@stage-labs/metro 0.1.0-beta.148 → 0.1.0-beta.149

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stage-labs/metro",
-  "version": "0.1.0-beta.148",
+  "version": "0.1.0-beta.149",
   "description": "The metro command line. Sign in once per machine, then hand your MCP connector list to Claude Code without the credentials touching disk, argv or shell history.",
   "license": "MIT",
   "repository": {

package/runtime/marketplace/plugin/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.1.0-beta.148",
+  "version": "0.1.0-beta.149",
   "description": "Metro for Claude Code, installed by the metro daemon on this machine: every connector the agent holds as its own MCP server relayed through the daemon, the orchestrator-only guard on the main thread, and the standing rules loaded at each session start. No vendor credential ever sits in a config file.",
   "author": {
     "name": "Bonustrack",

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

@@ -1,4 +1,5 @@
 import { isRecord } from '@metro-labs/core/is-record';
+import { log } from '@metro-labs/core/log';
 import { GeminiAuthError, type GeminiTokens } from './gemini-auth.js';
 
 export const CODE_ASSIST_BASE = 'https://cloudcode-pa.googleapis.com';
@@ -73,16 +74,35 @@ function refuseIneligible(load: Record<string, unknown>): void {
   throw new GeminiAuthError(said.join('; '));
 }
 
+const MANAGED =
+  'Google treats this account as a managed (Workspace) one: it has a Code Assist tier but no project of its own, and the individual tier is for personal Google accounts (gmail.com). Sign in with the personal account that holds your Google AI plan';
+
+function tierToOnboard(load: Record<string, unknown>): { id: string; name: string | null } {
+  const allowed = Array.isArray(load.allowedTiers) ? load.allowedTiers.filter(isRecord) : [];
+  const chosen = allowed.find((t) => t.isDefault === true);
+  return { id: text(chosen?.id) ?? FREE_TIER, name: text(chosen?.name) };
+}
+
+const summary = (load: Record<string, unknown>): Record<string, unknown> => ({
+  current: isRecord(load.currentTier) ? text(load.currentTier.id) : null,
+  paid: isRecord(load.paidTier) ? text(load.paidTier.id) : null,
+  allowed: Array.isArray(load.allowedTiers) ? load.allowedTiers.filter(isRecord).map((t) => `${text(t.id) ?? '?'}${t.isDefault === true ? '*' : ''}`) : [],
+  ineligible: Array.isArray(load.ineligibleTiers) ? load.ineligibleTiers.filter(isRecord).map((t) => `${text(t.tierId) ?? '?'}:${text(t.reasonCode) ?? '?'}`) : [],
+  project: text(load.cloudaicompanionProject),
+});
+
 export async function onboard(tokens: GeminiTokens, base = CODE_ASSIST_BASE, fetchImpl: typeof fetch = fetch): Promise<Onboarded> {
   const load = await call(base, 'loadCodeAssist', tokens.accessToken, { metadata: METADATA }, fetchImpl);
+  log.info(summary(load), 'gemini: Code Assist answered loadCodeAssist');
   refuseIneligible(load);
   const tier = tierOf(load);
   const known = text(load.cloudaicompanionProject);
   if (known !== null) return { project: known, tier: tier.name ?? tier.id };
-  const tierId = tier.id ?? FREE_TIER;
-  const op = await waitOperation(base, tokens.accessToken, await call(base, 'onboardUser', tokens.accessToken, { tierId, metadata: METADATA }, fetchImpl), fetchImpl);
+  if (isRecord(load.currentTier)) throw new GeminiAuthError(MANAGED);
+  const wanted = tierToOnboard(load);
+  const op = await waitOperation(base, tokens.accessToken, await call(base, 'onboardUser', tokens.accessToken, { tierId: wanted.id, metadata: METADATA }, fetchImpl), fetchImpl);
   const response = isRecord(op.response) ? op.response : {};
   const project = isRecord(response.cloudaicompanionProject) ? text(response.cloudaicompanionProject.id) : null;
   if (project === null) throw new GeminiAuthError('Google did not assign a Code Assist project to this account; sign in to https://geminicli.com once with the Gemini CLI, then try again');
-  return { project, tier: tier.name ?? tierId };
+  return { project, tier: wanted.name ?? wanted.id };
 }

package/runtime/runtime.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.0-beta.148"
+  "version": "0.1.0-beta.149"
 }