feat: unit targeting, enriched change strategies, remove bolt strategy

- Remove `bolt` change strategy from schema, config, setup, elaborate,
  construct, and advance (iteration terminology retained)
- Enrich `unit` strategy: per-unit MRs to default branch, skip integrator,
  force sequential path, support `/construct <unit-name>` targeting
- Enrich `intent` strategy: autonomous DAG-driven, single intent MR with
  all ticket references collected from units
- Add `get_unit_dep_status()` to dag.sh for formatted dep precheck reports
- Add unit targeting to /construct with arg disambiguation, dep validation,
  completion check, and targetUnit state persistence
- Update /advance with targeted unit early exit, strategy-aware merge
  (per-unit PR for unit strategy, intent branch merge for intent strategy)
- Preserve targetUnit in enforce-iteration.sh continuation command
- Elaborate: remove decomposition question (agent decides), enforce unit
  boundaries (no spanning deps or domains), require criteria display before
  confirmation, handle "Other" free-text as conversation pause

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: jwaldrip

plugin/hooks/enforce-iteration.sh

@@ -141,7 +141,12 @@ elif [ "$READY_COUNT" -gt 0 ] || [ "$IN_PROGRESS_COUNT" -gt 0 ]; then
   echo ""
   echo "### ACTION REQUIRED"
   echo ""
-  echo "Call \`/construct\` to continue the autonomous loop."
+  TARGET_UNIT=$(echo "$ITERATION_JSON" | han parse json targetUnit -r --default "" 2>/dev/null || echo "")
+  if [ -n "$TARGET_UNIT" ]; then
+    echo "Call \`/construct ${INTENT_SLUG} ${TARGET_UNIT}\` to continue targeted construction."
+  else
+    echo "Call \`/construct\` to continue the autonomous loop."
+  fi
   echo ""
   echo "**Note:** Subagents have clean context. No \`/clear\` needed."
   echo ""

plugin/lib/config.ts

@@ -14,13 +14,13 @@ import { dirname, join } from "node:path"
 /**
  * Change strategy determines how git branches are organized
  */
-export type ChangeStrategy = "trunk" | "unit" | "bolt" | "intent"
+export type ChangeStrategy = "trunk" | "unit" | "intent"
 
 /**
  * VCS configuration for git or jj
  */
 export interface VcsConfig {
-	/** How changes are organized: trunk, unit, bolt, or intent */
+	/** How changes are organized: trunk, unit, or intent */
 	change_strategy: ChangeStrategy
 	/** Whether to create PR for elaborated intent review before planning */
 	elaboration_review: boolean

plugin/lib/dag.sh

@@ -137,6 +137,52 @@ are_deps_completed() {
   return 0
 }
 
+# Check dependency status for a specific unit and output formatted report
+# Returns 0 if all deps met, 1 if blocked (prints blocking report to stdout)
+# Usage: get_unit_dep_status <intent_dir> <unit_name>
+get_unit_dep_status() {
+  local intent_dir="$1"
+  local unit_name="$2"
+  local unit_file="$intent_dir/$unit_name.md"
+
+  if [ ! -f "$unit_file" ]; then
+    echo "Error: Unit file not found: $unit_file" >&2
+    return 1
+  fi
+
+  local deps
+  deps=$(parse_unit_deps "$unit_file")
+
+  # No dependencies means all deps met
+  [ -z "$deps" ] && return 0
+
+  local has_blocking=false
+  local table_rows=""
+
+  for dep in $deps; do
+    [ -z "$dep" ] && continue
+    local dep_file="$intent_dir/$dep.md"
+    local dep_status
+    dep_status=$(parse_unit_status "$dep_file")
+
+    if [ "$dep_status" != "completed" ]; then
+      has_blocking=true
+      table_rows="${table_rows}| $dep | $dep_status (blocking) |\n"
+    else
+      table_rows="${table_rows}| $dep | $dep_status |\n"
+    fi
+  done
+
+  if [ "$has_blocking" = "true" ]; then
+    echo "| Dependency | Status |"
+    echo "|------------|--------|"
+    printf "%b" "$table_rows"
+    return 1
+  fi
+
+  return 0
+}
+
 # Find ready units (pending + all deps completed)
 # Returns unit names (without .md) one per line
 # Usage: find_ready_units <intent_dir>

plugin/schemas/settings.schema.json

@@ -137,9 +137,9 @@
 			"properties": {
 				"change_strategy": {
 					"type": "string",
-					"enum": ["trunk", "unit", "bolt", "intent"],
+					"enum": ["trunk", "unit", "intent"],
 					"default": "unit",
-					"description": "How changes are organized:\n- trunk: All work on main branch, no feature branches\n- unit: One branch per unit of work (default)\n- bolt: One branch per intent with squashed commits\n- intent: One long-lived branch per intent with linear history"
+					"description": "How changes are organized:\n- trunk: All work on main branch, no feature branches\n- unit: One branch per unit, each gets its own MR reviewed individually (default)\n- intent: One long-lived branch per intent, agents build autonomously via DAG ordering"
 				},
 				"elaboration_review": {
 					"type": "boolean",
@@ -153,7 +153,7 @@
 				},
 				"auto_merge": {
 					"type": "boolean",
-					"description": "Whether to automatically merge completed unit branches. Only applies to 'unit' and 'bolt' strategies."
+					"description": "Whether to automatically merge completed unit branches. Only applies to 'unit' and 'intent' strategies."
 				},
 				"auto_squash": {
 					"type": "boolean",

plugin/skills/advance/SKILL.md

@@ -69,9 +69,32 @@ if [ -n "$CURRENT_UNIT" ] && [ -f "$INTENT_DIR/${CURRENT_UNIT}.md" ]; then
 fi
 ```
 
-### Step 2c: Merge Unit Branch on Completion
+### Step 2c: Handle Targeted Unit Completion
 
-After marking a unit as completed, merge the unit branch into the intent branch:
+When `targetUnit` is set in state and matches the just-completed unit, handle early exit:
+
+```bash
+TARGET_UNIT=$(echo "$STATE" | han parse json targetUnit -r --default "")
+if [ -n "$TARGET_UNIT" ] && [ "$TARGET_UNIT" = "$CURRENT_UNIT" ]; then
+  # Clear targetUnit from state
+  STATE=$(echo "$STATE" | han parse json --set "targetUnit=")
+  han keep save iteration.json "$STATE"
+
+  echo "## Targeted Unit Complete: ${CURRENT_UNIT}"
+  echo ""
+  echo "The targeted unit has finished its workflow."
+  echo ""
+  echo "**Next steps:**"
+  echo "- Run \`/construct\` to continue with the next ready unit"
+  echo "- Run \`/construct <unit-name>\` to target another specific unit"
+  echo "- Run \`/advance\` if all units are complete"
+  exit 0
+fi
+```
+
+### Step 2d: Merge Unit Branch on Completion
+
+After marking a unit as completed, merge behavior depends on `change_strategy`:
 
 ```bash
 # Load config for merge settings
@@ -80,11 +103,45 @@ INTENT_DIR=".ai-dlc/${INTENT_SLUG}"
 CONFIG=$(get_ai_dlc_config "$INTENT_DIR")
 AUTO_MERGE=$(echo "$CONFIG" | jq -r '.auto_merge // "true"')
 AUTO_SQUASH=$(echo "$CONFIG" | jq -r '.auto_squash // "false"')
+CHANGE_STRATEGY=$(echo "$CONFIG" | jq -r '.change_strategy // "unit"')
+DEFAULT_BRANCH=$(echo "$CONFIG" | jq -r '.default_branch')
+
+UNIT_SLUG="${CURRENT_UNIT#unit-}"
+UNIT_BRANCH="ai-dlc/${INTENT_SLUG}/${UNIT_SLUG}"
+
+if [ "$CHANGE_STRATEGY" = "unit" ]; then
+  # Unit strategy: open a PR/MR for the unit branch directly to the default branch
+  git push -u origin "$UNIT_BRANCH" 2>/dev/null || true
+
+  # Get this unit's ticket reference (if any) for the PR body
+  UNIT_TICKET=$(han parse yaml ticket -r --default "" < "$INTENT_DIR/${CURRENT_UNIT}.md" 2>/dev/null || echo "")
+  TICKET_LINE=""
+  if [ -n "$UNIT_TICKET" ]; then
+    TICKET_LINE="Closes ${UNIT_TICKET}"
+  fi
+
+  gh pr create \
+    --base "$DEFAULT_BRANCH" \
+    --head "$UNIT_BRANCH" \
+    --title "unit: ${CURRENT_UNIT}" \
+    --body "$(cat <<EOF
+## Unit: ${CURRENT_UNIT}
 
-if [ "$AUTO_MERGE" = "true" ]; then
-  UNIT_SLUG="${CURRENT_UNIT#unit-}"
-  UNIT_BRANCH="ai-dlc/${INTENT_SLUG}/${UNIT_SLUG}"
+Part of intent: ${INTENT_SLUG}
 
+${TICKET_LINE}
+
+---
+*Built with [AI-DLC](https://ai-dlc.dev)*
+EOF
+)" 2>/dev/null || echo "PR may already exist for $UNIT_BRANCH"
+
+  # Clean up unit worktree
+  WORKTREE_PATH="/tmp/ai-dlc-${INTENT_SLUG}-${UNIT_SLUG}"
+  [ -d "$WORKTREE_PATH" ] && git worktree remove "$WORKTREE_PATH"
+
+elif [ "$AUTO_MERGE" = "true" ]; then
+  # Intent/trunk strategy: merge unit branch into intent branch
   # Ensure we're on the intent branch
   git checkout "ai-dlc/${INTENT_SLUG}/main"
 
@@ -114,10 +171,10 @@ if (dagSummary.allComplete) {
   // ALL UNITS COMPLETE - Check if integrator should run
   // Skip integrator for:
   //   - Single-unit intents (reviewer already validated it)
-  //   - change_strategy "bolt" (single squashed branch, no multi-unit merge)
+  //   - change_strategy "unit" (each unit reviewed individually via per-unit MR)
   const unitCount = dagSummary.totalCount;
   const changeStrategy = config.change_strategy || "unit";
-  const skipIntegrator = unitCount <= 1 || changeStrategy === "bolt";
+  const skipIntegrator = unitCount <= 1 || changeStrategy === "unit";
   if (!skipIntegrator && !state.integratorComplete) {
     // Spawn integrator on the intent branch
     // See Step 2e below
@@ -389,7 +446,20 @@ INTENT_BRANCH="ai-dlc/${INTENT_SLUG}/main"
 git push -u origin "$INTENT_BRANCH" 2>/dev/null || true
 ```
 
-2. Create PR/MR:
+2. Collect ticket references from all units:
+
+```bash
+TICKET_REFS=""
+for unit_file in "$INTENT_DIR"/unit-*.md; do
+  [ -f "$unit_file" ] || continue
+  TICKET=$(han parse yaml ticket -r --default "" < "$unit_file" 2>/dev/null || echo "")
+  if [ -n "$TICKET" ]; then
+    TICKET_REFS="${TICKET_REFS}\nCloses ${TICKET}"
+  fi
+done
+```
+
+3. Create PR/MR:
 
 ```bash
 gh pr create \
@@ -408,6 +478,8 @@ ${SUCCESS_CRITERIA_AS_CHECKLIST}
 ## Changes
 ${COMPLETED_UNITS_AS_CHANGE_LIST}
 
+$(printf "%b" "${TICKET_REFS}")
+
 ---
 *Built with [AI-DLC](https://ai-dlc.dev)*
 EOF