arctx-cli 0.2.0b2__py3-none-any.whl

arctx_cli/ext/git/cherry_pick.py

@@ -0,0 +1,144 @@
+"""arctx CLI cherry-pick command.
+
+Drives a ``git cherry-pick`` and records the corresponding arctx Transition with
+BranchPayload, GitChangePayload, CherryPickPayload, BranchTipEvent, and
+SessionPointerEvent.
+"""
+
+from __future__ import annotations
+
+import argparse
+import json
+import sys
+
+from arctx_cli.append_batch import graph_counts, maybe_append_or_save
+from arctx_cli.context import (
+    resolve_run_id_from_args,
+    resolve_store,
+    resolve_user_id_from_args,
+    resolve_work_session_id_from_args,
+)
+
+
+def add_parser(subparsers) -> argparse.ArgumentParser:
+    """Register the ``cherry-pick`` subcommand parser."""
+    p = subparsers.add_parser(
+        "cherry-pick",
+        help="Cherry-pick a commit and record a arctx transition",
+    )
+    p.add_argument("--sha", required=True, help="Commit sha to cherry-pick")
+    p.add_argument("--branch", default=None, help="Override branch name")
+    p.add_argument("--run", default=None, help="Explicit run id")
+    p.add_argument("--store-dir", default=None, help="Store directory")
+    p.add_argument("--user", default=None, help="User id for attribution")
+    p.add_argument("--work-session", default=None, help="Work session id")
+    return p
+
+
+def run_cherry_pick_command(
+    *,
+    source_sha: str,
+    branch: str | None,
+    run_id: str | None,
+    store_dir: str | None,
+    user_id: str | None,
+    work_session_id: str | None,
+) -> dict:
+    """Execute a cherry-pick and persist the resulting graph records.
+
+    Parameters
+    ----------
+    source_sha:
+        Commit SHA to cherry-pick.
+    branch:
+        Branch name override.
+    run_id:
+        Explicit run id.
+    store_dir:
+        Store directory.
+    user_id:
+        User id for work event attribution.
+    work_session_id:
+        Work session id.
+
+    Returns
+    -------
+    dict with transition_id, output_node_id, branch, head_commit,
+    source_transition, source_commit.
+    """
+    store = resolve_store(store_dir)
+    handle = store.load_run(run_id)
+
+    before = graph_counts(handle)
+
+    transition = handle.git.cherry_pick(
+        source_sha=source_sha,
+        branch=branch,
+        user_id=user_id,
+        work_session_id=work_session_id,
+    )
+
+    maybe_append_or_save(
+        store=store,
+        handle=handle,
+        user_id=user_id,
+        work_session_id=work_session_id,
+        before=before,
+    )
+
+    # Extract payload info for the result.
+    git_payloads = handle.run_graph.payloads_for_transition(
+        transition.transition_id, payload_type="git_change"
+    )
+    head_commit = git_payloads[-1].head_commit if git_payloads else ""
+    branch_payloads = handle.run_graph.payloads_for_transition(
+        transition.transition_id, payload_type="branch"
+    )
+    resolved_branch = branch_payloads[-1].branch if branch_payloads else ""
+    cp_payloads = handle.run_graph.payloads_for_transition(
+        transition.transition_id, payload_type="cherry_pick"
+    )
+    source_transition = cp_payloads[-1].source_transition if cp_payloads else None
+    source_commit = cp_payloads[-1].source_commit if cp_payloads else ""
+
+    return {
+        "transition_id": transition.transition_id,
+        "output_node_id": transition.output_node_id,
+        "branch": resolved_branch,
+        "head_commit": head_commit,
+        "source_transition": source_transition,
+        "source_commit": source_commit,
+    }
+
+
+def cli_cherry_pick(args) -> int:
+    """Entry point for ``arctx cherry-pick`` subcommand."""
+    from arctx.ext.git.verbs._forward_transition import ParallelSessionConflict  # noqa: PLC0415
+
+    run_id = resolve_run_id_from_args(args)
+    user_id = resolve_user_id_from_args(args)
+    work_session_id = resolve_work_session_id_from_args(args)
+
+    try:
+        result = run_cherry_pick_command(
+            source_sha=args.sha,
+            branch=args.branch,
+            run_id=run_id,
+            store_dir=args.store_dir,
+            user_id=user_id,
+            work_session_id=work_session_id,
+        )
+    except ParallelSessionConflict as exc:
+        print(f"error: {exc}", file=sys.stderr)
+        print(
+            "hint: another session has advanced this branch. "
+            "Rebase / pull before committing.",
+            file=sys.stderr,
+        )
+        return 2
+    except Exception as exc:  # noqa: BLE001
+        print(f"error: {exc}", file=sys.stderr)
+        return 1
+
+    print(json.dumps(result, indent=2))
+    return 0

arctx_cli/ext/git/commit.py

@@ -0,0 +1,205 @@
+"""arctx CLI commit command.
+
+Drives a git commit and records the corresponding arctx Transition with
+BranchPayload, GitChangePayload, BranchTipEvent, and SessionPointerEvent.
+"""
+
+from __future__ import annotations
+
+import argparse
+import json
+import sys
+
+from arctx_cli.append_batch import graph_counts, maybe_append_or_save
+from arctx_cli.context import (
+    resolve_run_id_from_args,
+    resolve_store,
+    resolve_user_id_from_args,
+    resolve_work_session_id_from_args,
+)
+
+
+def add_parser(subparsers) -> argparse.ArgumentParser:
+    """Register the ``commit`` subcommand parser."""
+    p = subparsers.add_parser(
+        "commit",
+        help="Drive a git commit and record a arctx transition",
+    )
+    p.add_argument("-m", "--message", required=True, help="Commit message")
+    p.add_argument(
+        "--branch",
+        default=None,
+        help="Override branch name (default: current git branch)",
+    )
+    p.add_argument(
+        "--merge",
+        default=None,
+        metavar="REF",
+        help=(
+            "Merge target. Format: 'branch:<name>', 'node:<id>', or just '<name>' "
+            "(auto-detected as branch name). Drives git merge and records a "
+            "multi-input transition with MergePayload."
+        ),
+    )
+    p.add_argument(
+        "--join",
+        action="store_true",
+        help=(
+            "Treat the merge as a arctx-only join (no common ancestor). "
+            "Records JoinPayload instead of MergePayload. Only valid with --merge."
+        ),
+    )
+    p.add_argument("--run", default=None, help="Explicit run id")
+    p.add_argument("--store-dir", default=None, help="Store directory")
+    p.add_argument("--user", default=None, help="User id for attribution")
+    p.add_argument("--work-session", default=None, help="Work session id")
+    return p
+
+
+def _parse_merge_ref(ref: str) -> tuple[str | None, str | None]:
+    """Parse a merge ref string into (other_branch, other_node_id).
+
+    Formats accepted:
+    - "branch:<name>"  → branch name
+    - "node:<id>"      → node id
+    - "<anything>"     → treated as branch name (auto-detect)
+    """
+    if ref.startswith("branch:"):
+        return ref[len("branch:"):], None
+    if ref.startswith("node:"):
+        return None, ref[len("node:"):]
+    # Auto-detect: treat as branch name.
+    return ref, None
+
+
+def run_commit_command(
+    *,
+    message: str,
+    branch: str | None,
+    run_id: str | None,
+    store_dir: str | None,
+    user_id: str | None,
+    work_session_id: str | None,
+    merge: str | None = None,
+    join: bool = False,
+    # Test-only parameters; not exposed in the CLI parser.
+    dry_run: bool = False,
+    head_commit: str | None = None,
+) -> dict:
+    """Execute a commit (or merge) and persist the resulting graph records.
+
+    Parameters
+    ----------
+    message:
+        Git commit message.
+    branch:
+        Branch name override (None → infer from git).
+    run_id:
+        Explicit run id. If None, resolved from env / <gitdir>/arctx-id.
+    store_dir:
+        Store directory. If None, resolved from ARCTX_HOME.
+    user_id:
+        User id for work event attribution.
+    work_session_id:
+        Work session id.
+    merge:
+        If set, drive a merge instead of a plain commit. Format:
+        'branch:<name>', 'node:<id>', or '<name>' (branch auto-detect).
+    join:
+        If True and merge is set, use JoinPayload instead of MergePayload.
+
+    Returns
+    -------
+    dict with transition_id, output_node_id, branch, head_commit.
+    """
+    store = resolve_store(store_dir)
+    handle = store.load_run(run_id)
+
+    before = graph_counts(handle)
+
+    if merge is not None:
+        other_branch, other_node_id = _parse_merge_ref(merge)
+        transition = handle.git.merge(
+            other_branch=other_branch,
+            other_node_id=other_node_id,
+            message=message,
+            branch=branch,
+            user_id=user_id,
+            work_session_id=work_session_id,
+            join=join,
+            dry_run=dry_run,
+            head_commit=head_commit,
+        )
+    else:
+        transition = handle.git.commit(
+            message=message,
+            branch=branch,
+            user_id=user_id,
+            work_session_id=work_session_id,
+            dry_run=dry_run,
+            head_commit=head_commit,
+        )
+
+    maybe_append_or_save(
+        store=store,
+        handle=handle,
+        user_id=user_id,
+        work_session_id=work_session_id,
+        before=before,
+    )
+
+    # Extract GitChangePayload info for the result.
+    git_payloads = handle.run_graph.payloads_for_transition(
+        transition.transition_id, payload_type="git_change"
+    )
+    head_commit = git_payloads[-1].head_commit if git_payloads else ""
+    branch_payloads = handle.run_graph.payloads_for_transition(
+        transition.transition_id, payload_type="branch"
+    )
+    resolved_branch = branch_payloads[-1].branch if branch_payloads else ""
+
+    result: dict = {
+        "transition_id": transition.transition_id,
+        "output_node_id": transition.output_node_id,
+        "branch": resolved_branch,
+        "head_commit": head_commit,
+    }
+    if merge is not None:
+        result["merge"] = merge
+        result["join"] = join
+    return result
+
+
+def cli_commit(args) -> int:
+    """Entry point for ``arctx commit`` subcommand."""
+    from arctx.ext.git.verbs._forward_transition import ParallelSessionConflict  # noqa: PLC0415
+
+    run_id = resolve_run_id_from_args(args)
+    user_id = resolve_user_id_from_args(args)
+    work_session_id = resolve_work_session_id_from_args(args)
+
+    try:
+        result = run_commit_command(
+            message=args.message,
+            branch=args.branch,
+            run_id=run_id,
+            store_dir=args.store_dir,
+            user_id=user_id,
+            work_session_id=work_session_id,
+            merge=getattr(args, "merge", None),
+            join=getattr(args, "join", False),
+        )
+    except ParallelSessionConflict as exc:
+        print(f"error: {exc}", file=sys.stderr)
+        print(
+            "hint: another session has advanced this branch. "
+            "Rebase / pull before committing.",
+            file=sys.stderr,
+        )
+        return 2
+    except Exception as exc:  # noqa: BLE001
+        print(f"error: {exc}", file=sys.stderr)
+        return 1
+
+    print(json.dumps(result, indent=2))
+    return 0