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.
Address latest PR review comments
Julius Marminge8e744269a2ed
diff --git a/apps/server/src/codexAppServerManager.test.ts b/apps/server/src/codexAppServerManager.test.tsindex 59077ce78..afb23d48a 100644--- a/apps/server/src/codexAppServerManager.test.ts+++ b/apps/server/src/codexAppServerManager.test.ts@@ -143,6 +143,40 @@ describe("isRecoverableThreadResumeError", () => {});});+describe("startSession", () => {+ it("emits session/startFailed when resolving cwd throws before process launch", async () => {+ const manager = new CodexAppServerManager();+ const events: Array<{ method: string; kind: string; message?: string }> = [];+ manager.on("event", (event) => {+ events.push({+ method: event.method,+ kind: event.kind,+ ...(event.message ? { message: event.message } : {}),+ });+ });++ const processCwd = vi.spyOn(process, "cwd").mockImplementation(() => {+ throw new Error("cwd missing");+ });+ try {+ await expect(+ manager.startSession({+ provider: "codex",+ }),+ ).rejects.toThrow("cwd missing");+ expect(events).toHaveLength(1);+ expect(events[0]).toEqual({+ method: "session/startFailed",+ kind: "error",+ message: "cwd missing",+ });+ } finally {+ processCwd.mockRestore();+ manager.stopAll();+ }+ });+});+describe("sendTurn", () => {it("sends text and image user input items to turn/start", async () => {const { manager, context, requireSession, sendRequest, updateSession } =diff --git a/apps/server/src/codexAppServerManager.ts b/apps/server/src/codexAppServerManager.tsindex c3352ccb2..406a41a08 100644--- a/apps/server/src/codexAppServerManager.ts+++ b/apps/server/src/codexAppServerManager.ts@@ -148,41 +148,43 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEveasync startSession(input: ProviderSessionStartInput): Promise<ProviderSession> {const sessionId = randomUUID();const now = new Date().toISOString();- const resolvedCwd = input.cwd ?? process.cwd();+ let context: CodexSessionContext | undefined;- const session: ProviderSession = {- sessionId,- provider: "codex",- status: "connecting",- model: normalizeCodexModelSlug(input.model),- cwd: resolvedCwd,- createdAt: now,- updatedAt: now,- };+ try {+ const resolvedCwd = input.cwd ?? process.cwd();- const child = spawn("codex", ["app-server"], {- cwd: resolvedCwd,- env: process.env,- stdio: ["pipe", "pipe", "pipe"],- });- const output = readline.createInterface({ input: child.stdout });-- const context: CodexSessionContext = {- session,- child,- output,- pending: new Map(),- pendingApprovals: new Map(),- nextRequestId: 1,- stopping: false,- };+ const session: ProviderSession = {+ sessionId,+ provider: "codex",+ status: "connecting",+ model: normalizeCodexModelSlug(input.model),+ cwd: resolvedCwd,+ createdAt: now,+ updatedAt: now,+ };- this.sessions.set(sessionId, context);- this.attachProcessListeners(context);+ const child = spawn("codex", ["app-server"], {+ cwd: resolvedCwd,+ env: process.env,+ stdio: ["pipe", "pipe", "pipe"],+ });+ const output = readline.createInterface({ input: child.stdout });++ context = {+ session,+ child,+ output,+ pending: new Map(),+ pendingApprovals: new Map(),+ nextRequestId: 1,+ stopping: false,+ };- this.emitLifecycleEvent(context, "session/connecting", "Starting codex app-server");+ this.sessions.set(sessionId, context);+ this.attachProcessListeners(context);++ this.emitLifecycleEvent(context, "session/connecting", "Starting codex app-server");- try {await this.sendRequest(context, "initialize", {clientInfo: {name: "t3code_desktop",@@ -252,12 +254,24 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEvereturn { ...context.session };} catch (error) {const message = error instanceof Error ? error.message : "Failed to start Codex session.";- this.updateSession(context, {- status: "error",- lastError: message,- });- this.emitErrorEvent(context, "session/startFailed", message);- this.stopSession(sessionId);+ if (context) {+ this.updateSession(context, {+ status: "error",+ lastError: message,+ });+ this.emitErrorEvent(context, "session/startFailed", message);+ this.stopSession(sessionId);+ } else {+ this.emitEvent({+ id: randomUUID(),+ kind: "error",+ provider: "codex",+ sessionId,+ createdAt: new Date().toISOString(),+ method: "session/startFailed",+ message,+ });+ }throw new Error(message, { cause: error });}}diff --git a/apps/server/src/filesystemCheckpointStore.test.ts b/apps/server/src/filesystemCheckpointStore.test.tsindex 185ac2807..0938fcb93 100644--- a/apps/server/src/filesystemCheckpointStore.test.ts+++ b/apps/server/src/filesystemCheckpointStore.test.ts@@ -204,4 +204,11 @@ describe("FilesystemCheckpointStore", () => {await rm(cwd, { recursive: true, force: true });}});++ it("returns false when repository path does not exist", async () => {+ const store = new FilesystemCheckpointStore();+ const cwd = path.join(os.tmpdir(), `t3-fs-checkpoints-missing-${Date.now()}`);++ expect(await store.isGitRepository(cwd)).toBe(false);+ });});diff --git a/apps/server/src/filesystemCheckpointStore.ts b/apps/server/src/filesystemCheckpointStore.tsindex 2de2a65b2..7b517f4fe 100644--- a/apps/server/src/filesystemCheckpointStore.ts+++ b/apps/server/src/filesystemCheckpointStore.ts@@ -32,10 +32,14 @@ interface GitOptions {export class FilesystemCheckpointStore {async isGitRepository(cwd: string): Promise<boolean> {- const result = await this.runGit(cwd, ["rev-parse", "--is-inside-work-tree"], {- allowNonZeroExit: true,- });- return result.code === 0 && result.stdout.trim() === "true";+ try {+ const result = await this.runGit(cwd, ["rev-parse", "--is-inside-work-tree"], {+ allowNonZeroExit: true,+ });+ return result.code === 0 && result.stdout.trim() === "true";+ } catch {+ return false;+ }}async captureCheckpoint(input: {diff --git a/apps/web/src/store.test.ts b/apps/web/src/store.test.tsindex 625934f04..cbdd5617b 100644--- a/apps/web/src/store.test.ts+++ b/apps/web/src/store.test.ts@@ -618,10 +618,10 @@ describe("store reducer thread continuity", () => {],activeThreadId: "thread-b",runtimeMode: "full-access",- diffOpen: false,- diffThreadId: null,- diffTurnId: null,- diffFilePath: null,+ diffOpen: true,+ diffThreadId: "thread-b",+ diffTurnId: "turn-b",+ diffFilePath: "src/removed.ts",};const next = reducer(state, {@@ -646,6 +646,10 @@ describe("store reducer thread continuity", () => {expect(next.threads[0]?.id).toBe("thread-a");expect(next.threads[0]?.projectId).toBe("project-new-a");expect(next.activeThreadId).toBe("thread-a");+ expect(next.diffOpen).toBe(false);+ expect(next.diffThreadId).toBeNull();+ expect(next.diffTurnId).toBeNull();+ expect(next.diffFilePath).toBeNull();});it("treats empty scripts from sync as authoritative", () => {@@ -753,10 +757,10 @@ describe("store reducer thread continuity", () => {],activeThreadId: "thread-a",runtimeMode: "full-access",- diffOpen: false,- diffThreadId: null,- diffTurnId: null,- diffFilePath: null,+ diffOpen: true,+ diffThreadId: "thread-a",+ diffTurnId: "turn-a",+ diffFilePath: "src/a.ts",};const next = reducer(state, {@@ -769,6 +773,10 @@ describe("store reducer thread continuity", () => {expect(next.threads).toHaveLength(1);expect(next.threads[0]?.id).toBe("thread-b");expect(next.activeThreadId).toBe("thread-b");+ expect(next.diffOpen).toBe(false);+ expect(next.diffThreadId).toBeNull();+ expect(next.diffTurnId).toBeNull();+ expect(next.diffFilePath).toBeNull();});it("marks the active thread as visited when selected", () => {diff --git a/apps/web/src/store.ts b/apps/web/src/store.tsindex 06f3e1052..439368cf9 100644--- a/apps/web/src/store.ts+++ b/apps/web/src/store.ts@@ -198,6 +198,32 @@ function updateThread(return threads.map((t) => (t.id === threadId ? updater(t) : t));}+function resetDiffTargetIfMissing(state: AppState, threads: Thread[]) {+ if (!state.diffThreadId) {+ return {+ diffOpen: state.diffOpen,+ diffThreadId: state.diffThreadId,+ diffTurnId: state.diffTurnId,+ diffFilePath: state.diffFilePath,+ };+ }+ const hasThread = threads.some((thread) => thread.id === state.diffThreadId);+ if (hasThread) {+ return {+ diffOpen: state.diffOpen,+ diffThreadId: state.diffThreadId,+ diffTurnId: state.diffTurnId,+ diffFilePath: state.diffFilePath,+ };+ }+ return {+ diffOpen: false,+ diffThreadId: null,+ diffTurnId: null,+ diffFilePath: null,+ };+}+function mergeTurnDiffSummaries(existing: Thread["turnDiffSummaries"],next: Thread["turnDiffSummaries"],@@ -602,12 +628,14 @@ export function reducer(state: AppState, action: Action): AppState {const activeThreadId = nextThreads.some((thread) => thread.id === state.activeThreadId)? state.activeThreadId: (nextThreads[0]?.id ?? null);+ const diffState = resetDiffTargetIfMissing(state, nextThreads);return {...state,projects: nextProjects,threads: nextThreads,activeThreadId,+ ...diffState,};}@@ -629,12 +657,14 @@ export function reducer(state: AppState, action: Action): AppState {const activeThreadId = threads.some((thread) => thread.id === state.activeThreadId)? state.activeThreadId: (threads[0]?.id ?? null);+ const diffState = resetDiffTargetIfMissing(state, threads);return {...state,projects,threads,activeThreadId,+ ...diffState,};}