@akagilnc/pi-workflow-roles 0.1.5216 → 0.1.5241

package/dist/public-cli/post-admission.js

@@ -18,7 +18,6 @@ import { pickEngineAxis } from "../package-resources/engine-material.js";
 import { readStoredHostSessionId, resolveHostAwareSessionAvailability, } from "../session-identity.js";
 import { rewriteRunDirectoryPathValue } from "../role-run-relocation.js";
 import { isOfficerReviewSeat } from "../packaged-role-registry.js";
-import { deliverCaseDossierAsAttachment } from "./case-dossier-delivery.js";
 /** Original error bytes, never relabeled — a secondary fact riding beside a classified cause. */
 function describeCaughtError(error) {
     if (error instanceof Error) {
@@ -29,17 +28,17 @@ function describeCaughtError(error) {
 }
 /**
  * Nested gate summons (station child) on an officer seat: dialogue content is
- * peer words only (#879). ADR 0081 case dossier still hangs via the existing
- * attachments freeze seam — never into the peer body, never RoleTurnRequest.materials.
+ * peer words only (#879). Never RoleTurnRequest.materials; #1092 drops code-side
+ * 起居录 path pointer freeze — roles locate records by ticket number.
  */
 function isStationChildOfficerDialogue(role, env) {
     return env.stationChild === true && isOfficerReviewSeat(role);
 }
-import { mintEngineDetourInvocationScope, readInvocationSelectedHost, withEngineDetourInvocationScope, } from "../engine-detour-usage.js";
-import { projectHostTransitionPriorNative } from "../host-transition-prior-native.js";
+import { mintEngineDetourInvocationScope, withEngineDetourInvocationScope, } from "../engine-detour-usage.js";
 import { clearCurrentCourt, clearTypedProviderHttpObservation, describeErrorIdentity, markRunRunning, readCurrentCourt, recordCurrentCourt, renderResumeCommand, } from "./run-lifecycle.js";
 import { processCancelDiagnostic, processCancelSignalName, } from "./process-cancel.js";
 import { homeFromRunDirectory } from "../activation-ledger-topology.js";
+import { recordRunStart } from "../host-session-record.js";
 import { attemptProducedFreshSubmission, classifyPostAdmissionFailure, controlledFailureInputFromResolution, exitCodeForTerminalOutcome, explicitInternalKnownFailureClassificationInput, formatCliDiagnostic, formatErrorCauseDetail, formatTerminalResult, inspectJudgeSession, isLawfulTypedTerminalOutcome, presentFailureTerminal, publishedFailureErrorPath, presentStructuralRejection, resolveAuditedRunnerFailureResolution, resolveControlledFailureResumeObservation, settleFailureTerminalResult, settleHostEndedNoReceipt, attachRecordedSubmissions, rewritePublishedFailureErrorPath, } from "./settlement.js";
 import {} from "./terminal.js";
 import { ensureRealArtifactsDirectory, persistReturnedRunState, runWithAutoResumeLoop, TurnDispatchedFailure, } from "./auto-resume.js";
@@ -407,45 +406,11 @@ export async function dispatchPostAdmissionTurn(input) {
     try {
         // #987: do not pre-block or classify host dispatch from AK credential
         // catalog facts. Per-invocation runner/host evidence owns provider identity.
-        // #617 DK-4: capture previous invocation host before markRunRunning overwrites it.
-        // Single authority projectHostTransitionPriorNative classifies the prior native volume.
-        // Same-run resume (#637) keeps host identity on the run's invocation page.
-        let previousHost;
-        const liveHost = env.host;
-        const principalCoordinates = admitted.principal === undefined
-            ? undefined
-            : env.principalAuthority.decode(admitted.principal);
-        let hostTransition;
-        try {
-            previousHost = readInvocationSelectedHost(admitted.runDirectory);
-            hostTransition =
-                previousHost !== undefined && liveHost !== undefined && principalCoordinates !== undefined
-                    ? await projectHostTransitionPriorNative({
-                        previousHost,
-                        liveHost,
-                        piSessionFile: principalCoordinates.sessionFile,
-                    })
-                    : undefined;
-        }
-        catch (error) {
-            // prior-native IO is on the public one-shot path — controlled failure, not bare throw.
-            return {
-                ...(await presentControlledFailure(admitted, withEngineDetourInvocationScope({
-                    timedOut: false,
-                    code: null,
-                    stderr: "",
-                    thrown: error,
-                }, request.invocationScopeId), adapters, env.principalAuthority, io, persistRunState)),
-                ...deferredPersist,
-            };
-        }
         await clearTypedProviderHttpObservation(admitted.runDirectory);
         // The authoritative host write (markRunRunning) is delayed to just before
         // executeTurn — not merely past beforeDispatch (#840 r9 判词 class 2). Any
-        // pre-turn retry (beforeDispatch, dossier projection, continuation
-        // assembly) must still see the prior invocation host on its next attempt;
-        // committing env.host earlier would make readInvocationSelectedHost read back the
-        // new host on the retry and silently drop hostTransition.
+        // pre-turn retry (beforeDispatch, continuation assembly) must not commit a host
+        // identity until the turn is ready.
         // Failures settle the run (presentControlledFailure); they must not leave it
         // permanently running. Call-local auto-resume retries this hook until it
         // succeeds; only an exhausted nested station child skips the parent loop
@@ -472,10 +437,8 @@ export async function dispatchPostAdmissionTurn(input) {
         }
         // Turn request is assembled after beforeDispatch so this turn sees whatever it
         // settled — the seat's ticket bind re-projection and any court diarist station
-        // writes (#742). Case dossier delivery (ADR 0081 / #709 / #858) rides here once
-        // for every public entry on the existing attachments → readingMaterial face
-        // (station-child and ordinary share one seam). Dialogue continuation stays
-        // caller/peer opaque — never splice system path sections into user dialogue.
+        // writes (#742). Dialogue continuation stays caller/peer opaque. #1092: no
+        // code-side 起居录 path freeze or readingMaterial inject — roles read by ticket.
         // No package-resume parallel face or typed resume identity.
         // #990: one-shot / auto-resume may freeze principal+runDirectory before
         // relocate; always take durable identity from the live admitted object.
@@ -487,24 +450,11 @@ export async function dispatchPostAdmissionTurn(input) {
         if (env.stationChild !== undefined) {
             turnRequest = { ...turnRequest, stationChild: env.stationChild };
         }
-        if (hostTransition !== undefined) {
-            turnRequest = { ...turnRequest, hostTransition };
-        }
         // Selected host axis rides the shared Host envelope for in-turn tools
         // (detour usage ledger) — never a pre-spawn invocation.json reread.
-        if (typeof liveHost === "string" && liveHost.trim() !== "") {
-            turnRequest = { ...turnRequest, host: liveHost.trim() };
+        if (typeof env.host === "string" && env.host.trim() !== "") {
+            turnRequest = { ...turnRequest, host: env.host.trim() };
         }
-        // 0081 non-dialogue face: freeze pointer section under run/attachments/.
-        // Seat consumes via loadCaseDossierReadingMaterial → existing agent-start
-        // readingMaterial / systemPrompt.materials fold. Caller instruction, empty
-        // request, and resume --message stay verbatim.
-        await deliverCaseDossierAsAttachment({
-            ticketNumber: admitted.ticketNumber,
-            projectRoot: admitted.projectRoot,
-            home: env.home,
-            runDirectory: admitted.runDirectory,
-        });
         // Authoritative host write happens here, at the real dispatch boundary —
         // immediately before the turn actually starts, after every retryable
         // pre-turn step above has succeeded on this attempt (#840 r9 判词 class 2).
@@ -514,6 +464,7 @@ export async function dispatchPostAdmissionTurn(input) {
         // auto-resume re-enters this dispatch and must reuse the same scope.
         let result;
         try {
+            recordRunStart(admitted.runDirectory);
             result = await env.roleTurnHost.executeTurn(turnRequest);
         }
         catch (error) {

package/dist/sitian-appender.js

@@ -1,11 +1,5 @@
-import { createHash, randomUUID } from "node:crypto";
-import {
-  appendFileSync,
-  existsSync,
-  readFileSync,
-  unlinkSync,
-  writeFileSync
-} from "node:fs";
+import { randomUUID } from "node:crypto";
+import { appendFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { resolveBookKeyFromGit } from "./activation-ledger-git.js";
 import {
@@ -19,48 +13,12 @@ import {
 import {
   SitianInfrastructureError
 } from "./sitian-contracts.js";
-function isRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function errorCodeOf(error) {
-  return error.code;
-}
-function identityClaimPath(recordFile, identity) {
-  const digest = createHash("sha256").update(identity, "utf8").digest("hex");
-  return `${recordFile}.id-${digest}`;
-}
-function createExclusiveFile(path, contents) {
-  writeFileSync(path, contents, { encoding: "utf8", flag: "wx" });
-}
-function sealTornTail(recordFile) {
-  if (!existsSync(recordFile)) return;
-  const buffer = readFileSync(recordFile);
-  if (buffer.length > 0 && buffer[buffer.length - 1] !== 10) {
-    appendFileSync(recordFile, "\n", "utf8");
-  }
-}
 function appendSitianRecordBlock(input, block) {
   if (block === "") return;
   try {
     const { sessionDir, recordFile, ledgerHome } = resolveSitianRecordPath(input);
     ensureRealDirectoryTree(ledgerHome, sessionDir);
-    appendFileSync(recordFile, "", "utf8");
-    sealTornTail(recordFile);
-    const identityOf = (line) => {
-      try {
-        const row = JSON.parse(line);
-        return isRecord(row) && typeof row.identity === "string" ? row.identity : void 0;
-      } catch {
-        return void 0;
-      }
-    };
-    const identities = new Set(readFileSync(recordFile, "utf8").split("\n").map(identityOf).filter((id) => id !== void 0));
-    for (const line of block.match(/[^\n]*\n|[^\n]+$/g) ?? []) {
-      const identity = identityOf(line);
-      if (identity !== void 0 && identities.has(identity)) continue;
-      appendFileSync(recordFile, line, "utf8");
-      if (identity !== void 0) identities.add(identity);
-    }
+    appendFileSync(recordFile, block, "utf8");
   } catch (error) {
     if (error instanceof SitianInfrastructureError) throw error;
     throw new SitianInfrastructureError(
@@ -69,106 +27,6 @@ function appendSitianRecordBlock(input, block) {
     );
   }
 }
-function findIdentityPointer(recordFile, identity, kind, level) {
-  if (!existsSync(recordFile)) return void 0;
-  const text = readFileSync(recordFile, "utf8");
-  for (const line of text.split("\n")) {
-    const trimmed = line.trim();
-    if (!trimmed) continue;
-    try {
-      const parsed = JSON.parse(trimmed);
-      if (isRecord(parsed) && parsed.identity === identity) {
-        return { identity, recordFile, kind, level };
-      }
-    } catch {
-    }
-  }
-  return void 0;
-}
-function unlinkAbsentOk(path) {
-  try {
-    unlinkSync(path);
-    return void 0;
-  } catch (error) {
-    if (errorCodeOf(error) === "ENOENT") return void 0;
-    return error instanceof Error ? error : new Error(errorText(error));
-  }
-}
-function appendWithIdentityClaim(recordFile, record, row) {
-  sealTornTail(recordFile);
-  const claimPath = identityClaimPath(recordFile, record.identity);
-  const existing = findIdentityPointer(
-    recordFile,
-    record.identity,
-    record.kind,
-    record.level
-  );
-  if (existing !== void 0) {
-    unlinkAbsentOk(claimPath);
-    return existing;
-  }
-  try {
-    createExclusiveFile(claimPath, "");
-  } catch (error) {
-    if (errorCodeOf(error) !== "EEXIST") throw error;
-    sealTornTail(recordFile);
-    const published = findIdentityPointer(
-      recordFile,
-      record.identity,
-      record.kind,
-      record.level
-    );
-    if (published !== void 0) {
-      unlinkAbsentOk(claimPath);
-      return published;
-    }
-    throw new SitianInfrastructureError(
-      `Sitian identity claim at ${claimPath} already exists for identity ${record.identity}`,
-      { cause: error }
-    );
-  }
-  let primaryFailure;
-  let result;
-  let cleanupFailure;
-  try {
-    sealTornTail(recordFile);
-    const raced = findIdentityPointer(
-      recordFile,
-      record.identity,
-      record.kind,
-      record.level
-    );
-    if (raced !== void 0) {
-      result = raced;
-    } else {
-      appendFileSync(recordFile, row, "utf8");
-      result = {
-        identity: record.identity,
-        recordFile,
-        kind: record.kind,
-        level: record.level
-      };
-    }
-  } catch (error) {
-    primaryFailure = error;
-  } finally {
-    cleanupFailure = unlinkAbsentOk(claimPath);
-  }
-  if (primaryFailure !== void 0) {
-    if (primaryFailure instanceof SitianInfrastructureError) throw primaryFailure;
-    throw new SitianInfrastructureError(
-      `Sitian appender persistence failure: ${errorText(primaryFailure)}`,
-      { cause: primaryFailure }
-    );
-  }
-  if (cleanupFailure !== void 0) {
-    throw new SitianInfrastructureError(
-      `Sitian identity claim at ${claimPath} could not be released after append for identity ${record.identity}: ${errorText(cleanupFailure)}`,
-      { cause: cleanupFailure }
-    );
-  }
-  return result;
-}
 const S4_SUBMISSION_LEDGER_KINDS = /* @__PURE__ */ new Set([
   "candidate",
   "roundContext",
@@ -215,14 +73,6 @@ function resolveSitianRecordPathInLedger(input, ledgerHome) {
   }
   return { sessionDir, recordFile, ledgerHome };
 }
-function projectTicketRecordsPathShape() {
-  const { recordFile } = ticketProvenanceUnderBookPaths(
-    join("~", ".ak-roles"),
-    "<\u7C3F>",
-    "<\u7968\u53F7>"
-  );
-  return recordFile.replace(/\\/g, "/");
-}
 function resolveSitianRecordPath(input) {
   const ledgerHome = input.home !== void 0 && input.home.length > 0 ? resolveActivationLedgerHome(input.home) : resolveActivationLedgerHomeForPath(input.runDirectory ?? input.sessionParent);
   return resolveSitianRecordPathInLedger(input, ledgerHome);
@@ -249,7 +99,13 @@ function appendSitianRecord(input) {
     };
     const row = `${JSON.stringify(record)}
 `;
-    return appendWithIdentityClaim(recordFile, record, row);
+    appendFileSync(recordFile, row, "utf8");
+    return {
+      identity: record.identity,
+      recordFile,
+      kind: record.kind,
+      level: record.level
+    };
   } catch (error) {
     if (error instanceof SitianInfrastructureError) throw error;
     throw new SitianInfrastructureError(
@@ -262,7 +118,6 @@ export {
   S4_SUBMISSION_LEDGER_KINDS,
   appendSitianRecord,
   appendSitianRecordBlock,
-  projectTicketRecordsPathShape,
   resolveSitianRecordPath,
   resolveSitianRecordPathInLedger,
   resolveSitianVolumeCategory

package/package.json

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

package/src/acp-host/role-turn-host.ts

@@ -1,3 +1,4 @@
+import { join } from "node:path";
 import { spawn } from "node:child_process";
 import { createInterface } from "node:readline";
 
@@ -8,7 +9,10 @@ import {
   raceAgainstHostAbort,
 } from "../external-host-turn-loop.ts";
 
-import { reportHostSessionEvent } from "../host-session-record.ts";
+import {
+  copyAndRecordHostDossier,
+  recordNativeSessionPointer,
+} from "../host-session-record.ts";
 import {
   NAVIGATOR_OUTPUT_TOOL_NAME,
   navigatorProseFromUnknown,
@@ -20,30 +24,6 @@ import {
 } from "../prepared-role-turn.ts";
 import { acpModelId, type AcpHostDescription } from "./description.ts";
 
-/** #971: authorized host for usage + auto_compact ledgering only. */
-const GROK_BUILD_HOST = "grok-build";
-
-/** #971: grok-build prompt result carries host usage under `_meta.usage`. */
-function acpPromptResultHasUsage(result: Readonly<Record<string, unknown>>): boolean {
-  const meta = result._meta;
-  if (typeof meta !== "object" || meta === null || Array.isArray(meta)) return false;
-  return Object.prototype.hasOwnProperty.call(meta, "usage");
-}
-
-/**
- * #971: ledger only the authorized vendor compaction notice on grok-build.
- * Other `_x.ai/*` notifications stay out of host-session records.
- */
-function isAcpAutoCompactCompletedNotification(
-  method: string,
-  params: Readonly<Record<string, unknown>>,
-): boolean {
-  if (method !== "_x.ai/session_notification") return false;
-  const update = params.update;
-  if (typeof update !== "object" || update === null || Array.isArray(update)) return false;
-  return (update as { sessionUpdate?: unknown }).sessionUpdate === "auto_compact_completed";
-}
-
 /**
  * #959: collect free-form agent text from ACP session/update stream.
  * Used only when the navigator seat spoke prose without calling the output tool.
@@ -278,7 +258,9 @@ export function createAcpRoleTurnHost(config: AcpRoleTurnHostConfig): RoleTurnHo
     const systemPromptOverride = renderSystemPromptOverride(prepared.systemPrompt);
     let connection: AcpConnection | undefined;
     let sessionId: string | undefined;
+    let sessionOpened = false;
     let accepted = false;
+    const sessionParent = config.sessionIdentity.resolveSessionFile(request.principal);
     // Mutable so dispose failure can outrank a clean turn (headless withCleanupFailure face).
     let outcome: RoleTurnResult = failure("session", "AcpNoOutcome", "no-outcome");
     try {
@@ -286,66 +268,26 @@ export function createAcpRoleTurnHost(config: AcpRoleTurnHostConfig): RoleTurnHo
         outcome = failure("activation", "UncontrolledAcpSession", "ak-config-missing");
       } else {
       connection = await config.connect(request);
-      // Live host-session records: ACP session/update → sitian sole entry (#811).
-      // One abort + one race helper + one outer projection — write failure ends
-      // any in-flight RPC as typed session infrastructure failure.
-      const sessionParent = config.sessionIdentity.resolveSessionFile(request.principal);
-      const recordAbort = new AbortController();
-      let hostSessionRecordFailure: RoleTurnKnownFailure | undefined;
-      const hostSessionRecordResult = (): RoleTurnResult => ({
-        code: null,
-        stderr: "",
-        timedOut: false,
-        knownFailure: hostSessionRecordFailure!,
-      });
-      const noteHostSessionRecordFailure = (error: unknown): void => {
-        if (hostSessionRecordFailure !== undefined) return;
-        hostSessionRecordFailure = {
-          cause: "session",
-          identity: { name: "HostSessionRecordFailure", code: "host-session-record-failed" },
-          diagnostic: error instanceof Error ? error.message : String(error),
-        };
-        try { recordAbort.abort(); } catch { /* already aborted */ }
-      };
       const rpc = (
         method: string,
         params: Readonly<Record<string, unknown>>,
-      ): Promise<Readonly<Record<string, unknown>>> =>
-        raceAgainstHostAbort(connection!.request(method, params), recordAbort.signal, "host-session-record-failed");
+      ): Promise<Readonly<Record<string, unknown>>> => connection!.request(method, params);
 
       // #959: navigator free-form agent text — only while session/prompt is in flight.
       // session/load replays history via session/update; those must not enter the bucket
       // (resume / set_model load would otherwise prepend prior turns as "this turn" prose).
       const agentProseChunks: string[] = [];
       let collectAgentProse = false;
-      // #971: usage + auto_compact are grok-build-only; same ACP adapter serves Hermes too.
-      const ledgerGrokBuildObservability = config.hostName === GROK_BUILD_HOST;
       connection.onNotification?.((method, params) => {
-        if (hostSessionRecordFailure !== undefined) return;
         const isSessionUpdate = method === "session/update";
-        const isAutoCompact = ledgerGrokBuildObservability
-          && isAcpAutoCompactCompletedNotification(method, params);
-        // #971: session/update stays; auto_compact_completed is the only vendor notice.
-        if (!isSessionUpdate && !isAutoCompact) return;
-        if (isSessionUpdate && collectAgentProse) {
+        if (!isSessionUpdate) return;
+        if (collectAgentProse) {
           const chunk = acpAgentTextChunk(params);
           if (chunk !== undefined) agentProseChunks.push(chunk);
         }
-        try {
-          reportHostSessionEvent({
-            host: config.hostName,
-            cwd: request.cwd,
-            sessionParent,
-            source: "acp-host",
-            event: { method, params },
-          });
-        } catch (error) {
-          noteHostSessionRecordFailure(error);
-        }
       });
 
-      try {
-        const initialized = await rpc("initialize", {
+      const initialized = await rpc("initialize", {
           protocolVersion: 1,
           clientCapabilities: {},
         });
@@ -374,9 +316,13 @@ export function createAcpRoleTurnHost(config: AcpRoleTurnHostConfig): RoleTurnHo
             sessionId: bindSessionId,
             ...sessionBindParams,
           });
-          return typeof loaded.sessionId === "string" && loaded.sessionId !== ""
+          const loadedId = typeof loaded.sessionId === "string" && loaded.sessionId !== ""
             ? loaded.sessionId
             : bindSessionId;
+          if (config.hostName !== "hermes") recordNativeSessionPointer({
+            host: config.hostName, sessionId: loadedId, cwd: request.cwd, sessionParent, home: request.home,
+          });
+          return loadedId;
         };
         if (request.continuation.kind === "resume" && config.boundResume === "session/load") {
           const explicitHostSessionId = request.continuation.hostSessionId;
@@ -384,7 +330,9 @@ export function createAcpRoleTurnHost(config: AcpRoleTurnHostConfig): RoleTurnHo
             ? explicitHostSessionId
             : await config.sessionIdentity.load(request.principal);
           if (boundSessionId !== undefined && boundSessionId !== "") {
+            sessionId = boundSessionId;
             sessionId = await loadSession(boundSessionId);
+            sessionOpened = true;
           }
         }
         let sessionReady = true;
@@ -395,6 +343,10 @@ export function createAcpRoleTurnHost(config: AcpRoleTurnHostConfig): RoleTurnHo
             outcome = failure("session", "AcpSessionFailure", "session-id-missing");
             sessionReady = false;
           } else {
+            if (config.hostName !== "hermes") recordNativeSessionPointer({
+              host: config.hostName, sessionId, cwd: request.cwd, sessionParent, home: request.home,
+            });
+            sessionOpened = true;
             await config.sessionIdentity.bind(request.principal, sessionId);
           }
         }
@@ -415,12 +367,6 @@ export function createAcpRoleTurnHost(config: AcpRoleTurnHostConfig): RoleTurnHo
           roundLimitName: "AcpRoundLimit",
           currentSessionId: () => sessionId,
           async runRound({ prompt, abortSignal }) {
-            if (hostSessionRecordFailure !== undefined) return { status: "terminal", result: hostSessionRecordResult() };
-            // Envelope infra abort, parent cancellation (#675), and host-session
-            // record abort (#811) share one race face for in-flight prompt.
-            const abortParts: AbortSignal[] = [recordAbort.signal];
-            if (abortSignal !== undefined) abortParts.push(abortSignal);
-            const combinedAbort = AbortSignal.any(abortParts);
             let result: Readonly<Record<string, unknown>>;
             // Open the prose gate only for this prompt round; clear any stale chunks first.
             agentProseChunks.length = 0;
@@ -431,36 +377,15 @@ export function createAcpRoleTurnHost(config: AcpRoleTurnHostConfig): RoleTurnHo
                   sessionId: activeSessionId,
                   prompt: [{ type: "text", text: prompt }],
                 }),
-                combinedAbort,
+                abortSignal,
                 "ACP host aborted",
               );
             } catch (error) {
               collectAgentProse = false;
               agentProseChunks.length = 0;
-              if (hostSessionRecordFailure !== undefined) {
-                return { status: "terminal", result: hostSessionRecordResult() };
-              }
               throw error;
             }
             collectAgentProse = false;
-            // #971: per-round grok-build usage is on the prompt JSON-RPC result, not a notice.
-            if (ledgerGrokBuildObservability && acpPromptResultHasUsage(result)) {
-              try {
-                reportHostSessionEvent({
-                  host: config.hostName,
-                  cwd: request.cwd,
-                  sessionParent,
-                  source: "acp-host",
-                  event: { method: "session/prompt", result },
-                });
-              } catch (error) {
-                noteHostSessionRecordFailure(error);
-                return { status: "terminal", result: hostSessionRecordResult() };
-              }
-            }
-            if (hostSessionRecordFailure !== undefined) {
-              return { status: "terminal", result: hostSessionRecordResult() };
-            }
             if (result.stopReason === "refusal") {
               agentProseChunks.length = 0;
               return {
@@ -487,18 +412,9 @@ export function createAcpRoleTurnHost(config: AcpRoleTurnHostConfig): RoleTurnHo
             accepted = true;
           },
         });
-        outcome = hostSessionRecordFailure !== undefined ? hostSessionRecordResult() : turnResult;
+        outcome = turnResult;
         } // sessionReady
         } // model match else
-      } catch (error) {
-        // recordAbort races setup RPCs via raceAgainstHostAbort (host-aborted code);
-        // noteHostSessionRecordFailure always sets the typed failure before aborting.
-        if (hostSessionRecordFailure !== undefined) {
-          outcome = hostSessionRecordResult();
-        } else {
-          throw error;
-        }
-      }
       } // mcpServers else
     } finally {
       if (connection !== undefined) {
@@ -509,6 +425,18 @@ export function createAcpRoleTurnHost(config: AcpRoleTurnHostConfig): RoleTurnHo
         try { await connection.close(); }
         catch { /* keep turn result */ }
       }
+      if (config.hostName !== "hermes" && sessionOpened && sessionId !== undefined) {
+        copyAndRecordHostDossier({
+          host: config.hostName,
+          sessionId,
+          cwd: request.cwd,
+          sessionDirectory: join(request.runDirectory, "session"),
+          sessionParent,
+          continuation: request.continuation,
+          ...(request.model !== undefined ? { model: request.model } : {}),
+          ...(request.home !== undefined ? { home: request.home } : {}),
+        });
+      }
       try {
         await prepared.dispose?.();
       } catch (cleanupError) {

package/src/engine-detour-usage.ts

@@ -222,7 +222,7 @@ export async function readEngineDetourToolUsage(input: {
   });
 
   const { records } = await readSitianRecords(recordFile);
-  const calls: EngineDetourCallFact[] = [];
+  const callsByToolCallId = new Map<string, EngineDetourCallFact>();
   for (const record of records) {
     if (record.kind !== ENGINE_DETOUR_CALL_KIND) continue;
     const boundScope = invocationScopeIdOfRecord(record);
@@ -240,9 +240,11 @@ export async function readEngineDetourToolUsage(input: {
     };
     const fact = callFactFromSitianPayload(record.payload, pointer);
     if (fact === undefined) continue;
-    calls.push(fact);
+    // ADR 0086: Reader deduplicates by toolCallId within the invocation scope
+    callsByToolCallId.set(fact.toolCallId, fact);
   }
 
+  const calls = Array.from(callsByToolCallId.values());
   return { callCount: calls.length, calls };
 }
 
@@ -300,20 +302,6 @@ export async function readInvocationEngineMounted(
   return typeof raw.engine === "string" && raw.engine.trim() !== "";
 }
 
-/**
- * Selected host from the admission invocation page — for post-admission
- * host-transition classification only. In-turn tools take host from the shared
- * Host envelope (RoleTurnRequest / HostContext), never this reader.
- * Undefined when absent — callers must not invent "pi".
- */
-export function readInvocationSelectedHost(runDirectory: string): string | undefined {
-  const raw = readInvocationRecord(runDirectory);
-  if (raw === undefined) return undefined;
-  return typeof raw.host === "string" && raw.host.trim() !== ""
-    ? raw.host.trim()
-    : undefined;
-}
-
 /** Merge usage into decisiveFacts without touching role payloads. */
 export function withEngineDetourToolUsageFact<
   T extends { readonly decisiveFacts?: Readonly<Record<string, unknown>> },