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.
[codex] prevent ACP assistant ID collisions after restarts (#3932)
Maxwell Youngbcd640bf4d81
diff --git a/apps/server/src/provider/Drivers/CursorDriver.ts b/apps/server/src/provider/Drivers/CursorDriver.tsindex 9451792fc..61f804897 100644--- a/apps/server/src/provider/Drivers/CursorDriver.ts+++ b/apps/server/src/provider/Drivers/CursorDriver.ts@@ -101,6 +101,7 @@ export const CursorDriver: ProviderDriver<CursorSettings, CursorDriverEnv> = {defaultConfig: (): CursorSettings => decodeCursorSettings({}),create: ({ instanceId, displayName, accentColor, environment, enabled, config }) =>Effect.gen(function* () {+ const crypto = yield* Crypto.Crypto;const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;const fileSystem = yield* FileSystem.FileSystem;const path = yield* Path.Path;@@ -133,6 +134,7 @@ export const CursorDriver: ProviderDriver<CursorSettings, CursorDriverEnv> = {const checkProvider = checkCursorProviderStatus(effectiveConfig, processEnv).pipe(Effect.map(stampIdentity),+ Effect.provideService(Crypto.Crypto, crypto),Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),Effect.provideService(FileSystem.FileSystem, fileSystem),Effect.provideService(Path.Path, path),diff --git a/apps/server/src/provider/Drivers/GrokDriver.ts b/apps/server/src/provider/Drivers/GrokDriver.tsindex d855d1a45..4eb32c20c 100644--- a/apps/server/src/provider/Drivers/GrokDriver.ts+++ b/apps/server/src/provider/Drivers/GrokDriver.ts@@ -84,6 +84,7 @@ export const GrokDriver: ProviderDriver<GrokSettings, GrokDriverEnv> = {defaultConfig: (): GrokSettings => decodeGrokSettings({}),create: ({ instanceId, displayName, accentColor, environment, enabled, config }) =>Effect.gen(function* () {+ const crypto = yield* Crypto.Crypto;const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;const httpClient = yield* HttpClient.HttpClient;const serverSettings = yield* ServerSettingsService;@@ -114,6 +115,7 @@ export const GrokDriver: ProviderDriver<GrokSettings, GrokDriverEnv> = {const checkProvider = checkGrokProviderStatus(effectiveConfig, processEnv).pipe(Effect.map(stampIdentity),+ Effect.provideService(Crypto.Crypto, crypto),Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),);diff --git a/apps/server/src/provider/Layers/CursorAdapter.test.ts b/apps/server/src/provider/Layers/CursorAdapter.test.tsindex 5a59a0223..491f718a9 100644--- a/apps/server/src/provider/Layers/CursorAdapter.test.ts+++ b/apps/server/src/provider/Layers/CursorAdapter.test.ts@@ -228,7 +228,7 @@ cursorAdapterTestLayer("CursorAdapterLive", (it) => {assert.isDefined(delta);if (delta?.type === "content.delta") {assert.equal(delta.payload.delta, "hello from mock");- assert.match(String(delta.itemId), /^assistant:mock-session-1:segment:0$/);+ assert.match(String(delta.itemId), /^assistant:mock-session-1:runtime:[^:]+:segment:0$/);}const assistantCompleted = runtimeEvents.find(@@ -687,7 +687,10 @@ cursorAdapterTestLayer("CursorAdapterLive", (it) => {if (contentDelta?.type === "content.delta") {assert.equal(String(contentDelta.turnId), String(turn.turnId));assert.equal(contentDelta.payload.delta, "hello from mock");- assert.equal(String(contentDelta.itemId), "assistant:mock-session-1:segment:0");+ assert.match(+ String(contentDelta.itemId),+ /^assistant:mock-session-1:runtime:[^:]+:segment:0$/,+ );}});diff --git a/apps/server/src/provider/Layers/CursorAdapter.ts b/apps/server/src/provider/Layers/CursorAdapter.tsindex 59788a2d2..4dd38519c 100644--- a/apps/server/src/provider/Layers/CursorAdapter.ts+++ b/apps/server/src/provider/Layers/CursorAdapter.ts@@ -558,6 +558,7 @@ export function makeCursorAdapter(: {}),...acpNativeLoggers,}).pipe(+ Effect.provideService(Crypto.Crypto, crypto),Effect.provideService(Scope.Scope, sessionScope),Effect.mapError((cause) =>diff --git a/apps/server/src/provider/Layers/CursorProvider.test.ts b/apps/server/src/provider/Layers/CursorProvider.test.tsindex 3aefdcad1..e969a7bea 100644--- a/apps/server/src/provider/Layers/CursorProvider.test.ts+++ b/apps/server/src/provider/Layers/CursorProvider.test.ts@@ -1,6 +1,7 @@import * as NodeOS from "node:os";import * as NodeServices from "@effect/platform-node/NodeServices";+import type * as Crypto from "effect/Crypto";import * as Effect from "effect/Effect";import * as FileSystem from "effect/FileSystem";import * as Path from "effect/Path";@@ -28,7 +29,7 @@ const runNode = <A, E>(effect: Effect.Effect<A,E,- ChildProcessSpawner.ChildProcessSpawner | FileSystem.FileSystem | Path.Path+ ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | FileSystem.FileSystem | Path.Path>,): Promise<A> => Effect.runPromise(effect.pipe(Effect.provide(NodeServices.layer)));diff --git a/apps/server/src/provider/Layers/CursorProvider.ts b/apps/server/src/provider/Layers/CursorProvider.tsindex cd9b93a47..063f2c1bf 100644--- a/apps/server/src/provider/Layers/CursorProvider.ts+++ b/apps/server/src/provider/Layers/CursorProvider.ts@@ -11,6 +11,7 @@ import type {import { ProviderDriverKind } from "@t3tools/contracts";import type * as EffectAcpSchema from "effect-acp/schema";import { causeErrorTag } from "@t3tools/shared/observability";+import * as Crypto from "effect/Crypto";import * as DateTime from "effect/DateTime";import * as Effect from "effect/Effect";import * as Exit from "effect/Exit";@@ -992,7 +993,7 @@ export const checkCursorProviderStatus = Effect.fn("checkCursorProviderStatus")(): Effect.fn.Return<ServerProviderDraft,never,- ChildProcessSpawner.ChildProcessSpawner | FileSystem.FileSystem | Path.Path+ ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | FileSystem.FileSystem | Path.Path> {const checkedAt = DateTime.formatIso(yield* DateTime.now);const fallbackModels = getCursorFallbackModels(cursorSettings);diff --git a/apps/server/src/provider/Layers/GrokAdapter.ts b/apps/server/src/provider/Layers/GrokAdapter.tsindex c22b21801..d8c288a82 100644--- a/apps/server/src/provider/Layers/GrokAdapter.ts+++ b/apps/server/src/provider/Layers/GrokAdapter.ts@@ -596,6 +596,7 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte: {}),...acpNativeLoggers,}).pipe(+ Effect.provideService(Crypto.Crypto, crypto),Effect.provideService(Scope.Scope, sessionScope),Effect.mapError((cause) =>diff --git a/apps/server/src/provider/Layers/GrokProvider.ts b/apps/server/src/provider/Layers/GrokProvider.tsindex cf5d5ad9c..33f61ad97 100644--- a/apps/server/src/provider/Layers/GrokProvider.ts+++ b/apps/server/src/provider/Layers/GrokProvider.ts@@ -7,6 +7,7 @@ import {} from "@t3tools/contracts";import type * as EffectAcpSchema from "effect-acp/schema";import { causeErrorTag } from "@t3tools/shared/observability";+import * as Crypto from "effect/Crypto";import * as DateTime from "effect/DateTime";import * as Effect from "effect/Effect";import * as Exit from "effect/Exit";@@ -167,7 +168,11 @@ const runGrokVersionCommand = (export const checkGrokProviderStatus = Effect.fn("checkGrokProviderStatus")(function* (grokSettings: GrokSettings,environment: NodeJS.ProcessEnv = process.env,-): Effect.fn.Return<ServerProviderDraft, never, ChildProcessSpawner.ChildProcessSpawner> {+): Effect.fn.Return<+ ServerProviderDraft,+ never,+ ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto+> {const checkedAt = DateTime.formatIso(yield* DateTime.now);const fallbackModels = grokModelsFromSettings(grokSettings.customModels);diff --git a/apps/server/src/provider/acp/AcpJsonRpcConnection.test.ts b/apps/server/src/provider/acp/AcpJsonRpcConnection.test.tsindex 4e9700dab..b1ef0d3e5 100644--- a/apps/server/src/provider/acp/AcpJsonRpcConnection.test.ts+++ b/apps/server/src/provider/acp/AcpJsonRpcConnection.test.ts@@ -116,6 +116,43 @@ describe("AcpSessionRuntime", () => {),);+ it.effect("keeps assistant item IDs unique when a provider session restarts", () => {+ const collectFirstAssistantItemId = Effect.gen(function* () {+ const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;+ const started = yield* runtime.start();+ expect(started.sessionId).toBe("mock-session-1");++ yield* runtime.prompt({+ prompt: [{ type: "text", text: "hi" }],+ });++ const events = Array.from(yield* Stream.runCollect(Stream.take(runtime.getEvents(), 4)));+ const assistantStart = events.find((event) => event._tag === "AssistantItemStarted");+ expect(assistantStart?._tag).toBe("AssistantItemStarted");+ return assistantStart?._tag === "AssistantItemStarted" ? assistantStart.itemId : "";+ }).pipe(+ Effect.provide(+ AcpSessionRuntime.layer({+ spawn: {+ command: mockAgentCommand,+ args: mockAgentArgs,+ },+ cwd: process.cwd(),+ clientInfo: { name: "t3-test", version: "0.0.0" },+ authMethodId: "test",+ }),+ ),+ Effect.scoped,+ );++ return Effect.gen(function* () {+ const beforeRestart = yield* collectFirstAssistantItemId;+ const afterRestart = yield* collectFirstAssistantItemId;++ expect(afterRestart).not.toBe(beforeRestart);+ }).pipe(Effect.provide(NodeServices.layer));+ });+it.effect("drops session updates emitted for a child ACP session", () =>Effect.gen(function* () {const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;diff --git a/apps/server/src/provider/acp/AcpSessionRuntime.ts b/apps/server/src/provider/acp/AcpSessionRuntime.tsindex bc2df3aa8..09fce6d56 100644--- a/apps/server/src/provider/acp/AcpSessionRuntime.ts+++ b/apps/server/src/provider/acp/AcpSessionRuntime.ts@@ -1,6 +1,7 @@import * as Cause from "effect/Cause";import * as Clock from "effect/Clock";import * as Context from "effect/Context";+import * as Crypto from "effect/Crypto";import * as Deferred from "effect/Deferred";import * as Duration from "effect/Duration";import * as Effect from "effect/Effect";@@ -270,14 +271,24 @@ export const make = (): Effect.Effect<AcpSessionRuntime["Service"],EffectAcpErrors.AcpError,- ChildProcessSpawner.ChildProcessSpawner | Scope.Scope+ ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | Scope.Scope> =>Effect.gen(function* () {+ const crypto = yield* Crypto.Crypto;const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;const runtimeScope = yield* Scope.Scope;const eventQueue = yield* Queue.unbounded<AcpSessionRuntimeEvent>();const modeStateRef = yield* Ref.make<AcpSessionModeState | undefined>(undefined);const toolCallsRef = yield* Ref.make(new Map<string, AcpToolCallState>());+ const assistantItemRuntimeId = yield* crypto.randomUUIDv4.pipe(+ Effect.mapError(+ (cause) =>+ new EffectAcpErrors.AcpTransportError({+ detail: "Failed to generate an ACP assistant item runtime identifier.",+ cause,+ }),+ ),+ );const assistantSegmentRef = yield* Ref.make<AcpAssistantSegmentState>({ nextSegmentIndex: 0 });const configOptionsRef = yield* Ref.make(sessionConfigOptionsFromSetup(undefined));const startStateRef = yield* Ref.make<AcpStartState>({ _tag: "NotStarted" });@@ -387,6 +398,7 @@ export const make = (modeStateRef,toolCallsRef,assistantSegmentRef,+ assistantItemRuntimeId,params: notification,});}),@@ -802,7 +814,7 @@ export const layer = (): Layer.Layer<AcpSessionRuntime,EffectAcpErrors.AcpError,- ChildProcessSpawner.ChildProcessSpawner+ ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto> => Layer.effect(AcpSessionRuntime, make(options));function sessionConfigOptionsFromSetup(@@ -834,12 +846,14 @@ const handleSessionUpdate = ({modeStateRef,toolCallsRef,assistantSegmentRef,+ assistantItemRuntimeId,params,}: {readonly queue: Queue.Queue<AcpSessionRuntimeEvent>;readonly modeStateRef: Ref.Ref<AcpSessionModeState | undefined>;readonly toolCallsRef: Ref.Ref<Map<string, AcpToolCallState>>;readonly assistantSegmentRef: Ref.Ref<AcpAssistantSegmentState>;+ readonly assistantItemRuntimeId: string;readonly params: EffectAcpSchema.SessionNotification;}): Effect.Effect<void> =>Effect.gen(function* () {@@ -887,6 +901,7 @@ const handleSessionUpdate = ({queue,assistantSegmentRef,sessionId: params.sessionId,+ assistantItemRuntimeId,});yield* Queue.offer(queue, {...event,@@ -924,17 +939,19 @@ function shouldEmitToolCallUpdate(return previous === undefined || previous.title !== next.title || previous.detail !== next.detail;}-const assistantItemId = (sessionId: string, segmentIndex: number) =>- `assistant:${sessionId}:segment:${segmentIndex}`;+const assistantItemId = (sessionId: string, runtimeId: string, segmentIndex: number) =>+ `assistant:${sessionId}:runtime:${runtimeId}:segment:${segmentIndex}`;const ensureActiveAssistantSegment = ({queue,assistantSegmentRef,sessionId,+ assistantItemRuntimeId,}: {readonly queue: Queue.Queue<AcpSessionRuntimeEvent>;readonly assistantSegmentRef: Ref.Ref<AcpAssistantSegmentState>;readonly sessionId: string;+ readonly assistantItemRuntimeId: string;}) =>Ref.modify<AcpAssistantSegmentState, EnsureActiveAssistantSegmentResult>(assistantSegmentRef,@@ -942,7 +959,7 @@ const ensureActiveAssistantSegment = ({if (current.activeItemId) {return [{ itemId: current.activeItemId }, current] as const;}- const itemId = assistantItemId(sessionId, current.nextSegmentIndex);+ const itemId = assistantItemId(sessionId, assistantItemRuntimeId, current.nextSegmentIndex);return [{itemId,diff --git a/apps/server/src/provider/acp/CursorAcpSupport.ts b/apps/server/src/provider/acp/CursorAcpSupport.tsindex c5c16b102..30203ad77 100644--- a/apps/server/src/provider/acp/CursorAcpSupport.ts+++ b/apps/server/src/provider/acp/CursorAcpSupport.ts@@ -1,4 +1,5 @@import { type CursorSettings, type ProviderOptionSelection } from "@t3tools/contracts";+import * as Crypto from "effect/Crypto";import * as Effect from "effect/Effect";import * as Layer from "effect/Layer";import * as Scope from "effect/Scope";@@ -50,7 +51,7 @@ export const makeCursorAcpRuntime = (): Effect.Effect<AcpSessionRuntime.AcpSessionRuntime["Service"],EffectAcpErrors.AcpError,- Scope.Scope+ Crypto.Crypto | Scope.Scope> =>Effect.gen(function* () {const acpContext = yield* Layer.build(diff --git a/apps/server/src/provider/acp/GrokAcpSupport.ts b/apps/server/src/provider/acp/GrokAcpSupport.tsindex 3e6d63a53..c928b3ed8 100644--- a/apps/server/src/provider/acp/GrokAcpSupport.ts+++ b/apps/server/src/provider/acp/GrokAcpSupport.ts@@ -1,4 +1,5 @@import { type GrokSettings, ProviderDriverKind } from "@t3tools/contracts";+import * as Crypto from "effect/Crypto";import * as Effect from "effect/Effect";import * as Layer from "effect/Layer";import * as Scope from "effect/Scope";@@ -55,7 +56,7 @@ export const makeGrokAcpRuntime = (): Effect.Effect<AcpSessionRuntime.AcpSessionRuntime["Service"],EffectAcpErrors.AcpError,- Scope.Scope+ Crypto.Crypto | Scope.Scope> =>Effect.gen(function* () {const acpContext = yield* Layer.build(diff --git a/apps/server/src/textGeneration/CursorTextGeneration.ts b/apps/server/src/textGeneration/CursorTextGeneration.tsindex 3e1f4eb8b..6d1e5d02d 100644--- a/apps/server/src/textGeneration/CursorTextGeneration.ts+++ b/apps/server/src/textGeneration/CursorTextGeneration.ts@@ -1,3 +1,4 @@+import * as Crypto from "effect/Crypto";import * as Effect from "effect/Effect";import * as Option from "effect/Option";import * as Ref from "effect/Ref";@@ -38,6 +39,7 @@ export const makeCursorTextGeneration = Effect.fn("makeCursorTextGeneration")(fucursorSettings: CursorSettings,environment?: NodeJS.ProcessEnv,) {+ const crypto = yield* Crypto.Crypto;const commandSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;const resolvedEnvironment = environment ?? process.env;@@ -66,7 +68,7 @@ export const makeCursorTextGeneration = Effect.fn("makeCursorTextGeneration")(fuchildProcessSpawner: commandSpawner,cwd,clientInfo: { name: "t3-code-git-text", version: "0.0.0" },- });+ }).pipe(Effect.provideService(Crypto.Crypto, crypto));yield* runtime.handleSessionUpdate((notification) => {const update = notification.update;diff --git a/apps/server/src/textGeneration/GrokTextGeneration.ts b/apps/server/src/textGeneration/GrokTextGeneration.tsindex 1bb582163..fd367acdf 100644--- a/apps/server/src/textGeneration/GrokTextGeneration.ts+++ b/apps/server/src/textGeneration/GrokTextGeneration.ts@@ -1,3 +1,4 @@+import * as Crypto from "effect/Crypto";import * as Effect from "effect/Effect";import * as Option from "effect/Option";import * as Ref from "effect/Ref";@@ -37,6 +38,7 @@ export const makeGrokTextGeneration = Effect.fn("makeGrokTextGeneration")(functigrokSettings: GrokSettings,environment: NodeJS.ProcessEnv = process.env,) {+ const crypto = yield* Crypto.Crypto;const commandSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;const runGrokJson = <S extends Schema.Top>({@@ -65,7 +67,7 @@ export const makeGrokTextGeneration = Effect.fn("makeGrokTextGeneration")(functichildProcessSpawner: commandSpawner,cwd,clientInfo: { name: "t3-code-git-text", version: "0.0.0" },- });+ }).pipe(Effect.provideService(Crypto.Crypto, crypto));yield* runtime.handleSessionUpdate((notification) => {const update = notification.update;