didericis
572106d98f
Companion to the compact preflight in #31 — the JSON format was the structured alternative to the verbose text summary. With the new compact text already on screen, no consumer was using the JSON shape, and the abstract `BottlePlan.to_dict` was the biggest piece of API surface no one is implementing against. Removed: - `--format` CLI flag from `start` and `resume`. - `output_format` kwarg from `_launch_bottle`. - `BottlePlan.to_dict` abstract method. - `DockerBottlePlan.to_dict` (60-line dict builder). - The `_PlanView` dataclass — `print` was the only remaining caller, so the env-name computation is inlined. - `tests/integration/test_dry_run_plan.py` (JSON-shape integration test). - `tests/unit/test_cli_start_format.py` (flag-conflict unit). Plan-introspection is still possible by reading the `DockerBottlePlan` dataclass directly — fields like `image`, `container_name`, `stage_dir`, `use_runsc` are all there. Tooling that needs a stable wire shape can JSON-serialize the dataclass themselves. 411 unit + integration tests pass. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
60 lines
1.9 KiB
Python
60 lines
1.9 KiB
Python
"""resume: re-launch a bottle by its identity.
|
|
|
|
Reads ~/.claude-bottle/state/<identity>/metadata.json to recover the
|
|
(agent_name, cwd, copy_cwd) the bottle was originally started with,
|
|
then runs the same launch core as `start` — but pinned to the
|
|
recorded identity so the new bottle picks up any per-bottle Dockerfile
|
|
(from capability-block apply) and transcript snapshot under the same
|
|
state dir.
|
|
|
|
Use case: an agent calls capability-block, the dashboard approves
|
|
and tears down the bottle, the operator runs
|
|
./cli.py resume <identity>
|
|
to bring up the replacement with the new capabilities baked in.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import argparse
|
|
|
|
from ..backend import BottleSpec
|
|
from ..backend.docker.bottle_state import read_metadata
|
|
from ..log import die
|
|
from ..manifest import Manifest
|
|
from ._common import PROG, USER_CWD
|
|
from .start import _launch_bottle
|
|
|
|
|
|
def cmd_resume(argv: list[str]) -> int:
|
|
parser = argparse.ArgumentParser(prog=f"{PROG} resume", add_help=True)
|
|
parser.add_argument("--dry-run", action="store_true")
|
|
parser.add_argument("--remote-control", action="store_true")
|
|
parser.add_argument(
|
|
"identity",
|
|
help="bottle identity from a prior `start` (see its session-end output)",
|
|
)
|
|
args = parser.parse_args(argv)
|
|
|
|
metadata = read_metadata(args.identity)
|
|
if metadata is None:
|
|
die(
|
|
f"no state recorded for identity {args.identity!r}; "
|
|
f"check ~/.claude-bottle/state/ or run `cli.py start` to create a new bottle"
|
|
)
|
|
|
|
manifest = Manifest.resolve(USER_CWD)
|
|
manifest.require_agent(metadata.agent_name)
|
|
|
|
spec = BottleSpec(
|
|
manifest=manifest,
|
|
agent_name=metadata.agent_name,
|
|
copy_cwd=metadata.copy_cwd,
|
|
user_cwd=metadata.cwd or USER_CWD,
|
|
identity=metadata.identity,
|
|
)
|
|
return _launch_bottle(
|
|
spec,
|
|
dry_run=args.dry_run,
|
|
remote_control=args.remote_control,
|
|
)
|