Skip to content

Commit 5e0a014

Browse files
committed
fix(server): migrate legacy piAgent provider state
1 parent 1b77529 commit 5e0a014

6 files changed

Lines changed: 194 additions & 6 deletions

File tree

‎apps/server/src/persistence/Layers/OrchestrationEventStore.test.ts‎

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { CommandId, EventId, ProjectId } from "@t3tools/contracts";
1+
import { CommandId, EventId, MessageId, ProjectId, ThreadId } from "@t3tools/contracts";
22
import { assert, it } from "@effect/vitest";
33
import { Effect, Layer, Schema, Stream } from "effect";
44
import * as SqlClient from "effect/unstable/sql/SqlClient";
@@ -116,4 +116,69 @@ layer("OrchestrationEventStore", (it) => {
116116
}
117117
}),
118118
);
119+
120+
it.effect("maps legacy piAgent provider payloads to codex during replay", () =>
121+
Effect.gen(function* () {
122+
const eventStore = yield* OrchestrationEventStore;
123+
const sql = yield* SqlClient.SqlClient;
124+
const now = new Date().toISOString();
125+
126+
yield* sql`
127+
INSERT INTO orchestration_events (
128+
event_id,
129+
aggregate_kind,
130+
stream_id,
131+
stream_version,
132+
event_type,
133+
occurred_at,
134+
command_id,
135+
causation_event_id,
136+
correlation_id,
137+
actor_kind,
138+
payload_json,
139+
metadata_json
140+
)
141+
VALUES (
142+
${EventId.makeUnsafe("evt-store-legacy-provider")},
143+
${"thread"},
144+
${ThreadId.makeUnsafe("thread-legacy-provider")},
145+
${0},
146+
${"thread.turn-start-requested"},
147+
${now},
148+
${CommandId.makeUnsafe("cmd-store-legacy-provider")},
149+
${null},
150+
${CommandId.makeUnsafe("cmd-store-legacy-provider")},
151+
${"client"},
152+
${JSON.stringify({
153+
threadId: ThreadId.makeUnsafe("thread-legacy-provider"),
154+
messageId: MessageId.makeUnsafe("msg-legacy-provider"),
155+
provider: "piAgent",
156+
runtimeMode: "full-access",
157+
interactionMode: "default",
158+
createdAt: now,
159+
})},
160+
${JSON.stringify({ adapterKey: "piAgent" })}
161+
)
162+
`;
163+
164+
const storedRows = yield* sql<{ readonly sequence: number }>`
165+
SELECT sequence
166+
FROM orchestration_events
167+
WHERE event_id = ${EventId.makeUnsafe("evt-store-legacy-provider")}
168+
`;
169+
170+
const replayed = yield* Stream.runCollect(
171+
eventStore.readFromSequence((storedRows[0]?.sequence ?? 1) - 1, 1),
172+
).pipe(Effect.map((chunk) => Array.from(chunk)));
173+
174+
assert.equal(replayed.length, 1);
175+
const event = replayed[0];
176+
assert.equal(event?.type, "thread.turn-start-requested");
177+
if (!event || event.type !== "thread.turn-start-requested") {
178+
return;
179+
}
180+
assert.equal(event.payload.provider, "codex");
181+
assert.equal(event.metadata.adapterKey, "codex");
182+
}),
183+
);
119184
});

‎apps/server/src/persistence/Layers/OrchestrationEventStore.ts‎

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,53 @@ const ReadFromSequenceRequestSchema = Schema.Struct({
6464
const DEFAULT_READ_FROM_SEQUENCE_LIMIT = 1_000;
6565
const READ_PAGE_SIZE = 500;
6666

67+
function normalizeLegacyProviderValue(provider: unknown): unknown {
68+
return provider === "piAgent" ? "codex" : provider;
69+
}
70+
71+
function normalizeLegacyEventRow(
72+
row: Schema.Schema.Type<typeof OrchestrationEventPersistedRowSchema>,
73+
): Schema.Schema.Type<typeof OrchestrationEventPersistedRowSchema> {
74+
const payload =
75+
row.payload && typeof row.payload === "object" && !Array.isArray(row.payload)
76+
? (() => {
77+
const nextProvider = normalizeLegacyProviderValue(
78+
(row.payload as Record<string, unknown>).provider,
79+
);
80+
return nextProvider === (row.payload as Record<string, unknown>).provider
81+
? row.payload
82+
: {
83+
...row.payload,
84+
provider: nextProvider,
85+
};
86+
})()
87+
: row.payload;
88+
const metadata =
89+
row.metadata && typeof row.metadata === "object" && !Array.isArray(row.metadata)
90+
? (() => {
91+
const nextAdapterKey = normalizeLegacyProviderValue(
92+
(row.metadata as Record<string, unknown>).adapterKey,
93+
);
94+
return nextAdapterKey === (row.metadata as Record<string, unknown>).adapterKey
95+
? row.metadata
96+
: {
97+
...row.metadata,
98+
adapterKey: nextAdapterKey === undefined ? undefined : String(nextAdapterKey),
99+
};
100+
})()
101+
: row.metadata;
102+
103+
if (payload === row.payload && metadata === row.metadata) {
104+
return row;
105+
}
106+
107+
return {
108+
...row,
109+
payload,
110+
metadata,
111+
};
112+
}
113+
67114
function inferActorKind(
68115
event: Omit<OrchestrationEvent, "sequence">,
69116
): Schema.Schema.Type<typeof OrchestrationActorKind> {
@@ -199,7 +246,7 @@ const makeEventStore = Effect.gen(function* () {
199246
),
200247
),
201248
Effect.flatMap((row) =>
202-
decodeEvent(row).pipe(
249+
decodeEvent(normalizeLegacyEventRow(row)).pipe(
203250
Effect.mapError(toPersistenceDecodeError("OrchestrationEventStore.append:rowToEvent")),
204251
),
205252
),
@@ -230,7 +277,7 @@ const makeEventStore = Effect.gen(function* () {
230277
),
231278
Effect.flatMap((rows) =>
232279
Effect.forEach(rows, (row) =>
233-
decodeEvent(row).pipe(
280+
decodeEvent(normalizeLegacyEventRow(row)).pipe(
234281
Effect.mapError(
235282
toPersistenceDecodeError("OrchestrationEventStore.readFromSequence:rowToEvent"),
236283
),

‎apps/server/src/persistence/Migrations.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import Migration0013 from "./Migrations/013_ProjectionThreadProposedPlans.ts";
2828
import Migration0014 from "./Migrations/014_ProjectionThreadProposedPlanImplementation.ts";
2929
import Migration0015 from "./Migrations/015_ProjectionTurnsSourceProposedPlan.ts";
3030
import Migration0016 from "./Migrations/016_ProjectionThreadsTitleSummaryState.ts";
31+
import Migration0017 from "./Migrations/017_LegacyPiAgentProviderName.ts";
3132
import { Effect } from "effect";
3233

3334
/**
@@ -57,6 +58,7 @@ const loader = Migrator.fromRecord({
5758
"14_ProjectionThreadProposedPlanImplementation": Migration0014,
5859
"15_ProjectionTurnsSourceProposedPlan": Migration0015,
5960
"16_ProjectionThreadsTitleSummaryState": Migration0016,
61+
"17_LegacyPiAgentProviderName": Migration0017,
6062
});
6163

6264
/**
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import * as Effect from "effect/Effect";
2+
import * as SqlClient from "effect/unstable/sql/SqlClient";
3+
4+
export default Effect.gen(function* () {
5+
const sql = yield* SqlClient.SqlClient;
6+
7+
yield* sql`
8+
UPDATE provider_session_runtime
9+
SET
10+
provider_name = CASE
11+
WHEN provider_name = 'piAgent' THEN 'codex'
12+
ELSE provider_name
13+
END,
14+
adapter_key = CASE
15+
WHEN adapter_key = 'piAgent' THEN 'codex'
16+
ELSE adapter_key
17+
END
18+
WHERE provider_name = 'piAgent' OR adapter_key = 'piAgent'
19+
`;
20+
21+
yield* sql`
22+
UPDATE projection_thread_sessions
23+
SET provider_name = 'codex'
24+
WHERE provider_name = 'piAgent'
25+
`;
26+
27+
yield* sql`
28+
UPDATE orchestration_events
29+
SET payload_json = json_set(payload_json, '$.provider', 'codex')
30+
WHERE json_extract(payload_json, '$.provider') = 'piAgent'
31+
`;
32+
33+
yield* sql`
34+
UPDATE orchestration_events
35+
SET metadata_json = json_set(metadata_json, '$.adapterKey', 'codex')
36+
WHERE json_extract(metadata_json, '$.adapterKey') = 'piAgent'
37+
`;
38+
});

‎apps/server/src/provider/Layers/ProviderSessionDirectory.test.ts‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,4 +204,29 @@ it.layer(makeDirectoryLayer(SqlitePersistenceMemory))("ProviderSessionDirectoryL
204204

205205
fs.rmSync(tempDir, { recursive: true, force: true });
206206
}));
207+
208+
it("maps legacy piAgent provider rows to codex on read", () =>
209+
Effect.gen(function* () {
210+
const directory = yield* ProviderSessionDirectory;
211+
const runtimeRepository = yield* ProviderSessionRuntimeRepository;
212+
const threadId = ThreadId.makeUnsafe("thread-legacy-provider");
213+
214+
yield* runtimeRepository.upsert({
215+
threadId,
216+
providerName: "piAgent",
217+
adapterKey: "piAgent",
218+
runtimeMode: "full-access",
219+
status: "stopped",
220+
lastSeenAt: new Date().toISOString(),
221+
resumeCursor: null,
222+
runtimePayload: null,
223+
});
224+
225+
const binding = yield* directory.getBinding(threadId);
226+
assertSome(binding, {
227+
threadId,
228+
provider: "codex",
229+
adapterKey: "codex",
230+
});
231+
}));
207232
});

‎apps/server/src/provider/Layers/ProviderSessionDirectory.ts‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@ import {
99
type ProviderSessionDirectoryShape,
1010
} from "../Services/ProviderSessionDirectory.ts";
1111

12+
function normalizePersistedProviderName(providerName: string): ProviderKind | undefined {
13+
if (providerName === "codex" || providerName === "claudeAgent") {
14+
return providerName;
15+
}
16+
if (providerName === "piAgent") {
17+
return "codex";
18+
}
19+
return undefined;
20+
}
21+
1222
function toPersistenceError(operation: string) {
1323
return (cause: unknown) =>
1424
new ProviderSessionDirectoryPersistenceError({
@@ -22,8 +32,9 @@ function decodeProviderKind(
2232
providerName: string,
2333
operation: string,
2434
): Effect.Effect<ProviderKind, ProviderSessionDirectoryPersistenceError> {
25-
if (providerName === "codex" || providerName === "claudeAgent") {
26-
return Effect.succeed(providerName);
35+
const normalizedProviderName = normalizePersistedProviderName(providerName);
36+
if (normalizedProviderName) {
37+
return Effect.succeed(normalizedProviderName);
2738
}
2839
return Effect.fail(
2940
new ProviderSessionDirectoryPersistenceError({
@@ -65,7 +76,7 @@ const makeProviderSessionDirectory = Effect.gen(function* () {
6576
Option.some({
6677
threadId: value.threadId,
6778
provider,
68-
adapterKey: value.adapterKey,
79+
adapterKey: normalizePersistedProviderName(value.adapterKey) ?? value.adapterKey,
6980
runtimeMode: value.runtimeMode,
7081
status: value.status,
7182
resumeCursor: value.resumeCursor,

0 commit comments

Comments
 (0)