fix(bridge): forward Pi agent_end so the spinner stops at workflow completion
The FE derived 'working' purely as activeSession && !pendingWidget, so the
final workflow turn — the only one that ends without a follow-up gate —
left the spinner on forever (observed live: 21592s after F8 approve).
- SessionBridge maps Pi's agent_end -> SSE system_event {event: agent_end}
- PiProcessManager notifies the client (info error + synthetic agent_end)
when the child dies unexpectedly; expected teardowns stay silent
- sessionStore tracks agentActive (on: user entry/text_delta/ui_request,
off: agent_end); AppShell working now requires it; resume sets it
optimistically
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -76,6 +76,8 @@ export function AppShell() {
|
||||
// working spinner shows straight away; the backend calls run after.
|
||||
setPanelSession(null);
|
||||
resetSession();
|
||||
// Optimistic: the resume POST is about to hand the ball to the harness.
|
||||
setAgentActive(true);
|
||||
setActiveSessionId(id);
|
||||
try {
|
||||
await resumeSession(id);
|
||||
@@ -152,13 +154,17 @@ export function AppShell() {
|
||||
);
|
||||
}
|
||||
|
||||
// The harness "holds the ball" whenever a session is live and no widget is
|
||||
// waiting on the human; once a widget appears, input is back in the user's court.
|
||||
// The harness "holds the ball" whenever a session is live, no widget is waiting on
|
||||
// the human, AND the Pi turn is still in flight (agentActive). Without the last
|
||||
// condition the final workflow step — which ends with no follow-up gate — would
|
||||
// leave the spinner on forever.
|
||||
const pendingWidget = useSessionStore((s) => s.pendingWidget);
|
||||
const resetSession = useSessionStore((s) => s.resetSession);
|
||||
const setPhase = useSessionStore((s) => s.setPhase);
|
||||
const setAgentActive = useSessionStore((s) => s.setAgentActive);
|
||||
const lastSystemEvent = useSessionStore((s) => s.lastSystemEvent);
|
||||
const working = Boolean(activeSessionId) && !pendingWidget;
|
||||
const agentActive = useSessionStore((s) => s.agentActive);
|
||||
const working = Boolean(activeSessionId) && !pendingWidget && agentActive;
|
||||
// Processing time counts only while the harness works, not while a finalized
|
||||
// session sits idle or a gate awaits the reviewer (pendingWidget).
|
||||
const running = working && !finalized;
|
||||
|
||||
@@ -39,6 +39,35 @@ test("ui_request without a phase keeps the existing currentPhase", () => {
|
||||
expect(useSessionStore.getState().currentPhase).toBe("F2");
|
||||
});
|
||||
|
||||
test("agentActive lifecycle: off by default, on with activity, off on agent_end", () => {
|
||||
const st = useSessionStore.getState();
|
||||
expect(useSessionStore.getState().agentActive).toBe(false);
|
||||
// Any streamed text means the turn is alive (also covers reattaching mid-turn).
|
||||
st.applyEvent({ type: "text_delta", text: "Analisi" });
|
||||
expect(useSessionStore.getState().agentActive).toBe(true);
|
||||
// Pi's end-of-turn signal (mapped by the backend) releases the working state.
|
||||
st.applyEvent({ type: "system_event", event: "agent_end" });
|
||||
expect(useSessionStore.getState().agentActive).toBe(false);
|
||||
});
|
||||
|
||||
test("setLastUserEntry hands the ball back to the harness (agentActive on)", () => {
|
||||
useSessionStore.getState().setLastUserEntry({ kind: "choice", text: "approve" });
|
||||
expect(useSessionStore.getState().agentActive).toBe(true);
|
||||
});
|
||||
|
||||
test("setAgentActive drives the flag directly (resume optimistic spin)", () => {
|
||||
useSessionStore.getState().setAgentActive(true);
|
||||
expect(useSessionStore.getState().agentActive).toBe(true);
|
||||
useSessionStore.getState().resetSession();
|
||||
expect(useSessionStore.getState().agentActive).toBe(false);
|
||||
});
|
||||
|
||||
test("a ui_request keeps agentActive on (turn blocked on the gate, not ended)", () => {
|
||||
const st = useSessionStore.getState();
|
||||
st.applyEvent({ type: "ui_request", ui_request: { id: "u1", widget: "select" } });
|
||||
expect(useSessionStore.getState().agentActive).toBe(true);
|
||||
});
|
||||
|
||||
test("pushToast appends an error toast", () => {
|
||||
useSessionStore.getState().pushToast({ level: "error", text: "boom" });
|
||||
expect(useSessionStore.getState().toasts.at(-1)).toEqual({ level: "error", text: "boom" });
|
||||
|
||||
@@ -15,12 +15,17 @@ interface SessionState {
|
||||
lastSystemEvent: StreamEvent | null;
|
||||
currentPhase: string | null;
|
||||
phaseError: string | null;
|
||||
// True while a Pi turn is in flight. Turned off by the backend-forwarded `agent_end`
|
||||
// system event — the only end-of-turn signal on the final workflow step, where no
|
||||
// follow-up gate arrives to release the spinner.
|
||||
agentActive: boolean;
|
||||
applyEvent: (e: StreamEvent) => void;
|
||||
clearPending: () => void;
|
||||
resetSession: () => void;
|
||||
setPhase: (phase: string | null) => void;
|
||||
pushToast: (toast: { level: string; text: string }) => void;
|
||||
setLastUserEntry: (e: { kind: "input" | "choice"; text: string }) => void;
|
||||
setAgentActive: (v: boolean) => void;
|
||||
}
|
||||
|
||||
const empty = {
|
||||
@@ -32,6 +37,7 @@ const empty = {
|
||||
lastSystemEvent: null,
|
||||
currentPhase: null as string | null,
|
||||
phaseError: null as string | null,
|
||||
agentActive: false,
|
||||
};
|
||||
|
||||
export const useSessionStore = create<SessionState>((set) => ({
|
||||
@@ -41,6 +47,8 @@ export const useSessionStore = create<SessionState>((set) => ({
|
||||
if (e.type === "ui_request")
|
||||
return {
|
||||
pendingWidget: e.ui_request,
|
||||
// The turn is blocked on the gate, not ended: keep the agent marked active.
|
||||
agentActive: true,
|
||||
currentPhase: e.ui_request.phase
|
||||
? e.ui_request.phase.split("_")[0]
|
||||
: st.currentPhase,
|
||||
@@ -52,19 +60,25 @@ export const useSessionStore = create<SessionState>((set) => ({
|
||||
const last = t.at(-1);
|
||||
if (last && !st.pendingWidget) t[t.length - 1] = { role: "assistant", text: last.text + e.text };
|
||||
else t.push({ role: "assistant", text: e.text });
|
||||
return { transcript: t };
|
||||
// Streamed text means the turn is alive (also covers reattaching mid-turn).
|
||||
return { transcript: t, agentActive: true };
|
||||
}
|
||||
if (e.type === "info") {
|
||||
const stepMessages = [...st.stepMessages, { level: e.level ?? "info", text: e.text }];
|
||||
// An error during the active phase marks that phase red until the next gate.
|
||||
return e.level === "error" ? { stepMessages, phaseError: st.currentPhase } : { stepMessages };
|
||||
}
|
||||
if (e.type === "system_event") return { lastSystemEvent: e };
|
||||
if (e.type === "system_event")
|
||||
return e.event === "agent_end"
|
||||
? { lastSystemEvent: e, agentActive: false }
|
||||
: { lastSystemEvent: e };
|
||||
return {};
|
||||
}),
|
||||
clearPending: () => set({ pendingWidget: null }),
|
||||
resetSession: () => set({ ...empty }),
|
||||
setPhase: (phase) => set({ currentPhase: phase }),
|
||||
pushToast: (toast) => set((st) => ({ toasts: [...st.toasts, toast] })),
|
||||
setLastUserEntry: (e) => set({ lastUserEntry: e, stepMessages: [] }),
|
||||
// A user entry (question, gate choice, steer) hands the ball back to the harness.
|
||||
setLastUserEntry: (e) => set({ lastUserEntry: e, stepMessages: [], agentActive: true }),
|
||||
setAgentActive: (v) => set({ agentActive: v }),
|
||||
}));
|
||||
|
||||
Reference in New Issue
Block a user