@botiverse/oar 0.79.0 → 0.80.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -3
- package/dist/contracts/install.d.ts +16 -10
- package/dist/contracts/install.d.ts.map +1 -1
- package/dist/contracts/session-unavailable-error.d.ts +6 -4
- package/dist/contracts/session-unavailable-error.d.ts.map +1 -1
- package/dist/contracts/session-unavailable-error.js +4 -2
- package/dist/contracts/session-unavailable-error.js.map +1 -1
- package/dist/runtimes/codex/app-server-client.d.ts +1 -1
- package/dist/runtimes/codex/app-server-client.d.ts.map +1 -1
- package/dist/runtimes/codex/session.d.ts.map +1 -1
- package/dist/runtimes/codex/session.js +11 -10
- package/dist/runtimes/codex/session.js.map +1 -1
- package/dist/runtimes/pi/rpc/open.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/open.js +3 -1
- package/dist/runtimes/pi/rpc/open.js.map +1 -1
- package/dist/runtimes/pi/rpc/session.js +2 -2
- package/dist/runtimes/pi/rpc/session.js.map +1 -1
- package/dist/runtimes/qoder/session.d.ts.map +1 -1
- package/dist/runtimes/qoder/session.js +2 -1
- package/dist/runtimes/qoder/session.js.map +1 -1
- package/dist/runtimes/qwen/session.d.ts.map +1 -1
- package/dist/runtimes/qwen/session.js +3 -1
- package/dist/runtimes/qwen/session.js.map +1 -1
- package/dist/shared/acp/client-app.d.ts +17 -4
- package/dist/shared/acp/client-app.d.ts.map +1 -1
- package/dist/shared/acp/client-app.js +35 -12
- package/dist/shared/acp/client-app.js.map +1 -1
- package/dist/shared/acp/initialize.d.ts +6 -0
- package/dist/shared/acp/initialize.d.ts.map +1 -0
- package/dist/shared/acp/initialize.js +30 -0
- package/dist/shared/acp/initialize.js.map +1 -0
- package/dist/shared/acp/profile.d.ts +2 -0
- package/dist/shared/acp/profile.d.ts.map +1 -1
- package/dist/shared/acp/profile.js +8 -24
- package/dist/shared/acp/profile.js.map +1 -1
- package/dist/shared/acp/protocol-error.d.ts +5 -0
- package/dist/shared/acp/protocol-error.d.ts.map +1 -0
- package/dist/shared/acp/protocol-error.js +6 -0
- package/dist/shared/acp/protocol-error.js.map +1 -0
- package/dist/shared/acp/records.d.ts +10 -8
- package/dist/shared/acp/records.d.ts.map +1 -1
- package/dist/shared/acp/records.js +24 -11
- package/dist/shared/acp/records.js.map +1 -1
- package/dist/shared/acp/routing.d.ts +59 -0
- package/dist/shared/acp/routing.d.ts.map +1 -0
- package/dist/shared/acp/routing.js +374 -0
- package/dist/shared/acp/routing.js.map +1 -0
- package/dist/shared/acp/session.d.ts +28 -2
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +163 -106
- package/dist/shared/acp/session.js.map +1 -1
- package/dist/shared/acp/shared-session.d.ts +27 -0
- package/dist/shared/acp/shared-session.d.ts.map +1 -0
- package/dist/shared/acp/shared-session.js +171 -0
- package/dist/shared/acp/shared-session.js.map +1 -0
- package/dist/shared/acp/shared-wire.d.ts +9 -0
- package/dist/shared/acp/shared-wire.d.ts.map +1 -0
- package/dist/shared/acp/shared-wire.js +113 -0
- package/dist/shared/acp/shared-wire.js.map +1 -0
- package/dist/shared/acp/turns.d.ts +4 -3
- package/dist/shared/acp/turns.d.ts.map +1 -1
- package/dist/shared/acp/turns.js +11 -4
- package/dist/shared/acp/turns.js.map +1 -1
- package/dist/shared/credential-redactor.d.ts +2 -0
- package/dist/shared/credential-redactor.d.ts.map +1 -1
- package/dist/shared/credential-redactor.js +1 -0
- package/dist/shared/credential-redactor.js.map +1 -1
- package/dist/shared/executable/diagnostics.d.ts +17 -0
- package/dist/shared/executable/diagnostics.d.ts.map +1 -1
- package/dist/shared/executable/diagnostics.js +11 -0
- package/dist/shared/executable/diagnostics.js.map +1 -1
- package/dist/shared/executable/ownership.d.ts.map +1 -1
- package/dist/shared/executable/ownership.js +22 -5
- package/dist/shared/executable/ownership.js.map +1 -1
- package/dist/shared/executable/process-cleanup.d.ts +29 -0
- package/dist/shared/executable/process-cleanup.d.ts.map +1 -0
- package/dist/shared/executable/process-cleanup.js +84 -0
- package/dist/shared/executable/process-cleanup.js.map +1 -0
- package/dist/shared/executable/process-tree.d.ts +29 -2
- package/dist/shared/executable/process-tree.d.ts.map +1 -1
- package/dist/shared/executable/process-tree.js +110 -21
- package/dist/shared/executable/process-tree.js.map +1 -1
- package/dist/shared/executable/process.d.ts +1 -1
- package/dist/shared/executable/process.d.ts.map +1 -1
- package/dist/shared/executable/process.js +20 -24
- package/dist/shared/executable/process.js.map +1 -1
- package/dist/shared/executable/run.d.ts.map +1 -1
- package/dist/shared/executable/run.js +16 -2
- package/dist/shared/executable/run.js.map +1 -1
- package/dist/shared/install-npm.d.ts.map +1 -1
- package/dist/shared/install-npm.js +31 -4
- package/dist/shared/install-npm.js.map +1 -1
- package/dist/shared/install.d.ts +1 -1
- package/dist/shared/install.js +1 -1
- package/dist/shared/process-pool.d.ts +5 -1
- package/dist/shared/process-pool.d.ts.map +1 -1
- package/dist/shared/process-pool.js +11 -8
- package/dist/shared/process-pool.js.map +1 -1
- package/dist/shared/process-session.d.ts.map +1 -1
- package/dist/shared/process-session.js +2 -1
- package/dist/shared/process-session.js.map +1 -1
- package/dist/shared/session-credentials.d.ts +2 -2
- package/dist/shared/session-credentials.d.ts.map +1 -1
- package/dist/shared/session-credentials.js +21 -18
- package/dist/shared/session-credentials.js.map +1 -1
- package/dist/shared/session-kernel.d.ts +2 -0
- package/dist/shared/session-kernel.d.ts.map +1 -1
- package/dist/shared/session-kernel.js +1 -1
- package/dist/shared/session-kernel.js.map +1 -1
- package/dist/shared/stream-json/session.d.ts.map +1 -1
- package/dist/shared/stream-json/session.js +10 -3
- package/dist/shared/stream-json/session.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* oxlint-disable typescript/promise-function-async -- SDK handlers deliberately return terminal promises directly. */
|
|
2
|
-
import { client as createClient, methods, } from "@agentclientprotocol/sdk";
|
|
2
|
+
import { client as createClient, methods, RequestError, } from "@agentclientprotocol/sdk";
|
|
3
3
|
/** OAR's YOLO answer to a permission request: the broadest allow on offer, else cancel. */
|
|
4
4
|
export function allowPermission(request) {
|
|
5
5
|
const selected = request.options.find((option) => option.kind === "allow_always")
|
|
@@ -22,15 +22,38 @@ function isParamsRecord(params) {
|
|
|
22
22
|
return params !== null && typeof params === "object" && !Array.isArray(params);
|
|
23
23
|
}
|
|
24
24
|
const passthrough = (params) => isParamsRecord(params) ? params : {};
|
|
25
|
+
// The SDK's built-in session router has already validated this notification.
|
|
26
|
+
// Its second schema parse would clone params and lose private wire metadata.
|
|
27
|
+
function originalNotification(params) {
|
|
28
|
+
if (!isParamsRecord(params) || typeof params.sessionId !== "string" || !isParamsRecord(params.update)) {
|
|
29
|
+
throw new TypeError("Invalid ACP session notification");
|
|
30
|
+
}
|
|
31
|
+
// oxlint-disable-next-line typescript/consistent-type-assertions, typescript/no-unsafe-type-assertion -- SDK SessionUpdateRouter validated the complete schema before this handler.
|
|
32
|
+
return params;
|
|
33
|
+
}
|
|
25
34
|
/** Compose OAR's typed ACP client handlers directly on the official SDK app. */
|
|
26
35
|
export function createAcpClientApp(terminal, hooks) {
|
|
36
|
+
return createRoutedAcpClientApp({
|
|
37
|
+
target: () => Promise.resolve({ terminal, hooks }),
|
|
38
|
+
update: hooks.update,
|
|
39
|
+
extension: hooks.extension,
|
|
40
|
+
extensionNotifications: hooks.extensionNotifications,
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
/** Shared and isolated connections use the same permission and terminal handlers. */
|
|
44
|
+
export function createRoutedAcpClientApp(routing) {
|
|
27
45
|
// Every client request is a toApp request record; the reply (or thrown
|
|
28
46
|
// error) is the answered response.
|
|
29
47
|
const observed = (method, handle) => async (context) => {
|
|
30
48
|
const id = requestIdOf(context);
|
|
31
|
-
hooks.
|
|
49
|
+
const { terminal, hooks, receivedAt, active } = await routing.target(method, context.params, context.requestId);
|
|
50
|
+
hooks.requested(id, method, context.params, receivedAt);
|
|
32
51
|
try {
|
|
33
|
-
|
|
52
|
+
context.signal.throwIfAborted();
|
|
53
|
+
if (active?.() === false) {
|
|
54
|
+
throw RequestError.invalidParams(undefined, "ACP native session no longer accepts host requests");
|
|
55
|
+
}
|
|
56
|
+
const reply = await handle(context.params, terminal);
|
|
34
57
|
hooks.answered(id, reply);
|
|
35
58
|
return reply;
|
|
36
59
|
}
|
|
@@ -41,17 +64,17 @@ export function createAcpClientApp(terminal, hooks) {
|
|
|
41
64
|
};
|
|
42
65
|
let app = createClient({ name: "oar" })
|
|
43
66
|
.onRequest(methods.client.session.requestPermission, observed(methods.client.session.requestPermission, allowPermission))
|
|
44
|
-
.onRequest(methods.client.terminal.create, observed(methods.client.terminal.create, (params) => terminal.create(params)))
|
|
45
|
-
.onRequest(methods.client.terminal.output, observed(methods.client.terminal.output, (params) => terminal.output(params)))
|
|
46
|
-
.onRequest(methods.client.terminal.waitForExit, observed(methods.client.terminal.waitForExit, (params) => terminal.waitForExit(params)))
|
|
47
|
-
.onRequest(methods.client.terminal.kill, observed(methods.client.terminal.kill, (params) => terminal.kill(params)))
|
|
48
|
-
.onRequest(methods.client.terminal.release, observed(methods.client.terminal.release, (params) => terminal.release(params)))
|
|
49
|
-
.onNotification(methods.client.session.update, ({ params }) => {
|
|
50
|
-
|
|
67
|
+
.onRequest(methods.client.terminal.create, observed(methods.client.terminal.create, (params, terminal) => terminal.create(params)))
|
|
68
|
+
.onRequest(methods.client.terminal.output, observed(methods.client.terminal.output, (params, terminal) => terminal.output(params)))
|
|
69
|
+
.onRequest(methods.client.terminal.waitForExit, observed(methods.client.terminal.waitForExit, (params, terminal) => terminal.waitForExit(params)))
|
|
70
|
+
.onRequest(methods.client.terminal.kill, observed(methods.client.terminal.kill, (params, terminal) => terminal.kill(params)))
|
|
71
|
+
.onRequest(methods.client.terminal.release, observed(methods.client.terminal.release, (params, terminal) => terminal.release(params)))
|
|
72
|
+
.onNotification(methods.client.session.update, originalNotification, ({ params }) => {
|
|
73
|
+
routing.update(params);
|
|
51
74
|
});
|
|
52
|
-
for (const method of
|
|
75
|
+
for (const method of routing.extensionNotifications) {
|
|
53
76
|
app = app.onNotification(method, passthrough, ({ params }) => {
|
|
54
|
-
|
|
77
|
+
routing.extension(method, params);
|
|
55
78
|
});
|
|
56
79
|
}
|
|
57
80
|
return app;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-app.js","sources":["../../../src/shared/acp/client-app.ts"],"names":[],"mappings":"AAAA,sHAAsH;AACtH,OAAO,EACL,MAAM,IAAI,YAAY,EACtB,OAAO,
|
|
1
|
+
{"version":3,"file":"client-app.js","sources":["../../../src/shared/acp/client-app.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { SessionOptions } from "../../contracts/session.js";
|
|
2
|
+
import { type JsonRecord } from "../json.js";
|
|
3
|
+
import type { AcpOpenObserver, AcpSessionProfile } from "./profile.js";
|
|
4
|
+
import { type AcpProcess } from "./process.js";
|
|
5
|
+
export declare function initializeAcpConnection(process: AcpProcess, profile: AcpSessionProfile, options: SessionOptions, observe: AcpOpenObserver): Promise<JsonRecord>;
|
|
6
|
+
//# sourceMappingURL=initialize.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"initialize.d.ts","sources":["../../../src/shared/acp/initialize.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACvE,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,cAAc,CAAC;AAEhE,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,UAAU,CAAC,CAoCrB"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/* oxlint-disable typescript/promise-function-async -- SDK request callbacks return the native promise. */
|
|
2
|
+
import { methods, PROTOCOL_VERSION } from "@agentclientprotocol/sdk";
|
|
3
|
+
import { asRecord } from "../json.js";
|
|
4
|
+
import { withAcpDeadline } from "./process.js";
|
|
5
|
+
export async function initializeAcpConnection(process, profile, options, observe) {
|
|
6
|
+
const meta = profile.initializeMeta?.(options);
|
|
7
|
+
const method = methods.agent.initialize;
|
|
8
|
+
const initialized = await withAcpDeadline(process, method, profile.requestTimeoutMs ?? 15_000, (requestOptions) => process.connection.agent.request(method, {
|
|
9
|
+
protocolVersion: PROTOCOL_VERSION,
|
|
10
|
+
clientCapabilities: {
|
|
11
|
+
fs: { readTextFile: false, writeTextFile: false },
|
|
12
|
+
terminal: true,
|
|
13
|
+
},
|
|
14
|
+
clientInfo: { name: "oar", version: "0.0.0" },
|
|
15
|
+
...(meta === undefined ? {} : { _meta: meta }),
|
|
16
|
+
}, requestOptions));
|
|
17
|
+
const response = asRecord(initialized);
|
|
18
|
+
if (response === null) {
|
|
19
|
+
throw new TypeError(`ACP ${method} returned a non-object response`);
|
|
20
|
+
}
|
|
21
|
+
observe({ method, response });
|
|
22
|
+
const authMethod = profile.selectAuthMethod?.(response);
|
|
23
|
+
if (authMethod !== undefined) {
|
|
24
|
+
const authenticate = methods.agent.authenticate;
|
|
25
|
+
const authenticated = await withAcpDeadline(process, authenticate, profile.requestTimeoutMs ?? 15_000, (requestOptions) => process.connection.agent.request(authenticate, { methodId: authMethod }, requestOptions));
|
|
26
|
+
observe({ method: authenticate, response: asRecord(authenticated) ?? {} });
|
|
27
|
+
}
|
|
28
|
+
return response;
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=initialize.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"initialize.js","sources":["../../../src/shared/acp/initialize.ts"],"names":[],"mappings":"AAAA,0GAA0G;AAC1G,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,EAAE,QAAQ,EAAmB,MAAM,YAAY,CAAC;AAEvD,OAAO,EAAmB,eAAe,EAAE,MAAM,cAAc,CAAC;AAEhE,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,OAAmB,EACnB,OAA0B,EAC1B,OAAuB,EACvB,OAAwB;IAExB,MAAM,IAAI,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,OAAO,CAAC,CAAC;IAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC;IACxC,MAAM,WAAW,GAAG,MAAM,eAAe,CACvC,OAAO,EACP,MAAM,EACN,OAAO,CAAC,gBAAgB,IAAI,MAAM,EAClC,CAAC,cAAc,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE;QAC3D,eAAe,EAAE,gBAAgB;QACjC,kBAAkB,EAAE;YAClB,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE;YACjD,QAAQ,EAAE,IAAI;SACf;QACD,UAAU,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE;QAC7C,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;KAC/C,EAAE,cAAc,CAAC,CACnB,CAAC;IACF,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;IACvC,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QAAC,MAAM,IAAI,SAAS,CAAC,OAAO,MAAM,iCAAiC,CAAC,CAAC;IAAC,CAAC;IAC/F,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC9B,MAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,QAAQ,CAAC,CAAC;IACxD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC;QAChD,MAAM,aAAa,GAAG,MAAM,eAAe,CACzC,OAAO,EACP,YAAY,EACZ,OAAO,CAAC,gBAAgB,IAAI,MAAM,EAClC,CAAC,cAAc,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAClD,YAAY,EACZ,EAAE,QAAQ,EAAE,UAAU,EAAE,EACxB,cAAc,CACf,CACF,CAAC;QACF,OAAO,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC7E,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -111,4 +111,6 @@ export declare function hasAcpCapability(value: unknown): boolean;
|
|
|
111
111
|
export declare function promptAcp(process: AcpProcess, sessionId: string, prompt: readonly JsonRecord[], extraParams?: JsonRecord): Promise<JsonRecord>;
|
|
112
112
|
export declare function closeAcpSession(process: AcpProcess, sessionId: string): Promise<void>;
|
|
113
113
|
export declare function openAcpSession(process: AcpProcess, profile: AcpSessionProfile, options: SessionOptions, observe?: AcpOpenObserver): Promise<OpenedAcpSession>;
|
|
114
|
+
/** Open/configure one session on an already initialized connection. */
|
|
115
|
+
export declare function openInitializedAcpSession(process: AcpProcess, profile: AcpSessionProfile, options: SessionOptions, initialized: JsonRecord, observe?: AcpOpenObserver, bind?: (sessionId: string) => void): Promise<OpenedAcpSession>;
|
|
114
116
|
//# sourceMappingURL=profile.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.d.ts","sources":["../../../src/shared/acp/profile.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9H,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"profile.d.ts","sources":["../../../src/shared/acp/profile.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/* oxlint-disable typescript/promise-function-async -- Deadline callbacks deliberately return the SDK's native promises. */
|
|
2
|
-
import { methods
|
|
2
|
+
import { methods } from "@agentclientprotocol/sdk";
|
|
3
3
|
import { asRecord } from "../json.js";
|
|
4
|
+
import { initializeAcpConnection } from "./initialize.js";
|
|
4
5
|
import { acpAdditionalDirectories } from "./additional-directories.js";
|
|
5
6
|
import { applyAcpEffort, applyAcpModel } from "./effort.js";
|
|
6
7
|
import { acpResumeFailure, acpOpenStep } from "./failure.js";
|
|
@@ -34,28 +35,6 @@ export async function closeAcpSession(process, sessionId) {
|
|
|
34
35
|
const method = methods.agent.session.close;
|
|
35
36
|
await withAcpDeadline(process, method, 2000, (requestOptions) => process.connection.agent.request(method, { sessionId }, requestOptions));
|
|
36
37
|
}
|
|
37
|
-
async function initialize(process, profile, options, observe) {
|
|
38
|
-
const meta = profile.initializeMeta?.(options);
|
|
39
|
-
const method = methods.agent.initialize;
|
|
40
|
-
const initialized = await withAcpDeadline(process, method, profile.requestTimeoutMs ?? 15_000, (requestOptions) => process.connection.agent.request(method, {
|
|
41
|
-
protocolVersion: PROTOCOL_VERSION,
|
|
42
|
-
clientCapabilities: {
|
|
43
|
-
fs: { readTextFile: false, writeTextFile: false },
|
|
44
|
-
terminal: true,
|
|
45
|
-
},
|
|
46
|
-
clientInfo: { name: "oar", version: "0.0.0" },
|
|
47
|
-
...(meta === undefined ? {} : { _meta: meta }),
|
|
48
|
-
}, requestOptions));
|
|
49
|
-
const response = responseRecord(method, initialized);
|
|
50
|
-
observe({ method, response });
|
|
51
|
-
const authMethod = profile.selectAuthMethod?.(response);
|
|
52
|
-
if (authMethod !== undefined) {
|
|
53
|
-
const authenticate = methods.agent.authenticate;
|
|
54
|
-
const authenticated = await withAcpDeadline(process, authenticate, profile.requestTimeoutMs ?? 15_000, (requestOptions) => process.connection.agent.request(authenticate, { methodId: authMethod }, requestOptions));
|
|
55
|
-
observe({ method: authenticate, response: asRecord(authenticated) ?? {} });
|
|
56
|
-
}
|
|
57
|
-
return response;
|
|
58
|
-
}
|
|
59
38
|
async function createOrResume(process, profile, initialized, options, meta) {
|
|
60
39
|
const capabilities = asRecord(initialized.agentCapabilities);
|
|
61
40
|
const sessionCapabilities = asRecord(capabilities?.sessionCapabilities);
|
|
@@ -99,8 +78,13 @@ async function createOrResume(process, profile, initialized, options, meta) {
|
|
|
99
78
|
}
|
|
100
79
|
export async function openAcpSession(process, profile, options, observe = () => { }) {
|
|
101
80
|
// A refused login or model rejects the open as a RuntimeFailureError (failure.ts).
|
|
102
|
-
const initialized = await acpOpenStep(
|
|
81
|
+
const initialized = await acpOpenStep(initializeAcpConnection(process, profile, options, observe), "open");
|
|
82
|
+
return openInitializedAcpSession(process, profile, options, initialized, observe);
|
|
83
|
+
}
|
|
84
|
+
/** Open/configure one session on an already initialized connection. */
|
|
85
|
+
export async function openInitializedAcpSession(process, profile, options, initialized, observe = () => { }, bind = () => { }) {
|
|
103
86
|
const opened = await acpOpenStep(createOrResume(process, profile, initialized, options, profile.sessionMeta?.(options, initialized)), "open");
|
|
87
|
+
bind(opened.sessionId);
|
|
104
88
|
observe({ method: opened.openMethod, response: opened.response });
|
|
105
89
|
const setModelResponse = options.model === undefined
|
|
106
90
|
? undefined
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.js","sources":["../../../src/shared/acp/profile.ts"],"names":[],"mappings":"AAAA,2HAA2H;AAC3H,OAAO,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"profile.js","sources":["../../../src/shared/acp/profile.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"protocol-error.d.ts","sources":["../../../src/shared/acp/protocol-error.ts"],"names":[],"mappings":"AACA,+EAA+E;AAC/E,qBAAa,gBAAiB,SAAQ,KAAK;IACzC,SAAkB,IAAI,sBAAsB;CAC7C"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
/* oxlint-disable import/prefer-default-export -- Private named protocol ownership error. */
|
|
2
|
+
/** A native response violates the connection's protocol ownership contract. */
|
|
3
|
+
export class AcpProtocolError extends Error {
|
|
4
|
+
name = "AcpProtocolError";
|
|
5
|
+
}
|
|
6
|
+
//# sourceMappingURL=protocol-error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"protocol-error.js","sources":["../../../src/shared/acp/protocol-error.ts"],"names":[],"mappings":"AAAA,4FAA4F;AAC5F,+EAA+E;AAC/E,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IACvB,IAAI,GAAG,kBAAkB,CAAC;CAC7C"}
|
|
@@ -7,10 +7,9 @@ import type { AcpTokenUsage } from "./token-usage.js";
|
|
|
7
7
|
/**
|
|
8
8
|
* How ACP wire traffic lands in the record stream. Every frame is recorded
|
|
9
9
|
* verbatim; this module only decides the envelope (which session id) and the
|
|
10
|
-
* events.
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
* docs/spec/runtime-matrix.md).
|
|
10
|
+
* events. Every routed update retains its native session id. Shared
|
|
11
|
+
* connections prove ownership before this layer and provide only accepted
|
|
12
|
+
* parent/child links. Isolated profiles retain their existing attribution.
|
|
14
13
|
*/
|
|
15
14
|
export interface AcpRecorder {
|
|
16
15
|
/**
|
|
@@ -20,13 +19,13 @@ export interface AcpRecorder {
|
|
|
20
19
|
* session/set_model is answered, i.e. while still opening).
|
|
21
20
|
*/
|
|
22
21
|
bind(kernel: SessionKernel): void;
|
|
23
|
-
update(notification: SessionNotification): void;
|
|
22
|
+
update(notification: SessionNotification, receivedAt?: number): void;
|
|
24
23
|
/** A vendor extension notification, verbatim; a parent/child session pair links the graph. afterOpen is captured on the wire, before SDK routing or recorder buffering. */
|
|
25
|
-
extension(method: string, params: JsonRecord, afterOpen?: boolean): void;
|
|
24
|
+
extension(method: string, params: JsonRecord, afterOpen?: boolean, receivedAt?: number): void;
|
|
26
25
|
/** A handshake answer (initialize, session/new|resume|load, session/set_model, session/set_config_option): the runtime's word, with its model and effort reports as events. */
|
|
27
26
|
step(method: string, response: JsonRecord): void;
|
|
28
27
|
/** A runtime→app request, verbatim, under the runtime's own request id. */
|
|
29
|
-
requested(id: string, method: string, params: unknown): void;
|
|
28
|
+
requested(id: string, method: string, params: unknown, receivedAt?: number): void;
|
|
30
29
|
/** oar's answer to a runtime→app request. */
|
|
31
30
|
answered(id: string, reply: unknown): void;
|
|
32
31
|
}
|
|
@@ -44,5 +43,8 @@ export declare function acpLineageOf(params: JsonRecord): {
|
|
|
44
43
|
readonly parent: string;
|
|
45
44
|
readonly child: string;
|
|
46
45
|
} | null;
|
|
47
|
-
export declare function createAcpRecorder(usageGate: UsageUpdateGate, attributeUpdate?: AcpSessionProfile["attributeUpdate"], tokenUsage?: AcpTokenUsage
|
|
46
|
+
export declare function createAcpRecorder(usageGate: UsageUpdateGate, attributeUpdate?: AcpSessionProfile["attributeUpdate"], tokenUsage?: AcpTokenUsage, associations?: (method: string, params: JsonRecord) => readonly {
|
|
47
|
+
readonly parent: string;
|
|
48
|
+
readonly child: string;
|
|
49
|
+
}[]): AcpRecorder;
|
|
48
50
|
//# sourceMappingURL=records.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"records.d.ts","sources":["../../../src/shared/acp/records.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG1D,OAAO,EAAW,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD
|
|
1
|
+
{"version":3,"file":"records.d.ts","sources":["../../../src/shared/acp/records.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG1D,OAAO,EAAW,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,IAAI,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;IAClC,MAAM,CAAC,YAAY,EAAE,mBAAmB,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrE,2KAA2K;IAC3K,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9F,+KAA+K;IAC/K,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,GAAG,IAAI,CAAC;IACjD,2EAA2E;IAC3E,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClF,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;CAC5C;AAYD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAgB3G;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,eAAe,EAAE,eAAe,CAAC,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,EAAE,UAAU,CAAC,EAAE,aAAa,EAAE,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,SAAS;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE,GAAG,WAAW,CA0FpR"}
|
|
@@ -39,7 +39,8 @@ export function acpLineageOf(params) {
|
|
|
39
39
|
}
|
|
40
40
|
return null;
|
|
41
41
|
}
|
|
42
|
-
export function createAcpRecorder(usageGate, attributeUpdate, tokenUsage) {
|
|
42
|
+
export function createAcpRecorder(usageGate, attributeUpdate, tokenUsage, associations) {
|
|
43
|
+
const hostRequests = new Map();
|
|
43
44
|
const projections = new Map();
|
|
44
45
|
const projectionFor = (sessionId) => {
|
|
45
46
|
let state = projections.get(sessionId);
|
|
@@ -66,24 +67,28 @@ export function createAcpRecorder(usageGate, attributeUpdate, tokenUsage) {
|
|
|
66
67
|
append(kernel);
|
|
67
68
|
}
|
|
68
69
|
},
|
|
69
|
-
update(notification) {
|
|
70
|
+
update(notification, receivedAt) {
|
|
70
71
|
write((kernel) => {
|
|
71
72
|
const source = attributeUpdate?.(notification);
|
|
72
73
|
const update = asRecord(notification.update);
|
|
73
74
|
const sessionId = source?.sessionId ?? notification.sessionId;
|
|
74
75
|
const foreign = sessionId !== kernel.sessionId;
|
|
75
76
|
const events = update === null ? [] : projectAcpUpdate(projectionFor(sessionId), update);
|
|
76
|
-
|
|
77
|
+
const ownedLinks = associations?.(methods.client.session.update, asRecord(notification) ?? {});
|
|
78
|
+
if (ownedLinks !== undefined) {
|
|
79
|
+
events.push(...newSessionLinks(kernel, ownedLinks.map(({ parent, child }) => ({ parent, child, via: "tool_call" }))));
|
|
80
|
+
}
|
|
81
|
+
else if (source?.parent !== undefined) {
|
|
77
82
|
events.push(...newSessionLinks(kernel, [{ parent: source.parent, child: sessionId, via: "tool_call" }]));
|
|
78
83
|
}
|
|
79
84
|
const type = typeof update?.sessionUpdate === "string" ? update.sessionUpdate : methods.client.session.update;
|
|
80
|
-
const record = kernel.frame({ type, native: notification, events }, foreign ? { sessionId } : undefined);
|
|
85
|
+
const record = kernel.frame({ type, native: notification, events }, { ...(foreign ? { sessionId } : {}), ...(receivedAt === undefined ? {} : { receivedAt }) });
|
|
81
86
|
if (!foreign) {
|
|
82
87
|
usageGate.observe(events.some((event) => event.kind === "usage") ? record.seq : undefined);
|
|
83
88
|
}
|
|
84
89
|
});
|
|
85
90
|
},
|
|
86
|
-
extension(method, params, afterOpen
|
|
91
|
+
extension(method, params, afterOpen, receivedAt) {
|
|
87
92
|
write((kernel) => {
|
|
88
93
|
// The envelope says whose frame this is: a child session pushes its
|
|
89
94
|
// own `response_completed` / `turn_completed` on grok's vendor method
|
|
@@ -94,12 +99,13 @@ export function createAcpRecorder(usageGate, attributeUpdate, tokenUsage) {
|
|
|
94
99
|
const sessionId = stringField(params, ["sessionId"]);
|
|
95
100
|
const foreign = sessionId !== null && sessionId !== kernel.sessionId;
|
|
96
101
|
const lineage = acpLineageOf(params);
|
|
97
|
-
const
|
|
98
|
-
const
|
|
102
|
+
const links = associations?.(method, params) ?? (lineage === null ? [] : [lineage]);
|
|
103
|
+
const events = newSessionLinks(kernel, links.map(({ parent, child }) => ({ parent, child, via: "tool_call" })));
|
|
104
|
+
const usage = sessionId === kernel.sessionId ? tokenUsage?.extension(method, params, afterOpen ?? false) : null;
|
|
99
105
|
if (usage !== null && usage !== undefined) {
|
|
100
106
|
events.push(usage);
|
|
101
107
|
}
|
|
102
|
-
kernel.frame({ type: method, native: params, events }, foreign ? { sessionId } : undefined);
|
|
108
|
+
kernel.frame({ type: method, native: params, events }, { ...(foreign ? { sessionId } : {}), ...(receivedAt === undefined ? {} : { receivedAt }) });
|
|
103
109
|
});
|
|
104
110
|
},
|
|
105
111
|
step(method, response) {
|
|
@@ -112,14 +118,21 @@ export function createAcpRecorder(usageGate, attributeUpdate, tokenUsage) {
|
|
|
112
118
|
] });
|
|
113
119
|
});
|
|
114
120
|
},
|
|
115
|
-
requested(id, method, params) {
|
|
121
|
+
requested(id, method, params, receivedAt) {
|
|
116
122
|
write((kernel) => {
|
|
117
|
-
|
|
123
|
+
const sessionId = asRecord(params)?.sessionId;
|
|
124
|
+
const foreign = typeof sessionId === "string" && sessionId !== kernel.sessionId;
|
|
125
|
+
if (foreign) {
|
|
126
|
+
hostRequests.set(id, sessionId);
|
|
127
|
+
}
|
|
128
|
+
kernel.request("toApp", { kind: "native", type: method, native: params }, { id, ...(foreign ? { sessionId } : {}), ...(receivedAt === undefined ? {} : { receivedAt }) });
|
|
118
129
|
});
|
|
119
130
|
},
|
|
120
131
|
answered(id, reply) {
|
|
121
132
|
write((kernel) => {
|
|
122
|
-
|
|
133
|
+
const sessionId = hostRequests.get(id);
|
|
134
|
+
hostRequests.delete(id);
|
|
135
|
+
kernel.respond(id, { kind: "answered", native: reply ?? null }, sessionId === undefined ? undefined : { sessionId });
|
|
123
136
|
});
|
|
124
137
|
},
|
|
125
138
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"records.js","sources":["../../../src/shared/acp/records.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAmB,MAAM,YAAY,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,EAAE,OAAO,EAA4B,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAAE,gBAAgB,EAA2B,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"records.js","sources":["../../../src/shared/acp/records.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import { type JsonRpcId } from "@agentclientprotocol/sdk";
|
|
2
|
+
import type { CredentialRedactor } from "../credential-redactor.js";
|
|
3
|
+
import { type JsonRecord } from "../json.js";
|
|
4
|
+
export interface AcpAssociation {
|
|
5
|
+
readonly parent: string;
|
|
6
|
+
readonly child: string;
|
|
7
|
+
}
|
|
8
|
+
export interface AcpIngress {
|
|
9
|
+
readonly receivedAt: number;
|
|
10
|
+
readonly afterOpen: boolean;
|
|
11
|
+
}
|
|
12
|
+
export interface AcpUnattributed {
|
|
13
|
+
readonly method: string;
|
|
14
|
+
readonly params: unknown;
|
|
15
|
+
readonly receivedAt: number;
|
|
16
|
+
readonly reason: "expired" | "capacity" | "retired" | "unowned" | "conflict" | "connection_closed" | "pre_reservation";
|
|
17
|
+
}
|
|
18
|
+
export interface AcpOwner<T> {
|
|
19
|
+
readonly target: T;
|
|
20
|
+
/** Bind only the id returned by session/new. Collisions are protocol violations. */
|
|
21
|
+
bind(id: string): void;
|
|
22
|
+
/** Reserve resume/load before sending; earlier buffered traffic has no proven generation. */
|
|
23
|
+
reserve(id: string): void;
|
|
24
|
+
opened(): void;
|
|
25
|
+
stopRequests(): void;
|
|
26
|
+
associations(method: string, params: JsonRecord): readonly AcpAssociation[];
|
|
27
|
+
/** Retire every root/descendant id for this connection's lifetime. No guessed generations. */
|
|
28
|
+
dispose(): void;
|
|
29
|
+
}
|
|
30
|
+
export interface AcpRouting<T> {
|
|
31
|
+
redact(this: void, text: string): string;
|
|
32
|
+
redactValue<V>(this: void, value: V): V;
|
|
33
|
+
ingress(params: object, requestId?: JsonRpcId): void;
|
|
34
|
+
answered(requestId: JsonRpcId): void;
|
|
35
|
+
opened(id: string, resumed: boolean): void;
|
|
36
|
+
newStarted(requestId: JsonRpcId): void;
|
|
37
|
+
newFinished(requestId: JsonRpcId): void;
|
|
38
|
+
retired(id: string): boolean;
|
|
39
|
+
retireUnowned(id: string): boolean;
|
|
40
|
+
attach(target: T, credentials: CredentialRedactor): AcpOwner<T>;
|
|
41
|
+
notify(method: string, params: unknown, deliver: (target: T, ingress: AcpIngress) => void): void;
|
|
42
|
+
request(method: string, params: unknown, requestId?: JsonRpcId): Promise<{
|
|
43
|
+
readonly target: T;
|
|
44
|
+
readonly ingress: AcpIngress;
|
|
45
|
+
readonly active: () => boolean;
|
|
46
|
+
}>;
|
|
47
|
+
diagnostic(method: string, params: unknown, reason?: AcpUnattributed["reason"]): void;
|
|
48
|
+
close(): void;
|
|
49
|
+
}
|
|
50
|
+
/** Connection-local ownership, independent of sessions' kernels and native request-id allocation. */
|
|
51
|
+
export declare function createAcpRouting<T>(options: {
|
|
52
|
+
readonly associations?: (method: string, params: JsonRecord) => readonly AcpAssociation[];
|
|
53
|
+
readonly sessionId?: (method: string, params: JsonRecord) => string | null;
|
|
54
|
+
readonly diagnostic: (entry: AcpUnattributed) => void;
|
|
55
|
+
readonly maxFrames?: number;
|
|
56
|
+
readonly maxBytes?: number;
|
|
57
|
+
readonly waitMs?: number;
|
|
58
|
+
}): AcpRouting<T>;
|
|
59
|
+
//# sourceMappingURL=routing.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"routing.d.ts","sources":["../../../src/shared/acp/routing.ts"],"names":[],"mappings":"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"}
|