@cueloop/client 0.1.0-alpha.98 → 0.1.0-alpha.99

package/src/thread/use-thread-agent.ts

@@ -1,4 +1,5 @@
 import { useEffect, useRef, useState } from "react";
+import { subscribeThreadState, connectThreadObserver } from "@cueloop/daemon/thread-subscription";
 import { DaemonClient } from "@cueloop/daemon/client";
 import type { ThreadAgentState } from "@cueloop/schema";
 
@@ -26,6 +27,7 @@ export function useThreadAgent(id: string, home?: string, injected?: ThreadAgent
     let cancelled = false;
     let connection: DaemonClient | undefined;
     let unsubscribe: (() => void) | undefined;
+
     revision.current++;
     const refresh = async (api: ThreadAgentClient) => {
       const requested = ++revision.current;
@@ -51,21 +53,29 @@ export function useThreadAgent(id: string, home?: string, injected?: ThreadAgent
 
           return;
         }
-        connection = await DaemonClient.connect({ home, autostart: true });
-        if (cancelled) {
-          connection.close();
-          return;
-        }
-        setClient(connection);
-        unsubscribe = connection.onEvent((event) => {
-          if (event.event === "agent.updated" && event.sessionId === id)
-            void refresh(connection!).catch((error) => {
+        unsubscribe = subscribeThreadState({
+          connect: connectThreadObserver({ home, autostart: true }),
+          matches: (event) => event.event === "agent.updated" && event.sessionId === id,
+          read: async (api, signal) => {
+            const requested = ++revision.current;
+            const state = await api.agentGet(id, { signal });
+
+            return { state, requested };
+          },
+          onConnect: (api) => {
+            connection = api;
+            setClient(api);
+            void configure(api).catch((error) => {
               if (!cancelled) setError(String(error));
             });
+          },
+          onValue: ({ state, requested }) => {
+            if (!cancelled && requested === revision.current) setState(state);
+          },
+          onError: (error) => {
+            if (!cancelled) setError(String(error));
+          },
         });
-        await connection.subscribe();
-        await refresh(connection);
-        await configure(connection);
       } catch (error) {
         if (!cancelled) setError(error instanceof Error ? error.message : String(error));
       }

package/src/ui/components/PromptDialog.test.tsx

@@ -21,6 +21,7 @@ test("the input is focused on open, so typing lands in the dialog", async () =>
     />,
     { width: 60, height: 12 },
   );
+
   await settle(setup);
 
   await typeText(setup, "!");
@@ -45,14 +46,17 @@ test("clicking save fires onSave and clicking cancel fires onCancel", async () =
     />,
     { width: 60, height: 12 },
   );
+
   await settle(setup);
 
   const save = locateText(setup, "save");
+
   await setup.mockMouse.click(save.column, save.row);
   expect(saved).toBe(1);
   expect(cancelled).toBe(0);
 
   const cancel = locateText(setup, "cancel");
+
   await setup.mockMouse.click(cancel.column, cancel.row);
   expect(cancelled).toBe(1);
   expect(saved).toBe(1);

package/src/ui/components/RootOverlay.tsx

@@ -29,6 +29,7 @@ export function RootOverlayProvider({ children }: { children: React.ReactNode })
         setOverlays((current) => {
           if (!current.has(key)) return current;
           const next = new Map(current);
+
           next.delete(key);
 
           return next;

package/src/ui/components/primitives/Dialog.test.tsx

@@ -23,6 +23,7 @@ test("clicking the backdrop dismisses; clicking inside the panel does not", asyn
     </Dialog>,
     { width: 60, height: 20 },
   );
+
   await settle(setup);
 
   // the top-left corner is backdrop, outside the centered panel

package/src/workbench/components/ChangesColumn.tsx

@@ -140,6 +140,7 @@ export function ChangesFileTree({
       return setCursor(Math.min(cursorIndex + 1, rows.length - 1));
     if (key.name === "k" || key.name === "up") return setCursor(Math.max(cursorIndex - 1, 0));
     const row = rows[cursorIndex];
+
     if (!row) return;
     if (key.name === "return" || key.name === "enter")
       return row.isFolder ? toggle(row.id) : onSelectFile(row.id, true);

package/src/workbench/components/ChangesFileTree.test.tsx

@@ -41,6 +41,7 @@ test("j moves onto a file and Enter opens it", async () => {
     />,
     { width: 40, height: 12 },
   );
+
   await settle(setup);
   await waitForText(setup, "a.ts");
 
@@ -117,6 +118,7 @@ test("without focus the keyboard opens nothing", async () => {
     <ChangesFileTree files={files} onSelectFile={(path) => opened.push(path)} theme={DARK} />,
     { width: 40, height: 12 },
   );
+
   await settle(setup);
   await waitForText(setup, "a.ts");
 

package/src/workbench/components/FileContentsView.tsx

@@ -34,12 +34,14 @@ export function FileContentsView({
   // instance; a state-backed ref rebinds the target once the code renderable exists.
   const [codeTarget, setCodeTarget] = useState<CodeRenderable | null>(null);
   const loadRef = useRef(loadContents);
+
   useEffect(() => {
     loadRef.current = loadContents;
   });
 
   useEffect(() => {
     let alive = true;
+
     void loadRef.current(path).then(
       (contents) => {
         if (alive) setLoaded({ path, lines: contents === null ? null : contents.split("\n") });

package/src/workbench/components/GridTabContent.tsx

@@ -111,6 +111,7 @@ export function GridTabContent(props: {
   theme: Theme;
 }): React.ReactNode {
   const { tab } = props;
+
   if (tab.kind === "file" && tab.fileView === "contents" && tab.path !== undefined) {
     const filePath = tab.path;
 

package/src/workbench/components/ProjectTreeView.test.tsx

@@ -31,6 +31,7 @@ test("Enter expands a folder, then j moves down and Enter opens the file", async
     />,
     { width: 40, height: 12 },
   );
+
   await settle(setup);
   await waitForText(setup, "src");
 
@@ -144,6 +145,7 @@ test("without focus the keyboard does nothing", async () => {
     />,
     { width: 40, height: 12 },
   );
+
   await settle(setup);
   await waitForText(setup, "src");
 
@@ -223,6 +225,7 @@ test("a double-click requests a persistent file tab", async () => {
 
   await waitForText(setup, "README.md");
   const file = locateText(setup, "README.md");
+
   await setup.mockMouse.doubleClick(file.column, file.row);
   expect(opened).toEqual([
     { path: "README.md", persistent: false },

package/src/workbench/components/ProjectTreeView.tsx

@@ -56,6 +56,7 @@ export function ProjectTreeView({
     if (key.name === "k" || key.name === "up")
       return setCursorId(rows[Math.max(cursorIndex - 1, 0)]!.id);
     const row = rows[cursorIndex];
+
     if (!row) return;
     if (key.name === "return" || key.name === "enter")
       return row.isFolder ? toggle(row.id) : onSelectFile(row.id, true);

package/src/workbench/components/editor-grid.test.ts

@@ -19,10 +19,12 @@ import {
 
 function asBranch(node: EditorNode | null): EditorBranch {
   if (node === null || node.type !== "branch") throw new Error("expected a branch node");
+
   return node;
 }
 function asGroup(node: EditorNode | null): EditorGroup {
   if (node === null || node.type !== "group") throw new Error("expected a group node");
+
   return node;
 }
 
@@ -30,6 +32,7 @@ describe("editor grid", () => {
   test("a fresh group holds its tabs with the first active", () => {
     const tab = changesTab();
     const group = makeGroup([tab]);
+
     expect(group.type).toBe("group");
     expect(group.activeTabId).toBe(tab.id);
   });
@@ -38,6 +41,7 @@ describe("editor grid", () => {
     const group = makeGroup([changesTab()]);
     const file = fileTab("App.tsx", "src/App.tsx", "diff");
     const next = asGroup(addTab(group, group.id, file));
+
     expect(next.tabs).toHaveLength(2);
     expect(next.activeTabId).toBe(file.id);
   });
@@ -81,8 +85,10 @@ describe("editor grid", () => {
   test("splitting right makes a horizontal branch and focuses the new group", () => {
     const group = makeGroup([fileTab("App.tsx", "src/App.tsx", "diff")]);
     const { tree, focusGroupId } = splitGroup(group, group.id, "right");
+
     expect(tree.type).toBe("branch");
     const branch = asBranch(tree);
+
     expect(branch.orientation).toBe("horizontal");
     expect(branch.children).toHaveLength(2);
     // the new group is the second child (right edge) and takes focus
@@ -95,6 +101,7 @@ describe("editor grid", () => {
     const group = makeGroup([fileTab("a.ts", "a.ts", "contents")]);
     const { tree, focusGroupId } = splitGroup(group, group.id, "up");
     const branch = asBranch(tree);
+
     expect(branch.orientation).toBe("vertical");
     expect(branch.children[0]!.id).toBe(focusGroupId);
   });
@@ -131,6 +138,7 @@ describe("editor grid", () => {
     const branch = asBranch(tree);
     const rightGroup = asGroup(branch.children[1]!);
     const collapsed = closeTab(tree, rightGroup.id, rightGroup.tabs[0]!.id);
+
     expect(collapsed?.type).toBe("group");
     expect(asGroup(collapsed).id).toBe(group.id);
   });
@@ -138,6 +146,7 @@ describe("editor grid", () => {
   test("closing the only tab of the whole grid returns null", () => {
     const tab = changesTab();
     const group = makeGroup([tab]);
+
     expect(closeTab(group, group.id, tab.id)).toBeNull();
   });
 
@@ -146,8 +155,10 @@ describe("editor grid", () => {
     const { tree } = splitGroup(group, group.id, "right");
     const branch = asBranch(tree);
     const rightGroup = asGroup(branch.children[1]!);
+
     expect(containsGroup(tree, group.id)).toBe(true);
     const collapsed = closeTab(tree, rightGroup.id, rightGroup.tabs[0]!.id);
+
     expect(containsGroup(asGroup(collapsed), rightGroup.id)).toBe(false);
   });
 

package/src/workbench/components/editor-grid.ts

@@ -81,6 +81,7 @@ export function firstGroupId(node: EditorNode): string {
 /** Whether a group id still exists in the grid; used to re-home focus after a prune. */
 export function containsGroup(node: EditorNode, groupId: string): boolean {
   if (node.type === "group") return node.id === groupId;
+
   return node.children.some((child) => containsGroup(child, groupId));
 }
 
@@ -97,6 +98,7 @@ function replaceGroup(
   fn: (group: EditorGroup) => EditorNode,
 ): EditorNode {
   if (node.type === "group") return node.id === id ? fn(node) : node;
+
   return { ...node, children: node.children.map((child) => replaceGroup(child, id, fn)) };
 }
 
@@ -223,8 +225,10 @@ export function keepFileTab(node: EditorNode, groupId: string, tabId: string): E
 export function pruneEmpty(node: EditorNode): EditorNode | null {
   if (node.type === "group") return node.tabs.length > 0 ? node : null;
   const kept = node.children.map(pruneEmpty).filter((child): child is EditorNode => child !== null);
+
   if (kept.length === 0) return null;
   if (kept.length === 1) return kept[0]!;
+
   return { ...node, children: kept };
 }
 
@@ -233,8 +237,10 @@ export function closeTab(node: EditorNode, groupId: string, tabId: string): Edit
   const next = replaceGroup(node, groupId, (group) => {
     const tabs = group.tabs.filter((tab) => tab.id !== tabId);
     const activeTabId = group.activeTabId === tabId ? (tabs[0]?.id ?? null) : group.activeTabId;
+
     return { ...group, tabs, activeTabId };
   });
+
   return pruneEmpty(next);
 }
 
@@ -249,10 +255,12 @@ export function splitGroup(
   let focusGroupId = groupId;
   const tree = replaceGroup(node, groupId, (group) => {
     const active = group.tabs.find((tab) => tab.id === group.activeTabId) ?? group.tabs[0];
+
     if (active === undefined) return group;
     const movedTab: EditorTab =
       active.kind === "welcome" ? { ...active, id: freshId() } : { ...active, preview: false };
     const newGroup = makeGroup([movedTab]);
+
     focusGroupId = newGroup.id;
     const orientation = direction === "left" || direction === "right" ? "horizontal" : "vertical";
     const newFirst = direction === "left" || direction === "up";
@@ -268,7 +276,9 @@ export function splitGroup(
       activeTabId: sourceTabs[0]!.id,
     };
     const children = newFirst ? [newGroup, sourceGroup] : [sourceGroup, newGroup];
+
     return { type: "branch", id: freshId(), orientation, children };
   });
+
   return { tree, focusGroupId };
 }

package/src/workbench/use-changes-workbench.ts

@@ -141,24 +141,29 @@ export function useChangesWorkbench(options?: ChangesWorkbenchOptions): ChangesW
   const close = (groupId: string, tabId: string): void => {
     setGrid((tree) => {
       const pruned = closeTab(tree, groupId, tabId);
+
       if (pruned === null) {
         setChangesOpen(false);
         setProjectMode("tree");
         // leaving zoom on would hide the Thread pane with no editor to fill the gap
         setZoomed(false);
+
         return makeGroup([changesTab()]);
       }
       // re-home focus when the closed group was pruned away, so the next open has a live target
       setFocusedGroup((current) =>
         current !== null && containsGroup(pruned, current) ? current : firstGroupId(pruned),
       );
+
       return pruned;
     });
   };
   const split = (groupId: string, direction: SplitDirection): void => {
     setGrid((tree) => {
       const result = splitGroup(tree, groupId, direction);
+
       setFocusedGroup(result.focusGroupId);
+
       return result.tree;
     });
   };