@felan-ai/felan 0.34.0 → 0.34.2
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 +7 -6
- package/dist/acp/daemon-session.d.ts +1 -0
- package/dist/acp/daemon-session.d.ts.map +1 -1
- package/dist/acp/daemon-session.js +6 -0
- package/dist/acp/daemon-session.js.map +1 -1
- package/dist/acp/session-registry.d.ts.map +1 -1
- package/dist/acp/session-registry.js +5 -1
- package/dist/acp/session-registry.js.map +1 -1
- package/dist/client/build-mismatch.d.ts +4 -0
- package/dist/client/build-mismatch.d.ts.map +1 -0
- package/dist/client/build-mismatch.js +28 -0
- package/dist/client/build-mismatch.js.map +1 -0
- package/dist/client/client.d.ts +13 -2
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/client.js +34 -14
- package/dist/client/client.js.map +1 -1
- package/dist/client-application.d.ts +1 -1
- package/dist/client-application.d.ts.map +1 -1
- package/dist/client-application.js +13 -10
- package/dist/client-application.js.map +1 -1
- package/dist/daemon-command.d.ts.map +1 -1
- package/dist/daemon-command.js +7 -1
- package/dist/daemon-command.js.map +1 -1
- package/dist/headless.d.ts.map +1 -1
- package/dist/headless.js +12 -4
- package/dist/headless.js.map +1 -1
- package/dist/process-restart.d.ts +4 -0
- package/dist/process-restart.d.ts.map +1 -1
- package/dist/process-restart.js +33 -3
- package/dist/process-restart.js.map +1 -1
- package/dist/tui/commands.d.ts +1 -1
- package/dist/tui/commands.d.ts.map +1 -1
- package/dist/tui/controller.d.ts +2 -2
- package/dist/tui/controller.d.ts.map +1 -1
- package/dist/tui/controller.js +14 -8
- package/dist/tui/controller.js.map +1 -1
- package/dist/tui/run.d.ts.map +1 -1
- package/dist/tui/run.js +4 -1
- package/dist/tui/run.js.map +1 -1
- package/npm-shrinkwrap.json +43 -43
- package/package.json +17 -17
package/README.md
CHANGED
|
@@ -337,12 +337,13 @@ All built-ins are enabled by default, including the Powerline footer in TUI
|
|
|
337
337
|
sessions. Binary-backed features can remain inactive until their dependency is
|
|
338
338
|
installed or the feature is disabled through `/dependencies`.
|
|
339
339
|
|
|
340
|
-
Session compaction is also enabled by default
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
340
|
+
Session compaction is also enabled by default and uses the verified summary
|
|
341
|
+
method. Set `extensionConfig.sessionCompaction.method` to `classifier` to drop
|
|
342
|
+
or shorten eligible bulky successful tool results instead when Pi's catalog has
|
|
343
|
+
an authenticated classifier model available; without one, or when the
|
|
344
|
+
classifier fails, it uses the verified summary. When idle with a large context,
|
|
345
|
+
the extension also compacts shortly before a known prompt-cache lifetime
|
|
346
|
+
expires (`compactBeforeCacheExpiry`). Summary mode uses the active model by default or the
|
|
346
347
|
configured `inherit`, `xhigh`, `high`, `medium`, or `low` policy. Tier selection
|
|
347
348
|
prefers the active provider/family and falls back to inherit when unavailable.
|
|
348
349
|
Both methods preserve structured continuity and expose `session_recall` for the
|
|
@@ -6,6 +6,7 @@ export interface DaemonClientOptions {
|
|
|
6
6
|
readonly sessionDir?: string;
|
|
7
7
|
readonly createClient?: (options: SessionClientOptions) => SessionClient;
|
|
8
8
|
}
|
|
9
|
+
export declare function daemonRestartRecovery(daemonRuntime?: string): string;
|
|
9
10
|
export declare function createDaemonClient(options: DaemonClientOptions, kind: 'acp' | 'headless', interactionKinds?: SessionClientOptions['interactionKinds'], capabilities?: SessionClientOptions['capabilities']): Promise<SessionClient>;
|
|
10
11
|
export declare class DaemonRequestError extends Error {
|
|
11
12
|
readonly code: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-session.d.ts","sourceRoot":"","sources":["../../src/acp/daemon-session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"daemon-session.d.ts","sourceRoot":"","sources":["../../src/acp/daemon-session.ts"],"names":[],"mappings":"AAEA,OAAO,EAAU,KAAK,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAK/E,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,aAAa,CAAC;CAC1E;AAKD,wBAAgB,qBAAqB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAIpE;AAED,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,KAAK,GAAG,UAAU,EAAE,gBAAgB,GAAE,oBAAoB,CAAC,kBAAkB,CAAM,EAAE,YAAY,GAAE,oBAAoB,CAAC,cAAc,CAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAQjP;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM;IAAmB,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,eAAe;IAAE,QAAQ,CAAC,SAAS,EAAE,OAAO;gBAA1G,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAW,OAAO,EAAE,UAAU,GAAG,eAAe,EAAW,SAAS,EAAE,OAAO;CAGhI;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE;IAAE,OAAO,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,UAAU,GAAG,eAAe,CAAC;IAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,CAAA;CAAE,GAAG,CAAC,CAGrL;AAED,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAa7H;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CA0B9H;AAED,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;IAAE,QAAQ,EAAE,eAAe,CAAC;IAAC,QAAQ,EAAE,OAAO,EAAE,CAAA;CAAE,CAAC,CAWxK;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CA2BtI"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { DAEMON_VERSION } from '@felan-ai/daemon';
|
|
2
|
+
import { resolve } from 'node:path';
|
|
2
3
|
import { LIMITS } from '@felan-ai/session-protocol';
|
|
3
4
|
import { SessionClient } from '../client/client.js';
|
|
4
5
|
import { clientDaemonTarget } from '../client-application.js';
|
|
@@ -6,6 +7,11 @@ import { resolveClientHostComposition, resolveInstalledDaemonEntrypoint } from '
|
|
|
6
7
|
import { FELAN_VERSION } from '../version.js';
|
|
7
8
|
/** Backoff of 250 ms doubling to 10 s spans about 36 s over eight attempts, covering the 30 s headless reconnect window. */
|
|
8
9
|
const HEADLESS_RECONNECT_ATTEMPTS = 8;
|
|
10
|
+
export function daemonRestartRecovery(daemonRuntime) {
|
|
11
|
+
const runtime = daemonRuntime && resolve(daemonRuntime);
|
|
12
|
+
const target = runtime ? ` --daemon-runtime ${/^[\w\-./~:@]+$/u.test(runtime) ? runtime : `'${runtime.replaceAll("'", "'\\''")}'`}` : '';
|
|
13
|
+
return `Run felan daemon restart${target} to apply the new build.`;
|
|
14
|
+
}
|
|
9
15
|
export async function createDaemonClient(options, kind, interactionKinds = [], capabilities = []) {
|
|
10
16
|
const target = clientDaemonTarget(options);
|
|
11
17
|
const expectedComposition = options.createClient ? undefined : await resolveClientHostComposition(target);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-session.js","sourceRoot":"","sources":["../../src/acp/daemon-session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"daemon-session.js","sourceRoot":"","sources":["../../src/acp/daemon-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-registry.d.ts","sourceRoot":"","sources":["../../src/acp/session-registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,YAAY,EAAE,KAAK,kBAAkB,EAAE,KAAK,mBAAmB,EAAE,KAAK,kBAAkB,EAAE,KAAK,iBAAiB,EAAE,KAAK,aAAa,EAAE,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"session-registry.d.ts","sourceRoot":"","sources":["../../src/acp/session-registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,YAAY,EAAE,KAAK,kBAAkB,EAAE,KAAK,mBAAmB,EAAE,KAAK,kBAAkB,EAAE,KAAK,iBAAiB,EAAE,KAAK,aAAa,EAAE,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAKxN,OAAO,EAA0I,KAAK,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAKvM,MAAM,WAAW,yBAA0B,SAAQ,mBAAmB;IACpE,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACtD;AAaD,qBAAa,kBAAkB;;IAajB,QAAQ,CAAC,OAAO,EAAE,yBAAyB;gBAAlC,OAAO,GAAE,yBAA8B;IAI5D,UAAU,CAAC,YAAY,EAAE,kBAAkB,GAAG,IAAI;IAKlD,UAAU,CAAC,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAWrF,WAAW,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IA8D7F,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC;IA0B7E,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW9C,YAAY,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAQzE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CA4BzB"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { RequestError } from '@agentclientprotocol/sdk';
|
|
2
2
|
import { isAbsolute, resolve } from 'node:path';
|
|
3
3
|
import { readMessageDisplay } from '@felan-ai/session-protocol';
|
|
4
|
-
import {
|
|
4
|
+
import { watchDaemonBuildMismatch } from '../client/build-mismatch.js';
|
|
5
|
+
import { accepted, createDaemonClient, daemonRestartRecovery, DaemonRequestError, readCurrentDaemonHistory, readDaemonHistory, waitForDaemonRun } from './daemon-session.js';
|
|
5
6
|
import { ACP_UI_CAPABILITIES, AcpProtocolInteractions } from './protocol-interactions.js';
|
|
6
7
|
import { AcpProtocolUpdates } from './protocol-updates.js';
|
|
7
8
|
import { AcpToolCallIdRegistry, prepareAcpPrompt, sanitizeAcpErrorMessage } from './session-updates.js';
|
|
@@ -15,6 +16,7 @@ export class AcpSessionRegistry {
|
|
|
15
16
|
#client;
|
|
16
17
|
#connecting;
|
|
17
18
|
#unsubscribe;
|
|
19
|
+
#stopBuildMismatchWatch;
|
|
18
20
|
#disposed = false;
|
|
19
21
|
#disposePromise;
|
|
20
22
|
constructor(options = {}) {
|
|
@@ -56,6 +58,7 @@ export class AcpSessionRegistry {
|
|
|
56
58
|
if (!this.#client) {
|
|
57
59
|
this.#client = await createDaemonClient(this.options, 'acp', this.#supportsForms
|
|
58
60
|
? ['tool_approval', 'select', 'confirm', 'input', 'editor', 'form', 'dependency'] : ['tool_approval'], this.#supportsForms ? [...ACP_UI_CAPABILITIES] : ACP_UI_CAPABILITIES.filter(capability => capability !== 'ui.action'));
|
|
61
|
+
this.#stopBuildMismatchWatch = watchDaemonBuildMismatch(this.#client, daemonRestartRecovery(this.options.daemonRuntime), message => this.#writeDiagnostic(message));
|
|
59
62
|
this.#unsubscribe = this.#client.subscribe(() => this.#observe());
|
|
60
63
|
this.#connecting = this.#client.connect();
|
|
61
64
|
}
|
|
@@ -171,6 +174,7 @@ export class AcpSessionRegistry {
|
|
|
171
174
|
if (this.#disposePromise)
|
|
172
175
|
return this.#disposePromise;
|
|
173
176
|
this.#disposed = true;
|
|
177
|
+
this.#stopBuildMismatchWatch?.();
|
|
174
178
|
this.#unsubscribe?.();
|
|
175
179
|
for (const active of this.#sessions.values()) {
|
|
176
180
|
active.lifetime.abort();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-registry.js","sourceRoot":"","sources":["../../src/acp/session-registry.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session-registry.js","sourceRoot":"","sources":["../../src/acp/session-registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAkK,MAAM,0BAA0B,CAAC;AACxN,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAwB,MAAM,4BAA4B,CAAC;AACtF,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAEvE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,gBAAgB,EAA4B,MAAM,qBAAqB,CAAC;AACvM,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAiBxG,MAAM,OAAO,kBAAkB;IAaR;IAZZ,SAAS,GAAG,IAAI,GAAG,EAA4B,CAAC;IAChD,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9B,QAAQ,GAAG,IAAI,GAAG,EAAoB,CAAC;IACvC,gBAAgB,CAA4B;IACrD,cAAc,GAAG,KAAK,CAAC;IACvB,OAAO,CAA4B;IACnC,WAAW,CAA+B;IAC1C,YAAY,CAA2B;IACvC,uBAAuB,CAA2B;IAClD,SAAS,GAAG,KAAK,CAAC;IAClB,eAAe,CAA4B;IAE3C,YAAqB,UAAqC,EAAE;QAAvC,YAAO,GAAP,OAAO,CAAgC;QAC1D,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,eAAe,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,UAAU,CAAC,YAAgC;QACzC,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,IAAI,CAAC,cAAc,GAAG,YAAY,CAAC,WAAW,EAAE,IAAI,IAAI,IAAI,CAAC;IAC/D,CAAC;IAED,UAAU,CAAC,MAAyB,EAAE,MAAoB;QACxD,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;YAC5B,MAAM,GAAG,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;YAC3C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YACrC,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,GAAG,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;YAC9G,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;YAC3C,OAAO,EAAE,SAAS,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAA0B,EAAE,MAAoB;QAChE,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC;YAAE,MAAM,YAAY,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,EAAE,sCAAsC,CAAC,CAAC;QAC5L,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;YAC5B,IAAI,CAAC;gBAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,sBAAsB,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;gBAAC,OAAO,EAAE,CAAC;YAAC,CAAC;oBAC/G,CAAC;gBAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,cAAc;gBAC9E,CAAC,CAAC,CAAC,eAAe,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,EACrG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,KAAK,WAAW,CAAC,CAAC,CAAC;YACzH,IAAI,CAAC,uBAAuB,GAAG,wBAAwB,CAAC,IAAI,CAAC,OAAO,EAClE,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;YAChG,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YAClE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAC5C,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,OAAO;YAAE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACtF,MAAM,IAAI,CAAC,WAAW,CAAC;QACvB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,SAAiB,EAAE,GAAW,EAAE,MAAoB;QAChE,MAAM,MAAM,GAAG,IAAI,CAAC,OAAQ,CAAC;QAC7B,IAAI,MAAoC,CAAC;QACzC,IAAI,CAAC;YACH,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;YAC/F,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;gBAAE,MAAM,YAAY,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,kDAAkD,CAAC,CAAC;YAC7I,MAAM,GAAG,GAAG,IAAI,qBAAqB,EAAE,CAAC;YACxC,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC;YACvC,MAAM,OAAO,GAAG,IAAI,kBAAkB,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACvH,MAAM,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK;gBAC3E,YAAY,EAAE,IAAI,uBAAuB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,cAAc,EAC/F,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,EAC9D,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC;YACtI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACtC,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;YAC3E,IAAI,QAAQ,CAAC,MAAM,CAAC,OAAO;gBAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;YAC/E,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC;YACpB,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,MAAM,EAAE,CAAC;gBAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAAC,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;gBAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAAC,CAAC;YACvG,IAAI,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC;gBAAE,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YACpF,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,QAAQ;QACN,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO;gBAAE,SAAS;YAC9D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACjE,IAAI,UAAU,EAAE,KAAK,CAAC,MAAM,KAAK,MAAM,IAAI,UAAU,CAAC,KAAK,CAAC,QAAQ;gBAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACxH,MAAM,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC;QAClC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAAqB,EAAE,OAAqB;QACvD,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,CAAC,KAAK;YAAE,MAAM,YAAY,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,EAAE,0BAA0B,CAAC,CAAC;QAClH,IAAI,MAAM,CAAC,YAAY;YAAE,MAAM,YAAY,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,EAAE,qCAAqC,CAAC,CAAC;QACnI,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC/C,MAAM,CAAC,eAAe,GAAG,KAAK,CAAC;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,CAAC,YAAY,GAAG,OAAO,CAAC;QAC9B,IAAI,CAAC;YAAC,OAAO,MAAM,OAAO,CAAC;QAAC,CAAC;QAC7B,OAAO,KAAK,EAAE,CAAC;YAAC,MAAM,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAAC,CAAC;gBACxC,CAAC;YAAC,IAAI,MAAM,CAAC,YAAY,KAAK,OAAO,EAAE,CAAC;gBAAC,OAAO,MAAM,CAAC,YAAY,CAAC;gBAAC,OAAO,MAAM,CAAC,KAAK,CAAC;YAAC,CAAC;QAAC,CAAC;IACvG,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAwB,EAAE,IAAY;QACrD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAQ,CAAC;QAC7B,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACpG,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QACrB,IAAI,MAAM,CAAC,eAAe;YAAE,QAAQ,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAC/G,MAAM,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAChF,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACtG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,MAAM,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,MAAM,CAAC,eAAe;YAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC;QAC/D,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,SAAiB;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO;QACtD,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC;QAC9B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,CAAC;QAC7F,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC;gBAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,OAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;YAAC,CAAC;YAC3F,OAAO,KAAK,EAAE,CAAC;gBAAC,MAAM,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAED,YAAY,CAAC,MAA2B;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACxC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAAC,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QACrD,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,GAAG,QAAQ,CAAC,MAAM,IAAI,CAAC,OAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACzG,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,eAAe;YAAE,OAAO,IAAI,CAAC,eAAe,CAAC;QACtD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,uBAAuB,EAAE,EAAE,CAAC;QACjC,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;QACtB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC;YAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAAC,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAAC,CAAC;QACvG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACvB,wFAAwF;QACxF,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QACzC,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED,QAAQ,CAAC,OAAe;QACtB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM;YAAE,MAAM,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC1D,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,WAAW,KAAW,IAAI,IAAI,CAAC,SAAS;QAAE,MAAM,YAAY,CAAC,aAAa,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC;IAEhH,MAAM,CAAI,SAA2B;QACnC,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,GAAG,MAAM,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/E,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3B,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5F,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AAED,SAAS,sBAAsB,CAAC,MAAgE;IAC9F,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC;QAAE,MAAM,YAAY,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,EAAE,8BAA8B,CAAC,CAAC;IACnH,IAAI,MAAM,CAAC,qBAAqB,EAAE,MAAM;QAAE,MAAM,YAAY,CAAC,aAAa,CAAC,SAAS,EAAE,0CAA0C,CAAC,CAAC;IAClI,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,UAAU,CAAC,IAAY,EAAE,KAAa;IAC7C,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC;AACxI,CAAC;AAED,SAAS,UAAU,CAAC,QAAyB;IAC3C,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,KAAK,aAAa;QAAE,OAAO,WAAW,CAAC;IAC7D,MAAM,OAAO,GAAG,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;IACtG,MAAM,OAAO,GAAG,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACrD,IAAI,OAAO,EAAE,IAAI,KAAK,WAAW;QAAE,OAAO,UAAU,CAAC;IACrD,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,WAAW,CAAC;IACzD,IAAI,OAAO,CAAC,UAAU,KAAK,QAAQ;QAAE,OAAO,YAAY,CAAC;IACzD,IAAI,OAAO,CAAC,UAAU,KAAK,OAAO;QAAE,MAAM,YAAY,CAAC,aAAa,CAAC,SAAS,EAAE,uBAAuB,CAAC,OAAO,CAAC,YAAY,IAAI,sBAAsB,CAAC,CAAC,CAAC;IACzJ,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACtC,IAAI,KAAK,YAAY,YAAY;QAAE,OAAO,KAAK,CAAC;IAChD,IAAI,KAAK,YAAY,kBAAkB,EAAE,CAAC;QACxC,MAAM,IAAI,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC;QACtF,MAAM,OAAO,GAAG,uBAAuB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACvD,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,IAAI,KAAK,CAAC,IAAI,KAAK,yBAAyB;YAAE,OAAO,YAAY,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChI,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW;YAAE,OAAO,YAAY,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAChF,IAAI,CAAC,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,OAAO,YAAY,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1H,OAAO,YAAY,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,YAAY,CAAC,aAAa,CAAC,SAAS,EAAE,uBAAuB,CAAC,KAAK,CAAC,CAAC,CAAC;AAC/E,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { DaemonBuildMismatch, SessionClient } from './client.js';
|
|
2
|
+
export declare function formatDaemonBuildMismatch(mismatch: DaemonBuildMismatch, recovery: string): string;
|
|
3
|
+
export declare function watchDaemonBuildMismatch(client: Pick<SessionClient, 'status' | 'identity' | 'buildMismatch' | 'subscribe'>, recovery: string, warn: (message: string) => void): () => void;
|
|
4
|
+
//# sourceMappingURL=build-mismatch.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"build-mismatch.d.ts","sourceRoot":"","sources":["../../src/client/build-mismatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEtE,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKjG;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,UAAU,GAAG,eAAe,GAAG,WAAW,CAAC,EACzH,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,IAAI,CAe/D"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
export function formatDaemonBuildMismatch(mismatch, recovery) {
|
|
2
|
+
const difference = mismatch.expectedDaemonVersion && mismatch.daemonVersion !== mismatch.expectedDaemonVersion
|
|
3
|
+
? `Daemon ${mismatch.daemonVersion} is running; this installation expects ${mismatch.expectedDaemonVersion}.`
|
|
4
|
+
: `Daemon ${mismatch.daemonVersion} is running a different package/provider build from this installation.`;
|
|
5
|
+
return `${difference} ${recovery}`;
|
|
6
|
+
}
|
|
7
|
+
export function watchDaemonBuildMismatch(client, recovery, warn) {
|
|
8
|
+
let previous;
|
|
9
|
+
const check = () => {
|
|
10
|
+
if (client.status !== 'ready')
|
|
11
|
+
return;
|
|
12
|
+
const mismatch = client.buildMismatch;
|
|
13
|
+
if (!mismatch) {
|
|
14
|
+
previous = undefined;
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
17
|
+
const key = JSON.stringify([client.identity, mismatch.daemonVersion, mismatch.expectedDaemonVersion,
|
|
18
|
+
mismatch.composition, mismatch.expectedComposition]);
|
|
19
|
+
if (key === previous)
|
|
20
|
+
return;
|
|
21
|
+
previous = key;
|
|
22
|
+
warn(formatDaemonBuildMismatch(mismatch, recovery));
|
|
23
|
+
};
|
|
24
|
+
const unsubscribe = client.subscribe(check);
|
|
25
|
+
check();
|
|
26
|
+
return unsubscribe;
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=build-mismatch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"build-mismatch.js","sourceRoot":"","sources":["../../src/client/build-mismatch.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,yBAAyB,CAAC,QAA6B,EAAE,QAAgB;IACvF,MAAM,UAAU,GAAG,QAAQ,CAAC,qBAAqB,IAAI,QAAQ,CAAC,aAAa,KAAK,QAAQ,CAAC,qBAAqB;QAC5G,CAAC,CAAC,UAAU,QAAQ,CAAC,aAAa,0CAA0C,QAAQ,CAAC,qBAAqB,GAAG;QAC7G,CAAC,CAAC,UAAU,QAAQ,CAAC,aAAa,wEAAwE,CAAC;IAC7G,OAAO,GAAG,UAAU,IAAI,QAAQ,EAAE,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,MAAkF,EACzH,QAAgB,EAAE,IAA+B;IACjD,IAAI,QAA4B,CAAC;IACjC,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO;YAAE,OAAO;QACtC,MAAM,QAAQ,GAAG,MAAM,CAAC,aAAa,CAAC;QACtC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAAC,QAAQ,GAAG,SAAS,CAAC;YAAC,OAAO;QAAC,CAAC;QAChD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC,qBAAqB;YACjG,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC;QACvD,IAAI,GAAG,KAAK,QAAQ;YAAE,OAAO;QAC7B,QAAQ,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC;IACF,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC5C,KAAK,EAAE,CAAC;IACR,OAAO,WAAW,CAAC;AACrB,CAAC"}
|
package/dist/client/client.d.ts
CHANGED
|
@@ -20,6 +20,7 @@ export interface AttachmentState {
|
|
|
20
20
|
readonly id: string;
|
|
21
21
|
readonly session: string;
|
|
22
22
|
readonly requirePolicy?: 'acp-strict';
|
|
23
|
+
readonly sessionDir?: string;
|
|
23
24
|
readonly binding?: string;
|
|
24
25
|
readonly state: SessionState;
|
|
25
26
|
/** When the latest snapshot made this attachment live. */
|
|
@@ -53,6 +54,13 @@ export interface SessionClientOptions {
|
|
|
53
54
|
/** Receives connection and attachment transitions for troubleshooting; must not throw. */
|
|
54
55
|
diagnostics?: (event: ClientDiagnostic) => void;
|
|
55
56
|
}
|
|
57
|
+
export interface DaemonBuildMismatch {
|
|
58
|
+
readonly daemonVersion: string;
|
|
59
|
+
readonly expectedDaemonVersion?: string;
|
|
60
|
+
readonly composition?: Readonly<NonNullable<OperationResult<'hello'>['composition']>>;
|
|
61
|
+
readonly expectedComposition?: Readonly<NonNullable<SessionClientOptions['expectedComposition']>>;
|
|
62
|
+
readonly activeWork?: number;
|
|
63
|
+
}
|
|
56
64
|
export declare class SessionClient {
|
|
57
65
|
private readonly options;
|
|
58
66
|
readonly target: ResolvedDaemonTarget;
|
|
@@ -86,6 +94,7 @@ export declare class SessionClient {
|
|
|
86
94
|
private verifying;
|
|
87
95
|
private replacing;
|
|
88
96
|
private mismatchedWork;
|
|
97
|
+
private mismatchedBuild;
|
|
89
98
|
private negotiated;
|
|
90
99
|
private connectionState;
|
|
91
100
|
constructor(options: SessionClientOptions);
|
|
@@ -125,6 +134,7 @@ export declare class SessionClient {
|
|
|
125
134
|
} | undefined;
|
|
126
135
|
/** Active work on an incompatible daemon, when it could report it; restarting it would interrupt that work. */
|
|
127
136
|
get incompatibleActiveWork(): number | undefined;
|
|
137
|
+
get buildMismatch(): DaemonBuildMismatch | undefined;
|
|
128
138
|
getInteractions(options?: {
|
|
129
139
|
includeSessions?: boolean;
|
|
130
140
|
}): readonly Interaction[];
|
|
@@ -143,7 +153,7 @@ export declare class SessionClient {
|
|
|
143
153
|
replacing?: DaemonIdentity;
|
|
144
154
|
}): Promise<OperationResult<'hello'>>;
|
|
145
155
|
private connectShared;
|
|
146
|
-
/**
|
|
156
|
+
/** Only a fresh launch-capable client replaces an idle compatible build; established clients must not bounce a newer daemon. */
|
|
147
157
|
private open;
|
|
148
158
|
private openOnce;
|
|
149
159
|
private activeWork;
|
|
@@ -156,8 +166,9 @@ export declare class SessionClient {
|
|
|
156
166
|
private finish;
|
|
157
167
|
private receive;
|
|
158
168
|
private acceptInteraction;
|
|
159
|
-
attach(session: string,
|
|
169
|
+
attach(session: string, options?: {
|
|
160
170
|
requirePolicy?: 'acp-strict';
|
|
171
|
+
sessionDir?: string;
|
|
161
172
|
}): Promise<ResponseFor<'attach'>>;
|
|
162
173
|
retryAttach(session: string): Promise<ResponseFor<'attach'>>;
|
|
163
174
|
private restore;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"AAEA,OAAO,EAGgB,KAAK,cAAc,EAAE,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,KAAK,WAAW,EACrG,KAAK,SAAS,EAAE,KAAK,eAAe,EAAE,KAAK,eAAe,EAAE,KAAK,iBAAiB,EAAE,KAAK,QAAQ,EAAE,KAAK,WAAW,EACpH,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAA6D,KAAK,YAAY,EAAE,KAAK,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAElJ,OAAO,EAAqC,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AACpF,OAAO,EAAsC,KAAK,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACjH,OAAO,EAAwC,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAE/F,wBAAgB,YAAY,CAAC,GAAG,SAAa,GAAG,MAAM,CAQrD;AAED,MAAM,MAAM,YAAY,GACpB;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAClE;IAAE,MAAM,EAAE,UAAU,GAAG,UAAU,GAAG,eAAe,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAA;CAAE,CAAC;AAC3H,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,aAAa,CAAC,EAAE,YAAY,CAAC;IACtC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,0DAA0D;IAC1D,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,8CAA8C;IAC9C,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;CAClC;AACD,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,YAAY,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,gBAAgB,CAAC,CAAC;IACzI,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;IACvC,gBAAgB,CAAC,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,kBAAkB,CAAC,CAAC;IAChE,YAAY,CAAC,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC;IACxD,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,MAAM,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,cAAc,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACzG,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,4GAA4G;IAC5G,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,6FAA6F;IAC7F,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,0FAA0F;IAC1F,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAC;CACjD;AAiBD,qBAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"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"}
|
package/dist/client/client.js
CHANGED
|
@@ -52,12 +52,14 @@ export class SessionClient {
|
|
|
52
52
|
verifying;
|
|
53
53
|
replacing;
|
|
54
54
|
mismatchedWork;
|
|
55
|
+
mismatchedBuild;
|
|
55
56
|
negotiated;
|
|
56
57
|
connectionState = 'disconnected';
|
|
57
58
|
constructor(options) {
|
|
58
59
|
this.options = options;
|
|
59
60
|
this.options = { ...options, target: structuredClone(options.target),
|
|
60
61
|
...(options.launch ? { launch: structuredClone(options.launch) } : {}),
|
|
62
|
+
...(options.expectedComposition ? { expectedComposition: structuredClone(options.expectedComposition) } : {}),
|
|
61
63
|
interactionKinds: [...(options.interactionKinds ?? [])], capabilities: [...(options.capabilities ?? [])] };
|
|
62
64
|
this.target = resolveDaemonTarget(options.target);
|
|
63
65
|
if (options.expectedDaemonVersion !== undefined && (!options.expectedDaemonVersion || Buffer.byteLength(options.expectedDaemonVersion) > 128))
|
|
@@ -81,6 +83,7 @@ export class SessionClient {
|
|
|
81
83
|
get capabilities() { return this.negotiated && structuredClone(this.negotiated); }
|
|
82
84
|
/** Active work on an incompatible daemon, when it could report it; restarting it would interrupt that work. */
|
|
83
85
|
get incompatibleActiveWork() { return this.connectionState === 'incompatible' ? this.mismatchedWork : undefined; }
|
|
86
|
+
get buildMismatch() { return this.connectionState === 'ready' ? structuredClone(this.mismatchedBuild) : undefined; }
|
|
84
87
|
getInteractions(options = {}) {
|
|
85
88
|
const items = new Map(this.interactionNotifications);
|
|
86
89
|
if (options.includeSessions)
|
|
@@ -187,10 +190,11 @@ export class SessionClient {
|
|
|
187
190
|
this.connecting = this.open(launch).finally(() => { this.connecting = undefined; });
|
|
188
191
|
return this.connecting;
|
|
189
192
|
}
|
|
190
|
-
/**
|
|
193
|
+
/** Only a fresh launch-capable client replaces an idle compatible build; established clients must not bounce a newer daemon. */
|
|
191
194
|
async open(launch) {
|
|
195
|
+
const replaceIdleBuild = !this.established && launch && !!this.options.launch && !this.options.expected;
|
|
192
196
|
try {
|
|
193
|
-
return await this.openOnce(launch);
|
|
197
|
+
return await this.openOnce(launch, replaceIdleBuild);
|
|
194
198
|
}
|
|
195
199
|
catch (error) {
|
|
196
200
|
if (!launch || this.closed || this.connectionState !== 'incompatible' || this.mismatchedWork !== 0 || !this.options.launch || this.options.expected)
|
|
@@ -202,13 +206,14 @@ export class SessionClient {
|
|
|
202
206
|
await waitForDaemonStop(this, this.lifetime.signal);
|
|
203
207
|
this.pinned = undefined;
|
|
204
208
|
this.replacing = identity;
|
|
205
|
-
return this.openOnce(launch);
|
|
209
|
+
return this.openOnce(launch, false);
|
|
206
210
|
}
|
|
207
211
|
}
|
|
208
|
-
async openOnce(launch) {
|
|
212
|
+
async openOnce(launch, replaceIdleBuild) {
|
|
209
213
|
this.queuedInteractions = [];
|
|
210
214
|
this.queuedInteractionBytes = 0;
|
|
211
215
|
this.mismatchedWork = undefined;
|
|
216
|
+
this.mismatchedBuild = undefined;
|
|
212
217
|
// Only an explicit expected identity or this attempt's launch receipt pins the instance; an unpinned client follows daemon restarts.
|
|
213
218
|
this.verifying = this.options.expected && structuredClone(this.options.expected);
|
|
214
219
|
this.connectionState = 'connecting';
|
|
@@ -270,14 +275,25 @@ export class SessionClient {
|
|
|
270
275
|
const result = hello.result;
|
|
271
276
|
assertTargetIdentity(this.target, this.verifying ?? result.identity, result.identity);
|
|
272
277
|
this.pinned = structuredClone(result.identity);
|
|
278
|
+
const expectedComposition = this.options.expectedComposition;
|
|
273
279
|
const versionDiffers = !!this.options.expectedDaemonVersion && result.daemonVersion !== this.options.expectedDaemonVersion;
|
|
274
|
-
|
|
275
|
-
||
|
|
276
|
-
||
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
280
|
+
const buildDiffers = versionDiffers || expectedComposition && (expectedComposition.managerPackage !== result.composition?.managerPackage
|
|
281
|
+
|| expectedComposition.managerVersion !== result.composition?.managerVersion
|
|
282
|
+
|| expectedComposition.providerDigest !== result.composition?.providerDigest);
|
|
283
|
+
if (buildDiffers) {
|
|
284
|
+
const work = await this.activeWork(result.operations);
|
|
285
|
+
if (this.closed || epoch !== this.epoch)
|
|
286
|
+
throw new Error('Connection was superseded');
|
|
287
|
+
if (versionDiffers && replaceIdleBuild && work === 0) {
|
|
288
|
+
this.mismatchedWork = work;
|
|
289
|
+
this.connectionState = 'incompatible';
|
|
290
|
+
throw new Error('Daemon version differs from the installed package; restart it to continue.');
|
|
291
|
+
}
|
|
292
|
+
this.mismatchedBuild = { daemonVersion: result.daemonVersion,
|
|
293
|
+
...(this.options.expectedDaemonVersion ? { expectedDaemonVersion: this.options.expectedDaemonVersion } : {}),
|
|
294
|
+
...(result.composition ? { composition: structuredClone(result.composition) } : {}),
|
|
295
|
+
...(expectedComposition ? { expectedComposition: structuredClone(expectedComposition) } : {}),
|
|
296
|
+
...(work === undefined ? {} : { activeWork: work }) };
|
|
281
297
|
}
|
|
282
298
|
this.negotiated = structuredClone(result);
|
|
283
299
|
for (const interaction of this.queuedInteractions)
|
|
@@ -303,6 +319,7 @@ export class SessionClient {
|
|
|
303
319
|
return structuredClone(result);
|
|
304
320
|
}
|
|
305
321
|
catch (error) {
|
|
322
|
+
this.mismatchedBuild = undefined;
|
|
306
323
|
this.diagnose({ event: 'connection.failed', error: diagnosticText(error) });
|
|
307
324
|
const status = this.connectionState;
|
|
308
325
|
// An established client that will retry stays disconnected so observers do not treat a daemon restart as fatal.
|
|
@@ -520,12 +537,12 @@ export class SessionClient {
|
|
|
520
537
|
if (this.interactionNotifications.size > LIMITS.pageEntries)
|
|
521
538
|
throw new Error('Interaction notification limit exceeded');
|
|
522
539
|
}
|
|
523
|
-
async attach(session,
|
|
540
|
+
async attach(session, options = {}) {
|
|
524
541
|
if (this.connectionState !== 'ready')
|
|
525
542
|
throw new Error('Connect before attaching');
|
|
526
543
|
if (this.attachments.has(session))
|
|
527
544
|
throw new Error('Session already attached');
|
|
528
|
-
const attachment = { id: randomUUID(), session, ...
|
|
545
|
+
const attachment = { id: randomUUID(), session, ...options, state: createSessionState(session) };
|
|
529
546
|
this.attachments.set(session, attachment);
|
|
530
547
|
const response = await this.restore(session, 'attach');
|
|
531
548
|
if (response.outcome === 'rejected' && this.attachments.get(session)?.id === attachment.id)
|
|
@@ -554,7 +571,8 @@ export class SessionClient {
|
|
|
554
571
|
this.attachments.set(session, { ...attachment, state: { ...attachment.state, status: 'awaiting_snapshot' } });
|
|
555
572
|
const started = Date.now();
|
|
556
573
|
const response = await this.exchange('attach', { expected: this.pinned,
|
|
557
|
-
...(attachment.requirePolicy ? { requirePolicy: attachment.requirePolicy } : {})
|
|
574
|
+
...(attachment.requirePolicy ? { requirePolicy: attachment.requirePolicy } : {}),
|
|
575
|
+
...(attachment.sessionDir !== undefined ? { sessionDir: attachment.sessionDir } : {}) }, session, undefined, true);
|
|
558
576
|
this.diagnoseAttach(session, trigger, response, Date.now() - started);
|
|
559
577
|
if (this.closed || epoch !== this.epoch || this.attachments.get(session)?.id !== attachment.id)
|
|
560
578
|
return response;
|
|
@@ -661,6 +679,7 @@ export class SessionClient {
|
|
|
661
679
|
return;
|
|
662
680
|
this.diagnose({ event: 'connection.lost', reason, ...(error === undefined ? {} : { error: diagnosticText(error) }) });
|
|
663
681
|
const wasReady = this.connectionState === 'ready';
|
|
682
|
+
this.mismatchedBuild = undefined;
|
|
664
683
|
++this.epoch;
|
|
665
684
|
const transport = this.transport;
|
|
666
685
|
this.transport = undefined;
|
|
@@ -775,6 +794,7 @@ export class SessionClient {
|
|
|
775
794
|
this.closed = true;
|
|
776
795
|
this.connectionState = 'closed';
|
|
777
796
|
++this.epoch;
|
|
797
|
+
this.mismatchedBuild = undefined;
|
|
778
798
|
this.lifetime.abort();
|
|
779
799
|
this.interactionNotifications.clear();
|
|
780
800
|
this.presentationSequences.clear();
|