@workweave/router 0.2.2 → 0.2.4

package/pi-router/src/dispatch.ts

@@ -301,7 +301,7 @@ export function registerDispatch(pi: ExtensionAPI, selfPath: string): void {
 			if (!key) {
 				return {
 					content: [
-						{ type: "text", text: "Weave dispatch unavailable: no router key (set WEAVE_ROUTER_KEY or run the --pi installer)." },
+						{ type: "text", text: "Weave Router dispatch unavailable: no router key (set WEAVE_ROUTER_KEY or run the --pi installer)." },
 					],
 					details: { results: [] as ChildResult[] },
 					isError: true,
@@ -337,7 +337,7 @@ export function registerDispatch(pi: ExtensionAPI, selfPath: string): void {
 				const preview = t.prompt.length > 60 ? `${t.prompt.slice(0, 60)}...` : t.prompt;
 				text += `\n  ${theme.fg("dim", preview)}`;
 			}
-			if (tasks.length > 3) text += `\n  ${theme.fg("muted", `... +${tasks.length - 3} more`)}`;
+			if (tasks.length > 3) text += `\n  ${theme.fg("muted", `… +${tasks.length - 3} more`)}`;
 			return new Text(text, 0, 0);
 		},
 	});

package/pi-router/src/index.ts

@@ -1,5 +1,5 @@
 /**
- * @workweave/router — route the pi coding agent through the WorkWeave Router.
+ * @workweave/router — route the pi coding agent through the Weave Router.
  *
  * Wiring (all on the existing router surface — no router source change beyond
  * the installer):

package/pi-router/src/provider.ts

@@ -28,7 +28,7 @@ export function registerWeave(pi: ExtensionAPI): void {
 		// key there is fatal rather than silently routing on quality knobs.
 		if (isSubagent()) {
 			throw new Error(
-				"Weave: no router key found (set WEAVE_ROUTER_KEY or write ~/.pi/agent/.weave_router_key).",
+				"Weave Router: no router key found (set WEAVE_ROUTER_KEY or write ~/.pi/agent/.weave_router_key).",
 			);
 		}
 		return;

package/pi-router/src/routed-model.ts

@@ -23,7 +23,7 @@ export function registerRoutedModel(pi: ExtensionAPI): void {
 
 		if (ctx.hasUI) {
 			ctx.ui.setStatus(STATUS_KEY, `routed: ${model}`);
-			ctx.ui.notify(`Weave routed to ${model}`, "info");
+			ctx.ui.notify(`Weave Router routed to ${model}`, "info");
 		} else {
 			process.stderr.write(`${ROUTED_MODEL_STDERR_PREFIX} ${model}\n`);
 		}

package/uninstall.sh

@@ -54,7 +54,7 @@ while [ $# -gt 0 ]; do
       ;;
     --dir)
       install_dir="${2:-}"; shift 2
-      [ -n "$install_dir" ] || { err "--dir requires a path"; exit 2; }
+      [ -n "$install_dir" ] || { err "--dir requires a path."; exit 2; }
       ;;
     --codex)
       target="codex"; shift
@@ -78,7 +78,7 @@ while [ $# -gt 0 ]; do
       exit 0
       ;;
     *)
-      err "unknown flag: $1"; exit 2
+      err "Unknown flag: $1. Run --help for usage."; exit 2
       ;;
   esac
 done
@@ -136,7 +136,7 @@ if [ "$target" = "opencode" ]; then
         "~/"*)  project_dir="$HOME/${project_dir#~/}" ;;
       esac
       if [ ! -d "$project_dir" ]; then
-        err "directory does not exist: $project_dir"
+        err "Directory does not exist: $project_dir."
         exit 1
       fi
       project_dir="$(cd "$project_dir" && pwd)"
@@ -155,14 +155,30 @@ if [ "$target" = "opencode" ]; then
   opencode_config_file="$opencode_dir/opencode.json"
   refuse_if_symlink "$opencode_config_file"
 
+  # Canonicalize the plugin path exactly as install.sh did (`cd … && pwd`) so
+  # the `plugin` array entry matches on removal — a raw "$opencode_dir/…" string
+  # can differ (symlinks, trailing slash) and leave the entry behind.
+  if [ -d "$opencode_dir" ]; then
+    opencode_plugin="$(cd "$opencode_dir" && pwd)/.weave/opencode-weave.ts"
+  else
+    opencode_plugin="$opencode_dir/.weave/opencode-weave.ts"
+  fi
   if [ -f "$opencode_config_file" ]; then
-    # Strip `provider.weave` and any router-pointing top-level model. Other
-    # providers, user-set models that don't reference the router, and any
+    # Strip every managed provider (`weave`, the login-only `weave-claude`, and
+    # the legacy `weave-codex` from pre-upgrade installs), the managed plugin
+    # entry from the `plugin` array, and any router-pointing top-level model
+    # (the `weave/`, `weave-claude/`, and `weave-codex/` prefixes — otherwise a
+    # default survives and points at a deleted provider). Other providers,
+    # user-set models that don't reference the router, other plugins, and any
     # unrelated keys are preserved.
-    cleaned="$(jq '
+    cleaned="$(jq --arg plugin "$opencode_plugin" '
       (if .provider.weave then del(.provider.weave) else . end)
+      | (if .provider["weave-claude"] then del(.provider["weave-claude"]) else . end)
+      | (if .provider["weave-codex"] then del(.provider["weave-codex"]) else . end)
       | (if (.provider // {}) == {} then del(.provider) else . end)
-      | (if (.model // "" | tostring | startswith("weave/")) then del(.model) else . end)
+      | (if (.plugin | type) == "array" then .plugin -= [$plugin] else . end)
+      | (if (.plugin | type) == "array" and (.plugin | length) == 0 then del(.plugin) else . end)
+      | (if (.model // "" | tostring | (startswith("weave/") or startswith("weave-claude/") or startswith("weave-codex/"))) then del(.model) else . end)
     ' "$opencode_config_file")"
     printf '%s\n' "$cleaned" >"$opencode_config_file"
 
@@ -179,6 +195,16 @@ if [ "$target" = "opencode" ]; then
     info "No opencode config at $opencode_config_file (already uninstalled?)"
   fi
 
+  # Drop the bundled subscription plugin (no secrets; the config holds the key,
+  # opencode's own auth store holds the ChatGPT/Claude tokens). Remove the
+  # .weave/ dir only if it's left empty so we don't clobber an unrelated user dir.
+  if [ -f "$opencode_plugin" ]; then
+    refuse_if_symlink "$opencode_plugin"
+    rm -f "$opencode_plugin"
+    rmdir "$opencode_dir/.weave" 2>/dev/null || true
+    ok "Removed $opencode_plugin"
+  fi
+
   # Drop the toggle parked sidecar (holds the parked router model when off).
   opencode_parked="$opencode_dir/.weave-parked.json"
   if [ -f "$opencode_parked" ]; then
@@ -219,7 +245,7 @@ if [ "$target" = "pi" ]; then
         "~/"*)  project_dir="$HOME/${project_dir#~/}" ;;
       esac
       if [ ! -d "$project_dir" ]; then
-        err "directory does not exist: $project_dir"
+        err "Directory does not exist: $project_dir."
         exit 1
       fi
       project_dir="$(cd "$project_dir" && pwd)"
@@ -325,7 +351,7 @@ if [ "$target" = "codex" ]; then
         "~/"*)  project_dir="$HOME/${project_dir#~/}" ;;
       esac
       if [ ! -d "$project_dir" ]; then
-        err "directory does not exist: $project_dir"
+        err "Directory does not exist: $project_dir."
         exit 1
       fi
       project_dir="$(cd "$project_dir" && pwd)"
@@ -422,7 +448,7 @@ else
       "~/"*)  project_dir="$HOME/${project_dir#~/}" ;;
     esac
     if [ ! -d "$project_dir" ]; then
-      err "directory does not exist: $project_dir"
+      err "Directory does not exist: $project_dir."
       exit 1
     fi
     project_dir="$(cd "$project_dir" && pwd)"