wherever-dev 0.17.1 → 0.18.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/extension-lifecycle.d.ts +27 -7
- package/dist/extension-lifecycle.d.ts.map +1 -1
- package/dist/extension-lifecycle.js +39 -8
- package/dist/extension-lifecycle.js.map +1 -1
- package/dist/index.js +93 -2
- package/dist/index.js.map +1 -1
- package/dist/protocol.d.ts +6 -0
- package/dist/protocol.d.ts.map +1 -1
- package/dist/session-pool.d.ts +67 -0
- package/dist/session-pool.d.ts.map +1 -1
- package/dist/session-pool.js +241 -74
- package/dist/session-pool.js.map +1 -1
- package/package.json +1 -1
- package/public/_app/immutable/chunks/{BhP7_nMn.js → 6cDLdLMr.js} +2 -2
- package/public/_app/immutable/chunks/{BhP7_nMn.js.map → 6cDLdLMr.js.map} +1 -1
- package/public/_app/immutable/chunks/BWLk4g7S.js +2 -0
- package/public/_app/immutable/chunks/{Bio1jLTG.js.map → BWLk4g7S.js.map} +1 -1
- package/public/_app/immutable/chunks/{BRAYQ_mD.js → C2gDSNg3.js} +2 -2
- package/public/_app/immutable/chunks/{BRAYQ_mD.js.map → C2gDSNg3.js.map} +1 -1
- package/public/_app/immutable/entry/{app.D06PTvNp.js → app.DCsaSS2h.js} +3 -3
- package/public/_app/immutable/entry/{app.D06PTvNp.js.map → app.DCsaSS2h.js.map} +1 -1
- package/public/_app/immutable/entry/start.CVu9YCQp.js +2 -0
- package/public/_app/immutable/entry/start.CVu9YCQp.js.map +1 -0
- package/public/_app/immutable/nodes/{0.05Mp-ARy.js → 0.BKhPUBoV.js} +2 -2
- package/public/_app/immutable/nodes/{0.05Mp-ARy.js.map → 0.BKhPUBoV.js.map} +1 -1
- package/public/_app/immutable/nodes/{1.C_Y-Wpdd.js → 1.D-6k-nc0.js} +2 -2
- package/public/_app/immutable/nodes/{1.C_Y-Wpdd.js.map → 1.D-6k-nc0.js.map} +1 -1
- package/public/_app/immutable/nodes/{2.DmncGYOi.js → 2.B1UIQ9ew.js} +46 -46
- package/public/_app/immutable/nodes/2.B1UIQ9ew.js.map +1 -0
- package/public/_app/version.json +1 -1
- package/public/index.html +10 -10
- package/public/service-worker.js +1 -1
- package/public/_app/immutable/chunks/Bio1jLTG.js +0 -2
- package/public/_app/immutable/entry/start.DoiCihIa.js +0 -2
- package/public/_app/immutable/entry/start.DoiCihIa.js.map +0 -1
- package/public/_app/immutable/nodes/2.DmncGYOi.js.map +0 -1
package/dist/session-pool.d.ts
CHANGED
|
@@ -312,6 +312,19 @@ import type { AgentSession, AgentSessionEvent } from '@earendil-works/pi-coding-
|
|
|
312
312
|
import type { Model, Api } from '@earendil-works/pi-ai';
|
|
313
313
|
import type { SessionInfo, HistoryMessage, FolderWithSessions, ModelInfo, ContextUsageInfo, SkillCommand } from './session-types.js';
|
|
314
314
|
import type { WebSocket } from 'ws';
|
|
315
|
+
/**
|
|
316
|
+
* Outcome of `SessionPool.reloadSession`. `started: false` is a refusal that
|
|
317
|
+
* changed nothing. `closed: true` means the session was closed by another path
|
|
318
|
+
* (delete, eviction, CLI takeover, shutdown) mid-reload; that path already told
|
|
319
|
+
* its viewers, so the caller should not send them an error on top.
|
|
320
|
+
*/
|
|
321
|
+
export interface ReloadResult {
|
|
322
|
+
started: boolean;
|
|
323
|
+
error?: string;
|
|
324
|
+
closed?: boolean;
|
|
325
|
+
}
|
|
326
|
+
/** What a send (or model change) gets while the session's agent is being rebuilt. */
|
|
327
|
+
export declare const RELOADING_REFUSAL = "The session is reloading, so this was not delivered. Try again once it is ready.";
|
|
315
328
|
export interface ServerTrackedSession {
|
|
316
329
|
type: 'server';
|
|
317
330
|
sessionId: string;
|
|
@@ -327,6 +340,9 @@ export interface ServerTrackedSession {
|
|
|
327
340
|
lastActivity: number;
|
|
328
341
|
inFlightToolCount: number;
|
|
329
342
|
conversationSignal: ConversationModeSignal;
|
|
343
|
+
reloading?: boolean;
|
|
344
|
+
reloadPromise?: Promise<unknown>;
|
|
345
|
+
busy?: number;
|
|
330
346
|
}
|
|
331
347
|
export interface CliTrackedSession {
|
|
332
348
|
type: 'cli';
|
|
@@ -582,6 +598,7 @@ export declare class SessionPool {
|
|
|
582
598
|
sendUserMessage(sessionFileOrId: string, text: string, streamingBehavior?: 'steer' | 'followUp', conversationMode?: boolean): Promise<void>;
|
|
583
599
|
private isSudoCommand;
|
|
584
600
|
private runServerBash;
|
|
601
|
+
private runServerBashUnguarded;
|
|
585
602
|
private buildSudoOperations;
|
|
586
603
|
submitSudoPassword(promptId: string, password: string): Promise<boolean>;
|
|
587
604
|
cancelSudoPrompt(promptId: string): void;
|
|
@@ -643,6 +660,56 @@ export declare class SessionPool {
|
|
|
643
660
|
unregisterCliSession(rawSessionFile: string): Promise<void>;
|
|
644
661
|
handleCliEvent(rawSessionFile: string, event: AgentSessionEvent): void;
|
|
645
662
|
disposeAll(): Promise<void>;
|
|
663
|
+
/**
|
|
664
|
+
* Build and START a live server agent: fresh settings, resource loader
|
|
665
|
+
* (extensions, skills, prompts, context files), createAgentSession, then
|
|
666
|
+
* bindExtensions. The ONE place a server agent is built, shared by loadSession,
|
|
667
|
+
* createNewSession and reloadSession, so the three can never drift in which
|
|
668
|
+
* tools, extensions or lifecycle a server session gets.
|
|
669
|
+
*/
|
|
670
|
+
private buildServerAgent;
|
|
671
|
+
/** True while `reloadSession` is rebuilding this session's agent. */
|
|
672
|
+
isReloading(sessionFileOrId: string): boolean;
|
|
673
|
+
/**
|
|
674
|
+
* The web `/reload`: re-read settings, extensions, skills, prompts and context
|
|
675
|
+
* files for a server session, like pi's `/reload`, WITHOUT calling
|
|
676
|
+
* `AgentSession.reload()`.
|
|
677
|
+
*
|
|
678
|
+
* pi's in-place reload calls pi-ai's `resetApiProviders()`, which is
|
|
679
|
+
* process-wide: every OTHER live session's extension-registered API providers
|
|
680
|
+
* would vanish for the seconds the reloading session spends re-loading its
|
|
681
|
+
* extensions. So the agent is REBUILT instead, through the same builder as a
|
|
682
|
+
* load: the old agent gets `session_shutdown` (reason `reload`) and is
|
|
683
|
+
* disposed, then a new AgentSession is built on the SAME SessionManager (so
|
|
684
|
+
* entries not yet flushed to disk survive, exactly as in an in-place reload),
|
|
685
|
+
* keeping the current model and thinking level, and its extensions get
|
|
686
|
+
* `session_start` (reason `reload`). The tracked entry is updated in place, so
|
|
687
|
+
* clients, idle state and the pool key are untouched.
|
|
688
|
+
*
|
|
689
|
+
* Refused while the agent is doing anything (streaming, compacting, running a
|
|
690
|
+
* `!command`, or a send still in its pre-stream phase: see `busy`), for CLI
|
|
691
|
+
* bridges (the terminal pi owns that agent) and while already reloading; a
|
|
692
|
+
* refusal returns `started: false` and changes nothing. `onStart` runs once
|
|
693
|
+
* every check has passed, before the old agent is touched. If the rebuild
|
|
694
|
+
* fails the old agent is already gone, so the entry is dropped and the next
|
|
695
|
+
* load builds a fresh one.
|
|
696
|
+
*
|
|
697
|
+
* Unlike pi's in-place reload, the rebuild does NOT carry over an active-tool
|
|
698
|
+
* set an extension narrowed with `setActiveTools`, extension flag values, or
|
|
699
|
+
* messages an extension queued for the next turn: the new agent starts from
|
|
700
|
+
* the defaults, as a fresh load would.
|
|
701
|
+
*/
|
|
702
|
+
reloadSession(sessionFileOrId: string, opts?: {
|
|
703
|
+
onStart?: () => void;
|
|
704
|
+
}): Promise<ReloadResult>;
|
|
705
|
+
private runReload;
|
|
706
|
+
/**
|
|
707
|
+
* Forget a session entry (its agent's teardown is the caller's business). A
|
|
708
|
+
* sudo prompt whose session is gone can never be answered: drop it here so an
|
|
709
|
+
* abandoned prompt is bounded by the session's own lifetime (idle eviction)
|
|
710
|
+
* rather than waiting for someone to type the next `!sudo`.
|
|
711
|
+
*/
|
|
712
|
+
private dropSessionEntry;
|
|
646
713
|
/**
|
|
647
714
|
* Bind a freshly created server session's extensions; if that throws, shut
|
|
648
715
|
* down and dispose the session so a failed create leaks nothing, then rethrow
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-pool.d.ts","sourceRoot":"","sources":["../src/session-pool.ts"],"names":[],"mappings":"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"}
|
|
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
|
@@ -676,8 +676,10 @@ import { randomUUID } from 'node:crypto';
|
|
|
676
676
|
import { createAttachFileTool } from './attach-file-tool.js';
|
|
677
677
|
import { createSayTool } from './say-tool.js';
|
|
678
678
|
import { createConversationModeSignal } from './conversation-mode-hint.js';
|
|
679
|
-
import { bindServerSessionExtensions, shutdownAndDisposeAgentSession, EXTENSION_SHUTDOWN_TIMEOUT_MS, EXTENSION_BIND_WARN_AFTER_MS, } from './extension-lifecycle.js';
|
|
679
|
+
import { bindServerSessionExtensions, shutdownAndDisposeAgentSession, clearPiExtensionCache, EXTENSION_SHUTDOWN_TIMEOUT_MS, EXTENSION_BIND_WARN_AFTER_MS, } from './extension-lifecycle.js';
|
|
680
680
|
import { matchRemoteRepoRule } from './remote-candidates.js';
|
|
681
|
+
/** What a send (or model change) gets while the session's agent is being rebuilt. */
|
|
682
|
+
export const RELOADING_REFUSAL = 'The session is reloading, so this was not delivered. Try again once it is ready.';
|
|
681
683
|
export class SessionPool {
|
|
682
684
|
sessions = new Map();
|
|
683
685
|
pendingSessions = new Map();
|
|
@@ -975,37 +977,12 @@ export class SessionPool {
|
|
|
975
977
|
break;
|
|
976
978
|
}
|
|
977
979
|
}
|
|
978
|
-
const
|
|
979
|
-
// The conversation-mode signal is an INLINE pi extension (the SDK-supported
|
|
980
|
-
// way to get a before_agent_start hook on a server-created session, the
|
|
981
|
-
// counterpart of the pi.on(...) the CLI-bridge extension registers). It is
|
|
982
|
-
// per session, so the armed flag can never cross sessions.
|
|
983
|
-
const conversationSignal = createConversationModeSignal();
|
|
984
|
-
const resourceLoader = new DefaultResourceLoader({
|
|
980
|
+
const { agentSession, conversationSignal } = await this.buildServerAgent({
|
|
985
981
|
cwd: normalizedCwd,
|
|
986
|
-
agentDir: this.agentDir,
|
|
987
|
-
settingsManager,
|
|
988
|
-
extensionFactories: [conversationSignal.inlineExtension, ...this.extraExtensionFactories],
|
|
989
|
-
});
|
|
990
|
-
await resourceLoader.reload();
|
|
991
|
-
const { session: agentSession } = await createAgentSession({
|
|
992
|
-
cwd: normalizedCwd,
|
|
993
|
-
authStorage: this.authStorage,
|
|
994
|
-
modelRegistry: this.modelRegistry,
|
|
995
|
-
model,
|
|
996
982
|
sessionManager,
|
|
997
|
-
|
|
998
|
-
|
|
999
|
-
// Register attach_file + say for server-created sessions (web frontend
|
|
1000
|
-
// with no CLI bridge). Both tools are self-contained; their UI affordance
|
|
1001
|
-
// (attach_file's download button, say's spoken-reply card) is driven by
|
|
1002
|
-
// the tool call reaching the web UI, no bridge/marker needed.
|
|
1003
|
-
customTools: [createAttachFileTool(normalizedCwd), createSayTool()],
|
|
983
|
+
model,
|
|
984
|
+
label: resolvedFile,
|
|
1004
985
|
});
|
|
1005
|
-
// Start the extensions BEFORE the session is tracked or reaches a client:
|
|
1006
|
-
// createAgentSession only loads them, bindExtensions emits session_start +
|
|
1007
|
-
// resources_discover (see extension-lifecycle.ts for the chosen bindings).
|
|
1008
|
-
await this.bindOrDispose(agentSession, resolvedFile);
|
|
1009
986
|
const modelLabel = agentSession.model ? `${agentSession.model.provider}:${agentSession.model.id}` : '';
|
|
1010
987
|
const tracked = {
|
|
1011
988
|
type: 'server',
|
|
@@ -1218,31 +1195,12 @@ export class SessionPool {
|
|
|
1218
1195
|
model = this.modelRegistry.find(parsed.provider, parsed.id);
|
|
1219
1196
|
}
|
|
1220
1197
|
}
|
|
1221
|
-
const
|
|
1222
|
-
// Per-turn conversation-mode signal (see the other DefaultResourceLoader
|
|
1223
|
-
// call for the rationale).
|
|
1224
|
-
const conversationSignal = createConversationModeSignal();
|
|
1225
|
-
const resourceLoader = new DefaultResourceLoader({
|
|
1226
|
-
cwd: resolvedCwd,
|
|
1227
|
-
agentDir: this.agentDir,
|
|
1228
|
-
settingsManager,
|
|
1229
|
-
extensionFactories: [conversationSignal.inlineExtension, ...this.extraExtensionFactories],
|
|
1230
|
-
});
|
|
1231
|
-
await resourceLoader.reload();
|
|
1232
|
-
const { session: agentSession } = await createAgentSession({
|
|
1198
|
+
const { agentSession, conversationSignal } = await this.buildServerAgent({
|
|
1233
1199
|
cwd: resolvedCwd,
|
|
1234
|
-
authStorage: this.authStorage,
|
|
1235
|
-
modelRegistry: this.modelRegistry,
|
|
1236
|
-
model,
|
|
1237
1200
|
sessionManager,
|
|
1238
|
-
|
|
1239
|
-
|
|
1240
|
-
// Register attach_file + say for server-created sessions (see the other
|
|
1241
|
-
// createAgentSession call for the rationale).
|
|
1242
|
-
customTools: [createAttachFileTool(resolvedCwd), createSayTool()],
|
|
1201
|
+
model,
|
|
1202
|
+
label: resolvedCwd,
|
|
1243
1203
|
});
|
|
1244
|
-
// Start the extensions before tracking (see the other createAgentSession call).
|
|
1245
|
-
await this.bindOrDispose(agentSession, agentSession.sessionFile || resolvedCwd);
|
|
1246
1204
|
const sessionFile = normalizeSessionFile(agentSession.sessionFile || '');
|
|
1247
1205
|
const modelLabel = agentSession.model ? `${agentSession.model.provider}:${agentSession.model.id}` : '';
|
|
1248
1206
|
const tracked = {
|
|
@@ -1580,6 +1538,11 @@ export class SessionPool {
|
|
|
1580
1538
|
const tracked = this.getSession(sessionFileOrId);
|
|
1581
1539
|
if (!tracked)
|
|
1582
1540
|
return;
|
|
1541
|
+
// Backstop for the WS layer's own check: mid-reload the tracked agent is the
|
|
1542
|
+
// one being shut down. Throwing surfaces as a retryable session_error.
|
|
1543
|
+
if (tracked.type === 'server' && tracked.reloading) {
|
|
1544
|
+
throw new Error(RELOADING_REFUSAL);
|
|
1545
|
+
}
|
|
1583
1546
|
tracked.lastActivity = Date.now();
|
|
1584
1547
|
this.cancelIdleCheck(tracked.sessionFile);
|
|
1585
1548
|
const isBash = text.trimStart().startsWith('!');
|
|
@@ -1643,15 +1606,23 @@ export class SessionPool {
|
|
|
1643
1606
|
// expansions are start-of-message anchored, and any trailing text after
|
|
1644
1607
|
// "/skill:<name> " is preserved and appended after the skill block. Plain
|
|
1645
1608
|
// text keeps the sendUserMessage() path (extension "input"-event source).
|
|
1646
|
-
|
|
1647
|
-
|
|
1648
|
-
|
|
1649
|
-
|
|
1650
|
-
|
|
1651
|
-
|
|
1609
|
+
// Counted as busy (synchronously, before the first await) so a /reload
|
|
1610
|
+
// cannot dispose the agent under a send that pi has not started streaming.
|
|
1611
|
+
tracked.busy = (tracked.busy ?? 0) + 1;
|
|
1612
|
+
try {
|
|
1613
|
+
if (text.startsWith('/')) {
|
|
1614
|
+
await tracked.agentSession.prompt(text, {
|
|
1615
|
+
expandPromptTemplates: true,
|
|
1616
|
+
streamingBehavior,
|
|
1617
|
+
source: 'interactive',
|
|
1618
|
+
});
|
|
1619
|
+
}
|
|
1620
|
+
else {
|
|
1621
|
+
await tracked.agentSession.sendUserMessage(text, { deliverAs: streamingBehavior });
|
|
1622
|
+
}
|
|
1652
1623
|
}
|
|
1653
|
-
|
|
1654
|
-
|
|
1624
|
+
finally {
|
|
1625
|
+
tracked.busy -= 1;
|
|
1655
1626
|
}
|
|
1656
1627
|
}
|
|
1657
1628
|
else if (tracked.type === 'cli') {
|
|
@@ -1676,6 +1647,19 @@ export class SessionPool {
|
|
|
1676
1647
|
// custom executor that feeds the password over stdin; when omitted the agent
|
|
1677
1648
|
// uses its default local shell backend.
|
|
1678
1649
|
async runServerBash(tracked, command, excludeFromContext, operations) {
|
|
1650
|
+
// Never run on the old agent mid-reload (submitSudoPassword waits the reload out).
|
|
1651
|
+
if (tracked.reloading)
|
|
1652
|
+
throw new Error(RELOADING_REFUSAL);
|
|
1653
|
+
// Busy for the whole command: a reload would otherwise abort it via dispose().
|
|
1654
|
+
tracked.busy = (tracked.busy ?? 0) + 1;
|
|
1655
|
+
try {
|
|
1656
|
+
await this.runServerBashUnguarded(tracked, command, excludeFromContext, operations);
|
|
1657
|
+
}
|
|
1658
|
+
finally {
|
|
1659
|
+
tracked.busy -= 1;
|
|
1660
|
+
}
|
|
1661
|
+
}
|
|
1662
|
+
async runServerBashUnguarded(tracked, command, excludeFromContext, operations) {
|
|
1679
1663
|
if (this.onEvent) {
|
|
1680
1664
|
this.onEvent(tracked.sessionFile, {
|
|
1681
1665
|
type: 'tool_execution_start',
|
|
@@ -1782,9 +1766,18 @@ export class SessionPool {
|
|
|
1782
1766
|
if (!pending)
|
|
1783
1767
|
return false;
|
|
1784
1768
|
this.pendingSudo.delete(promptId);
|
|
1785
|
-
|
|
1769
|
+
let tracked = this.getSession(pending.sessionFileOrId);
|
|
1786
1770
|
if (!tracked)
|
|
1787
1771
|
return false;
|
|
1772
|
+
// The password answers a prompt the user already saw; a /reload that started
|
|
1773
|
+
// meanwhile must not make them retype it. Wait the (bounded) reload out and
|
|
1774
|
+
// run on the rebuilt agent. The password lives only in this closure meanwhile.
|
|
1775
|
+
if (tracked.type === 'server' && tracked.reloading) {
|
|
1776
|
+
await tracked.reloadPromise;
|
|
1777
|
+
tracked = this.getSession(pending.sessionFileOrId);
|
|
1778
|
+
if (!tracked)
|
|
1779
|
+
return false;
|
|
1780
|
+
}
|
|
1788
1781
|
tracked.lastActivity = Date.now();
|
|
1789
1782
|
this.cancelIdleCheck(tracked.sessionFile);
|
|
1790
1783
|
if (tracked.type === 'server') {
|
|
@@ -1856,6 +1849,8 @@ export class SessionPool {
|
|
|
1856
1849
|
if (!tracked)
|
|
1857
1850
|
return { error: 'Session not found' };
|
|
1858
1851
|
if (tracked.type === 'server') {
|
|
1852
|
+
if (tracked.reloading)
|
|
1853
|
+
return { error: RELOADING_REFUSAL };
|
|
1859
1854
|
const parsed = this.parseModelStr(modelStr);
|
|
1860
1855
|
if (!parsed)
|
|
1861
1856
|
return { error: `Invalid model format: ${modelStr}` };
|
|
@@ -1959,9 +1954,14 @@ export class SessionPool {
|
|
|
1959
1954
|
const tracked = this.getSession(sessionFileOrId);
|
|
1960
1955
|
if (!tracked)
|
|
1961
1956
|
return Promise.resolve();
|
|
1962
|
-
this.cancelIdleCheck(tracked.sessionFile);
|
|
1963
1957
|
let teardown = Promise.resolve();
|
|
1964
|
-
if (tracked.type === 'server') {
|
|
1958
|
+
if (tracked.type === 'server' && tracked.reloading) {
|
|
1959
|
+
// reloadSession owns the agent mid-rebuild: it is already shutting the old
|
|
1960
|
+
// one down, and it releases the new one once it sees the entry is gone.
|
|
1961
|
+
// Waiting for it keeps server shutdown from exiting mid-teardown.
|
|
1962
|
+
teardown = (tracked.reloadPromise ?? Promise.resolve()).then(() => { }, () => { });
|
|
1963
|
+
}
|
|
1964
|
+
else if (tracked.type === 'server') {
|
|
1965
1965
|
tracked.eventUnsubscribe();
|
|
1966
1966
|
teardown = shutdownAndDisposeAgentSession(tracked.agentSession, `${tracked.sessionFile} (${reason})`, this.extensionShutdownTimeoutMs);
|
|
1967
1967
|
}
|
|
@@ -1971,14 +1971,7 @@ export class SessionPool {
|
|
|
1971
1971
|
}
|
|
1972
1972
|
catch (err) { }
|
|
1973
1973
|
}
|
|
1974
|
-
this.
|
|
1975
|
-
// A prompt whose session is gone can never be answered: drop it here so an
|
|
1976
|
-
// abandoned prompt is bounded by the session's own lifetime (idle eviction)
|
|
1977
|
-
// rather than waiting for someone to type the next `!sudo`.
|
|
1978
|
-
for (const [id, p] of this.pendingSudo) {
|
|
1979
|
-
if (p.sessionFileOrId === tracked.sessionFile)
|
|
1980
|
-
this.pendingSudo.delete(id);
|
|
1981
|
-
}
|
|
1974
|
+
this.dropSessionEntry(tracked);
|
|
1982
1975
|
return teardown;
|
|
1983
1976
|
}
|
|
1984
1977
|
async registerCliSession(rawSessionFile, cwd, modelStr, cliWs, isStreaming = false) {
|
|
@@ -2005,7 +1998,12 @@ export class SessionPool {
|
|
|
2005
1998
|
if (existing) {
|
|
2006
1999
|
clients = existing.clients;
|
|
2007
2000
|
this.cancelIdleCheck(sessionFile);
|
|
2008
|
-
if (existing.type === 'server') {
|
|
2001
|
+
if (existing.type === 'server' && existing.reloading) {
|
|
2002
|
+
// Mid-reload there is no turn to interrupt (reload refuses while
|
|
2003
|
+
// streaming), and reloadSession owns the agent: it releases the rebuilt
|
|
2004
|
+
// one once it sees this CLI entry has replaced its own.
|
|
2005
|
+
}
|
|
2006
|
+
else if (existing.type === 'server') {
|
|
2009
2007
|
interruptedToolCall = existing.inFlightToolCount > 0;
|
|
2010
2008
|
interruptedTurn = interruptedToolCall || existing.agentSession.isStreaming;
|
|
2011
2009
|
try {
|
|
@@ -2013,9 +2011,10 @@ export class SessionPool {
|
|
|
2013
2011
|
}
|
|
2014
2012
|
catch (err) { }
|
|
2015
2013
|
// Start the server agent's teardown NOW (its in-flight turn is aborted
|
|
2016
|
-
// synchronously, then session_shutdown, then dispose), but only AWAIT
|
|
2017
|
-
//
|
|
2018
|
-
//
|
|
2014
|
+
// synchronously, then session_shutdown, then dispose), but only AWAIT
|
|
2015
|
+
// it after the CLI entry has replaced it in the pool, so no message can
|
|
2016
|
+
// reach the dying agent while its extensions shut down. The CLI's pi
|
|
2017
|
+
// process binds its own extensions; nothing to do for it.
|
|
2019
2018
|
serverTeardown = shutdownAndDisposeAgentSession(existing.agentSession, `${sessionFile} (cli takeover)`, this.extensionShutdownTimeoutMs);
|
|
2020
2019
|
}
|
|
2021
2020
|
}
|
|
@@ -2137,6 +2136,174 @@ export class SessionPool {
|
|
|
2137
2136
|
// one extension-shutdown timeout, not one per session.
|
|
2138
2137
|
await Promise.all(sessionIds.map((id) => this.destroySession(id, 'server shutdown')));
|
|
2139
2138
|
}
|
|
2139
|
+
/**
|
|
2140
|
+
* Build and START a live server agent: fresh settings, resource loader
|
|
2141
|
+
* (extensions, skills, prompts, context files), createAgentSession, then
|
|
2142
|
+
* bindExtensions. The ONE place a server agent is built, shared by loadSession,
|
|
2143
|
+
* createNewSession and reloadSession, so the three can never drift in which
|
|
2144
|
+
* tools, extensions or lifecycle a server session gets.
|
|
2145
|
+
*/
|
|
2146
|
+
async buildServerAgent(opts) {
|
|
2147
|
+
const settingsManager = SettingsManager.create(opts.cwd, this.agentDir);
|
|
2148
|
+
// The conversation-mode signal is an INLINE pi extension (the SDK-supported
|
|
2149
|
+
// way to get a before_agent_start hook on a server-created session, the
|
|
2150
|
+
// counterpart of the pi.on(...) the CLI-bridge extension registers). It is
|
|
2151
|
+
// per session, so the armed flag can never cross sessions.
|
|
2152
|
+
const conversationSignal = createConversationModeSignal();
|
|
2153
|
+
const resourceLoader = new DefaultResourceLoader({
|
|
2154
|
+
cwd: opts.cwd,
|
|
2155
|
+
agentDir: this.agentDir,
|
|
2156
|
+
settingsManager,
|
|
2157
|
+
extensionFactories: [conversationSignal.inlineExtension, ...this.extraExtensionFactories],
|
|
2158
|
+
});
|
|
2159
|
+
await resourceLoader.reload();
|
|
2160
|
+
const { session: agentSession } = await createAgentSession({
|
|
2161
|
+
cwd: opts.cwd,
|
|
2162
|
+
authStorage: this.authStorage,
|
|
2163
|
+
modelRegistry: this.modelRegistry,
|
|
2164
|
+
model: opts.model,
|
|
2165
|
+
thinkingLevel: opts.thinkingLevel,
|
|
2166
|
+
sessionManager: opts.sessionManager,
|
|
2167
|
+
settingsManager,
|
|
2168
|
+
resourceLoader,
|
|
2169
|
+
// Register attach_file + say for server-created sessions (web frontend
|
|
2170
|
+
// with no CLI bridge). Both tools are self-contained; their UI affordance
|
|
2171
|
+
// (attach_file's download button, say's spoken-reply card) is driven by
|
|
2172
|
+
// the tool call reaching the web UI, no bridge/marker needed.
|
|
2173
|
+
customTools: [createAttachFileTool(opts.cwd), createSayTool()],
|
|
2174
|
+
sessionStartEvent: opts.sessionStartEvent,
|
|
2175
|
+
});
|
|
2176
|
+
// Start the extensions BEFORE the session is tracked or reaches a client:
|
|
2177
|
+
// createAgentSession only loads them, bindExtensions emits session_start +
|
|
2178
|
+
// resources_discover (see extension-lifecycle.ts for the chosen bindings).
|
|
2179
|
+
await this.bindOrDispose(agentSession, opts.label);
|
|
2180
|
+
return { agentSession, conversationSignal };
|
|
2181
|
+
}
|
|
2182
|
+
/** True while `reloadSession` is rebuilding this session's agent. */
|
|
2183
|
+
isReloading(sessionFileOrId) {
|
|
2184
|
+
const tracked = this.getSession(sessionFileOrId);
|
|
2185
|
+
return tracked?.type === 'server' && tracked.reloading === true;
|
|
2186
|
+
}
|
|
2187
|
+
/**
|
|
2188
|
+
* The web `/reload`: re-read settings, extensions, skills, prompts and context
|
|
2189
|
+
* files for a server session, like pi's `/reload`, WITHOUT calling
|
|
2190
|
+
* `AgentSession.reload()`.
|
|
2191
|
+
*
|
|
2192
|
+
* pi's in-place reload calls pi-ai's `resetApiProviders()`, which is
|
|
2193
|
+
* process-wide: every OTHER live session's extension-registered API providers
|
|
2194
|
+
* would vanish for the seconds the reloading session spends re-loading its
|
|
2195
|
+
* extensions. So the agent is REBUILT instead, through the same builder as a
|
|
2196
|
+
* load: the old agent gets `session_shutdown` (reason `reload`) and is
|
|
2197
|
+
* disposed, then a new AgentSession is built on the SAME SessionManager (so
|
|
2198
|
+
* entries not yet flushed to disk survive, exactly as in an in-place reload),
|
|
2199
|
+
* keeping the current model and thinking level, and its extensions get
|
|
2200
|
+
* `session_start` (reason `reload`). The tracked entry is updated in place, so
|
|
2201
|
+
* clients, idle state and the pool key are untouched.
|
|
2202
|
+
*
|
|
2203
|
+
* Refused while the agent is doing anything (streaming, compacting, running a
|
|
2204
|
+
* `!command`, or a send still in its pre-stream phase: see `busy`), for CLI
|
|
2205
|
+
* bridges (the terminal pi owns that agent) and while already reloading; a
|
|
2206
|
+
* refusal returns `started: false` and changes nothing. `onStart` runs once
|
|
2207
|
+
* every check has passed, before the old agent is touched. If the rebuild
|
|
2208
|
+
* fails the old agent is already gone, so the entry is dropped and the next
|
|
2209
|
+
* load builds a fresh one.
|
|
2210
|
+
*
|
|
2211
|
+
* Unlike pi's in-place reload, the rebuild does NOT carry over an active-tool
|
|
2212
|
+
* set an extension narrowed with `setActiveTools`, extension flag values, or
|
|
2213
|
+
* messages an extension queued for the next turn: the new agent starts from
|
|
2214
|
+
* the defaults, as a fresh load would.
|
|
2215
|
+
*/
|
|
2216
|
+
async reloadSession(sessionFileOrId, opts = {}) {
|
|
2217
|
+
const tracked = this.getSession(sessionFileOrId);
|
|
2218
|
+
if (!tracked)
|
|
2219
|
+
return { error: 'Session not found.', started: false };
|
|
2220
|
+
if (tracked.type !== 'server') {
|
|
2221
|
+
return { error: 'This session is running in a terminal pi. Run /reload in that terminal.', started: false };
|
|
2222
|
+
}
|
|
2223
|
+
if (tracked.reloading)
|
|
2224
|
+
return { error: 'This session is already reloading.', started: false };
|
|
2225
|
+
const old = tracked.agentSession;
|
|
2226
|
+
// `busy` covers what pi's flags miss: a send still in extension commands /
|
|
2227
|
+
// input handlers / compaction check (not yet streaming), and a `!command`.
|
|
2228
|
+
if (old.isStreaming || old.isCompacting || old.isBashRunning || (tracked.busy ?? 0) > 0) {
|
|
2229
|
+
return { error: 'Wait for the current response to finish before reloading.', started: false };
|
|
2230
|
+
}
|
|
2231
|
+
// Everything from here to the first await is synchronous, so no send can
|
|
2232
|
+
// slip in between the checks above and `reloading` being observable.
|
|
2233
|
+
tracked.reloading = true;
|
|
2234
|
+
tracked.lastActivity = Date.now();
|
|
2235
|
+
const run = this.runReload(tracked, opts);
|
|
2236
|
+
tracked.reloadPromise = run;
|
|
2237
|
+
return run;
|
|
2238
|
+
}
|
|
2239
|
+
async runReload(tracked, opts) {
|
|
2240
|
+
const old = tracked.agentSession;
|
|
2241
|
+
const label = `${tracked.sessionFile} (reload)`;
|
|
2242
|
+
try {
|
|
2243
|
+
// Past every refusal: the caller can now tell clients the agent is going away.
|
|
2244
|
+
opts.onStart?.();
|
|
2245
|
+
tracked.eventUnsubscribe();
|
|
2246
|
+
const { sessionManager, model, thinkingLevel } = old;
|
|
2247
|
+
await shutdownAndDisposeAgentSession(old, label, this.extensionShutdownTimeoutMs, 'reload');
|
|
2248
|
+
// Otherwise the fresh loader below reuses pi's cached factories: the old code.
|
|
2249
|
+
await clearPiExtensionCache();
|
|
2250
|
+
let built;
|
|
2251
|
+
try {
|
|
2252
|
+
built = await this.buildServerAgent({
|
|
2253
|
+
cwd: tracked.cwd,
|
|
2254
|
+
sessionManager,
|
|
2255
|
+
model,
|
|
2256
|
+
thinkingLevel,
|
|
2257
|
+
sessionStartEvent: { type: 'session_start', reason: 'reload' },
|
|
2258
|
+
label,
|
|
2259
|
+
});
|
|
2260
|
+
}
|
|
2261
|
+
catch (err) {
|
|
2262
|
+
if (this.sessions.get(tracked.sessionFile) !== tracked) {
|
|
2263
|
+
return { error: 'The session was closed while it was reloading.', started: true, closed: true };
|
|
2264
|
+
}
|
|
2265
|
+
this.dropSessionEntry(tracked);
|
|
2266
|
+
return {
|
|
2267
|
+
error: `Reload failed: ${err.message}. Re-open the session to start a fresh agent.`,
|
|
2268
|
+
started: true,
|
|
2269
|
+
};
|
|
2270
|
+
}
|
|
2271
|
+
// The session may have been destroyed (deleted, evicted, taken over by a
|
|
2272
|
+
// CLI, server shutdown) while we were rebuilding. Those paths leave a
|
|
2273
|
+
// reloading agent to us, so the new one is ours to release.
|
|
2274
|
+
if (this.sessions.get(tracked.sessionFile) !== tracked) {
|
|
2275
|
+
await shutdownAndDisposeAgentSession(built.agentSession, `${label} (closed during reload)`, this.extensionShutdownTimeoutMs);
|
|
2276
|
+
return { error: 'The session was closed while it was reloading.', started: true, closed: true };
|
|
2277
|
+
}
|
|
2278
|
+
tracked.agentSession = built.agentSession;
|
|
2279
|
+
tracked.conversationSignal = built.conversationSignal;
|
|
2280
|
+
tracked.model = built.agentSession.model ? `${built.agentSession.model.provider}:${built.agentSession.model.id}` : '';
|
|
2281
|
+
tracked.inFlightToolCount = 0;
|
|
2282
|
+
tracked.isIdle = true;
|
|
2283
|
+
tracked.eventUnsubscribe = this.setupEventListeners(tracked.sessionFile, built.agentSession);
|
|
2284
|
+
return { started: true };
|
|
2285
|
+
}
|
|
2286
|
+
finally {
|
|
2287
|
+
tracked.reloading = false;
|
|
2288
|
+
tracked.reloadPromise = undefined;
|
|
2289
|
+
if (this.sessions.get(tracked.sessionFile) === tracked)
|
|
2290
|
+
this.scheduleIdleCheck(tracked.sessionFile);
|
|
2291
|
+
}
|
|
2292
|
+
}
|
|
2293
|
+
/**
|
|
2294
|
+
* Forget a session entry (its agent's teardown is the caller's business). A
|
|
2295
|
+
* sudo prompt whose session is gone can never be answered: drop it here so an
|
|
2296
|
+
* abandoned prompt is bounded by the session's own lifetime (idle eviction)
|
|
2297
|
+
* rather than waiting for someone to type the next `!sudo`.
|
|
2298
|
+
*/
|
|
2299
|
+
dropSessionEntry(tracked) {
|
|
2300
|
+
this.cancelIdleCheck(tracked.sessionFile);
|
|
2301
|
+
this.sessions.delete(tracked.sessionFile);
|
|
2302
|
+
for (const [id, p] of this.pendingSudo) {
|
|
2303
|
+
if (p.sessionFileOrId === tracked.sessionFile)
|
|
2304
|
+
this.pendingSudo.delete(id);
|
|
2305
|
+
}
|
|
2306
|
+
}
|
|
2140
2307
|
/**
|
|
2141
2308
|
* Bind a freshly created server session's extensions; if that throws, shut
|
|
2142
2309
|
* down and dispose the session so a failed create leaks nothing, then rethrow
|