@algosuite/vo-mcp 0.2.0-beta.26 → 0.2.0-beta.28

package/dist/agent-auth-probe-cli.mjs

@@ -177,27 +177,48 @@ function getAnthropicKey({ EntryCtor = defaultEntryCtor() } = {}) {
 }
 var PREFER_LOGIN_ENV = "VO_RUNNER_PREFER_LOGIN";
 var CLAUDE_PREFER_LOGIN_ENV = "VO_RUNNER_CLAUDE_PREFER_LOGIN";
+var PREFER_KEY_ENV = "VO_RUNNER_PREFER_KEY";
+var CLAUDE_PREFER_KEY_ENV = "VO_RUNNER_CLAUDE_PREFER_KEY";
 function isTruthyFlag(v) {
   const s = String(v ?? "").trim().toLowerCase();
   return s === "1" || s === "true" || s === "yes" || s === "on";
 }
-function withAnthropicKey(baseEnv = {}, { getKey = getAnthropicKey } = {}) {
-  if (isTruthyFlag(baseEnv[CLAUDE_PREFER_LOGIN_ENV]) || isTruthyFlag(baseEnv[PREFER_LOGIN_ENV])) {
+function wantsLogin(env) {
+  return isTruthyFlag(env[CLAUDE_PREFER_LOGIN_ENV]) || isTruthyFlag(env[PREFER_LOGIN_ENV]);
+}
+function wantsKey(env) {
+  return isTruthyFlag(env[CLAUDE_PREFER_KEY_ENV]) || isTruthyFlag(env[PREFER_KEY_ENV]);
+}
+function withAnthropicKey(baseEnv = {}, { getKey = getAnthropicKey, probeLogin = probeClaudeLoginState } = {}) {
+  const preferKey = wantsKey(baseEnv);
+  if (!preferKey && wantsLogin(baseEnv)) {
     const next = { ...baseEnv };
     delete next.ANTHROPIC_API_KEY;
     return next;
   }
   if (baseEnv.ANTHROPIC_API_KEY) return { ...baseEnv };
   const key = getKey();
-  return key ? { ...baseEnv, ANTHROPIC_API_KEY: key } : { ...baseEnv };
+  if (!key) return { ...baseEnv };
+  if (!preferKey && probeLogin() === true) return { ...baseEnv };
+  return { ...baseEnv, ANTHROPIC_API_KEY: key };
+}
+function claudeCostBasis(env = process.env) {
+  return String(env.ANTHROPIC_API_KEY || "").trim() ? "vendor_billed" : "subscription_api_equivalent";
 }
-function describeAnthropicAuthSource(baseEnv = {}, { getKey = getAnthropicKey } = {}) {
-  if (isTruthyFlag(baseEnv[CLAUDE_PREFER_LOGIN_ENV]) || isTruthyFlag(baseEnv[PREFER_LOGIN_ENV])) {
+function describeAnthropicAuthSource(baseEnv = {}, { getKey = getAnthropicKey, probeLogin = probeClaudeLoginState } = {}) {
+  const preferKey = wantsKey(baseEnv);
+  if (!preferKey && wantsLogin(baseEnv)) {
     return "claude auth login (VO_RUNNER_PREFER_LOGIN set \u2014 any API key ignored)";
   }
   if (baseEnv.ANTHROPIC_API_KEY) return "ANTHROPIC_API_KEY from environment";
-  if (getKey()) return "ANTHROPIC_API_KEY from OS keychain";
-  return "claude auth login session (no API key set)";
+  if (!getKey()) return "claude auth login session (no API key set)";
+  if (preferKey) {
+    return "ANTHROPIC_API_KEY from OS keychain (VO_RUNNER_PREFER_KEY set \u2014 subscription ignored)";
+  }
+  if (probeLogin() === true) {
+    return "claude auth login session (subscription beats the stored keychain key)";
+  }
+  return "ANTHROPIC_API_KEY from OS keychain";
 }
 function probeClaudeLoginState({
   spawn: spawn2 = spawnSync2,
@@ -375,6 +396,36 @@ function parseClaudeStreamEvent(line) {
   return event.type === "result" ? buildResultEvent(event) : null;
 }
 
+// ../../scripts/virtual-office/code-runner/agent-auth-tier.mjs
+var AUTH_TIER_SUBSCRIPTION = "subscription";
+var AUTH_TIER_API_KEY = "api_key";
+var AUTH_TIER_LOCAL = "local";
+var AUTH_TIER_UNKNOWN = "unknown";
+var AUTH_TIERS = Object.freeze([
+  AUTH_TIER_SUBSCRIPTION,
+  AUTH_TIER_API_KEY,
+  AUTH_TIER_LOCAL,
+  AUTH_TIER_UNKNOWN
+]);
+var COST_BASIS_TO_TIER = Object.freeze({
+  subscription_api_equivalent: AUTH_TIER_SUBSCRIPTION,
+  vendor_billed: AUTH_TIER_API_KEY,
+  local_zero: AUTH_TIER_LOCAL
+});
+function authTierFromCostBasis(costBasis) {
+  return COST_BASIS_TO_TIER[String(costBasis ?? "")] ?? AUTH_TIER_UNKNOWN;
+}
+function safeAuthTier(compute) {
+  try {
+    return normalizeAuthTier(compute());
+  } catch {
+    return AUTH_TIER_UNKNOWN;
+  }
+}
+function normalizeAuthTier(value) {
+  return AUTH_TIERS.includes(value) ? value : AUTH_TIER_UNKNOWN;
+}
+
 // ../../scripts/virtual-office/code-runner/cli-version-floor.mjs
 var MIN_CLAUDE_CLI_VERSION = "2.1.218";
 var SECURITY_RATIONALE = "Claude Code 2.1.211/2.1.213 fixed a PreToolUse-hook bypass on unsandboxed Bash (our destructive-fs/git/cloud tripwires DO NOT FIRE on older CLIs) and worktree-subagents mutating the main checkout. 2.1.218 fixed Windows paths with a lowercase-\\u segment (e.g. ...\\utils\\, ...\\ui\\) being corrupted into CJK in tool inputs, making those files silently inaccessible \u2014 the fleet is Windows and 1,376 tracked files sit under utils/ alone. Update: npm install -g @anthropic-ai/claude-code (or the native installer).";
@@ -440,9 +491,22 @@ function isTimeout(probe) {
 function notFound(probe) {
   return errorCode(probe?.error) === "ENOENT";
 }
+function resolveClaudeAuthTier({
+  env = process.env,
+  loggedIn = null,
+  getStoredKey = getAnthropicKey
+} = {}) {
+  return safeAuthTier(() => {
+    const spawnEnv = withAnthropicKey(env, { getKey: getStoredKey, probeLogin: () => loggedIn });
+    const tier = authTierFromCostBasis(claudeCostBasis(spawnEnv));
+    if (tier === AUTH_TIER_SUBSCRIPTION && loggedIn !== true) return AUTH_TIER_UNKNOWN;
+    return tier;
+  });
+}
 async function checkClaudeAuth({
   spawnVersion = spawnClaudeSync,
   probeLogin = probeClaudeLoginState,
+  getStoredKey = getAnthropicKey,
   env = process.env
 } = {}) {
   try {
@@ -492,6 +556,10 @@ async function checkClaudeAuth({
     return {
       installed: true,
       authenticated: true,
+      // Dispatch-time billing signal, carried on the same probe that already
+      // paid for the login read. Never sent for a non-authenticated result:
+      // there is no tier without a working credential.
+      authTier: resolveClaudeAuthTier({ env, loggedIn, getStoredKey }),
       message: loggedIn === true ? "claude CLI installed and logged in (claude auth status)" : "claude binary found (login state unknown \u2014 auth check is best-effort)"
     };
   } catch (error) {
@@ -536,7 +604,7 @@ var ClaudeRunner = class {
     return withAnthropicKey(env);
   }
   costBasis(env = process.env) {
-    return String(env.ANTHROPIC_API_KEY || "").trim() ? "vendor_billed" : "subscription_api_equivalent";
+    return claudeCostBasis(env);
   }
   /** Describe which Anthropic auth source the spawn will use (for runner logs). */
   describeAuth(env = process.env) {
@@ -811,6 +879,19 @@ var CodexRunner = class {
   costBasis(env = process.env) {
     return String(env.OPENAI_API_KEY || env.CODEX_API_KEY || "").trim() ? "vendor_billed" : "subscription_api_equivalent";
   }
+  /**
+   * Dispatch-time billing tier for the NEXT codex spawn, from the SAME facts
+   * checkAuth() already gathered — no extra subprocess. applyAuthEnv() is a
+   * keychain read in this process (@napi-rs/keyring), not a spawn.
+   *
+   * Codex is the agent where this signal was already computed and then thrown
+   * away: checkAuth() distinguished "API key available (no persisted ChatGPT
+   * login)" from a real login, but only inside a `message` string that the
+   * heartbeat schema strips before storage. This gives that fact a typed home.
+   */
+  authTier(env = this.env) {
+    return safeAuthTier(() => authTierFromCostBasis(this.costBasis(this.applyAuthEnv(env))));
+  }
   /** Best-effort binary + persisted-login probe. Never throws or spends tokens. */
   async checkAuth() {
     try {
@@ -844,6 +925,7 @@ ${login.stderr || ""}`.trim();
             installed: true,
             authenticated: true,
             ...versionField,
+            authTier: this.authTier(),
             message: "codex API key available (no persisted ChatGPT login)"
           };
         }
@@ -858,6 +940,7 @@ ${login.stderr || ""}`.trim();
         installed: true,
         authenticated: true,
         ...versionField,
+        authTier: this.authTier(),
         message: output || "codex login status succeeded"
       };
     } catch (err) {
@@ -960,6 +1043,16 @@ var CursorRunner = class {
   costBasis(env = process.env) {
     return env.CURSOR_API_KEY ? "vendor_billed" : "unknown";
   }
+  /**
+   * Dispatch-time billing tier. Inherits costBasis()'s deliberate refusal to
+   * guess: a prior interactive `cursor-agent login` has undocumented
+   * subscription semantics, so it reports 'unknown' rather than claiming a
+   * flat-cost seat the runner cannot actually prove. Keychain read only — the
+   * heartbeat never pays for a subprocess to answer this.
+   */
+  authTier(env = process.env) {
+    return safeAuthTier(() => authTierFromCostBasis(this.costBasis(this.applyAuthEnv(env))));
+  }
   /** Best-effort: is `cursor-agent` on PATH? Never throws. */
   async checkAuth() {
     try {
@@ -985,6 +1078,7 @@ var CursorRunner = class {
       return {
         installed: true,
         authenticated: true,
+        authTier: this.authTier(),
         message: "cursor-agent found (EXPERIMENTAL: headless mode may need a TTY; auth check is best-effort)"
       };
     } catch (err) {
@@ -1121,6 +1215,10 @@ var LocalModelRunner = class {
   costBasis() {
     return "local_zero";
   }
+  /** Dispatch-time billing tier: local inference is never billed by a vendor. */
+  authTier() {
+    return safeAuthTier(() => authTierFromCostBasis(this.costBasis()));
+  }
   describeAuth(env = process.env) {
     const authEnv = this.applyAuthEnv(env);
     const provider = resolveLocalProvider(this.env);
@@ -1178,6 +1276,7 @@ var LocalModelRunner = class {
     return {
       installed: true,
       authenticated: true,
+      authTier: this.authTier(),
       message: `${provider} reachable; model "${model}" configured (local-only, no cloud spend)`
     };
   }
@@ -1250,7 +1349,7 @@ var OpenAICompatibleRunner = class {
   buildArgs(opts = {}) {
     void opts;
     throw new Error(
-      "OpenAI-compatible full-repository coding is disabled. Use an explicit sanitized task capsule through the AlgoSuite Model Firewall."
+      "OpenAI-compatible full-repository coding is disabled. The `oai` runner lane is RETIRED (PR #8742) and executes nothing. Set VO_CODE_RUNNER_AGENT to claude, codex, cursor, local, or meta. Use an explicit sanitized task capsule through the AlgoSuite Model Firewall."
     );
   }
   /** Codex JSONL events map identically → reuse the proven parser. */
@@ -1273,14 +1372,14 @@ var OpenAICompatibleRunner = class {
   describeAuth(env = process.env) {
     const hasKey = Boolean(String(env[OAI_API_KEY_ENV] || "").trim());
     const baseUrl = resolveOaiBaseUrl(env);
-    return `oai-compat endpoint=${baseUrl || "<unset>"} key=${hasKey ? "set" : "MISSING"}`;
+    return `oai-compat RETIRED endpoint=${baseUrl || "<unset>"} key=${hasKey ? "set" : "MISSING"}`;
   }
-  /** Best-effort: base URL chosen AND the codex transport is installed. */
+  /** Always unavailable: the lane is retired, so nothing can authenticate it. */
   async checkAuth() {
     return {
       installed: false,
       authenticated: false,
-      message: "OpenAI-compatible coding is disabled; sanitized Model Firewall task capsules only"
+      message: "the `oai` lane is RETIRED (PR #8742); OpenAI-compatible coding is disabled \u2014 sanitized Model Firewall task capsules only"
     };
   }
 };