@botiverse/oar 0.76.2 → 0.77.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 +6 -4
- package/assets/brands/NOTICE.md +3 -3
- package/assets/brands/codebuddy-on-dark.svg +1 -0
- package/assets/brands/codebuddy-on-light.svg +1 -0
- package/assets/brands/codebuddy.svg +1 -0
- package/dist/brands.d.ts +8 -0
- package/dist/brands.d.ts.map +1 -1
- package/dist/brands.js +8 -0
- package/dist/brands.js.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/login.d.ts +2 -0
- package/dist/contracts/login.d.ts.map +1 -1
- package/dist/contracts/provider-auth.d.ts +14 -4
- package/dist/contracts/provider-auth.d.ts.map +1 -1
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -0
- package/dist/index.js.map +1 -1
- package/dist/observe/redact-record.js +2 -2
- package/dist/observe/redact-record.js.map +1 -1
- package/dist/runtimes/codebuddy/account-control.d.ts +13 -0
- package/dist/runtimes/codebuddy/account-control.d.ts.map +1 -0
- package/dist/runtimes/codebuddy/account-control.js +88 -0
- package/dist/runtimes/codebuddy/account-control.js.map +1 -0
- package/dist/runtimes/codebuddy/auth-status.d.ts +7 -0
- package/dist/runtimes/codebuddy/auth-status.d.ts.map +1 -0
- package/dist/runtimes/codebuddy/auth-status.js +44 -0
- package/dist/runtimes/codebuddy/auth-status.js.map +1 -0
- package/dist/runtimes/codebuddy/extensions.d.ts +5 -0
- package/dist/runtimes/codebuddy/extensions.d.ts.map +1 -0
- package/dist/runtimes/codebuddy/extensions.js +28 -0
- package/dist/runtimes/codebuddy/extensions.js.map +1 -0
- package/dist/runtimes/codebuddy/failure.d.ts +5 -0
- package/dist/runtimes/codebuddy/failure.d.ts.map +1 -0
- package/dist/runtimes/codebuddy/failure.js +35 -0
- package/dist/runtimes/codebuddy/failure.js.map +1 -0
- package/dist/runtimes/codebuddy/index.d.ts +20 -0
- package/dist/runtimes/codebuddy/index.d.ts.map +1 -0
- package/dist/runtimes/codebuddy/index.js +15 -0
- package/dist/runtimes/codebuddy/index.js.map +1 -0
- package/dist/runtimes/codebuddy/installation.d.ts +2 -0
- package/dist/runtimes/codebuddy/installation.d.ts.map +1 -0
- package/dist/runtimes/codebuddy/installation.js +7 -0
- package/dist/runtimes/codebuddy/installation.js.map +1 -0
- package/dist/runtimes/codebuddy/list-models.d.ts +6 -0
- package/dist/runtimes/codebuddy/list-models.d.ts.map +1 -0
- package/dist/runtimes/codebuddy/list-models.js +90 -0
- package/dist/runtimes/codebuddy/list-models.js.map +1 -0
- package/dist/runtimes/codebuddy/login.d.ts +6 -0
- package/dist/runtimes/codebuddy/login.d.ts.map +1 -0
- package/dist/runtimes/codebuddy/login.js +110 -0
- package/dist/runtimes/codebuddy/login.js.map +1 -0
- package/dist/runtimes/codebuddy/options.d.ts +5 -0
- package/dist/runtimes/codebuddy/options.d.ts.map +1 -0
- package/dist/runtimes/codebuddy/options.js +21 -0
- package/dist/runtimes/codebuddy/options.js.map +1 -0
- package/dist/runtimes/codebuddy/prompt-file.d.ts +6 -0
- package/dist/runtimes/codebuddy/prompt-file.d.ts.map +1 -0
- package/dist/runtimes/codebuddy/prompt-file.js +20 -0
- package/dist/runtimes/codebuddy/prompt-file.js.map +1 -0
- package/dist/runtimes/codebuddy/session.d.ts +5 -0
- package/dist/runtimes/codebuddy/session.d.ts.map +1 -0
- package/dist/runtimes/codebuddy/session.js +52 -0
- package/dist/runtimes/codebuddy/session.js.map +1 -0
- package/dist/runtimes/cursor/auth-status.js +1 -1
- package/dist/runtimes/cursor/auth-status.js.map +1 -1
- package/dist/runtimes/pi/auth.d.ts +1 -1
- package/dist/runtimes/pi/auth.d.ts.map +1 -1
- package/dist/runtimes/pi/auth.js +36 -8
- package/dist/runtimes/pi/auth.js.map +1 -1
- package/dist/runtimes/pi/config-value.d.ts +3 -0
- package/dist/runtimes/pi/config-value.d.ts.map +1 -0
- package/dist/runtimes/pi/config-value.js +5 -0
- package/dist/runtimes/pi/config-value.js.map +1 -0
- package/dist/runtimes/pi/index.d.ts +2 -0
- package/dist/runtimes/pi/index.d.ts.map +1 -1
- package/dist/runtimes/pi/index.js +1 -0
- package/dist/runtimes/pi/index.js.map +1 -1
- package/dist/runtimes/pi/mcp.d.ts +1 -7
- package/dist/runtimes/pi/mcp.d.ts.map +1 -1
- package/dist/runtimes/pi/mcp.js +2 -9
- package/dist/runtimes/pi/mcp.js.map +1 -1
- package/dist/runtimes/qoder/daemon.js +2 -2
- package/dist/runtimes/qoder/daemon.js.map +1 -1
- package/dist/runtimes/qwen/auth-status.js +1 -1
- package/dist/runtimes/qwen/auth-status.js.map +1 -1
- package/dist/runtimes/qwen/projection.d.ts.map +1 -1
- package/dist/runtimes/qwen/projection.js +6 -1
- package/dist/runtimes/qwen/projection.js.map +1 -1
- package/dist/shared/credential-redaction.d.ts +4 -0
- package/dist/shared/credential-redaction.d.ts.map +1 -1
- package/dist/shared/credential-redaction.js +13 -4
- package/dist/shared/credential-redaction.js.map +1 -1
- package/dist/shared/stream-json/content.d.ts +2 -1
- package/dist/shared/stream-json/content.d.ts.map +1 -1
- package/dist/shared/stream-json/content.js +21 -9
- package/dist/shared/stream-json/content.js.map +1 -1
- package/dist/shared/stream-json/profile.d.ts +2 -0
- package/dist/shared/stream-json/profile.d.ts.map +1 -1
- package/dist/shared/stream-json/projection.js +1 -1
- package/dist/shared/stream-json/projection.js.map +1 -1
- package/package.json +1 -1
package/dist/runtimes/pi/auth.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { piLiteralConfigValue } from "./config-value.js";
|
|
2
2
|
export function toLoginEvent(event) {
|
|
3
3
|
switch (event.type) {
|
|
4
4
|
case "auth_url":
|
|
@@ -23,8 +23,10 @@ export function toLoginEvent(event) {
|
|
|
23
23
|
throw new Error("unhandled Pi auth event");
|
|
24
24
|
}
|
|
25
25
|
export function toLoginPrompt(prompt) {
|
|
26
|
+
const cancellation = prompt.signal === undefined ? {} : { signal: prompt.signal };
|
|
26
27
|
if (prompt.type === "select") {
|
|
27
28
|
return {
|
|
29
|
+
...cancellation,
|
|
28
30
|
kind: "select",
|
|
29
31
|
message: prompt.message,
|
|
30
32
|
options: prompt.options.map((option) => ({
|
|
@@ -35,6 +37,7 @@ export function toLoginPrompt(prompt) {
|
|
|
35
37
|
};
|
|
36
38
|
}
|
|
37
39
|
return {
|
|
40
|
+
...cancellation,
|
|
38
41
|
kind: prompt.type,
|
|
39
42
|
message: prompt.message,
|
|
40
43
|
...(prompt.placeholder === undefined ? {} : { placeholder: prompt.placeholder }),
|
|
@@ -63,16 +66,40 @@ export function piLoginProvider(provider) {
|
|
|
63
66
|
}
|
|
64
67
|
return methods.length === 0 ? undefined : { providerId: provider.id, name: provider.name, methods };
|
|
65
68
|
}
|
|
66
|
-
/**
|
|
67
|
-
function
|
|
69
|
+
/** A host may leave its input callback pending after cancellation; Pi must still get the rejection. */
|
|
70
|
+
async function answerPrompt(interaction, prompt) {
|
|
71
|
+
const { signal } = prompt;
|
|
72
|
+
signal?.throwIfAborted();
|
|
73
|
+
if (signal === undefined) {
|
|
74
|
+
return interaction.prompt(prompt);
|
|
75
|
+
}
|
|
76
|
+
const { promise, reject } = Promise.withResolvers();
|
|
77
|
+
const abort = () => { reject(signal.reason); };
|
|
78
|
+
signal.addEventListener("abort", abort, { once: true });
|
|
79
|
+
try {
|
|
80
|
+
const answer = (async () => {
|
|
81
|
+
await Promise.resolve();
|
|
82
|
+
signal.throwIfAborted();
|
|
83
|
+
return interaction.prompt(prompt);
|
|
84
|
+
})();
|
|
85
|
+
return await Promise.race([answer, promise]);
|
|
86
|
+
}
|
|
87
|
+
finally {
|
|
88
|
+
signal.removeEventListener("abort", abort);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
/** Bridge cancellation and native prompts; only API-key secrets use Pi's literal config-value escapes. */
|
|
92
|
+
function toPiInteraction(interaction, method) {
|
|
68
93
|
return {
|
|
69
94
|
...(interaction.signal === undefined ? {} : { signal: interaction.signal }),
|
|
70
95
|
notify: (event) => {
|
|
71
96
|
interaction.onEvent(toLoginEvent(event));
|
|
72
97
|
},
|
|
73
98
|
prompt: async (prompt) => {
|
|
74
|
-
const
|
|
75
|
-
|
|
99
|
+
const signal = prompt.signal === undefined ? interaction.signal
|
|
100
|
+
: (interaction.signal === undefined ? prompt.signal : AbortSignal.any([prompt.signal, interaction.signal]));
|
|
101
|
+
const answer = await answerPrompt(interaction, toLoginPrompt({ ...prompt, ...(signal === undefined ? {} : { signal }) }));
|
|
102
|
+
return method === "api_key" && prompt.type === "secret" ? piLiteralConfigValue(answer) : answer;
|
|
76
103
|
},
|
|
77
104
|
};
|
|
78
105
|
}
|
|
@@ -146,9 +173,9 @@ class PiProviderAuth {
|
|
|
146
173
|
const status = await this.#statusOf(providerId);
|
|
147
174
|
return status;
|
|
148
175
|
}
|
|
149
|
-
async login(providerId, method, interaction) {
|
|
176
|
+
async login(providerId, method, interaction, options) {
|
|
150
177
|
const authType = method;
|
|
151
|
-
await this.#runtime.login(providerId, authType, toPiInteraction(interaction));
|
|
178
|
+
await this.#runtime.login(providerId, authType, toPiInteraction(interaction, method), options);
|
|
152
179
|
const status = await this.#statusOf(providerId);
|
|
153
180
|
return status;
|
|
154
181
|
}
|
|
@@ -156,7 +183,7 @@ class PiProviderAuth {
|
|
|
156
183
|
// Persist the key by running pi's api-key login flow, answering its key
|
|
157
184
|
// prompt and nothing else (see keyOnlyInteraction).
|
|
158
185
|
const authType = "api_key";
|
|
159
|
-
await this.#runtime.login(providerId, authType, toPiInteraction(keyOnlyInteraction(providerId, apiKey)));
|
|
186
|
+
await this.#runtime.login(providerId, authType, toPiInteraction(keyOnlyInteraction(providerId, apiKey), authType));
|
|
160
187
|
}
|
|
161
188
|
async logout(providerId) {
|
|
162
189
|
await this.#runtime.logout(providerId);
|
|
@@ -164,6 +191,7 @@ class PiProviderAuth {
|
|
|
164
191
|
}
|
|
165
192
|
/** Create a {@link ProviderAuthFacade} backed by Pi's `ModelRuntime`. */
|
|
166
193
|
export async function createPiProviderAuth(options = {}) {
|
|
194
|
+
const { piFacadeRuntime } = await import("./facade-runtime.js");
|
|
167
195
|
const runtime = await piFacadeRuntime(options, { allowModelNetwork: false, refreshOnCreate: false });
|
|
168
196
|
return new PiProviderAuth(runtime);
|
|
169
197
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sources":["../../../src/runtimes/pi/auth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth.js","sources":["../../../src/runtimes/pi/auth.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAczD,MAAM,UAAU,YAAY,CAAC,KAAkB;IAC7C,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,UAAU;YACb,OAAO;gBACL,IAAI,EAAE,UAAU;gBAChB,GAAG,EAAE,KAAK,CAAC,GAAG;gBACd,GAAG,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC;aAClF,CAAC;QACJ,KAAK,aAAa;YAChB,OAAO;gBACL,IAAI,EAAE,aAAa;gBACnB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,eAAe,EAAE,KAAK,CAAC,eAAe;gBACtC,GAAG,CAAC,KAAK,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,eAAe,EAAE,CAAC;gBAC1F,GAAG,CAAC,KAAK,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,EAAE,CAAC;aAC9F,CAAC;QACJ,KAAK,MAAM,CAAC;QACZ,KAAK,UAAU;YACb,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;IACpD,CAAC;IACD,oEAAoE;IACpE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAAoB;IAChD,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;IAClF,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO;YACL,GAAG,YAAY;YACf,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBACvC,EAAE,EAAE,MAAM,CAAC,EAAE;gBACb,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,GAAG,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC;aACjF,CAAC,CAAC;SACJ,CAAC;IACJ,CAAC;IACD,OAAO;QACL,GAAG,YAAY;QACf,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,GAAG,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC;KACjF,CAAC;AACJ,CAAC;AAYD;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,QAAyB;IACvD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC;IACxC,MAAM,OAAO,GAA0B,EAAE,CAAC;IAC1C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,CAAC,IAAI,CAAC;YACX,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,YAAY,EAAE,KAAK,CAAC,cAAc,KAAK,IAAI;YAC3C,GAAG,CAAC,KAAK,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC;SAC5E,CAAC,CAAC;IACL,CAAC;IACD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS;YACrC,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;YACzD,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC;AACtG,CAAC;AAED,uGAAuG;AACvG,KAAK,UAAU,YAAY,CAAC,WAAqC,EAAE,MAA2B;IAC5F,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC1B,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;IACD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,EAAS,CAAC;IAC3D,MAAM,KAAK,GAAG,GAAS,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACrD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,CAAC,KAAK,IAAqB,EAAE;YAC1C,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;YACxB,MAAM,CAAC,cAAc,EAAE,CAAC;YACxB,OAAO,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC,CAAC,EAAE,CAAC;QACL,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC/C,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;AACH,CAAC;AAED,0GAA0G;AAC1G,SAAS,eAAe,CAAC,WAAqC,EAAE,MAA2B;IACzF,OAAO;QACL,GAAG,CAAC,WAAW,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC;QAC3E,MAAM,EAAE,CAAC,KAAkB,EAAQ,EAAE;YACnC,WAAW,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QAC3C,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,MAAoB,EAAmB,EAAE;YACtD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM;gBAC7D,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAC9G,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,WAAW,EAAE,aAAa,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAC1H,OAAO,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAClG,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAS,kBAAkB,CAAC,UAAkB,EAAE,MAAc;IAC5D,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,OAAO;QACL,OAAO,EAAE,GAAS,EAAE;YAClB,kDAAkD;QACpD,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,MAA2B,EAAmB,EAAE;YAC7D,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;YACxB,IAAI,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC1C,QAAQ,GAAG,IAAI,CAAC;gBAChB,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,GAAG,UAAU,4CAA4C,MAAM,CAAC,IAAI,MAAM,MAAM,CAAC,OAAO,MAAM;kBAC1G,cAAc,UAAU,iDAAiD,CAAC,CAAC;QACjF,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,cAAc;IACT,QAAQ,CAAe;IAEhC,YAAY,OAAqB;QAC/B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,UAAkB;QAChC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACxD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;QAC3C,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC;QAC3C,OAAO;YACL,UAAU;YACV,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;YACpD,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;YACzC,uEAAuE;YACvE,sEAAsE;YACtE,YAAY,EAAE,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI;SACnH,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAAO,GAAmC,EAAE;QAC9D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC;QAC1D,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;YAC9B,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;gBACtC,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,UAAU,EAAE,IAAI;gBAChB,MAAM,EAAE,UAAU,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;gBACzD,YAAY,EAAE,UAAU,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI;aACnI,CAAC,CAAC,CAAC;QACN,CAAC;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;YACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YAC3D,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC,CAAC;IACN,CAAC;IAED,cAAc;QACZ,6CAA6C;QAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9G,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,UAAkB;QAC7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAChD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,KAAK,CACT,UAAkB,EAClB,MAA2B,EAC3B,WAAqC,EACrC,OAA8B;QAE9B,MAAM,QAAQ,GAAe,MAAM,CAAC;QACpC,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,eAAe,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;QAC/F,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAChD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,UAAkB,EAAE,MAAc;QAChD,wEAAwE;QACxE,oDAAoD;QACpD,MAAM,QAAQ,GAAe,SAAS,CAAC;QACvC,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,eAAe,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;IACrH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,UAAkB;QAC7B,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACzC,CAAC;CACF;AAKD,yEAAyE;AACzE,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,OAAO,GAA0B,EAAE;IAC5E,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;IACrG,OAAO,IAAI,cAAc,CAAC,OAAO,CAAC,CAAC;AACrC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config-value.d.ts","sources":["../../../src/runtimes/pi/config-value.ts"],"names":[],"mappings":"AAAA,wGAAwG;AACxG,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE1D"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config-value.js","sources":["../../../src/runtimes/pi/config-value.ts"],"names":[],"mappings":"AAAA,wGAAwG;AACxG,MAAM,UAAU,oBAAoB,CAAC,KAAa;IAChD,OAAO,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAChE,CAAC"}
|
|
@@ -18,4 +18,6 @@ export declare const piRuntime: Runtime & {
|
|
|
18
18
|
};
|
|
19
19
|
export { piListModels, projectPiModels } from "./list-models.js";
|
|
20
20
|
export { piSession } from "./session.js";
|
|
21
|
+
export { createPiProviderAuth } from "./auth.js";
|
|
22
|
+
export type { PiProviderAuthOptions } from "./auth.js";
|
|
21
23
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/pi/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,kBAAkB,CAAC;AAOpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD,YAAY,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAQrD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,GAAE,gBAAqB,GAAG,OAAO,GAAG;IAAE,QAAQ,CAAC,YAAY,EAAE,OAAO,cAAc,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,YAAY,CAAA;CAAE,CAgCpK;AAED,eAAO,MAAM,SAAS;2BAlC8E,OAAO,cAAc;yBAAuB,OAAO,YAAY;CAkCzH,CAAC;AAE3C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/pi/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,kBAAkB,CAAC;AAOpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD,YAAY,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAQrD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,GAAE,gBAAqB,GAAG,OAAO,GAAG;IAAE,QAAQ,CAAC,YAAY,EAAE,OAAO,cAAc,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,YAAY,CAAA;CAAE,CAgCpK;AAED,eAAO,MAAM,SAAS;2BAlC8E,OAAO,cAAc;yBAAuB,OAAO,YAAY;CAkCzH,CAAC;AAE3C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACjD,YAAY,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC"}
|
|
@@ -63,4 +63,5 @@ export function createPiRuntime(options = {}) {
|
|
|
63
63
|
export const piRuntime = createPiRuntime();
|
|
64
64
|
export { piListModels, projectPiModels } from "./list-models.js";
|
|
65
65
|
export { piSession } from "./session.js";
|
|
66
|
+
export { createPiProviderAuth } from "./auth.js";
|
|
66
67
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../src/runtimes/pi/index.ts"],"names":[],"mappings":"AAAA,0GAA0G;AAC1G,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAgB,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAqB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,gCAAgC,EAAE,MAAM,yBAAyB,CAAC;AAMnG,MAAM,WAAW,GAAuB,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE;IACvE,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,MAAM,oBAAoB,EAAE,CAAC;IAC5C,OAAO,MAAM,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;AAC5D,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,OAAO,GAAqB,EAAE;IAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,KAAK,YAAY,CAAC;IACtD,6HAA6H;IAC7H,IAAI,CAAC,UAAU,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QAAC,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;IAAC,CAAC;IACrH,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QAAC,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAAC,CAAC;IAC7H,MAAM,WAAW,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,KAAK,GAA6B,KAAK,EAAE,YAAY,EAAE,WAAW,GAAG,EAAE,EAAE,EAAE;QAC/E,IAAI,UAAU,EAAE,CAAC;YAAC,gCAAgC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAAC,CAAC;QACtE,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAClE,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IACF,MAAM,OAAO,GAAG,aAAa,CAAC;QAC5B,EAAE,EAAE,IAAI;QACR,KAAK,EAAE,aAAa,CAAC,EAAE;QACvB,qBAAqB,EAAE,UAAU,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,uBAAuB;QACxF,mBAAmB,EAAE,MAAM;QAC3B,GAAG,WAAW;QACd,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,sBAAsB,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM;QACtM,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,sBAAsB,CAAC,WAAW,CAAC,QAAQ,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ;QAC9M,KAAK;QACL,YAAY,EAAE,cAAc;QAC5B,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE;YAC7C,IAAI,UAAU,EAAE,CAAC;gBAAC,gCAAgC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YAAC,CAAC;YACtE,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;YAC5D,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,UAAU,EAAE,UAAU;YACpB,CAAC,CAAC,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAClK,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC;QAC1B,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC;KACpK,CAAC,CAAC;IACH,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,eAAe,EAAE,CAAC;AAE3C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../src/runtimes/pi/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,6 @@
|
|
|
1
1
|
import type { InlineExtension, McpServerConfig } from "@earendil-works/pi-coding-agent";
|
|
2
2
|
import type { McpServer, SessionOptions } from "../../contracts/session.js";
|
|
3
|
-
|
|
4
|
-
* A value as pi reads it literally: pi resolves `env` and `headers` values
|
|
5
|
-
* (`resolveConfigValue`), running one that starts with `!` as a shell
|
|
6
|
-
* command and interpolating `$NAME`; `$$` and `$!` are its escapes for a
|
|
7
|
-
* literal `$` and `!`.
|
|
8
|
-
*/
|
|
9
|
-
export declare function piLiteralConfigValue(value: string): string;
|
|
3
|
+
export { piLiteralConfigValue } from "./config-value.js";
|
|
10
4
|
/**
|
|
11
5
|
* One entry as pi's MCP server config: http `{type, url, headers}`, stdio
|
|
12
6
|
* `{type, command, args, env}` whose env is `SessionOptions.env` with the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.d.ts","sources":["../../../src/runtimes/pi/mcp.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACxF,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp.d.ts","sources":["../../../src/runtimes/pi/mcp.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACxF,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAI5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AA8BzD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,GAAE,cAAc,CAAC,KAAK,CAAM,GAAG,eAAe,CAY5G;AAcD;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAStE;AAmBD,yEAAyE;AACzE,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,UAAU,EAAE,SAAS,eAAe,EAAE,CAAC;IAChD;;;;OAIG;IACH,KAAK,CAAC,UAAU,EAAE,SAAS;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,GAAG,IAAI,CAAC;CACvF;AAKD;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CA+BhH"}
|
package/dist/runtimes/pi/mcp.js
CHANGED
|
@@ -2,6 +2,8 @@ import { sessionCredentialRedactor } from "../../shared/credential-redactor.js";
|
|
|
2
2
|
import { UnsupportedOptionError } from "../../contracts/errors.js";
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
import { checkMcpServerNames, givenMcpServers, isHttpMcpServer } from "../../shared/mcp-servers.js";
|
|
5
|
+
import { piLiteralConfigValue } from "./config-value.js";
|
|
6
|
+
export { piLiteralConfigValue } from "./config-value.js";
|
|
5
7
|
/*
|
|
6
8
|
* SessionOptions.mcpServers on pi: the SDK's own MCP support, as the pi CLI
|
|
7
9
|
* runs it (pi-coding-agent 1.0.4). pi's MCP client is the built-in `mcp`
|
|
@@ -24,15 +26,6 @@ import { checkMcpServerNames, givenMcpServers, isHttpMcpServer } from "../../sha
|
|
|
24
26
|
*/
|
|
25
27
|
/** The names pi takes (`validateMcpServerConfig`); its tool namespace folds `-` into `_`, so `a-b` and `a_b` would be one server. */
|
|
26
28
|
const PI_MCP_SERVER_NAME = /^[\w-]+$/u;
|
|
27
|
-
/**
|
|
28
|
-
* A value as pi reads it literally: pi resolves `env` and `headers` values
|
|
29
|
-
* (`resolveConfigValue`), running one that starts with `!` as a shell
|
|
30
|
-
* command and interpolating `$NAME`; `$$` and `$!` are its escapes for a
|
|
31
|
-
* literal `$` and `!`.
|
|
32
|
-
*/
|
|
33
|
-
export function piLiteralConfigValue(value) {
|
|
34
|
-
return value.replaceAll(/[$!]/gu, (character) => `$${character}`);
|
|
35
|
-
}
|
|
36
29
|
function literalValues(values) {
|
|
37
30
|
return Object.fromEntries(Object.entries(values).map(([key, value]) => [key, piLiteralConfigValue(value)]));
|
|
38
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.js","sources":["../../../src/runtimes/pi/mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp.js","sources":["../../../src/runtimes/pi/mcp.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ export async function qoderDaemonSession(child, sessionId, workerArgs, cwd, env)
|
|
|
16
16
|
if (frame === null || failure.error !== undefined) {
|
|
17
17
|
return;
|
|
18
18
|
}
|
|
19
|
-
if (frame.session_id !== undefined && frame.session_id !== sessionId) {
|
|
19
|
+
if (frame.session_id !== undefined && frame.session_id !== null && frame.session_id !== sessionId) {
|
|
20
20
|
failure.error = new Error("Qoder daemon received a frame belonging to another session; OAR terminated the owned process");
|
|
21
21
|
controls.end();
|
|
22
22
|
child.kill();
|
|
@@ -46,7 +46,7 @@ export async function qoderDaemonSession(child, sessionId, workerArgs, cwd, env)
|
|
|
46
46
|
continue;
|
|
47
47
|
}
|
|
48
48
|
const frame = asRecord(parseJson(line));
|
|
49
|
-
if (frame === null || (frame.session_id !== undefined && frame.session_id !== sessionId)) {
|
|
49
|
+
if (frame === null || (frame.session_id !== undefined && frame.session_id !== null && frame.session_id !== sessionId)) {
|
|
50
50
|
throw new Error("Qoder daemon input does not belong to this session");
|
|
51
51
|
}
|
|
52
52
|
const request = asRecord(frame.request);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon.js","sources":["../../../src/runtimes/qoder/daemon.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEpD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAEtE,6EAA6E;AAC7E,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,KAAkB,EAAE,SAAiB,EAAE,UAA6B,EAAE,GAAW,EAAE,GAAsB;IAChJ,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,wBAAwB,CAAC,CAAC;IACzE,MAAM,QAAQ,GAA+B,EAAE,CAAC;IAChD,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAsB,EAAE,CAAC;IACtC,MAAM,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;IACjC,MAAM,CAAC,MAAM,EAAE,CAAC;IAChB,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACpB,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QACxC,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QAC9D,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"daemon.js","sources":["../../../src/runtimes/qoder/daemon.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,7 +89,7 @@ async function inspectCredentials(env, signal) {
|
|
|
89
89
|
}
|
|
90
90
|
signal.throwIfAborted();
|
|
91
91
|
return observed.length > 0
|
|
92
|
-
? unknown
|
|
92
|
+
? { kind: "unknown", source: SOURCE, configured: observed, detail: `Configured sources: ${observed.join("; ")}. No credential was validated. ${SCOPE}` }
|
|
93
93
|
: { kind: "logged_out", source: SOURCE, detail: `No user/system provider credential found. Configure OPENAI_API_KEY + OPENAI_BASE_URL + OPENAI_MODEL, or BAILIAN_CODING_PLAN_API_KEY / BAILIAN_TOKEN_PLAN_API_KEY with the region's plan URL, or OPENROUTER_API_KEY / REQUESTY_API_KEY with its provider URL. ${SCOPE}` };
|
|
94
94
|
}
|
|
95
95
|
/** Presence only. Never starts Qwen, sends requests, refreshes or reads token contents. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-status.js","sources":["../../../src/runtimes/qwen/auth-status.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auth-status.js","sources":["../../../src/runtimes/qwen/auth-status.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projection.d.ts","sources":["../../../src/runtimes/qwen/projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,WAAW,EAAe,MAAM,4BAA4B,CAAC;AAC7F,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAA+B,KAAK,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAChH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAGvF,MAAM,WAAW,cAAe,SAAQ,yBAAyB;IAC/D,sGAAsG;IACtG,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;CAC7B;AACD,wBAAgB,qBAAqB,CAAC,MAAM,UAAQ,GAAG,cAAc,CAEpE;AAED,oGAAoG;AACpG,wBAAgB,SAAS,CAAC,OAAO,EAAE,UAAU,GAAG,WAAW,GAAG,IAAI,CAKjE;AAYD,eAAO,MAAM,qBAAqB,EAAE,2BAA2B,CAAC,cAAc,
|
|
1
|
+
{"version":3,"file":"projection.d.ts","sources":["../../../src/runtimes/qwen/projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,WAAW,EAAe,MAAM,4BAA4B,CAAC;AAC7F,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAA+B,KAAK,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAChH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAGvF,MAAM,WAAW,cAAe,SAAQ,yBAAyB;IAC/D,sGAAsG;IACtG,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;CAC7B;AACD,wBAAgB,qBAAqB,CAAC,MAAM,UAAQ,GAAG,cAAc,CAEpE;AAED,oGAAoG;AACpG,wBAAgB,SAAS,CAAC,OAAO,EAAE,UAAU,GAAG,WAAW,GAAG,IAAI,CAKjE;AAYD,eAAO,MAAM,qBAAqB,EAAE,2BAA2B,CAAC,cAAc,CAiB7E,CAAC"}
|
|
@@ -27,11 +27,16 @@ function outcome(state, message) {
|
|
|
27
27
|
}
|
|
28
28
|
export const qwenProjectionProfile = {
|
|
29
29
|
name: "qwen", duplicateReason: "Qwen refused the input", commandLifecycle: false,
|
|
30
|
+
// 0.26.3 starts a message once, reuses block index 0, then assigns each
|
|
31
|
+
// completed assistant block its own id after content_block_stop.
|
|
32
|
+
assistantFollowsBlockStop: true,
|
|
30
33
|
assistant: (state) => state,
|
|
31
34
|
result: (state, message, agentPath) => {
|
|
32
35
|
const usage = agentPath.length === 0 && state.usageKnown ? qwenUsage(message) : null;
|
|
33
36
|
const before = usage === null ? [] : [{ kind: "usage", usage: { total: usage } }];
|
|
34
|
-
|
|
37
|
+
const partials = new Map(state.partials);
|
|
38
|
+
partials.delete(JSON.stringify(agentPath));
|
|
39
|
+
return { state: { ...state, partials, ...(usage === null ? {} : { usage }) }, outcome: outcome(state, message), before, after: [] };
|
|
35
40
|
},
|
|
36
41
|
init: () => [],
|
|
37
42
|
compacted: (state) => state,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projection.js","sources":["../../../src/runtimes/qwen/projection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,2BAA2B,EAAkC,MAAM,mCAAmC,CAAC;AAEhH,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAOpE,MAAM,UAAU,qBAAqB,CAAC,MAAM,GAAG,KAAK;IAClD,OAAO,EAAE,GAAG,2BAA2B,EAAE,UAAU,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AAClF,CAAC;AAED,oGAAoG;AACpG,MAAM,UAAU,SAAS,CAAC,OAAmB;IAC3C,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACtC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAAC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IAC3F,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IACzE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,yBAAyB,EAAE,KAAK,EAAE,6BAA6B,EAAE,CAAC,EAAE,CAAC;AAC5H,CAAC;AAED,SAAS,OAAO,CAAC,KAAqB,EAAE,OAAmB;IACzD,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;QAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAAC,CAAC;IACzD,IAAI,OAAO,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QAC9B,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,mBAAmB,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IAC3H,CAAC;IACD,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACtC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,KAAK,iBAAiB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS;QACnG,MAAM,EAAE,OAAO,KAAK,EAAE,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;AAC7G,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAgD;IAChF,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,KAAK;IAChF,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;IAC3B,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;QACpC,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACrF,MAAM,MAAM,GAAuB,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QACtG,OAAO,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"projection.js","sources":["../../../src/runtimes/qwen/projection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,2BAA2B,EAAkC,MAAM,mCAAmC,CAAC;AAEhH,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAOpE,MAAM,UAAU,qBAAqB,CAAC,MAAM,GAAG,KAAK;IAClD,OAAO,EAAE,GAAG,2BAA2B,EAAE,UAAU,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AAClF,CAAC;AAED,oGAAoG;AACpG,MAAM,UAAU,SAAS,CAAC,OAAmB;IAC3C,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACtC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAAC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IAC3F,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IACzE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,yBAAyB,EAAE,KAAK,EAAE,6BAA6B,EAAE,CAAC,EAAE,CAAC;AAC5H,CAAC;AAED,SAAS,OAAO,CAAC,KAAqB,EAAE,OAAmB;IACzD,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;QAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAAC,CAAC;IACzD,IAAI,OAAO,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QAC9B,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,mBAAmB,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IAC3H,CAAC;IACD,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACtC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,KAAK,iBAAiB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS;QACnG,MAAM,EAAE,OAAO,KAAK,EAAE,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;AAC7G,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAgD;IAChF,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,KAAK;IAChF,wEAAwE;IACxE,iEAAiE;IACjE,yBAAyB,EAAE,IAAI;IAC/B,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;IAC3B,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;QACpC,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACrF,MAAM,MAAM,GAAuB,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QACtG,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACzC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;QAC3C,OAAO,EAAE,KAAK,EAAE,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IACtI,CAAC;IACD,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE;IACd,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;IAC3B,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IAC1C,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;CAC1C,CAAC"}
|
|
@@ -20,4 +20,8 @@ export declare function redactionCovers(type: string): boolean;
|
|
|
20
20
|
* edit free-form text, other field names, other notifications or the received object.
|
|
21
21
|
*/
|
|
22
22
|
export declare function redactGrokNotification(method: string, params: JsonRecord): JsonRecord;
|
|
23
|
+
/** Browser authorization URLs belong to the private login interaction, not stored session records. */
|
|
24
|
+
export declare function redactCodebuddyNotification(method: string, params: JsonRecord): JsonRecord;
|
|
25
|
+
/** Shared dispatch for both live frames and a host's previously stored records. */
|
|
26
|
+
export declare function redactCredentialNotification(method: string, params: JsonRecord): JsonRecord;
|
|
23
27
|
//# sourceMappingURL=credential-redaction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-redaction.d.ts","sources":["../../src/shared/credential-redaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAkCtD;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAA;CAItG,CAAC;AAEF,+DAA+D;AAC/D,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAErD;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,UAAU,CAErF"}
|
|
1
|
+
{"version":3,"file":"credential-redaction.d.ts","sources":["../../src/shared/credential-redaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAkCtD;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAA;CAItG,CAAC;AAEF,+DAA+D;AAC/D,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAErD;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,UAAU,CAErF;AAED,sGAAsG;AACtG,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,UAAU,CAG1F;AAED,mFAAmF;AACnF,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,UAAU,CAE3F"}
|
|
@@ -37,9 +37,9 @@ function redactMcpTree(value) {
|
|
|
37
37
|
* can pre-filter its storage by them.
|
|
38
38
|
*/
|
|
39
39
|
export const REDACTION_RULES = {
|
|
40
|
-
version:
|
|
41
|
-
//
|
|
42
|
-
frameTypePrefixes: ["_x.ai/mcp/", "_x.ai/mcp_initialized"],
|
|
40
|
+
version: 2,
|
|
41
|
+
// Grok MCP credentials and CodeBuddy browser authorization links.
|
|
42
|
+
frameTypePrefixes: ["_x.ai/mcp/", "_x.ai/mcp_initialized", "_codebuddy.ai/authUrl"],
|
|
43
43
|
};
|
|
44
44
|
/** Whether a frame `type` is one the redaction rules cover. */
|
|
45
45
|
export function redactionCovers(type) {
|
|
@@ -52,6 +52,15 @@ export function redactionCovers(type) {
|
|
|
52
52
|
* edit free-form text, other field names, other notifications or the received object.
|
|
53
53
|
*/
|
|
54
54
|
export function redactGrokNotification(method, params) {
|
|
55
|
-
return
|
|
55
|
+
return method.startsWith("_x.ai/mcp/") || method.startsWith("_x.ai/mcp_initialized") ? redactMcpFields(params) : params;
|
|
56
|
+
}
|
|
57
|
+
/** Browser authorization URLs belong to the private login interaction, not stored session records. */
|
|
58
|
+
export function redactCodebuddyNotification(method, params) {
|
|
59
|
+
return method === "_codebuddy.ai/authUrl" && typeof params.authUrl === "string"
|
|
60
|
+
? { ...params, authUrl: "[redacted]" } : params;
|
|
61
|
+
}
|
|
62
|
+
/** Shared dispatch for both live frames and a host's previously stored records. */
|
|
63
|
+
export function redactCredentialNotification(method, params) {
|
|
64
|
+
return redactCodebuddyNotification(method, redactGrokNotification(method, params));
|
|
56
65
|
}
|
|
57
66
|
//# sourceMappingURL=credential-redaction.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-redaction.js","sources":["../../src/shared/credential-redaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAmB,MAAM,WAAW,CAAC;AAEtD,gFAAgF;AAChF,SAAS,iBAAiB,CAAC,KAAc;IACvC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAc,EAAE,EAAE;YAClC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC/B,OAAO,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,eAAe,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACxI,CAAC,CAAC,CAAC;IACL,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/B,OAAO,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;AAC7G,CAAC;AAED,SAAS,eAAe,CAAC,MAAkB;IACzC,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACpE,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,cAAc,EAAE,CAAC;YACjE,OAAO,CAAC,GAAG,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;QACzC,CAAC;QACD,IAAI,GAAG,KAAK,cAAc,IAAI,GAAG,KAAK,aAAa,EAAE,CAAC;YACpD,OAAO,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QACrD,CAAC;QACD,OAAO,CAAC,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC,CAAC;AACN,CAAC;AAED,SAAS,aAAa,CAAC,KAAc;IACnC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAc,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7D,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/B,OAAO,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;AAC3D,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,eAAe,GAAgF;IAC1G,OAAO,EAAE,CAAC;IACV,
|
|
1
|
+
{"version":3,"file":"credential-redaction.js","sources":["../../src/shared/credential-redaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,12 +13,13 @@ type PartialBlock = PartialText | PartialTool;
|
|
|
13
13
|
interface PartialMessage {
|
|
14
14
|
readonly id?: string;
|
|
15
15
|
readonly blocks: ReadonlyMap<number, PartialBlock>;
|
|
16
|
+
readonly stoppedIndex?: number | undefined;
|
|
16
17
|
}
|
|
17
18
|
/** Only unfinished API messages, per agent lane. Children can stream while root is idle. */
|
|
18
19
|
export type StreamJsonPartials = ReadonlyMap<string, PartialMessage>;
|
|
19
20
|
export declare function contentBlocks(message: JsonRecord): readonly JsonRecord[];
|
|
20
21
|
/** Pure content projection; the caller records the original frame even if events is empty. */
|
|
21
|
-
export declare function streamJsonContent(partials: StreamJsonPartials, message: JsonRecord, agentPath: readonly string[], assistantAfterMessageStop?: boolean, partialMessageIds?: boolean): {
|
|
22
|
+
export declare function streamJsonContent(partials: StreamJsonPartials, message: JsonRecord, agentPath: readonly string[], assistantAfterMessageStop?: boolean, partialMessageIds?: boolean, assistantFollowsBlockStop?: boolean): {
|
|
22
23
|
partials: StreamJsonPartials;
|
|
23
24
|
events: RuntimeEventBody[];
|
|
24
25
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content.d.ts","sources":["../../../src/shared/stream-json/content.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAEvD,UAAU,WAAW;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B;AACD,UAAU,WAAW;IACnB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AACD,KAAK,YAAY,GAAG,WAAW,GAAG,WAAW,CAAC;AAC9C,UAAU,cAAc;IACtB,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"content.d.ts","sources":["../../../src/shared/stream-json/content.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAEvD,UAAU,WAAW;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B;AACD,UAAU,WAAW;IACnB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AACD,KAAK,YAAY,GAAG,WAAW,GAAG,WAAW,CAAC;AAC9C,UAAU,cAAc;IACtB,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACnD,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5C;AACD,4FAA4F;AAC5F,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AAErE,wBAAgB,aAAa,CAAC,OAAO,EAAE,UAAU,GAAG,SAAS,UAAU,EAAE,CAGxE;AAsHD,8FAA8F;AAC9F,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,MAAM,EAAE,EAAE,yBAAyB,UAAQ,EAAE,iBAAiB,UAAO,EAAE,yBAAyB,UAAQ,GAAG;IAAE,QAAQ,EAAE,kBAAkB,CAAC;IAAC,MAAM,EAAE,gBAAgB,EAAE,CAAA;CAAE,CAiB/Q;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,UAAU,GAAG,gBAAgB,EAAE,CAkB7E"}
|
|
@@ -16,11 +16,14 @@ function streamContent(previous, event, partialMessageIds) {
|
|
|
16
16
|
const id = asRecord(event.message)?.id;
|
|
17
17
|
return { message: { ...(typeof id === "string" ? { id } : {}), blocks: new Map() }, events: [] };
|
|
18
18
|
}
|
|
19
|
-
const message = previous
|
|
19
|
+
const message = { ...previous, blocks: previous?.blocks ?? new Map(), stoppedIndex: undefined };
|
|
20
|
+
if (event.type === "content_block_stop" && typeof event.index === "number") {
|
|
21
|
+
return { message: { ...message, stoppedIndex: event.index }, events: [] };
|
|
22
|
+
}
|
|
20
23
|
const body = event.type === "content_block_start" ? asRecord(event.content_block)
|
|
21
24
|
: (event.type === "content_block_delta" ? asRecord(event.delta) : null);
|
|
22
25
|
if (typeof event.index !== "number") {
|
|
23
|
-
return { message
|
|
26
|
+
return { message, events: [] };
|
|
24
27
|
}
|
|
25
28
|
const blocks = new Map(message.blocks);
|
|
26
29
|
if (body?.type === "tool_use" && typeof body.id === "string" && typeof body.name === "string") {
|
|
@@ -30,12 +33,12 @@ function streamContent(previous, event, partialMessageIds) {
|
|
|
30
33
|
}
|
|
31
34
|
if (body?.type === "input_json_delta" && typeof body.partial_json === "string") {
|
|
32
35
|
const tool = blocks.get(event.index);
|
|
33
|
-
return { message
|
|
36
|
+
return { message, events: tool?.type === "tool_use" ? [{ kind: "tool_call_input_delta", callId: tool.callId, delta: body.partial_json }] : [] };
|
|
34
37
|
}
|
|
35
38
|
const type = body?.type === "text" || body?.type === "text_delta" ? "text"
|
|
36
39
|
: (body?.type === "thinking" || body?.type === "thinking_delta" ? "thinking" : null);
|
|
37
40
|
if (type === null) {
|
|
38
|
-
return { message
|
|
41
|
+
return { message, events: [] };
|
|
39
42
|
}
|
|
40
43
|
const value = body?.[type];
|
|
41
44
|
const text = typeof value === "string" ? value : "";
|
|
@@ -47,11 +50,20 @@ function streamContent(previous, event, partialMessageIds) {
|
|
|
47
50
|
/** Native 2.1.293 emits one completed block just before its content_block_stop,
|
|
48
51
|
* with the same API id for every block. Consume that block's streamed prefix
|
|
49
52
|
* once, rather than treating an entire message id as already projected. */
|
|
50
|
-
function finalContent(message, partial, partialMessageIds) {
|
|
53
|
+
function finalContent(message, partial, partialMessageIds, assistantFollowsBlockStop) {
|
|
51
54
|
const id = asRecord(message.message)?.id;
|
|
52
55
|
const identity = typeof id === "string" ? { messageId: id } : {};
|
|
53
56
|
const blocks = new Map(partial?.blocks);
|
|
57
|
+
const content = contentBlocks(message);
|
|
54
58
|
const remainder = (type, full) => {
|
|
59
|
+
const stoppedIndex = partial?.stoppedIndex;
|
|
60
|
+
const stopped = stoppedIndex === undefined ? undefined : blocks.get(stoppedIndex);
|
|
61
|
+
if (assistantFollowsBlockStop && content.length === 1 && stoppedIndex !== undefined && stopped?.type === type && !stopped.finalized) {
|
|
62
|
+
// This dialect emits a snapshot after a complete streamed block. The
|
|
63
|
+
// stop/start sequence identifies it, not text equality or the final id.
|
|
64
|
+
blocks.set(stoppedIndex, { ...stopped, finalized: true });
|
|
65
|
+
return stopped.text.length === 0 ? full : null;
|
|
66
|
+
}
|
|
55
67
|
if (typeof id !== "string" || (partial?.id !== id && (partialMessageIds || partial?.id !== undefined))) {
|
|
56
68
|
return full;
|
|
57
69
|
}
|
|
@@ -68,7 +80,7 @@ function finalContent(message, partial, partialMessageIds) {
|
|
|
68
80
|
return suffix.length === 0 ? null : suffix;
|
|
69
81
|
};
|
|
70
82
|
const events = [];
|
|
71
|
-
for (const block of
|
|
83
|
+
for (const block of content) {
|
|
72
84
|
switch (block.type) {
|
|
73
85
|
case "text": {
|
|
74
86
|
const text = typeof block.text === "string" ? remainder("text", block.text) : null;
|
|
@@ -109,10 +121,10 @@ function finalContent(message, partial, partialMessageIds) {
|
|
|
109
121
|
break;
|
|
110
122
|
}
|
|
111
123
|
}
|
|
112
|
-
return { message: partial === undefined ? undefined : { ...partial, blocks }, events };
|
|
124
|
+
return { message: partial === undefined ? undefined : { ...partial, blocks, stoppedIndex: undefined }, events };
|
|
113
125
|
}
|
|
114
126
|
/** Pure content projection; the caller records the original frame even if events is empty. */
|
|
115
|
-
export function streamJsonContent(partials, message, agentPath, assistantAfterMessageStop = false, partialMessageIds = true) {
|
|
127
|
+
export function streamJsonContent(partials, message, agentPath, assistantAfterMessageStop = false, partialMessageIds = true, assistantFollowsBlockStop = false) {
|
|
116
128
|
const lane = JSON.stringify(agentPath);
|
|
117
129
|
if (message.type === "stream_event" && asRecord(message.event)?.type === "message_stop") {
|
|
118
130
|
// Retain at most the latest API message in this lane until its final
|
|
@@ -129,7 +141,7 @@ export function streamJsonContent(partials, message, agentPath, assistantAfterMe
|
|
|
129
141
|
const previous = partials.get(lane);
|
|
130
142
|
const next = message.type === "stream_event"
|
|
131
143
|
? streamContent(previous, asRecord(message.event) ?? {}, partialMessageIds)
|
|
132
|
-
: finalContent(message, previous, partialMessageIds);
|
|
144
|
+
: finalContent(message, previous, partialMessageIds, assistantFollowsBlockStop);
|
|
133
145
|
return { partials: next.message === undefined ? partials : new Map([...partials, [lane, next.message]]), events: next.events };
|
|
134
146
|
}
|
|
135
147
|
export function streamJsonToolResults(message) {
|