nightytidy 0.2.7 → 0.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nightytidy",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "Automated overnight codebase improvement through Claude Code",
   "license": "MIT",
   "author": "Dorian Spitz",

package/src/agent/cli-bridge.js

@@ -76,7 +76,7 @@ export class CliBridge {
   }
 
   _run(args, onOutput, opts = {}) {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
       const binPath = path.resolve(import.meta.dirname, '../../bin/nightytidy.js');
       const proc = spawn('node', [binPath, ...args], {
         cwd: this.projectDir,
@@ -87,15 +87,40 @@ export class CliBridge {
       let stdout = '';
       let stderr = '';
       let killed = false;
+      let settled = false;
+
+      const settle = (result) => {
+        if (settled) return;
+        settled = true;
+        if (timer) clearTimeout(timer);
+        if (killTimer) clearTimeout(killTimer);
+        resolve(result);
+      };
 
       // Timeout — kill the process if it takes too long
       let timer = null;
+      let killTimer = null;
       if (opts.timeout) {
         timer = setTimeout(() => {
           killed = true;
           const timeoutSec = Math.round(opts.timeout / 1000);
           warn(`CLI process timed out after ${timeoutSec}s: ${args.join(' ')}`);
           this.kill();
+          // On Windows, taskkill is fire-and-forget — the 'close' event may
+          // never fire. Force-resolve after 5s to prevent the agent from
+          // hanging forever.
+          killTimer = setTimeout(() => {
+            warn(`CLI process did not exit within 5s after kill — force-resolving`);
+            this.activeProcess = null;
+            settle({
+              success: false,
+              exitCode: -1,
+              stdout,
+              stderr: `Process timed out after ${timeoutSec}s — Claude Code may be unavailable`,
+              parsed: CliBridge.parseOutput(stdout),
+              timedOut: true,
+            });
+          }, 5000);
         }, opts.timeout);
       }
 
@@ -127,26 +152,23 @@ export class CliBridge {
       });
 
       proc.on('close', (code) => {
-        if (timer) clearTimeout(timer);
         this.activeProcess = null;
-        const parsed = CliBridge.parseOutput(stdout);
-        resolve({
+        settle({
           success: code === 0 && !killed,
           exitCode: code,
           stdout,
           stderr: killed
             ? `Process timed out after ${Math.round(opts.timeout / 1000)}s — Claude Code may be unavailable`
             : stderr,
-          parsed,
+          parsed: CliBridge.parseOutput(stdout),
           timedOut: killed,
         });
       });
 
       proc.on('error', (err) => {
-        if (timer) clearTimeout(timer);
         this.activeProcess = null;
         logError(`CLI process error: ${err.message}`);
-        resolve({
+        settle({
           success: false,
           exitCode: -1,
           stdout,

package/src/agent/index.js

@@ -372,6 +372,7 @@ export async function startAgent() {
           run: { id: interrupted.id },
         }, []);
         reply({ type: 'interrupted-discarded', runId: interrupted.id });
+        if (!runQueue.getCurrent()) processQueue();
         break;
       }
 
@@ -717,7 +718,8 @@ export async function startAgent() {
 
     stopHeartbeat();
     info(`  Finishing run (report + merge)...`);
-    await bridge.finishRun();
+    const finishResult = await bridge.finishRun();
+    const reportMarkdown = finishResult?.parsed?.reportContent || null;
     projectManager.updateProject(run.projectId, { lastRunAt: Date.now() });
 
     const elapsedMs = Date.now() - run.startedAt;
@@ -733,6 +735,7 @@ export async function startAgent() {
       project: project.name,
       projectId: project.id,
       run: { id: run.id, totalSteps, completedSteps: run.steps.length, elapsedMs: Date.now() - run.startedAt },
+      reportMarkdown,
     }, project.webhooks);
 
     activeBridge = null;
@@ -927,7 +930,8 @@ export async function startAgent() {
     // Finish the run
     stopHeartbeat();
     info(`  Finishing resumed run (report + merge)...`);
-    await bridge.finishRun();
+    const finishResult = await bridge.finishRun();
+    const reportMarkdown = finishResult?.parsed?.reportContent || null;
     projectManager.updateProject(interrupted.projectId, { lastRunAt: Date.now() });
 
     wsServer.broadcast({ type: 'run-completed', runId: interrupted.id, results: {} });
@@ -936,6 +940,7 @@ export async function startAgent() {
     dispatchWithQueue('run_completed', {
       project: project.name, projectId: project.id,
       run: { id: interrupted.id, totalSteps: interrupted.steps.length, completedSteps: runProgress.completedCount, elapsedMs: Date.now() - interrupted.startedAt },
+      reportMarkdown,
     }, project.webhooks);
 
     activeBridge = null;
@@ -956,11 +961,13 @@ export async function startAgent() {
     interrupted.status = 'running';
     runQueue._save();
 
+    let finishResult = null;
     try {
-      await bridge.finishRun();
+      finishResult = await bridge.finishRun();
     } catch (err) {
       warn(`  finishRun failed: ${err.message}`);
     }
+    const reportMarkdown = finishResult?.parsed?.reportContent || null;
 
     projectManager.updateProject(interrupted.projectId, { lastRunAt: Date.now() });
     wsServer.broadcast({ type: 'run-completed', runId: interrupted.id, status: 'completed', results: {} });
@@ -969,6 +976,7 @@ export async function startAgent() {
     dispatchWithQueue('run_completed', {
       project: project.name, projectId: project.id,
       run: { id: interrupted.id, totalSteps: interrupted.steps.length, completedSteps: interrupted.lastProgress?.completedCount || 0, elapsedMs: Date.now() - interrupted.startedAt },
+      reportMarkdown,
     }, project.webhooks);
 
     activeBridge = null;
@@ -1099,6 +1107,15 @@ export async function startAgent() {
     runQueue.markInterrupted({ completedCount: 0, failedCount: 0, totalCost: 0, stepList: [], currentStepNum: null });
   }
 
+  // Process any queued runs left from a previous session
+  if (!runQueue.getInterrupted() && !runQueue.getCurrent()) {
+    const pending = runQueue.getQueue();
+    if (pending.length > 0) {
+      info(`Found ${pending.length} queued run(s) — starting queue processing`);
+      processQueue();
+    }
+  }
+
   // Print startup info
   console.log(`\nNightyTidy Agent v${AGENT_VERSION}`);
   console.log(`WebSocket: ws://127.0.0.1:${actualPort}`);