fix(threads): preserve auto-title matching after prompt formatting

Author: maria-rcks

apps/server/src/bootstrap.test.ts

@@ -132,7 +132,7 @@ it.layer(NodeServices.layer)("readBootstrapEnvelope", (it) => {
       const duplicatedFdPath = resolveFdPath(fd);
       assert.notStrictEqual(duplicatedFdPath, undefined);
       const closeSyncSpy = vi.spyOn(NFS, "closeSync");
-      bootstrapFsInterceptor.failCreateReadStreamForDuplicatedPath = duplicatedFdPath;
+      bootstrapFsInterceptor.failCreateReadStreamForDuplicatedPath = duplicatedFdPath ?? null;
 
       try {
         const payload = yield* readBootstrapEnvelope(TestEnvelopeSchema, fd, { timeoutMs: 100 });

apps/server/src/git/Layers/GitCore.test.ts

@@ -415,8 +415,9 @@ it.layer(TestLayer)("git integration", (it) => {
 
     it.effect("refreshes upstream behind count after checkout when remote branch advanced", () =>
       Effect.gen(function* () {
-        const services = yield* Effect.services();
-        const runPromise = Effect.runPromiseWith(services);
+        const runPromise = yield* Effect.withFiber((fiber) =>
+          Effect.succeed(Effect.runPromiseWith(fiber.services)),
+        );
 
         const remote = yield* makeTmpDir();
         const source = yield* makeTmpDir();

apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts

@@ -425,6 +425,58 @@ describe("ProviderCommandReactor", () => {
     expect(thread?.title).toBe("Keep this custom title");
   });
 
+  it("matches the client-seeded title even when the outgoing prompt is reformatted", async () => {
+    const harness = await createHarness();
+    const now = new Date().toISOString();
+    const seededTitle = "Fix reconnect spinner on resume";
+    harness.generateThreadTitle.mockReturnValue(
+      Effect.succeed({
+        title: "Reconnect spinner resume bug",
+      }),
+    );
+
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.meta.update",
+        commandId: CommandId.makeUnsafe("cmd-thread-title-formatted-seed"),
+        threadId: ThreadId.makeUnsafe("thread-1"),
+        title: seededTitle,
+      }),
+    );
+
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.turn.start",
+        commandId: CommandId.makeUnsafe("cmd-turn-start-title-formatted"),
+        threadId: ThreadId.makeUnsafe("thread-1"),
+        message: {
+          messageId: asMessageId("user-message-title-formatted"),
+          role: "user",
+          text: "[effort:high]\\n\\nFix reconnect spinner on resume",
+          attachments: [],
+        },
+        titleSeed: seededTitle,
+        textGenerationModel: "gpt-5.4-mini",
+        interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
+        runtimeMode: "approval-required",
+        createdAt: now,
+      }),
+    );
+
+    await waitFor(() => harness.generateThreadTitle.mock.calls.length === 1);
+    await waitFor(async () => {
+      const readModel = await Effect.runPromise(harness.engine.getReadModel());
+      return (
+        readModel.threads.find((entry) => entry.id === ThreadId.makeUnsafe("thread-1"))?.title ===
+        "Reconnect spinner resume bug"
+      );
+    });
+
+    const readModel = await Effect.runPromise(harness.engine.getReadModel());
+    const thread = readModel.threads.find((entry) => entry.id === ThreadId.makeUnsafe("thread-1"));
+    expect(thread?.title).toBe("Reconnect spinner resume bug");
+  });
+
   it("reuses the text generation model for automatic worktree branch naming", async () => {
     const harness = await createHarness();
     const now = new Date().toISOString();

apps/server/src/orchestration/Layers/ProviderCommandReactor.ts

@@ -79,8 +79,16 @@ const DEFAULT_THREAD_TITLE = "New thread";
 function buildReplaceableThreadTitles(input: {
   readonly messageText: string;
   readonly attachments?: ReadonlyArray<ChatAttachment>;
+  readonly titleSeed?: string;
 }): ReadonlySet<string> {
   const titles = new Set<string>([DEFAULT_THREAD_TITLE]);
+  const trimmedTitleSeed = input.titleSeed?.trim();
+
+  if (trimmedTitleSeed) {
+    titles.add(trimmedTitleSeed);
+    return titles;
+  }
+
   const trimmedMessage = input.messageText.trim();
 
   if (trimmedMessage.length > 0) {
@@ -101,6 +109,7 @@ function isReplaceableThreadTitle(
   input: {
     readonly messageText: string;
     readonly attachments?: ReadonlyArray<ChatAttachment>;
+    readonly titleSeed?: string;
   },
 ): boolean {
   return buildReplaceableThreadTitles(input).has(currentTitle.trim());
@@ -565,6 +574,7 @@ const make = Effect.gen(function* () {
       const generationInput = {
         messageText: message.text,
         ...(message.attachments !== undefined ? { attachments: message.attachments } : {}),
+        ...(event.payload.titleSeed !== undefined ? { titleSeed: event.payload.titleSeed } : {}),
         ...(event.payload.textGenerationModel !== undefined
           ? { textGenerationModel: event.payload.textGenerationModel }
           : {}),

apps/server/src/orchestration/decider.ts

@@ -377,6 +377,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
           ...(command.modelSelection !== undefined
             ? { modelSelection: command.modelSelection }
             : {}),
+          ...(command.titleSeed !== undefined ? { titleSeed: command.titleSeed } : {}),
           ...(command.textGenerationModel !== undefined
             ? { textGenerationModel: command.textGenerationModel }
             : {}),

apps/server/src/persistence/NodeSqliteClient.ts

@@ -20,7 +20,7 @@ import * as Stream from "effect/Stream";
 import * as Reactivity from "effect/unstable/reactivity/Reactivity";
 import * as Client from "effect/unstable/sql/SqlClient";
 import type { Connection } from "effect/unstable/sql/SqlConnection";
-import { SqlError, classifySqliteError } from "effect/unstable/sql/SqlError";
+import { SqlError } from "effect/unstable/sql/SqlError";
 import * as Statement from "effect/unstable/sql/Statement";
 
 const ATTR_DB_SYSTEM_NAME = "db.system.name";
@@ -29,8 +29,11 @@ export const TypeId: TypeId = "~local/sqlite-node/SqliteClient";
 
 export type TypeId = "~local/sqlite-node/SqliteClient";
 
-const classifyError = (cause: unknown, message: string, operation: string) =>
-  classifySqliteError(cause, { message, operation });
+const sqlError = (cause: unknown, message: string) =>
+  new SqlError({
+    cause,
+    message,
+  });
 
 /**
  * SqliteClient - Effect service tag for the sqlite SQL client.
@@ -112,10 +115,7 @@ const makeWithDatabase = (
         lookup: (sql: string) =>
           Effect.try({
             try: () => db.prepare(sql),
-            catch: (cause) =>
-              new SqlError({
-                reason: classifyError(cause, "Failed to prepare statement", "prepare"),
-              }),
+            catch: (cause) => sqlError(cause, "Failed to prepare statement"),
           }),
       });
 
@@ -133,11 +133,7 @@ const makeWithDatabase = (
             const result = statement.run(...(params as any));
             return Effect.succeed(raw ? (result as unknown as ReadonlyArray<any>) : []);
           } catch (cause) {
-            return Effect.fail(
-              new SqlError({
-                reason: classifyError(cause, "Failed to execute statement", "execute"),
-              }),
-            );
+            return Effect.fail(sqlError(cause, "Failed to execute statement"));
           }
         });
 
@@ -160,10 +156,7 @@ const makeWithDatabase = (
                 statement.run(...(params as any));
                 return [];
               },
-              catch: (cause) =>
-                new SqlError({
-                  reason: classifyError(cause, "Failed to execute statement", "execute"),
-                }),
+              catch: (cause) => sqlError(cause, "Failed to execute statement"),
             }),
           (statement) =>
             Effect.sync(() => {

apps/server/src/provider/Layers/ClaudeAdapter.test.ts

@@ -1100,8 +1100,9 @@ describe("ClaudeAdapterLive", () => {
   it.effect("closes the session when the Claude stream aborts after a turn starts", () => {
     const harness = makeHarness();
     return Effect.gen(function* () {
-      const services = yield* Effect.services();
-      const runFork = Effect.runForkWith(services);
+      const runFork = yield* Effect.withFiber((fiber) =>
+        Effect.succeed(Effect.runForkWith(fiber.services)),
+      );
 
       const adapter = yield* ClaudeAdapter;
       const runtimeEvents: Array<ProviderRuntimeEvent> = [];
@@ -1200,8 +1201,9 @@ describe("ClaudeAdapterLive", () => {
     );
 
     return Effect.gen(function* () {
-      const services = yield* Effect.services();
-      const runFork = Effect.runForkWith(services);
+      const runFork = yield* Effect.withFiber((fiber) =>
+        Effect.succeed(Effect.runForkWith(fiber.services)),
+      );
 
       const adapter = yield* ClaudeAdapter;
 

apps/server/src/provider/Layers/ClaudeAdapter.ts

@@ -2380,9 +2380,12 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
         existingResumeSessionId === undefined ? yield* Random.nextUUIDv4 : undefined;
       const sessionId = existingResumeSessionId ?? newSessionId;
 
-      const services = yield* Effect.services();
-      const runFork = Effect.runForkWith(services);
-      const runPromise = Effect.runPromiseWith(services);
+      const runFork = yield* Effect.withFiber((fiber) =>
+        Effect.succeed(Effect.runForkWith(fiber.services)),
+      );
+      const runPromise = yield* Effect.withFiber((fiber) =>
+        Effect.succeed(Effect.runPromiseWith(fiber.services)),
+      );
 
       const promptQueue = yield* Queue.unbounded<PromptQueueItem>();
       const prompt = Stream.fromQueue(promptQueue).pipe(

apps/web/src/components/ChatView.tsx

@@ -2711,6 +2711,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
           attachments: turnAttachments,
         },
         modelSelection: selectedModelSelection,
+        titleSeed: title,
         textGenerationModel: selectedTextGenerationModel,
         assistantDeliveryMode: settings.enableAssistantStreaming ? "streaming" : "buffered",
         runtimeMode,
@@ -2994,6 +2995,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
             attachments: [],
           },
           modelSelection: selectedModelSelection,
+          titleSeed: activeThread.title,
           textGenerationModel: selectedTextGenerationModel,
           assistantDeliveryMode: settings.enableAssistantStreaming ? "streaming" : "buffered",
           runtimeMode,
@@ -3113,6 +3115,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
             attachments: [],
           },
           modelSelection: selectedModelSelection,
+          titleSeed: nextThreadTitle,
           textGenerationModel: selectedTextGenerationModel,
           assistantDeliveryMode: settings.enableAssistantStreaming ? "streaming" : "buffered",
           runtimeMode,

packages/contracts/src/orchestration.test.ts

@@ -338,6 +338,25 @@ it.effect("accepts a text generation model in thread.turn.start", () =>
   }),
 );
 
+it.effect("accepts a title seed in thread.turn.start", () =>
+  Effect.gen(function* () {
+    const parsed = yield* decodeThreadTurnStartCommand({
+      type: "thread.turn.start",
+      commandId: "cmd-turn-title-seed",
+      threadId: "thread-1",
+      message: {
+        messageId: "msg-title-seed",
+        role: "user",
+        text: "hello",
+        attachments: [],
+      },
+      titleSeed: "Investigate reconnect failures",
+      createdAt: "2026-01-01T00:00:00.000Z",
+    });
+    assert.strictEqual(parsed.titleSeed, "Investigate reconnect failures");
+  }),
+);
+
 it.effect("accepts a source proposed plan reference in thread.turn.start", () =>
   Effect.gen(function* () {
     const parsed = yield* decodeThreadTurnStartCommand({
@@ -409,6 +428,18 @@ it.effect("decodes thread.turn-start-requested text generation model when presen
   }),
 );
 
+it.effect("decodes thread.turn-start-requested title seed when present", () =>
+  Effect.gen(function* () {
+    const parsed = yield* decodeThreadTurnStartRequestedPayload({
+      threadId: "thread-2",
+      messageId: "msg-2",
+      titleSeed: "Investigate reconnect failures",
+      createdAt: "2026-01-01T00:00:00.000Z",
+    });
+    assert.strictEqual(parsed.titleSeed, "Investigate reconnect failures");
+  }),
+);
+
 it.effect("decodes latest turn source proposed plan metadata when present", () =>
   Effect.gen(function* () {
     const parsed = yield* decodeOrchestrationLatestTurn({