@pi-chamber/web 0.3.3 → 0.4.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/README.md +1 -0
- package/bin/lib/cli-startup.js +1 -0
- package/dist/assets/CommitSection-0zl1puqf.js +1 -0
- package/dist/assets/DiagramEditor-CFV_TjE2.js +1 -0
- package/dist/assets/DiagramView-0I4PZUpw.js +1 -0
- package/dist/assets/{DiffView-DGD9DMS7.js → DiffView-BoTz2Zqe.js} +2 -2
- package/dist/assets/{FilesView-DB5VI7EN.js → FilesView-CVMNE9Pr.js} +6 -6
- package/dist/assets/GitView-DnsbCAWl.js +6 -0
- package/dist/assets/JsonTreeView-Cn1Mk0Wf.js +1 -0
- package/dist/assets/{MarkdownRendererImpl-V1HMFCjr.js → MarkdownRendererImpl-DJKD8tNq.js} +2 -2
- package/dist/assets/PatchDiff-GdGq3IlM.js +1 -0
- package/dist/assets/PierreDiffViewer-CdkAUt-S.js +136 -0
- package/dist/assets/SessionSwitcherContent-BTzVmIop.js +1 -0
- package/dist/assets/SessionSwitcherDropdown-DuPmnk3k.js +2 -0
- package/dist/assets/SessionUnreadDot-ogHL0INY.js +1 -0
- package/dist/assets/SettingsView-SHhVrRdh.js +4 -0
- package/dist/assets/SettingsWindow-D_D1qqLF.js +1 -0
- package/dist/assets/{ToolOutputDialog-2zKUdGYL.js → ToolOutputDialog-BHaf293m.js} +6 -6
- package/dist/assets/ToolPartDiffPreview-BTMXNcqG.js +8 -0
- package/dist/assets/{VirtualizedFileDiff-UMgLcO4Q.js → VirtualizedFileDiff-CRVvv23V.js} +4 -4
- package/dist/assets/{SessionSwitcherDropdown-o1RjhCfF.js → WindowsWindowControls-CTtxXnD1.js} +172 -123
- package/dist/assets/collapsible-BO4qEdib.js +1 -0
- package/dist/assets/computeVirtualFileMetrics-D1I8YrPV.js +3 -0
- package/dist/assets/contextFileOpenGuard-w5xG9Qz2.js +1 -0
- package/dist/assets/index-3zee2IYy.css +1 -0
- package/dist/assets/{index-BAqpUCjs.js → index-CI-cd-mw.js} +6 -6
- package/dist/assets/index-DbghctxK.js +1 -0
- package/dist/assets/isDiffPlainText-BK9bF1l5.js +1 -0
- package/dist/assets/isFilePlainText-Cua0RCRz.js +1 -0
- package/dist/assets/main-BNJQ6mSF.js +2 -0
- package/dist/assets/{main-CmkRaMOR.js → main-CoA--JT-.js} +6 -6
- package/dist/assets/markdownCore-BGlLZrb8.js +3 -0
- package/dist/assets/miniChat-DU2jFhXq.js +2 -0
- package/dist/assets/mobile-B3lJ_CJR.js +2 -0
- package/dist/assets/renderElectronMiniChatApp-BfXYv3zl.js +2 -0
- package/dist/assets/renderMobileApp-Cd_F7yMe.js +14 -0
- package/dist/assets/{runtimeSurface-CkHYYg0E.js → runtimeSurface-UriLeO95.js} +1 -1
- package/dist/assets/{useInlineCommentController-DD31jQNC.js → useInlineCommentController-5XANmO1k.js} +2 -2
- package/dist/assets/usePanelSlide-CBZw2Cjo.js +56 -0
- package/dist/assets/useSwitcherItems-Cc6Tx-LO.js +1 -0
- package/dist/assets/{useWindowTitle-DoHrUC5r.js → useWindowTitle-Bf8ZNN_R.js} +1 -1
- package/dist/assets/{vendor-codemirror-language-data-Dp_Z-0GD.js → vendor-codemirror-language-data-DxpwplIe.js} +2 -2
- package/dist/assets/{vendor-katex-CHD9BdDO.js → vendor-katex-CNckGUMB.js} +1 -1
- package/dist/assets/{vendor-marked-i_gIkIP3.js → vendor-marked-CX41MkDF.js} +1 -1
- package/dist/assets/{web-components-Cct1r-wn.js → web-components-g7DKkne_.js} +4 -4
- package/dist/index.html +5 -5
- package/dist/mini-chat.html +4 -4
- package/dist/mobile.html +4 -4
- package/dist/sw.js +1 -1
- package/package.json +1 -1
- package/server/index.js +27 -5
- package/server/lib/fs/routes.js +0 -21
- package/server/lib/git/DOCUMENTATION.md +13 -3
- package/server/lib/git/routes.js +80 -4
- package/server/lib/git/routes.test.js +135 -0
- package/server/lib/git/service.js +130 -31
- package/server/lib/git/service.test.js +146 -0
- package/server/lib/pi/routes.js +67 -2
- package/server/lib/pi/routes.test.js +43 -3
- package/server/lib/pi/session-daemon/DOCUMENTATION.md +4 -4
- package/server/lib/pi/session-daemon/message-entry-aliases.js +53 -13
- package/server/lib/pi/session-daemon/message-entry-aliases.test.js +110 -0
- package/server/lib/pi/session-daemon/session-daemon.js +181 -22
- package/server/lib/pi/session-daemon/session-daemon.test.js +123 -3
- package/server/lib/pi/session-daemon/session-retry-limits.js +55 -0
- package/server/lib/pi/session-daemon/session-retry-limits.test.js +53 -0
- package/server/lib/pi/session-daemon/skill-read-classifier.js +39 -0
- package/server/lib/pi/session-daemon/skill-read-classifier.test.js +41 -0
- package/server/lib/pi/session-daemon/supervisor.js +3 -0
- package/server/lib/pi/small-model-generation.js +104 -0
- package/server/lib/pi/small-model-generation.test.js +66 -0
- package/server/lib/preview/proxy-runtime.js +11 -1
- package/server/lib/preview/proxy-runtime.test.js +3 -0
- package/server/lib/relay/tunnel-host.js +1 -0
- package/server/lib/stt/DOCUMENTATION.md +38 -0
- package/server/lib/stt/audio.js +47 -0
- package/server/lib/stt/config-store.js +81 -0
- package/server/lib/stt/config-store.test.js +36 -0
- package/server/lib/stt/local/model-catalog.js +57 -0
- package/server/lib/stt/local/model-downloader.js +127 -0
- package/server/lib/stt/local/recognizer.js +64 -0
- package/server/lib/stt/local/sherpa-loader.js +43 -0
- package/server/lib/stt/local/worker-client.js +115 -0
- package/server/lib/stt/local/worker-process.js +64 -0
- package/server/lib/stt/protocol.js +38 -0
- package/server/lib/stt/protocol.test.js +17 -0
- package/server/lib/stt/providers/local-worker-provider.js +11 -0
- package/server/lib/stt/providers/openai-compatible-provider.js +31 -0
- package/server/lib/stt/providers/openai-compatible-provider.test.js +31 -0
- package/server/lib/stt/runtime.js +111 -0
- package/server/lib/stt/service.js +106 -0
- package/server/lib/stt/stream-manager.js +188 -0
- package/server/lib/stt/stream-manager.test.js +64 -0
- package/server/lib/ui-auth/DOCUMENTATION.md +1 -1
- package/server/lib/ui-auth/ui-auth.js +8 -3
- package/server/lib/ui-auth/ui-auth.test.js +8 -0
- package/server/lib/workspace/host.js +18 -2
- package/dist/assets/CommitSection-BAYzLtBf.js +0 -1
- package/dist/assets/DiagramEditor-D1yc4joK.js +0 -1
- package/dist/assets/DiagramView-CAlJiG11.js +0 -1
- package/dist/assets/GitView-CFlPcSn9.js +0 -6
- package/dist/assets/JsonTreeView-CoX1ZscV.js +0 -1
- package/dist/assets/PatchDiff-D6Gs7K5B.js +0 -1
- package/dist/assets/PierreDiffViewer-COYd5Qr-.js +0 -136
- package/dist/assets/SettingsView-BYqvfMTS.js +0 -4
- package/dist/assets/SettingsWindow-CtNS0tQn.js +0 -1
- package/dist/assets/ToolPartDiffPreview-CBFC9min.js +0 -8
- package/dist/assets/collapsible-Kx4bmsQM.js +0 -1
- package/dist/assets/computeVirtualFileMetrics-DdOCbMyK.js +0 -3
- package/dist/assets/contextFileOpenGuard-BRldMp0d.js +0 -1
- package/dist/assets/index-CuSNEV7s.js +0 -1
- package/dist/assets/index-riABQmQ_.css +0 -1
- package/dist/assets/isDiffPlainText-CGIf0q8p.js +0 -1
- package/dist/assets/isFilePlainText-D4hgTRxT.js +0 -1
- package/dist/assets/main-By_pvk90.js +0 -2
- package/dist/assets/markdownCore-CAVCyFnI.js +0 -2
- package/dist/assets/miniChat-_XK2gGZE.js +0 -2
- package/dist/assets/mobile-B4E4JqAf.js +0 -2
- package/dist/assets/renderElectronMiniChatApp-Ca4hZgIz.js +0 -1
- package/dist/assets/renderMobileApp-ClA5Cnmw.js +0 -14
- package/dist/assets/usePanelSlide-a4c67FIY.js +0 -56
|
@@ -19,6 +19,8 @@ import {
|
|
|
19
19
|
import { createPiModelConfigStore } from '../model-config-store.js';
|
|
20
20
|
import { clampThinkingLevel, getSupportedThinkingLevels, isPiThinkingLevel } from '../thinking-levels.js';
|
|
21
21
|
import { createMessageEntryAliases } from './message-entry-aliases.js';
|
|
22
|
+
import { resolveEffectiveRetryLimitFromDataDir as resolveEffectiveRetryLimit } from './session-retry-limits.js';
|
|
23
|
+
import { createSkillReadClassifier } from './skill-read-classifier.js';
|
|
22
24
|
import { createSessionRuntimeRegistry } from './runtime-registry.js';
|
|
23
25
|
import {
|
|
24
26
|
findPiSessionJsonlById,
|
|
@@ -137,15 +139,64 @@ export function createSessionDaemon({
|
|
|
137
139
|
const latestAssistantMessageIds = new Map();
|
|
138
140
|
const messageStartedAt = new Map();
|
|
139
141
|
const toolStartedAt = new Map();
|
|
142
|
+
const toolInputBySession = new Map();
|
|
140
143
|
const latestUserMessageIds = new Map();
|
|
141
144
|
const retryStateBySession = new Map();
|
|
145
|
+
const compactionStateBySession = new Map();
|
|
142
146
|
const activeRunStartedAt = new Map();
|
|
143
147
|
const sendGenerationBySession = new Map();
|
|
144
148
|
const streamingRedactionBuffers = new Map();
|
|
145
149
|
const loginAttempts = new Map();
|
|
146
150
|
const messageEntryAliases = createMessageEntryAliases();
|
|
151
|
+
const skillReadClassifierByRuntime = new WeakMap();
|
|
147
152
|
const MAX_REPLAY_EVENTS = 1_024;
|
|
148
153
|
|
|
154
|
+
const skillReadClassifierFor = (activeRuntime, directory) => {
|
|
155
|
+
if (!activeRuntime || typeof activeRuntime !== 'object') return undefined;
|
|
156
|
+
const classifierCwd = activeRuntime.cwd || directory || activeDirectory || cwd;
|
|
157
|
+
const cached = skillReadClassifierByRuntime.get(activeRuntime);
|
|
158
|
+
if (cached?.cwd === classifierCwd) return cached.classifier;
|
|
159
|
+
const loader = activeRuntime.services?.resourceLoader;
|
|
160
|
+
const discovered = loader?.getSkills?.();
|
|
161
|
+
const classifier = createSkillReadClassifier({
|
|
162
|
+
cwd: classifierCwd,
|
|
163
|
+
skills: discovered?.skills,
|
|
164
|
+
platform,
|
|
165
|
+
});
|
|
166
|
+
skillReadClassifierByRuntime.set(activeRuntime, { cwd: classifierCwd, classifier });
|
|
167
|
+
return classifier;
|
|
168
|
+
};
|
|
169
|
+
|
|
170
|
+
const rememberToolInput = (sessionId, toolCallId, args) => {
|
|
171
|
+
const inputs = toolInputBySession.get(sessionId) ?? new Map();
|
|
172
|
+
inputs.set(toolCallId, args);
|
|
173
|
+
toolInputBySession.set(sessionId, inputs);
|
|
174
|
+
};
|
|
175
|
+
|
|
176
|
+
const getToolInput = (sessionId, toolCallId) => toolInputBySession.get(sessionId)?.get(toolCallId);
|
|
177
|
+
|
|
178
|
+
const forgetToolInput = (sessionId, toolCallId) => {
|
|
179
|
+
const inputs = toolInputBySession.get(sessionId);
|
|
180
|
+
if (!inputs) return;
|
|
181
|
+
inputs.delete(toolCallId);
|
|
182
|
+
if (inputs.size === 0) toolInputBySession.delete(sessionId);
|
|
183
|
+
};
|
|
184
|
+
|
|
185
|
+
const mergeToolPresentationMetadata = (metadata, activeRuntime, directory, toolName, args) => {
|
|
186
|
+
const skill = skillReadClassifierFor(activeRuntime, directory)?.(toolName, args);
|
|
187
|
+
if (!skill) return metadata;
|
|
188
|
+
const currentPiChamberMetadata = metadata?.pichamber && typeof metadata.pichamber === 'object'
|
|
189
|
+
? metadata.pichamber
|
|
190
|
+
: {};
|
|
191
|
+
return {
|
|
192
|
+
...(metadata ?? {}),
|
|
193
|
+
pichamber: {
|
|
194
|
+
...currentPiChamberMetadata,
|
|
195
|
+
skill,
|
|
196
|
+
},
|
|
197
|
+
};
|
|
198
|
+
};
|
|
199
|
+
|
|
149
200
|
const validateDirectoryPath = async (dir) => {
|
|
150
201
|
if (typeof dir !== 'string' || dir.trim().length === 0) {
|
|
151
202
|
throw new SessionDaemonProtocolError('INVALID_ARGUMENT', 'The directory path is required.');
|
|
@@ -227,6 +278,24 @@ export function createSessionDaemon({
|
|
|
227
278
|
? { sessionId: runtime.session.sessionId, isStreaming: runtime.session.isStreaming }
|
|
228
279
|
: { sessionId: dormantSession?.sessionId, isStreaming: false };
|
|
229
280
|
|
|
281
|
+
const persistedCompactionState = (session) => {
|
|
282
|
+
const entries = session?.sessionManager?.getBranch?.() ?? session?.sessionManager?.getEntries?.();
|
|
283
|
+
if (!Array.isArray(entries)) return undefined;
|
|
284
|
+
const entry = [...entries].reverse().find((candidate) => candidate?.type === 'compaction');
|
|
285
|
+
if (!entry) return undefined;
|
|
286
|
+
const completedAt = typeof entry.timestamp === 'number' ? entry.timestamp : Date.parse(entry.timestamp);
|
|
287
|
+
return {
|
|
288
|
+
phase: 'completed',
|
|
289
|
+
...(Number.isFinite(completedAt) ? { completedAt } : {}),
|
|
290
|
+
...(Number.isFinite(entry.tokensBefore) && entry.tokensBefore >= 0 ? { tokensBefore: entry.tokensBefore } : {}),
|
|
291
|
+
};
|
|
292
|
+
};
|
|
293
|
+
|
|
294
|
+
const compactionStateFor = (session) => {
|
|
295
|
+
if (!session?.sessionId) return undefined;
|
|
296
|
+
return compactionStateBySession.get(session.sessionId) ?? persistedCompactionState(session);
|
|
297
|
+
};
|
|
298
|
+
|
|
230
299
|
const rememberRuntimeSession = () => {
|
|
231
300
|
const sessionId = runtime?.session?.sessionId;
|
|
232
301
|
if (typeof sessionId !== 'string' || sessionId.length === 0) return;
|
|
@@ -244,8 +313,9 @@ export function createSessionDaemon({
|
|
|
244
313
|
if (requestedSessionId && requestedSessionId !== session.sessionId) return;
|
|
245
314
|
const activeSession = targetRuntime?.session || runtime?.session;
|
|
246
315
|
const retry = session.sessionId ? retryStateBySession.get(session.sessionId) : undefined;
|
|
316
|
+
const compaction = compactionStateFor(activeSession);
|
|
247
317
|
const targetDirectory = targetRuntime?.cwd || activeDirectory || cwd;
|
|
248
|
-
const messages = activeSession ? projectMessageEntries(
|
|
318
|
+
const messages = activeSession ? projectMessageEntries(targetRuntime || runtime, targetDirectory) : [];
|
|
249
319
|
const lastAssistant = [...messages].reverse().find((entry) => entry.message.role === 'assistant')?.message;
|
|
250
320
|
const model = activeSession?.model;
|
|
251
321
|
const snapshotSequence = ++sequence;
|
|
@@ -260,6 +330,7 @@ export function createSessionDaemon({
|
|
|
260
330
|
isStreaming: session.isStreaming ?? false,
|
|
261
331
|
lifecycle: retry ? 'retry' : session.isStreaming ? 'busy' : 'idle',
|
|
262
332
|
...(retry ? { retry } : {}),
|
|
333
|
+
...(compaction ? { compaction } : {}),
|
|
263
334
|
queue: activeSession ? {
|
|
264
335
|
steering: activeSession.getSteeringMessages?.().length ?? 0,
|
|
265
336
|
followUp: activeSession.getFollowUpMessages?.().length ?? 0,
|
|
@@ -334,12 +405,13 @@ export function createSessionDaemon({
|
|
|
334
405
|
const timer = setTimeout(async () => {
|
|
335
406
|
idleDisposeTimers.delete(sessionId);
|
|
336
407
|
const targetRuntime = runtimeRegistry?.findBySessionId(sessionId);
|
|
337
|
-
if (!targetRuntime || targetRuntime.session?.isStreaming) return;
|
|
408
|
+
if (!targetRuntime || targetRuntime.session?.isStreaming || targetRuntime.session?.isCompacting) return;
|
|
338
409
|
try {
|
|
339
410
|
if (targetRuntime === runtime) {
|
|
340
411
|
rememberRuntimeSession();
|
|
341
412
|
}
|
|
342
413
|
await runtimeRegistry.dispose(targetRuntime);
|
|
414
|
+
compactionStateBySession.delete(sessionId);
|
|
343
415
|
if (targetRuntime === runtime) {
|
|
344
416
|
runtime = undefined;
|
|
345
417
|
}
|
|
@@ -639,7 +711,8 @@ export function createSessionDaemon({
|
|
|
639
711
|
return entries;
|
|
640
712
|
};
|
|
641
713
|
|
|
642
|
-
const projectMessageEntries = (
|
|
714
|
+
const projectMessageEntries = (activeRuntime, targetDir = activeDirectory || cwd) => {
|
|
715
|
+
const session = activeRuntime?.session;
|
|
643
716
|
// Use the active branch, not the full file. `getEntries()` returns every
|
|
644
717
|
// entry ever written, so a bare `branch()`/`resetLeaf()` would appear to
|
|
645
718
|
// do nothing. `getBranch()` follows the current leaf and is what
|
|
@@ -682,6 +755,7 @@ export function createSessionDaemon({
|
|
|
682
755
|
const result = toolResults.get(part.id);
|
|
683
756
|
const running = streaming && !result;
|
|
684
757
|
const interrupted = !running && !result;
|
|
758
|
+
const metadata = mergeToolPresentationMetadata(result?.metadata, activeRuntime, targetDir, part.name, part.arguments);
|
|
685
759
|
return [{
|
|
686
760
|
type: 'tool',
|
|
687
761
|
id: `${entry.id}:tool:${part.id}`,
|
|
@@ -697,7 +771,7 @@ export function createSessionDaemon({
|
|
|
697
771
|
? { error: 'Tool was interrupted before completion.' }
|
|
698
772
|
: {}),
|
|
699
773
|
...(result?.isError || interrupted ? { isError: true } : {}),
|
|
700
|
-
...(
|
|
774
|
+
...(metadata ? { metadata } : {}),
|
|
701
775
|
...(Number.isFinite(result?.endedAt)
|
|
702
776
|
? { endedAt: result.endedAt }
|
|
703
777
|
: interrupted
|
|
@@ -730,13 +804,14 @@ export function createSessionDaemon({
|
|
|
730
804
|
throw new SessionDaemonProtocolError('INVALID_SESSION', 'Pi returned an invalid active session.');
|
|
731
805
|
}
|
|
732
806
|
const model = session.model;
|
|
733
|
-
const messages = projectMessageEntries(
|
|
807
|
+
const messages = projectMessageEntries(activeRuntime, targetDir);
|
|
734
808
|
const lastAssistant = [...messages].reverse().find((entry) => entry.message.role === 'assistant')?.message;
|
|
735
809
|
const sessionModel = lastAssistant?.model
|
|
736
810
|
?? (model?.provider && model?.id ? { providerId: model.provider, modelId: model.id } : undefined);
|
|
737
811
|
const sessionThinking = lastAssistant?.thinkingLevel || session.thinkingLevel;
|
|
738
812
|
const isStreaming = session.isStreaming === true;
|
|
739
813
|
const retry = retryStateBySession.get(session.sessionId);
|
|
814
|
+
const compaction = compactionStateFor(session);
|
|
740
815
|
return {
|
|
741
816
|
session: {
|
|
742
817
|
id: session.sessionId, directory: targetDir, createdAt, updatedAt: createdAt,
|
|
@@ -750,6 +825,7 @@ export function createSessionDaemon({
|
|
|
750
825
|
isStreaming,
|
|
751
826
|
lifecycle: retry ? 'retry' : isStreaming ? 'busy' : 'idle',
|
|
752
827
|
...(retry ? { retry } : {}),
|
|
828
|
+
...(compaction ? { compaction } : {}),
|
|
753
829
|
...(activeRunStartedAt.has(session.sessionId) ? { runStartedAt: activeRunStartedAt.get(session.sessionId) } : {}),
|
|
754
830
|
serverNow: Date.now(),
|
|
755
831
|
};
|
|
@@ -782,24 +858,21 @@ export function createSessionDaemon({
|
|
|
782
858
|
});
|
|
783
859
|
if (!newRuntime.cwd) newRuntime.cwd = targetCwd;
|
|
784
860
|
// Apply default retry limit for new sessions. Explicit per-run overrides win.
|
|
861
|
+
// With no PiChamber override configured, Pi's own retry settings stay
|
|
862
|
+
// authoritative — the runtime default (3) already matches, so nothing is
|
|
863
|
+
// applied and a user's Pi-native maxRetries value is never stomped.
|
|
785
864
|
try {
|
|
786
865
|
const settingsManager = newRuntime.services?.settingsManager;
|
|
787
866
|
if (settingsManager && typeof settingsManager.getRetrySettings === 'function') {
|
|
788
|
-
|
|
789
|
-
if (effective
|
|
790
|
-
try {
|
|
791
|
-
const raw = await readFile(join(resolvePiChamberDataDir(), 'pi', 'settings.json'), 'utf8');
|
|
792
|
-
const parsed = JSON.parse(raw);
|
|
793
|
-
if (Number.isInteger(parsed?.defaultRetryLimit)) effective = parsed.defaultRetryLimit;
|
|
794
|
-
} catch {}
|
|
795
|
-
if (effective === undefined) effective = 3;
|
|
796
|
-
}
|
|
797
|
-
if (Number.isInteger(effective) && effective >= 0 && effective <= 10) {
|
|
867
|
+
const effective = await resolveEffectiveRetryLimit({ payloadRetryLimit: explicitRetryLimit, dataDir: resolvePiChamberDataDir() });
|
|
868
|
+
if (effective !== undefined) {
|
|
798
869
|
const current = settingsManager.getRetrySettings().maxRetries;
|
|
799
870
|
if (current !== effective) {
|
|
800
871
|
if (typeof settingsManager.applyOverrides === 'function') {
|
|
872
|
+
// In-memory only: applyOverrides never queues a write, so this
|
|
873
|
+
// scopes the limit to sessions created on this runtime without
|
|
874
|
+
// touching Pi's own settings files.
|
|
801
875
|
settingsManager.applyOverrides({ retry: { maxRetries: effective } });
|
|
802
|
-
if (explicitRetryLimit === undefined) await settingsManager.flush().catch(() => {});
|
|
803
876
|
} else if (settingsManager.globalSettings) {
|
|
804
877
|
settingsManager.globalSettings.retry = { ...(settingsManager.globalSettings.retry ?? {}), maxRetries: effective };
|
|
805
878
|
}
|
|
@@ -1708,9 +1781,11 @@ export function createSessionDaemon({
|
|
|
1708
1781
|
}
|
|
1709
1782
|
messageEntryAliases.clearSession({ cwd: active?.cwd || targetDir, sessionId });
|
|
1710
1783
|
retryStateBySession.delete(sessionId);
|
|
1784
|
+
compactionStateBySession.delete(sessionId);
|
|
1711
1785
|
activeRunStartedAt.delete(sessionId);
|
|
1712
1786
|
latestUserMessageIds.delete(sessionId);
|
|
1713
1787
|
latestAssistantMessageIds.delete(sessionId);
|
|
1788
|
+
toolInputBySession.delete(sessionId);
|
|
1714
1789
|
publish('session.lifecycle', { state: 'idle', deleted: true, serverNow: Date.now() }, sessionId, targetDir);
|
|
1715
1790
|
};
|
|
1716
1791
|
|
|
@@ -1801,7 +1876,10 @@ export function createSessionDaemon({
|
|
|
1801
1876
|
case 'tool_execution_start': {
|
|
1802
1877
|
const messageId = streamingMessageIds.get(sessionId) ?? latestAssistantMessageIds.get(sessionId) ?? `assistant-${sessionId}`;
|
|
1803
1878
|
const startedAt = Date.now();
|
|
1879
|
+
const activeRuntime = runtimeRegistry?.get({ cwd: directory, sessionId }) || runtime;
|
|
1880
|
+
const metadata = mergeToolPresentationMetadata(undefined, activeRuntime, directory, event.toolName, event.args);
|
|
1804
1881
|
toolStartedAt.set(event.toolCallId, startedAt);
|
|
1882
|
+
rememberToolInput(sessionId, event.toolCallId, event.args);
|
|
1805
1883
|
publish('session.tool.start', {
|
|
1806
1884
|
toolCallId: event.toolCallId,
|
|
1807
1885
|
partId: `${messageId}:tool:${event.toolCallId}`,
|
|
@@ -1810,13 +1888,17 @@ export function createSessionDaemon({
|
|
|
1810
1888
|
toolName: event.toolName,
|
|
1811
1889
|
state: 'running',
|
|
1812
1890
|
...(event.args !== undefined ? { input: redactAttachmentValues(event.args) } : {}),
|
|
1891
|
+
...(metadata ? { metadata } : {}),
|
|
1813
1892
|
startedAt,
|
|
1814
1893
|
}, sessionId, directory);
|
|
1815
1894
|
break;
|
|
1816
1895
|
}
|
|
1817
1896
|
case 'tool_execution_update': {
|
|
1818
1897
|
const messageId = streamingMessageIds.get(sessionId) ?? latestAssistantMessageIds.get(sessionId) ?? `assistant-${sessionId}`;
|
|
1898
|
+
const activeRuntime = runtimeRegistry?.get({ cwd: directory, sessionId }) || runtime;
|
|
1899
|
+
const toolArgs = event.args ?? getToolInput(sessionId, event.toolCallId);
|
|
1819
1900
|
const projected = projectToolResult(event.partialResult, false);
|
|
1901
|
+
const metadata = mergeToolPresentationMetadata(projected.metadata, activeRuntime, directory, event.toolName, toolArgs);
|
|
1820
1902
|
publish('session.tool.update', {
|
|
1821
1903
|
toolCallId: event.toolCallId,
|
|
1822
1904
|
partId: `${messageId}:tool:${event.toolCallId}`,
|
|
@@ -1826,14 +1908,19 @@ export function createSessionDaemon({
|
|
|
1826
1908
|
state: 'running',
|
|
1827
1909
|
...(event.args !== undefined ? { input: redactAttachmentValues(event.args) } : {}),
|
|
1828
1910
|
...projected,
|
|
1911
|
+
...(metadata ? { metadata } : {}),
|
|
1829
1912
|
}, sessionId, directory);
|
|
1830
1913
|
break;
|
|
1831
1914
|
}
|
|
1832
1915
|
case 'tool_execution_end': {
|
|
1833
1916
|
const messageId = streamingMessageIds.get(sessionId) ?? latestAssistantMessageIds.get(sessionId) ?? `assistant-${sessionId}`;
|
|
1834
1917
|
const startedAt = toolStartedAt.get(event.toolCallId);
|
|
1918
|
+
const toolArgs = event.args ?? getToolInput(sessionId, event.toolCallId);
|
|
1835
1919
|
toolStartedAt.delete(event.toolCallId);
|
|
1920
|
+
forgetToolInput(sessionId, event.toolCallId);
|
|
1921
|
+
const activeRuntime = runtimeRegistry?.get({ cwd: directory, sessionId }) || runtime;
|
|
1836
1922
|
const projected = projectToolResult(event.result, event.isError === true);
|
|
1923
|
+
const metadata = mergeToolPresentationMetadata(projected.metadata, activeRuntime, directory, event.toolName, toolArgs);
|
|
1837
1924
|
publish('session.tool.end', {
|
|
1838
1925
|
toolCallId: event.toolCallId,
|
|
1839
1926
|
partId: `${messageId}:tool:${event.toolCallId}`,
|
|
@@ -1843,6 +1930,7 @@ export function createSessionDaemon({
|
|
|
1843
1930
|
state: event.isError ? 'error' : 'completed',
|
|
1844
1931
|
isError: event.isError === true,
|
|
1845
1932
|
...projected,
|
|
1933
|
+
...(metadata ? { metadata } : {}),
|
|
1846
1934
|
...(Number.isFinite(startedAt) ? { startedAt } : {}),
|
|
1847
1935
|
endedAt: Date.now(),
|
|
1848
1936
|
}, sessionId, directory);
|
|
@@ -1885,18 +1973,66 @@ export function createSessionDaemon({
|
|
|
1885
1973
|
activeRunStartedAt.delete(sessionId);
|
|
1886
1974
|
latestUserMessageIds.delete(sessionId);
|
|
1887
1975
|
latestAssistantMessageIds.delete(sessionId);
|
|
1976
|
+
toolInputBySession.delete(sessionId);
|
|
1888
1977
|
publish('session.lifecycle', { state: 'idle', serverNow: Date.now() }, sessionId, directory);
|
|
1889
1978
|
scheduleIdleDisposal(sessionId);
|
|
1890
1979
|
break;
|
|
1891
1980
|
case 'thinking_level_changed':
|
|
1892
1981
|
publish('session.thinking', { thinking: event.level }, sessionId, directory);
|
|
1893
1982
|
break;
|
|
1894
|
-
case 'compaction_start':
|
|
1895
|
-
|
|
1983
|
+
case 'compaction_start': {
|
|
1984
|
+
clearIdleDisposal(sessionId);
|
|
1985
|
+
const compaction = { phase: 'running', reason: event.reason, startedAt: Date.now() };
|
|
1986
|
+
compactionStateBySession.set(sessionId, compaction);
|
|
1987
|
+
publish('session.compaction', compaction, sessionId, directory);
|
|
1896
1988
|
break;
|
|
1897
|
-
|
|
1898
|
-
|
|
1989
|
+
}
|
|
1990
|
+
case 'summarization_retry_scheduled': {
|
|
1991
|
+
const current = compactionStateBySession.get(sessionId);
|
|
1992
|
+
if (!current || (current.phase !== 'running' && current.phase !== 'retrying')) break;
|
|
1993
|
+
const compaction = {
|
|
1994
|
+
...current,
|
|
1995
|
+
phase: 'retrying',
|
|
1996
|
+
attempt: event.attempt,
|
|
1997
|
+
maxAttempts: event.maxAttempts,
|
|
1998
|
+
next: Date.now() + event.delayMs,
|
|
1999
|
+
message: redactAttachmentPaths(event.errorMessage),
|
|
2000
|
+
};
|
|
2001
|
+
compactionStateBySession.set(sessionId, compaction);
|
|
2002
|
+
publish('session.compaction', compaction, sessionId, directory);
|
|
1899
2003
|
break;
|
|
2004
|
+
}
|
|
2005
|
+
case 'summarization_retry_attempt_start': {
|
|
2006
|
+
if (event.source !== 'compaction') break;
|
|
2007
|
+
const current = compactionStateBySession.get(sessionId);
|
|
2008
|
+
if (!current) break;
|
|
2009
|
+
const compaction = { ...current, phase: 'running' };
|
|
2010
|
+
compactionStateBySession.set(sessionId, compaction);
|
|
2011
|
+
publish('session.compaction', compaction, sessionId, directory);
|
|
2012
|
+
break;
|
|
2013
|
+
}
|
|
2014
|
+
case 'compaction_end': {
|
|
2015
|
+
const current = compactionStateBySession.get(sessionId);
|
|
2016
|
+
const phase = event.aborted ? 'aborted' : event.result ? 'completed' : 'failed';
|
|
2017
|
+
const compaction = {
|
|
2018
|
+
phase,
|
|
2019
|
+
...(event.reason ? { reason: event.reason } : {}),
|
|
2020
|
+
...(current?.startedAt ? { startedAt: current.startedAt } : {}),
|
|
2021
|
+
completedAt: Date.now(),
|
|
2022
|
+
...(event.result && Number.isFinite(event.result.tokensBefore) && event.result.tokensBefore >= 0
|
|
2023
|
+
? { tokensBefore: event.result.tokensBefore }
|
|
2024
|
+
: {}),
|
|
2025
|
+
...(event.result && Number.isFinite(event.result.estimatedTokensAfter) && event.result.estimatedTokensAfter >= 0
|
|
2026
|
+
? { estimatedTokensAfter: event.result.estimatedTokensAfter }
|
|
2027
|
+
: {}),
|
|
2028
|
+
willRetry: event.willRetry === true,
|
|
2029
|
+
...(typeof event.errorMessage === 'string' ? { message: redactAttachmentPaths(event.errorMessage) } : {}),
|
|
2030
|
+
};
|
|
2031
|
+
compactionStateBySession.set(sessionId, compaction);
|
|
2032
|
+
publish('session.compaction', compaction, sessionId, directory);
|
|
2033
|
+
if (!event.willRetry) scheduleIdleDisposal(sessionId);
|
|
2034
|
+
break;
|
|
2035
|
+
}
|
|
1900
2036
|
default:
|
|
1901
2037
|
break;
|
|
1902
2038
|
}
|
|
@@ -2140,7 +2276,15 @@ export function createSessionDaemon({
|
|
|
2140
2276
|
}
|
|
2141
2277
|
case 'sessions.compact': {
|
|
2142
2278
|
if (message.payload?.thinking !== undefined) validateThinking(message.payload.thinking);
|
|
2279
|
+
if (message.payload?.customInstructions !== undefined
|
|
2280
|
+
&& (typeof message.payload.customInstructions !== 'string' || message.payload.customInstructions.length > 20_000)) {
|
|
2281
|
+
throw new SessionDaemonProtocolError('INVALID_ARGUMENT', 'Compaction instructions must be a string no longer than 20,000 characters.');
|
|
2282
|
+
}
|
|
2143
2283
|
const activeRuntime = await activateSession(message.payload?.sessionId, message.payload?.directory || message.payload?.cwd);
|
|
2284
|
+
const currentCompaction = compactionStateBySession.get(message.payload.sessionId);
|
|
2285
|
+
if (activeRuntime.session.isCompacting || currentCompaction?.phase === 'running' || currentCompaction?.phase === 'retrying') {
|
|
2286
|
+
throw new SessionDaemonProtocolError('SESSION_BUSY', 'This session is already compacting.');
|
|
2287
|
+
}
|
|
2144
2288
|
if (message.payload?.model !== undefined) {
|
|
2145
2289
|
await setSessionModel(activeRuntime, message.payload.model);
|
|
2146
2290
|
publishSessionModel(activeRuntime.session, message.payload.sessionId, activeRuntime.cwd);
|
|
@@ -2148,8 +2292,22 @@ export function createSessionDaemon({
|
|
|
2148
2292
|
if (message.payload?.thinking !== undefined) {
|
|
2149
2293
|
applyThinking(activeRuntime, message.payload.thinking, message.payload.sessionId, activeRuntime.cwd);
|
|
2150
2294
|
}
|
|
2151
|
-
|
|
2152
|
-
|
|
2295
|
+
Promise.resolve(activeRuntime.session.compact(message.payload?.customInstructions)).catch((error) => {
|
|
2296
|
+
const current = compactionStateBySession.get(message.payload.sessionId);
|
|
2297
|
+
if (current?.phase === 'completed' || current?.phase === 'failed' || current?.phase === 'aborted') return;
|
|
2298
|
+
const compaction = {
|
|
2299
|
+
phase: 'failed',
|
|
2300
|
+
reason: 'manual',
|
|
2301
|
+
...(current?.startedAt ? { startedAt: current.startedAt } : {}),
|
|
2302
|
+
completedAt: Date.now(),
|
|
2303
|
+
message: redactAttachmentPaths(error instanceof Error ? error.message : 'Compaction failed.'),
|
|
2304
|
+
willRetry: false,
|
|
2305
|
+
};
|
|
2306
|
+
compactionStateBySession.set(message.payload.sessionId, compaction);
|
|
2307
|
+
publish('session.compaction', compaction, message.payload.sessionId, activeRuntime.cwd);
|
|
2308
|
+
scheduleIdleDisposal(message.payload.sessionId);
|
|
2309
|
+
});
|
|
2310
|
+
writeFrame(socket, { protocolVersion: PROTOCOL_VERSION, kind: 'response', requestId: message.requestId, result: { accepted: true } });
|
|
2153
2311
|
return;
|
|
2154
2312
|
}
|
|
2155
2313
|
default:
|
|
@@ -2275,6 +2433,7 @@ export function createSessionDaemon({
|
|
|
2275
2433
|
}
|
|
2276
2434
|
loginAttempts.clear();
|
|
2277
2435
|
retryStateBySession.clear();
|
|
2436
|
+
compactionStateBySession.clear();
|
|
2278
2437
|
activeRunStartedAt.clear();
|
|
2279
2438
|
latestUserMessageIds.clear();
|
|
2280
2439
|
latestAssistantMessageIds.clear();
|
|
@@ -996,7 +996,7 @@ describe('Pi session daemon spike', () => {
|
|
|
996
996
|
const thinkingEvent = client.next((frame) => frame.event === 'session.thinking');
|
|
997
997
|
await expect(client.request('sessions.setThinking', { sessionId: 'pi-session-forked', thinking: 'minimal' })).resolves.toMatchObject({ result: {} });
|
|
998
998
|
await expect(thinkingEvent).resolves.toMatchObject({ payload: { thinking: 'minimal' } });
|
|
999
|
-
await expect(client.request('sessions.compact', { sessionId: 'pi-session-forked', thinking: 'medium' })).resolves.toMatchObject({ result: {} });
|
|
999
|
+
await expect(client.request('sessions.compact', { sessionId: 'pi-session-forked', thinking: 'medium' })).resolves.toMatchObject({ result: { accepted: true } });
|
|
1000
1000
|
expect(runtime.session.compacted).toBe(1);
|
|
1001
1001
|
await expect(client.request('sessions.prompt', { sessionId: 'pi-session-forked', text: 'prompt' })).resolves.toMatchObject({ result: { accepted: true, messageId: 'fake-entry' } });
|
|
1002
1002
|
expect(runtime.session.sent).toEqual([{ text: 'prompt', options: undefined }]);
|
|
@@ -1122,14 +1122,16 @@ describe('Pi session daemon spike', () => {
|
|
|
1122
1122
|
const agentDir = join(root, 'agent');
|
|
1123
1123
|
const endpoint = testDaemonEndpoint(root);
|
|
1124
1124
|
await Promise.all([mkdir(cwd), mkdir(agentDir)]);
|
|
1125
|
+
const skillPath = join(agentDir, 'skills', 'directory-name', 'SKILL.md');
|
|
1125
1126
|
const loader = {
|
|
1126
|
-
getSkills: () => ({ skills: [{ name: 'review', description: 'Review changes', filePath:
|
|
1127
|
+
getSkills: () => ({ skills: [{ name: 'review', description: 'Review changes', filePath: skillPath, sourceInfo: { scope: 'user', origin: 'top-level' } }] }),
|
|
1127
1128
|
getPrompts: () => ({ prompts: [] }),
|
|
1128
1129
|
getAgentsFiles: () => ({ agentsFiles: [] }),
|
|
1129
1130
|
};
|
|
1131
|
+
const session = new FakeSession();
|
|
1130
1132
|
daemon = createSessionDaemon({
|
|
1131
1133
|
endpoint, credential, cwd, agentDir,
|
|
1132
|
-
createRuntime: async () => ({ session
|
|
1134
|
+
createRuntime: async () => ({ cwd, session, services: { resourceLoader: loader }, async dispose() {} }),
|
|
1133
1135
|
});
|
|
1134
1136
|
await daemon.start();
|
|
1135
1137
|
const client = connectClient(endpoint);
|
|
@@ -1139,6 +1141,48 @@ describe('Pi session daemon spike', () => {
|
|
|
1139
1141
|
const globalAgents = listed.result.agents.find((resource) => resource.location === 'global');
|
|
1140
1142
|
expect(globalAgents).toMatchObject({ kind: 'agents', name: 'AGENTS.md', editable: true });
|
|
1141
1143
|
expect(JSON.stringify(listed.result)).not.toContain(agentDir);
|
|
1144
|
+
|
|
1145
|
+
const skillToolStart = client.next((frame) => frame.event === 'session.tool.start' && frame.payload?.toolCallId === 'skill-read');
|
|
1146
|
+
session.emit({ type: 'tool_execution_start', toolCallId: 'skill-read', toolName: 'read', args: { path: skillPath } });
|
|
1147
|
+
await expect(skillToolStart).resolves.toMatchObject({
|
|
1148
|
+
payload: { metadata: { pichamber: { skill: { name: 'review' } } } },
|
|
1149
|
+
});
|
|
1150
|
+
const skillToolEnd = client.next((frame) => frame.event === 'session.tool.end' && frame.payload?.toolCallId === 'skill-read');
|
|
1151
|
+
session.emit({
|
|
1152
|
+
type: 'tool_execution_end', toolCallId: 'skill-read', toolName: 'read',
|
|
1153
|
+
result: { content: [{ type: 'text', text: 'skill content' }], details: { truncation: { truncated: false } } },
|
|
1154
|
+
isError: false,
|
|
1155
|
+
});
|
|
1156
|
+
await expect(skillToolEnd).resolves.toMatchObject({
|
|
1157
|
+
payload: {
|
|
1158
|
+
metadata: {
|
|
1159
|
+
truncation: { truncated: false },
|
|
1160
|
+
pichamber: { skill: { name: 'review' } },
|
|
1161
|
+
},
|
|
1162
|
+
},
|
|
1163
|
+
});
|
|
1164
|
+
|
|
1165
|
+
session.entries = [{
|
|
1166
|
+
type: 'message',
|
|
1167
|
+
id: 'assistant-skill-read',
|
|
1168
|
+
timestamp: '2026-01-01T00:00:02.000Z',
|
|
1169
|
+
message: {
|
|
1170
|
+
role: 'assistant', provider: 'test', model: 'model',
|
|
1171
|
+
content: [{ type: 'toolCall', id: 'persisted-skill-read', name: 'read', arguments: { path: skillPath } }],
|
|
1172
|
+
},
|
|
1173
|
+
}, {
|
|
1174
|
+
type: 'message',
|
|
1175
|
+
id: 'skill-read-result',
|
|
1176
|
+
timestamp: '2026-01-01T00:00:03.000Z',
|
|
1177
|
+
message: {
|
|
1178
|
+
role: 'toolResult', toolCallId: 'persisted-skill-read', toolName: 'read',
|
|
1179
|
+
content: [{ type: 'text', text: 'skill content' }], isError: false,
|
|
1180
|
+
},
|
|
1181
|
+
}];
|
|
1182
|
+
await expect(client.request('sessions.open', { sessionId: session.sessionId, directory: cwd })).resolves.toMatchObject({
|
|
1183
|
+
result: { messages: [{ parts: [expect.objectContaining({ metadata: { pichamber: { skill: { name: 'review' } } } })] }] },
|
|
1184
|
+
});
|
|
1185
|
+
|
|
1142
1186
|
await expect(client.request('resources.update', { resourceId: globalAgents.id, content: '# Global instructions\n' })).resolves.toMatchObject({ result: { agents: expect.any(Array) } });
|
|
1143
1187
|
await expect(readFile(join(agentDir, 'AGENTS.md'), 'utf8')).resolves.toBe('# Global instructions\n');
|
|
1144
1188
|
await client.close();
|
|
@@ -1201,6 +1245,82 @@ describe('Pi session daemon spike', () => {
|
|
|
1201
1245
|
await client.close();
|
|
1202
1246
|
});
|
|
1203
1247
|
|
|
1248
|
+
it('acknowledges manual compaction before summarization completes and publishes its outcome', async () => {
|
|
1249
|
+
const root = await mkdtemp(join(tmpdir(), 'pichamber-pi-daemon-compact-'));
|
|
1250
|
+
const endpoint = testDaemonEndpoint(root);
|
|
1251
|
+
const session = new FakeSession('pi-session-compact');
|
|
1252
|
+
let finishCompaction;
|
|
1253
|
+
session.compact = async (customInstructions) => {
|
|
1254
|
+
session.compacted += 1;
|
|
1255
|
+
session.compactionInstructions = customInstructions;
|
|
1256
|
+
session.emit({ type: 'compaction_start', reason: 'manual' });
|
|
1257
|
+
await new Promise((resolve) => { finishCompaction = resolve; });
|
|
1258
|
+
session.emit({
|
|
1259
|
+
type: 'compaction_end',
|
|
1260
|
+
reason: 'manual',
|
|
1261
|
+
result: { tokensBefore: 120_000, estimatedTokensAfter: 24_000 },
|
|
1262
|
+
aborted: false,
|
|
1263
|
+
willRetry: false,
|
|
1264
|
+
});
|
|
1265
|
+
};
|
|
1266
|
+
daemon = createSessionDaemon({ endpoint, credential, cwd: root, createRuntime: async () => ({ session, async dispose() {} }) });
|
|
1267
|
+
await daemon.start();
|
|
1268
|
+
const client = connectClient(endpoint);
|
|
1269
|
+
await client.authenticate();
|
|
1270
|
+
await client.request('sessions.create', { cwd: root });
|
|
1271
|
+
|
|
1272
|
+
const started = client.next((frame) => frame.event === 'session.compaction' && frame.payload.phase === 'running');
|
|
1273
|
+
const completed = client.next((frame) => frame.event === 'session.compaction' && frame.payload.phase === 'completed');
|
|
1274
|
+
await expect(client.request('sessions.compact', {
|
|
1275
|
+
sessionId: 'pi-session-compact',
|
|
1276
|
+
customInstructions: 'Keep the unresolved test failures',
|
|
1277
|
+
})).resolves.toMatchObject({ result: { accepted: true } });
|
|
1278
|
+
expect(session.compacted).toBe(1);
|
|
1279
|
+
expect(session.compactionInstructions).toBe('Keep the unresolved test failures');
|
|
1280
|
+
await expect(started).resolves.toMatchObject({ payload: { phase: 'running', reason: 'manual' } });
|
|
1281
|
+
|
|
1282
|
+
const observer = connectClient(endpoint);
|
|
1283
|
+
const snapshot = await observer.authenticate();
|
|
1284
|
+
expect(snapshot.payload.compaction).toMatchObject({ phase: 'running', reason: 'manual' });
|
|
1285
|
+
await observer.close();
|
|
1286
|
+
|
|
1287
|
+
const retrying = client.next((frame) => frame.event === 'session.compaction' && frame.payload.phase === 'retrying');
|
|
1288
|
+
session.emit({ type: 'summarization_retry_scheduled', attempt: 1, maxAttempts: 3, delayMs: 2_000, errorMessage: 'temporary provider failure' });
|
|
1289
|
+
await expect(retrying).resolves.toMatchObject({
|
|
1290
|
+
payload: { phase: 'retrying', attempt: 1, maxAttempts: 3, message: 'temporary provider failure' },
|
|
1291
|
+
});
|
|
1292
|
+
|
|
1293
|
+
finishCompaction();
|
|
1294
|
+
await expect(completed).resolves.toMatchObject({
|
|
1295
|
+
payload: {
|
|
1296
|
+
phase: 'completed',
|
|
1297
|
+
reason: 'manual',
|
|
1298
|
+
tokensBefore: 120_000,
|
|
1299
|
+
estimatedTokensAfter: 24_000,
|
|
1300
|
+
},
|
|
1301
|
+
});
|
|
1302
|
+
await client.close();
|
|
1303
|
+
});
|
|
1304
|
+
|
|
1305
|
+
it('publishes a terminal compaction failure when the SDK rejects without an end event', async () => {
|
|
1306
|
+
const root = await mkdtemp(join(tmpdir(), 'pichamber-pi-daemon-compact-failure-'));
|
|
1307
|
+
const endpoint = testDaemonEndpoint(root);
|
|
1308
|
+
const session = new FakeSession('pi-session-compact-failure');
|
|
1309
|
+
session.compact = async () => { throw new Error('summary provider unavailable'); };
|
|
1310
|
+
daemon = createSessionDaemon({ endpoint, credential, cwd: root, createRuntime: async () => ({ session, async dispose() {} }) });
|
|
1311
|
+
await daemon.start();
|
|
1312
|
+
const client = connectClient(endpoint);
|
|
1313
|
+
await client.authenticate();
|
|
1314
|
+
await client.request('sessions.create', { cwd: root });
|
|
1315
|
+
|
|
1316
|
+
const failed = client.next((frame) => frame.event === 'session.compaction' && frame.payload.phase === 'failed');
|
|
1317
|
+
await expect(client.request('sessions.compact', { sessionId: session.sessionId })).resolves.toMatchObject({ result: { accepted: true } });
|
|
1318
|
+
await expect(failed).resolves.toMatchObject({
|
|
1319
|
+
payload: { phase: 'failed', reason: 'manual', message: 'summary provider unavailable', willRetry: false },
|
|
1320
|
+
});
|
|
1321
|
+
await client.close();
|
|
1322
|
+
});
|
|
1323
|
+
|
|
1204
1324
|
it('maps all core session event families to sequenced public-safe daemon frames', async () => {
|
|
1205
1325
|
const root = await mkdtemp(join(tmpdir(), 'pichamber-pi-daemon-'));
|
|
1206
1326
|
const endpoint = testDaemonEndpoint(root);
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { readFile } from 'node:fs/promises';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
|
|
4
|
+
export const PI_FALLBACK_RETRY_LIMIT = 3;
|
|
5
|
+
const PI_MIN_RETRY_LIMIT = 0;
|
|
6
|
+
const PI_MAX_RETRY_LIMIT = 10;
|
|
7
|
+
|
|
8
|
+
const isValidRetryLimit = (value) => Number.isInteger(value) && value >= PI_MIN_RETRY_LIMIT && value <= PI_MAX_RETRY_LIMIT;
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* Resolve the retry limit a new session should run with.
|
|
12
|
+
*
|
|
13
|
+
* Precedence: an explicit per-create payload value wins; otherwise the
|
|
14
|
+
* PiChamber default-retry-limit sidecar setting applies. When neither is
|
|
15
|
+
* configured the result is `undefined` and the caller must leave the runtime's
|
|
16
|
+
* own retry settings untouched — Pi stays authoritative and its built-in
|
|
17
|
+
* default (3) already matches the documented fallback.
|
|
18
|
+
*/
|
|
19
|
+
const resolveEffectiveRetryLimit = async ({ payloadRetryLimit, readSettingsFile = readFile, settingsPath } = {}) => {
|
|
20
|
+
if (payloadRetryLimit !== undefined) {
|
|
21
|
+
if (!isValidRetryLimit(payloadRetryLimit)) {
|
|
22
|
+
throw new Error('The retry limit must be an integer between 0 and 10.');
|
|
23
|
+
}
|
|
24
|
+
return payloadRetryLimit;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
if (settingsPath !== undefined) {
|
|
28
|
+
try {
|
|
29
|
+
const raw = await readSettingsFile(settingsPath, 'utf8');
|
|
30
|
+
const parsed = JSON.parse(raw);
|
|
31
|
+
if (isValidRetryLimit(parsed?.defaultRetryLimit)) return parsed.defaultRetryLimit;
|
|
32
|
+
if (parsed?.defaultRetryLimit !== undefined && parsed?.defaultRetryLimit !== null) {
|
|
33
|
+
throw new Error('The retry limit must be an integer between 0 and 10.');
|
|
34
|
+
}
|
|
35
|
+
} catch (error) {
|
|
36
|
+
// A malformed sidecar value must fail loudly; absence (ENOENT / empty
|
|
37
|
+
// file) is the normal no-override case and resolves to undefined.
|
|
38
|
+
if (error?.code === 'ENOENT') return undefined;
|
|
39
|
+
if (error instanceof SyntaxError || error?.message?.includes('retry limit')) throw error;
|
|
40
|
+
throw error;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
return undefined;
|
|
44
|
+
};
|
|
45
|
+
|
|
46
|
+
/** Convenience wrapper used by the daemon with its standard data-dir path. */
|
|
47
|
+
export const resolveEffectiveRetryLimitFromDataDir = async ({ payloadRetryLimit, dataDir }) => (
|
|
48
|
+
resolveEffectiveRetryLimit({
|
|
49
|
+
payloadRetryLimit,
|
|
50
|
+
// An explicit payload value never reads the sidecar, so no path is needed.
|
|
51
|
+
...(payloadRetryLimit === undefined && dataDir !== undefined
|
|
52
|
+
? { settingsPath: join(dataDir, 'pi', 'settings.json') }
|
|
53
|
+
: {}),
|
|
54
|
+
})
|
|
55
|
+
);
|