pi-acp 0.0.25 → 0.0.27

package/README.md

@@ -1,6 +1,6 @@
 # pi-acp
 
-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).
+ACP ([Agent Client Protocol](https://agentclientprotocol.com/overview/introduction)) adapter for [`pi`](https://github.com/earendil-works/pi) coding agent (fka shitty coding agent).
 
 `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.
 
@@ -34,7 +34,7 @@ Expect some minor breaking changes.
 Make sure pi is installed
 
 ```bash
-npm install -g @mariozechner/pi-coding-agent
+npm install -g @earendil-works/pi-coding-agent
 ```
 
 - Node.js 22+
@@ -109,6 +109,27 @@ Point your ACP client to the built `dist/index.js`:
   }
 ```
 
+### Environment variables
+
+- `PI_ACP_ENABLE_EMBEDDED_CONTEXT=true` advertises ACP `promptCapabilities.embeddedContext` support to the client.
+- Default: unset/any other value means `false`.
+- When disabled, compliant ACP clients should avoid sending embedded `resource` blocks. If they send them anyway, `pi-acp` still degrades gracefully by converting them into plain-text prompt context.
+
+You can add the environment variable in the Zed settings with:
+
+```json
+  "agent_servers": {
+    "pi": {
+      "type": "custom",
+      "command": "node",
+      "args": ["/path/to/pi-acp/dist/index.js"],
+      "env": {
+          "PI_ACP_ENABLE_EMBEDDED_CONTEXT": "true",
+      }
+    }
+  }
+```
+
 ### Slash commands
 
 `pi-acp` supports slash commands:
@@ -174,7 +195,7 @@ Project layout:
 ## Limitations
 
 - No ACP filesystem delegation (`fs/*`) and no ACP terminal delegation (`terminal/*`). pi reads/writes and executes locally.
-- MCP servers are accepted in ACP params and stored in session state, but not wired through to pi (see [why](https://mariozechner.at/posts/2025-11-02-what-if-you-dont-need-mcp/)). If you use [pi MCP adapter](https://github.com/nicobailon/pi-mcp-adapter) it will be available in the ACP client.
+- MCP servers are accepted in ACP params and stored in session state, but not wired through to pi in this adapter. If you use [pi MCP adapter](https://github.com/nicobailon/pi-mcp-adapter) it will be available in the ACP client.
 - Assistant streaming is currently sent as `agent_message_chunk` (no separate thought stream).
 - Queue is implemented client-side and should work like pi's `one-at-a-time`
 - ~~ACP clients don't yet suport session history, but ACP sessions from `pi-acp` can be `/resume`d in pi directly~~

package/dist/index.js

@@ -171,10 +171,10 @@ var PiRpcProcess = class _PiRpcProcess {
       shell: shouldUseShellForPiCommand(cmd)
     });
     try {
-      await new Promise((resolve3, reject) => {
+      await new Promise((resolve4, reject) => {
         const onSpawn = () => {
           cleanup();
-          resolve3();
+          resolve4();
         };
         const onError = (err) => {
           cleanup();
@@ -191,7 +191,7 @@ var PiRpcProcess = class _PiRpcProcess {
       const code = typeof e?.code === "string" ? e.code : void 0;
       if (code === "ENOENT") {
         throw new PiRpcSpawnError(
-          `Could not start pi: executable not found (command: ${cmd}). Pi needs to be installed before it can run in ACP clients. Install it via \`npm install -g @mariozechner/pi-coding-agent\` or ensure \`pi\` is on your PATH. Then try again.`,
+          `Could not start pi: executable not found (command: ${cmd}). Pi needs to be installed before it can run in ACP clients. Install it via \`npm install -g @earendil-works/pi-coding-agent\` or ensure \`pi\` is on your PATH. Then try again.`,
           { code, cause: e }
         );
       }
@@ -313,8 +313,8 @@ var PiRpcProcess = class _PiRpcProcess {
     const id = crypto.randomUUID();
     const withId = { ...cmd, id };
     const line = JSON.stringify(withId) + "\n";
-    return new Promise((resolve3, reject) => {
-      this.pending.set(id, { resolve: resolve3, reject });
+    return new Promise((resolve4, reject) => {
+      this.pending.set(id, { resolve: resolve4, reject });
       try {
         this.child.stdin.write(line, (err) => {
           if (err) {
@@ -383,6 +383,12 @@ var SessionStore = class {
     };
     saveFile(this.path, db);
   }
+  delete(sessionId) {
+    const db = loadFile(this.path);
+    if (!db.sessions[sessionId]) return;
+    delete db.sessions[sessionId];
+    saveFile(this.path, db);
+  }
 };
 
 // src/acp/translate/pi-tools.ts
@@ -654,7 +660,8 @@ var PiAcpSession = class {
   cwd;
   mcpServers;
   startupInfo = null;
-  startupInfoSent = false;
+  startupInfoSentOutOfTurn = false;
+  startupInfoSentInPrompt = false;
   proc;
   conn;
   fileCommands;
@@ -689,6 +696,8 @@ var PiAcpSession = class {
   }
   setStartupInfo(text) {
     this.startupInfo = text;
+    this.startupInfoSentOutOfTurn = false;
+    this.startupInfoSentInPrompt = false;
   }
   /**
    * Best-effort attempt to send startup info outside of a prompt turn.
@@ -696,17 +705,26 @@ var PiAcpSession = class {
    * callers can invoke this shortly after session/new returns.
    */
   sendStartupInfoIfPending() {
-    if (this.startupInfoSent || !this.startupInfo) return;
-    this.startupInfoSent = true;
+    if (this.startupInfoSentOutOfTurn || !this.startupInfo) return;
+    this.startupInfoSentOutOfTurn = true;
+    this.emit({
+      sessionUpdate: "agent_message_chunk",
+      content: { type: "text", text: this.startupInfo }
+    });
+  }
+  sendStartupInfoOnFirstPromptIfPending() {
+    if (this.startupInfoSentInPrompt || !this.startupInfo) return;
+    this.startupInfoSentInPrompt = true;
     this.emit({
       sessionUpdate: "agent_message_chunk",
       content: { type: "text", text: this.startupInfo }
     });
   }
   async prompt(message, images = []) {
+    this.sendStartupInfoOnFirstPromptIfPending();
     const expandedMessage = expandSlashCommand(message, this.fileCommands);
-    const turnPromise = new Promise((resolve3, reject) => {
-      const queued = { message: expandedMessage, images, resolve: resolve3, reject };
+    const turnPromise = new Promise((resolve4, reject) => {
+      const queued = { message: expandedMessage, images, resolve: resolve4, reject };
       if (this.pendingTurn) {
         this.turnQueue.push(queued);
         this.emit({
@@ -962,7 +980,10 @@ var PiAcpSession = class {
       case "auto_compaction_start": {
         this.emit({
           sessionUpdate: "agent_message_chunk",
-          content: { type: "text", text: "Context nearing limit, running automatic compaction..." }
+          content: {
+            type: "text",
+            text: "Context nearing limit, running automatic compaction..."
+          }
         });
         break;
       }
@@ -1036,16 +1057,31 @@ function toToolKind(toolName) {
 }
 
 // src/acp/pi-sessions.ts
-import { readdirSync as readdirSync2, readFileSync as readFileSync4, statSync, openSync, readSync, closeSync } from "fs";
+import { readdirSync as readdirSync2, readFileSync as readFileSync4, statSync, openSync, readSync, closeSync, existsSync as existsSync2 } from "fs";
 import { homedir as homedir3 } from "os";
-import { join as join3 } from "path";
+import { join as join3, resolve as resolve2, isAbsolute as isAbsolute2 } from "path";
 var DEFAULT_TAIL_BYTES = 256 * 1024;
 var DEFAULT_HEAD_BYTES = 64 * 1024;
 function getPiAgentDir() {
-  return process.env.PI_CODING_AGENT_DIR ?? join3(homedir3(), ".pi", "agent");
+  return process.env.PI_CODING_AGENT_DIR ? resolve2(process.env.PI_CODING_AGENT_DIR) : join3(homedir3(), ".pi", "agent");
+}
+function readSessionDirFromSettings(agentDir) {
+  const settingsPath = join3(agentDir, "settings.json");
+  try {
+    if (!existsSync2(settingsPath)) return null;
+    const raw = readFileSync4(settingsPath, "utf8");
+    const data = JSON.parse(raw);
+    if (!data || typeof data !== "object" || Array.isArray(data)) return null;
+    const sessionDir = data.sessionDir;
+    if (typeof sessionDir !== "string" || !sessionDir.trim()) return null;
+    return isAbsolute2(sessionDir) ? sessionDir : resolve2(agentDir, sessionDir);
+  } catch {
+    return null;
+  }
 }
 function getPiSessionsDir() {
-  return join3(getPiAgentDir(), "sessions");
+  const agentDir = getPiAgentDir();
+  return readSessionDirFromSettings(agentDir) ?? join3(agentDir, "sessions");
 }
 function walkJsonlFiles(dir, out) {
   let entries;
@@ -1339,9 +1375,9 @@ ${r.text}`;
 }
 
 // src/acp/pi-settings.ts
-import { existsSync as existsSync2, readFileSync as readFileSync5 } from "fs";
+import { existsSync as existsSync3, readFileSync as readFileSync5 } from "fs";
 import { homedir as homedir4 } from "os";
-import { join as join4, resolve as resolve2 } from "path";
+import { join as join4, resolve as resolve3 } from "path";
 function isObject(x) {
   return Boolean(x) && typeof x === "object" && !Array.isArray(x);
 }
@@ -1356,7 +1392,7 @@ function deepMerge(a, b) {
 }
 function readJsonFile(path) {
   try {
-    if (!existsSync2(path)) return {};
+    if (!existsSync3(path)) return {};
     const raw = readFileSync5(path, "utf-8");
     const data = JSON.parse(raw);
     return isObject(data) ? data : {};
@@ -1366,13 +1402,13 @@ function readJsonFile(path) {
 }
 function getMergedSettings(cwd) {
   const globalSettingsPath = join4(getAgentDir(), "settings.json");
-  const projectSettingsPath = resolve2(cwd, ".pi", "settings.json");
+  const projectSettingsPath = resolve3(cwd, ".pi", "settings.json");
   const global = readJsonFile(globalSettingsPath);
   const project = readJsonFile(projectSettingsPath);
   return deepMerge(global, project);
 }
 function getAgentDir() {
-  return process.env.PI_CODING_AGENT_DIR ? resolve2(process.env.PI_CODING_AGENT_DIR) : join4(homedir4(), ".pi", "agent");
+  return process.env.PI_CODING_AGENT_DIR ? resolve3(process.env.PI_CODING_AGENT_DIR) : join4(homedir4(), ".pi", "agent");
 }
 function getEnableSkillCommands(cwd) {
   const merged = getMergedSettings(cwd);
@@ -1422,81 +1458,10 @@ function toAvailableCommandsFromPiGetCommands(data, opts) {
 }
 
 // src/acp/agent.ts
-import { isAbsolute as isAbsolute2 } from "path";
-import { existsSync as existsSync4, readFileSync as readFileSync7, realpathSync, readdirSync as readdirSync3, statSync as statSync2 } from "fs";
-import { join as join6, dirname as dirname2, basename } from "path";
+import { isAbsolute as isAbsolute3 } from "path";
+import { existsSync as existsSync4, readFileSync as readFileSync6, realpathSync, readdirSync as readdirSync3, statSync as statSync2, unlinkSync } from "fs";
+import { join as join5, dirname as dirname2, basename } from "path";
 import { spawnSync } from "child_process";
-
-// src/pi-auth/status.ts
-import { existsSync as existsSync3, readFileSync as readFileSync6 } from "fs";
-import { homedir as homedir5 } from "os";
-import { join as join5 } from "path";
-function safeReadJson(path) {
-  try {
-    if (!existsSync3(path)) return null;
-    const raw = readFileSync6(path, "utf-8");
-    if (!raw.trim()) return null;
-    return JSON.parse(raw);
-  } catch {
-    return null;
-  }
-}
-function getPiAgentDir2() {
-  const envDir = process.env.PI_CODING_AGENT_DIR;
-  if (envDir) {
-    if (envDir === "~") return homedir5();
-    if (envDir.startsWith("~/")) return homedir5() + envDir.slice(1);
-    return envDir;
-  }
-  return join5(homedir5(), ".pi", "agent");
-}
-function hasAnyPiAuthConfigured() {
-  const agentDir = getPiAgentDir2();
-  const authPath = join5(agentDir, "auth.json");
-  const auth = safeReadJson(authPath);
-  if (auth && typeof auth === "object" && Object.keys(auth).length > 0) return true;
-  const modelsPath = join5(agentDir, "models.json");
-  const models = safeReadJson(modelsPath);
-  const providers = models?.providers;
-  if (providers && typeof providers === "object") {
-    for (const p of Object.values(providers)) {
-      if (p && typeof p === "object" && typeof p.apiKey === "string" && p.apiKey.trim()) {
-        return true;
-      }
-    }
-  }
-  const envVars = [
-    "OPENAI_API_KEY",
-    "AZURE_OPENAI_API_KEY",
-    "GEMINI_API_KEY",
-    "GROQ_API_KEY",
-    "CEREBRAS_API_KEY",
-    "XAI_API_KEY",
-    "OPENROUTER_API_KEY",
-    "AI_GATEWAY_API_KEY",
-    "ZAI_API_KEY",
-    "MISTRAL_API_KEY",
-    "MINIMAX_API_KEY",
-    "MINIMAX_CN_API_KEY",
-    "HF_TOKEN",
-    "OPENCODE_API_KEY",
-    "KIMI_API_KEY",
-    // Copilot/github
-    "COPILOT_GITHUB_TOKEN",
-    "GH_TOKEN",
-    "GITHUB_TOKEN",
-    // Anthropic oauth
-    "ANTHROPIC_OAUTH_TOKEN",
-    "ANTHROPIC_API_KEY"
-  ];
-  for (const k of envVars) {
-    const v = process.env[k];
-    if (typeof v === "string" && v.trim()) return true;
-  }
-  return false;
-}
-
-// src/acp/agent.ts
 import { fileURLToPath } from "url";
 function builtinAvailableCommands() {
   return [
@@ -1563,6 +1528,17 @@ var PiAcpAgent = class {
     this.conn = conn;
     void _config;
   }
+  cleanupFailedNewSession(sessionId, state) {
+    this.sessions.close(sessionId);
+    const sessionFile = typeof state?.sessionFile === "string" && state.sessionFile.trim() ? state.sessionFile : this.store.get(sessionId)?.sessionFile;
+    if (typeof sessionFile === "string" && sessionFile.trim()) {
+      try {
+        if (existsSync4(sessionFile)) unlinkSync(sessionFile);
+      } catch {
+      }
+    }
+    this.store.delete(sessionId);
+  }
   async initialize(params) {
     const supportedVersion = 1;
     const requested = params.protocolVersion;
@@ -1584,7 +1560,7 @@ var PiAcpAgent = class {
         promptCapabilities: {
           image: true,
           audio: false,
-          embeddedContext: false
+          embeddedContext: process.env.PI_ACP_ENABLE_EMBEDDED_CONTEXT === "true"
         },
         sessionCapabilities: {
           // **UNSTABLE** ACP capability used by Zed's codex-acp adapter.
@@ -1595,16 +1571,10 @@ var PiAcpAgent = class {
     };
   }
   async newSession(params) {
-    if (!isAbsolute2(params.cwd)) {
+    if (!isAbsolute3(params.cwd)) {
       throw RequestError3.invalidParams(`cwd must be an absolute path: ${params.cwd}`);
     }
     this.lastSessionCwd = params.cwd;
-    if (!hasAnyPiAuthConfigured()) {
-      throw RequestError3.authRequired(
-        { authMethods: getAuthMethods() },
-        "Configure an API key or log in with an OAuth provider."
-      );
-    }
     const fileCommands = loadSlashCommands(params.cwd);
     const enableSkillCommands = getEnableSkillCommands(params.cwd);
     const session = await this.sessions.create({
@@ -1616,24 +1586,41 @@ var PiAcpAgent = class {
     });
     let state = null;
     let availableModels = null;
+    let stateErr = null;
+    let availableModelsErr = null;
     await Promise.all([
       session.proc.getState().then((s) => {
         state = s;
-      }).catch(() => {
+      }).catch((err) => {
+        stateErr = err;
         state = null;
       }),
       session.proc.getAvailableModels().then((m) => {
         availableModels = m;
-      }).catch(() => {
+      }).catch((err) => {
+        availableModelsErr = err;
         availableModels = null;
       })
     ]);
+    const availableModelsAuthErr = maybeAuthRequiredError(availableModelsErr);
+    if (availableModelsAuthErr) {
+      this.cleanupFailedNewSession(session.sessionId, state);
+      throw availableModelsAuthErr;
+    }
+    if (availableModelsErr) {
+      this.cleanupFailedNewSession(session.sessionId, state);
+      throw RequestError3.internalError({}, String(availableModelsErr?.message ?? availableModelsErr));
+    }
     const rawModelsCount = Array.isArray(availableModels?.models) ? availableModels.models.length : 0;
     if (rawModelsCount === 0) {
-      try {
-        session.proc.dispose?.();
-      } catch {
-      }
+      this.cleanupFailedNewSession(session.sessionId, state);
+      throw RequestError3.authRequired(
+        { authMethods: getAuthMethods() },
+        "Configure an API key or log in with an OAuth provider."
+      );
+    }
+    if (stateErr && maybeAuthRequiredError(stateErr)) {
+      this.cleanupFailedNewSession(session.sessionId, state);
       throw RequestError3.authRequired(
         { authMethods: getAuthMethods() },
         "Configure an API key or log in with an OAuth provider."
@@ -1885,7 +1872,7 @@ ${JSON.stringify(stats, null, 2)}`;
             if (piPath) {
               const resolved = realpathSync(piPath);
               const pkgRoot = dirname2(dirname2(resolved));
-              const p = join6(pkgRoot, "CHANGELOG.md");
+              const p = join5(pkgRoot, "CHANGELOG.md");
               if (existsSync4(p)) return p;
             }
           } catch {
@@ -1894,7 +1881,7 @@ ${JSON.stringify(stats, null, 2)}`;
             const npmRoot = spawnSync("npm", ["root", "-g"], { encoding: "utf-8" });
             const root = String(npmRoot.stdout ?? "").trim();
             if (root) {
-              const p = join6(root, "@mariozechner", "pi-coding-agent", "CHANGELOG.md");
+              const p = join5(root, "@earendil-works", "pi-coding-agent", "CHANGELOG.md");
               if (existsSync4(p)) return p;
             }
           } catch {
@@ -1914,7 +1901,7 @@ ${JSON.stringify(stats, null, 2)}`;
         }
         let text = "";
         try {
-          text = readFileSync7(changelogPath, "utf-8");
+          text = readFileSync6(changelogPath, "utf-8");
         } catch (e) {
           await this.conn.sessionUpdate({
             sessionId: session.sessionId,
@@ -1954,7 +1941,7 @@ ${JSON.stringify(stats, null, 2)}`;
           return { stopReason: "end_turn" };
         }
         try {
-          const raw = readFileSync7(sessionFile, "utf-8");
+          const raw = readFileSync6(sessionFile, "utf-8");
           if (raw.trim().length === 0) {
             await this.conn.sessionUpdate({
               sessionId: session.sessionId,
@@ -1982,7 +1969,7 @@ ${JSON.stringify(stats, null, 2)}`;
           return { stopReason: "end_turn" };
         }
         const safeSessionId = session.sessionId.replace(/[^a-zA-Z0-9_-]/g, "_");
-        const outputPath = join6(session.cwd, `pi-session-${safeSessionId}.html`);
+        const outputPath = join5(session.cwd, `pi-session-${safeSessionId}.html`);
         let resultPath = "";
         try {
           const result2 = await session.proc.exportHtml(outputPath);
@@ -2089,7 +2076,7 @@ ${JSON.stringify(stats, null, 2)}`;
     return { sessions, nextCursor, _meta: {} };
   }
   async loadSession(params) {
-    if (!isAbsolute2(params.cwd)) {
+    if (!isAbsolute3(params.cwd)) {
       throw RequestError3.invalidParams(`cwd must be an absolute path: ${params.cwd}`);
     }
     this.sessions.close(params.sessionId);
@@ -2349,16 +2336,19 @@ function compareSemver(a, b) {
 function buildUpdateNotice() {
   try {
     const piVersion = spawnSync("pi", ["--version"], { encoding: "utf-8" });
-    const installed = (String(piVersion.stdout ?? "").trim() || String(piVersion.stderr ?? "").trim()).replace(/^v/i, "");
+    const installed = (String(piVersion.stdout ?? "").trim() || String(piVersion.stderr ?? "").trim()).replace(
+      /^v/i,
+      ""
+    );
     if (!installed || !isSemver(installed)) return null;
-    const latestRes = spawnSync("npm", ["view", "@mariozechner/pi-coding-agent", "version"], {
+    const latestRes = spawnSync("npm", ["view", "@earendil-works/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\``;
+    return `New version available: v${latest} (installed v${installed}). Run: \`npm i -g @earendil-works/pi-coding-agent\``;
   } catch {
     return null;
   }
@@ -2368,7 +2358,10 @@ function buildStartupInfo(opts) {
   const md = [];
   try {
     const piVersion = spawnSync("pi", ["--version"], { encoding: "utf-8" });
-    const installed = (String(piVersion.stdout ?? "").trim() || String(piVersion.stderr ?? "").trim()).replace(/^v/i, "");
+    const installed = (String(piVersion.stdout ?? "").trim() || String(piVersion.stderr ?? "").trim()).replace(
+      /^v/i,
+      ""
+    );
     if (installed) {
       md.push(`pi v${installed}`);
       md.push("---");
@@ -2384,14 +2377,14 @@ function buildStartupInfo(opts) {
     md.push("");
   };
   const contextItems = [];
-  const contextPath = join6(opts.cwd, "AGENTS.md");
+  const contextPath = join5(opts.cwd, "AGENTS.md");
   if (existsSync4(contextPath)) contextItems.push(contextPath);
   addSection("Context", contextItems);
   const skillsItems = [];
   const pushSkillFromRoot = (root) => {
     try {
       for (const e of readdirSync3(root)) {
-        const p = join6(root, e);
+        const p = join5(root, e);
         try {
           const st = statSync2(p);
           if (st.isFile() && e.toLowerCase().endsWith(".md")) {
@@ -2411,7 +2404,7 @@ function buildStartupInfo(opts) {
         }
         for (const name of entries) {
           if (name === "node_modules" || name === ".git") continue;
-          const p = join6(dir, name);
+          const p = join5(dir, name);
           let st;
           try {
             st = statSync2(p);
@@ -2428,15 +2421,15 @@ function buildStartupInfo(opts) {
     } catch {
     }
   };
-  const globalSkillsDir = join6(getAgentDir(), "skills");
+  const globalSkillsDir = join5(getAgentDir(), "skills");
   pushSkillFromRoot(globalSkillsDir);
-  const legacyAgentsSkillsDir = join6(process.env.HOME ?? "", ".agents", "skills");
+  const legacyAgentsSkillsDir = join5(process.env.HOME ?? "", ".agents", "skills");
   pushSkillFromRoot(legacyAgentsSkillsDir);
-  const projectSkillsDir = join6(opts.cwd, ".pi", "skills");
+  const projectSkillsDir = join5(opts.cwd, ".pi", "skills");
   pushSkillFromRoot(projectSkillsDir);
   addSection("Skills", skillsItems);
   const promptsItems = [];
-  const promptsDir = join6(process.env.HOME ?? "", ".pi", "agent", "prompts");
+  const promptsDir = join5(process.env.HOME ?? "", ".pi", "agent", "prompts");
   try {
     const prompts = readdirSync3(promptsDir).filter((f) => f.endsWith(".md"));
     for (const f of prompts) promptsItems.push(`/${basename(f, ".md")}`);
@@ -2444,15 +2437,15 @@ function buildStartupInfo(opts) {
   }
   addSection("Prompts", promptsItems);
   const extItems = [];
-  const extDir = join6(process.env.HOME ?? "", ".pi", "agent", "extensions");
+  const extDir = join5(process.env.HOME ?? "", ".pi", "agent", "extensions");
   try {
     const exts = readdirSync3(extDir).filter((f) => f.endsWith(".ts") || f.endsWith(".js"));
-    for (const f of exts) extItems.push(join6(extDir, f));
+    for (const f of exts) extItems.push(join5(extDir, f));
   } catch {
   }
   try {
-    const settingsPath = join6(process.env.HOME ?? "", ".pi", "agent", "settings.json");
-    const settings = JSON.parse(readFileSync7(settingsPath, "utf-8"));
+    const settingsPath = join5(process.env.HOME ?? "", ".pi", "agent", "settings.json");
+    const settings = JSON.parse(readFileSync6(settingsPath, "utf-8"));
     const pkgs = Array.isArray(settings?.packages) ? settings.packages : [];
     for (const pkg2 of pkgs) {
       const s = String(pkg2);
@@ -2477,9 +2470,9 @@ function readNearestPackageJson(metaUrl) {
   try {
     let dir = dirname2(fileURLToPath(metaUrl));
     for (let i = 0; i < 6; i++) {
-      const p = join6(dir, "package.json");
+      const p = join5(dir, "package.json");
       if (existsSync4(p)) {
-        const json = JSON.parse(readFileSync7(p, "utf-8"));
+        const json = JSON.parse(readFileSync6(p, "utf-8"));
         return { name: json?.name, version: json?.version };
       }
       dir = dirname2(dir);
@@ -2500,7 +2493,7 @@ if (process.argv.includes("--terminal-login")) {
   });
   if (res.error && res.error.code === "ENOENT") {
     process.stderr.write(
-      `pi-acp: could not start pi (command not found: ${cmd}). Install it via \`npm install -g @mariozechner/pi-coding-agent\` or ensure \`pi\` is on your PATH.
+      `pi-acp: could not start pi (command not found: ${cmd}). Install it via \`npm install -g @earendil-works/pi-coding-agent\` or ensure \`pi\` is on your PATH.
 `
     );
     process.exit(1);
@@ -2509,15 +2502,15 @@ if (process.argv.includes("--terminal-login")) {
 }
 var input = new WritableStream({
   write(chunk) {
-    return new Promise((resolve3) => {
-      if (process.stdout.destroyed || !process.stdout.writable) return resolve3();
+    return new Promise((resolve4) => {
+      if (process.stdout.destroyed || !process.stdout.writable) return resolve4();
       try {
         process.stdout.write(chunk, (err) => {
           void err;
-          resolve3();
+          resolve4();
         });
       } catch {
-        resolve3();
+        resolve4();
       }
     });
   }