chatroom-cli 1.2.3 → 1.2.4

package/dist/index.js

@@ -11284,22 +11284,9 @@ async function registerAgent(chatroomId, options, deps) {
         harnessVersions: machineInfo.harnessVersions,
         availableModels
       });
-      const agentHarness = machineInfo.availableHarnesses.length > 0 ? machineInfo.availableHarnesses[0] : undefined;
-      await d.backend.mutation(api.machines.saveTeamAgentConfig, {
-        sessionId,
-        chatroomId,
-        role,
-        type: "remote",
-        machineId: machineInfo.machineId,
-        agentHarness,
-        workingDir: process.cwd()
-      });
       console.log(`✅ Registered as remote agent for role "${role}"`);
       console.log(`   Machine: ${machineInfo.hostname} (${machineInfo.machineId})`);
       console.log(`   Working directory: ${process.cwd()}`);
-      if (agentHarness) {
-        console.log(`   Agent harness: ${agentHarness}`);
-      }
     } catch (error) {
       console.error(`❌ Registration failed: ${error.message}`);
       process.exit(1);
@@ -13694,9 +13681,14 @@ function parseMachineCommand(raw) {
         console.error(`   ⚠️  Invalid start-agent command: missing chatroomId, role, or agentHarness`);
         return null;
       }
+      if (!raw.reason) {
+        console.error(`   ⚠️  Invalid start-agent command: missing required reason field`);
+        return null;
+      }
       return {
         _id: raw._id,
         type: "start-agent",
+        reason: raw.reason,
         payload: {
           chatroomId,
           role,
@@ -13713,9 +13705,14 @@ function parseMachineCommand(raw) {
         console.error(`   ⚠️  Invalid stop-agent command: missing chatroomId or role`);
         return null;
       }
+      if (!raw.reason) {
+        console.error(`   ⚠️  Invalid stop-agent command: missing required reason field`);
+        return null;
+      }
       return {
         _id: raw._id,
         type: "stop-agent",
+        reason: raw.reason,
         payload: { chatroomId, role },
         createdAt: raw.createdAt
       };
@@ -13960,6 +13957,9 @@ async function handleStartAgent(ctx, command) {
   console.log(`      Chatroom: ${chatroomId}`);
   console.log(`      Role: ${role}`);
   console.log(`      Harness: ${agentHarness}`);
+  if (command.reason) {
+    console.log(`      Reason: ${command.reason}`);
+  }
   if (model) {
     console.log(`      Model: ${model}`);
   }
@@ -13987,14 +13987,19 @@ async function handleStartAgent(ctx, command) {
       chatroomId
     });
     const existingConfig = existingConfigs.configs.find((c) => c.machineId === ctx.machineId && c.role.toLowerCase() === role.toLowerCase());
-    if (existingConfig?.spawnedAgentPid) {
-      const existingPid = existingConfig.spawnedAgentPid;
-      const anyService = ctx.agentServices.values().next().value;
-      const isAlive = anyService ? anyService.isAlive(existingPid) : false;
+    const backendPid = existingConfig?.spawnedAgentPid;
+    const localEntry = ctx.deps.machine.listAgentEntries(ctx.machineId).find((e) => e.chatroomId === chatroomId && e.role.toLowerCase() === role.toLowerCase());
+    const localPid = localEntry?.entry.pid;
+    const pidsToKill = [
+      ...new Set([backendPid, localPid].filter((p) => p !== undefined))
+    ];
+    const anyService = ctx.agentServices.values().next().value;
+    for (const pid2 of pidsToKill) {
+      const isAlive = anyService ? anyService.isAlive(pid2) : false;
       if (isAlive) {
-        console.log(`   ⚠️  Existing agent detected (PID: ${existingPid}) — stopping before respawn`);
-        await onAgentShutdown(ctx, { chatroomId, role, pid: existingPid });
-        console.log(`   ✅ Existing agent stopped`);
+        console.log(`   ⚠️  Existing agent detected (PID: ${pid2}) — stopping before respawn`);
+        await onAgentShutdown(ctx, { chatroomId, role, pid: pid2 });
+        console.log(`   ✅ Existing agent stopped (PID: ${pid2})`);
       }
     }
   } catch (e) {
@@ -14129,46 +14134,64 @@ async function handleStopAgent(ctx, command) {
     chatroomId
   });
   const targetConfig = configsResult.configs.find((c) => c.machineId === ctx.machineId && c.role.toLowerCase() === role.toLowerCase());
-  if (!targetConfig?.spawnedAgentPid) {
+  const backendPid = targetConfig?.spawnedAgentPid;
+  const localEntry = ctx.deps.machine.listAgentEntries(ctx.machineId).find((e) => e.chatroomId === chatroomId && e.role.toLowerCase() === role.toLowerCase());
+  const localPid = localEntry?.entry.pid;
+  const allPids = [...new Set([backendPid, localPid].filter((p) => p !== undefined))];
+  if (allPids.length === 0) {
     const msg = "No running agent found (no PID recorded)";
     console.log(`   ⚠️  ${msg}`);
     return { result: msg, failed: true };
   }
-  const pidToKill = targetConfig.spawnedAgentPid;
-  console.log(`   Stopping agent with PID: ${pidToKill}`);
   const anyService = ctx.agentServices.values().next().value;
-  const isAlive = anyService ? anyService.isAlive(pidToKill) : false;
-  if (!isAlive) {
-    console.log(`   ⚠️  PID ${pidToKill} does not appear to belong to the expected agent`);
-    await clearAgentPidEverywhere(ctx, chatroomId, role);
-    console.log(`   Cleared stale PID`);
+  let anyKilled = false;
+  let lastError = null;
+  for (const pid of allPids) {
+    console.log(`   Stopping agent with PID: ${pid}`);
+    const isAlive = anyService ? anyService.isAlive(pid) : false;
+    if (!isAlive) {
+      console.log(`   ⚠️  PID ${pid} does not appear to belong to the expected agent`);
+      await clearAgentPidEverywhere(ctx, chatroomId, role);
+      console.log(`   Cleared stale PID`);
+      try {
+        await ctx.deps.backend.mutation(api.participants.leave, {
+          sessionId: ctx.sessionId,
+          chatroomId,
+          role
+        });
+        console.log(`   Removed participant record`);
+      } catch {}
+      continue;
+    }
     try {
-      await ctx.deps.backend.mutation(api.participants.leave, {
-        sessionId: ctx.sessionId,
+      const shutdownResult = await onAgentShutdown(ctx, {
         chatroomId,
-        role
+        role,
+        pid
       });
-      console.log(`   Removed participant record`);
-    } catch {}
-    return {
-      result: `PID ${pidToKill} appears stale (process not found or belongs to different program)`,
-      failed: true
-    };
+      const msg = shutdownResult.killed ? `Agent stopped (PID: ${pid})` : `Agent stop attempted (PID: ${pid}) — process may still be running`;
+      console.log(`   ${shutdownResult.killed ? "✅" : "⚠️ "} ${msg}`);
+      if (shutdownResult.killed) {
+        anyKilled = true;
+      }
+    } catch (e) {
+      lastError = e;
+      console.log(`   ⚠️  Failed to stop agent (PID: ${pid}): ${e.message}`);
+    }
   }
-  try {
-    const shutdownResult = await onAgentShutdown(ctx, {
-      chatroomId,
-      role,
-      pid: pidToKill
-    });
-    const msg = shutdownResult.killed ? `Agent stopped (PID: ${pidToKill})` : `Agent stop attempted (PID: ${pidToKill}) — process may still be running`;
-    console.log(`   ${shutdownResult.killed ? "✅" : "⚠️ "} ${msg}`);
-    return { result: msg, failed: !shutdownResult.killed };
-  } catch (e) {
-    const msg = `Failed to stop agent: ${e.message}`;
+  if (lastError && !anyKilled) {
+    const msg = `Failed to stop agent: ${lastError.message}`;
     console.log(`   ⚠️  ${msg}`);
     return { result: msg, failed: true };
   }
+  if (!anyKilled) {
+    return {
+      result: `All recorded PIDs appear stale (processes not found or belong to different programs)`,
+      failed: true
+    };
+  }
+  const killedCount = allPids.length > 1 ? ` (${allPids.length} PIDs)` : ``;
+  return { result: `Agent stopped${killedCount}`, failed: false };
 }
 var init_stop_agent = __esm(() => {
   init_api3();

package/package.json

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