Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(plugins): 保留任务取消与中断终态

Dash4a4cd9bf9242
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts
index 9279c6c1f4..4cc624ed3b 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts
@@ -208,6 +208,34 @@ describe('plugin ordinary task receipts', () => {
f.service.accept(run.taskId, { clientId: run.inputMessageId }, f.execution),
).rejects.toMatchObject({ code: 'REQUEST_EXPIRED' });
});
+ it.each(['completed', 'failed', 'cancelled', 'interrupted'] as const)(
+ 'keeps native %s during a running cancellation', async status => {
+ const f = fixture();
+ const run = await f.send();
+ await f.service.accept(run.taskId, { clientId: run.inputMessageId }, f.execution);
+ f.deps.cancel = vi.fn(async () => {
+ await f.service.settle(run.taskId, f.execution, status);
+ return 'stopping' as const;
+ });
+ expect((await f.service.cancel('p', run.runId)).status).toBe(status);
+ await f.service.settle(run.taskId, f.execution, 'failed');
+ expect((await f.service.getRun('p', run.runId)).status).toBe(status);
+ },
+ );
+ it.each(['cancelled', 'interrupted'] as const)(
+ 'settles a stopping run as %s and ignores stale or duplicate terminals', async status => {
+ const f = fixture();
+ const run = await f.send();
+ await f.service.accept(run.taskId, { clientId: run.inputMessageId }, f.execution);
+ f.deps.cancel = vi.fn(async () => 'stopping' as const);
+ expect((await f.service.cancel('p', run.runId)).status).toBe('stopping');
+ await f.service.settle(run.taskId, { ...f.execution, generation: f.execution.generation + 1 }, status);
+ expect(JSON.parse(f.rows.get(run.runId)!.payload).status).toBe('stopping');
+ await f.service.settle(run.taskId, f.execution, status);
+ await f.service.settle(run.taskId, f.execution, 'failed');
+ expect((await f.service.getRun('p', run.runId)).status).toBe(status);
+ },
+ );
it('does not convert a completed output into cancellation', async () => {
const f = fixture();
const run = await f.send();
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/sessionEventPipeline.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/sessionEventPipeline.test.ts
index d1b0946ac0..a8d86f809e 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/sessionEventPipeline.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/sessionEventPipeline.test.ts
@@ -242,6 +242,7 @@ function harness() {
});
const activity = new SessionTurnActivityTracker();
const deps = {
+ onPluginTaskTerminal: vi.fn(),
onSuccessfulProductTurn: vi.fn(async () => {}),
onUnsuccessfulProductTurn: vi.fn(async () => {}),
log,
@@ -491,6 +492,24 @@ describe('production Session event pipeline', () => {
await h.dispose();
},
);
+ it.each(['completed', 'failed', 'cancelled', 'interrupted'])(
+ 'preserves the plugin terminal %s before generic failure bookkeeping', async status => {
+ const h = harness();
+ h.emit(event('done', { status }, {
+ sessionInstanceId: h.session.instanceId, sessionTurnGeneration: 0,
+ }));
+ await microtasks();
+ expect(h.deps.onPluginTaskTerminal).toHaveBeenCalledWith('task', {
+ instanceId: h.session.instanceId, generation: 0,
+ }, status, undefined);
+ if (status !== 'completed') {
+ expect(h.deps.onPluginTaskTerminal.mock.invocationCallOrder[0]).toBeLessThan(
+ h.deps.onUnsuccessfulProductTurn.mock.invocationCallOrder[0],
+ );
+ }
+ await h.dispose();
+ },
+ );
it.each([
['zh-CN', 'Pi 扩展未能完成刷新。请重启 Cindy 后再使用 Pi。'],
['zh-TW', 'Pi 擴充功能未能完成重新整理。請重新啟動 Cindy 後再使用 Pi。'],
diff --git a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts b/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
index e8412d4d2f..2802eaef9a 100644
--- a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
+++ b/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
@@ -407,7 +407,7 @@ export function createPluginTaskService(deps: PluginTaskServiceDeps) {
settle: (
taskId: string,
execution: SessionExecutionIdentity,
- status: 'completed' | 'failed',
+ status: 'completed' | 'failed' | 'cancelled' | 'interrupted',
outputMessageId?: string,
) =>
exclusive(async () => {
diff --git a/apps/desktop/src/main/maker-ipc/sessionEventTerminal.ts b/apps/desktop/src/main/maker-ipc/sessionEventTerminal.ts
index 4ac4a77515..72e47c66c7 100644
--- a/apps/desktop/src/main/maker-ipc/sessionEventTerminal.ts
+++ b/apps/desktop/src/main/maker-ipc/sessionEventTerminal.ts
@@ -51,7 +51,7 @@ import {
type ProductTurnFailureOwner,
} from './productTurnFailureOwner.js';
export interface FinishSessionTerminalEventDeps {
- readonly onPluginTaskTerminal?: (sessionId: string, execution: { instanceId: string; generation: number }, outcome: 'completed' | 'failed', outputMessageId?: string) => void;
+ readonly onPluginTaskTerminal?: (sessionId: string, execution: { instanceId: string; generation: number }, outcome: 'completed' | 'failed' | 'cancelled' | 'interrupted', outputMessageId?: string) => void;
readonly onSuccessfulProductTurn?: (
sessionId: string,
owner?: ProductTurnFailureOwner,
@@ -525,6 +525,18 @@ export function finishSessionTerminalEvent(
// gateway persistence, overflow surface, or auto-resume abandonment).
const unsuccessfulBoundary =
isTerminalTurnErrorEvent(event) || !isSuccessfulAssistantReplyDoneData(event.data);
+ if (typeof event.sessionTurnGeneration === 'number' && !recoveryOwnsUnsuccessfulBoundary && !autoResumeSuppressesPersist) {
+ const nativeStatus = (event.data as { status?: unknown } | null)?.status;
+ const outcome = !isTerminalTurnErrorEvent(event)
+ && (nativeStatus === 'cancelled' || nativeStatus === 'interrupted')
+ ? nativeStatus : unsuccessfulBoundary ? 'failed' : 'completed';
+ // Settle the precise native outcome before generic unsuccessful-turn
+ // bookkeeping can enqueue its fallback failure for the same execution.
+ deps.onPluginTaskTerminal?.(session.id, {
+ instanceId: event.sessionInstanceId ?? session.instanceId,
+ generation: event.sessionTurnGeneration,
+ }, outcome, turnAssistantPersistId ?? undefined);
+ }
if (
unsuccessfulBoundary &&
!recoveryOwnsUnsuccessfulBoundary &&
@@ -543,12 +555,6 @@ export function finishSessionTerminalEvent(
...(item.supersedesUserClientId ? [item.supersedesUserClientId] : []),
...(item.retrySourceClientId ? [item.retrySourceClientId] : []),
]) ?? [];
- if (typeof event.sessionTurnGeneration === 'number' && !recoveryOwnsUnsuccessfulBoundary && !autoResumeSuppressesPersist) {
- deps.onPluginTaskTerminal?.(session.id, {
- instanceId: event.sessionInstanceId ?? session.instanceId,
- generation: event.sessionTurnGeneration,
- }, unsuccessfulBoundary ? 'failed' : 'completed', turnAssistantPersistId ?? undefined);
- }
void (async () => {
try {
const doneData = event.data as {