@wrongstack/tools 0.305.1 → 0.306.2

package/dist/format.js

@@ -364,8 +364,11 @@ var SENSITIVE_FLAG_PATTERNS = [
   /--(?:token|password|passwd|pwd|secret|api[-_]?key|api[-_]?secret|auth|credential|private[-_]?key|access[-_]?key|github[-_]?token|gh[-_]?token|bearer|jwt|oauth|pin|pincode|passphrase|access[-_]?token)(?:[=\s,][^\s]*)?/gi,
   // -t short flag (token): attached (-tVALUE), separated (-t VALUE), or -t=VALUE.
   // (?<![-\w]) anchors to a token start so we don't match the `-t` inside `--token`.
+  // The value must be token-like (>= 8 chars) so ordinary combined flags such
+  // as `tar -tf` / `ssh -tt` are not eaten. Global flag: EVERY occurrence is
+  // redacted, not just the first.
   // NOTE: synced with @wrongstack/core observability/redact-command.ts.
-  /(?<![-\w])-t(?:[=\s]+)?[^\s,-]+/,
+  /(?<![-\w])-t(?:[=\s]+)?[^\s,-]{8,}/g,
   // -p|-password|-a (redis auth) short flags: attached + separated + =value.
   // Same token-start anchor; over-redaction is an accepted tradeoff for a
   // redaction function. Synced with core copy.
@@ -373,8 +376,9 @@ var SENSITIVE_FLAG_PATTERNS = [
   // env var–style secrets: TOKEN=x, API_KEY=y, etc.
   /(?:TOKEN|API_KEY|API_SECRET|AUTH_TOKEN|GITHUB_TOKEN|GH_TOKEN|BEARER|JWT|OAUTH|CREDENTIAL|SECRET|PRIVATE_KEY|PASSWORD|PASSWD)\s*[=:]\s*[^\s,]+/gi,
   // Generic high-entropy look: base64 strings >32 chars or hex strings >32 digits — but only
-  // when preceded by a flag name (e.g. --github-token=EyJ...).
-  /--\w*(?:token|key|secret|password|passwd|auth|credential)\w*[=\s,][A-Za-z0-9+/=]{32,}/
+  // when preceded by a flag name (e.g. --github-token=EyJ...). Global flag so
+  // every such flag in the command line is redacted, not just the first.
+  /--\w*(?:token|key|secret|password|passwd|auth|credential)\w*[=\s,][A-Za-z0-9+/=]{32,}/g
 ];
 function redactCommand(cmd) {
   let result = cmd;
@@ -463,11 +467,15 @@ var ProcessRegistryImpl = class {
     return Number.isInteger(pid) && pid > 1 && pid !== process.pid && pid !== process.ppid;
   }
   _canSignalProcessGroup(p) {
-    return os.platform() !== "win32" && p.processGroupLeader === true && this._isSafeSignalPid(p.pid) && typeof p.child.pid === "number" && p.child.pid === p.pid;
+    return os.platform() !== "win32" && p.processGroupLeader === true && this._isSafeSignalPid(p.pid) && p.child !== null && typeof p.child.pid === "number" && p.child.pid === p.pid;
   }
   _killChildDirect(p, signal) {
     try {
-      p.child.kill(signal);
+      if (p.child) {
+        p.child.kill(signal);
+        return;
+      }
+      if (this._isSafeSignalPid(p.pid)) process.kill(p.pid, signal);
     } catch {
     }
   }
@@ -665,15 +673,15 @@ var ProcessRegistryImpl = class {
     this._pruneStale(pid);
     const p = this.processes.get(pid);
     if (!p) return false;
-    if (p.killed) return true;
+    if (p.killed && opts.force !== true) return true;
     if (p.protected && opts.includeProtected !== true) return false;
     if (opts.preserveBackground && p.background) return false;
     const { force = false, graceMs = DEFAULT_GRACE_MS } = opts;
     const isWin2 = os.platform() === "win32";
     if (isWin2) {
-      const liveRealChild = p.child.exitCode === null && typeof p.child.pid === "number";
+      const liveRealChild = p.child === null || p.child.exitCode === null && typeof p.child.pid === "number";
       const directFallback = () => {
-        if (p.child.exitCode === null) {
+        if (p.child && p.child.exitCode === null) {
           try {
             p.child.kill("SIGKILL");
           } catch {
@@ -685,10 +693,7 @@ var ProcessRegistryImpl = class {
         onSettled: directFallback
       })) {
       } else {
-        try {
-          p.child.kill(force ? "SIGKILL" : "SIGTERM");
-        } catch {
-        }
+        this._killChildDirect(p, force ? "SIGKILL" : "SIGTERM");
       }
       p.killed = true;
       return true;
@@ -699,7 +704,7 @@ var ProcessRegistryImpl = class {
       } else {
         this._killPosix(p, "SIGTERM");
         const timer = setTimeout(() => {
-          if (this.processes.has(pid) && !p.child.killed) {
+          if (this.processes.has(pid) && !p.child?.killed) {
             this._killPosix(p, "SIGKILL");
           }
         }, graceMs);
@@ -754,6 +759,16 @@ var ProcessRegistryImpl = class {
    * before reusing a PID, but we want to clean up before that becomes a risk.
    */
   _isStaleEntry(entry) {
+    if (entry.child === null) {
+      if (Date.now() - entry.startedAt <= 6e4) return false;
+      if (os.platform() === "win32") return false;
+      try {
+        process.kill(entry.pid, 0);
+        return false;
+      } catch (err) {
+        return err.code !== "EPERM";
+      }
+    }
     return entry.child.exitCode !== null && Date.now() - entry.startedAt > 6e4;
   }
   /**
@@ -3590,8 +3605,9 @@ var formatTool = {
           type: "final",
           output: {
             fixer: bridge.language,
-            files_checked: 0,
-            files_changed: run.summary.errors > 0 ? 0 : 1,
+            // Language-bridge runs don't report per-file counts.
+            files_checked: void 0,
+            files_changed: void 0,
             output: normalizeCommandOutput(run.output || run.error || ""),
             truncated: run.truncated
           }
@@ -3618,11 +3634,14 @@ var formatTool = {
       text: `Running ${detected}\u2026`,
       data: { fixer: detected, check: !!input.check }
     };
-    const args = ["format", "--write"];
-    if (input.check) args[args.length - 1] = "--check";
-    if (input.files) {
-      const files = Array.isArray(input.files) ? input.files : input.files.split(",");
-      args.push("--", ...files.map((f) => f.trim()));
+    const fileList = input.files ? (Array.isArray(input.files) ? input.files : input.files.split(",")).map((f) => f.trim()) : [];
+    let args;
+    if (detected === "prettier") {
+      args = [input.check ? "--check" : "--write"];
+      args.push(...fileList.length > 0 ? fileList : ["."]);
+    } else {
+      args = ["format", input.check ? "--check" : "--write"];
+      if (fileList.length > 0) args.push("--", ...fileList);
     }
     const result = yield* spawnStream({
       cmd: detected,
@@ -3631,32 +3650,63 @@ var formatTool = {
       signal: opts.signal,
       maxBytes: 1e5
     });
-    const changed = [...result.stdout.matchAll(/\bchanged\b/gi)].length;
+    const combinedOut = `${result.stdout}
+${result.stderr}`;
+    const counts = parseFormatterCounts(detected, combinedOut);
     yield {
       type: "final",
       output: {
         fixer: detected,
-        files_checked: 0,
-        files_changed: changed,
+        files_checked: counts.checked,
+        files_changed: counts.changed,
         output: normalizeCommandOutput(result.stdout || result.stderr || result.error || ""),
         truncated: result.truncated
       }
     };
   }
 };
+function parseFormatterCounts(fixer, output) {
+  if (fixer !== "biome") return { checked: void 0, changed: void 0 };
+  const checkedMatch = /\b(?:Checked|Formatted)\s+(\d+)\s+files?\b/i.exec(output);
+  const changedMatch = /\bFixed\s+(\d+)\s+files?\b/i.exec(output);
+  return {
+    checked: checkedMatch?.[1] !== void 0 ? Number(checkedMatch[1]) : void 0,
+    changed: changedMatch?.[1] !== void 0 ? Number(changedMatch[1]) : void 0
+  };
+}
 async function detectFixer(cwd) {
-  const { stat: stat5 } = await import("node:fs/promises");
-  try {
-    await stat5(`${cwd}/biome.json`);
-    return "biome";
-  } catch {
+  const fs6 = await import("node:fs/promises");
+  const exists = async (file) => {
     try {
-      await stat5(`${cwd}/.prettierrc`);
-      return "prettier";
+      await fs6.stat(`${cwd}/${file}`);
+      return true;
     } catch {
-      return "biome";
+      return false;
     }
+  };
+  if (await exists("biome.json") || await exists("biome.jsonc")) return "biome";
+  const PRETTIER_CONFIGS = [
+    ".prettierrc",
+    ".prettierrc.json",
+    ".prettierrc.yml",
+    ".prettierrc.yaml",
+    ".prettierrc.js",
+    ".prettierrc.cjs",
+    ".prettierrc.mjs",
+    "prettier.config.js",
+    "prettier.config.cjs",
+    "prettier.config.mjs"
+  ];
+  for (const cfg of PRETTIER_CONFIGS) {
+    if (await exists(cfg)) return "prettier";
+  }
+  try {
+    const raw = await fs6.readFile(`${cwd}/package.json`, "utf8");
+    const pkg = JSON.parse(raw);
+    if (pkg["prettier"] !== void 0) return "prettier";
+  } catch {
   }
+  return "biome";
 }
 export {
   formatTool

package/dist/glob.js

@@ -2,6 +2,7 @@
 import * as fs2 from "node:fs/promises";
 import * as path3 from "node:path";
 import { compileGlob as compileGlob2, DEFAULT_WALK_IGNORE_DIRS } from "@wrongstack/core/utils";
+import { ToolValidationError } from "@wrongstack/core/types";
 
 // src/_concurrency.ts
 async function mapWithConcurrency(items, limit, fn) {
@@ -143,7 +144,7 @@ var WALK_CONCURRENCY = 16;
 var globTool = {
   name: "glob",
   category: "Filesystem",
-  description: "Find files by path pattern. Use index-backed `codebase-search` first for code symbols or concepts when it is live.",
+  description: "Find files by path pattern. Results are sorted by modification time, newest first, so when the list is truncated at `limit` it is the oldest files that are dropped (recency-biased). Use index-backed `codebase-search` first for code symbols or concepts when it is live.",
   usageHint: "PATH DISCOVERY AND SEARCH SCOPING:\n\n- When `codebase-search` is live, use it first for code concepts; use `glob` for filenames, path patterns, and non-indexed files.\n- Combine with `path` and `limit`.\n- Default ignores common build/dependency directories.\nMuch more efficient than shell `find` for most use cases inside the agent.",
   selection: {
     doNotUseWhen: "you need to search inside file contents.",
@@ -154,7 +155,7 @@ var globTool = {
   capabilities: ["fs.read"],
   icon: "folder",
   maxOutputBytes: 65536,
-  timeoutMs: 5e3,
+  timeoutMs: 15e3,
   inputSchema: {
     type: "object",
     properties: {
@@ -168,13 +169,20 @@ var globTool = {
       },
       limit: {
         type: "integer",
-        description: "Maximum number of results to return (default 1000, max 5000)."
+        minimum: 1,
+        maximum: 5e3,
+        description: "Maximum number of results to return (default 1000, max 5000). Results are sorted by mtime descending, so truncation keeps the most recently modified files."
       }
     },
     required: ["pattern"]
   },
   async execute(input, ctx, opts) {
-    if (!input?.pattern) throw new Error("glob: pattern is required");
+    if (!input?.pattern) {
+      throw new ToolValidationError({
+        message: "glob: pattern is required",
+        field: "pattern"
+      });
+    }
     const signal = opts?.signal;
     const base = input.path ? await safeResolveReal(input.path, ctx) : ctx.cwd;
     const limit = Math.max(1, Math.min(input.limit ?? 1e3, 5e3));

package/dist/grep.d.ts

@@ -15,5 +15,7 @@ interface GrepOutput {
     used: 'rg' | 'native';
 }
 export declare const grepTool: Tool<GrepInput, GrepOutput>;
+/** Test-only: forget the cached rg availability so mocks can vary per test. */
+export declare function __resetRgDetectionForTests(): void;
 export {};
 //# sourceMappingURL=grep.d.ts.map

package/dist/grep.js

@@ -358,7 +358,7 @@ var grepTool = {
         field: "pattern"
       });
     }
-    const rgAvailable = await detectRg(opts.signal);
+    const rgAvailable = await detectRg();
     if (rgAvailable) {
       try {
         yield* runRgStream(input, base, mode, limit, opts.signal);
@@ -371,16 +371,26 @@ var grepTool = {
     yield { type: "final", output: out };
   }
 };
-async function detectRg(signal) {
-  return new Promise((resolve2) => {
+var rgAvailabilityCache;
+function __resetRgDetectionForTests() {
+  rgAvailabilityCache = void 0;
+}
+function detectRg() {
+  rgAvailabilityCache ??= new Promise((resolve2) => {
     try {
-      const p = spawn("rg", ["--version"], { env: buildChildEnv(), stdio: "ignore", signal, windowsHide: true });
+      const p = spawn("rg", ["--version"], {
+        env: buildChildEnv(),
+        stdio: "ignore",
+        signal: AbortSignal.timeout(1e4),
+        windowsHide: true
+      });
       p.on("error", () => resolve2(false));
       p.on("close", (code) => resolve2(code === 0));
     } catch {
       resolve2(false);
     }
   });
+  return rgAvailabilityCache;
 }
 async function* runRgStream(input, base, mode, limit, signal) {
   const args = ["--no-heading"];
@@ -701,6 +711,7 @@ async function runNative(input, base, mode, limit, signal) {
   };
 }
 export {
+  __resetRgDetectionForTests,
   grepTool
 };
 //# sourceMappingURL=grep.js.map