maesttro 0.4.4 → 0.6.0

package/README.md

@@ -51,8 +51,8 @@ cd stagehand && bun run build && npm i -g .
 ## Usage
 
 ```bash
-maesttro setup                           # one-time: build image, create volume, log in to GitHub
-maesttro login / logout / status         # manage the GitHub login
+maesttro setup                           # one-time: build image, log in to GitHub and Claude
+maesttro login / logout / status         # manage both logins, or one with `github` / `claude`
 maesttro list                            # see available clients
 maesttro doctor                          # health check anytime
 
@@ -63,7 +63,7 @@ maesttro bash                            # plain shell inside the runner, for de
 maesttro sessions                        # list this repo's kept sessions
 maesttro sessions remove <id>            # drop one (preserves branches; --force discards unbranched commits)
 maesttro sessions remove --all           # drop all of this repo's sessions
-maesttro resume <id>                     # continue one, in the mode it started with
+maesttro resume [client] <id>            # continue one, in its mode and with its last client
 maesttro push [branch]                   # push a branch a session created (shows what goes out, asks first)
 maesttro push [branch] --force           # same, as a force push
 
@@ -105,7 +105,7 @@ other hosts.
 Inside a session, `gh` works for **that repo only** (issues, pull requests,
 comments). It acts as the Maesttro GitHub App's bot:
 
-- `maesttro login` runs once. It's a GitHub device flow, and your token is kept in the OS keychain.
+- `maesttro login github` runs once. It's a GitHub device flow, and your token is kept in the OS keychain.
 - Each launch asks the Maesttro broker for a token that is scoped to the repo and lasts at most an hour. The CLI refreshes it quietly and revokes it when you exit.
 - The token can read code and write issues and PRs, but can't push, merge or delete branches.
 - Commits are authored by you (your repo's `user.name` / `user.email`) and committed by the bot.
@@ -159,7 +159,11 @@ thinking blocks shown. The two providers replace yours of the same name; the
 rest (`mcp`, `plugin`, other providers) is merged. Removed secrets are listed
 at launch by path. `{env:X}` / `$X` references are kept.
 
-Claude Code keeps its own login and defaults. It is pointed at envoy's
+Claude Code keeps its own defaults. Its subscription login comes from
+`maesttro login claude`: the host keeps the only copy of the refresh token,
+rotates it for every session, and hands each session just the access token.
+Without it, a session shows Claude Code's own login screen, which lasts for
+that session only. Claude Code is pointed at envoy's
 `$MAESTTRO_URL/claude-code` (`ANTHROPIC_BASE_URL`), with Maesttro added to the
 model picker as a custom option (`maesttro`), with its context window read
 from envoy at launch. Anthropic models pass
@@ -178,8 +182,8 @@ config, keeping your own keys. So `maesttro update` has two steps:
    which the next session picks up.
 2. It rebuilds the runner image, for new client and tool versions.
 
-Your session state (in the `maesttro-home` volume) and your project files are
-untouched by an update.
+Your session homes (under `~/.config/maesttro/sessions`) and your project files
+are untouched by an update.
 
 On start, `maesttro` checks for a newer published version and offers to update.
 Declining only skips it for that run; the next start asks again.
@@ -190,7 +194,8 @@ Declining only skips it for that run; the next start asks again.
 
 | Mount | Source | Purpose |
 |---|---|---|
-| `/home/agent` | `maesttro-home` named volume | Per-client session state. Survives across runs, lives only in Docker. Holds no GitHub credential. |
+| `/home/agent` | `~/.config/maesttro/sessions/<id>/home` | The session's own home, reused by `maesttro resume` and deleted with the session. Never shared with another session. Holds no GitHub credential. |
+| `/home/agent/.claude` | `~/.config/maesttro/sessions/<id>/claude` | Claude Code's directory, kept outside the home so the host can write the session's Claude login (no refresh token) without following anything the agent planted. |
 | `/home/agent/.config/gh-maesttro` (read-only) | per-session temp dir on host | The session's GitHub token (`hosts.yml`). The CLI refreshes it before its 1 h expiry and revokes it on exit. Not mounted in `--strict` sessions, or when GitHub access is unavailable. |
 | `/opt/maesttro-objects` (read-only) | your repo's `.git/objects` | Base history, borrowed by the clone through its `alternates`, which is pinned to this fixed path so it resolves the same on every host OS. The real `.git` is never mounted. |
 | `/workspace` | the session clone (`.worktrees/<id>`) | The working directory: a `git clone --shared` detached at the default branch. |
@@ -217,6 +222,8 @@ maesttro/
 │   ├── paths.ts     # locates bundled Dockerfile wherever npm installs the package
 │   ├── account.ts, device-flow.ts, credential-store.ts, github-login.ts
 │   │                # `maesttro login` / `logout` / `status`, keychain storage
+│   ├── claude-keeper.ts, claude-refresher.ts, session-home.ts
+│   │                # host-managed Claude login: capture, rotate, push to sessions
 │   └── github-session.ts, broker-client.ts, session-dir.ts, refresher.ts
 │                    # per-session GitHub token: mint, mount, refresh, revoke
 ├── broker/          # server-side token broker (not published; see libretto)
@@ -249,5 +256,4 @@ registry it was installed from.
 ## Open items
 
 - Pin exact client CLI versions in the Dockerfile once stable
-- Decide whether each client gets its own volume, or shares one (current setup: shared)
 - Homebrew tap as an alternative install path for non-Node users — optional