@vedmalex/ai-connect 0.4.0 → 0.5.0

package/dist/bun/index.js

@@ -383,7 +383,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,
@@ -400,7 +400,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";
@@ -1638,18 +1638,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();
@@ -6343,54 +6339,26 @@ function createDefaultRouteHandlers(options = {}) {
 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"
 };
 
 // src/cli-presets.ts
 var AI_CONNECT_DEFAULT_CLI_PRESETS = {
-  gemini: {
-    id: "gemini",
-    label: "Gemini CLI",
-    command: "gemini",
-    transportId: "gemini-cli",
+  pi: {
+    id: "pi",
+    label: "pi (coding agent)",
+    command: "pi",
+    transportId: "pi-cli",
     options: {
-      preset: "gemini",
-      argsTemplate: ["-p", "{prompt}", "--output-format", "json", "--model", "{model}"],
+      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.
+      argsTemplate: ["--print", "--model", "{model}", "{prompt}"],
       discovery: {
-        via: "acp",
-        acp: {
-          transportId: "gemini-acp"
-        }
+        via: "none"
       },
       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"
+        kind: "text"
       }
     }
   },
@@ -6474,8 +6442,7 @@ var AI_CONNECT_DEFAULT_CLI_COMMANDS = {
   "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
+  "pi:pi-cli": AI_CONNECT_DEFAULT_CLI_PRESETS.pi.command
 };
 function getCliTransportPreset(presetId) {
   return AI_CONNECT_DEFAULT_CLI_PRESETS[presetId];
@@ -6597,52 +6564,22 @@ var TEXT_PROVIDER_CATALOG = [
         runtime: "universal",
         defaultModel: "gemini-3.1-flash-lite",
         defaultBaseUrl: ""
-      },
-      {
-        providerId: "gemini",
-        providerLabel: "Gemini",
-        transportKind: "cli",
-        transportId: "gemini-cli",
-        transportLabel: "Gemini CLI",
-        runtime: "local",
-        defaultModel: "gemini-2.5-flash",
-        defaultCommand: AI_CONNECT_DEFAULT_CLI_COMMANDS["gemini:gemini-cli"]
-      },
-      {
-        providerId: "gemini",
-        providerLabel: "Gemini",
-        transportKind: "acp",
-        transportId: "gemini-acp",
-        transportLabel: "Gemini ACP",
-        runtime: "local",
-        defaultModel: "auto-gemini-3",
-        defaultCommand: AI_CONNECT_DEFAULT_ACP_COMMANDS["gemini:gemini-acp"]
       }
     ]
   },
   {
-    providerId: "qwen",
-    label: "Qwen",
+    providerId: "pi",
+    label: "pi",
     transports: [
       {
-        providerId: "qwen",
-        providerLabel: "Qwen",
+        providerId: "pi",
+        providerLabel: "pi",
         transportKind: "cli",
-        transportId: "qwen-cli",
-        transportLabel: "Qwen CLI",
+        transportId: "pi-cli",
+        transportLabel: "pi CLI",
         runtime: "local",
-        defaultModel: "qwen3-coder-plus",
-        defaultCommand: AI_CONNECT_DEFAULT_CLI_COMMANDS["qwen:qwen-cli"]
-      },
-      {
-        providerId: "qwen",
-        providerLabel: "Qwen",
-        transportKind: "acp",
-        transportId: "qwen-acp",
-        transportLabel: "Qwen ACP",
-        runtime: "local",
-        defaultModel: "default",
-        defaultCommand: AI_CONNECT_DEFAULT_ACP_COMMANDS["qwen:qwen-acp"]
+        defaultModel: "gemini-3.1-pro-low",
+        defaultCommand: AI_CONNECT_DEFAULT_CLI_COMMANDS["pi:pi-cli"]
       }
     ]
   },
@@ -6815,15 +6752,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");
 }
@@ -6869,118 +6797,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 {
@@ -7029,70 +6845,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 {
@@ -7210,15 +6962,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);
   }
@@ -7799,10 +7545,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");
   }
@@ -7938,16 +7680,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: "",
@@ -8460,9 +8192,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 [
@@ -8709,18 +8438,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) {
@@ -8789,17 +8507,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();
@@ -8824,14 +8532,6 @@ import fs2 from "node:fs/promises";
 import os2 from "node:os";
 import path2 from "node:path";
 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"
@@ -8938,10 +8638,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":
@@ -9320,60 +9018,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;
@@ -9459,10 +9103,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);