@botiverse/oar 0.95.0 → 0.96.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 +59 -41
- package/dist/contracts/login.d.ts +1 -0
- package/dist/contracts/login.d.ts.map +1 -1
- package/dist/contracts/records.d.ts +2 -2
- package/dist/contracts/records.d.ts.map +1 -1
- package/dist/runtimes/claude/account-usage.d.ts.map +1 -1
- package/dist/runtimes/claude/account-usage.js +69 -66
- package/dist/runtimes/claude/account-usage.js.map +1 -1
- package/dist/runtimes/claude/auth-status.d.ts +1 -3
- package/dist/runtimes/claude/auth-status.d.ts.map +1 -1
- package/dist/runtimes/claude/auth-status.js +6 -2
- package/dist/runtimes/claude/auth-status.js.map +1 -1
- package/dist/runtimes/claude/login.d.ts.map +1 -1
- package/dist/runtimes/claude/login.js +4 -3
- package/dist/runtimes/claude/login.js.map +1 -1
- package/dist/runtimes/codebuddy/auth-status.d.ts +2 -1
- package/dist/runtimes/codebuddy/auth-status.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/auth-status.js +9 -1
- package/dist/runtimes/codebuddy/auth-status.js.map +1 -1
- package/dist/runtimes/codebuddy/login.js +2 -2
- package/dist/runtimes/codebuddy/login.js.map +1 -1
- package/dist/runtimes/codex/account-request.d.ts.map +1 -1
- package/dist/runtimes/codex/account-request.js +38 -30
- package/dist/runtimes/codex/account-request.js.map +1 -1
- package/dist/runtimes/codex/installation.d.ts +8 -0
- package/dist/runtimes/codex/installation.d.ts.map +1 -1
- package/dist/runtimes/codex/installation.js +22 -1
- package/dist/runtimes/codex/installation.js.map +1 -1
- package/dist/runtimes/codex/login.d.ts +4 -1
- package/dist/runtimes/codex/login.d.ts.map +1 -1
- package/dist/runtimes/codex/login.js +10 -3
- package/dist/runtimes/codex/login.js.map +1 -1
- package/dist/runtimes/codex/logout.js +2 -2
- package/dist/runtimes/codex/logout.js.map +1 -1
- package/dist/runtimes/cursor/auth-status.d.ts.map +1 -1
- package/dist/runtimes/cursor/auth-status.js +15 -10
- package/dist/runtimes/cursor/auth-status.js.map +1 -1
- package/dist/runtimes/grok/account-usage.d.ts.map +1 -1
- package/dist/runtimes/grok/account-usage.js +58 -29
- package/dist/runtimes/grok/account-usage.js.map +1 -1
- package/dist/runtimes/grok/failure.d.ts.map +1 -1
- package/dist/runtimes/grok/failure.js +35 -6
- package/dist/runtimes/grok/failure.js.map +1 -1
- package/dist/runtimes/grok/native-turns.d.ts +13 -0
- package/dist/runtimes/grok/native-turns.d.ts.map +1 -0
- package/dist/runtimes/grok/native-turns.js +49 -0
- package/dist/runtimes/grok/native-turns.js.map +1 -0
- package/dist/runtimes/grok/session.d.ts.map +1 -1
- package/dist/runtimes/grok/session.js +12 -6
- package/dist/runtimes/grok/session.js.map +1 -1
- package/dist/runtimes/grok/spontaneous-usage.d.ts +6 -5
- package/dist/runtimes/grok/spontaneous-usage.d.ts.map +1 -1
- package/dist/runtimes/grok/spontaneous-usage.js +7 -6
- package/dist/runtimes/grok/spontaneous-usage.js.map +1 -1
- package/dist/runtimes/kimi/auth-config.d.ts.map +1 -1
- package/dist/runtimes/kimi/auth-config.js +5 -3
- package/dist/runtimes/kimi/auth-config.js.map +1 -1
- package/dist/runtimes/kimi/auth-status.d.ts +3 -0
- package/dist/runtimes/kimi/auth-status.d.ts.map +1 -1
- package/dist/runtimes/kimi/auth-status.js +11 -1
- package/dist/runtimes/kimi/auth-status.js.map +1 -1
- package/dist/runtimes/kimi/logout.js +2 -2
- package/dist/runtimes/kimi/logout.js.map +1 -1
- package/dist/runtimes/opencode/failure.d.ts +3 -0
- package/dist/runtimes/opencode/failure.d.ts.map +1 -0
- package/dist/runtimes/opencode/failure.js +29 -0
- package/dist/runtimes/opencode/failure.js.map +1 -0
- package/dist/runtimes/opencode/session.d.ts.map +1 -1
- package/dist/runtimes/opencode/session.js +2 -0
- package/dist/runtimes/opencode/session.js.map +1 -1
- package/dist/runtimes/qoder/auth-status.d.ts +3 -0
- package/dist/runtimes/qoder/auth-status.d.ts.map +1 -1
- package/dist/runtimes/qoder/auth-status.js +10 -2
- package/dist/runtimes/qoder/auth-status.js.map +1 -1
- package/dist/runtimes/qoder/login.js +2 -2
- package/dist/runtimes/qoder/login.js.map +1 -1
- package/dist/runtimes/qwen/auth-status.d.ts.map +1 -1
- package/dist/runtimes/qwen/auth-status.js +10 -16
- package/dist/runtimes/qwen/auth-status.js.map +1 -1
- package/dist/shared/acp/native-turns.d.ts +37 -0
- package/dist/shared/acp/native-turns.d.ts.map +1 -0
- package/dist/shared/acp/native-turns.js +107 -0
- package/dist/shared/acp/native-turns.js.map +1 -0
- package/dist/shared/acp/profile.d.ts +44 -2
- 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 +4 -1
- package/dist/shared/acp/records.d.ts.map +1 -1
- package/dist/shared/acp/records.js +2 -2
- package/dist/shared/acp/records.js.map +1 -1
- package/dist/shared/acp/session-state.d.ts +22 -0
- package/dist/shared/acp/session-state.d.ts.map +1 -0
- package/dist/shared/acp/session-state.js +39 -0
- package/dist/shared/acp/session-state.js.map +1 -0
- package/dist/shared/acp/session.d.ts +3 -17
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +25 -43
- package/dist/shared/acp/session.js.map +1 -1
- package/dist/shared/acp/steer-request.d.ts +12 -0
- package/dist/shared/acp/steer-request.d.ts.map +1 -0
- package/dist/shared/acp/steer-request.js +56 -0
- package/dist/shared/acp/steer-request.js.map +1 -0
- package/dist/shared/acp/token-usage.d.ts +1 -1
- package/dist/shared/acp/token-usage.d.ts.map +1 -1
- package/dist/shared/acp/token-usage.js +2 -2
- package/dist/shared/acp/token-usage.js.map +1 -1
- package/dist/shared/acp/turns.d.ts +6 -2
- package/dist/shared/acp/turns.d.ts.map +1 -1
- package/dist/shared/acp/turns.js +4 -3
- package/dist/shared/acp/turns.js.map +1 -1
- package/dist/shared/executable/query.d.ts +11 -0
- package/dist/shared/executable/query.d.ts.map +1 -0
- package/dist/shared/executable/query.js +31 -0
- package/dist/shared/executable/query.js.map +1 -0
- package/dist/shared/record-retention.d.ts.map +1 -1
- package/dist/shared/record-retention.js +3 -1
- package/dist/shared/record-retention.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sources":["../../../src/runtimes/kimi/logout.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAqB,MAAM,wBAAwB,CAAC;AAC5E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"logout.js","sources":["../../../src/runtimes/kimi/logout.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAqB,MAAM,wBAAwB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAErE,qFAAqF;AACrF,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,YAAmC,EAAE,OAAO,GAAkB,EAAE;IAC/F,MAAM,MAAM,GAAG,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/F,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO,MAAM,CAAC,MAAM,CAAC;IAAC,CAAC;IACxD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC;IACxJ,IAAI,MAAM,KAAK,aAAa,EAAE,CAAC;QAAC,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,EAAE,mCAAmC,EAAE,CAAC;IAAC,CAAC;IAC7I,MAAM,MAAM,GAAiB,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAChE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,gBAAgB,EAAE,MAAM,EAAE,kCAAkC;KAC5H,CAAC;IACF,OAAO,eAAe,CAAC,MAAM,EAAE,MAAM,kBAAkB,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAClH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"failure.d.ts","sources":["../../../src/runtimes/opencode/failure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAyBlG,eAAO,MAAM,sBAAsB,EAAE,gBAKpC,CAAC"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { acpErrorReason, rpcErrorCode } from "../../shared/acp/failure.js";
|
|
2
|
+
import { asRecord } from "../../shared/json.js";
|
|
3
|
+
/*
|
|
4
|
+
* OpenCode's JSON-RPC -32603 prompt errors can carry `data`
|
|
5
|
+
* `{ service, errorName }`; `errorName` is opencode's own `SessionError`
|
|
6
|
+
* type (read on v2.2.6: packages/cli/src/acp/error.ts, packages/core/src/session/to-session-error.ts).
|
|
7
|
+
* Only that field is read, and only a name in the table decides: any other
|
|
8
|
+
* answer (no name, or one like `APIError`) is left to the generic rules, which
|
|
9
|
+
* read its words. The status, retry delay and body do not reach ACP, and
|
|
10
|
+
* nothing says whose quota a limit is, so no scope is reported.
|
|
11
|
+
*/
|
|
12
|
+
const INTERNAL_ERROR = -32_603;
|
|
13
|
+
const ERROR_NAMES = {
|
|
14
|
+
"provider.free-limit": "quota",
|
|
15
|
+
"provider.go-limit": "quota",
|
|
16
|
+
"provider.budget-limit": "quota",
|
|
17
|
+
"provider.model-budget-limit": "quota",
|
|
18
|
+
"provider.quota": "quota",
|
|
19
|
+
"provider.rate-limit": "rate_limited",
|
|
20
|
+
};
|
|
21
|
+
export const opencodeFailureOutcome = (error) => {
|
|
22
|
+
if (rpcErrorCode(error) !== INTERNAL_ERROR) {
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
const errorName = asRecord(error instanceof Error && "data" in error ? error.data : undefined)?.errorName;
|
|
26
|
+
const failure = typeof errorName === "string" && Object.hasOwn(ERROR_NAMES, errorName) ? ERROR_NAMES[errorName] : undefined;
|
|
27
|
+
return failure === undefined ? null : { kind: "failed", reason: acpErrorReason(error), failure };
|
|
28
|
+
};
|
|
29
|
+
//# sourceMappingURL=failure.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"failure.js","sources":["../../../src/runtimes/opencode/failure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAyB,MAAM,6BAA6B,CAAC;AAElG,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD;;;;;;;;GAQG;AAEH,MAAM,cAAc,GAAG,CAAC,MAAM,CAAC;AAE/B,MAAM,WAAW,GAAoD;IACnE,qBAAqB,EAAE,OAAO;IAC9B,mBAAmB,EAAE,OAAO;IAC5B,uBAAuB,EAAE,OAAO;IAChC,6BAA6B,EAAE,OAAO;IACtC,gBAAgB,EAAE,OAAO;IACzB,qBAAqB,EAAE,cAAc;CACtC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAqB,CAAC,KAAK,EAAE,EAAE;IAChE,IAAI,YAAY,CAAC,KAAK,CAAC,KAAK,cAAc,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,YAAY,KAAK,IAAI,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC;IAC1G,MAAM,OAAO,GAAG,OAAO,SAAS,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5H,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;AACnG,CAAC,CAAC"}
|
|
@@ -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;AAKjF,eAAO,MAAM,kBAAkB,EAAE,iBA2BhC,CAAC;AAIF,eAAO,MAAM,+BAA+B,EAAE,qBAI7C,CAAC;AACF,eAAO,MAAM,oBAAoB,EAAE,iBAMlC,CAAC;AA+BF,eAAO,MAAM,eAAe,EAAE,YAgC5B,CAAC"}
|
|
@@ -6,9 +6,11 @@ import { opencodeChildAttribution } 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
|
+
import { opencodeFailureOutcome } from "./failure.js";
|
|
9
10
|
import { prepareOpenCodePrompts, validateOpenCodePrompts, verifyOpenCodeAgent } from "./prompt-config.js";
|
|
10
11
|
export const opencodeAcpProfile = {
|
|
11
12
|
args: ["acp"],
|
|
13
|
+
failureOutcome: opencodeFailureOutcome,
|
|
12
14
|
validateOptions: (options) => { refuseSessionOptions(opencodeV1RefusedSessionOptions, options); },
|
|
13
15
|
// The ACP layer forwards only its own sessions' parts: a `task` subagent
|
|
14
16
|
// runs in a child session whose frames never reach this transport, so the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sources":["../../../src/runtimes/opencode/session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session.js","sources":["../../../src/runtimes/opencode/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,8 @@ import type { AvailableInstallation } from "../../contracts/installation.js";
|
|
|
2
2
|
import type { AuthStatus, AuthStatusOptions } from "../../contracts/login.js";
|
|
3
3
|
/** Status also carries identity and organization details. Only its explicit boolean leaves the private query. */
|
|
4
4
|
export declare function projectQoderAuthStatus(stdout: string): AuthStatus;
|
|
5
|
+
export declare function readQoderAuthStatus(installation: AvailableInstallation, options?: AuthStatusOptions & {
|
|
6
|
+
readonly signal?: AbortSignal;
|
|
7
|
+
}): Promise<AuthStatus>;
|
|
5
8
|
export declare function qoderAuthStatus(installation: AvailableInstallation, options?: AuthStatusOptions): Promise<AuthStatus>;
|
|
6
9
|
//# sourceMappingURL=auth-status.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-status.d.ts","sources":["../../../src/runtimes/qoder/auth-status.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth-status.d.ts","sources":["../../../src/runtimes/qoder/auth-status.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAM9E,iHAAiH;AACjH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAMjE;AAED,wBAAsB,mBAAmB,CAAC,YAAY,EAAE,qBAAqB,EAAE,OAAO,GAAE,iBAAiB,GAAG;IAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAOvK;AAED,wBAAsB,eAAe,CAAC,YAAY,EAAE,qBAAqB,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC,CAM/H"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { withQueryDeadline } from "../../shared/executable/query.js";
|
|
1
2
|
import { sessionEnvironment } from "../../shared/environment.js";
|
|
2
3
|
import { asRecord, parseJson } from "../../shared/json.js";
|
|
3
4
|
import { runExecutable } from "../../shared/executable/index.js";
|
|
@@ -10,14 +11,21 @@ export function projectQoderAuthStatus(stdout) {
|
|
|
10
11
|
}
|
|
11
12
|
return { kind: response.logged_in ? "logged_in" : "logged_out", source: SOURCE };
|
|
12
13
|
}
|
|
13
|
-
export async function
|
|
14
|
+
export async function readQoderAuthStatus(installation, options = {}) {
|
|
14
15
|
if (installation.via !== "executable") {
|
|
15
16
|
return { kind: "unknown", detail: "not a machine-installed executable" };
|
|
16
17
|
}
|
|
17
|
-
const result = await runExecutable(installation.command, ["status", "--output", "json"], { env: sessionEnvironment(options.env), timeoutMs: options.timeoutMs ?? 30_000 });
|
|
18
|
+
const result = await runExecutable(installation.command, ["status", "--output", "json"], { env: sessionEnvironment(options.env), timeoutMs: options.timeoutMs ?? 30_000, ...(options.signal === undefined ? {} : { signal: options.signal }) });
|
|
18
19
|
if (!result.ok) {
|
|
19
20
|
return { kind: "unknown", source: SOURCE, detail: "Qoder account query ended without an answer" };
|
|
20
21
|
}
|
|
21
22
|
return projectQoderAuthStatus(result.stdout);
|
|
22
23
|
}
|
|
24
|
+
export async function qoderAuthStatus(installation, options = {}) {
|
|
25
|
+
const status = await withQueryDeadline("Qoder auth status", options.timeoutMs ?? 30_000, async (signal) => {
|
|
26
|
+
const result = await readQoderAuthStatus(installation, { ...options, signal });
|
|
27
|
+
return result;
|
|
28
|
+
}, { kind: "unknown", source: SOURCE, detail: "Qoder auth status timed out" });
|
|
29
|
+
return status;
|
|
30
|
+
}
|
|
23
31
|
//# sourceMappingURL=auth-status.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-status.js","sources":["../../../src/runtimes/qoder/auth-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAGjE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,MAAM,MAAM,GAAG,+BAA+B,CAAC;AAE/C,iHAAiH;AACjH,MAAM,UAAU,sBAAsB,CAAC,MAAc;IACnD,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7C,IAAI,OAAO,QAAQ,EAAE,SAAS,KAAK,SAAS,EAAE,CAAC;QAC7C,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,sCAAsC,EAAE,CAAC;IAC7F,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AACnF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,
|
|
1
|
+
{"version":3,"file":"auth-status.js","sources":["../../../src/runtimes/qoder/auth-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAGjE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,MAAM,MAAM,GAAG,+BAA+B,CAAC;AAE/C,iHAAiH;AACjH,MAAM,UAAU,sBAAsB,CAAC,MAAc;IACnD,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7C,IAAI,OAAO,QAAQ,EAAE,SAAS,KAAK,SAAS,EAAE,CAAC;QAC7C,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,sCAAsC,EAAE,CAAC;IAC7F,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AACnF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,YAAmC,EAAE,OAAO,GAA0D,EAAE;IAChJ,IAAI,YAAY,CAAC,GAAG,KAAK,YAAY,EAAE,CAAC;QAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,oCAAoC,EAAE,CAAC;IAAC,CAAC;IACpH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IAChP,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QACf,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,6CAA6C,EAAE,CAAC;IACpG,CAAC;IACD,OAAO,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,YAAmC,EAAE,OAAO,GAAsB,EAAE;IACxG,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAa,mBAAmB,EAAE,OAAO,CAAC,SAAS,IAAI,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACpH,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,YAAY,EAAE,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAC/E,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,6BAA6B,EAAE,CAAC,CAAC;IAC/E,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { sessionEnvironment } from "../../shared/environment.js";
|
|
2
2
|
import { errorMessage, LoginSecrets, loginBounds, loginExecutable, spawnLoginProcess, stoppedResult } from "../../shared/login.js";
|
|
3
|
-
import {
|
|
3
|
+
import { readQoderAuthStatus } from "./auth-status.js";
|
|
4
4
|
/** Native browser login restores the previous account first and does not log it out before an attempt. */
|
|
5
5
|
export async function qoderLogin(installation, interaction, options = {}) {
|
|
6
6
|
const target = loginExecutable(installation, "Qoder", undefined, sessionEnvironment(options.env));
|
|
@@ -66,7 +66,7 @@ export async function qoderLogin(installation, interaction, options = {}) {
|
|
|
66
66
|
if (aborted()) {
|
|
67
67
|
return { kind: "logged_in" };
|
|
68
68
|
}
|
|
69
|
-
const status = await
|
|
69
|
+
const status = await readQoderAuthStatus(installation, { env: options.env });
|
|
70
70
|
return status.kind === "logged_out"
|
|
71
71
|
? { kind: "failed", reason: "not_logged_in", detail: "Qoder reported success but its status command reads logged out" }
|
|
72
72
|
: { kind: "logged_in" };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sources":["../../../src/runtimes/qoder/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAIjE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,iBAAiB,EAAE,aAAa,EAAqB,MAAM,uBAAuB,CAAC;AACtJ,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"login.js","sources":["../../../src/runtimes/qoder/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-status.d.ts","sources":["../../../src/runtimes/qwen/auth-status.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth-status.d.ts","sources":["../../../src/runtimes/qwen/auth-status.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAiC,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AA4EhG,2FAA2F;AAC3F,eAAO,MAAM,cAAc,EAAE,gBAWG,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { withQueryDeadline } from "../../shared/executable/query.js";
|
|
1
2
|
import path from "node:path";
|
|
2
3
|
import { environmentValue, sessionEnvironment } from "../../shared/environment.js";
|
|
3
4
|
import { asRecord, asRecordList } from "../../shared/json.js";
|
|
@@ -94,21 +95,14 @@ async function inspectCredentials(env, signal) {
|
|
|
94
95
|
}
|
|
95
96
|
/** Presence only. Never starts Qwen, sends requests, refreshes or reads token contents. */
|
|
96
97
|
export const qwenAuthStatus = Object.assign(async (_installation, options = {}) => {
|
|
97
|
-
const
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
}
|
|
107
|
-
catch {
|
|
108
|
-
return unknown(abort.signal.aborted ? "Qwen local credential inspection timed out" : "Qwen user/system configuration could not be completely inspected; credentials may be configured");
|
|
109
|
-
}
|
|
110
|
-
finally {
|
|
111
|
-
clearTimeout(timer);
|
|
112
|
-
}
|
|
98
|
+
const result = await withQueryDeadline("Qwen auth status", options.timeoutMs ?? 20_000, async (signal) => {
|
|
99
|
+
try {
|
|
100
|
+
return await inspectCredentials(sessionEnvironment(options.env), signal);
|
|
101
|
+
}
|
|
102
|
+
catch {
|
|
103
|
+
return unknown("Qwen user/system configuration could not be completely inspected; credentials may be configured");
|
|
104
|
+
}
|
|
105
|
+
}, { kind: "unknown", source: SOURCE, detail: "Qwen local credential inspection timed out" });
|
|
106
|
+
return result;
|
|
113
107
|
}, { localOnly: true });
|
|
114
108
|
//# sourceMappingURL=auth-status.js.map
|
|
@@ -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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"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import type { RuntimeEventBody } from "../../contracts/session.js";
|
|
2
|
+
import { type JsonRecord } from "../json.js";
|
|
3
|
+
import type { AcpNativeTurns } from "./profile.js";
|
|
4
|
+
/**
|
|
5
|
+
* The runtime's native turns on the root session, for a profile with
|
|
6
|
+
* `nativeTurns` (grok). OAR names every prompt it sends; the runtime's own
|
|
7
|
+
* queue reports then say when that prompt waits (`input_queued`) and starts
|
|
8
|
+
* (`turn_active`). A turn the runtime runs under any other name is its own:
|
|
9
|
+
* the turn driver adopts it as the active turn (so prompt is busy, held input
|
|
10
|
+
* waits, steer and abort reach it), with `turn_active` at its start and
|
|
11
|
+
* `turn_ended` at its own end report. Only live root frames count: an opening
|
|
12
|
+
* or `_meta.isReplay` frame is history, not a turn.
|
|
13
|
+
*
|
|
14
|
+
* Grok runs one turn at a time, so its next turn can start before OAR records
|
|
15
|
+
* the previous prompt's answer (the answer waits for the SDK's notification
|
|
16
|
+
* flush). A host waiting on that prompt must get the prompt's end, and the
|
|
17
|
+
* next turn must still be running after it: such a start is held until the
|
|
18
|
+
* prompt's turn closes, then reported on that closing frame after its
|
|
19
|
+
* `turn_ended`. A run that also ends before then stays inside the prompt's turn.
|
|
20
|
+
*/
|
|
21
|
+
export interface AcpNativeTurnTracker {
|
|
22
|
+
/** Name the next OAR prompt; the returned fields go into that prompt's `_meta`. */
|
|
23
|
+
readonly name: (inputId: string | undefined) => JsonRecord;
|
|
24
|
+
readonly sentByOar: (promptId: string) => boolean;
|
|
25
|
+
readonly project: (method: string, params: JsonRecord, rootId: string | undefined, afterOpen: boolean) => readonly RuntimeEventBody[];
|
|
26
|
+
/** The turn driver: its active turn, and adopting or releasing a native one. */
|
|
27
|
+
readonly bind: (control: AcpNativeTurnControl) => void;
|
|
28
|
+
/** An OAR prompt's turn just closed: a native turn that started during it is reported now. */
|
|
29
|
+
readonly afterOarTurn: () => readonly RuntimeEventBody[];
|
|
30
|
+
}
|
|
31
|
+
export interface AcpNativeTurnControl {
|
|
32
|
+
readonly active: () => object | null;
|
|
33
|
+
readonly adopt: () => object;
|
|
34
|
+
readonly release: (turn: object) => void;
|
|
35
|
+
}
|
|
36
|
+
export declare function createAcpNativeTurnTracker(profile: AcpNativeTurns | undefined): AcpNativeTurnTracker | undefined;
|
|
37
|
+
//# sourceMappingURL=native-turns.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"native-turns.d.ts","sources":["../../../src/shared/acp/native-turns.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAe,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,WAAW,oBAAoB;IACnC,mFAAmF;IACnF,QAAQ,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,KAAK,UAAU,CAAC;IAC3D,QAAQ,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IAClD,QAAQ,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,EAAE,OAAO,KAAK,SAAS,gBAAgB,EAAE,CAAC;IACtI,gFAAgF;IAChF,QAAQ,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAC;IACvD,8FAA8F;IAC9F,QAAQ,CAAC,YAAY,EAAE,MAAM,SAAS,gBAAgB,EAAE,CAAC;CAC1D;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,KAAK,EAAE,MAAM,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC1C;AAID,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,GAAG,oBAAoB,GAAG,SAAS,CAuEhH"}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
import { asRecord } from "../json.js";
|
|
3
|
+
const unbound = { active: () => null, adopt: () => ({}), release: () => { } };
|
|
4
|
+
export function createAcpNativeTurnTracker(profile) {
|
|
5
|
+
if (profile === undefined) {
|
|
6
|
+
return undefined;
|
|
7
|
+
}
|
|
8
|
+
const sent = new Map();
|
|
9
|
+
const queuedReported = new Set();
|
|
10
|
+
const endedReports = new Set();
|
|
11
|
+
let control = unbound;
|
|
12
|
+
let running = null;
|
|
13
|
+
/** The runtime's own running prompt id, its adopted turn, and whether its start waits for an OAR turn to close. */
|
|
14
|
+
let own = null;
|
|
15
|
+
let adopted = null;
|
|
16
|
+
let deferred = false;
|
|
17
|
+
let lastEnded = null;
|
|
18
|
+
const oarTurnOpen = () => { const active = control.active(); return active !== null && active !== adopted; };
|
|
19
|
+
const started = (promptId) => {
|
|
20
|
+
if (own === promptId) {
|
|
21
|
+
return [];
|
|
22
|
+
}
|
|
23
|
+
own = promptId;
|
|
24
|
+
lastEnded = null;
|
|
25
|
+
if (oarTurnOpen()) {
|
|
26
|
+
deferred = true;
|
|
27
|
+
return [];
|
|
28
|
+
}
|
|
29
|
+
adopted = control.adopt();
|
|
30
|
+
return [{ kind: "turn_active" }];
|
|
31
|
+
};
|
|
32
|
+
const ended = (promptId, outcome, key) => {
|
|
33
|
+
// A repeated delivery: the same native report, or (without one) the same id with no start since.
|
|
34
|
+
if (key === undefined ? lastEnded === promptId : endedReports.has(key)) {
|
|
35
|
+
return [];
|
|
36
|
+
}
|
|
37
|
+
if (key !== undefined) {
|
|
38
|
+
endedReports.add(key);
|
|
39
|
+
}
|
|
40
|
+
lastEnded = promptId;
|
|
41
|
+
if (own !== promptId) {
|
|
42
|
+
return oarTurnOpen() ? [] : [{ kind: "turn_ended", outcome }];
|
|
43
|
+
}
|
|
44
|
+
own = null;
|
|
45
|
+
if (deferred) {
|
|
46
|
+
deferred = false;
|
|
47
|
+
return [];
|
|
48
|
+
}
|
|
49
|
+
const turn = adopted;
|
|
50
|
+
adopted = null;
|
|
51
|
+
if (turn !== null) {
|
|
52
|
+
control.release(turn);
|
|
53
|
+
}
|
|
54
|
+
return [{ kind: "turn_ended", outcome }];
|
|
55
|
+
};
|
|
56
|
+
return {
|
|
57
|
+
name(inputId) {
|
|
58
|
+
const promptId = `oar-${randomUUID()}`;
|
|
59
|
+
sent.set(promptId, inputId);
|
|
60
|
+
return profile.promptMeta(promptId);
|
|
61
|
+
},
|
|
62
|
+
sentByOar: (promptId) => sent.has(promptId),
|
|
63
|
+
project(method, params, rootId, afterOpen) {
|
|
64
|
+
// oxlint-disable-next-line eslint/no-underscore-dangle -- Native ACP extension envelope.
|
|
65
|
+
if (!afterOpen || rootId === undefined || params.sessionId !== rootId || asRecord(params._meta)?.isReplay === true) {
|
|
66
|
+
return [];
|
|
67
|
+
}
|
|
68
|
+
const report = profile.read(method, params);
|
|
69
|
+
if (report === null) {
|
|
70
|
+
return [];
|
|
71
|
+
}
|
|
72
|
+
if (report.kind === "ended") {
|
|
73
|
+
return sent.has(report.promptId) ? [] : ended(report.promptId, report.outcome, report.key);
|
|
74
|
+
}
|
|
75
|
+
const events = [];
|
|
76
|
+
for (const promptId of report.queued) {
|
|
77
|
+
const inputId = sent.get(promptId);
|
|
78
|
+
if (inputId !== undefined && !queuedReported.has(promptId)) {
|
|
79
|
+
queuedReported.add(promptId);
|
|
80
|
+
events.push({ kind: "input_queued", inputId });
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
if (report.running === running) {
|
|
84
|
+
return events;
|
|
85
|
+
}
|
|
86
|
+
running = report.running;
|
|
87
|
+
if (running === null) {
|
|
88
|
+
return events;
|
|
89
|
+
}
|
|
90
|
+
if (!sent.has(running)) {
|
|
91
|
+
return [...events, ...started(running)];
|
|
92
|
+
}
|
|
93
|
+
const inputId = sent.get(running);
|
|
94
|
+
return [...events, { kind: "turn_active", ...(inputId === undefined ? {} : { inputId }) }];
|
|
95
|
+
},
|
|
96
|
+
bind(next) { control = next; },
|
|
97
|
+
afterOarTurn() {
|
|
98
|
+
if (own === null || !deferred) {
|
|
99
|
+
return [];
|
|
100
|
+
}
|
|
101
|
+
deferred = false;
|
|
102
|
+
adopted = control.adopt();
|
|
103
|
+
return [{ kind: "turn_active" }];
|
|
104
|
+
},
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
//# sourceMappingURL=native-turns.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"native-turns.js","sources":["../../../src/shared/acp/native-turns.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,6 +72,27 @@ export interface AcpSessionProfile {
|
|
|
72
72
|
}) => Promise<void>;
|
|
73
73
|
/** Return prompt-level extension fields for the runtime's native steer; absent when the runtime cannot steer, and then the session has no `steer`. */
|
|
74
74
|
readonly steerParams?: (input: string) => JsonRecord;
|
|
75
|
+
/**
|
|
76
|
+
* A native steer that is its own RPC, not another prompt (grok
|
|
77
|
+
* `_x.ai/interject`): the answer admits the input into the running turn,
|
|
78
|
+
* which still ends with the original prompt's answer. Exclusive with
|
|
79
|
+
* `steerParams`.
|
|
80
|
+
*/
|
|
81
|
+
readonly steerRequest?: (context: {
|
|
82
|
+
readonly sessionId: string;
|
|
83
|
+
readonly input: string;
|
|
84
|
+
readonly prompt: readonly JsonRecord[];
|
|
85
|
+
readonly inputId: string;
|
|
86
|
+
}) => {
|
|
87
|
+
readonly method: string;
|
|
88
|
+
readonly params: JsonRecord;
|
|
89
|
+
};
|
|
90
|
+
/**
|
|
91
|
+
* Turns the runtime runs without a prompt from OAR (grok: a sub-agent's
|
|
92
|
+
* completion wake, a late interjection). OAR names each prompt it sends;
|
|
93
|
+
* any root turn under another name is the runtime's own.
|
|
94
|
+
*/
|
|
95
|
+
readonly nativeTurns?: AcpNativeTurns;
|
|
75
96
|
/** A steer replaces the native prompt: fold all admitted answers as one turn (grok sendNow). Otherwise only the original prompt ends the turn. */
|
|
76
97
|
readonly steerSupersedesPrompt?: boolean;
|
|
77
98
|
/** A replacing steer settles the prior RPC early; a later failure reports the loop outcome only after every earlier RPC has replied (agy CLI). */
|
|
@@ -85,8 +106,8 @@ export interface AcpSessionProfile {
|
|
|
85
106
|
* combines them with independent vendor ledgers and emits cumulative usage.
|
|
86
107
|
*/
|
|
87
108
|
readonly promptTokenUsage?: (response: JsonRecord) => TokenTotals | null;
|
|
88
|
-
/** Independent root ledger, never overlapping promptTokenUsage. The native key deduplicates delivery; replayed reports only remember that identity. Child notifications are excluded by the recorder. */
|
|
89
|
-
readonly spontaneousTokenUsage?: (method: string, params: JsonRecord) => {
|
|
109
|
+
/** Independent root ledger, never overlapping promptTokenUsage: `sentByOar` names prompts whose answer already carries their tokens. The native key deduplicates delivery; replayed reports only remember that identity. Child notifications are excluded by the recorder. */
|
|
110
|
+
readonly spontaneousTokenUsage?: (method: string, params: JsonRecord, sentByOar: (promptId: string) => boolean) => {
|
|
90
111
|
readonly key: string;
|
|
91
112
|
readonly tokens: TokenTotals;
|
|
92
113
|
readonly replayed?: boolean;
|
|
@@ -107,6 +128,27 @@ export interface AcpSessionProfile {
|
|
|
107
128
|
/** Bound for `usageUpdateAfterPrompt`; default 500 ms. */
|
|
108
129
|
readonly usageUpdateTimeoutMs?: number;
|
|
109
130
|
}
|
|
131
|
+
/** What one root notification says about the runtime's native turns. */
|
|
132
|
+
export type AcpNativeTurnReport =
|
|
133
|
+
/** The runtime's prompt queue: the prompt it is running (null when none) and the ones it holds. */
|
|
134
|
+
{
|
|
135
|
+
readonly kind: "queue";
|
|
136
|
+
readonly running: string | null;
|
|
137
|
+
readonly queued: readonly string[];
|
|
138
|
+
}
|
|
139
|
+
/** A prompt's turn ended, by the runtime's own report; `key` identifies that report across repeated delivery. */
|
|
140
|
+
| {
|
|
141
|
+
readonly kind: "ended";
|
|
142
|
+
readonly promptId: string;
|
|
143
|
+
readonly outcome: TurnOutcome;
|
|
144
|
+
readonly key?: string;
|
|
145
|
+
};
|
|
146
|
+
export interface AcpNativeTurns {
|
|
147
|
+
/** Prompt-level fields naming one OAR prompt (merged into `_meta`). */
|
|
148
|
+
readonly promptMeta: (promptId: string) => JsonRecord;
|
|
149
|
+
/** Read a live root notification; replays and other sessions never reach this. */
|
|
150
|
+
readonly read: (method: string, params: JsonRecord) => AcpNativeTurnReport | null;
|
|
151
|
+
}
|
|
110
152
|
export interface OpenedAcpSession {
|
|
111
153
|
readonly initialized: JsonRecord;
|
|
112
154
|
readonly response: JsonRecord;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.d.ts","sources":["../../../src/shared/acp/profile.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"profile.d.ts","sources":["../../../src/shared/acp/profile.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.js","sources":["../../../src/shared/acp/profile.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,QAAQ,EAAmB,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5D,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAyB,MAAM,cAAc,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAmB,eAAe,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAE1E,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAwB,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"profile.js","sources":["../../../src/shared/acp/profile.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { RuntimeEventBody } from "../../contracts/session.js";
|
|
1
2
|
import { type JsonRecord } from "../json.js";
|
|
2
3
|
import type { SessionKernel } from "../session-kernel.js";
|
|
3
4
|
import { type SessionNotification } from "./process.js";
|
|
@@ -46,5 +47,7 @@ export declare function acpLineageOf(params: JsonRecord): {
|
|
|
46
47
|
export declare function createAcpRecorder(usageGate: UsageUpdateGate, attributeUpdate?: AcpSessionProfile["attributeUpdate"], tokenUsage?: AcpTokenUsage, associations?: (method: string, params: JsonRecord) => readonly {
|
|
47
48
|
readonly parent: string;
|
|
48
49
|
readonly child: string;
|
|
49
|
-
}[], projectUpdate?: AcpSessionProfile["projectUpdate"], projectExtension?: AcpSessionProfile["projectExtension"]
|
|
50
|
+
}[], projectUpdate?: AcpSessionProfile["projectUpdate"], projectExtension?: AcpSessionProfile["projectExtension"], nativeTurns?: {
|
|
51
|
+
project: (method: string, params: JsonRecord, rootId: string, afterOpen: boolean) => readonly RuntimeEventBody[];
|
|
52
|
+
}): AcpRecorder;
|
|
50
53
|
//# sourceMappingURL=records.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"records.d.ts","sources":["../../../src/shared/acp/records.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"records.d.ts","sources":["../../../src/shared/acp/records.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG1D,OAAO,EAAW,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,IAAI,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;IAClC,MAAM,CAAC,YAAY,EAAE,mBAAmB,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrE,2KAA2K;IAC3K,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9F,+KAA+K;IAC/K,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,GAAG,IAAI,CAAC;IACjD,2EAA2E;IAC3E,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClF,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;CAC5C;AAYD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAgB3G;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,eAAe,EAAE,eAAe,CAAC,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,EAAE,UAAU,CAAC,EAAE,aAAa,EAAE,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,SAAS;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE,EAAE,aAAa,CAAC,EAAE,iBAAiB,CAAC,eAAe,CAAC,EAAE,gBAAgB,CAAC,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,WAAW,CAAC,EAAE;IAAE,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,KAAK,SAAS,gBAAgB,EAAE,CAAA;CAAE,GAAG,WAAW,CAqGtgB"}
|
|
@@ -39,7 +39,7 @@ export function acpLineageOf(params) {
|
|
|
39
39
|
}
|
|
40
40
|
return null;
|
|
41
41
|
}
|
|
42
|
-
export function createAcpRecorder(usageGate, attributeUpdate, tokenUsage, associations, projectUpdate, projectExtension) {
|
|
42
|
+
export function createAcpRecorder(usageGate, attributeUpdate, tokenUsage, associations, projectUpdate, projectExtension, nativeTurns) {
|
|
43
43
|
const hostRequests = new Map();
|
|
44
44
|
const projections = new Map();
|
|
45
45
|
const projectionFor = (sessionId) => {
|
|
@@ -114,7 +114,7 @@ export function createAcpRecorder(usageGate, attributeUpdate, tokenUsage, associ
|
|
|
114
114
|
if (usage !== null && usage !== undefined) {
|
|
115
115
|
events.push(usage);
|
|
116
116
|
}
|
|
117
|
-
events.push(...projectExtension?.(method, params) ?? []);
|
|
117
|
+
events.push(...projectExtension?.(method, params) ?? [], ...nativeTurns?.project(method, params, kernel.sessionId, afterOpen ?? false) ?? []);
|
|
118
118
|
kernel.frame({ type: method, native: params, events }, { ...(foreign ? { sessionId } : {}), ...(receivedAt === undefined ? {} : { receivedAt }) });
|
|
119
119
|
});
|
|
120
120
|
},
|