kanna-code 0.35.2 → 0.36.1

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

@@ -61,6 +61,37 @@ const DEFAULT_KEYBINDINGS_SNAPSHOT: KeybindingsSnapshot = {
 
 const DEFAULT_APP_SETTINGS_SNAPSHOT: AppSettingsSnapshot = {
   analyticsEnabled: true,
+  browserSettingsMigrated: false,
+  theme: "system",
+  chatSoundPreference: "always",
+  chatSoundId: "funk",
+  terminal: {
+    scrollbackLines: 1_000,
+    minColumnWidth: 450,
+  },
+  editor: {
+    preset: "cursor",
+    commandTemplate: "cursor {path}",
+  },
+  defaultProvider: "last_used",
+  providerDefaults: {
+    claude: {
+      model: "claude-opus-4-7",
+      modelOptions: {
+        reasoningEffort: "high",
+        contextWindow: "200k",
+      },
+      planMode: false,
+    },
+    codex: {
+      model: "gpt-5.5",
+      modelOptions: {
+        reasoningEffort: "high",
+        fastMode: false,
+      },
+      planMode: false,
+    },
+  },
   warning: null,
   filePathDisplay: "~/.kanna/data/settings.json",
 }
@@ -163,6 +194,7 @@ describe("ws-router", () => {
       updateManager: null,
     })
     const ws = new FakeWebSocket()
+    router.handleOpen(ws as never)
 
     await router.handleMessage(
       ws as never,
@@ -254,6 +286,7 @@ describe("ws-router", () => {
       updateManager: null,
     })
     const ws = new FakeWebSocket()
+    router.handleOpen(ws as never)
 
     await router.handleMessage(
       ws as never,
@@ -298,6 +331,124 @@ describe("ws-router", () => {
     expect(writes).toEqual([{ analyticsEnabled: false }])
   })
 
+  test("subscribes to app settings and writes patches through the router", async () => {
+    let snapshot: AppSettingsSnapshot = DEFAULT_APP_SETTINGS_SNAPSHOT
+    let listener: ((nextSnapshot: AppSettingsSnapshot) => void) | null = null
+    const router = createWsRouter({
+      store: { state: createEmptyState() } 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,
+      appSettings: {
+        getSnapshot: () => snapshot,
+        write: async (value) => {
+          snapshot = { ...snapshot, analyticsEnabled: value.analyticsEnabled }
+          return snapshot
+        },
+        writePatch: async (patch) => {
+          snapshot = {
+            ...snapshot,
+            analyticsEnabled: patch.analyticsEnabled ?? snapshot.analyticsEnabled,
+            browserSettingsMigrated: patch.browserSettingsMigrated ?? snapshot.browserSettingsMigrated,
+            theme: patch.theme ?? snapshot.theme,
+            chatSoundPreference: patch.chatSoundPreference ?? snapshot.chatSoundPreference,
+            chatSoundId: patch.chatSoundId ?? snapshot.chatSoundId,
+            defaultProvider: patch.defaultProvider ?? snapshot.defaultProvider,
+            terminal: { ...snapshot.terminal, ...patch.terminal },
+            editor: { ...snapshot.editor, ...patch.editor },
+          }
+          listener?.(snapshot)
+          return snapshot
+        },
+        onChange: (nextListener) => {
+          listener = nextListener
+          return () => {
+            listener = null
+          }
+        },
+      },
+      refreshDiscovery: async () => [],
+      getDiscoveredProjects: () => [],
+      machineDisplayName: "Local Machine",
+      updateManager: null,
+    })
+    const ws = new FakeWebSocket()
+    router.handleOpen(ws as never)
+
+    await router.handleMessage(
+      ws as never,
+      JSON.stringify({
+        v: 1,
+        type: "subscribe",
+        id: "app-settings-sub-1",
+        topic: { type: "app-settings" },
+      })
+    )
+
+    await router.handleMessage(
+      ws as never,
+      JSON.stringify({
+        v: 1,
+        type: "command",
+        id: "settings-patch-1",
+        command: {
+          type: "settings.writeAppSettingsPatch",
+          patch: {
+            theme: "dark",
+            terminal: { scrollbackLines: 2_000 },
+          },
+        },
+      })
+    )
+
+    expect(ws.sent).toEqual([
+      {
+        v: PROTOCOL_VERSION,
+        type: "snapshot",
+        id: "app-settings-sub-1",
+        snapshot: {
+          type: "app-settings",
+          data: DEFAULT_APP_SETTINGS_SNAPSHOT,
+        },
+      },
+      {
+        v: PROTOCOL_VERSION,
+        type: "snapshot",
+        id: "app-settings-sub-1",
+        snapshot: {
+          type: "app-settings",
+          data: {
+            ...DEFAULT_APP_SETTINGS_SNAPSHOT,
+            theme: "dark",
+            terminal: {
+              ...DEFAULT_APP_SETTINGS_SNAPSHOT.terminal,
+              scrollbackLines: 2_000,
+            },
+          },
+        },
+      },
+      {
+        v: PROTOCOL_VERSION,
+        type: "ack",
+        id: "settings-patch-1",
+        result: {
+          ...DEFAULT_APP_SETTINGS_SNAPSHOT,
+          theme: "dark",
+          terminal: {
+            ...DEFAULT_APP_SETTINGS_SNAPSHOT.terminal,
+            scrollbackLines: 2_000,
+          },
+        },
+      },
+    ])
+  })
+
   test("tracks analytics preference transitions in the correct order", async () => {
     const analyticsEvents: string[] = []
     let analyticsEnabled = true

package/src/server/ws-router.ts

@@ -16,7 +16,7 @@ import { writeStandaloneTranscriptExport } from "./standalone-export"
 import { TerminalManager } from "./terminal-manager"
 import type { UpdateManager } from "./update-manager"
 import { deriveChatSnapshot, deriveLocalProjectsSnapshot, deriveSidebarData } from "./read-models"
-import type { AppSettingsSnapshot, LlmProviderSnapshot, LlmProviderValidationResult } from "../shared/types"
+import type { AppSettingsPatch, AppSettingsSnapshot, LlmProviderSnapshot, LlmProviderValidationResult } from "../shared/types"
 
 const DEFAULT_CHAT_RECENT_LIMIT = 200
 
@@ -49,6 +49,7 @@ function countSubscriptionsByTopic(ws: ServerWebSocket<ClientState>) {
   let localProjects = 0
   let update = 0
   let keybindings = 0
+  let appSettings = 0
   let terminal = 0
 
   for (const topic of ws.data.subscriptions.values()) {
@@ -71,6 +72,9 @@ function countSubscriptionsByTopic(ws: ServerWebSocket<ClientState>) {
       case "keybindings":
         keybindings += 1
         break
+      case "app-settings":
+        appSettings += 1
+        break
       case "terminal":
         terminal += 1
         break
@@ -85,6 +89,7 @@ function countSubscriptionsByTopic(ws: ServerWebSocket<ClientState>) {
     localProjects,
     update,
     keybindings,
+    appSettings,
     terminal,
   }
 }
@@ -101,7 +106,7 @@ interface CreateWsRouterArgs {
   agent: AgentCoordinator
   terminals: TerminalManager
   keybindings: KeybindingsManager
-  appSettings?: Pick<AppSettingsManager, "getSnapshot" | "write">
+  appSettings?: Pick<AppSettingsManager, "getSnapshot" | "write"> & Partial<Pick<AppSettingsManager, "writePatch" | "onChange">>
   analytics?: AnalyticsReporter
   llmProvider?: {
     read: () => Promise<LlmProviderSnapshot>
@@ -119,6 +124,7 @@ interface SnapshotBroadcastFilter {
   includeLocalProjects?: boolean
   includeUpdate?: boolean
   includeKeybindings?: boolean
+  includeAppSettings?: boolean
   chatIds?: Set<string>
   projectIds?: Set<string>
   terminalIds?: Set<string>
@@ -226,17 +232,88 @@ export function createWsRouter({
       },
     }),
   }
-  const resolvedAppSettings = appSettings ?? {
-    getSnapshot: () => ({
-      analyticsEnabled: true,
-      warning: null,
-      filePathDisplay: "~/.kanna/data/settings.json",
-    } satisfies AppSettingsSnapshot),
-    write: async ({ analyticsEnabled }: { analyticsEnabled: boolean }) => ({
-      analyticsEnabled,
-      warning: null,
-      filePathDisplay: "~/.kanna/data/settings.json",
-    } satisfies AppSettingsSnapshot),
+  let fallbackAppSettingsSnapshot: AppSettingsSnapshot = {
+    analyticsEnabled: true,
+    browserSettingsMigrated: false,
+    theme: "system",
+    chatSoundPreference: "always",
+    chatSoundId: "funk",
+    terminal: {
+      scrollbackLines: 1_000,
+      minColumnWidth: 450,
+    },
+    editor: {
+      preset: "cursor",
+      commandTemplate: "cursor {path}",
+    },
+    defaultProvider: "last_used",
+    providerDefaults: {
+      claude: {
+        model: "claude-opus-4-7",
+        modelOptions: {
+          reasoningEffort: "high",
+          contextWindow: "200k",
+        },
+        planMode: false,
+      },
+      codex: {
+        model: "gpt-5.5",
+        modelOptions: {
+          reasoningEffort: "high",
+          fastMode: false,
+        },
+        planMode: false,
+      },
+    },
+    warning: null,
+    filePathDisplay: "~/.kanna/data/settings.json",
+  }
+  const mergeAppSettingsPatch = (snapshot: AppSettingsSnapshot, patch: AppSettingsPatch): AppSettingsSnapshot => ({
+    ...snapshot,
+    ...patch,
+    terminal: {
+      ...snapshot.terminal,
+      ...patch.terminal,
+    },
+    editor: {
+      ...snapshot.editor,
+      ...patch.editor,
+    },
+    providerDefaults: {
+      claude: {
+        ...snapshot.providerDefaults.claude,
+        ...patch.providerDefaults?.claude,
+        modelOptions: {
+          ...snapshot.providerDefaults.claude.modelOptions,
+          ...patch.providerDefaults?.claude?.modelOptions,
+        },
+      },
+      codex: {
+        ...snapshot.providerDefaults.codex,
+        ...patch.providerDefaults?.codex,
+        modelOptions: {
+          ...snapshot.providerDefaults.codex.modelOptions,
+          ...patch.providerDefaults?.codex?.modelOptions,
+        },
+      },
+    },
+  })
+  const resolvedAppSettings = {
+    getSnapshot: () => appSettings?.getSnapshot() ?? fallbackAppSettingsSnapshot,
+    write: async (value: { analyticsEnabled: boolean }) => {
+      if (appSettings) return await appSettings.write(value)
+      fallbackAppSettingsSnapshot = { ...fallbackAppSettingsSnapshot, analyticsEnabled: value.analyticsEnabled }
+      return fallbackAppSettingsSnapshot
+    },
+    writePatch: async (patch: AppSettingsPatch) => {
+      if (appSettings?.writePatch) return await appSettings.writePatch(patch)
+      if (appSettings && patch.analyticsEnabled !== undefined && Object.keys(patch).length === 1) {
+        return await appSettings.write({ analyticsEnabled: patch.analyticsEnabled })
+      }
+      fallbackAppSettingsSnapshot = mergeAppSettingsPatch(appSettings?.getSnapshot() ?? fallbackAppSettingsSnapshot, patch)
+      return fallbackAppSettingsSnapshot
+    },
+    onChange: (listener: (snapshot: AppSettingsSnapshot) => void) => appSettings?.onChange?.(listener) ?? (() => {}),
   }
   const resolvedAnalytics = analytics ?? NoopAnalyticsReporter
 
@@ -307,6 +384,9 @@ export function createWsRouter({
     if (topic.type === "keybindings") {
       return Boolean(filter.includeKeybindings)
     }
+    if (topic.type === "app-settings") {
+      return Boolean(filter.includeAppSettings)
+    }
     if (topic.type === "chat") {
       return filter.chatIds?.has(topic.chatId) ?? false
     }
@@ -398,6 +478,18 @@ export function createWsRouter({
       }
     }
 
+    if (topic.type === "app-settings") {
+      return {
+        v: PROTOCOL_VERSION,
+        type: "snapshot",
+        id,
+        snapshot: {
+          type: "app-settings",
+          data: resolvedAppSettings.getSnapshot(),
+        },
+      }
+    }
+
     if (topic.type === "update") {
       return {
         v: PROTOCOL_VERSION,
@@ -683,6 +775,21 @@ export function createWsRouter({
     }
   })
 
+  const disposeAppSettingsEvents = resolvedAppSettings.onChange(() => {
+    for (const ws of sockets) {
+      const snapshotSignatures = ensureSnapshotSignatures(ws)
+      for (const [id, topic] of ws.data.subscriptions.entries()) {
+        if (topic.type !== "app-settings") 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)
+        send(ws, envelope)
+      }
+    }
+  })
+
   const disposeUpdateEvents = updateManager?.onChange(() => {
     for (const ws of sockets) {
       const snapshotSignatures = ensureSnapshotSignatures(ws)
@@ -770,6 +877,18 @@ export function createWsRouter({
           }
           return
         }
+        case "settings.writeAppSettingsPatch": {
+          const previousAnalyticsEnabled = resolvedAppSettings.getSnapshot().analyticsEnabled
+          const snapshot = await resolvedAppSettings.writePatch(command.patch)
+          send(ws, { v: PROTOCOL_VERSION, type: "ack", id, result: snapshot })
+          if (command.patch.analyticsEnabled !== undefined && previousAnalyticsEnabled && !snapshot.analyticsEnabled) {
+            resolvedAnalytics.track("analytics_disabled")
+          }
+          if (command.patch.analyticsEnabled !== undefined && !previousAnalyticsEnabled && snapshot.analyticsEnabled) {
+            resolvedAnalytics.track("analytics_enabled")
+          }
+          return
+        }
         case "settings.readLlmProvider": {
           send(ws, { v: PROTOCOL_VERSION, type: "ack", id, result: await resolvedLlmProvider.read() })
           return
@@ -1246,6 +1365,7 @@ export function createWsRouter({
       agent.setBackgroundErrorReporter?.(null)
       disposeTerminalEvents()
       disposeKeybindingEvents()
+      disposeAppSettingsEvents()
       disposeUpdateEvents()
     },
   }

package/src/shared/protocol.ts

@@ -1,5 +1,6 @@
 import type {
   AppSettingsSnapshot,
+  AppSettingsPatch,
   AgentProvider,
   ChatAttachment,
   ChatDiffSnapshot,
@@ -14,9 +15,10 @@ import type {
   StandaloneTranscriptAttachmentMode,
   StandaloneTranscriptExportResult,
   UpdateSnapshot,
+  EditorPreset,
 } from "./types"
 
-export type EditorPreset = "cursor" | "vscode" | "xcode" | "windsurf" | "custom"
+export type { EditorPreset }
 
 export interface EditorOpenSettings {
   preset: EditorPreset
@@ -28,6 +30,7 @@ export type SubscriptionTopic =
   | { type: "local-projects" }
   | { type: "update" }
   | { type: "keybindings" }
+  | { type: "app-settings" }
   | { type: "chat"; chatId: string; recentLimit?: number }
   | { type: "project-git"; projectId: string }
   | { type: "terminal"; terminalId: string }
@@ -63,6 +66,7 @@ export type ClientCommand =
   | { type: "settings.writeKeybindings"; bindings: KeybindingsSnapshot["bindings"] }
   | { type: "settings.readAppSettings" }
   | { type: "settings.writeAppSettings"; analyticsEnabled: boolean }
+  | { type: "settings.writeAppSettingsPatch"; patch: AppSettingsPatch }
   | { type: "settings.readLlmProvider" }
   | {
       type: "settings.writeLlmProvider"
@@ -81,7 +85,7 @@ export type ClientCommand =
   | {
       type: "system.openExternal"
       localPath: string
-      action: "open_finder" | "open_terminal" | "open_editor"
+      action: "open_finder" | "open_terminal" | "open_editor" | "open_preview" | "open_default"
       line?: number
       column?: number
       editor?: EditorOpenSettings
@@ -208,6 +212,8 @@ export type ClientCommand =
   | { type: "terminal.resize"; terminalId: string; cols: number; rows: number }
   | { type: "terminal.close"; terminalId: string }
 
+export type OpenExternalAction = Extract<ClientCommand, { type: "system.openExternal" }>["action"]
+
 export type ClientEnvelope =
   | { v: 1; type: "subscribe"; id: string; topic: SubscriptionTopic }
   | { v: 1; type: "unsubscribe"; id: string }

package/src/shared/types.ts

@@ -3,6 +3,11 @@ export const PROTOCOL_VERSION = 1 as const
 
 export type AgentProvider = "claude" | "codex"
 export type LlmProviderKind = "openai" | "openrouter" | "custom"
+export type AppThemePreference = "light" | "dark" | "system"
+export type ChatSoundPreference = "never" | "unfocused" | "always"
+export type ChatSoundId = "blow" | "bottle" | "frog" | "funk" | "glass" | "ping" | "pop" | "purr" | "tink"
+export type DefaultProviderPreference = "last_used" | AgentProvider
+export type EditorPreset = "cursor" | "vscode" | "xcode" | "windsurf" | "custom"
 export const DEFAULT_OPENAI_SDK_MODEL = "gpt-5.4-mini"
 export const DEFAULT_OPENROUTER_SDK_MODEL = "moonshotai/kimi-k2.5:nitro"
 
@@ -132,6 +137,17 @@ export interface ProviderModelOptionsByProvider {
   codex: CodexModelOptions
 }
 
+export interface ProviderPreference<TModelOptions> {
+  model: string
+  modelOptions: TModelOptions
+  planMode: boolean
+}
+
+export type ChatProviderPreferences = {
+  claude: ProviderPreference<ClaudeModelOptions>
+  codex: ProviderPreference<CodexModelOptions>
+}
+
 export type ModelOptions = Partial<{
   [K in AgentProvider]: Partial<ProviderModelOptionsByProvider[K]>
 }>
@@ -354,10 +370,39 @@ export interface LocalProjectsSnapshot {
 
 export interface AppSettingsSnapshot {
   analyticsEnabled: boolean
+  browserSettingsMigrated: boolean
+  theme: AppThemePreference
+  chatSoundPreference: ChatSoundPreference
+  chatSoundId: ChatSoundId
+  terminal: {
+    scrollbackLines: number
+    minColumnWidth: number
+  }
+  editor: {
+    preset: EditorPreset
+    commandTemplate: string
+  }
+  defaultProvider: DefaultProviderPreference
+  providerDefaults: ChatProviderPreferences
   warning: string | null
   filePathDisplay: string
 }
 
+export interface AppSettingsPatch {
+  analyticsEnabled?: boolean
+  browserSettingsMigrated?: boolean
+  theme?: AppThemePreference
+  chatSoundPreference?: ChatSoundPreference
+  chatSoundId?: ChatSoundId
+  terminal?: Partial<AppSettingsSnapshot["terminal"]>
+  editor?: Partial<AppSettingsSnapshot["editor"]>
+  defaultProvider?: DefaultProviderPreference
+  providerDefaults?: {
+    claude?: Partial<ProviderPreference<ClaudeModelOptions>>
+    codex?: Partial<ProviderPreference<CodexModelOptions>>
+  }
+}
+
 export interface LlmProviderFile {
   provider?: LlmProviderKind
   apiKey?: string