@neuralnomads/codenomad-dev 0.20.0-dev-20260911-ea37f97b → 0.20.0-dev-20260917-aa51cbb9

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 (191) hide show
  1. package/README.md +2 -2
  2. package/dist/api-types.js.map +1 -1
  3. package/dist/opencode/automation-plugin.test.js +32 -38
  4. package/dist/opencode/automation-plugin.test.js.map +1 -1
  5. package/dist/opencode/compatibility/contract-fixture.js +15 -0
  6. package/dist/opencode/compatibility/contract-fixture.js.map +1 -0
  7. package/dist/opencode/compatibility/events.js +9 -0
  8. package/dist/opencode/compatibility/events.js.map +1 -0
  9. package/dist/opencode/compatibility/location.js +89 -0
  10. package/dist/opencode/compatibility/location.js.map +1 -0
  11. package/dist/opencode/compatibility/location.test.js +92 -0
  12. package/dist/opencode/compatibility/location.test.js.map +1 -0
  13. package/dist/opencode/compatibility/negotiate.js +73 -0
  14. package/dist/opencode/compatibility/negotiate.js.map +1 -0
  15. package/dist/opencode/compatibility/negotiate.test.js +61 -0
  16. package/dist/opencode/compatibility/negotiate.test.js.map +1 -0
  17. package/dist/opencode/compatibility/proxy-locations.js +137 -0
  18. package/dist/opencode/compatibility/proxy-locations.js.map +1 -0
  19. package/dist/opencode/compatibility/proxy-locations.test.js +42 -0
  20. package/dist/opencode/compatibility/proxy-locations.test.js.map +1 -0
  21. package/dist/opencode/compatibility/proxy.js +60 -0
  22. package/dist/opencode/compatibility/proxy.js.map +1 -0
  23. package/dist/opencode/compatibility/proxy.test.js +47 -0
  24. package/dist/opencode/compatibility/proxy.test.js.map +1 -0
  25. package/dist/opencode/compatibility/requests.js +54 -0
  26. package/dist/opencode/compatibility/requests.js.map +1 -0
  27. package/dist/opencode/compatibility/runtime.js +26 -0
  28. package/dist/opencode/compatibility/runtime.js.map +1 -0
  29. package/dist/opencode/compatibility/transport.js +112 -0
  30. package/dist/opencode/compatibility/transport.js.map +1 -0
  31. package/dist/opencode/compatibility/transport.test.js +83 -0
  32. package/dist/opencode/compatibility/transport.test.js.map +1 -0
  33. package/dist/opencode/session-pruning/location.js +16 -0
  34. package/dist/opencode/session-pruning/location.js.map +1 -0
  35. package/dist/opencode/session-pruning/package.test.js +37 -0
  36. package/dist/opencode/session-pruning/package.test.js.map +1 -0
  37. package/dist/opencode/session-pruning/plugin.js +5 -2
  38. package/dist/opencode/session-pruning/plugin.js.map +1 -1
  39. package/dist/opencode/session-pruning/preview-store.js +3 -2
  40. package/dist/opencode/session-pruning/preview-store.js.map +1 -1
  41. package/dist/opencode/session-pruning/pruning.test.js +7 -5
  42. package/dist/opencode/session-pruning/pruning.test.js.map +1 -1
  43. package/dist/opencode/session-pruning/service.js +5 -4
  44. package/dist/opencode/session-pruning/service.js.map +1 -1
  45. package/dist/opencode/session-pruning/service.test.js +65 -53
  46. package/dist/opencode/session-pruning/service.test.js.map +1 -1
  47. package/dist/permissions/opencode-replier.js +2 -2
  48. package/dist/permissions/opencode-replier.js.map +1 -1
  49. package/dist/permissions/opencode-replier.test.js +1 -1
  50. package/dist/permissions/opencode-replier.test.js.map +1 -1
  51. package/dist/permissions/opencode-yolo-metadata.js.map +1 -1
  52. package/dist/permissions/opencode-yolo-metadata.test.js.map +1 -1
  53. package/dist/plugins/session-pruning/plugin.mjs +422 -271
  54. package/dist/server/__tests__/instance-proxy-legacy.test.js +111 -0
  55. package/dist/server/__tests__/instance-proxy-legacy.test.js.map +1 -0
  56. package/dist/server/__tests__/instance-proxy.test.js +95 -34
  57. package/dist/server/__tests__/instance-proxy.test.js.map +1 -1
  58. package/dist/server/http-server.js +147 -237
  59. package/dist/server/http-server.js.map +1 -1
  60. package/dist/server/routes/session-pruning.js +4 -2
  61. package/dist/server/routes/session-pruning.js.map +1 -1
  62. package/dist/server/routes/session-pruning.test.js +16 -2
  63. package/dist/server/routes/session-pruning.test.js.map +1 -1
  64. package/dist/server/routes/worktrees.js +1 -0
  65. package/dist/server/routes/worktrees.js.map +1 -1
  66. package/dist/server/routes/worktrees.test.js +54 -1
  67. package/dist/server/routes/worktrees.test.js.map +1 -1
  68. package/dist/workspaces/host-opencode-service.test.js +56 -7
  69. package/dist/workspaces/host-opencode-service.test.js.map +1 -1
  70. package/dist/workspaces/instance-client.js.map +1 -1
  71. package/dist/workspaces/instance-events.js +71 -57
  72. package/dist/workspaces/instance-events.js.map +1 -1
  73. package/dist/workspaces/instance-events.test.js +122 -9
  74. package/dist/workspaces/instance-events.test.js.map +1 -1
  75. package/dist/workspaces/manager.js +24 -39
  76. package/dist/workspaces/manager.js.map +1 -1
  77. package/dist/workspaces/manager.test.js +43 -7
  78. package/dist/workspaces/manager.test.js.map +1 -1
  79. package/dist/workspaces/opencode-cli-service.js +56 -29
  80. package/dist/workspaces/opencode-cli-service.js.map +1 -1
  81. package/dist/workspaces/opencode-connection-generation.test.js +57 -0
  82. package/dist/workspaces/opencode-connection-generation.test.js.map +1 -0
  83. package/dist/workspaces/opencode-service.js +70 -16
  84. package/dist/workspaces/opencode-service.js.map +1 -1
  85. package/dist/workspaces/opencode-service.test.js +3 -4
  86. package/dist/workspaces/opencode-service.test.js.map +1 -1
  87. package/dist/workspaces/worktree-session-evacuation.js +31 -11
  88. package/dist/workspaces/worktree-session-evacuation.js.map +1 -1
  89. package/dist/workspaces/worktree-session-evacuation.test.js +211 -0
  90. package/dist/workspaces/worktree-session-evacuation.test.js.map +1 -1
  91. package/dist/workspaces/wsl-opencode-service.test.js +64 -24
  92. package/dist/workspaces/wsl-opencode-service.test.js.map +1 -1
  93. package/package.json +3 -3
  94. package/public/assets/App-BROhwPo9.js +54 -0
  95. package/public/assets/App-BROhwPo9.js.map +1 -0
  96. package/public/assets/{FilesTab-CRpGDs1B.js → FilesTab-DY3Vr-3r.js} +3 -3
  97. package/public/assets/{FilesTab-CRpGDs1B.js.map → FilesTab-DY3Vr-3r.js.map} +1 -1
  98. package/public/assets/{GitChangesTab-DxFebTiq.js → GitChangesTab-BD6CJngE.js} +3 -3
  99. package/public/assets/{GitChangesTab-DxFebTiq.js.map → GitChangesTab-BD6CJngE.js.map} +1 -1
  100. package/public/assets/{SplitFilePanel-DgTMrrO-.js → SplitFilePanel-BdY6d_6m.js} +2 -2
  101. package/public/assets/{SplitFilePanel-DgTMrrO-.js.map → SplitFilePanel-BdY6d_6m.js.map} +1 -1
  102. package/public/assets/StatusTab-C-_2yaPa.js +2 -0
  103. package/public/assets/StatusTab-C-_2yaPa.js.map +1 -0
  104. package/public/assets/{align-justify-v_yPXSys.js → align-justify-DI8VTZ4G.js} +2 -2
  105. package/public/assets/{align-justify-v_yPXSys.js.map → align-justify-DI8VTZ4G.js.map} +1 -1
  106. package/public/assets/{bundle-full-HzL_Jtqk.js → bundle-full-D_M65Eb_.js} +2 -2
  107. package/public/assets/{bundle-full-HzL_Jtqk.js.map → bundle-full-D_M65Eb_.js.map} +1 -1
  108. package/public/assets/{client-state-CF-PJ0GG.js → client-state-CWCzCOz6.js} +2 -2
  109. package/public/assets/{client-state-CF-PJ0GG.js.map → client-state-CWCzCOz6.js.map} +1 -1
  110. package/public/assets/{diff-viewer-BFDQBDVy.js → diff-viewer-CGPsYEr3.js} +2 -2
  111. package/public/assets/{diff-viewer-BFDQBDVy.js.map → diff-viewer-CGPsYEr3.js.map} +1 -1
  112. package/public/assets/index-B8-lAqjr.js +2 -0
  113. package/public/assets/index-B8-lAqjr.js.map +1 -0
  114. package/public/assets/index-BeUewQym.js +2 -0
  115. package/public/assets/index-BeUewQym.js.map +1 -0
  116. package/public/assets/index-BxRFHpJd.js +2 -0
  117. package/public/assets/{index-D2UHSOG5.js.map → index-BxRFHpJd.js.map} +1 -1
  118. package/public/assets/index-Bzv1kU-S.js +2 -0
  119. package/public/assets/{index-CTKYD_VJ.js.map → index-Bzv1kU-S.js.map} +1 -1
  120. package/public/assets/index-C9tI4CRG.js +2 -0
  121. package/public/assets/index-C9tI4CRG.js.map +1 -0
  122. package/public/assets/index-CGYHFZ6F.js +2 -0
  123. package/public/assets/index-CGYHFZ6F.js.map +1 -0
  124. package/public/assets/{index-CHYmKl10.js → index-CMEAjBFp.js} +2 -2
  125. package/public/assets/index-CMEAjBFp.js.map +1 -0
  126. package/public/assets/index-Cazypvyc.js +2 -0
  127. package/public/assets/index-Cazypvyc.js.map +1 -0
  128. package/public/assets/index-CwqzofWP.js +2 -0
  129. package/public/assets/index-CwqzofWP.js.map +1 -0
  130. package/public/assets/index-Da9yOa6q.js +2 -0
  131. package/public/assets/index-Da9yOa6q.js.map +1 -0
  132. package/public/assets/{index-RK9gf0uk.js → index-Ddjkirek.js} +2 -2
  133. package/public/assets/{index-RK9gf0uk.js.map → index-Ddjkirek.js.map} +1 -1
  134. package/public/assets/index-HHgvEOAH.js +3 -0
  135. package/public/assets/index-HHgvEOAH.js.map +1 -0
  136. package/public/assets/index-MeFffHqb.css +1 -0
  137. package/public/assets/loading-CdhHiSED.css +1 -0
  138. package/public/assets/{loading-BSB82snY.js → loading-Gqh6NPUr.js} +2 -2
  139. package/public/assets/{loading-BSB82snY.js.map → loading-Gqh6NPUr.js.map} +1 -1
  140. package/public/assets/main-Cbx7KdTr.js +38 -0
  141. package/public/assets/main-Cbx7KdTr.js.map +1 -0
  142. package/public/assets/{markdown-DtidoL2Z.js → markdown-BWnjyvnX.js} +4 -4
  143. package/public/assets/{markdown-DtidoL2Z.js.map → markdown-BWnjyvnX.js.map} +1 -1
  144. package/public/assets/monaco-viewer-BEJIiZWL.js +27 -0
  145. package/public/assets/monaco-viewer-BEJIiZWL.js.map +1 -0
  146. package/public/assets/{startup-state-settings-card-BY741Rt0.js → startup-state-settings-card-C4E2Itop.js} +2 -2
  147. package/public/assets/{startup-state-settings-card-BY741Rt0.js.map → startup-state-settings-card-C4E2Itop.js.map} +1 -1
  148. package/public/assets/{terminal-square-BdC_jwm3.js → terminal-square-C3wutdV0.js} +2 -2
  149. package/public/assets/{terminal-square-BdC_jwm3.js.map → terminal-square-C3wutdV0.js.map} +1 -1
  150. package/public/assets/tool-call-DNsAQ_m4.js +60 -0
  151. package/public/assets/tool-call-DNsAQ_m4.js.map +1 -0
  152. package/public/assets/{unified-picker-C0eo1chJ.js → unified-picker-tB7y17Qz.js} +2 -2
  153. package/public/assets/unified-picker-tB7y17Qz.js.map +1 -0
  154. package/public/assets/{wrap-text-BuMtdvMx.js → wrap-text-CkBxzt04.js} +2 -2
  155. package/public/assets/{wrap-text-BuMtdvMx.js.map → wrap-text-CkBxzt04.js.map} +1 -1
  156. package/public/index.html +4 -4
  157. package/public/loading.html +5 -5
  158. package/public/sw.js +1 -1
  159. package/public/sw.js.map +1 -1
  160. package/public/assets/App-0-FcHzPS.js +0 -44
  161. package/public/assets/App-0-FcHzPS.js.map +0 -1
  162. package/public/assets/StatusTab-LKUA9cbH.js +0 -2
  163. package/public/assets/StatusTab-LKUA9cbH.js.map +0 -1
  164. package/public/assets/index-8iPlm2r0.js +0 -2
  165. package/public/assets/index-8iPlm2r0.js.map +0 -1
  166. package/public/assets/index-B185mC7m.js +0 -2
  167. package/public/assets/index-B185mC7m.js.map +0 -1
  168. package/public/assets/index-Bbj1xF8i.js +0 -2
  169. package/public/assets/index-Bbj1xF8i.js.map +0 -1
  170. package/public/assets/index-BsmFN3k1.js +0 -2
  171. package/public/assets/index-BsmFN3k1.js.map +0 -1
  172. package/public/assets/index-Bz_OQJYA.css +0 -1
  173. package/public/assets/index-C52CfqK3.js +0 -2
  174. package/public/assets/index-C52CfqK3.js.map +0 -1
  175. package/public/assets/index-CHYmKl10.js.map +0 -1
  176. package/public/assets/index-CTKYD_VJ.js +0 -2
  177. package/public/assets/index-D2UHSOG5.js +0 -2
  178. package/public/assets/index-DDoB_Z36.js +0 -2
  179. package/public/assets/index-DDoB_Z36.js.map +0 -1
  180. package/public/assets/index-DcwAtZw-.js +0 -3
  181. package/public/assets/index-DcwAtZw-.js.map +0 -1
  182. package/public/assets/index-DxUD3RYr.js +0 -2
  183. package/public/assets/index-DxUD3RYr.js.map +0 -1
  184. package/public/assets/loading-CmEVQgyj.css +0 -1
  185. package/public/assets/main-CZztwrfv.js +0 -48
  186. package/public/assets/main-CZztwrfv.js.map +0 -1
  187. package/public/assets/monaco-viewer-CpxDfB-6.js +0 -27
  188. package/public/assets/monaco-viewer-CpxDfB-6.js.map +0 -1
  189. package/public/assets/tool-call-DbtCsJ4x.js +0 -60
  190. package/public/assets/tool-call-DbtCsJ4x.js.map +0 -1
  191. package/public/assets/unified-picker-C0eo1chJ.js.map +0 -1
@@ -1,22 +1,28 @@
1
- import { isSessionNotFoundError } from "@opencode-ai/client";
1
+ import { isSessionNotFoundError } from "@opencode/client";
2
+ import { readLocationRef } from "../opencode/compatibility/location";
2
3
  const RECONNECT_DELAY_MS = 1000;
3
- const DIRECTORY_OWNER_CACHE_MS = 2000;
4
- const SESSION_DIRECTORY_CACHE_MS = 2000;
4
+ const LOCATION_OWNER_CACHE_MS = 2000;
5
+ const SESSION_LOCATION_CACHE_MS = 2000;
5
6
  const GLOBAL_EVENT_TYPES = new Set([
6
- "agent.updated",
7
7
  "catalog.updated",
8
+ "agent.updated",
8
9
  "command.updated",
9
10
  "config.updated",
10
11
  "credential.switched",
11
12
  "credential.updated",
12
- "integration.connection.updated",
13
13
  "integration.updated",
14
14
  "installation.update-available",
15
15
  "installation.updated",
16
16
  "mcp.resources.changed",
17
17
  "mcp.status.changed",
18
18
  "models-dev.refreshed",
19
+ "model.updated",
20
+ "plugin.updated",
21
+ "provider.updated",
22
+ "reference.updated",
19
23
  "server.connected",
24
+ "skill.updated",
25
+ "websearch.updated",
20
26
  ]);
21
27
  export class InstanceEventBridge {
22
28
  constructor(options) {
@@ -24,10 +30,10 @@ export class InstanceEventBridge {
24
30
  this.controller = new AbortController();
25
31
  this.status = "connecting";
26
32
  this.generation = 0;
27
- this.directoryOwners = new Map();
28
- this.sessionDirectories = new Map();
29
- this.ptyDirectories = new Map();
30
- this.shellDirectories = new Map();
33
+ this.locationOwners = new Map();
34
+ this.sessionLocations = new Map();
35
+ this.ptyLocations = new Map();
36
+ this.shellLocations = new Map();
31
37
  this.onWorkspaceStarted = (event) => {
32
38
  this.clearLocationCaches();
33
39
  if (!this.task)
@@ -95,14 +101,16 @@ export class InstanceEventBridge {
95
101
  const ptyId = this.ptyId(event);
96
102
  const shellId = this.shellId(event);
97
103
  if (event.type === "session.moved" && sessionId)
98
- this.sessionDirectories.delete(sessionId);
99
- const directory = event.location?.directory
100
- ?? this.ptyInfoDirectory(event)
101
- ?? (ptyId ? this.ptyDirectories.get(ptyId) : undefined)
102
- ?? this.shellInfoDirectory(event)
103
- ?? (shellId ? this.shellDirectories.get(shellId) : undefined)
104
- ?? (sessionId ? await this.resolveSessionDirectory(sessionId) : undefined);
105
- if (!directory) {
104
+ this.sessionLocations.delete(sessionId);
105
+ // A scoped event is native location authority, not merely a cwd hint. Keep
106
+ // that full pair for subsequent locationless PTY/Shell/session events.
107
+ const location = event.location ? readLocationRef(event.location)
108
+ : (ptyId ? this.ptyLocations.get(ptyId) : undefined)
109
+ ?? this.ptyInfoLocation(event)
110
+ ?? (shellId ? this.shellLocations.get(shellId) : undefined)
111
+ ?? this.shellInfoLocation(event)
112
+ ?? (sessionId ? await this.resolveSessionLocation(sessionId) : undefined);
113
+ if (!location) {
106
114
  if (GLOBAL_EVENT_TYPES.has(event.type)) {
107
115
  this.broadcastEvent(event);
108
116
  return;
@@ -111,44 +119,46 @@ export class InstanceEventBridge {
111
119
  // Deletion can make session.get return 404 before the event arrives. Session IDs are
112
120
  // service-global, so notifying every logical workspace cannot delete another session.
113
121
  this.broadcastEvent(event);
114
- this.sessionDirectories.delete(sessionId);
122
+ this.sessionLocations.delete(sessionId);
115
123
  }
116
124
  return;
117
125
  }
118
- if (sessionId) {
119
- this.sessionDirectories.set(sessionId, {
120
- expiresAt: Date.now() + SESSION_DIRECTORY_CACHE_MS,
121
- directory: Promise.resolve(directory),
126
+ // The moved envelope can refer to the old location. The next locationless
127
+ // event must resolve the native session rather than cache that old owner.
128
+ if (sessionId && event.type !== "session.moved") {
129
+ this.sessionLocations.set(sessionId, {
130
+ expiresAt: Date.now() + SESSION_LOCATION_CACHE_MS,
131
+ location: Promise.resolve(location),
122
132
  });
123
133
  }
124
134
  if (ptyId)
125
- this.ptyDirectories.set(ptyId, directory);
135
+ this.ptyLocations.set(ptyId, location);
126
136
  if (shellId)
127
- this.shellDirectories.set(shellId, directory);
128
- const instanceIds = await this.resolveDirectoryOwners(directory);
137
+ this.shellLocations.set(shellId, location);
138
+ const instanceIds = await this.resolveLocationOwners(location);
129
139
  if (instanceIds.length === 0) {
130
140
  if (event.type === "session.deleted" && sessionId)
131
- this.sessionDirectories.delete(sessionId);
141
+ this.sessionLocations.delete(sessionId);
132
142
  if (event.type === "pty.deleted" && ptyId)
133
- this.ptyDirectories.delete(ptyId);
143
+ this.ptyLocations.delete(ptyId);
134
144
  if (event.type === "shell.deleted" && shellId)
135
- this.shellDirectories.delete(shellId);
145
+ this.shellLocations.delete(shellId);
136
146
  return;
137
147
  }
138
148
  for (const instanceId of instanceIds) {
139
149
  this.options.eventBus.publish({ type: "instance.event", instanceId, event });
140
150
  }
141
151
  if (event.type === "session.deleted" && sessionId)
142
- this.sessionDirectories.delete(sessionId);
152
+ this.sessionLocations.delete(sessionId);
143
153
  if (event.type === "pty.deleted" && ptyId)
144
- this.ptyDirectories.delete(ptyId);
154
+ this.ptyLocations.delete(ptyId);
145
155
  if (event.type === "shell.deleted" && shellId)
146
- this.shellDirectories.delete(shellId);
156
+ this.shellLocations.delete(shellId);
147
157
  }
148
158
  sessionId(event) {
149
159
  const data = event.data;
150
160
  const sessionId = data.sessionID ?? (event.type === "form.created" ? data.form?.sessionID : undefined);
151
- return typeof sessionId === "string" && sessionId ? sessionId : undefined;
161
+ return typeof sessionId === "string" && sessionId && sessionId !== "global" ? sessionId : undefined;
152
162
  }
153
163
  ptyId(event) {
154
164
  if (!event.type.startsWith("pty."))
@@ -157,11 +167,11 @@ export class InstanceEventBridge {
157
167
  const id = data.id ?? data.info?.id;
158
168
  return typeof id === "string" && id ? id : undefined;
159
169
  }
160
- ptyInfoDirectory(event) {
170
+ ptyInfoLocation(event) {
161
171
  if (event.type !== "pty.created" && event.type !== "pty.updated")
162
172
  return undefined;
163
173
  const cwd = event.data.info?.cwd;
164
- return typeof cwd === "string" && cwd ? cwd : undefined;
174
+ return typeof cwd === "string" && cwd ? { directory: cwd } : undefined;
165
175
  }
166
176
  shellId(event) {
167
177
  if (!event.type.startsWith("shell."))
@@ -170,26 +180,26 @@ export class InstanceEventBridge {
170
180
  const id = data.id ?? data.info?.id;
171
181
  return typeof id === "string" && id ? id : undefined;
172
182
  }
173
- shellInfoDirectory(event) {
183
+ shellInfoLocation(event) {
174
184
  if (event.type !== "shell.created")
175
185
  return undefined;
176
186
  const cwd = event.data.info?.cwd;
177
- return typeof cwd === "string" && cwd ? cwd : undefined;
187
+ return typeof cwd === "string" && cwd ? { directory: cwd } : undefined;
178
188
  }
179
189
  broadcastEvent(event) {
180
190
  for (const workspace of this.options.workspaceManager.list()) {
181
191
  this.options.eventBus.publish({ type: "instance.event", instanceId: workspace.id, event });
182
192
  }
183
193
  }
184
- resolveSessionDirectory(sessionId) {
194
+ resolveSessionLocation(sessionId) {
185
195
  const now = Date.now();
186
- const cached = this.sessionDirectories.get(sessionId);
196
+ const cached = this.sessionLocations.get(sessionId);
187
197
  if (cached && cached.expiresAt > now)
188
- return cached.directory;
198
+ return cached.location;
189
199
  const resolve = () => this.options.workspaceManager.getSharedServiceClient()
190
200
  .then((client) => client.session.get({ sessionID: sessionId }))
191
- .then((session) => session.location.directory);
192
- const directory = resolve().catch((error) => {
201
+ .then((session) => readLocationRef(session.location));
202
+ const location = resolve().catch((error) => {
193
203
  if (isSessionNotFoundError(error))
194
204
  return undefined;
195
205
  return resolve().catch((retryError) => {
@@ -197,28 +207,32 @@ export class InstanceEventBridge {
197
207
  return undefined;
198
208
  });
199
209
  });
200
- const entry = { expiresAt: Number.POSITIVE_INFINITY, directory };
201
- this.sessionDirectories.set(sessionId, entry);
202
- const settle = () => { entry.expiresAt = Date.now() + SESSION_DIRECTORY_CACHE_MS; };
203
- void directory.then(settle, settle);
204
- return directory;
210
+ const entry = { expiresAt: Number.POSITIVE_INFINITY, location };
211
+ this.sessionLocations.set(sessionId, entry);
212
+ const settle = () => { entry.expiresAt = Date.now() + SESSION_LOCATION_CACHE_MS; };
213
+ void location.then(settle, settle);
214
+ return location;
205
215
  }
206
- resolveDirectoryOwners(directory) {
216
+ resolveLocationOwners(location) {
207
217
  const now = Date.now();
208
- const cached = this.directoryOwners.get(directory);
218
+ const key = JSON.stringify([location.directory, location.workspaceID]);
219
+ const cached = this.locationOwners.get(key);
209
220
  if (cached && cached.expiresAt > now)
210
221
  return cached.owners;
211
222
  const workspaces = this.options.workspaceManager.list();
212
- const owners = Promise.allSettled(workspaces.map((workspace) => (this.options.workspaceManager.ownsDirectory(workspace.id, directory))))
223
+ const owns = (id) => location.workspaceID === undefined
224
+ ? this.options.workspaceManager.ownsDirectory(id, location.directory)
225
+ : this.options.workspaceManager.ownsLocation(id, location);
226
+ const owners = Promise.allSettled(workspaces.map((workspace) => (owns(workspace.id))))
213
227
  .then(async (ownership) => {
214
228
  if (ownership.some((result) => result.status === "rejected")) {
215
229
  ownership = await Promise.allSettled(ownership.map((result, index) => (result.status === "fulfilled"
216
230
  ? Promise.resolve(result.value)
217
- : this.options.workspaceManager.ownsDirectory(workspaces[index].id, directory))));
231
+ : owns(workspaces[index].id))));
218
232
  }
219
233
  const failed = ownership.find((result) => result.status === "rejected");
220
234
  if (failed) {
221
- this.options.logger.warn({ err: failed.reason, directory }, "Failed to resolve instance event directory owner");
235
+ this.options.logger.warn({ err: failed.reason, location }, "Failed to resolve instance event location owner");
222
236
  }
223
237
  const currentIds = new Set(this.options.workspaceManager.list().map((workspace) => workspace.id));
224
238
  return ownership.flatMap((result, index) => {
@@ -227,16 +241,16 @@ export class InstanceEventBridge {
227
241
  });
228
242
  });
229
243
  const entry = { expiresAt: Number.POSITIVE_INFINITY, owners };
230
- this.directoryOwners.set(directory, entry);
231
- const settle = () => { entry.expiresAt = Date.now() + DIRECTORY_OWNER_CACHE_MS; };
244
+ this.locationOwners.set(key, entry);
245
+ const settle = () => { entry.expiresAt = Date.now() + LOCATION_OWNER_CACHE_MS; };
232
246
  void owners.then(settle, settle);
233
247
  return owners;
234
248
  }
235
249
  clearLocationCaches() {
236
- this.directoryOwners.clear();
237
- this.sessionDirectories.clear();
238
- this.ptyDirectories.clear();
239
- this.shellDirectories.clear();
250
+ this.locationOwners.clear();
251
+ this.sessionLocations.clear();
252
+ this.ptyLocations.clear();
253
+ this.shellLocations.clear();
240
254
  }
241
255
  updateStatus(status, reason) {
242
256
  this.status = status;
@@ -1 +1 @@
1
- {"version":3,"file":"instance-events.js","sourceRoot":"","sources":["../../src/workspaces/instance-events.ts"],"names":[],"mappings":"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","sourcesContent":["import { isSessionNotFoundError, type OpenCodeEvent } from \"@opencode-ai/client\"\nimport { EventBus } from \"../events/bus\"\nimport { Logger } from \"../logger\"\nimport { WorkspaceManager } from \"./manager\"\nimport { InstanceStreamStatus } from \"../api-types\"\n\nconst RECONNECT_DELAY_MS = 1000\nconst DIRECTORY_OWNER_CACHE_MS = 2000\nconst SESSION_DIRECTORY_CACHE_MS = 2000\nconst GLOBAL_EVENT_TYPES = new Set([\n \"agent.updated\",\n \"catalog.updated\",\n \"command.updated\",\n \"config.updated\",\n \"credential.switched\",\n \"credential.updated\",\n \"integration.connection.updated\",\n \"integration.updated\",\n \"installation.update-available\",\n \"installation.updated\",\n \"mcp.resources.changed\",\n \"mcp.status.changed\",\n \"models-dev.refreshed\",\n \"server.connected\",\n])\n\ninterface InstanceEventBridgeOptions {\n workspaceManager: WorkspaceManager\n eventBus: EventBus\n logger: Logger\n}\n\nexport class InstanceEventBridge {\n private readonly controller = new AbortController()\n private status: InstanceStreamStatus = \"connecting\"\n private generation = 0\n private task?: Promise<void>\n private readonly directoryOwners = new Map<string, { expiresAt: number; owners: Promise<string[]> }>()\n private readonly sessionDirectories = new Map<string, { expiresAt: number; directory: Promise<string | undefined> }>()\n private readonly ptyDirectories = new Map<string, string>()\n private readonly shellDirectories = new Map<string, string>()\n private readonly onWorkspaceStarted = (event: { workspace: { id: string } }) => {\n this.clearLocationCaches()\n if (!this.task) this.task = this.run()\n else this.publishStatus(event.workspace.id, this.status)\n }\n private readonly onWorkspaceStopped = (event: { workspaceId: string }) => {\n this.clearLocationCaches()\n this.publishStatus(event.workspaceId, \"disconnected\", \"workspace stopped\")\n }\n private readonly onWorkspaceError = (event: { workspace: { id: string } }) => {\n this.clearLocationCaches()\n this.publishStatus(event.workspace.id, \"disconnected\", \"workspace error\")\n }\n\n constructor(private readonly options: InstanceEventBridgeOptions) {\n const bus = this.options.eventBus\n bus.on(\"workspace.started\", this.onWorkspaceStarted)\n bus.on(\"workspace.stopped\", this.onWorkspaceStopped)\n bus.on(\"workspace.error\", this.onWorkspaceError)\n }\n\n shutdown() {\n this.controller.abort()\n const bus = this.options.eventBus\n bus.off(\"workspace.started\", this.onWorkspaceStarted)\n bus.off(\"workspace.stopped\", this.onWorkspaceStopped)\n bus.off(\"workspace.error\", this.onWorkspaceError)\n for (const workspace of this.options.workspaceManager.list()) {\n this.publishStatus(workspace.id, \"disconnected\")\n }\n }\n\n private async run() {\n while (!this.controller.signal.aborted) {\n this.generation += 1\n this.clearLocationCaches()\n this.updateStatus(\"connecting\")\n try {\n const events = await this.options.workspaceManager.subscribeToSharedService(this.controller.signal)\n let confirmed = false\n for await (const event of events) {\n if (this.controller.signal.aborted) return\n if (!confirmed) {\n if (event.type !== \"server.connected\") {\n throw new Error(`Shared OpenCode event stream started with ${event.type}, expected server.connected`)\n }\n confirmed = true\n this.updateStatus(\"connected\")\n }\n await this.publishEvent(event)\n }\n if (!this.controller.signal.aborted) throw new Error(\"Shared OpenCode event stream ended\")\n } catch (error) {\n if (this.controller.signal.aborted) return\n this.options.logger.warn({ err: error }, \"Shared OpenCode event stream disconnected\")\n this.updateStatus(\"error\", error instanceof Error ? error.message : String(error))\n await this.delay(RECONNECT_DELAY_MS)\n }\n }\n }\n\n private async publishEvent(event: OpenCodeEvent) {\n const sessionId = this.sessionId(event)\n const ptyId = this.ptyId(event)\n const shellId = this.shellId(event)\n if (event.type === \"session.moved\" && sessionId) this.sessionDirectories.delete(sessionId)\n\n const directory = event.location?.directory\n ?? this.ptyInfoDirectory(event)\n ?? (ptyId ? this.ptyDirectories.get(ptyId) : undefined)\n ?? this.shellInfoDirectory(event)\n ?? (shellId ? this.shellDirectories.get(shellId) : undefined)\n ?? (sessionId ? await this.resolveSessionDirectory(sessionId) : undefined)\n if (!directory) {\n if (GLOBAL_EVENT_TYPES.has(event.type)) {\n this.broadcastEvent(event)\n return\n }\n if (event.type === \"session.deleted\" && sessionId) {\n // Deletion can make session.get return 404 before the event arrives. Session IDs are\n // service-global, so notifying every logical workspace cannot delete another session.\n this.broadcastEvent(event)\n this.sessionDirectories.delete(sessionId)\n }\n return\n }\n if (sessionId) {\n this.sessionDirectories.set(sessionId, {\n expiresAt: Date.now() + SESSION_DIRECTORY_CACHE_MS,\n directory: Promise.resolve(directory),\n })\n }\n if (ptyId) this.ptyDirectories.set(ptyId, directory)\n if (shellId) this.shellDirectories.set(shellId, directory)\n\n const instanceIds = await this.resolveDirectoryOwners(directory)\n if (instanceIds.length === 0) {\n if (event.type === \"session.deleted\" && sessionId) this.sessionDirectories.delete(sessionId)\n if (event.type === \"pty.deleted\" && ptyId) this.ptyDirectories.delete(ptyId)\n if (event.type === \"shell.deleted\" && shellId) this.shellDirectories.delete(shellId)\n return\n }\n\n for (const instanceId of instanceIds) {\n this.options.eventBus.publish({ type: \"instance.event\", instanceId, event })\n }\n if (event.type === \"session.deleted\" && sessionId) this.sessionDirectories.delete(sessionId)\n if (event.type === \"pty.deleted\" && ptyId) this.ptyDirectories.delete(ptyId)\n if (event.type === \"shell.deleted\" && shellId) this.shellDirectories.delete(shellId)\n }\n\n private sessionId(event: OpenCodeEvent): string | undefined {\n const data = event.data as { sessionID?: unknown; form?: { sessionID?: unknown } }\n const sessionId = data.sessionID ?? (event.type === \"form.created\" ? data.form?.sessionID : undefined)\n return typeof sessionId === \"string\" && sessionId ? sessionId : undefined\n }\n\n private ptyId(event: OpenCodeEvent): string | undefined {\n if (!event.type.startsWith(\"pty.\")) return undefined\n const data = event.data as { id?: unknown; info?: { id?: unknown } }\n const id = data.id ?? data.info?.id\n return typeof id === \"string\" && id ? id : undefined\n }\n\n private ptyInfoDirectory(event: OpenCodeEvent): string | undefined {\n if (event.type !== \"pty.created\" && event.type !== \"pty.updated\") return undefined\n const cwd = (event.data as { info?: { cwd?: unknown } }).info?.cwd\n return typeof cwd === \"string\" && cwd ? cwd : undefined\n }\n\n private shellId(event: OpenCodeEvent): string | undefined {\n if (!event.type.startsWith(\"shell.\")) return undefined\n const data = event.data as { id?: unknown; info?: { id?: unknown } }\n const id = data.id ?? data.info?.id\n return typeof id === \"string\" && id ? id : undefined\n }\n\n private shellInfoDirectory(event: OpenCodeEvent): string | undefined {\n if (event.type !== \"shell.created\") return undefined\n const cwd = (event.data as { info?: { cwd?: unknown } }).info?.cwd\n return typeof cwd === \"string\" && cwd ? cwd : undefined\n }\n\n private broadcastEvent(event: OpenCodeEvent): void {\n for (const workspace of this.options.workspaceManager.list()) {\n this.options.eventBus.publish({ type: \"instance.event\", instanceId: workspace.id, event })\n }\n }\n\n private resolveSessionDirectory(sessionId: string): Promise<string | undefined> {\n const now = Date.now()\n const cached = this.sessionDirectories.get(sessionId)\n if (cached && cached.expiresAt > now) return cached.directory\n\n const resolve = () => this.options.workspaceManager.getSharedServiceClient()\n .then((client) => client.session.get({ sessionID: sessionId }))\n .then((session) => session.location.directory)\n const directory = resolve().catch((error) => {\n if (isSessionNotFoundError(error)) return undefined\n return resolve().catch((retryError) => {\n this.options.logger.warn({ err: retryError, sessionId }, \"Failed to resolve instance event session location\")\n return undefined\n })\n })\n const entry = { expiresAt: Number.POSITIVE_INFINITY, directory }\n this.sessionDirectories.set(sessionId, entry)\n const settle = () => { entry.expiresAt = Date.now() + SESSION_DIRECTORY_CACHE_MS }\n void directory.then(settle, settle)\n return directory\n }\n\n private resolveDirectoryOwners(directory: string): Promise<string[]> {\n const now = Date.now()\n const cached = this.directoryOwners.get(directory)\n if (cached && cached.expiresAt > now) return cached.owners\n\n const workspaces = this.options.workspaceManager.list()\n const owners = Promise.allSettled(workspaces.map((workspace) => (\n this.options.workspaceManager.ownsDirectory(workspace.id, directory)\n )))\n .then(async (ownership) => {\n if (ownership.some((result) => result.status === \"rejected\")) {\n ownership = await Promise.allSettled(ownership.map((result, index) => (\n result.status === \"fulfilled\"\n ? Promise.resolve(result.value)\n : this.options.workspaceManager.ownsDirectory(workspaces[index].id, directory)\n )))\n }\n const failed = ownership.find((result) => result.status === \"rejected\")\n if (failed) {\n this.options.logger.warn({ err: failed.reason, directory }, \"Failed to resolve instance event directory owner\")\n }\n const currentIds = new Set(this.options.workspaceManager.list().map((workspace) => workspace.id))\n return ownership.flatMap((result, index) => {\n const id = workspaces[index].id\n return result.status === \"fulfilled\" && result.value && currentIds.has(id) ? [id] : []\n })\n })\n const entry = { expiresAt: Number.POSITIVE_INFINITY, owners }\n this.directoryOwners.set(directory, entry)\n const settle = () => { entry.expiresAt = Date.now() + DIRECTORY_OWNER_CACHE_MS }\n void owners.then(settle, settle)\n return owners\n }\n\n private clearLocationCaches(): void {\n this.directoryOwners.clear()\n this.sessionDirectories.clear()\n this.ptyDirectories.clear()\n this.shellDirectories.clear()\n }\n\n private updateStatus(status: InstanceStreamStatus, reason?: string) {\n this.status = status\n for (const workspace of this.options.workspaceManager.list()) {\n this.publishStatus(workspace.id, status, reason)\n }\n }\n\n private publishStatus(instanceId: string, status: InstanceStreamStatus, reason?: string) {\n this.options.logger.debug({ instanceId, status, reason }, \"Instance event status updated\")\n this.options.eventBus.publish({ type: \"instance.eventStatus\", instanceId, status, generation: this.generation, reason })\n }\n\n private delay(duration: number) {\n return new Promise<void>((resolve) => {\n const timeout = setTimeout(resolve, duration)\n this.controller.signal.addEventListener(\"abort\", () => {\n clearTimeout(timeout)\n resolve()\n }, { once: true })\n })\n }\n}\n"]}
1
+ {"version":3,"file":"instance-events.js","sourceRoot":"","sources":["../../src/workspaces/instance-events.ts"],"names":[],"mappings":"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","sourcesContent":["import { isSessionNotFoundError, type LocationRef, type OpenCodeEvent } from \"@opencode/client\"\nimport { readLocationRef } from \"../opencode/compatibility/location\"\nimport { EventBus } from \"../events/bus\"\nimport { Logger } from \"../logger\"\nimport { WorkspaceManager } from \"./manager\"\nimport { InstanceStreamStatus } from \"../api-types\"\n\nconst RECONNECT_DELAY_MS = 1000\nconst LOCATION_OWNER_CACHE_MS = 2000\nconst SESSION_LOCATION_CACHE_MS = 2000\nconst GLOBAL_EVENT_TYPES = new Set([\n \"catalog.updated\",\n \"agent.updated\",\n \"command.updated\",\n \"config.updated\",\n \"credential.switched\",\n \"credential.updated\",\n \"integration.updated\",\n \"installation.update-available\",\n \"installation.updated\",\n \"mcp.resources.changed\",\n \"mcp.status.changed\",\n \"models-dev.refreshed\",\n \"model.updated\",\n \"plugin.updated\",\n \"provider.updated\",\n \"reference.updated\",\n \"server.connected\",\n \"skill.updated\",\n \"websearch.updated\",\n])\n\ninterface InstanceEventBridgeOptions {\n workspaceManager: WorkspaceManager\n eventBus: EventBus\n logger: Logger\n}\n\nexport class InstanceEventBridge {\n private readonly controller = new AbortController()\n private status: InstanceStreamStatus = \"connecting\"\n private generation = 0\n private task?: Promise<void>\n private readonly locationOwners = new Map<string, { expiresAt: number; owners: Promise<string[]> }>()\n private readonly sessionLocations = new Map<string, { expiresAt: number; location: Promise<LocationRef | undefined> }>()\n private readonly ptyLocations = new Map<string, LocationRef>()\n private readonly shellLocations = new Map<string, LocationRef>()\n private readonly onWorkspaceStarted = (event: { workspace: { id: string } }) => {\n this.clearLocationCaches()\n if (!this.task) this.task = this.run()\n else this.publishStatus(event.workspace.id, this.status)\n }\n private readonly onWorkspaceStopped = (event: { workspaceId: string }) => {\n this.clearLocationCaches()\n this.publishStatus(event.workspaceId, \"disconnected\", \"workspace stopped\")\n }\n private readonly onWorkspaceError = (event: { workspace: { id: string } }) => {\n this.clearLocationCaches()\n this.publishStatus(event.workspace.id, \"disconnected\", \"workspace error\")\n }\n\n constructor(private readonly options: InstanceEventBridgeOptions) {\n const bus = this.options.eventBus\n bus.on(\"workspace.started\", this.onWorkspaceStarted)\n bus.on(\"workspace.stopped\", this.onWorkspaceStopped)\n bus.on(\"workspace.error\", this.onWorkspaceError)\n }\n\n shutdown() {\n this.controller.abort()\n const bus = this.options.eventBus\n bus.off(\"workspace.started\", this.onWorkspaceStarted)\n bus.off(\"workspace.stopped\", this.onWorkspaceStopped)\n bus.off(\"workspace.error\", this.onWorkspaceError)\n for (const workspace of this.options.workspaceManager.list()) {\n this.publishStatus(workspace.id, \"disconnected\")\n }\n }\n\n private async run() {\n while (!this.controller.signal.aborted) {\n this.generation += 1\n this.clearLocationCaches()\n this.updateStatus(\"connecting\")\n try {\n const events = await this.options.workspaceManager.subscribeToSharedService(this.controller.signal)\n let confirmed = false\n for await (const event of events) {\n if (this.controller.signal.aborted) return\n if (!confirmed) {\n if (event.type !== \"server.connected\") {\n throw new Error(`Shared OpenCode event stream started with ${event.type}, expected server.connected`)\n }\n confirmed = true\n this.updateStatus(\"connected\")\n }\n await this.publishEvent(event)\n }\n if (!this.controller.signal.aborted) throw new Error(\"Shared OpenCode event stream ended\")\n } catch (error) {\n if (this.controller.signal.aborted) return\n this.options.logger.warn({ err: error }, \"Shared OpenCode event stream disconnected\")\n this.updateStatus(\"error\", error instanceof Error ? error.message : String(error))\n await this.delay(RECONNECT_DELAY_MS)\n }\n }\n }\n\n private async publishEvent(event: OpenCodeEvent) {\n const sessionId = this.sessionId(event)\n const ptyId = this.ptyId(event)\n const shellId = this.shellId(event)\n if (event.type === \"session.moved\" && sessionId) this.sessionLocations.delete(sessionId)\n\n // A scoped event is native location authority, not merely a cwd hint. Keep\n // that full pair for subsequent locationless PTY/Shell/session events.\n const location = event.location ? readLocationRef(event.location)\n : (ptyId ? this.ptyLocations.get(ptyId) : undefined)\n ?? this.ptyInfoLocation(event)\n ?? (shellId ? this.shellLocations.get(shellId) : undefined)\n ?? this.shellInfoLocation(event)\n ?? (sessionId ? await this.resolveSessionLocation(sessionId) : undefined)\n if (!location) {\n if (GLOBAL_EVENT_TYPES.has(event.type)) {\n this.broadcastEvent(event)\n return\n }\n if (event.type === \"session.deleted\" && sessionId) {\n // Deletion can make session.get return 404 before the event arrives. Session IDs are\n // service-global, so notifying every logical workspace cannot delete another session.\n this.broadcastEvent(event)\n this.sessionLocations.delete(sessionId)\n }\n return\n }\n // The moved envelope can refer to the old location. The next locationless\n // event must resolve the native session rather than cache that old owner.\n if (sessionId && event.type !== \"session.moved\") {\n this.sessionLocations.set(sessionId, {\n expiresAt: Date.now() + SESSION_LOCATION_CACHE_MS,\n location: Promise.resolve(location),\n })\n }\n if (ptyId) this.ptyLocations.set(ptyId, location)\n if (shellId) this.shellLocations.set(shellId, location)\n\n const instanceIds = await this.resolveLocationOwners(location)\n if (instanceIds.length === 0) {\n if (event.type === \"session.deleted\" && sessionId) this.sessionLocations.delete(sessionId)\n if (event.type === \"pty.deleted\" && ptyId) this.ptyLocations.delete(ptyId)\n if (event.type === \"shell.deleted\" && shellId) this.shellLocations.delete(shellId)\n return\n }\n\n for (const instanceId of instanceIds) {\n this.options.eventBus.publish({ type: \"instance.event\", instanceId, event })\n }\n if (event.type === \"session.deleted\" && sessionId) this.sessionLocations.delete(sessionId)\n if (event.type === \"pty.deleted\" && ptyId) this.ptyLocations.delete(ptyId)\n if (event.type === \"shell.deleted\" && shellId) this.shellLocations.delete(shellId)\n }\n\n private sessionId(event: OpenCodeEvent): string | undefined {\n const data = event.data as { sessionID?: unknown; form?: { sessionID?: unknown } }\n const sessionId = data.sessionID ?? (event.type === \"form.created\" ? data.form?.sessionID : undefined)\n return typeof sessionId === \"string\" && sessionId && sessionId !== \"global\" ? sessionId : undefined\n }\n\n private ptyId(event: OpenCodeEvent): string | undefined {\n if (!event.type.startsWith(\"pty.\")) return undefined\n const data = event.data as { id?: unknown; info?: { id?: unknown } }\n const id = data.id ?? data.info?.id\n return typeof id === \"string\" && id ? id : undefined\n }\n\n private ptyInfoLocation(event: OpenCodeEvent): LocationRef | undefined {\n if (event.type !== \"pty.created\" && event.type !== \"pty.updated\") return undefined\n const cwd = (event.data as { info?: { cwd?: unknown } }).info?.cwd\n return typeof cwd === \"string\" && cwd ? { directory: cwd } : undefined\n }\n\n private shellId(event: OpenCodeEvent): string | undefined {\n if (!event.type.startsWith(\"shell.\")) return undefined\n const data = event.data as { id?: unknown; info?: { id?: unknown } }\n const id = data.id ?? data.info?.id\n return typeof id === \"string\" && id ? id : undefined\n }\n\n private shellInfoLocation(event: OpenCodeEvent): LocationRef | undefined {\n if (event.type !== \"shell.created\") return undefined\n const cwd = (event.data as { info?: { cwd?: unknown } }).info?.cwd\n return typeof cwd === \"string\" && cwd ? { directory: cwd } : undefined\n }\n\n private broadcastEvent(event: OpenCodeEvent): void {\n for (const workspace of this.options.workspaceManager.list()) {\n this.options.eventBus.publish({ type: \"instance.event\", instanceId: workspace.id, event })\n }\n }\n\n private resolveSessionLocation(sessionId: string): Promise<LocationRef | undefined> {\n const now = Date.now()\n const cached = this.sessionLocations.get(sessionId)\n if (cached && cached.expiresAt > now) return cached.location\n\n const resolve = () => this.options.workspaceManager.getSharedServiceClient()\n .then((client) => client.session.get({ sessionID: sessionId }))\n .then((session) => readLocationRef(session.location))\n const location = resolve().catch((error) => {\n if (isSessionNotFoundError(error)) return undefined\n return resolve().catch((retryError) => {\n this.options.logger.warn({ err: retryError, sessionId }, \"Failed to resolve instance event session location\")\n return undefined\n })\n })\n const entry = { expiresAt: Number.POSITIVE_INFINITY, location }\n this.sessionLocations.set(sessionId, entry)\n const settle = () => { entry.expiresAt = Date.now() + SESSION_LOCATION_CACHE_MS }\n void location.then(settle, settle)\n return location\n }\n\n private resolveLocationOwners(location: LocationRef): Promise<string[]> {\n const now = Date.now()\n const key = JSON.stringify([location.directory, location.workspaceID])\n const cached = this.locationOwners.get(key)\n if (cached && cached.expiresAt > now) return cached.owners\n\n const workspaces = this.options.workspaceManager.list()\n const owns = (id: string) => location.workspaceID === undefined\n ? this.options.workspaceManager.ownsDirectory(id, location.directory)\n : this.options.workspaceManager.ownsLocation(id, location)\n const owners = Promise.allSettled(workspaces.map((workspace) => (\n owns(workspace.id)\n )))\n .then(async (ownership) => {\n if (ownership.some((result) => result.status === \"rejected\")) {\n ownership = await Promise.allSettled(ownership.map((result, index) => (\n result.status === \"fulfilled\"\n ? Promise.resolve(result.value)\n : owns(workspaces[index].id)\n )))\n }\n const failed = ownership.find((result) => result.status === \"rejected\")\n if (failed) {\n this.options.logger.warn({ err: failed.reason, location }, \"Failed to resolve instance event location owner\")\n }\n const currentIds = new Set(this.options.workspaceManager.list().map((workspace) => workspace.id))\n return ownership.flatMap((result, index) => {\n const id = workspaces[index].id\n return result.status === \"fulfilled\" && result.value && currentIds.has(id) ? [id] : []\n })\n })\n const entry = { expiresAt: Number.POSITIVE_INFINITY, owners }\n this.locationOwners.set(key, entry)\n const settle = () => { entry.expiresAt = Date.now() + LOCATION_OWNER_CACHE_MS }\n void owners.then(settle, settle)\n return owners\n }\n\n private clearLocationCaches(): void {\n this.locationOwners.clear()\n this.sessionLocations.clear()\n this.ptyLocations.clear()\n this.shellLocations.clear()\n }\n\n private updateStatus(status: InstanceStreamStatus, reason?: string) {\n this.status = status\n for (const workspace of this.options.workspaceManager.list()) {\n this.publishStatus(workspace.id, status, reason)\n }\n }\n\n private publishStatus(instanceId: string, status: InstanceStreamStatus, reason?: string) {\n this.options.logger.debug({ instanceId, status, reason }, \"Instance event status updated\")\n this.options.eventBus.publish({ type: \"instance.eventStatus\", instanceId, status, generation: this.generation, reason })\n }\n\n private delay(duration: number) {\n return new Promise<void>((resolve) => {\n const timeout = setTimeout(resolve, duration)\n this.controller.signal.addEventListener(\"abort\", () => {\n clearTimeout(timeout)\n resolve()\n }, { once: true })\n })\n }\n}\n"]}
@@ -34,6 +34,7 @@ function locationlessManager(events, sessionLocations, workspaces = [{ id: "a",
34
34
  const manager = {
35
35
  list: () => workspaces,
36
36
  ownsDirectory: async (workspaceId, directory) => (workspaces.some((workspace) => workspace.id === workspaceId && workspace.path === directory)),
37
+ ownsLocation: async (workspaceId, location) => workspaces.some(workspace => (workspace.id === workspaceId && workspace.path === location.directory && workspace.workspaceID === location.workspaceID)),
37
38
  getSharedServiceClient: async () => ({
38
39
  session: { get: async ({ sessionID }) => {
39
40
  sessionGets++;
@@ -42,7 +43,7 @@ function locationlessManager(events, sessionLocations, workspaces = [{ id: "a",
42
43
  throw location;
43
44
  if (!location)
44
45
  throw new Error("Session not found");
45
- return { id: sessionID, location: { directory: location } };
46
+ return { id: sessionID, location: typeof location === "string" ? { directory: location } : location };
46
47
  } },
47
48
  }),
48
49
  subscribeToSharedService: async (signal) => (async function* () {
@@ -54,6 +55,117 @@ function locationlessManager(events, sessionLocations, workspaces = [{ id: "a",
54
55
  return { manager, sessionGets: () => sessionGets };
55
56
  }
56
57
  describe("InstanceEventBridge", () => {
58
+ it("keeps same-directory legacy identities separate for scoped and cached locationless events", async () => {
59
+ const one = { directory: "/repo", workspaceID: "one" };
60
+ const two = { directory: "/repo", workspaceID: "two" };
61
+ const events = [
62
+ { type: "session.text.delta", location: one, data: { sessionID: "s1", delta: "one" } },
63
+ { type: "session.text.delta", location: two, data: { sessionID: "s2", delta: "two" } },
64
+ { type: "session.text.delta", data: { sessionID: "s1", delta: "cached one" } },
65
+ { type: "session.text.delta", data: { sessionID: "s2", delta: "cached two" } },
66
+ { type: "session.text.delta", data: { sessionID: "s3", delta: "resolved two" } },
67
+ { type: "session.text.delta", data: { sessionID: "s3", delta: "cached resolved two" } },
68
+ ];
69
+ const { manager, sessionGets } = locationlessManager(events, { s3: two }, [
70
+ { id: "a", path: "/repo", workspaceID: "one" }, { id: "b", path: "/repo", workspaceID: "two" },
71
+ ]);
72
+ let checks = 0;
73
+ const owns = manager.ownsLocation.bind(manager);
74
+ manager.ownsLocation = async (...args) => { checks++; return owns(...args); };
75
+ const bus = new EventBus();
76
+ const received = [];
77
+ bus.on("instance.event", event => { if (event.event.type !== "server.connected")
78
+ received.push(event.instanceId); });
79
+ const bridge = new InstanceEventBridge({ workspaceManager: manager, eventBus: bus, logger });
80
+ try {
81
+ bus.publish({ type: "workspace.started", workspace: manager.list()[0] });
82
+ await waitFor(() => received.length === events.length);
83
+ assert.deepEqual(received, ["a", "b", "a", "b", "b", "b"]);
84
+ assert.equal(checks, 4, "one lookup per full location and logical workspace");
85
+ assert.equal(sessionGets(), 1);
86
+ }
87
+ finally {
88
+ bridge.shutdown();
89
+ }
90
+ });
91
+ it("retains scoped PTY and Shell identity for later locationless events", async () => {
92
+ const location = { directory: "/repo", workspaceID: "two" };
93
+ const events = [
94
+ { type: "pty.created", location, data: { info: { id: "p", cwd: "/repo" } } },
95
+ { type: "pty.updated", data: { info: { id: "p", cwd: "/repo/subdirectory" } } },
96
+ { type: "pty.deleted", data: { id: "p" } },
97
+ { type: "shell.created", location, data: { info: { id: "sh", cwd: "/repo" } } },
98
+ { type: "shell.exited", data: { id: "sh" } },
99
+ { type: "shell.deleted", data: { id: "sh" } },
100
+ ];
101
+ const { manager } = locationlessManager(events, {}, [
102
+ { id: "a", path: "/repo", workspaceID: "one" }, { id: "b", path: "/repo", workspaceID: "two" },
103
+ ]);
104
+ const bus = new EventBus();
105
+ const received = [];
106
+ bus.on("instance.event", event => { if (event.event.type !== "server.connected")
107
+ received.push(event.instanceId); });
108
+ const bridge = new InstanceEventBridge({ workspaceManager: manager, eventBus: bus, logger });
109
+ try {
110
+ bus.publish({ type: "workspace.started", workspace: manager.list()[0] });
111
+ await waitFor(() => received.length === events.length);
112
+ assert.deepEqual(received, events.map(() => "b"));
113
+ }
114
+ finally {
115
+ bridge.shutdown();
116
+ }
117
+ });
118
+ it("does not retain a moved session's old envelope identity", async () => {
119
+ const one = { directory: "/repo", workspaceID: "one" };
120
+ const two = { directory: "/repo", workspaceID: "two" };
121
+ const events = [
122
+ { type: "session.text.delta", location: one, data: { sessionID: "s", delta: "before" } },
123
+ { type: "session.moved", location: one, data: { sessionID: "s", location: two } },
124
+ { type: "session.text.delta", data: { sessionID: "s", delta: "after" } },
125
+ ];
126
+ const { manager, sessionGets } = locationlessManager(events, { s: two }, [
127
+ { id: "a", path: "/repo", workspaceID: "one" }, { id: "b", path: "/repo", workspaceID: "two" },
128
+ ]);
129
+ const bus = new EventBus();
130
+ const received = [];
131
+ bus.on("instance.event", event => { if (event.event.type !== "server.connected")
132
+ received.push(event.instanceId); });
133
+ const bridge = new InstanceEventBridge({ workspaceManager: manager, eventBus: bus, logger });
134
+ try {
135
+ bus.publish({ type: "workspace.started", workspace: manager.list()[0] });
136
+ await waitFor(() => received.length === events.length);
137
+ assert.deepEqual(received, ["a", "a", "b"]);
138
+ assert.equal(sessionGets(), 1);
139
+ }
140
+ finally {
141
+ bridge.shutdown();
142
+ }
143
+ });
144
+ it("never treats the global Form sentinel as a session location cache key", async () => {
145
+ const location = { directory: "/repo", workspaceID: "one" };
146
+ const events = [
147
+ { type: "form.created", location, data: { form: { id: "scoped", sessionID: "global" } } },
148
+ { type: "form.created", data: { form: { id: "unscoped", sessionID: "global" } } },
149
+ { type: "model.updated", data: {} },
150
+ ];
151
+ const { manager, sessionGets } = locationlessManager(events, { global: location }, [
152
+ { id: "a", path: "/repo", workspaceID: "one" }, { id: "b", path: "/repo", workspaceID: "two" },
153
+ ]);
154
+ const bus = new EventBus();
155
+ const received = [];
156
+ bus.on("instance.event", event => { if (event.event.type !== "server.connected")
157
+ received.push(event); });
158
+ const bridge = new InstanceEventBridge({ workspaceManager: manager, eventBus: bus, logger });
159
+ try {
160
+ bus.publish({ type: "workspace.started", workspace: manager.list()[0] });
161
+ await waitFor(() => received.length === 3);
162
+ assert.equal(received.filter(event => event.event.type === "form.created").length, 1);
163
+ assert.equal(sessionGets(), 0);
164
+ }
165
+ finally {
166
+ bridge.shutdown();
167
+ }
168
+ });
57
169
  it("does not publish connected until the stream confirms with its first event", async () => {
58
170
  const gate = deferred();
59
171
  const manager = {
@@ -305,7 +417,7 @@ describe("InstanceEventBridge", () => {
305
417
  subscribeToSharedService: async (signal) => (async function* () {
306
418
  yield serverConnected();
307
419
  yield { type: "permission.asked", location: { directory: "/repo" }, data: { id: "p1" } };
308
- yield { type: "catalog.updated", data: {} };
420
+ yield { id: "model-update", created: 1, type: "model.updated", data: {} };
309
421
  await new Promise((resolve) => signal?.addEventListener("abort", () => resolve(), { once: true }));
310
422
  })(),
311
423
  };
@@ -322,7 +434,7 @@ describe("InstanceEventBridge", () => {
322
434
  workspaces = [workspaces[1]];
323
435
  retry.resolve(false);
324
436
  await waitFor(() => received.length === 1);
325
- assert.equal(received[0].event.type, "catalog.updated");
437
+ assert.equal(received[0].event.type, "model.updated");
326
438
  assert.equal(received[0].instanceId, "flaky");
327
439
  }
328
440
  finally {
@@ -386,7 +498,7 @@ describe("InstanceEventBridge", () => {
386
498
  const events = [
387
499
  { type: "session.status", data: { sessionID: "unknown", status: { type: "idle" } } },
388
500
  { type: "permission.asked", data: { id: "unknown", sessionID: "unknown" } },
389
- { type: "catalog.updated", data: {} },
501
+ { type: "model.updated", data: {} },
390
502
  ];
391
503
  const { manager, sessionGets } = locationlessManager(events, { unknown: new Error("not found") });
392
504
  const bus = new EventBus();
@@ -400,7 +512,7 @@ describe("InstanceEventBridge", () => {
400
512
  bus.publish({ type: "workspace.started", workspace: manager.list()[0] });
401
513
  await waitFor(() => received.length === 1);
402
514
  assert.equal(sessionGets(), 2);
403
- assert.equal(received[0].event.type, "catalog.updated");
515
+ assert.equal(received[0].event.type, "model.updated");
404
516
  }
405
517
  finally {
406
518
  bridge.shutdown();
@@ -427,7 +539,7 @@ describe("InstanceEventBridge", () => {
427
539
  yield { type: "permission.asked", data: { id: "p1", sessionID: "missing" } };
428
540
  now = 3_001;
429
541
  yield { type: "permission.asked", data: { id: "p2", sessionID: "missing" } };
430
- yield { type: "catalog.updated", data: {} };
542
+ yield { id: "model-update", created: 1, type: "model.updated", data: {} };
431
543
  await new Promise((resolve) => signal?.addEventListener("abort", () => resolve(), { once: true }));
432
544
  })(),
433
545
  };
@@ -442,7 +554,7 @@ describe("InstanceEventBridge", () => {
442
554
  bus.publish({ type: "workspace.started", workspace: manager.list()[0] });
443
555
  await waitFor(() => received.length === 1);
444
556
  assert.equal(sessionGets, 2);
445
- assert.equal(received[0].event.type, "catalog.updated");
557
+ assert.equal(received[0].event.type, "model.updated");
446
558
  }
447
559
  finally {
448
560
  Date.now = originalNow;
@@ -573,10 +685,11 @@ describe("InstanceEventBridge", () => {
573
685
  it("broadcasts safe global locationless service events", async () => {
574
686
  const events = [
575
687
  { type: "agent.updated", data: {} },
576
- { type: "catalog.updated", data: {} },
688
+ { type: "model.updated", data: {} },
577
689
  { type: "command.updated", data: {} },
578
690
  { type: "config.updated", data: {} },
579
- { type: "integration.connection.updated", data: { integrationID: "test" } },
691
+ { type: "provider.updated", data: {} },
692
+ { type: "plugin.updated", data: {} },
580
693
  { type: "integration.updated", data: {} },
581
694
  { type: "mcp.resources.changed", data: { server: "test" } },
582
695
  { type: "mcp.status.changed", data: { server: "test" } },