wherever-dev 0.18.4 → 0.19.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/dist/builtin-extensions.d.ts +28 -0
- package/dist/builtin-extensions.d.ts.map +1 -0
- package/dist/builtin-extensions.js +28 -0
- package/dist/builtin-extensions.js.map +1 -0
- package/dist/config-dir.d.ts +13 -0
- package/dist/config-dir.d.ts.map +1 -0
- package/dist/config-dir.js +18 -0
- package/dist/config-dir.js.map +1 -0
- package/dist/extension-lifecycle.d.ts +3 -2
- package/dist/extension-lifecycle.d.ts.map +1 -1
- package/dist/extension-lifecycle.js +8 -4
- package/dist/extension-lifecycle.js.map +1 -1
- package/dist/index.js +377 -35
- package/dist/index.js.map +1 -1
- package/dist/pi-sdk-policy.d.ts +91 -0
- package/dist/pi-sdk-policy.d.ts.map +1 -0
- package/dist/pi-sdk-policy.js +173 -0
- package/dist/pi-sdk-policy.js.map +1 -0
- package/dist/pi-sdk.d.ts +56 -0
- package/dist/pi-sdk.d.ts.map +1 -0
- package/dist/pi-sdk.js +124 -0
- package/dist/pi-sdk.js.map +1 -0
- package/dist/protocol.d.ts +23 -0
- package/dist/protocol.d.ts.map +1 -1
- package/dist/session-pool.d.ts +56 -12
- package/dist/session-pool.d.ts.map +1 -1
- package/dist/session-pool.js +108 -36
- package/dist/session-pool.js.map +1 -1
- package/dist/upload-gate.d.ts +96 -0
- package/dist/upload-gate.d.ts.map +1 -0
- package/dist/upload-gate.js +109 -0
- package/dist/upload-gate.js.map +1 -0
- package/dist/upload-staging.d.ts +172 -0
- package/dist/upload-staging.d.ts.map +1 -0
- package/dist/upload-staging.js +368 -0
- package/dist/upload-staging.js.map +1 -0
- package/package.json +5 -3
- package/public/_app/immutable/assets/{0.BnOlDJL_.css → 0.Cb5vRzMp.css} +1 -1
- package/public/_app/immutable/chunks/{wEbpki5g.js → B4u7MCsa.js} +2 -2
- package/public/_app/immutable/chunks/{wEbpki5g.js.map → B4u7MCsa.js.map} +1 -1
- package/public/_app/immutable/chunks/{D7qz2w2U.js → CMMpRRWm.js} +2 -2
- package/public/_app/immutable/chunks/{D7qz2w2U.js.map → CMMpRRWm.js.map} +1 -1
- package/public/_app/immutable/chunks/{Ds-VJGnt.js → D7cniAcl.js} +2 -2
- package/public/_app/immutable/chunks/{Ds-VJGnt.js.map → D7cniAcl.js.map} +1 -1
- package/public/_app/immutable/entry/{app.DTMeXTQG.js → app.B09hP3rk.js} +3 -3
- package/public/_app/immutable/entry/{app.DTMeXTQG.js.map → app.B09hP3rk.js.map} +1 -1
- package/public/_app/immutable/entry/start.DsunIvKH.js +2 -0
- package/public/_app/immutable/entry/start.DsunIvKH.js.map +1 -0
- package/public/_app/immutable/nodes/{0.CCTuxjIi.js → 0.Bl6oKVU5.js} +2 -2
- package/public/_app/immutable/nodes/{0.CCTuxjIi.js.map → 0.Bl6oKVU5.js.map} +1 -1
- package/public/_app/immutable/nodes/{1.5ZhRu6ko.js → 1.H6kc-Qsz.js} +2 -2
- package/public/_app/immutable/nodes/{1.5ZhRu6ko.js.map → 1.H6kc-Qsz.js.map} +1 -1
- package/public/_app/immutable/nodes/2.B6sChdvF.js +120 -0
- package/public/_app/immutable/nodes/2.B6sChdvF.js.map +1 -0
- package/public/_app/version.json +1 -1
- package/public/index.html +11 -11
- package/public/service-worker.js +1 -1
- package/public/_app/immutable/entry/start.CwhL7q0v.js +0 -2
- package/public/_app/immutable/entry/start.CwhL7q0v.js.map +0 -1
- package/public/_app/immutable/nodes/2.DOUZvKq4.js +0 -120
- package/public/_app/immutable/nodes/2.DOUZvKq4.js.map +0 -1
package/dist/session-pool.d.ts
CHANGED
|
@@ -67,6 +67,13 @@ export interface AppearanceConfig {
|
|
|
67
67
|
}
|
|
68
68
|
export interface WhereverConfig {
|
|
69
69
|
gitInitDefault?: boolean;
|
|
70
|
+
/**
|
|
71
|
+
* Which pi SDK server sessions run on (bundled, `auto` = the `pi` on PATH,
|
|
72
|
+
* or a path) and the version opt-ins. Read ONCE at startup by pi-sdk.ts,
|
|
73
|
+
* straight from config.json (this module loads after the choice is made);
|
|
74
|
+
* typed here so the config shape has one description. See pi-sdk-policy.ts.
|
|
75
|
+
*/
|
|
76
|
+
piSdk?: PiSdkConfig;
|
|
70
77
|
remoteRepoRules?: RemoteRepoRule[];
|
|
71
78
|
commonFolders?: string[];
|
|
72
79
|
/** Visual identity of THIS server instance in the web dashboard. */
|
|
@@ -81,6 +88,13 @@ export interface WhereverConfig {
|
|
|
81
88
|
dir?: string;
|
|
82
89
|
subDir?: string;
|
|
83
90
|
method?: 'post' | 'websocket';
|
|
91
|
+
/**
|
|
92
|
+
* Max size of ONE uploaded file, in bytes, enforced on every upload path
|
|
93
|
+
* (legacy `file_upload` by decoded size; the chunked and POST paths reuse
|
|
94
|
+
* it). Default 1 GiB (`DEFAULT_UPLOAD_MAX_BYTES` in upload-gate.ts): larger
|
|
95
|
+
* than the 100 MiB download cap on purpose, since phone videos exceed it.
|
|
96
|
+
*/
|
|
97
|
+
maxBytes?: number;
|
|
84
98
|
};
|
|
85
99
|
/**
|
|
86
100
|
* Controls which files the `GET /session/download` endpoint will serve to a
|
|
@@ -251,14 +265,7 @@ export interface SessionRetention {
|
|
|
251
265
|
* per file (milliseconds), and even a cold pass never blocks the event loop.
|
|
252
266
|
*/
|
|
253
267
|
export declare function scanDiskSessions(sessionsRoot: string, folderWanted: (cwd: string) => boolean, label: string, retention?: SessionRetention): Promise<DiskSessionInfo[]>;
|
|
254
|
-
|
|
255
|
-
* Directory holding `config.json`. `WHEREVER_CONFIG_DIR` overrides the default
|
|
256
|
-
* `~/.wherever` so a test server can run in FULL isolation (ADR 0001): without
|
|
257
|
-
* it, an isolated harness still reads the developer's real config, so e.g. a
|
|
258
|
-
* personal `sessions.ignore: ["/tmp/**"]` silently hid the harness's own
|
|
259
|
-
* temp-dir sessions from /sessions.
|
|
260
|
-
*/
|
|
261
|
-
export declare function getWhereverConfigDir(): string;
|
|
268
|
+
export { getWhereverConfigDir } from './config-dir.js';
|
|
262
269
|
/**
|
|
263
270
|
* Directory holding everything the RUNNING SERVER WRITES (drafts, generated
|
|
264
271
|
* self-signed certs). Separate from the CONFIG directory because the two have
|
|
@@ -308,6 +315,7 @@ export type RemoteRepoProbe = {
|
|
|
308
315
|
*/
|
|
309
316
|
export declare function detectRemoteRepo(rule: RemoteRepoRule, repoName: string): RemoteRepoProbe;
|
|
310
317
|
import { type ConversationModeSignal } from './conversation-mode-hint.js';
|
|
318
|
+
import type { PiSdkConfig } from './pi-sdk-policy.js';
|
|
311
319
|
import type { InlineExtension } from '@earendil-works/pi-coding-agent';
|
|
312
320
|
import type { AgentSession, AgentSessionEvent } from '@earendil-works/pi-coding-agent';
|
|
313
321
|
import type { Model, Api } from '@earendil-works/pi-ai';
|
|
@@ -365,8 +373,16 @@ export declare class SessionPool {
|
|
|
365
373
|
private sessions;
|
|
366
374
|
private pendingSessions;
|
|
367
375
|
private pendingCreateSessions;
|
|
368
|
-
|
|
369
|
-
|
|
376
|
+
/**
|
|
377
|
+
* The model/auth runtime shared by every server session (auth.json +
|
|
378
|
+
* models.json in the agent dir), and the registry view over it. pi creates
|
|
379
|
+
* the runtime asynchronously, so it is started in the constructor and every
|
|
380
|
+
* path that needs it awaits `ensureModels()` (a pool used without
|
|
381
|
+
* `initialize()`, as the tests do, still works).
|
|
382
|
+
*/
|
|
383
|
+
private modelRuntime?;
|
|
384
|
+
private modelRegistry?;
|
|
385
|
+
private modelsReady;
|
|
370
386
|
private agentDir;
|
|
371
387
|
private idleTimeoutMs;
|
|
372
388
|
private pendingSudo;
|
|
@@ -388,6 +404,8 @@ export declare class SessionPool {
|
|
|
388
404
|
extensionShutdownTimeoutMs?: number;
|
|
389
405
|
extensionBindWarnAfterMs?: number;
|
|
390
406
|
});
|
|
407
|
+
/** The shared model registry, once pi's model runtime has loaded. */
|
|
408
|
+
private ensureModels;
|
|
391
409
|
initialize(): Promise<void>;
|
|
392
410
|
/**
|
|
393
411
|
* Register, in the shared registry, the providers that extensions declare
|
|
@@ -440,19 +458,27 @@ export declare class SessionPool {
|
|
|
440
458
|
* it (see inFlightScans).
|
|
441
459
|
*/
|
|
442
460
|
private warmSessionIndex;
|
|
461
|
+
/**
|
|
462
|
+
* The models that have working auth right now. pi keeps availability as a
|
|
463
|
+
* snapshot it refreshes asynchronously, so this asks for a fresh pass first:
|
|
464
|
+
* a provider the user signed in to from a terminal pi since (auth.json
|
|
465
|
+
* changed) then shows up without restarting the server. If the pass fails,
|
|
466
|
+
* the last snapshot is still a better answer than nothing.
|
|
467
|
+
*/
|
|
468
|
+
private availableModels;
|
|
443
469
|
/**
|
|
444
470
|
* List available models. `isDefault` is resolved against `cwd` (falling back to
|
|
445
471
|
* the server's process cwd), so a folder-local harness/pi config default is
|
|
446
472
|
* honored, not just the server global default.
|
|
447
473
|
*/
|
|
448
|
-
getAvailableModels(cwd?: string): ModelInfo[]
|
|
474
|
+
getAvailableModels(cwd?: string): Promise<ModelInfo[]>;
|
|
449
475
|
/**
|
|
450
476
|
* Resolve the default model (as "provider:modelId") for a given folder, using
|
|
451
477
|
* that folder's resolved settings (folder-local harness/pi config wins over the
|
|
452
478
|
* server global). Returns null when no default is configured or the resolved
|
|
453
479
|
* model is not among the available models.
|
|
454
480
|
*/
|
|
455
|
-
getDefaultModelFor(cwd: string): string | null
|
|
481
|
+
getDefaultModelFor(cwd: string): Promise<string | null>;
|
|
456
482
|
findModel(provider: string, modelId: string): Model<Api> | undefined;
|
|
457
483
|
/**
|
|
458
484
|
* Resolve a session identifier (short ID/name OR an absolute .jsonl path) to a
|
|
@@ -475,6 +501,24 @@ export declare class SessionPool {
|
|
|
475
501
|
* dangling one does not, which is what a user means by "the folder is there".)
|
|
476
502
|
*/
|
|
477
503
|
private folderExists;
|
|
504
|
+
/**
|
|
505
|
+
* HEADER-ONLY read of what a write into a session's folder needs: its cwd and
|
|
506
|
+
* the two folder verdicts of `readSessionMeta` (`readOnly`, `folderMissing`),
|
|
507
|
+
* with no history and no agent. A resident session answers from the pool; a
|
|
508
|
+
* cold one (including one whose agent is still building) from the session
|
|
509
|
+
* file's header, one 8 KB read regardless of transcript size. Used by
|
|
510
|
+
* `POST /session/upload`, which has no socket and so no painted session.
|
|
511
|
+
* `{error}` means the session cannot be resolved at all.
|
|
512
|
+
*/
|
|
513
|
+
readSessionFolderMeta(sessionFileOrId: string): Promise<{
|
|
514
|
+
sessionFile: string;
|
|
515
|
+
sessionId: string;
|
|
516
|
+
cwd: string;
|
|
517
|
+
readOnly: boolean;
|
|
518
|
+
folderMissing: boolean;
|
|
519
|
+
} | {
|
|
520
|
+
error: string;
|
|
521
|
+
}>;
|
|
478
522
|
/**
|
|
479
523
|
* CHEAP read of a session's metadata + history WITHOUT building a live agent.
|
|
480
524
|
* Opening a session for VIEWING only needs the header (id/cwd/model) and the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-pool.d.ts","sourceRoot":"","sources":["../src/session-pool.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,KAAK,eAAe,EACrB,MAAM,yBAAyB,CAAC;AAEjC,YAAY,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAU/C;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAGhE;AAgBD,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,GAAG,UAAU,GAAG,OAAO,GAAG,SAAS,CAAC;IACtD,UAAU,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;CACnC;AAED,oFAAoF;AACpF,MAAM,MAAM,kBAAkB,GAC1B,WAAW,GACX,cAAc,GACd,eAAe,GACf,eAAe,GACf,aAAa,GACb,WAAW,GACX,gBAAgB,GAChB,WAAW,GACX,WAAW,GACX,aAAa,CAAC;AAElB;;;;;GAKG;AACH,+FAA+F;AAC/F,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;AAErE,MAAM,WAAW,gBAAgB;IAC/B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACvB,wGAAwG;IACxG,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,4FAA4F;IAC5F,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC,CAAC;IACrD;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,oFAAoF;IACpF,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B;AAED,MAAM,WAAW,cAAc;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC;IACnC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,oEAAoE;IACpE,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,MAAM,CAAC,EAAE;QACP,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,OAAO,CAAC,EAAE;QACR,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GAAG,QAAQ,CAAC;QACpC,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;KAC/B,CAAC;IACF;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE;QACV,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QACjB,uDAAuD;QACvD,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;IACF;;;;OAIG;IACH,IAAI,CAAC,EAAE;QACL,2JAA2J;QAC3J,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,mJAAmJ;QACnJ,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF;;;;;;;;;;;;;;OAcG;IACH,MAAM,CAAC,EAAE;QACP,uFAAuF;QACvF,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,iFAAiF;QACjF,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACvB,8EAA8E;QAC9E,KAAK,CAAC,EAAE,MAAM,CAAC;QACf;;;;;;;;WAQG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,0FAA0F;QAC1F,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,CAAC;IACF;;;;OAIG;IACH,kBAAkB,CAAC,EAAE;QACnB;;;;WAIG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,sEAAsE;QACtE,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,iFAAiF;IACjF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yGAAyG;IACzG,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gCAAgC;IAChC,QAAQ,CAAC,EAAE;QACT;;;;;;WAMG;QACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;QAClB;;;;;;;;WAQG;QACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB;;;;;;;;;;;;WAYG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;CACH;AAyCD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CA0B1F;AAaD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CASxD;AAmDD,8EAA8E;AAC9E,wBAAgB,uBAAuB,IAAI,MAAM,CAEhD;AA0CD,uEAAuE;AACvE,wBAAgB,4BAA4B,IAAI,MAAM,CAErD;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAE3D;AAED;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB1F;AAED,gDAAgD;AAChD,wBAAgB,sBAAsB,IAAI,IAAI,CAO7C;AAsBD;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B,gEAAgE;IAChE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,+DAA+D;IAC/D,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,EACtC,KAAK,EAAE,MAAM,EACb,SAAS,CAAC,EAAE,gBAAgB,GAC3B,OAAO,CAAC,eAAe,EAAE,CAAC,CAS5B;AAmID;;;;;;GAMG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAG7C;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAG5C;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C;AAED,wBAAgB,iBAAiB,IAAI,cAAc,CA+BlD;AAUD,eAAO,MAAM,0BAA0B,skCAiBtC,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAgBlE;AAED,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,QAoBxD;AAmBD,MAAM,MAAM,eAAe,GACvB;IAAE,MAAM,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAChC;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,MAAM,CAAC,EAAE,SAAS,CAAA;CAAE,CAAC;AAE1C;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,eAAe,CA+CxF;AAoBD,OAAO,EAAgC,KAAK,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAUxG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAMvE,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACvF,OAAO,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,kBAAkB,EAAE,SAAS,EAAqB,gBAAgB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACxJ,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAEpC;;;;;GAKG;AACH,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,qFAAqF;AACrF,eAAO,MAAM,iBAAiB,qFACsD,CAAC;AAErF,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,IAAI,CAAC;IAChD,gBAAgB,EAAE,MAAM,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IAOrB,iBAAiB,EAAE,MAAM,CAAC;IAK1B,kBAAkB,EAAE,sBAAsB,CAAC;IAI3C,SAAS,CAAC,EAAE,OAAO,CAAC;IAGpB,aAAa,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAMjC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,KAAK,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,IAAI,CAAC;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,SAAS,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IAGrB,YAAY,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;CACxC;AAED,MAAM,MAAM,cAAc,GAAG,oBAAoB,GAAG,iBAAiB,CAAC;AAEtE,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAqC;IACrD,OAAO,CAAC,eAAe,CAA2E;IAClG,OAAO,CAAC,qBAAqB,CAAiG;IAC9H,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAW9B,OAAO,CAAC,WAAW,CAGf;IAEJ,+EAA+E;IAC/E,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAe;IAEzD,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAElE;;;;OAIG;IACH,OAAO,CAAC,uBAAuB,CAAoB;IACnD,yFAAyF;IACzF,OAAO,CAAC,0BAA0B,CAAS;IAC3C,6EAA6E;IAC7E,OAAO,CAAC,wBAAwB,CAAS;gBAGvC,aAAa,SAAU,EACvB,OAAO,GAAE;QACP,uBAAuB,CAAC,EAAE,eAAe,EAAE,CAAC;QAC5C,0BAA0B,CAAC,EAAE,MAAM,CAAC;QACpC,wBAAwB,CAAC,EAAE,MAAM,CAAC;KAC9B;IAcF,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBjC;;;;;;;;;;;;;;;;;;OAkBG;IACH,OAAO,CAAC,0BAA0B;IAgBlC;;;;;;;;;;;;;;OAcG;YACW,0BAA0B;IAmBxC;;kFAE8E;IAC9E,cAAc,IAAI,MAAM;IAIxB,8EAA8E;IAC9E,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO;IAO5C;;;;;;;OAOG;IACH,OAAO,CAAC,gBAAgB;IAwBxB;;;;OAIG;IACH,kBAAkB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE;IAiB7C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAW9C,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS;IAIpE;;;OAGG;YACW,kBAAkB;IAkBhC;;;;;;;;;;;;;;OAcG;YACW,YAAY;IAS1B;;;;;;;;OAQG;IACG,eAAe,CACnB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CACN;QACE,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE;YAAE,QAAQ,EAAE,cAAc,EAAE,CAAC;YAAC,UAAU,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC;QAC5E,QAAQ,EAAE,OAAO,CAAC;QAClB;;;;;;WAMG;QACH,aAAa,EAAE,OAAO,CAAC;QACvB,QAAQ,EAAE,OAAO,CAAC;KACnB,GACD;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CACpB;IAkDK,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,cAAc,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAoH7H;;;;;;;;;;;;;OAaG;IACG,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,OAAO,EAAE,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,cAAc,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAmNxO;;;;;;;;;;;;;OAaG;IACG,WAAW,CACf,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAsDzF,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI;IAS3E,YAAY,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAO7D,UAAU,CAAC,eAAe,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI;IAkB1D;iDAC6C;IAC7C,cAAc,IAAI,cAAc,EAAE;IAIlC,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI;IAQ1D,cAAc,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE;IAc7H;;;;;;;;;;;;;;OAcG;IACG,uBAAuB,CAC3B,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,MAAM,EACb,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC;QAAE,QAAQ,EAAE,cAAc,EAAE,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAO9E;;;;;;;;;;;;;;;;;;;OAmBG;IACG,YAAY,CAAC,IAAI,GAAE,SAAS,GAAG,UAAsB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAwB3F;;;;;OAKG;YACW,yBAAyB;IAYvC,kFAAkF;IAClF,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAMnC;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IA4DpB,iBAAiB,IAAI,WAAW,EAAE;IAa5B,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAuB1E;;;;;;;;;OASG;IACG,eAAe,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,OAAO,GAAG,UAAU,EAAE,gBAAgB,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAwG/I,OAAO,CAAC,aAAa;YAQP,aAAa;YAiBb,sBAAsB;IAuDpC,OAAO,CAAC,mBAAmB;IAoDrB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAyC9E,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAIlC,YAAY,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB1D;;;;;;;;;;;;OAYG;IACH,gBAAgB,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAMpD,gBAAgB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxD,WAAW,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAyBzF,WAAW,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO;IAM7C;;;;;;;;OAQG;IACH,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,YAAY,EAAE;IAYlD;;;;;OAKG;IACH,eAAe,CAAC,eAAe,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,GAAG,SAAS;IAW7E,gFAAgF;IAChF,kBAAkB,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI,GAAG,IAAI;IAOjF,iBAAiB,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI;IAYhD,eAAe,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI;IAO9C;;;;;;OAMG;IACH,cAAc,CAAC,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBhE,kBAAkB,CAAC,cAAc,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,UAAQ,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,cAAc,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,CAAC;QAAC,mBAAmB,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAqGhO,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BjE,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAgChE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAOjC;;;;;;OAMG;YACW,gBAAgB;IAiE9B,qEAAqE;IACrE,WAAW,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO;IAK7C;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACG,aAAa,CACjB,eAAe,EAAE,MAAM,EACvB,IAAI,GAAE;QAAE,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;KAAO,GAClC,OAAO,CAAC,YAAY,CAAC;YAuBV,SAAS;IAuDvB;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;;;OAIG;YACW,aAAa;IAS3B,OAAO,CAAC,mBAAmB;IAsD3B,OAAO,CAAC,aAAa;CAQtB"}
|
|
1
|
+
{"version":3,"file":"session-pool.d.ts","sourceRoot":"","sources":["../src/session-pool.ts"],"names":[],"mappings":"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"}
|
package/dist/session-pool.js
CHANGED
|
@@ -442,17 +442,8 @@ async function runDiskScan(sessionsRoot, folderWanted, label, retention) {
|
|
|
442
442
|
}
|
|
443
443
|
return infos;
|
|
444
444
|
}
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
* `~/.wherever` so a test server can run in FULL isolation (ADR 0001): without
|
|
448
|
-
* it, an isolated harness still reads the developer's real config, so e.g. a
|
|
449
|
-
* personal `sessions.ignore: ["/tmp/**"]` silently hid the harness's own
|
|
450
|
-
* temp-dir sessions from /sessions.
|
|
451
|
-
*/
|
|
452
|
-
export function getWhereverConfigDir() {
|
|
453
|
-
const override = process.env.WHEREVER_CONFIG_DIR;
|
|
454
|
-
return override && override.trim() ? path.resolve(override.trim()) : path.join(os.homedir(), '.wherever');
|
|
455
|
-
}
|
|
445
|
+
export { getWhereverConfigDir } from './config-dir.js';
|
|
446
|
+
import { getWhereverConfigDir } from './config-dir.js';
|
|
456
447
|
/**
|
|
457
448
|
* Directory holding everything the RUNNING SERVER WRITES (drafts, generated
|
|
458
449
|
* self-signed certs). Separate from the CONFIG directory because the two have
|
|
@@ -677,13 +668,16 @@ export function detectRemoteRepo(rule, repoName) {
|
|
|
677
668
|
// drift the registry exists to end. `setupUpstreamTracking` above is still used
|
|
678
669
|
// by the remote-CREATION path (a brand new repository); the registry configures
|
|
679
670
|
// tracking for a clone itself.
|
|
680
|
-
|
|
671
|
+
// Runtime SDK values come from pi-sdk.ts (the SDK chosen at startup), never
|
|
672
|
+
// from the package directly; types may still be imported from the package.
|
|
673
|
+
import { createAgentSession, ModelRuntime, ModelRegistry, DefaultResourceLoader, SettingsManager, getAgentDir, SessionManager } from './pi-sdk.js';
|
|
681
674
|
import { spawn } from 'node:child_process';
|
|
682
675
|
import { randomUUID } from 'node:crypto';
|
|
683
676
|
import { createAttachFileTool } from './attach-file-tool.js';
|
|
684
677
|
import { createSayTool } from './say-tool.js';
|
|
685
678
|
import { createConversationModeSignal } from './conversation-mode-hint.js';
|
|
686
679
|
import { withoutCliBridgeExtension } from './cli-bridge-extension.js';
|
|
680
|
+
import { serverBuiltinExtensions } from './builtin-extensions.js';
|
|
687
681
|
import { markWhereverServerProcess } from './server-process-marker.js';
|
|
688
682
|
import { bindServerSessionExtensions, shutdownAndDisposeAgentSession, clearPiExtensionCache, EXTENSION_SHUTDOWN_TIMEOUT_MS, EXTENSION_BIND_WARN_AFTER_MS, } from './extension-lifecycle.js';
|
|
689
683
|
/** How long startup waits for the extension-provider discovery before going on
|
|
@@ -696,8 +690,16 @@ export class SessionPool {
|
|
|
696
690
|
sessions = new Map();
|
|
697
691
|
pendingSessions = new Map();
|
|
698
692
|
pendingCreateSessions = new Map();
|
|
699
|
-
|
|
693
|
+
/**
|
|
694
|
+
* The model/auth runtime shared by every server session (auth.json +
|
|
695
|
+
* models.json in the agent dir), and the registry view over it. pi creates
|
|
696
|
+
* the runtime asynchronously, so it is started in the constructor and every
|
|
697
|
+
* path that needs it awaits `ensureModels()` (a pool used without
|
|
698
|
+
* `initialize()`, as the tests do, still works).
|
|
699
|
+
*/
|
|
700
|
+
modelRuntime;
|
|
700
701
|
modelRegistry;
|
|
702
|
+
modelsReady;
|
|
701
703
|
agentDir;
|
|
702
704
|
idleTimeoutMs;
|
|
703
705
|
// Pending `!sudo ...` commands awaiting a password from the client, keyed by a
|
|
@@ -731,12 +733,27 @@ export class SessionPool {
|
|
|
731
733
|
this.extensionShutdownTimeoutMs = options.extensionShutdownTimeoutMs ?? EXTENSION_SHUTDOWN_TIMEOUT_MS;
|
|
732
734
|
this.extensionBindWarnAfterMs = options.extensionBindWarnAfterMs ?? EXTENSION_BIND_WARN_AFTER_MS;
|
|
733
735
|
this.agentDir = getAgentDir();
|
|
734
|
-
this.
|
|
735
|
-
|
|
736
|
+
this.modelsReady = ModelRuntime.create({
|
|
737
|
+
authPath: path.join(this.agentDir, 'auth.json'),
|
|
738
|
+
modelsPath: path.join(this.agentDir, 'models.json'),
|
|
739
|
+
}).then((runtime) => {
|
|
740
|
+
this.modelRuntime = runtime;
|
|
741
|
+
this.modelRegistry = new ModelRegistry(runtime);
|
|
742
|
+
return this.modelRegistry;
|
|
743
|
+
});
|
|
744
|
+
// Observed here so a failure is never an unhandled rejection; every caller
|
|
745
|
+
// of ensureModels() still sees it.
|
|
746
|
+
this.modelsReady.catch((err) => {
|
|
747
|
+
console.error(`[wherever] could not load models/auth: ${err instanceof Error ? err.message : String(err)}`);
|
|
748
|
+
});
|
|
736
749
|
this.idleTimeoutMs = idleTimeoutMs;
|
|
737
750
|
}
|
|
751
|
+
/** The shared model registry, once pi's model runtime has loaded. */
|
|
752
|
+
ensureModels() {
|
|
753
|
+
return this.modelsReady;
|
|
754
|
+
}
|
|
738
755
|
async initialize() {
|
|
739
|
-
this.
|
|
756
|
+
await this.ensureModels();
|
|
740
757
|
// Bounded: an extension that talks to something slow while loading must
|
|
741
758
|
// not hold the server's startup hostage. Past the bound the discovery keeps
|
|
742
759
|
// going in the background and still registers what it finds.
|
|
@@ -770,11 +787,11 @@ export class SessionPool {
|
|
|
770
787
|
* the shared registry for the life of the process (they survive `refresh()`),
|
|
771
788
|
* which is what the other sessions and `/models` need.
|
|
772
789
|
*/
|
|
773
|
-
registerExtensionProviders(resourceLoader, label) {
|
|
790
|
+
registerExtensionProviders(models, resourceLoader, label) {
|
|
774
791
|
const runtime = resourceLoader.getExtensions().runtime;
|
|
775
792
|
for (const { name, config, extensionPath } of runtime.pendingProviderRegistrations) {
|
|
776
793
|
try {
|
|
777
|
-
|
|
794
|
+
models.registerProvider(name, config);
|
|
778
795
|
}
|
|
779
796
|
catch (err) {
|
|
780
797
|
console.error(`[wherever] ${label}: extension ${extensionPath} failed to register provider "${name}": ${err instanceof Error ? err.message : String(err)}`);
|
|
@@ -808,7 +825,7 @@ export class SessionPool {
|
|
|
808
825
|
extensionsOverride: withoutCliBridgeExtension,
|
|
809
826
|
});
|
|
810
827
|
await resourceLoader.reload();
|
|
811
|
-
this.registerExtensionProviders(resourceLoader, 'startup discovery');
|
|
828
|
+
this.registerExtensionProviders(await this.ensureModels(), resourceLoader, 'startup discovery');
|
|
812
829
|
}
|
|
813
830
|
catch (err) {
|
|
814
831
|
console.error(`[wherever] could not discover extension providers at startup: ${err instanceof Error ? err.message : String(err)}`);
|
|
@@ -857,13 +874,30 @@ export class SessionPool {
|
|
|
857
874
|
/* warm-up is best-effort: a real request will retry and report. */
|
|
858
875
|
});
|
|
859
876
|
}
|
|
877
|
+
/**
|
|
878
|
+
* The models that have working auth right now. pi keeps availability as a
|
|
879
|
+
* snapshot it refreshes asynchronously, so this asks for a fresh pass first:
|
|
880
|
+
* a provider the user signed in to from a terminal pi since (auth.json
|
|
881
|
+
* changed) then shows up without restarting the server. If the pass fails,
|
|
882
|
+
* the last snapshot is still a better answer than nothing.
|
|
883
|
+
*/
|
|
884
|
+
async availableModels() {
|
|
885
|
+
const registry = await this.ensureModels();
|
|
886
|
+
try {
|
|
887
|
+
return { registry, available: await this.modelRuntime.getAvailable() };
|
|
888
|
+
}
|
|
889
|
+
catch (err) {
|
|
890
|
+
console.error(`[wherever] model availability refresh failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
891
|
+
return { registry, available: registry.getAvailable() };
|
|
892
|
+
}
|
|
893
|
+
}
|
|
860
894
|
/**
|
|
861
895
|
* List available models. `isDefault` is resolved against `cwd` (falling back to
|
|
862
896
|
* the server's process cwd), so a folder-local harness/pi config default is
|
|
863
897
|
* honored, not just the server global default.
|
|
864
898
|
*/
|
|
865
|
-
getAvailableModels(cwd) {
|
|
866
|
-
const available = this.
|
|
899
|
+
async getAvailableModels(cwd) {
|
|
900
|
+
const { registry, available } = await this.availableModels();
|
|
867
901
|
const settings = SettingsManager.create(cwd || process.cwd(), this.agentDir);
|
|
868
902
|
const defaultProvider = settings.getDefaultProvider();
|
|
869
903
|
const defaultModel = settings.getDefaultModel();
|
|
@@ -872,7 +906,7 @@ export class SessionPool {
|
|
|
872
906
|
return {
|
|
873
907
|
provider: m.provider,
|
|
874
908
|
modelId: m.id,
|
|
875
|
-
label: `${
|
|
909
|
+
label: `${registry.getProviderDisplayName(m.provider)}: ${m.name}`,
|
|
876
910
|
isDefault,
|
|
877
911
|
};
|
|
878
912
|
});
|
|
@@ -883,19 +917,18 @@ export class SessionPool {
|
|
|
883
917
|
* server global). Returns null when no default is configured or the resolved
|
|
884
918
|
* model is not among the available models.
|
|
885
919
|
*/
|
|
886
|
-
getDefaultModelFor(cwd) {
|
|
920
|
+
async getDefaultModelFor(cwd) {
|
|
887
921
|
const settings = SettingsManager.create(cwd, this.agentDir);
|
|
888
922
|
const defaultProvider = settings.getDefaultProvider();
|
|
889
923
|
const defaultModel = settings.getDefaultModel();
|
|
890
924
|
if (!defaultProvider || !defaultModel)
|
|
891
925
|
return null;
|
|
892
|
-
const
|
|
893
|
-
|
|
894
|
-
.some((m) => m.provider === defaultProvider && m.id === defaultModel);
|
|
926
|
+
const { available } = await this.availableModels();
|
|
927
|
+
const found = available.some((m) => m.provider === defaultProvider && m.id === defaultModel);
|
|
895
928
|
return found ? `${defaultProvider}:${defaultModel}` : null;
|
|
896
929
|
}
|
|
897
930
|
findModel(provider, modelId) {
|
|
898
|
-
return this.modelRegistry
|
|
931
|
+
return this.modelRegistry?.find(provider, modelId);
|
|
899
932
|
}
|
|
900
933
|
/**
|
|
901
934
|
* Resolve a session identifier (short ID/name OR an absolute .jsonl path) to a
|
|
@@ -944,6 +977,43 @@ export class SessionPool {
|
|
|
944
977
|
return false;
|
|
945
978
|
}
|
|
946
979
|
}
|
|
980
|
+
/**
|
|
981
|
+
* HEADER-ONLY read of what a write into a session's folder needs: its cwd and
|
|
982
|
+
* the two folder verdicts of `readSessionMeta` (`readOnly`, `folderMissing`),
|
|
983
|
+
* with no history and no agent. A resident session answers from the pool; a
|
|
984
|
+
* cold one (including one whose agent is still building) from the session
|
|
985
|
+
* file's header, one 8 KB read regardless of transcript size. Used by
|
|
986
|
+
* `POST /session/upload`, which has no socket and so no painted session.
|
|
987
|
+
* `{error}` means the session cannot be resolved at all.
|
|
988
|
+
*/
|
|
989
|
+
async readSessionFolderMeta(sessionFileOrId) {
|
|
990
|
+
const resolved = await this.resolveSessionFile(sessionFileOrId);
|
|
991
|
+
if (resolved.error || !resolved.resolvedFile) {
|
|
992
|
+
return { error: resolved.error ?? 'Could not resolve session' };
|
|
993
|
+
}
|
|
994
|
+
const resolvedFile = resolved.resolvedFile;
|
|
995
|
+
const resident = this.sessions.get(resolvedFile);
|
|
996
|
+
let sessionId;
|
|
997
|
+
let cwd;
|
|
998
|
+
if (resident) {
|
|
999
|
+
sessionId = resident.sessionId;
|
|
1000
|
+
cwd = resident.cwd;
|
|
1001
|
+
}
|
|
1002
|
+
else {
|
|
1003
|
+
const header = await readSessionHeader(resolvedFile);
|
|
1004
|
+
if (!header)
|
|
1005
|
+
return { error: `Session "${sessionFileOrId}" not found` };
|
|
1006
|
+
sessionId = header.id;
|
|
1007
|
+
cwd = normalizePath(header.cwd || process.cwd());
|
|
1008
|
+
}
|
|
1009
|
+
return {
|
|
1010
|
+
sessionFile: resolvedFile,
|
|
1011
|
+
sessionId,
|
|
1012
|
+
cwd,
|
|
1013
|
+
readOnly: this.isReadOnlyCwd(cwd),
|
|
1014
|
+
folderMissing: !(await this.folderExists(cwd)),
|
|
1015
|
+
};
|
|
1016
|
+
}
|
|
947
1017
|
/**
|
|
948
1018
|
* CHEAP read of a session's metadata + history WITHOUT building a live agent.
|
|
949
1019
|
* Opening a session for VIEWING only needs the header (id/cwd/model) and the
|
|
@@ -1046,7 +1116,7 @@ export class SessionPool {
|
|
|
1046
1116
|
const parsed = this.parseModelStr(modelStr);
|
|
1047
1117
|
if (parsed) {
|
|
1048
1118
|
modelRef = parsed;
|
|
1049
|
-
model = this.
|
|
1119
|
+
model = (await this.ensureModels()).find(parsed.provider, parsed.id);
|
|
1050
1120
|
}
|
|
1051
1121
|
}
|
|
1052
1122
|
if (!model && header) {
|
|
@@ -1065,7 +1135,7 @@ export class SessionPool {
|
|
|
1065
1135
|
continue;
|
|
1066
1136
|
if ('provider' in e && 'modelId' in e) {
|
|
1067
1137
|
modelRef ??= { provider: e.provider, id: e.modelId };
|
|
1068
|
-
model = this.
|
|
1138
|
+
model = (await this.ensureModels()).find(e.provider, e.modelId);
|
|
1069
1139
|
}
|
|
1070
1140
|
break;
|
|
1071
1141
|
}
|
|
@@ -1288,7 +1358,7 @@ export class SessionPool {
|
|
|
1288
1358
|
const parsed = this.parseModelStr(modelStr);
|
|
1289
1359
|
if (parsed) {
|
|
1290
1360
|
modelRef = parsed;
|
|
1291
|
-
model = this.
|
|
1361
|
+
model = (await this.ensureModels()).find(parsed.provider, parsed.id);
|
|
1292
1362
|
}
|
|
1293
1363
|
}
|
|
1294
1364
|
const { agentSession, conversationSignal } = await this.buildServerAgent({
|
|
@@ -1951,7 +2021,7 @@ export class SessionPool {
|
|
|
1951
2021
|
const parsed = this.parseModelStr(modelStr);
|
|
1952
2022
|
if (!parsed)
|
|
1953
2023
|
return { error: `Invalid model format: ${modelStr}` };
|
|
1954
|
-
const model = this.
|
|
2024
|
+
const model = (await this.ensureModels()).find(parsed.provider, parsed.id);
|
|
1955
2025
|
if (!model)
|
|
1956
2026
|
return { error: `Model not found: ${modelStr}` };
|
|
1957
2027
|
try {
|
|
@@ -2251,7 +2321,9 @@ export class SessionPool {
|
|
|
2251
2321
|
cwd: opts.cwd,
|
|
2252
2322
|
agentDir: this.agentDir,
|
|
2253
2323
|
settingsManager,
|
|
2254
|
-
|
|
2324
|
+
// pi's built-in MCP, codemode and tool search come first, as in the CLI
|
|
2325
|
+
// (see builtin-extensions.ts: the SDK does not load them by itself).
|
|
2326
|
+
extensionFactories: [...serverBuiltinExtensions, conversationSignal.inlineExtension, ...this.extraExtensionFactories],
|
|
2255
2327
|
// Never the CLI bridge (`@wherever-dev/pi`) in a server session: in-process
|
|
2256
2328
|
// it registers this very session as a CLI and loops takeover/handback. The
|
|
2257
2329
|
// identification rule is documented at isCliBridgeExtensionPath.
|
|
@@ -2259,7 +2331,8 @@ export class SessionPool {
|
|
|
2259
2331
|
});
|
|
2260
2332
|
await resourceLoader.reload();
|
|
2261
2333
|
// Before createAgentSession picks the model: see registerExtensionProviders.
|
|
2262
|
-
this.
|
|
2334
|
+
const models = await this.ensureModels();
|
|
2335
|
+
this.registerExtensionProviders(models, resourceLoader, opts.label);
|
|
2263
2336
|
// A model handed in was looked up BEFORE this build re-registered its
|
|
2264
2337
|
// provider (a reload keeps the old session's model object), so take the
|
|
2265
2338
|
// registry's current one: an extension edit picked up by /reload (a new
|
|
@@ -2268,11 +2341,10 @@ export class SessionPool {
|
|
|
2268
2341
|
// is now ours, so the refresh is too.
|
|
2269
2342
|
// The name asked for wins; otherwise the model object handed in (a reload).
|
|
2270
2343
|
const ref = opts.modelRef ?? (opts.model && { provider: opts.model.provider, id: opts.model.id });
|
|
2271
|
-
const model = (ref &&
|
|
2344
|
+
const model = (ref && models.find(ref.provider, ref.id)) ?? opts.model;
|
|
2272
2345
|
const { session: agentSession } = await createAgentSession({
|
|
2273
2346
|
cwd: opts.cwd,
|
|
2274
|
-
|
|
2275
|
-
modelRegistry: this.modelRegistry,
|
|
2347
|
+
modelRuntime: this.modelRuntime,
|
|
2276
2348
|
model,
|
|
2277
2349
|
thinkingLevel: opts.thinkingLevel,
|
|
2278
2350
|
sessionManager: opts.sessionManager,
|