@paperclipai/adapter-utils 2026.1005.0 → 2026.1006.0-beta.0

package/README.md

@@ -9,6 +9,19 @@ For the adapter-author guide see
 [`docs/adapters/creating-an-adapter.md`](../../docs/adapters/creating-an-adapter.md)
 and the in-repo notes at [`packages/adapters/AUTHORING.md`](../adapters/AUTHORING.md).
 
+## Sandbox bridge deadlines
+
+Command-managed bridge control operations (queue reads, input delivery, setup,
+and cleanup) have a host-enforced deadline of at most 30 seconds per shell
+command. A shorter configured timeout still applies. These operations cannot
+inherit the agent run's hours-long lifetime or wait forever on a provider that
+ignores its timeout. Long-lived agent session commands keep their own limits.
+
+A control timeout reports a transport failure. It does not prove that the
+remote command stopped and does not replay an uncertain write. The process
+session closes failed input delivery and uses its existing shutdown path;
+normal execution settlement must still verify termination.
+
 ## No-remote-git contract
 
 The local execution-workspace cwd is the only persistence boundary across

package/dist/acpx-engine/ephemeral-session-environment.d.ts

@@ -0,0 +1,4 @@
+import type { AcpSessionStore } from "acpx/runtime";
+/** Keep the current run's environment in memory, outside persisted conversation state. */
+export declare function createEphemeralSessionEnvironmentStore(persistedStore: AcpSessionStore, currentEnvironment: Readonly<Record<string, string>>): AcpSessionStore;
+//# sourceMappingURL=ephemeral-session-environment.d.ts.map

package/dist/acpx-engine/ephemeral-session-environment.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ephemeral-session-environment.d.ts","sourceRoot":"","sources":["../../src/acpx-engine/ephemeral-session-environment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,0FAA0F;AAC1F,wBAAgB,sCAAsC,CACpD,cAAc,EAAE,eAAe,EAC/B,kBAAkB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GACnD,eAAe,CAyBjB"}

package/dist/acpx-engine/ephemeral-session-environment.js

@@ -0,0 +1,29 @@
+/** Keep the current run's environment in memory, outside persisted conversation state. */
+export function createEphemeralSessionEnvironmentStore(persistedStore, currentEnvironment) {
+    return {
+        async load(id) {
+            const record = await persistedStore.load(id);
+            if (!record)
+                return undefined;
+            return {
+                ...record,
+                acpx: {
+                    ...record.acpx,
+                    session_options: {
+                        ...record.acpx?.session_options,
+                        env: { ...currentEnvironment },
+                    },
+                },
+            };
+        },
+        save(record) {
+            const persisted = { ...record };
+            if (record.acpx?.session_options !== undefined) {
+                const { env: _environment, ...sessionOptions } = record.acpx.session_options;
+                persisted.acpx = { ...record.acpx, session_options: sessionOptions };
+            }
+            return persistedStore.save(persisted);
+        },
+    };
+}
+//# sourceMappingURL=ephemeral-session-environment.js.map

package/dist/acpx-engine/ephemeral-session-environment.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ephemeral-session-environment.js","sourceRoot":"","sources":["../../src/acpx-engine/ephemeral-session-environment.ts"],"names":[],"mappings":"AAEA,0FAA0F;AAC1F,MAAM,UAAU,sCAAsC,CACpD,cAA+B,EAC/B,kBAAoD;IAEpD,OAAO;QACL,KAAK,CAAC,IAAI,CAAC,EAAE;YACX,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM;gBAAE,OAAO,SAAS,CAAC;YAC9B,OAAO;gBACL,GAAG,MAAM;gBACT,IAAI,EAAE;oBACJ,GAAG,MAAM,CAAC,IAAI;oBACd,eAAe,EAAE;wBACf,GAAG,MAAM,CAAC,IAAI,EAAE,eAAe;wBAC/B,GAAG,EAAE,EAAE,GAAG,kBAAkB,EAAE;qBAC/B;iBACF;aACF,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,MAAM;YACT,MAAM,SAAS,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;YAChC,IAAI,MAAM,CAAC,IAAI,EAAE,eAAe,KAAK,SAAS,EAAE,CAAC;gBAC/C,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,cAAc,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC;gBAC7E,SAAS,CAAC,IAAI,GAAG,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC;YACvE,CAAC;YACD,OAAO,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxC,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/acpx-engine/ephemeral-session-environment.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ephemeral-session-environment.test.d.ts.map

package/dist/acpx-engine/ephemeral-session-environment.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ephemeral-session-environment.test.d.ts","sourceRoot":"","sources":["../../src/acpx-engine/ephemeral-session-environment.test.ts"],"names":[],"mappings":""}

package/dist/acpx-engine/ephemeral-session-environment.test.js

@@ -0,0 +1,177 @@
+import { mkdtemp, readFile, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { createRuntimeStore } from "acpx/runtime";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { createEphemeralSessionEnvironmentStore } from "./ephemeral-session-environment.js";
+const currentEnvironment = Object.freeze({
+    PAPERCLIP_API_KEY: "current-credential-fixture",
+    PAPERCLIP_RUN_ID: "current-run-fixture",
+    PATH: "/fixture/current-bin",
+});
+const oldEnvironment = { PAPERCLIP_API_KEY: "old-credential-fixture", OLD_RUN_PATH: "/fixture/old-run" };
+function record() {
+    return {
+        schema: "acpx.session.v1",
+        acpxRecordId: "fixture-record",
+        acpSessionId: "fixture-session",
+        agentSessionId: "fixture-agent-session",
+        agentCommand: "fixture-provider",
+        cwd: "/fixture/project",
+        name: "fixture-name",
+        createdAt: "2026-10-03T00:00:00.000Z",
+        lastUsedAt: "2026-10-03T00:00:01.000Z",
+        lastSeq: 3,
+        eventLog: { active_path: "/fixture/events.jsonl", segment_count: 1, max_segment_bytes: 1024, max_segments: 2 },
+        messages: [{ User: { id: "message-1", content: [{ Text: "Retained conversation" }] } }],
+        updated_at: "2026-10-03T00:00:01.000Z",
+        cumulative_token_usage: { input_tokens: 11, output_tokens: 7 },
+        request_token_usage: { request_1: { input_tokens: 11 } },
+        importedFrom: { recordId: "origin-record", cwdOriginal: "/fixture/origin", exportedBy: "fixture-caller", exportedAt: "2026-10-03T00:00:00.000Z" },
+        acpx: {
+            current_mode_id: "code",
+            desired_config_options: { effort: "high" },
+            session_options: { model: "fixture-model", allowed_tools: ["Read", "Write"], max_turns: 4, system_prompt: { append: "Retained caller option" }, env: { ...currentEnvironment } },
+        },
+    };
+}
+function freeze(value) {
+    for (const child of Object.values(value))
+        if (typeof child === "object" && child !== null)
+            freeze(child);
+    return Object.freeze(value);
+}
+function stubStore(loaded) {
+    const load = vi.fn().mockResolvedValue(loaded);
+    const save = vi.fn().mockResolvedValue(undefined);
+    return { load, save };
+}
+const directories = [];
+afterEach(async () => { await Promise.all(directories.splice(0).map(directory => rm(directory, { recursive: true, force: true }))); });
+async function diskStore() {
+    const stateDir = await mkdtemp(join(tmpdir(), "paperclip-session-env-"));
+    directories.push(stateDir);
+    return { store: createRuntimeStore({ stateDir }), file: join(stateDir, "sessions", "fixture-record.json") };
+}
+describe("ephemeral ACPX session environment", () => {
+    it("saves a fresh session to the actual file store without persisting its live environment", async () => {
+        const disk = await diskStore(), input = freeze(record());
+        const wrapper = createEphemeralSessionEnvironmentStore(disk.store, currentEnvironment);
+        await wrapper.save(input);
+        const text = await readFile(disk.file, "utf8"), saved = JSON.parse(text);
+        expect(saved.acpx.session_options).not.toHaveProperty("env");
+        for (const value of Object.values(currentEnvironment))
+            expect(text).not.toContain(value);
+        expect(input.acpx?.session_options?.env).toEqual(currentEnvironment);
+        expect(saved.acpx.current_mode_id).toBe("code");
+        expect(saved.acpx.desired_config_options).toEqual(input.acpx?.desired_config_options);
+        expect(saved.acpx.session_options).toEqual({ model: "fixture-model", allowed_tools: ["Read", "Write"], max_turns: 4, system_prompt: { append: "Retained caller option" } });
+        expect(saved.messages).toEqual(input.messages);
+        expect(saved.imported_from.record_id).toBe("origin-record");
+        const loaded = await wrapper.load(input.acpxRecordId);
+        expect(loaded?.acpx?.session_options?.env).toEqual(currentEnvironment);
+        expect(loaded?.messages).toEqual(input.messages);
+    });
+    it("loads an old env-bearing file with rotated credentials without writing, then saves neither environment", async () => {
+        const disk = await diskStore(), legacy = record();
+        legacy.acpx.session_options.env = { ...oldEnvironment };
+        await disk.store.save(legacy);
+        const before = await readFile(disk.file, "utf8");
+        const wrapper = createEphemeralSessionEnvironmentStore(disk.store, currentEnvironment);
+        const loaded = await wrapper.load(legacy.acpxRecordId);
+        expect(loaded?.acpx?.session_options?.env).toEqual(currentEnvironment);
+        expect(loaded?.acpx?.session_options?.env).not.toHaveProperty("OLD_RUN_PATH");
+        expect(await readFile(disk.file, "utf8")).toBe(before);
+        expect(legacy.acpx?.session_options?.env).toEqual(oldEnvironment);
+        await wrapper.save(loaded);
+        const after = await readFile(disk.file, "utf8");
+        for (const value of [...Object.values(oldEnvironment), ...Object.values(currentEnvironment)])
+            expect(after).not.toContain(value);
+        expect(JSON.parse(after).acpx.session_options).not.toHaveProperty("env");
+        expect(loaded?.acpx?.session_options?.env).toEqual(currentEnvironment);
+    });
+    it("loads an env-free persisted session into the current environment without writing", async () => {
+        const disk = await diskStore(), input = record();
+        delete input.acpx.session_options.env;
+        await disk.store.save(input);
+        const before = await readFile(disk.file, "utf8");
+        const loaded = await createEphemeralSessionEnvironmentStore(disk.store, currentEnvironment).load(input.acpxRecordId);
+        expect(loaded?.acpx?.session_options?.env).toEqual(currentEnvironment);
+        expect(loaded?.acpx?.session_options?.model).toBe("fixture-model");
+        expect(await readFile(disk.file, "utf8")).toBe(before);
+    });
+    it("copies loaded records, options and current env without mutating stored or caller-owned objects", async () => {
+        const stored = record();
+        stored.acpx.session_options.env = { ...oldEnvironment };
+        freeze(stored);
+        const backing = stubStore(stored), wrapper = createEphemeralSessionEnvironmentStore(backing, currentEnvironment);
+        const loaded = await wrapper.load("fixture-record");
+        expect(backing.load).toHaveBeenCalledWith("fixture-record");
+        expect(backing.save).not.toHaveBeenCalled();
+        expect(loaded).not.toBe(stored);
+        expect(loaded?.acpx).not.toBe(stored.acpx);
+        expect(loaded?.acpx?.session_options).not.toBe(stored.acpx?.session_options);
+        expect(loaded?.acpx?.session_options?.env).not.toBe(currentEnvironment);
+        expect(stored.acpx?.session_options?.env).toEqual(oldEnvironment);
+        loaded.acpx.session_options.env.PAPERCLIP_API_KEY = "isolated-loaded-fixture";
+        expect(currentEnvironment.PAPERCLIP_API_KEY).toBe("current-credential-fixture");
+    });
+    it("saves only a copied env-free projection, preserving unrelated and caller metadata", async () => {
+        const input = freeze(Object.assign(record(), { caller_metadata: { keep: "caller-state", env: { preserve: "unrelated caller metadata" } } }));
+        const backing = stubStore(undefined), wrapper = createEphemeralSessionEnvironmentStore(backing, currentEnvironment);
+        await wrapper.save(input);
+        const saved = backing.save.mock.calls[0][0];
+        const { env: _environment, ...expectedOptions } = input.acpx.session_options;
+        expect(saved).toEqual({ ...input, acpx: { ...input.acpx, session_options: expectedOptions } });
+        expect(saved).not.toBe(input);
+        expect(saved.acpx).not.toBe(input.acpx);
+        expect(saved.acpx?.session_options).not.toBe(input.acpx?.session_options);
+        expect(saved.acpx?.session_options).not.toHaveProperty("env");
+        expect(input.acpx?.session_options?.env).toEqual(currentEnvironment);
+    });
+    for (const [name, acpx] of [
+        ["absent acpx", undefined],
+        ["explicit undefined acpx", undefined],
+        ["absent session options", { current_mode_id: "code" }],
+        ["undefined session options", { session_options: undefined }],
+        ["empty session options", { session_options: {} }],
+        ["undefined env", { session_options: { env: undefined, model: "fixture-model" } }],
+    ])
+        it(`preserves ${name} when saving and retains existing load injection semantics`, async () => {
+            const input = record();
+            if (name === "absent acpx")
+                delete input.acpx;
+            else
+                input.acpx = acpx;
+            freeze(input);
+            const backing = stubStore(input), wrapper = createEphemeralSessionEnvironmentStore(backing, currentEnvironment);
+            await wrapper.save(input);
+            const saved = backing.save.mock.calls[0][0];
+            if (name === "undefined env")
+                expect(saved.acpx?.session_options).toEqual({ model: "fixture-model" });
+            else
+                expect(saved).toEqual(input);
+            expect(Object.hasOwn(saved, "acpx")).toBe(Object.hasOwn(input, "acpx"));
+            if (saved.acpx && input.acpx)
+                expect(Object.hasOwn(saved.acpx, "session_options")).toBe(Object.hasOwn(input.acpx, "session_options"));
+            const loaded = await wrapper.load(input.acpxRecordId);
+            expect(loaded?.acpx?.session_options?.env).toEqual(currentEnvironment);
+            expect(backing.save).toHaveBeenCalledTimes(1);
+        });
+    it("returns a missing record without saving or creating conversation state", async () => {
+        const backing = stubStore(undefined);
+        expect(await createEphemeralSessionEnvironmentStore(backing, currentEnvironment).load("missing")).toBeUndefined();
+        expect(backing.save).not.toHaveBeenCalled();
+    });
+    it("propagates load and save errors unchanged", async () => {
+        const failure = new Error("fixture store failure"), backing = stubStore(undefined);
+        backing.load.mockRejectedValue(failure);
+        backing.save.mockRejectedValue(failure);
+        const wrapper = createEphemeralSessionEnvironmentStore(backing, currentEnvironment);
+        await expect(wrapper.load("fixture-record")).rejects.toBe(failure);
+        const input = freeze(record());
+        await expect(wrapper.save(input)).rejects.toBe(failure);
+        expect(input.acpx?.session_options?.env).toEqual(currentEnvironment);
+    });
+});
+//# sourceMappingURL=ephemeral-session-environment.test.js.map

package/dist/acpx-engine/ephemeral-session-environment.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ephemeral-session-environment.test.js","sourceRoot":"","sources":["../../src/acpx-engine/ephemeral-session-environment.test.ts"],"names":[],"mappings":"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"}

package/dist/acpx-engine/execute.d.ts.map

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

package/dist/acpx-engine/execute.js

@@ -1,4 +1,5 @@
 import { cancellableSandboxStartup } from "./startup-cancellation.js";
+import { withAdapterExecutionPhase } from "../execution-phase.js";
 import fs from "node:fs/promises";
 import fsSync from "node:fs";
 import os from "node:os";
@@ -6,14 +7,16 @@ import path from "node:path";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import { createHash, randomUUID } from "node:crypto";
+import { parseFrontmatterMarkdown } from "@paperclipai/shared";
 import { fileURLToPath } from "node:url";
 import { adapterExecutionTargetSessionIdentity, describeAdapterExecutionTarget, adapterExecutionTargetDuplexObservabilityRecorder, adapterExecutionTargetEnablesSandboxDuplexBridge, formatAdapterExecutionTimeoutErrorMessage, formatAdapterExecutionTimeoutStartLogLine, prepareAdapterExecutionTargetRuntime, readAdapterExecutionTarget, resolveAdapterExecutionTargetTimeout, resolveReferencedSourceIgnore, runAdapterExecutionTargetShellCommand, startAdapterExecutionTargetPaperclipBridge, startAdapterExecutionTargetProcessSessionBridge, } from "@paperclipai/adapter-utils/execution-target";
 import { captureLocalProcess, capturedProcessExited, killCapturedLocalProcess } from "./local-process-control.js";
 import { DUPLEX_CHANNEL_LOST_ERROR_CODE } from "../bridge-transport-contract.js";
-import { formatTerminalSessionFailure, sanitizeTerminalSessionFailure, } from "./terminal-session-failure.js";
+import { classifyToolDefinitionFailure, formatTerminalSessionFailure, sanitizeTerminalSessionFailure, } from "./terminal-session-failure.js";
 import { classifyWorkspaceRestoreFailure, describeWorkspaceRestoreFailure, } from "../workspace-restore-merge.js";
-import { DEFAULT_PAPERCLIP_AGENT_PROMPT_TEMPLATE, DEFAULT_PAPERCLIP_CONVERSATION_PROMPT_TEMPLATE, applyPaperclipWorkspaceEnv, asNumber, asString, buildInvocationEnvForLogs, buildPaperclipEnv, ensureAbsoluteDirectory, ensurePathInEnv, ensurePaperclipSkillSymlink, isForbiddenConfigEnvKey, isPaperclipExternalChatTurn, isPaperclipRuntimeEnvKey, joinPromptSections, materializePaperclipSkillCopy, parseObject, isPaperclipSkillSourceMissing, readPaperclipRuntimeSkillEntries, readPaperclipIssueWorkModeFromContext, renderTemplate, resolvePaperclipInstanceRootForAdapter, selectPaperclipPromptSections, resolveLegacyPaperclipDesiredSkillNames, removeMaintainerOnlySkillSymlinks, rewriteWorkspaceCwdEnvVarsForExecution, shapePaperclipWorkspaceEnvForExecution, } from "@paperclipai/adapter-utils/server-utils";
+import { DEFAULT_PAPERCLIP_AGENT_PROMPT_TEMPLATE, DEFAULT_PAPERCLIP_CONVERSATION_PROMPT_TEMPLATE, applyPaperclipWorkspaceEnv, asNumber, asString, buildInvocationEnvForLogs, buildPaperclipEnv, ensureAbsoluteDirectory, ensurePathInEnv, ensurePaperclipSkillSymlink, isForbiddenConfigEnvKey, isPaperclipExternalChatTurn, isPaperclipRuntimeEnvKey, joinPromptSections, materializePaperclipSkillCopy, parseObject, isPaperclipSkillSourceMissing, readPaperclipRuntimeSkillEntries, readPaperclipIssueWorkModeFromContext, renderTemplate, resolvePaperclipInstanceRootForAdapter, hydrateFreshSessionHandoff, selectInitialCommunicationGuidance, selectPaperclipPromptSections, resolveLegacyPaperclipDesiredSkillNames, removeMaintainerOnlySkillSymlinks, rewriteWorkspaceCwdEnvVarsForExecution, shapePaperclipWorkspaceEnvForExecution, } from "@paperclipai/adapter-utils/server-utils";
 import { shellQuote } from "@paperclipai/adapter-utils/ssh";
+import { createEphemeralSessionEnvironmentStore } from "./ephemeral-session-environment.js";
 import { createAcpRuntime, createAgentRegistry, createRuntimeStore, isAcpRuntimeError, } from "acpx/runtime";
 import { ACPX_DUPLEX_LOSS_CANCEL_DEADLINE_MS, ACPX_HANDSHAKE_TIMEOUT_MS, ACPX_HANDSHAKE_TRANSPORT_POLL_MS, DEFAULT_ACP_ENGINE_AGENT, DEFAULT_ACP_ENGINE_MODE, DEFAULT_ACP_ENGINE_NON_INTERACTIVE_PERMISSIONS, DEFAULT_ACP_ENGINE_PERMISSION_MODE, DEFAULT_ACP_ENGINE_TIMEOUT_SEC, DEFAULT_ACP_ENGINE_WARM_HANDLE_IDLE_MS, } from "./constants.js";
 import { createRunResourceLedger } from "./run-resource-ledger.js";
@@ -622,11 +625,25 @@ async function prepareClaudeSkillRuntime(input) {
         }
     }
     const selectedNames = materializedNames.sort();
+    const skillDescriptions = await Promise.all(selectedNames.map(async (name) => {
+        const file = path.join(skillsHome, name, "SKILL.md");
+        let description = "";
+        try {
+            const parsed = parseFrontmatterMarkdown(await fs.readFile(file, "utf8"));
+            description = asString(parsed.frontmatter.description, "").replace(/\s+/g, " ").trim().slice(0, 512);
+        }
+        catch {
+            // A readable skill without valid routing metadata remains available.
+            // Do not substitute its body for a missing description.
+        }
+        return `- ${name}${description ? `: ${description}` : ""} (file: ${file})`;
+    }));
     const promptInstructions = selectedNames.length > 0
         ? [
             "Paperclip has materialized selected runtime skills for this ACPX Claude session.",
             `Skill root: ${skillsHome}`,
             `Selected skills: ${selectedNames.join(", ")}`,
+            ...skillDescriptions,
             "When a task calls for one of these skills, read its SKILL.md from that root and follow it.",
         ].join("\n")
         : "";
@@ -908,6 +925,7 @@ function buildSessionParams(input) {
         mode: prepared.mode,
         stateDir: prepared.stateDir,
         configFingerprint: prepared.fingerprint,
+        mcpFingerprint: shortHash(prepared.mcpIdentity),
         ...(prepared.requestedModel ? { model: prepared.requestedModel } : {}),
         ...(prepared.requestedThinkingEffort ? { thinkingEffort: prepared.requestedThinkingEffort } : {}),
         ...(prepared.fastMode ? { fastMode: true } : {}),
@@ -1453,7 +1471,9 @@ async function buildRuntime(input) {
                 defaultMode: paperclipClaudeSettings.defaultMode,
             }
             : null,
-        mcpServers: mcpIdentity,
+        // Qualified built-in ACP harnesses reconnect to the supplied MCP servers
+        // on session/load. Keep their conversation identity independent of tools.
+        mcpServers: ["claude", "codex", "grok", "gemini", "kimi"].includes(acpxAgent) ? [] : mcpIdentity,
         secretManifestHash: shortHash(secretManifest),
         // Fold the resolved adapter env (all applied user-configured values —
         // plain, secret_ref, and stable PAPERCLIP_* config such as an explicit
@@ -2153,7 +2173,8 @@ async function buildPrompt(ctx, resumedSession, env) {
     const renderedBootstrapPrompt = !resumedSession && bootstrapPromptTemplate.trim().length > 0
         ? renderTemplate(bootstrapPromptTemplate, templateData).trim()
         : "";
-    const { taskContextNote, wakePrompt } = selectPaperclipPromptSections(context, { resumedSession });
+    await hydrateFreshSessionHandoff(ctx, { resumedSession });
+    const { taskContextNote, wakePrompt } = selectPaperclipPromptSections(context, { resumedSession, includeCommunicationGuidance: false });
     const externalChatTurn = isPaperclipExternalChatTurn(context.paperclipWake);
     const shouldUseResumeDeltaPrompt = resumedSession && wakePrompt.length > 0;
     const promptInstructionsPrefix = shouldUseResumeDeltaPrompt ? "" : instructionsPrefix;
@@ -2166,6 +2187,7 @@ async function buildPrompt(ctx, resumedSession, env) {
     const prompt = joinPromptSections([
         promptInstructionsPrefix,
         renderedBootstrapPrompt,
+        selectInitialCommunicationGuidance(context, { resumedSession }),
         wakePrompt,
         sessionHandoffNote,
         taskContextNote,
@@ -3072,9 +3094,9 @@ export function createAcpxEngineExecutor(deps = {}) {
                     : teardownErr instanceof Error
                         ? teardownErr.message
                         : String(teardownErr);
-                await ctx
+                await withAdapterExecutionPhase(ctx, "phase_reporting", () => ctx
                     .onLog("stderr", `[paperclip] ACPX teardown step "${step}" failed: ${reason}\n`)
-                    .catch(() => { });
+                    .catch(() => { }));
             };
             // Emit one per-phase timing run-log event. It is not an OpenTelemetry
             // export and it is not a Telemetry event: it carries the phase name
@@ -3087,13 +3109,13 @@ export function createAcpxEngineExecutor(deps = {}) {
             const timedPhase = async (phase, run) => {
                 const start = now();
                 try {
-                    await run();
+                    await withAdapterExecutionPhase(ctx, phase, run);
                 }
                 catch (error) {
-                    await emitPhase(phase, start, "failed");
+                    await withAdapterExecutionPhase(ctx, "phase_reporting", () => emitPhase(phase, start, "failed"));
                     throw error;
                 }
-                await emitPhase(phase, start, "ok");
+                await withAdapterExecutionPhase(ctx, "phase_reporting", () => emitPhase(phase, start, "ok"));
             };
             // The turn the run started. It is hoisted to the run scope so the settlement
             // `endSession` step can cancel a running turn before it closes the runtime
@@ -3211,7 +3233,14 @@ export function createAcpxEngineExecutor(deps = {}) {
                     // same session still sees it. The borrow clears the entry's idle timer, so
                     // the reused runtime cannot expire under its own timer while this run uses
                     // it (today's `clearWarmHandleTimer(cached)` after the reuse decision).
-                    const cached = canResume ? hostStore.borrow(prepared.sessionKey) : undefined;
+                    let cached = canResume ? hostStore.borrow(prepared.sessionKey) : undefined;
+                    if (cached && (ctx.context.refreshTools === true
+                        || asString(previousParams.mcpFingerprint, "") !== shortHash(prepared.mcpIdentity)
+                        // MCP bearer credentials are run-scoped, even for an unchanged catalog.
+                        || prepared.mcpServers.length > 0)) {
+                        await hostStore.discard(prepared.sessionKey);
+                        cached = undefined;
+                    }
                     childStderrState = cached?.childStderrState ?? { logPath: null, pendingLiveLine: "" };
                     processIdentitySink = cached?.processIdentitySink ?? {
                         current: ctx.onSpawn,
@@ -3224,27 +3253,9 @@ export function createAcpxEngineExecutor(deps = {}) {
                     flushChildStderr(childStderrState);
                     childStderrState.logPath = prepared.childStderrLogPath;
                     const persistedRuntimeStore = createRuntimeStore({ stateDir: prepared.stateDir });
-                    const runtimeStore = {
-                        async load(id) {
-                            const record = await persistedRuntimeStore.load(id);
-                            if (!record)
-                                return undefined;
-                            // ACPX resumes from the stored session options rather than the
-                            // options passed to ensureSession. Keep conversation state, but
-                            // launch the provider with this run's credentials and scratch paths.
-                            return {
-                                ...record,
-                                acpx: {
-                                    ...record.acpx,
-                                    session_options: {
-                                        ...record.acpx?.session_options,
-                                        env: { ...prepared.env },
-                                    },
-                                },
-                            };
-                        },
-                        save: (record) => persistedRuntimeStore.save(record),
-                    };
+                    // Resume with this run's launch environment; keep it out of the saved
+                    // conversation record without mutating the live runtime's options.
+                    const runtimeStore = createEphemeralSessionEnvironmentStore(persistedRuntimeStore, prepared.env);
                     const runtimeOptions = {
                         cwd: prepared.cwd,
                         // Host-only spawn cwd for the relay proxy on the remote process-session
@@ -3768,8 +3779,9 @@ export function createAcpxEngineExecutor(deps = {}) {
                         // Diagnostics are retained even when an adapter has no recovery
                         // classifier. Redact before bounding so partial secrets cannot leak.
                         onTerminalSessionFailure: (failure) => {
+                            terminalFailureClassification = classifyToolDefinitionFailure(failure)
+                                ?? deps.classifyTerminalSessionFailure?.(failure, new Date(now())) ?? null;
                             terminalSessionFailure = sanitizeTerminalSessionFailure(failure, prepared.env, ctx.authToken, parseObject(ctx.config.env));
-                            terminalFailureClassification = deps.classifyTerminalSessionFailure?.(failure, new Date(now())) ?? null;
                         },
                     });
                     activeTurn = turn;
@@ -3827,7 +3839,7 @@ export function createAcpxEngineExecutor(deps = {}) {
                         armStopDeadline();
                     return {
                         cancel: async (reason) => {
-                            await turn.cancel({ reason });
+                            await withAdapterExecutionPhase(ctx, "cancel_turn", () => turn.cancel({ reason }));
                         },
                     };
                 };
@@ -4283,7 +4295,7 @@ export function createAcpxEngineExecutor(deps = {}) {
                         : baseSettlement;
                     // Cancel a running turn before the close (the turn-error path).
                     if (settlement.cancelTurnReason && activeTurn) {
-                        await activeTurn.cancel({ reason: settlement.cancelTurnReason }).catch(() => { });
+                        await withAdapterExecutionPhase(ctx, "cancel_turn", () => activeTurn.cancel({ reason: settlement.cancelTurnReason }).catch(() => { }));
                     }
                     const existing = warmHandles.get(prepared.sessionKey);
                     // Re-read the duplex control-channel disposition here, at the
@@ -4320,26 +4332,26 @@ export function createAcpxEngineExecutor(deps = {}) {
                         existing) {
                         // A matching warm entry closes through the warm store, which also
                         // clears its idle timer and flushes its child stderr.
-                        runtimeStopConfirmed = await closeWarmHandle({
+                        runtimeStopConfirmed = await withAdapterExecutionPhase(ctx, "close_session", () => closeWarmHandle({
                             handles: warmHandles,
                             key: prepared.sessionKey,
                             entry: existing,
                             reason: settlement.reason,
                             discardPersistentState: settlement.discardPersistentState,
-                        });
+                        }));
                         return;
                     }
                     const onCloseError = settlement.recordCloseError || ctx.signal?.aborted
                         ? (closeErr) => recordTeardownError("runtime-close", closeErr)
                         : () => { };
-                    await runtime
+                    await withAdapterExecutionPhase(ctx, "close_session", () => runtime
                         .close({
                         handle: settlement.handle,
                         reason: settlement.reason,
                         discardPersistentState: settlement.discardPersistentState,
                     })
                         .then(() => { runtimeStopConfirmed = true; })
-                        .catch(onCloseError);
+                        .catch(onCloseError));
                     if (settlement.dropWarmEntry && warmHandleMatches(existing, runtime, settlement.handle) && existing) {
                         clearWarmHandleTimer(existing);
                         warmHandles.delete(prepared.sessionKey);
@@ -4372,7 +4384,7 @@ export function createAcpxEngineExecutor(deps = {}) {
                     const stopped = runtimeStopConfirmed || (!prepared.processSessionBridge && capturedProcessExited(processIdentitySink?.localProcess));
                     try {
                         if (stopped)
-                            await ctx.onProviderStopped?.();
+                            await withAdapterExecutionPhase(ctx, "instruction_collection", () => ctx.onProviderStopped?.());
                     }
                     catch {
                         // Match ACP's fail-soft teardown policy without describing this as
@@ -4380,12 +4392,15 @@ export function createAcpxEngineExecutor(deps = {}) {
                         await recordTeardownError("instruction-collection", new Error("Instruction collection failed after provider stop. No instruction save is claimed."));
                     }
                     finally {
-                        await runRuntimeSpan("sandbox.syncBack", async () => {
+                        await withAdapterExecutionPhase(ctx, "workspace_restore", () => runRuntimeSpan("sandbox.syncBack", async () => {
                             const restoreOutcome = await syncBackManagedHome(prepared);
                             if (!restoreOutcome.ok) {
-                                workspaceRestoreFailureField = { workspaceRestoreFailure: restoreOutcome.code };
+                                workspaceRestoreFailureField = {
+                                    workspaceRestoreFailure: restoreOutcome.code,
+                                    ...(restoreOutcome.diagnostic ? { workspaceRestoreDiagnostic: restoreOutcome.diagnostic } : {}),
+                                };
                             }
-                        });
+                        }));
                     }
                 }),
                 // The staging lease releases as the run's final act, AFTER the coordinator
@@ -4455,6 +4470,15 @@ export function createAcpxEngineExecutor(deps = {}) {
                                 } },
                         };
                     }
+                    // Preserve the policy resolved for this execution target. The server
+                    // cannot reconstruct sandbox defaults from the stored agent config.
+                    capturedResult = {
+                        ...capturedResult,
+                        resultJson: {
+                            ...capturedResult.resultJson,
+                            adapterExecutionTimeout: { ...prepared.timeoutResolution },
+                        },
+                    };
                     // The sync-back settlement step runs before this reproduces the result
                     // (settlement precedes reproduction), so a failed workspace restore is
                     // already recorded by the time we get here. Merge it into `resultJson`