@stage-labs/metro 0.1.0-beta.322 → 0.1.0-beta.323

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stage-labs/metro",
-  "version": "0.1.0-beta.322",
+  "version": "0.1.0-beta.323",
   "description": "The metro command line: run your agent on this machine, relaying its chat channels and connectors to Claude Code.",
   "license": "MIT",
   "repository": {

package/runtime/node_modules/@metro-labs/daemon/src/claude/session.ts

@@ -11,11 +11,12 @@ import { isRecord } from '@metro-labs/core/is-record';
 import { readJson, writeJson } from '@metro-labs/core/secure-fs';
 import { METRO_VERSION } from '@metro-labs/core/version';
 import { agentsDir, listAgentFiles } from '../agents/files.js';
-import { notReady, primaryRoute, type ModelSetup } from '@metro-labs/inference/model-config';
+import { primaryRoute, type ModelSetup } from '@metro-labs/inference/model-config';
 import { effectiveSetup } from '../gateway/effective.js';
 import { inSessionScope } from './memory.js';
 import { runningAsRoot } from '../metro-user/privilege.js';
 import { agentUser, agentUserExpected, agentViewDir, asAgent, claudeHome } from '../agent-user/user.js';
+import { routeReadiness } from '../gateway/box-gateway.js';
 
 function sessionEnv(): Record<string, string> {
   const user = agentUser();
@@ -133,7 +134,7 @@ const NO_MODEL = "the organization routes this agent to no model yet: choose one
 function credentialReady(deps: SessionDeps): string | null {
   try {
     const primary = primaryRoute((deps.model ?? (() => effectiveSetup()))());
-    return primary === null ? NO_MODEL : notReady(primary);
+    return primary === null ? NO_MODEL : routeReadiness(primary);
   } catch (err) {
     return `the model setup is not readable (${errMsg(err)})`;
   }

package/runtime/node_modules/@metro-labs/daemon/src/gateway/box-gateway.ts

@@ -1,6 +1,7 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { log } from '@metro-labs/core/log';
 import { handleGatewayRequest, type GatewayDeps } from '@metro-labs/inference/gateway';
+import { notReady, setupNotReady, type Route } from '@metro-labs/inference/model-config';
 import { agentsDir } from '../agents/files.js';
 import { agentIdForKey } from '../agents/keys.js';
 import { reregisterMcpToken } from '../mcp-server/link.js';
@@ -13,6 +14,8 @@ type Handler = (req: IncomingMessage, res: ServerResponse) => boolean;
 
 const identify = (key: string): boolean => agentIdForKey(key) !== undefined;
 
+export const routeReadiness = (route: Route): string | null => (gatewayUrl() === null ? notReady(route) : setupNotReady(route));
+
 export const boxGateway = (): GatewayDeps => ({
   setup: () => effectiveSetup(),
   identify,

package/runtime/node_modules/@metro-labs/daemon/src/gateway/model-api.ts

@@ -4,7 +4,8 @@ import { ApiError } from '@metro-labs/http/api-error';
 import { apiFailure, apiSession, cors, sendJson } from '@metro-labs/http/api-http';
 import { effectiveSetup } from './effective.js';
 import { chainStatus } from '@metro-labs/inference/fallback';
-import { helperSetup, notReady, primaryRoute, type Connection, type ModelSetup } from '@metro-labs/inference/model-config';
+import { helperSetup, primaryRoute, type Connection, type ModelSetup } from '@metro-labs/inference/model-config';
+import { routeReadiness } from './box-gateway.js';
 import { orgModels, type SyncStatus } from './org-models.js';
 import { lastServed } from '@metro-labs/inference/served';
 import { refreshUsage, type UsageDeps } from '@metro-labs/inference/usage-refresh';
@@ -29,8 +30,8 @@ function publicConnection(c: Connection): Record<string, unknown> {
     provider: c.provider,
     label: c.label,
     model: c.model,
-    hasKey: c.apiKey !== '',
-    subscription: c.claudeToken !== '',
+    hasKey: c.apiKey !== '' || c.auth === 'key',
+    subscription: c.claudeToken !== '' || c.auth === 'subscription',
     region: c.region,
     zdr: c.zdr,
     signedOut: c.signedOut,
@@ -52,7 +53,7 @@ function helpersBody(setup: ModelSetup): Record<string, unknown> | null {
 export function settingsBody(deps: ModelApiDeps): Record<string, unknown> {
   const setup = setupOf(deps);
   const primary = primaryRoute(setup);
-  const reason = primary === null ? NO_MODEL : notReady(primary);
+  const reason = primary === null ? NO_MODEL : routeReadiness(primary);
   return {
     source: setup.source,
     sync: (deps.syncStatus ?? (() => orgModels()?.syncStatus() ?? NO_SYNC))(),

package/runtime/node_modules/@metro-labs/inference/src/delivered.ts

@@ -1,6 +1,6 @@
 import { readEffort, type RouteEffort } from '@metro-labs/core/effort';
 import { isRecord } from '@metro-labs/core/is-record';
-import { emptySetup, isProvider, type ModelSetup, type Account, type Chain, type CodexAccess, type Connection, type Fallback, type Provider, type RouteSource } from './model-config.js';
+import { emptySetup, isProvider, type AuthKind, type ModelSetup, type Account, type Chain, type CodexAccess, type Connection, type Fallback, type Provider, type RouteSource } from './model-config.js';
 
 export interface DeliveredRoute {
   primary: Fallback | null;
@@ -69,6 +69,10 @@ function credentialOf(provider: Provider, raw: unknown): Credential {
   return { apiKey: text(raw.apiKey), claudeToken: provider === 'anthropic' ? text(raw.claudeToken) : '', codex: null };
 }
 
+const AUTH_KINDS: readonly AuthKind[] = ['key', 'subscription', 'codex'];
+
+const authOf = (raw: unknown): AuthKind | null => AUTH_KINDS.find((kind) => kind === raw) ?? null;
+
 export function deliveredConnection(raw: unknown): Connection | null {
   if (!isRecord(raw) || !isProvider(raw.provider)) return null;
   const id = text(raw.id);
@@ -86,7 +90,8 @@ export function deliveredConnection(raw: unknown): Connection | null {
     codex,
     claudeToken,
     account: accountOf(raw.account),
-    signedOut: codex === null && apiKey === '' && claudeToken === '',
+    signedOut: typeof raw.signedOut === 'boolean' ? raw.signedOut : codex === null && apiKey === '' && claudeToken === '',
+    auth: authOf(raw.auth),
   };
 }
 

package/runtime/node_modules/@metro-labs/inference/src/model-config.ts

@@ -31,8 +31,11 @@ export interface Connection {
   claudeToken: string;
   account: Account;
   signedOut: boolean;
+  auth?: AuthKind | null;
 }
 
+export type AuthKind = 'key' | 'subscription' | 'codex';
+
 export interface Fallback {
   connection: string;
   model: string;
@@ -77,28 +80,36 @@ export function primaryRoute(setup: ModelSetup): Route | null {
   return null;
 }
 
-const CHECKS: Record<Provider, [(r: Route) => boolean, string][]> = {
-  anthropic: [[(r) => r.connection.apiKey === '' && r.connection.claudeToken === '', "Anthropic has no API key or Claude subscription: add one on the organization's Gateway page."]],
+type Check = [(r: Route) => boolean, string, 'credential' | 'setup'];
+
+const CHECKS: Record<Provider, Check[]> = {
+  anthropic: [[(r) => r.connection.apiKey === '' && r.connection.claudeToken === '', "Anthropic has no API key or Claude subscription: add one on the organization's Gateway page.", 'credential']],
   bedrock: [
-    [(r) => r.connection.apiKey === '', "Bedrock has no API key: add it on the organization's Gateway page."],
-    [(r) => r.connection.region === '', "Bedrock needs a region: add it on the organization's Gateway page."],
+    [(r) => r.connection.apiKey === '', "Bedrock has no API key: add it on the organization's Gateway page.", 'credential'],
+    [(r) => r.connection.region === '', "Bedrock needs a region: add it on the organization's Gateway page.", 'setup'],
   ],
   openrouter: [
-    [(r) => r.connection.apiKey === '', "OpenRouter has no API key: add it on the organization's Gateway page."],
-    [(r) => r.model === '', "OpenRouter needs a model id: choose one on the organization's Gateway page."],
+    [(r) => r.connection.apiKey === '', "OpenRouter has no API key: add it on the organization's Gateway page.", 'credential'],
+    [(r) => r.model === '', "OpenRouter needs a model id: choose one on the organization's Gateway page.", 'setup'],
   ],
   codex: [
-    [(r) => r.connection.codex === null, CODEX_SIGN_IN],
-    [(r) => r.model === '', "Codex needs a model id: choose one on the organization's Gateway page."],
+    [(r) => r.connection.codex === null, CODEX_SIGN_IN, 'credential'],
+    [(r) => r.model === '', "Codex needs a model id: choose one on the organization's Gateway page.", 'setup'],
   ],
   routeway: [
-    [(r) => r.connection.apiKey === '', "Routeway has no API key: add it on the organization's Gateway page."],
-    [(r) => r.model === '', "Routeway needs a model id: choose one on the organization's Gateway page."],
+    [(r) => r.connection.apiKey === '', "Routeway has no API key: add it on the organization's Gateway page.", 'credential'],
+    [(r) => r.model === '', "Routeway needs a model id: choose one on the organization's Gateway page.", 'setup'],
   ],
 };
 
 export const notReady = (route: Route): string | null => CHECKS[route.connection.provider].find(([missing]) => missing(route))?.[1] ?? null;
 
+export function setupNotReady(route: Route): string | null {
+  const checks = CHECKS[route.connection.provider];
+  if (route.connection.signedOut) return checks.find(([, , kind]) => kind === 'credential')?.[1] ?? null;
+  return checks.find(([missing, , kind]) => kind === 'setup' && missing(route))?.[1] ?? null;
+}
+
 export const isSmallModel = (requested: string): boolean => SMALL_RE.test(requested);
 
 const DEFAULTS: Record<Provider, (requested: string, model: string) => string> = {

package/runtime/runtime.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.0-beta.322"
+  "version": "0.1.0-beta.323"
 }

package/runtime/sdk-runner/runner.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.0-beta.322",
+  "version": "0.1.0-beta.323",
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "0.3.287",
     "@modelcontextprotocol/sdk": "^1.29.0",