fix: namespace intent branches as ai-dlc/{slug}/main

Git refs cannot be both a leaf node and a directory, so
ai-dlc/{slug} as a branch prevents creating unit branches
at ai-dlc/{slug}/{unit-slug}. This renames intent branches
to ai-dlc/{slug}/main, keeping unit branches at
ai-dlc/{slug}/{unit-slug}.

Updated branch patterns in all skills, hooks, and dag.sh.

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

Author: jwaldrip

plugin/hooks/enforce-iteration.sh

@@ -31,9 +31,9 @@ ITERATION_JSON=""
 ITERATION_JSON=$(han keep load iteration.json --quiet 2>/dev/null || echo "")
 
 # If not found and we're on a unit branch, try the parent intent branch
-if [ -z "$ITERATION_JSON" ] && [[ "$CURRENT_BRANCH" == ai-dlc/*/* ]]; then
-  # Extract intent branch: ai-dlc/intent-slug/unit-slug -> ai-dlc/intent-slug
-  INTENT_BRANCH=$(echo "$CURRENT_BRANCH" | sed 's|^\(ai-dlc/[^/]*\)/.*|\1|')
+if [ -z "$ITERATION_JSON" ] && [[ "$CURRENT_BRANCH" == ai-dlc/*/* ]] && [[ "$CURRENT_BRANCH" != ai-dlc/*/main ]]; then
+  # Extract intent branch: ai-dlc/intent-slug/unit-slug -> ai-dlc/intent-slug/main
+  INTENT_BRANCH=$(echo "$CURRENT_BRANCH" | sed 's|^\(ai-dlc/[^/]*\)/.*|\1/main|')
   ITERATION_JSON=$(han keep load --branch "$INTENT_BRANCH" iteration.json --quiet 2>/dev/null || echo "")
 fi
 

plugin/hooks/inject-context.sh

@@ -114,9 +114,11 @@ ITERATION_JSON=""
 ITERATION_JSON=$(han keep load iteration.json --quiet 2>/dev/null || echo "")
 
 # If not found and we're on a unit branch, try the parent intent branch
-if [ -z "$ITERATION_JSON" ] && [[ "$CURRENT_BRANCH" == ai-dlc/*/* ]]; then
-  # Extract intent branch: ai-dlc/intent-slug/unit-slug -> ai-dlc/intent-slug
-  INTENT_BRANCH=$(echo "$CURRENT_BRANCH" | sed 's|^\(ai-dlc/[^/]*\)/.*|\1|')
+# Unit branches: ai-dlc/{slug}/{unit-slug} (where unit-slug != "main")
+# Intent branches: ai-dlc/{slug}/main
+if [ -z "$ITERATION_JSON" ] && [[ "$CURRENT_BRANCH" == ai-dlc/*/* ]] && [[ "$CURRENT_BRANCH" != ai-dlc/*/main ]]; then
+  # Extract intent branch: ai-dlc/intent-slug/unit-slug -> ai-dlc/intent-slug/main
+  INTENT_BRANCH=$(echo "$CURRENT_BRANCH" | sed 's|^\(ai-dlc/[^/]*\)/.*|\1/main|')
   ITERATION_JSON=$(han keep load --branch "$INTENT_BRANCH" iteration.json --quiet 2>/dev/null || echo "")
 fi
 
@@ -582,9 +584,9 @@ echo ""
 # Check branch naming convention (informational only)
 # Note: CURRENT_BRANCH already cached at top of script
 if [ -n "$CURRENT_BRANCH" ] && [ "$CURRENT_BRANCH" != "main" ] && [ "$CURRENT_BRANCH" != "master" ]; then
-  if ! echo "$CURRENT_BRANCH" | grep -qE '^ai-dlc/[a-z0-9-]+/[0-9]+-[a-z0-9-]+$'; then
+  if ! echo "$CURRENT_BRANCH" | grep -qE '^ai-dlc/[a-z0-9-]+/(main|[0-9]+-[a-z0-9-]+)$'; then
     echo "> **WARNING:** Current branch \`$CURRENT_BRANCH\` doesn't follow AI-DLC convention."
-    echo "> Expected: \`ai-dlc/{intent-slug}/{unit-number}-{unit-slug}\`"
+    echo "> Expected: \`ai-dlc/{intent-slug}/main\` or \`ai-dlc/{intent-slug}/{unit-number}-{unit-slug}\`"
     echo "> Create correct branch before proceeding."
     echo ""
   fi

plugin/hooks/subagent-context.sh

@@ -25,9 +25,11 @@ ITERATION_JSON=""
 ITERATION_JSON=$(han keep load iteration.json --quiet 2>/dev/null || echo "")
 
 # If not found and we're on a unit branch, try the parent intent branch
-if [ -z "$ITERATION_JSON" ] && [[ "$CURRENT_BRANCH" == ai-dlc/*/* ]]; then
-  # Extract intent branch: ai-dlc/intent-slug/unit-slug -> ai-dlc/intent-slug
-  INTENT_BRANCH=$(echo "$CURRENT_BRANCH" | sed 's|^\(ai-dlc/[^/]*\)/.*|\1|')
+# Unit branches: ai-dlc/{slug}/{unit-slug} (where unit-slug != "main")
+# Intent branches: ai-dlc/{slug}/main
+if [ -z "$ITERATION_JSON" ] && [[ "$CURRENT_BRANCH" == ai-dlc/*/* ]] && [[ "$CURRENT_BRANCH" != ai-dlc/*/main ]]; then
+  # Extract intent branch: ai-dlc/intent-slug/unit-slug -> ai-dlc/intent-slug/main
+  INTENT_BRANCH=$(echo "$CURRENT_BRANCH" | sed 's|^\(ai-dlc/[^/]*\)/.*|\1/main|')
   ITERATION_JSON=$(han keep load --branch "$INTENT_BRANCH" iteration.json --quiet 2>/dev/null || echo "")
 fi
 

plugin/lib/dag.sh

@@ -564,13 +564,13 @@ discover_branch_intents() {
   local seen_slugs=""
 
   # 1. Check existing worktrees (highest priority)
-  # Parse git worktree list --porcelain to find ai-dlc/* branches
+  # Parse git worktree list --porcelain to find ai-dlc/*/main branches
   while IFS= read -r line; do
     if [[ "$line" == "branch refs/heads/ai-dlc/"* ]]; then
       local branch="${line#branch refs/heads/}"
-      # Only intent-level branches (ai-dlc/slug, not ai-dlc/slug/unit)
-      if [[ "$branch" =~ ^ai-dlc/[^/]+$ ]]; then
-        local slug="${branch#ai-dlc/}"
+      # Only intent-level branches (ai-dlc/slug/main)
+      if [[ "$branch" =~ ^ai-dlc/([^/]+)/main$ ]]; then
+        local slug="${BASH_REMATCH[1]}"
         # Read intent.md from the branch
         local intent_content
         intent_content=$(git show "$branch:.ai-dlc/$slug/intent.md" 2>/dev/null) || continue
@@ -585,12 +585,12 @@ discover_branch_intents() {
     fi
   done < <(git worktree list --porcelain 2>/dev/null)
 
-  # 2. Check local ai-dlc/* branches (no worktree)
+  # 2. Check local ai-dlc/*/main branches (no worktree)
   while IFS= read -r branch; do
     [ -z "$branch" ] && continue
-    # Only intent-level branches (ai-dlc/slug, not ai-dlc/slug/unit)
-    [[ "$branch" =~ ^ai-dlc/[^/]+$ ]] || continue
-    local slug="${branch#ai-dlc/}"
+    # Only intent-level branches (ai-dlc/slug/main)
+    [[ "$branch" =~ ^ai-dlc/([^/]+)/main$ ]] || continue
+    local slug="${BASH_REMATCH[1]}"
     # Skip if already seen in worktree
     [[ "$seen_slugs" == *" $slug"* ]] && continue
     # Read intent.md from the branch
@@ -603,15 +603,15 @@ discover_branch_intents() {
     workflow=$(echo "$intent_content" | han parse yaml workflow -r --default default 2>/dev/null || echo "default")
     echo "$slug|$workflow|local|$branch"
     seen_slugs="$seen_slugs $slug"
-  done < <(git for-each-ref --format='%(refname:short)' 'refs/heads/ai-dlc/*' 2>/dev/null)
+  done < <(git for-each-ref --format='%(refname:short)' 'refs/heads/ai-dlc/*/main' 2>/dev/null)
 
   # 3. Check remote branches (only if include_remote=true)
   if [ "$include_remote" = "true" ]; then
     while IFS= read -r branch; do
       [ -z "$branch" ] && continue
-      # Only intent-level branches
-      [[ "$branch" =~ ^origin/ai-dlc/[^/]+$ ]] || continue
-      local slug="${branch#origin/ai-dlc/}"
+      # Only intent-level branches (origin/ai-dlc/slug/main)
+      [[ "$branch" =~ ^origin/ai-dlc/([^/]+)/main$ ]] || continue
+      local slug="${BASH_REMATCH[1]}"
       # Skip if already seen
       [[ "$seen_slugs" == *" $slug"* ]] && continue
       # Read intent.md from the remote branch
@@ -624,6 +624,6 @@ discover_branch_intents() {
       workflow=$(echo "$intent_content" | han parse yaml workflow -r --default default 2>/dev/null || echo "default")
       echo "$slug|$workflow|remote|$branch"
       seen_slugs="$seen_slugs $slug"
-    done < <(git for-each-ref --format='%(refname:short)' 'refs/remotes/origin/ai-dlc/*' 2>/dev/null)
+    done < <(git for-each-ref --format='%(refname:short)' 'refs/remotes/origin/ai-dlc/*/main' 2>/dev/null)
   fi
 }

plugin/skills/advance/SKILL.md

@@ -86,7 +86,7 @@ if [ "$AUTO_MERGE" = "true" ]; then
   UNIT_BRANCH="ai-dlc/${INTENT_SLUG}/${UNIT_SLUG}"
 
   # Ensure we're on the intent branch
-  git checkout "ai-dlc/${INTENT_SLUG}"
+  git checkout "ai-dlc/${INTENT_SLUG}/main"
 
   # Merge unit branch
   if [ "$AUTO_SQUASH" = "true" ]; then
@@ -205,15 +205,15 @@ DEFAULT_BRANCH=$(echo "$CONFIG" | jq -r '.default_branch')
 ```
 
 ```
-Intent branch ready: ai-dlc/{intent-slug} → ${DEFAULT_BRANCH}
+Intent branch ready: ai-dlc/{intent-slug}/main → ${DEFAULT_BRANCH}
 
-Create PR: gh pr create --base ${DEFAULT_BRANCH} --head ai-dlc/{intent-slug}
+Create PR: gh pr create --base ${DEFAULT_BRANCH} --head ai-dlc/{intent-slug}/main
 ```
 
 ### Next Steps
 
-1. **Review changes** - Check the work on branch `ai-dlc/{intent-slug}`
-2. **Create PR** - `gh pr create --base ${DEFAULT_BRANCH} --head ai-dlc/{intent-slug}`
+1. **Review changes** - Check the work on branch `ai-dlc/{intent-slug}/main`
+2. **Create PR** - `gh pr create --base ${DEFAULT_BRANCH} --head ai-dlc/{intent-slug}/main`
 3. **Clean up worktrees** - `git worktree remove /tmp/ai-dlc-{intent-slug}`
 4. **Start new task** - Run `/reset` to clear state, then `/elaborate`
 ```

plugin/skills/construct/SKILL.md

@@ -115,7 +115,7 @@ elif [ ${#ACTIVE_INTENTS[@]} -gt 1 ]; then
 fi
 
 # Ensure we're in the intent worktree
-INTENT_BRANCH="ai-dlc/${INTENT_SLUG}"
+INTENT_BRANCH="ai-dlc/${INTENT_SLUG}/main"
 INTENT_WORKTREE="/tmp/ai-dlc-${INTENT_SLUG}"
 
 if [ ! -d "$INTENT_WORKTREE" ]; then
@@ -134,7 +134,7 @@ Ensure the intent branch tracks the remote so teammates can push their unit bran
 ```bash
 # Verify remote exists and configure upstream tracking
 if git remote get-url origin &>/dev/null; then
-  INTENT_BRANCH="ai-dlc/${INTENT_SLUG}"
+  INTENT_BRANCH="ai-dlc/${INTENT_SLUG}/main"
 
   # Ensure the intent branch tracks the remote
   git branch --set-upstream-to=origin/"$INTENT_BRANCH" 2>/dev/null || true
@@ -436,7 +436,7 @@ AUTO_SQUASH=$(echo "$CONFIG" | jq -r '.auto_squash // "false"')
 
 if [ "$AUTO_MERGE" = "true" ]; then
   UNIT_BRANCH="ai-dlc/${INTENT_SLUG}/${UNIT_SLUG}"
-  git checkout "ai-dlc/${INTENT_SLUG}"
+  git checkout "ai-dlc/${INTENT_SLUG}/main"
 
   if [ "$AUTO_SQUASH" = "true" ]; then
     git merge --squash "$UNIT_BRANCH"

plugin/skills/elaborate/SKILL.md

@@ -672,7 +672,7 @@ Create the intent branch and worktree, then write files in `.ai-dlc/{intent-slug
 **CRITICAL: The intent MUST run in an isolated worktree, not the main working directory. Create this BEFORE writing any artifacts so all files are committed to the intent branch.**
 
 ```bash
-INTENT_BRANCH="ai-dlc/${intentSlug}"
+INTENT_BRANCH="ai-dlc/${intentSlug}/main"
 INTENT_WORKTREE="/tmp/ai-dlc-${intentSlug}"
 git worktree add -B "$INTENT_BRANCH" "$INTENT_WORKTREE"
 cd "$INTENT_WORKTREE"
@@ -757,7 +757,7 @@ problem space.}
 ---
 status: pending
 depends_on: []
-branch: ai-dlc/{intent-slug}/NN-{slug}
+branch: ai-dlc/{intent-slug}/NN-{unit-slug}
 discipline: {discipline}  # frontend, backend, api, documentation, devops, etc.
 ticket: ""  # Ticketing provider ticket key (auto-populated if ticketing provider configured)
 ---
@@ -828,7 +828,7 @@ If the orchestrator is in a temporary workspace (`/tmp/ai-dlc-workspace-*`):
 git push -u origin "$INTENT_BRANCH"
 ```
 
-This ensures builders can pull the intent branch when working remotely. Note in the handoff: "Artifacts pushed to `ai-dlc/{intent-slug}` branch on remote."
+This ensures builders can pull the intent branch when working remotely. Note in the handoff: "Artifacts pushed to `ai-dlc/{intent-slug}/main` branch on remote."
 
 ---
 
@@ -873,7 +873,7 @@ Tell the user:
 Elaboration complete!
 
 Intent Worktree: /tmp/ai-dlc-{intent-slug}/
-Branch: ai-dlc/{intent-slug}
+Branch: ai-dlc/{intent-slug}/main
 
 Created: .ai-dlc/{intent-slug}/
 - intent.md (intent, config, and testing requirements)

plugin/skills/resume/SKILL.md

@@ -104,7 +104,7 @@ starting_hat=$(get_recommended_hat ".ai-dlc/${slug}" "${workflow}")
 **CRITICAL: The orchestrator MUST run in the intent worktree, not the main working directory.**
 
 ```bash
-INTENT_BRANCH="ai-dlc/${slug}"
+INTENT_BRANCH="ai-dlc/${slug}/main"
 INTENT_WORKTREE="/tmp/ai-dlc-${slug}"
 
 if [ ! -d "$INTENT_WORKTREE" ]; then