@wukonglabs/wukong 0.1.2 → 0.1.4

package/README.md

@@ -80,26 +80,35 @@ Place at `~/.wukong/wukong.json` (global) or `./wukong.json` (project):
 ```json
 {
   "agent": {
-    "defaultModel": "deepseek-chat",
+    "defaultModel": "deepseek-chat"
+  },
+  "llm": {
     "providers": {
-      "openai": {
-        "apiKey": "sk-xxx",
+      "deepseek": {
+        "type": "openai-compatible",
+        "apiKey": "${DEEPSEEK_API_KEY}",
         "baseUrl": "https://api.deepseek.com/v1"
       }
+    },
+    "models": {
+      "deepseek-chat": {
+        "provider": "deepseek",
+        "id": "deepseek-chat"
+      }
     }
   }
 }
 ```
 
-Works with any OpenAI-compatible endpoint and Anthropic Claude. Provider type is auto-detected from model name / baseUrl.
+Use `--model <alias>` at startup. In TUI, `/model` lists models and `/model <alias>` switches between turns.
 
 ### Environment Variables (Recommended)
 
 ```bash
-OPENAI_API_KEY=sk-xxx              # → providers.openai.apiKey
-LLM_BASE_URL=https://api.xxx/v1    # → providers.openai.baseUrl
-LLM_MODEL=gpt-4o                   # → agent.defaultModel
-ANTHROPIC_API_KEY=sk-ant-xxx       # → providers.anthropic.apiKey
+OPENAI_API_KEY=sk-xxx              # → llm.providers.openai.apiKey (if declared)
+LLM_BASE_URL=https://api.xxx/v1    # → llm.providers.openai.baseUrl
+LLM_MODEL=openai-default           # → agent.defaultModel (declared alias)
+ANTHROPIC_API_KEY=sk-ant-xxx       # → llm.providers.anthropic.apiKey (if declared)
 ```
 
 Config file string values support `${VAR_NAME}` templates referencing env vars.

package/dist/cli/help.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,eAAO,MAAM,OAAO,UAAU,CAAC;AAE/B,eAAO,MAAM,SAAS,QA+Ed,CAAC;AAET;;GAEG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAEtC"}
+{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,eAAO,MAAM,OAAO,UAAU,CAAC;AAE/B,eAAO,MAAM,SAAS,QAkFd,CAAC;AAET;;GAEG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAEtC"}

package/dist/cli/help.js

@@ -22,6 +22,7 @@ Wukong (悟空) — CI-First AI Agent CLI
 核心选项:
   -m, --message <text>      任务描述（agent 模式必填）
   -sp, --system-prompt <text>  自定义 system prompt
+  --model <alias>           选择 llm.models 中声明的模型别名
   -c, --continue            续接当前 workspace 最近一次会话（交互模式默认）
   -n, --new                 强制新开一条会话（CI 模式默认）
   -s, --session-id <uuid>   精确指定要恢复的 session uuid
@@ -43,7 +44,9 @@ Wukong (悟空) — CI-First AI Agent CLI
 
 思考模式:
   --think                   启用扩展思考模式
-  --think-budget <tokens>   思考 token 预算（最小 1024）
+  --no-think                显式关闭思考模式
+  --think-budget <tokens>   Anthropic 思考 token 预算（最小 1024）
+  --reasoning-effort <level> DeepSeek 思考强度: low | high | xhigh | max
 
 编辑确认:
   --confirm <mode>          确认模式: always | smart(默认) | never

package/dist/cli/help.js.map

@@ -1 +1 @@
-{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,0CAA0C;AAC1C,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC;AAE/B,MAAM,CAAC,MAAM,SAAS,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+ExB,CAAC,IAAI,EAAE,CAAC;AAET;;GAEG;AACH,MAAM,UAAU,aAAa;IAC3B,OAAO,WAAW,OAAO,EAAE,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,0CAA0C;AAC1C,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC;AAE/B,MAAM,CAAC,MAAM,SAAS,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkFxB,CAAC,IAAI,EAAE,CAAC;AAET;;GAEG;AACH,MAAM,UAAU,aAAa;IAC3B,OAAO,WAAW,OAAO,EAAE,CAAC;AAC9B,CAAC"}

package/dist/index.js

@@ -5,7 +5,7 @@ import * as path from "node:path";
 import * as os from "node:os";
 // ── 核心能力全部来自独立发布的 SDK 包 ──
 // CLI 只做参数解析、会话编排与输出渲染，组装逻辑（createAgent）在 SDK 内。
-import { createAgent, SessionManager, collectSmartContext, attachSmartContext, AutoVerifier, DEFAULT_VERIFY_CONFIG, compactIfNeeded, loadConfig, Logger, setGlobalLogger, resolveWorkspace, getDefaultEventBus, ToolAuthorizer, TOOL_NAMES, isToolName, } from "@wukonglabs/wukong-agent-sdk";
+import { createAgent, SessionManager, collectSmartContext, attachSmartContext, AutoVerifier, DEFAULT_VERIFY_CONFIG, compactIfNeeded, loadConfig, resolveModelConfig, Logger, setGlobalLogger, resolveWorkspace, getDefaultEventBus, ToolAuthorizer, TOOL_NAMES, isToolName, } from "@wukonglabs/wukong-agent-sdk";
 // ── CLI 本地模块（不属于 SDK 对外能力） ──
 import { EXIT_CODES, resolveExitCode } from "./cli/exit-codes.js";
 import { HELP_TEXT, formatVersion, VERSION } from "./cli/help.js";
@@ -22,6 +22,7 @@ function parseArgs(argv) {
         positional: [],
         message: null,
         systemPrompt: null,
+        model: null,
         sessionId: null,
         continueSession: false,
         newSession: false,
@@ -31,7 +32,9 @@ function parseArgs(argv) {
         yes: false,
         confirmMode: null,
         think: false,
+        noThink: false,
         thinkBudget: null,
+        reasoningEffort: null,
         planMode: 'auto',
         verify: false,
         verifyCommand: null,
@@ -78,6 +81,9 @@ function parseArgs(argv) {
             case "-sp":
                 result.systemPrompt = args[++i] ?? null;
                 break;
+            case "--model":
+                result.model = args[++i] ?? null;
+                break;
             case "--session-id":
             case "-s":
                 result.sessionId = args[++i] ?? null;
@@ -115,6 +121,11 @@ function parseArgs(argv) {
                 break;
             case "--think":
                 result.think = true;
+                result.noThink = false;
+                break;
+            case "--no-think":
+                result.noThink = true;
+                result.think = false;
                 break;
             case "--think-budget":
                 {
@@ -122,6 +133,17 @@ function parseArgs(argv) {
                     if (!isNaN(budget) && budget >= 1024) {
                         result.thinkBudget = budget;
                         result.think = true; // --think-budget 隐含 --think
+                        result.noThink = false;
+                    }
+                }
+                break;
+            case "--reasoning-effort":
+                {
+                    const effort = args[++i];
+                    if (effort === 'low' || effort === 'high' || effort === 'xhigh' || effort === 'max') {
+                        result.reasoningEffort = effort;
+                        result.think = true; // reasoning_effort 隐含开启思考
+                        result.noThink = false;
                     }
                 }
                 break;
@@ -236,6 +258,7 @@ async function initAgent(opts) {
     return createAgent({
         config: opts.cfg,
         logger: opts.logger,
+        model: opts.model,
         confirmMode: opts.confirmMode,
         thinking: opts.thinking,
         ciMode: opts.ciMode ?? false,
@@ -252,8 +275,10 @@ async function runAgentCommand(cliArgs) {
     setGlobalLogger(logger);
     const cfg = await loadConfig();
     applyPermissionOverrides(cfg, cliArgs, logger);
+    const selectedModel = cliArgs.model ?? cfg.agent.defaultModel;
+    resolveModelConfig(cfg, selectedModel);
     const resolvedConfirmMode = cliArgs.yes ? 'never' : (cliArgs.confirmMode ?? cfg.tools.confirmMode ?? 'smart');
-    const resolvedThinking = resolveThinking(cliArgs, cfg);
+    const resolvedThinking = resolveThinking(cliArgs, cfg, selectedModel);
     // CI 模式：--yes 或 --json 时自动启用
     const isCiMode = cliArgs.yes || cliArgs.json;
     // ── Session 策略解析 ──
@@ -299,7 +324,7 @@ async function runAgentCommand(cliArgs) {
             }
         };
     const { llm, contextBuilder, agent, effectiveMaxSteps, resolvedModel } = await initAgent({
-        cfg, logger, confirmMode: resolvedConfirmMode, thinking: resolvedThinking, ciMode: isCiMode, planMode: cliArgs.planMode,
+        cfg, logger, model: selectedModel, confirmMode: resolvedConfirmMode, thinking: resolvedThinking, ciMode: isCiMode, planMode: cliArgs.planMode,
         overrides: { maxSteps: cliArgs.maxSteps, contextWindow: cliArgs.contextWindow },
         onStream, tracerOpts: { enabled: !cliArgs.noTrace },
     });
@@ -579,10 +604,12 @@ function extractModifiedFiles(trace) {
     }
     return [...files];
 }
-/** 检测配置中是否已存在至少一个带 apiKey 的 provider（env / 配置文件都会汇总到这里） */
+/** 检测是否存在至少一个可用模型及其带 apiKey 的 Provider。 */
 function hasConfiguredProvider(cfg) {
-    const providers = cfg.agent?.providers ?? {};
-    return Object.values(providers).some((p) => !!p && typeof p.apiKey === "string" && p.apiKey.trim().length > 0);
+    return Object.values(cfg.llm.models).some((model) => {
+        const provider = cfg.llm.providers[model.provider];
+        return !!provider?.apiKey?.trim();
+    });
 }
 /**
  * 交互式配置向导：在用户未配置任何 Provider 时收集最小可用配置。
@@ -602,23 +629,27 @@ async function runSetupWizard(logger) {
         logger.info("  3) OpenAI 兼容（自定义 baseUrl，如 DeepSeek / 通义 / 本地 vLLM 等）");
         const typeChoice = (await question("输入序号 [1]: ")).trim() || "1";
         let providerKey;
+        let modelAlias;
         let type;
         let defaultModel;
         let baseUrlRequired = false;
         switch (typeChoice) {
             case "2":
                 providerKey = "anthropic";
+                modelAlias = "anthropic-default";
                 type = "anthropic";
                 defaultModel = "claude-sonnet-4-20250514";
                 break;
             case "3":
-                providerKey = "openai-compatible";
+                providerKey = "custom";
+                modelAlias = "custom-default";
                 type = "openai-compatible";
                 defaultModel = "";
                 baseUrlRequired = true;
                 break;
             default:
                 providerKey = "openai";
+                modelAlias = "openai-default";
                 type = "openai";
                 defaultModel = "gpt-4o";
                 break;
@@ -650,8 +681,8 @@ async function runSetupWizard(logger) {
             logger.error("❌ 未填写模型名，配置未完成");
             return null;
         }
-        const providerConf = { apiKey, baseUrl, type, model };
-        return { providerKey, model, providerConf };
+        const providerConf = { apiKey, baseUrl, type };
+        return { providerKey, modelAlias, modelId: model, providerConf };
     }
     finally {
         rl.close();
@@ -671,10 +702,18 @@ async function persistWukongConfig(setup, logger) {
         // 文件不存在或无法解析 → 从空对象开始
     }
     existing.agent = existing.agent ?? {};
-    existing.agent.provider = setup.providerKey;
-    existing.agent.defaultModel = setup.model;
-    existing.agent.providers = existing.agent.providers ?? {};
-    existing.agent.providers[setup.providerKey] = setup.providerConf;
+    delete existing.agent.provider;
+    delete existing.agent.providers;
+    delete existing.agent.thinking;
+    existing.agent.defaultModel = setup.modelAlias;
+    existing.llm = existing.llm ?? {};
+    existing.llm.providers = existing.llm.providers ?? {};
+    existing.llm.models = existing.llm.models ?? {};
+    existing.llm.providers[setup.providerKey] = setup.providerConf;
+    existing.llm.models[setup.modelAlias] = {
+        provider: setup.providerKey,
+        id: setup.modelId,
+    };
     try {
         await fs.mkdir(dir, { recursive: true });
         await fs.writeFile(file, JSON.stringify(existing, null, 2) + "\n", { mode: 0o600 });
@@ -801,16 +840,21 @@ async function runInteractive(cliArgs) {
         }
         await persistWukongConfig(setup, logger);
         // 直接注入内存配置，无需重新加载（避免本地 wukong.json 遮蔽全局配置的边界情况）
-        cfg.agent.provider = setup.providerKey;
-        cfg.agent.defaultModel = setup.model;
-        cfg.agent.providers[setup.providerKey] = setup.providerConf;
+        cfg.agent.defaultModel = setup.modelAlias;
+        cfg.llm.providers[setup.providerKey] = setup.providerConf;
+        cfg.llm.models[setup.modelAlias] = {
+            provider: setup.providerKey,
+            id: setup.modelId,
+        };
         logger.info("");
         if (suppressTuiBootInfo) {
             logger.setLevel('warn');
         }
     }
+    const selectedModel = cliArgs.model ?? cfg.agent.defaultModel;
+    resolveModelConfig(cfg, selectedModel);
     const resolvedConfirmMode = cliArgs.yes ? 'never' : (cliArgs.confirmMode ?? cfg.tools.confirmMode ?? 'smart');
-    const resolvedThinking = resolveThinking(cliArgs, cfg);
+    const resolvedThinking = resolveThinking(cliArgs, cfg, selectedModel);
     const sessionManager = new SessionManager(cfg.sessions.dir);
     const workspace = resolveWorkspace();
     // 交互模式不视为 CI(即使被 pipe,交互模式一定不会被 --yes/--json 触发)
@@ -923,7 +967,7 @@ async function runInteractiveReadline(cliArgs, cfg, logger, resolvedConfirmMode,
         }
     };
     const { llm, tools, contextBuilder, agent, resolvedModel } = await initAgent({
-        cfg, logger, confirmMode: resolvedConfirmMode, thinking: resolvedThinking, planMode: cliArgs.planMode,
+        cfg, logger, model: cliArgs.model ?? cfg.agent.defaultModel, confirmMode: resolvedConfirmMode, thinking: resolvedThinking, planMode: cliArgs.planMode,
         overrides: { maxSteps: cliArgs.maxSteps, contextWindow: cliArgs.contextWindow },
         onStream, tracerOpts: { enabled: !cliArgs.noTrace },
         shouldAbort, authorizeTool,
@@ -1048,11 +1092,11 @@ async function runInteractiveTui(cliArgs, cfg, logger, resolvedConfirmMode, reso
     };
     // 读取持久化输入历史(可选,失败不阻塞)
     const initialHistory = await loadInputHistory().catch(() => []);
-    // agent 引用:sendMessage 通过它跑 agent;init 完成前为 null
-    const agentRef = {
-        llm: null,
-        contextBuilder: null,
-        agent: null,
+    // 当前运行时只在完整候选 Agent 构造成功后原子替换。
+    const agentRef = { current: null };
+    const streamSinkRef = { current: null };
+    const onStreamProxy = (event) => {
+        streamSinkRef.current?.(event);
     };
     const handlers = {
         eventBus: getDefaultEventBus(),
@@ -1068,12 +1112,46 @@ async function runInteractiveTui(cliArgs, cfg, logger, resolvedConfirmMode, reso
         authorizer,
         // M1:/compact 手动压缩(复用 index.ts 作用域内的 compactIfNeeded)
         compactIfNeeded: async () => {
-            if (!agentRef.agent || !agentRef.contextBuilder || !agentRef.llm)
+            const runtime = agentRef.current;
+            if (!runtime)
                 return;
-            await compactIfNeeded(session, agentRef.contextBuilder.build(session, ''), agentRef.llm, cfg.sessions.compaction);
+            await compactIfNeeded(session, runtime.contextBuilder.build(session, ''), runtime.llm, cfg.sessions.compaction);
+        },
+        listModels: () => Object.entries(cfg.llm.models)
+            .filter(([, profile]) => {
+            const apiKey = cfg.llm.providers[profile.provider]?.apiKey;
+            return !!apiKey && !/^\$\{[^}]+\}$/.test(apiKey);
+        })
+            .map(([alias, profile]) => ({
+            alias,
+            id: profile.id,
+            provider: profile.provider,
+        })),
+        switchModel: async (alias) => {
+            resolveModelConfig(cfg, alias);
+            const candidate = await initAgent({
+                cfg,
+                logger,
+                model: alias,
+                confirmMode: resolvedConfirmMode,
+                thinking: resolveThinking(cliArgs, cfg, alias),
+                planMode: cliArgs.planMode,
+                overrides: { maxSteps: cliArgs.maxSteps, contextWindow: cliArgs.contextWindow },
+                onStream: onStreamProxy,
+                tracerOpts: { enabled: !cliArgs.noTrace },
+                shouldAbort,
+                authorizeTool,
+            });
+            agentRef.current = candidate;
+            return {
+                alias: candidate.resolvedModelProfile.alias,
+                id: candidate.resolvedModelProfile.id,
+                provider: candidate.resolvedModelProfile.providerName,
+            };
         },
         sendMessage: async (input) => {
-            if (!agentRef.agent || !agentRef.contextBuilder || !agentRef.llm) {
+            const runtime = agentRef.current;
+            if (!runtime) {
                 throw new Error('Agent 未初始化');
             }
             // 持久化输入历史(异步,不阻塞)
@@ -1090,14 +1168,14 @@ async function runInteractiveTui(cliArgs, cfg, logger, resolvedConfirmMode, reso
                     // Smart Context 失败不影响主流程
                 }
             }
-            const messages = agentRef.contextBuilder.build(session, attachSmartContext(input, smartContextText));
-            const result = await agentRef.agent.runWithMessages(messages);
+            const messages = runtime.contextBuilder.build(session, attachSmartContext(input, smartContextText));
+            const result = await runtime.agent.runWithMessages(messages);
             await session.appendMessages([
                 { role: "user", content: input },
                 ...result.newMessages,
             ]);
-            const allMessages = agentRef.contextBuilder.build(session, "");
-            await compactIfNeeded(session, allMessages, agentRef.llm, cfg.sessions.compaction);
+            const allMessages = runtime.contextBuilder.build(session, "");
+            await compactIfNeeded(session, allMessages, runtime.llm, cfg.sessions.compaction);
             const durationMs = result.metrics?.durationMs ?? 0;
             return {
                 response: result.response,
@@ -1131,20 +1209,15 @@ async function runInteractiveTui(cliArgs, cfg, logger, resolvedConfirmMode, reso
     //   - 首帧被日志盖在可视区上方(用户看不到 Header/输入框)
     //   - Static 追加历史项时打在错的位置(Header 被复制多次)
     //   - 大量空线框(Ink 尝试重绘时高度计算失效)
-    // onStream 通过 sinkRef 桥接:先创建占位,Ink 启动时挂上真正的 sink。
-    const streamSinkRef = { current: null };
-    const onStreamProxy = (event) => {
-        streamSinkRef.current?.(event);
-    };
-    const { llm, contextBuilder, agent, tools, resolvedModel, skillsLoaded } = await initAgent({
-        cfg, logger, confirmMode: resolvedConfirmMode, thinking: resolvedThinking, planMode: cliArgs.planMode,
+    // onStream 通过前面创建的稳定 sinkRef 桥接到 Ink。
+    const initialRuntime = await initAgent({
+        cfg, logger, model: cliArgs.model ?? cfg.agent.defaultModel, confirmMode: resolvedConfirmMode, thinking: resolvedThinking, planMode: cliArgs.planMode,
         overrides: { maxSteps: cliArgs.maxSteps, contextWindow: cliArgs.contextWindow },
         onStream: onStreamProxy, tracerOpts: { enabled: !cliArgs.noTrace },
         shouldAbort, authorizeTool,
     });
-    agentRef.llm = llm;
-    agentRef.contextBuilder = contextBuilder;
-    agentRef.agent = agent;
+    agentRef.current = initialRuntime;
+    const { tools, resolvedModel, skillsLoaded } = initialRuntime;
     // ── init 完成后再启动 Ink ──
     // 此时终端上可能已经有几十行 skills 加载日志,Ink 启动后会:
     //   - 立即切换到 alt-screen(取决于终端;不切换时也会把 UI 渲染在当前光标处)
@@ -1245,18 +1318,53 @@ function applyPermissionOverrides(cfg, cliArgs, logger) {
         logger.info(`🔒 强制拒绝工具: ${cliArgs.denyTools.join(', ')}`);
     }
 }
-/** 从 CLI 参数和配置文件解析思考模式配置 */
-function resolveThinking(cliArgs, cfg) {
-    // CLI 参数优先
-    if (cliArgs.think) {
-        const budget = cliArgs.thinkBudget ?? cfg.agent.thinking?.budgetTokens ?? 10000;
-        return { type: 'enabled', budgetTokens: Math.max(budget, 1024) };
+/** 从所选模型与 CLI 参数解析本次运行的思考配置。 */
+function resolveThinking(cliArgs, cfg, modelAlias) {
+    const configured = resolveModelConfig(cfg, modelAlias).thinking;
+    const hasCliOverride = cliArgs.noThink || cliArgs.think || cliArgs.thinkBudget !== null || cliArgs.reasoningEffort !== null;
+    if (!configured) {
+        if (hasCliOverride) {
+            throw new Error(`模型 "${modelAlias}" 未声明 thinking 协议，不能使用思考参数`);
+        }
+        return undefined;
+    }
+    const configuredType = configured.enabled ? 'enabled' : 'disabled';
+    if (!hasCliOverride) {
+        return configured.protocol === 'deepseek'
+            ? {
+                protocol: 'deepseek',
+                type: configuredType,
+                ...(configured.reasoningEffort ? { reasoningEffort: configured.reasoningEffort } : {}),
+            }
+            : {
+                protocol: 'anthropic',
+                type: configuredType,
+                ...(configured.budgetTokens !== undefined ? { budgetTokens: configured.budgetTokens } : {}),
+            };
     }
-    // 配置文件
-    if (cfg.agent.thinking?.enabled) {
-        return { type: 'enabled', budgetTokens: Math.max(cfg.agent.thinking.budgetTokens ?? 10000, 1024) };
+    const type = cliArgs.noThink ? 'disabled' : 'enabled';
+    if (configured.protocol === 'deepseek') {
+        if (cliArgs.thinkBudget !== null) {
+            throw new Error(`模型 "${modelAlias}" 使用 deepseek 思考协议，不支持 --think-budget`);
+        }
+        return {
+            protocol: 'deepseek',
+            type,
+            ...(type === 'enabled' && (cliArgs.reasoningEffort ?? configured.reasoningEffort)
+                ? { reasoningEffort: cliArgs.reasoningEffort ?? configured.reasoningEffort }
+                : {}),
+        };
     }
-    return undefined;
+    if (cliArgs.reasoningEffort !== null) {
+        throw new Error(`模型 "${modelAlias}" 使用 anthropic 思考协议，不支持 --reasoning-effort`);
+    }
+    return {
+        protocol: 'anthropic',
+        type,
+        ...(type === 'enabled'
+            ? { budgetTokens: Math.max(cliArgs.thinkBudget ?? configured.budgetTokens ?? 10000, 1024) }
+            : {}),
+    };
 }
 // 🛡️ 全局兜底：任何遗漏监听的异步 'error' 事件（如子进程 spawn 失败）
 // 都不应直接秒杀进程。记录日志并优雅退出，保留错误现场便于排查。