@pi-chamber/web 0.9.0 → 0.9.1

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.
Files changed (101) hide show
  1. package/README.md +22 -6
  2. package/bin/cli.js +11 -1
  3. package/bin/cli.test.js +18 -0
  4. package/bin/lib/DOCUMENTATION.md +3 -3
  5. package/bin/lib/cli-args.js +7 -3
  6. package/bin/lib/cli-lifecycle.js +3 -0
  7. package/bin/lib/cli-paths.js +6 -0
  8. package/bin/lib/cli-process.js +1 -0
  9. package/bin/lib/cli-tunnel-profiles.js +15 -10
  10. package/bin/lib/commands-connect-url.js +9 -1
  11. package/bin/lib/commands-logs.js +22 -4
  12. package/bin/lib/commands-serve.js +10 -2
  13. package/bin/lib/commands-tunnel.js +14 -0
  14. package/bin/lib/commands-update.js +18 -14
  15. package/bin/lib/commands-update.test.js +2 -1
  16. package/dist/assets/{DiagramEditor-CcbnMl1H.js → DiagramEditor-DoEOH0hY.js} +1 -1
  17. package/dist/assets/{DiagramView-DTW5jwK3.js → DiagramView-y9Ystuhv.js} +1 -1
  18. package/dist/assets/{DiffView-CZyHHAOB.js → DiffView-ScM4XoqZ.js} +6 -6
  19. package/dist/assets/{FilesView-BJYLFR3H.js → FilesView-CjkhMFqJ.js} +1 -1
  20. package/dist/assets/{GitView-Cg_5UU7E.js → GitView-Bqi6H8I-.js} +3 -3
  21. package/dist/assets/JsonTreeView-DWhlH6NK.js +1 -0
  22. package/dist/assets/{MarkdownRendererImpl-WqBwxlso.js → MarkdownRendererImpl-CEOKZ1qH.js} +1 -1
  23. package/dist/assets/{PatchDiff-BRi23N1l.js → PatchDiff-ClnfJJ2J.js} +1 -1
  24. package/dist/assets/{SessionSwitcherContent-7VAU5pwZ.js → SessionSwitcherContent-e6JzUXD_.js} +1 -1
  25. package/dist/assets/{SessionSwitcherDropdown-BslRtccE.js → SessionSwitcherDropdown-C4etG8dv.js} +2 -2
  26. package/dist/assets/{SessionUnreadDot-1nV0Z2ZA.js → SessionUnreadDot-BVTSwRiG.js} +1 -1
  27. package/dist/assets/SettingsView-C0S0Sx-S.js +2 -0
  28. package/dist/assets/{SettingsWindow-D4jZHl8X.js → SettingsWindow-Cy9tmnMg.js} +1 -1
  29. package/dist/assets/ToolOutputDialog-Csrc0Uk2.js +8 -0
  30. package/dist/assets/{ToolPartDiffPreview-9FLv2fWD.js → ToolPartDiffPreview-6oH6KD44.js} +1 -1
  31. package/dist/assets/{VirtualizedFileDiff-ywmPBXAG.js → VirtualizedFileDiff-DJNcTQNp.js} +3 -3
  32. package/dist/assets/{collapsible-6mCYf7Ky.js → collapsible-DxgVLhi9.js} +1 -1
  33. package/dist/assets/computeVirtualFileMetrics-B-WoeBMW.js +3 -0
  34. package/dist/assets/{contextFileOpenGuard-CKyf-TZ7.js → contextFileOpenGuard-DQ4U9xRH.js} +1 -1
  35. package/dist/assets/{gitStatusPredicates-UsytDMy_.js → gitStatusPredicates-CIFSGjJs.js} +1 -1
  36. package/dist/assets/{index-yWgKW2Fx.js → index-D2C3q2xD.js} +4 -4
  37. package/dist/assets/{index-C8NYcA8-.css → index-DNoEeZ2U.css} +1 -1
  38. package/dist/assets/{index-D1IaU-Q7.js → index-DmNPBaSo.js} +1 -1
  39. package/dist/assets/{isDiffPlainText-DPCilEx_.js → isDiffPlainText-CrvpUauF.js} +1 -1
  40. package/dist/assets/{isFilePlainText-XdCAgm8R.js → isFilePlainText-CKvhS32g.js} +1 -1
  41. package/dist/assets/{main-DhvLreEl.js → main-BFv8slLp.js} +2 -2
  42. package/dist/assets/{main-DcAMXRSi.js → main-CjM7g4Gq.js} +7 -7
  43. package/dist/assets/{markdownCore-BF0Dqwm4.js → markdownCore-DKrraAqT.js} +1 -1
  44. package/dist/assets/{miniChat-DsCx0dsW.js → miniChat-hQnLS5mt.js} +2 -2
  45. package/dist/assets/{mobile-C-IN49xX.js → mobile-DuXOBGs_.js} +2 -2
  46. package/dist/assets/renderElectronMiniChatApp-ClJBZVGy.js +2 -0
  47. package/dist/assets/{renderMobileApp-xCdVzvyf.js → renderMobileApp-DofX2wjB.js} +3 -3
  48. package/dist/assets/{runtimeEndpointReset-CT3WShpj.js → runtimeEndpointReset-BZeYg6eN.js} +3 -3
  49. package/dist/assets/{runtimeSurface-C_3mcJ01.js → runtimeSurface-C7CBxDbh.js} +1 -1
  50. package/dist/assets/{useAppFontEffects-BgK55NDM.js → useAppFontEffects-Cs0f1dKn.js} +102 -102
  51. package/dist/assets/{useFilesViewSearch-CWx24PZg.js → useFilesViewSearch-D1hcbBEc.js} +1 -1
  52. package/dist/assets/usePushVisibilityBeacon-DqHkuVS5.js +10 -0
  53. package/dist/assets/{useSwitcherItems-CrS-F6DY.js → useSwitcherItems-BEoW7LlC.js} +1 -1
  54. package/dist/assets/{vendor-codemirror-language-data-BzeePAPn.js → vendor-codemirror-language-data-B8Ac62S_.js} +2 -2
  55. package/dist/assets/{web-components-DAkBDXRk.js → web-components-Dy-Tz_LJ.js} +2 -2
  56. package/dist/index.html +4 -4
  57. package/dist/mini-chat.html +3 -3
  58. package/dist/mobile.html +3 -3
  59. package/package.json +3 -3
  60. package/server/index.js +26 -7
  61. package/server/lib/client-auth/pairing.js +13 -2
  62. package/server/lib/client-auth/remote-clients.js +13 -2
  63. package/server/lib/fs/DOCUMENTATION.md +3 -1
  64. package/server/lib/fs/routes.test.js +74 -0
  65. package/server/lib/git/DOCUMENTATION.md +1 -1
  66. package/server/lib/git/identity-storage.js +10 -1
  67. package/server/lib/package-manager.js +1 -1
  68. package/server/lib/package-manager.test.js +11 -0
  69. package/server/lib/pi/archive-store.js +3 -2
  70. package/server/lib/pi/model-config-store.js +6 -2
  71. package/server/lib/pi/routes.js +11 -2
  72. package/server/lib/pi/session-daemon/DOCUMENTATION.md +12 -6
  73. package/server/lib/pi/session-daemon/daemon-process.js +48 -13
  74. package/server/lib/pi/session-daemon/session-daemon.js +226 -40
  75. package/server/lib/pi/session-daemon/session-daemon.test.js +207 -0
  76. package/server/lib/pi/session-daemon/session-lease.js +151 -0
  77. package/server/lib/pi/session-daemon/session-lease.test.js +108 -0
  78. package/server/lib/pi/session-daemon/supervisor.js +244 -54
  79. package/server/lib/pi/session-daemon/supervisor.test.js +202 -6
  80. package/server/lib/pi/session-folders-store.js +20 -2
  81. package/server/lib/pi/session-folders-store.test.js +17 -0
  82. package/server/lib/pi/settings-store.js +3 -2
  83. package/server/lib/pi/snippets-store.js +4 -1
  84. package/server/lib/pi/ui-settings-store.js +3 -2
  85. package/server/lib/server/cross-process-lock.js +112 -0
  86. package/server/lib/server/cross-process-lock.test.js +70 -0
  87. package/server/lib/server/server-profile.js +110 -0
  88. package/server/lib/server/server-profile.test.js +58 -0
  89. package/server/lib/server/tunnel-service.DOCUMENTATION.md +7 -8
  90. package/server/lib/server/tunnel-service.js +8 -1
  91. package/server/lib/stt/config-store.js +3 -2
  92. package/server/lib/terminal/DOCUMENTATION.md +1 -1
  93. package/server/lib/tunnels/DOCUMENTATION.md +38 -18
  94. package/server/lib/ui-auth/ui-auth.js +9 -2
  95. package/server/lib/ui-auth/ui-passkeys.js +9 -1
  96. package/dist/assets/JsonTreeView-GTdKGEdy.js +0 -1
  97. package/dist/assets/SettingsView-UIaAyjTo.js +0 -2
  98. package/dist/assets/ToolOutputDialog-BoeJONiR.js +0 -8
  99. package/dist/assets/computeVirtualFileMetrics-3H6mg13G.js +0 -3
  100. package/dist/assets/renderElectronMiniChatApp-C13HXGZL.js +0 -2
  101. package/dist/assets/usePushVisibilityBeacon-swMQLm-i.js +0 -10
@@ -30,6 +30,8 @@ import { createMessageEntryAliases } from './message-entry-aliases.js';
30
30
  import { resolveEffectiveRetryLimitFromDataDir as resolveEffectiveRetryLimit } from './session-retry-limits.js';
31
31
  import { createSkillReadClassifier } from './skill-read-classifier.js';
32
32
  import { createSessionRuntimeRegistry } from './runtime-registry.js';
33
+ import { acquireSessionLease, releaseSessionLease } from './session-lease.js';
34
+ import { withCrossProcessLock } from '../../server/cross-process-lock.js';
33
35
  import {
34
36
  findPiSessionJsonlById,
35
37
  getPiSessionDirectory,
@@ -148,6 +150,14 @@ export function createSessionDaemon({
148
150
  agentDir = getAgentDir(),
149
151
  createRuntime: injectCreateRuntime,
150
152
  healthMetadata = {},
153
+ profileKey,
154
+ serverInstanceId,
155
+ serverPid,
156
+ daemonId,
157
+ daemonRuntime,
158
+ buildId,
159
+ onOwnershipClaim,
160
+ onShutdown,
151
161
  idleTimeoutMs = 5 * 60 * 1_000,
152
162
  listSessions = ({ cwd: sessionCwd, agentDir: sessionAgentDir = agentDir }) => listPiSessionJsonlDirectory({
153
163
  cwd: sessionCwd,
@@ -165,6 +175,14 @@ export function createSessionDaemon({
165
175
  manager.appendSessionInfo(title);
166
176
  },
167
177
  platform = process.platform,
178
+ isServerProcessAlive = (pid) => {
179
+ try {
180
+ process.kill(pid, 0);
181
+ return true;
182
+ } catch (error) {
183
+ return error?.code === 'EPERM';
184
+ }
185
+ },
168
186
  } = {}) {
169
187
  if (!isLocalSessionDaemonEndpoint(endpoint, platform)) {
170
188
  throw new SessionDaemonProtocolError('INVALID_ENDPOINT', 'The session daemon endpoint must be local.');
@@ -181,6 +199,45 @@ export function createSessionDaemon({
181
199
 
182
200
  let server;
183
201
  let runtime;
202
+ let ownerServerInstanceId = typeof serverInstanceId === 'string' && serverInstanceId.length > 0 ? serverInstanceId : null;
203
+ let ownerServerPid = Number.isInteger(serverPid) && serverPid > 0 ? serverPid : null;
204
+ const leaseOwner = () => {
205
+ if (typeof profileKey !== 'string' || profileKey.length === 0) return null;
206
+ if (typeof daemonId !== 'string' || daemonId.length === 0) return null;
207
+ if (typeof ownerServerInstanceId !== 'string' || ownerServerInstanceId.length === 0) return null;
208
+ return {
209
+ profileKey,
210
+ serverInstanceId: ownerServerInstanceId,
211
+ daemonId,
212
+ daemonPid: process.pid,
213
+ };
214
+ };
215
+ // Exclusive cross-daemon ownership of one resident session. The session
216
+ // stays visible in listings; contention reports SESSION_IN_USE instead of
217
+ // pretending the session is absent or idle.
218
+ const acquireResidentLease = async ({ cwd: leaseCwd, sessionId }) => {
219
+ const owner = leaseOwner();
220
+ if (!owner || typeof sessionId !== 'string' || sessionId.length === 0) return;
221
+ let result;
222
+ try {
223
+ result = await acquireSessionLease({ agentDir, cwd: leaseCwd, sessionId, owner });
224
+ } catch (error) {
225
+ throw new SessionDaemonProtocolError('SESSION_LEASE_UNAVAILABLE', 'The session ownership check is temporarily unavailable.');
226
+ }
227
+ if (!result.acquired) {
228
+ throw new SessionDaemonProtocolError('SESSION_IN_USE', 'Another PiChamber instance is currently using this session.');
229
+ }
230
+ };
231
+ const releaseResidentLease = async ({ cwd: leaseCwd, sessionId }) => {
232
+ const owner = leaseOwner();
233
+ if (!owner || typeof sessionId !== 'string' || sessionId.length === 0) return;
234
+ try {
235
+ await releaseSessionLease({ agentDir, cwd: leaseCwd, sessionId, owner });
236
+ } catch {
237
+ // Lease release is best-effort; a stale lease is reclaimable by the
238
+ // next owner once this daemon pid is dead.
239
+ }
240
+ };
184
241
  let runtimeRegistry;
185
242
  let runtimeStartPromise;
186
243
  let idleDisposeTimer;
@@ -435,6 +492,7 @@ export function createSessionDaemon({
435
492
  dormantSession = {
436
493
  sessionId,
437
494
  sessionFile: runtime.session.sessionManager?.getSessionFile?.(),
495
+ cwd: runtime.cwd || activeDirectory || cwd,
438
496
  };
439
497
  };
440
498
 
@@ -510,6 +568,19 @@ export function createSessionDaemon({
510
568
  await resourceReloadQueue.catch(() => {});
511
569
  resourceReloadsByRuntime.clear();
512
570
  clearExtensionState(undefined);
571
+ const leased = [];
572
+ try {
573
+ for (const tracked of runtimeRegistry?.listAll?.() ?? []) {
574
+ if (typeof tracked?.session?.sessionId === 'string') {
575
+ leased.push({ cwd: tracked.cwd || activeDirectory || cwd, sessionId: tracked.session.sessionId });
576
+ }
577
+ }
578
+ } catch {
579
+ // Registry enumeration must never block teardown.
580
+ }
581
+ if (runtime && typeof runtime.session?.sessionId === 'string') {
582
+ leased.push({ cwd: runtime.cwd || activeDirectory || cwd, sessionId: runtime.session.sessionId });
583
+ }
513
584
  if (runtimeRegistry) {
514
585
  const hadTrackedRuntime = runtimeRegistry.size > 0;
515
586
  await runtimeRegistry.disposeAll();
@@ -519,22 +590,39 @@ export function createSessionDaemon({
519
590
  await runtime?.dispose?.();
520
591
  }
521
592
  runtime = undefined;
593
+ for (const lease of leased) {
594
+ await releaseResidentLease(lease);
595
+ }
522
596
  };
523
597
 
524
598
  const startRuntime = async ({ cwd: runtimeCwd = activeDirectory || cwd, sessionFile } = {}) => {
525
599
  if (sessionFile) await validatePiSessionJsonlFile(sessionFile);
526
- const newRuntime = await createRuntime({ cwd: runtimeCwd, agentDir, ...(sessionFile ? { sessionFile } : {}) });
600
+ const canonicalRuntimeCwd = sessionFile && dormantSession?.cwd
601
+ ? dormantSession.cwd
602
+ : runtimeCwd;
603
+ if (sessionFile && dormantSession?.sessionId) {
604
+ await acquireResidentLease({ cwd: canonicalRuntimeCwd, sessionId: dormantSession.sessionId });
605
+ }
606
+ let newRuntime;
607
+ try {
608
+ newRuntime = await createRuntime({ cwd: canonicalRuntimeCwd, agentDir, ...(sessionFile ? { sessionFile } : {}) });
609
+ } catch (error) {
610
+ if (sessionFile && dormantSession?.sessionId) {
611
+ await releaseResidentLease({ cwd: canonicalRuntimeCwd, sessionId: dormantSession.sessionId });
612
+ }
613
+ throw error;
614
+ }
527
615
  if (!newRuntime.cwd) {
528
- newRuntime.cwd = runtimeCwd;
616
+ newRuntime.cwd = canonicalRuntimeCwd;
529
617
  }
530
618
  if (!runtimeRegistry) {
531
619
  runtimeRegistry = createSessionRuntimeRegistry({
532
620
  onSessionEvent: ({ cwd: eventCwd, sessionId: eventSessionId }, event) => publishSessionEvent(eventSessionId, event, eventCwd),
533
621
  });
534
622
  }
535
- runtimeRegistry.register(newRuntime, { cwd: runtimeCwd });
623
+ runtimeRegistry.register(newRuntime, { cwd: canonicalRuntimeCwd });
536
624
  runtime = newRuntime;
537
- activeDirectory = runtimeCwd;
625
+ activeDirectory = canonicalRuntimeCwd;
538
626
  rememberRuntimeSession();
539
627
  return newRuntime;
540
628
  };
@@ -643,6 +731,7 @@ export function createSessionDaemon({
643
731
  if (targetRuntime === runtime) rememberRuntimeSession();
644
732
  clearExtensionState(sessionId);
645
733
  await runtimeRegistry.dispose(targetRuntime);
734
+ await releaseResidentLease({ cwd: targetRuntime.cwd || activeDirectory || cwd, sessionId });
646
735
  shutdownRequestedBySession.delete(sessionId);
647
736
  compactionStateBySession.delete(sessionId);
648
737
  if (targetRuntime === runtime) runtime = undefined;
@@ -892,10 +981,17 @@ export function createSessionDaemon({
892
981
  return existingAnywhere;
893
982
  }
894
983
  const { target, directory } = await findPersistedSession(sessionId, requestedDirectory);
895
- const newRuntime = await createRuntime({ cwd: directory, agentDir, sessionFile: target.path });
896
- if (!newRuntime.cwd) newRuntime.cwd = directory;
897
- if (newRuntime.session?.sessionId !== sessionId && typeof newRuntime.switchSession === 'function') {
898
- await newRuntime.switchSession(target.path);
984
+ await acquireResidentLease({ cwd: directory, sessionId });
985
+ let newRuntime;
986
+ try {
987
+ newRuntime = await createRuntime({ cwd: directory, agentDir, sessionFile: target.path });
988
+ if (!newRuntime.cwd) newRuntime.cwd = directory;
989
+ if (newRuntime.session?.sessionId !== sessionId && typeof newRuntime.switchSession === 'function') {
990
+ await newRuntime.switchSession(target.path);
991
+ }
992
+ } catch (error) {
993
+ await releaseResidentLease({ cwd: directory, sessionId });
994
+ throw error;
899
995
  }
900
996
  const raced = runtimeRegistry.findBySessionId(sessionId);
901
997
  if (raced) {
@@ -917,6 +1013,7 @@ export function createSessionDaemon({
917
1013
  return winner;
918
1014
  }
919
1015
  }
1016
+ await releaseResidentLease({ cwd: directory, sessionId });
920
1017
  throw error;
921
1018
  }
922
1019
  runtime = newRuntime;
@@ -1232,6 +1329,12 @@ export function createSessionDaemon({
1232
1329
  newRuntime.session.sessionManager.appendSessionInfo(payload.title.trim());
1233
1330
  }
1234
1331
  if (result?.cancelled) throw new SessionDaemonProtocolError('SESSION_CREATE_CANCELLED', 'Pi cancelled session creation.');
1332
+ try {
1333
+ await acquireResidentLease({ cwd: targetCwd, sessionId: newRuntime.session.sessionId });
1334
+ } catch (error) {
1335
+ try { await newRuntime.dispose?.(); } catch { /* the failed create owns nothing */ }
1336
+ throw error;
1337
+ }
1235
1338
  if (payload.model) {
1236
1339
  await setSessionModel(newRuntime, payload.model);
1237
1340
  publishSessionModel(newRuntime.session, newRuntime.session.sessionId, targetCwd);
@@ -1602,36 +1705,42 @@ export function createSessionDaemon({
1602
1705
  throw new SessionDaemonProtocolError('SESSION_BUSY', 'Project trust cannot change during an active session.');
1603
1706
  }
1604
1707
  }
1605
- const trustStore = createTrustStore(agentDir);
1606
- if (hasTrust) trustStore.set(targetDir, payload.trust);
1607
- const trusted = trustStore.get(targetDir) === true;
1608
- if (payload.scope === 'project' && !trusted && (hasModel || hasThinking)) {
1609
- throw new SessionDaemonProtocolError('PROJECT_UNTRUSTED', 'The project is not trusted.');
1610
- }
1611
- if (hasModel || hasThinking) {
1612
- const manager = createSettingsManager({ cwd: targetDir, agentDir, projectTrusted: trusted });
1613
- if (payload.scope === 'global') {
1614
- if (hasModel) manager.setDefaultModelAndProvider(payload.defaultModel?.providerId, payload.defaultModel?.modelId);
1615
- if (hasThinking) manager.setDefaultThinkingLevel(payload.defaultThinking ?? undefined);
1616
- } else {
1617
- if (hasModel) {
1618
- manager.updateProjectSettings('defaultProvider', (settings) => {
1619
- if (payload.defaultModel === null) delete settings.defaultProvider;
1620
- else settings.defaultProvider = payload.defaultModel.providerId;
1621
- });
1622
- manager.updateProjectSettings('defaultModel', (settings) => {
1623
- if (payload.defaultModel === null) delete settings.defaultModel;
1624
- else settings.defaultModel = payload.defaultModel.modelId;
1708
+ // Pi settings and trust live under the shared agent directory: read the
1709
+ // current files and commit inside the shared lock so concurrent daemons
1710
+ // cannot interleave read-modify-write cycles.
1711
+ const trusted = await withSharedPiConfigLock(async () => {
1712
+ const trustStore = createTrustStore(agentDir);
1713
+ if (hasTrust) trustStore.set(targetDir, payload.trust);
1714
+ const isTrusted = trustStore.get(targetDir) === true;
1715
+ if (payload.scope === 'project' && !isTrusted && (hasModel || hasThinking)) {
1716
+ throw new SessionDaemonProtocolError('PROJECT_UNTRUSTED', 'The project is not trusted.');
1717
+ }
1718
+ if (hasModel || hasThinking) {
1719
+ const manager = createSettingsManager({ cwd: targetDir, agentDir, projectTrusted: isTrusted });
1720
+ if (payload.scope === 'global') {
1721
+ if (hasModel) manager.setDefaultModelAndProvider(payload.defaultModel?.providerId, payload.defaultModel?.modelId);
1722
+ if (hasThinking) manager.setDefaultThinkingLevel(payload.defaultThinking ?? undefined);
1723
+ } else {
1724
+ if (hasModel) {
1725
+ manager.updateProjectSettings('defaultProvider', (settings) => {
1726
+ if (payload.defaultModel === null) delete settings.defaultProvider;
1727
+ else settings.defaultProvider = payload.defaultModel.providerId;
1728
+ });
1729
+ manager.updateProjectSettings('defaultModel', (settings) => {
1730
+ if (payload.defaultModel === null) delete settings.defaultModel;
1731
+ else settings.defaultModel = payload.defaultModel.modelId;
1732
+ });
1733
+ }
1734
+ if (hasThinking) manager.updateProjectSettings('defaultThinkingLevel', (settings) => {
1735
+ if (payload.defaultThinking === null) delete settings.defaultThinkingLevel;
1736
+ else settings.defaultThinkingLevel = payload.defaultThinking;
1625
1737
  });
1626
1738
  }
1627
- if (hasThinking) manager.updateProjectSettings('defaultThinkingLevel', (settings) => {
1628
- if (payload.defaultThinking === null) delete settings.defaultThinkingLevel;
1629
- else settings.defaultThinkingLevel = payload.defaultThinking;
1630
- });
1739
+ await manager.flush();
1740
+ if (manager.drainErrors().length > 0) throw new SessionDaemonProtocolError('PI_SETTINGS_INVALID', 'Pi settings could not be written.');
1631
1741
  }
1632
- await manager.flush();
1633
- if (manager.drainErrors().length > 0) throw new SessionDaemonProtocolError('PI_SETTINGS_INVALID', 'Pi settings could not be written.');
1634
- }
1742
+ return isTrusted;
1743
+ });
1635
1744
  if (hasTrust && runtime) {
1636
1745
  await disposeRuntime();
1637
1746
  await ensureRuntime();
@@ -1743,7 +1852,16 @@ export function createSessionDaemon({
1743
1852
  return pending;
1744
1853
  };
1745
1854
 
1746
- const writeResourceFile = async (filePath, content) => {
1855
+ // Pi prompt and context files live under the shared agent directory (or a
1856
+ // shared project directory), so concurrent daemons serialize here rather
1857
+ // than in-process only. The lock is deliberately coarse: resource edits
1858
+ // are rare user-driven writes, never streaming hot paths.
1859
+ const withSharedPiConfigLock = (operation) => withCrossProcessLock(
1860
+ join(agentDir, '.pichamber', 'locks', 'pi-config.lock'),
1861
+ operation,
1862
+ );
1863
+
1864
+ const writeResourceFile = async (filePath, content) => withSharedPiConfigLock(async () => {
1747
1865
  const temporary = `${filePath}.${randomUUID()}.tmp`;
1748
1866
  await mkdir(dirname(filePath), { recursive: true, mode: 0o700 });
1749
1867
  try {
@@ -1753,9 +1871,9 @@ export function createSessionDaemon({
1753
1871
  await rm(temporary, { force: true }).catch(() => {});
1754
1872
  throw error;
1755
1873
  }
1756
- };
1874
+ });
1757
1875
 
1758
- const writeNewResourceFile = async (filePath, content) => {
1876
+ const writeNewResourceFile = async (filePath, content) => withSharedPiConfigLock(async () => {
1759
1877
  const temporary = `${filePath}.${randomUUID()}.tmp`;
1760
1878
  await mkdir(dirname(filePath), { recursive: true, mode: 0o700 });
1761
1879
  try {
@@ -1769,7 +1887,7 @@ export function createSessionDaemon({
1769
1887
  throw error;
1770
1888
  }
1771
1889
  await rm(temporary, { force: true }).catch(() => {});
1772
- };
1890
+ });
1773
1891
 
1774
1892
  const refreshResources = async (targetDir) => {
1775
1893
  servicesCache.delete(targetDir || activeDirectory || cwd);
@@ -2404,9 +2522,16 @@ export function createSessionDaemon({
2404
2522
  } else if (!active) {
2405
2523
  const { target, directory } = await findPersistedSession(sessionId, targetDir);
2406
2524
  targetDir = directory;
2407
- await rm(target.path, { force: false });
2525
+ await acquireResidentLease({ cwd: targetDir, sessionId });
2526
+ try {
2527
+ await rm(target.path, { force: false });
2528
+ } catch (error) {
2529
+ await releaseResidentLease({ cwd: targetDir, sessionId });
2530
+ throw error;
2531
+ }
2408
2532
  }
2409
2533
  messageEntryAliases.clearSession({ cwd: active?.cwd || targetDir, sessionId });
2534
+ await releaseResidentLease({ cwd: active?.cwd || targetDir, sessionId });
2410
2535
  retryStateBySession.delete(sessionId);
2411
2536
  compactionStateBySession.delete(sessionId);
2412
2537
  activeRunStartedAt.delete(sessionId);
@@ -2747,6 +2872,7 @@ export function createSessionDaemon({
2747
2872
  sessionId: getSessionState().sessionId,
2748
2873
  lastSequence: sequence,
2749
2874
  capabilities: [
2875
+ 'runtime.claim', 'runtime.shutdown',
2750
2876
  'projects.list', 'projects.select', 'sessions.list', 'sessions.create', 'sessions.open', 'sessions.rename', 'sessions.delete',
2751
2877
  'sessions.tree', 'sessions.navigate', 'sessions.fork', 'sessions.clone', 'sessions.prompt',
2752
2878
  'sessions.steer', 'sessions.followUp', 'sessions.abort', 'sessions.setModel',
@@ -2756,9 +2882,66 @@ export function createSessionDaemon({
2756
2882
  'extensions.list', 'extensions.respond',
2757
2883
  ],
2758
2884
  ...(Number.isInteger(healthMetadata.daemonPid) ? { daemonPid: healthMetadata.daemonPid } : {}),
2885
+ ...(typeof profileKey === 'string' && profileKey.length > 0 ? { profileKey } : {}),
2886
+ ...(typeof daemonId === 'string' && daemonId.length > 0 ? { daemonId } : {}),
2887
+ ...(typeof ownerServerInstanceId === 'string' && ownerServerInstanceId.length > 0 ? { serverInstanceId: ownerServerInstanceId } : {}),
2888
+ ...(Number.isInteger(ownerServerPid) && ownerServerPid > 0 ? { serverPid: ownerServerPid } : {}),
2889
+ ...(typeof daemonRuntime === 'string' && daemonRuntime.length > 0 ? { runtime: daemonRuntime } : {}),
2890
+ ...(typeof buildId === 'string' && buildId.length > 0 ? { buildId } : {}),
2759
2891
  },
2760
2892
  });
2761
2893
  return;
2894
+ case 'runtime.claim': {
2895
+ const nextOwner = message.payload?.serverInstanceId;
2896
+ const nextServerPid = message.payload?.serverPid;
2897
+ if (typeof nextOwner !== 'string' || nextOwner.length === 0
2898
+ || !Number.isInteger(nextServerPid) || nextServerPid <= 0) {
2899
+ throw new SessionDaemonProtocolError('INVALID_ARGUMENT', 'The claiming server instance is invalid.');
2900
+ }
2901
+ if (ownerServerInstanceId !== null && nextOwner !== ownerServerInstanceId
2902
+ && ownerServerPid !== null && isServerProcessAlive(ownerServerPid)) {
2903
+ throw new SessionDaemonProtocolError('OWNERSHIP_CONFLICT', 'The current server still owns this daemon.');
2904
+ }
2905
+ await onOwnershipClaim?.({ serverInstanceId: nextOwner, serverPid: nextServerPid });
2906
+ ownerServerInstanceId = nextOwner;
2907
+ ownerServerPid = nextServerPid;
2908
+ writeFrame(socket, {
2909
+ protocolVersion: PROTOCOL_VERSION,
2910
+ kind: 'response',
2911
+ requestId: message.requestId,
2912
+ result: { claimed: true, serverInstanceId: ownerServerInstanceId, serverPid: ownerServerPid },
2913
+ });
2914
+ return;
2915
+ }
2916
+ case 'runtime.shutdown': {
2917
+ const caller = message.payload?.serverInstanceId;
2918
+ const callerDaemon = message.payload?.daemonId;
2919
+ if (typeof caller !== 'string' || caller.length === 0) {
2920
+ throw new SessionDaemonProtocolError('INVALID_ARGUMENT', 'The shutting-down server instance is invalid.');
2921
+ }
2922
+ if ((ownerServerInstanceId !== null && caller !== ownerServerInstanceId)
2923
+ || (typeof daemonId === 'string' && daemonId.length > 0 && callerDaemon !== daemonId)) {
2924
+ throw new SessionDaemonProtocolError('OWNERSHIP_MISMATCH', 'The daemon is owned by another server instance.');
2925
+ }
2926
+ writeFrame(socket, {
2927
+ protocolVersion: PROTOCOL_VERSION,
2928
+ kind: 'response',
2929
+ requestId: message.requestId,
2930
+ result: { shutdown: true },
2931
+ });
2932
+ if (typeof onShutdown === 'function') {
2933
+ const shutdownHook = onShutdown;
2934
+ setImmediate(() => {
2935
+ try {
2936
+ shutdownHook();
2937
+ } catch {
2938
+ // Shutdown hooks own their own error handling; the response
2939
+ // has already been delivered.
2940
+ }
2941
+ });
2942
+ }
2943
+ return;
2944
+ }
2762
2945
  case 'projects.list':
2763
2946
  writeFrame(socket, {
2764
2947
  protocolVersion: PROTOCOL_VERSION,
@@ -2971,6 +3154,9 @@ export function createSessionDaemon({
2971
3154
  : requestedId;
2972
3155
  const result = await activeRuntime.fork(entryId, { position: 'at' });
2973
3156
  if (result.cancelled) throw new SessionDaemonProtocolError('SESSION_CREATE_CANCELLED', 'Pi cancelled session creation.');
3157
+ if (typeof activeRuntime.session?.sessionId === 'string') {
3158
+ await acquireResidentLease({ cwd: activeRuntime.cwd, sessionId: activeRuntime.session.sessionId });
3159
+ }
2974
3160
  rememberRuntimeSession();
2975
3161
  writeFrame(socket, { protocolVersion: PROTOCOL_VERSION, kind: 'response', requestId: message.requestId, result: projectActiveSession(activeRuntime, activeRuntime.cwd) });
2976
3162
  return;
@@ -2368,4 +2368,211 @@ describe('Pi session daemon spike', () => {
2368
2368
  expect(detail.result.messages[0].message.thinkingLevel).toBe('high');
2369
2369
  await client.close();
2370
2370
  });
2371
+
2372
+ it('transfers profile ownership through runtime.claim and enforces it on runtime.shutdown', async () => {
2373
+ const root = await mkdtemp(join(tmpdir(), 'pichamber-pi-daemon-ownership-'));
2374
+ const endpoint = testDaemonEndpoint(root);
2375
+ const projectDir = join(root, 'project');
2376
+ const agentDir = join(root, 'agent');
2377
+ await mkdir(projectDir, { recursive: true });
2378
+ await mkdir(agentDir, { recursive: true });
2379
+ let shutdownCalls = 0;
2380
+ daemon = createSessionDaemon({
2381
+ endpoint,
2382
+ credential,
2383
+ cwd: projectDir,
2384
+ agentDir,
2385
+ profileKey: 'web-p3000',
2386
+ serverInstanceId: 'server-a',
2387
+ serverPid: 987_654_321,
2388
+ daemonId: 'daemon-a',
2389
+ onShutdown: () => { shutdownCalls += 1; },
2390
+ });
2391
+ await daemon.start();
2392
+ const client = connectClient(endpoint);
2393
+ await client.authenticate();
2394
+ await expect(client.request('runtime.health')).resolves.toMatchObject({
2395
+ result: { profileKey: 'web-p3000', daemonId: 'daemon-a', serverInstanceId: 'server-a' },
2396
+ });
2397
+ await expect(client.request('runtime.claim', { serverInstanceId: 'server-b', serverPid: process.pid })).resolves.toMatchObject({
2398
+ result: { claimed: true, serverInstanceId: 'server-b', serverPid: process.pid },
2399
+ });
2400
+ const requestRaw = (requestClient, command, payload) => {
2401
+ const requestId = `request-${Math.random()}`;
2402
+ requestClient.socket.write(`${JSON.stringify({ protocolVersion: 1, kind: 'request', requestId, command, payload })}\n`);
2403
+ return requestClient.next((message) => message.kind === 'error');
2404
+ };
2405
+ // The stale previous owner must not shut the daemon down. A rejected
2406
+ // command destroys its connection, so later steps reconnect.
2407
+ await expect(requestRaw(client, 'runtime.shutdown', { serverInstanceId: 'server-a', daemonId: 'daemon-a' }))
2408
+ .resolves.toMatchObject({ error: { code: 'OWNERSHIP_MISMATCH' } });
2409
+ expect(shutdownCalls).toBe(0);
2410
+ // The current owner shuts it down through authenticated IPC.
2411
+ const owner = connectClient(endpoint);
2412
+ await owner.authenticate();
2413
+ owner.socket.write(`${JSON.stringify({ protocolVersion: 1, kind: 'request', requestId: 'shutdown-ok', command: 'runtime.shutdown', payload: { serverInstanceId: 'server-b', daemonId: 'daemon-a' } })}\n`);
2414
+ await expect(owner.next((message) => message.kind === 'response' && message.requestId === 'shutdown-ok'))
2415
+ .resolves.toMatchObject({ result: { shutdown: true } });
2416
+ await new Promise((resolve) => setImmediate(resolve));
2417
+ expect(shutdownCalls).toBe(1);
2418
+ await owner.close();
2419
+ });
2420
+
2421
+ it('keeps the prior owner when an ownership claim cannot be persisted', async () => {
2422
+ const root = await mkdtemp(join(tmpdir(), 'pichamber-pi-daemon-claim-persist-'));
2423
+ const endpoint = testDaemonEndpoint(root);
2424
+ daemon = createSessionDaemon({
2425
+ endpoint,
2426
+ credential,
2427
+ cwd: root,
2428
+ profileKey: 'web-p3000',
2429
+ serverInstanceId: 'server-a',
2430
+ serverPid: 987_654_321,
2431
+ daemonId: 'daemon-a',
2432
+ onOwnershipClaim: async () => {
2433
+ throw Object.assign(new Error('State write failed'), { code: 'STATE_WRITE_FAILED' });
2434
+ },
2435
+ });
2436
+ await daemon.start();
2437
+ const claimant = connectClient(endpoint);
2438
+ await claimant.authenticate();
2439
+ const response = claimant.next((message) => message.kind === 'error');
2440
+ claimant.socket.write(`${JSON.stringify({
2441
+ protocolVersion: 1,
2442
+ kind: 'request',
2443
+ requestId: 'claim-persist-failure',
2444
+ command: 'runtime.claim',
2445
+ payload: { serverInstanceId: 'server-b', serverPid: process.pid },
2446
+ })}\n`);
2447
+ await expect(response).resolves.toMatchObject({ error: { code: 'STATE_WRITE_FAILED' } });
2448
+
2449
+ const observer = connectClient(endpoint);
2450
+ await observer.authenticate();
2451
+ await expect(observer.request('runtime.health')).resolves.toMatchObject({
2452
+ result: { serverInstanceId: 'server-a', serverPid: 987_654_321 },
2453
+ });
2454
+ claimant.socket.destroy();
2455
+ await observer.close();
2456
+ });
2457
+
2458
+ it('refuses to transfer profile ownership while the current server is alive', async () => {
2459
+ const root = await mkdtemp(join(tmpdir(), 'pichamber-pi-daemon-live-owner-'));
2460
+ const endpoint = testDaemonEndpoint(root);
2461
+ const projectDir = join(root, 'project');
2462
+ await mkdir(projectDir, { recursive: true });
2463
+ daemon = createSessionDaemon({
2464
+ endpoint,
2465
+ credential,
2466
+ cwd: projectDir,
2467
+ profileKey: 'web-p3000',
2468
+ serverInstanceId: 'server-a',
2469
+ serverPid: process.pid,
2470
+ daemonId: 'daemon-a',
2471
+ });
2472
+ await daemon.start();
2473
+ const client = connectClient(endpoint);
2474
+ await client.authenticate();
2475
+ const requestId = 'claim-live-owner';
2476
+ const response = client.next((message) => message.kind === 'error');
2477
+ client.socket.write(`${JSON.stringify({
2478
+ protocolVersion: 1,
2479
+ kind: 'request',
2480
+ requestId,
2481
+ command: 'runtime.claim',
2482
+ payload: { serverInstanceId: 'server-b', serverPid: process.pid + 1 },
2483
+ })}\n`);
2484
+ await expect(response).resolves.toMatchObject({ error: { code: 'OWNERSHIP_CONFLICT' } });
2485
+ await client.close();
2486
+ });
2487
+
2488
+ it('refuses a cross-profile open of a leased session instead of hiding it', async () => {
2489
+ const root = await mkdtemp(join(tmpdir(), 'pichamber-pi-daemon-lease-'));
2490
+ const endpointA = join(root, 'a.sock');
2491
+ const endpointB = join(root, 'b.sock');
2492
+ const agentDir = join(root, 'agent');
2493
+ await mkdir(agentDir, { recursive: true });
2494
+ const file1 = join(root, 'session-1.jsonl');
2495
+ const file2 = join(root, 'session-2.jsonl');
2496
+ await writeFile(file1, `{"type":"session","id":"session-1","cwd":"${root}"}\n`);
2497
+ await writeFile(file2, `{"type":"session","id":"session-2","cwd":"${root}"}\n`);
2498
+ const sessions = new Map();
2499
+ sessions.set('session-1', new FakeSession('session-1', file1));
2500
+ sessions.set('session-2', new FakeSession('session-2', file2));
2501
+ const createRuntime = async ({ sessionFile }) => {
2502
+ const id = sessionFile?.includes('session-2') ? 'session-2' : 'session-1';
2503
+ return new FakeRuntime({ cwd: root, session: sessions.get(id) });
2504
+ };
2505
+ // Non-standard filenames: resolve opens through the mocked list path,
2506
+ // mirroring the concurrent-sessions test above.
2507
+ const listSessions = async () => [
2508
+ { path: file1, id: 'session-1', cwd: root, created: new Date(), modified: new Date(), messageCount: 0 },
2509
+ { path: file2, id: 'session-2', cwd: root, created: new Date(), modified: new Date(), messageCount: 0 },
2510
+ ];
2511
+ daemon = createSessionDaemon({
2512
+ endpoint: endpointA,
2513
+ credential,
2514
+ cwd: root,
2515
+ agentDir,
2516
+ profileKey: 'web-p3000',
2517
+ serverInstanceId: 'server-a',
2518
+ daemonId: 'daemon-a',
2519
+ createRuntime,
2520
+ listSessions,
2521
+ });
2522
+ const daemonB = createSessionDaemonImpl({
2523
+ endpoint: endpointB,
2524
+ credential,
2525
+ cwd: root,
2526
+ agentDir,
2527
+ profileKey: 'web-dev-p3902',
2528
+ serverInstanceId: 'server-b',
2529
+ daemonId: 'daemon-b',
2530
+ createRuntime,
2531
+ listSessions,
2532
+ });
2533
+ const safeClose = async (requestClient) => {
2534
+ try {
2535
+ if (requestClient?.socket.destroyed) return;
2536
+ await Promise.race([
2537
+ requestClient.close(),
2538
+ new Promise((resolve) => setTimeout(resolve, 1_000)),
2539
+ ]);
2540
+ } catch {}
2541
+ };
2542
+ let clientA;
2543
+ let clientB;
2544
+ try {
2545
+ await daemon.start();
2546
+ await daemonB.start();
2547
+ clientA = connectClient(endpointA);
2548
+ await clientA.authenticate();
2549
+ clientB = connectClient(endpointB);
2550
+ await clientB.authenticate();
2551
+ await expect(clientA.request('sessions.open', { sessionId: 'session-1' })).resolves.toMatchObject({
2552
+ result: { session: { id: 'session-1' } },
2553
+ });
2554
+ // A different session stays fully concurrent across profiles.
2555
+ await expect(clientB.request('sessions.open', { sessionId: 'session-2' })).resolves.toMatchObject({
2556
+ result: { session: { id: 'session-2' } },
2557
+ });
2558
+ // The same session reports ownership instead of absent or idle state.
2559
+ // A rejected command destroys its connection, so later steps reconnect.
2560
+ clientB.socket.write(`${JSON.stringify({ protocolVersion: 1, kind: 'request', requestId: 'contended', command: 'sessions.open', payload: { sessionId: 'session-1' } })}\n`);
2561
+ await expect(clientB.next((message) => message.kind === 'error'))
2562
+ .resolves.toMatchObject({ error: { code: 'SESSION_IN_USE' } });
2563
+ await safeClose(clientB);
2564
+ // Releasing the lease (here through daemon shutdown) lets the other
2565
+ // profile open the session.
2566
+ await daemon.stop();
2567
+ clientB = connectClient(endpointB);
2568
+ await clientB.authenticate();
2569
+ await expect(clientB.request('sessions.open', { sessionId: 'session-1' })).resolves.toMatchObject({
2570
+ result: { session: { id: 'session-1' } },
2571
+ });
2572
+ } finally {
2573
+ await safeClose(clientA);
2574
+ await safeClose(clientB);
2575
+ await daemonB.stop();
2576
+ }
2577
+ });
2371
2578
  });