chatroom-cli 1.77.1 → 1.77.2

package/dist/index.js

@@ -77610,9 +77610,6 @@ ${getUnresolvedDecisionsSectionBlock()}
 
 ## Notes
 <anything the user should know — context, caveats, or observations not covered above. Omit if none.>
-
-## Next steps
-<follow-up actions for the user or team. Omit if none.>
 \`\`\``;
 }
 var init_planner_to_user = __esm(() => {
@@ -77715,9 +77712,6 @@ ${getUnresolvedDecisionsSectionBlock()}
 
 ## Notes
 <anything the user should know — context, caveats, or observations not covered above. Omit if none.>
-
-## Next steps
-<follow-up actions for the user or team. Omit if none.>
 \`\`\``;
 }
 var init_solo_to_user = __esm(() => {
@@ -78896,7 +78890,9 @@ flowchart TD
 **Review loop:**
 - Review completed work before moving to the next slice.
 - Send back with specific feedback if requirements aren't met.
-- ${feedingNote}.`;
+- ${feedingNote}.
+
+**When enhancement is enabled:** See \`<handoff-enhancer>\` in task delivery — one check-in per delegation before builder.`;
 }
 function getDelegationGuidelinesSection(config3, options) {
   const feedingNote = config3.hasBuilder ? "Feed slices to the builder incrementally — one at a time, not all at once" : "When implementing yourself, tackle one layer at a time — avoid large monolithic changes";
@@ -78914,9 +78910,10 @@ function getDelegationGuidelinesSection(config3, options) {
 function buildHandoffRuleLines(config3) {
   return [
     config3.hasBuilder ? "- **To delegate implementation** → Hand off to `builder` with clear requirements" : "- **To implement** → Work on the chatroom task directly (you are acting as implementer)",
+    config3.hasBuilder ? "- **When enhancement is enabled** → See `<handoff-enhancer>` in task delivery before each builder delegation" : null,
     "- **To deliver to user** → Hand off to `user` with a complete, standalone summary\n  ⚠️ The user can ONLY see the handoff-to-user message — progress reports and all other messages are invisible to them. Write the handoff as a self-contained document: include all relevant context, results, and next steps without assuming the user read any prior conversation.",
     config3.hasBuilder ? "- **For rework** → Hand off back to `builder` with specific feedback on what needs to change" : "- **For rework** → Revise your implementation directly and re-validate"
-  ].join(`
+  ].filter((line) => line !== null).join(`
 `);
 }
 function getHandoffRulesSection(config3, nativeIntegration) {
@@ -103884,7 +103881,7 @@ var init_start_subscriptions2 = __esm(() => {
 });
 
 // src/commands/machine/daemon-start/enhancer/constants.ts
-var ENHANCER_AGENT_ROLE = "enhancer";
+var ENHANCER_AGENT_ROLE = "enhancer", ENHANCER_AGENT_END_GRACE_MS = 3000, ENHANCER_JOB_POLL_INTERVAL_MS = 500, ENHANCER_SILENCE_TIMEOUT_MS = 120000;
 
 // src/commands/machine/daemon-start/enhancer/enhancer-log.ts
 function formatEnhancerLogLine(message) {
@@ -103899,6 +103896,114 @@ function writeEnhancerLog(message) {
 }
 var ENHANCER_LOG_PREFIX = "[enhancer]";
 
+// src/commands/machine/daemon-start/enhancer/wait-for-enhancer-job.ts
+async function waitForEnhancerJobResolution(params) {
+  const { sessionId, chatroomId, jobId, backend: backend2, onFailure, onSalvageComplete } = params;
+  let outcome = null;
+  let lastActivityAt = Date.now();
+  let salvagedText = "";
+  const pollInterval = setInterval(async () => {
+    if (outcome)
+      return;
+    try {
+      const status3 = await backend2.query(api.web.enhancer.index.getJob, {
+        sessionId,
+        chatroomId,
+        jobId
+      });
+      if (status3?.status === "complete") {
+        outcome = "complete";
+        writeEnhancerLog(`completed job=${jobId}`);
+      }
+    } catch {}
+  }, ENHANCER_JOB_POLL_INTERVAL_MS);
+  const silenceInterval = setInterval(() => {
+    if (outcome)
+      return;
+    if (Date.now() - lastActivityAt >= ENHANCER_SILENCE_TIMEOUT_MS) {
+      outcome = "failed";
+      writeEnhancerLog(`silence timeout — no activity for ${ENHANCER_SILENCE_TIMEOUT_MS}ms`);
+      onFailure("Enhancer silence timeout — no output received", false);
+    }
+  }, ENHANCER_JOB_POLL_INTERVAL_MS);
+  params.onAssistantText?.((text) => {
+    lastActivityAt = Date.now();
+    salvagedText += text;
+  });
+  params.onAgentEnd?.(() => {
+    if (outcome)
+      return;
+    const check4 = () => {
+      if (outcome)
+        return;
+      backend2.query(api.web.enhancer.index.getJob, {
+        sessionId,
+        chatroomId,
+        jobId
+      }).then((status3) => {
+        if (outcome)
+          return;
+        if (status3?.status === "complete") {
+          outcome = "complete";
+          return;
+        }
+        if (status3?.status === "running") {
+          const trimmed = salvagedText.trim();
+          if (trimmed && onSalvageComplete) {
+            onSalvageComplete(trimmed).then(() => {
+              if (outcome)
+                return;
+              backend2.query(api.web.enhancer.index.getJob, {
+                sessionId,
+                chatroomId,
+                jobId
+              }).then((afterSalvage) => {
+                if (afterSalvage?.status === "complete") {
+                  outcome = "complete";
+                  writeEnhancerLog("agent_end: salvaged assistant text via complete");
+                  return;
+                }
+                outcome = "failed";
+                writeEnhancerLog("agent_end: turn ended without complete — failing terminal");
+                onFailure("Agent exited without completing enhancer job", true);
+              });
+            }).catch(() => {
+              outcome = "failed";
+              writeEnhancerLog("agent_end: turn ended without complete — failing terminal");
+              onFailure("Agent exited without completing enhancer job", true);
+            });
+          } else {
+            outcome = "failed";
+            writeEnhancerLog("agent_end: turn ended without complete — failing terminal");
+            onFailure("Agent exited without completing enhancer job", true);
+          }
+        }
+      });
+    };
+    setTimeout(check4, ENHANCER_AGENT_END_GRACE_MS);
+  });
+  params.onExit(() => {
+    if (outcome)
+      return;
+    outcome = "failed";
+    onFailure("Agent process exited without completing enhancer job", false);
+  });
+  await new Promise((resolve4) => {
+    const check4 = setInterval(() => {
+      if (outcome) {
+        clearInterval(check4);
+        resolve4();
+      }
+    }, 100);
+  });
+  clearInterval(pollInterval);
+  clearInterval(silenceInterval);
+  return outcome ?? "failed";
+}
+var init_wait_for_enhancer_job = __esm(() => {
+  init_api3();
+});
+
 // src/commands/machine/daemon-start/enhancer/job-subscriber.ts
 function startEnhancerJobSubscriber(sessionId, machineId, convexUrl, backend2, wsClient2, agentServices) {
   const inFlight = new Set;
@@ -103911,6 +104016,8 @@ function startEnhancerJobSubscriber(sessionId, machineId, convexUrl, backend2, w
         let claimed = false;
         let chatroomId = job.chatroomId;
         let jobId = job.jobId;
+        let spawnResult = null;
+        let service3 = null;
         try {
           const claim = await backend2.mutation(api.daemon.enhancer.index.claimForSpawn, {
             sessionId,
@@ -103928,7 +104035,7 @@ function startEnhancerJobSubscriber(sessionId, machineId, convexUrl, backend2, w
           chatroomId = payload.chatroomId;
           jobId = payload.jobId;
           writeEnhancerLog(`spawning harness=${payload.agentHarness} model=${payload.model} job=${payload.jobId}`);
-          const service3 = agentServices.get(payload.agentHarness);
+          service3 = agentServices.get(payload.agentHarness) ?? null;
           if (!service3) {
             await backend2.mutation(api.web.enhancer.index.recordAttemptFailure, {
               sessionId,
@@ -103938,7 +104045,7 @@ function startEnhancerJobSubscriber(sessionId, machineId, convexUrl, backend2, w
             });
             return;
           }
-          const spawnResult = await service3.spawn({
+          spawnResult = await service3.spawn({
             workingDir: payload.workingDir,
             prompt: createSpawnPrompt(payload.taskEnvelope),
             systemPrompt: payload.systemPrompt,
@@ -103953,29 +104060,34 @@ function startEnhancerJobSubscriber(sessionId, machineId, convexUrl, backend2, w
           spawnResult.onLogLine?.((line) => {
             writeEnhancerLog(line);
           });
-          spawnResult.onAssistantText?.((text) => {
-            if (text)
-              writeEnhancerLog(`text] ${text}`);
-          });
-          await new Promise((resolve4) => {
-            spawnResult.onExit(() => resolve4());
-          });
-          const status3 = await backend2.query(api.web.enhancer.index.getJob, {
+          const sr = spawnResult;
+          const outcome = await waitForEnhancerJobResolution({
             sessionId,
             chatroomId: payload.chatroomId,
-            jobId: payload.jobId
+            jobId: payload.jobId,
+            backend: backend2,
+            onAssistantText: sr.onAssistantText ? (cb) => sr.onAssistantText(cb) : undefined,
+            onAgentEnd: sr.onAgentEnd ? (cb) => sr.onAgentEnd(cb) : undefined,
+            onExit: (cb) => sr.onExit(() => cb()),
+            onSalvageComplete: async (content) => {
+              await backend2.mutation(api.web.enhancer.index.complete, {
+                sessionId,
+                chatroomId: payload.chatroomId,
+                jobId: payload.jobId,
+                enhancedContent: content
+              });
+            },
+            onFailure: async (error51, forceTerminal) => {
+              await backend2.mutation(api.web.enhancer.index.recordAttemptFailure, {
+                sessionId,
+                chatroomId: payload.chatroomId,
+                jobId: payload.jobId,
+                error: error51,
+                ...forceTerminal ? { forceTerminal: true } : {}
+              });
+            }
           });
-          if (status3?.status === "complete") {
-            writeEnhancerLog(`completed job=${payload.jobId}`);
-          }
-          if (status3?.status === "running") {
-            await backend2.mutation(api.web.enhancer.index.recordAttemptFailure, {
-              sessionId,
-              chatroomId: payload.chatroomId,
-              jobId: payload.jobId,
-              error: "Agent exited without completing enhancer job"
-            });
-          }
+          writeEnhancerLog(`completed job=${jobId}`);
         } catch (err) {
           writeEnhancerLog(`error: ${err instanceof Error ? err.message : String(err)}`);
           if (claimed) {
@@ -103988,6 +104100,11 @@ function startEnhancerJobSubscriber(sessionId, machineId, convexUrl, backend2, w
           }
         } finally {
           inFlight.delete(job.jobId);
+          if (spawnResult && service3) {
+            try {
+              await service3.stop(spawnResult.pid);
+            } catch {}
+          }
         }
       })();
     }
@@ -103995,6 +104112,7 @@ function startEnhancerJobSubscriber(sessionId, machineId, convexUrl, backend2, w
   return { stop: unsub };
 }
 var init_job_subscriber = __esm(() => {
+  init_wait_for_enhancer_job();
   init_api3();
 });
 
@@ -104112,11 +104230,11 @@ async function getWorkspacesForMachine(deps) {
     return store.workspaces;
   }
   try {
-    const workspaces = await deps.backend.query(api.workspaces.listRecentlyObservedWorkspacesForMachine, {
+    const workingDirs = await deps.backend.query(api.workspaces.listRecentlyObservedWorkspacesForMachine, {
       sessionId: deps.sessionId,
       machineId: deps.machineId
     });
-    const mapped = workspaces.map((ws) => ({ workingDir: ws.workingDir }));
+    const mapped = (workingDirs ?? []).map((workingDir) => ({ workingDir }));
     if (store) {
       store.workspaces = mapped;
       store.updatedAt = Date.now();
@@ -107837,18 +107955,18 @@ async function syncScannedFileTree(session2, normalizedWorkingDir, tree, dataHas
 function toDeltaOperations(delta) {
   return [
     ...delta.added.map((entry) => ({
-      operation: "add",
-      path: entry.path,
-      entryType: entry.type
+      o: "a",
+      p: entry.path,
+      e: entry.type === "directory" ? "d" : "f"
     })),
     ...delta.removed.map((entryPath) => ({
-      operation: "remove",
-      path: entryPath
+      o: "r",
+      p: entryPath
     })),
     ...delta.typeChanged.map((entry) => ({
-      operation: "type-change",
-      path: entry.path,
-      entryType: entry.type
+      o: "t",
+      p: entry.path,
+      e: entry.type === "directory" ? "d" : "f"
     }))
   ];
 }
@@ -113276,9 +113394,9 @@ var startObservedSyncSubscriptionEffect = (wsClient2) => exports_Effect.gen(func
     sessionId: session2.sessionId,
     machineId: session2.machineId
   }, (observed) => {
-    if (stopped)
+    if (stopped || observed == null)
       return;
-    handleObservedChange(observed ?? []);
+    handleObservedChange(observed);
   }, (err) => {
     console.warn(`[${formatTimestamp()}] ⚠️ Observed-sync subscription error: ${getErrorMessage(err)}`);
   });
@@ -113291,8 +113409,8 @@ var startObservedSyncSubscriptionEffect = (wsClient2) => exports_Effect.gen(func
       sessionId: session2.sessionId,
       machineId: session2.machineId
     }).then((observed) => {
-      if (!stopped)
-        handleObservedChange(observed ?? []);
+      if (!stopped && observed != null)
+        handleObservedChange(observed);
     }).catch((err) => {
       console.warn(`[${formatTimestamp()}] ⚠️ Observed-sync reconcile query failed: ${getErrorMessage(err)}`);
     }).finally(() => {
@@ -114501,8 +114619,8 @@ var init_task_monitor = __esm(() => {
 });
 
 // src/commands/machine/daemon-start/workspace-list-subscription.ts
-function toSyncWorkspaces(workspaces) {
-  return workspaces.map((ws) => ({ workingDir: ws.workingDir }));
+function toSyncWorkspaces(workingDirs) {
+  return workingDirs.map((workingDir) => ({ workingDir }));
 }
 var startWorkspaceListSubscriptionEffect = (wsClient2) => exports_Effect.gen(function* () {
   const session2 = yield* DaemonSessionService;
@@ -114514,16 +114632,16 @@ var startWorkspaceListSubscriptionEffect = (wsClient2) => exports_Effect.gen(fun
   };
   let stopped = false;
   let reconcileInFlight = false;
-  const applyList = (workspaces) => {
+  const applyList = (workingDirs) => {
     if (!session2.workspaceListStore)
       return;
-    session2.workspaceListStore.workspaces = toSyncWorkspaces(workspaces);
+    session2.workspaceListStore.workspaces = toSyncWorkspaces(workingDirs);
     session2.workspaceListStore.updatedAt = Date.now();
   };
   const unsubscribe = wsClient2.onUpdate(api.workspaces.listRecentlyObservedWorkspacesForMachine, queryArgs, (workspaces) => {
-    if (stopped)
+    if (stopped || workspaces == null)
       return;
-    applyList(workspaces ?? []);
+    applyList(workspaces);
   }, (err) => {
     console.warn(`[${formatTimestamp()}] ⚠️ Workspace-list subscription error: ${getErrorMessage(err)}`);
   });
@@ -114532,8 +114650,8 @@ var startWorkspaceListSubscriptionEffect = (wsClient2) => exports_Effect.gen(fun
       return;
     reconcileInFlight = true;
     session2.backend.query(api.workspaces.listRecentlyObservedWorkspacesForMachine, queryArgs).then((workspaces) => {
-      if (!stopped)
-        applyList(workspaces ?? []);
+      if (!stopped && workspaces != null)
+        applyList(workspaces);
     }).catch((err) => {
       console.warn(`[${formatTimestamp()}] ⚠️ Workspace-list reconcile failed: ${getErrorMessage(err)}`);
     }).finally(() => {
@@ -116147,4 +116265,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=94A8E14D18276BBD64756E2164756E21
+//# debugId=E0C7F128710614BD64756E2164756E21