@wrongstack/tools 0.292.1 → 0.295.0

package/dist/bash.d.ts

@@ -1,4 +1,4 @@
-import { type Tool } from '@wrongstack/core';
+import type { Tool } from '@wrongstack/core/types';
 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,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"}
+{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../src/bash.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,IAAI,EAAmB,MAAM,wBAAwB,CAAC;AASpE,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,CAyoBhD,CAAC;AAGF,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC"}

package/dist/bash.js

@@ -5,16 +5,16 @@ import {
   emitProcessCompleted,
   emitProcessOutput,
   emitProcessStarted
-} from "@wrongstack/core";
+} from "@wrongstack/core/observability";
 
 // src/_env.ts
-import { buildChildEnv } from "@wrongstack/core";
+import { buildChildEnv } from "@wrongstack/core/utils";
 
 // src/_output-spool.ts
 import { createWriteStream, mkdirSync } from "node:fs";
 import * as fsp from "node:fs/promises";
 import * as path from "node:path";
-import { wstackGlobalRoot } from "@wrongstack/core";
+import { wstackGlobalRoot } from "@wrongstack/core/utils";
 var SPOOL_RETENTION_MS = 7 * 24 * 60 * 60 * 1e3;
 var SPOOL_WRITE_HWM_BYTES = 4 * 1024 * 1024;
 var sweepStarted = false;
@@ -118,7 +118,7 @@ function createOutputSpool(opts) {
 }
 
 // src/_util.ts
-import * as Core from "@wrongstack/core";
+import * as Core from "@wrongstack/core/utils";
 var COMMAND_OUTPUT_MAX_BYTES = 32768;
 var REPEAT_RUN_THRESHOLD = 3;
 function collapseCarriageReturns(text) {
@@ -387,7 +387,7 @@ var CircuitBreaker = class {
 };
 
 // src/_redact-command.ts
-import { expectDefined } from "@wrongstack/core";
+import { expectDefined } from "@wrongstack/core/utils";
 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,
@@ -481,7 +481,12 @@ var ProcessRegistryImpl = class {
     this.breaker.setEnabled(false);
   }
   register(info) {
-    this.processes.set(info.pid, { ...info, killed: false, protected: info.protected ?? false });
+    this.processes.set(info.pid, {
+      ...info,
+      killed: false,
+      protected: info.protected ?? false,
+      background: info.background ?? false
+    });
   }
   _isSafeSignalPid(pid) {
     return Number.isInteger(pid) && pid > 1 && pid !== process.pid && pid !== process.ppid;
@@ -534,12 +539,21 @@ var ProcessRegistryImpl = class {
     }
     return n;
   }
+  /** Count of active jobs explicitly launched in background mode. */
+  get activeBackgroundCount() {
+    let n = 0;
+    for (const p of this.processes.values()) {
+      if (p.background && !p.killed) n++;
+    }
+    return n;
+  }
   /**
    * Combined stats for observability — used by /ps and the TUI status bar.
    */
   stats() {
     return {
       activeCount: this.activeCount,
+      backgroundCount: this.activeBackgroundCount,
       totalCount: this.processes.size,
       breaker: this.breaker.snapshot()
     };
@@ -640,7 +654,7 @@ var ProcessRegistryImpl = class {
     this.autoKillTimer = setTimeout(() => {
       this.autoKillTimer = null;
       this.autoKillArmedAt = null;
-      this.killAll({ force: false });
+      this.killAll({ force: false, preserveBackground: true });
       this.breaker.forceReset();
       this._emitBreakerCountdown();
     }, this.autoKillResetMs);
@@ -680,6 +694,7 @@ var ProcessRegistryImpl = class {
     if (!p) return false;
     if (p.killed) return true;
     if (p.protected) return false;
+    if (opts.preserveBackground && p.background) return false;
     const { force = false, graceMs = DEFAULT_GRACE_MS } = opts;
     const isWin2 = os.platform() === "win32";
     if (isWin2) {
@@ -790,8 +805,9 @@ import * as os3 from "node:os";
 // src/process-registry-persistent.ts
 import * as fs from "node:fs/promises";
 import * as os2 from "node:os";
+import { wstackGlobalRoot as wstackGlobalRoot3 } from "@wrongstack/core/utils";
 import * as path2 from "node:path";
-var REGISTRY_FILE = ".wrongstack/process-registry.json";
+var REGISTRY_FILE = "process-registry.json";
 function toErrorMessage(err) {
   return err instanceof Error ? err.message : String(err);
 }
@@ -809,7 +825,7 @@ function emitStructuredLog(level, event, message, error) {
 }
 var HEARTBEAT_INTERVAL_MS = 5e3;
 var STALE_THRESHOLD_MS = 3e4;
-var LOCKFILE = ".wrongstack/.process-registry.lock";
+var LOCKFILE = ".process-registry.lock";
 function generateInstanceId() {
   const hostname2 = os2.hostname();
   const pid = process.pid;
@@ -898,12 +914,18 @@ var PersistentProcessRegistry = class {
   lockPath;
   baseRegistry;
   heartbeatInterval = null;
+  cleanupInterval = null;
+  heartbeatRunning = false;
+  cleanupRunning = false;
   isShuttingDown = false;
+  onProcessExit = () => {
+    void this.syncToPersistent();
+  };
   constructor(baseRegistry) {
     this.instanceId = generateInstanceId();
-    const homeDir = os2.homedir();
-    this.registryPath = path2.join(homeDir, REGISTRY_FILE);
-    this.lockPath = path2.join(homeDir, LOCKFILE);
+    const globalRoot = wstackGlobalRoot3();
+    this.registryPath = path2.join(globalRoot, REGISTRY_FILE);
+    this.lockPath = path2.join(globalRoot, LOCKFILE);
     this.baseRegistry = baseRegistry ?? getProcessRegistry();
     this.ensureDirectory().catch((err) => {
       emitStructuredLog("warn", "process_registry.dir_create_failed", "PersistentProcessRegistry: failed to create .wrongstack directory", err);
@@ -922,16 +944,18 @@ var PersistentProcessRegistry = class {
    */
   start() {
     if (this.heartbeatInterval) return;
-    this.syncToPersistent();
+    this.isShuttingDown = false;
+    this.heartbeat();
     this.heartbeatInterval = setInterval(() => {
       this.heartbeat();
     }, HEARTBEAT_INTERVAL_MS);
     this.heartbeatInterval.unref?.();
-    setInterval(() => {
-      this.cleanupStaleEntries();
-    }, STALE_THRESHOLD_MS).unref?.();
+    this.cleanupInterval = setInterval(() => {
+      this.cleanup();
+    }, STALE_THRESHOLD_MS);
+    this.cleanupInterval.unref?.();
     this.registerMainProcess();
-    process.on("exit", () => this.syncToPersistent());
+    process.on("exit", this.onProcessExit);
   }
   /**
    * Stop the heartbeat and clean up.
@@ -942,7 +966,12 @@ var PersistentProcessRegistry = class {
       clearInterval(this.heartbeatInterval);
       this.heartbeatInterval = null;
     }
-    this.syncToPersistent();
+    if (this.cleanupInterval) {
+      clearInterval(this.cleanupInterval);
+      this.cleanupInterval = null;
+    }
+    process.off("exit", this.onProcessExit);
+    void this.syncToPersistent();
   }
   /**
    * Register the main WrongStack process as protected.
@@ -1026,8 +1055,18 @@ var PersistentProcessRegistry = class {
    * Send heartbeat to mark all this instance's processes as alive.
    */
   heartbeat() {
-    if (this.isShuttingDown) return;
-    this.syncToPersistent();
+    if (this.isShuttingDown || this.heartbeatRunning) return;
+    this.heartbeatRunning = true;
+    void this.syncToPersistent().finally(() => {
+      this.heartbeatRunning = false;
+    });
+  }
+  cleanup() {
+    if (this.isShuttingDown || this.cleanupRunning) return;
+    this.cleanupRunning = true;
+    void this.cleanupStaleEntries().finally(() => {
+      this.cleanupRunning = false;
+    });
   }
   /**
    * Sync this instance's processes to the persistent registry.
@@ -1781,14 +1820,12 @@ var bashTool = {
     const detached = !isWin2;
     const startedAt = Date.now();
     if (input.background) {
-      let buf2 = "";
-      let truncated = false;
       const child2 = spawn2(shell, args, {
         cwd: ctx.projectRoot,
         env,
         // PowerShell takes the script on stdin (no argv quoting); cmd.exe
         // and POSIX shells ignore stdin when given the command inline.
-        stdio: [plan.useStdin ? "pipe" : "ignore", "pipe", "pipe"],
+        stdio: [plan.useStdin ? "pipe" : "ignore", "ignore", "ignore"],
         // win32: CreateProcess IGNORES CREATE_NO_WINDOW (windowsHide) when
         // DETACHED_PROCESS (detached: true) is set, so the console-less
         // cmd.exe's grandchildren (node, dev servers) each allocate a fresh
@@ -1807,8 +1844,8 @@ var bashTool = {
         }
       }
       const pid2 = child2.pid;
-      let stdoutBytes2 = 0;
-      let stderrBytes2 = 0;
+      const stdoutBytes2 = 0;
+      const stderrBytes2 = 0;
       let telemetryCompleted2 = false;
       emitProcessStarted({
         ...pid2 !== void 0 ? { pid: pid2 } : {},
@@ -1841,41 +1878,17 @@ var bashTool = {
           startedAt: Date.now(),
           sessionId: ctx.session?.id,
           child: child2,
-          processGroupLeader: detached && child2.pid === pid2
+          processGroupLeader: detached && child2.pid === pid2,
+          background: true
         });
         child2.on("close", () => registry.unregister(pid2));
       }
-      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) {
-          buf2 += chunk.toString().slice(0, remain);
-        }
-        if (buf2.length >= MAX_OUTPUT) {
-          truncated = true;
-          child2.stdout?.off("data", onBgStdout);
-          child2.stderr?.off("data", onBgStderr);
-        }
-      };
-      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", 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", (code, signal) => {
-        cleanupBackground();
         registry.afterCall(Date.now() - startedAt, false, bypassBreaker);
         completeBackground(code ?? (signal ? 1 : 0), signal ?? void 0);
       });
@@ -1883,7 +1896,7 @@ var bashTool = {
       yield {
         type: "final",
         output: {
-          output: normalizeCommandOutput(buf2),
+          output: "",
           exit_code: null,
           timed_out: false,
           pid: pid2
@@ -2154,6 +2167,7 @@ ${hint}` : ""),
     for (const entry of registry.bySession(sessionId)) {
       if (entry.name !== "bash") continue;
       if (entry.child.exitCode !== null) continue;
+      if (entry.background) continue;
       if (entry.protected) continue;
       registry.kill(entry.pid, { force: true });
     }