dsh-compact-saviour 0.2.8 → 0.2.9

package/lib/dsh-compact-saviour.js

@@ -5,7 +5,7 @@ import { SessionId, SessionSeq } from "@deepseek-ai/dsh-session";
 import { createHash, randomUUID } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
 import { CompactionId, ManualCompactionError, compactCheckpointSource, toolPairingBalancedAfter, toolPairingBalancedBefore } from "@deepseek-ai/dsh-compaction";
-//#region lib/types/summary-types.js
+// lib/types/summary-types.js
 function frameSummary(summary) {
 	return [
 		{
@@ -19,8 +19,7 @@ function frameSummary(summary) {
 		}
 	];
 }
-//#endregion
-//#region lib/types/vendor/region.js
+// lib/types/vendor/region.js
 /**
 * Surface retention selection and the shared log-recorded compaction
 * transaction for automatic open-turn and manual idle-session compaction.
@@ -636,8 +635,7 @@ async function compress(ctx, input, agent, options) {
 		maxTokens: cap
 	};
 }
-//#endregion
-//#region lib/types/pressure.js
+// lib/types/pressure.js
 function estimateRequest(measurement, header) {
 	return measurement.surfaceTokens + (header?.tools?.length ? Math.ceil(JSON.stringify(header.tools).length / 4) + 4 : 0);
 }
@@ -725,8 +723,7 @@ var PressureMeter = class {
 		};
 	}
 };
-//#endregion
-//#region lib/types/controller.js
+// lib/types/controller.js
 const inactive = () => ({
 	view: {
 		phase: "idle",
@@ -1112,8 +1109,7 @@ var Controller = class {
 		return work;
 	}
 };
-//#endregion
-//#region lib/types/routes.js
+// lib/types/routes.js
 function snapshot(value) {
 	if (!value.revision || ![value.context, value.target].every((route) => typeof route?.provider === "string" && route.provider && typeof route.model === "string" && route.model && (route.reasoningEffort === void 0 || typeof route.reasoningEffort === "string" && route.reasoningEffort))) throw new Error("Invalid session compaction route");
 	if (value.maxOutputTokens !== void 0 && (!Number.isSafeInteger(value.maxOutputTokens) || value.maxOutputTokens <= 0)) throw new Error("Invalid session compaction output reservation");
@@ -1185,8 +1181,7 @@ var CompactionRouteRegistry = class {
 		this.resolvers.clear();
 	}
 };
-//#endregion
-//#region lib/types/dsh-compact-saviour.js
+// lib/types/dsh-compact-saviour.js
 const name = "dsh-compact-saviour";
 const inject = [
 	"agents",
@@ -1313,5 +1308,4 @@ function apply(ctx, config) {
 	}));
 	ctx.logger.info("[my-plugins/dsh-compact-saviour] loaded");
 }
-//#endregion
 export { CompactionRouteRegistry, Config, apply, inject, name };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-compact-saviour",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "Dedicated-model compaction rescue and manual compaction in the native context popup",
   "type": "module",
   "license": "MIT",
@@ -39,25 +39,25 @@
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.4",
     "@deepseek-ai/schemastery": "^3.18.4",
-    "@deepseek-ai/dsh-agent": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-compaction": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-compaction-basic": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-commands": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-llm": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-session": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-token-meter": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-settings": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-scope": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-client-ui-conversation": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-client-ui-settings": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-client-ui-slots": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-api-session-controller": ">=0.2.0-rc.1 <0.2.1",
+    "@deepseek-ai/dsh-agent": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-compaction": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-compaction-basic": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-commands": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-llm": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-session": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-token-meter": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-settings": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-scope": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-client-ui-conversation": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-client-ui-settings": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-client-ui-slots": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-api-session-controller": ">=0.2.1-rc.1 <0.2.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "@deepseek-ai/dsh-client-connection": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-host-webserver": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-session-projection": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-client-ui-renderer": ">=0.2.0-rc.1 <0.2.1"
+    "@deepseek-ai/dsh-client-connection": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-host-webserver": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-session-projection": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-client-ui-renderer": ">=0.2.1-rc.1 <0.2.2"
   },
   "devDependencies": {
     "@types/node": "^22.20.0",
@@ -66,8 +66,8 @@
     "typescript": "^6.0.3",
     "tsx": "^4.22.4",
     "tsdown": "^0.22.2",
-    "@deepseek-ai/dsh-agent-loop-testkit": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-agent-loop": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-agent-loop-testkit": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-agent-loop": ">=0.2.1-rc.1 <0.2.2",
     "semver": "7.8.5",
     "@deepseek-ai/cordis-plugin-loader": "*"
   },
@@ -88,7 +88,8 @@
     "docs"
   ],
   "engines": {
-    "node": ">=24.0.0"
+    "node": ">=24.0.0",
+    "dsh": ">=0.2.1-rc.1 <0.2.2"
   },
   "repository": {
     "type": "git",

package/scripts/link-harness-dependencies.mjs

@@ -1,8 +1,8 @@
-import { existsSync, mkdirSync, symlinkSync, realpathSync, readFileSync, readdirSync } from 'node:fs';
+import { existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, realpathSync, rmSync, symlinkSync } from 'node:fs';
 import { dirname, join, resolve } from 'node:path';
 import { createRequire } from 'node:module';
-const root = resolve(process.argv[2] || '');
-if (!process.argv[2] || !existsSync(join(root, 'tools/dshx/src/client-build.js'))) throw new Error('Pass a prepared Harness checkout.');
+const root = resolve(process.argv[2] || process.env.DSH_REPO || '');
+if (!root || !existsSync(join(root, 'tools/dshx/src/client-build.js'))) throw new Error('Pass a prepared Harness checkout.');
 const packages = new Map();
 function walk(path, depth = 0) {
   if (depth > 4) return;
@@ -18,8 +18,18 @@ function link(name, target) {
   const destination = join(local, name);
   mkdirSync(dirname(destination), { recursive: true });
   if (existsSync(destination)) {
-    if (realpathSync(destination) !== realpathSync(target)) throw new Error(`Dependency mismatch: ${name}`);
-  } else symlinkSync(target, destination);
+    if (realpathSync(destination) === realpathSync(target)) return;
+    if (!lstatSync(destination).isSymbolicLink()) {
+      if (!name.startsWith('@deepseek-ai/')) {
+        console.log(`Keeping installed ${name}; it is not a symlink.`);
+        return;
+      }
+      rmSync(destination, { recursive: true, force: true });
+    } else {
+      rmSync(destination);
+    }
+  }
+  symlinkSync(target, destination);
 }
 const rootRequire = createRequire(join(root, 'package.json'));
 const uiRequire = createRequire(join(root, 'packages/client/ui-conversation/package.json'));
@@ -30,7 +40,13 @@ for (const name of Object.keys({ ...pkg.peerDependencies, ...pkg.devDependencies
   if (!target) for (const req of [rootRequire, uiRequire, webRequire]) {
     try { target = dirname(req.resolve(`${name}/package.json`)); break; } catch {}
   }
-  if (!target) throw new Error(`Cannot resolve ${name} in selected Harness`);
+  if (!target) {
+    if (existsSync(join(local, name))) {
+      console.log(`Keeping installed ${name}; selected Harness does not ship it.`);
+      continue;
+    }
+    throw new Error(`Cannot resolve ${name} in selected Harness`);
+  }
   link(name, target);
 }
 mkdirSync(join(local, '.bin'), { recursive: true });

package/tests/peer-range.test.ts

@@ -3,19 +3,19 @@ import { readFileSync } from 'node:fs';
 import test from 'node:test';
 import semver from 'semver';
 
-const RANGE = '>=0.2.0-rc.1 <0.2.1';
-const ACCEPT = ['0.2.0-rc.2', '0.2.0', '0.2.0-rc.2'];
-const REJECT = ['0.2.0-alpha', '0.2.0-alpha.1', '0.2.0-alpha.2', '0.1.7-rc.2', '0.1.7-rc.1', '0.2.1'];
+const RANGE = '>=0.2.1-rc.1 <0.2.2';
+const ACCEPT = ['0.2.1-rc.5', '0.2.1-rc.1', '0.2.1'];
+const REJECT = ['0.2.0-rc.2', '0.2.0', '0.2.0-alpha', '0.2.0-alpha.1', '0.2.1-alpha.1', '0.1.7-rc.2', '0.1.7-rc.1', '0.2.2'];
 
-test('Harness peers use >=0.2.0-rc.1 <0.2.1', () => {
+test('Harness peers use >=0.2.1-rc.1 <0.2.2', () => {
   const pkg = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
-  assert.equal(pkg.version, '0.2.8');
-  assert.equal(semver.satisfies('0.2.0-rc.2', RANGE), true);
+  assert.equal(pkg.version, '0.2.9');
+  assert.equal(semver.satisfies('0.2.1-rc.5', RANGE), true);
   const peers = Object.entries(pkg.peerDependencies).filter(([name]) => name.startsWith('@deepseek-ai/dsh'));
   assert.ok(peers.length >= 17);
   for (const [name, range] of peers) assert.equal(range, RANGE, name);
-  assert.equal(pkg.devDependencies['@deepseek-ai/dsh-agent-loop'], '0.2.0-rc.2');
-  assert.equal(pkg.devDependencies['@deepseek-ai/dsh-agent-loop-testkit'], '0.2.0-rc.2');
+  assert.equal(pkg.devDependencies['@deepseek-ai/dsh-agent-loop'], RANGE);
+  assert.equal(pkg.devDependencies['@deepseek-ai/dsh-agent-loop-testkit'], RANGE);
   assert.equal(pkg.peerDependencies['@deepseek-ai/cordis'], '^4.0.4');
   assert.equal(pkg.peerDependencies['@deepseek-ai/schemastery'], '^3.18.4');
   for (const version of ACCEPT) assert.equal(semver.satisfies(version, RANGE), true, version);