@openchambery/web 2.0.0-beta.25 → 2.0.0-beta.28

package/server/lib/opencode/runtime-contract.js

@@ -7,20 +7,21 @@
  * execution semantics.
  *
  * Evidence bounds (ticket 11):
- * - MIN_VERIFIED: pin / installed verification (`2.0.12`)
+ * - MIN_VERIFIED: credential API availability (`2.0.20`)
  * Any acceptable OpenCode 2.x at or above MIN_VERIFIED may execute. Below-min
  * 2.x and 1.x are refused with upgrade guidance; there is no upper version cap.
  */
 
 import {
   PINNED_OPENCODE2_VERSION,
+  MINIMUM_OPENCODE2_VERSION,
   compareOpenCode2Versions,
   isAcceptableOpenCode2HealthVersion,
   isOpenCode1xVersion,
 } from './opencode2-pin.js';
 
 /** Lowest version with documented OpenChamber + OpenCode 2 contract tests. */
-export const RUNTIME_CONTRACT_MIN_VERIFIED = PINNED_OPENCODE2_VERSION;
+export const RUNTIME_CONTRACT_MIN_VERIFIED = MINIMUM_OPENCODE2_VERSION;
 
 /**
  * Optional / core capabilities and the minimum serve version that admits them.

package/server/lib/opencode/runtime-contract.test.js

@@ -13,14 +13,14 @@ import {
 } from './runtime-contract.js';
 
 describe('runtime contract admission (ticket 11)', () => {
-  it('records minimum verified bound from pin', () => {
-    expect(RUNTIME_CONTRACT_MIN_VERIFIED).toBe('2.0.12');
+  it('records the credential API floor independently of the install pin', () => {
+    expect(RUNTIME_CONTRACT_MIN_VERIFIED).toBe('2.0.20');
   });
 
   it('classifies version bands with a 2.x floor only', () => {
-    expect(classifyRuntimeVersionBand('2.0.12')).toBe('verified');
-    expect(classifyRuntimeVersionBand('2.0.14')).toBe('verified');
-    expect(classifyRuntimeVersionBand('2.0.15')).toBe('verified');
+    expect(classifyRuntimeVersionBand('2.0.19')).toBe('below-min');
+    expect(classifyRuntimeVersionBand('2.0.20')).toBe('verified');
+    expect(classifyRuntimeVersionBand('2.0.23')).toBe('verified');
     expect(classifyRuntimeVersionBand('2.1.0')).toBe('verified');
     expect(classifyRuntimeVersionBand('2.0.5')).toBe('below-min');
     expect(classifyRuntimeVersionBand('1.18.18')).toBe('1x');
@@ -30,8 +30,8 @@ describe('runtime contract admission (ticket 11)', () => {
 
   it('admits verified serve for core protocol and optional caps', () => {
     const result = evaluateRuntimeContract({
-      serveVersion: '2.0.12',
-      cliVersion: '2.0.12',
+      serveVersion: '2.0.20',
+      cliVersion: '2.0.20',
       reachable: true,
       authenticated: true,
       healthOk: true,
@@ -65,7 +65,7 @@ describe('runtime contract admission (ticket 11)', () => {
 
   it('admits newer 2.x above the documented floor for execution', () => {
     const result = evaluateRuntimeContract({
-      serveVersion: '2.0.15',
+      serveVersion: '2.0.23',
       reachable: true,
       authenticated: true,
       healthOk: true,
@@ -105,12 +105,12 @@ describe('runtime contract admission (ticket 11)', () => {
     expect(evaluateRuntimeContract({
       reachable: true,
       authenticated: false,
-      serveVersion: '2.0.12',
+      serveVersion: '2.0.20',
       healthOk: true,
     }).phase).toBe('unauthenticated');
 
     const migration = evaluateRuntimeContract({
-      serveVersion: '2.0.12',
+      serveVersion: '2.0.20',
       reachable: true,
       authenticated: true,
       healthOk: true,
@@ -122,7 +122,7 @@ describe('runtime contract admission (ticket 11)', () => {
     expect(migration.migrationExecutable).toBe(false);
 
     const mismatch = evaluateRuntimeContract({
-      serveVersion: '2.0.12',
+      serveVersion: '2.0.20',
       cliVersion: '2.0.14',
       reachable: true,
       authenticated: true,
@@ -179,7 +179,7 @@ describe('runtime contract admission (ticket 11)', () => {
       migrationAdmitTranscript: true,
     });
     const body = runtimeContractExecutionBlockedBody(contract);
-    expect(body.error).toContain('2.0.12');
+    expect(body.error).toContain('2.0.20');
     expect(body.error).toMatch(/Settings → About/i);
     expect(formatRuntimeContractBlockedError(contract)).toBe(body.error);
   });

package/server/lib/opencode/shared.js

@@ -2,18 +2,18 @@ import fs from 'fs';
 import path from 'path';
 import os from 'os';
 import yaml from 'yaml';
-import { parse as parseJsonc } from 'jsonc-parser';
+import {
+  getGlobalConfigDirectory, readConfigFile, isPlainObject, readConfigLayers,
+  readConfig, getConfigForPath, writeConfig, getJsonEntrySource, getJsonWriteTarget,
+} from './config-files.js';
 
 // ============== PATH CONSTANTS ==============
 
-const OPENCODE_CONFIG_DIR = path.join(os.homedir(), '.config', 'opencode');
+const OPENCODE_CONFIG_DIR = getGlobalConfigDirectory();
 const AGENT_DIR = path.join(OPENCODE_CONFIG_DIR, 'agents');
 const COMMAND_DIR = path.join(OPENCODE_CONFIG_DIR, 'commands');
 const SKILL_DIR = path.join(OPENCODE_CONFIG_DIR, 'skills');
-const CONFIG_FILE = path.join(OPENCODE_CONFIG_DIR, 'config.json');
-const CUSTOM_CONFIG_FILE = process.env.OPENCODE_CONFIG
-  ? path.resolve(process.env.OPENCODE_CONFIG)
-  : null;
+const CONFIG_FILE = path.join(OPENCODE_CONFIG_DIR, 'opencode.jsonc');
 const PROMPT_FILE_PATTERN = /^\{file:(.+)\}$/i;
 
 // ============== SCOPE TYPE CONSTANTS ==============
@@ -89,175 +89,6 @@ function writeMdFile(filePath, frontmatter, body) {
 
 // ============== CONFIG FILE OPERATIONS ==============
 
-function getProjectConfigCandidates(workingDirectory) {
-  if (!workingDirectory) return [];
-  return [
-    path.join(workingDirectory, 'opencode.json'),
-    path.join(workingDirectory, 'opencode.jsonc'),
-    path.join(workingDirectory, '.opencode', 'opencode.json'),
-    path.join(workingDirectory, '.opencode', 'opencode.jsonc'),
-  ];
-}
-
-function getProjectConfigPath(workingDirectory) {
-  if (!workingDirectory) return null;
-
-  const candidates = getProjectConfigCandidates(workingDirectory);
-
-  for (const candidate of candidates) {
-    if (fs.existsSync(candidate)) {
-      return candidate;
-    }
-  }
-
-  return candidates[0];
-}
-
-function getConfigPaths(workingDirectory) {
-  return {
-    userPaths: [
-      path.join(OPENCODE_CONFIG_DIR, 'config.json'),
-      path.join(OPENCODE_CONFIG_DIR, 'opencode.json'),
-      path.join(OPENCODE_CONFIG_DIR, 'opencode.jsonc'),
-    ],
-    projectPath: getProjectConfigPath(workingDirectory),
-    customPath: CUSTOM_CONFIG_FILE
-  };
-}
-
-function getPrimaryUserConfigPath(userPaths) {
-  for (const userPath of userPaths) {
-    if (fs.existsSync(userPath)) {
-      return userPath;
-    }
-  }
-
-  return CONFIG_FILE;
-}
-
-function readConfigFile(filePath) {
-  if (!filePath || !fs.existsSync(filePath)) {
-    return {};
-  }
-  try {
-    const content = fs.readFileSync(filePath, 'utf8');
-    const normalized = content.trim();
-    if (!normalized) {
-      return {};
-    }
-    return parseJsonc(normalized, [], { allowTrailingComma: true });
-  } catch (error) {
-    console.error(`Failed to read config file: ${filePath}`, error);
-    throw new Error('Failed to read OpenCode configuration');
-  }
-}
-
-function isPlainObject(value) {
-  return value && typeof value === 'object' && !Array.isArray(value);
-}
-
-function mergeConfigs(base, override) {
-  if (!isPlainObject(base) || !isPlainObject(override)) {
-    return override;
-  }
-  const result = { ...base };
-  for (const [key, value] of Object.entries(override)) {
-    if (key in result) {
-      const baseValue = result[key];
-      if (isPlainObject(baseValue) && isPlainObject(value)) {
-        result[key] = mergeConfigs(baseValue, value);
-      } else {
-        result[key] = value;
-      }
-    } else {
-      result[key] = value;
-    }
-  }
-  return result;
-}
-
-function readConfigLayers(workingDirectory) {
-  const { userPaths, projectPath, customPath } = getConfigPaths(workingDirectory);
-  const userPath = getPrimaryUserConfigPath(userPaths);
-  const userConfig = readConfigFile(userPath);
-  const projectConfig = readConfigFile(projectPath);
-  const customConfig = readConfigFile(customPath);
-  const mergedConfig = mergeConfigs(mergeConfigs(userConfig, projectConfig), customConfig);
-
-  return {
-    userConfig,
-    projectConfig,
-    customConfig,
-    mergedConfig,
-    paths: { userPath, projectPath, customPath }
-  };
-}
-
-function readConfig(workingDirectory) {
-  return readConfigLayers(workingDirectory).mergedConfig;
-}
-
-function getConfigForPath(layers, targetPath) {
-  if (!targetPath) {
-    return layers.userConfig;
-  }
-  if (layers.paths.customPath && targetPath === layers.paths.customPath) {
-    return layers.customConfig;
-  }
-  if (layers.paths.projectPath && targetPath === layers.paths.projectPath) {
-    return layers.projectConfig;
-  }
-  return layers.userConfig;
-}
-
-function writeConfig(config, filePath = CONFIG_FILE) {
-  try {
-    if (fs.existsSync(filePath)) {
-      const backupFile = `${filePath}.openchamber.backup`;
-      fs.copyFileSync(filePath, backupFile);
-      console.log(`Created config backup: ${backupFile}`);
-    }
-
-    fs.mkdirSync(path.dirname(filePath), { recursive: true });
-    fs.writeFileSync(filePath, JSON.stringify(config, null, 2), 'utf8');
-    console.log(`Successfully wrote config file: ${filePath}`);
-  } catch (error) {
-    console.error(`Failed to write config file: ${filePath}`, error);
-    throw new Error('Failed to write OpenCode configuration');
-  }
-}
-
-function getJsonEntrySource(layers, sectionKey, entryName) {
-  const { userConfig, projectConfig, customConfig, paths } = layers;
-  const customSection = customConfig?.[sectionKey]?.[entryName];
-  if (customSection !== undefined) {
-    return { section: customSection, config: customConfig, path: paths.customPath, exists: true };
-  }
-
-  const projectSection = projectConfig?.[sectionKey]?.[entryName];
-  if (projectSection !== undefined) {
-    return { section: projectSection, config: projectConfig, path: paths.projectPath, exists: true };
-  }
-
-  const userSection = userConfig?.[sectionKey]?.[entryName];
-  if (userSection !== undefined) {
-    return { section: userSection, config: userConfig, path: paths.userPath, exists: true };
-  }
-
-  return { section: null, config: null, path: null, exists: false };
-}
-
-function getJsonWriteTarget(layers, preferredScope) {
-  const { userConfig, projectConfig, customConfig, paths } = layers;
-  if (paths.customPath) {
-    return { config: customConfig, path: paths.customPath };
-  }
-  if (preferredScope === AGENT_SCOPE.PROJECT && paths.projectPath) {
-    return { config: projectConfig, path: paths.projectPath };
-  }
-  return { config: userConfig, path: paths.userPath };
-}
-
 // ============== GIT/WORKTREE HELPERS ==============
 
 function getAncestors(startDir, stopDir) {

package/server/lib/opencode/upgrade-screen.js

@@ -1,5 +1,5 @@
 /**
- * Startup upgrade screen for OpenCode below 2.0.15.
+ * Startup upgrade screen for OpenCode below the runtime contract minimum.
  *
  * This module does not own process lifecycle. It classifies the version the
  * existing startup path already detected, and installs through the owned-cache
@@ -9,6 +9,7 @@
 
 import {
   PINNED_OPENCODE2_VERSION,
+  MINIMUM_OPENCODE2_VERSION,
   isAcceptableOpenCode2HealthVersion,
   isOpenCode1xVersion,
   isOpenCode2VersionAtLeast,
@@ -16,7 +17,7 @@ import {
 } from './opencode2-pin.js';
 
 /** Oldest OpenCode this OpenChamber build will enter a session against. */
-export const REQUIRED_OPENCODE_VERSION = '2.0.15';
+export const REQUIRED_OPENCODE_VERSION = MINIMUM_OPENCODE2_VERSION;
 
 const normalizeVersion = (value) => {
   if (typeof value !== 'string') return null;
@@ -68,14 +69,6 @@ export function platformSupportsUpgradeScreenInstall(platform = process.platform
   }
 }
 
-const pickDetectedVersion = (serveVersion, cliVersion) => {
-  const serve = normalizeVersion(serveVersion);
-  const cli = normalizeVersion(cliVersion);
-  if (serve && !isUpgradeScreenSatisfied(serve)) return serve;
-  if (serve) return serve;
-  return cli;
-};
-
 /**
  * @param {{
  *   version?: string | null,
@@ -156,7 +149,7 @@ async function readUpgradeScreenStatus(deps) {
     ? await Promise.resolve(deps.readCliVersion()).catch(() => null)
     : null;
   return describeUpgradeScreen({
-    version: pickDetectedVersion(serveVersion, cliVersion),
+    version: serveVersion || (typeof deps.readServeVersion === 'function' ? null : cliVersion),
     installation,
     platformCanInstall: typeof deps.platformCanInstall === 'boolean'
       ? deps.platformCanInstall

package/server/lib/opencode/upgrade-screen.test.js

@@ -11,26 +11,26 @@ import {
 } from './upgrade-screen.js';
 
 describe('upgrade screen version gate', () => {
-  it('uses 2.0.15 even when the runtime pin is older', () => {
-    expect(REQUIRED_OPENCODE_VERSION).toBe('2.0.15');
-    expect(resolveUpgradeScreenTarget('2.0.12')).toBe('2.0.15');
-    expect(resolveUpgradeScreenTarget('2.0.16')).toBe('2.0.16');
+  it('uses the floor even when the runtime pin is older', () => {
+    expect(REQUIRED_OPENCODE_VERSION).toBe('2.0.20');
+    expect(resolveUpgradeScreenTarget('2.0.12')).toBe('2.0.20');
+    expect(resolveUpgradeScreenTarget('2.0.23')).toBe('2.0.23');
   });
 
-  it('does not open the gate at or above 2.0.15', () => {
+  it('does not open the gate at or above 2.0.20', () => {
     expect(describeUpgradeScreen({
-      version: '2.0.15',
+      version: '2.0.20',
       installation: 'managed',
       platformCanInstall: true,
-    })).toMatchObject({ state: 'compatible', canInstall: false, minimumVersion: '2.0.15' });
+    })).toMatchObject({ state: 'compatible', canInstall: false, minimumVersion: '2.0.20' });
     expect(describeUpgradeScreen({
-      version: 'v2.0.16',
+      version: 'v2.0.23',
       installation: 'managed',
       platformCanInstall: true,
     }).state).toBe('compatible');
   });
 
-  it('opens the gate below 2.0.15 and offers install only when this runtime can switch', () => {
+  it('opens the gate below 2.0.20 and offers install only when this runtime can switch', () => {
     expect(describeUpgradeScreen({
       version: '2.0.14',
       installation: 'managed',
@@ -68,17 +68,17 @@ describe('upgrade screen version gate', () => {
 
   it('does not report an unverified install as upgraded', () => {
     expect(evaluateUpgradeScreenInstallResult({
-      targetVersion: '2.0.15',
+      targetVersion: '2.0.23',
       serveVersion: '2.0.14',
     })).toMatchObject({ ok: false, upgraded: false, version: '2.0.14' });
     expect(evaluateUpgradeScreenInstallResult({
-      targetVersion: '2.0.15',
+      targetVersion: '2.0.23',
       serveVersion: null,
     }).upgraded).toBe(false);
     expect(evaluateUpgradeScreenInstallResult({
-      targetVersion: '2.0.15',
-      serveVersion: '2.0.15',
-    })).toMatchObject({ ok: true, upgraded: true, version: '2.0.15' });
+      targetVersion: '2.0.23',
+      serveVersion: '2.0.23',
+    })).toMatchObject({ ok: true, upgraded: true, version: '2.0.23' });
   });
 });
 
@@ -94,7 +94,7 @@ describe('installRequiredOpenCode', () => {
         calls.push('install');
         return '/cache/opencode';
       }),
-      readBinaryVersion: vi.fn(() => '2.0.15'),
+      readBinaryVersion: vi.fn(() => '2.0.23'),
       persistBinary: vi.fn(async () => {
         calls.push('persist');
       }),
@@ -114,20 +114,20 @@ describe('installRequiredOpenCode', () => {
     return { deps, calls };
   };
 
-  it('installs 2.0.15 and only succeeds after the running serve is verified', async () => {
+  it('installs 2.0.23 and only succeeds after the running serve is verified', async () => {
     const { deps, calls } = createDeps({
       readServeVersion: vi.fn()
         .mockResolvedValueOnce('2.0.14')
-        .mockResolvedValueOnce('2.0.15'),
+        .mockResolvedValueOnce('2.0.23'),
     });
 
     await expect(installRequiredOpenCode(deps)).resolves.toMatchObject({
       ok: true,
       upgraded: true,
-      version: '2.0.15',
-      targetVersion: '2.0.15',
+      version: '2.0.23',
+      targetVersion: '2.0.23',
     });
-    expect(deps.install).toHaveBeenCalledWith({ version: '2.0.15' });
+    expect(deps.install).toHaveBeenCalledWith({ version: '2.0.23' });
     expect(calls).toEqual(['install', 'persist', 'force', 'restart', 'ready']);
   });
 
@@ -137,7 +137,7 @@ describe('installRequiredOpenCode', () => {
         .mockResolvedValueOnce('1.18.30')
         .mockResolvedValueOnce('1.18.30'),
       readCliVersion: () => '1.18.30',
-      readBinaryVersion: () => '2.0.15',
+      readBinaryVersion: () => '2.0.23',
     });
 
     await expect(installRequiredOpenCode(deps)).rejects.toThrow(/still 1\.18\.30/);
@@ -161,11 +161,11 @@ describe('installRequiredOpenCode', () => {
 });
 
 describe('upgrade screen routes', () => {
-  it('hides the gate for 2.0.15 and reports install failure without upgraded:true', async () => {
+  it('hides the gate for 2.0.20 and reports install failure without upgraded:true', async () => {
     const app = express();
     app.use(express.json());
     const readServeVersion = vi.fn()
-      .mockResolvedValueOnce('2.0.15')
+      .mockResolvedValueOnce('2.0.20')
       .mockResolvedValueOnce('2.0.12')
       .mockResolvedValueOnce('2.0.12');
     registerUpgradeScreenRoutes(app, {
@@ -176,14 +176,14 @@ describe('upgrade screen routes', () => {
       install: vi.fn(async () => {
         throw new Error('registry unreachable');
       }),
-      readBinaryVersion: () => '2.0.15',
+      readBinaryVersion: () => '2.0.23',
       persistBinary: vi.fn(),
       forceBinary: vi.fn(),
       restart: vi.fn(),
     });
 
     const compatible = await request(app).get('/api/opencode/compatibility').expect(200);
-    expect(compatible.body).toMatchObject({ state: 'compatible', version: '2.0.15', minimumVersion: '2.0.15' });
+    expect(compatible.body).toMatchObject({ state: 'compatible', version: '2.0.20', minimumVersion: '2.0.20' });
 
     const failed = await request(app).post('/api/opencode/install-required').expect(500);
     expect(failed.body).toMatchObject({

package/server/lib/opencode/version-alignment.test.js

@@ -0,0 +1,40 @@
+import { describe, expect, it, vi } from 'vitest';
+import { MINIMUM_OPENCODE2_VERSION, PINNED_OPENCODE2_VERSION } from './opencode2-pin.js';
+import { evaluateRuntimeContract } from './runtime-contract.js';
+import { describeUpgradeScreen, installRequiredOpenCode, resolveUpgradeScreenTarget } from './upgrade-screen.js';
+import { ensurePinnedOpenCode2Cli } from './ensure-cli.js';
+
+describe('v2 version alignment', () => {
+  it.each(['1.18.30', '2.0.19', null, 'unknown'])('blocks execution and startup for %s', (version) => {
+    expect(evaluateRuntimeContract({ serveVersion: version, cliVersion: '2.0.23', reachable: true, authenticated: true }).executionAllowed).toBe(false);
+    expect(describeUpgradeScreen({ version }).state).not.toBe('compatible');
+  });
+  it.each(['2.0.20', '2.0.23', '2.1.0'])('admits running %s independently of CLI pin', (version) => {
+    expect(evaluateRuntimeContract({ serveVersion: version, cliVersion: '2.0.15', reachable: true, authenticated: true })).toMatchObject({ executionAllowed: true, versionMismatch: true, minVerifiedVersion: '2.0.20' });
+    expect(describeUpgradeScreen({ version }).state).toBe('compatible');
+  });
+  it('installs the audited pin on first install and preserves newer discovered CLIs', async () => {
+    expect(MINIMUM_OPENCODE2_VERSION).toBe('2.0.20');
+    expect(PINNED_OPENCODE2_VERSION).toBe('2.0.23');
+    expect(resolveUpgradeScreenTarget()).toBe('2.0.23');
+    const install = vi.fn(async () => '/owned/opencode');
+    await expect(ensurePinnedOpenCode2Cli({ readVersion: (path) => path === '/owned/opencode' ? '2.0.23' : '', install })).resolves.toMatchObject({ version: '2.0.23', installed: true });
+    expect(install).toHaveBeenCalledWith(expect.objectContaining({ version: '2.0.23' }));
+    install.mockClear();
+    await expect(ensurePinnedOpenCode2Cli({ discoveredPath: '/global/opencode', readVersion: () => '2.1.0', install })).resolves.toMatchObject({ version: '2.1.0', installed: false });
+    expect(install).not.toHaveBeenCalled();
+  });
+  it('does not infer a successful installation from an unreadable binary', async () => {
+    await expect(ensurePinnedOpenCode2Cli({ readVersion: () => '', install: async () => '/owned/opencode' })).rejects.toThrow('got unknown');
+  });
+  it('verifies the live service after explicit install, and rolls selection back on failure', async () => {
+    const persistBinary = vi.fn();
+    const restart = vi.fn();
+    const deps = { resolveOwnership: async () => ({ ownership: 'shared-service' }), readServeVersion: vi.fn().mockResolvedValueOnce('2.0.19').mockResolvedValueOnce('2.0.23'), readCliVersion: () => '2.0.23', platformCanInstall: true, install: async () => '/owned/opencode', readBinaryVersion: () => '2.0.23', persistBinary, restart, isSharedService: () => true };
+    await expect(installRequiredOpenCode(deps)).resolves.toMatchObject({ upgraded: true, version: '2.0.23' });
+    expect(restart).toHaveBeenCalledWith({ binaryPath: '/owned/opencode' });
+    deps.readServeVersion.mockResolvedValue('2.0.19');
+    await expect(installRequiredOpenCode(deps)).rejects.toMatchObject({ code: 'UPGRADE_SCREEN_NOT_VERIFIED' });
+    expect(persistBinary).toHaveBeenLastCalledWith('');
+  });
+});

package/server/lib/quota/DOCUMENTATION.md

@@ -38,6 +38,15 @@ These provider IDs are currently dispatchable via `fetchQuotaForProvider(provide
 - `providers/openai.js` exists for logic parity/reuse but is intentionally not registered for dispatcher ID routing.
 
 ## Response contract
+Provider credentials are read asynchronously from the current OpenCode service via
+`opencode/auth.js`; only the selected credential is used. Account switching and
+logout are observed on the next request, without file fallback or persisted secret
+cache. Credential-list transport/auth/schema failure rejects the configured-provider
+list instead of returning an authoritative empty list; per-provider quota requests
+return `ok: false` with a sanitized error. VS Code uses the same credential adapter.
+OpenChamber-owned quota cookies and Grok/Antigravity-specific stores retain their
+separate explicit sources; they are not legacy OpenCode `auth.json` fallbacks.
+
 All providers should return results via shared helpers to preserve API shape:
 - Required fields: `providerId`, `providerName`, `ok`, `configured`, `usage`, `fetchedAt`
 - Optional field: `error`

package/server/lib/quota/provider-credentials.test.js

@@ -0,0 +1,29 @@
+import { afterEach, expect, it, vi } from 'vitest';
+import { configureOpenCodeCredentials } from '../opencode/auth.js';
+import { fetchQuota as fetchCodexQuota } from './providers/codex.js';
+import { fetchQuotaForProvider, listConfiguredQuotaProviders } from './providers/index.js';
+
+afterEach(() => { configureOpenCodeCredentials(null); vi.unstubAllGlobals(); });
+
+it('quota requests follow the current active account, then stop sending after logout', async () => {
+  let access = 'first-account';
+  configureOpenCodeCredentials(() => ({ credential: { list: async () => access ? [{ id: 'selected', integrationID: 'openai', active: true, value: { type: 'oauth', access, refresh: 'refresh', expires: 123 } }] : [] } }));
+  const fetchMock = vi.fn(async () => Response.json({ rate_limit: { primary_window: { used_percent: 20 } } }));
+  vi.stubGlobal('fetch', fetchMock);
+  await fetchCodexQuota();
+  expect(fetchMock.mock.calls[0][1].headers.Authorization).toBe('Bearer first-account');
+  access = 'second-account';
+  await fetchCodexQuota();
+  expect(fetchMock.mock.calls[1][1].headers.Authorization).toBe('Bearer second-account');
+  access = '';
+  await expect(fetchCodexQuota()).resolves.toMatchObject({ ok: false, configured: false });
+  expect(fetchMock).toHaveBeenCalledTimes(2);
+});
+
+it('quota source failure remains an error with no upstream secret in the response', async () => {
+  configureOpenCodeCredentials(() => ({ credential: { list: async () => { throw new Error('secret-from-upstream'); } } }));
+  await expect(listConfiguredQuotaProviders()).rejects.toThrow('Unable to read OpenCode credentials');
+  const result = await fetchQuotaForProvider('codex');
+  expect(result).toMatchObject({ ok: false, error: 'Unable to read OpenCode credentials' });
+  expect(JSON.stringify(result)).not.toContain('secret-from-upstream');
+});

package/server/lib/quota/providers/claude.js

@@ -1,4 +1,4 @@
-import { readAuthFile } from '../../opencode/auth.js';
+import { readOpenCodeCredentials } from '../../opencode/auth.js';
 import {
   getAuthEntry,
   normalizeAuthEntry,
@@ -12,14 +12,14 @@ export const providerId = 'claude';
 export const providerName = 'Claude';
 const aliases = ['anthropic', 'claude'];
 
-export const isConfigured = () => {
-  const auth = readAuthFile();
+export const isConfigured = async () => {
+  const auth = await readOpenCodeCredentials();
   const entry = normalizeAuthEntry(getAuthEntry(auth, aliases));
   return Boolean(entry?.access || entry?.token);
 };
 
 export const fetchQuota = async () => {
-  const auth = readAuthFile();
+  const auth = await readOpenCodeCredentials();
   const entry = normalizeAuthEntry(getAuthEntry(auth, aliases));
   const accessToken = entry?.access ?? entry?.token;
 

package/server/lib/quota/providers/codex.js

@@ -1,4 +1,4 @@
-import { readAuthFile } from '../../opencode/auth.js';
+import { readOpenCodeCredentials } from '../../opencode/auth.js';
 import {
   getAuthEntry,
   normalizeAuthEntry,
@@ -14,14 +14,14 @@ export const providerId = 'codex';
 export const providerName = 'Codex';
 const aliases = ['openai', 'codex', 'chatgpt'];
 
-export const isConfigured = () => {
-  const auth = readAuthFile();
+export const isConfigured = async () => {
+  const auth = await readOpenCodeCredentials();
   const entry = normalizeAuthEntry(getAuthEntry(auth, aliases));
   return Boolean(entry?.access || entry?.token);
 };
 
 export const fetchQuota = async () => {
-  const auth = readAuthFile();
+  const auth = await readOpenCodeCredentials();
   const entry = normalizeAuthEntry(getAuthEntry(auth, aliases));
   const accessToken = entry?.access ?? entry?.token;
   const accountId = entry?.accountId;

package/server/lib/quota/providers/codex.test.js

@@ -1,7 +1,7 @@
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
 vi.mock('../../opencode/auth.js', () => ({
-  readAuthFile: () => ({ openai: { access: 'test-token' } }),
+  readOpenCodeCredentials: async () => ({ openai: { access: 'test-token' } }),
 }));
 
 import { fetchQuota } from './codex.js';

package/server/lib/quota/providers/copilot.js

@@ -1,4 +1,4 @@
-import { readAuthFile } from '../../opencode/auth.js';
+import { readOpenCodeCredentials } from '../../opencode/auth.js';
 import {
   getAuthEntry,
   normalizeAuthEntry,
@@ -42,14 +42,14 @@ export const providerId = 'github-copilot';
 export const providerName = 'GitHub Copilot';
 const aliases = ['github-copilot', 'copilot'];
 
-export const isConfigured = () => {
-  const auth = readAuthFile();
+export const isConfigured = async () => {
+  const auth = await readOpenCodeCredentials();
   const entry = normalizeAuthEntry(getAuthEntry(auth, aliases));
   return Boolean(entry?.access || entry?.token);
 };
 
 export const fetchQuota = async () => {
-  const auth = readAuthFile();
+  const auth = await readOpenCodeCredentials();
   const entry = normalizeAuthEntry(getAuthEntry(auth, aliases));
   const accessToken = entry?.access ?? entry?.token;
 
@@ -107,7 +107,7 @@ export const providerIdAddon = 'github-copilot-addon';
 export const providerNameAddon = 'GitHub Copilot Add-on';
 
 export const fetchQuotaAddon = async () => {
-  const auth = readAuthFile();
+  const auth = await readOpenCodeCredentials();
   const entry = normalizeAuthEntry(getAuthEntry(auth, aliases));
   const accessToken = entry?.access ?? entry?.token;