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.

fix(web): open diff files from nested projects (#6174)

Guilherme Barros9f26656cb958
diff --git a/apps/web/src/components/DiffPanel.tsx b/apps/web/src/components/DiffPanel.tsx
index b929d05a7..66f0a4e11 100644
--- a/apps/web/src/components/DiffPanel.tsx
+++ b/apps/web/src/components/DiffPanel.tsx
@@ -134,6 +134,9 @@ export default function DiffPanel({
: null,
);
const activeCwd = activeThread?.worktreePath ?? activeProject?.workspaceRoot;
+ const activeRepositoryRoot = activeThread?.worktreePath
+ ? undefined
+ : activeProject?.repositoryIdentity?.rootPath;
const serverConfig = useAtomValue(
serverEnvironment.configValueAtom(activeThread?.environmentId ?? null),
);
@@ -443,6 +446,7 @@ export default function DiffPanel({
threadRef: routeThreadRef,
filePath,
activeCwd,
+ repositoryRoot: activeRepositoryRoot,
openInEditor: (targetPath) => {
void (async () => {
const result = await openInPreferredEditor(targetPath);
@@ -462,7 +466,7 @@ export default function DiffPanel({
},
});
},
- [activeCwd, openInPreferredEditor, routeThreadRef],
+ [activeCwd, activeRepositoryRoot, openInPreferredEditor, routeThreadRef],
);
const toggleDiffFileCollapsed = useCallback(
(fileKey: string) => {
diff --git a/apps/web/src/diffFileActions.test.ts b/apps/web/src/diffFileActions.test.ts
index 9c358ab1d..c5d3571a9 100644
--- a/apps/web/src/diffFileActions.test.ts
+++ b/apps/web/src/diffFileActions.test.ts
@@ -2,7 +2,7 @@ import { scopeThreadRef } from "@t3tools/client-runtime/environment";
import { EnvironmentId, ThreadId } from "@t3tools/contracts";
import { beforeEach, describe, expect, it, vi } from "vite-plus/test";
-import { openDiffFilePrimaryAction } from "./diffFileActions";
+import { openDiffFilePrimaryAction, resolveDiffPathForWorkspace } from "./diffFileActions";
import { selectThreadRightPanelState, useRightPanelStore } from "./rightPanelStore";
const THREAD_REF = scopeThreadRef(
@@ -48,4 +48,77 @@ describe("openDiffFilePrimaryAction", () => {
"/repo/project/apps/web/src/components/DiffPanel.tsx",
);
});
+
+ it("opens repository-relative diff files from a nested project", () => {
+ const openInEditor = vi.fn();
+
+ openDiffFilePrimaryAction({
+ threadRef: THREAD_REF,
+ filePath: "frontend/Dockerfile",
+ activeCwd: "/repo/frontend",
+ repositoryRoot: "/repo",
+ openInEditor,
+ });
+
+ expect(
+ selectThreadRightPanelState(useRightPanelStore.getState().byThreadKey, THREAD_REF),
+ ).toMatchObject({
+ isOpen: true,
+ activeSurfaceId: "file:Dockerfile",
+ });
+ expect(openInEditor).not.toHaveBeenCalled();
+ });
+
+ it("preserves repository-relative paths in a separate worktree", () => {
+ expect(
+ resolveDiffPathForWorkspace({
+ filePath: "frontend/Dockerfile",
+ workspaceRoot: "/worktrees/feature",
+ repositoryRoot: "/repo",
+ }),
+ ).toBe("frontend/Dockerfile");
+ });
+
+ it("handles Windows roots and mixed diff separators", () => {
+ expect(
+ resolveDiffPathForWorkspace({
+ filePath: "Frontend/src\\index.ts",
+ workspaceRoot: "C:\\repo\\frontend",
+ repositoryRoot: "C:\\repo",
+ }),
+ ).toBe("src/index.ts");
+ });
+
+ it.each([
+ { workspaceRoot: "/frontend", repositoryRoot: "/" },
+ { workspaceRoot: "C:\\frontend", repositoryRoot: "C:\\" },
+ ])("handles filesystem roots: $repositoryRoot", ({ workspaceRoot, repositoryRoot }) => {
+ expect(
+ resolveDiffPathForWorkspace({
+ filePath: "frontend/index.ts",
+ workspaceRoot,
+ repositoryRoot,
+ }),
+ ).toBe("index.ts");
+ });
+
+ it.each(["backend/server.ts", "frontend2/app.ts", "frontend/../secret.ts", "C:secret.ts"])(
+ "does not open an out-of-project diff path: %s",
+ (filePath) => {
+ const openInEditor = vi.fn();
+
+ openDiffFilePrimaryAction({
+ threadRef: THREAD_REF,
+ filePath,
+ activeCwd: "/repo/frontend",
+ repositoryRoot: "/repo",
+ openInEditor,
+ });
+
+ expect(
+ selectThreadRightPanelState(useRightPanelStore.getState().byThreadKey, THREAD_REF),
+ ).toMatchObject({ isOpen: false });
+ expect(openInEditor).not.toHaveBeenCalled();
+ },
+ );
});
diff --git a/apps/web/src/diffFileActions.ts b/apps/web/src/diffFileActions.ts
index 335ad21fc..3ac22c28c 100644
--- a/apps/web/src/diffFileActions.ts
+++ b/apps/web/src/diffFileActions.ts
@@ -1,4 +1,5 @@
import type { ScopedThreadRef } from "@t3tools/contracts";
+import { isWindowsAbsolutePath, normalizeProjectPathForComparison } from "@t3tools/shared/path";
import { useRightPanelStore } from "./rightPanelStore";
import { resolvePathLinkTarget } from "./terminal-links";
@@ -7,19 +8,93 @@ interface OpenDiffFilePrimaryActionInput {
readonly threadRef: ScopedThreadRef | null;
readonly filePath: string;
readonly activeCwd: string | undefined;
+ readonly repositoryRoot?: string | undefined;
readonly openInEditor: (targetPath: string) => void;
}
+function normalizedRelativePathSegments(filePath: string): ReadonlyArray<string> | null {
+ if (filePath.startsWith("/") || isWindowsAbsolutePath(filePath) || /^[a-zA-Z]:/.test(filePath)) {
+ return null;
+ }
+
+ const segments = filePath
+ .replaceAll("\\", "/")
+ .split("/")
+ .filter((segment) => segment.length > 0 && segment !== ".");
+ if (segments.length === 0 || segments.includes("..")) return null;
+ return segments;
+}
+
+function repositoryRelativeWorkspaceSegments(
+ workspaceRoot: string | undefined,
+ repositoryRoot: string | undefined,
+): ReadonlyArray<string> | null {
+ if (!workspaceRoot || !repositoryRoot) return null;
+
+ const normalizedWorkspaceRoot = normalizeProjectPathForComparison(workspaceRoot);
+ const normalizedRepositoryRoot = normalizeProjectPathForComparison(repositoryRoot);
+ if (normalizedWorkspaceRoot === normalizedRepositoryRoot) return [];
+
+ const separator = normalizedRepositoryRoot.includes("\\") ? "\\" : "/";
+ const repositoryPrefix = normalizedRepositoryRoot.endsWith(separator)
+ ? normalizedRepositoryRoot
+ : `${normalizedRepositoryRoot}${separator}`;
+ if (!normalizedWorkspaceRoot.startsWith(repositoryPrefix)) return null;
+
+ return normalizedWorkspaceRoot
+ .slice(repositoryPrefix.length)
+ .split(/[\\/]+/)
+ .filter(Boolean);
+}
+
+export function resolveDiffPathForWorkspace(input: {
+ readonly filePath: string;
+ readonly workspaceRoot: string | undefined;
+ readonly repositoryRoot: string | undefined;
+}): string | null {
+ const fileSegments = normalizedRelativePathSegments(input.filePath);
+ if (!fileSegments) return null;
+
+ const workspaceSegments = repositoryRelativeWorkspaceSegments(
+ input.workspaceRoot,
+ input.repositoryRoot,
+ );
+ if (!workspaceSegments || workspaceSegments.length === 0) {
+ return fileSegments.join("/");
+ }
+
+ const caseInsensitive = input.repositoryRoot
+ ? isWindowsAbsolutePath(input.repositoryRoot)
+ : false;
+ const belongsToWorkspace = workspaceSegments.every((segment, index) => {
+ const candidate = fileSegments[index];
+ if (candidate === undefined) return false;
+ return caseInsensitive ? candidate.toLowerCase() === segment : candidate === segment;
+ });
+ if (!belongsToWorkspace) return null;
+
+ const relativeSegments = fileSegments.slice(workspaceSegments.length);
+ return relativeSegments.length > 0 ? relativeSegments.join("/") : null;
+}
+
export function openDiffFilePrimaryAction({
threadRef,
filePath,
activeCwd,
+ repositoryRoot,
openInEditor,
}: OpenDiffFilePrimaryActionInput): void {
+ const workspaceFilePath = resolveDiffPathForWorkspace({
+ filePath,
+ workspaceRoot: activeCwd,
+ repositoryRoot,
+ });
+ if (!workspaceFilePath) return;
+
if (threadRef) {
- useRightPanelStore.getState().openFile(threadRef, filePath);
+ useRightPanelStore.getState().openFile(threadRef, workspaceFilePath);
return;
}
- openInEditor(activeCwd ? resolvePathLinkTarget(filePath, activeCwd) : filePath);
+ openInEditor(activeCwd ? resolvePathLinkTarget(workspaceFilePath, activeCwd) : workspaceFilePath);
}