@hyperdrive.bot/paseo-server 0.3.41 → 0.3.42

package/dist/server/server/workspace-directory.js

@@ -44,6 +44,28 @@ export function workspaceIdsOnCheckout(workspaces, cwd) {
         .filter((workspace) => !workspace.archivedAt && resolve(workspace.cwd) === resolvedCwd)
         .map((workspace) => workspace.workspaceId);
 }
+/**
+ * Build the bucket-derivation input for one agent snapshot.
+ *
+ * Exists so every call site in this file feeds `deriveAgentStateBucket` the
+ * SAME shape. It previously did not: two call sites hand-built the object and
+ * both omitted `activeChildCount`, so server-derived workspace buckets could
+ * never see armed background work while the app-side derivation could. The same
+ * agent then bucketed as "done" in the workspace list and "running" on its
+ * kanban card. One helper, one shape, no drift.
+ */
+function toBucketInput(agent) {
+    return {
+        status: agent.status,
+        pendingPermissionCount: agent.pendingPermissions?.length ?? 0,
+        requiresAttention: agent.requiresAttention,
+        attentionReason: agent.attentionReason ?? null,
+        // Monitors, crons and backgrounded shells still alive on this agent. Live
+        // SUBAGENTS are not counted here — they arrive as their own snapshots and
+        // are attributed to the delegation root in applyAgentBucketContributions.
+        activeChildCount: agent.activeBackgroundTaskCount ?? 0,
+    };
+}
 export class WorkspaceDirectory {
     constructor(deps) {
         this.deps = deps;
@@ -166,15 +188,13 @@ export class WorkspaceDirectory {
                     continue;
                 }
                 workspaceAgent = parentAgent;
-                bucket = "running";
+                // A live subagent means the ROOT's own turn is not in flight — it is
+                // waiting on delegated work that will hand control back by itself.
+                // That is "pending", not "running"; see agent-state-bucket.ts.
+                bucket = "pending";
             }
             else {
-                bucket = deriveAgentStateBucket({
-                    status: agent.status,
-                    pendingPermissionCount: agent.pendingPermissions?.length ?? 0,
-                    requiresAttention: agent.requiresAttention,
-                    attentionReason: agent.attentionReason ?? null,
-                });
+                bucket = deriveAgentStateBucket(toBucketInput(agent));
             }
             const workspaceId = workspaceAgent.workspaceId;
             if (!workspaceId) {
@@ -210,7 +230,10 @@ export class WorkspaceDirectory {
                 existing.status = bucket;
             }
             const entries = terminalEntriesByWorkspaceId.get(workspaceId) ?? [];
-            entries.push({ bucket, changedAtIso: new Date(activity.changedAt).toISOString() });
+            entries.push({
+                bucket,
+                changedAtIso: new Date(activity.changedAt).toISOString(),
+            });
             terminalEntriesByWorkspaceId.set(workspaceId, entries);
         }
         return terminalEntriesByWorkspaceId;
@@ -271,12 +294,7 @@ export class WorkspaceDirectory {
     findNewestTimestampInBucket(contributingAgents, terminalEntries, winningBucket) {
         const agentTimestamps = contributingAgents
             .filter((agent) => {
-            const derived = deriveAgentStateBucket({
-                status: agent.status,
-                pendingPermissionCount: agent.pendingPermissions?.length ?? 0,
-                requiresAttention: agent.requiresAttention,
-                attentionReason: agent.attentionReason ?? null,
-            });
+            const derived = deriveAgentStateBucket(toBucketInput(agent));
             return derived === winningBucket;
         })
             .map((agent) => {