axon-code 2.4.0 → 2.6.1

package/dist/auth/snapshot.d.ts

@@ -0,0 +1,24 @@
+/**
+ * 统一认证快照 — 供 GoalTool / ScheduleTask 等需要持久化凭证的场景使用
+ *
+ * 问题背景：
+ *   GoalTool 创建目标时需要快照当前认证，供 daemon 后台执行时复用。
+ *   但在 Web UI 模式下，认证信息存在 settings.json 里，不在环境变量中。
+ *   旧实现只读 process.env.ANTHROPIC_API_KEY，导致快照为空，daemon 执行时 401。
+ *
+ * 读取优先级（与 webAuth.getCredentials 对齐）:
+ *   1. settings.json 中的 apiKey / OAuth 配置（Web UI 的主认证源）
+ *   2. 环境变量 ANTHROPIC_API_KEY / AXON_API_KEY
+ *   3. initAuth()/getAuth()（CLI keychain 等）
+ */
+export interface AuthSnapshot {
+    apiKey?: string;
+    authToken?: string;
+    baseUrl?: string;
+}
+/**
+ * 从所有可用认证源获取当前有效凭证的快照
+ * 适用于需要序列化认证信息供独立进程使用的场景（daemon、子进程等）
+ */
+export declare function snapshotAuthCredentials(): AuthSnapshot | undefined;
+//# sourceMappingURL=snapshot.d.ts.map

package/dist/auth/snapshot.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../src/auth/snapshot.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAMH,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,IAAI,YAAY,GAAG,SAAS,CA0ClE"}

package/dist/auth/snapshot.js

@@ -0,0 +1,144 @@
+/**
+ * 统一认证快照 — 供 GoalTool / ScheduleTask 等需要持久化凭证的场景使用
+ *
+ * 问题背景：
+ *   GoalTool 创建目标时需要快照当前认证，供 daemon 后台执行时复用。
+ *   但在 Web UI 模式下，认证信息存在 settings.json 里，不在环境变量中。
+ *   旧实现只读 process.env.ANTHROPIC_API_KEY，导致快照为空，daemon 执行时 401。
+ *
+ * 读取优先级（与 webAuth.getCredentials 对齐）:
+ *   1. settings.json 中的 apiKey / OAuth 配置（Web UI 的主认证源）
+ *   2. 环境变量 ANTHROPIC_API_KEY / AXON_API_KEY
+ *   3. initAuth()/getAuth()（CLI keychain 等）
+ */
+import * as fs from 'fs';
+import { configManager } from '../config/index.js';
+import { initAuth, getAuth } from './index.js';
+/**
+ * 从所有可用认证源获取当前有效凭证的快照
+ * 适用于需要序列化认证信息供独立进程使用的场景（daemon、子进程等）
+ */
+export function snapshotAuthCredentials() {
+    // 来源 1: settings.json（Web UI 模式的主认证源）
+    const fromSettings = readFromSettings();
+    if (fromSettings && (fromSettings.apiKey || fromSettings.authToken)) {
+        return fromSettings;
+    }
+    // 来源 2: 环境变量
+    const envKey = process.env.ANTHROPIC_API_KEY || process.env.AXON_API_KEY;
+    if (envKey) {
+        return {
+            apiKey: envKey,
+            baseUrl: process.env.ANTHROPIC_BASE_URL,
+        };
+    }
+    // 来源 3: CLI 认证系统（keychain 等）
+    try {
+        initAuth();
+        const auth = getAuth();
+        if (auth) {
+            if (auth.type === 'api_key' && auth.apiKey) {
+                return {
+                    apiKey: auth.apiKey,
+                    baseUrl: process.env.ANTHROPIC_BASE_URL,
+                };
+            }
+            if (auth.type === 'oauth') {
+                const token = auth.authToken || auth.accessToken;
+                if (token) {
+                    return {
+                        authToken: token,
+                        baseUrl: process.env.ANTHROPIC_BASE_URL,
+                    };
+                }
+            }
+        }
+    }
+    catch {
+        // CLI auth 初始化失败，忽略
+    }
+    return undefined;
+}
+/**
+ * 从 settings.json 读取认证信息
+ * 复制了 webAuth.readSettings + getCredentials 的核心逻辑，
+ * 避免工具层直接依赖 web server 层
+ */
+function readFromSettings() {
+    try {
+        const settingsPath = configManager.getConfigPaths().userSettings;
+        if (!fs.existsSync(settingsPath))
+            return undefined;
+        const raw = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
+        const apiKey = raw.apiKey;
+        const apiBaseUrl = raw.apiBaseUrl;
+        const authPriority = raw.authPriority || 'auto';
+        const result = {};
+        if (apiBaseUrl) {
+            result.baseUrl = apiBaseUrl;
+        }
+        // 按 authPriority 决定使用哪种凭证（与 webAuth.getCredentials 逻辑一致）
+        if (authPriority === 'apiKey') {
+            if (apiKey)
+                result.apiKey = apiKey;
+        }
+        else if (authPriority === 'oauth') {
+            const oauthCreds = readOAuthCredentials();
+            if (oauthCreds)
+                Object.assign(result, oauthCreds);
+        }
+        else {
+            // auto: apiKey 优先，没有则 fallback 到 OAuth
+            if (apiKey) {
+                result.apiKey = apiKey;
+            }
+            else {
+                const oauthCreds = readOAuthCredentials();
+                if (oauthCreds)
+                    Object.assign(result, oauthCreds);
+            }
+        }
+        // 环境变量兜底（容器化部署场景，settings.json 可能没有 apiKey）
+        if (!result.apiKey && !result.authToken) {
+            const envKey = process.env.ANTHROPIC_API_KEY || process.env.AXON_API_KEY;
+            if (envKey) {
+                result.apiKey = envKey;
+                // baseUrl 也从环境变量兜底（settings.json 没有 apiBaseUrl 时）
+                if (!result.baseUrl && process.env.ANTHROPIC_BASE_URL) {
+                    result.baseUrl = process.env.ANTHROPIC_BASE_URL;
+                }
+            }
+        }
+        if (result.apiKey || result.authToken)
+            return result;
+        return undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * 从 configManager 读取 OAuth 凭证
+ * 对齐 webAuth.getOAuthCredentials 的逻辑
+ */
+function readOAuthCredentials() {
+    try {
+        const config = configManager.getAll();
+        const oauthAccount = config.oauthAccount;
+        if (!oauthAccount || !oauthAccount.accessToken)
+            return undefined;
+        const hasInferenceScope = oauthAccount.scopes?.includes('user:inference');
+        if (hasInferenceScope) {
+            return { authToken: oauthAccount.accessToken };
+        }
+        if (oauthAccount.oauthApiKey) {
+            return { apiKey: oauthAccount.oauthApiKey };
+        }
+        // fallback
+        return { authToken: oauthAccount.accessToken };
+    }
+    catch {
+        return undefined;
+    }
+}
+//# sourceMappingURL=snapshot.js.map

package/dist/auth/snapshot.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../src/auth/snapshot.ts"],"names":[],"mappings":"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"}

package/dist/cli.js

@@ -15,7 +15,7 @@ import React from 'react';
 import { render } from 'ink';
 import { ConversationLoop } from './core/loop.js';
 import { Session } from './core/session.js';
-import { toolRegistry } from './tools/index.js';
+import { toolRegistry, initPluginToolSync } from './tools/index.js';
 import { configManager } from './config/index.js';
 import { listSessions, loadSession, forkSession, findSessionByPr } from './session/index.js';
 import { emitLifecycleEvent } from './lifecycle/index.js';
@@ -764,6 +764,8 @@ async function runTextInterface(prompt, options, modelMap, systemPrompt) {
     console.log(LOGO);
     // 从配置管理器获取完整配置（包括环境变量）
     const config = configManager.getAll();
+    // 初始化插件工具同步 — 将已安装插件注册的工具桥接到 toolRegistry，让模型 API 可识别
+    initPluginToolSync();
     const loop = new ConversationLoop({
         model: modelMap[options.model] || options.model,
         maxTokens: parseInt(options.maxTokens),