chatroom-cli 1.97.4 → 1.97.5

package/dist/index.js

@@ -31426,6 +31426,7 @@ var init_cursor_sdk_stream_adapter = __esm(() => {
   init_native_stream_adapter_base();
   CursorSdkStreamAdapter = class CursorSdkStreamAdapter extends NativeStreamAdapterBase {
     textBuffer = "";
+    sawTextDelta = false;
     handleMessage(message) {
       this.notifyOutput();
       switch (message.type) {
@@ -31477,6 +31478,7 @@ var init_cursor_sdk_stream_adapter = __esm(() => {
       this.notifyOutput();
       switch (update5.type) {
         case "text-delta":
+          this.sawTextDelta = true;
           this.appendAssistantText(update5.text);
           break;
         case "thinking-delta":
@@ -31514,10 +31516,11 @@ var init_cursor_sdk_stream_adapter = __esm(() => {
     finish() {
       this.flushText();
       this.emitAgentEnd();
+      this.sawTextDelta = false;
     }
     handleAssistant(message) {
       for (const block of message.message.content) {
-        if (block.type === "text") {
+        if (block.type === "text" && !this.sawTextDelta) {
           this.appendAssistantText(block.text);
         }
       }
@@ -31533,6 +31536,7 @@ var init_cursor_sdk_stream_adapter = __esm(() => {
       const nested2 = update5.taskUpdate;
       switch (nested2.type) {
         case "text-delta":
+          this.sawTextDelta = true;
           this.appendAssistantText(nested2.text);
           break;
         case "tool-call-started":
@@ -99899,9 +99903,126 @@ var init_state_recovery = __esm(() => {
   });
 });
 
+// src/commands/machine/daemon-process-scan.ts
+import { execFileSync } from "node:child_process";
+import { existsSync as existsSync7, readFileSync as readFileSync9 } from "node:fs";
+function commandLooksLikeDaemonStart(command) {
+  return command.includes(DAEMON_START_ARGV);
+}
+function envBlobMatchesConvexUrl(envBlob, convexUrl) {
+  const assigned = envBlob.split(/\0|\s+/).find((token) => token.startsWith("CHATROOM_CONVEX_URL="));
+  if (assigned !== undefined) {
+    return assigned.slice("CHATROOM_CONVEX_URL=".length) === convexUrl;
+  }
+  return convexUrl === CONVEX_URL;
+}
+function parsePidCommandLine(line) {
+  const trimmed = line.trim();
+  if (!trimmed)
+    return null;
+  const splitAt2 = trimmed.search(/\s+/);
+  if (splitAt2 <= 0)
+    return null;
+  const pid = Number.parseInt(trimmed.slice(0, splitAt2), 10);
+  if (!Number.isFinite(pid) || pid <= 0)
+    return null;
+  return { pid, command: trimmed.slice(splitAt2).trim() };
+}
+function parsePsPidCommandLines(stdout) {
+  const result = [];
+  for (const line of stdout.split(`
+`)) {
+    const parsed = parsePidCommandLine(line);
+    if (parsed)
+      result.push(parsed);
+  }
+  return result;
+}
+function readPpid(pid) {
+  if (process.platform === "linux") {
+    try {
+      const stat2 = readFileSync9(`/proc/${pid}/stat`, "utf-8");
+      const closeParen = stat2.lastIndexOf(")");
+      const rest = closeParen >= 0 ? stat2.slice(closeParen + 2).split(" ") : stat2.split(" ");
+      const ppid = Number.parseInt(rest[1] ?? "", 10);
+      return Number.isFinite(ppid) && ppid >= 0 ? ppid : null;
+    } catch {
+      return null;
+    }
+  }
+  try {
+    const stdout = execFileSync("ps", ["-p", String(pid), "-o", "ppid="], {
+      encoding: "utf-8",
+      timeout: 2000
+    });
+    const ppid = Number.parseInt(stdout.trim(), 10);
+    return Number.isFinite(ppid) && ppid >= 0 ? ppid : null;
+  } catch {
+    return null;
+  }
+}
+function collectAncestorPids(pid = process.pid, ppid = process.ppid) {
+  const skip = new Set([pid, ppid, 0, 1]);
+  let current = ppid;
+  for (let i2 = 0;i2 < 20 && current > 1; i2++) {
+    const parent = readPpid(current);
+    if (parent === null || skip.has(parent))
+      break;
+    skip.add(parent);
+    current = parent;
+  }
+  return skip;
+}
+function readProcessEnvBlob(pid) {
+  if (process.platform === "linux" && existsSync7(`/proc/${pid}/environ`)) {
+    try {
+      return readFileSync9(`/proc/${pid}/environ`, "utf-8");
+    } catch {
+      return "";
+    }
+  }
+  try {
+    return execFileSync("ps", ["eww", "-p", String(pid), "-ww", "-o", "command="], {
+      encoding: "utf-8",
+      timeout: 2000
+    });
+  } catch {
+    return "";
+  }
+}
+function listDaemonStartProcesses() {
+  if (process.platform === "win32")
+    return [];
+  try {
+    const stdout = execFileSync("ps", ["-axo", "pid=,command="], {
+      encoding: "utf-8",
+      timeout: 5000
+    });
+    return parsePsPidCommandLines(stdout).filter((row) => commandLooksLikeDaemonStart(row.command));
+  } catch {
+    return [];
+  }
+}
+function listMatchingDaemonPids(convexUrl = getConvexUrl()) {
+  const protectedPids = collectAncestorPids();
+  const matches = [];
+  for (const row of listDaemonStartProcesses()) {
+    if (protectedPids.has(row.pid))
+      continue;
+    if (!envBlobMatchesConvexUrl(readProcessEnvBlob(row.pid), convexUrl))
+      continue;
+    matches.push(row.pid);
+  }
+  return matches;
+}
+var DAEMON_START_ARGV = "machine daemon start";
+var init_daemon_process_scan = __esm(() => {
+  init_client2();
+});
+
 // src/commands/machine/pid.ts
 import { createHash as createHash3 } from "node:crypto";
-import { existsSync as existsSync7, readFileSync as readFileSync9, writeFileSync as writeFileSync4, unlinkSync as unlinkSync2, mkdirSync as mkdirSync5 } from "node:fs";
+import { existsSync as existsSync8, readFileSync as readFileSync10, writeFileSync as writeFileSync4, unlinkSync as unlinkSync2, mkdirSync as mkdirSync5 } from "node:fs";
 import { homedir as homedir6 } from "node:os";
 import { join as join19 } from "node:path";
 function getUrlHash2() {
@@ -99912,7 +100033,7 @@ function getPidFileName() {
   return `daemon-${getUrlHash2()}.pid`;
 }
 function ensureChatroomDir3() {
-  if (!existsSync7(CHATROOM_DIR4)) {
+  if (!existsSync8(CHATROOM_DIR4)) {
     mkdirSync5(CHATROOM_DIR4, { recursive: true, mode: 448 });
   }
 }
@@ -99929,11 +100050,11 @@ function isProcessRunning(pid) {
 }
 function readPid() {
   const pidPath = getPidFilePath();
-  if (!existsSync7(pidPath)) {
+  if (!existsSync8(pidPath)) {
     return null;
   }
   try {
-    const content = readFileSync9(pidPath, "utf-8").trim();
+    const content = readFileSync10(pidPath, "utf-8").trim();
     const pid = parseInt(content, 10);
     if (isNaN(pid) || pid <= 0) {
       return null;
@@ -99951,7 +100072,7 @@ function writePid() {
 function removePid() {
   const pidPath = getPidFilePath();
   try {
-    if (existsSync7(pidPath)) {
+    if (existsSync8(pidPath)) {
       unlinkSync2(pidPath);
     }
   } catch {}
@@ -99967,6 +100088,47 @@ function isDaemonRunning() {
   removePid();
   return { running: false, pid: null };
 }
+function defaultSignal(pid, signal) {
+  process.kill(pid, signal);
+}
+function uniquePositivePids(pids) {
+  return [...new Set(pids)].filter((pid) => Number.isFinite(pid) && pid > 0);
+}
+function signalBestEffort(pid, signal, send) {
+  try {
+    send(pid, signal);
+  } catch {}
+}
+async function stopExistingDaemons(options) {
+  const isRunning3 = options?.isRunning ?? isProcessRunning;
+  const send = options?.signal ?? defaultSignal;
+  const sleep7 = options?.sleep ?? ((ms) => new Promise((resolve4) => setTimeout(resolve4, ms)));
+  const log4 = options?.log ?? ((message) => console.error(message));
+  const waitMs = options?.waitMs ?? STOP_EXISTING_WAIT_MS;
+  const listPids = options?.listMatchingDaemonPids ?? listMatchingDaemonPids;
+  const pidFilePid = readPid();
+  const targets = uniquePositivePids([
+    ...pidFilePid !== null && isRunning3(pidFilePid) ? [pidFilePid] : [],
+    ...listPids()
+  ]).filter((pid) => pid !== process.pid && pid !== process.ppid);
+  if (targets.length === 0)
+    return [];
+  for (const pid of targets) {
+    log4(`Stopping previous daemon (PID: ${pid})...`);
+    signalBestEffort(pid, "SIGTERM", send);
+  }
+  const deadline = Date.now() + waitMs;
+  let remaining = targets.filter((pid) => isRunning3(pid));
+  while (remaining.length > 0 && Date.now() < deadline) {
+    await sleep7(STOP_EXISTING_POLL_MS);
+    remaining = remaining.filter((pid) => isRunning3(pid));
+  }
+  for (const pid of remaining) {
+    log4(`Process did not exit gracefully, forcing PID ${pid}...`);
+    signalBestEffort(pid, "SIGKILL", send);
+  }
+  return targets;
+}
 function tryAcquireLock() {
   const { running: running3 } = isDaemonRunning();
   if (running3) {
@@ -100000,6 +100162,13 @@ 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)));
+  await stopExistingDaemons({
+    listMatchingDaemonPids: options?.listMatchingDaemonPids,
+    isRunning: options?.isRunning,
+    signal: options?.signal,
+    sleep: sleep7,
+    waitMs: maxWaitMs
+  });
   const deadline = Date.now() + maxWaitMs;
   if (await waitForLockOrTimeout(deadline, intervalMs, sleep7)) {
     return true;
@@ -100011,8 +100180,9 @@ async function acquireLockWithRetry(options) {
 function releaseLock() {
   removePid();
 }
-var CHATROOM_DIR4, LOCK_RETRY_INTERVAL_MS = 500, LOCK_RETRY_MAX_WAIT_MS = 15000;
+var CHATROOM_DIR4, LOCK_RETRY_INTERVAL_MS = 500, LOCK_RETRY_MAX_WAIT_MS = 15000, STOP_EXISTING_WAIT_MS = 8000, STOP_EXISTING_POLL_MS = 100;
 var init_pid = __esm(() => {
+  init_daemon_process_scan();
   init_client2();
   CHATROOM_DIR4 = join19(homedir6(), ".chatroom");
 });
@@ -105777,10 +105947,10 @@ var init_local_actions = __esm(() => {
 });
 
 // src/infrastructure/local-actions/pick-folder.ts
-import { execFileSync } from "node:child_process";
+import { execFileSync as execFileSync2 } from "node:child_process";
 function runPicker(command, args2) {
   try {
-    const path3 = execFileSync(command, args2, { encoding: "utf8", timeout: 300000 }).trim();
+    const path3 = execFileSync2(command, args2, { encoding: "utf8", timeout: 300000 }).trim();
     if (!path3)
       return { success: false, error: "No folder selected" };
     return { success: true, path: path3 };
@@ -109360,10 +109530,12 @@ var init_workspace_visibility_policy = __esm(() => {
     "coverage",
     "__pycache__",
     ".turbo",
+    ".nx",
     ".cache",
     ".tmp",
     "tmp",
     "_generated",
+    ".convex",
     ".vercel"
   ]);
   ALWAYS_EXCLUDE_DIR_NAMES = new Set([...HIDDEN_DIR_NAMES, ...SHALLOW_SYNC_DIR_NAMES]);
@@ -110250,7 +110422,7 @@ var init_file_tree_scanner = __esm(() => {
 });
 
 // src/infrastructure/services/workspace/git-workspace-porcelain.ts
-import { existsSync as existsSync8 } from "node:fs";
+import { existsSync as existsSync9 } from "node:fs";
 import path4 from "node:path";
 function isEmptyRepoHeadError(error51) {
   const message = error51.message.toLowerCase();
@@ -110426,7 +110598,7 @@ function porcelainPathsLeftSnapshot(args2) {
   return left3.sort((a, b) => a.localeCompare(b));
 }
 function porcelainUntrackedDeletedEvents(args2) {
-  const exists3 = args2.pathExists ?? ((p) => existsSync8(p));
+  const exists3 = args2.pathExists ?? ((p) => existsSync9(p));
   const left3 = porcelainPathsLeftSnapshot({
     workspaceRoot: args2.workspaceRoot,
     node: args2.node,
@@ -112940,6 +113112,74 @@ var init_workspace_file_tree_coordinator = __esm(() => {
   DEFAULT_RECONCILE_INTERVAL_MS = 10 * 60 * 1000;
 });
 
+// src/infrastructure/services/workspace/workspace-sync-config.ts
+var FILE_TREE_SYNC_DEBOUNCE_MS = 5000;
+
+// src/infrastructure/services/workspace/workspace-sync-queue.ts
+function queueKey(machineId, workingDir) {
+  return `${machineId}\x00${workingDir}`;
+}
+function getOrCreateState(key) {
+  let state = queues.get(key);
+  if (!state) {
+    state = { drainPromise: null, pendingTask: null, scheduled: false };
+    queues.set(key, state);
+  }
+  return state;
+}
+function sleep7(ms) {
+  return new Promise((resolve8) => setTimeout(resolve8, ms));
+}
+async function drainQueue(state, key, debounceMs) {
+  try {
+    while (state.pendingTask) {
+      const lastCompletedAt = lastCompletedAtByKey.get(key) ?? 0;
+      const elapsed3 = Date.now() - lastCompletedAt;
+      const waitMs = lastCompletedAt === 0 ? 0 : Math.max(0, debounceMs - elapsed3);
+      if (waitMs > 0) {
+        await sleep7(waitMs);
+      }
+      const task = state.pendingTask;
+      if (!task)
+        break;
+      state.pendingTask = null;
+      await task();
+      lastCompletedAtByKey.set(key, Date.now());
+    }
+  } finally {
+    state.drainPromise = null;
+    state.scheduled = false;
+    if (state.pendingTask) {
+      kickDrain(state, key, debounceMs);
+    } else {
+      queues.delete(key);
+    }
+  }
+}
+function kickDrain(state, key, debounceMs) {
+  if (state.scheduled || state.drainPromise)
+    return;
+  state.scheduled = true;
+  state.drainPromise = new Promise((resolve8, reject) => {
+    queueMicrotask(() => {
+      drainQueue(state, key, debounceMs).then(resolve8, reject);
+    });
+  });
+}
+async function enqueueFileTreeSync(machineId, workingDir, task, options) {
+  const debounceMs = options?.debounceMs ?? FILE_TREE_SYNC_DEBOUNCE_MS;
+  const key = queueKey(machineId, workingDir);
+  const state = getOrCreateState(key);
+  state.pendingTask = task;
+  kickDrain(state, key, debounceMs);
+  return state.drainPromise ?? Promise.resolve();
+}
+var queues, lastCompletedAtByKey;
+var init_workspace_sync_queue = __esm(() => {
+  queues = new Map;
+  lastCompletedAtByKey = new Map;
+});
+
 // src/daemon/entry/files/file-tree-subscription.ts
 import { randomUUID as randomUUID11 } from "node:crypto";
 function logSubscriptionWarn(label, err) {
@@ -112986,15 +113226,17 @@ async function processPendingFileTreeRequests(session2, coordinators, ensureCoor
     requestsByDir.set(normalized, requestsByDir.get(normalized) === true || request2.force === true);
   }
   for (const [normalized, force] of requestsByDir) {
-    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) => {
-      logSubscriptionWarn(`File tree failed for ${normalized}`, err);
+    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) => {
+        logSubscriptionWarn(`File tree failed for ${normalized}`, err);
+      });
     });
   }
 }
@@ -113128,6 +113370,7 @@ var init_file_tree_subscription = __esm(() => {
   init_blob_snapshot_publish();
   init_sharded_snapshot_publish();
   init_workspace_file_tree_coordinator();
+  init_workspace_sync_queue();
   init_convex_error();
   init_daemon_services();
 });
@@ -127757,7 +128000,7 @@ function routeRequest(req, res, deps) {
 }
 
 // src/daemon/local-web/server/serve-static.ts
-import { existsSync as existsSync9, readFileSync as readFileSync10 } from "node:fs";
+import { existsSync as existsSync10, readFileSync as readFileSync11 } from "node:fs";
 import { dirname as dirname15, join as join27 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 function clientDistCandidates(here) {
@@ -127770,7 +128013,7 @@ function clientDistCandidates(here) {
 function resolveClientDistDir(here = dirname15(fileURLToPath7(import.meta.url))) {
   const candidates = clientDistCandidates(here);
   for (const dir of candidates) {
-    if (existsSync9(join27(dir, "index.html")))
+    if (existsSync10(join27(dir, "index.html")))
       return dir;
   }
   return candidates[0];
@@ -127789,24 +128032,24 @@ function tryServeStatic(req, res, distDir) {
     res.end();
     return true;
   }
-  if (existsSync9(filePath)) {
+  if (existsSync10(filePath)) {
     const ext = safePath.slice(safePath.lastIndexOf("."));
     const type = MIME[ext] ?? "application/octet-stream";
     res.writeHead(200, { "Content-Type": type });
     if (req.method === "HEAD") {
       res.end();
     } else {
-      res.end(readFileSync10(filePath));
+      res.end(readFileSync11(filePath));
     }
     return true;
   }
   const indexPath = join27(distDir, "index.html");
-  if (existsSync9(indexPath)) {
+  if (existsSync10(indexPath)) {
     res.writeHead(200, { "Content-Type": "text/html" });
     if (req.method === "HEAD") {
       res.end();
     } else {
-      res.end(readFileSync10(indexPath));
+      res.end(readFileSync11(indexPath));
     }
     return true;
   }
@@ -128195,29 +128438,19 @@ var init_daemon_start = __esm(() => {
 // src/commands/machine/daemon-stop.ts
 async function daemonStop() {
   const { running: running3, pid } = isDaemonRunning();
-  if (!running3) {
+  const stopped = await stopExistingDaemons();
+  removePid();
+  if (!running3 && stopped.length === 0) {
     console.log(`⚪ Daemon is not running`);
     return;
   }
-  console.log(`Stopping daemon (PID: ${pid})...`);
-  try {
-    process.kill(pid, "SIGTERM");
-    await new Promise((resolve8) => setTimeout(resolve8, 8000));
-    try {
-      process.kill(pid, 0);
-      console.log(`Process did not exit gracefully, forcing...`);
-      process.kill(pid, "SIGKILL");
-    } catch {}
-    removePid();
-    console.log(`✅ Daemon stopped`);
-  } catch (error51) {
-    console.error(`❌ Failed to stop daemon: ${getErrorMessage(error51)}`);
-    removePid();
+  if (stopped.length === 0 && pid !== null) {
+    console.log(`Stopping daemon (PID: ${pid})...`);
   }
+  console.log(`✅ Daemon stopped`);
 }
 var init_daemon_stop = __esm(() => {
   init_pid();
-  init_convex_error();
 });
 
 // src/commands/machine/daemon-status.ts
@@ -129409,4 +129642,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=104EE59D5601863F64756E2164756E21
+//# debugId=2F868299E7BFEA7764756E2164756E21