@sixb/server 0.2.2 → 0.2.3

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 (147) hide show
  1. package/README.md +3 -3
  2. package/dist/artifacts/frame.d.ts.map +1 -1
  3. package/dist/auth/scope.d.ts +3 -0
  4. package/dist/auth/scope.d.ts.map +1 -1
  5. package/dist/auth/shared-access.d.ts +23 -0
  6. package/dist/auth/shared-access.d.ts.map +1 -1
  7. package/dist/connectors/http.d.ts +6 -1
  8. package/dist/connectors/http.d.ts.map +1 -1
  9. package/dist/index.js +2777 -683
  10. package/dist/index.js.map +41 -34
  11. package/dist/live/awareness.d.ts +48 -0
  12. package/dist/live/awareness.d.ts.map +1 -0
  13. package/dist/live/room.d.ts +198 -0
  14. package/dist/live/room.d.ts.map +1 -0
  15. package/dist/live/rooms.d.ts +67 -0
  16. package/dist/live/rooms.d.ts.map +1 -0
  17. package/dist/registerRoutes.d.ts.map +1 -1
  18. package/dist/routes/actions.d.ts +3 -3
  19. package/dist/routes/agent-approvals.d.ts +10 -10
  20. package/dist/routes/agent-children.d.ts +2 -2
  21. package/dist/routes/agent-computers.d.ts +32 -0
  22. package/dist/routes/agent-computers.d.ts.map +1 -1
  23. package/dist/routes/agent-runners.d.ts.map +1 -1
  24. package/dist/routes/agents.d.ts +48 -48
  25. package/dist/routes/artifact-frames.d.ts +2 -1
  26. package/dist/routes/artifact-frames.d.ts.map +1 -1
  27. package/dist/routes/artifacts.d.ts +1713 -178
  28. package/dist/routes/artifacts.d.ts.map +1 -1
  29. package/dist/routes/auth.d.ts +21 -21
  30. package/dist/routes/connector-connection-runs.d.ts +124 -5
  31. package/dist/routes/connector-connection-runs.d.ts.map +1 -1
  32. package/dist/routes/connector-connections.d.ts +9 -1
  33. package/dist/routes/connector-connections.d.ts.map +1 -1
  34. package/dist/routes/datasets.d.ts +5 -5
  35. package/dist/routes/events.d.ts +4 -4
  36. package/dist/routes/lake.d.ts +91 -0
  37. package/dist/routes/lake.d.ts.map +1 -0
  38. package/dist/routes/links.d.ts +6 -6
  39. package/dist/routes/logs.d.ts +2 -2
  40. package/dist/routes/model-generations.d.ts +2 -2
  41. package/dist/routes/objects.d.ts +6 -6
  42. package/dist/routes/objects.d.ts.map +1 -1
  43. package/dist/routes/observed-agent-threads.d.ts +7 -7
  44. package/dist/routes/ontology.d.ts +6 -6
  45. package/dist/routes/pipelines.d.ts +8 -4
  46. package/dist/routes/pipelines.d.ts.map +1 -1
  47. package/dist/routes/projections.d.ts +2 -2
  48. package/dist/routes/share-grants.d.ts +9 -9
  49. package/dist/routes/shared-access.d.ts +57 -2
  50. package/dist/routes/shared-access.d.ts.map +1 -1
  51. package/dist/routes/status.d.ts +11 -15
  52. package/dist/routes/status.d.ts.map +1 -1
  53. package/dist/routes/syncs.d.ts +5 -2
  54. package/dist/routes/syncs.d.ts.map +1 -1
  55. package/dist/routes/telemetry.d.ts +7 -7
  56. package/dist/routes/webhooks.d.ts.map +1 -1
  57. package/dist/routes/workflows.d.ts +3 -3
  58. package/dist/routes/ws/artifacts.d.ts +57 -0
  59. package/dist/routes/ws/artifacts.d.ts.map +1 -0
  60. package/dist/routes/ws/events.d.ts +8 -7
  61. package/dist/routes/ws/events.d.ts.map +1 -1
  62. package/dist/routes/ws/index.d.ts +2 -1
  63. package/dist/routes/ws/index.d.ts.map +1 -1
  64. package/dist/routes/ws/logs.d.ts +10 -10
  65. package/dist/routes/ws/shared-sockets.d.ts +52 -0
  66. package/dist/routes/ws/shared-sockets.d.ts.map +1 -0
  67. package/dist/schemas/actions.d.ts +7 -7
  68. package/dist/schemas/activity.d.ts +8 -8
  69. package/dist/schemas/agent-approvals.d.ts +27 -27
  70. package/dist/schemas/agents.d.ts +195 -154
  71. package/dist/schemas/agents.d.ts.map +1 -1
  72. package/dist/schemas/ai-accounting.d.ts +12 -12
  73. package/dist/schemas/artifacts.d.ts +2106 -127
  74. package/dist/schemas/artifacts.d.ts.map +1 -1
  75. package/dist/schemas/auth.d.ts +63 -63
  76. package/dist/schemas/connectors.d.ts +180 -20
  77. package/dist/schemas/connectors.d.ts.map +1 -1
  78. package/dist/schemas/datasets.d.ts +44 -44
  79. package/dist/schemas/event-payloads.d.ts +2 -2
  80. package/dist/schemas/events.d.ts +26 -26
  81. package/dist/schemas/events.d.ts.map +1 -1
  82. package/dist/schemas/files.d.ts +12 -0
  83. package/dist/schemas/files.d.ts.map +1 -1
  84. package/dist/schemas/lake.d.ts +251 -0
  85. package/dist/schemas/lake.d.ts.map +1 -0
  86. package/dist/schemas/lineage.d.ts +56 -56
  87. package/dist/schemas/logs.d.ts +18 -18
  88. package/dist/schemas/models.d.ts +4 -4
  89. package/dist/schemas/objects.d.ts.map +1 -1
  90. package/dist/schemas/ontology.d.ts +14 -14
  91. package/dist/schemas/pipelines.d.ts +70 -48
  92. package/dist/schemas/pipelines.d.ts.map +1 -1
  93. package/dist/schemas/projections.d.ts +14 -14
  94. package/dist/schemas/projections.d.ts.map +1 -1
  95. package/dist/schemas/share-grants.d.ts +30 -30
  96. package/dist/schemas/shared-access.d.ts +17 -4
  97. package/dist/schemas/shared-access.d.ts.map +1 -1
  98. package/dist/schemas/status.d.ts +59 -79
  99. package/dist/schemas/status.d.ts.map +1 -1
  100. package/dist/schemas/syncs.d.ts +26 -10
  101. package/dist/schemas/syncs.d.ts.map +1 -1
  102. package/dist/schemas/telemetry.d.ts +26 -26
  103. package/dist/schemas/workflows.d.ts +19 -19
  104. package/dist/server.d.ts +13 -0
  105. package/dist/server.d.ts.map +1 -1
  106. package/dist/utils/ws.d.ts +3 -0
  107. package/dist/utils/ws.d.ts.map +1 -1
  108. package/package.json +11 -7
  109. package/src/artifacts/frame.ts +4 -13
  110. package/src/auth/scope.ts +10 -1
  111. package/src/auth/shared-access.ts +108 -12
  112. package/src/connectors/http.ts +35 -1
  113. package/src/live/README.md +136 -0
  114. package/src/live/awareness.ts +141 -0
  115. package/src/live/room.ts +933 -0
  116. package/src/live/rooms.ts +288 -0
  117. package/src/registerRoutes.ts +2 -0
  118. package/src/routes/agent-computers.ts +59 -1
  119. package/src/routes/agent-runners.ts +1 -0
  120. package/src/routes/artifact-frames.ts +40 -12
  121. package/src/routes/artifacts.ts +713 -28
  122. package/src/routes/connector-connection-runs.ts +7 -12
  123. package/src/routes/connector-connections.ts +10 -7
  124. package/src/routes/lake.ts +73 -0
  125. package/src/routes/objects.ts +3 -9
  126. package/src/routes/pipelines.ts +1 -0
  127. package/src/routes/shared-access.ts +53 -1
  128. package/src/routes/status.ts +9 -4
  129. package/src/routes/syncs.ts +1 -0
  130. package/src/routes/webhooks.ts +44 -3
  131. package/src/routes/ws/artifacts.ts +138 -0
  132. package/src/routes/ws/events.ts +7 -2
  133. package/src/routes/ws/index.ts +13 -2
  134. package/src/routes/ws/shared-sockets.ts +152 -0
  135. package/src/schemas/agents.ts +11 -0
  136. package/src/schemas/artifacts.ts +255 -18
  137. package/src/schemas/connectors.ts +17 -2
  138. package/src/schemas/files.ts +12 -0
  139. package/src/schemas/lake.ts +53 -0
  140. package/src/schemas/objects.ts +1 -0
  141. package/src/schemas/pipelines.ts +2 -0
  142. package/src/schemas/projections.ts +2 -2
  143. package/src/schemas/shared-access.ts +16 -0
  144. package/src/schemas/status.ts +16 -22
  145. package/src/schemas/syncs.ts +2 -0
  146. package/src/server.ts +35 -4
  147. package/src/utils/ws.ts +7 -0
@@ -0,0 +1,288 @@
1
+ import type { SixbHostView } from "@sixb/core"
2
+ import {
3
+ type ArtifactLiveClientMessage,
4
+ type ArtifactLiveServerMessage,
5
+ type ArtifactLiveUser,
6
+ decodeLiveData,
7
+ } from "@sixb/core/artifacts/live"
8
+ import { liveUserOf } from "./awareness"
9
+ import { type LiveConnection, LiveRoom, type LiveRoomHost } from "./room"
10
+
11
+ /** How many artifacts one connection may hold live at once. */
12
+ export const MAX_LIVE_ARTIFACTS_PER_CONNECTION = 16
13
+ /** The largest sync message a connection may send in parts: four boards' worth of HTML. */
14
+ export const MAX_LIVE_SYNC_BYTES = 8 * 1024 * 1024
15
+
16
+ /**
17
+ * The artifacts this server holds live, one room each, opened by the first connection that joins
18
+ * and closed once the last leaves and its changes are written back. Every room learns of the
19
+ * artifact's writes from the project's events, wherever they were made.
20
+ */
21
+ export class LiveRooms {
22
+ private readonly rooms = new Map<string, Promise<LiveRoom | "not_found" | "not_live">>()
23
+ /**
24
+ * The artifacts each connection joined, or is joining: the slot is taken before the join reads
25
+ * anything, so joins at once count against the cap, and each is its own ticket, so a join that
26
+ * resumes once the connection left, or joined again, knows it is stale.
27
+ */
28
+ private readonly joined = new Map<string, Map<string, symbol>>()
29
+ /** Who each connection is, read once. */
30
+ private readonly users = new Map<string, Promise<ArtifactLiveUser>>()
31
+ /** The parts of a sync message a connection is sending, by connection and artifact. */
32
+ private readonly parts = new Map<string, { chunks: Uint8Array[]; bytes: number }>()
33
+ private events: Promise<() => void> | undefined
34
+ private closed = false
35
+
36
+ constructor(private readonly host: LiveRoomHost & { readonly events: SixbHostView["events"] }) {}
37
+
38
+ /** Handles a message from a connection. */
39
+ async receive(connection: LiveConnection, message: ArtifactLiveClientMessage): Promise<void> {
40
+ switch (message.type) {
41
+ case "join":
42
+ return this.join(connection, message.artifactId)
43
+ case "leave":
44
+ return this.leave(connection, message.artifactId)
45
+ case "sync": {
46
+ const room = await this.held(connection, message.artifactId)
47
+ const bytes = room && this.assemble(connection, message)
48
+ if (bytes) await room.sync(connection.id, bytes)
49
+ return
50
+ }
51
+ case "awareness": {
52
+ const room = await this.held(connection, message.artifactId)
53
+ room?.presence(connection.id, message.data)
54
+ return
55
+ }
56
+ }
57
+ }
58
+
59
+ /** Leaves every artifact a connection holds: it closed. */
60
+ async disconnect(connection: LiveConnection): Promise<void> {
61
+ for (const artifactId of [...(this.joined.get(connection.id)?.keys() ?? [])]) {
62
+ await this.leave(connection, artifactId)
63
+ }
64
+ this.joined.delete(connection.id)
65
+ this.users.delete(connection.id)
66
+ }
67
+
68
+ /**
69
+ * Writes back what every room holds unwritten, then stops them and the events feed: the server
70
+ * stops.
71
+ */
72
+ async close(): Promise<void> {
73
+ this.closed = true
74
+ for (const opening of this.rooms.values()) {
75
+ const room = await opening.catch(() => null)
76
+ if (!(room instanceof LiveRoom)) continue
77
+ room.save()
78
+ await room.settled()
79
+ room.close()
80
+ }
81
+ this.rooms.clear()
82
+ const unsubscribe = await this.events?.catch(() => undefined)
83
+ unsubscribe?.()
84
+ }
85
+
86
+ /** Settles once every room's queued work is done. */
87
+ async settled(): Promise<void> {
88
+ for (const opening of [...this.rooms.values()]) {
89
+ const room = await opening.catch(() => null)
90
+ if (room instanceof LiveRoom) await room.settled()
91
+ }
92
+ }
93
+
94
+ /**
95
+ * Joins a connection to an artifact it may read: to edit it when it may change it, to watch it
96
+ * otherwise. One it may not read, or that is not edited live, is refused with why.
97
+ */
98
+ private async join(connection: LiveConnection, artifactId: string): Promise<void> {
99
+ const send = (message: ArtifactLiveServerMessage) => connection.send(message)
100
+ const held = this.joined.get(connection.id) ?? new Map<string, symbol>()
101
+ if (held.has(artifactId)) return
102
+ if (held.size >= MAX_LIVE_ARTIFACTS_PER_CONNECTION) {
103
+ send({
104
+ type: "error",
105
+ artifactId,
106
+ message: `[SixbServer] A connection holds at most ${MAX_LIVE_ARTIFACTS_PER_CONNECTION} artifacts live: leave one first.`,
107
+ })
108
+ return
109
+ }
110
+
111
+ // Taken now, before anything is read: what follows waits, and other joins run meanwhile.
112
+ const ticket = Symbol(artifactId)
113
+ held.set(artifactId, ticket)
114
+ this.joined.set(connection.id, held)
115
+ const current = () => this.joined.get(connection.id)?.get(artifactId) === ticket
116
+ const release = () => {
117
+ if (current()) this.joined.get(connection.id)?.delete(artifactId)
118
+ }
119
+
120
+ try {
121
+ const access = await connection.sixb.artifacts.access(artifactId)
122
+ if (access === null || access === "none") {
123
+ release()
124
+ send({ type: "left", artifactId, reason: access === null ? "not_found" : "not_shared" })
125
+ return
126
+ }
127
+
128
+ const user = await this.userOf(connection)
129
+ const room = await this.open(artifactId)
130
+ if (!(room instanceof LiveRoom)) {
131
+ release()
132
+ send({ type: "left", artifactId, reason: room })
133
+ return
134
+ }
135
+
136
+ // The connection left, or closed, while this read: it is not here, and a room this join
137
+ // opened for it closes again. Otherwise it joins now, before the room can close.
138
+ if (!current()) {
139
+ room.closeIfUnheld()
140
+ return
141
+ }
142
+ room.join(connection, access === "read" ? "watch" : "edit", user)
143
+ } catch (error) {
144
+ release()
145
+ throw error
146
+ }
147
+ }
148
+
149
+ private userOf(connection: LiveConnection): Promise<ArtifactLiveUser> {
150
+ // A guest is read at each join: the name they give after joining shows from their next one.
151
+ if (connection.user) return connection.user()
152
+
153
+ const known = this.users.get(connection.id)
154
+ if (known) return known
155
+
156
+ const user = liveUserOf(
157
+ this.host.storage,
158
+ this.host.projectId,
159
+ connection.sixb.execution.requestedBy
160
+ )
161
+ this.users.set(connection.id, user)
162
+ return user
163
+ }
164
+
165
+ /**
166
+ * Reads again who a connection is, and shows it so in every artifact it holds: a shared link's
167
+ * guest gave their name, which the server reads from their session, never from the client.
168
+ */
169
+ async refreshUser(connection: LiveConnection): Promise<void> {
170
+ this.users.delete(connection.id)
171
+ const user = await this.userOf(connection)
172
+
173
+ for (const artifactId of this.joined.get(connection.id)?.keys() ?? []) {
174
+ const room = await this.rooms.get(artifactId)
175
+ if (room instanceof LiveRoom) room.rename(connection.id, user)
176
+ }
177
+ }
178
+
179
+ /** Leaves an artifact, as asked: the connection is told it left, once it did. */
180
+ private async leave(connection: LiveConnection, artifactId: string): Promise<void> {
181
+ this.parts.delete(partsKey(connection, artifactId))
182
+ const held = this.joined.get(connection.id)
183
+ if (!held?.delete(artifactId)) return
184
+
185
+ const room = await this.rooms.get(artifactId)
186
+ if (room instanceof LiveRoom) room.leave(connection.id)
187
+ connection.send({ type: "left", artifactId, reason: "left" })
188
+ }
189
+
190
+ /**
191
+ * The bytes of a whole sync message: this one's, or, on its last part, every part's. Null while
192
+ * parts are still to come, and for a message that is not base64 or grew too large.
193
+ */
194
+ private assemble(
195
+ connection: LiveConnection,
196
+ message: Extract<ArtifactLiveClientMessage, { type: "sync" }>
197
+ ): Uint8Array | null {
198
+ const key = partsKey(connection, message.artifactId)
199
+ const bytes = decodeLiveData(message.data)
200
+ const parts = this.parts.get(key)
201
+ const size = (parts?.bytes ?? 0) + (bytes?.length ?? 0)
202
+
203
+ if (!bytes || size > MAX_LIVE_SYNC_BYTES) {
204
+ this.parts.delete(key)
205
+ connection.send({
206
+ type: "error",
207
+ artifactId: message.artifactId,
208
+ message: bytes
209
+ ? `[SixbServer] A sync message holds at most ${MAX_LIVE_SYNC_BYTES} bytes.`
210
+ : "[SixbServer] A sync message's data is base64.",
211
+ })
212
+ return null
213
+ }
214
+
215
+ if (message.more) {
216
+ this.parts.set(key, { chunks: [...(parts?.chunks ?? []), bytes], bytes: size })
217
+ return null
218
+ }
219
+ if (!parts) return bytes
220
+
221
+ this.parts.delete(key)
222
+ const whole = new Uint8Array(size)
223
+ let offset = 0
224
+ for (const chunk of [...parts.chunks, bytes]) {
225
+ whole.set(chunk, offset)
226
+ offset += chunk.length
227
+ }
228
+ return whole
229
+ }
230
+
231
+ /** The room of an artifact the connection joined. */
232
+ private async held(connection: LiveConnection, artifactId: string): Promise<LiveRoom | null> {
233
+ if (!this.joined.get(connection.id)?.has(artifactId)) {
234
+ connection.send({
235
+ type: "error",
236
+ artifactId,
237
+ message: "[SixbServer] Join the artifact before sending it changes.",
238
+ })
239
+ return null
240
+ }
241
+ const room = await this.rooms.get(artifactId)
242
+ return room instanceof LiveRoom ? room : null
243
+ }
244
+
245
+ /** The artifact's room, opened once however many join at once; a refusal is not kept. */
246
+ private async open(artifactId: string): Promise<LiveRoom | "not_found" | "not_live"> {
247
+ const existing = await this.rooms.get(artifactId)
248
+ if (existing instanceof LiveRoom && !existing.isClosed) return existing
249
+
250
+ this.followEvents()
251
+ const opening = LiveRoom.open(this.host, artifactId, () => {
252
+ // A room reopened since holds the entry now.
253
+ if (this.rooms.get(artifactId) === opening) this.rooms.delete(artifactId)
254
+ })
255
+ this.rooms.set(artifactId, opening)
256
+ const room = await opening.catch((error: unknown) => {
257
+ this.rooms.delete(artifactId)
258
+ throw error
259
+ })
260
+ if (!(room instanceof LiveRoom)) this.rooms.delete(artifactId)
261
+ return room
262
+ }
263
+
264
+ /** Every write to an artifact a room holds reaches it, whichever server or worker made it. */
265
+ private followEvents(): void {
266
+ if (this.events || this.closed) return
267
+ const following = this.host.events.subscribe(
268
+ { from: "latest", types: ["artifact.updated"] },
269
+ async (events) => {
270
+ for (const event of events) {
271
+ if (event.type !== "artifact.updated") continue
272
+ const room = await this.rooms.get(event.payload.artifactId)
273
+ if (room instanceof LiveRoom) room.written(event.payload.revision)
274
+ }
275
+ }
276
+ )
277
+ // A feed that could not start is asked for again by the next room that opens.
278
+ this.events = following
279
+ following.catch((error: unknown) => {
280
+ if (this.events === following) this.events = undefined
281
+ console.error("[SixbServer] Could not follow the artifacts' writes:", error)
282
+ })
283
+ }
284
+ }
285
+
286
+ function partsKey(connection: LiveConnection, artifactId: string): string {
287
+ return `${connection.id}\n${artifactId}`
288
+ }
@@ -24,6 +24,7 @@ import { registerDatasetRoutes } from "./routes/datasets"
24
24
  import { registerEventRoutes } from "./routes/events"
25
25
  import { registerFileDownloadRoutes } from "./routes/file-downloads"
26
26
  import { registerFileRoutes } from "./routes/files"
27
+ import { registerLakeRoutes } from "./routes/lake"
27
28
  import { registerLinkRoutes } from "./routes/links"
28
29
  import { registerLogRoutes } from "./routes/logs"
29
30
  import { registerModelCallRoutes } from "./routes/model-calls"
@@ -62,6 +63,7 @@ export function registerHttpRoutes(app: Elysia, host: SixbHostView, options: Htt
62
63
  registerConnectorConnectionRoutes(app, host)
63
64
  registerConnectorConnectionRunRoutes(app, host, options.connectorConnections)
64
65
  registerDatasetRoutes(app, host)
66
+ registerLakeRoutes(app, host)
65
67
  registerSyncRoutes(app, host)
66
68
  registerPipelineRoutes(app, host)
67
69
  registerWorkflowRoutes(app, host)
@@ -18,10 +18,14 @@ import type {
18
18
  import type { Elysia } from "elysia"
19
19
  import { z } from "zod"
20
20
  import { requestActor, requireRequestSixb } from "../auth/scope"
21
- import { SIXB_SESSION_MUTATION_SECURITY_REQUIREMENT } from "../openapi/security"
21
+ import {
22
+ SIXB_SESSION_MUTATION_SECURITY_REQUIREMENT,
23
+ SIXB_SESSION_SECURITY_REQUIREMENT,
24
+ } from "../openapi/security"
22
25
  import { OPENAPI_TAGS } from "../openapi/tags"
23
26
  import {
24
27
  AgentBackgroundCommandParamsSchema,
28
+ AgentComputerListResponseSchema,
25
29
  AgentComputerSessionParamsSchema,
26
30
  AgentRequestErrorResponseSchema,
27
31
  AgentThreadComputerInputSchema,
@@ -121,6 +125,40 @@ export async function endLapsedComputerSessions(host: SixbHostView): Promise<voi
121
125
 
122
126
  export function registerAgentComputerRoutes(app: Elysia, host: SixbHostView) {
123
127
  return app
128
+ .get(
129
+ "/api/agent-computers",
130
+ async (context) => {
131
+ const { set } = context
132
+ const sixb = requireRequestSixb(context)
133
+ try {
134
+ const agents = host.storage.agents
135
+ if (!agents) return unconfiguredStorageResponse(set, "Agent storage")
136
+
137
+ const live = await agents.computers.listLive({
138
+ projectId: host.id,
139
+ ownerPrincipal: requestActor(sixb),
140
+ now: new Date(),
141
+ })
142
+ return AgentComputerListResponseSchema.parse({ computers: computersOf(live) })
143
+ } catch (error) {
144
+ return handleAgentRouteError(error, set)
145
+ }
146
+ },
147
+ {
148
+ response: {
149
+ 200: AgentComputerListResponseSchema,
150
+ 501: ErrorResponseSchema,
151
+ },
152
+ detail: {
153
+ summary: "List your computers with sixb open now",
154
+ description:
155
+ "Each of your computers with a live session, and the folders `sixb` is open in there: a thread created to run in one of them runs there now.",
156
+ tags: [OPENAPI_TAGS.agentThreads.name],
157
+ operationId: "listAgentComputers",
158
+ security: SIXB_SESSION_SECURITY_REQUIREMENT,
159
+ },
160
+ }
161
+ )
124
162
  .post(
125
163
  "/api/agent-threads/:threadId/computer",
126
164
  async (context) => {
@@ -405,6 +443,26 @@ function sameCommands(
405
443
  return stableJsonStringify(before) === stableJsonStringify(now)
406
444
  }
407
445
 
446
+ /** Live sessions as computers, each with its folders: sorted, so a list reads the same each time. */
447
+ function computersOf(
448
+ sessions: readonly AgentComputerSessionRecord[]
449
+ ): { id: string; name: string; folders: string[] }[] {
450
+ const byId = new Map<string, { id: string; name: string; folders: Set<string> }>()
451
+ for (const { computer } of sessions) {
452
+ const known = byId.get(computer.id)
453
+ if (known) known.folders.add(computer.folder)
454
+ else
455
+ byId.set(computer.id, {
456
+ id: computer.id,
457
+ name: computer.name,
458
+ folders: new Set([computer.folder]),
459
+ })
460
+ }
461
+ return [...byId.values()]
462
+ .map(({ id, name, folders }) => ({ id, name, folders: [...folders].sort() }))
463
+ .sort((a, b) => a.name.localeCompare(b.name) || a.id.localeCompare(b.id))
464
+ }
465
+
408
466
  /** The owner's queued turns that wait for this computer, in this folder. */
409
467
  async function waitingTurns(
410
468
  host: SixbHostView,
@@ -39,6 +39,7 @@ export function agentRunSessionHost(host: SixbHostView): AgentRunSessionHost | n
39
39
  host.broker
40
40
  )
41
41
  ),
42
+ domainEvents: host.events,
42
43
  security: host.definitions.security,
43
44
  sdk: host,
44
45
  definitions: host.definitions,
@@ -1,8 +1,10 @@
1
1
  import type { SixbHostView } from "@sixb/core"
2
2
  import { parseArtifactAddress } from "@sixb/core/artifacts"
3
+ import { annotateBoard } from "@sixb/core/artifacts/live"
3
4
  import {
4
5
  ARTIFACT_FRAME_ROUTE_PREFIX,
5
6
  FRAME_ASSETS,
7
+ FRAME_REFERENCE_PATH,
6
8
  FRAME_REFERENCE_PREFIX,
7
9
  frameEntries,
8
10
  frameLayout,
@@ -11,6 +13,11 @@ import {
11
13
  rewriteFrameReferences,
12
14
  } from "@sixb/core/internal/artifacts/frames"
13
15
  import { openFileRef } from "@sixb/core/internal/blob-storage"
16
+ import type {
17
+ ArtifactFrameTarget,
18
+ ArtifactStorage,
19
+ ArtifactVersionRecord,
20
+ } from "@sixb/core/storage"
14
21
  import type { Elysia } from "elysia"
15
22
  import { frameContentSecurityPolicy } from "../artifacts/frame"
16
23
  import type { ResolvedSixbApiBrowserPolicy } from "../auth/browser-origin"
@@ -24,7 +31,8 @@ interface FrameContext {
24
31
  /**
25
32
  * Serves a version's files to its sandboxed frame, under the token a frame link carries: the token
26
33
  * is the credential, so the route is public. Each entry gets its layout's kit and the runtime,
27
- * which are served beside the files. Hidden from OpenAPI: clients receive frame links, they
34
+ * which are served beside the files. A canvas's board asked for with `?sixb-edit` is served for
35
+ * editing: its static elements marked with their addresses. Hidden from OpenAPI: clients receive frame links, they
28
36
  * never build them.
29
37
  */
30
38
  export function registerArtifactFrameRoutes(
@@ -84,21 +92,16 @@ async function frameResponse(
84
92
  }
85
93
  let lent = false
86
94
  if (path?.startsWith(FRAME_REFERENCE_PREFIX)) {
87
- // A file another artifact lends this one: only one its frame was issued with, at that version.
88
- const match = /^([^/@]+)@(\d+)\/(.+)$/.exec(path.slice(FRAME_REFERENCE_PREFIX.length))
95
+ // A file another artifact lends this one: only one its frame was issued with. A pinned
96
+ // address shows its created version; an unpinned one the lender's latest, as it is now.
97
+ const match = FRAME_REFERENCE_PATH.exec(path.slice(FRAME_REFERENCE_PREFIX.length))
89
98
  const target = frame.targets.find(
90
99
  (candidate) =>
91
100
  candidate.artifactId === match?.[1] &&
92
- candidate.version === Number(match?.[2]) &&
101
+ String(candidate.version) === match?.[2] &&
93
102
  parseArtifactAddress(candidate.address)?.path === match?.[3]
94
103
  )
95
- const lender = target
96
- ? await storage.getVersion({
97
- projectId: host.id,
98
- artifactId: target.artifactId,
99
- version: target.version,
100
- })
101
- : null
104
+ const lender = target ? await lenderVersion(storage, host.id, target) : null
102
105
  if (!lender || !match) return notFound()
103
106
  version = lender
104
107
  path = match[3] ?? null
@@ -115,8 +118,18 @@ async function frameResponse(
115
118
  headers.set("cache-control", "private, no-cache")
116
119
  if (options.head) return new Response(null, { headers })
117
120
  const text = await new Response(opened.body).text()
121
+
122
+ // A canvas's board served for editing has its static elements marked with their addresses,
123
+ // for the runtime to report and edit them by.
124
+ const editing =
125
+ version.outline.kind === "canvas" && new URL(request.url).searchParams.has("sixb-edit")
126
+ const source = editing ? annotateBoard(text) : text
118
127
  return new Response(
119
- injectFrameAssets(rewriteFrameReferences(text, frame.targets, file.path), layout, file.path),
128
+ injectFrameAssets(
129
+ rewriteFrameReferences(source, frame.targets, file.path),
130
+ layout,
131
+ file.path
132
+ ),
120
133
  { headers }
121
134
  )
122
135
  }
@@ -135,6 +148,21 @@ async function frameResponse(
135
148
  return response
136
149
  }
137
150
 
151
+ async function lenderVersion(
152
+ storage: ArtifactStorage,
153
+ projectId: string,
154
+ target: ArtifactFrameTarget
155
+ ): Promise<ArtifactVersionRecord | null> {
156
+ const { artifactId } = target
157
+ const version =
158
+ target.version === "latest"
159
+ ? (await storage.get({ projectId, id: artifactId }))?.latestVersion
160
+ : target.version
161
+ if (version === undefined) return null
162
+
163
+ return storage.getVersion({ projectId, artifactId, version })
164
+ }
165
+
138
166
  function decodePath(raw: string | undefined): string | null {
139
167
  try {
140
168
  return decodeURIComponent(raw ?? "")