smashimo/oh-my-pi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(coding-agent/session): split queued-message editor restore between dequeue and interrupt

Browse Source 
- Generalized `isUserQueuedMessage` to a user-attribution predicate (`role === "user"` or custom `attribution === "user"` and not display-suppressed) so visible agent-authored steers (advisor cards, IRC/extension asides) and hidden goal/plan/budget steers are all excluded from editor restore, not just advisor cards.
- Gave `AgentSession.clearQueue` a `{ forInterrupt }` option: plain Alt+Up dequeue restores user messages and preserves every other queued message for the continuing stream, while Esc+abort keeps only advisor cards (for `abort()`'s `#extractQueuedAdvisorCards` preservation) and drops other internal steers so the post-abort `#drainStrandedQueuedMessages` can't auto-resume the interrupted run.
- Threaded `forInterrupt: options?.abort` from `InputController.restoreQueuedMessagesToEditor` and kept `queuedMessageCount` on actual displayable-queue semantics so `hasPendingMessages()`/RPC and the empty-submit abort gate stay accurate.
- Updated skill-queue tests to cover both policies (hidden and visible agent-authored steers preserved on dequeue, dropped on interrupt) and refreshed the changelog entry.
This commit is contained in:
can1357
2026-06-16 16:09:28 +02:00
parent 6bbc573c6f
commit 1e3909a151
5 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/coding-agent/test/input-controller-skill-queue.test.ts
+23 -15
View File
@@ -286,34 +286,42 @@ describe("AgentSession derived queued custom display", () => {
expect(session.getQueuedMessages().steering).toEqual([]);
expect(session.queuedMessageCount).toBe(0);
// A hidden agent-authored steer must not leak into the editor, and clearQueue
// must drop it so abort()'s stranded-message drain can't auto-resume the run
// the user just interrupted (the drain gate is agent.hasQueuedMessages()).
// Plain Alt+Up dequeue restores nothing AND preserves the hidden steer for the
// continuing stream — it isn't the user's draft.
expect(session.clearQueue().steering).toEqual([]);
expect(session.agent.hasQueuedMessages()).toBe(true);
// Esc+abort drops it so abort()'s stranded-message drain can't auto-resume the
// run the user just interrupted (the drain gate is agent.hasQueuedMessages()).
expect(session.clearQueue({ forInterrupt: true }).steering).toEqual([]);
expect(session.agent.hasQueuedMessages()).toBe(false);
});
it("never restores a visible agent-authored custom steer, and drops it on clearQueue", async () => {
it("never restores a visible agent-authored custom steer; preserves on dequeue, drops on interrupt", async () => {
fixture = await createRealSession();
const { session } = fixture;
// An IRC aside / extension notice: visible, but agent-authored — editing it
// An IRC aside / extension/hook notice: visible, but agent-authored — editing it
// makes no sense, so it must not ride the Esc/Alt+Up editor-restore path.
session.agent.steer({
role: "custom",
customType: "irc",
content: "peer pinged you",
display: true,
attribution: "agent",
details: {},
timestamp: Date.now(),
});
const steer = () =>
session.agent.steer({
role: "custom",
customType: "irc",
content: "peer pinged you",
display: true,
attribution: "agent",
details: {},
timestamp: Date.now(),
});
steer();
expect(session.getQueuedMessages().steering).toEqual([]);
// popLast leaves the agent steer untouched (not user-restorable)...
expect(session.popLastQueuedMessage()).toBeUndefined();
expect(session.agent.peekSteeringQueue()).toHaveLength(1);
// ...and clearQueue restores nothing while dropping it (no auto-resume leftover).
// ...plain dequeue restores nothing but PRESERVES the extension steer (not lost)...
expect(session.clearQueue().steering).toEqual([]);
expect(session.agent.peekSteeringQueue()).toHaveLength(1);
// ...and only Esc+abort drops it (no auto-resume leftover).
expect(session.clearQueue({ forInterrupt: true }).steering).toEqual([]);
expect(session.agent.hasQueuedMessages()).toBe(false);
});