From f34312c42411ae374ff8c877aeff4facd677a1ad Mon Sep 17 00:00:00 2001
From: Codex <codex@pikas.tech>
Date: Tue, 2 Jun 2026 00:40:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Queue=20refresh=20=E6=8C=89=20command=20?=
 =?UTF-8?q?=E7=BB=88=E6=80=81=E6=94=B6=E6=95=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mgr/queue-dispatch.ts                  | 9 ++++++---
 src/selftest/cases/75-queue-q2-dispatch.ts | 1 -
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/mgr/queue-dispatch.ts b/src/mgr/queue-dispatch.ts
index 1c19b96..1582c46 100644
--- a/src/mgr/queue-dispatch.ts
+++ b/src/mgr/queue-dispatch.ts
@@ -1,5 +1,5 @@
 import { AgentRunError } from "../common/errors.js";
-import type { CreateRunInput, JsonRecord, JsonValue, QueueAttemptRef, QueueDispatchResult, QueueTaskRecord, QueueTaskState, RunRecord } from "../common/types.js";
+import type { CommandRecord, CreateRunInput, JsonRecord, JsonValue, QueueAttemptRef, QueueDispatchResult, QueueTaskRecord, QueueTaskState, RunRecord } from "../common/types.js";
 import { asRecord } from "../common/validation.js";
 import type { AgentRunStore } from "./store.js";
 import { isTerminalQueueTaskState } from "./store.js";
@@ -66,7 +66,7 @@ export async function refreshQueueTaskFromCore(store: AgentRunStore, taskId: str
   if (!latestAttempt?.runId || !latestAttempt.commandId) throw new AgentRunError("schema-invalid", `queue task ${taskId} has no Core attempt to refresh`, { httpStatus: 409 });
   const [run, command] = await Promise.all([store.getRun(latestAttempt.runId), store.getCommand(latestAttempt.commandId)]);
   if (command.runId !== run.id) throw new AgentRunError("schema-invalid", `queue task ${taskId} attempt references mismatched run and command`, { httpStatus: 409 });
-  const state = queueStateFromRun(run);
+  const state = queueStateFromCore(run, command);
   const sessionId = run.sessionRef?.sessionId ?? latestAttempt.sessionId ?? null;
   const sessionPath = sessionId ? `/api/v1/sessions/${encodeURIComponent(sessionId)}` : latestAttempt.sessionPath ?? null;
   const nextAttempt: QueueAttemptRef = { ...latestAttempt, state, sessionId, sessionPath };
@@ -81,7 +81,10 @@ function assertDispatchable(task: QueueTaskRecord): void {
   if (!task.executionPolicy) throw new AgentRunError("schema-invalid", "queue dispatch requires executionPolicy", { httpStatus: 400 });
 }
 
-function queueStateFromRun(run: RunRecord): QueueTaskState {
+function queueStateFromCore(run: RunRecord, command: CommandRecord): QueueTaskState {
+  if (command.state === "completed") return "completed";
+  if (command.state === "failed") return "failed";
+  if (command.state === "cancelled") return "cancelled";
   if (run.status === "completed") return "completed";
   if (run.status === "failed") return "failed";
   if (run.status === "blocked") return "blocked";
diff --git a/src/selftest/cases/75-queue-q2-dispatch.ts b/src/selftest/cases/75-queue-q2-dispatch.ts
index 00d3962..b970ff4 100644
--- a/src/selftest/cases/75-queue-q2-dispatch.ts
+++ b/src/selftest/cases/75-queue-q2-dispatch.ts
@@ -84,7 +84,6 @@ console.log(JSON.stringify({ apiVersion: manifest.apiVersion, kind: manifest.kin
       (error) => error instanceof Error && error.message.includes("not pending"),
     );
     await client.patch(`/api/v1/commands/${dispatched.command.id}/status`, { terminalStatus: "completed", failureKind: null, failureMessage: null });
-    await client.patch(`/api/v1/runs/${dispatched.run.id}/status`, { terminalStatus: "completed", failureKind: null, failureMessage: null });
     const refreshed = await client.post(`/api/v1/queue/tasks/${created.id}/refresh`, {}) as QueueTaskRecord;
     assert.equal(refreshed.state, "completed");
     assert.equal(refreshed.latestAttempt?.state, "completed");