@acpus/runtime 0.8.0 → 0.9.0-alpha.0

package/dist/hooks/loader.js

@@ -1,110 +1,94 @@
 import { createHash } from "node:crypto";
-import { existsSync, readFileSync } from "node:fs";
+import { readFile } from "node:fs/promises";
 import { homedir } from "node:os";
-import { join, resolve } from "node:path";
-import { parse as parseYaml } from "yaml";
-import { EVENT_NAMES, INJECTOR_NAMES, validateHookConfigShape } from "@acpus/core";
-/** Absolute path to the global hooks file (~/.acpus/hooks.yaml). */
-export function globalHookConfigPath() {
-    return join(homedir(), ".acpus", "hooks.yaml");
+import { join } from "node:path";
+import { err, ok } from "neverthrow";
+import { hookEvents, validateHooksFile } from "./config.js";
+export function formatHookLoadError(error) {
+    if (error.type === "invalid-config") {
+        return `Invalid hooks config at ${error.path}: ${error.errors.map(item => `${item.path}: ${item.message}`).join("; ")}`;
+    }
+    return `Invalid hooks config at ${error.path}: ${error.message}`;
+}
+export function projectHooksPath(workspaceDir) {
+    return join(workspaceDir, ".acpus", "hooks.json");
+}
+export function globalHooksPath(homeDir = homedir()) {
+    return join(homeDir, ".acpus", "hooks.json");
 }
-/** Absolute path to the project hooks file (<workspace>/.acpus/hooks.yaml). */
-export function projectHookConfigPath(workspace) {
-    return join(resolve(workspace), ".acpus", "hooks.yaml");
+export async function loadHooksConfig(workspaceDir, options = {}) {
+    const scoped = await loadHooksConfigScopes(workspaceDir, options);
+    return scoped.map(scopes => scopes.flatMap(scope => scope.hooks));
 }
-/** True when the config declares no injectors and no events. */
-export function isEmptyHookConfig(config) {
-    const injectorCount = INJECTOR_NAMES.reduce((n, k) => n + (config.injectors?.[k]?.length ?? 0), 0);
-    const eventCount = EVENT_NAMES.reduce((n, k) => n + (config.events?.[k]?.length ?? 0), 0);
-    return injectorCount === 0 && eventCount === 0;
+export async function loadHooksConfigScopes(workspaceDir, options = {}) {
+    const project = await loadHooksConfigScope("project", projectHooksPath(workspaceDir));
+    if (project.isErr())
+        return err(project.error);
+    const global = await loadHooksConfigScope("global", globalHooksPath(options.homeDir));
+    if (global.isErr())
+        return err(global.error);
+    return ok([project.value, global.value]);
 }
-/**
- * Loads and merges hook configuration from the global and project layers.
- *
- * A missing layer is treated as empty (no error). Merge concatenates handler
- * arrays per key with global handlers ordered before project handlers.
- */
-export class HookConfigLoader {
-    workspace;
-    constructor(workspace = process.cwd()) {
-        this.workspace = workspace;
+export async function loadHooksConfigScope(source, path) {
+    return loadScope(source, path);
+}
+export function flattenHooksFile(file, source, sourcePath) {
+    const hooks = [];
+    for (const event of hookEvents) {
+        const entries = file[event] ?? [];
+        for (const [definitionIndex, entry] of entries.entries()) {
+            const definitionHash = hashDefinition(source, sourcePath, event, definitionIndex, entry);
+            hooks.push({
+                ...entry,
+                event,
+                source,
+                sourcePath,
+                definitionIndex,
+                definitionHash,
+                effectiveId: entry.id ?? `${source}:${event}:${definitionIndex}:${definitionHash.slice(0, 12)}`,
+            });
+        }
     }
-    /** Read a single layer; absent or empty files yield an empty config. */
-    loadLayer(path) {
-        if (!existsSync(path))
-            return { path, config: {}, exists: false };
-        const raw = readFileSync(path, "utf8").trim();
-        if (raw.length === 0)
-            return { path, config: {}, exists: true };
-        const parsed = parseYaml(raw);
-        validateHookConfig(parsed, path);
-        return { path, config: parsed, exists: true };
+    return hooks;
+}
+async function loadScope(source, path) {
+    let bytes;
+    try {
+        bytes = await readFile(path, "utf8");
     }
-    /** Load and merge both layers, returning the merged config plus source paths. */
-    load() {
-        const globalLayer = this.loadLayer(globalHookConfigPath());
-        const projectLayer = this.loadLayer(projectHookConfigPath(this.workspace));
-        const merged = mergeHookConfigs(globalLayer.config, projectLayer.config);
-        return { merged, globalLayer, projectLayer };
+    catch (error) {
+        if (isNotFound(error))
+            return ok({ source, path, hooks: [] });
+        return err({ type: "read-failed", source, path, message: error instanceof Error ? error.message : String(error) });
     }
-    /**
-     * Freeze the merged configuration into a snapshot. Returns `undefined` when
-     * both layers are absent/empty so the runtime can skip all hook machinery.
-     */
-    freeze() {
-        const { merged, globalLayer, projectLayer } = this.load();
-        if (isEmptyHookConfig(merged))
-            return undefined;
-        return {
-            hash: hashHookConfig(merged),
-            globalConfigPath: globalLayer.exists ? globalLayer.path : undefined,
-            projectConfigPath: projectLayer.exists ? projectLayer.path : undefined,
-            mergedConfig: merged
-        };
+    let parsed;
+    try {
+        parsed = JSON.parse(bytes);
     }
-}
-/** Validate the minimal command-only hook config shape used by the runtime. */
-function validateHookConfig(config, path) {
-    const [issue] = validateHookConfigShape(config);
-    if (!issue)
-        return;
-    throw new Error(`${path}: ${issue.path ? `${issue.path} ` : ""}${issue.message}`);
-}
-/** Concatenate handler arrays per key; global handlers precede project handlers. */
-export function mergeHookConfigs(global, project) {
-    const injectors = {};
-    for (const key of INJECTOR_NAMES) {
-        const combined = [...(global.injectors?.[key] ?? []), ...(project.injectors?.[key] ?? [])];
-        if (combined.length > 0)
-            injectors[key] = combined;
-    }
-    const events = {};
-    for (const key of EVENT_NAMES) {
-        const combined = [...(global.events?.[key] ?? []), ...(project.events?.[key] ?? [])];
-        if (combined.length > 0)
-            events[key] = combined;
+    catch (error) {
+        return err({ type: "invalid-json", source, path, message: error instanceof Error ? error.message : String(error) });
     }
-    const result = {};
-    if (Object.keys(injectors).length > 0)
-        result.injectors = injectors;
-    if (Object.keys(events).length > 0)
-        result.events = events;
-    return result;
+    const validated = validateHooksFile(parsed);
+    if (validated.isErr())
+        return err({ type: "invalid-config", source, path, errors: validated.error });
+    return ok({ source, path, hooks: flattenHooksFile(validated.value, source, path) });
+}
+function hashDefinition(source, sourcePath, event, definitionIndex, config) {
+    return createHash("sha256")
+        .update(stableJson({ source, sourcePath, event, definitionIndex, config }))
+        .digest("hex");
 }
-/** Stable "sha256:..." hash over the canonicalized merged configuration. */
-export function hashHookConfig(config) {
-    return `sha256:${createHash("sha256").update(canonicalJson(config)).digest("hex")}`;
+function stableJson(value) {
+    return JSON.stringify(sortValue(value));
 }
-/** Deterministic JSON with object keys sorted recursively. */
-function canonicalJson(value) {
+function sortValue(value) {
     if (Array.isArray(value))
-        return `[${value.map(canonicalJson).join(",")}]`;
-    if (value && typeof value === "object") {
-        const entries = Object.entries(value)
-            .filter(([, v]) => v !== undefined)
-            .sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0));
-        return `{${entries.map(([k, v]) => `${JSON.stringify(k)}:${canonicalJson(v)}`).join(",")}}`;
-    }
-    return JSON.stringify(value ?? null);
+        return value.map(sortValue);
+    if (!value || typeof value !== "object")
+        return value;
+    return Object.fromEntries(Object.entries(value).sort(([left], [right]) => left.localeCompare(right)).map(([key, item]) => [key, sortValue(item)]));
+}
+function isNotFound(error) {
+    return !!error && typeof error === "object" && "code" in error && error.code === "ENOENT";
 }
 //# sourceMappingURL=loader.js.map

package/dist/hooks/loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/hooks/loader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/hooks/loader.ts"],"names":[],"mappings":"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"}

package/dist/hooks/runner.d.ts

@@ -1,42 +1,15 @@
-import { type EventName, type HookConfig, type InjectorHookHandler, type HookPayload, type InjectorName, type InjectorResult } from "@acpus/core";
-/**
- * Thrown when an injector handler fails under the `on_failure: "fail"` policy.
- * The interpreter maps this to a node failure with `failureKind: "hook_failure"`.
- */
-export declare class HookFailureError extends Error {
-    constructor(message: string);
-}
-/**
- * Executes hook command handlers. Injectors run sequentially and may fail the
- * node; events never affect outcome. The runner holds the frozen, merged
- * configuration for a single Run.
- */
-export declare class HookRunner {
-    private readonly config;
-    constructor(config: HookConfig);
-    hasInjector(name: InjectorName): boolean;
-    hasEvent(name: EventName): boolean;
-    injectorHandlers(name: InjectorName): InjectorHookHandler[];
-    /**
-     * Run all handlers for an injector sequentially, merging their results.
-     * `prependPrompt` is concatenated in order for beforeAgentExec; `env` maps
-     * merge with later handlers overriding earlier ones for beforeProgramExec.
-     * A failing handler under `fail` throws
-     * HookFailureError; under `skip` it logs a warning and injects nothing.
-     *
-     * `onHandler` is called once per handler with the resolved per-handler result
-     * (for journaling).
-     */
-    runInjector(name: InjectorName, payload: HookPayload, onHandler?: (handlerIndex: number, result: InjectorResult, durationMs: number) => void): Promise<InjectorResult>;
-    /**
-     * Fire all handlers for an event. Event handlers are async by default;
-     * `sync: true` handlers are awaited. Event handlers never throw and never
-     * affect Run/Node outcome — failures are logged as warnings.
-     */
-    emitEvent(name: EventName, payload: HookPayload): Promise<void>;
-    private runHandler;
-    private runCommand;
-    /** Parse handler stdout as an InjectorResult. Empty output → empty result. */
-    private parseInjectorStdout;
-}
+import type { HookEvent, LoadedHookConfig } from "./config.js";
+import type { HookContext } from "./context.js";
+import type { HookJournalEntry } from "./journal.js";
+export type HookRunner = {
+    trigger(event: HookEvent, context: HookContext): void;
+    drain(): Promise<void>;
+    activeCount(): number;
+};
+export type HookJournalWriter = {
+    writeHookJournal(entry: HookJournalEntry): void;
+};
+export declare function createHookRunner(hooks: readonly LoadedHookConfig[], journal: HookJournalWriter, options?: {
+    now?: () => Date;
+}): HookRunner;
 //# sourceMappingURL=runner.d.ts.map

package/dist/hooks/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/hooks/runner.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,SAAS,EACd,KAAK,UAAU,EAEf,KAAK,mBAAmB,EACxB,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,cAAc,EAEpB,MAAM,aAAa,CAAC;AAKrB;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,KAAK;IACzC,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAWD;;;;GAIG;AACH,qBAAa,UAAU;IACT,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAnC,YAA6B,MAAM,EAAE,UAAU,EAAI;IAEnD,WAAW,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAEvC;IAED,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAEjC;IAED,gBAAgB,CAAC,IAAI,EAAE,YAAY,GAAG,mBAAmB,EAAE,CAE1D;IAED;;;;;;;;;OASG;IACG,WAAW,CACf,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,WAAW,EACpB,SAAS,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,GACrF,OAAO,CAAC,cAAc,CAAC,CA6CzB;IAED;;;;OAIG;IACG,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAepE;YAGa,UAAU;YAUV,UAAU;IA8BxB,8EAA8E;IAC9E,OAAO,CAAC,mBAAmB;CAU5B"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/hooks/runner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAa,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC1E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IACtD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,WAAW,IAAI,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAC;CACjD,CAAC;AAKF,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,SAAS,gBAAgB,EAAE,EAClC,OAAO,EAAE,iBAAiB,EAC1B,OAAO,GAAE;IAAE,GAAG,CAAC,EAAE,MAAM,IAAI,CAAA;CAAO,GACjC,UAAU,CA0BZ"}

package/dist/hooks/runner.js

@@ -1,161 +1,193 @@
-import { execa } from "execa";
-import { parseDurationMs } from "@acpus/core";
-const DEFAULT_INJECTOR_TIMEOUT_MS = 5_000;
-const DEFAULT_EVENT_TIMEOUT_MS = 30_000;
-/**
- * Thrown when an injector handler fails under the `on_failure: "fail"` policy.
- * The interpreter maps this to a node failure with `failureKind: "hook_failure"`.
- */
-export class HookFailureError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = "HookFailureError";
-    }
-}
-/**
- * Executes hook command handlers. Injectors run sequentially and may fail the
- * node; events never affect outcome. The runner holds the frozen, merged
- * configuration for a single Run.
- */
-export class HookRunner {
-    config;
-    constructor(config) {
-        this.config = config;
-    }
-    hasInjector(name) {
-        return (this.config.injectors?.[name]?.length ?? 0) > 0;
-    }
-    hasEvent(name) {
-        return (this.config.events?.[name]?.length ?? 0) > 0;
-    }
-    injectorHandlers(name) {
-        return this.config.injectors?.[name] ?? [];
-    }
-    /**
-     * Run all handlers for an injector sequentially, merging their results.
-     * `prependPrompt` is concatenated in order for beforeAgentExec; `env` maps
-     * merge with later handlers overriding earlier ones for beforeProgramExec.
-     * A failing handler under `fail` throws
-     * HookFailureError; under `skip` it logs a warning and injects nothing.
-     *
-     * `onHandler` is called once per handler with the resolved per-handler result
-     * (for journaling).
-     */
-    async runInjector(name, payload, onHandler) {
-        const handlers = this.injectorHandlers(name);
-        const contexts = [];
-        let env;
-        for (let i = 0; i < handlers.length; i++) {
-            const handler = handlers[i];
-            const started = Date.now();
-            const outcome = await this.runHandler(handler, payload, DEFAULT_INJECTOR_TIMEOUT_MS, true);
-            const durationMs = Date.now() - started;
-            if (!outcome.ok) {
-                const policy = handler.on_failure ?? "fail";
-                if (policy === "fail") {
-                    throw new HookFailureError(`Injector '${name}' handler #${i} failed: ${outcome.error ?? "unknown error"}`);
-                }
-                console.warn(`Injector '${name}' handler #${i} failed (skipped): ${outcome.error ?? "unknown error"}`);
-                onHandler?.(i, {}, durationMs);
+import { spawn } from "node:child_process";
+import { parseDurationMs } from "../execution/duration.js";
+const defaultTimeout = "30s";
+const outputLimit = 4 * 1024;
+export function createHookRunner(hooks, journal, options = {}) {
+    const now = options.now ?? (() => new Date());
+    const active = new Set();
+    let nextTriggerOrder = 1;
+    function trigger(event, context) {
+        for (const hook of hooks) {
+            if (hook.event !== event || !matches(hook.match, context))
                 continue;
-            }
-            const result = outcome.result ?? {};
-            if (name === "beforeAgentExec") {
-                const agentResult = result;
-                if (typeof agentResult.prependPrompt === "string" && agentResult.prependPrompt.length > 0) {
-                    contexts.push(agentResult.prependPrompt);
-                }
-            }
-            if (name === "beforeProgramExec") {
-                const programResult = result;
-                if (programResult.env && Object.keys(programResult.env).length > 0) {
-                    env = { ...(env ?? {}), ...programResult.env };
-                }
-            }
-            onHandler?.(i, result, durationMs);
+            const startedAt = now();
+            const triggerOrder = nextTriggerOrder++;
+            const running = spawnHook(hook, context, startedAt, triggerOrder, journal)
+                .catch(() => undefined)
+                .finally(() => active.delete(running));
+            active.add(running);
         }
-        if (name === "beforeAgentExec") {
-            const merged = {};
-            if (contexts.length > 0)
-                merged.prependPrompt = contexts.join("\n");
-            return merged;
-        }
-        const merged = {};
-        if (env)
-            merged.env = env;
-        return merged;
     }
-    /**
-     * Fire all handlers for an event. Event handlers are async by default;
-     * `sync: true` handlers are awaited. Event handlers never throw and never
-     * affect Run/Node outcome — failures are logged as warnings.
-     */
-    async emitEvent(name, payload) {
-        const handlers = this.config.events?.[name] ?? [];
-        for (let i = 0; i < handlers.length; i++) {
-            const handler = handlers[i];
-            const run = this.runHandler(handler, payload, DEFAULT_EVENT_TIMEOUT_MS, false)
-                .then((outcome) => {
-                if (!outcome.ok) {
-                    console.warn(`Event '${name}' handler #${i} failed (ignored): ${outcome.error ?? "unknown error"}`);
-                }
-            })
-                .catch((error) => {
-                console.warn(`Event '${name}' handler #${i} threw (ignored): ${error instanceof Error ? error.message : String(error)}`);
-            });
-            if (handler.sync)
-                await run;
+    return {
+        trigger,
+        async drain() {
+            await Promise.all([...active]);
+        },
+        activeCount() {
+            return active.size;
+        },
+    };
+}
+function matches(match, context) {
+    if (!match)
+        return true;
+    return matchesField(match.workflow, context.run.workflowName)
+        && matchesField(match.nodeId, context.node?.id)
+        && matchesField(match.nodeKey, context.node?.key)
+        && matchesField(match.kind, context.node?.kind);
+}
+function matchesField(regex, value) {
+    return regex === undefined || (value !== undefined && new RegExp(regex).test(value));
+}
+async function spawnHook(hook, context, startedAt, triggerOrder, journal) {
+    const timeoutMs = parseDurationMs(hook.timeout ?? defaultTimeout);
+    const startedMs = startedAt.getTime();
+    const result = await runShellCommand(hook.command, context, timeoutMs);
+    writeJournal(journal, journalEntry(hook, context, triggerOrder, {
+        ...result,
+        durationMs: Math.max(0, Date.now() - startedMs),
+        triggeredAt: startedAt.toISOString(),
+    }));
+}
+function runShellCommand(command, context, timeoutMs) {
+    return new Promise(resolve => {
+        const child = spawn(command, { shell: true, cwd: context.run.workspaceDir, detached: process.platform !== "win32" });
+        const stdout = new OutputCollector(outputLimit);
+        const stderr = new OutputCollector(outputLimit);
+        let timedOut = false;
+        let settled = false;
+        let killTimer;
+        const timeout = setTimeout(() => {
+            timedOut = true;
+            killProcessTree(child.pid, "SIGTERM");
+            killTimer = setTimeout(() => killProcessTree(child.pid, "SIGKILL"), 2_000);
+        }, timeoutMs);
+        child.stdout?.on("data", chunk => stdout.append(Buffer.from(chunk)));
+        child.stderr?.on("data", chunk => stderr.append(Buffer.from(chunk)));
+        child.stdin?.on("error", () => {
+            // Hooks are non-interfering; a command that exits before reading stdin
+            // should be recorded from process close/error, not crash the daemon.
+        });
+        child.on("error", error => finish({
+            status: "failed",
+            stdout: stdout.toString(),
+            stderr: stderr.toString(),
+            error: error.message,
+        }));
+        child.on("close", code => finish({
+            status: timedOut ? "timed_out" : code === 0 ? "completed" : "failed",
+            ...(timedOut || code === null ? {} : { exitCode: code }),
+            stdout: stdout.toString(),
+            stderr: stderr.toString(),
+            ...(timedOut ? { error: "timeout" } : code === 0 ? {} : { error: `exit_code_${code ?? "null"}` }),
+        }));
+        child.stdin?.end(JSON.stringify(context));
+        function finish(result) {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timeout);
+            if (killTimer)
+                clearTimeout(killTimer);
+            resolve(result);
         }
+    });
+}
+function journalEntry(hook, context, triggerOrder, result) {
+    return {
+        runId: context.run.id,
+        eventSequence: context.eventSequence,
+        triggerOrder,
+        event: context.event,
+        source: hook.source,
+        sourcePath: hook.sourcePath,
+        handlerId: hook.id ?? hook.effectiveId,
+        definitionHash: hook.definitionHash,
+        ...(context.node?.key === undefined ? {} : { nodeKey: context.node.key }),
+        status: result.status,
+        ...(result.exitCode === undefined ? {} : { exitCode: result.exitCode }),
+        ...(result.stdout === undefined ? {} : { stdout: result.stdout }),
+        ...(result.stderr === undefined ? {} : { stderr: result.stderr }),
+        ...(result.durationMs === undefined ? {} : { durationMs: result.durationMs }),
+        ...(result.error === undefined ? {} : { error: result.error }),
+        triggeredAt: result.triggeredAt,
+    };
+}
+function writeJournal(journal, entry) {
+    try {
+        journal.writeHookJournal(entry);
     }
-    /** Dispatch a single command handler. `parseResult` only for injectors. */
-    async runHandler(handler, payload, defaultTimeoutMs, parseResult) {
-        const timeoutMs = handler.timeout ? parseDurationMs(handler.timeout) || defaultTimeoutMs : defaultTimeoutMs;
-        return this.runCommand(handler, payload, timeoutMs, parseResult);
+    catch {
+        // Hooks are non-interfering; journal failures must not affect workflow execution.
     }
-    async runCommand(handler, payload, timeoutMs, parseResult) {
-        try {
-            const result = await execa(handler.command, {
-                shell: true,
-                cwd: handler.cwd ?? process.cwd(),
-                timeout: timeoutMs > 0 ? timeoutMs : undefined,
-                reject: false,
-                input: JSON.stringify(payload),
-                env: handler.env
-                    ? { ...Object.fromEntries(Object.entries(process.env).filter(([, v]) => v !== undefined)), ...handler.env }
-                    : undefined
-            });
-            if (result.timedOut) {
-                return { ok: false, error: `timed out after ${timeoutMs}ms` };
-            }
-            if ((result.exitCode ?? 0) !== 0) {
-                return { ok: false, error: `exit code ${result.exitCode}: ${stderrTail(result.stderr)}` };
-            }
-            if (!parseResult)
-                return { ok: true };
-            return this.parseInjectorStdout(result.stdout ?? "");
-        }
-        catch (error) {
-            return { ok: false, error: error instanceof Error ? error.message : String(error) };
+}
+function killProcessTree(pid, signal) {
+    if (pid === undefined)
+        return;
+    try {
+        if (process.platform === "win32") {
+            spawn("taskkill", ["/pid", String(pid), "/T", signal === "SIGKILL" ? "/F" : ""].filter(Boolean), { stdio: "ignore" }).unref();
+            return;
         }
+        process.kill(-pid, signal);
     }
-    /** Parse handler stdout as an InjectorResult. Empty output → empty result. */
-    parseInjectorStdout(raw) {
-        const trimmed = raw.trim();
-        if (trimmed.length === 0)
-            return { ok: true, result: {} };
+    catch {
         try {
-            const parsed = JSON.parse(trimmed);
-            return { ok: true, result: parsed ?? {} };
+            process.kill(pid, signal);
         }
         catch {
-            return { ok: false, error: "stdout is not valid JSON" };
+            // Best effort; hook timeout is non-interfering.
+        }
+    }
+}
+class OutputCollector {
+    limit;
+    full = Buffer.alloc(0);
+    head = Buffer.alloc(0);
+    tail = Buffer.alloc(0);
+    total = 0;
+    truncated = false;
+    constructor(limit) {
+        this.limit = limit;
+    }
+    append(chunk) {
+        const nextTotal = this.total + chunk.length;
+        if (!this.truncated && nextTotal <= this.limit * 2) {
+            this.full = Buffer.concat([this.full, chunk]);
+            this.total = nextTotal;
+            return;
+        }
+        if (!this.truncated) {
+            this.head = this.full.length >= this.limit
+                ? this.full.subarray(0, this.limit)
+                : Buffer.concat([this.full, chunk.subarray(0, this.limit - this.full.length)]);
+            this.tail = lastBytes(this.full.subarray(Math.max(0, this.full.length - this.limit)), chunk, this.limit);
+            this.full = Buffer.alloc(0);
+            this.truncated = true;
+            this.total = nextTotal;
+            return;
         }
+        this.total += chunk.length;
+        this.tail = lastBytes(this.tail, chunk, this.limit);
     }
+    toString() {
+        return boundedUtf8(this.truncated ? Buffer.concat([this.head, this.tail]) : this.full, this.limit * 2);
+    }
+}
+function lastBytes(previousTail, chunk, limit) {
+    if (chunk.length >= limit)
+        return chunk.subarray(chunk.length - limit);
+    const combined = Buffer.concat([previousTail, chunk]);
+    return combined.length <= limit ? combined : combined.subarray(combined.length - limit);
 }
-/** Last few lines of stderr for a concise failure summary. */
-function stderrTail(stderr) {
-    if (!stderr)
-        return "";
-    return stderr.replace(/\s+$/u, "").split(/\r?\n/u).slice(-5).join("\n");
+function boundedUtf8(buffer, maxBytes) {
+    let end = Math.min(buffer.length, maxBytes);
+    while (end >= 0) {
+        const value = buffer.subarray(0, end).toString("utf8");
+        if (Buffer.byteLength(value, "utf8") <= maxBytes)
+            return value;
+        end -= 1;
+    }
+    return "";
 }
 //# sourceMappingURL=runner.js.map