Skip to content

Commit ff21611

Browse files
committed
merge(input): integrate verified screenshot delivery with direct B (anomalyco#100)
2 parents 1c606af + f0ce10c commit ff21611

34 files changed

Lines changed: 2867 additions & 58 deletions

‎packages/core/schema.json‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"version": "7",
33
"dialect": "sqlite",
4-
"id": "7e5a6b09-5d1d-41a6-917f-7bab9944917a",
4+
"id": "9cbf2b9f-92a3-4ca2-93ca-5b69d8db150f",
55
"prevIds": [
6-
"f14a9b18-8207-487e-a3d3-227e629ba9ad"
6+
"7e5a6b09-5d1d-41a6-917f-7bab9944917a"
77
],
88
"ddl": [
99
{
@@ -1476,6 +1476,16 @@
14761476
"entityType": "columns",
14771477
"table": "v1_session_input"
14781478
},
1479+
{
1480+
"type": "text",
1481+
"notNull": false,
1482+
"autoincrement": false,
1483+
"default": null,
1484+
"generated": null,
1485+
"name": "images",
1486+
"entityType": "columns",
1487+
"table": "v1_session_input"
1488+
},
14791489
{
14801490
"type": "text",
14811491
"notNull": true,

‎packages/core/src/database/migration.gen.ts‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/core/src/database/migration.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const lock = Semaphore.makeUnsafe(1)
1313
export type Migration = {
1414
id: string
1515
up: (tx: Transaction) => Effect.Effect<void, unknown>
16+
fresh?: true
1617
}
1718

1819
export function apply(db: Database) {
@@ -26,6 +27,12 @@ export function apply(db: Database) {
2627
yield* db.transaction((tx) =>
2728
Effect.gen(function* () {
2829
yield* schema.up(tx)
30+
// Generated table DDL cannot express runtime compatibility triggers.
31+
yield* Effect.forEach(
32+
migrations,
33+
(migration) => ("fresh" in migration && migration.fresh ? migration.up(tx) : Effect.void),
34+
{ discard: true },
35+
)
2936
yield* tx.run(
3037
sql`CREATE TABLE ${sql.identifier("migration")} (id TEXT PRIMARY KEY, time_completed INTEGER NOT NULL)`,
3138
)
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { Effect } from "effect"
2+
import type { DatabaseMigration } from "../migration"
3+
4+
export default {
5+
id: "20260916185726_v1_input_images",
6+
up(tx) {
7+
return Effect.gen(function* () {
8+
yield* tx.run(`ALTER TABLE \`v1_session_input\` ADD \`images\` text;`)
9+
})
10+
},
11+
} satisfies DatabaseMigration.Migration
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import { Effect } from "effect"
2+
import type { DatabaseMigration } from "../migration"
3+
4+
export default {
5+
id: "20260916205955_v1_input_media_guard",
6+
fresh: true,
7+
up(tx) {
8+
return tx
9+
.run(
10+
`
11+
CREATE TRIGGER IF NOT EXISTS v1_input_images_require_parts
12+
BEFORE UPDATE OF state ON v1_session_input
13+
WHEN OLD.state = 'pending' AND NEW.state = 'promoted' AND json_array_length(OLD.images) > 0
14+
BEGIN
15+
SELECT RAISE(ABORT, 'Image inputs require an image-capable runtime; media remains pending')
16+
WHERE json_array_length(OLD.images) != (
17+
SELECT count(*) FROM part
18+
WHERE session_id = NEW.session_id AND message_id = json_extract(NEW.receipt, '$.messageID')
19+
AND json_extract(data, '$.type') = 'file'
20+
) OR EXISTS (
21+
SELECT 1 FROM json_each(OLD.images) expected
22+
LEFT JOIN (
23+
SELECT row_number() OVER (ORDER BY id) - 1 AS ordinal, data FROM part
24+
WHERE session_id = NEW.session_id AND message_id = json_extract(NEW.receipt, '$.messageID')
25+
AND json_extract(data, '$.type') = 'file'
26+
) actual ON actual.ordinal = CAST(expected.key AS INTEGER)
27+
WHERE actual.data IS NULL
28+
OR json_extract(actual.data, '$.url') IS NOT json_extract(expected.value, '$.url')
29+
OR json_extract(actual.data, '$.mime') IS NOT json_extract(expected.value, '$.mime')
30+
OR json_extract(actual.data, '$.filename') IS NOT json_extract(expected.value, '$.filename')
31+
);
32+
END;
33+
`,
34+
)
35+
.pipe(Effect.asVoid)
36+
},
37+
} satisfies DatabaseMigration.Migration

‎packages/core/src/database/schema.gen.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ export default {
232232
\`admitted_seq\` integer NOT NULL,
233233
\`state\` text NOT NULL,
234234
\`payload\` text NOT NULL,
235+
\`images\` text,
235236
\`model\` text NOT NULL,
236237
\`receipt\` text NOT NULL,
237238
CONSTRAINT \`fk_v1_session_input_session_id_session_id_fk\` FOREIGN KEY (\`session_id\`) REFERENCES \`session\`(\`id\`) ON DELETE CASCADE

‎packages/core/src/session/projector.ts‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
export * as SessionProjector from "./projector"
22

33
import { and, desc, eq, gt, or, sql } from "drizzle-orm"
4+
import { isDeepStrictEqual } from "node:util"
45
import { DateTime, Effect, Layer, Schema } from "effect"
56
import { Database } from "../database/database"
67
import { EventV2 } from "../event"
@@ -22,6 +23,7 @@ const encodeMessage = Schema.encodeSync(SessionMessage.Message)
2223

2324
export class SessionAlreadyProjected extends Error {}
2425
export class InputLifecycleConflict extends Error {}
26+
export class InputCapacityExceeded extends Error {}
2527

2628
type Usage = {
2729
cost: number
@@ -276,6 +278,38 @@ const layer = Layer.effectDiscard(
276278
Effect.gen(function* () {
277279
const seq = event.durable?.seq
278280
if (seq === undefined) return yield* Effect.die("Input admission requires a durable sequence")
281+
const existing = yield* db
282+
.select({ id: V1InputTable.request_id })
283+
.from(V1InputTable)
284+
.where(eq(V1InputTable.request_id, event.data.payload.requestID))
285+
.get()
286+
.pipe(Effect.orDie)
287+
if (existing) return yield* Effect.die(new InputLifecycleConflict())
288+
if (!event.data.payload.text.trim() && !event.data.payload.images?.length)
289+
return yield* Effect.die(new InputLifecycleConflict())
290+
if (
291+
(event.data.payload.images?.length ?? 0) !== (event.data.images?.length ?? 0) ||
292+
event.data.images?.some((image, index) => image.filename !== event.data.payload.images?.[index]?.filename)
293+
)
294+
return yield* Effect.die(new InputLifecycleConflict())
295+
const pending = yield* db
296+
.select({
297+
count: sql<number>`coalesce(sum(case when ${V1InputTable.state} = 'pending' then 1 else 0 end), 0)`,
298+
bytes: sql<number>`coalesce(sum(length(cast(${V1InputTable.payload} as blob)) + coalesce(length(cast(${V1InputTable.images} as blob)), 0) + length(cast(${V1InputTable.receipt} as blob))), 0)`,
299+
})
300+
.from(V1InputTable)
301+
.where(eq(V1InputTable.session_id, event.data.sessionID))
302+
.get()
303+
.pipe(Effect.orDie)
304+
const incoming =
305+
Buffer.byteLength(JSON.stringify(event.data.payload)) * 2 +
306+
Buffer.byteLength(JSON.stringify(event.data.images ?? [])) +
307+
1024
308+
if (
309+
event.data.images?.length &&
310+
((pending?.count ?? 0) >= 64 || (pending?.bytes ?? 0) + incoming > 64 * 1024 * 1024)
311+
)
312+
return yield* Effect.die(new InputCapacityExceeded())
279313
const stored = yield* db
280314
.insert(V1InputTable)
281315
.values({
@@ -284,6 +318,7 @@ const layer = Layer.effectDiscard(
284318
admitted_seq: seq,
285319
state: "pending",
286320
payload: event.data.payload,
321+
images: event.data.images,
287322
model: event.data.model,
288323
receipt: {
289324
...event.data.payload,
@@ -340,6 +375,32 @@ const layer = Layer.effectDiscard(
340375
.pipe(Effect.orDie)
341376
if (!row) return yield* Effect.die(new InputLifecycleConflict())
342377
const info = event.data.info
378+
const images = event.data.images ?? []
379+
if (
380+
info.sessionID !== event.data.sessionID ||
381+
info.agent !== row.receipt.agent ||
382+
!isDeepStrictEqual(info.model, row.model) ||
383+
event.data.part.sessionID !== info.sessionID ||
384+
event.data.part.messageID !== info.id ||
385+
event.data.part.text !== row.payload.text ||
386+
images.some((image) => image.sessionID !== info.sessionID || image.messageID !== info.id) ||
387+
(images.length > 0 && !/^prt_[A-Za-z0-9]+$/.test(event.data.part.id)) ||
388+
images.some(
389+
(image, index) =>
390+
!/^prt_[A-Za-z0-9]+$/.test(image.id) ||
391+
image.id <= (index === 0 ? event.data.part.id : images[index - 1].id),
392+
) ||
393+
!isDeepStrictEqual(
394+
images.map((image) => ({
395+
type: image.type,
396+
mime: image.mime,
397+
url: image.url,
398+
...(image.filename === undefined ? {} : { filename: image.filename }),
399+
})),
400+
row.images ?? [],
401+
)
402+
)
403+
return yield* Effect.die(new InputLifecycleConflict())
343404
yield* db
344405
.insert(MessageTable)
345406
.values({ id: info.id, session_id: info.sessionID, time_created: info.time.created, data: messageData(info) })
@@ -356,6 +417,19 @@ const layer = Layer.effectDiscard(
356417
})
357418
.run()
358419
.pipe(Effect.orDie)
420+
for (const image of event.data.images ?? []) {
421+
yield* db
422+
.insert(PartTable)
423+
.values({
424+
id: image.id,
425+
message_id: info.id,
426+
session_id: info.sessionID,
427+
time_created: info.time.created,
428+
data: partData(image),
429+
})
430+
.run()
431+
.pipe(Effect.orDie)
432+
}
359433
yield* db
360434
.update(V1InputTable)
361435
.set({

‎packages/core/src/session/sql.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ export const V1InputTable = sqliteTable(
9090
admitted_seq: integer().notNull(),
9191
state: text().$type<SessionV1.InputReceipt["state"]>().notNull(),
9292
payload: text({ mode: "json" }).$type<SessionV1.InputPayload>().notNull(),
93+
images: text({ mode: "json" }).$type<readonly SessionV1.InputImage[]>(),
9394
model: text({ mode: "json" }).$type<SessionV1.User["model"]>().notNull(),
9495
receipt: text({ mode: "json" }).$type<SessionV1.InputReceipt>().notNull(),
9596
},

‎packages/core/src/v1/session.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ export {
1717
Format,
1818
Info,
1919
InputPayload,
20+
InputImage,
21+
InputImages,
22+
ImageSupport,
23+
ImageCapabilities,
2024
InputReceipt,
2125
MessageID,
2226
OutputFormatJsonSchema,

‎packages/core/test/database-migration.test.ts‎

Lines changed: 73 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { fileURLToPath } from "url"
44
import path from "path"
55
import { SqliteClient } from "@effect/sql-sqlite-bun"
66
import { EffectDrizzleSqlite } from "@opencode-ai/effect-drizzle-sqlite"
7-
import { Effect, Layer } from "effect"
7+
import { Cause, Effect, Exit, Layer } from "effect"
88
import { eq, inArray, sql } from "drizzle-orm"
99
import { DatabaseMigration } from "@opencode-ai/core/database/migration"
1010
import { migrations } from "@opencode-ai/core/database/migration.gen"
@@ -39,6 +39,78 @@ const run = <A, E>(effect: Effect.Effect<A, E, SqlClientService>) =>
3939
const makeDb = EffectDrizzleSqlite.makeWithDefaults()
4040

4141
describe("DatabaseMigration", () => {
42+
test.each(["fresh", "upgrade"])("%s databases prevent an old runtime dropping admitted images", async (mode) => {
43+
await run(
44+
Effect.gen(function* () {
45+
const db = yield* makeDb
46+
yield* DatabaseMigration.apply(db)
47+
if (mode === "upgrade") {
48+
yield* db.run(sql`DROP TRIGGER IF EXISTS v1_input_images_require_parts`)
49+
yield* db.run(sql`DELETE FROM migration WHERE id = '20260916205955_v1_input_media_guard'`)
50+
}
51+
yield* db
52+
.insert(ProjectTable)
53+
.values({ id: ProjectV2.ID.global, worktree: AbsolutePath.make("/fixture"), sandboxes: [] })
54+
.run()
55+
const sessionID = SessionSchema.ID.make("ses_media_guard")
56+
yield* db
57+
.insert(SessionTable)
58+
.values({
59+
id: sessionID,
60+
project_id: ProjectV2.ID.global,
61+
slug: "guard",
62+
directory: "/fixture",
63+
title: "Guard",
64+
version: "test",
65+
})
66+
.run()
67+
const image = {
68+
type: "file",
69+
mime: "image/png",
70+
filename: "fixture.png",
71+
url: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAADCAIAAAA2iEnWAAAAFElEQVR4nGOM6rnEwMDAxAAGUAoAIIQBvq4LkJkAAAAASUVORK5CYII=",
72+
}
73+
yield* db.run(sql`INSERT INTO v1_session_input(request_id, session_id, admitted_seq, state, payload, images, model, receipt)
74+
VALUES ('image', ${sessionID}, 1, 'pending', ${JSON.stringify({ requestID: "image", delivery: "queue", text: "image prompt", images: [image] })},
75+
${JSON.stringify([image])}, '{}', ${JSON.stringify({ requestID: "image", state: "pending", images: [image] })}),
76+
('text', ${sessionID}, 2, 'pending', '{"requestID":"text","delivery":"queue","text":"text prompt"}', NULL, '{}', '{"requestID":"text","state":"pending"}')`)
77+
if (mode === "upgrade") yield* DatabaseMigration.apply(db)
78+
79+
// This is the pre-image projector's transaction, bypassing new service-level validation.
80+
const legacyPromote = (requestID: string) =>
81+
db.transaction((tx) =>
82+
Effect.gen(function* () {
83+
yield* tx.run(
84+
sql`INSERT INTO message(id,session_id,time_created,time_updated,data) VALUES (${`msg_${requestID}`},${sessionID},1,1,'{"role":"user"}')`,
85+
)
86+
yield* tx.run(
87+
sql`INSERT INTO part(id,message_id,session_id,time_created,time_updated,data) VALUES (${`prt_${requestID}`},${`msg_${requestID}`},${sessionID},1,1,'{"type":"text","text":"legacy text"}')`,
88+
)
89+
yield* tx.run(
90+
sql`UPDATE v1_session_input SET state='promoted', receipt=json_set(receipt,'$.state','promoted','$.messageID',${`msg_${requestID}`},'$.timePromoted',1) WHERE request_id=${requestID}`,
91+
)
92+
}),
93+
)
94+
const rejected = yield* legacyPromote("image").pipe(Effect.exit)
95+
expect(Exit.isFailure(rejected)).toBe(true)
96+
if (Exit.isFailure(rejected)) expect(Cause.pretty(rejected.cause)).toContain("image-capable runtime")
97+
expect(yield* db.get(sql`SELECT state FROM v1_session_input WHERE request_id='image'`)).toEqual({
98+
state: "pending",
99+
})
100+
expect(yield* db.get(sql`SELECT id FROM message WHERE id='msg_image'`)).toBeUndefined()
101+
expect(yield* db.get(sql`SELECT id FROM part WHERE message_id='msg_image'`)).toBeUndefined()
102+
yield* legacyPromote("text")
103+
expect(yield* db.get(sql`SELECT state FROM v1_session_input WHERE request_id='text'`)).toEqual({
104+
state: "promoted",
105+
})
106+
yield* db.run(sql`UPDATE v1_session_input SET state='cancelled' WHERE request_id='image'`)
107+
expect(yield* db.get(sql`SELECT images FROM v1_session_input WHERE request_id='image'`)).toEqual({
108+
images: JSON.stringify([image]),
109+
})
110+
}),
111+
)
112+
})
113+
42114
test("defaults missing workspace names while preserving legacy workspace data", async () => {
43115
await run(
44116
Effect.gen(function* () {

0 commit comments

Comments
 (0)