@clawos-dev/clawd 0.2.193-beta.389.2a43229 → 0.2.194-beta.390.a17fa6d

package/dist/cli.cjs

@@ -156,6 +156,7 @@ var init_methods = __esm({
       // 联系人身份由中心 server introspect 背书，不再是"对方颁发的 capability"。
       // 写入路径：device:connect 落 store + 自动反向（决策 #11）；list / remove 作联系人列表读删。
       "contact:list",
+      "contact:pin",
       "contact:remove",
       // ---- visitor:* (web 访客 · persona web 分享，spec 2026-06-24-persona-web-share-design) ----
       // owner-only：列出登录访问过本机 public persona 的 web 访客（零安装、飞书登录、daemon 自签
@@ -247,7 +248,6 @@ var init_events = __esm({
     SESSION_STATUS_VALUES = [
       "idle",
       "running",
-      "running-idle",
       "stopped",
       "error",
       "observing"
@@ -304,7 +304,9 @@ var init_errors = __esm({
       // app-builder 单栏默认 refactor (spec 2026-06-02-app-builder-single-pane-default-design)：
       // appBuilder:createProject 加 personaId + session 未绑校验后抛的两个错码。
       WRONG_PERSONA: "WRONG_PERSONA",
-      SESSION_ALREADY_BOUND: "SESSION_ALREADY_BOUND"
+      SESSION_ALREADY_BOUND: "SESSION_ALREADY_BOUND",
+      // 2026-07-02 unified people sidebar: contact:pin 时 deviceId 不在 store（可能被别处删了）
+      CONTACT_NOT_FOUND: "CONTACT_NOT_FOUND"
     };
     ClawdError = class extends Error {
       constructor(code, message) {
@@ -5640,7 +5642,7 @@ var init_inbox = __esm({
 });
 
 // ../protocol/src/contact.ts
-var ContactSchema, ContactWireSchema, ContactRemoveArgsSchema, ContactRemoveOkSchema, ContactListOkSchema, ContactAddedFrameSchema, ContactRemovedFrameSchema;
+var ContactSchema, ContactWireSchema, ContactRemoveArgsSchema, ContactRemoveOkSchema, ContactListOkSchema, ContactAddedFrameSchema, ContactRemovedFrameSchema, ContactPinArgsSchema, ContactPinOkSchema, ContactPinnedFrameSchema;
 var init_contact = __esm({
   "../protocol/src/contact.ts"() {
     "use strict";
@@ -5669,7 +5671,13 @@ var init_contact = __esm({
       // 不用 .min(1)：自动反向路径合法地存空串，禁止填假 token 占位（不造假数据）。
       connectToken: external_exports.string(),
       grants: external_exports.array(GrantSchema),
-      addedAt: external_exports.number().int().nonnegative()
+      addedAt: external_exports.number().int().nonnegative(),
+      /**
+       * pin 时间戳（ms，Date.now() 语义）；null = 未 pin。sidebar 顶部固定区渲染由此驱动。
+       * 老 contacts.json 缺此字段 → zod default 补 null（无破坏性升级；不 orphan）。
+       * 对齐 SessionFile.pinnedAt 语义（daemon 侧持久化，contact:pin RPC 更新 → contact:pinned push）。
+       */
+      pinnedAt: external_exports.number().int().nullable().default(null)
     }).strict();
     ContactWireSchema = ContactSchema;
     ContactRemoveArgsSchema = external_exports.object({
@@ -5691,6 +5699,20 @@ var init_contact = __esm({
       type: external_exports.literal("contact:removed"),
       deviceId: external_exports.string().min(1)
     }).strict();
+    ContactPinArgsSchema = external_exports.object({
+      deviceId: external_exports.string().min(1),
+      pinned: external_exports.boolean()
+    }).strict();
+    ContactPinOkSchema = external_exports.object({
+      type: external_exports.literal("contact:pin:ok"),
+      deviceId: external_exports.string().min(1),
+      pinnedAt: external_exports.number().int().nullable()
+    }).strict();
+    ContactPinnedFrameSchema = external_exports.object({
+      type: external_exports.literal("contact:pinned"),
+      deviceId: external_exports.string().min(1),
+      pinnedAt: external_exports.number().int().nullable()
+    }).strict();
   }
 });
 
@@ -41759,23 +41781,13 @@ function pushEventToBuffer(state, event, deps) {
     effects.push({ kind: "persist-file", file: next.file });
     effects.push(sessionInfoFrame(next.file));
   }
-  if (isTurnEnd && next.procAlive && (next.status === "running" || next.status === "spawning")) {
+  if (isTurnEnd && next.subSessionMeta?.idleKillEnabled && next.procAlive && (next.status === "running" || next.status === "spawning")) {
     next.status = "running-idle";
     effects.push({
-      kind: "emit-frame",
-      frame: {
-        type: "session:status",
-        sessionId: next.file.sessionId,
-        status: "running-idle"
-      }
+      kind: "schedule-idle-kill",
+      sessionId: next.file.sessionId,
+      ms: IDLE_KILL_DELAY_MS
     });
-    if (next.subSessionMeta?.idleKillEnabled) {
-      effects.push({
-        kind: "schedule-idle-kill",
-        sessionId: next.file.sessionId,
-        ms: IDLE_KILL_DELAY_MS
-      });
-    }
   }
   return { state: next, effects };
 }
@@ -41802,12 +41814,6 @@ function applyCommand(state, command, deps) {
       if (next.status === "running-idle") {
         effects.push({ kind: "cancel-idle-kill", sessionId });
         next.status = next.procAlive ? "running" : "idle";
-        if (next.procAlive) {
-          effects.push({
-            kind: "emit-frame",
-            frame: { type: "session:status", sessionId, status: "running" }
-          });
-        }
       }
       if (!next.procAlive) {
         next.procAlive = true;
@@ -42809,10 +42815,9 @@ function compressFrameForWire(frame) {
   switch (status) {
     case "spawning":
     case "running":
-      compressed = "running";
-      break;
+    // sub-session（persona）专属内部状态：进程仍活着等 idle-kill；wire 协议看到的是 'running'
     case "running-idle":
-      compressed = "running-idle";
+      compressed = "running";
       break;
     case "stopping":
     case "stopped":
@@ -42838,9 +42843,8 @@ function compressStatus(status) {
   switch (status) {
     case "spawning":
     case "running":
-      return "running";
     case "running-idle":
-      return "running-idle";
+      return "running";
     case "stopping":
     case "stopped":
       return "stopped";
@@ -50314,6 +50318,18 @@ var ContactStore = class {
     if (existed) this.flush();
     return existed;
   }
+  /**
+   * 更新单条 contact 的 pinnedAt（对齐 session:pin pattern，2026-07-02 unified people sidebar）。
+   * @param pinnedAt null = 未 pin；number = pin 时间戳（daemon 侧 Date.now()）
+   * @returns 是否命中：deviceId 不存在返 false，调用方按需 error/broadcast；命中即 flush。
+   */
+  setPin(deviceId, pinnedAt) {
+    const existing = this.contacts.get(deviceId);
+    if (!existing) return false;
+    this.contacts.set(deviceId, { ...existing, pinnedAt });
+    this.flush();
+    return true;
+  }
   flush() {
     const file = path30.join(this.dataDir, FILE_NAME);
     const tmp = `${file}.tmp-${process.pid}-${Date.now()}`;
@@ -50460,7 +50476,8 @@ async function autoReverseContact(args) {
     remoteUrl: args.selfUrl,
     connectToken: "",
     grants,
-    addedAt: now()
+    addedAt: now(),
+    pinnedAt: null
   };
   args.store.upsert(base);
   args.broadcast({ type: "contact:added", contact: base });
@@ -53975,6 +53992,31 @@ function buildContactHandlers(deps) {
       }
     };
   };
+  const pin = async (frame, _client, ctx) => {
+    ensureOwner(ctx);
+    const { type: _t, requestId: _r, ...rest } = frame;
+    const args = ContactPinArgsSchema.parse(rest);
+    const pinnedAt = args.pinned ? deps.now() : null;
+    const hit = deps.store.setPin(args.deviceId, pinnedAt);
+    if (!hit) {
+      throw new ClawdError(
+        ERROR_CODES.CONTACT_NOT_FOUND,
+        `CONTACT_NOT_FOUND: contact ${args.deviceId} not in store`
+      );
+    }
+    deps.broadcast({
+      type: "contact:pinned",
+      deviceId: args.deviceId,
+      pinnedAt
+    });
+    return {
+      response: {
+        type: "contact:pin:ok",
+        deviceId: args.deviceId,
+        pinnedAt
+      }
+    };
+  };
   const remove = async (frame, _client, ctx) => {
     ensureOwner(ctx);
     const { type: _t, requestId: _r, ...rest } = frame;
@@ -53993,6 +54035,7 @@ function buildContactHandlers(deps) {
   };
   return {
     "contact:list": list,
+    "contact:pin": pin,
     "contact:remove": remove
   };
 }
@@ -54149,7 +54192,8 @@ function buildDeviceHandlers(deps) {
         // 过期后对方拒 TOKEN_EXPIRED → 重新 device:connect 换新票）
         connectToken: exchanged.token,
         grants: wh.grants,
-        addedAt: now()
+        addedAt: now(),
+        pinnedAt: null
       };
       deps.store.upsert(contact);
       deps.broadcast({ type: "contact:added", contact });
@@ -56461,7 +56505,8 @@ function buildMethodHandlers(deps) {
     }),
     ...buildContactHandlers({
       store: deps.contactStore,
-      broadcast: deps.broadcastToOwners
+      broadcast: deps.broadcastToOwners,
+      now: () => Date.now()
     }),
     whoami: buildWhoamiHandler({
       ownerDisplayName: deps.ownerDisplayName,
@@ -56796,6 +56841,7 @@ var METHOD_GRANT_MAP = {
   // 飞书统一身份 Phase 3 (决策 #14): received-capability:* 正名 contact:*。
   // 写入路径在 device:connect / 自动反向；list / remove 作联系人读 / 删，owner-only。
   "contact:list": ADMIN_ANY,
+  "contact:pin": ADMIN_ANY,
   "contact:remove": ADMIN_ANY,
   // ---- visitor:* (访客名单，owner-only) ----
   // owner 看完整访客名单（含没开会话的）；guest 不可调（handler 内再 assertOwner 兜底）。