mixdog 1.4.0 → 1.4.2

package/src/session-runtime/workspace/transitions.mjs

@@ -15,51 +15,28 @@
  * (runtime/shared/worktrees/manager.mjs), loaded on first use.
  */
 import { randomUUID } from 'node:crypto';
-import { setTimeout as delay } from 'node:timers/promises';
-import { isDeepStrictEqual } from 'node:util';
-import {
-  WORKTREE_CARRY_CHOICES,
-  WORKTREE_SNAPSHOT_KIND,
-  branchMenuEntries,
-  isWorktreeBound,
-  isWorktreeError,
-  normalizeSessionWorkspace,
-  worktreeError,
-  worktreeNameError,
-  worktreeRefusal,
-} from '../../runtime/shared/worktrees/contract.mjs';
 import { normalizeWorktreeSettings } from '../../runtime/shared/worktrees/settings.mjs';
 import * as maintenance from '../../runtime/shared/worktrees/maintenance.mjs';
-import { inspectRepo, throwIfAborted } from '../../runtime/shared/worktrees/git.mjs';
-import { worktreePreparationNote } from '../../runtime/shared/worktrees/preparation-report.mjs';
-import { isWithin, samePath } from '../../runtime/shared/worktrees/paths.mjs';
-import { readGitHead } from '../../runtime/shared/worktrees/git-head.mjs';
-import {
-  holdWorkspaceActivity,
-  isExternalCheckout,
-  releaseAll,
-} from '../../runtime/shared/worktrees/activity-gate.mjs';
-import { mergeConfirmedTarget } from '../../runtime/shared/worktrees/branch-management.mjs';
+import { inspectRepo } from '../../runtime/shared/worktrees/git.mjs';
+import { samePath } from '../../runtime/shared/worktrees/paths.mjs';
 import {
   clearReadDedupSession,
   resetReadStateAfterCompaction,
 } from '../../runtime/agent/orchestrator/session/cache/read-cache.mjs';
-import { sessionHasConversationMessages } from '../../runtime/agent/orchestrator/runtime-core/session-text.mjs';
 import { buildWorkspacePromptContext } from '../../runtime/agent/orchestrator/session/manager/session-prompt-composition.mjs';
-import {
-  promptContentText,
-  refreshSessionWorkspaceContext,
-} from '../../runtime/agent/orchestrator/session/manager/prompt-utils.mjs';
+import { refreshSessionWorkspaceContext } from '../../runtime/agent/orchestrator/session/manager/prompt-utils.mjs';
 import { AGENT_OWNER } from '../../runtime/agent/orchestrator/agent-owner.mjs';
 import { _liveSessions } from '../../runtime/agent/orchestrator/session/store/live-state.mjs';
-import { admitTurn, beginWorkspaceTransition, holdCheckoutFolder } from './admission-gate.mjs';
+import { createActivityGuards } from './activity-guards.mjs';
 import { createProjectBranchOps } from './project-branches.mjs';
-import { assertRetainedFits, createTransitionSteps, undoAll } from './transition-steps.mjs';
-import { readSessionWorkspace } from './workspace-state.mjs';
-
-const ACTIVE_STAGES = new Set(['connecting', 'requesting', 'streaming', 'tool_running', 'running', 'cancelling']);
-const BUSY_WORKER_STATES = new Set([...ACTIVE_STAGES, 'starting', 'spawning', 'queued', 'pending']);
-const BUSY_JOB_STATES = new Set(['starting', 'spawning', 'queued', 'pending', 'running']);
+import { createSessionWorkspaceView } from './session-view.mjs';
+import { createSideCheckouts } from './side-checkouts.mjs';
+import { createTransitionRunner } from './transition-runner.mjs';
+import { createTransitionSteps } from './transition-steps.mjs';
+import { createWorkspaceMerge } from './workspace-merge.mjs';
+import { createWorktreeIntents, creationIntent } from './worktree-intents.mjs';
+import { createWorktreeMaintenance } from './worktree-maintenance.mjs';
+import { createWorktreeSetup, defaultPlanWorktreeSetup, defaultRunWorktreeSetup } from './worktree-setup.mjs';
 
 const loadDefaultManager = () => import('../../runtime/shared/worktrees/manager.mjs');
 
@@ -71,28 +48,12 @@ async function defaultOwnShellJobCount(sessionIds) {
   return otherSessionBackgroundShellJobCount(new Set()) - otherSessionBackgroundShellJobCount(new Set(sessionIds));
 }
 
-const lower = (value) => String(value || '').toLowerCase();
-
-const WORKTREE_BOUND_SWITCH =
-  'The session works in a managed worktree; exit the worktree first (switch to a project-folder branch, or merge or remove the worktree) before moving it to another project.';
-
 /** The registered Project (projects.json) at `path`, or null. */
 async function defaultRegisteredProject(path) {
   const { listProjectsStrict } = await import('../../runtime/shared/projects.mjs');
   return listProjectsStrict().find((entry) => samePath(entry.path, path))?.path ?? null;
 }
 
-/** The dependency installs a new worktree folder still needs (dependencies.mjs). */
-async function defaultPlanWorktreeSetup(input) {
-  const { planDependencySetup } = await import('../../runtime/shared/worktrees/dependencies.mjs');
-  return planDependencySetup(input);
-}
-
-async function defaultRunWorktreeSetup(input) {
-  const { runWorktreeSetupCommands } = await import('../../runtime/shared/worktrees/setup-commands.mjs');
-  return runWorktreeSetupCommands(input);
-}
-
 /**
  * Re-root one session's prompt at `cwd`: environment facts and instruction
  * files for every session, project memory for the Lead only (workers never
@@ -120,58 +81,6 @@ export async function refreshWorkspacePrompt(session, cwd, { loadCoreMemoryConte
   });
 }
 
-/**
- * Creation-time intent: `{ mode: 'worktree', name }` asks for a worktree;
- * `{ mode: 'default' }` — an interactive Lead the user starts (TUI launch) —
- * follows the settings `newTaskDefault`; `{ mode: 'branch' }` or no intent
- * runs in the project folder. Desktop tasks carry their choice from the
- * renderer, and agents, schedules, webhooks and resumed sessions pass none,
- * so the default never applies to them.
- */
-function creationIntent(worktree, settings) {
-  if (worktree?.mode === 'worktree') {
-    return { name: worktree.name ?? null, confirmLarge: false, explicit: true, sessionId: null, txId: null };
-  }
-  return worktree?.mode === 'default' && settings.newTaskDefault === 'worktree'
-    ? { name: null, confirmLarge: false, explicit: false, sessionId: null, txId: null }
-    : null;
-}
-
-function validName(name) {
-  if (name === undefined || name === null) return null;
-  const error = worktreeNameError(name);
-  if (error) throw new TypeError(`worktree name is invalid: ${error}`);
-  return name;
-}
-
-function normalizeTarget(target) {
-  const kind = target?.kind;
-  if (kind === 'worktree') return { kind, name: validName(target.name) };
-  if (kind === 'branch') {
-    if (typeof target.branch !== 'string' || !target.branch.trim()) {
-      throw new TypeError('workspace target branch must be a non-empty string.');
-    }
-    return { kind, branch: target.branch.trim(), create: target.create === true };
-  }
-  if (kind === 'remove-worktree') return { kind, force: target.force === true };
-  throw new TypeError('workspace target kind must be branch, worktree or remove-worktree.');
-}
-
-function validRevision(value) {
-  if (value === undefined || value === null) return undefined;
-  if (!Number.isSafeInteger(value) || value < 0) {
-    throw new TypeError('expectedRevision must be a non-negative integer.');
-  }
-  return value;
-}
-
-/** WORKTREE_REVISION_CONFLICT when the caller expected another workspace revision. */
-function assertRevision(revision, expectedRevision) {
-  if (expectedRevision !== undefined && expectedRevision !== revision) {
-    throw worktreeError('WORKTREE_REVISION_CONFLICT', undefined, { expectedRevision, revision });
-  }
-}
-
 /**
  * The workspace methods every external caller (the runtime facade: desktop
  * IPC, the daemon's `session.configure` lane, remote views) reaches: exactly
@@ -190,12 +99,6 @@ export function publicWorkspaceMethods(api) {
   };
 }
 
-// A settled turn's snapshot cleanup waits at most 2^5 times its first delay between attempts.
-const SNAPSHOT_BACKOFF_STEPS = 5;
-
-/** The in-flight marker state of each transition kind. */
-const TRANSITION_STATE = { worktree: 'provisioning', branch: 'switching', 'remove-worktree': 'removing' };
-
 /**
  * @param {object} deps
  * @param {() => any} deps.getSession The Lead session this runtime hosts.
@@ -247,15 +150,7 @@ export function createWorkspaceTransitions({
   snapshotRetryLimit = 20,
 }) {
   const worktreeSettings = () => normalizeWorktreeSettings(getConfig?.()?.worktree);
-  let pendingIntent = creationIntent(initialIntent, worktreeSettings());
-  // The creation txIds of the read-only snapshots the current admitted turn
-  // made. Each turn owns its own set, so its cleanup never touches a later
-  // turn's snapshots (a txId, unlike a freed slug, is never reused).
-  let turnSnapshots = null;
-  // The running cleanups of settled turns' snapshots (controller → session id).
-  const snapshotCleanups = new Map();
-  let disposed = false;
-  const setupListeners = new Set();
+  const initialPending = creationIntent(initialIntent, worktreeSettings());
   let managerPromise = null;
   const backend = () => {
     if (manager) return Promise.resolve(manager);
@@ -263,209 +158,28 @@ export function createWorkspaceTransitions({
     return managerPromise;
   };
 
-  function hostedSession(sessionRef) {
-    const session = getSession();
-    const requested = String(sessionRef?.sessionId || '').trim();
-    if (!session?.id || (requested && requested !== session.id)) {
-      throw new Error(`workspace: session ${requested || '(none)'} is not hosted by this runtime.`);
-    }
-    return session;
-  }
-
-  async function ensureSession() {
-    if (!getSession()?.id && typeof createCurrentSession === 'function') await createCurrentSession('workspace');
-    return hostedSession(null);
-  }
-
-  function projectPathOf(session) {
-    const desktop = getDesktopSession?.() || session?.desktopSession;
-    if (desktop?.classification === 'project' && desktop.projectPath) return desktop.projectPath;
-    return session?.cwd || getCurrentCwd();
-  }
-
-  /** The stored record, or the project-folder workspace (revision 0) of a session that never moved. */
-  function currentWorkspace(session) {
-    const stored = readSessionWorkspace(session);
-    if (stored) return stored;
-    const projectPath = projectPathOf(session);
-    return normalizeSessionWorkspace({ projectPath, cwd: getCurrentCwd() || projectPath, revision: 0 });
-  }
-
-  let liveWorkspace = null;
-
-  /**
-   * The workspace the session publishes: a worktree-bound record as stored; a
-   * project-folder session (never moved, back from a worktree, or carrying a
-   * transition stub) with the folder's checked-out branch / detached commit and
-   * repoCommonDir read straight from HEAD — no git process. Null outside a git
-   * repository for a session without a record. Identity-stable while equal.
-   */
-  function getLiveWorkspace() {
-    const session = getSession();
-    const stored = readSessionWorkspace(session);
-    if (isWorktreeBound(stored)) return session.workspace;
-    let base;
-    try {
-      base = stored ?? currentWorkspace(session);
-    } catch {
-      return session?.workspace ?? null;
-    }
-    const head = readGitHead(base.cwd);
-    if (!head) return session?.workspace ?? null;
-    const next = {
-      ...base,
-      repoCommonDir: head.repoCommonDir,
-      branch: head.branch,
-      baseCommit: head.branch ? base.baseCommit : head.commit,
-    };
-    if (!liveWorkspace || !isDeepStrictEqual(liveWorkspace, next)) liveWorkspace = next;
-    return liveWorkspace;
-  }
-
-  function isSessionActive(session) {
-    const runtime = sessionManager?.getSessionRuntime?.(session.id);
-    if (runtime?.controller?.signal && !runtime.controller.signal.aborted) return true;
-    return ACTIVE_STAGES.has(lower(runtime?.stage || session.status));
-  }
-
-  const workersOf = (session) =>
-    listLiveSessions().filter(
-      (candidate) =>
-        candidate?.id &&
-        candidate.id !== session.id &&
-        candidate.owner === AGENT_OWNER &&
-        candidate.closed !== true &&
-        (candidate.ownerSessionId === session.id || candidate.parentSessionId === session.id)
-    );
-
-  /**
-   * WORKTREE_BUSY_JOBS while this Lead has a turn, workers or background
-   * shells running (`shellJobs: false` tolerates background shells).
-   */
-  async function assertLeadIdle(session, { ownTurn = false, shellJobs: checkShellJobs = true } = {}) {
-    if (!ownTurn && getActiveTurnCount() > 0) {
-      throw worktreeError('WORKTREE_BUSY_JOBS', 'The session is running a turn; wait for it to finish.', {
-        reason: 'turn',
-      });
-    }
-    const status = agentStatusState?.() || {};
-    const workers = Array.isArray(status.agentWorkers) ? status.agentWorkers : [];
-    const jobs = Array.isArray(status.agentJobs) ? status.agentJobs : [];
-    const busyWorkers = workers.filter(
-      (row) => BUSY_WORKER_STATES.has(lower(row?.status)) || BUSY_WORKER_STATES.has(lower(row?.stage))
-    ).length;
-    const busyJobs = jobs.filter((row) => BUSY_JOB_STATES.has(lower(row?.status))).length;
-    if (busyWorkers || busyJobs) {
-      throw worktreeError('WORKTREE_BUSY_JOBS', undefined, { reason: 'workers', workers: busyWorkers, jobs: busyJobs });
-    }
-    if (!checkShellJobs) return;
-    const ids = new Set([session.id, ...workers.map((row) => row?.sessionId).filter(Boolean)]);
-    for (const worker of workersOf(session)) ids.add(worker.id);
-    const shellJobs = await countOwnShellJobs([...ids]);
-    if (shellJobs > 0) throw worktreeError('WORKTREE_BUSY_JOBS', undefined, { reason: 'shell-jobs', shellJobs });
-  }
-
-  /**
-   * A checkout or merge in the shared checkout `folder` refuses while another
-   * session (not this Lead's own workers) works there, then holds the folder
-   * until the returned release: other sessions' turns that arrive meanwhile
-   * wait (admission gate). `sessionId` null: a session-less (draft) change.
-   * @returns {() => void}
-   */
-  function holdProjectFolder(sessionId, folder, { hold = true } = {}) {
-    const users = listLiveSessions().filter(
-      (candidate) =>
-        candidate?.id &&
-        candidate.id !== sessionId &&
-        candidate.closed !== true &&
-        (!sessionId || (candidate.ownerSessionId !== sessionId && candidate.parentSessionId !== sessionId)) &&
-        typeof candidate.cwd === 'string' &&
-        isWithin(folder, candidate.cwd) &&
-        isSessionActive(candidate)
-    );
-    if (users.length) throw worktreeRefusal('folder-in-use', { sessions: users.map((candidate) => candidate.id) });
-    return holdCheckoutFolder(sessionId, folder, { hold });
-  }
-
-  /** Run `fn` holding the checkout `folder` (holdProjectFolder); released when it settles. */
-  async function withProjectFolder(sessionId, folder, fn) {
-    const release = holdProjectFolder(sessionId, folder);
-    try {
-      return await fn();
-    } finally {
-      release();
-    }
-  }
-
-  /**
-   * Before a carry clears the shared checkout `folder` (held by the caller,
-   * so no new turn starts there): WORKTREE_BUSY_JOBS while any other session
-   * working in it — idle or not, this Lead's workers included — owns a
-   * running background shell (holdProjectFolder already refused running
-   * turns and agents there, assertLeadIdle this Lead's own). Processes
-   * outside Mixdog (editors, watchers) cannot be excluded.
-   */
-  async function assertCheckoutQuiet(session, folder) {
-    const sharing = listLiveSessions()
-      .filter(
-        (candidate) =>
-          candidate?.id &&
-          candidate.id !== session.id &&
-          candidate.closed !== true &&
-          typeof candidate.cwd === 'string' &&
-          isWithin(folder, candidate.cwd)
-      )
-      .map((candidate) => candidate.id);
-    if (!sharing.length) return;
-    const shellJobs = await countOwnShellJobs(sharing);
-    if (shellJobs > 0) throw worktreeRefusal('folder-shell-jobs', { shellJobs });
-  }
-
-  /**
-   * The shared admission of every merge and folder cleanup (manageProjectBranch):
-   * refuses while a session or worker runs in an affected folder, or a
-   * background command does; `removing` refuses while any session still uses
-   * one. Then holds the folders — Mixdog checkouts only; an external checkout
-   * takes no lease from this profile — so new Mixdog work there waits until `run`
-   * settles. `actor`: the session acting on its own checkout, whose own turn
-   * and workers its caller already checked (assertLeadIdle).
-   */
-  async function withManagementFolders(folders, removing, run, { actor = null } = {}) {
-    const release = [];
-    try {
-      for (const folder of [...new Set(folders)].sort()) {
-        release.push(holdProjectFolder(actor, folder, { hold: !isExternalCheckout(folder) }));
-      }
-      release.push(holdWorkspaceActivity(folders, { sessionId: actor }));
-      const stored = await listWorkspaceConsumers();
-      const consumers = new Map(stored.map((session) => [session.id, session]));
-      for (const session of listLiveSessions()) if (session?.closed !== true) consumers.set(session.id, session);
-      const affected = [...consumers.values()].filter((session) =>
-        folders.some((folder) => session.cwd && isWithin(folder, session.cwd))
-      );
-      const blocking = removing
-        ? affected
-        : affected.filter(
-            (session) =>
-              !(actor && [session.id, session.ownerSessionId, session.parentSessionId].includes(actor)) &&
-              isSessionActive(session)
-          );
-      if (blocking.length) throw worktreeRefusal('folder-in-use', { sessions: blocking.map((session) => session.id) });
-      const jobs = await listWorkspaceJobs();
-      if (jobs.some((job) => !job.terminal && folders.some((folder) => isWithin(folder, job.cwd)))) {
-        throw worktreeRefusal('folder-shell-jobs');
-      }
-      if ((await countOwnShellJobs(affected.map((session) => session.id))) > 0) {
-        throw worktreeRefusal('folder-shell-jobs');
-      }
-      return await run([...consumers.keys()]);
-    } finally {
-      releaseAll(release);
-    }
-  }
-
+  const view = createSessionWorkspaceView({
+    getSession,
+    getCurrentCwd,
+    getDesktopSession,
+    createCurrentSession,
+    inspectProject,
+    backend,
+    pendingWorktree: () => intents.pendingWorktree(),
+  });
+  const { hostedSession, ensureSession, currentWorkspace } = view;
+  const guards = createActivityGuards({
+    getActiveTurnCount,
+    agentStatusState,
+    countOwnShellJobs,
+    listLiveSessions,
+    sessionManager,
+    listWorkspaceConsumers,
+    listWorkspaceJobs,
+  });
+  const { assertLeadIdle, withProjectFolder, withManagementFolders } = guards;
   const steps = createTransitionSteps({
-    assertCheckoutQuiet,
+    assertCheckoutQuiet: guards.assertCheckoutQuiet,
     backend,
     inspectProject,
     runtimeToken,
@@ -477,7 +191,7 @@ export function createWorkspaceTransitions({
     refreshWorkspaceContext,
     invalidateCaches,
     updateLeadWorkerCwd,
-    workersOf,
+    workersOf: guards.workersOf,
     withProjectFolder,
   });
   const projectBranches = createProjectBranchOps({
@@ -487,740 +201,93 @@ export function createWorkspaceTransitions({
     withProjectFolder,
     withManagementFolders,
   });
-
-  async function transition(session, target, options = {}) {
-    throwIfAborted(options.signal);
-    const previous = currentWorkspace(session);
-    assertRevision(previous.revision, options.expectedRevision);
-    const txId = String(options.txId || '').trim() || newTxId();
-    const leave = beginWorkspaceTransition(session.id, txId);
-    const hadRecord = Object.hasOwn(session, 'workspace');
-    const stored = session.workspace;
-    const marker = normalizeSessionWorkspace({
-      ...previous,
-      transition: { state: TRANSITION_STATE[target.kind], txId },
-    });
-    session.workspace = marker;
-    const restore = () => {
-      if (hadRecord) session.workspace = stored;
-      else delete session.workspace;
-    };
-    const journal = [];
-    try {
-      await assertLeadIdle(session, { ownTurn: options.ownTurn === true });
-      const run = { signal: options.signal, txId, journal };
-      // A new checkout gets its dependencies prepared at the start of the
-      // first turn a session runs there (runPendingSetup, from its registry entry).
-      if (target.kind === 'worktree') {
-        return await steps.enterWorktree(session, previous, {
-          ...run,
-          name: target.name,
-          nameHint: options.nameHint,
-          confirmLarge: options.confirmLarge,
-          changes: options.changes,
-        });
-      }
-      if (target.kind === 'branch') {
-        return await steps.enterProjectBranch(session, previous, {
-          ...run,
-          branch: target.branch,
-          create: target.create,
-          confirmLarge: options.confirmLarge,
-        });
-      }
-      return await steps.removeRetainedWorktree(session, previous, { ...run, force: target.force });
-    } catch (error) {
-      // Whatever already moved (cwd, record, prompts, worker roots, lease)
-      // goes back exactly; the previous workspace stays authoritative.
-      await undoAll(journal, error);
-      throw error;
-    } finally {
-      if (session.workspace === marker) restore();
-      leave();
-    }
-  }
-
-  /**
-   * The one entry of every transition. `ownTurn` (internal: the Lead's own
-   * tool call) tolerates the calling turn; `txId` keys the creation.
-   */
-  async function runTransition(sessionRef, target, options = {}, { ownTurn = false, txId = '' } = {}) {
-    const session = hostedSession(sessionRef);
-    return transition(session, normalizeTarget(target), {
-      expectedRevision: validRevision(options.expectedRevision),
-      confirmLarge: options.confirmLarge === true,
-      signal: options.signal,
-      ownTurn: ownTurn === true,
-      txId,
-    });
-  }
+  const runner = createTransitionRunner({
+    getSession,
+    hostedSession,
+    currentWorkspace,
+    assertLeadIdle,
+    steps,
+    newTxId,
+    applyResolvedCwd,
+    getCurrentCwd,
+  });
+  const setup = createWorktreeSetup({ backend, newTxId, planWorktreeSetup, runWorktreeSetup });
+  const intents = createWorktreeIntents({
+    initial: initialPending,
+    getSession,
+    getReservedSessionId,
+    ensureSession,
+    currentWorkspace,
+    backend,
+    transition: runner.transition,
+    runTransition: runner.runTransition,
+    runPendingSetup: setup.runPendingSetup,
+    newTxId,
+  });
+  const checkouts = createSideCheckouts({
+    getSession,
+    getCurrentCwd,
+    hostedSession,
+    sessionProject: view.sessionProject,
+    backend,
+    runtimeToken,
+    newTxId,
+    snapshotRetryMs,
+    snapshotRetryLimit,
+  });
+  const worktrees = createWorktreeMaintenance({
+    getSession,
+    listLiveSessions,
+    listStoredSessionIds,
+    backend,
+    withManagementFolders,
+    cancelSnapshotCleanups: checkouts.cancelSnapshotCleanups,
+    worktreeSettings,
+  });
+  const merge = createWorkspaceMerge({
+    hostedSession,
+    currentWorkspace,
+    assertLeadIdle,
+    inspectProject,
+    backend,
+    withManagementFolders,
+    removeWorktree: runner.removeWorktree,
+    worktreeSettings,
+    newTxId,
+  });
 
   /** @type {import('../../runtime/shared/worktrees/contract.mjs').ApplyWorkspaceTransition} */
   async function applyWorkspaceTransition(sessionRef, target, options = {}) {
-    return runTransition(sessionRef, target, options);
-  }
-
-  /** The pending worktree intent that applies to `session`'s next turn, if any. */
-  function intentFor(session) {
-    const intent = pendingIntent;
-    if (!intent) return null;
-    if (isWorktreeBound(readSessionWorkspace(session))) {
-      pendingIntent = null;
-      return null;
-    }
-    if (intent.sessionId) return intent.sessionId === session.id ? intent : null;
-    // A creation-time intent belongs to a new task: never to a resumed
-    // conversation this runtime opened instead.
-    const started =
-      sessionHasConversationMessages(session) || sessionHasConversationMessages({ messages: session.liveTurnMessages });
-    return started ? null : intent;
-  }
-
-  /**
-   * Create and enter the worktree `intent` asks for now: its txId is fixed on
-   * first use (`submissionId`, else a fresh one) so a retry reuses the same
-   * worktree, and the prompt text names an unnamed one. A settled intent is
-   * consumed.
-   */
-  async function provisionIntent(session, intent, submissionId, prompt, options) {
-    intent.txId ||= String(submissionId || '').trim() || newTxId();
-    const result = await transition(
-      session,
-      { kind: 'worktree', name: intent.name },
-      { txId: intent.txId, nameHint: promptContentText(prompt), confirmLarge: intent.confirmLarge, ...options }
-    );
-    if (pendingIntent === intent) pendingIntent = null;
-    return result;
-  }
-
-  /**
-   * Turn-start workspace gate, run after the session exists and before the
-   * user row, the review snapshot, hooks, the provider and any worker spawn.
-   * A session in recovery refuses the turn; a pending worktree intent is
-   * provisioned now (txId = the first submission id, reused by retries; an
-   * unnamed worktree takes its slug from the first message).
-   */
-  async function prepareTurnWorkspace({ submissionId = '', prompt = '', signal, confirmLarge = false } = {}) {
-    const session = getSession();
-    if (!session?.id) return null;
-    const stored = readSessionWorkspace(session);
-    if (stored?.transition.state === 'recovery') {
-      throw worktreeError(
-        'WORKTREE_MISSING',
-        'The worktree for this session no longer exists; pick a branch or remove the worktree to continue.',
-        { worktreeId: stored.worktreeId, path: stored.cwd }
-      );
-    }
-    const intent = intentFor(session);
-    let result = null;
-    if (intent) {
-      try {
-        result = await provisionIntent(session, intent, submissionId, prompt, {
-          confirmLarge: intent.confirmLarge || confirmLarge === true,
-          signal,
-          ownTurn: true,
-        });
-      } catch (error) {
-        // The settings default never blocks a task outside a git repository.
-        if (!intent.explicit && isWorktreeError(error, 'WORKTREE_UNSUPPORTED_REPO')) {
-          if (pendingIntent === intent) pendingIntent = null;
-          return null;
-        }
-        throw error;
-      }
-    }
-    await runPendingSetup(session, signal);
-    return result;
-  }
-
-  /**
-   * Prepare the session's new worktree, once, under the turn (its admission
-   * keeps the folder from being merged or removed; its signal — the Stop
-   * button — cancels): the frozen installs the links made at creation did
-   * not cover. While an install runs, every onWorktreeSetup listener gets its
-   * one-line progress; nothing else reaches the user. The agent gets one
-   * compact note with this turn (`session.pendingSetupNotice`): the main
-   * checkout, what was copied, linked and installed, what failed (with the
-   * output tail) and what was skipped. A failure or timeout is in the note
-   * and the turn goes on; a cancel aborts the turn like any other stop. The
-   * worktree stays either way. The setup belongs to the worktree it was made
-   * for, whichever path made it (a worktree task, a branch selection, `git
-   * worktree add`): its registry entry keeps it pending (manager
-   * claimWorktreeSetup) until the first turn a session runs there, never in
-   * another folder.
-   */
-  async function runPendingSetup(session, signal) {
-    const here = readSessionWorkspace(session);
-    if (!isWorktreeBound(here)) return;
-    const claimed = await (await backend()).claimWorktreeSetup(here.worktreeId);
-    if (!claimed) return;
-    const id = newTxId();
-    const report = {
-      root: claimed.prepared?.root || here.projectPath,
-      prepared: claimed.prepared,
-      dependencyNotes: [],
-      installs: null,
-      notes: [],
-    };
-    const emit = (event) => {
-      for (const listener of setupListeners) {
-        try {
-          listener({ ...event, id, sessionId: session.id, cwd: here.cwd });
-        } catch {
-          /* a viewer's failure never stops the setup */
-        }
-      }
-    };
-    try {
-      const plan = await planWorktreeSetup({ worktreeDir: here.cwd, mainDir: here.projectPath, signal });
-      report.dependencyNotes = plan.notes;
-      if (plan.commands.length) {
-        report.installs = await runWorktreeSetup({ commands: plan.commands, signal, onProgress: emit });
-      }
-    } catch (error) {
-      if (!signal?.aborted) report.notes.push(`Dependencies could not be prepared: ${error?.message || error}`);
-    }
-    session.pendingSetupNotice = { revision: Date.now(), content: worktreePreparationNote(report) };
-    throwIfAborted(signal);
-  }
-
-  /** Subscribe to worktree setup progress; returns the unsubscribe. */
-  function onWorktreeSetup(listener) {
-    if (typeof listener !== 'function') return () => {};
-    setupListeners.add(listener);
-    return () => setupListeners.delete(listener);
-  }
-
-  async function getBranchMenu() {
-    const session = getSession();
-    const workspace = session?.id
-      ? currentWorkspace(session)
-      : normalizeSessionWorkspace({ projectPath: projectPathOf(null), cwd: getCurrentCwd(), revision: 0 });
-    const menu = await (await backend()).listBranchOccupancy({
-      projectPath: workspace.projectPath,
-      sessionId: session?.id || null,
-    });
-    const selectedEntry = workspace.worktreeId ? await (await backend()).findWorktreeContaining(workspace.cwd) : null;
-    // A session outside a managed worktree (the project folder — never moved,
-    // or back from a worktree — or a linked checkout of the selected branch)
-    // is on whatever that folder has checked out now.
-    // Its repository is the project's (a never-moved session has no stored
-    // record), and a detached checkout shows branch null with the commit in
-    // baseCommit — never mistaken for "not a repository".
-    let view = workspace;
-    if (!isWorktreeBound(workspace)) {
-      const project = await inspectProject(workspace.cwd);
-      const checkedOut = project.currentBranch ?? null;
-      view = {
-        ...workspace,
-        repoCommonDir: project.repoCommonDir ?? workspace.repoCommonDir,
-        branch: checkedOut,
-        baseCommit: checkedOut ? workspace.baseCommit : (project.headCommit ?? null),
-      };
-    }
-    return {
-      workspace: view,
-      pendingWorktree: pendingIntent ? { name: pendingIntent.name } : null,
-      branches: branchMenuEntries(menu.branches, menu.occupancy),
-      occupancy: menu.occupancy,
-      retainedWorktree: selectedEntry ?? menu.retainedWorktree ?? null,
-      // Creation notes of the retained worktree (submodules, include entries).
-      warnings: Array.isArray(menu.retainedWorktree?.warnings) ? [...menu.retainedWorktree.warnings] : [],
-    };
-  }
-
-  /** The maintenance scope here: every live session of this process counts as a live owner. */
-  async function maintenanceScope() {
-    const liveSessionIds = [
-      ...new Set([getSession()?.id, ...listLiveSessions().map((candidate) => candidate?.id)].filter(Boolean)),
-    ];
-    return { liveSessionIds, listSessionIds: listStoredSessionIds, manager: await backend() };
-  }
-
-  /**
-   * Every managed worktree with who retains it (the manual list). Read-only
-   * snapshots (no branch) only with `includeSnapshots` (the git tool); the
-   * desktop list (DesktopManagedWorktreeRow, a branch per row) never gets them.
-   */
-  async function listWorktrees({ includeSnapshots = false } = {}) {
-    const rows = await maintenance.listWorktreesWithRetention(await maintenanceScope());
-    return includeSnapshots ? rows : rows.filter((row) => row.kind !== WORKTREE_SNAPSHOT_KIND);
-  }
-
-  /** The manual prune: clean, merged worktrees no stored or live session retains. */
-  async function pruneWorktrees({ repoCommonDir = null } = {}) {
-    return maintenance.pruneWorktrees({ ...(await maintenanceScope()), repoCommonDir });
-  }
-
-  /** After `sessionId` was deleted: autoCleanup removes its clean, merged worktree. */
-  async function cleanupDeletedSession(sessionId) {
-    // Its snapshots go with it below; no turn cleanup keeps retrying them.
-    cancelSnapshotCleanups(sessionId);
-    return maintenance.cleanupDeletedSessionWorktree(sessionId, {
-      manager: await backend(),
-      autoCleanup: worktreeSettings().autoCleanup,
-    });
-  }
-
-  /**
-   * Turn admission (see admission-gate admitTurn); resolves the release. The
-   * release also starts the removal of the read-only snapshots this turn
-   * made — only those (removeTurnSnapshots).
-   */
-  async function admitTurnWorkspace({ signal } = {}) {
-    const release = await admitTurn({ sessionId: getSession()?.id || '', cwd: () => getCurrentCwd() || '', signal });
-    const made = new Set();
-    turnSnapshots = made;
-    return () => {
-      release();
-      if (turnSnapshots === made) turnSnapshots = null;
-      const sessionId = getSession()?.id;
-      if (made.size && sessionId) void removeTurnSnapshots(sessionId, [...made]);
-    };
-  }
-
-  /**
-   * Remove a settled turn's snapshots (by creation `txIds`) once nothing runs
-   * in them: a worker turn or background shell holding a workspace lease
-   * inside one keeps it (manager removeSessionSnapshots reports it `in-use`).
-   * Those are retried with a doubling delay (`snapshotRetryMs`, at most
-   * 2^SNAPSHOT_BACKOFF_STEPS times it) for at most `snapshotRetryLimit`
-   * attempts; a snapshot removal that fails otherwise is not retried. What is
-   * left then — or when the runtime is disposed, the session closes, is
-   * deleted or is no longer the one hosted here — is the prune's and the
-   * startup reconcile's. Admission is not held meanwhile: the removal only
-   * ever names this turn's snapshots.
-   */
-  async function removeTurnSnapshots(sessionId, txIds) {
-    if (disposed) return;
-    const controller = new AbortController();
-    snapshotCleanups.set(controller, sessionId);
-    try {
-      let pending = txIds;
-      for (let attempt = 0; pending.length && attempt < snapshotRetryLimit; attempt++) {
-        if (attempt > 0) {
-          const wait = snapshotRetryMs * 2 ** Math.min(attempt - 1, SNAPSHOT_BACKOFF_STEPS);
-          await delay(wait, undefined, { ref: false, signal: controller.signal });
-        }
-        const session = getSession();
-        if (session?.id !== sessionId || session.closed === true) return;
-        const report = await (await backend()).removeSessionSnapshots(sessionId, { txIds: pending });
-        pending = report.kept.filter((row) => row.reason === 'in-use').map((row) => row.txId);
-      }
-    } catch {
-      // Cancelled, or the backend failed: the rest is the maintenance's.
-    } finally {
-      snapshotCleanups.delete(controller);
-    }
-  }
-
-  /** Stop the snapshot cleanups of `sessionId` (every session's when null). */
-  function cancelSnapshotCleanups(sessionId = null) {
-    for (const [controller, owner] of snapshotCleanups) {
-      if (sessionId === null || owner === sessionId) controller.abort();
-    }
-  }
-
-  /** Runtime teardown: no snapshot cleanup runs on (prune / startup reconcile finish them). */
-  function dispose() {
-    disposed = true;
-    cancelSnapshotCleanups();
-  }
-
-  /**
-   * Run in `branch`'s checkout (see enterProjectBranch). `ownTurn`
-   * (internal: the Lead's own tool call) tolerates the calling turn.
-   */
-  async function selectBranch(
-    { branch, create = false, expectedRevision, confirmLarge = false, txId = '' } = {},
-    { ownTurn = false } = {}
-  ) {
-    const session = await ensureSession();
-    const current = currentWorkspace(session);
-    if (current.branch === branch && current.worktreeId) {
-      assertRevision(current.revision, validRevision(expectedRevision));
-      pendingIntent = null;
-      return { revision: current.revision, workspace: current };
-    }
-    const target = { kind: 'branch', branch, create: create === true };
-    const result = await runTransition(
-      { sessionId: session.id },
-      target,
-      { expectedRevision, confirmLarge },
-      { ownTurn, txId: String(txId || '').trim() }
-    );
-    pendingIntent = null;
-    return result;
-  }
-
-  /** WORKTREE_PROJECT_MISMATCH unless `repoCommonDir` (when given) is the session Project's repository. */
-  async function sessionProject(session, repoCommonDir) {
-    const workspace = currentWorkspace(session);
-    const project = await inspectProject(workspace.projectPath);
-    if (repoCommonDir && !samePath(repoCommonDir, project.repoCommonDir)) {
-      throw worktreeError(
-        'WORKTREE_PROJECT_MISMATCH',
-        "Managed worktrees belong to this session's Project repository; run the command there.",
-        { projectPath: workspace.projectPath, repoCommonDir }
-      );
-    }
-    return { workspace, project };
-  }
-
-  /**
-   * A managed worktree for `branch` without moving the session (`git
-   * worktree add`): retained by this session like a branch it selected, so
-   * entering it later (selectBranch) reuses it. A branch already checked out
-   * elsewhere is WORKTREE_BRANCH_OCCUPIED, except in this session's own
-   * managed worktree, which is returned as it is. `startPoint` (with
-   * `create`): the commit the new branch starts at.
-   */
-  async function addBranchWorktree({
-    branch,
-    create = false,
-    startPoint = null,
-    confirmLarge = false,
-    txId = '',
-    repoCommonDir = null,
-  } = {}) {
-    const session = hostedSession(null);
-    const { workspace } = await sessionProject(session, repoCommonDir);
-    const backendApi = await backend();
-    const { occupancy } = await backendApi.listBranchOccupancy({
-      projectPath: workspace.projectPath,
-      sessionId: session.id,
-    });
-    const held = occupancy.find((row) => row.branch === branch && row.kind !== 'free');
-    if (held && !(held.kind === 'session' && held.sessionId === session.id)) {
-      throw worktreeError('WORKTREE_BRANCH_OCCUPIED', `Branch ${branch} is checked out in ${held.path}.`, {
-        branch,
-        path: held.path,
-        kind: held.kind,
-        ...(held.sessionId ? { sessionId: held.sessionId } : {}),
-      });
-    }
-    const resolved = await backendApi.resolveBranchWorkspace({
-      projectPath: workspace.projectPath,
-      branch,
-      create: create === true,
-      startPoint,
-      sessionId: session.id,
-      runtimeToken,
-      txId: String(txId || '').trim() || newTxId(),
-      confirmLarge: confirmLarge === true,
-    });
-    return {
-      path: resolved.path,
-      branch,
-      worktreeId: resolved.entry?.id ?? null,
-      created: resolved.created === true,
-      baseCommit: resolved.entry?.baseCommit ?? null,
-      mergeTarget: resolved.entry?.mergeTarget ?? null,
-    };
-  }
-
-  /**
-   * A read-only snapshot of `commit` for this session's turn (`git worktree
-   * add --detach`): a detached managed checkout no session works in,
-   * removed when the turn settles (and nothing runs in it any more). The
-   * session does not move. Only inside an admitted turn: a snapshot always
-   * belongs to the turn that made it.
-   */
-  async function createSnapshot({ commit = 'HEAD', confirmLarge = false, txId = '', repoCommonDir = null } = {}) {
-    const session = hostedSession(null);
-    const made = turnSnapshots;
-    if (!made) throw new Error('A read-only snapshot belongs to a turn; none is running in this session.');
-    const { workspace } = await sessionProject(session, repoCommonDir);
-    const tx = String(txId || '').trim() || newTxId();
-    const entry = await (await backend()).createSnapshotWorktree({
-      projectPath: workspace.projectPath,
-      sessionId: session.id,
-      runtimeToken,
-      commit,
-      txId: tx,
-      confirmLarge: confirmLarge === true,
-    });
-    made.add(tx);
-    return entry;
-  }
-
-  /**
-   * Remove this session's snapshot at `path` now; a dirty one only with
-   * `force`, and none while a worker or background shell runs in it.
-   */
-  async function removeSnapshot({ path, force = false } = {}) {
-    const session = hostedSession(null);
-    const backendApi = await backend();
-    const entry = await backendApi.getWorktreeByPath(path);
-    if (entry?.kind !== WORKTREE_SNAPSHOT_KIND) throw worktreeError('WORKTREE_MISSING', undefined, { path });
-    if (entry.holderSessionId !== session.id) {
-      throw worktreeError(
-        'WORKTREE_BUSY_JOBS',
-        "This snapshot belongs to another session's turn; it is removed when that turn ends, or by a prune.",
-        { reason: 'snapshot-held', sessionId: entry.holderSessionId, entryId: entry.id }
-      );
-    }
-    const removed = await backendApi.removeSnapshotWorktree({ entryId: entry.id, force: force === true });
-    return { ...removed, entryId: entry.id, path: entry.path };
-  }
-
-  /**
-   * "워크트리": re-enter the retained worktree now, or arm the lazy creation
-   * for the next message (confirmLarge acknowledges WORKTREE_LARGE_REPO_CONFIRM).
-   *
-   * `provision` (a New Task's first send, before its prompt is submitted)
-   * creates and enters the worktree right away instead: `prompt` names it
-   * like the lazy path would and `txId` (the submission id) makes a resend
-   * reuse it. Typed failures (large repository, disk, busy) therefore reach
-   * the sender while its draft is still unsent, and the turn that follows
-   * finds the session already bound.
-   *
-   * A provisioning that creates a new worktree decides the project folder's
-   * uncommitted changes (tracked and untracked): none → it proceeds; without
-   * `carryChanges` it refuses with WORKTREE_DIRTY_CHOICE (`details.count`);
-   * `leave` starts the worktree at HEAD and leaves them; `carry` moves them
-   * into it (the result's `changes` reports which). Re-entering a retained
-   * worktree never touches them.
-   *
-   * `ownTurn` (internal: the Lead's own tool call) tolerates the calling turn.
-   */
-  async function requestWorktree(
-    {
-      name = null,
-      confirmLarge = false,
-      provision = false,
-      carryChanges,
-      prompt = '',
-      txId = '',
-      expectedRevision,
-    } = {},
-    { ownTurn = false } = {}
-  ) {
-    const nameHint = validName(name);
-    const expected = validRevision(expectedRevision);
-    if (carryChanges !== undefined && carryChanges !== null && !WORKTREE_CARRY_CHOICES.includes(carryChanges)) {
-      throw new TypeError(`carryChanges must be one of ${WORKTREE_CARRY_CHOICES.join(', ')}.`);
-    }
-    const session = provision === true ? await ensureSession() : getSession();
-    // No session yet: the menu it was read from had revision 0.
-    const current = session?.id ? currentWorkspace(session) : null;
-    assertRevision(current?.revision ?? 0, expected);
-    if (current) {
-      if (isWorktreeBound(current)) return { revision: current.revision, workspace: current, pending: false };
-      if (await (await backend()).getSessionWorktree(session.id)) {
-        const entered = await runTransition(
-          { sessionId: session.id },
-          { kind: 'worktree' },
-          { expectedRevision: expected },
-          { ownTurn }
-        );
-        return { ...entered, pending: false };
-      }
-    }
-    const priorIntent = pendingIntent;
-    pendingIntent = {
-      name: nameHint ?? pendingIntent?.name ?? null,
-      confirmLarge: confirmLarge === true || pendingIntent?.confirmLarge === true,
-      explicit: true,
-      sessionId: session?.id || getReservedSessionId?.() || null,
-      txId: pendingIntent?.txId ?? null,
-    };
-    if (provision === true) {
-      const intent = pendingIntent;
-      try {
-        return {
-          ...(await provisionIntent(session, intent, txId, prompt, {
-            expectedRevision: expected,
-            changes: carryChanges ?? 'ask',
-            ownTurn: ownTurn === true,
-          })),
-          pending: false,
-        };
-      } catch (error) {
-        // A refused move (uncommitted changes to decide, busy, …) is never
-        // re-armed for the next turn, where nobody could answer it.
-        if (pendingIntent === intent) pendingIntent = priorIntent;
-        throw error;
-      }
-    }
-    const workspace = session?.id ? currentWorkspace(session) : null;
-    return { revision: workspace?.revision ?? 0, workspace, pending: true };
-  }
-
-  /**
-   * Merge the retained worktree into the project folder's checked-out branch.
-   * `ownTurn` (internal: the Lead's own tool call) tolerates the calling turn.
-   */
-  async function mergeWorkspace(
-    { confirmed = false, target = null, cleanup = false, expectedRevision } = {},
-    { ownTurn = false } = {}
-  ) {
-    if (confirmed !== true) {
-      throw worktreeError('WORKTREE_CONFIRM_REQUIRED', 'mergeWorkspace requires confirmed: true.');
-    }
-    const expected = validRevision(expectedRevision);
-    const session = hostedSession(null);
-    const merged = await mergeRetainedWorktree(session, { target, ownTurn, expectedRevision: expected });
-    if (cleanup !== true || merged.merged !== true) return merged;
-    // "Merge and clean up": with autoCleanup on, the merged worktree goes now
-    // (a dirty one stays, reported); off, nothing is removed automatically.
-    // The merge is committed: a failed or refused cleanup (dirty, retained
-    // file recovery data, ...) is a cleanup notice, never a merge failure.
-    if (worktreeSettings().autoCleanup !== true) {
-      return {
-        ...merged,
-        cleanup: { removed: false, reason: 'auto-cleanup-off', message: 'Auto cleanup is off; the worktree is kept.' },
-      };
-    }
-    // The cleanup never moves a session: while this session still works in the
-    // merged folder (or any other session uses it) the removal is refused.
-    try {
-      if (isWorktreeBound(currentWorkspace(session))) {
-        throw worktreeRefusal('folder-in-use', { sessions: [session.id] });
-      }
-      const entry = await (await backend()).getSessionWorktree(session.id);
-      const removed = await withManagementFolders(
-        entry ? [entry.path] : [],
-        true,
-        () => removeWorktree({ force: false }, { ownTurn }),
-        { actor: session.id }
-      );
-      return { ...merged, cleanup: removed.removed, revision: removed.revision, workspace: removed.workspace };
-    } catch (error) {
-      // The merge stands: a refused or incomplete cleanup (in use, dirty,
-      // unmerged, retained file recovery data, partly removed, …) is
-      // reported, never thrown, with the workspace as it is now.
-      const workspace = currentWorkspace(session);
-      const code = typeof error?.code === 'string' ? error.code : '';
-      return {
-        ...merged,
-        cleanup: {
-          removed: false,
-          reason: code || 'WORKTREE_CLEANUP_FAILED',
-          ...(code ? { code } : {}),
-          message: String(error?.message || error),
-        },
-        revision: workspace.revision,
-        workspace,
-      };
-    }
-  }
-
-  /**
-   * The merge itself. The retained worktree must belong to this session's
-   * Project (same repository and Project folder — a Project switch may have
-   * left it behind); its branch, or the branch of the linked checkout the
-   * session works in, is merged into the project folder through the shared
-   * guarded path (mergeConfirmedTarget): both folders validated and held.
-   */
-  async function mergeRetainedWorktree(session, { target, ownTurn, expectedRevision }) {
-    const workspace = currentWorkspace(session);
-    assertRevision(workspace.revision, expectedRevision);
-    const leave = beginWorkspaceTransition(session.id, `merge:${newTxId()}`);
-    try {
-      await assertLeadIdle(session, { ownTurn: ownTurn === true });
-      const project = await inspectProject(workspace.projectPath);
-      let branch;
-      if (!workspace.worktreeId && !samePath(workspace.cwd, workspace.projectPath)) {
-        const source = await inspectProject(workspace.cwd);
-        if (!samePath(source.repoCommonDir, project.repoCommonDir)) throw worktreeError('WORKTREE_PROJECT_MISMATCH');
-        branch = source.currentBranch;
-      } else {
-        const backendApi = await backend();
-        const entry = workspace.worktreeId
-          ? await backendApi.findWorktreeContaining(workspace.cwd)
-          : await backendApi.getSessionWorktree(session.id);
-        if (!entry) throw worktreeError('WORKTREE_MISSING', 'This session has no worktree to merge.');
-        assertRetainedFits(entry, project, workspace.projectPath);
-        if (!samePath(entry.projectPath, workspace.projectPath)) {
-          throw worktreeError('WORKTREE_PROJECT_MISMATCH', undefined, {
-            worktreeId: entry.id,
-            worktreeProject: entry.projectPath,
-            projectPath: workspace.projectPath,
-          });
-        }
-        branch = entry.branch;
-      }
-      return await mergeConfirmedTarget(
-        { projectPath: workspace.projectPath, branch, target },
-        (folders, removing, run) => withManagementFolders(folders, removing, run, { actor: session.id })
-      );
-    } finally {
-      leave();
-    }
-  }
-
-  /**
-   * Move the hosted Lead to another Project folder (session set-project, the
-   * desktop/remote setCwd): the one authority for a Project switch, admitted
-   * like a workspace transition. Refused while a turn runs (`ownTurn`: the
-   * Lead's own tool call tolerates its calling turn), while workers run, and
-   * while the session works in a managed worktree. Serialized with turns and
-   * other workspace changes; the prompt refresh of the Lead and its idle
-   * workers completes (or rolls the switch back) before it resolves. Without
-   * a session (a draft) only the runtime cwd and the selection move.
-   * `classifyByMembership` (the desktop/remote move): a folder outside every
-   * registered Project is classified as a task (cwd-apply).
-   * @returns {Promise<string>} the runtime cwd after the switch
-   */
-  async function switchProject(cwd, { ownTurn = false, classifyByMembership = false } = {}) {
-    const selection = { classifyByMembership: classifyByMembership === true };
-    const session = getSession();
-    if (!session?.id) {
-      applyResolvedCwd(cwd, { persistProjectSelection: true, ...selection });
-      return getCurrentCwd();
-    }
-    const leave = beginWorkspaceTransition(session.id, `project:${newTxId()}`);
-    const journal = [];
-    try {
-      await assertLeadIdle(session, { ownTurn: ownTurn === true, shellJobs: false });
-      if (isWorktreeBound(readSessionWorkspace(session))) throw new Error(WORKTREE_BOUND_SWITCH);
-      await steps.switchProject(session, cwd, journal, selection);
-      return getCurrentCwd();
-    } catch (error) {
-      await undoAll(journal, error);
-      throw error;
-    } finally {
-      leave();
-    }
-  }
-
-  async function removeWorktree({ force = false, expectedRevision } = {}, { ownTurn = false } = {}) {
-    const expected = validRevision(expectedRevision);
-    const session = hostedSession(null);
-    return transition(
-      session,
-      { kind: 'remove-worktree', force: force === true },
-      { ownTurn: ownTurn === true, expectedRevision: expected }
-    );
+    return runner.runTransition(sessionRef, target, options);
   }
 
   return {
     applyWorkspaceTransition,
-    prepareTurnWorkspace,
-    admitTurnWorkspace,
+    prepareTurnWorkspace: intents.prepareTurnWorkspace,
+    admitTurnWorkspace: checkouts.admitTurnWorkspace,
     /** The durable workspace record of the hosted session (null: project folder, never moved). */
     getWorkspace: () => getSession()?.workspace ?? null,
     /** What the session snapshot publishes (see getLiveWorkspace). */
-    getLiveWorkspace,
-    getBranchMenu,
+    getLiveWorkspace: view.getLiveWorkspace,
+    getBranchMenu: view.getBranchMenu,
     getProjectBranchMenu: projectBranches.getProjectBranchMenu,
-    selectBranch,
+    selectBranch: intents.selectBranch,
     selectProjectBranch: projectBranches.selectProjectBranch,
     mergeProjectBranch: projectBranches.mergeProjectBranch,
     inspectProjectBranch: projectBranches.inspectProjectBranch,
     manageProjectBranch: projectBranches.manageProjectBranch,
-    requestWorktree,
-    mergeWorkspace,
-    removeWorktree,
-    addBranchWorktree,
-    createSnapshot,
-    removeSnapshot,
-    switchProject,
-    listWorktrees,
-    pruneWorktrees,
-    cleanupDeletedSession,
-    onWorktreeSetup,
-    dispose,
+    requestWorktree: intents.requestWorktree,
+    mergeWorkspace: merge.mergeWorkspace,
+    removeWorktree: runner.removeWorktree,
+    addBranchWorktree: checkouts.addBranchWorktree,
+    createSnapshot: checkouts.createSnapshot,
+    removeSnapshot: checkouts.removeSnapshot,
+    switchProject: runner.switchProject,
+    listWorktrees: worktrees.listWorktrees,
+    pruneWorktrees: worktrees.pruneWorktrees,
+    removeOrphanWorktree: worktrees.removeOrphanWorktree,
+    cleanupDeletedSession: worktrees.cleanupDeletedSession,
+    onWorktreeSetup: setup.onWorktreeSetup,
+    dispose: checkouts.dispose,
   };
 }