@ktpartners/dgs-platform 2.9.0 → 3.3.0

package/deliver-great-systems/workflows/research-idea.md

@@ -1,9 +1,9 @@
 <purpose>
-Subagent-driven research workflow that investigates an idea's feasibility and technical landscape across five adaptive dimensions. Claude acts as an analyst -- purposeful and efficient, adapting depth to what the idea actually needs rather than running a checklist.
+Subagent-driven research workflow that investigates an idea's feasibility and technical landscape. The orchestrator parses arguments, loads idea context (body, discussion log, prior research, supporting docs, REPOS.md), spawns a dedicated `dgs-idea-researcher` subagent for the five adaptive research dimensions, then handles the Research Log entry, git commit, and next-step suggestion. The orchestrator keeps its own context clean — dimension prose and retrieved web/codebase content stay inside the subagent.
 
 Produces a structured research document at `${project_root}/docs/ideas/pending/{slug}-research.md` and appends a Research Log entry to the idea file. Commits both files together and suggests the next step based on findings.
 
-When re-researching a previously-researched idea, the document is overwritten with a "Changes from Prior Research" section highlighting what shifted. Each re-research appends a fresh Research Log entry.
+When re-researching a previously-researched idea, the subagent overwrites the document and emits a "Changes from Prior Research" section only when meaningful differences exist. Each re-research appends a fresh Research Log entry.
 </purpose>
 
 <context_tier>planning</context_tier>
@@ -86,7 +86,7 @@ Also check for prior research document:
 SLUG=$(echo "${filename}" | sed 's/^[0-9]*-//' | sed 's/\.md$//')
 RESEARCH_DOC="${project_root}/docs/ideas/pending/${SLUG}-research.md"
 ```
-If the research document file exists, read it for prior research context.
+If the research document file exists, note its path so the subagent can read it for re-research diffing.
 
 **Load idea supporting documents:**
 
@@ -98,7 +98,7 @@ IDEA_DOCS_DIR="${IDEA_DIR}/docs"
 
 If a flat structure is used (ideas stored as files, not directories), derive from the filename:
 ```bash
-IDEA_DOCS_DIR="${project_root}/docs/ideas/pending/${SLUG}"
+IDEA_DOCS_DIR="${project_root}/docs/ideas/${SLUG}"
 ```
 
 Check both paths. Use whichever exists.
@@ -126,154 +126,92 @@ cat ${project_root}/REPOS.md 2>/dev/null
 If REPOS.md exists and has entries, this is a multi-repo project -- research should be partitioned by repo where relevant.
 </step>
 
-<step name="research_context">
-Assess the idea and decide research strategy:
+<step name="spawn_researcher">
+Resolve the model for the idea-researcher subagent. The `resolve-model` CLI subcommand on `dgs-tools.cjs` emits JSON (`{"model": "...", "profile": "..."}`) — pipe through `jq -r .model` to extract the bare model string:
 
-1. **Announce focus**: Print one line explaining which dimensions matter most for this idea and why. E.g.: "Focusing on landscape survey and codebase analysis -- this idea involves integrating with existing patterns."
-
-2. **Read Discussion Log** if present -- use discussion insights (refined problem, approach, open questions) to guide research focus areas.
-
-3. **Read prior research** if present -- note what was found before. On re-research, Claude will overwrite the document but should note what changed.
-
-4. **Read supporting documents** if `ideaDocs` is not empty -- review loaded text files, diagrams, and other supporting materials. These may reveal additional context about the idea's scope, architecture requirements, or prior art that inform the research focus areas.
-
-5. **Determine repo scope**: If REPOS.md exists, identify which repos are relevant to this idea. If no REPOS.md, treat as single-repo research.
-</step>
-
-<step name="web_search">
-**Dimension 1: Web Search**
-
-Announce: "Searching web for prior art and technical landscape..."
-
-Use WebSearch and WebFetch to investigate:
-- How others have solved similar problems
-- Existing libraries, tools, or frameworks relevant to the idea
-- Common patterns and anti-patterns
-- Recent discussions or blog posts
-
-Adapt depth to what the idea needs -- a well-understood problem gets a quick scan, a novel idea gets broader exploration. If web search yields little, note the gap and move on.
-
-Web search is best-effort -- search what's findable, note gaps, move on. Don't burn time on thin topics.
-</step>
-
-<step name="codebase_analysis">
-**Dimension 2: Codebase Analysis**
-
-Announce: "Analyzing codebase for related implementations..."
-
-Use Grep and Glob to examine:
-- Existing code that relates to the idea's domain
-- Patterns already established that would apply
-- Potential conflicts or integration points
-- Code that would need to change
-
-For multi-repo projects: analyze each relevant repo separately, noting repo-specific patterns and concerns.
-</step>
-
-<step name="landscape_survey">
-**Dimension 3: Landscape Survey**
-
-Announce: "Surveying technical landscape..."
-
-Build comparison information for relevant tools/libraries/approaches:
-- For obvious choices (one clear winner): brief verdict with reasoning
-- For genuine tradeoffs: table with pros, cons, license, maintenance status, compatibility
-- Per repo stack for multi-repo projects
-
-Recommend when clear -- strong recommendation when one option is clearly better, present options neutrally when it's genuinely a toss-up.
-</step>
-
-<step name="approaches">
-**Dimension 4: Approaches & Patterns**
-
-Announce: "Identifying approaches and patterns..."
-
-Identify how similar problems have been solved:
-- Architectural patterns that apply
-- Implementation strategies
-- Sequencing (what to build first)
-- What to avoid and why
-</step>
-
-<step name="feasibility">
-**Dimension 5: Feasibility Assessment**
-
-Announce: "Assessing feasibility..."
-
-Assess:
-- **Stack fit**: How well does this fit the existing technology stack?
-- **Effort estimate**: T-shirt size (S/M/L/XL) + approximate phase count
-- **Key risks**: What could go wrong? What are the unknowns?
-- **New dependencies**: Any new libraries, services, or external integrations needed?
-- **Recommendation**: Overall go/no-go/conditional assessment
-</step>
-
-<step name="write_document">
-Create (or overwrite) the research document.
-
-Ensure directory exists:
 ```bash
-mkdir -p ${project_root}/docs/ideas/pending
+IDEA_RESEARCHER_MODEL=$(node ~/.claude/deliver-great-systems/bin/dgs-tools.cjs resolve-model dgs-idea-researcher | jq -r .model)
 ```
 
-Write the research document to `${project_root}/docs/ideas/pending/${SLUG}-research.md` using the Write tool.
-
-**Document structure:**
-```markdown
----
-type: research
-idea_id: {id}
-idea_title: "{title}"
-date: "{YYYY-MM-DD}"
-repos_analysed: ["{repo1}", "{repo2}"]
----
-
-# Research: {title}
-
-{If re-research and meaningful changes exist:}
-## Changes from Prior Research
-
-{Bullet list of what's new, updated, or contradicted vs prior findings. Include when there are meaningful differences from prior research, skip when findings are similar.}
+The MODEL_PROFILES entry resolves to `inherit` (quality profile), `sonnet` (balanced), or `haiku` (budget) based on the project's `model_profile` config. (Note: wiring `idea_researcher_model` directly into init.cjs — so the orchestrator could read it from init JSON, mirroring `researcher_model` in plan-phase — is a follow-up. The CLI invocation above is the canonical resolution path here.)
 
-## Web Search Findings
+Build the research prompt with all loaded context. Inline the idea content; pass paths for files the subagent should Read itself:
 
-{Findings from Dimension 1}
-
-## Codebase Analysis
-
-{Findings from Dimension 2. For multi-repo: subsections per repo.}
-
-## Landscape Survey
-
-{Findings from Dimension 3. Comparison tables where applicable.}
-
-## Approaches & Patterns
-
-{Findings from Dimension 4}
-
-## Feasibility Assessment
+```markdown
+<objective>
+Research idea #${id}: ${title}
+Answer: "Is this idea feasible? What's the technical landscape and recommended approach?"
+</objective>
+
+<files_to_read>
+{If prior research exists:} ${RESEARCH_DOC}
+{If discussion log file exists separately, pass its path; otherwise the discussion log is inlined in <idea_content> below.}
+{For each ideaDoc loaded: pass its path}
+{If REPOS.md exists:} ${project_root}/REPOS.md
+</files_to_read>
+
+<idea_content>
+**Title:** ${title}
+**Tags:** ${tags}
+**Body:**
+${body}
+
+{If notes:} **Notes:** ${notes}
+
+{If discussionLog:} **Discussion Log:**
+${discussionLog}
+</idea_content>
+
+<prior_research>
+{If prior research doc exists:}
+Prior research at `${RESEARCH_DOC}` — read it before researching, then include a `## Changes from Prior Research` section in the new doc ONLY when meaningful differences exist. Omit the section when findings are substantially the same.
+{Otherwise:}
+No prior research.
+</prior_research>
+
+<supporting_docs>
+{If ideaDocs non-empty:}
+The following per-idea supporting documents were loaded by the orchestrator; their paths are listed in <files_to_read>. Brief summaries: {list path + 1-line summary per doc}.
+{Otherwise:}
+None
+</supporting_docs>
+
+<repos>
+{If REPOS.md exists:}
+Multi-repo project. Repos: {list repo names from REPOS.md}. Partition Codebase Analysis (Dimension 2) by repo, and provide per-repo stack recommendations in the Landscape Survey (Dimension 3) where relevant.
+{Otherwise:}
+Single-repo project — no partitioning needed.
+</repos>
+
+<output>
+Write the research document to: ${project_root}/docs/ideas/pending/${SLUG}-research.md
+
+`mkdir -p ${project_root}/docs/ideas/pending` first if the directory doesn't exist.
+
+Return a `## RESEARCH COMPLETE` block with: key findings (3-5 bullets), recommendation, document path, outcome (one of: "Ready for spec" / "Needs more discussion" / "Not feasible" / "Other: {short label}").
+</output>
+```
 
-**Stack Fit:** {assessment}
-**Effort:** {T-shirt size} -- {phase count estimate}
-**Key Risks:**
-{bullet list}
-**New Dependencies:**
-{bullet list or "None"}
-**Recommendation:** {go / no-go / conditional with conditions}
+Spawn the subagent:
 
----
-*Researched: {YYYY-MM-DD}*
+```
+Task(
+  prompt=research_prompt,
+  subagent_type="dgs-idea-researcher",
+  model="${IDEA_RESEARCHER_MODEL}",
+  description="Research idea #${id}"
+)
 ```
 
-For multi-repo projects, the Codebase Analysis and Landscape Survey sections should have `### {repo-name}` subsections.
-
-If repos_analysed is empty (no REPOS.md), omit the field from frontmatter or use an empty array.
+Handle the return:
+- **`## RESEARCH COMPLETE`**: extract `keyFindings`, `recommendation`, `outcome`, and the document path from the structured return. These flow into `save_research_log` as the entry JSON fields.
+- **`## RESEARCH BLOCKED`**: display the blocker to the user, offer the options the subagent surfaced (provide context / abort). Do NOT proceed to `save_research_log` or `git_commit` until the blocker is resolved.
 </step>
 
 <step name="save_research_log">
 Save the Research Log entry to the idea file via the CLI command.
 
-Build the entry JSON:
+Build the entry JSON from the subagent's structured return:
 ```json
 {
   "date": "YYYY-MM-DD",
@@ -296,7 +234,7 @@ Parse the JSON result to confirm success.
 <step name="git_commit">
 Commit both the research document and the updated idea file:
 ```bash
-node ~/.claude/deliver-great-systems/bin/dgs-tools.cjs commit "docs: research idea #${id} -- ${title}" --files ${project_root}/docs/ideas/pending/${SLUG}-research.md ${project_root}/ideas/${state}/${filename}
+node ~/.claude/deliver-great-systems/bin/dgs-tools.cjs commit "docs: research idea #${id} -- ${title}" --files ${project_root}/docs/ideas/pending/${SLUG}-research.md ${project_root}/ideas/${filename}
 ```
 </step>
 
@@ -317,7 +255,7 @@ Suggest next step based on outcome:
 
 <success_criteria>
 - [ ] Idea loaded with full context (body, tags, notes, discussion log, research log)
-- [ ] Research dimensions executed with progress announcements
+- [ ] `dgs-idea-researcher` subagent spawned with resolved model and a complete research prompt
 - [ ] Research document created at `${project_root}/docs/ideas/pending/{slug}-research.md` with frontmatter
 - [ ] Research Log entry saved to idea file via research-save CLI
 - [ ] Both files committed together

package/deliver-great-systems/workflows/resume-project.md

@@ -247,7 +247,7 @@ Based on user selection, route to appropriate workflow:
   ---
   ```
 - **Transition** → ./transition.md
-- **Check todos** → Read ${project_root}/todos/pending/, present summary
+- **Check todos** → Run `node "$HOME/.claude/deliver-great-systems/bin/dgs-tools.cjs" todos list --status pending`, present summary
 - **Review alignment** → Read PROJECT.md, compare to current state
 - **Something else** → Ask what they need
 </step>
@@ -278,7 +278,7 @@ If STATE.md is missing but other artifacts exist:
 1. Read PROJECT.md → Extract "What This Is" and Core Value
 2. Read ROADMAP.md → Determine phases, find current position
 3. Scan \*-SUMMARY.md files → Extract decisions, concerns
-4. Count pending todos in ${project_root}/todos/pending/
+4. Count pending todos via `node "$HOME/.claude/deliver-great-systems/bin/dgs-tools.cjs" todos list --status pending --count`
 5. Check for .continue-here files → Session continuity
 
 Reconstruct and write STATE.md, then proceed normally.

package/deliver-great-systems/workflows/run-job.md

@@ -1,5 +1,5 @@
 <purpose>
-Execute a milestone build job end-to-end. Reads the job file, loops through pending steps, spawns an isolated subagent per step, updates the job file in real-time, handles failures with immediate halt, manages dynamic gap-fix cycles at both milestone level (GapFixCycle, max 3) and phase level (PhaseFixCycle, max 2), and moves completed jobs to the completed/ directory. Supports --dry-run mode for step preview without execution. Auto-generates job summaries on completion and failure.
+Execute a milestone build job end-to-end. Reads the job file, loops through pending steps, spawns an isolated subagent per step, updates the job file in real-time, handles failures with immediate halt, manages dynamic gap-fix cycles at both milestone level (GapFixCycle, max 3) and phase level (PhaseFixCycle, max 2), and marks completed jobs with status: completed. Supports --dry-run mode for step preview without execution. Auto-generates job summaries on completion and failure.
 
 The orchestrator stays lean: it reads only the job file and MILESTONE-AUDIT.md (plus phase UAT status via CLI for phase-level audits). All actual work is delegated to subagents via Task tool. Each subagent gets a fresh context window with no shared state beyond what is on disk.
 </purpose>
@@ -106,7 +106,7 @@ Parse the JSON result.
 Error: No job found for version {VERSION}. Create one with /dgs:create-milestone-job {VERSION}
 ```
 
-**If found in `completed/` directory:**
+**If found.status is 'completed':**
 ```
 Error: Job {VERSION} is already completed.
 ```
@@ -117,21 +117,14 @@ Store `JOB_PATH` from the result for all subsequent operations.
 <step name="move_to_in_progress">
 Transition the job to in-progress state if needed.
 
-**If job is in `pending/`:**
+**If found.status is 'pending':**
 
-1. Move the file to `in-progress/`:
+1. Set the job status to in-progress (updates both frontmatter and header):
    ```bash
-   node ~/.claude/deliver-great-systems/bin/dgs-tools.cjs jobs move "$JOB_PATH" "${jobs_root}/in-progress"
+   node ~/.claude/deliver-great-systems/bin/dgs-tools.cjs jobs set-status "$VERSION" --status in-progress
    ```
 
-2. Update `JOB_PATH` to reflect the new location under `in-progress/`.
-
-3. Update the header Status field (using the updated `$JOB_PATH`):
-   ```bash
-   node ~/.claude/deliver-great-systems/bin/dgs-tools.cjs jobs update-header "$JOB_PATH" Status in-progress
-   ```
-
-**If already in `in-progress/`:** Skip the move. The job is being resumed.
+**If found.status is already 'in-progress':** Skip. The job is being resumed.
 
 **Record starting commit SHAs:**
 
@@ -293,7 +286,7 @@ Loop through steps starting from `nextStepIndex`.
 
    **Mid-workflow push (after phase-completing steps):**
 
-   After a step completes successfully, check if the step's command is a phase-completing workflow: `execute-phase`, `verify-work`, `audit-phase`, `audit-milestone`, `plan-phase`, `plan-milestone-gaps`, or `complete-milestone`.
+   After a step completes successfully, check if the step's command is a phase-completing workflow: `execute-phase`, `verify-work`, `audit-phase`, `audit-milestone`, `plan-phase`, `plan-milestone-gaps`, `validate-phase`, or `complete-milestone`.
 
    If so, and `sync_push` is not `"off"` and `cadence_push` is true:
    ```bash
@@ -332,13 +325,13 @@ Loop through steps starting from `nextStepIndex`.
    ```bash
    SUMMARY=$(node ~/.claude/deliver-great-systems/bin/dgs-tools.cjs jobs generate-summary "$VERSION")
    ```
-   Parse the result. If `found: true`, write the `content` field to `${jobs_root}/in-progress/job-{version}-SUMMARY.md` using the Write tool (job stays in in-progress/ on failure).
-   Display: `Job summary written to ${jobs_root}/in-progress/job-{version}-SUMMARY.md`
+   Parse the result. If `found: true`, write the `content` field to `${jobs_root}/job-{version}-SUMMARY.md` using the Write tool (job stays in place on failure -- status is tracked in frontmatter).
+   Display: `Job summary written to ${jobs_root}/job-{version}-SUMMARY.md`
 
    **Commit and push failure summary:**
 
    ```bash
-   node "$HOME/.claude/deliver-great-systems/bin/dgs-tools.cjs" commit "docs(job): ${VERSION} failure summary" --files "${jobs_root}/in-progress/job-${VERSION}-SUMMARY.md" --push
+   node "$HOME/.claude/deliver-great-systems/bin/dgs-tools.cjs" commit "docs(job): ${VERSION} failure summary" --files "${jobs_root}/job-${VERSION}-SUMMARY.md" --push
    ```
 
    **HALT immediately.** Do not proceed to the next step.
@@ -359,11 +352,11 @@ After an `audit-milestone` step completes successfully, check the audit outcome.
 
 Note: --no-check jobs never trigger this code path because they have no audit-milestone step. The `check: false` header means no `audit-milestone` step is generated by `generateMilestoneSteps`, so handle_audit_result is never reached.
 
-Note: The original complete-milestone step (if present) remains at its position after the original
-audit step. Gap-fix steps (including re-audit) are inserted between the original audit step and
-complete-milestone. When the re-audit passes, the loop naturally reaches complete-milestone.
-If the re-audit finds MORE gaps, another cycle inserts steps after THAT re-audit, further
-deferring complete-milestone. This is correct -- complete-milestone only runs after a clean audit.
+Note: audit-milestone is the last step of milestone jobs. complete-milestone is never
+auto-run because it requires manual intervention (branch review, tag push, merge conflict
+resolution). After audit passes, the job ends and the user runs /dgs:complete-milestone
+manually. Gap-fix steps are inserted after the original audit step; when a re-audit passes,
+the job completes and the user still runs complete-milestone manually.
 
 1. **Read audit status:**
    ```bash
@@ -378,9 +371,9 @@ deferring complete-milestone. This is correct -- complete-milestone only runs af
      ```
    - If `GAP_FIX_CYCLE == 0` (audit passed first time): Display clean banner:
      ```
-     Audit passed -- no gaps found. Proceeding to complete milestone.
+     Audit passed -- no gaps found. Run /dgs:complete-milestone manually to archive.
      ```
-   - Continue to the next step (should be `complete-milestone`).
+   - Job completes after this step. User runs /dgs:complete-milestone manually when ready.
 
 3. **If `gaps_found`:**
 
@@ -536,39 +529,32 @@ After an `audit-phase` step completes successfully, check the phase audit outcom
 <step name="complete_job">
 When all steps are completed (`nextStepIndex` is null after the loop):
 
-1. **Update header Status to `completed`:**
+1. **Set job status to `completed`** (updates both frontmatter and header):
    ```bash
-   node ~/.claude/deliver-great-systems/bin/dgs-tools.cjs jobs update-header "$JOB_PATH" Status completed
+   node ~/.claude/deliver-great-systems/bin/dgs-tools.cjs jobs set-status "$VERSION" --status completed
    ```
 
-2. **Move job to `completed/`:**
-   ```bash
-   node ~/.claude/deliver-great-systems/bin/dgs-tools.cjs jobs move "$JOB_PATH" "${jobs_root}/completed"
-   ```
-
-   Update `JOB_PATH` to reflect the new location under `completed/`.
-
    **Commit and push job status:**
 
    ```bash
-   git add -A "$(dirname "$JOB_PATH")/../"
+   git add -A "$(dirname "$JOB_PATH")/"
    node "$HOME/.claude/deliver-great-systems/bin/dgs-tools.cjs" commit "docs(job): ${VERSION} completed" --push
    ```
 
-3. **Generate job summary:**
+2. **Generate job summary:**
    ```bash
    SUMMARY=$(node ~/.claude/deliver-great-systems/bin/dgs-tools.cjs jobs generate-summary "$VERSION")
    ```
-   Parse the result. If `found: true`, write the `content` field to `${jobs_root}/completed/job-{version}-SUMMARY.md` using the Write tool.
-   Display: `Job summary written to ${jobs_root}/completed/job-{version}-SUMMARY.md`
+   Parse the result. If `found: true`, write the `content` field to `${jobs_root}/job-{version}-SUMMARY.md` using the Write tool.
+   Display: `Job summary written to ${jobs_root}/job-{version}-SUMMARY.md`
 
    **Commit and push completion summary:**
 
    ```bash
-   node "$HOME/.claude/deliver-great-systems/bin/dgs-tools.cjs" commit "docs(job): ${VERSION} completion summary" --files "${jobs_root}/completed/job-${VERSION}-SUMMARY.md" --push
+   node "$HOME/.claude/deliver-great-systems/bin/dgs-tools.cjs" commit "docs(job): ${VERSION} completion summary" --files "${jobs_root}/job-${VERSION}-SUMMARY.md" --push
    ```
 
-4. **Post-workflow push (sync_after):**
+3. **Post-workflow push (sync_after):**
 
    Follow the sync-hooks post-workflow push pattern with `WORKFLOW_NAME = "run-job"`:
 
@@ -582,7 +568,7 @@ When all steps are completed (`nextStepIndex` is null after the loop):
 
    Display aggregated push summary including any accumulated `SYNC_WARNINGS` from mid-workflow pushes.
 
-5. **Display completion banner:**
+4. **Display completion banner:**
 
    If `AUTO_RESOLVE_COUNT` is 0:
    ```
@@ -617,11 +603,11 @@ The orchestrator MUST stay lean per EXEC-07:
 - [ ] Milestone audit gap-fix cycle auto-approved with 3-cycle safety limit
 - [ ] Phase audit gap-fix cycle auto-approved with 2-cycle safety limit
 - [ ] PhaseFixCycle counter resets on plan-phase/map-codebase steps
-- [ ] Completed jobs moved to completed/ directory with banner
+- [ ] Completed jobs marked with status: completed with banner
 - [ ] Orchestrator reads only job file and MILESTONE-AUDIT.md (phase UAT via CLI)
 - [ ] --dry-run flag displays step preview without executing
-- [ ] Job summary auto-generated on completion (written to completed/)
-- [ ] Job summary auto-generated on failure (written to in-progress/)
+- [ ] Job summary auto-generated on completion (written to ${jobs_root}/)
+- [ ] Job summary auto-generated on failure (written to ${jobs_root}/)
 - [ ] Pre-workflow pull executed before job steps start (sync_before)
 - [ ] Mid-workflow push after phase-completing steps (silent, no prompt)
 - [ ] Post-workflow push after job completion (sync_after)

package/deliver-great-systems/workflows/settings.md

@@ -45,8 +45,8 @@ Parse current values (default to `true` if not present):
 - `workflow.verifier` — spawn verifier during execute-phase
 - `workflow.nyquist_validation` — validation architecture research during plan-phase (default: true if absent)
 - `workflow.codereview` — spawn code reviewer after plan execution (default: false if absent)
+- `workflow.four_eyes` — four-eyes completion governance mode (default: "off" if absent)
 - `model_profile` — which model each agent uses (default: `balanced`)
-- `git.branching_strategy` — branching approach (default: `"none"`)
 - `git.base_branch` — integration target branch for code repos (default: `"main"`)
 - `git.sync_push` — remote sync push mode (default: "off" if absent for existing installs)
 - `git.sync_pull` — remote sync pull mode (default: "off" if absent for existing installs)
@@ -59,62 +59,6 @@ CLAUDE_MD_HAS_DGS=$(grep -l 'DGS:BEGIN' ./CLAUDE.md 2>/dev/null && echo "true" |
 ```
 </step>
 
-<step name="detect_old_templates">
-After loading current config, check if the branch templates use old defaults without `{project}`:
-
-```bash
-CURRENT_PHASE_TPL=$(node "$HOME/.claude/deliver-great-systems/bin/dgs-tools.cjs" config-get git.phase_branch_template --raw 2>/dev/null)
-CURRENT_MILESTONE_TPL=$(node "$HOME/.claude/deliver-great-systems/bin/dgs-tools.cjs" config-get git.milestone_branch_template --raw 2>/dev/null)
-```
-
-If either template is set AND does not contain `{project}`, and `branching_strategy` is not `"none"`, show migration hint before the settings questions:
-
-```
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- DGS ► BRANCH TEMPLATE UPDATE AVAILABLE
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-
-Your branch templates don't include the project name, which can cause
-collisions in multi-project setups.
-
-Current:  {current_phase_tpl}
-Suggested: dgs/{project}/phase-{phase}-{slug}
-
-Current:  {current_milestone_tpl}
-Suggested: dgs/{project}/{milestone}-{slug}
-```
-
-Use AskUserQuestion:
-```
-AskUserQuestion([{
-  question: "Update branch templates to include project name?",
-  header: "Templates",
-  multiSelect: false,
-  options: [
-    { label: "Yes (Recommended)", description: "Updates templates to include {project} for multi-project safety" },
-    { label: "No", description: "Keep current templates" }
-  ]
-}])
-```
-
-If "Yes": write updated templates to config.json using config-set:
-```bash
-node "$HOME/.claude/deliver-great-systems/bin/dgs-tools.cjs" config-set git.phase_branch_template "dgs/{project}/phase-{phase}-{slug}"
-node "$HOME/.claude/deliver-great-systems/bin/dgs-tools.cjs" config-set git.milestone_branch_template "dgs/{project}/{milestone}-{slug}"
-```
-
-Show confirmation:
-```
-Updated branch templates to include {project}.
-Branch names will now look like: dgs/your-project/phase-03-auth
-
-Note: Existing branches using the old format will NOT be renamed.
-Only new branches will use the updated format.
-```
-
-If templates already contain `{project}` or branching_strategy is "none": skip this step silently.
-</step>
-
 <step name="present_settings">
 Use AskUserQuestion with current values pre-selected:
 
@@ -185,21 +129,14 @@ AskUserQuestion([
     ]
   },
   {
-    question: "Git branching strategy?",
-    header: "Branching",
+    question: "Four-eyes completion governance? (requires a second contributor for milestone/quick completion)",
+    header: "Four-Eyes",
     multiSelect: false,
     options: [
-      { label: "None (Recommended)", description: "Commit to current branch (fine for single projects)" },
-      { label: "Per Phase", description: "Branch per phase, review before merging" },
-      { label: "Per Milestone", description: "Branch per project, merge all at end (for parallel projects)" }
+      { label: "Off", description: "No contributor check at completion gates" },
+      { label: "Warn", description: "Warn if only one contributor, but allow completion" },
+      { label: "Enforce", description: "Block completion unless a second contributor is detected (bypass with --force)" }
     ]
-  },
-  {
-    question: "Base branch for code repos? (integration target for branching operations)",
-    header: "Git",
-    multiSelect: false,
-    freeform: true,
-    placeholder: currentConfig.base_branch || "main"
   }
 ])
 ```
@@ -450,11 +387,11 @@ Merge new settings into existing config:
     "auto_advance": true/false,
     "nyquist_validation": true/false,
     "codereview": true/false,
-    "discipline": true/false
+    "discipline": true/false,
+    "four_eyes": "off" | "warn" | "enforce"
   },
   "git": {
-    "branching_strategy": "none" | "phase" | "milestone",
-    "base_branch": "main" | user_answer,
+    "base_branch": "main",
     "sync_push": "off" | "prompt" | "auto",
     "sync_pull": "off" | "prompt" | "auto"
   }
@@ -495,7 +432,6 @@ Write `~/.dgs/defaults.json` with:
   "model_profile": <current>,
   "commit_docs": <current>,
   "parallelization": <current>,
-  "branching_strategy": <current>,
   "workflow": {
     "research": <current>,
     "plan_check": <current>,
@@ -503,7 +439,8 @@ Write `~/.dgs/defaults.json` with:
     "auto_advance": <current>,
     "nyquist_validation": <current>,
     "codereview": <current>,
-    "discipline": <current>
+    "discipline": <current>,
+    "four_eyes": <current>
   },
   "git": {
     "sync_push": <current>,
@@ -544,8 +481,7 @@ Display:
 | Auto-Advance         | {On/Off} |
 | Nyquist Validation   | {On/Off} |
 | Code Reviewer        | {On/Off} |
-| Git Branching        | {None/Per Phase/Per Milestone} |
-| Base Branch          | {main/develop/etc.} |
+| Four-Eyes Governance | {Off/Warn/Enforce} |
 | Workflow Discipline  | {On/Off} |
 | Git Sync Push        | {Off/Prompt/Auto} |
 | Git Sync Pull        | {Off/Prompt/Auto} |
@@ -567,7 +503,7 @@ Quick commands:
 
 <success_criteria>
 - [ ] Current config read
-- [ ] User presented with 9 workflow settings (profile + 6 workflow toggles + git branching + base branch)
+- [ ] User presented with 8 workflow settings (profile + 6 workflow toggles + four-eyes governance)
 - [ ] User shown review key status (read-only)
 - [ ] Config updated with model_profile, workflow, and git sections
 - [ ] User offered to save as global defaults (~/.dgs/defaults.json)