@botiverse/oar 0.126.0 → 0.127.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 +2 -2
- package/dist/contracts/records.d.ts +7 -1
- package/dist/contracts/records.d.ts.map +1 -1
- package/dist/contracts/runtime.d.ts +5 -0
- package/dist/contracts/runtime.d.ts.map +1 -1
- package/dist/contracts/runtime.js.map +1 -1
- package/dist/observe/agent-status.js +1 -0
- package/dist/observe/agent-status.js.map +1 -1
- package/dist/observe/index.d.ts +1 -0
- package/dist/observe/index.d.ts.map +1 -1
- package/dist/observe/index.js +1 -0
- package/dist/observe/index.js.map +1 -1
- package/dist/observe/mcp-startup.d.ts +7 -0
- package/dist/observe/mcp-startup.d.ts.map +1 -0
- package/dist/observe/mcp-startup.js +16 -0
- package/dist/observe/mcp-startup.js.map +1 -0
- package/dist/observe/session-view-events.d.ts.map +1 -1
- package/dist/observe/session-view-events.js +1 -0
- package/dist/observe/session-view-events.js.map +1 -1
- package/dist/runtimes/claude/failure.d.ts.map +1 -1
- package/dist/runtimes/claude/failure.js +4 -1
- package/dist/runtimes/claude/failure.js.map +1 -1
- package/dist/runtimes/codex/index.d.ts +4 -0
- package/dist/runtimes/codex/index.d.ts.map +1 -1
- package/dist/runtimes/codex/index.js +1 -1
- package/dist/runtimes/codex/index.js.map +1 -1
- package/dist/runtimes/codex/projection.d.ts.map +1 -1
- package/dist/runtimes/codex/projection.js +17 -0
- package/dist/runtimes/codex/projection.js.map +1 -1
- package/dist/runtimes/pi/auth.d.ts +30 -7
- package/dist/runtimes/pi/auth.d.ts.map +1 -1
- package/dist/runtimes/pi/auth.js +2 -0
- package/dist/runtimes/pi/auth.js.map +1 -1
- package/dist/runtimes/pi/catalog.d.ts +1 -1
- package/dist/runtimes/pi/catalog.d.ts.map +1 -1
- package/dist/runtimes/pi/catalog.js.map +1 -1
- package/dist/runtimes/pi/facade-runtime.d.ts +1 -7
- package/dist/runtimes/pi/facade-runtime.d.ts.map +1 -1
- package/dist/runtimes/pi/facade-runtime.js.map +1 -1
- package/dist/runtimes/pi/installation.d.ts +8 -3
- package/dist/runtimes/pi/installation.d.ts.map +1 -1
- package/dist/runtimes/pi/installation.js +47 -13
- package/dist/runtimes/pi/installation.js.map +1 -1
- package/dist/runtimes/pi/options.d.ts +7 -0
- package/dist/runtimes/pi/options.d.ts.map +1 -1
- package/dist/runtimes/qoder/daemon.js +1 -1
- package/dist/runtimes/qoder/daemon.js.map +1 -1
- package/dist/shared/executable/close.d.ts +1 -1
- package/dist/shared/executable/close.js +2 -2
- package/dist/shared/executable/close.js.map +1 -1
- package/dist/shared/executable/process-shutdown.d.ts +1 -0
- package/dist/shared/executable/process-shutdown.d.ts.map +1 -1
- package/dist/shared/executable/process-shutdown.js +26 -2
- package/dist/shared/executable/process-shutdown.js.map +1 -1
- package/dist/shared/executable/process.d.ts +7 -0
- package/dist/shared/executable/process.d.ts.map +1 -1
- package/dist/shared/executable/process.js +1 -0
- package/dist/shared/executable/process.js.map +1 -1
- package/dist/shared/failure-class.d.ts +2 -0
- package/dist/shared/failure-class.d.ts.map +1 -1
- package/dist/shared/failure-class.js +11 -1
- package/dist/shared/failure-class.js.map +1 -1
- package/package.json +5 -3
|
@@ -1,10 +1,34 @@
|
|
|
1
1
|
import type { LoginProvider, ProviderAuthFacade, ProviderLoginEvent, ProviderLoginPrompt } from "../../contracts/provider-auth.js";
|
|
2
|
-
import type {
|
|
3
|
-
|
|
4
|
-
type
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
2
|
+
import type { PiModelRuntimePaths } from "./options.js";
|
|
3
|
+
export type PiAuthEvent = {
|
|
4
|
+
readonly type: "auth_url";
|
|
5
|
+
readonly url: string;
|
|
6
|
+
readonly instructions?: string;
|
|
7
|
+
} | {
|
|
8
|
+
readonly type: "device_code";
|
|
9
|
+
readonly userCode: string;
|
|
10
|
+
readonly verificationUri: string;
|
|
11
|
+
readonly intervalSeconds?: number;
|
|
12
|
+
readonly expiresInSeconds?: number;
|
|
13
|
+
} | {
|
|
14
|
+
readonly type: "info" | "progress";
|
|
15
|
+
readonly message: string;
|
|
16
|
+
};
|
|
17
|
+
export type PiAuthPrompt = {
|
|
18
|
+
readonly type: "select";
|
|
19
|
+
readonly message: string;
|
|
20
|
+
readonly signal?: AbortSignal;
|
|
21
|
+
readonly options: readonly {
|
|
22
|
+
readonly id: string;
|
|
23
|
+
readonly label: string;
|
|
24
|
+
readonly description?: string;
|
|
25
|
+
}[];
|
|
26
|
+
} | {
|
|
27
|
+
readonly type: "text" | "secret" | "manual_code";
|
|
28
|
+
readonly message: string;
|
|
29
|
+
readonly placeholder?: string;
|
|
30
|
+
readonly signal?: AbortSignal;
|
|
31
|
+
};
|
|
8
32
|
export declare function toLoginEvent(event: PiAuthEvent): ProviderLoginEvent;
|
|
9
33
|
export declare function toLoginPrompt(prompt: PiAuthPrompt): ProviderLoginPrompt;
|
|
10
34
|
/** The part of a pi `Provider` its `/login` menu reads; every `Provider` is one. */
|
|
@@ -33,5 +57,4 @@ export declare function piLoginProvider(provider: PiLoginProvider): LoginProvide
|
|
|
33
57
|
export type PiProviderAuthOptions = PiModelRuntimePaths;
|
|
34
58
|
/** Create a {@link ProviderAuthFacade} backed by Pi's `ModelRuntime`. */
|
|
35
59
|
export declare function createPiProviderAuth(options?: PiProviderAuthOptions): Promise<ProviderAuthFacade>;
|
|
36
|
-
export {};
|
|
37
60
|
//# sourceMappingURL=auth.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sources":["../../../src/runtimes/pi/auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,kBAAkB,EAElB,kBAAkB,EAIlB,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sources":["../../../src/runtimes/pi/auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,kBAAkB,EAElB,kBAAkB,EAIlB,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAiBxD,MAAM,MAAM,WAAW,GACnB;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GACnF;IAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE,GACpK;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE,MAAM,MAAM,YAAY,GACpB;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,SAAS;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAAE,GACjM;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,aAAa,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,CAAC;AAQjJ,wBAAgB,YAAY,CAAC,KAAK,EAAE,WAAW,GAAG,kBAAkB,CAsBnE;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,mBAAmB,CAoBvE;AAED,oFAAoF;AACpF,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE;QACb,QAAQ,CAAC,KAAK,CAAC,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;YAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAC5G,QAAQ,CAAC,MAAM,CAAC,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAA;SAAE,CAAC;KACvE,CAAC;CACH;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,eAAe,GAAG,aAAa,GAAG,SAAS,CAiBpF;AA6ID,kIAAkI;AAClI,MAAM,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAExD,yEAAyE;AACzE,wBAAsB,oBAAoB,CAAC,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAI3G"}
|
package/dist/runtimes/pi/auth.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sources":["../../../src/runtimes/pi/auth.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.js","sources":["../../../src/runtimes/pi/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ModelCatalogFacade } from "../../contracts/model-catalog.js";
|
|
2
|
-
import {
|
|
2
|
+
import type { PiModelRuntimePaths } from "./options.js";
|
|
3
3
|
/** `auth.json` and `models.json` default into the agent dir sessions use. */
|
|
4
4
|
export type PiModelCatalogOptions = PiModelRuntimePaths;
|
|
5
5
|
/** Create a {@link ModelCatalogFacade} backed by Pi's `ModelRegistry`. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.d.ts","sources":["../../../src/runtimes/pi/catalog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAKV,kBAAkB,EACnB,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"catalog.d.ts","sources":["../../../src/runtimes/pi/catalog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAKV,kBAAkB,EACnB,MAAM,kCAAkC,CAAC;AAG1C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAgFxD,6EAA6E;AAC7E,MAAM,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAExD,0EAA0E;AAC1E,wBAAsB,oBAAoB,CAAC,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAG3G"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.js","sources":["../../../src/runtimes/pi/catalog.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAqB,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACpG,OAAO,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"catalog.js","sources":["../../../src/runtimes/pi/catalog.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,5 @@
|
|
|
1
1
|
import { ModelRuntime } from "@earendil-works/pi-coding-agent";
|
|
2
|
-
|
|
3
|
-
export interface PiModelRuntimePaths {
|
|
4
|
-
/** Path to Pi's `auth.json`; defaults to `auth.json` in the agent dir. */
|
|
5
|
-
readonly authPath?: string;
|
|
6
|
-
/** Path to Pi's `models.json`; defaults to `models.json` in the agent dir; `null` disables the static config. */
|
|
7
|
-
readonly modelsPath?: string | null;
|
|
8
|
-
}
|
|
2
|
+
import type { PiModelRuntimePaths } from "./options.js";
|
|
9
3
|
type ModelRuntimeOptions = NonNullable<Parameters<typeof ModelRuntime.create>[0]>;
|
|
10
4
|
/**
|
|
11
5
|
* A `ModelRuntime` for a facade, reading the same agent dir as a session:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"facade-runtime.d.ts","sources":["../../../src/runtimes/pi/facade-runtime.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,YAAY,EAAmB,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"facade-runtime.d.ts","sources":["../../../src/runtimes/pi/facade-runtime.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,YAAY,EAAmB,MAAM,iCAAiC,CAAC;AAC7F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAIxD,KAAK,mBAAmB,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAElF;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CAAC,KAAK,EAAE,mBAAmB,EAAE,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,UAAU,GAAG,YAAY,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAStJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"facade-runtime.js","sources":["../../../src/runtimes/pi/facade-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"facade-runtime.js","sources":["../../../src/runtimes/pi/facade-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAE7F,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAIhD;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,KAA0B,EAAE,OAA6D;IAC7H,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IACzC,MAAM,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC;IACjE,OAAO,YAAY,CAAC,MAAM,CAAC;QACzB,GAAG,OAAO;QACV,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC;QACvD,4EAA4E;QAC5E,UAAU,EAAE,KAAK,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU;KAC9F,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -3,11 +3,16 @@ import { type HostEnvironment } from "../../shared/host-environment.js";
|
|
|
3
3
|
import type { PiRuntimeOptions } from "./options.js";
|
|
4
4
|
/**
|
|
5
5
|
* Probe Pi availability for in-process or native RPC subprocess execution:
|
|
6
|
-
* -
|
|
7
|
-
* -
|
|
6
|
+
* - Every Pi mode requires optional dependencies `@earendil-works/pi-coding-agent`
|
|
7
|
+
* and `@earendil-works/pi-ai` in the host, reporting `unsupported` with code
|
|
8
|
+
* `dependency_missing` when either is absent (for example, when installed with
|
|
9
|
+
* `--omit=optional`).
|
|
10
|
+
* - Subprocess without an explicit `command` also requires a non-SEA, non-Electron
|
|
8
11
|
* Node host and a resolvable `@earendil-works/pi-coding-agent/rpc-entry` on disk.
|
|
9
12
|
* - Subprocess with an explicit `command` delegates discovery, caching, and
|
|
10
|
-
* version-floor enforcement (`>= 1.4.0`) to `executableInstallation
|
|
13
|
+
* version-floor enforcement (`>= 1.4.0`) to `executableInstallation`, then
|
|
14
|
+
* still checks both host packages (used for session lookup, project-package
|
|
15
|
+
* checks, and context-overflow detection).
|
|
11
16
|
*/
|
|
12
17
|
export declare function piInstallationFor(runtimeOptions?: PiRuntimeOptions, hostOverride?: Partial<HostEnvironment>): InstallationProbe;
|
|
13
18
|
export declare const piInstallation: InstallationProbe;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installation.d.ts","sources":["../../../src/runtimes/pi/installation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAwB,MAAM,iCAAiC,CAAC;AAC/F,OAAO,EAAgD,KAAK,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAEtH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"installation.d.ts","sources":["../../../src/runtimes/pi/installation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAwB,MAAM,iCAAiC,CAAC;AAC/F,OAAO,EAAgD,KAAK,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAEtH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAoCrD;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAC/B,cAAc,GAAE,gBAAqB,EACrC,YAAY,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,GACtC,iBAAiB,CA0DnB;AAED,eAAO,MAAM,cAAc,EAAE,iBAAuC,CAAC"}
|
|
@@ -2,20 +2,34 @@ import { checkHostEnvironment, currentHostEnvironment } from "../../shared/host-
|
|
|
2
2
|
import { executableInstallation } from "../../shared/installation.js";
|
|
3
3
|
import { PI_RPC_MINIMUM_VERSION } from "./rpc/version.js";
|
|
4
4
|
const SDK_PACKAGE = "@earendil-works/pi-coding-agent";
|
|
5
|
+
const AI_PACKAGE = "@earendil-works/pi-ai";
|
|
5
6
|
const RPC_ENTRY = "@earendil-works/pi-coding-agent/rpc-entry";
|
|
6
|
-
async function
|
|
7
|
+
async function packageAvailable(host, specifier, allowImportFallback) {
|
|
8
|
+
if (host.resolveModule(specifier) !== null) {
|
|
9
|
+
return true;
|
|
10
|
+
}
|
|
11
|
+
if (!allowImportFallback) {
|
|
12
|
+
return false;
|
|
13
|
+
}
|
|
7
14
|
try {
|
|
8
|
-
//
|
|
9
|
-
//
|
|
10
|
-
await import("@earendil-works/pi-coding-agent");
|
|
15
|
+
// String LITERALS, not variables: bundlers only compile in (and resolve)
|
|
16
|
+
// literal specifiers, and this fallback exists for single-file hosts.
|
|
17
|
+
await (specifier === SDK_PACKAGE ? import("@earendil-works/pi-coding-agent") : import("@earendil-works/pi-ai"));
|
|
11
18
|
return true;
|
|
12
19
|
}
|
|
13
20
|
catch {
|
|
14
21
|
return false;
|
|
15
22
|
}
|
|
16
23
|
}
|
|
17
|
-
async function
|
|
18
|
-
|
|
24
|
+
async function missingPiPeers(host, allowImportFallback) {
|
|
25
|
+
const missing = [];
|
|
26
|
+
if (!await packageAvailable(host, SDK_PACKAGE, allowImportFallback)) {
|
|
27
|
+
missing.push(SDK_PACKAGE);
|
|
28
|
+
}
|
|
29
|
+
if (!await packageAvailable(host, AI_PACKAGE, allowImportFallback)) {
|
|
30
|
+
missing.push(AI_PACKAGE);
|
|
31
|
+
}
|
|
32
|
+
return missing;
|
|
19
33
|
}
|
|
20
34
|
function parsePiVersion(raw) {
|
|
21
35
|
const trimmed = raw.trim();
|
|
@@ -23,13 +37,19 @@ function parsePiVersion(raw) {
|
|
|
23
37
|
}
|
|
24
38
|
/**
|
|
25
39
|
* Probe Pi availability for in-process or native RPC subprocess execution:
|
|
26
|
-
* -
|
|
27
|
-
* -
|
|
40
|
+
* - Every Pi mode requires optional dependencies `@earendil-works/pi-coding-agent`
|
|
41
|
+
* and `@earendil-works/pi-ai` in the host, reporting `unsupported` with code
|
|
42
|
+
* `dependency_missing` when either is absent (for example, when installed with
|
|
43
|
+
* `--omit=optional`).
|
|
44
|
+
* - Subprocess without an explicit `command` also requires a non-SEA, non-Electron
|
|
28
45
|
* Node host and a resolvable `@earendil-works/pi-coding-agent/rpc-entry` on disk.
|
|
29
46
|
* - Subprocess with an explicit `command` delegates discovery, caching, and
|
|
30
|
-
* version-floor enforcement (`>= 1.4.0`) to `executableInstallation
|
|
47
|
+
* version-floor enforcement (`>= 1.4.0`) to `executableInstallation`, then
|
|
48
|
+
* still checks both host packages (used for session lookup, project-package
|
|
49
|
+
* checks, and context-overflow detection).
|
|
31
50
|
*/
|
|
32
51
|
export function piInstallationFor(runtimeOptions = {}, hostOverride) {
|
|
52
|
+
const allowImportFallback = hostOverride?.resolveModule === undefined;
|
|
33
53
|
const commandProbe = runtimeOptions.execution === "subprocess" && runtimeOptions.command !== undefined
|
|
34
54
|
? executableInstallation("", runtimeOptions.command, [], undefined, {
|
|
35
55
|
...(runtimeOptions.args === undefined ? {} : { argsPrefix: runtimeOptions.args }),
|
|
@@ -50,8 +70,13 @@ export function piInstallationFor(runtimeOptions = {}, hostOverride) {
|
|
|
50
70
|
if (snapshot.kind !== "available") {
|
|
51
71
|
return snapshot;
|
|
52
72
|
}
|
|
53
|
-
|
|
54
|
-
|
|
73
|
+
const missing = await missingPiPeers(host, allowImportFallback);
|
|
74
|
+
if (missing.length > 0) {
|
|
75
|
+
return {
|
|
76
|
+
kind: "unsupported",
|
|
77
|
+
code: "dependency_missing",
|
|
78
|
+
reason: `Pi RPC requires ${missing.join(" and ")} in the host for session lookup, project-package checks, and context-overflow detection, even when running an explicit command. Install ${missing.join(" ")} in your project.`,
|
|
79
|
+
};
|
|
55
80
|
}
|
|
56
81
|
return { kind: "available", via: "bundled" };
|
|
57
82
|
}
|
|
@@ -65,14 +90,23 @@ export function piInstallationFor(runtimeOptions = {}, hostOverride) {
|
|
|
65
90
|
},
|
|
66
91
|
requiredModule: {
|
|
67
92
|
specifier: RPC_ENTRY,
|
|
68
|
-
reason: `A single-file host must provide command for Pi subprocess execution: createPiRuntime({ execution: "subprocess", command, args }). OAR could not resolve ${RPC_ENTRY}.`,
|
|
93
|
+
reason: `A single-file host must provide command for Pi subprocess execution: createPiRuntime({ execution: "subprocess", command, args }). OAR could not resolve ${RPC_ENTRY} (install @earendil-works/pi-coding-agent and @earendil-works/pi-ai if omitted).`,
|
|
69
94
|
},
|
|
70
95
|
}, host);
|
|
71
96
|
if (refusal !== null) {
|
|
72
97
|
return refusal;
|
|
73
98
|
}
|
|
74
99
|
}
|
|
75
|
-
|
|
100
|
+
const missing = await missingPiPeers(host, allowImportFallback);
|
|
101
|
+
if (missing.length > 0) {
|
|
102
|
+
const label = runtimeOptions.execution === "subprocess" ? "Pi RPC" : "Pi";
|
|
103
|
+
return {
|
|
104
|
+
kind: "unsupported",
|
|
105
|
+
code: "dependency_missing",
|
|
106
|
+
reason: `${label} requires optional ${missing.length === 1 ? "dependency" : "dependencies"} ${missing.join(" and ")}. Install ${missing.join(" ")} (or install @botiverse/oar without omitting optional dependencies).`,
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
return { kind: "available", via: "bundled" };
|
|
76
110
|
};
|
|
77
111
|
}
|
|
78
112
|
export const piInstallation = piInstallationFor();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installation.js","sources":["../../../src/runtimes/pi/installation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,sBAAsB,EAAwB,MAAM,kCAAkC,CAAC;AACtH,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,MAAM,WAAW,GAAG,iCAAiC,CAAC;AACtD,MAAM,SAAS,GAAG,2CAA2C,CAAC;AAE9D,KAAK,UAAU,
|
|
1
|
+
{"version":3,"file":"installation.js","sources":["../../../src/runtimes/pi/installation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
/** Where a facade's `ModelRuntime` keeps credentials and custom providers; both default into the agent dir. */
|
|
2
|
+
export interface PiModelRuntimePaths {
|
|
3
|
+
/** Path to Pi's `auth.json`; defaults to `auth.json` in the agent dir. */
|
|
4
|
+
readonly authPath?: string;
|
|
5
|
+
/** Path to Pi's `models.json`; defaults to `models.json` in the agent dir; `null` disables the static config. */
|
|
6
|
+
readonly modelsPath?: string | null;
|
|
7
|
+
}
|
|
1
8
|
export interface PiProjectOptions {
|
|
2
9
|
/** Trust this cwd for this open only. False disables native project configuration and extensions. */
|
|
3
10
|
readonly projectTrusted?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.d.ts","sources":["../../../src/runtimes/pi/options.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,qGAAqG;IACrG,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAClC,+IAA+I;IAC/I,QAAQ,CAAC,0BAA0B,CAAC,EAAE,OAAO,CAAC;CAC/C;AAED,8EAA8E;AAC9E,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,GAAG,CAAC;IACjD,4CAA4C;IAC5C,QAAQ,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC;IAClC,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC;CACvB,GAAG;IACF,0CAA0C;IAC1C,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC;IACjC,kJAAkJ;IAClJ,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,qFAAqF;IACrF,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACnC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"options.d.ts","sources":["../../../src/runtimes/pi/options.ts"],"names":[],"mappings":"AAAA,+GAA+G;AAC/G,MAAM,WAAW,mBAAmB;IAClC,0EAA0E;IAC1E,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,iHAAiH;IACjH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,gBAAgB;IAC/B,qGAAqG;IACrG,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAClC,+IAA+I;IAC/I,QAAQ,CAAC,0BAA0B,CAAC,EAAE,OAAO,CAAC;CAC/C;AAED,8EAA8E;AAC9E,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,GAAG,CAAC;IACjD,4CAA4C;IAC5C,QAAQ,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC;IAClC,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC;CACvB,GAAG;IACF,0CAA0C;IAC1C,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC;IACjC,kJAAkJ;IAClJ,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,qFAAqF;IACrF,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACnC,CAAC,CAAC"}
|
|
@@ -101,7 +101,7 @@ export async function qoderDaemonSession(child, sessionId, workerArgs, cwd, env,
|
|
|
101
101
|
diagnostics: () => ({ ...child.diagnostics(), ...(failure.error === undefined ? {} : {
|
|
102
102
|
error: { code: "QODER_PROTOCOL_ERROR", message: failure.error.message },
|
|
103
103
|
}) }), resources: child.resources,
|
|
104
|
-
kill: () => { child.kill(); }, onExit: (handler) => { child.onExit(handler); },
|
|
104
|
+
kill: () => { child.kill(); }, forceKill: () => { child.forceKill(); }, onExit: (handler) => { child.onExit(handler); },
|
|
105
105
|
onLine(handler) {
|
|
106
106
|
handlers.push(handler);
|
|
107
107
|
if (ready) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon.js","sources":["../../../src/runtimes/qoder/daemon.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"daemon.js","sources":["../../../src/runtimes/qoder/daemon.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { LineProcess } from "./process.js";
|
|
2
2
|
/**
|
|
3
3
|
* End a line process through stdin EOF, letting native shutdown finish while
|
|
4
|
-
* preserving process-tree cleanup, then
|
|
4
|
+
* preserving process-tree cleanup, then force-kill after one grace period.
|
|
5
5
|
*/
|
|
6
6
|
export declare function closeLineProcess(child: LineProcess): Promise<void>;
|
|
7
7
|
//# sourceMappingURL=close.d.ts.map
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { killGraceMs } from "./process-signals.js";
|
|
2
2
|
/**
|
|
3
3
|
* End a line process through stdin EOF, letting native shutdown finish while
|
|
4
|
-
* preserving process-tree cleanup, then
|
|
4
|
+
* preserving process-tree cleanup, then force-kill after one grace period.
|
|
5
5
|
*/
|
|
6
6
|
export async function closeLineProcess(child) {
|
|
7
7
|
if (child.stopping()) {
|
|
@@ -13,7 +13,7 @@ export async function closeLineProcess(child) {
|
|
|
13
13
|
await child.exited;
|
|
14
14
|
return;
|
|
15
15
|
}
|
|
16
|
-
const timer = setTimeout(() => { child.
|
|
16
|
+
const timer = setTimeout(() => { child.forceKill(); }, killGraceMs());
|
|
17
17
|
child.markNativeStop();
|
|
18
18
|
child.stdin.end();
|
|
19
19
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"close.js","sources":["../../../src/shared/executable/close.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,KAAkB;IACvD,IAAI,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC;QAAC,MAAM,KAAK,CAAC,MAAM,CAAC;QAAC,OAAO;IAAC,CAAC;IACrD,MAAM,KAAK,CAAC,eAAe,EAAE,CAAC;IAC9B,IAAI,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC;QAAC,MAAM,KAAK,CAAC,MAAM,CAAC;QAAC,OAAO;IAAC,CAAC;IACrD,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"close.js","sources":["../../../src/shared/executable/close.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,KAAkB;IACvD,IAAI,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC;QAAC,MAAM,KAAK,CAAC,MAAM,CAAC;QAAC,OAAO;IAAC,CAAC;IACrD,MAAM,KAAK,CAAC,eAAe,EAAE,CAAC;IAC9B,IAAI,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC;QAAC,MAAM,KAAK,CAAC,MAAM,CAAC;QAAC,OAAO;IAAC,CAAC;IACrD,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IACtE,KAAK,CAAC,cAAc,EAAE,CAAC;IACvB,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;IAClB,IAAI,CAAC;QAAC,MAAM,KAAK,CAAC,MAAM,CAAC;IAAC,CAAC;YACnB,CAAC;QAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAAC,CAAC;AAClC,CAAC"}
|
|
@@ -9,6 +9,7 @@ interface ShutdownOptions {
|
|
|
9
9
|
export declare function processShutdown(child: ChildProcess, options: ShutdownOptions): {
|
|
10
10
|
readonly finished: Promise<void>;
|
|
11
11
|
stop(): void;
|
|
12
|
+
forceStop(): void;
|
|
12
13
|
prepare(): Promise<void>;
|
|
13
14
|
markNativeStop(): void;
|
|
14
15
|
observeCancellation(): Promise<CancellationObservation>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-shutdown.d.ts","sources":["../../../src/shared/executable/process-shutdown.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAA4C,KAAK,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAChH,OAAO,EAA6B,KAAK,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAKpG,UAAU,eAAe;IAAG,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAAE;AAEvF,iFAAiF;AACjF,wBAAgB,eAAe,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,eAAe,GAAG;IAC9E,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,IAAI,IAAI,CAAC;IACb,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,cAAc,IAAI,IAAI,CAAC;IACvB,mBAAmB,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACxD,YAAY,IAAI,IAAI,CAAC;IACrB,QAAQ,IAAI,OAAO,CAAC;IACpB,WAAW,IAAI,yBAAyB,GAAG,SAAS,CAAC;IACrD,MAAM,IAAI,MAAM,GAAG,SAAS,CAAC;CAC9B,
|
|
1
|
+
{"version":3,"file":"process-shutdown.d.ts","sources":["../../../src/shared/executable/process-shutdown.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAA4C,KAAK,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAChH,OAAO,EAA6B,KAAK,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAKpG,UAAU,eAAe;IAAG,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAAE;AAEvF,iFAAiF;AACjF,wBAAgB,eAAe,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,eAAe,GAAG;IAC9E,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,IAAI,IAAI,CAAC;IACb,SAAS,IAAI,IAAI,CAAC;IAClB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,cAAc,IAAI,IAAI,CAAC;IACvB,mBAAmB,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACxD,YAAY,IAAI,IAAI,CAAC;IACrB,QAAQ,IAAI,OAAO,CAAC;IACpB,WAAW,IAAI,yBAAyB,GAAG,SAAS,CAAC;IACrD,MAAM,IAAI,MAAM,GAAG,SAAS,CAAC;CAC9B,CAqJA"}
|
|
@@ -7,6 +7,7 @@ import { processTiming, processTimingId } from "./process-timing.js";
|
|
|
7
7
|
export function processShutdown(child, options) {
|
|
8
8
|
const shutdownId = processTimingId();
|
|
9
9
|
let stopping = false;
|
|
10
|
+
let forced = false;
|
|
10
11
|
let ended = false;
|
|
11
12
|
let stopAction = false;
|
|
12
13
|
const cancellations = new Set();
|
|
@@ -49,7 +50,7 @@ export function processShutdown(child, options) {
|
|
|
49
50
|
}
|
|
50
51
|
};
|
|
51
52
|
const close = () => {
|
|
52
|
-
if (!alive()) {
|
|
53
|
+
if (!alive() || forced) {
|
|
53
54
|
return;
|
|
54
55
|
}
|
|
55
56
|
stopAction = true;
|
|
@@ -63,7 +64,7 @@ export function processShutdown(child, options) {
|
|
|
63
64
|
signalProcessGroup(child, "SIGTERM");
|
|
64
65
|
}
|
|
65
66
|
}
|
|
66
|
-
escalation = setTimeout(() => { phase = force(); }, killGraceMs());
|
|
67
|
+
escalation = setTimeout(() => { forced = true; phase = force(); }, killGraceMs());
|
|
67
68
|
};
|
|
68
69
|
const ownedCleanup = () => {
|
|
69
70
|
if (cleanup === undefined) {
|
|
@@ -108,6 +109,10 @@ export function processShutdown(child, options) {
|
|
|
108
109
|
await force();
|
|
109
110
|
}
|
|
110
111
|
};
|
|
112
|
+
const captureAndForce = async (prepared) => {
|
|
113
|
+
await prepared;
|
|
114
|
+
await force();
|
|
115
|
+
};
|
|
111
116
|
const finish = async () => {
|
|
112
117
|
await nativeExit.promise;
|
|
113
118
|
// Native exit can arrive during capture or force. Finish after that phase,
|
|
@@ -189,6 +194,25 @@ export function processShutdown(child, options) {
|
|
|
189
194
|
const prepared = prepare();
|
|
190
195
|
phase = captureAndClose(prepared);
|
|
191
196
|
},
|
|
197
|
+
forceStop() {
|
|
198
|
+
if (!alive() || forced) {
|
|
199
|
+
return;
|
|
200
|
+
}
|
|
201
|
+
forced = true;
|
|
202
|
+
clearTimeout(escalation);
|
|
203
|
+
if (!stopping) {
|
|
204
|
+
processTiming({ kind: "stop_requested", shutdownId });
|
|
205
|
+
stopping = true;
|
|
206
|
+
}
|
|
207
|
+
stopAction = true;
|
|
208
|
+
child.stdin?.end();
|
|
209
|
+
if (options.killTree !== true || child.pid === undefined) {
|
|
210
|
+
phase = force();
|
|
211
|
+
return;
|
|
212
|
+
}
|
|
213
|
+
const prepared = prepare();
|
|
214
|
+
phase = captureAndForce(prepared);
|
|
215
|
+
},
|
|
192
216
|
};
|
|
193
217
|
}
|
|
194
218
|
//# sourceMappingURL=process-shutdown.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-shutdown.js","sources":["../../../src/shared/executable/process-shutdown.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAkC,MAAM,sBAAsB,CAAC;AAChH,OAAO,EAAE,yBAAyB,EAAgC,MAAM,2BAA2B,CAAC;AACpG,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAIrE,iFAAiF;AACjF,MAAM,UAAU,eAAe,CAAC,KAAmB,EAAE,OAAwB;
|
|
1
|
+
{"version":3,"file":"process-shutdown.js","sources":["../../../src/shared/executable/process-shutdown.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,6 +77,13 @@ export interface LineProcess {
|
|
|
77
77
|
* already belong to another process.
|
|
78
78
|
*/
|
|
79
79
|
kill(): void;
|
|
80
|
+
/**
|
|
81
|
+
* Immediately force-end the process and its tree without a graceful SIGTERM
|
|
82
|
+
* or grace-period delay (SIGKILL to the process group and tracked descendants
|
|
83
|
+
* on POSIX; taskkill /T /F on Windows when `killTree` is set). Used after a
|
|
84
|
+
* caller's own graceful shutdown wait (such as stdin EOF) has already expired.
|
|
85
|
+
*/
|
|
86
|
+
forceKill(): void;
|
|
80
87
|
/** The child's memory with its group and descendants (process-resources.ts); null once it has exited. */
|
|
81
88
|
readonly resources: ReturnType<typeof treeResourcesReader>;
|
|
82
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.d.ts","sources":["../../../src/shared/executable/process.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,KAAK,QAAQ,EAAE,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEnE,OAAO,EAAuD,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAIhH,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAMzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC1H,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACjC;;;;OAIG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,uEAAuE;IACvE,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,6EAA6E;IAC7E,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;CAC9B;AACD,8EAA8E;AAC9E,MAAM,WAAW,WAAW;IAC1B,8EAA8E;IAC9E,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,uGAAuG;IACvG,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACxC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC1B,+EAA+E;IAC/E,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,kEAAkE;IAClE,WAAW,IAAI,kBAAkB,CAAC;IAClC,6EAA6E;IAC7E,QAAQ,IAAI,OAAO,CAAC;IACpB,gGAAgG;IAChG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,sFAAsF;IACtF,cAAc,IAAI,IAAI,CAAC;IACvB,gFAAgF;IAChF,mBAAmB,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACxD,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,yEAAyE;IACzE,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAC9C,+DAA+D;IAC/D,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IACtE;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,CAAC;IACb,yGAAyG;IACzG,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;CAC5D;AACD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,GAAE,kBAAuB,GAC/B,WAAW,
|
|
1
|
+
{"version":3,"file":"process.d.ts","sources":["../../../src/shared/executable/process.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,KAAK,QAAQ,EAAE,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEnE,OAAO,EAAuD,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAIhH,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAMzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC1H,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACjC;;;;OAIG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,uEAAuE;IACvE,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,6EAA6E;IAC7E,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;CAC9B;AACD,8EAA8E;AAC9E,MAAM,WAAW,WAAW;IAC1B,8EAA8E;IAC9E,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,uGAAuG;IACvG,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACxC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC1B,+EAA+E;IAC/E,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,kEAAkE;IAClE,WAAW,IAAI,kBAAkB,CAAC;IAClC,6EAA6E;IAC7E,QAAQ,IAAI,OAAO,CAAC;IACpB,gGAAgG;IAChG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,sFAAsF;IACtF,cAAc,IAAI,IAAI,CAAC;IACvB,gFAAgF;IAChF,mBAAmB,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACxD,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,yEAAyE;IACzE,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAC9C,+DAA+D;IAC/D,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IACtE;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,CAAC;IACb;;;;;OAKG;IACH,SAAS,IAAI,IAAI,CAAC;IAClB,yGAAyG;IACzG,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;CAC5D;AACD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,GAAE,kBAAuB,GAC/B,WAAW,CAyIb"}
|
|
@@ -162,6 +162,7 @@ export function spawnLineProcess(command, args, options = {}) {
|
|
|
162
162
|
},
|
|
163
163
|
resources: treeResourcesReader(child, () => ended),
|
|
164
164
|
kill: () => { shutdown.stop(); },
|
|
165
|
+
forceKill: () => { shutdown.forceStop(); },
|
|
165
166
|
};
|
|
166
167
|
}
|
|
167
168
|
//# sourceMappingURL=process.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.js","sources":["../../../src/shared/executable/process.ts"],"names":[],"mappings":"AAAA,kIAAkI;AAClI,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,MAAM,EAAgC,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAA2B,MAAM,kBAAkB,CAAC;AAChH,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAkD,MAAM,sBAAsB,CAAC;AAC3H,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAgC,MAAM,gCAAgC,CAAC;AAE5H,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"process.js","sources":["../../../src/shared/executable/process.ts"],"names":[],"mappings":"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"}
|