@clawos-dev/clawd 0.2.601 → 0.2.603

package/dist/cli.cjs

@@ -64276,6 +64276,8 @@ var GATEWAY_ROUTES = {
   session: (personaId2) => `/p/${encodeURIComponent(personaId2)}/session`,
   sessionSend: (personaId2, sessionId) => `/p/${encodeURIComponent(personaId2)}/session/${encodeURIComponent(sessionId)}`,
   sessionMirror: (personaId2, sessionId) => `/p/${encodeURIComponent(personaId2)}/session/${encodeURIComponent(sessionId)}/mirror`,
+  eventSession: (personaId2) => `/p/${encodeURIComponent(personaId2)}/session/events`,
+  eventSend: (personaId2, sessionId) => `/p/${encodeURIComponent(personaId2)}/session/events/${encodeURIComponent(sessionId)}`,
   // 调用方自己那块盘的用量（design 2026-09-19-cloud-volume-usage §3.3）：同样按人、不挂 persona
   volume: () => "/me/volume",
   // 云 persona 运行看板的数据（design 2026-09-23-cloud-persona-metrics §3.6）：只给发布者与管理员（gateway 问中心，design 2026-09-24-cloud-persona-conversations §3.2）
@@ -64396,6 +64398,22 @@ var CloudGatewayClient = class {
       logger: this.deps.logger
     });
   }
+  async openEventSession(personaId2, opts) {
+    const { apiKey, gatewayUrl } = await this.credentials();
+    return openHttpEventSession({
+      fetchImpl: this.fetchImpl,
+      gatewayUrl,
+      apiKey,
+      personaId: personaId2,
+      engineSessionId: opts.toolSessionId,
+      instructions: opts.instructions,
+      purpose: opts.purpose,
+      expectedEngine: opts.expectedEngine,
+      effort: opts.effort,
+      personaMode: opts.personaMode,
+      logger: this.deps.logger
+    });
+  }
   /**
    * 看板数据（design 2026-09-23-cloud-persona-metrics §3.8）：GET /metrics/<persona>?window&entry，**原样回**状态码与 body——
    * 形状真源在 gateway 的 cloud-persona-metrics，daemon 只是替浏览器拿本机 api key 转一跳。拿不到 key / 连不上 / 超时 → 抛（路由折成 502）。
@@ -64433,6 +64451,149 @@ var CloudGatewayClient = class {
     return CloudVolumeUsageSchema.parse(body.volume);
   }
 };
+function openHttpEventSession(opts) {
+  const { fetchImpl, gatewayUrl, apiKey, personaId: personaId2, engineSessionId, instructions, purpose, effort, personaMode, expectedEngine, logger } = opts;
+  const headers = { authorization: `Bearer ${apiKey}`, "content-type": "application/json" };
+  const abort = new AbortController();
+  const eventCbs = [];
+  const controlCbs = [];
+  const closeCbs = [];
+  const earlyEvents = [];
+  const earlyControls = [];
+  let closed = false;
+  let readyControl = null;
+  let errorControl = null;
+  let sessionId = null;
+  let resolveReady;
+  let rejectReady;
+  const ready = new Promise((resolve9, reject) => {
+    resolveReady = resolve9;
+    rejectReady = reject;
+  });
+  void ready.catch(() => {
+  });
+  let sendChain = Promise.resolve();
+  const emitControl = (control) => {
+    if (control.kind === "ready") readyControl = control;
+    if (control.kind === "error") errorControl = control;
+    if (!controlCbs.length) earlyControls.push(control);
+    for (const cb of controlCbs) cb(control);
+  };
+  const finish = (message) => {
+    if (closed) return;
+    if (message) emitControl({ kind: "error", message });
+    closed = true;
+    rejectReady(new Error(message ?? "event session closed"));
+    abort.abort();
+    for (const cb of closeCbs) cb();
+  };
+  void (async () => {
+    try {
+      const res = await fetchImpl(gatewayUrl + GATEWAY_ROUTES.eventSession(personaId2), {
+        method: "POST",
+        headers,
+        body: JSON.stringify({ expectedEngine, ...engineSessionId ? { engineSessionId } : {}, ...instructions ? { instructions } : {}, ...purpose ? { purpose } : {}, ...effort ? { effort } : {}, ...personaMode ? { personaMode } : {} }),
+        signal: abort.signal
+      });
+      if (!res.ok || !res.body) {
+        let message = `gateway \u56DE ${res.status}`;
+        try {
+          const body = await res.json();
+          if (typeof body.message === "string") message = body.message;
+          if (body.error === "SESSION_VERSION_EXPIRED" && !message.includes("SESSION_VERSION_EXPIRED")) message = `SESSION_VERSION_EXPIRED: ${message}`;
+        } catch {
+        }
+        finish(message);
+        return;
+      }
+      const reader = res.body.getReader();
+      const decoder = new TextDecoder();
+      let pending = "";
+      for (; ; ) {
+        const { value, done } = await reader.read();
+        if (done) break;
+        pending += decoder.decode(value, { stream: true });
+        const lines = pending.split("\n");
+        pending = lines.pop() ?? "";
+        for (const line of lines) {
+          if (!line.trim()) continue;
+          const data = JSON.parse(line);
+          if (data.clawd === "events") {
+            const events = ParsedEventSchema.array().parse(data.events);
+            if (!eventCbs.length) earlyEvents.push(events);
+            for (const cb of eventCbs) cb(events);
+            continue;
+          }
+          const control = parseControlLine(line);
+          if (!control) throw new Error("gateway event stream contains an unknown line");
+          if (control.kind === "ready") {
+            if (!control.session) throw new Error("gateway ready line has no session id");
+            if (control.engine !== expectedEngine) {
+              finish(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");
+              return;
+            }
+            sessionId = control.session;
+            resolveReady();
+          }
+          emitControl(control);
+          if (control.kind === "error") {
+            finish();
+            return;
+          }
+        }
+      }
+      finish();
+    } catch (e) {
+      if (!closed) {
+        logger?.warn("cloud event stream failed", { message: e.message });
+        finish(`\u4E91\u4E0A\u4E8B\u4EF6\u901A\u9053\u51FA\u9519\uFF1A${e.message}`);
+      }
+    }
+  })();
+  return {
+    send(command) {
+      const next = sendChain.then(async () => {
+        await ready;
+        if (closed || !sessionId) throw new Error("event session closed");
+        const res = await fetchImpl(gatewayUrl + GATEWAY_ROUTES.eventSend(personaId2, sessionId), { method: "POST", headers, body: JSON.stringify(command) });
+        if (!res.ok) {
+          let message = `gateway \u56DE ${res.status}`;
+          try {
+            const body = await res.json();
+            if (typeof body.message === "string") message = body.message;
+          } catch {
+          }
+          finish(message);
+          throw new Error(message);
+        }
+      });
+      sendChain = next.catch(() => {
+      });
+      return next;
+    },
+    onEvents(cb) {
+      const first = !eventCbs.length;
+      eventCbs.push(cb);
+      if (first) for (const events of earlyEvents.splice(0)) cb(events);
+    },
+    onControl(cb) {
+      const first = !controlCbs.length;
+      controlCbs.push(cb);
+      if (first) for (const control of earlyControls.splice(0)) cb(control);
+      else {
+        if (readyControl) cb(readyControl);
+        if (errorControl) cb(errorControl);
+      }
+    },
+    onClose(cb) {
+      closeCbs.push(cb);
+      if (closed) cb();
+    },
+    close() {
+      finish();
+    }
+  };
+}
 function parseControlLine(line) {
   let o2;
   try {
@@ -64653,54 +64814,26 @@ init_protocol();
 
 // src/tools/codex-cloud-session.ts
 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, ...paths.model ? { model: paths.model } : {}, cwd: paths.personaDir, approvalPolicy: "never", sandbox: ctx.titleOnly ? "read-only" : "danger-full-access", developerInstructions };
-}
-function deferredLineStream() {
-  let target = null;
-  let closed = false;
-  const pending = [];
-  const lineCbs = [];
-  const closeCbs = [];
-  const finish = () => {
-    if (closed) return;
-    closed = true;
-    for (const cb of closeCbs) cb();
-  };
-  return {
-    attach(t2) {
-      if (closed) {
-        t2.close();
-        return;
-      }
-      target = t2;
-      t2.onLine((l2) => {
-        for (const cb of lineCbs) cb(l2);
-      });
-      t2.onClose(finish);
-      for (const line of pending.splice(0)) t2.write(line);
-    },
-    write(line) {
-      if (closed) return;
-      if (target) target.write(line);
-      else pending.push(line);
-    },
-    onLine(cb) {
-      lineCbs.push(cb);
-    },
-    onClose(cb) {
-      closeCbs.push(cb);
-      if (closed) cb();
-    },
-    close() {
-      if (closed) return;
-      target?.close();
-      finish();
-    }
-  };
+
+// src/tools/cloud-portable-input.ts
+async function portableCloudInput(text, resolvers) {
+  const markers = [...text.matchAll(/\[attachment:image:(https?:\/\/[^\]]+)\]/g)];
+  let result = text;
+  for (const match of markers) {
+    const url = match[1];
+    let dataUrl;
+    const codex = resolvers.resolveCodexImage?.(url);
+    if (codex?.type === "image" && codex.url.startsWith("data:")) dataUrl = codex.url;
+    if (!dataUrl && resolvers.fetchPiImage) {
+      const pi = await resolvers.fetchPiImage(url).catch(() => null);
+      if (pi) dataUrl = `data:${pi.mimeType};base64,${pi.data}`;
+    }
+    if (dataUrl) result = result.replace(match[0], `[attachment:image:${dataUrl}]`);
+  }
+  return result;
 }
+
+// src/tools/codex-cloud-session.ts
 function cloudImageInput(deps) {
   return (url) => {
     const secret = deps.getSignSecret?.();
@@ -64719,73 +64852,84 @@ function cloudImageInput(deps) {
 }
 function createCloudCodexSession(ctx, sink, deps) {
   const personaId2 = personaIdFromCloudCwd(ctx.cwd);
-  const stream = deferredLineStream();
-  let resolvePaths;
-  let rejectPaths;
-  const paths = new Promise((resolve9, reject) => {
-    resolvePaths = resolve9;
-    rejectPaths = reject;
-  });
-  paths.catch(() => {
-  });
-  stream.onClose(() => rejectPaths(new Error("\u4E91\u4E0A\u901A\u9053\u5728 ready \u4E4B\u524D\u5173\u4E86\uFF0C\u62FF\u4E0D\u5230 Pod \u8DEF\u5F84")));
   let channel = null;
-  const driver = driveCodexThread({
-    ctx,
-    sink,
-    stream,
-    logger: deps.logger,
-    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 没有意义
-    kill: () => stream.close(),
-    // 云 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) => {
-      if (!ctx.titleOnly) void channel?.mirror({ outcome, ...afterFirstByteMs !== void 0 ? { afterFirstByteMs } : {} });
-    },
-    now: deps.now
-  });
+  let closed = false;
+  let exited = false;
+  const exit = () => {
+    if (!exited) {
+      exited = true;
+      sink.onExit(null);
+    }
+  };
   if (!personaId2) {
     queueMicrotask(() => {
       sink.onError(`cloud session has no persona id (cwd=${ctx.cwd})`);
-      stream.close();
+      exit();
     });
-    return driver.session;
-  }
-  void deps.client.openSession(personaId2, { expectedEngine: "codex", ...ctx.titleOnly ? { purpose: "title" } : {} }).then(
-    (opened) => {
-      channel = opened;
+    return { startTurn() {
+    }, respondPermission() {
+    }, interrupt() {
+    }, async stop() {
+    } };
+  }
+  const opened = deps.client.openEventSession(personaId2, {
+    expectedEngine: "codex",
+    ...ctx.toolSessionId ? { toolSessionId: ctx.toolSessionId } : {},
+    ...ctx.extraSystemPrompt ? { instructions: ctx.extraSystemPrompt } : {},
+    ...ctx.effort ? { effort: ctx.effort } : {},
+    ...ctx.personaMode ? { personaMode: ctx.personaMode } : {},
+    ...ctx.titleOnly ? { purpose: "title" } : {}
+  }).then(
+    (opened2) => {
+      channel = opened2;
+      channel.onEvents((events) => sink.pushEvents(events));
       channel.onControl((c2) => {
-        if (c2.kind === "ready") {
-          resolvePaths({ personaDir: c2.personaDir, workDir: c2.workDir, model: c2.model });
-        } else if (c2.kind === "queued") {
+        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") {
           sink.onError(`\u4E91\u4E0A persona \u8D77\u4E0D\u6765\uFF1A${c2.message}`);
         }
       });
-      stream.attach(channel);
+      channel.onClose(exit);
+      if (closed) channel.close();
+      return channel;
     },
     (e) => {
       sink.onError(e instanceof CloudApiKeyRequiredError ? e.message : `\u8FDE\u4E0D\u4E0A\u4E91 gateway\uFF1A${e.message}`);
-      stream.close();
+      exit();
+      throw e;
     }
   );
-  return driver.session;
+  void opened.catch(() => {
+  });
+  let sendChain = Promise.resolve();
+  const send2 = (command) => {
+    sendChain = sendChain.then(command).catch((e) => {
+      if (!closed && !exited) sink.onError(`\u4E91\u4E0A\u4F1A\u8BDD\u4E0A\u884C\u5931\u8D25\uFF1A${e.message}`);
+    });
+  };
+  return {
+    startTurn(text) {
+      send2(async () => {
+        const ch = await opened;
+        if (closed) return;
+        const portable = await portableCloudInput(text, { resolveCodexImage: cloudImageInput(deps) });
+        await ch.send({ command: "turn", text: portable });
+      });
+    },
+    respondPermission(requestId, allow) {
+      send2(async () => (await opened).send({ command: "permission", requestId, allow }));
+    },
+    interrupt() {
+      send2(async () => (await opened).send({ command: "interrupt" }));
+    },
+    async stop() {
+      closed = true;
+      const ch = await opened.catch(() => null);
+      ch?.close();
+      exit();
+    }
+  };
 }
 
 // src/tools/codex-cloud.ts
@@ -65473,34 +65617,30 @@ function cloudPiInstructions(ctx) {
 function createCloudPiSession(ctx, sink, deps) {
   const personaId2 = personaIdFromCloudCwd(ctx.cwd);
   const sessionId = ctx.toolSessionId ?? (0, import_node_crypto13.randomUUID)();
-  const stream = deferredLineStream();
   let channel = null;
-  const driver = drivePiSession({
-    sink,
-    stream,
-    sessionId,
-    logger: deps.logger,
-    fetchImage: deps.fetchImage ?? makeImageFetcher(),
-    // 「让对端走人」= 断开下行流，gateway 收到就删 Pod；信号对 Pod 没有意义
-    kill: () => stream.close(),
-    // 云 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) => {
-      if (!ctx.titleOnly) void channel?.mirror({ outcome, ...afterFirstByteMs !== void 0 ? { afterFirstByteMs } : {} });
-    },
-    now: deps.now
-  });
+  let closed = false;
+  let exited = false;
+  const exit = () => {
+    if (!exited) {
+      exited = true;
+      sink.onExit(null);
+    }
+  };
   if (!personaId2) {
     queueMicrotask(() => {
       sink.onError(`cloud session has no persona id (cwd=${ctx.cwd})`);
-      stream.close();
+      exit();
     });
-    return driver.session;
-  }
-  void deps.client.openSession(personaId2, { toolSessionId: sessionId, instructions: ctx.titleOnly ? "" : cloudPiInstructions(ctx), expectedEngine: "pi", ...ctx.titleOnly ? { purpose: "title" } : {} }).then(
-    (opened) => {
-      channel = opened;
+    return { startTurn() {
+    }, respondPermission() {
+    }, interrupt() {
+    }, async stop() {
+    } };
+  }
+  const opened = deps.client.openEventSession(personaId2, { expectedEngine: "pi", toolSessionId: sessionId, instructions: ctx.titleOnly ? "" : cloudPiInstructions(ctx), ...ctx.titleOnly ? { purpose: "title" } : {} }).then(
+    (opened2) => {
+      channel = opened2;
+      channel.onEvents((events) => sink.pushEvents(events));
       channel.onControl((c2) => {
         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` }]);
@@ -65508,14 +65648,46 @@ function createCloudPiSession(ctx, sink, deps) {
           sink.onError(`\u4E91\u4E0A persona \u8D77\u4E0D\u6765\uFF1A${c2.message}`);
         }
       });
-      stream.attach(channel);
+      channel.onClose(exit);
+      if (closed) channel.close();
+      return channel;
     },
     (e) => {
       sink.onError(e instanceof CloudApiKeyRequiredError ? e.message : `\u8FDE\u4E0D\u4E0A\u4E91 gateway\uFF1A${e.message}`);
-      stream.close();
+      exit();
+      throw e;
     }
   );
-  return driver.session;
+  void opened.catch(() => {
+  });
+  let sendChain = Promise.resolve();
+  const send2 = (command) => {
+    sendChain = sendChain.then(command).catch((e) => {
+      if (!closed && !exited) sink.onError(`\u4E91\u4E0A\u4F1A\u8BDD\u4E0A\u884C\u5931\u8D25\uFF1A${e.message}`);
+    });
+  };
+  return {
+    startTurn(text) {
+      send2(async () => {
+        const ch = await opened;
+        if (closed) return;
+        const portable = await portableCloudInput(text, { fetchPiImage: deps.fetchImage ?? makeImageFetcher() });
+        await ch.send({ command: "turn", text: portable });
+      });
+    },
+    respondPermission(requestId, allow) {
+      send2(async () => (await opened).send({ command: "permission", requestId, allow }));
+    },
+    interrupt() {
+      send2(async () => (await opened).send({ command: "interrupt" }));
+    },
+    async stop() {
+      closed = true;
+      const ch = await opened.catch(() => null);
+      ch?.close();
+      exit();
+    }
+  };
 }
 
 // src/tools/pi-cloud.ts
@@ -73092,7 +73264,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.601".length > 0 ? "0.2.601" : "dev";
+var version = "0.2.603".length > 0 ? "0.2.603" : "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.601",
+  "version": "0.2.603",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",