@ran-sh/dsh-crew 1.0.3 → 1.1.0

package/scripts/setup.mjs

@@ -13,67 +13,68 @@ import { homedir } from 'node:os';
 import * as realInstaller from '../src/install/install.mjs';
 import { crewDshHome, crewProfileDir, CREW_PROFILE_NAME } from '../src/install/install.mjs';
 import {
-  ensureCrewDshRuntime,
-  ensureCrewPluginRegistration,
-  resolveDshCli,
+  ensureCrewDshRuntime,
+  ensureCrewPluginRegistration,
+  resolveDshCli,
   runResolvedDsh,
   describeDshCli,
   removeCrewPluginRegistration,
+  TARGET_DSH_VERSION,
 } from '../src/dsh-cli-runtime.mjs';
 
 const ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '..');
 
-function commandExists(name) {
-  const r = spawnSync(/^win/.test(process.platform) ? 'where' : 'which', [name], {
+function commandExists(name) {
+  const r = spawnSync(/^win/.test(process.platform) ? 'where' : 'which', [name], {
     encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'],
   });
-  return r.status === 0;
-}
-
-const PACKAGE_MANAGER_COMMAND = /^(?:npm|npx|pnpm|yarn|yarnpkg|bun|bunx)$/i;
-
-export function spawnCommand(command, platform = process.platform) {
-  if (platform === 'win32' && PACKAGE_MANAGER_COMMAND.test(command)) {
-    return `${command}.cmd`;
-  }
-  return command;
-}
-
-export function spawnNeedsShell(command, platform = process.platform) {
-  return platform === 'win32' && PACKAGE_MANAGER_COMMAND.test(command);
-}
-
-export function spawnInvocation(command, args = [], platform = process.platform, environment = process.env) {
-  const executable = spawnCommand(command, platform);
-  if (!spawnNeedsShell(command, platform)) return { command: executable, args };
-  const unsafe = args.find((arg) => !/^[A-Za-z0-9@._:+/=\-]+$/.test(String(arg)));
-  if (unsafe !== undefined) throw new Error(`unsafe package-manager argument: ${unsafe}`);
-  return {
-    command: environment.ComSpec || 'cmd.exe',
-    args: ['/d', '/s', '/c', [executable, ...args].join(' ')],
-  };
-}
-
-function run(cmd, args, opts = {}) {
-  let invocation;
-  try {
-    invocation = spawnInvocation(cmd, args);
-  } catch (error) {
-    return { ok: false, status: -1, stdout: '', stderr: String(error?.message ?? error), error };
-  }
-  const r = spawnSync(invocation.command, invocation.args, {
-    encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], shell: opts.shell === true, cwd: opts.cwd ?? ROOT,
-    env: opts.env ?? process.env,
-  });
-  const processError = r.error ? `${r.error.name}: ${r.error.message}` : '';
-  return {
-    ok: r.status === 0,
-    status: r.status ?? -1,
-    stdout: r.stdout ?? '',
-    stderr: r.stderr || processError,
-    error: r.error ?? null,
-  };
-}
+  return r.status === 0;
+}
+
+const PACKAGE_MANAGER_COMMAND = /^(?:npm|npx|pnpm|yarn|yarnpkg|bun|bunx)$/i;
+
+export function spawnCommand(command, platform = process.platform) {
+  if (platform === 'win32' && PACKAGE_MANAGER_COMMAND.test(command)) {
+    return `${command}.cmd`;
+  }
+  return command;
+}
+
+export function spawnNeedsShell(command, platform = process.platform) {
+  return platform === 'win32' && PACKAGE_MANAGER_COMMAND.test(command);
+}
+
+export function spawnInvocation(command, args = [], platform = process.platform, environment = process.env) {
+  const executable = spawnCommand(command, platform);
+  if (!spawnNeedsShell(command, platform)) return { command: executable, args };
+  const unsafe = args.find((arg) => !/^[A-Za-z0-9@._:+/=\-]+$/.test(String(arg)));
+  if (unsafe !== undefined) throw new Error(`unsafe package-manager argument: ${unsafe}`);
+  return {
+    command: environment.ComSpec || 'cmd.exe',
+    args: ['/d', '/s', '/c', [executable, ...args].join(' ')],
+  };
+}
+
+function run(cmd, args, opts = {}) {
+  let invocation;
+  try {
+    invocation = spawnInvocation(cmd, args);
+  } catch (error) {
+    return { ok: false, status: -1, stdout: '', stderr: String(error?.message ?? error), error };
+  }
+  const r = spawnSync(invocation.command, invocation.args, {
+    encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], shell: opts.shell === true, cwd: opts.cwd ?? ROOT,
+    env: opts.env ?? process.env,
+  });
+  const processError = r.error ? `${r.error.name}: ${r.error.message}` : '';
+  return {
+    ok: r.status === 0,
+    status: r.status ?? -1,
+    stdout: r.stdout ?? '',
+    stderr: r.stderr || processError,
+    error: r.error ?? null,
+  };
+}
 
 /**
  * Detect the DSH CLI. `allowDownload` is intentionally opt-in: installation
@@ -143,18 +144,18 @@ export async function setupInstall({
   installer = realInstaller,
   depRunner = null,
 } = {}) {
-  log('DSH Crew installer');
-  if (!checkRoot(root)) return { ok: false, error: `not a dsh-crew checkout: ${root}` };
-  const pnpmOk = commandExists('pnpm');
-
-  if (depRunner) {
+  log('DSH Crew installer');
+  if (!checkRoot(root)) return { ok: false, error: `not a dsh-crew checkout: ${root}` };
+  const pnpmOk = commandExists('pnpm');
+
+  if (depRunner) {
     const r = depRunner(root);
     if (!r.ok) { mark(log, false, r.text); return { ok: false, error: r.text }; }
     mark(log, true, r.text);
-  } else if (!dryRun) {
-    const cmd = pnpmOk ? 'pnpm' : 'npx';
+  } else if (!dryRun) {
+    const cmd = pnpmOk ? 'pnpm' : 'npx';
     const baseArgs = pnpmOk ? [] : ['-y', 'pnpm'];
-    const d = run(cmd, [...baseArgs, 'install', '--frozen-lockfile'], { cwd: root });
+    const d = run(cmd, [...baseArgs, 'install', '--frozen-lockfile'], { cwd: root });
     if (!d.ok) {
       if (depsPresent(root)) mark(log, true, `dependencies (already present; install skipped — ${(d.stderr || d.stdout || '').trim().split('\n')[0]})`);
       else {
@@ -163,11 +164,11 @@ export async function setupInstall({
       }
     } else mark(log, true, 'dependencies');
   } else mark(log, true, 'dependencies (dry-run)');
-
-  if (!dryRun) {
-    const b = pnpmOk
-      ? run('pnpm', ['run', 'build:client'], { cwd: root })
-      : run('npx', ['-y', 'pnpm', 'run', 'build:client'], { cwd: root });
+
+  if (!dryRun) {
+    const b = pnpmOk
+      ? run('pnpm', ['run', 'build:client'], { cwd: root })
+      : run('npx', ['-y', 'pnpm', 'run', 'build:client'], { cwd: root });
     if (!b.ok) {
       log(`✗ client build failed:\n${(b.stderr || b.stdout || '').slice(0, 600)}`);
       return { ok: false, error: 'client build failed' };
@@ -181,6 +182,17 @@ export async function setupInstall({
   // available, install a reusable copy under Crew state before falling back to
   // the transient download path. Dry-run never provisions or downloads.
   let dsh = detectDsh({ allowDownload: false, home });
+  // A reusable Crew runtime pinned to a DIFFERENT cohort than this source
+  // tree must never be silently reused (and never upgraded in place by the
+  // installer): a stale runtime would boot the wrong @deepseek-ai/dsh. The
+  // transactional update path owns cohort migration. Dry-run never mutates
+  // and must not be blocked by the machine's current cohort state.
+  if (!dryRun && dsh?.kind === 'crew-runtime' && dsh.version && dsh.version !== TARGET_DSH_VERSION) {
+    return {
+      ok: false,
+      error: `Crew runtime ${dsh.version} does not match ${TARGET_DSH_VERSION}; use the transactional update path (dsh-crew update) to migrate the cohort`,
+    };
+  }
   if (!dryRun && (!dsh || dsh.kind === 'npx-local')) {
     const boot = ensureCrewDshRuntime({ home });
     if (boot.ok) dsh = boot.cli;
@@ -197,45 +209,45 @@ export async function setupInstall({
     // is kept here as an explicit contrast so existing CLI tests/people see the
     // change, never as a command that targets the official web profile.
     mark(log, true, `DSH web profile would be linked (legacy) — now: dedicated dsh-crew profile under the Crew DSH_HOME; the official web profile is never modified (${dsh.description ?? dsh.kind} add "link:${root}")`);
-  } else {
-    const registration = ensureCrewPluginRegistration({ home, root, name });
-    if (!registration.ok) {
-      log(`✗ DSH crew profile link failed (${registration.code ?? 'unknown'})`);
-      return { ok: false, error: 'DSH profile link failed' };
-    }
-    mark(log, true, `DSH crew profile linked offline (dedicated Crew DSH_HOME, profile dsh-crew; ${registration.changed ? 'updated' : 'already current'})`);
-  }
-
-  if (dryRun) mark(log, true, 'Codex Desktop integration (dry-run)');
-  else {
+  } else {
+    const registration = ensureCrewPluginRegistration({ home, root, name });
+    if (!registration.ok) {
+      log(`✗ DSH crew profile link failed (${registration.code ?? 'unknown'})`);
+      return { ok: false, error: 'DSH profile link failed' };
+    }
+    mark(log, true, `DSH crew profile linked offline (dedicated Crew DSH_HOME, profile dsh-crew; ${registration.changed ? 'updated' : 'already current'})`);
+  }
+
+  if (dryRun) mark(log, true, 'Codex Desktop integration (dry-run)');
+  else {
     const r = installer.installCodex ? installer.installCodex({ home }) : realInstaller.installCodex({ home });
     mark(log, r.ok !== false, r.ok === false ? `Codex Desktop integration failed: ${(r.actions ?? []).join('; ')}` : 'Codex Desktop integration');
-    if (r.ok === false) return { ok: false, error: 'Codex integration failed' };
-  }
-
-  if (dryRun) mark(log, true, 'ZCode integration (dry-run)');
-  else {
-    const r = installer.installZCode
-      ? installer.installZCode({ home, root })
-      : realInstaller.installZCode({ home, root });
-    if (r.ok === false) {
-      mark(log, false, `ZCode integration failed (${r.code ?? 'unknown'})`);
-      return { ok: false, error: 'ZCode integration failed' };
-    }
-    mark(log, true, 'ZCode integration');
-  }
-
-  if (dryRun) mark(log, true, 'Windows login startup (dry-run)');
-  else {
-    const r = installer.installWindowsStartup
-      ? installer.installWindowsStartup({ home, root })
-      : realInstaller.installWindowsStartup({ home, root });
-    if (r.ok === false) {
-      mark(log, false, `Windows login startup failed (${r.code ?? 'unknown'})`);
-      return { ok: false, error: 'Windows login startup failed' };
-    }
-    if (r.supported) mark(log, true, 'Windows login startup');
-  }
+    if (r.ok === false) return { ok: false, error: 'Codex integration failed' };
+  }
+
+  if (dryRun) mark(log, true, 'ZCode integration (dry-run)');
+  else {
+    const r = installer.installZCode
+      ? installer.installZCode({ home, root })
+      : realInstaller.installZCode({ home, root });
+    if (r.ok === false) {
+      mark(log, false, `ZCode integration failed (${r.code ?? 'unknown'})`);
+      return { ok: false, error: 'ZCode integration failed' };
+    }
+    mark(log, true, 'ZCode integration');
+  }
+
+  if (dryRun) mark(log, true, 'Windows login startup (dry-run)');
+  else {
+    const r = installer.installWindowsStartup
+      ? installer.installWindowsStartup({ home, root })
+      : realInstaller.installWindowsStartup({ home, root });
+    if (r.ok === false) {
+      mark(log, false, `Windows login startup failed (${r.code ?? 'unknown'})`);
+      return { ok: false, error: 'Windows login startup failed' };
+    }
+    if (r.supported) mark(log, true, 'Windows login startup');
+  }
 
   if (commandExists('claude')) {
     if (dryRun) mark(log, true, 'Claude Code integration (dry-run)');
@@ -266,31 +278,31 @@ export async function setupUninstall({
   const fail = (name, text) => { mark(log, false, text || `${name} failed`); failures.push(name); };
 
   if (dryRun) {
-    mark(log, true, 'Codex Desktop integration would be removed');
-    mark(log, true, 'ZCode integration would be removed');
-    mark(log, true, 'Claude Code integration would be removed');
-    mark(log, true, 'Windows login startup would be removed');
-    mark(log, true, 'DSH crew profile would be removed');
+    mark(log, true, 'Codex Desktop integration would be removed');
+    mark(log, true, 'ZCode integration would be removed');
+    mark(log, true, 'Claude Code integration would be removed');
+    mark(log, true, 'Windows login startup would be removed');
+    mark(log, true, 'DSH crew profile would be removed');
   } else {
     const cx = installer.uninstallCodex ? installer.uninstallCodex({ home }) : realInstaller.uninstallCodex({ home });
-    if (cx.ok !== false) mark(log, true, 'Codex Desktop integration removed');
-    else fail('codex', 'Codex Desktop integration removal failed');
-
-    const zc = installer.uninstallZCode
-      ? installer.uninstallZCode({ home, root })
-      : realInstaller.uninstallZCode({ home, root });
-    if (zc.ok !== false) mark(log, true, 'ZCode integration removed');
-    else fail('zcode', 'ZCode integration removal failed');
-
-    const cl = installer.uninstallClaudeCode ? installer.uninstallClaudeCode({ home }) : realInstaller.uninstallClaudeCode({ home });
-    if (cl.ok !== false) mark(log, true, 'Claude Code integration removed');
-    else fail('claude', 'Claude Code integration removal failed');
-
-    const startup = installer.uninstallWindowsStartup
-      ? installer.uninstallWindowsStartup({ home })
-      : realInstaller.uninstallWindowsStartup({ home });
-    if (startup.ok === false) fail('startup', 'Windows login startup removal failed');
-    else if (startup.supported) mark(log, true, 'Windows login startup removed');
+    if (cx.ok !== false) mark(log, true, 'Codex Desktop integration removed');
+    else fail('codex', 'Codex Desktop integration removal failed');
+
+    const zc = installer.uninstallZCode
+      ? installer.uninstallZCode({ home, root })
+      : realInstaller.uninstallZCode({ home, root });
+    if (zc.ok !== false) mark(log, true, 'ZCode integration removed');
+    else fail('zcode', 'ZCode integration removal failed');
+
+    const cl = installer.uninstallClaudeCode ? installer.uninstallClaudeCode({ home }) : realInstaller.uninstallClaudeCode({ home });
+    if (cl.ok !== false) mark(log, true, 'Claude Code integration removed');
+    else fail('claude', 'Claude Code integration removal failed');
+
+    const startup = installer.uninstallWindowsStartup
+      ? installer.uninstallWindowsStartup({ home })
+      : realInstaller.uninstallWindowsStartup({ home });
+    if (startup.ok === false) fail('startup', 'Windows login startup removal failed');
+    else if (startup.supported) mark(log, true, 'Windows login startup removed');
 
     const name = readPackageName(root);
     if (!name) fail('dsh', 'DSH plugin removal failed: package name missing');
@@ -320,15 +332,15 @@ export async function setupUninstall({
 }
 
 export async function setupStatus({ log = console.log, root = ROOT, home = homedir(), installer = realInstaller } = {}) {
-  const st = installer.installStatus ? installer.installStatus({ home, root }) : realInstaller.installStatus({ home, root });
-  const claude = st?.claude?.installed ? 'installed' : 'not installed';
-  const codex = st?.codex?.installed ? 'installed' : 'not installed';
-  const zcode = st?.zcode?.installed ? 'installed' : 'not installed';
-  const startupState = installer.windowsStartupStatus
-    ? installer.windowsStartupStatus({ home })
-    : realInstaller.windowsStartupStatus({ home });
-  const windowsStartup = !startupState.supported ? 'not supported'
-    : startupState.ready ? 'installed' : startupState.installed ? 'needs repair' : 'not installed';
+  const st = installer.installStatus ? installer.installStatus({ home, root }) : realInstaller.installStatus({ home, root });
+  const claude = st?.claude?.installed ? 'installed' : 'not installed';
+  const codex = st?.codex?.installed ? 'installed' : 'not installed';
+  const zcode = st?.zcode?.installed ? 'installed' : 'not installed';
+  const startupState = installer.windowsStartupStatus
+    ? installer.windowsStartupStatus({ home })
+    : realInstaller.windowsStartupStatus({ home });
+  const windowsStartup = !startupState.supported ? 'not supported'
+    : startupState.ready ? 'installed' : startupState.installed ? 'needs repair' : 'not installed';
   // Crew status reads ONLY the dedicated Crew profile under the Crew DSH_HOME;
   // the official web profile layout under the default DSH home is intentionally
   // never inspected.
@@ -343,12 +355,12 @@ export async function setupStatus({ log = console.log, root = ROOT, home = homed
     } catch { dshPlugin = 'unknown'; }
   }
   log(`DSH plugin: ${dshPlugin} (dedicated dsh-crew profile; official web profile ignored)`);
-  log(`Codex Desktop integration: ${codex}`);
-  log(`ZCode integration: ${zcode}`);
-  log(`Claude Code integration: ${claude}`);
-  log(`Windows login startup: ${windowsStartup}`);
-  return { ok: true, dshPlugin, codex, zcode, claude, windowsStartup };
-}
+  log(`Codex Desktop integration: ${codex}`);
+  log(`ZCode integration: ${zcode}`);
+  log(`Claude Code integration: ${claude}`);
+  log(`Windows login startup: ${windowsStartup}`);
+  return { ok: true, dshPlugin, codex, zcode, claude, windowsStartup };
+}
 
 export async function runSetupCli({ argv = process.argv.slice(2), run: actions = {}, log = console.log } = {}) {
   const action = argv[0];