@trim21/personal-pi-extensions 0.0.198 → 0.0.199

package/README.md

@@ -246,7 +246,7 @@ index.ts     —— pi adapter：把 core 接到 pi 的 sendMessage / 生命周
 
 ### 关键设计
 
-- **心跳即活跃**：每个 session 每 15s 写一次 `lastSeenAt`；`talk-list-sessions` 默认只显示最近 15 分钟内有心跳的 session，已结束/挂起的 session 自动从默认列表消失（`includeOffline: true` 可见全部）。`status` 用 45s 心跳阈值区分 live / not responding / offline。
+- **心跳即活跃**：每个 session 每 15s 写一次 `lastSeenAt`；`talk-list-sessions` 默认只显示最近 15 分钟内有心跳的 session，已结束/挂起的 session 自动从默认列表消失（`includeOffline: true` 可见全部）。`status` 用 45s 心跳阈值区分 live / not responding / offline，并显示 `working` / `waiting-talk-message`（`talk-wait` / `talk-ask` 阻塞等待中）/ `idle`。
 - **定期清理**：心跳停止超过 24h 且无未投递 mail 的记录会被定期 sweep（30 分钟一次）回收；有 mail 的保留 30 天。resume 后 session 会自动重新注册，无 mail 即无损失。
 - **投递成功才消费**：信件只在成功交给 `sendMessage` 后才从 inbox 删除，投递失败留在 inbox 下次重试——不会因 `sendMessage` 吞异常而静默丢信。
 - **双向 ask 仲裁**：`talk-ask` 发起前先检查收件箱（有对方消息就先读/先回）；阻塞等待期间若收到对方的 ask（而非 reply），按两个 ask 的 `ts` 字段仲裁——先 ask 者主导继续等，后 ask 者让位并先回复对方。`ts` 是信件内固定字段，双方读到同一对值，结论天然对称；同毫秒碰撞用 `session dir + session id` 字符串比较兜底。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.0.198",
+  "version": "0.0.199",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [

package/src/talk/core.ts

@@ -205,6 +205,11 @@ export class TalkCore {
     void this.writeSelf({ status: "working" });
   }
 
+  /** Blocked on talk-wait / talk-ask — visible as "waiting-talk-message". */
+  setWaiting(): void {
+    void this.writeSelf({ status: "waiting-talk-message" });
+  }
+
   setIdle(): void {
     void this.writeSelf({ status: "idle" });
   }
@@ -473,13 +478,19 @@ export class TalkCore {
   async wait(timeoutMs: number, signal?: AbortSignal): Promise<string> {
     const self = this.requireSelf();
     const deadline = this.now() + timeoutMs;
-    for (;;) {
-      const inbox = await listInbox(this.storage, self.addr);
-      const fresh = await this.consumeFresh(inbox);
-      if (fresh.length > 0) return fresh.map((l) => formatDelivery(l)).join("\n\n");
-      if (signal?.aborted) return "aborted";
-      if (this.now() >= deadline) return `No message within ${Math.round(timeoutMs / 1000)}s.`;
-      await sleep(WAIT_POLL_MS);
+    this.setWaiting();
+    try {
+      for (;;) {
+        const inbox = await listInbox(this.storage, self.addr);
+        const fresh = await this.consumeFresh(inbox);
+        if (fresh.length > 0) return fresh.map((l) => formatDelivery(l)).join("\n\n");
+        if (signal?.aborted) return "aborted";
+        if (this.now() >= deadline) return `No message within ${Math.round(timeoutMs / 1000)}s.`;
+        await sleep(WAIT_POLL_MS);
+      }
+    } finally {
+      // The tool call is still part of a running agent turn.
+      this.setWorking();
     }
   }
 
@@ -608,11 +619,17 @@ export class TalkCore {
       body,
       ts: sent.letter.ts,
     });
-    const outcome = await this.waitForReply(sent.letter.id, Math.max(1000, timeoutMs), signal);
-    await clearAsk(this.storage, self.addr, sent.letter.id);
-    if (!outcome.replied)
-      return `Ask ${sent.letter.id.slice(0, 8)} to "${record.name}": ${outcome.reason}.`;
-    return `"${record.name}" replied:\n\n${outcome.body}`;
+    this.setWaiting();
+    try {
+      const outcome = await this.waitForReply(sent.letter.id, Math.max(1000, timeoutMs), signal);
+      await clearAsk(this.storage, self.addr, sent.letter.id);
+      if (!outcome.replied)
+        return `Ask ${sent.letter.id.slice(0, 8)} to "${record.name}": ${outcome.reason}.`;
+      return `"${record.name}" replied:\n\n${outcome.body}`;
+    } finally {
+      // The ask tool call is still part of a running agent turn.
+      this.setWorking();
+    }
   }
 
   async reply(replyTo: string, body: string): Promise<string> {

package/src/talk/registry.ts

@@ -30,7 +30,11 @@ export const SessionRecordSchema = Type.Object({
   pid: Type.Number(),
   startedAt: Type.Number(),
   lastSeenAt: Type.Number(),
-  status: Type.Union([Type.Literal("idle"), Type.Literal("working")]),
+  status: Type.Union([
+    Type.Literal("idle"),
+    Type.Literal("working"),
+    Type.Literal("waiting-talk-message"),
+  ]),
   offline: Type.Optional(Type.Boolean()),
 });
 export type SessionRecord = Static<typeof SessionRecordSchema>;