Skip to content

refactor(cli): drop the legacy Goal Stop-hook plumbing #11459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qqqys merged 2 commits into from
Sep 9, 2026
Merged

refactor(cli): drop the legacy Goal Stop-hook plumbing #11459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9e8385
refactor(cli): drop the legacy Goal Stop-hook plumbing
qqqys Sep 9, 2026
f0c8e84
test(cli): pin that the Stop-hook loop payload carries no Goal projec…
qqqys Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 0 additions & 82 deletions packages/cli/src/acp-integration/acpAgent.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,13 +599,6 @@ vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => ({
applyProviderInstallPlan: vi.fn().mockResolvedValue({
updatedModelProviders: {},
}),
unregisterGoalHook: vi.fn(),
getActiveGoal: vi.fn(),
getLastGoalTerminal: vi.fn(),
// Reached through the real `ui/utils/restoreGoal.js` on the resume path.
registerGoalHook: vi.fn(),
setGoalTerminalObserver: vi.fn(),
setLastGoalTerminal: vi.fn(),
uiTelemetryService: {
removeSession: vi.fn(),
getMetricsForSession: vi.fn(),
Expand Down Expand Up @@ -1076,9 +1069,6 @@ import {
SessionTranscriptTooLargeError,
SessionTranscriptPageTooLargeError,
encodeSessionTranscriptCursor,
unregisterGoalHook,
getActiveGoal,
registerGoalHook,
findBoundaryAtOrBefore,
isReplayTurnStartType,
startEventLoopLagMonitor,
Expand Down Expand Up @@ -3644,7 +3634,6 @@ describe('QwenAgent MCP SSE/HTTP support', () => {
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
replayHistory: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -4354,7 +4343,6 @@ describe('QwenAgent MCP SSE/HTTP support', () => {
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
replayHistory: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
);
Expand Down Expand Up @@ -4560,7 +4548,6 @@ describe('QwenAgent MCP SSE/HTTP support', () => {
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
replayHistory: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -4760,7 +4747,6 @@ describe('QwenAgent MCP SSE/HTTP support', () => {
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
replayHistory: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
beginClose: vi.fn().mockReturnValue(vi.fn()),
beginCloseIfAvailable: vi.fn().mockReturnValue(vi.fn()),
Expand Down Expand Up @@ -15288,7 +15274,6 @@ describe('QwenAgent MCP SSE/HTTP support', () => {
agent.extMethod(SERVE_CONTROL_EXT_METHODS.sessionGoalGet, params),
).rejects.toThrow(/sessionId/i);
}
expect(getActiveGoal).not.toHaveBeenCalled();

mockConnectionState.resolve();
await agentPromise;
Expand Down Expand Up @@ -15316,7 +15301,6 @@ describe('QwenAgent MCP SSE/HTTP support', () => {
sessionId: 'not-a-live-session',
}),
).rejects.toThrow();
expect(getActiveGoal).not.toHaveBeenCalledWith('not-a-live-session');

mockConnectionState.resolve();
await agentPromise;
Expand Down Expand Up @@ -19526,7 +19510,6 @@ describe('QwenAgent MCP SSE/HTTP support', () => {
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
replayHistory: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
} as unknown as InstanceType<typeof Session>;
Expand Down Expand Up @@ -21070,7 +21053,6 @@ describe('QwenAgent session-management routing (rename / delete / list / branch
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
replayHistory: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -22751,7 +22733,6 @@ describe('QwenAgent loadSession / unstable_resumeSession', () => {
apiTimeMs: number;
};
installRewriter: ReturnType<typeof vi.fn>;
installGoalTerminalObserver: ReturnType<typeof vi.fn>;
installManagedConversationActivation: ReturnType<typeof vi.fn>;
startCronScheduler: ReturnType<typeof vi.fn>;
enableLiveScreenContext: ReturnType<typeof vi.fn>;
Expand Down Expand Up @@ -23142,7 +23123,6 @@ describe('QwenAgent loadSession / unstable_resumeSession', () => {
apiTimeMs: 11,
},
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
installManagedConversationActivation: vi.fn(
(activate: () => Promise<void>) => {
lastManagedConversationActivation = activate;
Expand Down Expand Up @@ -24197,44 +24177,6 @@ describe('QwenAgent loadSession / unstable_resumeSession', () => {
},
);

it('leaves canonical Goal recovery to Config initialization', async () => {
bindRestoreMocks({
sessionExists: true,
resumedConversation: {
messages: [
{
uuid: 'goal-state',
parentUuid: null,
sessionId: 'persisted-1',
timestamp: new Date(0).toISOString(),
type: 'system',
subtype: 'goal_state',
cwd: '/tmp',
version: '1.0.0',
systemPayload: {
v: 2,
cause: 'create',
snapshot: goalSnapshot(),
},
},
],
},
});
const { agent, agentPromise } = await spawnAgent();

await agent.loadSession({
cwd: '/tmp',
sessionId: 'persisted-1',
mcpServers: [],
});

expect(registerGoalHook).not.toHaveBeenCalled();
expect(unregisterGoalHook).not.toHaveBeenCalled();

mockConnectionState.resolve();
await agentPromise;
});

it('loadSession returns LoadSessionResponse and replays history on the session', async () => {
const messages = [{ role: 'user', parts: [{ text: 'hi' }] }];
const innerConfig = bindRestoreMocks({
Expand Down Expand Up @@ -27292,7 +27234,6 @@ describe('sessionLanguage multi-session propagation', () => {
getConfig: vi.fn().mockReturnValue(cfg),
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
};
Expand Down Expand Up @@ -27484,7 +27425,6 @@ describe('sessionLanguage multi-session propagation', () => {
getConfig: vi.fn().mockReturnValue(cfg),
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
} as unknown as InstanceType<typeof Session>;
Expand Down Expand Up @@ -27595,7 +27535,6 @@ describe('sessionLanguage multi-session propagation', () => {
reloadModelProvidersFromDisk: index === 0 ? reload1 : reload2,
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
} as unknown as InstanceType<typeof Session>;
Expand Down Expand Up @@ -27724,7 +27663,6 @@ describe('sessionLanguage multi-session propagation', () => {
getSessionReasoningSelection,
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -27812,7 +27750,6 @@ describe('sessionLanguage multi-session propagation', () => {
clearTodoStopGuardTrust,
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -27917,7 +27854,6 @@ describe('sessionLanguage multi-session propagation', () => {
clearTodoStopGuardTrust: vi.fn(),
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -28031,7 +27967,6 @@ describe('sessionLanguage multi-session propagation', () => {
clearTodoStopGuardTrust: vi.fn(),
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -28138,7 +28073,6 @@ describe('sessionLanguage multi-session propagation', () => {
clearTodoStopGuardTrust: vi.fn(),
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -28236,7 +28170,6 @@ describe('sessionLanguage multi-session propagation', () => {
clearTodoStopGuardTrust,
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -28350,7 +28283,6 @@ describe('sessionLanguage multi-session propagation', () => {
clearTodoStopGuardTrust,
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -28465,7 +28397,6 @@ describe('sessionLanguage multi-session propagation', () => {
clearTodoStopGuardTrust,
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -28585,7 +28516,6 @@ describe('sessionLanguage multi-session propagation', () => {
clearTodoStopGuardTrust,
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -28699,7 +28629,6 @@ describe('sessionLanguage multi-session propagation', () => {
clearTodoStopGuardTrust,
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -28791,7 +28720,6 @@ describe('sessionLanguage multi-session propagation', () => {
clearTodoStopGuardTrust,
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -28885,7 +28813,6 @@ describe('sessionLanguage multi-session propagation', () => {
clearTodoStopGuardTrust,
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
} as unknown as InstanceType<typeof Session>;
Expand Down Expand Up @@ -29019,7 +28946,6 @@ describe('sessionLanguage multi-session propagation', () => {
clearTodoStopGuardTrust,
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -29103,7 +29029,6 @@ describe('sessionLanguage multi-session propagation', () => {
clearTodoStopGuardTrust,
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -29184,7 +29109,6 @@ describe('sessionLanguage multi-session propagation', () => {
clearTodoStopGuardTrust,
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -29272,7 +29196,6 @@ describe('sessionLanguage multi-session propagation', () => {
clearTodoStopGuardTrust,
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -29365,7 +29288,6 @@ describe('sessionLanguage multi-session propagation', () => {
clearActiveTodoPlanRevision: vi.fn(),
clearTodoStopGuardTrust: vi.fn(),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -29876,7 +29798,6 @@ describe('sessionLanguage multi-session propagation', () => {
getConfig: vi.fn().mockReturnValue(cfg),
sendAvailableCommandsUpdate,
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -29954,7 +29875,6 @@ describe('sessionLanguage multi-session propagation', () => {
getConfig: vi.fn().mockReturnValue(cfg),
sendAvailableCommandsUpdate,
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down Expand Up @@ -30102,7 +30022,6 @@ describe('sessionLanguage multi-session propagation', () => {
getConfig: vi.fn().mockReturnValue(cfg),
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
} as unknown as InstanceType<typeof Session>;
Expand Down Expand Up @@ -30172,7 +30091,6 @@ describe('sessionLanguage multi-session propagation', () => {
getConfig: vi.fn().mockReturnValue(cfgA),
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
}) as unknown as InstanceType<typeof Session>,
Expand Down
1 change: 0 additions & 1 deletion packages/cli/src/acp-integration/acpAgent.worktree.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,6 @@ describe('QwenAgent loadSession — Phase C worktree context restore', () => {
sendAvailableCommandsUpdate: vi.fn().mockResolvedValue(undefined),
replayHistory: vi.fn().mockResolvedValue(undefined),
installRewriter: vi.fn(),
installGoalTerminalObserver: vi.fn(),
startCronScheduler: vi.fn(),
dispose: vi.fn(),
pendingWorktreeNotice: null as string | null,
Expand Down
26 changes: 26 additions & 0 deletions packages/cli/src/acp-integration/session/emitters/MessageEmitter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,32 @@ describe('MessageEmitter', () => {
});
});

describe('emitStopHookLoop', () => {
it('sends loop metadata and no legacy goal projection', async () => {
// Exact equality, not `objectContaining`: the three assertions that
// observe this payload through the real emitter in `Session.test.ts` all
// match on a subset, so re-attaching the first-generation `goal`
// sub-object -- a partial revert, or a badly resolved merge -- would put
// a second, stale Goal projection back on the ACP wire beside
// `_meta.goalState` and leave the whole suite green. A surplus key fails
// this assertion.
await emitter.emitStopHookLoop(2, ['first reason', 'second reason'], 3);

expect(sendUpdateSpy).toHaveBeenCalledTimes(1);
expect(sendUpdateSpy).toHaveBeenCalledWith({
sessionUpdate: 'agent_message_chunk',
content: { type: 'text', text: '' },
_meta: {
stopHookLoop: {
iterationCount: 2,
reasons: ['first reason', 'second reason'],
stopHookCount: 3,
},
},
});
});
});

describe('emitGoalState', () => {
it('sends canonical state with the legacy projection used by replay', async () => {
const snapshot: GoalSnapshotV2 = {
Expand Down
Loading
Loading