coderouter-cli 2.13.0__py3-none-any.whl → 2.14.0__py3-none-any.whl

coderouter/vscode_init.py

@@ -395,7 +395,19 @@ def _apply_envrc(
     force: bool,
     dry_run: bool,
 ) -> FileOutcome:
-    new_text = _render_envrc(base_url=base_url, profile=profile)
+    """Write (or refresh) the managed block in ``.envrc``.
+
+    Three cases, and only the third can refuse:
+
+    * **No file** — create it with the fenced block.
+    * **Fenced file** — replace the block, keep everything outside it
+      byte-for-byte. No ``--force`` needed; this is not destructive.
+    * **Unfenced file we did not write** — refuse, unless ``--force``,
+      which now *appends* the block rather than replacing the file. The
+      operator's lines survive either way.
+    """
+    block = _render_envrc_block(base_url=base_url, profile=profile)
+
     old_text = ""
     if path.exists():
         try:
@@ -407,32 +419,76 @@ def _apply_envrc(
                 reason=f"cannot read existing file: {exc}",
             )
 
+    if not old_text:
+        new_text = block + "\n"
+    else:
+        split = _split_managed_block(old_text)
+        if split is None and _looks_like_our_legacy_output(
+            old_text, base_url=base_url, profile=profile
+        ):
+            # Our own pre-v2.14.0 output: adopt it into the fence silently.
+            split = ("", "")
+        if split is None:
+            outside = ""  # --force adopts the file wholesale; see below
+            if not force:
+                would = old_text.rstrip("\n") + "\n\n" + block + "\n"
+                return FileOutcome(
+                    path=path,
+                    action="conflict",
+                    diff=_text_diff(old_text, would, path),
+                    reason=(
+                        ".envrc exists and carries no "
+                        f"`{_ENVRC_BEGIN}` fence, so CodeRouter did not write it. "
+                        "Re-run with --force to APPEND the managed block "
+                        "(your existing lines are kept — unlike before "
+                        "v2.14.0, --force no longer replaces the whole file); "
+                        f"the previous contents are still saved to "
+                        f"{_backup_path(path).name}."
+                    ),
+                )
+            # --force on an unfenced file means "adopt it, mine wins". The
+            # block is APPENDED, not substituted for the file: direnv applies
+            # exports in order, so a duplicate the operator already had is
+            # shadowed rather than deleted, and their other lines survive. The
+            # conflict scan is skipped here on purpose — refusing would leave
+            # --force with nothing it could actually do.
+            new_text = old_text.rstrip("\n") + "\n\n" + block + "\n"
+        else:
+            before, after = split
+            outside = before + after
+            new_text = (
+                before.rstrip("\n") + ("\n\n" if before.strip() else "")
+            ) + block + ("\n\n" + after.lstrip("\n") if after.strip() else "\n")
+
+        conflicts = _unmanaged_conflicts(outside)
+        if conflicts:
+            # direnv applies exports in order, so a duplicate outside the
+            # fence would silently win or lose depending on placement.
+            # Refusing is the only answer that cannot surprise anyone.
+            return FileOutcome(
+                path=path,
+                action="conflict",
+                diff=_text_diff(old_text, new_text, path),
+                reason=(
+                    "these variables are already exported outside the managed "
+                    f"block: {', '.join(conflicts)}. CodeRouter will not write "
+                    "a second export for a value you own — direnv would apply "
+                    "whichever comes last. Remove your line, or move it inside "
+                    f"`{_ENVRC_BEGIN}` … `{_ENVRC_END}`."
+                ),
+            )
+
     if new_text == old_text:
         return FileOutcome(path=path, action="unchanged")
 
     diff = _text_diff(old_text, new_text, path)
 
-    if old_text and not force:
-        return FileOutcome(
-            path=path,
-            action="conflict",
-            diff=diff,
-            reason=(
-                ".envrc already exists and its contents differ. "
-                "Re-run with --force to replace the WHOLE file with the "
-                "generated contents (this is not a merge — custom lines "
-                "such as `source_env_if_exists .envrc.local` are dropped); "
-                f"the previous contents are saved to {_backup_path(path).name}. "
-                "(Tip: keep secrets in a separate .envrc.local and "
-                "``source_env_if_exists`` from .envrc.)"
-            ),
-        )
-
     reason = ""
     if not dry_run:
-        # H-11: --force replaces the whole file, so stash the old bytes
-        # (mode included) before they are gone. Inside the dry_run guard
-        # on purpose — --dry-run must not touch the filesystem at all.
+        # H-11: keep the old bytes (mode included) even though the write is
+        # now surgical. A bug in the fence logic would take exactly this
+        # path. Inside the dry_run guard on purpose — --dry-run must not
+        # touch the filesystem at all.
         if old_text:
             backup = _make_backup(path)
             reason = (
@@ -463,6 +519,86 @@ def _apply_envrc(
     )
 
 
+# ---------------------------------------------------------------------------
+# v2.14.0 — marker-delimited managed block in .envrc
+# ---------------------------------------------------------------------------
+#
+# Until now, ``--force`` on ``.envrc`` was a whole-file replace: it wrote the
+# generated contents over whatever was there, dropping any line the operator
+# had added. That is how H-11 happened, and "we back it up first" only helps
+# somebody who knows to look for the backup.
+#
+# The fix is the one codex-router uses on ``~/.codex/config.toml``: fence the
+# part we own between markers, rewrite only that, and leave everything else
+# byte-for-byte. Once the fence exists, a re-run is no longer destructive, so
+# it needs no ``--force`` at all — ``--force`` shrinks back to its honest
+# meaning of "yes, adopt a file I did not write".
+
+_ENVRC_BEGIN = "# BEGIN coderouter-managed"
+_ENVRC_END = "# END coderouter-managed"
+
+# The variables the managed block owns. A value for one of these sitting
+# OUTSIDE the block is a conflict we refuse rather than silently shadow —
+# direnv applies exports in order, so whichever came last would win and the
+# operator would have no idea which one is live.
+_MANAGED_ENVRC_VARS = ("ANTHROPIC_BASE_URL", "ANTHROPIC_AUTH_TOKEN", "CODEROUTER_MODE")
+
+
+def _split_managed_block(text: str) -> tuple[str, str] | None:
+    """Split ``text`` around the managed block.
+
+    Returns ``(before, after)`` with the block (and its markers) removed,
+    or ``None`` when the file carries no fence. A file with a begin marker
+    and no end marker also returns ``None`` — a half-written fence is not
+    something to guess at, and the caller turns that into a refusal.
+    """
+    start = text.find(_ENVRC_BEGIN)
+    if start == -1:
+        return None
+    end = text.find(_ENVRC_END, start)
+    if end == -1:
+        return None
+    return text[:start], text[end + len(_ENVRC_END) :].lstrip("\n")
+
+
+def _render_envrc_block(*, base_url: str, profile: str | None) -> str:
+    """The fenced block CodeRouter owns, markers included."""
+    lines = [
+        _ENVRC_BEGIN,
+        "# Managed by `coderouter vscode-init`. Edits inside this block are",
+        "# overwritten on the next run; put your own lines outside it.",
+        f'export ANTHROPIC_BASE_URL="{base_url}"',
+        f'export ANTHROPIC_AUTH_TOKEN="{DEFAULT_TOKEN}"',
+    ]
+    if profile:
+        lines.append(f'export CODEROUTER_MODE="{profile}"')
+    lines.append(_ENVRC_END)
+    return "\n".join(lines)
+
+
+def _unmanaged_conflicts(outside_text: str) -> list[str]:
+    """Managed variables the operator exports outside our block."""
+    found: list[str] = []
+    for line in outside_text.splitlines():
+        stripped = line.strip()
+        if stripped.startswith("#"):
+            continue
+        for var in _MANAGED_ENVRC_VARS:
+            if stripped.startswith((f"export {var}=", f"{var}=")) and var not in found:
+                found.append(var)
+    return found
+
+
+def _looks_like_our_legacy_output(text: str, *, base_url: str, profile: str | None) -> bool:
+    """True when the file is byte-identical to a pre-v2.14.0 generation.
+
+    An operator upgrading has an unfenced ``.envrc`` that we wrote — asking
+    them to pass ``--force`` to adopt our own previous output would be
+    rude, and appending a second block would double the exports.
+    """
+    return text == _render_envrc(base_url=base_url, profile=profile)
+
+
 def _render_envrc(*, base_url: str, profile: str | None) -> str:
     """Build the .envrc contents. Kept split for test targeting."""
     lines = [

{coderouter_cli-2.13.0.dist-info → coderouter_cli-2.14.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coderouter-cli
-Version: 2.13.0
+Version: 2.14.0
 Summary: Local-first, free-first, fallback-built-in LLM router. Claude Code / OpenAI compatible.
 Project-URL: Homepage, https://github.com/zephel01/CodeRouter
 Project-URL: Repository, https://github.com/zephel01/CodeRouter

{coderouter_cli-2.13.0.dist-info → coderouter_cli-2.14.0.dist-info}/RECORD

@@ -1,10 +1,11 @@
 coderouter/__init__.py,sha256=ghdjPrLtnRzY8fyQ4CJZI1UJKADyNTLtA3G7se8H7Ns,696
 coderouter/__main__.py,sha256=-LCgxJnvgUV240HjQKv7ly-mn2NuKHpC4nCpvTHjeSU,130
-coderouter/cli.py,sha256=TyI29d8-Zc8SClcKn92Oj8DGyQRxMpBSWTxLiFTH3Qo,37043
+coderouter/cli.py,sha256=Nbx1ur_HnssFtuM48yPELwhY40veVNnTAfK7OVF2uVc,42400
 coderouter/cli_stats.py,sha256=CCjzc1G4hTRHZ2gG1XhxhDpUkJnnl3NXbcbp1T18jpg,29894
 coderouter/cost.py,sha256=32h6uzb4nxh2eA5d2Hn3kD9yJbtis6CFDAbeIy5KRkM,7431
+coderouter/credentials.py,sha256=R_PdrcA941_jJX_U8hxrjPDTCVVzLd4dsw2c00KwAwE,12991
 coderouter/doctor.py,sha256=wmPunlvqm2s7x3VGLjexqHPLD2oejwE3Mu04V8y-xn4,89869
-coderouter/doctor_apply.py,sha256=UqRvzRqENHWqsL3OCsuSotNdxCMw5rP2LnCWMBLmZow,28033
+coderouter/doctor_apply.py,sha256=tZT3bEd1G6t67YRhf1TGY4NlSvZuJJbnEqN-3AKy8Hc,29972
 coderouter/env_security.py,sha256=FEBZnXfJ0xE39kmMMn39zk0W_DRRnmcB_REmP9f4xWo,14796
 coderouter/errors.py,sha256=Xmq67lheyw8iv3Ox39jh2c4tvNI5RcUR4QkoxVDN6l4,1130
 coderouter/gguf_introspect.py,sha256=Scu0JjUfLHj7T7TL0HQIm1AZcGYrXsjkaMMSN9HkTro,16121
@@ -13,21 +14,23 @@ coderouter/language_tax.py,sha256=LTbE3tIfoJuV2O3T0NixRKhzq_dEOTUuPEerJv2q9uk,93
 coderouter/launcher_devices.py,sha256=DAV34Q1crGptmj1zOAk21YQzlxQNAt5Ud7qcldTD95w,29406
 coderouter/launcher_speculative.py,sha256=h0RTGsD1Y56sJVywDJwybrT75_Ta3GF1Jz_B1d42aPg,12931
 coderouter/launcher_swap.py,sha256=tMW5ZElDdf9T1VQGsUkvfLiSCdj_oXN_UtkV7DE8ySY,24175
-coderouter/logging.py,sha256=5rfi4_R4aoeeUYDc642dgs61wA0aBX7wvubyB-k3Uyo,58074
+coderouter/logging.py,sha256=jhEyCNqvES6x8bohn-F6CofxRNY8vyKfmli0Tj8RYWU,58472
 coderouter/output_filters.py,sha256=0ry_rPiS_kC-FnHgaNVP6v7e6Al2djxzu9vBzZ8kEkE,25314
+coderouter/rollback.py,sha256=Bqxx1MALTDLYc0BtGMEMqRyiZIWFoAZJH_RBQw-M5ow,7675
+coderouter/secret_redaction.py,sha256=Rg71gqKN6jnybZ6UvCvXIvnThI9uRBvmOqC2grSUSUk,23159
 coderouter/token_estimation.py,sha256=7klQYA4FIg1vtjQGWAhwiBhiLwyz8KTetrLVXFJLGIc,16957
 coderouter/token_estimation_accurate.py,sha256=GTfzrBVnvAGjeVzmzAeUdOYZvWZKLAxcxPpFiJGlzjk,4609
-coderouter/vscode_init.py,sha256=fW0chCDTngvWQuJgQ7aqYmE6hnZO3hCk8mAiEkZ9FCo,26741
+coderouter/vscode_init.py,sha256=fM-f9RbX91F8ioVoiltoU5Hfp2Z6E7vxppSTmrvKTaQ,32969
 coderouter/adapters/__init__.py,sha256=7dIDSZ-FE_0iSqLSDc_lK1idRdLTKcM2hP9tCJipgPI,463
-coderouter/adapters/anthropic_native.py,sha256=-FGTQFlFL5Z2IZms4NUGPcNkIN-fVvQrCY8e8nxW17s,24777
+coderouter/adapters/anthropic_native.py,sha256=jGeJqL13mYyPfmwTsYFoi89-Uq-yxdZxvhfnbGdjH4U,24931
 coderouter/adapters/base.py,sha256=ykKMaiIVVGr23oFFXilK2iP_YhI8-CtsEiJyFXaC9bE,10396
-coderouter/adapters/openai_compat.py,sha256=wcrd_UpV7N6ISpUyKvdFPGU-YjCrX5oMqGpjAFEeWfg,20356
+coderouter/adapters/openai_compat.py,sha256=aGdXi7XpsGVFP-vzy-b2z6CEvuGYmc8smLvSKjOeqM0,20580
 coderouter/adapters/registry.py,sha256=XNc1wmFv_oZlqKS0rA693TRDdbq1sZ-OIcofXOVOtq0,3680
 coderouter/config/__init__.py,sha256=FODEn74fN-qZnt4INPSHswqhOlEgpL6-_onxsitSx8g,274
 coderouter/config/capability_registry.py,sha256=RZgzHF54dXy0CCDocRCz2ee21qXGbbgTSKTkRI9iLL4,16936
 coderouter/config/env_file.py,sha256=CoMK27fuAXm-NtoLzXb8yN2E-wDFjHQuFwiIlmgTBQw,10356
-coderouter/config/loader.py,sha256=vk1LFm-OCiyq2GB5G53g7kTnrJgmQjkZPqgr9X13wpc,11294
-coderouter/config/schemas.py,sha256=J05km7-YXgNxy6guKUDcNsuMyJ21SnDIurjx8Rz_hSg,136672
+coderouter/config/loader.py,sha256=7FoJXWaO_vN9FAjUStJDwI4aAYcUQQgMJtq5BNy8Pnc,12419
+coderouter/config/schemas.py,sha256=y4zdG0S1k-kGYYM8XrMpYB6BR1HBxc2XMX6bTftRWpQ,142367
 coderouter/data/__init__.py,sha256=uNyfD9jaCvTWsBAWtaw1Fr25OSxzv3psGMfBjT1z0Cc,328
 coderouter/data/model-capabilities.yaml,sha256=S9jt6SC6-3s2-icZ_n-a14iEMnc2yB1C2R6q-N_tZWQ,19309
 coderouter/guards/__init__.py,sha256=5qliYBqygvVPneej7nx0uSjxDKsz7t8VzvrDgVBJlvU,1170
@@ -44,10 +47,11 @@ coderouter/guards/tool_loop.py,sha256=EzeMcmU7BLeTW2jsRVevU81l5rhWcn1oUr7EpzgXjV
 coderouter/ingress/__init__.py,sha256=WQsCH2CGJCAhy0mS6GSEdeYZRkkQu2OHDsP4CJWTLug,155
 coderouter/ingress/anthropic_routes.py,sha256=1ThXzx8VgxRV7UCi3NF5ey7kbr0ADPKTXyQuYS5gK1w,27063
 coderouter/ingress/app.py,sha256=ZOx7dSvMxaWS4CzXOOEwgzFuycAVgAeWKCN6lFNF-F0,22433
-coderouter/ingress/dashboard_routes.py,sha256=1SqNNrVTfQiZcx5n2MvjAzWirittX0e61tCt-MKp4Ag,25617
+coderouter/ingress/dashboard_routes.py,sha256=nPW5_pJe27-hzqCs4sqVVn0BrgXB_7Wcd4qZ6cirvWo,26736
 coderouter/ingress/launcher_routes.py,sha256=uP_Otp9JE0fydUt1YP-wYcnS8Kj5RPLNIFf88YpfkPM,141535
-coderouter/ingress/metrics_routes.py,sha256=M22dwOGn24P05Ge4W3c7d7mYytSGWjIR-pPSPOAiHJY,3965
+coderouter/ingress/metrics_routes.py,sha256=4s_f9CY8nVIdQBfXxyUMlN7r5_cXHOaAu7PvNbUuoxg,4609
 coderouter/ingress/openai_routes.py,sha256=TrugsQNJfNPgKKLzfT1aXzrs4emWYGE4XebEBuaZoWk,12505
+coderouter/ingress/ui_auth.py,sha256=uCWB5IaMQRNFYdY39FQ5DDVhsoRQJoqimZNSAu_QK_Q,3742
 coderouter/metrics/__init__.py,sha256=7Es351DPS7yLM0yVF_F0eesmiD83n7Zzhie44chht38,1465
 coderouter/metrics/collector.py,sha256=wdGuX5yOBWEHCz1KVIfaUBZP5NXW3U34yyYlLGwgoCE,61212
 coderouter/metrics/prometheus.py,sha256=THYkvrcpQK3ZNW-BV0h3O-PoT2ppNZ0dapQuu1nyHwE,24410
@@ -62,9 +66,9 @@ coderouter/routing/budget.py,sha256=PblmVKJGs_BwNa9uDHAA8hmZ4XIVKv38mHAeU0V3OMs,
 coderouter/routing/capability.py,sha256=rRQhzTgQYFTFDNYcSLKvq3xjdw6B1w7T-3jS7PTMI14,27864
 coderouter/routing/fallback.py,sha256=fqwjz5hTNsQDEf45nYcVTwGJwz2mFxQ5ZmZwdvFSKsI,156394
 coderouter/state/__init__.py,sha256=XoGcPmmBQSiZWML2S0juSveQ78xfhtdeCliNnVyzu7E,1088
-coderouter/state/audit_log.py,sha256=n7vuDsTfd5iuNUJhlRQPakJ2tMSsT9EfgPCzs1GEaac,10941
+coderouter/state/audit_log.py,sha256=-6okO4NZ63a0C4Q2BHwhBHqB-0NlwOgSN_d4ProDFhM,11227
 coderouter/state/replay.py,sha256=Z_YHKroTKZdrL8qObFxcoLOAQWWXZvXFdLfxzvBhEJg,11230
-coderouter/state/request_log.py,sha256=mNxQJ9IDGpUtT5rZbCo_-CTyhxmvig7C2Gfvdn9rcss,8612
+coderouter/state/request_log.py,sha256=JlEvkWHwGtoLesnqr0XJy9CyXQDX4ZRHFMTPJ_0FegQ,8898
 coderouter/state/store.py,sha256=h-rsMJq8GILsOfCP94nI40cuHaj4Vqycsm9UNN77REI,7445
 coderouter/state/suggest_rules.py,sha256=FvdhEvao5NvdKp9zs8AkcoFKHY4yqqXY2HekvSjpDFA,16670
 coderouter/translation/__init__.py,sha256=PYXN7XVEwpG1uC8RLy6fvnGbzEZhhrEuUapH8IYOtG8,1788
@@ -72,8 +76,8 @@ coderouter/translation/anthropic.py,sha256=ZQQGS9itN_3o7IKD68lKr5gR_Kem32Jsd7OcG
 coderouter/translation/convert.py,sha256=VrstDAMsUpcQ1VgMTn_-ETp1OjGX8v0ZGhCkcd4icyU,53037
 coderouter/translation/tool_repair.py,sha256=1p8rmdyyscGX2g0DDOYitMnLv-nKfR1SLuLaRB4z7GM,64244
 coderouter/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-coderouter_cli-2.13.0.dist-info/METADATA,sha256=J6h8klUNsTIhWoMjrax70AR9nCFXYK_rFP2tbpChn8I,16897
-coderouter_cli-2.13.0.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-coderouter_cli-2.13.0.dist-info/entry_points.txt,sha256=-dnLfD1YZ2WjH2zSdNCvlO65wYltM9bsHt9Fhg3yGss,51
-coderouter_cli-2.13.0.dist-info/licenses/LICENSE,sha256=wkEzoR86jFw33jvfOHjULqmkGEfxTFMgMaJnpR8mPRw,1065
-coderouter_cli-2.13.0.dist-info/RECORD,,
+coderouter_cli-2.14.0.dist-info/METADATA,sha256=GFrjK39UG8-agX8MIVToBeSanFbzCJ0zRVCfktderhs,16897
+coderouter_cli-2.14.0.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+coderouter_cli-2.14.0.dist-info/entry_points.txt,sha256=-dnLfD1YZ2WjH2zSdNCvlO65wYltM9bsHt9Fhg3yGss,51
+coderouter_cli-2.14.0.dist-info/licenses/LICENSE,sha256=wkEzoR86jFw33jvfOHjULqmkGEfxTFMgMaJnpR8mPRw,1065
+coderouter_cli-2.14.0.dist-info/RECORD,,