refactor(tasks): route acp through executor (#57478)

vincentkoc · web-flow · commit 126f77315f0b · 2026-03-30T13:58:51.000+09:00
* refactor(tasks): add executor facade

* refactor(tasks): extract delivery policy

* refactor(tasks): route acp through executor
diff --git a/src/acp/control-plane/manager.core.ts b/src/acp/control-plane/manager.core.ts
@@ -4,10 +4,11 @@ import { logVerbose } from "../../globals.js";
 import { normalizeAgentId } from "../../routing/session-key.js";
 import { isAcpSessionKey } from "../../sessions/session-key-utils.js";
 import {
-  createTaskRecord,
-  markTaskRunningByRunId,
-  markTaskTerminalByRunId,
-} from "../../tasks/task-registry.js";
+  createRunningTaskRun,
+  completeTaskRunByRunId,
+  failTaskRunByRunId,
+  startTaskRunByRunId,
+} from "../../tasks/task-executor.js";
 import type { DeliveryContext } from "../../utils/delivery-context.js";
 import {
   AcpRuntimeError,
@@ -1880,7 +1881,7 @@ export class AcpSessionManager {
 
   private createBackgroundTaskRecord(context: BackgroundTaskContext, startedAt: number): void {
     try {
-      createTaskRecord({
+      createRunningTaskRun({
         runtime: "acp",
         sourceId: context.runId,
         requesterSessionKey: context.requesterSessionKey,
@@ -1889,7 +1890,6 @@ export class AcpSessionManager {
         runId: context.runId,
         label: context.label,
         task: context.task,
-        status: "running",
         startedAt,
       });
     } catch (error) {
@@ -1907,7 +1907,7 @@ export class AcpSessionManager {
     },
   ): void {
     try {
-      markTaskRunningByRunId({
+      startTaskRunByRunId({
         runId,
         lastEventAt: params.lastEventAt,
         progressSummary: params.progressSummary,
@@ -1930,15 +1930,25 @@ export class AcpSessionManager {
     },
   ): void {
     try {
-      markTaskTerminalByRunId({
+      if (params.status === "succeeded") {
+        completeTaskRunByRunId({
+          runId,
+          endedAt: params.endedAt,
+          lastEventAt: params.lastEventAt,
+          progressSummary: params.progressSummary,
+          terminalSummary: params.terminalSummary,
+          terminalOutcome: params.terminalOutcome,
+        });
+        return;
+      }
+      failTaskRunByRunId({
         runId,
         status: params.status,
         endedAt: params.endedAt,
         lastEventAt: params.lastEventAt,
         error: params.error,
         progressSummary: params.progressSummary,
         terminalSummary: params.terminalSummary,
-        terminalOutcome: params.terminalOutcome,
       });
     } catch (error) {
       logVerbose(`acp-manager: failed updating background task for ${runId}: ${String(error)}`);
diff --git a/src/agents/acp-spawn.ts b/src/agents/acp-spawn.ts
@@ -44,7 +44,7 @@ import {
   normalizeAgentId,
   parseAgentSessionKey,
 } from "../routing/session-key.js";
-import { createTaskRecord } from "../tasks/task-registry.js";
+import { createRunningTaskRun } from "../tasks/task-executor.js";
 import {
   deliveryContextFromSession,
   formatConversationTarget,
@@ -953,7 +953,7 @@ export async function spawnAcpDirect(
     }
     parentRelay?.notifyStarted();
     try {
-      createTaskRecord({
+      createRunningTaskRun({
         runtime: "acp",
         sourceId: childRunId,
         requesterSessionKey: requesterInternalKey,
@@ -963,7 +963,6 @@ export async function spawnAcpDirect(
         label: params.label,
         task: params.task,
         preferMetadata: true,
-        status: "running",
         deliveryStatus: requesterInternalKey.trim() ? "pending" : "parent_missing",
         startedAt: Date.now(),
       });
@@ -985,7 +984,7 @@ export async function spawnAcpDirect(
   }
 
   try {
-    createTaskRecord({
+    createRunningTaskRun({
       runtime: "acp",
       sourceId: childRunId,
       requesterSessionKey: requesterInternalKey,
@@ -995,7 +994,6 @@ export async function spawnAcpDirect(
       label: params.label,
       task: params.task,
       preferMetadata: true,
-      status: "running",
       deliveryStatus: requesterInternalKey.trim() ? "pending" : "parent_missing",
       startedAt: Date.now(),
     });
