@ran-sh/dsh-crew 1.0.2 → 1.1.0

package/src/install/official-web.mjs

@@ -1,16 +1,11 @@
 import {
-  copyFileSync,
   existsSync,
   lstatSync,
-  mkdirSync,
   readFileSync,
   realpathSync,
-  unlinkSync,
-  writeFileSync,
 } from 'node:fs';
 import { homedir } from 'node:os';
-import { dirname, join } from 'node:path';
-import { ensurePluginRegistration, removeCrewPluginRegistration } from '../dsh-cli-runtime.mjs';
+import { join } from 'node:path';
 
 export const OFFICIAL_BRIDGE_PACKAGE = '@ran-sh/dsh-crew-web-bridge';
 const STATE_FILENAME = 'official-web.json';
@@ -30,12 +25,6 @@ function readState(home) {
   } catch { return null; }
 }
 
-function writeState(home, value) {
-  const file = officialWebIntegrationStateFile({ home });
-  mkdirSync(dirname(file), { recursive: true });
-  writeFileSync(file, JSON.stringify(value, null, 2) + '\n');
-}
-
 function validOfficialManifest(file) {
   if (!existsSync(file)) return { ok: false, code: 'OFFICIAL_WEB_PROFILE_NOT_FOUND' };
   try {
@@ -50,83 +39,57 @@ function validOfficialManifest(file) {
   } catch { return { ok: false, code: 'OFFICIAL_WEB_PROFILE_INVALID' }; }
 }
 
-function makeBackup({ home, profileManifest, previous }) {
-  if (previous?.backup_file && existsSync(previous.backup_file)) return previous.backup_file;
-  const backupDir = join(home, '.config', 'dsh-crew', 'backups');
-  mkdirSync(backupDir, { recursive: true });
-  const backupFile = join(backupDir, `official-web-package-${Date.now()}.json`);
-  copyFileSync(profileManifest, backupFile);
-  return backupFile;
-}
+export const OFFICIAL_WEB_READ_ONLY_CODE = 'OFFICIAL_WEB_PROFILE_READ_ONLY';
 
+// The official ~/.dsh/profiles/web tree is a read-only boundary. Crew must
+// never install, update, register, unlink, repair, or mutate anything under
+// ~/.dsh; the isolated 3210 Crew backend is the only runtime Crew owns.
+// ensure/remove therefore fail closed instead of writing the official
+// profile. Status probing stays read-only.
 export function ensureOfficialWebIntegration({ home = homedir(), releaseDir } = {}) {
-  let resolvedRelease;
-  try { resolvedRelease = realpathSync(releaseDir); } catch { return { ok: false, code: 'RELEASE_NOT_FOUND' }; }
-  const bridgeRoot = join(resolvedRelease, 'official-web-bridge');
-  const profileRoot = officialWebProfileDir({ home });
-  const profileManifest = join(profileRoot, 'package.json');
-  const profile = validOfficialManifest(profileManifest);
-  if (!profile.ok) return profile;
-  const previous = readState(home);
-  const backupFile = makeBackup({ home, profileManifest, previous });
-  const registration = ensurePluginRegistration({
-    profileRoot,
-    root: bridgeRoot,
-    name: OFFICIAL_BRIDGE_PACKAGE,
-    createProfile: false,
-  });
-  if (!registration.ok) {
-    return { ok: false, code: registration.code === 'CREW_PROFILE_METADATA_INVALID' ? 'OFFICIAL_WEB_PROFILE_INVALID' : registration.code };
-  }
-  const stateChanged = previous?.enabled !== true || previous?.release_dir !== resolvedRelease || previous?.backup_file !== backupFile;
-  writeState(home, {
-    enabled: true,
-    release_dir: resolvedRelease,
-    backup_file: backupFile,
-    package: OFFICIAL_BRIDGE_PACKAGE,
-  });
-  return { ...registration, changed: registration.changed || stateChanged, backupFile };
+  return { ok: false, code: OFFICIAL_WEB_READ_ONLY_CODE };
 }
 
-export function officialWebIntegrationStatus({ home = homedir(), releaseDir } = {}) {
-  const state = readState(home);
-  if (state?.enabled !== true) return { enabled: false, healthy: false, state };
+// Project the legacy full-bridge state file. The old `enabled: true` shape
+// is DEPRECATED: dsh-crew no longer desires any control of the 3080 official
+// web profile (the native 3210 page is the full control plane, and the 3080
+// quick surface is optional). Status probing stays read-only; the projection
+// makes the legacy record diagnostic instead of an active intent.
+function projectLegacyState(state, home, releaseDir) {
+  if (!state || state?.enabled !== true) {
+    return { enabled: false, legacy_present: false, desired: false, healthy: false, state };
+  }
   const expectedRelease = releaseDir ?? state.release_dir;
   let expectedBridge;
   try { expectedBridge = realpathSync(join(expectedRelease, 'official-web-bridge')); } catch {
-    return { enabled: true, healthy: false, code: 'BRIDGE_RELEASE_MISSING', state };
+    return { enabled: false, legacy_present: true, desired: false, healthy: false, code: 'BRIDGE_RELEASE_MISSING', state };
   }
   const profileRoot = officialWebProfileDir({ home });
   const profile = validOfficialManifest(join(profileRoot, 'package.json'));
-  if (!profile.ok) return { enabled: true, healthy: false, code: profile.code, state };
+  if (!profile.ok) {
+    return { enabled: false, legacy_present: true, desired: false, healthy: false, code: profile.code, state };
+  }
   const dependency = profile.manifest.dependencies?.[OFFICIAL_BRIDGE_PACKAGE];
   const bundled = profile.manifest.dsh.profile.bundles.includes(OFFICIAL_BRIDGE_PACKAGE);
   const linkPath = join(profileRoot, 'node_modules', ...OFFICIAL_BRIDGE_PACKAGE.split('/'));
   let linked = false;
   try { linked = lstatSync(linkPath).isSymbolicLink() && realpathSync(linkPath) === expectedBridge; } catch {}
-  return { enabled: true, healthy: Boolean(dependency && bundled && linked), state, linkPath, expectedBridge };
+  return {
+    enabled: false,
+    legacy_present: true,
+    desired: false,
+    healthy: Boolean(dependency && bundled && linked),
+    removal_requires_manual_official_profile_action: true,
+    state,
+    linkPath,
+    expectedBridge,
+  };
+}
+
+export function officialWebIntegrationStatus({ home = homedir(), releaseDir } = {}) {
+  return projectLegacyState(readState(home), home, releaseDir);
 }
 
 export function removeOfficialWebIntegration({ home = homedir(), remember = true, preserveIntent = false } = {}) {
-  const profileRoot = officialWebProfileDir({ home });
-  const profileManifest = join(profileRoot, 'package.json');
-  const profile = validOfficialManifest(profileManifest);
-  if (!profile.ok && profile.code !== 'OFFICIAL_WEB_PROFILE_NOT_FOUND') return profile;
-  let removed = false;
-  if (profile.ok) {
-    const result = removeCrewPluginRegistration({ home, name: OFFICIAL_BRIDGE_PACKAGE, profileRoot });
-    if (!result.ok) return { ok: false, code: result.code === 'CREW_PROFILE_METADATA_INVALID' ? 'OFFICIAL_WEB_PROFILE_INVALID' : result.code };
-    removed = result.removed;
-  }
-  const previous = readState(home);
-  if (remember) writeState(home, {
-    ...(previous ?? {}),
-    enabled: preserveIntent ? previous?.enabled === true : false,
-    package: OFFICIAL_BRIDGE_PACKAGE,
-  });
-  else {
-    const stateFile = officialWebIntegrationStateFile({ home });
-    if (existsSync(stateFile)) unlinkSync(stateFile);
-  }
-  return { ok: true, removed };
+  return { ok: false, code: OFFICIAL_WEB_READ_ONLY_CODE };
 }

package/src/jobs.mjs

@@ -1,6 +1,12 @@
 // Job manager: each job runs one dsh-jsonrpc-agent runtime via the DSH SDK.
 // Progress derived from session.event notifications; status mirrored to a
 // JSON file so the Claude Code statusline (and anything else) can render it.
+//
+// alpha.5 SDK surface: DeepSeekHarness takes HarnessClientOptions at the top
+// level (no `launch` wrapper). The SDK resolves the installed same-version
+// dsh CLI itself and enforces the same-version manifest check, so dsh-crew
+// never passes an explicit dshBin that would bypass it. The worker rides the
+// `sdk-minimal` profile with the Crew overlay applied as a --patch.
 
 import { DeepSeekHarness } from '@deepseek-ai/dsh-sdk-client';
 import { readFileSync, mkdirSync, existsSync } from 'node:fs';
@@ -8,7 +14,6 @@ import { createShardWriter } from './status-shard.mjs';
 import { fileURLToPath } from 'node:url';
 import { dirname, join, resolve } from 'node:path';
 import { homedir } from 'node:os';
-import { createRequire } from 'node:module';
 import { appendDeliveryInstructions, parseDeliveryReport, formatDeliveryMetadata } from './delivery.mjs';
 import { captureWorkspaceBaseline, captureWorkspaceDiff, NOT_A_GIT_REPOSITORY } from './workspace-audit.mjs';
 import { buildOutcome, JOB_PHASES } from './workflow.mjs';
@@ -17,19 +22,10 @@ import { buildDirectSelectionTrace } from './model-routing.mjs';
 
 const ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '..');
 const CONFIG_DIR = join(homedir(), '.config', 'dsh-crew');
+const CREW_DSH_HOME = join(homedir(), '.config', 'dsh-crew', 'harness');
 const STATUS_FILE = join(CONFIG_DIR, 'status.json');
 const CORDIS = join(ROOT, 'worker.cordis.yml');
 
-// The worker agent entry. The pnpm .bin shim on Windows is a POSIX shell
-// script that Node spawn cannot execute (ENOENT), so we always launch
-// `node <lib/bin.js> <cordis>` via process.execPath — cross-platform.
-const requireAgents = createRequire(import.meta.url);
-let AGENT_JS = null;
-for (const spec of ['@deepseek-ai/dsh-sdk-jsonrpc-demo/bin', '@deepseek-ai/dsh-sdk-jsonrpc-demo/lib/bin.js']) {
-  try { AGENT_JS = requireAgents.resolve(spec); break; } catch {}
-}
-if (!AGENT_JS) AGENT_JS = join(ROOT, 'node_modules', '@deepseek-ai', 'dsh-sdk-jsonrpc-demo', 'lib', 'bin.js');
-
 export const TIERS = {
   flash: { model: 'deepseek-v4-flash', label: 'V4 Flash' },
   pro: { model: 'deepseek-v4-pro', label: 'V4 Pro' },
@@ -115,7 +111,7 @@ export function startJob({
   if (!tierInfo) throw new Error(`unknown tier "${tier}" (expected: ${Object.keys(TIERS).join(', ')})`);
   if (!ROLES[role]) throw new Error(`unknown role "${role}" (expected: ${Object.keys(ROLES).join(', ')})`);
   if (!['off', 'high', 'max'].includes(effort)) throw new Error(`unknown effort "${effort}" (expected: off, high, max)`);
-  if (!existsSync(AGENT_JS)) throw new Error(`dsh-jsonrpc-agent not installed at ${AGENT_JS}; run pnpm install in ${ROOT}`);
+  if (!existsSync(CORDIS)) throw new Error(`worker overlay not found at ${CORDIS}`);
   const workspace = resolve(cwd ?? process.cwd());
   // The worker always gets the auditable Delivery Contract appended (unless it
   // already carries one), so its final message follows ## Diff / ## Tests /
@@ -128,22 +124,22 @@ export function startJob({
   }
 
   const harness = new DeepSeekHarness({
-    launch: {
-      command: process.execPath,
-      args: [AGENT_JS, CORDIS],
-      cwd: workspace,
-      env: {
-        ...process.env,
-        ...dotEnv,
-        DSH_CWD: workspace,
-        DSH_SESSION_ROOT: join(CONFIG_DIR, 'sessions'),
-        DSH_REASONING_EFFORT: effort,
-      },
-      requestTimeoutMs: timeoutMs,
+    profile: 'sdk-minimal',
+    patches: [CORDIS],
+    dshHome: CREW_DSH_HOME,
+    processCwd: workspace,
+    env: {
+      ...process.env,
+      ...dotEnv,
+      DSH_CWD: workspace,
+      DSH_SESSION_ROOT: join(CONFIG_DIR, 'sessions'),
+      DSH_REASONING_EFFORT: effort,
     },
+    requestTimeoutMs: timeoutMs,
     cwd: workspace,
     provider: 'deepseek-official',
     model: tierInfo.model,
+    reasoningEffort: effort,
     maxTokens,
   });
 

package/src/model-catalog.mjs

@@ -20,7 +20,14 @@ function catalogError() {
 function normalizeProvider(raw) {
   if (!raw || typeof raw.id !== 'string' || raw.id.trim() === '') return null;
   const id = raw.id.trim();
-  return { id, name: typeof raw.name === 'string' && raw.name.trim() ? raw.name.trim() : id };
+  const adapterOwned = typeof raw.adapter_owned === 'boolean'
+    ? raw.adapter_owned
+    : typeof raw.adapterOwned === 'boolean' ? raw.adapterOwned : undefined;
+  return {
+    id,
+    name: typeof raw.name === 'string' && raw.name.trim() ? raw.name.trim() : id,
+    ...(adapterOwned === undefined ? {} : { adapter_owned: adapterOwned }),
+  };
 }
 
 function normalizeModels(raw, provider) {