chore(vendor): re-carry patches and adapt src to interchange 4cc6972

Verbatim adoptions of mime/mailbox/harness and workflow-host's narrow subset; types runtime split carried with ledger markers; inference's 9 commits merged with 3-way-resolved carries; storage-isogit e75eee2 verified safe (no first-party sync.request/statePushed/createStatePack/undeploy use); reasoning-effort c8be7e9 adopted; crypto/author/log unchanged. formatSafetyRatingText gains a ledgered compat re-export for the published @corbits/openai-responses dist, which still imports it from @intx/types/runtime.

Author: TheGreatAxios

bun.lock

@@ -1,9 +1,8 @@
-import {
-  createDependencies,
-  type Dependencies,
-  type AdapterManifest,
-} from "@intx/inference";
+import { createDependencies, type Dependencies } from "@intx/inference";
 import { loadAdapterRegistry } from "@intx/inference/providers";
+// AdapterManifest moved from the @intx/inference barrel to @intx/types at
+// upstream 4cc6972 (the inference barrel no longer re-exports it).
+import type { AdapterManifest } from "@intx/types";
 import * as openaiCompatible from "./openai-compatible-adapter.js";
 import * as opencodeGo from "./opencode-go-adapter.js";
 import * as codexResponses from "./codex-responses.js";

docs/VENDORING.md

@@ -26,6 +26,20 @@ test files into the new `testing/reactor-waiters.ts` (exported from
 `loadErrors` hooks and the FORBIDDEN_DEPS credential-failure companion
 suite re-carried onto the new shapes.
 
+### 2026-10-14 re-sync to `4cc6972` (CL-10656, HEAD drift 0.4.0 → base)
+
+All three entries re-carried; none dropped (`loadErrors` and error-seq
+resumption still absent upstream in this range). Upstream touched
+`agent.ts` (`d1835b` per-send `deliver` options adopted upstream, `660ef8`
+signature reflow); `agent.ts` three-way merged cleanly with zero
+adaptation — no upstream change intersects the two patch sites. New
+upstream files `authoring.ts` (authoring-only subpath barrel) and the
+`canonicalize.ts` helpers carried verbatim, with the `./authoring` and
+`./canonicalize` subpath exports wired into the vendored `package.json`
+(the inert `vendor/intx-workflow-host/workflow-definition-loader.ts` copy
+imports `./authoring` at its new pin). Upstream also deleted no vendored
+files and changed `testing/` not at all.
+
 ## agent-ts-resume-error-seq
 
 `agent.ts` — `createAgent` resumes `errorSeq` from `auditStore.loadErrors`

src/provider/inference-dependencies.ts

@@ -11,6 +11,14 @@
     "./testing": {
       "types": "./src/testing/index.ts",
       "default": "./src/testing/index.ts"
+    },
+    "./authoring": {
+      "types": "./src/authoring.ts",
+      "default": "./src/authoring.ts"
+    },
+    "./canonicalize": {
+      "types": "./src/canonicalize.ts",
+      "default": "./src/canonicalize.ts"
     }
   },
   "dependencies": {

vendor/intx-agent/PATCHES.md

@@ -61,6 +61,7 @@ import type {
   ConversationTurn,
   InboundMessage,
   InferenceSource,
+  PerCallInferenceOptions,
   ReactorDirector,
   ToolCall,
   ToolDefinition,
@@ -114,6 +115,16 @@ export type SendOptions = {
   signal?: AbortSignal;
   /** Override the default "from" header on the synthetic inbound message. */
   from?: string;
+  /**
+   * Inference options for the model calls this send drives. Applies to this
+   * send alone; a key the director names outright still wins.
+   */
+  inference?: PerCallInferenceOptions;
+};
+
+type QueuedSend = {
+  message: InboundMessage;
+  inference: PerCallInferenceOptions | undefined;
 };
 
 export type SendResult =
@@ -477,7 +488,7 @@ export async function createAgent<EnvReq extends BaseEnv>(
     // the language allows; the comment block above is what makes
     // the "assigned before any reachable read" invariant explicit.
     // eslint-disable-next-line prefer-const -- forward declaration; const cannot express this ordering
-    let sendQueue: SendQueue<InboundMessage, SendResult>;
+    let sendQueue: SendQueue<QueuedSend, SendResult>;
 
     // shutdownComplete resolves from the assembly's onShutdown hook
     // (composed after audit flush by the assembly) or, as a fallback, from
@@ -770,11 +781,11 @@ export async function createAgent<EnvReq extends BaseEnv>(
       ...(env.compactors !== undefined ? { compactors: env.compactors } : {}),
     });
 
-    sendQueue = createSendQueue<InboundMessage, SendResult>({
+    sendQueue = createSendQueue<QueuedSend, SendResult>({
       maxDepth: env.sendQueueMax ?? DEFAULT_SEND_QUEUE_MAX,
-      start: (message) => {
+      start: ({ message, inference }) => {
         activeCycle = { lastAssistantTurn: undefined };
-        reactor.deliver(message);
+        reactor.deliver(message, inference !== undefined ? { inference } : {});
       },
     });
 
@@ -813,7 +824,10 @@ export async function createAgent<EnvReq extends BaseEnv>(
       // and per the design must fail loud.
       if (closed) return Promise.reject(new AgentClosedError());
       const message = buildInboundMessage(content, opts);
-      return sendQueue.enqueue(message, opts?.signal);
+      return sendQueue.enqueue(
+        { message, inference: opts?.inference },
+        opts?.signal,
+      );
     }
 
     function stream(): AsyncIterable<ReactorEmittedEvent> {

vendor/intx-agent/package.json

@@ -185,6 +185,51 @@ spot-checks at the recorded positions are unchanged for the same reason
   reason now gains an in-tree companion test (added this sync) and is
   exercised on the abort paths of `e2e/reactor-approval-acceptance.test.ts`.
 
+### 2026-10-14 re-sync to `4cc6972` (CL-10656, HEAD drift 0.4.0 → base)
+
+Every entry re-carried against the pristine `4cc6972` tree; none dropped as
+upstream-absorbed (grep of the pristine tree: `isStreamTerminal`,
+`isPollOnlyPendingBatch`, `ephemeralTurns`, `loadErrors`, `turnsRevision`/
+`deepFreeze`, `isCommitting`, `MAX_LINE_LENGTH` — all still absent).
+Nine upstream commits touch this package (`0f72f95`, `1ff8805`, `a0be30`,
+`660ef8`, `d1e05e`, `cb61da`, `d1835b`, `c8be7e`, `2d973a`). Adaptation
+surface: 22 upstream-changed files; 9 vendored files carry local content
+and were three-way merged (`git merge-file`, ours/base/theirs), the rest
+copied verbatim.
+
+- `errors.ts` conflict: upstream `c8be7e` added
+  `classifyRequestBuildError` between `classifyNetworkError` and the
+  patched `classifyAbortError(reason?)`; both kept (upstream function
+  adopted, patch re-carried with its `ClassifiedAbortRaw` type).
+- `reactor.ts` two conflicts: (1) `d1835b` added
+  `mergeInferenceOptions`/`PerCallInferenceOptions` strip-copy beside the
+  patched `ExtendedInferenceOptions` (`ephemeralTurns`) — both kept; (2)
+  `d1835b`/`0f72f95` restructured `processDelivery` (per-send `deliver`
+  options, `deliveredInference` adoption, `expectedFrom` removal) inside
+  the atomic-acceptance critical section — the upstream adoption block
+  was re-slit above the patched `disposition` declaration, and the
+  `reactor-ts-atomic-approval-acceptance` `try/finally` boundary is
+  intact.
+- Clean three-way merges on patched files: `assembly.ts`,
+  `correlation.ts`, `errors.test.ts`, `harness.ts`, `index.ts`,
+  `providers/anthropic.ts`, `providers/google-genai.ts`,
+  `providers/openai.ts`, `reactor.test.ts`; patch hunks carry with zero
+  adaptation (`providers-ts-openai-exclusive-cache-usage`,
+  `inference-ts-cl-7783-truncated-tool-call` stop-reason chain verified
+  against the new `@intx/types` `inference-events.ts` sites and
+  `providers/anthropic.ts`). The vendored `index.ts` merged with
+  upstream's barrel: upstream moved the `AdapterManifest` export to
+  `@intx/types` (`adapter-manifest.ts`); first-party
+  `src/provider/inference-dependencies.ts` imports it there now.
+- `effort.ts`/`effort.test.ts` (`c8be7e` reasoning-effort mapping) and
+  `manifest.ts`'s new callers (`2d973a` adapter manifest) adopted
+  verbatim; the vendored `package.json` gains the upstream `./manifest`
+  and `./default-director` subpath exports.
+- Post-merge divergence proof: `bin/vendor-patch-diff` against the
+  recorded SHA prints the same +/− line multiset as the pre-sync ledger
+  diff (1324 + / 230 − for this package), i.e. no patch content lost and
+  no unledgered divergence gained.
+
 ## adapter-ts-stream-terminal-detector
 
 `adapter.ts` — Adds `StreamTerminalDetector`/`ProviderAdapter.isStreamTerminal`.

vendor/intx-agent/src/agent.ts

@@ -23,7 +23,7 @@ import {
   type ToolDefinition,
   type ToolResultTransform,
   type ToolRunner,
-} from "@intx/types/runtime";
+} from "@intx/types/runtime-core";
 
 import { createAuditCollector, type AuditCollector } from "./audit-collector";
 import {

vendor/intx-inference/PATCHES.md

@@ -11,6 +11,10 @@ import type { InboundMessage, PendingOperation } from "@intx/types/runtime";
  * Validates whether an inbound message is an authentic response to a
  * registered pending operation. Consumers provide this at reactor construction
  * time to enforce sender identity and signature checks.
+ *
+ * The reactor performs no sender check of its own, so a composition that
+ * supplies no validator resolves a pending operation for any message bearing a
+ * registered correlation ID. See MESSAGE.md (Correlation Security).
  */
 export interface CorrelationValidator {
   /**

vendor/intx-inference/src/assembly.ts

@@ -2,6 +2,7 @@ import { describe, test, expect } from "bun:test";
 import {
   classifyHTTPError,
   classifyNetworkError,
+  classifyRequestBuildError,
   classifyAbortError,
   classifyStreamError,
   classifyProtocolMismatch,
@@ -82,6 +83,16 @@ describe("classifyNetworkError", () => {
   });
 });
 
+describe("classifyRequestBuildError", () => {
+  test("Error instance → fatal with message", () => {
+    const cause = new Error("set maxTokens above 8192.");
+    const err = classifyRequestBuildError(cause);
+    expect(err.category).toBe("fatal");
+    expect(err.message).toBe("set maxTokens above 8192.");
+    expect(err.raw).toBe(cause);
+  });
+});
+
 describe("classifyAbortError", () => {
   test("always returns aborted category", () => {
     const err = classifyAbortError();