@clawos-dev/clawd 0.2.218 → 0.2.219

package/dist/cli.cjs

@@ -41651,6 +41651,47 @@ function escapeAttr(v2) {
   return v2.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 
+// src/shift/end-frame-handler.ts
+function makeEndFrameHandler(sessionId, onEnd) {
+  return (frame) => {
+    if (!frame || typeof frame !== "object") return;
+    const f = frame;
+    if (f.type !== "session:status") return;
+    if (f.sessionId !== sessionId) return;
+    if (f.status === "running-idle") {
+      onEnd({ kind: "idle" });
+      return;
+    }
+    if (f.status === "stopped") {
+      onEnd({ kind: "stopped" });
+      return;
+    }
+    if (f.status === "error") {
+      onEnd({ kind: "error", message: f.message ?? "cc proc error" });
+      return;
+    }
+  };
+}
+
+// src/shift/end-dispatcher.ts
+function dispatchShiftEnd(info, settle, killImpl) {
+  if (info.kind === "idle") {
+    settle({ ok: true });
+    killImpl();
+    return;
+  }
+  if (info.kind === "stopped") {
+    settle({ error: "cc exited before turn completed" });
+    return;
+  }
+  if (info.kind === "error") {
+    settle({ error: info.message });
+    return;
+  }
+  const _exhaustive = info;
+  throw new Error(`dispatchShiftEnd: unhandled kind ${JSON.stringify(_exhaustive)}`);
+}
+
 // src/session/runner.ts
 var import_node_os4 = __toESM(require("os"), 1);
 var import_node_path7 = __toESM(require("path"), 1);
@@ -44469,8 +44510,9 @@ var SessionManager = class {
    * 跟 createDispatchedSession 的差异：
    *   - 不带 dispatchId / source / task pack；prompt 直接当第一条 user message
    *   - 不调 personaDispatchManager.registerBSession
-   *   - 多返一个 ended Promise，监听 session:status (stopped/error) 帧通过现有
-   *     subscribe() 入口（白名单已含 session:status）
+   *   - 多返一个 ended Promise，监听 session:status 帧翻译成 shift 业务终态 union
+   *     （ShiftSessionEnded：{ok:true} | {error:string}），不经 exit code 中转
+   *   - turn-idle 到达即视为业务完成 → settle {ok:true} + fire-and-forget kill cc
    *   - kill 通过 runner.input({command:{kind:'stop'}}) 触发 SIGKILL → proc-exit
    */
   createShiftSession(args) {
@@ -44514,16 +44556,18 @@ var SessionManager = class {
       unsubscribe();
       resolveEnded(info);
     };
-    unsubscribe = this.subscribe(sessionId, scope, (frame) => {
-      if (frame.type !== "session:status") return;
-      const f = frame;
-      if (f.sessionId !== sessionId) return;
-      if (f.status === "stopped") {
-        settle({ exitCode: f.exitCode ?? null });
-      } else if (f.status === "error") {
-        settle({ exitCode: null, error: f.message ?? "cc proc error" });
-      }
-    });
+    const killImpl = () => {
+      const r = this.runners.get(sessionId);
+      if (!r) return;
+      r.input({ kind: "command", command: { kind: "stop" } });
+    };
+    unsubscribe = this.subscribe(
+      sessionId,
+      scope,
+      makeEndFrameHandler(sessionId, (info) => {
+        dispatchShiftEnd(info, settle, killImpl);
+      })
+    );
     const runner = this.ensureRunnerForScope(file, scope);
     this.deps.logger?.info("shift.createShiftSession.runner-ready", { sessionId });
     runner.input({
@@ -44536,12 +44580,7 @@ var SessionManager = class {
         })
       }
     });
-    const kill = () => {
-      const r = this.runners.get(sessionId);
-      if (!r) return;
-      r.input({ kind: "command", command: { kind: "stop" } });
-    };
-    return { sessionId, ended, kill };
+    return { sessionId, ended, kill: killImpl };
   }
   /**
    * 老板插话：把 'inject-owner-text' input 喂给对应 runner，
@@ -48446,15 +48485,11 @@ function createShiftSpawnFn(deps) {
     void created.ended.then((info) => {
       clearTimeout(timer);
       if (settled) return;
-      if (info.error) {
-        settle({ kind: "error", error: info.error });
-        return;
-      }
-      if (info.exitCode === 0) {
+      if ("ok" in info) {
         settle({ kind: "ok" });
         return;
       }
-      settle({ kind: "error", error: `cc exited with code ${info.exitCode}` });
+      settle({ kind: "error", error: info.error });
     });
     return { sessionId: created.sessionId, ended };
   };

package/package.json

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