@stage-labs/metro 0.1.0-beta.31 → 0.1.0-beta.310

package/runtime/node_modules/@metro-labs/{mcp/src/daemon → daemon/src/files}/upload-api.ts

@@ -1,17 +1,16 @@
 import { open, rename, rm, type FileHandle } from 'node:fs/promises';
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import { guessMime } from '../stations/attachments.js';
+import { guessMime } from '@metro-labs/core/stations/attachments';
 import { safeFileName } from '../stations/attach-inline.js';
 import {
   allowedAgents,
-  authConfigFromEnv,
   authenticate,
   extractToken,
 } from '../mcp/request-identity.js';
-import { ApiError } from './api-error.js';
-import { apiFailure, cors, sendJson } from './api-http.js';
-import { log } from './log.js';
-import { writeSecure } from './secure-fs.js';
+import { ApiError } from '@metro-labs/http/api-error';
+import { apiFailure, cors, sendJson } from '@metro-labs/http/api-http';
+import { log } from '@metro-labs/core/log';
+import { writeSecure } from '@metro-labs/core/secure-fs';
 import {
   createUploadSlot,
   liveUploadBytes,
@@ -38,7 +37,7 @@ const VAGUE_MIMES = new Set([
 
 const mib = (n: number): string => `${Math.round(n / (1024 * 1024))} MiB`;
 
-export const uploadLimit = (): string =>
+const uploadLimit = (): string =>
   `${mib(MAX_UPLOAD_BYTES)} (${MAX_UPLOAD_BYTES} bytes)`;
 
 const tooLarge = (): string =>
@@ -69,23 +68,7 @@ const query = (req: IncomingMessage, key: string): string | undefined =>
   new URL(req.url ?? '/', 'http://localhost').searchParams.get(key) ?? undefined;
 
 const identityScope = (req: IncomingMessage): Set<string> =>
-  allowedAgents(authenticate(req, authConfigFromEnv()) ?? undefined);
-
-function ownerFromScope(req: IncomingMessage, allowed: Set<string>): string {
-  const requested = query(req, 'agent');
-  if (requested !== undefined) {
-    if (!allowed.has(requested))
-      throw new ApiError(`agent ${requested} is outside your scope`, 403);
-    return requested;
-  }
-  const [only] = [...allowed];
-  if (allowed.size === 1 && only !== undefined) return only;
-  throw new ApiError(
-    `this credential covers ${allowed.size} agents; ` +
-      'name the owning agent with ?agent=<id>',
-    400,
-  );
-}
+  allowedAgents(authenticate(req) ?? undefined);
 
 function mimeFor(req: IncomingMessage, name: string): string {
   const explicit = query(req, 'mime');
@@ -186,10 +169,10 @@ async function handleCreate(
   req: IncomingMessage,
   res: ServerResponse,
 ): Promise<void> {
-  const allowed = identityScope(req);
-  if (allowed.size === 0) throw new ApiError('unauthorized', 401);
+  const [owner] = identityScope(req);
+  if (owner === undefined) throw new ApiError('unauthorized', 401);
   const name = safeFileName(query(req, 'name'));
-  const id = createUploadSlot(ownerFromScope(req, allowed), {
+  const id = createUploadSlot(owner, {
     name,
     mime: mimeFor(req, name),
   });

package/runtime/node_modules/@metro-labs/{mcp/src/daemon → daemon/src/files}/upload-store.ts

@@ -1,11 +1,11 @@
 import { randomBytes } from 'node:crypto';
 import { readdirSync, rmSync, statSync } from 'node:fs';
-import { tmpdir } from 'node:os';
+import { homedir } from 'node:os';
 import { join } from 'node:path';
-import { ensureSecureDir, readJson, writeSecure } from './secure-fs.js';
+import { ensureSecureDir, readJson, writeSecure } from '@metro-labs/core/secure-fs';
 import { grantAllowsPath, issueGrant } from './attach-grant.js';
 import { ownerOf, recordOwner } from './attach-owner.js';
-import { errMsg, log } from './log.js';
+import { errMsg, log } from '@metro-labs/core/log';
 
 export const UPLOAD_TTL_MS = 30 * 60 * 1000;
 export const MAX_UPLOAD_BYTES = 64 * 1024 * 1024;
@@ -16,7 +16,7 @@ const SUFFIXES = ['', '.part', '.meta', '.owner', '.grant'] as const;
 const SWEEP_MS = 60_000;
 
 export const uploadDir = (): string =>
-  process.env.METRO_UPLOAD_DIR ?? join(tmpdir(), 'metro-uploads');
+  process.env.METRO_UPLOAD_DIR ?? join(homedir(), '.metro', 'uploads');
 
 export const newUploadId = (): string =>
   `up_${randomBytes(16).toString('base64url')}`;

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

@@ -0,0 +1,228 @@
+import type { IncomingMessage, ServerResponse } from 'node:http';
+import { log } from '@metro-labs/core/log';
+import { EventStreamDecoder, type EventStreamMessage } from './eventstream.js';
+import { errorFrame, providerStatus, relayFrames, sendError, upstreamMessage, type Watch } from './forward.js';
+import type { Connection } from './model-config.js';
+import { estimateTokens } from './subscription.js';
+import { UsageScanner } from './usage.js';
+
+const ANTHROPIC_VERSION = 'bedrock-2023-05-31';
+const EXTRA_INPUT_RE = /^([A-Za-z0-9_]+)(?:\.[^:]*)?: Extra inputs are not permitted/;
+const MAX_REPAIRS = 4;
+
+export interface Adaptations {
+  fields: Set<string>;
+  dropBetas: boolean;
+}
+
+export const freshAdaptations = (): Adaptations => ({ fields: new Set(), dropBetas: false });
+
+export interface BedrockUpstream {
+  settings: Connection;
+  base: string;
+  learned: Adaptations;
+  watch: Watch;
+}
+
+interface Rewritten {
+  modelId: string;
+  stream: boolean;
+  body: Record<string, unknown>;
+  betas: string[];
+}
+
+interface Attempt {
+  body: Record<string, unknown>;
+  betas: string[];
+}
+
+const PREFIXES: [RegExp, string][] = [
+  [/^us-gov-/, 'us-gov'],
+  [/^us-/, 'us'],
+  [/^eu-/, 'eu'],
+  [/^ap-/, 'apac'],
+];
+
+function regionPrefix(region: string): string {
+  for (const [pattern, prefix] of PREFIXES) if (pattern.test(region)) return prefix;
+  return 'global';
+}
+
+function bedrockModelId(requested: string, region: string): string {
+  if (requested.includes('anthropic.')) return requested;
+  return `${regionPrefix(region)}.anthropic.${requested}`;
+}
+
+export const bedrockBase = (region: string): string => `https://bedrock-runtime.${region}.amazonaws.com`;
+
+function splitBetas(header: string | string[] | undefined): string[] {
+  const raw = Array.isArray(header) ? header.join(',') : (header ?? '');
+  return raw
+    .split(',')
+    .map((b) => b.trim())
+    .filter((b) => b !== '');
+}
+
+function rewriteForBedrock(
+  body: Record<string, unknown>,
+  model: string,
+  betaHeader: string | string[] | undefined,
+  region: string,
+): Rewritten {
+  const betas = splitBetas(betaHeader);
+  const out: Record<string, unknown> = {
+    ...Object.fromEntries(Object.entries(body).filter(([key]) => key !== 'model' && key !== 'stream')),
+    anthropic_version: ANTHROPIC_VERSION,
+  };
+  if (betas.length > 0) out.anthropic_beta = betas;
+  return { modelId: bedrockModelId(model, region), stream: body.stream === true, body: out, betas };
+}
+
+function errorKind(status: number, errorType: string | null): string {
+  if (status === 429 || errorType === 'ThrottlingException') return 'rate_limit_error';
+  if (status === 400) return 'invalid_request_error';
+  if (status === 401 || status === 403) return 'permission_error';
+  if (status === 404) return 'not_found_error';
+  if (status === 503) return 'overloaded_error';
+  return 'api_error';
+}
+
+const invokeUrl = (up: BedrockUpstream, modelId: string, action: string): string =>
+  `${up.base}/model/${encodeURIComponent(modelId)}/${action}`;
+
+function callBedrock(up: BedrockUpstream, url: string, body: unknown, accept: string): Promise<Response> {
+  return fetch(url, {
+    method: 'POST',
+    headers: {
+      authorization: `Bearer ${up.settings.apiKey}`,
+      'content-type': 'application/json',
+      accept,
+    },
+    body: JSON.stringify(body),
+    signal: up.watch.signal,
+  });
+}
+
+const without = (body: Record<string, unknown>, keys: Set<string>): Record<string, unknown> =>
+  Object.fromEntries(Object.entries(body).filter(([key]) => !keys.has(key)));
+
+function applyLearned(req: Rewritten, learned: Adaptations): Attempt {
+  const dropped = new Set(learned.fields);
+  if (learned.dropBetas) dropped.add('anthropic_beta');
+  return { body: without(req.body, dropped), betas: learned.dropBetas ? [] : req.betas };
+}
+
+function repair(attempt: Attempt, learned: Adaptations, message: string): Attempt | null {
+  const named = EXTRA_INPUT_RE.exec(message)?.[1];
+  if (named !== undefined && named in attempt.body) {
+    learned.fields.add(named);
+    log.warn({ field: named }, 'gateway: Bedrock refused an extra input; dropping it from every request');
+    return { body: without(attempt.body, new Set([named])), betas: attempt.betas };
+  }
+  if (attempt.betas.length > 0) {
+    learned.dropBetas = true;
+    log.warn({ betas: attempt.betas }, 'gateway: retrying without anthropic_beta');
+    return { body: without(attempt.body, new Set(['anthropic_beta'])), betas: [] };
+  }
+  return null;
+}
+
+async function withRepairs(up: BedrockUpstream, req: Rewritten, send: (attempt: Attempt) => Promise<Response>): Promise<Response> {
+  let attempt = applyLearned(req, up.learned);
+  for (let repairs = 0; ; repairs += 1) {
+    const res = await send(attempt);
+    if (res.status !== 400 || repairs >= MAX_REPAIRS) return res;
+    const text = await res.text();
+    const next = repair(attempt, up.learned, upstreamMessage(text, 'Bedrock returned no body'));
+    if (next === null) return new Response(text, { status: 400, headers: res.headers });
+    attempt = next;
+  }
+}
+
+function invoke(up: BedrockUpstream, req: Rewritten): Promise<Response> {
+  const action = req.stream ? 'invoke-with-response-stream' : 'invoke';
+  const accept = req.stream ? 'application/vnd.amazon.eventstream' : 'application/json';
+  const url = invokeUrl(up, req.modelId, action);
+  return withRepairs(up, req, (attempt) => callBedrock(up, url, attempt.body, accept));
+}
+
+function eventTypeOf(event: string): string {
+  try {
+    const parsed = JSON.parse(event) as { type?: unknown };
+    return typeof parsed.type === 'string' ? parsed.type : 'message';
+  } catch {
+    return 'message';
+  }
+}
+
+function eventFrame(message: EventStreamMessage): string {
+  if (message.headers[':message-type'] === 'event') {
+    const parsed = JSON.parse(message.payload.toString('utf8')) as { bytes?: unknown };
+    if (typeof parsed.bytes !== 'string') return '';
+    const event = Buffer.from(parsed.bytes, 'base64').toString('utf8');
+    return `event: ${eventTypeOf(event)}\ndata: ${event}\n\n`;
+  }
+  const errorType = message.headers[':exception-type'] ?? message.headers[':error-code'] ?? null;
+  return errorFrame(errorKind(500, errorType), upstreamMessage(message.payload.toString('utf8'), 'Bedrock stream error'));
+}
+
+function relayStream(upstream: Response, res: ServerResponse, watch: Watch, key: string): Promise<void> {
+  const decoder = new EventStreamDecoder();
+  return relayFrames(upstream, res, watch, key, {
+    push: (chunk, emit) => {
+      for (const message of decoder.push(Buffer.from(chunk))) emit(eventFrame(message));
+    },
+    close: () => '',
+    idle: (message) => errorFrame('api_error', message),
+  });
+}
+
+async function relayFailure(upstream: Response, res: ServerResponse): Promise<void> {
+  const text = await upstream.text();
+  sendError(res, providerStatus(upstream.status), errorKind(upstream.status, upstream.headers.get('x-amzn-errortype')), upstreamMessage(text, 'Bedrock returned no body'));
+}
+
+export async function bedrockMessages(
+  req: IncomingMessage,
+  res: ServerResponse,
+  body: Record<string, unknown>,
+  model: string,
+  up: BedrockUpstream,
+): Promise<void> {
+  const rewritten = rewriteForBedrock(body, model, req.headers['anthropic-beta'], up.settings.region);
+  const upstream = await invoke(up, rewritten);
+  if (!upstream.ok) {
+    await relayFailure(upstream, res);
+    return;
+  }
+  if (rewritten.stream) {
+    await relayStream(upstream, res, up.watch, up.settings.id);
+    return;
+  }
+  const text = await upstream.text();
+  const scanner = new UsageScanner(up.settings.id);
+  scanner.feed(text);
+  scanner.done();
+  res.writeHead(200, { 'content-type': 'application/json' });
+  res.end(text);
+}
+
+export async function bedrockCount(
+  req: IncomingMessage,
+  res: ServerResponse,
+  body: Record<string, unknown>,
+  model: string,
+  up: BedrockUpstream,
+): Promise<void> {
+  const rewritten = rewriteForBedrock(body, model, req.headers['anthropic-beta'], up.settings.region);
+  const url = invokeUrl(up, rewritten.modelId, 'count-tokens');
+  const upstream = await withRepairs(up, rewritten, (attempt) => callBedrock(up, url, { input: { invokeModel: { body: JSON.stringify(attempt.body) } } }, 'application/json'));
+  const text = await upstream.text();
+  let counted: number | null = null;
+  if (upstream.ok) {
+    const parsed = JSON.parse(text) as { inputTokens?: unknown };
+    if (typeof parsed.inputTokens === 'number') counted = parsed.inputTokens;
+  }
+  res.writeHead(200, { 'content-type': 'application/json' });
+  res.end(JSON.stringify({ input_tokens: counted ?? estimateTokens(rewritten.body) }));
+}

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

@@ -0,0 +1,192 @@
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import { ID_RE, newId } from '@metro-labs/core/ids';
+import { isRecord } from '@metro-labs/core/is-record';
+import { errMsg, log } from '@metro-labs/core/log';
+import { ApiError } from '@metro-labs/http/api-error';
+import { readFileSync } from '../agent-user/agent-fs.js';
+import { moveHome, removeHome } from '../agent-user/home-fs.js';
+import { claudeHome } from '../agent-user/user.js';
+import { claudeAccountIn, type ClaudeAccount, type LoginTarget } from '../claude/login.js';
+import { readClaudeUsage } from '../claude/usage-probe.js';
+import { currentOf, reach, refreshed, type TokenSource, type TokenState } from './subscription.js';
+import { forgetOne, forgetReported } from './usage.js';
+import { readClaudeLogins, writeClaudeLogins, type ClaudeLogin } from './claude-store.js';
+import { loginRef } from './model-config.js';
+
+const CREDENTIALS = '.credentials.json';
+const RENEW_MARGIN_MS = 60_000;
+const NEW = 'new';
+const MISSING = 'this Claude login is no longer on the box: sign in again on the Model page';
+
+export interface ClaudeLoginDeps {
+  root?: string;
+  probe?: (env: Record<string, string>) => Promise<unknown>;
+  account?: (env: Record<string, string>) => ClaudeAccount;
+  dir?: string;
+}
+
+interface ClaudeTokens {
+  accessToken: string;
+  expiresAt: number | null;
+  savedAt: string;
+}
+
+const state: TokenState<ClaudeTokens> = new Map();
+const seen = new Map<string, ClaudeTokens>();
+
+const claudeLoginsRoot = (): string => join(claudeHome() ?? homedir(), '.metro', 'claude-logins');
+
+const rootOf = (deps: ClaudeLoginDeps): string => deps.root ?? claudeLoginsRoot();
+
+function claudeLoginEnv(login: string, deps: ClaudeLoginDeps = {}): Record<string, string> {
+  if (!ID_RE.test(login)) throw new Error('not a Claude login id');
+  return { CLAUDE_CONFIG_DIR: join(rootOf(deps), login) };
+}
+
+export const probeClaudeLogin = (login: string, deps: ClaudeLoginDeps = {}): Promise<unknown> =>
+  (deps.probe ?? ((env) => readClaudeUsage({ env })))(claudeLoginEnv(login, deps));
+
+const stale = (tokens: ClaudeTokens, margin = RENEW_MARGIN_MS): boolean => tokens.expiresAt !== null && tokens.expiresAt - margin <= Date.now();
+
+function onDisk(login: string, deps: ClaudeLoginDeps): ClaudeTokens | null {
+  let raw: unknown;
+  try {
+    raw = JSON.parse(readFileSync(join(claudeLoginEnv(login, deps).CLAUDE_CONFIG_DIR ?? '', CREDENTIALS), 'utf8'));
+  } catch {
+    return null;
+  }
+  const oauth = isRecord(raw) && isRecord(raw.claudeAiOauth) ? raw.claudeAiOauth : {};
+  const accessToken = typeof oauth.accessToken === 'string' ? oauth.accessToken : '';
+  const expiresAt = typeof oauth.expiresAt === 'number' && Number.isFinite(oauth.expiresAt) ? oauth.expiresAt : null;
+  return accessToken === '' ? null : { accessToken, expiresAt, savedAt: new Date(expiresAt ?? 0).toISOString() };
+}
+
+function remembered(login: string, tokens: ClaudeTokens | null): ClaudeTokens | null {
+  if (tokens === null) seen.delete(login);
+  else seen.set(login, tokens);
+  return tokens;
+}
+
+function known(login: string, deps: ClaudeLoginDeps): ClaudeTokens | null {
+  const kept = seen.get(login);
+  if (kept !== undefined && !stale(kept)) return kept;
+  const read = onDisk(login, deps);
+  return read === null && kept !== undefined ? kept : remembered(login, read);
+}
+
+function sourceFor(login: string, deps: ClaudeLoginDeps): TokenSource<ClaudeTokens> {
+  return {
+    label: 'Claude',
+    stale: (tokens) => stale(tokens),
+    refresh: async () => {
+      try {
+        await probeClaudeLogin(login, deps);
+      } catch (err) {
+        log.warn({ err: errMsg(err) }, 'claude-logins: Claude Code stumbled while renewing a login, so its folder is read as it is');
+      }
+      const fresh = onDisk(login, deps);
+      if (fresh === null || stale(fresh, 0)) throw new Error('Claude Code could not renew this login');
+      return fresh;
+    },
+    save: (id, tokens) => {
+      remembered(id, tokens);
+    },
+  };
+}
+
+function again(login: string, failed: ClaudeTokens, deps: ClaudeLoginDeps, source: TokenSource<ClaudeTokens>): Promise<ClaudeTokens> {
+  const disk = onDisk(login, deps);
+  if (disk !== null && disk.accessToken !== failed.accessToken && !stale(disk)) return Promise.resolve(remembered(login, disk) ?? disk);
+  return refreshed(state, login, failed, source);
+}
+
+export function withClaudeLogin(login: string, deps: ClaudeLoginDeps, send: (token: string) => Promise<Response>): Promise<Response> {
+  const source = sourceFor(login, deps);
+  return reach(
+    () => currentOf(state, login, known(login, deps), source, MISSING),
+    (failed) => again(login, failed, deps, source),
+    (tokens) => send(tokens.accessToken),
+  );
+}
+
+const folderOf = (login: string, deps: ClaudeLoginDeps): string => claudeLoginEnv(login, deps).CLAUDE_CONFIG_DIR ?? '';
+
+function forgetTokens(login: string): void {
+  seen.delete(login);
+  state.delete(login);
+}
+
+function dropFolder(login: string, deps: ClaudeLoginDeps): void {
+  forgetTokens(login);
+  try {
+    removeHome(folderOf(login, deps), true);
+  } catch (err) {
+    log.warn({ err: errMsg(err) }, 'claude-logins: could not remove the folder of a Claude login that is no longer used');
+  }
+}
+
+export function removeClaudeLogin(login: string, deps: ClaudeLoginDeps = {}): void {
+  const logins = readClaudeLogins(deps.dir);
+  if (!logins.some((l) => l.id === login)) throw new ApiError('no such Claude login on this box', 404);
+  writeClaudeLogins(logins.filter((l) => l.id !== login), deps.dir);
+  dropFolder(login, deps);
+  forgetOne(loginRef(login));
+  log.info({ login }, 'claude-logins: a Claude login was removed from this box');
+}
+
+function takeOver(fresh: string, replaced: string, deps: ClaudeLoginDeps): void {
+  const aside = `${folderOf(replaced, deps)}.old-${newId()}`;
+  moveHome(folderOf(replaced, deps), aside);
+  try {
+    moveHome(folderOf(fresh, deps), folderOf(replaced, deps));
+  } catch (err) {
+    moveHome(aside, folderOf(replaced, deps));
+    throw err;
+  }
+  forgetTokens(replaced);
+  try {
+    removeHome(aside, true);
+  } catch (err) {
+    log.warn({ err: errMsg(err) }, 'claude-logins: could not remove the folder of the login that was signed in again');
+  }
+}
+
+function keep(login: string, replacing: string | null, account: ClaudeAccount, deps: ClaudeLoginDeps): string | null {
+  const logins = readClaudeLogins(deps.dir);
+  if (replacing !== null && !logins.some((l) => l.id === replacing)) return 'that Claude login was removed during the sign-in';
+  if (replacing !== null) takeOver(login, replacing, deps);
+  const entry: ClaudeLogin = { id: replacing ?? login, email: account.account, plan: account.plan, savedAt: new Date().toISOString() };
+  writeClaudeLogins(replacing === null ? [...logins, entry] : logins.map((l) => (l.id === replacing ? entry : l)), deps.dir);
+  forgetReported(loginRef(entry.id));
+  log.info({ login: entry.id, plan: account.plan, added: replacing === null }, 'claude-logins: the Claude login was kept on this box');
+  return null;
+}
+
+function settle(ok: boolean, login: string, replacing: string | null, deps: ClaudeLoginDeps): Promise<string | null> {
+  if (!ok) {
+    dropFolder(login, deps);
+    return Promise.resolve(null);
+  }
+  let problem: string | null;
+  try {
+    const account = (deps.account ?? claudeAccountIn)(claudeLoginEnv(login, deps));
+    problem = account.signedIn ? keep(login, replacing, account, deps) : 'the sign-in finished but Claude Code holds no login; try again';
+  } catch (err) {
+    problem = errMsg(err);
+  }
+  if (problem !== null) dropFolder(login, deps);
+  return Promise.resolve(problem);
+}
+
+export function claudeLoginTarget(asked: string, deps: ClaudeLoginDeps = {}): LoginTarget {
+  const replacing = asked === NEW ? null : asked;
+  if (replacing !== null && !readClaudeLogins(deps.dir).some((l) => l.id === replacing)) throw new ApiError('no such Claude login on this box', 404);
+  const login = newId();
+  return { key: asked, env: claudeLoginEnv(login, deps), settle: (ok) => settle(ok, login, replacing, deps) };
+}
+
+export function forgetClaudeTokens(): void {
+  seen.clear();
+  state.clear();
+}

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

@@ -0,0 +1,59 @@
+import { join } from 'node:path';
+import { ID_RE } from '@metro-labs/core/ids';
+import { isRecord } from '@metro-labs/core/is-record';
+import { errMsg, log } from '@metro-labs/core/log';
+import { readJson, writeSecure } from '@metro-labs/core/secure-fs';
+import { agentsDir } from '../agents/files.js';
+
+export interface ClaudeLogin {
+  id: string;
+  email: string | null;
+  plan: string | null;
+  savedAt: string;
+}
+
+const MODEL_FILE = 'model.json';
+
+const text = (value: unknown): string => (typeof value === 'string' ? value.trim() : '');
+const maybe = (value: unknown): string | null => (typeof value === 'string' && value !== '' ? value : null);
+
+function claudeLoginOf(raw: unknown): ClaudeLogin | null {
+  if (!isRecord(raw) || !ID_RE.test(text(raw.id))) return null;
+  return { id: text(raw.id), email: maybe(raw.email), plan: maybe(raw.plan), savedAt: text(raw.savedAt) };
+}
+
+const modelPath = (dir: string): string => join(dir, MODEL_FILE);
+
+const readModelFile = (dir: string): unknown =>
+  readJson<unknown>(modelPath(dir), null, { warn: 'model.json is unreadable, so the Claude logins of this box are not seen until it is fixed' });
+
+const isV2 = (raw: unknown): raw is Record<string, unknown> & { connections: unknown[] } =>
+  isRecord(raw) && raw.version !== 3 && Array.isArray(raw.connections);
+
+const unique = (logins: ClaudeLogin[]): ClaudeLogin[] => logins.filter((l, at) => logins.findIndex((o) => o.id === l.id) === at);
+
+function claudeLoginsIn(raw: unknown): ClaudeLogin[] {
+  if (isV2(raw)) return unique(raw.connections.flatMap((c: unknown) => (isRecord(c) && c.provider === 'anthropic' ? (claudeLoginOf(c.claude) ?? []) : [])));
+  if (!isRecord(raw) || !Array.isArray(raw.claude)) return [];
+  return unique(raw.claude.flatMap((c: unknown) => claudeLoginOf(c) ?? []));
+}
+
+export const readClaudeLogins = (dir = agentsDir()): ClaudeLogin[] => claudeLoginsIn(readModelFile(dir));
+
+export function writeClaudeLogins(logins: ClaudeLogin[], dir = agentsDir()): void {
+  writeSecure(modelPath(dir), JSON.stringify({ version: 3, claude: logins }, null, 2));
+}
+
+export function retireV2ModelFile(dir = agentsDir()): boolean {
+  try {
+    const raw = readModelFile(dir);
+    if (!isV2(raw)) return false;
+    const logins = claudeLoginsIn(raw);
+    writeClaudeLogins(logins, dir);
+    log.warn({ claudeLogins: logins.length, connections: raw.connections.length }, 'org-models: model.json was still the old version 2; it keeps only its Claude logins now, and its connections are never served');
+    return true;
+  } catch (err) {
+    log.warn({ err: errMsg(err) }, 'org-models: the old version 2 model.json could not be rewritten; its connections are never served');
+    return false;
+  }
+}