@clawos-dev/clawd 0.2.56-beta.90.047fd4f → 0.2.56-beta.91.df217af

package/dist/cli.cjs

@@ -4404,6 +4404,10 @@ var init_methods = __esm({
       "persona:issueToken",
       "persona:revokeToken",
       "persona:listSubSessions",
+      // owner-side bootstrap RPC：拉 (personaId, token) tuple 下所有 listener sub-session
+      // 元数据。后续增量靠 persona:listenerChat:* push 维护，本 RPC 仅在 owner ws connect /
+      // reconnect 时一次性补齐 cache。
+      "persona:listListenerChatsForToken",
       "persona:appendOwnerMessage",
       "info",
       "ping"
@@ -8595,7 +8599,7 @@ var init_zod = __esm({
 });
 
 // ../protocol/src/persona-schemas.ts
-var PersonaTokenEntrySchema, PersonaFileSchema, PersonaInfoResponseSchema, PersonaCreateArgsSchema, PersonaIdArgsSchema, PersonaUpdateArgsSchema, PersonaIssueTokenArgsSchema, PersonaRevokeTokenArgsSchema, PersonaAppendOwnerMessageArgsSchema, ChatSummarySchema, ChatListRequestSchema, ChatListResponseSchema, ChatRenameRequestSchema, ChatRenameResponseSchema, ChatDeleteRequestSchema, ChatDeleteResponseSchema;
+var PersonaTokenEntrySchema, PersonaFileSchema, PersonaInfoResponseSchema, PersonaCreateArgsSchema, PersonaIdArgsSchema, PersonaUpdateArgsSchema, PersonaIssueTokenArgsSchema, PersonaRevokeTokenArgsSchema, PersonaAppendOwnerMessageArgsSchema, FRAME_TYPE_CHAT_OPEN, FRAME_TYPE_CHAT_RENAME, FRAME_TYPE_CHAT_DELETE, FRAME_TYPE_CHAT_LIST, FRAME_TYPE_CHAT_CREATED, FRAME_TYPE_CHAT_RENAMED, FRAME_TYPE_CHAT_DELETED, FRAME_TYPE_PERSONA_LISTENER_CHAT_CREATED, FRAME_TYPE_PERSONA_LISTENER_CHAT_RENAMED, FRAME_TYPE_PERSONA_LISTENER_CHAT_DELETED, FRAME_TYPE_PERSONA_LISTENER_STATUS, ChatSummarySchema, ChatOpenRequestSchema, ChatRenameRequestSchema, ChatDeleteRequestSchema, ChatRenameResponseSchema, ChatDeleteResponseSchema, ChatListPushSchema, ChatCreatedFrameSchema, ChatRenamedFrameSchema, ChatDeletedFrameSchema, PersonaListenerChatCreatedFrameSchema, PersonaListenerChatRenamedFrameSchema, PersonaListenerChatDeletedFrameSchema, PersonaListenerStatusFrameSchema, PersonaListListenerChatsForTokenArgsSchema, PersonaListListenerChatsForTokenResponseSchema;
 var init_persona_schemas = __esm({
   "../protocol/src/persona-schemas.ts"() {
     "use strict";
@@ -8654,47 +8658,116 @@ var init_persona_schemas = __esm({
       subSessionId: external_exports.string().min(1),
       text: external_exports.string().min(1)
     });
+    FRAME_TYPE_CHAT_OPEN = "chat:open";
+    FRAME_TYPE_CHAT_RENAME = "chat:rename";
+    FRAME_TYPE_CHAT_DELETE = "chat:delete";
+    FRAME_TYPE_CHAT_LIST = "chat:list";
+    FRAME_TYPE_CHAT_CREATED = "chat:created";
+    FRAME_TYPE_CHAT_RENAMED = "chat:renamed";
+    FRAME_TYPE_CHAT_DELETED = "chat:deleted";
+    FRAME_TYPE_PERSONA_LISTENER_CHAT_CREATED = "persona:listenerChat:created";
+    FRAME_TYPE_PERSONA_LISTENER_CHAT_RENAMED = "persona:listenerChat:renamed";
+    FRAME_TYPE_PERSONA_LISTENER_CHAT_DELETED = "persona:listenerChat:deleted";
+    FRAME_TYPE_PERSONA_LISTENER_STATUS = "persona:listenerStatus";
     ChatSummarySchema = external_exports.object({
       sessionId: external_exports.string().min(1),
-      /** 派生 sessionId 时使用的原始 chatId（'default' 为 root chat 保留值） */
+      /** 派生 sessionId 时使用的原始 chatId（永远三元组 hash 派生，无 default 特例） */
       chatId: external_exports.string().min(1),
       /** sub-session label，listener 视为 chat 名 */
       label: external_exports.string(),
       /** SessionFile.createdAt（ISO string） */
-      createdAt: external_exports.string(),
-      /** 是否为 default chat（sessionId 等于 ${personaId}-${tokenHash12} 时为 true） */
-      isDefault: external_exports.boolean()
+      createdAt: external_exports.string()
     });
-    ChatListRequestSchema = external_exports.object({
-      type: external_exports.literal("chat:list"),
+    ChatOpenRequestSchema = external_exports.object({
+      type: external_exports.literal(FRAME_TYPE_CHAT_OPEN),
+      /** 客户端生成的 chatId（uuid 推荐）；daemon 用三元组派生 sub-session sessionId */
+      chatId: external_exports.string().min(1),
+      /** 不存在时是否自动创建。true = 创建（典型：新建对话）；false/缺省 = 命中已有，否则 NOT_FOUND */
+      autoCreate: external_exports.boolean().optional(),
       requestId: external_exports.string().min(1).optional()
     });
-    ChatListResponseSchema = external_exports.object({
-      type: external_exports.literal("chat:list"),
-      requestId: external_exports.string().min(1).optional(),
-      chats: external_exports.array(ChatSummarySchema)
-    });
     ChatRenameRequestSchema = external_exports.object({
-      type: external_exports.literal("chat:rename"),
+      type: external_exports.literal(FRAME_TYPE_CHAT_RENAME),
       requestId: external_exports.string().min(1).optional(),
       sessionId: external_exports.string().min(1),
       label: external_exports.string().min(1)
     });
-    ChatRenameResponseSchema = external_exports.object({
-      type: external_exports.literal("chat:rename"),
-      requestId: external_exports.string().min(1).optional(),
-      ok: external_exports.literal(true)
-    });
     ChatDeleteRequestSchema = external_exports.object({
-      type: external_exports.literal("chat:delete"),
+      type: external_exports.literal(FRAME_TYPE_CHAT_DELETE),
       requestId: external_exports.string().min(1).optional(),
       sessionId: external_exports.string().min(1)
     });
+    ChatRenameResponseSchema = external_exports.object({
+      type: external_exports.literal(FRAME_TYPE_CHAT_RENAME),
+      requestId: external_exports.string().min(1).optional(),
+      ok: external_exports.literal(true)
+    });
     ChatDeleteResponseSchema = external_exports.object({
-      type: external_exports.literal("chat:delete"),
+      type: external_exports.literal(FRAME_TYPE_CHAT_DELETE),
       requestId: external_exports.string().min(1).optional(),
       ok: external_exports.literal(true)
     });
+    ChatListPushSchema = external_exports.object({
+      type: external_exports.literal(FRAME_TYPE_CHAT_LIST),
+      chats: external_exports.array(ChatSummarySchema)
+    });
+    ChatCreatedFrameSchema = external_exports.object({
+      type: external_exports.literal(FRAME_TYPE_CHAT_CREATED),
+      sessionId: external_exports.string().min(1),
+      chatId: external_exports.string().min(1),
+      label: external_exports.string().optional(),
+      /** ISO timestamp */
+      createdAt: external_exports.string().min(1)
+    });
+    ChatRenamedFrameSchema = external_exports.object({
+      type: external_exports.literal(FRAME_TYPE_CHAT_RENAMED),
+      sessionId: external_exports.string().min(1),
+      label: external_exports.string().min(1)
+    });
+    ChatDeletedFrameSchema = external_exports.object({
+      type: external_exports.literal(FRAME_TYPE_CHAT_DELETED),
+      sessionId: external_exports.string().min(1)
+    });
+    PersonaListenerChatCreatedFrameSchema = external_exports.object({
+      type: external_exports.literal(FRAME_TYPE_PERSONA_LISTENER_CHAT_CREATED),
+      personaId: external_exports.string().min(1),
+      /** owner 同时持有 token 字符串：sidebar 已经按 token 维度渲染 listener leaf，
+       *  push 帧用 token 直接定位归属 leaf。token 不是密钥，owner 本来就持有。 */
+      token: external_exports.string().min(1),
+      sessionId: external_exports.string().min(1),
+      chatId: external_exports.string().min(1),
+      label: external_exports.string().optional(),
+      createdAt: external_exports.string().min(1)
+    });
+    PersonaListenerChatRenamedFrameSchema = external_exports.object({
+      type: external_exports.literal(FRAME_TYPE_PERSONA_LISTENER_CHAT_RENAMED),
+      personaId: external_exports.string().min(1),
+      token: external_exports.string().min(1),
+      sessionId: external_exports.string().min(1),
+      label: external_exports.string().min(1)
+    });
+    PersonaListenerChatDeletedFrameSchema = external_exports.object({
+      type: external_exports.literal(FRAME_TYPE_PERSONA_LISTENER_CHAT_DELETED),
+      personaId: external_exports.string().min(1),
+      token: external_exports.string().min(1),
+      sessionId: external_exports.string().min(1),
+      /** 原始 chatId（用于 owner UI 比对 personaView.chatId 清理 stale selection） */
+      chatId: external_exports.string().min(1)
+    });
+    PersonaListenerStatusFrameSchema = external_exports.object({
+      type: external_exports.literal(FRAME_TYPE_PERSONA_LISTENER_STATUS),
+      personaId: external_exports.string().min(1),
+      token: external_exports.string().min(1),
+      status: external_exports.enum(["online", "offline"]),
+      activeWsCount: external_exports.number().int().nonnegative()
+    });
+    PersonaListListenerChatsForTokenArgsSchema = external_exports.object({
+      personaId: external_exports.string().min(1),
+      token: external_exports.string().min(1)
+    });
+    PersonaListListenerChatsForTokenResponseSchema = external_exports.object({
+      chats: external_exports.array(ChatSummarySchema)
+    });
   }
 });
 
@@ -8798,9 +8871,10 @@ var init_schemas = __esm({
       // owner-mode persona session 身份标识；UI 用它在 SessionList 过滤 + jump，
       // daemon 用它做 idempotent dedupe + spawn 时派生 ctx.personaMode='owner'
       ownerPersonaId: external_exports.string().min(1).optional(),
-      // listener-mode sub-session 的原始 chatId（owner-mode 不设；旧数据缺省）
-      // alice 端 chat:list 拿到 chatId 后用它发 auth 帧重连同一 sub-session；
-      // daemon 派生 sessionId 是单向 hash，必须保留原始 chatId 才能让 alice 重建连接
+      // listener-mode sub-session 的原始 chatId（owner-mode 不写；listener-scope 强制写入）。
+      // 派生 sessionId 是单向 hash `${personaId}-${tokenHash12}-${chatHash8}`，必须保留原始 chatId
+      // 才能让 alice 重连同一 sub-session（持久化在 alice localStorage 之外，由 daemon push 同步）。
+      // optional 是因为 owner-mode session 不带；只要写入就是 listener-mode 必填三元组。
       chatId: external_exports.string().min(1).optional(),
       createdAt: external_exports.string().min(1),
       updatedAt: external_exports.string().min(1)
@@ -9233,8 +9307,7 @@ var init_schemas = __esm({
     AuthRequestFrameSchema = external_exports.object({
       type: external_exports.literal("auth"),
       token: external_exports.string().min(1),
-      scheme: external_exports.literal("bearer").optional(),
-      chatId: external_exports.string().optional()
+      scheme: external_exports.literal("bearer").optional()
     });
     AuthOkFrameSchema = external_exports.object({
       type: external_exports.literal("auth:ok"),
@@ -17989,16 +18062,21 @@ var PersonaManager = class {
     return updated;
   }
   /**
-   * 拿到（或按需创建）该 token 对应的 sub-session。subSessionId 由 personaId + token 哈希派生
-   * 保证 idempotent：同一 token 永远复用同一个 sub-session。
+   * 拿到（或按需创建）该 (token, chatId) 对应的 sub-session。subSessionId 由 personaId + token +
+   * chatId 三元组 hash 派生，保证 idempotent：同一 tuple 永远复用同一个 sub-session。
+   *
+   * chatId 必填 —— listener 协议从 v2 起拆 phase：客户端 auth 后通过 chat:open(chatId, autoCreate?)
+   * 显式进入某个 chat；不再有 'default' 默认值。chatId 通常是客户端生成的 uuid，落 listener 端
+   * 持久化由客户端负责（daemon 不替客户端记忆"最近哪个 chat"）。
+   *
    * 创建路径：开启 idleKillEnabled，cwd 取 persona 目录，不再硬编码 permission mode / tool allowlist
    * （sandbox 约束移到 persona dir 下的 .claude/settings.json，由 OS-level Seatbelt 执行）
    */
   getOrCreateSubSession(personaId, token, chatId) {
     const persona = this.deps.registry.get(personaId);
     if (!persona) throw new Error(`persona not found: ${personaId}`);
-    const normalizedChatId = chatId && chatId.length > 0 ? chatId : "default";
-    const subSessionId = this.deriveSubSessionId(personaId, token, normalizedChatId);
+    if (!chatId) throw new Error("chatId is required");
+    const subSessionId = this.deriveSubSessionId(personaId, token, chatId);
     const scope = { kind: "persona", personaId, mode: "listener" };
     const existing = this.deps.sessionManager.readForScope(subSessionId, scope);
     if (existing) {
@@ -18013,10 +18091,28 @@ var PersonaManager = class {
       tool: "claude",
       label: subLabel,
       model: persona.model,
-      chatId: normalizedChatId
+      chatId
     });
     return { sessionFile, isNew: true };
   }
+  /**
+   * 检查 (token, chatId) 对应的 sub-session 是否存在；不存在返回 null。
+   * chat:open(autoCreate=false) 路径用：listener 想"只切已有 chat"时不能撞 auto-create。
+   */
+  getSubSession(personaId, token, chatId) {
+    if (!chatId) return null;
+    const subSessionId = this.deriveSubSessionId(personaId, token, chatId);
+    const scope = { kind: "persona", personaId, mode: "listener" };
+    return this.deps.sessionManager.readForScope(subSessionId, scope);
+  }
+  /**
+   * 校验 sessionId 是否属于 (personaId, token) tuple（前 12 字符 tokenHash 一致）。
+   * chat:rename / chat:delete 用：listener 只能操作自己 tuple 内的 chat。
+   */
+  tokenPrefixFor(personaId, token) {
+    const tokenHash = import_node_crypto3.default.createHash("sha256").update(token).digest("hex").slice(0, 12);
+    return `${personaId}-${tokenHash}`;
+  }
   /**
    * 老板插话：把"老板的话"作为 meta-text + metaSource='owner' 推到 sub-session 的事件流。
    * 委托 SessionManager.injectOwnerMessage 路由到 reducer 'inject-owner-text' input
@@ -18045,13 +18141,11 @@ var PersonaManager = class {
     throw new Error(`failed to generate unique personaId for label=${label}`);
   }
   /**
-   * subSessionId 派生：
-   * - chatId='default' → 二元组 `${personaId}-${tokenHash12}` (root 兼容，旧路径不变)
-   * - chatId 非 default → 三元组 `${personaId}-${tokenHash12}-${chatHash8}`
+   * subSessionId 派生：永远三元组 `${personaId}-${tokenHash12}-${chatHash8}`，无 default 特例。
+   * 旧 v1 实现保留 default 二元组兼容已废除。
    */
   deriveSubSessionId(personaId, token, chatId) {
     const tokenHash = import_node_crypto3.default.createHash("sha256").update(token).digest("hex").slice(0, 12);
-    if (chatId === "default") return `${personaId}-${tokenHash}`;
     const chatHash = import_node_crypto3.default.createHash("sha256").update(chatId).digest("hex").slice(0, 8);
     return `${personaId}-${tokenHash}-${chatHash}`;
   }
@@ -19180,9 +19274,14 @@ var PersonaBoundHandler = class {
     this.deps = deps;
   }
   deps;
+  // tuple fan-out 表：tokenPrefix → 同 tuple 所有 listener ws 的 send fn 集合
+  tupleSubscribers = /* @__PURE__ */ new Map();
+  // tuple → 当前活跃 ws 数；从 0→1 emit online；从 1→0 emit offline
+  listenerWsCount = /* @__PURE__ */ new Map();
   handle(ws, personaId) {
+    let phase = "pre-auth";
     let scope = null;
-    let unsubscribe = null;
+    let unsubscribeSession = null;
     const send = (frame) => {
       try {
         ws.send(JSON.stringify(frame));
@@ -19195,6 +19294,39 @@ var PersonaBoundHandler = class {
       if (requestId) errFrame.requestId = requestId;
       send(errFrame);
     };
+    const cleanupTupleRegistration = () => {
+      if (!scope) return;
+      const subs = this.tupleSubscribers.get(scope.tokenPrefix);
+      if (subs) {
+        subs.delete(send);
+        if (subs.size === 0) this.tupleSubscribers.delete(scope.tokenPrefix);
+      }
+      const before = this.listenerWsCount.get(scope.tokenPrefix) ?? 0;
+      const after = before - 1;
+      if (after <= 0) {
+        this.listenerWsCount.delete(scope.tokenPrefix);
+        this.deps.ownerBroadcast(
+          PersonaListenerStatusFrameSchema.parse({
+            type: FRAME_TYPE_PERSONA_LISTENER_STATUS,
+            personaId: scope.personaId,
+            token: scope.token,
+            status: "offline",
+            activeWsCount: 0
+          })
+        );
+      } else {
+        this.listenerWsCount.set(scope.tokenPrefix, after);
+        this.deps.ownerBroadcast(
+          PersonaListenerStatusFrameSchema.parse({
+            type: FRAME_TYPE_PERSONA_LISTENER_STATUS,
+            personaId: scope.personaId,
+            token: scope.token,
+            status: "online",
+            activeWsCount: after
+          })
+        );
+      }
+    };
     ws.on("message", (raw) => {
       let parsedRaw;
       try {
@@ -19208,7 +19340,7 @@ var PersonaBoundHandler = class {
         return;
       }
       const frame = parsedRaw;
-      if (!scope) {
+      if (phase === "pre-auth") {
         const authParse = AuthRequestFrameSchema.safeParse(frame);
         if (!authParse.success) {
           ws.close(4400, "PROTOCOL_VIOLATION");
@@ -19226,30 +19358,33 @@ var PersonaBoundHandler = class {
           ws.close(4404, "PERSONA_DELETED");
           return;
         }
-        let subSessionFile;
-        try {
-          const { sessionFile } = this.deps.personaManager.getOrCreateSubSession(
+        const tokenPrefix = this.deps.personaManager.tokenPrefixFor(personaId, token);
+        scope = { personaId, token, tokenPrefix };
+        phase = "tuple-watch";
+        let subs = this.tupleSubscribers.get(tokenPrefix);
+        if (!subs) {
+          subs = /* @__PURE__ */ new Set();
+          this.tupleSubscribers.set(tokenPrefix, subs);
+        }
+        subs.add(send);
+        const nextCount = (this.listenerWsCount.get(tokenPrefix) ?? 0) + 1;
+        this.listenerWsCount.set(tokenPrefix, nextCount);
+        this.deps.ownerBroadcast(
+          PersonaListenerStatusFrameSchema.parse({
+            type: FRAME_TYPE_PERSONA_LISTENER_STATUS,
             personaId,
             token,
-            authParse.data.chatId
-          );
-          subSessionFile = sessionFile;
-        } catch (err) {
-          this.deps.logger.warn(
-            `persona getOrCreateSubSession failed: ${err.message}`
-          );
-          ws.close(1011, "INTERNAL");
-          return;
-        }
-        scope = { personaId, subSessionId: subSessionFile.sessionId };
+            status: "online",
+            activeWsCount: nextCount
+          })
+        );
         send({ type: "auth:ok" });
-        send({
-          type: "session:info",
-          sessionId: subSessionFile.sessionId,
-          label: persona.label,
-          cwd: this.deps.personaStore.personaDirPath(personaId),
-          ...persona.model ? { model: persona.model } : {}
-        });
+        send(
+          ChatListPushSchema.parse({
+            type: FRAME_TYPE_CHAT_LIST,
+            chats: this.listChatsForTuple(personaId, tokenPrefix)
+          })
+        );
         return;
       }
       const type = frame.type;
@@ -19262,8 +19397,183 @@ var PersonaBoundHandler = class {
         send({ type: "pong", at: Date.now() });
         return;
       }
+      if (!scope) {
+        ws.close(4400, "PROTOCOL_VIOLATION");
+        return;
+      }
+      if (type === "chat:open") {
+        const parsed = ChatOpenRequestSchema.safeParse(frame);
+        if (!parsed.success) {
+          sendError(requestId, "VALIDATION_ERROR", parsed.error.message);
+          return;
+        }
+        const { chatId, autoCreate } = parsed.data;
+        let sessionFile;
+        let isNew = false;
+        try {
+          if (autoCreate) {
+            const r = this.deps.personaManager.getOrCreateSubSession(scope.personaId, scope.token, chatId);
+            sessionFile = r.sessionFile;
+            isNew = r.isNew;
+          } else {
+            sessionFile = this.deps.personaManager.getSubSession(scope.personaId, scope.token, chatId);
+            if (!sessionFile) {
+              sendError(requestId, "SESSION_NOT_FOUND", `chatId not found: ${chatId}`);
+              return;
+            }
+          }
+        } catch (err) {
+          sendError(requestId, "INTERNAL", err.message);
+          return;
+        }
+        if (unsubscribeSession && scope.activeSubSessionId !== sessionFile.sessionId) {
+          unsubscribeSession();
+          unsubscribeSession = null;
+        }
+        if (!unsubscribeSession) {
+          unsubscribeSession = this.deps.sessionManager.subscribe(
+            sessionFile.sessionId,
+            { kind: "persona", personaId: scope.personaId, mode: "listener" },
+            (eventFrame) => send(eventFrame)
+          );
+        }
+        scope.activeSubSessionId = sessionFile.sessionId;
+        phase = "chat-active";
+        const persona = this.deps.registry.get(scope.personaId);
+        const infoFrame = {
+          type: "session:info",
+          sessionId: sessionFile.sessionId,
+          chatId,
+          label: persona?.label ?? "",
+          cwd: sessionFile.cwd
+        };
+        if (persona?.model) infoFrame.model = persona.model;
+        if (requestId) infoFrame.requestId = requestId;
+        send(infoFrame);
+        send({
+          type: "session:status",
+          sessionId: sessionFile.sessionId,
+          status: this.deps.sessionManager.getCurrentStatus(sessionFile.sessionId)
+        });
+        if (isNew) {
+          const createdBase = {
+            sessionId: sessionFile.sessionId,
+            chatId,
+            label: sessionFile.label,
+            createdAt: sessionFile.createdAt
+          };
+          this.fanoutTuple(
+            scope.tokenPrefix,
+            ChatCreatedFrameSchema.parse({ type: FRAME_TYPE_CHAT_CREATED, ...createdBase })
+          );
+          this.deps.ownerBroadcast(
+            PersonaListenerChatCreatedFrameSchema.parse({
+              type: FRAME_TYPE_PERSONA_LISTENER_CHAT_CREATED,
+              personaId: scope.personaId,
+              token: scope.token,
+              ...createdBase
+            })
+          );
+        }
+        return;
+      }
+      if (type === "chat:rename") {
+        const parsed = ChatRenameRequestSchema.safeParse(frame);
+        if (!parsed.success) {
+          sendError(requestId, "VALIDATION_ERROR", parsed.error.message);
+          return;
+        }
+        const { sessionId: targetId, label } = parsed.data;
+        if (!this.isInTuple(targetId, scope.tokenPrefix)) {
+          sendError(requestId, "FORBIDDEN", "sessionId out of (persona, token) scope");
+          return;
+        }
+        try {
+          this.deps.sessionManager.renameForScope({
+            sessionId: targetId,
+            scope: { kind: "persona", personaId: scope.personaId, mode: "listener" },
+            label
+          });
+        } catch (err) {
+          const e = err;
+          sendError(requestId, e.code ?? "INTERNAL", e.message ?? String(err));
+          return;
+        }
+        if (requestId) send({ type: FRAME_TYPE_CHAT_RENAME, requestId, ok: true });
+        this.fanoutTuple(
+          scope.tokenPrefix,
+          ChatRenamedFrameSchema.parse({ type: FRAME_TYPE_CHAT_RENAMED, sessionId: targetId, label })
+        );
+        this.deps.ownerBroadcast(
+          PersonaListenerChatRenamedFrameSchema.parse({
+            type: FRAME_TYPE_PERSONA_LISTENER_CHAT_RENAMED,
+            personaId: scope.personaId,
+            token: scope.token,
+            sessionId: targetId,
+            label
+          })
+        );
+        return;
+      }
+      if (type === "chat:delete") {
+        const parsed = ChatDeleteRequestSchema.safeParse(frame);
+        if (!parsed.success) {
+          sendError(requestId, "VALIDATION_ERROR", parsed.error.message);
+          return;
+        }
+        const { sessionId: targetId } = parsed.data;
+        if (!this.isInTuple(targetId, scope.tokenPrefix)) {
+          sendError(requestId, "FORBIDDEN", "sessionId out of (persona, token) scope");
+          return;
+        }
+        const before = this.deps.sessionManager.readForScope(targetId, {
+          kind: "persona",
+          personaId: scope.personaId,
+          mode: "listener"
+        });
+        const chatIdForFrame = before?.chatId ?? "unknown";
+        try {
+          this.deps.sessionManager.deleteForScope({
+            sessionId: targetId,
+            scope: { kind: "persona", personaId: scope.personaId, mode: "listener" }
+          });
+        } catch (err) {
+          const e = err;
+          sendError(requestId, e.code ?? "INTERNAL", e.message ?? String(err));
+          return;
+        }
+        if (requestId) send({ type: FRAME_TYPE_CHAT_DELETE, requestId, ok: true });
+        this.fanoutTuple(
+          scope.tokenPrefix,
+          ChatDeletedFrameSchema.parse({ type: FRAME_TYPE_CHAT_DELETED, sessionId: targetId })
+        );
+        this.deps.ownerBroadcast(
+          PersonaListenerChatDeletedFrameSchema.parse({
+            type: FRAME_TYPE_PERSONA_LISTENER_CHAT_DELETED,
+            personaId: scope.personaId,
+            token: scope.token,
+            sessionId: targetId,
+            chatId: chatIdForFrame
+          })
+        );
+        if (scope.activeSubSessionId === targetId) {
+          unsubscribeSession?.();
+          unsubscribeSession = null;
+          scope.activeSubSessionId = void 0;
+          phase = "tuple-watch";
+        }
+        return;
+      }
+      if (phase !== "chat-active" || !scope.activeSubSessionId) {
+        sendError(
+          requestId,
+          "METHOD_NOT_ALLOWED",
+          `${typeof type === "string" ? type : "unknown"} requires chat:open first`
+        );
+        return;
+      }
       const requireScopedSession = () => {
-        if (frame.sessionId !== scope.subSessionId) {
+        if (frame.sessionId !== scope.activeSubSessionId) {
           sendError(requestId, "FORBIDDEN", "sessionId out of scope");
           return false;
         }
@@ -19275,33 +19585,6 @@ var PersonaBoundHandler = class {
         mode: "listener"
       });
       switch (type) {
-        case "session:subscribe": {
-          if (!requireScopedSession()) return;
-          if (unsubscribe) unsubscribe();
-          unsubscribe = this.deps.sessionManager.subscribe(
-            scope.subSessionId,
-            listenerScope(),
-            (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 "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;
@@ -19311,7 +19594,7 @@ var PersonaBoundHandler = class {
           }
           try {
             this.deps.sessionManager.sendForScope({
-              sessionId: scope.subSessionId,
+              sessionId: scope.activeSubSessionId,
               scope: listenerScope(),
               text
             });
@@ -19326,10 +19609,11 @@ var PersonaBoundHandler = class {
           if (!requireScopedSession()) return;
           try {
             this.deps.sessionManager.resetForScope({
-              sessionId: scope.subSessionId,
+              sessionId: scope.activeSubSessionId,
               scope: listenerScope()
             });
-            if (requestId) send({ type: "session:info", sessionId: scope.subSessionId, requestId });
+            if (requestId)
+              send({ type: "session:info", sessionId: scope.activeSubSessionId, requestId });
           } catch (err) {
             const e = err;
             sendError(requestId, e.code ?? "INTERNAL", e.message ?? String(err));
@@ -19342,7 +19626,7 @@ var PersonaBoundHandler = class {
           const offset = typeof frame.offset === "number" && frame.offset >= 0 ? frame.offset : 0;
           try {
             const page = this.deps.sessionManager.readHistoryPageForScope(
-              scope.subSessionId,
+              scope.activeSubSessionId,
               listenerScope(),
               limit,
               offset
@@ -19362,94 +19646,6 @@ var PersonaBoundHandler = class {
           }
           return;
         }
-        case "chat:list": {
-          const tokenPart = scope.subSessionId.slice(
-            scope.personaId.length + 1,
-            scope.personaId.length + 1 + 12
-          );
-          const tokenPrefix = `${scope.personaId}-${tokenPart}`;
-          try {
-            const all = this.deps.sessionManager.listPersonaSessions(scope.personaId, "listener");
-            const sameTuple = all.filter(
-              (s) => s.sessionId === tokenPrefix || s.sessionId.startsWith(`${tokenPrefix}-`)
-            );
-            const chats = sameTuple.map((s) => ({
-              sessionId: s.sessionId,
-              chatId: s.chatId ?? (s.sessionId === tokenPrefix ? "default" : "unknown"),
-              label: s.label ?? "",
-              createdAt: s.createdAt,
-              isDefault: s.sessionId === tokenPrefix
-            }));
-            if (requestId) send({ type: "chat:list", requestId, chats });
-            else send({ type: "chat:list", chats });
-          } catch (err) {
-            const e = err;
-            sendError(requestId, e.code ?? "INTERNAL", e.message ?? String(err));
-          }
-          return;
-        }
-        case "chat:rename": {
-          const targetId = frame.sessionId;
-          const newLabel = frame.label;
-          if (typeof targetId !== "string" || targetId.length === 0) {
-            sendError(requestId, "VALIDATION_ERROR", "sessionId must be non-empty string");
-            return;
-          }
-          if (typeof newLabel !== "string" || newLabel.length === 0) {
-            sendError(requestId, "VALIDATION_ERROR", "label must be non-empty string");
-            return;
-          }
-          const tokenPart = scope.subSessionId.slice(
-            scope.personaId.length + 1,
-            scope.personaId.length + 1 + 12
-          );
-          const tokenPrefix = `${scope.personaId}-${tokenPart}`;
-          const sameTuple = targetId === tokenPrefix || targetId.startsWith(`${tokenPrefix}-`);
-          if (!sameTuple) {
-            sendError(requestId, "FORBIDDEN", "sessionId out of (persona, token) scope");
-            return;
-          }
-          try {
-            this.deps.sessionManager.renameForScope({
-              sessionId: targetId,
-              scope: listenerScope(),
-              label: newLabel
-            });
-            if (requestId) send({ type: "chat:rename", requestId, ok: true });
-          } catch (err) {
-            const e = err;
-            sendError(requestId, e.code ?? "INTERNAL", e.message ?? String(err));
-          }
-          return;
-        }
-        case "chat:delete": {
-          const targetId = frame.sessionId;
-          if (typeof targetId !== "string" || targetId.length === 0) {
-            sendError(requestId, "VALIDATION_ERROR", "sessionId must be non-empty string");
-            return;
-          }
-          const tokenPart = scope.subSessionId.slice(
-            scope.personaId.length + 1,
-            scope.personaId.length + 1 + 12
-          );
-          const tokenPrefix = `${scope.personaId}-${tokenPart}`;
-          const sameTuple = targetId === tokenPrefix || targetId.startsWith(`${tokenPrefix}-`);
-          if (!sameTuple) {
-            sendError(requestId, "FORBIDDEN", "sessionId out of (persona, token) scope");
-            return;
-          }
-          try {
-            this.deps.sessionManager.deleteForScope({
-              sessionId: targetId,
-              scope: listenerScope()
-            });
-            if (requestId) send({ type: "chat:delete", requestId, ok: true });
-          } catch (err) {
-            const e = err;
-            sendError(requestId, e.code ?? "INTERNAL", e.message ?? String(err));
-          }
-          return;
-        }
         default:
           sendError(
             requestId,
@@ -19460,10 +19656,43 @@ var PersonaBoundHandler = class {
       }
     });
     ws.on("close", () => {
-      unsubscribe?.();
-      unsubscribe = null;
+      unsubscribeSession?.();
+      unsubscribeSession = null;
+      cleanupTupleRegistration();
     });
   }
+  // ---- helpers ----
+  fanoutTuple(tokenPrefix, frame) {
+    const subs = this.tupleSubscribers.get(tokenPrefix);
+    if (!subs) return;
+    for (const fn of subs) {
+      try {
+        fn(frame);
+      } catch {
+      }
+    }
+  }
+  isInTuple(sessionId, tokenPrefix) {
+    return sessionId === tokenPrefix || sessionId.startsWith(`${tokenPrefix}-`);
+  }
+  listChatsForTuple(personaId, tokenPrefix) {
+    const all = this.deps.sessionManager.listPersonaSessions(personaId, "listener");
+    return all.filter((s) => s.sessionId === tokenPrefix || s.sessionId.startsWith(`${tokenPrefix}-`)).map((s) => ({
+      sessionId: s.sessionId,
+      chatId: s.chatId ?? "unknown",
+      label: s.label ?? "",
+      createdAt: s.createdAt
+    }));
+  }
+  // ---------------- owner-side helpers ----------------
+  /**
+   * owner-side bootstrap RPC：拉 (personaId, token) tuple 下所有 listener sub-session 元数据。
+   * 由 handlers/persona.ts persona:listListenerChatsForToken 调用。
+   */
+  listChatsForOwner(personaId, token) {
+    const tokenPrefix = this.deps.personaManager.tokenPrefixFor(personaId, token);
+    return this.listChatsForTuple(personaId, tokenPrefix);
+  }
 };
 
 // src/transport/auth.ts
@@ -20882,7 +21111,7 @@ function buildMetaHandlers(deps) {
 // src/handlers/persona.ts
 init_protocol();
 function buildPersonaHandlers(deps) {
-  const { personaManager, personaRegistry, sessionManager } = deps;
+  const { personaManager, personaRegistry, sessionManager, personaBoundHandler } = deps;
   const create = async (frame) => {
     const { type: _type, requestId: _requestId, ...rest } = frame;
     const args = PersonaCreateArgsSchema.parse(rest);
@@ -20945,6 +21174,13 @@ function buildPersonaHandlers(deps) {
       response: { type: "persona:appendOwnerMessage", ok: true }
     };
   };
+  const listListenerChatsForToken = async (frame) => {
+    const args = PersonaListListenerChatsForTokenArgsSchema.parse(frame);
+    const chats = personaBoundHandler.listChatsForOwner(args.personaId, args.token);
+    return {
+      response: { type: "persona:listListenerChatsForToken", chats }
+    };
+  };
   return {
     "persona:create": create,
     "persona:list": list,
@@ -20954,6 +21190,7 @@ function buildPersonaHandlers(deps) {
     "persona:issueToken": issueToken,
     "persona:revokeToken": revokeToken,
     "persona:listSubSessions": listSubSessions,
+    "persona:listListenerChatsForToken": listListenerChatsForToken,
     "persona:appendOwnerMessage": appendOwnerMessage
   };
 }
@@ -20971,7 +21208,8 @@ function buildMethodHandlers(deps) {
     ...buildPersonaHandlers({
       personaManager: deps.personaManager,
       personaRegistry: deps.personaRegistry,
-      sessionManager: deps.manager
+      sessionManager: deps.manager,
+      personaBoundHandler: deps.personaBoundHandler
     })
   };
 }
@@ -21079,6 +21317,16 @@ async function startDaemon(config) {
     sessionManager: manager
   });
   let currentTunnelUrl = null;
+  const personaBoundHandler = new PersonaBoundHandler({
+    registry: personaRegistry,
+    personaManager,
+    personaStore,
+    sessionManager: manager,
+    logger,
+    ownerBroadcast: (frame) => {
+      transport?.broadcastAll(frame);
+    }
+  });
   const handlers = buildMethodHandlers({
     manager,
     workspace,
@@ -21090,15 +21338,9 @@ async function startDaemon(config) {
     store,
     personaManager,
     personaRegistry,
+    personaBoundHandler,
     getTunnelUrl: () => currentTunnelUrl
   });
-  const personaBoundHandler = new PersonaBoundHandler({
-    registry: personaRegistry,
-    personaManager,
-    personaStore,
-    sessionManager: manager,
-    logger
-  });
   wsServer = new LocalWsServer({
     host: config.host,
     port: config.port,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.56-beta.90.047fd4f",
+  "version": "0.2.56-beta.91.df217af",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",