@co0ontty/wand 4.80.0 → 4.80.1-beta.g1fbbefb

package/dist/git-quick-commit.js

@@ -1,8 +1,7 @@
 import { existsSync } from "node:fs";
 import { spawn } from "node:child_process";
-import { ClaudeRunError, runClaudePrint } from "./claude-sdk-runner.js";
-import { callSystemAiTextWithFallback } from "./system-ai.js";
 import { buildChildEnv } from "./env-utils.js";
+import { buildLanguageDirective } from "./language-prompt.js";
 import { isSessionProvider, providerCliInstalled } from "./session-provider.js";
 import { runGitAsync as runGitAsyncBase, runGitRawAsync as runGitRawAsyncBase, getGitErrorMessage, } from "./git-utils.js";
 import { composeSystemFallback, systemPromptFlag, thinkingEffortToClaudeCliEffort, thinkingEffortToCodexReasoningEffort, thinkingEffortToGrokEffort, thinkingEffortToOpenCodeVariant, thinkingEffortToQoderEffort, thinkingEffortToPiLevel, } from "./structured-provider-common.js";
@@ -17,10 +16,6 @@ const MAX_FILE_ENTRIES = 200;
 // 30s 在 API 抖动时不够用，放宽到 60s。
 const CLAUDE_MESSAGE_TIMEOUT_MS = 60_000;
 const CODEX_MESSAGE_TIMEOUT_MS = 60_000;
-// API mode can contain several profiles. Keep each probe bounded so the whole
-// chain can still reach the current-session CLI before native clients' 180s
-// request deadline.
-const DIRECT_API_PROFILE_TIMEOUT_MS = 20_000;
 const QUICK_COMMIT_CLI_TIMEOUT_MS = 120_000;
 const MAX_DIFF_FOR_AI = 100_000;
 // 迭代提示词模式下只给文件清单做核对，不需要完整 diff：单次上限比 diff 小一个量级。
@@ -283,31 +278,37 @@ export class QuickCommitError extends Error {
     }
 }
 // ── AI commit message generation ──
+/**
+ * 一次性 Claude 文本生成（commit message / tag / 提示词优化…）。
+ *
+ * 直接 spawn 本机 `claude -p`，与 PTY / 结构化会话同源：认证、模型、`~/.claude`
+ * 配置完全一致。对齐原来 SDK 时代的行为：
+ *   - `--tools ""` 关掉全部工具：纯文本生成不需要工具，也避免一次性短调用顺手读文件；
+ *   - `--no-session-persistence`：不污染 `~/.claude/projects/` 的会话历史；
+ *   - `--strict-mcp-config`（不给 --mcp-config）：跳过用户配置的 MCP，省启动时间与 token。
+ * 语言指令与任务规则都走 `--append-system-prompt`，任务自己的输出格式排在后面。
+ */
 async function callClaudeText(request, cwd, language, opts) {
-    try {
-        const effort = thinkingEffortToClaudeCliEffort(opts.thinkingEffort ?? "off");
-        return await runClaudePrint(request.prompt, {
-            cwd,
-            timeoutMs: CLAUDE_MESSAGE_TIMEOUT_MS,
-            language,
-            systemInstructions: request.system,
-            model: opts.model ?? undefined,
-            ...(effort ? { effort } : {}),
-        });
-    }
-    catch (error) {
-        if (error instanceof ClaudeRunError) {
-            // 把通用 ClaudeRunError 翻译成 quick-commit 自己的错误码 + 中文话术。
-            if (error.code === "CLAUDE_TIMEOUT") {
-                throw new QuickCommitError("Claude 生成超时，请手动填写 commit message。", "CLAUDE_TIMEOUT");
-            }
-            if (error.code === "CLAUDE_EMPTY_RESULT") {
-                throw new QuickCommitError("Claude 返回了空的 commit message。", "EMPTY_AI_MESSAGE");
-            }
-            throw new QuickCommitError(error.message, error.code);
-        }
-        throw error;
-    }
+    const args = ["-p", "--output-format", "text", "--tools", "", "--no-session-persistence", "--strict-mcp-config"];
+    const languageDirective = language ? buildLanguageDirective(language) : "";
+    const systemPrompt = [languageDirective, (request.system ?? "").trim()].filter(Boolean).join("\n\n");
+    if (systemPrompt)
+        args.push("--append-system-prompt", systemPrompt);
+    const model = opts.model?.trim();
+    if (model && model !== "default")
+        args.push("--model", model);
+    const effort = thinkingEffortToClaudeCliEffort(opts.thinkingEffort ?? "off");
+    if (effort)
+        args.push("--effort", effort);
+    const stdout = await runCliText("claude", args, request.prompt, {
+        cwd,
+        timeoutMs: CLAUDE_MESSAGE_TIMEOUT_MS,
+        inheritEnv: opts.inheritEnv,
+    });
+    const text = stdout.trim();
+    if (!text)
+        throw new QuickCommitError("Claude 返回了空的 commit message。", "EMPTY_AI_MESSAGE");
+    return text;
 }
 function stripFences(raw) {
     return raw.trim().replace(/^```(?:json)?\s*/i, "").replace(/\s*```$/i, "").trim();
@@ -657,17 +658,6 @@ async function callCliAiText(request, cwd, language, opts) {
         return callGeminiText(request, cwd, opts);
     return callClaudeText(request, cwd, language, opts);
 }
-async function callDirectApiText(request, systemAi) {
-    const text = await callSystemAiTextWithFallback(request, systemAi, DIRECT_API_PROFILE_TIMEOUT_MS);
-    if (!text.trim()) {
-        throw new QuickCommitError("直连 API 返回了空结果。", "EMPTY_AI_MESSAGE");
-    }
-    return text;
-}
-function aiFallbackFailed(primary, primaryError, fallbackError) {
-    const fallback = primary === "直连 API" ? "CLI" : "直连 API";
-    return new QuickCommitError(`${primary} 与 ${fallback} 均失败：${getGitErrorMessage(primaryError)}；${getGitErrorMessage(fallbackError)}`, "AI_FALLBACK_FAILED");
-}
 /**
  * 多候选降级时给整条链的时间上限。原生客户端的请求宽限约 180s，
  * 候选再多也不能把整个请求拖死；单次仍受各自 CLI 超时保护。
@@ -729,28 +719,11 @@ async function callCliCandidates(request, cwd, language, opts) {
     throw new QuickCommitError(`所有 CLI 候选均失败：${errors.join("；")}`, "AI_FALLBACK_FAILED");
 }
 /**
- * Run a lightweight AI request through the selected Commit source. API mode
- * exhausts its profile chain and then falls back once to the system employee's
- * CLI chain. CLI mode walks that chain in order.
+ * Run a lightweight AI request through the system employee's CLI chain.
+ * 所有 Wand 自有文本调用都走本机已安装的 CLI，没有任何直连 API 分支。
  */
 export async function callConfiguredAiText(request, cwd, language, opts) {
-    const effective = withOpsPersona(request, opts.opsPersona);
-    if (opts.systemAi?.enabled) {
-        try {
-            return await callDirectApiText(effective, opts.systemAi);
-        }
-        catch (apiError) {
-            try {
-                // The user selected the direct API first. If it is unavailable or
-                // empty, retry this exact request through their selected CLI chain.
-                return await callCliCandidates(effective, cwd, language, opts);
-            }
-            catch (cliError) {
-                throw aiFallbackFailed("直连 API", apiError, cliError);
-            }
-        }
-    }
-    return callCliCandidates(effective, cwd, language, opts);
+    return callCliCandidates(withOpsPersona(request, opts.opsPersona), cwd, language, opts);
 }
 /** Read the unstaged + staged tree without touching the index. */
 async function collectWorkingTreeDiff(cwd) {
@@ -1037,13 +1010,7 @@ export async function runTagHead(opts) {
         catch {
             headSubject = "";
         }
-        tagName = await generateTagAfterCommit(cwd, language, headSubject || "", {
-            provider: opts.provider,
-            model: opts.model,
-            thinkingEffort: opts.thinkingEffort,
-            inheritEnv: opts.inheritEnv,
-            systemAi: opts.systemAi,
-        });
+        tagName = await generateTagAfterCommit(cwd, language, headSubject || "", opts);
     }
     if (!tagName) {
         throw new QuickCommitError("请填写 tag 名称，或开启 AI 生成。", "EMPTY_TAG");
@@ -1507,13 +1474,9 @@ export async function runQuickCommitWithFallback(opts) {
 }
 export async function runQuickCommit(opts) {
     const { cwd, language, autoMessage, customMessage, tag, autoTag, push, submodule } = opts;
-    const ai = {
-        provider: opts.provider,
-        model: opts.model,
-        thinkingEffort: opts.thinkingEffort,
-        inheritEnv: opts.inheritEnv,
-        systemAi: opts.systemAi,
-    };
+    // QuickCommitOptions 本身带全套 AI 字段（模型、系统运维人设、候选链）：
+    // 逐字段抄一份会静默丢掉新增字段，直接复用同一个对象。
+    const ai = opts;
     await assertGitWorkTreeAsync(cwd);
     // 先 add 一次让我们能在 collectStagedDiff 看到完整改动（包含 submodule 指针），
     // AI 生成 message 时也基于这个 staged diff。

package/dist/language-prompt.d.ts

@@ -1,6 +1,6 @@
 /**
  * 强语言指令生成器：供 PTY runner、structured-session-manager（CLI + SDK 两个分支）、
- * 一次性 SDK 调用（claude-sdk-runner.ts）共用。
+ * 会话与一次性 CLI 调用（git-quick-commit 等）共用。
  *
  * 原本各 runner 散落写 "请使用中文回复" 这种软指令，Claude 写技术内容时还是会条件
  * 反射切英文（"Now let me ..."、"OK, ..."），用户设置中文也照样夹英文。

package/dist/language-prompt.js

@@ -1,6 +1,6 @@
 /**
  * 强语言指令生成器：供 PTY runner、structured-session-manager（CLI + SDK 两个分支）、
- * 一次性 SDK 调用（claude-sdk-runner.ts）共用。
+ * 会话与一次性 CLI 调用（git-quick-commit 等）共用。
  *
  * 原本各 runner 散落写 "请使用中文回复" 这种软指令，Claude 写技术内容时还是会条件
  * 反射切英文（"Now let me ..."、"OK, ..."），用户设置中文也照样夹英文。

package/dist/native-session-title.d.ts

@@ -0,0 +1,17 @@
+import type { SessionProvider } from "./types.js";
+/** 各 provider 状态根目录，测试可整体替换。 */
+export interface NativeTitleHomes {
+    codexHome?: string;
+    qoderProjectsDirs?: string[];
+    openCodeDatabasePath?: string;
+    grokSessionsDir?: string;
+}
+/**
+ * provider 自己在运行期写下的会话标题：
+ * codex `session_index.jsonl` 的 thread_name、qoder 转录里的 ai-title、
+ * OpenCode SQLite 的 session.title、grok `summary.json` 的 generated_title。
+ * Claude / Pi / Gemini 没有这个入口，返回空串让调用方回退系统硅基员工。
+ */
+export declare function readNativeSessionTitle(provider: SessionProvider, providerSessionId: string | null | undefined, cwd: string, homes?: NativeTitleHomes): Promise<string>;
+/** 只用于测试与降级：清掉按文件指纹缓存的原生标题。 */
+export declare function clearNativeSessionTitleCache(): void;

package/dist/native-session-title.js

@@ -0,0 +1,257 @@
+import { existsSync, openSync, readSync, closeSync, readdirSync, statSync } from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { DatabaseSync } from "node:sqlite";
+import { isPlausibleTaskTitle } from "./task-title.js";
+const SESSION_ID_PATTERN = /^[a-z0-9][a-z0-9._:-]{0,199}$/i;
+const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+const READ_CAP_BYTES = 2 * 1024 * 1024;
+const GROK_WALK_LIMIT = 4_000;
+/**
+ * provider 自己在运行期写下的会话标题：
+ * codex `session_index.jsonl` 的 thread_name、qoder 转录里的 ai-title、
+ * OpenCode SQLite 的 session.title、grok `summary.json` 的 generated_title。
+ * Claude / Pi / Gemini 没有这个入口，返回空串让调用方回退系统硅基员工。
+ */
+export async function readNativeSessionTitle(provider, providerSessionId, cwd, homes = {}) {
+    const id = providerSessionId?.trim() ?? "";
+    if (!id || !SESSION_ID_PATTERN.test(id))
+        return "";
+    switch (provider) {
+        case "codex":
+            return readCodexNativeTitle(id, homes.codexHome);
+        case "qoder":
+            return readQoderNativeTitle(id, homes.qoderProjectsDirs);
+        case "opencode":
+            return readOpenCodeNativeTitle(id, homes.openCodeDatabasePath);
+        case "grok":
+            return readGrokNativeTitle(id, cwd, homes.grokSessionsDir);
+        default:
+            return "";
+    }
+}
+function acceptNativeTitle(value) {
+    if (typeof value !== "string")
+        return "";
+    const title = value.replace(/\s+/g, " ").trim();
+    return title && isPlausibleTaskTitle(title) ? title : "";
+}
+function readTail(filePath, maxBytes) {
+    let fd = null;
+    try {
+        const stats = statSync(filePath);
+        const length = Math.min(maxBytes, Math.max(0, stats.size));
+        const buffer = Buffer.alloc(length);
+        fd = openSync(filePath, "r");
+        const readAt = stats.size - length;
+        const bytesRead = readSync(fd, buffer, 0, length, readAt);
+        return buffer.toString("utf8", 0, bytesRead);
+    }
+    catch {
+        return "";
+    }
+    finally {
+        if (fd !== null) {
+            try {
+                closeSync(fd);
+            }
+            catch { /* 只读兜底 */ }
+        }
+    }
+}
+function readHead(filePath, maxBytes) {
+    let fd = null;
+    try {
+        const stats = statSync(filePath);
+        fd = openSync(filePath, "r");
+        const buffer = Buffer.alloc(Math.min(maxBytes, Math.max(1, stats.size)));
+        const bytesRead = readSync(fd, buffer, 0, buffer.length, 0);
+        return buffer.toString("utf8", 0, bytesRead);
+    }
+    catch {
+        return "";
+    }
+    finally {
+        if (fd !== null) {
+            try {
+                closeSync(fd);
+            }
+            catch { /* 只读兜底 */ }
+        }
+    }
+}
+const nativeTitleCache = new Map();
+function fingerprint(filePath) {
+    try {
+        const stats = statSync(filePath);
+        return `${stats.mtimeMs}:${stats.size}`;
+    }
+    catch {
+        return "missing";
+    }
+}
+/** 同一会话在同一次生成里会被反复问到（标题、快捷提交、resume），按文件指纹缓存。 */
+function cachedTitle(cacheKey, sourcePath, read) {
+    const key = `${cacheKey}|${sourcePath}`;
+    const stamp = fingerprint(sourcePath);
+    const hit = nativeTitleCache.get(key);
+    if (hit && hit.key === stamp)
+        return hit.title;
+    const title = read();
+    if (nativeTitleCache.size > 512)
+        nativeTitleCache.clear();
+    nativeTitleCache.set(key, { key: stamp, title });
+    return title;
+}
+function readCodexNativeTitle(threadId, codexHome) {
+    if (!UUID_PATTERN.test(threadId))
+        return "";
+    const index = path.join(codexHome ?? path.join(os.homedir(), ".codex"), "session_index.jsonl");
+    if (!existsSync(index))
+        return "";
+    return cachedTitle(`codex:${threadId}`, index, () => {
+        let title = "";
+        for (const line of readTail(index, READ_CAP_BYTES).split("\n")) {
+            if (!line.includes(threadId))
+                continue;
+            try {
+                const parsed = JSON.parse(line);
+                if (parsed.id === threadId)
+                    title = acceptNativeTitle(parsed.thread_name);
+            }
+            catch {
+                continue;
+            }
+        }
+        return title;
+    });
+}
+function readQoderNativeTitle(sessionId, projectsDirs) {
+    const dirs = projectsDirs ?? [
+        path.join(os.homedir(), ".qoder", "projects"),
+        path.join(os.homedir(), ".qoder-cn", "projects"),
+    ];
+    for (const projectsDir of dirs) {
+        let projects;
+        try {
+            projects = readdirSync(projectsDir);
+        }
+        catch {
+            continue;
+        }
+        for (const project of projects) {
+            const transcript = path.join(projectsDir, project, `${sessionId}.jsonl`);
+            if (!existsSync(transcript))
+                continue;
+            const title = cachedTitle(`qoder:${sessionId}`, transcript, () => {
+                let found = "";
+                for (const line of readHead(transcript, READ_CAP_BYTES).split("\n")) {
+                    if (!line.includes('"ai-title"'))
+                        continue;
+                    try {
+                        const parsed = JSON.parse(line);
+                        if (parsed.type === "ai-title")
+                            found = acceptNativeTitle(parsed.aiTitle);
+                    }
+                    catch {
+                        continue;
+                    }
+                }
+                return found;
+            });
+            if (title)
+                return title;
+        }
+    }
+    return "";
+}
+/** OpenCode 未命名会话的占位标题不能当原生标题用。 */
+const OPENCODE_PLACEHOLDER_TITLE = /^(?:new session|untitled session)\b/i;
+function readOpenCodeNativeTitle(sessionId, databasePath) {
+    const dbPath = databasePath ?? path.join(process.env.XDG_DATA_HOME?.trim() || path.join(os.homedir(), ".local", "share"), "opencode", "opencode.db");
+    if (!existsSync(dbPath))
+        return "";
+    return cachedTitle(`opencode:${sessionId}`, dbPath, () => {
+        let database = null;
+        try {
+            database = new DatabaseSync(dbPath, { readOnly: true });
+            const row = database.prepare("SELECT title FROM session WHERE id = ?").get(sessionId);
+            const title = acceptNativeTitle(row?.title);
+            return title && !OPENCODE_PLACEHOLDER_TITLE.test(title) ? title : "";
+        }
+        catch {
+            return "";
+        }
+        finally {
+            try {
+                database?.close();
+            }
+            catch { /* 只读探测 */ }
+        }
+    });
+}
+function grokSessionDirs(grokSessionsDir, cwd) {
+    const encoded = encodeURIComponent(cwd);
+    const primary = path.join(grokSessionsDir, encoded);
+    if (existsSync(primary))
+        return [primary];
+    const visited = [];
+    let queue = [{ dir: grokSessionsDir, depth: 0 }];
+    while (queue.length > 0 && visited.length < GROK_WALK_LIMIT) {
+        const next = [];
+        for (const item of queue) {
+            let entries;
+            try {
+                entries = readdirSync(item.dir);
+            }
+            catch {
+                continue;
+            }
+            for (const entry of entries) {
+                const full = path.join(item.dir, entry);
+                let stats;
+                try {
+                    stats = statSync(full);
+                }
+                catch {
+                    continue;
+                }
+                if (!stats.isDirectory())
+                    continue;
+                visited.push(full);
+                if (item.depth < 2)
+                    next.push({ dir: full, depth: item.depth + 1 });
+            }
+        }
+        queue = next;
+    }
+    return visited;
+}
+function readGrokNativeTitle(sessionId, cwd, grokSessionsDir) {
+    if (!UUID_PATTERN.test(sessionId))
+        return "";
+    const root = grokSessionsDir ?? path.join(os.homedir(), ".grok", "sessions");
+    if (!existsSync(root))
+        return "";
+    for (const dir of grokSessionDirs(root, cwd)) {
+        const summary = path.join(dir, sessionId, "summary.json");
+        if (!existsSync(summary))
+            continue;
+        const title = cachedTitle(`grok:${sessionId}`, summary, () => {
+            try {
+                const parsed = JSON.parse(readHead(summary, 65_536));
+                return acceptNativeTitle(parsed.generated_title);
+            }
+            catch {
+                return "";
+            }
+        });
+        if (title)
+            return title;
+    }
+    return "";
+}
+/** 只用于测试与降级：清掉按文件指纹缓存的原生标题。 */
+export function clearNativeSessionTitleCache() {
+    nativeTitleCache.clear();
+}

package/dist/process-manager.d.ts

@@ -37,6 +37,7 @@ export declare class ProcessManager extends EventEmitter {
     /** 启动时被识别为孤儿 PTY 并标记为 exited 的旧会话数（旧服务器进程已死） */
     private orphanRecoveredCount;
     private readonly topicCoordinator;
+    private readonly nativeTitles;
     private disposed;
     private readonly terminalHost;
     constructor(config: WandConfig, storage: WandStorage, configDir?: string, terminalHost?: TerminalHost);
@@ -145,6 +146,8 @@ export declare class ProcessManager extends EventEmitter {
      */
     setWorktreeMergeState(id: string, status: SessionSnapshot["worktreeMergeStatus"], info: SessionSnapshot["worktreeMergeInfo"]): SessionSnapshot | null;
     private maybeGenerateSessionTopic;
+    /** 原生标题优先于模型标题：只受「不能是任务名/目录名」约束，命中且变化时才落库。 */
+    private applyNativeSessionTitle;
     private defaultAutonomyPolicy;
     resolveEscalation(id: string, requestId: string, resolution?: PermissionResolution): SessionSnapshot;
     approvePermission(id: string): SessionSnapshot;

package/dist/process-manager.js

@@ -14,11 +14,12 @@ import { buildLanguageDirective, buildManagedAutonomyDirective } from "./languag
 import { prepareSessionWorktree } from "./git-worktree.js";
 import { getProviderCommandSessionId, getProviderResumeCommandSessionId } from "./resume-policy.js";
 import { commandWithSystemPrompt, composeSystemFallback, normalizeThinkingEffort, systemPromptFlag, thinkingEffortToClaudeCliEffort, thinkingEffortToClaudeSlashEffort, thinkingEffortToCodexReasoningEffort, thinkingEffortToGrokEffort, thinkingEffortToPiLevel, thinkingEffortToQoderEffort } from "./structured-provider-common.js";
-import { consumePtyInputForTopic, createPtyTopicLineBuffer, provisionalSessionTopic, SessionTopicCoordinator, sessionTopicBlocklistForSnapshot, shouldAcceptGeneratedSessionTitle, shouldGenerateSessionTopicFromInput, } from "./session-topic.js";
+import { consumePtyInputForTopic, createPtyTopicLineBuffer, provisionalSessionTopic, SessionNativeTitleTracker, SessionTopicCoordinator, sessionTopicBlocklistForSnapshot, shouldAcceptGeneratedSessionTitle, shouldGenerateSessionTopicFromInput, } from "./session-topic.js";
+import { readNativeSessionTitle } from "./native-session-title.js";
 import { getErrorMessage } from "./error-utils.js";
 import { recordIterationPrompt } from "./iteration-log.js";
 import { describePtySpawnFailure } from "./ensure-node-pty-helper.js";
-import { resolveSystemAiContext } from "./session-ai-context.js";
+import { resolveSessionProvider, resolveSystemAiContext } from "./session-ai-context.js";
 import { resolveSessionCwd } from "./session-cwd.js";
 import { inferProviderFromCommand } from "./session-provider.js";
 import { PtyTerminalState } from "./pty-terminal-state.js";
@@ -547,6 +548,7 @@ export class ProcessManager extends EventEmitter {
     /** 启动时被识别为孤儿 PTY 并标记为 exited 的旧会话数（旧服务器进程已死） */
     orphanRecoveredCount = 0;
     topicCoordinator = new SessionTopicCoordinator();
+    nativeTitles = new SessionNativeTitleTracker();
     disposed = false;
     terminalHost;
     constructor(config, storage, configDir, terminalHost) {
@@ -930,6 +932,7 @@ export class ProcessManager extends EventEmitter {
             }
         }
         this.topicCoordinator.clear();
+        this.nativeTitles.clear();
         this.removeAllListeners("process");
         this.logger.dispose();
         this.terminalHost.disconnect();
@@ -2015,8 +2018,11 @@ export class ProcessManager extends EventEmitter {
         // 迭代提示词记录：和会话标题共用同一套「有没有信息量」判断，用户不用多做一步。
         recordIterationPrompt(this.storage, record, prompt, "session");
         const blockedTitles = sessionTopicBlocklistForSnapshot(record, this.storage);
+        // CLI 自己起了名字就归它，模型标题与输入首行都不再覆盖；取不到原生标题才走系统硅基员工。
+        const hasNativeTitle = this.nativeTitles.has(id);
         const provisional = provisionalSessionTopic(prompt, blockedTitles);
         if (provisional
+            && !hasNativeTitle
             && shouldGenerateSessionTopicFromInput(prompt)
             && (record.title !== provisional.title || record.description !== provisional.description)) {
             this.setSessionTopic(id, provisional.title, provisional.description);
@@ -2027,12 +2033,22 @@ export class ProcessManager extends EventEmitter {
             cwd: record.cwd,
             language: this.config.language,
             ai: resolveSystemAiContext(record, this.config, this.storage.getSystemSiliconEmployee()),
+            readNativeTitle: () => readNativeSessionTitle(resolveSessionProvider(record), record.claudeSessionId, record.cwd),
+            hasNativeTitle,
             onGenerating: (generating) => {
                 if (!this.disposed)
                     this.setSessionTopicGenerating(id, generating);
             },
-            onTopic: ({ title, description }) => {
-                if (!this.disposed && this.sessions.has(id) && shouldAcceptGeneratedSessionTitle(title, blockedTitles)) {
+            onTopic: ({ title, description, source }) => {
+                if (this.disposed || !this.sessions.has(id))
+                    return;
+                if (source === "native") {
+                    this.applyNativeSessionTitle(id, title, blockedTitles);
+                    return;
+                }
+                if (this.nativeTitles.has(id))
+                    return;
+                if (shouldAcceptGeneratedSessionTitle(title, blockedTitles)) {
                     this.setSessionTopic(id, title, description);
                 }
             },
@@ -2041,6 +2057,16 @@ export class ProcessManager extends EventEmitter {
             },
         });
     }
+    /** 原生标题优先于模型标题：只受「不能是任务名/目录名」约束，命中且变化时才落库。 */
+    applyNativeSessionTitle(id, title, blockedTitles) {
+        this.nativeTitles.record(id, title);
+        const current = this.sessions.get(id);
+        if (!current || !shouldAcceptGeneratedSessionTitle(title, blockedTitles))
+            return;
+        if (current.title === title && current.description === title)
+            return;
+        this.setSessionTopic(id, title, title);
+    }
     defaultAutonomyPolicy(mode) {
         if (mode === "agent" || mode === "agent-max" || mode === "managed" || mode === "native" || mode === "full-access") {
             return "agent";
@@ -2288,8 +2314,10 @@ export class ProcessManager extends EventEmitter {
             case "output.chat": {
                 record.output = record.ptyBridge?.getRawOutput() ?? record.output;
                 const rawMessages = record.ptyBridge?.getMessages() ?? [];
-                const isStreaming = record.status === "running";
                 const bridgeData = event.data;
+                const sequenceChanged = record.ptyChatMessageCount !== rawMessages.length;
+                const isStreaming = record.status === "running" && bridgeData?.isResponding === true;
+                record.ptyChatMessageCount = rawMessages.length;
                 // 每轮忙碌信号：turn 开始置 true，回复结束清 false。只在翻转时广播，
                 // 避免流式期间每个 chunk 都发 status 事件。
                 const responding = bridgeData?.isResponding === true;
@@ -2310,7 +2338,10 @@ export class ProcessManager extends EventEmitter {
                 if (bridgeData && typeof bridgeData.isResponding === "boolean") {
                     data.isResponding = bridgeData.isResponding;
                 }
-                if (isStreaming && rawMessages.length > 0) {
+                // A new round can append user + assistant at once. Last-only payloads
+                // cannot establish that sequence for any of the existing clients.
+                // Idle is a turn boundary even when the shell process remains running.
+                if (isStreaming && !sequenceChanged && rawMessages.length > 0) {
                     data.incremental = true;
                     const lastTurn = rawMessages[rawMessages.length - 1];
                     const truncatedLast = truncateMessagesForTransport([lastTurn], this.config.cardDefaults ?? {}, 0);

package/dist/server-session-routes.js

@@ -5,7 +5,7 @@ import { alignedBlockStart, blockWindowMessagesForTransport, sliceTurnBlocksForT
 import { toSessionDetailDTO, toSessionListItemDTO } from "./session-transport.js";
 import { checkSessionWorktreeMergeabilityAsync, cleanupSessionWorktreeAsync, getWorktreeMergeErrorCode, mergeSessionWorktreeAsync, WorktreeMergeError, } from "./git-worktree.js";
 import { resolveSessionCwd } from "./session-cwd.js";
-import { resolveCommitAiContext } from "./session-ai-context.js";
+import { resolveSystemAiContext } from "./session-ai-context.js";
 import { getGitStatusAsync, QuickCommitError, runQuickCommitWithFallback, runTagHead, runPush, generateCommitMessageOnly, } from "./git-quick-commit.js";
 import { getErrorMessage } from "./error-utils.js";
 import { archiveCommitTasks } from "./commit-task-archive.js";
@@ -111,24 +111,6 @@ function getInputErrorResponse(error, sessionId) {
         },
     };
 }
-function parseClaudeSdkSkills(value) {
-    if (!Array.isArray(value)) {
-        throw new Error("skills 必须是数组。");
-    }
-    if (value.length > 50) {
-        throw new Error("最多选择 50 个 skills。");
-    }
-    const names = new Set();
-    for (const item of value) {
-        if (typeof item !== "string")
-            throw new Error("skills 只能包含字符串。");
-        const name = item.trim();
-        if (!name || name.length > 128)
-            throw new Error("skill 名称无效。");
-        names.add(name);
-    }
-    return Array.from(names);
-}
 function getInputDebugMeta(error) {
     if (error instanceof Error) {
         return { name: error.name, message: error.message, stack: error.stack };
@@ -630,17 +612,10 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 res.status(404).json({ error: "未找到该结构化会话。" });
                 return;
             }
-            const hasSkills = Object.prototype.hasOwnProperty.call(req.body ?? {}, "skills");
-            if (hasSkills && (session.provider !== "claude" || session.runner !== "claude-sdk")) {
-                res.status(400).json({ error: "skills 仅支持 Claude SDK 结构化会话。" });
-                return;
-            }
-            const skills = hasSkills ? parseClaudeSdkSkills(req.body.skills) : [];
             const snapshot = await structured.sendMessage(req.params.id, input, {
                 interrupt,
                 preserveQueue,
                 idempotencyKey,
-                skills,
             });
             res.json(sessionResponseDTO(snapshot));
         }
@@ -887,7 +862,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         }
         const body = (req.body ?? {});
         try {
-            const ai = resolveCommitAiContext(snapshot, config, undefined, storage.getSystemSiliconEmployee());
+            const ai = resolveSystemAiContext(snapshot, config, storage.getSystemSiliconEmployee());
             // 自动 message + 迭代模式：拿本轮提示词当输入；提交成功后标记已用掉。
             const context = await iterationCommitInput(storage, snapshot, body);
             const result = await runQuickCommitWithFallback({
@@ -983,7 +958,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         }
         const body = (req.body ?? {});
         try {
-            const ai = resolveCommitAiContext(snapshot, config, undefined, storage.getSystemSiliconEmployee());
+            const ai = resolveSystemAiContext(snapshot, config, storage.getSystemSiliconEmployee());
             const context = await iterationCommitInput(storage, snapshot, body);
             const result = await generateCommitMessageOnly(snapshot.cwd, config.language ?? "", {
                 ...ai,
@@ -1020,7 +995,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         }
         const body = (req.body ?? {});
         try {
-            const ai = resolveCommitAiContext(snapshot, config, undefined, storage.getSystemSiliconEmployee());
+            const ai = resolveSystemAiContext(snapshot, config, storage.getSystemSiliconEmployee());
             const result = await runTagHead({
                 cwd: snapshot.cwd,
                 language: config.language ?? "",