@botiverse/oar 0.109.0 → 0.111.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 +69 -39
- package/dist/contracts/account-usage.d.ts +10 -5
- package/dist/contracts/account-usage.d.ts.map +1 -1
- package/dist/contracts/installation.d.ts +3 -0
- package/dist/contracts/installation.d.ts.map +1 -1
- package/dist/contracts/inventory.d.ts +3 -1
- package/dist/contracts/inventory.d.ts.map +1 -1
- package/dist/contracts/list-models.d.ts +10 -0
- package/dist/contracts/list-models.d.ts.map +1 -1
- package/dist/contracts/login.d.ts +4 -0
- package/dist/contracts/login.d.ts.map +1 -1
- package/dist/contracts/runtime.d.ts +2 -0
- package/dist/contracts/runtime.d.ts.map +1 -1
- package/dist/contracts/runtime.js.map +1 -1
- package/dist/contracts/session-options.d.ts +3 -3
- package/dist/contracts/session-options.d.ts.map +1 -1
- package/dist/observe/agent-status.d.ts.map +1 -1
- package/dist/observe/agent-status.js +4 -3
- package/dist/observe/agent-status.js.map +1 -1
- package/dist/observe/input-admission.js +2 -2
- package/dist/observe/input-admission.js.map +1 -1
- package/dist/runtimes/antigravity/account-usage.d.ts.map +1 -1
- package/dist/runtimes/antigravity/account-usage.js +5 -0
- package/dist/runtimes/antigravity/account-usage.js.map +1 -1
- package/dist/runtimes/antigravity/auth.d.ts.map +1 -1
- package/dist/runtimes/antigravity/auth.js +18 -6
- package/dist/runtimes/antigravity/auth.js.map +1 -1
- package/dist/runtimes/antigravity/index.d.ts +1 -0
- package/dist/runtimes/antigravity/index.d.ts.map +1 -1
- package/dist/runtimes/antigravity/index.js +2 -0
- package/dist/runtimes/antigravity/index.js.map +1 -1
- package/dist/runtimes/antigravity/installation.d.ts +1 -2
- package/dist/runtimes/antigravity/installation.d.ts.map +1 -1
- package/dist/runtimes/antigravity/installation.js +6 -12
- package/dist/runtimes/antigravity/installation.js.map +1 -1
- package/dist/runtimes/antigravity/list-models.d.ts +2 -1
- package/dist/runtimes/antigravity/list-models.d.ts.map +1 -1
- package/dist/runtimes/antigravity/list-models.js +55 -4
- package/dist/runtimes/antigravity/list-models.js.map +1 -1
- package/dist/runtimes/antigravity/logout.d.ts +1 -1
- package/dist/runtimes/antigravity/logout.js +1 -1
- package/dist/runtimes/antigravity/model-selection.d.ts +5 -0
- package/dist/runtimes/antigravity/model-selection.d.ts.map +1 -0
- package/dist/runtimes/antigravity/model-selection.js +58 -0
- package/dist/runtimes/antigravity/model-selection.js.map +1 -0
- package/dist/runtimes/antigravity/session.d.ts.map +1 -1
- package/dist/runtimes/antigravity/session.js +2 -0
- package/dist/runtimes/antigravity/session.js.map +1 -1
- package/dist/runtimes/antigravity/version.d.ts +19 -0
- package/dist/runtimes/antigravity/version.d.ts.map +1 -0
- package/dist/runtimes/antigravity/version.js +32 -0
- package/dist/runtimes/antigravity/version.js.map +1 -0
- package/dist/runtimes/codex/account-usage.d.ts.map +1 -1
- package/dist/runtimes/codex/account-usage.js +20 -2
- package/dist/runtimes/codex/account-usage.js.map +1 -1
- package/dist/runtimes/codex/input-delivery.d.ts +8 -1
- package/dist/runtimes/codex/input-delivery.d.ts.map +1 -1
- package/dist/runtimes/codex/input-delivery.js +13 -0
- package/dist/runtimes/codex/input-delivery.js.map +1 -1
- package/dist/runtimes/codex/session.d.ts.map +1 -1
- package/dist/runtimes/codex/session.js +5 -3
- package/dist/runtimes/codex/session.js.map +1 -1
- package/dist/runtimes/cursor/auth-status.d.ts.map +1 -1
- package/dist/runtimes/cursor/auth-status.js +2 -1
- package/dist/runtimes/cursor/auth-status.js.map +1 -1
- package/dist/runtimes/cursor/index.d.ts +2 -2
- package/dist/runtimes/cursor/login.d.ts.map +1 -1
- package/dist/runtimes/cursor/login.js +2 -1
- package/dist/runtimes/cursor/login.js.map +1 -1
- package/dist/runtimes/cursor/logout.d.ts.map +1 -1
- package/dist/runtimes/cursor/logout.js +2 -1
- package/dist/runtimes/cursor/logout.js.map +1 -1
- package/dist/runtimes/cursor/run.d.ts.map +1 -1
- package/dist/runtimes/cursor/run.js +9 -2
- package/dist/runtimes/cursor/run.js.map +1 -1
- package/dist/runtimes/cursor/sdk-version.d.ts +3 -0
- package/dist/runtimes/cursor/sdk-version.d.ts.map +1 -0
- package/dist/runtimes/cursor/sdk-version.js +3 -0
- package/dist/runtimes/cursor/sdk-version.js.map +1 -0
- package/dist/runtimes/cursor/sdk.d.ts +4 -1
- package/dist/runtimes/cursor/sdk.d.ts.map +1 -1
- package/dist/runtimes/cursor/subprocess/child-script.d.ts.map +1 -1
- package/dist/runtimes/cursor/subprocess/child-script.js +5 -1
- package/dist/runtimes/cursor/subprocess/child-script.js.map +1 -1
- package/dist/runtimes/cursor/subprocess/proxy.d.ts.map +1 -1
- package/dist/runtimes/cursor/subprocess/proxy.js +2 -1
- package/dist/runtimes/cursor/subprocess/proxy.js.map +1 -1
- package/dist/runtimes/dsh/bridge.d.ts.map +1 -1
- package/dist/runtimes/dsh/bridge.js +32 -2
- package/dist/runtimes/dsh/bridge.js.map +1 -1
- package/dist/runtimes/dsh/index.d.ts +1 -0
- package/dist/runtimes/dsh/index.d.ts.map +1 -1
- package/dist/runtimes/dsh/index.js +2 -0
- package/dist/runtimes/dsh/index.js.map +1 -1
- package/dist/runtimes/dsh/installation.d.ts.map +1 -1
- package/dist/runtimes/dsh/installation.js +2 -3
- package/dist/runtimes/dsh/installation.js.map +1 -1
- package/dist/runtimes/dsh/list-models.d.ts.map +1 -1
- package/dist/runtimes/dsh/list-models.js +6 -3
- package/dist/runtimes/dsh/list-models.js.map +1 -1
- package/dist/runtimes/dsh/options.d.ts.map +1 -1
- package/dist/runtimes/dsh/options.js +0 -2
- package/dist/runtimes/dsh/options.js.map +1 -1
- package/dist/runtimes/dsh/session.d.ts.map +1 -1
- package/dist/runtimes/dsh/session.js +14 -7
- package/dist/runtimes/dsh/session.js.map +1 -1
- package/dist/runtimes/dsh/version.d.ts +5 -0
- package/dist/runtimes/dsh/version.d.ts.map +1 -1
- package/dist/runtimes/dsh/version.js +6 -0
- package/dist/runtimes/dsh/version.js.map +1 -1
- package/dist/runtimes/pi/index.d.ts.map +1 -1
- package/dist/runtimes/pi/index.js +2 -0
- package/dist/runtimes/pi/index.js.map +1 -1
- package/dist/runtimes/pi/open.d.ts +3 -2
- package/dist/runtimes/pi/open.d.ts.map +1 -1
- package/dist/runtimes/pi/open.js +3 -6
- package/dist/runtimes/pi/open.js.map +1 -1
- package/dist/runtimes/pi/projection.d.ts.map +1 -1
- package/dist/runtimes/pi/projection.js +3 -2
- package/dist/runtimes/pi/projection.js.map +1 -1
- package/dist/runtimes/pi/rpc/readers.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/readers.js +7 -0
- package/dist/runtimes/pi/rpc/readers.js.map +1 -1
- package/dist/runtimes/pi/rpc/version.d.ts +12 -0
- package/dist/runtimes/pi/rpc/version.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/version.js +17 -3
- package/dist/runtimes/pi/rpc/version.js.map +1 -1
- package/dist/runtimes/pi/session.d.ts.map +1 -1
- package/dist/runtimes/pi/session.js +14 -13
- package/dist/runtimes/pi/session.js.map +1 -1
- package/dist/runtimes/pi/static-modules.d.ts +1 -1
- package/dist/runtimes/pi/static-modules.d.ts.map +1 -1
- package/dist/runtimes/pi/static-modules.js +12 -21
- package/dist/runtimes/pi/static-modules.js.map +1 -1
- package/dist/runtimes/pi-durable/messages.d.ts +0 -5
- package/dist/runtimes/pi-durable/messages.d.ts.map +1 -1
- package/dist/runtimes/pi-durable/messages.js +1 -28
- package/dist/runtimes/pi-durable/messages.js.map +1 -1
- package/dist/runtimes/pi-durable/projection.d.ts +16 -7
- package/dist/runtimes/pi-durable/projection.d.ts.map +1 -1
- package/dist/runtimes/pi-durable/projection.js +167 -115
- package/dist/runtimes/pi-durable/projection.js.map +1 -1
- package/dist/runtimes/pi-durable/session.d.ts.map +1 -1
- package/dist/runtimes/pi-durable/session.js +122 -44
- package/dist/runtimes/pi-durable/session.js.map +1 -1
- package/dist/shared/acp/config-updates.d.ts.map +1 -1
- package/dist/shared/acp/config-updates.js +3 -1
- package/dist/shared/acp/config-updates.js.map +1 -1
- package/dist/shared/acp/effort.d.ts +1 -1
- package/dist/shared/acp/effort.d.ts.map +1 -1
- package/dist/shared/acp/effort.js +1 -0
- package/dist/shared/acp/effort.js.map +1 -1
- package/dist/shared/acp/initialize.js +1 -1
- package/dist/shared/acp/initialize.js.map +1 -1
- package/dist/shared/acp/model-configuration.d.ts +15 -0
- package/dist/shared/acp/model-configuration.d.ts.map +1 -0
- package/dist/shared/acp/model-configuration.js +27 -0
- package/dist/shared/acp/model-configuration.js.map +1 -0
- package/dist/shared/acp/profile.d.ts +6 -0
- package/dist/shared/acp/profile.d.ts.map +1 -1
- package/dist/shared/acp/profile.js +2 -21
- package/dist/shared/acp/profile.js.map +1 -1
- package/dist/shared/executable/process-cancellation.d.ts +1 -1
- package/dist/shared/executable/process-cancellation.d.ts.map +1 -1
- package/dist/shared/executable/process-cancellation.js +3 -2
- package/dist/shared/executable/process-cancellation.js.map +1 -1
- package/dist/shared/executable/process-shutdown.d.ts.map +1 -1
- package/dist/shared/executable/process-shutdown.js +17 -2
- package/dist/shared/executable/process-shutdown.js.map +1 -1
- package/dist/shared/executable/process-table-async.d.ts.map +1 -1
- package/dist/shared/executable/process-table-async.js +21 -2
- package/dist/shared/executable/process-table-async.js.map +1 -1
- package/dist/shared/executable/process-table-budget.d.ts.map +1 -1
- package/dist/shared/executable/process-table-budget.js +10 -3
- package/dist/shared/executable/process-table-budget.js.map +1 -1
- package/dist/shared/executable/process-table-command.d.ts +2 -0
- package/dist/shared/executable/process-table-command.d.ts.map +1 -1
- package/dist/shared/executable/process-table-command.js.map +1 -1
- package/dist/shared/executable/process-timing.d.ts +50 -0
- package/dist/shared/executable/process-timing.d.ts.map +1 -0
- package/dist/shared/executable/process-timing.js +21 -0
- package/dist/shared/executable/process-timing.js.map +1 -0
- package/package.json +9 -9
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { BACKGROUND_CONTEXT } from "@earendil-works/chord/context";
|
|
2
|
-
import {
|
|
2
|
+
import {} from "@earendil-works/pi-durable";
|
|
3
3
|
import { createSessionKernel } from "../../shared/session-kernel.js";
|
|
4
4
|
import { sealSession } from "../../shared/seal-session.js";
|
|
5
5
|
import { statusOf } from "../../observe/agent-status.js";
|
|
6
6
|
import { openConversation } from "./options.js";
|
|
7
|
-
import {
|
|
7
|
+
import { appendedEntries, foldDurableView, initialDurableProjection, liveOf, runEnded, submissionOutcome } from "./projection.js";
|
|
8
8
|
function settledOutcome(record) {
|
|
9
9
|
const outcome = submissionOutcome([record]);
|
|
10
10
|
return outcome === undefined ? [] : [{ kind: "turn_ended", outcome }];
|
|
@@ -15,7 +15,7 @@ function errorSummary(error) {
|
|
|
15
15
|
...(typeof code === "string" || (typeof code === "number" && Number.isFinite(code)) ? { code } : {}) };
|
|
16
16
|
}
|
|
17
17
|
function watchEndSummary(end) {
|
|
18
|
-
return "error" in end ? {
|
|
18
|
+
return "error" in end ? { kind: end.kind, error: errorSummary(end.error) } : end;
|
|
19
19
|
}
|
|
20
20
|
async function withdraw(harness, conversation, inputId) {
|
|
21
21
|
const record = await harness.commit(async (tx) => { const value = await tx.submissionByRequest(conversation.id, inputId); return value; }, BACKGROUND_CONTEXT);
|
|
@@ -25,62 +25,131 @@ async function withdraw(harness, conversation, inputId) {
|
|
|
25
25
|
}
|
|
26
26
|
export async function piDurableSession(harness, models, options, context) {
|
|
27
27
|
const conversation = await openConversation(harness, models, options);
|
|
28
|
-
const stream = await watchEvents(harness, conversation.id, BACKGROUND_CONTEXT);
|
|
29
28
|
const kernel = createSessionKernel(String(conversation.id), undefined, options.retainedBytes);
|
|
30
29
|
kernel.opened(context ?? { requested: "auto", placement: "in_process" });
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
const next = foldDurableBatch(state, events);
|
|
38
|
-
state = next.state;
|
|
39
|
-
kernel.frame(next.frame);
|
|
40
|
-
if (events.some((event) => event.type === "snapshot" && event.run === undefined) && priorRun.length > 0) {
|
|
41
|
-
try {
|
|
42
|
-
const native = await Promise.all(priorRun.map(async (id) => {
|
|
43
|
-
const handle = await harness.submission(id, BACKGROUND_CONTEXT);
|
|
44
|
-
return handle?.status(BACKGROUND_CONTEXT);
|
|
45
|
-
}));
|
|
46
|
-
const outcome = submissionOutcome(native);
|
|
47
|
-
kernel.frame({ type: "pi-durable/submissions", native, events: outcome === undefined ? [] : [{ kind: "turn_ended", outcome }] });
|
|
48
|
-
}
|
|
49
|
-
catch (error) {
|
|
50
|
-
kernel.frame({ type: "pi-durable/submissions_error", native: errorSummary(error), events: [] });
|
|
51
|
-
}
|
|
30
|
+
const pending = [];
|
|
31
|
+
let draining = undefined;
|
|
32
|
+
let ready = false;
|
|
33
|
+
const schedule = () => {
|
|
34
|
+
if (!ready || draining !== undefined) {
|
|
35
|
+
return;
|
|
52
36
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
37
|
+
draining = drainScheduled();
|
|
38
|
+
};
|
|
39
|
+
async function drainScheduled() {
|
|
40
|
+
await Promise.resolve();
|
|
41
|
+
try {
|
|
42
|
+
await drain();
|
|
43
|
+
}
|
|
44
|
+
catch (error) {
|
|
45
|
+
observation.detach();
|
|
46
|
+
pending.length = 0;
|
|
47
|
+
kernel.frame({ type: "pi-durable/projection_error", native: errorSummary(error), events: [] });
|
|
58
48
|
kernel.respond("", { kind: "exited", code: null });
|
|
59
49
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
catch (error) {
|
|
67
|
-
await stream.stop();
|
|
68
|
-
throw error;
|
|
50
|
+
finally {
|
|
51
|
+
draining = undefined;
|
|
52
|
+
if (pending.length > 0) {
|
|
53
|
+
schedule();
|
|
54
|
+
}
|
|
55
|
+
}
|
|
69
56
|
}
|
|
57
|
+
// A synchronous observer runs on the native transaction line. Only enqueue
|
|
58
|
+
// its immutable notification here: projection and native reads run later.
|
|
59
|
+
const observation = await harness.observeConversation(conversation.id, {
|
|
60
|
+
advance(call) { pending.push({ call }); schedule(); },
|
|
61
|
+
end(end) { pending.push({ end }); schedule(); },
|
|
62
|
+
}, BACKGROUND_CONTEXT);
|
|
63
|
+
const initialize = () => {
|
|
64
|
+
try {
|
|
65
|
+
const value = observation.value;
|
|
66
|
+
const initial = foldDurableView(initialDurableProjection(value), { kind: "value", value, ops: [], retired: false }, [], true);
|
|
67
|
+
kernel.frame(initial.frame);
|
|
68
|
+
// The host owns scheduling; opening a controller resumes saved native work.
|
|
69
|
+
harness.resume();
|
|
70
|
+
return initial.state;
|
|
71
|
+
}
|
|
72
|
+
catch (error) {
|
|
73
|
+
observation.detach();
|
|
74
|
+
pending.length = 0;
|
|
75
|
+
throw error;
|
|
76
|
+
}
|
|
77
|
+
};
|
|
78
|
+
let state = initialize();
|
|
79
|
+
ready = true;
|
|
80
|
+
schedule();
|
|
70
81
|
let disposing = undefined;
|
|
82
|
+
async function receipts(ids) {
|
|
83
|
+
const records = await Promise.all(ids.map(async (id) => {
|
|
84
|
+
const handle = await harness.submission(id, BACKGROUND_CONTEXT);
|
|
85
|
+
return handle?.status(BACKGROUND_CONTEXT);
|
|
86
|
+
}));
|
|
87
|
+
return records;
|
|
88
|
+
}
|
|
89
|
+
async function drain() {
|
|
90
|
+
while (pending.length > 0) {
|
|
91
|
+
const item = pending.shift();
|
|
92
|
+
if (item === undefined) {
|
|
93
|
+
break;
|
|
94
|
+
}
|
|
95
|
+
if ("end" in item) {
|
|
96
|
+
kernel.frame({ type: "pi-durable/watch_closed", native: watchEndSummary(item.end), events: [] });
|
|
97
|
+
kernel.respond("", { kind: "exited", code: null });
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
if (item.call.kind === "failed") {
|
|
101
|
+
kernel.frame({ type: "pi-durable/watch_error", native: errorSummary(item.call.error), events: [] });
|
|
102
|
+
continue;
|
|
103
|
+
}
|
|
104
|
+
const prior = state;
|
|
105
|
+
const ended = runEnded(prior, item.call);
|
|
106
|
+
let inputs = [];
|
|
107
|
+
const hasUserEntry = appendedEntries(prior.view, item.call).some(entry => (entry.model ?? []).some(message => message.role === "user"));
|
|
108
|
+
if (hasUserEntry) {
|
|
109
|
+
try {
|
|
110
|
+
const records = await receipts(liveOf(item.call.value).run?.inputs ?? []);
|
|
111
|
+
inputs = records.filter(record => record !== undefined);
|
|
112
|
+
}
|
|
113
|
+
catch (error) {
|
|
114
|
+
kernel.frame({ type: "pi-durable/submissions_error", native: errorSummary(error), events: [] });
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
let outcome = undefined;
|
|
118
|
+
if (ended) {
|
|
119
|
+
if (liveOf(prior.view).run?.afterRun !== undefined) {
|
|
120
|
+
// The native run has already answered; it stayed busy only to await
|
|
121
|
+
// its afterRun tasks, including for an observer attached mid-wait.
|
|
122
|
+
outcome = { kind: "completed" };
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
try {
|
|
126
|
+
const native = await receipts(prior.runInputs);
|
|
127
|
+
outcome = submissionOutcome(native);
|
|
128
|
+
kernel.frame({ type: "pi-durable/submissions", native: native.map(record => record ?? null), events: [] });
|
|
129
|
+
}
|
|
130
|
+
catch (error) {
|
|
131
|
+
kernel.frame({ type: "pi-durable/submissions_error", native: errorSummary(error), events: [] });
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
const next = foldDurableView(prior, item.call, inputs, false, outcome);
|
|
136
|
+
state = next.state;
|
|
137
|
+
kernel.frame(next.frame);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
71
140
|
const submit = async (kind, input, inputOptions, wasRunning) => {
|
|
72
141
|
if ((inputOptions.images?.length ?? 0) > 0) {
|
|
73
142
|
return { kind: "rejected", code: "unsupported", reason: "pi-durable browser sessions do not read local image files" };
|
|
74
143
|
}
|
|
75
144
|
const prior = inputOptions.inputId === undefined ? undefined : await harness.commit(async (tx) => { const value = await tx.submissionByRequest(conversation.id, inputOptions.inputId ?? ""); return value; }, BACKGROUND_CONTEXT);
|
|
76
145
|
if (prior !== undefined) {
|
|
77
|
-
kernel.frame({ type: "pi-durable/submission", native: prior, events: !wasRunning && state.run
|
|
146
|
+
kernel.frame({ type: "pi-durable/submission", native: prior, events: !wasRunning && liveOf(state.view).run === undefined && kind === "prompt" ? settledOutcome(prior) : [] });
|
|
78
147
|
return { kind: "accepted", native: prior };
|
|
79
148
|
}
|
|
80
149
|
if (kind === "prompt" && wasRunning) {
|
|
81
150
|
return { kind: "rejected", code: "busy", reason: "busy" };
|
|
82
151
|
}
|
|
83
|
-
if (kind === "steer" && state.run
|
|
152
|
+
if (kind === "steer" && liveOf(state.view).run === undefined) {
|
|
84
153
|
return { kind: "rejected", code: "no_active_turn", reason: "no active turn" };
|
|
85
154
|
}
|
|
86
155
|
try {
|
|
@@ -114,10 +183,11 @@ export async function piDurableSession(harness, models, options, context) {
|
|
|
114
183
|
},
|
|
115
184
|
abort: async () => {
|
|
116
185
|
const result = await kernel.control({ kind: "abort" }, async () => {
|
|
117
|
-
if (state.run
|
|
186
|
+
if (liveOf(state.view).run === undefined) {
|
|
118
187
|
return { kind: "rejected", code: "no_active_turn", reason: "no active turn" };
|
|
119
188
|
}
|
|
120
189
|
await conversation.abort(BACKGROUND_CONTEXT);
|
|
190
|
+
await flush();
|
|
121
191
|
return { kind: "accepted" };
|
|
122
192
|
});
|
|
123
193
|
return result;
|
|
@@ -131,8 +201,16 @@ export async function piDurableSession(harness, models, options, context) {
|
|
|
131
201
|
},
|
|
132
202
|
});
|
|
133
203
|
async function stopWatching(request) {
|
|
134
|
-
|
|
135
|
-
|
|
204
|
+
observation.detach();
|
|
205
|
+
await flush();
|
|
206
|
+
kernel.respond(request.id, { kind: "accepted" });
|
|
207
|
+
}
|
|
208
|
+
async function flush() {
|
|
209
|
+
let current = draining;
|
|
210
|
+
while (current !== undefined) {
|
|
211
|
+
await current;
|
|
212
|
+
current = draining;
|
|
213
|
+
}
|
|
136
214
|
}
|
|
137
215
|
}
|
|
138
216
|
//# sourceMappingURL=session.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sources":["../../../src/runtimes/pi-durable/session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session.js","sources":["../../../src/runtimes/pi-durable/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-updates.d.ts","sources":["../../../src/shared/acp/config-updates.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config-updates.d.ts","sources":["../../../src/shared/acp/config-updates.ts"],"names":[],"mappings":"AAKA,KAAK,mBAAmB,GAAG,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElE,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,YAAY,EAAE,OAAO,GAAG,IAAI,CAAC;IACrC,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,mBAAmB,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAC5H;AAED,8FAA8F;AAC9F,wBAAgB,sBAAsB,IAAI,gBAAgB,CAoDzD"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { asRecord, asRecordList } from "../json.js";
|
|
2
2
|
import { ModelConfirmationError } from "../../contracts/model-confirmation-error.js";
|
|
3
|
+
import { acpReportedEffort } from "./model.js";
|
|
3
4
|
import { AcpError } from "./errors.js";
|
|
4
5
|
/** Observe before sending; wait after the native answer, inside the same request deadline. */
|
|
5
6
|
export function createAcpConfigUpdates() {
|
|
@@ -26,6 +27,7 @@ export function createAcpConfigUpdates() {
|
|
|
26
27
|
}
|
|
27
28
|
state.observed = true;
|
|
28
29
|
state.current = option.currentValue;
|
|
30
|
+
state.effort = acpReportedEffort(update);
|
|
29
31
|
state.changed?.();
|
|
30
32
|
};
|
|
31
33
|
listeners.add(listener);
|
|
@@ -61,7 +63,7 @@ export function createAcpConfigUpdates() {
|
|
|
61
63
|
// A conflicting notification is an observation, not proof of refusal,
|
|
62
64
|
// until the request's existing deadline runs out.
|
|
63
65
|
if (error instanceof AcpError && error.kind === "timeout" && state.observed && state.current !== value) {
|
|
64
|
-
const message = `ACP config_option_update left ${configId} at ${String(state.current)} although ${value} was requested`;
|
|
66
|
+
const message = `ACP config_option_update left ${configId} at ${String(state.current)} although ${value} was requested${configId === "model" && typeof state.effort === "string" ? ` (native thought_level=${state.effort})` : ""}`;
|
|
65
67
|
throw configId === "model" ? new ModelConfirmationError(message, { requested: value, reported: typeof state.current === "string" ? state.current : null }) : new Error(message);
|
|
66
68
|
}
|
|
67
69
|
throw error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-updates.js","sources":["../../../src/shared/acp/config-updates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAmB,MAAM,YAAY,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AASvC,8FAA8F;AAC9F,MAAM,UAAU,sBAAsB;IACpC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAmD,CAAC;IAC7E,OAAO;QACL,OAAO,CAAC,YAAY;YAClB,MAAM,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACzE,IAAI,OAAO,MAAM,EAAE,SAAS,KAAK,QAAQ,IAAI,MAAM,EAAE,aAAa,KAAK,sBAAsB,EAAE,CAAC;gBAAC,OAAO;YAAC,CAAC;YAC1G,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YAAC,CAAC;QAC3E,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG;YAC3C,MAAM,KAAK,
|
|
1
|
+
{"version":3,"file":"config-updates.js","sources":["../../../src/shared/acp/config-updates.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,7 @@ export declare function applyAcpEffort(process: AcpProcess, opened: {
|
|
|
23
23
|
readonly method: string;
|
|
24
24
|
readonly response: JsonRecord;
|
|
25
25
|
}) => void;
|
|
26
|
-
}): Promise<
|
|
26
|
+
}): Promise<JsonRecord>;
|
|
27
27
|
/**
|
|
28
28
|
* Apply `SessionOptions.model`: `session/set_model {modelId}`, or with
|
|
29
29
|
* `viaConfigOption` `session/set_config_option` on the `model` option (for
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"effort.d.ts","sources":["../../../src/shared/acp/effort.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAEvD,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,cAAc,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AA+B5D;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;CAAE,EAClG,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IACP,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAA;KAAE,KAAK,IAAI,CAAC;CAC9F,GACA,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"effort.d.ts","sources":["../../../src/shared/acp/effort.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAEvD,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,cAAc,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AA+B5D;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;CAAE,EAClG,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IACP,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAA;KAAE,KAAK,IAAI,CAAC;CAC9F,GACA,OAAO,CAAC,UAAU,CAAC,CAqBrB;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE;IACP,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAA;KAAE,KAAK,IAAI,CAAC;CAC9F,GACA,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAYjC"}
|
|
@@ -57,6 +57,7 @@ export async function applyAcpEffort(process, opened, effort, context) {
|
|
|
57
57
|
if (applied !== effort) {
|
|
58
58
|
throw new Error(`${method} left ${configId} at ${applied ?? "an unreported value"} although effort ${effort} was requested`);
|
|
59
59
|
}
|
|
60
|
+
return response;
|
|
60
61
|
}
|
|
61
62
|
/**
|
|
62
63
|
* Apply `SessionOptions.model`: `session/set_model {modelId}`, or with
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"effort.js","sources":["../../../src/shared/acp/effort.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"effort.js","sources":["../../../src/shared/acp/effort.ts"],"names":[],"mappings":"AAAA,2HAA2H;AAC3H,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAmB,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACtE,OAAO,EAAmB,eAAe,EAAE,MAAM,cAAc,CAAC;AAGhE,SAAS,eAAe,CACtB,OAAmB,EAAE,SAAiB,EAAE,QAAgB,EAAE,KAAa,EACvE,OAA4E;IAE5E,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QAClC,OAAO,eAAe,CAAC,OAAO,EAAE,2BAA2B,EAAE,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,CAC/F,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,2BAA2B,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,cAAc,CAAC,CAAC,CAAC;IACnH,CAAC;IACD,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,CAChE,eAAe,CAAC,OAAO,EAAE,2BAA2B,EAAE,OAAO,CAAC,SAAS,EAAE,KAAK,EAAC,cAAc,EAAC,EAAE;QAC9F,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,2BAA2B,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,cAAc,CAAC,CAAC;QACrI,MAAM,OAAO,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,cAAc,EAAE,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;QAC9I,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QACrC,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC,CAAC,CAAC;AACR,CAAC;AAED,6GAA6G;AAC7G,SAAS,YAAY,CAAC,KAAc;IAClC,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IACD,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC;IACnC,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC,OAAO,CAAC;IACvB,CAAC;IACD,OAAO,GAAG,KAAK,CAAC,OAAO,KAAK,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC;AACxF,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAmB,EACnB,MAAkG,EAClG,MAAc,EACd,OAIC;IAED,MAAM,QAAQ,GAAG,qBAAqB,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;IAC5D,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1D,oEAAoE;QACpE,sDAAsD;QACtD,MAAM,IAAI,sBAAsB,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,UAAU,yDAAyD,MAAM,oBAAoB,CAAC,CAAC;IACtJ,CAAC;IACD,MAAM,MAAM,GAAG,2BAA2B,CAAC;IAC3C,IAAI,MAAM,GAAY,SAAS,CAAC;IAChC,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACvF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,IAAI,QAAQ,IAAI,MAAM,iBAAiB,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3G,CAAC;IACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACxC,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,SAAS,QAAQ,OAAO,OAAO,IAAI,qBAAqB,oBAAoB,MAAM,gBAAgB,CAAC,CAAC;IAC/H,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAmB,EACnB,SAAiB,EACjB,KAAa,EACb,OAKC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAC3F,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe;QACtD,CAAC,CAAC,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC;QAC9D,CAAC,CAAC,eAAe,CACjB,OAAO,EACP,MAAM,EACN,OAAO,CAAC,SAAS,EACjB,CAAC,cAAc,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,cAAc,CAAC,CAC5G,CAAC,CAAC,IAAI,SAAS,CAAC;IACjB,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,IAAI,EAAE,EAAE,CAAC,CAAC;IACtD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -6,7 +6,7 @@ export async function initializeAcpConnection(process, profile, options, observe
|
|
|
6
6
|
const meta = profile.initializeMeta?.(options);
|
|
7
7
|
const capabilitiesMeta = profile.clientCapabilitiesMeta?.(options);
|
|
8
8
|
const method = methods.agent.initialize;
|
|
9
|
-
const initialized = await withAcpDeadline(process, method, profile.
|
|
9
|
+
const initialized = await withAcpDeadline(process, method, profile.initializeTimeoutMs ?? 60_000, (requestOptions) => process.connection.agent.request(method, {
|
|
10
10
|
protocolVersion: PROTOCOL_VERSION,
|
|
11
11
|
clientCapabilities: {
|
|
12
12
|
fs: { readTextFile: false, writeTextFile: false },
|
|
@@ -1 +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,gBAAgB,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC,OAAO,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC;IACxC,MAAM,WAAW,GAAG,MAAM,eAAe,CACvC,OAAO,EACP,MAAM,EACN,OAAO,CAAC,
|
|
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,gBAAgB,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC,OAAO,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC;IACxC,MAAM,WAAW,GAAG,MAAM,eAAe,CACvC,OAAO,EACP,MAAM,EACN,OAAO,CAAC,mBAAmB,IAAI,MAAM,EACrC,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;YACd,GAAG,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;SACvE;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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { SessionOptions } from "../../contracts/session.js";
|
|
2
|
+
import type { JsonRecord } from "../json.js";
|
|
3
|
+
import type { AcpSessionProfile, AcpOpenObserver, OpenedAcpSession } from "./profile.js";
|
|
4
|
+
import type { AcpProcess } from "./process.js";
|
|
5
|
+
import type { AcpConfigUpdates } from "./config-updates.js";
|
|
6
|
+
export interface AcpModelConfigurationContext {
|
|
7
|
+
readonly options: SessionOptions;
|
|
8
|
+
readonly response: JsonRecord;
|
|
9
|
+
readonly setModel: (model: string) => Promise<JsonRecord | undefined>;
|
|
10
|
+
readonly setEffort: (effort: string, modelResponse: JsonRecord | undefined) => Promise<JsonRecord>;
|
|
11
|
+
}
|
|
12
|
+
export type AcpModelConfiguration = (context: AcpModelConfigurationContext) => Promise<JsonRecord | undefined>;
|
|
13
|
+
/** Profiles choose native selectors; shared calls own deadlines, confirmation and records. */
|
|
14
|
+
export declare function configureAcpModel(process: AcpProcess, profile: AcpSessionProfile, options: SessionOptions, opened: Pick<OpenedAcpSession, "response" | "sessionId" | "openMethod">, observe: AcpOpenObserver, updates?: AcpConfigUpdates): Promise<JsonRecord | undefined>;
|
|
15
|
+
//# sourceMappingURL=model-configuration.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model-configuration.d.ts","sources":["../../../src/shared/acp/model-configuration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACzF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAI5D,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IACtE,QAAQ,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,GAAG,SAAS,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CACpG;AACD,MAAM,MAAM,qBAAqB,GAAG,CAAC,OAAO,EAAE,4BAA4B,KAAK,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;AAE/G,8FAA8F;AAE9F,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,cAAc,EACxE,MAAM,EAAE,IAAI,CAAC,gBAAgB,EAAE,UAAU,GAAG,WAAW,GAAG,YAAY,CAAC,EACvE,OAAO,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,gBAAgB,GACnD,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAkBjC"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { applyAcpModel, applyAcpEffort } from "./effort.js";
|
|
2
|
+
import { acpOpenStep } from "./failure.js";
|
|
3
|
+
/** Profiles choose native selectors; shared calls own deadlines, confirmation and records. */
|
|
4
|
+
// oxlint-disable-next-line eslint/max-params -- Same session opening context as profile.ts.
|
|
5
|
+
export async function configureAcpModel(process, profile, options, opened, observe, updates) {
|
|
6
|
+
const context = { timeoutMs: profile.requestTimeoutMs ?? 15_000, observe, ...(updates === undefined ? {} : { updates }) };
|
|
7
|
+
const setModel = async (model) => {
|
|
8
|
+
const result = await acpOpenStep(applyAcpModel(process, opened.sessionId, model, { ...context, viaConfigOption: profile.modelViaConfigOption === true }), "model", profile.openFailure);
|
|
9
|
+
return result;
|
|
10
|
+
};
|
|
11
|
+
const setEffort = async (effort, response) => {
|
|
12
|
+
// A model switch can replace its thought-level menu entirely.
|
|
13
|
+
const menu = response !== undefined && Array.isArray(response.configOptions)
|
|
14
|
+
? { ...opened, response, openMethod: "session/set_config_option" } : opened;
|
|
15
|
+
const result = await applyAcpEffort(process, menu, effort, context);
|
|
16
|
+
return result;
|
|
17
|
+
};
|
|
18
|
+
if (profile.configureModel !== undefined) {
|
|
19
|
+
return profile.configureModel({ options, response: opened.response, setModel, setEffort });
|
|
20
|
+
}
|
|
21
|
+
const response = options.model === undefined ? undefined : await setModel(options.model);
|
|
22
|
+
if (options.effort !== undefined) {
|
|
23
|
+
await setEffort(options.effort, response);
|
|
24
|
+
}
|
|
25
|
+
return response;
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=model-configuration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model-configuration.js","sources":["../../../src/shared/acp/model-configuration.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAU3C,8FAA8F;AAC9F,4FAA4F;AAC5F,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,OAAmB,EAAE,OAA0B,EAAE,OAAuB,EACxE,MAAuE,EACvE,OAAwB,EAAE,OAA0B;IAEpD,MAAM,OAAO,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,gBAAgB,IAAI,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IAC1H,MAAM,QAAQ,GAAG,KAAK,EAAE,KAAa,EAAmC,EAAE;QACxE,MAAM,MAAM,GAAG,MAAM,WAAW,CAChC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,GAAG,OAAO,EAAE,eAAe,EAAE,OAAO,CAAC,oBAAoB,KAAK,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACvJ,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IACF,MAAM,SAAS,GAAG,KAAK,EAAE,MAAc,EAAE,QAAgC,EAAuB,EAAE;QAChG,8DAA8D;QAC9D,MAAM,IAAI,GAAG,QAAQ,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;YAC1E,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,2BAA2B,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;QAC9E,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACpE,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IACF,IAAI,OAAO,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO,OAAO,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;IAAC,CAAC;IACzI,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACzF,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAAC,MAAM,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAAC,CAAC;IAChF,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -4,6 +4,7 @@ import type { ContextUsage, RuntimeEventBody, SessionCapabilities, SessionOption
|
|
|
4
4
|
import { type JsonRecord } from "../json.js";
|
|
5
5
|
import type { AcpDerivedSessionHooks } from "./derived-sessions.js";
|
|
6
6
|
import type { AcpSteerRequestHooks } from "./steer-request.js";
|
|
7
|
+
import { type AcpModelConfiguration } from "./model-configuration.js";
|
|
7
8
|
import type { AcpConfigUpdates } from "./config-updates.js";
|
|
8
9
|
import { type AcpFailureReader, type AcpOpenFailureReader } from "./failure.js";
|
|
9
10
|
import { type AcpProcess } from "./process.js";
|
|
@@ -29,7 +30,10 @@ export interface AcpSessionProfile extends AcpDerivedSessionHooks, AcpSteerReque
|
|
|
29
30
|
readonly capabilities: Omit<SessionCapabilities, "images"> & {
|
|
30
31
|
readonly images?: boolean;
|
|
31
32
|
};
|
|
33
|
+
/** Bounded requests after initialization; default 15 seconds. */
|
|
32
34
|
readonly requestTimeoutMs?: number;
|
|
35
|
+
/** Only initialize; default 60 seconds, independent of requestTimeoutMs. */
|
|
36
|
+
readonly initializeTimeoutMs?: number;
|
|
33
37
|
readonly maxInputBytes?: number;
|
|
34
38
|
/** Only session/new and session/resume, when native startup work needs a larger bound. */
|
|
35
39
|
readonly sessionStartTimeoutMs?: number;
|
|
@@ -49,6 +53,8 @@ export interface AcpSessionProfile extends AcpDerivedSessionHooks, AcpSteerReque
|
|
|
49
53
|
* `{}` and pushes nothing (agy_acp_server 1.2.1): only that answer reports the applied model.
|
|
50
54
|
*/
|
|
51
55
|
readonly modelViaConfigOption?: boolean;
|
|
56
|
+
/** Vendor selection policy; all native calls retain shared confirmation and recording. */
|
|
57
|
+
readonly configureModel?: AcpModelConfiguration;
|
|
52
58
|
/** Wait for each native config notification before the next setting; agy publishes snapshots asynchronously. */
|
|
53
59
|
readonly confirmConfigOptionUpdates?: boolean;
|
|
54
60
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.d.ts","sources":["../../../src/shared/acp/profile.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAChJ,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAEvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"profile.d.ts","sources":["../../../src/shared/acp/profile.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { methods } from "@agentclientprotocol/sdk";
|
|
|
2
2
|
import { asRecord } from "../json.js";
|
|
3
3
|
import { initializeAcpConnection } from "./initialize.js";
|
|
4
4
|
import { acpAdditionalDirectories } from "./additional-directories.js";
|
|
5
|
-
import {
|
|
5
|
+
import { configureAcpModel } from "./model-configuration.js";
|
|
6
6
|
import { acpResumeFailure, acpOpenStep } from "./failure.js";
|
|
7
7
|
import { acpMcpServersParam } from "./mcp-servers.js";
|
|
8
8
|
import { withAcpDeadline } from "./process.js";
|
|
@@ -79,26 +79,7 @@ export async function openInitializedAcpSession(process, profile, options, initi
|
|
|
79
79
|
const opened = await acpOpenStep(createOrResume(process, profile, initialized, options, profile.sessionMeta?.(options, initialized)), "open", profile.openFailure);
|
|
80
80
|
bind(opened.sessionId);
|
|
81
81
|
observe({ method: opened.openMethod, response: opened.response });
|
|
82
|
-
const setModelResponse = options
|
|
83
|
-
? undefined
|
|
84
|
-
: await acpOpenStep(applyAcpModel(process, opened.sessionId, options.model, {
|
|
85
|
-
viaConfigOption: profile.modelViaConfigOption === true,
|
|
86
|
-
timeoutMs: profile.requestTimeoutMs ?? 15_000,
|
|
87
|
-
observe, ...(updates === undefined ? {} : { updates }),
|
|
88
|
-
}), "model", profile.openFailure);
|
|
89
|
-
if (options.effort !== undefined) {
|
|
90
|
-
// The effort menu belongs to the model in effect: a model switch whose
|
|
91
|
-
// answer lists the options (`set_config_option`, opencode 1.18.30 where
|
|
92
|
-
// the open model has no effort option and the requested one does) is
|
|
93
|
-
// read instead of the open's.
|
|
94
|
-
const menu = setModelResponse !== undefined && Array.isArray(setModelResponse.configOptions)
|
|
95
|
-
? { ...opened, response: setModelResponse, openMethod: "session/set_config_option" }
|
|
96
|
-
: opened;
|
|
97
|
-
await applyAcpEffort(process, menu, options.effort, {
|
|
98
|
-
timeoutMs: profile.requestTimeoutMs ?? 15_000,
|
|
99
|
-
observe, ...(updates === undefined ? {} : { updates }),
|
|
100
|
-
});
|
|
101
|
-
}
|
|
82
|
+
const setModelResponse = await configureAcpModel(process, profile, options, opened, observe, updates);
|
|
102
83
|
const configure = profile.configureSession;
|
|
103
84
|
if (configure !== undefined) {
|
|
104
85
|
await configure({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.js","sources":["../../../src/shared/acp/profile.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,QAAQ,EAAmB,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAG1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"profile.js","sources":["../../../src/shared/acp/profile.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,5 +10,5 @@ export interface CancellationObservation {
|
|
|
10
10
|
/** One fresh batched observation, with at most one second of caller waiting.
|
|
11
11
|
* A shared query may still serve other callers; its late result is never used
|
|
12
12
|
* for this cancellation and does not postpone native cancel dispatch. */
|
|
13
|
-
export declare function observeBeforeCancellation(): Promise<ProcessTableObservation>;
|
|
13
|
+
export declare function observeBeforeCancellation(requestId?: number): Promise<ProcessTableObservation>;
|
|
14
14
|
//# sourceMappingURL=process-cancellation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-cancellation.d.ts","sources":["../../../src/shared/executable/process-cancellation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"process-cancellation.d.ts","sources":["../../../src/shared/executable/process-cancellation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAGjE;uEACuE;AACvE,MAAM,WAAW,uBAAuB;IACtC,8FAA8F;IAC9F,QAAQ,CAAC,WAAW,CAAC,EAAE,uBAAuB,CAAC;IAC/C,MAAM,IAAI,IAAI,CAAC;IACf,QAAQ,IAAI,IAAI,CAAC;CAClB;AAED;;yEAEyE;AACzE,wBAAsB,yBAAyB,CAAC,SAAS,SAAoB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAG/G"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { observeProcessTableWithin } from "./process-table-budget.js";
|
|
2
|
+
import { processTimingId } from "./process-timing.js";
|
|
2
3
|
/** One fresh batched observation, with at most one second of caller waiting.
|
|
3
4
|
* A shared query may still serve other callers; its late result is never used
|
|
4
5
|
* for this cancellation and does not postpone native cancel dispatch. */
|
|
5
|
-
export async function observeBeforeCancellation() {
|
|
6
|
-
const result = await observeProcessTableWithin(1000);
|
|
6
|
+
export async function observeBeforeCancellation(requestId = processTimingId()) {
|
|
7
|
+
const result = await observeProcessTableWithin(1000, undefined, { requestId });
|
|
7
8
|
return result;
|
|
8
9
|
}
|
|
9
10
|
//# sourceMappingURL=process-cancellation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-cancellation.js","sources":["../../../src/shared/executable/process-cancellation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"process-cancellation.js","sources":["../../../src/shared/executable/process-cancellation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAWtD;;yEAEyE;AACzE,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,SAAS,GAAG,eAAe,EAAE;IAC3E,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IAC/E,OAAO,MAAM,CAAC;AAChB,CAAC"}
|