@wrongstack/tools 0.287.0 → 0.289.0

package/dist/bash.d.ts

@@ -1,4 +1,4 @@
-import type { Tool } from '@wrongstack/core';
+import { type Tool } from '@wrongstack/core';
 interface BashInput {
     command: string;
     timeout_ms?: number | undefined;

package/dist/bash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../src/bash.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAW,IAAI,EAAmB,MAAM,kBAAkB,CAAC;AASvE,UAAU,SAAS;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAClC;AAED,UAAU,UAAU;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAChC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AA4BD,eAAO,MAAM,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,UAAU,CAkmBhD,CAAC;AAGF,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../src/bash.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,KAAK,IAAI,EAEV,MAAM,kBAAkB,CAAC;AAS1B,UAAU,SAAS;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAClC;AAED,UAAU,UAAU;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAChC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AA4BD,eAAO,MAAM,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,UAAU,CAoqBhD,CAAC;AAGF,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC"}

package/dist/bash.js

@@ -1,6 +1,11 @@
 // src/bash.ts
 import { spawn as spawn2 } from "node:child_process";
 import * as os4 from "node:os";
+import {
+  emitProcessCompleted,
+  emitProcessOutput,
+  emitProcessStarted
+} from "@wrongstack/core";
 
 // src/_env.ts
 import { buildChildEnv } from "@wrongstack/core";
@@ -386,9 +391,14 @@ import { expectDefined } from "@wrongstack/core";
 var SENSITIVE_FLAG_PATTERNS = [
   // --flag=value  or  --flag "value"  (value captured up to next space or comma)
   /--(?: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,
-  // -f "value" style short flags
-  /(?<!\w)-t(?:\s+|\s*=\s*)[^\s,]+/,
-  /(?<!\w)-(?:p|password)(?:\s+|\s*=\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`.
+  // NOTE: synced with @wrongstack/core observability/redact-command.ts.
+  /(?<![-\w])-t(?:[=\s]+)?[^\s,-]+/,
+  // -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.
+  /(?<![-\w])-(?:password|p|a)(?:[=\s]+)?[^\s,-]+/gi,
   // 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
@@ -406,8 +416,10 @@ function redactCommand(cmd) {
         const flag = match.slice(0, match.indexOf(expectDefined(delim)) + 1);
         return `${flag}[REDACTED]`;
       }
-      const flagEnd = match.match(/^--?[a-zA-Z][a-zA-Z0-9_-]*/)?.[0] ?? match;
-      return `${flagEnd}=**redacted**`;
+      if (match.startsWith("--")) {
+        return match;
+      }
+      return `${match.slice(0, 2)}[REDACTED]`;
     });
   }
   return result;
@@ -1669,6 +1681,32 @@ var bashTool = {
         }
       }
       const pid2 = child2.pid;
+      let stdoutBytes2 = 0;
+      let stderrBytes2 = 0;
+      let telemetryCompleted2 = false;
+      emitProcessStarted({
+        ...pid2 !== void 0 ? { pid: pid2 } : {},
+        parentPid: process.pid,
+        command: redactCommand(`${shell} ${args.join(" ")}`),
+        args: redactCommand(args.join(" ")).split(" ").filter(Boolean),
+        cwd: ctx.projectRoot,
+        background: true,
+        startedAt: new Date(startedAt).toISOString()
+      });
+      const completeBackground = (exitCode, signal) => {
+        if (telemetryCompleted2) return;
+        telemetryCompleted2 = true;
+        emitProcessCompleted({
+          ...pid2 !== void 0 ? { pid: pid2 } : {},
+          exitCode,
+          ...signal ? { signal } : {},
+          durationMs: Date.now() - startedAt,
+          stdoutBytes: stdoutBytes2,
+          stderrBytes: stderrBytes2,
+          timedOut: false,
+          endedAt: (/* @__PURE__ */ new Date()).toISOString()
+        });
+      };
       if (typeof pid2 === "number") {
         registry.register({
           pid: pid2,
@@ -1681,7 +1719,10 @@ var bashTool = {
         });
         child2.on("close", () => registry.unregister(pid2));
       }
-      const onBgData = (chunk) => {
+      const onBgData = (chunk, stream) => {
+        if (stream === "stdout") stdoutBytes2 += chunk.byteLength;
+        else stderrBytes2 += chunk.byteLength;
+        emitProcessOutput({ pid: pid2, stream, chunk });
         if (truncated) return;
         const remain = MAX_OUTPUT - buf2.length;
         if (remain > 0) {
@@ -1689,24 +1730,28 @@ var bashTool = {
         }
         if (buf2.length >= MAX_OUTPUT) {
           truncated = true;
-          child2.stdout?.off("data", onBgData);
-          child2.stderr?.off("data", onBgData);
+          child2.stdout?.off("data", onBgStdout);
+          child2.stderr?.off("data", onBgStderr);
         }
       };
-      child2.stdout?.on("data", onBgData);
-      child2.stderr?.on("data", onBgData);
+      const onBgStdout = (chunk) => onBgData(chunk, "stdout");
+      const onBgStderr = (chunk) => onBgData(chunk, "stderr");
+      child2.stdout?.on("data", onBgStdout);
+      child2.stderr?.on("data", onBgStderr);
       const cleanupBackground = () => {
-        child2.stdout?.off("data", onBgData);
-        child2.stderr?.off("data", onBgData);
+        child2.stdout?.off("data", onBgStdout);
+        child2.stderr?.off("data", onBgStderr);
       };
       child2.on("error", () => {
         cleanupBackground();
         if (typeof pid2 === "number") registry.unregister(pid2);
         registry.afterCall(Date.now() - startedAt, true, bypassBreaker);
+        completeBackground(1);
       });
-      child2.on("close", () => {
+      child2.on("close", (code, signal) => {
         cleanupBackground();
         registry.afterCall(Date.now() - startedAt, false, bypassBreaker);
+        completeBackground(code ?? (signal ? 1 : 0), signal ?? void 0);
       });
       if (typeof pid2 === "number") child2.unref();
       yield {
@@ -1746,6 +1791,32 @@ var bashTool = {
       }
     }
     const pid = child.pid;
+    let stdoutBytes = 0;
+    let stderrBytes = 0;
+    let telemetryCompleted = false;
+    emitProcessStarted({
+      ...pid !== void 0 ? { pid } : {},
+      parentPid: process.pid,
+      command: redactCommand(`${shell} ${args.join(" ")}`),
+      args: redactCommand(args.join(" ")).split(" ").filter(Boolean),
+      cwd: ctx.projectRoot,
+      background: false,
+      startedAt: new Date(startedAt).toISOString()
+    });
+    const completeForeground = (exitCode, signal) => {
+      if (telemetryCompleted) return;
+      telemetryCompleted = true;
+      emitProcessCompleted({
+        ...pid !== void 0 ? { pid } : {},
+        exitCode,
+        ...signal ? { signal } : {},
+        durationMs: Date.now() - startedAt,
+        stdoutBytes,
+        stderrBytes,
+        timedOut,
+        endedAt: (/* @__PURE__ */ new Date()).toISOString()
+      });
+    };
     if (typeof pid === "number") {
       registry.register({
         pid,
@@ -1847,8 +1918,11 @@ var bashTool = {
         child.stderr?.resume();
       }
     };
-    const onData = (chunk) => {
+    const onData = (chunk, stream) => {
       const text = chunk.toString();
+      if (stream === "stdout") stdoutBytes += chunk.byteLength;
+      else stderrBytes += chunk.byteLength;
+      emitProcessOutput({ pid, stream, chunk });
       if (buf.length < MAX_OUTPUT) {
         buf += text.slice(0, MAX_OUTPUT - buf.length);
       }
@@ -1857,17 +1931,21 @@ var bashTool = {
       push({ kind: "data", text });
       pauseIfFlooded();
     };
-    child.stdout?.on("data", onData);
-    child.stderr?.on("data", onData);
+    const onStdoutData = (chunk) => onData(chunk, "stdout");
+    const onStderrData = (chunk) => onData(chunk, "stderr");
+    child.stdout?.on("data", onStdoutData);
+    child.stderr?.on("data", onStderrData);
     child.on("error", (err) => {
       for (const t of timers) clearTimeout(t);
       registry.afterCall(Date.now() - startedAt, true);
+      completeForeground(1);
       push({ kind: "error", err });
     });
-    child.on("close", (code) => {
+    child.on("close", (code, signal) => {
       for (const t of timers) clearTimeout(t);
       if (typeof pid === "number") registry.unregister(pid);
       registry.afterCall(Date.now() - startedAt, code !== 0 && code !== null);
+      completeForeground(timedOut ? 124 : code ?? (signal ? 1 : 0), signal ?? void 0);
       push({ kind: "end", code });
     });
     try {
@@ -1912,8 +1990,8 @@ ${hint}` : ""),
       for (const t of timers) clearTimeout(t);
       spool.finalize();
       if (isWin2) opts.signal.removeEventListener("abort", onAbort);
-      child.stdout?.off("data", onData);
-      child.stderr?.off("data", onData);
+      child.stdout?.off("data", onStdoutData);
+      child.stderr?.off("data", onStderrData);
       child.stdout?.destroy();
       child.stderr?.destroy();
       if (child.exitCode === null && !child.killed) {