getcompanion-ai/co-mono
1
0
Fork 0
mirror of https://github.com/getcompanion-ai/co-mono.git synced 2026-04-17 08:00:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(diff): keep picker open after selection

Browse source
This commit is contained in:
Mario Zechner 2026-01-26 23:04:32 +01:00
parent 5dbeadae05
commit a5f603d704
1 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

47
.pi/extensions/diff.ts
View file

@ -66,8 +66,29 @@ export default function (pi: ExtensionAPI) {
return; return;
} }
const openSelected = async (fileInfo: FileInfo): Promise<void> => {
try {
// Open in VS Code diff view.
// For untracked files, git difftool won't work, so fall back to just opening the file.
if (fileInfo.status === "?") {
await pi.exec("code", ["-g", fileInfo.file], { cwd: ctx.cwd });
return;
}
const diffResult = await pi.exec("git", ["difftool", "-y", "--tool=vscode", fileInfo.file], {
cwd: ctx.cwd,
});
if (diffResult.code !== 0) {
await pi.exec("code", ["-g", fileInfo.file], { cwd: ctx.cwd });
}
} catch (error) {
const message = error instanceof Error ? error.message : String(error);
ctx.ui.notify(`Failed to open ${fileInfo.file}: ${message}`, "error");
}
};
// Show file picker with SelectList // Show file picker with SelectList
const selected = await ctx.ui.custom<FileInfo | null>((tui, theme, _kb, done) => { await ctx.ui.custom<void>((tui, theme, _kb, done) => {
const container = new Container(); const container = new Container();
// Top border // Top border
@ -111,8 +132,10 @@ export default function (pi: ExtensionAPI) {
scrollInfo: (t) => theme.fg("dim", t), scrollInfo: (t) => theme.fg("dim", t),
noMatch: (t) => theme.fg("warning", t), noMatch: (t) => theme.fg("warning", t),
}); });
selectList.onSelect = (item) => done(item.value as FileInfo); selectList.onSelect = (item) => {
selectList.onCancel = () => done(null); void openSelected(item.value as FileInfo);
};
selectList.onCancel = () => done();
selectList.onSelectionChange = (item) => { selectList.onSelectionChange = (item) => {
currentIndex = items.indexOf(item); currentIndex = items.indexOf(item);
}; };
@ -120,7 +143,7 @@ export default function (pi: ExtensionAPI) {
// Help text // Help text
container.addChild( container.addChild(
new Text(theme.fg("dim", " ↑↓ navigate • ←→ page • enter select • esc cancel"), 0, 0), new Text(theme.fg("dim", " ↑↓ navigate • ←→ page • enter open • esc close"), 0, 0),
); );
// Bottom border // Bottom border
@ -146,22 +169,6 @@ export default function (pi: ExtensionAPI) {
}, },
}; };
}); });
if (!selected) return;
// Open in VS Code diff view (this will block until VS Code is closed)
// For untracked files, git difftool won't work, so fall back to just opening the file
if (selected.status === "?") {
await pi.exec("code", ["-g", selected.file], { cwd: ctx.cwd });
} else {
const diffResult = await pi.exec("git", ["difftool", "-y", "--tool=vscode", selected.file], {
cwd: ctx.cwd,
});
// Fallback if difftool fails
if (diffResult.code !== 0) {
await pi.exec("code", ["-g", selected.file], { cwd: ctx.cwd });
}
}
}, },
}); });
} }