@cuongtran001/kanna 1.3.0 → 1.4.0

package/src/shared/git-diff-types.ts

@@ -0,0 +1,165 @@
+// Git diff, branch, and worktree types.
+// Extracted from types.ts to keep the barrel lean.
+// All external consumers importing from "../shared/types" continue to work unchanged.
+
+export interface ChatDiffFile {
+  path: string
+  changeType: "added" | "deleted" | "modified" | "renamed"
+  isUntracked: boolean
+  additions: number
+  deletions: number
+  patchDigest: string
+  mimeType?: string
+  size?: number
+}
+
+export interface ChatBranchHistoryEntry {
+  sha: string
+  summary: string
+  description: string
+  authorName?: string
+  authoredAt: string
+  tags: string[]
+  githubUrl?: string
+}
+
+export interface ChatBranchHistorySnapshot {
+  entries: ChatBranchHistoryEntry[]
+}
+
+export type ChatBranchListEntryKind = "local" | "remote" | "pull_request"
+
+export interface ChatBranchListEntry {
+  id: string
+  kind: ChatBranchListEntryKind
+  name: string
+  displayName: string
+  updatedAt?: string
+  description?: string
+  remoteRef?: string
+  prNumber?: number
+  prTitle?: string
+  headRefName?: string
+  headLabel?: string
+  headRepoCloneUrl?: string
+  isCrossRepository?: boolean
+}
+
+export interface ChatBranchListResult {
+  currentBranchName?: string
+  defaultBranchName?: string
+  recent: ChatBranchListEntry[]
+  local: ChatBranchListEntry[]
+  remote: ChatBranchListEntry[]
+  pullRequests: ChatBranchListEntry[]
+  pullRequestsStatus: "available" | "unavailable" | "error"
+  pullRequestsError?: string
+}
+
+export interface GitHubPublishInfo {
+  ghInstalled: boolean
+  authenticated: boolean
+  activeAccountLogin?: string
+  owners: string[]
+  suggestedRepoName: string
+}
+
+export interface GitHubRepoAvailabilityResult {
+  available: boolean
+  message: string
+}
+
+export interface BranchMetadata {
+  branchName?: string
+  defaultBranchName?: string
+  hasOriginRemote?: boolean
+  originRepoSlug?: string
+  hasUpstream?: boolean
+}
+
+export interface UpstreamStatus {
+  aheadCount?: number
+  behindCount?: number
+  lastFetchedAt?: string
+}
+
+export interface ChatDiffSnapshot extends BranchMetadata, UpstreamStatus {
+  status: "unknown" | "ready" | "no_repo"
+  files: ChatDiffFile[]
+  branchHistory?: ChatBranchHistorySnapshot
+}
+
+export interface BranchActionSuccess {
+  ok: true
+  branchName?: string
+  snapshotChanged: boolean
+}
+
+export interface BranchActionFailure {
+  ok: false
+  title: string
+  message: string
+  detail?: string
+  cancelled?: boolean
+  snapshotChanged?: boolean
+}
+
+export type ChatSyncSuccess = BranchActionSuccess & {
+  action: "fetch" | "pull" | "push" | "publish"
+  aheadCount?: number
+  behindCount?: number
+}
+
+export type ChatSyncFailure = BranchActionFailure & {
+  action: "fetch" | "pull" | "push" | "publish"
+}
+
+export type ChatSyncResult = ChatSyncSuccess | ChatSyncFailure
+
+export type DiffCommitMode = "commit_and_push" | "commit_only"
+
+export type ChatCheckoutBranchSuccess = BranchActionSuccess
+export type ChatCheckoutBranchFailure = BranchActionFailure
+export type ChatCheckoutBranchResult = ChatCheckoutBranchSuccess | ChatCheckoutBranchFailure
+
+export type ChatCreateBranchSuccess = BranchActionSuccess & { branchName: string }
+export type ChatCreateBranchFailure = BranchActionFailure
+export type ChatCreateBranchResult = ChatCreateBranchSuccess | ChatCreateBranchFailure
+
+export type ChatMergePreviewStatus = "up_to_date" | "mergeable" | "conflicts" | "error"
+
+export interface ChatMergePreviewResult {
+  currentBranchName?: string
+  targetBranchName: string
+  targetDisplayName: string
+  status: ChatMergePreviewStatus
+  commitCount: number
+  hasConflicts: boolean
+  message: string
+  detail?: string
+}
+
+export type ChatMergeBranchSuccess = BranchActionSuccess
+export type ChatMergeBranchFailure = BranchActionFailure
+export type ChatMergeBranchResult = ChatMergeBranchSuccess | ChatMergeBranchFailure
+
+export type DiffCommitSuccess = BranchActionSuccess & {
+  mode: DiffCommitMode
+  pushed: boolean
+}
+
+export type DiffCommitFailure = BranchActionFailure & {
+  mode: DiffCommitMode
+  phase: "commit" | "push"
+  localCommitCreated?: boolean
+}
+
+export type DiffCommitResult = DiffCommitSuccess | DiffCommitFailure
+
+export interface GitWorktree {
+  path: string                 // absolute
+  branch: string               // e.g. "main", "feat/x", "(detached)"
+  sha: string                  // HEAD commit sha
+  isPrimary: boolean
+  isLocked: boolean            // git has flagged this worktree as locked (pruning inhibited)
+}

package/src/shared/mcp-types.ts

@@ -0,0 +1,105 @@
+// MCP (Model Context Protocol) server types.
+// Extracted from types.ts to keep the barrel lean.
+// All external consumers importing from "../shared/types" continue to work unchanged.
+
+import type {
+  OAuthTokens,
+  OAuthClientInformationFull,
+  AuthorizationServerMetadata,
+} from "@modelcontextprotocol/sdk/shared/auth.js"
+
+export type McpServerTransport = "stdio" | "http" | "sse" | "ws"
+
+export type McpServerTestResult =
+  | { status: "untested" }
+  | { status: "pending"; startedAt: string }
+  | { status: "ok"; testedAt: string; toolCount: number }
+  | { status: "error"; testedAt: string; message: string }
+
+export interface McpOAuthFlowState {
+  codeVerifier: string
+  state: string
+  issuer: string
+  authorizationUrl: string
+  // AS metadata cached between start and complete (avoids re-discovery)
+  metadata: AuthorizationServerMetadata
+}
+
+export interface McpOAuthState {
+  enabled: boolean
+  status: "unauthenticated" | "authenticated" | "error"
+  errorMessage?: string
+  // resolved AS issuer (set on complete; used by refresh without re-discovery)
+  issuer?: string
+  // cached AS metadata (token_endpoint, etc.) persisted at complete so refresh
+  // uses it directly instead of re-discovering from issuer (which may be a
+  // non-resolvable resource URL, e.g. claude.ai design MCP)
+  metadata?: AuthorizationServerMetadata
+  // DCR result keyed by AS issuer (SEP-2352)
+  clientByIssuer?: Record<string, OAuthClientInformationFull>
+  tokens?: OAuthTokens
+  obtainedAt?: number
+  // present only mid-flow; cleared on complete/cancel
+  flow?: McpOAuthFlowState
+}
+
+interface McpServerBase {
+  id: string
+  name: string
+  enabled: boolean
+  createdAt: string
+  updatedAt: string
+  lastTest: McpServerTestResult
+}
+
+export interface McpServerStdioFields {
+  transport: "stdio"
+  command: string
+  args: string[]
+  env: Record<string, string>
+  cwd?: string
+}
+
+export interface McpServerNetworkFields {
+  transport: "http" | "sse" | "ws"
+  url: string
+  headers: Record<string, string>
+  oauth?: McpOAuthState
+}
+
+export type McpServerConfig =
+  | (McpServerBase & McpServerStdioFields)
+  | (McpServerBase & McpServerNetworkFields)
+
+export type McpServerInput =
+  | (McpServerStdioFields & { name: string; enabled?: boolean })
+  | (McpServerNetworkFields & { name: string; enabled?: boolean })
+
+export type McpServerPatch = Partial<{
+  name: string
+  enabled: boolean
+  transport: McpServerTransport
+  command: string
+  args: string[]
+  env: Record<string, string>
+  cwd: string | undefined
+  url: string
+  headers: Record<string, string>
+  oauth: McpOAuthState
+}>
+
+export interface McpValidationError {
+  code:
+    | "INVALID_NAME"
+    | "DUPLICATE_NAME"
+    | "RESERVED_NAME"
+    | "INVALID_TRANSPORT"
+    | "MISSING_COMMAND"
+    | "INVALID_URL"
+    | "INVALID_HEADER_KEY"
+    | "INVALID_ENV_KEY"
+    | "NOT_FOUND"
+    | "INVALID_OAUTH_TRANSPORT"
+  field?: string
+  message: string
+}

package/src/shared/protocol.ts

@@ -26,6 +26,7 @@ import type {
   UpdateSnapshot,
   EditorPreset,
 } from "./types"
+import type { ChatOpsEvent } from "./chat-ops"
 import type { ChatPermissionPolicyOverride, ToolRequestDecision } from "./permission-policy"
 import type { PtyInstanceDelta, PtyInstancesSnapshot } from "./pty-instance"
 import type { WorkflowRunSummary } from "./workflow-types"
@@ -45,7 +46,7 @@ export type SubscriptionTopic =
   | { type: "keybindings" }
   | { type: "app-settings" }
   | { type: "push-config" }
-  | { type: "chat"; chatId: string; recentLimit?: number }
+  | { type: "chat"; chatId: string; recentLimit?: number; since?: number }
   | { type: "project-git"; projectId: string }
   | { type: "terminal"; terminalId: string }
   | { type: "pty-instances" }
@@ -90,7 +91,7 @@ export interface OrchRunsSnapshot {
   runs: OrchRunSummary[]
 }
 
-export type WsEvent = TerminalEvent | PtyInstancesEvent
+export type WsEvent = TerminalEvent | PtyInstancesEvent | ChatOpsEvent
 
 export type ClientCommand =
   | { type: "project.open"; localPath: string }