atdd 0.4.4__py3-none-any.whl → 0.4.6__py3-none-any.whl

atdd/cli.py

@@ -110,16 +110,60 @@ class ATDDCoach:
             parallel=True
         )
 
-    def update_registries(self, registry_type: str = "all") -> int:
-        """Update registries from source files."""
-        if registry_type == "wagons":
-            self.registry_updater.update_wagon_registry()
-        elif registry_type == "contracts":
-            self.registry_updater.update_contract_registry()
-        elif registry_type == "telemetry":
-            self.registry_updater.update_telemetry_registry()
-        else:  # all
-            self.registry_updater.update_all()
+    def update_registries(
+        self,
+        registry_type: str = "all",
+        apply: bool = False,
+        check: bool = False
+    ) -> int:
+        """Update registries from source files.
+
+        Args:
+            registry_type: Which registry to update (all, wagons, trains, contracts, etc.)
+            apply: If True, apply changes without prompting (CI mode)
+            check: If True, only check for drift without applying (exit 1 if drift)
+
+        Returns:
+            0 on success, 1 if --check and drift detected
+        """
+        # Convert flags to mode string
+        if check:
+            mode = "check"
+        elif apply:
+            mode = "apply"
+        else:
+            mode = "interactive"
+
+        # Registry type handlers
+        handlers = {
+            "wagons": self.registry_updater.update_wagon_registry,
+            "trains": self.registry_updater.build_trains,
+            "contracts": self.registry_updater.update_contract_registry,
+            "telemetry": self.registry_updater.update_telemetry_registry,
+            "tester": self.registry_updater.build_tester,
+            "coder": self.registry_updater.build_coder,
+            "supabase": self.registry_updater.build_supabase,
+        }
+
+        if registry_type == "all":
+            result = self.registry_updater.build_all(mode=mode)
+            # In check mode, return 1 if any registry has changes
+            if check:
+                has_changes = any(
+                    r.get("has_changes", False) or r.get("new", 0) > 0 or len(r.get("changes", [])) > 0
+                    for r in result.values()
+                )
+                return 1 if has_changes else 0
+        elif registry_type in handlers:
+            result = handlers[registry_type](mode=mode)
+            # In check mode, return 1 if this registry has changes
+            if check:
+                has_changes = result.get("has_changes", False) or result.get("new", 0) > 0 or len(result.get("changes", [])) > 0
+                return 1 if has_changes else 0
+        else:
+            print(f"Unknown registry type: {registry_type}")
+            return 1
+
         return 0
 
     def show_status(self) -> int:
@@ -285,9 +329,20 @@ Phase descriptions:
         nargs="?",
         type=str,
         default="all",
-        choices=["all", "wagons", "contracts", "telemetry"],
+        choices=["all", "wagons", "trains", "contracts", "telemetry", "tester", "coder", "supabase"],
         help="Registry type to update (default: all)"
     )
+    registry_update_parser.add_argument(
+        "--yes", "--apply",
+        action="store_true",
+        dest="apply",
+        help="Apply changes without prompting (for CI/automation)"
+    )
+    registry_update_parser.add_argument(
+        "--check",
+        action="store_true",
+        help="Check for drift without applying (exit 1 if changes detected)"
+    )
 
     # ----- atdd init -----
     init_parser = subparsers.add_parser(
@@ -497,7 +552,11 @@ Phase descriptions:
         coach = ATDDCoach(repo_root=repo_path)
 
         if args.registry_command == "update":
-            return coach.update_registries(registry_type=args.type)
+            return coach.update_registries(
+                registry_type=args.type,
+                apply=args.apply,
+                check=args.check
+            )
         else:
             registry_parser.print_help()
             return 0

atdd/coach/commands/registry.py

@@ -160,6 +160,74 @@ class RegistryBuilder:
         self.python_dir = repo_root / "python"
         self.supabase_dir = repo_root / "supabase"
 
+    # ========================================================================
+    # MODE HANDLING - Unified confirmation and apply logic
+    # ========================================================================
+    # Handles interactive, apply, and check modes for all registries
+    # ========================================================================
+
+    def _confirm_and_apply(
+        self,
+        mode: str,
+        registry_name: str,
+        registry_path: Path,
+        output_data: Dict[str, Any],
+        stats: Dict[str, Any],
+        preview_msg: str = ""
+    ) -> Dict[str, Any]:
+        """
+        Handle confirmation and apply based on mode.
+
+        Args:
+            mode: "interactive", "apply", or "check"
+            registry_name: Human-readable name for messages (e.g., "wagon", "contract")
+            registry_path: Path to the registry file
+            output_data: Data to write to the registry
+            stats: Statistics dict to update with results
+            preview_msg: Optional custom preview message
+
+        Returns:
+            Updated stats dict with has_changes flag
+        """
+        has_changes = stats.get("new", 0) > 0 or len(stats.get("changes", [])) > 0
+        stats["has_changes"] = has_changes
+
+        if mode == "check":
+            if has_changes:
+                print(f"\n⚠️  Drift detected in {registry_name} registry")
+            else:
+                print(f"\n✅ {registry_name.capitalize()} registry is in sync")
+            return stats
+
+        if mode == "apply":
+            # Write without prompting
+            registry_path.parent.mkdir(parents=True, exist_ok=True)
+            with open(registry_path, "w") as f:
+                yaml.dump(output_data, f, default_flow_style=False, sort_keys=False, allow_unicode=True)
+
+            print(f"\n✅ {registry_name.capitalize()} registry updated successfully!")
+            print(f"  📝 Registry: {registry_path}")
+            return stats
+
+        # Interactive mode - ask for confirmation
+        print(f"\n❓ Do you want to apply these changes to the {registry_name} registry?")
+        print("   Type 'yes' to confirm, or anything else to cancel:")
+        response = input("   > ").strip().lower()
+
+        if response != "yes":
+            print("\n❌ Update cancelled by user")
+            stats["cancelled"] = True
+            return stats
+
+        # Write registry
+        registry_path.parent.mkdir(parents=True, exist_ok=True)
+        with open(registry_path, "w") as f:
+            yaml.dump(output_data, f, default_flow_style=False, sort_keys=False, allow_unicode=True)
+
+        print(f"\n✅ {registry_name.capitalize()} registry updated successfully!")
+        print(f"  📝 Registry: {registry_path}")
+        return stats
+
     # ========================================================================
     # DOMAIN LAYER - Pure Business Logic (Change Detection)
     # ========================================================================
@@ -469,16 +537,20 @@ class RegistryBuilder:
     # Reads/writes YAML files, scans directories for source files
     # ========================================================================
 
-    def update_wagon_registry(self, preview_only: bool = False) -> Dict[str, Any]:
+    def update_wagon_registry(self, mode: str = "interactive", preview_only: bool = None) -> Dict[str, Any]:
         """
         Update plan/_wagons.yaml from wagon manifest files.
 
         Args:
-            preview_only: If True, only show what would change without applying
+            mode: "interactive" (prompt), "apply" (no prompt), or "check" (verify only)
+            preview_only: Deprecated - use mode="check" instead
 
         Returns:
-            Statistics about the update
+            Statistics about the update (includes has_changes flag for check mode)
         """
+        # Backwards compatibility
+        if preview_only is not None:
+            mode = "check" if preview_only else "interactive"
         print("📊 Analyzing wagon registry from manifest files...")
 
         # Load existing registry
@@ -500,7 +572,7 @@ class RegistryBuilder:
             "updated": 0,
             "new": 0,
             "preserved_drafts": 0,
-            "changes": []  # Track detailed changes
+            "changes": []
         }
 
         for manifest_path in sorted(manifest_files):
@@ -539,7 +611,6 @@ class RegistryBuilder:
                 # Check if updating or new
                 if slug in existing_wagons:
                     stats["updated"] += 1
-                    # Track field-level changes
                     changes = self._detect_changes(slug, existing_wagons[slug], entry)
                     if changes:
                         stats["changes"].append({
@@ -560,13 +631,17 @@ class RegistryBuilder:
             except Exception as e:
                 print(f"  ❌ Error processing {manifest_path}: {e}")
 
-        # Preserve draft wagons (those without manifests)
+        # Preserve draft wagons (those without manifests or with draft: true)
         preserved_drafts = []
         for slug, wagon in existing_wagons.items():
-            if not wagon.get("manifest") and not wagon.get("path"):
-                updated_wagons.append(wagon)
-                preserved_drafts.append(slug)
-                stats["preserved_drafts"] += 1
+            is_draft = wagon.get("draft", False)
+            has_no_manifest = not wagon.get("manifest") and not wagon.get("path")
+            if is_draft or has_no_manifest:
+                # Check if already added from manifest scan
+                if slug not in [w.get("wagon") for w in updated_wagons]:
+                    updated_wagons.append(wagon)
+                    preserved_drafts.append(slug)
+                    stats["preserved_drafts"] += 1
 
         # Sort by wagon slug
         updated_wagons.sort(key=lambda w: w.get("wagon", ""))
@@ -580,44 +655,24 @@ class RegistryBuilder:
         # Print detailed change report
         self._print_change_report(stats["changes"], preserved_drafts)
 
-        # If preview only, return early
-        if preview_only:
-            print("\n⚠️  Preview mode - no changes applied")
-            return stats
-
-        # Ask for user approval
-        print("\n❓ Do you want to apply these changes to the registry?")
-        print("   Type 'yes' to confirm, or anything else to cancel:")
-        response = input("   > ").strip().lower()
-
-        if response != "yes":
-            print("\n❌ Update cancelled by user")
-            stats["cancelled"] = True
-            return stats
-
-        # Write updated registry
+        # Use helper for confirm/apply
         output = {"wagons": updated_wagons}
-        with open(registry_path, "w") as f:
-            yaml.dump(output, f, default_flow_style=False, sort_keys=False, allow_unicode=True)
-
-        print(f"\n✅ Registry updated successfully!")
-        print(f"  • Updated {stats['updated']} wagons")
-        print(f"  • Added {stats['new']} new wagons")
-        print(f"  • Preserved {stats['preserved_drafts']} draft wagons")
-        print(f"  📝 Registry: {registry_path}")
-
-        return stats
+        return self._confirm_and_apply(mode, "wagon", registry_path, output, stats)
 
-    def update_contract_registry(self, preview_only: bool = False) -> Dict[str, Any]:
+    def update_contract_registry(self, mode: str = "interactive", preview_only: bool = None) -> Dict[str, Any]:
         """
         Update contracts/_artifacts.yaml from contract schema files.
 
         Args:
-            preview_only: If True, only show what would change without applying
+            mode: "interactive" (prompt), "apply" (no prompt), or "check" (verify only)
+            preview_only: Deprecated - use mode="check" instead
 
         Returns:
-            Statistics about the update
+            Statistics about the update (includes has_changes flag for check mode)
         """
+        # Backwards compatibility
+        if preview_only is not None:
+            mode = "check" if preview_only else "interactive"
         print("\n📊 Analyzing contract registry from schema files...")
 
         # Load existing registry
@@ -635,6 +690,7 @@ class RegistryBuilder:
             "updated": 0,
             "new": 0,
             "errors": 0,
+            "preserved_drafts": 0,
             "changes": []
         }
 
@@ -657,7 +713,7 @@ class RegistryBuilder:
                 # Build artifact entry
                 rel_path = str(schema_path.relative_to(self.repo_root))
 
-                artifact_id = schema_id  # No :v1 suffix - version tracked separately
+                artifact_id = schema_id
                 artifact = {
                     "id": artifact_id,
                     "urn": f"contract:{schema_id}",
@@ -694,55 +750,44 @@ class RegistryBuilder:
                 print(f"  ⚠️  Error processing {schema_path}: {e}")
                 stats["errors"] += 1
 
+        # Preserve draft artifacts (path doesn't exist or draft: true)
+        for artifact_id, artifact in existing_artifacts.items():
+            is_draft = artifact.get("draft", False)
+            path_exists = artifact.get("path") and (self.repo_root / artifact.get("path")).exists()
+            if is_draft or not path_exists:
+                if artifact_id not in [a.get("id") for a in artifacts]:
+                    artifacts.append(artifact)
+                    stats["preserved_drafts"] += 1
+
         # Show preview
         print(f"\n📋 PREVIEW:")
         print(f"  • {stats['updated']} artifacts will be updated")
         print(f"  • {stats['new']} new artifacts will be added")
+        print(f"  • {stats['preserved_drafts']} draft artifacts will be preserved")
         if stats["errors"] > 0:
             print(f"  ⚠️  {stats['errors']} errors encountered")
 
         # Print detailed change report
         self._print_contract_change_report(stats["changes"])
 
-        # If preview only, return early
-        if preview_only:
-            print("\n⚠️  Preview mode - no changes applied")
-            return stats
-
-        # Ask for user approval
-        print("\n❓ Do you want to apply these changes to the contract registry?")
-        print("   Type 'yes' to confirm, or anything else to cancel:")
-        response = input("   > ").strip().lower()
-
-        if response != "yes":
-            print("\n❌ Update cancelled by user")
-            stats["cancelled"] = True
-            return stats
-
-        # Write registry
-        registry_path = self.contracts_dir / "_artifacts.yaml"
+        # Use helper for confirm/apply
         output = {"artifacts": artifacts}
+        return self._confirm_and_apply(mode, "contract", registry_path, output, stats)
 
-        with open(registry_path, "w") as f:
-            yaml.dump(output, f, default_flow_style=False, sort_keys=False, allow_unicode=True)
-
-        print(f"\n✅ Contract registry updated successfully!")
-        print(f"  • Updated {stats['updated']} artifacts")
-        print(f"  • Added {stats['new']} new artifacts")
-        print(f"  📝 Registry: {registry_path}")
-
-        return stats
-
-    def update_telemetry_registry(self, preview_only: bool = False) -> Dict[str, Any]:
+    def update_telemetry_registry(self, mode: str = "interactive", preview_only: bool = None) -> Dict[str, Any]:
         """
         Update telemetry/_signals.yaml from telemetry signal files.
 
         Args:
-            preview_only: If True, only show what would change without applying
+            mode: "interactive" (prompt), "apply" (no prompt), or "check" (verify only)
+            preview_only: Deprecated - use mode="check" instead
 
         Returns:
-            Statistics about the update
+            Statistics about the update (includes has_changes flag for check mode)
         """
+        # Backwards compatibility
+        if preview_only is not None:
+            mode = "check" if preview_only else "interactive"
         print("\n📊 Analyzing telemetry registry from signal files...")
 
         # Load existing registry
@@ -760,6 +805,7 @@ class RegistryBuilder:
             "updated": 0,
             "new": 0,
             "errors": 0,
+            "preserved_drafts": 0,
             "changes": []
         }
 
@@ -820,63 +866,211 @@ class RegistryBuilder:
                 print(f"  ⚠️  Error processing {signal_path}: {e}")
                 stats["errors"] += 1
 
+        # Preserve draft signals (path doesn't exist or draft: true)
+        for signal_id, signal in existing_signals.items():
+            is_draft = signal.get("draft", False)
+            path_exists = signal.get("path") and (self.repo_root / signal.get("path")).exists()
+            if is_draft or not path_exists:
+                if signal_id not in [s.get("id") for s in signals]:
+                    signals.append(signal)
+                    stats["preserved_drafts"] += 1
+
         # Show preview
         print(f"\n📋 PREVIEW:")
         print(f"  • {stats['updated']} signals will be updated")
         print(f"  • {stats['new']} new signals will be added")
+        print(f"  • {stats['preserved_drafts']} draft signals will be preserved")
         if stats["errors"] > 0:
             print(f"  ⚠️  {stats['errors']} errors encountered")
 
         # Print detailed change report
         self._print_telemetry_change_report(stats["changes"])
 
-        # If preview only, return early
-        if preview_only:
-            print("\n⚠️  Preview mode - no changes applied")
-            return stats
+        # Use helper for confirm/apply
+        output = {"signals": signals}
+        return self._confirm_and_apply(mode, "telemetry", registry_path, output, stats)
 
-        # Ask for user approval
-        print("\n❓ Do you want to apply these changes to the telemetry registry?")
-        print("   Type 'yes' to confirm, or anything else to cancel:")
-        response = input("   > ").strip().lower()
+    # Alias methods for unified API
+    def build_planner(self, mode: str = "interactive", preview_only: bool = None) -> Dict[str, Any]:
+        """Build planner registry (alias for update_wagon_registry)."""
+        # Backwards compatibility: preview_only=True maps to mode="check"
+        if preview_only is not None:
+            mode = "check" if preview_only else "interactive"
+        return self.update_wagon_registry(mode)
 
-        if response != "yes":
-            print("\n❌ Update cancelled by user")
-            stats["cancelled"] = True
+    def build_contracts(self, mode: str = "interactive", preview_only: bool = None) -> Dict[str, Any]:
+        """Build contracts registry (alias for update_contract_registry)."""
+        if preview_only is not None:
+            mode = "check" if preview_only else "interactive"
+        return self.update_contract_registry(mode)
+
+    def build_telemetry(self, mode: str = "interactive", preview_only: bool = None) -> Dict[str, Any]:
+        """Build telemetry registry (alias for update_telemetry_registry)."""
+        if preview_only is not None:
+            mode = "check" if preview_only else "interactive"
+        return self.update_telemetry_registry(mode)
+
+    def build_trains(self, mode: str = "interactive") -> Dict[str, Any]:
+        """
+        Build trains registry from train manifest files.
+        Scans plan/_trains/*.yaml files and builds plan/_trains.yaml.
+
+        Train ID convention: NN-XX-name where:
+        - NN = theme prefix (first 2 digits for grouping)
+        - XX = category within theme
+        - name = train slug
+
+        Args:
+            mode: "interactive" (prompt), "apply" (no prompt), or "check" (verify only)
+
+        Returns:
+            Statistics about the update (includes has_changes flag for check mode)
+        """
+        print("\n📊 Analyzing trains registry from manifest files...")
+
+        # Set up paths
+        trains_dir = self.plan_dir / "_trains"
+        registry_path = self.plan_dir / "_trains.yaml"
+
+        # Load existing registry
+        existing_trains = {}
+        if registry_path.exists():
+            with open(registry_path) as f:
+                registry_data = yaml.safe_load(f)
+                existing_trains = {t.get("train_id"): t for t in registry_data.get("trains", [])}
+
+        trains = []
+        stats = {
+            "total_manifests": 0,
+            "processed": 0,
+            "updated": 0,
+            "new": 0,
+            "errors": 0,
+            "preserved_drafts": 0,
+            "changes": []
+        }
+
+        # Check if trains directory exists
+        if not trains_dir.exists():
+            print(f"  ⚠️  No _trains/ directory found at {trains_dir}")
+            # Still preserve existing drafts
+            for train_id, train in existing_trains.items():
+                if train.get("draft", False):
+                    trains.append(train)
+                    stats["preserved_drafts"] += 1
+
+            if stats["preserved_drafts"] > 0:
+                print(f"\n📋 PREVIEW:")
+                print(f"  • {stats['preserved_drafts']} draft trains will be preserved")
+                output = {"trains": trains}
+                return self._confirm_and_apply(mode, "trains", registry_path, output, stats)
+
+            stats["has_changes"] = False
             return stats
 
-        # Write registry
-        registry_path = self.telemetry_dir / "_signals.yaml"
-        output = {"signals": signals}
+        # Scan for train manifests
+        manifest_files = list(trains_dir.glob("*.yaml"))
+        manifest_files = [f for f in manifest_files if not f.name.startswith("_")]
+        stats["total_manifests"] = len(manifest_files)
 
-        with open(registry_path, "w") as f:
-            yaml.dump(output, f, default_flow_style=False, sort_keys=False, allow_unicode=True)
+        for manifest_path in sorted(manifest_files):
+            try:
+                with open(manifest_path) as f:
+                    manifest = yaml.safe_load(f)
 
-        print(f"\n✅ Telemetry registry updated successfully!")
-        print(f"  • Updated {stats['updated']} signals")
-        print(f"  • Added {stats['new']} new signals")
-        print(f"  📝 Registry: {registry_path}")
+                if not manifest:
+                    print(f"  ⚠️  Skipping empty manifest: {manifest_path}")
+                    continue
 
-        return stats
+                train_id = manifest.get("train_id", manifest.get("train", ""))
+                if not train_id:
+                    # Try to infer from filename (e.g., 01-01-setup.yaml -> 01-01-setup)
+                    train_id = manifest_path.stem
 
-    # Alias methods for unified API
-    def build_planner(self, preview_only: bool = False) -> Dict[str, Any]:
-        """Build planner registry (alias for update_wagon_registry)."""
-        return self.update_wagon_registry(preview_only)
+                # Parse theme from train_id (first 2 digits)
+                theme = ""
+                if len(train_id) >= 2 and train_id[:2].isdigit():
+                    theme = train_id[:2]
 
-    def build_contracts(self, preview_only: bool = False) -> Dict[str, Any]:
-        """Build contracts registry (alias for update_contract_registry)."""
-        return self.update_contract_registry(preview_only)
+                # Build train entry
+                rel_manifest = str(manifest_path.relative_to(self.repo_root))
 
-    def build_telemetry(self, preview_only: bool = False) -> Dict[str, Any]:
-        """Build telemetry registry (alias for update_telemetry_registry)."""
-        return self.update_telemetry_registry(preview_only)
+                entry = {
+                    "train_id": train_id,
+                    "theme": theme,
+                    "title": manifest.get("title", manifest.get("description", "")),
+                    "description": manifest.get("description", ""),
+                    "wagons": manifest.get("wagons", []),
+                    "status": manifest.get("status", "planned"),
+                    "manifest": rel_manifest
+                }
+
+                # Check if updating or new
+                if train_id in existing_trains:
+                    stats["updated"] += 1
+                    # Check for field changes
+                    old = existing_trains[train_id]
+                    changed_fields = []
+                    for field in ["title", "description", "wagons", "status", "theme"]:
+                        if old.get(field) != entry.get(field):
+                            changed_fields.append(field)
+                    if changed_fields:
+                        stats["changes"].append({
+                            "train": train_id,
+                            "type": "updated",
+                            "fields": changed_fields
+                        })
+                else:
+                    stats["new"] += 1
+                    stats["changes"].append({
+                        "train": train_id,
+                        "type": "new",
+                        "fields": ["all fields (new train)"]
+                    })
+
+                trains.append(entry)
+                stats["processed"] += 1
 
-    def build_tester(self, preview_only: bool = False) -> Dict[str, Any]:
+            except Exception as e:
+                print(f"  ❌ Error processing {manifest_path}: {e}")
+                stats["errors"] += 1
+
+        # Preserve draft trains (those without manifests or with draft: true)
+        for train_id, train in existing_trains.items():
+            is_draft = train.get("draft", False)
+            has_no_manifest = not train.get("manifest")
+            if is_draft or has_no_manifest:
+                if train_id not in [t.get("train_id") for t in trains]:
+                    trains.append(train)
+                    stats["preserved_drafts"] += 1
+
+        # Sort by train_id
+        trains.sort(key=lambda t: t.get("train_id", ""))
+
+        # Show preview
+        print(f"\n📋 PREVIEW:")
+        print(f"  • {stats['updated']} trains will be updated")
+        print(f"  • {stats['new']} new trains will be added")
+        print(f"  • {stats['preserved_drafts']} draft trains will be preserved")
+        if stats["errors"] > 0:
+            print(f"  ⚠️  {stats['errors']} errors encountered")
+
+        # Use helper for confirm/apply
+        output = {"trains": trains}
+        return self._confirm_and_apply(mode, "trains", registry_path, output, stats)
+
+    def build_tester(self, mode: str = "interactive", preview_only: bool = None) -> Dict[str, Any]:
         """
         Build tester registry from test files.
         Scans atdd/tester/**/*_test.py files for URNs and metadata.
+
+        Args:
+            mode: "interactive" (prompt), "apply" (no prompt), or "check" (verify only)
+            preview_only: Deprecated - use mode="check" instead
         """
+        # Backwards compatibility
+        if preview_only is not None:
+            mode = "check" if preview_only else "interactive"
         print("\n📊 Analyzing tester registry from test files...")
 
         # Load existing registry
@@ -894,12 +1088,12 @@ class RegistryBuilder:
             "updated": 0,
             "new": 0,
             "errors": 0,
+            "preserved_drafts": 0,
             "changes": []
         }
 
         # Scan for test files
         if self.tester_dir.exists():
-            # Look for both test_*.py and *_test.py patterns
             test_files = list(self.tester_dir.glob("**/*_test.py"))
             test_files.extend(list(self.tester_dir.glob("**/test_*.py")))
             test_files = [f for f in test_files if not f.name.startswith("_")]
@@ -910,16 +1104,13 @@ class RegistryBuilder:
                     with open(test_file) as f:
                         content = f.read()
 
-                    # Extract URN markers from docstring or comments
                     urns = re.findall(r'URN:\s*(\S+)', content)
                     spec_urns = re.findall(r'Spec:\s*(\S+)', content)
                     acceptance_urns = re.findall(r'Acceptance:\s*(\S+)', content)
 
-                    # Extract wagon from path
                     rel_path = test_file.relative_to(self.tester_dir)
                     wagon = rel_path.parts[0] if len(rel_path.parts) > 1 else "unknown"
 
-                    # Build test entry
                     for urn in urns:
                         test_entry = {
                             "urn": urn,
@@ -932,7 +1123,6 @@ class RegistryBuilder:
                         if acceptance_urns:
                             test_entry["acceptance_urn"] = acceptance_urns[0]
 
-                        # Track changes
                         if urn in existing_tests:
                             stats["updated"] += 1
                         else:
@@ -950,45 +1140,39 @@ class RegistryBuilder:
                     print(f"  ⚠️  Error processing {test_file}: {e}")
                     stats["errors"] += 1
 
+        # Preserve draft tests (file doesn't exist or draft: true)
+        for urn, test in existing_tests.items():
+            is_draft = test.get("draft", False)
+            file_exists = test.get("file") and (self.repo_root / test.get("file")).exists()
+            if is_draft or not file_exists:
+                if urn not in [t.get("urn") for t in tests]:
+                    tests.append(test)
+                    stats["preserved_drafts"] += 1
+
         # Show preview
         print(f"\n📋 PREVIEW:")
         print(f"  • {stats['updated']} tests will be updated")
         print(f"  • {stats['new']} new tests will be added")
+        print(f"  • {stats['preserved_drafts']} draft tests will be preserved")
         if stats["errors"] > 0:
             print(f"  ⚠️  {stats['errors']} errors encountered")
 
-        if preview_only:
-            print("\n⚠️  Preview mode - no changes applied")
-            return stats
-
-        # Ask for confirmation
-        print("\n❓ Do you want to apply these changes to the tester registry?")
-        print("   Type 'yes' to confirm, or anything else to cancel:")
-        response = input("   > ").strip().lower()
-
-        if response != "yes":
-            print("\n❌ Update cancelled by user")
-            stats["cancelled"] = True
-            return stats
-
-        # Write registry
+        # Use helper for confirm/apply
         output = {"tests": tests}
-        registry_path.parent.mkdir(parents=True, exist_ok=True)
-        with open(registry_path, "w") as f:
-            yaml.dump(output, f, default_flow_style=False, sort_keys=False, allow_unicode=True)
-
-        print(f"\n✅ Tester registry updated successfully!")
-        print(f"  • Updated {stats['updated']} tests")
-        print(f"  • Added {stats['new']} new tests")
-        print(f"  📝 Registry: {registry_path}")
-
-        return stats
+        return self._confirm_and_apply(mode, "tester", registry_path, output, stats)
 
-    def build_coder(self, preview_only: bool = False) -> Dict[str, Any]:
+    def build_coder(self, mode: str = "interactive", preview_only: bool = None) -> Dict[str, Any]:
         """
         Build coder implementation registry from Python files.
         Scans python/**/*.py files for implementations.
+
+        Args:
+            mode: "interactive" (prompt), "apply" (no prompt), or "check" (verify only)
+            preview_only: Deprecated - use mode="check" instead
         """
+        # Backwards compatibility
+        if preview_only is not None:
+            mode = "check" if preview_only else "interactive"
         print("\n📊 Analyzing coder registry from Python files...")
 
         # Load existing registry
@@ -1006,13 +1190,13 @@ class RegistryBuilder:
             "updated": 0,
             "new": 0,
             "errors": 0,
+            "preserved_drafts": 0,
             "changes": []
         }
 
         # Scan for Python implementation files
         if self.python_dir.exists():
             py_files = list(self.python_dir.glob("**/*.py"))
-            # Filter out __init__, __pycache__, and files in specific test directories
             py_files = [
                 f for f in py_files
                 if not f.name.startswith("_")
@@ -1029,18 +1213,15 @@ class RegistryBuilder:
                     with open(py_file) as f:
                         content = f.read()
 
-                    # Extract metadata from docstring
                     spec_urns = re.findall(r'Spec:\s*(\S+)', content)
                     test_urns = re.findall(r'Test:\s*(\S+)', content)
 
-                    # Extract wagon and layer from path
                     rel_path = py_file.relative_to(self.python_dir)
                     parts = rel_path.parts
 
                     wagon = parts[0] if len(parts) > 0 else "unknown"
                     layer = "unknown"
 
-                    # Try to detect layer from path
                     if "domain" in str(py_file):
                         layer = "domain"
                     elif "application" in str(py_file):
@@ -1050,17 +1231,15 @@ class RegistryBuilder:
                     elif "presentation" in str(py_file):
                         layer = "presentation"
 
-                    # Generate URN
                     component = py_file.stem
                     impl_urn = f"impl:{wagon}:{layer}:{component}:python"
 
-                    # Build implementation entry
                     impl_entry = {
                         "urn": impl_urn,
                         "file": str(py_file.relative_to(self.repo_root)),
                         "wagon": wagon,
                         "layer": layer,
-                        "component_type": "entity",  # Default
+                        "component_type": "entity",
                         "language": "python"
                     }
 
@@ -1069,7 +1248,6 @@ class RegistryBuilder:
                     if test_urns:
                         impl_entry["test_urn"] = test_urns[0]
 
-                    # Track changes
                     if impl_urn in existing_impls:
                         stats["updated"] += 1
                     else:
@@ -1087,45 +1265,39 @@ class RegistryBuilder:
                     print(f"  ⚠️  Error processing {py_file}: {e}")
                     stats["errors"] += 1
 
+        # Preserve draft implementations (file doesn't exist or draft: true)
+        for urn, impl in existing_impls.items():
+            is_draft = impl.get("draft", False)
+            file_exists = impl.get("file") and (self.repo_root / impl.get("file")).exists()
+            if is_draft or not file_exists:
+                if urn not in [i.get("urn") for i in implementations]:
+                    implementations.append(impl)
+                    stats["preserved_drafts"] += 1
+
         # Show preview
         print(f"\n📋 PREVIEW:")
         print(f"  • {stats['updated']} implementations will be updated")
         print(f"  • {stats['new']} new implementations will be added")
+        print(f"  • {stats['preserved_drafts']} draft implementations will be preserved")
         if stats["errors"] > 0:
             print(f"  ⚠️  {stats['errors']} errors encountered")
 
-        if preview_only:
-            print("\n⚠️  Preview mode - no changes applied")
-            return stats
-
-        # Ask for confirmation
-        print("\n❓ Do you want to apply these changes to the coder registry?")
-        print("   Type 'yes' to confirm, or anything else to cancel:")
-        response = input("   > ").strip().lower()
-
-        if response != "yes":
-            print("\n❌ Update cancelled by user")
-            stats["cancelled"] = True
-            return stats
-
-        # Write registry
+        # Use helper for confirm/apply
         output = {"implementations": implementations}
-        registry_path.parent.mkdir(parents=True, exist_ok=True)
-        with open(registry_path, "w") as f:
-            yaml.dump(output, f, default_flow_style=False, sort_keys=False, allow_unicode=True)
-
-        print(f"\n✅ Coder registry updated successfully!")
-        print(f"  • Updated {stats['updated']} implementations")
-        print(f"  • Added {stats['new']} new implementations")
-        print(f"  📝 Registry: {registry_path}")
+        return self._confirm_and_apply(mode, "coder", registry_path, output, stats)
 
-        return stats
-
-    def build_supabase(self, preview_only: bool = False) -> Dict[str, Any]:
+    def build_supabase(self, mode: str = "interactive", preview_only: bool = None) -> Dict[str, Any]:
         """
         Build supabase functions registry.
         Scans supabase/functions/**/ for function directories.
+
+        Args:
+            mode: "interactive" (prompt), "apply" (no prompt), or "check" (verify only)
+            preview_only: Deprecated - use mode="check" instead
         """
+        # Backwards compatibility
+        if preview_only is not None:
+            mode = "check" if preview_only else "interactive"
         print("\n📊 Analyzing supabase registry from function files...")
 
         # Load existing registry
@@ -1134,7 +1306,7 @@ class RegistryBuilder:
         if registry_path.exists():
             with open(registry_path) as f:
                 registry_data = yaml.safe_load(f)
-                existing_funcs = {f.get("id"): f for f in registry_data.get("functions", [])}
+                existing_funcs = {fn.get("id"): fn for fn in registry_data.get("functions", [])}
 
         functions = []
         stats = {
@@ -1143,6 +1315,7 @@ class RegistryBuilder:
             "updated": 0,
             "new": 0,
             "errors": 0,
+            "preserved_drafts": 0,
             "changes": []
         }
 
@@ -1168,7 +1341,6 @@ class RegistryBuilder:
                         "description": f"Supabase function: {func_id}"
                     }
 
-                    # Track changes
                     if func_id in existing_funcs:
                         stats["updated"] += 1
                     else:
@@ -1186,37 +1358,24 @@ class RegistryBuilder:
                     print(f"  ⚠️  Error processing {func_dir}: {e}")
                     stats["errors"] += 1
 
+        # Preserve draft functions (path doesn't exist or draft: true)
+        for func_id, func in existing_funcs.items():
+            is_draft = func.get("draft", False)
+            path_exists = func.get("path") and (self.repo_root / func.get("path")).exists()
+            if is_draft or not path_exists:
+                if func_id not in [fn.get("id") for fn in functions]:
+                    functions.append(func)
+                    stats["preserved_drafts"] += 1
+
         # Show preview
         print(f"\n📋 PREVIEW:")
         print(f"  • {stats['updated']} functions will be updated")
         print(f"  • {stats['new']} new functions will be added")
+        print(f"  • {stats['preserved_drafts']} draft functions will be preserved")
 
-        if preview_only:
-            print("\n⚠️  Preview mode - no changes applied")
-            return stats
-
-        # Ask for confirmation
-        print("\n❓ Do you want to apply these changes to the supabase registry?")
-        print("   Type 'yes' to confirm, or anything else to cancel:")
-        response = input("   > ").strip().lower()
-
-        if response != "yes":
-            print("\n❌ Update cancelled by user")
-            stats["cancelled"] = True
-            return stats
-
-        # Write registry
+        # Use helper for confirm/apply
         output = {"functions": functions}
-        registry_path.parent.mkdir(parents=True, exist_ok=True)
-        with open(registry_path, "w") as f:
-            yaml.dump(output, f, default_flow_style=False, sort_keys=False, allow_unicode=True)
-
-        print(f"\n✅ Supabase registry updated successfully!")
-        print(f"  • Updated {stats['updated']} functions")
-        print(f"  • Added {stats['new']} new functions")
-        print(f"  📝 Registry: {registry_path}")
-
-        return stats
+        return self._confirm_and_apply(mode, "supabase", registry_path, output, stats)
 
     def build_python_manifest(self, preview_only: bool = False) -> Dict[str, Any]:
         """
@@ -1317,19 +1476,24 @@ class RegistryBuilder:
 
         return stats
 
-    def build_all(self) -> Dict[str, Any]:
-        """Build all registries."""
+    def build_all(self, mode: str = "interactive") -> Dict[str, Any]:
+        """Build all registries.
+
+        Args:
+            mode: "interactive" (prompt), "apply" (no prompt), or "check" (verify only)
+        """
         print("=" * 60)
         print("Unified Registry Builder - Synchronizing from source files")
         print("=" * 60)
 
         results = {
-            "plan": self.build_planner(),
-            "contracts": self.build_contracts(),
-            "telemetry": self.build_telemetry(),
-            "tester": self.build_tester(),
-            "coder": self.build_coder(),
-            "supabase": self.build_supabase()
+            "plan": self.build_planner(mode),
+            "trains": self.build_trains(mode),
+            "contracts": self.build_contracts(mode),
+            "telemetry": self.build_telemetry(mode),
+            "tester": self.build_tester(mode),
+            "coder": self.build_coder(mode),
+            "supabase": self.build_supabase(mode)
         }
 
         print("\n" + "=" * 60)

atdd/coach/templates/SESSION-TEMPLATE.md

@@ -348,7 +348,7 @@ Rules:
 -->
 
 - [ ] Determine change class: PATCH / MINOR / MAJOR
-- [ ] Bump version in version file (pyproject.toml, package.json, etc.)
+- [ ] Bump version in version file (recommended: VERSION; sync any language manifests if used)
 - [ ] Commit: "Bump version to {version}"
 - [ ] Create tag: `git tag v{version}`
 - [ ] Push with tags: `git push origin {branch} --tags`

atdd/coach/validators/test_release_versioning.py

@@ -62,6 +62,12 @@ def _read_version_from_file(path: Path) -> str:
         version = _parse_package_json_version(path)
     else:
         version = _parse_plain_version(path)
+        if not version:
+            pytest.fail(
+                f"Could not read version from {path}. "
+                "Expected first non-comment line to contain a semver like "
+                "'1.2.3' or '1.2.3 - short summary'."
+            )
 
     if not version:
         pytest.fail(f"Could not read version from {path}")
@@ -127,11 +133,17 @@ def _parse_package_json_version(path: Path) -> Optional[str]:
 
 
 def _parse_plain_version(path: Path) -> Optional[str]:
+    version_pattern = re.compile(
+        r"\bv?(?P<version>\d+\.\d+(?:\.\d+)?(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?)\b"
+    )
     for line in path.read_text().splitlines():
         stripped = line.strip()
         if not stripped or stripped.startswith("#"):
             continue
-        return stripped
+        match = version_pattern.search(stripped)
+        if match:
+            return match.group("version")
+        return None
     return None
 
 

{atdd-0.4.4.dist-info → atdd-0.4.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atdd
-Version: 0.4.4
+Version: 0.4.6
 Summary: ATDD Platform - Acceptance Test Driven Development toolkit
 License: MIT
 Requires-Python: >=3.10
@@ -58,14 +58,20 @@ atdd --help
 ```bash
 atdd init                      # Initialize ATDD in your project
 atdd gate                      # ⚠️ START EVERY SESSION WITH THIS
-atdd session new <capability>    # Create a planning session
+atdd session new <task>        # Create a planning session
 atdd sync                      # Sync rules to agent config files
 atdd validate                  # Run all validators
 ```
 
 > **⚠️ `atdd gate` is required.** 
 > 🤖 Tell your agent: "Run `atdd gate` and follow ATDD rigorously." 
-> Agents skip instruction files but can't ignore tool output. No gate = no ATDD guarantees.
+> Agents skip instruction files but can't ignore tool ou
+
+
+
+
+
+tput. No gate = no ATDD guarantees.
 
 ## What It Does
 
@@ -232,14 +238,16 @@ atdd validate --html       # With HTML report
 
 ### Release Versioning
 
-ATDD enforces release versioning via coach validators. Configure the version file and tag prefix in `.atdd/config.yaml`:
+ATDD enforces release versioning via coach validators. Recommended: keep a single root `VERSION` file as the canonical source (first line like `1.2.3 - short summary`; trailing summary is ignored). Configure the version file and tag prefix in `.atdd/config.yaml`:
 
 ```yaml
 release:
-  version_file: "pyproject.toml"  # or package.json, VERSION, etc.
+  version_file: "VERSION"  # recommended single source of truth
   tag_prefix: "v"
 ```
 
+If you also publish with language-specific manifests (e.g., `pyproject.toml`, `package.json`), keep their version fields in sync with `VERSION`.
+
 Validation (`atdd validate coach` or `atdd validate`) requires:
 - Version file exists and contains a version
 - Git tag on HEAD matches `{tag_prefix}{version}`

{atdd-0.4.4.dist-info → atdd-0.4.6.dist-info}/RECORD

@@ -1,6 +1,6 @@
 atdd/__init__.py,sha256=-S8i9OahH-t9FJkPn6nprxipnjVum3rLeVsCS74T6eY,156
 atdd/__main__.py,sha256=B0sXDQLjFN9GowTlXo4NMWwPZPjDsrT8Frq7DnbdOD8,77
-atdd/cli.py,sha256=NlhWL8sRLBzISgyn2KM-KT_aYnMBHt_xNP3TqfMHIhA,20364
+atdd/cli.py,sha256=5O5IazSmlAPyIDmtOXE1Wi7RT_-FmtagkzETmPszE9E,22506
 atdd/conftest.py,sha256=Fj3kIhCETbj2QBCIjySBgdS3stKNRZcZzKTJr7A4LaQ,5300
 atdd/version_check.py,sha256=BlPcLwzNnm457vWUolB3wMtZEI-fXvpzfm6p8U_j7rc,6684
 atdd/coach/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -14,7 +14,7 @@ atdd/coach/commands/initializer.py,sha256=wuvzj7QwA11ilNjRZU6Bx2bLQXITdBHJxR9_mZ
 atdd/coach/commands/interface.py,sha256=FwBrJpWkfSL9n4n0HT_EC-alseXgU0bweKD4TImyHN0,40483
 atdd/coach/commands/inventory.py,sha256=qU42MnkXt1JSBh5GU7pPSKmCO27Zfga7XwMT19RquJE,20969
 atdd/coach/commands/migration.py,sha256=wRxU7emvvHqWt1MvXKkNTkPBjp0sU9g8F5Uy5yV2YfI,8177
-atdd/coach/commands/registry.py,sha256=76-Pe3_cN483JR1pXUdDIE5WSZjWtVV0Jl8dRtRw_9Y,58349
+atdd/coach/commands/registry.py,sha256=zE_Djgo4QKaDnp9JiPAh0D9wIv5Ed1yTmMEy31ipJkY,66736
 atdd/coach/commands/session.py,sha256=MhuWXd5TR6bB3w0t8vANeZx3L476qwLT6EUQMwg-wQA,14268
 atdd/coach/commands/sync.py,sha256=SLNzhcc6IuzMofMbkH9wM9rBSk5tPfcWPKXn9TaSZ-Y,13782
 atdd/coach/commands/test_interface.py,sha256=a7ut2Hhk0PnQ5LfJZkoQwfkfkVuB5OHA4QBwOS0-jcg,16870
@@ -28,7 +28,7 @@ atdd/coach/overlays/claude.md,sha256=33mhpqhmsRhCtdWlU7cMXAJDsaVra9uBBK8URV8OtQA
 atdd/coach/schemas/config.schema.json,sha256=CpePppEAB6WiLeWVgWW3EKOxlLvMHHcWisRnJL9z_SE,1863
 atdd/coach/schemas/manifest.schema.json,sha256=WO13-YF_FgH1awh96khCtk-112b6XSC24anlY3B7GjY,2885
 atdd/coach/templates/ATDD.md,sha256=MLbrVbCETJre4c05d5FXGuf6W95Hz9E0jpE4RI9r4cg,13237
-atdd/coach/templates/SESSION-TEMPLATE.md,sha256=gcmfDDD6rREI20vhWXlf01AGbRbR8Hh7Q4QZX4H-pVw,9455
+atdd/coach/templates/SESSION-TEMPLATE.md,sha256=cGT_0x5KLbPHOCiuM8evLGpWKIlR-aggqxiBtbjSJoo,9478
 atdd/coach/utils/__init__.py,sha256=7Jbo-heJEKSAn6I0s35z_2S4R8qGZ48PL6a2IntcNYg,148
 atdd/coach/utils/repo.py,sha256=0kiF5WpVTen0nO14u5T0RflznZhgGco2i9CwKobOh38,3757
 atdd/coach/utils/graph/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -37,7 +37,7 @@ atdd/coach/validators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 atdd/coach/validators/shared_fixtures.py,sha256=tdqAb4675P-oOCL08mvSCG9XpmwMCjL9iSq1W5U7-wk,12558
 atdd/coach/validators/test_enrich_wagon_registry.py,sha256=WeTwYJqoNY6mEYc-QAvQo7YVagSOjaNKxB6Q6dpWqIM,6561
 atdd/coach/validators/test_registry.py,sha256=ffN70yA_1xxL3R8gdpGbY2M8dQXyuajIZhBZ-ylNiNs,17845
-atdd/coach/validators/test_release_versioning.py,sha256=-H2hCRfdikVP54LHNDqW9IDmm6JLNBUZRdnF2uICvOI,5194
+atdd/coach/validators/test_release_versioning.py,sha256=B40DfbtrSGguPc537zXmjT75hhySfocWLzJWqOKZQcU,5678
 atdd/coach/validators/test_session_validation.py,sha256=0VszXtFwRTO04b5CxDPO3klk0VfiqlpdbNpshjMn-qU,39079
 atdd/coach/validators/test_traceability.py,sha256=qTyobt41VBiCr6xRN2C7BPtGYvk_2poVQIe814Blt8E,15977
 atdd/coach/validators/test_update_feature_paths.py,sha256=zOKVDgEIpncSJwDh_shyyou5Pu-Ai7Z_XgF8zAbQVTA,4528
@@ -182,9 +182,9 @@ atdd/tester/validators/test_red_supabase_layer_structure.py,sha256=zbUjsMWSJE1MP
 atdd/tester/validators/test_telemetry_structure.py,sha256=uU5frZnxSlOn60iHyqhe7Pg9b0wrOV7N14D4S6Aw6TE,22626
 atdd/tester/validators/test_typescript_test_naming.py,sha256=E-TyGv_GVlTfsbyuxrtv9sOWSZS_QcpH6rrJFbWoeeU,11280
 atdd/tester/validators/test_typescript_test_structure.py,sha256=eV89SD1RaKtchBZupqhnJmaruoROosf3LwB4Fwe4UJI,2612
-atdd-0.4.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-atdd-0.4.4.dist-info/METADATA,sha256=cBMNKGmx5Uyw5kwn_v6ezv-CKbuFd5QpsZ6hFG_rg9k,8426
-atdd-0.4.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-atdd-0.4.4.dist-info/entry_points.txt,sha256=-C3yrA1WQQfN3iuGmSzPapA5cKVBEYU5Q1HUffSJTbY,38
-atdd-0.4.4.dist-info/top_level.txt,sha256=VKkf6Uiyrm4RS6ULCGM-v8AzYN8K2yg8SMqwJLoO-xs,5
-atdd-0.4.4.dist-info/RECORD,,
+atdd-0.4.6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+atdd-0.4.6.dist-info/METADATA,sha256=krXgWDxwrC0W-HkHgBtc0GoE0aXyJWqhHGPpjm3G4T8,8716
+atdd-0.4.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+atdd-0.4.6.dist-info/entry_points.txt,sha256=-C3yrA1WQQfN3iuGmSzPapA5cKVBEYU5Q1HUffSJTbY,38
+atdd-0.4.6.dist-info/top_level.txt,sha256=VKkf6Uiyrm4RS6ULCGM-v8AzYN8K2yg8SMqwJLoO-xs,5
+atdd-0.4.6.dist-info/RECORD,,