* fix(providers): use Bearer auth for Gemini CLI OAuth tokens When credentials come from ~/.gemini/oauth_creds.json (Gemini CLI), send them as Authorization: Bearer header instead of ?key= query parameter. API keys from env vars or config continue using ?key=. Fixes #194 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * refactor(gemini): harden OAuth bearer auth flow and tests * fix(gemini): granular auth source tracking and review fixes Build on chumyin's auth model refactor with: - Expand GeminiAuth to 4 variants (ExplicitKey/EnvGeminiKey/EnvGoogleKey/ OAuthToken) so auth_source() uses stored discriminant without re-reading env vars at call time - Add is_api_key()/credential() helpers on the enum - Upgrade expired OAuth token log from debug to warn - Add tests: provider_rejects_empty_key, auth_source_explicit_key, auth_source_none_without_credentials Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * style: apply rustfmt to fix CI lint failures Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: root <root@instance-20220913-1738.vcn09131738.oraclevcn.com> Co-authored-by: argenis de la rosa <theonlyhennygod@gmail.com>
255 lines
8.2 KiB
Rust
255 lines
8.2 KiB
Rust
//! SkillForge — Skill auto-discovery, evaluation, and integration engine.
|
|
//!
|
|
//! Pipeline: Scout → Evaluate → Integrate
|
|
//! Discovers skills from external sources, scores them, and generates
|
|
//! ZeroClaw-compatible manifests for qualified candidates.
|
|
|
|
pub mod evaluate;
|
|
pub mod integrate;
|
|
pub mod scout;
|
|
|
|
use anyhow::Result;
|
|
use serde::{Deserialize, Serialize};
|
|
use tracing::{info, warn};
|
|
|
|
use self::evaluate::{EvalResult, Evaluator, Recommendation};
|
|
use self::integrate::Integrator;
|
|
use self::scout::{GitHubScout, Scout, ScoutResult, ScoutSource};
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Configuration
|
|
// ---------------------------------------------------------------------------
|
|
|
|
#[derive(Clone, Serialize, Deserialize)]
|
|
pub struct SkillForgeConfig {
|
|
#[serde(default)]
|
|
pub enabled: bool,
|
|
#[serde(default = "default_auto_integrate")]
|
|
pub auto_integrate: bool,
|
|
#[serde(default = "default_sources")]
|
|
pub sources: Vec<String>,
|
|
#[serde(default = "default_scan_interval")]
|
|
pub scan_interval_hours: u64,
|
|
#[serde(default = "default_min_score")]
|
|
pub min_score: f64,
|
|
/// Optional GitHub personal-access token for higher rate limits.
|
|
#[serde(default)]
|
|
pub github_token: Option<String>,
|
|
/// Directory where integrated skills are written.
|
|
#[serde(default = "default_output_dir")]
|
|
pub output_dir: String,
|
|
}
|
|
|
|
fn default_auto_integrate() -> bool {
|
|
true
|
|
}
|
|
fn default_sources() -> Vec<String> {
|
|
vec!["github".into(), "clawhub".into()]
|
|
}
|
|
fn default_scan_interval() -> u64 {
|
|
24
|
|
}
|
|
fn default_min_score() -> f64 {
|
|
0.7
|
|
}
|
|
fn default_output_dir() -> String {
|
|
"./skills".into()
|
|
}
|
|
|
|
impl Default for SkillForgeConfig {
|
|
fn default() -> Self {
|
|
Self {
|
|
enabled: false,
|
|
auto_integrate: default_auto_integrate(),
|
|
sources: default_sources(),
|
|
scan_interval_hours: default_scan_interval(),
|
|
min_score: default_min_score(),
|
|
github_token: None,
|
|
output_dir: default_output_dir(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl std::fmt::Debug for SkillForgeConfig {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
f.debug_struct("SkillForgeConfig")
|
|
.field("enabled", &self.enabled)
|
|
.field("auto_integrate", &self.auto_integrate)
|
|
.field("sources", &self.sources)
|
|
.field("scan_interval_hours", &self.scan_interval_hours)
|
|
.field("min_score", &self.min_score)
|
|
.field("github_token", &self.github_token.as_ref().map(|_| "***"))
|
|
.field("output_dir", &self.output_dir)
|
|
.finish()
|
|
}
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// ForgeReport — summary of a single pipeline run
|
|
// ---------------------------------------------------------------------------
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct ForgeReport {
|
|
pub discovered: usize,
|
|
pub evaluated: usize,
|
|
pub auto_integrated: usize,
|
|
pub manual_review: usize,
|
|
pub skipped: usize,
|
|
pub results: Vec<EvalResult>,
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// SkillForge
|
|
// ---------------------------------------------------------------------------
|
|
|
|
pub struct SkillForge {
|
|
config: SkillForgeConfig,
|
|
evaluator: Evaluator,
|
|
integrator: Integrator,
|
|
}
|
|
|
|
impl SkillForge {
|
|
pub fn new(config: SkillForgeConfig) -> Self {
|
|
let evaluator = Evaluator::new(config.min_score);
|
|
let integrator = Integrator::new(config.output_dir.clone());
|
|
Self {
|
|
config,
|
|
evaluator,
|
|
integrator,
|
|
}
|
|
}
|
|
|
|
/// Run the full pipeline: Scout → Evaluate → Integrate.
|
|
pub async fn forge(&self) -> Result<ForgeReport> {
|
|
if !self.config.enabled {
|
|
warn!("SkillForge is disabled — skipping");
|
|
return Ok(ForgeReport {
|
|
discovered: 0,
|
|
evaluated: 0,
|
|
auto_integrated: 0,
|
|
manual_review: 0,
|
|
skipped: 0,
|
|
results: vec![],
|
|
});
|
|
}
|
|
|
|
// --- Scout ----------------------------------------------------------
|
|
let mut candidates: Vec<ScoutResult> = Vec::new();
|
|
|
|
for src in &self.config.sources {
|
|
let source: ScoutSource = src.parse().unwrap(); // Infallible
|
|
match source {
|
|
ScoutSource::GitHub => {
|
|
let scout = GitHubScout::new(self.config.github_token.clone());
|
|
match scout.discover().await {
|
|
Ok(mut found) => {
|
|
info!(count = found.len(), "GitHub scout returned candidates");
|
|
candidates.append(&mut found);
|
|
}
|
|
Err(e) => {
|
|
warn!(error = %e, "GitHub scout failed, continuing with other sources");
|
|
}
|
|
}
|
|
}
|
|
ScoutSource::ClawHub | ScoutSource::HuggingFace => {
|
|
info!(
|
|
source = src.as_str(),
|
|
"Source not yet implemented — skipping"
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Deduplicate by URL
|
|
scout::dedup(&mut candidates);
|
|
let discovered = candidates.len();
|
|
info!(discovered, "Total unique candidates after dedup");
|
|
|
|
// --- Evaluate -------------------------------------------------------
|
|
let results: Vec<EvalResult> = candidates
|
|
.into_iter()
|
|
.map(|c| self.evaluator.evaluate(c))
|
|
.collect();
|
|
let evaluated = results.len();
|
|
|
|
// --- Integrate ------------------------------------------------------
|
|
let mut auto_integrated = 0usize;
|
|
let mut manual_review = 0usize;
|
|
let mut skipped = 0usize;
|
|
|
|
for res in &results {
|
|
match res.recommendation {
|
|
Recommendation::Auto => {
|
|
if self.config.auto_integrate {
|
|
match self.integrator.integrate(&res.candidate) {
|
|
Ok(_) => {
|
|
auto_integrated += 1;
|
|
}
|
|
Err(e) => {
|
|
warn!(
|
|
skill = res.candidate.name.as_str(),
|
|
error = %e,
|
|
"Integration failed for candidate, continuing"
|
|
);
|
|
}
|
|
}
|
|
} else {
|
|
// Count as would-be auto but not actually integrated
|
|
manual_review += 1;
|
|
}
|
|
}
|
|
Recommendation::Manual => {
|
|
manual_review += 1;
|
|
}
|
|
Recommendation::Skip => {
|
|
skipped += 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
info!(
|
|
auto_integrated,
|
|
manual_review, skipped, "Forge pipeline complete"
|
|
);
|
|
|
|
Ok(ForgeReport {
|
|
discovered,
|
|
evaluated,
|
|
auto_integrated,
|
|
manual_review,
|
|
skipped,
|
|
results,
|
|
})
|
|
}
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Tests
|
|
// ---------------------------------------------------------------------------
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[tokio::test]
|
|
async fn disabled_forge_returns_empty_report() {
|
|
let cfg = SkillForgeConfig {
|
|
enabled: false,
|
|
..Default::default()
|
|
};
|
|
let forge = SkillForge::new(cfg);
|
|
let report = forge.forge().await.unwrap();
|
|
assert_eq!(report.discovered, 0);
|
|
assert_eq!(report.auto_integrated, 0);
|
|
}
|
|
|
|
#[test]
|
|
fn default_config_values() {
|
|
let cfg = SkillForgeConfig::default();
|
|
assert!(!cfg.enabled);
|
|
assert!(cfg.auto_integrate);
|
|
assert_eq!(cfg.scan_interval_hours, 24);
|
|
assert!((cfg.min_score - 0.7).abs() < f64::EPSILON);
|
|
assert_eq!(cfg.sources, vec!["github", "clawhub"]);
|
|
}
|
|
}
|