claude-code-workflow 6.3.18 → 6.3.20

package/ccw/src/cli.ts

@@ -83,6 +83,7 @@ export function run(argv: string[]): void {
     .description('Open workflow dashboard server with live path switching')
     .option('-p, --path <path>', 'Path to project directory', '.')
     .option('--port <port>', 'Server port', '3456')
+    .option('--host <host>', 'Server host to bind', '127.0.0.1')
     .option('--no-browser', 'Start server without opening browser')
     .action(viewCommand);
 
@@ -92,6 +93,7 @@ export function run(argv: string[]): void {
     .description('Alias for view command')
     .option('-p, --path <path>', 'Initial project directory')
     .option('--port <port>', 'Server port', '3456')
+    .option('--host <host>', 'Server host to bind', '127.0.0.1')
     .option('--no-browser', 'Start server without opening browser')
     .action(serveCommand);
 
@@ -175,7 +177,7 @@ export function run(argv: string[]): void {
     .option('--model <model>', 'Model override')
     .option('--cd <path>', 'Working directory')
     .option('--includeDirs <dirs>', 'Additional directories (--include-directories for gemini/qwen, --add-dir for codex/claude)')
-    .option('--timeout <ms>', 'Timeout in milliseconds', '300000')
+    .option('--timeout <ms>', 'Timeout in milliseconds (0=disabled, controlled by external caller)', '0')
     .option('--stream', 'Enable streaming output (default: non-streaming with caching)')
     .option('--limit <n>', 'History limit')
     .option('--status <status>', 'Filter by status')
@@ -288,6 +290,7 @@ export function run(argv: string[]): void {
     .option('--reason <text>', 'Failure reason')
     .option('--fail', 'Mark task as failed')
     .option('--from-queue [queue-id]', 'Sync issue statuses from queue (default: active queue)')
+    .option('--queue <queue-id>', 'Target queue ID for multi-queue operations')
     .action((subcommand, args, options) => issueCommand(subcommand, args, options));
 
   program.parse(argv);

package/ccw/src/commands/cli.ts

@@ -5,6 +5,9 @@
 
 import chalk from 'chalk';
 import http from 'http';
+import inquirer from 'inquirer';
+import type { CliOutputUnit } from '../tools/cli-output-converter.js';
+import { SmartContentFormatter } from '../tools/cli-output-converter.js';
 import {
   cliExecutorTool,
   getCliToolsStatus,
@@ -26,6 +29,7 @@ import {
   getStorageLocationInstructions
 } from '../tools/storage-manager.js';
 import { getHistoryStore } from '../tools/cli-history-store.js';
+import { createSpinner } from '../utils/ui.js';
 
 // Dashboard notification settings
 const DASHBOARD_PORT = process.env.CCW_PORT || 3456;
@@ -280,12 +284,17 @@ async function cleanStorage(options: StorageOptions): Promise<void> {
     }
 
     if (!force) {
-      console.log(chalk.bold.yellow('\n  Warning: This will delete ALL CCW storage:'));
-      console.log(`    Location:  ${stats.rootPath}`);
-      console.log(`    Projects:  ${stats.projectCount}`);
-      console.log(`    Size:      ${formatBytes(stats.totalSize)}`);
-      console.log(chalk.gray('\n  Use --force to confirm deletion.\n'));
-      return;
+      const { proceed } = await inquirer.prompt([{
+        type: 'confirm',
+        name: 'proceed',
+        message: `Delete ALL CCW storage? This will remove ${stats.projectCount} projects (${formatBytes(stats.totalSize)}). This action cannot be undone.`,
+        default: false
+      }]);
+
+      if (!proceed) {
+        console.log(chalk.yellow('\n  Storage clean cancelled.\n'));
+        return;
+      }
     }
 
     console.log(chalk.bold.cyan('\n  Cleaning all storage...\n'));
@@ -705,7 +714,6 @@ async function execAction(positionalPrompt: string | undefined, options: CliExec
   }
   const nativeMode = noNative ? ' (prompt-concat)' : '';
   const idInfo = id ? ` [${id}]` : '';
-  console.log(chalk.cyan(`\n  Executing ${tool} (${mode} mode${resumeInfo}${nativeMode})${idInfo}...\n`));
 
   // Show merge details
   if (isMerge) {
@@ -719,11 +727,32 @@ async function execAction(positionalPrompt: string | undefined, options: CliExec
   // Generate execution ID for streaming (use custom ID or timestamp-based)
   const executionId = id || `${Date.now()}-${tool}`;
   const startTime = Date.now();
+  const modelInfo = model ? ` @${model}` : '';
+  const spinnerBaseText = `Executing ${tool}${modelInfo} (${mode} mode${resumeInfo}${nativeMode})${idInfo}...`;
+  console.log();
+
+  const spinner = stream ? null : createSpinner(`  ${spinnerBaseText}`).start();
+  const elapsedInterval = spinner
+    ? setInterval(() => {
+      const elapsedSeconds = Math.floor((Date.now() - startTime) / 1000);
+      spinner.text = `  ${spinnerBaseText} (${elapsedSeconds}s elapsed)`;
+    }, 1000)
+    : null;
+  elapsedInterval?.unref?.();
+
+  if (!spinner) {
+    console.log(chalk.cyan(`  ${spinnerBaseText}\n`));
+  }
 
   // Handle process interruption (SIGINT/SIGTERM) to notify dashboard
   const handleInterrupt = (signal: string) => {
     const duration = Date.now() - startTime;
-    console.log(chalk.yellow(`\n  Interrupted by ${signal}`));
+    if (elapsedInterval) clearInterval(elapsedInterval);
+    if (spinner) {
+      spinner.warn(`Interrupted by ${signal} (${Math.floor(duration / 1000)}s elapsed)`);
+    } else {
+      console.log(chalk.yellow(`\n  Interrupted by ${signal}`));
+    }
 
     // Kill child process (gemini/codex/qwen CLI) if running
     killCurrentCliProcess();
@@ -761,20 +790,50 @@ async function execAction(positionalPrompt: string | undefined, options: CliExec
   });
 
   // Streaming output handler - broadcasts to dashboard AND writes to stdout
-  const onOutput = (chunk: any) => {
+  const onOutput = (unit: CliOutputUnit) => {
     // Always broadcast to dashboard for real-time viewing
     // Note: /api/hook wraps extraData into payload, so send fields directly
+    // Maintain backward compatibility with frontend expecting { chunkType, data }
+    // Use SmartContentFormatter for intelligent content formatting (never returns null)
+    const content = SmartContentFormatter.format(unit.content, unit.type);
     broadcastStreamEvent('CLI_OUTPUT', {
       executionId,
-      chunkType: chunk.type,
-      data: chunk.data
+      chunkType: unit.type,  // For backward compatibility
+      data: content,         // For backward compatibility (now formatted)
+      unit                   // New structured format
     });
+
     // Write to terminal only when --stream flag is passed
     if (stream) {
-      process.stdout.write(chunk.data);
+      switch (unit.type) {
+        case 'stdout':
+        case 'code':
+          process.stdout.write(typeof unit.content === 'string' ? unit.content : JSON.stringify(unit.content));
+          break;
+        case 'stderr':
+          process.stderr.write(typeof unit.content === 'string' ? unit.content : JSON.stringify(unit.content));
+          break;
+        case 'thought':
+          // Optional: display thinking process with different color
+          // For now, skip to reduce noise
+          break;
+        case 'progress':
+          // Optional: update progress bar
+          // For now, skip
+          break;
+        default:
+          // Other types: output content if available
+          if (unit.content) {
+            process.stdout.write(typeof unit.content === 'string' ? unit.content : '');
+          }
+      }
     }
   };
 
+  // Use JSON-lines parsing by default to enable type badges (thought, code, file_diff, etc.)
+  // All CLI tools may output structured JSON that can be parsed for richer UI
+  const outputFormat = 'json-lines';
+
   try {
     const result = await cliExecutorTool.execute({
       tool,
@@ -783,25 +842,45 @@ async function execAction(positionalPrompt: string | undefined, options: CliExec
       model,
       cd,
       includeDirs,
-      timeout: timeout ? parseInt(timeout, 10) : 300000,
+      timeout: timeout ? parseInt(timeout, 10) : 0, // 0 = no internal timeout, controlled by external caller
       resume,
       id, // custom execution ID
       noNative,
-      stream: !!stream // stream=true → streaming enabled (no cache), stream=false → cache output (default)
+      stream: !!stream, // stream=true → streaming enabled (no cache), stream=false → cache output (default)
+      outputFormat // Enable JSONL parsing for tools that support it
     }, onOutput); // Always pass onOutput for real-time dashboard streaming
 
+    if (elapsedInterval) clearInterval(elapsedInterval);
+    if (spinner) {
+      const durationSeconds = (result.execution.duration_ms / 1000).toFixed(1);
+      const turnInfo = result.success && result.conversation.turn_count > 1
+        ? ` (turn ${result.conversation.turn_count})`
+        : '';
+      if (result.success) {
+        spinner.succeed(`Completed in ${durationSeconds}s${turnInfo}`);
+      } else {
+        spinner.fail(`Failed after ${durationSeconds}s`);
+      }
+    }
+
     // If not streaming (default), print output now
-    if (!stream && result.stdout) {
-      console.log(result.stdout);
+    // Prefer parsedOutput (from stream parser) over raw stdout for better formatting
+    if (!stream) {
+      const output = result.parsedOutput || result.stdout;
+      if (output) {
+        console.log(output);
+      }
     }
 
     // Print summary with execution ID and turn info
     console.log();
     if (result.success) {
-      const turnInfo = result.conversation.turn_count > 1
-        ? ` (turn ${result.conversation.turn_count})`
-        : '';
-      console.log(chalk.green(`  ✓ Completed in ${(result.execution.duration_ms / 1000).toFixed(1)}s${turnInfo}`));
+      if (!spinner) {
+        const turnInfo = result.conversation.turn_count > 1
+          ? ` (turn ${result.conversation.turn_count})`
+          : '';
+        console.log(chalk.green(`  ✓ Completed in ${(result.execution.duration_ms / 1000).toFixed(1)}s${turnInfo}`));
+      }
       console.log(chalk.gray(`  ID: ${result.execution.id}`));
       if (isMerge && !id) {
         // Merge without custom ID: updated all source conversations
@@ -840,7 +919,9 @@ async function execAction(positionalPrompt: string | undefined, options: CliExec
       // Delay to allow HTTP request to complete
       setTimeout(() => process.exit(0), 150);
     } else {
-      console.log(chalk.red(`  ✗ Failed (${result.execution.status})`));
+      if (!spinner) {
+        console.log(chalk.red(`  ✗ Failed (${result.execution.status})`));
+      }
       console.log(chalk.gray(`  ID: ${result.execution.id}`));
       console.log(chalk.gray(`  Duration: ${(result.execution.duration_ms / 1000).toFixed(1)}s`));
       console.log(chalk.gray(`  Exit Code: ${result.execution.exit_code}`));
@@ -857,6 +938,8 @@ async function execAction(positionalPrompt: string | undefined, options: CliExec
         }
         if (stderrLines.length > 30) {
           console.log(chalk.yellow(`  ... ${stderrLines.length - 30} more lines`));
+          console.log(chalk.cyan(`  💡 View full output: ccw cli output ${result.execution.id}`));
+          console.log();
         }
         console.log(chalk.gray('  ' + '─'.repeat(60)));
       }
@@ -866,7 +949,6 @@ async function execAction(positionalPrompt: string | undefined, options: CliExec
       console.log(chalk.yellow.bold('  Troubleshooting:'));
       console.log(chalk.gray(`    • Check if ${tool} is properly installed: ccw cli status`));
       console.log(chalk.gray(`    • Enable debug mode: DEBUG=true ccw cli -p "..."  or  set DEBUG=true && ccw cli -p "..."`));
-      console.log(chalk.gray(`    • View full output: ccw cli output ${result.execution.id}`));
       if (result.stderr?.includes('API key') || result.stderr?.includes('Authentication')) {
         console.log(chalk.gray(`    • Check API key configuration for ${tool}`));
       }
@@ -897,6 +979,8 @@ async function execAction(positionalPrompt: string | undefined, options: CliExec
     }
   } catch (error) {
     const err = error as Error;
+    if (elapsedInterval) clearInterval(elapsedInterval);
+    if (spinner) spinner.fail('Execution error');
     console.error(chalk.red.bold(`\n  ✗ Execution Error\n`));
     console.error(chalk.red(`  ${err.message}`));
 
@@ -1117,8 +1201,8 @@ export async function cliCommand(
         console.log(chalk.bold.cyan('\n  CCW CLI Tool Executor\n'));
         console.log('  Unified interface for Gemini, Qwen, and Codex CLI tools.\n');
         console.log('  Usage:');
-        console.log(chalk.gray('    ccw cli -p "<prompt>" --tool <tool>     Execute with prompt'));
-        console.log(chalk.gray('    ccw cli -f prompt.txt --tool <tool>     Execute from file'));
+        console.log(chalk.gray('    ccw cli -f prompt.txt --tool <tool>     Execute from file (recommended for multi-line)'));
+        console.log(chalk.gray('    ccw cli -p "<prompt>" --tool <tool>     Execute with prompt (single-line)'));
         console.log();
         console.log('  Subcommands:');
         console.log(chalk.gray('    status              Check CLI tools availability'));
@@ -1129,8 +1213,8 @@ export async function cliCommand(
         console.log(chalk.gray('    test-parse [args]   Debug CLI argument parsing'));
         console.log();
         console.log('  Options:');
-        console.log(chalk.gray('    -p, --prompt <text> Prompt text'));
-        console.log(chalk.gray('    -f, --file <file>   Read prompt from file'));
+        console.log(chalk.gray('    -f, --file <file>   Read prompt from file (recommended for multi-line prompts)'));
+        console.log(chalk.gray('    -p, --prompt <text> Prompt text (single-line)'));
         console.log(chalk.gray('    --tool <tool>       Tool: gemini, qwen, codex (default: gemini)'));
         console.log(chalk.gray('    --mode <mode>       Mode: analysis, write, auto (default: analysis)'));
         console.log(chalk.gray('    -d, --debug         Enable debug logging for troubleshooting'));
@@ -1142,6 +1226,27 @@ export async function cliCommand(
         console.log(chalk.gray('    --cache <items>     Cache: comma-separated @patterns and text'));
         console.log(chalk.gray('    --inject-mode <m>   Inject mode: none, full, progressive'));
         console.log();
+        console.log('  Examples:');
+        console.log(chalk.gray('    ccw cli -f my-prompt.txt --tool gemini'));
+        console.log();
+        console.log(chalk.gray('    # Bash/Linux heredoc'));
+        console.log(chalk.gray("    ccw cli -f <(cat <<'EOF'"));
+        console.log(chalk.gray('    PURPOSE: Multi-line prompt'));
+        console.log(chalk.gray('    TASK: Example task'));
+        console.log(chalk.gray('    EOF'));
+        console.log(chalk.gray('    ) --tool gemini'));
+        console.log();
+        console.log(chalk.gray('    # PowerShell multi-line'));
+        console.log(chalk.gray("    @'"));
+        console.log(chalk.gray('    PURPOSE: Multi-line prompt'));
+        console.log(chalk.gray('    TASK: Example task'));
+        console.log(chalk.gray("    '@ | Out-File -Encoding utf8 prompt.tmp; ccw cli -f prompt.tmp --tool gemini"));
+        console.log();
+        console.log(chalk.gray('    ccw cli --resume --tool gemini'));
+        console.log(chalk.gray('    ccw cli -p "..." --cache "@src/**/*.ts" --tool codex'));
+        console.log(chalk.gray('    ccw cli -p "..." --cache "@src/**/*" --inject-mode progressive --tool gemini'));
+        console.log(chalk.gray('    ccw cli output <id> --final      # View result with usage hint'));
+        console.log();
         console.log('  Cache format:');
         console.log(chalk.gray('    --cache "@src/**/*.ts,@CLAUDE.md"     # @patterns to pack'));
         console.log(chalk.gray('    --cache "@src/**/*,extra context"     # patterns + text content'));
@@ -1158,14 +1263,7 @@ export async function cliCommand(
         console.log(chalk.gray('    --offset <n> Start from byte offset'));
         console.log(chalk.gray('    --limit <n>  Limit output bytes'));
         console.log();
-        console.log('  Examples:');
-        console.log(chalk.gray('    ccw cli -p "Analyze auth module" --tool gemini'));
-        console.log(chalk.gray('    ccw cli -f prompt.txt --tool codex --mode write'));
-        console.log(chalk.gray('    ccw cli -p "$(cat template.md)" --tool gemini'));
-        console.log(chalk.gray('    ccw cli --resume --tool gemini'));
-        console.log(chalk.gray('    ccw cli -p "..." --cache "@src/**/*.ts" --tool codex'));
-        console.log(chalk.gray('    ccw cli -p "..." --cache "@src/**/*" --inject-mode progressive --tool gemini'));
-        console.log(chalk.gray('    ccw cli output <id> --final      # View result with usage hint'));
+        console.log(chalk.dim('  Tip: For complex prompts, use --file to avoid shell escaping issues'));
         console.log();
       }
     }