@openchambery/web 1.19.22-beta.1 → 2.0.0-beta.10

package/server/lib/opencode/plugin-routes.test.js

@@ -263,11 +263,11 @@ describe('opencode plugin routes', () => {
     expect(response.body.results[0]).toMatchObject({ kind: 'npm-ok', spec: '@scope/foo@1.0.0', name: '@scope/foo' });
   });
 
-  test('POST /entry creates entry and requires reload', async () => {
+  test('POST /entry persists for V2 hot reload without restarting', async () => {
     const response = await createEntry('a');
 
-    expect(response.body).toMatchObject({ success: true, requiresReload: true, reloadDelayMs: 25 });
-    expect(refreshOpenCodeAfterConfigChange).toHaveBeenCalledWith('plugin entry creation');
+    expect(response.body).toMatchObject({ success: true, requiresReload: false, application: 'watch' });
+    expect(refreshOpenCodeAfterConfigChange).not.toHaveBeenCalled();
   });
 
   test('GET after POST returns created entry', async () => {
@@ -302,7 +302,7 @@ describe('opencode plugin routes', () => {
     expect(response.body.success).toBe(true);
     const after = await request(app).get('/api/config/plugins').expect(200);
     expect(after.body.entries[0]).toEqual(expect.objectContaining({ spec: 'b', scope: 'user' }));
-    expect(refreshOpenCodeAfterConfigChange).toHaveBeenCalledWith('plugin entry update');
+    expect(refreshOpenCodeAfterConfigChange).not.toHaveBeenCalled();
   });
 
   test('DELETE /entry/:id removes entry and prunes plugin key', async () => {
@@ -315,15 +315,15 @@ describe('opencode plugin routes', () => {
     const after = await request(app).get('/api/config/plugins').expect(200);
     expect(after.body.entries).toEqual([]);
     expect(readJson(userConfigPath).plugin).toBeUndefined();
-    expect(refreshOpenCodeAfterConfigChange).toHaveBeenCalledWith('plugin entry deletion');
+    expect(refreshOpenCodeAfterConfigChange).not.toHaveBeenCalled();
   });
 
   test('POST /file writes plugin dir file', async () => {
     const response = await createFile('test.js', '//x');
 
-    expect(response.body).toMatchObject({ success: true, requiresReload: true });
+    expect(response.body).toMatchObject({ success: true, requiresReload: false, application: 'watch' });
     expect(fs.readFileSync(path.join(rootDir, 'plugins', 'test.js'), 'utf8')).toBe('//x');
-    expect(refreshOpenCodeAfterConfigChange).toHaveBeenCalledWith('plugin file creation');
+    expect(refreshOpenCodeAfterConfigChange).not.toHaveBeenCalled();
   });
 
   test('POST duplicate file returns 409', async () => {
@@ -348,7 +348,7 @@ describe('opencode plugin routes', () => {
       .expect(200);
 
     expect(fs.readFileSync(path.join(rootDir, 'plugins', 'test.js'), 'utf8')).toBe('//y');
-    expect(refreshOpenCodeAfterConfigChange).toHaveBeenCalledWith('plugin file update');
+    expect(refreshOpenCodeAfterConfigChange).not.toHaveBeenCalled();
   });
 
   test('DELETE /file/:id unlinks file', async () => {
@@ -359,7 +359,7 @@ describe('opencode plugin routes', () => {
     await request(app).delete(`/api/config/plugins/file/${encodeURIComponent(id)}`).expect(200);
 
     expect(fs.existsSync(path.join(rootDir, 'plugins', 'test.js'))).toBe(false);
-    expect(refreshOpenCodeAfterConfigChange).toHaveBeenCalledWith('plugin file deletion');
+    expect(refreshOpenCodeAfterConfigChange).not.toHaveBeenCalled();
   });
 
   test('PATCH unknown entry id returns 404', async () => {

package/server/lib/opencode/plugins.js

@@ -7,6 +7,7 @@ import {
   writeConfig,
 } from './shared.js';
 import { isPathSpec } from './plugin-spec.js';
+import { withV1PluginIncompatibility } from './plugin-compatibility.js';
 
 const PLUGIN_FILE_NAME_PATTERN = /^[a-z0-9][a-z0-9-_.]*\.(js|ts|mjs|cjs)$/;
 
@@ -248,7 +249,7 @@ function listPluginEntries(workingDirectory) {
     }
     return source.config.plugin.map((raw) => {
       const parsed = parsePluginRaw(raw);
-      return {
+      return withV1PluginIncompatibility({
         id: encodePluginId('config', `${source.scope}:${parsed.spec}`),
         spec: parsed.spec,
         ...(parsed.options !== undefined ? { options: parsed.options } : {}),
@@ -256,7 +257,7 @@ function listPluginEntries(workingDirectory) {
         kind: 'config',
         parsedKind: parsedKindForSpec(parsed.spec),
         sourcePath: source.filePath,
-      };
+      });
     });
   });
 }
@@ -333,7 +334,7 @@ function listPluginDirFiles(workingDirectory) {
     }
     return fs.readdirSync(dir, { withFileTypes: true })
       .filter((entry) => entry.isFile() && PLUGIN_FILE_NAME_PATTERN.test(entry.name) && !entry.name.includes('..'))
-      .map((entry) => ({
+      .map((entry) => withV1PluginIncompatibility({
         id: encodePluginId('file', `${scope}:${entry.name}`),
         fileName: entry.name,
         scope,

package/server/lib/opencode/plugins.test.js

@@ -138,6 +138,18 @@ describe('opencode plugins data layer', () => {
     ]);
   });
 
+  test('lists V1 plugins as incompatible instead of a silent load failure', () => {
+    writeJson(userConfigPath, { plugin: ['oh-my-opencode'] });
+    const entries = plugins.listPluginEntries(projectDir);
+    expect(entries).toEqual([
+      expect.objectContaining({
+        spec: 'oh-my-opencode',
+        compatibility: 'v1-incompatible',
+        compatible: false,
+      }),
+    ]);
+  });
+
   test('encodes and decodes ids', () => {
     const id = plugins.encodePluginId('config', 'user:oh-my-openagent@4.3.0');
     expect(plugins.decodePluginId(id)).toEqual({ prefix: 'config', value: 'user:oh-my-openagent@4.3.0' });

package/server/lib/opencode/provider-catalog.js

@@ -56,20 +56,37 @@ const projectModalities = (source) => {
   return ownKeys(projected).length > 0 ? projected : undefined;
 };
 
+// v2 ModelCapabilities.input/output are modality name arrays, not boolean maps.
+const projectModalityList = (source) => {
+  if (!Array.isArray(source)) return undefined;
+  const projected = createDictionary();
+  for (const item of source) {
+    if (typeof item !== 'string' || !MODALITIES.has(item) || !isSafeIdentifier(item)) continue;
+    projected[item] = true;
+  }
+  return ownKeys(projected).length > 0 ? projected : undefined;
+};
+
 const projectCapabilities = (source) => {
   if (!isRecord(source)) return undefined;
   const capabilities = createDictionary();
   const flags = projectBooleanFields(source, ['temperature', 'reasoning', 'attachment', 'toolcall']);
   if (flags) Object.assign(capabilities, flags);
+  // v2 names tool support `tools`. Keep an explicit catalog `toolcall` flag when both exist.
+  if (!Object.hasOwn(capabilities, 'toolcall') && typeof source.tools === 'boolean') {
+    capabilities.toolcall = source.tools;
+  }
   for (const field of ['input', 'output']) {
     if (!Object.hasOwn(source, field)) continue;
-    const modalities = projectModalities(source[field]);
+    const modalities = Array.isArray(source[field])
+      ? projectModalityList(source[field])
+      : projectModalities(source[field]);
     if (modalities) capabilities[field] = modalities;
   }
   return ownKeys(capabilities).length > 0 ? capabilities : undefined;
 };
 
-const projectCost = (source) => {
+const projectCostEntry = (source) => {
   if (!isRecord(source)) return undefined;
   const cost = createDictionary();
   for (const field of ['input', 'output']) {
@@ -87,6 +104,30 @@ const projectCost = (source) => {
   return ownKeys(cost).length > 0 ? cost : undefined;
 };
 
+// v2 ModelInfo.cost is a tier array. The untiered entry is the base price.
+const projectCost = (source) => {
+  if (Array.isArray(source)) {
+    const base = source.find((item) => isRecord(item) && !isRecord(item.tier))
+      || source.find((item) => isRecord(item));
+    return projectCostEntry(base);
+  }
+  return projectCostEntry(source);
+};
+
+// v2 ModelInfo.variants is `{ id, settings?, headers?, body? }[]`. Catalog consumers
+// still read a name→{} record. Request payloads stay server-side.
+const projectVariantNames = (source) => {
+  if (Array.isArray(source)) {
+    return source.map((item) => {
+      if (typeof item === 'string') return item;
+      if (isRecord(item) && typeof item.id === 'string') return item.id;
+      return undefined;
+    });
+  }
+  if (isRecord(source)) return ownKeys(source);
+  return null;
+};
+
 function projectModel(source) {
   if (!isRecord(source) || !isSafeIdentifier(source.id) || !isSafeDisplayName(source.name)) return null;
   // partial is structural only (e.g. variant truncation). Soft allowlist stripping of optional
@@ -113,18 +154,23 @@ function projectModel(source) {
   if (Object.hasOwn(source, 'release_date') && source.release_date !== '' && source.release_date !== null) {
     if (isSafeReleaseDate(source.release_date)) model.release_date = source.release_date;
   }
-  if (Object.hasOwn(source, 'variants') && isRecord(source.variants)) {
-    const variants = createDictionary();
-    let variantCount = 0;
-    for (const variantName of ownKeys(source.variants)) {
-      if (variantCount >= MAX_VARIANTS_PER_MODEL) {
-        partial = true;
-        break;
+  if (Object.hasOwn(source, 'variants')) {
+    const names = projectVariantNames(source.variants);
+    if (names) {
+      const variants = createDictionary();
+      let variantCount = 0;
+      for (const variantName of names) {
+        if (variantCount >= MAX_VARIANTS_PER_MODEL) {
+          partial = true;
+          break;
+        }
+        variantCount += 1;
+        if (typeof variantName === 'string' && isSafeIdentifier(variantName) && !Object.hasOwn(variants, variantName)) {
+          variants[variantName] = createDictionary();
+        }
       }
-      variantCount += 1;
-      if (isSafeIdentifier(variantName)) variants[variantName] = createDictionary();
+      if (ownKeys(variants).length > 0) model.variants = variants;
     }
-    if (ownKeys(variants).length > 0) model.variants = variants;
   }
   return { value: model, partial };
 }

package/server/lib/opencode/provider-catalog.test.js

@@ -204,6 +204,54 @@ describe('projectProviderCatalog', () => {
     expect(result.value.partial).toBe(true);
   });
 
+  it('projects v2 variant arrays, capability lists, and tiered cost without leaking request payloads', () => {
+    const result = projectProviderCatalog({
+      providers: [{
+        id: 'openai',
+        name: 'OpenAI',
+        models: {
+          'gpt-5': {
+            id: 'gpt-5',
+            name: 'GPT 5',
+            capabilities: {
+              tools: true,
+              input: ['text', 'image', 'secret-modality'],
+              output: ['text'],
+            },
+            cost: [
+              { tier: { type: 'context', size: 200000 }, input: 9, output: 9, cache: { read: 1, write: 1 } },
+              { input: 1, output: 2, cache: { read: 0.1, write: 0.2 }, secret: 'cost-sentinel' },
+            ],
+            variants: [
+              { id: 'low', settings: { reasoningEffort: 'low', apiKey: 'variant-settings-sentinel' }, headers: { Authorization: 'variant-headers-sentinel' } },
+              { id: 'high', body: { store: false } },
+              { id: 'low' },
+              { id: 'constructor' },
+              'max',
+              { settings: { token: 'variant-missing-id-sentinel' } },
+            ],
+          },
+        },
+      }],
+      default: {},
+    });
+
+    expect(result.ok).toBe(true);
+    expect(result.value.partial).toBe(false);
+    expect(result.value.providers[0].models['gpt-5']).toEqual({
+      id: 'gpt-5',
+      name: 'GPT 5',
+      capabilities: {
+        toolcall: true,
+        input: { text: true, image: true },
+        output: { text: true },
+      },
+      cost: { input: 1, output: 2, cache: { read: 0.1, write: 0.2 } },
+      variants: { low: {}, high: {}, max: {} },
+    });
+    expect(JSON.stringify(result.value)).not.toContain('sentinel');
+  });
+
   it('treats empty/null release_date as absent without marking the catalog partial', () => {
     const catalog = safeCatalog();
     catalog.providers[0].models['gpt-5'].release_date = '';