@wukonglabs/wukong 0.0.8 → 0.0.10

package/dist/index.js

@@ -1,81 +1,30 @@
 #!/usr/bin/env node
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-const readline = __importStar(require("node:readline"));
-const fs = __importStar(require("node:fs/promises"));
-const path = __importStar(require("node:path"));
-const os = __importStar(require("node:os"));
+import * as readline from "node:readline";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import * as os from "node:os";
 // ── 核心能力全部来自独立发布的 SDK 包 ──
 // CLI 只做参数解析、会话编排与输出渲染，组装逻辑（createAgent）在 SDK 内。
-const wukong_agent_sdk_1 = require("@wukonglabs/wukong-agent-sdk");
+import { createAgent, SessionManager, collectSmartContext, AutoVerifier, DEFAULT_VERIFY_CONFIG, compactIfNeeded, loadConfig, Logger, setGlobalLogger, resolveWorkspace, getDefaultEventBus, ToolAuthorizer, } from "@wukonglabs/wukong-agent-sdk";
 // ── CLI 本地模块（不属于 SDK 对外能力） ──
-const exit_codes_js_1 = require("./cli/exit-codes.js");
-const help_js_1 = require("./cli/help.js");
-const summary_js_1 = require("./cli/summary.js");
-/**
- * 为 CI 环境自动生成唯一 session ID
- *
- * 消除并发 CI job 互相污染的风险。
- * 按优先级从 CI 环境变量中提取 branch/commit/jobId，
- * 组合为 `ci:<branch>:<commit>:<jobId>` 格式。
- */
-function generateCiSessionId() {
-    const branch = process.env.CI_COMMIT_BRANCH
-        || process.env.GITHUB_HEAD_REF
-        || process.env.GITHUB_REF_NAME
-        || process.env.BRANCH_NAME
-        || 'unknown';
-    const commit = (process.env.CI_COMMIT_SHA
-        || process.env.GITHUB_SHA
-        || process.env.GIT_COMMIT
-        || '').substring(0, 8) || 'nocommit';
-    const jobId = process.env.CI_JOB_ID
-        || process.env.GITHUB_RUN_ID
-        || process.env.BUILD_NUMBER
-        || Date.now().toString(36);
-    return `ci:${branch}:${commit}:${jobId}`;
-}
+import { EXIT_CODES, resolveExitCode } from "./cli/exit-codes.js";
+import { HELP_TEXT, formatVersion } from "./cli/help.js";
+import { buildJsonSummary } from "./cli/summary.js";
+import { runSessionCommand } from "./cli/session-commands.js";
+import { runWorkspaceCommand } from "./cli/workspace-commands.js";
+import { shouldUseTuiFromProcess } from "./tui/should-use-tui.js";
+import { runInk } from "./tui/run-ink.js";
+import { createAbortController } from "./sigint-handler.js";
 function parseArgs(argv) {
     const args = argv.slice(2);
     const result = {
         command: null,
+        positional: [],
         message: null,
         systemPrompt: null,
-        sessionId: "cli:local",
-        sessionIdExplicit: false,
+        sessionId: null,
+        continueSession: false,
+        newSession: false,
         json: false,
         test: false,
         images: [],
@@ -104,8 +53,19 @@ function parseArgs(argv) {
     let i = 0;
     while (i < args.length) {
         const arg = args[i];
-        if (!arg.startsWith("-") && !result.command) {
-            result.command = arg;
+        if (!arg.startsWith("-")) {
+            if (!result.command) {
+                result.command = arg;
+                // 子命令组:"session" / "workspace" 后所有剩余参数原样收集,
+                // 让子命令自己解析(避免顶层 dash 参数 switch 吞掉 --all 之类)
+                if (arg === "session" || arg === "workspace") {
+                    result.positional.push(...args.slice(i + 1));
+                    break;
+                }
+            }
+            else {
+                result.positional.push(arg);
+            }
             i++;
             continue;
         }
@@ -120,8 +80,15 @@ function parseArgs(argv) {
                 break;
             case "--session-id":
             case "-s":
-                result.sessionId = args[++i] ?? "cli:local";
-                result.sessionIdExplicit = true;
+                result.sessionId = args[++i] ?? null;
+                break;
+            case "--continue":
+            case "-c":
+                result.continueSession = true;
+                break;
+            case "--new":
+            case "-n":
+                result.newSession = true;
                 break;
             case "--json":
                 result.json = true;
@@ -265,33 +232,37 @@ function parseArgs(argv) {
     }
     return result;
 }
-async function initAgent(cfg, logger, confirmMode, thinking, ciMode = false, planMode = 'auto', overrides, onStream, tracerOpts) {
-    return (0, wukong_agent_sdk_1.createAgent)({
-        config: cfg,
-        logger,
-        confirmMode,
-        thinking,
-        ciMode,
-        planMode,
-        overrides,
-        onStream,
-        tracer: tracerOpts,
+async function initAgent(opts) {
+    return createAgent({
+        config: opts.cfg,
+        logger: opts.logger,
+        confirmMode: opts.confirmMode,
+        thinking: opts.thinking,
+        ciMode: opts.ciMode ?? false,
+        planMode: opts.planMode ?? 'auto',
+        overrides: opts.overrides,
+        onStream: opts.onStream,
+        tracer: opts.tracerOpts,
+        shouldAbort: opts.shouldAbort,
+        authorizeTool: opts.authorizeTool,
     });
 }
 async function runAgentCommand(cliArgs) {
-    const logger = new wukong_agent_sdk_1.Logger({ jsonMode: cliArgs.json, level: cliArgs.verbose ? 'debug' : 'info' });
-    (0, wukong_agent_sdk_1.setGlobalLogger)(logger);
-    const cfg = await (0, wukong_agent_sdk_1.loadConfig)();
+    const logger = new Logger({ jsonMode: cliArgs.json, level: cliArgs.verbose ? 'debug' : 'info' });
+    setGlobalLogger(logger);
+    const cfg = await loadConfig();
     applyPermissionOverrides(cfg, cliArgs, logger);
     const resolvedConfirmMode = cliArgs.yes ? 'never' : (cliArgs.confirmMode ?? cfg.tools.confirmMode ?? 'smart');
     const resolvedThinking = resolveThinking(cliArgs, cfg);
     // CI 模式：--yes 或 --json 时自动启用
     const isCiMode = cliArgs.yes || cliArgs.json;
-    // ── CI Session 隔离 ──
-    // CI 模式下，若用户未显式指定 session ID，自动生成唯一 ID 避免并发污染
-    const effectiveSessionId = cliArgs.sessionIdExplicit
-        ? cliArgs.sessionId
-        : (isCiMode ? generateCiSessionId() : cliArgs.sessionId);
+    // ── Session 策略解析 ──
+    // 参见 resolveCliSessionStrategy;CI 模式默认新开+ephemeral,交互默认续接
+    const sessionStrategy = resolveCliSessionStrategy(cliArgs, isCiMode, logger);
+    if (sessionStrategy === null) {
+        // 参数冲突,已经打过日志,直接退出
+        process.exit(EXIT_CODES.CONFIG_ERROR);
+    }
     const isEphemeral = cliArgs.ephemeral || isCiMode;
     // ── 流式输出回调 ──
     // JSON 模式下也使用流式请求（LLM 传输层），只是不输出到 stdout
@@ -327,12 +298,16 @@ async function runAgentCommand(cliArgs) {
                     break;
             }
         };
-    const { llm, contextBuilder, agent, effectiveMaxSteps, resolvedModel } = await initAgent(cfg, logger, resolvedConfirmMode, resolvedThinking, isCiMode, cliArgs.planMode, {
-        maxSteps: cliArgs.maxSteps,
-        contextWindow: cliArgs.contextWindow,
-    }, onStream, { enabled: !cliArgs.noTrace });
-    const sessionManager = new wukong_agent_sdk_1.SessionManager(cfg.sessions.dir);
-    const session = await sessionManager.getOrCreate(effectiveSessionId);
+    const { llm, contextBuilder, agent, effectiveMaxSteps, resolvedModel } = await initAgent({
+        cfg, logger, confirmMode: resolvedConfirmMode, thinking: resolvedThinking, ciMode: isCiMode, planMode: cliArgs.planMode,
+        overrides: { maxSteps: cliArgs.maxSteps, contextWindow: cliArgs.contextWindow },
+        onStream, tracerOpts: { enabled: !cliArgs.noTrace },
+    });
+    const sessionManager = new SessionManager(cfg.sessions.dir);
+    const workspace = resolveWorkspace();
+    const resolved = await sessionManager.resolveSession({ workspace, strategy: sessionStrategy });
+    const session = resolved.session;
+    const sessionUuidShort = resolved.session.ref?.sessionUuid.slice(0, 8) ?? "";
     const userMessage = cliArgs.message;
     if (!userMessage) {
         if (cliArgs.json) {
@@ -340,7 +315,7 @@ async function runAgentCommand(cliArgs) {
                 version: 2,
                 runId: "",
                 status: "error",
-                exitCode: exit_codes_js_1.EXIT_CODES.CONFIG_ERROR,
+                exitCode: EXIT_CODES.CONFIG_ERROR,
                 summary: "缺少 --message 参数",
                 result: { payloads: [] },
             };
@@ -349,10 +324,12 @@ async function runAgentCommand(cliArgs) {
         else {
             logger.error("❌ 缺少 --message 参数。用法: wukong agent --message \"你的消息\"");
         }
-        process.exit(exit_codes_js_1.EXIT_CODES.CONFIG_ERROR);
+        process.exit(EXIT_CODES.CONFIG_ERROR);
     }
     logger.info(`📡 LLM: ${resolvedModel}`);
-    logger.info(`📂 会话: ${effectiveSessionId} (${session.recordCount} 条记录)${isEphemeral ? ' [ephemeral]' : ''}`);
+    logger.info(`📂 会话: ${sessionUuidShort} @ ${workspace.root}` +
+        ` (${session.recordCount} 条记录${resolved.created ? ", 新建" : ""})` +
+        `${isEphemeral ? " [ephemeral]" : ""}`);
     try {
         let userContent;
         if (cliArgs.images.length > 0) {
@@ -373,7 +350,7 @@ async function runAgentCommand(cliArgs) {
         let smartContextText;
         if (!cliArgs.noSmartContext && userMessage) {
             try {
-                const sc = await (0, wukong_agent_sdk_1.collectSmartContext)(userMessage, process.cwd());
+                const sc = await collectSmartContext(userMessage, process.cwd());
                 if (sc.contextText && sc.files.length > 0) {
                     smartContextText = sc.contextText;
                     logger.info(`📂 Smart Context: 注入 ${sc.files.length} 个相关文件摘要 (~${sc.estimatedTokens} token)`);
@@ -390,14 +367,14 @@ async function runAgentCommand(cliArgs) {
             ...result.newMessages,
         ]);
         const allMessages = contextBuilder.build(session, "");
-        await (0, wukong_agent_sdk_1.compactIfNeeded)(session, allMessages, llm, cfg.sessions.compaction);
+        await compactIfNeeded(session, allMessages, llm, cfg.sessions.compaction);
         // ── 自动验证 ──
         let verification;
         const agentVerifyCfg = cfg.agent.verify;
         const shouldVerify = !cliArgs.noVerify && (cliArgs.verify || agentVerifyCfg?.enabled);
         if (shouldVerify && !result.aborted) {
             const verifyConfig = {
-                ...wukong_agent_sdk_1.DEFAULT_VERIFY_CONFIG,
+                ...DEFAULT_VERIFY_CONFIG,
                 ...(agentVerifyCfg ?? {}),
                 enabled: true,
                 // CLI 参数覆盖：验证超时
@@ -405,7 +382,7 @@ async function runAgentCommand(cliArgs) {
                 // CI 模式下默认包含 build 命令
                 includeBuild: isCiMode,
             };
-            const verifier = new wukong_agent_sdk_1.AutoVerifier(verifyConfig, logger);
+            const verifier = new AutoVerifier(verifyConfig, logger);
             verification = await verifier.verifyAndFix(process.cwd(), async (fixPrompt) => {
                 // 让 Agent 执行修复
                 const fixMessages = contextBuilder.build(session, fixPrompt);
@@ -418,7 +395,7 @@ async function runAgentCommand(cliArgs) {
             }, cliArgs.verifyCommand ?? undefined);
         }
         // ── 计算退出码 ──
-        const exitCode = (0, exit_codes_js_1.resolveExitCode)({
+        const exitCode = resolveExitCode({
             aborted: result.aborted,
             steps: result.steps,
             maxSteps: effectiveMaxSteps,
@@ -441,8 +418,8 @@ async function runAgentCommand(cliArgs) {
             const filesModified = extractModifiedFiles(result.trace);
             // 推断 status
             const status = result.aborted ? 'error'
-                : exitCode === exit_codes_js_1.EXIT_CODES.TASK_INCOMPLETE ? 'incomplete'
-                    : exitCode === exit_codes_js_1.EXIT_CODES.VERIFY_FAILED ? 'verify_failed'
+                : exitCode === EXIT_CODES.TASK_INCOMPLETE ? 'incomplete'
+                    : exitCode === EXIT_CODES.VERIFY_FAILED ? 'verify_failed'
                         : 'success';
             const metrics = result.metrics;
             const durationMs = metrics?.durationMs ?? 0;
@@ -451,7 +428,7 @@ async function runAgentCommand(cliArgs) {
                 runId: `run_${Date.now()}`,
                 status,
                 exitCode,
-                summary: (0, summary_js_1.buildJsonSummary)(result.response, {
+                summary: buildJsonSummary(result.response, {
                     steps: result.steps,
                     totalTokens: result.totalTokens.prompt + result.totalTokens.completion,
                 }),
@@ -545,7 +522,7 @@ async function runAgentCommand(cliArgs) {
         if (isEphemeral) {
             try {
                 await session.clear();
-                logger.info(`🗑️  Ephemeral session 已清理: ${effectiveSessionId}`);
+                logger.info(`🗑️  Ephemeral session 已清理: ${sessionUuidShort}`);
             }
             catch {
                 // 清理失败不影响退出码
@@ -559,7 +536,7 @@ async function runAgentCommand(cliArgs) {
                 version: 2,
                 runId: `run_${Date.now()}`,
                 status: "error",
-                exitCode: exit_codes_js_1.EXIT_CODES.LLM_ERROR,
+                exitCode: EXIT_CODES.LLM_ERROR,
                 summary: error instanceof Error ? error.message : String(error),
                 result: { payloads: [] },
             };
@@ -568,7 +545,7 @@ async function runAgentCommand(cliArgs) {
         else {
             logger.error("❌ Agent 执行出错:", error);
         }
-        process.exit(exit_codes_js_1.EXIT_CODES.LLM_ERROR);
+        process.exit(EXIT_CODES.LLM_ERROR);
     }
 }
 /** 从 trace 中提取被修改的文件路径 */
@@ -696,13 +673,67 @@ async function persistWukongConfig(setup, logger) {
         logger.warn(`⚠️  配置写入失败（本次运行仍可继续）: ${String(err)}`);
     }
 }
+/** 输入历史持久化文件路径(~/.wukong/history.jsonl,每行一条) */
+function inputHistoryPath() {
+    return path.join(os.homedir(), '.wukong', 'history.jsonl');
+}
+/**
+ * 读取持久化的输入历史(跨 session 共享)。
+ *
+ * 文件格式:JSONL,每行一个 JSON 字符串(带引号),便于 append。
+ * 失败(文件不存在/解析错误)返回空数组,不阻塞启动。
+ */
+async function loadInputHistory() {
+    const file = inputHistoryPath();
+    let content;
+    try {
+        content = await fs.readFile(file, 'utf8');
+    }
+    catch {
+        return [];
+    }
+    const entries = [];
+    for (const line of content.split('\n')) {
+        const trimmed = line.trim();
+        if (!trimmed)
+            continue;
+        try {
+            const parsed = JSON.parse(trimmed);
+            if (typeof parsed === 'string' && parsed.length > 0) {
+                entries.push(parsed);
+            }
+        }
+        catch {
+            // 损坏行跳过
+        }
+    }
+    // 最多返回最近 1000 条
+    return entries.slice(-1000);
+}
+/**
+ * 追加一条输入历史到持久化文件。
+ * 失败静默(历史持久化不是关键路径)。
+ */
+async function appendInputHistory(entry) {
+    const trimmed = entry.trim();
+    if (!trimmed)
+        return;
+    const file = inputHistoryPath();
+    try {
+        await fs.mkdir(path.dirname(file), { recursive: true });
+        await fs.appendFile(file, JSON.stringify(trimmed) + '\n', { mode: 0o600 });
+    }
+    catch {
+        // 静默失败
+    }
+}
 async function runInteractive(cliArgs) {
-    const logger = new wukong_agent_sdk_1.Logger({ jsonMode: false });
-    (0, wukong_agent_sdk_1.setGlobalLogger)(logger);
+    const logger = new Logger({ jsonMode: false });
+    setGlobalLogger(logger);
     logger.info("🐒 Wukong (悟空) v0.1.0");
     logger.info("========================");
     logger.info("");
-    const cfg = await (0, wukong_agent_sdk_1.loadConfig)();
+    const cfg = await loadConfig();
     applyPermissionOverrides(cfg, cliArgs, logger);
     // ── 未配置模型时：TTY 下进入交互式向导，非 TTY 下打印手动配置指引 ──
     if (!hasConfiguredProvider(cfg)) {
@@ -713,12 +744,12 @@ async function runInteractive(cliArgs) {
             logger.error("     export LLM_BASE_URL=https://api.deepseek.com/v1   # OpenAI 兼容端点");
             logger.error("     export LLM_MODEL=deepseek-chat");
             logger.error("   或编辑 ~/.wukong/wukong.json（详见 README 的「配置」章节）。");
-            process.exit(exit_codes_js_1.EXIT_CODES.CONFIG_ERROR);
+            process.exit(EXIT_CODES.CONFIG_ERROR);
         }
         const setup = await runSetupWizard(logger);
         if (!setup) {
             logger.error("❌ 配置未完成，无法启动。可参考 README 手动配置后重试。");
-            process.exit(exit_codes_js_1.EXIT_CODES.CONFIG_ERROR);
+            process.exit(EXIT_CODES.CONFIG_ERROR);
         }
         await persistWukongConfig(setup, logger);
         // 直接注入内存配置，无需重新加载（避免本地 wukong.json 遮蔽全局配置的边界情况）
@@ -729,7 +760,90 @@ async function runInteractive(cliArgs) {
     }
     const resolvedConfirmMode = cliArgs.yes ? 'never' : (cliArgs.confirmMode ?? cfg.tools.confirmMode ?? 'smart');
     const resolvedThinking = resolveThinking(cliArgs, cfg);
-    // ── 流式输出回调（交互模式） ──
+    const sessionManager = new SessionManager(cfg.sessions.dir);
+    const workspace = resolveWorkspace();
+    // 交互模式不视为 CI(即使被 pipe,交互模式一定不会被 --yes/--json 触发)
+    const interactiveStrategy = resolveCliSessionStrategy(cliArgs, /* isCiMode */ false, logger);
+    if (interactiveStrategy === null) {
+        process.exit(EXIT_CODES.CONFIG_ERROR);
+    }
+    const resolvedInteractive = await sessionManager.resolveSession({
+        workspace,
+        strategy: interactiveStrategy,
+    });
+    const session = resolvedInteractive.session;
+    const sessionUuidShort = resolvedInteractive.session.ref?.sessionUuid.slice(0, 8) ?? "";
+    // ── 判定是否启用 TUI(§3.1 M1 降级矩阵) ──
+    const useTui = shouldUseTuiFromProcess();
+    if (!useTui) {
+        // 降级到 readline(readline 路径装 process SIGINT handler)
+        return runInteractiveReadline(cliArgs, cfg, logger, resolvedConfirmMode, resolvedThinking, session, workspace, sessionUuidShort, resolvedInteractive.created);
+    }
+    // ── TUI 路径(Ink raw mode 拦截 Ctrl+C,不装 process handler,由 TextInput onAbort 触发) ──
+    return runInteractiveTui(cliArgs, cfg, logger, resolvedConfirmMode, resolvedThinking, session, workspace, sessionUuidShort);
+}
+/**
+ * readline 降级路径(原 runInteractive 的实现,保持完全不变)。
+ *
+ * 触发条件(见 shouldUseTui):
+ *   - WUKONG_TUI=off
+ *   - CI=true
+ *   - stdin/stdout 非 TTY
+ *   - TERM=dumb
+ */
+async function runInteractiveReadline(cliArgs, cfg, logger, resolvedConfirmMode, resolvedThinking, session, workspace, sessionUuidShort, sessionCreated) {
+    // §3.3 M3:graceful shutdown(readline 路径装 process SIGINT handler)
+    const abortController = createAbortController({
+        onFirstAbort: () => {
+            process.stderr.write('\n\n⚠️  收到中断信号,正在优雅退出(等当前步骤完成)...\n');
+            process.stderr.write('   再按一次 Ctrl+C 立即退出(session 可能不完整)\n');
+        },
+        onSecondAbort: () => {
+            process.stderr.write('\n\n⏏️  立即退出\n');
+        },
+        installProcessHandler: true,
+    });
+    const shouldAbort = abortController.shouldAbort;
+    // §3.6 M1:工具授权器(readline 路径用简单 question UI)
+    const authorizer = new ToolAuthorizer({
+        workspaceRoot: workspace.root,
+        ciMode: false,
+        uiCallback: async (req) => {
+            return new Promise((resolve) => {
+                const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
+                process.stderr.write(`\n🔒 授权请求: ${req.toolName} (step ${req.step})\n`);
+                process.stderr.write(`   参数: ${req.argumentsJson.slice(0, 200)}\n`);
+                rl.question('[y]仅本次 [s]session [l]本项目 [g]全局 [n]拒绝 [x]永久拒绝: ', (ans) => {
+                    rl.close();
+                    const c = ans.trim().toLowerCase();
+                    switch (c) {
+                        case 's':
+                            resolve({ approved: true, decision: 'session' });
+                            break;
+                        case 'l':
+                            resolve({ approved: true, decision: 'always-local' });
+                            break;
+                        case 'g':
+                            resolve({ approved: true, decision: 'always-global' });
+                            break;
+                        case 'n':
+                            resolve({ approved: false, decision: 'no' });
+                            break;
+                        case 'x':
+                            resolve({ approved: false, decision: 'no-always' });
+                            break;
+                        default:
+                            resolve({ approved: true, decision: 'once' });
+                            break;
+                    }
+                });
+            });
+        },
+    });
+    const authorizeTool = async (req) => {
+        return authorizer.requestAuthorization(req);
+    };
+    // ── 流式输出回调(交互模式 readline 降级) ──
     let interactiveStreamStarted = false;
     const onStream = (event) => {
         switch (event.type) {
@@ -754,23 +868,24 @@ async function runInteractive(cliArgs) {
                 break;
         }
     };
-    const { llm, tools, contextBuilder, agent, resolvedModel } = await initAgent(cfg, logger, resolvedConfirmMode, resolvedThinking, false, cliArgs.planMode, {
-        maxSteps: cliArgs.maxSteps,
-        contextWindow: cliArgs.contextWindow,
-    }, onStream, { enabled: !cliArgs.noTrace });
+    const { llm, tools, contextBuilder, agent, resolvedModel } = await initAgent({
+        cfg, logger, confirmMode: resolvedConfirmMode, thinking: resolvedThinking, planMode: cliArgs.planMode,
+        overrides: { maxSteps: cliArgs.maxSteps, contextWindow: cliArgs.contextWindow },
+        onStream, tracerOpts: { enabled: !cliArgs.noTrace },
+        shouldAbort, authorizeTool,
+    });
     logger.info(`📡 LLM: ${resolvedModel}`);
     logger.info(`🔧 已注册 ${tools.size} 个工具: ${tools.listNames().join(", ")}`);
-    const sessionManager = new wukong_agent_sdk_1.SessionManager(cfg.sessions.dir);
-    const session = await sessionManager.getOrCreate(cliArgs.sessionId);
     logger.info(`📂 会话存储: ${cfg.sessions.dir}`);
+    logger.info(`📂 会话: ${sessionUuidShort} @ ${workspace.root}` +
+        ` (${session.recordCount} 条记录${sessionCreated ? ", 新建" : ""})`);
     logger.info(`📜 历史记录: ${session.recordCount} 条`);
     logger.info("");
     async function sendMessage(input) {
-        // ── Smart Context 收集（交互模式首条消息） ──
         let smartContextText;
         if (!cliArgs.noSmartContext && session.recordCount === 0) {
             try {
-                const sc = await (0, wukong_agent_sdk_1.collectSmartContext)(input, process.cwd());
+                const sc = await collectSmartContext(input, process.cwd());
                 if (sc.contextText && sc.files.length > 0) {
                     smartContextText = sc.contextText;
                     logger.info(`📂 Smart Context: 注入 ${sc.files.length} 个相关文件摘要 (~${sc.estimatedTokens} token)`);
@@ -781,9 +896,8 @@ async function runInteractive(cliArgs) {
             }
         }
         const messages = contextBuilder.build(session, input, undefined, smartContextText);
-        interactiveStreamStarted = false; // 重置流式状态
+        interactiveStreamStarted = false;
         const result = await agent.runWithMessages(messages);
-        // 如果已经流式输出了，不需要再重复打印
         if (!interactiveStreamStarted) {
             logger.info(`\nWukong: ${result.response}`);
         }
@@ -793,8 +907,7 @@ async function runInteractive(cliArgs) {
             ...result.newMessages,
         ]);
         const allMessages = contextBuilder.build(session, "");
-        await (0, wukong_agent_sdk_1.compactIfNeeded)(session, allMessages, llm, cfg.sessions.compaction);
-        return result;
+        await compactIfNeeded(session, allMessages, llm, cfg.sessions.compaction);
     }
     if (cliArgs.test) {
         logger.info("🧪 测试模式：发送一条测试消息...");
@@ -825,6 +938,7 @@ async function runInteractive(cliArgs) {
             if (trimmed.toLowerCase() === "exit") {
                 logger.info("👋 再见！");
                 rl.close();
+                abortController.uninstall();
                 return;
             }
             if (trimmed.toLowerCase() === "clear") {
@@ -844,6 +958,161 @@ async function runInteractive(cliArgs) {
     };
     ask();
 }
+/**
+ * TUI 路径(Ink 渲染)。
+ *
+ * 与 readline 路径的差异:
+ *   - onStream 通过 streamSinkRef 桥接给 App,由 App 渲染流式文本(不走 stdout)
+ *   - sendMessage 返回 CompletedRun,供 App 展示统计信息
+ *   - 输入用 Ink TextInput(多行 + 历史 + Ctrl+R)
+ *
+ * M1 简化:model 用 cfg.agent.defaultModel 作为初始显示值(initAgent 内部的
+ * resolvedModel 通常与之一致;即便不一致也不影响功能,只影响 Header 显示)。
+ * M2 引入 step counter 时会顺便修这个 —— 届时通过 EventBus 的 run_start 事件
+ * 携带真实 model,App 订阅后更新即可。
+ */
+async function runInteractiveTui(cliArgs, cfg, logger, resolvedConfirmMode, resolvedThinking, session, workspace, sessionUuidShort) {
+    // §3.3 M3:graceful shutdown(TUI 路径不装 process handler,Ink raw mode 拦截 Ctrl+C)
+    // TextInput 的 onAbort → requestAbort,实现两次 Ctrl+C 语义
+    const abortController = createAbortController({
+        onFirstAbort: () => {
+            // 提示通过 App 状态显示(不直接写 stderr,避免打乱 Ink 渲染)
+        },
+        onSecondAbort: () => {
+            // 二次直接退出,Ink unmount 由 process.exit 触发
+        },
+        installProcessHandler: false,
+    });
+    const shouldAbort = abortController.shouldAbort;
+    // §3.6 M1:工具授权器(交互模式;CI 模式 runAgentCommand 不创建)
+    const authorizer = new ToolAuthorizer({
+        workspaceRoot: workspace.root,
+        ciMode: false,
+    });
+    const authorizeTool = async (req) => {
+        return authorizer.requestAuthorization(req);
+    };
+    // 读取持久化输入历史(可选,失败不阻塞)
+    const initialHistory = await loadInputHistory().catch(() => []);
+    // agent 引用:sendMessage 通过它跑 agent;init 完成前为 null
+    const agentRef = {
+        llm: null,
+        contextBuilder: null,
+        agent: null,
+    };
+    const handlers = {
+        eventBus: getDefaultEventBus(),
+        clearSession: async () => {
+            await session.clear();
+        },
+        // 与 initAgent 内部逻辑一致(effectiveMaxSteps = overrides?.maxSteps ?? cfg.agent.maxSteps)
+        maxSteps: cliArgs.maxSteps ?? cfg.agent.maxSteps,
+        // §3.3 M3:Ctrl+C 两次语义(TextInput onAbort → requestAbort)
+        requestAbort: abortController.requestAbort,
+        isAbortRequested: abortController.isFirstAbortReceived,
+        // §3.6 M1:工具授权器(App 把 uiCallback 桥接到 PermissionCard)
+        authorizer,
+        sendMessage: async (input) => {
+            if (!agentRef.agent || !agentRef.contextBuilder || !agentRef.llm) {
+                throw new Error('Agent 未初始化');
+            }
+            // 持久化输入历史(异步,不阻塞)
+            void appendInputHistory(input);
+            let smartContextText;
+            if (!cliArgs.noSmartContext && session.recordCount === 0) {
+                try {
+                    const sc = await collectSmartContext(input, process.cwd());
+                    if (sc.contextText && sc.files.length > 0) {
+                        smartContextText = sc.contextText;
+                    }
+                }
+                catch {
+                    // Smart Context 失败不影响主流程
+                }
+            }
+            const messages = agentRef.contextBuilder.build(session, input, undefined, smartContextText);
+            const result = await agentRef.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 durationMs = result.metrics?.durationMs ?? 0;
+            return {
+                response: result.response,
+                steps: result.steps,
+                totalTokens: result.totalTokens,
+                durationMs,
+            };
+        },
+    };
+    // 启动 Ink(App 会立即渲染,但 agent 还没 init;用户输入会被 sendMessage 拦截)
+    const inkHandle = runInk({
+        model: cfg.agent.defaultModel ?? 'unknown',
+        sessionUuidShort,
+        workspaceRoot: workspace.root,
+        handlers,
+        initialHistory,
+    });
+    // init agent,把 Ink 的 onStream 传进去
+    const { llm, contextBuilder, agent } = await initAgent({
+        cfg, logger, confirmMode: resolvedConfirmMode, thinking: resolvedThinking, planMode: cliArgs.planMode,
+        overrides: { maxSteps: cliArgs.maxSteps, contextWindow: cliArgs.contextWindow },
+        onStream: inkHandle.onStream, tracerOpts: { enabled: !cliArgs.noTrace },
+        shouldAbort, authorizeTool,
+    });
+    agentRef.llm = llm;
+    agentRef.contextBuilder = contextBuilder;
+    agentRef.agent = agent;
+    // test 模式:发一条消息验证后退出
+    if (cliArgs.test) {
+        try {
+            await handlers.sendMessage('请列出当前目录下有哪些文件和文件夹。');
+            process.stderr.write("\n✅ 测试通过，AI 对话正常！\n");
+            inkHandle.unmount();
+            process.exit(0);
+        }
+        catch (error) {
+            process.stderr.write(`\n❌ 测试失败: ${String(error)}\n`);
+            inkHandle.unmount();
+            process.exit(1);
+        }
+    }
+}
+/**
+ * 把 CLI 参数(--session-id / --continue / --new)与运行模式(CI/交互)综合起来,
+ * 得到 SessionManager.resolveSession() 需要的 strategy 对象。
+ *
+ * 三种 session 参数互斥,冲突时返回 null,调用方应以 CONFIG_ERROR 退出。
+ *
+ * 决策规则:
+ *   显式参数(--session-id / --continue / --new)      → 按参数
+ *   无显式参数 + CI 模式                              → new(不复用旧 session)
+ *   无显式参数 + 交互模式                             → continue(自动续接 latest)
+ *
+ * @returns 解析出的 strategy;若参数冲突返回 null(已通过 logger 报错)
+ */
+function resolveCliSessionStrategy(cliArgs, isCiMode, logger) {
+    const flags = [
+        cliArgs.sessionId != null,
+        cliArgs.continueSession,
+        cliArgs.newSession,
+    ].filter(Boolean).length;
+    if (flags > 1) {
+        logger.error("❌ --session-id / --continue / --new 三者互斥,只能指定其中一个");
+        return null;
+    }
+    if (cliArgs.sessionId != null) {
+        return { kind: "specific", sessionUuid: cliArgs.sessionId };
+    }
+    if (cliArgs.continueSession)
+        return { kind: "continue" };
+    if (cliArgs.newSession)
+        return { kind: "new" };
+    // 无显式参数:CI 默认新开,交互默认续接
+    return isCiMode ? { kind: "new" } : { kind: "continue" };
+}
 /**
  * 应用 CLI 权限参数到 cfg（覆盖 cfg.tools.profile/allow/deny）
  *
@@ -882,24 +1151,53 @@ function resolveThinking(cliArgs, cfg) {
 }
 async function main() {
     const cliArgs = parseArgs(process.argv);
+    // 把 --yes / --json 反射到 env,让 SDK 层的 config loader 也能识别
+    // CI 模式(§1.3)。参见 core 里 isCiMode()。
+    if (cliArgs.yes)
+        process.env.WUKONG_YES = "1";
+    if (cliArgs.json)
+        process.env.WUKONG_JSON = "1";
     // 优先处理 --help 和 --version
     if (cliArgs.help) {
-        process.stdout.write(help_js_1.HELP_TEXT + '\n');
+        process.stdout.write(HELP_TEXT + '\n');
         process.exit(0);
     }
     if (cliArgs.version) {
-        process.stdout.write((0, help_js_1.formatVersion)() + '\n');
+        process.stdout.write(formatVersion() + '\n');
         process.exit(0);
     }
     switch (cliArgs.command) {
         case "agent":
             await runAgentCommand(cliArgs);
             break;
+        case "session":
+            await runSessionSubcommand(cliArgs);
+            break;
+        case "workspace":
+            await runWorkspaceSubcommand(cliArgs);
+            break;
         default:
             await runInteractive(cliArgs);
             break;
     }
 }
+async function runSessionSubcommand(cliArgs) {
+    const logger = new Logger({ jsonMode: false });
+    setGlobalLogger(logger);
+    const cfg = await loadConfig();
+    const manager = new SessionManager(cfg.sessions.dir);
+    const workspace = resolveWorkspace();
+    const code = await runSessionCommand({ manager, workspace, args: cliArgs.positional });
+    process.exit(code);
+}
+async function runWorkspaceSubcommand(cliArgs) {
+    const logger = new Logger({ jsonMode: false });
+    setGlobalLogger(logger);
+    const cfg = await loadConfig();
+    const manager = new SessionManager(cfg.sessions.dir);
+    const code = await runWorkspaceCommand({ manager, args: cliArgs.positional });
+    process.exit(code);
+}
 main().catch((err) => {
     process.stderr.write(String(err) + '\n');
     process.exit(1);