pi-acp 0.0.27 → 0.0.29

package/dist/index.js

@@ -48,36 +48,6 @@ function terminalAuthLaunchSpec() {
 
 // src/acp/session.ts
 import { RequestError as RequestError2 } from "@agentclientprotocol/sdk";
-
-// src/acp/auth-required.ts
-import { RequestError } from "@agentclientprotocol/sdk";
-function maybeAuthRequiredError(err) {
-  const msg = String(err?.message ?? err ?? "");
-  const s = msg.toLowerCase();
-  const patterns = [
-    "api key",
-    "apikey",
-    "missing key",
-    "no key",
-    "not configured",
-    "unauthorized",
-    "authentication",
-    "permission denied",
-    "forbidden",
-    "401",
-    "403"
-  ];
-  const hit = patterns.some((p) => s.includes(p));
-  if (!hit) return null;
-  return RequestError.authRequired(
-    {
-      authMethods: getAuthMethods()
-    },
-    "Configure an API key or log in with an OAuth provider."
-  );
-}
-
-// src/acp/session.ts
 import { readFileSync as readFileSync3 } from "fs";
 import { isAbsolute, resolve as resolvePath } from "path";
 
@@ -309,27 +279,68 @@ var PiRpcProcess = class _PiRpcProcess {
     if (!res.success) throw new Error(`pi get_commands failed: ${res.error ?? JSON.stringify(res.data)}`);
     return res.data;
   }
+  async sendExtensionUiResponse(response) {
+    await this.writeLine(`${JSON.stringify({ type: "extension_ui_response", ...response })}
+`);
+  }
   request(cmd) {
     const id = crypto.randomUUID();
     const withId = { ...cmd, id };
-    const line = JSON.stringify(withId) + "\n";
+    const line = `${JSON.stringify(withId)}
+`;
     return new Promise((resolve4, reject) => {
       this.pending.set(id, { resolve: resolve4, reject });
+      void this.writeLine(line).catch((error) => {
+        this.pending.delete(id);
+        reject(error);
+      });
+    });
+  }
+  writeLine(line) {
+    return new Promise((resolve4, reject) => {
       try {
-        this.child.stdin.write(line, (err) => {
-          if (err) {
-            this.pending.delete(id);
-            reject(err);
+        this.child.stdin.write(line, (error) => {
+          if (error) {
+            reject(error);
+            return;
           }
+          resolve4();
         });
-      } catch (e) {
-        this.pending.delete(id);
-        reject(e);
+      } catch (error) {
+        reject(error);
       }
     });
   }
 };
 
+// src/acp/auth-required.ts
+import { RequestError } from "@agentclientprotocol/sdk";
+function maybeAuthRequiredError(err) {
+  const msg = String(err?.message ?? err ?? "");
+  const s = msg.toLowerCase();
+  const patterns = [
+    "api key",
+    "apikey",
+    "missing key",
+    "no key",
+    "not configured",
+    "unauthorized",
+    "authentication",
+    "permission denied",
+    "forbidden",
+    "401",
+    "403"
+  ];
+  const hit = patterns.some((p) => s.includes(p));
+  if (!hit) return null;
+  return RequestError.authRequired(
+    {
+      authMethods: getAuthMethods()
+    },
+    "Configure an API key or log in with an OAuth provider."
+  );
+}
+
 // src/acp/session-store.ts
 import { mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dirname } from "path";
@@ -391,37 +402,6 @@ var SessionStore = class {
   }
 };
 
-// src/acp/translate/pi-tools.ts
-function toolResultToText(result) {
-  if (!result) return "";
-  const content = result.content;
-  if (Array.isArray(content)) {
-    const texts = content.map((c) => c?.type === "text" && typeof c.text === "string" ? c.text : "").filter(Boolean);
-    if (texts.length) return texts.join("");
-  }
-  const details = result?.details;
-  const diff = details?.diff;
-  if (typeof diff === "string" && diff.trim()) {
-    return diff;
-  }
-  const stdout = (typeof details?.stdout === "string" ? details.stdout : void 0) ?? (typeof result?.stdout === "string" ? result.stdout : void 0) ?? (typeof details?.output === "string" ? details.output : void 0) ?? (typeof result?.output === "string" ? result.output : void 0);
-  const stderr = (typeof details?.stderr === "string" ? details.stderr : void 0) ?? (typeof result?.stderr === "string" ? result.stderr : void 0);
-  const exitCode = (typeof details?.exitCode === "number" ? details.exitCode : void 0) ?? (typeof result?.exitCode === "number" ? result.exitCode : void 0) ?? (typeof details?.code === "number" ? details.code : void 0) ?? (typeof result?.code === "number" ? result.code : void 0);
-  if (typeof stdout === "string" && stdout.trim() || typeof stderr === "string" && stderr.trim()) {
-    const parts = [];
-    if (typeof stdout === "string" && stdout.trim()) parts.push(stdout);
-    if (typeof stderr === "string" && stderr.trim()) parts.push(`stderr:
-${stderr}`);
-    if (typeof exitCode === "number") parts.push(`exit code: ${exitCode}`);
-    return parts.join("\n\n").trimEnd();
-  }
-  try {
-    return JSON.stringify(result, null, 2);
-  } catch {
-    return String(result);
-  }
-}
-
 // src/acp/slash-commands.ts
 import { existsSync, readdirSync, readFileSync as readFileSync2 } from "fs";
 import { homedir as homedir2 } from "os";
@@ -546,7 +526,44 @@ function expandSlashCommand(text, fileCommands) {
   return substituteArgs(cmd.content, args);
 }
 
+// src/acp/translate/pi-tools.ts
+function toolResultToText(result) {
+  if (!result) return "";
+  const content = result.content;
+  if (Array.isArray(content)) {
+    const texts = content.map((c) => c?.type === "text" && typeof c.text === "string" ? c.text : "").filter(Boolean);
+    if (texts.length) return texts.join("");
+  }
+  const details = result?.details;
+  const diff = details?.diff;
+  if (typeof diff === "string" && diff.trim()) {
+    return diff;
+  }
+  const stdout = (typeof details?.stdout === "string" ? details.stdout : void 0) ?? (typeof result?.stdout === "string" ? result.stdout : void 0) ?? (typeof details?.output === "string" ? details.output : void 0) ?? (typeof result?.output === "string" ? result.output : void 0);
+  const stderr = (typeof details?.stderr === "string" ? details.stderr : void 0) ?? (typeof result?.stderr === "string" ? result.stderr : void 0);
+  const exitCode = (typeof details?.exitCode === "number" ? details.exitCode : void 0) ?? (typeof result?.exitCode === "number" ? result.exitCode : void 0) ?? (typeof details?.code === "number" ? details.code : void 0) ?? (typeof result?.code === "number" ? result.code : void 0);
+  if (typeof stdout === "string" && stdout.trim() || typeof stderr === "string" && stderr.trim()) {
+    const parts = [];
+    if (typeof stdout === "string" && stdout.trim()) parts.push(stdout);
+    if (typeof stderr === "string" && stderr.trim()) parts.push(`stderr:
+${stderr}`);
+    if (typeof exitCode === "number") parts.push(`exit code: ${exitCode}`);
+    return parts.join("\n\n").trimEnd();
+  }
+  try {
+    return JSON.stringify(result, null, 2);
+  } catch {
+    return String(result);
+  }
+}
+
 // src/acp/session.ts
+var CONFIRM_PERMISSION_OPTIONS = [
+  { optionId: "yes", name: "Yes", kind: "allow_once" },
+  { optionId: "no", name: "No", kind: "reject_once" }
+];
+var EXTENSION_UI_RAW_INPUT_KEYS = ["title", "message", "options", "placeholder", "prefill"];
+var CHOICE_OPTION_PREFIX = "choice-";
 function findUniqueLineNumber(text, needle) {
   if (!needle) return void 0;
   const first = text.indexOf(needle);
@@ -660,8 +677,7 @@ var PiAcpSession = class {
   cwd;
   mcpServers;
   startupInfo = null;
-  startupInfoSentOutOfTurn = false;
-  startupInfoSentInPrompt = false;
+  startupInfoSent = false;
   proc;
   conn;
   fileCommands;
@@ -696,8 +712,7 @@ var PiAcpSession = class {
   }
   setStartupInfo(text) {
     this.startupInfo = text;
-    this.startupInfoSentOutOfTurn = false;
-    this.startupInfoSentInPrompt = false;
+    this.startupInfoSent = false;
   }
   /**
    * Best-effort attempt to send startup info outside of a prompt turn.
@@ -705,23 +720,14 @@ var PiAcpSession = class {
    * callers can invoke this shortly after session/new returns.
    */
   sendStartupInfoIfPending() {
-    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;
+    if (this.startupInfoSent || !this.startupInfo) return;
+    this.startupInfoSent = 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((resolve4, reject) => {
       const queued = { message: expandedMessage, images, resolve: resolve4, reject };
@@ -963,6 +969,17 @@ var PiAcpSession = class {
         this.editSnapshots.delete(toolCallId);
         break;
       }
+      case "extension_ui_request": {
+        void this.handleExtensionUiRequest(ev).catch(() => {
+          const id = stringProp(ev, "id");
+          if (!id) {
+            return;
+          }
+          void this.proc.sendExtensionUiResponse({ id, cancelled: true }).catch(() => {
+          });
+        });
+        break;
+      }
       case "auto_retry_start": {
         this.emit({
           sessionUpdate: "agent_message_chunk",
@@ -1030,7 +1047,116 @@ var PiAcpSession = class {
         break;
     }
   }
+  async handleExtensionUiRequest(ev) {
+    const id = stringProp(ev, "id");
+    const method = stringProp(ev, "method");
+    if (!id) {
+      return;
+    }
+    if (method === "select") {
+      await this.handleExtensionSelect(ev, id);
+      return;
+    }
+    if (method === "confirm") {
+      await this.handleExtensionConfirm(ev, id);
+      return;
+    }
+    if (method === "input" || method === "editor") {
+      this.emit({
+        sessionUpdate: "agent_message_chunk",
+        content: {
+          type: "text",
+          text: `Pi ${method} UI request is not supported in ACP yet; cancelling it.`
+        }
+      });
+      await this.proc.sendExtensionUiResponse({ id, cancelled: true });
+      return;
+    }
+    if (method === "notify") {
+      this.emit({
+        sessionUpdate: "agent_message_chunk",
+        content: { type: "text", text: stringProp(ev, "message") ?? "Pi notification" }
+      });
+      await this.proc.sendExtensionUiResponse({ id, cancelled: true });
+      return;
+    }
+    await this.proc.sendExtensionUiResponse({ id, cancelled: true });
+  }
+  async handleExtensionSelect(ev, id) {
+    const rawOptions = ev.options;
+    const options = Array.isArray(rawOptions) ? rawOptions.map((option) => String(option)) : [];
+    if (!options.length) {
+      await this.proc.sendExtensionUiResponse({ id, cancelled: true });
+      return;
+    }
+    const permissionOptions = options.map((name, index2) => ({
+      optionId: `${CHOICE_OPTION_PREFIX}${index2}`,
+      name,
+      kind: "allow_once"
+    }));
+    const selected = await this.requestExtensionPermission(id, ev, permissionOptions);
+    if (selected === null) {
+      return;
+    }
+    const selectedOptionId = selected.outcome.outcome === "selected" ? selected.outcome.optionId : null;
+    const index = selectedOptionId === null ? null : optionIndex(selectedOptionId);
+    const value = index === null ? null : options.at(index) ?? null;
+    await this.proc.sendExtensionUiResponse(value === null ? { id, cancelled: true } : { id, value });
+  }
+  async handleExtensionConfirm(ev, id) {
+    const selected = await this.requestExtensionPermission(id, ev, CONFIRM_PERMISSION_OPTIONS);
+    if (selected === null) {
+      return;
+    }
+    if (selected.outcome.outcome === "cancelled") {
+      await this.proc.sendExtensionUiResponse({ id, cancelled: true });
+      return;
+    }
+    await this.proc.sendExtensionUiResponse({ id, confirmed: selected.outcome.optionId === "yes" });
+  }
+  async requestExtensionPermission(id, ev, options) {
+    try {
+      return await this.conn.requestPermission({
+        sessionId: this.sessionId,
+        toolCall: extensionUiToolCall(id, ev),
+        options
+      });
+    } catch {
+      await this.proc.sendExtensionUiResponse({ id, cancelled: true });
+      return null;
+    }
+  }
 };
+function extensionUiToolCall(id, ev) {
+  const method = stringProp(ev, "method") ?? "ui";
+  const title = stringProp(ev, "title") ?? `Pi ${method}`;
+  const rawInput = { method };
+  for (const key of EXTENSION_UI_RAW_INPUT_KEYS) {
+    if (Object.hasOwn(ev, key)) rawInput[key] = ev[key];
+  }
+  return {
+    toolCallId: `pi-ui-${id}`,
+    title,
+    kind: "other",
+    status: "pending",
+    rawInput
+  };
+}
+function stringProp(source, key) {
+  const value = source[key];
+  return typeof value === "string" ? value : null;
+}
+function optionIndex(optionId) {
+  if (!optionId.startsWith(CHOICE_OPTION_PREFIX)) {
+    return null;
+  }
+  const rawIndex = optionId.slice(CHOICE_OPTION_PREFIX.length);
+  if (!rawIndex) {
+    return null;
+  }
+  const index = Number(rawIndex);
+  return Number.isSafeInteger(index) && index >= 0 && String(index) === rawIndex ? index : null;
+}
 function formatAutoRetryMessage(ev) {
   const attempt = Number(ev.attempt);
   const maxAttempts = Number(ev.maxAttempts);
@@ -1463,6 +1589,8 @@ import { existsSync as existsSync4, readFileSync as readFileSync6, realpathSync,
 import { join as join5, dirname as dirname2, basename } from "path";
 import { spawnSync } from "child_process";
 import { fileURLToPath } from "url";
+var MODEL_CONFIG_ID = "model";
+var THOUGHT_LEVEL_CONFIG_ID = "thought_level";
 function builtinAvailableCommands() {
   return [
     {
@@ -1626,8 +1754,10 @@ var PiAcpAgent = class {
         "Configure an API key or log in with an OAuth provider."
       );
     }
-    const models = await getModelState(session.proc, { state, availableModels });
-    const thinking = await getThinkingState(session.proc, { state });
+    const { configOptions, models, modes } = await getSessionConfiguration(session.proc, {
+      state,
+      availableModels
+    });
     const quietStartup = getQuietStartup(params.cwd);
     const updateNotice = buildUpdateNotice();
     const preludeText = quietStartup ? updateNotice ? updateNotice + "\n" : "" : buildStartupInfo({
@@ -1640,8 +1770,9 @@ var PiAcpAgent = class {
     this.sessions.closeAllExcept?.(session.sessionId);
     const response = {
       sessionId: session.sessionId,
+      configOptions,
       models,
-      modes: thinking,
+      modes,
       _meta: {
         piAcp: {
           startupInfo: preludeText || null
@@ -2171,11 +2302,11 @@ ${JSON.stringify(stats, null, 2)}`;
         });
       }
     }
-    const models = await getModelState(proc);
-    const thinking = await getThinkingState(proc);
+    const { configOptions, models, modes } = await getSessionConfiguration(proc);
     const response = {
+      configOptions,
       models,
-      modes: thinking,
+      modes,
       _meta: {
         piAcp: {
           startupInfo: null
@@ -2213,28 +2344,8 @@ ${JSON.stringify(stats, null, 2)}`;
   }
   async unstable_setSessionModel(params) {
     const session = this.sessions.get(params.sessionId);
-    let provider = null;
-    let modelId = null;
-    if (params.modelId.includes("/")) {
-      const [p, ...rest] = params.modelId.split("/");
-      provider = p;
-      modelId = rest.join("/");
-    } else {
-      modelId = params.modelId;
-    }
-    if (!provider) {
-      const data = await session.proc.getAvailableModels();
-      const models = Array.isArray(data?.models) ? data.models : [];
-      const found = models.find((m) => String(m?.id) === modelId);
-      if (found) {
-        provider = String(found.provider);
-        modelId = String(found.id);
-      }
-    }
-    if (!provider || !modelId) {
-      throw RequestError3.invalidParams(`Unknown modelId: ${params.modelId}`);
-    }
-    await session.proc.setModel(provider, modelId);
+    await setSessionModel(session.proc, params.modelId);
+    await emitConfigOptionsUpdate(this.conn, session.sessionId, session.proc);
   }
   async setSessionMode(params) {
     const session = this.sessions.get(params.sessionId);
@@ -2250,8 +2361,35 @@ ${JSON.stringify(stats, null, 2)}`;
         currentModeId: mode
       }
     });
+    await emitConfigOptionsUpdate(this.conn, session.sessionId, session.proc);
     return {};
   }
+  async setSessionConfigOption(params) {
+    const session = this.sessions.get(params.sessionId);
+    const configId = String(params.configId);
+    if (typeof params.value !== "string") {
+      throw RequestError3.invalidParams(`Expected string value for config option: ${configId}`);
+    }
+    if (configId === MODEL_CONFIG_ID) {
+      await setSessionModel(session.proc, params.value);
+    } else if (configId === THOUGHT_LEVEL_CONFIG_ID) {
+      if (!isThinkingLevel(params.value)) {
+        throw RequestError3.invalidParams(`Unknown thinking level: ${params.value}`);
+      }
+      await session.proc.setThinkingLevel(params.value);
+      void this.conn.sessionUpdate({
+        sessionId: session.sessionId,
+        update: {
+          sessionUpdate: "current_mode_update",
+          currentModeId: params.value
+        }
+      });
+    } else {
+      throw RequestError3.invalidParams(`Unknown config option: ${configId}`);
+    }
+    const configOptions = await emitConfigOptionsUpdate(this.conn, session.sessionId, session.proc);
+    return { configOptions };
+  }
 };
 function isThinkingLevel(x) {
   return x === "off" || x === "minimal" || x === "low" || x === "medium" || x === "high" || x === "xhigh";
@@ -2277,6 +2415,47 @@ async function getThinkingState(proc, pre) {
     }))
   };
 }
+async function getSessionConfiguration(proc, pre) {
+  const [models, modes] = await Promise.all([getModelState(proc, pre), getThinkingState(proc, { state: pre?.state })]);
+  return {
+    configOptions: buildConfigOptions({ models, modes }),
+    models,
+    modes
+  };
+}
+function buildConfigOptions(state) {
+  const configOptions = [
+    {
+      type: "select",
+      id: THOUGHT_LEVEL_CONFIG_ID,
+      category: "thought_level",
+      name: "Thinking",
+      description: "Set the reasoning effort for this session",
+      currentValue: state.modes.currentModeId,
+      options: state.modes.availableModes.map((mode) => ({
+        value: mode.id,
+        name: mode.name,
+        description: mode.description ?? null
+      }))
+    }
+  ];
+  if (state.models?.availableModels.length) {
+    configOptions.unshift({
+      type: "select",
+      id: MODEL_CONFIG_ID,
+      category: "model",
+      name: "Model",
+      description: "Select the model for this session",
+      currentValue: state.models.currentModelId,
+      options: state.models.availableModels.map((model) => ({
+        value: model.modelId,
+        name: model.name,
+        description: model.description ?? null
+      }))
+    });
+  }
+  return configOptions;
+}
 async function getModelState(proc, pre) {
   let availableModels = [];
   const data = pre?.availableModels ?? await (async () => {
@@ -2316,9 +2495,44 @@ async function getModelState(proc, pre) {
   if (!currentModelId) currentModelId = availableModels[0]?.modelId ?? "default";
   return {
     availableModels,
-    currentModelId
+    currentModelId: currentModelId ?? availableModels[0]?.modelId ?? "default"
   };
 }
+async function emitConfigOptionsUpdate(conn, sessionId, proc) {
+  const { configOptions } = await getSessionConfiguration(proc);
+  await conn.sessionUpdate({
+    sessionId,
+    update: {
+      sessionUpdate: "config_option_update",
+      configOptions
+    }
+  });
+  return configOptions;
+}
+async function setSessionModel(proc, requestedModelId) {
+  let provider = null;
+  let modelId = null;
+  if (requestedModelId.includes("/")) {
+    const [candidateProvider, ...rest] = requestedModelId.split("/");
+    provider = candidateProvider;
+    modelId = rest.join("/");
+  } else {
+    modelId = requestedModelId;
+  }
+  if (!provider) {
+    const data = await proc.getAvailableModels();
+    const models = Array.isArray(data?.models) ? data.models : [];
+    const found = models.find((m) => String(m?.id) === modelId);
+    if (found) {
+      provider = String(found.provider);
+      modelId = String(found.id);
+    }
+  }
+  if (!provider || !modelId) {
+    throw RequestError3.invalidParams(`Unknown modelId: ${requestedModelId}`);
+  }
+  await proc.setModel(provider, modelId);
+}
 function isSemver(v) {
   return /^\d+\.\d+\.\d+(?:[-+].+)?$/.test(v);
 }