chatroom-cli 1.115.2 → 1.115.4

package/dist/index.js

@@ -27949,7 +27949,7 @@ var init_v_literals_of = __esm(() => {
 });
 
 // ../../services/backend/src/domain/entities/agent.ts
-var AGENT_HARNESSES, AgentHarnessEnum, agentHarnessValidator, AGENT_TYPES, AgentTypeEnum, agentTypeValidator, MACHINE_COMMAND_TYPES, MachineCommandTypeEnum, machineCommandTypeValidator, MACHINE_COMMAND_STATUSES, MachineCommandStatusEnum, machineCommandStatusValidator, AGENT_START_REASONS, AgentStartReasonEnum, agentStartReasonValidator, USER_EXPLICIT_START_REASONS, EXPLICIT_DAEMON_START_REASONS, isExplicitDaemonStart = (reason) => EXPLICIT_DAEMON_START_REASONS.includes(reason), AGENT_STOP_REASONS, agentPostStopDesiredStateValidator, AgentStopReasonEnum, agentStopReasonValidator, isAgentStopReason = (value) => AGENT_STOP_REASONS.includes(value), MODEL_SOURCES, ModelSourceEnum, modelSourceValidator;
+var AGENT_HARNESSES, AgentHarnessEnum, agentHarnessValidator, AGENT_TYPES, AgentTypeEnum, agentTypeValidator, MACHINE_COMMAND_TYPES, MachineCommandTypeEnum, machineCommandTypeValidator, MACHINE_COMMAND_STATUSES, MachineCommandStatusEnum, machineCommandStatusValidator, AGENT_START_REASONS, AgentStartReasonEnum, agentStartReasonValidator, USER_EXPLICIT_START_REASONS, EXPLICIT_DAEMON_START_REASONS, isExplicitDaemonStart = (reason) => EXPLICIT_DAEMON_START_REASONS.includes(reason), AGENT_STOP_REASONS, agentPostStopDesiredStateValidator, AgentStopReasonEnum, agentStopReasonValidator, MODEL_SOURCES, ModelSourceEnum, modelSourceValidator;
 var init_agent = __esm(() => {
   init_values();
   init_v_literals_of();
@@ -28127,7 +28127,7 @@ function normalizeAgentLifecycleFact(raw) {
       emittedAt: Number(rest.emittedAt)
     };
   }
-  if (kind === "spawned" || kind === "exited" || kind === "activity" || kind === "turn_failed") {
+  if (kind === "spawned" || kind === "exited" || kind === "activity" || kind === "turn_failed" || kind === "chatroom_shutdown_complete") {
     return rest;
   }
   throw new Error(`Unknown agent lifecycle fact kind: ${String(kind)}`);
@@ -28147,6 +28147,8 @@ function buildActivityLifecycleFact(params) {
 function agentLifecycleDeliveryKey(machineId, fact) {
   if (fact.kind === "cleared_all_pids")
     return `${machineId}:__machine__`;
+  if (fact.kind === "chatroom_shutdown_complete")
+    return `${machineId}:${fact.chatroomId}:shutdown:${fact.commandId}`;
   return `${machineId}:${fact.chatroomId}:${fact.role.toLowerCase()}`;
 }
 function buildAgentLifecycleRevisionKey(prefix, parts2) {
@@ -28172,7 +28174,7 @@ function isTurnPhaseIdle(phase) {
 var init_check_agent_slot = () => {};
 
 // src/daemon/services/task-service/domain/usecase/native-cold-session-delivery.ts
-function snapshotRequestsNativeColdSession(task) {
+function taskRequestsNativeColdSession(task) {
   return task.requestsNativeColdSession === true;
 }
 function isColdStartEligibleSlotState(slot) {
@@ -28181,10 +28183,10 @@ function isColdStartEligibleSlotState(slot) {
   return isSlotIdle(slot.state);
 }
 function isNativeColdSessionDeliveryOwnedSpawn(task, slot) {
-  return snapshotRequestsNativeColdSession(task) && isColdStartEligibleSlotState(slot);
+  return taskRequestsNativeColdSession(task) && isColdStartEligibleSlotState(slot);
 }
 function explainColdSessionDeliveryBlock(task, slot) {
-  if (!snapshotRequestsNativeColdSession(task))
+  if (!taskRequestsNativeColdSession(task))
     return null;
   if (isChatroomStopScopeActive(task.chatroomId)) {
     return "chatroom_stop_scope_active";
@@ -28429,9 +28431,6 @@ var init_assigned_task = __esm(() => {
 });
 
 // src/daemon/services/task-service/domain/usecase/native-ready-invariant.ts
-function isAgentReadyForNativeDelivery(task, slot) {
-  return explainAgentReadyForNativeDeliveryBlock(task, slot) === null;
-}
 function explainAgentReadyForNativeDeliveryBlock(task, slot) {
   const runtimeConfig = resolveAgentRuntimeConfig(task, slot);
   if (!runtimeConfig)
@@ -28447,13 +28446,10 @@ function explainAgentReadyForNativeDeliveryBlock(task, slot) {
     return null;
   }
   if (!slot) {
-    return task.agentConfig.spawnedAgentPid == null ? "spawned_pid_missing" : `slot_missing (expectedPid=${task.agentConfig.spawnedAgentPid})`;
+    return "slot_missing";
   }
   if (!isSlotRunning(slot.state)) {
-    if (task.agentConfig.spawnedAgentPid != null && slot.pid !== task.agentConfig.spawnedAgentPid) {
-      return `pid_mismatch (slotPid=${slot.pid ?? "none"}, expectedPid=${task.agentConfig.spawnedAgentPid})`;
-    }
-    return `slot_not_running (slotState=${slot.state}, expectedPid=${task.agentConfig.spawnedAgentPid ?? "none"})`;
+    return `slot_not_running (slotState=${slot.state})`;
   }
   if (slot.pid == null) {
     return "slot_pid_missing";
@@ -28510,9 +28506,6 @@ var init_native_integration = __esm(() => {
 });
 
 // src/daemon/services/task-service/domain/usecase/native-task-injector-logic.ts
-function shouldDeliverNativeTask(task, opts) {
-  return explainNativeDeliveryBlock(task, opts) === null;
-}
 function explainNativeDeliveryBlock(task, opts) {
   if (!isDeliverableNativeTaskStatus(task.status)) {
     return `task_status_not_deliverable (status=${task.status})`;
@@ -28546,8 +28539,8 @@ var init_native_task_injector_logic = __esm(() => {
 // ../../services/backend/src/domain/entities/participant.ts
 var NATIVE_WAITING_ACTION = "native:waiting", NATIVE_TASK_INJECTED_ACTION = "native:task-injected", GET_NEXT_TASK_STARTED_ACTION = "get-next-task:started";
 
-// src/infrastructure/mappers/map-assigned-task.ts
-function mapAssignedTaskSnapshot(row) {
+// src/infrastructure/mappers/map-assigned-task-view.ts
+function mapAssignedTask(row) {
   return {
     taskId: row.taskId,
     chatroomId: row.chatroomId,
@@ -28557,11 +28550,7 @@ function mapAssignedTaskSnapshot(row) {
     createdAt: row.createdAt,
     agentConfig: {
       role: row.agentConfig.role,
-      machineId: row.agentConfig.machineId,
-      spawnedAgentPid: row.agentConfig.spawnedAgentPid,
-      desiredState: row.agentConfig.desiredState,
-      circuitState: row.agentConfig.circuitState,
-      configLifecycleRevision: row.agentConfig.configLifecycleRevision
+      machineId: row.agentConfig.machineId
     },
     assignee: row.assignee,
     participant: row.participant,
@@ -28570,7 +28559,7 @@ function mapAssignedTaskSnapshot(row) {
 }
 function mapAssignedTaskView(row) {
   return {
-    ...mapAssignedTaskSnapshot(row),
+    ...mapAssignedTask(row),
     taskContent: row.taskContent,
     taskEnvelope: row.taskEnvelope,
     startInNewSession: row.startInNewSession
@@ -28744,8 +28733,6 @@ function stableBlockReason(reason) {
     "slot_missing",
     "slot_not_running",
     "slot_pid_missing",
-    "spawned_pid_missing",
-    "pid_mismatch",
     "harness_session_missing",
     "turn_not_idle",
     "working_dir_missing"
@@ -28797,14 +28784,17 @@ function decideNextDelivery(tasks, context5) {
   if (isSlotStopping(context5.slot?.state ?? "idle")) {
     return { kind: "wait", taskId: task.taskId, reason: "slot_stopping" };
   }
-  const coldSession = context5.snapshotRequestsNativeColdSession(task);
-  const startAllowed = blockReason.startsWith("slot_missing") || blockReason.startsWith("slot_not_running") || blockReason.startsWith("spawned_pid_missing");
+  const coldSession = context5.taskRequestsNativeColdSession(task);
+  const startAllowed = blockReason.startsWith("slot_missing") || blockReason.startsWith("slot_not_running");
   if (startAllowed && !coldSession && task.status === "pending" && isSlotIdle(context5.slot?.state ?? "idle") && runtimeConfig.workingDir) {
     return { kind: "start-agent", taskId: task.taskId };
   }
   if (blockReason.startsWith("harness_session_missing")) {
     return { kind: "wait", taskId: task.taskId, reason: "session_not_ready" };
   }
+  if (blockReason.startsWith("turn_not_idle")) {
+    return { kind: "wait", taskId: task.taskId, reason: "turn_not_idle" };
+  }
   return { kind: "blocked", taskId: task.taskId, reason: stableBlockReason(blockReason) };
 }
 var init_delivery_decision = __esm(() => {
@@ -28930,7 +28920,7 @@ class NativeTaskDeliveryCoordinator {
         deliveryInFlight: false,
         agentLifecycleInFlight: isRestartOrchestratorInFlight(firstTask.chatroomId, role),
         isNativeHarness: taskService.isNativeHarness,
-        snapshotRequestsNativeColdSession: taskService.snapshotRequestsNativeColdSession,
+        taskRequestsNativeColdSession: taskService.taskRequestsNativeColdSession,
         explainNativeDeliveryBlock: taskService.explainNativeDeliveryBlock
       });
       const attemptId = `${Date.now()}-${firstTask.taskId}`;
@@ -28970,7 +28960,6 @@ class NativeTaskDeliveryCoordinator {
             workingDir: runtimeConfig.workingDir,
             reason: AgentStartReasonEnum["platform.pending_task_wake"],
             wantResume: false,
-            lifecycleRevision: row.agentConfig.configLifecycleRevision,
             taskId: row.taskId
           }, context5.signal));
           console.log(`[NativeDelivery:execution] attempt=${attemptId} role=${role} chatroom=${row.chatroomId} task=${row.taskId} operation=start-agent result=${startResult && typeof startResult === "object" && "success" in startResult ? startResult.success : "completed"}`);
@@ -29043,7 +29032,7 @@ var init_native_task_delivery_coordinator = __esm(() => {
 
 // src/daemon/services/task-service/service/native-delivery/task-delivery-processor.ts
 async function processTasksUpdate(runtime4, effectContext2, agentMgr, runSerializedForAgent, taskService, sessionDeps, machineId, pass, lifecycleOutbox, isTaskActive, options) {
-  const first = options.snapshots[0];
+  const first = options.tasks[0];
   if (!first)
     return;
   logNativeDeliveryTrigger(pass, first.agentConfig.role, first.chatroomId, first.taskId);
@@ -29060,7 +29049,6 @@ async function processTasksUpdate(runtime4, effectContext2, agentMgr, runSeriali
         workingDir: runtimeConfig.workingDir,
         reason: AgentStartReasonEnum["platform.pending_task_wake"],
         wantResume: false,
-        lifecycleRevision: task.agentConfig.configLifecycleRevision,
         taskId: task.taskId
       }, context5.signal));
     },
@@ -29080,7 +29068,7 @@ async function processTasksUpdate(runtime4, effectContext2, agentMgr, runSeriali
     }
   };
   await getNativeTaskDeliveryCoordinator().reconcileRoleTasks({
-    tasks: [...options.snapshots],
+    tasks: [...options.tasks],
     pass,
     runtime: runtime4,
     effectContext: effectContext2,
@@ -29264,7 +29252,7 @@ function resolveSessionAugmentationForTask(task, role) {
   }
   return resolveSessionAugmentationForRole(role);
 }
-function taskRequestsNativeColdSession(task) {
+function taskRequestsNativeColdSession2(task) {
   if (task.taskEnvelope !== undefined) {
     return normalizeTaskEnvelope({ taskEnvelope: task.taskEnvelope }).sessionPolicy === "new";
   }
@@ -29287,12 +29275,11 @@ var init_parse_session_augmentation = __esm(() => {
 });
 
 // ../../services/backend/config/reliability.ts
-var HARNESS_SESSION_READY_TIMEOUT_MS = 5000, DAEMON_HEARTBEAT_INTERVAL_MS, DAEMON_HEARTBEAT_TTL_MS, AGENT_REQUEST_DEADLINE_MS = 120000, MACHINE_COMMAND_LEASE_RENEWAL_INTERVAL_MS = 20000, MACHINE_COMMAND_DAEMON_ROUTINE_TTL_MS, AGENT_STOP_TERMINAL_RETENTION_MS, SCOPE_TARGET_STOP_TIMEOUT_MS = 1e4, AGENT_LIFECYCLE_OPERATION_TIMEOUT_MS = 120000, CONNECTION_CLOSE_REQUEST_TTL_MS, ENHANCER_TERMINAL_JOB_RETENTION_MS;
+var HARNESS_SESSION_READY_TIMEOUT_MS = 5000, DAEMON_HEARTBEAT_INTERVAL_MS, DAEMON_HEARTBEAT_TTL_MS, AGENT_REQUEST_DEADLINE_MS = 120000, MACHINE_COMMAND_LEASE_RENEWAL_INTERVAL_MS = 20000, MACHINE_COMMAND_DAEMON_ROUTINE_TTL_MS, SCOPE_TARGET_STOP_TIMEOUT_MS = 1e4, AGENT_LIFECYCLE_OPERATION_TIMEOUT_MS = 120000, 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;
   MACHINE_COMMAND_DAEMON_ROUTINE_TTL_MS = 5 * 60000;
-  AGENT_STOP_TERMINAL_RETENTION_MS = 30 * 24 * 60 * 60 * 1000;
   CONNECTION_CLOSE_REQUEST_TTL_MS = 10 * 60000;
   ENHANCER_TERMINAL_JOB_RETENTION_MS = 30 * 24 * 60 * 60 * 1000;
 });
@@ -29314,7 +29301,7 @@ async function waitForHarnessSessionId(agentMgr, chatroomId, role, signal) {
   return null;
 }
 async function ensureColdSessionBeforeNativeInject(task, deps) {
-  if (!taskRequestsNativeColdSession({
+  if (!taskRequestsNativeColdSession2({
     content: task.taskContent ?? "",
     taskEnvelope: task.taskEnvelope,
     startInNewSession: task.startInNewSession
@@ -29460,7 +29447,7 @@ function claimPendingTaskIfNeeded(task, deps) {
   });
 }
 function resolveHarnessSessionPolicy(task, initialHarnessSessionId) {
-  if (!taskRequestsNativeColdSession({
+  if (!taskRequestsNativeColdSession2({
     content: task.taskContent ?? "",
     taskEnvelope: task.taskEnvelope,
     startInNewSession: task.startInNewSession
@@ -29674,7 +29661,7 @@ class AgentWorkManager {
     });
     this.deliveryTaskService = {
       isNativeHarness,
-      snapshotRequestsNativeColdSession,
+      taskRequestsNativeColdSession,
       explainNativeDeliveryBlock,
       releaseTaskAfterTurnFailure: deps.taskService.releaseTaskAfterTurnFailure,
       loadAssignedTaskForAction: deps.taskService.loadAssignedTaskForAction,
@@ -29777,7 +29764,7 @@ class AgentWorkManager {
   }
   async handleTaskServiceNotification(notification) {
     if (notification.kind === "bootstrap") {
-      await this.requestReconcileForSnapshots(notification.snapshots, "bootstrap");
+      await this.requestReconcileForTasks(notification.tasks, "bootstrap");
       return;
     }
     if (notification.event.eventType === "task_deleted" /* TaskDeleted */) {
@@ -29825,14 +29812,14 @@ class AgentWorkManager {
         do {
           const source = state.pendingSource ?? params.source;
           state.pendingSource = undefined;
-          const snapshots = this.deps.taskSnapshotState.listForRole(params.chatroomId, params.role);
-          if (snapshots.length === 0) {
+          const tasks = this.deps.taskInboxState.listForRole(params.chatroomId, params.role);
+          if (tasks.length === 0) {
             logNativeDeliveryDecision(source, params.role, params.chatroomId, "idle", undefined, {
               reason: "no_deliverable_task",
               attemptId: `${Date.now()}-${params.chatroomId}-${params.role}`
             });
           }
-          await this.reconcileRole(source, snapshots, params.onTaskDelivered);
+          await this.reconcileRole(source, tasks, params.onTaskDelivered);
         } while (state.pendingSource !== undefined);
       } finally {
         if (this.reconcileStates.get(key) === state)
@@ -29854,8 +29841,8 @@ class AgentWorkManager {
     });
     return delivered;
   }
-  async requestReconcileForSnapshots(snapshots, source) {
-    const roles = new Set(snapshots.map((snapshot) => `${snapshot.chatroomId}:${snapshot.agentConfig.role.toLowerCase()}`));
+  async requestReconcileForTasks(tasks, source) {
+    const roles = new Set(tasks.map((snapshot) => `${snapshot.chatroomId}:${snapshot.agentConfig.role.toLowerCase()}`));
     await Promise.all([...roles].map((key) => {
       const separator = key.indexOf(":");
       return this.requestReconcile({
@@ -29865,11 +29852,11 @@ class AgentWorkManager {
       });
     }));
   }
-  async reconcileRole(pass, snapshots, onTaskDelivered) {
-    if (snapshots.length === 0)
+  async reconcileRole(pass, tasks, onTaskDelivered) {
+    if (tasks.length === 0)
       return;
     await processTasksUpdate(this.deps.runtime, this.deps.effectContext, this.deps.agentMgr, this.deps.runSerializedForAgent, this.deliveryTaskService, this.deps.sessionDeps, this.deps.machineId, pass, this.deps.lifecycleOutbox, ({ chatroomId, role, taskId }) => this.deps.agentTaskState.get({ chatroomId, role })?.taskId === taskId, {
-      snapshots,
+      tasks,
       onTaskDelivered: (args2) => {
         this.recordTaskDelivered(args2);
         onTaskDelivered?.(args2);
@@ -30291,11 +30278,6 @@ var init_agent_task_state = () => {};
 function defaultNativeTurnPhase() {
   return "idle";
 }
-function isNativeSlotIdleForDelivery(slot) {
-  if (slot?.state !== "running")
-    return false;
-  return (slot.nativeTurnPhase ?? defaultNativeTurnPhase()) === "idle";
-}
 function setNativeTurnPhase(slot, phase) {
   slot.nativeTurnPhase = phase;
 }
@@ -30441,9 +30423,6 @@ function normalizeAgentStopRole(role) {
 function buildAgentStopTargetKey(args2) {
   return `${args2.machineId}:${normalizeAgentStopRole(args2.role)}:${args2.pid}`;
 }
-function buildAgentStopRevisionKey(args2) {
-  return `${args2.stopCommandId}:${args2.targetKey}`;
-}
 
 // src/infrastructure/deps/process.ts
 function isProcessAlive(kill, pid) {
@@ -30675,9 +30654,6 @@ function createChatroomScopeBarrier() {
     }
   };
 }
-function resetChatroomScopeBarrierForTests() {
-  activeChatroomScopeDepth.clear();
-}
 function createStopAgentTargetsDeps(args2) {
   const confirmed = createStopAgentConfirmedDeps(args2.confirmedDeps);
   return {
@@ -30707,26 +30683,6 @@ async function runRoleScopedStop(args2) {
     targets
   });
 }
-function createStopAgentTargetsDepsForCommand(args2) {
-  const base = createStopAgentTargetsDeps(args2);
-  return {
-    ...base,
-    buildRevisionKey: (target) => buildAgentStopRevisionKey({ stopCommandId: args2.stopCommandId, targetKey: target.targetKey })
-  };
-}
-async function runExactTargetsStop(args2) {
-  const deps = createStopAgentTargetsDepsForCommand(args2);
-  const targets = args2.targets.map((target) => ({
-    ...target,
-    agentHarness: target.agentHarness
-  }));
-  return stopAgentTargets(deps, {
-    chatroomId: args2.chatroomId,
-    scope: { kind: "chatroom" },
-    reason: args2.reason,
-    targets
-  });
-}
 var activeChatroomScopeDepth;
 var init_execute_stop_targets_adapter = __esm(() => {
   init_stop_agent_confirmed_adapter();
@@ -30961,9 +30917,6 @@ var init_agent_lifecycle_service = __esm(() => {
       const key = agentKey(opts.chatroomId, opts.role);
       const currentSlot = yield* getSlotFromRef(key);
       if (currentSlot && currentSlot.state !== "idle") {
-        if (opts.lifecycleRevision !== undefined && currentSlot.authorizedLifecycleRevision !== opts.lifecycleRevision) {
-          return { success: false, error: "stale_revision" };
-        }
         return {
           success: true,
           pid: currentSlot.pid
@@ -31527,9 +31480,6 @@ class AgentProcessManager {
     } else if (slot.stopRequested) {
       return { success: false, error: "stop_requested" };
     }
-    if (slot.state !== "idle" && opts.lifecycleRevision !== undefined && slot.authorizedLifecycleRevision !== opts.lifecycleRevision) {
-      return { success: false, error: "stale_revision" };
-    }
     if (slot.state === "running" && slot.pid && !isProcessAlive(this.deps.processes.kill, slot.pid)) {
       this.clearSlotRuntimeState(slot);
     }
@@ -32242,12 +32192,6 @@ class AgentProcessManager {
     }).catch((err) => {
       console.log(`   ⚠️  Failed to record agent.started event: ${err.message}`);
     });
-    const lifecycleRevision = slot.authorizedLifecycleRevision ?? opts.lifecycleRevision;
-    if (lifecycleRevision === undefined) {
-      this.deps.processes.kill(pid, "SIGTERM");
-      this.resetSlotIdle(slot);
-      return Promise.resolve();
-    }
     const emittedAt = this.deps.clock.now();
     return this.deps.lifecycleOutbox.enqueue({
       kind: "spawned",
@@ -32263,14 +32207,9 @@ class AgentProcessManager {
         pid,
         emittedAt
       }),
-      emittedAt,
-      lifecycleRevision
-    }).then((result) => {
-      if (result.rejectionReason) {
-        console.log(`   ⚠️  Spawn rejected by backend: ${result.rejectionReason}`);
-        this.deps.processes.kill(pid, "SIGTERM");
-        this.resetSlotIdle(slot);
-      }
+      emittedAt
+    }).then(() => {
+      return;
     }).catch((err) => console.log(`   ⚠️  Failed to enqueue agent spawned lifecycle fact: ${err.message}`));
   }
   registerSpawnCallbacks(slot, opts, spawnResult, pid) {
@@ -32403,14 +32342,12 @@ class AgentProcessManager {
       machineId: this.deps.machineId,
       chatroomId: opts.chatroomId,
       role: opts.role,
-      lifecycleRevision: opts.lifecycleRevision,
       taskId: opts.taskId
     });
     if (!authorization.allowed) {
       this.resetSlotIdle(slot);
       return { success: false, error: authorization.reason };
     }
-    slot.authorizedLifecycleRevision = authorization.lifecycleRevision;
     const wantResume = opts.wantResume;
     console.log(`[AgentProcessManager] harness start: role=${opts.role} harness=${opts.agentHarness} wantResume=${wantResume} reason=${opts.reason}`);
     try {
@@ -32470,8 +32407,6 @@ class AgentProcessManager {
   async forceClearStuckStoppingSlot(key, slot, chatroomId, role, reason, clearStopIntent = false) {
     const pid = slot.pid;
     const harness = slot.harness;
-    const stopCommandId = slot.stopCommandId;
-    const stopTargetKey = slot.stopTargetKey;
     const durationMs = slot.stoppingSince ? this.deps.clock.now() - slot.stoppingSince : STOPPING_TIMEOUT_MS;
     this.bumpStopGeneration(slot);
     this.clearSlotRuntimeState(slot);
@@ -32505,32 +32440,6 @@ class AgentProcessManager {
       };
       this.recordAgentExit(role, exitArgs, "Failed to record stop-timeout exit");
     }
-    if (pid && stopCommandId && stopTargetKey) {
-      try {
-        await this.deps.backend.mutation(api.agentStops.reportTargetOutcome, {
-          sessionId: this.deps.sessionId,
-          stopCommandId,
-          chatroomId,
-          machineId: this.deps.machineId,
-          targetKey: stopTargetKey,
-          role,
-          pid,
-          status: "failed",
-          outcome: "failed",
-          termination: "forced",
-          errorMessage: "Daemon force-cleared a timed-out stop operation"
-        });
-        await this.deps.backend.mutation(api.agentStops.completeMachineExecution, {
-          sessionId: this.deps.sessionId,
-          stopCommandId,
-          machineId: this.deps.machineId,
-          status: "failed",
-          errorMessage: "Daemon force-cleared a timed-out stop operation"
-        });
-      } catch (error) {
-        console.log(`   ⚠️  Failed to finalize timed-out stop for ${role}@${chatroomId}: ${error.message}`);
-      }
-    }
     await this.clearAgentPidQuietly(chatroomId, role);
   }
   async doStop(key, slot, pid, opts, stopGeneration) {
@@ -32618,10 +32527,7 @@ function createHarnessActivityEmitter() {
     }
   };
 }
-var HARNESS_ACTIVITY_KINDS;
-var init_harness_activity_emitter = __esm(() => {
-  HARNESS_ACTIVITY_KINDS = ["transport", "progress", "waiting", "failure"];
-});
+var init_harness_activity_emitter = () => {};
 
 // src/daemon/services/agent-process-service/index.ts
 var init_agent_process_service2 = __esm(() => {
@@ -32643,58 +32549,58 @@ var init_agent_process_contracts = __esm(() => {
   init_harness_activity_emitter();
 });
 
-// src/daemon/infrastructure/inbox/task-state-manager.ts
-function snapshotKey(taskId, role) {
+// src/daemon/infrastructure/inbox/task-inbox-state.ts
+function taskKey(taskId, role) {
   return `${taskId}:${role.toLowerCase()}`;
 }
-function isStaleStatusPatch(snapshot, status3, updatedAt) {
-  if (snapshot.updatedAt > updatedAt)
+function isStaleStatusPatch(current, status3, updatedAt) {
+  if (current.updatedAt > updatedAt)
     return true;
-  return snapshot.updatedAt === updatedAt && snapshot.status === "completed" && status3 !== "completed";
+  return current.updatedAt === updatedAt && current.status === "completed" && status3 !== "completed";
 }
 
-class TaskStateManager {
-  snapshots = new Map;
+class TaskInboxState {
+  tasks = new Map;
   initialized = false;
-  replace(snapshots) {
-    this.snapshots.clear();
-    this.upsert(snapshots);
+  replace(tasks) {
+    this.tasks.clear();
+    this.upsert(tasks);
     this.initialized = true;
   }
   listForRole(chatroomId, role) {
     const roleLower = role.toLowerCase();
-    return [...this.snapshots.values()].filter((snapshot) => snapshot.chatroomId === chatroomId && snapshot.agentConfig.role.toLowerCase() === roleLower);
+    return [...this.tasks.values()].filter((task) => task.chatroomId === chatroomId && task.agentConfig.role.toLowerCase() === roleLower);
   }
   isInitialized() {
     return this.initialized;
   }
   getForRole(chatroomId, role, taskId) {
-    const snapshot = this.snapshots.get(snapshotKey(taskId, role));
-    return snapshot?.chatroomId === chatroomId ? snapshot : null;
+    const task = this.tasks.get(taskKey(taskId, role));
+    return task?.chatroomId === chatroomId ? task : null;
   }
   listAll() {
-    return [...this.snapshots.values()];
+    return [...this.tasks.values()];
   }
-  upsert(snapshots) {
-    for (const snapshot of snapshots) {
-      this.snapshots.set(snapshotKey(snapshot.taskId, snapshot.agentConfig.role), snapshot);
+  upsert(tasks) {
+    for (const task of tasks) {
+      this.tasks.set(taskKey(task.taskId, task.agentConfig.role), task);
     }
   }
   remove(chatroomId, role, taskId) {
-    const key = snapshotKey(taskId, role);
-    const snapshot = this.snapshots.get(key);
-    if (!snapshot || snapshot.chatroomId !== chatroomId)
+    const key = taskKey(taskId, role);
+    const task = this.tasks.get(key);
+    if (!task || task.chatroomId !== chatroomId)
       return false;
-    return this.snapshots.delete(key);
+    return this.tasks.delete(key);
   }
   markStatus(chatroomId, role, taskId, status3, updatedAt) {
-    const key = snapshotKey(taskId, role);
-    const snapshot = this.snapshots.get(key);
-    if (!snapshot || snapshot.chatroomId !== chatroomId)
+    const key = taskKey(taskId, role);
+    const task = this.tasks.get(key);
+    if (!task || task.chatroomId !== chatroomId)
       return false;
-    if (isStaleStatusPatch(snapshot, status3, updatedAt))
+    if (isStaleStatusPatch(task, status3, updatedAt))
       return false;
-    this.snapshots.set(key, { ...snapshot, status: status3, updatedAt });
+    this.tasks.set(key, { ...task, status: status3, updatedAt });
     return true;
   }
 }
@@ -32702,7 +32608,7 @@ class TaskStateManager {
 // src/daemon/services/task-service/service/task-service.ts
 function createTaskService(deps) {
   const gateway = createConvexNativeTaskDeliveryGateway(deps.backend);
-  const taskSnapshotState = new TaskStateManager;
+  const taskInboxState = new TaskInboxState;
   const listeners = new Set;
   let inboxPollTimer;
   let inboxPollInFlight = false;
@@ -32711,10 +32617,10 @@ function createTaskService(deps) {
   };
   const applyInboxEvent = (event) => {
     if (event.eventType === "task_deleted" /* TaskDeleted */ || event.task.status === "completed") {
-      taskSnapshotState.remove(event.chatroomId, event.role, event.taskId);
+      taskInboxState.remove(event.chatroomId, event.role, event.taskId);
       return true;
     }
-    taskSnapshotState.upsert([
+    taskInboxState.upsert([
       {
         taskId: event.task.taskId,
         chatroomId: event.task.chatroomId,
@@ -32781,9 +32687,9 @@ function createTaskService(deps) {
       machineId: deps.machineId,
       eventId
     }),
-    listTasksForRole: (chatroomId, role) => taskSnapshotState.listForRole(chatroomId, role),
-    listAllTasks: () => taskSnapshotState.listAll(),
-    taskSnapshotState,
+    listTasksForRole: (chatroomId, role) => taskInboxState.listForRole(chatroomId, role),
+    listAllTasks: () => taskInboxState.listAll(),
+    taskInboxState,
     releaseTaskAfterTurnFailure: async (args2) => {
       const result = await gateway.releaseTaskAfterTurnFailure({
         sessionId: deps.sessionId,
@@ -32791,7 +32697,7 @@ function createTaskService(deps) {
         role: args2.role,
         taskId: args2.taskId
       });
-      taskSnapshotState.markStatus(args2.chatroomId, args2.role, args2.taskId, result.status, result.updatedAt);
+      taskInboxState.markStatus(args2.chatroomId, args2.role, args2.taskId, result.status, result.updatedAt);
       return result;
     },
     loadAssignedTaskForAction: async ({ chatroomId, role, taskId }) => {
@@ -32824,55 +32730,6 @@ var init_task_service2 = __esm(() => {
 });
 
 // src/daemon/services/service-interfaces.ts
-var exports_service_interfaces = {};
-__export(exports_service_interfaces, {
-  untrackChildPid: () => untrackChildPid,
-  trackChildPid: () => trackChildPid,
-  snapshotRequestsNativeColdSession: () => snapshotRequestsNativeColdSession,
-  shouldDeliverNativeTask: () => shouldDeliverNativeTask,
-  setNativeTurnPhase: () => setNativeTurnPhase,
-  runRoleScopedStop: () => runRoleScopedStop,
-  runNativeInjectionEffect: () => runNativeInjectionEffect,
-  runExactTargetsStop: () => runExactTargetsStop,
-  runConfirmedStop: () => runConfirmedStop,
-  resetRoleDeliveryState: () => resetRoleDeliveryState,
-  resetChatroomScopeBarrierForTests: () => resetChatroomScopeBarrierForTests,
-  reapOrphanedProcessGroupsEffect: () => reapOrphanedProcessGroupsEffect,
-  reapOrphanedProcessGroups: () => reapOrphanedProcessGroups,
-  isNativeSlotIdleForDelivery: () => isNativeSlotIdleForDelivery,
-  isNativeHarness: () => isNativeHarness,
-  isDeliverableNativeTaskStatus: () => isDeliverableNativeTaskStatus,
-  isChatroomStopScopeActive: () => isChatroomStopScopeActive,
-  isAgentReadyForNativeDelivery: () => isAgentReadyForNativeDelivery,
-  getChildPidsFilePath: () => getChildPidsFilePath,
-  forceKillAllTrackedProcessGroupsEffect: () => forceKillAllTrackedProcessGroupsEffect,
-  forceKillAllTrackedProcessGroups: () => forceKillAllTrackedProcessGroups,
-  explainNativeDeliveryBlock: () => explainNativeDeliveryBlock,
-  explainAgentReadyForNativeDeliveryBlock: () => explainAgentReadyForNativeDeliveryBlock,
-  defaultNativeTurnPhase: () => defaultNativeTurnPhase,
-  createTaskService: () => createTaskService,
-  createStopAgentTargetsDepsForCommand: () => createStopAgentTargetsDepsForCommand,
-  createStopAgentTargetsDeps: () => createStopAgentTargetsDeps,
-  createStopAgentConfirmedDeps: () => createStopAgentConfirmedDeps,
-  createHarnessActivityEmitter: () => createHarnessActivityEmitter,
-  createDaemonAuditPort: () => createDaemonAuditPort,
-  createConvexNativeTaskDeliveryGateway: () => createConvexNativeTaskDeliveryGateway,
-  createChatroomScopeBarrier: () => createChatroomScopeBarrier,
-  createAgentTaskStateService: () => createAgentTaskStateService,
-  createAgentProcessService: () => createAgentProcessService,
-  createAgentProcessManagerService: () => createAgentProcessManagerService,
-  createAgentProcessCommandBus: () => createAgentProcessCommandBus,
-  clearTrackedPidsEffect: () => clearTrackedPidsEffect,
-  clearTrackedPids: () => clearTrackedPids,
-  buildStopTargetDescriptor: () => buildStopTargetDescriptor,
-  buildNativeInjectionPrompt: () => buildNativeInjectionPrompt,
-  STOPPING_TIMEOUT_MS: () => STOPPING_TIMEOUT_MS,
-  InMemoryActiveTaskStateStore: () => InMemoryActiveTaskStateStore,
-  HARNESS_ACTIVITY_KINDS: () => HARNESS_ACTIVITY_KINDS,
-  DefaultAgentTaskStateService: () => DefaultAgentTaskStateService,
-  AgentWorkManager: () => AgentWorkManager,
-  AgentProcessManager: () => AgentProcessManager
-});
 var init_service_interfaces = __esm(() => {
   init_task_service2();
   init_agent_process_service2();
@@ -89739,6 +89596,7 @@ function toConvexLifecycleFact(fact) {
   return {
     ...normalized,
     chatroomId: normalized.chatroomId,
+    ...normalized.kind === "chatroom_shutdown_complete" ? { commandId: normalized.commandId } : {},
     ...(normalized.kind === "activity" || normalized.kind === "turn_failed") && normalized.taskId ? { taskId: normalized.taskId } : {}
   };
 }
@@ -89750,10 +89608,7 @@ function createAgentLifecycleSend(session2) {
       fact: toConvexLifecycleFact(fact)
     };
     const result = await session2.backend.mutation(api.machines.projectAgentLifecycleFact, args2);
-    return {
-      ...result,
-      ...result.skipped && result.rejectionReason ? { rejectionReason: result.rejectionReason } : {}
-    };
+    return result;
   };
 }
 var init_agent_lifecycle_send = __esm(() => {
@@ -89776,154 +89631,6 @@ var init_agent_lifecycle_outbox_runtime = __esm(() => {
   init_agent_lifecycle_send();
 });
 
-// src/daemon/entry/enhancer/enhancer-spawn-registry.ts
-function registerEnhancerSpawn(handle) {
-  const handles = byChatroom.get(handle.chatroomId) ?? new Set;
-  handles.add(handle);
-  byChatroom.set(handle.chatroomId, handles);
-}
-function unregisterEnhancerSpawn(handle) {
-  const handles = byChatroom.get(handle.chatroomId);
-  if (!handles)
-    return;
-  handles.delete(handle);
-  if (handles.size === 0)
-    byChatroom.delete(handle.chatroomId);
-}
-async function abortEnhancerSpawnsForChatroom(chatroomId) {
-  const handles = byChatroom.get(chatroomId);
-  if (!handles)
-    return;
-  await Promise.all([...handles].map(async (handle) => {
-    handle.abort();
-    await handle.stopProcess().catch(() => {
-      return;
-    });
-  }));
-}
-var byChatroom;
-var init_enhancer_spawn_registry = __esm(() => {
-  byChatroom = new Map;
-});
-
-// src/daemon/entry/finalize-scoped-stop-execution.ts
-var exports_finalize_scoped_stop_execution = {};
-__export(exports_finalize_scoped_stop_execution, {
-  finalizeScopedStopExecution: () => finalizeScopedStopExecution
-});
-async function finalizeScopedStopExecution(args2) {
-  for (const { target, outcome, lifecycleWarning } of args2.result.targets) {
-    await args2.backend.mutation(api.agentStops.reportTargetOutcome, {
-      sessionId: args2.sessionId,
-      stopCommandId: args2.stopCommandId,
-      chatroomId: args2.chatroomId,
-      machineId: args2.machineId,
-      targetKey: target.targetKey,
-      role: target.role,
-      pid: target.pid,
-      status: "completed",
-      outcome: outcome.kind === "stopped" ? "stopped" : "already_stopped",
-      termination: outcome.termination,
-      lifecycleWarning
-    });
-  }
-  for (const failure of args2.result.failures) {
-    await args2.backend.mutation(api.agentStops.reportTargetOutcome, {
-      sessionId: args2.sessionId,
-      stopCommandId: args2.stopCommandId,
-      chatroomId: args2.chatroomId,
-      machineId: args2.machineId,
-      targetKey: failure.target.targetKey,
-      role: failure.target.role,
-      pid: failure.target.pid,
-      status: "failed",
-      outcome: "failed",
-      errorMessage: String(failure.error)
-    });
-  }
-  const failed = args2.result.failures.length > 0 || args2.executionError != null;
-  await args2.backend.mutation(api.agentStops.completeMachineExecution, {
-    sessionId: args2.sessionId,
-    stopCommandId: args2.stopCommandId,
-    machineId: args2.machineId,
-    status: failed ? "failed" : "completed",
-    errorMessage: failed ? args2.executionError ? String(args2.executionError) : `${args2.result.failures.length} target(s) failed` : undefined
-  });
-}
-var init_finalize_scoped_stop_execution = __esm(() => {
-  init_api3();
-});
-
-// src/daemon/entry/execute-scoped-stop-command.ts
-async function executeScopedStopForCommand(args2) {
-  args2.apm.markChatroomStopIntent(args2.chatroomId, args2.reason);
-  if (args2.scope.kind === "chatroom") {
-    await abortEnhancerSpawnsForChatroom(args2.chatroomId);
-  }
-  const { runExactTargetsStop: runExactTargetsStop2 } = await Promise.resolve().then(() => (init_service_interfaces(), exports_service_interfaces));
-  const finalize = await Promise.resolve().then(() => (init_finalize_scoped_stop_execution(), exports_finalize_scoped_stop_execution));
-  const begun = await args2.backend.mutation(api.agentStops.beginMachineExecution, {
-    sessionId: args2.sessionId,
-    stopCommandId: args2.stopCommandId,
-    machineId: args2.machineId,
-    inboxCommandId: args2.inboxCommandId
-  });
-  if (!begun.shouldExecute)
-    return { stoppedCount: 0, failedCount: 0 };
-  for (const target of begun.targets) {
-    args2.apm.markStopIntent(args2.chatroomId, target.role, args2.reason, target.pid);
-    args2.apm.bindStopTarget?.({
-      chatroomId: args2.chatroomId,
-      role: target.role,
-      pid: target.pid,
-      stopCommandId: args2.stopCommandId,
-      targetKey: target.targetKey
-    });
-  }
-  let result = { targets: [], failures: [] };
-  let executionError;
-  try {
-    const targetsByRole = new Map;
-    for (const target of begun.targets) {
-      const roleTargets = targetsByRole.get(target.role) ?? [];
-      roleTargets.push(target);
-      targetsByRole.set(target.role, roleTargets);
-    }
-    const roleResults = await Promise.all([...targetsByRole.entries()].map(([role, targets]) => args2.runSerializedForAgent({ chatroomId: args2.chatroomId, role }, { timeoutMs: AGENT_LIFECYCLE_OPERATION_TIMEOUT_MS }, async (_ops, context5) => {
-      if (context5.signal.aborted)
-        throw context5.signal.reason;
-      return runExactTargetsStop2({
-        apm: args2.apm,
-        confirmedDeps: args2.apm.getConfirmedStopAdapterDeps(),
-        stopCommandId: args2.stopCommandId,
-        chatroomId: args2.chatroomId,
-        targets,
-        reason: args2.reason
-      });
-    })));
-    result = {
-      targets: roleResults.flatMap((roleResult) => roleResult.targets),
-      failures: roleResults.flatMap((roleResult) => roleResult.failures)
-    };
-  } catch (error) {
-    executionError = error;
-    console.warn("[daemon] scoped stop execution failed", error);
-  } finally {
-    await finalize.finalizeScopedStopExecution({ ...args2, result, executionError });
-    await args2.apm.syncSlotsAfterScopedStop(result);
-  }
-  return {
-    stoppedCount: result.targets.length,
-    failedCount: result.failures.length + (executionError != null ? 1 : 0),
-    executionError
-  };
-}
-var init_execute_scoped_stop_command = __esm(() => {
-  init_reliability();
-  init_api3();
-  init_enhancer_spawn_registry();
-});
-
 // src/daemon/entry/daemon-services.ts
 function DaemonMutableStateServiceLive(init2) {
   return exports_Layer.effect(DaemonMutableStateService, exports_Effect.gen(function* () {
@@ -89946,70 +89653,7 @@ var AgentLifecycleOutboxService, AgentLifecycleOutboxServiceLive = (registry2, m
   loadEventCursor: (machineId) => exports_Effect.promise(() => ops.loadEventCursor(machineId))
 }), DaemonSpawningService, DaemonSpawningServiceLive = (ops) => exports_Layer.succeed(DaemonSpawningService, {
   shouldAllowSpawn: (chatroomId, reason) => ops.shouldAllowSpawn(chatroomId, reason)
-}), DaemonAgentProcessManagerService, DaemonAgentProcessManagerServiceLive = (mgr, processManagerService, sessionDeps) => exports_Layer.succeed(DaemonAgentProcessManagerService, {
-  executeScopedStopForCommand: (args2) => exports_Effect.promise(async () => {
-    if (!sessionDeps)
-      return { stoppedCount: 0, failedCount: 0 };
-    return executeScopedStopForCommand({
-      ...sessionDeps,
-      apm: mgr,
-      runSerializedForAgent: processManagerService.runSerializedForAgent,
-      ...args2
-    });
-  }),
-  runInboxRoleScopedStop: (event) => exports_Effect.promise(async () => {
-    const { runRoleScopedStop: runRoleScopedStop2 } = await Promise.resolve().then(() => (init_service_interfaces(), exports_service_interfaces));
-    const legacyReason = {
-      "team.switch": "platform.team_switch",
-      dedup: "platform.dedup",
-      "stale-config": "platform.dedup"
-    };
-    const reason = isAgentStopReason(event.reason) ? event.reason : legacyReason[event.reason] ?? "user.stop";
-    if (Date.now() > event.deadline)
-      return;
-    const execute = async (stopAgent, signal) => {
-      const result = await runRoleScopedStop2({
-        apm: mgr,
-        confirmedDeps: mgr.getConfirmedStopAdapterDeps(),
-        chatroomId: event.chatroomId,
-        role: event.role,
-        reason
-      });
-      if (result.targets.length === 0 && result.failures.length === 0 && event.pid) {
-        await stopAgent({
-          chatroomId: event.chatroomId,
-          role: event.role,
-          reason,
-          pid: event.pid
-        }, signal);
-      }
-      for (const failure of result.failures)
-        console.warn(`[daemon] scoped stop failed for ${failure.target.targetKey}`, failure.error);
-    };
-    await processManagerService.runSerializedForAgent({ chatroomId: event.chatroomId, role: event.role }, { timeoutMs: SCOPE_TARGET_STOP_TIMEOUT_MS }, async (ops, context5) => {
-      if (context5.signal.aborted)
-        throw context5.signal.reason;
-      await execute(ops.stopAgent, context5.signal);
-    });
-  }),
-  runInboxScopedStop: (event) => exports_Effect.promise(async () => {
-    if (!sessionDeps)
-      return;
-    const inboxCommandId = event.commandId ?? event._id;
-    const reason = isAgentStopReason(event.reason) ? event.reason : "user.stop";
-    await executeScopedStopForCommand({
-      sessionId: sessionDeps.sessionId,
-      machineId: sessionDeps.machineId,
-      backend: sessionDeps.backend,
-      apm: mgr,
-      stopCommandId: event.stopCommandId,
-      chatroomId: event.chatroomId,
-      scope: event.scope,
-      reason,
-      inboxCommandId,
-      runSerializedForAgent: processManagerService.runSerializedForAgent
-    });
-  }),
+}), DaemonAgentProcessManagerService, DaemonAgentProcessManagerServiceLive = (mgr, processManagerService) => exports_Layer.succeed(DaemonAgentProcessManagerService, {
   ensureRunning: (opts) => exports_Effect.promise(() => mgr.ensureRunning(opts)),
   stop: (opts) => exports_Effect.promise(() => mgr.stop(opts)),
   handleExit: (opts) => exports_Effect.promise(() => mgr.handleExit(opts)),
@@ -90024,10 +89668,7 @@ var AgentLifecycleOutboxService, AgentLifecycleOutboxServiceLive = (registry2, m
 }), DaemonAgentProcessManagerCommandService, DaemonAgentProcessManagerCommandServiceLive = (service4) => exports_Layer.succeed(DaemonAgentProcessManagerCommandService, service4), DaemonSessionService, DaemonMutableStateService;
 var init_daemon_services = __esm(() => {
   init_esm();
-  init_reliability();
   init_agent_lifecycle_outbox_runtime();
-  init_execute_scoped_stop_command();
-  init_agent();
   init_service_interfaces();
   AgentLifecycleOutboxService = class AgentLifecycleOutboxService extends exports_Context.Tag("AgentLifecycleOutboxService")() {
   };
@@ -90055,11 +89696,7 @@ function daemonSessionToLayers(init2) {
   return exports_Layer.mergeAll(BackendServiceLive({
     mutation: (e, a) => init2.backend.mutation(e, a),
     query: (e, a) => init2.backend.query(e, a)
-  }), ProcessServiceLive, ClockServiceLive, FsServiceLive, DaemonMachineServiceLive(init2.machine), AgentLifecycleOutboxServiceLive(init2.agentLifecycleOutbox, init2.machineId), DaemonSpawningServiceLive(init2.spawning), DaemonAgentProcessManagerServiceLive(init2.agentProcessManager, init2.agentProcessManagerService, {
-    sessionId: init2.sessionId,
-    machineId: init2.machineId,
-    backend: init2.backend
-  }), DaemonAgentProcessManagerCommandServiceLive(init2.agentProcessManagerService), DaemonMutableStateServiceLive({
+  }), ProcessServiceLive, ClockServiceLive, FsServiceLive, DaemonMachineServiceLive(init2.machine), AgentLifecycleOutboxServiceLive(init2.agentLifecycleOutbox, init2.machineId), DaemonSpawningServiceLive(init2.spawning), DaemonAgentProcessManagerServiceLive(init2.agentProcessManager, init2.agentProcessManagerService), DaemonAgentProcessManagerCommandServiceLive(init2.agentProcessManagerService), DaemonMutableStateServiceLive({
     lastPushedGitState: init2.lastPushedGitState,
     lastPushedModels: init2.lastPushedModels,
     lastPushedHarnessFingerprint: init2.lastPushedHarnessFingerprint,
@@ -94519,8 +94156,6 @@ var init_command_event_types = __esm(() => {
   DAEMON_COMMAND_EVENT_TYPES = [
     "agent.requestStart",
     "agent.restart",
-    "agent.requestStop",
-    "agent.stopScope",
     "daemon.ping",
     "daemon.gitRefresh",
     "daemon.workspaceListChanged",
@@ -96193,8 +95828,7 @@ async function restartAgent(deps, input) {
       model: input.model,
       workingDir: input.workingDir,
       correlationId: input.correlationId,
-      wantResume: input.wantResume,
-      ...input.lifecycleRevision !== undefined ? { lifecycleRevision: input.lifecycleRevision } : {}
+      wantResume: input.wantResume
     });
   } catch (error) {
     log4(`[daemon] agent.restart failed (correlationId=${input.correlationId}) for role=${input.role}: ${error instanceof Error ? error.message : String(error)}`);
@@ -96434,8 +96068,7 @@ var onRequestRestartAgentEffect = (event, nativeDelivery) => exports_Effect.gen(
     workingDir: event.workingDir,
     correlationId: event.correlationId,
     deadline: event.deadline,
-    wantResume: event.wantResume,
-    lifecycleRevision: event.lifecycleRevision
+    wantResume: event.wantResume
   }));
 });
 var init_on_request_restart_agent = __esm(() => {
@@ -96461,8 +96094,7 @@ async function startAgent2(deps, input) {
       model: input.model,
       workingDir: input.workingDir,
       reason: input.reason,
-      wantResume: input.wantResume,
-      ...input.lifecycleRevision !== undefined ? { lifecycleRevision: input.lifecycleRevision } : {}
+      wantResume: input.wantResume
     });
   } catch (error) {
     const message = error instanceof Error ? error.message : typeof error === "object" && error !== null && ("error" in error) ? String(error.error) : "unknown";
@@ -96508,8 +96140,7 @@ var onRequestStartAgentEffect = (event) => exports_Effect.gen(function* () {
       workingDir: event.workingDir,
       reason: event.reason,
       deadline: event.deadline,
-      wantResume: event.wantResume,
-      lifecycleRevision: event.lifecycleRevision
+      wantResume: event.wantResume
     });
     await drainPendingEnhancerJobsIfRegistered();
   });
@@ -96520,31 +96151,6 @@ var init_on_request_start_agent = __esm(() => {
   init_daemon_services();
 });
 
-// src/daemon/entry/events/agent/on-request-stop-agent.ts
-var onRequestStopAgentEffect = (event) => exports_Effect.gen(function* () {
-  const agentMgr = yield* DaemonAgentProcessManagerService;
-  if (Date.now() > event.deadline)
-    return;
-  if (agentMgr.runInboxRoleScopedStop)
-    yield* agentMgr.runInboxRoleScopedStop(event);
-});
-var init_on_request_stop_agent = __esm(() => {
-  init_esm();
-  init_daemon_services();
-});
-
-// src/daemon/entry/events/agent/on-stop-scope-agent.ts
-var onStopScopeAgentEffect = (event) => exports_Effect.gen(function* () {
-  const agentMgr = yield* DaemonAgentProcessManagerService;
-  const stop4 = agentMgr.runInboxScopedStop;
-  if (stop4)
-    yield* stop4(event);
-});
-var init_on_stop_scope_agent = __esm(() => {
-  init_esm();
-  init_daemon_services();
-});
-
 // src/daemon/entry/handlers/ping.ts
 function handlePing() {
   console.log(`   ↪ Responding: pong`);
@@ -96722,15 +96328,6 @@ function handleRequestRestartEffect(event, tracker, nativeDelivery) {
     tracker.commandIds.set(eventId, Date.now());
   });
 }
-function handleRequestStopEffect(event, tracker) {
-  return exports_Effect.gen(function* () {
-    const eventId = event._id.toString();
-    if (tracker.commandIds.has(eventId))
-      return;
-    yield* onRequestStopAgentEffect(event);
-    tracker.commandIds.set(eventId, Date.now());
-  });
-}
 function handlePingCommandEffect(event, tracker) {
   return exports_Effect.gen(function* () {
     const eventId = event._id.toString();
@@ -96884,8 +96481,6 @@ var init_command_dispatch = __esm(() => {
   init_pick_folder();
   init_on_request_restart_agent();
   init_on_request_start_agent();
-  init_on_request_stop_agent();
-  init_on_stop_scope_agent();
   init_ping();
   init_manager();
   init_convex_error();
@@ -96893,14 +96488,6 @@ var init_command_dispatch = __esm(() => {
   commandEventHandlers = {
     "agent.requestStart": handleRequestStartEffect,
     "agent.restart": handleRequestRestartEffect,
-    "agent.requestStop": handleRequestStopEffect,
-    "agent.stopScope": (event, tracker) => exports_Effect.gen(function* () {
-      const eventId = String(event.commandId ?? event._id);
-      if (tracker.commandIds.has(eventId))
-        return;
-      yield* onStopScopeAgentEffect(event);
-      tracker.commandIds.set(eventId, Date.now());
-    }),
     "daemon.ping": handlePingCommandEffect,
     "daemon.gitRefresh": handleGitRefreshCommandEffect,
     "daemon.workspaceListChanged": handleWorkspaceListChangedCommandEffect,
@@ -96956,6 +96543,36 @@ function createEnhancerLogWriter(logSink, context5, clock4 = () => Date.now()) {
 var ENHANCER_LOG_PREFIX = "[enhancer]";
 var init_enhancer_log = () => {};
 
+// src/daemon/entry/enhancer/enhancer-spawn-registry.ts
+function registerEnhancerSpawn(handle) {
+  const handles = byChatroom.get(handle.chatroomId) ?? new Set;
+  handles.add(handle);
+  byChatroom.set(handle.chatroomId, handles);
+}
+function unregisterEnhancerSpawn(handle) {
+  const handles = byChatroom.get(handle.chatroomId);
+  if (!handles)
+    return;
+  handles.delete(handle);
+  if (handles.size === 0)
+    byChatroom.delete(handle.chatroomId);
+}
+async function abortEnhancerSpawnsForChatroom(chatroomId) {
+  const handles = byChatroom.get(chatroomId);
+  if (!handles)
+    return;
+  await Promise.all([...handles].map(async (handle) => {
+    handle.abort();
+    await handle.stopProcess().catch(() => {
+      return;
+    });
+  }));
+}
+var byChatroom;
+var init_enhancer_spawn_registry = __esm(() => {
+  byChatroom = new Map;
+});
+
 // src/daemon/entry/enhancer/job-outcome-subscription.ts
 function subscribeToEnhancerJobOutcome(args2) {
   let currentState = null;
@@ -103154,7 +102771,7 @@ var startTaskInboxEffect = () => exports_Effect.gen(function* () {
     runSerializedForAgent: commandService.runSerializedForAgent,
     sessionDeps,
     machineId: session2.machineId,
-    taskSnapshotState: session2.taskService.taskSnapshotState,
+    taskInboxState: session2.taskService.taskInboxState,
     agentTaskState,
     lifecycleOutbox,
     taskService: session2.taskService
@@ -104151,6 +103768,48 @@ var init_deps = __esm(() => {
   init_publisher_registry();
 });
 
+// src/daemon/entry/execute-chatroom-stop-command.ts
+async function executeChatroomStopCommand(args2) {
+  if (args2.role)
+    args2.apm.markStopIntent(args2.chatroomId, args2.role, "user.stop");
+  else {
+    args2.apm.markChatroomStopIntent(args2.chatroomId, "user.stop");
+    await abortEnhancerSpawnsForChatroom(args2.chatroomId);
+  }
+  const confirmedDeps = args2.apm.getConfirmedStopAdapterDeps();
+  const targets = await args2.apm.discoverStopTargets(args2.chatroomId);
+  const roles = [
+    ...new Set(targets.filter((target) => !args2.role || target.role.toLowerCase() === args2.role.toLowerCase()).map((target) => target.role.toLowerCase()))
+  ];
+  const results = await Promise.allSettled(roles.map((role) => args2.runSerializedForAgent({ chatroomId: args2.chatroomId, role }, { timeoutMs: AGENT_LIFECYCLE_OPERATION_TIMEOUT_MS }, async (_ops, context5) => {
+    if (context5.signal.aborted)
+      throw context5.signal.reason;
+    await runRoleScopedStop({
+      apm: args2.apm,
+      confirmedDeps,
+      chatroomId: args2.chatroomId,
+      role,
+      reason: "user.stop"
+    });
+  })));
+  for (const result of results)
+    if (result.status === "rejected")
+      console.warn("[daemon] chatroom stop attempt failed", result.reason);
+  await confirmedDeps.lifecycleOutbox.enqueue({
+    kind: "chatroom_shutdown_complete",
+    chatroomId: args2.chatroomId,
+    commandId: args2.commandId,
+    ...args2.finalizeChatroom === undefined ? {} : { finalizeChatroom: args2.finalizeChatroom },
+    revisionKey: `shutdown:${args2.commandId}`,
+    emittedAt: Date.now()
+  });
+}
+var init_execute_chatroom_stop_command = __esm(() => {
+  init_reliability();
+  init_enhancer_spawn_registry();
+  init_agent_process_service2();
+});
+
 // src/daemon/entry/persistence-path.ts
 import { homedir as homedir10 } from "node:os";
 import { join as join26 } from "node:path";
@@ -104296,6 +103955,45 @@ var init_agentic_query_session = __esm(() => {
   init_api3();
 });
 
+// src/daemon/infrastructure/convex/subscribers/chatroom-workspace-agent-commands.ts
+function startChatroomWorkspaceAgentCommandsSubscriber(deps, onClaimed) {
+  let draining = false;
+  let queued = false;
+  let stopped = false;
+  const args2 = { sessionId: deps.sessionId, machineId: deps.machineId };
+  const drain = async () => {
+    if (stopped || draining) {
+      queued = true;
+      return;
+    }
+    draining = true;
+    try {
+      do {
+        queued = false;
+        let claimed;
+        while (claimed = await deps.wsClient.mutation(api.chatroomWorkspaceAgentCommandsInbox.claimNext, args2))
+          await onClaimed(claimed);
+      } while (queued && !stopped);
+    } finally {
+      draining = false;
+    }
+  };
+  const unsub = deps.wsClient.onUpdate(api.chatroomWorkspaceAgentCommandsInbox.watchNext, args2, (commandId) => {
+    if (commandId)
+      drain();
+  }, (err) => console.warn(`[daemon] workspace-agent-command watch error: ${String(err)}`));
+  drain();
+  return {
+    async stop() {
+      stopped = true;
+      unsub();
+    }
+  };
+}
+var init_chatroom_workspace_agent_commands = __esm(() => {
+  init_api3();
+});
+
 // src/daemon/infrastructure/convex/subscribers/command-run.ts
 function runId(run3) {
   return typeof run3._id === "string" ? run3._id : run3._id.toString();
@@ -104688,6 +104386,7 @@ function startAllSubscribers(deps) {
       claimedCommand: claimed
     });
   });
+  const workspaceAgentCommands = deps.onWorkspaceAgentCommand ? startChatroomWorkspaceAgentCommandsSubscriber(deps, deps.onWorkspaceAgentCommand) : undefined;
   const commandRun = startCommandRunSubscriber(deps, onEvent);
   const fileTree = startFileTreeRequestSubscriber(deps, onEvent);
   const fileTreeRelease = startFileTreeReleaseRequestSubscriber(deps, onEvent);
@@ -104699,6 +104398,7 @@ function startAllSubscribers(deps) {
     async stopAll() {
       await Promise.all([
         machineCommands.stop(),
+        workspaceAgentCommands?.stop(),
         commandRun.stop(),
         gitRequest.stop(),
         fileTree.stop(),
@@ -104716,6 +104416,7 @@ var init_subscriber_registry = __esm(() => {
   init_event_router();
   init_agentic_query_prompt();
   init_agentic_query_session();
+  init_chatroom_workspace_agent_commands();
   init_command_run();
   init_enhancer_job();
   init_file_content_request();
@@ -133877,7 +133578,15 @@ async function startDaemon() {
     wsClient: wsClient2,
     sessionId: asConvexSessionId(init2.sessionId),
     machineId: init2.machineId,
-    router: createDefaultEventRouterDeps()
+    router: createDefaultEventRouterDeps(),
+    onWorkspaceAgentCommand: (command) => executeChatroomStopCommand({
+      apm: init2.agentProcessManager,
+      chatroomId: command.chatroomId,
+      commandId: command._id,
+      role: command.command.type === "stop_agent" ? command.command.role : undefined,
+      finalizeChatroom: command.command.type === "stop_all_agents" ? command.command.finalizeChatroom : undefined,
+      runSerializedForAgent: init2.agentProcessManagerService.runSerializedForAgent
+    })
   });
   console.log(`[daemon] Local web UI: http://127.0.0.1:${localWeb.port}/`);
   const layers = daemonSessionToLayers(init2);
@@ -133906,6 +133615,7 @@ var init_start_daemon = __esm(() => {
   init_daemon_runtime();
   init_default_router_deps();
   init_deps();
+  init_execute_chatroom_stop_command();
   init_init_daemon();
   init_persistence_path();
   init_resolve_local_web_port();
@@ -135146,4 +134856,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=7D04CA8EEEBFA97564756E2164756E21
+//# debugId=1E9B97C58361134164756E2164756E21