@ran-sh/dsh-crew 2.1.8 → 2.2.1

package/.claude-plugin/plugin.json

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

package/docs/job-contracts.md

@@ -8,7 +8,7 @@ back to the caller.
 
 ```text
 caller objective
-  -> Worker in isolated workspace
+  -> Worker in the project's stable worker workspace (or a caller-named one)
   -> structured outcome + candidate reference
   -> optional Reviewer inspects the workspace directly
   -> compact Result Contract + canonical job events
@@ -22,6 +22,10 @@ changes/tests/risks, changed-file names, base revision, and candidate
 fingerprint. It opens the relevant files and runs `git diff` in the isolated
 workspace when deeper inspection is needed.
 
+The workspace a job ran in is grouped by directory, not created per job: a
+reviewer reviewing in place runs in the worker's workspace, and only an explicit
+reviewer gets `dsh-crew-review`. See the isolation note above.
+
 The capsule also carries a pointer to the reviewed attempt's persisted execution
 record — the Hub session id plus the Crew harness session store — because a
 transient change leaves nothing in the workspace to inspect once it has been
@@ -95,6 +99,15 @@ Per-job precedence is request `constraints` > Profile > session defaults.
 `auto`, `existing`, or `none`. Workspace preflight reports `READY`, `CONFLICT`,
 `READ_ONLY`, or `UNAVAILABLE` before dispatch.
 
+With the default isolation a job runs in its project's stable workspace —
+`dsh-crew-worker`, or `dsh-crew-review` for an explicit reviewer — rather than a
+tree of its own, which is what keeps the Harness session panel at two entries per
+project. The workspace is reset to the job's base revision before it runs, so the
+candidate is still that job's work alone, and it is held for the job's duration: a
+second job finds it held and is refused with `WORKSPACE_BUSY` instead of sharing a
+tree with the first. `none` (shared) keeps the caller's directory and takes no
+lock.
+
 `constraints.allow_no_changes: true` is for tasks explicitly expected to leave
 no net workspace changes, including read-only search/inspection and bounded
 temporary smoke work. It does not blindly convert a partial Delivery Report

package/docs/readiness-matrix.md

@@ -39,13 +39,32 @@ rows remain `NOT_RUN` until a trusted higher layer supplies explicit evidence.
 - `provider_health`
 - `reviewer_health`
 - `model_execution`
+- `worker_primary_callable`
+- `worker_escalation_callable`
+- `reviewer_primary_callable`
+- `provider_lifecycle_consistent`
 - `deepseek_flash`
 - `deepseek_pro`
-- `opencode_go_mimo_qwen`
 - `reviewer_pipeline`
 - `cancellation_timeout_escalation`
 - `standalone_official`
 
+This list is the one the code builds; it had drifted, listing a row that was
+removed and omitting four that exist.
+
+Coverage of a provider is not a row per provider. `deepseek_flash` and
+`deepseek_pro` are the exception: they name DeepSeek Official because that
+provider has its own slots, and a machine running its workers elsewhere has no
+such execution to show — the row says so rather than borrowing another
+provider's. Everything else that answers "can this machine's configured route
+actually run" — `provider_health`, `reviewer_health`, `model_execution`,
+`worker_primary_callable`, `reviewer_primary_callable`, `reviewer_pipeline` — is
+filtered to whatever route is currently selected, so an operator on other
+providers is covered by those and loses nothing by the two DeepSeek rows
+reading `NOT_RUN`. A static row per provider was tried and replaced by these
+dynamic signals; `opencode_go_mimo_qwen` was that attempt's last trace in this
+document.
+
 `provider_health` and `reviewer_health` describe only the currently resolved
 Worker and Reviewer routes. A fresh negative observation overrides historical
 success; unrelated providers and stale observations do not. Historical jobs

package/lib/client.js

@@ -570,8 +570,8 @@ const copy = {
 		delete: "删除（不可恢复）",
 		scope: "范围",
 		all: "全部（含你自己的会话）",
-		crew: "仅 Crew 创建（推荐）",
-		worktree: "仅 Crew 工作树",
+		crew: "仅 Crew 创建",
+		worktree: "仅 Crew 工作区（推荐）",
 		before: "指定时间之前",
 		time: "创建时间早于",
 		timeHint: "按本机时区选择，严格按创建时间筛选；包含新会话的工作区会保留。",
@@ -612,8 +612,8 @@ const copy = {
 		delete: "Delete (permanent)",
 		scope: "Scope",
 		all: "Everything (includes your own sessions)",
-		crew: "Crew-created only (recommended)",
-		worktree: "Crew worktrees only",
+		crew: "Crew-created only",
+		worktree: "Crew workspaces only (recommended)",
 		before: "Before a date",
 		time: "Created before",
 		timeHint: "Local timezone; strict creation-time cutoff. Workspaces with newer sessions are kept.",
@@ -651,7 +651,8 @@ function HistoryPanel({ locale }) {
 	const t = copy[locale === "zh" ? "zh" : "en"];
 	const [open, setOpen] = (0, react.useState)(false);
 	const [operation, setOperation] = (0, react.useState)("archive");
-	const [scope, setScope] = (0, react.useState)("crew");
+	const [scope, setScope] = (0, react.useState)("worktree");
+	const timeScoped = scope === "before" || scope === "worktree";
 	const [before, setBefore] = (0, react.useState)("");
 	const [preview, setPreview] = (0, react.useState)(null);
 	const [status, setStatus] = (0, react.useState)({ phase: "IDLE" });
@@ -816,7 +817,7 @@ function HistoryPanel({ locale }) {
 						})
 					] })]
 				}),
-				scope === "before" && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [
+				timeScoped && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [
 					t.time,
 					" ",
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
@@ -840,11 +841,11 @@ function HistoryPanel({ locale }) {
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 					type: "button",
 					style,
-					disabled: locked || !connected || scope === "before" && !Number.isFinite(new Date(before).getTime()),
+					disabled: locked || !connected || timeScoped && before !== "" && !Number.isFinite(new Date(before).getTime()) || scope === "before" && before === "",
 					onClick: () => void act("preview", {
 						operation,
 						scope,
-						...scope === "before" ? { before: new Date(before).toISOString() } : {}
+						...timeScoped && before !== "" ? { before: new Date(before).toISOString() } : {}
 					}),
 					children: t.preview
 				}),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ran-sh/dsh-crew",
-  "version": "2.1.8",
+  "version": "2.2.1",
   "type": "module",
   "main": "./src/hub/entry.mjs",
   "bin": {

package/scripts/setup.mjs

@@ -16,7 +16,6 @@ import {
   ensureCrewDshRuntime,
   ensureCrewPluginRegistration,
   resolveDshCli,
-  runResolvedDsh,
   describeDshCli,
   removeCrewPluginRegistration,
   TARGET_DSH_VERSION,
@@ -81,11 +80,12 @@ function run(cmd, args, opts = {}) {
  * may use `npx -y` to fetch DSH, while status/uninstall probes never trigger a
  * network download merely by checking availability.
  *
- * The returned descriptor is the CLI base only; every invocation is built by
- * `runDsh` with the dedicated dsh-crew profile and the Crew DSH_HOME in the
- * child process environment. The official ``web`` profile is never a target.
+ * The returned descriptor is the CLI base only, reported to the operator as
+ * `description`; the dedicated dsh-crew profile and the Crew-owned DSH_HOME
+ * are supplied by the install flow. The official ``web`` profile is never a
+ * target.
  */
-export function detectDsh({ allowDownload = false, home = homedir(), includeCompatibility = true } = {}) {
+function detectDsh({ allowDownload = false, home = homedir(), includeCompatibility = true } = {}) {
   const resolved = resolveDshCli({
     home,
     allowDownload,
@@ -95,18 +95,6 @@ export function detectDsh({ allowDownload = false, home = homedir(), includeComp
   return { ...resolved, cli: resolved.command, description: describeDshCli(resolved) };
 }
 
-/**
- * Run a DSH plugin command against the dedicated Crew profile under the
- * Crew-owned DSH_HOME. `home` is the "user home" base used to derive that
- * isolated home, so tests can point it at a disposable root.
- */
-export function runDsh(dsh, args, { home = homedir() } = {}) {
-  const resolved = dsh?.command
-    ? dsh
-    : { kind: dsh?.kind ?? 'legacy', command: dsh?.cli ?? dsh, args: [] };
-  return runResolvedDsh(resolved, ['plugin', '--profile', CREW_PROFILE_NAME, ...args], { home });
-}
-
 export function readPackageName(root = ROOT) {
   try { return JSON.parse(readFileSync(join(root, 'package.json'), 'utf8')).name; } catch { return null; }
 }
@@ -117,20 +105,11 @@ export function checkRoot(root = ROOT) {
     && existsSync(join(root, 'cordis.patch.yml'));
 }
 
-export function depsPresent(root = ROOT) {
+function depsPresent(root = ROOT) {
   return existsSync(join(root, 'node_modules', '@modelcontextprotocol', 'sdk'))
     && existsSync(join(root, 'node_modules', '.bin', 'tsdown'));
 }
 
-export function profileHasPackage(home, name, profileRoot = crewProfileDir({ home })) {
-  const pkgFile = join(profileRoot, 'package.json');
-  if (!existsSync(pkgFile)) return false;
-  try {
-    const pkg = JSON.parse(readFileSync(pkgFile, 'utf8'));
-    return Boolean(pkg.dependencies?.[name]) || Boolean((pkg.dsh?.profile?.bundles ?? []).includes(name));
-  } catch { return false; }
-}
-
 function mark(log, ok, text) {
   log(`${ok ? '✓' : '✗'} ${text}`);
   return ok;

package/scripts/verify-npm-install.mjs

@@ -24,7 +24,7 @@ const DSH_PACKAGE = '@deepseek-ai/dsh';
 const DSH_PREFIX = '@deepseek-ai/dsh-';
 const MAX_DIRECT_PEERS = 64;
 
-export function resolveNpmInvocation({
+function resolveNpmInvocation({
   platform = process.platform,
   nodePath = process.execPath,
   fileExists = existsSync,
@@ -144,7 +144,7 @@ function manifestUrl(registryUrl, name, version) {
   return `${registryUrl.replace(/\/+$/, '')}/${encodedName}/${encodeURIComponent(version)}`;
 }
 
-export async function fetchPublicManifest(name, version, {
+async function fetchPublicManifest(name, version, {
   registryUrl = registry,
   fetchImpl = globalThis.fetch,
 } = {}) {

package/skills/dsh-crew/SKILL.md

@@ -90,20 +90,23 @@ review asks for changes, that is a task result to act on — not approval.
   auditable evidence, and a reply with neither a change nor a verified check is
   incomplete. That is the gate working, not the worker failing. A task that
   changes nothing *on purpose* can pass — see the next entry.
-- **A job is named `Crew_<date>_<time>_<purpose>`.** The worktree directory, the
-  session the Harness lists in its workspace panel, and the name in a status
-  payload all use that one string, so a conversation can be matched to a
-  directory by eye. The purpose is the role: `worker` or `reviewer`.
+- **A project has two workspaces, and a job is named `Crew_<date>_<time>_<purpose>`.**
+  Worker jobs and the review that follows one run in `dsh-crew-worker`; an
+  explicit reviewer runs in `dsh-crew-review`. The Harness groups sessions by the
+  directory a job ran in, so those two are what an operator sees in the panel,
+  however many jobs have run. The job's own name still distinguishes it inside
+  the group.
 - **A verified zero-change task needs `constraints.allow_no_changes: true`.**
   For a deliberately temporary job — create, verify, clean up, end with an empty
   diff — that flag plus the reported checks is what certifies it. It requires a
   clean, readable baseline, at least one `PASS` and no `FAIL`, and it relaxes
   nothing else: no evidence, a failed check, a dirty baseline or an actual change
   each still refuse.
-- **Isolated workspaces need git.** The default `worktree` isolation fails with
+- **Isolated workspaces need git.** The default isolation fails with
   `NOT_GIT_REPOSITORY` for a non-git workspace rather than silently sharing the
-  tree. Use `shared` deliberately if that is what you want; `allow_no_changes`
-  works in either.
+  tree; a directory already sitting at the workspace path that Crew did not
+  create fails with `WORKSPACE_CONFLICT` instead of being deleted. Use `shared`
+  deliberately if that is what you want; `allow_no_changes` works in either.
 - **A repository with no commits cannot be isolated.** `git init` with nothing
   committed reports `REPOSITORY_HAS_NO_COMMITS` — there is no revision to start
   from. Commit once, or run that job with `shared`.
@@ -140,11 +143,13 @@ unrestricted. Defaults mirror DeepSeek's published peak hours.
 
 ## Work
 
-`isolation: worktree` is the default: a coding worker runs in a per-job git
-worktree and the primary tree is untouched. Non-git workspaces fail with
-`NOT_GIT_REPOSITORY` rather than silently sharing the tree; use `shared`
-explicitly if that is what you want. Concurrent jobs are capped by
-`max_parallel`.
+The default isolation gives a coding worker a git worktree of its own project,
+and the primary tree is untouched. That worktree is the project's stable worker
+or reviewer workspace, reset to the job's base revision before it runs, so the
+candidate diff is that job's work alone. One job at a time runs in each — a
+second finds the workspace held and is refused with `WORKSPACE_BUSY` rather than
+sharing it, because two jobs in one tree would each see the other's edits. So
+concurrency is bounded by workspaces even where `max_parallel` is higher.
 
 The reviewer gate is `required` by default: an unreviewed change fails. Review
 findings and failing tests are results to address, never a reason to bypass the
@@ -153,9 +158,13 @@ gate.
 ## History
 
 Session storage is shared between 3080 and 3210 — clearing one clears both.
-Cleanup is scoped by provenance, and the default scope is **Crew-created only**,
-so the operator's own conversations survive. `all` removes theirs too; use it
-deliberately. Archived batches are restorable from the panel.
+The default scope is **Crew's own workspaces**: sessions Crew recorded creating
+that ran in `dsh-crew-worker`, `dsh-crew-review`, or a per-job worktree an
+earlier release left behind. The operator's own conversations survive, and so
+does anything Crew ran in a directory that is not one of its workspaces.
+`all` removes theirs too; use it deliberately. The panel's date field narrows
+any scope to sessions created before it, and workspaces with newer sessions are
+kept. Archived batches are restorable from the panel.
 
 ## When Crew is unavailable
 

package/src/adaptive-routing.mjs

@@ -5,8 +5,8 @@
 // caller may record only outcomes Crew already observed, and routing decisions
 // expose bounded evidence suitable for model-selection trace metadata.
 
-export const ADAPTIVE_ROUTING_VERSION = 1;
-export const ADAPTIVE_ROUTING_DEFAULTS = Object.freeze({
+const ADAPTIVE_ROUTING_VERSION = 1;
+const ADAPTIVE_ROUTING_DEFAULTS = Object.freeze({
   enabled: false,
   window_size: 8,
   min_samples: 2,

package/src/ci-evidence.mjs

@@ -29,7 +29,7 @@
 // one; nothing here reads credentials from disk, and the value is never logged,
 // returned, or included in an evidence record.
 
-export const CI_EVIDENCE_REPO = 'Ran-sh/dsh-crew';
+const CI_EVIDENCE_REPO = 'Ran-sh/dsh-crew';
 
 // The row each CI job validates. A platform with no job in the workflow cannot
 // be evidenced by any run, so `macos_smoke` is deliberately absent rather than

package/src/client/history-panel.tsx

@@ -5,7 +5,7 @@ const pending = (phase?: string) => !!phase && !['IDLE', 'DONE', 'FAILED', 'ROLL
 const copy = {
   zh: {
     title: '工作区与会话清理', intro: '仅影响 3210 的工作区记录与会话日志；不删除项目文件、附件或 3080 数据。',
-    operation: '操作', archive: '归档（可恢复）', delete: '删除（不可恢复）', scope: '范围', all: '全部（含你自己的会话）', crew: '仅 Crew 创建（推荐）', worktree: '仅 Crew 工作树', before: '指定时间之前',
+    operation: '操作', archive: '归档（可恢复）', delete: '删除（不可恢复）', scope: '范围', all: '全部（含你自己的会话）', crew: '仅 Crew 创建', worktree: '仅 Crew 工作区（推荐）', before: '指定时间之前',
     time: '创建时间早于', timeHint: '按本机时区选择，严格按创建时间筛选；包含新会话的工作区会保留。',
     preview: '预览清理范围', confirm: '确认执行', acknowledgement: '删除确认：请输入 DELETE', idle: '会短暂停止并重启 3210；请先结束或关闭所有正在使用的 3210 会话。',
     consent: '我已确认范围，并同意短暂重启 3210', restore: '恢复', archives: '已归档批次', empty: '暂无可恢复的归档',
@@ -17,7 +17,7 @@ const copy = {
   },
   en: {
     title: 'Workspace & session cleanup', intro: 'Only 3210 workspace records and session logs. Project files, attachments and 3080 data are untouched.',
-    operation: 'Action', archive: 'Archive (restorable)', delete: 'Delete (permanent)', scope: 'Scope', all: 'Everything (includes your own sessions)', crew: 'Crew-created only (recommended)', worktree: 'Crew worktrees only', before: 'Before a date',
+    operation: 'Action', archive: 'Archive (restorable)', delete: 'Delete (permanent)', scope: 'Scope', all: 'Everything (includes your own sessions)', crew: 'Crew-created only', worktree: 'Crew workspaces only (recommended)', before: 'Before a date',
     time: 'Created before', timeHint: 'Local timezone; strict creation-time cutoff. Workspaces with newer sessions are kept.',
     preview: 'Preview cleanup', confirm: 'Confirm operation', acknowledgement: 'Type DELETE to confirm deletion', idle: '3210 will briefly stop and restart. End or close all active 3210 conversations first.',
     consent: 'I reviewed the scope and agree to restart 3210', restore: 'Restore', archives: 'Archived batches', empty: 'No restorable archives',
@@ -33,7 +33,8 @@ export function HistoryPanel({ locale }: { locale: string }) {
   const t = copy[locale === 'zh' ? 'zh' : 'en'];
   const [open, setOpen] = useState(false);
   const [operation, setOperation] = useState('archive');
-  const [scope, setScope] = useState('crew');
+  const [scope, setScope] = useState('worktree');
+  const timeScoped = scope === 'before' || scope === 'worktree';
   const [before, setBefore] = useState('');
   const [preview, setPreview] = useState<any>(null);
   const [status, setStatus] = useState<any>({ phase: 'IDLE' });
@@ -83,9 +84,9 @@ export function HistoryPanel({ locale }: { locale: string }) {
         <label>{t.operation} <select style={style} value={operation} disabled={locked} onChange={e => { setOperation(e.target.value); invalidate(); }}><option value="archive">{t.archive}</option><option value="delete">{t.delete}</option></select></label>
         <label>{t.scope} <select style={style} value={scope} disabled={locked} onChange={e => { setScope(e.target.value); invalidate(); }}><option value="crew">{t.crew}</option><option value="worktree">{t.worktree}</option><option value="all">{t.all}</option><option value="before">{t.before}</option></select></label>
       </div>
-      {scope === 'before' && <label>{t.time} <input type="datetime-local" style={style} value={before} disabled={locked} onChange={e => { setBefore(e.target.value); invalidate(); }} /></label>}
+      {timeScoped && <label>{t.time} <input type="datetime-local" style={style} value={before} disabled={locked} onChange={e => { setBefore(e.target.value); invalidate(); }} /></label>}
       <div style={{ fontSize: 11.5, opacity: .7 }}>{t.timeHint}</div>
-      <button type="button" style={style} disabled={locked || !connected || (scope === 'before' && !Number.isFinite(new Date(before).getTime()))} onClick={() => void act('preview', { operation, scope, ...(scope === 'before' ? { before: new Date(before).toISOString() } : {}) })}>{t.preview}</button>
+      <button type="button" style={style} disabled={locked || !connected || (timeScoped && before !== '' && !Number.isFinite(new Date(before).getTime())) || (scope === 'before' && before === '')} onClick={() => void act('preview', { operation, scope, ...(timeScoped && before !== '' ? { before: new Date(before).toISOString() } : {}) })}>{t.preview}</button>
       {preview && <div style={{ ...style, display: 'flex', flexDirection: 'column', gap: 9 }}>
         <strong>{t.count(preview.counts.workspaces, preview.counts.sessions)}</strong>
         {preview.before && <span>{t.time}: {new Date(preview.before).toLocaleString()}</span>}

package/src/client/quick-panel.tsx

@@ -9,7 +9,6 @@ import { PanelHeader, PanelStyles } from './panel-chrome';
 // (/_dsh/dsh-crew/quick-config, /quick-status). Runtime maintenance stays on 3210.
 
 const API = '/_dsh/dsh-crew';
-const CREW_CONTROL_PLANE_URL = 'http://127.0.0.1:3210/';
 const FULL = 'http://127.0.0.1:3210/';
 
 type ModelEntry = { provider: string; model: string };

package/src/credential-lifecycle.mjs

@@ -4,9 +4,6 @@
 
 import { createHash, randomUUID } from 'node:crypto';
 
-export const CREDENTIAL_PURGE_STATES = Object.freeze([
-  'PLANNED', 'REFERENCE_RECHECKED', 'PURGE_PENDING_CONFIRMATION', 'PURGED', 'VERIFIED', 'FAILED',
-]);
 const ID_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,191}$/;
 const REVISION_PATTERN = /^[a-f0-9]{64}$/;
 

package/src/credential-purge-state.mjs

@@ -36,7 +36,7 @@ export function markCredentialPurged(input, plan) {
   };
 }
 
-export function markCredentialPurgeUnverified(input, plan) {
+function markCredentialPurgeUnverified(input, plan) {
   const state = normalizeCredentialPurgeState(input);
   if (!validId(plan?.reference_id) || !validId(plan?.plan_id)) return state;
   const purged = { ...state.purged };
@@ -53,7 +53,3 @@ export function recordCredentialPurgeOutcome(input, plan, result) {
   if (result?.state === 'PURGED') return markCredentialPurgeUnverified(input, plan);
   return normalizeCredentialPurgeState(input);
 }
-
-export function isCredentialPurged(input, referenceId) {
-  return Object.prototype.hasOwnProperty.call(normalizeCredentialPurgeState(input).purged, referenceId);
-}

package/src/credential-reference.mjs

@@ -28,11 +28,3 @@ export function classifyCredentialReference(value, { kind = 'env' } = {}) {
     : HANDLE_REFERENCE.test(raw) && !SECRET_LIKE.test(raw) && !EMBEDDED_SECRET.test(raw);
   return { present: true, value: valid ? raw : null, redacted: !valid };
 }
-
-export function sanitizeCredentialReference(value, options = {}) {
-  return classifyCredentialReference(value, options).value;
-}
-
-export function hasCredentialReference(value, options = {}) {
-  return classifyCredentialReference(value, options).present;
-}

package/src/crew-workspaces.mjs

@@ -0,0 +1,136 @@
+// The two stable workspaces a Crew job runs in, one pair per project.
+//
+// Every job used to get its own git worktree named `Crew_<date>_<time>_<role>`,
+// so the Harness — which groups sessions by the job's cwd, and matches the
+// workspace exactly (`resolveByPath`, never a parent directory) — grew a new
+// workspace entry for every job an operator ran. A pair that is created once and
+// reused means the session list stops growing: a worker job and its automatic
+// review both run in `dsh-crew-worker` (the reviewer has to see the tree the
+// worker produced), and an explicit reviewer dispatch runs in `dsh-crew-review`.
+//
+// Two cwds per project, never shared between projects: a worktree belongs to one
+// repository, so the pair is namespaced under a key derived from the repository
+// path.
+//
+// Because the workspace outlives the job, two jobs sharing it would corrupt each
+// other's evidence — see `workspace-lock.mjs`, which this takes for the whole
+// job, and the reset below, which is what keeps a job from inheriting the last
+// one's work.
+
+import { existsSync } from 'node:fs';
+import { createHash } from 'node:crypto';
+import { basename, join, resolve, sep } from 'node:path';
+
+import {
+  createWorktreeAt,
+  crewOwnsWorktree,
+  defaultWorktreeRoot,
+  inspectRepository,
+  resetWorktreeTo,
+} from './workspace-isolation.mjs';
+import { acquireWorkspaceLock, DEFAULT_LOCK_WAIT_MS } from './workspace-lock.mjs';
+
+export const CREW_WORKSPACE_WORKER = 'dsh-crew-worker';
+export const CREW_WORKSPACE_REVIEW = 'dsh-crew-review';
+const CREW_WORKSPACE_NAMES = Object.freeze([CREW_WORKSPACE_WORKER, CREW_WORKSPACE_REVIEW]);
+export const WORKSPACE_CONFLICT = 'WORKSPACE_CONFLICT';
+
+/** The workspace a role runs in. Only the reviewer is separated out. */
+export function crewWorkspaceName(role) {
+  return role === 'reviewer' || role === 'review' ? CREW_WORKSPACE_REVIEW : CREW_WORKSPACE_WORKER;
+}
+
+/** Is this directory name one of the two stable workspaces? */
+export function isCrewWorkspaceName(name) {
+  return CREW_WORKSPACE_NAMES.includes(String(name ?? ''));
+}
+
+/**
+ * A stable, filesystem-safe key for a repository.
+ *
+ * Two projects' `dsh-crew-worker` directories must not collide, and the human
+ * part is kept because the key is visible in the session path: the directory
+ * name plus eight hex characters of the resolved path, the same shape the legacy
+ * worktree names used.
+ */
+export function crewProjectKey(repoRoot) {
+  const identity = resolve(String(repoRoot ?? '')).split(sep).join('/');
+  const normalized = process.platform === 'win32' ? identity.toLowerCase() : identity;
+  const safe = basename(identity).replace(/[^A-Za-z0-9]+/g, '-').slice(0, 32).replace(/^-+|-+$/g, '') || 'project';
+  const digest = createHash('sha256').update(normalized).digest('hex').slice(0, 8);
+  return `dsh-crew-${safe}-${digest}`;
+}
+
+/** `<worktreeRoot>/<projectKey>/<name>` — where this project's pair lives. */
+export function crewWorkspacePath({ repoRoot, role, root = defaultWorktreeRoot() } = {}) {
+  return join(resolve(root), crewProjectKey(repoRoot), crewWorkspaceName(role));
+}
+
+/** The lock for a workspace lives beside the pair, never inside the tree. */
+export function crewWorkspaceLockPath({ repoRoot, role, root = defaultWorktreeRoot() } = {}) {
+  return join(resolve(root), crewProjectKey(repoRoot), '.locks', `${crewWorkspaceName(role)}.lock`);
+}
+
+/**
+ * The workspace this job should run in, held for the job's duration.
+ *
+ * Creates the pair member on first use and adopts it afterwards; the adopted
+ * tree is reset to the job's base revision so the candidate diff is this job's
+ * work alone, exactly as a fresh worktree gave it. Returns a `release` that
+ * drops the lock but leaves the directory — the next job reuses it.
+ */
+export async function ensureCrewWorkspace({
+  cwd,
+  role,
+  baseRevision,
+  at,
+  root = defaultWorktreeRoot(),
+  git,
+  lockWaitMs = DEFAULT_LOCK_WAIT_MS,
+  now,
+  sleep,
+  isAlive,
+  pid,
+} = {}) {
+  const repo = await inspectRepository({ cwd, git });
+  if (!repo.ok) return { ok: false, reason: repo.reason, error: repo.error };
+  const repoRoot = repo.repoRoot;
+  const revision = baseRevision ?? repo.baseRevision;
+  const name = crewWorkspaceName(role);
+  const worktreePath = crewWorkspacePath({ repoRoot, role, root });
+  const lockPath = crewWorkspaceLockPath({ repoRoot, role, root });
+
+  const lock = await acquireWorkspaceLock({ lockPath, purpose: name, waitMs: lockWaitMs, now, sleep, isAlive, pid });
+  if (!lock.ok) return { ok: false, reason: lock.reason, error: lock.error, holder: lock.holder ?? null };
+  const release = lock.release;
+
+  const fail = (reason, error) => {
+    release();
+    return { ok: false, reason, error };
+  };
+
+  const reused = await crewOwnsWorktree({ worktreePath, repoRoot, git });
+  if (!reused) {
+    if (existsSync(worktreePath)) {
+      // Something is there that Crew did not create. Deleting it would be a
+      // destructive guess about a directory Crew cannot claim, so refuse and
+      // say which path is in the way.
+      return fail(WORKSPACE_CONFLICT, `workspace path exists but is not a Crew worktree of this repository: ${worktreePath}`);
+    }
+    const created = await createWorktreeAt({ dir: worktreePath, repoRoot, revision, purpose: name, at, git });
+    if (!created.ok) return fail(created.reason, created.error);
+  }
+
+  const reset = await resetWorktreeTo({ worktreePath, revision, git });
+  if (!reset.ok) return fail(reset.reason, reset.error);
+
+  return { ok: true, worktreePath, repoRoot, baseRevision: revision, name, reused, release };
+}
+
+/**
+ * Release the lock a job held. The directory stays: it is the workspace the
+ * next job — and every session it produced — belongs to.
+ */
+export function releaseCrewWorkspace(handle) {
+  try { return handle?.release?.() === true; } catch { return false; }
+}

package/src/delivery.mjs

@@ -11,7 +11,7 @@
 
 export const DELIVERY_SECTIONS = ['Diff', 'Tests', 'Risks'];
 export const OPTIONAL_DELIVERY_SECTIONS = ['Unverified'];
-export const ALL_DELIVERY_SECTIONS = [...DELIVERY_SECTIONS, ...OPTIONAL_DELIVERY_SECTIONS];
+const ALL_DELIVERY_SECTIONS = [...DELIVERY_SECTIONS, ...OPTIONAL_DELIVERY_SECTIONS];
 
 export const REVIEW_SECTIONS = ['Review Findings', 'Evidence', 'Risks', 'Verdict'];
 
@@ -129,7 +129,7 @@ export function appendDeliveryInstructions(task, { tier, isReview } = {}) {
  * visible evidence. Two parsers gave two answers about one section; there is now
  * one, and it lives here.
  */
-export function parseTestRow(line) {
+function parseTestRow(line) {
   const normalized = String(line ?? '')
     .replace(/^\s*[-*+]\s+/, '')
     .replace(/^\|/, '')