Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 40 additions & 7 deletions apps/web/src/components/Sidebar.logic.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1049,9 +1049,11 @@ describe("Working shelf (beta)", () => {
).toBe(false);
});

it("lists a pinned thread that waits on its own agents under Working until it finishes", () => {
// A pinned parent waiting on a delegated child reads Waiting; it belongs in Working.
const shelf = (thread: typeof waiting | typeof idle, placement: { pinned?: boolean } = {}) =>
it("keeps a pinned thread in Pinned whatever it is doing, and unpinned work in Working", () => {
const shelf = (
thread: Parameters<typeof isSidebarThreadWorking>[0],
placement: { pinned?: boolean } = {},
) =>
resolveSidebarShelf(
resolveSidebarThreadSection({
snoozed: false,
Expand All @@ -1060,15 +1062,23 @@ describe("Working shelf (beta)", () => {
}),
isSidebarThreadWorking(thread),
);
expect(shelf(waiting, { pinned: true })).toBe("working");
const statuses = {
running: { ...idle, runtime },
"waiting on its own agents": waiting,
"needs approval": { ...waiting, hasPendingApprovals: true },
"needs input": { ...waiting, hasPendingUserInput: true },
failed: { ...waiting, runtime: { ...runtime, status: "failed" as const, lastError: "boom" } },
idle,
};
for (const [status, thread] of Object.entries(statuses)) {
expect(shelf(thread, { pinned: true }), status).toBe("pinned");
}
expect(shelf(statuses.running)).toBe("working");
expect(shelf(waiting)).toBe("working");
expect(shelf(idle, { pinned: true })).toBe("pinned");
expect(shelf(idle)).toBe("active");
// Settled and snoozed threads stay in their own groups even while working.
expect(resolveSidebarShelf("settled", true)).toBe("settled");
expect(resolveSidebarShelf("snoozed", true)).toBe("snoozed");
// A thread waiting on a person is not Working, pinned or not.
expect(shelf({ ...waiting, hasPendingApprovals: true }, { pinned: true })).toBe("pinned");
});

it("keeps a ready plan in the inbox while background work runs", () => {
Expand Down Expand Up @@ -1161,6 +1171,29 @@ describe("Working shelf (beta)", () => {
expect(resolveSidebarDropVerb("active", "working")).toBeNull();
});

it("lets a pinned thread reorder, unpin and refuse the Working shelf like any pin", () => {
const pinnedItems: readonly SidebarListItem[] = [
marker("pinned-header"),
row("p1", "pinned"),
row("p2", "pinned"),
marker("pinned-divider"),
row("a1", "active"),
marker("working-header"),
row("w1", "working"),
];
expect(resolveSidebarDropTarget(pinnedItems, "p1", "w1")).toBeNull();
expect(resolveSidebarDropTarget(pinnedItems, "p1", "p2")).toEqual({
section: "pinned",
pinnedOrder: ["p2", "p1"],
activeOrder: ["a1"],
});
expect(resolveSidebarDropTarget(pinnedItems, "p1", "a1")).toEqual({
section: "active",
pinnedOrder: ["p2"],
activeOrder: ["a1", "p1"],
});
});

it.each([
["pinned", "p1"],
["active", "a2"],
Expand Down
8 changes: 4 additions & 4 deletions apps/web/src/components/Sidebar.logic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,15 @@ export function resolveSidebarThreadSection(input: {
}

/**
* The shelf a thread lists in while the Working shelf is on. Work the thread waits on, such as
* its own background task or child agent, keeps it Working even when pinned; it returns to
* Pinned when it finishes. Snoozed and settled threads stay put.
* The shelf a thread lists in while the Working shelf is on. Only unpinned active threads move
* to Working; a pinned thread stays at the top whatever it is doing, and shows its status in
* place. Snoozed and settled threads stay put.
*/
export function resolveSidebarShelf(
section: SidebarSection,
working: boolean,
): SidebarSection | "working" {
return working && (section === "active" || section === "pinned") ? "working" : section;
return working && section === "active" ? "working" : section;
}

const SIDEBAR_MARKER_PREFIX = "sidebar-marker-";
Expand Down
Loading