Skip to content

feat: route git mutator IPC through registry #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
parsakhaz wants to merge 1 commit into
base: phase2-command-registry-git-status-runtime
Choose a base branch
from
Open

feat: route git mutator IPC through registry #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions main/src/ipc/daemonRegistryBindings.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ const GIT_STATUS_CHANNELS = [
'git:get-github-remote',
] as const;

const GIT_DIRECT_MUTATION_CHANNELS = [
const GIT_MUTATION_CHANNELS = [
'sessions:git-commit',
'sessions:rebase-main-into-worktree',
'sessions:abort-rebase-and-use-claude',
Expand All @@ -198,6 +198,11 @@ const GIT_DIRECT_MUTATION_CHANNELS = [
'git:clone-repo',
] as const;

const GIT_CHANNELS = [
...GIT_STATUS_CHANNELS,
...GIT_MUTATION_CHANNELS,
] as const;

interface IpcMainStub {
boundChannels: string[];
handle(channel: string, listener: (_event: unknown, ...args: unknown[]) => unknown): void;
Expand Down Expand Up @@ -320,19 +325,14 @@ describe('daemon registry IPC bindings', () => {
expect(registry.has('sessions:set-active-session')).toBe(false);
});

it('keeps git mutators direct while routing git status and history through the registry', () => {
it('routes all daemon-owned git handlers through the shared registry', () => {
const registry = new PaneCommandRegistry();
const ipcMain = createIpcMainStub();

registerGitHandlers(ipcMain, createServicesStub(), registry);

expect(registry.listChannels()).toEqual([...GIT_STATUS_CHANNELS].sort());
expect(
ipcMain.boundChannels.filter(channel => !GIT_DIRECT_MUTATION_CHANNELS.includes(channel as (typeof GIT_DIRECT_MUTATION_CHANNELS)[number])).sort(),
).toEqual([...GIT_STATUS_CHANNELS].sort());
expect(ipcMain.boundChannels.filter(channel => GIT_DIRECT_MUTATION_CHANNELS.includes(channel as (typeof GIT_DIRECT_MUTATION_CHANNELS)[number])).sort()).toEqual(
[...GIT_DIRECT_MUTATION_CHANNELS].sort(),
);
expect(registry.has('git:clone-repo')).toBe(false);
expect(registry.listChannels()).toEqual([...GIT_CHANNELS].sort());
expect(ipcMain.boundChannels.sort()).toEqual([...GIT_CHANNELS].sort());
expect(registry.has('git:clone-repo')).toBe(true);
});
});
52 changes: 37 additions & 15 deletions main/src/ipc/git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,28 @@ const DAEMON_GIT_STATUS_CHANNELS = [
'git:get-github-remote',
] as const;

const DAEMON_GIT_MUTATION_CHANNELS = [
'sessions:git-commit',
'sessions:rebase-main-into-worktree',
'sessions:abort-rebase-and-use-claude',
'sessions:squash-and-rebase-to-main',
'sessions:rebase-to-main',
'sessions:git-pull',
'sessions:git-push',
'sessions:git-soft-reset',
'sessions:git-fetch',
'sessions:git-stash',
'sessions:git-stash-pop',
'sessions:set-upstream',
'sessions:git-stage-and-commit',
'git:clone-repo',
] as const;

const DAEMON_GIT_CHANNELS = [
...DAEMON_GIT_STATUS_CHANNELS,
...DAEMON_GIT_MUTATION_CHANNELS,
] as const;

export function registerGitHandlers(
ipcMain: IpcMain,
services: AppServices,
Expand Down Expand Up @@ -408,7 +430,7 @@ export function registerGitHandlers(
}
});

ipcMain.handle('sessions:git-commit', async (_event, sessionId: string, message: string) => {
commandRegistry.register('sessions:git-commit', async (sessionId: string, message: string) => {
try {
const session = await sessionManager.getSession(sessionId);
if (!session || !session.worktreePath) {
Expand Down Expand Up @@ -840,7 +862,7 @@ export function registerGitHandlers(
}
});

ipcMain.handle('sessions:rebase-main-into-worktree', async (_event, sessionId: string) => {
commandRegistry.register('sessions:rebase-main-into-worktree', async (sessionId: string) => {
try {
const session = await sessionManager.getSession(sessionId);
if (!session) {
Expand Down Expand Up @@ -986,7 +1008,7 @@ export function registerGitHandlers(
}
});

ipcMain.handle('sessions:abort-rebase-and-use-claude', async (_event, sessionId: string) => {
commandRegistry.register('sessions:abort-rebase-and-use-claude', async (sessionId: string) => {
try {
const session = await sessionManager.getSession(sessionId);
if (!session) {
Expand Down Expand Up @@ -1071,7 +1093,7 @@ export function registerGitHandlers(
}
});

ipcMain.handle('sessions:squash-and-rebase-to-main', async (_event, sessionId: string, commitMessage: string) => {
commandRegistry.register('sessions:squash-and-rebase-to-main', async (sessionId: string, commitMessage: string) => {
try {
const session = await sessionManager.getSession(sessionId);
if (!session) {
Expand Down Expand Up @@ -1166,7 +1188,7 @@ export function registerGitHandlers(
}
});

ipcMain.handle('sessions:rebase-to-main', async (_event, sessionId: string) => {
commandRegistry.register('sessions:rebase-to-main', async (sessionId: string) => {
try {
const session = await sessionManager.getSession(sessionId);
if (!session) {
Expand Down Expand Up @@ -1253,7 +1275,7 @@ export function registerGitHandlers(
});

// Git pull/push operations for main repo sessions
ipcMain.handle('sessions:git-pull', async (_event, sessionId: string) => {
commandRegistry.register('sessions:git-pull', async (sessionId: string) => {
try {
const session = await sessionManager.getSession(sessionId);
if (!session) {
Expand Down Expand Up @@ -1332,7 +1354,7 @@ export function registerGitHandlers(
}
});

ipcMain.handle('sessions:git-push', async (_event, sessionId: string) => {
commandRegistry.register('sessions:git-push', async (sessionId: string) => {
try {
const session = await sessionManager.getSession(sessionId);
if (!session) {
Expand Down Expand Up @@ -1409,7 +1431,7 @@ export function registerGitHandlers(
}
});

ipcMain.handle('sessions:git-soft-reset', async (_event, sessionId: string) => {
commandRegistry.register('sessions:git-soft-reset', async (sessionId: string) => {
try {
const session = await sessionManager.getSession(sessionId);
if (!session) {
Expand Down Expand Up @@ -1479,7 +1501,7 @@ export function registerGitHandlers(
}
});

ipcMain.handle('sessions:git-fetch', async (_event, sessionId: string) => {
commandRegistry.register('sessions:git-fetch', async (sessionId: string) => {
try {
const session = await sessionManager.getSession(sessionId);
if (!session) {
Expand Down Expand Up @@ -1539,7 +1561,7 @@ export function registerGitHandlers(
}
});

ipcMain.handle('sessions:git-stash', async (_event, sessionId: string, message?: string) => {
commandRegistry.register('sessions:git-stash', async (sessionId: string, message?: string) => {
try {
const session = await sessionManager.getSession(sessionId);
if (!session) {
Expand Down Expand Up @@ -1599,7 +1621,7 @@ export function registerGitHandlers(
}
});

ipcMain.handle('sessions:git-stash-pop', async (_event, sessionId: string) => {
commandRegistry.register('sessions:git-stash-pop', async (sessionId: string) => {
try {
const session = await sessionManager.getSession(sessionId);
if (!session) {
Expand Down Expand Up @@ -1684,7 +1706,7 @@ export function registerGitHandlers(
}
});

ipcMain.handle('sessions:set-upstream', async (_event, sessionId: string, remoteBranch: string) => {
commandRegistry.register('sessions:set-upstream', async (sessionId: string, remoteBranch: string) => {
try {
const session = await sessionManager.getSession(sessionId);
if (!session) {
Expand Down Expand Up @@ -1768,7 +1790,7 @@ export function registerGitHandlers(
}
});

ipcMain.handle('sessions:git-stage-and-commit', async (_event, sessionId: string, message: string) => {
commandRegistry.register('sessions:git-stage-and-commit', async (sessionId: string, message: string) => {
try {
const session = await sessionManager.getSession(sessionId);
if (!session) {
Expand Down Expand Up @@ -2060,7 +2082,7 @@ export function registerGitHandlers(
}
});

ipcMain.handle('git:clone-repo', async (_event, url: string, destDir: string) => {
commandRegistry.register('git:clone-repo', async (url: string, destDir: string) => {
if (!isValidGitUrl(url)) {
return { success: false, error: 'Invalid repository URL. Use https:// or git@ format.' };
}
Expand Down Expand Up @@ -2121,5 +2143,5 @@ export function registerGitHandlers(
}
});

commandRegistry.bindChannels(ipcMain, DAEMON_GIT_STATUS_CHANNELS);
commandRegistry.bindChannels(ipcMain, DAEMON_GIT_CHANNELS);
}