@clawos-dev/clawd 0.2.598 → 0.2.600

package/dist/cli.cjs

@@ -46612,6 +46612,7 @@ function applyCommand(state, command, deps) {
         resolvedModel: _model,
         // aiLabel 是旧对话内容生成的标题，/clear 后属于不存在的话题，一并清掉
         aiLabel: _aiLabel,
+        aiLabelGeneratedAt: _titleGeneratedAt,
         ...rest
       } = next.file;
       void _drop;
@@ -46620,6 +46621,7 @@ function applyCommand(state, command, deps) {
       void _branch;
       void _model;
       void _aiLabel;
+      void _titleGeneratedAt;
       const nextFile = {
         ...rest,
         ...command.nextToolSessionId ? { toolSessionId: command.nextToolSessionId } : {},
@@ -47686,7 +47688,7 @@ var SessionManager = class {
   // sessionId → SessionRunner；在 send / ensureSession 时按需创建
   runners = /* @__PURE__ */ new Map();
   // 标题生成 in-flight 防重（进程内）；跨重启防重靠 SessionFile.aiLabelGeneratedAt
-  titleGenPending = /* @__PURE__ */ new Set();
+  titleGenPending = /* @__PURE__ */ new Map();
   // 当同步命令执行期间，runner 的 emit-frame 临时 push 到这里；
   // null 表示当前是异步路径（stdout 'data' / proc 'exit' 等），走 deps.broadcastFrame
   currentCollector = null;
@@ -48445,6 +48447,10 @@ var SessionManager = class {
   }
   update(args) {
     const existing = this.getFile(args.sessionId);
+    if (args.patch.model !== void 0 || args.patch.label) {
+      this.titleGenPending.get(args.sessionId)?.abort();
+      this.titleGenPending.delete(args.sessionId);
+    }
     const runner = this.runners.get(args.sessionId);
     if (runner) {
       const { value, broadcast } = this.withCollector(() => {
@@ -48454,6 +48460,12 @@ var SessionManager = class {
       return { response: value, broadcast };
     }
     const updated = { ...existing, ...args.patch, updatedAt: nowIso2(this.deps) };
+    if (args.patch.model !== void 0) {
+      delete updated.resolvedModel;
+      delete updated.resolvedEffort;
+    } else if (args.patch.effort !== void 0) {
+      delete updated.resolvedEffort;
+    }
     this.writeOwned(updated);
     return { response: updated, broadcast: [] };
   }
@@ -48517,6 +48529,7 @@ var SessionManager = class {
   delete(args) {
     const existing = this.findOwnedSession(args.sessionId);
     if (!existing) throw new ClawdError(ERROR_CODES.SESSION_NOT_FOUND, args.sessionId);
+    this.titleGenPending.get(args.sessionId)?.abort();
     const scope = this.scopeForFile(existing);
     const runner = this.runners.get(args.sessionId);
     if (runner) {
@@ -48580,7 +48593,7 @@ var SessionManager = class {
   /**
    * 首条 send 触发的智能标题自产（spec：PR #1196 追加拍板 2026-08-17）。
    * 背景见 tools/title-generator.ts 头注释——CC/codex 两条上游标题数据源都等不来
-   * 「首轮即有」，daemon 用会话同家族小模型自己生成，与主 turn 并行，几秒后经
+   * 「首轮即有」，daemon 用本会话选定的引擎和模型自己生成，与主 turn 并行，完成后经
    * manager.update 内部通道写 aiLabel（marker patch：不刷 updatedAt、广播 session:info）。
    *
    * 跳过条件：
@@ -48595,15 +48608,20 @@ var SessionManager = class {
     const sessionId = file.sessionId;
     if (file.aiLabelGeneratedAt || file.label || file.larkChatId) return;
     if (this.titleGenPending.has(sessionId)) return;
-    this.titleGenPending.add(sessionId);
-    void generate(file.tool ?? "claude", text).then((title) => {
+    const controller = new AbortController();
+    this.titleGenPending.set(sessionId, controller);
+    void generate(file, text, controller.signal).then((title) => {
+      if (controller.signal.aborted) return;
+      const current = this.findOwnedSession(sessionId);
+      if (!current || current.label || current.aiLabelGeneratedAt || current.tool !== file.tool || current.model !== file.model) return;
       if (!title) return;
       this.applyResolvedMeta(sessionId, { aiLabel: title });
       this.deps.logger?.info("title-gen ok", { sessionId, tool: file.tool, title });
     }).catch((err) => {
+      if (controller.signal.aborted) return;
       this.deps.logger?.warn("title-gen failed", { sessionId, message: err.message });
     }).finally(() => {
-      this.titleGenPending.delete(sessionId);
+      if (this.titleGenPending.get(sessionId) === controller) this.titleGenPending.delete(sessionId);
     });
   }
   /**
@@ -48842,6 +48860,8 @@ var SessionManager = class {
   }
   newSession(args) {
     const existingFile = this.getFile(args.sessionId);
+    this.titleGenPending.get(args.sessionId)?.abort();
+    this.titleGenPending.delete(args.sessionId);
     const nextToolSessionId = this.deps.mode === "tui" && (existingFile.tool ?? "claude") === "claude" ? (0, import_node_crypto3.randomUUID)() : void 0;
     this.clearPendingTurnEnd(args.sessionId);
     const runner = this.runners.get(args.sessionId);
@@ -48862,6 +48882,8 @@ var SessionManager = class {
       contextWindowSize: _win,
       gitBranch: _branch,
       resolvedModel: _model,
+      aiLabel: _aiLabel,
+      aiLabelGeneratedAt: _titleGeneratedAt,
       ...rest
     } = existing;
     void _drop;
@@ -48869,6 +48891,8 @@ var SessionManager = class {
     void _win;
     void _branch;
     void _model;
+    void _aiLabel;
+    void _titleGeneratedAt;
     const updated = {
       ...rest,
       ...nextToolSessionId ? { toolSessionId: nextToolSessionId } : {},
@@ -48941,6 +48965,8 @@ var SessionManager = class {
     return { runningSessions: running };
   }
   stopAll() {
+    for (const controller of this.titleGenPending.values()) controller.abort();
+    this.titleGenPending.clear();
     for (const r2 of this.runners.values()) {
       r2.input({ kind: "command", command: { kind: "stop" } });
     }
@@ -49117,6 +49143,8 @@ var SessionManager = class {
         `sub-session not found: ${scopeKey(args.scope)}/${args.sessionId}`
       );
     }
+    this.titleGenPending.get(args.sessionId)?.abort();
+    this.titleGenPending.delete(args.sessionId);
     const runner = this.ensureRunnerForScope(file, args.scope);
     const nextToolSessionId = this.deps.mode === "tui" && (file.tool ?? "claude") === "claude" ? (0, import_node_crypto3.randomUUID)() : void 0;
     const { broadcast } = this.withCollector(() => {
@@ -64362,6 +64390,7 @@ var CloudGatewayClient = class {
       personaId: personaId2,
       ...opts.toolSessionId ? { engineSessionId: opts.toolSessionId } : {},
       ...opts.instructions ? { instructions: opts.instructions } : {},
+      ...opts.purpose ? { purpose: opts.purpose } : {},
       logger: this.deps.logger
     });
   }
@@ -64428,7 +64457,7 @@ function parseControlLine(line) {
   }
 }
 function openHttpLineStream(opts) {
-  const { fetchImpl, gatewayUrl, apiKey, personaId: personaId2, engineSessionId, instructions, logger } = opts;
+  const { fetchImpl, gatewayUrl, apiKey, personaId: personaId2, engineSessionId, instructions, purpose, logger } = opts;
   const headers = { authorization: `Bearer ${apiKey}`, "content-type": "application/json" };
   const ac = new AbortController();
   const lineCbs = [];
@@ -64496,7 +64525,7 @@ function openHttpLineStream(opts) {
       res = await fetchImpl(gatewayUrl + GATEWAY_ROUTES.session(personaId2), {
         method: "POST",
         headers,
-        body: JSON.stringify({ ...engineSessionId ? { engineSessionId } : {}, ...instructions ? { instructions } : {} }),
+        body: JSON.stringify({ ...engineSessionId ? { engineSessionId } : {}, ...instructions ? { instructions } : {}, ...purpose ? { purpose } : {} }),
         signal: ac.signal
       });
     } catch (e) {
@@ -64613,8 +64642,8 @@ init_protocol();
 var import_node_fs38 = __toESM(require("fs"), 1);
 function cloudThreadParams(ctx, paths) {
   const { model: _model, ...base } = threadStartParams(ctx);
-  const developerInstructions = [ctx.extraSystemPrompt, workDirPrompt(paths.workDir, ctx.personaMode ?? "owner")].filter((x2) => Boolean(x2)).join("\n\n");
-  return { ...base, cwd: paths.personaDir, approvalPolicy: "never", sandbox: "danger-full-access", developerInstructions };
+  const developerInstructions = ctx.titleOnly ? "\u53EA\u6839\u636E\u7528\u6237\u6D88\u606F\u8FD4\u56DE\u7B80\u77ED\u6807\u9898\u3002\u4E0D\u8981\u8C03\u7528\u5DE5\u5177\u3001\u8BFB\u53D6\u6587\u4EF6\u3001\u8BBF\u95EE\u7F51\u7EDC\u6216\u4FEE\u6539\u4EFB\u4F55\u5185\u5BB9\u3002" : [ctx.extraSystemPrompt, workDirPrompt(paths.workDir, ctx.personaMode ?? "owner")].filter((x2) => Boolean(x2)).join("\n\n");
+  return { ...base, cwd: paths.personaDir, approvalPolicy: "never", sandbox: ctx.titleOnly ? "read-only" : "danger-full-access", developerInstructions };
 }
 function deferredLineStream() {
   let target = null;
@@ -64701,7 +64730,9 @@ function createCloudCodexSession(ctx, sink, deps) {
     // 云 persona 运行看板（design 2026-09-23-cloud-persona-metrics §3.7）：提问那一行带「一轮开始」头，轮末镜像顺带报这一轮的结果
     onTurnStarting: () => channel?.markNextLineTurnStart(),
     // 轮末镜像带上这一轮的结果与首字节（design 2026-09-23-cloud-persona-metrics §3.7）
-    onTurnCompleted: (outcome, afterFirstByteMs) => void channel?.mirror({ outcome, ...afterFirstByteMs !== void 0 ? { afterFirstByteMs } : {} }),
+    onTurnCompleted: (outcome, afterFirstByteMs) => {
+      if (!ctx.titleOnly) void channel?.mirror({ outcome, ...afterFirstByteMs !== void 0 ? { afterFirstByteMs } : {} });
+    },
     now: deps.now
   });
   if (!personaId2) {
@@ -64711,7 +64742,7 @@ function createCloudCodexSession(ctx, sink, deps) {
     });
     return driver.session;
   }
-  void deps.client.openSession(personaId2).then(
+  void (ctx.titleOnly ? deps.client.openSession(personaId2, { purpose: "title" }) : deps.client.openSession(personaId2)).then(
     (opened) => {
       channel = opened;
       channel.onControl((c2) => {
@@ -65431,7 +65462,9 @@ function createCloudPiSession(ctx, sink, deps) {
     // 云 persona 运行看板（design 2026-09-23-cloud-persona-metrics §3.7）：提问那一行带「一轮开始」头，轮末镜像顺带报这一轮的结果
     onTurnStarting: () => channel?.markNextLineTurnStart(),
     // 轮末镜像带上这一轮的结果与首字节（design 2026-09-23-cloud-persona-metrics §3.7）
-    onTurnCompleted: (outcome, afterFirstByteMs) => void channel?.mirror({ outcome, ...afterFirstByteMs !== void 0 ? { afterFirstByteMs } : {} }),
+    onTurnCompleted: (outcome, afterFirstByteMs) => {
+      if (!ctx.titleOnly) void channel?.mirror({ outcome, ...afterFirstByteMs !== void 0 ? { afterFirstByteMs } : {} });
+    },
     now: deps.now
   });
   if (!personaId2) {
@@ -65441,7 +65474,7 @@ function createCloudPiSession(ctx, sink, deps) {
     });
     return driver.session;
   }
-  void deps.client.openSession(personaId2, { toolSessionId: sessionId, instructions: cloudPiInstructions(ctx) }).then(
+  void deps.client.openSession(personaId2, { toolSessionId: sessionId, instructions: ctx.titleOnly ? "" : cloudPiInstructions(ctx), ...ctx.titleOnly ? { purpose: "title" } : {} }).then(
     (opened) => {
       channel = opened;
       channel.onControl((c2) => {
@@ -66313,10 +66346,6 @@ var import_node_fs45 = __toESM(require("fs"), 1);
 var import_node_os18 = __toESM(require("os"), 1);
 var import_node_path49 = __toESM(require("path"), 1);
 var TITLE_GEN_DIR_PREFIX = "clawd-title-";
-var TITLE_MODEL_BY_TOOL = {
-  claude: "haiku",
-  codex: "gpt-5.4-mini"
-};
 var TITLE_INPUT_MAX_CHARS = 400;
 var DEFAULT_TITLE_GEN_TIMEOUT_MS = 45e3;
 var outFileSeq = 0;
@@ -66337,8 +66366,8 @@ function sanitizeTitle(raw) {
   if (!stripped) return null;
   return stripped.slice(0, 60);
 }
-function buildClaudeTitleArgs(prompt) {
-  return ["-p", "--model", TITLE_MODEL_BY_TOOL.claude, prompt];
+function buildClaudeTitleArgs(prompt, model) {
+  return ["-p", "--no-session-persistence", "--tools", "", ...model ? ["--model", model] : [], prompt];
 }
 var CODEX_TITLE_SCHEMA = JSON.stringify({
   type: "object",
@@ -66358,7 +66387,7 @@ function parseTitleJson(raw) {
   }
   return sanitizeTitle(text);
 }
-function buildCodexTitleArgs(prompt, outFile, schemaFile) {
+function buildCodexTitleArgs(prompt, outFile, schemaFile, model) {
   return [
     "exec",
     "--ephemeral",
@@ -66367,8 +66396,7 @@ function buildCodexTitleArgs(prompt, outFile, schemaFile) {
     schemaFile,
     "-s",
     "read-only",
-    "-m",
-    TITLE_MODEL_BY_TOOL.codex,
+    ...model ? ["-m", model] : [],
     "--color",
     "never",
     "-o",
@@ -66376,10 +66404,35 @@ function buildCodexTitleArgs(prompt, outFile, schemaFile) {
     prompt
   ];
 }
-async function generateSessionTitle(tool, firstMessage, deps = {}) {
-  if (tool !== "claude" && !isCodexFamily(tool)) return null;
+function buildPiTitleArgs(prompt, model) {
+  return [
+    "-p",
+    "--mode",
+    "text",
+    "--no-session",
+    "--no-tools",
+    "--no-skills",
+    "--no-context-files",
+    ...model ? ["--model", model] : [],
+    "--",
+    prompt
+  ];
+}
+async function generateSessionTitle(file, firstMessage, deps = {}) {
+  const tool = file.tool ?? "claude";
+  if (tool !== "claude" && tool !== "pi" && tool !== "pi-cloud" && !isCodexFamily(tool)) return null;
   const text = firstMessage.trim();
-  if (!text) return null;
+  if (!text || deps.signal?.aborted) return null;
+  if (tool === "codex-cloud" || tool === "pi-cloud") {
+    if (!deps.generateCloud) return null;
+    try {
+      const raw = await deps.generateCloud(file, buildClaudeTitlePrompt(text), deps.signal);
+      return raw && !deps.signal?.aborted ? parseTitleJson(raw) : null;
+    } catch (err) {
+      deps.logger?.warn("title-gen cloud failed", { tool, message: err.message });
+      return null;
+    }
+  }
   let workDir;
   try {
     workDir = import_node_fs45.default.mkdtempSync(import_node_path49.default.join(import_node_os18.default.tmpdir(), TITLE_GEN_DIR_PREFIX));
@@ -66394,7 +66447,7 @@ async function generateSessionTitle(tool, firstMessage, deps = {}) {
   };
   const outFile = import_node_path49.default.join(workDir, `codex-title-${process.pid}-${++outFileSeq}-${Date.now()}.txt`);
   const schemaFile = import_node_path49.default.join(workDir, "title-schema.json");
-  if (isCodexFamily(tool)) {
+  if (tool === "codex") {
     try {
       import_node_fs45.default.writeFileSync(schemaFile, CODEX_TITLE_SCHEMA);
     } catch {
@@ -66402,14 +66455,16 @@ async function generateSessionTitle(tool, firstMessage, deps = {}) {
       return null;
     }
   }
-  const cmd = tool === "claude" ? process.env.CLAUDE_BIN ?? "claude" : process.env.CODEX_BIN ?? "codex";
-  const args = tool === "claude" ? buildClaudeTitleArgs(buildClaudeTitlePrompt(text)) : buildCodexTitleArgs(buildTitlePrompt(text), outFile, schemaFile);
+  const cmd = tool === "claude" ? process.env.CLAUDE_BIN ?? "claude" : tool === "pi" ? process.env.PI_BIN ?? "pi" : process.env.CODEX_BIN ?? "codex";
+  const chosenModel = file.resolvedModel || file.model;
+  const model = tool === "codex" ? sanitizeCodexModel(chosenModel) : chosenModel;
+  const args = tool === "claude" ? buildClaudeTitleArgs(buildClaudeTitlePrompt(text), model) : tool === "pi" ? buildPiTitleArgs(buildClaudeTitlePrompt(text), model) : buildCodexTitleArgs(buildTitlePrompt(text), outFile, schemaFile, model);
   const doSpawn = deps.spawnOverride ?? ((c2, a2, o2) => (0, import_node_child_process13.spawn)(c2, a2, { ...o2, stdio: ["ignore", "pipe", "pipe"] }));
   const timeoutMs = deps.timeoutMs ?? DEFAULT_TITLE_GEN_TIMEOUT_MS;
   return await new Promise((resolve9) => {
     let proc;
     try {
-      proc = doSpawn(cmd, args, { cwd: workDir });
+      proc = doSpawn(cmd, args, { cwd: model ? workDir : file.cwd });
     } catch (err) {
       deps.logger?.warn("title-gen spawn failed", { tool, message: err.message });
       cleanupWorkDir();
@@ -66421,10 +66476,13 @@ async function generateSessionTitle(tool, firstMessage, deps = {}) {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
+      deps.signal?.removeEventListener("abort", onAbort);
       if (proc.exitCode === null && proc.signalCode === null) proc.kill("SIGKILL");
       cleanupWorkDir();
       resolve9(title);
     };
+    const onAbort = () => finish(null);
+    deps.signal?.addEventListener("abort", onAbort, { once: true });
     const timer = setTimeout(() => {
       deps.logger?.warn("title-gen timed out", { tool, timeoutMs });
       finish(null);
@@ -66443,7 +66501,7 @@ async function generateSessionTitle(tool, firstMessage, deps = {}) {
         deps.logger?.warn("title-gen exited non-zero", { tool, code });
         return finish(null);
       }
-      if (tool === "claude") return finish(parseTitleJson(stdout));
+      if (tool === "claude" || tool === "pi") return finish(parseTitleJson(stdout));
       let fileText = "";
       try {
         fileText = import_node_fs45.default.readFileSync(outFile, "utf8");
@@ -66455,6 +66513,57 @@ async function generateSessionTitle(tool, firstMessage, deps = {}) {
   });
 }
 
+// src/tools/cloud-title.ts
+function generateCloudTitle(file, prompt, signal, getAdapter2, timeoutMs = 45e3) {
+  if (signal?.aborted) return Promise.resolve(null);
+  return new Promise((resolve9) => {
+    let agent;
+    let settled = false;
+    let finalText = "";
+    let partialText = "";
+    let failed = false;
+    const finish = (raw) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", onAbort);
+      try {
+        void Promise.resolve(agent?.stop("SIGKILL")).catch(() => {
+        });
+      } catch {
+      }
+      resolve9(raw);
+    };
+    const onAbort = () => finish(null);
+    const timer = setTimeout(() => finish(null), timeoutMs);
+    signal?.addEventListener("abort", onAbort, { once: true });
+    try {
+      const adapter = getAdapter2(file.tool);
+      if (!adapter.createSession) return finish(null);
+      agent = adapter.createSession({ cwd: file.cwd, env: {}, titleOnly: true }, {
+        pushEvents(events) {
+          for (const event of events) {
+            if (event.kind === "text") {
+              if (event.partialId) partialText += event.text;
+              else finalText = event.text;
+            } else if (event.kind === "error" || event.kind === "tool_call" || event.kind === "permission_request") {
+              failed = true;
+              finish(null);
+            } else if (event.kind === "turn_end") {
+              finish(failed ? null : finalText || partialText || null);
+            }
+          }
+        },
+        onExit: () => finish(null),
+        onError: () => finish(null)
+      });
+      agent.startTurn(prompt);
+    } catch {
+      finish(null);
+    }
+  });
+}
+
 // ../node_modules/.pnpm/ws@8.20.0/node_modules/ws/wrapper.mjs
 var import_stream = __toESM(require_stream(), 1);
 var import_extension2 = __toESM(require_extension(), 1);
@@ -72959,7 +73068,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.598".length > 0 ? "0.2.598" : "dev";
+var version = "0.2.600".length > 0 ? "0.2.600" : "dev";
 
 // src/cli-probe/probe.ts
 var fs83 = __toESM(require("fs"), 1);
@@ -75912,9 +76021,13 @@ async function startDaemon(config) {
     // per-persona 凭据注入（M1b Step 5）：runner 在解释 spawn effect 时按 ctx.personaId 调，
     // 产出拼进 ctx.mcpConfigs。**不在 reducer 里**——渲染要读写 fs，那边是纯函数。
     resolvePersonaMcpConfig,
-    // 会话标题自产（首条 send 并行 fire，claude→haiku / codex→gpt-5.4-mini）。
+    // 会话标题自产（首条 send 并行 fire，沿用会话引擎和模型）。
     // 不注入 = 功能关（manager 测试默认关闭防烧真调用），这里是唯一的生产装配点。
-    generateTitle: (tool, firstMessage) => generateSessionTitle(tool, firstMessage, { logger }),
+    generateTitle: (file, firstMessage, signal) => generateSessionTitle(file, firstMessage, {
+      logger,
+      signal,
+      generateCloud: (titleFile, prompt, titleSignal) => generateCloudTitle(titleFile, prompt, titleSignal, getAdapter)
+    }),
     broadcastFrame: (frame, target) => {
       if (target === "all") {
         transport?.broadcastAll(frame);