diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md
index 8065c94b..5d3edca7 100644
--- a/.claude/CLAUDE.md
+++ b/.claude/CLAUDE.md
@@ -26,7 +26,7 @@ Available CLI endpoints are dynamically defined by the config file:
   ```
   Bash({ command: "ccw cli -p '...' --tool gemini", run_in_background: true })
   ```
-- **After CLI call**: Stop immediately - let CLI execute in background, do NOT poll with TaskOutput
+- **After CLI call**: If no other tasks, stop immediately - let CLI execute in background, do NOT poll with TaskOutput
 
 ## Code Diagnostics
 
diff --git a/ccw/src/commands/cli.ts b/ccw/src/commands/cli.ts
index fb57dcf0..9fbed256 100644
--- a/ccw/src/commands/cli.ts
+++ b/ccw/src/commands/cli.ts
@@ -702,6 +702,9 @@ async function execAction(positionalPrompt: string | undefined, options: CliExec
         console.log(chalk.gray(`  Total: ${result.conversation.turn_count} turns, ${(result.conversation.total_duration_ms / 1000).toFixed(1)}s`));
       }
       console.log(chalk.dim(`  Continue: ccw cli -p "..." --resume ${result.execution.id}`));
+      if (!stream) {
+        console.log(chalk.dim(`  Output (optional): ccw cli output ${result.execution.id}`));
+      }
 
       // Notify dashboard: execution completed
       notifyDashboard({