@clawos-dev/clawd 0.2.600 → 0.2.602

package/dist/cli.cjs

@@ -53791,7 +53791,7 @@ function driveCodexThread(opts) {
     if (opts.skillsExtraRoots?.length) {
       void client.request("skills/extraRoots/set", { extraRoots: opts.skillsExtraRoots }).catch((e) => logger?.warn("codex skills/extraRoots/set failed", { message: e.message }));
     }
-    const threadParams = typeof opts.threadParams === "function" ? await opts.threadParams() : opts.threadParams;
+    const threadParams = typeof opts.threadParams === "function" ? await opts.threadParams(client) : opts.threadParams;
     if (threadId) {
       await client.request("thread/resume", { threadId, ...threadParams });
     } else {
@@ -64380,6 +64380,7 @@ var CloudGatewayClient = class {
    * `toolSessionId`：调用方预分配的引擎会话 id（pi 的 --session-id；codex 的 thread id 是协议内的、不传），进 open 的 body `engineSessionId`
    * （契约 2026-09-18 §3.2）。`instructions`：会话级指令（pi-cloud 的连接 intro，工作目录写 CLOUD_WORKSPACE_SLOT），进 body `instructions`，
    * gateway 落成 Pod 里的 /run/agent/instructions.md（契约 §3.1）；codex-cloud 不发（走协议内 developerInstructions）。
+   * `expectedEngine` 是 session 创建时的引擎；gateway 在起 Pod 前与当前发布核对。
    */
   async openSession(personaId2, opts = {}) {
     const { apiKey, gatewayUrl } = await this.credentials();
@@ -64391,6 +64392,7 @@ var CloudGatewayClient = class {
       ...opts.toolSessionId ? { engineSessionId: opts.toolSessionId } : {},
       ...opts.instructions ? { instructions: opts.instructions } : {},
       ...opts.purpose ? { purpose: opts.purpose } : {},
+      ...opts.expectedEngine ? { expectedEngine: opts.expectedEngine } : {},
       logger: this.deps.logger
     });
   }
@@ -64448,7 +64450,9 @@ function parseControlLine(line) {
         kind: "ready",
         session: typeof r2.session === "string" ? r2.session : "",
         personaDir: typeof r2.personaDir === "string" ? r2.personaDir : "",
-        workDir: typeof r2.workDir === "string" ? r2.workDir : ""
+        workDir: typeof r2.workDir === "string" ? r2.workDir : "",
+        ...typeof r2.model === "string" ? { model: r2.model } : {},
+        ...typeof r2.engine === "string" ? { engine: r2.engine } : {}
       };
     case "error":
       return { kind: "error", message: typeof r2.message === "string" ? r2.message : "gateway error" };
@@ -64457,7 +64461,7 @@ function parseControlLine(line) {
   }
 }
 function openHttpLineStream(opts) {
-  const { fetchImpl, gatewayUrl, apiKey, personaId: personaId2, engineSessionId, instructions, purpose, logger } = opts;
+  const { fetchImpl, gatewayUrl, apiKey, personaId: personaId2, engineSessionId, instructions, purpose, expectedEngine, logger } = opts;
   const headers = { authorization: `Bearer ${apiKey}`, "content-type": "application/json" };
   const ac = new AbortController();
   const lineCbs = [];
@@ -64525,7 +64529,7 @@ function openHttpLineStream(opts) {
       res = await fetchImpl(gatewayUrl + GATEWAY_ROUTES.session(personaId2), {
         method: "POST",
         headers,
-        body: JSON.stringify({ ...engineSessionId ? { engineSessionId } : {}, ...instructions ? { instructions } : {}, ...purpose ? { purpose } : {} }),
+        body: JSON.stringify({ ...engineSessionId ? { engineSessionId } : {}, ...instructions ? { instructions } : {}, ...purpose ? { purpose } : {}, ...expectedEngine ? { expectedEngine } : {} }),
         signal: ac.signal
       });
     } catch (e) {
@@ -64539,6 +64543,7 @@ function openHttpLineStream(opts) {
         const body = await res.json();
         if (typeof body.message === "string") message = body.message;
         else if (typeof body.error === "string") message = body.error;
+        if (body.error === "SESSION_VERSION_EXPIRED" && !message.includes("SESSION_VERSION_EXPIRED")) message = `SESSION_VERSION_EXPIRED: ${message}`;
       } catch {
       }
       emitControl({ kind: "error", message });
@@ -64579,6 +64584,14 @@ function openHttpLineStream(opts) {
                 });
                 break;
               }
+              if (expectedEngine && control.engine !== expectedEngine) {
+                emitControl({ kind: "error", message: control.engine ? `SESSION_VERSION_EXPIRED: \u5F53\u524D Pod \u662F ${control.engine}\uFF0C\u8FD9\u6761\u4F1A\u8BDD\u9700\u8981 ${expectedEngine}` : "gateway \u7684 ready \u63A7\u5236\u884C\u6CA1\u5E26 engine\uFF0Cgateway \u592A\u8001\uFF0C\u5148\u5347 gateway" });
+                stop = true;
+                ac.abort();
+                void reader.cancel().catch(() => {
+                });
+                break;
+              }
               sessionId = control.session;
               flush();
             }
@@ -64643,7 +64656,7 @@ var import_node_fs38 = __toESM(require("fs"), 1);
 function cloudThreadParams(ctx, paths) {
   const { model: _model, ...base } = threadStartParams(ctx);
   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 };
+  return { ...base, ...paths.model ? { model: paths.model } : {}, cwd: paths.personaDir, approvalPolicy: "never", sandbox: ctx.titleOnly ? "read-only" : "danger-full-access", developerInstructions };
 }
 function deferredLineStream() {
   let target = null;
@@ -64722,7 +64735,18 @@ function createCloudCodexSession(ctx, sink, deps) {
     sink,
     stream,
     logger: deps.logger,
-    threadParams: () => paths.then((p3) => cloudThreadParams(ctx, p3)),
+    threadParams: async (client) => {
+      const p3 = await paths;
+      const params = cloudThreadParams(ctx, p3);
+      if (!ctx.toolSessionId || p3.model) return params;
+      const config = await client.request("config/read", {});
+      if (config?.config?.model) return { ...params, model: config.config.model };
+      const list = await client.request("model/list", {});
+      const selected = list?.data?.find((m3) => m3.isDefault);
+      const current = selected?.id || selected?.model;
+      if (!current) throw new Error("\u65E0\u6CD5\u786E\u5B9A\u5F53\u524D Codex \u9ED8\u8BA4\u6A21\u578B\uFF0C\u62D2\u7EDD\u6CBF\u7528\u65E7\u4F1A\u8BDD\u6A21\u578B");
+      return { ...params, model: current };
+    },
     imageInput: cloudImageInput(deps),
     // skills 在 Pod 里由 persona 目录自带，本机路径对它没意义
     // 「让对端走人」= 断开下行流，gateway 收到就删 Job；信号对 Pod 没有意义
@@ -64742,12 +64766,12 @@ function createCloudCodexSession(ctx, sink, deps) {
     });
     return driver.session;
   }
-  void (ctx.titleOnly ? deps.client.openSession(personaId2, { purpose: "title" }) : deps.client.openSession(personaId2)).then(
+  void deps.client.openSession(personaId2, { expectedEngine: "codex", ...ctx.titleOnly ? { purpose: "title" } : {} }).then(
     (opened) => {
       channel = opened;
       channel.onControl((c2) => {
         if (c2.kind === "ready") {
-          resolvePaths({ personaDir: c2.personaDir, workDir: c2.workDir });
+          resolvePaths({ personaDir: c2.personaDir, workDir: c2.workDir, model: c2.model });
         } else if (c2.kind === "queued") {
           sink.pushEvents([{ kind: "meta-text", text: `\u4E91\u4E0A\u673A\u5668\u6709 ${c2.running} \u4E2A\u4EFB\u52A1\u5728\u8DD1\uFF0C\u7B49\u4E00\u4E2A\u7ED3\u675F\u5C31\u8F6E\u5230\u4F60` }]);
         } else if (c2.kind === "error") {
@@ -65474,7 +65498,7 @@ function createCloudPiSession(ctx, sink, deps) {
     });
     return driver.session;
   }
-  void deps.client.openSession(personaId2, { toolSessionId: sessionId, instructions: ctx.titleOnly ? "" : cloudPiInstructions(ctx), ...ctx.titleOnly ? { purpose: "title" } : {} }).then(
+  void deps.client.openSession(personaId2, { toolSessionId: sessionId, instructions: ctx.titleOnly ? "" : cloudPiInstructions(ctx), expectedEngine: "pi", ...ctx.titleOnly ? { purpose: "title" } : {} }).then(
     (opened) => {
       channel = opened;
       channel.onControl((c2) => {
@@ -73068,7 +73092,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.600".length > 0 ? "0.2.600" : "dev";
+var version = "0.2.602".length > 0 ? "0.2.602" : "dev";
 
 // src/cli-probe/probe.ts
 var fs83 = __toESM(require("fs"), 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.600",
+  "version": "0.2.602",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",