@outcomeeng/spx 0.6.14 → 0.6.15

package/dist/cli.js

@@ -4,11 +4,6 @@ import { createRequire as createRequire2 } from "module";
 // src/interfaces/cli/program.ts
 import { Command } from "commander";
 
-// src/domains/config/cwd.ts
-var CONFIG_PROCESS_CWD = {
-  read: () => process.cwd()
-};
-
 // src/domains/config/root.ts
 import { execFileSync } from "child_process";
 import { resolve } from "path";
@@ -41,6 +36,11 @@ var DEFAULT_PRODUCT_DIR_RESOLVER_DEPS = {
   }
 };
 
+// src/lib/config/cwd.ts
+var CONFIG_PROCESS_CWD = {
+  read: () => process.cwd()
+};
+
 // src/interfaces/cli/product-context.ts
 import { resolve as resolve2 } from "path";
 var SPX_GLOBAL_OPTIONS = {
@@ -1720,11 +1720,11 @@ function compareSearchResults(left, right) {
   return `${left.agent}:${left.sessionId}`.localeCompare(`${right.agent}:${right.sessionId}`);
 }
 
-// src/git/root.ts
+// src/lib/git/root.ts
 import { execa } from "execa";
 import { basename, dirname, isAbsolute as isAbsolute2, join, resolve as resolve5 } from "path";
 
-// src/git/environment.ts
+// src/lib/git/environment.ts
 function withoutGitEnvironment(env) {
   const cleaned = { ...env };
   for (const key of Object.keys(cleaned)) {
@@ -1735,7 +1735,7 @@ function withoutGitEnvironment(env) {
   return cleaned;
 }
 
-// src/git/root.ts
+// src/lib/git/root.ts
 var defaultGitDependencies = {
   execa: async (command, args, options) => {
     const result = await execa(command, args, {
@@ -6543,11 +6543,17 @@ function spxReachabilityRunner(probe) {
 var WORKTREE_POOL_VERDICT = {
   COMPLIANT: "compliant",
   NON_COMPLIANT: "non-compliant",
+  MAIN_CHECKOUT_MISSING: "main-checkout-missing",
+  MAIN_CHECKOUT_DETACHED: "main-checkout-detached",
+  MAIN_CHECKOUT_WRONG_BRANCH: "main-checkout-wrong-branch",
   UNKNOWN: "unknown"
 };
 var REMEDIATION5 = {
   [WORKTREE_POOL_VERDICT.COMPLIANT]: "Worktree layout is compliant; no action needed.",
   [WORKTREE_POOL_VERDICT.NON_COMPLIANT]: "Linked worktrees require a bare-repository pool; convert the layout or remove the linked worktrees.",
+  [WORKTREE_POOL_VERDICT.MAIN_CHECKOUT_MISSING]: "Create the repository-named main checkout beside the bare repository and attach it to the default branch.",
+  [WORKTREE_POOL_VERDICT.MAIN_CHECKOUT_DETACHED]: "Attach the designated main checkout to the repository default branch.",
+  [WORKTREE_POOL_VERDICT.MAIN_CHECKOUT_WRONG_BRANCH]: "Switch the designated main checkout to the repository default branch.",
   [WORKTREE_POOL_VERDICT.UNKNOWN]: "Re-run diagnose; if it persists, inspect git worktree list and occupancy claims."
 };
 function record6(verdict, bucket, reading2) {
@@ -6558,6 +6564,10 @@ function record6(verdict, bucket, reading2) {
     readings: {
       bare: String(reading2.bareRepository),
       linked: String(reading2.linkedWorktrees),
+      mainCheckoutPath: reading2.mainCheckoutPath ?? "",
+      defaultBranch: reading2.defaultBranch ?? "",
+      mainCheckoutBranch: reading2.mainCheckoutBranch ?? "",
+      mainCheckoutBranchRead: String(reading2.mainCheckoutBranchRead),
       running: String(reading2.running),
       free: String(reading2.free)
     },
@@ -6571,6 +6581,20 @@ function classifyWorktreePool(reading2) {
   if (!reading2.bareRepository && reading2.linkedWorktrees) {
     return record6(WORKTREE_POOL_VERDICT.NON_COMPLIANT, VERDICT_BUCKET.BROKEN, reading2);
   }
+  if (reading2.bareRepository) {
+    if (reading2.mainCheckoutPath === null) {
+      return record6(WORKTREE_POOL_VERDICT.MAIN_CHECKOUT_MISSING, VERDICT_BUCKET.BROKEN, reading2);
+    }
+    if (reading2.defaultBranch === null || !reading2.mainCheckoutBranchRead) {
+      return record6(WORKTREE_POOL_VERDICT.UNKNOWN, VERDICT_BUCKET.UNKNOWN, reading2);
+    }
+    if (reading2.mainCheckoutBranch === null) {
+      return record6(WORKTREE_POOL_VERDICT.MAIN_CHECKOUT_DETACHED, VERDICT_BUCKET.BROKEN, reading2);
+    }
+    if (reading2.mainCheckoutBranch !== reading2.defaultBranch) {
+      return record6(WORKTREE_POOL_VERDICT.MAIN_CHECKOUT_WRONG_BRANCH, VERDICT_BUCKET.BROKEN, reading2);
+    }
+  }
   return record6(WORKTREE_POOL_VERDICT.COMPLIANT, VERDICT_BUCKET.HEALTHY, reading2);
 }
 function worktreePoolRunner(probe) {
@@ -6638,6 +6662,26 @@ function resolveColorChoice(choice) {
   return choice.isTty;
 }
 
+// src/domains/diagnose/report-contract.ts
+var BUCKET_SEVERITY = {
+  [VERDICT_BUCKET.HEALTHY]: SEVERITY.OK,
+  [VERDICT_BUCKET.DEGRADED]: SEVERITY.WARN,
+  [VERDICT_BUCKET.UNKNOWN]: SEVERITY.UNKNOWN,
+  [VERDICT_BUCKET.BROKEN]: SEVERITY.ERROR,
+  [VERDICT_BUCKET.NOT_APPLICABLE]: SEVERITY.MUTED
+};
+var OVERALL_SEVERITY = {
+  [OVERALL_VERDICT.HEALTHY]: SEVERITY.OK,
+  [OVERALL_VERDICT.DEGRADED]: SEVERITY.WARN,
+  [OVERALL_VERDICT.UNKNOWN]: SEVERITY.UNKNOWN,
+  [OVERALL_VERDICT.BROKEN]: SEVERITY.ERROR
+};
+var CANONICAL_CHECKOUT_PROBLEM = {
+  [WORKTREE_POOL_VERDICT.MAIN_CHECKOUT_DETACHED]: "The designated main checkout is not attached to any branch.",
+  [WORKTREE_POOL_VERDICT.MAIN_CHECKOUT_MISSING]: "The designated main checkout could not be found.",
+  [WORKTREE_POOL_VERDICT.MAIN_CHECKOUT_WRONG_BRANCH]: "The designated main checkout is attached to the wrong branch."
+};
+
 // src/domains/diagnose/report.ts
 var DIAGNOSE_FORMAT = {
   JSON: "json",
@@ -6707,19 +6751,6 @@ var DIAGNOSE_TEXT_DETAIL = {
   UNREGISTERED_MARKETPLACE_FIX: "Register the configured plugin marketplace.",
   WORKTREE_POOL_VALID: "Layout is valid for shared session work."
 };
-var BUCKET_SEVERITY = {
-  [VERDICT_BUCKET.HEALTHY]: SEVERITY.OK,
-  [VERDICT_BUCKET.DEGRADED]: SEVERITY.WARN,
-  [VERDICT_BUCKET.UNKNOWN]: SEVERITY.UNKNOWN,
-  [VERDICT_BUCKET.BROKEN]: SEVERITY.ERROR,
-  [VERDICT_BUCKET.NOT_APPLICABLE]: SEVERITY.MUTED
-};
-var OVERALL_SEVERITY = {
-  [OVERALL_VERDICT.HEALTHY]: SEVERITY.OK,
-  [OVERALL_VERDICT.DEGRADED]: SEVERITY.WARN,
-  [OVERALL_VERDICT.UNKNOWN]: SEVERITY.UNKNOWN,
-  [OVERALL_VERDICT.BROKEN]: SEVERITY.ERROR
-};
 function renderReportJson(report2) {
   return JSON.stringify(
     {
@@ -6885,6 +6916,30 @@ function worktreePoolText(check) {
           `${DIAGNOSE_TEXT_LABEL.FIX}: convert to a bare-repository worktree pool or remove the linked worktrees.`
         ]
       };
+    case WORKTREE_POOL_VERDICT.MAIN_CHECKOUT_MISSING:
+      return {
+        header: DIAGNOSE_TEXT_HEADER.WORKTREE_POOL_INVALID,
+        details: [
+          `${DIAGNOSE_TEXT_LABEL.PROBLEM}: ${CANONICAL_CHECKOUT_PROBLEM[WORKTREE_POOL_VERDICT.MAIN_CHECKOUT_MISSING]}`,
+          `${DIAGNOSE_TEXT_LABEL.FIX}: ${check.remediation}`
+        ]
+      };
+    case WORKTREE_POOL_VERDICT.MAIN_CHECKOUT_DETACHED:
+      return {
+        header: DIAGNOSE_TEXT_HEADER.WORKTREE_POOL_INVALID,
+        details: [
+          `${DIAGNOSE_TEXT_LABEL.PROBLEM}: ${CANONICAL_CHECKOUT_PROBLEM[WORKTREE_POOL_VERDICT.MAIN_CHECKOUT_DETACHED]}`,
+          `${DIAGNOSE_TEXT_LABEL.FIX}: ${check.remediation}`
+        ]
+      };
+    case WORKTREE_POOL_VERDICT.MAIN_CHECKOUT_WRONG_BRANCH:
+      return {
+        header: DIAGNOSE_TEXT_HEADER.WORKTREE_POOL_INVALID,
+        details: [
+          `${DIAGNOSE_TEXT_LABEL.PROBLEM}: ${CANONICAL_CHECKOUT_PROBLEM[WORKTREE_POOL_VERDICT.MAIN_CHECKOUT_WRONG_BRANCH]}`,
+          `${DIAGNOSE_TEXT_LABEL.FIX}: ${check.remediation}`
+        ]
+      };
     case WORKTREE_POOL_VERDICT.UNKNOWN:
       return {
         header: DIAGNOSE_TEXT_HEADER.WORKTREE_POOL_UNKNOWN,
@@ -7670,9 +7725,31 @@ var DIAGNOSE_DOING_SESSION_ARGS = ["session", "list", "--status", "doing", "--js
 var PLUGIN_CACHE_SEGMENTS = ["plugins", "cache"];
 var NOT_FOUND_ERROR_CODE = "ENOENT";
 var VERSION_DIRECTORY_PATTERN = /^\d+(?:\.\d+)*$/;
+var MAIN_CHECKOUT_SYMBOLIC_REF_ARGS = [
+  GIT_ROOT_COMMAND.SYMBOLIC_REF,
+  GIT_ROOT_COMMAND.QUIET,
+  GIT_ROOT_COMMAND.SHORT,
+  GIT_ROOT_COMMAND.HEAD
+];
+async function readMainCheckoutBranch(path7) {
+  try {
+    const result = await defaultGitDependencies.execa(
+      GIT_ROOT_COMMAND.EXECUTABLE,
+      [...MAIN_CHECKOUT_SYMBOLIC_REF_ARGS],
+      { cwd: path7, reject: false }
+    );
+    if (result.exitCode === 0) return { read: true, branch: result.stdout.trim() };
+    if (result.exitCode === 1) return { read: true, branch: null };
+    return { read: false, branch: null };
+  } catch {
+    return { read: false, branch: null };
+  }
+}
 var defaultWorktreePoolSnapshotDependencies = {
   env: process.env,
   gatherGitFacts,
+  resolveDefaultBranch,
+  readMainCheckoutBranch,
   fs: defaultOccupancyFileSystem,
   processTable: defaultProcessTable
 };
@@ -7695,6 +7772,10 @@ function erroredWorktreePoolSnapshot() {
     errored: true,
     bareRepository: false,
     linkedWorktrees: false,
+    mainCheckoutPath: null,
+    defaultBranch: null,
+    mainCheckoutBranch: null,
+    mainCheckoutBranchRead: false,
     worktrees: [],
     currentWorktreeRoot: null,
     liveClaimSessionIds: /* @__PURE__ */ new Set()
@@ -7708,9 +7789,29 @@ function parseDoingSessions(stdout) {
     return null;
   }
 }
+async function gatherMainCheckoutStanding(facts, deps) {
+  const designatedMainCheckout = mainCheckoutPath(facts);
+  if (!facts.commonDirIsBare) {
+    return {
+      mainCheckoutPath: designatedMainCheckout,
+      defaultBranch: null,
+      mainCheckoutBranch: null,
+      mainCheckoutBranchRead: true
+    };
+  }
+  const defaultBranch = await (deps.resolveDefaultBranch ?? resolveDefaultBranch)();
+  const branchReading = designatedMainCheckout === null ? { read: true, branch: null } : await (deps.readMainCheckoutBranch ?? readMainCheckoutBranch)(designatedMainCheckout);
+  return {
+    mainCheckoutPath: designatedMainCheckout,
+    defaultBranch,
+    mainCheckoutBranch: branchReading.branch,
+    mainCheckoutBranchRead: branchReading.read
+  };
+}
 async function gatherWorktreePoolSnapshot(deps = defaultWorktreePoolSnapshotDependencies) {
   const facts = await deps.gatherGitFacts();
   if (!facts?.worktreeListRead) return erroredWorktreePoolSnapshot();
+  const mainCheckoutStanding = await gatherMainCheckoutStanding(facts, deps);
   const worktreesDir = worktreesScopeDir(dirname3(facts.commonDir));
   const worktrees = [];
   const liveClaimSessionIds = /* @__PURE__ */ new Set();
@@ -7739,6 +7840,7 @@ async function gatherWorktreePoolSnapshot(deps = defaultWorktreePoolSnapshotDepe
     errored: false,
     bareRepository: facts.commonDirIsBare,
     linkedWorktrees: !facts.commonDirIsBare && facts.worktreeRoots.length > 1,
+    ...mainCheckoutStanding,
     worktrees,
     currentWorktreeRoot: facts.worktreeRoot,
     liveClaimSessionIds
@@ -7750,6 +7852,10 @@ function worktreePoolReadingFromSnapshot(snapshot) {
       errored: true,
       bareRepository: false,
       linkedWorktrees: false,
+      mainCheckoutPath: null,
+      defaultBranch: null,
+      mainCheckoutBranch: null,
+      mainCheckoutBranchRead: false,
       running: 0,
       free: 0
     };
@@ -7764,6 +7870,10 @@ function worktreePoolReadingFromSnapshot(snapshot) {
     errored: false,
     bareRepository: snapshot.bareRepository,
     linkedWorktrees: snapshot.linkedWorktrees,
+    mainCheckoutPath: snapshot.mainCheckoutPath,
+    defaultBranch: snapshot.defaultBranch,
+    mainCheckoutBranch: snapshot.mainCheckoutBranch,
+    mainCheckoutBranchRead: snapshot.mainCheckoutBranchRead,
     running,
     free
   };
@@ -12326,7 +12436,7 @@ var sessionDomain = {
 import { access } from "fs/promises";
 import { join as join16 } from "path";
 
-// src/git/tracked-paths.ts
+// src/lib/git/tracked-paths.ts
 var GIT_LS_FILES_SUBCOMMAND = "ls-files";
 var GIT_NUL_TERMINATED_FLAG = "-z";
 var TRACKED_PATH_NUL_SEPARATOR = "\0";
@@ -12953,13 +13063,14 @@ function lowerIndexSiblingsForContextNodes(snapshot, contextNodes) {
   return lowerSiblings;
 }
 function decisionsFor(snapshot, contextNodes) {
-  const contextByParentId = /* @__PURE__ */ new Map();
-  for (const node of contextNodes) {
-    contextByParentId.set(node.parentId, node.order);
-  }
+  const constrainingOrderByParentId = new Map(
+    contextNodes.map((node) => [node.parentId, node.order])
+  );
+  const targetId = contextNodes.at(-1)?.id;
   return snapshot.decisions.filter((decision) => {
-    const constrainedOrder = contextByParentId.get(decision.parentId);
-    return constrainedOrder !== void 0 && decision.order < constrainedOrder;
+    if (decision.parentId === targetId) return true;
+    const constrainingOrder = constrainingOrderByParentId.get(decision.parentId);
+    return constrainingOrder !== void 0 && decision.order < constrainingOrder;
   });
 }
 function evidenceFor(snapshot, target) {
@@ -13788,16 +13899,100 @@ function pathsFromNulDelimited(stdout) {
   return nulDelimitedFields(stdout).sort(compareAsciiStrings);
 }
 
+// src/lib/git/changed-paths.ts
+var GIT_DIFF_CACHED_FLAG = "--cached";
+var GIT_LS_FILES_COMMAND = "ls-files";
+var GIT_LS_FILES_OTHERS_FLAG = "--others";
+var GIT_LS_FILES_EXCLUDE_STANDARD_FLAG = "--exclude-standard";
+function uniqueSortedPaths(paths) {
+  return [...new Set(paths)].sort(compareAsciiStrings);
+}
+async function gitStdout(git, productDir, args, errorMessage) {
+  const result = await git.execa(GIT_ROOT_COMMAND.EXECUTABLE, [...args], { cwd: productDir, reject: false });
+  if (result.exitCode !== 0) {
+    throw new Error(`${errorMessage}: ${result.stderr}`);
+  }
+  return result.stdout;
+}
+async function changedPathsForCommittedRange(options) {
+  const stdout = await gitStdout(
+    options.git,
+    options.productDir,
+    changesetNameStatusArgs(options.base, options.head),
+    "failed to diff committed changed paths"
+  );
+  return pathsFromNameStatus(stdout);
+}
+async function changedPathsForStagedComparison(options) {
+  const stdout = await gitStdout(
+    options.git,
+    options.productDir,
+    [
+      GIT_DIFF_COMMAND,
+      GIT_DIFF_CACHED_FLAG,
+      GIT_NAME_STATUS_FLAG,
+      GIT_NULL_DELIMITED_FLAG,
+      options.base
+    ],
+    "failed to diff staged changed paths"
+  );
+  return pathsFromNameStatus(stdout);
+}
+async function changedPathsForWorktreeComparison(options) {
+  const trackedStdout = await gitStdout(
+    options.git,
+    options.productDir,
+    [
+      GIT_DIFF_COMMAND,
+      GIT_NAME_STATUS_FLAG,
+      GIT_NULL_DELIMITED_FLAG,
+      options.base
+    ],
+    "failed to diff worktree changed paths"
+  );
+  const untrackedPaths = await untrackedProductPaths(options);
+  return uniqueSortedPaths([
+    ...pathsFromNameStatus(trackedStdout),
+    ...untrackedPaths
+  ]);
+}
+async function changedPathsForDirtyWorktree(options) {
+  const trackedStdout = await gitStdout(
+    options.git,
+    options.productDir,
+    [
+      GIT_DIFF_COMMAND,
+      GIT_NAME_STATUS_FLAG,
+      GIT_NULL_DELIMITED_FLAG
+    ],
+    "failed to diff dirty worktree paths"
+  );
+  const untrackedPaths = await untrackedProductPaths(options);
+  return uniqueSortedPaths([
+    ...pathsFromNameStatus(trackedStdout),
+    ...untrackedPaths
+  ]);
+}
+async function untrackedProductPaths(options) {
+  const stdout = await gitStdout(
+    options.git,
+    options.productDir,
+    [
+      GIT_LS_FILES_COMMAND,
+      GIT_LS_FILES_OTHERS_FLAG,
+      GIT_LS_FILES_EXCLUDE_STANDARD_FLAG,
+      GIT_NULL_DELIMITED_FLAG
+    ],
+    "failed to list untracked paths"
+  );
+  return pathsFromNulDelimited(stdout);
+}
+
 // src/commands/test/changed-set-planning.ts
-var CHANGED_TEST_DIFF_COMMAND = "diff";
-var CHANGED_TEST_DIFF_CACHED_FLAG = "--cached";
-var CHANGED_TEST_LS_FILES_COMMAND = "ls-files";
+var CHANGED_TEST_LS_FILES_COMMAND = GIT_LS_FILES_COMMAND;
 var CHANGED_TEST_SHOW_COMMAND = "show";
 var CHANGED_TEST_INDEX_PATH_PREFIX = ":";
-var CHANGED_TEST_DIFF_NAME_STATUS_FLAG = GIT_NAME_STATUS_FLAG;
 var CHANGED_TEST_NULL_DELIMITED_FLAG = GIT_NULL_DELIMITED_FLAG;
-var CHANGED_TEST_LS_FILES_OTHERS_FLAG = "--others";
-var CHANGED_TEST_LS_FILES_EXCLUDE_STANDARD_FLAG = "--exclude-standard";
 var CHANGED_TEST_LS_FILES_CACHED_FLAG = "--cached";
 var HEAD_REF = "HEAD";
 var ORIGIN_REMOTE = "origin";
@@ -13819,7 +14014,6 @@ var CHANGED_TEST_PRODUCT_INPUT_PATHS = [
   "src/config/source-roots.ts"
 ];
 var EMPTY_TREE_SHA = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
-var changedPathsFromNameStatus = pathsFromNameStatus;
 function stagedSnapshotReadError(path7, stderr) {
   const error = new Error(
     `failed to read staged test candidate for changed test planning: ${path7}: ${stderr}`
@@ -13849,48 +14043,13 @@ async function requiredRefSha(ref, productDir, git) {
   return sha;
 }
 async function changedPaths(productDir, baseSha, staged, git) {
-  const runner = git?.execa;
-  if (runner === void 0) {
+  if (git === void 0) {
     throw new Error("changed test planning requires injected git access");
   }
-  const result = await runner(
-    GIT_ROOT_COMMAND.EXECUTABLE,
-    [
-      CHANGED_TEST_DIFF_COMMAND,
-      ...staged ? [CHANGED_TEST_DIFF_CACHED_FLAG, CHANGED_TEST_DIFF_NAME_STATUS_FLAG, CHANGED_TEST_NULL_DELIMITED_FLAG] : [CHANGED_TEST_DIFF_NAME_STATUS_FLAG, CHANGED_TEST_NULL_DELIMITED_FLAG],
-      baseSha
-    ],
-    { cwd: productDir, reject: false }
-  );
-  if (result.exitCode !== 0) {
-    throw new Error(`failed to diff changed paths for test planning: ${result.stderr}`);
-  }
-  const diffPaths = changedPathsFromNameStatus(result.stdout);
   if (staged) {
-    return diffPaths;
-  }
-  const untrackedPaths = await untrackedWorktreePaths(productDir, git);
-  return [.../* @__PURE__ */ new Set([...diffPaths, ...untrackedPaths])].sort(compareAsciiStrings);
-}
-async function untrackedWorktreePaths(productDir, git) {
-  const runner = git?.execa;
-  if (runner === void 0) {
-    throw new Error("changed test planning requires injected git access");
-  }
-  const result = await runner(
-    GIT_ROOT_COMMAND.EXECUTABLE,
-    [
-      CHANGED_TEST_LS_FILES_COMMAND,
-      CHANGED_TEST_LS_FILES_OTHERS_FLAG,
-      CHANGED_TEST_LS_FILES_EXCLUDE_STANDARD_FLAG,
-      CHANGED_TEST_NULL_DELIMITED_FLAG
-    ],
-    { cwd: productDir, reject: false }
-  );
-  if (result.exitCode !== 0) {
-    throw new Error(`failed to list untracked paths for changed test planning: ${result.stderr}`);
+    return await changedPathsForStagedComparison({ productDir, base: baseSha, git });
   }
-  return pathsFromNulDelimited(result.stdout);
+  return await changedPathsForWorktreeComparison({ productDir, base: baseSha, git });
 }
 function isSpecTestPath(path7) {
   return path7.startsWith(SPEC_ROOT_PREFIX) && path7.includes(SPEC_TESTS_PATH_SEGMENT);
@@ -14153,33 +14312,7 @@ function stagedSnapshotFileReader(productDir, git) {
   };
 }
 async function dirtyWorktreePaths(productDir, git) {
-  const tracked = await git.execa(
-    GIT_ROOT_COMMAND.EXECUTABLE,
-    [CHANGED_TEST_DIFF_COMMAND, CHANGED_TEST_DIFF_NAME_STATUS_FLAG, CHANGED_TEST_NULL_DELIMITED_FLAG],
-    { cwd: productDir, reject: false }
-  );
-  if (tracked.exitCode !== 0) {
-    throw new Error(`failed to diff worktree paths for staged test planning: ${tracked.stderr}`);
-  }
-  const untracked = await git.execa(
-    GIT_ROOT_COMMAND.EXECUTABLE,
-    [
-      CHANGED_TEST_LS_FILES_COMMAND,
-      CHANGED_TEST_LS_FILES_OTHERS_FLAG,
-      CHANGED_TEST_LS_FILES_EXCLUDE_STANDARD_FLAG,
-      CHANGED_TEST_NULL_DELIMITED_FLAG
-    ],
-    { cwd: productDir, reject: false }
-  );
-  if (untracked.exitCode !== 0) {
-    throw new Error(`failed to list untracked paths for staged test planning: ${untracked.stderr}`);
-  }
-  return [
-    .../* @__PURE__ */ new Set([
-      ...pathsFromNameStatus(tracked.stdout),
-      ...pathsFromNulDelimited(untracked.stdout)
-    ])
-  ].sort(compareAsciiStrings);
+  return await changedPathsForDirtyWorktree({ productDir, git });
 }
 function isSpecTreeTestPath(path7) {
   return path7.startsWith(`${SPEC_TREE_ROOT_OPERAND}${PATH_SEPARATOR2}`) && path7.includes(SPEC_TREE_TESTS_PATH_SEGMENT);
@@ -15438,6 +15571,10 @@ var SPEC_DOMAIN_CLI = {
 var SPEC_STATUS_FORMAT_MESSAGE = {
   INVALID_PREFIX: "Invalid format"
 };
+var SPEC_CONTEXT_OUTPUT_FORMAT = {
+  TEXT: "text",
+  JSON: "json"
+};
 var VALID_STATUS_FORMATS = [
   OUTPUT_FORMAT.TEXT,
   OUTPUT_FORMAT.JSON,
@@ -15472,6 +15609,9 @@ function handleCommandError(io, error) {
 `);
   return io.exit(1);
 }
+async function contextOutputForFormat(format2, options) {
+  return format2 === SPEC_CONTEXT_OUTPUT_FORMAT.JSON ? contextCommand(options) : contextTextCommand(options);
+}
 function resolveStatusFormat(options) {
   if (options.json === true) {
     return "json";
@@ -15491,7 +15631,8 @@ function registerSpecCommands(specCmd, invocation) {
   const onWarning = (warning) => writeInvocationWarning3(invocation.io, warning);
   specCmd.command(SPEC_DOMAIN_CLI.CONTEXT_COMMAND).description("Load deterministic context for a spec-tree node").argument("<target>", "Spec-tree node path").option(SPEC_DOMAIN_CLI.JSON_OPTION, "Output as JSON").action(async (target, options) => {
     try {
-      const output = options.json === true ? await contextCommand({ target, cwd: productDir(), onWarning }) : await contextTextCommand({ target, cwd: productDir(), onWarning });
+      const format2 = options.json === true ? SPEC_CONTEXT_OUTPUT_FORMAT.JSON : SPEC_CONTEXT_OUTPUT_FORMAT.TEXT;
+      const output = await contextOutputForFormat(format2, { target, cwd: productDir(), onWarning });
       writeOutput4(invocation.io, output);
     } catch (error) {
       handleCommandError(invocation.io, error);
@@ -22049,22 +22190,27 @@ async function resolveVerifyScope(deps) {
     ok: true,
     value: {
       productDir: product.productDir,
+      worktreeRoot: product.worktreeRoot,
       branchSlug: slugBranchIdentity(branchIdentity),
       backendIdentity: backend.value
     }
   };
 }
-async function resolveChangedScope(scope2, deps) {
-  const cwd = deps.cwd ?? CONFIG_PROCESS_CWD.read();
+async function resolveChangedScope(scope2, productDir, deps) {
   const git = deps.git ?? defaultGitDependencies;
-  const diff = await git.execa(GIT_ROOT_COMMAND.EXECUTABLE, [...changesetNameStatusArgs(scope2.base, scope2.head)], {
-    cwd,
-    reject: false
-  });
-  if (diff.exitCode !== VERIFY_CLI_EXIT_CODE.OK) {
-    return { ok: false, error: `${VERIFY_CLI_ERROR.CHANGED_SCOPE_FAILED}: ${diff.stderr}` };
+  try {
+    return {
+      ok: true,
+      value: await changedPathsForCommittedRange({
+        productDir,
+        base: scope2.base,
+        head: scope2.head,
+        git
+      })
+    };
+  } catch (error) {
+    return { ok: false, error: `${VERIFY_CLI_ERROR.CHANGED_SCOPE_FAILED}: ${error.message}` };
   }
-  return { ok: true, value: pathsFromNameStatus(diff.stdout) };
 }
 async function persistInputRecord(runScope2, record7, deps) {
   const path7 = verifyInputRecordPath(runScope2);
@@ -22231,7 +22377,7 @@ async function verifyStartCommand(options, deps) {
   if (!inputContent.ok) return errorResult3(inputContent.error);
   const inputDigest = digestRunInput(options.input, inputContent.value);
   if (!inputDigest.ok) return errorResult3(inputDigest.error);
-  const changedScope = await resolveChangedScope(scope2.value, deps);
+  const changedScope = await resolveChangedScope(scope2.value, resolved.value.worktreeRoot, deps);
   if (!changedScope.ok) return errorResult3(changedScope.error);
   const context = await verificationContextCreateCommand(
     {