@ran-sh/dsh-crew 0.3.7 → 0.3.8

package/src/dsh-cli-runtime.mjs

@@ -5,27 +5,27 @@
 // compatibility fallbacks. Status and uninstall callers can resolve without
 // allowing a download.
 
-import { spawnSync } from 'node:child_process';
-import { createRequire } from 'node:module';
-import {
-  existsSync,
-  lstatSync,
-  mkdirSync,
-  readFileSync,
-  realpathSync,
-  symlinkSync,
-  unlinkSync,
-  writeFileSync,
-} from 'node:fs';
-import { dirname, extname, isAbsolute, join, relative, resolve, sep } from 'node:path';
+import { spawnSync } from 'node:child_process';
+import { createRequire } from 'node:module';
+import {
+  existsSync,
+  lstatSync,
+  mkdirSync,
+  readFileSync,
+  realpathSync,
+  symlinkSync,
+  unlinkSync,
+  writeFileSync,
+} from 'node:fs';
+import { dirname, extname, isAbsolute, join, relative, resolve, sep } from 'node:path';
 import { homedir } from 'node:os';
 import { crewDshHome, crewProfileDir } from './install/install.mjs';
 
-export const DSH_CLI_PACKAGE = '@deepseek-ai/dsh';
-export const CREW_DSH_RUNTIME_DIRNAME = 'runtime';
-const CREW_PROFILE_DEFAULT_BUNDLES = ['@deepseek-ai/dsh-base'];
-const PROFILE_PATCH_TEMPLATE = '[]\n';
-const PROFILE_PNPM_WORKSPACE = 'packages:\n  - .\n\nnodeLinker: hoisted\nautoInstallPeers: false\n';
+export const DSH_CLI_PACKAGE = '@deepseek-ai/dsh';
+export const CREW_DSH_RUNTIME_DIRNAME = 'runtime';
+const CREW_PROFILE_DEFAULT_BUNDLES = ['@deepseek-ai/dsh-base', '@deepseek-ai/dsh-web-app'];
+const PROFILE_PATCH_TEMPLATE = '[]\n';
+const PROFILE_PNPM_WORKSPACE = 'packages:\n  - .\n\nnodeLinker: hoisted\nautoInstallPeers: false\n';
 
 function defaultFindCommand(name) {
   const probe = process.platform === 'win32' ? 'where.exe' : 'which';
@@ -236,170 +236,181 @@ export function ensureCrewDshRuntime({
   return { ok: true, cli, reused: false, version: cli.version, runtimeRoot };
 }
 
-export function describeDshCli(cli) {
+export function describeDshCli(cli) {
   if (!cli) return 'unavailable';
   const version = cli.version ? `@${cli.version}` : '';
   return `${cli.kind}${version}`;
-}
-
-function isObject(value) {
-  return value !== null && typeof value === 'object' && !Array.isArray(value);
-}
-
-function isSafePackageName(name) {
-  return typeof name === 'string'
-    && /^(?:@[^/\s]+\/)?[^/\s]+$/u.test(name)
-    && !name.split('/').some((part) => part === '.' || part === '..');
-}
-
-function isWithin(root, candidate) {
-  const rel = relative(root, candidate);
-  return rel === '' || (rel !== '..' && !rel.startsWith(`..${sep}`) && !isAbsolute(rel));
-}
-
-function fileSpec(target) {
-  return `link:${target.replace(/\\/g, '/')}`;
-}
-
-function profileLinkPath(profileRoot, name) {
-  return join(profileRoot, 'node_modules', ...name.split('/'));
-}
-
-function readPluginRoot(root, expectedName) {
-  if (typeof root !== 'string' || !isAbsolute(root)) return { ok: false, code: 'INVALID_CREW_PLUGIN_ROOT' };
-  let targetRoot;
-  try { targetRoot = realpathSync(root); } catch { return { ok: false, code: 'CREW_PLUGIN_ROOT_NOT_FOUND' }; }
-  const packageFile = join(targetRoot, 'package.json');
-  let pkg;
-  try { pkg = JSON.parse(readFileSync(packageFile, 'utf8')); } catch { return { ok: false, code: 'CREW_PLUGIN_MANIFEST_INVALID' }; }
-  if (!isObject(pkg) || !isSafePackageName(pkg.name) || (expectedName !== undefined && pkg.name !== expectedName)) {
-    return { ok: false, code: 'CREW_PLUGIN_MANIFEST_INVALID' };
-  }
-  const patchSpec = pkg.dsh?.bundle?.patch;
-  if (typeof patchSpec !== 'string' || !patchSpec.trim()) return { ok: false, code: 'CREW_PLUGIN_BUNDLE_INVALID' };
-  const patchPath = resolve(targetRoot, patchSpec);
-  if (!isWithin(targetRoot, patchPath) || !existsSync(patchPath)) return { ok: false, code: 'CREW_PLUGIN_BUNDLE_INVALID' };
-  return { ok: true, targetRoot, packageFile, packageName: pkg.name, packageVersion: pkg.version ?? null, patchPath, pkg };
-}
-
-function readProfileManifestForRegistration(profileRoot) {
-  const profileManifest = join(profileRoot, 'package.json');
-  if (!existsSync(profileManifest)) {
-    return {
-      profileManifest,
-      manifest: {
-        name: `dsh-profile-${profileRoot.split(/[\\/]/u).at(-1)}`,
-        private: true,
-        dependencies: {},
-        dsh: { profile: { bundles: [...CREW_PROFILE_DEFAULT_BUNDLES] } },
-      },
-      created: true,
-    };
-  }
-  let manifest;
-  try { manifest = JSON.parse(readFileSync(profileManifest, 'utf8')); } catch { return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' }; }
-  if (!isObject(manifest)) return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' };
-  if (manifest.dependencies !== undefined && !isObject(manifest.dependencies)) return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' };
-  if (manifest.dependencies && Object.values(manifest.dependencies).some((value) => typeof value !== 'string')) {
-    return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' };
-  }
-  if (manifest.dsh !== undefined && !isObject(manifest.dsh)) return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' };
-  if (manifest.dsh?.profile !== undefined && !isObject(manifest.dsh.profile)) return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' };
-  const bundles = manifest.dsh?.profile?.bundles;
-  if (bundles !== undefined && (!Array.isArray(bundles) || bundles.some((name) => !isSafePackageName(name)))) {
-    return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' };
-  }
-  return { profileManifest, manifest, created: false };
-}
-
-function ensureProfileScaffold(profileRoot) {
-  mkdirSync(profileRoot, { recursive: true });
-  let changed = false;
-  const patchFile = join(profileRoot, 'cordis.patch.yml');
-  if (!existsSync(patchFile)) { writeFileSync(patchFile, PROFILE_PATCH_TEMPLATE); changed = true; }
-  const workspaceFile = join(profileRoot, 'pnpm-workspace.yaml');
-  if (!existsSync(workspaceFile)) { writeFileSync(workspaceFile, PROFILE_PNPM_WORKSPACE); changed = true; }
-  return changed;
-}
-
-function ensureDirectoryLink(linkPath, targetRoot) {
-  let stat;
-  try { stat = lstatSync(linkPath); } catch { stat = null; }
-  if (stat && !stat.isSymbolicLink()) return { ok: false, code: 'CREW_PLUGIN_LINK_CONFLICT' };
-  if (stat) {
-    try {
-      if (realpathSync(linkPath) === targetRoot) return { ok: true, changed: false };
-    } catch {}
-    unlinkSync(linkPath);
-  }
-  mkdirSync(dirname(linkPath), { recursive: true });
-  symlinkSync(targetRoot, linkPath, process.platform === 'win32' ? 'junction' : 'dir');
-  return { ok: true, changed: true };
-}
-
-/**
- * Register a local Crew plugin without invoking DSH's pnpm-forwarding plugin
- * command. The profile manifest and one loader-visible directory link are the
- * only state changed; no dependency resolution or policy bypass is attempted.
- */
-export function ensureCrewPluginRegistration({ home = homedir(), root, name } = {}) {
-  const plugin = readPluginRoot(root, name);
-  if (!plugin.ok) return plugin;
-  const profileRoot = crewProfileDir({ home });
-  const profile = readProfileManifestForRegistration(profileRoot);
-  if (profile.ok === false) return profile;
-  const scaffoldChanged = ensureProfileScaffold(profileRoot);
-  const current = profile.manifest;
-  const dependencies = { ...(current.dependencies ?? {}) };
-  const currentBundles = current.dsh?.profile?.bundles ?? [...CREW_PROFILE_DEFAULT_BUNDLES];
-  const nextBundles = [];
-  let seen = false;
-  for (const bundle of currentBundles) {
-    if (bundle === plugin.packageName) {
-      if (!seen) { nextBundles.push(bundle); seen = true; }
-    } else nextBundles.push(bundle);
-  }
-  if (!seen) nextBundles.push(plugin.packageName);
-  dependencies[plugin.packageName] = fileSpec(plugin.targetRoot);
-  const next = {
-    ...current,
-    dependencies,
-    dsh: {
-      ...(current.dsh ?? {}),
-      profile: { ...(current.dsh?.profile ?? {}), bundles: nextBundles },
-    },
-  };
-  const manifestChanged = JSON.stringify(current) !== JSON.stringify(next) || profile.created;
-  const linkPath = profileLinkPath(profileRoot, plugin.packageName);
-  let link;
-  try { link = ensureDirectoryLink(linkPath, plugin.targetRoot); } catch { return { ok: false, code: 'CREW_PLUGIN_LINK_FAILED' }; }
-  if (!link.ok) return link;
-  try {
-    if (manifestChanged) writeFileSync(profile.profileManifest, JSON.stringify(next, null, 2) + '\n');
-    // Resolve the intended package entry from the validated checkout. Node's
-    // package-name resolution cache can retain the old target after a stale
-    // junction is replaced in the same process, so loader visibility is proven
-    // by the link target plus a normal package entry resolution from that
-    // target rather than by trusting a cached package-name lookup.
-    const resolvedEntry = createRequire(join(plugin.targetRoot, 'package.json')).resolve('.');
-    const resolvedRoot = realpathSync(linkPath);
-    if (resolvedRoot !== plugin.targetRoot || !isWithin(plugin.targetRoot, realpathSync(resolvedEntry))) {
-      return { ok: false, code: 'CREW_PLUGIN_NOT_LOADABLE' };
-    }
-    return {
-      ok: true,
-      changed: scaffoldChanged || manifestChanged || link.changed,
-      profileRoot,
-      profileManifest: profile.profileManifest,
-      linkPath,
-      targetRoot: plugin.targetRoot,
-      packageName: plugin.packageName,
-      packageVersion: plugin.packageVersion,
-      patchPath: plugin.patchPath,
-      resolvedEntry,
-    };
-  } catch { return { ok: false, code: 'CREW_PLUGIN_NOT_LOADABLE' }; }
-}
+}
+
+function isObject(value) {
+  return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+
+function isSafePackageName(name) {
+  return typeof name === 'string'
+    && /^(?:@[^/\s]+\/)?[^/\s]+$/u.test(name)
+    && !name.split('/').some((part) => part === '.' || part === '..');
+}
+
+function isWithin(root, candidate) {
+  const rel = relative(root, candidate);
+  return rel === '' || (rel !== '..' && !rel.startsWith(`..${sep}`) && !isAbsolute(rel));
+}
+
+function fileSpec(target) {
+  return `link:${target.replace(/\\/g, '/')}`;
+}
+
+function profileLinkPath(profileRoot, name) {
+  return join(profileRoot, 'node_modules', ...name.split('/'));
+}
+
+function readPluginRoot(root, expectedName) {
+  if (typeof root !== 'string' || !isAbsolute(root)) return { ok: false, code: 'INVALID_CREW_PLUGIN_ROOT' };
+  let targetRoot;
+  try { targetRoot = realpathSync(root); } catch { return { ok: false, code: 'CREW_PLUGIN_ROOT_NOT_FOUND' }; }
+  const packageFile = join(targetRoot, 'package.json');
+  let pkg;
+  try { pkg = JSON.parse(readFileSync(packageFile, 'utf8')); } catch { return { ok: false, code: 'CREW_PLUGIN_MANIFEST_INVALID' }; }
+  if (!isObject(pkg) || !isSafePackageName(pkg.name) || (expectedName !== undefined && pkg.name !== expectedName)) {
+    return { ok: false, code: 'CREW_PLUGIN_MANIFEST_INVALID' };
+  }
+  const patchSpec = pkg.dsh?.bundle?.patch;
+  if (typeof patchSpec !== 'string' || !patchSpec.trim()) return { ok: false, code: 'CREW_PLUGIN_BUNDLE_INVALID' };
+  const patchPath = resolve(targetRoot, patchSpec);
+  if (!isWithin(targetRoot, patchPath) || !existsSync(patchPath)) return { ok: false, code: 'CREW_PLUGIN_BUNDLE_INVALID' };
+  return { ok: true, targetRoot, packageFile, packageName: pkg.name, packageVersion: pkg.version ?? null, patchPath, pkg };
+}
+
+function readProfileManifestForRegistration(profileRoot, { create = true, defaultBundles = CREW_PROFILE_DEFAULT_BUNDLES } = {}) {
+  const profileManifest = join(profileRoot, 'package.json');
+  if (!existsSync(profileManifest)) {
+    if (!create) return { ok: false, code: 'PROFILE_NOT_FOUND', profileManifest };
+    return {
+      profileManifest,
+      manifest: {
+        name: `dsh-profile-${profileRoot.split(/[\\/]/u).at(-1)}`,
+        private: true,
+        dependencies: {},
+        dsh: { profile: { bundles: [...defaultBundles] } },
+      },
+      created: true,
+    };
+  }
+  let manifest;
+  try { manifest = JSON.parse(readFileSync(profileManifest, 'utf8')); } catch { return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' }; }
+  if (!isObject(manifest)) return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' };
+  if (manifest.dependencies !== undefined && !isObject(manifest.dependencies)) return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' };
+  if (manifest.dependencies && Object.values(manifest.dependencies).some((value) => typeof value !== 'string')) {
+    return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' };
+  }
+  if (manifest.dsh !== undefined && !isObject(manifest.dsh)) return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' };
+  if (manifest.dsh?.profile !== undefined && !isObject(manifest.dsh.profile)) return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' };
+  const bundles = manifest.dsh?.profile?.bundles;
+  if (bundles !== undefined && (!Array.isArray(bundles) || bundles.some((name) => !isSafePackageName(name)))) {
+    return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' };
+  }
+  return { profileManifest, manifest, created: false };
+}
+
+function ensureProfileScaffold(profileRoot) {
+  mkdirSync(profileRoot, { recursive: true });
+  let changed = false;
+  const patchFile = join(profileRoot, 'cordis.patch.yml');
+  if (!existsSync(patchFile)) { writeFileSync(patchFile, PROFILE_PATCH_TEMPLATE); changed = true; }
+  const workspaceFile = join(profileRoot, 'pnpm-workspace.yaml');
+  if (!existsSync(workspaceFile)) { writeFileSync(workspaceFile, PROFILE_PNPM_WORKSPACE); changed = true; }
+  return changed;
+}
+
+function ensureDirectoryLink(linkPath, targetRoot) {
+  let stat;
+  try { stat = lstatSync(linkPath); } catch { stat = null; }
+  if (stat && !stat.isSymbolicLink()) return { ok: false, code: 'CREW_PLUGIN_LINK_CONFLICT' };
+  if (stat) {
+    try {
+      if (realpathSync(linkPath) === targetRoot) return { ok: true, changed: false };
+    } catch {}
+    unlinkSync(linkPath);
+  }
+  mkdirSync(dirname(linkPath), { recursive: true });
+  symlinkSync(targetRoot, linkPath, process.platform === 'win32' ? 'junction' : 'dir');
+  return { ok: true, changed: true };
+}
+
+/**
+ * Register a local Crew plugin without invoking DSH's pnpm-forwarding plugin
+ * command. The profile manifest and one loader-visible directory link are the
+ * only state changed; no dependency resolution or policy bypass is attempted.
+ */
+export function ensurePluginRegistration({
+  profileRoot,
+  root,
+  name,
+  createProfile = true,
+  defaultBundles = CREW_PROFILE_DEFAULT_BUNDLES,
+} = {}) {
+  const plugin = readPluginRoot(root, name);
+  if (!plugin.ok) return plugin;
+  if (typeof profileRoot !== 'string' || !isAbsolute(profileRoot)) return { ok: false, code: 'INVALID_PROFILE_ROOT' };
+  const profile = readProfileManifestForRegistration(profileRoot, { create: createProfile, defaultBundles });
+  if (profile.ok === false) return profile;
+  const scaffoldChanged = createProfile ? ensureProfileScaffold(profileRoot) : false;
+  const current = profile.manifest;
+  const dependencies = { ...(current.dependencies ?? {}) };
+  const currentBundles = current.dsh?.profile?.bundles ?? [...CREW_PROFILE_DEFAULT_BUNDLES];
+  const nextBundles = [];
+  let seen = false;
+  for (const bundle of currentBundles) {
+    if (bundle === plugin.packageName) {
+      if (!seen) { nextBundles.push(bundle); seen = true; }
+    } else nextBundles.push(bundle);
+  }
+  if (!seen) nextBundles.push(plugin.packageName);
+  dependencies[plugin.packageName] = fileSpec(plugin.targetRoot);
+  const next = {
+    ...current,
+    dependencies,
+    dsh: {
+      ...(current.dsh ?? {}),
+      profile: { ...(current.dsh?.profile ?? {}), bundles: nextBundles },
+    },
+  };
+  const manifestChanged = JSON.stringify(current) !== JSON.stringify(next) || profile.created;
+  const linkPath = profileLinkPath(profileRoot, plugin.packageName);
+  let link;
+  try { link = ensureDirectoryLink(linkPath, plugin.targetRoot); } catch { return { ok: false, code: 'CREW_PLUGIN_LINK_FAILED' }; }
+  if (!link.ok) return link;
+  try {
+    if (manifestChanged) writeFileSync(profile.profileManifest, JSON.stringify(next, null, 2) + '\n');
+    // Resolve the intended package entry from the validated checkout. Node's
+    // package-name resolution cache can retain the old target after a stale
+    // junction is replaced in the same process, so loader visibility is proven
+    // by the link target plus a normal package entry resolution from that
+    // target rather than by trusting a cached package-name lookup.
+    const resolvedEntry = createRequire(join(plugin.targetRoot, 'package.json')).resolve('.');
+    const resolvedRoot = realpathSync(linkPath);
+    if (resolvedRoot !== plugin.targetRoot || !isWithin(plugin.targetRoot, realpathSync(resolvedEntry))) {
+      return { ok: false, code: 'CREW_PLUGIN_NOT_LOADABLE' };
+    }
+    return {
+      ok: true,
+      changed: scaffoldChanged || manifestChanged || link.changed,
+      profileRoot,
+      profileManifest: profile.profileManifest,
+      linkPath,
+      targetRoot: plugin.targetRoot,
+      packageName: plugin.packageName,
+      packageVersion: plugin.packageVersion,
+      patchPath: plugin.patchPath,
+      resolvedEntry,
+    };
+  } catch { return { ok: false, code: 'CREW_PLUGIN_NOT_LOADABLE' }; }
+}
+
+export function ensureCrewPluginRegistration({ home = homedir(), root, name } = {}) {
+  return ensurePluginRegistration({ profileRoot: crewProfileDir({ home }), root, name });
+}
 
 /**
  * Remove one Crew plugin registration without invoking a package manager.
@@ -407,41 +418,41 @@ export function ensureCrewPluginRegistration({ home = homedir(), root, name } =
  * status/uninstall probe cannot touch the official web profile or download
  * anything merely to remove a stale registration.
  */
-export function removeCrewPluginRegistration({ home = homedir(), name, profileRoot = crewProfileDir({ home }) } = {}) {
-  if (!isSafePackageName(name)) {
-    return { ok: false, code: 'INVALID_CREW_PLUGIN_NAME' };
-  }
+export function removeCrewPluginRegistration({ home = homedir(), name, profileRoot = crewProfileDir({ home }) } = {}) {
+  if (!isSafePackageName(name)) {
+    return { ok: false, code: 'INVALID_CREW_PLUGIN_NAME' };
+  }
   const packageFile = join(profileRoot, 'package.json');
   if (!existsSync(packageFile)) return { ok: true, removed: false };
-  let pkg;
-  try { pkg = JSON.parse(readFileSync(packageFile, 'utf8')); } catch { return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' }; }
-  if (!isObject(pkg)
-    || (pkg.dependencies !== undefined && !isObject(pkg.dependencies))
-    || (pkg.dsh !== undefined && !isObject(pkg.dsh))
-    || (pkg.dsh?.profile !== undefined && !isObject(pkg.dsh.profile))
-    || (pkg.dsh?.profile?.bundles !== undefined
-      && (!Array.isArray(pkg.dsh.profile.bundles)
-        || pkg.dsh.profile.bundles.some((item) => !isSafePackageName(item))))) {
-    return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' };
-  }
-  const hadDependency = Boolean(pkg.dependencies?.[name]);
-  const bundles = Array.isArray(pkg.dsh?.profile?.bundles) ? pkg.dsh.profile.bundles : [];
+  let pkg;
+  try { pkg = JSON.parse(readFileSync(packageFile, 'utf8')); } catch { return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' }; }
+  if (!isObject(pkg)
+    || (pkg.dependencies !== undefined && !isObject(pkg.dependencies))
+    || (pkg.dsh !== undefined && !isObject(pkg.dsh))
+    || (pkg.dsh?.profile !== undefined && !isObject(pkg.dsh.profile))
+    || (pkg.dsh?.profile?.bundles !== undefined
+      && (!Array.isArray(pkg.dsh.profile.bundles)
+        || pkg.dsh.profile.bundles.some((item) => !isSafePackageName(item))))) {
+    return { ok: false, code: 'CREW_PROFILE_METADATA_INVALID' };
+  }
+  const hadDependency = Boolean(pkg.dependencies?.[name]);
+  const bundles = Array.isArray(pkg.dsh?.profile?.bundles) ? pkg.dsh.profile.bundles : [];
   const hadBundle = bundles.includes(name);
   if (!hadDependency && !hadBundle) return { ok: true, removed: false };
-  const linkPath = profileLinkPath(profileRoot, name);
-  let linkStat;
-  try { linkStat = lstatSync(linkPath); } catch { linkStat = null; }
-  if (linkStat && !linkStat.isSymbolicLink()) return { ok: false, code: 'CREW_PLUGIN_LINK_CONFLICT' };
-  const next = { ...pkg };
+  const linkPath = profileLinkPath(profileRoot, name);
+  let linkStat;
+  try { linkStat = lstatSync(linkPath); } catch { linkStat = null; }
+  if (linkStat && !linkStat.isSymbolicLink()) return { ok: false, code: 'CREW_PLUGIN_LINK_CONFLICT' };
+  const next = { ...pkg };
   if (hadDependency) {
     next.dependencies = { ...pkg.dependencies };
     delete next.dependencies[name];
     if (Object.keys(next.dependencies).length === 0) delete next.dependencies;
   }
-  if (hadBundle) {
-    next.dsh = { ...pkg.dsh, profile: { ...pkg.dsh.profile, bundles: bundles.filter((item) => item !== name) } };
-  }
-  writeFileSync(packageFile, JSON.stringify(next, null, 2) + '\n');
-  if (linkStat) unlinkSync(linkPath);
-  return { ok: true, removed: true };
-}
+  if (hadBundle) {
+    next.dsh = { ...pkg.dsh, profile: { ...pkg.dsh.profile, bundles: bundles.filter((item) => item !== name) } };
+  }
+  writeFileSync(packageFile, JSON.stringify(next, null, 2) + '\n');
+  if (linkStat) unlinkSync(linkPath);
+  return { ok: true, removed: true };
+}

package/src/install/npx-lifecycle.mjs

@@ -40,6 +40,11 @@ import { homedir } from 'node:os';
 import * as realInstaller from './install.mjs';
 import { crewProfileDir } from './install.mjs';
 import { ensureCrewDshRuntime, ensureCrewPluginRegistration, removeCrewPluginRegistration } from '../dsh-cli-runtime.mjs';
+import {
+  ensureOfficialWebIntegration,
+  officialWebIntegrationStatus,
+  removeOfficialWebIntegration,
+} from './official-web.mjs';
 
 export const CREW_APP_DIRNAME = 'app';
 export const RELEASES_DIRNAME = 'releases';
@@ -429,7 +434,11 @@ export function validateInstalledPayload(dir, { expectedName, expectedVersion, a
       }
     }
   }
-  for (const rel of ['cordis.patch.yml', 'src/server.mjs', 'src/hub/entry.mjs', 'lib/client.js', 'bin/dsh-crew.mjs']) {
+  for (const rel of [
+    'cordis.patch.yml', 'src/server.mjs', 'src/hub/entry.mjs', 'lib/client.js', 'bin/dsh-crew.mjs',
+    'official-web-bridge/package.json', 'official-web-bridge/cordis.patch.yml',
+    'official-web-bridge/entry.mjs', 'official-web-bridge/lib/client.js',
+  ]) {
     if (!existsSync(join(dir, rel))) errors.push(`payload artifact missing: ${rel}`);
   }
   if (!allowIncomplete && existsSync(join(dir, INCOMPLETE_MARKER))) errors.push('release is still marked incomplete');
@@ -553,9 +562,52 @@ async function activateRelease({ home, releaseDir, manifest, log, installer }) {
     return false;
   }
   log('✓ Claude Code integration');
+
+  const official = officialWebIntegrationStatus({ home });
+  if (official.enabled) {
+    const repaired = ensureOfficialWebIntegration({ home, releaseDir });
+    if (!repaired.ok) {
+      log(`✗ official 3080 bridge repair failed (${repaired.code ?? 'unknown'})`);
+      return false;
+    }
+    log('✓ official 3080 UI bridge → isolated Crew backend on 3210');
+  }
   return true;
 }
 
+export async function npxIntegrate({ home = homedir(), log = console.log } = {}) {
+  const pointer = readCurrentPointer({ home });
+  if (!pointer || !existsSync(pointer.path)) {
+    log('✗ install DSH Crew before enabling the official 3080 integration');
+    return { ok: false, error: 'DSH Crew is not installed' };
+  }
+  const validated = validateInstalledPayload(pointer.path, { expectedName: pointer.name, expectedVersion: pointer.version });
+  if (!validated.ok) {
+    log('✗ installed DSH Crew payload is damaged; run dsh-crew update first');
+    return { ok: false, error: 'installed payload invalid' };
+  }
+  const result = ensureOfficialWebIntegration({ home, releaseDir: pointer.path });
+  if (!result.ok) {
+    log(`✗ official 3080 integration failed (${result.code ?? 'unknown'})`);
+    return { ok: false, error: result.code ?? 'integration failed' };
+  }
+  log(result.changed
+    ? '✓ official 3080 UI connected to the isolated Crew backend on 3210'
+    : '- official 3080 UI integration already healthy');
+  log(`  backup: ${result.backupFile}`);
+  return { ok: true, changed: result.changed, backupFile: result.backupFile };
+}
+
+export async function npxDetach({ home = homedir(), log = console.log } = {}) {
+  const result = removeOfficialWebIntegration({ home });
+  if (!result.ok) {
+    log(`✗ official 3080 integration removal failed (${result.code ?? 'unknown'})`);
+    return { ok: false, error: result.code ?? 'detach failed' };
+  }
+  log(result.removed ? '✓ official 3080 bridge removed; isolated 3210 mode remains available' : '- official 3080 bridge already absent');
+  return { ok: true, removed: result.removed };
+}
+
 export async function npxInstall({
   home = homedir(),
   log = console.log,
@@ -895,6 +947,8 @@ export function npxStatus({
   const st = installer.installStatus ? installer.installStatus({ home }) : realInstaller.installStatus({ home });
   const codex = st?.codex?.installed ? 'installed' : 'not installed';
   const claude = st?.claude?.installed ? 'installed' : 'not installed';
+  const official = officialWebIntegrationStatus({ home, releaseDir: pointer?.path });
+  const officialWeb = !official.enabled ? 'disabled' : official.healthy ? 'installed' : 'needs repair';
 
   log(`DSH Crew launcher/candidate: ${candidateVersion ?? 'unknown'}`);
   log(`Installed DSH Crew payload: ${installedLine}`);
@@ -908,7 +962,8 @@ export function npxStatus({
       log(`  Refresh the launcher with: npm install -g ${UPDATE_PACKAGE_NAME}@${installedVersion}`);
     }
   }
-  log(`DSH plugin: ${dshPlugin} (dedicated dsh-crew profile; official web profile ignored)`);
+  log(`DSH plugin: ${dshPlugin} (dedicated dsh-crew profile on 3210)`);
+  log(`Official 3080 UI bridge: ${officialWeb}`);
   log(`Codex Desktop integration: ${codex}`);
   log(`Claude Code integration: ${claude}`);
 
@@ -918,6 +973,7 @@ export function npxStatus({
     installedVersion,
     installedPath: pointer?.path ?? null,
     dshPlugin,
+    officialWeb,
     codex,
     claude,
   };
@@ -944,6 +1000,10 @@ export async function npxUninstall({
   if (cl.ok !== false) log('✓ Claude Code integration removed');
   else fail('Claude Code integration removal failed');
 
+  const official = removeOfficialWebIntegration({ home, preserveIntent: !purge, remember: !purge });
+  if (!official.ok) fail(`official 3080 bridge removal failed (${official.code ?? 'unknown'})`);
+  else log(official.removed ? '✓ official 3080 bridge removed' : '- official 3080 bridge already absent');
+
   if (name) {
     const removed = removeCrewPluginRegistration({ home, name });
     if (!removed.ok) fail(`Harness registration removal failed (${removed.code ?? 'unknown'})`);
@@ -982,6 +1042,8 @@ export const USAGE = `usage: dsh-crew <command> [--purge] [--candidate <path>]
 
 Commands:
   install     persist the candidate package into Crew-owned state and register it
+  integrate   show Crew inside the official 3080 UI; backend stays isolated on 3210
+  detach      remove only the official 3080 bridge; isolated 3210 mode remains available
   status      read-only report of launcher/installed versions and integrations
   update      resolve the newest permitted package from the configured npm registry (or
               --candidate), stage and validate it, then activate; idempotent when current
@@ -1032,13 +1094,15 @@ export async function runNpxCli({
     error(USAGE);
     return 1;
   }
-  if (unknown.length > 0 || !['install', 'status', 'update', 'uninstall'].includes(command)) {
+  if (unknown.length > 0 || !['install', 'integrate', 'detach', 'status', 'update', 'uninstall'].includes(command)) {
     error(`unknown command: ${command ?? '<none>'}\n\n${USAGE}`);
     return 1;
   }
   try {
     const actions = {
       install: commands.install ?? npxInstall,
+      integrate: commands.integrate ?? npxIntegrate,
+      detach: commands.detach ?? npxDetach,
       status: commands.status ?? npxStatus,
       update: commands.update ?? npxUpdate,
       uninstall: commands.uninstall ?? npxUninstall,