@cuongtran001/kanna 1.63.2 → 1.63.3

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

@@ -1,8 +1,6 @@
 import { log } from "../shared/log"
 import { PROTOCOL_VERSION } from "../shared/types"
 import type { ServerWebSocket } from "bun"
-import type { PtyInstanceDelta } from "../shared/pty-instance"
-import type { PtyInstanceRegistry } from "./claude-pty/pty-instance-registry"
 import type { WorkflowRegistry } from "./workflow-registry"
 import type { BackgroundTaskOutputRegistry } from "./background-task-output-registry"
 import type { BoardChange, BoardRegistry } from "./board-registry"
@@ -38,7 +36,6 @@ export interface BroadcastManagerDeps {
   resolvedAppSettings: ResolvedAppSettings
   updateManager: UpdateManager | null
   packageUpdateManager?: PackageUpdateManager
-  ptyInstances?: PtyInstanceRegistry
   workflowRegistry?: WorkflowRegistry
   boardRegistry?: BoardRegistry
   backgroundTaskOutputRegistry?: BackgroundTaskOutputRegistry
@@ -57,7 +54,6 @@ export class BroadcastManager {
   private readonly disposeKeybindingEvents: () => void
   private readonly disposeAppSettingsEvents: () => void
   private readonly disposeUpdateEvents: () => void
-  private readonly disposePtyInstances: () => void
   private readonly disposeWorkflows: () => void
   private readonly disposeBoards: () => void
   private readonly disposeBackgroundTaskOutput: () => void
@@ -71,7 +67,6 @@ export class BroadcastManager {
       resolvedAppSettings,
       updateManager,
       packageUpdateManager,
-      ptyInstances,
       workflowRegistry,
       boardRegistry,
       backgroundTaskOutputRegistry,
@@ -128,16 +123,6 @@ export class BroadcastManager {
       }
     }) ?? (() => {})
 
-    this.disposePtyInstances = ptyInstances?.subscribe((delta: PtyInstanceDelta) => {
-      if (delta.type === "added") {
-        this.pushPtyInstancesEvent({ type: "pty-instances.added", instance: delta.instance })
-      } else if (delta.type === "updated") {
-        this.pushPtyInstancesEvent({ type: "pty-instances.updated", instance: delta.instance })
-      } else {
-        this.pushPtyInstancesEvent({ type: "pty-instances.removed", chatId: delta.chatId })
-      }
-    }) ?? (() => {})
-
     this.disposeWorkflows = workflowRegistry?.subscribe((chatId) => {
       for (const ws of this.sockets) {
         const snapshotSignatures = ensureSnapshotSignatures(ws)
@@ -532,17 +517,6 @@ export class BroadcastManager {
     }
   }
 
-  private pushPtyInstancesEvent(
-    event: Extract<ServerEnvelope, { type: "event" }>["event"]
-  ): void {
-    for (const ws of this.sockets) {
-      for (const [id, topic] of ws.data.subscriptions.entries()) {
-        if (topic.type !== "pty-instances") continue
-        send(ws, { v: PROTOCOL_VERSION, type: "event", id, event })
-      }
-    }
-  }
-
   pushFollowedSessions(): void {
     for (const ws of this.sockets) {
       const snapshotSignatures = ensureSnapshotSignatures(ws)
@@ -584,7 +558,6 @@ export class BroadcastManager {
     this.disposeKeybindingEvents()
     this.disposeAppSettingsEvents()
     this.disposeUpdateEvents()
-    this.disposePtyInstances()
     this.disposeWorkflows()
     this.disposeBoards()
     this.disposeBackgroundTaskOutput()

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

@@ -94,13 +94,12 @@ describe("mergeAppSettingsPatch", () => {
     expect(result.providerDefaults.codex.modelOptions.reasoningEffort).toBe("high")
   })
 
-  test("claudeDriver lifecycle is deep-merged and preference is preserved", () => {
+  test("claudeDriver lifecycle is deep-merged", () => {
     const snapshot = makeSnapshot()
     const result = mergeAppSettingsPatch(snapshot, {
       claudeDriver: { lifecycle: { idleTimeoutMs: 9_000 } },
     })
-    expect(result.claudeDriver.preference).toBe(snapshot.claudeDriver.preference)
-    expect(result.claudeDriver.lifecycle).toMatchObject({ idleTimeoutMs: 9_000 })
+    expect(result.claudeDriver.lifecycle).toEqual({ ...snapshot.claudeDriver.lifecycle, idleTimeoutMs: 9_000 })
   })
 
   test("subagentRuntime.defaultLoopSubagentId null clears the value", () => {

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

@@ -4,7 +4,7 @@ import {
   AUTH_DEFAULTS,
   CLAUDE_AUTH_DEFAULTS,
   CLAUDE_DRIVER_DEFAULTS,
-  CLAUDE_PTY_LIFECYCLE_DEFAULTS,
+  CLAUDE_LIFECYCLE_DEFAULTS,
   CLOUDFLARE_TUNNEL_DEFAULTS,
   DEFAULT_OPENROUTER_SDK_MODEL,
   PACKAGE_UPDATE_SETTINGS_DEFAULTS,
@@ -166,7 +166,6 @@ export function mergeAppSettingsPatch(
     },
     installedPlugins: snapshot.installedPlugins,
     claudeDriver: {
-      preference: patch.claudeDriver?.preference ?? snapshot.claudeDriver.preference,
       lifecycle: {
         ...snapshot.claudeDriver.lifecycle,
         ...patch.claudeDriver?.lifecycle,
@@ -241,7 +240,7 @@ export function buildInitialAppSettingsSnapshot(): AppSettingsSnapshot {
     customMcpServers: [],
     customModels: [],
     textSnippets: [],
-    claudeDriver: { ...CLAUDE_DRIVER_DEFAULTS, lifecycle: { ...CLAUDE_PTY_LIFECYCLE_DEFAULTS } },
+    claudeDriver: { ...CLAUDE_DRIVER_DEFAULTS, lifecycle: { ...CLAUDE_LIFECYCLE_DEFAULTS } },
     globalPromptAppend: "",
     shareDefaultTtlHours: 24,
     subagentRuntime: { runTimeoutMs: 600_000, defaultLoopSubagentId: null },

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

@@ -13,7 +13,6 @@ import type { EventStore } from "./event-store"
 import type { AgentCoordinator } from "./agent"
 import type { TerminalManager } from "./terminal-manager"
 import type { KeybindingsManager } from "./keybindings"
-import type { PtyInstanceRegistry } from "./claude-pty/pty-instance-registry"
 import type { WorkflowRegistry } from "./workflow-registry"
 import type { BackgroundTaskOutputRegistry } from "./background-task-output-registry"
 import type { BoardRegistry } from "./board-registry"
@@ -65,7 +64,6 @@ export interface EnvelopeDeps {
     "checkGitHubRepoAvailability" | "publishToGitHub" | "listBranches" | "previewMergeBranch" |
     "mergeBranch" | "syncBranch" | "checkoutBranch" | "createBranch" | "generateCommitMessage" |
     "commitFiles" | "discardFile" | "ignoreFile" | "readPatch">
-  ptyInstances?: PtyInstanceRegistry
   workflowRegistry?: WorkflowRegistry
   backgroundTaskOutputRegistry?: BackgroundTaskOutputRegistry
   boardRegistry?: BoardRegistry
@@ -158,7 +156,6 @@ export function createEnvelopeBuilder(deps: EnvelopeDeps): EnvelopeBuilder {
     resolvedAppSettings,
     keybindings,
     resolvedDiffStore,
-    ptyInstances,
     workflowRegistry,
     backgroundTaskOutputRegistry,
     boardRegistry,
@@ -327,18 +324,6 @@ export function createEnvelopeBuilder(deps: EnvelopeDeps): EnvelopeBuilder {
       }
     }
 
-    if (topic.type === "pty-instances") {
-      return {
-        v: PROTOCOL_VERSION,
-        type: "snapshot",
-        id,
-        snapshot: {
-          type: "pty-instances",
-          data: { instances: ptyInstances?.snapshot() ?? [] },
-        },
-      }
-    }
-
     if (topic.type === "workflows") {
       return {
         v: PROTOCOL_VERSION,

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

@@ -3,7 +3,7 @@ import type { ObservabilityCommandDeps } from "./ws-router-observability"
 import { handleObservabilityCommand } from "./ws-router-observability"
 import type { ClientCommand } from "../shared/protocol"
 import type { ChatRecord, ProjectRecord } from "./events"
-import { encodeCwd } from "./claude-pty/jsonl-path.adapter"
+import { encodeCwd } from "./claude-projects-path.adapter"
 
 const REAL_CWD = process.cwd()
 

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

@@ -7,7 +7,7 @@ import {
   AUTH_DEFAULTS,
   CLAUDE_AUTH_DEFAULTS,
   CLAUDE_DRIVER_DEFAULTS,
-  CLAUDE_PTY_LIFECYCLE_DEFAULTS,
+  CLAUDE_LIFECYCLE_DEFAULTS,
   CLOUDFLARE_TUNNEL_DEFAULTS,
   DEFAULT_OPENROUTER_SDK_MODEL,
   PACKAGE_UPDATE_SETTINGS_DEFAULTS,
@@ -53,7 +53,7 @@ function makeSnapshot(): AppSettingsSnapshot {
     customMcpServers: [],
     customModels: [],
     textSnippets: [],
-    claudeDriver: { ...CLAUDE_DRIVER_DEFAULTS, lifecycle: { ...CLAUDE_PTY_LIFECYCLE_DEFAULTS } },
+    claudeDriver: { ...CLAUDE_DRIVER_DEFAULTS, lifecycle: { ...CLAUDE_LIFECYCLE_DEFAULTS } },
     globalPromptAppend: "",
     shareDefaultTtlHours: 24,
     subagentRuntime: { runTimeoutMs: 600_000, defaultLoopSubagentId: null },

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

@@ -4,7 +4,7 @@ import { randomUUID } from "node:crypto"
 import { mkdtemp, rm, writeFile } from "node:fs/promises"
 import { tmpdir } from "node:os"
 import path from "node:path"
-import { AUTH_DEFAULTS, CLAUDE_AUTH_DEFAULTS, CLAUDE_DRIVER_DEFAULTS, CLAUDE_PTY_LIFECYCLE_DEFAULTS, CLOUDFLARE_TUNNEL_DEFAULTS, DEFAULT_OPENROUTER_SDK_MODEL, EMPTY_CHAT_ACTIVITY, PACKAGE_UPDATE_SETTINGS_DEFAULTS, PLUGIN_SETTINGS_DEFAULTS, PROTOCOL_VERSION, PUSH_DEFAULTS,
+import { AUTH_DEFAULTS, CLAUDE_AUTH_DEFAULTS, CLAUDE_DRIVER_DEFAULTS, CLAUDE_LIFECYCLE_DEFAULTS, CLOUDFLARE_TUNNEL_DEFAULTS, DEFAULT_OPENROUTER_SDK_MODEL, EMPTY_CHAT_ACTIVITY, PACKAGE_UPDATE_SETTINGS_DEFAULTS, PLUGIN_SETTINGS_DEFAULTS, PROTOCOL_VERSION, PUSH_DEFAULTS,
   TELEMETRY_DEFAULTS, TYPOGRAPHY_DEFAULTS, UPLOAD_DEFAULTS } from "../shared/types"
 import { BUILTIN_SLASH_COMMANDS } from "../shared/builtin-commands"
 import type { AppSettingsSnapshot, ChatActivity, KeybindingsSnapshot, LlmProviderSnapshot, McpServerConfig, McpServerTestResult, OpenRouterModel, UpdateSnapshot } from "../shared/types"
@@ -137,7 +137,7 @@ const DEFAULT_APP_SETTINGS_SNAPSHOT: AppSettingsSnapshot = {
   customMcpServers: [],
   customModels: [],
   textSnippets: [],
-  claudeDriver: { ...CLAUDE_DRIVER_DEFAULTS, lifecycle: { ...CLAUDE_PTY_LIFECYCLE_DEFAULTS } },
+  claudeDriver: { ...CLAUDE_DRIVER_DEFAULTS, lifecycle: { ...CLAUDE_LIFECYCLE_DEFAULTS } },
   globalPromptAppend: "",
   shareDefaultTtlHours: 24,
   subagentRuntime: { runTimeoutMs: 600_000, defaultLoopSubagentId: null },

package/src/server/ws-router.ts

@@ -28,7 +28,6 @@ import { listWorktrees } from "./worktree-store.adapter"
 import type { TunnelGateway } from "./cloudflare-tunnel/gateway"
 import type { PushManager } from "./push/push-manager"
 import type { SessionShareService } from "./session-share"
-import type { PtyInstanceRegistry } from "./claude-pty/pty-instance-registry"
 import type { WorkflowRegistry } from "./workflow-registry"
 import type { BackgroundTaskOutputRegistry } from "./background-task-output-registry"
 import { handleBoardCommand } from "./ws-router-boards"
@@ -107,8 +106,6 @@ interface CreateWsRouterArgs {
   machineDisplayName: string
   updateManager: UpdateManager | null
   pushManager: PushManager
-  ptyInstances?: PtyInstanceRegistry
-  killPtyInstance?: (chatId: string) => Promise<{ ok: boolean; error?: string }>
   workflowRegistry?: WorkflowRegistry
   boardRegistry?: BoardRegistry
   boardSync?: BoardSync
@@ -141,8 +138,6 @@ export function createWsRouter({
   machineDisplayName,
   updateManager,
   pushManager,
-  ptyInstances,
-  killPtyInstance,
   workflowRegistry,
   boardRegistry,
   boardSync,
@@ -169,7 +164,6 @@ export function createWsRouter({
     resolvedAppSettings,
     keybindings,
     resolvedDiffStore,
-    ptyInstances,
     workflowRegistry,
     boardRegistry,
     backgroundTaskOutputRegistry,
@@ -190,7 +184,6 @@ export function createWsRouter({
     resolvedAppSettings,
     updateManager,
     packageUpdateManager,
-    ptyInstances,
     workflowRegistry,
     boardRegistry,
     backgroundTaskOutputRegistry,
@@ -229,7 +222,6 @@ export function createWsRouter({
     return {
       agent,
       tunnelGateway,
-      killPtyInstance,
       send: (envelope) => send(ws, envelope),
       broadcastChatAndSidebar: (chatId) => broadcast.broadcastChatAndSidebar(chatId),
     }

package/src/shared/app-settings-types.ts

@@ -136,37 +136,27 @@ export function normalizeAnthropicBaseUrl(raw: string): string | null {
 export const GLOBAL_PROMPT_APPEND_MAX_CHARS = 8_000
 
 
-export type ClaudeDriverPreference = "sdk" | "pty"
-
-export const CLAUDE_DRIVER_VALUES: readonly ClaudeDriverPreference[] = ["sdk", "pty"]
-
-export function isClaudeDriverPreference(value: string | null | undefined): value is ClaudeDriverPreference {
-  return value === "sdk" || value === "pty"
-}
-
-export interface ClaudePtyLifecycleSettings {
+export interface ClaudeLifecycleSettings {
   idleTimeoutMs: number
   maxConcurrent: number
 }
 
-export const CLAUDE_PTY_LIFECYCLE_DEFAULTS: ClaudePtyLifecycleSettings = {
+export const CLAUDE_LIFECYCLE_DEFAULTS: ClaudeLifecycleSettings = {
   idleTimeoutMs: 600_000,
   maxConcurrent: 4,
 }
 
-export const CLAUDE_PTY_IDLE_TIMEOUT_MS_MIN = 60_000
-export const CLAUDE_PTY_IDLE_TIMEOUT_MS_MAX = 3_600_000
-export const CLAUDE_PTY_MAX_CONCURRENT_MIN = 1
-export const CLAUDE_PTY_MAX_CONCURRENT_MAX = 16
+export const CLAUDE_IDLE_TIMEOUT_MS_MIN = 60_000
+export const CLAUDE_IDLE_TIMEOUT_MS_MAX = 3_600_000
+export const CLAUDE_MAX_CONCURRENT_MIN = 1
+export const CLAUDE_MAX_CONCURRENT_MAX = 16
 
 export interface ClaudeDriverSettings {
-  preference: ClaudeDriverPreference
-  lifecycle: ClaudePtyLifecycleSettings
+  lifecycle: ClaudeLifecycleSettings
 }
 
 export const CLAUDE_DRIVER_DEFAULTS: ClaudeDriverSettings = {
-  preference: "sdk",
-  lifecycle: { ...CLAUDE_PTY_LIFECYCLE_DEFAULTS },
+  lifecycle: { ...CLAUDE_LIFECYCLE_DEFAULTS },
 }
 
 export type ClaudeSessionLifecycleStatus = "cold" | "warming" | "active" | "idle" | "cooling"
@@ -386,8 +376,7 @@ export interface AppSettingsPatch {
     delete?: { id: string }
   }
   claudeDriver?: {
-    preference?: ClaudeDriverPreference
-    lifecycle?: Partial<ClaudePtyLifecycleSettings>
+    lifecycle?: Partial<ClaudeLifecycleSettings>
   }
   globalPromptAppend?: string
   shareDefaultTtlHours?: number

package/src/shared/claude-api-error-classification.ts

@@ -8,7 +8,7 @@ const DESCRIPTION_BY_REASON: ReadonlyMap<string, ClaudeApiErrorDescription> = ne
   ["claude_code_version_too_old", {
     headline: "Model not supported by this Claude Code version",
     explanation: "The selected model needs a newer Claude Code than the one Kanna runs, so every turn on this model fails.",
-    remedy: "Pick another model, or update Kanna, which bundles Claude Code. If Kanna runs your own claude binary (the PTY driver, or CLAUDE_EXECUTABLE is set), run \"claude update\" instead.",
+    remedy: "Pick another model, or update Kanna, which bundles Claude Code. If Kanna runs your own claude binary (CLAUDE_EXECUTABLE is set), run \"claude update\" instead.",
   }],
 ])
 

package/src/shared/protocol.ts

@@ -28,7 +28,6 @@ import type {
 } from "./types"
 import type { ChatOpsEvent } from "./chat-ops"
 import type { ChatPermissionPolicyOverride, ToolRequestDecision } from "./permission-policy"
-import type { PtyInstanceDelta, PtyInstancesSnapshot } from "./pty-instance"
 import type {
   BoardOwnerKind,
   BoardSummary,
@@ -58,7 +57,6 @@ export type SubscriptionTopic =
   | { type: "project-git"; projectId: string; chatId?: string }
   | { type: "project-commands"; projectId: string }
   | { type: "terminal"; terminalId: string }
-  | { type: "pty-instances" }
   | { type: "workflows"; chatId: string }
   | { type: "boards"; ownerKind: BoardOwnerKind; ownerId: string }
   | { type: "board"; boardId: string; pageSize?: number }
@@ -91,11 +89,6 @@ export type SubagentCommandResult =
 
 export type SubagentDeleteResult = { ok: true }
 
-export type PtyInstancesEvent =
-  | { type: "pty-instances.added"; instance: Extract<PtyInstanceDelta, { type: "added" }>["instance"] }
-  | { type: "pty-instances.updated"; instance: Extract<PtyInstanceDelta, { type: "updated" }>["instance"] }
-  | { type: "pty-instances.removed"; chatId: string }
-
 export interface WorkflowsSnapshot {
   chatId: string
   runs: WorkflowRunSummary[]
@@ -140,7 +133,7 @@ export function readProjectDeleteResult(value: JsonValue): ProjectDeleteResult {
   return { deletedBoardIds: stringsOf(record.deletedBoardIds), failures: stringsOf(record.failures) }
 }
 
-export type WsEvent = TerminalEvent | PtyInstancesEvent | ChatOpsEvent
+export type WsEvent = TerminalEvent | ChatOpsEvent
 
 export type ClientCommand =
   | { type: "project.open"; localPath: string }
@@ -412,8 +405,6 @@ export type ClientCommand =
   | { type: "terminal.input"; terminalId: string; data: string }
   | { type: "terminal.resize"; terminalId: string; cols: number; rows: number }
   | { type: "terminal.close"; terminalId: string }
-  | { type: "pty.cancel"; chatId: string }
-  | { type: "pty.kill"; chatId: string }
   | { type: "push.identifyDevice"; pushDeviceId: string | null }
   | { type: "push.subscribe"; subscription: PushSubscribeRequestPayload; label: string; userAgent: string }
   | { type: "push.unsubscribe"; pushDeviceId: string }
@@ -442,7 +433,6 @@ export type ServerSnapshot =
   | { type: "project-git"; data: ChatDiffSnapshot | null }
   | { type: "project-commands"; data: ProjectCommandsSnapshot }
   | { type: "terminal"; data: TerminalSnapshot | null }
-  | { type: "pty-instances"; data: PtyInstancesSnapshot }
   | { type: "workflows"; data: WorkflowsSnapshot }
   | { type: "boards"; data: BoardsSnapshot }
   | { type: "board"; data: BoardSnapshot }

package/dist/client/assets/BoardsRoutePage-BTTjJX-Y.js

@@ -1 +0,0 @@
-import{o as e}from"./rolldown-runtime-C0FnF6B9.js";import{t}from"./react-DiVRNtpo.js";import{c as n,l as r,u as i}from"./chunk-OB3PAWPO-mARpRU1A.js";import{t as a}from"./jsx-runtime-BdxMnOeJ.js";import{o}from"./formatters-wSVyvDFZ.js";import{t as s}from"./BoardsPage-BJalB-bc.js";var c=e(t(),1),l=e(a(),1);function u(){let e=r(),t=n(),{projectId:a=``}=i(),u=[...e.sidebarData.starredProjectGroups,...e.sidebarData.projectGroups].find(e=>e.groupKey===a),d=u?o(u.localPath):`Project`,f=(0,c.useCallback)(e=>{t(`/boards/${a}/${e}`)},[t,a]);return(0,l.jsx)(`div`,{className:`relative flex min-h-0 min-w-0 flex-1 flex-col`,children:(0,l.jsx)(s,{ownerKind:`project`,ownerId:a,ownerName:d,socket:e.socket,onOpenBoard:f})})}export{u as BoardsRoutePage};