@with-logic/elwood 0.1.2 → 0.1.3

package/CHANGELOG.md

@@ -12,6 +12,19 @@ back each entry are listed in `prd/14-conformance.md`.
 
 ## [Unreleased]
 
+## [0.1.3] - 2026-09-14
+
+- Keep live session warnings quiet in text and JSON CLI output, including model
+  discovery; enable them with `--verbose` or `--debug`. JSONL warning events and
+  fatal errors remain available as before.
+
+- List both Claude and Codex catalogs in bare `elwood models`, with agent
+  associations, partial failure diagnostics, and one shared timeout budget.
+  Explicit `--agent` keeps the single-agent output contract.
+
+- Preserve new CLI sessions by default so they can be listed and resumed; use
+  `--ephemeral` to remove new or resumed Elwood state after the run.
+
 ## [0.1.2] - 2026-09-13
 
 - Preserve the inherited PATH when an interactive login shell exits successfully

package/README.md

@@ -107,7 +107,7 @@ when a human should make those decisions. There is no default turn timeout; pass
 elwood "Summarize this repository"
 git diff | elwood --agent claude "Review this diff for correctness"
 elwood --output json "Run the tests and summarize failures" | jq -r .response
-elwood --keep --output json "Remember that the release color is teal"
+elwood --output json "Remember that the release color is teal"
 elwood --resume <sessionId> "What is the release color?"
 ```
 
@@ -179,11 +179,13 @@ combined with `--stream`, `--verbose`, `--debug`, or `--output jsonl`.
 
 ### Continuation and cleanup
 
-New runs are ephemeral unless `--keep` is supplied. A kept text run reports its
-session ID on stderr; JSON and JSONL include it in the terminal record:
+New and resumed headless runs preserve Elwood state by default. A resumable
+session ID is reported on stderr for text output and in the terminal record for
+JSON and JSONL. `--keep` explicitly selects the default; use `--ephemeral` for
+one-off runs that should remove their Elwood state afterward:
 
 ```sh
-first=$(elwood --keep --output json "Remember that the release color is teal")
+first=$(elwood --output json "Remember that the release color is teal")
 id=$(printf '%s' "$first" | jq -r .sessionId)
 elwood --resume "$id" "What is the release color?"
 elwood --resume "$id" --ephemeral "Finish this conversation"
@@ -232,7 +234,7 @@ signal: a socket left behind by a force-killed owner reads as live until that
 session is next started or torn down. Unreadable records are skipped with a
 stderr warning, and an empty state directory is a normal empty result.
 `resume <id>` follows every `--resume` rule: stored agent and workspace, no
-`--cwd`, no `--keep`, no persona, and piped stdin composes the same way.
+`--cwd`, no persona, and piped stdin composes the same way.
 
 `elwood interactive [id]` opens the real `claude` or `codex` TUI in the current
 terminal — no hidden PTY, no automation, no observation, no Elwood state — with
@@ -259,21 +261,25 @@ command rejects `--output json|jsonl`, `--stream`, `--verbose`, `--debug`,
 
 ### Listing models
 
-`elwood models` starts the selected agent briefly, opens and cancels its own
-model picker, tears the session down, and prints the rows. Text marks the
-current model with `*` and the default with `(default)`; JSON is one
-`{"schemaVersion":1,"type":"models",...}` document of `AgentModelOption` rows:
+`elwood models` lists Claude and Codex models, with each model's agent noted.
+It probes Claude then Codex, briefly opening and cancelling each model picker,
+and removes both probe sessions afterward. `--agent` limits the listing to one
+agent; saved configuration and `ELWOOD_AGENT` do not narrow the bare command.
+Text marks the current model with `*` and the default with `(default)`.
 
 ```sh
 elwood models
+elwood models --output json | jq '.agents[] | {agent, models}'
 elwood models --agent claude --output json | jq -r '.models[] | select(.isCurrent) | .id'
 ```
 
-Starting the agent is unavoidable because the picker is the only source of the
-list. The command honors `--agent`, `--cwd`, `--model`, `--reasoning-effort`,
-`--timeout`, `--state-dir`, trust, and posture flags, leaves no Elwood state
-behind, and maps failures (timeout, interruption, blocked prompts) to the usual
-statuses and error documents.
+JSON is one `{"schemaVersion":1,"type":"models",...}` document. Combined
+listings contain `agents: [{agent, models}]` and `errors: [...]`; explicit
+`--agent` retains the single `agent` and `models` fields. If one agent fails or
+is unavailable, the other catalog remains available and the command exits
+nonzero. `--timeout` is one budget shared by both probes, and Ctrl-C stops
+further probes. Workspace, model, reasoning, trust, state-directory, and
+matching adapter posture settings apply; the configured model stays unchanged.
 
 ### Trust and security
 

package/dist/cli/help.d.ts

@@ -2,6 +2,6 @@
  * Static production help for the first-party headless Elwood command.
  * Implements PRD §12A.1/§12A.7-§12A.10 and C-CLI-02/C-CLI-21 through C-CLI-26.
  */
-export declare const cliHelp = "Usage: elwood [options] [prompt...]\n       elwood run [options] [prompt...]\n       elwood resume <id> [options] [prompt...]\n       elwood interactive [id] [options]\n       elwood sessions [--state-dir <path>] [--output <text|json>]\n       elwood models [options] [--output <text|json>]\n       elwood config <command>\n\nRun one Claude Code or Codex turn and write its combined assistant response.\nPositional text and piped stdin are combined with one blank line.\n\nExamples:\n  elwood \"Summarize this repository\"\n  git diff | elwood \"Review this diff for correctness\"\n  elwood run --output json < prompt.txt\n  elwood --keep --output json \"Remember this decision\"\n\nCommands:\n  run                         Run one agent turn (default)\n  resume <id> [prompt...]     Resume a kept session; same as run --resume <id>\n  interactive [id]            Open the agent's own TUI here with Elwood's settings\n  sessions                    List Elwood-owned session records; never starts an agent\n  models                      List the agent's models (starts the agent briefly)\n  config                      Inspect or update global defaults; see config --help\n  help                        Show this help\n\nAgent and turn options:\n  --agent <claude|codex>      Select the agent (default: first available of claude, codex)\n  --model <id>                Select or switch the model\n  --reasoning-effort <level>  Claude: low|medium|high|xhigh|max\n                              Codex: none|minimal|low|medium|high|xhigh|max\n  --persona <prompt>          Run a real side-effect-capable setup turn; hide its answer\n  -C, --cwd <path>            Workspace for a new run (default: current directory)\n  --image <path>              Attach an image; repeat to preserve order\n  --timeout <duration>        Bound launch, setup, and turn (default: none; ms|s|m|h)\n  --trust / --no-trust        Toggle allowlisted trust automation (default: trust)\n  --no-defaults               Ignore saved config and ELWOOD_* run defaults\n\nContinuation and output:\n  --keep                      Preserve Elwood state for a new session\n  --resume <id>               Resume the exact stored agent and workspace\n  --ephemeral                 Remove resumed Elwood state afterward\n  --output <text|json|jsonl>  Stdout protocol (default: text)\n  --stream / --no-stream      Toggle incremental text output (default: off)\n  --verbose / --no-verbose    Toggle concise elapsed progress on stderr (default: off)\n  --debug                     Write full sanitized event details to stderr\n  --head                      View the full agent TUI in this terminal\n  --state-dir <path>          Override CLI-owned state storage\n\nAgent posture defaults and supported values:\n  --high-trust / --no-high-trust\n                              Never ask for permissions on either agent (default: off):\n                              Claude bypassPermissions; Codex danger-full-access + never\n  --claude-permission-mode <default|acceptEdits|plan|auto|dontAsk|bypassPermissions>\n                              Default: dontAsk\n  --codex-sandbox <read-only|workspace-write|danger-full-access>\n                              Default: workspace-write\n  --codex-approval-policy <untrusted|on-request|never>\n                              Default: never\n\nHead mode is view-only and requires terminal stdin and stderr. It cannot be\ncombined with stream, verbose, debug, or JSONL output. Ctrl-C still interrupts.\n\nWarnings and diagnostics use stderr; stdout remains the selected protocol.\nUse \"elwood config effective\" to explain resolved values and their sources.\n\nResume subcommand:\n  elwood resume <id> [prompt...] is exactly elwood run --resume <id>: the stored\n  agent and workspace are used, --cwd is rejected, and piped stdin still applies.\n\nInteractive mode:\n  elwood interactive [id] runs claude or codex in the foreground of this terminal\n  with the resolved agent, model, effort, workspace, and posture passed as the\n  agent's own flags. Elwood does not observe or record the conversation and\n  writes no session state. With an id, the stored session's own conversation is\n  resumed in its stored workspace with its stored posture. Requires a terminal on\n  stdin and stdout; cannot be combined with --output json/jsonl, --stream,\n  --verbose, --debug, --head, --timeout, --persona, --image, --keep, --ephemeral,\n  or --resume. Built-in posture defaults are not applied unless configured.\n\nSession listing:\n  elwood sessions lists id, agent, live, resumable, last used, created, and\n  workspace for records in the effective state directory. \"live\" means a\n  launch's bridge socket is present. Text is an aligned table; --output json\n  emits one {\"schemaVersion\":1,\"type\":\"sessions\",...} document. An empty state\n  directory is a normal, empty result.\n\nModel listing:\n  elwood models starts the selected agent briefly, opens and cancels its own\n  model picker, tears the session down, and prints the rows. Text marks the\n  current model with * and the default with (default); --output json emits one\n  {\"schemaVersion\":1,\"type\":\"models\",...} document. Honors --agent, --cwd,\n  --model, --reasoning-effort, --timeout, --state-dir, trust, and posture flags.\n\n  -h, --help                  Show this help\n  -V, --version               Show the Elwood version\n";
+export declare const cliHelp = "Usage: elwood [options] [prompt...]\n       elwood run [options] [prompt...]\n       elwood resume <id> [options] [prompt...]\n       elwood interactive [id] [options]\n       elwood sessions [--state-dir <path>] [--output <text|json>]\n       elwood models [options] [--output <text|json>]\n       elwood config <command>\n\nRun one Claude Code or Codex turn and write its combined assistant response.\nPositional text and piped stdin are combined with one blank line.\n\nExamples:\n  elwood \"Summarize this repository\"\n  git diff | elwood \"Review this diff for correctness\"\n  elwood run --output json < prompt.txt\n  elwood --output json \"Remember this decision\"\n\nCommands:\n  run                         Run one agent turn (default)\n  resume <id> [prompt...]     Resume a kept session; same as run --resume <id>\n  interactive [id]            Open the agent's own TUI here with Elwood's settings\n  sessions                    List Elwood-owned session records; never starts an agent\n  models                      List both agents' models (starts each briefly)\n  config                      Inspect or update global defaults; see config --help\n  help                        Show this help\n\nAgent and turn options:\n  --agent <claude|codex>      Select the agent (default: first available of claude, codex)\n  --model <id>                Select or switch the model\n  --reasoning-effort <level>  Claude: low|medium|high|xhigh|max\n                              Codex: none|minimal|low|medium|high|xhigh|max\n  --persona <prompt>          Run a real side-effect-capable setup turn; hide its answer\n  -C, --cwd <path>            Workspace for a new run (default: current directory)\n  --image <path>              Attach an image; repeat to preserve order\n  --timeout <duration>        Bound launch, setup, and turn (default: none; ms|s|m|h)\n  --trust / --no-trust        Toggle allowlisted trust automation (default: trust)\n  --no-defaults               Ignore saved config and ELWOOD_* run defaults\n\nContinuation and output:\n  --keep                      Preserve Elwood state (default)\n  --resume <id>               Resume the exact stored agent and workspace\n  --ephemeral                 Remove new or resumed Elwood state afterward\n  --output <text|json|jsonl>  Stdout protocol (default: text)\n  --stream / --no-stream      Toggle incremental text output (default: off)\n  --verbose / --no-verbose    Toggle warnings and concise progress on stderr (default: off)\n  --debug                     Write full sanitized event details to stderr\n  --head                      View the full agent TUI in this terminal\n  --state-dir <path>          Override CLI-owned state storage\n\nAgent posture defaults and supported values:\n  --high-trust / --no-high-trust\n                              Never ask for permissions on either agent (default: off):\n                              Claude bypassPermissions; Codex danger-full-access + never\n  --claude-permission-mode <default|acceptEdits|plan|auto|dontAsk|bypassPermissions>\n                              Default: dontAsk\n  --codex-sandbox <read-only|workspace-write|danger-full-access>\n                              Default: workspace-write\n  --codex-approval-policy <untrusted|on-request|never>\n                              Default: never\n\nHead mode is view-only and requires terminal stdin and stderr. It cannot be\ncombined with stream, verbose, debug, or JSONL output. Ctrl-C still interrupts.\n\nWarnings and diagnostics use stderr; stdout remains the selected protocol.\nUse \"elwood config effective\" to explain resolved values and their sources.\n\nResume subcommand:\n  elwood resume <id> [prompt...] is exactly elwood run --resume <id>: the stored\n  agent and workspace are used, --cwd is rejected, and piped stdin still applies.\n\nInteractive mode:\n  elwood interactive [id] runs claude or codex in the foreground of this terminal\n  with the resolved agent, model, effort, workspace, and posture passed as the\n  agent's own flags. Elwood does not observe or record the conversation and\n  writes no session state. With an id, the stored session's own conversation is\n  resumed in its stored workspace with its stored posture. Requires a terminal on\n  stdin and stdout; cannot be combined with --output json/jsonl, --stream,\n  --verbose, --debug, --head, --timeout, --persona, --image, --keep, --ephemeral,\n  or --resume. Built-in posture defaults are not applied unless configured.\n\nSession listing:\n  elwood sessions lists id, agent, live, resumable, last used, created, and\n  workspace for records in the effective state directory. \"live\" means a\n  launch's bridge socket is present. Text is an aligned table; --output json\n  emits one {\"schemaVersion\":1,\"type\":\"sessions\",...} document. An empty state\n  directory is a normal, empty result.\n\nModel listing:\n  elwood models probes Claude then Codex, showing each model's agent. --agent\n  limits the listing to that agent; saved/environment agent defaults do not.\n  Each probe opens and cancels the picker, then removes its session state.\n  Text marks current with * and default with (default); JSON emits one models\n  document: agents/errors arrays for both, or agent/models with --agent.\n  Partial failures retain available models and exit nonzero. --timeout is one\n  budget for the whole command; Ctrl-C stops further probes. Honors --cwd,\n  --model, --reasoning-effort, --state-dir, trust, and matching posture flags.\n\n  -h, --help                  Show this help\n  -V, --version               Show the Elwood version\n";
 export declare const cliConfigHelp = "Usage: elwood config <command> [arguments]\n\nInspect or update Elwood's global user configuration without starting an agent.\n\nCommands:\n  path                        Print the global config path\n  show                        Print the saved configuration document\n  effective [run options]     Explain resolved launch/output settings and sources\n  get <key>                   Print one configured scalar\n  set <key> <value>           Set one documented config key\n  unset <key>                 Remove one configured key\n\n  -h, --help                  Show this help\n\nExamples:\n  elwood config show\n  elwood config effective --agent claude\n  elwood config set codex.sandbox workspace-write\n";
 //# sourceMappingURL=help.d.ts.map

package/dist/cli/help.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,eAAO,MAAM,OAAO,yxKAgGnB,CAAC;AAEF,eAAO,MAAM,aAAa,usBAkBzB,CAAC"}
+{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,eAAO,MAAM,OAAO,g/KAmGnB,CAAC;AAEF,eAAO,MAAM,aAAa,usBAkBzB,CAAC"}

package/dist/cli/help.js

@@ -17,14 +17,14 @@ Examples:
   elwood "Summarize this repository"
   git diff | elwood "Review this diff for correctness"
   elwood run --output json < prompt.txt
-  elwood --keep --output json "Remember this decision"
+  elwood --output json "Remember this decision"
 
 Commands:
   run                         Run one agent turn (default)
   resume <id> [prompt...]     Resume a kept session; same as run --resume <id>
   interactive [id]            Open the agent's own TUI here with Elwood's settings
   sessions                    List Elwood-owned session records; never starts an agent
-  models                      List the agent's models (starts the agent briefly)
+  models                      List both agents' models (starts each briefly)
   config                      Inspect or update global defaults; see config --help
   help                        Show this help
 
@@ -41,12 +41,12 @@ Agent and turn options:
   --no-defaults               Ignore saved config and ELWOOD_* run defaults
 
 Continuation and output:
-  --keep                      Preserve Elwood state for a new session
+  --keep                      Preserve Elwood state (default)
   --resume <id>               Resume the exact stored agent and workspace
-  --ephemeral                 Remove resumed Elwood state afterward
+  --ephemeral                 Remove new or resumed Elwood state afterward
   --output <text|json|jsonl>  Stdout protocol (default: text)
   --stream / --no-stream      Toggle incremental text output (default: off)
-  --verbose / --no-verbose    Toggle concise elapsed progress on stderr (default: off)
+  --verbose / --no-verbose    Toggle warnings and concise progress on stderr (default: off)
   --debug                     Write full sanitized event details to stderr
   --head                      View the full agent TUI in this terminal
   --state-dir <path>          Override CLI-owned state storage
@@ -90,11 +90,14 @@ Session listing:
   directory is a normal, empty result.
 
 Model listing:
-  elwood models starts the selected agent briefly, opens and cancels its own
-  model picker, tears the session down, and prints the rows. Text marks the
-  current model with * and the default with (default); --output json emits one
-  {"schemaVersion":1,"type":"models",...} document. Honors --agent, --cwd,
-  --model, --reasoning-effort, --timeout, --state-dir, trust, and posture flags.
+  elwood models probes Claude then Codex, showing each model's agent. --agent
+  limits the listing to that agent; saved/environment agent defaults do not.
+  Each probe opens and cancels the picker, then removes its session state.
+  Text marks current with * and default with (default); JSON emits one models
+  document: agents/errors arrays for both, or agent/models with --agent.
+  Partial failures retain available models and exit nonzero. --timeout is one
+  budget for the whole command; Ctrl-C stops further probes. Honors --cwd,
+  --model, --reasoning-effort, --state-dir, trust, and matching posture flags.
 
   -h, --help                  Show this help
   -V, --version               Show the Elwood version

package/dist/cli/help.js.map

@@ -1 +1 @@
-{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgGtB,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;;;;CAkB5B,CAAC"}
+{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmGtB,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;;;;CAkB5B,CAAC"}

package/dist/cli/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAQ5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAG9D,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC;CAC/B,CAAC;AACF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,OAAO,iBAAiB,CAAC;IAC3C,QAAQ,CAAC,QAAQ,EAAE,OAAO,kBAAkB,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,OAAO,iBAAiB,CAAC;IAC3C,QAAQ,CAAC,OAAO,EAAE,OAAO,UAAU,CAAC;IACpC,QAAQ,CAAC,UAAU,EAAE,OAAO,aAAa,CAAC;IAC1C,QAAQ,CAAC,WAAW,EAAE,OAAO,qBAAqB,CAAC;IACnD,QAAQ,CAAC,GAAG,EAAE,MAAM,MAAM,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,OAAO,iBACmB,CAAC;AAElE,eAAO,MAAM,oBAAoB,EAAE,OAAO,UACY,CAAC;AAEvD,eAAO,MAAM,oBAAoB,EAAE,OAAO,aACkB,CAAC;AAE7D,eAAO,MAAM,qBAAqB,EAAE,OAAO,qBAC8B,CAAC;AAa1E,+FAA+F;AAC/F,wBAAsB,IAAI,CACxB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE,cAAc,EACvB,YAAY,GAAE,mBAA8B,GAC3C,OAAO,CAAC,MAAM,CAAC,CA0EjB"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAS5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAG5D,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAG9D,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC;CAC/B,CAAC;AACF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,OAAO,iBAAiB,CAAC;IAC3C,QAAQ,CAAC,QAAQ,EAAE,OAAO,kBAAkB,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,OAAO,iBAAiB,CAAC;IAC3C,QAAQ,CAAC,OAAO,EAAE,OAAO,UAAU,CAAC;IACpC,QAAQ,CAAC,UAAU,EAAE,OAAO,aAAa,CAAC;IAC1C,QAAQ,CAAC,WAAW,EAAE,OAAO,qBAAqB,CAAC;IACnD,QAAQ,CAAC,GAAG,EAAE,MAAM,MAAM,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,OAAO,iBACmB,CAAC;AAElE,eAAO,MAAM,oBAAoB,EAAE,OAAO,UACY,CAAC;AAEvD,eAAO,MAAM,oBAAoB,EAAE,OAAO,aACkB,CAAC;AAE7D,eAAO,MAAM,qBAAqB,EAAE,OAAO,qBAC8B,CAAC;AAa1E,+FAA+F;AAC/F,wBAAsB,IAAI,CACxB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE,cAAc,EACvB,YAAY,GAAE,mBAA8B,GAC3C,OAAO,CAAC,MAAM,CAAC,CAwFjB"}

package/dist/cli/main.js

@@ -7,9 +7,11 @@ import { runConfigCommand } from "./config/commands.js";
 import { HeadedDisplay } from "./head/display.js";
 import { cliHelp } from "./help.js";
 import { agentHint, cliFailure, errorRecord, explicitStructuredOutput, renderErrorRecord, } from "./main-failure.js";
+import { executeCombinedModels } from "./models/combined.js";
 import { resolveRunRequest, resolveRunSettings } from "./request/index.js";
 import { optional, usage } from "./request/values.js";
 import { assertListingOutput, runSessionsCommand } from "./sessions/index.js";
+import { resolveListingSettings } from "./sessions/settings.js";
 import { AsyncOutputSink } from "./stream.js";
 import { readCliVersion } from "./version.js";
 export const prepareDefaultCliSession = async (...args) => (await import("./session/index.js")).prepareCliSession(...args);
@@ -55,6 +57,13 @@ export async function main(args, context, dependencies = defaults) {
             return await dependencies.interactive(parsed, context);
         }
         if (parsed.command === "models") {
+            if (parsed.run.flags.agent === undefined) {
+                const settings = resolveListingSettings(parsed.run, context);
+                output = settings.output;
+                agent = null;
+                assertListingOutput(settings, "models");
+                return await executeCombinedModels(parsed.run, output, context, { stdout, stderr }, dependencies, startedAt);
+            }
             const settings = await dependencies.settings(parsed.run, context);
             assertListingOutput(settings, "models");
             output = settings.output;

package/dist/cli/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EACL,SAAS,EACT,UAAU,EACV,WAAW,EACX,wBAAwB,EACxB,iBAAiB,GAClB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAoB,MAAM,aAAa,CAAC;AAEhE,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAwB9C,MAAM,CAAC,MAAM,wBAAwB,GAA6B,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE,CAClF,CAAC,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,CAAC;AAElE,MAAM,CAAC,MAAM,oBAAoB,GAAsB,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE,CACvE,CAAC,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,CAAC;AAEvD,MAAM,CAAC,MAAM,oBAAoB,GAAyB,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE,CAC1E,CAAC,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,CAAC;AAE7D,MAAM,CAAC,MAAM,qBAAqB,GAAiC,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE,CACnF,CAAC,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC,CAAC,qBAAqB,CAAC,GAAG,IAAI,CAAC,CAAC;AAE1E,MAAM,QAAQ,GAAwB;IACpC,OAAO,EAAE,cAAc;IACvB,OAAO,EAAE,iBAAiB;IAC1B,QAAQ,EAAE,kBAAkB;IAC5B,OAAO,EAAE,wBAAwB;IACjC,OAAO,EAAE,oBAAoB;IAC7B,UAAU,EAAE,oBAAoB;IAChC,WAAW,EAAE,qBAAqB;IAClC,GAAG,EAAE,IAAI,CAAC,GAAG;CACd,CAAC;AAEF,+FAA+F;AAC/F,MAAM,CAAC,KAAK,UAAU,IAAI,CACxB,IAAuB,EACvB,OAAuB,EACvB,eAAoC,QAAQ;IAE5C,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC;IACrC,IAAI,MAAM,GAAG,wBAAwB,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC;IACtD,IAAI,KAAK,GAAG,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,IAA+B,CAAC;IACpC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,MAAM,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;YAC9B,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,CAAC,CAAC;QACX,CAAC;QACD,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,MAAM,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAClD,OAAO,CAAC,CAAC;QACX,CAAC;QACD,IAAI,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YAChC,MAAM,gBAAgB,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YAC5D,OAAO,CAAC,CAAC;QACX,CAAC;QACD,IAAI,MAAM,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;YAClC,OAAO,MAAM,kBAAkB,CAAC,MAAM,EAAE,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1E,CAAC;QACD,IAAI,MAAM,CAAC,OAAO,KAAK,aAAa,EAAE,CAAC;YACrC,OAAO,MAAM,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YAChC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAClE,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACxC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;YACzB,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;YACvB,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACtD,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;YAC/B,OAAO,MAAM,YAAY,CAAC,UAAU,CAClC,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,OAAO,EAChB,EAAE,MAAM,EAAE,MAAM,EAAE,EAClB,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAC7B,CAAC;QACJ,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC7D,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QACzB,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;QACvB,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YAC3B,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC/B,MAAM,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAC5D,CAAC;YACD,IAAI,GAAG,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,CACzC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAC/E,CAAC;QACF,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;QAC/B,OAAO,MAAM,YAAY,CAAC,OAAO,CAC/B,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,OAAO,EAChB,EAAE,MAAM,EAAE,MAAM,EAAE,EAClB,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CACxD,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,EAAE,KAAK,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QAClC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC;QAC3E,MAAM,iBAAiB,CAAC,MAAM,EAAE,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,CAC5F,GAAG,EAAE,CAAC,SAAS,CAChB,CAAC;QACF,OAAO,OAAO,CAAC,QAAQ,CAAC;IAC1B,CAAC;YAAS,CAAC;QACT,MAAM,IAAI,EAAE,KAAK,EAAE,CAAC;QACpB,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACpD,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;AACH,CAAC"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"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"}

package/dist/cli/models/combined.d.ts

@@ -0,0 +1,6 @@
+/** Sequential aggregate model listing with a command-wide deadline (PRD §12A.10, C-CLI-26). */
+import type { CliMainContext, CliMainDependencies } from "../main.ts";
+import type { CliOutputMode, ParsedRunCommand } from "../types.ts";
+import type { ExecuteModelsIo } from "./index.ts";
+export declare function executeCombinedModels(parsed: ParsedRunCommand, output: CliOutputMode, context: CliMainContext, io: ExecuteModelsIo, dependencies: CliMainDependencies, startedAt: number): Promise<number>;
+//# sourceMappingURL=combined.d.ts.map

package/dist/cli/models/combined.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"combined.d.ts","sourceRoot":"","sources":["../../../src/cli/models/combined.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAG/F,OAAO,KAAK,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAItE,OAAO,KAAK,EAAY,aAAa,EAAE,gBAAgB,EAAsB,MAAM,aAAa,CAAC;AAEjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAiBlD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,cAAc,EACvB,EAAE,EAAE,eAAe,EACnB,YAAY,EAAE,mBAAmB,EACjC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CA2EjB"}

package/dist/cli/models/combined.js

@@ -0,0 +1,92 @@
+/** Sequential aggregate model listing with a command-wide deadline (PRD §12A.10, C-CLI-26). */
+import { cliFailure, errorRecord } from "../main-failure.js";
+import { cliAgents } from "../types.js";
+import { renderCombinedModels } from "./render.js";
+import { modelAgentInputs } from "./settings.js";
+import { ModelsSignals } from "./signals.js";
+async function teardownPreparedSession(session) {
+    try {
+        await session.teardown();
+        return { action: "teardown", status: "succeeded" };
+    }
+    catch {
+        return { action: "teardown", status: "failed", error: "Cleanup failed." };
+    }
+}
+export async function executeCombinedModels(parsed, output, context, io, dependencies, startedAt) {
+    const signals = new ModelsSignals(context.signals);
+    const results = [];
+    let deadline;
+    const stopped = () => {
+        if (signals.interrupted)
+            return { code: "interrupted", message: "Interrupted.", exitCode: 130 };
+        if (deadline !== undefined && dependencies.now() >= deadline)
+            return { code: "timeout", message: "Timed out.", exitCode: 124 };
+        return undefined;
+    };
+    const failed = (agent, failure, cleanup) => {
+        results.push({
+            agent,
+            error: errorRecord(agent, failure, Math.max(0, dependencies.now() - startedAt), cleanup),
+            exitCode: failure.exitCode,
+        });
+    };
+    try {
+        // Validate both sets of settings before launching either adapter.
+        const settings = new Map();
+        const failures = new Map();
+        for (const agent of cliAgents) {
+            const inputs = modelAgentInputs(parsed, context.env, agent);
+            try {
+                const request = await dependencies.settings(inputs.parsed, { ...context, env: inputs.env });
+                if (request.timeoutMs !== undefined)
+                    deadline = startedAt + request.timeoutMs;
+                settings.set(agent, request);
+            }
+            catch (error) {
+                failures.set(agent, cliFailure(error));
+            }
+        }
+        for (const agent of cliAgents) {
+            const stop = stopped();
+            if (stop !== undefined) {
+                failed(agent, stop);
+                break;
+            }
+            const invalid = failures.get(agent);
+            if (invalid !== undefined) {
+                failed(agent, invalid);
+                continue;
+            }
+            let prepared;
+            try {
+                prepared = await dependencies.prepare(settings.get(agent));
+            }
+            catch (error) {
+                const stop = stopped();
+                if (stop !== undefined) {
+                    failed(agent, stop);
+                    break;
+                }
+                failed(agent, cliFailure(error));
+                continue;
+            }
+            const afterPreparation = stopped();
+            if (afterPreparation !== undefined) {
+                const cleanup = await teardownPreparedSession(prepared.session);
+                failed(agent, afterPreparation, cleanup);
+                break;
+            }
+            await dependencies.listModels({
+                ...prepared.request,
+                ...(deadline === undefined ? {} : { timeoutMs: deadline - dependencies.now() }),
+            }, prepared.session, io, { signals, onResult: (result) => results.push(result) });
+        }
+        await renderCombinedModels(output, results, io);
+        return Math.max(0, ...results.map((result) => ("error" in result ? result.exitCode : 0)));
+    }
+    finally {
+        signals.dispose();
+    }
+}
+//# sourceMappingURL=combined.js.map

package/dist/cli/models/combined.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"combined.js","sourceRoot":"","sources":["../../../src/cli/models/combined.ts"],"names":[],"mappings":"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"}

package/dist/cli/models/index.d.ts

@@ -8,6 +8,7 @@ import { type CliLifecycleClock, type CliSignalSource } from "../lifecycle/index
 import type { CliSessionFacade } from "../session/index.ts";
 import type { AsyncOutputSink } from "../stream.ts";
 import type { EffectiveRunRequest } from "../types.ts";
+import type { ModelsResult } from "./result.ts";
 export type ExecuteModelsIo = {
     readonly stdout: AsyncOutputSink;
     readonly stderr: AsyncOutputSink;
@@ -15,6 +16,7 @@ export type ExecuteModelsIo = {
 export type ExecuteModelsDependencies = {
     readonly signals: CliSignalSource;
     readonly clock?: CliLifecycleClock;
+    readonly onResult?: (result: ModelsResult) => void;
 };
 export declare function executeModels(request: EffectiveRunRequest, session: CliSessionFacade, io: ExecuteModelsIo, dependencies: ExecuteModelsDependencies): Promise<number>;
 //# sourceMappingURL=index.d.ts.map

package/dist/cli/models/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/models/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAgB,KAAK,iBAAiB,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMnG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAIvD,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;CAClC,CAAC;AACF,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC;CACpC,CAAC;AAEF,wBAAsB,aAAa,CACjC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,gBAAgB,EACzB,EAAE,EAAE,eAAe,EACnB,YAAY,EAAE,yBAAyB,GACtC,OAAO,CAAC,MAAM,CAAC,CAkDjB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/models/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAgB,KAAK,iBAAiB,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMnG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;CAClC,CAAC;AACF,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC;IACnC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,CAAC;CACpD,CAAC;AAEF,wBAAsB,aAAa,CACjC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,gBAAgB,EACzB,EAAE,EAAE,eAAe,EACnB,YAAY,EAAE,yBAAyB,GACtC,OAAO,CAAC,MAAM,CAAC,CA+DjB"}

package/dist/cli/models/index.js

@@ -13,7 +13,7 @@ import { subscribeRunEvents } from "../run/subscribe.js";
 import { CodexUpdateAttentionGuard } from "../update-attention.js";
 import { renderModels } from "./render.js";
 export async function executeModels(request, session, io, dependencies) {
-    const lifecycle = new CliLifecycle(request, session, dependencies.signals, dependencies.clock);
+    const lifecycle = new CliLifecycle({ ...request, keep: false, ephemeral: true }, session, dependencies.signals, dependencies.clock);
     const clean = createCliSanitizer();
     const warnings = [];
     const updateAttention = request.agent === "codex"
@@ -21,11 +21,16 @@ export async function executeModels(request, session, io, dependencies) {
         : undefined;
     const unsubscribers = subscribeRunEvents(request, session, lifecycle, {
         status: () => undefined,
-        warning: (event) => warnings.push(writeWarning(io.stderr, event, clean)),
+        warning: (event) => {
+            if (request.verbose || request.debug === true)
+                warnings.push(writeWarning(io.stderr, event, clean));
+        },
     }, undefined, updateAttention);
     let models;
     lifecycle.start();
     try {
+        if (lifecycle.failure !== undefined)
+            throw lifecycle.failure;
         lifecycle.beginLaunch();
         const started = await lifecycle.race(session.start());
         if (started.completed) {
@@ -49,11 +54,17 @@ export async function executeModels(request, session, io, dependencies) {
     const failure = lifecycle.failure;
     if (failure === undefined) {
         // Both races completed (the lifecycle only stops on a recorded failure), so rows exist.
-        await renderModels(request.output, request.agent, models, io.stdout);
+        if (dependencies.onResult === undefined)
+            await renderModels(request.output, request.agent, models, io.stdout);
+        else
+            dependencies.onResult({ agent: request.agent, models: models });
         return 0;
     }
     const record = errorRecord(request.agent, failure, lifecycle.durationMs(), cleanup);
-    await renderErrorRecord(request.output, record, io.stdout, io.stderr);
+    if (dependencies.onResult === undefined)
+        await renderErrorRecord(request.output, record, io.stdout, io.stderr);
+    else
+        dependencies.onResult({ agent: request.agent, error: record, exitCode: failure.exitCode });
     return failure.exitCode;
 }
 function writeWarning(stderr, event, clean) {

package/dist/cli/models/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/models/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/models/index.ts"],"names":[],"mappings":"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"}

package/dist/cli/models/render.d.ts

@@ -5,5 +5,9 @@
 import type { AgentModelOption } from "../../core/models/rows.ts";
 import type { AsyncOutputSink } from "../stream.ts";
 import type { CliAgent, CliOutputMode } from "../types.ts";
+import type { ExecuteModelsIo } from "./index.ts";
+import type { ModelsResult } from "./result.ts";
 export declare function renderModels(output: CliOutputMode, agent: CliAgent, models: readonly AgentModelOption[], stdout: AsyncOutputSink): Promise<void>;
+/** Render a combined invocation once, after every started probe has been cleaned up. */
+export declare function renderCombinedModels(output: CliOutputMode, results: readonly ModelsResult[], io: ExecuteModelsIo): Promise<void>;
 //# sourceMappingURL=render.d.ts.map

package/dist/cli/models/render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../src/cli/models/render.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAElE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAI3D,wBAAsB,YAAY,CAChC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,QAAQ,EACf,MAAM,EAAE,SAAS,gBAAgB,EAAE,EACnC,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC,CAoBf"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../src/cli/models/render.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAElE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAIhD,wBAAsB,YAAY,CAChC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,QAAQ,EACf,MAAM,EAAE,SAAS,gBAAgB,EAAE,EACnC,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC,CAoBf;AAeD,wFAAwF;AACxF,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,EAAE,EAAE,eAAe,GAClB,OAAO,CAAC,IAAI,CAAC,CAsCf"}

package/dist/cli/models/render.js

@@ -2,7 +2,7 @@
  * Table and JSON rendering for `elwood models`.
  * Implements PRD §12A.10 and C-CLI-26.
  */
-import { createCliSanitizer } from "../output/sanitize.js";
+import { createCliSanitizer, formatDiagnosticValue } from "../output/sanitize.js";
 import { renderTable } from "../table.js";
 const header = ["CURRENT", "ID", "LABEL", "DEFAULT", "DESCRIPTION"];
 export async function renderModels(output, agent, models, stdout) {
@@ -30,4 +30,31 @@ function sanitizedModel(model, clean) {
         raw: clean(model.raw),
     };
 }
+/** Render a combined invocation once, after every started probe has been cleaned up. */
+export async function renderCombinedModels(output, results, io) {
+    const clean = createCliSanitizer();
+    const agents = results.flatMap((result) => "models" in result
+        ? [
+            {
+                agent: result.agent,
+                models: result.models.map((model) => sanitizedModel(model, clean)),
+            },
+        ]
+        : []);
+    const errors = results.flatMap((result) => ("error" in result ? [result.error] : []));
+    if (output === "json") {
+        await io.stdout.write(`${JSON.stringify({ schemaVersion: 1, type: "models", agents, errors })}\n`);
+        return;
+    }
+    await io.stdout.write(renderTable(["AGENT", ...header], agents.flatMap(({ agent, models }) => models.map((model) => [
+        agent,
+        model.isCurrent ? "*" : "",
+        model.id,
+        model.label,
+        model.isDefault ? "(default)" : "",
+        model.description ?? "",
+    ]))));
+    for (const error of errors)
+        await io.stderr.write(`elwood: ${error.agent}: ${formatDiagnosticValue(error.error.message, clean)}\n`);
+}
 //# sourceMappingURL=render.js.map

package/dist/cli/models/render.js.map

@@ -1 +1 @@
-{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/cli/models/render.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,MAAM,MAAM,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;AAEpE,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAAqB,EACrB,KAAe,EACf,MAAmC,EACnC,MAAuB;IAEvB,MAAM,KAAK,GAAG,kBAAkB,EAAE,CAAC;IACnC,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IACjE,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACtB,MAAM,QAAQ,GAAG,EAAE,aAAa,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAC3E,MAAM,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpD,OAAO;IACT,CAAC;IACD,MAAM,MAAM,CAAC,KAAK,CAChB,WAAW,CACT,MAAM,EACN,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QAClB,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QAC1B,KAAK,CAAC,EAAE;QACR,KAAK,CAAC,KAAK;QACX,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;QAClC,KAAK,CAAC,WAAW,IAAI,EAAE;KACxB,CAAC,CACH,CACF,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CACrB,KAAuB,EACvB,KAAgC;IAEhC,OAAO;QACL,GAAG,KAAK;QACR,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QACnB,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC;QACzB,GAAG,CAAC,KAAK,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;QACrF,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;KACtB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/cli/models/render.ts"],"names":[],"mappings":"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"}

package/dist/cli/models/result.d.ts

@@ -0,0 +1,13 @@
+/** Typed model probe outcomes shared by single and combined listings (PRD §12A.10, C-CLI-26). */
+import type { AgentModelOption } from "../../core/models/rows.ts";
+import type { CliError } from "../output/types.ts";
+import type { CliAgent } from "../types.ts";
+export type ModelsResult = {
+    readonly agent: CliAgent;
+    readonly models: readonly AgentModelOption[];
+} | {
+    readonly agent: CliAgent;
+    readonly error: CliError;
+    readonly exitCode: number;
+};
+//# sourceMappingURL=result.d.ts.map

package/dist/cli/models/result.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["../../../src/cli/models/result.ts"],"names":[],"mappings":"AAAA,iGAAiG;AACjG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,MAAM,YAAY,GACpB;IAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,gBAAgB,EAAE,CAAA;CAAE,GAC1E;IAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC"}

package/dist/cli/models/result.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=result.js.map

package/dist/cli/models/result.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"result.js","sourceRoot":"","sources":["../../../src/cli/models/result.ts"],"names":[],"mappings":""}

package/dist/cli/models/settings.d.ts

@@ -0,0 +1,61 @@
+import type { CliAgent, CliEnvironment, ParsedRunCommand } from "../types.ts";
+export declare function modelAgentInputs(parsed: ParsedRunCommand, environment: CliEnvironment, agent: CliAgent): {
+    parsed: {
+        flags: {
+            claudePermissionMode?: string;
+            agent: "claude" | "codex";
+            output?: string;
+            timeout?: string;
+            trust?: boolean;
+            highTrust?: boolean;
+            stateDir?: string;
+            verbose?: boolean;
+            stream?: boolean;
+            debug?: boolean;
+            ignoreDefaults?: boolean;
+            head?: boolean;
+            persona?: string;
+            model?: string;
+            reasoningEffort?: string;
+            cwd?: string;
+            images: readonly string[];
+            keep?: boolean;
+            resume?: string;
+            ephemeral?: boolean;
+        } | {
+            codexApprovalPolicy?: string;
+            codexSandbox?: string;
+            agent: "claude" | "codex";
+            output?: string;
+            timeout?: string;
+            trust?: boolean;
+            highTrust?: boolean;
+            stateDir?: string;
+            verbose?: boolean;
+            stream?: boolean;
+            debug?: boolean;
+            ignoreDefaults?: boolean;
+            head?: boolean;
+            persona?: string;
+            model?: string;
+            reasoningEffort?: string;
+            cwd?: string;
+            images: readonly string[];
+            keep?: boolean;
+            resume?: string;
+            ephemeral?: boolean;
+        };
+        command: "run";
+        explicit: ReadonlySet<import("../types.ts").RunOptionKey>;
+        promptWords: readonly string[];
+    };
+    env: {
+        ELWOOD_CODEX_SANDBOX: undefined;
+        ELWOOD_CODEX_APPROVAL_POLICY: undefined;
+        ELWOOD_AGENT: undefined;
+    } | {
+        ELWOOD_CLAUDE_PERMISSION_MODE: undefined;
+        ELWOOD_AGENT: undefined;
+    };
+};
+//# sourceMappingURL=settings.d.ts.map

package/dist/cli/models/settings.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../src/cli/models/settings.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE9E,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,cAAc,EAC3B,KAAK,EAAE,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqBhB"}

package/dist/cli/models/settings.js

@@ -0,0 +1,24 @@
+/** Select only the matching adapter's options for combined model probes (PRD §12A.10). */
+import { optional } from "../request/values.js";
+export function modelAgentInputs(parsed, environment, agent) {
+    const { claudePermissionMode, codexSandbox, codexApprovalPolicy, ...shared } = parsed.flags;
+    const flags = {
+        ...shared,
+        agent,
+        ...(agent === "claude"
+            ? optional(claudePermissionMode, "claudePermissionMode")
+            : {
+                ...optional(codexSandbox, "codexSandbox"),
+                ...optional(codexApprovalPolicy, "codexApprovalPolicy"),
+            }),
+    };
+    const env = {
+        ...environment,
+        ELWOOD_AGENT: undefined,
+        ...(agent === "claude"
+            ? { ELWOOD_CODEX_SANDBOX: undefined, ELWOOD_CODEX_APPROVAL_POLICY: undefined }
+            : { ELWOOD_CLAUDE_PERMISSION_MODE: undefined }),
+    };
+    return { parsed: { ...parsed, flags }, env };
+}
+//# sourceMappingURL=settings.js.map

package/dist/cli/models/settings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../src/cli/models/settings.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAGhD,MAAM,UAAU,gBAAgB,CAC9B,MAAwB,EACxB,WAA2B,EAC3B,KAAe;IAEf,MAAM,EAAE,oBAAoB,EAAE,YAAY,EAAE,mBAAmB,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC;IAC5F,MAAM,KAAK,GAAG;QACZ,GAAG,MAAM;QACT,KAAK;QACL,GAAG,CAAC,KAAK,KAAK,QAAQ;YACpB,CAAC,CAAC,QAAQ,CAAC,oBAAoB,EAAE,sBAAsB,CAAC;YACxD,CAAC,CAAC;gBACE,GAAG,QAAQ,CAAC,YAAY,EAAE,cAAc,CAAC;gBACzC,GAAG,QAAQ,CAAC,mBAAmB,EAAE,qBAAqB,CAAC;aACxD,CAAC;KACP,CAAC;IACF,MAAM,GAAG,GAAG;QACV,GAAG,WAAW;QACd,YAAY,EAAE,SAAS;QACvB,GAAG,CAAC,KAAK,KAAK,QAAQ;YACpB,CAAC,CAAC,EAAE,oBAAoB,EAAE,SAAS,EAAE,4BAA4B,EAAE,SAAS,EAAE;YAC9E,CAAC,CAAC,EAAE,6BAA6B,EAAE,SAAS,EAAE,CAAC;KAClD,CAAC;IACF,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC;AAC/C,CAAC"}

package/dist/cli/models/signals.d.ts

@@ -0,0 +1,11 @@
+/** Keep SIGINT bound between combined probes and replay cancellation at launch (PRD §12A.10). */
+import type { Unsubscribe } from "../../core/types.ts";
+import type { CliSignalSource } from "../lifecycle/index.ts";
+export declare class ModelsSignals implements CliSignalSource {
+    interrupted: boolean;
+    private readonly handlers;
+    readonly dispose: Unsubscribe;
+    constructor(source: CliSignalSource);
+    onSigint(handler: () => void): Unsubscribe;
+}
+//# sourceMappingURL=signals.d.ts.map

package/dist/cli/models/signals.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"signals.d.ts","sourceRoot":"","sources":["../../../src/cli/models/signals.ts"],"names":[],"mappings":"AAAA,iGAAiG;AACjG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,qBAAa,aAAc,YAAW,eAAe;IACnD,WAAW,UAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyB;IAClD,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;gBAElB,MAAM,EAAE,eAAe;IAOnC,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,GAAG,WAAW;CAO3C"}

package/dist/cli/models/signals.js

@@ -0,0 +1,21 @@
+export class ModelsSignals {
+    interrupted = false;
+    handlers = new Set();
+    dispose;
+    constructor(source) {
+        this.dispose = source.onSigint(() => {
+            this.interrupted = true;
+            for (const handler of this.handlers)
+                handler();
+        });
+    }
+    onSigint(handler) {
+        this.handlers.add(handler);
+        if (this.interrupted)
+            handler();
+        return () => {
+            this.handlers.delete(handler);
+        };
+    }
+}
+//# sourceMappingURL=signals.js.map

package/dist/cli/models/signals.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"signals.js","sourceRoot":"","sources":["../../../src/cli/models/signals.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,aAAa;IACxB,WAAW,GAAG,KAAK,CAAC;IACH,QAAQ,GAAG,IAAI,GAAG,EAAc,CAAC;IACzC,OAAO,CAAc;IAE9B,YAAY,MAAuB;QACjC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE;YAClC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YACxB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ;gBAAE,OAAO,EAAE,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,OAAmB;QAC1B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,IAAI,CAAC,WAAW;YAAE,OAAO,EAAE,CAAC;QAChC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC,CAAC;IACJ,CAAC;CACF"}

package/dist/cli/request/index.js

@@ -78,7 +78,7 @@ export async function resolveRunSettings(parsed, context, detectAgent = detectAv
         cwdExplicit: parsed.explicit.has("cwd"),
         imagePaths: parsed.flags.images,
         prompt: "",
-        keep: parsed.flags.keep ?? false,
+        keep: !parsed.flags.ephemeral,
         ...optional(optionalNonBlank(parsed.flags.resume, "resume"), "resume"),
         ephemeral: parsed.flags.ephemeral ?? false,
         resolution: {

package/dist/cli/request/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/request/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/request/index.ts"],"names":[],"mappings":"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"}

package/dist/cli/request/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/cli/request/validation.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACtB,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG/C;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,gBAAgB,EACxB,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,QAAQ,EACf,WAAW,EAAE,MAAM,GAClB,IAAI,CAQN;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,WAAW,GAAG,IAAI,CAgBlF;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,EAC7B,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,EAC9B,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,OAAO,GACZ,IAAI,CAaN;AAMD,yFAAyF;AACzF,wBAAgB,eAAe,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CASlF;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CACnC,CAAC;AAEF,4FAA4F;AAC5F,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,gBAAgB,EACxB,GAAG,EAAE,WAAW,GACf,sBAAsB,CAaxB;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,WAAW,GAAG,IAAI,CAMlF"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/cli/request/validation.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACtB,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG/C;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,gBAAgB,EACxB,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,QAAQ,EACf,WAAW,EAAE,MAAM,GAClB,IAAI,CAQN;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,WAAW,GAAG,IAAI,CAYlF;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,EAC7B,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,EAC9B,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,OAAO,GACZ,IAAI,CAaN;AAMD,yFAAyF;AACzF,wBAAgB,eAAe,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CASlF;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CACnC,CAAC;AAEF,4FAA4F;AAC5F,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,gBAAgB,EACxB,GAAG,EAAE,WAAW,GACf,sBAAsB,CAaxB;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,WAAW,GAAG,IAAI,CAMlF"}

package/dist/cli/request/validation.js

@@ -24,10 +24,6 @@ export function validateSpecificFlags(parsed, env, agent, agentSource) {
 export function validateLifecycle(parsed, env) {
     if (parsed.flags.keep && parsed.flags.ephemeral)
         throw usage("--keep and --ephemeral cannot be combined.");
-    if (parsed.flags.ephemeral && parsed.flags.resume === undefined)
-        throw usage("--ephemeral requires --resume.");
-    if (parsed.flags.keep && parsed.flags.resume !== undefined)
-        throw usage("--keep is only valid for a new session.");
     if (parsed.flags.cwd !== undefined && parsed.flags.resume !== undefined)
         throw usage("--cwd cannot be used with --resume; resume uses the stored workspace.");
     if (parsed.flags.resume !== undefined) {

package/dist/cli/request/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/cli/request/validation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/cli/request/validation.ts"],"names":[],"mappings":"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"}

package/dist/cli/run/output.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../../src/cli/run/output.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAM9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAoB,MAAM,oBAAoB,CAAC;AACjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAoB,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGzE,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiB;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAe;IACzC,OAAO,CAAC,KAAK,CAA0C;IACvD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwB;IACjD,OAAO,CAAC,IAAI,CAAoC;IAChD,OAAO,CAAC,KAAK,CAAS;gBAGpB,OAAO,EAAE,mBAAmB,EAC5B,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,MAAM,MAAM;IAWzB,UAAU,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI;IAI5C,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAI/B,IAAI,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAQrC,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG;QAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;KAAE,GAAG,IAAI;IAIrE,OAAO,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAUxC,QAAQ,IAAI,IAAI;IAMhB,aAAa,IAAI,IAAI;IAIf,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,MAAM,CAAC,cAAc,EAAE,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BpE,OAAO,CAAC,OAAO;YAkBD,YAAY;IAI1B,OAAO,CAAC,QAAQ;IAKhB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,KAAK;IAIb,0FAA0F;YAC5E,iBAAiB;IAU/B,OAAO,CAAC,QAAQ,CAAC,eAAe,CACW;CAC5C"}
+{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../../src/cli/run/output.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAM9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAoB,MAAM,oBAAoB,CAAC;AACjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAoB,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGzE,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiB;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAe;IACzC,OAAO,CAAC,KAAK,CAA0C;IACvD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwB;IACjD,OAAO,CAAC,IAAI,CAAoC;IAChD,OAAO,CAAC,KAAK,CAAS;gBAGpB,OAAO,EAAE,mBAAmB,EAC5B,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,MAAM,MAAM;IAWzB,UAAU,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI;IAI5C,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAI/B,IAAI,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAQrC,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG;QAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;KAAE,GAAG,IAAI;IAIrE,OAAO,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAOxC,QAAQ,IAAI,IAAI;IAMhB,aAAa,IAAI,IAAI;IAIf,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,MAAM,CAAC,cAAc,EAAE,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BpE,OAAO,CAAC,OAAO;YAkBD,YAAY;IAI1B,OAAO,CAAC,QAAQ;IAKhB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,KAAK;IAIb,0FAA0F;YAC5E,iBAAiB;IAU/B,OAAO,CAAC,QAAQ,CAAC,eAAe,CACW;CAC5C"}

package/dist/cli/run/output.js

@@ -8,7 +8,7 @@ import { progressFromTurn, progressFromWarning } from "../output/records.js";
 import { createCliSanitizer, formatDiagnosticValue } from "../output/sanitize.js";
 import { StreamingTextRenderer, writeFinalText } from "../output/text.js";
 import { agentDisplayName } from "../types.js";
-import { completionLine, conciseLine, debugLine, warningLine } from "./output-lines.js";
+import { completionLine, conciseLine, debugLine } from "./output-lines.js";
 export class RunOutput {
     request;
     stdout;
@@ -52,12 +52,9 @@ export class RunOutput {
     warning(event) {
         if (this.ended)
             return;
-        const record = progressFromWarning(event, this.clean);
-        if (this.request.output !== "jsonl" && !this.request.verbose && this.request.debug !== true) {
-            this.queueDiagnostic(warningLine(record, this.diagnosticValue));
+        if (this.request.output !== "jsonl" && !this.request.verbose && this.request.debug !== true)
             return;
-        }
-        void this.enqueue(record);
+        void this.enqueue(progressFromWarning(event, this.clean));
     }
     starting() {
         this.progress(`Starting ${agentDisplayName(this.request.agent)} in ${this.diagnosticValue(this.request.cwd)}`);

package/dist/cli/run/output.js.map

@@ -1 +1 @@
-{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../src/cli/run/output.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../src/cli/run/output.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAG1E,OAAO,EAAE,gBAAgB,EAA4B,MAAM,aAAa,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAO3E,MAAM,OAAO,SAAS;IACH,OAAO,CAAsB;IAC7B,MAAM,CAAkB;IACxB,MAAM,CAAkB;IACxB,KAAK,CAAiB;IACtB,SAAS,CAAe;IACjC,KAAK,GAAqB,kBAAkB,EAAE,CAAC;IACtC,aAAa,GAAa,EAAE,CAAC;IAC7B,KAAK,CAAgB;IACrB,QAAQ,CAAwB;IACzC,IAAI,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IACxC,KAAK,GAAG,KAAK,CAAC;IAEtB,YACE,OAA4B,EAC5B,MAAuB,EACvB,MAAuB,EACvB,KAAqB,EACrB,SAAuB;QAEvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,IAAI,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAClD,IAAI,CAAC,QAAQ,GAAG,IAAI,qBAAqB,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,UAAU,CAAC,OAA0B;QACnC,IAAI,CAAC,KAAK,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAED,IAAI,CAAC,KAAgB;QACnB,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACvF,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,MAAuD;QAC5D,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED,OAAO,CAAC,KAAyB;QAC/B,IAAI,IAAI,CAAC,KAAK;YAAE,OAAO;QACvB,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,KAAK,IAAI;YACzF,OAAO;QACT,KAAK,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,QAAQ,CACX,YAAY,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAChG,CAAC;IACJ,CAAC;IAED,aAAa;QACX,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,IAAI,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,cAAuC;QAClD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,IAAI,MAAM,GAAG,cAAc,EAAE,CAAC;QAC9B,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YACxD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;YACtE,gFAAgF;YAChF,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;gBAAE,MAAM,GAAG,cAAc,EAAE,CAAC;QACvE,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM;YAAE,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;aACvF,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,OAAO;YAAE,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;aACxF,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;;YACzE,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC3E,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACrF,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1F,CAAC;QACD,IACE,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM;YAC9B,IAAI,CAAC,OAAO,CAAC,IAAI;YACjB,MAAM,CAAC,SAAS,KAAK,IAAI;YACzB,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,WAAW,EACrC,CAAC;YACD,MAAM,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC;IAEO,OAAO,CAAC,MAAyB;QACvC,IAAI,IAAI,CAAC,KAAK;YAAE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YACxC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,OAAO;gBAAE,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YAC1F,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM;gBAC/C,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YAC9D,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,OAAO,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC;YAClF,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,KAAK,IAAI;gBAC9C,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;iBAC1E,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC/C,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;gBACvD,IAAI,IAAI,KAAK,SAAS;oBAAE,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YACpE,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC/D,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,KAAuB;QAChD,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;IAClD,CAAC;IAEO,QAAQ,CAAC,OAAe;QAC9B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,KAAK,IAAI;YAAE,OAAO;QACjE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,IAAI,CAAC,CAAC,CAAC;IACnD,CAAC;IAEO,eAAe,CAAC,IAAY;QAClC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YACxC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACjE,CAAC;IAEO,KAAK,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC;IACxF,CAAC;IAED,0FAA0F;IAClF,KAAK,CAAC,iBAAiB,CAAC,IAAY;QAC1C,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC9B,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACzB,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAEgB,eAAe,GAAG,CAAC,KAAa,EAAU,EAAE,CAC3D,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;CAC5C"}

package/docs/cli-output.md

@@ -5,9 +5,9 @@ exit codes, and safe shell recipes. Start with [cli.md](cli.md) for usage.
 
 ## Text, verbose, and stream
 
-Text is the default output protocol. Warnings and diagnostics go to stderr,
-never into the answer on stdout. `--verbose` adds compact elapsed phase,
-tool-name, warning, and cleanup progress; it does not repeat assistant or
+Text is the default output protocol. Live session warnings are quiet by default,
+including during `elwood models`. Errors remain visible. `--verbose` adds compact
+elapsed phase, tool-name, warning, and cleanup progress on stderr; it does not repeat assistant or
 thinking text. `--debug` adds full sanitized event details. `--stream` emits
 assistant text as it arrives and is valid only with text output; use
 `--no-stream` when config enabled streaming but a script needs JSON.
@@ -26,7 +26,9 @@ a downstream pipe closing early triggers cleanup without an uncaught `EPIPE`.
 
 `--output json` emits exactly one version-1 document. Its stable fields are
 `schemaVersion`, `type`, `agent`, `response`, `sessionId`, `durationMs`,
-`cleanup`, and, on failure, `error`:
+`cleanup`, and, on failure, `error`. The examples below use `--ephemeral`, so
+cleanup removes session state and `sessionId` is null. By default, CLI turns
+preserve state and return a resumable session ID once one is available:
 
 ```json
 {
@@ -66,7 +68,8 @@ a usage error or `no_agent_found`) reports `"agent": null`.
 `--output jsonl` emits sequenced version-1 `text`, `thinking`, `tool`,
 `status`, and `warning` records followed by exactly one `result` or `error`
 record. Every record has `sequence` and `elapsedMs`; tool calls and results
-share `toolCallId` when the agent supplies one:
+share `toolCallId` when the agent supplies one. This example also uses
+`--ephemeral`:
 
 ```jsonl
 {"schemaVersion":1,"type":"status","status":"running","sequence":1,"elapsedMs":114}
@@ -77,7 +80,9 @@ share `toolCallId` when the agent supplies one:
 ```
 
 JSONL warning records stay on stdout so the machine protocol remains ordered;
-text and JSON runs surface warnings on stderr.
+text and JSON runs surface session warnings on stderr only with `--verbose`
+or `--debug`. `ELWOOD_VERBOSE=true` or config `verbose: true` also enables them;
+`--no-verbose` overrides inherited verbosity (but not explicit `--debug`).
 
 ## Session and model listings
 
@@ -108,10 +113,35 @@ in JSON mode, and `sessions` never starts an agent:
 check, so a force-killed owner can leave a stale "live" until the session is
 next started or torn down. An empty state directory yields an empty `sessions`
 array (text mode prints a notice on stderr and nothing on stdout). Unreadable
-records are skipped with one stderr warning each.
+records are skipped with one stderr warning each, even without verbosity,
+because the listing omits those results.
 
-`elwood models` starts the agent briefly to read its own model picker, then
-tears the session down:
+`elwood models` probes Claude then Codex, regardless of saved or environment
+agent defaults. Text includes an `AGENT` column. JSON contains successful
+catalogs and canonical per-agent error records in one document:
+
+```json
+{
+  "schemaVersion": 1,
+  "type": "models",
+  "agents": [
+    { "agent": "claude", "models": [] },
+    { "agent": "codex", "models": [] }
+  ],
+  "errors": []
+}
+```
+
+Each probe opens and cancels its model picker and always removes its session
+state. An empty `models` array means that probe succeeded with no rows. If an
+adapter fails, its catalog is absent from `agents` and its canonical error
+record appears in `errors`, including `agent`, `error`, `durationMs`, and
+`cleanup`. Available catalogs remain present. Incomplete results exit nonzero:
+130 for interruption, then 124 for timeout, 2 for usage errors, or 1 for other
+failures, in that precedence order. `--timeout` is a whole-command budget; no
+next probe starts after timeout or Ctrl-C.
+
+Explicit `elwood models --agent claude` retains its single-agent document:
 
 ```json
 {
@@ -125,7 +155,7 @@ tears the session down:
 }
 ```
 
-Failures use the same `error` document and statuses as a run. Useful recipes:
+Single-agent failures use the same `error` document and statuses as a run. Useful recipes:
 
 ```sh
 id=$(elwood sessions --output json | jq -r '.sessions[0].id')

package/docs/cli.md

@@ -83,8 +83,9 @@ Boolean environment values are exactly `true` or `false`.
 Run `elwood --help` for the full flag list. Launch controls include `--model`,
 `--reasoning-effort`, `--persona`, `--claude-permission-mode`,
 `--codex-sandbox`, `--codex-approval-policy`, `--state-dir`, `--verbose`,
-`--debug`, and `--trust` / `--no-trust`. The built-in non-interactive posture
-is Claude `dontAsk`, or Codex `workspace-write` with approval policy `never`.
+`--debug`, and `--trust` / `--no-trust`. Live session warnings are quiet by
+default; use `--verbose` or `--debug` to see them, including for `elwood models`.
+The built-in non-interactive posture is Claude `dontAsk`, or Codex `workspace-write` with approval policy `never`.
 
 For an unattended run that must never stop on a permission prompt, prefer the
 agent-neutral `--high-trust` over per-agent posture flags. It selects Claude

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@with-logic/elwood",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Control interactive agentic coding CLIs (Claude Code, Codex) through real terminal sessions: typed hooks, a unified activity stream, resumable sessions, and a headless CLI.",
   "license": "MIT",
   "author": "Logic App, Inc.",

package/prd/12a-cli.md

@@ -86,10 +86,12 @@ launch, persona setup, and the user turn. Signal handlers are active before
 launch. The first `SIGINT` requests interruption and cleanup, a repeated
 `SIGINT` force-kills the process tree, and an interrupted invocation exits 130.
 
-A new invocation tears down its Elwood-owned state after every outcome; teardown
-does not undo workspace changes or remove history owned by the underlying agent.
-`--keep` instead preserves it after stop-or-kill cleanup and reports its session
-ID on stderr in text mode. A resume uses `--resume <id>` to load exactly the
+New and resumed headless runs preserve their Elwood-owned state after every
+outcome by default, after stop-or-kill cleanup. `--keep` explicitly selects this
+default. `--ephemeral` instead requests teardown for either a new or resumed
+run; it cannot be combined with `--keep`. Teardown does not undo workspace
+changes or remove history owned by the underlying agent. A preserved run reports
+its resumable session ID on stderr in text mode. A resume uses `--resume <id>` to load exactly the
 stored adapter and cwd; it never falls back to a new conversation, and `--cwd`
 is therefore rejected with `--resume` rather than overriding the stored
 workspace. Explicit adapter conflicts are usage errors. Before launch, resumed state and its cwd MUST satisfy the private,
@@ -117,11 +119,13 @@ stacks, bridge credentials, and terminal escape sequences.
 
 Text is the default output. It writes the combined assistant response — every
 observed assistant text message in order, separated by one blank line — with one
-trailing newline when non-empty and zero bytes for an empty response. Concise,
-sanitized warnings are written to stderr by default for text and JSON runs;
-JSONL represents them only as ordered warning records to avoid duplicate
-diagnostics. `--verbose` adds concise elapsed-time phase, tool-name, and cleanup
-progress to stderr without replaying assistant or thinking text. `--debug` emits
+trailing newline when non-empty and zero bytes for an empty response. Live session
+warnings are quiet by default for text and JSON runs, including model probes.
+`--verbose` enables concise sanitized warnings and elapsed-time phase, tool-name,
+and cleanup progress on stderr without replaying assistant or thinking text.
+`--debug` also enables warnings. JSONL always represents warnings as ordered
+records without duplicating them on stderr. Fatal errors and `sessions` warnings
+about omitted unreadable records remain visible without verbosity. `--debug` emits
 full sanitized normalized event details to stderr and is intended for diagnosis
 rather than routine progress. `--stream` is text-only, emits assistant chunks once with one
 blank line between distinct messages, preserves partial output on failure, and
@@ -345,7 +349,7 @@ and status 1.
 ### 12A.10 Model listing
 
 `elwood models [options] [--output <text|json>]` briefly starts a headless
-session for the selected agent — honoring agent, workspace, model, reasoning
+session for each requested agent — honoring workspace, model, reasoning
 effort, timeout, trust, state directory, and adapter posture with normal
 precedence — waits for readiness, drives the agent's own model picker through
 the public `listModels` operation (which opens and cancels the picker and leaves
@@ -354,7 +358,30 @@ runs no persona turn, uses a fresh session identity under the effective state
 directory, and always tears that identity down, so no Elwood state remains
 afterward. Starting the agent is unavoidable and the help text says so.
 
-Text output is an aligned table with a header row: `*` in the first column marks
+Without an explicit `--agent`, the command MUST probe Claude and then Codex
+sequentially, regardless of `ELWOOD_AGENT` or a saved agent default. Each probe
+uses its own adapter settings; adapter-specific flags and environment posture
+settings apply only to their matching adapter. Shared settings apply to both.
+`--timeout` is one budget for the whole command, including settings resolution
+and preparation. Each probe receives only the remaining budget. Once exhausted,
+the next adapter MUST NOT start; available catalogs remain in the partial result. A failed or unavailable adapter MUST NOT
+hide the other adapter’s available models. SIGINT stops the command and MUST
+NOT launch the next adapter. Every started probe is cleaned up before the next.
+
+For combined listings, text includes an `AGENT` column and per-agent errors go
+to stderr. JSON is exactly one document
+`{ "schemaVersion": 1, "type": "models", "agents": [{ "agent": "...", "models": [...] }], "errors": [...] }`.
+`agents` contains successful catalogs (including empty catalogs), and `errors`
+contains the canonical version-1 error records with agent, error, duration, and
+cleanup fields. Both arrays retain probe order. Status is 0 only if both probes
+succeeded; otherwise interruption (130) takes precedence over timeout (124),
+usage errors (2), and other failures (1). Output-protocol errors and global
+config-file read, parse, or schema errors fail before any probe. Adapter-specific
+setting validation failures are recorded for that adapter and permit the other
+adapter to proceed. An explicit `--agent` preserves the single-agent output
+and error contract below. All model probes remain ephemeral.
+
+Single-agent text output is an aligned table with a header row: `*` in the first column marks
 the current model, followed by the id, label, `(default)` when the row is the
 adapter's default, and the description. JSON output is exactly one version-1
 document `{ "schemaVersion": 1, "type": "models", "agent": "...", "models": [...] }`

package/prd/14-conformance.md

@@ -291,9 +291,9 @@ Each criterion has:
 | C-CLI-05 | §12A.2 | A CLI turn preserves Elwood's real interactive environment and auto-authorizes only its documented trust classes; disabled or unrecognized trust automation fails as `blocked_prompt` without submitting into the dialog. |
 | C-CLI-06 | §12A.2 | Built-in and selected per-agent permission, sandbox, approval, model, effort, and persona settings validate against the effective adapter before launch. |
 | C-CLI-07 | §12A.2 | An optional duration bounds launch, setup, and turn; first and repeated `SIGINT` perform interrupt then force-kill behavior; timeout and interruption exit 124 and 130 respectively. |
-| C-CLI-08 | §12A.2 §12A.5 | New Elwood state tears down unless kept, resumed state preserves unless ephemeral, exact resume never falls back, teardown does not undo workspace/agent-owned state, and persona is one output-discarded but side-effect-capable new-session setup turn that is rejected on resume. |
+| C-CLI-08 | §12A.2 §12A.5 | New and resumed headless state preserves by default; explicit `--keep` selects preservation, `--ephemeral` selects teardown for either, the two flags conflict, exact resume never falls back, teardown does not undo workspace/agent-owned state, and persona is one output-discarded but side-effect-capable new-session setup turn that is rejected on resume. |
 | C-CLI-09 | §12A.2 | Premature agent exit and cleanup failure retain collected response data; cleanup runs once, never replaces a primary failure, and changes otherwise-successful execution to status 1. |
-| C-CLI-10 | §12A.3 | Default text output contains only the combined observed assistant messages with exact separator/newline semantics; text/JSON warnings surface concisely on stderr; verbose emits concise elapsed progress without assistant/thinking duplication; debug detail stays on stderr; and streamed text is emitted once with partial output retained on failure. |
+| C-CLI-10 | §12A.3 | Default text output contains only the combined observed assistant messages with exact separator/newline semantics; text/JSON live session warnings (including model probes) are silent unless verbose or debug is enabled, while JSONL keeps ordered warning records and fatal errors remain visible; verbose emits concise elapsed progress without assistant/thinking duplication; debug detail stays on stderr; and streamed text is emitted once with partial output retained on failure. |
 | C-CLI-11 | §12A.3 | JSON emits one version-1 terminal document and JSONL emits ordered normalized records plus exactly one terminal record, including structured validation errors when explicitly selected; every JSONL record has `elapsedMs` and tool records carry `toolCallId` when available. An error record emitted before any adapter was selected reports `agent: null`; otherwise `agent` is the selected or running adapter. |
 | C-CLI-12 | §12A.3 | Output excludes terminal and secret-bearing internals, honors backpressure, and treats downstream `EPIPE` as graceful consumer closure followed by cleanup. |
 | C-CLI-13 | §12A.4 | Config path resolution follows explicit, absolute XDG, then home fallback order; config is strict version 1 with only documented keys, and project-local config is ignored. |
@@ -309,7 +309,7 @@ Each criterion has:
 | C-CLI-23 | §12A.7 | `elwood resume <id> [options] [prompt...]` is a parse-time rewrite of `elwood run --resume <id>` sharing one resolution/execution path: stored adapter and workspace loading, `--cwd`/explicit-adapter/`--keep`/persona/`--ephemeral` rules, and positional-plus-piped prompt composition are identical; a missing id or an additional `--resume` is a usage error. |
 | C-CLI-24 | §12A.8 | `elwood sessions` lists private, owner-matched session records under the effective state directory without launching an agent, reporting id, adapter, workspace, ISO-8601 `createdAt`/`lastUsedAt`, `resumable`, and socket-presence `live`, ordered by most recent use; unreadable records are skipped with a stderr warning, an empty or absent state directory is a status-0 empty listing (stderr notice in text, empty array in JSON), text is an aligned header table, JSON is one version-1 `sessions` document, and JSONL, prompt words, or other run options are usage errors. |
 | C-CLI-25 | §12A.9 | `elwood interactive [id]` spawns the selected agent's own CLI in the foreground with inherited stdio, no PTY/bridge/automation/state, `SIGINT` passed through, and the agent's exit status; it fails with status 2 before spawning without terminal stdin and stdout or with `--output json|jsonl`, `--stream`, `--verbose`, `--debug`, `--head`, `--timeout`, `--persona`, `--image`, `--keep`, `--ephemeral`, `--resume`, or extra positionals; explicitly selected agent, model, effort, workspace, and posture map through the adapters' shared launch-argument builders while built-in posture defaults are omitted; and `[id]` loads the stored record with `--resume` semantics, merges stored posture field by field, and passes the agent's own conversation id or fails as `resume_unavailable`. |
-| C-CLI-26 | §12A.10 | `elwood models` starts a fresh headless session with normal setting precedence, lists models through the public picker operation without changing the model, always tears the session and its state down, prints an aligned table (`*` current, `(default)`) or one version-1 `models` document of `AgentModelOption` rows, maps timeout/interruption/blocked-prompt/agent-exit/picker failures to the existing error conventions and statuses, and rejects stream, head, persona, image, keep, resume, ephemeral, positional, and JSONL inputs as usage errors. |
+| C-CLI-26 | §12A.10 | `elwood models` without explicit `--agent` probes Claude then Codex sequentially despite environment/config agent defaults, associates each catalog with its adapter, applies each adapter’s settings and one shared timeout budget, retains partial successes alongside per-agent errors in one aggregate JSON document or an AGENT-column table, exits nonzero on incomplete results, and stops before launching another adapter after SIGINT. Explicit `--agent` preserves the single-agent contract: it starts a fresh headless session with normal setting precedence, lists models through the public picker operation without changing the model, always tears the session and its state down, prints an aligned table (`*` current, `(default)`) or one version-1 `models` document of `AgentModelOption` rows, maps timeout/interruption/blocked-prompt/agent-exit/picker failures to the existing error conventions and statuses, and rejects stream, head, persona, image, keep, resume, ephemeral, positional, and JSONL inputs as usage errors. |
 
 #### C-E2E: Real Adapter Flows (§12)