@trim21/personal-pi-extensions 0.0.198 → 0.0.201

package/README.md

@@ -234,7 +234,6 @@ index.ts     —— pi adapter：把 core 接到 pi 的 sendMessage / 生命周
 | -------------------- | -------------------------------------------------------------------------------------------------------------------------- |
 | `talk-list-sessions` | 列出其他 session，返回 JSON 数组（`status` / `work_dir` / `id` / `name`）；默认只列有心跳的，`includeOffline: true` 列全部 |
 | `talk-ask`           | 向某个 session 提问并阻塞等待回复（默认 30 分钟超时）                                                                      |
-| `talk-wait`          | 阻塞等待新消息到达                                                                                                         |
 | `talk-send`          | 发送纯文本消息（`to: "*"` 广播所有，`to: "cwd"` 广播同 cwd）                                                               |
 | `talk-reply`         | 回复一个 ask（`replyTo` 为 ask id，显式关联、不推断）                                                                      |
 
@@ -246,7 +245,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-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.201",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [

package/src/talk/core.ts

@@ -12,13 +12,12 @@
 import { isAbsolute, resolve } from "node:path";
 
 import { expandHome } from "../lib/path.js";
-import { formatDelivery, formatListing, refusalUnknown, shortAddr } from "./format.js";
+import { formatListing, refusalUnknown, shortAddr } from "./format.js";
 import {
   appendAudit,
   awaitReceipt,
   clearAsk,
   deposit,
-  type InboxItem,
   type Letter,
   type LetterKind,
   listInbox,
@@ -69,11 +68,8 @@ const HEARTBEAT_MS = 15_000;
 const WATCH_POLL_MS = 5000;
 const DELIVERY_BACKOFF_MS = 5000;
 const INITIAL_DRAIN_DELAY_MS = 1200;
-const WAIT_POLL_MS = 500;
 const SWEEP_INTERVAL_MS = 30 * 60 * 1000;
 
-const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
-
 /** Normalize an allowed path: expand ~, resolve relative against baseCwd, strip trailing slashes. */
 function normalizeAllowedPath(p: string, baseCwd: string): string {
   const expanded = expandHome(p);
@@ -205,6 +201,11 @@ export class TalkCore {
     void this.writeSelf({ status: "working" });
   }
 
+  /** Blocked on talk-ask — visible as "waiting-talk-message". */
+  setWaiting(): void {
+    void this.writeSelf({ status: "waiting-talk-message" });
+  }
+
   setIdle(): void {
     void this.writeSelf({ status: "idle" });
   }
@@ -320,28 +321,6 @@ export class TalkCore {
     }
   }
 
-  /** Read and consume fresh inbox letters, returning those to present to the model. */
-  private async consumeFresh(items: InboxItem[]): Promise<Letter[]> {
-    const self = this.requireSelf();
-    const fresh: Letter[] = [];
-    for (const item of items) {
-      if (this.deliveredIds.has(item.letter.id)) {
-        // Already handed out in a previous pass but the remove failed; only remove.
-        if (await removeLetter(this.storage, self.addr, item.fileName)) {
-          this.deliveredIds.delete(item.letter.id);
-        }
-        continue;
-      }
-      if (await this.processIncoming(item.letter)) fresh.push(item.letter);
-      if (await removeLetter(this.storage, self.addr, item.fileName)) {
-        // consumed
-      } else {
-        this.deliveredIds.add(item.letter.id);
-      }
-    }
-    return fresh;
-  }
-
   // ── Outbound ───────────────────────────────────────────────────────────
 
   /**
@@ -469,20 +448,6 @@ export class TalkCore {
 
   // ── Tool actions ───────────────────────────────────────────────────────
 
-  /** Block until a message arrives (or timeout/abort). */
-  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);
-    }
-  }
-
   /**
    * JSON listing of visible peer sessions. Defaults to sessions whose
    * heartbeat is fresh (within LIST_ACTIVE_MS); pass includeOffline to show
@@ -608,11 +573,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/index.ts

@@ -260,24 +260,6 @@ export default function talk(pi: ExtensionAPI) {
     },
   });
 
-  pi.registerTool({
-    name: "talk-wait",
-    label: "Wait for Talk Message",
-    description:
-      "Block until a new talk message arrives in your inbox (or until the timeout). Returns the message(s) that arrived.",
-    promptSnippet: "Wait for an incoming talk message",
-    parameters: Type.Object({
-      timeoutMs: Type.Optional(
-        Type.Number({ description: `How long to block in ms; default ${ASK_TIMEOUT_MS}` }),
-      ),
-    }),
-    async execute(_toolCallId, params, signal) {
-      const initError = requireInit();
-      if (initError) return toolResult(initError);
-      return toolResult(await core.wait(params.timeoutMs ?? ASK_TIMEOUT_MS, signal ?? undefined));
-    },
-  });
-
   pi.registerTool({
     name: "talk-send",
     label: "Send Talk Message",

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>;