kanna-code 0.24.0 → 0.25.0

package/src/server/ws-router.ts

@@ -22,7 +22,7 @@ export interface ClientState {
 
 interface CreateWsRouterArgs {
   store: EventStore
-  diffStore?: Pick<DiffStore, "getSnapshot" | "refreshSnapshot" | "listBranches" | "syncBranch" | "checkoutBranch" | "createBranch" | "generateCommitMessage" | "commitFiles" | "discardFile" | "ignoreFile">
+  diffStore?: Pick<DiffStore, "getProjectSnapshot" | "refreshSnapshot" | "listBranches" | "previewMergeBranch" | "mergeBranch" | "syncBranch" | "checkoutBranch" | "createBranch" | "generateCommitMessage" | "commitFiles" | "discardFile" | "ignoreFile" | "readPatch">
   agent: AgentCoordinator
   terminals: TerminalManager
   keybindings: KeybindingsManager
@@ -57,9 +57,11 @@ export function createWsRouter({
 }: CreateWsRouterArgs) {
   const sockets = new Set<ServerWebSocket<ClientState>>()
   const resolvedDiffStore = diffStore ?? {
-    getSnapshot: () => ({ status: "unknown", branchName: undefined, defaultBranchName: undefined, originRepoSlug: undefined, hasUpstream: undefined, aheadCount: undefined, behindCount: undefined, lastFetchedAt: undefined, files: [] as const, branchHistory: { entries: [] as const } }),
+    getProjectSnapshot: () => ({ status: "unknown", branchName: undefined, defaultBranchName: undefined, originRepoSlug: undefined, hasUpstream: undefined, aheadCount: undefined, behindCount: undefined, lastFetchedAt: undefined, files: [] as const, branchHistory: { entries: [] as const } }),
     refreshSnapshot: async () => false,
     listBranches: async () => ({ recent: [], local: [], remote: [], pullRequests: [], pullRequestsStatus: "unavailable" as const }),
+    previewMergeBranch: async () => ({ currentBranchName: undefined, targetBranchName: "", targetDisplayName: "", status: "error" as const, commitCount: 0, hasConflicts: false, message: "Merge preview unavailable." }),
+    mergeBranch: async () => ({ ok: false as const, title: "Merge failed", message: "Merge unavailable.", snapshotChanged: false }),
     syncBranch: async () => ({ ok: true, action: "fetch" as const, branchName: undefined, snapshotChanged: false }),
     checkoutBranch: async () => ({ ok: true, branchName: undefined, snapshotChanged: false }),
     createBranch: async () => ({ ok: true, branchName: "main", snapshotChanged: false }),
@@ -67,6 +69,7 @@ export function createWsRouter({
     commitFiles: async () => ({ ok: true, mode: "commit_only" as const, branchName: undefined, pushed: false, snapshotChanged: false }),
     discardFile: async () => ({ snapshotChanged: false }),
     ignoreFile: async () => ({ snapshotChanged: false }),
+    readPatch: async () => ({ patch: "" }),
   }
 
   function createEnvelope(id: string, topic: SubscriptionTopic): ServerEnvelope {
@@ -141,6 +144,20 @@ export function createWsRouter({
       }
     }
 
+    if (topic.type === "project-git") {
+      return {
+        v: PROTOCOL_VERSION,
+        type: "snapshot",
+        id,
+        snapshot: {
+          type: "project-git",
+          data: store.getProject(topic.projectId)
+            ? resolvedDiffStore.getProjectSnapshot(topic.projectId)
+            : null,
+        },
+      }
+    }
+
     return {
       v: PROTOCOL_VERSION,
       type: "snapshot",
@@ -152,8 +169,7 @@ export function createWsRouter({
           agent.getActiveStatuses(),
           agent.getDrainingChatIds(),
           topic.chatId,
-          (chatId) => store.getRecentChatHistory(chatId, topic.recentLimit ?? DEFAULT_CHAT_RECENT_LIMIT),
-          (chatId) => resolvedDiffStore.getSnapshot(chatId)
+          (chatId) => store.getRecentChatHistory(chatId, topic.recentLimit ?? DEFAULT_CHAT_RECENT_LIMIT)
         ),
       },
     }
@@ -254,6 +270,14 @@ export function createWsRouter({
 
   agent.setBackgroundErrorReporter?.(broadcastError)
 
+  function resolveChatProject(chatId: string) {
+    const chat = store.getChat(chatId)
+    if (!chat) throw new Error("Chat not found")
+    const project = store.getProject(chat.projectId)
+    if (!project) throw new Error("Project not found")
+    return { chat, project }
+  }
+
   async function handleCommand(ws: ServerWebSocket<ClientState>, message: Extract<ClientEnvelope, { type: "command" }>) {
     const { command, id } = message
     try {
@@ -326,6 +350,18 @@ export function createWsRouter({
           send(ws, { v: PROTOCOL_VERSION, type: "ack", id })
           break
         }
+        case "project.readDiffPatch": {
+          const project = store.getProject(command.projectId)
+          if (!project) {
+            throw new Error("Project not found")
+          }
+          const result = await resolvedDiffStore.readPatch({
+            projectPath: project.localPath,
+            path: command.path,
+          })
+          send(ws, { v: PROTOCOL_VERSION, type: "ack", id, result })
+          return
+        }
         case "system.openExternal": {
           await openExternal(command)
           send(ws, { v: PROTOCOL_VERSION, type: "ack", id })
@@ -359,15 +395,8 @@ export function createWsRouter({
           break
         }
         case "chat.refreshDiffs": {
-          const chat = store.getChat(command.chatId)
-          if (!chat) {
-            throw new Error("Chat not found")
-          }
-          const project = store.getProject(chat.projectId)
-          if (!project) {
-            throw new Error("Project not found")
-          }
-          const changed = await resolvedDiffStore.refreshSnapshot(command.chatId, project.localPath)
+          const { project } = resolveChatProject(command.chatId)
+          const changed = await resolvedDiffStore.refreshSnapshot(project.id, project.localPath)
           send(ws, { v: PROTOCOL_VERSION, type: "ack", id })
           if (changed) {
             broadcastSnapshots()
@@ -375,31 +404,39 @@ export function createWsRouter({
           return
         }
         case "chat.listBranches": {
-          const chat = store.getChat(command.chatId)
-          if (!chat) {
-            throw new Error("Chat not found")
-          }
-          const project = store.getProject(chat.projectId)
-          if (!project) {
-            throw new Error("Project not found")
-          }
+          const { project } = resolveChatProject(command.chatId)
           const result = await resolvedDiffStore.listBranches({
             projectPath: project.localPath,
           })
           send(ws, { v: PROTOCOL_VERSION, type: "ack", id, result })
           return
         }
-        case "chat.checkoutBranch": {
-          const chat = store.getChat(command.chatId)
-          if (!chat) {
-            throw new Error("Chat not found")
-          }
-          const project = store.getProject(chat.projectId)
-          if (!project) {
-            throw new Error("Project not found")
+        case "chat.previewMergeBranch": {
+          const { project } = resolveChatProject(command.chatId)
+          const result = await resolvedDiffStore.previewMergeBranch({
+            projectPath: project.localPath,
+            branch: command.branch,
+          })
+          send(ws, { v: PROTOCOL_VERSION, type: "ack", id, result })
+          return
+        }
+        case "chat.mergeBranch": {
+          const { project } = resolveChatProject(command.chatId)
+          const result = await resolvedDiffStore.mergeBranch({
+            projectId: project.id,
+            projectPath: project.localPath,
+            branch: command.branch,
+          })
+          send(ws, { v: PROTOCOL_VERSION, type: "ack", id, result })
+          if (result.snapshotChanged) {
+            broadcastSnapshots()
           }
+          return
+        }
+        case "chat.checkoutBranch": {
+          const { project } = resolveChatProject(command.chatId)
           const result = await resolvedDiffStore.checkoutBranch({
-            chatId: command.chatId,
+            projectId: project.id,
             projectPath: project.localPath,
             branch: command.branch,
             bringChanges: command.bringChanges,
@@ -411,16 +448,9 @@ export function createWsRouter({
           return
         }
         case "chat.syncBranch": {
-          const chat = store.getChat(command.chatId)
-          if (!chat) {
-            throw new Error("Chat not found")
-          }
-          const project = store.getProject(chat.projectId)
-          if (!project) {
-            throw new Error("Project not found")
-          }
+          const { project } = resolveChatProject(command.chatId)
           const result = await resolvedDiffStore.syncBranch({
-            chatId: command.chatId,
+            projectId: project.id,
             projectPath: project.localPath,
             action: command.action,
           })
@@ -431,16 +461,9 @@ export function createWsRouter({
           return
         }
         case "chat.createBranch": {
-          const chat = store.getChat(command.chatId)
-          if (!chat) {
-            throw new Error("Chat not found")
-          }
-          const project = store.getProject(chat.projectId)
-          if (!project) {
-            throw new Error("Project not found")
-          }
+          const { project } = resolveChatProject(command.chatId)
           const result = await resolvedDiffStore.createBranch({
-            chatId: command.chatId,
+            projectId: project.id,
             projectPath: project.localPath,
             name: command.name,
             baseBranchName: command.baseBranchName,
@@ -452,14 +475,7 @@ export function createWsRouter({
           return
         }
         case "chat.generateCommitMessage": {
-          const chat = store.getChat(command.chatId)
-          if (!chat) {
-            throw new Error("Chat not found")
-          }
-          const project = store.getProject(chat.projectId)
-          if (!project) {
-            throw new Error("Project not found")
-          }
+          const { project } = resolveChatProject(command.chatId)
           const result = await resolvedDiffStore.generateCommitMessage({
             projectPath: project.localPath,
             paths: command.paths,
@@ -468,16 +484,9 @@ export function createWsRouter({
           return
         }
         case "chat.commitDiffs": {
-          const chat = store.getChat(command.chatId)
-          if (!chat) {
-            throw new Error("Chat not found")
-          }
-          const project = store.getProject(chat.projectId)
-          if (!project) {
-            throw new Error("Project not found")
-          }
+          const { project } = resolveChatProject(command.chatId)
           const result = await resolvedDiffStore.commitFiles({
-            chatId: command.chatId,
+            projectId: project.id,
             projectPath: project.localPath,
             paths: command.paths,
             summary: command.summary,
@@ -491,16 +500,9 @@ export function createWsRouter({
           return
         }
         case "chat.discardDiffFile": {
-          const chat = store.getChat(command.chatId)
-          if (!chat) {
-            throw new Error("Chat not found")
-          }
-          const project = store.getProject(chat.projectId)
-          if (!project) {
-            throw new Error("Project not found")
-          }
+          const { project } = resolveChatProject(command.chatId)
           const result = await resolvedDiffStore.discardFile({
-            chatId: command.chatId,
+            projectId: project.id,
             projectPath: project.localPath,
             path: command.path,
           })
@@ -511,16 +513,9 @@ export function createWsRouter({
           return
         }
         case "chat.ignoreDiffFile": {
-          const chat = store.getChat(command.chatId)
-          if (!chat) {
-            throw new Error("Chat not found")
-          }
-          const project = store.getProject(chat.projectId)
-          if (!project) {
-            throw new Error("Project not found")
-          }
+          const { project } = resolveChatProject(command.chatId)
           const result = await resolvedDiffStore.ignoreFile({
-            chatId: command.chatId,
+            projectId: project.id,
             projectPath: project.localPath,
             path: command.path,
           })
@@ -542,9 +537,7 @@ export function createWsRouter({
         }
         case "chat.loadHistory": {
           const chat = store.getChat(command.chatId)
-          if (!chat) {
-            throw new Error("Chat not found")
-          }
+          if (!chat) throw new Error("Chat not found")
           const page = store.getMessagesPageBefore(command.chatId, command.beforeCursor, command.limit)
           send(ws, { v: PROTOCOL_VERSION, type: "ack", id, result: page })
           return

package/src/shared/protocol.ts

@@ -1,6 +1,7 @@
 import type {
   AgentProvider,
   ChatAttachment,
+  ChatDiffSnapshot,
   ChatHistoryPage,
   ChatSnapshot,
   DiffCommitMode,
@@ -24,6 +25,7 @@ export type SubscriptionTopic =
   | { type: "update" }
   | { type: "keybindings" }
   | { type: "chat"; chatId: string; recentLimit?: number }
+  | { type: "project-git"; projectId: string }
   | { type: "terminal"; terminalId: string }
 
 export interface TerminalSnapshot {
@@ -48,6 +50,7 @@ export type ClientCommand =
   | { type: "project.open"; localPath: string }
   | { type: "project.create"; localPath: string; title: string }
   | { type: "project.remove"; projectId: string }
+  | { type: "project.readDiffPatch"; projectId: string; path: string }
   | { type: "system.ping" }
   | { type: "update.check"; force?: boolean }
   | { type: "update.install" }
@@ -79,7 +82,39 @@ export type ClientCommand =
     }
   | { type: "chat.refreshDiffs"; chatId: string }
   | { type: "chat.listBranches"; chatId: string }
-  | { type: "chat.syncBranch"; chatId: string; action: "fetch" | "pull" | "publish" }
+  | {
+      type: "chat.previewMergeBranch"
+      chatId: string
+      branch:
+      | { kind: "local"; name: string }
+      | { kind: "remote"; name: string; remoteRef: string }
+      | {
+          kind: "pull_request"
+          name: string
+          prNumber: number
+          headRefName: string
+          headRepoCloneUrl?: string
+          isCrossRepository?: boolean
+          remoteRef?: string
+        }
+    }
+  | {
+      type: "chat.mergeBranch"
+      chatId: string
+      branch:
+      | { kind: "local"; name: string }
+      | { kind: "remote"; name: string; remoteRef: string }
+      | {
+          kind: "pull_request"
+          name: string
+          prNumber: number
+          headRefName: string
+          headRepoCloneUrl?: string
+          isCrossRepository?: boolean
+          remoteRef?: string
+        }
+    }
+  | { type: "chat.syncBranch"; chatId: string; action: "fetch" | "pull" | "push" | "publish" }
   | {
       type: "chat.checkoutBranch"
       chatId: string
@@ -122,6 +157,7 @@ export type ServerSnapshot =
   | { type: "update"; data: UpdateSnapshot }
   | { type: "keybindings"; data: KeybindingsSnapshot }
   | { type: "chat"; data: ChatSnapshot | null }
+  | { type: "project-git"; data: ChatDiffSnapshot | null }
   | { type: "terminal"; data: TerminalSnapshot | null }
 
 export type ServerEnvelope =

package/src/shared/types.ts

@@ -273,6 +273,9 @@ export type KeybindingAction =
   | "openInFinder"
   | "openInEditor"
   | "addSplitTerminal"
+  | "jumpToSidebarChat"
+  | "createChatInCurrentProject"
+  | "openAddProject"
 
 export const DEFAULT_KEYBINDINGS: Record<KeybindingAction, string[]> = {
   toggleEmbeddedTerminal: ["cmd+j", "ctrl+`"],
@@ -280,6 +283,9 @@ export const DEFAULT_KEYBINDINGS: Record<KeybindingAction, string[]> = {
   openInFinder: ["cmd+alt+f", "ctrl+alt+f"],
   openInEditor: ["cmd+shift+o", "ctrl+shift+o"],
   addSplitTerminal: ["cmd+/", "ctrl+/"],
+  jumpToSidebarChat: ["cmd+alt"],
+  createChatInCurrentProject: ["cmd+alt+n"],
+  openAddProject: ["cmd+alt+o"],
 }
 
 export interface KeybindingsSnapshot {
@@ -472,7 +478,9 @@ export interface ChatDiffFile {
   path: string
   changeType: "added" | "deleted" | "modified" | "renamed"
   isUntracked: boolean
-  patch: string
+  additions: number
+  deletions: number
+  patchDigest: string
   mimeType?: string
   size?: number
 }
@@ -520,91 +528,88 @@ export interface ChatBranchListResult {
   pullRequestsError?: string
 }
 
-export interface ChatDiffSnapshot {
-  status: "unknown" | "ready" | "no_repo"
+export interface BranchMetadata {
   branchName?: string
   defaultBranchName?: string
   originRepoSlug?: string
   hasUpstream?: boolean
+}
+
+export interface UpstreamStatus {
   aheadCount?: number
   behindCount?: number
   lastFetchedAt?: string
+}
+
+export interface ChatDiffSnapshot extends BranchMetadata, UpstreamStatus {
+  status: "unknown" | "ready" | "no_repo"
   files: ChatDiffFile[]
   branchHistory?: ChatBranchHistorySnapshot
 }
 
-export interface ChatSyncSuccess {
+export interface BranchActionSuccess {
   ok: true
-  action: "fetch" | "pull" | "publish"
   branchName?: string
-  aheadCount?: number
-  behindCount?: number
   snapshotChanged: boolean
 }
 
-export interface ChatSyncFailure {
+export interface BranchActionFailure {
   ok: false
-  action: "fetch" | "pull" | "publish"
   title: string
   message: string
   detail?: string
+  cancelled?: boolean
   snapshotChanged?: boolean
 }
 
-export type ChatSyncResult = ChatSyncSuccess | ChatSyncFailure
-
-export type DiffCommitMode = "commit_and_push" | "commit_only"
-
-export interface ChatCheckoutBranchSuccess {
-  ok: true
-  branchName?: string
-  snapshotChanged: boolean
+export type ChatSyncSuccess = BranchActionSuccess & {
+  action: "fetch" | "pull" | "push" | "publish"
+  aheadCount?: number
+  behindCount?: number
 }
 
-export interface ChatCheckoutBranchFailure {
-  ok: false
-  cancelled?: boolean
-  title: string
-  message: string
-  detail?: string
-  snapshotChanged?: boolean
+export type ChatSyncFailure = BranchActionFailure & {
+  action: "fetch" | "pull" | "push" | "publish"
 }
 
+export type ChatSyncResult = ChatSyncSuccess | ChatSyncFailure
+
+export type DiffCommitMode = "commit_and_push" | "commit_only"
+
+export type ChatCheckoutBranchSuccess = BranchActionSuccess
+export type ChatCheckoutBranchFailure = BranchActionFailure
 export type ChatCheckoutBranchResult = ChatCheckoutBranchSuccess | ChatCheckoutBranchFailure
 
-export interface ChatCreateBranchSuccess {
-  ok: true
-  branchName: string
-  snapshotChanged: boolean
-}
+export type ChatCreateBranchSuccess = BranchActionSuccess & { branchName: string }
+export type ChatCreateBranchFailure = BranchActionFailure
+export type ChatCreateBranchResult = ChatCreateBranchSuccess | ChatCreateBranchFailure
 
-export interface ChatCreateBranchFailure {
-  ok: false
-  title: string
+export type ChatMergePreviewStatus = "up_to_date" | "mergeable" | "conflicts" | "error"
+
+export interface ChatMergePreviewResult {
+  currentBranchName?: string
+  targetBranchName: string
+  targetDisplayName: string
+  status: ChatMergePreviewStatus
+  commitCount: number
+  hasConflicts: boolean
   message: string
   detail?: string
-  snapshotChanged?: boolean
 }
 
-export type ChatCreateBranchResult = ChatCreateBranchSuccess | ChatCreateBranchFailure
+export type ChatMergeBranchSuccess = BranchActionSuccess
+export type ChatMergeBranchFailure = BranchActionFailure
+export type ChatMergeBranchResult = ChatMergeBranchSuccess | ChatMergeBranchFailure
 
-export interface DiffCommitSuccess {
-  ok: true
+export type DiffCommitSuccess = BranchActionSuccess & {
   mode: DiffCommitMode
-  branchName?: string
   pushed: boolean
-  snapshotChanged: boolean
 }
 
-export interface DiffCommitFailure {
-  ok: false
+export type DiffCommitFailure = BranchActionFailure & {
   mode: DiffCommitMode
   phase: "commit" | "push"
-  title: string
-  message: string
-  detail?: string
   localCommitCreated?: boolean
-  snapshotChanged?: boolean
 }
 
 export type DiffCommitResult = DiffCommitSuccess | DiffCommitFailure
@@ -784,7 +789,6 @@ export interface ChatSnapshot {
   runtime: ChatRuntime
   messages: TranscriptEntry[]
   history: ChatHistorySnapshot
-  diffs: ChatDiffSnapshot
   availableProviders: ProviderCatalogEntry[]
 }