llm-switcher 1.2.12 → 1.3.1

package/state.mjs

@@ -35,8 +35,8 @@ if (DATA_DIR !== ROOT_DIR) {
 const LEGACY_TARGET_TOOL = { anthropic: 'claude', responses: 'codex' };
 // Migration input only: the pointer keys an unmigrated config may still carry.
 const LEGACY_TARGETS = ['anthropic', 'responses', 'openai-chat', 'vertex'];
-export const TOOLS = ['claude', 'codex'];
-export const COMMAND_WORDS = new Set(['claude', 'codex', 'on', 'off', 'status', 'doctor', 'ui']);
+export const TOOLS = ['claude', 'codex', 'agy'];
+export const COMMAND_WORDS = new Set(['claude', 'codex', 'agy', 'on', 'off', 'status', 'doctor', 'ui']);
 export const DEFAULT_PORT = 3456;
 export const DEFAULT_BLINDFOLD_PORT = 3457;
 // Codex with ChatGPT sign-in calls https://chatgpt.com/backend-api/codex.
@@ -53,6 +53,9 @@ export const CLAUDE_MODEL_SLOTS = ['opus', 'sonnet', 'haiku', 'fable'];
 // - subagent <-> `agents.default_subagent_model` (spawned agents)
 // No fast/fallback in the docs — those are custom keys, read only for backward compatibility.
 export const CODEX_MODEL_SLOTS = ['main', 'review', 'subagent'];
+// The Antigravity CLI (agy) picks its own model per call. One slot names the upstream model of its
+// agent calls; a '*' in the value stands for the model id that agy sent (antigravity/* = Bifrost).
+export const AGY_MODEL_SLOTS = ['main'];
 export const CHAT_MODEL_SLOTS = ['default'];
 export const VERTEX_MODEL_SLOTS = ['default'];
 
@@ -134,10 +137,13 @@ export const paths = {
   envClaudeSh: path.join(STATE_DIR, 'env-claude.sh'),
   envCodexCmd: path.join(STATE_DIR, 'env-codex.cmd'),
   envCodexSh: path.join(STATE_DIR, 'env-codex.sh'),
+  envAgyCmd: path.join(STATE_DIR, 'env-agy.cmd'),
+  envAgySh: path.join(STATE_DIR, 'env-agy.sh'),
   // One line per tool, written with that tool's env file: what the launcher shows the person at
   // launch. Empty exactly when the tool is not routed, so the launcher needs no second condition.
   routeClaude: path.join(STATE_DIR, 'route-claude.txt'),
   routeCodex: path.join(STATE_DIR, 'route-codex.txt'),
+  routeAgy: path.join(STATE_DIR, 'route-agy.txt'),
   // The gateway port of the last switch on. The shim scrubs a stale loopback base URL
   // against it, so a shell opened before a port change still reaches the right gateway.
   gatewayPort: path.join(STATE_DIR, 'gateway.port'),
@@ -447,7 +453,7 @@ function createCodexHalf(p) {
 
 export function validateProfileInput(p) {
   if (!p || typeof p !== 'object' || Array.isArray(p)) return 'Profile must be an object';
-  if (p.inFormat !== undefined) return 'inFormat is not supported; use "tool": "claude" or "tool": "codex"';
+  if (p.inFormat !== undefined) return 'inFormat is not supported; use "tool": "claude", "codex" or "agy"';
   if (p.blindfold !== undefined) return 'blindfold per-profile setting is deprecated';
   if (p.blindfoldPort !== undefined) return 'blindfoldPort per-profile setting is deprecated';
   if (p.blindfoldHost !== undefined) return 'blindfoldHost per-profile setting is deprecated';
@@ -637,9 +643,15 @@ export function migrateConfigInMemory(rawConfig) {
   }
 
   // Step 3: Pointer migration (R7b, Item 2)
+  // A present pointer follows its profile through a Step 1 rename: a profile keyed "agy" became
+  // "agy-profile" when agy turned into a command word, and a pointer left on "agy" would dangle.
+  const presentPointer = (tool) => {
+    const v = rawConfig.activeProfiles[tool];
+    return v ? (renameMap.get(v) || v) : v;
+  };
   const newActiveProfiles = {};
   if (rawConfig.activeProfiles && Object.hasOwn(rawConfig.activeProfiles, 'claude')) {
-    newActiveProfiles.claude = rawConfig.activeProfiles.claude;
+    newActiveProfiles.claude = presentPointer('claude');
   } else {
     let oldClaudeTarget = null;
     if (rawConfig.activeProfiles && Object.hasOwn(rawConfig.activeProfiles, 'anthropic')) {
@@ -664,7 +676,7 @@ export function migrateConfigInMemory(rawConfig) {
   }
 
   if (rawConfig.activeProfiles && Object.hasOwn(rawConfig.activeProfiles, 'codex')) {
-    newActiveProfiles.codex = rawConfig.activeProfiles.codex;
+    newActiveProfiles.codex = presentPointer('codex');
   } else {
     let oldCodexTarget = null;
     if (rawConfig.activeProfiles && Object.hasOwn(rawConfig.activeProfiles, 'responses')) {
@@ -688,6 +700,11 @@ export function migrateConfigInMemory(rawConfig) {
     }
   }
 
+  // agy has no legacy key and no single-pointer fallback: only its own pointer, and only to a
+  // profile made for agy.
+  const agyKey = rawConfig.activeProfiles && Object.hasOwn(rawConfig.activeProfiles, 'agy') ? presentPointer('agy') : null;
+  newActiveProfiles.agy = agyKey && cfg.profiles[agyKey]?.tool === 'agy' ? agyKey : null;
+
   cfg.activeProfiles = newActiveProfiles;
   delete cfg.activeProfile;
 
@@ -993,6 +1010,8 @@ export function findProfileKey(cfg, name) {
 }
 
 export function profileAcceptsTarget(profile, target) {
+  // agy has no legacy spelling and no inFormat: only a profile made for it serves it.
+  if (target === 'agy') return profile?.tool === 'agy';
   if (profile?.tool) {
     if (target === 'claude' || target === 'anthropic') return profile.tool === 'claude';
     if (target === 'codex' || target === 'responses') return profile.tool === 'codex';
@@ -1008,6 +1027,7 @@ export function profileAcceptsTarget(profile, target) {
 export function modelSlotsForProfile(profile) {
   if (profile?.tool === 'claude') return CLAUDE_MODEL_SLOTS;
   if (profile?.tool === 'codex') return CODEX_MODEL_SLOTS;
+  if (profile?.tool === 'agy') return AGY_MODEL_SLOTS;
   return MODEL_SLOTS_BY_FORMAT[profile?.inFormat] || MODEL_SLOTS_BY_FORMAT.auto;
 }
 
@@ -1185,7 +1205,8 @@ export function getActiveMap(cfg) {
       : Object.hasOwn(ap, legacy) ? ap[legacy]
         : cfg?.activeProfile ?? null
   );
-  return { claude: pointer('claude', 'anthropic'), codex: pointer('codex', 'responses') };
+  // agy is newer than the single legacy pointer, so only its own key can turn it on.
+  return { claude: pointer('claude', 'anthropic'), codex: pointer('codex', 'responses'), agy: ap.agy ?? null };
 }
 
 /**
@@ -1325,7 +1346,11 @@ export function computeLaunchState(cfg, port) {
   const pick = (t) => (hasProfile(cfg, map[t]) ? cfg.profiles[map[t]] : null);
   const claude = pick('claude');
   const codex = pick('codex');
-  const active = Boolean(claude || codex);
+  const agy = pick('agy');
+  // The interceptor serves Claude Code and Codex only. agy takes its endpoint from CLOUD_CODE_URL, so
+  // an agy-only switch on writes the launch files and starts no interceptor.
+  const intercepted = Boolean(claude || codex);
+  const active = Boolean(intercepted || agy);
 
   // One interceptor serves both tools (R3) and its port lives at the top level of config.json
   // (R3b). The per-profile port went with the per-profile host and prefix.
@@ -1354,7 +1379,7 @@ export function computeLaunchState(cfg, port) {
     // and the tool set. The tool set travels sorted as one string (Finding 6), which is also what
     // lets a running interceptor be updated in place instead of restarted.
     // null when no tool is active, which is how reconcileBlindfold knows to stop it.
-    blindfold: active
+    blindfold: intercepted
       ? {
         port: bfPort,
         activeTools: deriveActiveTools(cfg).join(','),
@@ -1367,15 +1392,20 @@ export function computeLaunchState(cfg, port) {
     // of the other tool, and a restart cannot leave a stale override behind.
     envClaude: [],
     envCodex: [],
+    envAgy: [],
     // The launcher notice, one line per tool. Empty for a tool that is not routed (A1).
     routeClaude: claude ? routeLine('claude', map.claude, claude) : '',
-    routeCodex: codex ? routeLine('codex', map.codex, codex) : ''
+    routeCodex: codex ? routeLine('codex', map.codex, codex) : '',
+    routeAgy: agy ? routeLine('agy', map.agy, agy) : ''
   };
 
   // NODE_EXTRA_CA_CERTS is deliberately absent from env-claude: the shim decides it at launch,
   // because only then does it know whether the user brought a CA of their own (R2).
   if (claude) state.envClaude = proxyPairs();
   if (codex) state.envCodex = [...proxyPairs(), ['CODEX_CA_CERTIFICATE', paths.blindfoldCA]];
+  // agy reaches the gateway directly over plain http: no proxy and no CA (Go on Windows reads only
+  // the system store). Remote control keeps its own host, so it never crosses the switcher.
+  if (agy) state.envAgy = [['CLOUD_CODE_URL', `http://127.0.0.1:${port}`]];
   return state;
 }
 
@@ -1470,13 +1500,17 @@ function writeToolFiles(pairs, shPath, cmdPath) {
 // tools from activeProfiles, and a colliding config is one this build will not migrate. This empties
 // only the file pair of the tool that was switched off, under the same lock, so the other tool's
 // launcher files are never opened (A13: emptied, never deleted).
+const TOOL_FILES = {
+  claude: () => [paths.envClaudeCmd, paths.envClaudeSh, paths.routeClaude],
+  codex: () => [paths.envCodexCmd, paths.envCodexSh, paths.routeCodex],
+  agy: () => [paths.envAgyCmd, paths.envAgySh, paths.routeAgy]
+};
+
 export function emptyToolEnvFiles(tool) {
   const codex = tool === 'codex';
   const codexRouteChanged = withLaunchLock(() => {
     const before = codex ? readOrEmpty(paths.envCodexSh) : '';
-    writeAtomic(codex ? paths.envCodexCmd : paths.envClaudeCmd, '');
-    writeAtomic(codex ? paths.envCodexSh : paths.envClaudeSh, '');
-    writeAtomic(codex ? paths.routeCodex : paths.routeClaude, '');
+    for (const f of (TOOL_FILES[tool] || TOOL_FILES.claude)()) writeAtomic(f, '');
     return before !== '';
   });
   return { codexRouteChanged, codexDaemon: codexRouteChanged ? restartCodexDaemon([]) : undefined };
@@ -1544,9 +1578,12 @@ function writeLaunchState(cfg, port) {
   try {
     writeToolFiles(st.envClaude, paths.envClaudeSh, paths.envClaudeCmd);
     writeToolFiles(st.envCodex, paths.envCodexSh, paths.envCodexCmd);
+    writeToolFiles(st.envAgy, paths.envAgySh, paths.envAgyCmd);
     writeAtomic(paths.routeClaude, st.routeClaude ? `${st.routeClaude}
 ` : '');
     writeAtomic(paths.routeCodex, st.routeCodex ? `${st.routeCodex}
+` : '');
+    writeAtomic(paths.routeAgy, st.routeAgy ? `${st.routeAgy}
 ` : '');
     st.codexRouteChanged = readOrEmpty(paths.envCodexSh) !== codexBefore;
     // Recorded on switch on so a shell opened while the gateway ran can still recognize its own
@@ -1573,7 +1610,7 @@ export function clearLaunchState(port) {
     writeAtomic(paths.envCmd, STUB_CMD);
     writeAtomic(paths.envSh, STUB_SH);
     for (const f of [paths.envClaudeCmd, paths.envClaudeSh, paths.envCodexCmd, paths.envCodexSh,
-      paths.routeClaude, paths.routeCodex]) {
+      paths.envAgyCmd, paths.envAgySh, paths.routeClaude, paths.routeCodex, paths.routeAgy]) {
       writeAtomic(f, '');
     }
     return codexBefore !== '';

package/switch.mjs

@@ -44,7 +44,7 @@ if (!config) {
 }
 
 // R5: two commands, one per tool. The openai and vertex commands went with their input routes.
-const TARGET_ALIASES = { claude: 'claude', codex: 'codex' };
+const TARGET_ALIASES = { claude: 'claude', codex: 'codex', agy: 'agy' };
 
 // Strip --port/-p and their value from positional args. -p is the global option everywhere, as in
 // resolvePort; `switch port <n>` is the command that changes the port.
@@ -337,7 +337,7 @@ async function changePort(newPortStr) {
 }
 
 function printProfile(profile) {
-  console.log(`Input Target: ${show(profile.inFormat || 'auto').toUpperCase()}`);
+  console.log(`Input Target: ${show(profile.tool || profile.inFormat || 'auto').toUpperCase()}`);
   console.log(`Routing:      ${profile.outFormat ? `out=${show(profile.outFormat)}` : `mode=${show(profile.mode || 'hybrid')}`}`);
   console.log(`Upstream:     ${show(profile.baseURL || '(not set)')}`);
   for (const slot of modelSlotsForProfile(profile)) {
@@ -347,7 +347,7 @@ function printProfile(profile) {
 }
 
 function printTargets(activeMap) {
-  const labels = { claude: 'Claude Code', codex: 'Codex' };
+  const labels = { claude: 'Claude Code', codex: 'Codex', agy: 'Antigravity' };
   for (const t of TOOLS) {
     console.log(`  ${labels[t].padEnd(12)} (${t.padEnd(11)}) -> ${activeMap[t] ? show(activeMap[t]) : 'OFF (official)'}`);
   }
@@ -529,7 +529,7 @@ async function turnOff(targetArg) {
   if (targetArg) {
     const target = TARGET_ALIASES[targetArg.toLowerCase()];
     if (!target) {
-      console.error(`[Error] Unknown target "${targetArg}". Use one of: claude, codex`);
+      console.error(`[Error] Unknown target "${targetArg}". Use one of: claude, codex, agy`);
       process.exit(1);
     }
     if (refused) {
@@ -564,7 +564,7 @@ async function turnOff(targetArg) {
   console.log('Deactivating Proxy and restoring official endpoints...');
   if (refused) {
     // Both pointers through the same writer. Nothing below runs until those bytes are on disk (R7b).
-    casOff(['claude', 'codex']);
+    casOff(TOOLS);
     reportSettings(clearLaunchState(port));
     const result = await stopProxy(port);
     reportStopped(result, port);
@@ -591,7 +591,7 @@ async function turnOff(targetArg) {
 // Only a CLI whose target is active is expected to go through the gateway.
 function auditActiveClis() {
   const map = getActiveMap(config);
-  return auditRunningProcesses([map.claude && 'claude', map.codex && 'codex'].filter(Boolean));
+  return auditRunningProcesses(TOOLS.filter(t => map[t]));
 }
 
 // settings.json edits are never silent: name every value the switcher removed.
@@ -799,13 +799,15 @@ async function managePlugin(action = 'status') {
 
   if (act === 'install' || act === 'on') {
     const { CURRENT_VERSION } = await import('./version.mjs');
-    const { installed, failed, paths } = installPlugin({}, CURRENT_VERSION);
+    const { installed, skipped, failed, paths } = installPlugin({}, CURRENT_VERSION);
     for (const tool of installed) console.log(`[OK] ${tool}: ${paths[tool]}`);
+    for (const k of skipped) console.log(`[Skip] ${k.tool}: ${k.reason}`);
     for (const f of failed) console.error(`[Error] ${f.tool}: ${f.reason}`);
     if (installed.length) {
       console.log('\nNeither settings.json nor config.toml was opened. Each tool reads a file of its own.');
       console.log(`Claude Code loads it on the next session as ${PLUGIN_NAME}@skills-dir.`);
       console.log('Codex asks you once to trust a new hook. Accept it, or the hook stays off.');
+      if (installed.includes('agy')) console.log(`agy: ${pluginStatus().agy.note}.`);
       console.log('\nTo remove it:  switch plugin uninstall');
     }
     if (failed.length) process.exit(1);
@@ -826,7 +828,10 @@ async function managePlugin(action = 'status') {
   console.log(`             ${st.claude.path}`);
   console.log(`Codex      : ${st.codex.installed ? 'INSTALLED' : 'not installed'}`);
   console.log(`             ${st.codex.path}`);
-  if (!st.claude.installed || !st.codex.installed) {
+  console.log(`Antigravity: ${st.agy.installed ? 'INSTALLED' : 'not installed'}`);
+  console.log(`             ${st.agy.path}${st.agy.error ? ` (${st.agy.error})` : ''}`);
+  console.log(`             ${st.agy.note}`);
+  if (!st.claude.installed || !st.codex.installed || !st.agy.installed) {
     console.log(`\nThe notice is optional. Without it the gateway still routes every request,`);
     console.log(`and the shim still raises its own notice at launch.`);
     console.log(`To add it:  switch plugin install`);
@@ -1268,13 +1273,14 @@ if (cmd === 'off' || cmd === 'stop') {
   console.log('  switch <profile>               # Activate profile for all compatible targets');
   console.log('  switch claude <profile>        # Set active profile for Claude Code');
   console.log('  switch codex <profile>         # Set active profile for Codex');
+  console.log('  switch agy <profile>           # Set active profile for the Antigravity CLI (agy)');
   console.log('  switch port <number>           # Change gateway port');
   console.log('  switch service install         # Install OS background autostart service (auto-updates on logon)');
   console.log('  switch service uninstall       # Uninstall background autostart service');
   console.log('  switch shim install            # Auto-inject env into resumed sessions (claude --resume)');
   console.log('  switch shim status             # Check shims + detect sessions bypassing the gateway');
   console.log('  switch shim uninstall          # Remove launcher shims');
-  console.log('  switch plugin install          # Optional launch notice inside Claude Code & Codex');
+  console.log('  switch plugin install          # Optional launch notice inside Claude Code, Codex & agy');
   console.log('  switch plugin status           # Is that notice installed');
   console.log('  switch plugin uninstall        # Remove that notice');
   console.log('  switch off [target]            # Restore official endpoints (all, or one target)');