create-claude-workspace 1.1.17 → 1.1.19

package/dist/template/.claude/scripts/autonomous.mjs

@@ -233,43 +233,96 @@ process.on('SIGTERM', () => {
 
 // ─── Stream event display ───
 
+/** Track last displayed text to avoid re-printing full content on partial message updates */
+let lastAssistantText = '';
+
 function formatStreamEvent(event) {
-  // Handle stream_event wrapper (from --include-partial-messages)
-  if (event.type === 'stream_event') {
-    const inner = event.event ?? event;
-    const delta = inner.delta;
-    if (delta?.type === 'text_delta' && delta.text) {
-      return delta.text; // raw text fragment for streaming display
-    }
-    return null;
+  const type = event.type;
+
+  // System init — silent (session_id extracted elsewhere)
+  if (type === 'system') return null;
+
+  // Ping — silent
+  if (type === 'ping') return null;
+
+  // Rate limit event
+  if (type === 'rate_limit_event') {
+    const info = event.rate_limit_info ?? event;
+    const resets = info.resets_at ?? info.retry_after ?? '';
+    return `${C.yellow}⏳ Rate limited${resets ? ` (resets: ${resets})` : ''}${C.reset}\n`;
+  }
+
+  // Error event
+  if (type === 'error') {
+    const msg = event.error?.message ?? event.message ?? JSON.stringify(event);
+    return `${C.red}✗ Error: ${msg}${C.reset}\n`;
   }
 
-  // Assistant message
-  if (event.type === 'assistant') {
+  // Assistant message — content is always an array of content blocks
+  if (type === 'assistant') {
     const msg = event.message;
     if (!msg) return null;
-    if (msg.type === 'tool_use' || msg.tool) {
-      const name = msg.name ?? msg.tool ?? 'tool';
-      const input = msg.input ?? {};
-      const detail = input.command ?? input.file_path ?? input.pattern ?? input.query ?? '';
-      const short = typeof detail === 'string' ? detail.slice(0, 120) : '';
-      return `${C.cyan}▶ ${name}${C.reset}${short ? ` ${C.dim}${short}${C.reset}` : ''}\n`;
+    const content = msg.content;
+
+    // Content blocks array (the standard format)
+    if (Array.isArray(content)) {
+      const parts = [];
+      for (const block of content) {
+        if (block.type === 'tool_use') {
+          const input = block.input ?? {};
+          const detail = input.command ?? input.file_path ?? input.pattern ?? input.query ?? '';
+          const short = typeof detail === 'string' ? detail.slice(0, 120) : '';
+          parts.push(`${C.cyan}▶ ${block.name ?? 'tool'}${C.reset}${short ? ` ${C.dim}${short}${C.reset}` : ''}`);
+        } else if (block.type === 'text' && block.text) {
+          // With --include-partial-messages, we get the full accumulated text each time.
+          // Only print the NEW portion to avoid re-printing everything.
+          let text = block.text;
+          if (text.startsWith(lastAssistantText) && lastAssistantText.length > 0) {
+            text = text.slice(lastAssistantText.length);
+          }
+          if (text) {
+            lastAssistantText = block.text;
+            parts.push(text);
+          }
+        } else if (block.type === 'thinking' && block.thinking) {
+          // Thinking blocks — show abbreviated
+          const preview = block.thinking.slice(0, 200).replace(/\n/g, ' ');
+          parts.push(`${C.dim}💭 ${preview}${preview.length < block.thinking.length ? '...' : ''}${C.reset}`);
+        }
+      }
+      if (parts.length) return parts.join('\n') + '\n';
+      return null;
     }
-    if (typeof msg.content === 'string' && msg.content) {
-      return `${C.bold}${msg.content}${C.reset}\n`;
+
+    // Fallback: string content (shouldn't happen with stream-json, but just in case)
+    if (typeof content === 'string' && content) {
+      return `${content}\n`;
     }
     return null;
   }
 
-  // Tool result
-  if (event.type === 'result' && event.subtype === 'tool_result') {
-    const isErr = event.is_error;
-    const icon = isErr ? `${C.red}✗` : `${C.green}✓`;
-    const content = typeof event.content === 'string' ? event.content : '';
-    const preview = content.slice(0, 150).replace(/\n/g, ' ');
-    return `${icon} ${C.dim}${preview}${C.reset}\n`;
+  // User message — contains tool results
+  if (type === 'user') {
+    // Reset text tracking on new turn
+    lastAssistantText = '';
+    const content = event.message?.content;
+    if (!Array.isArray(content)) return null;
+    for (const block of content) {
+      if (block.type === 'tool_result') {
+        const isErr = block.is_error;
+        const icon = isErr ? `${C.red}✗` : `${C.green}✓`;
+        const text = typeof block.content === 'string' ? block.content : '';
+        const preview = text.slice(0, 150).replace(/\n/g, ' ');
+        return `${icon} ${C.dim}${preview}${C.reset}\n`;
+      }
+    }
+    return null;
   }
 
+  // Final result — silent (parsed separately for structured output)
+  if (type === 'result') return null;
+
+  // Unknown event type — show for debugging
   return null;
 }
 
@@ -286,6 +339,7 @@ function runClaude(projectDir, opts, { resumeSessionId = null, resumePrompt = nu
     baseFlags.push('-p');
     baseFlags.push('--output-format', 'stream-json');
     baseFlags.push('--verbose');
+    baseFlags.push('--include-partial-messages');
     baseFlags.push('--max-turns', String(opts.maxTurns));
     baseFlags.push('--json-schema', RESULT_SCHEMA);
 
@@ -351,6 +405,9 @@ function runClaude(projectDir, opts, { resumeSessionId = null, resumePrompt = nu
           }
 
           // Rate limit detection from stream events
+          if (event.type === 'rate_limit_event') {
+            isRateLimit = true;
+          }
           if (event.type === 'error') {
             const msg = (event.error?.message ?? event.message ?? '').toLowerCase();
             if (msg.includes('rate limit') || msg.includes('rate_limit') || msg.includes('overloaded')) {
@@ -360,7 +417,9 @@ function runClaude(projectDir, opts, { resumeSessionId = null, resumePrompt = nu
 
           // Display formatted event
           const formatted = formatStreamEvent(event);
-          if (formatted) process.stdout.write(formatted);
+          if (formatted) {
+            process.stdout.write(formatted);
+          }
         } catch {
           // Non-JSON line — display as-is
           process.stdout.write(line + '\n');

package/dist/template/.claude/scripts/docker-run.mjs

@@ -66,16 +66,23 @@ function toDockerPath(p) {
  * Does NOT use shell: true — on Windows, cmd.exe splits arguments after
  * '-c' into separate words, breaking 'bash -c "node ..."' commands.
  * Without shell, Node.js passes each array element as a distinct argv entry.
+ *
+ * cwd is set to DOCKER_DIR so Docker Compose finds docker-compose.yml
+ * in its default location. Volume/build paths in the compose file are
+ * resolved relative to the compose file's directory, not cwd.
  */
 function compose(args, opts = {}) {
-  const composeFile = join(DOCKER_DIR, 'docker-compose.yml');
-  const files = ['-f', composeFile];
-  if (existsSync(AUTH_COMPOSE)) files.push('-f', AUTH_COMPOSE);
-  return spawnSync('docker', ['compose', ...files, ...args], {
-    cwd: PROJECT_DIR,
+  const files = [];
+  if (existsSync(AUTH_COMPOSE)) files.push('-f', 'docker-compose.yml', '-f', AUTH_COMPOSE);
+  const result = spawnSync('docker', ['compose', ...files, ...args], {
+    cwd: DOCKER_DIR,
     stdio: opts.capture ? 'pipe' : 'inherit',
     env: { ...process.env },
   });
+  if (!opts.capture && result.status !== 0 && result.status !== null) {
+    error(`docker compose ${args[0]} failed (exit code ${result.status})`);
+  }
+  return result;
 }
 
 function cleanup() {
@@ -247,7 +254,11 @@ info('Docker is ready.');
 
 // 2. Build
 step('2/4 Building container image...');
-compose(opts.rebuild ? ['build', '--no-cache'] : ['build', '-q']);
+const buildResult = compose(opts.rebuild ? ['build', '--no-cache'] : ['build', '-q']);
+if (buildResult.status !== 0) {
+  error('Docker image build failed. Fix the errors above and re-run.');
+  process.exit(1);
+}
 info('Image built.');
 
 // 3. Auth

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-claude-workspace",
-  "version": "1.1.17",
+  "version": "1.1.19",
   "description": "Scaffold a project with Claude Code agents for autonomous AI-driven development",
   "type": "module",
   "bin": {