@akagilnc/pi-workflow-roles 0.1.2135 → 0.1.2139

package/README.md

@@ -40,7 +40,7 @@ ak-role config unset-engine judge
 
 Receipts are typed, so callers compose roles without parsing prose; ordering and stopping stay caller-owned. Programmatic consumers derive contracts from the exported schemas in `src/package-contracts/`, not from this guide.
 
-When a labor-engine detour fails and the seat continues the labor on the main road, the typed receipt may carry a mechanical `engineLaborFallback` field: `{ engine, failure, laborBy: "seat" }`. It appears only after a real detour failure that fell back to seat labor (including package-owned idle timeout on the detour tool)—not on detour success or caller cancel. First failure wins for the activation; model-forged `engineLaborFallback` keys are stripped unless the package latch recorded one. Sole producer: `src/engine-labor-fallback.ts`; decision record: [ADR 0071](docs/adr/0071-engine-detour-failure-seat-fallback-declaration.md). This README only projects that contract.
+When a labor-engine detour fails and the seat continues the labor on the main road, the typed receipt may carry a mechanical `engineLaborFallback` field: `{ engine, failure, laborBy: "seat" }`. It appears only after a real detour failure that fell back to seat labor—not on detour success or caller cancel. First failure wins for the activation; model-forged `engineLaborFallback` keys are stripped unless the package latch recorded one. Sole producer: `src/engine-labor-fallback.ts`; decision record: [ADR 0071](docs/adr/0071-engine-detour-failure-seat-fallback-declaration.md). This README only projects that contract.
 
 ## Call the roles
 

package/README.zh-CN.md

@@ -40,7 +40,7 @@ ak-role config unset-engine judge
 
 回执是 typed 的，调用者不必解析散文即可组合角色；顺序与停止归调用者。编程消费者从 `src/package-contracts/` 导出推导契约，不从本文。
 
-当劳务引擎绕行失败、座席回到主路继续劳务时，typed 回执可带机械字段 `engineLaborFallback`：`{ engine, failure, laborBy: "seat" }`。仅在真实绕行失败并座席顶班后出现（含 detour 工具命中 package-owned idle 超时）——成功绕行或调用方 cancel 不出现。同一次 activation 内先到先得；无包内 latch 时剥离模型伪造的 `engineLaborFallback` 键。唯一构造点：`src/engine-labor-fallback.ts`；决策记录：[ADR 0071](docs/adr/0071-engine-detour-failure-seat-fallback-declaration.md)。本文只投影该契约。
+当劳务引擎绕行失败、座席回到主路继续劳务时，typed 回执可带机械字段 `engineLaborFallback`：`{ engine, failure, laborBy: "seat" }`。仅在真实绕行失败并座席顶班后出现——成功绕行或调用方 cancel 不出现。同一次 activation 内先到先得；无包内 latch 时剥离模型伪造的 `engineLaborFallback` 键。唯一构造点：`src/engine-labor-fallback.ts`；决策记录：[ADR 0071](docs/adr/0071-engine-detour-failure-seat-fallback-declaration.md)。本文只投影该契约。
 
 ## 调用百官
 

package/dist/compliance-transport.js

@@ -1,7 +1,6 @@
 import { Type } from "typebox";
 import { executeAuditorChild, } from "./evidence-child-executor.js";
 import { createAuditorDossierTool } from "./auditor-dossier-tool.js";
-import { withPackageOwnedToolIdleSuspended } from "./package-owned-tool-idle.js";
 /** Zero-projection kickoff — soul already carries dossier-fetch duty; no hand-delivered materials. */
 export const AUDITOR_DOSSIER_PROMPT = "Audit the current run dossier.";
 const nonblank = Type.String({ minLength: 1, pattern: "\\S" });
@@ -62,28 +61,24 @@ export function readComplianceCandidate(arguments_, usage) {
     return { status: "audit-incomplete", observation: { kind: "object-status-unreadable", status: status === undefined ? "missing" : "unknown" }, candidate: arguments_, ...(usage === undefined ? {} : { usage }) };
 }
 export async function runComplianceAudit(options) {
-    // #339: only the real compliance-audit await leaves the outer package-owned
-    // idle owner. Pre/post-audit work stays under the single outer backstop.
-    return withPackageOwnedToolIdleSuspended(async () => {
-        const prompt = options.serializedInput ?? AUDITOR_DOSSIER_PROMPT;
-        const receipt = await executeAuditorChild({
-            tool: options.tool,
-            dossierTool: createAuditorDossierTool(options.runDirectory),
-            systemPrompt: options.systemPrompt,
-            prompt,
-            roleLabel: options.roleLabel,
-            context: options.context,
-            retainResponse: (response) => retainComplianceResponse(options.context, response),
-            ...(options.runCompletion === undefined ? {} : { runCompletion: options.runCompletion }),
-            ...(options.signal === undefined ? {} : { signal: options.signal }),
-        });
-        if (receipt.noReceiptLifecycle !== undefined) {
-            return {
-                status: "no-receipt",
-                ...receipt.noReceiptLifecycle,
-                ...(receipt.response.usage === undefined ? {} : { usage: receipt.response.usage }),
-            };
-        }
-        return readComplianceCandidate(receipt.decision, receipt.response.usage);
+    const prompt = options.serializedInput ?? AUDITOR_DOSSIER_PROMPT;
+    const receipt = await executeAuditorChild({
+        tool: options.tool,
+        dossierTool: createAuditorDossierTool(options.runDirectory),
+        systemPrompt: options.systemPrompt,
+        prompt,
+        roleLabel: options.roleLabel,
+        context: options.context,
+        retainResponse: (response) => retainComplianceResponse(options.context, response),
+        ...(options.runCompletion === undefined ? {} : { runCompletion: options.runCompletion }),
+        ...(options.signal === undefined ? {} : { signal: options.signal }),
     });
+    if (receipt.noReceiptLifecycle !== undefined) {
+        return {
+            status: "no-receipt",
+            ...receipt.noReceiptLifecycle,
+            ...(receipt.response.usage === undefined ? {} : { usage: receipt.response.usage }),
+        };
+    }
+    return readComplianceCandidate(receipt.decision, receipt.response.usage);
 }

package/dist/engine-detour-tool.js

@@ -1,7 +1,6 @@
 import { Type } from "typebox";
 import { ENGINE_DETOUR_ALREADY_USED_DIAGNOSTIC, ENGINE_DETOUR_TOOL_NAME, engineDetourFailureDiagnostic, engineNameFromEnv, isEngineDetourFailure, runEngineDetourOnce, } from "./engine-detour.js";
 import { activationEngineLaborFallbackLatch, recordEngineLaborFallback, } from "./engine-labor-fallback.js";
-import { isPackageOwnedToolIdleTimeoutError, pokePackageOwnedToolIdle, wrapPackageOwnedToolDefinition, } from "./package-owned-tool-idle.js";
 const engineDetourArgsSchema = Type.Object({
     argv: Type.Array(Type.String({ minLength: 1 }), {
         minItems: 1,
@@ -23,14 +22,8 @@ function seatFallbackToolResult(field, failure) {
         },
     };
 }
-/** Caller/upper-layer cancel must propagate; idle backstop is seat-fallback, not cancel. */
+/** Caller/upper-layer cancel must propagate; process failure is seat-fallback, not cancel. */
 function isCallerCancellation(error, signal) {
-    if (isPackageOwnedToolIdleTimeoutError(error))
-        return false;
-    if (signal !== undefined &&
-        isPackageOwnedToolIdleTimeoutError(signal.reason)) {
-        return false;
-    }
     if (signal?.aborted === true)
         return true;
     if (typeof error === "object" &&
@@ -44,13 +37,13 @@ function isCallerCancellation(error, signal) {
  * Build one once-latch detour tool definition for a configured engine name.
  * `latch` is shared so parent registration can reset between activations.
  * `fail` owns host abort (parent) vs throw (evidence child) for tool misuse only.
- * Engine process failure (nonzero/empty/spawn/idle-timeout) soft-returns seat fallback (#380).
+ * Engine process failure (nonzero/empty/spawn) soft-returns seat fallback (#380).
  * Caller AbortSignal cancel propagates without writing fallback.
  */
 export function createEngineDetourToolDefinition(input) {
     const latch = input.latch ?? { used: false };
     const engineName = input.engineName;
-    return wrapPackageOwnedToolDefinition({
+    return {
         name: ENGINE_DETOUR_TOOL_NAME,
         label: "Engine Detour",
         description: `Run one labor-engine subprocess (engine=${engineName}) and return its stdout to this session. Call at most once per activation. Build argv from the host CLI actual interface for this engine name; when optional packaged notes are present in the session prompt, follow those bytes too.`,
@@ -83,17 +76,14 @@ export function createEngineDetourToolDefinition(input) {
             };
             let result;
             try {
-                // Byte activity on stdout/stderr touches the outer package-owned idle clock
-                // (183s silence law unchanged). True hangs still die; slow streaming engines live.
                 result = await runEngineDetourOnce({
                     argv,
                     cwd: ctx.cwd,
                     ...(signal === undefined ? {} : { signal }),
-                    onOutputActivity: pokePackageOwnedToolIdle,
                 });
             }
             catch (error) {
-                // Caller cancel: propagate. Idle backstop + spawn/engine failure: seat fallback.
+                // Caller cancel: propagate. Spawn/engine failure: seat fallback.
                 if (isCallerCancellation(error, signal)) {
                     throw error;
                 }
@@ -111,7 +101,7 @@ export function createEngineDetourToolDefinition(input) {
                 },
             };
         },
-    });
+    };
 }
 /**
  * Register the engine-generic detour tool once for this process when any role has

package/dist/engine-detour.js

@@ -48,8 +48,8 @@ export async function runEngineDetourOnce(input) {
     return await new Promise((resolve, reject) => {
         let settled = false;
         const signal = input.signal;
-        // Own abort→kill explicitly so rejection preserves signal.reason (caller cancel
-        // vs package-owned idle). Do not pass `signal` to spawn (Node replaces reason).
+        // Own abort→kill explicitly so rejection preserves signal.reason (caller cancel).
+        // Do not pass `signal` to spawn (Node replaces reason).
         const child = spawn(command, args, {
             cwd: input.cwd,
             env: input.env ?? process.env,
@@ -57,18 +57,11 @@ export async function runEngineDetourOnce(input) {
         });
         let stdout = "";
         let stderr = "";
-        const noteActivity = (chunk) => {
-            if (chunk.length === 0)
-                return;
-            input.onOutputActivity?.();
-        };
         child.stdout.setEncoding("utf8").on("data", (chunk) => {
             stdout += chunk;
-            noteActivity(chunk);
         });
         child.stderr.setEncoding("utf8").on("data", (chunk) => {
             stderr += chunk;
-            noteActivity(chunk);
         });
         const fail = (error) => {
             if (settled)
@@ -89,8 +82,7 @@ export async function runEngineDetourOnce(input) {
             resolve(result);
         };
         const onAbort = () => {
-            // Fail synchronously so cooperative idle/cancel paths can soft-settle
-            // before the outer package-owned idle hard-reject drain.
+            // Fail synchronously so caller-cancel soft-settle preserves signal.reason.
             fail(signal !== undefined ? abortReasonError(signal) : new Error("aborted"));
             try {
                 child.kill("SIGTERM");

package/dist/evidence-child-executor.js

@@ -11,7 +11,6 @@ import { AUDITOR_COMPLIANCE_FAILURE_ENTRY_TYPE, AUDITOR_PARENT_ATTEMPT_BINDING_E
 import { createEngineDetourToolDefinition } from "./engine-detour-tool.js";
 import { engineNameFromEnv } from "./engine-detour.js";
 import { appendEngineSessionMaterial, engineSessionMaterialFromOptions, } from "./package-resources/engine-material.js";
-import { wrapPackageOwnedToolDefinition } from "./package-owned-tool-idle.js";
 import { createReceiptDeliveryPolicy, NO_RECEIPT_LIFECYCLE_ENTRY_TYPE, RECEIPT_DELIVERY_PROMPT } from "./receipt-delivery-policy.js";
 import { REVIEWER_VERIFICATION_BOUNDARY } from "./reviewer-construction.js";
 import { createStreamIdleGuard, isStreamIdleTimeoutError } from "./stream-idle-guard.js";
@@ -599,7 +598,7 @@ export async function executeAuditorChild(options) {
         let decisionToolFailure;
         const decisionToolFailures = new Map();
         const delivery = createReceiptDeliveryPolicy();
-        const tool = wrapPackageOwnedToolDefinition({
+        const tool = {
             ...options.tool,
             label: options.roleLabel,
             async execute(...args) {
@@ -625,7 +624,7 @@ export async function executeAuditorChild(options) {
                     throw error;
                 }
             },
-        });
+        };
         const parentSessionManager = options.context.sessionManager;
         const parentHeader = parentSessionManager?.getHeader?.();
         const parentSessionFile = parentSessionManager?.getSessionFile?.();
@@ -644,7 +643,7 @@ export async function executeAuditorChild(options) {
             thinkingLevel: options.context.thinkingLevel ?? "off",
             modelRuntime: inherited.runtime,
             systemPrompt: options.systemPrompt,
-            customTools: [wrapPackageOwnedToolDefinition({ ...options.dossierTool, label: options.roleLabel }), tool],
+            customTools: [{ ...options.dossierTool, label: options.roleLabel }, tool],
             sessionManager: auditorSessionManager,
         });
         const binding = {

package/dist/navigator-attendance.js

@@ -14,7 +14,6 @@ import { PACKAGED_ROLE_REGISTRY, packagedRoleMetadata } from "./packaged-role-re
 import { openInProcessAgentSession } from "./in-process-session.js";
 import { renderPublicAkRoleCommand } from "./public-command-renderer.js";
 import { issueRoot, subjectPath } from "./work-subject-identity.js";
-import { wrapPackageOwnedToolDefinition } from "./package-owned-tool-idle.js";
 import { createReceiptDeliveryPolicy, NO_RECEIPT_LIFECYCLE_ENTRY_TYPE, RECEIPT_DELIVERY_PROMPT } from "./receipt-delivery-policy.js";
 import { recordTypedProviderHttpStatus } from "./typed-provider-http.js";
 import {
@@ -247,7 +246,7 @@ function parseNavigatorModelSetting(value) {
   return { provider, model, thinkingLevel: suffix === "max" ? "max" : "off" };
 }
 function createNavigatorPrepareTool(onOutput) {
-  return wrapPackageOwnedToolDefinition({
+  return {
     name: NAVIGATOR_PREPARE_TOOL_NAME,
     label: "Navigator preparation",
     description: "Submit Navigator direction advice. Provide candidates with next.role (phase when meaningful). route/matches/reason/command are optional context, not acceptance gates.",
@@ -256,7 +255,7 @@ function createNavigatorPrepareTool(onOutput) {
       onOutput(value);
       return { content: [{ type: "text", text: "Navigator preparation accepted" }], details: value, terminate: true };
     }
-  });
+  };
 }
 function selectNavigatorCandidate(candidates, settlement) {
   if (settlement.kind !== "accepted") return void 0;

package/dist/public-cli/main.js

@@ -19302,64 +19302,6 @@ var init_engine_labor_fallback = __esm({
   }
 });
 
-// src/stream-idle-guard.ts
-var init_stream_idle_guard = __esm({
-  "src/stream-idle-guard.ts"() {
-    "use strict";
-  }
-});
-
-// src/stderr-jsonl.ts
-var init_stderr_jsonl = __esm({
-  "src/stderr-jsonl.ts"() {
-    "use strict";
-  }
-});
-
-// src/tool-execution-observation.ts
-var observationBase, toolExecutionObservationRecordSchema;
-var init_tool_execution_observation = __esm({
-  "src/tool-execution-observation.ts"() {
-    "use strict";
-    init_build();
-    init_value2();
-    init_stderr_jsonl();
-    observationBase = {
-      role: typebox_exports.String({ minLength: 1 }),
-      toolCallId: typebox_exports.String({ minLength: 1 }),
-      toolName: typebox_exports.String({ minLength: 1 }),
-      timestamp: typebox_exports.String({ format: "date-time" })
-    };
-    toolExecutionObservationRecordSchema = typebox_exports.Union([
-      typebox_exports.Object({
-        ...observationBase,
-        event: typebox_exports.Literal("tool_execution_start")
-      }, { additionalProperties: true }),
-      typebox_exports.Object({
-        ...observationBase,
-        event: typebox_exports.Literal("tool_execution_update")
-      }, { additionalProperties: true }),
-      typebox_exports.Object({
-        ...observationBase,
-        event: typebox_exports.Literal("tool_execution_end"),
-        isError: typebox_exports.Boolean()
-      }, { additionalProperties: true })
-    ]);
-  }
-});
-
-// src/package-owned-tool-idle.ts
-import { AsyncLocalStorage } from "node:async_hooks";
-var packageOwnedToolIdleScope;
-var init_package_owned_tool_idle = __esm({
-  "src/package-owned-tool-idle.ts"() {
-    "use strict";
-    init_stream_idle_guard();
-    init_tool_execution_observation();
-    packageOwnedToolIdleScope = new AsyncLocalStorage();
-  }
-});
-
 // src/engine-detour-tool.ts
 var engineDetourArgsSchema;
 var init_engine_detour_tool = __esm({
@@ -19368,7 +19310,6 @@ var init_engine_detour_tool = __esm({
     init_build();
     init_engine_detour();
     init_engine_labor_fallback();
-    init_package_owned_tool_idle();
     engineDetourArgsSchema = typebox_exports.Object(
       {
         argv: typebox_exports.Array(typebox_exports.String({ minLength: 1 }), {
@@ -19411,6 +19352,13 @@ var init_receipt_delivery_policy = __esm({
   }
 });
 
+// src/stream-idle-guard.ts
+var init_stream_idle_guard = __esm({
+  "src/stream-idle-guard.ts"() {
+    "use strict";
+  }
+});
+
 // src/evidence-child-executor.ts
 var init_evidence_child_executor = __esm({
   "src/evidence-child-executor.ts"() {
@@ -19419,7 +19367,6 @@ var init_evidence_child_executor = __esm({
     init_engine_detour_tool();
     init_engine_detour();
     init_engine_material();
-    init_package_owned_tool_idle();
     init_receipt_delivery_policy();
     init_reviewer_construction();
     init_stream_idle_guard();
@@ -19452,7 +19399,6 @@ var init_compliance_transport = __esm({
     init_build();
     init_evidence_child_executor();
     init_auditor_dossier_tool();
-    init_package_owned_tool_idle();
     nonblank2 = typebox_exports.String({ minLength: 1, pattern: "\\S" });
     decisionGateSchema = typebox_exports.Object({ question: nonblank2, options: typebox_exports.Array(nonblank2, { minItems: 1 }) }, { additionalProperties: false });
     complianceDecisionSchema = typebox_exports.Object({ status: typebox_exports.Unknown({ description: "Auditor decision status." }), violations: typebox_exports.Array(nonblank2, { description: "Observed compliance violations." }), conflicts: typebox_exports.Array(nonblank2, { description: "Unresolved authority or execution conflicts." }), decisionGate: typebox_exports.Union([decisionGateSchema, typebox_exports.Null()], { description: "Escalation question and available options." }) }, { additionalProperties: true, required: [] });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akagilnc/pi-workflow-roles",
-  "version": "0.1.2135",
+  "version": "0.1.2139",
   "description": "Soul-bound workflow roles for Pi",
   "type": "module",
   "license": "Apache-2.0",

package/resources/engines/codex.md

@@ -33,10 +33,9 @@ codex exec --skip-git-repo-check --ephemeral -C "$PROJECT_ROOT" "YOUR_LABOR_PROM
 
 Default (non-`--json`) mode prints the session banner and progress on stderr
 (measured on this host). Collect the labor body from stdout so that stderr log
-noise is not mixed into the returned body; the package idle clock can still see
-activity on both streams. Use `--json` only when the seat itself needs
-machine-readable event rows (those rows land on stdout as JSONL; measured event
-types include `thread.started`, `turn.started`, `item.completed`, `error`,
+noise is not mixed into the returned body. Use `--json` only when the seat itself
+needs machine-readable event rows (those rows land on stdout as JSONL; measured
+event types include `thread.started`, `turn.started`, `item.completed`, `error`,
 `turn.failed`):
 
 ```bash

package/resources/engines/grok-4.6.md

@@ -27,12 +27,11 @@ grok --prompt-file /path/to/labor-prompt.md -m grok-4.6 --always-approve --outpu
 - `--output-format plain` keeps stdout clean for capture — but it stays
   silent until the run finishes. **For labor longer than ~2 minutes use
   `--output-format streaming-json` instead**: it emits NDJSON events
-  (thought/text deltas) continuously from the first second, which keeps the
-  package idle watchdog fed (verified live 2026-08-21; a plain-format judge
-  run was killed by the 183s idle timeout). Reconstruct the final answer by concatenating each NDJSON
-  object's `data` where `type == "text"`, in stream order; `type == "end"`
-  (stopReason end_turn) marks completion. Do not treat `thought` events as
-  the answer (live-verified stream shape 2026-08-21).
+  (thought/text deltas) continuously from the first second, so long runs stay
+  observable instead of appearing hung. Reconstruct the final answer by
+  concatenating each NDJSON object's `data` where `type == "text"`, in stream
+  order; `type == "end"` (stopReason end_turn) marks completion. Do not treat
+  `thought` events as the answer (live-verified stream shape 2026-08-21).
 - **Always pass `--reasoning-effort <low|medium|high>`** matching the effort
   tier ordered in the labor mandate (verified live 2026-08-21: flag exists,
   alias `--effort`; a low-tier run completed correctly). If the mandate names

package/resources/engines/kimi.md

@@ -31,8 +31,8 @@ kimi -m <model-alias> -p "YOUR_LABOR_PROMPT"
 ```
 
 Use `--output-format stream-json` (choices measured on this host: `text`,
-`stream-json`; default is `text`) so the package idle clock can see subprocess
-activity while the engine works. Take the labor body from
+`stream-json`; default is `text`) when long labor needs progressive observability
+while the engine works. Take the labor body from
 `{"role":"assistant","content":...}` rows, not from `role:meta` rows:
 
 ```bash

package/resources/engines/opus.md

@@ -33,8 +33,8 @@ claude -p --model opus --verbose --output-format=stream-json "YOUR_LABOR_PROMPT"
 ```
 
 Use `--output-format=stream-json` (choices measured on this host: `text`, `json`,
-`stream-json`) so the package idle clock can see subprocess activity while the
-engine works; take the labor body from the final `result` event's `result` field,
+`stream-json`) when long labor needs progressive observability while the engine
+works; take the labor body from the final `result` event's `result` field,
 not from intermediate stream rows.
 
 Prefer `claude --help` on the host over any remembered flag set. Do not wrap this

package/src/collector-role.ts

@@ -61,10 +61,6 @@ const requestSchema = collectorRequestArgsSchema;
 const waitSchema = collectorWaitArgsSchema;
 const outputSchema = collectorOutputArgsSchema;
 
-// Well below the fixed 183s package-tool silence clock while avoiding noisy UI
-// churn during Collector's legal five-minute wait.
-const COLLECTOR_WAIT_PROGRESS_INTERVAL_MS = 60_000;
-
 type RequestParams = Static<typeof requestSchema>;
 type WaitParams = Static<typeof waitSchema>;
 type OutputParams = Static<typeof outputSchema>;
@@ -377,40 +373,18 @@ export function createCollectorRoleRuntime(
         "Call ak_collector_wait with a positive durationMs; runtime caps each wait to five minutes and to remaining eligibility.",
       ],
       parameters: waitSchema,
-      async execute(toolCallId, params: WaitParams, signal, onUpdate, ctx) {
+      async execute(toolCallId, params: WaitParams, signal, _onUpdate, ctx) {
         if (activation === undefined) {
           throw new Error("Collector is not activated");
         }
-        const currentActivation = activation;
-        let progressTimer: ReturnType<typeof setTimeout> | undefined;
         try {
-          currentActivation.ledger.beginOperational(COLLECTOR_WAIT_TOOL, toolCallId);
-          const waitStartedMono = currentActivation.clock.monoNow();
-          let lastElapsedMs = 0;
-          const scheduleProgress = (): void => {
-            if (onUpdate === undefined) return;
-            progressTimer = setTimeout(() => {
-              const elapsedMs = Math.max(
-                0,
-                Math.floor(currentActivation.clock.monoNow() - waitStartedMono),
-              );
-              if (elapsedMs > lastElapsedMs) {
-                lastElapsedMs = elapsedMs;
-                onUpdate({
-                  content: [],
-                  details: { kind: "collector_wait_progress", elapsedMs },
-                });
-              }
-              scheduleProgress();
-            }, COLLECTOR_WAIT_PROGRESS_INTERVAL_MS);
-          };
-          scheduleProgress();
-          const details = await currentActivation.ledger.wait(
+          activation.ledger.beginOperational(COLLECTOR_WAIT_TOOL, toolCallId);
+          const details = await activation.ledger.wait(
             params,
-            currentActivation.clock,
+            activation.clock,
             signal,
           );
-          currentActivation.ledger.completeOperational(toolCallId);
+          activation.ledger.completeOperational(toolCallId);
           return {
             content: [{
               type: "text" as const,
@@ -420,8 +394,6 @@ export function createCollectorRoleRuntime(
           };
         } catch (error) {
           hostActions.failInfrastructure(error, ctx);
-        } finally {
-          if (progressTimer !== undefined) clearTimeout(progressTimer);
         }
       },
     });

package/src/compliance-transport.ts

@@ -7,7 +7,6 @@ import {
 } from "./evidence-child-executor.ts";
 import { createAuditorDossierTool } from "./auditor-dossier-tool.ts";
 import type { DossierObservation } from "./dossier-resolution.ts";
-import { withPackageOwnedToolIdleSuspended } from "./package-owned-tool-idle.ts";
 import type { NoReceiptLifecycleFacts } from "./receipt-delivery-policy.ts";
 
 export type ComplianceCompletion = AuditorCompletion;
@@ -117,28 +116,24 @@ export type RunComplianceAuditOptions = {
 };
 
 export async function runComplianceAudit(options: RunComplianceAuditOptions): Promise<ComplianceDecision> {
-  // #339: only the real compliance-audit await leaves the outer package-owned
-  // idle owner. Pre/post-audit work stays under the single outer backstop.
-  return withPackageOwnedToolIdleSuspended(async () => {
-    const prompt = options.serializedInput ?? AUDITOR_DOSSIER_PROMPT;
-    const receipt = await executeAuditorChild({
-      tool: options.tool,
-      dossierTool: createAuditorDossierTool(options.runDirectory),
-      systemPrompt: options.systemPrompt,
-      prompt,
-      roleLabel: options.roleLabel,
-      context: options.context,
-      retainResponse: (response) => retainComplianceResponse(options.context, response),
-      ...(options.runCompletion === undefined ? {} : { runCompletion: options.runCompletion }),
-      ...(options.signal === undefined ? {} : { signal: options.signal }),
-    });
-    if (receipt.noReceiptLifecycle !== undefined) {
-      return {
-        status: "no-receipt",
-        ...receipt.noReceiptLifecycle,
-        ...(receipt.response.usage === undefined ? {} : { usage: receipt.response.usage }),
-      };
-    }
-    return readComplianceCandidate(receipt.decision, receipt.response.usage);
+  const prompt = options.serializedInput ?? AUDITOR_DOSSIER_PROMPT;
+  const receipt = await executeAuditorChild({
+    tool: options.tool,
+    dossierTool: createAuditorDossierTool(options.runDirectory),
+    systemPrompt: options.systemPrompt,
+    prompt,
+    roleLabel: options.roleLabel,
+    context: options.context,
+    retainResponse: (response) => retainComplianceResponse(options.context, response),
+    ...(options.runCompletion === undefined ? {} : { runCompletion: options.runCompletion }),
+    ...(options.signal === undefined ? {} : { signal: options.signal }),
   });
+  if (receipt.noReceiptLifecycle !== undefined) {
+    return {
+      status: "no-receipt",
+      ...receipt.noReceiptLifecycle,
+      ...(receipt.response.usage === undefined ? {} : { usage: receipt.response.usage }),
+    };
+  }
+  return readComplianceCandidate(receipt.decision, receipt.response.usage);
 }

package/src/engine-detour-tool.ts

@@ -4,7 +4,7 @@
  * Evidence-child legs install the same definition via customTools (no spawn in role modules).
  * #380: engine process failure soft-returns so the seat rejoins the main road; declaration
  * is recorded once via engine-labor-fallback (no fail-closed reject-leg).
- * Caller AbortSignal cancel propagates without fallback; package-owned idle abort soft-fails.
+ * Caller AbortSignal cancel propagates without fallback.
  */
 import type {
   AgentToolResult,
@@ -27,11 +27,6 @@ import {
   recordEngineLaborFallback,
   type EngineLaborFallbackField,
 } from "./engine-labor-fallback.ts";
-import {
-  isPackageOwnedToolIdleTimeoutError,
-  pokePackageOwnedToolIdle,
-  wrapPackageOwnedToolDefinition,
-} from "./package-owned-tool-idle.ts";
 
 const engineDetourArgsSchema = Type.Object(
   {
@@ -81,18 +76,11 @@ function seatFallbackToolResult(
   };
 }
 
-/** Caller/upper-layer cancel must propagate; idle backstop is seat-fallback, not cancel. */
+/** Caller/upper-layer cancel must propagate; process failure is seat-fallback, not cancel. */
 function isCallerCancellation(
   error: unknown,
   signal: AbortSignal | undefined,
 ): boolean {
-  if (isPackageOwnedToolIdleTimeoutError(error)) return false;
-  if (
-    signal !== undefined &&
-    isPackageOwnedToolIdleTimeoutError(signal.reason)
-  ) {
-    return false;
-  }
   if (signal?.aborted === true) return true;
   if (
     typeof error === "object" &&
@@ -108,7 +96,7 @@ function isCallerCancellation(
  * Build one once-latch detour tool definition for a configured engine name.
  * `latch` is shared so parent registration can reset between activations.
  * `fail` owns host abort (parent) vs throw (evidence child) for tool misuse only.
- * Engine process failure (nonzero/empty/spawn/idle-timeout) soft-returns seat fallback (#380).
+ * Engine process failure (nonzero/empty/spawn) soft-returns seat fallback (#380).
  * Caller AbortSignal cancel propagates without writing fallback.
  */
 export function createEngineDetourToolDefinition(input: {
@@ -118,7 +106,7 @@ export function createEngineDetourToolDefinition(input: {
 }): ToolDefinition {
   const latch = input.latch ?? { used: false };
   const engineName = input.engineName;
-  return wrapPackageOwnedToolDefinition({
+  return {
     name: ENGINE_DETOUR_TOOL_NAME,
     label: "Engine Detour",
     description:
@@ -170,16 +158,13 @@ export function createEngineDetourToolDefinition(input: {
 
       let result: Awaited<ReturnType<typeof runEngineDetourOnce>>;
       try {
-        // Byte activity on stdout/stderr touches the outer package-owned idle clock
-        // (183s silence law unchanged). True hangs still die; slow streaming engines live.
         result = await runEngineDetourOnce({
           argv,
           cwd: ctx.cwd,
           ...(signal === undefined ? {} : { signal }),
-          onOutputActivity: pokePackageOwnedToolIdle,
         });
       } catch (error) {
-        // Caller cancel: propagate. Idle backstop + spawn/engine failure: seat fallback.
+        // Caller cancel: propagate. Spawn/engine failure: seat fallback.
         if (isCallerCancellation(error, signal)) {
           throw error;
         }
@@ -200,7 +185,7 @@ export function createEngineDetourToolDefinition(input: {
         },
       };
     },
-  }) as ToolDefinition;
+  } as ToolDefinition;
 }
 
 /**

package/src/engine-detour.ts

@@ -44,11 +44,6 @@ export type EngineDetourRunInput = Readonly<{
   cwd: string;
   env?: NodeJS.ProcessEnv;
   signal?: AbortSignal;
-  /**
-   * Called when the child emits at least one byte on stdout or stderr.
-   * Host wires this to the package-owned idle clock (activity = touch); no timer here.
-   */
-  onOutputActivity?: () => void;
 }>;
 
 function abortReasonError(signal: AbortSignal): Error {
@@ -78,8 +73,8 @@ export async function runEngineDetourOnce(
   return await new Promise<EngineDetourResult>((resolve, reject) => {
     let settled = false;
     const signal = input.signal;
-    // Own abort→kill explicitly so rejection preserves signal.reason (caller cancel
-    // vs package-owned idle). Do not pass `signal` to spawn (Node replaces reason).
+    // Own abort→kill explicitly so rejection preserves signal.reason (caller cancel).
+    // Do not pass `signal` to spawn (Node replaces reason).
     const child = spawn(command, args, {
       cwd: input.cwd,
       env: input.env ?? process.env,
@@ -87,17 +82,11 @@ export async function runEngineDetourOnce(
     });
     let stdout = "";
     let stderr = "";
-    const noteActivity = (chunk: string): void => {
-      if (chunk.length === 0) return;
-      input.onOutputActivity?.();
-    };
     child.stdout.setEncoding("utf8").on("data", (chunk: string) => {
       stdout += chunk;
-      noteActivity(chunk);
     });
     child.stderr.setEncoding("utf8").on("data", (chunk: string) => {
       stderr += chunk;
-      noteActivity(chunk);
     });
     const fail = (error: unknown): void => {
       if (settled) return;
@@ -116,8 +105,7 @@ export async function runEngineDetourOnce(
       resolve(result);
     };
     const onAbort = (): void => {
-      // Fail synchronously so cooperative idle/cancel paths can soft-settle
-      // before the outer package-owned idle hard-reject drain.
+      // Fail synchronously so caller-cancel soft-settle preserves signal.reason.
       fail(signal !== undefined ? abortReasonError(signal) : new Error("aborted"));
       try {
         child.kill("SIGTERM");

package/src/evidence-child-executor.ts

@@ -36,7 +36,6 @@ import {
   engineSessionMaterialFromOptions,
   type EngineSessionMaterial,
 } from "./package-resources/engine-material.ts";
-import { wrapPackageOwnedToolDefinition } from "./package-owned-tool-idle.ts";
 import { createReceiptDeliveryPolicy, NO_RECEIPT_LIFECYCLE_ENTRY_TYPE, RECEIPT_DELIVERY_PROMPT, type NoReceiptLifecycleFacts } from "./receipt-delivery-policy.ts";
 import { REVIEWER_VERIFICATION_BOUNDARY } from "./reviewer-construction.ts";
 import type { ReviewerPromptText } from "./reviewer-prompt-identity.ts";
@@ -750,7 +749,7 @@ export async function executeAuditorChild(
     let decisionToolFailure: unknown;
     const decisionToolFailures = new Map<string, unknown>();
     const delivery = createReceiptDeliveryPolicy();
-    const tool = wrapPackageOwnedToolDefinition({
+    const tool = {
       ...options.tool,
       label: options.roleLabel,
       async execute(...args: any[]) {
@@ -775,7 +774,7 @@ export async function executeAuditorChild(
           throw error;
         }
       },
-    });
+    };
 
     const parentSessionManager = options.context.sessionManager;
     const parentHeader = parentSessionManager?.getHeader?.();
@@ -796,7 +795,7 @@ export async function executeAuditorChild(
       thinkingLevel: options.context.thinkingLevel ?? "off",
       modelRuntime: inherited.runtime,
       systemPrompt: options.systemPrompt,
-      customTools: [wrapPackageOwnedToolDefinition({ ...options.dossierTool, label: options.roleLabel }), tool],
+      customTools: [{ ...options.dossierTool, label: options.roleLabel }, tool],
       sessionManager: auditorSessionManager,
     });
 

package/src/navigator-attendance.ts

@@ -16,7 +16,6 @@ import { PACKAGED_ROLE_REGISTRY, type PackagedRole, packagedRoleMetadata } from
 import { openInProcessAgentSession } from "./in-process-session.ts";
 import { renderPublicAkRoleCommand } from "./public-command-renderer.ts";
 import { issueRoot, subjectPath } from "./work-subject-identity.ts";
-import { wrapPackageOwnedToolDefinition } from "./package-owned-tool-idle.ts";
 import { createReceiptDeliveryPolicy, NO_RECEIPT_LIFECYCLE_ENTRY_TYPE, RECEIPT_DELIVERY_PROMPT } from "./receipt-delivery-policy.ts";
 import { recordTypedProviderHttpStatus } from "./typed-provider-http.ts";
 import {
@@ -437,7 +436,7 @@ export function parseNavigatorModelSetting(value: string): { provider: string; m
 }
 
 export function createNavigatorPrepareTool(onOutput: (value: PrepareOutput) => void): ToolDefinition {
-  return wrapPackageOwnedToolDefinition({
+  return {
     name: NAVIGATOR_PREPARE_TOOL_NAME,
     label: "Navigator preparation",
     description: "Submit Navigator direction advice. Provide candidates with next.role (phase when meaningful). route/matches/reason/command are optional context, not acceptance gates.",
@@ -448,7 +447,7 @@ export function createNavigatorPrepareTool(onOutput: (value: PrepareOutput) => v
       onOutput(value as PrepareOutput);
       return { content: [{ type: "text" as const, text: "Navigator preparation accepted" }], details: value, terminate: true as const };
     },
-  });
+  };
 }
 
 /**

package/src/role-runtime.ts

@@ -28,7 +28,6 @@ import {
   installActivationEngineLaborFallbackLatch,
   restoreEngineLaborFallbackFromSessionEntries,
 } from "./engine-labor-fallback.ts";
-import { installPackageOwnedToolRegistration } from "./package-owned-tool-idle.ts";
 import { createReceiptDeliveryPolicy, NO_RECEIPT_LIFECYCLE_ENTRY_TYPE, RECEIPT_DELIVERY_PROMPT } from "./receipt-delivery-policy.ts";
 import { createOAuthKeepalive, type OAuthKeepaliveOptions } from "./oauth-keepalive.ts";
 
@@ -575,8 +574,6 @@ export function createRoleRuntimeExtension(
   dependencies: RoleRuntimeDependencies,
 ): (pi: ExtensionAPI) => void {
   return (pi) => {
-    // #102: one shared package-owned tool registration surface for all role runtimes.
-    installPackageOwnedToolRegistration(pi);
     pi.registerFlag(ROLE_FLAG.name, ROLE_FLAG.definition);
     // Reviewer transport flags: shared envelope owns registration (ADR 0018).
     for (const flag of REVIEWER_TRANSPORT_FLAGS) {

package/dist/package-owned-tool-idle.js

@@ -1,223 +0,0 @@
-/**
- * #102 package-owned tool idle backstop.
- *
- * Fixed 183000ms silence clock on package-owned tool execute only.
- * Real producing onUpdate resets; final resolve/reject clears; timeout throws so
- * Pi settles the current call as an LLM-visible isError tool result. No retry,
- * role failure, process termination, config, or Pi built-in coverage.
- *
- * #339: do not name-exempt whole terminating tools. Outer idle stays armed for
- * pre/post-audit work. Only the real compliance-audit await suspends this single
- * layer (ADR 0059 owns that interval); resume re-arms the same outer backstop.
- *
- * #380: on idle, abort a derived tool signal (not the caller signal) so detour
- * spawn cleanup and softFail can run through the existing AbortSignal path.
- * Cooperative soft-settle may win; non-listeners still hard-reject after a
- * microtask drain (no second timer).
- */
-import { AsyncLocalStorage } from "node:async_hooks";
-import { DEFAULT_STREAM_IDLE_TIMEOUT_MS, createStreamIdleGuard, } from "./stream-idle-guard.js";
-import { isProducingToolUpdate } from "./tool-execution-observation.js";
-export const PACKAGE_OWNED_TOOL_IDLE_TIMEOUT_MS = DEFAULT_STREAM_IDLE_TIMEOUT_MS;
-export const PACKAGE_OWNED_TOOL_IDLE_TIMEOUT_CODE = "AK_PACKAGE_OWNED_TOOL_IDLE_TIMEOUT";
-const WRAPPED = Symbol.for("ak.packageOwnedToolIdleWrapped");
-/**
- * Active outer package-owned execute idle, if any. Nested tool executes install
- * their own store; compliance audit only suspends the store visible at await time.
- */
-const packageOwnedToolIdleScope = new AsyncLocalStorage();
-export class PackageOwnedToolIdleTimeoutError extends Error {
-    code = PACKAGE_OWNED_TOOL_IDLE_TIMEOUT_CODE;
-    idleTimeoutMs = PACKAGE_OWNED_TOOL_IDLE_TIMEOUT_MS;
-    constructor() {
-        super(`package-owned tool idle timeout after ${PACKAGE_OWNED_TOOL_IDLE_TIMEOUT_MS}ms`);
-        this.name = "PackageOwnedToolIdleTimeoutError";
-    }
-}
-export function isPackageOwnedToolIdleTimeoutError(value) {
-    return (value instanceof PackageOwnedToolIdleTimeoutError ||
-        (typeof value === "object" &&
-            value !== null &&
-            value.name === "PackageOwnedToolIdleTimeoutError" &&
-            value.code === PACKAGE_OWNED_TOOL_IDLE_TIMEOUT_CODE));
-}
-/**
- * Package-tool activity includes content production and host-only details
- * progress. Keep the observation-plane oracle separate: its stderr heartbeat
- * contract remains content-driven. Pi's known execute-entry placeholder
- * (`content: [], details: undefined`) is not activity.
- */
-function isPackageOwnedToolActivityUpdate(partialResult) {
-    if (isProducingToolUpdate(partialResult))
-        return true;
-    if (typeof partialResult !== "object" || partialResult === null)
-        return false;
-    const details = partialResult.details;
-    if (details === undefined || details === null)
-        return false;
-    if (typeof details === "string")
-        return details.length > 0;
-    if (Array.isArray(details))
-        return details.length > 0;
-    if (typeof details === "object")
-        return Reflect.ownKeys(details).length > 0;
-    return true;
-}
-/**
- * #339: suspend the active package-owned execute idle for one real compliance
- * audit await. Single-layer only — production has one runComplianceAudit seam.
- * No-op outside a wrapped package-owned execute. No second timeout or retry.
- */
-export async function withPackageOwnedToolIdleSuspended(run) {
-    const scope = packageOwnedToolIdleScope.getStore();
-    if (scope === undefined)
-        return run();
-    scope.suspend();
-    try {
-        return await run();
-    }
-    finally {
-        scope.resume();
-    }
-}
-/**
- * Touch the active package-owned execute idle clock (reuse stream-idle-guard poke).
- * No-op outside a wrapped package-owned execute or while that layer is suspended.
- * Used by long-running tools (engine detour) that see real subprocess output bytes.
- */
-export function pokePackageOwnedToolIdle() {
-    packageOwnedToolIdleScope.getStore()?.poke();
-}
-/**
- * Single shared execute wrapper for package-owned tool definitions.
- * Idempotent: wrapping twice returns the same protected definition.
- */
-export function wrapPackageOwnedToolDefinition(tool) {
-    // Mark the execute function, not the tool object — callers may spread tool fields
-    // onto a new definition with a different execute (e.g. auditor customTools).
-    if (tool.execute[WRAPPED] === true)
-        return tool;
-    const originalExecute = tool.execute.bind(tool);
-    const wrappedExecute = function packageOwnedToolIdleExecute(...args) {
-        const parentSignal = args[2];
-        const onUpdate = args[3];
-        return new Promise((resolve, reject) => {
-            let settled = false;
-            let suspended = false;
-            let idle = createStreamIdleGuard({
-                idleTimeoutMs: PACKAGE_OWNED_TOOL_IDLE_TIMEOUT_MS,
-            });
-            // Derived tool signal: caller cancel forwards; idle aborts this only (not parent).
-            const toolController = new AbortController();
-            const onParentAbort = () => {
-                if (toolController.signal.aborted)
-                    return;
-                toolController.abort(parentSignal?.reason);
-            };
-            if (parentSignal !== undefined) {
-                if (parentSignal.aborted) {
-                    toolController.abort(parentSignal.reason);
-                }
-                else {
-                    parentSignal.addEventListener("abort", onParentAbort);
-                }
-            }
-            const cleanup = () => {
-                idle.signal.removeEventListener("abort", onIdle);
-                idle.dispose();
-                parentSignal?.removeEventListener("abort", onParentAbort);
-            };
-            const settle = (deliver) => {
-                if (settled)
-                    return;
-                settled = true;
-                cleanup();
-                deliver();
-            };
-            const onIdle = () => {
-                const idleError = new PackageOwnedToolIdleTimeoutError();
-                if (!toolController.signal.aborted) {
-                    toolController.abort(idleError);
-                }
-                // Cooperative tools (detour) soft-settle via the aborted signal in the
-                // next microtasks. Non-listeners still hard-reject after a short drain
-                // of those microtasks — no second wall-clock timer.
-                void Promise.resolve()
-                    .then(() => { })
-                    .then(() => { })
-                    .then(() => {
-                    settle(() => reject(idleError));
-                });
-            };
-            idle.signal.addEventListener("abort", onIdle, { once: true });
-            const suspension = {
-                suspend() {
-                    if (settled || suspended)
-                        return;
-                    suspended = true;
-                    // ADR 0059 owns the audit interval — drop this layer until audit returns.
-                    idle.signal.removeEventListener("abort", onIdle);
-                    idle.dispose();
-                },
-                resume() {
-                    if (settled || !suspended)
-                        return;
-                    suspended = false;
-                    // Fresh single-layer silence window for post-audit work (e.g. cleanup).
-                    idle = createStreamIdleGuard({
-                        idleTimeoutMs: PACKAGE_OWNED_TOOL_IDLE_TIMEOUT_MS,
-                    });
-                    idle.signal.addEventListener("abort", onIdle, { once: true });
-                },
-                poke() {
-                    if (settled || suspended)
-                        return;
-                    idle.poke();
-                },
-            };
-            const guardedOnUpdate = onUpdate === undefined
-                ? undefined
-                : (partialResult) => {
-                    if (settled)
-                        return;
-                    if (isPackageOwnedToolActivityUpdate(partialResult))
-                        idle.poke();
-                    onUpdate(partialResult);
-                };
-            const callArgs = args.slice();
-            // Pass derived signal so idle/cancel can clean up subprocesses without
-            // aborting the caller/parent agent signal identity.
-            callArgs[2] = toolController.signal;
-            callArgs[3] = guardedOnUpdate;
-            void packageOwnedToolIdleScope.run(suspension, async () => {
-                try {
-                    const result = await originalExecute(...callArgs);
-                    settle(() => resolve(result));
-                }
-                catch (error) {
-                    settle(() => reject(error));
-                }
-            });
-        });
-    };
-    wrappedExecute[WRAPPED] = true;
-    return {
-        ...tool,
-        execute: wrappedExecute,
-    };
-}
-/**
- * Install the shared registration surface on an ExtensionAPI once.
- * All subsequent pi.registerTool calls for package-owned tools are wrapped.
- */
-export function installPackageOwnedToolRegistration(pi) {
-    const current = pi.registerTool;
-    if (current[WRAPPED] === true)
-        return;
-    const original = current.bind(pi);
-    const installed = ((tool) => {
-        original(wrapPackageOwnedToolDefinition(tool));
-    });
-    installed[WRAPPED] = true;
-    pi.registerTool = installed;
-}

package/src/package-owned-tool-idle.ts

@@ -1,257 +0,0 @@
-/**
- * #102 package-owned tool idle backstop.
- *
- * Fixed 183000ms silence clock on package-owned tool execute only.
- * Real producing onUpdate resets; final resolve/reject clears; timeout throws so
- * Pi settles the current call as an LLM-visible isError tool result. No retry,
- * role failure, process termination, config, or Pi built-in coverage.
- *
- * #339: do not name-exempt whole terminating tools. Outer idle stays armed for
- * pre/post-audit work. Only the real compliance-audit await suspends this single
- * layer (ADR 0059 owns that interval); resume re-arms the same outer backstop.
- *
- * #380: on idle, abort a derived tool signal (not the caller signal) so detour
- * spawn cleanup and softFail can run through the existing AbortSignal path.
- * Cooperative soft-settle may win; non-listeners still hard-reject after a
- * microtask drain (no second timer).
- */
-import { AsyncLocalStorage } from "node:async_hooks";
-import type { ExtensionAPI, ToolDefinition } from "@earendil-works/pi-coding-agent";
-
-import {
-  DEFAULT_STREAM_IDLE_TIMEOUT_MS,
-  createStreamIdleGuard,
-  type StreamIdleGuard,
-} from "./stream-idle-guard.ts";
-import { isProducingToolUpdate } from "./tool-execution-observation.ts";
-
-export const PACKAGE_OWNED_TOOL_IDLE_TIMEOUT_MS = DEFAULT_STREAM_IDLE_TIMEOUT_MS;
-export const PACKAGE_OWNED_TOOL_IDLE_TIMEOUT_CODE = "AK_PACKAGE_OWNED_TOOL_IDLE_TIMEOUT" as const;
-
-const WRAPPED = Symbol.for("ak.packageOwnedToolIdleWrapped");
-
-type PackageOwnedToolIdleSuspension = {
-  suspend(): void;
-  resume(): void;
-  /** Reset the silence window (byte/activity signal from the active execute). */
-  poke(): void;
-};
-
-/**
- * Active outer package-owned execute idle, if any. Nested tool executes install
- * their own store; compliance audit only suspends the store visible at await time.
- */
-const packageOwnedToolIdleScope = new AsyncLocalStorage<PackageOwnedToolIdleSuspension>();
-
-export class PackageOwnedToolIdleTimeoutError extends Error {
-  readonly code = PACKAGE_OWNED_TOOL_IDLE_TIMEOUT_CODE;
-  readonly idleTimeoutMs = PACKAGE_OWNED_TOOL_IDLE_TIMEOUT_MS;
-
-  constructor() {
-    super(`package-owned tool idle timeout after ${PACKAGE_OWNED_TOOL_IDLE_TIMEOUT_MS}ms`);
-    this.name = "PackageOwnedToolIdleTimeoutError";
-  }
-}
-
-export function isPackageOwnedToolIdleTimeoutError(
-  value: unknown,
-): value is PackageOwnedToolIdleTimeoutError {
-  return (
-    value instanceof PackageOwnedToolIdleTimeoutError ||
-    (
-      typeof value === "object" &&
-      value !== null &&
-      (value as { name?: unknown }).name === "PackageOwnedToolIdleTimeoutError" &&
-      (value as { code?: unknown }).code === PACKAGE_OWNED_TOOL_IDLE_TIMEOUT_CODE
-    )
-  );
-}
-
-/** Minimal executable tool shape accepted by the shared idle wrapper. */
-export type PackageOwnedToolLike = {
-  readonly name: string;
-  execute: (...args: never[]) => Promise<unknown>;
-};
-
-/**
- * Package-tool activity includes content production and host-only details
- * progress. Keep the observation-plane oracle separate: its stderr heartbeat
- * contract remains content-driven. Pi's known execute-entry placeholder
- * (`content: [], details: undefined`) is not activity.
- */
-function isPackageOwnedToolActivityUpdate(partialResult: unknown): boolean {
-  if (isProducingToolUpdate(partialResult)) return true;
-  if (typeof partialResult !== "object" || partialResult === null) return false;
-  const details = (partialResult as { details?: unknown }).details;
-  if (details === undefined || details === null) return false;
-  if (typeof details === "string") return details.length > 0;
-  if (Array.isArray(details)) return details.length > 0;
-  if (typeof details === "object") return Reflect.ownKeys(details).length > 0;
-  return true;
-}
-
-/**
- * #339: suspend the active package-owned execute idle for one real compliance
- * audit await. Single-layer only — production has one runComplianceAudit seam.
- * No-op outside a wrapped package-owned execute. No second timeout or retry.
- */
-export async function withPackageOwnedToolIdleSuspended<T>(
-  run: () => Promise<T>,
-): Promise<T> {
-  const scope = packageOwnedToolIdleScope.getStore();
-  if (scope === undefined) return run();
-  scope.suspend();
-  try {
-    return await run();
-  } finally {
-    scope.resume();
-  }
-}
-
-/**
- * Touch the active package-owned execute idle clock (reuse stream-idle-guard poke).
- * No-op outside a wrapped package-owned execute or while that layer is suspended.
- * Used by long-running tools (engine detour) that see real subprocess output bytes.
- */
-export function pokePackageOwnedToolIdle(): void {
-  packageOwnedToolIdleScope.getStore()?.poke();
-}
-
-/**
- * Single shared execute wrapper for package-owned tool definitions.
- * Idempotent: wrapping twice returns the same protected definition.
- */
-export function wrapPackageOwnedToolDefinition<T extends PackageOwnedToolLike>(tool: T): T {
-  // Mark the execute function, not the tool object — callers may spread tool fields
-  // onto a new definition with a different execute (e.g. auditor customTools).
-  if ((tool.execute as { [WRAPPED]?: boolean })[WRAPPED] === true) return tool;
-
-  const originalExecute = tool.execute.bind(tool) as (
-    ...args: unknown[]
-  ) => Promise<unknown>;
-
-  const wrappedExecute = function packageOwnedToolIdleExecute(
-    ...args: unknown[]
-  ): Promise<unknown> {
-    const parentSignal = args[2] as AbortSignal | undefined;
-    const onUpdate = args[3] as ((partialResult: unknown) => void) | undefined;
-    return new Promise((resolve, reject) => {
-      let settled = false;
-      let suspended = false;
-      let idle: StreamIdleGuard = createStreamIdleGuard({
-        idleTimeoutMs: PACKAGE_OWNED_TOOL_IDLE_TIMEOUT_MS,
-      });
-
-      // Derived tool signal: caller cancel forwards; idle aborts this only (not parent).
-      const toolController = new AbortController();
-      const onParentAbort = (): void => {
-        if (toolController.signal.aborted) return;
-        toolController.abort(parentSignal?.reason);
-      };
-      if (parentSignal !== undefined) {
-        if (parentSignal.aborted) {
-          toolController.abort(parentSignal.reason);
-        } else {
-          parentSignal.addEventListener("abort", onParentAbort);
-        }
-      }
-
-      const cleanup = (): void => {
-        idle.signal.removeEventListener("abort", onIdle);
-        idle.dispose();
-        parentSignal?.removeEventListener("abort", onParentAbort);
-      };
-
-      const settle = (deliver: () => void): void => {
-        if (settled) return;
-        settled = true;
-        cleanup();
-        deliver();
-      };
-      const onIdle = (): void => {
-        const idleError = new PackageOwnedToolIdleTimeoutError();
-        if (!toolController.signal.aborted) {
-          toolController.abort(idleError);
-        }
-        // Cooperative tools (detour) soft-settle via the aborted signal in the
-        // next microtasks. Non-listeners still hard-reject after a short drain
-        // of those microtasks — no second wall-clock timer.
-        void Promise.resolve()
-          .then(() => {})
-          .then(() => {})
-          .then(() => {
-            settle(() => reject(idleError));
-          });
-      };
-      idle.signal.addEventListener("abort", onIdle, { once: true });
-
-      const suspension: PackageOwnedToolIdleSuspension = {
-        suspend(): void {
-          if (settled || suspended) return;
-          suspended = true;
-          // ADR 0059 owns the audit interval — drop this layer until audit returns.
-          idle.signal.removeEventListener("abort", onIdle);
-          idle.dispose();
-        },
-        resume(): void {
-          if (settled || !suspended) return;
-          suspended = false;
-          // Fresh single-layer silence window for post-audit work (e.g. cleanup).
-          idle = createStreamIdleGuard({
-            idleTimeoutMs: PACKAGE_OWNED_TOOL_IDLE_TIMEOUT_MS,
-          });
-          idle.signal.addEventListener("abort", onIdle, { once: true });
-        },
-        poke(): void {
-          if (settled || suspended) return;
-          idle.poke();
-        },
-      };
-
-      const guardedOnUpdate = onUpdate === undefined
-        ? undefined
-        : (partialResult: unknown) => {
-            if (settled) return;
-            if (isPackageOwnedToolActivityUpdate(partialResult)) idle.poke();
-            onUpdate(partialResult);
-          };
-
-      const callArgs = args.slice();
-      // Pass derived signal so idle/cancel can clean up subprocesses without
-      // aborting the caller/parent agent signal identity.
-      callArgs[2] = toolController.signal;
-      callArgs[3] = guardedOnUpdate;
-
-      void packageOwnedToolIdleScope.run(suspension, async () => {
-        try {
-          const result = await originalExecute(...callArgs);
-          settle(() => resolve(result));
-        } catch (error) {
-          settle(() => reject(error));
-        }
-      });
-    });
-  };
-  (wrappedExecute as { [WRAPPED]?: boolean })[WRAPPED] = true;
-
-  return {
-    ...tool,
-    execute: wrappedExecute as T["execute"],
-  };
-}
-
-/**
- * Install the shared registration surface on an ExtensionAPI once.
- * All subsequent pi.registerTool calls for package-owned tools are wrapped.
- */
-export function installPackageOwnedToolRegistration(pi: ExtensionAPI): void {
-  const current = pi.registerTool;
-  if ((current as { [WRAPPED]?: boolean })[WRAPPED] === true) return;
-
-  const original = current.bind(pi);
-  const installed = ((tool: ToolDefinition<any, any, any>) => {
-    original(wrapPackageOwnedToolDefinition(tool) as ToolDefinition<any, any, any>);
-  }) as typeof pi.registerTool;
-  (installed as { [WRAPPED]?: boolean })[WRAPPED] = true;
-  pi.registerTool = installed;
-}