@botiverse/oar 0.116.0 → 0.118.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/dist/contracts/list-models.d.ts +6 -0
- package/dist/contracts/list-models.d.ts.map +1 -1
- package/dist/runtimes/codex/list-models.d.ts.map +1 -1
- package/dist/runtimes/codex/list-models.js +23 -3
- package/dist/runtimes/codex/list-models.js.map +1 -1
- package/dist/runtimes/cursor/projection.d.ts.map +1 -1
- package/dist/runtimes/cursor/projection.js +8 -1
- package/dist/runtimes/cursor/projection.js.map +1 -1
- package/dist/runtimes/kimi/account-usage.d.ts.map +1 -1
- package/dist/runtimes/kimi/account-usage.js +6 -0
- package/dist/runtimes/kimi/account-usage.js.map +1 -1
- package/dist/runtimes/kimi/native-usage.d.ts.map +1 -1
- package/dist/runtimes/kimi/native-usage.js +9 -5
- package/dist/runtimes/kimi/native-usage.js.map +1 -1
- package/dist/runtimes/kimi/skills.d.ts.map +1 -1
- package/dist/runtimes/kimi/skills.js +27 -32
- package/dist/runtimes/kimi/skills.js.map +1 -1
- package/dist/runtimes/kimi/web-shutdown.d.ts +6 -0
- package/dist/runtimes/kimi/web-shutdown.d.ts.map +1 -0
- package/dist/runtimes/kimi/web-shutdown.js +40 -0
- package/dist/runtimes/kimi/web-shutdown.js.map +1 -0
- package/dist/runtimes/kimi/web-startup.d.ts.map +1 -1
- package/dist/runtimes/kimi/web-startup.js +3 -0
- package/dist/runtimes/kimi/web-startup.js.map +1 -1
- package/dist/runtimes/opencode/startup-gate.d.ts +4 -3
- package/dist/runtimes/opencode/startup-gate.d.ts.map +1 -1
- package/dist/runtimes/opencode/startup-gate.js +4 -3
- package/dist/runtimes/opencode/startup-gate.js.map +1 -1
- package/dist/runtimes/qwen/context-usage.d.ts +15 -0
- package/dist/runtimes/qwen/context-usage.d.ts.map +1 -0
- package/dist/runtimes/qwen/context-usage.js +77 -0
- package/dist/runtimes/qwen/context-usage.js.map +1 -0
- package/dist/runtimes/qwen/session.d.ts.map +1 -1
- package/dist/runtimes/qwen/session.js +7 -2
- package/dist/runtimes/qwen/session.js.map +1 -1
- package/dist/shared/stream-json/permission.d.ts +6 -0
- package/dist/shared/stream-json/permission.d.ts.map +1 -0
- package/dist/shared/stream-json/permission.js +12 -0
- package/dist/shared/stream-json/permission.js.map +1 -0
- package/dist/shared/stream-json/profile.d.ts +3 -0
- package/dist/shared/stream-json/profile.d.ts.map +1 -1
- package/dist/shared/stream-json/result-readback.d.ts +15 -0
- package/dist/shared/stream-json/result-readback.d.ts.map +1 -0
- package/dist/shared/stream-json/result-readback.js +74 -0
- package/dist/shared/stream-json/result-readback.js.map +1 -0
- package/dist/shared/stream-json/session.d.ts.map +1 -1
- package/dist/shared/stream-json/session.js +42 -35
- package/dist/shared/stream-json/session.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startup-gate.js","sources":["../../../src/runtimes/opencode/startup-gate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,WAAW,CAAC;AAE5E,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAGpE,MAAM,WAAW,GAAG,IAAI,GAAG,EAAoB,CAAC;AAEhD,kGAAkG;AAClG,SAAS,SAAS,CAAC,SAAiB;IAClC,IAAI,CAAC;QAAC,OAAO,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAAC,CAAC;IAC9C,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAAC,MAAM,KAAK,CAAC;QAAC,CAAC;QAChG,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QAClC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAAC,MAAM,KAAK,CAAC;QAAC,CAAC;QAC1C,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;IACtD,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,KAAc,IAAW,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC,CAAC,CAAC;AAErI,SAAS,aAAa,CAAC,OAAuB;IAC5C,MAAM,GAAG,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,GAAG,GAAG,gBAAgB,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;IACnD,MAAM,IAAI,GAAG,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACnG,oEAAoE;IACpE,MAAM,SAAS,GAAG,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;IACxE,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5E,CAAC;AAED,SAAS,SAAS,CAAC,SAAiB,EAAE,OAAiB;IACrD,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,OAAO,GAAG,EAAE;QACV,IAAI,QAAQ,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QACzB,QAAQ,GAAG,IAAI,CAAC;QAChB,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAAC,CAAC;aACrD,CAAC;YAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAAC,CAAC;IACxB,CAAC,CAAC;AACJ,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"startup-gate.js","sources":["../../../src/runtimes/opencode/startup-gate.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { ContextUsage } from "../../contracts/session.js";
|
|
2
|
+
import type { LineProcess } from "../../shared/executable/index.js";
|
|
3
|
+
import { type JsonRecord } from "../../shared/json.js";
|
|
4
|
+
import type { SessionKernel } from "../../shared/session-kernel.js";
|
|
5
|
+
/** Local readback measured at 2-15 ms; a missing answer must not hold turn completion indefinitely. */
|
|
6
|
+
export declare const QWEN_CONTEXT_TIMEOUT_MS = 1000;
|
|
7
|
+
/** Native last-prompt count, never result.usage's cumulative input or the estimated breakdown. */
|
|
8
|
+
export declare function qwenContextUsage(message: JsonRecord): ContextUsage | null;
|
|
9
|
+
/** Session-visible control, separate from private account/configuration queries. */
|
|
10
|
+
export declare function qwenContextReadback(child: Pick<LineProcess, "write">): {
|
|
11
|
+
query(kernel: SessionKernel): Promise<void>;
|
|
12
|
+
consume(message: JsonRecord): boolean;
|
|
13
|
+
end(code?: "runtime_exited" | "disposed"): void;
|
|
14
|
+
};
|
|
15
|
+
//# sourceMappingURL=context-usage.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"context-usage.d.ts","sources":["../../../src/runtimes/qwen/context-usage.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAkC,MAAM,4BAA4B,CAAC;AAC/F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAEpE,uGAAuG;AACvG,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAI5C,kGAAkG;AAClG,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,UAAU,GAAG,YAAY,GAAG,IAAI,CASzE;AAED,oFAAoF;AACpF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG;IACtE,KAAK,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC;IACtC,GAAG,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,UAAU,GAAG,IAAI,CAAC;CACjD,CAwCA"}
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
import { asRecord } from "../../shared/json.js";
|
|
3
|
+
/** Local readback measured at 2-15 ms; a missing answer must not hold turn completion indefinitely. */
|
|
4
|
+
export const QWEN_CONTEXT_TIMEOUT_MS = 1000;
|
|
5
|
+
const count = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : null;
|
|
6
|
+
/** Native last-prompt count, never result.usage's cumulative input or the estimated breakdown. */
|
|
7
|
+
export function qwenContextUsage(message) {
|
|
8
|
+
const response = asRecord(message.response);
|
|
9
|
+
const data = response?.subtype === "success" ? asRecord(response.response) : null;
|
|
10
|
+
if (data?.subtype !== "get_context_usage") {
|
|
11
|
+
return null;
|
|
12
|
+
}
|
|
13
|
+
const window = count(data.contextWindowSize);
|
|
14
|
+
const contextWindow = window !== null && window > 0 ? window : null;
|
|
15
|
+
const tokens = data.isEstimated === false ? count(data.totalTokens) : null;
|
|
16
|
+
if (tokens === null && contextWindow === null) {
|
|
17
|
+
return null;
|
|
18
|
+
}
|
|
19
|
+
return { tokens, contextWindow, percent: tokens === null || contextWindow === null ? null : tokens / contextWindow * 100 };
|
|
20
|
+
}
|
|
21
|
+
/** Session-visible control, separate from private account/configuration queries. */
|
|
22
|
+
export function qwenContextReadback(child) {
|
|
23
|
+
let pending = null;
|
|
24
|
+
return {
|
|
25
|
+
async query(kernel) {
|
|
26
|
+
const id = `qwen-context-${randomUUID()}`;
|
|
27
|
+
const native = { type: "control_request", request_id: id, request: { subtype: "get_context_usage", show_details: false } };
|
|
28
|
+
const { promise, resolve } = Promise.withResolvers();
|
|
29
|
+
let settled = false;
|
|
30
|
+
const finish = (body) => {
|
|
31
|
+
if (settled) {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
settled = true;
|
|
35
|
+
pending = null;
|
|
36
|
+
clearTimeout(timer);
|
|
37
|
+
kernel.respond(id, body);
|
|
38
|
+
resolve();
|
|
39
|
+
};
|
|
40
|
+
const isPending = () => !settled;
|
|
41
|
+
const timer = setTimeout(() => { finish({ kind: "rejected", code: "error", reason: "Qwen context readback timed out" }); }, QWEN_CONTEXT_TIMEOUT_MS);
|
|
42
|
+
pending = { id, kernel, finish };
|
|
43
|
+
kernel.request("toRuntime", { kind: "native", type: "get_context_usage", native }, { id });
|
|
44
|
+
const blocked = kernel.unreachable();
|
|
45
|
+
if (blocked !== null) {
|
|
46
|
+
finish(blocked);
|
|
47
|
+
}
|
|
48
|
+
else if (isPending()) {
|
|
49
|
+
try {
|
|
50
|
+
child.write(`${JSON.stringify(native)}\n`);
|
|
51
|
+
}
|
|
52
|
+
catch (error) {
|
|
53
|
+
finish({ kind: "rejected", code: "error", reason: error instanceof Error ? error.message : String(error) });
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
await promise;
|
|
57
|
+
},
|
|
58
|
+
consume(message) {
|
|
59
|
+
const response = asRecord(message.response);
|
|
60
|
+
const active = pending;
|
|
61
|
+
if (message.type !== "control_response" || active === null || response?.request_id !== active.id) {
|
|
62
|
+
return false;
|
|
63
|
+
}
|
|
64
|
+
const context = qwenContextUsage(message);
|
|
65
|
+
const events = context === null ? [] : [{ kind: "usage", usage: { context } }];
|
|
66
|
+
active.kernel.frame({ type: "control_response", native: message, responseTo: active.id, events });
|
|
67
|
+
active.finish(response.subtype === "success" ? { kind: "accepted" } : {
|
|
68
|
+
kind: "rejected", code: "runtime_refused", reason: typeof response.error === "string" ? response.error : "Qwen refused context readback",
|
|
69
|
+
});
|
|
70
|
+
return true;
|
|
71
|
+
},
|
|
72
|
+
end(code = "runtime_exited") {
|
|
73
|
+
pending?.finish(pending.kernel.unreachable() ?? { kind: "rejected", code, reason: "Qwen context readback stopped" });
|
|
74
|
+
},
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
//# sourceMappingURL=context-usage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"context-usage.js","sources":["../../../src/runtimes/qwen/context-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/qwen/session.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG5F,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/qwen/session.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG5F,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAQjE,wGAAwG;AACxG,wBAAgB,aAAa,CAAC,OAAO,EAAE,SAAS,SAAS,EAAE,GAAG,UAAU,CAKvE;AAED,wGAAwG;AACxG,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,gBAAgB,EAAE,CAO9F;AAED,eAAO,MAAM,WAAW,EAAE,YAkCxB,CAAC"}
|
|
@@ -5,6 +5,7 @@ import { withSessionCredentials } from "../../shared/session-credentials.js";
|
|
|
5
5
|
import { checkMcpServerNames, isHttpMcpServer } from "../../shared/mcp-servers.js";
|
|
6
6
|
import { asRecord } from "../../shared/json.js";
|
|
7
7
|
import { streamJsonSession } from "../../shared/stream-json/session.js";
|
|
8
|
+
import { qwenContextReadback } from "./context-usage.js";
|
|
8
9
|
import { closeQwen } from "./close.js";
|
|
9
10
|
import { launchQwen } from "./launch.js";
|
|
10
11
|
import { qwenControl, qwenPermissionResponse } from "./control.js";
|
|
@@ -33,6 +34,8 @@ export const qwenSession = withSessionCredentials(async (installation, options,
|
|
|
33
34
|
const mcpServers = qwenMcpConfig(options.mcpServers ?? []);
|
|
34
35
|
const child = await launchQwen(installation.command, sessionId, options);
|
|
35
36
|
const control = qwenControl(child);
|
|
37
|
+
const context = qwenContextReadback(child);
|
|
38
|
+
let canReadContext = false;
|
|
36
39
|
try {
|
|
37
40
|
return await streamJsonSession(child, sessionId, credentials, {
|
|
38
41
|
projection: qwenProjectionProfile, initial: initialQwenProjection(options.resume !== undefined),
|
|
@@ -40,7 +43,8 @@ export const qwenSession = withSessionCredentials(async (installation, options,
|
|
|
40
43
|
steer: false,
|
|
41
44
|
userMessage: (text, inputId) => `${JSON.stringify({ type: "user", uuid: inputId ?? randomUUID(), session_id: sessionId, parent_tool_use_id: null,
|
|
42
45
|
message: { role: "user", content: [{ type: "text", text }] } })}\n`,
|
|
43
|
-
consume: (message) => control.consume(message),
|
|
46
|
+
consume: (message) => control.consume(message) || context.consume(message),
|
|
47
|
+
beforeRootResult: (kernel, state) => canReadContext && !state.abortRequested ? context.query(kernel) : undefined,
|
|
44
48
|
open: async (projection) => {
|
|
45
49
|
// FIRST stdin frame must be initialize; a user frame first disables the control dispatcher.
|
|
46
50
|
const answer = await control.request({ subtype: "initialize", mcpServers, ...(options.effort === undefined ? {} : { effort: options.effort }) }).catch((error) => {
|
|
@@ -53,10 +57,11 @@ export const qwenSession = withSessionCredentials(async (installation, options,
|
|
|
53
57
|
if (native?.session_id !== sessionId) {
|
|
54
58
|
throw new Error(`Qwen initialized a different session: ${String(native?.session_id)}`);
|
|
55
59
|
}
|
|
60
|
+
canReadContext = asRecord(native.capabilities)?.can_get_context_usage === true;
|
|
56
61
|
const events = qwenEffort(answer, options.effort);
|
|
57
62
|
projection.report({ type: "control_response", native: answer, events });
|
|
58
63
|
},
|
|
59
|
-
exited: () => { control.end(); }, disposing: () => { control.end(); },
|
|
64
|
+
exited: () => { control.end(); context.end(); }, disposing: () => { control.end(); context.end("disposed"); },
|
|
60
65
|
permissionResponse: qwenPermissionResponse,
|
|
61
66
|
close: async (active) => { if (active) {
|
|
62
67
|
child.kill();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sources":["../../../src/runtimes/qwen/session.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"session.js","sources":["../../../src/runtimes/qwen/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { LineProcess } from "../executable/index.js";
|
|
2
|
+
import { type JsonRecord } from "../json.js";
|
|
3
|
+
import type { SessionKernel } from "../session-kernel.js";
|
|
4
|
+
/** Record a native app request and, where supported, the dialect's permission response. */
|
|
5
|
+
export declare function streamJsonAppRequest(kernel: SessionKernel, child: Pick<LineProcess, "write">, id: string, type: string, message: JsonRecord, permissionResponse?: (requestId: string, request: JsonRecord) => JsonRecord | null): void;
|
|
6
|
+
//# sourceMappingURL=permission.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"permission.d.ts","sources":["../../../src/shared/stream-json/permission.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,2FAA2F;AAC3F,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAC1I,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,KAAK,UAAU,GAAG,IAAI,GAAG,IAAI,CAQ1F"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { asRecord } from "../json.js";
|
|
2
|
+
/** Record a native app request and, where supported, the dialect's permission response. */
|
|
3
|
+
export function streamJsonAppRequest(kernel, child, id, type, message, permissionResponse) {
|
|
4
|
+
kernel.request("toApp", { kind: "native", type, native: message }, { id });
|
|
5
|
+
const request = asRecord(message.request);
|
|
6
|
+
const reply = type === "can_use_tool" && request !== null ? permissionResponse?.(id, request) : undefined;
|
|
7
|
+
if (reply !== undefined && reply !== null) {
|
|
8
|
+
child.write(`${JSON.stringify(reply)}\n`);
|
|
9
|
+
kernel.respond(id, { kind: "accepted", native: reply });
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=permission.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"permission.js","sources":["../../../src/shared/stream-json/permission.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAmB,MAAM,YAAY,CAAC;AAGvD,2FAA2F;AAC3F,MAAM,UAAU,oBAAoB,CAAC,MAAqB,EAAE,KAAiC,EAAE,EAAU,EAAE,IAAY,EAAE,OAAmB,EAC1I,kBAAkF;IAClF,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC3E,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,IAAI,KAAK,cAAc,IAAI,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,kBAAkB,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1G,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAC1C,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1D,CAAC;AACH,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { SessionKernel } from "../session-kernel.js";
|
|
1
2
|
import type { CompactionOperation } from "../manual-compaction.js";
|
|
2
3
|
import type { RuntimeEventBody, TurnOutcome, SessionCapabilities, Session, FrameBody, RequestRecord, ResponseBody } from "../../contracts/session.js";
|
|
3
4
|
import type { LoadedImage } from "../input-images.js";
|
|
@@ -56,6 +57,8 @@ export interface StreamJsonSessionProfile<S extends StreamJsonProjectionState> {
|
|
|
56
57
|
replace(state: S): void;
|
|
57
58
|
report(body: FrameBody): void;
|
|
58
59
|
}) => Promise<void>;
|
|
60
|
+
/** Read native settlement facts before publishing root turn end and draining queued input. Must settle on exit/disposal. */
|
|
61
|
+
readonly beforeRootResult?: (kernel: SessionKernel, state: S) => Promise<void> | void;
|
|
59
62
|
readonly exited: (code: number | null) => void;
|
|
60
63
|
/** Why OAR terminated its owned process; absent for an independent native exit. */
|
|
61
64
|
readonly exitReason?: () => string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.d.ts","sources":["../../../src/shared/stream-json/profile.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"profile.d.ts","sources":["../../../src/shared/stream-json/profile.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { LineProcess } from "../executable/index.js";
|
|
2
|
+
import { type JsonRecord } from "../json.js";
|
|
3
|
+
/** Keep native controls outside this queue: their replies may be what settlement awaits. */
|
|
4
|
+
export declare function streamJsonResultReadback(child: LineProcess, callbacks: {
|
|
5
|
+
consume(message: JsonRecord): boolean;
|
|
6
|
+
exiting(code: number | null): void;
|
|
7
|
+
before(): Promise<void> | void;
|
|
8
|
+
process(message: JsonRecord, receivedAt: number): void;
|
|
9
|
+
exited(code: number | null, reason?: string): void;
|
|
10
|
+
}): {
|
|
11
|
+
listen(): void;
|
|
12
|
+
settling(): boolean;
|
|
13
|
+
hasExited(): boolean;
|
|
14
|
+
};
|
|
15
|
+
//# sourceMappingURL=result-readback.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"result-readback.d.ts","sources":["../../../src/shared/stream-json/result-readback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAuB,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAElE,4FAA4F;AAC5F,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE;IACtE,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC;IACtC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;IACnC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC/B,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACvD,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpD,GAAG;IACF,MAAM,IAAI,IAAI,CAAC;IACf,QAAQ,IAAI,OAAO,CAAC;IACpB,SAAS,IAAI,OAAO,CAAC;CACtB,CAoDA"}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import { asRecord, parseJson } from "../json.js";
|
|
2
|
+
/** Keep native controls outside this queue: their replies may be what settlement awaits. */
|
|
3
|
+
export function streamJsonResultReadback(child, callbacks) {
|
|
4
|
+
const buffered = [];
|
|
5
|
+
let settling = false;
|
|
6
|
+
let exited = false;
|
|
7
|
+
let deferredExit = null;
|
|
8
|
+
const receive = (message, receivedAt) => {
|
|
9
|
+
if (settling) {
|
|
10
|
+
buffered.push({ message, receivedAt });
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
const rootResult = message.type === "result" && (typeof message.parent_tool_use_id !== "string" || message.parent_tool_use_id.length === 0);
|
|
14
|
+
if (rootResult && !exited) {
|
|
15
|
+
settling = true;
|
|
16
|
+
const waiting = callbacks.before();
|
|
17
|
+
if (waiting !== undefined) {
|
|
18
|
+
void (async () => {
|
|
19
|
+
try {
|
|
20
|
+
await waiting;
|
|
21
|
+
}
|
|
22
|
+
finally {
|
|
23
|
+
settling = false;
|
|
24
|
+
callbacks.process(message, receivedAt);
|
|
25
|
+
drain();
|
|
26
|
+
if (deferredExit !== null) {
|
|
27
|
+
callbacks.exited(deferredExit.code, deferredExit.reason);
|
|
28
|
+
deferredExit = null;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
})();
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
settling = false;
|
|
35
|
+
}
|
|
36
|
+
callbacks.process(message, receivedAt);
|
|
37
|
+
};
|
|
38
|
+
function drain() {
|
|
39
|
+
for (;;) {
|
|
40
|
+
if (settling) {
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
const next = buffered.shift();
|
|
44
|
+
if (next === undefined) {
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
receive(next.message, next.receivedAt);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
return {
|
|
51
|
+
settling: () => settling, hasExited: () => exited,
|
|
52
|
+
listen() {
|
|
53
|
+
child.onLine(line => {
|
|
54
|
+
const message = asRecord(parseJson(line));
|
|
55
|
+
if (message !== null && !callbacks.consume(message)) {
|
|
56
|
+
receive(message, Date.now());
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
child.onExit((code, reason) => {
|
|
60
|
+
exited = true;
|
|
61
|
+
// End awaited readbacks now; other controls must settle through promises,
|
|
62
|
+
// not synchronously publish responses before the exit record.
|
|
63
|
+
callbacks.exiting(code);
|
|
64
|
+
if (settling) {
|
|
65
|
+
deferredExit = { code, ...(reason === undefined ? {} : { reason }) };
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
callbacks.exited(code, reason);
|
|
69
|
+
}
|
|
70
|
+
});
|
|
71
|
+
},
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
//# sourceMappingURL=result-readback.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"result-readback.js","sources":["../../../src/shared/stream-json/result-readback.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sources":["../../../src/shared/stream-json/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.d.ts","sources":["../../../src/shared/stream-json/session.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAA8C,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAKtG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,EAA4B,KAAK,yBAAyB,EAA+B,MAAM,YAAY,CAAC;AACnH,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAE7D,sGAAsG;AACtG,wBAAsB,iBAAiB,CAAC,CAAC,SAAS,yBAAyB,EACzE,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,kBAAkB,EAC/B,OAAO,EAAE,wBAAwB,CAAC,CAAC,CAAC,GACnC,OAAO,CAAC,OAAO,CAAC,CAiRlB"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
+
import { streamJsonAppRequest } from "./permission.js";
|
|
2
|
+
import { streamJsonResultReadback } from "./result-readback.js";
|
|
1
3
|
import { writeHeldInput } from "./held-input.js";
|
|
2
4
|
import { streamJsonTaskControl } from "./task-control.js";
|
|
3
5
|
import { streamJsonCompaction } from "./compaction.js";
|
|
4
6
|
import { createAbortFallback } from "../abort-fallback.js";
|
|
5
7
|
import { withInputImages } from "../input-images.js";
|
|
6
8
|
import { withdrawControl } from "../held-input.js";
|
|
7
|
-
import { asRecord, parseJson } from "../json.js";
|
|
8
9
|
import { appendCleanupFailure, cleanupFailureReason } from "../executable/process-cleanup.js";
|
|
9
10
|
import { streamJsonUserMessage, streamJsonPrompted } from "./input-lifecycle.js";
|
|
10
11
|
import { foldStreamJsonStdout } from "./projection.js";
|
|
@@ -20,9 +21,9 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
20
21
|
const writtenQueues = new Map();
|
|
21
22
|
const heldQueue = [];
|
|
22
23
|
let dispatching = false;
|
|
23
|
-
const nativeBusy = () => state.active !== null || state.spontaneous;
|
|
24
|
+
const nativeBusy = () => !messages.settling() && (state.active !== null || state.spontaneous);
|
|
24
25
|
const compaction = streamJsonCompaction(kernel, profile, state, drainHeld, () => heldQueue.length > 0);
|
|
25
|
-
const busy = () => dispatching || nativeBusy() || compaction?.busy() === true;
|
|
26
|
+
const busy = () => dispatching || messages.settling() || nativeBusy() || compaction?.busy() === true;
|
|
26
27
|
let canCancelQueued = false;
|
|
27
28
|
const abortFallback = createAbortFallback(() => { child.kill(); });
|
|
28
29
|
const pendingInterrupts = new Map();
|
|
@@ -34,7 +35,7 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
34
35
|
try {
|
|
35
36
|
await observingCancellation?.result;
|
|
36
37
|
}
|
|
37
|
-
catch { /* The abort reports
|
|
38
|
+
catch { /* The abort reports observation failure; later input still proceeds. */ }
|
|
38
39
|
};
|
|
39
40
|
const sentInterrupts = new Set();
|
|
40
41
|
const completeCancellation = () => {
|
|
@@ -49,7 +50,7 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
49
50
|
}
|
|
50
51
|
};
|
|
51
52
|
function drainHeld() {
|
|
52
|
-
if (state.disposed || kernel.unreachable() !== null || busy() || observingCancellation !== null || heldQueue[0]?.accepted !== true) {
|
|
53
|
+
if (state.disposed || messages.hasExited() || kernel.unreachable() !== null || busy() || observingCancellation !== null || heldQueue[0]?.accepted !== true) {
|
|
53
54
|
return;
|
|
54
55
|
}
|
|
55
56
|
const next = heldQueue.shift();
|
|
@@ -66,18 +67,7 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
66
67
|
drainHeld();
|
|
67
68
|
}
|
|
68
69
|
}
|
|
69
|
-
|
|
70
|
-
child.onLine((line) => {
|
|
71
|
-
const message = asRecord(parseJson(line));
|
|
72
|
-
if (message === null) {
|
|
73
|
-
return;
|
|
74
|
-
}
|
|
75
|
-
if (message.type === "system" && message.subtype === "init" && typeof message.parent_tool_use_id !== "string" && Array.isArray(message.capabilities)) {
|
|
76
|
-
canCancelQueued = profile.cancelQueuedCapability !== undefined && message.capabilities.includes(profile.cancelQueuedCapability);
|
|
77
|
-
}
|
|
78
|
-
if (tasks?.consume(message) === true || profile.consume(message)) {
|
|
79
|
-
return;
|
|
80
|
-
}
|
|
70
|
+
const processMessage = (message, receivedAt) => {
|
|
81
71
|
const { state: nextProjection, commands } = foldStreamJsonStdout(profile.projection, state.projection, message);
|
|
82
72
|
state.projection = nextProjection;
|
|
83
73
|
if (message.type === "command_lifecycle" && message.state === "queued" && typeof message.command_uuid === "string") {
|
|
@@ -124,7 +114,7 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
124
114
|
state.active = null;
|
|
125
115
|
}
|
|
126
116
|
}
|
|
127
|
-
const record = kernel.frame(correlated ? { ...command.body, responseTo: nativeResponse } : command.body, { agentPath: command.agentPath });
|
|
117
|
+
const record = kernel.frame(correlated ? { ...command.body, responseTo: nativeResponse } : command.body, { agentPath: command.agentPath, receivedAt });
|
|
128
118
|
if (record.agentPath.length > 0) {
|
|
129
119
|
break;
|
|
130
120
|
}
|
|
@@ -148,16 +138,9 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
148
138
|
}
|
|
149
139
|
break;
|
|
150
140
|
}
|
|
151
|
-
case "toApp":
|
|
152
|
-
kernel
|
|
153
|
-
const request = asRecord(message.request);
|
|
154
|
-
const reply = command.type === "can_use_tool" && request !== null ? profile.permissionResponse?.(command.id, request) : undefined;
|
|
155
|
-
if (reply !== undefined && reply !== null) {
|
|
156
|
-
child.write(`${JSON.stringify(reply)}\n`);
|
|
157
|
-
kernel.respond(command.id, { kind: "accepted", native: reply });
|
|
158
|
-
}
|
|
141
|
+
case "toApp":
|
|
142
|
+
streamJsonAppRequest(kernel, child, command.id, command.type, message, profile.permissionResponse);
|
|
159
143
|
break;
|
|
160
|
-
}
|
|
161
144
|
default:
|
|
162
145
|
break;
|
|
163
146
|
}
|
|
@@ -174,8 +157,29 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
174
157
|
if (ended || (dropped && !busy())) {
|
|
175
158
|
drainHeld();
|
|
176
159
|
}
|
|
160
|
+
};
|
|
161
|
+
const messages = streamJsonResultReadback(child, {
|
|
162
|
+
before: () => {
|
|
163
|
+
if (profile.beforeRootResult === undefined || state.disposed) {
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
166
|
+
// Native work has ended; hold input without interrupting a completed turn during readback.
|
|
167
|
+
abortFallback.clear();
|
|
168
|
+
completeCancellation();
|
|
169
|
+
turnRevision += 1;
|
|
170
|
+
return profile.beforeRootResult(kernel, state.projection);
|
|
171
|
+
},
|
|
172
|
+
process: processMessage,
|
|
173
|
+
consume: (message) => {
|
|
174
|
+
if (message.type === "system" && message.subtype === "init" && typeof message.parent_tool_use_id !== "string" && Array.isArray(message.capabilities)) {
|
|
175
|
+
canCancelQueued = profile.cancelQueuedCapability !== undefined && message.capabilities.includes(profile.cancelQueuedCapability);
|
|
176
|
+
}
|
|
177
|
+
return tasks?.consume(message) === true || profile.consume(message);
|
|
178
|
+
},
|
|
179
|
+
exiting: profile.exited,
|
|
180
|
+
exited: (code, reason) => { finishExit(code, reason); },
|
|
177
181
|
});
|
|
178
|
-
|
|
182
|
+
const finishExit = (code, cleanupReason) => {
|
|
179
183
|
abortFallback.clear();
|
|
180
184
|
completeCancellation();
|
|
181
185
|
turnRevision += 1;
|
|
@@ -190,8 +194,8 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
190
194
|
kernel.respond(requestId, { kind: "rejected", code: "runtime_exited", reason: "runtime exited" });
|
|
191
195
|
}
|
|
192
196
|
tasks?.end();
|
|
193
|
-
|
|
194
|
-
|
|
197
|
+
};
|
|
198
|
+
messages.listen();
|
|
195
199
|
try {
|
|
196
200
|
await profile.open({ current: () => state.projection, replace: (projection) => { state.projection = projection; }, report: (body) => { kernel.frame(body); } });
|
|
197
201
|
}
|
|
@@ -211,6 +215,9 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
211
215
|
}
|
|
212
216
|
const body = { kind: "prompt", input, ...inputOptions };
|
|
213
217
|
return kernel.control(body, (request) => {
|
|
218
|
+
if (messages.hasExited()) {
|
|
219
|
+
return { kind: "rejected", code: "runtime_exited", reason: "runtime exited" };
|
|
220
|
+
}
|
|
214
221
|
if (busy() || heldQueue.length > 0) {
|
|
215
222
|
return { kind: "rejected", code: "busy", reason: "busy" };
|
|
216
223
|
}
|
|
@@ -244,6 +251,9 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
244
251
|
} : {}),
|
|
245
252
|
queue: async (input, inputOptions) => {
|
|
246
253
|
const result = await kernel.control({ kind: "queue", input, ...inputOptions }, (request) => withInputImages(capabilities, inputOptions?.images, (images) => {
|
|
254
|
+
if (messages.hasExited()) {
|
|
255
|
+
return { kind: "rejected", code: "runtime_exited", reason: "runtime exited" };
|
|
256
|
+
}
|
|
247
257
|
heldQueue.push({ request, input, ...(inputOptions?.inputId === undefined ? {} : { inputId: inputOptions.inputId }), options: { ...inputOptions }, images });
|
|
248
258
|
heldQueue.sort((left, right) => left.request.seq - right.request.seq);
|
|
249
259
|
return { kind: "accepted", queued: "adapter" };
|
|
@@ -310,11 +320,8 @@ export async function streamJsonSession(child, sessionId, credentials, profile)
|
|
|
310
320
|
}
|
|
311
321
|
observation.commit();
|
|
312
322
|
sentInterrupts.add(requestId);
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
request_id: requestId,
|
|
316
|
-
request: { subtype: "interrupt", ...(canCancelQueued && state.projection.unstartedInputs.size > 0 ? { cancel_queued: true } : {}) },
|
|
317
|
-
})}\n`);
|
|
323
|
+
const interrupt = { subtype: "interrupt", ...(canCancelQueued && state.projection.unstartedInputs.size > 0 ? { cancel_queued: true } : {}) };
|
|
324
|
+
child.write(`${JSON.stringify({ type: "control_request", request_id: requestId, request: interrupt })}\n`);
|
|
318
325
|
const result = await promise;
|
|
319
326
|
unsubscribe();
|
|
320
327
|
return result;
|