@gencode/uni 0.3.1 → 0.4.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/CHANGELOG.md +19 -0
- package/README.md +104 -0
- package/dist/shared/src/index.d.ts +1 -1
- package/dist/shared/src/index.d.ts.map +1 -1
- package/dist/shared/src/index.js.map +1 -1
- package/dist/shared/src/session.d.ts +13 -0
- package/dist/shared/src/session.d.ts.map +1 -1
- package/dist/uni/src/artifacts/accumulator.d.ts +17 -0
- package/dist/uni/src/artifacts/accumulator.d.ts.map +1 -0
- package/dist/uni/src/artifacts/accumulator.js +73 -0
- package/dist/uni/src/artifacts/accumulator.js.map +1 -0
- package/dist/uni/src/artifacts/parser.d.ts +14 -0
- package/dist/uni/src/artifacts/parser.d.ts.map +1 -0
- package/dist/uni/src/artifacts/parser.js +151 -0
- package/dist/uni/src/artifacts/parser.js.map +1 -0
- package/dist/uni/src/artifacts/stream-filter.d.ts +16 -0
- package/dist/uni/src/artifacts/stream-filter.d.ts.map +1 -0
- package/dist/uni/src/artifacts/stream-filter.js +93 -0
- package/dist/uni/src/artifacts/stream-filter.js.map +1 -0
- package/dist/uni/src/artifacts/tool-inference.d.ts +11 -0
- package/dist/uni/src/artifacts/tool-inference.d.ts.map +1 -0
- package/dist/uni/src/artifacts/tool-inference.js +257 -0
- package/dist/uni/src/artifacts/tool-inference.js.map +1 -0
- package/dist/uni/src/events/normalizer.d.ts.map +1 -1
- package/dist/uni/src/events/normalizer.js +8 -1
- package/dist/uni/src/events/normalizer.js.map +1 -1
- package/dist/uni/src/events/provider-events.d.ts.map +1 -1
- package/dist/uni/src/events/provider-events.js +353 -56
- package/dist/uni/src/events/provider-events.js.map +1 -1
- package/dist/uni/src/program.d.ts.map +1 -1
- package/dist/uni/src/program.js +8 -4
- package/dist/uni/src/program.js.map +1 -1
- package/dist/uni/src/providers/claude-code.d.ts.map +1 -1
- package/dist/uni/src/providers/claude-code.js +6 -2
- package/dist/uni/src/providers/claude-code.js.map +1 -1
- package/dist/uni/src/providers/codex.d.ts.map +1 -1
- package/dist/uni/src/providers/codex.js +13 -7
- package/dist/uni/src/providers/codex.js.map +1 -1
- package/dist/uni/src/providers/opencode.d.ts.map +1 -1
- package/dist/uni/src/providers/opencode.js +6 -2
- package/dist/uni/src/providers/opencode.js.map +1 -1
- package/dist/uni/src/providers/pi.d.ts.map +1 -1
- package/dist/uni/src/providers/pi.js +14 -5
- package/dist/uni/src/providers/pi.js.map +1 -1
- package/dist/uni/src/providers/provider-state.d.ts +10 -0
- package/dist/uni/src/providers/provider-state.d.ts.map +1 -0
- package/dist/uni/src/providers/provider-state.js +50 -0
- package/dist/uni/src/providers/provider-state.js.map +1 -0
- package/dist/uni/src/providers/spawned-provider.d.ts.map +1 -1
- package/dist/uni/src/providers/spawned-provider.js +36 -4
- package/dist/uni/src/providers/spawned-provider.js.map +1 -1
- package/dist/uni/src/run.d.ts.map +1 -1
- package/dist/uni/src/run.js +852 -336
- package/dist/uni/src/run.js.map +1 -1
- package/dist/uni/src/session/artifact-operation-store.d.ts +66 -0
- package/dist/uni/src/session/artifact-operation-store.d.ts.map +1 -0
- package/dist/uni/src/session/artifact-operation-store.js +370 -0
- package/dist/uni/src/session/artifact-operation-store.js.map +1 -0
- package/dist/uni/src/session/context-store.d.ts +37 -0
- package/dist/uni/src/session/context-store.d.ts.map +1 -0
- package/dist/uni/src/session/context-store.js +222 -0
- package/dist/uni/src/session/context-store.js.map +1 -0
- package/dist/uni/src/session/session-store.d.ts +57 -2
- package/dist/uni/src/session/session-store.d.ts.map +1 -1
- package/dist/uni/src/session/session-store.js +484 -15
- package/dist/uni/src/session/session-store.js.map +1 -1
- package/dist/uni/src/transcript/turn-accumulator.d.ts +57 -0
- package/dist/uni/src/transcript/turn-accumulator.d.ts.map +1 -0
- package/dist/uni/src/transcript/turn-accumulator.js +136 -0
- package/dist/uni/src/transcript/turn-accumulator.js.map +1 -0
- package/dist/uni/src/types.d.ts +25 -1
- package/dist/uni/src/types.d.ts.map +1 -1
- package/package.json +2 -2
package/dist/uni/src/program.js
CHANGED
|
@@ -3,6 +3,7 @@ import { buildRuntimeConfig } from "./runtime-config.js";
|
|
|
3
3
|
import { runUni } from "./run.js";
|
|
4
4
|
import fs from "node:fs";
|
|
5
5
|
import path from "node:path";
|
|
6
|
+
import { randomUUID } from "node:crypto";
|
|
6
7
|
import { fileURLToPath } from "node:url";
|
|
7
8
|
function loadPackageVersion() {
|
|
8
9
|
const currentDir = path.dirname(fileURLToPath(import.meta.url));
|
|
@@ -80,6 +81,7 @@ function buildRunOptions(options) {
|
|
|
80
81
|
streamUrl: options.streamUrl,
|
|
81
82
|
streamAuthToken: options.streamAuthToken,
|
|
82
83
|
streamEvents: options.streamEvents,
|
|
84
|
+
artifactsUrlWhitelist: options.artifactsUrlWhitelist,
|
|
83
85
|
timeout: options.timeout,
|
|
84
86
|
output: options.output,
|
|
85
87
|
pluginsConfig: options.pluginsConfig,
|
|
@@ -97,7 +99,8 @@ function shouldStreamText(event) {
|
|
|
97
99
|
}
|
|
98
100
|
export async function executeUniRun(options, run = runUni) {
|
|
99
101
|
const output = options.output === "json" || options.output === "jsonl" ? options.output : "text";
|
|
100
|
-
const
|
|
102
|
+
const logicalSessionId = options.sessionId?.trim() || randomUUID();
|
|
103
|
+
const runOptions = { ...options, sessionId: logicalSessionId };
|
|
101
104
|
let wroteText = false;
|
|
102
105
|
let terminalEventWritten = false;
|
|
103
106
|
if (output === "jsonl") {
|
|
@@ -113,7 +116,7 @@ export async function executeUniRun(options, run = runUni) {
|
|
|
113
116
|
}
|
|
114
117
|
writeJsonLine({
|
|
115
118
|
type: "progress",
|
|
116
|
-
sessionId: event.sessionId ??
|
|
119
|
+
sessionId: event.sessionId ?? logicalSessionId,
|
|
117
120
|
messageId: event.messageId ?? options.messageId,
|
|
118
121
|
channel: options.channel ?? "WEB",
|
|
119
122
|
user: options.user,
|
|
@@ -138,7 +141,7 @@ export async function executeUniRun(options, run = runUni) {
|
|
|
138
141
|
if (output === "jsonl" && !terminalEventWritten) {
|
|
139
142
|
writeJsonLine({
|
|
140
143
|
type: "error",
|
|
141
|
-
sessionId:
|
|
144
|
+
sessionId: logicalSessionId,
|
|
142
145
|
messageId: options.messageId,
|
|
143
146
|
channel: options.channel ?? "WEB",
|
|
144
147
|
user: options.user,
|
|
@@ -180,7 +183,7 @@ export function createProgram(dependencies = {}) {
|
|
|
180
183
|
.option("--message <text>", "User message to send to the runtime")
|
|
181
184
|
.option("--from-file <path>", "Load structured message JSON from a file")
|
|
182
185
|
.option("--skillsLoadPaths <paths>", "Legacy skills load paths, currently unsupported")
|
|
183
|
-
.option("-s, --session-id <id>", "Resume an existing
|
|
186
|
+
.option("-s, --session-id <id>", "Resume an existing logical session by ID")
|
|
184
187
|
.option("--session-store <name>", "Session store directory under .aimax")
|
|
185
188
|
.option("--message-id <id>", "Message ID for correlation")
|
|
186
189
|
.option("-c, --channel <channel>", "Channel name", "WEB")
|
|
@@ -194,6 +197,7 @@ export function createProgram(dependencies = {}) {
|
|
|
194
197
|
.option("--stream-url <url>", "WebSocket URL for streaming")
|
|
195
198
|
.option("--stream-auth-token <token>", "WebSocket auth token")
|
|
196
199
|
.option("--stream-events <list>", "Comma-separated stream events")
|
|
200
|
+
.option("--artifacts-url-whitelist <values>", "Comma-separated exact hostnames or URLs allowed for URL artifacts")
|
|
197
201
|
.option("--timeout <ms>", "Execution timeout in milliseconds")
|
|
198
202
|
.option("--output <format>", "Output format: text, json, or jsonl", "text")
|
|
199
203
|
.option("--plugins-config <path>", "Legacy plugins config, currently unsupported")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"program.js","sourceRoot":"","sources":["../../../src/program.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,kBAAkB,EAA6B,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,SAAS,kBAAkB;IACzB,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAChE,MAAM,UAAU,GAAG;QACjB,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,iBAAiB,CAAC;QAC3C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,oBAAoB,CAAC;QAC9C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,uBAAuB,CAAC;KAClD,CAAC;IAEF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9B,SAAS;QACX,CAAC;QACD,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAA0B,CAAC;QACxD,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpE,OAAO,MAAM,CAAC,OAAO,CAAC;QACxB,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,cAAc,GAAG,kBAAkB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"program.js","sourceRoot":"","sources":["../../../src/program.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code.d.ts","sourceRoot":"","sources":["../../../../src/providers/claude-code.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAuB,WAAW,EAAsB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"claude-code.d.ts","sourceRoot":"","sources":["../../../../src/providers/claude-code.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAuB,WAAW,EAAsB,MAAM,aAAa,CAAC;AAiExF,wBAAgB,wBAAwB,IAAI,WAAW,CA+BtD"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { parseClaudeCodeEvent } from "../events/provider-events.js";
|
|
2
2
|
import { SpawnedProvider } from "./spawned-provider.js";
|
|
3
3
|
import { splitCliPath } from "../runtime-config.js";
|
|
4
|
+
import { defaultProviderStateEnv, providerSessionId } from "./provider-state.js";
|
|
4
5
|
function resolveConfig(context) {
|
|
5
6
|
return context.runtimeConfig.claudeCode ?? {};
|
|
6
7
|
}
|
|
@@ -22,8 +23,9 @@ function buildArgs(context, prompt) {
|
|
|
22
23
|
"--output-format", "stream-json",
|
|
23
24
|
"--print",
|
|
24
25
|
];
|
|
25
|
-
|
|
26
|
-
|
|
26
|
+
const nativeSessionId = providerSessionId(context);
|
|
27
|
+
if (nativeSessionId) {
|
|
28
|
+
args.push("--resume", nativeSessionId);
|
|
27
29
|
}
|
|
28
30
|
const model = resolveModel(context, config);
|
|
29
31
|
if (model) {
|
|
@@ -72,6 +74,8 @@ export function createClaudeCodeProvider() {
|
|
|
72
74
|
buildEnv: (context) => {
|
|
73
75
|
const config = resolveConfig(context);
|
|
74
76
|
return {
|
|
77
|
+
...defaultProviderStateEnv("claude-code", context.dataDir),
|
|
78
|
+
...(context.runtimeConfig.env ?? {}),
|
|
75
79
|
...(config.provider?.env ?? {}),
|
|
76
80
|
...(config.env ?? {}),
|
|
77
81
|
...(config.provider?.apiKey ? { ANTHROPIC_API_KEY: config.provider.apiKey } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code.js","sourceRoot":"","sources":["../../../../src/providers/claude-code.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"claude-code.js","sourceRoot":"","sources":["../../../../src/providers/claude-code.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../../src/providers/codex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,WAAW,EAAsB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../../src/providers/codex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,WAAW,EAAsB,MAAM,aAAa,CAAC;AAmDnF,wBAAgB,mBAAmB,IAAI,WAAW,CA4BjD"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { parseCodexEvent } from "../events/provider-events.js";
|
|
2
2
|
import { SpawnedProvider } from "./spawned-provider.js";
|
|
3
3
|
import { splitCliPath } from "../runtime-config.js";
|
|
4
|
+
import { defaultProviderStateEnv, providerSessionId } from "./provider-state.js";
|
|
4
5
|
function resolveConfig(context) {
|
|
5
6
|
return context.runtimeConfig.codex ?? {};
|
|
6
7
|
}
|
|
@@ -12,12 +13,11 @@ function buildArgs(context) {
|
|
|
12
13
|
if (config.backend === "app_server") {
|
|
13
14
|
throw new Error("codex backend app_server is not implemented in @gencode/uni yet");
|
|
14
15
|
}
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
if (context.projectDir) {
|
|
16
|
+
const nativeSessionId = providerSessionId(context);
|
|
17
|
+
const args = nativeSessionId
|
|
18
|
+
? ["exec", "resume", "--skip-git-repo-check", "--json"]
|
|
19
|
+
: ["exec", "--skip-git-repo-check", "--json"];
|
|
20
|
+
if (context.projectDir && !nativeSessionId) {
|
|
21
21
|
args.push("--cd", context.projectDir);
|
|
22
22
|
}
|
|
23
23
|
const model = resolveModel(context, config);
|
|
@@ -39,13 +39,17 @@ function buildArgs(context) {
|
|
|
39
39
|
if (context.baseUrl) {
|
|
40
40
|
args.push("-c", `openai_base_url=${JSON.stringify(context.baseUrl)}`);
|
|
41
41
|
}
|
|
42
|
+
if (nativeSessionId) {
|
|
43
|
+
args.push(nativeSessionId);
|
|
44
|
+
}
|
|
45
|
+
args.push("-");
|
|
42
46
|
return args;
|
|
43
47
|
}
|
|
44
48
|
export function createCodexProvider() {
|
|
45
49
|
return new SpawnedProvider({
|
|
46
50
|
runtimeAgent: "codex",
|
|
47
51
|
defaultCommand: "codex",
|
|
48
|
-
capabilities: new Set(["session-resume", "text-stream", "callback", "websocket"]),
|
|
52
|
+
capabilities: new Set(["session-resume", "text-stream", "tool-events", "callback", "websocket"]),
|
|
49
53
|
buildArgs,
|
|
50
54
|
resolveCommand: (context) => {
|
|
51
55
|
const config = resolveConfig(context);
|
|
@@ -58,6 +62,8 @@ export function createCodexProvider() {
|
|
|
58
62
|
buildEnv: (context) => {
|
|
59
63
|
const config = resolveConfig(context);
|
|
60
64
|
return {
|
|
65
|
+
...defaultProviderStateEnv("codex", context.dataDir),
|
|
66
|
+
...(context.runtimeConfig.env ?? {}),
|
|
61
67
|
...(config.provider?.env ?? {}),
|
|
62
68
|
...(config.env ?? {}),
|
|
63
69
|
...(config.codexHome ? { CODEX_HOME: config.codexHome } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../../src/providers/codex.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../../src/providers/codex.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode.d.ts","sourceRoot":"","sources":["../../../../src/providers/opencode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,WAAW,EAAsB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"opencode.d.ts","sourceRoot":"","sources":["../../../../src/providers/opencode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,WAAW,EAAsB,MAAM,aAAa,CAAC;AA2BtF,wBAAgB,sBAAsB,IAAI,WAAW,CA0BpD"}
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import { parseOpenCodeEvent } from "../events/provider-events.js";
|
|
2
2
|
import { splitCliPath } from "../runtime-config.js";
|
|
3
3
|
import { SpawnedProvider } from "./spawned-provider.js";
|
|
4
|
+
import { defaultProviderStateEnv, providerSessionId } from "./provider-state.js";
|
|
4
5
|
function resolveConfig(context) {
|
|
5
6
|
return context.runtimeConfig.opencode ?? {};
|
|
6
7
|
}
|
|
7
8
|
function buildArgs(context) {
|
|
8
9
|
const config = resolveConfig(context);
|
|
9
10
|
const args = ["run", "--format", "json", "--thinking"];
|
|
10
|
-
|
|
11
|
-
|
|
11
|
+
const nativeSessionId = providerSessionId(context);
|
|
12
|
+
if (nativeSessionId) {
|
|
13
|
+
args.push("--session", nativeSessionId);
|
|
12
14
|
}
|
|
13
15
|
const model = context.model ?? config.provider?.model;
|
|
14
16
|
if (model) {
|
|
@@ -35,6 +37,8 @@ export function createOpenCodeProvider() {
|
|
|
35
37
|
buildEnv: (context) => {
|
|
36
38
|
const config = resolveConfig(context);
|
|
37
39
|
return {
|
|
40
|
+
...defaultProviderStateEnv("opencode", context.dataDir),
|
|
41
|
+
...(context.runtimeConfig.env ?? {}),
|
|
38
42
|
...(config.provider?.env ?? {}),
|
|
39
43
|
...(config.env ?? {}),
|
|
40
44
|
...(config.provider?.apiKey ? { OPENAI_API_KEY: config.provider.apiKey } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode.js","sourceRoot":"","sources":["../../../../src/providers/opencode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"opencode.js","sourceRoot":"","sources":["../../../../src/providers/opencode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEjF,SAAS,aAAa,CAAC,OAA2B;IAChD,OAAO,OAAO,CAAC,aAAa,CAAC,QAAQ,IAAI,EAAE,CAAC;AAC9C,CAAC;AAED,SAAS,SAAS,CAAC,OAA2B;IAC5C,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IACvD,MAAM,eAAe,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,eAAe,EAAE,CAAC;QACpB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAC1C,CAAC;IACD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC;IACtD,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC9B,CAAC;IACD,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,OAAO,IAAI,eAAe,CAAC;QACzB,YAAY,EAAE,UAAU;QACxB,cAAc,EAAE,UAAU;QAC1B,YAAY,EAAE,IAAI,GAAG,CAAC,CAAC,gBAAgB,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;QAChG,SAAS;QACT,cAAc,EAAE,CAAC,OAAO,EAAE,EAAE;YAC1B,MAAM,QAAQ,GAAG,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;YAC9D,OAAO;gBACL,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,UAAU;gBACvC,SAAS,EAAE,QAAQ,CAAC,SAAS;aAC9B,CAAC;QACJ,CAAC;QACD,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE;YACpB,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;YACtC,OAAO;gBACL,GAAG,uBAAuB,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC;gBACvD,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,EAAE,CAAC;gBACpC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,IAAI,EAAE,CAAC;gBAC/B,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC;gBACrB,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9E,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAClF,CAAC;QACJ,CAAC;QACD,SAAS,EAAE,kBAAkB;KAC9B,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pi.d.ts","sourceRoot":"","sources":["../../../../src/providers/pi.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,WAAW,EAAsB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"pi.d.ts","sourceRoot":"","sources":["../../../../src/providers/pi.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,WAAW,EAAsB,MAAM,aAAa,CAAC;AA6BhF,wBAAgB,gBAAgB,IAAI,WAAW,CAwB9C"}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { parsePiEvent } from "../events/provider-events.js";
|
|
2
2
|
import { SpawnedProvider } from "./spawned-provider.js";
|
|
3
|
+
import { defaultProviderStateEnv, providerSessionId } from "./provider-state.js";
|
|
3
4
|
function resolveConfig(context) {
|
|
4
5
|
return context.runtimeConfig.pi ?? {};
|
|
5
6
|
}
|
|
6
7
|
function buildArgs(context) {
|
|
7
8
|
const config = resolveConfig(context);
|
|
8
9
|
const args = ["--mode", "json", "-p"];
|
|
9
|
-
|
|
10
|
-
|
|
10
|
+
const nativeSessionId = providerSessionId(context);
|
|
11
|
+
if (nativeSessionId) {
|
|
12
|
+
args.push("--session", nativeSessionId);
|
|
11
13
|
}
|
|
12
14
|
const model = context.model;
|
|
13
15
|
if (model) {
|
|
@@ -24,15 +26,22 @@ function buildArgs(context) {
|
|
|
24
26
|
export function createPiProvider() {
|
|
25
27
|
return new SpawnedProvider({
|
|
26
28
|
runtimeAgent: "pi",
|
|
27
|
-
defaultCommand: "pi
|
|
28
|
-
capabilities: new Set(["session-resume", "text-stream", "callback", "websocket"]),
|
|
29
|
+
defaultCommand: "pi",
|
|
30
|
+
capabilities: new Set(["session-resume", "text-stream", "tool-events", "callback", "websocket"]),
|
|
29
31
|
buildArgs,
|
|
30
32
|
resolveCommand: (context) => ({
|
|
31
|
-
command: resolveConfig(context).command ?? "pi
|
|
33
|
+
command: resolveConfig(context).command ?? "pi",
|
|
32
34
|
}),
|
|
33
35
|
buildEnv: (context) => {
|
|
34
36
|
const config = resolveConfig(context);
|
|
37
|
+
const commonEnv = context.runtimeConfig.env ?? {};
|
|
35
38
|
return {
|
|
39
|
+
...defaultProviderStateEnv("pi", context.dataDir, {
|
|
40
|
+
...process.env,
|
|
41
|
+
...commonEnv,
|
|
42
|
+
...(config.env ?? {}),
|
|
43
|
+
}),
|
|
44
|
+
...commonEnv,
|
|
36
45
|
...(config.env ?? {}),
|
|
37
46
|
};
|
|
38
47
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pi.js","sourceRoot":"","sources":["../../../../src/providers/pi.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"pi.js","sourceRoot":"","sources":["../../../../src/providers/pi.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEjF,SAAS,aAAa,CAAC,OAA2B;IAChD,OAAO,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,CAAC;AACxC,CAAC;AAED,SAAS,SAAS,CAAC,OAA2B;IAC5C,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACtC,MAAM,eAAe,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,eAAe,EAAE,CAAC;QACpB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAC1C,CAAC;IACD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAC5B,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC9B,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC9B,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,OAAO,IAAI,eAAe,CAAC;QACzB,YAAY,EAAE,IAAI;QAClB,cAAc,EAAE,IAAI;QACpB,YAAY,EAAE,IAAI,GAAG,CAAC,CAAC,gBAAgB,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;QAChG,SAAS;QACT,cAAc,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAC5B,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,OAAO,IAAI,IAAI;SAChD,CAAC;QACF,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE;YACpB,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;YACtC,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,EAAE,CAAC;YAClD,OAAO;gBACL,GAAG,uBAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE;oBAChD,GAAG,OAAO,CAAC,GAAG;oBACd,GAAG,SAAS;oBACZ,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC;iBACtB,CAAC;gBACF,GAAG,SAAS;gBACZ,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC;aACtB,CAAC;QACJ,CAAC;QACD,SAAS,EAAE,YAAY;KACxB,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { UniProviderContext, UniRuntimeAgent } from "../types.js";
|
|
2
|
+
export declare function providerStateRoot(dataDir: string): string;
|
|
3
|
+
export declare function providerStateDir(dataDir: string, runtimeAgent: UniRuntimeAgent): string;
|
|
4
|
+
/**
|
|
5
|
+
* Defaults provider-native state to the mounted AIMax data directory while
|
|
6
|
+
* preserving an explicit process/request environment override.
|
|
7
|
+
*/
|
|
8
|
+
export declare function defaultProviderStateEnv(runtimeAgent: UniRuntimeAgent, dataDir: string, inheritedEnv?: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
|
|
9
|
+
export declare function providerSessionId(context: Pick<UniProviderContext, "providerSessionId" | "sessionId">): string | undefined;
|
|
10
|
+
//# sourceMappingURL=provider-state.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-state.d.ts","sourceRoot":"","sources":["../../../../src/providers/provider-state.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAQvE,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEzD;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,eAAe,GAAG,MAAM,CAEvF;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,YAAY,EAAE,eAAe,EAC7B,OAAO,EAAE,MAAM,EACf,YAAY,GAAE,MAAM,CAAC,UAAwB,GAC5C,MAAM,CAAC,UAAU,CA8BnB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,EAAE,mBAAmB,GAAG,WAAW,CAAC,GAAG,MAAM,GAAG,SAAS,CAE1H"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import path from "node:path";
|
|
2
|
+
const PROVIDER_STATE_DIR = "provider-state";
|
|
3
|
+
function nonEmpty(value) {
|
|
4
|
+
return value?.trim() ? value : undefined;
|
|
5
|
+
}
|
|
6
|
+
export function providerStateRoot(dataDir) {
|
|
7
|
+
return path.join(dataDir, ".aimax", PROVIDER_STATE_DIR);
|
|
8
|
+
}
|
|
9
|
+
export function providerStateDir(dataDir, runtimeAgent) {
|
|
10
|
+
return path.join(providerStateRoot(dataDir), runtimeAgent);
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Defaults provider-native state to the mounted AIMax data directory while
|
|
14
|
+
* preserving an explicit process/request environment override.
|
|
15
|
+
*/
|
|
16
|
+
export function defaultProviderStateEnv(runtimeAgent, dataDir, inheritedEnv = process.env) {
|
|
17
|
+
switch (runtimeAgent) {
|
|
18
|
+
case "claude-code":
|
|
19
|
+
return {
|
|
20
|
+
CLAUDE_CONFIG_DIR: nonEmpty(inheritedEnv.CLAUDE_CONFIG_DIR)
|
|
21
|
+
?? providerStateDir(dataDir, runtimeAgent),
|
|
22
|
+
};
|
|
23
|
+
case "codex":
|
|
24
|
+
return {
|
|
25
|
+
CODEX_HOME: nonEmpty(inheritedEnv.CODEX_HOME)
|
|
26
|
+
?? providerStateDir(dataDir, runtimeAgent),
|
|
27
|
+
};
|
|
28
|
+
case "opencode":
|
|
29
|
+
return {
|
|
30
|
+
// OpenCode appends its own `opencode` segment to XDG_DATA_HOME.
|
|
31
|
+
XDG_DATA_HOME: nonEmpty(inheritedEnv.XDG_DATA_HOME)
|
|
32
|
+
?? providerStateRoot(dataDir),
|
|
33
|
+
};
|
|
34
|
+
case "pi": {
|
|
35
|
+
const agentDir = nonEmpty(inheritedEnv.PI_CODING_AGENT_DIR)
|
|
36
|
+
?? providerStateDir(dataDir, runtimeAgent);
|
|
37
|
+
return {
|
|
38
|
+
PI_CODING_AGENT_DIR: agentDir,
|
|
39
|
+
PI_CODING_AGENT_SESSION_DIR: nonEmpty(inheritedEnv.PI_CODING_AGENT_SESSION_DIR)
|
|
40
|
+
?? path.join(agentDir, "sessions"),
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
case "acp":
|
|
44
|
+
return {};
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
export function providerSessionId(context) {
|
|
48
|
+
return nonEmpty(context.providerSessionId) ?? nonEmpty(context.sessionId);
|
|
49
|
+
}
|
|
50
|
+
//# sourceMappingURL=provider-state.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-state.js","sourceRoot":"","sources":["../../../../src/providers/provider-state.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;AAE5C,SAAS,QAAQ,CAAC,KAAyB;IACzC,OAAO,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAe,EAAE,YAA6B;IAC7E,OAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,CAAC;AAC7D,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CACrC,YAA6B,EAC7B,OAAe,EACf,eAAkC,OAAO,CAAC,GAAG;IAE7C,QAAQ,YAAY,EAAE,CAAC;QACrB,KAAK,aAAa;YAChB,OAAO;gBACL,iBAAiB,EAAE,QAAQ,CAAC,YAAY,CAAC,iBAAiB,CAAC;uBACtD,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC;aAC7C,CAAC;QACJ,KAAK,OAAO;YACV,OAAO;gBACL,UAAU,EAAE,QAAQ,CAAC,YAAY,CAAC,UAAU,CAAC;uBACxC,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC;aAC7C,CAAC;QACJ,KAAK,UAAU;YACb,OAAO;gBACL,gEAAgE;gBAChE,aAAa,EAAE,QAAQ,CAAC,YAAY,CAAC,aAAa,CAAC;uBAC9C,iBAAiB,CAAC,OAAO,CAAC;aAChC,CAAC;QACJ,KAAK,IAAI,CAAC,CAAC,CAAC;YACV,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,mBAAmB,CAAC;mBACtD,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAC7C,OAAO;gBACL,mBAAmB,EAAE,QAAQ;gBAC7B,2BAA2B,EAAE,QAAQ,CAAC,YAAY,CAAC,2BAA2B,CAAC;uBAC1E,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC;aACrC,CAAC;QACJ,CAAC;QACD,KAAK,KAAK;YACR,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAAoE;IACpG,OAAO,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;AAC5E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawned-provider.d.ts","sourceRoot":"","sources":["../../../../src/providers/spawned-provider.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"spawned-provider.d.ts","sourceRoot":"","sources":["../../../../src/providers/spawned-provider.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAehJ,MAAM,MAAM,sBAAsB,GAAG;IACnC,YAAY,EAAE,eAAe,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,WAAW,CAAC,qBAAqB,CAAC,CAAC;IACjD,SAAS,EAAE,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IACrE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACnC,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC5F,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK,MAAM,CAAC,UAAU,CAAC;IAC9D,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,gBAAgB,EAAE,CAAC;CACjD,CAAC;AAoCF,qBAAa,eAAgB,YAAW,WAAW;IAIrC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAC;IACvC,QAAQ,CAAC,YAAY,EAAE,WAAW,CAAC,qBAAqB,CAAC,CAAC;gBAE7B,OAAO,EAAE,sBAAsB;IAKtD,GAAG,CACP,OAAO,EAAE,kBAAkB,EAC3B,IAAI,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,GAC/C,OAAO,CAAC,iBAAiB,CAAC;CAwH9B"}
|
|
@@ -1,6 +1,17 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
2
|
import { once } from "node:events";
|
|
3
3
|
import readline from "node:readline";
|
|
4
|
+
function accumulateUsage(current, next) {
|
|
5
|
+
if (!next)
|
|
6
|
+
return current;
|
|
7
|
+
if (!current)
|
|
8
|
+
return { ...next };
|
|
9
|
+
return {
|
|
10
|
+
input: current.input + next.input,
|
|
11
|
+
output: current.output + next.output,
|
|
12
|
+
total: current.total + next.total,
|
|
13
|
+
};
|
|
14
|
+
}
|
|
4
15
|
function toPrompt(context) {
|
|
5
16
|
if (context.input.kind === "text") {
|
|
6
17
|
return context.input.message;
|
|
@@ -54,6 +65,7 @@ export class SpawnedProvider {
|
|
|
54
65
|
cwd: context.projectDir ?? context.dataDir,
|
|
55
66
|
env: {
|
|
56
67
|
...process.env,
|
|
68
|
+
...(context.runtimeConfig.env ?? {}),
|
|
57
69
|
...this.profile.buildEnv?.(context),
|
|
58
70
|
},
|
|
59
71
|
stdio: ["pipe", "pipe", "pipe"],
|
|
@@ -63,17 +75,21 @@ export class SpawnedProvider {
|
|
|
63
75
|
const stderr = readline.createInterface({ input: child.stderr });
|
|
64
76
|
const stdoutClosed = once(stdout, "close");
|
|
65
77
|
const stderrClosed = once(stderr, "close");
|
|
66
|
-
let sessionId = context.sessionId;
|
|
78
|
+
let sessionId = context.providerSessionId ?? context.sessionId;
|
|
67
79
|
let finalText = "";
|
|
68
80
|
let errorText = "";
|
|
69
81
|
let childError;
|
|
70
82
|
let providerErrorEmitted = false;
|
|
71
83
|
let usage;
|
|
84
|
+
let model;
|
|
72
85
|
let processing = Promise.resolve();
|
|
73
86
|
const processEvents = async (events) => {
|
|
74
87
|
for (const event of events) {
|
|
75
88
|
if (event.type === "session_started") {
|
|
76
89
|
sessionId = event.sessionId;
|
|
90
|
+
if (event.model) {
|
|
91
|
+
model = event.model;
|
|
92
|
+
}
|
|
77
93
|
}
|
|
78
94
|
else if (event.type === "text_delta") {
|
|
79
95
|
finalText += event.text;
|
|
@@ -83,12 +99,21 @@ export class SpawnedProvider {
|
|
|
83
99
|
finalText = event.text;
|
|
84
100
|
}
|
|
85
101
|
if (event.usage) {
|
|
86
|
-
usage = event.usage;
|
|
102
|
+
usage = accumulateUsage(usage, event.usage);
|
|
103
|
+
}
|
|
104
|
+
if (event.model) {
|
|
105
|
+
model = event.model;
|
|
87
106
|
}
|
|
88
107
|
}
|
|
89
108
|
else if (event.type === "error") {
|
|
90
109
|
errorText = event.message;
|
|
91
110
|
providerErrorEmitted = true;
|
|
111
|
+
if (event.usage) {
|
|
112
|
+
usage = accumulateUsage(usage, event.usage);
|
|
113
|
+
}
|
|
114
|
+
if (event.model) {
|
|
115
|
+
model = event.model;
|
|
116
|
+
}
|
|
92
117
|
}
|
|
93
118
|
await emit(event);
|
|
94
119
|
}
|
|
@@ -96,8 +121,14 @@ export class SpawnedProvider {
|
|
|
96
121
|
stdout.on("line", (line) => {
|
|
97
122
|
processing = processing.then(() => processEvents(this.profile.parseLine(line)));
|
|
98
123
|
});
|
|
99
|
-
stderr.on("line", (
|
|
100
|
-
processing = processing.then(() => processEvents([{
|
|
124
|
+
stderr.on("line", () => {
|
|
125
|
+
processing = processing.then(() => processEvents([{
|
|
126
|
+
type: "diagnostic",
|
|
127
|
+
level: "warn",
|
|
128
|
+
scope: "runner",
|
|
129
|
+
phase: "stderr",
|
|
130
|
+
message: `${this.runtimeAgent} wrote to stderr`,
|
|
131
|
+
}]));
|
|
101
132
|
});
|
|
102
133
|
context.signal.addEventListener("abort", () => {
|
|
103
134
|
if (!errorText) {
|
|
@@ -133,6 +164,7 @@ export class SpawnedProvider {
|
|
|
133
164
|
sessionId,
|
|
134
165
|
text: finalText || undefined,
|
|
135
166
|
usage,
|
|
167
|
+
model,
|
|
136
168
|
error: errorText || undefined,
|
|
137
169
|
};
|
|
138
170
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawned-provider.js","sourceRoot":"","sources":["../../../../src/providers/spawned-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAuC,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,QAAQ,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"spawned-provider.js","sourceRoot":"","sources":["../../../../src/providers/spawned-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/run.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/run.ts"],"names":[],"mappings":"AAgDA,OAAO,KAAK,EAKV,aAAa,EACb,YAAY,EAGZ,qBAAqB,EACtB,MAAM,YAAY,CAAC;AAyBpB,eAAO,MAAM,mCAAmC,EAAE,MAAM,CAAC,qBAAqB,EAAE,MAAM,CAOrF,CAAC;AAMF,MAAM,MAAM,kCAAkC,CAAC,CAAC,SAAS,MAAM,IAAI;IACjE,OAAO,EAAE,IAAI,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC;IACxC,WAAW,EAAE,qBAAqB,EAAE,CAAC;CACtC,CAAC;AAcF,wBAAgB,4BAA4B,CAAC,CAAC,SAAS,MAAM,EAC3D,OAAO,EAAE,CAAC,GACT,kCAAkC,CAAC,CAAC,CAAC,CAUvC;AA8kBD,wBAAsB,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CAmhB1E"}
|