@tokmizer/plugin 0.9.57 → 0.9.59

package/dist/native/manifest.json

@@ -1,22 +1,32 @@
 {
   "darwin-arm64": {
-    "version": "0.9.57",
+    "version": "0.9.59",
     "file": "tkr-exec-darwin-arm64",
-    "sha256": "c3979c74dc1faea94b6c5e3f974c3dd34df9615ca6dd3448a28a356c51f1948f"
+    "sha256": "51649a9a308547accdea592a35eeed18bc9fe36cd92bab493631f0496ee35c5d"
   },
   "darwin-x64": {
-    "version": "0.9.57",
+    "version": "0.9.59",
     "file": "tkr-exec-darwin-x64",
-    "sha256": "645abd7bf9bf7723db091de56d7aebefa5eeb4189303a1843739ab76529e6e1f"
+    "sha256": "b1d44e36eb8b18e4c811f0cb332e3541a7fb964b3748f3998998c3cefcd9fb72"
   },
   "linux-arm64": {
-    "version": "0.9.57",
+    "version": "0.9.59",
     "file": "tkr-exec-linux-arm64",
-    "sha256": "06f615141483965cc840c9eeec3da63149daf2a09603b9390471a712124ab160"
+    "sha256": "526edbcbdd7f0cf9b732e04968c238ef6a59f441d3c42bad73038407e441a6a8"
   },
   "linux-x64": {
-    "version": "0.9.57",
+    "version": "0.9.59",
     "file": "tkr-exec-linux-x64",
-    "sha256": "1a8ff65bdfb5f31444c3b2df2b68cd556ca2ebfdcc21c2e89d976f15f53e5dd2"
+    "sha256": "44acfffa5f099a53b9fff1337bfa7a87c39dd319713b05ed7dd8dd75e2125176"
+  },
+  "win32-arm64": {
+    "version": "0.9.59",
+    "file": "tkr-exec-win32-arm64.exe",
+    "sha256": "3aade1e4dc370b58903dac51c0c55379a9028c680f5b1e45af7b3b5065bd6a3b"
+  },
+  "win32-x64": {
+    "version": "0.9.59",
+    "file": "tkr-exec-win32-x64.exe",
+    "sha256": "3977f6a4dfcb983cc8cea7eb92ad60d524f5cc4db43ec8be3421c0fb315ba3ae"
   }
 }

package/dist/native/single.json

@@ -0,0 +1,38 @@
+{
+  "darwin-arm64": {
+    "version": "0.9.59",
+    "package": "@tokmizer/plugin-darwin-arm64",
+    "file": "tkr",
+    "sha256": "9fd4c2094fff7614a1f5766976bfad8a1161f1e19a935d7489a2aaef651428c4"
+  },
+  "darwin-x64": {
+    "version": "0.9.59",
+    "package": "@tokmizer/plugin-darwin-x64",
+    "file": "tkr",
+    "sha256": "088325e1ed8c6ff576ab45ee41ff3060e12db3c0f8d1b8822c2be6a1099db9cd"
+  },
+  "linux-arm64": {
+    "version": "0.9.59",
+    "package": "@tokmizer/plugin-linux-arm64",
+    "file": "tkr",
+    "sha256": "54ab3abe5ae7e0d53af930b34b0ad4ecc1e1ec59753b33c2aa5df0496a60bf7f"
+  },
+  "linux-x64": {
+    "version": "0.9.59",
+    "package": "@tokmizer/plugin-linux-x64",
+    "file": "tkr",
+    "sha256": "c7cd9ea3ff94cc69b4834550ed541dfdb5c6540f205f3ee1ff9a014d1b6bf1d7"
+  },
+  "win32-arm64": {
+    "version": "0.9.59",
+    "package": "@tokmizer/plugin-win32-arm64",
+    "file": "tkr.exe",
+    "sha256": "a2a82a175d3a36c75237a1371c3d5969295a8ca285115326562bbaa8d78236e5"
+  },
+  "win32-x64": {
+    "version": "0.9.59",
+    "package": "@tokmizer/plugin-win32-x64",
+    "file": "tkr.exe",
+    "sha256": "8ef4b646cc80f943c0f894ff4cc95bef01c940a5e85926462f73d95ca78238a5"
+  }
+}

package/hooks/on-session-start.d.mts

@@ -0,0 +1 @@
+export {};

package/hooks/on-session-start.mjs

@@ -1,13 +1,23 @@
-import { spawn } from "node:child_process";
+import { spawn, spawnSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { join, dirname, basename } from "node:path";
 import { readFileSync, writeFileSync, existsSync, mkdirSync, readdirSync, renameSync, rmSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 
+const drained = new Promise((resolve) => {
+  if (process.stdin.isTTY) return resolve();
+  const timer = setTimeout(resolve, 2000);
+  process.stdin.on("data", () => {}).once("end", () => { clearTimeout(timer); resolve(); }).once("error", () => { clearTimeout(timer); resolve(); });
+});
+
 const home = process.env.TOKMIZER_HOME || join(homedir(), ".tokmizer");
+const single = process.env.TOKMIZER_SINGLE_BINARY === "1";
+const pluginRoot = process.env.CLAUDE_PLUGIN_ROOT || (single ? join(dirname(process.execPath), "..", "..") : join(dirname(fileURLToPath(import.meta.url)), ".."));
+const networkOff =
+  ["0", "off", "false", "no"].includes(String(process.env.TOKMIZER_NETWORK ?? "").trim().toLowerCase()) ||
+  existsSync(join(home, "network-off"));
 
 try {
-  const pluginRoot = process.env.CLAUDE_PLUGIN_ROOT || join(dirname(fileURLToPath(import.meta.url)), "..");
   const srcDir = join(pluginRoot, "command-templates");
   const destDir = process.env.TOKMIZER_CLAUDE_COMMANDS_DIR || join(homedir(), ".claude", "commands");
   const MARKER = "managed-by: tokmizer";
@@ -30,7 +40,12 @@ try {
 } catch {}
 
 try {
-  const pluginRoot = process.env.CLAUDE_PLUGIN_ROOT || join(dirname(fileURLToPath(import.meta.url)), "..");
+  const args = single ? ["shims-heal"] : [join(dirname(fileURLToPath(import.meta.url)), "..", "dist", "bin", "tkr.js"), "shims-heal"];
+  const healed = spawnSync(process.execPath, args, { stdio: ["ignore", "pipe", "ignore"], encoding: "utf8", timeout: 3000, windowsHide: true });
+  if (healed.status === 0 && healed.stdout && healed.stdout.trim()) console.log(healed.stdout.trim());
+} catch {}
+
+try {
   const SEMVER = /^\d+\.\d+\.\d+$/;
   const self = basename(pluginRoot);
   if (SEMVER.test(self)) {
@@ -69,31 +84,18 @@ try {
 } catch {}
 
 try {
-  const onboardFile = join(home, "onboarded");
-  const shimNudge = join(home, "shim-nudge");
-  const shimsDir = join(home, "shims");
-  if (existsSync(onboardFile) && !existsSync(shimNudge) && !existsSync(shimsDir)) {
-    const onboardedAt = Number(readFileSync(onboardFile, "utf8")) || 0;
-    if (onboardedAt > 0 && Date.now() - onboardedAt >= 24 * 60 * 60 * 1000) {
-      const win = process.platform === "win32";
-      const hasTkr = (process.env.PATH || "").split(win ? ";" : ":").some((d) => {
-        try {
-          return d && existsSync(join(d, win ? "tkr.cmd" : "tkr"));
-        } catch {
-          return false;
-        }
-      });
-      const fixCmd = hasTkr
-        ? "tkr shim install"
-        : win
-          ? "npm install -g @tokmizer/plugin && tkr shim install"
-          : "curl -fsSL https://tokmizer.com/install.sh | bash";
-      console.log(
-        "Tokmizer covers this agent. Your other terminals and sub-agents are not covered yet. " +
-          "One command fixes that: " + fixCmd
-      );
-      writeFileSync(shimNudge, String(Date.now()));
-    }
+  const noticeFile = join(home, "network-notice-shown");
+  if (!networkOff && !existsSync(noticeFile)) {
+    console.log(
+      [
+        "Tokmizer contacts tokmizer.com to keep its rules up to date and to improve the product. No account or email is needed.",
+        "It sends a random install ID, your computer name, OS and CPU model, a hash of your network card address and of your user name, and the plugin version. Command contents and output are never sent.",
+        "Usage stats (command names, token counts and install health counts) are sent only while they are on. Check with: tkr telemetry status.",
+        "Turn all network access off: tkr network off. Usage stats only: tkr telemetry off."
+      ].join("\n")
+    );
+    mkdirSync(home, { recursive: true });
+    writeFileSync(noticeFile, String(Date.now()));
   }
 } catch {}
 
@@ -126,8 +128,7 @@ try {
 } catch {}
 
 try {
-  const here = dirname(fileURLToPath(import.meta.url));
-  const manifest = JSON.parse(readFileSync(join(here, "..", ".claude-plugin", "plugin.json"), "utf8"));
+  const manifest = JSON.parse(readFileSync(join(pluginRoot, ".claude-plugin", "plugin.json"), "utf8"));
   const state = JSON.parse(readFileSync(join(home, "state.json"), "utf8"));
   const latest = state.latestPluginVersion;
   if (latest && manifest.version && latest !== manifest.version) {
@@ -149,16 +150,18 @@ try {
     last = Number(readFileSync(throttleFile, "utf8")) || 0;
   } catch {}
 
-  if (existsSync(stateFile) && Date.now() - last >= THROTTLE_MS) {
+  if (!networkOff && existsSync(stateFile) && Date.now() - last >= THROTTLE_MS) {
     try {
       writeFileSync(throttleFile, String(Date.now()));
     } catch {}
-    const here = dirname(fileURLToPath(import.meta.url));
-    const tkr = join(here, "..", "dist", "bin", "tkr.js");
-    const child = spawn(process.execPath, [tkr, "heartbeat"], {
+    const args = single ? ["heartbeat"] : [join(dirname(fileURLToPath(import.meta.url)), "..", "dist", "bin", "tkr.js"), "heartbeat"];
+    const child = spawn(process.execPath, args, {
       detached: true,
       stdio: "ignore"
     });
     child.unref();
   }
 } catch {}
+
+await drained;
+process.stdin.destroy();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokmizer/plugin",
-  "version": "0.9.57",
+  "version": "0.9.59",
   "description": "Tokmizer reduces token consumption for AI coding tools (Claude Code, Codex, Cursor, Aider, Gemini CLI, Cline, Windsurf, Copilot). Cross-OS.",
   "type": "module",
   "engines": {
@@ -12,14 +12,27 @@
     "tkr-exec": "dist/bin/tkr-exec",
     "tkr-shim": "dist/bin/tkr-shim.js",
     "tkr-codex-hook": "dist/bin/tkr-codex-hook.js",
+    "tkr-cursor-hook": "dist/bin/tkr-cursor-hook.js",
+    "tkr-gemini-hook": "dist/bin/tkr-gemini-hook.js",
+    "tkr-agent-hook": "dist/bin/tkr-agent-hook.js",
+    "tkr-copilot-hook": "dist/bin/tkr-copilot-hook.js",
+    "tkr-droid-hook": "dist/bin/tkr-droid-hook.js",
+    "tkr-trae-hook": "dist/bin/tkr-trae-hook.js",
+    "tkr-qwen-hook": "dist/bin/tkr-qwen-hook.js",
+    "tkr-crush-hook": "dist/bin/tkr-crush-hook.js",
+    "tkr-junie-hook": "dist/bin/tkr-junie-hook.js",
+    "tkr-zcode-hook": "dist/bin/tkr-zcode-hook.js",
+    "tkr-grok-hook": "dist/bin/tkr-grok-hook.js",
     "tkr-daemon": "dist/bin/tkr-daemon.js"
   },
   "files": [
     "dist",
-    "codex-plugin",
+    ".codex-plugin",
+    "codex-hooks",
     ".claude-plugin",
     "hooks",
     "command-templates",
+    "agent-plugins",
     "scripts/install-mac-linux.sh",
     "scripts/install-windows.ps1",
     "scripts/install-native.mjs",
@@ -31,7 +44,9 @@
     "build": "tsc -p tsconfig.json --noEmit && node scripts/bundle.mjs",
     "build:native": "node scripts/build-native.mjs",
     "postinstall": "node scripts/install-native.mjs",
-    "prepublishOnly": "npm run build && node scripts/check-native-artifacts.mjs && ( cd ../.. && npx vitest run packages/plugin ) && node scripts/check-prod-key.mjs && node scripts/check-version.mjs && node scripts/check-dist-clean.mjs && node scripts/check-pack-clean.mjs && node dist/bin/tkr-exec.js echo dist-smoke-ok && node dist/bin/tkr.js help > /dev/null"
+    "prepublishOnly": "npm run build && node scripts/check-native-artifacts.mjs && ( cd ../.. && npx vitest run packages/plugin ) && node scripts/check-upgrade-safety.mjs && node scripts/check-prod-key.mjs && node scripts/check-version.mjs && node scripts/check-dist-clean.mjs && node scripts/check-pack-clean.mjs && node scripts/smoke-dist.mjs",
+    "build:single": "node scripts/build-single.mjs",
+    "pack:single": "node scripts/pack-single.mjs"
   },
   "devDependencies": {
     "@types/cross-spawn": "^6.0.6",
@@ -41,6 +56,14 @@
     "smol-toml": "^1.9.0",
     "zod": "^3.23.8"
   },
+  "optionalDependencies": {
+    "@tokmizer/plugin-darwin-arm64": "0.9.59",
+    "@tokmizer/plugin-darwin-x64": "0.9.59",
+    "@tokmizer/plugin-linux-arm64": "0.9.59",
+    "@tokmizer/plugin-linux-x64": "0.9.59",
+    "@tokmizer/plugin-win32-arm64": "0.9.59",
+    "@tokmizer/plugin-win32-x64": "0.9.59"
+  },
   "publishConfig": {
     "access": "public"
   },

package/scripts/README-INSTALL.md

@@ -2,7 +2,7 @@
 
 Tokmizer works with **Claude Code, OpenAI Codex, Cursor, Cline, Aider, Gemini CLI, Windsurf, and GitHub Copilot** — on **macOS, Linux, and Windows**.
 
-Claude Code and Codex use native hooks. Other tools can use command wrappers configured by `tkr shim install`. Node.js 20.11 or newer is required for npm installation. Tokmizer is free and requires no account.
+Claude Code, Codex, Cursor, Gemini CLI, GitHub Copilot, Factory Droid, Trae, Qwen Code, Crush, Junie CLI, ZCode, Grok Build and Kilo Code use native hooks or plugins (`tkr setup-<tool>` installs them; see the table below). Aider, Cline and Windsurf have no hook system: Tokmizer reaches them through command shims that are active only inside the agent, never in your own terminals. Tokmizer does not edit your shell profile. Node.js 20.11 or newer is required for npm installation. Tokmizer is free and requires no account.
 
 ## macOS / Linux
 
@@ -14,7 +14,6 @@ curl -fsSL https://tokmizer.com/install.sh | bash
 
 ```powershell
 npm.cmd install -g @tokmizer/plugin
-tkr.cmd shim install
 ```
 
 Claude Code users can also install via the marketplace (see Per-tool notes below).
@@ -22,30 +21,67 @@ Claude Code users can also install via the marketplace (see Per-tool notes below
 ## npm (macOS / Linux)
 
 ```bash
-npm install -g @tokmizer/plugin && tkr shim install
+npm install -g @tokmizer/plugin
 ```
 
 ## Homebrew
 
 ```bash
-brew install norwelltw/tokmizer/tokmizer && tkr shim install
+brew install norwelltw/tokmizer/tokmizer
 ```
 
 ## Per-tool notes
 
 | Tool          | Adapter         | Setup                                                          |
 |---------------|-----------------|----------------------------------------------------------------|
-| Claude Code   | Native hooks    | `/plugin marketplace add norwelltw/Tokmizer` then `/plugin install tokmizer@tokmizer` |
+| Claude Code   | Native hooks    | `/plugin marketplace add norwelltw/Tokmizer` then `/plugin install tokmizer@tokmizer`. Without Node.js, `install.sh` runs `tkr setup-claude` for you (`tkr setup-claude --remove` undoes it) |
 | Codex CLI     | Native hook     | Install tkr (npm or brew), run `tkr setup-codex`, restart Codex, then approve in `/hooks` |
-| Cursor        | Shell-shim      | Open a new terminal after install.                             |
-| Cline         | Shell-shim      | Open a new terminal after install.                             |
-| Aider         | Shell-shim      | Open a new terminal after install.                             |
-| Gemini CLI    | Shell-shim      | Open a new terminal after install.                             |
-| Windsurf      | Shell-shim      | Open a new terminal after install.                             |
-| GitHub Copilot| Shell-shim      | Open a new terminal after install.                             |
-| Plain shell   | Shell-shim      | Works out of the box.                                          |
-
-Open a new terminal after installation and run `tkr status`. If activation is pending because the service could not be reached, rerun `tkr status` when online. Connecting an account is optional: `tkr link <your-key>`.
+| Cursor        | Native hook     | Install tkr (npm or brew), run `tkr setup-cursor`, then restart Cursor. |
+| Cline         | Agent shims     | Start VS Code from a terminal with `tkr wrap --host cline code .`, or add the workspace setting below. |
+| Aider         | Agent shims     | Start it with `tkr wrap aider [args]`.                          |
+| Gemini CLI    | Native hook     | Install tkr (npm or brew), run `tkr setup-gemini`, then restart Gemini CLI. |
+| Windsurf      | Agent shims     | Start it from a terminal with `tkr wrap --host windsurf windsurf .`, or add the workspace setting below. |
+| GitHub Copilot| Native hook     | Install tkr (npm or brew), run `tkr setup-copilot`, then restart VS Code or Copilot CLI. |
+| Factory Droid | Native hook     | Run `tkr setup-droid`, then restart Droid.                      |
+| Trae          | Native hook     | Run `tkr setup-trae`, then restart Trae.                        |
+| Qwen Code     | Native hook     | Run `tkr setup-qwen`, then restart Qwen Code.                   |
+| Crush         | Native hook     | Run `tkr setup-crush`, then restart Crush.                      |
+| Junie CLI     | Native hook     | Run `tkr setup-junie`, then restart Junie.                      |
+| ZCode         | Native hook     | Run `tkr setup-zcode`, then restart ZCode.                      |
+| Grok Build    | Native hook     | Run `tkr setup-grok`, then restart Grok Build (1.0.4 or newer). |
+| Kilo Code     | Plugin          | Run `tkr setup-kilo`, then restart Kilo Code.                   |
+| Plain shell   | None by default | Your terminals are left alone. To route every terminal through Tokmizer anyway: `tkr shim global-path on` (undo: `tkr shim global-path off`). |
+
+Run `tkr status` after installation. If activation is pending because the service could not be reached, rerun `tkr status` when online. Connecting an account is optional: `tkr link <your-key>`.
+
+## Agents without hooks
+
+`tkr wrap [--host aider|cline|windsurf] <command> [args]` starts the agent with the shim folder first on its `PATH` and `TOKMIZER_HOST` set, so only that agent and the commands it runs go through Tokmizer.
+
+For Cline and Windsurf (both run commands in the editor terminal), the same can be set per workspace in `.vscode/settings.json`. Replace `HOME` with your home folder and use `terminal.integrated.env.linux` on Linux:
+
+```json
+{
+  "terminal.integrated.env.osx": {
+    "PATH": "HOME/.tokmizer/shims:${env:PATH}",
+    "TOKMIZER_HOST": "cline"
+  }
+}
+```
+
+Shims never call a versioned install folder. They go through `~/.tokmizer/bin/tkr-shim-launch`, which finds the current install at run time. If no install is found, the command runs unchanged and prints a one-line hint to run `tkr doctor --fix`.
+
+## Repair and upgrades
+
+`tkr doctor` lists outdated shims, old PATH lines in your shell profile and hooks that point at a removed install. `tkr doctor --fix` repairs them. Each edited shell profile is first copied to `~/.tokmizer/backup/rc/` (private to you), and only the exact two lines Tokmizer wrote are removed. `tkr shim global-path on` puts them back.
+
+If an old version left your shell unable to run commands (`Error: Cannot find module .../tkr-shim.js`), run this in any terminal; it needs no Node.js and no network:
+
+```bash
+mv ~/.tokmizer/shims ~/.tokmizer/shims.off
+```
+
+Then open a new terminal, update Tokmizer, and run `npx -y -p @tokmizer/plugin@latest tkr doctor --fix` (or `tkr doctor --fix`) to remove the old PATH line.
 
 ## Choose a mode
 

package/scripts/install-mac-linux.sh

@@ -4,15 +4,85 @@ set -euo pipefail
 err() { printf 'tkr install: %s\n' "$*" >&2; exit 1; }
 log() { printf 'tkr: %s\n' "$*"; }
 
-command -v node >/dev/null 2>&1 || err "Node.js 20.11+ is required."
-command -v npm >/dev/null 2>&1 || err "npm is required."
-node -e 'const [major, minor] = process.versions.node.split(".").map(Number); process.exit(major > 20 || major === 20 && minor >= 11 ? 0 : 1)' || err "Node.js 20.11+ is required."
+node_ready() {
+  command -v node >/dev/null 2>&1 && command -v npm >/dev/null 2>&1 &&
+    node -e 'const [major, minor] = process.versions.node.split(".").map(Number); process.exit(major > 20 || major === 20 && minor >= 11 ? 0 : 1)' 2>/dev/null
+}
 
-log "Installing @tokmizer/plugin from npm..."
-npm install -g @tokmizer/plugin
-command -v tkr >/dev/null 2>&1 || err "tkr is not on PATH. Add the npm global bin directory to PATH and run tkr shim install."
+work=""
+
+sha256_of() {
+  if command -v sha256sum >/dev/null 2>&1; then sha256sum "$1" | cut -d' ' -f1
+  else shasum -a 256 "$1" | cut -d' ' -f1
+  fi
+}
+
+install_standalone() {
+  local os arch key base line name sum root bindir unavailable
+  unavailable="Install Node.js 20.11+ and retry."
+  case "$(uname -s)" in
+    Darwin) os=darwin ;;
+    Linux) os=linux ;;
+    *) err "No standalone build for $(uname -s). $unavailable" ;;
+  esac
+  case "$(uname -m)" in
+    arm64|aarch64) arch=arm64 ;;
+    x86_64|amd64) arch=x64 ;;
+    *) err "No standalone build for $(uname -m). $unavailable" ;;
+  esac
+  key="$os-$arch"
+  base="${TOKMIZER_DOWNLOAD_BASE:-https://github.com/norwelltw/Tokmizer/releases/latest/download}"
+  root="${TOKMIZER_INSTALL_DIR:-$HOME/.local/share/tokmizer}"
+  bindir="${TOKMIZER_BIN_DIR:-$HOME/.local/bin}"
+  command -v curl >/dev/null 2>&1 || err "curl is required."
+  command -v tar >/dev/null 2>&1 || err "tar is required."
+  work="$(mktemp -d)"
+  trap 'rm -rf "${work:-}"' EXIT
+  curl -fsSL "$base/SHA256SUMS" -o "$work/SHA256SUMS" || err "Could not download the standalone build. $unavailable"
+  line="$(grep -E "^[0-9a-f]{64}  tokmizer-[0-9][^ /]*-$key\.tar\.gz$" "$work/SHA256SUMS" | head -n 1)" || true
+  [ -n "$line" ] || err "No standalone build for $key. $unavailable"
+  sum="${line%%  *}"
+  name="${line#*  }"
+  log "Downloading $name..."
+  curl -fsSL "$base/$name" -o "$work/$name" || err "Could not download $name."
+  [ "$(sha256_of "$work/$name")" = "$sum" ] || err "Checksum mismatch for $name."
+  tar -xzf "$work/$name" -C "$work"
+  "$work/${name%.tar.gz}/dist/bin/tkr" --single-check >/dev/null 2>&1 || err "The downloaded executable does not run on this system. $unavailable"
+  mkdir -p "$root" "$bindir"
+  rm -rf "${root:?}/${name%.tar.gz}"
+  mv "$work/${name%.tar.gz}" "$root/${name%.tar.gz}"
+  ln -sfn "${name%.tar.gz}" "$root/current"
+  ln -sf "$root/current/dist/bin/tkr" "$bindir/tkr"
+  ln -sf "$root/current/dist/bin/tkr-exec" "$bindir/tkr-exec"
+  case ":$PATH:" in
+    *":$bindir:"*) ;;
+    *) PATH="$bindir:$PATH"; log "Add $bindir to your PATH." ;;
+  esac
+}
+
+claude_code_present() {
+  [ -d "${CLAUDE_CONFIG_DIR:-$HOME/.claude}" ] || command -v claude >/dev/null 2>&1
+}
+
+claude_before=0
+if claude_code_present; then claude_before=1; fi
+
+standalone=0
+if [ "${TOKMIZER_STANDALONE:-}" = "1" ] || ! node_ready; then
+  log "Installing the standalone tkr executable (Node.js not needed)..."
+  install_standalone
+  standalone=1
+else
+  log "Installing @tokmizer/plugin from npm..."
+  npm install -g @tokmizer/plugin
+fi
+command -v tkr >/dev/null 2>&1 || err "tkr is not on PATH. Add its directory to PATH and run tkr shim install."
 
 tkr shim install </dev/null
-log "Done. Open a new terminal. Tokmizer is free and does not require an account."
+if [ "$standalone" = "1" ] && [ "$claude_before" = "1" ]; then
+  tkr setup-claude </dev/null || log "Could not add the Claude Code hooks. Run: tkr setup-claude"
+fi
+log "Done. Tokmizer is free and does not require an account. Your shell profile was not changed."
 log "For Codex, also run: tkr setup-codex"
+log "For Aider, Cline or Windsurf, start them with: tkr wrap <agent>"
 log "Check the installation with: tkr status"