@pi-chamber/web 1.0.4 → 1.0.5-rc.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/cli.js +21 -2
- package/bin/cli.test.js +164 -4
- package/bin/lib/DOCUMENTATION.md +3 -3
- package/bin/lib/cli-args.js +96 -13
- package/bin/lib/commands-connect-url-tailscale.test.js +136 -0
- package/bin/lib/commands-connect-url.js +146 -39
- package/bin/lib/commands-connect-url.test.js +126 -0
- package/bin/lib/commands-serve.js +45 -2
- package/bin/lib/commands-status.js +28 -5
- package/bin/lib/commands-status.test.js +107 -0
- package/bin/lib/commands-tunnel.js +36 -10
- package/dist/assets/{DiagramView-BpG1c3Hi.js → DiagramView-BWG8peHt.js} +1 -1
- package/dist/assets/DiffView-C_uRNQMT.js +18 -0
- package/dist/assets/{FileSaveConflictDialog-DP7k9a-i.js → FileSaveConflictDialog-DlH8IWDL.js} +2 -2
- package/dist/assets/FilesView-RnF9JBPu.js +6 -0
- package/dist/assets/{GitHubDetailScaffold-UxLAMAOl.js → GitHubDetailScaffold-BTRvUnwh.js} +2 -2
- package/dist/assets/{GitHubLinkPicker-Bh9RO1yK.js → GitHubLinkPicker-CGi8p2zF.js} +1 -1
- package/dist/assets/{GitHubListPrimitives-DQyhT5wG.js → GitHubListPrimitives-XckcmdeA.js} +1 -1
- package/dist/assets/{GitView-XBBheKRM.js → GitView-DyPJ8Oay.js} +4 -4
- package/dist/assets/{IssuesSurface-BA1kpvAJ.js → IssuesSurface-rQ78ziEu.js} +3 -3
- package/dist/assets/{JsonTreeView-BAaEPL4O.js → JsonTreeView-Cy5NKUzx.js} +1 -1
- package/dist/assets/{MarkdownRendererImpl-DzgDmUsL.js → MarkdownRendererImpl-C5AlnAbG.js} +1 -1
- package/dist/assets/{PatchDiff-BMEUsgXH.js → PatchDiff-D6048My1.js} +1 -1
- package/dist/assets/PierreDiffViewer-_000TWrM.js +135 -0
- package/dist/assets/PullRequestsSurface-eACi4Yxm.js +2 -0
- package/dist/assets/SessionSwitcherContent-CFMjBIfH.js +1 -0
- package/dist/assets/SessionSwitcherDropdown-CINW_ydZ.js +2 -0
- package/dist/assets/SessionUnreadDot-YZJi4IFP.js +1 -0
- package/dist/assets/SettingsView-DBiQXIji.js +6 -0
- package/dist/assets/{SettingsWindow-j0e99YI0.js → SettingsWindow-Wvd56oG1.js} +1 -1
- package/dist/assets/StickyHorizontalScrollbar-BMITjK4e.js +8 -0
- package/dist/assets/{ToolOutputDialog-VlS12Xyq.js → ToolOutputDialog-DeDXQNWw.js} +4 -4
- package/dist/assets/{ToolPartDiffPreview-DdSneZws.js → ToolPartDiffPreview-DuN8fldE.js} +1 -1
- package/dist/assets/{VirtualizedFileDiff-BqiXjvP6.js → VirtualizedFileDiff-BYVjUxk9.js} +4 -4
- package/dist/assets/{Virtualizer-Cp_cJWbI.js → Virtualizer-DP6HbEeC.js} +1 -1
- package/dist/assets/{collapsible-C7oyikVm.js → collapsible-BOcd0lzY.js} +1 -1
- package/dist/assets/{computeVirtualFileMetrics-BJjC-tXV.js → computeVirtualFileMetrics-E4gJTgVF.js} +1 -1
- package/dist/assets/{contextFileOpenGuard-BBzqKGei.js → contextFileOpenGuard-CcGZtZsz.js} +1 -1
- package/dist/assets/{gitStatusPredicates-Dq-E5DaH.js → gitStatusPredicates-C2H7tf7t.js} +1 -1
- package/dist/assets/{githubLink-Cryd7GkG.js → githubLink-DTEEkgAl.js} +5 -5
- package/dist/assets/{index-BbhXFTId.js → index-BKc_DF05.js} +1 -1
- package/dist/assets/index-DWSrsQWl.js +11 -0
- package/dist/assets/index-DsQIBAWK.css +1 -0
- package/dist/assets/main-BNoO2jRw.js +136 -0
- package/dist/assets/main-DnCR4Jva.js +2 -0
- package/dist/assets/{markdownCore-B9AuEyYi.js → markdownCore-CP1hsIRw.js} +2 -2
- package/dist/assets/{miniChat-CgOaJfD8.js → miniChat-BBI_B4OS.js} +2 -2
- package/dist/assets/mobile-dRWyYBgl.js +2 -0
- package/dist/assets/{nativeFileSave-BzhtrDoD.js → nativeFileSave-CFuugNKV.js} +1 -1
- package/dist/assets/pi-session-focus-preference-Cw78V7mw.js +9 -0
- package/dist/assets/{renderDiffWithHighlighter-CVLsdtQ5.js → renderDiffWithHighlighter-kdzNWs8-.js} +1 -1
- package/dist/assets/renderElectronMiniChatApp-uVOQvccp.js +2 -0
- package/dist/assets/{renderFileWithHighlighter-DJ9mk2bZ.js → renderFileWithHighlighter-BdeYSXwS.js} +1 -1
- package/dist/assets/renderMobileApp-Cdg1IAhJ.js +11 -0
- package/dist/assets/runtimeEndpointReset-thviM404.js +62 -0
- package/dist/assets/{runtimeSurface-DBiUWYK2.js → runtimeSurface-Der4qUnI.js} +1 -1
- package/dist/assets/useAppFontEffects-Bd0btzjJ.js +212 -0
- package/dist/assets/{useFilesViewSearch-D2Au5Xgt.js → useFilesViewSearch-Yvk43YOy.js} +3 -3
- package/dist/assets/useGitHubRemoteSearch-BUjSEnXC.js +1 -0
- package/dist/assets/{useSwitcherItems-Dej8BzXI.js → useSwitcherItems-D2opwbRZ.js} +1 -1
- package/dist/assets/{vendor-aparajita-capacitor-secure-storage-BYohCVY0.js → vendor-aparajita-capacitor-secure-storage-BDrMx_CE.js} +1 -1
- package/dist/assets/{vendor-base-ui-BscvGUFt.js → vendor-base-ui-CKRUCG-f.js} +1 -1
- package/dist/assets/{vendor-boot-Dgb9NVFe.js → vendor-boot-EC6IyLt1.js} +13 -13
- package/dist/assets/{vendor-capacitor-app-BjdQVib9.js → vendor-capacitor-app-BaupizkW.js} +1 -1
- package/dist/assets/{vendor-capacitor-keyboard-eTtI5go3.js → vendor-capacitor-keyboard-9BVxykO7.js} +1 -1
- package/dist/assets/{vendor-capacitor-status-bar-9rNIGxlO.js → vendor-capacitor-status-bar-BsrUwiaA.js} +1 -1
- package/dist/assets/{vendor-codemirror-autocomplete-DxS3jwvE.js → vendor-codemirror-autocomplete-CGpAsPWp.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-angular-DdjXl9e2.js → vendor-codemirror-lang-angular-CDJoHJSY.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-cpp--aMr7NVt.js → vendor-codemirror-lang-cpp-BmHofQls.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-css-CZ_qxZY9.js → vendor-codemirror-lang-css-RM2HqXZ0.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-go-Ca-y2Alu.js → vendor-codemirror-lang-go-Crwca_X7.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-html-COZ0L5wT.js → vendor-codemirror-lang-html-CHSHUpwq.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-java-D3Rf3QNJ.js → vendor-codemirror-lang-java-lhQXgWu0.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-javascript-DwJ-IvCs.js → vendor-codemirror-lang-javascript-Dw4kFO4e.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-jinja-D_5lod6k.js → vendor-codemirror-lang-jinja-_pAC3UTN.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-json-BG8C7OpC.js → vendor-codemirror-lang-json-B-b1vAv-.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-less-CVEkoaTw.js → vendor-codemirror-lang-less-xIgOi1ze.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-liquid-U9vj0m8w.js → vendor-codemirror-lang-liquid-CP49m5dB.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-markdown-DqlYH9gY.js → vendor-codemirror-lang-markdown-BTht2ATe.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-php-BFEiEVA1.js → vendor-codemirror-lang-php-BguZDhaO.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-python-Cz1dQXQd.js → vendor-codemirror-lang-python-CH6_em9L.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-rust-C_CoD9mj.js → vendor-codemirror-lang-rust-EG_DtGyi.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-sass-BuR0aKh5.js → vendor-codemirror-lang-sass-BknY5Qpo.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-sql-DggNUjdM.js → vendor-codemirror-lang-sql-B0f-qCZo.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-vue-DFZHi2J3.js → vendor-codemirror-lang-vue-CyGn9snv.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-wast-zuTN3SHT.js → vendor-codemirror-lang-wast-CsFfSyyB.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-xml-CrcvhI-k.js → vendor-codemirror-lang-xml-Cdan_Jp1.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-yaml-DcVWsakb.js → vendor-codemirror-lang-yaml-COI5hck8.js} +1 -1
- package/dist/assets/{vendor-codemirror-language-data-CCLITgCF.js → vendor-codemirror-language-data-CqU7kHmg.js} +2 -2
- package/dist/assets/{vendor-codemirror-search-H7NOEdbX.js → vendor-codemirror-search-DUfSCF9S.js} +1 -1
- package/dist/assets/{vendor-lezer-cpp-C8aD2KAr.js → vendor-lezer-cpp-DMZOJzBa.js} +1 -1
- package/dist/assets/{vendor-lezer-css-2lbTJF-Y.js → vendor-lezer-css-DUkkbMp7.js} +1 -1
- package/dist/assets/{vendor-lezer-go-Bw6LFTrZ.js → vendor-lezer-go-CHIhCNY6.js} +1 -1
- package/dist/assets/{vendor-lezer-html-D7ym2z7S.js → vendor-lezer-html-B3h0MOrG.js} +1 -1
- package/dist/assets/{vendor-lezer-java-CZhK7w21.js → vendor-lezer-java-tMazV_6X.js} +1 -1
- package/dist/assets/{vendor-lezer-javascript-rpKeTHZp.js → vendor-lezer-javascript-ctwLWf4v.js} +1 -1
- package/dist/assets/{vendor-lezer-json-C7jwsd2G.js → vendor-lezer-json-BP_UAzLL.js} +1 -1
- package/dist/assets/{vendor-lezer-lr-DR-ylqNN.js → vendor-lezer-lr-B8TQctNw.js} +1 -1
- package/dist/assets/{vendor-lezer-markdown-Bir0m5nB.js → vendor-lezer-markdown-aGLZf_3h.js} +1 -1
- package/dist/assets/{vendor-lezer-php-y0hIEfo1.js → vendor-lezer-php-D5zCNzlt.js} +1 -1
- package/dist/assets/{vendor-lezer-python-D64A9lNV.js → vendor-lezer-python-EJ4Im4y2.js} +1 -1
- package/dist/assets/{vendor-lezer-rust-E3ZA9T2L.js → vendor-lezer-rust-DO5c7OtA.js} +1 -1
- package/dist/assets/{vendor-lezer-sass-C5UFI9SP.js → vendor-lezer-sass-CMi6zfXI.js} +1 -1
- package/dist/assets/{vendor-lezer-xml-DOy7FzCR.js → vendor-lezer-xml-0MHMeZDp.js} +1 -1
- package/dist/assets/{vendor-lezer-yaml-kEjaSCvZ.js → vendor-lezer-yaml-BE2EFjpA.js} +1 -1
- package/dist/assets/{vendor-replit-codemirror-vim-BLfh0LPy.js → vendor-replit-codemirror-vim-AnOuN8yJ.js} +1 -1
- package/dist/assets/{web-components-C7CmoFxi.js → web-components-BeROQeen.js} +3 -3
- package/dist/index.html +4 -4
- package/dist/mini-chat.html +3 -3
- package/dist/mobile.html +3 -3
- package/dist/sw.js +1 -1
- package/package.json +1 -2
- package/server/index.js +72 -30
- package/server/lib/client-auth/DOCUMENTATION.md +15 -1
- package/server/lib/client-auth/pairing.js +2 -12
- package/server/lib/client-auth/remote-clients.js +2 -12
- package/server/lib/cloudflare-tunnel.js +0 -132
- package/server/lib/fs/DOCUMENTATION.md +8 -0
- package/server/lib/fs/atomic-write.js +111 -0
- package/server/lib/fs/atomic-write.test.js +133 -0
- package/server/lib/notifications/DOCUMENTATION.md +43 -32
- package/server/lib/notifications/pi-notification-watcher.js +8 -7
- package/server/lib/notifications/pi-notification-watcher.test.js +88 -2
- package/server/lib/pi/routes-extension-events.test.js +231 -0
- package/server/lib/pi/routes.js +137 -4
- package/server/lib/pi/routes.test.js +248 -2
- package/server/lib/pi/session-daemon/DOCUMENTATION.md +17 -4
- package/server/lib/pi/session-daemon/daemon-process.js +2 -0
- package/server/lib/pi/session-daemon/engines/index.js +6 -0
- package/server/lib/pi/session-daemon/extension-bridge-draft.test.js +1 -1
- package/server/lib/pi/session-daemon/extension-bridge.js +24 -0
- package/server/lib/pi/session-daemon/extension-message-render.js +74 -0
- package/server/lib/pi/session-daemon/extension-message-render.test.js +164 -0
- package/server/lib/pi/session-daemon/extension-tool-render.js +13 -6
- package/server/lib/pi/session-daemon/pending-input.js +188 -0
- package/server/lib/pi/session-daemon/pending-input.test.js +202 -0
- package/server/lib/pi/session-daemon/session-daemon-engines.test.js +828 -0
- package/server/lib/pi/session-daemon/session-daemon-extensions.test.js +296 -6
- package/server/lib/pi/session-daemon/session-daemon-turn.e2e.test.js +9 -0
- package/server/lib/pi/session-daemon/session-daemon.js +219 -19
- package/server/lib/pi/session-daemon/session-daemon.test.js +30 -2
- package/server/lib/pi/session-daemon/session-engine-router.js +390 -0
- package/server/lib/pi/session-daemon/session-engine-router.test.js +515 -0
- package/server/lib/pi/session-daemon/session-engines.js +467 -0
- package/server/lib/pi/session-daemon/session-engines.test.js +383 -0
- package/server/lib/pi/snippets-store.js +8 -17
- package/server/lib/pi/ui-settings-store.js +6 -10
- package/server/lib/pi/ui-settings-store.test.js +37 -1
- package/server/lib/relay/DOCUMENTATION.md +6 -4
- package/server/lib/relay/identity-store.js +116 -0
- package/server/lib/relay/identity-store.test.js +169 -0
- package/server/lib/relay/identity.js +6 -4
- package/server/lib/relay/server-id.js +63 -0
- package/server/lib/relay/server-id.test.js +132 -0
- package/server/lib/relay/signing-key.js +14 -11
- package/server/lib/security/bind-host.js +6 -2
- package/server/lib/security/bind-host.test.js +17 -0
- package/server/lib/server/core-routes.js +27 -1
- package/server/lib/server/lan-addresses.js +18 -6
- package/server/lib/server/lan-addresses.test.js +28 -0
- package/server/lib/server/tunnel-auth.js +47 -7
- package/server/lib/server/tunnel-auth.rate-limit.test.js +164 -0
- package/server/lib/server/tunnel-service.DOCUMENTATION.md +3 -4
- package/server/lib/server/tunnel-service.js +23 -20
- package/server/lib/server/tunnel-service.test.js +19 -2
- package/server/lib/stt/config-store.js +5 -15
- package/server/lib/tailscale/DOCUMENTATION.md +285 -0
- package/server/lib/tailscale/nc-probe.js +220 -0
- package/server/lib/tailscale/routes.js +45 -0
- package/server/lib/tailscale/service.js +1012 -0
- package/server/lib/tailscale/tailscale.js +302 -0
- package/server/lib/tailscale/tailscale.test.js +2080 -0
- package/server/lib/tunnels/DOCUMENTATION.md +3 -4
- package/server/lib/tunnels/providers/cloudflare.js +1 -22
- package/server/lib/tunnels/types.js +0 -2
- package/server/lib/ui-auth/DOCUMENTATION.md +31 -0
- package/server/lib/ui-auth/ui-auth.js +80 -6
- package/server/lib/ui-auth/ui-auth.test.js +136 -0
- package/server/lib/ui-auth/ui-passkeys.js +2 -13
- package/server/lib/update-job-store.js +4 -6
- package/dist/assets/DiffView-BxwoRCYx.js +0 -18
- package/dist/assets/FilesView-D_2QcdUt.js +0 -6
- package/dist/assets/PierreDiffViewer-BW8MO-O6.js +0 -134
- package/dist/assets/PullRequestsSurface-B3ictm4I.js +0 -2
- package/dist/assets/SessionSwitcherContent-rLoyVqgs.js +0 -1
- package/dist/assets/SessionSwitcherDropdown-CfySKnUu.js +0 -2
- package/dist/assets/SessionUnreadDot-CmEF9sxM.js +0 -1
- package/dist/assets/SettingsView-BiwlwnTK.js +0 -6
- package/dist/assets/index-BnZVqcki.js +0 -11
- package/dist/assets/index-BnieExes.css +0 -1
- package/dist/assets/main-9O5IAtT_.js +0 -136
- package/dist/assets/main-DWGwALIw.js +0 -2
- package/dist/assets/mobile-BbJcYVym.js +0 -2
- package/dist/assets/pi-session-focus-preference-Bmk1iOvn.js +0 -10
- package/dist/assets/renderElectronMiniChatApp-R5o9NwFC.js +0 -2
- package/dist/assets/renderMobileApp-CQ9tWYIj.js +0 -11
- package/dist/assets/runtimeEndpointReset-CtK4C_5h.js +0 -62
- package/dist/assets/useAppFontEffects-DviRbaCJ.js +0 -212
- package/dist/assets/useGitHubRemoteSearch-D-K7aolk.js +0 -1
- package/dist/assets/vendor-capacitor-push-notifications-CBKq2Arn.js +0 -1
- package/server/lib/notifications/delivery-runtime.js +0 -314
- package/server/lib/notifications/delivery-runtime.test.js +0 -85
- package/server/lib/notifications/routes.js +0 -74
- package/server/lib/relay/service.js +0 -9
|
@@ -37,6 +37,7 @@ import {
|
|
|
37
37
|
createExtensionToolRenderer,
|
|
38
38
|
installExtensionGlobalTheme,
|
|
39
39
|
} from './extension-tool-render.js';
|
|
40
|
+
import { createExtensionMessageRenderer } from './extension-message-render.js';
|
|
40
41
|
import { getBuiltinExtensionFactories } from './builtin-extensions.js';
|
|
41
42
|
import {
|
|
42
43
|
SESSION_DAEMON_DEFAULT_MESSAGE_PAGE_LIMIT,
|
|
@@ -66,6 +67,12 @@ import {
|
|
|
66
67
|
validatePiSessionJsonlFile,
|
|
67
68
|
} from './session-jsonl.js';
|
|
68
69
|
import { resolvePiChamberDataDir } from '../../pichamber-data-dir.js';
|
|
70
|
+
import {
|
|
71
|
+
createSessionEngineRegistry,
|
|
72
|
+
logSessionEngineError,
|
|
73
|
+
} from './session-engines.js';
|
|
74
|
+
import { createSessionEngineRouter } from './session-engine-router.js';
|
|
75
|
+
import { createPendingInputIndex } from './pending-input.js';
|
|
69
76
|
|
|
70
77
|
const textFromContent = (content) => (
|
|
71
78
|
Array.isArray(content)
|
|
@@ -210,6 +217,8 @@ export function createSessionDaemon({
|
|
|
210
217
|
}
|
|
211
218
|
},
|
|
212
219
|
extensionToolRenderer: injectExtensionToolRenderer,
|
|
220
|
+
engines = [],
|
|
221
|
+
extensionMessageRenderer: injectExtensionMessageRenderer,
|
|
213
222
|
} = {}) {
|
|
214
223
|
if (!isLocalSessionDaemonEndpoint(endpoint, platform)) {
|
|
215
224
|
throw new SessionDaemonProtocolError('INVALID_ENDPOINT', 'The session daemon endpoint must be local.');
|
|
@@ -226,12 +235,17 @@ export function createSessionDaemon({
|
|
|
226
235
|
if (!Number.isFinite(sendOperationTtlMs) || sendOperationTtlMs <= 0) {
|
|
227
236
|
throw new SessionDaemonProtocolError('INVALID_SEND_OPERATION_TTL', 'The session daemon send operation ttl is invalid.');
|
|
228
237
|
}
|
|
238
|
+
if (!Array.isArray(engines) || engines.some((factory) => typeof factory !== 'function')) {
|
|
239
|
+
throw new SessionDaemonProtocolError('INVALID_ENGINES', 'The session engine list is invalid.');
|
|
240
|
+
}
|
|
229
241
|
|
|
230
242
|
let server;
|
|
231
243
|
let runtime;
|
|
232
244
|
const extensionTheme = createExtensionTheme();
|
|
233
245
|
installExtensionGlobalTheme(extensionTheme);
|
|
234
246
|
const extensionToolRenderer = injectExtensionToolRenderer ?? createExtensionToolRenderer({ theme: extensionTheme });
|
|
247
|
+
const extensionMessageRenderer = injectExtensionMessageRenderer
|
|
248
|
+
?? createExtensionMessageRenderer({ theme: extensionTheme, redactAttachmentPaths: (value) => redactAttachmentPaths(value) });
|
|
235
249
|
let ownerServerInstanceId = typeof serverInstanceId === 'string' && serverInstanceId.length > 0 ? serverInstanceId : null;
|
|
236
250
|
let ownerServerPid = Number.isInteger(serverPid) && serverPid > 0 ? serverPid : null;
|
|
237
251
|
const leaseOwner = () => {
|
|
@@ -273,6 +287,10 @@ export function createSessionDaemon({
|
|
|
273
287
|
}
|
|
274
288
|
};
|
|
275
289
|
let runtimeRegistry;
|
|
290
|
+
// Session engine registry. Created in `start()` (empty when no factories
|
|
291
|
+
// are registered); every routing branch guards on `size > 0` so the
|
|
292
|
+
// zero-engine path runs exactly the Pi-only code.
|
|
293
|
+
let engineRegistry;
|
|
276
294
|
let runtimeStartPromise;
|
|
277
295
|
let idleDisposeTimer;
|
|
278
296
|
let dormantSession;
|
|
@@ -573,6 +591,14 @@ export function createSessionDaemon({
|
|
|
573
591
|
for (const client of clients) writeLine(client, line);
|
|
574
592
|
};
|
|
575
593
|
|
|
594
|
+
// Daemon-level pending-input state: whether a session is blocked waiting
|
|
595
|
+
// for the user. Daemon-hosted blocking requests (extension dialogs) and
|
|
596
|
+
// engine-reported summaries both feed it; every device learns it without
|
|
597
|
+
// opening the session. Declared before the bridge so dialogs register.
|
|
598
|
+
const pendingInput = createPendingInputIndex({
|
|
599
|
+
publish,
|
|
600
|
+
onHostedSessionSettled: (sessionId) => safeTouchIdleDisposal(sessionId),
|
|
601
|
+
});
|
|
576
602
|
const extensionBridge = createExtensionBridge({
|
|
577
603
|
publish,
|
|
578
604
|
resolveDirectory,
|
|
@@ -583,7 +609,9 @@ export function createSessionDaemon({
|
|
|
583
609
|
getDefaultDirectory: () => activeDirectory || cwd,
|
|
584
610
|
getSequence: () => sequence,
|
|
585
611
|
protocolError: (code, message) => new SessionDaemonProtocolError(code, message),
|
|
612
|
+
renderExtensionMessage: (session, message) => extensionMessageRenderer.renderMessage(session, message),
|
|
586
613
|
requestSessionShutdown: (sessionId) => shutdownRequestedBySession.add(sessionId),
|
|
614
|
+
pendingInput,
|
|
587
615
|
});
|
|
588
616
|
const {
|
|
589
617
|
buildExtensionBindings,
|
|
@@ -652,6 +680,18 @@ export function createSessionDaemon({
|
|
|
652
680
|
};
|
|
653
681
|
|
|
654
682
|
const publishSnapshot = (socket, requestedSessionId, { resync = false } = {}) => {
|
|
683
|
+
const engineSnapshot = engineRouter.snapshotEvent(requestedSessionId, { resync });
|
|
684
|
+
if (engineSnapshot) {
|
|
685
|
+
writeFrame(socket, {
|
|
686
|
+
protocolVersion: PROTOCOL_VERSION,
|
|
687
|
+
kind: 'event',
|
|
688
|
+
event: 'session.snapshot',
|
|
689
|
+
streamEpoch,
|
|
690
|
+
sequence: engineSnapshot.sequence,
|
|
691
|
+
payload: engineSnapshot.payload,
|
|
692
|
+
});
|
|
693
|
+
return;
|
|
694
|
+
}
|
|
655
695
|
const targetRuntime = requestedSessionId ? runtimeRegistry?.findBySessionId(requestedSessionId) : runtime;
|
|
656
696
|
const session = targetRuntime?.session
|
|
657
697
|
? { sessionId: targetRuntime.session.sessionId, isStreaming: targetRuntime.session.isStreaming }
|
|
@@ -705,6 +745,11 @@ export function createSessionDaemon({
|
|
|
705
745
|
...(extensionSnapshot.title ? { extensionTitle: extensionSnapshot.title } : {}),
|
|
706
746
|
...(extensionSnapshot.working ? { extensionWorking: extensionSnapshot.working } : {}),
|
|
707
747
|
...(extensionSnapshot.draftTracked ? { extensionDraftTracked: true } : {}),
|
|
748
|
+
...(session.sessionId
|
|
749
|
+
? {
|
|
750
|
+
inputState: { pending: pendingInput.summaryFor(session.sessionId) },
|
|
751
|
+
}
|
|
752
|
+
: {}),
|
|
708
753
|
},
|
|
709
754
|
});
|
|
710
755
|
};
|
|
@@ -764,6 +809,7 @@ export function createSessionDaemon({
|
|
|
764
809
|
await resourceReloadQueue.catch(() => {});
|
|
765
810
|
resourceReloadsByRuntime.clear();
|
|
766
811
|
clearExtensionState(undefined);
|
|
812
|
+
pendingInput.clear();
|
|
767
813
|
const leased = [];
|
|
768
814
|
try {
|
|
769
815
|
for (const tracked of runtimeRegistry?.listAll?.() ?? []) {
|
|
@@ -972,6 +1018,11 @@ export function createSessionDaemon({
|
|
|
972
1018
|
|
|
973
1019
|
const isIdleDisposalSafe = (sessionId, targetRuntime) => {
|
|
974
1020
|
if (!targetRuntime) return false;
|
|
1021
|
+
// A session blocked on a hosted input request (e.g. an extension dialog
|
|
1022
|
+
// opened while idle) must survive the idle timer so a user who walks
|
|
1023
|
+
// away finds it still pending later. Deletion and daemon stop still
|
|
1024
|
+
// cancel dialogs as before.
|
|
1025
|
+
if (isValidIdleSessionId(sessionId) && pendingInput.hasHostedRequests(sessionId)) return false;
|
|
975
1026
|
if (isValidIdleSessionId(sessionId) && (activeSessionRequests.get(sessionId) ?? 0) > 0) return false;
|
|
976
1027
|
if (targetRuntime.session?.isStreaming || targetRuntime.session?.isCompacting) return false;
|
|
977
1028
|
if (activeSessionInputs.has(targetRuntime)) return false;
|
|
@@ -1015,9 +1066,11 @@ export function createSessionDaemon({
|
|
|
1015
1066
|
const targetCwd = targetRuntime.cwd || activeDirectory || cwd;
|
|
1016
1067
|
try {
|
|
1017
1068
|
if (targetRuntime === runtime) rememberRuntimeSession();
|
|
1018
|
-
//
|
|
1019
|
-
//
|
|
1020
|
-
//
|
|
1069
|
+
// Kept for safety: while a hosted input request is pending the idle
|
|
1070
|
+
// guard above refuses disposal, so this cancel path is normally
|
|
1071
|
+
// unreachable from idle disposal. Deletion and daemon stop still
|
|
1072
|
+
// cancel dialogs with an authoritative dismiss event so no extension
|
|
1073
|
+
// thread blocks forever on a disposed runtime.
|
|
1021
1074
|
clearExtensionState(sessionId);
|
|
1022
1075
|
extensionToolRenderer.clearSession(sessionId);
|
|
1023
1076
|
await runtimeRegistry.dispose(targetRuntime);
|
|
@@ -1057,6 +1110,7 @@ export function createSessionDaemon({
|
|
|
1057
1110
|
activeRunStartedAt.delete(sessionId);
|
|
1058
1111
|
shutdownRequestedBySession.delete(sessionId);
|
|
1059
1112
|
publish('session.deleted', {}, sessionId, targetCwd);
|
|
1113
|
+
pendingInput.forgetSession(sessionId);
|
|
1060
1114
|
}
|
|
1061
1115
|
} catch {
|
|
1062
1116
|
// A failed disposal retains ownership (registry entry, lease, and
|
|
@@ -1239,6 +1293,9 @@ export function createSessionDaemon({
|
|
|
1239
1293
|
...(safeFirstMessage ? { preview: safeFirstMessage } : {}),
|
|
1240
1294
|
updatedAt,
|
|
1241
1295
|
...(liveById.has(session.id) ? { live: liveById.get(session.id) } : {}),
|
|
1296
|
+
// Daemon-level pending input: authoritatively null when nothing is
|
|
1297
|
+
// pending, always stamped with the same observed sequence as `live`.
|
|
1298
|
+
inputState: { pending: pendingInput.summaryFor(session.id), sequence: observedSequence },
|
|
1242
1299
|
};
|
|
1243
1300
|
});
|
|
1244
1301
|
};
|
|
@@ -1577,7 +1634,7 @@ export function createSessionDaemon({
|
|
|
1577
1634
|
: Array.isArray(entry.content)
|
|
1578
1635
|
? textFromContent(entry.content)
|
|
1579
1636
|
: '';
|
|
1580
|
-
|
|
1637
|
+
const projected = {
|
|
1581
1638
|
message: {
|
|
1582
1639
|
id: entry.id, sessionId: session.sessionId, directory: targetDir, role: 'extension',
|
|
1583
1640
|
customType: entry.customType,
|
|
@@ -1586,7 +1643,11 @@ export function createSessionDaemon({
|
|
|
1586
1643
|
...(entry.details !== undefined ? { details: redactAttachmentValues(entry.details) } : {}),
|
|
1587
1644
|
},
|
|
1588
1645
|
parts: [],
|
|
1589
|
-
}
|
|
1646
|
+
};
|
|
1647
|
+
// Renderer input is rebuilt from the entry so replay sees exactly
|
|
1648
|
+
// what the live path received; the render itself resolves lazily.
|
|
1649
|
+
pendingMessageRenders.set(projected, () => extensionMessageRenderer.renderEntry(session, entry));
|
|
1650
|
+
return [projected];
|
|
1590
1651
|
}
|
|
1591
1652
|
if (entry?.type !== 'message' || !entry.message || typeof entry.id !== 'string') return [];
|
|
1592
1653
|
const timestamp = Date.parse(entry.timestamp);
|
|
@@ -1729,6 +1790,22 @@ export function createSessionDaemon({
|
|
|
1729
1790
|
return projected;
|
|
1730
1791
|
};
|
|
1731
1792
|
|
|
1793
|
+
// Custom message renders run extension code too, so they resolve lazily
|
|
1794
|
+
// for the same reason: only for messages a page actually selects.
|
|
1795
|
+
const pendingMessageRenders = new WeakMap();
|
|
1796
|
+
const materializeMessageRenders = (projected) => {
|
|
1797
|
+
const resolve = projected && pendingMessageRenders.get(projected);
|
|
1798
|
+
if (!resolve) return projected;
|
|
1799
|
+
pendingMessageRenders.delete(projected);
|
|
1800
|
+
try {
|
|
1801
|
+
const render = resolve();
|
|
1802
|
+
if (render) projected.message.render = render;
|
|
1803
|
+
} catch {}
|
|
1804
|
+
return projected;
|
|
1805
|
+
};
|
|
1806
|
+
|
|
1807
|
+
const materializePendingRenders = (projected) => materializeMessageRenders(materializeToolRenders(projected));
|
|
1808
|
+
|
|
1732
1809
|
const projectMessagePage = (messages, options = {}) => {
|
|
1733
1810
|
const requestedLimit = options.limit ?? SESSION_DAEMON_DEFAULT_MESSAGE_PAGE_LIMIT;
|
|
1734
1811
|
if (!Number.isSafeInteger(requestedLimit) || requestedLimit < 1 || requestedLimit > SESSION_DAEMON_MAX_MESSAGE_PAGE_LIMIT) {
|
|
@@ -1746,7 +1823,7 @@ export function createSessionDaemon({
|
|
|
1746
1823
|
let start = end;
|
|
1747
1824
|
let pageBytes = 2;
|
|
1748
1825
|
while (start > 0 && end - start < requestedLimit) {
|
|
1749
|
-
const candidate =
|
|
1826
|
+
const candidate = materializePendingRenders(messages[start - 1]);
|
|
1750
1827
|
const candidateBytes = Buffer.byteLength(JSON.stringify(candidate));
|
|
1751
1828
|
if (start < end && pageBytes + candidateBytes + 1 > SESSION_DAEMON_MESSAGE_PAGE_TARGET_BYTES) break;
|
|
1752
1829
|
start -= 1;
|
|
@@ -1757,7 +1834,7 @@ export function createSessionDaemon({
|
|
|
1757
1834
|
const firstMessage = selected[0]?.message;
|
|
1758
1835
|
if (firstMessage?.role === 'assistant' && typeof firstMessage.parentId === 'string') {
|
|
1759
1836
|
anchorIndex = messages.findIndex((entry, index) => index < start && entry?.message?.id === firstMessage.parentId);
|
|
1760
|
-
if (anchorIndex >= 0) selected.unshift(
|
|
1837
|
+
if (anchorIndex >= 0) selected.unshift(materializePendingRenders(messages[anchorIndex]));
|
|
1761
1838
|
}
|
|
1762
1839
|
const beginsAtAdjacentAnchor = anchorIndex === start - 1;
|
|
1763
1840
|
const cursorIndex = beginsAtAdjacentAnchor ? anchorIndex : start;
|
|
@@ -1843,6 +1920,7 @@ export function createSessionDaemon({
|
|
|
1843
1920
|
...(extensionSnapshot.title ? { extensionTitle: extensionSnapshot.title } : {}),
|
|
1844
1921
|
...(extensionSnapshot.working ? { extensionWorking: extensionSnapshot.working } : {}),
|
|
1845
1922
|
...(extensionSnapshot.draftTracked ? { extensionDraftTracked: true } : {}),
|
|
1923
|
+
inputState: { pending: pendingInput.summaryFor(session.sessionId) },
|
|
1846
1924
|
};
|
|
1847
1925
|
};
|
|
1848
1926
|
|
|
@@ -2242,9 +2320,21 @@ export function createSessionDaemon({
|
|
|
2242
2320
|
...(attempt.prompt ? { prompt: attempt.prompt } : {}),
|
|
2243
2321
|
...(attempt.authUrl ? { authUrl: attempt.authUrl } : {}),
|
|
2244
2322
|
...(attempt.deviceCode ? { deviceCode: attempt.deviceCode } : {}),
|
|
2245
|
-
...(attempt.errorCode ? { error: { code: attempt.errorCode } } : {}),
|
|
2323
|
+
...(attempt.errorCode ? { error: { code: attempt.errorCode, ...(attempt.errorMessage ? { message: attempt.errorMessage } : {}) } } : {}),
|
|
2246
2324
|
});
|
|
2247
2325
|
|
|
2326
|
+
// Pi's login errors explain what to fix (state mismatch, wrong pasted URL,
|
|
2327
|
+
// token endpoint rejection). Strip URL query strings so an echoed callback URL
|
|
2328
|
+
// never carries an authorization code, and bound the length.
|
|
2329
|
+
const describeLoginError = (error) => {
|
|
2330
|
+
const parts = [];
|
|
2331
|
+
for (let current = error, depth = 0; current && depth < 3; current = current.cause, depth += 1) {
|
|
2332
|
+
if (typeof current.message === 'string' && current.message.trim()) parts.push(current.message.trim());
|
|
2333
|
+
}
|
|
2334
|
+
const message = parts.join(': ').replace(/(https?:\/\/[^\s?#]+)[?#]\S*/gi, '$1').replace(/\s+/g, ' ');
|
|
2335
|
+
return message ? message.slice(0, 500) : undefined;
|
|
2336
|
+
};
|
|
2337
|
+
|
|
2248
2338
|
const getLoginAttempt = (providerId, attemptId) => {
|
|
2249
2339
|
const attempt = loginAttempts.get(attemptId);
|
|
2250
2340
|
if (!attempt || attempt.providerId !== providerId) {
|
|
@@ -2282,7 +2372,7 @@ export function createSessionDaemon({
|
|
|
2282
2372
|
const controller = new AbortController();
|
|
2283
2373
|
const attempt = {
|
|
2284
2374
|
id: randomUUID(), providerId: payload.providerId, state: 'pending', controller,
|
|
2285
|
-
prompt: undefined, authUrl: undefined, deviceCode: undefined, errorCode: undefined,
|
|
2375
|
+
prompt: undefined, authUrl: undefined, deviceCode: undefined, errorCode: undefined, errorMessage: undefined,
|
|
2286
2376
|
resolvePrompt: undefined, rejectPrompt: undefined,
|
|
2287
2377
|
};
|
|
2288
2378
|
attempt.expiry = expireLoginAttempt(attempt);
|
|
@@ -2322,9 +2412,20 @@ export function createSessionDaemon({
|
|
|
2322
2412
|
}
|
|
2323
2413
|
},
|
|
2324
2414
|
};
|
|
2325
|
-
|
|
2415
|
+
// Pi 1.0 OAuth flows such as Sign in with ChatGPT require a stable device ID
|
|
2416
|
+
// for this installation; the Pi CLI passes the same option from global settings.
|
|
2417
|
+
const settingsManager = activeRuntime.services?.settingsManager;
|
|
2418
|
+
const loginOptions = typeof settingsManager?.getOrCreateDeviceId === 'function'
|
|
2419
|
+
? { getDeviceId: () => settingsManager.getOrCreateDeviceId() }
|
|
2420
|
+
: undefined;
|
|
2421
|
+
void modelRuntime.login(payload.providerId, payload.type, interaction, loginOptions).then(
|
|
2326
2422
|
() => { attempt.state = 'complete'; attempt.prompt = undefined; },
|
|
2327
|
-
() => {
|
|
2423
|
+
(error) => {
|
|
2424
|
+
attempt.state = 'failed';
|
|
2425
|
+
attempt.prompt = undefined;
|
|
2426
|
+
attempt.errorCode = 'PROVIDER_AUTH_REQUIRED';
|
|
2427
|
+
attempt.errorMessage = describeLoginError(error);
|
|
2428
|
+
},
|
|
2328
2429
|
).finally(() => {
|
|
2329
2430
|
clearTimeout(attempt.expiry);
|
|
2330
2431
|
const timer = setTimeout(() => loginAttempts.delete(attempt.id), 5 * 60 * 1_000);
|
|
@@ -3081,7 +3182,7 @@ export function createSessionDaemon({
|
|
|
3081
3182
|
: null,
|
|
3082
3183
|
});
|
|
3083
3184
|
|
|
3084
|
-
const sessionInput = async (payload, delivery) => {
|
|
3185
|
+
const sessionInput = async (payload, delivery, execute = runSessionInput) => {
|
|
3085
3186
|
if (!payload || typeof payload !== 'object' || typeof payload.sessionId !== 'string'
|
|
3086
3187
|
|| typeof payload.text !== 'string' || payload.text.length === 0 || Buffer.byteLength(payload.text) > 64 * 1024) {
|
|
3087
3188
|
throw new SessionDaemonProtocolError('INVALID_PROMPT', 'The session prompt is invalid.');
|
|
@@ -3136,7 +3237,7 @@ export function createSessionDaemon({
|
|
|
3136
3237
|
claimEntry = claimed.entry;
|
|
3137
3238
|
}
|
|
3138
3239
|
try {
|
|
3139
|
-
const result = await
|
|
3240
|
+
const result = await execute(payload, delivery);
|
|
3140
3241
|
claimEntry?.settle({ accepted: true, receipt: { accepted: true, messageId: result.messageId } });
|
|
3141
3242
|
return result;
|
|
3142
3243
|
} catch (error) {
|
|
@@ -3457,6 +3558,9 @@ export function createSessionDaemon({
|
|
|
3457
3558
|
// catalog, transcript, activity, and caches. Archive and directory moves
|
|
3458
3559
|
// keep the session id and never publish this event.
|
|
3459
3560
|
publish('session.deleted', {}, sessionId, targetDir);
|
|
3561
|
+
// `session.deleted` already tells clients; drop pending-input state
|
|
3562
|
+
// without publishing a redundant `session.input`.
|
|
3563
|
+
pendingInput.forgetSession(sessionId);
|
|
3460
3564
|
} finally {
|
|
3461
3565
|
// Deletion never re-arms idle lifetime.
|
|
3462
3566
|
clearIdleDisposal(sessionId);
|
|
@@ -3866,11 +3970,33 @@ export function createSessionDaemon({
|
|
|
3866
3970
|
}
|
|
3867
3971
|
};
|
|
3868
3972
|
|
|
3973
|
+
// Session engine router: all ownership-first dispatch lives in
|
|
3974
|
+
// `session-engine-router.js`; the daemon keeps thin call sites so upstream
|
|
3975
|
+
// Pi merges stay conflict-free. Each method guards on an empty registry,
|
|
3976
|
+
// so the zero-engine path runs exactly the Pi-only code.
|
|
3977
|
+
const engineRouter = createSessionEngineRouter({
|
|
3978
|
+
getRegistry: () => engineRegistry,
|
|
3979
|
+
resolveDirectory,
|
|
3980
|
+
sessionInput,
|
|
3981
|
+
redact: (value) => redactAttachmentValues(value),
|
|
3982
|
+
createError: (code, message) => new SessionDaemonProtocolError(code, message),
|
|
3983
|
+
logEngineError: (engineId, event, error) => logSessionEngineError(undefined, engineId, event, error),
|
|
3984
|
+
writeFrame,
|
|
3985
|
+
writeDetail: writeDetailResponse,
|
|
3986
|
+
publish,
|
|
3987
|
+
getStreamEpoch: () => streamEpoch,
|
|
3988
|
+
allocateSequence: () => ++sequence,
|
|
3989
|
+
protocolVersion: PROTOCOL_VERSION,
|
|
3990
|
+
pendingInput,
|
|
3991
|
+
getSequence: () => sequence,
|
|
3992
|
+
});
|
|
3993
|
+
|
|
3869
3994
|
const handleRequest = async (socket, message) => {
|
|
3870
3995
|
if (message.protocolVersion !== PROTOCOL_VERSION || message.kind !== 'request' || typeof message.requestId !== 'string') {
|
|
3871
3996
|
throw new SessionDaemonProtocolError('INVALID_REQUEST', 'The daemon request is invalid.');
|
|
3872
3997
|
}
|
|
3873
3998
|
|
|
3999
|
+
if (engineRouter.hasEngines() && await engineRouter.dispatch(socket, message)) return;
|
|
3874
4000
|
// Central idle-lifetime guard: hold one session refcount across the
|
|
3875
4001
|
// whole dispatch so a concurrent short read cannot re-arm (or a timer
|
|
3876
4002
|
// fire and dispose) while a longer operation on the same session is
|
|
@@ -3898,8 +4024,8 @@ export function createSessionDaemon({
|
|
|
3898
4024
|
'runtime.claim', 'runtime.shutdown',
|
|
3899
4025
|
'projects.list', 'projects.select', 'sessions.list', 'sessions.create', 'sessions.open', 'sessions.messages', 'sessions.rename', 'sessions.delete',
|
|
3900
4026
|
'sessions.tree', 'sessions.navigate', 'sessions.fork', 'sessions.clone', 'sessions.prompt',
|
|
3901
|
-
'sessions.steer', 'sessions.followUp', 'sessions.sendReceipt', 'sessions.abort', 'sessions.setModel',
|
|
3902
|
-
'sessions.setThinking', 'sessions.compact', 'providers.list', 'providers.refresh', 'providers.config.get', 'providers.models.set', 'providers.models.add', 'providers.status', 'providers.login',
|
|
4027
|
+
'sessions.steer', 'sessions.followUp', 'sessions.sendReceipt', 'sessions.pendingInput', 'sessions.abort', 'sessions.setModel',
|
|
4028
|
+
'sessions.setThinking', 'sessions.compact', 'engines.list', 'providers.list', 'providers.refresh', 'providers.config.get', 'providers.models.set', 'providers.models.add', 'providers.status', 'providers.login',
|
|
3903
4029
|
'providers.login.respond', 'providers.login.status', 'providers.logout', 'settings.get', 'settings.set',
|
|
3904
4030
|
'resources.list', 'resources.update', 'resources.prompts.create', 'resources.prompts.update', 'resources.prompts.delete',
|
|
3905
4031
|
'extensions.list', 'extensions.respond', 'extensions.draft',
|
|
@@ -3984,9 +4110,31 @@ export function createSessionDaemon({
|
|
|
3984
4110
|
writeFrame(socket, { protocolVersion: PROTOCOL_VERSION, kind: 'response', requestId: message.requestId, result: { directory: targetDir } });
|
|
3985
4111
|
return;
|
|
3986
4112
|
}
|
|
4113
|
+
case 'engines.list': {
|
|
4114
|
+
writeFrame(socket, {
|
|
4115
|
+
protocolVersion: PROTOCOL_VERSION,
|
|
4116
|
+
kind: 'response',
|
|
4117
|
+
requestId: message.requestId,
|
|
4118
|
+
result: engineRouter.describe(),
|
|
4119
|
+
});
|
|
4120
|
+
return;
|
|
4121
|
+
}
|
|
3987
4122
|
case 'providers.list': {
|
|
3988
4123
|
const result = await listProviders(message.payload?.directory);
|
|
3989
|
-
|
|
4124
|
+
if (!engineRouter.hasEngines()) {
|
|
4125
|
+
writeFrame(socket, { protocolVersion: PROTOCOL_VERSION, kind: 'response', requestId: message.requestId, result });
|
|
4126
|
+
return;
|
|
4127
|
+
}
|
|
4128
|
+
const merged = await engineRouter.mergeProviders(result);
|
|
4129
|
+
writeFrame(socket, {
|
|
4130
|
+
protocolVersion: PROTOCOL_VERSION,
|
|
4131
|
+
kind: 'response',
|
|
4132
|
+
requestId: message.requestId,
|
|
4133
|
+
result: {
|
|
4134
|
+
providers: merged.providers,
|
|
4135
|
+
...(merged.incompleteEngines ? { incompleteEngines: merged.incompleteEngines } : {}),
|
|
4136
|
+
},
|
|
4137
|
+
});
|
|
3990
4138
|
return;
|
|
3991
4139
|
}
|
|
3992
4140
|
case 'providers.refresh': {
|
|
@@ -4125,15 +4273,43 @@ export function createSessionDaemon({
|
|
|
4125
4273
|
});
|
|
4126
4274
|
return;
|
|
4127
4275
|
}
|
|
4276
|
+
case 'sessions.pendingInput': {
|
|
4277
|
+
// Daemon-level pending-input state for every session with an open
|
|
4278
|
+
// request. No arguments, not session-scoped, never routed to
|
|
4279
|
+
// engines: engine summaries are already folded into the index.
|
|
4280
|
+
writeFrame(socket, {
|
|
4281
|
+
protocolVersion: PROTOCOL_VERSION,
|
|
4282
|
+
kind: 'response',
|
|
4283
|
+
requestId: message.requestId,
|
|
4284
|
+
result: { sessions: pendingInput.list(), sequence, streamEpoch },
|
|
4285
|
+
});
|
|
4286
|
+
return;
|
|
4287
|
+
}
|
|
4128
4288
|
case 'sessions.list': {
|
|
4129
4289
|
const sessions = await listSessionItems(message.payload?.directory || message.payload?.cwd);
|
|
4290
|
+
if (!engineRouter.hasEngines()) {
|
|
4291
|
+
writeFrame(socket, {
|
|
4292
|
+
protocolVersion: PROTOCOL_VERSION,
|
|
4293
|
+
kind: 'response',
|
|
4294
|
+
requestId: message.requestId,
|
|
4295
|
+
// Stamp the stream lifetime so clients can reject a listing that a
|
|
4296
|
+
// previous daemon process generated after an epoch change.
|
|
4297
|
+
result: { sessions, streamEpoch },
|
|
4298
|
+
});
|
|
4299
|
+
return;
|
|
4300
|
+
}
|
|
4301
|
+
const listDir = message.payload?.directory || message.payload?.cwd;
|
|
4302
|
+
const listTargetDir = listDir ? await resolveDirectory(listDir) : (activeDirectory || cwd);
|
|
4303
|
+
const merged = await engineRouter.mergeSessionList(sessions, listTargetDir);
|
|
4130
4304
|
writeFrame(socket, {
|
|
4131
4305
|
protocolVersion: PROTOCOL_VERSION,
|
|
4132
4306
|
kind: 'response',
|
|
4133
4307
|
requestId: message.requestId,
|
|
4134
|
-
|
|
4135
|
-
|
|
4136
|
-
|
|
4308
|
+
result: {
|
|
4309
|
+
sessions: merged.sessions,
|
|
4310
|
+
streamEpoch,
|
|
4311
|
+
...(merged.incompleteEngines ? { incompleteEngines: merged.incompleteEngines } : {}),
|
|
4312
|
+
},
|
|
4137
4313
|
});
|
|
4138
4314
|
return;
|
|
4139
4315
|
}
|
|
@@ -4224,6 +4400,7 @@ export function createSessionDaemon({
|
|
|
4224
4400
|
return;
|
|
4225
4401
|
}
|
|
4226
4402
|
case 'sessions.create': {
|
|
4403
|
+
if ((engineRouter.hasEngines() || message.payload?.engine !== undefined) && await engineRouter.create(socket, message)) return;
|
|
4227
4404
|
const result = await createSession(message.payload);
|
|
4228
4405
|
writeDetailResponse(socket, message.requestId, result);
|
|
4229
4406
|
return;
|
|
@@ -4446,6 +4623,19 @@ export function createSessionDaemon({
|
|
|
4446
4623
|
runtimeRegistry = createSessionRuntimeRegistry({
|
|
4447
4624
|
onSessionEvent: ({ cwd: eventCwd, sessionId: eventSessionId }, event) => publishSessionEvent(eventSessionId, event, eventCwd),
|
|
4448
4625
|
});
|
|
4626
|
+
engineRegistry = await createSessionEngineRegistry({
|
|
4627
|
+
factories: engines,
|
|
4628
|
+
host: {
|
|
4629
|
+
publish: (...args) => engineRouter.publish(...args),
|
|
4630
|
+
prepareAttachments: (attachments) => prepareAttachmentContent(attachments),
|
|
4631
|
+
streamEpoch,
|
|
4632
|
+
agentDir,
|
|
4633
|
+
dataDir: resolvePiChamberDataDir(),
|
|
4634
|
+
logger: (engineId, event, error) => logSessionEngineError(undefined, engineId, event, error),
|
|
4635
|
+
createError: (code, message) => new SessionDaemonProtocolError(code, message),
|
|
4636
|
+
},
|
|
4637
|
+
redact: (value) => redactAttachmentValues(value),
|
|
4638
|
+
});
|
|
4449
4639
|
|
|
4450
4640
|
try {
|
|
4451
4641
|
if (platform !== 'win32') {
|
|
@@ -4471,6 +4661,8 @@ export function createSessionDaemon({
|
|
|
4471
4661
|
started = true;
|
|
4472
4662
|
} catch (error) {
|
|
4473
4663
|
messageEntryAliases.clear();
|
|
4664
|
+
await engineRegistry?.disposeAll().catch(() => {});
|
|
4665
|
+
engineRegistry = undefined;
|
|
4474
4666
|
await disposeRuntime();
|
|
4475
4667
|
server = undefined;
|
|
4476
4668
|
throw error;
|
|
@@ -4529,6 +4721,14 @@ export function createSessionDaemon({
|
|
|
4529
4721
|
for (const pendingFailedCreate of [...pendingFailedCreateCleanups.values()]) {
|
|
4530
4722
|
await drainPendingFailedCreateCleanup(pendingFailedCreate.sessionId).catch(() => false);
|
|
4531
4723
|
}
|
|
4724
|
+
if (engineRegistry) {
|
|
4725
|
+
try {
|
|
4726
|
+
await engineRegistry.disposeAll();
|
|
4727
|
+
} catch {
|
|
4728
|
+
// An engine disposal failure must not prevent remaining teardown.
|
|
4729
|
+
}
|
|
4730
|
+
engineRegistry = undefined;
|
|
4731
|
+
}
|
|
4532
4732
|
server = undefined;
|
|
4533
4733
|
started = false;
|
|
4534
4734
|
if (platform !== 'win32') await rm(endpoint, { force: true });
|
|
@@ -35,7 +35,8 @@ class FakeSession {
|
|
|
35
35
|
getModels: () => [{ provider: 'test', id: 'model', name: 'Test model', contextWindow: 128_000, reasoning: true, thinkingLevelMap: { low: 1, high: null } }],
|
|
36
36
|
getProvider: (providerId) => providerId === 'test' ? ({ name: 'Test provider' }) : undefined,
|
|
37
37
|
getProviderAuthStatus: () => ({ configured: this.providerAuthenticated }),
|
|
38
|
-
login: async (_providerId, type, interaction) => {
|
|
38
|
+
login: async (_providerId, type, interaction, options) => {
|
|
39
|
+
this.lastLoginDeviceId = options?.getDeviceId?.();
|
|
39
40
|
if (type === 'api_key') this.lastApiKey = await interaction.prompt({ type: 'secret', message: 'Key' });
|
|
40
41
|
else {
|
|
41
42
|
interaction.notify({ type: 'device_code', userCode: 'CODE', verificationUri: 'https://example.test/device' });
|
|
@@ -2048,7 +2049,8 @@ describe('Pi session daemon spike', () => {
|
|
|
2048
2049
|
const root = await mkdtemp(join(tmpdir(), 'pichamber-pi-daemon-'));
|
|
2049
2050
|
const endpoint = testDaemonEndpoint(root);
|
|
2050
2051
|
const session = new FakeSession();
|
|
2051
|
-
|
|
2052
|
+
const settingsManager = { getOrCreateDeviceId: () => '00000000-0000-4000-8000-000000000001' };
|
|
2053
|
+
daemon = createSessionDaemon({ endpoint, credential, cwd: root, createRuntime: async () => ({ session, services: { settingsManager }, async dispose() {} }) });
|
|
2052
2054
|
await daemon.start();
|
|
2053
2055
|
const client = connectClient(endpoint);
|
|
2054
2056
|
await client.authenticate();
|
|
@@ -2065,10 +2067,36 @@ describe('Pi session daemon spike', () => {
|
|
|
2065
2067
|
await expect(client.request('providers.login.respond', { providerId: 'test', loginId, value: 'manual-code' })).resolves.toMatchObject({ result: { login: { id: loginId, state: 'pending' } } });
|
|
2066
2068
|
await new Promise((resolve) => setTimeout(resolve, 0));
|
|
2067
2069
|
expect(session.lastOAuthCode).toBe('manual-code');
|
|
2070
|
+
// Pi 1.0 Sign in with ChatGPT requires the installation device ID.
|
|
2071
|
+
expect(session.lastLoginDeviceId).toBe('00000000-0000-4000-8000-000000000001');
|
|
2068
2072
|
await expect(client.request('providers.logout', { providerId: 'test' })).resolves.toMatchObject({ result: { authenticated: false } });
|
|
2069
2073
|
await client.close();
|
|
2070
2074
|
});
|
|
2071
2075
|
|
|
2076
|
+
it('reports why a provider login failed without echoing callback query strings', async () => {
|
|
2077
|
+
const root = await mkdtemp(join(tmpdir(), 'pichamber-pi-daemon-login-fail-'));
|
|
2078
|
+
const endpoint = testDaemonEndpoint(root);
|
|
2079
|
+
const session = new FakeSession();
|
|
2080
|
+
session.modelRuntime.login = async () => {
|
|
2081
|
+
throw new Error('Token request failed', { cause: new Error('Bad callback http://127.0.0.1:1455/auth/callback?code=secret-code&state=s') });
|
|
2082
|
+
};
|
|
2083
|
+
daemon = createSessionDaemon({ endpoint, credential, cwd: root, createRuntime: async () => ({ session, async dispose() {} }) });
|
|
2084
|
+
await daemon.start();
|
|
2085
|
+
const client = connectClient(endpoint);
|
|
2086
|
+
await client.authenticate();
|
|
2087
|
+
|
|
2088
|
+
const started = await client.request('providers.login', { providerId: 'test', type: 'oauth' });
|
|
2089
|
+
const loginId = started.result.login.id;
|
|
2090
|
+
await new Promise((resolve) => setTimeout(resolve, 0));
|
|
2091
|
+
const status = await client.request('providers.login.status', { providerId: 'test', loginId });
|
|
2092
|
+
expect(status.result.login).toMatchObject({
|
|
2093
|
+
state: 'failed',
|
|
2094
|
+
error: { code: 'PROVIDER_AUTH_REQUIRED', message: 'Token request failed: Bad callback http://127.0.0.1:1455/auth/callback' },
|
|
2095
|
+
});
|
|
2096
|
+
expect(JSON.stringify(status)).not.toContain('secret-code');
|
|
2097
|
+
await client.close();
|
|
2098
|
+
});
|
|
2099
|
+
|
|
2072
2100
|
it('acknowledges manual compaction before summarization completes and publishes its outcome', async () => {
|
|
2073
2101
|
const root = await mkdtemp(join(tmpdir(), 'pichamber-pi-daemon-compact-'));
|
|
2074
2102
|
const endpoint = testDaemonEndpoint(root);
|