* 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>
339 lines
11 KiB
Rust
339 lines
11 KiB
Rust
//! Scout — skill discovery from external sources.
|
|
|
|
use anyhow::Result;
|
|
use async_trait::async_trait;
|
|
use chrono::{DateTime, Utc};
|
|
use serde::{Deserialize, Serialize};
|
|
use tracing::{debug, warn};
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// ScoutSource
|
|
// ---------------------------------------------------------------------------
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
|
pub enum ScoutSource {
|
|
GitHub,
|
|
ClawHub,
|
|
HuggingFace,
|
|
}
|
|
|
|
impl std::str::FromStr for ScoutSource {
|
|
type Err = std::convert::Infallible;
|
|
|
|
fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
|
|
Ok(match s.to_lowercase().as_str() {
|
|
"github" => Self::GitHub,
|
|
"clawhub" => Self::ClawHub,
|
|
"huggingface" | "hf" => Self::HuggingFace,
|
|
_ => {
|
|
warn!(source = s, "Unknown scout source, defaulting to GitHub");
|
|
Self::GitHub
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// ScoutResult
|
|
// ---------------------------------------------------------------------------
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct ScoutResult {
|
|
pub name: String,
|
|
pub url: String,
|
|
pub description: String,
|
|
pub stars: u64,
|
|
pub language: Option<String>,
|
|
pub updated_at: Option<DateTime<Utc>>,
|
|
pub source: ScoutSource,
|
|
/// Owner / org extracted from the URL or API response.
|
|
pub owner: String,
|
|
/// Whether the repo has a license file.
|
|
pub has_license: bool,
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Scout trait
|
|
// ---------------------------------------------------------------------------
|
|
|
|
#[async_trait]
|
|
pub trait Scout: Send + Sync {
|
|
/// Discover candidate skills from the source.
|
|
async fn discover(&self) -> Result<Vec<ScoutResult>>;
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// GitHubScout
|
|
// ---------------------------------------------------------------------------
|
|
|
|
/// Searches GitHub for repos matching skill-related queries.
|
|
pub struct GitHubScout {
|
|
client: reqwest::Client,
|
|
queries: Vec<String>,
|
|
}
|
|
|
|
impl GitHubScout {
|
|
pub fn new(token: Option<String>) -> Self {
|
|
use std::time::Duration;
|
|
|
|
let mut headers = reqwest::header::HeaderMap::new();
|
|
headers.insert(
|
|
reqwest::header::ACCEPT,
|
|
"application/vnd.github+json".parse().expect("valid header"),
|
|
);
|
|
headers.insert(
|
|
reqwest::header::USER_AGENT,
|
|
"ZeroClaw-SkillForge/0.1".parse().expect("valid header"),
|
|
);
|
|
if let Some(ref t) = token {
|
|
if let Ok(val) = format!("Bearer {t}").parse() {
|
|
headers.insert(reqwest::header::AUTHORIZATION, val);
|
|
}
|
|
}
|
|
|
|
let client = reqwest::Client::builder()
|
|
.default_headers(headers)
|
|
.timeout(Duration::from_secs(30))
|
|
.build()
|
|
.expect("failed to build reqwest client");
|
|
|
|
Self {
|
|
client,
|
|
queries: vec!["zeroclaw skill".into(), "ai agent skill".into()],
|
|
}
|
|
}
|
|
|
|
/// Parse the GitHub search/repositories JSON response.
|
|
fn parse_items(body: &serde_json::Value) -> Vec<ScoutResult> {
|
|
let items = match body.get("items").and_then(|v| v.as_array()) {
|
|
Some(arr) => arr,
|
|
None => return vec![],
|
|
};
|
|
|
|
items
|
|
.iter()
|
|
.filter_map(|item| {
|
|
let name = item.get("name")?.as_str()?.to_string();
|
|
let url = item.get("html_url")?.as_str()?.to_string();
|
|
let description = item
|
|
.get("description")
|
|
.and_then(|v| v.as_str())
|
|
.unwrap_or("")
|
|
.to_string();
|
|
let stars = item
|
|
.get("stargazers_count")
|
|
.and_then(|v| v.as_u64())
|
|
.unwrap_or(0);
|
|
let language = item
|
|
.get("language")
|
|
.and_then(|v| v.as_str())
|
|
.map(String::from);
|
|
let updated_at = item
|
|
.get("updated_at")
|
|
.and_then(|v| v.as_str())
|
|
.and_then(|s| s.parse::<DateTime<Utc>>().ok());
|
|
let owner = item
|
|
.get("owner")
|
|
.and_then(|o| o.get("login"))
|
|
.and_then(|v| v.as_str())
|
|
.unwrap_or("unknown")
|
|
.to_string();
|
|
let has_license = item.get("license").map(|v| !v.is_null()).unwrap_or(false);
|
|
|
|
Some(ScoutResult {
|
|
name,
|
|
url,
|
|
description,
|
|
stars,
|
|
language,
|
|
updated_at,
|
|
source: ScoutSource::GitHub,
|
|
owner,
|
|
has_license,
|
|
})
|
|
})
|
|
.collect()
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl Scout for GitHubScout {
|
|
async fn discover(&self) -> Result<Vec<ScoutResult>> {
|
|
let mut all: Vec<ScoutResult> = Vec::new();
|
|
|
|
for query in &self.queries {
|
|
let url = format!(
|
|
"https://api.github.com/search/repositories?q={}&sort=stars&order=desc&per_page=30",
|
|
urlencoding(query)
|
|
);
|
|
debug!(query = query.as_str(), "Searching GitHub");
|
|
|
|
let resp = match self.client.get(&url).send().await {
|
|
Ok(r) => r,
|
|
Err(e) => {
|
|
warn!(
|
|
query = query.as_str(),
|
|
error = %e,
|
|
"GitHub API request failed, skipping query"
|
|
);
|
|
continue;
|
|
}
|
|
};
|
|
|
|
if !resp.status().is_success() {
|
|
warn!(
|
|
status = %resp.status(),
|
|
query = query.as_str(),
|
|
"GitHub search returned non-200"
|
|
);
|
|
continue;
|
|
}
|
|
|
|
let body: serde_json::Value = match resp.json().await {
|
|
Ok(v) => v,
|
|
Err(e) => {
|
|
warn!(
|
|
query = query.as_str(),
|
|
error = %e,
|
|
"Failed to parse GitHub response, skipping query"
|
|
);
|
|
continue;
|
|
}
|
|
};
|
|
|
|
let mut items = Self::parse_items(&body);
|
|
debug!(count = items.len(), query = query.as_str(), "Parsed items");
|
|
all.append(&mut items);
|
|
}
|
|
|
|
dedup(&mut all);
|
|
Ok(all)
|
|
}
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Helpers
|
|
// ---------------------------------------------------------------------------
|
|
|
|
/// Minimal percent-encoding for query strings (space → +).
|
|
fn urlencoding(s: &str) -> String {
|
|
s.replace(' ', "+").replace('&', "%26").replace('#', "%23")
|
|
}
|
|
|
|
/// Deduplicate scout results by URL (keeps first occurrence).
|
|
pub fn dedup(results: &mut Vec<ScoutResult>) {
|
|
let mut seen = std::collections::HashSet::new();
|
|
results.retain(|r| seen.insert(r.url.clone()));
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Tests
|
|
// ---------------------------------------------------------------------------
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn scout_source_from_str() {
|
|
assert_eq!(
|
|
"github".parse::<ScoutSource>().unwrap(),
|
|
ScoutSource::GitHub
|
|
);
|
|
assert_eq!(
|
|
"GitHub".parse::<ScoutSource>().unwrap(),
|
|
ScoutSource::GitHub
|
|
);
|
|
assert_eq!(
|
|
"clawhub".parse::<ScoutSource>().unwrap(),
|
|
ScoutSource::ClawHub
|
|
);
|
|
assert_eq!(
|
|
"huggingface".parse::<ScoutSource>().unwrap(),
|
|
ScoutSource::HuggingFace
|
|
);
|
|
assert_eq!(
|
|
"hf".parse::<ScoutSource>().unwrap(),
|
|
ScoutSource::HuggingFace
|
|
);
|
|
// unknown falls back to GitHub
|
|
assert_eq!(
|
|
"unknown".parse::<ScoutSource>().unwrap(),
|
|
ScoutSource::GitHub
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn dedup_removes_duplicates() {
|
|
let mut results = vec![
|
|
ScoutResult {
|
|
name: "a".into(),
|
|
url: "https://github.com/x/a".into(),
|
|
description: String::new(),
|
|
stars: 10,
|
|
language: None,
|
|
updated_at: None,
|
|
source: ScoutSource::GitHub,
|
|
owner: "x".into(),
|
|
has_license: true,
|
|
},
|
|
ScoutResult {
|
|
name: "a-dup".into(),
|
|
url: "https://github.com/x/a".into(),
|
|
description: String::new(),
|
|
stars: 10,
|
|
language: None,
|
|
updated_at: None,
|
|
source: ScoutSource::GitHub,
|
|
owner: "x".into(),
|
|
has_license: true,
|
|
},
|
|
ScoutResult {
|
|
name: "b".into(),
|
|
url: "https://github.com/x/b".into(),
|
|
description: String::new(),
|
|
stars: 5,
|
|
language: None,
|
|
updated_at: None,
|
|
source: ScoutSource::GitHub,
|
|
owner: "x".into(),
|
|
has_license: false,
|
|
},
|
|
];
|
|
dedup(&mut results);
|
|
assert_eq!(results.len(), 2);
|
|
assert_eq!(results[0].name, "a");
|
|
assert_eq!(results[1].name, "b");
|
|
}
|
|
|
|
#[test]
|
|
fn parse_github_items() {
|
|
let json = serde_json::json!({
|
|
"total_count": 1,
|
|
"items": [
|
|
{
|
|
"name": "cool-skill",
|
|
"html_url": "https://github.com/user/cool-skill",
|
|
"description": "A cool skill",
|
|
"stargazers_count": 42,
|
|
"language": "Rust",
|
|
"updated_at": "2026-01-15T10:00:00Z",
|
|
"owner": { "login": "user" },
|
|
"license": { "spdx_id": "MIT" }
|
|
}
|
|
]
|
|
});
|
|
let items = GitHubScout::parse_items(&json);
|
|
assert_eq!(items.len(), 1);
|
|
assert_eq!(items[0].name, "cool-skill");
|
|
assert_eq!(items[0].stars, 42);
|
|
assert!(items[0].has_license);
|
|
assert_eq!(items[0].owner, "user");
|
|
}
|
|
|
|
#[test]
|
|
fn urlencoding_works() {
|
|
assert_eq!(urlencoding("hello world"), "hello+world");
|
|
assert_eq!(urlencoding("a&b#c"), "a%26b%23c");
|
|
}
|
|
}
|