@adaptiqai/deepseek-harness 0.2.11 → 0.2.12

package/lib/host.js

@@ -17,7 +17,7 @@ var __runInitializers = (array, flags, self, value) => {
   return value;
 };
 var __decorateElement = (array, flags, name2, decorators, target, extra) => {
-  var fn, it, done, ctx, access, k = flags & 7, s = !!(flags & 8), p = !!(flags & 16);
+  var fn, it, done, ctx, access2, k = flags & 7, s = !!(flags & 8), p = !!(flags & 16);
   var j = k > 3 ? array.length + 1 : k ? s ? 1 : 2 : 0, key = __decoratorStrings[k + 5];
   var initializers = k > 3 && (array[j - 1] = []), extraInitializers = array[j] || (array[j] = []);
   var desc = k && (!p && !s && (target = target.prototype), k < 5 && (k > 3 || !p) && __getOwnPropDesc(k < 4 ? target : { get [name2]() {
@@ -29,9 +29,9 @@ var __decorateElement = (array, flags, name2, decorators, target, extra) => {
   for (var i = decorators.length - 1; i >= 0; i--) {
     ctx = __decoratorContext(k, name2, done = {}, array[3], extraInitializers);
     if (k) {
-      ctx.static = s, ctx.private = p, access = ctx.access = { has: p ? (x) => __privateIn(target, x) : (x) => name2 in x };
-      if (k ^ 3) access.get = p ? (x) => (k ^ 1 ? __privateGet : __privateMethod)(x, target, k ^ 4 ? extra : desc.get) : (x) => x[name2];
-      if (k > 2) access.set = p ? (x, y) => __privateSet(x, target, y, k ^ 4 ? extra : desc.set) : (x, y) => x[name2] = y;
+      ctx.static = s, ctx.private = p, access2 = ctx.access = { has: p ? (x) => __privateIn(target, x) : (x) => name2 in x };
+      if (k ^ 3) access2.get = p ? (x) => (k ^ 1 ? __privateGet : __privateMethod)(x, target, k ^ 4 ? extra : desc.get) : (x) => x[name2];
+      if (k > 2) access2.set = p ? (x, y) => __privateSet(x, target, y, k ^ 4 ? extra : desc.set) : (x, y) => x[name2] = y;
     }
     it = (0, decorators[i])(k ? k < 4 ? p ? extra : desc[key] : k > 4 ? void 0 : { get: desc.get, set: desc.set } : target, ctx), done._ = 1;
     if (k ^ 4 || it === void 0) __expectFn(it) && (k > 4 ? initializers.unshift(it) : k ? p ? extra = it : desc[key] = it : target = it);
@@ -491,13 +491,13 @@ var AuthManager = class {
       if (!response.ok)
         throw new Error(`AdaptiqAI could not refresh the sign-in (HTTP ${response.status}).`);
       const body = await readJson(response);
-      const access = String(body?.access_token ?? "");
+      const access2 = String(body?.access_token ?? "");
       const refresh = String(body?.refresh_token ?? "");
-      if (!access.startsWith("ak_") || !refresh.startsWith("akr_"))
+      if (!access2.startsWith("ak_") || !refresh.startsWith("akr_"))
         throw new Error("AdaptiqAI returned an invalid refreshed credential.");
       return {
         ...current,
-        access,
+        access: access2,
         refresh,
         expiresAt: this.now() + Math.max(60, Number(body?.expires_in ?? 3600)) * 1e3,
         workspaceLabel: typeof body?.workspace_label === "string" && body.workspace_label !== "" ? body.workspace_label : current.workspaceLabel
@@ -627,9 +627,9 @@ var AuthManager = class {
           return;
         }
         const body = await readJson(response);
-        const access = String(body?.access_token ?? "");
+        const access2 = String(body?.access_token ?? "");
         const refresh = String(body?.refresh_token ?? "");
-        if (!access.startsWith("ak_") || !refresh.startsWith("akr_")) {
+        if (!access2.startsWith("ak_") || !refresh.startsWith("akr_")) {
           this.fail(flow, { code: "failed", message: "AdaptiqAI returned an invalid credential." });
           return;
         }
@@ -637,7 +637,7 @@ var AuthManager = class {
         const grant = {
           schema: "adaptiq-dsh-grant-v1",
           apiBase: this.options.apiBase,
-          access,
+          access: access2,
           refresh,
           clientProof,
           expiresAt: this.now() + Math.max(60, Number(body?.expires_in ?? 3600)) * 1e3,
@@ -1783,9 +1783,9 @@ function isYes(reply) {
   const name2 = reply.slice(at).replace(/^[,，:：;；.。]\s*/u, "");
   return YES_PHRASES.has(words(reply.slice(0, at))) && NAMED.test(name2);
 }
-function createRefusal(access) {
-  const reason = typeof access?.reason === "string" ? access.reason : null;
-  const owners = [].concat(access?.owners ?? access?.owner ?? []).map((owner) => typeof owner === "string" ? owner : typeof owner?.name === "string" ? owner.name : typeof owner?.email === "string" ? owner.email : "").filter((owner) => owner !== "");
+function createRefusal(access2) {
+  const reason = typeof access2?.reason === "string" ? access2.reason : null;
+  const owners = [].concat(access2?.owners ?? access2?.owner ?? []).map((owner) => typeof owner === "string" ? owner : typeof owner?.name === "string" ? owner.name : typeof owner?.email === "string" ? owner.email : "").filter((owner) => owner !== "");
   const ask = owners.length === 0 ? "ask a workspace owner" : `ask ${owners.join(" or ")}`;
   switch (reason) {
     case "role":
@@ -2505,9 +2505,10 @@ var Workspace = class {
     };
   }
   /**
-   * Read the newest published version. It is announced only once it is old
-   * enough for the harness's package manager to install (pnpm refuses a
-   * version younger than a day); the check then comes back when it is.
+   * Read the newest published version. It is announced at once where the
+   * plugin installs it itself and the harness exempts it from its package
+   * manager's wait; otherwise only once it is old enough (pnpm refuses a
+   * version younger than a day), and the check comes back when it is.
    */
   async checkForUpdate() {
     if (!this.deps.updateCheck || this.now() - this.updateCheckedAt < 24 * 36e5)
@@ -2526,7 +2527,7 @@ var Workspace = class {
       const published = Date.parse(str4(obj4(body.time)?.[version]) ?? "");
       if (!Number.isFinite(published))
         return;
-      if (this.now() - published < RELEASE_AGE_MS) {
+      if (this.now() - published < RELEASE_AGE_MS && !await this.installsFreshReleases()) {
         this.updateCheckedAt = published + RELEASE_AGE_MS - 24 * 36e5 + 6e4;
         return;
       }
@@ -2536,6 +2537,13 @@ var Workspace = class {
     } catch {
     }
   }
+  /** Whether the one-click update installs a release younger than the package manager's wait. */
+  async installsFreshReleases() {
+    const updater = this.deps.updater;
+    if (updater?.canInstall !== true || updater.installsFreshReleases === void 0)
+      return false;
+    return await updater.installsFreshReleases().catch(() => false);
+  }
   /** The update toast: once a newer version is out and not installed yet. */
   announceUpdate() {
     const plugin = this.pluginState();
@@ -2742,11 +2750,11 @@ var Workspace = class {
    * Waits while no model is running yet; never fails a refresh.
    */
   async applyFirstDefault() {
-    const access = this.deps.defaultModel;
-    if (this.state.defaultModel !== "pending" || access === void 0)
+    const access2 = this.deps.defaultModel;
+    if (this.state.defaultModel !== "pending" || access2 === void 0)
       return;
     try {
-      const current = access.current();
+      const current = access2.current();
       if (current === void 0)
         return;
       let choice = firstDefaultModel(current, this.deps.route, this.catalog);
@@ -2764,7 +2772,7 @@ var Workspace = class {
       }
       if (choice === null)
         return;
-      await access.save(choice);
+      await access2.save(choice);
       this.deps.log?.("info", `adaptiq: default model set to ${choice.model}`);
     } catch (error) {
       this.deps.log?.("warn", `adaptiq: could not set the default model: ${error instanceof Error ? error.message : String(error)}`);
@@ -3815,9 +3823,9 @@ var Workspace = class {
     if (this.memoryModel(session) === void 0)
       await this.ensureModels().catch(() => {
       });
-    const access = await this.deps.api.json("/v1/cli-auth/knowledge/status", { allow: [404] }).catch(() => null);
-    if (access !== null && access.create_allowed === false)
-      throw new Error(createRefusal(access));
+    const access2 = await this.deps.api.json("/v1/cli-auth/knowledge/status", { allow: [404] }).catch(() => null);
+    if (access2 !== null && access2.create_allowed === false)
+      throw new Error(createRefusal(access2));
     const body = await this.deps.api.json("/v1/memories", {
       method: "POST",
       headers: { ...this.memoryHeaders(session), "idempotency-key": idempotencyKey },
@@ -5881,6 +5889,150 @@ ${hash}`).digest("hex").slice(0, 48);
   })), "adaptiq: adaptiq_create_knowledge tool");
 }
 
+// src/host/release-age.ts
+import { constants } from "node:fs";
+import { access, readFile as readFile3, rename as rename2, rm, stat as stat2, writeFile as writeFile2 } from "node:fs/promises";
+import { isAbsolute as isAbsolute2, join } from "node:path";
+import { randomBytes } from "node:crypto";
+var KEY = "minimumReleaseAgeExclude";
+var FILE = "pnpm-workspace.yaml";
+var PACKAGE_NAME = /^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/u;
+var TOP_KEY = /^(?:([A-Za-z_][\w-]*)|'([^']*)'|"([^"\\]*)") *:(?: +(.*))?$/u;
+var ITEM = /^( *)- +(\S.*)$/u;
+var ENTRY = /^(?:'([^']*)'|"([^"\\]*)"|([\w.][\w@./~^<>=*|+ -]*?)) *(?: #.*)?$/u;
+var COMMENT = /^ *(?:#.*)?$/u;
+function singleLineValue(value) {
+  if (value.startsWith('"')) return /^"(?:[^"\\]|\\.)*" *(?:#.*)?$/u.test(value);
+  if (value.startsWith("'")) return /^'(?:[^']|'')*' *(?:#.*)?$/u.test(value);
+  if (value.startsWith("{")) return /^\{[^{}[\]]*\} *(?:#.*)?$/u.test(value);
+  if (value.startsWith("[")) return /^\[[^{}[\]]*\] *(?:#.*)?$/u.test(value);
+  return !/^[|>]/u.test(value) || /^[|>][-+]?\d? *(?:#.*)?$/u.test(value);
+}
+function readExcludeList(text2) {
+  if (/[\r\t\uFEFF]/u.test(text2)) return null;
+  const lines = text2.split("\n");
+  if (lines.at(-1) === "") lines.pop();
+  let keyLine = -1;
+  let blockKey = null;
+  let listOpen = false;
+  let blockValue = false;
+  const entries = [];
+  let indent = null;
+  for (const [index, line] of lines.entries()) {
+    if (COMMENT.test(line)) continue;
+    if (line.startsWith(" ")) {
+      if (!listOpen) continue;
+      const item = ITEM.exec(line);
+      if (item === null || indent !== null && item[1] !== indent) return null;
+      const entry = ENTRY.exec(item[2]);
+      if (entry === null) return null;
+      indent = item[1];
+      entries.push({ line: index, value: (entry[1] ?? entry[2] ?? entry[3]).trim() });
+      continue;
+    }
+    if (line.startsWith("- ")) {
+      if (!blockValue) return null;
+      if (listOpen) {
+        if (indent !== null && indent !== "") return null;
+        const entry = ENTRY.exec(line.slice(2).trimStart());
+        if (entry === null) return null;
+        indent = "";
+        entries.push({ line: index, value: (entry[1] ?? entry[2] ?? entry[3]).trim() });
+      }
+      continue;
+    }
+    const key = TOP_KEY.exec(line);
+    if (key === null) return null;
+    const name2 = key[1] ?? key[2] ?? key[3];
+    const value = key[4] ?? "";
+    listOpen = false;
+    blockValue = COMMENT.test(value);
+    if (name2 !== KEY) {
+      if (!blockValue && !singleLineValue(value)) return null;
+      continue;
+    }
+    if (keyLine !== -1) return null;
+    keyLine = index;
+    const flow = /^\[\] *(#.*)?$/u.exec(value);
+    if (flow !== null) blockKey = `${line.slice(0, line.indexOf(":"))}:${flow[1] === void 0 ? "" : ` ${flow[1]}`}`;
+    else if (!blockValue) return null;
+    listOpen = blockValue;
+  }
+  return { lines, keyLine, blockKey, entries, indent: indent ?? "  " };
+}
+function excludeRelease(text2, name2, version) {
+  if (!PACKAGE_NAME.test(name2) || !RELEASE_VERSION.test(version)) return null;
+  const list = readExcludeList(text2);
+  if (list === null) return null;
+  const spec = `${name2}@${version}`;
+  const ours = list.entries.filter((entry) => entry.value.startsWith(`${name2}@`));
+  if (ours.length === 1 && ours[0].value === spec) return text2;
+  const item = `${list.indent}- '${spec}'`;
+  const drop = new Set(ours.map((entry) => entry.line));
+  const out = [];
+  if (list.keyLine === -1) {
+    out.push(...list.lines, `${KEY}:`, `  - '${spec}'`);
+  } else {
+    const after = list.entries.length > 0 ? list.entries.at(-1).line : list.keyLine;
+    for (const [index, line] of list.lines.entries()) {
+      if (index === list.keyLine && list.blockKey !== null) out.push(list.blockKey);
+      else if (!drop.has(index)) out.push(line);
+      if (index === after) out.push(item);
+    }
+  }
+  return `${out.join("\n")}
+`;
+}
+function profileDir(ctx) {
+  const profile = ctx.get("profileContext");
+  return typeof profile?.dir === "string" && isAbsolute2(profile.dir) ? profile.dir : null;
+}
+async function canExcludeRelease(dir, name2) {
+  try {
+    const file = join(dir, FILE);
+    if (excludeRelease(await readFile3(file, "utf8"), name2, "0.0.0") === null) return false;
+    await access(file, constants.W_OK);
+    await access(dir, constants.W_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function writeReleaseExclusion(dir, name2, version, waitMs = 5e3) {
+  const file = join(dir, FILE);
+  const lock = join(dir, "package.json.lock");
+  const deadline = Date.now() + waitMs;
+  for (; ; ) {
+    try {
+      await writeFile2(lock, `${process.pid}
+`, { mode: 384, flag: "wx" });
+      break;
+    } catch (error) {
+      if (error.code !== "EEXIST" || Date.now() >= deadline) return false;
+      await new Promise((resolve2) => setTimeout(resolve2, 100));
+    }
+  }
+  try {
+    const before = await readFile3(file, "utf8");
+    const after = excludeRelease(before, name2, version);
+    if (after === null) return false;
+    if (after === before) return true;
+    const temp = `${file}.${randomBytes(6).toString("hex")}.tmp`;
+    try {
+      await writeFile2(temp, after, { mode: (await stat2(file)).mode & 511, flag: "wx" });
+      await rename2(temp, file);
+    } catch (error) {
+      await rm(temp, { force: true });
+      throw error;
+    }
+    return true;
+  } catch {
+    return false;
+  } finally {
+    await rm(lock, { force: true });
+  }
+}
+
 // src/host/updater.ts
 function pluginManager(ctx) {
   const service = ctx.get("pluginManager");
@@ -5905,6 +6057,10 @@ function harnessUpdater(ctx, name2, runtime) {
     get canInstall() {
       return pluginManager(ctx) !== void 0;
     },
+    async installsFreshReleases() {
+      const dir = profileDir(ctx);
+      return pluginManager(ctx) !== void 0 && dir !== null && await canExcludeRelease(dir, name2);
+    },
     async installed() {
       const local = runtime?.installedVersion() ?? null;
       if (local !== null) return local;
@@ -5915,6 +6071,8 @@ function harnessUpdater(ctx, name2, runtime) {
       if (!RELEASE_VERSION.test(version)) throw new UpdateFailure("failed", `${version} is not a release version`);
       const manager = pluginManager(ctx);
       if (manager === void 0) throw new UpdateFailure("failed", "this harness has no plugin manager");
+      const dir = profileDir(ctx);
+      if (dir !== null) await writeReleaseExclusion(dir, name2, version);
       const result = await manager.installBundle(`${name2}@${version}`, { enabled: true });
       if (result.application === "failed" || result.application === "cancelled" || result.error !== void 0) throw installFailure(result);
     },
@@ -5933,7 +6091,7 @@ Open **Settings \u2192 AdaptiqAI** to connect, or run \`/adaptiq signin\`.
 var ENTRY_PROTOCOL = 1;
 var RELOAD_SIGNATURE = true ? "ada3dfffa1b3d7b1" : "source";
 function pluginVersion() {
-  if (true) return "0.2.11";
+  if (true) return "0.2.12";
   try {
     return createRequire(import.meta.url)("../package.json").version;
   } catch {

package/lib/types/host/release-age.d.ts

@@ -0,0 +1,57 @@
+import type { Context } from '@deepseek-ai/cordis';
+/** Where the entries of `minimumReleaseAgeExclude` sit in the file's lines. */
+interface ExcludeList {
+    readonly lines: readonly string[];
+    /** The key's line, or -1 when the key is absent. */
+    readonly keyLine: number;
+    /** The key line rewritten for a block list, when it held an empty flow list (`[]`). */
+    readonly blockKey: string | null;
+    /** Line index and value of each entry. */
+    readonly entries: readonly {
+        readonly line: number;
+        readonly value: string;
+    }[];
+    readonly indent: string;
+}
+/**
+ * Read the exclusion list out of pnpm-workspace.yaml.
+ * @param text - the file's contents.
+ * @returns where the list is, or null when the layout is not one this edits with certainty.
+ */
+export declare function readExcludeList(text: string): ExcludeList | null;
+/**
+ * The file with exactly `name@version` listed for this package: older entries
+ * of the same package are replaced, every other line stays as it is.
+ * @param text - pnpm-workspace.yaml as it is.
+ * @param name - the plugin's package name.
+ * @param version - the release about to be installed.
+ * @returns the new text (the same text when nothing needs to change), or null when it cannot be edited with certainty.
+ */
+export declare function excludeRelease(text: string, name: string, version: string): string | null;
+/**
+ * The profile directory pnpm installs plugins in: the same `profileContext`
+ * the plugin manager installs through. Environment variables are not used: a
+ * harness started from another profile's shell inherits that profile's.
+ * @param ctx - the plugin context.
+ * @returns the directory, or null outside a dsh profile.
+ */
+export declare function profileDir(ctx: Context): string | null;
+/**
+ * Whether the exclusion can be written: the file exists, reads with certainty and is writable.
+ * @param dir - the profile directory.
+ * @param name - the plugin's package name.
+ * @returns true when {@link writeReleaseExclusion} would succeed short of a race.
+ */
+export declare function canExcludeRelease(dir: string, name: string): Promise<boolean>;
+/**
+ * List exactly `name@version` in the profile's `minimumReleaseAgeExclude`,
+ * under the profile's package lock (the one the plugin manager holds while it
+ * changes the profile), with an atomic replace.
+ * @param dir - the profile directory.
+ * @param name - the plugin's package name.
+ * @param version - the release about to be installed.
+ * @param waitMs - how long to wait for another package operation in the profile.
+ * @returns true when the file lists the version; false when it was left as it was.
+ */
+export declare function writeReleaseExclusion(dir: string, name: string, version: string, waitMs?: number): Promise<boolean>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptiqai/deepseek-harness",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "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",
@@ -90,7 +90,14 @@
     "react-dom": "~18.3.1",
     "typescript": "~5.9.3",
     "vitest": "~3.2.7",
-    "@adaptiqai/core": "0.2.7"
+    "@adaptiqai/core": "workspace:*"
+  },
+  "scripts": {
+    "link-dsh": "node scripts/link-dsh.mjs",
+    "build": "node scripts/gen-typert.mjs && node scripts/build.mjs",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "test": "vitest run",
+    "pack:local": "npm run build && pnpm pack --pack-destination ../../dist"
   },
   "repository": {
     "type": "git",
@@ -99,12 +106,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "scripts": {
-    "link-dsh": "node scripts/link-dsh.mjs",
-    "build": "node scripts/gen-typert.mjs && node scripts/build.mjs",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test": "vitest run",
-    "pack:local": "npm run build && pnpm pack --pack-destination ../../dist"
   }
-}
+}