coderouter-cli 2.9.3__py3-none-any.whl → 2.10.0__py3-none-any.whl

coderouter/cli.py

@@ -336,6 +336,78 @@ def _build_parser() -> argparse.ArgumentParser:
         ),
     )
 
+    # v2.10-A: `coderouter vscode-init` — scaffold a VSCode workspace so
+    # Claude Code launched from the integrated terminal auto-points at
+    # CodeRouter (no manual env-var juggling). Optionally writes .envrc
+    # for direnv users. Cline / Roo / Continue are covered by the cheat
+    # sheet printed on completion and docs/guides/vscode.md — this
+    # command deliberately does NOT touch those extensions' settings
+    # (their schemas change with their own release cadence).
+    vscode_init = sub.add_parser(
+        "vscode-init",
+        help="Scaffold VSCode workspace settings for CodeRouter (v2.10-A).",
+        description=(
+            "Write .vscode/settings.json (terminal.integrated.env.*) so a "
+            "Claude Code session launched from VSCode's integrated terminal "
+            "auto-points at CodeRouter. Optionally emit a direnv .envrc. "
+            "Idempotent: safe to re-run. Conflict-aware: refuses to overwrite "
+            "differing existing values without --force."
+        ),
+    )
+    vscode_init.add_argument(
+        "--target",
+        default=".",
+        metavar="PATH",
+        help="Workspace root (default: current directory).",
+    )
+    vscode_init.add_argument(
+        "--port",
+        type=int,
+        default=None,
+        metavar="PORT",
+        help=(
+            "CodeRouter port for ANTHROPIC_BASE_URL. Defaults to 8088 "
+            "(matches every docs / quickstart example). Note that "
+            "`coderouter serve` alone defaults to 4000; if you serve on "
+            "4000, pass --port 4000 here too."
+        ),
+    )
+    vscode_init.add_argument(
+        "--profile",
+        default=None,
+        metavar="NAME",
+        help=(
+            "Preload CODEROUTER_MODE=<profile> so the VSCode terminal "
+            "routes to a non-default profile without a per-request header."
+        ),
+    )
+    vscode_init.add_argument(
+        "--with-envrc",
+        action="store_true",
+        help=(
+            "Also write .envrc (direnv). Run `direnv allow` once after "
+            "generation. Tip: keep secrets in a separate .envrc.local."
+        ),
+    )
+    vscode_init.add_argument(
+        "--dry-run",
+        action="store_true",
+        help=(
+            "Compute all changes and print unified diffs, but do not write "
+            "any files. Byte-identical to the write path minus the final "
+            "os.replace."
+        ),
+    )
+    vscode_init.add_argument(
+        "--force",
+        action="store_true",
+        help=(
+            "Overwrite existing conflicting values. Without this flag, a "
+            "conflict is reported with a diff and the file is left "
+            "untouched (exit 2)."
+        ),
+    )
+
     return parser
 
 
@@ -432,6 +504,9 @@ def main(argv: list[str] | None = None) -> int:
     if args.command == "replay":
         return _run_replay(args)
 
+    if args.command == "vscode-init":
+        return _run_vscode_init(args)
+
     print(f"unknown command: {args.command}", file=sys.stderr)
     return 2
 
@@ -765,6 +840,56 @@ def _run_replay(args: argparse.Namespace) -> int:
     return 0
 
 
+def _run_vscode_init(args: argparse.Namespace) -> int:
+    """v2.10-A: drive :func:`coderouter.vscode_init.run_vscode_init`.
+
+    Kept small and testable — the actual scaffolding logic lives in
+    :mod:`coderouter.vscode_init` so tests can exercise it without
+    argparse in the way. This wrapper's job is:
+
+    * resolve the ``--target`` argument to a real directory
+    * map ``--port`` (default None) to the module's ``DEFAULT_PORT``
+    * translate exceptions (missing target directory) to a friendly
+      stderr message + exit 1
+    * print the formatted result and propagate the module's exit code
+    """
+    from coderouter.vscode_init import (
+        DEFAULT_PORT,
+        exit_code_for,
+        format_result,
+        run_vscode_init,
+    )
+
+    target = Path(args.target).expanduser()
+    if not target.is_dir():
+        print(
+            f"vscode-init: target directory does not exist: {target}",
+            file=sys.stderr,
+        )
+        return 1
+
+    port = args.port if args.port is not None else DEFAULT_PORT
+
+    try:
+        result = run_vscode_init(
+            target,
+            port=port,
+            profile=args.profile,
+            with_envrc=args.with_envrc,
+            dry_run=args.dry_run,
+            force=args.force,
+        )
+    except FileNotFoundError as exc:
+        # Raised only when target vanishes between the pre-check above
+        # and the module's own check — unlikely in practice, but map
+        # it to the same shape as the pre-check for consistency.
+        print(f"vscode-init: {exc}", file=sys.stderr)
+        return 1
+
+    print(format_result(result, dry_run=args.dry_run, port=port))
+    return exit_code_for(result)
+
+
 def _run_check_env(arg_value: str) -> int:
     """v1.6.3: filesystem / git security checks for `.env`.
 

coderouter/config/schemas.py

@@ -394,7 +394,7 @@ class ProviderConfig(BaseModel):
         default=False,
         description="If true, only used when ALLOW_PAID=true (plan.md §2.3).",
     )
-    timeout_s: float = Field(default=30.0, ge=1.0, le=600.0)
+    timeout_s: float = Field(default=30.0, ge=1.0, le=86400.0)
 
     # v2.6 language-tax track: path to a LOCAL ``tokenizer.json`` for this
     # provider's model, used to measure the CJK over-count vs the char/4
@@ -1460,6 +1460,49 @@ class LauncherOptionProfile(BaseModel):
     )
 
 
+class LauncherBenchConfig(BaseModel):
+    """The ``launcher.bench:`` block — defaults for the bench sweep feature.
+
+    設計 §4.1。デバイス構成スイープ(起動→readiness→外部ベンチ→停止→次)の
+    既定値を providers.yaml から供給する。未設定(``LauncherConfig.bench`` が
+    None)ならスイープ UI はハードコード既定を使う(完全後方互換)。すべての
+    フィールドに ``default`` があるので、既存 YAML は無改変で通過する。
+    """
+
+    model_config = ConfigDict(extra="forbid")
+
+    command_template: str = Field(
+        default="llmbench run --model local-openai --runs {runs}",
+        description=(
+            "外部ベンチコマンドのテンプレ。``{port}`` ``{config}`` "
+            "``{base_url}`` ``{results_dir}`` ``{runs}`` を単純置換で展開して "
+            "argv 化する(``str.format`` ではないので JSON 波括弧で誤爆しない)。"
+        ),
+    )
+    runs: int = Field(
+        default=5,
+        ge=1,
+        le=1000,
+        description="1 構成あたりのベンチ実行回数。``{runs}`` に展開される。",
+    )
+    results_dir: str | None = Field(
+        default=None,
+        description=(
+            "llmbench の results/ ディレクトリ。相対はサーバ CWD 基準。"
+            "設定時のみスイープ結果 JSON を読み比較サマリを付与する。"
+        ),
+    )
+    readiness_timeout_s: float = Field(
+        default=300.0,
+        ge=5.0,
+        le=3600.0,
+        description=(
+            "スイープの各構成でサーバが ready になるのを待つ最大秒数。"
+            "大きな GGUF ロードを考慮した既定 5 分。"
+        ),
+    )
+
+
 class SwapModelSpec(BaseModel):
     """One entry in ``launcher.swap.models`` (docs/designs/launcher-model-swap.md).
 
@@ -1863,6 +1906,13 @@ class LauncherConfig(BaseModel):
             "behavior."
         ),
     )
+    bench: LauncherBenchConfig | None = Field(
+        default=None,
+        description=(
+            "デバイス構成ベンチスイープ(設計 §4)の既定値。None(既定)なら "
+            "スイープ UI はハードコード既定を使う=完全後方互換。"
+        ),
+    )
 
     @model_validator(mode="after")
     def _check_auto_restart_backoff_ordered(self) -> LauncherConfig: