kanna-code 0.26.9 → 0.26.10

package/src/server/agent.ts

@@ -91,7 +91,7 @@ interface ClaudeSessionState {
 
 interface AgentCoordinatorArgs {
   store: EventStore
-  onStateChange: () => void
+  onStateChange: (chatId?: string) => void
   codexManager?: CodexAppServerManager
   generateTitle?: (messageContent: string, cwd: string) => Promise<GenerateChatTitleResult>
   startClaudeSession?: (args: {
@@ -629,7 +629,7 @@ async function startClaudeSession(args: {
 
 export class AgentCoordinator {
   private readonly store: EventStore
-  private readonly onStateChange: () => void
+  private readonly onStateChange: (chatId?: string) => void
   private readonly codexManager: CodexAppServerManager
   private readonly generateTitle: (messageContent: string, cwd: string) => Promise<GenerateChatTitleResult>
   private readonly startClaudeSessionFn: NonNullable<AgentCoordinatorArgs["startClaudeSession"]>
@@ -668,6 +668,10 @@ export class AgentCoordinator {
     return new Set(this.drainingStreams.keys())
   }
 
+  private emitStateChange(chatId?: string) {
+    this.onStateChange(chatId)
+  }
+
   getActiveTurnProfile(chatId: string): SendToStartingProfile | null {
     const active = this.activeTurns.get(chatId)
     if (!active?.clientTraceId || active.profilingStartedAt === undefined) {
@@ -685,7 +689,7 @@ export class AgentCoordinator {
     if (!draining) return
     draining.turn.close()
     this.drainingStreams.delete(chatId)
-    this.onStateChange()
+    this.emitStateChange(chatId)
   }
 
   async closeChat(chatId: string) {
@@ -695,7 +699,7 @@ export class AgentCoordinator {
       claudeSession.session.close()
       this.claudeSessions.delete(chatId)
     }
-    this.onStateChange()
+    this.emitStateChange(chatId)
   }
 
   private resolveProvider(command: Extract<ClientCommand, { type: "chat.send" }>, currentProvider: AgentProvider | null) {
@@ -813,7 +817,7 @@ export class AgentCoordinator {
       }
 
       active.status = "waiting_for_user"
-      this.onStateChange()
+      this.emitStateChange(args.chatId)
 
       return await new Promise<unknown>((resolve) => {
         active.pendingTool = {
@@ -901,7 +905,7 @@ export class AgentCoordinator {
       chatId: args.chatId,
       status: active.status,
     })
-    this.onStateChange()
+    this.emitStateChange(args.chatId)
     logSendToStartingProfile(args.profile, "start_turn.state_change_emitted", {
       chatId: args.chatId,
       status: active.status,
@@ -921,7 +925,7 @@ export class AgentCoordinator {
             }
           }
           await this.store.appendMessage(args.chatId, timestamped({ kind: "account_info", accountInfo }))
-          this.onStateChange()
+          this.emitStateChange(args.chatId)
         })
         .catch(() => undefined)
     }
@@ -1055,7 +1059,7 @@ export class AgentCoordinator {
         if (event.type === "session_token" && event.sessionToken) {
           session.sessionToken = event.sessionToken
           await this.store.setSessionToken(session.chatId, event.sessionToken)
-          this.onStateChange()
+          this.emitStateChange(session.chatId)
           continue
         }
 
@@ -1077,7 +1081,7 @@ export class AgentCoordinator {
           this.activeTurns.delete(session.chatId)
         }
 
-        this.onStateChange()
+        this.emitStateChange(session.chatId)
       }
     } catch (error) {
       const active = this.activeTurns.get(session.chatId)
@@ -1105,7 +1109,7 @@ export class AgentCoordinator {
         this.activeTurns.delete(session.chatId)
       }
       session.session.close()
-      this.onStateChange()
+      this.emitStateChange(session.chatId)
     }
   }
 
@@ -1123,7 +1127,7 @@ export class AgentCoordinator {
       if (chat.title !== expectedCurrentTitle) return
 
       await this.store.renameChat(chatId, result.title)
-      this.onStateChange()
+      this.emitStateChange(chatId)
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error)
       this.reportBackgroundError?.(
@@ -1141,7 +1145,7 @@ export class AgentCoordinator {
 
         if (event.type === "session_token" && event.sessionToken) {
           await this.store.setSessionToken(active.chatId, event.sessionToken)
-          this.onStateChange()
+          this.emitStateChange(active.chatId)
           continue
         }
 
@@ -1169,7 +1173,7 @@ export class AgentCoordinator {
           this.drainingStreams.set(active.chatId, { turn: active.turn })
         }
 
-        this.onStateChange()
+        this.emitStateChange(active.chatId)
       }
     } catch (error) {
       if (!active.cancelRequested) {
@@ -1199,7 +1203,7 @@ export class AgentCoordinator {
       }
       // Stream has fully ended — no longer draining.
       this.drainingStreams.delete(active.chatId)
-      this.onStateChange()
+      this.emitStateChange(active.chatId)
 
       if (active.postToolFollowUp && !active.cancelRequested) {
         try {
@@ -1227,7 +1231,7 @@ export class AgentCoordinator {
             })
           )
           await this.store.recordTurnFailed(active.chatId, message)
-          this.onStateChange()
+          this.emitStateChange(active.chatId)
         }
       }
     }
@@ -1274,7 +1278,7 @@ export class AgentCoordinator {
     // Remove from activeTurns immediately so the UI reflects the cancellation
     // right away, rather than waiting for interrupt() which may hang.
     this.activeTurns.delete(chatId)
-    this.onStateChange()
+    this.emitStateChange(chatId)
 
     // Now attempt to interrupt/close the underlying stream in the background.
     // This is best-effort — the turn is already removed from active state above,
@@ -1343,6 +1347,6 @@ export class AgentCoordinator {
 
     pending.resolve(command.result)
 
-    this.onStateChange()
+    this.emitStateChange(command.chatId)
   }
 }

package/src/server/event-store.ts

@@ -305,7 +305,7 @@ export class EventStore {
         break
       }
       case "chat_created": {
-        const chat = {
+      const chat = {
           id: event.chatId,
           projectId: event.projectId,
           title: event.title,
@@ -315,6 +315,7 @@ export class EventStore {
           provider: null,
           planMode: false,
           sessionToken: null,
+          hasMessages: false,
           lastTurnOutcome: null,
         }
         this.state.chatsById.set(chat.id, chat)
@@ -404,6 +405,7 @@ export class EventStore {
   private applyMessageMetadata(chatId: string, entry: TranscriptEntry) {
     const chat = this.state.chatsById.get(chatId)
     if (!chat) return
+    chat.hasMessages = true
     if (entry.kind === "user_prompt") {
       chat.lastMessageAt = entry.createdAt
     }
@@ -540,7 +542,11 @@ export class EventStore {
     for (const chat of this.state.chatsById.values()) {
       if (chat.deletedAt || protectedChatIds.has(chat.id)) continue
       if (now - chat.createdAt < maxAgeMs) continue
-      if (this.getMessages(chat.id).length > 0) continue
+      if (chat.hasMessages) continue
+      if (this.getMessages(chat.id).length > 0) {
+        chat.hasMessages = true
+        continue
+      }
 
       const event: ChatEvent = {
         v: STORE_VERSION,

package/src/server/events.ts

@@ -15,6 +15,7 @@ export interface ChatRecord {
   provider: AgentProvider | null
   planMode: boolean
   sessionToken: string | null
+  hasMessages?: boolean
   lastMessageAt?: number
   lastTurnOutcome: "success" | "failed" | "cancelled" | null
 }

package/src/server/server.ts

@@ -99,8 +99,12 @@ export async function startKannaServer(options: StartKannaServerOptions = {}) {
     : null
   const agent = new AgentCoordinator({
     store,
-    onStateChange: () => {
-      void router.broadcastSnapshots()
+    onStateChange: (chatId?: string) => {
+      if (chatId) {
+        router.scheduleChatStateBroadcast(chatId)
+        return
+      }
+      router.scheduleBroadcast()
     },
   })
   router = createWsRouter({
@@ -115,7 +119,8 @@ export async function startKannaServer(options: StartKannaServerOptions = {}) {
     updateManager,
   })
   const staleEmptyChatPruneInterval = setInterval(() => {
-    void router.broadcastSnapshots()
+    void router.pruneStaleEmptyChats()
+      .then(() => router.broadcastSnapshots())
   }, STALE_EMPTY_CHAT_PRUNE_INTERVAL_MS)
 
   const distDir = path.join(import.meta.dir, "..", "..", "dist", "client")

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

@@ -60,6 +60,7 @@ describe("ws-router", () => {
       updateManager: null,
     })
     const ws = new FakeWebSocket()
+    router.handleOpen(ws as never)
 
     ws.data.subscriptions.set("sub-1", { type: "sidebar" })
     await router.handleMessage(
@@ -143,6 +144,7 @@ describe("ws-router", () => {
       updateManager: null,
     })
     const ws = new FakeWebSocket()
+    router.handleOpen(ws as never)
 
     await router.handleMessage(
       ws as never,
@@ -230,6 +232,7 @@ describe("ws-router", () => {
       updateManager: null,
     })
     const ws = new FakeWebSocket()
+    router.handleOpen(ws as never)
 
     await router.handleMessage(
       ws as never,
@@ -302,6 +305,7 @@ describe("ws-router", () => {
       updateManager: null,
     })
     const ws = new FakeWebSocket()
+    router.handleOpen(ws as never)
 
     await router.handleMessage(
       ws as never,
@@ -383,6 +387,7 @@ describe("ws-router", () => {
       updateManager: null,
     })
     const ws = new FakeWebSocket()
+    router.handleOpen(ws as never)
 
     await router.handleMessage(
       ws as never,
@@ -666,7 +671,7 @@ describe("ws-router", () => {
     })
   })
 
-  test("prunes stale empty chats before sending sidebar snapshots", async () => {
+  test("prunes stale empty chats during explicit maintenance runs", async () => {
     const state = createEmptyState()
     state.projectsById.set("project-1", {
       id: "project-1",
@@ -715,6 +720,7 @@ describe("ws-router", () => {
     })
     const ws = new FakeWebSocket()
 
+    await router.pruneStaleEmptyChats()
     await router.handleMessage(
       ws as never,
       JSON.stringify({
@@ -743,7 +749,7 @@ describe("ws-router", () => {
     })
   })
 
-  test("protects draft-bearing chats from stale pruning before sidebar snapshots", async () => {
+  test("protects draft-bearing chats during explicit maintenance runs", async () => {
     const state = createEmptyState()
     state.projectsById.set("project-1", {
       id: "project-1",
@@ -790,6 +796,7 @@ describe("ws-router", () => {
       updateManager: null,
     })
     const ws = new FakeWebSocket()
+    router.handleOpen(ws as never)
 
     await router.handleMessage(
       ws as never,
@@ -804,6 +811,7 @@ describe("ws-router", () => {
       })
     )
 
+    await router.pruneStaleEmptyChats()
     await router.handleMessage(
       ws as never,
       JSON.stringify({

package/src/server/ws-router.ts

@@ -102,6 +102,16 @@ interface CreateWsRouterArgs {
   updateManager: UpdateManager | null
 }
 
+interface SnapshotBroadcastFilter {
+  includeSidebar?: boolean
+  includeLocalProjects?: boolean
+  includeUpdate?: boolean
+  includeKeybindings?: boolean
+  chatIds?: Set<string>
+  projectIds?: Set<string>
+  terminalIds?: Set<string>
+}
+
 function send(ws: ServerWebSocket<ClientState>, message: ServerEnvelope) {
   const payload = JSON.stringify(message)
   ws.send(payload)
@@ -128,6 +138,9 @@ export function createWsRouter({
   updateManager,
 }: CreateWsRouterArgs) {
   const sockets = new Set<ServerWebSocket<ClientState>>()
+  let pendingBroadcastTimer: ReturnType<typeof setTimeout> | null = null
+  let pendingBroadcastAll = false
+  const pendingBroadcastChatIds = new Set<string>()
   const resolvedDiffStore = diffStore ?? {
     getProjectSnapshot: () => ({ status: "unknown", branchName: undefined, defaultBranchName: undefined, hasOriginRemote: undefined, originRepoSlug: undefined, hasUpstream: undefined, aheadCount: undefined, behindCount: undefined, lastFetchedAt: undefined, files: [] as const, branchHistory: { entries: [] as const } }),
     refreshSnapshot: async () => false,
@@ -198,6 +211,36 @@ export function createWsRouter({
     }
   }
 
+  function shouldIncludeTopic(topic: SubscriptionTopic, filter?: SnapshotBroadcastFilter) {
+    if (!filter) {
+      return true
+    }
+
+    if (topic.type === "sidebar") {
+      return Boolean(filter.includeSidebar)
+    }
+    if (topic.type === "local-projects") {
+      return Boolean(filter.includeLocalProjects)
+    }
+    if (topic.type === "update") {
+      return Boolean(filter.includeUpdate)
+    }
+    if (topic.type === "keybindings") {
+      return Boolean(filter.includeKeybindings)
+    }
+    if (topic.type === "chat") {
+      return filter.chatIds?.has(topic.chatId) ?? false
+    }
+    if (topic.type === "project-git") {
+      return filter.projectIds?.has(topic.projectId) ?? false
+    }
+    if (topic.type === "terminal") {
+      return filter.terminalIds?.has(topic.terminalId) ?? false
+    }
+
+    return true
+  }
+
   function createEnvelope(id: string, topic: SubscriptionTopic): ServerEnvelope {
     if (topic.type === "sidebar") {
       const startedAt = performance.now()
@@ -314,7 +357,10 @@ export function createWsRouter({
     }
   }
 
-  async function pushSnapshots(ws: ServerWebSocket<ClientState>, options?: { skipPrune?: boolean }) {
+  async function pushSnapshots(
+    ws: ServerWebSocket<ClientState>,
+    options?: { skipPrune?: boolean; filter?: SnapshotBroadcastFilter }
+  ) {
     const pushStartedAt = performance.now()
     if (!options?.skipPrune) {
       await maybePruneStaleEmptyChats([ws])
@@ -323,6 +369,9 @@ export function createWsRouter({
     let sentCount = 0
     let skippedCount = 0
     for (const [id, topic] of ws.data.subscriptions.entries()) {
+      if (!shouldIncludeTopic(topic, options?.filter)) {
+        continue
+      }
       const envelopeStartedAt = performance.now()
       const envelope = createEnvelope(id, topic)
       const createdAt = performance.now()
@@ -369,8 +418,6 @@ export function createWsRouter({
 
   async function broadcastSnapshots() {
     const startedAt = performance.now()
-    await maybePruneStaleEmptyChats()
-    const afterPruneAt = performance.now()
     let socketCount = 0
     for (const ws of sockets) {
       socketCount += 1
@@ -380,7 +427,7 @@ export function createWsRouter({
       console.log("[kanna/send->starting][server]", JSON.stringify({
         stage: "ws.broadcast_snapshots_completed",
         elapsedMs: Number((performance.now() - startedAt).toFixed(1)),
-        pruneMs: Number((afterPruneAt - startedAt).toFixed(1)),
+        pruneMs: 0,
         socketCount,
         totalChatCount: store.state.chatsById.size,
         totalProjectCount: store.state.projectsById.size,
@@ -388,6 +435,83 @@ export function createWsRouter({
     }
   }
 
+  async function broadcastFilteredSnapshots(filter: SnapshotBroadcastFilter) {
+    const startedAt = performance.now()
+    let socketCount = 0
+    for (const ws of sockets) {
+      socketCount += 1
+      await pushSnapshots(ws, { skipPrune: true, filter })
+    }
+    if (isSendToStartingProfilingEnabled()) {
+      console.log("[kanna/send->starting][server]", JSON.stringify({
+        stage: "ws.broadcast_filtered_snapshots_completed",
+        elapsedMs: Number((performance.now() - startedAt).toFixed(1)),
+        socketCount,
+        includeSidebar: Boolean(filter.includeSidebar),
+        chatCount: filter.chatIds?.size ?? 0,
+        projectCount: filter.projectIds?.size ?? 0,
+      }))
+    }
+  }
+
+  function scheduleBroadcast() {
+    pendingBroadcastAll = true
+    pendingBroadcastChatIds.clear()
+    if (pendingBroadcastTimer) {
+      return
+    }
+    pendingBroadcastTimer = setTimeout(() => {
+      pendingBroadcastTimer = null
+      const shouldBroadcastAll = pendingBroadcastAll
+      const chatIds = new Set(pendingBroadcastChatIds)
+      pendingBroadcastAll = false
+      pendingBroadcastChatIds.clear()
+      if (shouldBroadcastAll) {
+        void broadcastSnapshots()
+        return
+      }
+      if (chatIds.size > 0) {
+        void broadcastFilteredSnapshots({
+          includeSidebar: true,
+          chatIds,
+        })
+      }
+    }, 16)
+  }
+
+  function scheduleChatStateBroadcast(chatId: string) {
+    if (!pendingBroadcastAll) {
+      pendingBroadcastChatIds.add(chatId)
+    }
+    if (pendingBroadcastTimer) {
+      return
+    }
+    pendingBroadcastTimer = setTimeout(() => {
+      pendingBroadcastTimer = null
+      const shouldBroadcastAll = pendingBroadcastAll
+      const chatIds = new Set(pendingBroadcastChatIds)
+      pendingBroadcastAll = false
+      pendingBroadcastChatIds.clear()
+      if (shouldBroadcastAll) {
+        void broadcastSnapshots()
+        return
+      }
+      if (chatIds.size > 0) {
+        void broadcastFilteredSnapshots({
+          includeSidebar: true,
+          chatIds,
+        })
+      }
+    }, 16)
+  }
+
+  async function broadcastChatAndSidebar(chatId: string) {
+    await broadcastFilteredSnapshots({
+      includeSidebar: true,
+      chatIds: new Set([chatId]),
+    })
+  }
+
   function broadcastError(message: string) {
     for (const ws of sockets) {
       send(ws, {
@@ -563,24 +687,28 @@ export function createWsRouter({
         case "chat.create": {
           const chat = await store.createChat(command.projectId)
           send(ws, { v: PROTOCOL_VERSION, type: "ack", id, result: { chatId: chat.id } })
-          break
+          await broadcastChatAndSidebar(chat.id)
+          return
         }
         case "chat.rename": {
           await store.renameChat(command.chatId, command.title)
           send(ws, { v: PROTOCOL_VERSION, type: "ack", id })
-          break
+          await broadcastChatAndSidebar(command.chatId)
+          return
         }
         case "chat.delete": {
           await agent.cancel(command.chatId)
           await agent.closeChat(command.chatId)
           await store.deleteChat(command.chatId)
           send(ws, { v: PROTOCOL_VERSION, type: "ack", id })
-          break
+          await broadcastFilteredSnapshots({ includeSidebar: true })
+          return
         }
         case "chat.markRead": {
           await store.setChatReadState(command.chatId, false)
           send(ws, { v: PROTOCOL_VERSION, type: "ack", id })
-          break
+          await broadcastChatAndSidebar(command.chatId)
+          return
         }
         case "chat.setDraftProtection": {
           ws.data.protectedDraftChatIds = new Set(command.chatIds)
@@ -600,7 +728,7 @@ export function createWsRouter({
             chatId: result.chatId ?? null,
             payloadBytes,
           })
-          break
+          return
         }
         case "chat.refreshDiffs": {
           const { project } = resolveChatProject(command.chatId)
@@ -780,12 +908,12 @@ export function createWsRouter({
         case "chat.cancel": {
           await agent.cancel(command.chatId)
           send(ws, { v: PROTOCOL_VERSION, type: "ack", id })
-          break
+          return
         }
         case "chat.stopDraining": {
           await agent.stopDraining(command.chatId)
           send(ws, { v: PROTOCOL_VERSION, type: "ack", id })
-          break
+          return
         }
         case "chat.loadHistory": {
           const chat = store.getChat(command.chatId)
@@ -797,7 +925,7 @@ export function createWsRouter({
         case "chat.respondTool": {
           await agent.respondTool(command)
           send(ws, { v: PROTOCOL_VERSION, type: "ack", id })
-          break
+          return
         }
         case "terminal.create": {
           const project = store.getProject(command.projectId)
@@ -852,6 +980,9 @@ export function createWsRouter({
       sockets.delete(ws)
     },
     broadcastSnapshots,
+    scheduleBroadcast,
+    scheduleChatStateBroadcast,
+    pruneStaleEmptyChats: () => maybePruneStaleEmptyChats(),
     async handleMessage(ws: ServerWebSocket<ClientState>, raw: string | Buffer | ArrayBuffer | Uint8Array) {
       let parsed: unknown
       try {
@@ -873,12 +1004,12 @@ export function createWsRouter({
         if (parsed.topic.type === "local-projects") {
           void refreshDiscovery().then(() => {
             if (ws.data.subscriptions.has(parsed.id)) {
-              void pushSnapshots(ws)
+              void pushSnapshots(ws, { skipPrune: true })
             }
           })
           return
         }
-        await pushSnapshots(ws)
+        await pushSnapshots(ws, { skipPrune: true })
         return
       }
 
@@ -893,6 +1024,9 @@ export function createWsRouter({
       await handleCommand(ws, parsed)
     },
     dispose() {
+      if (pendingBroadcastTimer) {
+        clearTimeout(pendingBroadcastTimer)
+      }
       agent.setBackgroundErrorReporter?.(null)
       disposeTerminalEvents()
       disposeKeybindingEvents()