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.
Return existing bootstrap thread IDs in welcome and guard root navigatio
Julius Marminge49472da66992
diff --git a/apps/server/src/wsServer.test.ts b/apps/server/src/wsServer.test.tsindex 3d8f53ec6..e0c91312a 100644--- a/apps/server/src/wsServer.test.ts+++ b/apps/server/src/wsServer.test.ts@@ -38,7 +38,7 @@ import type {TerminalWriteInput,} from "@t3tools/contracts";import { TerminalManager, type TerminalManagerShape } from "./terminal/Services/Manager";-import { SqlitePersistenceMemory } from "./persistence/Layers/Sqlite";+import { makeSqlitePersistenceLive, SqlitePersistenceMemory } from "./persistence/Layers/Sqlite";import { SqlClient } from "effect/unstable/sql";import { ProviderService, type ProviderServiceShape } from "./provider/Services/ProviderService";import { Open, type OpenShape } from "./open";@@ -506,6 +506,61 @@ describe("WebSocket Server", () => {);});+ it("includes bootstrap ids in welcome when cwd project and thread already exist", async () => {+ const stateDir = makeTempDir("t3code-state-bootstrap-existing-");+ const persistenceLayer = makeSqlitePersistenceLive(+ path.join(stateDir, "state.sqlite"),+ ) as unknown as Layer.Layer<SqlClient.SqlClient, never>;+ const cwd = "/test/bootstrap-existing";++ server = await createTestServer({+ cwd,+ stateDir,+ persistenceLayer,+ autoBootstrapProjectFromCwd: true,+ });+ let addr = server.address();+ let port = typeof addr === "object" && addr !== null ? addr.port : 0;+ expect(port).toBeGreaterThan(0);++ const firstWs = await connectWs(port);+ connections.push(firstWs);+ const firstWelcome = (await waitForMessage(firstWs)) as WsPush;+ const firstBootstrapProjectId = (firstWelcome.data as { bootstrapProjectId?: string })+ .bootstrapProjectId;+ const firstBootstrapThreadId = (firstWelcome.data as { bootstrapThreadId?: string })+ .bootstrapThreadId;+ expect(firstBootstrapProjectId).toBeDefined();+ expect(firstBootstrapThreadId).toBeDefined();++ firstWs.close();+ await closeTestServer();+ server = null;++ server = await createTestServer({+ cwd,+ stateDir,+ persistenceLayer,+ autoBootstrapProjectFromCwd: true,+ });+ addr = server.address();+ port = typeof addr === "object" && addr !== null ? addr.port : 0;+ expect(port).toBeGreaterThan(0);++ const secondWs = await connectWs(port);+ connections.push(secondWs);+ const secondWelcome = (await waitForMessage(secondWs)) as WsPush;+ expect(secondWelcome.channel).toBe(WS_CHANNELS.serverWelcome);+ expect(secondWelcome.data).toEqual(+ expect.objectContaining({+ cwd,+ projectName: "bootstrap-existing",+ bootstrapProjectId: firstBootstrapProjectId,+ bootstrapThreadId: firstBootstrapThreadId,+ }),+ );+ });+it("logs outbound websocket push events in dev mode", async () => {const logSpy = vi.spyOn(console, "log").mockImplementation(() => {// Keep test output clean while verifying websocket logs.diff --git a/apps/server/src/wsServer.ts b/apps/server/src/wsServer.tsindex 010014101..f00a99019 100644--- a/apps/server/src/wsServer.ts+++ b/apps/server/src/wsServer.ts@@ -388,6 +388,9 @@ export const createServer = Effect.fn(function* (): Effect.fn.Return<});welcomeBootstrapProjectId = bootstrapProjectId;welcomeBootstrapThreadId = threadId;+ } else {+ welcomeBootstrapProjectId = bootstrapProjectId;+ welcomeBootstrapThreadId = existingThread.id;}}).pipe(Effect.mapError(diff --git a/apps/web/src/routes/__root.tsx b/apps/web/src/routes/__root.tsxindex a7fbeb339..000e13204 100644--- a/apps/web/src/routes/__root.tsx+++ b/apps/web/src/routes/__root.tsx@@ -194,6 +194,9 @@ function EventRouter() {const unsubWelcome = onServerWelcome((payload) => {void (async () => {await syncSnapshot();+ if (disposed) {+ return;+ }if (!payload.bootstrapProjectId || !payload.bootstrapThreadId) {return;@@ -209,12 +212,12 @@ function EventRouter() {if (handledBootstrapThreadIdRef.current === payload.bootstrapThreadId) {return;}- handledBootstrapThreadIdRef.current = payload.bootstrapThreadId;await navigate({to: "/$threadId",params: { threadId: payload.bootstrapThreadId },replace: true,});+ handledBootstrapThreadIdRef.current = payload.bootstrapThreadId;})().catch(() => undefined);});const unsubServerConfigUpdated = onServerConfigUpdated((payload) => {