claude-code-workflow 6.3.2 → 6.3.5

package/ccw/src/core/routes/cli-routes.ts

@@ -769,9 +769,9 @@ export async function handleCliRoutes(ctx: RouteContext): Promise<boolean> {
   if (pathname === '/api/cli/code-index-mcp' && req.method === 'PUT') {
     handlePostRequest(req, res, async (body: unknown) => {
       try {
-        const { provider } = body as { provider: 'codexlens' | 'ace' };
-        if (!provider || !['codexlens', 'ace'].includes(provider)) {
-          return { error: 'Invalid provider. Must be "codexlens" or "ace"', status: 400 };
+        const { provider } = body as { provider: 'codexlens' | 'ace' | 'none' };
+        if (!provider || !['codexlens', 'ace', 'none'].includes(provider)) {
+          return { error: 'Invalid provider. Must be "codexlens", "ace", or "none"', status: 400 };
         }
 
         const result = updateCodeIndexMcp(initialPath, provider);

package/ccw/src/templates/dashboard-js/components/cli-history.js

@@ -15,7 +15,9 @@ async function loadCliHistory(options = {}) {
     const { limit = cliHistoryLimit, tool = cliHistoryFilter, status = null } = options;
 
     // Use history-native endpoint to get native session info
-    let url = `/api/cli/history-native?path=${encodeURIComponent(projectPath)}&limit=${limit}`;
+    // Use recursiveQueryEnabled setting (from cli-status.js) to control recursive query
+    const recursive = typeof recursiveQueryEnabled !== 'undefined' ? recursiveQueryEnabled : true;
+    let url = `/api/cli/history-native?path=${encodeURIComponent(projectPath)}&limit=${limit}&recursive=${recursive}`;
     if (tool) url += `&tool=${tool}`;
     if (status) url += `&status=${status}`;
     if (cliHistorySearch) url += `&search=${encodeURIComponent(cliHistorySearch)}`;
@@ -36,9 +38,12 @@ async function loadCliHistory(options = {}) {
 async function loadNativeSessionContent(executionId, sourceDir) {
   try {
     // If sourceDir provided, use it to build the correct path
-    const basePath = sourceDir && sourceDir !== '.'
-      ? projectPath + '/' + sourceDir
-      : projectPath;
+    // Check if sourceDir is absolute path (contains : or starts with /)
+    let basePath = projectPath;
+    if (sourceDir && sourceDir !== '.') {
+      const isAbsolute = sourceDir.includes(':') || sourceDir.startsWith('/');
+      basePath = isAbsolute ? sourceDir : projectPath + '/' + sourceDir;
+    }
     const url = `/api/cli/native-session?path=${encodeURIComponent(basePath)}&id=${encodeURIComponent(executionId)}`;
     const response = await fetch(url);
     if (!response.ok) return null;
@@ -65,9 +70,12 @@ async function loadEnrichedConversation(executionId) {
 async function loadExecutionDetail(executionId, sourceDir) {
   try {
     // If sourceDir provided, use it to build the correct path
-    const basePath = sourceDir && sourceDir !== '.' 
-      ? projectPath + '/' + sourceDir 
-      : projectPath;
+    // Check if sourceDir is absolute path (contains : or starts with /)
+    let basePath = projectPath;
+    if (sourceDir && sourceDir !== '.') {
+      const isAbsolute = sourceDir.includes(':') || sourceDir.startsWith('/');
+      basePath = isAbsolute ? sourceDir : projectPath + '/' + sourceDir;
+    }
     const url = `/api/cli/execution?path=${encodeURIComponent(basePath)}&id=${encodeURIComponent(executionId)}`;
     const response = await fetch(url);
     if (!response.ok) throw new Error('Execution not found');
@@ -137,8 +145,9 @@ function renderCliHistory() {
              </span>`
           : '';
 
-        // Escape sourceDir for use in onclick
-        const sourceDirEscaped = exec.sourceDir ? exec.sourceDir.replace(/'/g, "\\'") : '';
+        // Normalize and escape sourceDir for use in onclick
+        // Convert backslashes to forward slashes to prevent JS escape issues in onclick
+        const sourceDirEscaped = exec.sourceDir ? exec.sourceDir.replace(/\\/g, '/').replace(/'/g, "\\'") : '';
 
         return `
           <div class="cli-history-item ${hasNative ? 'has-native' : ''}">
@@ -155,11 +164,14 @@ function renderCliHistory() {
               <div class="cli-history-meta">
                 <span><i data-lucide="clock" class="w-3 h-3"></i> ${timeAgo}</span>
                 <span><i data-lucide="timer" class="w-3 h-3"></i> ${duration}</span>
-                <span><i data-lucide="hash" class="w-3 h-3"></i> ${exec.id.split('-')[0]}</span>
+                <span title="${exec.id}"><i data-lucide="hash" class="w-3 h-3"></i> ${exec.id.substring(0, 13)}...${exec.id.split('-').pop()}</span>
                 ${turnBadge}
               </div>
             </div>
             <div class="cli-history-actions">
+              <button class="btn-icon" onclick="event.stopPropagation(); copyCliExecutionId('${exec.id}')" title="Copy ID">
+                <i data-lucide="copy" class="w-3.5 h-3.5"></i>
+              </button>
               ${hasNative ? `
                 <button class="btn-icon" onclick="event.stopPropagation(); showNativeSessionDetail('${exec.id}', '${sourceDirEscaped}')" title="View Native Session">
                   <i data-lucide="file-json" class="w-3.5 h-3.5"></i>
@@ -431,9 +443,12 @@ function confirmDeleteExecution(executionId, sourceDir) {
 async function deleteExecution(executionId, sourceDir) {
   try {
     // Build correct path - use sourceDir if provided for recursive items
-    const basePath = sourceDir && sourceDir !== '.' 
-      ? projectPath + '/' + sourceDir 
-      : projectPath;
+    // Check if sourceDir is absolute path (contains : or starts with /)
+    let basePath = projectPath;
+    if (sourceDir && sourceDir !== '.') {
+      const isAbsolute = sourceDir.includes(':') || sourceDir.startsWith('/');
+      basePath = isAbsolute ? sourceDir : projectPath + '/' + sourceDir;
+    }
     
     const response = await fetch(`/api/cli/execution?path=${encodeURIComponent(basePath)}&id=${encodeURIComponent(executionId)}`, {
       method: 'DELETE'
@@ -461,6 +476,18 @@ async function deleteExecution(executionId, sourceDir) {
 }
 
 // ========== Copy Functions ==========
+async function copyCliExecutionId(executionId) {
+  if (navigator.clipboard) {
+    try {
+      await navigator.clipboard.writeText(executionId);
+      showRefreshToast('ID copied: ' + executionId, 'success');
+    } catch (err) {
+      console.error('Failed to copy ID:', err);
+      showRefreshToast('Failed to copy ID', 'error');
+    }
+  }
+}
+
 async function copyExecutionPrompt(executionId) {
   const detail = await loadExecutionDetail(executionId);
   if (!detail) {

package/ccw/src/templates/dashboard-js/components/cli-status.js

@@ -21,9 +21,24 @@ let nativeResumeEnabled = localStorage.getItem('ccw-native-resume') !== 'false';
 // Recursive Query settings (for hierarchical storage aggregation)
 let recursiveQueryEnabled = localStorage.getItem('ccw-recursive-query') !== 'false'; // default true
 
-// Code Index MCP provider (codexlens or ace)
+// Code Index MCP provider (codexlens, ace, or none)
 let codeIndexMcpProvider = 'codexlens';
 
+// ========== Helper Functions ==========
+/**
+ * Get the context-tools filename based on provider
+ */
+function getContextToolsFileName(provider) {
+  switch (provider) {
+    case 'ace':
+      return 'context-tools-ace.md';
+    case 'none':
+      return 'context-tools-none.md';
+    default:
+      return 'context-tools.md';
+  }
+}
+
 // ========== Initialization ==========
 function initCliStatus() {
   // Load all statuses in one call using aggregated endpoint
@@ -637,9 +652,17 @@ function renderCliStatus() {
                       onclick="setCodeIndexMcpProvider('ace')">
                 ACE
               </button>
+              <button class="code-mcp-btn px-3 py-1.5 text-xs font-medium rounded-md transition-all ${codeIndexMcpProvider === 'none' ? 'bg-primary text-primary-foreground shadow-sm' : 'text-muted-foreground hover:text-foreground'}"
+                      onclick="setCodeIndexMcpProvider('none')">
+                None
+              </button>
             </div>
           </div>
           <p class="cli-setting-desc">Code search provider (updates CLAUDE.md context-tools reference)</p>
+          <p class="cli-setting-desc text-xs text-muted-foreground mt-1">
+            <i data-lucide="file-text" class="w-3 h-3 inline-block mr-1"></i>
+            Current: <code class="bg-muted px-1 rounded">${getContextToolsFileName(codeIndexMcpProvider)}</code>
+          </p>
         </div>
       </div>
     </div>
@@ -775,7 +798,8 @@ async function setCodeIndexMcpProvider(provider) {
       if (window.claudeCliToolsConfig && window.claudeCliToolsConfig.settings) {
         window.claudeCliToolsConfig.settings.codeIndexMcp = provider;
       }
-      showRefreshToast(`Code Index MCP switched to ${provider === 'ace' ? 'ACE (Augment)' : 'CodexLens'}`, 'success');
+      const providerName = provider === 'ace' ? 'ACE (Augment)' : provider === 'none' ? 'None (Built-in only)' : 'CodexLens';
+      showRefreshToast(`Code Index MCP switched to ${providerName}`, 'success');
       // Re-render both CLI status and settings section
       if (typeof renderCliStatus === 'function') renderCliStatus();
       if (typeof renderCliSettingsSection === 'function') renderCliSettingsSection();

package/ccw/src/templates/dashboard-js/views/cli-manager.js

@@ -996,9 +996,14 @@ function renderCliSettingsSection() {
           '<select class="cli-setting-select" onchange="setCodeIndexMcpProvider(this.value)">' +
             '<option value="codexlens"' + (codeIndexMcpProvider === 'codexlens' ? ' selected' : '') + '>CodexLens</option>' +
             '<option value="ace"' + (codeIndexMcpProvider === 'ace' ? ' selected' : '') + '>ACE (Augment)</option>' +
+            '<option value="none"' + (codeIndexMcpProvider === 'none' ? ' selected' : '') + '>None (Built-in)</option>' +
           '</select>' +
         '</div>' +
         '<p class="cli-setting-desc">' + t('cli.codeIndexMcpDesc') + '</p>' +
+        '<p class="cli-setting-desc text-xs text-muted-foreground">' +
+          '<i data-lucide="file-text" class="w-3 h-3 inline-block mr-1"></i>' +
+          'Current: <code class="bg-muted px-1 rounded">' + getContextToolsFileName(codeIndexMcpProvider) + '</code>' +
+        '</p>' +
       '</div>' +
     '</div>';
 

package/ccw/src/templates/dashboard-js/views/history.js

@@ -69,8 +69,10 @@ async function renderCliHistoryView() {
           '</div>'
         : '';
 
+      // Normalize sourceDir: convert backslashes to forward slashes for safe onclick handling
+      var normalizedSourceDir = (exec.sourceDir || '').replace(/\\/g, '/');
       historyHtml += '<div class="history-item' + (isSelected ? ' history-item-selected' : '') + '" ' +
-        'onclick="' + (isMultiSelectMode ? 'toggleExecutionSelection(\'' + exec.id + '\')' : 'showExecutionDetail(\'' + exec.id + (exec.sourceDir ? '\',\'' + escapeHtml(exec.sourceDir) : '') + '\')') + '">' +
+        'onclick="' + (isMultiSelectMode ? 'toggleExecutionSelection(\'' + exec.id + '\')' : 'showExecutionDetail(\'' + exec.id + '\', \'' + normalizedSourceDir.replace(/'/g, "\\'") + '\')') + '">' +
         checkboxHtml +
         '<div class="history-item-main">' +
           '<div class="history-item-header">' +
@@ -87,14 +89,17 @@ async function renderCliHistoryView() {
           '<div class="history-item-meta">' +
             '<span class="history-time"><i data-lucide="clock" class="w-3 h-3"></i> ' + timeAgo + '</span>' +
             '<span class="history-duration"><i data-lucide="timer" class="w-3 h-3"></i> ' + duration + '</span>' +
-            '<span class="history-id"><i data-lucide="hash" class="w-3 h-3"></i> ' + exec.id.split('-')[0] + '</span>' +
+            '<span class="history-id" title="' + exec.id + '"><i data-lucide="hash" class="w-3 h-3"></i> ' + exec.id.substring(0, 13) + '...' + exec.id.split('-').pop() + '</span>' +
           '</div>' +
         '</div>' +
         '<div class="history-item-actions">' +
-          '<button class="btn-icon" onclick="event.stopPropagation(); showExecutionDetail(\'' + exec.id + '\')" title="View Details">' +
+          '<button class="btn-icon" onclick="event.stopPropagation(); copyExecutionId(\'' + exec.id + '\')" title="Copy ID">' +
+            '<i data-lucide="copy" class="w-4 h-4"></i>' +
+          '</button>' +
+          '<button class="btn-icon" onclick="event.stopPropagation(); showExecutionDetail(\'' + exec.id + '\', \'' + normalizedSourceDir.replace(/'/g, "\\'") + '\')" title="View Details">' +
             '<i data-lucide="eye" class="w-4 h-4"></i>' +
           '</button>' +
-          '<button class="btn-icon btn-danger" onclick="event.stopPropagation(); confirmDeleteExecution(\'' + exec.id + (exec.sourceDir ? '\',\'' + escapeHtml(exec.sourceDir) : '') + '\')" title="Delete">' +
+          '<button class="btn-icon btn-danger" onclick="event.stopPropagation(); confirmDeleteExecution(\'' + exec.id + '\', \'' + normalizedSourceDir.replace(/'/g, "\\'") + '\')" title="Delete">' +
             '<i data-lucide="trash-2" class="w-4 h-4"></i>' +
           '</button>' +
         '</div>' +
@@ -179,6 +184,16 @@ async function renderCliHistoryView() {
 }
 
 // ========== Actions ==========
+async function copyExecutionId(executionId) {
+  try {
+    await navigator.clipboard.writeText(executionId);
+    showRefreshToast('ID copied: ' + executionId, 'success');
+  } catch (err) {
+    console.error('Failed to copy ID:', err);
+    showRefreshToast('Failed to copy ID', 'error');
+  }
+}
+
 async function filterCliHistoryView(tool) {
   cliHistoryFilter = tool || null;
   await loadCliHistory();

package/ccw/src/tools/claude-cli-tools.ts

@@ -42,7 +42,7 @@ export interface ClaudeCliToolsConfig {
     nativeResume: boolean;
     recursiveQuery: boolean;
     cache: ClaudeCacheSettings;
-    codeIndexMcp: 'codexlens' | 'ace';  // Code Index MCP provider
+    codeIndexMcp: 'codexlens' | 'ace' | 'none';  // Code Index MCP provider
   };
 }
 
@@ -308,7 +308,7 @@ export function getClaudeCliToolsInfo(projectDir: string): {
  */
 export function updateCodeIndexMcp(
   projectDir: string,
-  provider: 'codexlens' | 'ace'
+  provider: 'codexlens' | 'ace' | 'none'
 ): { success: boolean; error?: string; config?: ClaudeCliToolsConfig } {
   try {
     // Update config
@@ -319,21 +319,28 @@ export function updateCodeIndexMcp(
     // Only update global CLAUDE.md (consistent with Chinese response / Windows platform)
     const globalClaudeMdPath = path.join(os.homedir(), '.claude', 'CLAUDE.md');
 
+    // Define patterns for all formats
+    const codexlensPattern = /@~\/\.claude\/workflows\/context-tools\.md/g;
+    const acePattern = /@~\/\.claude\/workflows\/context-tools-ace\.md/g;
+    const nonePattern = /@~\/\.claude\/workflows\/context-tools-none\.md/g;
+
+    // Determine target file based on provider
+    const targetFile = provider === 'ace'
+      ? '@~/.claude/workflows/context-tools-ace.md'
+      : provider === 'none'
+        ? '@~/.claude/workflows/context-tools-none.md'
+        : '@~/.claude/workflows/context-tools.md';
+
     if (!fs.existsSync(globalClaudeMdPath)) {
       // If global CLAUDE.md doesn't exist, check project-level
       const projectClaudeMdPath = path.join(projectDir, '.claude', 'CLAUDE.md');
       if (fs.existsSync(projectClaudeMdPath)) {
         let content = fs.readFileSync(projectClaudeMdPath, 'utf-8');
 
-        // Define patterns for both formats
-        const codexlensPattern = /@~\/\.claude\/workflows\/context-tools\.md/g;
-        const acePattern = /@~\/\.claude\/workflows\/context-tools-ace\.md/g;
-
-        if (provider === 'ace') {
-          content = content.replace(codexlensPattern, '@~/.claude/workflows/context-tools-ace.md');
-        } else {
-          content = content.replace(acePattern, '@~/.claude/workflows/context-tools.md');
-        }
+        // Replace any existing pattern with the target
+        content = content.replace(codexlensPattern, targetFile);
+        content = content.replace(acePattern, targetFile);
+        content = content.replace(nonePattern, targetFile);
 
         fs.writeFileSync(projectClaudeMdPath, content, 'utf-8');
         console.log(`[claude-cli-tools] Updated project CLAUDE.md to use ${provider} (no global CLAUDE.md found)`);
@@ -342,14 +349,10 @@ export function updateCodeIndexMcp(
       // Update global CLAUDE.md (primary target)
       let content = fs.readFileSync(globalClaudeMdPath, 'utf-8');
 
-      const codexlensPattern = /@~\/\.claude\/workflows\/context-tools\.md/g;
-      const acePattern = /@~\/\.claude\/workflows\/context-tools-ace\.md/g;
-
-      if (provider === 'ace') {
-        content = content.replace(codexlensPattern, '@~/.claude/workflows/context-tools-ace.md');
-      } else {
-        content = content.replace(acePattern, '@~/.claude/workflows/context-tools.md');
-      }
+      // Replace any existing pattern with the target
+      content = content.replace(codexlensPattern, targetFile);
+      content = content.replace(acePattern, targetFile);
+      content = content.replace(nonePattern, targetFile);
 
       fs.writeFileSync(globalClaudeMdPath, content, 'utf-8');
       console.log(`[claude-cli-tools] Updated global CLAUDE.md to use ${provider}`);
@@ -365,7 +368,21 @@ export function updateCodeIndexMcp(
 /**
  * Get current Code Index MCP provider
  */
-export function getCodeIndexMcp(projectDir: string): 'codexlens' | 'ace' {
+export function getCodeIndexMcp(projectDir: string): 'codexlens' | 'ace' | 'none' {
   const config = loadClaudeCliTools(projectDir);
   return config.settings.codeIndexMcp || 'codexlens';
 }
+
+/**
+ * Get the context-tools file path based on provider
+ */
+export function getContextToolsPath(provider: 'codexlens' | 'ace' | 'none'): string {
+  switch (provider) {
+    case 'ace':
+      return 'context-tools-ace.md';
+    case 'none':
+      return 'context-tools-none.md';
+    default:
+      return 'context-tools.md';
+  }
+}

package/ccw/src/tools/cli-executor.ts

@@ -73,6 +73,7 @@ const ParamsSchema = z.object({
   noNative: z.boolean().optional(), // Force prompt concatenation instead of native resume
   category: z.enum(['user', 'internal', 'insight']).default('user'), // Execution category for tracking
   parentExecutionId: z.string().optional(), // Parent execution ID for fork/retry scenarios
+  stream: z.boolean().default(false), // false = cache full output (default), true = stream output via callback
 });
 
 // Execution category types
@@ -863,24 +864,36 @@ async function executeCliTool(
       const endTime = Date.now();
       const duration = endTime - startTime;
 
-      // Determine status
+      // Determine status - prioritize output content over exit code
       let status: 'success' | 'error' | 'timeout' = 'success';
       if (timedOut) {
         status = 'timeout';
       } else if (code !== 0) {
-        // Check if HTTP 429 but results exist (Gemini quirk)
-        if (stderr.includes('429') && stdout.trim()) {
+        // Non-zero exit code doesn't always mean failure
+        // Check if there's valid output (AI response) - treat as success
+        const hasValidOutput = stdout.trim().length > 0;
+        const hasFatalError = stderr.includes('FATAL') ||
+                              stderr.includes('Authentication failed') ||
+                              stderr.includes('API key') ||
+                              stderr.includes('rate limit exceeded');
+
+        if (hasValidOutput && !hasFatalError) {
+          // Has output and no fatal errors - treat as success despite exit code
           status = 'success';
         } else {
           status = 'error';
         }
       }
 
-      // Create new turn
+      // Create new turn - cache full output when not streaming (default)
+      const shouldCache = !parsed.data.stream;
       const newTurnOutput = {
-        stdout: stdout.substring(0, 10240), // Truncate to 10KB
-        stderr: stderr.substring(0, 2048),  // Truncate to 2KB
-        truncated: stdout.length > 10240 || stderr.length > 2048
+        stdout: stdout.substring(0, 10240), // Truncate preview to 10KB
+        stderr: stderr.substring(0, 2048),  // Truncate preview to 2KB
+        truncated: stdout.length > 10240 || stderr.length > 2048,
+        cached: shouldCache,
+        stdout_full: shouldCache ? stdout : undefined,
+        stderr_full: shouldCache ? stderr : undefined
       };
 
       // Determine base turn number for merge scenarios

package/ccw/src/tools/cli-history-store.ts

@@ -23,6 +23,9 @@ export interface ConversationTurn {
     stdout: string;
     stderr: string;
     truncated: boolean;
+    cached?: boolean;
+    stdout_full?: string;
+    stderr_full?: string;
   };
 }
 
@@ -315,6 +318,28 @@ export class CliHistoryStore {
       } catch (indexErr) {
         console.warn('[CLI History] Turns timestamp index creation warning:', (indexErr as Error).message);
       }
+
+      // Add cached output columns to turns table for non-streaming mode
+      const turnsInfo = this.db.prepare('PRAGMA table_info(turns)').all() as Array<{ name: string }>;
+      const hasCached = turnsInfo.some(col => col.name === 'cached');
+      const hasStdoutFull = turnsInfo.some(col => col.name === 'stdout_full');
+      const hasStderrFull = turnsInfo.some(col => col.name === 'stderr_full');
+
+      if (!hasCached) {
+        console.log('[CLI History] Migrating database: adding cached column to turns table...');
+        this.db.exec('ALTER TABLE turns ADD COLUMN cached INTEGER DEFAULT 0;');
+        console.log('[CLI History] Migration complete: cached column added');
+      }
+      if (!hasStdoutFull) {
+        console.log('[CLI History] Migrating database: adding stdout_full column to turns table...');
+        this.db.exec('ALTER TABLE turns ADD COLUMN stdout_full TEXT;');
+        console.log('[CLI History] Migration complete: stdout_full column added');
+      }
+      if (!hasStderrFull) {
+        console.log('[CLI History] Migrating database: adding stderr_full column to turns table...');
+        this.db.exec('ALTER TABLE turns ADD COLUMN stderr_full TEXT;');
+        console.log('[CLI History] Migration complete: stderr_full column added');
+      }
     } catch (err) {
       console.error('[CLI History] Migration error:', (err as Error).message);
       // Don't throw - allow the store to continue working with existing schema
@@ -421,8 +446,8 @@ export class CliHistoryStore {
     `);
 
     const upsertTurn = this.db.prepare(`
-      INSERT INTO turns (conversation_id, turn_number, timestamp, prompt, duration_ms, status, exit_code, stdout, stderr, truncated)
-      VALUES (@conversation_id, @turn_number, @timestamp, @prompt, @duration_ms, @status, @exit_code, @stdout, @stderr, @truncated)
+      INSERT INTO turns (conversation_id, turn_number, timestamp, prompt, duration_ms, status, exit_code, stdout, stderr, truncated, cached, stdout_full, stderr_full)
+      VALUES (@conversation_id, @turn_number, @timestamp, @prompt, @duration_ms, @status, @exit_code, @stdout, @stderr, @truncated, @cached, @stdout_full, @stderr_full)
       ON CONFLICT(conversation_id, turn_number) DO UPDATE SET
         timestamp = @timestamp,
         prompt = @prompt,
@@ -431,7 +456,10 @@ export class CliHistoryStore {
         exit_code = @exit_code,
         stdout = @stdout,
         stderr = @stderr,
-        truncated = @truncated
+        truncated = @truncated,
+        cached = @cached,
+        stdout_full = @stdout_full,
+        stderr_full = @stderr_full
     `);
 
     const transaction = this.db.transaction(() => {
@@ -463,7 +491,10 @@ export class CliHistoryStore {
           exit_code: turn.exit_code,
           stdout: turn.output.stdout,
           stderr: turn.output.stderr,
-          truncated: turn.output.truncated ? 1 : 0
+          truncated: turn.output.truncated ? 1 : 0,
+          cached: turn.output.cached ? 1 : 0,
+          stdout_full: turn.output.stdout_full || null,
+          stderr_full: turn.output.stderr_full || null
         });
       }
     });
@@ -507,7 +538,10 @@ export class CliHistoryStore {
         output: {
           stdout: t.stdout || '',
           stderr: t.stderr || '',
-          truncated: !!t.truncated
+          truncated: !!t.truncated,
+          cached: !!t.cached,
+          stdout_full: t.stdout_full || undefined,
+          stderr_full: t.stderr_full || undefined
         }
       }))
     };
@@ -533,6 +567,92 @@ export class CliHistoryStore {
     };
   }
 
+  /**
+   * Get paginated cached output for a conversation turn
+   * @param conversationId - Conversation ID
+   * @param turnNumber - Turn number (default: latest turn)
+   * @param options - Pagination options
+   */
+  getCachedOutput(
+    conversationId: string,
+    turnNumber?: number,
+    options: {
+      offset?: number;      // Character offset (default: 0)
+      limit?: number;       // Max characters to return (default: 10000)
+      outputType?: 'stdout' | 'stderr' | 'both';  // Which output to fetch
+    } = {}
+  ): {
+    conversationId: string;
+    turnNumber: number;
+    stdout?: { content: string; totalBytes: number; offset: number; hasMore: boolean };
+    stderr?: { content: string; totalBytes: number; offset: number; hasMore: boolean };
+    cached: boolean;
+    prompt: string;
+    status: string;
+    timestamp: string;
+  } | null {
+    const { offset = 0, limit = 10000, outputType = 'both' } = options;
+
+    // Get turn (latest if not specified)
+    let turn;
+    if (turnNumber !== undefined) {
+      turn = this.db.prepare(`
+        SELECT * FROM turns WHERE conversation_id = ? AND turn_number = ?
+      `).get(conversationId, turnNumber) as any;
+    } else {
+      turn = this.db.prepare(`
+        SELECT * FROM turns WHERE conversation_id = ? ORDER BY turn_number DESC LIMIT 1
+      `).get(conversationId) as any;
+    }
+
+    if (!turn) return null;
+
+    const result: {
+      conversationId: string;
+      turnNumber: number;
+      stdout?: { content: string; totalBytes: number; offset: number; hasMore: boolean };
+      stderr?: { content: string; totalBytes: number; offset: number; hasMore: boolean };
+      cached: boolean;
+      prompt: string;
+      status: string;
+      timestamp: string;
+    } = {
+      conversationId,
+      turnNumber: turn.turn_number,
+      cached: !!turn.cached,
+      prompt: turn.prompt,
+      status: turn.status,
+      timestamp: turn.timestamp
+    };
+
+    // Use full output if cached, otherwise use truncated
+    if (outputType === 'stdout' || outputType === 'both') {
+      const fullStdout = turn.cached ? (turn.stdout_full || '') : (turn.stdout || '');
+      const totalBytes = fullStdout.length;
+      const content = fullStdout.substring(offset, offset + limit);
+      result.stdout = {
+        content,
+        totalBytes,
+        offset,
+        hasMore: offset + limit < totalBytes
+      };
+    }
+
+    if (outputType === 'stderr' || outputType === 'both') {
+      const fullStderr = turn.cached ? (turn.stderr_full || '') : (turn.stderr || '');
+      const totalBytes = fullStderr.length;
+      const content = fullStderr.substring(offset, offset + limit);
+      result.stderr = {
+        content,
+        totalBytes,
+        offset,
+        hasMore: offset + limit < totalBytes
+      };
+    }
+
+    return result;
+  }
+
   /**
    * Query execution history
    */