arctx-cli 0.2.0b3__tar.gz → 0.2.0b4__tar.gz

{arctx_cli-0.2.0b3 → arctx_cli-0.2.0b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arctx-cli
-Version: 0.2.0b3
+Version: 0.2.0b4
 Summary: CLI for ARCTX — append-only DAG for reasoning history and parallel agent work
 Project-URL: Homepage, https://github.com/takumiecd/arctx
 Project-URL: Repository, https://github.com/takumiecd/arctx
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Requires-Python: >=3.10
-Requires-Dist: arctx>=0.2.0b3
+Requires-Dist: arctx>=0.2.0b4
 Provides-Extra: dev
 Requires-Dist: black>=23.0; extra == 'dev'
 Requires-Dist: mypy>=1.0; extra == 'dev'

{arctx_cli-0.2.0b3 → arctx_cli-0.2.0b4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "arctx-cli"
-version = "0.2.0b3"
+version = "0.2.0b4"
 description = "CLI for ARCTX — append-only DAG for reasoning history and parallel agent work"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -25,7 +25,7 @@ classifiers = [
     "Topic :: Utilities",
 ]
 dependencies = [
-    "arctx>=0.2.0b3",
+    "arctx>=0.2.0b4",
 ]
 
 [project.optional-dependencies]

{arctx_cli-0.2.0b3 → arctx_cli-0.2.0b4}/src/arctx_cli/ext/git/commit.py

@@ -26,6 +26,18 @@ def add_parser(subparsers) -> argparse.ArgumentParser:
         help="Drive a git commit and record a arctx transition",
     )
     p.add_argument("-m", "--message", required=True, help="Commit message")
+    p.add_argument(
+        "--from",
+        dest="from_nodes",
+        action="append",
+        default=None,
+        metavar="NODE",
+        help=(
+            "Branch this commit off the given node instead of the session / "
+            "branch tip. Repeat for a fan-in. This is how sibling experiments "
+            "fan out from a shared baseline node."
+        ),
+    )
     p.add_argument(
         "--branch",
         default=None,
@@ -82,6 +94,7 @@ def run_commit_command(
     work_session_id: str | None,
     merge: str | None = None,
     join: bool = False,
+    from_node_ids: tuple[str, ...] | None = None,
     # Test-only parameters; not exposed in the CLI parser.
     dry_run: bool = False,
     head_commit: str | None = None,
@@ -136,6 +149,7 @@ def run_commit_command(
             branch=branch,
             user_id=user_id,
             work_session_id=work_session_id,
+            from_node_ids=from_node_ids,
             dry_run=dry_run,
             head_commit=head_commit,
         )
@@ -178,6 +192,12 @@ def cli_commit(args) -> int:
     user_id = resolve_user_id_from_args(args)
     work_session_id = resolve_work_session_id_from_args(args)
 
+    from_nodes = getattr(args, "from_nodes", None)
+    merge = getattr(args, "merge", None)
+    if from_nodes and merge is not None:
+        print("error: --from cannot be combined with --merge", file=sys.stderr)
+        return 1
+
     try:
         result = run_commit_command(
             message=args.message,
@@ -186,8 +206,9 @@ def cli_commit(args) -> int:
             store_dir=args.store_dir,
             user_id=user_id,
             work_session_id=work_session_id,
-            merge=getattr(args, "merge", None),
+            merge=merge,
             join=getattr(args, "join", False),
+            from_node_ids=tuple(from_nodes) if from_nodes else None,
         )
     except ParallelSessionConflict as exc:
         print(f"error: {exc}", file=sys.stderr)

{arctx_cli-0.2.0b3 → arctx_cli-0.2.0b4}/tests/cli/test_commit.py

@@ -146,3 +146,61 @@ class TestCommitCLIIntegration:
 
         t2 = handle.run_graph.transitions[r2["transition_id"]]
         assert r1["output_node_id"] in t2.input_node_ids
+
+    def test_from_branches_siblings_off_baseline(self, tmp_path, monkeypatch):
+        """--from anchors the input node, so experiments fan out from a baseline."""
+        repo = _init_git_repo(tmp_path / "repo")
+        monkeypatch.setenv("ARCTX_HOME", str(_arctx_home(tmp_path)))
+        monkeypatch.chdir(repo)
+
+        _init_arctx(repo, tmp_path, run_id="run_from")
+
+        from arctx_cli.ext.git.commit import run_commit_command
+
+        # Baseline commit.
+        (repo / "base.txt").write_text("base\n")
+        subprocess.run(["git", "add", "base.txt"], cwd=str(repo), check=True, capture_output=True)
+        base = run_commit_command(
+            message="baseline",
+            branch="main",
+            run_id="run_from",
+            store_dir=_store_dir(tmp_path),
+            user_id="user",
+            work_session_id="ws_a",
+        )
+        base_node = base["output_node_id"]
+
+        # Two experiments, each explicitly branched off the baseline node.
+        (repo / "exp.txt").write_text("a\n")
+        subprocess.run(["git", "add", "exp.txt"], cwd=str(repo), check=True, capture_output=True)
+        a = run_commit_command(
+            message="hypothesis A",
+            branch="try/a",
+            run_id="run_from",
+            store_dir=_store_dir(tmp_path),
+            user_id="user",
+            work_session_id="ws_a",
+            from_node_ids=(base_node,),
+        )
+
+        (repo / "exp.txt").write_text("b\n")
+        subprocess.run(["git", "add", "exp.txt"], cwd=str(repo), check=True, capture_output=True)
+        b = run_commit_command(
+            message="hypothesis B",
+            branch="try/b",
+            run_id="run_from",
+            store_dir=_store_dir(tmp_path),
+            user_id="user",
+            work_session_id="ws_a",
+            from_node_ids=(base_node,),
+        )
+
+        store = resolve_store(_store_dir(tmp_path))
+        handle = store.load_run("run_from")
+
+        ta = handle.run_graph.transitions[a["transition_id"]]
+        tb = handle.run_graph.transitions[b["transition_id"]]
+        # Both experiments hang off the same baseline node — true siblings.
+        assert ta.input_node_ids == (base_node,)
+        assert tb.input_node_ids == (base_node,)
+        assert a["output_node_id"] != b["output_node_id"]