@kushalkhemka/opensec-pi-subagents 0.19.10 → 0.19.11

package/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.19.11] - 2026-10-07
+
+### Fixed
+
+- **The main agent's commands had no time limit either.** Pi's `bash` has no default timeout, so an unbounded `grep -r … /` or a server started in the foreground held the main agent's turn until someone noticed. A main-agent `bash` call that sets no timeout now gets `toolTimeoutSeconds` (default 1200 s, `0` = off) and is killed at it, with the timeout reported to the model. A timeout the main agent supplies, even a longer one, is kept; subagents stay capped at the limit.
+
 ## [0.19.10] - 2026-10-07
 
 ### Fixed

package/README.md

@@ -82,7 +82,7 @@ model and thinking level unless their definition or call overrides them.
 | Setting | Default | Meaning |
 |---|---|---|
 | Background concurrency (`/agents → Settings`) | `10` | How many background agents run at once. |
-| Tool timeout (`/agents → Settings`, `toolTimeoutSeconds`) | `1200` | Seconds one subagent tool call may run (`0` = no limit). A `bash` call is killed at the limit and the agent sees the timeout; any other tool still running a minute later is stopped and the agent is told to continue another way (up to 3 times per run). |
+| Tool timeout (`/agents → Settings`, `toolTimeoutSeconds`) | `1200` | Seconds one subagent tool call may run (`0` = no limit). A `bash` call is killed at the limit and the agent sees the timeout; any other tool still running a minute later is stopped and the agent is told to continue another way (up to 3 times per run). The main agent's `bash` calls get the same timeout when they set none; a timeout the main agent asks for is kept. |
 
 ## Notes
 

package/dist/agent-runner.d.ts

@@ -170,6 +170,12 @@ export interface HungTool {
 }
 /** The prompt that resumes an agent whose tool call the watchdog stopped. */
 export declare function hungToolPrompt(hung: HungTool): string;
+/**
+ * Give a `bash` call's arguments the limit as their timeout when they set none —
+ * and, with `cap`, when they set a longer or invalid one. Pi mutates the same
+ * object it then executes with, so this changes the running call.
+ */
+export declare function boundBashTimeout(args: unknown, limitSeconds: number, cap: boolean): void;
 /**
  * Bound a subagent session's tool calls (see `toolTimeoutSeconds`).
  *

package/dist/agent-runner.js

@@ -383,6 +383,21 @@ export function hungToolPrompt(hung) {
         + "output is lost. Continue the task without repeating that call: split the work into smaller, bounded steps "
         + "(search specific folders rather than the whole filesystem, limit depth and output, add timeouts).";
 }
+/**
+ * Give a `bash` call's arguments the limit as their timeout when they set none —
+ * and, with `cap`, when they set a longer or invalid one. Pi mutates the same
+ * object it then executes with, so this changes the running call.
+ */
+export function boundBashTimeout(args, limitSeconds, cap) {
+    if (limitSeconds <= 0 || !args || typeof args !== "object")
+        return;
+    const call = args;
+    if (call.timeout == null)
+        call.timeout = limitSeconds;
+    else if (cap && (typeof call.timeout !== "number" || !(call.timeout > 0) || call.timeout > limitSeconds)) {
+        call.timeout = limitSeconds;
+    }
+}
 /**
  * Bound a subagent session's tool calls (see `toolTimeoutSeconds`).
  *
@@ -396,12 +411,8 @@ export function installToolTimeouts(session, limitSeconds = toolTimeoutSeconds)
         return { takeHung: () => undefined, dispose: () => { } };
     const priorBeforeToolCall = session.agent.beforeToolCall;
     session.agent.beforeToolCall = async (context, signal) => {
-        if (context.toolCall.name === "bash" && context.args && typeof context.args === "object") {
-            const args = context.args;
-            if (typeof args.timeout !== "number" || !(args.timeout > 0) || args.timeout > limitSeconds) {
-                args.timeout = limitSeconds;
-            }
-        }
+        if (context.toolCall.name === "bash")
+            boundBashTimeout(context.args, limitSeconds, true);
         return priorBeforeToolCall?.(context, signal);
     };
     const running = new Map();

package/dist/index.js

@@ -18,7 +18,7 @@ import { abortable } from "./abortable.js";
 import { hasAgentBadge, renderAgentName } from "./agent-color.js";
 import { buildNewAgentFile, disableInContent, enableInContent, isEmptyStub, locateAgentFile, personalAgentsDir, projectAgentsDir, serializeAgentFile } from "./agent-file-toggle.js";
 import { AgentManager, isTopLevelAgent } from "./agent-manager.js";
-import { getAgentConversation, getDefaultMaxTurns, getGraceTurns, getRememberAgents, getToolTimeoutSeconds, normalizeMaxTurns, resolveEffectiveMaxTurns, SUBAGENT_TOOL_NAMES, setDefaultMaxTurns, setGraceTurns, setRememberAgents, setToolTimeoutSeconds, steerAgent } from "./agent-runner.js";
+import { boundBashTimeout, getAgentConversation, getDefaultMaxTurns, getGraceTurns, getRememberAgents, getToolTimeoutSeconds, normalizeMaxTurns, resolveEffectiveMaxTurns, SUBAGENT_TOOL_NAMES, setDefaultMaxTurns, setGraceTurns, setRememberAgents, setToolTimeoutSeconds, steerAgent } from "./agent-runner.js";
 import { BUILTIN_TOOL_NAMES, getAgentConfig, getAllTypes, getAvailableTypes, getConfig, getFallbackSubagent, isDefaultsDisabled, NO_FALLBACK, registerAgents, resolveSpawnType, resolveType, setDefaultsDisabled, setFallbackSubagent } from "./agent-types.js";
 import { inChildSessionContext } from "./child-context.js";
 import { registerRpcHandlers } from "./cross-extension-rpc.js";
@@ -1310,6 +1310,16 @@ export default function (pi) {
         });
         return record;
     }
+    // The main agent's `bash` calls get the tool timeout too, but only when they
+    // set none: the user is there to ask for a longer one. Pi's bash has no default,
+    // so an unbounded `grep -r … /` or a server started in the foreground would
+    // otherwise hold the turn until someone notices. (Subagents are also capped —
+    // see installToolTimeouts in agent-runner.ts.)
+    pi.on("tool_call", (event) => {
+        if (event.toolName === "bash")
+            boundBashTimeout(event.input, getToolTimeoutSeconds(), false);
+        return undefined;
+    });
     // Grab UI context from first tool execution + clear lingering widget on new turn
     pi.on("tool_execution_start", async (_event, ctx) => {
         widget.setUICtx(ctx.ui);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kushalkhemka/opensec-pi-subagents",
-  "version": "0.19.10",
+  "version": "0.19.11",
   "description": "Fork of @tintinweb/pi-subagents with parent model/thinking inheritance and cached agent discovery.",
   "author": "tintinweb",
   "contributors": [

package/src/agent-runner.ts

@@ -449,6 +449,20 @@ export function hungToolPrompt(hung: HungTool): string {
     + "(search specific folders rather than the whole filesystem, limit depth and output, add timeouts).";
 }
 
+/**
+ * Give a `bash` call's arguments the limit as their timeout when they set none —
+ * and, with `cap`, when they set a longer or invalid one. Pi mutates the same
+ * object it then executes with, so this changes the running call.
+ */
+export function boundBashTimeout(args: unknown, limitSeconds: number, cap: boolean): void {
+  if (limitSeconds <= 0 || !args || typeof args !== "object") return;
+  const call = args as { timeout?: unknown };
+  if (call.timeout == null) call.timeout = limitSeconds;
+  else if (cap && (typeof call.timeout !== "number" || !(call.timeout > 0) || call.timeout > limitSeconds)) {
+    call.timeout = limitSeconds;
+  }
+}
+
 /**
  * Bound a subagent session's tool calls (see `toolTimeoutSeconds`).
  *
@@ -465,12 +479,7 @@ export function installToolTimeouts(session: AgentSession, limitSeconds = toolTi
 
   const priorBeforeToolCall = session.agent.beforeToolCall;
   session.agent.beforeToolCall = async (context, signal) => {
-    if (context.toolCall.name === "bash" && context.args && typeof context.args === "object") {
-      const args = context.args as { timeout?: unknown };
-      if (typeof args.timeout !== "number" || !(args.timeout > 0) || args.timeout > limitSeconds) {
-        args.timeout = limitSeconds;
-      }
-    }
+    if (context.toolCall.name === "bash") boundBashTimeout(context.args, limitSeconds, true);
     return priorBeforeToolCall?.(context, signal);
   };
 

package/src/index.ts

@@ -19,7 +19,7 @@ import { abortable } from "./abortable.js";
 import { hasAgentBadge, renderAgentName } from "./agent-color.js";
 import { buildNewAgentFile, disableInContent, enableInContent, isEmptyStub, locateAgentFile, personalAgentsDir, projectAgentsDir, serializeAgentFile } from "./agent-file-toggle.js";
 import { AgentManager, isTopLevelAgent } from "./agent-manager.js";
-import { getAgentConversation, getDefaultMaxTurns, getGraceTurns, getRememberAgents, getToolTimeoutSeconds, normalizeMaxTurns, resolveEffectiveMaxTurns, SUBAGENT_TOOL_NAMES, setDefaultMaxTurns, setGraceTurns, setRememberAgents, setToolTimeoutSeconds, steerAgent } from "./agent-runner.js";
+import { boundBashTimeout, getAgentConversation, getDefaultMaxTurns, getGraceTurns, getRememberAgents, getToolTimeoutSeconds, normalizeMaxTurns, resolveEffectiveMaxTurns, SUBAGENT_TOOL_NAMES, setDefaultMaxTurns, setGraceTurns, setRememberAgents, setToolTimeoutSeconds, steerAgent } from "./agent-runner.js";
 import { BUILTIN_TOOL_NAMES, getAgentConfig, getAllTypes, getAvailableTypes, getConfig, getFallbackSubagent, isDefaultsDisabled, NO_FALLBACK, registerAgents, resolveSpawnType, resolveType, setDefaultsDisabled, setFallbackSubagent } from "./agent-types.js";
 import { inChildSessionContext } from "./child-context.js";
 import { type RpcHandle, registerRpcHandlers } from "./cross-extension-rpc.js";
@@ -1413,6 +1413,16 @@ export default function (pi: ExtensionAPI) {
     return record;
   }
 
+  // The main agent's `bash` calls get the tool timeout too, but only when they
+  // set none: the user is there to ask for a longer one. Pi's bash has no default,
+  // so an unbounded `grep -r … /` or a server started in the foreground would
+  // otherwise hold the turn until someone notices. (Subagents are also capped —
+  // see installToolTimeouts in agent-runner.ts.)
+  pi.on("tool_call", (event) => {
+    if (event.toolName === "bash") boundBashTimeout(event.input, getToolTimeoutSeconds(), false);
+    return undefined;
+  });
+
   // Grab UI context from first tool execution + clear lingering widget on new turn
   pi.on("tool_execution_start", async (_event, ctx) => {
     widget.setUICtx(ctx.ui as UICtx);