@adaptiqai/deepseek-harness 0.2.4 → 0.2.5

package/lib/index.js

@@ -1275,6 +1275,22 @@ var str4 = (value) => typeof value === "string" && value.trim() !== "" ? value.t
 var count2 = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : null;
 var DEFAULT_PREFERENCES = { rememberByDefault: true, welcomed: false };
 var PAGE = 50;
+var ATTACH_POLL_MS = 15e3;
+var ATTACH_BACKOFF_MAX_MS = 10 * 6e4;
+var ATTACH_DEADLINE_MS = 6 * 36e5;
+var MODEL_ROUTE_CODES = /* @__PURE__ */ new Set(["memory_route_required", "model_required", "model_mismatch"]);
+function attachBackoffMs(failures) {
+  return Math.min(ATTACH_BACKOFF_MAX_MS, ATTACH_POLL_MS * 2 ** Math.min(Math.max(failures - 1, 0), 10));
+}
+function routeChoices(detail) {
+  if (!Array.isArray(detail.models))
+    return null;
+  return detail.models.flatMap((raw) => {
+    const entry = obj4(raw);
+    const id = typeof raw === "string" ? raw : str4(entry?.id) ?? str4(entry?.model);
+    return id === null || id === "" ? [] : [id];
+  });
+}
 var TROUBLE_QUIET_MS = 6e4;
 var SESSION_BACKOFF_MAX_MS = 5 * 6e4;
 function sessionBackoffMs(failures) {
@@ -2699,7 +2715,10 @@ var Workspace = class {
     if (session !== void 0 && this.now() - session.remoteAt > 1e4)
       await this.loadSession(session).catch(() => {
       });
-    const target = model2 !== void 0 && this.catalog.some((entry) => entry.id === model2) ? model2 : this.targetModel(session) ?? null;
+    const named = model2 !== void 0 && model2 !== "" && (this.catalog.length === 0 || this.catalog.some((entry) => entry.id === model2));
+    const target = named ? model2 : this.targetModel(session) ?? null;
+    if (target === null)
+      return { model: null, modelName: null, items: [], nextCursor: null, hasMore: false, summary: null };
     const attached = new Set(session?.knowledge.map((item) => item.id) ?? []);
     const name2 = (id) => this.modelName(id);
     const read = async (store, limit, after) => {
@@ -2708,7 +2727,7 @@ var Workspace = class {
         params.set("query", query.trim().slice(0, 200));
       if (after !== void 0 && after !== "")
         params.set("cursor", after);
-      const body = await this.deps.api.json(`/v1/memories?${params}`, { headers: store === null ? {} : { "x-adaptiq-model": store } });
+      const body = await this.deps.api.json(`/v1/memories?${params}`, { headers: { "x-adaptiq-model": store } });
       const items = (Array.isArray(body?.data) ? body.data : []).flatMap((raw) => {
         const memory = obj4(raw);
         return memory === null ? [] : [knowledgeItem(memory, store === target && attached.has(String(memory.memory_id)), { store, target, name: name2 })];
@@ -2718,13 +2737,13 @@ var Workspace = class {
     const here = await read(target, PAGE, cursor);
     await this.followCopies(target);
     let elsewhere = [];
-    if ((cursor === void 0 || cursor === "") && target !== null) {
+    if (cursor === void 0 || cursor === "") {
       const others = this.catalog.filter((entry) => entry.id !== target && entry.status !== "disabled").slice(0, 3);
       const pages = await Promise.all(others.map((entry) => read(entry.id, 20).catch(() => ({ items: [], pagination: null }))));
       const seen = new Set(here.items.map((item) => item.id));
       const copied = new Set([...this.copies.values()].filter((copy) => copy.target === target && copy.status === "ready").map((copy) => copy.source));
       const names = new Set(here.items.filter((item) => item.fits).map((item) => item.name));
-      const copyable = target !== null && this.catalog.some((entry) => entry.id === target);
+      const copyable = this.catalog.some((entry) => entry.id === target);
       elsewhere = pages.flatMap((page) => page.items).filter((item) => !seen.has(item.id) && !copied.has(item.id) && !names.has(item.name)).map((item) => {
         const copy = this.copies.get(copyKey(item.id, target));
         return { ...item, fits: false, attached: false, convertible: copyable && item.kind === "collection", copying: copy === void 0 || copy.status === "ready" ? null : copy.status };
@@ -2735,7 +2754,7 @@ var Workspace = class {
     const misfits = here.items.filter((item) => !item.fits);
     return {
       model: target,
-      modelName: target === null ? null : this.modelName(target),
+      modelName: this.modelName(target),
       items: [...fitting, ...misfits, ...elsewhere],
       nextCursor: str4(here.pagination?.next_cursor),
       hasMore: here.pagination?.has_more === true,
@@ -2934,7 +2953,8 @@ var Workspace = class {
         await this.setKnowledge(input.attachToSession, id, true).catch(() => {
         });
       else {
-        this.pendingAttach.set(id, { sessionId: input.attachToSession, at: this.now() });
+        const model2 = str4(memory.model) ?? this.memoryModel(session) ?? null;
+        this.pendingAttach.set(id, { sessionId: input.attachToSession, at: this.now(), model: model2, failures: 0, next: this.now() });
         this.scheduleAttach(1e4);
       }
     }
@@ -2949,25 +2969,102 @@ var Workspace = class {
     }, ms);
     this.attachTimer.unref?.();
   }
+  /**
+   * Read the collections waiting to be attached, each in its own model's store,
+   * and attach the ones that are ready.
+   */
   async attachReady() {
+    const groups = /* @__PURE__ */ new Map();
+    for (const [id, pending] of [...this.pendingAttach]) {
+      if (this.now() - pending.at > ATTACH_DEADLINE_MS) {
+        this.pendingAttach.delete(id);
+        continue;
+      }
+      if (pending.next > this.now())
+        continue;
+      const model2 = pending.model ?? this.targetModel(this.session(pending.sessionId));
+      if (model2 === void 0)
+        continue;
+      groups.set(model2, [...groups.get(model2) ?? [], [id, pending]]);
+    }
+    for (const [model2, entries] of groups) {
+      try {
+        await this.attachCheck(model2, entries);
+      } catch {
+      }
+    }
+    if (this.pendingAttach.size === 0)
+      return;
+    const now = this.now();
+    this.scheduleAttach(Math.min(...[...this.pendingAttach.values()].map((pending) => pending.next > now ? pending.next - now : ATTACH_POLL_MS)));
+  }
+  async attachCheck(model2, entries) {
+    let items = null;
     try {
-      const page = await this.listKnowledge();
-      for (const [id, pending] of [...this.pendingAttach]) {
-        const item = page.items.find((candidate) => candidate.id === id);
-        if (this.now() - pending.at > 6 * 36e5 || item?.status === "failed") {
-          this.pendingAttach.delete(id);
-          continue;
-        }
-        if (item?.status === "ready") {
+      items = await this.waitingKnowledge(model2);
+    } catch (error) {
+      const detail = error instanceof AdaptiqHttpError && error.status === 409 ? obj4(obj4(error.body)?.detail) : null;
+      const code = str4(detail?.code);
+      if (detail === null || code === null || !MODEL_ROUTE_CODES.has(code)) {
+        for (const [, pending] of entries)
+          pending.next = this.now() + ATTACH_POLL_MS;
+        return;
+      }
+      const choices = routeChoices(detail);
+      if (choices !== null && choices.length > 0 && !choices.includes(model2)) {
+        const name2 = this.modelName(model2) ?? model2;
+        for (const [id, pending] of entries) {
           this.pendingAttach.delete(id);
-          await this.setKnowledge(pending.sessionId, id, true).catch(() => {
+          this.raise({
+            kind: "model-unavailable",
+            tone: "info",
+            title: `${name2} isn't available`,
+            body: `Your new collection is saved. Add it from Knowledge once ${name2} is available again.`,
+            actions: [{ id: "open-models", label: "See your models", url: this.links.models }],
+            sessionId: pending.sessionId
           });
-          this.raise({ kind: "connected", tone: "success", title: `${item.name} is ready`, body: "It is now used in your conversation.", actions: [], sessionId: pending.sessionId });
         }
+        return;
+      }
+      const pick = choices?.find((choice) => choice === model2);
+      if (pick !== void 0)
+        items = await this.waitingKnowledge(pick).catch(() => null);
+      if (items === null) {
+        for (const [, pending] of entries) {
+          pending.failures += 1;
+          pending.next = this.now() + attachBackoffMs(pending.failures);
+        }
+        return;
       }
-    } catch {
     }
-    this.scheduleAttach(15e3);
+    for (const [id, pending] of entries) {
+      const item = items.find((candidate) => candidate.id === id);
+      pending.failures = 0;
+      pending.next = this.now() + ATTACH_POLL_MS;
+      if (item?.status === "failed") {
+        this.pendingAttach.delete(id);
+        continue;
+      }
+      if (item?.status === "ready") {
+        this.pendingAttach.delete(id);
+        await this.setKnowledge(pending.sessionId, id, true).catch(() => {
+        });
+        this.raise({ kind: "connected", tone: "success", title: `${item.name} is ready`, body: "It is now used in your conversation.", actions: [], sessionId: pending.sessionId });
+      }
+    }
+  }
+  /**
+   * One model's collections, for the ones waiting to be attached.
+   * @param model - the store to read.
+   * @returns the collections.
+   */
+  async waitingKnowledge(model2) {
+    const params = new URLSearchParams({ limit: String(PAGE), status: "all" });
+    const body = await this.deps.api.json(`/v1/memories?${params}`, { headers: { "x-adaptiq-model": model2 } });
+    return (Array.isArray(body?.data) ? body.data : []).flatMap((raw) => {
+      const memory = obj4(raw);
+      return memory === null ? [] : [knowledgeItem(memory, false)];
+    });
   }
   // ---------------------------------------------------------------- conversations as knowledge
   /** False once the server answered that it has no conversation routes. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptiqai/deepseek-harness",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "AdaptiqAI for DeepSeek Harness: models with 5M-token native memory and Knowledge. Sign up, get a model and work without leaving the harness",
   "keywords": [
     "dsh-plugin",
@@ -89,7 +89,7 @@
     "react-dom": "~18.3.1",
     "typescript": "~5.9.3",
     "vitest": "~3.2.7",
-    "@adaptiqai/core": "0.2.4"
+    "@adaptiqai/core": "0.2.5"
   },
   "repository": {
     "type": "git",