Skip to content

Commit 25d3daf

Browse files
committed
chore(vendor): adopt upstream HEAD content in vendored trees (4cc6972)
Verbatim adoption of the drift ranges triaged in docs/VENDORING.md; carried patches and ledgers land next.
1 parent 92b3dc4 commit 25d3daf

97 files changed

Lines changed: 11947 additions & 3621 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/session/runtime-assembly.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,7 @@ describe("buildCompactionContinuationMessage", () => {
12181218
expect(message.ref).toEqual({ uid: 0, mailbox: "system" });
12191219
expect(message.headers.from).toBe("user@local");
12201220
expect(message.headers.to).toEqual(["agent@local"]);
1221-
expect(message.headers.messageId.startsWith("compact-continue-")).toBe(
1221+
expect(message.headers.messageId?.startsWith("compact-continue-")).toBe(
12221222
true,
12231223
);
12241224
});
@@ -1251,6 +1251,6 @@ describe("buildMailboxMailMessage", () => {
12511251
expect(message.ref).toEqual({ uid: 0, mailbox: "system" });
12521252
expect(message.headers.from).toBe("user@local");
12531253
expect(message.headers.to).toEqual(["agent@local"]);
1254-
expect(message.headers.messageId.startsWith("mailbox-mail-")).toBe(true);
1254+
expect(message.headers.messageId?.startsWith("mailbox-mail-")).toBe(true);
12551255
});
12561256
});

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,8 @@ test("mid-run steer paints QUEUED INPUT until the real director reads it", async
718718
deliver: (text, pending, settle) => {
719719
const message = userInboundMessage(text, pending);
720720
const messageId = message.headers.messageId;
721+
if (messageId === undefined)
722+
throw new Error("userInboundMessage set no messageId");
721723
steerMessageId.current = messageId;
722724
bridge.beginQueuedInputDelivery(messageId);
723725
void deliverAgentMessage({

‎src/tui/runner/submit.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ export function createDeliverRouting(
581581
() => targetAgent.deliver(message),
582582
(result) => {
583583
if (result.status === "accepted" && isOperatorMessage) {
584-
state.acceptedInputObserver?.(message.headers.messageId);
584+
state.acceptedInputObserver?.(messageId);
585585
} else if (isOperatorMessage) {
586586
state.discardAcceptedInputObserver?.(messageId);
587587
}

‎vendor/intx-agent/README.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ In-process agent runtime built on `createReactorAssembly` from
44
`@intx/inference`. Construct an agent, `send()` it a message,
55
get a reply.
66

7+
Workflow packages can import `defineAgent`, tool and director declarations,
8+
and director registries from `@intx/agent/authoring`. That entry point keeps
9+
the reactor and agent execution runtime out of definition loading.
10+
11+
`@intx/agent/canonicalize` exports `canonicalizeForHash` and
12+
`CanonicalizationError` for deterministic serialization of deploy-hash inputs
13+
without loading the agent execution runtime.
14+
715
Use this package when you want an agent you can drive from inside
816
your own program — a CLI, a worker, a test, an embedded assistant.
917
If you want an agent that lives behind a mailbox instead, see

‎vendor/intx-agent/src/authoring.ts‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/** Agent definitions and declarations, without the agent execution runtime. */
2+
export {
3+
defineAgent,
4+
type AgentDefinition,
5+
type DefineAgentConfig,
6+
type EnvRequiredByAll,
7+
type InferencePreference,
8+
} from "./definition";
9+
export {
10+
defineTool,
11+
definePlugin,
12+
isAnnotatedPluginFactory,
13+
toolApprovalEffect,
14+
type AnnotatedPluginFactory,
15+
type AnnotatedToolFactory,
16+
type ToolDeclaration,
17+
} from "./tool";
18+
export {
19+
defineDirector,
20+
isAnnotatedDirectorFactory,
21+
type DefinedDirector,
22+
} from "./director";
23+
export {
24+
createDefaultDirectorRegistry,
25+
createDirectorRegistry,
26+
createWorkflowDirectorRegistry,
27+
UnknownDirectorIdError,
28+
} from "./director-registry";
29+
export {
30+
buildDefaultDirectorRef,
31+
defaultDirectorFactory,
32+
type DefaultDirectorConfig,
33+
} from "./default-director";
34+
export { effectiveDirectorRef } from "./env-validation";
35+
export type {
36+
AnnotatedDirectorFactory,
37+
DirectorRef,
38+
DirectorRegistry,
39+
} from "./director-types";
40+
export type { BaseEnv } from "./env";

‎vendor/intx-agent/src/default-director.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { type } from "arktype";
1818
import {
1919
createDefaultDirector,
2020
type DefaultDirectorPolicy,
21-
} from "@intx/inference";
21+
} from "@intx/inference/default-director";
2222

2323
import { defineDirector } from "./director";
2424

‎vendor/intx-agent/src/send-queue.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
// queue ordered against actual reactor cycles — two send() promises
1616
// cannot interleave at the reactor level.
1717
//
18+
// A `start` that throws synchronously rejects that item and pumps the
19+
// next, so a rejected item never occupies the active slot.
20+
//
1821
// Queue depth (active + pending) is bounded by `maxDepth`; exceeding it
1922
// throws `SendQueueFullError` synchronously from enqueue() so a buggy
2023
// caller flooding sends fails loud instead of silently buffering.
@@ -106,7 +109,13 @@ export function createSendQueue<T, R>(
106109
continue;
107110
}
108111
active = next;
109-
opts.start(next.item);
112+
try {
113+
opts.start(next.item);
114+
} catch (cause) {
115+
active = null;
116+
settle(next, "reject", cause);
117+
continue;
118+
}
110119
return;
111120
}
112121
}

‎vendor/intx-agent/src/source.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
InferenceSource as InferenceSourceValidator,
1919
applyInferenceSourceFields,
2020
type InferenceSource,
21-
} from "@intx/types/runtime";
21+
} from "@intx/types/runtime-core";
2222

2323
export class InvalidInferenceSourceError extends Error {
2424
constructor(message: string) {

‎vendor/intx-agent/src/tool.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// handler throws.
1919
//
2020
// `createToolRunner(tools)` builds a `ToolRunner` that dispatches by tool
21-
// name. Per the ToolRunner contract (packages/types/src/runtime.ts), `run`
21+
// name. Per the ToolRunner contract (packages/types/src/runtime-core.ts), `run`
2222
// must not throw -- unknown tool names and handler exceptions are surfaced
2323
// as `ToolResult` with `isError: true` so the model sees them and can
2424
// recover.

0 commit comments

Comments
 (0)