@abelxiaoxing/cadence 2.1.11 → 2.1.13
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/docs/conversation-mode.md +1 -1
- package/docs/service-management.md +6 -4
- package/package.json +1 -1
- package/src/cadence-mode.ts +1 -1
- package/src/native-build.ts +1 -1
- package/src/service/contracts/workbench.ts +6 -2
- package/src/service-client.ts +5 -1
- package/src/service-host.mjs +100 -39
- package/web/dist/assets/cadence.css +1 -1
- package/web/dist/assets/cadence.js +16 -16
- package/web/dist/manifest.json +7 -7
|
@@ -303,7 +303,7 @@ A revision may also change the assignments that have not started yet (drop, rewr
|
|
|
303
303
|
The unified WebUI sidebar automatically lists active work in this account and state home, including projects you have never selected.
|
|
304
304
|
An interactive terminal must load the Cadence extension: a real model/tool round appears even without `/cadence`, but an idle terminal or idle owner does not.
|
|
305
305
|
Terminal rounds are observe-only; owner turns and workflows retain their actual queue, execution, recovery and settlement phases and existing authorized controls.
|
|
306
|
-
|
|
306
|
+
Separate terminal instances and owner work keep their own rows; work already shown under **Running work** is not repeated.
|
|
307
307
|
|
|
308
308
|
Click an activity to remember its directory and read the shared Pi session at the observed branch.
|
|
309
309
|
This does not start or associate an owner, grant execution consent or expand workbench Stop.
|
|
@@ -107,7 +107,7 @@ Install and restart print the private entry link once the owner answers; the JSO
|
|
|
107
107
|
A successful manager start request is not owner readiness: an unready owner reports `quarantined` or `unconfirmed`, retains the separate `managerStatus`, exits nonzero and names `cadence doctor`.
|
|
108
108
|
Status also retains the manager's `active`/`activating`/`failed` observation separately.
|
|
109
109
|
A definition whose project directory was removed gets a readable refusal (exit78, so the unit does not restart in a loop); `cadence server install` switches it to the workbench.
|
|
110
|
-
`restart` rewrites an existing definition with the current Node and package paths, keeping its workspace and the user's disable choices, and starts it; run it after an npm upgrade
|
|
110
|
+
`restart` rewrites an existing definition with the current Node and package paths, keeping its workspace and the user's disable choices, and starts it; run it after an npm upgrade or a Node change.
|
|
111
111
|
The `upgrade` command (Linux) installs the latest version, or exactly `--to VERSION`, with the detected installation's package manager and restarts; see [Restart and upgrade from the WebUI](#restart-and-upgrade-from-the-webui) for its steps.
|
|
112
112
|
Commands that change the service (`install`, `restart`, `stop`, `uninstall`, `upgrade`) refuse with `inside-service` when they run inside the service they would stop, for example from a tool of its own agent: stopping a systemd unit ends every process in it, so the command would die before it started the service again.
|
|
113
113
|
Use the WebUI or a terminal outside the service instead.
|
|
@@ -335,9 +335,11 @@ At sign-out or shutdown Windows ends the owner without orderly Stop: running wor
|
|
|
335
335
|
The conversation model picker offers every thinking level the pinned SDK supports for a model, `off` through `xhigh` and `max`; a model whose `thinkingLevelMap` maps only `max` (as some DeepSeek configurations do) is chosen at `max`, and a child runs only at exactly that level.
|
|
336
336
|
A model whose provider or model ID contains a known credential value is withheld from the catalog, since showing the ID would reveal that value; the catalog says how many models are withheld, and the rest stay selectable.
|
|
337
337
|
Credential values are `auth.json` keys, `models.json` `apiKey` and header values (and the variables they name) and service-environment variables whose names contain `KEY`, `TOKEN`, `SECRET`, `PASS`, `AUTH` or `COOKIE`.
|
|
338
|
-
The common Ollama placeholder `"apiKey": "ollama"` under a provider named `ollama` is such a case: give the placeholder a value that matches no provider or model ID (for example `"local-no-auth"`), then
|
|
339
|
-
|
|
340
|
-
|
|
338
|
+
The common Ollama placeholder `"apiKey": "ollama"` under a provider named `ollama` is such a case: give the placeholder a value that matches no provider or model ID (for example `"local-no-auth"`), then reopen the model picker.
|
|
339
|
+
Opening the conversation model picker reads `models.json` again without restarting the service.
|
|
340
|
+
An invalid edit refuses that read; fix the file and reopen the picker.
|
|
341
|
+
There is no background reload or message replay.
|
|
342
|
+
Saved preferences remain; execution still verifies its pinned model.
|
|
341
343
|
- A foreground owner can be managed from another terminal.
|
|
342
344
|
Ctrl-C, SIGTERM, machine crash or terminal destruction is **not** the authenticated orderly Stop route: running work is interrupted, and the next start recovers the owner automatically.
|
|
343
345
|
A recovered `stopped` registration records that the old owner was proven gone, not that its interrupted work completed.
|
package/package.json
CHANGED
package/src/cadence-mode.ts
CHANGED
|
@@ -1347,7 +1347,7 @@ export function registerCadenceMode(pi: ExtensionAPI): void {
|
|
|
1347
1347
|
// Preference selection must never block observation/cancellation or the picker.
|
|
1348
1348
|
await connect(ctx, false);
|
|
1349
1349
|
current();
|
|
1350
|
-
const catalog = value(await client().models(undefined, location));
|
|
1350
|
+
const catalog = value(await client().models(undefined, location, true));
|
|
1351
1351
|
current();
|
|
1352
1352
|
const models = catalog.entries.filter(
|
|
1353
1353
|
(m) => m.eligibility === "candidate" && m.api,
|
package/src/native-build.ts
CHANGED
|
@@ -100,7 +100,10 @@ export type WorkbenchRead =
|
|
|
100
100
|
offset: number;
|
|
101
101
|
}
|
|
102
102
|
| {
|
|
103
|
-
kind:
|
|
103
|
+
kind:
|
|
104
|
+
| "conversation-context"
|
|
105
|
+
| "conversation-models"
|
|
106
|
+
| "reload-conversation-models";
|
|
104
107
|
location: ConversationLocation;
|
|
105
108
|
}
|
|
106
109
|
| { kind: "cadence-conversation"; id: string }
|
|
@@ -690,7 +693,7 @@ export type WorkbenchResult =
|
|
|
690
693
|
| { kind: "accepted"; commandId: string }
|
|
691
694
|
| { kind: "project"; commandId: string; path: string; link: string };
|
|
692
695
|
export interface WorkbenchPort {
|
|
693
|
-
read(request: WorkbenchRead): WorkbenchResult
|
|
696
|
+
read(request: WorkbenchRead): WorkbenchResult | Promise<WorkbenchResult>;
|
|
694
697
|
command(
|
|
695
698
|
request: WorkbenchCommand,
|
|
696
699
|
caller?: {
|
|
@@ -713,6 +716,7 @@ export function decodeWorkbenchRead(v: unknown): WorkbenchRead {
|
|
|
713
716
|
const kind = Object.getOwnPropertyDescriptor(v ?? {}, "kind")?.value;
|
|
714
717
|
switch (kind) {
|
|
715
718
|
case "conversation-context":
|
|
719
|
+
case "reload-conversation-models":
|
|
716
720
|
case "conversation-models": {
|
|
717
721
|
const o = closed(v, ["kind", "location"]);
|
|
718
722
|
return { kind, location: decodeConversationLocation(o.location) };
|
package/src/service-client.ts
CHANGED
|
@@ -233,11 +233,15 @@ export class ServiceClient {
|
|
|
233
233
|
async models(
|
|
234
234
|
signal?: AbortSignal,
|
|
235
235
|
location?: ConversationLocation,
|
|
236
|
+
reload = false,
|
|
236
237
|
): Promise<Reply<ModelCatalog>> {
|
|
237
238
|
try {
|
|
238
239
|
if (location) {
|
|
239
240
|
const reply = await this.workbenchRead(
|
|
240
|
-
{
|
|
241
|
+
{
|
|
242
|
+
kind: reload ? "reload-conversation-models" : "conversation-models",
|
|
243
|
+
location,
|
|
244
|
+
},
|
|
241
245
|
signal,
|
|
242
246
|
);
|
|
243
247
|
if (reply.kind === "error") return reply;
|
package/src/service-host.mjs
CHANGED
|
@@ -6343,6 +6343,7 @@ function decodeWorkbenchRead(v) {
|
|
|
6343
6343
|
const kind = Object.getOwnPropertyDescriptor(v ?? {}, "kind")?.value;
|
|
6344
6344
|
switch (kind) {
|
|
6345
6345
|
case "conversation-context":
|
|
6346
|
+
case "reload-conversation-models":
|
|
6346
6347
|
case "conversation-models": {
|
|
6347
6348
|
const o = closed(v, ["kind", "location"]);
|
|
6348
6349
|
return { kind, location: decodeConversationLocation(o.location) };
|
|
@@ -15911,7 +15912,7 @@ class ConversationContexts {
|
|
|
15911
15912
|
epoch: owner.epoch,
|
|
15912
15913
|
accessGeneration: owner.accessGeneration,
|
|
15913
15914
|
configRev: context.revision + 1,
|
|
15914
|
-
catalogId: conversationIdentity(`cadence-context-version:${canonicalJson([this.seed, context, selected2?.sourceSelectionId ?? null])}`),
|
|
15915
|
+
catalogId: conversationIdentity(`cadence-context-version:${canonicalJson([this.seed, this.o.models.catalogGeneration ?? 0, context, selected2?.sourceSelectionId ?? null])}`),
|
|
15915
15916
|
conversation: { id: context.id, cwd: context.cwd }
|
|
15916
15917
|
}
|
|
15917
15918
|
};
|
|
@@ -15921,7 +15922,7 @@ class ConversationContexts {
|
|
|
15921
15922
|
const { context } = this.records.read(location);
|
|
15922
15923
|
const catalog = this.o.models.catalog();
|
|
15923
15924
|
if (before.selected)
|
|
15924
|
-
this.o.models.assertCurrent(before.selected);
|
|
15925
|
+
this.o.models.assertCurrent(before.selected, "installed");
|
|
15925
15926
|
if (canonicalJson(before) !== canonicalJson(this.snapshot(location)))
|
|
15926
15927
|
throw new ContractError("stale");
|
|
15927
15928
|
let remembered = context.model;
|
|
@@ -17058,7 +17059,7 @@ Content-Length: 0\r
|
|
|
17058
17059
|
unavailable();
|
|
17059
17060
|
return {
|
|
17060
17061
|
kind: "ok",
|
|
17061
|
-
value: a.workbench.read(decodeWorkbenchRead(input))
|
|
17062
|
+
value: await a.workbench.read(decodeWorkbenchRead(input))
|
|
17062
17063
|
};
|
|
17063
17064
|
case "workbenchCommand": {
|
|
17064
17065
|
if (!a.workbench)
|
|
@@ -17638,7 +17639,7 @@ async function createGateway(value, hostUrl, source) {
|
|
|
17638
17639
|
const input = decodeGatewayInput(value), store = new GatewayStore(input.serverConfig, input.stateHome);
|
|
17639
17640
|
const web = loadWebAssets(source?.webDirectory);
|
|
17640
17641
|
const build2 = {
|
|
17641
|
-
contractHash: "
|
|
17642
|
+
contractHash: "103e212eee402600c29002528ccc3808b6fbe11ccee275a4d5f2a3d52576c520",
|
|
17642
17643
|
assets: {
|
|
17643
17644
|
sourceHash: web.manifest.sourceHash,
|
|
17644
17645
|
contractHash: web.manifest.contractHash,
|
|
@@ -29584,11 +29585,13 @@ class OwnerModelChoice {
|
|
|
29584
29585
|
revision;
|
|
29585
29586
|
catalogId = randomUUID23();
|
|
29586
29587
|
installing = false;
|
|
29588
|
+
generation;
|
|
29587
29589
|
constructor(options) {
|
|
29588
29590
|
this.options = options;
|
|
29589
29591
|
if (choiceOwners.has(options.owner))
|
|
29590
29592
|
throw new ContractError("conflict");
|
|
29591
29593
|
this.revision = 1;
|
|
29594
|
+
this.generation = options.models.catalogGeneration;
|
|
29592
29595
|
if (!Number.isSafeInteger(this.revision))
|
|
29593
29596
|
throw new ContractError("capacity");
|
|
29594
29597
|
choiceOwners.add(options.owner);
|
|
@@ -29596,6 +29599,11 @@ class OwnerModelChoice {
|
|
|
29596
29599
|
snapshot() {
|
|
29597
29600
|
this.options.owner.lease.assert();
|
|
29598
29601
|
this.options.access.assertCurrent();
|
|
29602
|
+
if (this.generation !== this.options.models.catalogGeneration) {
|
|
29603
|
+
this.generation = this.options.models.catalogGeneration;
|
|
29604
|
+
this.selection = null;
|
|
29605
|
+
this.catalogId = randomUUID23();
|
|
29606
|
+
}
|
|
29599
29607
|
return decodeModelChoiceState({
|
|
29600
29608
|
version: {
|
|
29601
29609
|
epoch: this.options.owner.lease.registration.epoch,
|
|
@@ -29610,7 +29618,7 @@ class OwnerModelChoice {
|
|
|
29610
29618
|
const before = this.snapshot();
|
|
29611
29619
|
const catalog = this.options.models.catalog();
|
|
29612
29620
|
if (before.selected)
|
|
29613
|
-
this.options.models.assertCurrent(before.selected);
|
|
29621
|
+
this.options.models.assertCurrent(before.selected, "installed");
|
|
29614
29622
|
if (canonicalJson(before) !== canonicalJson(this.snapshot()))
|
|
29615
29623
|
throw new ContractError("stale");
|
|
29616
29624
|
let remembered = null;
|
|
@@ -30089,6 +30097,11 @@ class OwnerModelContext {
|
|
|
30089
30097
|
#loading = false;
|
|
30090
30098
|
#tail = Promise.resolve();
|
|
30091
30099
|
#generation = 0;
|
|
30100
|
+
#reload;
|
|
30101
|
+
#previousLiterals = [];
|
|
30102
|
+
get catalogGeneration() {
|
|
30103
|
+
return this.#generation;
|
|
30104
|
+
}
|
|
30092
30105
|
constructor(options) {
|
|
30093
30106
|
this.#options = options;
|
|
30094
30107
|
this.#launch = captureEnvironment(options.environment);
|
|
@@ -30107,11 +30120,11 @@ class OwnerModelContext {
|
|
|
30107
30120
|
...entry.selection
|
|
30108
30121
|
}));
|
|
30109
30122
|
}
|
|
30110
|
-
assertCurrent(selection) {
|
|
30123
|
+
assertCurrent(selection, source = "disk") {
|
|
30111
30124
|
const selected2 = this.#selected.get(selection.sourceSelectionId);
|
|
30112
30125
|
if (!selected2 || canonicalSelection(selected2.selection) !== canonicalSelection(selection))
|
|
30113
30126
|
throw new ContractError("stale");
|
|
30114
|
-
this.fresh(selected2);
|
|
30127
|
+
this.fresh(selected2, false, source === "installed" ? this.catalogSource(true) : undefined);
|
|
30115
30128
|
}
|
|
30116
30129
|
redactionLiterals(selection) {
|
|
30117
30130
|
const selected2 = this.#selected.get(selection.sourceSelectionId);
|
|
@@ -30143,20 +30156,26 @@ class OwnerModelContext {
|
|
|
30143
30156
|
throw new ContractError("oversize");
|
|
30144
30157
|
return [...new Set(literals)];
|
|
30145
30158
|
}
|
|
30146
|
-
viewRedactionLiterals() {
|
|
30147
|
-
|
|
30159
|
+
viewRedactionLiterals(source = "installed") {
|
|
30160
|
+
this.#options.owner.lease.assert();
|
|
30161
|
+
if (!this.#source || !this.#snapshot)
|
|
30162
|
+
throw new ContractError("unavailable");
|
|
30163
|
+
const current2 = source === "text" ? readPiSnapshot(this.#source) : undefined;
|
|
30164
|
+
const { auth, credentials } = current2 ?? readPiAuth(this.#source);
|
|
30165
|
+
const installed = snapshotLiterals({ ...this.#snapshot, auth, credentials }, this.#launch, [...this.#previousLiterals, ...this.#options.network?.literals ?? []]);
|
|
30166
|
+
return current2 && !sameModels(current2, this.#snapshot) ? snapshotLiterals(current2, this.#launch, installed) : installed;
|
|
30148
30167
|
}
|
|
30149
30168
|
get loading() {
|
|
30150
30169
|
return this.#loading;
|
|
30151
30170
|
}
|
|
30152
30171
|
catalog() {
|
|
30153
30172
|
try {
|
|
30154
|
-
const current2 = this.catalogSource();
|
|
30173
|
+
const current2 = this.catalogSource(true);
|
|
30155
30174
|
const runtime = this.#runtime;
|
|
30156
30175
|
if (!runtime || !this.#thinking)
|
|
30157
30176
|
throw new ContractError("unavailable");
|
|
30158
30177
|
const catalog = projectModelCatalog(runtime, this.#thinking, current2, this.catalogLiterals(current2), (input, snapshot) => this.validateModel(input, snapshot));
|
|
30159
|
-
const after = this.catalogSource();
|
|
30178
|
+
const after = this.catalogSource(true);
|
|
30160
30179
|
if (after.auth.identity !== current2.auth.identity || after.auth.stamp !== current2.auth.stamp)
|
|
30161
30180
|
throw new ContractError("stale");
|
|
30162
30181
|
return catalog;
|
|
@@ -30164,23 +30183,67 @@ class OwnerModelContext {
|
|
|
30164
30183
|
throw new ContractError(error instanceof ContractError ? error.code : "corrupt-selected");
|
|
30165
30184
|
}
|
|
30166
30185
|
}
|
|
30167
|
-
catalogSource() {
|
|
30186
|
+
catalogSource(installedOnly = false) {
|
|
30168
30187
|
this.alive();
|
|
30169
|
-
return this.readCatalogSource();
|
|
30170
|
-
}
|
|
30171
|
-
readCatalogSource() {
|
|
30172
|
-
this.#options.owner.lease.assert();
|
|
30173
30188
|
if (this.#loading || !this.#runtime || !this.#snapshot || !this.#source || !this.#thinking)
|
|
30174
30189
|
throw new ContractError("unavailable");
|
|
30175
30190
|
if (this.#runtime.getError())
|
|
30176
30191
|
throw new ContractError("corrupt-selected");
|
|
30192
|
+
if (installedOnly)
|
|
30193
|
+
return { ...this.#snapshot, ...readPiAuth(this.#source) };
|
|
30177
30194
|
const current2 = readPiSnapshot(this.#source);
|
|
30178
30195
|
if (!sameModels(this.#snapshot, current2))
|
|
30179
30196
|
throw new ContractError("stale");
|
|
30180
30197
|
return current2;
|
|
30181
30198
|
}
|
|
30182
30199
|
catalogLiterals(snapshot) {
|
|
30183
|
-
return snapshotLiterals(snapshot, this.#launch, this.#options.network?.literals
|
|
30200
|
+
return snapshotLiterals(snapshot, this.#launch, this.#options.network?.literals);
|
|
30201
|
+
}
|
|
30202
|
+
async reloadCatalog() {
|
|
30203
|
+
this.alive();
|
|
30204
|
+
if (this.#reload)
|
|
30205
|
+
return this.#reload;
|
|
30206
|
+
const source = this.#source, installed = this.#snapshot;
|
|
30207
|
+
if (!source || !installed || this.#loading)
|
|
30208
|
+
throw new ContractError("unavailable");
|
|
30209
|
+
const before = readPiSnapshot(source);
|
|
30210
|
+
if (sameModels(installed, before))
|
|
30211
|
+
return;
|
|
30212
|
+
this.#reload = (async () => {
|
|
30213
|
+
const runtime = await this.createRuntime(source);
|
|
30214
|
+
this.alive();
|
|
30215
|
+
const after = readPiSnapshot(source);
|
|
30216
|
+
if (!sameModels(before, after) || before.auth.stamp !== after.auth.stamp || before.auth.identity !== after.auth.identity || this.#snapshot !== installed)
|
|
30217
|
+
throw new ContractError("stale");
|
|
30218
|
+
const previous = snapshotLiterals(installed, this.#launch, this.#previousLiterals);
|
|
30219
|
+
snapshotLiterals(after, this.#launch, previous);
|
|
30220
|
+
this.#previousLiterals = previous;
|
|
30221
|
+
this.#runtime = runtime;
|
|
30222
|
+
this.#snapshot = after;
|
|
30223
|
+
this.#selected.clear();
|
|
30224
|
+
this.#retained.clear();
|
|
30225
|
+
++this.#generation;
|
|
30226
|
+
})();
|
|
30227
|
+
try {
|
|
30228
|
+
await this.#reload;
|
|
30229
|
+
} finally {
|
|
30230
|
+
this.#reload = undefined;
|
|
30231
|
+
}
|
|
30232
|
+
}
|
|
30233
|
+
async createRuntime(source) {
|
|
30234
|
+
const { ModelRuntime } = await import("@earendil-works/pi-coding-agent");
|
|
30235
|
+
const { InMemoryModelsStore } = await import("@earendil-works/pi-ai");
|
|
30236
|
+
const runtime = await ModelRuntime.create({
|
|
30237
|
+
authPath: source.authPath,
|
|
30238
|
+
modelsPath: source.modelsPath,
|
|
30239
|
+
modelsStore: new InMemoryModelsStore,
|
|
30240
|
+
allowModelNetwork: false,
|
|
30241
|
+
refreshOnCreate: false
|
|
30242
|
+
});
|
|
30243
|
+
const refused2 = runtime.getError();
|
|
30244
|
+
if (refused2)
|
|
30245
|
+
throw sdkRefusal(refused2);
|
|
30246
|
+
return runtime;
|
|
30184
30247
|
}
|
|
30185
30248
|
replaceSelection(input, beforeInstall) {
|
|
30186
30249
|
this.#options.owner.assertQuiescent();
|
|
@@ -30227,7 +30290,7 @@ class OwnerModelContext {
|
|
|
30227
30290
|
}
|
|
30228
30291
|
async load() {
|
|
30229
30292
|
this.alive();
|
|
30230
|
-
if (this.#loading || this.#pending)
|
|
30293
|
+
if (this.#loading || this.#pending || this.#reload)
|
|
30231
30294
|
throw new ContractError("capacity");
|
|
30232
30295
|
const existing = runtimeOwners.get(this.#options.owner);
|
|
30233
30296
|
if (existing && existing !== this)
|
|
@@ -30243,26 +30306,16 @@ class OwnerModelContext {
|
|
|
30243
30306
|
const source = piSource(this.#options.agentDir, this.#options.home, this.#options.cwd, this.#launch);
|
|
30244
30307
|
const before = readPiSnapshot(source);
|
|
30245
30308
|
const pi = await import("@earendil-works/pi-coding-agent");
|
|
30246
|
-
const {
|
|
30247
|
-
const { InMemoryModelsStore, getSupportedThinkingLevels } = await import("@earendil-works/pi-ai");
|
|
30309
|
+
const { getSupportedThinkingLevels } = await import("@earendil-works/pi-ai");
|
|
30248
30310
|
if (this.#options.network)
|
|
30249
30311
|
await this.#options.network.initialize();
|
|
30250
30312
|
this.alive();
|
|
30251
30313
|
const ready2 = readPiSnapshot(source);
|
|
30252
30314
|
if (ready2.auth.identity !== before.auth.identity || !sameModels(before, ready2))
|
|
30253
30315
|
throw new ContractError("stale");
|
|
30254
|
-
const runtime = await
|
|
30255
|
-
authPath: source.authPath,
|
|
30256
|
-
modelsPath: source.modelsPath,
|
|
30257
|
-
modelsStore: new InMemoryModelsStore,
|
|
30258
|
-
allowModelNetwork: false,
|
|
30259
|
-
refreshOnCreate: false
|
|
30260
|
-
});
|
|
30316
|
+
const runtime = await this.createRuntime(source);
|
|
30261
30317
|
this.alive();
|
|
30262
30318
|
const after = readPiSnapshot(source);
|
|
30263
|
-
const refused2 = runtime.getError();
|
|
30264
|
-
if (refused2)
|
|
30265
|
-
throw sdkRefusal(refused2);
|
|
30266
30319
|
if (after.auth.identity !== ready2.auth.identity || !sameModels(ready2, after))
|
|
30267
30320
|
throw new ContractError("stale");
|
|
30268
30321
|
this.#source = source;
|
|
@@ -30325,11 +30378,13 @@ class OwnerModelContext {
|
|
|
30325
30378
|
throw new ContractError("unavailable");
|
|
30326
30379
|
return validateCatalogModel(this.#runtime, this.#thinking, input, current2, this.#launch, this.catalogLiterals(current2));
|
|
30327
30380
|
}
|
|
30328
|
-
fresh(selected2, resolvingOAuth = false) {
|
|
30381
|
+
fresh(selected2, resolvingOAuth = false, installed) {
|
|
30329
30382
|
this.alive();
|
|
30383
|
+
if (this.#selected.get(selected2.selection.sourceSelectionId) !== selected2)
|
|
30384
|
+
throw new ContractError("stale");
|
|
30330
30385
|
if (!this.#source || !this.#snapshot || !this.#runtime)
|
|
30331
30386
|
throw new ContractError("unavailable");
|
|
30332
|
-
const snapshot = readPiSnapshot(this.#source);
|
|
30387
|
+
const snapshot = installed ?? readPiSnapshot(this.#source);
|
|
30333
30388
|
if (this.#runtime.getError() || this.#runtime.getRegisteredNativeProvider(selected2.selection.provider) || this.#runtime.getRegisteredProviderConfig(selected2.selection.provider))
|
|
30334
30389
|
throw new ContractError("stale");
|
|
30335
30390
|
const model2 = this.#runtime.getModel(selected2.selection.provider, selected2.selection.model);
|
|
@@ -35278,8 +35333,8 @@ function workflowResultDetail(value, secrets) {
|
|
|
35278
35333
|
var runtimeSummary = (runtime) => `${describeWorkerRuntime(runtime)}
|
|
35279
35334
|
${RUN_ENVIRONMENT_POLICY}`;
|
|
35280
35335
|
var OWNER_RUNTIME = Object.freeze({
|
|
35281
|
-
version: "2.1.
|
|
35282
|
-
build: "
|
|
35336
|
+
version: "2.1.13",
|
|
35337
|
+
build: "76dee9ed5af2b1aa3aa9dad7bc8e3a0c97fc19729bf31b3eb3c63b4094f5db79",
|
|
35283
35338
|
entry: fileURLToPath7(import.meta.url),
|
|
35284
35339
|
pid: process.pid,
|
|
35285
35340
|
node: process.versions.node,
|
|
@@ -37879,6 +37934,12 @@ class Workbench {
|
|
|
37879
37934
|
kind: request3.kind,
|
|
37880
37935
|
context: this.contexts.records.read(request3.location).context
|
|
37881
37936
|
};
|
|
37937
|
+
case "reload-conversation-models":
|
|
37938
|
+
this.contexts.records.read(request3.location);
|
|
37939
|
+
return this.o.models.reloadCatalog().then(() => ({
|
|
37940
|
+
kind: "conversation-models",
|
|
37941
|
+
catalog: this.contexts.catalog(request3.location)
|
|
37942
|
+
}));
|
|
37882
37943
|
case "conversation-models":
|
|
37883
37944
|
return {
|
|
37884
37945
|
kind: request3.kind,
|
|
@@ -38260,7 +38321,7 @@ var processLifetime = {
|
|
|
38260
38321
|
}
|
|
38261
38322
|
};
|
|
38262
38323
|
async function createServiceHost(value, sourceBuild, lifetime) {
|
|
38263
|
-
const embedded = "
|
|
38324
|
+
const embedded = "103e212eee402600c29002528ccc3808b6fbe11ccee275a4d5f2a3d52576c520";
|
|
38264
38325
|
if (embedded && sourceBuild)
|
|
38265
38326
|
throw new ContractError("unsupported-context");
|
|
38266
38327
|
const contractHash = decodeHash(embedded ?? sourceBuild?.contractHash);
|
|
@@ -38426,11 +38487,11 @@ async function createServiceHost(value, sourceBuild, lifetime) {
|
|
|
38426
38487
|
owner.registerRuntime(() => gate.closeAdmission(), {
|
|
38427
38488
|
assertQuiescent: () => gate.assertQuiescent()
|
|
38428
38489
|
});
|
|
38429
|
-
const ownerLiterals = () => [
|
|
38490
|
+
const ownerLiterals = (workspace = false) => [
|
|
38430
38491
|
...access.redactionLiterals(),
|
|
38431
38492
|
native.capability,
|
|
38432
38493
|
...network.literals,
|
|
38433
|
-
...models2.viewRedactionLiterals()
|
|
38494
|
+
...models2.viewRedactionLiterals(workspace ? "installed" : "text")
|
|
38434
38495
|
];
|
|
38435
38496
|
workbench = !sourceBuild?.deferRuntime ? new Workbench({
|
|
38436
38497
|
coordination: c,
|
|
@@ -38470,13 +38531,13 @@ async function createServiceHost(value, sourceBuild, lifetime) {
|
|
|
38470
38531
|
};
|
|
38471
38532
|
},
|
|
38472
38533
|
workspace: () => {
|
|
38473
|
-
const before = ownerLiterals();
|
|
38534
|
+
const before = ownerLiterals(true);
|
|
38474
38535
|
const view = {
|
|
38475
38536
|
rootLabel: diagnosticText(sanitizeText(c.store.root, before), 4096),
|
|
38476
38537
|
models: models2.observe(),
|
|
38477
38538
|
context: unavailable2(null)
|
|
38478
38539
|
};
|
|
38479
|
-
if (canonicalJson(before) !== canonicalJson(ownerLiterals()))
|
|
38540
|
+
if (canonicalJson(before) !== canonicalJson(ownerLiterals(true)))
|
|
38480
38541
|
throw new ContractError("stale");
|
|
38481
38542
|
return view;
|
|
38482
38543
|
},
|