Skip to content

Commit 0b02e54

Browse files
author
gmackie
committed
Merge pull request 'fix(server): T3CODE-8 bound shell provider-session lookups' (pingdotgg#26) from fix/T3CODE-8-shell-session-query into custom-local
2 parents 88c2d7b + d43cbea commit 0b02e54

4 files changed

Lines changed: 173 additions & 3 deletions

File tree

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Shell provider session CI
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- custom-local
7+
paths:
8+
- apps/server/src/orchestration-v2/ProjectionStore*
9+
- apps/server/src/orchestration-v2/ThreadPullRequestService*
10+
- apps/server/tsconfig.shell-provider-session.json
11+
- .forgejo/workflows/shell-provider-session-ci.yml
12+
- pnpm-lock.yaml
13+
- pnpm-workspace.yaml
14+
workflow_dispatch:
15+
16+
permissions:
17+
contents: read
18+
19+
jobs:
20+
shell-provider-session:
21+
runs-on: forgegraph-ci
22+
timeout-minutes: 20
23+
steps:
24+
- uses: actions/checkout@v4
25+
- uses: actions/setup-node@v4
26+
with:
27+
node-version: 24.14.0
28+
- name: Install pinned dependencies
29+
run: |
30+
corepack enable
31+
corepack prepare [email protected] --activate
32+
pnpm install --frozen-lockfile
33+
- name: Verify shell provider session lookup
34+
run: |
35+
pnpm exec vp test run apps/server/src/orchestration-v2/ProjectionStore.providerSessionLookup.test.ts apps/server/src/orchestration-v2/ProjectionStore.test.ts apps/server/src/orchestration-v2/ThreadPullRequestService.test.ts
36+
pnpm exec tsc --noEmit --project apps/server/tsconfig.shell-provider-session.json
37+
pnpm exec vp lint apps/server/src/orchestration-v2/ProjectionStore.ts apps/server/src/orchestration-v2/ProjectionStore.providerSessionLookup.test.ts
38+
pnpm exec vp fmt --check apps/server/src/orchestration-v2/ProjectionStore.ts apps/server/src/orchestration-v2/ProjectionStore.providerSessionLookup.test.ts apps/server/tsconfig.shell-provider-session.json .forgejo/workflows/shell-provider-session-ci.yml
Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
import { assert, it } from "@effect/vitest";
2+
import {
3+
EventId,
4+
ProjectId,
5+
ProviderInstanceId,
6+
ThreadId,
7+
type OrchestrationV2AppThread,
8+
} from "@t3tools/contracts";
9+
import * as DateTime from "effect/DateTime";
10+
import * as Effect from "effect/Effect";
11+
import * as Layer from "effect/Layer";
12+
import * as Tracer from "effect/Tracer";
13+
import * as Schema from "effect/Schema";
14+
import * as SqlClient from "effect/sql/SqlClient";
15+
import * as Persistence from "../persistence/Layers/Sqlite.ts";
16+
import * as ProjectionStore from "./ProjectionStore.ts";
17+
18+
const encodeSessionError = Schema.encodeSync(
19+
Schema.fromJsonString(Schema.Struct({ lastError: Schema.String })),
20+
);
21+
22+
const layer = ProjectionStore.layer.pipe(Layer.provideMerge(Persistence.layerMemory));
23+
24+
it.effect(
25+
"starts shell error lookups from thread bindings while preserving latest matching sessions",
26+
() =>
27+
Effect.gen(function* () {
28+
const store = yield* ProjectionStore.ProjectionStoreV2;
29+
const sql = yield* SqlClient.SqlClient;
30+
const now = yield* DateTime.now;
31+
const provider = ProviderInstanceId.make("codex");
32+
const threadIds = ["first", "shared", "unbound"].map((name) =>
33+
ThreadId.make(`thread:session-lookup:${name}`),
34+
);
35+
for (const id of threadIds) {
36+
const payload: OrchestrationV2AppThread = {
37+
createdBy: "user",
38+
creationSource: "web",
39+
id,
40+
projectId: ProjectId.make("project:session-lookup"),
41+
title: "Session lookup",
42+
providerInstanceId: provider,
43+
modelSelection: { instanceId: provider, model: "gpt-5.4" },
44+
runtimeMode: "full-access",
45+
interactionMode: "default",
46+
branch: null,
47+
worktreePath: null,
48+
activeProviderThreadId: null,
49+
lineage: { parentThreadId: null, relationshipToParent: null, rootThreadId: id },
50+
forkedFrom: null,
51+
createdAt: now,
52+
updatedAt: now,
53+
archivedAt: null,
54+
settledOverride: null,
55+
settledAt: null,
56+
lastVisitedAt: null,
57+
deletedAt: null,
58+
};
59+
yield* store.apply({
60+
id: EventId.make(`event:session-lookup:${id}`),
61+
type: "thread.created",
62+
threadId: id,
63+
occurredAt: now,
64+
payload,
65+
});
66+
}
67+
const sessions = [
68+
{ id: "old", provider: "codex", updated: "2026-01-01", error: "old error" },
69+
{ id: "tie-a", provider: "codex", updated: "2026-01-02", error: "tie a" },
70+
{ id: "tie-z", provider: "codex", updated: "2026-01-02", error: "latest matching" },
71+
{
72+
id: "wrong-provider",
73+
provider: "claude",
74+
updated: "2026-01-03",
75+
error: "wrong provider",
76+
},
77+
{ id: "unbound-newest", provider: "codex", updated: "2026-01-04", error: "unbound" },
78+
];
79+
for (const session of sessions) {
80+
yield* sql`INSERT INTO orchestration_v2_projection_provider_sessions
81+
(provider_session_id, provider, provider_instance_id, status, updated_at, payload_json)
82+
VALUES (${session.id}, ${session.provider}, ${session.provider}, 'error', ${session.updated}, ${encodeSessionError({ lastError: session.error })})`;
83+
if (session.id !== "unbound-newest") {
84+
yield* sql`INSERT INTO orchestration_v2_projection_provider_session_bindings VALUES (${session.id}, ${threadIds[0]})`;
85+
}
86+
}
87+
yield* sql`INSERT INTO orchestration_v2_projection_provider_session_bindings VALUES ('tie-z', ${threadIds[1]})`;
88+
let shellQuery: string | undefined;
89+
const tracer = Tracer.make({
90+
span(options) {
91+
const span = new Tracer.NativeSpan(options);
92+
const end = span.end.bind(span);
93+
span.end = (time, exit) => {
94+
end(time, exit);
95+
const query = span.attributes.get("db.query.text");
96+
if (typeof query === "string" && query.includes("AS last_error")) shellQuery = query;
97+
};
98+
return span;
99+
},
100+
});
101+
const shell = yield* store.getShellSnapshot().pipe(Effect.withTracer(tracer));
102+
assert.deepEqual(
103+
shell.threads.map((thread) => thread.lastError),
104+
["latest matching", "latest matching", null],
105+
);
106+
assert.isDefined(shellQuery);
107+
const plan = yield* sql.unsafe<{ detail: string }>(`EXPLAIN QUERY PLAN ${shellQuery}`);
108+
assert.isTrue(
109+
plan.some((row) =>
110+
row.detail.includes(
111+
"SEARCH binding USING INDEX orchestration_v2_projection_provider_session_bindings_thread_idx",
112+
),
113+
),
114+
);
115+
assert.isFalse(
116+
plan.some((row) =>
117+
row.detail.includes(
118+
"SEARCH session USING INDEX orchestration_v2_projection_provider_sessions_instance_status_idx",
119+
),
120+
),
121+
);
122+
}).pipe(Effect.provide(layer)),
123+
);

‎apps/server/src/orchestration-v2/ProjectionStore.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4953,9 +4953,11 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
49534953
) AS activity_run_started_at,
49544954
(
49554955
SELECT json_extract(session.payload_json, '$.lastError')
4956-
FROM orchestration_v2_projection_provider_sessions session
4957-
INNER JOIN orchestration_v2_projection_provider_session_bindings binding
4958-
ON binding.provider_session_id = session.provider_session_id
4956+
-- Keep the thread binding first: provider-wide session scans
4957+
-- repeat for every thread and hold the snapshot transaction.
4958+
FROM orchestration_v2_projection_provider_session_bindings binding
4959+
CROSS JOIN orchestration_v2_projection_provider_sessions session
4960+
ON session.provider_session_id = binding.provider_session_id
49594961
WHERE binding.thread_id = t.thread_id
49604962
AND session.provider_instance_id = t.provider_instance_id
49614963
ORDER BY session.updated_at DESC, session.provider_session_id DESC
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"extends": "./tsconfig.json",
3+
"include": [
4+
"src/orchestration-v2/ProjectionStore.ts",
5+
"src/orchestration-v2/ProjectionStore.providerSessionLookup.test.ts"
6+
]
7+
}

0 commit comments

Comments
 (0)