chatroom-cli 1.103.1 → 1.103.2

package/dist/index.js

@@ -30445,8 +30445,8 @@ var init_claude_sdk_agent_service = __esm(() => {
                 maxTurns: DEFAULT_MAX_TURNS2,
                 pathToClaudeCodeExecutable: executablePath,
                 includePartialMessages: true,
-                systemPrompt: isFirstQuery && !sdkSession.resumeOnFirstQuery ? sdkSession.storedSystemPrompt : undefined,
-                resume: useResume ? sdkSession.sessionId : undefined,
+                ...isFirstQuery && !sdkSession.resumeOnFirstQuery && sdkSession.storedSystemPrompt !== undefined ? { systemPrompt: sdkSession.storedSystemPrompt } : {},
+                ...useResume && sdkSession.sessionId !== undefined ? { resume: sdkSession.sessionId } : {},
                 settingSources: [],
                 permissionMode: "bypassPermissions",
                 allowDangerouslySkipPermissions: true,
@@ -79539,7 +79539,7 @@ To reconnect, run:`);
         chatroomId: this.chatroomId,
         role: this.role,
         taskId: task._id,
-        messageId: message?._id,
+        ...message?._id !== undefined ? { messageId: message._id } : {},
         convexUrl: getConvexUrl()
       });
       const taskReceivedTime = new Date().toISOString().replace("T", " ").substring(0, 19);
@@ -110359,8 +110359,9 @@ var init_on_request_stop_agent = __esm(() => {
 // src/daemon/entry/events/agent/on-stop-scope-agent.ts
 var onStopScopeAgentEffect = (event) => exports_Effect.gen(function* () {
   const agentMgr = yield* DaemonAgentProcessManagerService;
-  if (agentMgr.runInboxScopedStop)
-    yield* agentMgr.runInboxScopedStop(event);
+  const stop4 = agentMgr.runInboxScopedStop;
+  if (stop4)
+    yield* stop4(event);
 });
 var init_on_stop_scope_agent = __esm(() => {
   init_esm();
@@ -111914,13 +111915,6 @@ var init_file_content_subscription = __esm(() => {
   init_daemon_services();
 });
 
-// src/infrastructure/services/workspace/file-tree-data-hash.ts
-import { createHash as createHash6 } from "node:crypto";
-function computeFileTreeDataHash(tree) {
-  return createHash6("md5").update(JSON.stringify(tree)).digest("hex");
-}
-var init_file_tree_data_hash = () => {};
-
 // src/infrastructure/services/workspace/file-tree-sync-ranker.ts
 function fileExtension(p) {
   const b = (p.split("/").pop() ?? p).toLowerCase();
@@ -112741,6 +112735,13 @@ var init_file_tree_scanner = __esm(() => {
   init_workspace_visibility_policy();
 });
 
+// src/infrastructure/services/workspace/file-tree-data-hash.ts
+import { createHash as createHash6 } from "node:crypto";
+function computeFileTreeDataHash(tree) {
+  return createHash6("md5").update(JSON.stringify(tree)).digest("hex");
+}
+var init_file_tree_data_hash = () => {};
+
 // src/infrastructure/services/workspace/git-workspace-porcelain.ts
 import { existsSync as existsSync9 } from "node:fs";
 import path4 from "node:path";
@@ -116074,6 +116075,17 @@ var init_workspace_file_tree_delta_send = __esm(() => {
 function logSubscriptionWarn(label, err) {
   console.warn(`[${formatTimestamp()}] ⚠️  ${label}: ${getErrorMessage(err)}`);
 }
+async function runOneShotFileTreeSync(session2, workingDir) {
+  const normalized = normalizeWorkingDirForLookup(workingDir);
+  const tree = await scanFileTree(normalized);
+  const send = createWorkspaceFileTreeCheckpointSend(session2, normalized);
+  await send({ tree, revision: 0 });
+  await session2.backend.mutation(api.workspaceFiles.fulfillFileTreeRequest, {
+    sessionId: session2.sessionId,
+    machineId: session2.machineId,
+    workingDir: normalized
+  });
+}
 async function stopCoordinatorForWorkingDir(coordinators, checkpointOutboxRegistry, deltaOutboxRegistry, normalized) {
   const coordinatorPromise = coordinators.get(normalized);
   if (!coordinatorPromise)
@@ -116082,8 +116094,8 @@ async function stopCoordinatorForWorkingDir(coordinators, checkpointOutboxRegist
   await coordinatorPromise.then((coordinator2) => coordinator2.stop()).catch(() => {
     return;
   });
-  await checkpointOutboxRegistry.stop(normalized);
-  await deltaOutboxRegistry.stop(normalized);
+  await checkpointOutboxRegistry?.stop(normalized);
+  await deltaOutboxRegistry?.stop(normalized);
 }
 async function drainPendingFileTreeReleaseRequests(session2, coordinators, checkpointOutboxRegistry, deltaOutboxRegistry) {
   const releases = await session2.backend.query(api.workspaceFiles.getPendingFileTreeReleaseRequests, {
@@ -116108,7 +116120,36 @@ async function drainPendingFileTreeReleaseRequests(session2, coordinators, check
     });
   }
 }
-async function processPendingFileTreeRequests(session2, coordinators, ensureCoordinator, requests) {
+async function processOnePendingFileTreeRequest(session2, coordinators, ensureCoordinator, normalized, force, checkpointOutboxRegistry, deltaOutboxRegistry) {
+  const start3 = Date.now();
+  const lease = await session2.backend.query(api.workspaceFiles.getFileTreeWatchLease, {
+    sessionId: session2.sessionId,
+    machineId: session2.machineId,
+    workingDir: normalized
+  });
+  if (!lease?.leaseActive) {
+    await stopCoordinatorForWorkingDir(coordinators, checkpointOutboxRegistry, deltaOutboxRegistry, normalized);
+    await runOneShotFileTreeSync(session2, normalized);
+    console.log(`[${formatTimestamp()}] \uD83C\uDF33 File tree ready: ${normalized} (${Date.now() - start3}ms, one-shot)`);
+    return;
+  }
+  await ensureCoordinator(normalized, force);
+  await session2.backend.mutation(api.workspaceFiles.fulfillFileTreeRequest, {
+    sessionId: session2.sessionId,
+    machineId: session2.machineId,
+    workingDir: normalized
+  });
+  const leaseAfterFulfill = await session2.backend.query(api.workspaceFiles.getFileTreeWatchLease, {
+    sessionId: session2.sessionId,
+    machineId: session2.machineId,
+    workingDir: normalized
+  });
+  if (!leaseAfterFulfill?.leaseActive) {
+    await stopCoordinatorForWorkingDir(coordinators, checkpointOutboxRegistry, deltaOutboxRegistry, normalized);
+  }
+  console.log(`[${formatTimestamp()}] \uD83C\uDF33 File tree ready: ${normalized} (${Date.now() - start3}ms${force ? ", reconciled" : ", cached"})`);
+}
+async function processPendingFileTreeRequests(session2, coordinators, ensureCoordinator, requests, checkpointOutboxRegistry, deltaOutboxRegistry) {
   if (!requests?.length)
     return;
   const requestsByDir = new Map;
@@ -116118,25 +116159,20 @@ async function processPendingFileTreeRequests(session2, coordinators, ensureCoor
   }
   for (const [normalized, force] of requestsByDir) {
     await enqueueFileTreeSync(session2.machineId, normalized, async () => {
-      const start3 = Date.now();
-      await ensureCoordinator(normalized, force).then(() => session2.backend.mutation(api.workspaceFiles.fulfillFileTreeRequest, {
-        sessionId: session2.sessionId,
-        machineId: session2.machineId,
-        workingDir: normalized
-      })).then(() => {
-        console.log(`[${formatTimestamp()}] \uD83C\uDF33 File tree ready: ${normalized} (${Date.now() - start3}ms${force ? ", reconciled" : ", cached"})`);
-      }).catch((err) => {
+      try {
+        await processOnePendingFileTreeRequest(session2, coordinators, ensureCoordinator, normalized, force, checkpointOutboxRegistry, deltaOutboxRegistry);
+      } catch (err) {
         logSubscriptionWarn(`File tree failed for ${normalized}`, err);
-      });
+      }
     });
   }
 }
-async function drainPendingFileTreeRequests(session2, coordinators, ensureCoordinator) {
+async function drainPendingFileTreeRequests(session2, coordinators, ensureCoordinator, checkpointOutboxRegistry, deltaOutboxRegistry) {
   const requests = await session2.backend.query(api.workspaceFiles.getPendingFileTreeRequests, {
     sessionId: session2.sessionId,
     machineId: session2.machineId
   });
-  await processPendingFileTreeRequests(session2, coordinators, ensureCoordinator, requests);
+  await processPendingFileTreeRequests(session2, coordinators, ensureCoordinator, requests, checkpointOutboxRegistry, deltaOutboxRegistry);
 }
 var startFileTreeSubscriptionEffect = () => exports_Effect.gen(function* () {
   const session2 = yield* DaemonSessionService;
@@ -116185,7 +116221,7 @@ var startFileTreeSubscriptionEffect = () => exports_Effect.gen(function* () {
     });
   };
   return {
-    drainPendingFileTreeRequests: () => drainPendingFileTreeRequests(session2, coordinators, ensureCoordinator),
+    drainPendingFileTreeRequests: () => drainPendingFileTreeRequests(session2, coordinators, ensureCoordinator, checkpointOutboxRegistry, deltaOutboxRegistry),
     drainPendingFileTreeReleaseRequests: () => drainPendingFileTreeReleaseRequests(session2, coordinators, checkpointOutboxRegistry, deltaOutboxRegistry),
     stop: () => {
       (async () => {
@@ -116201,6 +116237,7 @@ var startFileTreeSubscriptionEffect = () => exports_Effect.gen(function* () {
 var init_file_tree_subscription = __esm(() => {
   init_esm();
   init_api3();
+  init_file_tree_scanner();
   init_workspace_file_tree_coordinator();
   init_workspace_sync_queue();
   init_convex_error();
@@ -134469,7 +134506,9 @@ var init_opencode_install = __esm(() => {
 
 // src/infrastructure/retry-queue.ts
 async function withRetry(fn2, opts) {
-  const { maxRetries, baseDelayMs, maxDelayMs } = { ...DEFAULTS, ...opts };
+  const maxRetries = opts?.maxRetries ?? DEFAULTS.maxRetries;
+  const baseDelayMs = opts?.baseDelayMs ?? DEFAULTS.baseDelayMs;
+  const maxDelayMs = opts?.maxDelayMs ?? DEFAULTS.maxDelayMs;
   for (let attempt = 0;attempt <= maxRetries; attempt++) {
     try {
       return await fn2();
@@ -135092,4 +135131,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=48E3BD8E7ACDCBFA64756E2164756E21
+//# debugId=56DD8E367644E33A64756E2164756E21