chatroom-cli 1.74.0 → 1.76.0

package/dist/index.js

@@ -77540,8 +77540,11 @@ ${CODE_CHANGE_VERIFICATION_CONFIRMATION}
 
 ${getUnresolvedDecisionsSectionBlock()}
 
-## Notes / Next steps
-<anything the user should know, follow-ups, or open questions>
+## 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(() => {
@@ -77638,8 +77641,11 @@ ${CODE_CHANGE_VERIFICATION_CONFIRMATION}
 
 ${getUnresolvedDecisionsSectionBlock()}
 
-## Notes / Next steps
-<anything the user should know, follow-ups, or open questions>
+## 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(() => {
@@ -77856,70 +77862,6 @@ function formatDecodeError(error) {
   return message;
 }
 
-// ../../services/backend/config/reliability.ts
-var HARNESS_SESSION_READY_TIMEOUT_MS = 5000, NATIVE_DELIVERY_RECONCILE_MS = 1e4, DAEMON_HEARTBEAT_INTERVAL_MS, DAEMON_HEARTBEAT_TTL_MS, AGENT_REQUEST_DEADLINE_MS = 120000, OBSERVED_FULL_PUSH_INTERVAL_MS, OBSERVED_SAFETY_POLL_MS = 30000, OBSERVED_SYNC_RECONCILE_MS, WORKSPACE_RECENCY_WINDOW_MS, WORKSPACE_LIST_RECONCILE_MS, CONNECTION_CLOSE_REQUEST_TTL_MS, ENHANCER_ATTEMPT_TIMEOUT_MS = 120000, ENHANCER_TERMINAL_JOB_RETENTION_MS, ENHANCER_CLI_POLL_INTERVAL_MS = 1000;
-var init_reliability = __esm(() => {
-  DAEMON_HEARTBEAT_INTERVAL_MS = 5 * 60000;
-  DAEMON_HEARTBEAT_TTL_MS = 6 * DAEMON_HEARTBEAT_INTERVAL_MS;
-  OBSERVED_FULL_PUSH_INTERVAL_MS = 5 * 60000;
-  OBSERVED_SYNC_RECONCILE_MS = 15 * 60000;
-  WORKSPACE_RECENCY_WINDOW_MS = 7 * 24 * 60 * 60 * 1000;
-  WORKSPACE_LIST_RECONCILE_MS = 60 * 60 * 1000;
-  CONNECTION_CLOSE_REQUEST_TTL_MS = 10 * 60000;
-  ENHANCER_TERMINAL_JOB_RETENTION_MS = 30 * 24 * 60 * 60 * 1000;
-});
-
-// src/commands/enhancer/wait-for-job.ts
-var exports_wait_for_job = {};
-__export(exports_wait_for_job, {
-  waitForEnhancerJob: () => waitForEnhancerJob
-});
-async function waitForEnhancerJob(chatroomId, jobId, deps) {
-  const sessionId = await deps.getSessionId();
-  if (!sessionId) {
-    throw new Error("Not authenticated");
-  }
-  while (true) {
-    const job = await deps.query(deps.endpoints.getJob, {
-      sessionId,
-      chatroomId,
-      jobId
-    });
-    if (!job) {
-      throw new Error("Enhancer job not found");
-    }
-    if (job.status === "complete") {
-      return "complete";
-    }
-    if (job.status === "cancelled") {
-      return "cancelled";
-    }
-    if (job.status === "failed") {
-      return "failed";
-    }
-    if (job.status === "running" && job.runningSince) {
-      const elapsed3 = Date.now() - job.runningSince;
-      if (elapsed3 > ENHANCER_ATTEMPT_TIMEOUT_MS) {
-        await deps.mutation(deps.endpoints.recordAttemptFailure, {
-          sessionId,
-          chatroomId,
-          jobId,
-          error: "Attempt timed out"
-        });
-        await sleep5(ENHANCER_CLI_POLL_INTERVAL_MS);
-        continue;
-      }
-    }
-    await sleep5(ENHANCER_CLI_POLL_INTERVAL_MS);
-  }
-}
-function sleep5(ms) {
-  return new Promise((resolve3) => setTimeout(resolve3, ms));
-}
-var init_wait_for_job = __esm(() => {
-  init_reliability();
-});
-
 // ../../services/backend/prompts/native/session-continuity.ts
 function getSessionContinuityLine(nativeIntegration) {
   if (nativeIntegration) {
@@ -83849,6 +83791,19 @@ var init_featureFlags = __esm(() => {
   };
 });
 
+// ../../services/backend/config/reliability.ts
+var HARNESS_SESSION_READY_TIMEOUT_MS = 5000, NATIVE_DELIVERY_RECONCILE_MS = 1e4, DAEMON_HEARTBEAT_INTERVAL_MS, DAEMON_HEARTBEAT_TTL_MS, AGENT_REQUEST_DEADLINE_MS = 120000, OBSERVED_FULL_PUSH_INTERVAL_MS, OBSERVED_SAFETY_POLL_MS = 30000, OBSERVED_SYNC_RECONCILE_MS, WORKSPACE_RECENCY_WINDOW_MS, WORKSPACE_LIST_RECONCILE_MS, CONNECTION_CLOSE_REQUEST_TTL_MS, ENHANCER_TERMINAL_JOB_RETENTION_MS;
+var init_reliability = __esm(() => {
+  DAEMON_HEARTBEAT_INTERVAL_MS = 5 * 60000;
+  DAEMON_HEARTBEAT_TTL_MS = 6 * DAEMON_HEARTBEAT_INTERVAL_MS;
+  OBSERVED_FULL_PUSH_INTERVAL_MS = 5 * 60000;
+  OBSERVED_SYNC_RECONCILE_MS = 15 * 60000;
+  WORKSPACE_RECENCY_WINDOW_MS = 7 * 24 * 60 * 60 * 1000;
+  WORKSPACE_LIST_RECONCILE_MS = 60 * 60 * 1000;
+  CONNECTION_CLOSE_REQUEST_TTL_MS = 10 * 60000;
+  ENHANCER_TERMINAL_JOB_RETENTION_MS = 30 * 24 * 60 * 60 * 1000;
+});
+
 // src/commands/machine/daemon-start/command-event-types.ts
 function isDaemonCommandEventType(value) {
   return DAEMON_COMMAND_EVENT_TYPES.includes(value);
@@ -99290,7 +99245,7 @@ async function emitPhase(deps, event, phase, detail) {
     detail
   });
 }
-function sleep6(ms) {
+function sleep5(ms) {
   return new Promise((resolve4) => setTimeout(resolve4, ms));
 }
 async function waitForHarnessSessionId(deps, event, pid) {
@@ -99312,7 +99267,7 @@ async function waitForHarnessSessionId(deps, event, pid) {
     if (slot?.harnessSessionId) {
       return slot.harnessSessionId;
     }
-    await sleep6(100);
+    await sleep5(100);
   }
   await deps.session.backend.mutation(api.machines.emitHarnessSessionTimeout, {
     sessionId: deps.session.sessionId,
@@ -100820,7 +100775,7 @@ function logWaitingForShutdown(pid) {
 function logDaemonAlreadyRunning(pid) {
   console.error(`❌ Daemon already running for ${getConvexUrl()} (PID: ${pid})`);
 }
-async function waitForLockOrTimeout(deadline, intervalMs, sleep7) {
+async function waitForLockOrTimeout(deadline, intervalMs, sleep6) {
   let loggedWait = false;
   while (Date.now() < deadline) {
     if (tryAcquireLock()) {
@@ -100831,16 +100786,16 @@ async function waitForLockOrTimeout(deadline, intervalMs, sleep7) {
       logWaitingForShutdown(pid);
       loggedWait = true;
     }
-    await sleep7(intervalMs);
+    await sleep6(intervalMs);
   }
   return false;
 }
 async function acquireLockWithRetry(options) {
   const intervalMs = options?.intervalMs ?? LOCK_RETRY_INTERVAL_MS;
   const maxWaitMs = options?.maxWaitMs ?? LOCK_RETRY_MAX_WAIT_MS;
-  const sleep7 = options?.sleep ?? ((ms) => new Promise((resolve4) => setTimeout(resolve4, ms)));
+  const sleep6 = options?.sleep ?? ((ms) => new Promise((resolve4) => setTimeout(resolve4, ms)));
   const deadline = Date.now() + maxWaitMs;
-  if (await waitForLockOrTimeout(deadline, intervalMs, sleep7)) {
+  if (await waitForLockOrTimeout(deadline, intervalMs, sleep6)) {
     return true;
   }
   const { pid } = isDaemonRunning();
@@ -103394,7 +103349,6 @@ class BufferedJournalFactory {
         return;
       flushInProgress = true;
       const batch = buffer.splice(0);
-      console.log(`[journal] Flushing ${batch.length} chunks for session ${harnessSessionId}`);
       outputRepository.appendChunks(harnessSessionId, batch).catch((err) => {
         buffer.unshift(...batch);
         logger.warn(`[journal] Flush FAILED for ${harnessSessionId}: ${err instanceof Error ? err.message : String(err)}`);
@@ -103413,7 +103367,6 @@ class BufferedJournalFactory {
           messageId: chunk2.messageId,
           partType: chunk2.partType
         });
-        logger.log?.(`[journal] chunk recorded session=${harnessSessionId} messageId=${chunk2.messageId ?? "-"} partType=${chunk2.partType ?? "text"} bytes=${chunk2.content.length}`);
       },
       async flush() {
         await waitForInProgress();
@@ -103839,6 +103792,19 @@ var init_start_subscriptions2 = __esm(() => {
 // src/commands/machine/daemon-start/enhancer/constants.ts
 var ENHANCER_AGENT_ROLE = "enhancer";
 
+// src/commands/machine/daemon-start/enhancer/enhancer-log.ts
+function formatEnhancerLogLine(message) {
+  const trimmed = message.trimEnd();
+  if (trimmed.startsWith(ENHANCER_LOG_PREFIX))
+    return trimmed;
+  return `${ENHANCER_LOG_PREFIX} ${trimmed}`;
+}
+function writeEnhancerLog(message) {
+  process.stdout.write(`${formatEnhancerLogLine(message)}
+`);
+}
+var ENHANCER_LOG_PREFIX = "[enhancer]";
+
 // src/commands/machine/daemon-start/enhancer/job-subscriber.ts
 function startEnhancerJobSubscriber(sessionId, machineId, convexUrl, backend2, wsClient2, agentServices) {
   const inFlight = new Set;
@@ -103860,12 +103826,14 @@ function startEnhancerJobSubscriber(sessionId, machineId, convexUrl, backend2, w
           if (!claim.claimed)
             return;
           claimed = true;
+          writeEnhancerLog(`claimed job=${job.jobId} chatroom=${job.chatroomId}`);
           const payload = await backend2.query(api.daemon.enhancer.index.getSpawnPayload, {
             sessionId,
             jobId: job.jobId
           });
           chatroomId = payload.chatroomId;
           jobId = payload.jobId;
+          writeEnhancerLog(`spawning harness=${payload.agentHarness} model=${payload.model} job=${payload.jobId}`);
           const service3 = agentServices.get(payload.agentHarness);
           if (!service3) {
             await backend2.mutation(api.web.enhancer.index.recordAttemptFailure, {
@@ -103888,6 +103856,13 @@ function startEnhancerJobSubscriber(sessionId, machineId, convexUrl, backend2, w
             },
             resolvedConvexUrl: convexUrl
           });
+          spawnResult.onLogLine?.((line) => {
+            writeEnhancerLog(line);
+          });
+          spawnResult.onAssistantText?.((text) => {
+            if (text)
+              writeEnhancerLog(`text] ${text}`);
+          });
           await new Promise((resolve4) => {
             spawnResult.onExit(() => resolve4());
           });
@@ -103896,6 +103871,9 @@ function startEnhancerJobSubscriber(sessionId, machineId, convexUrl, backend2, w
             chatroomId: payload.chatroomId,
             jobId: payload.jobId
           });
+          if (status3?.status === "complete") {
+            writeEnhancerLog(`completed job=${payload.jobId}`);
+          }
           if (status3?.status === "running") {
             await backend2.mutation(api.web.enhancer.index.recordAttemptFailure, {
               sessionId,
@@ -103905,7 +103883,7 @@ function startEnhancerJobSubscriber(sessionId, machineId, convexUrl, backend2, w
             });
           }
         } catch (err) {
-          console.warn("[enhancer] spawn error:", err instanceof Error ? err.message : String(err));
+          writeEnhancerLog(`error: ${err instanceof Error ? err.message : String(err)}`);
           if (claimed) {
             await backend2.mutation(api.web.enhancer.index.recordAttemptFailure, {
               sessionId,
@@ -115694,7 +115672,6 @@ handoffCommandGroup.requiredOption("--chatroom-id <id>", "Chatroom identifier").
     const { api: api3 } = await Promise.resolve().then(() => (init_api3(), exports_api));
     const { getConvexClient: getConvexClient2 } = await Promise.resolve().then(() => (init_client2(), exports_client));
     const { getSessionId: getSessionId2 } = await Promise.resolve().then(() => (init_storage(), exports_storage));
-    const { waitForEnhancerJob: waitForEnhancerJob2 } = await Promise.resolve().then(() => (init_wait_for_job(), exports_wait_for_job));
     const client4 = await getConvexClient2();
     const sessionId = await getSessionId2();
     if (sessionId) {
@@ -115704,40 +115681,23 @@ handoffCommandGroup.requiredOption("--chatroom-id <id>", "Chatroom identifier").
           chatroomId: options.chatroomId
         });
         if (config4 && config4.enabled) {
-          const result = await client4.mutation(api3.web.enhancer.index.enqueueHandoff, {
+          await client4.mutation(api3.web.enhancer.index.enqueueHandoff, {
             sessionId,
             chatroomId: options.chatroomId,
             senderRole: options.role,
             targetRole: options.nextRole,
             content: message
           });
-          const jobId = result.jobId;
-          const outcome = await waitForEnhancerJob2(options.chatroomId, jobId, {
-            query: (endpoint, args2) => client4.query(endpoint, args2),
-            mutation: (endpoint, args2) => client4.mutation(endpoint, args2),
-            getSessionId: () => Promise.resolve(sessionId),
-            endpoints: {
-              getJob: api3.web.enhancer.index.getJob,
-              recordAttemptFailure: api3.web.enhancer.index.recordAttemptFailure
-            }
-          });
-          if (outcome === "failed") {
-            console.error(`
-❌ ERROR: Enhancer failed after all retries. No handoff was delivered.`);
-            process.exit(1);
-          }
-          if (outcome === "cancelled" || outcome === "complete") {
-            const { generateHandoffOutput: generateHandoffOutput2 } = await Promise.resolve().then(() => (init_generator(), exports_generator));
-            const { getConvexUrl: getConvexUrl2 } = await Promise.resolve().then(() => (init_client2(), exports_client));
-            const convexUrl = await getConvexUrl2();
-            console.log(generateHandoffOutput2({
-              role: options.role,
-              nextRole: options.nextRole,
-              chatroomId: options.chatroomId,
-              convexUrl
-            }));
-            return;
-          }
+          const { generateHandoffOutput: generateHandoffOutput2 } = await Promise.resolve().then(() => (init_generator(), exports_generator));
+          const { getConvexUrl: getConvexUrl2 } = await Promise.resolve().then(() => (init_client2(), exports_client));
+          const convexUrl = await getConvexUrl2();
+          console.log(generateHandoffOutput2({
+            role: options.role,
+            nextRole: options.nextRole,
+            chatroomId: options.chatroomId,
+            convexUrl
+          }));
+          return;
         }
       } catch (err) {
         const error51 = err;
@@ -116092,4 +116052,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=594320A213AD613364756E2164756E21
+//# debugId=7F5BB9A13B1C8A7564756E2164756E21