@frockbot/plugin-computer 0.1.0 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frockbot/plugin-computer",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "private": false,
   "type": "module",
   "exports": {
@@ -29,21 +29,21 @@
   },
   "dependencies": {
     "@cordisjs/client": "0.8.2",
-    "@frockbot/client-core": "0.1.0",
-    "@frockbot/client-ui": "0.1.0",
-    "@frockbot/computer-core": "0.1.0",
-    "@frockbot/computer-host-runtime": "0.1.0",
-    "@frockbot/kernel-agent-loop": "0.1.0",
-    "@frockbot/kernel-contracts": "0.1.0",
-    "@frockbot/plugin-prompt": "0.1.0",
-    "@frockbot/plugin-shell": "0.1.0",
-    "@frockbot/plugin-tools": "0.1.0",
+    "@frockbot/client-core": "0.1.2",
+    "@frockbot/client-ui": "0.1.2",
+    "@frockbot/computer-core": "0.1.2",
+    "@frockbot/computer-host-runtime": "0.1.2",
+    "@frockbot/kernel-agent-loop": "0.1.2",
+    "@frockbot/kernel-contracts": "0.1.2",
+    "@frockbot/plugin-prompt": "0.1.2",
+    "@frockbot/plugin-shell": "0.1.2",
+    "@frockbot/plugin-tools": "0.1.2",
     "cordis": "4.0.0-rc.8",
     "vue": "3.5.41"
   },
   "devDependencies": {
-    "@frockbot/plugin-models": "0.1.0",
-    "@frockbot/plugin-testkit": "0.1.0",
+    "@frockbot/plugin-models": "0.1.2",
+    "@frockbot/plugin-testkit": "0.1.2",
     "@types/bun": "1.4.0",
     "@types/node": "26.2.0",
     "@vitejs/plugin-vue": "6.0.8",

package/src/client/application.test.ts

@@ -70,6 +70,7 @@ function mountHostedProvider() {
   const calls: Array<[string, string | undefined, string | undefined]> = [];
   const runtime = new FakeRuntime();
   let phase: Phase = "idle";
+  let hostUpdating = false;
   let controlHeld = false;
   let renewFails = false;
   let state: { value: ComputerState } | undefined;
@@ -85,7 +86,9 @@ function mountHostedProvider() {
             type:
               "connect" | "takeControl" | "releaseControl" | "refreshViewer";
           };
-          if (command.type === "connect") phase = "ready";
+          if (command.type === "connect") {
+            phase = hostUpdating ? "updating" : "ready";
+          }
           if (command.type === "takeControl") {
             phase = "human-control";
             controlHeld = true;
@@ -122,7 +125,9 @@ function mountHostedProvider() {
               : phase === "updating"
                 ? "Updating the Computer runtime"
                 : "Computer ready",
-          ...(phase === "idle" || phase === "disconnected"
+          ...(phase === "idle" ||
+          phase === "disconnected" ||
+          phase === "updating"
             ? {}
             : {
                 viewerSession: {
@@ -174,6 +179,10 @@ function mountHostedProvider() {
     },
     setUpdating() {
       phase = "updating";
+      hostUpdating = true;
+    },
+    setReady() {
+      hostUpdating = false;
     },
     dispose() {
       if (Array.isArray(disposers)) {
@@ -235,7 +244,7 @@ describe("hosted Computer provider", () => {
     mounted.dispose();
   });
 
-  test("an updating strip click only expands the progress view", async () => {
+  test("an updating strip click rejoins the update and lands on ready when it finishes", async () => {
     const mounted = mountHostedProvider();
     await flush();
     mounted.setUpdating();
@@ -246,14 +255,35 @@ describe("hosted Computer provider", () => {
       message: "Updating the Computer runtime",
       expanded: false,
     });
+    // A collapsed strip never asks the host anything while it updates.
+    expect(postedTypes(mounted.calls)).toEqual([]);
 
+    // Opening rejoins: the host still reports the update, so the phase holds
+    // and the progress view is what expands.
     await mounted.state.openViewer();
-
     expect(mounted.state).toMatchObject({
       phase: "updating",
       expanded: true,
+      viewerUrl: undefined,
     });
-    expect(postedTypes(mounted.calls)).toEqual([]);
+    expect(postedTypes(mounted.calls)).toEqual(["connect"]);
+
+    // Every poll while open asks again, so the durable `updating` record is
+    // not the last word once the host has finished.
+    mounted.setReady();
+    mounted.runtime.tick(PROJECTION_POLL_INTERVAL_MS);
+    await flush();
+    expect(postedTypes(mounted.calls)).toEqual(["connect", "connect"]);
+    expect(mounted.state).toMatchObject({
+      phase: "ready",
+      expanded: true,
+      viewerUrl: "https://viewer.invalid/secret#view_only=1",
+    });
+
+    // Once ready, polls go back to reading only.
+    mounted.runtime.tick(PROJECTION_POLL_INTERVAL_MS);
+    await flush();
+    expect(postedTypes(mounted.calls)).toEqual(["connect", "connect"]);
     mounted.dispose();
   });
 

package/src/client/application.ts

@@ -163,6 +163,16 @@ export function createComputerClientPlugin(
       projectionPoll = runtime.setInterval(() => {
         const selectedBotId = shell.value.activeBotId;
         if (!selectedBotId || !runtime.isVisible()) return;
+        // The `updating` record is written when the host refused a connect
+        // mid-update; it only changes when someone connects again. While the
+        // User has the Computer open, rejoin the update each poll so the
+        // viewer arrives the moment the host finishes (P4).
+        if (machine.phase === "updating" && machine.expanded) {
+          void execute("connect").catch(() => {
+            // A refusal keeps the updating phase; the next poll asks again.
+          });
+          return;
+        }
         void load(selectedBotId).catch((error) =>
           apply({ type: "failed", message: errorMessage(error) }),
         );
@@ -234,9 +244,18 @@ export function createComputerClientPlugin(
 
     async function openViewer(): Promise<void> {
       if (machine.expanded) return;
-      const wake = machine.phase === "idle";
+      // Idle wakes. Updating rejoins: the host either hands back the viewer
+      // because the update has finished, or refuses again with its phase.
+      const wake = machine.phase === "idle" || machine.phase === "updating";
       apply({ type: "viewer-expanded" });
-      if (wake) await connect("connect-requested");
+      if (!wake) return;
+      if (machine.phase === "updating") {
+        await execute("connect").catch(() => {
+          // Still updating; the projection poll keeps rejoining.
+        });
+        return;
+      }
+      await connect("connect-requested");
     }
 
     async function closeViewer(): Promise<void> {