@workweave/router 0.1.7 → 0.1.8

package/install.sh

@@ -1035,6 +1035,19 @@ json_get() {
   jq -r "${2} // empty" "$1" 2>/dev/null || true
 }
 
+# claude_key_present returns 0 when the given settings file's
+# env.ANTHROPIC_CUSTOM_HEADERS carries the router key header. "On" is only valid
+# when this is true: in project scope the committed settings.json holds the
+# router URL but the key header lives only in the per-teammate settings.local.json
+# (or the parked sidecar), so a router URL alone doesn't mean requests can
+# authenticate.
+claude_key_present() {
+  case "$(json_get "$1" '.env.ANTHROPIC_CUSTOM_HEADERS')" in
+    *X-Weave-Router-Key*) return 0 ;;
+    *) return 1 ;;
+  esac
+}
+
 # gitignore_add appends an entry to the repo .gitignore in project scope so a
 # parked sidecar (which may carry the router key header) never gets committed.
 # No-op for user scope and --dir, matching how install handles its own ignores.
@@ -1056,6 +1069,15 @@ toggle_claude() {
   else
     active="$settings_file"
   fi
+  # Symlink containment for the parked sidecar: project/--dir paths come from a
+  # possibly-hostile repo, and `off` writes $parked via shell redirection (which
+  # follows symlinks). A repo could pre-place it as a symlink to clobber an
+  # arbitrary file or siphon the router-key-bearing parked data. The config
+  # files themselves are already guarded during path resolution; this covers the
+  # sidecar. User scope ($HOME) is trusted, matching the installer.
+  if [ "$scope" = "project" ] || [ -n "$install_dir" ]; then
+    refuse_if_symlink "$parked"
+  fi
   local parked_present="false"
   if [ -f "$parked" ]; then parked_present="true"; fi
   committed_base="$(json_get "$settings_file" '.env.ANTHROPIC_BASE_URL')"
@@ -1071,12 +1093,23 @@ toggle_claude() {
         if [ -n "$local_base" ] && ! router_shaped_url "$local_base"; then
           ok "Claude Code (project): ${C_BOLD}off${C_RESET} — routing directly to Anthropic. Run '$on_hint' to re-enable."
         elif router_shaped_url "$committed_base"; then
-          ok "Claude Code (project): ${C_BOLD}on${C_RESET} — routing through $committed_base."
+          # Router URL is committed, but it only authenticates if this teammate's
+          # settings.local.json carries the key header. A fresh clone (shared
+          # settings.json, no personal local file) has the URL but no key.
+          if claude_key_present "$local_settings_file"; then
+            ok "Claude Code (project): ${C_BOLD}on${C_RESET} — routing through $committed_base."
+          else
+            warn "Claude Code (project): router URL is set but your personal router key is missing (no settings.local.json) — requests won't authenticate. Run the installer to add your key."
+          fi
         else
           info "Claude Code (project): not configured for the router. Run the installer first."
         fi
       elif router_shaped_url "$committed_base"; then
-        ok "Claude Code: ${C_BOLD}on${C_RESET} — routing through $committed_base."
+        if claude_key_present "$settings_file"; then
+          ok "Claude Code: ${C_BOLD}on${C_RESET} — routing through $committed_base."
+        else
+          warn "Claude Code: router URL is set but the router key header is missing — requests won't authenticate. Run the installer to restore it."
+        fi
       else
         info "Claude Code: not configured for the router. Run the installer first."
       fi
@@ -1125,22 +1158,53 @@ toggle_claude() {
         if [ "$proj" = "true" ]; then
           local_base="$(json_get "$local_settings_file" '.env.ANTHROPIC_BASE_URL')"
           if [ -n "$local_base" ] && ! router_shaped_url "$local_base"; then
-            merged="$(jq '(.env // {}) |= del(.ANTHROPIC_BASE_URL)
-                          | (if (.env // {} | length) == 0 then del(.env) else . end)' "$local_settings_file")"
-            printf '%s\n' "$merged" >"$local_settings_file"
-            chmod 600 "$local_settings_file"
-            ok "Claude Code is now ${C_BOLD}on${C_RESET} (routing through the Weave Router). Restart Claude Code for it to take effect."
+            # We're off, but the parked sidecar is gone. The router key header
+            # lives only in the local file / sidecar in project scope — never in
+            # committed settings.json — so we can only re-enable cleanly if the
+            # header survived in the local file. If it didn't, clearing the
+            # override would point Claude Code at the router with no auth
+            # (401s); leave the working direct setup in place and tell the user
+            # to reinstall instead of faking success.
+            if claude_key_present "$local_settings_file"; then
+              merged="$(jq '(.env // {}) |= del(.ANTHROPIC_BASE_URL)
+                            | (if (.env // {} | length) == 0 then del(.env) else . end)' "$local_settings_file")"
+              printf '%s\n' "$merged" >"$local_settings_file"
+              chmod 600 "$local_settings_file"
+              ok "Claude Code is now ${C_BOLD}on${C_RESET} (routing through the Weave Router). Restart Claude Code for it to take effect."
+            else
+              warn "Claude Code is off and the parked router key is missing (its sidecar was deleted). Re-run the installer to restore the router key — leaving the current direct-to-Anthropic setup in place so requests don't fail auth."
+            fi
             return 0
           fi
         fi
-        if router_shaped_url "$committed_base"; then
+        # No direct override (or user scope). "On" requires both the router URL
+        # and the key header — a committed router URL with no local key (e.g. a
+        # fresh clone) can't authenticate, so don't claim it's already on.
+        if ! router_shaped_url "$committed_base"; then
+          warn "No parked router config found. Run the installer to set up Claude Code."
+        elif claude_key_present "$active"; then
           ok "Claude Code is already on — nothing to do."
         else
-          warn "No parked router config found. Run the installer to set up Claude Code."
+          # $active is settings.local.json in project scope, settings.json for
+          # user/--dir — name the right file so the hint isn't misleading.
+          warn "Router URL is set but the router key is missing — run the installer to add your key (written to $(basename "$active"))."
         fi
         return 0
       fi
-      parked_env="$(jq '.env' "$parked")"
+      # Sidecar present: restore it — but only if the result actually carries
+      # the router key. An off that ran with an empty/absent settings.local.json
+      # parks {"env":{}}; blindly restoring that would drop the direct override
+      # and leave the committed router URL unauthenticated while printing
+      # success. Refuse that and tell the user to reinstall.
+      parked_env="$(jq -c '.env // {}' "$parked")"
+      parked_has_key="false"
+      if printf '%s' "$parked_env" | jq -e '(.ANTHROPIC_CUSTOM_HEADERS // "") | test("X-Weave-Router-Key")' >/dev/null 2>&1; then
+        parked_has_key="true"
+      fi
+      if [ "$parked_has_key" != "true" ] && ! claude_key_present "$active"; then
+        warn "Can't re-enable: the parked config has no router key (it was created without one). Re-run the installer to set up your router key — leaving the current direct-to-Anthropic setup in place."
+        return 0
+      fi
       merged="$(jq --argjson p "$parked_env" '.env = (((.env // {}) | del(.ANTHROPIC_BASE_URL)) + $p)' "$active")"
       printf '%s\n' "$merged" >"$active"
       [ "$proj" = "true" ] && chmod 600 "$active"
@@ -1206,6 +1270,12 @@ toggle_codex() {
 toggle_opencode() {
   local f="$opencode_config_file" parked="$opencode_dir/.weave-parked.json"
   local model="" has_weave="false" parked_present="false" on="false" restore_model merged
+  # Symlink containment for the parked sidecar — `off` writes it via shell
+  # redirection; a hostile project repo could pre-place it as a symlink. The
+  # opencode.json itself is already guarded during path resolution.
+  if [ "$scope" = "project" ] || [ -n "$install_dir" ]; then
+    refuse_if_symlink "$parked"
+  fi
   if [ -f "$parked" ]; then parked_present="true"; fi
   if [ -f "$f" ]; then
     model="$(jq -r '.model // empty' "$f" 2>/dev/null || true)"
@@ -1243,6 +1313,16 @@ toggle_opencode() {
         restore_model="$(jq -r '.model // "weave/claude-sonnet-4-6"' "$parked")"
       elif [ "$has_weave" != "true" ]; then
         warn "opencode isn't configured for the router. Run the installer first."; return 0
+      else
+        # No parked model (sidecar deleted by hand). Derive the default from the
+        # installed provider.weave.models block rather than a hardcoded literal
+        # that silently diverges when the installer's default changes — prefer a
+        # sonnet entry, else the first model the installer registered.
+        restore_model="$(jq -r '
+          (.provider.weave.models // {} | keys) as $k
+          | (([$k[] | select(test("sonnet"))] | first) // $k[0] // "claude-sonnet-4-6")
+          | "weave/" + .
+        ' "$f" 2>/dev/null || echo "weave/claude-sonnet-4-6")"
       fi
       merged="$(jq --arg m "$restore_model" '.model = $m' "$f")"
       printf '%s\n' "$merged" >"$f"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workweave/router",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "One-command installer that points Claude Code at the Weave Router.",
   "bin": {
     "weave-router": "bin.js"