token-goat 2.6.5 → 2.6.6

package/README.md

@@ -328,9 +328,9 @@ This writes `.pi/extensions/token-goat.ts` in the current project only. Remove i
 token-goat install --copilot
 ```
 
-The `--copilot` flag patches Claude Code and registers a Copilot CLI hook config: `~/.copilot/hooks/token-goat.json` (a `{ version, hooks }` file registering `preToolUse`, `postToolUse`, `preCompact`, `agentStop`, and `subagentStop`, per Copilot's own [hooks reference](https://docs.github.com/en/copilot/reference/hooks-reference)) plus the shim script it points at, `~/.copilot/hooks/token-goat-shim.js`. Unlike Codex, Copilot's event names and response schema (`permissionDecision`/`modifiedArgs` for `preToolUse`, `modifiedResult`/`additionalContext` for `postToolUse`) genuinely differ from Claude Code's, so the shim translates rather than passes through.
+The `--copilot` flag patches Claude Code and registers a Copilot CLI hook config: `~/.copilot/hooks/token-goat.json` (a `{ version, hooks }` file registering `preToolUse`, `postToolUse`, `preCompact`, `agentStop`, `subagentStop`, and `userPromptSubmitted`, per Copilot's own [hooks reference](https://docs.github.com/en/copilot/reference/hooks-reference)) plus the shim script it points at, `~/.copilot/hooks/token-goat-shim.js`. Unlike Codex, Copilot's event names and response schema (`permissionDecision`/`modifiedArgs` for `preToolUse`, `modifiedResult`/`additionalContext` for `postToolUse`, `decision`/`reason` for `agentStop`/`subagentStop`) genuinely differ from Claude Code's, so the shim translates rather than passes through.
 
-What works: **bash output compression and re-read denial** (`preToolUse` returns `modifiedArgs` or `permissionDecision: "deny"`), **image shrinking and post-edit indexing** (`postToolUse` returns `additionalContext`), and the **compaction manifest** (`preCompact`). Copilot's built-in tool names (`shell`, `read`, `write`, `url`, `memory`, and MCP-server calls) are remapped onto token-goat's internal names where a clear match exists (`shell`→Bash, `read`→Read, `write`→Write, `url`→WebFetch); `memory` and MCP tool calls pass through unmapped and simply no-op.
+What works: **bash output compression and re-read denial** (`preToolUse` returns `modifiedArgs` or `permissionDecision: "deny"`), **image shrinking and post-edit indexing** (`postToolUse` returns `additionalContext`), and **stop-hallucination logging** (`agentStop`/`subagentStop` map a token-goat `deny` onto `decision: "block"`, everything else onto `decision: "allow"`). `preCompact` and `userPromptSubmitted` are notification-only on real Copilot CLI, per its docs: Copilot never reads a response body for either, so token-goat's compaction manifest and prompt-context hints have no surfacing channel there. The shim still calls through for both so token-goat's internal side effects keep running, but nothing gets injected back into the agent. Copilot's built-in tool names (`shell`, `read`, `write`, `url`, `memory`, and MCP-server calls) are remapped onto token-goat's internal names where a clear match exists (`shell`→Bash, `read`→Read, `write`→Write, `url`→WebFetch); `memory` and MCP tool calls pass through unmapped and simply no-op.
 
 No ambient environment variable documents "this process is running under Copilot CLI" the way Codex/opencode set one, so the shim sets `TOKEN_GOAT_HARNESS_OVERRIDE=copilot_cli` itself before calling `token-goat hook` (same workaround `--pi` uses). To install for one project instead of user scope: `token-goat install --copilot --local` (writes `.github/hooks/token-goat.json` in the current project). To remove: `token-goat uninstall --copilot`.
 

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.5";
+    return "2.6.6";
   }
   const require2 = createRequire(import.meta.url);
   const pkg = require2("../package.json");
@@ -140157,29 +140157,85 @@ var COPILOT_CLI_HOOK_SCRIPT = `#!/usr/bin/env node
 const { spawnSync } = require('node:child_process')
 
 // Copilot event name -> token-goat internal HookEventName (src/types.ts's
-// HOOK_EVENTS). Only these five have a token-goat handler; every other real
-// Copilot event (sessionEnd, userPromptSubmitted, postToolUseFailure,
-// subagentStart, errorOccurred, notification, permissionRequest) is left
-// unimplemented rather than guessed at, and falls through to the default
-// no-op below. 'sessionStart' is handled as a permanent no-op even though
-// it's a real Copilot event, because token-goat has no internal session_start
-// handler (mirrors PI_EXTENSION_SCRIPT's documented precedent).
+// HOOK_EVENTS). Only these six have a token-goat handler; every other real
+// Copilot event (sessionEnd, postToolUseFailure, subagentStart,
+// errorOccurred, notification, permissionRequest) is left unimplemented
+// rather than guessed at, and falls through to the default no-op below.
+// 'sessionStart' is handled as a permanent no-op even though it's a real
+// Copilot event, because token-goat has no internal session_start handler
+// (mirrors PI_EXTENSION_SCRIPT's documented precedent).
 const COPILOT_TO_TG_EVENT = {
   preToolUse: 'pre_tool_use',
   postToolUse: 'post_tool_use',
   preCompact: 'pre_compact',
   agentStop: 'stop',
   subagentStop: 'subagent_stop',
+  userPromptSubmitted: 'user_prompt_submit',
+}
+
+// Copilot built-in tool name -> token-goat internal tool name. Confirmed via
+// @github/copilot-sdk type definitions and multiple real GitHub issue payload
+// dumps -- supersedes an earlier docs-based guess (shell/read/write/url) that
+// didn't hold up in practice; 'write' in particular was never a real
+// toolName value, only a Copilot permission-pattern keyword. 'powershell'
+// maps to the same 'Bash' handler as 'bash' since both are shell-command
+// execution from token-goat's perspective (mirrors how hooks_bash.ts's own
+// filters already treat powershell-wrapped commands as part of the Bash
+// pipeline, not a separate tool). 'task', 'ask_user', 'memory', and
+// MCP-server tool invocations (<server-name>-<tool-name>) have no
+// token-goat equivalent and are passed through unmapped (safe no-op for
+// handlers that don't recognize the name).
+const TOOL_TO_TG = {
+  bash: 'Bash',
+  powershell: 'Bash',
+  view: 'Read',
+  create: 'Write',
+  edit: 'Edit',
+  web_fetch: 'WebFetch',
+  grep: 'Grep',
+  glob: 'Glob',
+}
+
+// Confirmed via github/copilot-cli#3349 (open, unresolved as of writing): some
+// real Copilot CLI invocations send toolArgs as a JSON-*encoded string*
+// rather than a parsed object, contradicting the documented schema. Left
+// unhandled, canonical.tool_input would become a raw string and every
+// downstream event.toolInput[key] lookup in token-goat's handlers would
+// silently return undefined -- the deny/dedup mechanism would no-op with no
+// error surfaced. Parse it defensively; on a non-string, absent, or
+// unparsable value, fall back to {} rather than throwing (this shim's
+// convention throughout is fail-open, never crash on a malformed payload).
+function parseMaybeJsonObject(value) {
+  if (value && typeof value === 'object') return value
+  if (typeof value === 'string') {
+    try {
+      const parsed = JSON.parse(value)
+      if (parsed && typeof parsed === 'object') return parsed
+    } catch {
+      // fall through to {}
+    }
+  }
+  return {}
 }
 
-// Copilot built-in tool name -> token-goat internal tool name. 'memory' and
-// MCP-server tool invocations have no equivalent and are passed through
-// unmapped (safe no-op for handlers that don't recognize the name).
-const TOOL_TO_TG = {
-  shell: 'Bash',
-  read: 'Read',
-  write: 'Write',
-  url: 'WebFetch',
+// view/edit/create send the file path under 'path'; every token-goat handler these
+// three tools reach only ever looks for 'file_path' (getFilePath in hooks_common.ts).
+// Keyed by the ORIGINAL Copilot tool name (before TOOL_TO_TG renames it) since that's
+// the name toolArgs' shape is keyed to, not token-goat's internal tool name.
+const FILE_PATH_ARG_KEY = {
+  view: 'path',
+  edit: 'path',
+  create: 'path',
+}
+
+function remapToolInput(copilotToolName, input) {
+  const pathKey = FILE_PATH_ARG_KEY[copilotToolName]
+  if (pathKey === undefined || !input || typeof input !== 'object' || !(pathKey in input)) {
+    return input
+  }
+  // Add file_path alongside the original key rather than renaming it, so nothing that
+  // might read the original 'path' key elsewhere (e.g. a future handler) loses it.
+  return Object.assign({}, input, { file_path: input[pathKey] })
 }
 
 function main() {
@@ -140219,7 +140275,25 @@ function main() {
   }
   if (toolName) {
     canonical.tool_name = TOOL_TO_TG[toolName] || toolName
-    canonical.tool_input = (payload && payload.toolArgs) || {}
+    canonical.tool_input = remapToolInput(toolName, parseMaybeJsonObject(payload && payload.toolArgs))
+  }
+
+  // postToolUse only: confirmed via https://docs.github.com/en/copilot/reference/hooks-reference
+  // that Copilot's toolResult is an object ({resultType, textResultForLlm}), not a bare string
+  // or array. Without this, token-goat's tool_response consumers (hooks_read.ts's
+  // extractReadOutput, hooks_bash.ts's extractBashOutput, etc. -- all of which check for a
+  // string or an object keyed by output/content/text/body) never see any content, so
+  // post-read/post-bash stats stay empty no matter how many tool calls happen. Extract the
+  // LLM-facing text directly rather than forwarding the raw object, since textResultForLlm
+  // isn't one of those recognized object keys.
+  const rawResult = payload && payload.toolResult
+  if (rawResult && typeof rawResult === 'object') {
+    const tr = rawResult
+    // text_result_for_llm: Copilot's docs also describe a "VS Code compatible" snake_case
+    // wire format (tool_result.text_result_for_llm) alongside the camelCase one above; try
+    // both rather than assuming only the camelCase shape ever reaches this shim.
+    const text = typeof tr.textResultForLlm === 'string' ? tr.textResultForLlm : tr.text_result_for_llm
+    if (typeof text === 'string') canonical.tool_response = text
   }
 
   // A single command string (not an args array) with shell: true, exactly like
@@ -140273,13 +140347,27 @@ function translate(copilotEvent, resp) {
     return {}
   }
 
-  // preCompact / agentStop / subagentStop: Copilot's docs (as fetched) do not
-  // enumerate an output schema for these three events. This maps the one
-  // context channel token-goat produces for them (systemMessage, per
-  // src/hook_registry.ts's serializeOutput) onto additionalContext as a
-  // best-effort guess -- unconfirmed, verify against Copilot's real behavior.
-  const context = extractContext(resp)
-  if (context) return { additionalContext: context }
+  if (copilotEvent === 'agentStop' || copilotEvent === 'subagentStop') {
+    // Confirmed against the hooks reference doc: the only accepted response
+    // shape for these two events is {decision, reason} -- additionalContext
+    // is not part of their schema and Copilot silently ignores it there.
+    // token-goat's internal 'stop'/'subagent_stop' handlers never return a
+    // real deny today (subagentStopHandler only ever logs and passes), but a
+    // future deny is mapped through here rather than silently dropped.
+    if (resp && resp.decision === 'block') {
+      const reason = (resp && resp.reason) || 'blocked by token-goat'
+      return { decision: 'block', reason: reason }
+    }
+    return { decision: 'allow' }
+  }
+
+  // preCompact / userPromptSubmitted: confirmed against the hooks reference
+  // doc that both are notification-only -- Copilot never reads a response
+  // body for either, so any additionalContext/systemMessage token-goat
+  // produces has no surfacing channel here. This still routes through the
+  // token-goat hook call above (unlike sessionStart's early no-op) so the
+  // internal handler's own side effects keep running; only the response is
+  // discarded.
   return {}
 }
 
@@ -140290,7 +140378,26 @@ function extractContext(resp) {
   return undefined
 }
 
-main()
+// Hard outer safety net, on top of main()'s own per-step try/catch fallbacks
+// (JSON.parse, readFileSync, spawnSync): a hook error must never itself cause
+// Copilot's fail-closed "(hook errored)" behavior, which denies EVERY tool
+// call unconditionally (the exact live-production failure mode behind
+// github/copilot-cli#4001). Any uncaught exception anywhere in this script --
+// including one a future code path adds that the existing per-step guards
+// don't anticipate -- still guarantees stdout gets valid JSON and the
+// process exits 0. process.exitCode is set explicitly and unconditionally at
+// the very end of every path so nothing upstream (e.g. an unhandled-rejection
+// warning in some Node versions nudging exit-code inference) can flip it.
+try {
+  main()
+} catch {
+  try {
+    process.stdout.write('{}')
+  } catch {
+    // stdout itself is broken; nothing more can be done here.
+  }
+}
+process.exitCode = 0
 `;
 
 // src/bridges/copilot_cli_install.ts
@@ -140298,7 +140405,14 @@ init_define_import_meta_env();
 import * as fs6 from "node:fs";
 import * as os4 from "node:os";
 import * as path9 from "node:path";
-var COPILOT_CLI_HOOK_EVENTS = ["preToolUse", "postToolUse", "preCompact", "agentStop", "subagentStop"];
+var COPILOT_CLI_HOOK_EVENTS = [
+  "preToolUse",
+  "postToolUse",
+  "preCompact",
+  "agentStop",
+  "subagentStop",
+  "userPromptSubmitted"
+];
 function copilotCliUserHooksDir() {
   return path9.join(os4.homedir(), ".copilot", "hooks");
 }
@@ -140315,7 +140429,7 @@ function copilotCliScriptPath(opts = {}) {
   return path9.join(copilotCliHooksDir(opts), "token-goat-shim.js");
 }
 function hookCommandFor2(scriptPath, event) {
-  return `node "${scriptPath}" ${event}`;
+  return `"${process.execPath}" "${scriptPath}" ${event}`;
 }
 function buildConfig(scriptPath) {
   const hooks = {};
@@ -140324,7 +140438,7 @@ function buildConfig(scriptPath) {
   }
   return { version: 1, hooks };
 }
-function writeIfDifferent(p, content) {
+function writeIfDifferent(p, content, backup = false) {
   let existing;
   try {
     existing = fs6.readFileSync(p, "utf8");
@@ -140332,6 +140446,7 @@ function writeIfDifferent(p, content) {
     existing = void 0;
   }
   if (existing === content) return false;
+  if (backup) backupFile(p);
   ensureDirSync(path9.dirname(p));
   atomicWriteText(p, content);
   return true;
@@ -140341,7 +140456,7 @@ function installCopilotCli(opts = {}) {
   const scriptPath = copilotCliScriptPath(opts);
   const scriptChanged = writeIfDifferent(scriptPath, COPILOT_CLI_HOOK_SCRIPT);
   const desiredText = JSON.stringify(buildConfig(scriptPath), null, 2) + "\n";
-  const configChanged = writeIfDifferent(configPath2, desiredText);
+  const configChanged = writeIfDifferent(configPath2, desiredText, true);
   return { configPath: configPath2, scriptPath, alreadyInstalled: !scriptChanged && !configChanged };
 }
 function uninstallCopilotCli(opts = {}) {
@@ -141122,11 +141237,25 @@ function pressureRawTotal(cache) {
 }
 function getEffectiveAutoTriggerWindow() {
   const ca = loadConfig().compact_assist;
+  const isConfigDefault = !isAutoTriggerMultiplierExplicit();
   const multiplier = getAutoTriggerMultiplier(
-    ca.harness === "auto" ? { configExplicitMultiplier: ca.auto_trigger_multiplier } : { configExplicitMultiplier: ca.auto_trigger_multiplier, harness: ca.harness }
+    ca.harness === "auto" ? { configExplicitMultiplier: ca.auto_trigger_multiplier, isConfigDefault } : { configExplicitMultiplier: ca.auto_trigger_multiplier, harness: ca.harness, isConfigDefault }
   );
   return CONTEXT_AUTOCOMPACT_TOKENS * multiplier;
 }
+function isAutoTriggerMultiplierExplicit() {
+  try {
+    const text = fs10.readFileSync(configPath(), "utf8");
+    const raw = parse(text);
+    const ca_raw = raw["compact_assist"];
+    if (ca_raw === null || typeof ca_raw !== "object" || Array.isArray(ca_raw)) {
+      return false;
+    }
+    return ca_raw["auto_trigger_multiplier"] !== void 0;
+  } catch {
+    return false;
+  }
+}
 function getContextPressure(cache) {
   try {
     if (!cache) {
@@ -142122,8 +142251,15 @@ function stripCstyleComments(text, lineCommentRe) {
           break;
         }
         result += line.slice(j, open);
-        inComment = true;
-        j = open;
+        const close = line.indexOf("*/", open + 2);
+        if (close === -1) {
+          result += " ".repeat(line.length - open);
+          inComment = true;
+          break;
+        }
+        result += " ".repeat(close + 2 - open);
+        j = close + 2;
+        inComment = false;
       } else {
         const close = line.indexOf("*/", j);
         if (close === -1) {
@@ -142196,12 +142332,16 @@ function stripBlockCommentSpan(line, inComment) {
   }
   return { code, inComment: comment };
 }
-function stripLineComment(line) {
-  let idx = line.indexOf("//");
-  while (idx !== -1 && isInsideStringLiteral(line, idx)) {
-    idx = line.indexOf("//", idx + 1);
+function stripLineComment(line, markers = ["//"]) {
+  let cutIdx = -1;
+  for (const marker of markers) {
+    let idx = line.indexOf(marker);
+    while (idx !== -1 && isInsideStringLiteral(line, idx)) {
+      idx = line.indexOf(marker, idx + 1);
+    }
+    if (idx !== -1 && (cutIdx === -1 || idx < cutIdx)) cutIdx = idx;
   }
-  return idx === -1 ? line : line.slice(0, idx);
+  return cutIdx === -1 ? line : line.slice(0, cutIdx);
 }
 function stripStringLiterals(line) {
   let out2 = "";
@@ -142367,7 +142507,7 @@ function extractCsharp(content, filePath) {
         }
       }
     }
-    const braceLine = stripStringLiterals(line);
+    const braceLine = stripStringLiterals(stripLineComment(line));
     const openBraces = (braceLine.match(/\{/g) ?? []).length;
     const closeBraces = (braceLine.match(/\}/g) ?? []).length;
     braceDepth += openBraces - closeBraces;
@@ -142435,7 +142575,7 @@ function extractPhp(content, filePath) {
     const line = codeLine.trimEnd();
     const stripped = line.trimStart();
     if (!stripped || stripped.startsWith("//") || stripped.startsWith("#")) continue;
-    const braceLine = stripStringLiterals(line);
+    const braceLine = stripStringLiterals(stripLineComment(line, ["//", "#"]));
     const openB = (braceLine.match(/\{/g) ?? []).length;
     const closeB = (braceLine.match(/\}/g) ?? []).length;
     braceDepth += openB - closeB;
@@ -143057,16 +143197,14 @@ function extractMakefile(content, filePath) {
 init_define_import_meta_env();
 var MAX_SYMBOLS4 = 500;
 var MAX_HEADING_LEN5 = 120;
-var LINE_COMMENT_RE = /\/\/[^\n]*/g;
 function stripComments2(text) {
-  let out2 = stripCstyleComments(text);
-  out2 = out2.replace(LINE_COMMENT_RE, (m) => " ".repeat(m.length));
-  return out2;
+  const out2 = stripCstyleComments(text);
+  return out2.split("\n").map((line) => stripLineComment(line)).join("\n");
 }
 var TOP_LEVEL_RE = /^[ \t]*(?<keyword>message|enum|service)\s+(?<name>[A-Za-z_][A-Za-z0-9_]*)\s*\{/gm;
 var EXTEND_RE = /^[ \t]*extend\s+(?<name>[A-Za-z_][A-Za-z0-9_.]*)\s*\{/gm;
-var RPC_RE = /^\s+rpc\s+([A-Za-z_][A-Za-z0-9_]*)\s*\(/gm;
-var ONEOF_RE = /^\s+oneof\s+([A-Za-z_][A-Za-z0-9_]*)\s*\{/gm;
+var RPC_RE = /^[ \t]+rpc\s+([A-Za-z_][A-Za-z0-9_]*)\s*\(/gm;
+var ONEOF_RE = /^[ \t]+oneof\s+([A-Za-z_][A-Za-z0-9_]*)\s*\{/gm;
 var IMPORT_RE2 = /^import\s+(?:weak\s+|public\s+)?["']([^"']+)["']/gm;
 var KIND_MAP2 = /* @__PURE__ */ new Map([
   ["message", "proto_message"],
@@ -143206,18 +143344,25 @@ function extractPowershell(content, filePath) {
     const rawLine = lines[i] ?? "";
     const lineNum = i + 1;
     let line = rawLine;
+    let openedBlockCommentThisLine = false;
     if (!inBlockComment) {
       const openIdx = findUnquoted(rawLine, "<#");
       if (openIdx !== -1) {
-        const closeIdx = rawLine.indexOf("#>", openIdx + 2);
-        if (closeIdx !== -1) {
-          line = rawLine.slice(0, openIdx) + " ".repeat(closeIdx + 2 - openIdx) + rawLine.slice(closeIdx + 2);
-        } else {
-          inBlockComment = true;
+        const hashIdx2 = findUnquoted(rawLine, "#");
+        const isRealOpener = hashIdx2 === -1 || hashIdx2 >= openIdx;
+        if (isRealOpener) {
+          const closeIdx = rawLine.indexOf("#>", openIdx + 2);
+          if (closeIdx !== -1) {
+            line = rawLine.slice(0, openIdx) + " ".repeat(closeIdx + 2 - openIdx) + rawLine.slice(closeIdx + 2);
+          } else {
+            inBlockComment = true;
+            openedBlockCommentThisLine = true;
+            line = rawLine.slice(0, openIdx);
+          }
         }
       }
     }
-    if (inBlockComment) {
+    if (inBlockComment && !openedBlockCommentThisLine) {
       const closeMarkerIdx = rawLine.indexOf("#>");
       if (closeMarkerIdx === -1) {
         continue;
@@ -143332,7 +143477,7 @@ function loadGrammar(lang, filePath) {
   } catch {
     grammar = null;
   }
-  _grammarCache.set(lang, grammar);
+  _grammarCache.set(cacheKey, grammar);
   return grammar;
 }
 function isTreeSitterAvailable(lang) {
@@ -143907,7 +144052,11 @@ function extractJsonSymbols(content, filePath) {
         } else {
           inString = false;
           let k = i + 1;
-          while (k < content.length && /\s/.test(content[k] ?? "")) k++;
+          let keyToColonNewlines = 0;
+          while (k < content.length && /\s/.test(content[k] ?? "")) {
+            if (content[k] === "\n") keyToColonNewlines++;
+            k++;
+          }
           if (content[k] === ":" && depthWhenStringOpened === 1) {
             let v = k + 1;
             let gapNewlines = 0;
@@ -143918,7 +144067,7 @@ function extractJsonSymbols(content, filePath) {
             let lineEnd = strStartLine;
             let body = (lines[strStartLine - 1] ?? "").trim();
             if (content[v] === '"') {
-              let valueLine = line + gapNewlines;
+              let valueLine = line + keyToColonNewlines + gapNewlines;
               let valueEscaping = false;
               for (let j = v + 1; j < content.length; j++) {
                 const vch = content[j];
@@ -155899,6 +156048,7 @@ var GoTestFilter = class extends ToolFilter {
         continue;
       }
       if (TEST_RPC_RE.test(line)) {
+        if (inFailBlock) inFailBlock = false;
         lastRunLine = line;
         droppedRun += 1;
         continue;
@@ -162348,12 +162498,12 @@ var CdkFilter = class extends ToolFilter {
   }
 };
 var cdkFilter = new CdkFilter();
-var _VAULT_TABLE_DIVIDER_RE = /^\s*-{3,}\s+-{3,}\s*$/;
+var _VAULT_TABLE_DIVIDER_RE = /^\s*-{3,}(?:\s+-{3,})?\s*$/;
 var _VAULT_LEASE_META_RE = /^\s*(?:lease_(?:id|renewable|duration|accessor)|token_(?:policies|accessor|type|ttl|issue_time|expire_time|explicit_max_ttl|num_uses|renewable)|renewable|request_id)\s/i;
 var _VAULT_SUCCESS_RE = /^\s*Success!\s+/i;
 var _VAULT_HEADER_RE = /^\s*(?:WARNING|==>|Key\s+Value\s*$)/i;
 var _VAULT_AUTH_HEADER_RE = /^\s*(?:Token\s+information:|The\s+token\s+information|Complete\s+the\s+following|vault\s+(?:kv|secrets|auth|policy|lease|token)\s)/i;
-var _VAULT_LIST_ITEM_RE = /^\s{1,6}[a-zA-Z0-9_./-]+\/?$/;
+var _VAULT_LIST_ITEM_RE = /^\s{0,6}[a-zA-Z0-9_./-]+\/?$/;
 var _VAULT_LIST_HEADER_RE = /^\s*Keys\s*$/i;
 var _VAULT_LIST_COLLAPSE_THRESHOLD = 10;
 var VaultFilter = class extends ToolFilter {
@@ -162366,7 +162516,7 @@ var VaultFilter = class extends ToolFilter {
     const kept = [];
     let metaCount = 0;
     let dividerCount = 0;
-    const isListCmd = argv.length >= 2 && argv[0].toLowerCase() === "vault" && (argv[1].toLowerCase() === "list" || argv.length >= 3 && argv[1].toLowerCase() === "kv" && argv[2].toLowerCase() === "list");
+    const isListCmd = argv.length >= 2 && pathStem(argv[0]).toLowerCase() === "vault" && (argv[1].toLowerCase() === "list" || argv.length >= 3 && argv[1].toLowerCase() === "kv" && argv[2].toLowerCase() === "list");
     const listItems = [];
     let inListBody = false;
     for (const line of lines) {
@@ -166492,6 +166642,9 @@ var PSQL_NOTICE_RE = /^(NOTICE|WARNING|HINT|DETAIL):/i;
 var PSQL_ERROR_RE = /^(ERROR|FATAL|PANIC):/i;
 var PSQL_ROWS_RE = /^\((\d+) rows?\)$/;
 var PSQL_CREATE_RE = /^(CREATE TABLE|CREATE INDEX|CREATE UNIQUE INDEX|CREATE SEQUENCE|CREATE TYPE|CREATE FUNCTION|CREATE VIEW|CREATE TRIGGER|ALTER TABLE|ADD CONSTRAINT)\b/i;
+function pluralize(n, singular, plural2 = `${singular}s`) {
+  return `${n} ${n === 1 ? singular : plural2}`;
+}
 var PsqlFilter = class _PsqlFilter extends ToolFilter {
   name = "psql";
   binaries = /* @__PURE__ */ new Set(["psql"]);
@@ -166505,14 +166658,26 @@ var PsqlFilter = class _PsqlFilter extends ToolFilter {
     const lines = text.split("\n");
     const createTables = lines.filter((ln) => /^CREATE TABLE\b/i.test(ln)).length;
     const createIndexes = lines.filter((ln) => /^CREATE (UNIQUE )?INDEX\b/i.test(ln)).length;
+    const createFunctions = lines.filter((ln) => /^CREATE FUNCTION\b/i.test(ln)).length;
+    const createViews = lines.filter((ln) => /^CREATE VIEW\b/i.test(ln)).length;
+    const createTypes = lines.filter((ln) => /^CREATE TYPE\b/i.test(ln)).length;
+    const createSequences = lines.filter((ln) => /^CREATE SEQUENCE\b/i.test(ln)).length;
+    const createTriggers = lines.filter((ln) => /^CREATE TRIGGER\b/i.test(ln)).length;
+    const alterations = lines.filter((ln) => /^(ALTER TABLE|ADD CONSTRAINT)\b/i.test(ln)).length;
     if (createTables >= 3) {
       const nonDdl = [];
       for (const ln of lines) {
         if (PSQL_CREATE_RE.test(ln)) continue;
         nonDdl.push(ln);
       }
-      const summaryParts = [`${createTables} tables`];
-      if (createIndexes) summaryParts.push(`${createIndexes} indexes`);
+      const summaryParts = [pluralize(createTables, "table")];
+      if (createIndexes) summaryParts.push(pluralize(createIndexes, "index", "indexes"));
+      if (createFunctions) summaryParts.push(pluralize(createFunctions, "function"));
+      if (createViews) summaryParts.push(pluralize(createViews, "view"));
+      if (createTypes) summaryParts.push(pluralize(createTypes, "type"));
+      if (createSequences) summaryParts.push(pluralize(createSequences, "sequence"));
+      if (createTriggers) summaryParts.push(pluralize(createTriggers, "trigger"));
+      if (alterations) summaryParts.push(pluralize(alterations, "alteration"));
       nonDdl.unshift(`[token-goat: Created ${summaryParts.join(", ")}]`);
       return this.finalize(nonDdl);
     }
@@ -167446,6 +167611,14 @@ var EnvFilter = class extends ToolFilter {
 };
 var envFilter = new EnvFilter();
 var JSON_ARRAY_MAX_ITEMS = 50;
+function stableStringify(value) {
+  if (Array.isArray(value)) return `[${value.map(stableStringify).join(",")}]`;
+  if (value !== null && typeof value === "object") {
+    const keys = Object.keys(value).sort();
+    return `{${keys.map((k) => `${JSON.stringify(k)}:${stableStringify(value[k])}`).join(",")}}`;
+  }
+  return JSON.stringify(value);
+}
 var JsonArrayFilter = class extends ToolFilter {
   name = "json_array";
   binaries = /* @__PURE__ */ new Set(["json"]);
@@ -167473,14 +167646,15 @@ var JsonArrayFilter = class extends ToolFilter {
     const dupCounts = /* @__PURE__ */ new Map();
     for (const item of data) {
       if (item !== null && typeof item === "object" && !Array.isArray(item)) {
+        const valueKey = stableStringify(item);
         const ks = Object.keys(item).sort().join(",");
         const preserve = Object.values(item).some(
           (v) => typeof v === "string" && hasHighEntropyToken(v)
         );
-        if (seen.has(ks) && !preserve) {
+        if (seen.has(valueKey) && !preserve) {
           dupCounts.set(ks, (dupCounts.get(ks) ?? 0) + 1);
         } else {
-          if (!seen.has(ks)) seen.set(ks, kept.length);
+          if (!seen.has(valueKey)) seen.set(valueKey, kept.length);
           kept.push(item);
         }
       } else {
@@ -169473,11 +169647,24 @@ export default function (pi: ExtensionAPI) {
   pi.on("tool_result", async (event, _ctx) => {
     const tg = TOOL_TO_TG[event.toolName];
     if (!tg) return;
+    // event.content is tool_result's real output field (ToolResultEventBase.content:
+    // (TextContent | ImageContent)[] -- verified against pi's own
+    // core/extensions/types.ts). Join the text blocks into a single string so
+    // extractReadOutput's truncation-marker detection (which only recognizes a
+    // string tool_response.output) can see it, mirroring opencode.ts's
+    // tool_response: { output } shape.
+    const contentBlocks = Array.isArray(event.content) ? event.content : [];
+    const output = contentBlocks
+      .filter((c: { type?: string }) => c && c.type === "text")
+      .map((c: { text?: string }) => c.text ?? "")
+      .join("
+");
     callHook("post_tool_use", {
       session_id: sessionId,
       tool_name: tg,
       tool_input: toToolInput(event.toolName, (event.input ?? {}) as Record<string, unknown>),
       cwd,
+      tool_response: { output },
     });
   });
 
@@ -194429,18 +194616,7 @@ function listSections(filePath) {
   return headers.map((h) => h.heading);
 }
 function listAllSections(filePath) {
-  let text;
-  try {
-    text = readFileSync22(filePath, "utf-8");
-  } catch {
-    return [];
-  }
-  if (text.charCodeAt(0) === 65279) {
-    text = text.slice(1);
-  }
-  const language = detectLanguage(filePath);
-  const { headers } = findHeaders(text, language);
-  return headers.map((h) => h.heading);
+  return listSections(filePath);
 }
 
 // src/overflow_guard.ts
@@ -197188,13 +197364,19 @@ function runLineRange(range2, opts) {
 function resolveSymbolSpec(spec, forceRefresh) {
   const { file: file2, symbol: symbol2 } = parseReadSpec(spec);
   if (symbol2 === void 0 || symbol2 === "") return null;
-  const dotParts = symbol2.split(".");
-  const [symBase, methodName] = dotParts.length > 1 ? [dotParts[0] ?? symbol2, dotParts[dotParts.length - 1]] : [symbol2, void 0];
-  const lookupName = methodName ?? symBase;
   const resolved = resolveIndexPath(file2);
   if (forceRefresh === true) {
     indexFileSync(resolved, globalDbPath());
   }
+  if (symbol2.includes(".")) {
+    const exactMatch = querySymbols({ name: symbol2, filePath: resolved, limit: 10 });
+    if (exactMatch.length > 0) {
+      return exactMatch[0] ?? null;
+    }
+  }
+  const dotParts = symbol2.split(".");
+  const [symBase, methodName] = dotParts.length > 1 ? [dotParts[0] ?? symbol2, dotParts[dotParts.length - 1]] : [symbol2, void 0];
+  const lookupName = methodName ?? symBase;
   let candidates = querySymbols({ name: lookupName, filePath: resolved, limit: 10 });
   if (candidates.length === 0) {
     const foldedFile = foldPath(file2);
@@ -203746,7 +203928,7 @@ async function cmdInstall(opts) {
     }
   }
   if (opts.copilot === true) {
-    const copilotResult = installCopilotCli();
+    const copilotResult = installCopilotCli({ local: opts.local === true });
     if (copilotResult.alreadyInstalled) {
       out(`Copilot CLI integration already installed \u2192 ${copilotResult.configPath}`);
     } else {
@@ -203827,7 +204009,7 @@ function cmdUninstall(opts) {
     );
   }
   if (opts.copilot === true) {
-    const copilotRemoved = uninstallCopilotCli();
+    const copilotRemoved = uninstallCopilotCli({ local: opts.local === true });
     out(
       copilotRemoved ? "Removed token-goat Copilot CLI integration." : "No token-goat Copilot CLI integration to remove."
     );

package/package.json

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