chatroom-cli 1.3.0 → 1.4.0

package/dist/index.js

@@ -10280,10 +10280,6 @@ function ensureMachineRegistered() {
     harnessVersions: config.harnessVersions
   };
 }
-function getMachineId() {
-  const config = loadMachineConfig();
-  return config?.machineId ?? null;
-}
 var CHATROOM_DIR2, MACHINE_FILE = "machine.json";
 var init_storage2 = __esm(() => {
   init_detection();
@@ -10756,6 +10752,9 @@ var init_pi_agent_service = __esm(() => {
       const pid = childProcess.pid;
       const context = options.context;
       const entry = this.registerProcess(pid, context);
+      const roleTag = context.role ?? "unknown";
+      const chatroomSuffix = context.chatroomId ? `@${context.chatroomId.slice(-6)}` : "";
+      const logPrefix = `[pi:${roleTag}${chatroomSuffix}`;
       const outputCallbacks = [];
       if (childProcess.stdout) {
         const reader = new PiRpcReader(childProcess.stdout);
@@ -10767,7 +10766,7 @@ var init_pi_agent_service = __esm(() => {
           for (const line of textBuffer.split(`
 `)) {
             if (line)
-              process.stdout.write(`[pi text] ${line}
+              process.stdout.write(`${logPrefix} text] ${line}
 `);
           }
           textBuffer = "";
@@ -10778,7 +10777,7 @@ var init_pi_agent_service = __esm(() => {
           for (const line of thinkingBuffer.split(`
 `)) {
             if (line)
-              process.stdout.write(`[pi thinking] ${line}
+              process.stdout.write(`${logPrefix} thinking] ${line}
 `);
           }
           thinkingBuffer = "";
@@ -10811,15 +10810,38 @@ var init_pi_agent_service = __esm(() => {
         reader.onAgentEnd(() => {
           flushText();
           flushThinking();
-          process.stdout.write(`[pi agent_end]
+          process.stdout.write(`${logPrefix} agent_end]
 `);
         });
         reader.onToolCall((name) => {
           flushText();
           flushThinking();
-          process.stdout.write(`[pi tool: ${name}]
+          process.stdout.write(`${logPrefix} tool: ${name}]
 `);
         });
+        if (childProcess.stderr) {
+          childProcess.stderr.pipe(process.stderr, { end: false });
+          childProcess.stderr.on("data", () => {
+            entry.lastOutputAt = Date.now();
+            for (const cb of outputCallbacks)
+              cb();
+          });
+        }
+        return {
+          pid,
+          onExit: (cb) => {
+            childProcess.on("exit", (code2, signal) => {
+              this.deleteProcess(pid);
+              cb({ code: code2, signal, context });
+            });
+          },
+          onOutput: (cb) => {
+            outputCallbacks.push(cb);
+          },
+          onAgentEnd: (cb) => {
+            reader.onAgentEnd(cb);
+          }
+        };
       }
       if (childProcess.stderr) {
         childProcess.stderr.pipe(process.stderr, { end: false });
@@ -11298,6 +11320,15 @@ async function registerAgent(chatroomId, options, deps) {
         harnessVersions: machineInfo.harnessVersions,
         availableModels
       });
+      try {
+        await d.backend.mutation(api.machines.recordAgentRegistered, {
+          sessionId,
+          chatroomId,
+          role,
+          agentType: "remote",
+          machineId: machineInfo.machineId
+        });
+      } catch {}
       console.log(`✅ Registered as remote agent for role "${role}"`);
       console.log(`   Machine: ${machineInfo.hostname} (${machineInfo.machineId})`);
       console.log(`   Working directory: ${process.cwd()}`);
@@ -13912,6 +13943,13 @@ async function executeStartAgent(ctx, args) {
       intentional: wasIntentional
     });
   });
+  if (spawnResult.onAgentEnd) {
+    spawnResult.onAgentEnd(() => {
+      try {
+        ctx.deps.processes.kill(-pid, "SIGTERM");
+      } catch {}
+    });
+  }
   let lastReportedTokenAt = 0;
   spawnResult.onOutput(() => {
     const now = Date.now();
@@ -14164,6 +14202,9 @@ async function refreshModels(ctx) {
   }
   if (!ctx.config)
     return;
+  const freshConfig = ensureMachineRegistered();
+  ctx.config.availableHarnesses = freshConfig.availableHarnesses;
+  ctx.config.harnessVersions = freshConfig.harnessVersions;
   const totalCount = Object.values(models).flat().length;
   try {
     await ctx.deps.backend.mutation(api.machines.register, {
@@ -14180,6 +14221,41 @@ async function refreshModels(ctx) {
     console.warn(`[${formatTimestamp()}] ⚠️  Model refresh failed: ${error.message}`);
   }
 }
+function evictStaleDedupEntries(processedCommandIds, processedPingIds) {
+  const evictBefore = Date.now() - AGENT_REQUEST_DEADLINE_MS;
+  for (const [id, ts] of processedCommandIds) {
+    if (ts < evictBefore)
+      processedCommandIds.delete(id);
+  }
+  for (const [id, ts] of processedPingIds) {
+    if (ts < evictBefore)
+      processedPingIds.delete(id);
+  }
+}
+async function dispatchCommandEvent(ctx, event, processedCommandIds, processedPingIds) {
+  const eventId = event._id.toString();
+  if (event.type === "agent.requestStart") {
+    if (processedCommandIds.has(eventId))
+      return;
+    processedCommandIds.set(eventId, Date.now());
+    await onRequestStartAgent(ctx, event);
+  } else if (event.type === "agent.requestStop") {
+    if (processedCommandIds.has(eventId))
+      return;
+    processedCommandIds.set(eventId, Date.now());
+    await onRequestStopAgent(ctx, event);
+  } else if (event.type === "daemon.ping") {
+    if (processedPingIds.has(eventId))
+      return;
+    processedPingIds.set(eventId, Date.now());
+    handlePing();
+    await ctx.deps.backend.mutation(api.machines.ackPing, {
+      sessionId: ctx.sessionId,
+      machineId: ctx.machineId,
+      pingEventId: event._id
+    });
+  }
+}
 async function startCommandLoop(ctx) {
   let heartbeatCount = 0;
   const heartbeatTimer = setInterval(() => {
@@ -14218,40 +14294,11 @@ Listening for commands...`);
   }, async (result) => {
     if (!result.events || result.events.length === 0)
       return;
-    const evictBefore = Date.now() - AGENT_REQUEST_DEADLINE_MS;
-    for (const [id, ts] of processedCommandIds) {
-      if (ts < evictBefore)
-        processedCommandIds.delete(id);
-    }
-    for (const [id, ts] of processedPingIds) {
-      if (ts < evictBefore)
-        processedPingIds.delete(id);
-    }
+    evictStaleDedupEntries(processedCommandIds, processedPingIds);
     for (const event of result.events) {
-      const eventId = event._id.toString();
       try {
         console.log(`[${formatTimestamp()}] \uD83D\uDCE1 Stream command event: ${event.type}`);
-        if (event.type === "agent.requestStart") {
-          if (processedCommandIds.has(eventId))
-            continue;
-          processedCommandIds.set(eventId, Date.now());
-          await onRequestStartAgent(ctx, event);
-        } else if (event.type === "agent.requestStop") {
-          if (processedCommandIds.has(eventId))
-            continue;
-          processedCommandIds.set(eventId, Date.now());
-          await onRequestStopAgent(ctx, event);
-        } else if (event.type === "daemon.ping") {
-          if (processedPingIds.has(eventId))
-            continue;
-          processedPingIds.set(eventId, Date.now());
-          handlePing();
-          await ctx.deps.backend.mutation(api.machines.ackPing, {
-            sessionId: ctx.sessionId,
-            machineId: ctx.machineId,
-            pingEventId: event._id
-          });
-        }
+        await dispatchCommandEvent(ctx, event, processedCommandIds, processedPingIds);
       } catch (err) {
         console.error(`[${formatTimestamp()}] ❌ Stream command event failed: ${err.message}`);
       }
@@ -14269,6 +14316,7 @@ var MODEL_REFRESH_INTERVAL_MS;
 var init_command_loop = __esm(() => {
   init_api3();
   init_client2();
+  init_machine();
   init_on_daemon_shutdown();
   init_on_request_start_agent();
   init_on_request_stop_agent();
@@ -14447,11 +14495,7 @@ function createDefaultDeps16() {
     }
   };
 }
-async function initDaemon() {
-  if (!acquireLock()) {
-    process.exit(1);
-  }
-  const convexUrl = getConvexUrl();
+function validateAuthentication(convexUrl) {
   const sessionId = getSessionId();
   if (!sessionId) {
     const otherUrls = getOtherSessionUrls();
@@ -14468,18 +14512,10 @@ Run: chatroom auth login`);
     releaseLock();
     process.exit(1);
   }
-  const machineId = getMachineId();
-  if (!machineId) {
-    console.error(`❌ Machine not registered`);
-    console.error(`
-Run any chatroom command first to register this machine,`);
-    console.error(`for example: chatroom auth status`);
-    releaseLock();
-    process.exit(1);
-  }
-  const client2 = await getConvexClient();
-  const typedSessionId = sessionId;
-  const validation = await client2.query(api.cliAuth.validateSession, { sessionId: typedSessionId });
+  return sessionId;
+}
+async function validateSession(client2, sessionId, convexUrl) {
+  const validation = await client2.query(api.cliAuth.validateSession, { sessionId });
   if (!validation.valid) {
     console.error(`❌ Session invalid: ${validation.reason}`);
     console.error(`
@@ -14487,32 +14523,34 @@ Run: chatroom auth login`);
     releaseLock();
     process.exit(1);
   }
+}
+function setupMachine() {
+  ensureMachineRegistered();
   const config3 = loadMachineConfig();
-  const openCodeService = new OpenCodeAgentService;
-  const piService = new PiAgentService;
-  const agentServices = new Map([
-    ["opencode", openCodeService],
-    ["pi", piService]
-  ]);
+  return config3;
+}
+async function registerCapabilities(client2, sessionId, config3, agentServices) {
+  const { machineId } = config3;
   const availableModels = await discoverModels(agentServices);
-  if (config3) {
-    try {
-      await client2.mutation(api.machines.register, {
-        sessionId: typedSessionId,
-        machineId,
-        hostname: config3.hostname,
-        os: config3.os,
-        availableHarnesses: config3.availableHarnesses,
-        harnessVersions: config3.harnessVersions,
-        availableModels
-      });
-    } catch (error) {
-      console.warn(`⚠️  Machine registration update failed: ${error.message}`);
-    }
+  try {
+    await client2.mutation(api.machines.register, {
+      sessionId,
+      machineId,
+      hostname: config3.hostname,
+      os: config3.os,
+      availableHarnesses: config3.availableHarnesses,
+      harnessVersions: config3.harnessVersions,
+      availableModels
+    });
+  } catch (error) {
+    console.warn(`⚠️  Machine registration update failed: ${error.message}`);
   }
+  return availableModels;
+}
+async function connectDaemon(client2, sessionId, machineId, convexUrl) {
   try {
     await client2.mutation(api.machines.updateDaemonStatus, {
-      sessionId: typedSessionId,
+      sessionId,
       machineId,
       connected: true
     });
@@ -14525,6 +14563,45 @@ Run: chatroom auth login`);
     releaseLock();
     process.exit(1);
   }
+}
+function logStartup(ctx, availableModels) {
+  console.log(`[${formatTimestamp()}] \uD83D\uDE80 Daemon started`);
+  console.log(`   CLI version: ${getVersion()}`);
+  console.log(`   Machine ID: ${ctx.machineId}`);
+  console.log(`   Hostname: ${ctx.config?.hostname ?? "unknown"}`);
+  console.log(`   Available harnesses: ${ctx.config?.availableHarnesses.join(", ") || "none"}`);
+  console.log(`   Available models: ${Object.keys(availableModels).length > 0 ? `${Object.values(availableModels).flat().length} models across ${Object.keys(availableModels).join(", ")}` : "none discovered"}`);
+  console.log(`   PID: ${process.pid}`);
+}
+async function recoverState(ctx) {
+  console.log(`
+[${formatTimestamp()}] \uD83D\uDD04 Recovering agent state...`);
+  try {
+    await recoverAgentState(ctx);
+  } catch (e) {
+    console.log(`   ⚠️  Recovery failed: ${e.message}`);
+    console.log(`   Continuing with fresh state`);
+  }
+}
+async function initDaemon() {
+  if (!acquireLock()) {
+    process.exit(1);
+  }
+  const convexUrl = getConvexUrl();
+  const sessionId = validateAuthentication(convexUrl);
+  const client2 = await getConvexClient();
+  const typedSessionId = sessionId;
+  await validateSession(client2, typedSessionId, convexUrl);
+  const config3 = setupMachine();
+  const { machineId } = config3;
+  const openCodeService = new OpenCodeAgentService;
+  const piService = new PiAgentService;
+  const agentServices = new Map([
+    ["opencode", openCodeService],
+    ["pi", piService]
+  ]);
+  const availableModels = await registerCapabilities(client2, typedSessionId, config3, agentServices);
+  await connectDaemon(client2, typedSessionId, machineId, convexUrl);
   const deps = createDefaultDeps16();
   deps.backend.mutation = (endpoint, args) => client2.mutation(endpoint, args);
   deps.backend.query = (endpoint, args) => client2.query(endpoint, args);
@@ -14539,21 +14616,8 @@ Run: chatroom auth login`);
     agentServices
   };
   registerEventListeners(ctx);
-  console.log(`[${formatTimestamp()}] \uD83D\uDE80 Daemon started`);
-  console.log(`   CLI version: ${getVersion()}`);
-  console.log(`   Machine ID: ${machineId}`);
-  console.log(`   Hostname: ${config3?.hostname ?? "Unknown"}`);
-  console.log(`   Available harnesses: ${config3?.availableHarnesses.join(", ") || "none"}`);
-  console.log(`   Available models: ${Object.keys(availableModels).length > 0 ? `${Object.values(availableModels).flat().length} models across ${Object.keys(availableModels).join(", ")}` : "none discovered"}`);
-  console.log(`   PID: ${process.pid}`);
-  console.log(`
-[${formatTimestamp()}] \uD83D\uDD04 Recovering agent state...`);
-  try {
-    await recoverAgentState(ctx);
-  } catch (e) {
-    console.log(`   ⚠️  Recovery failed: ${e.message}`);
-    console.log(`   Continuing with fresh state`);
-  }
+  logStartup(ctx, availableModels);
+  await recoverState(ctx);
   return ctx;
 }
 var init_init2 = __esm(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatroom-cli",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "CLI for multi-agent chatroom collaboration",
   "type": "module",
   "bin": {