didericis
4032e04a9c
Replaces the cwd-hash identity with a random 5-char base36 suffix per launch, so two simultaneous `start <agent>` invocations against the same cwd no longer collide on container names. Each launch is its own bottle. State carries metadata: every prepare step writes ~/.claude-bottle/state/<identity>/metadata.json with the (agent_name, cwd, copy_cwd, started_at) the bottle was launched with. The new `cli.py resume <identity>` reads this metadata and re-launches a bottle pinned to the same identity — picking up the per-bottle Dockerfile (from a prior capability-block apply) and the transcript snapshot under the same state dir. - bottle_state.py: bottle_identity(agent_name) drops the cwd param and gains a random suffix; BottleMetadata dataclass + read/write/metadata_path helpers. - BottleSpec gains an optional identity field — resume sets it to pin the identity; start leaves it empty so prepare mints fresh. - prepare.py: writes metadata at launch time; uses spec.identity if provided (resume) else bottle_identity(agent_name) (fresh start). - start.py: extracted _launch_bottle from cmd_start so resume can share the launch core; prints `./cli.py resume <identity>` hint at session end. - cli/resume.py (new): reads metadata, reconstructs BottleSpec with the recorded identity + cwd, delegates to _launch_bottle. Errors clearly when no state exists for the given identity. - cli/__init__.py: registers `resume` in COMMANDS + usage. - dashboard.py: capability-block approval status line now appends the `resume <identity>` hint so the operator can copy-paste the rebuild command without leaving the TUI. Closes the rebuild loop in PRD 0016: agent calls capability-block → operator approves → bottle torn down with state preserved → status line shows resume command → operator runs it → replacement bottle boots with the new Dockerfile and prior transcript. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
67 lines
2.1 KiB
Python
67 lines
2.1 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(
|
|
"--format",
|
|
choices=("text", "json"),
|
|
default="text",
|
|
help="preflight output format; --format=json requires --dry-run",
|
|
)
|
|
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,
|
|
output_format=args.format,
|
|
remote_control=args.remote_control,
|
|
)
|