@cloudcli-ai/cloudcli 1.36.3 → 1.37.0

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

@@ -6,6 +6,7 @@ import test from 'node:test';
 
 import { closeConnection, initializeDatabase, sessionsDb } from '@/modules/database/index.js';
 import { CodexSessionSynchronizer } from '@/modules/providers/list/codex/codex-session-synchronizer.provider.js';
+import { CodexSessionsProvider } from '@/modules/providers/list/codex/codex-sessions.provider.js';
 
 const patchHomeDir = (nextHomeDir: string) => {
   const original = os.homedir;
@@ -150,3 +151,42 @@ test('Codex synchronizer leaves indexed sessions untitled when no name is availa
     await rm(tempRoot, { recursive: true, force: true });
   }
 });
+
+test('Codex history renders Promise.all shell wrappers as Bash activity', { concurrency: false }, async () => {
+  const tempRoot = await mkdtemp(path.join(os.tmpdir(), 'codex-exec-history-'));
+  const workspacePath = path.join(tempRoot, 'workspace');
+  await mkdir(workspacePath, { recursive: true });
+  const restoreHomeDir = patchHomeDir(tempRoot);
+
+  try {
+    const providerSessionId = 'codex-exec-1';
+    const transcriptPath = await writeCodexTranscript(tempRoot, providerSessionId, workspacePath);
+    const execInput = 'const cmds = ["echo one", "echo two"]; await Promise.all(cmds.map(command => tools.shell_command({ command })));';
+    const planInput = 'await tools.update_plan({ plan: [] });';
+    await writeFile(transcriptPath, [
+      JSON.stringify({ type: 'session_meta', payload: { id: providerSessionId, cwd: workspacePath } }),
+      JSON.stringify({ type: 'response_item', payload: { type: 'custom_tool_call', name: 'exec', call_id: 'exec-1', input: execInput } }),
+      JSON.stringify({ type: 'response_item', payload: { type: 'custom_tool_call_output', call_id: 'exec-1', output: 'done' } }),
+      JSON.stringify({ type: 'response_item', payload: { type: 'custom_tool_call', name: 'exec', call_id: 'plan-1', input: planInput } }),
+      JSON.stringify({ type: 'response_item', payload: { type: 'custom_tool_call_output', call_id: 'plan-1', output: 'done' } }),
+    ].join('\n') + '\n', 'utf8');
+
+    await withIsolatedDatabase(async () => {
+      sessionsDb.createAppSession('app-exec-1', 'codex', workspacePath);
+      sessionsDb.assignProviderSessionId('app-exec-1', providerSessionId);
+      await new CodexSessionSynchronizer().synchronize();
+
+      const history = await new CodexSessionsProvider().fetchHistory('app-exec-1');
+      const toolUses = history.messages.filter((message) => message.kind === 'tool_use');
+      const toolResults = history.messages.filter((message) => message.kind === 'tool_result');
+
+      assert.equal(toolUses.length, 1);
+      assert.equal(toolUses[0].toolName, 'Bash');
+      assert.equal(toolUses[0].toolInput, JSON.stringify({ command: 'echo one\necho two' }));
+      assert.equal(toolResults.some((message) => message.toolCallId === 'plan-1'), false);
+    });
+  } finally {
+    restoreHomeDir();
+    await rm(tempRoot, { recursive: true, force: true });
+  }
+});

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' },
+  ]);
+});