specfuse-loop 0.3.3__tar.gz → 0.3.5__tar.gz

{specfuse_loop-0.3.3/specfuse_loop.egg-info → specfuse_loop-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: specfuse-loop
-Version: 0.3.3
+Version: 0.3.5
 Summary: Local-first executor for the Specfuse Plan + Work Unit gate-cycle methodology.
 Author: Specfuse contributors
 License: Apache-2.0

{specfuse_loop-0.3.3 → specfuse_loop-0.3.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "specfuse-loop"
-version = "0.3.3"
+version = "0.3.5"
 description = "Local-first executor for the Specfuse Plan + Work Unit gate-cycle methodology."
 readme = "README.md"
 requires-python = ">=3.10"

specfuse_loop-0.3.5/specfuse/loop/data/VERSION

@@ -0,0 +1 @@
+0.3.5

{specfuse_loop-0.3.3 → specfuse_loop-0.3.5}/specfuse/loop/loop.py

@@ -62,7 +62,7 @@ SPECFUSE_DIR = Path(".specfuse")
 REPO_ROOT = SPECFUSE_DIR.parent
 FEATURES_DIR = SPECFUSE_DIR / "features"
 VERIFICATION_PATH = SPECFUSE_DIR / "verification.yml"
-DRIVER_VERSION = "0.3.3"
+DRIVER_VERSION = "0.3.5"
 # Oldest scaffold layout this driver can drive. init.sh stamps the scaffold's own
 # version into `.specfuse/VERSION`; check_scaffold_version() fails loud at startup if
 # the consumer's scaffold is older than this, pointing at `specfuse upgrade`. Bump
@@ -728,7 +728,8 @@ def _branch_prep_hint(feature_dir: "Path", feat_fm: dict, feature_id: str) -> st
     lines = [
         "",
         "Easiest — let the loop create the branch and commit for you:",
-        "    specfuse-loop --prepare",
+        "    specfuse-loop --prepare        # …then run",
+        "    specfuse-loop --prepare-only   # …then stop, so you can review first",
         "",
         "Or do it manually:",
     ]
@@ -926,9 +927,15 @@ def ensure_feature_branch(feat_fm: dict, feature_dir: "Path | None" = None) -> N
         ).returncode == 0
         if not is_ancestor:
             raise FeatureBranchError(
-                f"branch '{branch}' exists and diverges from HEAD (not an "
-                f"ancestor). Refusing to silently check out a stale branch; "
-                f"resolve manually (rebase, recreate, or delete it) and re-run."
+                f"branch '{branch}' already exists and has diverged from your "
+                f"current branch '{current}' (it carries commits HEAD does not). "
+                f"Refusing to silently check it out — that could build on a stale "
+                f"base or lose work. Pick one, then re-run:\n"
+                f"  - resume that branch's work:    git checkout {branch}\n"
+                f"  - rebase it onto here:          git checkout {branch} && "
+                f"git rebase {current}\n"
+                f"  - discard it (work not needed): git branch -D {branch}   "
+                f"(the loop recreates it from HEAD)"
             )
         _checked_checkout(["checkout", branch], f"checkout of existing branch '{branch}'")
         print(f"Switched to feature branch '{branch}' (was on '{current}').")
@@ -2974,6 +2981,7 @@ def run(
     dry_run: bool,
     force_full_close: str | None = None,
     prepare: bool = False,
+    prepare_only: bool = False,
 ) -> int:
     # Fail-fast on a malformed verification.yml BEFORE we touch any WU state.
     # The per-gate `verify()` call lazy-loads the same file; if it's malformed,
@@ -3027,10 +3035,16 @@ def run(
             )
             return 1
         require_git_ready()
-        # --prepare: create the feature branch + commit the folder up front so
-        # the guards below pass (the do-it-for-me path draft-feature can't take).
-        if prepare:
+        # --prepare / --prepare-only: create the feature branch + commit the
+        # folder up front so the guards below pass (the do-it-for-me path
+        # draft-feature can't take). --prepare-only stops after, so you can
+        # review the commit before the loop dispatches anything.
+        if prepare or prepare_only:
             prepare_feature(feat_fm, feature_dir, feature_id)
+        if prepare_only:
+            print("Prepared: feature is on its branch and committed. "
+                  "Re-run `specfuse-loop` to start the gate.")
+            return 0
         # Pre-flight guards — both run BEFORE ensure_feature_branch so the
         # refusal happens before any branch mutation, and both protect against
         # the per-attempt `git reset --hard` destroying uncommitted state:
@@ -3517,7 +3531,12 @@ def run(
                         # FEAT-2026-0018/T07 — plan-next-draft lint hook (warn-only v1)
                         if wu.type == "plan-next":
                             try:
-                                from lint_plan import lint_plan_next_draft
+                                # Package-relative + function-local: lint_plan
+                                # imports `from .loop import VERDICT_VALUES`, so a
+                                # module-top import would be circular; the old
+                                # flat (top-level) form broke once the driver
+                                # ships as a pip package (#100).
+                                from .lint_plan import lint_plan_next_draft
                                 _warns = lint_plan_next_draft(feature_dir, gate.number)
                             except Exception as _exc:
                                 _warns = [f"lint_plan_next_draft raised: {_exc}"]
@@ -4014,12 +4033,16 @@ def main() -> int:
                     "'branch:') and commit its folder, then run — the do-it-for-me "
                     "path after /draft-feature, which leaves the folder "
                     "uncommitted on the current branch.")
+    ap.add_argument("--prepare-only", action="store_true",
+                    help="Like --prepare (create branch + commit the folder) but "
+                    "STOP afterwards without dispatching — review the commit, then "
+                    "re-run `specfuse-loop` to start.")
     args = ap.parse_args()
     if not FEATURES_DIR.exists():
         sys.exit(f"No {FEATURES_DIR}. Run from your repo root.")
     auto_sync(dry_run=args.dry_run, no_autosync=args.no_autosync)
     return run(args.feature, args.dry_run, force_full_close=args.force_full_close,
-               prepare=args.prepare)
+               prepare=args.prepare, prepare_only=args.prepare_only)
 
 
 if __name__ == "__main__":

{specfuse_loop-0.3.3 → specfuse_loop-0.3.5/specfuse_loop.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: specfuse-loop
-Version: 0.3.3
+Version: 0.3.5
 Summary: Local-first executor for the Specfuse Plan + Work Unit gate-cycle methodology.
 Author: Specfuse contributors
 License: Apache-2.0

{specfuse_loop-0.3.3 → specfuse_loop-0.3.5}/specfuse_loop.egg-info/SOURCES.txt

@@ -79,6 +79,7 @@ tests/test_lint_correlation_id_close_intermediate.py
 tests/test_lint_oracle_env.py
 tests/test_lint_plan_errors.py
 tests/test_lint_plan_next_draft.py
+tests/test_lint_plan_relative_import.py
 tests/test_lint_produces_driver_helper.py
 tests/test_lint_sections.py
 tests/test_lint_task_graph_yaml_selection.py

specfuse_loop-0.3.5/tests/test_lint_plan_relative_import.py

@@ -0,0 +1,57 @@
+#
+# Copyright 2026 Specfuse contributors
+# Licensed under the Apache License, Version 2.0. See LICENSE.
+#
+"""Regression test for #100 — the plan-next-draft lint hook must use a
+package-relative import.
+
+`loop.py`'s plan-next hook imported `from lint_plan import lint_plan_next_draft`
+(flat). That only resolved when the scripts were copied side-by-side (pre-pip);
+in the installed package it raises `No module named 'lint_plan'`, so the
+plan-next gate logs a warning and the draft lint never runs. The import is
+function-local on purpose (lint_plan imports `from .loop import VERDICT_VALUES`,
+so a module-top import would be circular) — the fix is to make the local import
+package-relative, not to hoist it.
+"""
+
+from __future__ import annotations
+
+import subprocess
+import sys
+import tempfile
+import unittest
+from pathlib import Path
+
+REPO_ROOT = Path(__file__).resolve().parent.parent
+LOOP_SRC = REPO_ROOT / "specfuse" / "loop" / "loop.py"
+
+
+class TestLintPlanRelativeImport(unittest.TestCase):
+
+    def test_loop_uses_package_relative_lint_plan_import(self):
+        src = LOOP_SRC.read_text(encoding="utf-8")
+        self.assertNotIn(
+            "from lint_plan import", src,
+            "flat `from lint_plan import` breaks in the installed package (#100)",
+        )
+        self.assertIn(
+            "from .lint_plan import lint_plan_next_draft", src,
+            "the plan-next hook must import lint_plan_next_draft package-relative",
+        )
+
+    def test_lint_plan_next_draft_importable_outside_repo_root(self):
+        """Resolvable as a package member even when CWD is not the repo root
+        (so a flat `lint_plan.py` on the path can't mask the bug)."""
+        with tempfile.TemporaryDirectory() as tmp:
+            r = subprocess.run(
+                [sys.executable, "-c",
+                 "from specfuse.loop.lint_plan import lint_plan_next_draft; "
+                 "print('ok')"],
+                capture_output=True, text=True, cwd=tmp,
+            )
+        self.assertEqual(r.returncode, 0, r.stderr)
+        self.assertIn("ok", r.stdout)
+
+
+if __name__ == "__main__":
+    unittest.main()

{specfuse_loop-0.3.3 → specfuse_loop-0.3.5}/tests/test_loop_orchestration.py

@@ -706,7 +706,7 @@ class TestMainArgparse(unittest.TestCase):
                 with patch.object(sys, "argv", ["loop", "--feature", "my-feature"]):
                     result = loop.main()
         self.assertEqual(result, 0)
-        mock_run.assert_called_once_with("my-feature", False, force_full_close=None, prepare=False)
+        mock_run.assert_called_once_with("my-feature", False, force_full_close=None, prepare=False, prepare_only=False)
 
     def test_dry_run_flag_forwarded_to_run(self):
         """--dry-run is forwarded as dry_run=True to run()."""
@@ -718,7 +718,7 @@ class TestMainArgparse(unittest.TestCase):
             with patch.object(loop, "run", return_value=0) as mock_run:
                 with patch.object(sys, "argv", ["loop", "--dry-run"]):
                     loop.main()
-        mock_run.assert_called_once_with(None, True, force_full_close=None, prepare=False)
+        mock_run.assert_called_once_with(None, True, force_full_close=None, prepare=False, prepare_only=False)
 
     def test_multi_active_error_propagates_from_run(self):
         """main() with no args propagates the find_feature multi-active SystemExit."""

{specfuse_loop-0.3.3 → specfuse_loop-0.3.5}/tests/test_prepare_feature.py

@@ -36,6 +36,13 @@ def _init_git(root: Path) -> None:
     subprocess.run(["git", "-C", str(root), "config", "commit.gpgSign", "false"],
                    check=True)
     (root / "README.md").write_text("# fixture\n")
+    specfuse = root / ".specfuse"
+    specfuse.mkdir()
+    (specfuse / "verification.yml").write_text(
+        "code:\n  - name: noop\n    command: \"true\"\n"
+        "doc:\n  - name: noop\n    command: \"true\"\n"
+        "plannext:\n  - name: noop\n    command: \"true\"\n"
+    )
     subprocess.run(["git", "-C", str(root), "add", "."], check=True)
     subprocess.run(["git", "-C", str(root), "commit", "-q", "-m", "init"], check=True)
 
@@ -46,7 +53,10 @@ def _write_uncommitted_feature(root: Path) -> Path:
     fdir.mkdir(parents=True)
     (fdir / "PLAN.md").write_text(
         f"---\nfeature_id: {_FEAT_ID}\ntitle: T\nbranch: {_BRANCH}\n"
-        f"roadmap_goal: t\nstatus: active\n---\n\n# Plan\n"
+        f"roadmap_goal: t\nstatus: active\n---\n\n# Plan\n\n```yaml\n"
+        f"gates:\n  - gate: 1\n    file: GATE-01.md\n    work_units:\n"
+        f"      - id: {_FEAT_ID}/T01\n        file: WU-01.md\n"
+        f"        depends_on: []\n```\n"
     )
     (fdir / "GATE-01.md").write_text("---\ngate: 1\nstatus: open\n---\n\n# Gate 1\n")
     (fdir / "WU-01.md").write_text(
@@ -85,6 +95,34 @@ class TestPrepareFeature(unittest.TestCase):
                                      capture_output=True, text=True).stdout
             self.assertIn("PLAN.md", tracked)
 
+    def test_prepare_only_prepares_then_stops(self):
+        """--prepare-only branches + commits but does NOT dispatch (rc=0)."""
+        with tempfile.TemporaryDirectory() as tmp:
+            root = Path(tmp)
+            _init_git(root)
+            _write_uncommitted_feature(root)
+            os.chdir(root)
+
+            called = {"dispatch": False}
+
+            def _no_dispatch(*a, **k):
+                called["dispatch"] = True
+                raise AssertionError("must not dispatch under --prepare-only")
+
+            orig = loop.dispatch
+            loop.dispatch = _no_dispatch
+            try:
+                rc = loop.run(None, dry_run=False, prepare_only=True)
+            finally:
+                loop.dispatch = orig
+
+            self.assertEqual(rc, 0)
+            self.assertFalse(called["dispatch"])
+            self.assertEqual(loop._current_branch(), _BRANCH)
+            # folder committed (tree clean)
+            rel = Path(".specfuse/features") / f"{_FEAT_ID}-thing"
+            self.assertEqual(loop.untracked_feature_files(rel), [])
+
     def test_committed_guard_message_suggests_prepare_and_branch(self):
         """On the default branch, the untracked-folder refusal names --prepare
         AND the `git checkout -b <branch>` step."""

specfuse_loop-0.3.3/specfuse/loop/data/VERSION

@@ -1 +0,0 @@
-0.3.3