pi-link 0.1.2 → 0.1.4

package/CHANGELOG.md

@@ -0,0 +1,97 @@
+# Changelog
+
+All notable changes to pi-link are documented here.
+
+This changelog is based on the git history from `2026-03-21` (initial commit as `pi-mesh`) through `2026-03-30` (current). Versions correspond to npm publishes.
+
+---
+
+## 0.1.4 — 2026-03-30
+
+### Added
+
+- **Heartbeat-based prompt timeout.** `link_prompt` no longer uses a fixed 2-minute timeout. The target sends keepalives every 30s while working (reusing `status_update`). The sender resets a 90-second inactivity timer on each keepalive. A 30-minute hard ceiling prevents broken-but-chatty targets from hanging forever. Long tasks with regular activity no longer false-timeout. (`fc73a00`, `5603f0d`)
+
+- **Self-target rejection.** `link_prompt` immediately rejects prompts where `to` equals your own terminal name, instead of sending a round-trip that would fail. (`0086c04`)
+
+- **Immediate failure on disconnect.** Pending `link_prompt` calls fail instantly when the target terminal leaves the network (`terminal_left`), instead of waiting for the inactivity timeout. (`0086c04`)
+
+- **`cleanupPending()` helper.** Single authority for resolving pending prompt state — all paths (response, inactivity, ceiling, abort, disconnect, delivery failure) go through one function, preventing double-resolution races. (`fc73a00`)
+
+---
+
+## 0.1.3 — 2026-03-26
+
+### Added
+
+- **Persistent link names.** `/link-name` saves your preferred name to the session via `pi.appendEntry()`. Resume a session and your name is restored automatically. Session switches (`/resume`) restore the new session's preferred name. Only explicit `/link-name` calls persist — hub-assigned variants like `"builder-2"` are not saved. (`369cf5d`)
+
+### Fixed
+
+- **Self join/leave echoes suppressed.** Hub no longer sends `terminal_joined`/`terminal_left` back to the terminal that triggered the event (e.g., during renames). Previously, renaming on the hub would echo a leave/join pair back to yourself. (`45cb018`)
+
+- **Pre-flight target validation for `link_prompt`.** The sender now checks if the target exists in the local terminal list before sending, returning an immediate error with the current terminal list instead of waiting for a timeout. (`45cb018`)
+
+---
+
+## 0.1.2 — 2026-03-24
+
+### Added
+
+- **Automatic agent status.** Each terminal's activity status is derived from Pi lifecycle events and broadcast across the link. Three states: `idle`, `thinking`, `tool:<name>` — each with a duration computed at render time. New `status_update` protocol message (push model: terminal → hub → all). New joiners receive a status snapshot in the `welcome` message. (`454415a`)
+
+- `/link` and `link_list` now show per-terminal status alongside names.
+
+---
+
+## 0.1.1 — 2026-03-22
+
+### Changed
+
+- **Published to npm.** Install command changed from `pi install git:github.com/alvivar/pi-mesh` to `pi install npm:pi-link`. (`87b394f`, `ed1e6cf`)
+
+---
+
+## 0.1.0 — 2026-03-22
+
+First npm publish. Renamed from `pi-mesh` to `pi-link`. (`57bda8b`)
+
+Everything below shipped together as the initial release.
+
+### Core
+
+- **Hub-spoke WebSocket network** on `127.0.0.1:9900`. First terminal becomes the hub; others connect as clients. All messages route through the hub. (`c239a9e`)
+
+- **Auto-discovery protocol.** Try client → fallback to hub → retry with 2–5s randomized backoff on race conditions. (`c239a9e`)
+
+- **Hub promotion.** When the hub goes down, the first client to reconnect becomes the new hub (race-based, no leader election). (`c239a9e`)
+
+### Tools
+
+- **`link_send`** — fire-and-forget message to a specific terminal or `"*"` for broadcast. Optional `triggerTurn` to kick off the remote LLM via `deliverAs: "steer"`. (`c239a9e`)
+
+- **`link_prompt`** — synchronous RPC: send a prompt to a remote terminal, wait for the LLM's response. Single-queue per terminal (immediate `"Terminal is busy"` rejection, no queuing). 2-minute fixed timeout at this version. (`c239a9e`)
+
+- **`link_list`** — list connected terminals with role info and self-identification. (`c239a9e`)
+
+### Commands
+
+- **`/link`** — show link status (name, role, online count). (`c239a9e`)
+- **`/link-name [name]`** — rename this terminal. No-arg form adopts the Pi session name. (`c239a9e`, `2fd67c7`)
+- **`/link-broadcast <msg>`** — broadcast a chat message to all other terminals. (`c0bf65a`)
+- **`/link-connect`** — connect mid-session without `--link` flag. Enables auto-reconnect. (`a2a0eac`)
+- **`/link-disconnect`** — disconnect and suppress auto-reconnect, even if `--link` was passed. (`a2a0eac`)
+
+### Opt-in startup
+
+- **`--link` flag.** Link is off by default — completely silent without the flag. No status bar, no connection attempts, no warnings. (`48d7e97`)
+
+### Protocol hardening (pre-release)
+
+These fixes shipped before 0.1.0 but are worth noting as they shaped the protocol:
+
+- **Early failure on missing targets.** Hub sends `prompt_response` with error for unknown targets, so the sender's promise resolves immediately instead of timing out. (`da38f62`)
+- **Delivery status from routing.** `routeMessage()` returns a boolean — authoritative on the hub, optimistic on clients. (`a29fefc`)
+- **Unique name enforcement.** Hub deduplicates names (`builder` → `builder-2`). Renames check for collisions. No-op renames short-circuit. (`84d2b68`, `1207647`)
+- **Unregistered client guard.** Hub ignores all non-`register` messages from clients that haven't completed registration. (`679f25f`)
+- **Session names as defaults.** Terminals use the Pi session name as their default link identity when available. (`2fd67c7`)

package/README.md

@@ -164,7 +164,7 @@ When `triggerTurn` is enabled, the message is delivered via `pi.sendMessage` wit
 
 > **Broadcast note:** Sending to `"*"` delivers to **all other terminals** — the sender is excluded.
 
-Pre-validates the target name against the local terminal list before sending, catching typos early. On the hub, delivery confirmation is authoritative. On clients, delivery is optimistic — the message is sent to the hub for routing.
+Pre-validates the target name against the local terminal list before sending, catching typos early. See [Message Routing](#message-routing--error-handling) for delivery semantics.
 
 ### `link_prompt`
 
@@ -177,8 +177,11 @@ Send a prompt to a remote terminal and **wait** for the LLM's response (synchron
 
 - The remote terminal processes the prompt via `pi.sendUserMessage()` — as if a user typed it.
 - Returns the remote terminal's actual assistant reply text as the tool result.
-- **2-minute timeout**; supports abort signals.
+- **Self-target rejection** — prompting yourself (`to` equals your own name) returns an immediate error.
+- **Heartbeat-based timeout** — no short fixed deadline. The target sends keepalives every 30s while working. The sender resets a 90-second inactivity timer on each keepalive. A 30-minute hard ceiling acts as a safety net against broken-but-chatty targets. A 10-minute task with regular activity never times out; a genuinely dead target times out in 90 seconds of silence.
+- **Immediate failure on disconnect** — if the target leaves the network (`terminal_left`), pending prompts to that target fail immediately instead of waiting for the inactivity timeout.
 - **Early failure detection** — if the message can't be delivered (e.g., target not found), the tool resolves immediately with an error instead of waiting for the timeout.
+- Supports abort signals.
 - Targets **one terminal at a time** (no broadcast mode).
 - Only **one remote prompt** can execute at a time per target terminal. Concurrent requests are rejected with `"Terminal is busy"`.
 
@@ -209,13 +212,13 @@ link (hub) 3 terminal(s)
 
 ## Slash Commands
 
-| Command                 | Purpose                                                                                                  |
-| ----------------------- | -------------------------------------------------------------------------------------------------------- |
-| `/link`                 | Show link status (name, role, online count, agent status per terminal)                                   |
-| `/link-name [name]`     | Rename this terminal. With no argument, adopts the current Pi session name if available. Collision-safe. |
-| `/link-broadcast <msg>` | Broadcast a chat message to all other terminals                                                          |
-| `/link-connect`         | Connect to Pi Link (works anytime, with or without `--link`)                                             |
-| `/link-disconnect`      | Disconnect from Pi Link and suppress auto-reconnect (overrides `--link`)                                 |
+| Command                 | Purpose                                                                                                                  |
+| ----------------------- | ------------------------------------------------------------------------------------------------------------------------ |
+| `/link`                 | Show link status (name, role, online count, agent status per terminal)                                                   |
+| `/link-name [name]`     | Rename and save as this session's preferred link name. With no argument, adopts the Pi session name. Restored on resume. |
+| `/link-broadcast <msg>` | Broadcast a chat message to all other terminals                                                                          |
+| `/link-connect`         | Connect to Pi Link (works anytime, with or without `--link`)                                                             |
+| `/link-disconnect`      | Disconnect from Pi Link and suppress auto-reconnect (overrides `--link`)                                                 |
 
 ### Examples
 
@@ -243,6 +246,8 @@ link (hub) 3 terminal(s)
 ✓ Pi Link hub started on :9900 as "orchestrator" ... if no hub exists
 ```
 
+**Name persistence:** `/link-name` saves your preferred name to the session. Resume later and it's restored automatically. If the name is taken, the hub assigns a variant (e.g., `"builder-2"`), but your preferred name stays saved for the next reconnect. See [Name Uniqueness & Persistence](#name-uniqueness--persistence) for details.
+
 See [Configuration](#configuration) for details on `--link`, `/link-connect`, and `/link-disconnect` behavior.
 
 ---
@@ -317,16 +322,16 @@ When the hub goes down and a client promotes itself, terminal names and in-fligh
 
 ## Limitations & Design Decisions
 
-| #   | Decision                                  | Rationale / Impact                                                                                                                                            |
-| --- | ----------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| 1   | **No authentication**                     | Any localhost process can connect to port 9900. Acceptable for local dev; don't expose the port externally.                                                   |
-| 2   | **Hardcoded port (9900)**                 | Not configurable without editing `DEFAULT_PORT` in `index.ts`. Could conflict with other services on the same port.                                           |
-| 3   | **Race-based hub promotion**              | Non-deterministic. Terminal state (names, in-flight prompts) is lost during promotion. Simple but imperfect.                                                  |
-| 4   | **Single remote prompt per terminal**     | No queuing — immediate rejection if the target is busy. Keeps the model simple and avoids unbounded backlogs.                                                 |
-| 5   | **No message persistence**                | Purely ephemeral WebSocket frames. Messages are lost if the recipient is offline.                                                                             |
-| 6   | **Client rename triggers full reconnect** | Changing a client's name requires a new `register` message, so the client disconnects and reconnects. Hub renames are handled in-place with collision checks. |
-| 7   | **Single-machine / localhost-only**       | Link only binds to `127.0.0.1`; terminals on different machines cannot join.                                                                                  |
-| 8   | **Opt-in startup**                        | Link is off by default. Use `pi --link` or `/link-connect` to participate. See [Configuration](#configuration).                                               |
+| #   | Decision                                  | Rationale / Impact                                                                                                                                                                                              |
+| --- | ----------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| 1   | **No authentication**                     | Any localhost process can connect to port 9900. Acceptable for local dev; don't expose the port externally.                                                                                                     |
+| 2   | **Hardcoded port (9900)**                 | Not configurable without editing `DEFAULT_PORT` in `index.ts`. Could conflict with other services on the same port.                                                                                             |
+| 3   | **Race-based hub promotion**              | Non-deterministic. Terminal state (names, in-flight prompts) is lost during promotion. Simple but imperfect.                                                                                                    |
+| 4   | **Single remote prompt per terminal**     | No queuing — immediate rejection if busy. See [`link_prompt`](#link_prompt) and [Troubleshooting](#terminal-is-busy-rejections).                                                                                |
+| 5   | **No message persistence**                | Purely ephemeral WebSocket frames. Messages are lost if the recipient is offline.                                                                                                                               |
+| 6   | **Client rename triggers full reconnect** | Changing a client's name requires a new `register` message, so the client disconnects and reconnects. Hub renames are handled in-place with collision checks.                                                   |
+| 7   | **Single-machine / localhost-only**       | Link only binds to `127.0.0.1`; terminals on different machines cannot join.                                                                                                                                    |
+| 8   | **Rename during prompt loses keepalives** | If the target renames mid-prompt, keepalive resets stop working (pending requests track by name). The final response can still succeed by request ID, but inactivity may false-fire on long tasks after rename. |
 
 ---
 
@@ -439,12 +444,14 @@ Client A            Hub              Client B
   |<-----------------|                  |
 ```
 
-### Name Uniqueness
+### Name Uniqueness & Persistence
 
 The hub enforces unique terminal names via a `uniqueName()` function. If `"builder"` is already taken, the next terminal requesting that name is assigned `"builder-2"`, then `"builder-3"`, and so on.
 
 Default names are random 4-character hex IDs: `t-a1b2`, `t-c3d4`, etc.
 
+**Persistence:** `/link-name` saves the preferred name to the session via `pi.appendEntry("link-name", { name })`. On session resume, the saved name is restored and requested from the hub. Only explicit `/link-name` calls persist — hub-assigned variants like `"builder-2"` are not saved. On reconnect, the terminal always requests the preferred name, not the last runtime name.
+
 **Rename guards:**
 
 - If you're already using the requested name, `/link-name` returns early (`"Already using..."`).
@@ -455,13 +462,15 @@ Default names are random 4-character hex IDs: `t-a1b2`, `t-c3d4`, etc.
 
 ### State Management
 
-| State Field              | Type                                  | Purpose                                              |
-| ------------------------ | ------------------------------------- | ---------------------------------------------------- |
-| `role`                   | `"hub" \| "client" \| "disconnected"` | Current network role                                 |
-| `isAgentBusy`            | `boolean`                             | Prevents accepting remote prompts during agent runs  |
-| `manuallyDisconnected`   | `boolean`                             | Set by `/link-disconnect`; suppresses auto-reconnect |
-| `pendingRemotePrompt`    | `object \| null`                      | Tracks the single in-flight remote prompt execution  |
-| `pendingPromptResponses` | `Map`                                 | Outstanding prompt RPCs awaiting responses           |
+| State Field              | Type                                  | Purpose                                                                                     |
+| ------------------------ | ------------------------------------- | ------------------------------------------------------------------------------------------- |
+| `role`                   | `"hub" \| "client" \| "disconnected"` | Current network role                                                                        |
+| `agentRunning`           | `boolean`                             | Whether an agent run is active; blocks incoming remote prompts                              |
+| `activeToolName`         | `string \| null`                      | Name of the currently executing tool (drives `tool:<name>` status)                          |
+| `stateSince`             | `number`                              | Timestamp of last status change (used for duration display)                                 |
+| `manuallyDisconnected`   | `boolean`                             | Set by `/link-disconnect`; suppresses auto-reconnect                                        |
+| `pendingRemotePrompt`    | `object \| null`                      | Tracks the single in-flight remote prompt execution                                         |
+| `pendingPromptResponses` | `Map`                                 | Outstanding prompt RPCs awaiting responses (includes inactivity + ceiling timers per entry) |
 
 ### Message Routing & Error Handling
 
@@ -483,13 +492,15 @@ The `manuallyDisconnected` flag distinguishes user-initiated disconnects (`/link
 
 The extension hooks into Pi's agent lifecycle events:
 
-- **`agent_start`** → Sets `isAgentBusy = true`, blocking incoming remote prompts. Broadcasts `status_update` (`thinking`).
+- **`agent_start`** → Sets `agentRunning = true`, blocking incoming remote prompts. Broadcasts `status_update` (`thinking`).
 - **`agent_end`** → Checks if a remote prompt was running. If so, extracts the last assistant response from `event.messages` and sends back a `prompt_response`. Broadcasts `status_update` (`idle`).
 - **`tool_execution_start`** → Broadcasts `status_update` (`tool:<name>`).
 - **`tool_execution_end`** → Clears tool status; broadcasts `status_update` (`thinking`) while the agent run continues.
 - **`session_shutdown`** → Full cleanup via `cleanup()`: closes all sockets, resolves pending promises, and disposes the extension.
 
-Status updates are push-based: each terminal broadcasts changes to the hub, which fans them out. New joiners receive a status snapshot for all terminals in the `welcome` message. Durations are computed at render time from a `since` timestamp — no polling or timer traffic over the wire.
+Status updates are push-based: each terminal broadcasts changes to the hub, which fans them out. New joiners receive a status snapshot for all terminals in the `welcome` message.
+
+While executing a remote prompt, the target sends a forced `status_update` every 30 seconds as a keepalive — reusing the existing status push mechanism. On the sender side, each incoming `status_update` from the target resets the 90-second inactivity timer. All resolution paths (response, inactivity, ceiling, abort, disconnect, delivery failure) go through a single `cleanupPending()` helper to prevent double-resolution races.
 
 ### Rendering
 

package/index.ts

@@ -32,8 +32,10 @@ import { WebSocket, WebSocketServer } from "ws";
 // ─── Constants ───────────────────────────────────────────────────────────────
 
 const DEFAULT_PORT = 9900;
-const PROMPT_TIMEOUT_MS = 120_000;
+const PROMPT_INACTIVITY_MS = 90_000;
+const PROMPT_HARD_CEILING_MS = 1_800_000;
 const RECONNECT_DELAY_MS = 2000;
+const KEEPALIVE_INTERVAL_MS = 30_000;
 
 // ─── Protocol ────────────────────────────────────────────────────────────────
 
@@ -118,6 +120,7 @@ export default function (pi: ExtensionAPI) {
 
   let role: "hub" | "client" | "disconnected" = "disconnected";
   let terminalName = `t-${crypto.randomUUID().slice(0, 4)}`;
+  let preferredName: string | null = null;
   let connectedTerminals: string[] = [];
   let ctx: ExtensionContext | undefined;
   let disposed = false;
@@ -148,12 +151,15 @@ export default function (pi: ExtensionAPI) {
         content: { type: "text"; text: string }[];
         details: Record<string, unknown>;
       }) => void;
-      timeout: ReturnType<typeof setTimeout>;
+      targetName: string;
+      inactivityTimeout: ReturnType<typeof setTimeout>;
+      ceilingTimeout: ReturnType<typeof setTimeout>;
     }
   >();
 
   // Pending remote prompt (this terminal is executing a prompt for someone else)
   let pendingRemotePrompt: { id: string; from: string } | null = null;
+  let keepaliveTimer: ReturnType<typeof setInterval> | null = null;
 
   // ── Helpers ──────────────────────────────────────────────────────────────
 
@@ -215,6 +221,40 @@ export default function (pi: ExtensionAPI) {
     return map.get(name) ?? null;
   }
 
+  // ── Pending prompt helpers ───────────────────────────────────────────────
+
+  function cleanupPending(requestId: string) {
+    const pending = pendingPromptResponses.get(requestId);
+    if (!pending) return null;
+    clearTimeout(pending.inactivityTimeout);
+    clearTimeout(pending.ceilingTimeout);
+    pendingPromptResponses.delete(requestId);
+    return pending;
+  }
+
+  function makeInactivityTimeout(requestId: string, targetName: string) {
+    return setTimeout(() => {
+      const pending = cleanupPending(requestId);
+      if (pending) {
+        pending.resolve(
+          textResult(
+            `Prompt to "${targetName}" timed out (no activity for ${PROMPT_INACTIVITY_MS / 1000}s)`,
+            { to: targetName, error: "timeout" },
+          ),
+        );
+      }
+    }, PROMPT_INACTIVITY_MS);
+  }
+
+  function resetInactivityFor(targetName: string) {
+    for (const [id, pending] of pendingPromptResponses) {
+      if (pending.targetName === targetName) {
+        clearTimeout(pending.inactivityTimeout);
+        pending.inactivityTimeout = makeInactivityTimeout(id, targetName);
+      }
+    }
+  }
+
   function allTerminalNames(): Set<string> {
     const names = new Set<string>();
     names.add(terminalName); // hub's own name
@@ -348,6 +388,20 @@ export default function (pi: ExtensionAPI) {
       case "terminal_left":
         connectedTerminals = msg.terminals;
         terminalStatuses.delete(msg.name);
+        // Fail any pending prompts to the departed terminal immediately
+        for (const [id, pending] of pendingPromptResponses) {
+          if (pending.targetName === msg.name) {
+            const p = cleanupPending(id);
+            if (p) {
+              p.resolve(
+                textResult(`Terminal "${msg.name}" disconnected`, {
+                  to: msg.name,
+                  error: "disconnected",
+                }),
+              );
+            }
+          }
+        }
         updateStatus();
         ctx?.ui.notify(`"${msg.name}" left the link`, "info");
         break;
@@ -355,6 +409,7 @@ export default function (pi: ExtensionAPI) {
       // ── Status update from another terminal ──
       case "status_update":
         terminalStatuses.set(msg.name, msg.status);
+        resetInactivityFor(msg.name);
         break;
 
       // ── Chat message ──
@@ -383,6 +438,12 @@ export default function (pi: ExtensionAPI) {
           });
         } else {
           pendingRemotePrompt = { id: msg.id, from: msg.from };
+          // Keepalive: periodic status push so sender knows we're alive
+          if (keepaliveTimer) clearInterval(keepaliveTimer);
+          keepaliveTimer = setInterval(
+            () => pushStatus(true),
+            KEEPALIVE_INTERVAL_MS,
+          );
           ctx?.ui.notify(`Running remote prompt from "${msg.from}"`, "info");
           pi.sendUserMessage(
             `[Remote prompt from "${msg.from}"]\n\n${msg.prompt}`,
@@ -392,10 +453,8 @@ export default function (pi: ExtensionAPI) {
 
       // ── Response to a prompt we sent ──
       case "prompt_response": {
-        const pending = pendingPromptResponses.get(msg.id);
+        const pending = cleanupPending(msg.id);
         if (pending) {
-          clearTimeout(pending.timeout);
-          pendingPromptResponses.delete(msg.id);
           if (msg.error) {
             pending.resolve(
               textResult(`Error from "${msg.from}": ${msg.error}`, {
@@ -464,6 +523,7 @@ export default function (pi: ExtensionAPI) {
       // Status update — store and fan out to other clients only (not back to hub)
       if (msg.type === "status_update") {
         hubTerminalStatuses.set(clientName, msg.status);
+        resetInactivityFor(clientName);
         const normalized: StatusUpdateMsg = {
           type: "status_update",
           name: clientName,
@@ -540,20 +600,20 @@ export default function (pi: ExtensionAPI) {
 
   // ── Connect as client ────────────────────────────────────────────────────
 
-  function connectAsClient(port: number): Promise<boolean> {
+  function connectAsClient(): Promise<boolean> {
     return new Promise((resolve) => {
-      const socket = new WebSocket(`ws://127.0.0.1:${port}`);
+      const socket = new WebSocket(`ws://127.0.0.1:${DEFAULT_PORT}`);
       let resolved = false;
 
       socket.on("open", () => {
         ws = socket;
         role = "client";
         resolved = true;
-        // Register with the hub
+        // Register with preferred name if available, otherwise current name
         socket.send(
           JSON.stringify({
             type: "register",
-            name: terminalName,
+            name: preferredName ?? terminalName,
           } satisfies RegisterMsg),
         );
         resolve(true);
@@ -594,7 +654,7 @@ export default function (pi: ExtensionAPI) {
     if (disposed) return;
 
     // Try connecting to an existing hub
-    if (await connectAsClient(DEFAULT_PORT)) return;
+    if (await connectAsClient()) return;
 
     // No hub found — become the hub
     if (await startHub()) return;
@@ -622,14 +682,22 @@ export default function (pi: ExtensionAPI) {
       reconnectTimer = null;
     }
 
+    // Clean up target-side remote prompt state
+    if (keepaliveTimer) {
+      clearInterval(keepaliveTimer);
+      keepaliveTimer = null;
+    }
+    pendingRemotePrompt = null;
+
     // Clean up pending prompts
-    for (const [id, pending] of pendingPromptResponses) {
-      clearTimeout(pending.timeout);
-      pending.resolve(
-        textResult("Link disconnected", { error: "disconnected" }),
-      );
+    for (const id of [...pendingPromptResponses.keys()]) {
+      const pending = cleanupPending(id);
+      if (pending) {
+        pending.resolve(
+          textResult("Link disconnected", { error: "disconnected" }),
+        );
+      }
     }
-    pendingPromptResponses.clear();
 
     // Close client connection
     if (ws) {
@@ -663,6 +731,20 @@ export default function (pi: ExtensionAPI) {
 
   pi.on("session_start", async (_event, _ctx) => {
     ctx = _ctx;
+
+    // Restore preferred link name from session
+    const saved = _ctx.sessionManager
+      .getEntries()
+      .filter(
+        (e: { type: string; customType?: string }) =>
+          e.type === "custom" && e.customType === "link-name",
+      )
+      .pop() as { data?: { name?: string } } | undefined;
+    if (saved?.data?.name) {
+      preferredName = saved.data.name;
+      terminalName = preferredName;
+    }
+
     if (pi.getFlag("link") === true) await initialize();
   });
 
@@ -670,6 +752,63 @@ export default function (pi: ExtensionAPI) {
     cleanup();
   });
 
+  pi.on("session_switch", async (_event, _ctx) => {
+    ctx = _ctx;
+
+    // Restore preferred name from the new session
+    const saved = _ctx.sessionManager
+      .getEntries()
+      .filter(
+        (e: { type: string; customType?: string }) =>
+          e.type === "custom" && e.customType === "link-name",
+      )
+      .pop() as { data?: { name?: string } } | undefined;
+
+    preferredName = saved?.data?.name ?? null;
+    const desiredName = preferredName ?? `t-${crypto.randomUUID().slice(0, 4)}`;
+
+    if (desiredName === terminalName) return; // no identity change needed
+
+    if (role === "hub") {
+      // Hub rename in-place — avoid tearing down the server
+      const takenByOther = Array.from(hubClients.values()).includes(
+        desiredName,
+      );
+      if (takenByOther) {
+        // Can't use preferred name — keep current identity
+        ctx?.ui.notify(
+          `Session preferred name "${desiredName}" is taken, keeping "${terminalName}"`,
+          "warning",
+        );
+        return;
+      }
+      const old = terminalName;
+      terminalName = desiredName;
+      const list = terminalList();
+      connectedTerminals = list;
+      updateStatus();
+      // Notify clients only — hub already updated local state
+      hubBroadcast(
+        { type: "terminal_left", name: old, terminals: list },
+        terminalName,
+      );
+      hubBroadcast(
+        { type: "terminal_joined", name: desiredName, terminals: list },
+        terminalName,
+      );
+      pushStatus(true);
+    } else if (role === "client") {
+      // Client — disconnect and reconnect with new name
+      terminalName = desiredName;
+      disconnect();
+      manuallyDisconnected = false;
+      await initialize();
+    } else {
+      // Disconnected — just update local name
+      terminalName = desiredName;
+    }
+  });
+
   pi.on("agent_start", async () => {
     agentRunning = true;
     activeToolName = null;
@@ -698,6 +837,10 @@ export default function (pi: ExtensionAPI) {
     // If we were running a remote prompt, send the response back
     if (pendingRemotePrompt) {
       const { id, from } = pendingRemotePrompt;
+      if (keepaliveTimer) {
+        clearInterval(keepaliveTimer);
+        keepaliveTimer = null;
+      }
       pendingRemotePrompt = null;
 
       // Find the last assistant text in this run
@@ -824,7 +967,7 @@ export default function (pi: ExtensionAPI) {
     description: [
       "Send a prompt to another Pi terminal and wait for its LLM to respond.",
       "The remote terminal processes the prompt as if a user typed it,",
-      "then returns the assistant's response. Times out after 2 minutes.",
+      "then returns the assistant's response. Times out after 90s of inactivity.",
     ].join(" "),
     promptSnippet:
       "Send a prompt to another Pi terminal and receive its LLM response",
@@ -836,33 +979,57 @@ export default function (pi: ExtensionAPI) {
     async execute(_toolCallId, params, signal) {
       if (role === "disconnected") return notConnectedResult();
 
+      if (params.to === terminalName) {
+        return textResult("Cannot prompt yourself", {
+          to: params.to,
+          error: "self_target",
+        });
+      }
+
+      if (!connectedTerminals.includes(params.to)) {
+        return textResult(
+          `Terminal "${params.to}" not found. Connected: ${connectedTerminals.join(", ")}`,
+          { to: params.to, error: "not_found" },
+        );
+      }
+
       const requestId = crypto.randomUUID();
 
       return new Promise((resolve) => {
-        const timeout = setTimeout(() => {
-          pendingPromptResponses.delete(requestId);
-          resolve(
-            textResult(
-              `Prompt to "${params.to}" timed out after ${PROMPT_TIMEOUT_MS / 1000}s`,
-              { to: params.to, error: "timeout" },
-            ),
-          );
-        }, PROMPT_TIMEOUT_MS);
+        const inactivityTimeout = makeInactivityTimeout(requestId, params.to);
+
+        const ceilingTimeout = setTimeout(() => {
+          const pending = cleanupPending(requestId);
+          if (pending) {
+            pending.resolve(
+              textResult(
+                `Prompt to "${params.to}" hit hard ceiling (${PROMPT_HARD_CEILING_MS / 60_000}min)`,
+                { to: params.to, error: "timeout" },
+              ),
+            );
+          }
+        }, PROMPT_HARD_CEILING_MS);
 
-        pendingPromptResponses.set(requestId, { resolve, timeout });
+        pendingPromptResponses.set(requestId, {
+          resolve,
+          targetName: params.to,
+          inactivityTimeout,
+          ceilingTimeout,
+        });
 
         // Abort handling
         signal?.addEventListener(
           "abort",
           () => {
-            clearTimeout(timeout);
-            pendingPromptResponses.delete(requestId);
-            resolve(
-              textResult("Prompt request aborted", {
-                to: params.to,
-                error: "aborted",
-              }),
-            );
+            const pending = cleanupPending(requestId);
+            if (pending) {
+              pending.resolve(
+                textResult("Prompt request aborted", {
+                  to: params.to,
+                  error: "aborted",
+                }),
+              );
+            }
           },
           { once: true },
         );
@@ -876,14 +1043,15 @@ export default function (pi: ExtensionAPI) {
         });
 
         if (!delivered && pendingPromptResponses.has(requestId)) {
-          clearTimeout(timeout);
-          pendingPromptResponses.delete(requestId);
-          resolve(
-            textResult(`Failed to send prompt to "${params.to}"`, {
-              to: params.to,
-              error: "not_delivered",
-            }),
-          );
+          const pending = cleanupPending(requestId);
+          if (pending) {
+            pending.resolve(
+              textResult(`Failed to send prompt to "${params.to}"`, {
+                to: params.to,
+                error: "not_delivered",
+              }),
+            );
+          }
         }
       });
     },
@@ -1019,12 +1187,23 @@ export default function (pi: ExtensionAPI) {
         }
       }
 
-      if (newName === terminalName) {
+      if (newName === terminalName && newName === preferredName) {
         _ctx.ui.notify(`Already using "${newName}"`, "info");
         return;
       }
 
-      // If we're the hub, check uniqueness before renaming
+      function savePreference() {
+        preferredName = newName;
+        pi.appendEntry("link-name", { name: preferredName });
+      }
+
+      if (newName === terminalName) {
+        savePreference();
+        _ctx.ui.notify(`Saved "${newName}" as preferred link name`, "info");
+        return;
+      }
+
+      // If we're the hub, check uniqueness before persisting
       if (role === "hub") {
         // Check if name is taken by another terminal
         const takenByOther = Array.from(hubClients.values()).includes(newName);
@@ -1040,15 +1219,21 @@ export default function (pi: ExtensionAPI) {
         const list = terminalList();
         connectedTerminals = list;
         updateStatus();
-        hubBroadcast({ type: "terminal_left", name: old, terminals: list });
+        // Notify clients only — hub already updated local state
+        hubBroadcast(
+          { type: "terminal_left", name: old, terminals: list },
+          terminalName,
+        );
         hubBroadcast(
           { type: "terminal_joined", name: newName, terminals: list },
-          newName,
+          terminalName,
         );
         pushStatus(true);
+        savePreference();
         _ctx.ui.notify(`Renamed to "${newName}"`, "info");
       } else if (role === "client") {
         // Reconnect with new name — hub will enforce uniqueness via register
+        savePreference();
         terminalName = newName;
         ws?.close();
         // Reconnect will happen via the onClose handler → scheduleReconnect
@@ -1057,6 +1242,7 @@ export default function (pi: ExtensionAPI) {
           "info",
         );
       } else {
+        savePreference();
         terminalName = newName;
         _ctx.ui.notify(`Name set to "${newName}" (not connected)`, "info");
       }

package/package.json

@@ -1,30 +1,30 @@
-{
-  "name": "pi-link",
-  "version": "0.1.2",
-  "description": "WebSocket-based inter-terminal communication for Pi. Connect multiple Pi terminals over a local link network.",
-  "author": "alvivar",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/alvivar/pi-link"
-  },
-  "keywords": [
-    "pi-package",
-    "pi",
-    "link",
-    "websocket",
-    "terminal",
-    "multi-agent"
-  ],
-  "dependencies": {
-    "ws": "^8.20.0"
-  },
-  "devDependencies": {
-    "@types/ws": "^8.18.1"
-  },
-  "pi": {
-    "extensions": [
-      "./index.ts"
-    ]
-  }
-}
+{
+  "name": "pi-link",
+  "version": "0.1.4",
+  "description": "WebSocket-based inter-terminal communication for Pi. Connect multiple Pi terminals over a local link network.",
+  "author": "alvivar",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/alvivar/pi-link"
+  },
+  "keywords": [
+    "pi-package",
+    "pi",
+    "link",
+    "websocket",
+    "terminal",
+    "multi-agent"
+  ],
+  "dependencies": {
+    "ws": "^8.20.0"
+  },
+  "devDependencies": {
+    "@types/ws": "^8.18.1"
+  },
+  "pi": {
+    "extensions": [
+      "./index.ts"
+    ]
+  }
+}