Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
Ignore stale resume cursors and Claude placeholder thread IDs
Julius Marminge92f1a4aa3ca9
diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.tsindex 7d6183b96..75b8e397e 100644--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts@@ -442,10 +442,10 @@ describe("ProviderCommandReactor", () => {expect(harness.stopSession.mock.calls[0]?.[0]).toEqual({ sessionId: asSessionId("sess-1") });expect(harness.startSession.mock.calls[1]?.[1]).toMatchObject({provider: "claudeCode",- resumeCursor: { opaque: "cursor-1" },approvalPolicy: "on-request",sandboxMode: "workspace-write",});+ expect(harness.startSession.mock.calls[1]?.[1]).not.toHaveProperty("resumeCursor");const readModel = await Effect.runPromise(harness.engine.getReadModel());const thread = readModel.threads.find((entry) => entry.id === ThreadId.makeUnsafe("thread-1"));diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.tsindex 9fc903841..ca075215e 100644--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts@@ -245,7 +245,9 @@ const make = Effect.gen(function* () {return existingSessionId;}- const resumeCursor = yield* resolveResumeCursorForSession(existingSessionId);+ const resumeCursor = providerChanged+ ? undefined+ : yield* resolveResumeCursorForSession(existingSessionId);const restartedSession = yield* startProviderSession({...(resumeCursor !== undefined ? { resumeCursor } : {}),...(options?.provider !== undefined ? { provider: options.provider } : {}),diff --git a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.tsindex 55a8452be..caeb1d951 100644--- a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts+++ b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts@@ -281,6 +281,65 @@ describe("ProviderRuntimeIngestion", () => {);});+ it("accepts claude turn lifecycle when seeded thread id is a synthetic placeholder", async () => {+ const harness = await createHarness();+ const seededAt = new Date().toISOString();++ await Effect.runPromise(+ harness.engine.dispatch({+ type: "thread.session.set",+ commandId: CommandId.makeUnsafe("cmd-session-seed-claude-placeholder"),+ threadId: ThreadId.makeUnsafe("thread-1"),+ session: {+ threadId: ThreadId.makeUnsafe("thread-1"),+ status: "ready",+ providerName: "claudeCode",+ providerSessionId: asSessionId("sess-1"),+ providerThreadId: asProviderThreadId("claude-thread-placeholder"),+ approvalPolicy: "on-request",+ sandboxMode: "workspace-write",+ activeTurnId: null,+ updatedAt: seededAt,+ lastError: null,+ },+ createdAt: seededAt,+ }),+ );++ harness.emit({+ type: "turn.started",+ eventId: asEventId("evt-turn-started-claude-placeholder"),+ provider: "claudeCode",+ sessionId: asSessionId("sess-1"),+ createdAt: new Date().toISOString(),+ threadId: asProviderThreadId("provider-thread-real"),+ turnId: asProviderTurnId("turn-claude-placeholder"),+ });++ await waitForThread(+ harness.engine,+ (thread) =>+ thread.session?.status === "running" &&+ thread.session?.activeTurnId === "turn-claude-placeholder",+ );++ harness.emit({+ type: "turn.completed",+ eventId: asEventId("evt-turn-completed-claude-placeholder"),+ provider: "claudeCode",+ sessionId: asSessionId("sess-1"),+ createdAt: new Date().toISOString(),+ threadId: asProviderThreadId("provider-thread-real"),+ turnId: asProviderTurnId("turn-claude-placeholder"),+ status: "completed",+ });++ await waitForThread(+ harness.engine,+ (thread) => thread.session?.status === "ready" && thread.session?.activeTurnId === null,+ );+ });+it("ignores non-active turn completion when runtime omits thread id", async () => {const harness = await createHarness();const now = new Date().toISOString();diff --git a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.tsindex 6668f5e5b..b0611e38b 100644--- a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts+++ b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts@@ -65,6 +65,13 @@ function sameId(left: string | null | undefined, right: string | null | undefinereturn left === right;}+function isSyntheticClaudeThreadId(+ provider: ProviderRuntimeEvent["provider"],+ threadId: ProviderThreadId | null,+): boolean {+ return provider === "claudeCode" && threadId !== null && threadId.startsWith("claude-thread-");+}+function truncateDetail(value: string, limit = 180): string {return value.length > limit ? `${value.slice(0, limit - 3)}...` : value;}@@ -345,14 +352,20 @@ const make = Effect.gen(function* () {const now = event.createdAt;const sessionProviderThreadId = thread.session?.providerThreadId ?? null;+ const scopedSessionProviderThreadId = isSyntheticClaudeThreadId(+ event.provider,+ sessionProviderThreadId,+ )+ ? null+ : sessionProviderThreadId;const eventProviderThreadId = toProviderThreadId(event.threadId);const eventTurnId = toTurnId("turnId" in event ? event.turnId : undefined);const activeTurnId = thread.session?.activeTurnId ?? null;const matchesThreadScope =eventProviderThreadId === null ||- sessionProviderThreadId === null ||- sameId(eventProviderThreadId, sessionProviderThreadId);+ scopedSessionProviderThreadId === null ||+ sameId(eventProviderThreadId, scopedSessionProviderThreadId);const conflictsWithActiveTurn =activeTurnId !== null && eventTurnId !== undefined && !sameId(activeTurnId, eventTurnId);const missingTurnForActiveTurn = activeTurnId !== null && eventTurnId === undefined;@@ -372,8 +385,8 @@ const make = Effect.gen(function* () {// Never let auxiliary/provider-side spawned threads replace the primary thread binding.if (eventProviderThreadId !== null &&- sessionProviderThreadId !== null &&- !sameId(eventProviderThreadId, sessionProviderThreadId)+ scopedSessionProviderThreadId !== null &&+ !sameId(eventProviderThreadId, scopedSessionProviderThreadId)) {return false;}@@ -395,7 +408,7 @@ const make = Effect.gen(function* () {return sameId(activeTurnId, eventTurnId);}// Without an active turn, only accept completion when no thread mismatch signal exists.- return eventProviderThreadId === null || sessionProviderThreadId === null;+ return eventProviderThreadId === null || scopedSessionProviderThreadId === null;default:return true;}@@ -415,7 +428,8 @@ const make = Effect.gen(function* () {: event.threadId !== undefined? ProviderThreadId.makeUnsafe(event.threadId): null;- const providerThreadId = providerThreadIdFromEvent ?? sessionProviderThreadId ?? null;+ const providerThreadId =+ providerThreadIdFromEvent ?? scopedSessionProviderThreadId ?? null;const status =event.type === "turn.started"? "running"