@martini-film/cli 0.1.0 → 0.2.0

package/README.md

@@ -7,7 +7,7 @@ in. One HTTPS request per call, a static key, no MCP session.
 
 ```bash
 npx @martini-film/cli --help                    # or: pnpm add -g @martini-film/cli → martini
-martini login                                   # pair this device through the browser (90-day key)
+martini login                                   # pair this device through the browser (90-day key); --no-wait to return at once, rerun to collect
 martini get_board_overview --project <id>       # any MCP tool, flags from its arguments
 martini get_asset --asset-id <id> --fields asset.status,asset.imageUrl
 martini upload ./ref.png ./take.mp4 --canvas <id>
@@ -19,16 +19,20 @@ martini probe <path|asset-id>…                  # duration, resolution, fps, c
 
 ## How commands are generated
 
-`martini <tool>` exists for every entry of the tool manifest (`src/generated/manifest.json`), which the backend
-exports from its MCP registry (`pnpm --dir backend run export:tool-manifest`) and drift-tests against the live
-registry. Flags are derived from each tool's JSON Schema: `assetId` becomes `--asset-id`, arrays repeat the flag
-(or take a JSON list), objects take JSON, and `--json '{…}'` / `--json @args.json` passes the whole arguments
-object — so a plan a script computed is submitted without retyping it. `martini <tool> --help` prints the tool's
-own description, every flag with its type and whether it is required, and one example.
+`martini <tool>` exists for every entry of the tool manifest the build carries — the same list the Martini
+MCP server publishes; `martini tools` says when the server has a newer one. Flags are derived from each tool's JSON Schema: `assetId` becomes `--asset-id`, arrays repeat the flag
+(or take a JSON list), objects take JSON, a `string | null` argument takes the literal `null` to clear it, a
+`"start" | "end" | {…}` union takes the bare word, and `--args '{…}'` / `--args @args.json` passes the whole
+arguments object (`--json` is an alias, except on a tool whose own argument is named `json`) — so a plan a script
+computed is submitted without retyping it. `--no-context` sends only what you typed, for tools that refuse a
+`projectId` next to another selector. `martini <tool> --help` prints the tool's own description, every flag with
+its type and whether it is required, the result fields when the tool declares them (as `--fields` paths), and one
+example.
 
 `projectId`, `canvasId`, and `runId` are filled from context when a tool takes them and the caller did not say:
 `--project` / `--canvas` / `--run`, else `MARTINI_PROJECT_ID` / `MARTINI_CANVAS_ID` / `MARTINI_RUN_ID`, else the
-config file.
+config file. A typed selector that replaces one of them keeps it out (`get_board_overview --project-query`,
+`run_workflow --workflow-id`, which runs a saved workflow on a canvas of its own).
 
 ## Credentials and context
 
@@ -37,7 +41,10 @@ Most specific first:
 1. Flags: `--api-key`, `--api-url`, `--profile`.
 2. Environment: `MARTINI_API_KEY`, `MARTINI_API_URL`, `MARTINI_PROFILE`, `MARTINI_CONFIG_FILE`.
 3. The nearest `.martini/config.json` above the working directory — what a workflow run's sandbox has.
-4. `~/.config/martini/config.json` — the profiles `martini login` saves, one per organization, with a default.
+4. `~/.config/martini/config.json` — the profiles `martini login` saves, one per organization (named after it, `test-team`), with a default.
+
+`--project-id`, `--canvas-id`, and `--run-id` (the tools' spelling) are accepted wherever `--project`, `--canvas`,
+and `--run` are.
 
 A workflow run's sandbox therefore needs nothing but its working directory; a laptop needs one `martini login`;
 a script sets `MARTINI_API_KEY`. A raw Martini API key (`mtn_live_…`) always works.
@@ -45,7 +52,10 @@ a script sets `MARTINI_API_KEY`. A raw Martini API key (`mtn_live_…`) always w
 ## Output and exit codes
 
 Results are JSON on stdout — compact when piped, indented on a terminal. `--fields a,b.c` keeps only those
-dotted paths, applied on the server so a large listing never crosses the wire. `--out <path>` writes the result
+dotted paths, applied on the server so a large listing never crosses the wire; a `*` segment steps into every value of
+an id-keyed map (`assets.*.status`) and is applied in the CLI. With `--wait` (including default
+waits), the CLI keeps the submission identifiers for polling and applies `--fields` to the final result.
+`--out <path>` writes the result
 (or, with `--raw`, the media bytes of tools like `view_asset`) to a file and prints one summary line. `--quiet`
 prints nothing on success. Errors are one JSON object on stderr: `{ "error": { "code", "message", "hint", "tool",
 "exitCode" } }`, with the tool's own MCP error code (`ASSET_NOT_READY`, `NODE_NOT_FOUND`, …).
@@ -63,14 +73,30 @@ prints nothing on success. Errors are one JSON object on stderr: `{ "error": { "
 
 Generation and rendering are asynchronous. `--wait` blocks until the produced assets (or the render) settle and
 adds `waited` to the result; it is on by default for single-item generation and rendering tools and off for batch
-tools, where you fan out and then `martini wait <ids…>` once. `--timeout <seconds>` (default 50, under the 60 s a
-sandbox command has) ends the wait with exit 4 and the pending ids, so the next command can resume it.
+tools, where you fan out and then `martini wait <ids…>` once. `waited` has one shape whatever was waited on:
+`{ kind, status, assets? | job? | run? | delivery? }` — `status` is the terminal status (for assets, `failed` when
+any failed) and the settled records sit under the key that names them; `martini wait` prints the same object.
+`--timeout <seconds>` (default `MARTINI_WAIT_TIMEOUT_SECONDS` when set, else 50; a malformed value is a usage error) ends the wait with exit 4: the
+result the command produced is still printed on stdout, with `pending` (and `settled`) ids, and the error on
+stderr names the `martini wait …` command that resumes it. Size `--timeout` to what your shell step allows — a
+video generation takes minutes.
+
+## Approving a quote
+
+`generate_nodes`, `upscale_assets`, and `enhance_draft` answer a quote first (`approvalNeeded: true`, `planHash`,
+the estimated olives) and start nothing until called again with that `planHash` (plus `batchRequestId` for
+upscales) and the approval argument. `--approve --max-olives <n>` does both in one command: it takes the quote,
+refuses when the estimated total is over the cap (`PLAN_OVER_BUDGET`) or has no number (`PLAN_UNPRICED`), with
+the quote on stdout and nothing started, and otherwise re-calls the tool with exactly what it asked for; the
+result carries `approvedPlan`. The cap is required: an approval always states how much it is for. A tool with an
+approval argument but no quote step (`create_nodes_and_generate`) is only attested by `--approve` and cannot be
+capped — for a capped batch, `create_nodes` then `generate_nodes --approve --max-olives <n>`.
 
 ## Compound commands
 
 | Command                              | Does                                                                                                  |
 | ------------------------------------ | ----------------------------------------------------------------------------------------------------- |
-| `login`, `logout`, `whoami`          | device-code pairing, forget a profile, who the CLI acts as                                            |
+| `login`, `logout`, `whoami`          | device-code pairing (a started pairing is resumed by running `login` again; `--no-wait` returns at once), forget a profile, who the CLI acts as |
 | `tools`, `models`                    | the manifest this build knows (and whether the server has a newer one); the cached model catalog       |
 | `upload <paths…>`                    | prepare → PUT → complete from local files, then wait for processing                                   |
 | `download <ids…>`                    | presigned URL → bytes → file                                                                          |
@@ -89,8 +115,7 @@ executing answers `RUN_NOT_ACTIVE` (exit 4).
 ## Single-file binary
 
 `pnpm run build:binary` compiles `dist/bin.js` into `dist/martini-linux-x64` with Bun for environments without
-Node (the agent-environment sandbox). Bun is only needed on the build machine. Every `cli-v<version>` tag builds
-it in CI and publishes it at `https://downloads.martini.film/cli-releases/<version>/martini-linux-x64`
-(`.github/workflows/cli-release.yml`); the npm package is published by hand (`AGENTS.md` → Releasing).
+Node (the agent-environment sandbox). Bun is only needed on the build machine. Every release publishes it at `https://downloads.martini.film/cli-releases/<version>/martini-linux-x64`;
+the npm package is published separately.
 
 Docs: <https://www.martini.film/docs/cli>.

package/dist/api.js

@@ -1,17 +1,10 @@
-/**
- * The wire: one HTTPS request per call against the API-key surface —
- * `POST /v1/tools/{name}` for every tool, `/v1/tools` for the manifest,
- * `/v1/me`, and the two login routes. Static key, no session. The CLI names
- * itself with `X-Martini-Client` and a User-Agent that also carries the host
- * agent it runs inside, so analytics can tell "the CLI under Claude Code" from
- * "Claude Code over MCP".
- */
 import { detectHostAgent } from './host.js';
-export const CLI_VERSION = '0.1.0';
+export const CLI_VERSION = '0.2.0';
 export class CliApiError extends Error {
     code;
     status;
     tool;
+    result;
     constructor(message, details) {
         super(message);
         this.name = 'CliApiError';
@@ -35,6 +28,10 @@ export function createApiClient(config, options = {}) {
         };
         if (config.apiKey)
             base.Authorization = `Bearer ${config.apiKey}`;
+        if (config.workerId)
+            base['X-Martini-Worker'] = config.workerId;
+        if (config.executionId)
+            base['X-Martini-Execution'] = config.executionId;
         return base;
     }
     async function readError(response, tool) {
@@ -44,7 +41,11 @@ export function createApiClient(config, options = {}) {
             body = JSON.parse(text);
         }
         catch {
-            body = { error: text };
+            const html = /^\s*<(!doctype|html)/i.test(text);
+            const title = html ? /<title>([^<]*)<\/title>/i.exec(text)?.[1]?.trim() : undefined;
+            body = {
+                error: html ? `The API did not answer (HTTP ${response.status}${title ? `: ${title}` : ''}). Try again.` : text,
+            };
         }
         const message = typeof body.error === 'string' && body.error ? body.error : `Request failed (${response.status})`;
         return new CliApiError(message, {
@@ -77,7 +78,6 @@ export function createApiClient(config, options = {}) {
     }
     return {
         config,
-        /** `POST /v1/tools/{name}` → the tool's JSON result. */
         async callTool(name, args, options = {}) {
             requireKey();
             const query = new URLSearchParams();
@@ -91,7 +91,6 @@ export function createApiClient(config, options = {}) {
                 ...(options.signal ? { signal: options.signal } : {}),
             });
         },
-        /** `POST /v1/tools/{name}?format=raw` → the media bytes of a single-media result. */
         async callToolRaw(name, args) {
             requireKey();
             const response = await fetchImpl(`${config.apiUrl}/v1/tools/${encodeURIComponent(name)}?format=raw`, {
@@ -131,7 +130,6 @@ export function createApiClient(config, options = {}) {
         async pollLogin(pollToken) {
             return requestJson(`/v1/cli/login/${encodeURIComponent(pollToken)}`, { method: 'GET' });
         },
-        /** A plain GET of an absolute URL (presigned downloads), with no Martini headers. */
         async fetchBytes(url) {
             const response = await fetchImpl(url);
             if (!response.ok) {
@@ -145,7 +143,6 @@ export function createApiClient(config, options = {}) {
                 contentType: response.headers.get('content-type') ?? 'application/octet-stream',
             };
         },
-        /** A plain PUT of bytes to a presigned URL with the exact headers the server signed. */
         async putBytes(url, bytes, putHeaders) {
             const response = await fetchImpl(url, { method: 'PUT', headers: putHeaders, body: bytes });
             if (!response.ok) {

package/dist/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAG3C,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAA;AAElC,MAAM,OAAO,WAAY,SAAQ,KAAK;IAC3B,IAAI,CAAQ;IACZ,MAAM,CAAQ;IACd,IAAI,CAAe;IAC5B,YAAY,OAAe,EAAE,OAA+D;QAC1F,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,aAAa,CAAA;QACzB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;QACxB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;QAC5B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,CAAA;IAClC,CAAC;CACF;AAmBD,MAAM,UAAU,SAAS,CAAC,MAAyB,OAAO,CAAC,GAAG;IAC5D,MAAM,IAAI,GAAG,eAAe,CAAC,GAAG,CAAC,CAAA;IACjC,OAAO,eAAe,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;AAChE,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAAsB,EAAE,UAA4B,EAAE;IACpF,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,IAAI,KAAK,CAAA;IACxC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAA;IAEtC,SAAS,OAAO,CAAC,QAAgC,EAAE;QACjD,MAAM,IAAI,GAA2B;YACnC,YAAY,EAAE,SAAS,CAAC,GAAG,CAAC;YAC5B,kBAAkB,EAAE,eAAe,WAAW,EAAE;YAChD,GAAG,KAAK;SACT,CAAA;QACD,IAAI,MAAM,CAAC,MAAM;YAAE,IAAI,CAAC,aAAa,GAAG,UAAU,MAAM,CAAC,MAAM,EAAE,CAAA;QACjE,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,UAAU,SAAS,CAAC,QAAkB,EAAE,IAAa;QACxD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QAClC,IAAI,IAAI,GAAwD,EAAE,CAAA;QAClE,IAAI,CAAC;YACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAgB,CAAA;QACxC,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;QACxB,CAAC;QACD,MAAM,OAAO,GAAG,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,mBAAmB,QAAQ,CAAC,MAAM,GAAG,CAAA;QACjH,OAAO,IAAI,WAAW,CAAC,OAAO,EAAE;YAC9B,IAAI,EAAE,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB;YAClE,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,IAAI,EAAE,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC;SACjE,CAAC,CAAA;IACJ,CAAC;IAED,SAAS,UAAU;QACjB,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,IAAI,WAAW,CAAC,gEAAgE,EAAE;gBACtF,IAAI,EAAE,YAAY;gBAClB,MAAM,EAAE,CAAC;aACV,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,KAAK,UAAU,WAAW,CAAI,IAAY,EAAE,OAAwC,EAAE;QACpF,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,IAAI,EAAE,EAAE;YAC1D,GAAG,IAAI;YACP,OAAO,EAAE,OAAO,CAAC;gBACf,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5D,GAAI,IAAI,CAAC,OAA8C;aACxD,CAAC;SACH,CAAC,CAAA;QACF,IAAI,CAAC,QAAQ,CAAC,EAAE;YAAE,MAAM,MAAM,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;QAC5D,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG;YAAE,OAAO,SAAc,CAAA;QAClD,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAM,CAAA;IACrC,CAAC;IAED,OAAO;QACL,MAAM;QAEN,wDAAwD;QACxD,KAAK,CAAC,QAAQ,CACZ,IAAY,EACZ,IAA6B,EAC7B,UAA2B,EAAE;YAE7B,UAAU,EAAE,CAAA;YACZ,MAAM,KAAK,GAAG,IAAI,eAAe,EAAE,CAAA;YACnC,IAAI,OAAO,CAAC,MAAM,EAAE,MAAM;gBAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;YACzE,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;YAChD,OAAO,WAAW,CAAI,aAAa,kBAAkB,CAAC,IAAI,CAAC,GAAG,MAAM,EAAE,EAAE;gBACtE,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;gBAC1B,IAAI,EAAE,IAAI;gBACV,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACtD,CAAC,CAAA;QACJ,CAAC;QAED,qFAAqF;QACrF,KAAK,CAAC,WAAW,CAAC,IAAY,EAAE,IAA6B;YAC3D,UAAU,EAAE,CAAA;YACZ,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,MAAM,CAAC,MAAM,aAAa,kBAAkB,CAAC,IAAI,CAAC,aAAa,EAAE;gBACnG,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,OAAO,CAAC,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC;gBACxD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aAC3B,CAAC,CAAA;YACF,IAAI,CAAC,QAAQ,CAAC,EAAE;gBAAE,MAAM,MAAM,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;YACvD,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;YAChE,IAAI,IAAI,GAAY,IAAI,CAAA;YACxB,IAAI,UAAU,EAAE,CAAC;gBACf,IAAI,CAAC;oBACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;gBAC/B,CAAC;gBAAC,MAAM,CAAC;oBACP,IAAI,GAAG,UAAU,CAAA;gBACnB,CAAC;YACH,CAAC;YACD,OAAO;gBACL,KAAK,EAAE,IAAI,UAAU,CAAC,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;gBACnD,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,0BAA0B;gBAC/E,IAAI;aACL,CAAA;QACH,CAAC;QAED,KAAK,CAAC,SAAS;YACb,UAAU,EAAE,CAAA;YACZ,OAAO,WAAW,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;QACpD,CAAC;QAED,KAAK,CAAC,EAAE;YAKN,UAAU,EAAE,CAAA;YACZ,OAAO,WAAW,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;QACjD,CAAC;QAED,KAAK,CAAC,UAAU,CAAC,WAAmB;YAOlC,OAAO,WAAW,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAA;QAChG,CAAC;QAED,KAAK,CAAC,SAAS,CACb,SAAiB;YAMjB,OAAO,WAAW,CAAC,iBAAiB,kBAAkB,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;QACzF,CAAC;QAED,qFAAqF;QACrF,KAAK,CAAC,UAAU,CAAC,GAAW;YAC1B,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,CAAA;YACrC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,WAAW,CAAC,oBAAoB,QAAQ,CAAC,MAAM,IAAI,EAAE;oBAC7D,IAAI,EAAE,iBAAiB;oBACvB,MAAM,EAAE,QAAQ,CAAC,MAAM;iBACxB,CAAC,CAAA;YACJ,CAAC;YACD,OAAO;gBACL,KAAK,EAAE,IAAI,UAAU,CAAC,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;gBACnD,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,0BAA0B;aAChF,CAAA;QACH,CAAC;QAED,wFAAwF;QACxF,KAAK,CAAC,QAAQ,CAAC,GAAW,EAAE,KAAiB,EAAE,UAAkC;YAC/E,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,KAA4B,EAAE,CAAC,CAAA;YACjH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,WAAW,CAAC,sBAAsB,QAAQ,CAAC,MAAM,IAAI,EAAE;oBAC/D,IAAI,EAAE,mBAAmB;oBACzB,MAAM,EAAE,QAAQ,CAAC,MAAM;iBACxB,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}

package/dist/approve.js

@@ -0,0 +1,83 @@
+import { CliApiError } from './api.js';
+import { ArgumentError, kebab } from './schema.js';
+export function approvalSupport(tool) {
+    const properties = tool.inputSchema.properties ?? {};
+    const argument = 'batchApproval' in properties ? 'batchApproval' : 'approval' in properties ? 'approval' : null;
+    if (!argument)
+        return null;
+    return {
+        kind: 'planHash' in properties ? 'quote' : 'attest',
+        argument,
+        echoesBatchRequestId: 'batchRequestId' in properties,
+    };
+}
+export function isQuote(result) {
+    if (!result || typeof result !== 'object' || Array.isArray(result))
+        return false;
+    const record = result;
+    return record.approvalNeeded === true || record.generated === false;
+}
+function quotedOlives(quote) {
+    const total = quote.totalEstimatedOlives ?? quote.estimatedOlives;
+    return typeof total === 'number' && Number.isFinite(total) ? total : null;
+}
+function itemCount(quote, args) {
+    if (Array.isArray(quote?.items))
+        return quote.items.length;
+    for (const key of ['nodeIds', 'nodes'])
+        if (Array.isArray(args[key]))
+            return args[key].length;
+    return 1;
+}
+export async function runWithApproval(tool, client, args, support, options) {
+    const { maxOlives } = options;
+    if (support.kind === 'attest') {
+        if (maxOlives !== undefined) {
+            throw new ArgumentError(`${tool.name} has no quote step, so --max-olives cannot be enforced on it. For a capped batch, create the drafts (create_nodes) and run generate_nodes --approve --max-olives ${maxOlives}.`);
+        }
+        const count = itemCount(undefined, args);
+        const summary = `Approved by martini CLI --approve: ${count} item(s), no server quote.`;
+        const approval = support.argument === 'batchApproval' ? { approved: true, summary, itemCount: count } : { approved: true, summary };
+        return client.callTool(tool.name, { ...args, [support.argument]: approval });
+    }
+    if (maxOlives === undefined) {
+        throw new ArgumentError(`--approve needs --max-olives <olives> on ${tool.name}: the quote is approved only when its estimated total is at or under that cap.`);
+    }
+    const quote = await client.callTool(tool.name, args);
+    if (!isQuote(quote))
+        return quote;
+    const total = quotedOlives(quote);
+    if (total === null) {
+        const error = new CliApiError(`${tool.name} quoted no total (an item has no server-side estimate), so --max-olives ${maxOlives} cannot be checked; nothing was started. Approve by hand: re-run with --plan-hash and --${kebab(support.argument)}.`, { code: 'PLAN_UNPRICED', status: 0, tool: tool.name });
+        error.result = quote;
+        throw error;
+    }
+    if (total > maxOlives) {
+        const error = new CliApiError(`${tool.name} quoted ${total} olives, over the --max-olives ${maxOlives} cap; nothing was started.`, { code: 'PLAN_OVER_BUDGET', status: 0, tool: tool.name });
+        error.result = quote;
+        throw error;
+    }
+    const count = itemCount(quote, args);
+    const summary = `Approved by martini CLI --approve: ${count} item(s), ${total} olives estimated, cap ${maxOlives}.`;
+    const approval = support.argument === 'batchApproval'
+        ? { approved: true, summary, itemCount: count, estimatedTotalCost: String(total) }
+        : { approved: true, summary, estimatedCost: String(total) };
+    const batchRequestId = support.echoesBatchRequestId && typeof quote.batchRequestId === 'string' ? quote.batchRequestId : undefined;
+    const result = await client.callTool(tool.name, {
+        ...args,
+        planHash: quote.planHash,
+        ...(batchRequestId ? { batchRequestId } : {}),
+        [support.argument]: approval,
+    });
+    const approvedPlan = {
+        planHash: quote.planHash,
+        ...(batchRequestId ? { batchRequestId } : {}),
+        itemCount: count,
+        estimatedOlives: total,
+        maxOlives,
+    };
+    return result && typeof result === 'object' && !Array.isArray(result)
+        ? { ...result, approvedPlan }
+        : { result, approvedPlan };
+}
+//# sourceMappingURL=approve.js.map

package/dist/approve.js.map

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

package/dist/args.js

@@ -1,8 +1,4 @@
-/**
- * Argument parsing without a framework: `martini <command> [positionals] [--flag value | --flag=value | --bool]`.
- * Repeated flags collect into arrays. Everything after `--` is positional.
- */
-export function parseArgs(argv) {
+export function parseArgs(argv, isBoolean = () => false) {
     const flags = new Map();
     const positionals = [];
     let command;
@@ -43,7 +39,8 @@ export function parseArgs(argv) {
                 continue;
             }
             const next = argv[i + 1];
-            if (next !== undefined && !next.startsWith('--')) {
+            const boolean = isBoolean(body, command);
+            if (next !== undefined && !next.startsWith('--') && (!boolean || /^(true|false|1|0|yes|no)$/.test(next))) {
                 push(body, next);
                 i += 1;
             }
@@ -59,7 +56,6 @@ export function parseArgs(argv) {
     }
     return { command, positionals, flags };
 }
-/** One value for a flag, or undefined; an array flag yields its last value. */
 export function flagString(flags, name) {
     const value = flags.get(name);
     if (value === undefined || value === true)

package/dist/args.js.map

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

package/dist/cli.js

@@ -1,22 +1,17 @@
-/**
- * The dispatcher. A command is either one of the compound commands (what no
- * single tool does) or any tool from the manifest by its MCP name — the same
- * vocabulary agents already know from the MCP, so nothing has to be translated
- * (docs/plans/agent-cli.md, decision 18).
- */
-import { createApiClient } from './api.js';
+import { CliApiError, createApiClient } from './api.js';
+import { approvalSupport, runWithApproval } from './approve.js';
 import { flagBoolean, flagString, parseArgs } from './args.js';
 import { download, upload, wait } from './commands/assets.js';
-import { selectedFields, timeoutMs, wantsWait } from './commands/context.js';
+import { assertKnownFlags, compoundBooleanFlags, CONTEXT_FLAG_ALIASES, needsLocalProjection, selectedFields, timeoutMs, wantsWait, } from './commands/context.js';
 import { files } from './commands/files.js';
 import { login, logout, whoami } from './commands/login.js';
 import { init, models, probe, tools, version } from './commands/tools.js';
 import { resolveConfig } from './config.js';
-import { renderHelp, renderToolHelp } from './help.js';
+import { renderCompoundHelp, renderHelp, renderToolHelp } from './help.js';
 import { findTool, loadManifest } from './manifest.js';
-import { EXIT, printBytes, printError, printResult } from './output.js';
-import { ArgumentError, buildArguments } from './schema.js';
-import { producedAssetIds, waitForAssets, waitForDelivery } from './wait.js';
+import { EXIT, printBytes, printError, printResult, selectFields, warnNoFieldsMatched, } from './output.js';
+import { ArgumentError, buildArguments, flagSpecs } from './schema.js';
+import { assetsOutcome, handleOutcome, producedAssetIds, waitForAssets, waitForDelivery, waitForJob, waitForRun, WaitTimeoutError, } from './wait.js';
 export const COMPOUND_COMMANDS = [
     login,
     logout,
@@ -31,7 +26,6 @@ export const COMPOUND_COMMANDS = [
     init,
     version,
 ];
-/** Flags the dispatcher owns; a tool never sees them as arguments. */
 export const GLOBAL_FLAG_NAMES = new Set([
     'help',
     'version',
@@ -47,8 +41,15 @@ export const GLOBAL_FLAG_NAMES = new Set([
     'api-key',
     'api-url',
     'profile',
+    'context',
+    'approve',
+    'max-olives',
+]);
+const TOOL_ONLY_GLOBAL_FLAGS = new Set(['approve', 'max-olives']);
+const GLOBAL_FLAGS_FOR_COMPOUNDS = new Set([
+    ...[...GLOBAL_FLAG_NAMES].filter(flag => !TOOL_ONLY_GLOBAL_FLAGS.has(flag)),
+    ...CONTEXT_FLAG_ALIASES,
 ]);
-/** Single-item generation and rendering block by default; batches fan out and `martini wait` later (decision 5). */
 const WAIT_BY_DEFAULT = new Set([
     'create_node_and_generate',
     'generate',
@@ -57,7 +58,7 @@ const WAIT_BY_DEFAULT = new Set([
     'upscale_assets',
     'render_blender_take',
 ]);
-const RENDER_TOOLS = new Set(['render_timeline']);
+const BOOLEAN_GLOBAL_FLAGS = new Set(['help', 'version', 'wait', 'quiet', 'raw', 'context', 'approve']);
 export async function main(options) {
     const env = options.env ?? process.env;
     const cwd = options.cwd ?? process.cwd();
@@ -66,36 +67,47 @@ export async function main(options) {
         ...(options.stderr ? { stderr: options.stderr } : {}),
         ...(options.isTTY !== undefined ? { isTTY: options.isTTY } : {}),
     };
-    const parsed = parseArgs(options.argv);
     const manifest = options.manifest ?? loadManifest();
+    const parsed = parseArgs(options.argv, (flag, command) => {
+        if (BOOLEAN_GLOBAL_FLAGS.has(flag))
+            return true;
+        const compound = COMPOUND_COMMANDS.find(candidate => candidate.name === command);
+        if (compound)
+            return compoundBooleanFlags(compound).includes(flag);
+        const tool = command ? findTool(command, manifest) : undefined;
+        return tool ? flagSpecs(tool).some(spec => spec.flag === flag && spec.kind === 'boolean') : false;
+    });
     try {
+        if (flagBoolean(parsed.flags, 'version') && parsed.command === undefined)
+            parsed.command = 'version';
         if (parsed.command === undefined ||
             parsed.command === 'help' ||
             (flagBoolean(parsed.flags, 'help') && !parsed.command)) {
             printResult(renderHelp(manifest, COMPOUND_COMMANDS), output);
             return EXIT.ok;
         }
-        if (parsed.command === '--version' || (flagBoolean(parsed.flags, 'version') && parsed.command === undefined)) {
-            parsed.command = 'version';
-        }
         const compound = COMPOUND_COMMANDS.find(command => command.name === parsed.command);
         const tool = compound ? undefined : findTool(parsed.command, manifest);
         if (!compound && !tool) {
             throw new ArgumentError(`Unknown command "${parsed.command}". Run martini --help for the list.`);
         }
         if (flagBoolean(parsed.flags, 'help')) {
-            printResult(tool ? renderToolHelp(tool) : `${compound.usage}\n\n${compound.summary}\n`, output);
+            printResult(tool ? renderToolHelp(tool) : renderCompoundHelp(compound), output);
             return EXIT.ok;
         }
+        if (compound)
+            assertKnownFlags(compound, parsed.flags, GLOBAL_FLAGS_FOR_COMPOUNDS);
         const config = resolveConfig(parsed.flags, { env, cwd });
-        const client = (options.createClient ??
-            (resolved => createApiClient(resolved, { ...(options.fetch ? { fetch: options.fetch } : {}), env })))(config);
+        const clientFor = options.createClient ??
+            (resolved => createApiClient(resolved, { ...(options.fetch ? { fetch: options.fetch } : {}), env }));
         const out = flagString(parsed.flags, 'out');
         if (out)
             output.out = out;
+        output.inRun = Boolean(config.runId);
         output.quiet = flagBoolean(parsed.flags, 'quiet') ?? false;
         const context = {
-            client,
+            client: clientFor(config),
+            clientFor,
             config,
             manifest,
             flags: parsed.flags,
@@ -106,58 +118,122 @@ export async function main(options) {
             now: options.now ?? Date.now,
             sleep: options.sleep ?? (ms => new Promise(resolve => setTimeout(resolve, ms))),
         };
+        const select = selectedFields(context);
+        timeoutMs(context);
         if (compound) {
             const result = await compound.run(context);
-            printResult(result, output);
+            const projected = select.length && result && typeof result === 'object' ? selectFields(result, select) : result;
+            warnNoFieldsMatched(projected, select, output);
+            printResult(projected, output);
             return EXIT.ok;
         }
-        printResult(await runTool(tool, context, parsed.flags), output);
+        const result = await runTool(tool, context, parsed.flags);
+        warnNoFieldsMatched(result, select, output, knownResultFields(tool));
+        printResult(result, output);
         return EXIT.ok;
     }
     catch (error) {
+        if (error instanceof CliApiError && error.result !== undefined)
+            printResult(error.result, output);
         return printError(error, output);
     }
 }
 async function runTool(tool, context, flags) {
+    const properties = tool.inputSchema.properties ?? {};
+    const ignore = new Set(GLOBAL_FLAG_NAMES);
+    for (const alias of CONTEXT_FLAG_ALIASES) {
+        if (!(alias.replace(/-id$/, 'Id') in properties))
+            ignore.add(alias);
+    }
+    const useContext = flagBoolean(flags, 'context') !== false;
     const args = buildArguments(tool, flags, {
-        ignore: GLOBAL_FLAG_NAMES,
-        context: {
-            ...(context.config.projectId ? { projectId: context.config.projectId } : {}),
-            ...(context.config.canvasId ? { canvasId: context.config.canvasId } : {}),
-            ...(context.config.runId ? { runId: context.config.runId } : {}),
-        },
+        ignore,
+        context: useContext
+            ? {
+                ...(context.config.projectId ? { projectId: context.config.projectId } : {}),
+                ...(context.config.canvasId ? { canvasId: context.config.canvasId } : {}),
+                ...(context.config.runId ? { runId: context.config.runId } : {}),
+            }
+            : {},
     });
     if (flagBoolean(flags, 'raw')) {
         const raw = await context.client.callToolRaw(tool.name, args);
         printBytes(raw.bytes, { ...context.output, contentType: raw.contentType });
-        // The bytes are the result; nothing else goes to the file or stdout.
         delete context.output.out;
         context.output.quiet = true;
         return raw.meta;
     }
     const select = selectedFields(context);
-    const result = await context.client.callTool(tool.name, args, select.length ? { select } : {});
-    if (!wantsWait(context, WAIT_BY_DEFAULT.has(tool.name)))
-        return result;
+    const shouldWait = wantsWait(context, WAIT_BY_DEFAULT.has(tool.name));
+    const approve = approvalFlags(tool, flags);
+    const local = shouldWait || approve !== null || needsLocalProjection(select);
+    const result = approve
+        ? await runWithApproval(tool, context.client, args, approve.support, approve.maxOlives === undefined ? {} : { maxOlives: approve.maxOlives })
+        : await context.client.callTool(tool.name, args, !local && select.length ? { select } : {});
+    if (!shouldWait)
+        return local ? selectFields(result, select) : result;
     const projectId = typeof args.projectId === 'string' ? args.projectId : context.config.projectId;
-    if (!projectId)
-        return result;
-    const waitOptions = { timeoutMs: timeoutMs(context), now: context.now, sleep: context.sleep };
-    if (RENDER_TOOLS.has(tool.name)) {
-        const renderId = result?.renderId;
-        if (typeof renderId === 'string') {
-            const delivery = await waitForDelivery(context.client, projectId, { renderId }, waitOptions);
-            return { ...result, delivery };
+    try {
+        return selectFields(await waitForToolResult(result, context, projectId), select);
+    }
+    catch (error) {
+        if (error instanceof CliApiError) {
+            const kept = selectFields(result, select);
+            const base = kept && typeof kept === 'object' && !Array.isArray(kept) ? kept : { result: kept };
+            error.result =
+                error instanceof WaitTimeoutError
+                    ? { ...base, pending: error.pending, ...(error.settled.length ? { settled: error.settled } : {}) }
+                    : { ...base, waitError: error.code };
         }
+        throw error;
+    }
+}
+async function waitForToolResult(result, context, projectId) {
+    if (!result || typeof result !== 'object')
         return result;
+    const record = result;
+    if (record.approvalNeeded === true || record.generated === false)
+        return result;
+    const waitOptions = { timeoutMs: timeoutMs(context), now: context.now, sleep: context.sleep };
+    if (typeof record.runId === 'string') {
+        return { ...record, waited: handleOutcome('run', await waitForRun(context.client, record.runId, waitOptions)) };
+    }
+    if (typeof record.renderId === 'string' || typeof record.exportId === 'string') {
+        const ids = {
+            ...(typeof record.renderId === 'string' ? { renderId: record.renderId } : {}),
+            ...(typeof record.exportId === 'string' ? { exportId: record.exportId } : {}),
+        };
+        return { ...record, waited: handleOutcome('render', await waitForDelivery(context.client, ids, waitOptions)) };
+    }
+    if (typeof record.jobId === 'string') {
+        return { ...record, waited: handleOutcome('job', await waitForJob(context.client, record.jobId, waitOptions)) };
     }
+    if (!projectId)
+        return result;
     const ids = producedAssetIds(result);
     if (ids.length === 0)
         return result;
-    const assets = await waitForAssets(context.client, projectId, ids, waitOptions);
-    return {
-        ...(typeof result === 'object' && result ? result : { result }),
-        waited: assets,
-    };
+    return { ...record, waited: assetsOutcome(await waitForAssets(context.client, projectId, ids, waitOptions)) };
+}
+function approvalFlags(tool, flags) {
+    const approve = flagBoolean(flags, 'approve') === true;
+    const rawMax = flagString(flags, 'max-olives');
+    if (!approve && rawMax === undefined)
+        return null;
+    const support = approvalSupport(tool);
+    if (!support) {
+        throw new ArgumentError(`${tool.name} takes no approval; --approve and --max-olives apply to generate_nodes, upscale_assets, enhance_draft, and the tools with an approval argument (see --help).`);
+    }
+    if (!approve)
+        throw new ArgumentError('--max-olives only applies together with --approve.');
+    if (rawMax === undefined)
+        return { support };
+    const maxOlives = Number(rawMax);
+    if (!Number.isFinite(maxOlives) || maxOlives < 0)
+        throw new ArgumentError('--max-olives must be a number of olives.');
+    return { support, maxOlives };
+}
+function knownResultFields(tool) {
+    return Object.keys(tool.outputSchema?.properties ?? {});
 }
 //# sourceMappingURL=cli.js.map