@clawos-dev/clawd 0.2.545 → 0.2.547

package/dist/cli.cjs

@@ -45639,7 +45639,9 @@ function cloneState(s2) {
     currentTurnSender: s2.currentTurnSender
   };
 }
+var CLOUD_IDLE_KILL_DELAY_MS = 5 * 6e4;
 function idleKillDelayOf(state) {
+  if (state.file.tool === CODEX_CLOUD_TOOL_ID) return CLOUD_IDLE_KILL_DELAY_MS;
   const ms = state.subSessionMeta?.idleKillDelayMs;
   return ms !== void 0 && ms > 0 ? ms : void 0;
 }
@@ -46082,7 +46084,7 @@ function pushEventToBufferInPlace(next, event, deps) {
     if (canCloseStdin) {
       next.stdinClosed = true;
       effects.push({ kind: "close-stdin" });
-    } else if (isRpcAgentTool(tool)) {
+    } else if (isRpcAgentTool(tool) && tool !== CODEX_CLOUD_TOOL_ID) {
       if (tool === PI_TOOL_ID) next.stdinClosed = true;
       effects.push({ kind: "kill", signal: "SIGTERM" });
     } else {
@@ -62409,6 +62411,32 @@ async function centralGetApiKey(opts) {
     gatewayUrl: typeof body.gatewayUrl === "string" ? body.gatewayUrl : null
   };
 }
+async function centralGetThread(opts) {
+  const f2 = opts.fetchImpl ?? globalThis.fetch;
+  const url = `${opts.api.replace(/\/+$/, "")}/api/persona-cloud/threads/${encodeURIComponent(opts.threadId)}`;
+  const ctrl = new AbortController();
+  const timer = setTimeout(() => ctrl.abort(), opts.timeoutMs ?? 15e3);
+  let res;
+  try {
+    res = await f2(url, { method: "GET", headers: { authorization: `Bearer ${opts.loginPass}` }, signal: ctrl.signal });
+  } catch (err) {
+    clearTimeout(timer);
+    throw new CentralClientError("NETWORK", `central server request failed: ${err.message}`, err);
+  }
+  clearTimeout(timer);
+  if (res.status === 404) return null;
+  if (res.status === 401) throw new CentralClientError("UNAUTHORIZED", "login pass rejected by center");
+  if (!res.ok) {
+    let detail = "";
+    try {
+      const body = await res.json();
+      if (typeof body?.message === "string" && body.message) detail = `: ${body.message}`;
+    } catch {
+    }
+    throw new CentralClientError("API_ERROR", `central server HTTP ${res.status}${detail}`);
+  }
+  return await res.text();
+}
 async function centralIssueApiKey(opts) {
   const body = await centralRequest(opts, "/api/persona-cloud/api-key", {
     method: "POST",
@@ -62496,8 +62524,6 @@ var GATEWAY_ROUTES = {
   healthz: () => "/healthz",
   session: (personaId2) => `/p/${encodeURIComponent(personaId2)}/session`,
   sessionSend: (personaId2, sessionId) => `/p/${encodeURIComponent(personaId2)}/session/${encodeURIComponent(sessionId)}`,
-  // 历史文件不挂在 persona 下：使用者卷跨 persona 共用（design 2026-09-14-codex-native-memories §3.2f）
-  thread: (threadId) => `/threads/${encodeURIComponent(threadId)}`,
   // 调用方自己那块盘的用量（design 2026-09-19-cloud-volume-usage §3.3）：同样按人、不挂 persona
   volume: () => "/me/volume"
 };
@@ -62612,16 +62638,6 @@ var CloudGatewayClient = class {
     if (body.volume == null) return null;
     return CloudVolumeUsageSchema.parse(body.volume);
   }
-  /** rollout 原文；404 = 没这条 thread（还没开过第一轮 / 卷被清）→ null */
-  async fetchRollout(threadId) {
-    const { apiKey, gatewayUrl } = await this.credentials();
-    const res = await this.fetchImpl(gatewayUrl + GATEWAY_ROUTES.thread(threadId), {
-      headers: { authorization: `Bearer ${apiKey}` }
-    });
-    if (res.status === 404) return null;
-    if (!res.ok) throw new Error(`gateway threads \u8DEF\u7531\u56DE ${res.status}`);
-    return await res.text();
-  }
 };
 function parseControlLine(line) {
   let o2;
@@ -63018,7 +63034,7 @@ var CloudCodexAdapter = class {
     this.client = opts.client;
     this.logger = opts.logger;
     this.getSignSecret = opts.getSignSecret;
-    this.historyReader = new CloudCodexHistoryReader(opts.client, opts.logger);
+    this.historyReader = new CloudCodexHistoryReader(opts.history, opts.logger);
   }
   /** 可用 = 能拿到凭据（登了飞书、生成过 key、中心配了 gateway），与本机装没装 codex 无关 */
   async probe() {
@@ -70995,7 +71011,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.545".length > 0 ? "0.2.545" : "dev";
+var version = "0.2.547".length > 0 ? "0.2.547" : "dev";
 
 // src/cli-probe/probe.ts
 var fs78 = __toESM(require("fs"), 1);
@@ -74199,7 +74215,22 @@ async function startDaemon(config) {
       getSignSecret: () => authFile.token
     })
   );
-  registerAdapter(CODEX_CLOUD_TOOL_ID, new CloudCodexAdapter({ client: cloudGateway, logger, getSignSecret: () => authFile.token }));
+  registerAdapter(
+    CODEX_CLOUD_TOOL_ID,
+    new CloudCodexAdapter({
+      client: cloudGateway,
+      // 历史副本从中心拉（design 2026-09-19-cloud-session-oss §3.4）：没登录就没有历史，不抛
+      history: {
+        fetchRollout: (threadId) => {
+          const loginPass = ownerIdentityStore.read()?.loginPass;
+          if (!loginPass) return Promise.resolve(null);
+          return centralGetThread({ api: config.clawosApi ?? DEFAULT_CLAWOS_API, loginPass, threadId });
+        }
+      },
+      logger,
+      getSignSecret: () => authFile.token
+    })
+  );
   const piMcpBridgeCandidates = [
     import_node_path80.default.join(here, "pi-mcp-bridge", "extension.cjs"),
     import_node_path80.default.join(here, "..", "dist", "pi-mcp-bridge", "extension.cjs")

package/package.json

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