kanna-code 0.21.0 → 0.22.0

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

@@ -54,8 +54,23 @@ describe("read models", () => {
       lastTurnOutcome: null,
     })
 
-    const chat = deriveChatSnapshot(state, new Map(), new Set(), "chat-1", () => [], () => ({ status: "unknown", files: [] }))
+    const chat = deriveChatSnapshot(
+      state,
+      new Map(),
+      new Set(),
+      "chat-1",
+      () => ({
+        messages: [],
+        history: {
+          hasOlder: false,
+          olderCursor: null,
+          recentLimit: 200,
+        },
+      }),
+      () => ({ status: "unknown", files: [] })
+    )
     expect(chat?.runtime.provider).toBe("claude")
+    expect(chat?.history.recentLimit).toBe(200)
     expect(chat?.availableProviders.length).toBeGreaterThan(1)
     expect(chat?.availableProviders.find((provider) => provider.id === "codex")?.models.map((model) => model.id)).toEqual([
       "gpt-5.4",
@@ -106,4 +121,45 @@ describe("read models", () => {
       },
     ])
   })
+
+  test("orders sidebar chats by user-visible activity instead of internal updatedAt churn", () => {
+    const state = createEmptyState()
+    state.projectsById.set("project-1", {
+      id: "project-1",
+      localPath: "/tmp/project",
+      title: "Project",
+      createdAt: 1,
+      updatedAt: 1,
+    })
+    state.projectIdsByPath.set("/tmp/project", "project-1")
+    state.chatsById.set("chat-old", {
+      id: "chat-old",
+      projectId: "project-1",
+      title: "Older user activity",
+      createdAt: 10,
+      updatedAt: 500,
+      unread: false,
+      provider: "claude",
+      planMode: false,
+      sessionToken: null,
+      lastMessageAt: 100,
+      lastTurnOutcome: null,
+    })
+    state.chatsById.set("chat-new", {
+      id: "chat-new",
+      projectId: "project-1",
+      title: "Newer user activity",
+      createdAt: 20,
+      updatedAt: 50,
+      unread: false,
+      provider: "claude",
+      planMode: false,
+      sessionToken: null,
+      lastMessageAt: 200,
+      lastTurnOutcome: null,
+    })
+
+    const sidebar = deriveSidebarData(state, new Map())
+    expect(sidebar.projectGroups[0]?.chats.map((chat) => chat.chatId)).toEqual(["chat-new", "chat-old"])
+  })
 })

package/src/server/read-models.ts

@@ -18,6 +18,10 @@ export function deriveStatus(chat: ChatRecord, activeStatus?: KannaStatus): Kann
   return "idle"
 }
 
+function getSidebarChatSortTimestamp(chat: ChatRecord) {
+  return chat.lastMessageAt ?? chat.createdAt
+}
+
 export function deriveSidebarData(
   state: StoreState,
   activeStatuses: Map<string, KannaStatus>
@@ -29,7 +33,7 @@ export function deriveSidebarData(
   const projectGroups: SidebarProjectGroup[] = projects.map((project) => {
     const chats: SidebarChatRow[] = [...state.chatsById.values()]
       .filter((chat) => chat.projectId === project.id && !chat.deletedAt)
-      .sort((a, b) => (b.lastMessageAt ?? b.updatedAt) - (a.lastMessageAt ?? a.updatedAt))
+      .sort((a, b) => getSidebarChatSortTimestamp(b) - getSidebarChatSortTimestamp(a))
       .map((chat) => ({
         _id: chat.id,
         _creationTime: chat.createdAt,
@@ -74,7 +78,7 @@ export function deriveLocalProjectsSnapshot(
   for (const project of [...state.projectsById.values()].filter((entry) => !entry.deletedAt)) {
     const chats = [...state.chatsById.values()].filter((chat) => chat.projectId === project.id && !chat.deletedAt)
     const lastOpenedAt = chats.reduce(
-      (latest, chat) => Math.max(latest, chat.lastMessageAt ?? chat.updatedAt ?? 0),
+      (latest, chat) => Math.max(latest, getSidebarChatSortTimestamp(chat)),
       project.updatedAt
     )
 
@@ -101,7 +105,7 @@ export function deriveChatSnapshot(
   activeStatuses: Map<string, KannaStatus>,
   drainingChatIds: Set<string>,
   chatId: string,
-  getMessages: (chatId: string) => ChatSnapshot["messages"],
+  getMessages: (chatId: string) => Pick<ChatSnapshot, "messages" | "history">,
   getDiffs: (chatId: string) => ChatDiffSnapshot
 ): ChatSnapshot | null {
   const chat = state.chatsById.get(chatId)
@@ -121,9 +125,12 @@ export function deriveChatSnapshot(
     sessionToken: chat.sessionToken,
   }
 
+  const transcript = getMessages(chat.id)
+
   return {
     runtime,
-    messages: getMessages(chat.id),
+    messages: transcript.messages,
+    history: transcript.history,
     diffs: getDiffs(chat.id),
     availableProviders: [...SERVER_PROVIDERS],
   }

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

@@ -176,6 +176,92 @@ describe("ws-router", () => {
     })
   })
 
+  test("loads older chat history pages", () => {
+    const state = createEmptyState()
+    state.projectsById.set("project-1", {
+      id: "project-1",
+      localPath: "/tmp/project",
+      title: "Project",
+      createdAt: 1,
+      updatedAt: 1,
+    })
+    state.projectIdsByPath.set("/tmp/project", "project-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,
+        getMessagesPageBefore: () => ({
+          messages: [{
+            _id: "msg-1",
+            kind: "assistant_text",
+            createdAt: 1,
+            text: "older message",
+          }],
+          hasOlder: false,
+          olderCursor: null,
+        }),
+        getChat: () => state.chatsById.get("chat-1") ?? null,
+      } 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()
+
+    router.handleMessage(
+      ws as never,
+      JSON.stringify({
+        v: 1,
+        type: "command",
+        id: "history-1",
+        command: {
+          type: "chat.loadHistory",
+          chatId: "chat-1",
+          beforeCursor: "idx:100",
+          limit: 100,
+        },
+      })
+    )
+
+    expect(ws.sent[0]).toEqual({
+      v: PROTOCOL_VERSION,
+      type: "ack",
+      id: "history-1",
+      result: {
+        messages: [{
+          _id: "msg-1",
+          kind: "assistant_text",
+          createdAt: 1,
+          text: "older message",
+        }],
+        hasOlder: false,
+        olderCursor: null,
+      },
+    })
+  })
+
   test("marks chats read and rebroadcasts sidebar snapshots", async () => {
     const state = createEmptyState()
     state.projectsById.set("project-1", {

package/src/server/ws-router.ts

@@ -13,6 +13,8 @@ import { TerminalManager } from "./terminal-manager"
 import type { UpdateManager } from "./update-manager"
 import { deriveChatSnapshot, deriveLocalProjectsSnapshot, deriveSidebarData } from "./read-models"
 
+const DEFAULT_CHAT_RECENT_LIMIT = 200
+
 export interface ClientState {
   subscriptions: Map<string, SubscriptionTopic>
   snapshotSignatures: Map<string, string>
@@ -55,10 +57,10 @@ export function createWsRouter({
 }: CreateWsRouterArgs) {
   const sockets = new Set<ServerWebSocket<ClientState>>()
   const resolvedDiffStore = diffStore ?? {
-    getSnapshot: () => ({ status: "unknown", branchName: undefined, files: [] as const }),
+    getSnapshot: () => ({ status: "unknown", branchName: undefined, hasUpstream: undefined, files: [] as const }),
     refreshSnapshot: async () => false,
     generateCommitMessage: async () => ({ subject: "Update selected files", body: "", usedFallback: true, failureMessage: null }),
-    commitFiles: async () => false,
+    commitFiles: async () => ({ ok: true, mode: "commit_only" as const, branchName: undefined, pushed: false, snapshotChanged: false }),
   }
 
   function createEnvelope(id: string, topic: SubscriptionTopic): ServerEnvelope {
@@ -144,7 +146,7 @@ export function createWsRouter({
           agent.getActiveStatuses(),
           agent.getDrainingChatIds(),
           topic.chatId,
-          (chatId) => store.getMessages(chatId),
+          (chatId) => store.getRecentChatHistory(chatId, topic.recentLimit ?? DEFAULT_CHAT_RECENT_LIMIT),
           (chatId) => resolvedDiffStore.getSnapshot(chatId)
         ),
       },
@@ -155,6 +157,7 @@ export function createWsRouter({
     const snapshotSignatures = ensureSnapshotSignatures(ws)
     for (const [id, topic] of ws.data.subscriptions.entries()) {
       const envelope = createEnvelope(id, topic)
+      if (envelope.type !== "snapshot") continue
       const signature = JSON.stringify(envelope.snapshot)
       if (snapshotSignatures.get(id) === signature) {
         continue
@@ -186,6 +189,7 @@ export function createWsRouter({
       for (const [id, topic] of ws.data.subscriptions.entries()) {
         if (topic.type !== "terminal" || topic.terminalId !== terminalId) continue
         const envelope = createEnvelope(id, topic)
+        if (envelope.type !== "snapshot") continue
         const signature = JSON.stringify(envelope.snapshot)
         if (snapshotSignatures.get(id) === signature) continue
         snapshotSignatures.set(id, signature)
@@ -218,6 +222,7 @@ export function createWsRouter({
       for (const [id, topic] of ws.data.subscriptions.entries()) {
         if (topic.type !== "keybindings") continue
         const envelope = createEnvelope(id, topic)
+        if (envelope.type !== "snapshot") continue
         const signature = JSON.stringify(envelope.snapshot)
         if (snapshotSignatures.get(id) === signature) continue
         snapshotSignatures.set(id, signature)
@@ -232,6 +237,7 @@ export function createWsRouter({
       for (const [id, topic] of ws.data.subscriptions.entries()) {
         if (topic.type !== "update") continue
         const envelope = createEnvelope(id, topic)
+        if (envelope.type !== "snapshot") continue
         const signature = JSON.stringify(envelope.snapshot)
         if (snapshotSignatures.get(id) === signature) continue
         snapshotSignatures.set(id, signature)
@@ -387,15 +393,16 @@ export function createWsRouter({
           if (!project) {
             throw new Error("Project not found")
           }
-          const changed = await resolvedDiffStore.commitFiles({
+          const result = await resolvedDiffStore.commitFiles({
             chatId: command.chatId,
             projectPath: project.localPath,
             paths: command.paths,
             summary: command.summary,
             description: command.description,
+            mode: command.mode,
           })
-          send(ws, { v: PROTOCOL_VERSION, type: "ack", id })
-          if (changed) {
+          send(ws, { v: PROTOCOL_VERSION, type: "ack", id, result })
+          if (result.snapshotChanged) {
             broadcastSnapshots()
           }
           return
@@ -410,6 +417,15 @@ export function createWsRouter({
           send(ws, { v: PROTOCOL_VERSION, type: "ack", id })
           break
         }
+        case "chat.loadHistory": {
+          const chat = store.getChat(command.chatId)
+          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
+        }
         case "chat.respondTool": {
           await agent.respondTool(command)
           send(ws, { v: PROTOCOL_VERSION, type: "ack", id })

package/src/shared/protocol.ts

@@ -1,7 +1,9 @@
 import type {
   AgentProvider,
   ChatAttachment,
+  ChatHistoryPage,
   ChatSnapshot,
+  DiffCommitMode,
   KeybindingsSnapshot,
   LocalProjectsSnapshot,
   ModelOptions,
@@ -21,7 +23,7 @@ export type SubscriptionTopic =
   | { type: "local-projects" }
   | { type: "update" }
   | { type: "keybindings" }
-  | { type: "chat"; chatId: string }
+  | { type: "chat"; chatId: string; recentLimit?: number }
   | { type: "terminal"; terminalId: string }
 
 export interface TerminalSnapshot {
@@ -77,9 +79,10 @@ export type ClientCommand =
     }
   | { type: "chat.refreshDiffs"; chatId: string }
   | { type: "chat.generateCommitMessage"; chatId: string; paths: string[] }
-  | { type: "chat.commitDiffs"; chatId: string; paths: string[]; summary: string; description?: string }
+  | { type: "chat.commitDiffs"; chatId: string; paths: string[]; summary: string; description?: string; mode: DiffCommitMode }
   | { type: "chat.cancel"; chatId: string }
   | { type: "chat.stopDraining"; chatId: string }
+  | { type: "chat.loadHistory"; chatId: string; beforeCursor: string; limit: number }
   | { type: "chat.respondTool"; chatId: string; toolUseId: string; result: unknown }
   | { type: "terminal.create"; projectId: string; terminalId: string; cols: number; rows: number; scrollback: number }
   | { type: "terminal.input"; terminalId: string; data: string }
@@ -102,7 +105,7 @@ export type ServerSnapshot =
 export type ServerEnvelope =
   | { v: 1; type: "snapshot"; id: string; snapshot: ServerSnapshot }
   | { v: 1; type: "event"; id: string; event: TerminalEvent }
-  | { v: 1; type: "ack"; id: string; result?: unknown }
+  | { v: 1; type: "ack"; id: string; result?: unknown | ChatHistoryPage }
   | { v: 1; type: "error"; id?: string; message: string }
 
 export function isClientEnvelope(value: unknown): value is ClientEnvelope {

package/src/shared/types.ts

@@ -479,9 +479,33 @@ export interface ChatDiffFile {
 export interface ChatDiffSnapshot {
   status: "unknown" | "ready" | "no_repo"
   branchName?: string
+  hasUpstream?: boolean
   files: ChatDiffFile[]
 }
 
+export type DiffCommitMode = "commit_and_push" | "commit_only"
+
+export interface DiffCommitSuccess {
+  ok: true
+  mode: DiffCommitMode
+  branchName?: string
+  pushed: boolean
+  snapshotChanged: boolean
+}
+
+export interface DiffCommitFailure {
+  ok: false
+  mode: DiffCommitMode
+  phase: "commit" | "push"
+  title: string
+  message: string
+  detail?: string
+  localCommitCreated?: boolean
+  snapshotChanged?: boolean
+}
+
+export type DiffCommitResult = DiffCommitSuccess | DiffCommitFailure
+
 export interface ContextWindowUpdatedEntry extends TranscriptEntryBase {
   kind: "context_window_updated"
   usage: ContextWindowUsageSnapshot
@@ -647,13 +671,26 @@ export interface ChatRuntime {
   sessionToken: string | null
 }
 
+export interface ChatHistorySnapshot {
+  hasOlder: boolean
+  olderCursor: string | null
+  recentLimit: number
+}
+
 export interface ChatSnapshot {
   runtime: ChatRuntime
   messages: TranscriptEntry[]
+  history: ChatHistorySnapshot
   diffs: ChatDiffSnapshot
   availableProviders: ProviderCatalogEntry[]
 }
 
+export interface ChatHistoryPage {
+  messages: TranscriptEntry[]
+  hasOlder: boolean
+  olderCursor: string | null
+}
+
 export interface KannaSnapshot {
   sidebar: SidebarData
   chat?: ChatSnapshot | null