token-goat 2.9.1 → 2.9.2

package/dist/{token-goat-chunk-CD6U5OD6.mjs → token-goat-chunk-LEBYARO3.mjs}

@@ -25,7 +25,7 @@ import {
   runSkeleton,
   runSymbol,
   withPinnedReads
-} from "./token-goat-chunk-SXSWQMNP.mjs";
+} from "./token-goat-chunk-FXAPKVRG.mjs";
 import {
   buildProjectMap,
   embeddingsDepsAvailable,
@@ -34,7 +34,7 @@ import {
   getProjectIndexCounts,
   isWorkerRunning,
   mapLookupBytesSaved
-} from "./token-goat-chunk-FDXINYK4.mjs";
+} from "./token-goat-chunk-LJ3CHCTT.mjs";
 import {
   ENV_KEYS,
   VERSION,
@@ -48,7 +48,7 @@ import {
   recordStat,
   resolveProjectRoot,
   savedTokensFromBytes
-} from "./token-goat-chunk-4ZDRTNGV.mjs";
+} from "./token-goat-chunk-UZ2NFOOZ.mjs";
 import "./token-goat-chunk-AO2QD2AG.mjs";
 import "./token-goat-chunk-AEX54RUZ.mjs";
 

package/dist/{token-goat-chunk-FDXINYK4.mjs → token-goat-chunk-LJ3CHCTT.mjs}

@@ -96,7 +96,7 @@ import {
   toDisplayPath,
   toKB,
   withFileLock
-} from "./token-goat-chunk-4ZDRTNGV.mjs";
+} from "./token-goat-chunk-UZ2NFOOZ.mjs";
 import {
   registerReset
 } from "./token-goat-chunk-AO2QD2AG.mjs";
@@ -3825,10 +3825,10 @@ function getGlobMatchCount(signature) {
   return _globQueries.get(signature) ?? null;
 }
 function setLastTabContext(text) {
-  _lastTabContext = text;
+  _lastTabContext = shortFingerprint(text);
 }
-function getLastTabContext() {
-  return _lastTabContext;
+function lastTabContextMatches(text) {
+  return _lastTabContext !== null && _lastTabContext === shortFingerprint(text);
 }
 var MAX_SEEN_IMAGE_HASHES = 16;
 function hasSeenImage(hash2) {
@@ -3966,7 +3966,7 @@ function exportSessionState() {
     grepQueries: Array.from(_grepQueries.entries()),
     globQueries: Array.from(_globQueries.entries()),
     outstandingAgentSpawns: _outstandingAgentSpawns.map((e) => [e.prompt, e.ts]),
-    ..._lastTabContext !== null ? { lastTabContext: _lastTabContext } : {},
+    ..._lastTabContext !== null ? { lastTabContextDigest: _lastTabContext } : {},
     ..._seenImageHashes.length > 0 ? { seenImageHashes: [..._seenImageHashes] } : {},
     ..._compactedAt > 0 ? { compactedAt: _compactedAt } : {}
   };
@@ -3993,7 +3993,7 @@ function importSessionState(s) {
   _globQueries = new Map(s.globQueries ?? []);
   _outstandingAgentSpawns = (s.outstandingAgentSpawns ?? []).map(([prompt, ts]) => ({ prompt, ts }));
   _outstandingAgentSpawnsAtLoad = [..._outstandingAgentSpawns];
-  _lastTabContext = s.lastTabContext ?? null;
+  _lastTabContext = s.lastTabContextDigest ?? null;
   _seenImageHashes = [...s.seenImageHashes ?? []];
   _compactedAt = s.compactedAt ?? 0;
 }
@@ -4851,12 +4851,12 @@ var COMMAND_PATTERNS = {
   gitImmutable: /^\s*git\s+show\s+[0-9a-f]{40}\b/i,
   gitDiffScoped: /\s--\s+\S/,
   dirListing: /^\s*(?:ls|eza|exa|dir|Get-ChildItem|gci)\b/i,
-  depList: /^\s*(?:npm\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=)?)*(?:ls|list)\b|pip\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=)?)*(?:list|freeze)\b|uv\s+pip\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=)?)*(?:list|freeze)\b|pnpm\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=)?)*(?:list|ls)\b|yarn\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=)?)*(?:list)\b|cargo\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=)?)*tree\b|bundle\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=)?)*(?:list|show)\b|composer\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=)?)*show\b)/i,
-  npmInstall: /^\s*npm\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=)?)*(?:install|ci)\b/i,
-  npmAudit: /^\s*npm\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=)?)*audit\b(?!.*(?:--fix|fix)\b)/i,
-  npmOutdated: /^\s*npm\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=)?)*outdated\b/i,
+  depList: /^\s*(?:npm\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=))*(?:ls|list)\b|pip\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=))*(?:list|freeze)\b|uv\s+pip\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=))*(?:list|freeze)\b|pnpm\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=))*(?:list|ls)\b|yarn\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=))*(?:list)\b|cargo\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=))*tree\b|bundle\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=))*(?:list|show)\b|composer\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=))*show\b)/i,
+  npmInstall: /^\s*npm\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=))*(?:install|ci)\b/i,
+  npmAudit: /^\s*npm\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=))*audit\b(?!.*(?:--fix|fix)\b)/i,
+  npmOutdated: /^\s*npm\s+(?:--?[a-zA-Z0-9_-]+(?:\s+|=))*outdated\b/i,
   envProbe: /^\s*(?:node\s+(?:-v|--version)|npm\s+(?:-v|--version)|python3?\s+(?:(?:-V)\b|--?version)|git\s+--version|uv\s+--version|go\s+version|rustc\s+--version|cargo\s+--version|java\s+--version|ruby\s+--version|gem\s+--version|php\s+--version|which\b|where\b)/i,
-  npx: /^\s*npx\s+(?:--?yes\s+)?(?!.*\b(?:install|add|remove|uninstall|i|rm|update|upgrade|set|get|publish|link|ci|audit|shrinkwrap|dedupe|prune|rebuild)\b)/i,
+  npx: /^(?!.*\b(?:install|add|remove|uninstall|i|rm|update|upgrade|set|get|publish|link|ci|audit|shrinkwrap|dedupe|prune|rebuild)\b)\s*npx\s+(?:--?yes\s+)?/i,
   gitPush: /^\s*git\s+push\b/i,
   testRunner: /^\s*(?:npx\s+)?(?:pytest|vitest|jest|go\s+test)\b/i,
   lintCommand: /^\s*(?:(?:npx\s+)?eslint|(?:uv\s+run\s+)?ruff)\b/i,
@@ -5354,7 +5354,7 @@ function coerce(raw) {
     grepQueries,
     globQueries,
     outstandingAgentSpawns,
-    ...typeof o["lastTabContext"] === "string" ? { lastTabContext: o["lastTabContext"] } : {},
+    ...typeof o["lastTabContextDigest"] === "string" ? { lastTabContextDigest: o["lastTabContextDigest"] } : {},
     ...seenImageHashes.length > 0 ? { seenImageHashes } : {},
     ...typeof o["compactedAt"] === "number" ? { compactedAt: o["compactedAt"] } : {},
     ...typeof o["created_ts"] === "number" ? { created_ts: o["created_ts"] } : {}
@@ -5483,7 +5483,7 @@ function mergeSessionState(disk, mem) {
     // in memory, applied again here because a union of two capped lists can exceed the cap.
     seenImageHashes: mergeSeenImageHashes(disk.seenImageHashes ?? [], mem.seenImageHashes ?? []),
     // Last-seen scalar, not an accumulating collection: prefer mem's value (this process's freshest observation) over disk's, since a newer write always supersedes an older one.
-    ...mem.lastTabContext !== void 0 ? { lastTabContext: mem.lastTabContext } : disk.lastTabContext !== void 0 ? { lastTabContext: disk.lastTabContext } : {},
+    ...mem.lastTabContextDigest !== void 0 ? { lastTabContextDigest: mem.lastTabContextDigest } : disk.lastTabContextDigest !== void 0 ? { lastTabContextDigest: disk.lastTabContextDigest } : {},
     // Prefer the value already on disk: it marks the original creation time, and must never be bumped forward to the merge's "now". `mem` never carries one (it is not tracked in memory), so this is really "keep whatever disk has".
     ...disk.created_ts !== void 0 ? { created_ts: disk.created_ts } : mem.created_ts !== void 0 ? { created_ts: mem.created_ts } : {}
   };
@@ -11107,7 +11107,7 @@ function getTrackedFiles(cwd = process.cwd()) {
 }
 
 // src/parser_fingerprint.ts
-var PARSER_FINGERPRINT = "b68587f48a3f933e";
+var PARSER_FINGERPRINT = "4659c517f042a452";
 
 // src/parser.ts
 import * as fs22 from "node:fs";
@@ -14440,7 +14440,7 @@ function extractSalesforceMarkup(content, filePath) {
   }
   attributeRefs(refs, markupNoComments, filePath, "controller");
   attributeRefs(refs, markupNoComments, filePath, "extensions", true);
-  const actionRe = isAura ? /\{!\s*c\.([A-Za-z_$][\w$]*)[^}]*\}/gi : /\baction\s*=\s*["']\{!\s*(?:c\.)?([A-Za-z_$][\w$]*)[^}]*\}["']/gi;
+  const actionRe = isAura ? /\{!\s*c\.([A-Za-z_$][\w$]*)(?:[^}\w$][^}]*)?\}/gi : /\baction\s*=\s*["']\{!\s*(?:c\.)?([A-Za-z_$][\w$]*)(?:[^}\w$][^}]*)?\}["']/gi;
   for (const match of markupNoComments.matchAll(actionRe)) {
     const line = matchLine(markupNoComments, match.index ?? 0);
     refs.push(ref(filePath, match[1] ?? "", line, 0, lineContext(content, line)));
@@ -16305,7 +16305,7 @@ var FALLBACK_PATTERNS = [
   { re: /^[ \t]*class\s+([A-Za-z_]\w*)/, kind: "class", style: "hash" },
   // TS/JS function & class declarations (optionally exported/async)
   {
-    re: /^[ \t]*(?:export\s+)?(?:default\s+)?(?:async\s+)?function\s*\*?\s*([A-Za-z_$][\w$]*)/,
+    re: /^[ \t]*(?:export\s+)?(?:default\s+)?(?:async\s+)?function\s*(?:\*\s*)?([A-Za-z_$][\w$]*)/,
     kind: "function",
     style: "c"
   },
@@ -17827,6 +17827,87 @@ function urlPolicyDenialReason(url, policy) {
   }
   return null;
 }
+function parseIpv6Groups(text) {
+  let rest = text;
+  const zoneAt = rest.indexOf("%");
+  if (zoneAt !== -1) rest = rest.slice(0, zoneAt);
+  if (!/^[0-9a-f:.]+$/i.test(rest) || !rest.includes(":")) return null;
+  const lastColon = rest.lastIndexOf(":");
+  const tail = rest.slice(lastColon + 1);
+  if (tail.includes(".")) {
+    const quad = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.exec(tail);
+    if (!quad) return null;
+    const octets = [Number(quad[1]), Number(quad[2]), Number(quad[3]), Number(quad[4])];
+    if (octets.some((n) => n > 255)) return null;
+    const hi = octets[0] << 8 | octets[1];
+    const lo = octets[2] << 8 | octets[3];
+    rest = `${rest.slice(0, lastColon + 1)}${hi.toString(16)}:${lo.toString(16)}`;
+  }
+  const parseGroup = (g) => /^[0-9a-f]{1,4}$/i.test(g) ? parseInt(g, 16) : null;
+  const halves = rest.split("::");
+  if (halves.length > 2) return null;
+  let parts;
+  if (halves.length === 2) {
+    const left = halves[0].length > 0 ? halves[0].split(":") : [];
+    const right = halves[1].length > 0 ? halves[1].split(":") : [];
+    if (left.length + right.length > 7) return null;
+    parts = [...left, ...Array(8 - left.length - right.length).fill("0"), ...right];
+  } else {
+    parts = rest.split(":");
+    if (parts.length !== 8) return null;
+  }
+  const groups = [];
+  for (const part of parts) {
+    const value = parseGroup(part);
+    if (value === null) return null;
+    groups.push(value);
+  }
+  return groups;
+}
+var METADATA_HOSTNAMES = /* @__PURE__ */ new Set([
+  "metadata.google.internal",
+  "metadata.goog",
+  // GCE answers on the bare name too, and it is the form most of Google's own docs use.
+  "metadata",
+  // Alibaba Cloud's equivalent of 169.254.169.254.
+  "100.100.100.200",
+  // EC2 resolves both of these to 169.254.169.254 inside a VPC, and neither is a dotted quad, so
+  // the link-local test below never sees them.
+  "instance-data",
+  "instance-data.ec2.internal"
+]);
+var METADATA_IPV6 = /* @__PURE__ */ new Set(["fd00:ec2::254", "[fd00:ec2::254]"]);
+function metadataEndpointRefusal(url) {
+  let host;
+  try {
+    host = new URL(url).hostname.toLowerCase().replace(/\.$/, "");
+  } catch {
+    return null;
+  }
+  if (METADATA_HOSTNAMES.has(host) || METADATA_IPV6.has(host)) {
+    return `URL is a cloud instance-metadata endpoint (${host})`;
+  }
+  if (/^169\.254\.\d{1,3}\.\d{1,3}$/.test(host)) {
+    return `URL is a link-local address (${host}), where cloud metadata services answer`;
+  }
+  if (embeddedIpv4Candidates(host).some(([a, b]) => a === 169 && b === 254)) {
+    return `URL is a link-local address written as IPv6 (${host}), where cloud metadata services answer`;
+  }
+  return null;
+}
+function embeddedIpv4Candidates(host) {
+  const groups = parseIpv6Groups(host.replace(/^\[/, "").replace(/\]$/, ""));
+  if (groups === null) return [];
+  const split = (hi, lo) => [
+    hi >> 8,
+    hi & 255,
+    lo >> 8,
+    lo & 255
+  ];
+  const out = [split(groups[6] ?? 0, groups[7] ?? 0)];
+  if (groups[0] === 8194) out.push(split(groups[1] ?? 0, groups[2] ?? 0));
+  return out;
+}
 
 export {
   createLazyModuleLoader,
@@ -17897,7 +17978,7 @@ export {
   recordGlobQuery,
   getGlobMatchCount,
   setLastTabContext,
-  getLastTabContext,
+  lastTabContextMatches,
   hasSeenImage,
   recordSeenImage,
   recordOutstandingAgentSpawn,
@@ -18072,5 +18153,7 @@ export {
   enqueueDirtyPathSafe,
   matchesAllowPattern,
   matchesDenyPattern,
-  urlPolicyDenialReason
+  urlPolicyDenialReason,
+  parseIpv6Groups,
+  metadataEndpointRefusal
 };

package/dist/{token-goat-chunk-4KD2N46D.mjs → token-goat-chunk-NY4HYRSK.mjs}

@@ -3,7 +3,7 @@ const require = __cjsRequire(import.meta.url);
 import {
   deliveredOutputBytes,
   wrappedShell
-} from "./token-goat-chunk-LHMC5ENL.mjs";
+} from "./token-goat-chunk-CGWACYYZ.mjs";
 import {
   ToolFilter,
   capTokens,
@@ -17,7 +17,7 @@ import {
   resolveMinNetSavingsBytes,
   selectFilter,
   shlexSplit
-} from "./token-goat-chunk-4ZDRTNGV.mjs";
+} from "./token-goat-chunk-UZ2NFOOZ.mjs";
 import "./token-goat-chunk-AO2QD2AG.mjs";
 import "./token-goat-chunk-AEX54RUZ.mjs";
 

package/dist/{token-goat-chunk-RRNRPCLX.mjs → token-goat-chunk-Q4LOQY44.mjs}

@@ -18,7 +18,7 @@ import {
   storeWebOutput,
   summarizeResidentContext,
   taskListPruneHint
-} from "./token-goat-chunk-MR7MNSDR.mjs";
+} from "./token-goat-chunk-VCNW7BGU.mjs";
 import {
   BASH_OUTPUT_SUBDIR,
   UNTRUSTED_TOOL_TAG,
@@ -49,7 +49,6 @@ import {
   getFileServedOutputs,
   getGlobMatchCount,
   getGrepMatchCount,
-  getLastTabContext,
   getMonitoringRecallHint,
   getOutstandingAgentSpawns,
   getSessionBashOutputs,
@@ -66,6 +65,7 @@ import {
   isBuildCommand,
   isScopedGitStatusOrDiffStatCommand,
   isTestRunnerCommand,
+  lastTabContextMatches,
   listSiblingSessionStates,
   loadSessionCache,
   loadSessionState,
@@ -76,6 +76,7 @@ import {
   matchesAllowPattern,
   matchesDenyPattern,
   meetsSavingsFloor,
+  metadataEndpointRefusal,
   probeImageMeta,
   recordBashOutput,
   recordBashRerun,
@@ -110,11 +111,11 @@ import {
   wasCliReadThisSession,
   wasFileReadThisSession,
   wasHintShown
-} from "./token-goat-chunk-FDXINYK4.mjs";
+} from "./token-goat-chunk-LJ3CHCTT.mjs";
 import {
   canRunWrappedShell,
   deliveredOutputBytes
-} from "./token-goat-chunk-LHMC5ENL.mjs";
+} from "./token-goat-chunk-CGWACYYZ.mjs";
 import {
   BODY_FIRST_TOOL_RESPONSE_KEYS,
   ENV_KEYS,
@@ -170,7 +171,48 @@ import {
   shortFingerprint,
   stripAnsiEscapes,
   toKB
-} from "./token-goat-chunk-4ZDRTNGV.mjs";
+} from "./token-goat-chunk-UZ2NFOOZ.mjs";
+
+// src/hint_suggestion_guard.ts
+function looksLikeSuggestion(slice) {
+  return slice.includes('"');
+}
+var SAFE_OUTSIDE_QUOTES = /^[A-Za-z0-9 \t_./=:,@+-]*$/;
+var CONTROL_OR_BIDI = /[\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F-\u009F\u200E\u200F\u202A-\u202E\u2066-\u2069\u061C\u200B-\u200D\u2028\u2029\uFE00-\uFE0F]|[\u{E0000}-\u{E007F}]/u;
+function suggestionIsUnsafe(slice) {
+  if (slice.includes("$") || slice.includes("\n") || slice.includes("\r") || slice.includes("`")) return true;
+  if (CONTROL_OR_BIDI.test(slice)) return true;
+  const regions = slice.split('"');
+  if (regions.length % 2 === 0) return true;
+  for (let i = 2; i < regions.length; i += 2) {
+    if (!SAFE_OUTSIDE_QUOTES.test(regions[i] ?? "")) return true;
+  }
+  return false;
+}
+var OMITTED = "token-goat (command omitted: the path contains shell metacharacters)";
+function stripUnsafeSuggestions(text) {
+  if (!text.includes("token-goat ")) return text;
+  let out = "";
+  let at = 0;
+  for (; ; ) {
+    const start = text.indexOf("token-goat ", at);
+    if (start === -1) return out + text.slice(at);
+    const lineBreak = text.slice(start).search(/[\r\n]/);
+    const line = lineBreak === -1 ? text.slice(start) : text.slice(start, start + lineBreak);
+    const firstTick = line.indexOf("`");
+    const narrow = firstTick === -1 ? line : line.slice(0, firstTick);
+    out += text.slice(at, start);
+    if (!looksLikeSuggestion(narrow) || !suggestionIsUnsafe(narrow)) {
+      out += narrow;
+      at = start + narrow.length;
+      continue;
+    }
+    const lastTick = line.lastIndexOf("`");
+    const wide = lastTick === -1 ? line : line.slice(0, lastTick);
+    out += OMITTED;
+    at = start + wide.length;
+  }
+}
 
 // src/hooks_grep.ts
 function grepIntInput(toolInput, key) {
@@ -645,7 +687,7 @@ import crypto from "node:crypto";
 var TRACKED_SKILL = "token-goat";
 var MAX_COMMANDS_SHOWN = 8;
 async function currentCommandNames() {
-  const { buildProgram } = await import("./token-goat-chunk-V5T3YNYR.mjs");
+  const { buildProgram } = await import("./token-goat-chunk-JMUBXBG7.mjs");
   return flattenCommandNames(buildCommandManifest(buildProgram()));
 }
 async function recordSkillVersionSnapshot(sessionId, skillName) {
@@ -5218,7 +5260,7 @@ function resolveCyclicReferences(value, utils, meta) {
   }
   const hierarchy = getMetaDataHierarchy(meta);
   const depth = getCyclicReferenceDepth(value, hierarchy, 0);
-  if (depth > 0 && hierarchy !== void 0) {
+  if (hierarchy !== void 0 && depth > 0) {
     return hierarchy[hierarchy.length - depth]?.result;
   }
   const type = getObjectType(value);
@@ -7035,6 +7077,10 @@ function preFetchHandler(event) {
   try {
     const urlOnlyCtx = resolveWebFetchUrl(event);
     if (urlOnlyCtx !== null) {
+      const metadataRefusal = metadataEndpointRefusal(urlOnlyCtx.url);
+      if (metadataRefusal !== null) {
+        return denyOutput(`WebFetch blocked: ${metadataRefusal}.`);
+      }
       const wfCfg = loadConfig().webfetch;
       if (wfCfg.deny.length > 0 && matchesDenyPattern(urlOnlyCtx.url, wfCfg.deny)) {
         return denyOutput(`WebFetch blocked: URL matches a configured webfetch.deny pattern.`);
@@ -10104,7 +10150,7 @@ ${dataUrl}`, changed: true, savedBytes: saved, savedTokens };
 var TAB_CONTEXT_UNCHANGED_NOTICE = "(tabs unchanged since last check)";
 function dedupTabContext(text) {
   if (!TAB_CONTEXT_RE.test(text)) return { text, changed: false };
-  const isRepeat = getLastTabContext() === text;
+  const isRepeat = lastTabContextMatches(text);
   setLastTabContext(text);
   if (!isRepeat) return { text, changed: false };
   const worthwhile = isRewriteWorthwhile({
@@ -10534,6 +10580,11 @@ function harnessForNormalization() {
   if (detected === "copilot_cli") return "copilot_cli";
   return "claude";
 }
+function safeSuggestions(output) {
+  if (output.hookType === "deny") return { hookType: "deny", message: stripUnsafeSuggestions(output.message) };
+  if (output.hookType === "context") return { hookType: "context", context: stripUnsafeSuggestions(output.context) };
+  return output;
+}
 async function relayInProcess(eventName, rawPayload) {
   try {
     if (!isHookEventName(eventName)) {
@@ -10556,7 +10607,7 @@ async function relayInProcess(eventName, rawPayload) {
       loadSessionState(stateKey);
     } catch {
     }
-    const output = await runHook(event);
+    const output = safeSuggestions(await runHook(event));
     try {
       saveSessionState(stateKey);
     } catch {