gflow-cli 0.23.0__tar.gz → 0.24.0__tar.gz

{gflow_cli-0.23.0 → gflow_cli-0.24.0}/CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.24.0] — 2026-07-01
+
+### Added
+
+- **`--project` on `video t2v`/`i2v`/`r2v` (#233)**: generate into an existing Flow
+  project instead of always creating a scratch project, matching `image t2i`/`i2i`.
+  Lets programmatic callers (e.g. a multi-clip storyboard worker) share one project
+  across several video generations instead of leaving one throwaway project per clip.
+- **`project` parameter on the MCP `gflow_generate_image` / `gflow_generate_video`
+  tools**: mirrors the CLI `--project` flag so MCP callers can also target an existing
+  Flow project (validated against the same id format). Completes `--project` parity
+  across the CLI and MCP surfaces.
+
 ## [0.23.0] — 2026-07-01
 
 ### Added
@@ -1682,7 +1695,8 @@ shell-script template that branches on these codes.
 
 First skeleton. Not functional end-to-end yet.
 
-[Unreleased]: https://github.com/ffroliva/gflow-cli/compare/v0.23.0...HEAD
+[Unreleased]: https://github.com/ffroliva/gflow-cli/compare/v0.24.0...HEAD
+[0.24.0]: https://github.com/ffroliva/gflow-cli/compare/v0.23.0...v0.24.0
 [0.23.0]: https://github.com/ffroliva/gflow-cli/compare/v0.22.0...v0.23.0
 [0.22.0]: https://github.com/ffroliva/gflow-cli/compare/v0.21.0...v0.22.0
 [0.21.0]: https://github.com/ffroliva/gflow-cli/compare/v0.20.1...v0.21.0

{gflow_cli-0.23.0 → gflow_cli-0.24.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gflow-cli
-Version: 0.23.0
+Version: 0.24.0
 Summary: Unofficial CLI for Google Flow — drive Veo image-to-video generations from the terminal.
 Project-URL: Homepage, https://github.com/ffroliva/gflow-cli
 Project-URL: Issues, https://github.com/ffroliva/gflow-cli/issues

{gflow_cli-0.23.0 → gflow_cli-0.24.0}/docs/INDEX.md

@@ -117,7 +117,7 @@ Slash commands for Claude Code, stored in `.claude/commands/gflow/`. All prefixe
 **"A gflow command hangs / fails — where do I start?"** → [DEBUGGING § Quick reference](DEBUGGING.md#quick-reference)
 **"Flow's UI broke a selector — how do I diagnose it?"** → [DEBUGGING § Inspecting Flow's live UI](DEBUGGING.md#inspecting-flows-live-ui)
 **"What does each `ui_automation.*` log event mean?"** → [DEBUGGING § Listener & HTTP-layer debugging](DEBUGGING.md#listener--http-layer-debugging)
-**"What was actually live-verified for the latest release?"** → latest: [LIVE_VERIFICATION_v0.23.0](LIVE_VERIFICATION_v0.23.0.md) (MCP generation wiring proven live end-to-end — tool→worker→real Flow REST→structured-error translation; final image-write blocked by an expired session, environmental. #222 macOS fix reporter-verified e2e on Apple Silicon). Prior: [v0.22.0](LIVE_VERIFICATION_v0.22.0.md) (Tools framework — automated/CI coverage complete; credit/key-gated live feature run is a pending owner gate, see the doc) · [v0.21.0](LIVE_VERIFICATION_v0.21.0.md) (MCP server over stdio + HTTP/SSE — credit-free protocol handshake; 4 tools / 2 prompts / 3 resources confirmed on stdout) · [v0.20.1](LIVE_VERIFICATION_v0.20.1.md) · [v0.20.0](LIVE_VERIFICATION_v0.20.0.md) · [v0.19.0](LIVE_VERIFICATION_v0.19.0.md) · [v0.18.0](LIVE_VERIFICATION_v0.18.0.md) · [v0.17.0](LIVE_VERIFICATION_v0.17.0.md) · [v0.16.0](LIVE_VERIFICATION_v0.16.0.md) · [v0.13.0](LIVE_VERIFICATION_v0.13.0.md) · [v0.12.0](LIVE_VERIFICATION_v0.12.0.md) · [v0.11.0](LIVE_VERIFICATION_v0.11.0.md) · [v0.10.0](LIVE_VERIFICATION_v0.10.0.md) · [v0.9.1](LIVE_VERIFICATION_v0.9.1.md) · [v0.9.0](LIVE_VERIFICATION_v0.9.0.md) · [v0.8.1](LIVE_VERIFICATION_v0.8.1.md) · [v0.7.0](LIVE_VERIFICATION_v0.7.0.md)
+**"What was actually live-verified for the latest release?"** → latest: [LIVE_VERIFICATION_v0.24.0](LIVE_VERIFICATION_v0.24.0.md) (--project parity across CLI + MCP — automated coverage; live gen auth-gated). Prior: [v0.23.0](LIVE_VERIFICATION_v0.23.0.md) (MCP generation wiring proven live end-to-end — tool→worker→real Flow REST→structured-error translation; final image-write blocked by an expired session, environmental. #222 macOS fix reporter-verified e2e on Apple Silicon). Prior: [v0.22.0](LIVE_VERIFICATION_v0.22.0.md) (Tools framework — automated/CI coverage complete; credit/key-gated live feature run is a pending owner gate, see the doc) · [v0.21.0](LIVE_VERIFICATION_v0.21.0.md) (MCP server over stdio + HTTP/SSE — credit-free protocol handshake; 4 tools / 2 prompts / 3 resources confirmed on stdout) · [v0.20.1](LIVE_VERIFICATION_v0.20.1.md) · [v0.20.0](LIVE_VERIFICATION_v0.20.0.md) · [v0.19.0](LIVE_VERIFICATION_v0.19.0.md) · [v0.18.0](LIVE_VERIFICATION_v0.18.0.md) · [v0.17.0](LIVE_VERIFICATION_v0.17.0.md) · [v0.16.0](LIVE_VERIFICATION_v0.16.0.md) · [v0.13.0](LIVE_VERIFICATION_v0.13.0.md) · [v0.12.0](LIVE_VERIFICATION_v0.12.0.md) · [v0.11.0](LIVE_VERIFICATION_v0.11.0.md) · [v0.10.0](LIVE_VERIFICATION_v0.10.0.md) · [v0.9.1](LIVE_VERIFICATION_v0.9.1.md) · [v0.9.0](LIVE_VERIFICATION_v0.9.0.md) · [v0.8.1](LIVE_VERIFICATION_v0.8.1.md) · [v0.7.0](LIVE_VERIFICATION_v0.7.0.md)
 **"Where is the reverse-engineered wire protocol for a feature?"** → the `*_RECON.md` design docs: [CHARACTER_RECON](CHARACTER_RECON.md) (Flow character entity protocol), [IMAGE_UPSCALE_RECON](IMAGE_UPSCALE_RECON.md) (`/v1/flow/upsampleImage` wire). Naming convention: one `<FEATURE>_RECON.md` per reverse-engineered surface, kept as the durable spec after the feature ships.
 **"What was live-verified for the data layer (PR #58)?"** → [LIVE_VERIFICATION_data_layer](LIVE_VERIFICATION_data_layer.md) — 1 Imagen + 1 Veo credit on denon82, 6-layer ledger (file + magic + Pillow + DB rows + CLI round-trip + structlog)
 **"What was live-verified for the video-download feature (#29)?"** → [LIVE_VERIFICATION_video_download](LIVE_VERIFICATION_video_download.md)

gflow_cli-0.24.0/docs/LIVE_VERIFICATION_v0.24.0.md

@@ -0,0 +1,38 @@
+# Live Verification — v0.24.0
+
+Release date: 2026-07-01. This release completes `--project` parity: `video
+t2v/i2v/r2v` gain `--project` (#233/#234) and the MCP `gflow_generate_image` /
+`gflow_generate_video` tools gain a `project` parameter (#235) — both let a caller
+target an existing Flow project instead of a scratch one.
+
+## Scope
+
+| Change | Surface | Verification |
+|---|---|---|
+| **#234** — `--project` on `video t2v/i2v/r2v` (CLI) | `cli_video.py`, `_cli_helpers.py` | ✅ Automated — behavior tests assert the id threads to `generate_video(project_id=...)` for all three modes; default (no flag) → scratch project; bad id rejected at the CLI boundary. Full council review GREEN + Sonar 100% new-coverage. |
+| **#235** — `project` param on MCP generate tools | `mcp/tools.py` | ✅ Automated — payload-threading tests assert `project` reaches `payload["project_id"]` (image + video), omitted → no `project_id`, bad id rejected before the worker. Reuses the CLI `_FLOW_ID_RE` validator. Council GREEN + Sonar pass. |
+
+## Nature of the change (why automated coverage is sufficient here)
+
+Neither change adds new generation plumbing: the worker/daemon already consumed
+`payload["project_id"]` (daemon.py:97 image, :168 video) and `FlowApiClient.generate_video`
+already accepted `project_id`. Both PRs only **surface + validate** the existing
+capability at the CLI and MCP boundaries, and thread it into the already-wired payload.
+The end-to-end "generate into an existing project" path (browser navigation to
+`project_editor_url(locale, project_id)` → `entering_existing_project`) is the same code
+prior releases exercised live for `image t2i --project`.
+
+## Live generation status
+
+A live credit-free run of `--project` against real Flow was **not** performed this cycle
+because the available `denon82` profile's Flow session is server-side expired (HTTP 401 —
+see [LIVE_VERIFICATION_v0.23.0](LIVE_VERIFICATION_v0.23.0.md)); exercising it requires an
+interactive `gflow auth login`. The project-targeting code path is shared with the
+already-live-verified `image t2i --project` path, and is fully covered by the automated
+behavior tests above.
+
+## Automated coverage
+
+- Full suite green on both PRs' CI (test matrix 3.11/3.12/3.13) at the merged tree.
+- `pyright src`: 0 errors. `ruff check` / `ruff format --check`: clean.
+- SonarCloud gate green on both PRs (#234 new-coverage 100%; #235 pass).

{gflow_cli-0.23.0 → gflow_cli-0.24.0}/docs/MCP.md

@@ -45,8 +45,8 @@ Both Click CLI (`src/gflow_cli/cli.py`) and MCP Server (`src/gflow_cli/mcp/`) ar
 The server registers three protocol surfaces:
 
 ### Tools (Executable actions)
-* `gflow_generate_image(prompt, model, aspect, count, seed, reference_images, tools, profile)`: Triggers text-to-image / image-to-image (Imagen / Nano Banana). `reference_images` switches to i2i.
-* `gflow_generate_video(prompt, mode, aspect, initial_frame, end_frame, reference_images, tools, profile)`: Triggers vertical or landscape video generation (Veo). `mode` is `t2v`/`i2v`/`r2v`; `i2v` requires `initial_frame`, `r2v` requires `reference_images`.
+* `gflow_generate_image(prompt, model, aspect, count, seed, reference_images, tools, profile, project)`: Triggers text-to-image / image-to-image (Imagen / Nano Banana). `reference_images` switches to i2i; `project` generates into an existing Flow project id (mirrors CLI `--project`).
+* `gflow_generate_video(prompt, mode, aspect, initial_frame, end_frame, reference_images, tools, profile, project)`: Triggers vertical or landscape video generation (Veo). `mode` is `t2v`/`i2v`/`r2v`; `i2v` requires `initial_frame`, `r2v` requires `reference_images`; `project` generates into an existing Flow project id (mirrors CLI `--project`).
 * `gflow_list_projects(profile, limit)`: Queries SQLite catalog for recent generation folders.
 * `gflow_list_characters(profile)`: Lists Flow Character entities (requires an active browser session).
 

{gflow_cli-0.23.0 → gflow_cli-0.24.0}/docs/PROJECT_STATUS.md

@@ -4,6 +4,19 @@
 
 ## Current release
 
+**v0.24.0 — alpha.** **`--project` parity across CLI + MCP.** The video commands
+(`video t2v`/`i2v`/`r2v`) gain `--project <id>` to generate into an existing Flow project
+instead of a scratch one (#233/#234), matching `image t2i`/`i2i`; and the MCP
+`gflow_generate_image` / `gflow_generate_video` tools gain a matching `project` parameter
+(#235), so agent callers get the same capability. Both surface an already-wired worker
+capability (`payload["project_id"]`) and validate the id identically. Carries forward
+v0.23.0 (MCP generation live + macOS 401 fix). Verification:
+[LIVE_VERIFICATION_v0.24.0](LIVE_VERIFICATION_v0.24.0.md).
+
+**Develop (unreleased, post-v0.24.0):** *(empty — develop is the staging branch for the next release).*
+
+<details><summary>v0.23.0 — MCP generation live + macOS 401 fixed</summary>
+
 **v0.23.0 — alpha.** **MCP generation goes live + macOS 401 fixed.** The MCP server's
 `gflow_generate_image` / `gflow_generate_video` tools — previously non-functional stubs —
 are now wired end-to-end to the FlowWorker queue (background worker owns download +
@@ -16,7 +29,7 @@ Carries forward v0.22.0 (Tools framework) + v0.21.0 (MCP server). Verification:
 [LIVE_VERIFICATION_v0.23.0](LIVE_VERIFICATION_v0.23.0.md) (MCP wiring proven live; #222
 reporter-verified e2e on macOS).
 
-**Develop (unreleased, post-v0.23.0):** *(empty — develop is the staging branch for the next release).*
+</details>
 
 <details><summary>v0.22.0 — Tools framework ("Creative Director")</summary>
 

{gflow_cli-0.23.0 → gflow_cli-0.24.0}/docs/USAGE.md

@@ -438,7 +438,11 @@ All prompts in a batch share one Flow project. The editor is opened once; each p
 Generate a video from a text prompt only.
 
 ```text
-gflow video t2v PROMPT [--model] [--duration] [--count] [--aspect] [--profile] [-t/--tool] [--out-dir]
+gflow video t2v PROMPT [--model] [--duration] [--count] [--aspect] [--profile] [-t/--tool] [--project] [--out-dir]
+
+Options:
+  --project ID          Generate in this EXISTING Flow project instead of a
+                        scratch project (see "Sharing one project across calls").
 ```
 
 ```bash
@@ -472,6 +476,8 @@ Arguments:
 Options:
   --initial-frame PATH  Initial frame to animate. Canonical form; replaces the positional IMAGE.
   --end-frame PATH      Optional end frame — Flow interpolates initial frame -> end frame.
+  --project ID          Generate in this EXISTING Flow project instead of a
+                        scratch project (see "Sharing one project across calls").
 ```
 
 ```bash
@@ -491,7 +497,9 @@ images. Per-model cap: `omni-flash` ≤7, the `veo-*` models ≤3. Fires
 gflow video r2v PROMPT --ref IMG [--ref IMG ...] [--model] [--duration] [--count] [--aspect] [...]
 
 Options:
-  --ref PATH  Reference image; repeat for up to 7 (omni-flash) / 3 (veo). [required]
+  --ref PATH    Reference image; repeat for up to 7 (omni-flash) / 3 (veo). [required]
+  --project ID  Generate in this EXISTING Flow project instead of a scratch
+                project (see "Sharing one project across calls").
 ```
 
 ```bash
@@ -499,6 +507,19 @@ gflow video r2v "a knight in this armor walks forward" --ref armor.png
 gflow video r2v "blend these worlds" --ref a.png --ref b.png --ref c.png --model omni-flash
 ```
 
+### Sharing one project across calls
+
+By default each `video t2v` / `i2v` / `r2v` call creates its own scratch Flow
+project. Pass `--project <id>` (same contract as `image t2i`/`i2i` — see
+[`gflow image t2i`](#gflow-image-t2i)) to generate into an existing project
+instead, e.g. to avoid one-throwaway-project-per-clip when scripting a
+multi-clip storyboard:
+
+```bash
+gflow video t2v "establishing shot" --project PROJ123
+gflow video t2v "close-up reaction" --project PROJ123
+```
+
 ## `gflow video batch`
 
 > ⚠️ **Not yet implemented.** The `batch` subcommand currently exits with
@@ -509,10 +530,12 @@ gflow video r2v "blend these worlds" --ref a.png --ref b.png --ref c.png --model
 ### Workaround — shell for-loop
 
 Until the manifest runner lands, you can drive sequential video generations
-through a plain shell loop. Each `gflow video t2v` / `i2v` / `r2v` call opens
-its **own Flow project**, so the resulting videos will NOT share a
-`project_id` (unlike `gflow image batch`, which mounts one project across
-all prompts) — but they DO get generated and downloaded:
+through a plain shell loop. Without `--project`, each `gflow video t2v` /
+`i2v` / `r2v` call opens its **own Flow project**, so the resulting videos
+will NOT share a `project_id` (unlike `gflow image batch`, which mounts one
+project across all prompts) — but they DO get generated and downloaded. Pass
+the same `--project <id>` to every call in the loop (see "Sharing one project
+across calls" above) if you want them to land in one project instead:
 
 ```bash
 # bash / WSL / macOS — one prompt per line

{gflow_cli-0.23.0 → gflow_cli-0.24.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "gflow-cli"
-version = "0.23.0"
+version = "0.24.0"
 description = "Unofficial CLI for Google Flow — drive Veo image-to-video generations from the terminal."
 readme = "README.md"
 license = { file = "LICENSE" }

{gflow_cli-0.23.0 → gflow_cli-0.24.0}/src/gflow_cli/__init__.py

@@ -1,3 +1,3 @@
 """gflow-cli — unofficial CLI for Google Flow."""
 
-__version__ = "0.23.0"
+__version__ = "0.24.0"

{gflow_cli-0.23.0 → gflow_cli-0.24.0}/src/gflow_cli/_cli_helpers.py

@@ -35,6 +35,7 @@ been removed. Both error handlers now import
 
 from __future__ import annotations
 
+import re
 import sys
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal
@@ -70,16 +71,36 @@ _console = Console()
 # `reportPrivateUsage` rule does NOT honor the PEP 484 `from X import Y as Y`
 # re-export idiom for underscore names, so __all__ is the practical fix.
 __all__ = [
+    "_FLOW_ID_RE",
     "_handle_gflow_error",
     "_handle_unhandled_error",
     "_make_provider_dir",
     "_resolve_profile",
+    "_validate_project_id",
     "apply_tool_option",
     "run_with_handlers",
     "safe_path_text",
     "tool_option",
 ]
 
+# Flow project ids are interpolated into navigation URLs and CSS selectors
+# (page.goto, `data-tile-id='fe_id_<id>'`) before any other guard runs, so the
+# `--project` option on both `image t2i`/`i2i` and `video t2v`/`i2v`/`r2v`
+# validates against this allowlist at the CLI boundary. Mirrors
+# `routes._PROJECT_ID_RE`. Relocated here (T4b follow-up) so the two call-site
+# modules can't drift out of sync.
+_FLOW_ID_RE = re.compile(r"^[A-Za-z0-9\-]{1,128}$")
+
+
+def _validate_project_id(
+    _ctx: click.Context, param: click.Parameter, value: str | None
+) -> str | None:
+    """Reject a --project id that isn't alphanumeric/hyphen (1-128 chars)."""
+    if value is not None and not _FLOW_ID_RE.fullmatch(value):
+        msg = "project id must be 1-128 chars of letters, digits, or hyphens."
+        raise click.BadParameter(msg, param=param)
+    return value
+
 
 _TOOL_OPTION_HELP = (
     "Apply a prompt tool before generating, e.g. --tool creative-director or "

{gflow_cli-0.23.0 → gflow_cli-0.24.0}/src/gflow_cli/cli_image.py

@@ -29,8 +29,10 @@ from rich.table import Table
 
 from gflow_cli import json_output
 from gflow_cli._cli_helpers import (
+    _FLOW_ID_RE,
     _make_provider_dir,
     _resolve_profile,
+    _validate_project_id,
     apply_tool_option,
     run_with_handlers,
     safe_path_text,
@@ -106,25 +108,10 @@ _CREATING_PROJECT_MSG = "  Creating project..."
 _T2I_PROJECT_TITLE = "gflow-cli t2i"
 _I2I_PROJECT_TITLE = "gflow-cli i2i"
 
-# Flow project / character-entity ids interpolated into navigation URLs and UI
-# selectors. Mirror routes._PROJECT_ID_RE so untrusted --project / --reference-entity
-# values are rejected at the CLI boundary (closes the page.goto + CSS-selector
-# injection gaps before the value ever reaches the browser).
-_FLOW_ID_RE = re.compile(r"^[A-Za-z0-9\-]{1,128}$")
-
-
-def _validate_project_id(
-    _ctx: click.Context, param: click.Parameter, value: str | None
-) -> str | None:
-    """Reject a --project id that isn't alphanumeric/hyphen (1-128 chars).
-
-    The value is interpolated into the editor navigation URL (`page.goto`) before
-    any other guard runs, so validate here at the boundary.
-    """
-    if value is not None and not _FLOW_ID_RE.fullmatch(value):
-        msg = "project id must be 1-128 chars of letters, digits, or hyphens."
-        raise click.BadParameter(msg, param=param)
-    return value
+# `_FLOW_ID_RE` / `_validate_project_id` (Flow project/character-entity id
+# allowlist for --project / --reference-entity) live in gflow_cli._cli_helpers
+# since they're shared with cli_video.py's --project option — see that
+# module's docstring for the injection-surface rationale.
 
 
 def _validate_entity_ids(

{gflow_cli-0.23.0 → gflow_cli-0.24.0}/src/gflow_cli/cli_video.py

@@ -19,6 +19,7 @@ from gflow_cli import json_output
 from gflow_cli._cli_helpers import (
     _make_provider_dir,
     _resolve_profile,
+    _validate_project_id,
     apply_tool_option,
     run_with_handlers,
     tool_option,
@@ -37,6 +38,14 @@ if TYPE_CHECKING:
 console = Console()
 logger = structlog.get_logger(__name__)
 
+_project_option = click.option(
+    "--project",
+    "project_id",
+    default=None,
+    callback=_validate_project_id,
+    help=("Generate in this existing Flow project id instead of creating a scratch project."),
+)
+
 
 def _warn_persistence_failed_after_success(
     *,
@@ -66,6 +75,7 @@ async def _generate_and_report(
     out_dir: Path | None,
     command: str = "video",
     as_json: bool = False,
+    project_id: str | None = None,
 ) -> None:
     """Drive FlowApiClient for a single GenerateVideoRequest and print the
     result (or fail with a non-zero exit). Shared by t2v, i2v, and r2v.
@@ -103,6 +113,7 @@ async def _generate_and_report(
 
             result = await client.generate_video(
                 req=request,
+                project_id=project_id,
                 out_dir=out_dir,
                 download=True,
                 on_started=on_started,
@@ -160,6 +171,7 @@ async def _run_t2v(
     as_json: bool = False,
     original_prompt: str | None = None,
     tool: AppliedTool | None = None,
+    project_id: str | None = None,
 ) -> None:
     from gflow_cli.api.video import Aspect, GenerateVideoRequest, Mode, VideoModel
 
@@ -180,24 +192,38 @@ async def _run_t2v(
         out_dir=out_dir,
         command="video t2v",
         as_json=as_json,
+        project_id=project_id,
     )
 
 
+@dataclass(frozen=True)
+class _I2VParams:
+    """Bundles image-to-video generation options for :func:`_run_i2v`.
+
+    Separating these from the profile/output/count fields keeps the function
+    signature below Sonar's 13-parameter limit (S107) while preserving every
+    CLI option. Mirrors `cli_image.py`'s `_I2IParams`.
+    """
+
+    image: str
+    prompt: str
+    aspect: str
+    end_frame: str | None = None
+    model: str | None = None
+    duration: int | None = None
+    original_prompt: str | None = None
+    tool: AppliedTool | None = None
+
+
 async def _run_i2v(
     *,
     profile_name: str,
     profile_dir: Path,
-    image: str,
-    prompt: str,
-    aspect: str,
+    params: _I2VParams,
     out_dir: Path | None,
-    end_frame: str | None = None,
-    model: str | None = None,
-    duration: int | None = None,
     count: int = 1,
     as_json: bool = False,
-    original_prompt: str | None = None,
-    tool: AppliedTool | None = None,
+    project_id: str | None = None,
 ) -> None:
     from gflow_cli.api.video import (
         I2V_DEFAULT_MODEL,
@@ -213,7 +239,7 @@ async def _run_i2v(
     # direct programmatic call can still smuggle it in. omni-flash silently
     # drops the start/end frames at submit and routes to T2V (issue #125), so
     # reject it here before any paid call.
-    resolved_model = VideoModel.from_cli(model)
+    resolved_model = VideoModel.from_cli(params.model)
     if resolved_model is None:
         resolved_model = I2V_DEFAULT_MODEL
     elif not resolved_model.supports_i2v_interpolation():
@@ -225,16 +251,16 @@ async def _run_i2v(
         raise ModelModeIncompatibilityError(detail=msg)
 
     request = GenerateVideoRequest(
-        prompt=prompt,
+        prompt=params.prompt,
         mode=Mode.I2V,
-        aspect=Aspect.from_cli(aspect),
+        aspect=Aspect.from_cli(params.aspect),
         model=resolved_model,
-        duration=duration,
+        duration=params.duration,
         count=count,
-        start_image=Path(image),
-        end_image=Path(end_frame) if end_frame else None,
-        original_prompt=original_prompt,
-        tool=tool,
+        start_image=Path(params.image),
+        end_image=Path(params.end_frame) if params.end_frame else None,
+        original_prompt=params.original_prompt,
+        tool=params.tool,
     )
     await _generate_and_report(
         request,
@@ -243,6 +269,7 @@ async def _run_i2v(
         out_dir=out_dir,
         command="video i2v",
         as_json=as_json,
+        project_id=project_id,
     )
 
 
@@ -260,6 +287,7 @@ async def _run_r2v(
     as_json: bool = False,
     original_prompt: str | None = None,
     tool: AppliedTool | None = None,
+    project_id: str | None = None,
 ) -> None:
     from gflow_cli.api.video import Aspect, GenerateVideoRequest, Mode, VideoModel
 
@@ -281,6 +309,7 @@ async def _run_r2v(
         out_dir=out_dir,
         command="video r2v",
         as_json=as_json,
+        project_id=project_id,
     )
 
 
@@ -769,6 +798,7 @@ def video() -> None:
         "falls back to the original prompt if unset or on error."
     ),
 )
+@_project_option
 @click.option(
     "--out-dir",
     "out_dir",
@@ -790,6 +820,7 @@ def t2v(
     count: int,
     profile: str | None,
     tool_specs: tuple[str, ...],
+    project_id: str | None,
     out_dir: Path | None,
     as_json: bool,
 ) -> None:
@@ -812,6 +843,7 @@ def t2v(
             as_json=as_json,
             original_prompt=original_prompt,
             tool=applied_tool,
+            project_id=project_id,
         ),
         cli_command="video t2v",
         as_json=as_json,
@@ -930,6 +962,7 @@ def _resolve_i2v_args(
 )
 @click.option("--profile", default=None, help="Profile name (overrides default).")
 @tool_option
+@_project_option
 @click.option(
     "--out-dir",
     "out_dir",
@@ -943,7 +976,7 @@ def _resolve_i2v_args(
     is_flag=True,
     help="Emit a machine-readable JSON result instead of Rich output.",
 )
-def i2v(
+def i2v(  # NOSONAR
     image: str | None,
     prompt: str | None,
     initial_frame: str | None,
@@ -955,6 +988,7 @@ def i2v(
     count: int,
     profile: str | None,
     tool_specs: tuple[str, ...],
+    project_id: str | None,
     out_dir: Path | None,
     as_json: bool,
 ) -> None:
@@ -976,21 +1010,25 @@ def i2v(
     prompt_to_send, original_prompt, applied_tool = apply_tool_option(
         resolved_prompt, tool_specs, category="video", quiet=as_json
     )
+    i2v_params = _I2VParams(
+        image=resolved_image,
+        prompt=prompt_to_send,
+        aspect=aspect,
+        end_frame=end_frame,
+        model=model,
+        duration=int(duration) if duration is not None else None,
+        original_prompt=original_prompt,
+        tool=applied_tool,
+    )
     run_with_handlers(
         lambda: _run_i2v(
             profile_name=profile_name,
             profile_dir=provider_dir,
-            image=resolved_image,
-            prompt=prompt_to_send,
-            end_frame=end_frame,
-            aspect=aspect,
-            model=model,
-            duration=int(duration) if duration is not None else None,
+            params=i2v_params,
             count=count,
             out_dir=out_dir,
             as_json=as_json,
-            original_prompt=original_prompt,
-            tool=applied_tool,
+            project_id=project_id,
         ),
         cli_command="video i2v",
         as_json=as_json,
@@ -1051,6 +1089,7 @@ def i2v(
 )
 @click.option("--profile", default=None, help="Profile name (overrides default).")
 @tool_option
+@_project_option
 @click.option(
     "--out-dir",
     "out_dir",
@@ -1073,6 +1112,7 @@ def r2v(
     count: int,
     profile: str | None,
     tool_specs: tuple[str, ...],
+    project_id: str | None,
     out_dir: Path | None,
     as_json: bool,
 ) -> None:
@@ -1114,6 +1154,7 @@ def r2v(
             as_json=as_json,
             original_prompt=original_prompt,
             tool=applied_tool,
+            project_id=project_id,
         ),
         cli_command="video r2v",
         as_json=as_json,