@bivy/bivy 0.16.10-staging.1 → 0.16.10-staging.2

package/bin/bivy.mjs

@@ -1791,13 +1791,30 @@ async function cmdExec(args = []) {
   let token;
   try { token = await localDeviceToken(config); }
   catch (error) { console.error(c.red(error?.message || String(error))); process.exit(1); return; }
-  const code = await run(nodeBin, [...nodeScriptArgs(execEntry), "--url", url(config), "--token", token, ...args], {
+  // Translate the friendly bridge names to their governed runtime ids (the same
+  // mapping `bivy run <agent> --chat` uses), so `bivy exec --agent codex` opens
+  // the governed Codex app-server session instead of the plain exec fallback.
+  // Other aliases (claude, gemini-cli, …) resolve server-side via the registry.
+  const execArgs = translateExecAgent(args);
+  const code = await run(nodeBin, [...nodeScriptArgs(execEntry), "--url", url(config), "--token", token, ...execArgs], {
     cwd: repoRoot,
     env: startEnv(config),
   });
   process.exit(code);
 }
 
+// Rewrite a `bivy exec` arg list's --agent/-a value through governedChatAgentId,
+// leaving everything else (the free-text prompt, --session, flags) untouched.
+function translateExecAgent(args = []) {
+  const out = [...args];
+  for (let i = 0; i < out.length; i++) {
+    const a = out[i];
+    if ((a === "--agent" || a === "-a") && out[i + 1]) { out[i + 1] = governedChatAgentId(out[i + 1]); i++; }
+    else if (typeof a === "string" && a.startsWith("--agent=")) out[i] = `--agent=${governedChatAgentId(a.slice("--agent=".length))}`;
+  }
+  return out;
+}
+
 // `bivy completions <bash|zsh|fish>` — print a shell completion script to eval or
 // install. Covers the top-level commands and known integration ids.
 function cmdCompletions(args = []) {

package/dist/runtime/host.js

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 // Copyright (c) 2026 Petter André Sjulstad
-import { listRuntimes, makeRuntime } from "./index.js";
+import { canonicalAgentId, listRuntimes, makeRuntime } from "./index.js";
 import { RemoteRuntime, connectSocketTransport } from "./remote.js";
 import { withExactCapabilitySurface } from "./types.js";
 function remoteRuntimeSelection() {
@@ -50,12 +50,24 @@ export class RuntimeHost {
     }
     resolveRuntimeId(requested, fallback) {
         const wantId = (requested || fallback).toLowerCase();
-        const info = this.list().find((candidate) => candidate.id === wantId);
+        // Resolve declared aliases and historical ids through the one authoritative
+        // registry (e.g. `claude` → claude-code-sdk, `gemini-cli` → gemini,
+        // `open-code` → opencode) so the session/exec API accepts the same friendly
+        // names the picker and `bivy run` use — not only exact canonical ids. This
+        // honors the aliases integrations already declare as data, instead of making
+        // every caller know each canonical id (previously only the CLI's `--chat`
+        // path translated a couple by hand, so `bivy exec --agent claude` failed).
+        // Unknown names fall through to wantId and still raise "Unknown agent" below.
+        const canonical = canonicalAgentId(wantId) ?? wantId;
+        // Pass the resolved id as the "current" runtime so a hidden-but-runnable
+        // contribution is still resolvable to back a session (the profiles' "hidden
+        // from the picker, still runnable" contract; parity with makeRuntime).
+        const info = this.list(canonical).find((candidate) => candidate.id === canonical);
         if (!info)
             throw new Error(`Unknown agent: ${wantId}`);
         if (info.status !== "available")
             throw new Error(`${info.displayName} is not available on this node yet.`);
-        return wantId;
+        return canonical;
     }
     get(requested, fallback, sandbox) {
         // Remote path (opt-in, reversible): return a RemoteRuntime that drives the
@@ -63,7 +75,10 @@ export class RuntimeHost {
         // runtime the daemon can't run locally (e.g. the Claude SDK isn't installed
         // here) is still offloadable — remote availability is the service's business.
         const remote = remoteRuntimeSelection();
-        const wantId = (requested || fallback).toLowerCase();
+        const requestedId = (requested || fallback).toLowerCase();
+        // Canonicalize before the remote check too, so an alias (e.g. `claude`) is
+        // matched against BIVY_REMOTE_RUNTIME and drives the correct remote facade.
+        const wantId = canonicalAgentId(requestedId) ?? requestedId;
         if (remote && remote.enabled(wantId))
             return this.getRemote(wantId, remote.addr, sandbox);
         const id = this.resolveRuntimeId(requested, fallback);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bivy/bivy",
-  "version": "0.16.10-staging.1",
+  "version": "0.16.10-staging.2",
   "type": "module",
   "license": "AGPL-3.0-only",
   "description": "Run coding agents on machines you own. Open-source, self-hostable agent workspace.",