@cuongtran001/kanna 1.3.0 → 1.3.1

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

@@ -0,0 +1,250 @@
+/**
+ * ws-router-diff.ts
+ *
+ * WS command handlers for all diff/git operations (chat.refreshDiffs,
+ * chat.initGit, chat.getGitHubPublishInfo, chat.checkGitHubRepoAvailability,
+ * chat.publishToGitHub, chat.listBranches, chat.previewMergeBranch,
+ * chat.mergeBranch, chat.checkoutBranch, chat.syncBranch, chat.createBranch,
+ * chat.generateCommitMessage, chat.commitDiffs, chat.discardDiffFile,
+ * chat.ignoreDiffFile) extracted from ws-router.ts.
+ *
+ * All 15 handlers delegate exclusively to the injected DiffStoreDep and follow
+ * the same pattern — look up the project, call the store, ack, broadcast if
+ * the snapshot changed.  No closure dependencies on createWsRouter locals.
+ */
+import { PROTOCOL_VERSION } from "../shared/types"
+import type { ClientCommand, ServerEnvelope } from "../shared/protocol"
+import type { DiffStore } from "./diff-store"
+
+// ---------------------------------------------------------------------------
+// Dep interface (duck-typed; avoids circular imports with ws-router.ts)
+// ---------------------------------------------------------------------------
+
+/** The subset of DiffStore methods consumed by diff/git WS commands. */
+export type DiffStoreDep = Pick<
+  DiffStore,
+  | "refreshSnapshot"
+  | "initializeGit"
+  | "getGitHubPublishInfo"
+  | "checkGitHubRepoAvailability"
+  | "publishToGitHub"
+  | "listBranches"
+  | "previewMergeBranch"
+  | "mergeBranch"
+  | "checkoutBranch"
+  | "syncBranch"
+  | "createBranch"
+  | "generateCommitMessage"
+  | "commitFiles"
+  | "discardFile"
+  | "ignoreFile"
+>
+
+export interface DiffCommandDeps {
+  /** Resolved DiffStore (or its no-op fallback). */
+  resolvedDiffStore: DiffStoreDep
+  /** Resolve the project for a given chatId — throws if not found. */
+  resolveChatProject: (chatId: string) => { project: { id: string; localPath: string } }
+  /** Pre-bound to the current WebSocket; called to send an ack envelope. */
+  send: (envelope: ServerEnvelope) => void
+  /** Called after any operation that may have changed the diff snapshot. */
+  broadcastSnapshots: () => void
+}
+
+// ---------------------------------------------------------------------------
+// Command dispatcher
+// ---------------------------------------------------------------------------
+
+/**
+ * Handle one diff/git WS command.
+ *
+ * Returns `true` when the command was handled (caller should `return`).
+ * Returns `false` when the command type is outside this module's scope.
+ */
+export async function handleDiffCommand(
+  deps: DiffCommandDeps,
+  command: ClientCommand,
+  id: string,
+): Promise<boolean> {
+  const { resolvedDiffStore, resolveChatProject, send, broadcastSnapshots } = deps
+
+  switch (command.type) {
+    case "chat.refreshDiffs": {
+      const { project } = resolveChatProject(command.chatId)
+      const changed = await resolvedDiffStore.refreshSnapshot(project.id, project.localPath)
+      send({ v: PROTOCOL_VERSION, type: "ack", id })
+      if (changed) {
+        void broadcastSnapshots()
+      }
+      return true
+    }
+    case "chat.initGit": {
+      const { project } = resolveChatProject(command.chatId)
+      const result = await resolvedDiffStore.initializeGit({
+        projectId: project.id,
+        projectPath: project.localPath,
+      })
+      send({ v: PROTOCOL_VERSION, type: "ack", id, result })
+      if (result.snapshotChanged) {
+        void broadcastSnapshots()
+      }
+      return true
+    }
+    case "chat.getGitHubPublishInfo": {
+      const { project } = resolveChatProject(command.chatId)
+      const result = await resolvedDiffStore.getGitHubPublishInfo({
+        projectPath: project.localPath,
+      })
+      send({ v: PROTOCOL_VERSION, type: "ack", id, result })
+      return true
+    }
+    case "chat.checkGitHubRepoAvailability": {
+      const result = await resolvedDiffStore.checkGitHubRepoAvailability({
+        owner: command.owner,
+        name: command.name,
+      })
+      send({ v: PROTOCOL_VERSION, type: "ack", id, result })
+      return true
+    }
+    case "chat.publishToGitHub": {
+      const { project } = resolveChatProject(command.chatId)
+      const result = await resolvedDiffStore.publishToGitHub({
+        projectId: project.id,
+        projectPath: project.localPath,
+        owner: command.owner,
+        name: command.name,
+        visibility: command.visibility,
+        description: command.description,
+      })
+      send({ v: PROTOCOL_VERSION, type: "ack", id, result })
+      if (result.snapshotChanged) {
+        void broadcastSnapshots()
+      }
+      return true
+    }
+    case "chat.listBranches": {
+      const { project } = resolveChatProject(command.chatId)
+      const result = await resolvedDiffStore.listBranches({
+        projectPath: project.localPath,
+      })
+      send({ v: PROTOCOL_VERSION, type: "ack", id, result })
+      return true
+    }
+    case "chat.previewMergeBranch": {
+      const { project } = resolveChatProject(command.chatId)
+      const result = await resolvedDiffStore.previewMergeBranch({
+        projectPath: project.localPath,
+        branch: command.branch,
+      })
+      send({ v: PROTOCOL_VERSION, type: "ack", id, result })
+      return true
+    }
+    case "chat.mergeBranch": {
+      const { project } = resolveChatProject(command.chatId)
+      const result = await resolvedDiffStore.mergeBranch({
+        projectId: project.id,
+        projectPath: project.localPath,
+        branch: command.branch,
+      })
+      send({ v: PROTOCOL_VERSION, type: "ack", id, result })
+      if (result.snapshotChanged) {
+        void broadcastSnapshots()
+      }
+      return true
+    }
+    case "chat.checkoutBranch": {
+      const { project } = resolveChatProject(command.chatId)
+      const result = await resolvedDiffStore.checkoutBranch({
+        projectId: project.id,
+        projectPath: project.localPath,
+        branch: command.branch,
+        bringChanges: command.bringChanges,
+      })
+      send({ v: PROTOCOL_VERSION, type: "ack", id, result })
+      if (result.snapshotChanged) {
+        void broadcastSnapshots()
+      }
+      return true
+    }
+    case "chat.syncBranch": {
+      const { project } = resolveChatProject(command.chatId)
+      const result = await resolvedDiffStore.syncBranch({
+        projectId: project.id,
+        projectPath: project.localPath,
+        action: command.action,
+      })
+      send({ v: PROTOCOL_VERSION, type: "ack", id, result })
+      if (result.snapshotChanged) {
+        void broadcastSnapshots()
+      }
+      return true
+    }
+    case "chat.createBranch": {
+      const { project } = resolveChatProject(command.chatId)
+      const result = await resolvedDiffStore.createBranch({
+        projectId: project.id,
+        projectPath: project.localPath,
+        name: command.name,
+        baseBranchName: command.baseBranchName,
+      })
+      send({ v: PROTOCOL_VERSION, type: "ack", id, result })
+      if (result.snapshotChanged) {
+        void broadcastSnapshots()
+      }
+      return true
+    }
+    case "chat.generateCommitMessage": {
+      const { project } = resolveChatProject(command.chatId)
+      const result = await resolvedDiffStore.generateCommitMessage({
+        projectPath: project.localPath,
+        paths: command.paths,
+      })
+      send({ v: PROTOCOL_VERSION, type: "ack", id, result })
+      return true
+    }
+    case "chat.commitDiffs": {
+      const { project } = resolveChatProject(command.chatId)
+      const result = await resolvedDiffStore.commitFiles({
+        projectId: project.id,
+        projectPath: project.localPath,
+        paths: command.paths,
+        summary: command.summary,
+        description: command.description,
+        mode: command.mode,
+      })
+      send({ v: PROTOCOL_VERSION, type: "ack", id, result })
+      if (result.snapshotChanged) {
+        void broadcastSnapshots()
+      }
+      return true
+    }
+    case "chat.discardDiffFile": {
+      const { project } = resolveChatProject(command.chatId)
+      const result = await resolvedDiffStore.discardFile({
+        projectId: project.id,
+        projectPath: project.localPath,
+        path: command.path,
+      })
+      send({ v: PROTOCOL_VERSION, type: "ack", id, result })
+      if (result.snapshotChanged) {
+        void broadcastSnapshots()
+      }
+      return true
+    }
+    case "chat.ignoreDiffFile": {
+      const { project } = resolveChatProject(command.chatId)
+      const result = await resolvedDiffStore.ignoreFile({
+        projectId: project.id,
+        projectPath: project.localPath,
+        path: command.path,
+      })
+      send({ v: PROTOCOL_VERSION, type: "ack", id, result })
+      if (result.snapshotChanged) {
+        void broadcastSnapshots()
+      }
+      return true
+    }
+    default:
+      return false
+  }
+}

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

@@ -0,0 +1,329 @@
+/**
+ * ws-router-envelope.ts
+ *
+ * Snapshot-envelope computation for the WebSocket router.
+ * Extracted from ws-router.ts to reduce its size.
+ *
+ * `createEnvelopeBuilder(deps)` returns `{ createEnvelope, getSidebarSnapshotCacheEntry }`
+ * whose closures capture the stable dep objects — no shared mutable state lives here.
+ */
+import os from "node:os"
+import { log } from "../shared/log"
+import { PROTOCOL_VERSION } from "../shared/types"
+import type { ServerEnvelope, SubscriptionTopic } from "../shared/protocol"
+import type { ServerWebSocket } from "bun"
+import { deriveChatSnapshot, deriveLocalProjectsSnapshot, deriveSidebarData } from "./read-models"
+import { toOrchRunSummary } from "./orchestration-input"
+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 { UpdateManager } from "./update-manager"
+import type { PushManager } from "./push/push-manager"
+import type { DiffStore } from "./diff-store"
+import type { DiscoveredProject } from "./discovery.adapter"
+import {
+  getSidebarProjectOrder,
+  isSendToStartingProfilingEnabled,
+} from "./ws-router-utils"
+import type { ClientState, SnapshotComputationCache } from "./ws-router-utils"
+import type { ResolvedAppSettings } from "./ws-router-defaults"
+
+const DEFAULT_CHAT_RECENT_LIMIT = 200
+
+// ── Deps type ─────────────────────────────────────────────────────────────────
+
+export interface EnvelopeDeps {
+  store: EventStore
+  agent: AgentCoordinator
+  resolvedAppSettings: ResolvedAppSettings
+  keybindings: KeybindingsManager
+  resolvedDiffStore: Pick<DiffStore,
+    "getProjectSnapshot" | "refreshSnapshot" | "initializeGit" | "getGitHubPublishInfo" |
+    "checkGitHubRepoAvailability" | "publishToGitHub" | "listBranches" | "previewMergeBranch" |
+    "mergeBranch" | "syncBranch" | "checkoutBranch" | "createBranch" | "generateCommitMessage" |
+    "commitFiles" | "discardFile" | "ignoreFile" | "readPatch">
+  ptyInstances?: PtyInstanceRegistry
+  workflowRegistry?: WorkflowRegistry
+  machineDisplayName: string
+  updateManager: UpdateManager | null
+  getDiscoveredProjects: () => DiscoveredProject[]
+  terminals: TerminalManager
+  pushManager: PushManager
+}
+
+// ── Internal: sidebar cache entry ─────────────────────────────────────────────
+
+function buildSidebarSnapshotCacheEntry(
+  deps: EnvelopeDeps,
+  cache?: SnapshotComputationCache
+): NonNullable<SnapshotComputationCache["sidebar"]> {
+  if (cache?.sidebar) {
+    return cache.sidebar
+  }
+
+  const { store, agent, pushManager } = deps
+  const startedAt = performance.now()
+  const data = deriveSidebarData(store.state, agent.getActiveStatuses(), {
+    sidebarProjectOrder: getSidebarProjectOrder(store),
+    drainingChatIds: agent.getDrainingChatIds(),
+    claudeSessionStates: agent.getClaudeSessionStates?.(),
+  })
+  const observed = data.projectGroups.flatMap((group) =>
+    group.chats.map((chat) => ({
+      chatId: chat.chatId,
+      projectLocalPath: group.localPath,
+      projectTitle: group.localPath.split("/").filter(Boolean).pop() ?? group.localPath,
+      chatTitle: chat.title,
+      status: chat.status,
+    }))
+  )
+  void pushManager.observeStatuses(observed).catch((error) => {
+    log.warn("[kanna/push] observeStatuses failed", { error })
+  })
+  if (isSendToStartingProfilingEnabled()) {
+    const totalChats = data.projectGroups.reduce((count, group) => count + group.chats.length, 0)
+    log.info("[kanna/send->starting][server]", JSON.stringify({
+      stage: "ws.sidebar_snapshot_built",
+      elapsedMs: Number((performance.now() - startedAt).toFixed(1)),
+      projectGroupCount: data.projectGroups.length,
+      chatCount: totalChats,
+      totalChatCount: store.state.chatsById.size,
+      totalProjectCount: store.state.projectsById.size,
+    }))
+  }
+
+  const sidebar = {
+    data,
+    signature: JSON.stringify({
+      type: "sidebar" as const,
+      data,
+    }),
+  }
+
+  if (cache) {
+    cache.sidebar = sidebar
+  }
+
+  return sidebar
+}
+
+// ── Exported factory ──────────────────────────────────────────────────────────
+
+export interface EnvelopeBuilder {
+  /**
+   * Returns a cached sidebar entry (computes it once per cache object).
+   * Exposed so callers can read the pre-computed signature for dedup.
+   */
+  getSidebarSnapshotCacheEntry(cache?: SnapshotComputationCache): NonNullable<SnapshotComputationCache["sidebar"]>
+  /**
+   * Build the full ServerEnvelope for a given subscription topic.
+   */
+  createEnvelope(
+    id: string,
+    topic: SubscriptionTopic,
+    cache?: SnapshotComputationCache,
+    connection?: ServerWebSocket<ClientState>,
+  ): ServerEnvelope
+}
+
+export function createEnvelopeBuilder(deps: EnvelopeDeps): EnvelopeBuilder {
+  const {
+    store,
+    agent,
+    resolvedAppSettings,
+    keybindings,
+    resolvedDiffStore,
+    ptyInstances,
+    workflowRegistry,
+    machineDisplayName,
+    updateManager,
+    getDiscoveredProjects,
+    terminals,
+    pushManager,
+  } = deps
+
+  function getSidebarSnapshotCacheEntry(cache?: SnapshotComputationCache) {
+    return buildSidebarSnapshotCacheEntry(deps, cache)
+  }
+
+  function createEnvelope(
+    id: string,
+    topic: SubscriptionTopic,
+    cache?: SnapshotComputationCache,
+    connection?: ServerWebSocket<ClientState>,
+  ): ServerEnvelope {
+    if (topic.type === "sidebar") {
+      const sidebar = getSidebarSnapshotCacheEntry(cache)
+      return {
+        v: PROTOCOL_VERSION,
+        type: "snapshot",
+        id,
+        snapshot: {
+          type: "sidebar",
+          data: sidebar.data,
+        },
+      }
+    }
+
+    if (topic.type === "local-projects") {
+      const discoveredProjects = getDiscoveredProjects()
+      const data = deriveLocalProjectsSnapshot(store.state, discoveredProjects, machineDisplayName, os.homedir())
+
+      return {
+        v: PROTOCOL_VERSION,
+        type: "snapshot",
+        id,
+        snapshot: {
+          type: "local-projects",
+          data,
+        },
+      }
+    }
+
+    if (topic.type === "keybindings") {
+      return {
+        v: PROTOCOL_VERSION,
+        type: "snapshot",
+        id,
+        snapshot: {
+          type: "keybindings",
+          data: keybindings.getSnapshot(),
+        },
+      }
+    }
+
+    if (topic.type === "app-settings") {
+      return {
+        v: PROTOCOL_VERSION,
+        type: "snapshot",
+        id,
+        snapshot: {
+          type: "app-settings",
+          data: resolvedAppSettings.getSnapshot(),
+        },
+      }
+    }
+
+    if (topic.type === "push-config") {
+      return {
+        v: PROTOCOL_VERSION,
+        type: "snapshot",
+        id,
+        snapshot: {
+          type: "push-config",
+          data: pushManager.getConfigSnapshot(connection?.data.pushDeviceId ?? null),
+        },
+      }
+    }
+
+    if (topic.type === "update") {
+      return {
+        v: PROTOCOL_VERSION,
+        type: "snapshot",
+        id,
+        snapshot: {
+          type: "update",
+          data: updateManager?.getSnapshot() ?? {
+            currentVersion: "unknown",
+            latestVersion: null,
+            status: "idle",
+            updateAvailable: false,
+            lastCheckedAt: null,
+            error: null,
+            installAction: "restart",
+            reloadRequestedAt: null,
+          },
+        },
+      }
+    }
+
+    if (topic.type === "terminal") {
+      return {
+        v: PROTOCOL_VERSION,
+        type: "snapshot",
+        id,
+        snapshot: {
+          type: "terminal",
+          data: terminals.getSnapshot(topic.terminalId),
+        },
+      }
+    }
+
+    if (topic.type === "project-git") {
+      return {
+        v: PROTOCOL_VERSION,
+        type: "snapshot",
+        id,
+        snapshot: {
+          type: "project-git",
+          data: store.getProject(topic.projectId)
+            ? resolvedDiffStore.getProjectSnapshot(topic.projectId)
+            : null,
+        },
+      }
+    }
+
+    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,
+        type: "snapshot",
+        id,
+        snapshot: {
+          type: "workflows",
+          data: { chatId: topic.chatId, runs: workflowRegistry?.snapshot(topic.chatId) ?? [] },
+        },
+      }
+    }
+
+    if (topic.type === "orch-runs") {
+      return {
+        v: PROTOCOL_VERSION,
+        type: "snapshot",
+        id,
+        snapshot: {
+          type: "orch-runs",
+          data: { runs: store.getOrchRuns().map(toOrchRunSummary) },
+        },
+      }
+    }
+
+    return {
+      v: PROTOCOL_VERSION,
+      type: "snapshot",
+      id,
+      snapshot: {
+        type: "chat",
+        data: deriveChatSnapshot(
+          store.state,
+          agent.getActiveStatuses(),
+          agent.getDrainingChatIds(),
+          agent.getSlashCommandsLoadingChatIds(),
+          topic.chatId,
+          (chatId) => store.getRecentChatHistory(chatId, topic.recentLimit ?? DEFAULT_CHAT_RECENT_LIMIT),
+          (chatId) => store.getTunnelEvents(chatId),
+          agent.getWaitStartedAtByChatId(),
+          Date.now(),
+          agent.getClaudeSessionStates?.() ?? new Map(),
+          resolvedAppSettings.getSnapshot().customModels ?? [],
+        ),
+      },
+    }
+  }
+
+  return { getSidebarSnapshotCacheEntry, createEnvelope }
+}