Stop retrying unavailable thread subscriptions#18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tim-smart wants to merge 1 commit into from
Closed

Stop retrying unavailable thread subscriptions #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions apps/server/src/checkpointing/CheckpointDiffQuery.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -203,6 +204,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -287,6 +289,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -356,6 +359,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -410,6 +414,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,7 @@ describe("OrchestrationEngine", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
Layer.provide(
Expand Down
116 changes: 116 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { assert, it } from "@effect/vitest";
import * as NodeServices from "@effect/platform-node/NodeServices";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as SqlClient from "effect/unstable/sql/SqlClient";

import { SqlitePersistenceMemory } from "../../persistence/Layers/Sqlite.ts";
Expand DownExpand Up@@ -690,6 +691,121 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
}),
);

it.effect("reads thread lifecycle markers regardless of deleted/archived state", () =>
Effect.gen(function* () {
const snapshotQuery = yield* ProjectionSnapshotQuery;
const sql = yield* SqlClient.SqlClient;

yield* sql`DELETE FROM projection_threads`;

yield* sql`
INSERT INTO projection_threads (
thread_id,
project_id,
title,
model_selection_json,
runtime_mode,
interaction_mode,
branch,
worktree_path,
latest_turn_id,
latest_user_message_at,
pending_approval_count,
pending_user_input_count,
has_actionable_proposed_plan,
created_at,
updated_at,
archived_at,
deleted_at
)
VALUES
(
'thread-lifecycle-active',
'project-lifecycle-test',
'Active Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:02.000Z',
'2026-04-06T00:00:03.000Z',
NULL,
NULL
),
(
'thread-lifecycle-archived',
'project-lifecycle-test',
'Archived Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:04.000Z',
'2026-04-06T00:00:05.000Z',
'2026-04-06T00:00:06.000Z',
NULL
),
(
'thread-lifecycle-deleted',
'project-lifecycle-test',
'Deleted Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:07.000Z',
'2026-04-06T00:00:08.000Z',
NULL,
'2026-04-06T00:00:09.000Z'
)
`;

const active = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-active"),
);
assert.deepEqual(active, Option.some({ deletedAt: null, archivedAt: null }));

const archived = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-archived"),
);
assert.deepEqual(
archived,
Option.some({ deletedAt: null, archivedAt: "2026-04-06T00:00:06.000Z" }),
);

const deleted = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-deleted"),
);
assert.deepEqual(
deleted,
Option.some({ deletedAt: "2026-04-06T00:00:09.000Z", archivedAt: null }),
);

const missing = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-missing"),
);
assert.deepEqual(missing, Option.none());
}),
);

it.effect("keeps settled threads in the shell snapshot with non-null settlement fields", () =>
Effect.gen(function* () {
const snapshotQuery = yield* ProjectionSnapshotQuery;
Expand Down
30 changes: 30 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -790,6 +790,23 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
`,
});

const getThreadLifecycleRowById = SqlSchema.findOneOption({
Request: ThreadIdLookupInput,
Result: Schema.Struct({
deletedAt: Schema.NullOr(IsoDateTime),
archivedAt: Schema.NullOr(IsoDateTime),
}),
execute: ({ threadId }) =>
sql`
SELECT
deleted_at AS "deletedAt",
archived_at AS "archivedAt"
FROM projection_threads
WHERE thread_id = ${threadId}
LIMIT 1
`,
});

const listThreadMessageRowsByThread = SqlSchema.findAll({
Request: ThreadIdLookupInput,
Result: ProjectionThreadMessageDbRowSchema,
Expand DownExpand Up@@ -2129,6 +2146,18 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
),
);

const getThreadLifecycleById: ProjectionSnapshotQueryShape["getThreadLifecycleById"] = (
threadId,
) =>
getThreadLifecycleRowById({ threadId }).pipe(
Effect.mapError(
toPersistenceSqlOrDecodeError(
"ProjectionSnapshotQuery.getThreadLifecycleById:query",
"ProjectionSnapshotQuery.getThreadLifecycleById:decodeRow",
),
),
);

return {
getCommandReadModel,
getSnapshot,
Expand All@@ -2144,6 +2173,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
getSessionStopContextById,
getThreadShellById,
getThreadDetailById,
getThreadLifecycleById,
getThreadDetailSnapshot,
} satisfies ProjectionSnapshotQueryShape;
});
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/orchestration/Services/ProjectionSnapshotQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -186,6 +186,19 @@ export interface ProjectionSnapshotQueryShape {
readonly getThreadDetailSnapshot: (
threadId: ThreadId,
) => Effect.Effect<Option.Option<OrchestrationThreadDetailSnapshot>, ProjectionRepositoryError>;

/**
* Read a thread's lifecycle markers regardless of its deleted/archived
* state. Lets callers that got no active row distinguish a thread that was
* deleted or archived (permanent) from one whose projection row does not
* exist (possibly not projected yet).
*/
readonly getThreadLifecycleById: (
threadId: ThreadId,
) => Effect.Effect<
Option.Option<{ readonly deletedAt: string | null; readonly archivedAt: string | null }>,
ProjectionRepositoryError
>;
}

/**
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/project/ProjectSetupScriptRunner.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ const makeProjectionSnapshotQueryLayer = (project: OrchestrationProject) =>
getSessionStopContextById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
});

const makeTerminalManagerLayer = (
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/provider/Layers/ProviderSessionReaper.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,6 +213,7 @@ describe("ProviderSessionReaper", () => {
),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
),
Layer.provideMerge(NodeServices.layer),
Expand Down
52 changes: 52 additions & 0 deletions apps/server/src/server.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -722,6 +722,7 @@ const buildAppUnderTest = (options?: {
getThreadShellById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
getCounts: () => Effect.succeed({ projectCount: 0, threadCount: 0 }),
getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
Expand DownExpand Up@@ -5688,6 +5689,57 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect(
"fails a thread subscription as permanently deleted when the thread row is deleted",
() =>
Effect.gen(function* () {
yield* buildAppUnderTest({
layers: {
projectionSnapshotQuery: {
getThreadLifecycleById: () =>
Effect.succeed(
Option.some({ deletedAt: "2026-01-01T00:00:01.000Z", archivedAt: null }),
),
},
},
});

const wsUrl = yield* getWsServerUrl("/ws");
const result = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.subscribeThread]({
threadId: defaultThreadId,
}).pipe(Stream.runCollect),
).pipe(Effect.result),
);

assertTrue(result._tag === "Failure");
assertTrue(result.failure._tag === "OrchestrationGetSnapshotError");
assert.equal(result.failure.reason, "thread-deleted");
assert.equal(result.failure.message, `Thread ${defaultThreadId} was deleted`);
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("fails a thread subscription as retriable when no thread row exists yet", () =>
Effect.gen(function* () {
yield* buildAppUnderTest({});

const wsUrl = yield* getWsServerUrl("/ws");
const result = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.subscribeThread]({
threadId: defaultThreadId,
}).pipe(Stream.runCollect),
).pipe(Effect.result),
);

assertTrue(result._tag === "Failure");
assertTrue(result.failure._tag === "OrchestrationGetSnapshotError");
assert.equal(result.failure.reason, "thread-missing");
assert.equal(result.failure.message, `Thread ${defaultThreadId} was not found`);
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("buffers shell events published while the fallback snapshot loads", () =>
Effect.gen(function* () {
const liveEvents = yield* PubSub.unbounded<OrchestrationEvent>();
Expand Down
4 changes: 4 additions & 0 deletions apps/server/src/serverRuntimeStartup.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ it.effect("launchStartupHeartbeat does not block the caller while counts are loa
getThreadShellById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
Effect.provideService(AnalyticsService.AnalyticsService, {
record: () => Effect.void,
Expand DownExpand Up@@ -162,6 +163,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets returns existing project and threa
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand DownExpand Up@@ -207,6 +209,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets creates a project and thread when
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand DownExpand Up@@ -258,6 +261,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets preserves typed UUID generation fa
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand Down
24 changes: 22 additions & 2 deletions apps/server/src/ws.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1474,9 +1474,29 @@ const makeWsRpcLayer = (
);

if (Option.isNone(snapshot)) {
// Distinguish permanently unavailable threads from a row that
// may not be projected yet, so clients can stop resubscribing
// to deleted/archived threads instead of retrying forever.
const lifecycle = yield* projectionSnapshotQuery
.getThreadLifecycleById(input.threadId)
.pipe(Effect.orElseSucceed(() => Option.none()));
const reason = Option.match(lifecycle, {
onNone: () => "thread-missing" as const,
onSome: (row) =>
row.deletedAt !== null
? ("thread-deleted" as const)
: row.archivedAt !== null
? ("thread-archived" as const)
: ("thread-missing" as const),
});
return yield* new OrchestrationGetSnapshotError({
message: `Thread ${input.threadId} was not found`,
cause: input.threadId,
message:
reason === "thread-deleted"
? `Thread ${input.threadId} was deleted`
: reason === "thread-archived"
? `Thread ${input.threadId} is archived`
: `Thread ${input.threadId} was not found`,
reason,
});
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Stop retrying unavailable thread subscriptions#18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tim-smart wants to merge 1 commit into from
Closed

Stop retrying unavailable thread subscriptions #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions apps/server/src/checkpointing/CheckpointDiffQuery.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -203,6 +204,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -287,6 +289,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -356,6 +359,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -410,6 +414,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,7 @@ describe("OrchestrationEngine", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
Layer.provide(
Expand Down
116 changes: 116 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { assert, it } from "@effect/vitest";
import * as NodeServices from "@effect/platform-node/NodeServices";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as SqlClient from "effect/unstable/sql/SqlClient";

import { SqlitePersistenceMemory } from "../../persistence/Layers/Sqlite.ts";
Expand DownExpand Up@@ -690,6 +691,121 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
}),
);

it.effect("reads thread lifecycle markers regardless of deleted/archived state", () =>
Effect.gen(function* () {
const snapshotQuery = yield* ProjectionSnapshotQuery;
const sql = yield* SqlClient.SqlClient;

yield* sql`DELETE FROM projection_threads`;

yield* sql`
INSERT INTO projection_threads (
thread_id,
project_id,
title,
model_selection_json,
runtime_mode,
interaction_mode,
branch,
worktree_path,
latest_turn_id,
latest_user_message_at,
pending_approval_count,
pending_user_input_count,
has_actionable_proposed_plan,
created_at,
updated_at,
archived_at,
deleted_at
)
VALUES
(
'thread-lifecycle-active',
'project-lifecycle-test',
'Active Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:02.000Z',
'2026-04-06T00:00:03.000Z',
NULL,
NULL
),
(
'thread-lifecycle-archived',
'project-lifecycle-test',
'Archived Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:04.000Z',
'2026-04-06T00:00:05.000Z',
'2026-04-06T00:00:06.000Z',
NULL
),
(
'thread-lifecycle-deleted',
'project-lifecycle-test',
'Deleted Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:07.000Z',
'2026-04-06T00:00:08.000Z',
NULL,
'2026-04-06T00:00:09.000Z'
)
`;

const active = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-active"),
);
assert.deepEqual(active, Option.some({ deletedAt: null, archivedAt: null }));

const archived = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-archived"),
);
assert.deepEqual(
archived,
Option.some({ deletedAt: null, archivedAt: "2026-04-06T00:00:06.000Z" }),
);

const deleted = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-deleted"),
);
assert.deepEqual(
deleted,
Option.some({ deletedAt: "2026-04-06T00:00:09.000Z", archivedAt: null }),
);

const missing = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-missing"),
);
assert.deepEqual(missing, Option.none());
}),
);

it.effect("keeps settled threads in the shell snapshot with non-null settlement fields", () =>
Effect.gen(function* () {
const snapshotQuery = yield* ProjectionSnapshotQuery;
Expand Down
30 changes: 30 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -790,6 +790,23 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
`,
});

const getThreadLifecycleRowById = SqlSchema.findOneOption({
Request: ThreadIdLookupInput,
Result: Schema.Struct({
deletedAt: Schema.NullOr(IsoDateTime),
archivedAt: Schema.NullOr(IsoDateTime),
}),
execute: ({ threadId }) =>
sql`
SELECT
deleted_at AS "deletedAt",
archived_at AS "archivedAt"
FROM projection_threads
WHERE thread_id = ${threadId}
LIMIT 1
`,
});

const listThreadMessageRowsByThread = SqlSchema.findAll({
Request: ThreadIdLookupInput,
Result: ProjectionThreadMessageDbRowSchema,
Expand DownExpand Up@@ -2129,6 +2146,18 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
),
);

const getThreadLifecycleById: ProjectionSnapshotQueryShape["getThreadLifecycleById"] = (
threadId,
) =>
getThreadLifecycleRowById({ threadId }).pipe(
Effect.mapError(
toPersistenceSqlOrDecodeError(
"ProjectionSnapshotQuery.getThreadLifecycleById:query",
"ProjectionSnapshotQuery.getThreadLifecycleById:decodeRow",
),
),
);

return {
getCommandReadModel,
getSnapshot,
Expand All@@ -2144,6 +2173,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
getSessionStopContextById,
getThreadShellById,
getThreadDetailById,
getThreadLifecycleById,
getThreadDetailSnapshot,
} satisfies ProjectionSnapshotQueryShape;
});
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/orchestration/Services/ProjectionSnapshotQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -186,6 +186,19 @@ export interface ProjectionSnapshotQueryShape {
readonly getThreadDetailSnapshot: (
threadId: ThreadId,
) => Effect.Effect<Option.Option<OrchestrationThreadDetailSnapshot>, ProjectionRepositoryError>;

/**
* Read a thread's lifecycle markers regardless of its deleted/archived
* state. Lets callers that got no active row distinguish a thread that was
* deleted or archived (permanent) from one whose projection row does not
* exist (possibly not projected yet).
*/
readonly getThreadLifecycleById: (
threadId: ThreadId,
) => Effect.Effect<
Option.Option<{ readonly deletedAt: string | null; readonly archivedAt: string | null }>,
ProjectionRepositoryError
>;
}

/**
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/project/ProjectSetupScriptRunner.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ const makeProjectionSnapshotQueryLayer = (project: OrchestrationProject) =>
getSessionStopContextById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
});

const makeTerminalManagerLayer = (
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/provider/Layers/ProviderSessionReaper.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,6 +213,7 @@ describe("ProviderSessionReaper", () => {
),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
),
Layer.provideMerge(NodeServices.layer),
Expand Down
52 changes: 52 additions & 0 deletions apps/server/src/server.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -722,6 +722,7 @@ const buildAppUnderTest = (options?: {
getThreadShellById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
getCounts: () => Effect.succeed({ projectCount: 0, threadCount: 0 }),
getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
Expand DownExpand Up@@ -5688,6 +5689,57 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect(
"fails a thread subscription as permanently deleted when the thread row is deleted",
() =>
Effect.gen(function* () {
yield* buildAppUnderTest({
layers: {
projectionSnapshotQuery: {
getThreadLifecycleById: () =>
Effect.succeed(
Option.some({ deletedAt: "2026-01-01T00:00:01.000Z", archivedAt: null }),
),
},
},
});

const wsUrl = yield* getWsServerUrl("/ws");
const result = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.subscribeThread]({
threadId: defaultThreadId,
}).pipe(Stream.runCollect),
).pipe(Effect.result),
);

assertTrue(result._tag === "Failure");
assertTrue(result.failure._tag === "OrchestrationGetSnapshotError");
assert.equal(result.failure.reason, "thread-deleted");
assert.equal(result.failure.message, `Thread ${defaultThreadId} was deleted`);
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("fails a thread subscription as retriable when no thread row exists yet", () =>
Effect.gen(function* () {
yield* buildAppUnderTest({});

const wsUrl = yield* getWsServerUrl("/ws");
const result = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.subscribeThread]({
threadId: defaultThreadId,
}).pipe(Stream.runCollect),
).pipe(Effect.result),
);

assertTrue(result._tag === "Failure");
assertTrue(result.failure._tag === "OrchestrationGetSnapshotError");
assert.equal(result.failure.reason, "thread-missing");
assert.equal(result.failure.message, `Thread ${defaultThreadId} was not found`);
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("buffers shell events published while the fallback snapshot loads", () =>
Effect.gen(function* () {
const liveEvents = yield* PubSub.unbounded<OrchestrationEvent>();
Expand Down
4 changes: 4 additions & 0 deletions apps/server/src/serverRuntimeStartup.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ it.effect("launchStartupHeartbeat does not block the caller while counts are loa
getThreadShellById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
Effect.provideService(AnalyticsService.AnalyticsService, {
record: () => Effect.void,
Expand DownExpand Up@@ -162,6 +163,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets returns existing project and threa
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand DownExpand Up@@ -207,6 +209,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets creates a project and thread when
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand DownExpand Up@@ -258,6 +261,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets preserves typed UUID generation fa
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand Down
24 changes: 22 additions & 2 deletions apps/server/src/ws.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1474,9 +1474,29 @@ const makeWsRpcLayer = (
);

if (Option.isNone(snapshot)) {
// Distinguish permanently unavailable threads from a row that
// may not be projected yet, so clients can stop resubscribing
// to deleted/archived threads instead of retrying forever.
const lifecycle = yield* projectionSnapshotQuery
.getThreadLifecycleById(input.threadId)
.pipe(Effect.orElseSucceed(() => Option.none()));
const reason = Option.match(lifecycle, {
onNone: () => "thread-missing" as const,
onSome: (row) =>
row.deletedAt !== null
? ("thread-deleted" as const)
: row.archivedAt !== null
? ("thread-archived" as const)
: ("thread-missing" as const),
});
return yield* new OrchestrationGetSnapshotError({
message: `Thread ${input.threadId} was not found`,
cause: input.threadId,
message:
reason === "thread-deleted"
? `Thread ${input.threadId} was deleted`
: reason === "thread-archived"
? `Thread ${input.threadId} is archived`
: `Thread ${input.threadId} was not found`,
reason,
});
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Stop retrying unavailable thread subscriptions#18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tim-smart wants to merge 1 commit into from
Closed

Stop retrying unavailable thread subscriptions #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions apps/server/src/checkpointing/CheckpointDiffQuery.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -203,6 +204,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -287,6 +289,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -356,6 +359,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -410,6 +414,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,7 @@ describe("OrchestrationEngine", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
Layer.provide(
Expand Down
116 changes: 116 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { assert, it } from "@effect/vitest";
import * as NodeServices from "@effect/platform-node/NodeServices";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as SqlClient from "effect/unstable/sql/SqlClient";

import { SqlitePersistenceMemory } from "../../persistence/Layers/Sqlite.ts";
Expand DownExpand Up@@ -690,6 +691,121 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
}),
);

it.effect("reads thread lifecycle markers regardless of deleted/archived state", () =>
Effect.gen(function* () {
const snapshotQuery = yield* ProjectionSnapshotQuery;
const sql = yield* SqlClient.SqlClient;

yield* sql`DELETE FROM projection_threads`;

yield* sql`
INSERT INTO projection_threads (
thread_id,
project_id,
title,
model_selection_json,
runtime_mode,
interaction_mode,
branch,
worktree_path,
latest_turn_id,
latest_user_message_at,
pending_approval_count,
pending_user_input_count,
has_actionable_proposed_plan,
created_at,
updated_at,
archived_at,
deleted_at
)
VALUES
(
'thread-lifecycle-active',
'project-lifecycle-test',
'Active Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:02.000Z',
'2026-04-06T00:00:03.000Z',
NULL,
NULL
),
(
'thread-lifecycle-archived',
'project-lifecycle-test',
'Archived Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:04.000Z',
'2026-04-06T00:00:05.000Z',
'2026-04-06T00:00:06.000Z',
NULL
),
(
'thread-lifecycle-deleted',
'project-lifecycle-test',
'Deleted Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:07.000Z',
'2026-04-06T00:00:08.000Z',
NULL,
'2026-04-06T00:00:09.000Z'
)
`;

const active = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-active"),
);
assert.deepEqual(active, Option.some({ deletedAt: null, archivedAt: null }));

const archived = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-archived"),
);
assert.deepEqual(
archived,
Option.some({ deletedAt: null, archivedAt: "2026-04-06T00:00:06.000Z" }),
);

const deleted = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-deleted"),
);
assert.deepEqual(
deleted,
Option.some({ deletedAt: "2026-04-06T00:00:09.000Z", archivedAt: null }),
);

const missing = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-missing"),
);
assert.deepEqual(missing, Option.none());
}),
);

it.effect("keeps settled threads in the shell snapshot with non-null settlement fields", () =>
Effect.gen(function* () {
const snapshotQuery = yield* ProjectionSnapshotQuery;
Expand Down
30 changes: 30 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -790,6 +790,23 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
`,
});

const getThreadLifecycleRowById = SqlSchema.findOneOption({
Request: ThreadIdLookupInput,
Result: Schema.Struct({
deletedAt: Schema.NullOr(IsoDateTime),
archivedAt: Schema.NullOr(IsoDateTime),
}),
execute: ({ threadId }) =>
sql`
SELECT
deleted_at AS "deletedAt",
archived_at AS "archivedAt"
FROM projection_threads
WHERE thread_id = ${threadId}
LIMIT 1
`,
});

const listThreadMessageRowsByThread = SqlSchema.findAll({
Request: ThreadIdLookupInput,
Result: ProjectionThreadMessageDbRowSchema,
Expand DownExpand Up@@ -2129,6 +2146,18 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
),
);

const getThreadLifecycleById: ProjectionSnapshotQueryShape["getThreadLifecycleById"] = (
threadId,
) =>
getThreadLifecycleRowById({ threadId }).pipe(
Effect.mapError(
toPersistenceSqlOrDecodeError(
"ProjectionSnapshotQuery.getThreadLifecycleById:query",
"ProjectionSnapshotQuery.getThreadLifecycleById:decodeRow",
),
),
);

return {
getCommandReadModel,
getSnapshot,
Expand All@@ -2144,6 +2173,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
getSessionStopContextById,
getThreadShellById,
getThreadDetailById,
getThreadLifecycleById,
getThreadDetailSnapshot,
} satisfies ProjectionSnapshotQueryShape;
});
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/orchestration/Services/ProjectionSnapshotQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -186,6 +186,19 @@ export interface ProjectionSnapshotQueryShape {
readonly getThreadDetailSnapshot: (
threadId: ThreadId,
) => Effect.Effect<Option.Option<OrchestrationThreadDetailSnapshot>, ProjectionRepositoryError>;

/**
* Read a thread's lifecycle markers regardless of its deleted/archived
* state. Lets callers that got no active row distinguish a thread that was
* deleted or archived (permanent) from one whose projection row does not
* exist (possibly not projected yet).
*/
readonly getThreadLifecycleById: (
threadId: ThreadId,
) => Effect.Effect<
Option.Option<{ readonly deletedAt: string | null; readonly archivedAt: string | null }>,
ProjectionRepositoryError
>;
}

/**
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/project/ProjectSetupScriptRunner.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ const makeProjectionSnapshotQueryLayer = (project: OrchestrationProject) =>
getSessionStopContextById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
});

const makeTerminalManagerLayer = (
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/provider/Layers/ProviderSessionReaper.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,6 +213,7 @@ describe("ProviderSessionReaper", () => {
),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
),
Layer.provideMerge(NodeServices.layer),
Expand Down
52 changes: 52 additions & 0 deletions apps/server/src/server.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -722,6 +722,7 @@ const buildAppUnderTest = (options?: {
getThreadShellById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
getCounts: () => Effect.succeed({ projectCount: 0, threadCount: 0 }),
getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
Expand DownExpand Up@@ -5688,6 +5689,57 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect(
"fails a thread subscription as permanently deleted when the thread row is deleted",
() =>
Effect.gen(function* () {
yield* buildAppUnderTest({
layers: {
projectionSnapshotQuery: {
getThreadLifecycleById: () =>
Effect.succeed(
Option.some({ deletedAt: "2026-01-01T00:00:01.000Z", archivedAt: null }),
),
},
},
});

const wsUrl = yield* getWsServerUrl("/ws");
const result = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.subscribeThread]({
threadId: defaultThreadId,
}).pipe(Stream.runCollect),
).pipe(Effect.result),
);

assertTrue(result._tag === "Failure");
assertTrue(result.failure._tag === "OrchestrationGetSnapshotError");
assert.equal(result.failure.reason, "thread-deleted");
assert.equal(result.failure.message, `Thread ${defaultThreadId} was deleted`);
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("fails a thread subscription as retriable when no thread row exists yet", () =>
Effect.gen(function* () {
yield* buildAppUnderTest({});

const wsUrl = yield* getWsServerUrl("/ws");
const result = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.subscribeThread]({
threadId: defaultThreadId,
}).pipe(Stream.runCollect),
).pipe(Effect.result),
);

assertTrue(result._tag === "Failure");
assertTrue(result.failure._tag === "OrchestrationGetSnapshotError");
assert.equal(result.failure.reason, "thread-missing");
assert.equal(result.failure.message, `Thread ${defaultThreadId} was not found`);
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("buffers shell events published while the fallback snapshot loads", () =>
Effect.gen(function* () {
const liveEvents = yield* PubSub.unbounded<OrchestrationEvent>();
Expand Down
4 changes: 4 additions & 0 deletions apps/server/src/serverRuntimeStartup.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ it.effect("launchStartupHeartbeat does not block the caller while counts are loa
getThreadShellById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
Effect.provideService(AnalyticsService.AnalyticsService, {
record: () => Effect.void,
Expand DownExpand Up@@ -162,6 +163,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets returns existing project and threa
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand DownExpand Up@@ -207,6 +209,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets creates a project and thread when
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand DownExpand Up@@ -258,6 +261,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets preserves typed UUID generation fa
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand Down
24 changes: 22 additions & 2 deletions apps/server/src/ws.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1474,9 +1474,29 @@ const makeWsRpcLayer = (
);

if (Option.isNone(snapshot)) {
// Distinguish permanently unavailable threads from a row that
// may not be projected yet, so clients can stop resubscribing
// to deleted/archived threads instead of retrying forever.
const lifecycle = yield* projectionSnapshotQuery
.getThreadLifecycleById(input.threadId)
.pipe(Effect.orElseSucceed(() => Option.none()));
const reason = Option.match(lifecycle, {
onNone: () => "thread-missing" as const,
onSome: (row) =>
row.deletedAt !== null
? ("thread-deleted" as const)
: row.archivedAt !== null
? ("thread-archived" as const)
: ("thread-missing" as const),
});
return yield* new OrchestrationGetSnapshotError({
message: `Thread ${input.threadId} was not found`,
cause: input.threadId,
message:
reason === "thread-deleted"
? `Thread ${input.threadId} was deleted`
: reason === "thread-archived"
? `Thread ${input.threadId} is archived`
: `Thread ${input.threadId} was not found`,
reason,
});
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Stop retrying unavailable thread subscriptions#18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tim-smart wants to merge 1 commit into from
Closed

Stop retrying unavailable thread subscriptions #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions apps/server/src/checkpointing/CheckpointDiffQuery.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -203,6 +204,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -287,6 +289,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -356,6 +359,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -410,6 +414,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,7 @@ describe("OrchestrationEngine", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
Layer.provide(
Expand Down
116 changes: 116 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { assert, it } from "@effect/vitest";
import * as NodeServices from "@effect/platform-node/NodeServices";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as SqlClient from "effect/unstable/sql/SqlClient";

import { SqlitePersistenceMemory } from "../../persistence/Layers/Sqlite.ts";
Expand DownExpand Up@@ -690,6 +691,121 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
}),
);

it.effect("reads thread lifecycle markers regardless of deleted/archived state", () =>
Effect.gen(function* () {
const snapshotQuery = yield* ProjectionSnapshotQuery;
const sql = yield* SqlClient.SqlClient;

yield* sql`DELETE FROM projection_threads`;

yield* sql`
INSERT INTO projection_threads (
thread_id,
project_id,
title,
model_selection_json,
runtime_mode,
interaction_mode,
branch,
worktree_path,
latest_turn_id,
latest_user_message_at,
pending_approval_count,
pending_user_input_count,
has_actionable_proposed_plan,
created_at,
updated_at,
archived_at,
deleted_at
)
VALUES
(
'thread-lifecycle-active',
'project-lifecycle-test',
'Active Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:02.000Z',
'2026-04-06T00:00:03.000Z',
NULL,
NULL
),
(
'thread-lifecycle-archived',
'project-lifecycle-test',
'Archived Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:04.000Z',
'2026-04-06T00:00:05.000Z',
'2026-04-06T00:00:06.000Z',
NULL
),
(
'thread-lifecycle-deleted',
'project-lifecycle-test',
'Deleted Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:07.000Z',
'2026-04-06T00:00:08.000Z',
NULL,
'2026-04-06T00:00:09.000Z'
)
`;

const active = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-active"),
);
assert.deepEqual(active, Option.some({ deletedAt: null, archivedAt: null }));

const archived = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-archived"),
);
assert.deepEqual(
archived,
Option.some({ deletedAt: null, archivedAt: "2026-04-06T00:00:06.000Z" }),
);

const deleted = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-deleted"),
);
assert.deepEqual(
deleted,
Option.some({ deletedAt: "2026-04-06T00:00:09.000Z", archivedAt: null }),
);

const missing = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-missing"),
);
assert.deepEqual(missing, Option.none());
}),
);

it.effect("keeps settled threads in the shell snapshot with non-null settlement fields", () =>
Effect.gen(function* () {
const snapshotQuery = yield* ProjectionSnapshotQuery;
Expand Down
30 changes: 30 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -790,6 +790,23 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
`,
});

const getThreadLifecycleRowById = SqlSchema.findOneOption({
Request: ThreadIdLookupInput,
Result: Schema.Struct({
deletedAt: Schema.NullOr(IsoDateTime),
archivedAt: Schema.NullOr(IsoDateTime),
}),
execute: ({ threadId }) =>
sql`
SELECT
deleted_at AS "deletedAt",
archived_at AS "archivedAt"
FROM projection_threads
WHERE thread_id = ${threadId}
LIMIT 1
`,
});

const listThreadMessageRowsByThread = SqlSchema.findAll({
Request: ThreadIdLookupInput,
Result: ProjectionThreadMessageDbRowSchema,
Expand DownExpand Up@@ -2129,6 +2146,18 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
),
);

const getThreadLifecycleById: ProjectionSnapshotQueryShape["getThreadLifecycleById"] = (
threadId,
) =>
getThreadLifecycleRowById({ threadId }).pipe(
Effect.mapError(
toPersistenceSqlOrDecodeError(
"ProjectionSnapshotQuery.getThreadLifecycleById:query",
"ProjectionSnapshotQuery.getThreadLifecycleById:decodeRow",
),
),
);

return {
getCommandReadModel,
getSnapshot,
Expand All@@ -2144,6 +2173,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
getSessionStopContextById,
getThreadShellById,
getThreadDetailById,
getThreadLifecycleById,
getThreadDetailSnapshot,
} satisfies ProjectionSnapshotQueryShape;
});
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/orchestration/Services/ProjectionSnapshotQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -186,6 +186,19 @@ export interface ProjectionSnapshotQueryShape {
readonly getThreadDetailSnapshot: (
threadId: ThreadId,
) => Effect.Effect<Option.Option<OrchestrationThreadDetailSnapshot>, ProjectionRepositoryError>;

/**
* Read a thread's lifecycle markers regardless of its deleted/archived
* state. Lets callers that got no active row distinguish a thread that was
* deleted or archived (permanent) from one whose projection row does not
* exist (possibly not projected yet).
*/
readonly getThreadLifecycleById: (
threadId: ThreadId,
) => Effect.Effect<
Option.Option<{ readonly deletedAt: string | null; readonly archivedAt: string | null }>,
ProjectionRepositoryError
>;
}

/**
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/project/ProjectSetupScriptRunner.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ const makeProjectionSnapshotQueryLayer = (project: OrchestrationProject) =>
getSessionStopContextById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
});

const makeTerminalManagerLayer = (
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/provider/Layers/ProviderSessionReaper.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,6 +213,7 @@ describe("ProviderSessionReaper", () => {
),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
),
Layer.provideMerge(NodeServices.layer),
Expand Down
52 changes: 52 additions & 0 deletions apps/server/src/server.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -722,6 +722,7 @@ const buildAppUnderTest = (options?: {
getThreadShellById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
getCounts: () => Effect.succeed({ projectCount: 0, threadCount: 0 }),
getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
Expand DownExpand Up@@ -5688,6 +5689,57 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect(
"fails a thread subscription as permanently deleted when the thread row is deleted",
() =>
Effect.gen(function* () {
yield* buildAppUnderTest({
layers: {
projectionSnapshotQuery: {
getThreadLifecycleById: () =>
Effect.succeed(
Option.some({ deletedAt: "2026-01-01T00:00:01.000Z", archivedAt: null }),
),
},
},
});

const wsUrl = yield* getWsServerUrl("/ws");
const result = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.subscribeThread]({
threadId: defaultThreadId,
}).pipe(Stream.runCollect),
).pipe(Effect.result),
);

assertTrue(result._tag === "Failure");
assertTrue(result.failure._tag === "OrchestrationGetSnapshotError");
assert.equal(result.failure.reason, "thread-deleted");
assert.equal(result.failure.message, `Thread ${defaultThreadId} was deleted`);
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("fails a thread subscription as retriable when no thread row exists yet", () =>
Effect.gen(function* () {
yield* buildAppUnderTest({});

const wsUrl = yield* getWsServerUrl("/ws");
const result = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.subscribeThread]({
threadId: defaultThreadId,
}).pipe(Stream.runCollect),
).pipe(Effect.result),
);

assertTrue(result._tag === "Failure");
assertTrue(result.failure._tag === "OrchestrationGetSnapshotError");
assert.equal(result.failure.reason, "thread-missing");
assert.equal(result.failure.message, `Thread ${defaultThreadId} was not found`);
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("buffers shell events published while the fallback snapshot loads", () =>
Effect.gen(function* () {
const liveEvents = yield* PubSub.unbounded<OrchestrationEvent>();
Expand Down
4 changes: 4 additions & 0 deletions apps/server/src/serverRuntimeStartup.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ it.effect("launchStartupHeartbeat does not block the caller while counts are loa
getThreadShellById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
Effect.provideService(AnalyticsService.AnalyticsService, {
record: () => Effect.void,
Expand DownExpand Up@@ -162,6 +163,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets returns existing project and threa
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand DownExpand Up@@ -207,6 +209,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets creates a project and thread when
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand DownExpand Up@@ -258,6 +261,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets preserves typed UUID generation fa
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand Down
24 changes: 22 additions & 2 deletions apps/server/src/ws.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1474,9 +1474,29 @@ const makeWsRpcLayer = (
);

if (Option.isNone(snapshot)) {
// Distinguish permanently unavailable threads from a row that
// may not be projected yet, so clients can stop resubscribing
// to deleted/archived threads instead of retrying forever.
const lifecycle = yield* projectionSnapshotQuery
.getThreadLifecycleById(input.threadId)
.pipe(Effect.orElseSucceed(() => Option.none()));
const reason = Option.match(lifecycle, {
onNone: () => "thread-missing" as const,
onSome: (row) =>
row.deletedAt !== null
? ("thread-deleted" as const)
: row.archivedAt !== null
? ("thread-archived" as const)
: ("thread-missing" as const),
});
return yield* new OrchestrationGetSnapshotError({
message: `Thread ${input.threadId} was not found`,
cause: input.threadId,
message:
reason === "thread-deleted"
? `Thread ${input.threadId} was deleted`
: reason === "thread-archived"
? `Thread ${input.threadId} is archived`
: `Thread ${input.threadId} was not found`,
reason,
});
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Stop retrying unavailable thread subscriptions#18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tim-smart wants to merge 1 commit into from
Closed

Stop retrying unavailable thread subscriptions #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions apps/server/src/checkpointing/CheckpointDiffQuery.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -203,6 +204,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -287,6 +289,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -356,6 +359,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -410,6 +414,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,7 @@ describe("OrchestrationEngine", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
Layer.provide(
Expand Down
116 changes: 116 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { assert, it } from "@effect/vitest";
import * as NodeServices from "@effect/platform-node/NodeServices";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as SqlClient from "effect/unstable/sql/SqlClient";

import { SqlitePersistenceMemory } from "../../persistence/Layers/Sqlite.ts";
Expand DownExpand Up@@ -690,6 +691,121 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
}),
);

it.effect("reads thread lifecycle markers regardless of deleted/archived state", () =>
Effect.gen(function* () {
const snapshotQuery = yield* ProjectionSnapshotQuery;
const sql = yield* SqlClient.SqlClient;

yield* sql`DELETE FROM projection_threads`;

yield* sql`
INSERT INTO projection_threads (
thread_id,
project_id,
title,
model_selection_json,
runtime_mode,
interaction_mode,
branch,
worktree_path,
latest_turn_id,
latest_user_message_at,
pending_approval_count,
pending_user_input_count,
has_actionable_proposed_plan,
created_at,
updated_at,
archived_at,
deleted_at
)
VALUES
(
'thread-lifecycle-active',
'project-lifecycle-test',
'Active Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:02.000Z',
'2026-04-06T00:00:03.000Z',
NULL,
NULL
),
(
'thread-lifecycle-archived',
'project-lifecycle-test',
'Archived Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:04.000Z',
'2026-04-06T00:00:05.000Z',
'2026-04-06T00:00:06.000Z',
NULL
),
(
'thread-lifecycle-deleted',
'project-lifecycle-test',
'Deleted Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:07.000Z',
'2026-04-06T00:00:08.000Z',
NULL,
'2026-04-06T00:00:09.000Z'
)
`;

const active = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-active"),
);
assert.deepEqual(active, Option.some({ deletedAt: null, archivedAt: null }));

const archived = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-archived"),
);
assert.deepEqual(
archived,
Option.some({ deletedAt: null, archivedAt: "2026-04-06T00:00:06.000Z" }),
);

const deleted = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-deleted"),
);
assert.deepEqual(
deleted,
Option.some({ deletedAt: "2026-04-06T00:00:09.000Z", archivedAt: null }),
);

const missing = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-missing"),
);
assert.deepEqual(missing, Option.none());
}),
);

it.effect("keeps settled threads in the shell snapshot with non-null settlement fields", () =>
Effect.gen(function* () {
const snapshotQuery = yield* ProjectionSnapshotQuery;
Expand Down
30 changes: 30 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -790,6 +790,23 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
`,
});

const getThreadLifecycleRowById = SqlSchema.findOneOption({
Request: ThreadIdLookupInput,
Result: Schema.Struct({
deletedAt: Schema.NullOr(IsoDateTime),
archivedAt: Schema.NullOr(IsoDateTime),
}),
execute: ({ threadId }) =>
sql`
SELECT
deleted_at AS "deletedAt",
archived_at AS "archivedAt"
FROM projection_threads
WHERE thread_id = ${threadId}
LIMIT 1
`,
});

const listThreadMessageRowsByThread = SqlSchema.findAll({
Request: ThreadIdLookupInput,
Result: ProjectionThreadMessageDbRowSchema,
Expand DownExpand Up@@ -2129,6 +2146,18 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
),
);

const getThreadLifecycleById: ProjectionSnapshotQueryShape["getThreadLifecycleById"] = (
threadId,
) =>
getThreadLifecycleRowById({ threadId }).pipe(
Effect.mapError(
toPersistenceSqlOrDecodeError(
"ProjectionSnapshotQuery.getThreadLifecycleById:query",
"ProjectionSnapshotQuery.getThreadLifecycleById:decodeRow",
),
),
);

return {
getCommandReadModel,
getSnapshot,
Expand All@@ -2144,6 +2173,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
getSessionStopContextById,
getThreadShellById,
getThreadDetailById,
getThreadLifecycleById,
getThreadDetailSnapshot,
} satisfies ProjectionSnapshotQueryShape;
});
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/orchestration/Services/ProjectionSnapshotQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -186,6 +186,19 @@ export interface ProjectionSnapshotQueryShape {
readonly getThreadDetailSnapshot: (
threadId: ThreadId,
) => Effect.Effect<Option.Option<OrchestrationThreadDetailSnapshot>, ProjectionRepositoryError>;

/**
* Read a thread's lifecycle markers regardless of its deleted/archived
* state. Lets callers that got no active row distinguish a thread that was
* deleted or archived (permanent) from one whose projection row does not
* exist (possibly not projected yet).
*/
readonly getThreadLifecycleById: (
threadId: ThreadId,
) => Effect.Effect<
Option.Option<{ readonly deletedAt: string | null; readonly archivedAt: string | null }>,
ProjectionRepositoryError
>;
}

/**
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/project/ProjectSetupScriptRunner.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ const makeProjectionSnapshotQueryLayer = (project: OrchestrationProject) =>
getSessionStopContextById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
});

const makeTerminalManagerLayer = (
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/provider/Layers/ProviderSessionReaper.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,6 +213,7 @@ describe("ProviderSessionReaper", () => {
),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
),
Layer.provideMerge(NodeServices.layer),
Expand Down
52 changes: 52 additions & 0 deletions apps/server/src/server.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -722,6 +722,7 @@ const buildAppUnderTest = (options?: {
getThreadShellById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
getCounts: () => Effect.succeed({ projectCount: 0, threadCount: 0 }),
getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
Expand DownExpand Up@@ -5688,6 +5689,57 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect(
"fails a thread subscription as permanently deleted when the thread row is deleted",
() =>
Effect.gen(function* () {
yield* buildAppUnderTest({
layers: {
projectionSnapshotQuery: {
getThreadLifecycleById: () =>
Effect.succeed(
Option.some({ deletedAt: "2026-01-01T00:00:01.000Z", archivedAt: null }),
),
},
},
});

const wsUrl = yield* getWsServerUrl("/ws");
const result = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.subscribeThread]({
threadId: defaultThreadId,
}).pipe(Stream.runCollect),
).pipe(Effect.result),
);

assertTrue(result._tag === "Failure");
assertTrue(result.failure._tag === "OrchestrationGetSnapshotError");
assert.equal(result.failure.reason, "thread-deleted");
assert.equal(result.failure.message, `Thread ${defaultThreadId} was deleted`);
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("fails a thread subscription as retriable when no thread row exists yet", () =>
Effect.gen(function* () {
yield* buildAppUnderTest({});

const wsUrl = yield* getWsServerUrl("/ws");
const result = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.subscribeThread]({
threadId: defaultThreadId,
}).pipe(Stream.runCollect),
).pipe(Effect.result),
);

assertTrue(result._tag === "Failure");
assertTrue(result.failure._tag === "OrchestrationGetSnapshotError");
assert.equal(result.failure.reason, "thread-missing");
assert.equal(result.failure.message, `Thread ${defaultThreadId} was not found`);
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("buffers shell events published while the fallback snapshot loads", () =>
Effect.gen(function* () {
const liveEvents = yield* PubSub.unbounded<OrchestrationEvent>();
Expand Down
4 changes: 4 additions & 0 deletions apps/server/src/serverRuntimeStartup.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ it.effect("launchStartupHeartbeat does not block the caller while counts are loa
getThreadShellById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
Effect.provideService(AnalyticsService.AnalyticsService, {
record: () => Effect.void,
Expand DownExpand Up@@ -162,6 +163,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets returns existing project and threa
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand DownExpand Up@@ -207,6 +209,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets creates a project and thread when
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand DownExpand Up@@ -258,6 +261,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets preserves typed UUID generation fa
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand Down
24 changes: 22 additions & 2 deletions apps/server/src/ws.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1474,9 +1474,29 @@ const makeWsRpcLayer = (
);

if (Option.isNone(snapshot)) {
// Distinguish permanently unavailable threads from a row that
// may not be projected yet, so clients can stop resubscribing
// to deleted/archived threads instead of retrying forever.
const lifecycle = yield* projectionSnapshotQuery
.getThreadLifecycleById(input.threadId)
.pipe(Effect.orElseSucceed(() => Option.none()));
const reason = Option.match(lifecycle, {
onNone: () => "thread-missing" as const,
onSome: (row) =>
row.deletedAt !== null
? ("thread-deleted" as const)
: row.archivedAt !== null
? ("thread-archived" as const)
: ("thread-missing" as const),
});
return yield* new OrchestrationGetSnapshotError({
message: `Thread ${input.threadId} was not found`,
cause: input.threadId,
message:
reason === "thread-deleted"
? `Thread ${input.threadId} was deleted`
: reason === "thread-archived"
? `Thread ${input.threadId} is archived`
: `Thread ${input.threadId} was not found`,
reason,
});
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Stop retrying unavailable thread subscriptions#18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tim-smart wants to merge 1 commit into from
Closed

Stop retrying unavailable thread subscriptions #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions apps/server/src/checkpointing/CheckpointDiffQuery.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -203,6 +204,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -287,6 +289,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -356,6 +359,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -410,6 +414,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,7 @@ describe("OrchestrationEngine", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
Layer.provide(
Expand Down
116 changes: 116 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { assert, it } from "@effect/vitest";
import * as NodeServices from "@effect/platform-node/NodeServices";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as SqlClient from "effect/unstable/sql/SqlClient";

import { SqlitePersistenceMemory } from "../../persistence/Layers/Sqlite.ts";
Expand DownExpand Up@@ -690,6 +691,121 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
}),
);

it.effect("reads thread lifecycle markers regardless of deleted/archived state", () =>
Effect.gen(function* () {
const snapshotQuery = yield* ProjectionSnapshotQuery;
const sql = yield* SqlClient.SqlClient;

yield* sql`DELETE FROM projection_threads`;

yield* sql`
INSERT INTO projection_threads (
thread_id,
project_id,
title,
model_selection_json,
runtime_mode,
interaction_mode,
branch,
worktree_path,
latest_turn_id,
latest_user_message_at,
pending_approval_count,
pending_user_input_count,
has_actionable_proposed_plan,
created_at,
updated_at,
archived_at,
deleted_at
)
VALUES
(
'thread-lifecycle-active',
'project-lifecycle-test',
'Active Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:02.000Z',
'2026-04-06T00:00:03.000Z',
NULL,
NULL
),
(
'thread-lifecycle-archived',
'project-lifecycle-test',
'Archived Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:04.000Z',
'2026-04-06T00:00:05.000Z',
'2026-04-06T00:00:06.000Z',
NULL
),
(
'thread-lifecycle-deleted',
'project-lifecycle-test',
'Deleted Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:07.000Z',
'2026-04-06T00:00:08.000Z',
NULL,
'2026-04-06T00:00:09.000Z'
)
`;

const active = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-active"),
);
assert.deepEqual(active, Option.some({ deletedAt: null, archivedAt: null }));

const archived = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-archived"),
);
assert.deepEqual(
archived,
Option.some({ deletedAt: null, archivedAt: "2026-04-06T00:00:06.000Z" }),
);

const deleted = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-deleted"),
);
assert.deepEqual(
deleted,
Option.some({ deletedAt: "2026-04-06T00:00:09.000Z", archivedAt: null }),
);

const missing = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-missing"),
);
assert.deepEqual(missing, Option.none());
}),
);

it.effect("keeps settled threads in the shell snapshot with non-null settlement fields", () =>
Effect.gen(function* () {
const snapshotQuery = yield* ProjectionSnapshotQuery;
Expand Down
30 changes: 30 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -790,6 +790,23 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
`,
});

const getThreadLifecycleRowById = SqlSchema.findOneOption({
Request: ThreadIdLookupInput,
Result: Schema.Struct({
deletedAt: Schema.NullOr(IsoDateTime),
archivedAt: Schema.NullOr(IsoDateTime),
}),
execute: ({ threadId }) =>
sql`
SELECT
deleted_at AS "deletedAt",
archived_at AS "archivedAt"
FROM projection_threads
WHERE thread_id = ${threadId}
LIMIT 1
`,
});

const listThreadMessageRowsByThread = SqlSchema.findAll({
Request: ThreadIdLookupInput,
Result: ProjectionThreadMessageDbRowSchema,
Expand DownExpand Up@@ -2129,6 +2146,18 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
),
);

const getThreadLifecycleById: ProjectionSnapshotQueryShape["getThreadLifecycleById"] = (
threadId,
) =>
getThreadLifecycleRowById({ threadId }).pipe(
Effect.mapError(
toPersistenceSqlOrDecodeError(
"ProjectionSnapshotQuery.getThreadLifecycleById:query",
"ProjectionSnapshotQuery.getThreadLifecycleById:decodeRow",
),
),
);

return {
getCommandReadModel,
getSnapshot,
Expand All@@ -2144,6 +2173,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
getSessionStopContextById,
getThreadShellById,
getThreadDetailById,
getThreadLifecycleById,
getThreadDetailSnapshot,
} satisfies ProjectionSnapshotQueryShape;
});
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/orchestration/Services/ProjectionSnapshotQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -186,6 +186,19 @@ export interface ProjectionSnapshotQueryShape {
readonly getThreadDetailSnapshot: (
threadId: ThreadId,
) => Effect.Effect<Option.Option<OrchestrationThreadDetailSnapshot>, ProjectionRepositoryError>;

/**
* Read a thread's lifecycle markers regardless of its deleted/archived
* state. Lets callers that got no active row distinguish a thread that was
* deleted or archived (permanent) from one whose projection row does not
* exist (possibly not projected yet).
*/
readonly getThreadLifecycleById: (
threadId: ThreadId,
) => Effect.Effect<
Option.Option<{ readonly deletedAt: string | null; readonly archivedAt: string | null }>,
ProjectionRepositoryError
>;
}

/**
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/project/ProjectSetupScriptRunner.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ const makeProjectionSnapshotQueryLayer = (project: OrchestrationProject) =>
getSessionStopContextById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
});

const makeTerminalManagerLayer = (
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/provider/Layers/ProviderSessionReaper.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,6 +213,7 @@ describe("ProviderSessionReaper", () => {
),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
),
Layer.provideMerge(NodeServices.layer),
Expand Down
52 changes: 52 additions & 0 deletions apps/server/src/server.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -722,6 +722,7 @@ const buildAppUnderTest = (options?: {
getThreadShellById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
getCounts: () => Effect.succeed({ projectCount: 0, threadCount: 0 }),
getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
Expand DownExpand Up@@ -5688,6 +5689,57 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect(
"fails a thread subscription as permanently deleted when the thread row is deleted",
() =>
Effect.gen(function* () {
yield* buildAppUnderTest({
layers: {
projectionSnapshotQuery: {
getThreadLifecycleById: () =>
Effect.succeed(
Option.some({ deletedAt: "2026-01-01T00:00:01.000Z", archivedAt: null }),
),
},
},
});

const wsUrl = yield* getWsServerUrl("/ws");
const result = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.subscribeThread]({
threadId: defaultThreadId,
}).pipe(Stream.runCollect),
).pipe(Effect.result),
);

assertTrue(result._tag === "Failure");
assertTrue(result.failure._tag === "OrchestrationGetSnapshotError");
assert.equal(result.failure.reason, "thread-deleted");
assert.equal(result.failure.message, `Thread ${defaultThreadId} was deleted`);
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("fails a thread subscription as retriable when no thread row exists yet", () =>
Effect.gen(function* () {
yield* buildAppUnderTest({});

const wsUrl = yield* getWsServerUrl("/ws");
const result = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.subscribeThread]({
threadId: defaultThreadId,
}).pipe(Stream.runCollect),
).pipe(Effect.result),
);

assertTrue(result._tag === "Failure");
assertTrue(result.failure._tag === "OrchestrationGetSnapshotError");
assert.equal(result.failure.reason, "thread-missing");
assert.equal(result.failure.message, `Thread ${defaultThreadId} was not found`);
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("buffers shell events published while the fallback snapshot loads", () =>
Effect.gen(function* () {
const liveEvents = yield* PubSub.unbounded<OrchestrationEvent>();
Expand Down
4 changes: 4 additions & 0 deletions apps/server/src/serverRuntimeStartup.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ it.effect("launchStartupHeartbeat does not block the caller while counts are loa
getThreadShellById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
Effect.provideService(AnalyticsService.AnalyticsService, {
record: () => Effect.void,
Expand DownExpand Up@@ -162,6 +163,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets returns existing project and threa
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand DownExpand Up@@ -207,6 +209,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets creates a project and thread when
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand DownExpand Up@@ -258,6 +261,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets preserves typed UUID generation fa
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand Down
24 changes: 22 additions & 2 deletions apps/server/src/ws.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1474,9 +1474,29 @@ const makeWsRpcLayer = (
);

if (Option.isNone(snapshot)) {
// Distinguish permanently unavailable threads from a row that
// may not be projected yet, so clients can stop resubscribing
// to deleted/archived threads instead of retrying forever.
const lifecycle = yield* projectionSnapshotQuery
.getThreadLifecycleById(input.threadId)
.pipe(Effect.orElseSucceed(() => Option.none()));
const reason = Option.match(lifecycle, {
onNone: () => "thread-missing" as const,
onSome: (row) =>
row.deletedAt !== null
? ("thread-deleted" as const)
: row.archivedAt !== null
? ("thread-archived" as const)
: ("thread-missing" as const),
});
return yield* new OrchestrationGetSnapshotError({
message: `Thread ${input.threadId} was not found`,
cause: input.threadId,
message:
reason === "thread-deleted"
? `Thread ${input.threadId} was deleted`
: reason === "thread-archived"
? `Thread ${input.threadId} is archived`
: `Thread ${input.threadId} was not found`,
reason,
});
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Stop retrying unavailable thread subscriptions#18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tim-smart wants to merge 1 commit into from
Closed

Stop retrying unavailable thread subscriptions #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions apps/server/src/checkpointing/CheckpointDiffQuery.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -203,6 +204,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -287,6 +289,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -356,6 +359,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -410,6 +414,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,7 @@ describe("OrchestrationEngine", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
Layer.provide(
Expand Down
116 changes: 116 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { assert, it } from "@effect/vitest";
import * as NodeServices from "@effect/platform-node/NodeServices";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as SqlClient from "effect/unstable/sql/SqlClient";

import { SqlitePersistenceMemory } from "../../persistence/Layers/Sqlite.ts";
Expand DownExpand Up@@ -690,6 +691,121 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
}),
);

it.effect("reads thread lifecycle markers regardless of deleted/archived state", () =>
Effect.gen(function* () {
const snapshotQuery = yield* ProjectionSnapshotQuery;
const sql = yield* SqlClient.SqlClient;

yield* sql`DELETE FROM projection_threads`;

yield* sql`
INSERT INTO projection_threads (
thread_id,
project_id,
title,
model_selection_json,
runtime_mode,
interaction_mode,
branch,
worktree_path,
latest_turn_id,
latest_user_message_at,
pending_approval_count,
pending_user_input_count,
has_actionable_proposed_plan,
created_at,
updated_at,
archived_at,
deleted_at
)
VALUES
(
'thread-lifecycle-active',
'project-lifecycle-test',
'Active Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:02.000Z',
'2026-04-06T00:00:03.000Z',
NULL,
NULL
),
(
'thread-lifecycle-archived',
'project-lifecycle-test',
'Archived Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:04.000Z',
'2026-04-06T00:00:05.000Z',
'2026-04-06T00:00:06.000Z',
NULL
),
(
'thread-lifecycle-deleted',
'project-lifecycle-test',
'Deleted Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:07.000Z',
'2026-04-06T00:00:08.000Z',
NULL,
'2026-04-06T00:00:09.000Z'
)
`;

const active = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-active"),
);
assert.deepEqual(active, Option.some({ deletedAt: null, archivedAt: null }));

const archived = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-archived"),
);
assert.deepEqual(
archived,
Option.some({ deletedAt: null, archivedAt: "2026-04-06T00:00:06.000Z" }),
);

const deleted = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-deleted"),
);
assert.deepEqual(
deleted,
Option.some({ deletedAt: "2026-04-06T00:00:09.000Z", archivedAt: null }),
);

const missing = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-missing"),
);
assert.deepEqual(missing, Option.none());
}),
);

it.effect("keeps settled threads in the shell snapshot with non-null settlement fields", () =>
Effect.gen(function* () {
const snapshotQuery = yield* ProjectionSnapshotQuery;
Expand Down
30 changes: 30 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -790,6 +790,23 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
`,
});

const getThreadLifecycleRowById = SqlSchema.findOneOption({
Request: ThreadIdLookupInput,
Result: Schema.Struct({
deletedAt: Schema.NullOr(IsoDateTime),
archivedAt: Schema.NullOr(IsoDateTime),
}),
execute: ({ threadId }) =>
sql`
SELECT
deleted_at AS "deletedAt",
archived_at AS "archivedAt"
FROM projection_threads
WHERE thread_id = ${threadId}
LIMIT 1
`,
});

const listThreadMessageRowsByThread = SqlSchema.findAll({
Request: ThreadIdLookupInput,
Result: ProjectionThreadMessageDbRowSchema,
Expand DownExpand Up@@ -2129,6 +2146,18 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
),
);

const getThreadLifecycleById: ProjectionSnapshotQueryShape["getThreadLifecycleById"] = (
threadId,
) =>
getThreadLifecycleRowById({ threadId }).pipe(
Effect.mapError(
toPersistenceSqlOrDecodeError(
"ProjectionSnapshotQuery.getThreadLifecycleById:query",
"ProjectionSnapshotQuery.getThreadLifecycleById:decodeRow",
),
),
);

return {
getCommandReadModel,
getSnapshot,
Expand All@@ -2144,6 +2173,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
getSessionStopContextById,
getThreadShellById,
getThreadDetailById,
getThreadLifecycleById,
getThreadDetailSnapshot,
} satisfies ProjectionSnapshotQueryShape;
});
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/orchestration/Services/ProjectionSnapshotQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -186,6 +186,19 @@ export interface ProjectionSnapshotQueryShape {
readonly getThreadDetailSnapshot: (
threadId: ThreadId,
) => Effect.Effect<Option.Option<OrchestrationThreadDetailSnapshot>, ProjectionRepositoryError>;

/**
* Read a thread's lifecycle markers regardless of its deleted/archived
* state. Lets callers that got no active row distinguish a thread that was
* deleted or archived (permanent) from one whose projection row does not
* exist (possibly not projected yet).
*/
readonly getThreadLifecycleById: (
threadId: ThreadId,
) => Effect.Effect<
Option.Option<{ readonly deletedAt: string | null; readonly archivedAt: string | null }>,
ProjectionRepositoryError
>;
}

/**
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/project/ProjectSetupScriptRunner.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ const makeProjectionSnapshotQueryLayer = (project: OrchestrationProject) =>
getSessionStopContextById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
});

const makeTerminalManagerLayer = (
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/provider/Layers/ProviderSessionReaper.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,6 +213,7 @@ describe("ProviderSessionReaper", () => {
),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
),
Layer.provideMerge(NodeServices.layer),
Expand Down
52 changes: 52 additions & 0 deletions apps/server/src/server.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -722,6 +722,7 @@ const buildAppUnderTest = (options?: {
getThreadShellById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
getCounts: () => Effect.succeed({ projectCount: 0, threadCount: 0 }),
getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
Expand DownExpand Up@@ -5688,6 +5689,57 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect(
"fails a thread subscription as permanently deleted when the thread row is deleted",
() =>
Effect.gen(function* () {
yield* buildAppUnderTest({
layers: {
projectionSnapshotQuery: {
getThreadLifecycleById: () =>
Effect.succeed(
Option.some({ deletedAt: "2026-01-01T00:00:01.000Z", archivedAt: null }),
),
},
},
});

const wsUrl = yield* getWsServerUrl("/ws");
const result = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.subscribeThread]({
threadId: defaultThreadId,
}).pipe(Stream.runCollect),
).pipe(Effect.result),
);

assertTrue(result._tag === "Failure");
assertTrue(result.failure._tag === "OrchestrationGetSnapshotError");
assert.equal(result.failure.reason, "thread-deleted");
assert.equal(result.failure.message, `Thread ${defaultThreadId} was deleted`);
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("fails a thread subscription as retriable when no thread row exists yet", () =>
Effect.gen(function* () {
yield* buildAppUnderTest({});

const wsUrl = yield* getWsServerUrl("/ws");
const result = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.subscribeThread]({
threadId: defaultThreadId,
}).pipe(Stream.runCollect),
).pipe(Effect.result),
);

assertTrue(result._tag === "Failure");
assertTrue(result.failure._tag === "OrchestrationGetSnapshotError");
assert.equal(result.failure.reason, "thread-missing");
assert.equal(result.failure.message, `Thread ${defaultThreadId} was not found`);
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("buffers shell events published while the fallback snapshot loads", () =>
Effect.gen(function* () {
const liveEvents = yield* PubSub.unbounded<OrchestrationEvent>();
Expand Down
4 changes: 4 additions & 0 deletions apps/server/src/serverRuntimeStartup.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ it.effect("launchStartupHeartbeat does not block the caller while counts are loa
getThreadShellById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
Effect.provideService(AnalyticsService.AnalyticsService, {
record: () => Effect.void,
Expand DownExpand Up@@ -162,6 +163,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets returns existing project and threa
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand DownExpand Up@@ -207,6 +209,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets creates a project and thread when
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand DownExpand Up@@ -258,6 +261,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets preserves typed UUID generation fa
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand Down
24 changes: 22 additions & 2 deletions apps/server/src/ws.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1474,9 +1474,29 @@ const makeWsRpcLayer = (
);

if (Option.isNone(snapshot)) {
// Distinguish permanently unavailable threads from a row that
// may not be projected yet, so clients can stop resubscribing
// to deleted/archived threads instead of retrying forever.
const lifecycle = yield* projectionSnapshotQuery
.getThreadLifecycleById(input.threadId)
.pipe(Effect.orElseSucceed(() => Option.none()));
const reason = Option.match(lifecycle, {
onNone: () => "thread-missing" as const,
onSome: (row) =>
row.deletedAt !== null
? ("thread-deleted" as const)
: row.archivedAt !== null
? ("thread-archived" as const)
: ("thread-missing" as const),
});
return yield* new OrchestrationGetSnapshotError({
message: `Thread ${input.threadId} was not found`,
cause: input.threadId,
message:
reason === "thread-deleted"
? `Thread ${input.threadId} was deleted`
: reason === "thread-archived"
? `Thread ${input.threadId} is archived`
: `Thread ${input.threadId} was not found`,
reason,
});
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Stop retrying unavailable thread subscriptions#18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tim-smart wants to merge 1 commit into from
Closed

Stop retrying unavailable thread subscriptions #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions apps/server/src/checkpointing/CheckpointDiffQuery.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -203,6 +204,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -287,6 +289,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -356,6 +359,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand DownExpand Up@@ -410,6 +414,7 @@ describe("CheckpointDiffQuery.layer", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
);
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,7 @@ describe("OrchestrationEngine", () => {
getSessionStopContextById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
),
Layer.provide(
Expand Down
116 changes: 116 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { assert, it } from "@effect/vitest";
import * as NodeServices from "@effect/platform-node/NodeServices";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as SqlClient from "effect/unstable/sql/SqlClient";

import { SqlitePersistenceMemory } from "../../persistence/Layers/Sqlite.ts";
Expand DownExpand Up@@ -690,6 +691,121 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
}),
);

it.effect("reads thread lifecycle markers regardless of deleted/archived state", () =>
Effect.gen(function* () {
const snapshotQuery = yield* ProjectionSnapshotQuery;
const sql = yield* SqlClient.SqlClient;

yield* sql`DELETE FROM projection_threads`;

yield* sql`
INSERT INTO projection_threads (
thread_id,
project_id,
title,
model_selection_json,
runtime_mode,
interaction_mode,
branch,
worktree_path,
latest_turn_id,
latest_user_message_at,
pending_approval_count,
pending_user_input_count,
has_actionable_proposed_plan,
created_at,
updated_at,
archived_at,
deleted_at
)
VALUES
(
'thread-lifecycle-active',
'project-lifecycle-test',
'Active Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:02.000Z',
'2026-04-06T00:00:03.000Z',
NULL,
NULL
),
(
'thread-lifecycle-archived',
'project-lifecycle-test',
'Archived Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:04.000Z',
'2026-04-06T00:00:05.000Z',
'2026-04-06T00:00:06.000Z',
NULL
),
(
'thread-lifecycle-deleted',
'project-lifecycle-test',
'Deleted Thread',
'{"provider":"codex","model":"gpt-5-codex"}',
'full-access',
'default',
NULL,
NULL,
NULL,
NULL,
0,
0,
0,
'2026-04-06T00:00:07.000Z',
'2026-04-06T00:00:08.000Z',
NULL,
'2026-04-06T00:00:09.000Z'
)
`;

const active = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-active"),
);
assert.deepEqual(active, Option.some({ deletedAt: null, archivedAt: null }));

const archived = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-archived"),
);
assert.deepEqual(
archived,
Option.some({ deletedAt: null, archivedAt: "2026-04-06T00:00:06.000Z" }),
);

const deleted = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-deleted"),
);
assert.deepEqual(
deleted,
Option.some({ deletedAt: "2026-04-06T00:00:09.000Z", archivedAt: null }),
);

const missing = yield* snapshotQuery.getThreadLifecycleById(
ThreadId.make("thread-lifecycle-missing"),
);
assert.deepEqual(missing, Option.none());
}),
);

it.effect("keeps settled threads in the shell snapshot with non-null settlement fields", () =>
Effect.gen(function* () {
const snapshotQuery = yield* ProjectionSnapshotQuery;
Expand Down
30 changes: 30 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -790,6 +790,23 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
`,
});

const getThreadLifecycleRowById = SqlSchema.findOneOption({
Request: ThreadIdLookupInput,
Result: Schema.Struct({
deletedAt: Schema.NullOr(IsoDateTime),
archivedAt: Schema.NullOr(IsoDateTime),
}),
execute: ({ threadId }) =>
sql`
SELECT
deleted_at AS "deletedAt",
archived_at AS "archivedAt"
FROM projection_threads
WHERE thread_id = ${threadId}
LIMIT 1
`,
});

const listThreadMessageRowsByThread = SqlSchema.findAll({
Request: ThreadIdLookupInput,
Result: ProjectionThreadMessageDbRowSchema,
Expand DownExpand Up@@ -2129,6 +2146,18 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
),
);

const getThreadLifecycleById: ProjectionSnapshotQueryShape["getThreadLifecycleById"] = (
threadId,
) =>
getThreadLifecycleRowById({ threadId }).pipe(
Effect.mapError(
toPersistenceSqlOrDecodeError(
"ProjectionSnapshotQuery.getThreadLifecycleById:query",
"ProjectionSnapshotQuery.getThreadLifecycleById:decodeRow",
),
),
);

return {
getCommandReadModel,
getSnapshot,
Expand All@@ -2144,6 +2173,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
getSessionStopContextById,
getThreadShellById,
getThreadDetailById,
getThreadLifecycleById,
getThreadDetailSnapshot,
} satisfies ProjectionSnapshotQueryShape;
});
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/orchestration/Services/ProjectionSnapshotQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -186,6 +186,19 @@ export interface ProjectionSnapshotQueryShape {
readonly getThreadDetailSnapshot: (
threadId: ThreadId,
) => Effect.Effect<Option.Option<OrchestrationThreadDetailSnapshot>, ProjectionRepositoryError>;

/**
* Read a thread's lifecycle markers regardless of its deleted/archived
* state. Lets callers that got no active row distinguish a thread that was
* deleted or archived (permanent) from one whose projection row does not
* exist (possibly not projected yet).
*/
readonly getThreadLifecycleById: (
threadId: ThreadId,
) => Effect.Effect<
Option.Option<{ readonly deletedAt: string | null; readonly archivedAt: string | null }>,
ProjectionRepositoryError
>;
}

/**
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/project/ProjectSetupScriptRunner.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ const makeProjectionSnapshotQueryLayer = (project: OrchestrationProject) =>
getSessionStopContextById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
});

const makeTerminalManagerLayer = (
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/provider/Layers/ProviderSessionReaper.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,6 +213,7 @@ describe("ProviderSessionReaper", () => {
),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
),
Layer.provideMerge(NodeServices.layer),
Expand Down
52 changes: 52 additions & 0 deletions apps/server/src/server.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -722,6 +722,7 @@ const buildAppUnderTest = (options?: {
getThreadShellById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
getCounts: () => Effect.succeed({ projectCount: 0, threadCount: 0 }),
getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
Expand DownExpand Up@@ -5688,6 +5689,57 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect(
"fails a thread subscription as permanently deleted when the thread row is deleted",
() =>
Effect.gen(function* () {
yield* buildAppUnderTest({
layers: {
projectionSnapshotQuery: {
getThreadLifecycleById: () =>
Effect.succeed(
Option.some({ deletedAt: "2026-01-01T00:00:01.000Z", archivedAt: null }),
),
},
},
});

const wsUrl = yield* getWsServerUrl("/ws");
const result = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.subscribeThread]({
threadId: defaultThreadId,
}).pipe(Stream.runCollect),
).pipe(Effect.result),
);

assertTrue(result._tag === "Failure");
assertTrue(result.failure._tag === "OrchestrationGetSnapshotError");
assert.equal(result.failure.reason, "thread-deleted");
assert.equal(result.failure.message, `Thread ${defaultThreadId} was deleted`);
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("fails a thread subscription as retriable when no thread row exists yet", () =>
Effect.gen(function* () {
yield* buildAppUnderTest({});

const wsUrl = yield* getWsServerUrl("/ws");
const result = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.subscribeThread]({
threadId: defaultThreadId,
}).pipe(Stream.runCollect),
).pipe(Effect.result),
);

assertTrue(result._tag === "Failure");
assertTrue(result.failure._tag === "OrchestrationGetSnapshotError");
assert.equal(result.failure.reason, "thread-missing");
assert.equal(result.failure.message, `Thread ${defaultThreadId} was not found`);
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("buffers shell events published while the fallback snapshot loads", () =>
Effect.gen(function* () {
const liveEvents = yield* PubSub.unbounded<OrchestrationEvent>();
Expand Down
4 changes: 4 additions & 0 deletions apps/server/src/serverRuntimeStartup.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ it.effect("launchStartupHeartbeat does not block the caller while counts are loa
getThreadShellById: () => Effect.succeed(Option.none()),
getThreadDetailById: () => Effect.succeed(Option.none()),
getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
getThreadLifecycleById: () => Effect.succeed(Option.none()),
}),
Effect.provideService(AnalyticsService.AnalyticsService, {
record: () => Effect.void,
Expand DownExpand Up@@ -162,6 +163,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets returns existing project and threa
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand DownExpand Up@@ -207,6 +209,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets creates a project and thread when
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand DownExpand Up@@ -258,6 +261,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets preserves typed UUID generation fa
getThreadShellById: () => Effect.die("unused"),
getThreadDetailById: () => Effect.die("unused"),
getThreadDetailSnapshot: () => Effect.die("unused"),
getThreadLifecycleById: () => Effect.die("unused"),
}),
Effect.provideService(OrchestrationEngine.OrchestrationEngineService, {
readEvents: () => Stream.empty,
Expand Down
24 changes: 22 additions & 2 deletions apps/server/src/ws.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1474,9 +1474,29 @@ const makeWsRpcLayer = (
);

if (Option.isNone(snapshot)) {
// Distinguish permanently unavailable threads from a row that
// may not be projected yet, so clients can stop resubscribing
// to deleted/archived threads instead of retrying forever.
const lifecycle = yield* projectionSnapshotQuery
.getThreadLifecycleById(input.threadId)
.pipe(Effect.orElseSucceed(() => Option.none()));
const reason = Option.match(lifecycle, {
onNone: () => "thread-missing" as const,
onSome: (row) =>
row.deletedAt !== null
? ("thread-deleted" as const)
: row.archivedAt !== null
? ("thread-archived" as const)
: ("thread-missing" as const),
});
return yield* new OrchestrationGetSnapshotError({
message: `Thread ${input.threadId} was not found`,
cause: input.threadId,
message:
reason === "thread-deleted"
? `Thread ${input.threadId} was deleted`
: reason === "thread-archived"
? `Thread ${input.threadId} is archived`
: `Thread ${input.threadId} was not found`,
reason,
});
}

Expand Down
Loading
Loading