@opengsd/gsd-core 1.9.1 → 1.11.0

package/gsd-core/workflows/review.md

@@ -24,6 +24,7 @@ command -v opencode >/dev/null 2>&1 && echo "opencode:available" || echo "openco
 command -v qwen >/dev/null 2>&1 && echo "qwen:available" || echo "qwen:missing"
 command -v cursor-agent >/dev/null 2>&1 && echo "cursor:available" || echo "cursor:missing"
 command -v agy >/dev/null 2>&1 && echo "antigravity:available" || echo "antigravity:missing"
+command -v kimi >/dev/null 2>&1 && echo "kimi-code:available" || echo "kimi-code:missing"
 
 # Check local model servers (OpenAI-compatible HTTP API — no CLI binary required)
 OLLAMA_HOST=$(gsd_run query config-get review.ollama_host --raw 2>/dev/null || echo "")
@@ -75,6 +76,7 @@ Parse flags from `$ARGUMENTS`:
 - `--qwen` → include Qwen Code
 - `--cursor` → include Cursor
 - `--agy` or `--antigravity` → include Antigravity CLI
+- `--kimi-code` → include Kimi CLI
 - `--ollama` → include Ollama (local server, OpenAI-compatible)
 - `--lm-studio` → include LM Studio (local server, OpenAI-compatible)
 - `--llama-cpp` → include llama.cpp (local server, OpenAI-compatible)
@@ -105,10 +107,9 @@ user who wants a preferred set has `review.default_reviewers`. Both stay lenient
   preference evaluated across many hosts, so a subset being present is expected, not an error
 - If all configured reviewers are unavailable, fail with an actionable message
 
-**Reviewer instances (#1517, optional):** if `review.reviewer_instances` is configured,
-instance names in `review.default_reviewers` run as independent identities. Resolution rules
-are in `gsd-core/references/reviewer-instances.md` — load it lazily only when instances are
-configured. Unconfigured → default path unchanged.
+<!-- gsd:section id="reviewer-instances-note-1" when="state:reviewer-instances-configured" -->
+If `section_manifest` is `null` or `"reviewer-instances-note-1"` is in its `included` list: read and execute `gsd-core/workflows/review/steps/reviewer-instances-note-1.md`. Otherwise skip — do not read the file.
+<!-- /gsd:section -->
 
 If no CLIs are available:
 ```
@@ -156,7 +157,7 @@ Rules:
 Collect phase artifacts for the review prompt:
 
 ```bash
-INIT=$(gsd_run query init.phase-op "${PHASE_ARG}")
+INIT=$(gsd_run query init.review "${PHASE_ARG}")
 if [[ "$INIT" == @file:* ]]; then INIT=$(cat "${INIT#@file:}"); fi
 
 # #2358: ONE run-scoped temp dir (portable via ${TMPDIR:-/tmp}) so overlapping
@@ -243,6 +244,9 @@ Write to a temp file: `{run_dir}/gsd-review-prompt.md`
 Also write individual section files so the budget tool can re-trim per reviewer:
 
 ```bash
+# #2962: zsh aborts the block on an unmatched for-list glob (nomatch); bash passes it through. nullglob both.
+shopt -s nullglob 2>/dev/null; setopt NULL_GLOB 2>/dev/null
+
 RUN_DIR="{run_dir}"   # from gather_context
 
 # Write individual section files for per-reviewer budget trimming
@@ -262,11 +266,13 @@ done
 if [ -f ".planning/PROJECT.md" ]; then
   cp .planning/PROJECT.md "${RUN_DIR}/gsd-review-project.md"
 fi
-if ls "${PHASE_DIR}/"*"-CONTEXT.md" >/dev/null 2>&1; then
-  cat "${PHASE_DIR}/"*"-CONTEXT.md" > "${RUN_DIR}/gsd-review-context.md"
+_CTX=( "${PHASE_DIR}"/*-CONTEXT.md )
+if [ ${#_CTX[@]} -gt 0 ]; then
+  cat "${_CTX[@]}" > "${RUN_DIR}/gsd-review-context.md"
 fi
-if ls "${PHASE_DIR}/"*"-RESEARCH.md" >/dev/null 2>&1; then
-  cat "${PHASE_DIR}/"*"-RESEARCH.md" > "${RUN_DIR}/gsd-review-research.md"
+_RESEARCH=( "${PHASE_DIR}"/*-RESEARCH.md )
+if [ ${#_RESEARCH[@]} -gt 0 ]; then
+  cat "${_RESEARCH[@]}" > "${RUN_DIR}/gsd-review-research.md"
 fi
 if [ -f ".planning/REQUIREMENTS.md" ]; then
   cp .planning/REQUIREMENTS.md "${RUN_DIR}/gsd-review-requirements.md"
@@ -306,13 +312,16 @@ An environment that genuinely hits an untrusted-hook prompt surfaces through the
 the empty-output stub as a dropped lane with diagnosable stderr, not silent attrition. Do not
 reintroduce the flag (even spelled out in prose — a regression test bans the literal file-wide).
 
-**Reviewer instances (#1517, optional):** instances resolve *through* a lane and are not lanes
-themselves (ADR-2782 D8). Each selected instance invokes its base `cli` with its own `model`/`agent`
-as opaque argv. Exact invocation in `gsd-core/references/reviewer-instances.md`.
+<!-- gsd:section id="reviewer-instances-note-2" when="state:reviewer-instances-configured" -->
+If `section_manifest` is `null` or `"reviewer-instances-note-2"` is in its `included` list: read and execute `gsd-core/workflows/review/steps/reviewer-instances-note-2.md`. Otherwise skip — do not read the file.
+<!-- /gsd:section -->
 
 Lanes run **sequentially, not in parallel** — concurrent invocation trips provider rate limits.
 
 ```bash
+# #2962: zsh aborts the block on an unmatched for-list glob (nomatch); bash passes it through. nullglob both.
+shopt -s nullglob 2>/dev/null; setopt NULL_GLOB 2>/dev/null
+
 RUN_DIR="{run_dir}"
 REPO_ROOT="$(git rev-parse --show-toplevel 2>/dev/null || pwd)"
 # SELECTED_REVIEWERS is the comma-separated result of reviewer selection (ADR-0011 precedence:
@@ -414,12 +423,31 @@ names, each gets its own `## <Adapter> Review (<instance>)` section, and ≥2 sa
 instances print a one-line shared-adapter caveat. Format in
 `gsd-core/references/reviewer-instances.md`.
 
+**Resolved model (#2295):** each lane's `review-lane invoke --json` line in
+`{run_dir}/gsd-review-lane-results.jsonl` carries a `model` object; render `models:` from
+its `value` and `model_sources:` from its `source`. Both maps carry exactly one entry per
+reviewer that appears in `reviewers:` — the two key sets always match. Write the literal
+`unknown` rather than omitting a key: an omitted key is indistinguishable from the feature
+not having run, and a reader must be able to tell *no model recorded* from *nothing to
+look at*. Emit every `models:`/`model_sources:` value as a DOUBLE-QUOTED YAML scalar — a
+legitimate model id can contain `:` (`llama3:70b`, `qwen2.5:7b`), which is unquotable as a
+bare scalar; a control character is already refused at the recording seam, so quoting is
+what closes the remaining `:`/`#`/leading-`-` cases. When GSD applied a reasoning effort to
+a lane, its `value` already carries a `(reasoning=<level>)` suffix (e.g.
+`gpt-5.6-sol (reasoning=high)`) — render it as-is, without re-deriving or re-formatting it.
+
 ```markdown
 ---
 phase: {N}
 reviewers: [gemini, claude, codex, coderabbit, opencode, qwen, cursor, antigravity, ollama, lm_studio, llama_cpp]  # populate at runtime with only the reviewers actually invoked
 reviewed_at: {ISO timestamp}
 plans_reviewed: [{list of PLAN.md files}]
+models:                   # resolved model per reviewer; `unknown` when not recoverable
+  codex: "gpt-5.6-sol (reasoning=low)"
+  antigravity: "unknown"
+model_sources:            # how each value above was determined
+  codex: "banner"
+  antigravity: "unknown"
 trimmed_reviewers:        # only present if at least one reviewer was trimmed
   ollama:
     budget: 6000
@@ -457,7 +485,7 @@ trimmed_reviewers:        # only present if at least one reviewer was trimmed
 
 ## Consensus Summary
 
-{synthesize common concerns across all reviewers. CodeRabbit is a diff-only reviewer (it never received the source-grounding prompt), so do not weight its verdict as a grounded plan review — fold in its diff findings, but base plan-level consensus on the prompt-fed reviewers. A reviewer output carrying the `[reviewed-without-repo-access]` marker (or beginning with `REVIEWED-WITHOUT-REPO-ACCESS`) ran without repo access (#2176) — treat it the same way: note its concerns, but do not count its verdict at full consensus weight.}
+{synthesize common concerns across all reviewers. CodeRabbit is a diff-only reviewer (it never received the source-grounding prompt), so do not weight its verdict as a grounded plan review — fold in its diff findings, but base plan-level consensus on the prompt-fed reviewers. A reviewer output carrying the `[reviewed-without-repo-access]` marker (or beginning with `REVIEWED-WITHOUT-REPO-ACCESS`) ran without repo access (#2176) — treat it the same way: note its concerns, but do not count its verdict at full consensus weight. A reviewer output carrying the `[reviewed-without-source-citations]` marker (#3194) declared source-grounded evidence but cited no `file:line` evidence, so it reviewed the plan text only — treat it the same way: note its concerns, but do not count its verdict at full consensus weight.}
 
 ### Agreed Strengths
 {strengths mentioned by 2+ reviewers}

package/gsd-core/workflows/section-manifest.json

@@ -0,0 +1,219 @@
+{
+  "workflows": {
+    "autonomous": [
+      {
+        "id": "converge-fail-fast",
+        "when": "state:plan-strategy-converge",
+        "read": "gsd-core/workflows/autonomous/steps/converge-fail-fast.md"
+      },
+      {
+        "id": "converge-banner",
+        "when": "state:plan-strategy-converge",
+        "read": "gsd-core/workflows/autonomous/steps/converge-banner.md"
+      },
+      {
+        "id": "converge-dispatch-bg",
+        "when": "state:plan-strategy-converge",
+        "read": "gsd-core/workflows/autonomous/steps/converge-dispatch-bg.md"
+      },
+      {
+        "id": "converge-dispatch-inline",
+        "when": "state:plan-strategy-converge",
+        "read": "gsd-core/workflows/autonomous/steps/converge-dispatch-inline.md"
+      },
+      {
+        "id": "converge-loop",
+        "when": "state:plan-strategy-converge",
+        "read": "gsd-core/workflows/autonomous/steps/converge-loop.md"
+      }
+    ],
+    "code-review": [
+      {
+        "id": "structural-pre-pass",
+        "when": "state:fallow-enabled",
+        "read": "gsd-core/workflows/code-review/steps/structural-pre-pass.md"
+      },
+      {
+        "id": "dispatch-fix",
+        "when": "flag:--fix",
+        "read": "gsd-core/workflows/code-review/steps/dispatch-fix.md"
+      }
+    ],
+    "complete-milestone": [
+      {
+        "id": "git-tag",
+        "when": "state:git-create-tag",
+        "read": "gsd-core/workflows/complete-milestone/steps/git-tag.md"
+      }
+    ],
+    "discuss-phase-assumptions": [
+      {
+        "id": "auto-advance-dispatch",
+        "when": "state:auto-advance-active",
+        "read": "gsd-core/workflows/discuss-phase-assumptions/steps/auto-advance-dispatch.md"
+      }
+    ],
+    "docs-update": [
+      {
+        "id": "dispatch-monorepo-packages",
+        "when": "state:is-monorepo",
+        "read": "gsd-core/workflows/docs-update/steps/dispatch-monorepo-packages.md"
+      }
+    ],
+    "execute-phase": [
+      {
+        "id": "partial-wave",
+        "when": "flag:--wave",
+        "read": "gsd-core/workflows/execute-phase/steps/partial-wave.md"
+      },
+      {
+        "id": "gap-closure-artifacts",
+        "when": "state:gap-closure-phase",
+        "read": "gsd-core/workflows/execute-phase/steps/gap-closure-artifacts.md"
+      },
+      {
+        "id": "regression-gate",
+        "when": "state:has-prior-phases",
+        "read": "gsd-core/workflows/execute-phase/steps/regression-gate.md"
+      }
+    ],
+    "new-milestone": [
+      {
+        "id": "project-md-milestone-write",
+        "when": "state:flat-mode",
+        "read": "gsd-core/workflows/new-milestone/steps/project-md-milestone-write.md"
+      },
+      {
+        "id": "reset-phase-safety",
+        "when": "flag:--reset-phase-numbers",
+        "read": "gsd-core/workflows/new-milestone/steps/reset-phase-safety.md"
+      }
+    ],
+    "new-project": [
+      {
+        "id": "auto-mode-detection",
+        "when": "flag:--auto",
+        "read": "gsd-core/workflows/new-project/steps/auto-mode-detection.md"
+      },
+      {
+        "id": "codebase-map-offer",
+        "when": "state:needs-codebase-map",
+        "read": "gsd-core/workflows/new-project/steps/codebase-map-offer.md"
+      },
+      {
+        "id": "auto-mode-config",
+        "when": "flag:--auto",
+        "read": "gsd-core/workflows/new-project/steps/auto-mode-config.md"
+      }
+    ],
+    "plan-phase": [
+      {
+        "id": "reviews-prerequisite",
+        "when": "flag:--reviews",
+        "read": "gsd-core/workflows/plan-phase/steps/reviews-prerequisite.md"
+      },
+      {
+        "id": "prd-express-gate",
+        "when": "flag:--prd",
+        "read": "gsd-core/workflows/plan-phase/steps/prd-express-gate.md"
+      },
+      {
+        "id": "adr-ingest-express-path",
+        "when": "flag:--ingest",
+        "read": "gsd-core/workflows/plan-phase/steps/adr-ingest-express-path.md"
+      },
+      {
+        "id": "research-only-modifiers",
+        "when": "flag:--research-phase",
+        "read": "gsd-core/workflows/plan-phase/steps/research-only-modifiers.md"
+      },
+      {
+        "id": "research-only-early-exit",
+        "when": "flag:--research-phase",
+        "read": "gsd-core/workflows/plan-phase/steps/research-only-early-exit.md"
+      },
+      {
+        "id": "chunked-planning-mode",
+        "when": "state:chunked-mode",
+        "read": "gsd-core/workflows/plan-phase/steps/chunked-planning-mode.md"
+      }
+    ],
+    "progress": [
+      {
+        "id": "mvp-display",
+        "when": "state:phase-mvp-mode",
+        "read": "gsd-core/workflows/progress/steps/mvp-display.md"
+      },
+      {
+        "id": "forensic-audit",
+        "when": "flag:--forensic",
+        "read": "gsd-core/workflows/progress/steps/forensic-audit.md"
+      }
+    ],
+    "quick": [
+      {
+        "id": "discussion-phase",
+        "when": "flag:--discuss",
+        "read": "gsd-core/workflows/quick/steps/discussion-phase.md"
+      },
+      {
+        "id": "research-phase",
+        "when": "flag:--research",
+        "read": "gsd-core/workflows/quick/steps/research-phase.md"
+      },
+      {
+        "id": "plan-checker-loop",
+        "when": "flag:--validate",
+        "read": "gsd-core/workflows/quick/steps/plan-checker-loop.md"
+      },
+      {
+        "id": "worktree-pre-dispatch-commit",
+        "when": "state:worktrees-enabled",
+        "read": "gsd-core/workflows/quick/steps/worktree-pre-dispatch-commit.md"
+      },
+      {
+        "id": "quick-verification",
+        "when": "flag:--validate",
+        "read": "gsd-core/workflows/quick/steps/quick-verification.md"
+      }
+    ],
+    "review": [
+      {
+        "id": "reviewer-instances-note-1",
+        "when": "state:reviewer-instances-configured",
+        "read": "gsd-core/workflows/review/steps/reviewer-instances-note-1.md"
+      },
+      {
+        "id": "reviewer-instances-note-2",
+        "when": "state:reviewer-instances-configured",
+        "read": "gsd-core/workflows/review/steps/reviewer-instances-note-2.md"
+      }
+    ],
+    "transition": [
+      {
+        "id": "workstream-collision-check",
+        "when": "state:workstream-active",
+        "read": "gsd-core/workflows/transition/steps/workstream-collision-check.md"
+      }
+    ],
+    "update": [
+      {
+        "id": "channel-banner",
+        "when": "state:next-channel",
+        "read": "gsd-core/workflows/update/steps/channel-banner.md"
+      }
+    ],
+    "verify-work": [
+      {
+        "id": "automated-ui-verification",
+        "when": "state:ui-phase-active",
+        "read": "gsd-core/workflows/verify-work/steps/automated-ui-verification.md"
+      },
+      {
+        "id": "mvp-uat-framing",
+        "when": "state:phase-mvp-mode",
+        "read": "gsd-core/workflows/verify-work/steps/mvp-uat-framing.md"
+      }
+    ]
+  }
+}

package/gsd-core/workflows/secure-phase.md

@@ -115,7 +115,7 @@ Print: `◆ Spawning security auditor... (runs in a subagent — no output until
 ```
 Agent(
   prompt="Read ~/.claude/agents/gsd-security-auditor.md for instructions.\n\n" +
-    "<files_to_read>{PLAN, SUMMARY, impl files, SECURITY.md}</files_to_read>" +
+    "<required_reading>{PLAN, SUMMARY, impl files, SECURITY.md}</required_reading>" +
     "<threat_register>{threat register}</threat_register>" +
     "<config>asvs_level: {SECURITY_ASVS}, block_on: {SECURITY_BLOCK_ON}</config>" +
     "<constraints>Never modify implementation files. Verify mitigations exist — do not scan for new threats. Escalate implementation gaps. Return a structured verdict only — do NOT write SECURITY.md (the orchestrator owns the file write).</constraints>" +

package/gsd-core/workflows/session-report.md

@@ -34,7 +34,8 @@ Read `.planning/ROADMAP.md` to get milestone name and goals.
 
 Check for existing reports:
 ```bash
-ls -la .planning/reports/SESSION_REPORT*.md 2>/dev/null || echo "No previous reports"
+_REPORTS=( .planning/reports/SESSION_REPORT*.md )
+if [ -e "${_REPORTS[0]}" ]; then ls -la "${_REPORTS[@]}"; else echo "No previous reports"; fi
 ```
 </step>
 

package/gsd-core/workflows/settings.md

@@ -59,7 +59,7 @@ Parse current values (default to `true` if not present):
 - `graphify.auto_update` — opt-in: auto-rebuild graph after main HEAD advances (#3347) (default: `false`)
 - `model_profile` — which model each agent uses (default: `balanced`)
 - `git.branching_strategy` — branching approach (default: `"none"`)
-- `workflow.use_worktrees` — whether parallel executor agents run in worktree isolation (default: `true`)
+- `workflow.use_worktrees` — whether parallel executor agents run in worktree isolation (honored when the runtime declares a `dispatch.isolation` primitive — `harness-worktree` or `orchestrator-worktree`; runtimes declaring `none` default it to `false` and fail closed on an explicit `true` — #1521, #2486, #2584)
 - `model_policy.provider` — provider slug for model policy (default: `null`; known values: anthropic, openai, google, qwen; set via /gsd:config --advanced)
 - `model_policy.budget` — budget level for model policy (default: `null`; known values: high, medium, low; set via /gsd:config --advanced)
 - `model_policy.high` — model ID for high-cost tier (default: `null`; set via /gsd:config --advanced)
@@ -87,6 +87,30 @@ configure `model_overrides` manually in .planning/config.json to target specific
 models per agent.
 ```
 
+**Isolation resolution for the Worktrees question (#2486):** resolve the runtime's declared executor-isolation primitive and the current worktrees value before presenting the questions. Use `inspect-dispatch-isolation`, the **sentinel-free** inspection verb — never `dispatch-isolation`, whose #3045 contract records the resolved decision to the executor-dispatch sentinel as an unconditional side effect; a settings menu must not be able to stamp a sentinel the isolation guards then enforce against real dispatches. Sentinel-free is the exact claim: the shared CLI bootstrap still runs, but nothing it does can block a dispatch. The worktrees read deliberately carries no `--default`/fallback: an absent key must stay distinguishable from an explicit `false` (empty output = key absent), which the pre-selection rule below depends on.
+
+A failed query is not a capability verdict, so track the two apart: settings still fails closed, but
+says so instead of claiming the runtime declares no primitive. The verb fail-closes an unknown runtime — or an
+internal resolution error — to `none` and exits 0, so `INSPECTED_RESOLVED=false` means only "the query did not answer"
+(#2486 review):
+
+```bash
+_INSPECTED_RAW=$(gsd_run query inspect-dispatch-isolation --raw 2>/dev/null)
+_ISOLATION_RC=$?
+if [ $_ISOLATION_RC -ne 0 ] || [ -z "$_INSPECTED_RAW" ]; then
+  INSPECTED_ISOLATION=none
+  INSPECTED_RESOLVED=false      # no verdict learned — not the same as "declares none"
+else
+  INSPECTED_ISOLATION="$_INSPECTED_RAW"
+  INSPECTED_RESOLVED=true
+fi
+case "$INSPECTED_ISOLATION" in
+  harness-worktree|orchestrator-worktree|none) ;;
+  *) INSPECTED_ISOLATION=none; INSPECTED_RESOLVED=false ;;   # out of vocabulary is not a verdict either
+esac
+USE_WORKTREES_CURRENT=$(gsd_run query config-get workflow.use_worktrees --raw 2>/dev/null)
+```
+
 Use AskUserQuestion with current values pre-selected. Questions are grouped into six visual sections; the first question in each section carries the section-denoting `header` field (AskUserQuestion renders abbreviated section tags for grouping, max 12 chars).
 
 Section layout:
@@ -113,6 +137,46 @@ Context Warnings, Research Qs
 
 **Conditional visibility — graphify.auto_update:** This question is shown only when the user's chosen `graphify.enabled` value is on. If `graphify.enabled` is off, omit the `graphify.auto_update` question and preserve the existing `graphify.auto_update` value in config (do not overwrite). Implementation: ask Graphify first; only ask Graph auto-update when Graphify is enabled.
 
+**Conditional options — Worktrees (#2486):** whether a runtime can honor `workflow.use_worktrees: true` depends on its **declared `dispatch.isolation` capability, not its name** (#2584): `harness-worktree` (the host isolates each executor) and `orchestrator-worktree` (GSD drives the worktrees) both run parallel; `none` fails closed on an explicit `true`. Branch on the same negotiation the execution gate resolves, via the sentinel-free `inspect-dispatch-isolation` verb, which fail-closes unknown/undeclared/`undocumented` to `none`. The rule is one-directional: **never persist a value the isolation gate would fail closed on.** **Do not add a runtime-name test here.** Branch on `$INSPECTED_ISOLATION`:
+
+- **If `INSPECTED_ISOLATION` ≠ `none`** (`harness-worktree` or `orchestrator-worktree`): present the Worktrees question exactly as written below — unchanged behavior. The `none` branch is the entirety of the #2486 change.
+- **If `INSPECTED_ISOLATION` = `none`:** replace the question's options with the two below — do NOT offer an enabling option, and NEVER write `workflow.use_worktrees: true` from this workflow when the runtime declares no isolation primitive, regardless of the user's answer:
+
+```
+{
+  question: "Use git worktrees for parallel agent isolation?",
+  header: "Worktrees",
+  multiSelect: false,
+  options: [
+    { label: "No (Recommended)", description: "Write use_worktrees: false. {FINDING}, so parallel plans run sequentially and {CONSEQUENCE}." },
+    { label: "Leave unchanged", description: "Do not write the key. {ABSENCE}; an existing explicit value is kept intact (e.g. for a worktree-capable install sharing this config)." }
+  ]
+}
+```
+
+**The three placeholders** carry the only difference between a capability GSD resolved and one it could not, so no text in this branch ever asserts a verdict that was not reached. Substitute them everywhere they appear — the two `description`s above, the pre-selection rationale, and the notice — from whichever column applies:
+
+| | `INSPECTED_RESOLVED=true` | `INSPECTED_RESOLVED=false` |
+|---|---|---|
+| `{FINDING}` | this runtime has no usable executor-isolation primitive | GSD could not resolve this runtime's executor-isolation capability |
+| `{CONSEQUENCE}` | execution fails closed on an explicit true | GSD cannot tell whether execution will accept an explicit true |
+| `{ABSENCE}` | absent, it resolves to false wherever this emit stamped that default | absent, it is the safe state until the capability resolves |
+
+Failing closed is right in both columns — never write `workflow.use_worktrees: true` from this branch either way. Only the explanation changes.
+
+  Persistence: "No (Recommended)" → write `workflow.use_worktrees: false`; "Leave unchanged" → do not write `workflow.use_worktrees` at all (preserve the existing value or absence).
+
+  Pre-selection: the generic "current values pre-selected" rule does not apply when `INSPECTED_ISOLATION` is `none` — an explicit `true` has no matching option by design. Pre-select "No (Recommended)" in every case, including an absent key (`$USE_WORKTREES_CURRENT` empty, the no-`--default` read's absent signal): absence resolves to `false` only where this emit stamped that default and to `true` otherwise, so leaving it absent can preserve the very state this branch prevents, while an explicit `false` is correct under either emit (#2486 review). The same applies when it is an explicit non-false value — the broken-inheritance case the notice below covers. "Leave unchanged" remains available for the deliberate shared-config case, but is never the default here. The default must be the repair the "(Recommended)" label points to, so accepting it never keeps a value this branch could not justify. In TEXT_MODE, mark that option as the default in the numbered list.
+
+  Additionally, if `$USE_WORKTREES_CURRENT` is non-empty and not `false` (the config carries an explicit `true` — e.g. inherited from a worktree-capable install sharing the repo; empty means the key is absent, which needs no notice), prepend this notice before the question:
+
+```
+Note: the project config currently sets workflow.use_worktrees: true.
+{FINDING}, so {CONSEQUENCE}. Choose "No" to repair it for this runtime, or
+"Leave unchanged" to keep it for a worktree-capable install that shares this
+config.
+```
+
 ```
 // Model profile is selected via a two-question split because AskUserQuestion enforces a
 // hard 4-option cap and there are 5 valid profiles (quality, balanced, budget, adaptive,
@@ -411,7 +475,7 @@ Merge new settings into existing config.json:
     "research_before_questions": true/false,
     "discuss_mode": "discuss" | "assumptions",
     "skip_discuss": true/false,
-    "use_worktrees": true/false
+    "use_worktrees": true/false   // never written as true when the runtime's dispatch.isolation is none; omitted entirely when the user chose "Leave unchanged" (#2486)
   },
   "plan_review": {
     "source_grounding": true/false