pi-acp 0.0.20 → 0.0.22

package/README.md

@@ -2,12 +2,14 @@
 
 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`
@@ -21,7 +23,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) By default, `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: `PI_ACP_STARTUP_INFO=false` (see below)
+- (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,19 +42,29 @@ 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": {
       "type": "custom",
       "command": "npx",
       "args": ["-y", "pi-acp"],
-      "env": {
-        "PI_ACP_STARTUP_INFO": "true" // optional, "true" by default
-      }
+      "env": {}
     }
   }
 ```
@@ -98,14 +110,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

@@ -146,7 +146,7 @@ var PiRpcProcess = class _PiRpcProcess {
   }
   static async spawn(params) {
     const cmd = params.piCommand ?? "pi";
-    const args = ["--mode", "rpc"];
+    const args = ["--mode", "rpc", "--no-themes"];
     if (params.sessionPath) args.push("--session", params.sessionPath);
     const child = spawn(cmd, args, {
       cwd: params.cwd,
@@ -527,10 +527,34 @@ function expandSlashCommand(text, fileCommands) {
 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);
   }
+  /**
+   * Dispose a session's underlying pi process and remove it from the manager.
+   * Used when clients explicitly reload a session and we want a fresh pi subprocess.
+   */
+  close(sessionId) {
+    const s = this.sessions.get(sessionId);
+    if (!s) return;
+    try {
+      s.proc.dispose?.();
+    } catch {
+    }
+    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 {
@@ -645,13 +669,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 };
@@ -1254,21 +1271,32 @@ function readJsonFile(path) {
     return {};
   }
 }
-function getAgentDir() {
-  return process.env.PI_CODING_AGENT_DIR ? resolve2(process.env.PI_CODING_AGENT_DIR) : join4(homedir4(), ".pi", "agent");
-}
-function getEnableSkillCommands(cwd) {
+function getMergedSettings(cwd) {
   const globalSettingsPath = join4(getAgentDir(), "settings.json");
   const projectSettingsPath = resolve2(cwd, ".pi", "settings.json");
   const global = readJsonFile(globalSettingsPath);
   const project = readJsonFile(projectSettingsPath);
-  const merged = deepMerge(global, project);
+  return deepMerge(global, project);
+}
+function getAgentDir() {
+  return process.env.PI_CODING_AGENT_DIR ? resolve2(process.env.PI_CODING_AGENT_DIR) : join4(homedir4(), ".pi", "agent");
+}
+function getEnableSkillCommands(cwd) {
+  const merged = getMergedSettings(cwd);
   const direct = merged.enableSkillCommands;
   if (typeof direct === "boolean") return direct;
   const nested = isObject(merged.skills) ? merged.skills.enableSkillCommands : void 0;
   if (typeof nested === "boolean") return nested;
   return true;
 }
+function getQuietStartup(cwd) {
+  const merged = getMergedSettings(cwd);
+  const direct = merged.quietStartup;
+  if (typeof direct === "boolean") return direct;
+  const legacy = merged.quietStart;
+  if (typeof legacy === "boolean") return legacy;
+  return false;
+}
 
 // src/acp/pi-commands.ts
 function describeFallback(c) {
@@ -1377,14 +1405,6 @@ function hasAnyPiAuthConfigured() {
 
 // src/acp/agent.ts
 import { fileURLToPath } from "url";
-function booleanEnv(name, defaultValue) {
-  const raw = process.env[name];
-  if (raw == null) return defaultValue;
-  const v = String(raw).trim().toLowerCase();
-  if (v === "true") return true;
-  if (v === "false") return false;
-  return defaultValue;
-}
 function builtinAvailableCommands() {
   return [
     {
@@ -1441,6 +1461,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) {
@@ -1498,12 +1521,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?.();
@@ -1514,11 +1546,18 @@ 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 showStartupInfo = booleanEnv("PI_ACP_STARTUP_INFO", true);
-    const preludeText = showStartupInfo ? buildStartupInfo({ cwd: params.cwd, fileCommands }) : "";
-    if (preludeText) session.setStartupInfo(preludeText);
+    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({
+      cwd: params.cwd,
+      fileCommands,
+      updateNotice
+    });
+    if (preludeText)
+      session.setStartupInfo(preludeText);
+    this.sessions.closeAllExcept?.(session.sessionId);
     const response = {
       sessionId: session.sessionId,
       models,
@@ -1529,7 +1568,7 @@ var PiAcpAgent = class {
         }
       }
     };
-    if (showStartupInfo) setTimeout(() => session.sendStartupInfoIfPending(), 0);
+    if (preludeText) setTimeout(() => session.sendStartupInfoIfPending(), 0);
     setTimeout(() => {
       void (async () => {
         try {
@@ -1960,6 +1999,7 @@ ${JSON.stringify(stats, null, 2)}`;
     if (!isAbsolute2(params.cwd)) {
       throw RequestError3.invalidParams(`cwd must be an absolute path: ${params.cwd}`);
     }
+    this.sessions.close(params.sessionId);
     this.lastSessionCwd = params.cwd;
     const stored = this.store.get(params.sessionId);
     const sessionFile = stored?.sessionFile ?? findPiSessionFile(params.sessionId);
@@ -1988,6 +2028,7 @@ ${JSON.stringify(stats, null, 2)}`;
       proc,
       fileCommands
     });
+    this.sessions.closeAllExcept?.(session.sessionId);
     this.store.upsert({
       sessionId: params.sessionId,
       cwd: params.cwd,
@@ -2135,14 +2176,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,
@@ -2153,34 +2197,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";
@@ -2203,10 +2253,26 @@ function compareSemver(a, b) {
   }
   return 0;
 }
+function buildUpdateNotice() {
+  try {
+    const piVersion = spawnSync("pi", ["--version"], { encoding: "utf-8" });
+    const installed = String(piVersion.stdout ?? "").trim().replace(/^v/i, "");
+    if (!installed || !isSemver(installed)) return null;
+    const latestRes = spawnSync("npm", ["view", "@mariozechner/pi-coding-agent", "version"], {
+      encoding: "utf-8",
+      timeout: 800
+    });
+    const latest = String(latestRes.stdout ?? "").trim().replace(/^v/i, "");
+    if (!latest || !isSemver(latest)) return null;
+    if (compareSemver(latest, installed) <= 0) return null;
+    return `New version available: v${latest} (installed v${installed}). Run: \`npm i -g @mariozechner/pi-coding-agent\``;
+  } catch {
+    return null;
+  }
+}
 function buildStartupInfo(opts) {
   void opts.fileCommands;
   const md = [];
-  let updateNotice = null;
   try {
     const piVersion = spawnSync("pi", ["--version"], { encoding: "utf-8" });
     const installed = String(piVersion.stdout ?? "").trim().replace(/^v/i, "");
@@ -2214,17 +2280,6 @@ function buildStartupInfo(opts) {
       md.push(`pi v${installed}`);
       md.push("---");
       md.push("");
-      try {
-        const latestRes = spawnSync("npm", ["view", "@mariozechner/pi-coding-agent", "version"], {
-          encoding: "utf-8",
-          timeout: 800
-        });
-        const latest = String(latestRes.stdout ?? "").trim().replace(/^v/i, "");
-        if (latest && isSemver(latest) && isSemver(installed) && compareSemver(latest, installed) > 0) {
-          updateNotice = `New version available: v${latest} (installed v${installed}). Run: \`npm i -g @mariozechner/pi-coding-agent\``;
-        }
-      } catch {
-      }
     }
   } catch {
   }
@@ -2318,9 +2373,9 @@ function buildStartupInfo(opts) {
   } catch {
   }
   addSection("Extensions", extItems);
-  if (updateNotice) {
+  if (opts.updateNotice) {
     md.push("---");
-    md.push(updateNotice);
+    md.push(opts.updateNotice);
     md.push("");
   }
   return md.join("\n").trim() + "\n";
@@ -2378,10 +2433,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);