openmates 0.27.0-alpha.79 → 0.27.0-alpha.80

package/dist/{chunk-RIVIWS3I.js → chunk-VTD4VHNF.js}

@@ -6260,11 +6260,14 @@ async function decodePersonalProjectCandidates(client2, rows2) {
     };
   }));
 }
-async function loadActiveCliProjectContext(client2, chatId, text8, onCatalog) {
-  const active = await client2.getActiveProjectFocus(chatId);
+async function loadActiveCliProjectContext(client2, chatId, text8, onCatalog, prefetched) {
+  const active = await (prefetched?.activeFocusRead ?? client2.getActiveProjectFocus(chatId));
+  prefetched?.assertCurrent();
   if (!active) return {};
   const options = { teamId: active.team_id, personal: !active.team_id };
-  const detail = await client2.getProject(active.project_id, options);
+  const detail = prefetched ? await prefetched.projectRead : await client2.getProject(active.project_id, options);
+  prefetched?.assertCurrent();
+  if (!detail) throw new Error("Active Project discovery unavailable.");
   const key = await client2.decryptProjectKey(detail.project, options);
   const result = {
     projectId: active.project_id,
@@ -6317,6 +6320,7 @@ async function loadActiveCliProjectContext(client2, chatId, text8, onCatalog) {
   }
   onCatalog?.(result.project_focus_catalog ?? []);
   let selected = [];
+  prefetched?.assertCurrent();
   if (text8?.trim() && candidates.length) selected = await client2.selectProjectContext(
     active.project_id,
     { chat_id: chatId, text: text8.slice(0, 8e3), candidates: candidates.slice(0, 24) },
@@ -6444,6 +6448,43 @@ function taskContextOwner(client2) {
     throw new Error("Task context workspace changed");
   };
 }
+var prefetchedDiscovery = /* @__PURE__ */ new WeakMap();
+var discoveryScope = (options) => JSON.stringify([options.teamId ?? null, options.personal === true]);
+function prefetchCliJevDiscovery(client2, chatId, options) {
+  const assertCurrent = taskContextOwner(client2);
+  const activeFocusRead = client2.getActiveProjectFocus(chatId);
+  const projectRead = activeFocusRead.then((active) => {
+    assertCurrent();
+    return active ? client2.getProject(active.project_id, { teamId: active.team_id, personal: !active.team_id }) : null;
+  });
+  void activeFocusRead.catch(() => {
+  });
+  void projectRead.catch(() => {
+  });
+  const ticket = Object.freeze({});
+  prefetchedDiscovery.set(ticket, {
+    client: client2,
+    chatId,
+    scope: discoveryScope(options),
+    assertCurrent,
+    activeFocusRead,
+    projectRead,
+    plansRead: client2.listUserPlans({ ...options, chatId, activeOnly: false }).catch(() => []),
+    directoryRead: client2.listUserTaskDiscoveryPage(options).catch(() => []),
+    linkedRead: client2.listUserTasks({ ...options, chatId, limit: 100 }).catch(() => [])
+  });
+  return ticket;
+}
+function consumeDiscovery(client2, chatId, options, ticket) {
+  if (!ticket) return;
+  const reads = prefetchedDiscovery.get(ticket);
+  prefetchedDiscovery.delete(ticket);
+  if (!reads || reads.client !== client2 || reads.chatId !== chatId || reads.scope !== discoveryScope(options)) {
+    throw new Error("Invalid same-send context discovery ticket.");
+  }
+  reads.assertCurrent();
+  return reads;
+}
 async function collectRelatedCliTaskContext(client2, chatId, options, records, nowSeconds3 = Date.now() / 1e3, requiredIds = /* @__PURE__ */ new Set()) {
   const assertTaskOwner = taskContextOwner(client2);
   const owned = records.filter((record10) => typeof record10.task_id === "string" && record10.task_id.length > 0 && record10.task_id.length <= 128 && Number.isSafeInteger(record10.version) && Number(record10.version) >= 1);
@@ -6504,8 +6545,13 @@ async function collectRelatedCliTaskContext(client2, chatId, options, records, n
   return candidates;
 }
 async function prepareCliJevContext(client2, chatId, options, supplied = {}, text8, discovery = {}) {
-  const assertTaskOwner = taskContextOwner(client2);
-  const plansRead = discovery.sdkMintedChatId ? Promise.resolve([]) : typeof client2.listUserPlans === "function" ? client2.listUserPlans({ ...options, chatId, activeOnly: false }).catch(() => []) : Promise.resolve([]);
+  const prefetched = consumeDiscovery(client2, chatId, options, discovery.prefetchedDiscovery);
+  const currentOwner3 = taskContextOwner(client2);
+  const assertTaskOwner = () => {
+    currentOwner3();
+    prefetched?.assertCurrent();
+  };
+  const plansRead = prefetched?.plansRead ?? (discovery.sdkMintedChatId ? Promise.resolve([]) : typeof client2.listUserPlans === "function" ? client2.listUserPlans({ ...options, chatId, activeOnly: false }).catch(() => []) : Promise.resolve([]));
   let candidates = [];
   let active = {};
   let tasks = [];
@@ -6514,12 +6560,13 @@ async function prepareCliJevContext(client2, chatId, options, supplied = {}, tex
   const catalogReady = new Promise((resolve20) => {
     resolveCatalog = resolve20;
   });
-  const activeReady = discovery.sdkMintedChatId ? Promise.resolve().then(() => resolveCatalog([])) : loadActiveCliProjectContext(client2, chatId, text8, resolveCatalog).then((value) => {
+  const activeReady = discovery.sdkMintedChatId ? Promise.resolve().then(() => resolveCatalog([])) : loadActiveCliProjectContext(client2, chatId, text8, resolveCatalog, prefetched).then((value) => {
     active = value;
   }).catch(() => {
   }).finally(() => resolveCatalog([]));
   await Promise.all([
     (discovery.verifiedProjectCandidates ? Promise.resolve(discovery.verifiedProjectCandidates) : discovery.usePersonalRoutingDirectory ? client2.listPersonalProjectRoutingDirectory().then((rows2) => decodePersonalProjectCandidates(client2, rows2)) : discoverCliProjectCandidates(client2, options, Boolean(discovery.onProjectRouting))).then((value) => {
+      assertTaskOwner();
       candidates = value;
       discovery.onProjectRouting?.({ project_focus_candidates: (discovery.verifiedProjectCandidates ?? supplied.project_focus_candidates ?? value).slice(0, 40) });
     }).catch((error) => {
@@ -6528,8 +6575,8 @@ async function prepareCliJevContext(client2, chatId, options, supplied = {}, tex
     (async () => {
       const taskClient = client2;
       const [directory, linked] = await Promise.all([
-        taskClient.listUserTaskDiscoveryPage?.(options).catch(() => []) ?? Promise.resolve([]),
-        discovery.sdkMintedChatId ? Promise.resolve([]) : client2.listUserTasks({ ...options, chatId, limit: 100 }).catch(() => [])
+        prefetched?.directoryRead ?? taskClient.listUserTaskDiscoveryPage?.(options).catch(() => []) ?? Promise.resolve([]),
+        prefetched?.linkedRead ?? (discovery.sdkMintedChatId ? Promise.resolve([]) : client2.listUserTasks({ ...options, chatId, limit: 100 }).catch(() => []))
       ]);
       assertTaskOwner();
       const records = /* @__PURE__ */ new Map();
@@ -16399,6 +16446,10 @@ var OpenMatesClient = class _OpenMatesClient {
         params.learningMode?.ageGroup ?? null
       ]);
       if (!params.incognito && params.chatId) readSavedPrivacyHistory();
+      const followupDiscoveryOwner = !params.incognito && params.chatId && !teamId && !params.projectId ? this.preparedChatOwner(this.requireSession(), teamId) : null;
+      const followupDiscoveryRead = followupDiscoveryOwner ? withHttpAbortSignal(historyAbort.signal, async () => prefetchCliJevDiscovery(this, chatId, { personal: true, teamId })) : null;
+      void followupDiscoveryRead?.catch(() => {
+      });
       const memoryStartedAt = performance.now();
       let availableMemories = params.memorySnapshot ?? [];
       let memoryCountsLoaded = false;
@@ -16895,7 +16946,12 @@ var OpenMatesClient = class _OpenMatesClient {
               messagePayload.client_context_request_id = contextRequestId;
             }
             pendingContext = (async () => {
+              const prefetchedDiscovery2 = followupDiscoveryRead ? await followupDiscoveryRead : void 0;
+              if (followupDiscoveryOwner && !this.preparedChatOwnerCurrent(followupDiscoveryOwner, teamId)) {
+                throw new Error("Chat workspace changed during context discovery.");
+              }
               const prepared = earlyContext ? await earlyContext : { ok: true, value: await withHttpAbortSignal(earlyContextAbort.signal, () => prepareCliJevContext(this, chatId, contextScope, suppliedContext, finalMessage, {
+                prefetchedDiscovery: prefetchedDiscovery2,
                 sdkMintedChatId,
                 onRouting: publishRouting,
                 verifiedProjectCandidates: verifiedProjectCandidates ?? void 0,
@@ -23103,7 +23159,13 @@ Required: ${schema.required.join(", ")}`
   clearInteractiveChatViewer() {
     const controller = this.interactiveViewerOpenController;
     this.interactiveViewerOpenController = null;
-    controller?.abort();
+    if (controller) {
+      const reason = Object.assign(new Error("Interactive chat viewer superseded"), {
+        name: "OpenMatesViewerSupersededError",
+        code: "OPENMATES_VIEWER_SUPERSEDED"
+      });
+      controller.abort(reason);
+    }
     this.interactiveViewerGeneration = (this.interactiveViewerGeneration ?? 0) + 1;
     this.interactiveViewerChatId = null;
     const ws = this.interactiveViewerSocket;

package/dist/cli.js

@@ -21,7 +21,7 @@ import {
   shouldRequireTrustedAccountGuard,
   waitForSafeE2ETotpWindow,
   waitForWorkflowRun
-} from "./chunk-RIVIWS3I.js";
+} from "./chunk-VTD4VHNF.js";
 import "./chunk-IWKP55ZB.js";
 import "./chunk-F2U6KIMR.js";
 import "./chunk-W5Q6FXNZ.js";

package/dist/index.js

@@ -44,7 +44,7 @@ import {
   selectAssistantMessagesForSpeech,
   serializeToYaml,
   summarizeAssistantSpeech
-} from "./chunk-RIVIWS3I.js";
+} from "./chunk-VTD4VHNF.js";
 import "./chunk-IWKP55ZB.js";
 import "./chunk-F2U6KIMR.js";
 import "./chunk-W5Q6FXNZ.js";

package/fixtures/privacy-runtime/linux-arm64/manifest.json

@@ -17,47 +17,47 @@
     {
       "name": "libggml-base.so",
       "bytes": 1110088,
-      "sha256": "636d0eea820a4c50419cedaf017c101318cc957cbf30d7c10eed76e58a0eb023"
+      "sha256": "c6d10b8188dbc89a72589bef007cd007c45b4ea6dfc10e406b5ca88610e570b8"
     },
     {
       "name": "libggml-base.so.0",
       "bytes": 1110088,
-      "sha256": "636d0eea820a4c50419cedaf017c101318cc957cbf30d7c10eed76e58a0eb023"
+      "sha256": "c6d10b8188dbc89a72589bef007cd007c45b4ea6dfc10e406b5ca88610e570b8"
     },
     {
       "name": "libggml-base.so.0.15.1",
       "bytes": 1110088,
-      "sha256": "636d0eea820a4c50419cedaf017c101318cc957cbf30d7c10eed76e58a0eb023"
+      "sha256": "c6d10b8188dbc89a72589bef007cd007c45b4ea6dfc10e406b5ca88610e570b8"
     },
     {
       "name": "libggml-cpu.so",
       "bytes": 869800,
-      "sha256": "6a778c182f6d27081ec59e9a3e47e38e11081396a579073cce8c2e082fe405de"
+      "sha256": "79eab04afa8a345c040fd5eb6590a05b04863c6cb9b4c1fed97c2d32bf93a8d1"
     },
     {
       "name": "libggml-cpu.so.0",
       "bytes": 869800,
-      "sha256": "6a778c182f6d27081ec59e9a3e47e38e11081396a579073cce8c2e082fe405de"
+      "sha256": "79eab04afa8a345c040fd5eb6590a05b04863c6cb9b4c1fed97c2d32bf93a8d1"
     },
     {
       "name": "libggml-cpu.so.0.15.1",
       "bytes": 869800,
-      "sha256": "6a778c182f6d27081ec59e9a3e47e38e11081396a579073cce8c2e082fe405de"
+      "sha256": "79eab04afa8a345c040fd5eb6590a05b04863c6cb9b4c1fed97c2d32bf93a8d1"
     },
     {
       "name": "libggml.so",
       "bytes": 1899104,
-      "sha256": "0101ffecb825b3648f287ed70367ef7cb1addfc9545feb820bfa9601572e846c"
+      "sha256": "e5276ea43e5719ab303adb0c1e7cef05e6c22db6642ec8e5216d2dd2000814cf"
     },
     {
       "name": "libggml.so.0",
       "bytes": 1899104,
-      "sha256": "0101ffecb825b3648f287ed70367ef7cb1addfc9545feb820bfa9601572e846c"
+      "sha256": "e5276ea43e5719ab303adb0c1e7cef05e6c22db6642ec8e5216d2dd2000814cf"
     },
     {
       "name": "libggml.so.0.15.1",
       "bytes": 1899104,
-      "sha256": "0101ffecb825b3648f287ed70367ef7cb1addfc9545feb820bfa9601572e846c"
+      "sha256": "e5276ea43e5719ab303adb0c1e7cef05e6c22db6642ec8e5216d2dd2000814cf"
     },
     {
       "name": "openmates-pii-worker",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmates",
-  "version": "0.27.0-alpha.79",
+  "version": "0.27.0-alpha.80",
   "description": "OpenMates CLI and SDK",
   "type": "module",
   "main": "dist/index.js",