@cloudcli-ai/cloudcli 1.36.3 → 1.37.1

package/server/modules/providers/tests/opencode-models.test.ts

@@ -2,141 +2,40 @@ import assert from 'node:assert/strict';
 import test from 'node:test';
 
 import {
-  buildOpenCodeDefinitionFromVerboseModels,
-  buildOpenCodeDefinitionFromIds,
-  parseOpenCodeModelsStdout,
-  parseOpenCodeVerboseModelsStdout,
+  OpenCodeProviderModels,
+  OPENCODE_PREDEFINED_MODELS,
 } from '@/modules/providers/list/opencode/opencode-models.provider.js';
 
-test('OpenCode models provider parses plain CLI output and removes duplicates', () => {
-  const ids = parseOpenCodeModelsStdout(`
-opencode/big-pickle
-not a model
-anthropic/claude-opus-4-7-fast
-anthropic/claude-opus-4-7-fast
-openai/gpt-5.5-pro
-`);
-
-  assert.deepEqual(ids, [
-    'opencode/big-pickle',
-    'anthropic/claude-opus-4-7-fast',
-    'openai/gpt-5.5-pro',
-  ]);
-});
-
-test('OpenCode models provider formats frontend labels from provider-prefixed ids', () => {
-  const definition = buildOpenCodeDefinitionFromIds([
-    'opencode/deepseek-v4-flash-free',
-    'opencode/nemotron-3-super-free',
-    'anthropic/claude-3-5-sonnet-20241022',
-    'anthropic/claude-opus-4-7-fast',
-    'google/model-alpha',
-    'openai/gpt-5.4-mini-fast',
-    'openai/gpt-5.5-pro',
-    'newprovider/alpha-v12-special-20261231',
-  ]);
-
-  assert.deepEqual(definition.OPTIONS, [
-    {
-      value: 'opencode/deepseek-v4-flash-free',
-      label: 'Deepseek V4 Flash Free',
-      description: 'opencode - opencode/deepseek-v4-flash-free',
-    },
-    {
-      value: 'opencode/nemotron-3-super-free',
-      label: 'Nemotron 3 Super Free',
-      description: 'opencode - opencode/nemotron-3-super-free',
-    },
-    {
-      value: 'anthropic/claude-3-5-sonnet-20241022',
-      label: 'Claude 3.5 Sonnet (2024-10-22)',
-      description: 'anthropic - anthropic/claude-3-5-sonnet-20241022',
-    },
-    {
-      value: 'anthropic/claude-opus-4-7-fast',
-      label: 'Claude Opus 4.7 Fast',
-      description: 'anthropic - anthropic/claude-opus-4-7-fast',
-    },
-    {
-      value: 'openai/gpt-5.4-mini-fast',
-      label: 'GPT-5.4 Mini Fast',
-      description: 'openai - openai/gpt-5.4-mini-fast',
-    },
-    {
-      value: 'openai/gpt-5.5-pro',
-      label: 'GPT-5.5 Pro',
-      description: 'openai - openai/gpt-5.5-pro',
-    },
-    {
-      value: 'newprovider/alpha-v12-special-20261231',
-      label: 'Alpha V12 Special (2026-12-31)',
-      description: 'newprovider - newprovider/alpha-v12-special-20261231',
-    },
-  ]);
-});
-
-test('OpenCode models provider maps verbose model variants to effort options', () => {
-  const models = parseOpenCodeVerboseModelsStdout(`
-opencode/deepseek-v4-flash-free
-{
-  "id": "deepseek-v4-flash-free",
-  "providerID": "opencode",
-  "name": "DeepSeek V4 Flash Free",
-  "variants": {
-    "low": {
-      "reasoningEffort": "low"
-    },
-    "high": {
-      "reasoningEffort": "high"
-    }
-  }
-}
-anthropic/claude-sonnet-5
-{
-  "id": "claude-sonnet-5",
-  "providerID": "anthropic",
-  "name": "Claude Sonnet 5",
-  "variants": {
-    "low": {
-      "effort": "low"
-    },
-    "max": {
-      "effort": "max"
-    }
-  }
-}
-google/model-alpha
-{
-  "id": "model-alpha",
-  "providerID": "google",
-  "name": "Model Alpha"
-}
-`);
-
-  const definition = buildOpenCodeDefinitionFromVerboseModels(models);
-
-  assert.deepEqual(definition.OPTIONS, [
-    {
-      value: 'opencode/deepseek-v4-flash-free',
-      label: 'DeepSeek V4 Flash Free',
-      description: 'opencode - opencode/deepseek-v4-flash-free',
-      effort: {
-        values: [
-          { value: 'low' },
-          { value: 'high' },
-        ],
-      },
-    },
-    {
-      value: 'anthropic/claude-sonnet-5',
-      label: 'Claude Sonnet 5',
-      description: 'anthropic - anthropic/claude-sonnet-5',
-      effort: {
-        values: [
-          { value: 'low' },
-          { value: 'max' },
-        ],
-      },
-    },
-  ]);
+test('OpenCode exposes only the curated predefined catalog', async () => {
+  const adapter = new OpenCodeProviderModels();
+
+  assert.deepEqual(await adapter.getSupportedModels(), OPENCODE_PREDEFINED_MODELS);
+  assert.equal(
+    (await adapter.getCurrentActiveModel()).model,
+    OPENCODE_PREDEFINED_MODELS.DEFAULT,
+  );
+  // OpenCode routes by `<providerID>/<modelID>`, so every option has to carry a
+  // provider prefix that `opencode models --verbose` reports.
+  const providerIds = new Set(
+    OPENCODE_PREDEFINED_MODELS.OPTIONS.map((option) => option.value.split('/')[0]),
+  );
+  assert.deepEqual([...providerIds].sort(), ['anthropic', 'opencode', 'openai'].sort());
+  assert.equal(
+    OPENCODE_PREDEFINED_MODELS.OPTIONS.every((option) => /^[a-z0-9-]+\/.+/.test(option.value)),
+    true,
+  );
+  assert.equal(
+    new Set(OPENCODE_PREDEFINED_MODELS.OPTIONS.map((option) => option.value)).size,
+    OPENCODE_PREDEFINED_MODELS.OPTIONS.length,
+  );
+  assert.equal(OPENCODE_PREDEFINED_MODELS.DEFAULT, 'opencode/gpt-5.6-terra');
+  assert.ok(
+    OPENCODE_PREDEFINED_MODELS.OPTIONS.some((option) => option.value === 'opencode/claude-opus-5'),
+  );
+  assert.ok(
+    OPENCODE_PREDEFINED_MODELS.OPTIONS.some((option) => option.value === 'anthropic/claude-opus-5'),
+  );
+  assert.ok(
+    OPENCODE_PREDEFINED_MODELS.OPTIONS.some((option) => option.value === 'openai/gpt-5.6'),
+  );
 });

package/server/modules/providers/tests/opencode-sessions.test.ts

@@ -470,22 +470,22 @@ const seedOpenCodeSession = async (
   }
 };
 
-test('OpenCode synchronizer titles app-created sessions from the first user message', { concurrency: false }, async () => {
+test('OpenCode synchronizer preserves the title assigned when CloudCLI creates a session', { concurrency: false }, async () => {
   const tempRoot = await mkdtemp(path.join(os.tmpdir(), 'opencode-session-sync-app-'));
   const workspacePath = path.join(tempRoot, 'workspace');
   await mkdir(workspacePath, { recursive: true });
   const restoreHomeDir = patchHomeDir(tempRoot);
 
   try {
-    // Stored title differs from the first message so we can prove the first
-    // message wins for sessions started from cloudcli.
+    // Both provider-owned values differ from the CloudCLI title so either one
+    // leaking through would change the assertion below.
     await seedOpenCodeSession(tempRoot, workspacePath, {
       sessionId: 'oc-app-1',
       title: 'OpenCode generated title',
-      firstUserText: 'Fix the checkout crash',
+      firstUserText: 'OpenCode first user prompt',
     });
     await withIsolatedDatabase(async () => {
-      sessionsDb.createAppSession('app-1', 'opencode', workspacePath);
+      sessionsDb.createAppSession('app-1', 'opencode', workspacePath, 'Fix the checkout crash');
       sessionsDb.assignProviderSessionId('app-1', 'oc-app-1');
 
       await new OpenCodeSessionSynchronizer().synchronize();

package/server/modules/providers/tests/{provider-image-history.test.ts → provider-attachment-history.test.ts}

@@ -4,7 +4,7 @@ import test from 'node:test';
 import { ClaudeSessionsProvider } from '@/modules/providers/list/claude/claude-sessions.provider.js';
 import { CodexSessionsProvider, extractCodexUserImages } from '@/modules/providers/list/codex/codex-sessions.provider.js';
 import { CursorSessionsProvider } from '@/modules/providers/list/cursor/cursor-sessions.provider.js';
-import { appendImagesInputTag } from '@/shared/image-attachments.js';
+import { appendFilesInputTag, appendImagesInputTag } from '@/shared/image-attachments.js';
 
 const SESSION_ID = 'session-1';
 
@@ -71,6 +71,29 @@ test('claude history: plain text user turns carry no images field', () => {
   assert.equal(messages[0].images, undefined);
 });
 
+test('claude history: file reference blocks restore non-image attachments', () => {
+  const provider = new ClaudeSessionsProvider();
+  const entry = {
+    uuid: 'u4',
+    timestamp: '2026-07-03T10:00:00.000Z',
+    message: {
+      role: 'user',
+      content: [{
+        type: 'text',
+        text: appendFilesInputTag('Summarize this', [
+          { path: 'C:/Users/x/.cloudcli/assets/brief.pdf', name: 'brief.pdf' },
+        ]),
+      }],
+    },
+  };
+
+  const messages = provider.normalizeMessage(entry, SESSION_ID);
+  assert.equal(messages[0].content, 'Summarize this');
+  assert.deepEqual(messages[0].files, [
+    { path: 'C:/Users/x/.cloudcli/assets/brief.pdf', name: 'brief.pdf' },
+  ]);
+});
+
 // ---------------------------------------------------------------- Codex
 
 test('codex history: user_message payload images become path attachments', () => {
@@ -123,6 +146,27 @@ test('codex history: normalized user entries keep their images', () => {
   assert.deepEqual(messages[0].images, [{ path: '.cloudcli/assets/a.png' }]);
 });
 
+test('codex history: normalized user entries restore file reference blocks', () => {
+  const provider = new CodexSessionsProvider();
+  const messages = provider.normalizeMessage(
+    {
+      timestamp: '2026-07-03T10:00:00.000Z',
+      message: {
+        role: 'user',
+        content: appendFilesInputTag('Review this', [
+          { path: 'C:/Users/x/.cloudcli/assets/spec.docx', name: 'spec.docx' },
+        ]),
+      },
+    },
+    SESSION_ID,
+  );
+
+  assert.equal(messages[0].content, 'Review this');
+  assert.deepEqual(messages[0].files, [
+    { path: 'C:/Users/x/.cloudcli/assets/spec.docx', name: 'spec.docx' },
+  ]);
+});
+
 // ---------------------------------------------------------------- Cursor
 
 test('cursor history: <images_input> inside user_query is stripped and attached', () => {
@@ -178,3 +222,26 @@ test('cursor history: user text without a tag keeps existing behavior', () => {
   assert.equal(messages[0].content, 'plain question');
   assert.equal(messages[0].images, undefined);
 });
+
+test('cursor history: file reference blocks are stripped and attached', () => {
+  const provider = new CursorSessionsProvider();
+  const taggedPrompt = appendFilesInputTag('Check the data', [
+    { path: 'C:/Users/x/.cloudcli/assets/data.csv', name: 'data.csv' },
+  ]);
+  const messages = provider.normalizeCursorBlobs([
+    {
+      id: 'blob-file',
+      sequence: 1,
+      rowid: 1,
+      content: {
+        role: 'user',
+        content: `<user_query>${taggedPrompt}</user_query>`,
+      },
+    },
+  ], SESSION_ID);
+
+  assert.equal(messages[0].content, 'Check the data');
+  assert.deepEqual(messages[0].files, [
+    { path: 'C:/Users/x/.cloudcli/assets/data.csv', name: 'data.csv' },
+  ]);
+});