pi-link 0.1.3 → 0.1.5

package/CHANGELOG.md

@@ -0,0 +1,107 @@
+# Changelog
+
+All notable changes to pi-link are documented here.
+
+This changelog is based on the git history from `2026-03-21` through `2026-04-02` (current). Versions correspond to npm publishes.
+
+---
+
+## 0.1.5 — 2026-04-02
+
+### Added
+
+- **Working directory sharing.** Each terminal reports its `cwd` on connect and on session switch. New `cwd_update` protocol message (10th message type) broadcasts mid-session directory changes. `link_list` and `/link` now show per-terminal working directories — full absolute paths in tool output, `~/…` shortened in the TUI. Agents can use this to choose the right target, use explicit paths when terminals differ, and catch wrong-project mistakes early.
+
+- **Header comment cleanup.** Simplified the top-of-file doc comment — removed feature bullet list and install instructions in favor of a concise summary.
+
+---
+
+## 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

@@ -85,7 +85,9 @@ Here's a concrete example of two terminals collaborating. Open two separate `pi
 > /link
 ⚡ Link: builder (hub) · 2 online
   builder: idle (5s)
+    cwd: ~/my-project
   researcher: idle (12s)
+    cwd: ~/my-project
 ```
 
 **Terminal 2** — rename it too:
@@ -142,11 +144,11 @@ The extension registers three tools that the LLM can invoke during agent runs.
 
 ### Which tool should I use?
 
-| Tool          | Behavior                                             | Returns                                  |
-| ------------- | ---------------------------------------------------- | ---------------------------------------- |
-| `link_send`   | Send a message; optionally trigger the remote LLM    | Send/delivery status only                |
-| `link_prompt` | Run a prompt on a remote terminal and wait for reply | The remote terminal's assistant response |
-| `link_list`   | List currently connected terminals                   | Terminal directory with roles and status |
+| Tool          | Behavior                                             | Returns                                   |
+| ------------- | ---------------------------------------------------- | ----------------------------------------- |
+| `link_send`   | Send a message; optionally trigger the remote LLM    | Send/delivery status only                 |
+| `link_prompt` | Run a prompt on a remote terminal and wait for reply | The remote terminal's assistant response  |
+| `link_list`   | List currently connected terminals                   | Terminal list with roles, status, and cwd |
 
 **If you need the other terminal's answer back, use `link_prompt`.** Use `link_send` to notify or steer without waiting.
 
@@ -164,7 +166,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,14 +179,19 @@ 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"`.
 
 ### `link_list`
 
-Lists all connected terminals with role info, live agent status, and self-identification. Takes no parameters.
+Lists all connected terminals with role info, live agent status, working directory, and self-identification. Takes no parameters.
+
+Each terminal reports its current working directory on connect and on session switch. `link_list` shows the full absolute path so agents can choose the right target, use explicit paths when terminals differ, and catch wrong-project mistakes early.
 
 Each terminal's status is derived automatically from Pi lifecycle events — agents can't set it manually. Three states:
 
@@ -196,13 +203,18 @@ Each terminal's status is derived automatically from Pi lifecycle events — age
 
 Durations are computed at render time from a `since` timestamp — no timer traffic over the wire. Terminals that just joined with no status data yet render as blank, not fake idle.
 
+Working directories use full absolute paths in tool output. In the TUI (`/link`), paths are shortened to `~/...` when possible to keep the display compact.
+
 **Example output:**
 
 ```
-link (hub) 3 terminal(s)
-  • builder@pi-link (you)  thinking (3s)
-  • reviewer@pi-link       idle (45s)
-  • docs@pi-link           tool:read (2s)
+Connected terminals:
+  • opus@pi-link (you)  idle (12s)
+    cwd: C:\Users\andre\.pi
+  • gpt@pi-link  thinking (3s)
+    cwd: C:\Users\andre\.pi
+  • docs@pi-link  idle (1m)
+    cwd: C:\Users\andre\.pi
 ```
 
 ---
@@ -211,7 +223,7 @@ link (hub) 3 terminal(s)
 
 | Command                 | Purpose                                                                                                                  |
 | ----------------------- | ------------------------------------------------------------------------------------------------------------------------ |
-| `/link`                 | Show link status (name, role, online count, agent status per terminal)                                                   |
+| `/link`                 | Show link status (name, role, online count, agent status, and cwd 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`)                                                             |
@@ -223,8 +235,11 @@ link (hub) 3 terminal(s)
 > /link
 ⚡ Link: builder (hub) · 3 online
   builder: idle (12s)
+    cwd: ~/my-project
   worker-1: thinking (3s)
+    cwd: ~/my-project
   worker-2: tool:bash (5s)
+    cwd: ~/other-project
 
 > /link-name orchestrator
 ✓ Renamed to "orchestrator"
@@ -243,7 +258,7 @@ 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 that session later and your name is restored automatically. If the name is taken, the hub assigns a variant (e.g., `"builder-2"`), but your preferred name stays saved — the next reconnect retries it. Both `/link-name builder` and `/link-name` (no args) count as explicit saves; hub-assigned variants like `"builder-2"` are never persisted.
+**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.
 
@@ -319,16 +334,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. |
 
 ---
 
@@ -382,19 +397,20 @@ The `pi.extensions` field tells Pi which files to load as extensions. Here it po
 
 ### Protocol
 
-The wire protocol consists of **9 message types**, all serialized as JSON over WebSocket frames:
-
-| Type              | Direction       | Purpose                                                 |
-| ----------------- | --------------- | ------------------------------------------------------- |
-| `register`        | Client → Hub    | First message after connecting; requests a name         |
-| `welcome`         | Hub → Client    | Confirms assigned name, terminal list + status snapshot |
-| `terminal_joined` | Hub → All       | Broadcast when a terminal joins                         |
-| `terminal_left`   | Hub → All       | Broadcast when a terminal disconnects                   |
-| `chat`            | Any → Any/All   | Fire-and-forget message; optionally triggers LLM turn   |
-| `prompt_request`  | Any → Any       | Request a remote terminal to execute a prompt           |
-| `prompt_response` | Any → Any       | Response carrying the remote prompt result              |
-| `status_update`   | Any → Hub → All | Terminal broadcasts its agent status change             |
-| `error`           | Hub → Client    | Error notification                                      |
+The wire protocol consists of **10 message types**, all serialized as JSON over WebSocket frames. New cwd-related fields are optional for backward compatibility.
+
+| Type              | Direction       | Purpose                                                                 |
+| ----------------- | --------------- | ----------------------------------------------------------------------- |
+| `register`        | Client → Hub    | First message after connecting; requests a name, optionally reports cwd |
+| `welcome`         | Hub → Client    | Confirms assigned name, terminal list + status/cwd snapshots            |
+| `terminal_joined` | Hub → All       | Broadcast when a terminal joins; may include cwd                        |
+| `terminal_left`   | Hub → All       | Broadcast when a terminal disconnects                                   |
+| `chat`            | Any → Any/All   | Fire-and-forget message; optionally triggers LLM turn                   |
+| `prompt_request`  | Any → Any       | Request a remote terminal to execute a prompt                           |
+| `prompt_response` | Any → Any       | Response carrying the remote prompt result                              |
+| `status_update`   | Any → Hub → All | Terminal broadcasts its agent status change                             |
+| `cwd_update`      | Any → Hub → All | Terminal broadcasts a cwd change                                        |
+| `error`           | Hub → Client    | Error notification                                                      |
 
 ### Message Flow Examples
 
@@ -403,16 +419,17 @@ The wire protocol consists of **9 message types**, all serialized as JSON over W
 ```
 Client                         Hub
   |                             |
-  | register {name:"builder"}   |
+  | register {name:"builder",   |
+  |           cwd:"C:\\Users\\..."} |
   |---------------------------->|
   |                             |
   | welcome {name, terminals,   |
-  | statuses}                   |
+  | statuses, cwds}             |
   |<----------------------------|
   |                             |
 ```
 
-Hub then broadcasts `terminal_joined` to the other connected terminals. The `welcome` message includes a status snapshot for all connected terminals (fields omitted above for brevity).
+Hub then broadcasts `terminal_joined` to the other connected terminals. The `welcome` message includes status and cwd snapshots for all connected terminals (fields omitted above for brevity). `terminal_joined` also includes the new terminal's optional cwd, and mid-session cwd changes are distributed via `cwd_update`.
 
 **Sending a chat message:**
 
@@ -459,13 +476,16 @@ 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)                                 |
+| `currentCwd`             | `string`                              | Current working directory reported to peers on connect and session switch                   |
+| `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
 
@@ -487,13 +507,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

@@ -2,21 +2,12 @@
  * Pi Link — WebSocket-based inter-terminal communication
  *
  * Connects multiple Pi terminals over a local WebSocket link.
- * The first terminal becomes the hub (server); others join as clients.
- * If the hub exits, a surviving terminal promotes itself automatically.
+ * Opt-in via --link flag or /link-connect command.
+ * First terminal to connect becomes the hub; others join as clients.
+ * Hub loss triggers automatic promotion of a surviving client.
  *
- * Features:
- *   - Auto-discovery: try to connect → fall back to becoming the hub
- *   - Named terminals with uniqueness enforcement
- *   - LLM tools: link_send (chat), link_prompt (remote prompt + response), link_list
- *   - Commands: /link, /link-name, /link-broadcast, /link-connect, /link-disconnect
- *   - Custom message renderer for incoming link messages
- *   - Auto-reconnect with hub promotion on disconnect
- *
- * Install:
- *   cd ~/.pi/agent/extensions/pi-link && npm install
- *
- * Then just start two or more `pi` terminals — they discover each other.
+ * Tools: link_send, link_prompt, link_list
+ * Commands: /link, /link-name, /link-broadcast, /link-connect, /link-disconnect
  */
 
 import type {
@@ -26,31 +17,42 @@ import type {
 import { Text } from "@mariozechner/pi-tui";
 import { Type } from "@sinclair/typebox";
 import * as crypto from "node:crypto";
+import * as os from "node:os";
 
 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 ────────────────────────────────────────────────────────────────
 
 interface RegisterMsg {
   type: "register";
   name: string;
+  cwd?: string;
 }
 interface WelcomeMsg {
   type: "welcome";
   name: string;
   terminals: string[];
   statuses?: Record<string, LinkStatus>;
+  cwds?: Record<string, string>;
 }
 interface TerminalJoinedMsg {
   type: "terminal_joined";
   name: string;
   terminals: string[];
+  cwd?: string;
+}
+interface CwdUpdateMsg {
+  type: "cwd_update";
+  name: string;
+  cwd: string;
 }
 interface TerminalLeftMsg {
   type: "terminal_left";
@@ -103,6 +105,7 @@ type LinkMessage =
   | PromptRequestMsg
   | PromptResponseMsg
   | StatusUpdateMsg
+  | CwdUpdateMsg
   | ErrorMsg;
 
 // ─── Extension ───────────────────────────────────────────────────────────────
@@ -132,11 +135,14 @@ export default function (pi: ExtensionAPI) {
   let lastPushedKind: string | null = null;
   let lastPushedTool: string | null = null;
   const terminalStatuses = new Map<string, LinkStatus>(); // other terminals
+  let currentCwd = "";
+  const terminalCwds = new Map<string, string>(); // other terminals' cwds
 
   // Hub state
   let wss: WebSocketServer | null = null;
   const hubClients = new Map<WebSocket, string>(); // ws → terminal name
   const hubTerminalStatuses = new Map<string, LinkStatus>(); // hub-authoritative
+  const hubTerminalCwds = new Map<string, string>(); // hub-authoritative (excludes self)
 
   // Client state
   let ws: WebSocket | null = null;
@@ -149,12 +155,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 ──────────────────────────────────────────────────────────────
 
@@ -216,6 +225,68 @@ export default function (pi: ExtensionAPI) {
     return map.get(name) ?? null;
   }
 
+  function getCwdFor(name: string): string | null {
+    if (name === terminalName) return currentCwd || null;
+    if (role === "hub") return hubTerminalCwds.get(name) ?? null;
+    return terminalCwds.get(name) ?? null;
+  }
+
+  function shortenPath(cwd: string): string {
+    const home = os.homedir().replace(/\\/g, "/");
+    const normalized = cwd.replace(/\\/g, "/");
+    if (normalized === home) return "~";
+    if (normalized.startsWith(home + "/"))
+      return "~" + normalized.slice(home.length);
+    return normalized;
+  }
+
+  function pushCwdUpdate() {
+    const msg: CwdUpdateMsg = {
+      type: "cwd_update",
+      name: terminalName,
+      cwd: currentCwd,
+    };
+    if (role === "hub") {
+      hubBroadcast(msg, terminalName);
+    } else if (role === "client" && ws?.readyState === WebSocket.OPEN) {
+      ws.send(JSON.stringify(msg));
+    }
+  }
+
+  // ── 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
@@ -326,11 +397,17 @@ export default function (pi: ExtensionAPI) {
         terminalName = msg.name;
         connectedTerminals = msg.terminals;
         terminalStatuses.clear();
+        terminalCwds.clear();
         if (msg.statuses) {
           for (const [name, status] of Object.entries(msg.statuses)) {
             terminalStatuses.set(name, status);
           }
         }
+        if (msg.cwds) {
+          for (const [name, cwd] of Object.entries(msg.cwds)) {
+            terminalCwds.set(name, cwd);
+          }
+        }
         updateStatus();
         ctx?.ui.notify(
           `Joined link as "${terminalName}" (${connectedTerminals.length} online)`,
@@ -339,9 +416,10 @@ export default function (pi: ExtensionAPI) {
         pushStatus(true);
         break;
 
-      // ── Directory updates ──
+      // ── Membership updates ──
       case "terminal_joined":
         connectedTerminals = msg.terminals;
+        if (role !== "hub" && msg.cwd) terminalCwds.set(msg.name, msg.cwd);
         updateStatus();
         ctx?.ui.notify(`"${msg.name}" joined the link`, "info");
         break;
@@ -349,6 +427,21 @@ export default function (pi: ExtensionAPI) {
       case "terminal_left":
         connectedTerminals = msg.terminals;
         terminalStatuses.delete(msg.name);
+        if (role !== "hub") terminalCwds.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;
@@ -356,6 +449,11 @@ export default function (pi: ExtensionAPI) {
       // ── Status update from another terminal ──
       case "status_update":
         terminalStatuses.set(msg.name, msg.status);
+        resetInactivityFor(msg.name);
+        break;
+
+      case "cwd_update":
+        terminalCwds.set(msg.name, msg.cwd);
         break;
 
       // ── Chat message ──
@@ -384,6 +482,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}`,
@@ -393,10 +497,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}`, {
@@ -430,30 +532,38 @@ export default function (pi: ExtensionAPI) {
       if (msg.type === "register") {
         clientName = uniqueName(msg.name);
         hubClients.set(clientWs, clientName);
+        if (msg.cwd) hubTerminalCwds.set(clientName, msg.cwd);
         const list = terminalList();
         connectedTerminals = list;
         updateStatus();
 
-        // Confirm to the new client (include status snapshot)
+        // Confirm to the new client (include status + cwd snapshots)
         const statuses: Record<string, LinkStatus> = {};
         statuses[terminalName] = deriveStatus(); // hub's own status
         for (const [name, status] of hubTerminalStatuses) {
           if (name !== clientName) statuses[name] = status;
         }
+        const cwds: Record<string, string> = {};
+        if (currentCwd) cwds[terminalName] = currentCwd; // hub's own cwd
+        for (const [name, cwd] of hubTerminalCwds) {
+          if (name !== clientName) cwds[name] = cwd;
+        }
         clientWs.send(
           JSON.stringify({
             type: "welcome",
             name: clientName,
             terminals: list,
             statuses,
+            cwds,
           } satisfies WelcomeMsg),
         );
 
-        // Notify everyone else
+        // Notify everyone else (include joiner's cwd)
         const joined: TerminalJoinedMsg = {
           type: "terminal_joined",
           name: clientName,
           terminals: list,
+          cwd: msg.cwd,
         };
         hubBroadcast(joined, clientName);
         return;
@@ -465,6 +575,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,
@@ -477,6 +588,21 @@ export default function (pi: ExtensionAPI) {
         return;
       }
 
+      // Cwd update — store and relay to other clients only
+      if (msg.type === "cwd_update") {
+        hubTerminalCwds.set(clientName, msg.cwd);
+        const normalized: CwdUpdateMsg = {
+          type: "cwd_update",
+          name: clientName,
+          cwd: msg.cwd,
+        };
+        const json = JSON.stringify(normalized);
+        for (const [otherWs, name] of hubClients) {
+          if (name !== clientName) otherWs.send(json);
+        }
+        return;
+      }
+
       // Route chat / prompt messages
       if (
         msg.type === "chat" ||
@@ -491,6 +617,7 @@ export default function (pi: ExtensionAPI) {
       if (clientName) {
         hubClients.delete(clientWs);
         hubTerminalStatuses.delete(clientName);
+        hubTerminalCwds.delete(clientName);
         const list = terminalList();
         connectedTerminals = list;
         updateStatus();
@@ -555,6 +682,7 @@ export default function (pi: ExtensionAPI) {
           JSON.stringify({
             type: "register",
             name: preferredName ?? terminalName,
+            cwd: currentCwd || undefined,
           } satisfies RegisterMsg),
         );
         resolve(true);
@@ -623,14 +751,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) {
@@ -650,6 +786,8 @@ export default function (pi: ExtensionAPI) {
     connectedTerminals = [];
     terminalStatuses.clear();
     hubTerminalStatuses.clear();
+    terminalCwds.clear();
+    hubTerminalCwds.clear();
     lastPushedKind = null;
     lastPushedTool = null;
     updateStatus();
@@ -664,6 +802,7 @@ export default function (pi: ExtensionAPI) {
 
   pi.on("session_start", async (_event, _ctx) => {
     ctx = _ctx;
+    currentCwd = _ctx.cwd;
 
     // Restore preferred link name from session
     const saved = _ctx.sessionManager
@@ -688,7 +827,12 @@ export default function (pi: ExtensionAPI) {
   pi.on("session_switch", async (_event, _ctx) => {
     ctx = _ctx;
 
-    // Restore preferred name from the new session
+    // 1. Cwd change detection (always, before any name logic)
+    const newCwd = _ctx.cwd;
+    const cwdChanged = newCwd !== currentCwd;
+    if (cwdChanged) currentCwd = newCwd;
+
+    // 2. Restore preferred name from the new session
     const saved = _ctx.sessionManager
       .getEntries()
       .filter(
@@ -699,9 +843,17 @@ export default function (pi: ExtensionAPI) {
 
     preferredName = saved?.data?.name ?? null;
     const desiredName = preferredName ?? `t-${crypto.randomUUID().slice(0, 4)}`;
+    const nameChanged = desiredName !== terminalName;
 
-    if (desiredName === terminalName) return; // no identity change needed
+    if (!nameChanged && !cwdChanged) return; // nothing to do
 
+    if (!nameChanged) {
+      // Name stayed the same, but cwd changed — push cwd update
+      pushCwdUpdate();
+      return;
+    }
+
+    // Name changed (cwd may or may not have changed too)
     if (role === "hub") {
       // Hub rename in-place — avoid tearing down the server
       const takenByOther = Array.from(hubClients.values()).includes(
@@ -713,6 +865,8 @@ export default function (pi: ExtensionAPI) {
           `Session preferred name "${desiredName}" is taken, keeping "${terminalName}"`,
           "warning",
         );
+        // Still push cwd update under current name if cwd changed
+        if (cwdChanged) pushCwdUpdate();
         return;
       }
       const old = terminalName;
@@ -726,12 +880,17 @@ export default function (pi: ExtensionAPI) {
         terminalName,
       );
       hubBroadcast(
-        { type: "terminal_joined", name: desiredName, terminals: list },
+        {
+          type: "terminal_joined",
+          name: desiredName,
+          terminals: list,
+          cwd: currentCwd,
+        },
         terminalName,
       );
       pushStatus(true);
     } else if (role === "client") {
-      // Client — disconnect and reconnect with new name
+      // Client — disconnect and reconnect with new name (register includes cwd)
       terminalName = desiredName;
       disconnect();
       manuallyDisconnected = false;
@@ -770,6 +929,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
@@ -896,7 +1059,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",
@@ -908,6 +1071,13 @@ 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(", ")}`,
@@ -918,30 +1088,40 @@ export default function (pi: ExtensionAPI) {
       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 },
         );
@@ -955,14 +1135,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",
+              }),
+            );
+          }
         }
       });
     },
@@ -1010,19 +1191,25 @@ export default function (pi: ExtensionAPI) {
       if (role === "disconnected") return notConnectedResult();
 
       const statuses: Record<string, string> = {};
+      const cwds: Record<string, string> = {};
       const list = connectedTerminals
         .map((name) => {
           const status = getStatusFor(name);
           const statusStr = status ? formatStatus(status) : "";
           if (statusStr) statuses[name] = statusStr;
+          const cwd = getCwdFor(name);
+          if (cwd) cwds[name] = cwd;
           const marker = name === terminalName ? " (you)" : "";
-          return `  • ${name}${marker}${statusStr ? "  " + statusStr : ""}`;
+          let line = `  \u2022 ${name}${marker}${statusStr ? "  " + statusStr : ""}`;
+          if (cwd) line += `\n    cwd: ${cwd}`;
+          return line;
         })
         .join("\n");
 
       return textResult(`Connected terminals:\n${list}`, {
         terminals: connectedTerminals,
         statuses,
+        cwds,
         self: terminalName,
         role,
       });
@@ -1033,6 +1220,7 @@ export default function (pi: ExtensionAPI) {
         | {
             terminals?: string[];
             statuses?: Record<string, string>;
+            cwds?: Record<string, string>;
             self?: string;
             role?: string;
           }
@@ -1048,11 +1236,13 @@ export default function (pi: ExtensionAPI) {
       for (const name of details.terminals) {
         const isSelf = name === details.self;
         const status = details.statuses?.[name] ?? "";
-        const nameStr = isSelf ? `• ${name} (you)` : `• ${name}`;
+        const cwd = details.cwds?.[name];
+        const nameStr = isSelf ? `\u2022 ${name} (you)` : `\u2022 ${name}`;
         text +=
           "\n  " +
           (isSelf ? theme.fg("accent", nameStr) : theme.fg("text", nameStr)) +
           (status ? "  " + theme.fg("dim", status) : "");
+        if (cwd) text += "\n    " + theme.fg("dim", `cwd: ${shortenPath(cwd)}`);
       }
       return new Text(text, 0, 0);
     },
@@ -1070,8 +1260,11 @@ export default function (pi: ExtensionAPI) {
       const lines = connectedTerminals.map((name) => {
         const status = getStatusFor(name);
         const statusStr = status ? formatStatus(status) : "";
+        const cwd = getCwdFor(name);
         const marker = name === terminalName ? " (you)" : "";
-        return `${name}${marker}${statusStr ? ": " + statusStr : ""}`;
+        let line = `${name}${marker}${statusStr ? ": " + statusStr : ""}`;
+        if (cwd) line += `\n  cwd: ${shortenPath(cwd)}`;
+        return line;
       });
       _ctx.ui.notify(
         `Link: ${terminalName} (${role}) · ${connectedTerminals.length} online\n${lines.join("\n")}`,
@@ -1136,7 +1329,12 @@ export default function (pi: ExtensionAPI) {
           terminalName,
         );
         hubBroadcast(
-          { type: "terminal_joined", name: newName, terminals: list },
+          {
+            type: "terminal_joined",
+            name: newName,
+            terminals: list,
+            cwd: currentCwd,
+          },
           terminalName,
         );
         pushStatus(true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-link",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "WebSocket-based inter-terminal communication for Pi. Connect multiple Pi terminals over a local link network.",
   "author": "alvivar",
   "license": "MIT",