gflow-cli 0.6.0a2__tar.gz → 0.6.0a4__tar.gz

{gflow_cli-0.6.0a2 → gflow_cli-0.6.0a4}/.env.template

@@ -21,6 +21,10 @@
 # `--profile <name>`.
 # GFLOW_CLI_PROFILE=default
 
+# Maximum wait time (seconds) for `gflow auth login` to complete Google sign-in.
+# Useful for agent pipelines — set low to surface hung logins as exit 12 fast.
+# GFLOW_CLI_AUTH_LOGIN_TIMEOUT=600
+
 # -----------------------------------------------------------------------------
 # Output paths
 # -----------------------------------------------------------------------------

{gflow_cli-0.6.0a2 → gflow_cli-0.6.0a4}/CHANGELOG.md

@@ -7,47 +7,93 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.6.0a4] — 2026-05-17
+
+> **Unified output resolution + batch orchestration refactor.** This release
+> aligns the CLI output structure across all commands and refactors the batch
+> runner to be more generic, preparing the codebase for Phase 6.
+
+### Added
+
+- **`resolve_batch_output_dir` helper** in `paths.py` — centralizes the
+  date-partitioned output directory logic used by all generation commands.
+- **`parse_batch_item_dict` helper** in `image_batch.py` — deduplicates JSON
+  prompt validation between `gflow run` and other batch sources.
+
+### Changed
+
+- **`gflow run` output directory** — now defaults to date-partitioned
+  `$GFLOW_CLI_OUTPUT_DIR/images/<YYYY-MM-DD>/` instead of the legacy
+  `out/<UTC-timestamp>/`, matching the `gflow image` convention.
+- **Refactored `run_image_batch`** into a generic `run_sequential_batch`
+  orchestrator — now accepts a swappable worker callback, allowing for uniform
+  video and image batch handling in the future.
+
+### Fixed
+
+- Removed ~80 lines of duplicate validation logic from `cli_run.py`.
+- Corrected test imports and expectations for unified output resolution.
+
+## [0.6.0a3] — 2026-05-17
+
+> **Deterministic timeouts + agent-friendly exit codes.** This release hardens
+> the auth login flow for unattended / agentic use: timeouts now raise distinct
+> errors with dedicated exit codes instead of silently swallowing failures.
+
+### Added
+
+- **`AuthLoginTimeoutError`** (exit code **12**) — raised by both strategies
+  when the user/agent does not complete sign-in within `timeout_seconds`.
+  Distinct from `ConfigurationError` (11) and `SecurityError` (13) so agents
+  can branch on failure type without parsing stderr.
+- **`SecurityError`** exit code **13** — now registered in `EXIT_CODE_MAP`.
+- **`timeout_seconds=600` parameter** on both `RealChromeStrategy` and
+  `InternalChromiumStrategy` — configurable upper bound for the login window.
+- **Broad `GFlowError` catch** in `auth_login` CLI command — previously only
+  caught `ConfigurationError`; now looks up any `GFlowError` subclass in
+  `EXIT_CODE_MAP` and exits with the correct code plus a `remediation_hint`.
+
+### Fixed
+
+- `InternalChromiumStrategy` had an infinite `while True:` polling loop that
+  never timed out; replaced with a bounded loop that raises
+  `AuthLoginTimeoutError` on expiry.
+- `auth login --browser chrome` when Chrome is missing now exits with code
+  **11** (ConfigurationError) instead of 1.
+
 ## [0.6.0a2] — 2026-05-16
 
 > **Real Chrome auth strategy — G12 block resolved.** This release restores
-> `gflow auth login` reliability by routing logins through the system's real
-> Google Chrome instead of Playwright's bundled Chromium. A carefully ordered
-> stealth configuration prevents Google's bot-detection from blocking the sign-in
-> flow.
+> `gflow auth login` reliability by implementing a new **Passive Capture**
+> strategy. This method providing a 100% clean browser environment by launching
+> your system's real Google Chrome as a standard process, completely bypassing
+> Google's bot-detection.
 
 ### Added
 
 - **`--browser [auto|chrome|internal]` flag** on `gflow auth login` — selects
-  the browser strategy. `chrome` uses real system Chrome (stealth). `internal`
-  falls back to bundled Chromium. `auto` (default) probes for real Chrome and
-  falls back gracefully.
+  the browser strategy. `chrome` uses real system Chrome (**Passive Capture**).
+  `internal` falls back to bundled Chromium. `auto` (default) probes for real
+  Chrome and falls back gracefully.
 - **`GFLOW_CLI_AUTH_BROWSER` env var** — overrides the browser strategy without
   a CLI flag.
-- **`RealChromeStrategy`** (`src/gflow_cli/auth/real_chrome.py`) — stealth
-  persistent context via `channel="chrome"` with
-  `--disable-blink-features=AutomationControlled` and a JS init-script to mask
-  `navigator.webdriver`.
+- **`RealChromeStrategy`** (`src/gflow_cli/auth/real_chrome.py`) — zero-automation
+  login flow: launches clean Chrome, waits for user to close window, then extracts
+  the session.
 - **`InternalChromiumStrategy`** — extracted from the previous `auth.py` monolith
   as an explicit fallback strategy.
 - **`AuthStrategyFactory`** — routes `auto`/`chrome`/`internal` to the
   appropriate strategy based on system state.
-- **`is_chrome_available()`** in `browser_manager.py` — non-raising probe for
-  system Chrome presence.
-- **4 new BDD scenarios** in `tests/features/auth_login.feature` covering all
-  `--browser` modes.
 
 ### Fixed
 
 - **G12 bot-detection block** — Google's "browser not secure" rejection (`/v3/signin/rejected`)
-  is bypassed by the stealth Chrome launch configuration. Root cause: without
-  `--disable-blink-features=AutomationControlled`, Blink's C++ engine sets
-  `navigator.webdriver = true` as a non-configurable native property before any
-  JS init script can run, making `Object.defineProperty` overrides silently fail.
-- **`add_init_script` timing** — registration now occurs before any page is
-  accessed, ensuring the stealth script fires on every navigation including the
-  first `goto()`.
+  is bypassed by the Passive Capture workflow. By removing all automation signals
+  (CDP, WebDriver flags) during login, the browser is indistinguishable from a
+  regular user session.
 - **Privacy Guard** — `RealChromeStrategy` validates that `profile_dir` is inside
   `GFLOW_CLI_HOME` and raises `SecurityError` if it is not, preventing accidental
+  interference with your primary personal Chrome profile.
   use of the user's primary system Chrome profile.
 - **`ConfigurationError` on missing Chrome** — clear "Chrome binary not found"
   message with install guidance when `--browser chrome` is requested but Chrome

{gflow_cli-0.6.0a2 → gflow_cli-0.6.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gflow-cli
-Version: 0.6.0a2
+Version: 0.6.0a4
 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.6.0a2 → gflow_cli-0.6.0a4}/docs/CONFIGURATION.md

@@ -68,6 +68,18 @@ A profile maps to a directory `$GFLOW_CLI_HOME/profile_<name>/`. Profiles are is
 **Default:** unset
 **Get one:** <https://aistudio.google.com/apikey>
 
+### `GFLOW_CLI_AUTH_LOGIN_TIMEOUT`
+
+**What:** Maximum time (seconds) that `gflow auth login` waits for the user to complete the Google sign-in flow in the browser.
+**Default:** `600` (10 minutes)
+**Range:** 1–86400
+**Exit code on expiry:** 12 (`AuthLoginTimeoutError`)
+**Note:** Useful for CI/CD or agent pipelines where a hung login should surface as a definite failure rather than blocking indefinitely. Set to a large value (e.g. `3600`) for interactive sessions over slow connections.
+
+```bash
+GFLOW_CLI_AUTH_LOGIN_TIMEOUT=120 gflow auth login   # abort after 2 minutes
+```
+
 ### `GFLOW_CLI_TIMEOUT_SECONDS`
 
 **What:** Per-request HTTP timeout. Veo videos can take 60–180 s each.

{gflow_cli-0.6.0a2 → gflow_cli-0.6.0a4}/pyproject.toml

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

{gflow_cli-0.6.0a2 → gflow_cli-0.6.0a4}/src/gflow_cli/__init__.py

@@ -1,3 +1,3 @@
 """gflow-cli — unofficial CLI for Google Flow."""
 
-__version__ = "0.6.0a2"
+__version__ = "0.6.0a4"

{gflow_cli-0.6.0a2 → gflow_cli-0.6.0a4}/src/gflow_cli/api/client.py

@@ -148,12 +148,14 @@ class FlowApiClient:
         # opening a second Playwright process against the same profile dir
         # (which would conflict on the Chromium lockfile — spec § 5.4.4).
         self._pw = await async_playwright().start()
+        from gflow_cli.browser_manager import channel_for_profile
         self._context = await self._pw.chromium.launch_persistent_context(
             user_data_dir=str(self.profile_dir),
             headless=self.headless,
             viewport={"width": 1280, "height": 720},
             locale="en-US",
             extra_http_headers={"Accept-Language": "en-US,en;q=0.9"},
+            channel=channel_for_profile(self.profile_dir),
         )
         # Open ``Settings.concurrency`` Pages inside the one persistent
         # BrowserContext. ``launch_persistent_context`` opens one Page by

{gflow_cli-0.6.0a2 → gflow_cli-0.6.0a4}/src/gflow_cli/api/transports/ui_automation.py

@@ -208,11 +208,13 @@ class UiAutomationTransport:
         pw_cm = async_playwright()
         pw = await pw_cm.__aenter__()
         try:
+            from gflow_cli.browser_manager import channel_for_profile  # noqa: PLC0415
             ctx = await pw.chromium.launch_persistent_context(
                 str(profile_dir),
                 headless=False,
                 viewport=cast("ViewportSize", _VIEWPORT),
                 locale="en-US",
+                channel=channel_for_profile(profile_dir),
             )
             self._pw_cm = pw_cm
             self._ctx = ctx

{gflow_cli-0.6.0a2 → gflow_cli-0.6.0a4}/src/gflow_cli/auth/__init__.py

@@ -61,7 +61,11 @@ def status(name: str = "default") -> dict[str, object]:
     """Lightweight check — does the profile dir exist and have cookies file?"""
     pdir = profile_dir(name)
     cookies_file: Path | None = None
-    for candidate in (pdir / "Default" / "Cookies", pdir / "Cookies"):
+    for candidate in (
+        pdir / "Default" / "Network" / "Cookies",  # Chrome 130+ (new location)
+        pdir / "Default" / "Cookies",               # Chrome < 130 / legacy
+        pdir / "Cookies",                           # Playwright bundled Chromium
+    ):
         if candidate.exists():
             cookies_file = candidate
             break

{gflow_cli-0.6.0a2 → gflow_cli-0.6.0a4}/src/gflow_cli/auth/factory.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import structlog
 
+from gflow_cli.config import get_settings
 from gflow_cli.errors import ConfigurationError
 
 from .base import AuthStrategy
@@ -22,28 +23,30 @@ class AuthStrategyFactory:
 
     def create(self, mode: str) -> AuthStrategy:
         """Create an authentication strategy based on the requested mode and system state."""
+        timeout = get_settings().auth_login_timeout
         # T2.4: auto mode probes for Real Chrome; falls back to internal if missing.
         if mode == "auto":
             if self._is_chrome_available():
-                return RealChromeStrategy()
+                return RealChromeStrategy(timeout_seconds=timeout)
             logger.warning(
                 "chrome_missing_falling_back_to_internal",
                 reason="Google Chrome was not detected on this system.",
             )
-            return InternalChromiumStrategy()
+            return InternalChromiumStrategy(timeout_seconds=timeout)
 
-        strategy_cls = self._strategies.get(mode)
-        if not strategy_cls:
+        if mode not in self._strategies:
             raise ConfigurationError(
                 f"Unknown auth browser mode '{mode}'. Supported: auto, chrome, internal."
             )
 
-        if mode == "chrome" and not self._is_chrome_available():
-            raise ConfigurationError(
-                "Chrome binary not found. Install Google Chrome or use '--browser internal'."
-            )
+        if mode == "chrome":
+            if not self._is_chrome_available():
+                raise ConfigurationError(
+                    "Chrome binary not found. Install Google Chrome or use '--browser internal'."
+                )
+            return RealChromeStrategy(timeout_seconds=timeout)
 
-        return strategy_cls()
+        return InternalChromiumStrategy(timeout_seconds=timeout)
 
     def _is_chrome_available(self) -> bool:
         """Probe for Real Chrome via browser_manager or Playwright."""

{gflow_cli-0.6.0a2 → gflow_cli-0.6.0a4}/src/gflow_cli/auth/internal_chromium.py

@@ -7,7 +7,8 @@ from typing import TYPE_CHECKING
 import structlog
 from rich.console import Console
 
-from gflow_cli.errors import AuthLoginTimeoutError
+from gflow_cli.config import get_settings
+from gflow_cli.errors import AuthLoginTimeoutError, SecurityError
 
 from .base import AuthStrategy
 
@@ -34,6 +35,15 @@ class InternalChromiumStrategy(AuthStrategy):
 
     async def login(self, profile_dir: Path, headless: bool) -> None:
         """Execute the login flow using internal Chromium."""
+        settings = get_settings()
+        try:
+            profile_dir.resolve(strict=False).relative_to(settings.home.resolve())
+        except ValueError:
+            raise SecurityError(
+                f"Profile directory {profile_dir} is outside of GFLOW_CLI_HOME "
+                f"({settings.home}) boundaries."
+            ) from None
+
         # Deferred import to avoid circular dependency and support test patching
         from .strategies import async_playwright
 
@@ -60,6 +70,7 @@ class InternalChromiumStrategy(AuthStrategy):
 
                 # Polling for success (SAPISID cookie + UI signal).
                 timeout_at = asyncio.get_running_loop().time() + self._timeout_seconds
+                success = False
 
                 while asyncio.get_running_loop().time() < timeout_at:
                     try:
@@ -73,9 +84,10 @@ class InternalChromiumStrategy(AuthStrategy):
                                 or await page.get_by_text("Your projects").is_visible()
                             ):
                                 logger.info("auth_login_success_detected", strategy=self.name)
+                                success = True
                                 break
                     except Exception:
-                        # If browser is closed or context is gone, exit loop
+                        # Browser or context is gone — exit loop without success
                         break
 
                     await asyncio.sleep(1)
@@ -84,11 +96,20 @@ class InternalChromiumStrategy(AuthStrategy):
                         f"Sign-in not completed within {self._timeout_seconds}s.",
                         remediation_hint=(
                             "Run `gflow auth login` again and complete sign-in promptly. "
-                            f"Set GFLOW_CLI_AUTH_TIMEOUT to a higher value if needed "
+                            f"Set GFLOW_CLI_AUTH_LOGIN_TIMEOUT to a higher value if needed "
                             f"(current: {self._timeout_seconds}s)."
                         ),
                     )
 
+                if not success:
+                    raise AuthLoginTimeoutError(
+                        "Browser closed before authentication was verified.",
+                        remediation_hint=(
+                            "Complete the full sign-in flow before closing the browser. "
+                            "Run `gflow auth login` to try again."
+                        ),
+                    )
+
                 # Small delay to ensure state is flushed to disk
                 await asyncio.sleep(1)
 

{gflow_cli-0.6.0a2 → gflow_cli-0.6.0a4}/src/gflow_cli/auth/real_chrome.py

@@ -10,7 +10,7 @@ import structlog
 from rich.console import Console
 
 from gflow_cli.config import get_settings
-from gflow_cli.errors import AuthLoginTimeoutError, SecurityError
+from gflow_cli.errors import AuthLoginTimeoutError, AuthMissingError, SecurityError
 
 from .base import AuthStrategy
 
@@ -68,7 +68,7 @@ class RealChromeStrategy(AuthStrategy):
         """Execute the login flow using Passive Capture on Real Chrome."""
         settings = get_settings()
         try:
-            profile_dir.relative_to(settings.home)
+            profile_dir.resolve(strict=False).relative_to(settings.home.resolve())
         except ValueError:
             raise SecurityError(
                 f"Profile directory {profile_dir} is outside of GFLOW_CLI_HOME "
@@ -134,10 +134,10 @@ class RealChromeStrategy(AuthStrategy):
             except subprocess.TimeoutExpired:
                 proc.kill()
             raise AuthLoginTimeoutError(
-                f"Sign-in not completed within {self._timeout_seconds}s; Chrome was closed.",
+                f"Sign-in timed out after {self._timeout_seconds}s; Chrome was stopped.",
                 remediation_hint=(
                     "Run `gflow auth login` again and complete sign-in before the time limit. "
-                    f"Set GFLOW_CLI_AUTH_TIMEOUT to raise the limit "
+                    f"Set GFLOW_CLI_AUTH_LOGIN_TIMEOUT to raise the limit "
                     f"(current: {self._timeout_seconds}s)."
                 ),
             ) from None
@@ -161,10 +161,14 @@ class RealChromeStrategy(AuthStrategy):
 
                 if has_sapisid:
                     logger.info("auth_login_success_verified", strategy=self.name)
-                    _console.print("[green]✓ Session captured and verified.[/green]")
+                    # Write strategy marker before any output that might fail on
+                    # narrow Windows codepages — FlowApiClient reads this to select
+                    # the matching Chrome channel for launch_persistent_context.
+                    (profile_dir / ".gflow_browser_strategy").write_text("chrome", encoding="utf-8")
+                    _console.print("[green][OK] Session captured and verified.[/green]")
                 else:
                     logger.warning("auth_login_no_cookies", strategy=self.name)
-                    raise RuntimeError(
+                    raise AuthMissingError(
                         "No session cookies found after sign-in. "
                         "Did you complete the sign-in before closing Chrome?"
                     )

{gflow_cli-0.6.0a2 → gflow_cli-0.6.0a4}/src/gflow_cli/browser_manager.py

@@ -172,6 +172,40 @@ def is_chrome_available() -> bool:
         return False
 
 
+def channel_for_profile(profile_dir: Path) -> str | None:
+    """Return the Playwright channel to use for ``profile_dir``, or None.
+
+    Reads the ``.gflow_browser_strategy`` marker written by
+    :class:`~gflow_cli.auth.real_chrome.RealChromeStrategy`. When the marker
+    is ``"chrome"`` and system Chrome is available, returns ``"chrome"`` so
+    callers can pass it to ``launch_persistent_context(channel=...)`` —
+    avoiding the downgrade-cleanup exit-33 that occurs when Playwright's
+    bundled Chromium opens a profile created by Chrome 130+.
+
+    Logs a warning when the marker requests Chrome but Chrome is no longer
+    available, as the resulting launch against bundled Chromium will likely
+    fail with the same exit-33 error.
+    """
+    import structlog as _structlog
+
+    _log = _structlog.get_logger(__name__)
+    marker = profile_dir / ".gflow_browser_strategy"
+    if not marker.exists():
+        return None
+    strategy = marker.read_text(encoding="utf-8").strip()
+    if strategy != "chrome":
+        return None
+    if is_chrome_available():
+        return "chrome"
+    _log.warning(
+        "browser_manager.chrome_marker_but_unavailable",
+        profile_dir=str(profile_dir),
+        hint="Profile was captured with system Chrome but Chrome is not found. "
+        "Re-run `gflow auth login --browser chrome` after installing Chrome.",
+    )
+    return None
+
+
 # ---------------------------------------------------------------------------
 # Health check
 # ---------------------------------------------------------------------------

{gflow_cli-0.6.0a2 → gflow_cli-0.6.0a4}/src/gflow_cli/cli_image.py

@@ -60,13 +60,12 @@ from gflow_cli.image_batch import (
     prompt_items_from_texts,
     read_prompt_file,
     render_image_batch_summary,
-    resolve_t2i_batch_output_dir,
     run_image_batch,
 )
 from gflow_cli.image_batch import (
     MIN_COUNT as _MIN_COUNT,
 )
-from gflow_cli.paths import image_output_path
+from gflow_cli.paths import image_output_path, resolve_batch_output_dir
 
 # Case-insensitive 8-4-4-4-12 hex with hyphens — Flow's media UUIDs.
 # When a `--ref` value matches this regex it's treated as an already-uploaded
@@ -417,7 +416,9 @@ def t2i(
     profile_name = _resolve_profile(profile)
     provider_dir = _make_provider_dir(profile_name)
     settings = get_settings()
-    output_dir = resolve_t2i_batch_output_dir(out=out, output_root=settings.output_dir)
+    output_dir = resolve_batch_output_dir(
+        cli_override=out, output_root=settings.output_dir, kind="images"
+    )
     console.print(
         f"\n[bold]gflow image t2i[/bold] · profile=[bold]{profile_name}[/bold] "
         f"· {len(batch_prompts)} prompt(s) · up to {len(batch_prompts) * count} image(s)"

{gflow_cli-0.6.0a2 → gflow_cli-0.6.0a4}/src/gflow_cli/cli_run.py

@@ -15,7 +15,6 @@ from __future__ import annotations
 import asyncio
 import json
 import sys
-import time
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, cast
@@ -29,45 +28,16 @@ from gflow_cli.api.transports import EXPERIMENTAL_TRANSPORTS
 from gflow_cli.config import get_settings
 from gflow_cli.errors import ConfigurationError
 from gflow_cli.image_batch import (
-    ALLOWED_ASPECT_RATIOS as _ALLOWED_ASPECT_RATIOS,
-)
-from gflow_cli.image_batch import (
-    ALLOWED_MODELS as _ALLOWED_MODELS,
-)
-from gflow_cli.image_batch import (
-    DEFAULT_ASPECT_RATIO as _DEFAULT_ASPECT_RATIO,
-)
-from gflow_cli.image_batch import (
-    DEFAULT_COUNT as _DEFAULT_COUNT,
-)
-from gflow_cli.image_batch import (
-    DEFAULT_MODEL as _DEFAULT_MODEL,
-)
-from gflow_cli.image_batch import (
-    MAX_COUNT as _MAX_COUNT,
-)
-from gflow_cli.image_batch import (
-    MAX_PROMPTS as _MAX_PROMPTS,
-)
-from gflow_cli.image_batch import (
-    MAX_TEXT_LEN as _MAX_TEXT_LEN,
-)
-from gflow_cli.image_batch import (
-    MIN_COUNT as _MIN_COUNT,
-)
-from gflow_cli.image_batch import (
-    MIN_PROMPTS as _MIN_PROMPTS,
-)
-from gflow_cli.image_batch import (
-    MIN_TEXT_LEN as _MIN_TEXT_LEN,
-)
-from gflow_cli.image_batch import (
+    MAX_PROMPTS,
+    MIN_PROMPTS,
     BatchOutcome,
     BatchPromptItem,
+    parse_batch_item_dict,
     render_image_batch_summary,
     resolve_exit_code,
     run_image_batch,
 )
+from gflow_cli.paths import resolve_batch_output_dir
 
 console = Console()
 
@@ -75,9 +45,6 @@ console = Console()
 _ALLOWED_TOP_LEVEL_KEYS: frozenset[str] = frozenset(
     {"profile", "transport", "output_dir", "prompts"}
 )
-_ALLOWED_PROMPT_KEYS: frozenset[str] = frozenset(
-    {"text", "aspect_ratio", "model", "count", "output_filename"}
-)
 # ---------------------------------------------------------------------------
 # Dataclasses — validated config + per-prompt outcome.
 # ---------------------------------------------------------------------------
@@ -129,14 +96,17 @@ class BatchConfig:
         if not isinstance(prompts_raw_obj, list):
             raise ConfigurationError("'prompts' must be a JSON array.")
         prompts_raw = cast("list[Any]", prompts_raw_obj)
-        if not (_MIN_PROMPTS <= len(prompts_raw) <= _MAX_PROMPTS):
+
+        if not (MIN_PROMPTS <= len(prompts_raw) <= MAX_PROMPTS):
             raise ConfigurationError(
-                f"'prompts' must have between {_MIN_PROMPTS} and "
-                f"{_MAX_PROMPTS} entries (got {len(prompts_raw)})."
+                f"'prompts' must have between {MIN_PROMPTS} and "
+                f"{MAX_PROMPTS} entries (got {len(prompts_raw)})."
             )
         prompts: list[BatchPromptItem] = []
         for idx, p in enumerate(prompts_raw):
-            prompts.append(cls._parse_prompt(p, idx))
+            if not isinstance(p, dict):
+                raise ConfigurationError(f"prompts[{idx}] must be a JSON object.")
+            prompts.append(parse_batch_item_dict(cast("dict[str, Any]", p), idx))
 
         profile = data.get("profile")
         if profile is not None and (not isinstance(profile, str) or not profile):
@@ -155,73 +125,12 @@ class BatchConfig:
             output_dir=output_dir,
         )
 
-    @staticmethod
-    def _parse_prompt(p: object, idx: int) -> BatchPromptItem:
-        if not isinstance(p, dict):
-            raise ConfigurationError(f"prompts[{idx}] must be a JSON object.")
-        item = cast("dict[str, Any]", p)
-        unknown = set(item) - _ALLOWED_PROMPT_KEYS
-        if unknown:
-            raise ConfigurationError(
-                f"prompts[{idx}] has unknown key(s) {sorted(unknown)!r}. "
-                f"Valid: {sorted(_ALLOWED_PROMPT_KEYS)!r}."
-            )
-        text_raw = item.get("text")
-        if not isinstance(text_raw, str):
-            raise ConfigurationError(f"prompts[{idx}].text must be a string.")
-        if not (_MIN_TEXT_LEN <= len(text_raw) <= _MAX_TEXT_LEN):
-            raise ConfigurationError(
-                f"prompts[{idx}].text length must be between {_MIN_TEXT_LEN} "
-                f"and {_MAX_TEXT_LEN} (got {len(text_raw)})."
-            )
-        aspect_ratio = item.get("aspect_ratio", _DEFAULT_ASPECT_RATIO)
-        if aspect_ratio not in _ALLOWED_ASPECT_RATIOS:
-            raise ConfigurationError(
-                f"prompts[{idx}].aspect_ratio {aspect_ratio!r} is invalid. "
-                f"Valid: {list(_ALLOWED_ASPECT_RATIOS)!r}."
-            )
-        model = item.get("model", _DEFAULT_MODEL)
-        if model not in _ALLOWED_MODELS:
-            raise ConfigurationError(
-                f"prompts[{idx}].model {model!r} is invalid. Valid: {list(_ALLOWED_MODELS)!r}."
-            )
-        count = item.get("count", _DEFAULT_COUNT)
-        if not isinstance(count, int) or isinstance(count, bool):
-            raise ConfigurationError(f"prompts[{idx}].count must be an integer.")
-        if not (_MIN_COUNT <= count <= _MAX_COUNT):
-            raise ConfigurationError(
-                f"prompts[{idx}].count must be between {_MIN_COUNT} and {_MAX_COUNT} (got {count})."
-            )
-        output_filename = item.get("output_filename")
-        if output_filename is not None and (
-            not isinstance(output_filename, str) or not output_filename
-        ):
-            raise ConfigurationError(f"prompts[{idx}].output_filename must be a non-empty string.")
-        return BatchPromptItem(
-            text=text_raw,
-            aspect_ratio=aspect_ratio,
-            model=model,
-            count=count,
-            output_filename=output_filename,
-            index=idx,
-        )
-
 
 # ---------------------------------------------------------------------------
-# Helpers — output dir resolution + experimental-transport gating.
+# Helpers — experimental-transport gating.
 # ---------------------------------------------------------------------------
 
 
-def _resolve_output_dir(*, cli_override: Path | None, config_value: str | None) -> Path:
-    """CLI flag > config value > default (``out/<UTC-timestamp>/``)."""
-    if cli_override is not None:
-        return cli_override
-    if config_value is not None:
-        return Path(config_value)
-    stamp = time.strftime("%Y%m%dT%H%M%SZ", time.gmtime())
-    return Path("out") / stamp
-
-
 def _check_transport_gated(transport: str | None) -> None:
     """Per spec D.1 rule 5: experimental transports require env var.
 
@@ -325,7 +234,11 @@ def run(
     profile_name = _resolve_profile(profile or cfg.profile)
     provider_dir = _make_provider_dir(profile_name)
     settings = get_settings()
-    output_dir = _resolve_output_dir(cli_override=output_dir_override, config_value=cfg.output_dir)
+    output_dir = resolve_batch_output_dir(
+        cli_override=output_dir_override,
+        config_value=cfg.output_dir,
+        output_root=settings.output_dir,
+    )
 
     console.print(
         f"\n[bold]gflow run[/bold] · profile=[bold]{profile_name}[/bold] "

{gflow_cli-0.6.0a2 → gflow_cli-0.6.0a4}/src/gflow_cli/config.py

@@ -129,6 +129,16 @@ class Settings(BaseSettings):
 
     # --- runtime ----------------------------------------------------------
     timeout_seconds: int = Field(default=600, ge=1, le=3600)
+    auth_login_timeout: int = Field(
+        default=600,
+        ge=1,
+        le=86400,
+        description=(
+            "Seconds to wait for the user to complete interactive sign-in. "
+            "Applies to both Real Chrome (Passive Capture) and Internal Chromium strategies. "
+            "Override via GFLOW_CLI_AUTH_LOGIN_TIMEOUT."
+        ),
+    )
     concurrency: int = Field(default=1, ge=1, le=16)
     headless: bool = Field(
         default=True,

{gflow_cli-0.6.0a2 → gflow_cli-0.6.0a4}/src/gflow_cli/errors.py

@@ -270,7 +270,7 @@ class AuthLoginTimeoutError(GFlowError):
     _default_remediation = (
         "The sign-in was not completed within the allowed time. "
         "Run `gflow auth login` again and complete sign-in promptly. "
-        "Increase GFLOW_CLI_AUTH_TIMEOUT (seconds) if you need more time."
+        "Increase GFLOW_CLI_AUTH_LOGIN_TIMEOUT (seconds) if you need more time."
     )