kanna-code 0.23.1 → 0.25.0

package/src/server/generate-commit-message.test.ts

@@ -11,7 +11,6 @@ describe("generateCommitMessageDetailed", () => {
         files: [{
           path: "app.ts",
           changeType: "modified",
-          isUntracked: false,
           patch: "diff --git a/app.ts b/app.ts\n--- a/app.ts\n+++ b/app.ts\n@@\n-old\n+new\n",
         }],
       },
@@ -39,7 +38,6 @@ describe("generateCommitMessageDetailed", () => {
         files: [{
           path: "src/feature.ts",
           changeType: "modified",
-          isUntracked: false,
           patch: "diff --git a/src/feature.ts b/src/feature.ts\n",
         }],
       },

package/src/server/generate-commit-message.ts

@@ -1,7 +1,12 @@
 import path from "node:path"
-import type { ChatDiffFile } from "../shared/types"
 import { QuickResponseAdapter } from "./quick-response"
 
+interface CommitMessageFile {
+  path: string
+  changeType: "added" | "deleted" | "modified" | "renamed"
+  patch: string
+}
+
 const COMMIT_MESSAGE_SCHEMA = {
   type: "object",
   properties: {
@@ -44,7 +49,7 @@ function sanitizeBody(value: unknown): string {
   return value.trim()
 }
 
-function fallbackSubject(files: ChatDiffFile[]) {
+function fallbackSubject(files: CommitMessageFile[]) {
   if (files.length === 1) {
     const fileName = path.posix.basename(files[0]?.path ?? "file")
     const normalized = `Update ${fileName}`.replace(/\s+/g, " ").trim()
@@ -56,7 +61,7 @@ function fallbackSubject(files: ChatDiffFile[]) {
 
 function buildCommitMessagePrompt(args: {
   branchName?: string
-  files: ChatDiffFile[]
+  files: CommitMessageFile[]
 }) {
   const fileList = args.files.map((file) => `${file.changeType}: ${file.path}`).join("\n")
   const combinedPatch = args.files.map((file) => file.patch).join("\n\n")
@@ -83,7 +88,7 @@ export async function generateCommitMessageDetailed(
   args: {
     cwd: string
     branchName?: string
-    files: ChatDiffFile[]
+    files: CommitMessageFile[]
   },
   adapter = new QuickResponseAdapter()
 ): Promise<GenerateCommitMessageResult> {

package/src/server/keybindings.test.ts

@@ -38,6 +38,9 @@ describe("normalizeKeybindings", () => {
       openInFinder: ["Cmd+Alt+F"],
       openInEditor: ["Cmd+Shift+O"],
       addSplitTerminal: ["Cmd+Shift+J"],
+      jumpToSidebarChat: ["Cmd+Alt"],
+      createChatInCurrentProject: ["Cmd+Alt+N"],
+      openAddProject: ["Cmd+Alt+O"],
     }, TEST_FILE_PATH)
 
     expect(snapshot).toEqual({
@@ -47,6 +50,9 @@ describe("normalizeKeybindings", () => {
         openInFinder: ["cmd+alt+f"],
         openInEditor: ["cmd+shift+o"],
         addSplitTerminal: ["cmd+shift+j"],
+        jumpToSidebarChat: ["cmd+alt"],
+        createChatInCurrentProject: ["cmd+alt+n"],
+        openAddProject: ["cmd+alt+o"],
       },
       warning: null,
       filePathDisplay: TEST_FILE_PATH,
@@ -97,6 +103,9 @@ describe("KeybindingsManager", () => {
       openInFinder: ["Cmd+Alt+F"],
       openInEditor: ["Cmd+Shift+O"],
       addSplitTerminal: ["Cmd+Shift+J"],
+      jumpToSidebarChat: ["Cmd+Alt"],
+      createChatInCurrentProject: ["Cmd+Alt+N"],
+      openAddProject: ["Cmd+Alt+O"],
     })
 
     expect(snapshot).toEqual({
@@ -106,6 +115,9 @@ describe("KeybindingsManager", () => {
         openInFinder: ["cmd+alt+f"],
         openInEditor: ["cmd+shift+o"],
         addSplitTerminal: ["cmd+shift+j"],
+        jumpToSidebarChat: ["cmd+alt"],
+        createChatInCurrentProject: ["cmd+alt+n"],
+        openAddProject: ["cmd+alt+o"],
       },
       warning: null,
       filePathDisplay: filePath,

package/src/server/keybindings.ts

@@ -159,6 +159,9 @@ function createDefaultSnapshot(filePath: string, warning: string | null = null):
       openInFinder: [...DEFAULT_KEYBINDINGS.openInFinder],
       openInEditor: [...DEFAULT_KEYBINDINGS.openInEditor],
       addSplitTerminal: [...DEFAULT_KEYBINDINGS.addSplitTerminal],
+      jumpToSidebarChat: [...DEFAULT_KEYBINDINGS.jumpToSidebarChat],
+      createChatInCurrentProject: [...DEFAULT_KEYBINDINGS.createChatInCurrentProject],
+      openAddProject: [...DEFAULT_KEYBINDINGS.openAddProject],
     },
     warning,
     filePathDisplay: formatDisplayPath(filePath),

package/src/server/read-models.test.ts

@@ -66,8 +66,7 @@ describe("read models", () => {
           olderCursor: null,
           recentLimit: 200,
         },
-      }),
-      () => ({ status: "unknown", files: [] })
+      })
     )
     expect(chat?.runtime.provider).toBe("claude")
     expect(chat?.history.recentLimit).toBe(200)

package/src/server/read-models.ts

@@ -1,5 +1,4 @@
 import type {
-  ChatDiffSnapshot,
   ChatRuntime,
   ChatSnapshot,
   KannaStatus,
@@ -105,8 +104,7 @@ export function deriveChatSnapshot(
   activeStatuses: Map<string, KannaStatus>,
   drainingChatIds: Set<string>,
   chatId: string,
-  getMessages: (chatId: string) => Pick<ChatSnapshot, "messages" | "history">,
-  getDiffs: (chatId: string) => ChatDiffSnapshot
+  getMessages: (chatId: string) => Pick<ChatSnapshot, "messages" | "history">
 ): ChatSnapshot | null {
   const chat = state.chatsById.get(chatId)
   if (!chat || chat.deletedAt) return null
@@ -131,7 +129,6 @@ export function deriveChatSnapshot(
     runtime,
     messages: transcript.messages,
     history: transcript.history,
-    diffs: getDiffs(chat.id),
     availableProviders: [...SERVER_PROVIDERS],
   }
 }

package/src/server/ws-router.test.ts

@@ -22,6 +22,9 @@ const DEFAULT_KEYBINDINGS_SNAPSHOT: KeybindingsSnapshot = {
     openInFinder: ["cmd+alt+f"],
     openInEditor: ["cmd+shift+o"],
     addSplitTerminal: ["cmd+shift+j"],
+    jumpToSidebarChat: ["cmd+alt"],
+    createChatInCurrentProject: ["cmd+alt+n"],
+    openAddProject: ["cmd+alt+o"],
   },
   warning: null,
   filePathDisplay: "~/.kanna/keybindings.json",
@@ -176,6 +179,264 @@ describe("ws-router", () => {
     })
   })
 
+  test("subscribes to project git snapshots independently from chat snapshots", async () => {
+    const state = createEmptyState()
+    state.projectsById.set("project-1", {
+      id: "project-1",
+      localPath: "/tmp/project",
+      title: "Project",
+      createdAt: 1,
+      updatedAt: 1,
+    })
+
+    const router = createWsRouter({
+      store: {
+        state,
+        getProject: () => state.projectsById.get("project-1") ?? null,
+      } as never,
+      diffStore: {
+        getProjectSnapshot: () => ({
+          status: "ready",
+          branchName: "main",
+          files: [],
+          branchHistory: { entries: [] },
+        }),
+        refreshSnapshot: async () => false,
+        listBranches: async () => ({ recent: [], local: [], remote: [], pullRequests: [], pullRequestsStatus: "unavailable" }),
+        previewMergeBranch: async () => ({ currentBranchName: "main", targetBranchName: "feature/test", targetDisplayName: "feature/test", status: "mergeable", commitCount: 1, hasConflicts: false, message: "ready" }),
+        mergeBranch: async () => ({ ok: true, branchName: "main", snapshotChanged: false }),
+        syncBranch: async () => ({ ok: true, action: "fetch", snapshotChanged: false }),
+        checkoutBranch: async () => ({ ok: true, snapshotChanged: false }),
+        createBranch: async () => ({ ok: true, branchName: "main", snapshotChanged: false }),
+        generateCommitMessage: async () => ({ subject: "", body: "", usedFallback: true, failureMessage: null }),
+        commitFiles: async () => ({ ok: true, mode: "commit_only", pushed: false, snapshotChanged: false }),
+        discardFile: async () => ({ snapshotChanged: false }),
+        ignoreFile: async () => ({ snapshotChanged: false }),
+        readPatch: async () => ({ patch: "" }),
+      } as never,
+      agent: { getActiveStatuses: () => new Map(), getDrainingChatIds: () => new Set() } as never,
+      terminals: {
+        getSnapshot: () => null,
+        onEvent: () => () => {},
+      } as never,
+      keybindings: {
+        getSnapshot: () => DEFAULT_KEYBINDINGS_SNAPSHOT,
+        onChange: () => () => {},
+      } as never,
+      refreshDiscovery: async () => [],
+      getDiscoveredProjects: () => [],
+      machineDisplayName: "Local Machine",
+      updateManager: null,
+    })
+    const ws = new FakeWebSocket()
+
+    await router.handleMessage(
+      ws as never,
+      JSON.stringify({
+        v: 1,
+        type: "subscribe",
+        id: "project-git-sub-1",
+        topic: { type: "project-git", projectId: "project-1" },
+      })
+    )
+
+    expect(ws.sent[0]).toEqual({
+      v: PROTOCOL_VERSION,
+      type: "snapshot",
+      id: "project-git-sub-1",
+      snapshot: {
+        type: "project-git",
+        data: {
+          status: "ready",
+          branchName: "main",
+          files: [],
+          branchHistory: { entries: [] },
+        },
+      },
+    })
+  })
+
+  test("reads diff patches through the project-scoped command", async () => {
+    const state = createEmptyState()
+    state.projectsById.set("project-1", {
+      id: "project-1",
+      localPath: "/tmp/project",
+      title: "Project",
+      createdAt: 1,
+      updatedAt: 1,
+    })
+
+    const router = createWsRouter({
+      store: {
+        state,
+        getProject: (projectId: string) => state.projectsById.get(projectId) ?? null,
+      } as never,
+      diffStore: {
+        getProjectSnapshot: () => null,
+        refreshSnapshot: async () => false,
+        listBranches: async () => ({ recent: [], local: [], remote: [], pullRequests: [], pullRequestsStatus: "unavailable" }),
+        previewMergeBranch: async () => ({ currentBranchName: "main", targetBranchName: "feature/test", targetDisplayName: "feature/test", status: "mergeable", commitCount: 1, hasConflicts: false, message: "ready" }),
+        mergeBranch: async () => ({ ok: true, branchName: "main", snapshotChanged: false }),
+        syncBranch: async () => ({ ok: true, action: "fetch", snapshotChanged: false }),
+        checkoutBranch: async () => ({ ok: true, snapshotChanged: false }),
+        createBranch: async () => ({ ok: true, branchName: "main", snapshotChanged: false }),
+        generateCommitMessage: async () => ({ subject: "", body: "", usedFallback: true, failureMessage: null }),
+        commitFiles: async () => ({ ok: true, mode: "commit_only", pushed: false, snapshotChanged: false }),
+        discardFile: async () => ({ snapshotChanged: false }),
+        ignoreFile: async () => ({ snapshotChanged: false }),
+        readPatch: async () => ({ patch: "diff --git a/app.txt b/app.txt" }),
+      } as never,
+      agent: { getActiveStatuses: () => new Map(), getDrainingChatIds: () => new Set() } as never,
+      terminals: {
+        getSnapshot: () => null,
+        onEvent: () => () => {},
+      } as never,
+      keybindings: {
+        getSnapshot: () => DEFAULT_KEYBINDINGS_SNAPSHOT,
+        onChange: () => () => {},
+      } as never,
+      refreshDiscovery: async () => [],
+      getDiscoveredProjects: () => [],
+      machineDisplayName: "Local Machine",
+      updateManager: null,
+    })
+    const ws = new FakeWebSocket()
+
+    await router.handleMessage(
+      ws as never,
+      JSON.stringify({
+        v: 1,
+        type: "command",
+        id: "read-patch-1",
+        command: {
+          type: "project.readDiffPatch",
+          projectId: "project-1",
+          path: "app.txt",
+        },
+      })
+    )
+
+    expect(ws.sent[0]).toEqual({
+      v: PROTOCOL_VERSION,
+      type: "ack",
+      id: "read-patch-1",
+      result: { patch: "diff --git a/app.txt b/app.txt" },
+    })
+  })
+
+  test("routes merge preview and merge commands through the diff store", async () => {
+    const state = createEmptyState()
+    state.projectsById.set("project-1", {
+      id: "project-1",
+      localPath: "/tmp/project",
+      title: "Project",
+      createdAt: 1,
+      updatedAt: 1,
+    })
+    state.chatsById.set("chat-1", {
+      id: "chat-1",
+      projectId: "project-1",
+      title: "Chat",
+      createdAt: 1,
+      updatedAt: 1,
+      unread: false,
+      provider: null,
+      planMode: false,
+      sessionToken: null,
+      lastTurnOutcome: null,
+    })
+
+    const router = createWsRouter({
+      store: {
+        state,
+        getProject: (projectId: string) => state.projectsById.get(projectId) ?? null,
+        getChat: (chatId: string) => state.chatsById.get(chatId) ?? null,
+      } as never,
+      diffStore: {
+        getProjectSnapshot: () => ({ status: "ready", branchName: "main", files: [], branchHistory: { entries: [] } }),
+        refreshSnapshot: async () => false,
+        listBranches: async () => ({ recent: [], local: [], remote: [], pullRequests: [], pullRequestsStatus: "unavailable" }),
+        previewMergeBranch: async () => ({ currentBranchName: "main", targetBranchName: "feature/test", targetDisplayName: "feature/test", status: "mergeable", commitCount: 2, hasConflicts: false, message: "2 commits from feature/test will merge into main." }),
+        mergeBranch: async () => ({ ok: true, branchName: "main", snapshotChanged: true }),
+        syncBranch: async () => ({ ok: true, action: "fetch", snapshotChanged: false }),
+        checkoutBranch: async () => ({ ok: true, snapshotChanged: false }),
+        createBranch: async () => ({ ok: true, branchName: "main", snapshotChanged: false }),
+        generateCommitMessage: async () => ({ subject: "", body: "", usedFallback: true, failureMessage: null }),
+        commitFiles: async () => ({ ok: true, mode: "commit_only", pushed: false, snapshotChanged: false }),
+        discardFile: async () => ({ snapshotChanged: false }),
+        ignoreFile: async () => ({ snapshotChanged: false }),
+        readPatch: async () => ({ patch: "" }),
+      } as never,
+      agent: { getActiveStatuses: () => new Map(), getDrainingChatIds: () => new Set() } as never,
+      terminals: {
+        getSnapshot: () => null,
+        onEvent: () => () => {},
+      } as never,
+      keybindings: {
+        getSnapshot: () => DEFAULT_KEYBINDINGS_SNAPSHOT,
+        onChange: () => () => {},
+      } as never,
+      refreshDiscovery: async () => [],
+      getDiscoveredProjects: () => [],
+      machineDisplayName: "Local Machine",
+      updateManager: null,
+    })
+    const ws = new FakeWebSocket()
+
+    await router.handleMessage(
+      ws as never,
+      JSON.stringify({
+        v: 1,
+        type: "command",
+        id: "preview-merge-1",
+        command: {
+          type: "chat.previewMergeBranch",
+          chatId: "chat-1",
+          branch: { kind: "local", name: "feature/test" },
+        },
+      })
+    )
+
+    await router.handleMessage(
+      ws as never,
+      JSON.stringify({
+        v: 1,
+        type: "command",
+        id: "merge-1",
+        command: {
+          type: "chat.mergeBranch",
+          chatId: "chat-1",
+          branch: { kind: "local", name: "feature/test" },
+        },
+      })
+    )
+
+    expect(ws.sent[0]).toEqual({
+      v: PROTOCOL_VERSION,
+      type: "ack",
+      id: "preview-merge-1",
+      result: {
+        currentBranchName: "main",
+        targetBranchName: "feature/test",
+        targetDisplayName: "feature/test",
+        status: "mergeable",
+        commitCount: 2,
+        hasConflicts: false,
+        message: "2 commits from feature/test will merge into main.",
+      },
+    })
+    expect(ws.sent[1]).toEqual({
+      v: PROTOCOL_VERSION,
+      type: "ack",
+      id: "merge-1",
+      result: {
+        ok: true,
+        branchName: "main",
+        snapshotChanged: true,
+      },
+    })
+  })
+
   test("loads older chat history pages", async () => {
     const state = createEmptyState()
     state.projectsById.set("project-1", {
@@ -506,6 +767,9 @@ describe("ws-router", () => {
             openInFinder: ["cmd+shift+g"],
             openInEditor: ["cmd+shift+p"],
             addSplitTerminal: ["cmd+alt+j"],
+            jumpToSidebarChat: ["cmd+alt"],
+            createChatInCurrentProject: ["cmd+alt+n"],
+            openAddProject: ["cmd+alt+o"],
           },
         },
       })
@@ -523,6 +787,9 @@ describe("ws-router", () => {
           openInFinder: ["cmd+shift+g"],
           openInEditor: ["cmd+shift+p"],
           addSplitTerminal: ["cmd+alt+j"],
+          jumpToSidebarChat: ["cmd+alt"],
+          createChatInCurrentProject: ["cmd+alt+n"],
+          openAddProject: ["cmd+alt+o"],
         },
         warning: null,
         filePathDisplay: "~/.kanna/keybindings.json",
@@ -675,13 +942,14 @@ describe("ws-router", () => {
       lastTurnOutcome: null,
     })
 
-    const discardCalls: Array<{ chatId: string; projectPath: string; path: string }> = []
+    const discardCalls: Array<{ projectId: string; projectPath: string; path: string }> = []
     const diffStore = {
-      getSnapshot: () => ({ status: "ready" as const, files: [] }),
+      getProjectSnapshot: () => ({ status: "ready" as const, files: [], defaultBranchName: "main", originRepoSlug: "acme/repo", aheadCount: 0, behindCount: 0, lastFetchedAt: undefined }),
       refreshSnapshot: async () => false,
+      syncBranch: async () => ({ ok: true as const, action: "fetch" as const, snapshotChanged: false }),
       generateCommitMessage: async () => ({ subject: "", body: "" }),
       commitFiles: async () => ({ ok: true as const, mode: "commit_only" as const, pushed: false, snapshotChanged: false }),
-      discardFile: async (args: { chatId: string; projectPath: string; path: string }) => {
+      discardFile: async (args: { projectId: string; projectPath: string; path: string }) => {
         discardCalls.push(args)
         return { snapshotChanged: true }
       },
@@ -738,7 +1006,7 @@ describe("ws-router", () => {
     )
 
     expect(discardCalls).toEqual([{
-      chatId: "chat-1",
+      projectId: "project-1",
       projectPath: "/tmp/project",
       path: "app.txt",
     }])
@@ -773,7 +1041,7 @@ describe("ws-router", () => {
       lastTurnOutcome: null,
     })
 
-    const ignoreCalls: Array<{ chatId: string; projectPath: string; path: string }> = []
+    const ignoreCalls: Array<{ projectId: string; projectPath: string; path: string }> = []
     const router = createWsRouter({
       store: {
         state,
@@ -781,12 +1049,13 @@ describe("ws-router", () => {
         getProject: (projectId: string) => state.projectsById.get(projectId) ?? null,
       } as never,
       diffStore: {
-        getSnapshot: () => ({ status: "ready" as const, files: [] }),
+        getProjectSnapshot: () => ({ status: "ready" as const, files: [], defaultBranchName: "main", originRepoSlug: "acme/repo", aheadCount: 0, behindCount: 0, lastFetchedAt: undefined }),
         refreshSnapshot: async () => false,
+        syncBranch: async () => ({ ok: true as const, action: "fetch" as const, snapshotChanged: false }),
         generateCommitMessage: async () => ({ subject: "", body: "" }),
         commitFiles: async () => ({ ok: true as const, mode: "commit_only" as const, pushed: false, snapshotChanged: false }),
         discardFile: async () => ({ snapshotChanged: false }),
-        ignoreFile: async (args: { chatId: string; projectPath: string; path: string }) => {
+        ignoreFile: async (args: { projectId: string; projectPath: string; path: string }) => {
           ignoreCalls.push(args)
           return { snapshotChanged: false }
         },
@@ -822,7 +1091,7 @@ describe("ws-router", () => {
     )
 
     expect(ignoreCalls).toEqual([{
-      chatId: "chat-1",
+      projectId: "project-1",
       projectPath: "/tmp/project",
       path: "scratch.log",
     }])