@clawos-dev/clawd 0.2.30 → 0.2.31

package/dist/cli.cjs

@@ -8583,7 +8583,7 @@ var init_zod = __esm({
 });
 
 // ../protocol/src/persona-schemas.ts
-var PersonaTokenEntrySchema, PersonaFileSchema, PersonaHelloFrameSchema, PersonaSendFrameSchema, PersonaResetFrameSchema, PersonaPingFrameSchema, PersonaReadyFrameSchema, PersonaHistoryEventFrameSchema, PersonaHistoryDoneFrameSchema, PersonaEventFrameSchema, PersonaErrorFrameSchema, PersonaPongFrameSchema, PersonaHistoryPageRequestFrameSchema, PersonaHistoryPageFrameSchema, PersonaClientFrameSchema, PersonaServerFrameSchema, PersonaCreateArgsSchema, PersonaIdArgsSchema, PersonaUpdateArgsSchema, PersonaIssueTokenArgsSchema, PersonaRevokeTokenArgsSchema, PersonaAppendOwnerMessageArgsSchema;
+var PersonaTokenEntrySchema, PersonaFileSchema, PersonaCreateArgsSchema, PersonaIdArgsSchema, PersonaUpdateArgsSchema, PersonaIssueTokenArgsSchema, PersonaRevokeTokenArgsSchema, PersonaAppendOwnerMessageArgsSchema;
 var init_persona_schemas = __esm({
   "../protocol/src/persona-schemas.ts"() {
     "use strict";
@@ -8602,83 +8602,6 @@ var init_persona_schemas = __esm({
       createdAt: external_exports.number(),
       updatedAt: external_exports.number()
     }).strict();
-    PersonaHelloFrameSchema = external_exports.object({
-      kind: external_exports.literal("persona-hello"),
-      token: external_exports.string().min(1)
-    });
-    PersonaSendFrameSchema = external_exports.object({
-      kind: external_exports.literal("send"),
-      text: external_exports.string()
-    });
-    PersonaResetFrameSchema = external_exports.object({
-      kind: external_exports.literal("reset")
-    });
-    PersonaPingFrameSchema = external_exports.object({
-      kind: external_exports.literal("ping")
-    });
-    PersonaReadyFrameSchema = external_exports.object({
-      kind: external_exports.literal("persona-ready"),
-      subSessionId: external_exports.string(),
-      personaLabel: external_exports.string(),
-      cwd: external_exports.string(),
-      model: external_exports.string().optional()
-    });
-    PersonaHistoryEventFrameSchema = external_exports.object({
-      kind: external_exports.literal("history-event"),
-      event: external_exports.unknown()
-    });
-    PersonaHistoryDoneFrameSchema = external_exports.object({
-      kind: external_exports.literal("history-done"),
-      offset: external_exports.number().int().nonnegative(),
-      total: external_exports.number().int().nonnegative()
-    });
-    PersonaEventFrameSchema = external_exports.object({
-      kind: external_exports.literal("event"),
-      event: external_exports.unknown()
-    });
-    PersonaErrorFrameSchema = external_exports.object({
-      kind: external_exports.literal("error"),
-      code: external_exports.enum([
-        "TOKEN_INVALID",
-        "TOKEN_REVOKED",
-        "PERSONA_DELETED",
-        "PERSONA_NOT_PUBLIC",
-        "INTERNAL"
-      ]),
-      message: external_exports.string()
-    });
-    PersonaPongFrameSchema = external_exports.object({
-      kind: external_exports.literal("pong")
-    });
-    PersonaHistoryPageRequestFrameSchema = external_exports.object({
-      kind: external_exports.literal("history-page-request"),
-      requestId: external_exports.string().min(1),
-      limit: external_exports.number().int().positive(),
-      offset: external_exports.number().int().nonnegative()
-    });
-    PersonaHistoryPageFrameSchema = external_exports.object({
-      kind: external_exports.literal("history-page"),
-      requestId: external_exports.string().min(1),
-      events: external_exports.array(external_exports.unknown()),
-      offset: external_exports.number().int().nonnegative(),
-      total: external_exports.number().int().nonnegative()
-    });
-    PersonaClientFrameSchema = external_exports.discriminatedUnion("kind", [
-      PersonaHelloFrameSchema,
-      PersonaSendFrameSchema,
-      PersonaResetFrameSchema,
-      PersonaPingFrameSchema,
-      PersonaHistoryPageRequestFrameSchema
-    ]);
-    PersonaServerFrameSchema = external_exports.discriminatedUnion("kind", [
-      PersonaReadyFrameSchema,
-      PersonaHistoryEventFrameSchema,
-      PersonaHistoryDoneFrameSchema,
-      PersonaEventFrameSchema,
-      PersonaErrorFrameSchema,
-      PersonaPongFrameSchema,
-      PersonaHistoryPageFrameSchema
-    ]);
     PersonaCreateArgsSchema = external_exports.object({
       label: external_exports.string().min(1),
       personality: external_exports.string(),
@@ -16661,8 +16584,9 @@ var SessionManager = class {
   // 不进 SessionFile schema（避免破坏现有 zod parse），仅运行时缓存
   subSessionMetaBySid = /* @__PURE__ */ new Map();
   // persona-bound transport 订阅器：sessionId → Set<listener>。
-  // 仅推 reducer 产出的 'session:event' 帧里的 ParsedEvent，其他帧（status / info / cleared）
-  // 由调用方按需自行处理（persona-bound 简化协议只暴露 event 流，不需要这些）
+  // 透传 owner 路径白名单 EventFrame（routeFromRunner 决定哪些 type 进入），listener 端按
+  // `frame.type` narrow 出 'session:event'（ParsedEvent）/ 'session:status'（procAlive 同步）等。
+  // 这样 owner / listener 共用同一组事件字面量，新增跨端信号时只需在 fan-out 白名单里加 type。
   eventSubscribers = /* @__PURE__ */ new Map();
   // 按 agentId 拿对应的 SessionStore；persona-* agentId 使用 personaRoot 路径。
   // 'default' 直接复用 deps.store；其它 agentId 第一次访问时按需创建并缓存。
@@ -16717,15 +16641,14 @@ var SessionManager = class {
   routeFromRunner(frame, target) {
     const compressed = compressFrameForWire(frame);
     if (!compressed) return;
-    if (compressed.type === "session:event") {
+    if (compressed.type === "session:event" || compressed.type === "session:status") {
       const sid = compressed.sessionId;
-      const ev = compressed.event;
-      if (sid && ev) {
+      if (sid) {
         const subs = this.eventSubscribers.get(sid);
         if (subs && subs.size > 0) {
           for (const fn of subs) {
             try {
-              fn(ev);
+              fn(compressed);
             } catch {
             }
           }
@@ -17170,6 +17093,20 @@ var SessionManager = class {
   getActive(sessionId) {
     return this.runners.get(sessionId);
   }
+  /**
+   * 拿当前 sub-session 的 wire 形态 status（已 compress：内部 reducer 'spawning' / 'running-idle' /
+   * 'stopping' 等都压平）。无 runner 返回 'idle'（没 spawn 过）。
+   *
+   * 用途：listener 端 subscribe 时补推一次当前 status —— sessionManager.subscribe 注册的
+   * callback 只接未来 emit，不重放当前 status；不补推则 listener 进入时如果 sub-session
+   * 已 running，永远拿不到 procAlive 信号。owner 路径在 LocalWsServer.onSubscribe hook
+   * 重放 pendingQuestions（同一思路）。
+   */
+  getCurrentStatus(sessionId) {
+    const runner = this.runners.get(sessionId);
+    if (!runner) return "idle";
+    return compressStatus(runner.getState().status);
+  }
   // 给 observer 用：保证有 runner 但不 spawn（仅创建 state 容器）
   ensureSession(file) {
     let r = this.runners.get(file.sessionId);
@@ -17282,7 +17219,9 @@ var SessionManager = class {
     return { events: all.slice(start, end), offset, total };
   }
   /**
-   * persona-bound transport 用：订阅 sub-session 实时 ParsedEvent。
+   * persona-bound transport 用：订阅 sub-session 的 owner-side EventFrame（白名单透传）。
+   * 与 owner 路径共享同一组字面量，listener callback 拿到的 frame.type 当前可能是
+   * 'session:event'（ParsedEvent 流）或 'session:status'（procAlive）。
    * 返回 unsubscribe；不破坏现有 wire 广播路径——routeFromRunner 同时 fan-out 到
    * eventSubscribers 和 deps.broadcastFrame
    */
@@ -18453,6 +18392,11 @@ var PersonaBoundHandler = class {
         this.deps.logger.warn(`persona ws send failed: ${err.message}`);
       }
     };
+    const sendError = (requestId, code, message) => {
+      const errFrame = { type: "error", code, message };
+      if (requestId) errFrame.requestId = requestId;
+      send(errFrame);
+    };
     ws.on("message", (raw) => {
       let parsedRaw;
       try {
@@ -18461,18 +18405,19 @@ var PersonaBoundHandler = class {
         ws.close(4400, "PROTOCOL_VIOLATION");
         return;
       }
-      const parseResult = PersonaClientFrameSchema.safeParse(parsedRaw);
-      if (!parseResult.success) {
+      if (typeof parsedRaw !== "object" || parsedRaw === null) {
         ws.close(4400, "PROTOCOL_VIOLATION");
         return;
       }
-      const frame = parseResult.data;
+      const frame = parsedRaw;
       if (!scope) {
-        if (frame.kind !== "persona-hello") {
+        const authParse = AuthRequestFrameSchema.safeParse(frame);
+        if (!authParse.success) {
           ws.close(4400, "PROTOCOL_VIOLATION");
           return;
         }
-        const verify = this.deps.registry.verifyToken(personaId, frame.token);
+        const { token } = authParse.data;
+        const verify = this.deps.registry.verifyToken(personaId, token);
         if (!verify.ok) {
           const code = verify.code === "PERSONA_DELETED" ? 4404 : verify.code === "PERSONA_NOT_PUBLIC" ? 4403 : 4401;
           ws.close(code, verify.code);
@@ -18487,7 +18432,7 @@ var PersonaBoundHandler = class {
         try {
           const { sessionFile } = this.deps.personaManager.getOrCreateSubSession(
             personaId,
-            frame.token
+            token
           );
           subSessionFile = sessionFile;
         } catch (err) {
@@ -18498,111 +18443,128 @@ var PersonaBoundHandler = class {
           return;
         }
         scope = { personaId, subSessionId: subSessionFile.sessionId };
+        send({ type: "auth:ok" });
         send({
-          kind: "persona-ready",
-          subSessionId: subSessionFile.sessionId,
-          personaLabel: persona.label,
+          type: "session:info",
+          sessionId: subSessionFile.sessionId,
+          label: persona.label,
           cwd: this.deps.personaStore.personaDirPath(personaId),
-          model: persona.model
-        });
-        unsubscribe = this.deps.sessionManager.subscribe(
-          subSessionFile.sessionId,
-          personaId,
-          (event) => {
-            send({ kind: "event", event });
-          }
-        );
-        const FIRST_PAGE_SIZE = 50;
-        let firstPageOffset = 0;
-        let firstPageTotal = 0;
-        try {
-          const page = this.deps.sessionManager.readHistoryPage(
-            subSessionFile.sessionId,
-            personaId,
-            FIRST_PAGE_SIZE,
-            0
-          );
-          for (const event of page.events) {
-            send({ kind: "history-event", event });
-          }
-          firstPageOffset = page.events.length;
-          firstPageTotal = page.total;
-        } catch (err) {
-          this.deps.logger.warn(
-            `persona history read failed: ${err.message}`
-          );
-        }
-        send({
-          kind: "history-done",
-          offset: firstPageOffset,
-          total: firstPageTotal
+          ...persona.model ? { model: persona.model } : {}
         });
         return;
       }
-      switch (frame.kind) {
-        case "persona-hello":
-          ws.close(4400, "PROTOCOL_VIOLATION");
+      const type = frame.type;
+      const requestId = typeof frame.requestId === "string" ? frame.requestId : void 0;
+      if (type === "auth") {
+        ws.close(4400, "PROTOCOL_VIOLATION");
+        return;
+      }
+      if (type === "ping") {
+        send({ type: "pong", at: Date.now() });
+        return;
+      }
+      const requireScopedSession = () => {
+        if (frame.sessionId !== scope.subSessionId) {
+          sendError(requestId, "FORBIDDEN", "sessionId out of scope");
+          return false;
+        }
+        return true;
+      };
+      switch (type) {
+        case "session:subscribe": {
+          if (!requireScopedSession()) return;
+          if (unsubscribe) unsubscribe();
+          unsubscribe = this.deps.sessionManager.subscribe(
+            scope.subSessionId,
+            scope.personaId,
+            (eventFrame) => send(eventFrame)
+          );
+          if (requestId)
+            send({ type: "subscribed", requestId, sessionId: scope.subSessionId });
+          const currentStatus = this.deps.sessionManager.getCurrentStatus(scope.subSessionId);
+          send({
+            type: "session:status",
+            sessionId: scope.subSessionId,
+            status: currentStatus
+          });
           return;
-        case "send": {
+        }
+        case "session:unsubscribe": {
+          if (!requireScopedSession()) return;
+          if (unsubscribe) {
+            unsubscribe();
+            unsubscribe = null;
+          }
+          if (requestId) send({ type: "unsubscribed", requestId, sessionId: scope.subSessionId });
+          return;
+        }
+        case "session:send": {
+          if (!requireScopedSession()) return;
+          const text = frame.text;
+          if (typeof text !== "string") {
+            sendError(requestId, "VALIDATION_ERROR", "text must be string");
+            return;
+          }
           try {
             this.deps.sessionManager.sendForAgent({
               sessionId: scope.subSessionId,
               agentId: scope.personaId,
-              text: frame.text
+              text
             });
+            if (requestId) send({ type: "session:send", ok: true, requestId });
           } catch (err) {
-            this.deps.logger.warn(
-              `persona sendForAgent failed: ${err.message}`
-            );
+            const e = err;
+            sendError(requestId, e.code ?? "INTERNAL", e.message ?? String(err));
           }
           return;
         }
-        case "reset": {
+        case "session:new": {
+          if (!requireScopedSession()) return;
           try {
             this.deps.sessionManager.resetForAgent({
               sessionId: scope.subSessionId,
               agentId: scope.personaId
             });
+            if (requestId) send({ type: "session:info", sessionId: scope.subSessionId, requestId });
           } catch (err) {
-            this.deps.logger.warn(
-              `persona resetForAgent failed: ${err.message}`
-            );
+            const e = err;
+            sendError(requestId, e.code ?? "INTERNAL", e.message ?? String(err));
           }
           return;
         }
-        case "ping":
-          send({ kind: "pong" });
-          return;
-        case "history-page-request": {
+        case "history:read": {
+          if (!requireScopedSession()) return;
+          const limit = typeof frame.limit === "number" && frame.limit > 0 ? frame.limit : 50;
+          const offset = typeof frame.offset === "number" && frame.offset >= 0 ? frame.offset : 0;
           try {
             const page = this.deps.sessionManager.readHistoryPage(
               scope.subSessionId,
               scope.personaId,
-              frame.limit,
-              frame.offset
+              limit,
+              offset
             );
-            send({
-              kind: "history-page",
-              requestId: frame.requestId,
-              events: page.events,
-              offset: frame.offset,
-              // 请求值原样回传，便于 client 识别越界
-              total: page.total
-            });
+            if (requestId) {
+              send({
+                type: "history:read",
+                requestId,
+                events: page.events,
+                offset,
+                total: page.total
+              });
+            }
           } catch (err) {
-            this.deps.logger.warn(
-              `persona history-page-request failed: ${err.message}`
-            );
-            send({
-              kind: "history-page",
-              requestId: frame.requestId,
-              events: [],
-              offset: frame.offset,
-              total: 0
-            });
+            const e = err;
+            sendError(requestId, e.code ?? "INTERNAL", e.message ?? String(err));
           }
           return;
         }
+        default:
+          sendError(
+            requestId,
+            "METHOD_NOT_ALLOWED",
+            `${typeof type === "string" ? type : "unknown"} not allowed for listener`
+          );
+          return;
       }
     });
     ws.on("close", () => {

package/package.json

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