kanna-code 0.32.2 → 0.32.4

package/src/server/event-store.ts

@@ -20,6 +20,25 @@ import { resolveLocalPath } from "./paths"
 
 const COMPACTION_THRESHOLD_BYTES = 2 * 1024 * 1024
 const STALE_EMPTY_CHAT_MAX_AGE_MS = 30 * 60 * 1000
+const SIDEBAR_PROJECT_ORDER_FILE = "sidebar-order.json"
+
+function normalizeSidebarProjectOrder(value: unknown) {
+  if (!Array.isArray(value)) {
+    return []
+  }
+
+  const seen = new Set<string>()
+  const projectIds: string[] = []
+  for (const entry of value) {
+    if (typeof entry !== "string") continue
+    const projectId = entry.trim()
+    if (!projectId || seen.has(projectId)) continue
+    seen.add(projectId)
+    projectIds.push(projectId)
+  }
+
+  return projectIds
+}
 
 function isSendToStartingProfilingEnabled() {
   return process.env.KANNA_PROFILE_SEND_TO_STARTING === "1"
@@ -59,7 +78,6 @@ function getReplayEventPriority(event: StoreEvent) {
   switch (event.type) {
     case "project_opened":
     case "project_removed":
-    case "sidebar_project_order_set":
       return 0
     case "chat_created":
       return 1
@@ -124,7 +142,10 @@ export class EventStore {
   private readonly queuedMessagesLogPath: string
   private readonly turnsLogPath: string
   private readonly transcriptsDir: string
+  private readonly sidebarProjectOrderPath: string
   private legacyMessagesByChatId = new Map<string, TranscriptEntry[]>()
+  private legacySidebarProjectOrder: string[] = []
+  private sidebarProjectOrder: string[] = []
   private snapshotHasLegacyMessages = false
   private cachedTranscript: { chatId: string; entries: TranscriptEntry[] } | null = null
 
@@ -137,6 +158,7 @@ export class EventStore {
     this.queuedMessagesLogPath = path.join(this.dataDir, "queued-messages.jsonl")
     this.turnsLogPath = path.join(this.dataDir, "turns.jsonl")
     this.transcriptsDir = path.join(this.dataDir, "transcripts")
+    this.sidebarProjectOrderPath = path.join(this.dataDir, SIDEBAR_PROJECT_ORDER_FILE)
   }
 
   async initialize() {
@@ -149,6 +171,7 @@ export class EventStore {
     await this.ensureFile(this.turnsLogPath)
     await this.loadSnapshot()
     await this.replayLogs()
+    await this.loadSidebarProjectOrder()
     if (!(await this.hasLegacyTranscriptData()) && await this.shouldCompact()) {
       await this.compact()
     }
@@ -199,7 +222,7 @@ export class EventStore {
           unread: chat.unread ?? false,
         })
       }
-      this.state.sidebarProjectOrder = [...(parsed.sidebarProjectOrder ?? [])]
+      this.legacySidebarProjectOrder = normalizeSidebarProjectOrder(parsed.sidebarProjectOrder)
       if (parsed.queuedMessages?.length) {
         for (const queuedSet of parsed.queuedMessages) {
           this.state.queuedMessagesByChatId.set(queuedSet.chatId, queuedSet.entries.map((entry) => ({
@@ -225,7 +248,8 @@ export class EventStore {
     this.state.projectIdsByPath.clear()
     this.state.chatsById.clear()
     this.state.queuedMessagesByChatId.clear()
-    this.state.sidebarProjectOrder = []
+    this.sidebarProjectOrder = []
+    this.legacySidebarProjectOrder = []
     this.cachedTranscript = null
   }
 
@@ -234,6 +258,86 @@ export class EventStore {
     this.snapshotHasLegacyMessages = false
   }
 
+  private async loadSidebarProjectOrder() {
+    const file = Bun.file(this.sidebarProjectOrderPath)
+    if (await file.exists()) {
+      try {
+        const text = await file.text()
+        if (!text.trim()) {
+          this.sidebarProjectOrder = []
+          return
+        }
+        this.sidebarProjectOrder = normalizeSidebarProjectOrder(JSON.parse(text))
+      } catch (error) {
+        console.warn(`${LOG_PREFIX} Failed to load ${SIDEBAR_PROJECT_ORDER_FILE}, ignoring saved order:`, error)
+        this.sidebarProjectOrder = []
+      }
+      return
+    }
+
+    const legacySidebarProjectOrder = await this.loadLegacySidebarProjectOrder()
+    this.sidebarProjectOrder = legacySidebarProjectOrder
+    if (legacySidebarProjectOrder.length > 0) {
+      await this.writeSidebarProjectOrderFile(legacySidebarProjectOrder)
+    }
+  }
+
+  private async loadLegacySidebarProjectOrder() {
+    const fromProjectsLog = await this.readLegacySidebarProjectOrderFromProjectsLog()
+    if (fromProjectsLog.length > 0) {
+      return fromProjectsLog
+    }
+    return [...this.legacySidebarProjectOrder]
+  }
+
+  private async readLegacySidebarProjectOrderFromProjectsLog() {
+    const file = Bun.file(this.projectsLogPath)
+    if (!(await file.exists())) return []
+
+    const text = await file.text()
+    if (!text.trim()) return []
+
+    const lines = text.split("\n")
+    let lastNonEmpty = -1
+    for (let index = lines.length - 1; index >= 0; index -= 1) {
+      if (lines[index].trim()) {
+        lastNonEmpty = index
+        break
+      }
+    }
+
+    let projectIds: string[] = []
+    for (let index = 0; index < lines.length; index += 1) {
+      const line = lines[index].trim()
+      if (!line) continue
+      try {
+        const event = JSON.parse(line) as {
+          v?: number
+          type?: string
+          projectIds?: unknown
+        }
+        if (event.v !== STORE_VERSION || event.type !== "sidebar_project_order_set") {
+          continue
+        }
+        projectIds = normalizeSidebarProjectOrder(event.projectIds)
+      } catch (error) {
+        if (index === lastNonEmpty) {
+          console.warn(`${LOG_PREFIX} Ignoring corrupt trailing line in ${path.basename(this.projectsLogPath)} while migrating sidebar order`)
+          return projectIds
+        }
+        console.warn(`${LOG_PREFIX} Failed to migrate sidebar order from ${path.basename(this.projectsLogPath)}:`, error)
+        return []
+      }
+    }
+
+    return projectIds
+  }
+
+  private async writeSidebarProjectOrderFile(projectIds: string[]) {
+    await mkdir(this.dataDir, { recursive: true })
+    await writeFile(this.sidebarProjectOrderPath, `${JSON.stringify(projectIds, null, 2)}\n`, "utf8")
+  }
+
   private async replayLogs() {
     if (this.storageReset) return
     const replayEvents = [
@@ -283,6 +387,9 @@ export class EventStore {
           await this.clearStorage()
           return []
         }
+        if ((event as { type?: unknown }).type === "sidebar_project_order_set") {
+          continue
+        }
         parsedEvents.push({
           event: event as StoreEvent,
           sourceIndex,
@@ -325,10 +432,6 @@ export class EventStore {
         this.state.projectIdsByPath.delete(project.localPath)
         break
       }
-      case "sidebar_project_order_set": {
-        this.state.sidebarProjectOrder = [...event.projectIds]
-        break
-      }
       case "chat_created": {
       const chat = {
           id: event.chatId,
@@ -541,7 +644,7 @@ export class EventStore {
     })
 
     const uniqueProjectIds = [...new Set(validProjectIds)]
-    const current = this.state.sidebarProjectOrder
+    const current = this.sidebarProjectOrder
     if (
       uniqueProjectIds.length === current.length
       && uniqueProjectIds.every((projectId, index) => current[index] === projectId)
@@ -549,13 +652,11 @@ export class EventStore {
       return
     }
 
-    const event: ProjectEvent = {
-      v: STORE_VERSION,
-      type: "sidebar_project_order_set",
-      timestamp: Date.now(),
-      projectIds: uniqueProjectIds,
-    }
-    await this.append(this.projectsLogPath, event)
+    this.writeChain = this.writeChain.then(async () => {
+      await this.writeSidebarProjectOrderFile(uniqueProjectIds)
+      this.sidebarProjectOrder = [...uniqueProjectIds]
+    })
+    return this.writeChain
   }
 
   async createChat(projectId: string) {
@@ -830,6 +931,10 @@ export class EventStore {
     return chat
   }
 
+  getSidebarProjectOrder() {
+    return [...this.sidebarProjectOrder]
+  }
+
   private getMessagesPageFromEntries(entries: TranscriptEntry[], limit: number, beforeIndex?: number): TranscriptPageResult {
     if (entries.length === 0) {
       return { entries: [], hasOlder: false, olderCursor: null }
@@ -961,7 +1066,6 @@ export class EventStore {
       v: STORE_VERSION,
       generatedAt: Date.now(),
       projects: this.listProjects().map((project) => ({ ...project })),
-      sidebarProjectOrder: [...this.state.sidebarProjectOrder],
       chats: [...this.state.chatsById.values()]
         .filter((chat) => !chat.deletedAt)
         .map((chat) => ({ ...chat })),

package/src/server/events.ts

@@ -25,7 +25,6 @@ export interface StoreState {
   projectIdsByPath: Map<string, string>
   chatsById: Map<string, ChatRecord>
   queuedMessagesByChatId: Map<string, QueuedChatMessage[]>
-  sidebarProjectOrder: string[]
 }
 
 export interface SnapshotFile {
@@ -50,11 +49,6 @@ export type ProjectEvent = {
   type: "project_removed"
   timestamp: number
   projectId: string
-} | {
-  v: 2
-  type: "sidebar_project_order_set"
-  timestamp: number
-  projectIds: string[]
 }
 
 export type ChatEvent =
@@ -167,7 +161,6 @@ export function createEmptyState(): StoreState {
     projectIdsByPath: new Map(),
     chatsById: new Map(),
     queuedMessagesByChatId: new Map(),
-    sidebarProjectOrder: [],
   }
 }
 

package/src/server/provider-catalog.test.ts

@@ -3,6 +3,7 @@ import {
   codexServiceTierFromModelOptions,
   normalizeClaudeModelOptions,
   normalizeCodexModelOptions,
+  normalizeServerModel,
 } from "./provider-catalog"
 import { resolveClaudeApiModelId } from "../shared/types"
 
@@ -55,6 +56,11 @@ describe("provider catalog normalization", () => {
     expect(codexServiceTierFromModelOptions(normalized)).toBe("fast")
   })
 
+  test("normalizes server model ids through the shared alias catalog", () => {
+    expect(normalizeServerModel("claude", "opus")).toBe("claude-opus-4-7")
+    expect(normalizeServerModel("codex", "gpt-5-codex")).toBe("gpt-5.3-codex")
+  })
+
   test("resolves Claude API model ids for 1m context window", () => {
     expect(resolveClaudeApiModelId("claude-opus-4-7", "1m")).toBe("claude-opus-4-7[1m]")
     expect(resolveClaudeApiModelId("claude-sonnet-4-6", "200k")).toBe("claude-sonnet-4-6")

package/src/server/provider-catalog.ts

@@ -13,6 +13,7 @@ import {
   DEFAULT_CODEX_MODEL_OPTIONS,
   PROVIDERS,
   normalizeClaudeContextWindow,
+  normalizeProviderModelId,
   isClaudeReasoningEffort,
   isCodexReasoningEffort,
 } from "../shared/types"
@@ -43,8 +44,9 @@ export function getServerProviderCatalog(provider: AgentProvider): ProviderCatal
 
 export function normalizeServerModel(provider: AgentProvider, model?: string): string {
   const catalog = getServerProviderCatalog(provider)
-  if (model && catalog.models.some((candidate) => candidate.id === model)) {
-    return model
+  const normalizedModel = normalizeProviderModelId(provider, model, catalog.defaultModel)
+  if (catalog.models.some((candidate) => candidate.id === normalizedModel)) {
+    return normalizedModel
   }
   return catalog.defaultModel
 }

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

@@ -26,7 +26,7 @@ describe("read models", () => {
       lastTurnOutcome: null,
     })
 
-    const sidebar = deriveSidebarData(state, new Map(), 1_000_000)
+    const sidebar = deriveSidebarData(state, new Map(), { nowMs: 1_000_000 })
     expect(sidebar.projectGroups[0]?.chats[0]?.provider).toBe("codex")
     expect(sidebar.projectGroups[0]?.chats[0]?.unread).toBe(true)
     expect(sidebar.projectGroups[0]?.previewChats.map((chat) => chat.chatId)).toEqual(["chat-1"])
@@ -198,9 +198,7 @@ describe("read models", () => {
       createdAt: 3,
       updatedAt: 15,
     })
-    state.sidebarProjectOrder = ["project-1"]
-
-    const sidebar = deriveSidebarData(state, new Map())
+    const sidebar = deriveSidebarData(state, new Map(), { sidebarProjectOrder: ["project-1"] })
 
     expect(sidebar.projectGroups.map((group) => group.groupKey)).toEqual(["project-1", "project-2", "project-3"])
   })
@@ -242,7 +240,7 @@ describe("read models", () => {
       lastTurnOutcome: null,
     })
 
-    const sidebar = deriveSidebarData(state, new Map(), 1_000_000)
+    const sidebar = deriveSidebarData(state, new Map(), { nowMs: 1_000_000 })
 
     expect(sidebar.projectGroups[0]?.previewChats.map((chat) => chat.chatId)).toEqual(["chat-1"])
     expect(sidebar.projectGroups[0]?.olderChats.map((chat) => chat.chatId)).toEqual(["chat-2"])

package/src/server/read-models.ts

@@ -49,8 +49,12 @@ function getSidebarChatBuckets(chats: SidebarChatRow[], nowMs: number) {
 export function deriveSidebarData(
   state: StoreState,
   activeStatuses: Map<string, KannaStatus>,
-  nowMs = Date.now()
+  options?: {
+    nowMs?: number
+    sidebarProjectOrder?: string[]
+  }
 ): SidebarData {
+  const nowMs = options?.nowMs ?? Date.now()
   const chatsByProjectId = new Map<string, ChatRecord[]>()
   for (const chat of state.chatsById.values()) {
     if (chat.deletedAt) continue
@@ -67,7 +71,7 @@ export function deriveSidebarData(
   const unorderedProjects = allProjects
     .sort((a, b) => b.updatedAt - a.updatedAt)
   const projectById = new Map(unorderedProjects.map((project) => [project.id, project]))
-  const orderedProjects = state.sidebarProjectOrder
+  const orderedProjects = (options?.sidebarProjectOrder ?? [])
     .map((projectId) => projectById.get(projectId))
     .filter((project): project is NonNullable<typeof project> => Boolean(project))
   const orderedProjectIds = new Set(orderedProjects.map((project) => project.id))

package/src/server/share.ts

@@ -63,42 +63,10 @@ function createNamedTunnel(token: string, localUrl: string) {
   return tunnel
 }
 
-async function awaitQuickTunnelUrl(tunnel: ShareTunnelProcess) {
-  return await new Promise<string>((resolve, reject) => {
-    let settled = false
-
-    const cleanup = () => {
-      tunnel.off("url", handleUrl)
-      tunnel.off("error", handleError)
-      tunnel.off("exit", handleExit)
-    }
-
-    const settle = (callback: () => void) => {
-      if (settled) return
-      settled = true
-      cleanup()
-      callback()
-    }
-
-    const handleUrl = (url: string) => {
-      settle(() => resolve(normalizePublicUrl(url)))
-    }
-
-    const handleError = (error: Error) => {
-      settle(() => reject(error))
-    }
-
-    const handleExit = (code: number | null, signal: NodeJS.Signals | null) => {
-      settle(() => reject(new Error(`Cloudflare tunnel exited before a public URL was ready (code: ${String(code)}, signal: ${String(signal)})`)))
-    }
-
-    tunnel.once("url", handleUrl)
-    tunnel.once("error", handleError)
-    tunnel.once("exit", handleExit)
-  })
-}
-
-async function awaitNamedTunnelReady(tunnel: ShareTunnelProcess) {
+async function awaitTunnelReady(
+  tunnel: ShareTunnelProcess,
+  { expectUrl }: { expectUrl: boolean },
+) {
   return await new Promise<string | null>((resolve, reject) => {
     let settled = false
 
@@ -121,6 +89,7 @@ async function awaitNamedTunnelReady(tunnel: ShareTunnelProcess) {
     }
 
     const handleConnected = () => {
+      if (expectUrl) return
       settle(() => resolve(null))
     }
 
@@ -129,11 +98,14 @@ async function awaitNamedTunnelReady(tunnel: ShareTunnelProcess) {
     }
 
     const handleExit = (code: number | null, signal: NodeJS.Signals | null) => {
-      settle(() => reject(new Error(`Cloudflare tunnel exited before it was ready (code: ${String(code)}, signal: ${String(signal)})`)))
+      const readyState = expectUrl ? "a public URL was ready" : "it was ready"
+      settle(() => reject(new Error(`Cloudflare tunnel exited before ${readyState} (code: ${String(code)}, signal: ${String(signal)})`)))
     }
 
     tunnel.once("url", handleUrl)
-    tunnel.once("connected", handleConnected)
+    if (!expectUrl) {
+      tunnel.once("connected", handleConnected)
+    }
     tunnel.once("error", handleError)
     tunnel.once("exit", handleExit)
   })
@@ -145,12 +117,11 @@ export async function startShareTunnel(
   deps: ShareTunnelDeps = {},
 ): Promise<StartedShareTunnel> {
   await ensureCloudflaredInstalled(deps)
-  const tunnel = isTokenShareMode(shareMode)
+  const namedTunnel = isTokenShareMode(shareMode)
+  const tunnel = namedTunnel
     ? (deps.createNamedTunnel ?? createNamedTunnel)(shareMode.token, localUrl)
     : (deps.createQuickTunnel ?? ((url) => Tunnel.quick(url)))(localUrl)
-  const publicUrl = isTokenShareMode(shareMode)
-    ? await awaitNamedTunnelReady(tunnel)
-    : await awaitQuickTunnelUrl(tunnel)
+  const publicUrl = await awaitTunnelReady(tunnel, { expectUrl: !namedTunnel })
 
   return {
     publicUrl,

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

@@ -863,12 +863,16 @@ describe("ws-router", () => {
     })
 
     const setSidebarProjectOrderCalls: string[][] = []
+    let sidebarProjectOrder: string[] = []
     const router = createWsRouter({
       store: {
         state,
+        getSidebarProjectOrder() {
+          return [...sidebarProjectOrder]
+        },
         async setSidebarProjectOrder(projectIds: string[]) {
           setSidebarProjectOrderCalls.push(projectIds)
-          state.sidebarProjectOrder = [...projectIds]
+          sidebarProjectOrder = [...projectIds]
         },
       } as never,
       agent: { getActiveStatuses: () => new Map(), getDrainingChatIds: () => new Set() } as never,

package/src/server/ws-router.ts

@@ -126,6 +126,12 @@ interface SnapshotComputationCache {
   }
 }
 
+function getSidebarProjectOrder(store: EventStore) {
+  return typeof store.getSidebarProjectOrder === "function"
+    ? store.getSidebarProjectOrder()
+    : []
+}
+
 function send(ws: ServerWebSocket<ClientState>, message: ServerEnvelope) {
   const payload = JSON.stringify(message)
   ws.send(payload)
@@ -300,7 +306,9 @@ export function createWsRouter({
     }
 
     const startedAt = performance.now()
-    const data = deriveSidebarData(store.state, agent.getActiveStatuses())
+    const data = deriveSidebarData(store.state, agent.getActiveStatuses(), {
+      sidebarProjectOrder: getSidebarProjectOrder(store),
+    })
     if (isSendToStartingProfilingEnabled()) {
       const totalChats = data.projectGroups.reduce((count, group) => count + group.chats.length, 0)
       console.log("[kanna/send->starting][server]", JSON.stringify({

package/src/shared/dev-ports.ts

@@ -1,5 +1,5 @@
 import type { ShareMode } from "./share"
-import { isShareEnabled } from "./share"
+import { assertNoHostOverride, getShareCliFlag, isShareEnabled } from "./share"
 
 export const DEFAULT_DEV_CLIENT_PORT = 5174
 
@@ -89,14 +89,12 @@ export function parseDevArgs(args: string[], localHostname: string): DevArgResol
   for (let index = 0; index < args.length; index += 1) {
     const arg = args[index]
     if (arg === "--share") {
-      if (sawHost) throw new Error("--share cannot be used with --host")
-      if (sawRemote) throw new Error("--share cannot be used with --remote")
+      assertNoHostOverride("--share", sawHost, sawRemote)
       share = "quick"
       continue
     }
     if (arg === "--cloudflared") {
-      if (sawHost) throw new Error("--cloudflared cannot be used with --host")
-      if (sawRemote) throw new Error("--cloudflared cannot be used with --remote")
+      assertNoHostOverride("--cloudflared", sawHost, sawRemote)
       const next = args[index + 1]
       if (!next || next.startsWith("-")) throw new Error("Missing value for --cloudflared")
       share = { kind: "token", token: next }
@@ -105,7 +103,7 @@ export function parseDevArgs(args: string[], localHostname: string): DevArgResol
     }
     if (arg === "--remote") {
       if (isShareEnabled(share)) {
-        throw new Error(typeof share === "string" ? "--share cannot be used with --remote" : "--cloudflared cannot be used with --remote")
+        throw new Error(`${getShareCliFlag(share)} cannot be used with --remote`)
       }
       sawRemote = true
       backendTargetHost = "127.0.0.1"
@@ -117,7 +115,7 @@ export function parseDevArgs(args: string[], localHostname: string): DevArgResol
     const next = args[index + 1]
     if (!next || next.startsWith("-")) continue
     if (isShareEnabled(share)) {
-      throw new Error(typeof share === "string" ? "--share cannot be used with --host" : "--cloudflared cannot be used with --host")
+      throw new Error(`${getShareCliFlag(share)} cannot be used with --host`)
     }
     sawHost = true
     hosts.add(next)

package/src/shared/share.ts

@@ -3,6 +3,8 @@ export type ShareMode = false | "quick" | {
   token: string
 }
 
+export type ShareCliFlag = "--share" | "--cloudflared"
+
 export function isShareEnabled(share: ShareMode): share is Exclude<ShareMode, false> {
   return share !== false
 }
@@ -10,3 +12,16 @@ export function isShareEnabled(share: ShareMode): share is Exclude<ShareMode, fa
 export function isTokenShareMode(share: ShareMode): share is { kind: "token"; token: string } {
   return typeof share === "object" && share !== null && share.kind === "token"
 }
+
+export function getShareCliFlag(share: Exclude<ShareMode, false>): ShareCliFlag {
+  return isTokenShareMode(share) ? "--cloudflared" : "--share"
+}
+
+export function assertNoHostOverride(shareFlag: ShareCliFlag, sawHost: boolean, sawRemote: boolean) {
+  if (sawHost) {
+    throw new Error(`${shareFlag} cannot be used with --host`)
+  }
+  if (sawRemote) {
+    throw new Error(`${shareFlag} cannot be used with --remote`)
+  }
+}

package/src/shared/types.test.ts

@@ -0,0 +1,24 @@
+import { describe, expect, test } from "bun:test"
+import {
+  normalizeClaudeModelId,
+  normalizeCodexModelId,
+  supportsClaudeMaxReasoningEffort,
+} from "./types"
+
+describe("shared model normalization", () => {
+  test("normalizes Claude aliases via the provider catalog", () => {
+    expect(normalizeClaudeModelId("opus")).toBe("claude-opus-4-7")
+    expect(normalizeClaudeModelId("sonnet")).toBe("claude-sonnet-4-6")
+    expect(normalizeClaudeModelId("haiku")).toBe("claude-haiku-4-5-20251001")
+  })
+
+  test("normalizes legacy Codex aliases via the provider catalog", () => {
+    expect(normalizeCodexModelId("gpt-5-codex")).toBe("gpt-5.3-codex")
+  })
+
+  test("uses declarative metadata for Claude max-effort support", () => {
+    expect(supportsClaudeMaxReasoningEffort("claude-opus-4-7")).toBe(true)
+    expect(supportsClaudeMaxReasoningEffort("opus")).toBe(true)
+    expect(supportsClaudeMaxReasoningEffort("claude-sonnet-4-6")).toBe(false)
+  })
+})