token-goat 2.6.7 → 2.6.8

package/dist/token-goat.mjs

@@ -137045,7 +137045,7 @@ init_define_import_meta_env();
 import { createRequire } from "node:module";
 function resolveVersion() {
   if (true) {
-    return "2.6.7";
+    return "2.6.8";
   }
   const require2 = createRequire(import.meta.url);
   const pkg = require2("../package.json");
@@ -140600,11 +140600,25 @@ function main() {
     process.stdout.write('{}')
     return
   }
-  const res = spawnSync('token-goat hook ' + eventName, {
-    input,
-    encoding: 'utf8',
-    shell: true,
-  })
+  // process.argv[3], when present, is the absolute path to the token-goat CLI entry
+  // that ran 'token-goat install --codex' (baked in by hookCommandFor in
+  // codex_install.ts). Invoking it directly via process.execPath sidesteps PATH/shell
+  // resolution for this inner call, the same single-point-of-failure class fixed for
+  // the Copilot CLI bridge's inner hook call (a bare 'token-goat' on PATH failing to
+  // resolve crashes this call, and Codex -- like Copilot -- fails closed on a
+  // non-zero-exit hook). Falls back to the old PATH-based shell:true invocation when
+  // argv[3] is absent (an older cached hook config).
+  const entryPath = process.argv[3]
+  const res = entryPath
+    ? spawnSync(process.execPath, [entryPath, 'hook', eventName], {
+        input,
+        encoding: 'utf8',
+      })
+    : spawnSync('token-goat hook ' + eventName, {
+        input,
+        encoding: 'utf8',
+        shell: true,
+      })
   if (res.status !== 0 || !res.stdout) {
     process.stdout.write('{}')
     return
@@ -140969,7 +140983,9 @@ function groupHasTokenGoat2(groups, matcher) {
   return false;
 }
 function hookCommandFor(scriptPath, eventArg) {
-  return `node "${scriptPath}" ${eventArg}`;
+  const entryPath = process.argv[1];
+  const entryArg = entryPath ? ` "${entryPath}"` : "";
+  return `"${process.execPath}" "${scriptPath}" ${eventArg}${entryArg}`;
 }
 function installCodex() {
   const configPath2 = codexConfigPath();
@@ -143130,8 +143146,7 @@ var MAX_OUTPUT_LINES = 60;
 function extractMarkdownHeadings(content) {
   const headings = [];
   const lines = content.split("\n");
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
+  for (const [i, line] of eachUnfencedLine(lines)) {
     if (!line) continue;
     const match2 = /^(#+)\s+(.+?)\s*$/.exec(line);
     if (!match2 || match2.length < 3) continue;
@@ -169515,6 +169530,7 @@ import { spawnSync } from "node:child_process";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
+import { fileURLToPath } from "node:url";
 
 // pi built-in tool names -> token-goat internal tool names
 const TOOL_TO_TG: Record<string, string> = {
@@ -169541,18 +169557,58 @@ const ARGS_TO_TG: Record<string, Record<string, string>> = {
 // it's excluded here rather than spawning a hook call that always no-ops.
 const PRE_HOOK_TOOLS = new Set(["Read", "Grep", "Bash", "WebFetch"]);
 
+// resolveEntryPath reads a sidecar JSON file (token-goat-entry.json, written by
+// installPi next to this extension file) containing the absolute path to the
+// token-goat CLI entry that was running at install time. Unlike Codex/Copilot,
+// this extension has no per-invocation command line to bake a path into (pi
+// loads it once as a module, then calls into it via pi.on(...) handlers), so
+// the sidecar file is the install-time channel for this value instead. Returns
+// undefined (triggering the PATH-based fallback below) if the sidecar is
+// missing, unreadable, or points at a path that no longer exists -- e.g. an
+// older install predating this file, or a moved/removed token-goat install.
+function resolveEntryPath(): string | undefined {
+  try {
+    const here = path.dirname(fileURLToPath(import.meta.url));
+    const sidecarPath = path.join(here, "token-goat-entry.json");
+    const parsed = JSON.parse(fs.readFileSync(sidecarPath, "utf8")) as { entryPath?: unknown };
+    if (typeof parsed.entryPath === "string" && parsed.entryPath && fs.existsSync(parsed.entryPath)) {
+      return parsed.entryPath;
+    }
+  } catch {
+    // fall through to undefined
+  }
+  return undefined;
+}
+
 function callHook(event: string, payload: Record<string, unknown>): Record<string, unknown> | null {
   try {
     // TOKEN_GOAT_HARNESS_OVERRIDE=pi guarantees detectHarness() resolves to
     // 'pi' for every call this bridge makes, instead of relying on a guessed
     // ambient env var pi-coding-agent may or may not set.
-    const r = spawnSync("token-goat", ["hook", event], {
-      input: JSON.stringify(payload),
-      encoding: "utf8",
-      timeout: 5000,
-      windowsHide: true,
-      env: { ...process.env, TOKEN_GOAT_HARNESS_OVERRIDE: "pi" },
-    });
+    //
+    // Invoking "token-goat" as a bare command here depends on PATH resolution
+    // (the npm global bin being on whatever PATH pi-coding-agent's own process
+    // inherits) -- the same class of single-point-of-failure fixed for the
+    // Codex/Copilot CLI bridges' hook commands. When resolveEntryPath() finds a
+    // baked install-time path, invoke it directly via process.execPath instead,
+    // sidestepping PATH entirely; otherwise fall back to the old PATH-based
+    // lookup (e.g. an extension installed before this fix).
+    const entryPath = resolveEntryPath();
+    const r = entryPath
+      ? spawnSync(process.execPath, [entryPath, "hook", event], {
+          input: JSON.stringify(payload),
+          encoding: "utf8",
+          timeout: 5000,
+          windowsHide: true,
+          env: { ...process.env, TOKEN_GOAT_HARNESS_OVERRIDE: "pi" },
+        })
+      : spawnSync("token-goat", ["hook", event], {
+          input: JSON.stringify(payload),
+          encoding: "utf8",
+          timeout: 5000,
+          windowsHide: true,
+          env: { ...process.env, TOKEN_GOAT_HARNESS_OVERRIDE: "pi" },
+        });
     if (r.error) return null;
     const out = r.stdout?.trim();
     if (!out) return null;
@@ -169731,6 +169787,9 @@ function piLocalExtensionPath() {
 function piExtensionPath(opts = {}) {
   return opts.local === true ? piLocalExtensionPath() : piGlobalExtensionPath();
 }
+function piEntrySidecarPath(opts = {}) {
+  return path28.join(path28.dirname(piExtensionPath(opts)), "token-goat-entry.json");
+}
 function installPi(opts = {}) {
   const extensionPath = piExtensionPath(opts);
   let existing;
@@ -169739,6 +169798,11 @@ function installPi(opts = {}) {
   } catch {
     existing = void 0;
   }
+  const entryPath = process.argv[1];
+  if (entryPath) {
+    ensureDirSync(path28.dirname(extensionPath));
+    atomicWriteText(piEntrySidecarPath(opts), JSON.stringify({ entryPath }));
+  }
   if (existing === PI_EXTENSION_SCRIPT) {
     return { extensionPath, alreadyInstalled: true };
   }
@@ -169748,6 +169812,10 @@ function installPi(opts = {}) {
 }
 function uninstallPi(opts = {}) {
   const extensionPath = piExtensionPath(opts);
+  try {
+    fs25.unlinkSync(piEntrySidecarPath(opts));
+  } catch {
+  }
   try {
     fs25.unlinkSync(extensionPath);
     return true;
@@ -194704,7 +194772,7 @@ function getHintFor(command2) {
     return "Request a narrower sub-heading, e.g. 'doc.md::Section#2'.";
   }
   if (cmd === "lines") {
-    return "Request a smaller line range, e.g. 'file.py::100-150'.";
+    return "Request a smaller line range, e.g. 'file.py@100-150'.";
   }
   if (cmd === "bash-output" || cmd === "web-output") {
     return "Use --grep PATTERN, --section HEADING, or --tail N to narrow the cached output.";
@@ -197781,6 +197849,10 @@ function parseDiffHunks(diffText) {
       currentFile = fileMatch[1] ?? null;
       continue;
     }
+    if (line === "+++ /dev/null") {
+      currentFile = null;
+      continue;
+    }
     const hunkMatch = /^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@/.exec(line);
     if (hunkMatch !== null && currentFile !== null) {
       const newStart = parseInt(hunkMatch[1], 10);
@@ -205089,7 +205161,7 @@ function buildProgram() {
       () => runSkeleton({
         file: file2,
         ...opts.json === true ? { json: true } : {},
-        ...opts.minLines !== void 0 ? { minLines: Number.parseInt(opts.minLines, 10) } : {},
+        ...opts.minLines !== void 0 ? { minLines: requireNonNegativeInt("--min-lines", opts.minLines) } : {},
         ...opts.forceRefresh === true ? { forceRefresh: true } : {},
         ...opts.stats === true ? { stats: true } : {}
       })
@@ -205100,7 +205172,7 @@ function buildProgram() {
       () => runOutline({
         file: file2,
         ...opts.json === true ? { json: true } : {},
-        ...opts.minLines !== void 0 ? { minLines: Number.parseInt(opts.minLines, 10) } : {},
+        ...opts.minLines !== void 0 ? { minLines: requireNonNegativeInt("--min-lines", opts.minLines) } : {},
         ...opts.forceRefresh === true ? { forceRefresh: true } : {},
         ...opts.stats === true ? { stats: true } : {}
       })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "token-goat",
-  "version": "2.6.7",
+  "version": "2.6.8",
   "description": "Surgical token-reduction companion for Claude Code and other AI coding agents",
   "type": "module",
   "main": "./dist/token-goat.mjs",