Skip to content

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.

Support provider-aware session selection in reactor

Julius Marmingec590beb4e3fe
diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts
index 99ce71c2e..7d6183b96 100644
--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts
+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts
@@ -87,13 +87,20 @@ describe("ProviderCommandReactor", () => {
const runtimeSessions: Array<ProviderSession> = [];
const startSession = vi.fn((_: unknown, input: unknown) => {
const sessionIndex = nextSessionIndex++;
+ const provider =
+ typeof input === "object" &&
+ input !== null &&
+ "provider" in input &&
+ (input.provider === "codex" || input.provider === "claudeCode")
+ ? input.provider
+ : "codex";
const resumeCursor =
typeof input === "object" && input !== null && "resumeCursor" in input
? input.resumeCursor
: undefined;
const session: ProviderSession = {
sessionId: asSessionId(`sess-${sessionIndex}`),
- provider: "codex" as const,
+ provider,
status: "ready" as const,
threadId: ProviderThreadId.makeUnsafe(`provider-thread-${sessionIndex}`),
resumeCursor: resumeCursor ?? { opaque: `cursor-${sessionIndex}` },
@@ -240,165 +247,55 @@ describe("ProviderCommandReactor", () => {
expect(thread?.session?.sandboxMode).toBe("workspace-write");
});
- it("generates and renames temporary worktree branch on first turn", async () => {
+ it("starts first turn with requested provider when provider is specified", async () => {
const harness = await createHarness();
const now = new Date().toISOString();
- await Effect.runPromise(
- harness.engine.dispatch({
- type: "thread.meta.update",
- commandId: CommandId.makeUnsafe("cmd-thread-meta-set-temp-branch"),
- threadId: ThreadId.makeUnsafe("thread-1"),
- branch: "t3code/89abc123",
- worktreePath: "/tmp/provider-project/.t3/worktrees/t3code-89abc123",
- }),
- );
-
- await Effect.runPromise(
- harness.engine.dispatch({
- type: "thread.turn.start",
- commandId: CommandId.makeUnsafe("cmd-turn-start-worktree-rename"),
- threadId: ThreadId.makeUnsafe("thread-1"),
- message: {
- messageId: asMessageId("user-message-worktree-rename"),
- role: "user",
- text: "Fix visual bug from screenshot",
- attachments: [
- {
- type: "image",
- id: "thread-1-att-rename",
- name: "bug.png",
- mimeType: "image/png",
- sizeBytes: 5,
- },
- ],
- },
- approvalPolicy: "on-request",
- sandboxMode: "workspace-write",
- createdAt: now,
- }),
- );
-
- await waitFor(() => harness.generateBranchName.mock.calls.length === 1);
- await waitFor(() => harness.renameBranch.mock.calls.length === 1);
-
- expect(harness.generateBranchName.mock.calls[0]?.[0]).toEqual({
- cwd: "/tmp/provider-project/.t3/worktrees/t3code-89abc123",
- message: "Fix visual bug from screenshot",
- attachments: [
- {
- type: "image",
- id: "thread-1-att-rename",
- name: "bug.png",
- mimeType: "image/png",
- sizeBytes: 5,
- },
- ],
- });
- expect(harness.renameBranch.mock.calls[0]?.[0]).toEqual({
- cwd: "/tmp/provider-project/.t3/worktrees/t3code-89abc123",
- oldBranch: "t3code/89abc123",
- newBranch: "t3code/generated-name",
- });
-
- await waitFor(() => {
- const readModel = Effect.runSync(harness.engine.getReadModel());
- const thread = readModel.threads.find(
- (entry) => entry.id === ThreadId.makeUnsafe("thread-1"),
- );
- return thread?.branch === "t3code/generated-name";
- });
- });
-
- it("passes persisted attachment references to branch generation and turn start", async () => {
- const harness = await createHarness();
- const now = new Date().toISOString();
-
- await Effect.runPromise(
- harness.engine.dispatch({
- type: "thread.meta.update",
- commandId: CommandId.makeUnsafe("cmd-thread-meta-set-temp-branch-persisted"),
- threadId: ThreadId.makeUnsafe("thread-1"),
- branch: "t3code/abcdef12",
- worktreePath: "/tmp/provider-project/.t3/worktrees/t3code-abcdef12",
- }),
- );
-
await Effect.runPromise(
harness.engine.dispatch({
type: "thread.turn.start",
- commandId: CommandId.makeUnsafe("cmd-turn-start-persisted-attachments"),
+ commandId: CommandId.makeUnsafe("cmd-turn-start-provider-first"),
threadId: ThreadId.makeUnsafe("thread-1"),
message: {
- messageId: asMessageId("user-message-persisted-attachments"),
+ messageId: asMessageId("user-message-provider-first"),
role: "user",
- text: "Fix visual bug from screenshot",
- attachments: [
- {
- type: "image",
- id: "thread-1-att-persisted",
- name: "bug.png",
- mimeType: "image/png",
- sizeBytes: 5,
- },
- ],
+ text: "hello claude",
+ attachments: [],
},
+ provider: "claudeCode",
approvalPolicy: "on-request",
sandboxMode: "workspace-write",
createdAt: now,
}),
);
- await waitFor(() => harness.generateBranchName.mock.calls.length === 1);
+ await waitFor(() => harness.startSession.mock.calls.length === 1);
await waitFor(() => harness.sendTurn.mock.calls.length === 1);
-
- expect(harness.generateBranchName.mock.calls[0]?.[0]).toEqual({
- cwd: "/tmp/provider-project/.t3/worktrees/t3code-abcdef12",
- message: "Fix visual bug from screenshot",
- attachments: [
- {
- type: "image",
- id: "thread-1-att-persisted",
- name: "bug.png",
- mimeType: "image/png",
- sizeBytes: 5,
- },
- ],
- });
- expect(harness.sendTurn.mock.calls[0]?.[0]).toMatchObject({
- attachments: [
- {
- type: "image",
- id: "thread-1-att-persisted",
- name: "bug.png",
- mimeType: "image/png",
- sizeBytes: 5,
- },
- ],
+ expect(harness.startSession.mock.calls[0]?.[1]).toMatchObject({
+ provider: "claudeCode",
+ cwd: "/tmp/provider-project",
+ model: "gpt-5-codex",
+ approvalPolicy: "on-request",
+ sandboxMode: "workspace-write",
});
+
+ const readModel = await Effect.runPromise(harness.engine.getReadModel());
+ const thread = readModel.threads.find((entry) => entry.id === ThreadId.makeUnsafe("thread-1"));
+ expect(thread?.session?.providerName).toBe("claudeCode");
+ expect(thread?.session?.providerSessionId).toBe("sess-1");
});
- it("skips worktree branch generation after the first user turn", async () => {
+ it("reuses the same provider session when runtime mode is unchanged", async () => {
const harness = await createHarness();
const now = new Date().toISOString();
- await Effect.runPromise(
- harness.engine.dispatch({
- type: "thread.meta.update",
- commandId: CommandId.makeUnsafe("cmd-thread-meta-set-temp-branch-2"),
- threadId: ThreadId.makeUnsafe("thread-1"),
- branch: "t3code/1234abcd",
- worktreePath: "/tmp/provider-project/.t3/worktrees/t3code-1234abcd",
- }),
- );
-
await Effect.runPromise(
harness.engine.dispatch({
type: "thread.turn.start",
- commandId: CommandId.makeUnsafe("cmd-turn-start-first"),
+ commandId: CommandId.makeUnsafe("cmd-turn-start-unchanged-1"),
threadId: ThreadId.makeUnsafe("thread-1"),
message: {
- messageId: asMessageId("user-message-first"),
+ messageId: asMessageId("user-message-unchanged-1"),
role: "user",
text: "first",
attachments: [],
@@ -409,15 +306,16 @@ describe("ProviderCommandReactor", () => {
}),
);
- await waitFor(() => harness.generateBranchName.mock.calls.length === 1);
+ await waitFor(() => harness.startSession.mock.calls.length === 1);
+ await waitFor(() => harness.sendTurn.mock.calls.length === 1);
await Effect.runPromise(
harness.engine.dispatch({
type: "thread.turn.start",
- commandId: CommandId.makeUnsafe("cmd-turn-start-second"),
+ commandId: CommandId.makeUnsafe("cmd-turn-start-unchanged-2"),
threadId: ThreadId.makeUnsafe("thread-1"),
message: {
- messageId: asMessageId("user-message-second"),
+ messageId: asMessageId("user-message-unchanged-2"),
role: "user",
text: "second",
attachments: [],
@@ -429,75 +327,27 @@ describe("ProviderCommandReactor", () => {
);
await waitFor(() => harness.sendTurn.mock.calls.length === 2);
- expect(harness.generateBranchName.mock.calls.length).toBe(1);
- expect(harness.renameBranch.mock.calls.length).toBe(1);
- });
-
- it("skips worktree rename when branch-name generation fails", async () => {
- const harness = await createHarness();
- const now = new Date().toISOString();
- harness.generateBranchName.mockImplementationOnce(() =>
- Effect.fail(
- new TextGenerationError({
- operation: "generateBranchName",
- detail: "model returned invalid payload",
- }),
- ),
- );
-
- await Effect.runPromise(
- harness.engine.dispatch({
- type: "thread.meta.update",
- commandId: CommandId.makeUnsafe("cmd-thread-meta-set-temp-branch-null"),
- threadId: ThreadId.makeUnsafe("thread-1"),
- branch: "t3code/0000abcd",
- worktreePath: "/tmp/provider-project/.t3/worktrees/t3code-0000abcd",
- }),
- );
-
- await Effect.runPromise(
- harness.engine.dispatch({
- type: "thread.turn.start",
- commandId: CommandId.makeUnsafe("cmd-turn-start-null-branch"),
- threadId: ThreadId.makeUnsafe("thread-1"),
- message: {
- messageId: asMessageId("user-message-null-branch"),
- role: "user",
- text: "Fix visual regression",
- attachments: [],
- },
- approvalPolicy: "on-request",
- sandboxMode: "workspace-write",
- createdAt: now,
- }),
- );
-
- await waitFor(() => harness.generateBranchName.mock.calls.length === 1);
- await Effect.runPromise(Effect.sleep("20 millis"));
- expect(harness.renameBranch.mock.calls.length).toBe(0);
-
- const readModel = await Effect.runPromise(harness.engine.getReadModel());
- const thread = readModel.threads.find((entry) => entry.id === ThreadId.makeUnsafe("thread-1"));
- expect(thread?.branch).toBe("t3code/0000abcd");
+ expect(harness.startSession.mock.calls.length).toBe(1);
+ expect(harness.stopSession.mock.calls.length).toBe(0);
});
- it("reuses the same provider session when runtime mode is unchanged", async () => {
+ it("restarts the provider session when runtime mode changes", async () => {
const harness = await createHarness();
const now = new Date().toISOString();
await Effect.runPromise(
harness.engine.dispatch({
type: "thread.turn.start",
- commandId: CommandId.makeUnsafe("cmd-turn-start-unchanged-1"),
+ commandId: CommandId.makeUnsafe("cmd-turn-start-runtime-mode-1"),
threadId: ThreadId.makeUnsafe("thread-1"),
message: {
- messageId: asMessageId("user-message-unchanged-1"),
+ messageId: asMessageId("user-message-runtime-mode-1"),
role: "user",
text: "first",
attachments: [],
},
- approvalPolicy: "on-request",
- sandboxMode: "workspace-write",
+ approvalPolicy: "never",
+ sandboxMode: "danger-full-access",
createdAt: now,
}),
);
@@ -508,10 +358,10 @@ describe("ProviderCommandReactor", () => {
await Effect.runPromise(
harness.engine.dispatch({
type: "thread.turn.start",
- commandId: CommandId.makeUnsafe("cmd-turn-start-unchanged-2"),
+ commandId: CommandId.makeUnsafe("cmd-turn-start-runtime-mode-2"),
threadId: ThreadId.makeUnsafe("thread-1"),
message: {
- messageId: asMessageId("user-message-unchanged-2"),
+ messageId: asMessageId("user-message-runtime-mode-2"),
role: "user",
text: "second",
attachments: [],
@@ -522,28 +372,44 @@ describe("ProviderCommandReactor", () => {
}),
);
+ await waitFor(() => harness.stopSession.mock.calls.length === 1);
+ await waitFor(() => harness.startSession.mock.calls.length === 2);
await waitFor(() => harness.sendTurn.mock.calls.length === 2);
- expect(harness.startSession.mock.calls.length).toBe(1);
- expect(harness.stopSession.mock.calls.length).toBe(0);
+
+ expect(harness.stopSession.mock.calls[0]?.[0]).toEqual({ sessionId: asSessionId("sess-1") });
+ expect(harness.startSession.mock.calls[1]?.[1]).toMatchObject({
+ resumeCursor: { opaque: "cursor-1" },
+ approvalPolicy: "on-request",
+ sandboxMode: "workspace-write",
+ });
+ expect(harness.sendTurn.mock.calls[1]?.[0]).toMatchObject({
+ sessionId: asSessionId("sess-2"),
+ });
+
+ const readModel = await Effect.runPromise(harness.engine.getReadModel());
+ const thread = readModel.threads.find((entry) => entry.id === ThreadId.makeUnsafe("thread-1"));
+ expect(thread?.session?.providerSessionId).toBe("sess-2");
+ expect(thread?.session?.approvalPolicy).toBe("on-request");
+ expect(thread?.session?.sandboxMode).toBe("workspace-write");
});
- it("restarts the provider session when runtime mode changes", async () => {
+ it("switches provider by restarting the session when turn request provider changes", async () => {
const harness = await createHarness();
const now = new Date().toISOString();
await Effect.runPromise(
harness.engine.dispatch({
type: "thread.turn.start",
- commandId: CommandId.makeUnsafe("cmd-turn-start-runtime-mode-1"),
+ commandId: CommandId.makeUnsafe("cmd-turn-start-provider-switch-1"),
threadId: ThreadId.makeUnsafe("thread-1"),
message: {
- messageId: asMessageId("user-message-runtime-mode-1"),
+ messageId: asMessageId("user-message-provider-switch-1"),
role: "user",
text: "first",
attachments: [],
},
- approvalPolicy: "never",
- sandboxMode: "danger-full-access",
+ approvalPolicy: "on-request",
+ sandboxMode: "workspace-write",
createdAt: now,
}),
);
@@ -554,14 +420,15 @@ describe("ProviderCommandReactor", () => {
await Effect.runPromise(
harness.engine.dispatch({
type: "thread.turn.start",
- commandId: CommandId.makeUnsafe("cmd-turn-start-runtime-mode-2"),
+ commandId: CommandId.makeUnsafe("cmd-turn-start-provider-switch-2"),
threadId: ThreadId.makeUnsafe("thread-1"),
message: {
- messageId: asMessageId("user-message-runtime-mode-2"),
+ messageId: asMessageId("user-message-provider-switch-2"),
role: "user",
text: "second",
attachments: [],
},
+ provider: "claudeCode",
approvalPolicy: "on-request",
sandboxMode: "workspace-write",
createdAt: now,
@@ -574,17 +441,16 @@ 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.sendTurn.mock.calls[1]?.[0]).toMatchObject({
- sessionId: asSessionId("sess-2"),
- });
const readModel = await Effect.runPromise(harness.engine.getReadModel());
const thread = readModel.threads.find((entry) => entry.id === ThreadId.makeUnsafe("thread-1"));
expect(thread?.session?.providerSessionId).toBe("sess-2");
+ expect(thread?.session?.providerName).toBe("claudeCode");
expect(thread?.session?.approvalPolicy).toBe("on-request");
expect(thread?.session?.sandboxMode).toBe("workspace-write");
});
diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts
index e909050d1..9fc903841 100644
--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts
+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts
@@ -168,6 +168,7 @@ const make = Effect.gen(function* () {
threadId: ThreadId,
createdAt: string,
options?: {
+ readonly provider?: ProviderKind;
readonly approvalPolicy?: ProviderApprovalPolicy;
readonly sandboxMode?: ProviderSandboxMode;
},
@@ -182,10 +183,11 @@ const make = Effect.gen(function* () {
options?.approvalPolicy ?? thread.session?.approvalPolicy ?? DEFAULT_APPROVAL_POLICY;
const desiredSandboxMode =
options?.sandboxMode ?? thread.session?.sandboxMode ?? DEFAULT_SANDBOX_MODE;
- const preferredProvider: ProviderKind | undefined =
+ const currentProvider: ProviderKind | undefined =
thread.session?.providerName === "codex" || thread.session?.providerName === "claudeCode"
? thread.session.providerName
: undefined;
+ const preferredProvider: ProviderKind | undefined = options?.provider ?? currentProvider;
const effectiveCwd = resolveThreadWorkspaceCwd({
thread,
projects: readModel.projects,
@@ -196,12 +198,17 @@ const make = Effect.gen(function* () {
Effect.map((sessions) => sessions.find((session) => session.sessionId === sessionId)?.resumeCursor),
);
- const startProviderSession = (resumeCursor?: unknown) =>
+ const startProviderSession = (input?: {
+ readonly resumeCursor?: unknown;
+ readonly provider?: ProviderKind;
+ }) =>
providerService.startSession(threadId, {
- ...(preferredProvider ? { provider: preferredProvider } : {}),
+ ...(input?.provider ?? preferredProvider
+ ? { provider: input?.provider ?? preferredProvider }
+ : {}),
...(effectiveCwd ? { cwd: effectiveCwd } : {}),
...(thread.model ? { model: thread.model } : {}),
- ...(resumeCursor !== undefined ? { resumeCursor } : {}),
+ ...(input?.resumeCursor !== undefined ? { resumeCursor: input.resumeCursor } : {}),
approvalPolicy: desiredApprovalPolicy,
sandboxMode: desiredSandboxMode,
});
@@ -232,13 +239,17 @@ const make = Effect.gen(function* () {
options.approvalPolicy !== thread.session?.approvalPolicy;
const sandboxModeChanged =
options?.sandboxMode !== undefined && options.sandboxMode !== thread.session?.sandboxMode;
+ const providerChanged = options?.provider !== undefined && options.provider !== currentProvider;
- if (!approvalPolicyChanged && !sandboxModeChanged) {
+ if (!approvalPolicyChanged && !sandboxModeChanged && !providerChanged) {
return existingSessionId;
}
const resumeCursor = yield* resolveResumeCursorForSession(existingSessionId);
- const restartedSession = yield* startProviderSession(resumeCursor);
+ const restartedSession = yield* startProviderSession({
+ ...(resumeCursor !== undefined ? { resumeCursor } : {}),
+ ...(options?.provider !== undefined ? { provider: options.provider } : {}),
+ });
yield* bindSessionToThread(restartedSession);
yield* providerService.stopSession({ sessionId: existingSessionId }).pipe(
Effect.catchCause((cause) =>
@@ -252,7 +263,9 @@ const make = Effect.gen(function* () {
return restartedSession.sessionId;
}
- const startedSession = yield* startProviderSession();
+ const startedSession = yield* startProviderSession({
+ ...(options?.provider !== undefined ? { provider: options.provider } : {}),
+ });
yield* bindSessionToThread(startedSession);
return startedSession.sessionId;
});
@@ -261,6 +274,7 @@ const make = Effect.gen(function* () {
readonly threadId: ThreadId;
readonly messageText: string;
readonly attachments?: ReadonlyArray<ChatAttachment>;
+ readonly provider?: ProviderKind;
readonly model?: string;
readonly effort?: string;
readonly approvalPolicy: ProviderApprovalPolicy;
@@ -272,6 +286,7 @@ const make = Effect.gen(function* () {
return;
}
const sessionId = yield* ensureSessionForThread(input.threadId, input.createdAt, {
+ ...(input.provider !== undefined ? { provider: input.provider } : {}),
approvalPolicy: input.approvalPolicy,
sandboxMode: input.sandboxMode,
});
@@ -394,6 +409,7 @@ const make = Effect.gen(function* () {
threadId: event.payload.threadId,
messageText: message.text,
...(message.attachments !== undefined ? { attachments: message.attachments } : {}),
+ ...(event.payload.provider !== undefined ? { provider: event.payload.provider } : {}),
...(event.payload.model !== undefined ? { model: event.payload.model } : {}),
...(event.payload.effort !== undefined ? { effort: event.payload.effort } : {}),
approvalPolicy: event.payload.approvalPolicy,