rafcode 3.2.1 → 3.8.0

package/tests/unit/codex-stream-renderer.test.ts

@@ -0,0 +1,127 @@
+import { renderCodexStreamEvent } from '../../src/parsers/codex-stream-renderer.js';
+
+describe('renderCodexStreamEvent', () => {
+  describe('item.completed with item.type: error (NEW-1)', () => {
+    it('renders an error line from item.completed error event', () => {
+      const line = JSON.stringify({
+        type: 'item.completed',
+        item: { type: 'error', message: 'model not found: gpt-bad' },
+      });
+      const result = renderCodexStreamEvent(line);
+      expect(result.display).toContain('✗ Error: model not found: gpt-bad');
+      expect(result.textContent).toBe('model not found: gpt-bad');
+    });
+
+    it('uses fallback text when item.message is absent', () => {
+      const line = JSON.stringify({
+        type: 'item.completed',
+        item: { type: 'error' },
+      });
+      const result = renderCodexStreamEvent(line);
+      expect(result.display).toContain('✗ Error: Unknown error');
+    });
+  });
+
+  describe('turn.failed with nested error.message (NEW-2)', () => {
+    it('surfaces nested error.message instead of generic fallback', () => {
+      const line = JSON.stringify({
+        type: 'turn.failed',
+        error: { message: 'rate limit exceeded' },
+      });
+      const result = renderCodexStreamEvent(line);
+      expect(result.display).toContain('✗ Failed: rate limit exceeded');
+      expect(result.textContent).toBe('rate limit exceeded');
+    });
+
+    it('falls back to event.message when error object is absent', () => {
+      const line = JSON.stringify({
+        type: 'turn.failed',
+        message: 'context length exceeded',
+      });
+      const result = renderCodexStreamEvent(line);
+      expect(result.display).toContain('✗ Failed: context length exceeded');
+    });
+
+    it('falls back to generic text when neither error.message nor message is present', () => {
+      const line = JSON.stringify({ type: 'turn.failed' });
+      const result = renderCodexStreamEvent(line);
+      expect(result.display).toContain('✗ Failed: Turn failed');
+    });
+  });
+
+  describe('existing event types remain unchanged', () => {
+    it('renders item.completed agent_message', () => {
+      const line = JSON.stringify({
+        type: 'item.completed',
+        item: { type: 'agent_message', text: 'Done.' },
+      });
+      const result = renderCodexStreamEvent(line);
+      expect(result.display).toBe('Done.\n');
+      expect(result.textContent).toBe('Done.');
+    });
+
+    it('renders item.completed command_execution', () => {
+      const line = JSON.stringify({
+        type: 'item.completed',
+        item: { type: 'command_execution', command: 'npm test', exit_code: 0 },
+      });
+      const result = renderCodexStreamEvent(line);
+      expect(result.display).toContain('Running: npm test');
+      expect(result.display).toContain('[✓]');
+    });
+
+    it('renders top-level error event', () => {
+      const line = JSON.stringify({ type: 'error', message: 'fatal error' });
+      const result = renderCodexStreamEvent(line);
+      expect(result.display).toContain('✗ Error: fatal error');
+    });
+  });
+
+  describe('turn.completed usage extraction', () => {
+    it('captures input and output tokens as usageData', () => {
+      const line = JSON.stringify({
+        type: 'turn.completed',
+        model: 'gpt-5.4',
+        usage: {
+          input_tokens: 1234,
+          output_tokens: 567,
+        },
+      });
+
+      const result = renderCodexStreamEvent(line);
+
+      expect(result.display).toBe('  → Usage: in: 1234, out: 567\n');
+      expect(result.usageData).toEqual({
+        inputTokens: 1234,
+        outputTokens: 567,
+        cacheReadInputTokens: 0,
+        cacheCreationInputTokens: 0,
+        modelUsage: {
+          'gpt-5.4': {
+            inputTokens: 1234,
+            outputTokens: 567,
+            cacheReadInputTokens: 0,
+            cacheCreationInputTokens: 0,
+            costUsd: null,
+          },
+        },
+        totalCostUsd: null,
+      });
+    });
+
+    it('keeps Codex cost unavailable when no exact cost field is present', () => {
+      const line = JSON.stringify({
+        type: 'turn.completed',
+        usage: {
+          input_tokens: 99,
+          output_tokens: 1,
+        },
+      });
+
+      const result = renderCodexStreamEvent(line);
+
+      expect(result.usageData?.totalCostUsd).toBeNull();
+      expect(result.usageData?.modelUsage.codex?.costUsd).toBeNull();
+    });
+  });
+});

package/tests/unit/command-output.test.ts

@@ -8,9 +8,13 @@ import {
   formatProjectHeader,
   formatSummary,
   formatProgressBar,
+  formatTaskTokenSummary,
+  formatTokenTotalSummary,
   TaskStatus,
 } from '../../src/utils/terminal-symbols.js';
 import { logger } from '../../src/utils/logger.js';
+import type { UsageData } from '../../src/types/config.js';
+import type { CostBreakdown, TaskUsageEntry } from '../../src/utils/token-tracker.js';
 
 /**
  * Integration tests verifying that do/status commands produce expected output format.
@@ -69,6 +73,13 @@ describe('Command Output Integration', () => {
         expect(consoleLogSpy).toHaveBeenCalledWith('✓ setup-db 2m 3s');
       });
 
+      it('should show canonical model labels in task status output', () => {
+        const output = formatTaskProgress(1, 3, 'running', 'auth-login', 45000, '001', 'gpt-5.4');
+        logger.info(output);
+
+        expect(consoleLogSpy).toHaveBeenCalledWith('● 001-auth-login (gpt-5.4) 45s');
+      });
+
       it('should show failed task with elapsed time', () => {
         const output = formatTaskProgress(3, 3, 'failed', 'deploy', 300000);
         logger.info(output);
@@ -76,6 +87,13 @@ describe('Command Output Integration', () => {
         expect(consoleLogSpy).toHaveBeenCalledWith('✗ deploy 5m 0s');
       });
 
+      it('should show model metadata in the existing compact model slot', () => {
+        const output = formatTaskProgress(1, 3, 'running', 'auth-login', 45000, '01', 'sonnet', { effort: 'low', fast: true });
+        logger.info(output);
+
+        expect(consoleLogSpy).toHaveBeenCalledWith('● 01-auth-login (sonnet, low, fast) 45s');
+      });
+
       it('should show pending task with fraction', () => {
         const output = formatTaskProgress(2, 5, 'pending', 'cleanup');
         logger.info(output);
@@ -126,6 +144,45 @@ describe('Command Output Integration', () => {
 
         expect(consoleLogSpy).toHaveBeenCalledWith('○ no tasks');
       });
+
+      it('should log Codex task token summaries without a fake cost', () => {
+        const usage: UsageData = {
+          inputTokens: 1234,
+          outputTokens: 567,
+          cacheReadInputTokens: 0,
+          cacheCreationInputTokens: 0,
+          modelUsage: {},
+          totalCostUsd: null,
+        };
+        const entry: TaskUsageEntry = {
+          taskId: '01',
+          usage,
+          cost: { totalCost: null },
+          attempts: [usage],
+        };
+
+        logger.dim(formatTaskTokenSummary(entry));
+
+        expect(consoleLogSpy).toHaveBeenCalledWith('  Tokens: 1,234 in / 567 out');
+      });
+
+      it('should log Claude total summaries with exact cost when available', () => {
+        const usage: UsageData = {
+          inputTokens: 5000,
+          outputTokens: 900,
+          cacheReadInputTokens: 0,
+          cacheCreationInputTokens: 0,
+          modelUsage: {},
+          totalCostUsd: 0.42,
+        };
+        const cost: CostBreakdown = { totalCost: 0.42 };
+
+        logger.dim(formatTokenTotalSummary(usage, cost));
+
+        expect(consoleLogSpy).toHaveBeenCalledWith(
+          expect.stringContaining('Total cost: $0.42')
+        );
+      });
     });
 
     describe('multi-project summary', () => {

package/tests/unit/commit-planning-artifacts-worktree.test.ts

@@ -1,8 +1,17 @@
+import { jest } from '@jest/globals';
 import { execSync } from 'node:child_process';
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
 
+const suiteHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'raf-commit-wt-home-'));
+let mockHomeDir = suiteHomeDir;
+
+jest.unstable_mockModule('node:os', () => ({
+  homedir: () => mockHomeDir,
+  tmpdir: () => os.tmpdir(),
+}));
+
 /**
  * Integration tests for commitPlanningArtifacts in worktree scenarios.
  * Uses real git repos and worktrees to verify the commit behavior.
@@ -10,6 +19,7 @@ import * as path from 'node:path';
 
 // Import the actual module (no mocking)
 const { commitPlanningArtifacts } = await import('../../src/core/git.js');
+const { resetConfigCache } = await import('../../src/utils/config.js');
 
 /**
  * Helper: create a temp directory for testing.
@@ -56,11 +66,14 @@ describe('commitPlanningArtifacts - worktree integration', () => {
   const worktreePaths: string[] = [];
 
   beforeEach(() => {
+    fs.rmSync(path.join(mockHomeDir, '.raf'), { recursive: true, force: true });
+    resetConfigCache();
     repoDir = makeTempDir('raf-commit-wt-');
     initGitRepo(repoDir);
   });
 
   afterEach(() => {
+    resetConfigCache();
     // Clean up worktrees first (before removing repo)
     for (const wt of worktreePaths) {
       try {
@@ -79,6 +92,10 @@ describe('commitPlanningArtifacts - worktree integration', () => {
     }
   });
 
+  afterAll(() => {
+    fs.rmSync(suiteHomeDir, { recursive: true, force: true });
+  });
+
   function createInitialProject(dir: string, projectFolder: string): string {
     const projectPath = path.join(dir, 'RAF', projectFolder);
     fs.mkdirSync(path.join(projectPath, 'plans'), { recursive: true });
@@ -128,7 +145,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
 
     // Verify commit was made
     const lastMsg = getLastCommitMessage(worktreePath);
-    expect(lastMsg).toMatch(/RAF\[1\] Plan: my-project/);
+    expect(lastMsg).toMatch(/RAF\[my-project\] Plan: /);
 
     // Verify both files are in the commit
     const committedFiles = getLastCommitFiles(worktreePath);
@@ -170,7 +187,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
 
     // Verify commit was made with Amend prefix
     const lastMsg = getLastCommitMessage(worktreePath);
-    expect(lastMsg).toMatch(/RAF\[1\] Amend: my-project/);
+    expect(lastMsg).toMatch(/RAF\[my-project\] Amend: /);
 
     // Verify only input.md and decisions.md are in the commit (not plan files)
     const committedFiles = getLastCommitFiles(worktreePath);
@@ -214,7 +231,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
 
     // Verify commit was made with Amend prefix
     const lastMsg = getLastCommitMessage(worktreePath);
-    expect(lastMsg).toMatch(/RAF\[1\] Amend: my-project/);
+    expect(lastMsg).toMatch(/RAF\[my-project\] Amend: /);
 
     // Verify all files are in the commit (input, decisions, AND plan files)
     const committedFiles = getLastCommitFiles(worktreePath);
@@ -282,7 +299,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
 
     // Verify commit was made
     const lastMsg = getLastCommitMessage(recreatedWtPath);
-    expect(lastMsg).toMatch(/RAF\[1\] Amend: my-project/);
+    expect(lastMsg).toMatch(/RAF\[my-project\] Amend: /);
 
     // Verify only input.md and decisions.md are in the commit (not plan files)
     const committedFiles = getLastCommitFiles(recreatedWtPath);
@@ -351,7 +368,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
 
     // Verify commit was made
     const lastMsg = getLastCommitMessage(recreatedWtPath);
-    expect(lastMsg).toMatch(/RAF\[1\] Amend: my-project/);
+    expect(lastMsg).toMatch(/RAF\[my-project\] Amend: /);
 
     // Verify all files are in the commit (including plan files)
     const committedFiles = getLastCommitFiles(recreatedWtPath);
@@ -384,7 +401,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
 
     // Verify commit was made
     const lastMsg = getLastCommitMessage(worktreePath);
-    expect(lastMsg).toMatch(/RAF\[1\] Plan: my-project/);
+    expect(lastMsg).toMatch(/RAF\[my-project\] Plan: /);
 
     // Only input.md should be in the commit (decisions.md unchanged)
     const committedFiles = getLastCommitFiles(worktreePath);
@@ -423,7 +440,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
 
     // Verify commit
     const lastMsg = getLastCommitMessage(repoDir);
-    expect(lastMsg).toMatch(/RAF\[1\] Plan: my-project/);
+    expect(lastMsg).toMatch(/RAF\[my-project\] Plan: /);
 
     const committedFiles = getLastCommitFiles(repoDir);
     expect(committedFiles).toContain(`RAF/${projectFolder}/input.md`);

package/tests/unit/commit-planning-artifacts.test.ts

@@ -1,4 +1,15 @@
 import { jest } from '@jest/globals';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
+
+const suiteHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'raf-commit-home-'));
+let mockHomeDir = suiteHomeDir;
+
+jest.unstable_mockModule('node:os', () => ({
+  homedir: () => mockHomeDir,
+  tmpdir: () => os.tmpdir(),
+}));
 
 // Mock execSync before importing the module
 const mockExecSync = jest.fn();
@@ -18,10 +29,21 @@ jest.unstable_mockModule('../../src/utils/logger.js', () => ({
 
 // Import after mocking
 const { commitPlanningArtifacts } = await import('../../src/core/git.js');
+const { resetConfigCache } = await import('../../src/utils/config.js');
 
 describe('commitPlanningArtifacts', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    fs.rmSync(path.join(mockHomeDir, '.raf'), { recursive: true, force: true });
+    resetConfigCache();
+  });
+
+  afterEach(() => {
+    resetConfigCache();
+  });
+
+  afterAll(() => {
+    fs.rmSync(suiteHomeDir, { recursive: true, force: true });
   });
 
   it('should commit input.md and decisions.md with correct message format', async () => {
@@ -53,9 +75,9 @@ describe('commitPlanningArtifacts', () => {
     expect(addCmds.some((cmd) => cmd.includes('input.md'))).toBe(true);
     expect(addCmds.some((cmd) => cmd.includes('decisions.md'))).toBe(true);
 
-    // Verify commit message format
+    // Verify commit message format: RAF[project-name] Plan: description
     expect(mockExecSync).toHaveBeenCalledWith(
-      expect.stringMatching(/git commit -m "RAF\[3\] Plan: decision-vault"/),
+      expect.stringMatching(/git commit -m "RAF\[decision-vault\] Plan: /),
       expect.any(Object)
     );
   });
@@ -78,7 +100,7 @@ describe('commitPlanningArtifacts', () => {
     await commitPlanningArtifacts('/Users/test/RAF/12-my-feature');
 
     expect(mockExecSync).toHaveBeenCalledWith(
-      expect.stringMatching(/git commit -m "RAF\[12\] Plan: my-feature"/),
+      expect.stringMatching(/git commit -m "RAF\[my-feature\] Plan: /),
       expect.any(Object)
     );
   });
@@ -247,7 +269,7 @@ describe('commitPlanningArtifacts', () => {
     await commitPlanningArtifacts('/Users/test/RAF/3-decision-vault', { isAmend: true });
 
     expect(mockExecSync).toHaveBeenCalledWith(
-      expect.stringMatching(/git commit -m "RAF\[3\] Amend: decision-vault"/),
+      expect.stringMatching(/git commit -m "RAF\[decision-vault\] Amend: updated plans"/),
       expect.any(Object)
     );
   });