@paperclipai/adapter-utils 2026.1012.0 → 2026.1012.1-canary.0

package/dist/acpx-engine/accounting-model.d.ts

@@ -0,0 +1,5 @@
+import type { AcpRuntimeStatus } from "acpx/runtime";
+/** Use provider-selected IDs, including its default. A mid-turn model change
+ * cannot be priced as a single-model receipt; never guess from a display name. */
+export declare function acpxAccountingModel(requested: string, before: AcpRuntimeStatus | null, after: AcpRuntimeStatus | null): string | null;
+//# sourceMappingURL=accounting-model.d.ts.map

package/dist/acpx-engine/accounting-model.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"accounting-model.d.ts","sourceRoot":"","sources":["../../src/acpx-engine/accounting-model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD;kFACkF;AAClF,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,IAAI,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAKrI"}

package/dist/acpx-engine/accounting-model.js

@@ -0,0 +1,10 @@
+/** Use provider-selected IDs, including its default. A mid-turn model change
+ * cannot be priced as a single-model receipt; never guess from a display name. */
+export function acpxAccountingModel(requested, before, after) {
+    const pre = before?.models?.currentModelId?.trim();
+    const post = after?.models?.currentModelId?.trim();
+    if (pre && post && pre !== post)
+        return null;
+    return post || pre || requested.trim() || null;
+}
+//# sourceMappingURL=accounting-model.js.map

package/dist/acpx-engine/accounting-model.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"accounting-model.js","sourceRoot":"","sources":["../../src/acpx-engine/accounting-model.ts"],"names":[],"mappings":"AAEA;kFACkF;AAClF,MAAM,UAAU,mBAAmB,CAAC,SAAiB,EAAE,MAA+B,EAAE,KAA8B;IACpH,MAAM,GAAG,GAAG,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;IACnD,MAAM,IAAI,GAAG,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;IACnD,IAAI,GAAG,IAAI,IAAI,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAC7C,OAAO,IAAI,IAAI,GAAG,IAAI,SAAS,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC;AACjD,CAAC"}

package/dist/acpx-engine/accounting-model.test.d.ts

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

package/dist/acpx-engine/accounting-model.test.d.ts.map

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

package/dist/acpx-engine/accounting-model.test.js

@@ -0,0 +1,18 @@
+import { describe, expect, it } from "vitest";
+import { acpxAccountingModel } from "./accounting-model.js";
+const selected = (id) => ({ models: { currentModelId: id, availableModelIds: [id] } });
+describe("ACP accounting model", () => {
+    it("retains the runtime's default and effective model instead of the requested label", () => {
+        expect(acpxAccountingModel("", selected("gpt-6.1-sol"), selected("gpt-6.1-sol"))).toBe("gpt-6.1-sol");
+        expect(acpxAccountingModel("default", null, selected("gpt-6-astra"))).toBe("gpt-6-astra");
+        expect(acpxAccountingModel("", selected("gpt-6-astra"), null)).toBe("gpt-6-astra");
+    });
+    it("uses explicit configuration only when no selected model was reported", () => {
+        expect(acpxAccountingModel("gpt-6.1-sol", null, null)).toBe("gpt-6.1-sol");
+        expect(acpxAccountingModel("", { models: { availableModelIds: ["gpt-6.1-sol"] } }, null)).toBeNull();
+    });
+    it("does not price a turn that changed models as one model", () => {
+        expect(acpxAccountingModel("gpt-6.1-sol", selected("gpt-6.1-sol"), selected("gpt-6-astra"))).toBeNull();
+    });
+});
+//# sourceMappingURL=accounting-model.test.js.map

package/dist/acpx-engine/accounting-model.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"accounting-model.test.js","sourceRoot":"","sources":["../../src/acpx-engine/accounting-model.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,QAAQ,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,iBAAiB,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAC/F,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,kFAAkF,EAAE,GAAG,EAAE;QAC1F,MAAM,CAAC,mBAAmB,CAAC,EAAE,EAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACtG,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC1F,MAAM,CAAC,mBAAmB,CAAC,EAAE,EAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACrF,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,sEAAsE,EAAE,GAAG,EAAE;QAC9E,MAAM,CAAC,mBAAmB,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC3E,MAAM,CAAC,mBAAmB,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,iBAAiB,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACvG,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,MAAM,CAAC,mBAAmB,CAAC,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC1G,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/acpx-engine/constants.d.ts

@@ -7,6 +7,7 @@ export declare const DEFAULT_ACP_ENGINE_WARM_HANDLE_IDLE_MS = 0;
 export declare const ACPX_HANDSHAKE_TIMEOUT_MS = 60000;
 export declare const ACPX_HANDSHAKE_TRANSPORT_POLL_MS = 250;
 export declare const ACPX_DUPLEX_LOSS_CANCEL_DEADLINE_MS = 30000;
+export declare const ACP_TOOL_KINDS: readonly ["read", "edit", "delete", "move", "search", "execute", "think", "fetch", "switch_mode", "other"];
 export declare const ACPX_ADAPTER_AGENT_IDS: {
     readonly claude_local: "claude";
     readonly codex_local: "codex";

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/acpx-engine/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,wBAAwB,WAAW,CAAC;AACjD,eAAO,MAAM,uBAAuB,eAAe,CAAC;AACpD,eAAO,MAAM,kCAAkC,gBAAgB,CAAC;AAChE,eAAO,MAAM,8CAA8C,SAAS,CAAC;AACrE,eAAO,MAAM,8BAA8B,IAAI,CAAC;AAChD,eAAO,MAAM,sCAAsC,IAAI,CAAC;AAOxD,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAMhD,eAAO,MAAM,gCAAgC,MAAM,CAAC;AAQpD,eAAO,MAAM,mCAAmC,QAAS,CAAC;AAE1D,eAAO,MAAM,sBAAsB;aACjC,YAAY,EAAE,QAAQ;aACtB,WAAW,EAAE,OAAO;aACpB,YAAY,EAAE,QAAQ;aACtB,UAAU,EAAE,MAAM;aAClB,UAAU,EAAE,QAAQ;CACZ,CAAC;AAEX,MAAM,MAAM,eAAe,GAAG,MAAM,OAAO,sBAAsB,CAAC;AAClE,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,sBAAsB,CAAC,CAAC,eAAe,CAAC,CAAC;AAE3E,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,WAAW,GAAG,IAAI,CAGpG"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/acpx-engine/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,wBAAwB,WAAW,CAAC;AACjD,eAAO,MAAM,uBAAuB,eAAe,CAAC;AACpD,eAAO,MAAM,kCAAkC,gBAAgB,CAAC;AAChE,eAAO,MAAM,8CAA8C,SAAS,CAAC;AACrE,eAAO,MAAM,8BAA8B,IAAI,CAAC;AAChD,eAAO,MAAM,sCAAsC,IAAI,CAAC;AAOxD,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAMhD,eAAO,MAAM,gCAAgC,MAAM,CAAC;AAQpD,eAAO,MAAM,mCAAmC,QAAS,CAAC;AAK1D,eAAO,MAAM,cAAc,YACzB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,CACvF,CAAC;AAEX,eAAO,MAAM,sBAAsB;aACjC,YAAY,EAAE,QAAQ;aACtB,WAAW,EAAE,OAAO;aACpB,YAAY,EAAE,QAAQ;aACtB,UAAU,EAAE,MAAM;aAClB,UAAU,EAAE,QAAQ;CACZ,CAAC;AAEX,MAAM,MAAM,eAAe,GAAG,MAAM,OAAO,sBAAsB,CAAC;AAClE,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,sBAAsB,CAAC,CAAC,eAAe,CAAC,CAAC;AAE3E,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,WAAW,GAAG,IAAI,CAGpG"}

package/dist/acpx-engine/constants.js

@@ -22,6 +22,12 @@ export const ACPX_HANDSHAKE_TRANSPORT_POLL_MS = 250;
 // is the host-side bound that ends the run without the agent's help. It is
 // much smaller than the whole-adapter execution timeout.
 export const ACPX_DUPLEX_LOSS_CANCEL_DEADLINE_MS = 30_000;
+// The closed ACP `ToolKind` enum. Run diagnostics may report these labels for
+// pending tool calls; tool titles, names, and inputs never leave the run.
+// Any other reported kind is collapsed to "unknown".
+export const ACP_TOOL_KINDS = [
+    "read", "edit", "delete", "move", "search", "execute", "think", "fetch", "switch_mode", "other",
+];
 export const ACPX_ADAPTER_AGENT_IDS = {
     claude_local: "claude",
     codex_local: "codex",

package/dist/acpx-engine/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/acpx-engine/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,wBAAwB,GAAG,QAAQ,CAAC;AACjD,MAAM,CAAC,MAAM,uBAAuB,GAAG,YAAY,CAAC;AACpD,MAAM,CAAC,MAAM,kCAAkC,GAAG,aAAa,CAAC;AAChE,MAAM,CAAC,MAAM,8CAA8C,GAAG,MAAM,CAAC;AACrE,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,CAAC;AAChD,MAAM,CAAC,MAAM,sCAAsC,GAAG,CAAC,CAAC;AAExD,2EAA2E;AAC3E,sEAAsE;AACtE,8EAA8E;AAC9E,0EAA0E;AAC1E,8DAA8D;AAC9D,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAC;AAEhD,4EAA4E;AAC5E,yEAAyE;AACzE,2EAA2E;AAC3E,qBAAqB;AACrB,MAAM,CAAC,MAAM,gCAAgC,GAAG,GAAG,CAAC;AAEpD,yEAAyE;AACzE,4EAA4E;AAC5E,8EAA8E;AAC9E,4EAA4E;AAC5E,2EAA2E;AAC3E,yDAAyD;AACzD,MAAM,CAAC,MAAM,mCAAmC,GAAG,MAAM,CAAC;AAE1D,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,YAAY,EAAE,QAAQ;IACtB,WAAW,EAAE,OAAO;IACpB,YAAY,EAAE,QAAQ;IACtB,UAAU,EAAE,MAAM;IAClB,UAAU,EAAE,QAAQ;CACZ,CAAC;AAKX,MAAM,UAAU,yBAAyB,CAAC,WAAsC;IAC9E,IAAI,CAAC,WAAW;QAAE,OAAO,IAAI,CAAC;IAC9B,OAAO,sBAAsB,CAAC,WAA8B,CAAC,IAAI,IAAI,CAAC;AACxE,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/acpx-engine/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,wBAAwB,GAAG,QAAQ,CAAC;AACjD,MAAM,CAAC,MAAM,uBAAuB,GAAG,YAAY,CAAC;AACpD,MAAM,CAAC,MAAM,kCAAkC,GAAG,aAAa,CAAC;AAChE,MAAM,CAAC,MAAM,8CAA8C,GAAG,MAAM,CAAC;AACrE,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,CAAC;AAChD,MAAM,CAAC,MAAM,sCAAsC,GAAG,CAAC,CAAC;AAExD,2EAA2E;AAC3E,sEAAsE;AACtE,8EAA8E;AAC9E,0EAA0E;AAC1E,8DAA8D;AAC9D,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAC;AAEhD,4EAA4E;AAC5E,yEAAyE;AACzE,2EAA2E;AAC3E,qBAAqB;AACrB,MAAM,CAAC,MAAM,gCAAgC,GAAG,GAAG,CAAC;AAEpD,yEAAyE;AACzE,4EAA4E;AAC5E,8EAA8E;AAC9E,4EAA4E;AAC5E,2EAA2E;AAC3E,yDAAyD;AACzD,MAAM,CAAC,MAAM,mCAAmC,GAAG,MAAM,CAAC;AAE1D,8EAA8E;AAC9E,0EAA0E;AAC1E,qDAAqD;AACrD,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO;CACvF,CAAC;AAEX,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,YAAY,EAAE,QAAQ;IACtB,WAAW,EAAE,OAAO;IACpB,YAAY,EAAE,QAAQ;IACtB,UAAU,EAAE,MAAM;IAClB,UAAU,EAAE,QAAQ;CACZ,CAAC;AAKX,MAAM,UAAU,yBAAyB,CAAC,WAAsC;IAC9E,IAAI,CAAC,WAAW;QAAE,OAAO,IAAI,CAAC;IAC9B,OAAO,sBAAsB,CAAC,WAA8B,CAAC,IAAI,IAAI,CAAC;AACxE,CAAC"}

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

@@ -296,6 +296,19 @@ export declare function buildAcpxRunSummary(input: {
     outputSegments: string[];
     fallback?: string | null;
 }): string;
+/**
+ * Activity as of the moment the turn's stop fired, for a stopped turn only.
+ * Separates a turn that went silent long before its deadline from one that
+ * was still working. Reports only ages and closed ACP tool-kind labels.
+ */
+export declare function summarizeAcpStopActivity(stopRequestedAt: number | null, lastEventBeforeStopAt: number | null, pendingTools: ReadonlyArray<{
+    kind?: string;
+    firstSeenAt?: number;
+}>): {
+    acpLastEventAgeAtStopMs?: number;
+    acpOldestPendingToolAgeAtStopMs?: number;
+    acpPendingToolKinds?: string;
+};
 /**
  * Fold the ACP runtime's post-turn usage into the adapter execution result
  * shape. The runtime persists the latest turn's token breakdown (adapters like

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":"AAWA,OAAO,KAAK,EACV,kBAAkB,EAClB,uBAAuB,EACvB,sBAAsB,EACtB,YAAY,EACb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAcL,KAAK,sBAAsB,EAI3B,KAAK,0BAA0B,EAC/B,KAAK,qCAAqC,EAC1C,KAAK,gCAAgC,EAEtC,MAAM,6CAA6C,CAAC;AAIrD,OAAO,EAIL,KAAK,0BAA0B,EAEhC,MAAM,+BAA+B,CAAC;AACvC,YAAY,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,KAAK,EAA+B,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAuC1G,OAAO,EAML,KAAK,UAAU,EAGf,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EAGrB,KAAK,wBAAwB,EAE9B,MAAM,cAAc,CAAC;AAYtB,OAAO,KAAK,EAGV,iBAAiB,EACjB,6BAA6B,EAE7B,0BAA0B,EAC1B,kBAAkB,EAKnB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAIL,KAAK,2BAA2B,EACjC,MAAM,sBAAsB,CAAC;AAM9B,OAAO,EAEL,KAAK,wBAAwB,EAG7B,KAAK,iBAAiB,EACvB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAaL,KAAK,kBAAkB,EAGxB,MAAM,qBAAqB,CAAC;AAiC7B,KAAK,0BAA0B,GAAG,iBAAiB,GAAG;IACpD,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,wBAAwB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAKjE,uBAAuB,CAAC,EAAE,MAAM,kBAAkB,GAAG,SAAS,CAAC;CAChE,CAAC;AAEF,KAAK,kBAAkB,GAAG,CAAC,OAAO,EAAE,0BAA0B,KAAK,UAAU,CAAC;AAE9E;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,uBAAuB;IACtC,aAAa,EAAE,qCAAqC,CAAC;IACrD;;;;;;OAMG;IACH,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC;;;;;;;;OAQG;IACH,QAAQ,EAAE,CAAC,MAAM,OAAO,CAAC,uBAAuB,CAAC,CAAC,GAAG,IAAI,CAAC;IAC1D;;;;;;;OAOG;IACH,OAAO,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;IACtC,UAAU,EAAE,MAAM,CAAC;CACpB;AAQD,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,WAAW,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACzC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,WAAW,4BAA4B;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,yEAAyE;IACzE,eAAe,EAAE,sBAAsB,CAAC;IACxC,uDAAuD;IACvD,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,KAAK,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;IACxC,iBAAiB,EAAE,uBAAuB,CAAC,mBAAmB,CAAC,CAAC;IAChE;;;;;;;;;;;OAWG;IACH,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B;;;;OAIG;IACH,KAAK,EAAE,CAAC,MAAM,EAAE,0BAA0B,EAAE,KAAK,OAAO,CAAC,qCAAqC,CAAC,CAAC;CACjG;AAED,MAAM,WAAW,2BAA2B;IAC1C,aAAa,EAAE,qCAAqC,CAAC;IACrD;;;;;;;;;;;;;;;OAeG;IACH,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAClD;;;;;;;;;OASG;IACH,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC;AAED,MAAM,MAAM,iCAAiC,GAAG,IAAI,CAClD,sBAAsB,EACtB,WAAW,GAAG,aAAa,GAAG,gBAAgB,CAC/C,CAAC;AAEF,MAAM,WAAW,yBAAyB;IACxC,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,6FAA6F;IAC7F,8BAA8B,CAAC,EAAE,CAC/B,OAAO,EAAE,0BAA0B,EACnC,GAAG,EAAE,IAAI,KACN,iCAAiC,GAAG,IAAI,CAAC;IAC9C;;;;;;OAMG;IACH,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC7C;;;;;OAKG;IACH,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;IACtD;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,CACvB,GAAG,EAAE,uBAAuB,KACzB,yBAAyB,GAAG,IAAI,GAAG,OAAO,CAAC,yBAAyB,GAAG,IAAI,CAAC,CAAC;IAClF;;;;OAIG;IACH,wBAAwB,CAAC,EAAE,CACzB,KAAK,EAAE,4BAA4B,KAChC,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAC1C;;;;;;OAMG;IACH,uBAAuB,CAAC,EAAE,CAAC,MAAM,EAAE,2BAA2B,KAAK,IAAI,CAAC;CACzE;AAwGD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,0BAA0B,GAAG,MAAM,CAEpF;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAEzF;AAoFD;;;;;GAKG;AACH,wBAAgB,mCAAmC,CACjD,YAAY,EAAE,MAAM,CAAC,UAAU,EAC/B,SAAS,EAAE,MAAM,EACjB,sBAAsB,EAAE,OAAO,GAC9B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAkBxB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/B,aAAa,EAAE,SAAS,6BAA6B,EAAE,EACvD,OAAO,EAAE;IACP,SAAS,EAAE,MAAM,CAAC;IAClB,sBAAsB,EAAE,OAAO,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,OAAO,CAAC,QAAQ,CAAC;CACpC,GACA,iBAAiB,CAQnB;AAwBD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAsB,gCAAgC,CACpD,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,gCAAgC,GACjD,OAAO,CAAC,MAAM,CAAC,CAgDjB;AAmCD,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAc/F;AAqCD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,EAAE,GAAG,IAAI,CAI1F;AAED,wBAAgB,kCAAkC,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,OAAO,CAOlF;AAED,wBAAgB,8BAA8B,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,MAAM,CAO1G;AAsoED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE;IACzC,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B,GAAG,MAAM,CAOT;AAuID;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE;IAC5C,SAAS,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACnC,UAAU,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACpC,cAAc,EAAE,wBAAwB,GAAG,IAAI,CAAC;IAChD,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,GAAG;IACF,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAC3C,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,CAyDA;AAijBD,wBAAgB,wBAAwB,CAAC,IAAI,GAAE,yBAA8B,SAS9B,uBAAuB,KAAG,OAAO,CAAC,sBAAsB,CAAC,CAqnDvG;AAGD,eAAO,MAAM,OAAO,QAxnD2B,uBAAuB,KAAG,OAAO,CAAC,sBAAsB,CAwnDtD,CAAC"}
+{"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

@@ -18,8 +18,9 @@ import { DEFAULT_PAPERCLIP_AGENT_PROMPT_TEMPLATE, DEFAULT_PAPERCLIP_CONVERSATION
 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 { ACP_TOOL_KINDS, 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";
+import { acpxAccountingModel } from "./accounting-model.js";
 import { settleAcpRun } from "./settlement-sequence.js";
 import { runAttempt, } from "./run-coordinator.js";
 import { runTurn as runTurnSequence, } from "./turn-sequence.js";
@@ -863,7 +864,7 @@ function normalizeRequestedThinkingEffort(config) {
         asString(config.effort, "")).trim();
 }
 function buildCodexStartupConfig(input) {
-    const hasRuntimeConfig = Boolean(input.requestedModel || input.requestedThinkingEffort || input.fastMode);
+    const hasRuntimeConfig = Boolean(input.requestedModel || input.requestedThinkingEffort || input.fastMode || input.identityEnvironmentKeys);
     if (!hasRuntimeConfig)
         return { value: null, invalidExistingConfig: false };
     let existing = {};
@@ -893,6 +894,11 @@ function buildCodexStartupConfig(input) {
                     },
                 }
                 : {}),
+            ...(input.identityEnvironmentKeys ? {
+                features: { ...parseObject(existing.features), ...(input.fastMode ? { fast_mode: true } : {}), shell_snapshot: false },
+                shell_environment_policy: { ...parseObject(existing.shell_environment_policy),
+                    inherit: "all", ignore_default_excludes: true, include_only: input.identityEnvironmentKeys },
+            } : {}),
         }),
         invalidExistingConfig,
     };
@@ -1211,7 +1217,7 @@ async function buildRuntime(input) {
     const stateDir = path.resolve(asString(config.stateDir, "") || defaultStateDir(agent.companyId, agent.id));
     await fs.mkdir(stateDir, { recursive: true });
     const envConfig = parseObject(config.env);
-    const env = { ...buildPaperclipEnv(agent), PAPERCLIP_RUN_ID: runId };
+    const env = { ...buildPaperclipEnv(agent, input.ctx.agentIdentity), PAPERCLIP_RUN_ID: runId };
     const wakeTaskId = (typeof context.taskId === "string" && context.taskId.trim()) ||
         (typeof context.issueId === "string" && context.issueId.trim()) ||
         "";
@@ -1300,9 +1306,22 @@ async function buildRuntime(input) {
     if (requestedModel && acpxAgent === "claude" && !env.ANTHROPIC_MODEL) {
         env.ANTHROPIC_MODEL = requestedModel;
     }
+    // Gemini CLI reads GEMINI_MODEL when creating each ACP session. Its ACP
+    // implementation supports set_model, but not set_config_option; configure
+    // the selected model before startup without changing the transport.
+    if (requestedModel && acpxAgent === "gemini") {
+        env.GEMINI_MODEL = requestedModel;
+    }
     if (acpxAgent === "codex") {
         const codexStartupConfig = buildCodexStartupConfig({
             existingConfig: env.CODEX_CONFIG,
+            ...(input.ctx.agentIdentity ? { identityEnvironmentKeys: [...new Set([
+                        "PATH", "HOME", "LANG", "TMPDIR", "CODEX_HOME",
+                        "PAPERCLIP_AGENT_KEY_ID", "PAPERCLIP_AGENT_PUBLIC_KEY", "PAPERCLIP_AGENT_PRIVATE_KEY",
+                        // Preserve Codex's default secret-name exclusions. The short-lived
+                        // Paperclip API token is required by the agent skill's Bash/curl calls.
+                        ...Object.keys(env).filter(key => key === "PAPERCLIP_API_KEY" || !/key|secret|token/i.test(key)),
+                    ])] } : {}),
             requestedModel,
             requestedThinkingEffort,
             fastMode,
@@ -1429,8 +1448,9 @@ async function buildRuntime(input) {
     // (fingerprint, compat, persist, ensureSession, error) bind to THIS single
     // value so a warm/resumable session created with the in-sandbox cwd is reused
     // — not invalidated — on the next run. Remote runner-backed → the in-sandbox
-    // workspace dir; local and the runner-less fallback → the HOST cwd,
-    // byte-identical to today.
+    // workspace dir; local and the runner-less fallback → the HOST cwd.
+    // Local Gemini resolves tool paths through realpath. Give its ACP filesystem
+    // client the same canonical root so workspace aliases stay within that root.
     //
     // PR 3: the staging transport derives the in-sandbox workspace dir
     // deterministically from the target's `remoteCwd` (it is exactly `remoteCwd`
@@ -1442,11 +1462,14 @@ async function buildRuntime(input) {
     // diverge from the cwd that fed the fingerprint.
     const sessionCwd = useRemoteProcessSession && executionTarget?.kind === "remote"
         ? executionTarget.remoteCwd
-        : cwd;
+        : acpxAgent === "gemini" && !executionTargetIsRemote
+            ? await fs.realpath(cwd)
+            : cwd;
     // The 17 fields the session fingerprint hashes. Company, agent, and task
     // identifiers are NOT here; they scope the outer session key only (see
     // `keyIdentity`). The fingerprint builder accepts only this identity.
     const fingerprintIdentity = {
+        ...(input.ctx.agentIdentity ? { agentIdentityKeyId: input.ctx.agentIdentity.keyId } : {}),
         acpxAgent,
         agentCommand: agentCommand ?? acpxAgent,
         cwd: path.resolve(sessionCwd),
@@ -1772,6 +1795,28 @@ async function buildRuntime(input) {
         await emitRunPhaseTiming(input.ctx, "start_transport", nowMs() - startTransportStart, "failed");
         throw err;
     }
+    const currentSkillRoot = acpxAgent === "codex" && runtimeEnv.CODEX_HOME
+        ? path.join(runtimeEnv.CODEX_HOME, "skills")
+        : acpxAgent === "gemini" && !executionTargetIsRemote && typeof skillsIdentity.skillsHome === "string"
+            ? skillsIdentity.skillsHome
+            : null;
+    if (currentSkillRoot && Array.isArray(skillsIdentity.selectedSkills) && skillsIdentity.selectedSkills.length > 0) {
+        // Managed connection homes are disposable. A resumed conversation may
+        // remember a previous home's skill paths; supply the current root on every
+        // turn, after the remote launch environment has rebased CODEX_HOME.
+        skillPromptInstructions = [
+            `Paperclip has materialized selected runtime skills for this ACPX ${acpxAgent === "codex" ? "Codex" : "Gemini"} run.`,
+            `Skill root for this run: ${currentSkillRoot}`,
+            `Selected skills: ${skillsIdentity.selectedSkills.join(", ")}`,
+            "When a task calls for one of these skills, read its SKILL.md from this root and follow it. Resolve referenced scripts and files relative to that skill. Use this run's root even when an earlier turn used a different path.",
+            ...(acpxAgent === "gemini" && skillsIdentity.selectedSkills.includes("paperclip")
+                ? [
+                    "Before calling Paperclip APIs or delivering task artifacts, read the selected paperclip skill's SKILL.md and its referenced artifact workflow. A completion comment does not upload an artifact or change task status.",
+                    "Gemini's shell tool rejects command substitution. Write JSON request bodies to a workspace file and use curl --data-binary @file, or use the selected skill's helpers, instead of constructing a body with command substitution.",
+                ]
+                : []),
+        ].join("\n");
+    }
     // The relay runs on the host with the sanitized remote launch environment.
     // Its /usr/bin/env node shebang cannot rely on that environment's PATH.
     const overrideCommand = processSessionBridge?.agentCommand
@@ -1837,12 +1882,13 @@ async function buildRuntime(input) {
 }
 function sessionConfigOptions(prepared) {
     const options = [];
-    // Claude and Codex runtime config is pre-set via startup env vars; skip
+    // Claude, Codex and Gemini runtime config is pre-set via startup env vars; skip
     // set_config_option to avoid ACP-server picker validation rejecting valid
     // backend model IDs that are not advertised by the local ACP server.
     if (prepared.requestedModel &&
         prepared.acpxAgent !== "claude" &&
-        prepared.acpxAgent !== "codex") {
+        prepared.acpxAgent !== "codex" &&
+        prepared.acpxAgent !== "gemini") {
         options.push({ key: "model", value: prepared.requestedModel });
     }
     if (prepared.requestedThinkingEffort && prepared.acpxAgent !== "codex") {
@@ -2319,6 +2365,41 @@ async function emitRuntimeEvent(ctx, event, toolTitles, coalescePlaceholderToolU
         });
     }
 }
+function isPendingAcpTool(tool) {
+    return tool.status !== "completed" && tool.status !== "failed" && tool.status !== "cancelled";
+}
+/**
+ * Activity as of the moment the turn's stop fired, for a stopped turn only.
+ * Separates a turn that went silent long before its deadline from one that
+ * was still working. Reports only ages and closed ACP tool-kind labels.
+ */
+export function summarizeAcpStopActivity(stopRequestedAt, lastEventBeforeStopAt, pendingTools) {
+    const summary = {};
+    if (pendingTools.length > 0) {
+        const knownKinds = ACP_TOOL_KINDS;
+        summary.acpPendingToolKinds = uniqueSorted(pendingTools.map((tool) => (tool.kind && knownKinds.includes(tool.kind) ? tool.kind : "unknown"))).join(",");
+    }
+    if (stopRequestedAt === null)
+        return summary;
+    const age = (since) => {
+        const value = stopRequestedAt - since;
+        return Number.isSafeInteger(value) && value >= 0 ? value : undefined;
+    };
+    if (lastEventBeforeStopAt !== null) {
+        const value = age(lastEventBeforeStopAt);
+        if (value !== undefined)
+            summary.acpLastEventAgeAtStopMs = value;
+    }
+    const pendingSince = pendingTools
+        .map((tool) => tool.firstSeenAt)
+        .filter((at) => typeof at === "number" && at <= stopRequestedAt);
+    if (pendingSince.length > 0) {
+        const value = age(Math.min(...pendingSince));
+        if (value !== undefined)
+            summary.acpOldestPendingToolAgeAtStopMs = value;
+    }
+    return summary;
+}
 function resultErrorMessage(result) {
     if (result.status !== "failed")
         return null;
@@ -2907,6 +2988,7 @@ export function createAcpxEngineExecutor(deps = {}) {
             provider: billingIdentity?.provider ?? "acpx",
             ...(billingIdentity?.biller ? { biller: billingIdentity.biller } : {}),
             billingType: billingIdentity?.billingType ?? "unknown",
+            pricingContext: undefined,
         };
         const warmIdleMs = asNumber(ctx.config.warmHandleIdleMs, DEFAULT_ACP_ENGINE_WARM_HANDLE_IDLE_MS);
         // The host run site owns the warm-handle store on this run. It operates over
@@ -3197,6 +3279,7 @@ export function createAcpxEngineExecutor(deps = {}) {
                             stageRuntimeSpan: runStageSpan,
                         }));
                         buildRuntimeSettled = true;
+                        billingFields.pricingContext = prepared.fastMode ? { serviceTier: "fast" } : undefined;
                         // Capture acquired resources before the cancellation boundary so the
                         // normal settlement path also releases a just-completed build.
                         releaseStagingLease = prepared.sessionStagingLeaseRelease;
@@ -3684,14 +3767,27 @@ export function createAcpxEngineExecutor(deps = {}) {
                 };
                 let eventBreakdown = null;
                 let eventCostUsd = null;
+                // Receipt persistence is fallible; retain the provider evidence before
+                // calling the sink so the failure result can still return it to the host.
+                let observedUsage = { usageComplete: false };
                 let lastRuntimeEventAt = null;
                 let observedRuntimeEvents = 0;
+                // Activity as of the moment the turn's stop (wall-clock timeout or
+                // operator stop) fired. The cancel can make the agent emit closing
+                // events (including updates that close the stalled tool), so the
+                // finalize-time age and pending set alone cannot tell a silent stall
+                // from live work.
+                let turnStopRequestedAt = null;
+                let lastRuntimeEventBeforeStopAt = null;
+                let pendingToolsAtStop = null;
+                let turnDispatchAttempted = false;
                 // The turn-local state the sequence steps share. `promptBuild` sets the
                 // prompt, `preTurnUsage` sets the pre-turn status, `turnStart` sets the
                 // active turn, and `turnFinalize` reads all three. `activeTurn` is the run-
                 // scoped hoisted local, so the settlement `endSession` step can cancel it.
                 let runPrompt = "";
                 let preTurnStatus = null;
+                let accountingModel = prepared.requestedModel || null;
                 // Phase-timing markers for the prepare_turn and turn phases. The prepare
                 // phase covers the prompt build and the pre-turn usage snapshot; the turn
                 // phase covers the started turn and the event relay.
@@ -3740,7 +3836,9 @@ export function createAcpxEngineExecutor(deps = {}) {
                                             ? `Requested ACPX model: ${prepared.requestedModel} (set via ANTHROPIC_MODEL env at startup).`
                                             : prepared.acpxAgent === "codex"
                                                 ? `Requested ACPX model: ${prepared.requestedModel} (set via CODEX_CONFIG at startup).`
-                                                : `Requested ACPX model: ${prepared.requestedModel}.`,
+                                                : prepared.acpxAgent === "gemini"
+                                                    ? `Requested ACPX model: ${prepared.requestedModel} (set via GEMINI_MODEL at startup).`
+                                                    : `Requested ACPX model: ${prepared.requestedModel}.`,
                                     ]
                                     : []),
                                 ...(prepared.requestedThinkingEffort ? [`Requested ACPX thinking effort: ${prepared.requestedThinkingEffort}.`] : []),
@@ -3761,6 +3859,7 @@ export function createAcpxEngineExecutor(deps = {}) {
                     // Snapshot pre-turn usage so cumulative agent-reported cost can be
                     // attributed to this run alone.
                     preTurnStatus = await readRuntimeStatus(runtime, sessionHandle);
+                    accountingModel = acpxAccountingModel(prepared.requestedModel, preTurnStatus, null);
                     // The prepare phase (prompt build + usage snapshot) finished; the turn
                     // phase starts next.
                     await emitPhase("prepare_turn", preparePhaseStart, "ok");
@@ -3768,6 +3867,15 @@ export function createAcpxEngineExecutor(deps = {}) {
                 };
                 const stepTurnStart = (signal, startTimeoutMs) => {
                     ctx.signal?.throwIfAborted();
+                    signal.addEventListener("abort", () => {
+                        if (turnStopRequestedAt !== null)
+                            return;
+                        turnStopRequestedAt = now();
+                        pendingToolsAtStop = [...interruptionTools.values()].filter(isPendingAcpTool);
+                    }, { once: true });
+                    // After entering startTurn, a thrown error cannot prove the provider
+                    // received no work. Only failures before this boundary are free to settle.
+                    turnDispatchAttempted = true;
                     const turn = runtime.startTurn({
                         handle: sessionHandle,
                         text: runPrompt,
@@ -3859,6 +3967,8 @@ export function createAcpxEngineExecutor(deps = {}) {
                     const drainEvents = (async () => {
                         for await (const event of turn.events) {
                             lastRuntimeEventAt = now();
+                            if (turnStopRequestedAt === null)
+                                lastRuntimeEventBeforeStopAt = lastRuntimeEventAt;
                             observedRuntimeEvents += 1;
                             // ACPX currently flattens client-side filesystem/terminal receipts
                             // into status text. They cannot establish complete action outcomes.
@@ -3872,6 +3982,7 @@ export function createAcpxEngineExecutor(deps = {}) {
                                     interruptionTools.set(event.toolCallId, {
                                         kind: event.kind ?? previous?.kind,
                                         status: event.status ?? previous?.status,
+                                        firstSeenAt: previous?.firstSeenAt ?? lastRuntimeEventAt,
                                     });
                                 }
                             }
@@ -3888,6 +3999,10 @@ export function createAcpxEngineExecutor(deps = {}) {
                             if (event.type === "status" && event.tag === "usage_update") {
                                 eventBreakdown = event.breakdown ?? eventBreakdown;
                                 eventCostUsd = usdCostAmount(event.cost) ?? eventCostUsd;
+                                const checkpoint = summarizeAcpxTurnUsage({ preStatus: preTurnStatus, postStatus: null, eventBreakdown, eventCostUsd });
+                                observedUsage = { usage: checkpoint.usage ?? undefined, costUsd: checkpoint.costUsd, usageBasis: "per_run", usageComplete: false };
+                                await ctx.onUsage?.({ ...billingFields, usage: checkpoint.usage ?? undefined, costUsd: checkpoint.costUsd,
+                                    model: accountingModel, usageBasis: "per_run", complete: false });
                             }
                             await emitRuntimeEvent(ctx, event, toolTitles, prepared.coalescePlaceholderToolUpdates);
                         }
@@ -3921,12 +4036,14 @@ export function createAcpxEngineExecutor(deps = {}) {
                     // Capture runtime activity before usage reads, error logs, or cleanup
                     // make an otherwise silent turn look active at its execution deadline.
                     const lastEventAgeMs = lastRuntimeEventAt === null ? undefined : now() - lastRuntimeEventAt;
+                    const pendingTools = [...interruptionTools.values()].filter(isPendingAcpTool);
                     const activityDiagnostics = {
                         acpObservedEventCount: observedRuntimeEvents,
                         ...(lastEventAgeMs !== undefined && Number.isSafeInteger(lastEventAgeMs) && lastEventAgeMs >= 0
                             ? { acpLastEventAgeMs: lastEventAgeMs } : {}),
-                        acpPendingToolCount: [...interruptionTools.values()].filter((tool) => tool.status !== "completed" && tool.status !== "failed" && tool.status !== "cancelled").length,
+                        acpPendingToolCount: pendingTools.length,
                         acpToolInventoryComplete: !incompleteToolInventory,
+                        ...summarizeAcpStopActivity(turnStopRequestedAt, lastRuntimeEventBeforeStopAt, pendingToolsAtStop ?? pendingTools),
                     };
                     if (input.kind === "terminal") {
                         const terminal = input.terminal;
@@ -3964,12 +4081,19 @@ export function createAcpxEngineExecutor(deps = {}) {
                         const turnSucceeded = terminal.status === "completed" && !timedOut && !channelLost;
                         // Read usage before the settlement can discard runtime state.
                         const postTurnStatus = await readRuntimeStatus(runtime, sessionHandle);
+                        accountingModel = acpxAccountingModel(prepared.requestedModel, preTurnStatus, postTurnStatus);
                         const turnUsage = summarizeAcpxTurnUsage({
                             preStatus: preTurnStatus,
                             postStatus: postTurnStatus,
                             eventBreakdown,
                             eventCostUsd,
                         });
+                        // An interrupted stream is provisional unless the runtime supplies its
+                        // post-terminal receipt. An in-stream usage_update alone cannot close it.
+                        const usageComplete = !channelLost && (turnSucceeded || postTurnStatus?.usage != null);
+                        observedUsage = { usage: turnUsage.usage ?? undefined, costUsd: turnUsage.costUsd, usageBasis: "per_run", usageComplete };
+                        await ctx.onUsage?.({ ...billingFields, usage: turnUsage.usage ?? undefined, costUsd: turnUsage.costUsd,
+                            model: accountingModel, usageBasis: "per_run", complete: usageComplete });
                         const failedTurn = terminal.status === "failed" || terminal.status === "cancelled" || timedOut;
                         // ACPX can defer session/load until runTurn. Forget an unavailable
                         // session so the next bounded turn receives the full task conversation.
@@ -4052,9 +4176,10 @@ export function createAcpxEngineExecutor(deps = {}) {
                             sessionDisplayId: sessionHandle.agentSessionId ?? sessionHandle.backendSessionId ?? sessionHandle.runtimeSessionName,
                             ...billingFields,
                             ...referencedProjectStagingFailuresField,
-                            model: prepared.requestedModel || null,
+                            model: accountingModel,
                             ...(turnUsage.usage ? { usage: turnUsage.usage, usageBasis: "per_run" } : {}),
                             costUsd: turnUsage.costUsd,
+                            usageComplete,
                             resultJson: {
                                 status: channelLost ? "failed" : terminal.status,
                                 ...activityDiagnostics,
@@ -4185,9 +4310,11 @@ export function createAcpxEngineExecutor(deps = {}) {
                         errorMessage: message,
                         errorCode: timedOut ? "acpx_timeout" : (emitted?.classified.errorCode ?? null),
                         errorMeta: emitted?.classified.errorMeta,
+                        ...observedUsage,
+                        ...(!turnDispatchAttempted ? { executionRecovery: { kind: "bootstrap", providerWorkStarted: false } } : {}),
                         ...billingFields,
                         ...referencedProjectStagingFailuresField,
-                        model: prepared.requestedModel || null,
+                        model: accountingModel,
                         clearSession: clearSession || timedOut,
                         resultJson: { phase, ...activityDiagnostics },
                         summary: message,