From 6903d3c508ab29f4666777fcef5959b60ef10db5 Mon Sep 17 00:00:00 2001
From: gsxdsm <eclipxe@gmail.com>
Date: Wed, 18 Feb 2026 11:21:43 -0800
Subject: [PATCH] fix: Standardize event name and import path

---
 apps/server/src/routes/worktree/routes/rebase.ts | 2 +-
 apps/server/src/services/merge-service.ts        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/server/src/routes/worktree/routes/rebase.ts b/apps/server/src/routes/worktree/routes/rebase.ts
index ecf5934b..7efb2c4b 100644
--- a/apps/server/src/routes/worktree/routes/rebase.ts
+++ b/apps/server/src/routes/worktree/routes/rebase.ts
@@ -98,7 +98,7 @@ export function createRebaseHandler(events: EventEmitter) {
         });
       } else {
         // Emit failure event for non-conflict failures
-        events.emit('rebase:failed', {
+        events.emit('rebase:failure', {
           worktreePath: resolvedWorktreePath,
           branch: result.branch,
           ontoBranch: result.ontoBranch,
diff --git a/apps/server/src/services/merge-service.ts b/apps/server/src/services/merge-service.ts
index 4992f25c..32ed07ae 100644
--- a/apps/server/src/services/merge-service.ts
+++ b/apps/server/src/services/merge-service.ts
@@ -5,7 +5,7 @@
  */
 
 import { createLogger } from '@automaker/utils';
-import { createEventEmitter } from '../lib/events';
+import { createEventEmitter } from '../lib/events.js';
 import { execGitCommand } from '../lib/git.js';
 const logger = createLogger('MergeService');