@vedmalex/ai-connect 0.4.0 → 0.6.0

package/dist/node/local.js

@@ -2,6 +2,128 @@
 import { accessSync, constants } from "node:fs";
 import { delimiter, join } from "node:path";
 
+// src/cli-presets.ts
+var AI_CONNECT_DEFAULT_CLI_PRESETS = {
+  pi: {
+    id: "pi",
+    label: "pi (coding agent)",
+    command: "pi",
+    transportId: "pi-cli",
+    options: {
+      preset: "pi",
+      // pi print mode emits the answer as plain text on stdout (no JSON wrapper),
+      // and has no ACP mode — so it uses the raw `text` parser and no discovery sidecar.
+      // pi takes file/image attachments as separate `@<path>` argv tokens (REQ-024);
+      // {files} expands one `@<staged-path>` token per attachment. pi stages all
+      // categories (PDFs as-is, no extraction guarantee).
+      argsTemplate: ["--print", "--model", "{model}", "{files}", "{prompt}"],
+      discovery: {
+        via: "none"
+      },
+      parser: {
+        kind: "text"
+      },
+      fileInput: {
+        placement: "args",
+        perFileArgs: ["@{path}"]
+      }
+    }
+  },
+  claude: {
+    id: "claude",
+    label: "Claude CLI",
+    command: "claude",
+    transportId: "claude-cli",
+    options: {
+      preset: "claude",
+      argsTemplate: ["--print", "--output-format", "json", "--model", "{model}", "{prompt}"],
+      discovery: {
+        via: "acp",
+        acp: {
+          transportId: "claude-code-acp"
+        }
+      },
+      parser: {
+        kind: "json",
+        textPath: "__preset__:claude.result",
+        usagePath: "usage",
+        errorPath: "__preset__:claude.error"
+      }
+    }
+  },
+  openclaude: {
+    id: "openclaude",
+    label: "OpenClaude CLI",
+    command: "openclaude",
+    transportId: "openclaude-cli",
+    options: {
+      preset: "openclaude",
+      argsTemplate: ["--print", "--output-format", "json", "--model", "{model}", "{prompt}"],
+      parser: {
+        kind: "json",
+        textPath: "__preset__:claude.result",
+        usagePath: "usage",
+        errorPath: "__preset__:claude.error"
+      }
+    }
+  },
+  codex: {
+    id: "codex",
+    label: "Codex CLI",
+    command: "codex",
+    transportId: "codex-cli",
+    options: {
+      preset: "codex",
+      // codex exec takes image attachments via `-i/--image <FILE>` flags
+      // (REQ-024); {files} expands a `--image <staged-path>` pair per image.
+      // Images only — a non-image attachment cleanly rejects pre-spawn.
+      argsTemplate: [
+        "exec",
+        "--json",
+        "--output-last-message",
+        "{output_file}",
+        "--model",
+        "{model}",
+        "{files}",
+        "{prompt}"
+      ],
+      discovery: {
+        via: "acp",
+        acp: {
+          transportId: "codex-acp"
+        }
+      },
+      fileInput: {
+        placement: "args",
+        perFileArgs: ["--image", "{path}"],
+        categories: ["image"]
+      },
+      parser: {
+        kind: "jsonl",
+        text: {
+          path: "__preset__:codex.text"
+        },
+        usage: {
+          path: "__preset__:codex.usage"
+        },
+        error: {
+          path: "__preset__:codex.error"
+        }
+      }
+    }
+  }
+};
+var AI_CONNECT_DEFAULT_CLI_COMMANDS = {
+  "anthropic:claude-cli": AI_CONNECT_DEFAULT_CLI_PRESETS.claude.command,
+  "anthropic:openclaude-cli": AI_CONNECT_DEFAULT_CLI_PRESETS.openclaude.command,
+  "openclaude:openclaude-cli": AI_CONNECT_DEFAULT_CLI_PRESETS.openclaude.command,
+  "openai:codex-cli": AI_CONNECT_DEFAULT_CLI_PRESETS.codex.command,
+  "pi:pi-cli": AI_CONNECT_DEFAULT_CLI_PRESETS.pi.command
+};
+function getCliTransportPreset(presetId) {
+  return AI_CONNECT_DEFAULT_CLI_PRESETS[presetId];
+}
+
 // src/errors.ts
 var AiConnectError = class extends Error {
   code;
@@ -346,9 +468,38 @@ function normalizeTransport(providerId, input) {
         ...fallback !== void 0 ? { fallback } : {}
       };
     })();
+    const fileInput = (() => {
+      const fi = descriptor.cli?.fileInput;
+      if (!fi) {
+        return void 0;
+      }
+      const validCategories = ["image", "document", "text", "other"];
+      if (fi.categories) {
+        for (const c of fi.categories) {
+          assert(
+            validCategories.includes(c),
+            `Unsupported CLI fileInput category "${String(c)}" for provider "${providerId}".`
+          );
+        }
+      }
+      const placement = fi.placement ?? "args";
+      assert(
+        placement === "args" || placement === "prompt",
+        `Unsupported CLI fileInput placement "${String(placement)}" for provider "${providerId}".`
+      );
+      return {
+        placement,
+        ...fi.perFileArgs ? { perFileArgs: fi.perFileArgs.map((part) => String(part)) } : {},
+        ...fi.mentionTemplate?.trim() ? { mentionTemplate: fi.mentionTemplate.trim() } : {},
+        ...fi.separator !== void 0 ? { separator: fi.separator } : {},
+        ...fi.categories ? { categories: [...fi.categories] } : {},
+        ...fi.stagingDir?.trim() ? { stagingDir: fi.stagingDir.trim() } : {}
+      };
+    })();
     return {
       ...normalized,
-      ...discovery ? { discovery } : {}
+      ...discovery ? { discovery } : {},
+      ...fileInput ? { fileInput } : {}
     };
   })();
   const normalizedAuth = descriptor.auth?.methodId?.trim() ? {
@@ -384,7 +535,7 @@ function normalizeTransport(providerId, input) {
     };
   }
   if (descriptor.kind === "cli") {
-    const inferredId2 = providerId === "anthropic" ? "claude-cli" : providerId === "openclaude" ? "openclaude-cli" : providerId === "openai" ? "codex-cli" : providerId === "gemini" ? "gemini-cli" : providerId === "qwen" ? "qwen-cli" : "cli";
+    const inferredId2 = providerId === "anthropic" ? "claude-cli" : providerId === "openclaude" ? "openclaude-cli" : providerId === "openai" ? "codex-cli" : providerId === "pi" ? "pi-cli" : "cli";
     return {
       kind: "cli",
       id: descriptor.id?.trim() || inferredId2,
@@ -401,7 +552,7 @@ function normalizeTransport(providerId, input) {
       ...descriptor.baseUrl?.trim() ? { baseUrl: descriptor.baseUrl.trim() } : {}
     };
   }
-  const inferredId = providerId === "anthropic" ? "claude-code-acp" : providerId === "openai" ? "codex-acp" : providerId === "gemini" ? "gemini-acp" : "acp";
+  const inferredId = providerId === "anthropic" ? "claude-code-acp" : providerId === "openai" ? "codex-acp" : "acp";
   const normalizedLaunch = descriptor.launch ? (() => {
     const contextMode = descriptor.launch?.contextMode ?? "workspace";
     const skillsMode = descriptor.launch?.skillsMode ?? "default";
@@ -436,7 +587,40 @@ function normalizeRuntime(transport, runtime) {
   }
   return "universal";
 }
+function cliPresetIdForTransportId(transportId) {
+  switch (transportId) {
+    case "pi-cli":
+      return "pi";
+    case "claude-cli":
+      return "claude";
+    case "openclaude-cli":
+      return "openclaude";
+    case "codex-cli":
+      return "codex";
+    default:
+      return void 0;
+  }
+}
+function cliFileInputCategories(transport) {
+  if (transport.kind !== "cli") {
+    return /* @__PURE__ */ new Set();
+  }
+  const presetId = transport.cli?.preset ?? cliPresetIdForTransportId(transport.id);
+  const presetFileInput = presetId ? AI_CONNECT_DEFAULT_CLI_PRESETS[presetId]?.options.fileInput : void 0;
+  const routeFileInput = transport.cli?.fileInput;
+  if (!presetFileInput && !routeFileInput) {
+    return /* @__PURE__ */ new Set();
+  }
+  const merged = {
+    ...presetFileInput ?? {},
+    ...routeFileInput ?? {}
+  };
+  return new Set(
+    merged.categories ?? ["image", "document", "text", "other"]
+  );
+}
 function defaultCapabilities(transport, runtime) {
+  const cliFileCategories = cliFileInputCategories(transport);
   const localOnly = runtime === "local" || transport.kind === "acp" || transport.kind === "cli" || transport.kind === "server";
   const browserSafe = !localOnly;
   return {
@@ -451,10 +635,12 @@ function defaultCapabilities(transport, runtime) {
     supportsClientToolExecution: transport.kind === "api",
     // C6 / F-P-4: api routes now advertise document + image input parity with acp.
     // The per-account `capabilities` override remains the escape hatch for
-    // text-only api proxies that must opt out.
-    supportsFileUpload: transport.kind === "acp" || transport.kind === "api",
+    // text-only api proxies that must opt out. REQ-024: a cli route advertises
+    // document/image input ONLY for the categories its fileInput actually stages
+    // (category-aware so e.g. an image-only cli cleanly rejects a PDF pre-spawn).
+    supportsFileUpload: transport.kind === "acp" || transport.kind === "api" || cliFileCategories.has("document"),
     supportsFileOutput: transport.kind === "acp",
-    supportsImageInput: transport.kind === "acp" || transport.kind === "api",
+    supportsImageInput: transport.kind === "acp" || transport.kind === "api" || cliFileCategories.has("image"),
     supportsImageOutput: transport.kind === "acp",
     supportsProfileVerification: true,
     supportsCredentialRotation: false,
@@ -1005,6 +1191,10 @@ function extension(value) {
   }
   return name.slice(index + 1).toLowerCase();
 }
+function extensionForMime(mimeType) {
+  const subtype = mimeType.split("/")[1]?.toLowerCase().replace(/[^a-z0-9.+-]/g, "");
+  return subtype && subtype.length > 0 ? subtype : "bin";
+}
 function isRemoteUrl(value) {
   try {
     const url = new URL(value);
@@ -1629,18 +1819,14 @@ var MODEL_REFERENCE = {
     key: "gemini-3.1-flash-lite",
     contextLength: 1048576
   },
+  "gemini-3.1-pro": { key: "gemini-3.1-pro", contextLength: 1048576 },
   "gemini-3-pro": { key: "gemini-3-pro", contextLength: 2097152 },
   "auto-gemini-3": { key: "auto-gemini-3", contextLength: 1048576 },
   "gemini-2.5-flash": { key: "gemini-2.5-flash", contextLength: 1048576 },
   "gemini-2.5-pro": { key: "gemini-2.5-pro", contextLength: 2097152 },
   "gemini-2.0-flash": { key: "gemini-2.0-flash", contextLength: 1048576 },
   "gemini-1.5-flash": { key: "gemini-1.5-flash", contextLength: 1048576 },
-  "gemini-1.5-pro": { key: "gemini-1.5-pro", contextLength: 2097152 },
-  // --- Qwen (catalog: qwen3-coder-plus) ---
-  "qwen3-coder-plus": { key: "qwen3-coder-plus", contextLength: 1048576 },
-  "qwen3-coder": { key: "qwen3-coder", contextLength: 262144 },
-  "qwen-max": { key: "qwen-max", contextLength: 32768 },
-  "qwen-plus": { key: "qwen-plus", contextLength: 131072 }
+  "gemini-1.5-pro": { key: "gemini-1.5-pro", contextLength: 2097152 }
 };
 function normalizeModelKey(model) {
   let key = model.trim().toLowerCase();
@@ -6320,8 +6506,6 @@ import { pathToFileURL } from "node:url";
 var AI_CONNECT_DEFAULT_ACP_COMMANDS = {
   "anthropic:claude-code-acp": "npx -y @agentclientprotocol/claude-agent-acp@^0.25.0",
   "openai:codex-acp": "npx @zed-industries/codex-acp@^0.11.1",
-  "gemini:gemini-acp": "gemini --acp",
-  "qwen:qwen-acp": "qwen --acp",
   "opencode:opencode-acp": "opencode acp"
 };
 
@@ -6402,15 +6586,6 @@ function resolveHomeDir(env) {
 function resolveXdgConfigHome(env) {
   return env.XDG_CONFIG_HOME ?? path.join(resolveHomeDir(env), ".config");
 }
-function resolveGeminiCliHome(env) {
-  return env.GEMINI_CLI_HOME ?? resolveHomeDir(env);
-}
-function resolveGeminiDir(env) {
-  return path.join(resolveGeminiCliHome(env), ".gemini");
-}
-function resolveQwenDir(env) {
-  return path.join(resolveHomeDir(env), ".qwen");
-}
 function resolveCodexHome(env) {
   return env.CODEX_HOME ?? path.join(resolveHomeDir(env), ".codex");
 }
@@ -6456,118 +6631,6 @@ async function removeIfExists(targetPath) {
     }
   });
 }
-async function readJsonFile(filePath) {
-  try {
-    const raw = await fs.readFile(filePath, "utf8");
-    const parsed = JSON.parse(raw);
-    return isRecord2(parsed) ? parsed : void 0;
-  } catch (error) {
-    if (error instanceof SyntaxError || error.code === "ENOENT") {
-      return void 0;
-    }
-    throw error;
-  }
-}
-function mergeRecordValues(current, next) {
-  const merged = { ...current };
-  for (const [key, value] of Object.entries(next)) {
-    const existing = merged[key];
-    if (isRecord2(existing) && isRecord2(value)) {
-      merged[key] = mergeRecordValues(existing, value);
-      continue;
-    }
-    merged[key] = value;
-  }
-  return merged;
-}
-async function writeJsonFile(filePath, value) {
-  await fs.mkdir(path.dirname(filePath), { recursive: true });
-  await fs.writeFile(filePath, `${JSON.stringify(value, null, 2)}
-`, "utf8");
-}
-async function prepareGeminiLaunchRuntime(base, launch) {
-  if (launch.contextMode === "workspace" && launch.skillsMode === "default") {
-    return {
-      ...base,
-      launch
-    };
-  }
-  const sandbox = await createSandboxPaths("ai-connect-gemini-acp-");
-  const originalGeminiDir = resolveGeminiDir(base.env);
-  const sandboxGeminiDir = path.join(sandbox.root, ".gemini");
-  const settingsPath = path.join(sandboxGeminiDir, "settings.json");
-  const systemSettingsPath = path.join(sandbox.config, "gemini-settings.json");
-  const systemDefaultsPath = path.join(
-    sandbox.config,
-    "gemini-system-defaults.json"
-  );
-  const isolatedCwd = launch.contextMode === "clean" || launch.skillsMode === "disabled" ? sandbox.root : base.cwd;
-  await Promise.all(
-    [
-      "oauth_creds.json",
-      "google_accounts.json",
-      "mcp-oauth-tokens.json",
-      "a2a-oauth-tokens.json",
-      "installation_id"
-    ].map(
-      (fileName) => maybeCopyFile(
-        path.join(originalGeminiDir, fileName),
-        path.join(sandboxGeminiDir, fileName)
-      )
-    )
-  );
-  const settings = mergeRecordValues(
-    await readJsonFile(settingsPath) ?? {},
-    {
-      context: {
-        fileName: "AI_CONNECT_CONTEXT_DISABLED.md",
-        includeDirectoryTree: false,
-        memoryBoundaryMarkers: [],
-        includeDirectories: [],
-        loadMemoryFromIncludeDirectories: false,
-        discoveryMaxDirs: 0
-      },
-      admin: {
-        mcp: {
-          enabled: false,
-          config: {},
-          requiredConfig: {}
-        },
-        ...launch.skillsMode === "disabled" ? {
-          skills: {
-            enabled: false
-          }
-        } : {}
-      },
-      ...launch.skillsMode === "disabled" ? {
-        skills: {
-          enabled: false,
-          disabled: []
-        }
-      } : {}
-    }
-  );
-  await Promise.all([
-    writeJsonFile(settingsPath, settings),
-    writeJsonFile(systemSettingsPath, {}),
-    writeJsonFile(systemDefaultsPath, {})
-  ]);
-  return {
-    commandLine: base.commandLine,
-    cwd: isolatedCwd,
-    env: {
-      ...base.env,
-      HOME: sandbox.root,
-      GEMINI_CLI_HOME: sandbox.root,
-      GEMINI_CLI_SYSTEM_SETTINGS_PATH: systemSettingsPath,
-      GEMINI_CLI_SYSTEM_DEFAULTS_PATH: systemDefaultsPath
-    },
-    launch,
-    cleanup: async () => {
-      await removeIfExists(sandbox.root);
-    }
-  };
-}
 async function prepareOpenCodeLaunchRuntime(base, launch) {
   if (launch.contextMode === "workspace" && launch.skillsMode === "default") {
     return {
@@ -6616,70 +6679,6 @@ async function prepareOpenCodeLaunchRuntime(base, launch) {
     }
   };
 }
-async function prepareQwenLaunchRuntime(base, launch) {
-  if (launch.contextMode === "workspace" && launch.skillsMode === "default") {
-    return {
-      ...base,
-      launch
-    };
-  }
-  const sandbox = await createSandboxPaths("ai-connect-qwen-acp-");
-  const originalQwenDir = resolveQwenDir(base.env);
-  const sandboxQwenDir = path.join(sandbox.home, ".qwen");
-  const settingsPath = path.join(sandboxQwenDir, "settings.json");
-  const systemSettingsPath = path.join(sandbox.config, "qwen-settings.json");
-  const systemDefaultsPath = path.join(
-    sandbox.config,
-    "qwen-system-defaults.json"
-  );
-  await Promise.all(
-    [
-      "oauth_creds.json",
-      "mcp-oauth-tokens.json",
-      "installation_id",
-      ".env",
-      "settings.json"
-    ].map(
-      (fileName) => maybeCopyFile(
-        path.join(originalQwenDir, fileName),
-        path.join(sandboxQwenDir, fileName)
-      )
-    )
-  );
-  const settings = mergeRecordValues(
-    await readJsonFile(settingsPath) ?? {},
-    {
-      context: {
-        fileName: ["AI_CONNECT_CONTEXT_DISABLED.md"],
-        includeDirectories: [],
-        loadFromIncludeDirectories: false
-      },
-      model: {
-        skipStartupContext: true
-      }
-    }
-  );
-  await Promise.all([
-    writeJsonFile(settingsPath, settings),
-    writeJsonFile(systemSettingsPath, {}),
-    writeJsonFile(systemDefaultsPath, {})
-  ]);
-  const isolatedCwd = launch.contextMode === "clean" || launch.skillsMode === "disabled" ? sandbox.root : base.cwd;
-  return {
-    commandLine: base.commandLine,
-    cwd: isolatedCwd,
-    env: {
-      ...base.env,
-      HOME: sandbox.home,
-      QWEN_CODE_SYSTEM_SETTINGS_PATH: systemSettingsPath,
-      QWEN_CODE_SYSTEM_DEFAULTS_PATH: systemDefaultsPath
-    },
-    launch,
-    cleanup: async () => {
-      await removeIfExists(sandbox.root);
-    }
-  };
-}
 async function prepareCodexLaunchRuntime(base, launch) {
   if (launch.contextMode === "workspace" && launch.skillsMode === "default") {
     return {
@@ -6797,15 +6796,9 @@ async function prepareAcpLaunchRuntime(route, options, commandLine, cwdOverride)
       ...options?.env ?? {}
     }
   };
-  if (route.transport.id === "gemini-acp") {
-    return prepareGeminiLaunchRuntime(base, launch);
-  }
   if (route.transport.id === "opencode-acp") {
     return prepareOpenCodeLaunchRuntime(base, launch);
   }
-  if (route.transport.id === "qwen-acp") {
-    return prepareQwenLaunchRuntime(base, launch);
-  }
   if (route.transport.id === "codex-acp") {
     return prepareCodexLaunchRuntime(base, launch);
   }
@@ -7386,10 +7379,6 @@ function buildAcpLifecycle(route, authRequest, mode) {
     steps.push("authenticate");
   }
   steps.push("session/new");
-  if (mode === "prompt" && route.transport.id === "gemini-acp") {
-    steps.push("session/set_model");
-    keys.push("session/set_model.modelId");
-  }
   if (mode === "prompt") {
     steps.push("session/prompt");
   }
@@ -7525,16 +7514,6 @@ var AcpConnection = class {
         );
       }
       const sessionId = session.sessionId;
-      if (context.route.transport.id === "gemini-acp") {
-        await measurePhase(
-          transport.phases ?? [],
-          "session/set_model",
-          async () => this.request("session/set_model", {
-            sessionId,
-            modelId: context.route.model
-          })
-        );
-      }
       this.activePrompt = {
         sessionId,
         text: "",
@@ -8047,9 +8026,6 @@ var AcpConnection = class {
     });
   }
 };
-function isGeminiAcpFallbackCandidate(route, commandLine) {
-  return route.transport.id === "gemini-acp" && commandLine.includes("--acp") && !commandLine.includes("--experimental-acp");
-}
 function cacheKeyForConnection(route, runtime, options) {
   const envEntries = Object.entries(options.env).sort(([left], [right]) => left.localeCompare(right)).map(([key, value]) => `${key}=${value}`).join("
");
   return [
@@ -8296,18 +8272,7 @@ function createAcpTransportManager(options) {
   }
   async function drivePrompt(context, onDelta) {
     const commandLine = resolveAcpCommand(context.route, options);
-    try {
-      return await runWithCommand(context, commandLine, onDelta);
-    } catch (error) {
-      if (!isGeminiAcpFallbackCandidate(context.route, commandLine)) {
-        throw error;
-      }
-      return await runWithCommand(
-        context,
-        commandLine.replace("--acp", "--experimental-acp"),
-        onDelta
-      );
-    }
+    return await runWithCommand(context, commandLine, onDelta);
   }
   return {
     async runPrompt(context) {
@@ -8376,17 +8341,7 @@ function createAcpTransportManager(options) {
     },
     async discoverModels(context) {
       const commandLine = resolveAcpCommand(context.route, options);
-      try {
-        return await discoverWithCommand(context, commandLine);
-      } catch (error) {
-        if (!isGeminiAcpFallbackCandidate(context.route, commandLine)) {
-          throw error;
-        }
-        return await discoverWithCommand(
-          context,
-          commandLine.replace("--acp", "--experimental-acp")
-        );
-      }
+      return await discoverWithCommand(context, commandLine);
     },
     async dispose() {
       const values = [...connectionPools.values()].flat();
@@ -8410,150 +8365,7 @@ import { spawn as spawn2 } from "node:child_process";
 import fs2 from "node:fs/promises";
 import os2 from "node:os";
 import path2 from "node:path";
-
-// src/cli-presets.ts
-var AI_CONNECT_DEFAULT_CLI_PRESETS = {
-  gemini: {
-    id: "gemini",
-    label: "Gemini CLI",
-    command: "gemini",
-    transportId: "gemini-cli",
-    options: {
-      preset: "gemini",
-      argsTemplate: ["-p", "{prompt}", "--output-format", "json", "--model", "{model}"],
-      discovery: {
-        via: "acp",
-        acp: {
-          transportId: "gemini-acp"
-        }
-      },
-      parser: {
-        kind: "json",
-        textPath: "response",
-        usagePath: "stats",
-        errorPath: "error"
-      }
-    }
-  },
-  qwen: {
-    id: "qwen",
-    label: "Qwen CLI",
-    command: "qwen",
-    transportId: "qwen-cli",
-    options: {
-      preset: "qwen",
-      argsTemplate: ["-p", "{prompt}", "--output-format", "json", "--model", "{model}"],
-      discovery: {
-        via: "acp",
-        acp: {
-          transportId: "qwen-acp"
-        }
-      },
-      parser: {
-        kind: "json",
-        textPath: "__preset__:qwen.result",
-        usagePath: "__preset__:qwen.stats",
-        errorPath: "__preset__:qwen.error"
-      }
-    }
-  },
-  claude: {
-    id: "claude",
-    label: "Claude CLI",
-    command: "claude",
-    transportId: "claude-cli",
-    options: {
-      preset: "claude",
-      argsTemplate: ["--print", "--output-format", "json", "--model", "{model}", "{prompt}"],
-      discovery: {
-        via: "acp",
-        acp: {
-          transportId: "claude-code-acp"
-        }
-      },
-      parser: {
-        kind: "json",
-        textPath: "__preset__:claude.result",
-        usagePath: "usage",
-        errorPath: "__preset__:claude.error"
-      }
-    }
-  },
-  openclaude: {
-    id: "openclaude",
-    label: "OpenClaude CLI",
-    command: "openclaude",
-    transportId: "openclaude-cli",
-    options: {
-      preset: "openclaude",
-      argsTemplate: ["--print", "--output-format", "json", "--model", "{model}", "{prompt}"],
-      parser: {
-        kind: "json",
-        textPath: "__preset__:claude.result",
-        usagePath: "usage",
-        errorPath: "__preset__:claude.error"
-      }
-    }
-  },
-  codex: {
-    id: "codex",
-    label: "Codex CLI",
-    command: "codex",
-    transportId: "codex-cli",
-    options: {
-      preset: "codex",
-      argsTemplate: [
-        "exec",
-        "--json",
-        "--output-last-message",
-        "{output_file}",
-        "--model",
-        "{model}",
-        "{prompt}"
-      ],
-      discovery: {
-        via: "acp",
-        acp: {
-          transportId: "codex-acp"
-        }
-      },
-      parser: {
-        kind: "jsonl",
-        text: {
-          path: "__preset__:codex.text"
-        },
-        usage: {
-          path: "__preset__:codex.usage"
-        },
-        error: {
-          path: "__preset__:codex.error"
-        }
-      }
-    }
-  }
-};
-var AI_CONNECT_DEFAULT_CLI_COMMANDS = {
-  "anthropic:claude-cli": AI_CONNECT_DEFAULT_CLI_PRESETS.claude.command,
-  "anthropic:openclaude-cli": AI_CONNECT_DEFAULT_CLI_PRESETS.openclaude.command,
-  "openclaude:openclaude-cli": AI_CONNECT_DEFAULT_CLI_PRESETS.openclaude.command,
-  "openai:codex-cli": AI_CONNECT_DEFAULT_CLI_PRESETS.codex.command,
-  "gemini:gemini-cli": AI_CONNECT_DEFAULT_CLI_PRESETS.gemini.command,
-  "qwen:qwen-cli": AI_CONNECT_DEFAULT_CLI_PRESETS.qwen.command
-};
-function getCliTransportPreset(presetId) {
-  return AI_CONNECT_DEFAULT_CLI_PRESETS[presetId];
-}
-
-// src/cli.ts
 var CLI_PRESET_ACP_DISCOVERY_DEFAULTS = {
-  gemini: {
-    transportId: "gemini-acp",
-    providerId: "gemini"
-  },
-  qwen: {
-    transportId: "qwen-acp",
-    providerId: "qwen"
-  },
   claude: {
     transportId: "claude-code-acp",
     providerId: "anthropic"
@@ -8583,25 +8395,26 @@ function splitCommandLine2(commandLine) {
 function quoteArg(value) {
   return /\s/.test(value) ? JSON.stringify(value) : value;
 }
-function buildCliPrompt(context) {
+function buildCliPrompt(context, fileInputEnabled) {
   if (context.request.operation !== "text") {
     throw new AiConnectError(
       "not_supported",
       `CLI transport "${context.route.transport.id}" only supports text requests.`
     );
   }
-  if (context.request.image || context.request.attachments.some(
-    (file) => portableFileCategory(file) === "image" || portableFileCategory(file) === "document"
-  )) {
+  if (context.request.image) {
     throw new AiConnectError(
       "unsupported_capability",
-      `CLI transport "${context.route.transport.id}" does not support image or document inputs.`
+      `CLI transport "${context.route.transport.id}" does not support image output.`
     );
   }
-  if (context.request.attachments.length > 0) {
+  if (!fileInputEnabled && context.request.attachments.length > 0) {
+    const hasBinary = context.request.attachments.some(
+      (file) => portableFileCategory(file) === "image" || portableFileCategory(file) === "document"
+    );
     throw new AiConnectError(
-      "not_supported",
-      `CLI transport "${context.route.transport.id}" does not support attachments.`
+      hasBinary ? "unsupported_capability" : "not_supported",
+      hasBinary ? `CLI transport "${context.route.transport.id}" does not support image or document inputs.` : `CLI transport "${context.route.transport.id}" does not support attachments.`
     );
   }
   return context.request.messages.map((message) => {
@@ -8660,10 +8473,8 @@ function buildCliCwd(context, options) {
 }
 function defaultCliPresetIdForRoute(route) {
   switch (route.transport.id) {
-    case "gemini-cli":
-      return "gemini";
-    case "qwen-cli":
-      return "qwen";
+    case "pi-cli":
+      return "pi";
     case "claude-cli":
       return "claude";
     case "openclaude-cli":
@@ -8748,11 +8559,16 @@ function createCliDiscoveryAcpRoute(route) {
 function resolveCliTransportOptions(route) {
   const presetId = route.transport.cli?.preset ?? defaultCliPresetIdForRoute(route);
   const preset = presetId ? getCliTransportPreset(presetId) : void 0;
+  const mergedFileInput = preset?.options.fileInput || route.transport.cli?.fileInput ? {
+    ...preset?.options.fileInput ?? {},
+    ...route.transport.cli?.fileInput ?? {}
+  } : void 0;
   const merged = {
     ...preset?.options ?? {},
     ...route.transport.cli ?? {},
     ...route.transport.cli?.argsTemplate ? { argsTemplate: route.transport.cli.argsTemplate } : {},
     ...route.transport.cli?.parser ? { parser: route.transport.cli.parser } : {},
+    ...mergedFileInput ? { fileInput: mergedFileInput } : {},
     ...presetId ? { preset: presetId } : {}
   };
   if (!merged.argsTemplate?.length) {
@@ -8763,15 +8579,73 @@ function resolveCliTransportOptions(route) {
   }
   return merged;
 }
-async function createOutputFile() {
+async function createCliTempDir(baseDir, prefix) {
   const tempDir = await fs2.mkdtemp(
-    path2.join(os2.tmpdir(), "ai-connect-cli-output-")
+    path2.join(baseDir ?? os2.tmpdir(), prefix ?? "ai-connect-cli-")
   );
   return {
     tempDir,
     outputFile: path2.join(tempDir, "last-message.txt")
   };
 }
+function safeStagedBasename(name, index, mimeType) {
+  const base = path2.basename(name.replace(/\\/g, "/"));
+  if (base === "" || base === "." || base === "..") {
+    return `attachment-${index}.${extensionForMime(mimeType)}`;
+  }
+  return base;
+}
+async function stageCliAttachments(attachments, attachDir, fileInput) {
+  const categories = new Set(
+    fileInput.categories ?? ["image", "document", "text", "other"]
+  );
+  await fs2.mkdir(attachDir, { recursive: true });
+  const refs = [];
+  const usedNames = /* @__PURE__ */ new Map();
+  for (let i = 0; i < attachments.length; i += 1) {
+    const file = preparePortableFile(attachments[i]);
+    const payload = await materializePortableFile(file);
+    if (!categories.has(payload.category)) {
+      continue;
+    }
+    let destName = safeStagedBasename(payload.name, i, payload.mimeType);
+    const seen = usedNames.get(destName);
+    if (seen !== void 0) {
+      destName = `${i}-${destName}`;
+    }
+    usedNames.set(destName, i);
+    const dest = path2.join(attachDir, destName);
+    if (payload.category === "text") {
+      if (payload.text !== void 0) {
+        await fs2.writeFile(dest, payload.text, "utf8");
+        refs.push(dest);
+        continue;
+      }
+    } else {
+      const bytes = payload.base64 ? Buffer.from(payload.base64, "base64") : await portableFileToBytes(file);
+      if (bytes !== void 0) {
+        await fs2.writeFile(dest, bytes);
+        refs.push(dest);
+        continue;
+      }
+    }
+    if (payload.uri) {
+      refs.push(payload.uri);
+    }
+  }
+  return refs;
+}
+function expandFileArgs(staged, fileInput) {
+  const perFileArgs = fileInput?.perFileArgs ?? ["@{path}"];
+  if (fileInput?.placement === "prompt") {
+    return [];
+  }
+  return staged.flatMap(
+    (ref) => perFileArgs.map(
+      (tpl) => tpl.replace("{path}", ref).replace("{name}", path2.basename(ref))
+    )
+  );
+}
 function materializeTemplateArg(templateArg, values, parameterKeys) {
   switch (templateArg) {
     case "{prompt}":
@@ -8798,31 +8672,62 @@ function materializeTemplateArg(templateArg, values, parameterKeys) {
 }
 async function buildCliInvocation(context, options) {
   const route = context.route;
-  const prompt = buildCliPrompt(context);
   const cliOptions = resolveCliTransportOptions(route);
+  const fileInput = cliOptions.fileInput;
+  const attachments = context.request.attachments;
+  const hasStageable = Boolean(fileInput) && attachments.length > 0;
+  let prompt = buildCliPrompt(context, Boolean(fileInput));
   const commandLine = resolveCliCommand(route, options);
   const resolved = splitCommandLine2(commandLine);
   const parameterKeys = [];
   let tempDir;
   let outputFile;
-  if (cliOptions.argsTemplate.includes("{output_file}")) {
-    const created = await createOutputFile();
+  const needsOutputFile = cliOptions.argsTemplate.includes("{output_file}");
+  if (needsOutputFile || hasStageable) {
+    const created = await createCliTempDir(
+      fileInput?.stagingDir ?? options?.staging?.dir,
+      options?.staging?.prefix
+    );
     tempDir = created.tempDir;
     outputFile = created.outputFile;
   }
+  let staged = [];
+  if (hasStageable && tempDir && fileInput) {
+    staged = await stageCliAttachments(
+      attachments,
+      path2.join(tempDir, "attachments"),
+      fileInput
+    );
+    if (fileInput.placement === "prompt" && staged.length > 0) {
+      const separator = fileInput.separator ?? " ";
+      const mentionTemplate = fileInput.mentionTemplate ?? "@{path}";
+      const mentions = staged.map(
+        (ref) => mentionTemplate.replace("{path}", ref).replace("{name}", path2.basename(ref))
+      ).join(separator);
+      prompt = `${prompt}${separator}${mentions}`;
+    }
+  }
   const args = [
     ...resolved.args,
-    ...cliOptions.argsTemplate.map(
-      (part) => materializeTemplateArg(
-        part,
-        {
-          prompt,
-          model: route.model,
-          ...outputFile ? { outputFile } : {}
-        },
-        parameterKeys
-      )
-    )
+    ...cliOptions.argsTemplate.flatMap((part) => {
+      if (part === "{files}") {
+        if (staged.length > 0) {
+          parameterKeys.push("{files}");
+        }
+        return expandFileArgs(staged, fileInput);
+      }
+      return [
+        materializeTemplateArg(
+          part,
+          {
+            prompt,
+            model: route.model,
+            ...outputFile ? { outputFile } : {}
+          },
+          parameterKeys
+        )
+      ];
+    })
   ];
   return {
     command: resolved.command,
@@ -8831,6 +8736,7 @@ async function buildCliInvocation(context, options) {
     env: buildCliEnvironment(options),
     ...tempDir ? { tempDir } : {},
     ...outputFile ? { outputFile } : {},
+    ...options?.staging?.keep ? { keepStaging: true } : {},
     parameterKeys
   };
 }
@@ -9042,60 +8948,6 @@ function parseCliModelList(stdout, parser, selector) {
   }
   return models;
 }
-function parseGeminiCli(stdout) {
-  const payload = JSON.parse(stdout);
-  if (typeof payload.error === "string") {
-    throw new AiConnectError("temporary_unavailable", payload.error);
-  }
-  if (typeof payload.response !== "string") {
-    throw new AiConnectError(
-      "temporary_unavailable",
-      "Gemini CLI JSON output did not include response text."
-    );
-  }
-  const usage = payload.stats ? statsToUsage(payload.stats) : void 0;
-  return {
-    text: payload.response,
-    ...usage ? { usage } : {},
-    data: payload
-  };
-}
-function parseQwenCli(stdout) {
-  const payload = JSON.parse(stdout);
-  if (!Array.isArray(payload)) {
-    throw new AiConnectError(
-      "temporary_unavailable",
-      "Qwen CLI JSON output did not return a message array."
-    );
-  }
-  const resultMessage = payload.find(
-    (entry) => entry && typeof entry === "object" && entry.type === "result"
-  );
-  if (!resultMessage) {
-    throw new AiConnectError(
-      "temporary_unavailable",
-      "Qwen CLI JSON output did not contain a result message."
-    );
-  }
-  if (resultMessage.is_error === true) {
-    throw new AiConnectError(
-      "temporary_unavailable",
-      typeof resultMessage.result === "string" ? resultMessage.result : "Qwen CLI returned an error result."
-    );
-  }
-  if (typeof resultMessage.result !== "string") {
-    throw new AiConnectError(
-      "temporary_unavailable",
-      "Qwen CLI result message did not contain text output."
-    );
-  }
-  const usage = resultMessage.stats ? statsToUsage(resultMessage.stats) : void 0;
-  return {
-    text: resultMessage.result,
-    ...usage ? { usage } : {},
-    data: payload
-  };
-}
 function parseClaudeCli(stdout) {
   const payload = JSON.parse(stdout);
   const text = typeof payload.result === "string" ? payload.result : typeof payload.response === "string" ? payload.response : typeof payload.text === "string" ? payload.text : void 0;
@@ -9181,10 +9033,8 @@ function parseCliResult(route, result, outputFileContent) {
     }
   }
   switch (cliOptions.preset) {
-    case "gemini":
-      return parseGeminiCli(stdout);
-    case "qwen":
-      return parseQwenCli(stdout);
+    case "pi":
+      return parseTextCli(stdout, { kind: "text" });
     case "claude":
     case "openclaude":
       return parseClaudeCli(stdout);
@@ -9275,7 +9125,7 @@ async function executeCliInvocation(invocation, timeoutMs, phases, signal) {
   });
 }
 async function cleanupCliInvocation(invocation) {
-  if (invocation.tempDir) {
+  if (invocation.tempDir && !invocation.keepStaging) {
     await fs2.rm(invocation.tempDir, { recursive: true, force: true });
   }
 }