Merge pull request #1431 from corbitsdev/cl-10656-intx-triage-adopt-upstream-head-drift-mimemail

chore(vendor): adopt interchange 4cc6972 drift in vendored trees

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

@@ -1218,7 +1218,7 @@ describe("buildCompactionContinuationMessage", () => {
     expect(message.ref).toEqual({ uid: 0, mailbox: "system" });
     expect(message.headers.from).toBe("user@local");
     expect(message.headers.to).toEqual(["agent@local"]);
-    expect(message.headers.messageId.startsWith("compact-continue-")).toBe(
+    expect(message.headers.messageId?.startsWith("compact-continue-")).toBe(
       true,
     );
   });
@@ -1251,6 +1251,6 @@ describe("buildMailboxMailMessage", () => {
     expect(message.ref).toEqual({ uid: 0, mailbox: "system" });
     expect(message.headers.from).toBe("user@local");
     expect(message.headers.to).toEqual(["agent@local"]);
-    expect(message.headers.messageId.startsWith("mailbox-mail-")).toBe(true);
+    expect(message.headers.messageId?.startsWith("mailbox-mail-")).toBe(true);
   });
 });

src/provider/inference-dependencies.ts

@@ -718,6 +718,8 @@ test("mid-run steer paints QUEUED INPUT until the real director reads it", async
               deliver: (text, pending, settle) => {
                 const message = userInboundMessage(text, pending);
                 const messageId = message.headers.messageId;
+                if (messageId === undefined)
+                  throw new Error("userInboundMessage set no messageId");
                 steerMessageId.current = messageId;
                 bridge.beginQueuedInputDelivery(messageId);
                 void deliverAgentMessage({

src/session/runtime-assembly.test.ts

@@ -581,7 +581,7 @@ export function createDeliverRouting(
           () => targetAgent.deliver(message),
           (result) => {
             if (result.status === "accepted" && isOperatorMessage) {
-              state.acceptedInputObserver?.(message.headers.messageId);
+              state.acceptedInputObserver?.(messageId);
             } else if (isOperatorMessage) {
               state.discardAcceptedInputObserver?.(messageId);
             }

src/tui/queued-input-chrome.test.ts

@@ -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/tui/runner/submit.ts

@@ -4,6 +4,14 @@ In-process agent runtime built on `createReactorAssembly` from
 `@intx/inference`. Construct an agent, `send()` it a message,
 get a reply.
 
+Workflow packages can import `defineAgent`, tool and director declarations,
+and director registries from `@intx/agent/authoring`. That entry point keeps
+the reactor and agent execution runtime out of definition loading.
+
+`@intx/agent/canonicalize` exports `canonicalizeForHash` and
+`CanonicalizationError` for deterministic serialization of deploy-hash inputs
+without loading the agent execution runtime.
+
 Use this package when you want an agent you can drive from inside
 your own program — a CLI, a worker, a test, an embedded assistant.
 If you want an agent that lives behind a mailbox instead, see

vendor/intx-agent/PATCHES.md

@@ -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/README.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> {