@jskit-ai/assistant-runtime 0.2.27 → 0.2.28

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- `@jskit-ai/assistant-runtime/client/providers/AssistantClientProvider` exports the client provider by itself, so the client bootstrap loads it without the assistant's elements and what they import.
+- `subscribeAssistantConversation()` takes `noticeMs`, how long an unanswered subscription waits before the loading notice. It stays ten seconds; tests pass a shorter one, so the real-socket proof of a slow subscription no longer waits ten seconds.
 - The assistant settings are a settings pane: the app bar shows their title and Save (a primary bar action that submits the form, with the card's loading and disabled states), and the card no longer has a Save row at its bottom. The button reads **Save** (`jskit.assistant.runtime.settings.save`, was "Save assistant settings"), since the bar's title names the settings. Visual only: what saving does is unchanged.
 - A browser test (`test/assistantSettings.browser.test.js`, fixture `fixtures/settings/`, run in CI) renders the settings pane in the shell's `ShellLayout` at 390 and 1280 px: the bar's title is the page's one `h1`, its **Save** is a submit button for `assistant-settings-form` that sends the edited prompt and shows its loading state until the save answers, a refused save shows the prompt's field message and reports the failure, and workspace settings show their note and no Save until the address names a workspace.
 - The assistant surface pattern's icon is `$smartToy`, and the fixtures render with `@jskit-ai/material-web`.

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@jskit-ai/assistant-runtime",
-  "version": "0.2.27",
+  "version": "0.2.28",
   "type": "module",
   "scripts": {
     "test": "jskit test"
   },
   "exports": {
     "./client": "./src/client/index.js",
+    "./client/providers/AssistantClientProvider": "./src/client/providers/AssistantClientProvider.js",
     "./shared": "./src/shared/index.js",
     "./server/actionIds": "./src/server/actionIds.js",
     "./server": "./src/server/index.js",
@@ -14,19 +15,19 @@
     "./locales/en.json": "./locales/en.json"
   },
   "dependencies": {
-    "@jskit-ai/assistant-core": "0.2.25",
+    "@jskit-ai/assistant-core": "0.2.26",
     "json-rest-schema": "^1.0.17"
   },
   "peerDependencies": {
-    "@jskit-ai/http-runtime": "0.2.11",
-    "@jskit-ai/http-web": "0.2.19",
-    "@jskit-ai/kernel": "0.2.11",
-    "@jskit-ai/realtime": "0.2.17",
-    "@jskit-ai/shell-web": "0.2.14",
+    "@jskit-ai/http-runtime": "0.2.12",
+    "@jskit-ai/http-web": "0.2.20",
+    "@jskit-ai/kernel": "0.2.12",
+    "@jskit-ai/realtime": "0.2.18",
+    "@jskit-ai/shell-web": "0.2.15",
     "@tanstack/vue-query": "^5.90.5",
     "vue": "^3.5.13",
     "vuetify": "^4.0.0",
-    "@jskit-ai/database-runtime": "0.1.260"
+    "@jskit-ai/database-runtime": "0.1.261"
   },
   "description": "Capability-based assistant runtime with per-surface chat, transcripts, settings, and action tools.",
   "jskit": {
@@ -88,6 +89,10 @@
             "subpath": "./client",
             "summary": "Exports assistant runtime client elements and composables."
           },
+          {
+            "subpath": "./client/providers/AssistantClientProvider",
+            "summary": "Exports the assistant client provider, which the client bootstrap loads without the elements."
+          },
           {
             "subpath": "./shared",
             "summary": "Exports assistant runtime shared config helpers."

package/src/client/support/subscribeAssistantConversation.js

@@ -45,12 +45,14 @@ function ignoreSubscriptionError() {}
  *   read: (read: { current: () => boolean }) => Promise<any>,
  *   onState: (state: any, options: { initial: boolean, canonical: boolean }) => void,
  *   onEvent?: (event: any) => void,
- *   onError?: (failure: Error) => void
- * }} subscription
+ *   onError?: (failure: Error) => void,
+ *   noticeMs?: number
+ * }} subscription `noticeMs` is how long an unanswered subscription waits before the loading notice: ten seconds,
+ *   shorter only in tests.
  */
 function subscribeAssistantConversation({
   socket, conversationId, targetSurfaceId, hostSurfaceId, workspaceSlug,
-  read, onState, onEvent = ignoreConversationEvent, onError = ignoreSubscriptionError
+  read, onState, onEvent = ignoreConversationEvent, onError = ignoreSubscriptionError, noticeMs = SUBSCRIPTION_NOTICE_MS
 }) {
   // readable-check: allow method-probe - input validation: an application may hand the conversation binding its own socket
   if (typeof socket?.on !== "function" || typeof socket?.off !== "function" || typeof socket?.timeout !== "function") {
@@ -239,7 +241,7 @@ function subscribeAssistantConversation({
     reloadQueued = false;
     waitingTimer = setTimeout(() => onError(Object.assign(
       new Error("Chat is still loading. Waiting for the server; Reload chat to try now."),
-      { code: "assistant_subscription_waiting" })), SUBSCRIPTION_NOTICE_MS);
+      { code: "assistant_subscription_waiting" })), noticeMs);
     socket.timeout(SUBSCRIPTION_LOST_MS).emit(ASSISTANT_CONVERSATION_SUBSCRIBE, input, (error, response) => {
       if (disposed || attempt !== generation) return;
       clearTimers();

package/test/assistantConversationSubscriptions.test.js

@@ -191,9 +191,9 @@ async function fixture(t, { diagnostics = false, onSetup } = {}) {
     });
     return socket;
   }
-  function view(socket, id) {
+  function view(socket, id, options = {}) {
     const states = [], received = [], errors = [];
-    const dispose = subscribeAssistantConversation({ socket, conversationId: id, targetSurfaceId: "home", hostSurfaceId: "home",
+    const dispose = subscribeAssistantConversation({ ...options, socket, conversationId: id, targetSurfaceId: "home", hostSurfaceId: "home",
       read() {
         return actions.execute({ actionId: actionIds.conversationRead,
           input: { targetSurfaceId: "home", conversationId: id },
@@ -332,7 +332,10 @@ test("slow successful subscriptions warn once with the blocked stage and no conv
   assert.equal(f.fetches.length, 0);
 });
 
-test("a real subscription slower than ten seconds keeps its observer, says it is still loading and delivers the late snapshot", { timeout: 25_000 }, async t => {
+// The client's ten-second notice is proven on a mocked clock below ("a connected subscription keeps waiting for a slow
+// server ..."); here a real socket and server run the same path with a shorter notice, and the server's clock is moved
+// past ten seconds, as in the test above.
+test("a real subscription slower than its notice keeps its observer, says it is still loading and delivers the late snapshot", async t => {
   const f = await fixture(t);
   const socket = await f.connect();
   const socketId = socket.id;
@@ -340,22 +343,23 @@ test("a real subscription slower than ten seconds keeps its observer, says it is
   await f.conversations.get(id).send({ messageId: "survives-wait", text: "Keep working through a slow snapshot" });
   await until(f.changes, () => f.fetches.length === 1);
   const barrier = f.holdNextRead(id);
-  const view = f.view(socket, id);
+  const noticeMs = 300;
+  const view = f.view(socket, id, { noticeMs });
   await until(f.changes, () => barrier.started);
-  const readStartedAt = performance.now();
   const subscriptionEpoch = f.subscriptionTimings.at(-1).subscriptionEpoch;
-  while (!view.errors.length) await once(f.changes, "change", { signal: AbortSignal.timeout(12_000) });
+  while (!view.errors.length) await once(f.changes, "change", { signal: AbortSignal.timeout(5_000) });
   assert.equal(view.errors[0].message, "Chat is still loading. Waiting for the server; Reload chat to try now.");
   assert.equal(view.errors[0].code, "assistant_subscription_waiting");
   assert.equal(f.active(), 1, "The slow observer stays attached while its snapshot is read");
   assert.equal(socket.id, socketId);
   assert.equal(socket.connected, true);
   assert.equal(view.states.length, 0);
-  // The client's ten-second wait starts before the server's clock does, so the
-  // read is held until the server has also waited ten seconds.
-  await new Promise(resolve => setTimeout(resolve, Math.max(0, 10_001 - (performance.now() - readStartedAt))));
-  barrier.resolve();
-  await until(f.changes, () => view.states.length === 1);
+  const now = performance.now.bind(performance);
+  const clock = t.mock.method(performance, "now", () => now() + 10_001);
+  try {
+    barrier.resolve();
+    await until(f.changes, () => view.states.length === 1);
+  } finally { clock.mock.restore(); }
   assert.equal(view.states[0].conversationLog[0].user.messageId, "survives-wait");
   const records = f.subscriptionTimings.filter(record => record.subscriptionEpoch === subscriptionEpoch);
   assert.equal(records.some(record => record.stage === "abandoned"), false, "Slow work is never abandoned");
@@ -434,8 +438,19 @@ test("Reload recovers a failed initial subscription on the same connected socket
   const barrier = f.holdNextRead(f.ids[0]);
   const view = f.view(socket, f.ids[0]);
   await until(f.changes, () => barrier.started);
+  // A failed read is a server failure, so the client also retries by itself a second later. Here the person reloads
+  // within that second; on a loaded host the steps below can take longer, and the retry would then subscribe before
+  // the conversation is revoked. The test holds that retry so only Reload recovers.
+  const setTimer = globalThis.setTimeout;
+  let retry = null;
+  t.mock.method(globalThis, "setTimeout", (callback, delay, ...args) => {
+    if (retry || delay !== 1_000) return setTimer(callback, delay, ...args);
+    retry = callback;
+    return setTimer(() => {}, 0);
+  });
   barrier.reject(new Error("The initial history read failed."));
   await until(f.changes, () => view.errors.length === 1 && f.active() === 0);
+  assert.equal(typeof retry, "function", "The failed subscription scheduled its automatic retry");
   assert.equal(socket.connected, true);
   assert.equal(view.states.length, 0);
 
@@ -833,10 +848,14 @@ test("subscription identity and surface checks reject forged bodies and honor co
   await until(f.changes, () => view.received.some(event => event.type === "message"));
   assert.equal(otherEvents.length, 0);
   f.revoked.add(f.ids[0]);
+  // A streamed delta may reuse the subscriber's authorization while it is under a second
+  // old; once a second has passed, the next delta authorizes again and is refused.
+  t.mock.timers.enable({ apis: ["Date"], now: Date.now() + 1000 });
   const before = view.received.length;
   f.fetches[0].text(" Secret output after access was revoked.");
   f.fetches[0].finish();
   await f.conversations.get(f.ids[0]).wait();
+  t.mock.timers.reset();
   assert.equal(view.received.length, before);
   assert.equal(f.published.some(event => event.realtime?.payload?.event?.text?.includes("Secret output")), false);
   const second = f.view(owner, f.ids[1]);

package/test/lazyAppConfig.test.js

@@ -178,7 +178,7 @@ test("registerRoutes forwards the resolved host surface through every direct act
           params: {
             conversationId: "conversation_1",
             surfaceId: "admin",
-            workspaceSlug: "dogandgroom"
+            workspaceSlug: "acme"
           },
           query: {
             limit: 20
@@ -233,7 +233,7 @@ test("registerRoutes builds workspace action input from explicit config and scop
       },
       input: {
         params: {
-          workspaceSlug: "dogandgroom",
+          workspaceSlug: "acme",
           surfaceId: "admin"
         },
         query: {
@@ -259,7 +259,7 @@ test("registerRoutes builds workspace action input from explicit config and scop
   assert.equal(reply.statusCode, 200);
   assert.equal(capturedAction?.surface, "admin");
   assert.equal(capturedAction?.input?.targetSurfaceId, "admin");
-  assert.equal(capturedAction?.input?.workspaceSlug, "dogandgroom");
+  assert.equal(capturedAction?.input?.workspaceSlug, "acme");
 });
 
 test("registerRoutes returns clear AppError payload for pre-stream assistant failures", async () => {
@@ -306,7 +306,7 @@ test("registerRoutes returns clear AppError payload for pre-stream assistant fai
       },
       input: {
         params: {
-          workspaceSlug: "dogandgroom",
+          workspaceSlug: "acme",
           surfaceId: "admin"
         },
         body: {
@@ -330,7 +330,7 @@ test("registerRoutes returns clear AppError payload for pre-stream assistant fai
   });
   assert.deepEqual(capturedInput, {
     targetSurfaceId: "admin",
-    workspaceSlug: "dogandgroom",
+    workspaceSlug: "acme",
     messageId: "msg_1",
     input: "hello"
   });
@@ -349,7 +349,7 @@ test("registerRoutes returns clear AppError payload for pre-stream assistant fai
     await route.handler({
       raw: { on() {}, off() {} },
       headers: { "x-jskit-surface": "admin" },
-      input: { params: { workspaceSlug: "dogandgroom", surfaceId: "admin" }, body: { messageId: "msg_2", input: "hello" } },
+      input: { params: { workspaceSlug: "acme", surfaceId: "admin" }, body: { messageId: "msg_2", input: "hello" } },
       executeAction: async () => { throw failure; }
     }, reply);
     assert.equal(reply.statusCode, status);
@@ -389,7 +389,7 @@ test("chat service uses explicit app config when conversations are listed", asyn
     {
       input: {
         targetSurfaceId: "admin",
-        workspaceSlug: "dogandgroom"
+        workspaceSlug: "acme"
       },
       context: {
         actor: {
@@ -398,14 +398,14 @@ test("chat service uses explicit app config when conversations are listed", asyn
         },
         workspace: {
           id: 7,
-          slug: "dogandgroom"
+          slug: "acme"
         }
       }
     }
   );
 
   assert.equal(response.assistantSurface.targetSurfaceId, "admin");
-  assert.equal(response.workspace.slug, "dogandgroom");
+  assert.equal(response.workspace.slug, "acme");
 });
 
 test("chat service rejects workspace-scoped assistant surfaces when workspace support is unavailable", async () => {
@@ -435,7 +435,7 @@ test("chat service rejects workspace-scoped assistant surfaces when workspace su
         {
           input: {
             targetSurfaceId: "admin",
-            workspaceSlug: "dogandgroom"
+            workspaceSlug: "acme"
           },
           context: {
             actor: {