chatroom-cli 1.77.1 → 1.77.4

package/dist/index.js

@@ -77251,7 +77251,7 @@ function getDelegationBriefDisclosureBlock() {
   return `${DELEGATION_BRIEF_DISCLOSURE_CHECKBOX}
 ${getDelegationBriefDisclosureComment()}`;
 }
-var DELEGATION_BRIEF_DISCLOSURE_CHECKBOX = "- [ ] I confirm that the goal and acceptance criteria from the planner’s delegation brief have been met";
+var DELEGATION_BRIEF_DISCLOSURE_CHECKBOX = "- [ ] I confirm the delegation brief is fully met: all (Required) files done, verified end-to-end, acceptance criteria pass";
 
 // ../../services/backend/prompts/utils/file-reference-guidance.ts
 function getFileReferenceGuidanceComment() {
@@ -77423,7 +77423,7 @@ ${getDelegationBriefIntro()}
 <choices that greatly simplify the solution while preserving long-term maintainability — reuse existing abstractions, avoid unnecessary layers, leverage platform conventions>
 
 ## Files to implement (exhaustive, file-level)
-List **every** file in this slice. For each file, state the exact change and paste the code the builder should match (no guessing).
+List **every** file in this slice. Mark each file **(Required)** or **(Optional)** — all Required files must land before PR. For each file, state the exact change and paste the code the builder should match (no guessing).
 ${getFileReferenceGuidanceComment()}
 
 ### \`apps/webapp/src/path/to/file.ts\`
@@ -77458,6 +77458,7 @@ Cross-file types, interfaces, or patterns that apply beyond a single file. Omit
 
 ## Requirements (acceptance criteria)
 - <verifiable outcome the builder can self-check>
+- Include at least one check that the feature is **verified end-to-end**. Unit tests alone are insufficient for new features.
 
 ## What to avoid
 - <anti-patterns, recurring mistakes, or scope creep for this slice — be explicit>
@@ -77582,7 +77583,7 @@ ${getFileReferenceProofOfCompletionExample()}
 <Omit if no backlog items were in scope.>
 
 ## Backlog Pending User Review Confirmation
-- [ ] I confirm that every backlog item implemented in this work has been moved to \`pending_user_review\` via \`chatroom backlog mark-for-review\` because a PR has been raised for user review
+- [ ] I confirm that every backlog item implemented in this work has been moved to \`pending_user_review\` via \`chatroom backlog mark-for-review\` after the feature was verified end-to-end and a PR was raised for user review
 - PR URL(s): <link to PR(s)>
 <Omit this section if no backlog items apply.>
 
@@ -77610,9 +77611,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(() => {
@@ -77687,7 +77685,7 @@ ${getFileReferenceProofOfCompletionExample()}
 <Omit if no backlog items were in scope.>
 
 ## Backlog Pending User Review Confirmation
-- [ ] I confirm that every backlog item implemented in this work has been moved to \`pending_user_review\` via \`chatroom backlog mark-for-review\` because a PR has been raised for user review
+- [ ] I confirm that every backlog item implemented in this work has been moved to \`pending_user_review\` via \`chatroom backlog mark-for-review\` after the feature was verified end-to-end and a PR was raised for user review
 - PR URL(s): <link to PR(s)>
 <Omit this section if no backlog items apply.>
 
@@ -77715,9 +77713,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(() => {
@@ -78814,6 +78809,10 @@ ${getBuilderFlowMermaid(nativeIntegration, codeChangesTarget, questionTarget)}
 - Follow established patterns and best practices from the codebase
 - Handle edge cases and error scenarios
 - Commit work with descriptive, atomic commit messages
+
+**Completion gates (before PR or handoff):**
+- All **(Required)** files done; **verified end-to-end** (user-facing entry point works: CLI command runnable, API reachable, or UI action functional)
+- If blocked → ## Blockers / questions to planner. No PR or \`mark-for-review\` until gates pass — unless the user explicitly requested a draft or incremental PR
 `;
 }
 var init_builder = () => {};
@@ -78885,18 +78884,21 @@ flowchart TD
 - **Spell out what to avoid** — anti-patterns and recurring mistakes you have seen from builders on similar work (scope creep, wrong abstractions, forbidden refactors).
 - **One slice ≈ one focused review surface.** If you can't imagine reviewing it in one sitting, split it.
 - **Order by dependency**, not by team convention. A slice should be runnable/testable when its dependencies are done.
+- **A slice is shippable only when verified end-to-end** — infra/helper files alone are not a complete slice.
 - **Skip phases that don't apply** (e.g., no frontend for a backend-only change, no schema for a pure refactor).
 
 **Code review:** For code-producing work, review before delivering. Activate the review framework with: ${cmd("skill activate code-review")}.
 
 **Backlog items:** When the task originates from a backlog item, activate the backlog skill: ${cmd("skill activate backlog")}.
 
-**If stuck:** After 2 failed rework attempts → step back, replan the slice, or deliver partial results with a clear explanation.
+**If stuck:** After 2 failed rework attempts → replan or hand back to planner as blocked. No partial PR, \`mark-for-review\`, or user delivery.
 
 **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 +78916,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) {
@@ -78932,7 +78935,7 @@ var init_handoff_rules = () => {};
 
 // ../../services/backend/prompts/cli/sections/when-work-comes-back.ts
 function getWhenWorkComesBackSection(config3) {
-  const reworkLine = config3.hasBuilder ? "3. If requirements are NOT met → hand back to `builder` for rework" : "3. If requirements are NOT met → revise your own implementation and re-validate";
+  const reworkLine = config3.hasBuilder ? "3. If requirements are NOT met (including partial work) → hand back to `builder` for rework" : "3. If requirements are NOT met (including partial work) → revise and re-validate";
   return `**When you receive work back from team members:**
 1. Review the completed work against the original user request
 2. If requirements are met → deliver to \`user\`
@@ -82333,7 +82336,7 @@ function renderBacklogAttachments(items, ctx) {
   for (const item of items) {
     lines.push(`  <attachment type="backlog" backlog-item-id="${escapeXmlAttribute(item._id)}">`);
     lines.push(...xmlTextElement("content", item.content, "    "));
-    lines.push(`    <hint>Work on this item. When done: chatroom backlog mark-for-review --chatroom-id="${escapeXmlAttribute(ctx.chatroomId)}" --role="${escapeXmlAttribute(ctx.role)}" --backlog-item-id=${item._id}</hint>`);
+    lines.push(`    <hint>Work on this item. Verified end-to-end + PR ready: chatroom backlog mark-for-review --chatroom-id="${escapeXmlAttribute(ctx.chatroomId)}" --role="${escapeXmlAttribute(ctx.role)}" --backlog-item-id=${item._id}</hint>`);
     lines.push(`  </attachment>`);
   }
   return lines;
@@ -82439,7 +82442,7 @@ function renderContextSection(input, chatroomId, role) {
     "</context>"
   ];
   if (ctx.triggerMessageContent) {
-    lines.push(`(For the message that triggered this context, run: chatroom context read --chatroom-id="${chatroomId}" --role="${role}")`);
+    lines.push(`(Trigger: chatroom context read --chatroom-id="${chatroomId}" --role="${role}")`);
   }
   lines.push(...renderStalenessNotice(ctx.elapsedHours));
   return lines;
@@ -82451,7 +82454,7 @@ function renderTaskPrompt(input) {
   lines.push(`   Task ID: ${taskId}`);
   lines.push(`   Status: ${status3}`);
   if (input.context) {
-    lines.push("On conflict, the message wins over background context.");
+    lines.push("On conflict, message wins over background context.");
   }
   lines.push(...renderDivergenceWarnings(input));
   lines.push(`
@@ -82748,14 +82751,58 @@ var init_skill = __esm(() => {
   init_convex_error();
 });
 
+// src/commands/messages/messages-fs-service.ts
+import * as nodeFs2 from "node:fs/promises";
+function buildMessageMarkdown(msg) {
+  const ts = new Date(msg._creationTime).toISOString();
+  const parts2 = [];
+  parts2.push("---");
+  parts2.push(`id: ${msg._id}`);
+  parts2.push(`createdAt: ${ts}`);
+  parts2.push(`senderRole: ${msg.senderRole}`);
+  parts2.push(`type: ${msg.type}`);
+  if (msg.targetRole)
+    parts2.push(`targetRole: ${msg.targetRole}`);
+  if (msg.classification)
+    parts2.push(`classification: ${msg.classification}`);
+  if (msg.taskStatus)
+    parts2.push(`taskStatus: ${msg.taskStatus}`);
+  if (msg.featureTitle)
+    parts2.push(`featureTitle: ${msg.featureTitle}`);
+  parts2.push("---");
+  parts2.push("");
+  parts2.push(msg.content);
+  return parts2.join(`
+`);
+}
+var MessagesFsService, MessagesFsServiceLive;
+var init_messages_fs_service = __esm(() => {
+  init_esm();
+  MessagesFsService = class MessagesFsService extends exports_Context.Tag("MessagesFsService")() {
+  };
+  MessagesFsServiceLive = exports_Layer.succeed(MessagesFsService, {
+    writeFile: (path3, data) => exports_Effect.tryPromise({
+      try: () => nodeFs2.writeFile(path3, data, "utf-8"),
+      catch: (e) => e instanceof Error ? e : new Error(String(e))
+    }),
+    mkdir: (path3, opts) => exports_Effect.tryPromise({
+      try: () => nodeFs2.mkdir(path3, opts),
+      catch: (e) => e instanceof Error ? e : new Error(String(e))
+    })
+  });
+});
+
 // src/commands/messages/index.ts
 var exports_messages = {};
 __export(exports_messages, {
   listSinceMessageEffect: () => listSinceMessageEffect,
   listSinceMessage: () => listSinceMessage,
   listBySenderRoleEffect: () => listBySenderRoleEffect,
-  listBySenderRole: () => listBySenderRole
+  listBySenderRole: () => listBySenderRole,
+  exportMessagesEffect: () => exportMessagesEffect,
+  exportMessages: () => exportMessages
 });
+import * as nodePath2 from "node:path";
 async function createDefaultDeps14() {
   const client4 = await getConvexClient();
   return {
@@ -82826,6 +82873,20 @@ async function listSinceMessage(chatroomId, options, deps) {
   const layer = commandServicesLayerFromDeps(d);
   await exports_Effect.runPromise(listSinceMessageEffect(chatroomId, options).pipe(exports_Effect.catchAll((err) => handleMessagesError(err)), exports_Effect.provide(layer)));
 }
+async function exportMessages(chatroomId, options, deps) {
+  const d = deps ?? await createDefaultDeps14();
+  const layer = commandServicesLayerFromDeps(d);
+  await exports_Effect.runPromise(exportMessagesEffect(chatroomId, options).pipe(exports_Effect.catchAll((err) => {
+    if ("_tag" in err) {
+      return handleMessagesError(err);
+    }
+    return exports_Effect.sync(() => {
+      console.error(`
+❌ Export failed: ${err.message}`);
+      process.exit(1);
+    });
+  }), exports_Effect.provide(exports_Layer.mergeAll(layer, MessagesFsServiceLive))));
+}
 var listBySenderRoleEffect = (chatroomId, options) => exports_Effect.gen(function* () {
   const backend2 = yield* BackendService;
   const sessionId = yield* requireSessionIdEffect((a) => ({
@@ -82916,9 +82977,59 @@ ${roleIndicator} ${message.senderRole}${message.targetRole ? ` → ${message.tar
 ` + "─".repeat(60));
     console.log(`\uD83D\uDCA1 Use --full to see complete message content`);
   });
+}), exportMessagesEffect = (chatroomId, options) => exports_Effect.gen(function* () {
+  const backend2 = yield* BackendService;
+  const fs11 = yield* MessagesFsService;
+  const sessionId = yield* requireSessionIdEffect((a) => ({
+    _tag: "NotAuthenticated",
+    convexUrl: a.convexUrl,
+    otherUrls: a.otherUrls
+  }));
+  yield* validateChatroomIdEffect(chatroomId, (id3) => ({
+    _tag: "InvalidChatroomId",
+    id: id3
+  }));
+  const messagesResult = yield* exports_Effect.either(backend2.query(api.messages.listBySenderRole, {
+    sessionId,
+    chatroomId,
+    senderRole: options.senderRole || "planner",
+    limit: options.limit
+  }));
+  if (messagesResult._tag === "Left") {
+    return yield* exports_Effect.fail({
+      _tag: "QueryFailed",
+      cause: messagesResult.left
+    });
+  }
+  const messages = messagesResult.right;
+  if (messages.length === 0) {
+    yield* exports_Effect.sync(() => console.log("No messages to export."));
+    return;
+  }
+  const dir = options.exportPath || `.chatroom/exports/messages/${chatroomId}`;
+  yield* fs11.mkdir(dir, { recursive: true });
+  const manifest = [];
+  for (const msg of messages) {
+    const filename = `${msg._creationTime}-${msg.senderRole}-${msg._id.slice(0, 8)}.md`;
+    const markdown = buildMessageMarkdown(msg);
+    yield* fs11.writeFile(nodePath2.join(dir, filename), markdown);
+    manifest.push({
+      id: msg._id,
+      senderRole: msg.senderRole,
+      createdAt: msg._creationTime,
+      filename
+    });
+  }
+  yield* fs11.writeFile(nodePath2.join(dir, "manifest.json"), JSON.stringify(manifest, null, 2));
+  yield* exports_Effect.sync(() => {
+    console.log(`
+\uD83D\uDCE8 Exported ${messages.length} messages to ${dir}`);
+    console.log(`   Manifest: ${dir}/manifest.json`);
+  });
 });
 var init_messages = __esm(() => {
   init_esm();
+  init_messages_fs_service();
   init_api3();
   init_storage();
   init_client2();
@@ -99681,17 +99792,17 @@ import {
   writeFileSync as writeFileSync3
 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
-import { join as join15 } from "node:path";
+import { join as join16 } from "node:path";
 function getUrlHash() {
   const url3 = getConvexUrl();
   return createHash2("sha256").update(url3).digest("hex").substring(0, 8);
 }
 function getChildPidsFilePath() {
-  const dir = join15(homedir5(), ".chatroom");
-  return join15(dir, `daemon-children-${getUrlHash()}.pids`);
+  const dir = join16(homedir5(), ".chatroom");
+  return join16(dir, `daemon-children-${getUrlHash()}.pids`);
 }
 function ensureChatroomDir2() {
-  const dir = join15(homedir5(), ".chatroom");
+  const dir = join16(homedir5(), ".chatroom");
   if (!existsSync5(dir)) {
     mkdirSync4(dir, { recursive: true, mode: 448 });
   }
@@ -100021,9 +100132,9 @@ var init_log_observer_sync = __esm(() => {
 });
 
 // src/commands/machine/daemon-start/handlers/process/output-store.ts
-import { appendFile as appendFile2, mkdir as mkdir7, readFile as readFile6, rm } from "node:fs/promises";
+import { appendFile as appendFile2, mkdir as mkdir8, readFile as readFile6, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join as join16 } from "node:path";
+import { join as join17 } from "node:path";
 
 class TempFileOutputStore {
   state;
@@ -100086,11 +100197,11 @@ function createOutputStore(runId) {
   if (!RUN_ID_RE.test(runId)) {
     throw new Error(`Invalid runId: ${runId}`);
   }
-  const filePath = join16(TEMP_DIR, `${runId}.log`);
+  const filePath = join17(TEMP_DIR, `${runId}.log`);
   return new TempFileOutputStore(filePath);
 }
 async function ensureTempDir() {
-  await mkdir7(TEMP_DIR, { recursive: true });
+  await mkdir8(TEMP_DIR, { recursive: true });
 }
 async function cleanOrphanTempFiles() {
   try {
@@ -100100,7 +100211,7 @@ async function cleanOrphanTempFiles() {
 var TAIL_WINDOW_BYTES, TEMP_DIR, RUN_ID_RE, MAX_TAIL_LINES_V2 = 50;
 var init_output_store = __esm(() => {
   TAIL_WINDOW_BYTES = 32 * 1024;
-  TEMP_DIR = join16(tmpdir(), "chatroom-cli", "runs");
+  TEMP_DIR = join17(tmpdir(), "chatroom-cli", "runs");
   RUN_ID_RE = /^[a-z0-9]+$/i;
 });
 
@@ -100791,7 +100902,7 @@ var init_pick_folder = () => {};
 import { createHash as createHash3 } from "node:crypto";
 import { existsSync as existsSync6, readFileSync as readFileSync8, writeFileSync as writeFileSync4, unlinkSync as unlinkSync2, mkdirSync as mkdirSync5 } from "node:fs";
 import { homedir as homedir6 } from "node:os";
-import { join as join17 } from "node:path";
+import { join as join18 } from "node:path";
 function getUrlHash2() {
   const url3 = getConvexUrl();
   return createHash3("sha256").update(url3).digest("hex").substring(0, 8);
@@ -100805,7 +100916,7 @@ function ensureChatroomDir3() {
   }
 }
 function getPidFilePath() {
-  return join17(CHATROOM_DIR4, getPidFileName());
+  return join18(CHATROOM_DIR4, getPidFileName());
 }
 function isProcessRunning(pid) {
   try {
@@ -100902,7 +101013,7 @@ function releaseLock() {
 var CHATROOM_DIR4, LOCK_RETRY_INTERVAL_MS = 500, LOCK_RETRY_MAX_WAIT_MS = 15000;
 var init_pid = __esm(() => {
   init_client2();
-  CHATROOM_DIR4 = join17(homedir6(), ".chatroom");
+  CHATROOM_DIR4 = join18(homedir6(), ".chatroom");
 });
 
 // src/infrastructure/harnesses/claude-sdk/claude-session.ts
@@ -103884,7 +103995,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 +104010,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 +104130,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 +104149,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 +104159,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 +104174,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 +104214,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 +104226,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 +104344,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();
@@ -107430,7 +107662,7 @@ function diffPathIndexes(previous, next4) {
 import { createHash as createHash6, randomUUID as randomUUID8 } from "node:crypto";
 import * as fs11 from "node:fs/promises";
 import { homedir as homedir7 } from "node:os";
-import { join as join20 } from "node:path";
+import { join as join21 } from "node:path";
 function workspaceKeyFor(workingDir) {
   const normalized = normalizeWorkingDirForLookup(workingDir);
   return createHash6("sha256").update(normalized).digest("hex").slice(0, 16);
@@ -107444,10 +107676,10 @@ function buildPathIndex(entries2) {
 }
 function manifestPath(machineId, workingDir) {
   const key = workspaceKeyFor(workingDir);
-  return join20(SYNC_STATE_DIR, machineId, key, "manifest.json");
+  return join21(SYNC_STATE_DIR, machineId, key, "manifest.json");
 }
 async function ensureDir(filePath) {
-  await fs11.mkdir(join20(filePath, ".."), { recursive: true, mode: 448 });
+  await fs11.mkdir(join21(filePath, ".."), { recursive: true, mode: 448 });
 }
 async function loadWorkspaceSyncManifest(machineId, workingDir) {
   try {
@@ -107507,7 +107739,7 @@ function entriesFromPathIndex(paths) {
 }
 var SYNC_STATE_VERSION = "2", SYNC_STATE_DIR;
 var init_workspace_sync_state = __esm(() => {
-  SYNC_STATE_DIR = join20(homedir7(), ".chatroom", "sync-state");
+  SYNC_STATE_DIR = join21(homedir7(), ".chatroom", "sync-state");
 });
 
 // src/infrastructure/services/workspace/workspace-file-tree-coordinator.ts
@@ -107837,18 +108069,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"
     }))
   ];
 }
@@ -107982,7 +108214,7 @@ function unsupportedFileWriteOperationMessage(operation) {
 }
 
 // src/commands/machine/daemon-start/file-write-fulfillment.ts
-import { access as access4, mkdir as mkdir9, rename as rename4, rm as rm3, writeFile as writeFile8 } from "node:fs/promises";
+import { access as access4, mkdir as mkdir10, rename as rename4, rm as rm3, writeFile as writeFile9 } from "node:fs/promises";
 import { dirname as dirname11 } from "node:path";
 function isTerminalFileWriteError(errorMessage) {
   const terminalMessages = new Set([
@@ -108035,9 +108267,9 @@ async function validateWriteOperation(operation, absolutePath) {
 }
 async function writePayloadToDisk(absolutePath, operation, content) {
   if (operation === "create") {
-    await mkdir9(dirname11(absolutePath), { recursive: true });
+    await mkdir10(dirname11(absolutePath), { recursive: true });
   }
-  await writeFile8(absolutePath, content);
+  await writeFile9(absolutePath, content);
 }
 async function fulfillOneFileWriteRequest(session2, request2) {
   const startTime = Date.now();
@@ -108098,7 +108330,7 @@ async function fulfillOneFileWriteRequest(session2, request2) {
         });
         return;
       }
-      await mkdir9(dirname11(targetResolved.absolutePath), { recursive: true });
+      await mkdir10(dirname11(targetResolved.absolutePath), { recursive: true });
       await rename4(resolved.absolutePath, targetResolved.absolutePath);
       await completeWriteRequest(session2, request2._id, { status: "done" });
       const elapsed4 = Date.now() - startTime;
@@ -108114,7 +108346,7 @@ async function fulfillOneFileWriteRequest(session2, request2) {
         });
         return;
       }
-      await mkdir9(resolved.absolutePath, { recursive: true });
+      await mkdir10(resolved.absolutePath, { recursive: true });
       await completeWriteRequest(session2, request2._id, { status: "done" });
       const elapsed4 = Date.now() - startTime;
       console.log(`[${formatTimestamp()}] ✏️  Directory mkdir fulfilled: ${filePath} (${elapsed4}ms)`);
@@ -112838,16 +113070,16 @@ var init_jsonc = __esm(() => {
 
 // src/infrastructure/services/workspace/workspace-resolver.ts
 import { readFile as readFile10, readdir as readdir3, stat as stat6 } from "node:fs/promises";
-import { join as join21, basename as basename4, resolve as resolve7 } from "node:path";
+import { join as join22, basename as basename4, resolve as resolve7 } from "node:path";
 async function resolveGlobPatternStar(rootDir, cleaned) {
-  const parentDir = join21(rootDir, cleaned.slice(0, -2));
+  const parentDir = join22(rootDir, cleaned.slice(0, -2));
   try {
     const entries2 = await readdir3(parentDir, { withFileTypes: true });
     const dirs = [];
     for (const entry of entries2) {
       if (!entry.isDirectory())
         continue;
-      const dirPath = join21(parentDir, entry.name);
+      const dirPath = join22(parentDir, entry.name);
       if (resolve7(dirPath).startsWith(resolve7(rootDir))) {
         dirs.push(dirPath);
       }
@@ -112858,7 +113090,7 @@ async function resolveGlobPatternStar(rootDir, cleaned) {
   }
 }
 async function resolveLiteralPath(rootDir, cleaned) {
-  const dir = join21(rootDir, cleaned);
+  const dir = join22(rootDir, cleaned);
   try {
     if (!resolve7(dir).startsWith(resolve7(rootDir)))
       return [];
@@ -112878,7 +113110,7 @@ async function resolveGlobPattern(rootDir, pattern) {
 }
 async function readPackageJson(dir) {
   try {
-    const content = await readFile10(join21(dir, "package.json"), "utf-8");
+    const content = await readFile10(join22(dir, "package.json"), "utf-8");
     const pkg = JSON.parse(content);
     return {
       name: pkg.name || basename4(dir),
@@ -112890,7 +113122,7 @@ async function readPackageJson(dir) {
 }
 async function readPnpmWorkspacePatterns(rootDir) {
   try {
-    const content = await readFile10(join21(rootDir, "pnpm-workspace.yaml"), "utf-8");
+    const content = await readFile10(join22(rootDir, "pnpm-workspace.yaml"), "utf-8");
     const patterns = [];
     let inPackages = false;
     for (const line of content.split(`
@@ -112917,7 +113149,7 @@ async function readPnpmWorkspacePatterns(rootDir) {
 }
 async function readPackageJsonWorkspacePatterns(rootDir) {
   try {
-    const content = await readFile10(join21(rootDir, "package.json"), "utf-8");
+    const content = await readFile10(join22(rootDir, "package.json"), "utf-8");
     const pkg = JSON.parse(content);
     if (!pkg.workspaces)
       return [];
@@ -112998,11 +113230,11 @@ var MAX_NAME_LENGTH = 256;
 
 // src/infrastructure/services/workspace/command-discovery.ts
 import { access as access5, readFile as readFile11 } from "node:fs/promises";
-import { join as join22, relative as relative4, basename as basename5 } from "node:path";
+import { join as join23, relative as relative4, basename as basename5 } from "node:path";
 async function detectPackageManager(workingDir) {
   for (const { file: file2, manager } of LOCKFILE_MAP) {
     try {
-      await access5(join22(workingDir, file2));
+      await access5(join23(workingDir, file2));
       return manager;
     } catch {}
   }
@@ -113071,7 +113303,7 @@ function collectRootScriptCommands(scripts, pm, scriptPrefix, rootSw) {
 }
 async function readRootPackageJson(workingDir, pm, scriptPrefix) {
   let rootPackageName = basename5(workingDir);
-  const pkg = await readJsonFile(join22(workingDir, "package.json"), "root package.json");
+  const pkg = await readJsonFile(join23(workingDir, "package.json"), "root package.json");
   if (!pkg)
     return { commands: [], rootPackageName };
   if (pkg.name)
@@ -113087,7 +113319,7 @@ async function readRootPackageJson(workingDir, pm, scriptPrefix) {
 }
 async function readTurboJson(workingDir, _turboPrefix, _rootSubWorkspace) {
   const turboTaskNames = [];
-  const turbo = await readJsonFile(join22(workingDir, "turbo.json"), "turbo.json");
+  const turbo = await readJsonFile(join23(workingDir, "turbo.json"), "turbo.json");
   if (!turbo?.tasks || typeof turbo.tasks !== "object")
     return turboTaskNames;
   for (const taskName of Object.keys(turbo.tasks)) {
@@ -113100,7 +113332,7 @@ async function readTurboJson(workingDir, _turboPrefix, _rootSubWorkspace) {
 async function readDenoJson(workingDir) {
   const commands = [];
   for (const fileName of ["deno.json", "deno.jsonc"]) {
-    const deno = await readJsonFile(join22(workingDir, fileName), fileName);
+    const deno = await readJsonFile(join23(workingDir, fileName), fileName);
     if (!deno?.tasks || typeof deno.tasks !== "object")
       continue;
     const pkgName = deno.name ?? basename5(workingDir);
@@ -113123,7 +113355,7 @@ async function readMakefile(workingDir) {
   const commands = [];
   for (const fileName of ["Makefile", "makefile"]) {
     try {
-      const content = await readFile11(join22(workingDir, fileName), "utf-8");
+      const content = await readFile11(join23(workingDir, fileName), "utf-8");
       const targets = parseMakefileTargets(content);
       if (targets.length === 0)
         continue;
@@ -113276,9 +113508,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 +113523,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 +114733,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 +114746,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 +114764,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 +116379,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=94A8E14D18276BBD64756E2164756E21
+//# debugId=550B12123AE171BD64756E2164756E21