@opengsd/gsd-pi 1.2.0-dev.84c56d87 → 1.2.0-dev.8e6112e9

package/dist/cli-model-override.d.ts

@@ -0,0 +1,15 @@
+import type { ModelRegistry as ModelRegistryInstance } from '@gsd/pi-coding-agent';
+/**
+ * Apply the --model CLI flag override to the active session.
+ * Searches available models by exact id or provider/id pattern and warns
+ * on stderr when the requested model is not found in the registry.
+ *
+ * The setModel call is intentionally fire-and-forget: provider readiness
+ * checks run later in startup so --model does not block session creation.
+ */
+export declare function applyModelOverride(session: {
+    setModel(model: {
+        provider: string;
+        id: string;
+    }): unknown | Promise<unknown>;
+}, modelRegistry: ModelRegistryInstance, modelFlag: string | undefined): void;

package/dist/cli-model-override.js

@@ -0,0 +1,21 @@
+/**
+ * Apply the --model CLI flag override to the active session.
+ * Searches available models by exact id or provider/id pattern and warns
+ * on stderr when the requested model is not found in the registry.
+ *
+ * The setModel call is intentionally fire-and-forget: provider readiness
+ * checks run later in startup so --model does not block session creation.
+ */
+export function applyModelOverride(session, modelRegistry, modelFlag) {
+    if (!modelFlag)
+        return;
+    const available = modelRegistry.getAvailable();
+    const match = available.find((m) => m.id === modelFlag) ||
+        available.find((m) => `${m.provider}/${m.id}` === modelFlag);
+    if (match) {
+        void session.setModel(match);
+    }
+    else {
+        process.stderr.write(`[gsd] Warning: Model "${modelFlag}" not found. Using configured default.\n`);
+    }
+}

package/dist/cli.js

@@ -14,6 +14,7 @@ import { printHelp, printSubcommandHelp } from './help-text.js';
 import { applySecurityOverrides } from './security-overrides.js';
 import { validateConfiguredModel } from './startup-model-validation.js';
 import { migrateAnthropicDefaultToClaudeCode } from './provider-migrations.js';
+import { applyModelOverride } from './cli-model-override.js';
 import { buildHeadlessAutoArgs, parseCliArgs, runWebCliBranch, migrateLegacyFlatSessions, } from './cli-web-branch.js';
 import { stopWebMode } from './web-mode.js';
 import { getProjectSessionsDir } from './project-sessions.js';
@@ -122,24 +123,6 @@ async function reapplyValidatedModelOnFallback(session, modelRegistry, settingsM
         // Provider not ready — leave session on its current model
     }
 }
-/**
- * Apply the --model CLI flag override to the active session.
- * Searches available models by exact id or provider/id pattern and warns
- * on stderr when the requested model is not found in the registry.
- */
-function applyModelOverride(session, modelRegistry, modelFlag) {
-    if (!modelFlag)
-        return;
-    const available = modelRegistry.getAvailable();
-    const match = available.find((m) => m.id === modelFlag) ||
-        available.find((m) => `${m.provider}/${m.id}` === modelFlag);
-    if (match) {
-        void session.setModel(match);
-    }
-    else {
-        process.stderr.write(`[gsd] Warning: Model "${modelFlag}" not found. Using configured default.\n`);
-    }
-}
 const cliFlags = parseCliArgs(process.argv);
 const isPrintMode = cliFlags.print || cliFlags.mode !== undefined;
 // `gsd [subcommand] --help` / `-h` — print help before any subcommand runs.

package/dist/headless-events.js

@@ -11,6 +11,7 @@
  * so wording stays in lockstep with detection.
  */
 import { isBlockedNoticeMessage, isManualResolutionNotice, isPauseNotice, isTerminalNotice, } from './resources/extensions/gsd/stop-notice.js';
+import { canonicalToolName } from './resources/extensions/gsd/engine-hook-contract.js';
 // ---------------------------------------------------------------------------
 // Exit Code Constants
 // ---------------------------------------------------------------------------
@@ -76,12 +77,13 @@ export const IDLE_TIMEOUT_MS = 15_000;
 // longer idle timeout to avoid killing the session prematurely (#808).
 export const NEW_MILESTONE_IDLE_TIMEOUT_MS = 120_000;
 const INTERACTIVE_HEADLESS_TOOLS = new Set(['ask_user_questions', 'secure_env_collect']);
+// Delegates to the shared normalizer seam (engine-hook-contract.ts) instead of
+// a hand-rolled parser. Behavior differs from the old parser only on malformed
+// MCP names: `mcp____tool` (empty server) and `mcp__server__` (empty tool) are
+// now returned unchanged rather than partially stripped — neither can match a
+// real tool name, so detection behavior is unaffected.
 export function canonicalHeadlessToolName(toolName) {
-    const name = String(toolName ?? '');
-    if (!name.startsWith('mcp__'))
-        return name;
-    const toolSeparator = name.indexOf('__', 'mcp__'.length);
-    return toolSeparator >= 0 ? name.slice(toolSeparator + 2) : name;
+    return canonicalToolName(String(toolName ?? ''));
 }
 function getCommandBlockContent(event) {
     if (event.type !== 'message_start' && event.type !== 'message_end')

package/dist/loader.js

@@ -31,7 +31,7 @@ if (firstArg === '--help' || firstArg === '-h') {
 // package.json (already parsed above) and verifies git is available.
 // ---------------------------------------------------------------------------
 {
-    const { MIN_NODE_MAJOR, checkNodeVersion, requireGit } = await import('./runtime-checks.js');
+    const { MIN_NODE_MAJOR, checkNodeVersion, gitAvailableOnPath } = await import('./runtime-checks.js');
     const red = '\x1b[31m';
     const bold = '\x1b[1m';
     const dim = '\x1b[2m';
@@ -48,8 +48,10 @@ if (firstArg === '--help' || firstArg === '-h') {
         process.exit(1);
     }
     // -- git --
-    const { execFileSync } = await import('child_process');
-    const gitOk = requireGit((cmd, args) => execFileSync(cmd, args, { stdio: 'ignore' }));
+    // Presence-check git via a $PATH scan rather than spawning `git --version`:
+    // the subprocess cost ~15ms on every cold start (~5% of startup CPU) just to
+    // confirm git is installed.
+    const gitOk = gitAvailableOnPath();
     if (!gitOk) {
         process.stderr.write(`\n${red}${bold}Error:${reset} GSD requires git but it was not found on PATH.\n\n` +
             `${dim}Install git:${reset}\n` +
@@ -230,6 +232,6 @@ if (missingPackages.length > 0) {
 }
 // Register GSD agent packages for extension imports before CLI loads.
 const { registerAgentBundles } = await import('./register-agent-bundles.js');
-registerAgentBundles();
+await registerAgentBundles();
 // Dynamic import defers ESM evaluation — config.js will see PI_PACKAGE_DIR above
 await import('./cli.js');

package/dist/mcp-server.js

@@ -29,6 +29,7 @@ function isPlainObject(value) {
 // built via a template string so TypeScript's NodeNext resolver treats them as
 // `any` and skips static checking.
 const MCP_PKG = '@modelcontextprotocol/sdk';
+import { sanitizeSchemaForMoonshot } from '@gsd/pi-ai';
 export function mcpSdkSpecifier(subpath) {
     return `${MCP_PKG}/${subpath}.js`;
 }
@@ -65,7 +66,7 @@ export async function startMcpServer(options) {
         tools: tools.map((t) => ({
             name: t.name,
             description: t.description,
-            inputSchema: t.parameters,
+            inputSchema: sanitizeSchemaForMoonshot(t.parameters),
         })),
     }));
     // tools/call — execute the requested tool and return content blocks.

package/dist/register-agent-bundles.d.ts

@@ -1,2 +1,11 @@
-/** Register GSD agent packages for extension virtual module resolution. */
-export declare function registerAgentBundles(): void;
+/**
+ * Register GSD agent packages for extension virtual module resolution.
+ *
+ * The eager `@gsd/agent-core` and `@gsd/agent-modes` barrels are only consumed
+ * by the Bun-binary extension loader (which has no filesystem and resolves
+ * bundled packages through `virtualModules`). On the Node/dev path the loader
+ * resolves those same specifiers by file path via `getAliases()`, so importing
+ * the full barrels at startup there is ~400ms of wasted module loading.
+ * Load them only when actually needed (Bun), keeping Node startup lean.
+ */
+export declare function registerAgentBundles(): Promise<void>;

package/dist/register-agent-bundles.js

@@ -1,12 +1,26 @@
-import * as agentCore from '@gsd/agent-core';
-import * as agentModes from '@gsd/agent-modes';
+import { isBunBinary } from '@gsd/pi-coding-agent/config.js';
 import { registerExtensionBundledModules } from '@gsd/pi-coding-agent/core/extensions/loader.js';
 let registered = false;
-/** Register GSD agent packages for extension virtual module resolution. */
-export function registerAgentBundles() {
+/**
+ * Register GSD agent packages for extension virtual module resolution.
+ *
+ * The eager `@gsd/agent-core` and `@gsd/agent-modes` barrels are only consumed
+ * by the Bun-binary extension loader (which has no filesystem and resolves
+ * bundled packages through `virtualModules`). On the Node/dev path the loader
+ * resolves those same specifiers by file path via `getAliases()`, so importing
+ * the full barrels at startup there is ~400ms of wasted module loading.
+ * Load them only when actually needed (Bun), keeping Node startup lean.
+ */
+export async function registerAgentBundles() {
     if (registered)
         return;
     registered = true;
+    if (!isBunBinary)
+        return;
+    const [agentCore, agentModes] = await Promise.all([
+        import('@gsd/agent-core'),
+        import('@gsd/agent-modes'),
+    ]);
     registerExtensionBundledModules({
         '@gsd/agent-core': agentCore,
         '@gsd/agent-modes': agentModes,

package/dist/resource-loader.d.ts

@@ -22,6 +22,9 @@ export declare function readManagedResourceVersion(agentDir: string): string | n
  * directory (e.g. pre-install verification).
  */
 export declare function computeResourceFingerprint(rootDir?: string): string;
+export declare function setGsdBrowserPackageSkillPathForTests(skillPath: string | null | undefined): void;
+export declare function collectGsdBrowserPackageSkillReferences(content: string): string[];
+export declare function hasStaleGsdBrowserPackageSkill(skillsDir: string): boolean;
 export declare function getNewerManagedResourceVersion(agentDir: string, currentVersion: string): string | null;
 /**
  * Syncs a single bundled resource directory into the agent directory.
@@ -49,18 +52,20 @@ export declare function reconcileMergedNodeModules(agentNodeModules: string, hoi
 /** Build a cache fingerprint from packageRoot + sorted entry names of both directories */
 export declare function mergedFingerprint(hoisted: string, internal: string): string;
 /**
- * Syncs all bundled resources to agentDir (~/.gsd/agent/) on every launch.
+ * Initializes managed resources under agentDir (~/.gsd/agent/).
  *
  * - extensions/ → ~/.gsd/agent/extensions/   (overwrite when version changes)
  * - shared/     → ~/.gsd/agent/shared/       (overwrite when version changes)
  * - agents/     → ~/.gsd/agent/agents/        (overwrite when version changes)
  * - skills/     → ~/.gsd/agent/skills/        (overwrite when version changes)
+ * - gsd-browser skill → ~/.gsd/agent/skills/gsd-browser/ from @opengsd/gsd-browser
  * - GSD-WORKFLOW.md → ~/.gsd/agent/GSD-WORKFLOW.md (fallback for env var miss)
  *
- * Skips the copy when the managed-resources.json version matches the current
- * GSD version, avoiding ~128ms of synchronous cpSync on every startup.
- * After `npm update -g @glittercowboy/gsd`, versions will differ and the
- * copy runs once to land the new resources.
+ * Skips the full copy only when the managed-resources.json version, content
+ * fingerprint, and package-owned gsd-browser skill all match the current
+ * install, avoiding ~128ms of synchronous cpSync on steady-state startup.
+ * After `npm update -g @opengsd/gsd-pi`, versions will differ and the copy
+ * runs once to land the new resources.
  *
  * Inspectable: `ls ~/.gsd/agent/extensions/`
  */

package/dist/resource-loader.js

@@ -1,6 +1,7 @@
 import { createHash } from 'node:crypto';
 import { homedir } from 'node:os';
 import { chmodSync, copyFileSync, cpSync, existsSync, lstatSync, mkdirSync, readFileSync, readlinkSync, readdirSync, rmSync, symlinkSync, unlinkSync, writeFileSync } from 'node:fs';
+import { createRequire } from 'node:module';
 import { basename, dirname, join, relative, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { compareSemver } from './update-check.js';
@@ -24,6 +25,10 @@ const resourcesDir = resolveBundledResourcesDirFromPackageRoot(packageRoot);
 const bundledExtensionsDir = join(resourcesDir, 'extensions');
 const resourceVersionManifestName = 'managed-resources.json';
 const resourceFingerprintFileName = '.managed-resources-content-hash';
+const gsdBrowserSkillName = 'gsd-browser';
+const requireFromResourceLoader = createRequire(import.meta.url);
+const gsdBrowserSkillReferenceDirs = ['docs', 'scripts', 'gsd-browser-skill'];
+let gsdBrowserPackageSkillPathForTests;
 export { discoverExtensionEntryPaths } from './extension-discovery.js';
 export function getExtensionKey(entryPath, extensionsDir) {
     const relPath = relative(extensionsDir, entryPath);
@@ -153,6 +158,111 @@ function getCurrentResourceFingerprint() {
     }
     return computeResourceFingerprint();
 }
+function resolveGsdBrowserPackageSkillPath() {
+    if (gsdBrowserPackageSkillPathForTests !== undefined) {
+        return gsdBrowserPackageSkillPathForTests;
+    }
+    try {
+        return requireFromResourceLoader.resolve('@opengsd/gsd-browser/SKILL.md');
+    }
+    catch {
+        return null;
+    }
+}
+export function setGsdBrowserPackageSkillPathForTests(skillPath) {
+    gsdBrowserPackageSkillPathForTests = skillPath;
+}
+export function collectGsdBrowserPackageSkillReferences(content) {
+    const refs = new Set();
+    const referencePattern = /`((?:\.\/)?(?:docs|scripts|gsd-browser-skill)\/[^`\s]+)`/g;
+    for (const match of content.matchAll(referencePattern)) {
+        const ref = normalizeGsdBrowserPackageSkillReference(match[1]);
+        if (ref)
+            refs.add(ref);
+    }
+    return [...refs].sort();
+}
+function normalizeGsdBrowserPackageSkillReference(ref) {
+    if (!ref)
+        return null;
+    const normalized = ref
+        .replace(/^\.\//, '')
+        .replace(/[),.;:]+$/, '');
+    if (normalized.includes('..') || normalized.startsWith('/'))
+        return null;
+    if (!gsdBrowserSkillReferenceDirs.some(dir => normalized === dir || normalized.startsWith(`${dir}/`))) {
+        return null;
+    }
+    return normalized;
+}
+function readGsdBrowserPackageSkillBundle(sourceSkillPath) {
+    const skillContent = readFileSync(sourceSkillPath);
+    const files = new Map([['SKILL.md', skillContent]]);
+    const supportRefs = collectGsdBrowserPackageSkillReferences(skillContent.toString('utf-8'));
+    const sourceDir = dirname(sourceSkillPath);
+    for (const relPath of supportRefs) {
+        const sourcePath = join(sourceDir, relPath);
+        if (existsSync(sourcePath)) {
+            files.set(relPath, readFileSync(sourcePath));
+        }
+    }
+    return files;
+}
+export function hasStaleGsdBrowserPackageSkill(skillsDir) {
+    const targetDir = join(skillsDir, gsdBrowserSkillName);
+    const sourceSkillPath = resolveGsdBrowserPackageSkillPath();
+    // Package unresolvable. syncGsdBrowserPackageSkill is a no-op in this case
+    // (it preserves any existing managed skill), so reporting "stale" here
+    // would drive a full resource resync on every launch that the sync cannot
+    // actually satisfy. Keep the existing managed skill in place until the
+    // package becomes resolvable again or the manifest fingerprint changes.
+    if (!sourceSkillPath)
+        return false;
+    try {
+        const sourceDir = dirname(sourceSkillPath);
+        const skillContent = readFileSync(sourceSkillPath, 'utf-8');
+        for (const [relPath, content] of readGsdBrowserPackageSkillBundle(sourceSkillPath)) {
+            const targetPath = join(targetDir, relPath);
+            if (!existsSync(targetPath) || !readFileSync(targetPath).equals(content)) {
+                return true;
+            }
+        }
+        // Only flag SKILL.md references when sync can actually correct them.
+        // The bundle loop above already covers "source has it, target missing".
+        // A reference the package itself does not ship (source missing) is only
+        // worth a resync if the target still has a stale copy that sync should
+        // clean up; missing on both sides is the steady state when upstream
+        // omits files referenced from SKILL.md and is not actionable here.
+        for (const relPath of collectGsdBrowserPackageSkillReferences(skillContent)) {
+            const sourcePath = join(sourceDir, relPath);
+            const targetPath = join(targetDir, relPath);
+            if (!existsSync(sourcePath) && existsSync(targetPath)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    catch {
+        return true;
+    }
+}
+function syncGsdBrowserPackageSkill(skillsDir) {
+    const targetDir = join(skillsDir, gsdBrowserSkillName);
+    const sourceSkillPath = resolveGsdBrowserPackageSkillPath();
+    if (!sourceSkillPath)
+        return;
+    makeTreeWritable(targetDir);
+    rmSync(targetDir, { recursive: true, force: true });
+    for (const [relPath, content] of readGsdBrowserPackageSkillBundle(sourceSkillPath)) {
+        const targetPath = join(targetDir, relPath);
+        mkdirSync(dirname(targetPath), { recursive: true });
+        writeFileSync(targetPath, content);
+        if (relPath.startsWith('scripts/') && relPath.endsWith('.sh')) {
+            chmodSync(targetPath, 0o755);
+        }
+    }
+    makeTreeWritable(targetDir);
+}
 function collectFileEntries(dir, root, out) {
     if (!existsSync(dir))
         return;
@@ -557,18 +667,20 @@ function pruneRemovedBundledExtensions(manifest, agentDir) {
     removeFileIfStale('env-utils.js');
 }
 /**
- * Syncs all bundled resources to agentDir (~/.gsd/agent/) on every launch.
+ * Initializes managed resources under agentDir (~/.gsd/agent/).
  *
  * - extensions/ → ~/.gsd/agent/extensions/   (overwrite when version changes)
  * - shared/     → ~/.gsd/agent/shared/       (overwrite when version changes)
  * - agents/     → ~/.gsd/agent/agents/        (overwrite when version changes)
  * - skills/     → ~/.gsd/agent/skills/        (overwrite when version changes)
+ * - gsd-browser skill → ~/.gsd/agent/skills/gsd-browser/ from @opengsd/gsd-browser
  * - GSD-WORKFLOW.md → ~/.gsd/agent/GSD-WORKFLOW.md (fallback for env var miss)
  *
- * Skips the copy when the managed-resources.json version matches the current
- * GSD version, avoiding ~128ms of synchronous cpSync on every startup.
- * After `npm update -g @glittercowboy/gsd`, versions will differ and the
- * copy runs once to land the new resources.
+ * Skips the full copy only when the managed-resources.json version, content
+ * fingerprint, and package-owned gsd-browser skill all match the current
+ * install, avoiding ~128ms of synchronous cpSync on steady-state startup.
+ * After `npm update -g @opengsd/gsd-pi`, versions will differ and the copy
+ * runs once to land the new resources.
  *
  * Inspectable: `ls ~/.gsd/agent/extensions/`
  */
@@ -603,11 +715,13 @@ export function initResources(agentDir, skillsDir = join(agentDir, 'skills')) {
         const hasStaleExtensionFiles = hasStaleCompiledExtensionSiblings(extensionsDir, bundledExtensionsDir);
         const hasMissingSharedFiles = hasMissingBundledResourceFiles(join(agentDir, 'shared'), join(resourcesDir, 'shared'));
         const hasMissingSkillFiles = hasMissingBundledResourceFiles(skillsDir, join(resourcesDir, 'skills'));
+        const hasStaleGsdBrowserSkill = hasStaleGsdBrowserPackageSkill(skillsDir);
         if (manifest.contentHash &&
             manifest.contentHash === currentHash &&
             !hasStaleExtensionFiles &&
             !hasMissingSharedFiles &&
-            !hasMissingSkillFiles) {
+            !hasMissingSkillFiles &&
+            !hasStaleGsdBrowserSkill) {
             return;
         }
     }
@@ -616,6 +730,7 @@ export function initResources(agentDir, skillsDir = join(agentDir, 'skills')) {
     syncResourceDir(join(resourcesDir, 'shared'), join(agentDir, 'shared'));
     syncResourceDir(join(resourcesDir, 'agents'), join(agentDir, 'agents'));
     syncResourceDir(join(resourcesDir, 'skills'), skillsDir);
+    syncGsdBrowserPackageSkill(skillsDir);
     // Sync GSD-WORKFLOW.md to agentDir as a fallback for when GSD_WORKFLOW_PATH
     // env var is not set (e.g. fork/dev builds, alternative entry points).
     const workflowSrc = join(resourcesDir, 'GSD-WORKFLOW.md');

package/dist/resources/.managed-resources-content-hash

@@ -1 +1 @@
-f9480adda54decba
+c1596479dbbcc638

package/dist/resources/GSD-WORKFLOW.md

@@ -470,13 +470,13 @@ key_decisions: []
 
 **After a slice completes:**
 1. Write slice `S##-SUMMARY.md` (compresses all task summaries).
-2. Write slice `S##-UAT.md` — a non-blocking human test script derived from the slice's must-haves and demo sentence. The agent does NOT wait for UAT results.
+2. Write slice `S##-UAT.md` — a human test script derived from the slice's must-haves and demo sentence.
 3. Mark the slice checkbox in `M###-ROADMAP.md` as `[x]`.
 4. Update `STATE.md` with new position.
 5. Update milestone `M###-SUMMARY.md` with the completed slice's contributions.
-6. Continue to next slice immediately. The user tests the UAT whenever convenient.
-7. If the user reports UAT failures later, create fix tasks in the current or a new slice.
-8. If all slices done → milestone complete.
+6. Continue to next slice immediately. UAT can run after slice completion; automatic milestone closure requires each slice assessment to record `PASS`.
+7. If UAT is missing or non-PASS at milestone closeout, run `/gsd dispatch uat`, request a slice-specific UAT rerun when needed, or create remediation work with `/gsd dispatch reassess`.
+8. If all slices are done and UAT plus milestone validation pass → milestone complete.
 
 ---
 
@@ -605,6 +605,7 @@ Commit types: `feat`, `fix`, `test`, `refactor`, `docs`, `perf`, `chore`
 |---------|-----|
 | Bad task | Revert the task commit on the active branch |
 | Bad milestone squash | Revert the squash commit on the integration branch |
+| UAT missing or non-PASS at closeout | Run `/gsd dispatch uat`, request a slice-specific UAT rerun when needed, or create remediation work with `/gsd dispatch reassess` |
 | UAT failure after merge | Create follow-up fix tasks in the current or next milestone |
 
 ---

package/dist/resources/extensions/ask-user-questions.js

@@ -187,10 +187,11 @@ function formatForLLM(result) {
     }
     return JSON.stringify({ answers });
 }
-async function playQuestionBell() {
+/** @internal Exported for testing only. */
+export async function playQuestionBell(preferences, stream) {
     try {
         const { playNotificationBell } = await import("./gsd/notifications.js");
-        playNotificationBell("question");
+        playNotificationBell("question", preferences, stream);
     }
     catch {
         // Best-effort: question rendering must never depend on alert delivery.

package/dist/resources/extensions/async-jobs/async-bash-tool.js

@@ -5,9 +5,9 @@
  * immediately. The LLM can continue working and check results later
  * with await_job.
  */
-import { getShellConfig, sanitizeCommand, DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, } from "@gsd/pi-coding-agent";
+import { getShellConfig, sanitizeCommand, killProcessTree, SIGKILL_GRACE_MS, HARD_DEADLINE_MS, DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, } from "@gsd/pi-coding-agent";
 import { Type } from "@sinclair/typebox";
-import { spawn, spawnSync } from "node:child_process";
+import { spawn } from "node:child_process";
 import { createWriteStream } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
@@ -22,37 +22,6 @@ function getTempFilePath() {
     const id = randomBytes(8).toString("hex");
     return join(tmpdir(), `pi-async-bash-${id}.log`);
 }
-/**
- * Kill a process and its children (cross-platform).
- * Uses process group kill on Unix; taskkill /F /T on Windows.
- */
-function killTree(pid) {
-    if (process.platform === "win32") {
-        try {
-            spawnSync("taskkill", ["/F", "/T", "/PID", String(pid)], {
-                timeout: 5_000,
-                stdio: "ignore",
-            });
-        }
-        catch {
-            try {
-                process.kill(pid, "SIGTERM");
-            }
-            catch { /* already exited */ }
-        }
-    }
-    else {
-        try {
-            process.kill(-pid, "SIGTERM");
-        }
-        catch {
-            try {
-                process.kill(pid, "SIGTERM");
-            }
-            catch { /* already exited */ }
-        }
-    }
-}
 export function createAsyncBashTool(getManager, getCwd) {
     return {
         name: "async_bash",
@@ -62,7 +31,7 @@ export function createAsyncBashTool(getManager, getCwd) {
             `Output is truncated to the last ${DEFAULT_MAX_LINES} lines or ${DEFAULT_MAX_BYTES / 1024}KB.`,
         promptSnippet: "Run a bash command in the background, returning a job ID immediately.",
         promptGuidelines: [
-            "Use async_bash for commands that take more than a few seconds (builds, tests, installs, large git operations).",
+            "Use async_bash for long-running builds, tests, installs, or operations that should run in the background so you can continue other work (the job ID lets you await_job later). Sync bash is uncapped — use async_bash when you want non-blocking behavior, not because of a timeout concern.",
             "After starting async jobs, continue with other work and use await_job when you need the results.",
             "await_job has a configurable timeout (default 120s) to prevent indefinite blocking — if it times out, jobs keep running and you can check again later.",
             "For long-running processes (SSH, deploys, training) that may take minutes+, prefer async_bash with periodic await_job polling over a single long await.",
@@ -122,36 +91,25 @@ function executeBashInBackground(command, cwd, signal, timeout) {
         });
         let timedOut = false;
         let timeoutHandle;
-        let sigkillHandle;
         let hardDeadlineHandle;
-        /** Grace period (ms) between SIGTERM and SIGKILL. */
-        const SIGKILL_GRACE_MS = 5_000;
-        /** Hard deadline (ms) after SIGKILL to force-resolve the promise. */
-        const HARD_DEADLINE_MS = 3_000;
         if (timeout !== undefined && timeout > 0) {
             timeoutHandle = setTimeout(() => {
                 timedOut = true;
+                // killProcessTree owns the SIGTERM -> grace -> SIGKILL escalation, so a
+                // SIGTERM-immune child is actually force-killed rather than left running.
                 if (child.pid)
-                    killTree(child.pid);
-                // If the process ignores SIGTERM, escalate to SIGKILL
-                sigkillHandle = setTimeout(() => {
-                    if (child.pid) {
-                        // killTree already uses taskkill /F /T on Windows
-                        killTree(child.pid);
-                    }
-                    // Hard deadline: if even SIGKILL doesn't trigger 'close',
-                    // force-resolve so the job doesn't hang forever (#2186).
-                    hardDeadlineHandle = setTimeout(() => {
-                        const output = Buffer.concat(chunks).toString("utf-8");
-                        safeResolve(output
-                            ? `${output}\n\nCommand timed out after ${timeout} seconds (force-killed)`
-                            : `Command timed out after ${timeout} seconds (force-killed)`);
-                    }, HARD_DEADLINE_MS);
-                    if (typeof hardDeadlineHandle === "object" && "unref" in hardDeadlineHandle)
-                        hardDeadlineHandle.unref();
-                }, SIGKILL_GRACE_MS);
-                if (typeof sigkillHandle === "object" && "unref" in sigkillHandle)
-                    sigkillHandle.unref();
+                    killProcessTree(child.pid);
+                // Hard deadline: a D-state (uninterruptible-I/O) child never emits 'close'
+                // even after SIGKILL, so force-resolve the promise rather than hang (#2186).
+                // Fires after the full grace window so SIGKILL has had its chance first.
+                hardDeadlineHandle = setTimeout(() => {
+                    const output = Buffer.concat(chunks).toString("utf-8");
+                    safeResolve(output
+                        ? `${output}\n\nCommand timed out after ${timeout} seconds (force-killed)`
+                        : `Command timed out after ${timeout} seconds (force-killed)`);
+                }, SIGKILL_GRACE_MS + HARD_DEADLINE_MS);
+                if (typeof hardDeadlineHandle === "object" && "unref" in hardDeadlineHandle)
+                    hardDeadlineHandle.unref();
             }, timeout * 1000);
         }
         const chunks = [];
@@ -182,7 +140,19 @@ function executeBashInBackground(command, cwd, signal, timeout) {
             child.stderr.on("data", onData);
         const onAbort = () => {
             if (child.pid)
-                killTree(child.pid);
+                killProcessTree(child.pid);
+            // Arm the same hard-deadline force-resolve the timeout path uses, so a
+            // cancelled D-state child (never emits 'close' even after SIGKILL) can't
+            // hang the job promise forever. safeResolve is idempotent, so the real
+            // 'close' still wins if the child does exit.
+            if (!hardDeadlineHandle) {
+                hardDeadlineHandle = setTimeout(() => {
+                    const output = Buffer.concat(chunks).toString("utf-8");
+                    safeResolve(output ? `${output}\n\nCommand aborted (force-killed)` : "Command aborted (force-killed)");
+                }, SIGKILL_GRACE_MS + HARD_DEADLINE_MS);
+                if (typeof hardDeadlineHandle === "object" && "unref" in hardDeadlineHandle)
+                    hardDeadlineHandle.unref();
+            }
         };
         if (signal.aborted) {
             onAbort();
@@ -193,8 +163,6 @@ function executeBashInBackground(command, cwd, signal, timeout) {
         child.on("error", (err) => {
             if (timeoutHandle)
                 clearTimeout(timeoutHandle);
-            if (sigkillHandle)
-                clearTimeout(sigkillHandle);
             if (hardDeadlineHandle)
                 clearTimeout(hardDeadlineHandle);
             signal.removeEventListener("abort", onAbort);
@@ -203,8 +171,6 @@ function executeBashInBackground(command, cwd, signal, timeout) {
         child.on("close", (code) => {
             if (timeoutHandle)
                 clearTimeout(timeoutHandle);
-            if (sigkillHandle)
-                clearTimeout(sigkillHandle);
             if (hardDeadlineHandle)
                 clearTimeout(hardDeadlineHandle);
             signal.removeEventListener("abort", onAbort);