@botiverse/oar 0.103.1 → 0.105.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/account-usage.d.ts +26 -6
- package/dist/contracts/account-usage.d.ts.map +1 -1
- package/dist/contracts/index.d.ts +1 -1
- package/dist/contracts/index.d.ts.map +1 -1
- package/dist/contracts/index.js.map +1 -1
- package/dist/contracts/runtime.d.ts +8 -0
- package/dist/contracts/runtime.d.ts.map +1 -1
- package/dist/contracts/runtime.js.map +1 -1
- package/dist/runtimes/claude/limit-reset/driver.d.ts.map +1 -1
- package/dist/runtimes/claude/limit-reset/driver.js +75 -27
- package/dist/runtimes/claude/limit-reset/driver.js.map +1 -1
- package/dist/runtimes/claude/limit-reset/screens.d.ts +16 -1
- package/dist/runtimes/claude/limit-reset/screens.d.ts.map +1 -1
- package/dist/runtimes/claude/limit-reset/screens.js +52 -6
- package/dist/runtimes/claude/limit-reset/screens.js.map +1 -1
- package/dist/runtimes/opencode/attribution.d.ts +19 -0
- package/dist/runtimes/opencode/attribution.d.ts.map +1 -1
- package/dist/runtimes/opencode/attribution.js +54 -0
- package/dist/runtimes/opencode/attribution.js.map +1 -1
- package/dist/runtimes/opencode/session.d.ts +8 -0
- package/dist/runtimes/opencode/session.d.ts.map +1 -1
- package/dist/runtimes/opencode/session.js +25 -4
- package/dist/runtimes/opencode/session.js.map +1 -1
- package/dist/runtimes/opencode/steering.d.ts +11 -0
- package/dist/runtimes/opencode/steering.d.ts.map +1 -0
- package/dist/runtimes/opencode/steering.js +23 -0
- package/dist/runtimes/opencode/steering.js.map +1 -0
- package/dist/runtimes/opencode/version.d.ts +9 -0
- package/dist/runtimes/opencode/version.d.ts.map +1 -1
- package/dist/runtimes/opencode/version.js +13 -4
- package/dist/runtimes/opencode/version.js.map +1 -1
- package/dist/shared/acp/derived-sessions.d.ts +40 -0
- package/dist/shared/acp/derived-sessions.d.ts.map +1 -0
- package/dist/shared/acp/derived-sessions.js +28 -0
- package/dist/shared/acp/derived-sessions.js.map +1 -0
- package/dist/shared/acp/initialize.d.ts.map +1 -1
- package/dist/shared/acp/initialize.js +2 -0
- package/dist/shared/acp/initialize.js.map +1 -1
- package/dist/shared/acp/profile.d.ts +5 -18
- package/dist/shared/acp/profile.d.ts.map +1 -1
- package/dist/shared/acp/profile.js.map +1 -1
- package/dist/shared/acp/records.d.ts +3 -3
- package/dist/shared/acp/records.d.ts.map +1 -1
- package/dist/shared/acp/records.js +34 -2
- package/dist/shared/acp/records.js.map +1 -1
- package/dist/shared/acp/session-state.js +1 -1
- package/dist/shared/acp/session-state.js.map +1 -1
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +4 -2
- package/dist/shared/acp/session.js.map +1 -1
- package/dist/shared/acp/shared-session.d.ts.map +1 -1
- package/dist/shared/acp/shared-session.js +8 -3
- package/dist/shared/acp/shared-session.js.map +1 -1
- package/dist/shared/acp/steer-request.d.ts +26 -2
- package/dist/shared/acp/steer-request.d.ts.map +1 -1
- package/dist/shared/acp/steer-request.js +13 -4
- package/dist/shared/acp/steer-request.js.map +1 -1
- package/dist/shared/deliver.d.ts.map +1 -1
- package/dist/shared/deliver.js +7 -3
- package/dist/shared/deliver.js.map +1 -1
- package/package.json +1 -1
|
@@ -57,18 +57,29 @@ export function hasDialogFooter(screen) {
|
|
|
57
57
|
/**
|
|
58
58
|
* The text in the input box, when there is one and no dialog over it. The box
|
|
59
59
|
* is `❯` and a no-break space, which a submitted command's echo
|
|
60
|
-
* (`❯ /limit-reset …`, a plain space) never has
|
|
60
|
+
* (`❯ /limit-reset …`, a plain space) never has, and it runs to the rule line
|
|
61
|
+
* under it: text on any later row is input too (joined with newlines), and
|
|
62
|
+
* without that closing rule the box is not recognised.
|
|
61
63
|
*/
|
|
62
64
|
export function inputLine(screen) {
|
|
63
65
|
if (hasDialogFooter(screen)) {
|
|
64
66
|
return null;
|
|
65
67
|
}
|
|
66
|
-
const
|
|
67
|
-
const [
|
|
68
|
-
|
|
68
|
+
const lines = screen.split("\n");
|
|
69
|
+
const starts = lines.flatMap((line, index) => (line.startsWith("❯\u00A0") ? [index] : []));
|
|
70
|
+
const [start] = starts;
|
|
71
|
+
if (starts.length !== 1 || start === undefined) {
|
|
72
|
+
return null;
|
|
73
|
+
}
|
|
74
|
+
const end = lines.findIndex((line, index) => index > start && /^─+$/u.test(line.trimEnd()));
|
|
75
|
+
if (end === -1) {
|
|
69
76
|
return null;
|
|
70
77
|
}
|
|
71
|
-
|
|
78
|
+
const rows = lines.slice(start, end).map((line, index) => (index === 0 ? line.slice(2).trimEnd() : line.trim()));
|
|
79
|
+
while (rows.length > 1 && rows.at(-1) === "") {
|
|
80
|
+
rows.pop();
|
|
81
|
+
}
|
|
82
|
+
return rows.join("\n");
|
|
72
83
|
}
|
|
73
84
|
/**
|
|
74
85
|
* The suggestion an empty input box shows in a new project (2.1.322 and
|
|
@@ -89,6 +100,7 @@ export function promptInput(screen) {
|
|
|
89
100
|
const input = inputLine(screen);
|
|
90
101
|
return input !== null && PLACEHOLDER.test(input) ? "" : input;
|
|
91
102
|
}
|
|
103
|
+
const TRUST_QUESTION = "Quick safety check: Is this a project you created or one you trust?";
|
|
92
104
|
/**
|
|
93
105
|
* The "do you trust this folder" screen a working directory gets the first
|
|
94
106
|
* time, and which of its two rows is selected ("No, exit" is, when it opens).
|
|
@@ -96,7 +108,7 @@ export function promptInput(screen) {
|
|
|
96
108
|
export function trustScreen(screen) {
|
|
97
109
|
const lines = trimmedLines(screen);
|
|
98
110
|
const footer = lines.lastIndexOf(DIALOG_FOOTER);
|
|
99
|
-
if (footer !== lines.length - 1 || footer < 2 || !lines.some((line) => line.startsWith(
|
|
111
|
+
if (footer !== lines.length - 1 || footer < 2 || !lines.some((line) => line.startsWith(TRUST_QUESTION))) {
|
|
100
112
|
return null;
|
|
101
113
|
}
|
|
102
114
|
const rows = `${lines[footer - 2]}\n${lines[footer - 1]}`;
|
|
@@ -116,6 +128,40 @@ export function bannerVersion(screen) {
|
|
|
116
128
|
export function isSignInScreen(screen) {
|
|
117
129
|
return screen.includes("Not logged in · Run /login");
|
|
118
130
|
}
|
|
131
|
+
/**
|
|
132
|
+
* The main prompt a command may be decided at: the input box and its status
|
|
133
|
+
* line with no dialog over them, and a version banner. An empty box without
|
|
134
|
+
* a banner counts too, so that it is reported `unsupported_version`.
|
|
135
|
+
*/
|
|
136
|
+
export function isMainPrompt(screen) {
|
|
137
|
+
const input = promptInput(screen);
|
|
138
|
+
return input !== null && (input === "" || bannerVersion(screen) !== null);
|
|
139
|
+
}
|
|
140
|
+
/**
|
|
141
|
+
* What a startup screen is, in OAR's own words only: the result carries this
|
|
142
|
+
* to the host, so no text from the screen (a path, an email, a conversation)
|
|
143
|
+
* goes into it, only which recorded piece of chrome was seen.
|
|
144
|
+
*/
|
|
145
|
+
export function startupScreenOf(screen) {
|
|
146
|
+
if (screen.trim() === "") {
|
|
147
|
+
return "blank";
|
|
148
|
+
}
|
|
149
|
+
if (screen.includes(TRUST_QUESTION)) {
|
|
150
|
+
return "trust_unrecognised";
|
|
151
|
+
}
|
|
152
|
+
if (hasDialogFooter(screen)) {
|
|
153
|
+
return "dialog";
|
|
154
|
+
}
|
|
155
|
+
const input = promptInput(screen);
|
|
156
|
+
if (input === null) {
|
|
157
|
+
return "unknown";
|
|
158
|
+
}
|
|
159
|
+
if (bannerVersion(screen) === null) {
|
|
160
|
+
return "no_banner";
|
|
161
|
+
}
|
|
162
|
+
// An empty prompt under a banner is only given up on when it never held still in time.
|
|
163
|
+
return input === "" ? "unsettled" : "prompt_with_text";
|
|
164
|
+
}
|
|
119
165
|
/** A limit the effect line may name: the only words allowed in its list. */
|
|
120
166
|
const LIMIT_NAME = "(?:5-hour|weekly|Opus|Sonnet|Fable)";
|
|
121
167
|
/** "Nov 14, 5:33pm", "Nov 14, 5pm": claude's short date. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"screens.js","sources":["../../../../src/runtimes/claude/limit-reset/screens.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"screens.js","sources":["../../../../src/runtimes/claude/limit-reset/screens.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,23 @@
|
|
|
1
|
+
import type { TaskEventBody } from "../../contracts/tasks.js";
|
|
2
|
+
import { type JsonRecord } from "../../shared/json.js";
|
|
1
3
|
import type { AcpSessionProfile } from "../../shared/acp/profile.js";
|
|
2
4
|
/** v2 forwards child updates on the root envelope; native metadata owns the identity. */
|
|
3
5
|
export declare const opencodeChildAttribution: NonNullable<AcpSessionProfile["attributeUpdate"]>;
|
|
6
|
+
/**
|
|
7
|
+
* 2.3.0 delivers background children only on this extension, and only to a
|
|
8
|
+
* client that declares `OPENCODE_CHILD_UPDATES` (packages/cli/src/acp/
|
|
9
|
+
* capabilities.ts, child.ts and translate.ts `route` at a6b15d33).
|
|
10
|
+
*/
|
|
11
|
+
export declare const OPENCODE_CHILD_UPDATE = "opencode/session/child_update";
|
|
12
|
+
export declare const OPENCODE_CHILD_UPDATES = "opencode/child-session-updates";
|
|
13
|
+
/** `{rootSessionId, childSessionId, parentSessionId, depth, title}` with `type: "update"` (a projected SessionUpdate) or `type: "status"`. */
|
|
14
|
+
export declare const opencodeChildUpdate: NonNullable<AcpSessionProfile["childNotification"]>;
|
|
15
|
+
/** The `subagent` tool returns at once with `rawOutput.metadata.sessionID` naming its background child (2.3.0). */
|
|
16
|
+
export declare function opencodeSpawnedSessions(update: JsonRecord): readonly string[];
|
|
17
|
+
/**
|
|
18
|
+
* Child lifecycle as the parent's tasks, keyed by the child session like Codex
|
|
19
|
+
* child threads. A finished child can take a follow-up (`subagent` with its
|
|
20
|
+
* `sessionID`), which reports `running` again.
|
|
21
|
+
*/
|
|
22
|
+
export declare function opencodeChildTasks(method: string, params: JsonRecord): TaskEventBody[];
|
|
4
23
|
//# sourceMappingURL=attribution.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attribution.d.ts","sources":["../../../src/runtimes/opencode/attribution.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"attribution.d.ts","sources":["../../../src/runtimes/opencode/attribution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAErE,yFAAyF;AACzF,eAAO,MAAM,wBAAwB,EAAE,WAAW,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAStF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,kCAAkC,CAAC;AACrE,eAAO,MAAM,sBAAsB,mCAAmC,CAAC;AAMvE,8IAA8I;AAC9I,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAKnF,CAAC;AAEF,mHAAmH;AACnH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,MAAM,EAAE,CAI7E;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,aAAa,EAAE,CAmBtF"}
|
|
@@ -10,4 +10,58 @@ export const opencodeChildAttribution = (notification) => {
|
|
|
10
10
|
}
|
|
11
11
|
return { sessionId: child.id, parent: child.parentID };
|
|
12
12
|
};
|
|
13
|
+
/**
|
|
14
|
+
* 2.3.0 delivers background children only on this extension, and only to a
|
|
15
|
+
* client that declares `OPENCODE_CHILD_UPDATES` (packages/cli/src/acp/
|
|
16
|
+
* capabilities.ts, child.ts and translate.ts `route` at a6b15d33).
|
|
17
|
+
*/
|
|
18
|
+
export const OPENCODE_CHILD_UPDATE = "opencode/session/child_update";
|
|
19
|
+
export const OPENCODE_CHILD_UPDATES = "opencode/child-session-updates";
|
|
20
|
+
function nonEmpty(value) {
|
|
21
|
+
return typeof value === "string" && value !== "" ? value : null;
|
|
22
|
+
}
|
|
23
|
+
/** `{rootSessionId, childSessionId, parentSessionId, depth, title}` with `type: "update"` (a projected SessionUpdate) or `type: "status"`. */
|
|
24
|
+
export const opencodeChildUpdate = (method, params) => {
|
|
25
|
+
const sessionId = nonEmpty(params.childSessionId);
|
|
26
|
+
const parent = nonEmpty(params.parentSessionId);
|
|
27
|
+
if (method !== OPENCODE_CHILD_UPDATE || sessionId === null || parent === null || sessionId === parent) {
|
|
28
|
+
return null;
|
|
29
|
+
}
|
|
30
|
+
return { sessionId, parent, update: params.type === "update" ? asRecord(params.update) : null };
|
|
31
|
+
};
|
|
32
|
+
/** The `subagent` tool returns at once with `rawOutput.metadata.sessionID` naming its background child (2.3.0). */
|
|
33
|
+
export function opencodeSpawnedSessions(update) {
|
|
34
|
+
if (update.sessionUpdate !== "tool_call" && update.sessionUpdate !== "tool_call_update") {
|
|
35
|
+
return [];
|
|
36
|
+
}
|
|
37
|
+
const child = nonEmpty(asRecord(asRecord(update.rawOutput)?.metadata)?.sessionID);
|
|
38
|
+
return child === null ? [] : [child];
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Child lifecycle as the parent's tasks, keyed by the child session like Codex
|
|
42
|
+
* child threads. A finished child can take a follow-up (`subagent` with its
|
|
43
|
+
* `sessionID`), which reports `running` again.
|
|
44
|
+
*/
|
|
45
|
+
export function opencodeChildTasks(method, params) {
|
|
46
|
+
const child = opencodeChildUpdate(method, params);
|
|
47
|
+
if (child === null || params.type !== "status") {
|
|
48
|
+
return [];
|
|
49
|
+
}
|
|
50
|
+
const taskId = child.sessionId;
|
|
51
|
+
switch (params.status) {
|
|
52
|
+
case "created":
|
|
53
|
+
return [{ kind: "task_started", taskId, taskType: "agent", childSessionId: taskId, background: true,
|
|
54
|
+
...(typeof params.title === "string" ? { description: params.title } : {}) }];
|
|
55
|
+
case "running":
|
|
56
|
+
return [{ kind: "task_updated", taskId, status: "running" }];
|
|
57
|
+
case "completed":
|
|
58
|
+
return [{ kind: "task_ended", taskId, status: "completed" }];
|
|
59
|
+
case "failed":
|
|
60
|
+
return [{ kind: "task_ended", taskId, status: "failed" }];
|
|
61
|
+
case "interrupted":
|
|
62
|
+
return [{ kind: "task_ended", taskId, status: "stopped" }];
|
|
63
|
+
default:
|
|
64
|
+
return [];
|
|
65
|
+
}
|
|
66
|
+
}
|
|
13
67
|
//# sourceMappingURL=attribution.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attribution.js","sources":["../../../src/runtimes/opencode/attribution.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"attribution.js","sources":["../../../src/runtimes/opencode/attribution.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAGjE,yFAAyF;AACzF,MAAM,CAAC,MAAM,wBAAwB,GAAsD,CAAC,YAAY,EAAE,EAAE;IAC1G,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC1C,sFAAsF;IACtF,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAAC,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAC/I,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,KAAK,EAAE,EAAE,KAAK,QAAQ,IAAI,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,IAAI,KAAK,CAAC,QAAQ,KAAK,EAAE,IAAI,KAAK,CAAC,EAAE,KAAK,KAAK,CAAC,QAAQ,EAAE,CAAC;QACtK,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC;AACzD,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,+BAA+B,CAAC;AACrE,MAAM,CAAC,MAAM,sBAAsB,GAAG,gCAAgC,CAAC;AAEvE,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;AAClE,CAAC;AAED,8IAA8I;AAC9I,MAAM,CAAC,MAAM,mBAAmB,GAAwD,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;IACzG,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAChD,IAAI,MAAM,KAAK,qBAAqB,IAAI,SAAS,KAAK,IAAI,IAAI,MAAM,KAAK,IAAI,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IACvH,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAClG,CAAC,CAAC;AAEF,mHAAmH;AACnH,MAAM,UAAU,uBAAuB,CAAC,MAAkB;IACxD,IAAI,MAAM,CAAC,aAAa,KAAK,WAAW,IAAI,MAAM,CAAC,aAAa,KAAK,kBAAkB,EAAE,CAAC;QAAC,OAAO,EAAE,CAAC;IAAC,CAAC;IACvG,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAC;IAClF,OAAO,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AACvC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAAc,EAAE,MAAkB;IACnE,MAAM,KAAK,GAAG,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClD,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAAC,OAAO,EAAE,CAAC;IAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC;IAC/B,QAAQ,MAAM,CAAC,MAAM,EAAE,CAAC;QACtB,KAAK,SAAS;YACZ,OAAO,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI;oBACjG,GAAG,CAAC,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAClF,KAAK,SAAS;YACZ,OAAO,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QAC/D,KAAK,WAAW;YACd,OAAO,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;QAC/D,KAAK,QAAQ;YACX,OAAO,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC5D,KAAK,aAAa;YAChB,OAAO,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QAC7D;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC"}
|
|
@@ -4,5 +4,13 @@ import { type AcpSessionProfile } from "../../shared/acp/session.js";
|
|
|
4
4
|
export declare const opencodeAcpProfile: AcpSessionProfile;
|
|
5
5
|
export declare const opencodeV2RefusedSessionOptions: RefusedSessionOptions;
|
|
6
6
|
export declare const opencodeV2AcpProfile: AcpSessionProfile;
|
|
7
|
+
/**
|
|
8
|
+
* 2.3.0 runs subagents in the background and stops projecting a child on the
|
|
9
|
+
* standard channel once its creating prompt ends. Declaring the capability moves
|
|
10
|
+
* every child update to `opencode/session/child_update`. The 2.2.5 and 2.2.7
|
|
11
|
+
* sources already read the same capability and would move their children too,
|
|
12
|
+
* so only 2.3 and later declare it; older lines keep their verified projection.
|
|
13
|
+
*/
|
|
14
|
+
export declare const opencodeBackgroundChildProfile: AcpSessionProfile;
|
|
7
15
|
export declare const opencodeSession: StartSession;
|
|
8
16
|
//# sourceMappingURL=session.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/opencode/session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAOxE,OAAO,KAAK,EAAE,YAAY,EAAW,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAc,KAAK,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/opencode/session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAOxE,OAAO,KAAK,EAAE,YAAY,EAAW,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAc,KAAK,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAMjF,eAAO,MAAM,kBAAkB,EAAE,iBA2BhC,CAAC;AAIF,eAAO,MAAM,+BAA+B,EAAE,qBAI7C,CAAC;AACF,eAAO,MAAM,oBAAoB,EAAE,iBAQlC,CAAC;AACF;;;;;;GAMG;AACH,eAAO,MAAM,8BAA8B,EAAE,iBAO5C,CAAC;AAgCF,eAAO,MAAM,eAAe,EAAE,YAkC5B,CAAC"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { withSessionCredentials } from "../../shared/session-credentials.js";
|
|
2
2
|
import { opencodeRefusedSessionOptions, opencodeV1RefusedSessionOptions } from "./options.js";
|
|
3
3
|
import { opencodeCompaction, opencodeCompactionEvents } from "./compaction.js";
|
|
4
|
-
import {
|
|
5
|
-
import { opencodeChildAttribution } from "./attribution.js";
|
|
4
|
+
import { hasBackgroundChildUpdates, opencodeRelease } from "./version.js";
|
|
5
|
+
import { OPENCODE_CHILD_UPDATE, OPENCODE_CHILD_UPDATES, opencodeChildAttribution, opencodeChildTasks, opencodeChildUpdate, opencodeSpawnedSessions } from "./attribution.js";
|
|
6
6
|
import { refuseSessionOptions } from "../../shared/session-options.js";
|
|
7
7
|
import { acpSession } from "../../shared/acp/session.js";
|
|
8
8
|
import { checkMcpServerNames } from "../../shared/mcp-servers.js";
|
|
9
9
|
import { opencodeFailureOutcome } from "./failure.js";
|
|
10
10
|
import { prepareOpenCodePrompts, validateOpenCodePrompts, verifyOpenCodeAgent } from "./prompt-config.js";
|
|
11
|
+
import { opencodeSteering } from "./steering.js";
|
|
11
12
|
export const opencodeAcpProfile = {
|
|
12
13
|
args: ["acp"],
|
|
13
14
|
failureOutcome: opencodeFailureOutcome,
|
|
@@ -49,8 +50,26 @@ export const opencodeV2AcpProfile = {
|
|
|
49
50
|
capabilities: { queue: { durable: false }, attribution: "nested" },
|
|
50
51
|
attributeUpdate: opencodeChildAttribution,
|
|
51
52
|
validateOptions: (options) => { refuseSessionOptions(opencodeV2RefusedSessionOptions, options); },
|
|
53
|
+
// A concurrent `session/prompt` is refused; `steer` exists only where `initialize` advertises `_session/steering`.
|
|
54
|
+
...opencodeSteering,
|
|
55
|
+
};
|
|
56
|
+
/**
|
|
57
|
+
* 2.3.0 runs subagents in the background and stops projecting a child on the
|
|
58
|
+
* standard channel once its creating prompt ends. Declaring the capability moves
|
|
59
|
+
* every child update to `opencode/session/child_update`. The 2.2.5 and 2.2.7
|
|
60
|
+
* sources already read the same capability and would move their children too,
|
|
61
|
+
* so only 2.3 and later declare it; older lines keep their verified projection.
|
|
62
|
+
*/
|
|
63
|
+
export const opencodeBackgroundChildProfile = {
|
|
64
|
+
...opencodeV2AcpProfile,
|
|
65
|
+
clientCapabilitiesMeta: () => ({ [OPENCODE_CHILD_UPDATES]: true }),
|
|
66
|
+
extensionNotifications: [OPENCODE_CHILD_UPDATE],
|
|
67
|
+
childNotification: opencodeChildUpdate,
|
|
68
|
+
spawnedSessions: opencodeSpawnedSessions,
|
|
69
|
+
projectExtension: opencodeChildTasks,
|
|
52
70
|
};
|
|
53
71
|
const directV2Session = acpSession(opencodeV2AcpProfile);
|
|
72
|
+
const backgroundChildSession = acpSession(opencodeBackgroundChildProfile);
|
|
54
73
|
function withPromptCleanup(session, cleanup) {
|
|
55
74
|
let unsubscribe = undefined;
|
|
56
75
|
const observeCleanup = async () => {
|
|
@@ -89,8 +108,10 @@ export const opencodeSession = withSessionCredentials(async (installation, optio
|
|
|
89
108
|
if (installation.via !== "executable") {
|
|
90
109
|
throw new Error("opencode requires an executable installation");
|
|
91
110
|
}
|
|
92
|
-
|
|
93
|
-
|
|
111
|
+
const release = await opencodeRelease(installation, options);
|
|
112
|
+
if (release.major === 2) {
|
|
113
|
+
const start = hasBackgroundChildUpdates(release) ? backgroundChildSession : directV2Session;
|
|
114
|
+
return start(installation, options, context);
|
|
94
115
|
}
|
|
95
116
|
refuseSessionOptions(opencodeV1RefusedSessionOptions, options);
|
|
96
117
|
if (options.systemPrompt === undefined && options.appendSystemPrompt === undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sources":["../../../src/runtimes/opencode/session.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,6BAA6B,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAC;AAC9F,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"session.js","sources":["../../../src/runtimes/opencode/session.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,6BAA6B,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAC;AAC9F,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC7K,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAEvE,OAAO,EAAE,UAAU,EAA0B,MAAM,6BAA6B,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC1G,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,CAAC,MAAM,kBAAkB,GAAsB;IACnD,IAAI,EAAE,CAAC,KAAK,CAAC;IACb,cAAc,EAAE,sBAAsB;IACtC,eAAe,EAAE,CAAC,OAAO,EAAE,EAAE,GAAG,oBAAoB,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACjG,yEAAyE;IACzE,0EAA0E;IAC1E,+DAA+D;IAC/D,YAAY,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE;IAClE,uEAAuE;IACvE,gBAAgB,EAAE,MAAM;IACxB,0EAA0E;IAC1E,4EAA4E;IAC5E,kCAAkC;IAClC,0EAA0E;IAC1E,2EAA2E;IAC3E,2DAA2D;IAC3D,oBAAoB,EAAE,IAAI;IAC1B,qEAAqE;IACrE,2EAA2E;IAC3E,0EAA0E;IAC1E,2DAA2D;IAC3D,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;IACvB,mEAAmE;IACnE,iEAAiE;IACjE,yDAAyD;IACzD,qBAAqB,EAAE,IAAI;IAC3B,mEAAmE;CACpE,CAAC;AAEF,MAAM,aAAa,GAAG,UAAU,CAAC,kBAAkB,CAAC,CAAC;AACrD,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,aAAa,EAAE,GAAG,kBAAkB,CAAC;AAC7E,MAAM,CAAC,MAAM,+BAA+B,GAA0B;IACpE,GAAG,6BAA6B;IAChC,kBAAkB,EAAE,2JAA2J;IAC/K,YAAY,EAAE,kLAAkL;CACjM,CAAC;AACF,MAAM,CAAC,MAAM,oBAAoB,GAAsB;IACrD,GAAG,aAAa;IAChB,UAAU,EAAE,kBAAkB,EAAE,aAAa,EAAE,wBAAwB;IACvE,YAAY,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE;IAClE,eAAe,EAAE,wBAAwB;IACzC,eAAe,EAAE,CAAC,OAAO,EAAE,EAAE,GAAG,oBAAoB,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACjG,mHAAmH;IACnH,GAAG,gBAAgB;CACpB,CAAC;AACF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAsB;IAC/D,GAAG,oBAAoB;IACvB,sBAAsB,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,sBAAsB,CAAC,EAAE,IAAI,EAAE,CAAC;IAClE,sBAAsB,EAAE,CAAC,qBAAqB,CAAC;IAC/C,iBAAiB,EAAE,mBAAmB;IACtC,eAAe,EAAE,uBAAuB;IACxC,gBAAgB,EAAE,kBAAkB;CACrC,CAAC;AACF,MAAM,eAAe,GAAG,UAAU,CAAC,oBAAoB,CAAC,CAAC;AACzD,MAAM,sBAAsB,GAAG,UAAU,CAAC,8BAA8B,CAAC,CAAC;AAE1E,SAAS,iBAAiB,CAAC,OAAgB,EAAE,OAA4B;IACvE,IAAI,WAAW,GAA6B,SAAS,CAAC;IACtD,MAAM,cAAc,GAAG,KAAK,IAAmB,EAAE;QAC/C,IAAI,CAAC;YAAC,MAAM,OAAO,EAAE,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,qCAAqC,CAAC,CAAC;IAC1E,CAAC,CAAC;IACF,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE;QACzC,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAChE,wEAAwE;YACxE,sEAAsE;YACtE,KAAK,cAAc,EAAE,CAAC;YACtB,WAAW,EAAE,EAAE,CAAC;QAClB,CAAC;IACH,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAC5C,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,EAAE,CAAC;QACpG,WAAW,EAAE,CAAC;IAChB,CAAC;IACD,IAAI,QAAQ,GAA8B,SAAS,CAAC;IACpD,MAAM,OAAO,GAAG,KAAK,IAAmB,EAAE;QACxC,IAAI,CAAC;YACH,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAC1B,CAAC;gBAAS,CAAC;YACT,WAAW,EAAE,CAAC;YACd,MAAM,OAAO,EAAE,CAAC;QAClB,CAAC;IACH,CAAC,CAAC;IACF,OAAO,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,EAAE,GAAG,QAAQ,KAAK,OAAO,EAAE,CAAC,CAAC,MAAM,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;AAC1F,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAiB,sBAAsB,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE;IACzH,oBAAoB,CAAC,6BAA6B,EAAE,OAAO,CAAC,CAAC;IAC7D,0EAA0E;IAC1E,mBAAmB,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;IAC9C,IAAI,YAAY,CAAC,GAAG,KAAK,YAAY,EAAE,CAAC;QAAC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAAC,CAAC;IAC3G,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC7D,IAAI,OAAO,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,eAAe,CAAC;QAC5F,OAAO,KAAK,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IACD,oBAAoB,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC;IAC/D,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,IAAI,OAAO,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;QACnF,OAAO,aAAa,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC;IACD,2EAA2E;IAC3E,iEAAiE;IACjE,uBAAuB,CAAC,OAAO,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7E,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC;YAC/B,GAAG,kBAAkB;YACrB,iHAAiH;YACjH,gBAAgB,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;gBACjC,IAAI,QAAQ,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;oBACjC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAChD,CAAC;gBACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;YAC3B,CAAC;SACF,CAAC,CAAC,YAAY,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5C,OAAO,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { AcpSessionProfile } from "../../shared/acp/profile.js";
|
|
2
|
+
/**
|
|
3
|
+
* OpenCode v2's interim mid-turn steering extension (first in 2.2.7; source
|
|
4
|
+
* `packages/cli/src/acp/{agent,turn,service}.ts`, docs/runtimes/opencode.md).
|
|
5
|
+
* `initialize` advertises it as `_meta.steering.supported: true`. The agent
|
|
6
|
+
* answers `injected` after adding the input to the running native turn, or
|
|
7
|
+
* `promptRequired` / `noRunningTurn` without starting a turn when none runs.
|
|
8
|
+
*/
|
|
9
|
+
export declare const OPENCODE_STEERING = "_session/steering";
|
|
10
|
+
export declare const opencodeSteering: Pick<AcpSessionProfile, "steerRequest" | "steerRequestAdvertised" | "steerRequestAnswer">;
|
|
11
|
+
//# sourceMappingURL=steering.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"steering.d.ts","sources":["../../../src/runtimes/opencode/steering.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGrE;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AAErD,eAAO,MAAM,gBAAgB,EAAE,IAAI,CAAC,iBAAiB,EAAE,cAAc,GAAG,wBAAwB,GAAG,oBAAoB,CAUtH,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { asRecord } from "../../shared/json.js";
|
|
2
|
+
/**
|
|
3
|
+
* OpenCode v2's interim mid-turn steering extension (first in 2.2.7; source
|
|
4
|
+
* `packages/cli/src/acp/{agent,turn,service}.ts`, docs/runtimes/opencode.md).
|
|
5
|
+
* `initialize` advertises it as `_meta.steering.supported: true`. The agent
|
|
6
|
+
* answers `injected` after adding the input to the running native turn, or
|
|
7
|
+
* `promptRequired` / `noRunningTurn` without starting a turn when none runs.
|
|
8
|
+
*/
|
|
9
|
+
export const OPENCODE_STEERING = "_session/steering";
|
|
10
|
+
export const opencodeSteering = {
|
|
11
|
+
// The extension reads only `sessionId` and `prompt`; it has no input identity field.
|
|
12
|
+
steerRequest: ({ sessionId, prompt }) => ({ method: OPENCODE_STEERING, params: { sessionId, prompt } }),
|
|
13
|
+
// oxlint-disable-next-line eslint/no-underscore-dangle -- Native ACP metadata envelope.
|
|
14
|
+
steerRequestAdvertised: (initialized) => asRecord(asRecord(initialized._meta)?.steering)?.supported === true,
|
|
15
|
+
steerRequestAnswer: (answer) => {
|
|
16
|
+
const outcome = asRecord(answer)?.outcome;
|
|
17
|
+
if (outcome === "injected") {
|
|
18
|
+
return "accepted";
|
|
19
|
+
}
|
|
20
|
+
return outcome === "promptRequired" ? "no_active_turn" : null;
|
|
21
|
+
},
|
|
22
|
+
};
|
|
23
|
+
//# sourceMappingURL=steering.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"steering.js","sources":["../../../src/runtimes/opencode/steering.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAErD,MAAM,CAAC,MAAM,gBAAgB,GAA8F;IACzH,qFAAqF;IACrF,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;IACvG,wFAAwF;IACxF,sBAAsB,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,EAAE,SAAS,KAAK,IAAI;IAC5G,kBAAkB,EAAE,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;QAC1C,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;YAAC,OAAO,UAAU,CAAC;QAAC,CAAC;QAClD,OAAO,OAAO,KAAK,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC;IAChE,CAAC;CACF,CAAC"}
|
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
import type { ExecutableInstallation } from "../../contracts/installation.js";
|
|
2
2
|
import type { SessionOptions } from "../../contracts/session.js";
|
|
3
|
+
/** A native release's numeric version; a prerelease suffix compares as its release. */
|
|
4
|
+
export interface OpencodeRelease {
|
|
5
|
+
readonly major: 1 | 2;
|
|
6
|
+
readonly minor: number;
|
|
7
|
+
readonly patch: number;
|
|
8
|
+
}
|
|
3
9
|
/** The two independently maintained native lines share one command name. */
|
|
10
|
+
export declare function opencodeRelease(installation: ExecutableInstallation, options?: Pick<SessionOptions, "cwd" | "env">): Promise<OpencodeRelease>;
|
|
4
11
|
export declare function opencodeMajor(installation: ExecutableInstallation, options?: Pick<SessionOptions, "cwd" | "env">): Promise<1 | 2>;
|
|
12
|
+
/** 2.3.0 runs subagents in the background and reports them through `opencode/session/child_update`. */
|
|
13
|
+
export declare function hasBackgroundChildUpdates(release: OpencodeRelease): boolean;
|
|
5
14
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sources":["../../../src/runtimes/opencode/version.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAKjE,4EAA4E;AAC5E,wBAAsB,aAAa,CAAC,YAAY,EAAE,sBAAsB,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,GAAG,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"version.d.ts","sources":["../../../src/runtimes/opencode/version.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAKjE,uFAAuF;AACvF,MAAM,WAAW,eAAe;IAAG,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE;AAE1G,4EAA4E;AAC5E,wBAAsB,eAAe,CAAC,YAAY,EAAE,sBAAsB,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,GAAG,KAAK,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,CAkBnJ;AAED,wBAAsB,aAAa,CAAC,YAAY,EAAE,sBAAsB,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,GAAG,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAGvI;AAED,uGAAuG;AACvG,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAE3E"}
|
|
@@ -2,7 +2,7 @@ import { processFailure } from "../../shared/executable/diagnostics.js";
|
|
|
2
2
|
import { runExecutable } from "../../shared/executable/run.js";
|
|
3
3
|
import { sessionEnvironment } from "../../shared/environment.js";
|
|
4
4
|
/** The two independently maintained native lines share one command name. */
|
|
5
|
-
export async function
|
|
5
|
+
export async function opencodeRelease(installation, options) {
|
|
6
6
|
let version = installation.version;
|
|
7
7
|
if (version === undefined) {
|
|
8
8
|
const result = await runExecutable(installation.command, ["--version"], {
|
|
@@ -14,10 +14,19 @@ export async function opencodeMajor(installation, options) {
|
|
|
14
14
|
}
|
|
15
15
|
version = result.stdout.trim();
|
|
16
16
|
}
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
const match = /^(?:opencode\s+)?v?([12])\.(\d+)\.(\d+)(?:\S*)$/u.exec(version.trim());
|
|
18
|
+
const [, major, minor, patch] = match ?? [];
|
|
19
|
+
if ((major === "1" || major === "2") && minor !== undefined && patch !== undefined) {
|
|
20
|
+
return { major: major === "1" ? 1 : 2, minor: Number(minor), patch: Number(patch) };
|
|
20
21
|
}
|
|
21
22
|
throw new Error(`Unrecognized opencode release line: ${JSON.stringify(version)}`);
|
|
22
23
|
}
|
|
24
|
+
export async function opencodeMajor(installation, options) {
|
|
25
|
+
const release = await opencodeRelease(installation, options);
|
|
26
|
+
return release.major;
|
|
27
|
+
}
|
|
28
|
+
/** 2.3.0 runs subagents in the background and reports them through `opencode/session/child_update`. */
|
|
29
|
+
export function hasBackgroundChildUpdates(release) {
|
|
30
|
+
return release.major === 2 && release.minor >= 3;
|
|
31
|
+
}
|
|
23
32
|
//# sourceMappingURL=version.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sources":["../../../src/runtimes/opencode/version.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"version.js","sources":["../../../src/runtimes/opencode/version.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAKjE,4EAA4E;AAC5E,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,YAAoC,EAAE,OAA6C;IACvH,IAAI,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;IACnC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE;YACtE,SAAS,EAAE,MAAM;YACjB,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;SAC7F,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,MAAM,cAAc,CAAC,8CAA8C,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QACjK,CAAC;QACD,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACjC,CAAC;IACD,MAAM,KAAK,GAAG,kDAAkD,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACtF,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;IAC5C,IAAI,CAAC,KAAK,KAAK,GAAG,IAAI,KAAK,KAAK,GAAG,CAAC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACnF,OAAO,EAAE,KAAK,EAAE,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;IACtF,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,uCAAuC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AACpF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,YAAoC,EAAE,OAA6C;IACrH,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC7D,OAAO,OAAO,CAAC,KAAK,CAAC;AACvB,CAAC;AAED,uGAAuG;AACvG,MAAM,UAAU,yBAAyB,CAAC,OAAwB;IAChE,OAAO,OAAO,CAAC,KAAK,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,IAAI,CAAC,CAAC;AACnD,CAAC"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import type { SessionEdge } from "../../contracts/graph.js";
|
|
2
|
+
import type { SessionOptions } from "../../contracts/session.js";
|
|
3
|
+
import type { JsonRecord } from "../json.js";
|
|
4
|
+
/** What a vendor extension notification says about one derived (child) session. */
|
|
5
|
+
export interface AcpChildNotification {
|
|
6
|
+
/** The derived session the notification is about. */
|
|
7
|
+
readonly sessionId: string;
|
|
8
|
+
/** Its parent session, as the runtime names it. A claim only: the graph edge also needs `spawnedSessions` evidence. */
|
|
9
|
+
readonly parent: string;
|
|
10
|
+
/**
|
|
11
|
+
* The derived session's own standard session update, projected exactly as its
|
|
12
|
+
* `session/update` would be and recorded under `sessionId`. Null for a lifecycle
|
|
13
|
+
* report, which is recorded on the parent's envelope with `projectExtension` events.
|
|
14
|
+
*/
|
|
15
|
+
readonly update: JsonRecord | null;
|
|
16
|
+
}
|
|
17
|
+
/** Profile hooks for runtimes that report derived sessions outside the standard update channel. */
|
|
18
|
+
export interface AcpDerivedSessionHooks {
|
|
19
|
+
/** Vendor client features merged into `initialize`'s `clientCapabilities._meta`. */
|
|
20
|
+
readonly clientCapabilitiesMeta?: (options: SessionOptions) => JsonRecord | undefined;
|
|
21
|
+
/**
|
|
22
|
+
* Read an extension notification about a derived session. Once one names a child,
|
|
23
|
+
* that child's attributed standard updates stay verbatim without events, so one
|
|
24
|
+
* native update is never projected twice.
|
|
25
|
+
*/
|
|
26
|
+
readonly childNotification?: (method: string, params: JsonRecord) => AcpChildNotification | null;
|
|
27
|
+
/** Child session ids a tool call update reports it started (the spawning tool's own output). */
|
|
28
|
+
readonly spawnedSessions?: (update: JsonRecord) => readonly string[];
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Edges proven by two native facts: a child notification naming its parent, and a
|
|
32
|
+
* tool call in that same parent session reporting the child it started. Either may
|
|
33
|
+
* arrive first; neither alone is an edge.
|
|
34
|
+
*/
|
|
35
|
+
export interface AcpChildLineage {
|
|
36
|
+
claim(child: string, parent: string): readonly SessionEdge[];
|
|
37
|
+
spawned(session: string, children: readonly string[]): readonly SessionEdge[];
|
|
38
|
+
}
|
|
39
|
+
export declare function createAcpChildLineage(): AcpChildLineage;
|
|
40
|
+
//# sourceMappingURL=derived-sessions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"derived-sessions.d.ts","sources":["../../../src/shared/acp/derived-sessions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,mFAAmF;AACnF,MAAM,WAAW,oBAAoB;IACnC,qDAAqD;IACrD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,uHAAuH;IACvH,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;CACpC;AAED,mGAAmG;AACnG,MAAM,WAAW,sBAAsB;IACrC,oFAAoF;IACpF,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,UAAU,GAAG,SAAS,CAAC;IACtF;;;;OAIG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,oBAAoB,GAAG,IAAI,CAAC;IACjG,gGAAgG;IAChG,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,SAAS,MAAM,EAAE,CAAC;CACtE;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,WAAW,EAAE,CAAC;IAC7D,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,WAAW,EAAE,CAAC;CAC/E;AAQD,wBAAgB,qBAAqB,IAAI,eAAe,CAiBvD"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
function add(map, key, value) {
|
|
2
|
+
const values = map.get(key) ?? new Set();
|
|
3
|
+
values.add(value);
|
|
4
|
+
map.set(key, values);
|
|
5
|
+
}
|
|
6
|
+
export function createAcpChildLineage() {
|
|
7
|
+
const claims = new Map();
|
|
8
|
+
const spawners = new Map();
|
|
9
|
+
return {
|
|
10
|
+
claim(child, parent) {
|
|
11
|
+
if (child === parent) {
|
|
12
|
+
return [];
|
|
13
|
+
}
|
|
14
|
+
add(claims, child, parent);
|
|
15
|
+
return spawners.get(child)?.has(parent) === true ? [{ parent, child, via: "tool_call" }] : [];
|
|
16
|
+
},
|
|
17
|
+
spawned(session, children) {
|
|
18
|
+
return children.flatMap((child) => {
|
|
19
|
+
if (child === session) {
|
|
20
|
+
return [];
|
|
21
|
+
}
|
|
22
|
+
add(spawners, child, session);
|
|
23
|
+
return claims.get(child)?.has(session) === true ? [{ parent: session, child, via: "tool_call" }] : [];
|
|
24
|
+
});
|
|
25
|
+
},
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=derived-sessions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"derived-sessions.js","sources":["../../../src/shared/acp/derived-sessions.ts"],"names":[],"mappings":"AA0CA,SAAS,GAAG,CAAC,GAA6B,EAAE,GAAW,EAAE,KAAa;IACpE,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,EAAU,CAAC;IACjD,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAClB,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,qBAAqB;IACnC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAuB,CAAC;IAC9C,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAuB,CAAC;IAChD,OAAO;QACL,KAAK,CAAC,KAAK,EAAE,MAAM;YACjB,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;gBAAC,OAAO,EAAE,CAAC;YAAC,CAAC;YACpC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YAC3B,OAAO,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAChG,CAAC;QACD,OAAO,CAAC,OAAO,EAAE,QAAQ;YACvB,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBAChC,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;oBAAC,OAAO,EAAE,CAAC;gBAAC,CAAC;gBACrC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;gBAC9B,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,WAAoB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACjH,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1 +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,
|
|
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,CAsCrB"}
|
|
@@ -4,12 +4,14 @@ import { asRecord } from "../json.js";
|
|
|
4
4
|
import { withAcpDeadline } from "./process.js";
|
|
5
5
|
export async function initializeAcpConnection(process, profile, options, observe) {
|
|
6
6
|
const meta = profile.initializeMeta?.(options);
|
|
7
|
+
const capabilitiesMeta = profile.clientCapabilitiesMeta?.(options);
|
|
7
8
|
const method = methods.agent.initialize;
|
|
8
9
|
const initialized = await withAcpDeadline(process, method, profile.requestTimeoutMs ?? 15_000, (requestOptions) => process.connection.agent.request(method, {
|
|
9
10
|
protocolVersion: PROTOCOL_VERSION,
|
|
10
11
|
clientCapabilities: {
|
|
11
12
|
fs: { readTextFile: false, writeTextFile: false },
|
|
12
13
|
terminal: true,
|
|
14
|
+
...(capabilitiesMeta === undefined ? {} : { _meta: capabilitiesMeta }),
|
|
13
15
|
},
|
|
14
16
|
clientInfo: { name: "oar", version: "0.0.0" },
|
|
15
17
|
...(meta === undefined ? {} : { _meta: meta }),
|
|
@@ -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,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;
|
|
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,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;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"}
|
|
@@ -2,18 +2,20 @@ import type { CompactionOperation } from "../manual-compaction.js";
|
|
|
2
2
|
import type { SessionKernel } from "../session-kernel.js";
|
|
3
3
|
import type { ContextUsage, RuntimeEventBody, SessionCapabilities, SessionOptions, TokenTotals, TurnOutcome } from "../../contracts/session.js";
|
|
4
4
|
import { type JsonRecord } from "../json.js";
|
|
5
|
+
import type { AcpDerivedSessionHooks } from "./derived-sessions.js";
|
|
6
|
+
import type { AcpSteerRequestHooks } from "./steer-request.js";
|
|
5
7
|
import type { AcpConfigUpdates } from "./config-updates.js";
|
|
6
8
|
import { type AcpFailureReader } from "./failure.js";
|
|
7
9
|
import { type AcpProcess } from "./process.js";
|
|
8
10
|
export { promptAcp } from "./prompt.js";
|
|
9
11
|
export { createUsageUpdateGate, type UsageUpdateGate } from "./usage-wait.js";
|
|
10
12
|
export { acpMcpOpenGuard } from "./mcp-servers.js";
|
|
11
|
-
export interface AcpSessionProfile {
|
|
13
|
+
export interface AcpSessionProfile extends AcpDerivedSessionHooks, AcpSteerRequestHooks {
|
|
12
14
|
/** Native compaction control, absent when the installed protocol cannot prove completion. */
|
|
13
15
|
readonly compaction?: (kernel: SessionKernel, runtime: AcpProcess, promptUsage: (response: JsonRecord) => RuntimeEventBody | null) => CompactionOperation;
|
|
14
|
-
/** Additional vendor facts on a session update; attribution remains the recorder's responsibility. */
|
|
15
16
|
/** Vendor facts on an extension notification; its envelope retains native attribution. */
|
|
16
17
|
readonly projectExtension?: (method: string, params: JsonRecord) => readonly RuntimeEventBody[];
|
|
18
|
+
/** Additional vendor facts on a session update; attribution remains the recorder's responsibility. */
|
|
17
19
|
readonly projectUpdate?: (update: JsonRecord) => readonly RuntimeEventBody[];
|
|
18
20
|
/** Vendor attribution for forwarded updates. The original notification is always recorded verbatim. */
|
|
19
21
|
readonly attributeUpdate?: (notification: unknown) => {
|
|
@@ -71,23 +73,8 @@ export interface AcpSessionProfile {
|
|
|
71
73
|
readonly response: JsonRecord;
|
|
72
74
|
readonly options: SessionOptions;
|
|
73
75
|
}) => Promise<void>;
|
|
74
|
-
/** Return prompt-level extension fields for the runtime's native steer; absent when the runtime cannot steer, and then the session has no `steer`. */
|
|
76
|
+
/** Return prompt-level extension fields for the runtime's native steer; absent when the runtime cannot steer, and then the session has no `steer`. Exclusive with `steerRequest` (steer-request.ts). */
|
|
75
77
|
readonly steerParams?: (input: string) => JsonRecord;
|
|
76
|
-
/**
|
|
77
|
-
* A native steer that is its own RPC, not another prompt (grok
|
|
78
|
-
* `_x.ai/interject`): the answer admits the input into the running turn,
|
|
79
|
-
* which still ends with the original prompt's answer. Exclusive with
|
|
80
|
-
* `steerParams`.
|
|
81
|
-
*/
|
|
82
|
-
readonly steerRequest?: (context: {
|
|
83
|
-
readonly sessionId: string;
|
|
84
|
-
readonly input: string;
|
|
85
|
-
readonly prompt: readonly JsonRecord[];
|
|
86
|
-
readonly inputId: string;
|
|
87
|
-
}) => {
|
|
88
|
-
readonly method: string;
|
|
89
|
-
readonly params: JsonRecord;
|
|
90
|
-
};
|
|
91
78
|
/**
|
|
92
79
|
* Turns the runtime runs without a prompt from OAR (grok: a sub-agent's
|
|
93
80
|
* completion wake, a late interjection). OAR names each prompt it sends;
|