@botiverse/oar 0.87.0 → 0.87.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/runtimes/qoder/launch.d.ts +3 -1
- package/dist/runtimes/qoder/launch.d.ts.map +1 -1
- package/dist/runtimes/qoder/launch.js +5 -3
- package/dist/runtimes/qoder/launch.js.map +1 -1
- package/dist/runtimes/qoder/list-models.d.ts +5 -3
- package/dist/runtimes/qoder/list-models.d.ts.map +1 -1
- package/dist/runtimes/qoder/list-models.js +21 -7
- package/dist/runtimes/qoder/list-models.js.map +1 -1
- package/dist/runtimes/qoder/protocol.d.ts +6 -0
- package/dist/runtimes/qoder/protocol.d.ts.map +1 -1
- package/dist/runtimes/qoder/protocol.js +6 -3
- package/dist/runtimes/qoder/protocol.js.map +1 -1
- package/dist/runtimes/qoder/session.d.ts.map +1 -1
- package/dist/runtimes/qoder/session.js +12 -10
- package/dist/runtimes/qoder/session.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import type { SessionOptions } from "../../contracts/session.js";
|
|
2
2
|
import { type LineProcess } from "../../shared/executable/index.js";
|
|
3
3
|
/** Process-scoped files keep MCP credentials and system prompts out of argv. */
|
|
4
|
-
export declare function launchQoder(command: string, sessionId: string, options: SessionOptions, version?: string): Promise<LineProcess
|
|
4
|
+
export declare function launchQoder(command: string, sessionId: string, options: SessionOptions, version?: string): Promise<LineProcess & {
|
|
5
|
+
readonly qoderVersion: string;
|
|
6
|
+
}>;
|
|
5
7
|
/** EOF finishes the native request before process-tree cleanup enforces the bound. */
|
|
6
8
|
export declare function closeQoder(child: LineProcess): Promise<void>;
|
|
7
9
|
//# sourceMappingURL=launch.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch.d.ts","sources":["../../../src/runtimes/qoder/launch.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAA2C,KAAK,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAS7G,gFAAgF;AAChF,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"launch.d.ts","sources":["../../../src/runtimes/qoder/launch.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAA2C,KAAK,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAS7G,gFAAgF;AAChF,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG;IAAE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC,CAoDzK;AAED,sFAAsF;AACtF,wBAAsB,UAAU,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAKlE"}
|
|
@@ -8,7 +8,7 @@ import { checkMcpServerNames, isHttpMcpServer } from "../../shared/mcp-servers.j
|
|
|
8
8
|
import { refuseSessionOptions } from "../../shared/session-options.js";
|
|
9
9
|
import { resolvedAdditionalDirectories } from "../../shared/additional-directories.js";
|
|
10
10
|
import { qoderDaemonSession } from "./daemon.js";
|
|
11
|
-
import {
|
|
11
|
+
import { qoderVersionInfo, qoderStartupError } from "./protocol.js";
|
|
12
12
|
import { checkQoderLaunchArgs, qoderRefusedSessionOptions } from "./options.js";
|
|
13
13
|
/** Process-scoped files keep MCP credentials and system prompts out of argv. */
|
|
14
14
|
export async function launchQoder(command, sessionId, options, version) {
|
|
@@ -18,7 +18,8 @@ export async function launchQoder(command, sessionId, options, version) {
|
|
|
18
18
|
const servers = options.mcpServers ?? [];
|
|
19
19
|
checkMcpServerNames(servers);
|
|
20
20
|
const directories = resolvedAdditionalDirectories(options);
|
|
21
|
-
const
|
|
21
|
+
const compatibility = qoderVersionInfo(version ?? await readExecutableVersion(command, 15_000, undefined, env));
|
|
22
|
+
const { protocol } = compatibility;
|
|
22
23
|
const needsFiles = servers.length > 0 || options.systemPrompt !== undefined || options.appendSystemPrompt !== undefined;
|
|
23
24
|
const temporary = needsFiles ? await privateTempDir("oar-qoder-mcp-") : null;
|
|
24
25
|
let child = undefined;
|
|
@@ -61,7 +62,8 @@ export async function launchQoder(command, sessionId, options, version) {
|
|
|
61
62
|
env: protocol === "daemon" ? { ...env, QODER_AGENT_SDK_DAEMON: "1" } : env, killTree: true });
|
|
62
63
|
child.onExit(() => { temporary?.remove(); });
|
|
63
64
|
await child.spawned;
|
|
64
|
-
|
|
65
|
+
const transport = protocol === "daemon" ? await qoderDaemonSession(child, sessionId, args, path.resolve(options.cwd), env) : child;
|
|
66
|
+
return { ...transport, qoderVersion: compatibility.version };
|
|
65
67
|
}
|
|
66
68
|
catch (error) {
|
|
67
69
|
child?.kill();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch.js","sources":["../../../src/runtimes/qoder/launch.ts"],"names":[],"mappings":"AAAA,8HAA8H;AAC9H,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAoB,MAAM,kCAAkC,CAAC;AAC7G,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AACvF,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"launch.js","sources":["../../../src/runtimes/qoder/launch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import type { ModelEntry, ModelLister } from "../../contracts/list-models.js";
|
|
2
2
|
import type { SessionOptions } from "../../contracts/session.js";
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
export declare function
|
|
3
|
+
import { type JsonRecord } from "../../shared/json.js";
|
|
4
|
+
/** New ModelProvider names identify a selector only when the complete catalog is unambiguous. */
|
|
5
|
+
export declare function qoderNativeModelName(model: unknown, models: readonly JsonRecord[], version?: string): string | undefined;
|
|
6
|
+
/** Pass the native CLI version for ModelProvider catalogs; omission retains the legacy projection. */
|
|
7
|
+
export declare function projectQoderModels(payload: unknown, version?: string): ModelEntry[];
|
|
6
8
|
export declare function readQoderModels(command: string, options: SessionOptions, timeoutMs?: number, version?: string): Promise<ModelEntry[]>;
|
|
7
9
|
export declare const qoderListModels: ModelLister;
|
|
8
10
|
//# sourceMappingURL=list-models.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-models.d.ts","sources":["../../../src/runtimes/qoder/list-models.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"list-models.d.ts","sources":["../../../src/runtimes/qoder/list-models.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAqC,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAO1F,iGAAiG;AACjG,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,UAAU,EAAE,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAUxH;AAED,sGAAsG;AACtG,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,UAAU,EAAE,CAenF;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,SAAS,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAU3I;AAED,eAAO,MAAM,eAAe,EAAE,WAK7B,CAAC"}
|
|
@@ -5,18 +5,32 @@ import { listingCwd } from "../../shared/listing-cwd.js";
|
|
|
5
5
|
import { launchQoder, closeQoder } from "./launch.js";
|
|
6
6
|
import { qoderControl } from "./control.js";
|
|
7
7
|
import { qoderAuthStatus } from "./auth-status.js";
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
import { qoderVersionInfo } from "./protocol.js";
|
|
9
|
+
/** New ModelProvider names identify a selector only when the complete catalog is unambiguous. */
|
|
10
|
+
export function qoderNativeModelName(model, models, version) {
|
|
11
|
+
const entry = asRecord(model);
|
|
12
|
+
if (version !== undefined && qoderVersionInfo(version).modelFormat === "provider") {
|
|
13
|
+
const name = entry?.displayName;
|
|
14
|
+
if (typeof entry?.value !== "string" || entry.value.length === 0 || entry.modelId !== entry.value || typeof name !== "string" || name.length === 0) {
|
|
15
|
+
return undefined;
|
|
16
|
+
}
|
|
17
|
+
if (models.filter(row => row.displayName === name).length !== 1 || models.filter(row => row.value === entry.value).length !== 1) {
|
|
18
|
+
return undefined;
|
|
19
|
+
}
|
|
20
|
+
return name;
|
|
21
|
+
}
|
|
22
|
+
const name = asRecord(entry?.serverModel)?.display_name;
|
|
11
23
|
return typeof name === "string" && name.length > 0 ? name : undefined;
|
|
12
24
|
}
|
|
13
|
-
|
|
14
|
-
|
|
25
|
+
/** Pass the native CLI version for ModelProvider catalogs; omission retains the legacy projection. */
|
|
26
|
+
export function projectQoderModels(payload, version) {
|
|
27
|
+
const models = asRecordList(asRecord(payload)?.models);
|
|
28
|
+
return models.flatMap((model) => {
|
|
15
29
|
if (typeof model.value !== "string" || model.value.length === 0) {
|
|
16
30
|
return [];
|
|
17
31
|
}
|
|
18
32
|
const efforts = effortLevelsOf(model.efforts);
|
|
19
|
-
const resolvedId = qoderNativeModelName(model);
|
|
33
|
+
const resolvedId = qoderNativeModelName(model, models, version);
|
|
20
34
|
return [{ id: model.value,
|
|
21
35
|
...(resolvedId !== undefined && resolvedId !== model.value ? { resolvedId } : {}),
|
|
22
36
|
...(typeof model.displayName === "string" ? { displayName: model.displayName } : {}),
|
|
@@ -36,7 +50,7 @@ export async function readQoderModels(command, options, timeoutMs = 30_000, vers
|
|
|
36
50
|
try {
|
|
37
51
|
await control.request({ subtype: "initialize" });
|
|
38
52
|
const answer = await control.request({ subtype: "get_models", fetchStrategy: "live" });
|
|
39
|
-
return projectQoderModels(asRecord(answer.response)?.response);
|
|
53
|
+
return projectQoderModels(asRecord(answer.response)?.response, child.qoderVersion);
|
|
40
54
|
}
|
|
41
55
|
finally {
|
|
42
56
|
control.end();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-models.js","sources":["../../../src/runtimes/qoder/list-models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"list-models.js","sources":["../../../src/runtimes/qoder/list-models.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,10 @@
|
|
|
1
1
|
import type { LineProcess } from "../../shared/executable/index.js";
|
|
2
|
+
/** One stable-version decision owns native transport and catalog identity. */
|
|
3
|
+
export declare function qoderVersionInfo(version: string | undefined): {
|
|
4
|
+
readonly version: string;
|
|
5
|
+
readonly protocol: "worker" | "daemon";
|
|
6
|
+
readonly modelFormat: "server" | "provider";
|
|
7
|
+
};
|
|
2
8
|
/** 1.1.81 removed the SDK worker from the ordinary headless stream. */
|
|
3
9
|
export declare function qoderProtocol(version: string | undefined): "worker" | "daemon";
|
|
4
10
|
/** Preserve the CLI's explicit environment credentials before local login. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol.d.ts","sources":["../../../src/runtimes/qoder/protocol.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAEpE,uEAAuE;AACvE,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"protocol.d.ts","sources":["../../../src/runtimes/qoder/protocol.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAEpE,8EAA8E;AAC9E,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,GAAG,UAAU,CAAA;CAAE,CAQ/K;AAED,uEAAuE;AACvE,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAA+C;AAE9H,8EAA8E;AAC9E,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAS9E;AAED,wFAAwF;AACxF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAErF;AAED,sEAAsE;AACtE,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAG7E"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
/**
|
|
2
|
-
export function
|
|
1
|
+
/** One stable-version decision owns native transport and catalog identity. */
|
|
2
|
+
export function qoderVersionInfo(version) {
|
|
3
3
|
const parts = /^(\d+)\.(\d+)\.(\d+)$/u.exec(version ?? "");
|
|
4
4
|
if (parts === null) {
|
|
5
5
|
throw new Error("Qoder version compatibility could not be determined; a readable stable CLI version is required to select its control and permission protocol");
|
|
@@ -7,8 +7,11 @@ export function qoderProtocol(version) {
|
|
|
7
7
|
const major = Number(parts[1]);
|
|
8
8
|
const minor = Number(parts[2]);
|
|
9
9
|
const patch = Number(parts[3]);
|
|
10
|
-
|
|
10
|
+
const atLeast = (floor) => major > 1 || (major === 1 && (minor > 1 || (minor === 1 && patch >= floor)));
|
|
11
|
+
return { version: parts[0], protocol: atLeast(81) ? "daemon" : "worker", modelFormat: atLeast(82) ? "provider" : "server" };
|
|
11
12
|
}
|
|
13
|
+
/** 1.1.81 removed the SDK worker from the ordinary headless stream. */
|
|
14
|
+
export function qoderProtocol(version) { return qoderVersionInfo(version).protocol; }
|
|
12
15
|
/** Preserve the CLI's explicit environment credentials before local login. */
|
|
13
16
|
export function qoderDaemonAuth(env) {
|
|
14
17
|
const accessToken = env.QODER_PERSONAL_ACCESS_TOKEN ?? "";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol.js","sources":["../../../src/runtimes/qoder/protocol.ts"],"names":[],"mappings":"AAEA,
|
|
1
|
+
{"version":3,"file":"protocol.js","sources":["../../../src/runtimes/qoder/protocol.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/qoder/session.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/qoder/session.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAmC/D,eAAO,MAAM,YAAY,EAAE,YA8CzB,CAAC"}
|
|
@@ -8,25 +8,27 @@ import { qoderCompaction } from "./compaction.js";
|
|
|
8
8
|
import { qoderControl, qoderInitializeTimeoutMs, rememberQoderSecrets } from "./control.js";
|
|
9
9
|
import { launchQoder, closeQoder } from "./launch.js";
|
|
10
10
|
import { initialQoderProjection, qoderProjectionProfile } from "./projection.js";
|
|
11
|
-
import { qoderStartupError, qoderTerminationReason } from "./protocol.js";
|
|
11
|
+
import { qoderStartupError, qoderTerminationReason, qoderVersionInfo } from "./protocol.js";
|
|
12
12
|
import { qoderPermissionResponse } from "./permission.js";
|
|
13
13
|
import { qoderNativeModelName } from "./list-models.js";
|
|
14
|
-
async function
|
|
14
|
+
async function readModelCatalog(control, requested, fetchStrategy) {
|
|
15
15
|
const catalog = await control.request({ subtype: "get_models", fetchStrategy }).catch((error) => {
|
|
16
16
|
throw new Error(`Qoder could not read ${fetchStrategy} model catalog to confirm ${JSON.stringify(requested)}: ${String(error)}`, { cause: error });
|
|
17
17
|
});
|
|
18
18
|
const payload = asRecord(asRecord(catalog.response)?.response);
|
|
19
|
-
return asRecordList(payload?.models)
|
|
19
|
+
return asRecordList(payload?.models);
|
|
20
20
|
}
|
|
21
|
-
async function confirmModel(control, requested, reported) {
|
|
22
|
-
let
|
|
23
|
-
|
|
24
|
-
|
|
21
|
+
async function confirmModel(control, requested, reported, version) {
|
|
22
|
+
let models = await readModelCatalog(control, requested, "cache");
|
|
23
|
+
let selected = models.find(entry => entry.value === requested);
|
|
24
|
+
if (qoderNativeModelName(selected, models, version) === undefined) {
|
|
25
|
+
models = await readModelCatalog(control, requested, "live");
|
|
26
|
+
selected = models.find(entry => entry.value === requested);
|
|
25
27
|
}
|
|
26
28
|
if (selected === undefined) {
|
|
27
29
|
throw new Error(`Qoder model catalog did not contain requested selector ${JSON.stringify(requested)}`);
|
|
28
30
|
}
|
|
29
|
-
const resolvedId = qoderNativeModelName(selected);
|
|
31
|
+
const resolvedId = qoderNativeModelName(selected, models, version);
|
|
30
32
|
if (resolvedId === undefined) {
|
|
31
33
|
throw new Error(`Qoder model catalog did not provide a resolved name for ${JSON.stringify(requested)}; reported ${JSON.stringify(reported)}`);
|
|
32
34
|
}
|
|
@@ -59,8 +61,8 @@ export const qoderSession = withSessionCredentials(async (installation, options,
|
|
|
59
61
|
},
|
|
60
62
|
open: async (projection) => {
|
|
61
63
|
await control.request({ subtype: "initialize" }, qoderInitializeTimeoutMs).catch((error) => { throw qoderStartupError(error, options.effort); });
|
|
62
|
-
if (options.model !== undefined && model !== options.model) {
|
|
63
|
-
await confirmModel(control, options.model, model);
|
|
64
|
+
if (options.model !== undefined && (model !== options.model || qoderVersionInfo(child.qoderVersion).modelFormat === "provider")) {
|
|
65
|
+
await confirmModel(control, options.model, model, child.qoderVersion);
|
|
64
66
|
}
|
|
65
67
|
const answer = await control.request({ subtype: "get_settings" }).catch((error) => {
|
|
66
68
|
if (options.effort === undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sources":["../../../src/runtimes/qoder/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AACxG,+GAA+G;AAC/G,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAmB,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"session.js","sources":["../../../src/runtimes/qoder/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AACxG,+GAA+G;AAC/G,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAmB,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC5F,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,KAAK,UAAU,gBAAgB,CAAC,OAAwC,EAAE,SAAiB,EAAE,aAA+B;IAC1H,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;QACvG,MAAM,IAAI,KAAK,CAAC,wBAAwB,aAAa,6BAA6B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IACrJ,CAAC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC/D,OAAO,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,OAAwC,EAAE,SAAiB,EAAE,QAAuB,EAAE,OAAe;IAC/H,IAAI,MAAM,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACjE,IAAI,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;IAC/D,IAAI,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,SAAS,EAAE,CAAC;QAClE,MAAM,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC5D,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;IAC7D,CAAC;IACD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAAC,MAAM,IAAI,KAAK,CAAC,0DAA0D,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAAC,CAAC;IACvI,MAAM,UAAU,GAAG,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACnE,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAAC,MAAM,IAAI,KAAK,CAAC,2DAA2D,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,cAAc,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAAC,CAAC;IAChL,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,cAAc,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACpK,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAiB,sBAAsB,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE;IAC5G,IAAI,YAAY,CAAC,GAAG,KAAK,YAAY,EAAE,CAAC;QAAC,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAAC,CAAC;IACzG,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,IAAI,UAAU,EAAE,CAAC;IACjD,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAChG,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,GAAG,oBAAoB,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClG,IAAI,KAAK,GAAkB,IAAI,CAAC;IAChC,IAAI,CAAC;QACH,OAAO,MAAM,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE;YAC5D,UAAU,EAAE,EAAE,UAAU,EAAE,2DAA2D,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,iBAAiB;gBAC1I,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,mBAAmB,IAAI,CAAC,OAAO,CAAC,KAAK,KAAK,WAAW,IAAI,OAAO,CAAC,KAAK,KAAK,WAAW,CAAC,IAAI,OAAO,OAAO,CAAC,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,EAAE;YAClN,UAAU,EAAE,sBAAsB,EAAE,OAAO,EAAE,sBAAsB,EAAE;YACrE,YAAY,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE;YACrF,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,4BAA4B;YACjE,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,IAAI,UAAU,EAAE,EAAE,UAAU,EAAE,SAAS;gBACtI,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI;YACrE,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;gBACnB,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;oBAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;gBAAC,CAAC;gBAC5H,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAClC,CAAC;YACD,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;gBACzB,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,wBAAwB,CAAC,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE,GAAG,MAAM,iBAAiB,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC1J,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,IAAI,gBAAgB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,WAAW,KAAK,UAAU,CAAC,EAAE,CAAC;oBAChI,MAAM,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;gBACxE,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;oBACzF,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;wBAAC,MAAM,KAAK,CAAC;oBAAC,CAAC;oBAClD,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;gBAC1H,CAAC,CAAC,CAAC;gBACH,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;gBACjF,MAAM,MAAM,GAAG,OAAO,OAAO,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC3E,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC;oBAAC,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAAC,CAAC;gBACzL,gGAAgG;gBAChG,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC3C,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBAC7C,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,SAAS,IAAI,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBACtJ,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,EAAE,GAAG,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;oBAChH,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;YACnE,CAAC;YACD,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,sBAAsB,CAAC,KAAK,CAAC;YAC5F,kBAAkB,EAAE,uBAAuB;YAC3C,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,IAAI,MAAM,EAAE,CAAC;gBAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBAAC,MAAM,KAAK,CAAC,MAAM,CAAC;YAAC,CAAC;iBAAM,CAAC;gBAAC,MAAM,UAAU,CAAC,KAAK,CAAC,CAAC;YAAC,CAAC,CAAC,CAAC;SACjH,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,EAAE,CAAC;QAAC,MAAM,UAAU,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,oBAAoB,CAAC,KAAK,EAAE,oBAAoB,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACvF,CAAC;AACH,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@botiverse/oar",
|
|
3
|
-
"version": "0.87.
|
|
3
|
+
"version": "0.87.1",
|
|
4
4
|
"description": "A programming interface for all agent harnesses: provider-independent contracts for controlling and observing agent runtimes",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|