@gakim-digital/dexter-bridge 0.11.6 → 0.11.9

package/src/runtimeProfiles.js

@@ -71,6 +71,20 @@ function normalizeCapabilities(value = {}) {
   };
 }
 
+function normalizeModelCatalog(value = {}) {
+  const source = ['runtime', 'fallback', 'stale', 'error'].includes(value.source)
+    ? value.source
+    : 'fallback';
+  return {
+    source,
+    refreshedAt: text(value.refreshedAt, 80) || new Date().toISOString(),
+    modelCount: Number.isFinite(Number(value.modelCount))
+      ? Math.max(0, Math.floor(Number(value.modelCount)))
+      : 0,
+    ...(text(value.error, 500) ? { error: text(value.error, 500) } : {}),
+  };
+}
+
 export function normalizeRuntimeProfile(value, { includeSecret = false } = {}) {
   if (!value || typeof value !== 'object' || Array.isArray(value)) return null;
   const driver = text(value.driver, 80);
@@ -110,6 +124,10 @@ export function normalizeRuntimeProfile(value, { includeSecret = false } = {}) {
     continuationIdentity: text(value.continuationIdentity, 180) || stableIdentity(driver, instanceId),
     capabilities: normalizeCapabilities(value.capabilities),
     models,
+    modelCatalog: normalizeModelCatalog({
+      ...(value.modelCatalog || {}),
+      modelCount: models.length,
+    }),
     ...(text(value.keyLast4, 16) ? { keyLast4: text(value.keyLast4, 16) } : {}),
     ...(text(value.command, 2048) ? { command: text(value.command, 2048) } : {}),
     ...(Array.isArray(value.args)
@@ -121,6 +139,9 @@ export function normalizeRuntimeProfile(value, { includeSecret = false } = {}) {
         }
       : {}),
     ...(text(value.cwd, 2048) ? { cwd: text(value.cwd, 2048) } : {}),
+    ...(normalizeDiagnostics(value.diagnostics)
+      ? { diagnostics: normalizeDiagnostics(value.diagnostics) }
+      : {}),
   };
   if (includeSecret && value.credentials) profile.credentials = value.credentials;
   return profile;
@@ -133,7 +154,104 @@ export function publicRuntimeProfile(value) {
   return publicProfile;
 }
 
-function profileFromAgentCheck(check) {
+const DIAGNOSTIC_LEVELS = new Set(['info', 'warn', 'error']);
+
+/**
+ * Structured environment checks for one local agent, shaped so the builder
+ * can show exactly what works and what to fix (installed, signed in, which
+ * credential is billed, and whether the model list came from the agent).
+ */
+export function diagnosticsFromAgentCheck(check, env = process.env) {
+  const label = check?.label || check?.agent || 'Agent';
+  const checks = [];
+  const add = (level, code, message, hint) =>
+    checks.push({ level, code, message, ...(hint ? { hint } : {}) });
+  if (!check || check.installed === false || check.status === 'unavailable') {
+    add(
+      'error',
+      'cli_missing',
+      check?.error || `${label} is not installed on this computer.`,
+      check?.agent === 'codex'
+        ? 'Install Codex (npm i -g @openai/codex), then restart the bridge.'
+        : 'Install Claude Code (npm i -g @anthropic-ai/claude-code), then restart the bridge.',
+    );
+  } else {
+    add(
+      'info',
+      'cli_detected',
+      `${label}${check.version ? ` ${check.version}` : ''} detected.`,
+    );
+    if (check.signedIn === false) {
+      add(
+        'error',
+        'sign_in_required',
+        check.error || `${label} is not signed in.`,
+        check.agent === 'codex'
+          ? 'Run `codex login` in a terminal, then restart the bridge.'
+          : 'Run `claude` in a terminal and sign in, then restart the bridge.',
+      );
+    } else {
+      const method = text(check.authMethod || check.authMode, 80);
+      add('info', 'signed_in', `Signed in${method ? ` (${method})` : ''}.`);
+      if (check.agent === 'claude-code' && text(env?.ANTHROPIC_API_KEY, 8)) {
+        add(
+          'warn',
+          'api_key_billing',
+          'ANTHROPIC_API_KEY is set, so Claude Code bills that API key instead of your Claude plan.',
+          'Unset ANTHROPIC_API_KEY in the bridge terminal to use your plan.',
+        );
+      }
+      if (check.agent === 'codex' && check.fallbackProviderUsed) {
+        add(
+          'warn',
+          'provider_fallback',
+          `Codex is using ${check.providerName || check.providerId || 'a fallback provider'} because the configured provider is not ready.`,
+        );
+      }
+    }
+    const modelCount = Array.isArray(check.modelDetails) ? check.modelDetails.length : 0;
+    if (check.modelCatalogSource === 'runtime') {
+      add('info', 'models_discovered', `${modelCount} model${modelCount === 1 ? '' : 's'} available.`);
+    } else if (check.signedIn !== false) {
+      add(
+        'warn',
+        'model_catalog_fallback',
+        `Could not read the model list from ${label}; showing the default list.`,
+        check.modelCatalogError ? text(check.modelCatalogError, 300) : undefined,
+      );
+    }
+  }
+  return {
+    status: checks.some((item) => item.level === 'error')
+      ? 'fail'
+      : checks.some((item) => item.level === 'warn')
+        ? 'warn'
+        : 'pass',
+    checks,
+    testedAt: new Date().toISOString(),
+  };
+}
+
+function normalizeDiagnostics(value) {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return null;
+  const checks = (Array.isArray(value.checks) ? value.checks : [])
+    .slice(0, 12)
+    .flatMap((item) => {
+      const level = DIAGNOSTIC_LEVELS.has(item?.level) ? item.level : null;
+      const code = text(item?.code, 80);
+      const message = text(item?.message, 500);
+      if (!level || !code || !message) return [];
+      const hint = text(item?.hint, 300);
+      return [{ level, code, message, ...(hint ? { hint } : {}) }];
+    });
+  return {
+    status: ['pass', 'warn', 'fail'].includes(value.status) ? value.status : 'warn',
+    checks,
+    testedAt: text(value.testedAt, 40) || new Date().toISOString(),
+  };
+}
+
+function profileFromAgentCheck(check, env) {
   if (!check || check.installed === false) return null;
   const driver =
     check.agent === 'codex' ? 'codex-app-server' : check.agent === 'claude-code' ? 'claude-code-cli' : null;
@@ -169,6 +287,13 @@ function profileFromAgentCheck(check) {
       cancellation: true,
     },
     models: check.modelDetails || [],
+    modelCatalog: {
+      source: check.modelCatalogSource || 'fallback',
+      refreshedAt: check.modelCatalogRefreshedAt,
+      modelCount: check.modelDetails?.length || 0,
+      ...(check.modelCatalogError ? { error: check.modelCatalogError } : {}),
+    },
+    diagnostics: diagnosticsFromAgentCheck(check, env),
   });
 }
 
@@ -239,7 +364,7 @@ export async function discoverRuntimeProfiles({
   const selectedRuntime = normalizeRuntimeSelection(runtimeSelection);
   const selectedDriver = runtimeDriver(selectedRuntime);
   const profiles = agentChecks
-    .map(profileFromAgentCheck)
+    .map((check) => profileFromAgentCheck(check, env))
     .filter(Boolean)
     .filter((profile) => !selectedDriver || profile.driver === selectedDriver);
   if (!selectedRuntime) {