merge: resolve conflicts with main (keep both last_updated and telemetry)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: jwaldrip

.claude-plugin/marketplace.json

@@ -6,7 +6,7 @@
   },
   "metadata": {
     "description": "AI-DLC — the software development profile of H·AI·K·U. Iterative AI-driven development with git integration, test suites, PR workflows, CI/CD pipelines, and deployment gates.",
-    "version": "1.20.17"
+    "version": "1.28.0"
   },
   "plugins": [
     {

CHANGELOG.md

@@ -5,6 +5,82 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.28.0] - 2026-03-26
+
+### Added
+
+- auto-cleanup worktrees at completion milestones ([d17a34b](../../commit/d17a34b))
+
+### Other
+
+- Merge pull request #23 from TheBushidoCollective/hampton/auto-cleanup-lifecycle ([8d9118f](../../commit/8d9118f))
+
+## [1.27.0] - 2026-03-26
+
+### Added
+
+- add design-specific unit template sections ([ef67955](../../commit/ef67955))
+
+### Other
+
+- Merge pull request #19 from TheBushidoCollective/hampton/design-unit-template ([8b1e653](../../commit/8b1e653))
+
+## [1.26.0] - 2026-03-26
+
+### Added
+
+- rework /followup to create linked iteration intents ([0723438](../../commit/0723438))
+
+### Other
+
+- Merge pull request #14 from TheBushidoCollective/hampton/followup-workflow ([3e44f9c](../../commit/3e44f9c))
+
+## [1.25.0] - 2026-03-26
+
+### Added
+
+- include design units in wireframe generation ([2f4c611](../../commit/2f4c611))
+
+### Other
+
+- Merge pull request #18 from TheBushidoCollective/hampton/design-unit-wireframes ([fc7cb8d](../../commit/fc7cb8d))
+
+## [1.24.0] - 2026-03-26
+
+### Added
+
+- add design-focused success criteria guidance ([d760163](../../commit/d760163))
+
+### Other
+
+- Merge pull request #20 from TheBushidoCollective/hampton/design-criteria-guidance ([c760c34](../../commit/c760c34))
+
+## [1.23.0] - 2026-03-26
+
+### Added
+
+- auto-route discipline: design to design workflow ([eae1c68](../../commit/eae1c68))
+
+### Other
+
+- Merge pull request #21 from TheBushidoCollective/hampton/auto-design-workflow ([dba8202](../../commit/dba8202))
+
+## [1.22.0] - 2026-03-26
+
+### Added
+
+- detect and remove merged worktrees ([bb1b27a](../../commit/bb1b27a))
+
+### Other
+
+- Merge pull request #11 from TheBushidoCollective/hampton/smart-worktree-cleanup ([90eeb1f](../../commit/90eeb1f))
+
+## [1.21.0] - 2026-03-26
+
+### Added
+
+- add OTEL reporting for AI-DLC workflow events ([b0cfb0c](../../commit/b0cfb0c))
+
 ## [1.20.17] - 2026-03-23
 
 ### Other

plugin/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-dlc",
-  "version": "1.20.17",
+  "version": "1.28.0",
   "description": "AI-DLC methodology - iterative AI-driven development with hat-based workflows, completion criteria, and automatic context preservation. Software development profile of the H•AI•K•U Method.",
   "author": {
     "name": "The Bushido Collective",

plugin/hooks/inject-context.sh

@@ -49,6 +49,14 @@ if [ -f "$HAIKU_LIB" ]; then
   source "$HAIKU_LIB"
 fi
 
+# Source telemetry library (non-blocking, no-op when disabled)
+TELEMETRY_LIB="${CLAUDE_PLUGIN_ROOT}/lib/telemetry.sh"
+if [ -f "$TELEMETRY_LIB" ]; then
+  # shellcheck source=/dev/null
+  source "$TELEMETRY_LIB"
+  aidlc_telemetry_init
+fi
+
 # Detect project maturity (greenfield / early / established)
 PROJECT_MATURITY=""
 if type detect_project_maturity &>/dev/null; then
@@ -354,6 +362,13 @@ if [ "$NEEDS_ADVANCE" = "true" ] && [ "$SOURCE" != "compact" ]; then
   else
     han keep save iteration.json "$ITERATION_JSON" 2>/dev/null || true
   fi
+
+  # Emit telemetry for bolt iteration advance
+  if type aidlc_log_event &>/dev/null; then
+    _ADVANCE_INTENT_SLUG=$(echo "$ITERATION_JSON" | han parse json intentSlug -r --default "" 2>/dev/null || echo "")
+    _ADVANCE_UNIT_SLUG=$(echo "$ITERATION_JSON" | han parse json targetUnit -r --default "" 2>/dev/null || echo "")
+    aidlc_record_bolt_iteration "$_ADVANCE_INTENT_SLUG" "$_ADVANCE_UNIT_SLUG" "$NEW_ITER" "advanced"
+  fi
 fi
 
 # Parse iteration state using han parse (no jq needed)

plugin/lib/dag.sh

@@ -479,11 +479,36 @@ update_unit_status() {
       ;;
   esac
 
+  # Capture old status for telemetry
+  local old_status
+  old_status=$(parse_unit_status "$unit_file")
+
   # Update status in frontmatter using han parse yaml-set
   han parse yaml-set status "$new_status" < "$unit_file" > "$unit_file.tmp" && mv "$unit_file.tmp" "$unit_file"
 
   # Update last_updated timestamp
   han parse yaml-set last_updated "$(date -u +%Y-%m-%dT%H:%M:%SZ)" < "$unit_file" > "$unit_file.tmp" && mv "$unit_file.tmp" "$unit_file"
+
+  # Emit telemetry for unit status change (non-blocking)
+  if [ -z "${_AIDLC_TELEMETRY_INIT:-}" ]; then
+    local telemetry_lib="${SCRIPT_DIR}/telemetry.sh"
+    if [ -f "$telemetry_lib" ]; then
+      # shellcheck source=telemetry.sh
+      source "$telemetry_lib"
+      aidlc_telemetry_init
+    fi
+  fi
+  if type aidlc_record_unit_status_change &>/dev/null; then
+    # Extract intent slug and unit slug from the path
+    # Path pattern: .ai-dlc/<intent_slug>/unit-NN-<unit_slug>.md
+    local unit_basename
+    unit_basename=$(basename "$unit_file" .md)
+    local intent_slug=""
+    if [[ "$real_path" =~ /\.ai-dlc/([^/]+)/ ]]; then
+      intent_slug="${BASH_REMATCH[1]}"
+    fi
+    aidlc_record_unit_status_change "$intent_slug" "$unit_basename" "$old_status" "$new_status"
+  fi
 }
 
 # Get DAG summary counts