apunkt/rowboat
1
0
Fork 0
mirror of https://github.com/rowboatlabs/rowboat.git synced 2026-06-24 20:28:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix file diffs

Browse source
This commit is contained in:
Arjun 2026-06-20 00:02:29 +05:30
parent f65f7e8fc8
commit f848d235d8
2 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
apps/x/apps/main/src/ipc.ts
View file

@ -1006,12 +1006,22 @@ export function setupIpcHandlers() {
if (!info.isGitRepo) {
return { isRepo: false, branch: null, hasCommits: false, files: [] };
}
const files = await codeGit.status(session.cwd);
let files = await codeGit.status(session.cwd);
if (session.worktree && !session.worktree.removedAt && session.worktree.baseBranch) {
const branchFiles = await codeGit.changedSinceBase(session.cwd, session.worktree.baseBranch);
const byPath = new Map(branchFiles.map((file) => [file.path, file]));
for (const file of files) {
if (!byPath.has(file.path)) byPath.set(file.path, file);
}
files = [...byPath.values()];
}
return { isRepo: true, branch: info.branch, hasCommits: info.hasCommits, files };
},
'codeSession:fileDiff': async (_event, args) => {
const session = await requireCodeSession(args.sessionId);
return codeGit.fileDiff(session.cwd, args.path);
return codeGit.fileDiff(session.cwd, args.path, {
baseRef: session.worktree && !session.worktree.removedAt ? session.worktree.baseBranch : null,
});
},
'codeSession:readdir': async (_event, args) => {
const session = await requireCodeSession(args.sessionId);

20
apps/x/packages/core/src/code-mode/git/service.ts
View file

@ -78,6 +78,14 @@ async function repoToplevel(cwd: string): Promise<string> {
}
}
async function mergeBase(cwd: string, baseRef: string): Promise<string> {
try {
return (await git(cwd, ['merge-base', baseRef, 'HEAD'])).trim() || baseRef;
} catch {
return baseRef;
}
}
function stateFromPorcelain(xy: string): GitFileState {
if (xy === '??') return 'untracked';
if (xy.includes('R')) return 'renamed';
@ -166,12 +174,7 @@ export async function status(cwd: string): Promise<GitStatusFile[]> {
// so it misses work an agent committed; this is what you want for a session
// summary. Counts come from numstat, states from name-status, merged by path.
export async function changedSinceBase(cwd: string, baseRef: string): Promise<GitStatusFile[]> {
let forkPoint = baseRef;
try {
forkPoint = (await git(cwd, ['merge-base', baseRef, 'HEAD'])).trim() || baseRef;
} catch {
forkPoint = baseRef;
}
const forkPoint = await mergeBase(cwd, baseRef);
const stateByPath = new Map<string, GitFileState>();
try {
@ -229,7 +232,7 @@ export interface FileDiff {
tooLarge: boolean;
}
export async function fileDiff(cwd: string, relPath: string): Promise<FileDiff> {
export async function fileDiff(cwd: string, relPath: string, opts: { baseRef?: string | null } = {}): Promise<FileDiff> {
// Paths from `status` are repo-root-relative; paths clicked in the chat
// timeline are cwd-relative. Resolve whichever interpretation points at a
// real file (deleted files fall back to the root interpretation, which is
@ -250,7 +253,8 @@ export async function fileDiff(cwd: string, relPath: string): Promise<FileDiff>
}
let oldText = '';
try {
oldText = await git(cwd, ['show', `HEAD:${gitPath}`]);
const oldRef = opts.baseRef ? await mergeBase(cwd, opts.baseRef) : 'HEAD';
oldText = await git(cwd, ['show', `${oldRef}:${gitPath}`]);
} catch {
// untracked / newly added / no commits — diff against empty
oldText = '';