create-claude-workspace 1.1.49 → 1.1.51

package/dist/scripts/autonomous.mjs

@@ -216,9 +216,10 @@ function setupSignals(opts, log, checkpoint) {
             finalCleanup(opts, checkpoint, log);
             process.exit(1);
         }
-        log.info(`${label}. Stopping after current iteration (Ctrl+C again to force)...`);
+        log.info(`${label}. Killing child process and stopping (Ctrl+C again to force exit)...`);
         stopping = true;
         stoppingRef.value = true;
+        currentChild?.kill();
     };
     process.on('SIGINT', () => gracefulStop('SIGINT'));
     process.on('SIGTERM', () => gracefulStop('SIGTERM'));

package/dist/scripts/docker-run.mjs

@@ -340,7 +340,7 @@ function main() {
         info('Autonomous mode — isolated in Docker, --skip-permissions is safe.');
         info('Press Ctrl+C to stop after current iteration.');
         console.log('');
-        compose(['run', '--rm', '-T', 'claude', '-c', `npx create-claude-workspace run ${escaped.join(' ')}`]);
+        compose(['run', '--rm', '-T', 'claude', '-c', `exec npx create-claude-workspace run ${escaped.join(' ')}`]);
     }
 }
 export { main as runDockerLoop, parseArgs, printHelp };

package/dist/scripts/lib/claude-runner.mjs

@@ -144,7 +144,7 @@ function parseStreamEvent(json) {
     }
 }
 // ─── Process tree kill (cross-platform) ───
-function killProcessTree(pid, isWin) {
+export function killProcessTree(pid, isWin) {
     if (isWin) {
         try {
             execSync(`taskkill /PID ${pid} /T /F`, { stdio: 'ignore' });

package/dist/scripts/lib/claude-runner.spec.js

@@ -1,5 +1,6 @@
 import { describe, it, expect, beforeEach } from 'vitest';
-import { resetStreamState, validateResult, formatStreamEvent } from './claude-runner.mjs';
+import { resetStreamState, validateResult, formatStreamEvent, killProcessTree } from './claude-runner.mjs';
+import { spawn, execSync } from 'node:child_process';
 describe('validateResult', () => {
     it('returns valid result for complete object', () => {
         const input = { status: 'completed', action: 'commit', message: 'Done task #1' };
@@ -236,3 +237,110 @@ describe('resetStreamState', () => {
         resetStreamState(); // should not throw
     });
 });
+// ─── killProcessTree integration tests ───
+// Verifies that Ctrl+C (killProcessTree) actually kills child processes.
+const isWin = process.platform === 'win32';
+function isProcessAlive(pid) {
+    try {
+        process.kill(pid, 0); // signal 0 = existence check
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function spawnLongRunning() {
+    const script = 'setTimeout(()=>{},60000)';
+    if (isWin) {
+        return spawn(process.env.ComSpec ?? 'cmd.exe', ['/c', 'node', '-e', script], {
+            stdio: 'ignore',
+            detached: true,
+            windowsHide: true,
+        });
+    }
+    return spawn('node', ['-e', script], {
+        stdio: 'ignore',
+        detached: true,
+    });
+}
+/** Spawn a nested process tree: parent node → child node (simulates cmd.exe → claude) */
+function spawnNestedTree() {
+    // Parent spawns a child that also sleeps — simulates cmd.exe → claude process tree
+    const innerScript = `
+    const { spawn } = require('child_process');
+    const child = spawn('node', ['-e', 'setTimeout(()=>{},60000)'], { stdio: 'ignore' });
+    child.unref();
+    setTimeout(()=>{},60000);
+  `.replace(/\n/g, ' ');
+    if (isWin) {
+        return spawn(process.env.ComSpec ?? 'cmd.exe', ['/c', 'node', '-e', innerScript], {
+            stdio: 'ignore',
+            detached: true,
+            windowsHide: true,
+        });
+    }
+    return spawn('node', ['-e', innerScript], {
+        stdio: 'ignore',
+        detached: true,
+    });
+}
+describe('killProcessTree', () => {
+    it('kills a simple child process', async () => {
+        const child = spawnLongRunning();
+        const pid = child.pid;
+        expect(pid).toBeGreaterThan(0);
+        // Give process time to start
+        await new Promise(r => setTimeout(r, 500));
+        expect(isProcessAlive(pid)).toBe(true);
+        // Kill it
+        killProcessTree(pid, isWin);
+        // Wait for process to die
+        await new Promise(r => setTimeout(r, isWin ? 2000 : 1000));
+        expect(isProcessAlive(pid)).toBe(false);
+    }, 10_000);
+    it('kills a nested process tree (simulates cmd.exe → claude)', async () => {
+        const parent = spawnNestedTree();
+        const parentPid = parent.pid;
+        expect(parentPid).toBeGreaterThan(0);
+        // Give tree time to start
+        await new Promise(r => setTimeout(r, 1500));
+        expect(isProcessAlive(parentPid)).toBe(true);
+        // Kill the tree
+        killProcessTree(parentPid, isWin);
+        // Wait for tree to die
+        await new Promise(r => setTimeout(r, isWin ? 3000 : 2000));
+        expect(isProcessAlive(parentPid)).toBe(false);
+        // On Windows, verify no orphan node.exe children from our tree
+        if (isWin) {
+            // tasklist can't reliably check by parent PID after parent is dead,
+            // but the /T flag in taskkill should have killed all children
+            try {
+                const taskInfo = execSync(`tasklist /FI "PID eq ${parentPid}" /NH`, {
+                    encoding: 'utf-8', stdio: 'pipe', timeout: 3000,
+                });
+                expect(taskInfo).not.toContain(String(parentPid));
+            }
+            catch { /* process dead, expected */ }
+        }
+    }, 15_000);
+    it('does not throw when killing already-dead process', () => {
+        // PID 999999 is almost certainly not a real process
+        expect(() => killProcessTree(999999, isWin)).not.toThrow();
+    });
+    it('kills process fast enough for interactive use (< 3s)', async () => {
+        const child = spawnLongRunning();
+        const pid = child.pid;
+        await new Promise(r => setTimeout(r, 500));
+        const start = Date.now();
+        killProcessTree(pid, isWin);
+        // Poll until dead or timeout
+        let alive = true;
+        while (alive && Date.now() - start < 3000) {
+            await new Promise(r => setTimeout(r, 100));
+            alive = isProcessAlive(pid);
+        }
+        const elapsed = Date.now() - start;
+        expect(alive).toBe(false);
+        expect(elapsed).toBeLessThan(3000);
+    }, 10_000);
+});

package/dist/template/.claude/docker/Dockerfile

@@ -6,14 +6,29 @@ RUN apt-get update && \
 
 
 # Non-root user — Claude Code refuses --dangerously-skip-permissions as root
-# Passwordless sudo for on-demand CLI installs (gh, glab) by agents
-RUN apt-get update && apt-get install -y --no-install-recommends sudo && \
+RUN apt-get update && apt-get install -y --no-install-recommends sudo gpg && \
     apt-get clean && rm -rf /var/lib/apt/lists/* && \
     useradd -m -s /bin/bash claude && \
     echo 'claude ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/claude && \
     mkdir -p /home/claude/.claude && \
     chown -R claude:claude /home/claude
 
+# Install gh (GitHub CLI) from official apt repo
+RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
+      | gpg --dearmor -o /usr/share/keyrings/githubcli-archive-keyring.gpg && \
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" \
+      > /etc/apt/sources.list.d/github-cli.list && \
+    apt-get update && apt-get install -y --no-install-recommends gh && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Install glab (GitLab CLI) — latest .deb from GitLab releases
+RUN GLAB_VER=$(curl -fsSL "https://gitlab.com/api/v4/projects/34675721/releases/permalink/latest" \
+      | node -pe 'JSON.parse(require("fs").readFileSync("/dev/stdin","utf8")).tag_name.slice(1)') && \
+    DEB_ARCH=$(dpkg --print-architecture) && \
+    curl -fsSL "https://gitlab.com/gitlab-org/cli/-/releases/v${GLAB_VER}/downloads/glab_${GLAB_VER}_linux_${DEB_ARCH}.deb" \
+      -o /tmp/glab.deb && \
+    dpkg -i /tmp/glab.deb && rm /tmp/glab.deb
+
 # Install Claude Code natively as the claude user
 RUN gosu claude bash -c 'curl -fsSL https://claude.ai/install.sh | bash'
 ENV PATH="/home/claude/.local/bin:$PATH"

package/dist/template/.claude/docker/docker-compose.yml

@@ -1,6 +1,8 @@
 services:
   claude:
     build: .
+    init: true
+    stop_grace_period: 30s
     stdin_open: true
     tty: true
     volumes:

package/dist/template/.claude/docker/docker-entrypoint.sh

@@ -36,6 +36,9 @@ if [[ -n "${GITLAB_TOKEN:-}" ]]; then
   git config --global credential.helper store
   echo "https://oauth2:${GITLAB_TOKEN}@gitlab.com" >> /home/claude/.git-credentials
   chown claude:claude /home/claude/.git-credentials
+  # Configure glab auth (glab reads GITLAB_TOKEN env var automatically,
+  # but explicit login ensures 'glab auth status' reports correctly)
+  gosu claude glab auth login --hostname gitlab.com --token "$GITLAB_TOKEN" 2>/dev/null || true
 fi
 
 # Auth pre-check — fail fast if no credentials available

package/package.json

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