Open-source AI coworkers that each get a computer of their own: a browser, files and tools, with every action decided before it happens and recorded after. Bring any AG-UI agent.
Plainer Computer handoff notice, no default Bot on a new conversation, and Tab straight to the composer (#789)
Guido Vizosod7cc57e7807b
diff --git a/agent-computer/src/control.ts b/agent-computer/src/control.tsindex 2041b0f3..4733a111 100644--- a/agent-computer/src/control.ts+++ b/agent-computer/src/control.ts@@ -207,6 +207,7 @@ export function createControl((active(live) || data.holder === "human" || data.recoveryRequired) &&barrier.pending() > 0,resumeSnapshotRequired: data.resumeSnapshotRequired,+ recoveryRequired: data.recoveryRequired,...(secret? {secretWanted: secret.label,diff --git a/agent-computer/tests/control.test.ts b/agent-computer/tests/control.test.tsindex eff8942d..96ee74ea 100644--- a/agent-computer/tests/control.test.ts+++ b/agent-computer/tests/control.test.ts@@ -121,6 +121,7 @@ describe("request-aware handoff", () => {status: "interrupted",interruption: "The browser restarted.",});+ expect(control.get().recoveryRequired).toBe(true);expect(control.humanMayDrive()).toBe(false);expect(() => control.admitBotAction(true)).toThrow(ControlError);expect(() => control.release(interrupted.id)).toThrow();@@ -131,6 +132,7 @@ describe("request-aware handoff", () => {const unanswered = request();control.interrupt("The browser restarted.");expect(control.get(unanswered.id).request?.status).toBe("interrupted");+ expect(control.get().recoveryRequired).toBe(false);// The page is as the Bot left it, so a fresh look is all it needs, not a person.expect(() => control.admitBotAction(true)).toThrow(SnapshotRequiredError);control.snapshotTaken();diff --git a/app/src/components/computer/computer-controls.tsx b/app/src/components/computer/computer-controls.tsxindex 60a6cc3e..a6b98e69 100644--- a/app/src/components/computer/computer-controls.tsx+++ b/app/src/components/computer/computer-controls.tsx@@ -61,7 +61,7 @@ export function ComputerChatControls({control &&(control.requested ||control.holder === "human" ||- control.request?.status === "interrupted" ||+ control.recoveryRequired ||control.secretWanted !== undefined),);const promptKey = needsYoudiff --git a/app/src/components/computer/computer-view.tsx b/app/src/components/computer/computer-view.tsxindex e9dc8f1e..bd5efa58 100644--- a/app/src/components/computer/computer-view.tsx+++ b/app/src/components/computer/computer-view.tsx@@ -510,10 +510,20 @@ export function ComputerView({Finishing the assistant's current action before giving you control…</p>) : null}- {!settled && control?.request?.status === "interrupted" ? (+ {/*+ The request's own interruption reason is written for the assistant, so the person gets+ their own sentence, and is only asked to act when the assistant is actually waiting on them.+ */}+ {!settled && control?.recoveryRequired ? (<p className="px-3 py-2 text-sm">- The browser was interrupted. {control.request.interruption} Open the- screen and take control again to check it.+ The Computer stopped while you had control, so the assistant can't+ use the browser yet. Take control to check the page, then hand it+ back.+ </p>+ ) : !settled && control?.request?.status === "interrupted" ? (+ <p className="px-3 py-2 text-sm text-muted-foreground">+ The Computer stopped before anyone took control. The assistant will+ ask again if it still needs you.</p>) : null}{/*diff --git a/app/src/components/computer/needs-you.ts b/app/src/components/computer/needs-you.tsindex 2f712d9c..c1e8fe13 100644--- a/app/src/components/computer/needs-you.ts+++ b/app/src/components/computer/needs-you.ts@@ -25,7 +25,7 @@ export function useNeedsYou(botId: string | undefined, when: boolean): boolean {state &&(state.requested ||state.holder === "human" ||- state.request?.status === "interrupted" ||+ state.recoveryRequired ||state.secretWanted !== undefined),),);diff --git a/app/src/components/ui/message-scroller.tsx b/app/src/components/ui/message-scroller.tsxindex 7b39d047..ffca59f0 100644--- a/app/src/components/ui/message-scroller.tsx+++ b/app/src/components/ui/message-scroller.tsx@@ -34,11 +34,16 @@ function MessageScroller({function MessageScrollerViewport({className,+ tabIndex,...props}: React.ComponentProps<typeof MessageScrollerPrimitive.Viewport>) {+ // The primitive is always a tab stop so the keyboard can scroll it. One with nothing to scroll,+ // like a conversation that has not started, is a stop between the To: field and the composer.+ const scrollable = useMessageScrollerScrollable();return (<MessageScrollerPrimitive.Viewportdata-slot="message-scroller-viewport"+ tabIndex={tabIndex ?? (scrollable.start || scrollable.end ? 0 : -1)}className={cn("size-full min-h-0 min-w-0 scroll-fade-b scrollbar-thin scrollbar-gutter-stable overflow-y-auto overscroll-contain contain-content data-autoscrolling:scrollbar-thumb-transparent data-autoscrolling:scrollbar-track-transparent",className,diff --git a/app/src/routes/_authed/_app/channel/new.tsx b/app/src/routes/_authed/_app/channel/new.tsxindex 4193fee5..c0918198 100644--- a/app/src/routes/_authed/_app/channel/new.tsx+++ b/app/src/routes/_authed/_app/channel/new.tsx@@ -23,7 +23,6 @@ import {ComboboxList,useComboboxAnchor,} from "@/components/ui/combobox";-import { defaultAgentProfile } from "@/lib/agents/default-agent";import {type AgentProfile,agentListQueryOptions,@@ -76,10 +75,9 @@ function RouteComponent() {enabled: Boolean(agent) && profiles !== undefined && !listed,retry: false,});- const chosen =- listed ??- (fetched?.id === agent ? fetched : undefined) ??- (agent ? undefined : defaultAgentProfile(profiles));+ // Only the URL names a recipient up front. Without one the To: field starts empty and open: a+ // Bot picked on the person's behalf is one they have to notice and remove.+ const chosen = listed ?? (fetched?.id === agent ? fetched : undefined);const needsUrlAgentDetail =Boolean(agent) && profiles !== undefined && !listed;const waitingForUrlAgent =diff --git a/app/tests/bot-route-default-agent.test.tsx b/app/tests/bot-route-default-agent.test.tsxindex c9bb15cc..10461150 100644--- a/app/tests/bot-route-default-agent.test.tsx+++ b/app/tests/bot-route-default-agent.test.tsx@@ -311,6 +311,7 @@ test("/bot opens a live Computer sidebar with ownership controls and preserves trequested: false,transitioning: false,resumeSnapshotRequired: false,+ recoveryRequired: false,});return Response.json({ error: "No frame yet" }, { status: 404 });},@@ -374,6 +375,7 @@ test("/bot?watch=true restores the live Computer panel on reload", async () => {requested: false,transitioning: false,resumeSnapshotRequired: false,+ recoveryRequired: false,}),{ preconnect: originalFetch.preconnect },);diff --git a/app/tests/channel-new-error-state.test.tsx b/app/tests/channel-new-error-state.test.tsxindex ac3bdc9d..226f5e72 100644--- a/app/tests/channel-new-error-state.test.tsx+++ b/app/tests/channel-new-error-state.test.tsx@@ -188,6 +188,20 @@ test("/channel/new keeps a successful empty roster as an empty picker", async ()await expectMessageComposerDisabled(view, true);});+test("/channel/new without a URL recipient leaves the To: field empty", async () => {+ const view = renderChannelNew(+ queryClientWithAgents([+ agent({ id: "picked-harness", name: "Picked Harness" }),+ GENERAL_ASSISTANT,+ ]),+ );++ await expectMessageComposerDisabled(view, true);+ expect(+ view.queryByRole("button", { hidden: true, name: /^Remove / }),+ ).toBeNull();+});+test("/channel/new keeps a successful visible recipient enabled", async () => {const view = renderChannelNew(queryClientWithAgents([GENERAL_ASSISTANT]),diff --git a/app/tests/computer-control-button.test.tsx b/app/tests/computer-control-button.test.tsxindex c4c2c09b..3c8502cb 100644--- a/app/tests/computer-control-button.test.tsx+++ b/app/tests/computer-control-button.test.tsx@@ -29,6 +29,7 @@ function server(initial: "bot" | "human" = "bot") {requested: false,transitioning: false,resumeSnapshotRequired: false,+ recoveryRequired: false,...(initial === "human"? {request: {diff --git a/app/tests/computer-handoff.test.ts b/app/tests/computer-handoff.test.tsindex be099934..8bbefc3b 100644--- a/app/tests/computer-handoff.test.ts+++ b/app/tests/computer-handoff.test.ts@@ -29,6 +29,7 @@ function state(status: HandoffStatus, id = "request-1"): ComputerControlState {requested: status === "waiting",transitioning: false,resumeSnapshotRequired: status === "completed",+ recoveryRequired: false,request: {id,status,diff --git a/app/tests/message-scroller-tab-stop.test.tsx b/app/tests/message-scroller-tab-stop.test.tsxnew file mode 100644index 00000000..861276cb--- /dev/null+++ b/app/tests/message-scroller-tab-stop.test.tsx@@ -0,0 +1,35 @@+import { afterAll, afterEach, beforeAll, expect, test } from "bun:test";+import { GlobalRegistrator } from "@happy-dom/global-registrator";+import { cleanup, render } from "@testing-library/react";+import {+ MessageScroller,+ MessageScrollerContent,+ MessageScrollerProvider,+ MessageScrollerViewport,+} from "@/components/ui/message-scroller";++beforeAll(() => GlobalRegistrator.register());+afterEach(() => cleanup());+afterAll(() => GlobalRegistrator.unregister());++function renderViewport(tabIndex?: number) {+ return render(+ <MessageScrollerProvider>+ <MessageScroller>+ <MessageScrollerViewport tabIndex={tabIndex}>+ <MessageScrollerContent />+ </MessageScrollerViewport>+ </MessageScroller>+ </MessageScrollerProvider>,+ );+}++test("a transcript with nothing to scroll is not a tab stop", () => {+ const view = renderViewport();+ expect(view.getByRole("region", { name: "Messages" }).tabIndex).toBe(-1);+});++test("a caller's own tabIndex still wins", () => {+ const view = renderViewport(0);+ expect(view.getByRole("region", { name: "Messages" }).tabIndex).toBe(0);+});diff --git a/server/tests/computer-handoff-contract.test.ts b/server/tests/computer-handoff-contract.test.tsindex add4132d..36837738 100644--- a/server/tests/computer-handoff-contract.test.ts+++ b/server/tests/computer-handoff-contract.test.ts@@ -16,6 +16,7 @@ const state: ComputerControlState = {requested: true,transitioning: false,resumeSnapshotRequired: false,+ recoveryRequired: false,request: {id: "request-1",toolCallId: "call-1",diff --git a/server/tests/headless-tools.test.ts b/server/tests/headless-tools.test.tsindex 78ad27ec..b15558a0 100644--- a/server/tests/headless-tools.test.ts+++ b/server/tests/headless-tools.test.ts@@ -344,6 +344,7 @@ function computerHarness(deny: string[] = []) {transitioning: false,since: "now",resumeSnapshotRequired: false,+ recoveryRequired: false,request: {id: "durable-handoff",status: "waiting",diff --git a/shared/computer-control.ts b/shared/computer-control.tsindex dc29657a..4b8a8211 100644--- a/shared/computer-control.ts+++ b/shared/computer-control.ts@@ -41,6 +41,8 @@ export type ComputerControlState = {request?: HandoffRequest;transitioning: boolean;resumeSnapshotRequired: boolean;+ /** A person had the page when the computer stopped, so they must check it before the Bot acts. */+ recoveryRequired: boolean;secretWanted?: string;secretRef?: string;secretSnapshotId?: number;