pi-acp 0.0.21 → 0.0.23

package/README.md

@@ -2,16 +2,21 @@
 
 ACP ([Agent Client Protocol](https://agentclientprotocol.com/overview/introduction)) adapter for [`pi`](https://github.com/badlogic/pi-mono/tree/main/packages/coding-agent) coding agent (fka shitty coding agent).
 
-`pi-acp` communicates **ACP JSON-RPC 2.0 over stdio** to an ACP client (e.g. an editor) and spawns `pi --mode rpc`, bridging requests/events between the two.
+`pi-acp` communicates **ACP JSON-RPC 2.0 over stdio** to an ACP client (e.g. Zed editor) and spawns `pi --mode rpc`, bridging requests/events between the two.
 
 ## Status
 
 This is an MVP-style adapter intended to be useful today and easy to iterate on. Some ACP features may be not implemented or are not supported (see [Limitations](#limitations)). Development is centered around [Zed](https://zed.dev) editor support, other clients may have varying levels of compatibility.
 
+Expect some minor breaking changes.
+
 ## Features
 
 - Streams assistant output as ACP `agent_message_chunk`
 - Maps pi tool execution to ACP `tool_call` / `tool_call_update`
+  - Tool call locations are surfaced when available for ACP clients that support opening the referenced file/context
+  - Relative file paths from pi are resolved against the session cwd before being emitted as ACP tool locations, which enables follow-along features in clients like Zed
+  - For `edit`, `pi-acp` attempts to infer a 1-based line number from a unique `oldText` match in the pre-edit file snapshot and includes it in the emitted tool location when possible
   - For `edit`, `pi-acp` snapshots the file before the tool runs and emits an ACP **structured diff** (`oldText`/`newText`) on completion when possible
 - Session persistence
   - pi stores its own sessions in `~/.pi/agent/sessions/...`
@@ -21,7 +26,7 @@ This is an MVP-style adapter intended to be useful today and easy to iterate on.
   - Adds a small set of built-in commands for headless/editor usage
   - Supports skill commands (if enabled in pi settings, they appear as `/skill:skill-name` in the ACP client)
 - Skills are loaded by pi directly and are available in ACP sessions
-- (Zed) `pi-acp` emits a short markdown “startup info” block into the session (pi version, context, skills, prompts, extensions - similar to `pi` in the terminal). You can disable it by setting `quietStartup: true` in pi settings (`~/.pi/agent/settings.json` or `<project>/.pi/settings.json`). When `quietStartup` is enabled, `pi-acp` will still emit a 'New version available' message if the installed pi version is outdated.
+- (Zed) `pi-acp` emits “startup info” block into the session (pi version, context, skills, prompts, extensions - similar to `pi` in the terminal). You can disable it by setting `quietStartup: true` in pi settings (`~/.pi/agent/settings.json` or `<project>/.pi/settings.json`). When `quietStartup` is enabled, `pi-acp` will still emit a 'New version available' message if the installed pi version is outdated.
 - (Zed) Session history is supported in Zed starting with [`v0.225.0`](https://zed.dev/releases/preview/0.225.0). Session loading / history maps to pi's session files. Sessions can be resumed both in `pi` and in the ACP client.
 
 ## Prerequisites
@@ -40,10 +45,22 @@ npm install -g @mariozechner/pi-coding-agent
 
 ### Add pi-acp to your ACP client, e.g. [Zed](https://zed.dev/docs/agents/external-agents/)
 
-Add the following to your Zed `settngs.json`:
+#### Using ACP Registry in Zed or other clients that support it:
+
+In Zed launch the registry with `zed: acp registry` command and select `pi ACP` adapter from the list. This will automatically add the agent server configuration to your `settings.json` and keep it up to date:
+
+```json
+  "agent_servers": {
+    "pi-acp": {
+      "type": "registry",
+    },
+  }
+```
 
 #### Using with `npx` (no global install needed, always loads the latest version):
 
+Add the following to your Zed `settings.json`:
+
 ```json
   "agent_servers": {
     "pi": {
@@ -96,14 +113,12 @@ Point your ACP client to the built `dist/index.js`:
 
 `pi-acp` supports slash commands:
 
-#### 1) File-based commands (compatible with pi)
+#### 1) File-based commands (aka prompts)
 
 Loaded from:
 
-- User commands: `~/.pi/agent/commands/**/*.md`
-- Project commands: `<cwd>/.pi/commands/**/*.md`
-
-These are expanded adapter-side (pi RPC mode doesn’t expand them).
+- User commands: `~/.pi/agent/prompts/**/*.md`
+- Project commands: `<cwd>/.pi/prompts/**/*.md`
 
 #### 2) Built-in commands
 

package/dist/index.js

@@ -84,6 +84,7 @@ import { isAbsolute, resolve as resolvePath } from "path";
 // src/pi-rpc/process.ts
 import { spawn } from "child_process";
 import * as readline from "readline";
+import { platform } from "os";
 var PiRpcSpawnError = class extends Error {
   /** Underlying spawn error code, e.g. ENOENT, EACCES */
   code;
@@ -145,8 +146,9 @@ var PiRpcProcess = class _PiRpcProcess {
     });
   }
   static async spawn(params) {
-    const cmd = params.piCommand ?? "pi";
-    const args = ["--mode", "rpc"];
+    const isWindows = platform() === "win32";
+    const cmd = params.piCommand ?? (isWindows ? "pi.cmd" : "pi");
+    const args = ["--mode", "rpc", "--no-themes"];
     if (params.sessionPath) args.push("--session", params.sessionPath);
     const child = spawn(cmd, args, {
       cwd: params.cwd,
@@ -524,9 +526,31 @@ function expandSlashCommand(text, fileCommands) {
 }
 
 // src/acp/session.ts
+function findUniqueLineNumber(text, needle) {
+  if (!needle) return void 0;
+  const first = text.indexOf(needle);
+  if (first < 0) return void 0;
+  const second = text.indexOf(needle, first + needle.length);
+  if (second >= 0) return void 0;
+  let line = 1;
+  for (let i = 0; i < first; i += 1) {
+    if (text.charCodeAt(i) === 10) line += 1;
+  }
+  return line;
+}
+function toToolCallLocations(args, cwd, line) {
+  const path = typeof args?.path === "string" ? args.path : void 0;
+  if (!path) return void 0;
+  const resolvedPath = isAbsolute(path) ? path : resolvePath(cwd, path);
+  return [{ path: resolvedPath, ...typeof line === "number" ? { line } : {} }];
+}
 var SessionManager = class {
   sessions = /* @__PURE__ */ new Map();
   store = new SessionStore();
+  /** Dispose all sessions and their underlying pi subprocesses. */
+  disposeAll() {
+    for (const [id] of this.sessions) this.close(id);
+  }
   /** Get a registered session if it exists (no throw). */
   maybeGet(sessionId) {
     return this.sessions.get(sessionId);
@@ -544,6 +568,13 @@ var SessionManager = class {
     }
     this.sessions.delete(sessionId);
   }
+  /** Close all sessions except the one with `keepSessionId`. */
+  closeAllExcept(keepSessionId) {
+    for (const [id] of this.sessions) {
+      if (id === keepSessionId) continue;
+      this.close(id);
+    }
+  }
   async create(params) {
     let proc;
     try {
@@ -658,13 +689,6 @@ var PiAcpSession = class {
     });
   }
   async prompt(message, images = []) {
-    if (!this.startupInfoSent && this.startupInfo) {
-      this.startupInfoSent = true;
-      this.emit({
-        sessionUpdate: "agent_message_chunk",
-        content: { type: "text", text: this.startupInfo }
-      });
-    }
     const expandedMessage = expandSlashCommand(message, this.fileCommands);
     const turnPromise = new Promise((resolve3, reject) => {
       const queued = { message: expandedMessage, images, resolve: resolve3, reject };
@@ -757,6 +781,13 @@ var PiAcpSession = class {
           });
           break;
         }
+        if (ame?.type === "thinking_delta" && typeof ame.delta === "string") {
+          this.emit({
+            sessionUpdate: "agent_thought_chunk",
+            content: { type: "text", text: ame.delta }
+          });
+          break;
+        }
         if (ame?.type === "toolcall_start" || ame?.type === "toolcall_delta" || ame?.type === "toolcall_end") {
           const toolCall = (
             // pi sometimes includes the tool call directly on the event
@@ -775,6 +806,7 @@ var PiAcpSession = class {
                 return { partialArgs: s };
               }
             })();
+            const locations = toToolCallLocations(rawInput, this.cwd);
             const existingStatus = this.currentToolCalls.get(toolCallId);
             const status = existingStatus ?? "pending";
             if (!existingStatus) {
@@ -785,6 +817,7 @@ var PiAcpSession = class {
                 title: toolName,
                 kind: toToolKind(toolName),
                 status,
+                locations,
                 rawInput
               });
             } else {
@@ -792,6 +825,7 @@ var PiAcpSession = class {
                 sessionUpdate: "tool_call_update",
                 toolCallId,
                 status,
+                locations,
                 rawInput
               });
             }
@@ -804,6 +838,7 @@ var PiAcpSession = class {
         const toolCallId = String(ev.toolCallId ?? crypto.randomUUID());
         const toolName = String(ev.toolName ?? "tool");
         const args = ev.args;
+        let line;
         if (toolName === "edit") {
           const p = typeof args?.path === "string" ? args.path : void 0;
           if (p) {
@@ -811,10 +846,13 @@ var PiAcpSession = class {
               const abs = isAbsolute(p) ? p : resolvePath(this.cwd, p);
               const oldText = readFileSync3(abs, "utf8");
               this.editSnapshots.set(toolCallId, { path: p, oldText });
+              const needle = typeof args?.oldText === "string" ? args.oldText : "";
+              line = findUniqueLineNumber(oldText, needle);
             } catch {
             }
           }
         }
+        const locations = toToolCallLocations(args, this.cwd, line);
         if (!this.currentToolCalls.has(toolCallId)) {
           this.currentToolCalls.set(toolCallId, "in_progress");
           this.emit({
@@ -823,6 +861,7 @@ var PiAcpSession = class {
             title: toolName,
             kind: toToolKind(toolName),
             status: "in_progress",
+            locations,
             rawInput: args
           });
         } else {
@@ -831,6 +870,7 @@ var PiAcpSession = class {
             sessionUpdate: "tool_call_update",
             toolCallId,
             status: "in_progress",
+            locations,
             rawInput: args
           });
         }
@@ -1457,6 +1497,9 @@ var PiAcpAgent = class {
   conn;
   sessions = new SessionManager();
   store = new SessionStore();
+  dispose() {
+    this.sessions.disposeAll();
+  }
   // Remember recent session cwd and use it as the default filter.
   lastSessionCwd = null;
   constructor(conn, _config) {
@@ -1514,12 +1557,21 @@ var PiAcpAgent = class {
       fileCommands,
       piCommand: process.env.PI_ACP_PI_COMMAND
     });
-    let rawModelsCount = 0;
-    try {
-      const data = await session.proc.getAvailableModels();
-      rawModelsCount = Array.isArray(data?.models) ? data.models.length : 0;
-    } catch {
-    }
+    let state = null;
+    let availableModels = null;
+    await Promise.all([
+      session.proc.getState().then((s) => {
+        state = s;
+      }).catch(() => {
+        state = null;
+      }),
+      session.proc.getAvailableModels().then((m) => {
+        availableModels = m;
+      }).catch(() => {
+        availableModels = null;
+      })
+    ]);
+    const rawModelsCount = Array.isArray(availableModels?.models) ? availableModels.models.length : 0;
     if (rawModelsCount === 0) {
       try {
         session.proc.dispose?.();
@@ -1530,8 +1582,8 @@ var PiAcpAgent = class {
         "Configure an API key or log in with an OAuth provider."
       );
     }
-    const models = await getModelState(session.proc);
-    const thinking = await getThinkingState(session.proc);
+    const models = await getModelState(session.proc, { state, availableModels });
+    const thinking = await getThinkingState(session.proc, { state });
     const quietStartup = getQuietStartup(params.cwd);
     const updateNotice = buildUpdateNotice();
     const preludeText = quietStartup ? updateNotice ? updateNotice + "\n" : "" : buildStartupInfo({
@@ -1539,7 +1591,9 @@ var PiAcpAgent = class {
       fileCommands,
       updateNotice
     });
-    if (preludeText) session.setStartupInfo(preludeText);
+    if (preludeText)
+      session.setStartupInfo(preludeText);
+    this.sessions.closeAllExcept?.(session.sessionId);
     const response = {
       sessionId: session.sessionId,
       models,
@@ -2010,6 +2064,7 @@ ${JSON.stringify(stats, null, 2)}`;
       proc,
       fileCommands
     });
+    this.sessions.closeAllExcept?.(session.sessionId);
     this.store.upsert({
       sessionId: params.sessionId,
       cwd: params.cwd,
@@ -2157,14 +2212,17 @@ ${JSON.stringify(stats, null, 2)}`;
 function isThinkingLevel(x) {
   return x === "off" || x === "minimal" || x === "low" || x === "medium" || x === "high" || x === "xhigh";
 }
-async function getThinkingState(proc) {
+async function getThinkingState(proc, pre) {
   let current = "medium";
-  try {
-    const state = await proc.getState();
-    const tl = typeof state?.thinkingLevel === "string" ? state.thinkingLevel : null;
-    if (tl && isThinkingLevel(tl)) current = tl;
-  } catch {
-  }
+  const state = pre?.state ?? await (async () => {
+    try {
+      return await proc.getState();
+    } catch {
+      return null;
+    }
+  })();
+  const tl = typeof state?.thinkingLevel === "string" ? state.thinkingLevel : null;
+  if (tl && isThinkingLevel(tl)) current = tl;
   const available = ["off", "minimal", "low", "medium", "high", "xhigh"];
   return {
     currentModeId: current,
@@ -2175,34 +2233,40 @@ async function getThinkingState(proc) {
     }))
   };
 }
-async function getModelState(proc) {
+async function getModelState(proc, pre) {
   let availableModels = [];
-  try {
-    const data = await proc.getAvailableModels();
-    const models = Array.isArray(data?.models) ? data.models : [];
-    availableModels = models.map((m) => {
-      const provider = String(m?.provider ?? "").trim();
-      const id = String(m?.id ?? "").trim();
-      if (!provider || !id) return null;
-      const name = String(m?.name ?? id);
-      return {
-        modelId: `${provider}/${id}`,
-        name: `${provider}/${name}`,
-        description: null
-      };
-    }).filter(Boolean);
-  } catch {
-  }
+  const data = pre?.availableModels ?? await (async () => {
+    try {
+      return await proc.getAvailableModels();
+    } catch {
+      return null;
+    }
+  })();
+  const models = Array.isArray(data?.models) ? data.models : [];
+  availableModels = models.map((m) => {
+    const provider = String(m?.provider ?? "").trim();
+    const id = String(m?.id ?? "").trim();
+    if (!provider || !id) return null;
+    const name = String(m?.name ?? id);
+    return {
+      modelId: `${provider}/${id}`,
+      name: `${provider}/${name}`,
+      description: null
+    };
+  }).filter(Boolean);
   let currentModelId = null;
-  try {
-    const state = await proc.getState();
-    const model = state?.model;
-    if (model && typeof model === "object") {
-      const provider = String(model.provider ?? "").trim();
-      const id = String(model.id ?? "").trim();
-      if (provider && id) currentModelId = `${provider}/${id}`;
+  const state = pre?.state ?? await (async () => {
+    try {
+      return await proc.getState();
+    } catch {
+      return null;
     }
-  } catch {
+  })();
+  const model = state?.model;
+  if (model && typeof model === "object") {
+    const provider = String(model.provider ?? "").trim();
+    const id = String(model.id ?? "").trim();
+    if (provider && id) currentModelId = `${provider}/${id}`;
   }
   if (!availableModels.length && !currentModelId) return null;
   if (!currentModelId) currentModelId = availableModels[0]?.modelId ?? "default";
@@ -2369,9 +2433,11 @@ function readNearestPackageJson(metaUrl) {
 }
 
 // src/index.ts
+import { platform as platform2 } from "os";
 if (process.argv.includes("--terminal-login")) {
   const { spawnSync: spawnSync2 } = await import("child_process");
-  const cmd = process.env.PI_ACP_PI_COMMAND ?? "pi";
+  const isWindows = platform2() === "win32";
+  const cmd = process.env.PI_ACP_PI_COMMAND ?? (isWindows ? "pi.cmd" : "pi");
   const res = spawnSync2(cmd, [], { stdio: "inherit", env: process.env });
   if (res.error && res.error.code === "ENOENT") {
     process.stderr.write(
@@ -2405,10 +2471,23 @@ var output = new ReadableStream({
   }
 });
 var stream = ndJsonStream(input, output);
-new AgentSideConnection((conn) => new PiAcpAgent(conn), stream);
+var agent = new AgentSideConnection((conn) => new PiAcpAgent(conn), stream);
+function shutdown() {
+  try {
+    ;
+    agent?.agent?.dispose?.();
+  } catch {
+  }
+  try {
+    process.exit(0);
+  } catch {
+  }
+}
+process.stdin.on("end", shutdown);
+process.stdin.on("close", shutdown);
 process.stdin.resume();
-process.on("SIGINT", () => process.exit(0));
-process.on("SIGTERM", () => process.exit(0));
+process.on("SIGINT", shutdown);
+process.on("SIGTERM", shutdown);
 process.stdout.on("error", () => {
   try {
     process.exit(0);