@ran-sh/dsh-crew 2.2.15 → 2.2.16

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-crew",
-  "version": "2.2.15",
+  "version": "2.2.16",
   "description": "Dispatch subtasks to DeepSeek Harness (DSH) agents as native subagents with live progress",
   "author": {
     "name": "ZSeven-W"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ran-sh/dsh-crew",
-  "version": "2.2.15",
+  "version": "2.2.16",
   "type": "module",
   "main": "./src/hub/entry.mjs",
   "bin": {
@@ -9,7 +9,11 @@
   "description": "DeepSeek Harness plugin: dispatch work to DSH agents from Claude Code / Codex, as native subagents with live progress",
   "dshCrew": {
     "payloadSchema": 2,
-    "windowsSupervisorHandoff": 1
+    "windowsSupervisorHandoff": 1,
+    "payloadRewrite": {
+      "schema": 1,
+      "rewritten": false
+    }
   },
   "dsh": {
     "bundle": {

package/src/dsh-cohort.mjs

@@ -14,21 +14,35 @@ export function isDshCohortPackage(name) {
   return name === DSH_CLI_PACKAGE || name.startsWith(`${DSH_CLI_PACKAGE}-`);
 }
 
-// The packages a persisted Crew payload vendors, at TARGET_DSH_VERSION.
+// WHAT THIS LIST IS: the names a persisted Crew payload pins to
+// TARGET_DSH_VERSION when the plugin declares them. It is the payload's cohort
+// authority, and it answers one question — "which exact version does this
+// package resolve to inside a release?"
 //
-// This list — not `package.json`'s DSH peer keys — decides what the standalone
-// payload installs. The two answer different questions: a peer key declares
-// which hosts will load the plugin, so it carries a RANGE that a host gate
-// compares against the running version, while a released payload must resolve
-// ONE exact cohort, because a half-upgraded tree is the failure it exists to
-// prevent. Reading the payload cohort out of the peer block conflated them, so
-// widening a peer range silently unlocked the cohort: nothing stayed pinned,
-// `exactSpecOverrides` produced no overrides, and npm materialized the newest
-// matching release instead of the one the embedded runtime runs.
+// WHAT IT IS NOT: an inventory of everything that must exist at run time. The
+// runtime tree is a cohort of its own, and `src/dsh-cli-runtime.mjs` judges it
+// dynamically — it walks every installed @deepseek-ai/dsh* copy and compares it
+// against TARGET_DSH_VERSION, so a member it was never told about still fails
+// the reuse gate instead of drifting silently. Adding a name here does not make
+// the runtime install it; removing one does not excuse it from that judgement.
 //
-// Names here are the cohort of TARGET_DSH_VERSION. A package that exists only
-// in a later cohort (a rename, for example) belongs in the peer block for that
-// host and must NOT be added here until TARGET_DSH_VERSION moves with it.
+// Two boundary cases, recorded so they are not re-litigated:
+//   * @deepseek-ai/dsh-base and @deepseek-ai/dsh-web-app are PROFILE BUNDLES,
+//     named by CREW_PROFILE_DEFAULT_BUNDLES in src/dsh-cli-runtime.mjs. They
+//     belong to the runtime tree the profile composes, not to this plugin's
+//     peer set, so they are correctly absent here. A payload never vendors them.
+//   * @deepseek-ai/dsh-agent-presets is listed but currently inert: nothing in
+//     package.json declares it, and only a declared name is pinned. It stays
+//     because it is the 0.1.6-alpha.1 provider of the `agentPresets` service this
+//     plugin resolves, and because its name dies at 0.1.7 — a host that needs the
+//     provider must not get it from the peer block, so the only way it can ever
+//     be pinned to the runtime cohort is from this list.
+//
+// The list is authoritative wherever a member is declared: a peer range and an
+// explicit dependency both resolve to TARGET_DSH_VERSION in the staged payload.
+// A package that exists only in a later cohort — a rename, for example — belongs
+// in the peer block for that host and must NOT be added here until
+// TARGET_DSH_VERSION moves with it.
 export const DSH_COHORT_PACKAGES = Object.freeze([
   DSH_CLI_PACKAGE,
   '@deepseek-ai/dsh-agent',

package/src/install/npx-lifecycle.mjs

@@ -36,7 +36,7 @@ import {
   writeFileSync,
 } from 'node:fs';
 import { createRequire } from 'node:module';
-import { dirname, isAbsolute, join, relative, resolve, sep } from 'node:path';
+import { basename, dirname, isAbsolute, join, relative, resolve, sep } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { homedir } from 'node:os';
 import * as realInstaller from './install.mjs';
@@ -998,6 +998,22 @@ export function exactSpecOverrides(dependencies) {
 
 // ---- payload staging ---------------------------------------------------------
 
+// Which manifest form a file is: absent or `rewritten: false` is the shape npm
+// published, `rewritten: true` is the shape the CLI staged. A version number alone
+// cannot tell the two apart, and they do not behave alike (`npm ls`, the dependency
+// tree, and any future integrity check all see different content), so a bug report
+// has to be able to name its form without guessing.
+export function payloadRewriteRecord({ source, dshVersion, now = new Date() } = {}) {
+  const kind = typeof source?.kind === 'string' && source.kind ? source.kind : 'unknown';
+  const record = { schema: 1, rewritten: true, source: { kind }, targetDshVersion: dshVersion ?? null };
+  for (const key of ['spec', 'integrity', 'file', 'path', 'version']) {
+    const value = source?.[key];
+    if (typeof value === 'string' && value) record.source[key] = value;
+  }
+  if (now instanceof Date && !Number.isNaN(now.valueOf())) record.rewrittenAt = now.toISOString();
+  return record;
+}
+
 /**
  * Stage the candidate into its FINAL release directory, guarded by an
  * incompleteness marker. Committing = removing the marker (a single-file
@@ -1005,13 +1021,15 @@ export function exactSpecOverrides(dependencies) {
  * pointer last. This avoids directory renames, which Windows can refuse with
  * transient EPERM while a freshly written tree is being scanned.
  *
- * The persisted manifest merges the exact-pinned DSH peer cohort into
- * `dependencies` (peer declarations are dropped): the installed payload runs
- * standalone — `src/server.mjs` statically imports DSH peers — so those
- * packages must exist inside the release, not be assumed from a host.
+ * The persisted manifest re-pins every declared DSH peer to the cohort in
+ * `dependencies`, with matching `overrides`, so a released payload resolves
+ * exactly one cohort, and it keeps the `peerDependencies` declaration so the
+ * host compatibility gate still has something to check. Only `devDependencies`
+ * is dropped — it is not a runtime input.
  */
 export function stageCandidatePayload({
   sourceRoot = runningPackageRoot(),
+  source = null,
   home = homedir(),
   log = () => {},
   now = new Date(),
@@ -1055,27 +1073,50 @@ export function stageCandidatePayload({
   // declaration only: the running host supplies it, as it supplies every other
   // shared module. Without this pin the payload stops carrying a resolvable
   // cohort at all, and `payloadDshVersion` fails closed on the range.
+  //
+  // `peerDependencies` STAYS in the payload. The host gate opens with
+  // `if (!Object.hasOwn(fields, "peerDependencies")) return void 0`, so a payload
+  // that dropped the key stops being checked at all: the installed form would
+  // trade the host's compatibility protection for nothing, and a future runtime
+  // that genuinely mismatched would fail silently at run time instead of being
+  // refused at boot. Keeping the declaration costs nothing — the exact cohort pin
+  // lives in `dependencies` plus `overrides`, which answers a different question
+  // than the range a host gate compares — and `peerDependenciesMeta.optional`
+  // keeps npm from treating the pinned copies as unsatisfied required peers.
+  // `devDependencies` is removed: it is not a runtime input and must never be
+  // materialized into the payload.
   const stagedManifest = { ...manifest };
   delete stagedManifest.devDependencies;
-  delete stagedManifest.peerDependencies;
-  delete stagedManifest.peerDependenciesMeta;
   const optionalNames = new Set(Object.keys(manifest.optionalDependencies ?? {}));
   const cohortPins = dshCohortPins();
-  const explicitDependencies = new Set(Object.keys(manifest.dependencies ?? {}));
   const stagedDependencies = { ...(manifest.dependencies ?? {}) };
   for (const [name, spec] of Object.entries(manifest.peerDependencies ?? {})) {
     if (!name.startsWith(DSH_SCOPE)) {
       if (!(name in stagedDependencies)) stagedDependencies[name] = spec;
       continue;
     }
-    // An explicit runtime dependency wins over the peer shorthand.
-    if (explicitDependencies.has(name)) continue;
+    // A scoped peer outside the cohort is a host-gate declaration only.
     if (!Object.hasOwn(cohortPins, name)) continue;
     stagedDependencies[name] = cohortPins[name];
   }
+  // The cohort list is authoritative wherever a member is declared, including a
+  // member an author promoted into `dependencies`. Pinning there too keeps one
+  // exact cohort; the alternative silently floats that package and re-opens
+  // exactly the drift the payload pin exists to prevent.
+  for (const [name, spec] of Object.entries(stagedDependencies)) {
+    if (!Object.hasOwn(cohortPins, name)) continue;
+    if (spec !== cohortPins[name]) {
+      log(`- pinning ${name} ${spec} -> ${cohortPins[name]} (the payload resolves one cohort)`);
+    }
+    stagedDependencies[name] = cohortPins[name];
+  }
   stagedManifest.dependencies = stagedDependencies;
   const overrides = exactSpecOverrides(stagedManifest.dependencies);
   if (overrides) stagedManifest.overrides = overrides;
+  stagedManifest.dshCrew = {
+    ...(stagedManifest.dshCrew ?? {}),
+    payloadRewrite: payloadRewriteRecord({ source, dshVersion: TARGET_DSH_VERSION, now }),
+  };
   writeFileSync(join(stageDir, 'package.json'), JSON.stringify(stagedManifest, null, 2) + '\n');
 
   // Materialize dependencies: prefer replicating the exact bits the candidate
@@ -2881,7 +2922,7 @@ async function npxInstallInner({ home, log, sourceRoot, installer, ensureRuntime
     return { ok: true, repaired: true, version: manifest.version, path: health.pointer.path };
   }
 
-  const staged = stageCandidatePayload({ sourceRoot: candidateRoot, home, log, npmInstaller });
+  const staged = stageCandidatePayload({ sourceRoot: candidateRoot, home, log, npmInstaller, source: { kind: 'running', path: candidateRoot, version: manifest.version } });
   if (!staged.ok) {
     log(`✗ staging failed (${staged.code})${staged.detail ? `: ${Array.isArray(staged.detail) ? staged.detail.join('; ') : String(staged.detail)}` : ''}`);
     return { ok: false, error: `staging failed (${staged.code})` };
@@ -2979,7 +3020,7 @@ export function resolveUpdateCandidate({
     if (existsSync(join(value, 'package.json'))) {
       const manifest = readManifest(value);
       if (!manifest?.name || !manifest?.version) return { ok: false, code: 'CANDIDATE_MANIFEST_INVALID', detail: value };
-      return { ok: true, sourceRoot: value, version: manifest.version, cleanup: null };
+      return { ok: true, sourceRoot: value, version: manifest.version, cleanup: null, source: { kind: 'candidate', path: value } };
     }
     if (/\.tgz$/i.test(value)) {
       const tmpRoot = join(crewReleasesDir({ home }), `.candidate-${timestampStamp()}-${process.pid}`);
@@ -2997,6 +3038,7 @@ export function resolveUpdateCandidate({
         ok: true,
         sourceRoot: extracted.sourceRoot,
         version: manifest.version,
+        source: { kind: 'candidate', file: basename(value) },
         cleanup: () => rmSync(tmpRoot, { recursive: true, force: true }),
       };
     }
@@ -3041,6 +3083,7 @@ export function resolveUpdateCandidate({
       ok: true,
       sourceRoot: extracted.sourceRoot,
       version: manifest.version,
+      source: { kind: 'registry', spec: effectiveSpec, ...(typeof info.integrity === 'string' && info.integrity ? { integrity: info.integrity } : {}), ...(typeof info.filename === 'string' && info.filename ? { file: info.filename } : {}) },
       cleanup: () => rmSync(tmpDir, { recursive: true, force: true }),
     };
   } catch (error) {
@@ -3097,7 +3140,7 @@ async function npxUpdateInner({ home, log, sourceRoot, candidate, spec, installe
   let resolved;
   if (launcherCanConverge) {
     log(`- newer launcher ${launcherManifest.version}; converging managed payload ${initialHealth.pointer.version} before registry resolution`);
-    resolved = { ok: true, sourceRoot: launcherRoot, version: launcherManifest.version, cleanup: null };
+    resolved = { ok: true, sourceRoot: launcherRoot, version: launcherManifest.version, cleanup: null, source: { kind: 'launcher', path: launcherRoot, version: launcherManifest.version } };
   } else {
     resolved = resolveUpdateCandidate({ candidate: explicitCandidate, spec, home, log, runner });
   }
@@ -3139,7 +3182,7 @@ async function npxUpdateInner({ home, log, sourceRoot, candidate, spec, installe
       log(`- updating managed payload ${health.pointer.version} -> ${manifest.version}`);
     }
 
-    const staged = stageCandidatePayload({ sourceRoot: resolved.sourceRoot, home, log, npmInstaller });
+    const staged = stageCandidatePayload({ sourceRoot: resolved.sourceRoot, home, log, npmInstaller, source: resolved.source });
     if (!staged.ok) {
       log(`✗ staging failed (${staged.code})${staged.detail ? `: ${Array.isArray(staged.detail) ? staged.detail.join('; ') : String(staged.detail)}` : ''}`);
       return { ok: false, error: `staging failed (${staged.code})` };

package/src/install/payload-content.mjs

@@ -13,6 +13,15 @@ function runtimeManifest(manifest) {
   delete normalized.devDependencies;
   delete normalized.peerDependencies;
   delete normalized.peerDependenciesMeta;
+  // The install-form record is bookkeeping about the manifest, not a property of
+  // the shipped files: normalize it away so one payload keeps one digest before
+  // and after the CLI rewrite. Without this, `samePayloadContent` would report
+  // every rewritten payload as changed and the same-version repair path would
+  // never be reachable again.
+  if (normalized.dshCrew && typeof normalized.dshCrew === 'object') {
+    const { payloadRewrite, ...rest } = normalized.dshCrew;
+    normalized.dshCrew = rest;
+  }
   return canonical(normalized);
 }
 

package/src/runtime-identity.mjs

@@ -36,7 +36,7 @@ export {
 // included in the identity contract.
 const RUNTIME_ID = randomUUID();
 
-export const RUNTIME_VERSION = '2.2.15';
+export const RUNTIME_VERSION = '2.2.16';
 export const HUB_PROTOCOL_VERSION = 1;
 
 export const HUB_CAPABILITIES = Object.freeze([