arctx-cli 0.3.0b1__tar.gz → 0.3.1b2__tar.gz

{arctx_cli-0.3.0b1 → arctx_cli-0.3.1b2}/.gitignore

@@ -6,6 +6,7 @@ __pycache__/
 .mypy_cache/
 .ruff_cache/
 .uv-cache/
+.uv-tools/
 .venv/
 .coverage
 htmlcov/
@@ -25,7 +26,9 @@ run.json
 # Package build artifacts
 dist/
 *.egg-info/
+packages/arctx/src/arctx/web/static/
 
 # IDE / Agent state directories
 .claude/
 .antigravitycli/
+.codex/

{arctx_cli-0.3.0b1 → arctx_cli-0.3.1b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arctx-cli
-Version: 0.3.0b1
+Version: 0.3.1b2
 Summary: CLI for ARCTX — append-only DAG editing and refactoring
 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.3.0b1
+Requires-Dist: arctx>=0.3.1b2
 Provides-Extra: dev
 Requires-Dist: black>=23.0; extra == 'dev'
 Requires-Dist: mypy>=1.0; extra == 'dev'

{arctx_cli-0.3.0b1 → arctx_cli-0.3.1b2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "arctx-cli"
-version = "0.3.0b1"
+version = "0.3.1b2"
 description = "CLI for ARCTX — append-only DAG editing and refactoring"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -25,7 +25,7 @@ classifiers = [
     "Topic :: Utilities",
 ]
 dependencies = [
-    "arctx>=0.3.0b1",
+    "arctx>=0.3.1b2",
 ]
 
 [project.optional-dependencies]

{arctx_cli-0.3.0b1 → arctx_cli-0.3.1b2}/src/arctx_cli/append_batch.py

@@ -20,18 +20,18 @@ def maybe_append_or_save(
     store,
     handle,
     user_id: str | None,
-    work_session_id: str | None,
+    lane_id: str | None,
     before: dict[str, set[str]],
 ) -> None:
     """Use append_batch for capable stores, otherwise fall back to save_run."""
-    if user_id is None or work_session_id is None or not hasattr(store, "append_batch"):
+    if user_id is None or lane_id is None or not hasattr(store, "append_batch"):
         store.save_run(handle)
         return
     store.append_batch(
         build_append_batch(
             handle,
             user_id=user_id,
-            work_session_id=work_session_id,
+            lane_id=lane_id,
             before=before,
         )
     )
@@ -41,7 +41,7 @@ def build_append_batch(
     handle,
     *,
     user_id: str,
-    work_session_id: str,
+    lane_id: str,
     before: dict[str, set[str]],
 ) -> AppendBatch:
     """Build an append batch from records added since *before*."""
@@ -67,12 +67,12 @@ def build_append_batch(
     if not new_events:
         raise RuntimeError("append batch requires at least one work event")
 
-    session = handle.run_graph.work_sessions[work_session_id]
+    session = handle.run_graph.lanes[lane_id]
     return AppendBatch(
         run_id=handle.run_id,
         user_id=user_id,
-        work_session_id=work_session_id,
-        work_session=session,
+        lane_id=lane_id,
+        lane=session,
         events=tuple(new_events),
         records=tuple(records),
     )

{arctx_cli-0.3.0b1 → arctx_cli-0.3.1b2}/src/arctx_cli/commands/__init__.py

@@ -11,6 +11,8 @@ def core_cli_commands() -> list[CliCommand]:
     from arctx_cli.commands.add import cli_add
     from arctx_cli.commands.alias_cmd import add_parser as add_alias_parser
     from arctx_cli.commands.alias_cmd import cli_alias
+    from arctx_cli.commands.asset import add_parser as add_asset_parser
+    from arctx_cli.commands.asset import cli_asset
     from arctx_cli.commands.attach import add_parser as add_attach_parser
     from arctx_cli.commands.attach import cli_attach
     from arctx_cli.commands.current import add_parser as add_current_parser
@@ -25,38 +27,75 @@ def core_cli_commands() -> list[CliCommand]:
     from arctx_cli.commands.ext import cli_ext
     from arctx_cli.commands.graph import add_parser as add_graph_parser
     from arctx_cli.commands.graph import cli_graph
+    from arctx_cli.commands.guide import add_parser as add_guide_parser
+    from arctx_cli.commands.guide import cli_guide
     from arctx_cli.commands.init import add_parser as add_init_parser
     from arctx_cli.commands.init import cli_init
+    from arctx_cli.commands.lane import add_parser as add_lane_parser
+    from arctx_cli.commands.lane import cli_lane
     from arctx_cli.commands.list import add_parser as add_list_parser
     from arctx_cli.commands.list import cli_list
     from arctx_cli.commands.log import add_parser as add_log_parser
     from arctx_cli.commands.log import cli_log
     from arctx_cli.commands.migrate import add_parser as add_migrate_parser
     from arctx_cli.commands.migrate import cli_migrate
+    from arctx_cli.commands.reparent import add_parser as add_reparent_parser
+    from arctx_cli.commands.reparent import cli_reparent
+    from arctx_cli.commands.uncut import add_parser as add_uncut_parser
+    from arctx_cli.commands.uncut import cli_uncut
+    from arctx_cli.commands.pr import (
+        add_accept_parser,
+        add_propose_parser,
+        add_reject_parser,
+        cli_accept,
+        cli_propose,
+        cli_reject,
+    )
+    from arctx_cli.commands.serve import add_parser as add_serve_parser
+    from arctx_cli.commands.serve import cli_serve
+    from arctx_cli.commands.sync_cmd import (
+        add_pull_parser,
+        add_push_parser,
+        add_remote_parser,
+        cli_pull,
+        cli_push,
+        cli_remote,
+    )
     from arctx_cli.commands.show import add_parser as add_show_parser
     from arctx_cli.commands.show import cli_show
     from arctx_cli.commands.use import add_parser as add_use_parser
     from arctx_cli.commands.use import cli_use
-    from arctx_cli.commands.work_session import add_parser as add_work_session_parser
-    from arctx_cli.commands.work_session import cli_work_session
+    from arctx_cli.commands.web import add_parser as add_web_parser
+    from arctx_cli.commands.web import cli_web
 
     return [
         CliCommand("add", add_add_parser, cli_add),
         CliCommand("alias", add_alias_parser, cli_alias),
+        CliCommand("asset", add_asset_parser, cli_asset),
         CliCommand("attach", add_attach_parser, cli_attach),
         CliCommand("current", add_current_parser, cli_current),
         CliCommand("ext", add_ext_parser, cli_ext),
         CliCommand("dump", add_dump_parser, cli_dump),
         CliCommand("export", add_export_parser, cli_export),
         CliCommand("graph", add_graph_parser, cli_graph),
+        CliCommand("guide", add_guide_parser, cli_guide),
         CliCommand("init", add_init_parser, cli_init),
+        CliCommand("lane", add_lane_parser, cli_lane),
         CliCommand("list", add_list_parser, cli_list),
         CliCommand("log", add_log_parser, cli_log),
         CliCommand("migrate", add_migrate_parser, cli_migrate),
         CliCommand("cut", add_cut_parser, cli_cut),
+        CliCommand("uncut", add_uncut_parser, cli_uncut),
+        CliCommand("reparent", add_reparent_parser, cli_reparent),
+        CliCommand("propose", add_propose_parser, cli_propose),
+        CliCommand("accept", add_accept_parser, cli_accept),
+        CliCommand("reject", add_reject_parser, cli_reject),
+        CliCommand("remote", add_remote_parser, cli_remote),
+        CliCommand("push", add_push_parser, cli_push),
+        CliCommand("serve", add_serve_parser, cli_serve),
         CliCommand("show", add_show_parser, cli_show),
         CliCommand("use", add_use_parser, cli_use),
-        CliCommand("work-session", add_work_session_parser, cli_work_session),
+        CliCommand("web", add_web_parser, cli_web),
     ]
 
 

arctx_cli-0.3.1b2/src/arctx_cli/commands/add.py

@@ -0,0 +1,113 @@
+"""User-facing arctx add commands."""
+
+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.commands._targets import step_view
+from arctx_cli.context import (
+    resolve_run_id_from_args,
+    resolve_store,
+    resolve_user_id_from_args,
+    resolve_lane_id_from_args,
+)
+from arctx_cli.payload_builder import build_payload, parse_field_args, parse_json_object
+
+
+def add_parser(subparsers) -> argparse.ArgumentParser:
+    parser = subparsers.add_parser("add", help="Add a Step from input Nodes")
+    parser.add_argument(
+        "--from",
+        action="append",
+        required=True,
+        dest="input_nodes",
+        metavar="NODE_ID",
+        help="Input node (repeatable for multi-input steps)",
+    )
+    parser.add_argument("--title", default=None)
+    parser.add_argument("--type", dest="payload_kind", default=None)
+    parser.add_argument("--payload-type", default="step_payload")
+    parser.add_argument("--field", action="append", default=None, help="Payload field as key=value")
+    parser.add_argument("--json", default=None, help="Payload fields as a JSON object")
+    parser.add_argument("--run", default=None)
+    parser.add_argument("--store-dir", default=None)
+    parser.add_argument("--user", default=None)
+    parser.add_argument("--lane", default=None)
+
+    return parser
+
+
+def run_add_step_command(
+    *,
+    run_id: str,
+    input_node_ids: list[str],
+    title: str | None,
+    payload_kind: str | None,
+    payload_type: str,
+    field_data: dict,
+    json_data: dict,
+    store_dir: str,
+    user_id: str | None = None,
+    lane_id: str | None = None,
+) -> dict:
+    store = resolve_store(store_dir)
+    if not store.run_path(run_id).exists():
+        raise KeyError(f"unknown run_id: {run_id}")
+    handle = store.load_run(run_id)
+    data = dict(json_data or {})
+    data.update(field_data or {})
+    if title is not None:
+        data.setdefault("title", title)
+        data.setdefault("text", title)
+    if payload_kind is not None:
+        data.setdefault("type", payload_kind)
+    else:
+        data.setdefault("type", "step")
+
+    payload = build_payload(
+        payload_type=payload_type,
+        target_kind="step",
+        target_id="pending",
+        payload_id="pending",
+        json_data={},
+        field_data=data,
+    )
+    before = graph_counts(handle)
+    step = handle.add_step(
+        input_node_ids,
+        payload,
+        user_id=user_id,
+        lane_id=lane_id,
+    )
+    maybe_append_or_save(
+        store=store,
+        handle=handle,
+        user_id=user_id,
+        lane_id=lane_id,
+        before=before,
+    )
+    return {"step": step_view(step)}
+
+
+def cli_add(args) -> int:
+    try:
+        result = run_add_step_command(
+            run_id=resolve_run_id_from_args(args),
+            input_node_ids=args.input_nodes,
+            title=args.title,
+            payload_kind=args.payload_kind,
+            payload_type=args.payload_type,
+            field_data=parse_field_args(args.field),
+            json_data=parse_json_object(args.json),
+            store_dir=args.store_dir,
+            user_id=resolve_user_id_from_args(args),
+            lane_id=resolve_lane_id_from_args(args),
+        )
+        print(json.dumps(result["step"], ensure_ascii=False, indent=2))
+        return 0
+    except (KeyError, ValueError, json.JSONDecodeError) as exc:
+        print(f"error: {exc}", file=sys.stderr)
+        return 1

arctx_cli-0.3.1b2/src/arctx_cli/commands/asset.py

@@ -0,0 +1,138 @@
+"""arctx asset command — attach and manage file assets (core payload)."""
+
+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_lane_id_from_args,
+)
+
+
+def add_parser(subparsers) -> argparse.ArgumentParser:
+    """Register the ``asset`` command namespace."""
+    asset_parser = subparsers.add_parser("asset", help="Asset management commands")
+    asset_sub = asset_parser.add_subparsers(dest="asset_command", required=True)
+
+    sp_attach = asset_sub.add_parser("attach", help="Attach a file to a Node or Step")
+    sp_attach.add_argument("file_path", help="Path to the file to attach")
+    sp_attach.add_argument("--target", required=True, dest="target_id", help="Node or Step ID")
+    sp_attach.add_argument("--run", default=None)
+    sp_attach.add_argument("--store-dir", default=None)
+    sp_attach.add_argument("--user", default=None)
+    sp_attach.add_argument("--lane", default=None)
+
+    sp_list = asset_sub.add_parser("list", help="List assets for a Node or Step")
+    sp_list.add_argument("--target", required=True, dest="target_id", help="Node or Step ID")
+    sp_list.add_argument("--run", default=None)
+    sp_list.add_argument("--store-dir", default=None)
+
+    sp_show = asset_sub.add_parser("show", help="Show details of a specific asset payload")
+    sp_show.add_argument("payload_id", help="Payload ID of the asset")
+    sp_show.add_argument("--run", default=None)
+    sp_show.add_argument("--store-dir", default=None)
+
+    return asset_parser
+
+
+def cli_asset(args) -> int:
+    """Dispatch ``arctx asset`` subcommands."""
+    if args.asset_command == "attach":
+        return _cli_asset_attach(args)
+    if args.asset_command == "list":
+        return _cli_asset_list(args)
+    if args.asset_command == "show":
+        return _cli_asset_show(args)
+    print(f"unknown asset subcommand: {args.asset_command}", file=sys.stderr)
+    return 1
+
+
+def _cli_asset_attach(args) -> int:
+    store = resolve_store(args.store_dir)
+    run_id = resolve_run_id_from_args(args)
+    user_id = resolve_user_id_from_args(args)
+    lane_id = resolve_lane_id_from_args(args)
+
+    if not store.run_path(run_id).exists():
+        print(f"error: unknown run_id: {run_id}", file=sys.stderr)
+        return 1
+
+    handle = store.load_run(run_id)
+    if (
+        args.target_id not in handle.run_graph.nodes
+        and args.target_id not in handle.run_graph.steps
+    ):
+        print(f"error: target_id not found: {args.target_id}", file=sys.stderr)
+        return 1
+
+    try:
+        before = graph_counts(handle)
+        payload = handle.attach_asset(
+            args.target_id,
+            args.file_path,
+            user_id=user_id,
+            lane_id=lane_id,
+        )
+    except (KeyError, ValueError, FileNotFoundError) as exc:
+        print(f"error: {exc}", file=sys.stderr)
+        return 1
+
+    maybe_append_or_save(
+        store=store,
+        handle=handle,
+        user_id=user_id,
+        lane_id=lane_id,
+        before=before,
+    )
+    print(json.dumps(payload.to_dict(), ensure_ascii=False, indent=2))
+    return 0
+
+
+def _cli_asset_list(args) -> int:
+    store = resolve_store(args.store_dir)
+    run_id = resolve_run_id_from_args(args)
+
+    if not store.run_path(run_id).exists():
+        print(f"error: unknown run_id: {run_id}", file=sys.stderr)
+        return 1
+
+    handle = store.load_run(run_id)
+    if args.target_id in handle.run_graph.nodes:
+        raw_payloads = handle.run_graph.payloads_for_node(args.target_id)
+    elif args.target_id in handle.run_graph.steps:
+        raw_payloads = handle.run_graph.payloads_for_step(args.target_id)
+    else:
+        print(f"error: target_id not found: {args.target_id}", file=sys.stderr)
+        return 1
+
+    payloads = [
+        p.to_dict()
+        for p in raw_payloads
+        if getattr(p, "payload_type", None) == "asset"
+    ]
+    print(json.dumps(payloads, ensure_ascii=False, indent=2))
+    return 0
+
+
+def _cli_asset_show(args) -> int:
+    store = resolve_store(args.store_dir)
+    run_id = resolve_run_id_from_args(args)
+
+    if not store.run_path(run_id).exists():
+        print(f"error: unknown run_id: {run_id}", file=sys.stderr)
+        return 1
+
+    handle = store.load_run(run_id)
+    payload = handle.run_graph.payloads.get(args.payload_id)
+    if payload is None or getattr(payload, "payload_type", None) != "asset":
+        print(f"error: asset payload not found: {args.payload_id}", file=sys.stderr)
+        return 1
+
+    print(json.dumps(payload.to_dict(), ensure_ascii=False, indent=2))
+    return 0

{arctx_cli-0.3.0b1 → arctx_cli-0.3.1b2}/src/arctx_cli/commands/attach.py

@@ -7,14 +7,14 @@ import json
 import sys
 
 from arctx_cli.commands._targets import resolve_target_kind
-from arctx_cli.commands.payload import run_payload_add_command
+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,
+    resolve_lane_id_from_args,
 )
-from arctx_cli.payload_builder import parse_field_args, parse_json_object
+from arctx_cli.payload_builder import build_payload, parse_field_args, parse_json_object
 
 
 def add_parser(subparsers) -> argparse.ArgumentParser:
@@ -27,7 +27,7 @@ def add_parser(subparsers) -> argparse.ArgumentParser:
     parser.add_argument("--run", default=None)
     parser.add_argument("--store-dir", default=None)
     parser.add_argument("--user", default=None)
-    parser.add_argument("--work-session", default=None)
+    parser.add_argument("--lane", default=None)
     return parser
 
 
@@ -41,7 +41,7 @@ def run_attach_command(
     json_data: dict,
     store_dir: str,
     user_id: str | None = None,
-    work_session_id: str | None = None,
+    lane_id: str | None = None,
 ) -> dict:
     store = resolve_store(store_dir)
     if not store.run_path(run_id).exists():
@@ -57,18 +57,42 @@ def run_attach_command(
     internal_payload_type = payload_type or (
         "node_payload" if target_kind == "node" else "step_payload"
     )
-    result = run_payload_add_command(
-        run_id=run_id,
-        target_kind=target_kind,
-        target_id=target_id,
+    before = graph_counts(handle)
+    payload = build_payload(
         payload_type=internal_payload_type,
-        field_data=data,
+        target_kind=target_kind,  # type: ignore[arg-type]
+        target_id=target_id,
+        payload_id=handle._next_id("pl"),
         json_data={},
-        store_dir=store_dir,
+        field_data=data,
+    )
+    if payload.target_kind == "node":
+        attached = handle.attach(
+            payload.target_id,
+            payload,
+            user_id=user_id,
+            lane_id=lane_id,
+        )
+    else:
+        handle.run_graph.attach_payload(payload)
+        handle.record_work_event(
+            user_id=user_id,
+            lane_id=lane_id,
+            event_type="payload_attached",
+            target_kind="step",
+            target_id=payload.target_id,
+            created_records=(payload.payload_id,),
+        )
+        attached = payload
+
+    maybe_append_or_save(
+        store=store,
+        handle=handle,
         user_id=user_id,
-        work_session_id=work_session_id,
+        lane_id=lane_id,
+        before=before,
     )
-    return result
+    return {"payload": attached.to_dict()}
 
 
 def cli_attach(args) -> int:
@@ -82,7 +106,7 @@ def cli_attach(args) -> int:
             json_data=parse_json_object(args.json),
             store_dir=args.store_dir,
             user_id=resolve_user_id_from_args(args),
-            work_session_id=resolve_work_session_id_from_args(args),
+            lane_id=resolve_lane_id_from_args(args),
         )
         print(json.dumps(result["payload"], ensure_ascii=False, indent=2))
         return 0

{arctx_cli-0.3.0b1 → arctx_cli-0.3.1b2}/src/arctx_cli/commands/cut.py

@@ -10,7 +10,7 @@ from arctx_cli.context import (
     resolve_run_id_from_args,
     resolve_store,
     resolve_user_id_from_args,
-    resolve_work_session_id_from_args,
+    resolve_lane_id_from_args,
 )
 from arctx_cli.append_batch import graph_counts, maybe_append_or_save
 
@@ -26,7 +26,7 @@ def add_parser(subparsers) -> argparse.ArgumentParser:
     parser.add_argument("--reason", default=None)
     parser.add_argument("--store-dir", default=None)
     parser.add_argument("--user", default=None)
-    parser.add_argument("--work-session", default=None)
+    parser.add_argument("--lane", default=None)
     return parser
 
 
@@ -38,7 +38,7 @@ def run_cut_command(
     reason: str | None,
     store_dir: str,
     user_id: str | None = None,
-    work_session_id: str | None = None,
+    lane_id: str | None = None,
 ) -> dict:
     store = resolve_store(store_dir)
     if not store.run_path(run_id).exists():
@@ -50,13 +50,13 @@ def run_cut_command(
         target_kind=target_kind,  # type: ignore[arg-type]
         reason=reason,
         user_id=user_id,
-        work_session_id=work_session_id,
+        lane_id=lane_id,
     )
     maybe_append_or_save(
         store=store,
         handle=handle,
         user_id=user_id,
-        work_session_id=work_session_id,
+        lane_id=lane_id,
         before=before,
     )
     return {"cut": cut.to_dict()}
@@ -96,7 +96,7 @@ def cli_cut(args) -> int:
         reason=args.reason,
         store_dir=args.store_dir,
         user_id=resolve_user_id_from_args(args),
-        work_session_id=resolve_work_session_id_from_args(args),
+        lane_id=resolve_lane_id_from_args(args),
     )
     print(json.dumps(result["cut"], ensure_ascii=False, indent=2))
     return 0

{arctx_cli-0.3.0b1 → arctx_cli-0.3.1b2}/src/arctx_cli/commands/export.py

@@ -21,9 +21,9 @@ def add_parser(subparsers) -> argparse.ArgumentParser:
     parser.add_argument(
         "--format",
         dest="fmt",
-        choices=["md", "tex", "html"],
+        choices=["md", "tex", "html", "json"],
         default="md",
-        help="Output format (default: md)",
+        help="Output format (default: md). json = machine-readable data contract for GUIs",
     )
     parser.add_argument("--node", dest="node_id", default=None,
                         help="Export only the subtree rooted at this node")