npm - kanna-code - Versions diffs - 0.22.0 → 0.23.1 - Mend

kanna-code 0.22.0 → 0.23.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/dist/client/assets/index-DADxOnBF.css +32 -0
package/dist/client/assets/index-y8BVCflz.js +2506 -0
package/dist/client/index.html +2 -2
package/package.json +2 -1
package/src/server/diff-store.test.ts +133 -2
package/src/server/diff-store.ts +136 -1
package/src/server/generate-commit-message.test.ts +2 -0
package/src/server/generate-commit-message.ts +2 -2
package/src/server/ws-router.test.ts +196 -14
package/src/server/ws-router.ts +43 -1
package/src/shared/protocol.ts +2 -0
package/src/shared/types.ts +1 -0
package/dist/client/assets/index-1BGyFTrZ.js +0 -2508
package/dist/client/assets/index-DKD9EePK.css +0 -32

package/dist/client/index.html CHANGED Viewed

@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="icon" type="image/png" href="/favicon.png" />
     <title>Kanna</title>
-    <script type="module" crossorigin src="/assets/index-1BGyFTrZ.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-DKD9EePK.css">
+    <script type="module" crossorigin src="/assets/index-y8BVCflz.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-DADxOnBF.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "kanna-code",
   "type": "module",
-  "version": "0.22.0",
+  "version": "0.23.1",
   "description": "A beautiful web UI for Claude Code",
   "license": "MIT",
   "keywords": [
@@ -68,6 +68,7 @@
     "@radix-ui/react-tooltip": "^1.2.8",
     "@tailwindcss/postcss": "^4.1.18",
     "@tailwindcss/typography": "^0.5.19",
+    "@tanstack/react-virtual": "^3.13.23",
     "@types/bun": "latest",
     "@types/node": "^24.10.1",
     "@types/qrcode": "^1.5.6",

package/src/server/diff-store.test.ts CHANGED Viewed

@@ -1,8 +1,8 @@
 import { afterEach, describe, expect, test } from "bun:test"
-import { mkdtemp, rm, writeFile } from "node:fs/promises"
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises"
 import { tmpdir } from "node:os"
 import path from "node:path"
-import { DiffStore } from "./diff-store"
+import { appendGitIgnoreEntry, DiffStore } from "./diff-store"
 async function run(command: string[], cwd: string) {
   const process = Bun.spawn(command, {
@@ -54,6 +54,7 @@ describe("DiffStore", () => {
     expect(snapshot.status).toBe("ready")
     expect(snapshot.files).toHaveLength(1)
     expect(snapshot.files[0]?.path).toBe("app.txt")
+    expect(snapshot.files[0]?.isUntracked).toBe(false)
     expect(snapshot.files[0]?.patch).toContain("-base")
     expect(snapshot.files[0]?.patch).toContain("+changed")
   })
@@ -123,5 +124,135 @@ describe("DiffStore", () => {
     expect(snapshot.files).toHaveLength(1)
     expect(snapshot.files[0]?.path).toBe("after.txt")
     expect(snapshot.files[0]?.changeType).toBe("renamed")
+    expect(snapshot.files[0]?.isUntracked).toBe(false)
+  })
+  test("marks untracked files so they can be ignored", async () => {
+    const repoRoot = await createRepo()
+    tempDirs.push(repoRoot)
+    await writeFile(path.join(repoRoot, "tracked.txt"), "base\n", "utf8")
+    await run(["git", "add", "."], repoRoot)
+    await run(["git", "commit", "-m", "init"], repoRoot)
+    await writeFile(path.join(repoRoot, "scratch.log"), "tmp\n", "utf8")
+    const store = new DiffStore(repoRoot)
+    await store.initialize()
+    await store.refreshSnapshot("chat-1", repoRoot)
+    const snapshot = store.getSnapshot("chat-1")
+    expect(snapshot.files).toHaveLength(1)
+    expect(snapshot.files[0]).toMatchObject({
+      path: "scratch.log",
+      changeType: "added",
+      isUntracked: true,
+    })
+  })
+  test("discardFile reverts a tracked modified file", async () => {
+    const repoRoot = await createRepo()
+    tempDirs.push(repoRoot)
+    await writeFile(path.join(repoRoot, "app.txt"), "base\n", "utf8")
+    await run(["git", "add", "."], repoRoot)
+    await run(["git", "commit", "-m", "init"], repoRoot)
+    await writeFile(path.join(repoRoot, "app.txt"), "changed\n", "utf8")
+    const store = new DiffStore(repoRoot)
+    await store.initialize()
+    await store.refreshSnapshot("chat-1", repoRoot)
+    await store.discardFile({
+      chatId: "chat-1",
+      projectPath: repoRoot,
+      path: "app.txt",
+    })
+    expect(await readFile(path.join(repoRoot, "app.txt"), "utf8")).toBe("base\n")
+    expect(store.getSnapshot("chat-1").files).toHaveLength(0)
+  })
+  test("discardFile deletes an untracked file", async () => {
+    const repoRoot = await createRepo()
+    tempDirs.push(repoRoot)
+    await writeFile(path.join(repoRoot, "tracked.txt"), "base\n", "utf8")
+    await run(["git", "add", "."], repoRoot)
+    await run(["git", "commit", "-m", "init"], repoRoot)
+    await writeFile(path.join(repoRoot, "scratch.log"), "tmp\n", "utf8")
+    const store = new DiffStore(repoRoot)
+    await store.initialize()
+    await store.refreshSnapshot("chat-1", repoRoot)
+    await store.discardFile({
+      chatId: "chat-1",
+      projectPath: repoRoot,
+      path: "scratch.log",
+    })
+    expect(await Bun.file(path.join(repoRoot, "scratch.log")).exists()).toBe(false)
+    expect(store.getSnapshot("chat-1").files).toHaveLength(0)
+  })
+  test("discardFile reverts a renamed file", async () => {
+    const repoRoot = await createRepo()
+    tempDirs.push(repoRoot)
+    await writeFile(path.join(repoRoot, "before.txt"), "same\n", "utf8")
+    await run(["git", "add", "."], repoRoot)
+    await run(["git", "commit", "-m", "init"], repoRoot)
+    await run(["git", "mv", "before.txt", "after.txt"], repoRoot)
+    const store = new DiffStore(repoRoot)
+    await store.initialize()
+    await store.refreshSnapshot("chat-1", repoRoot)
+    await store.discardFile({
+      chatId: "chat-1",
+      projectPath: repoRoot,
+      path: "after.txt",
+    })
+    expect(await Bun.file(path.join(repoRoot, "before.txt")).exists()).toBe(true)
+    expect(await Bun.file(path.join(repoRoot, "after.txt")).exists()).toBe(false)
+    expect(store.getSnapshot("chat-1").files).toHaveLength(0)
+  })
+  test("ignoreFile appends a .gitignore entry once", async () => {
+    const repoRoot = await createRepo()
+    tempDirs.push(repoRoot)
+    await writeFile(path.join(repoRoot, "tracked.txt"), "base\n", "utf8")
+    await run(["git", "add", "."], repoRoot)
+    await run(["git", "commit", "-m", "init"], repoRoot)
+    await writeFile(path.join(repoRoot, "scratch.log"), "tmp\n", "utf8")
+    const store = new DiffStore(repoRoot)
+    await store.initialize()
+    await store.refreshSnapshot("chat-1", repoRoot)
+    await store.ignoreFile({
+      chatId: "chat-1",
+      projectPath: repoRoot,
+      path: "scratch.log",
+    })
+    expect(await readFile(path.join(repoRoot, ".gitignore"), "utf8")).toBe("scratch.log\n")
+  })
+  test("appendGitIgnoreEntry does not duplicate an existing identical entry", () => {
+    expect(appendGitIgnoreEntry("scratch.log\n", "scratch.log")).toBe("scratch.log\n")
+    expect(appendGitIgnoreEntry("scratch.log", "scratch.log")).toBe("scratch.log\n")
+  })
+  test("ignoreFile rejects tracked files", async () => {
+    const repoRoot = await createRepo()
+    tempDirs.push(repoRoot)
+    await writeFile(path.join(repoRoot, "app.txt"), "base\n", "utf8")
+    await run(["git", "add", "."], repoRoot)
+    await run(["git", "commit", "-m", "init"], repoRoot)
+    await writeFile(path.join(repoRoot, "app.txt"), "changed\n", "utf8")
+    const store = new DiffStore(repoRoot)
+    await store.initialize()
+    await store.refreshSnapshot("chat-1", repoRoot)
+    await expect(store.ignoreFile({
+      chatId: "chat-1",
+      projectPath: repoRoot,
+      path: "app.txt",
+    })).rejects.toThrow("Only untracked files can be ignored from the diff viewer")
   })
 })

package/src/server/diff-store.ts CHANGED Viewed

@@ -42,6 +42,7 @@ interface DirtyPathEntry {
   path: string
   previousPath?: string
   changeType: ChatDiffFile["changeType"]
+  isUntracked: boolean
 }
 async function fileExists(filePath: string) {
@@ -167,9 +168,10 @@ function parseStatusPaths(output: string): DirtyPathEntry[] {
     const statusCode = line.slice(0, 2)
     const value = line.slice(3)
     if (!value) continue
+    const isUntracked = statusCode === "??"
     const isRename = statusCode.includes("R")
     const isDelete = statusCode.includes("D")
-    const isAdd = statusCode.includes("A") || statusCode === "??"
+    const isAdd = statusCode.includes("A") || isUntracked
     const changeType: ChatDiffFile["changeType"] = isRename
       ? "renamed"
       : isDelete
@@ -185,6 +187,7 @@ function parseStatusPaths(output: string): DirtyPathEntry[] {
           path: nextPath,
           previousPath: previousPath || undefined,
           changeType,
+          isUntracked,
         })
       }
       continue
@@ -193,6 +196,7 @@ function parseStatusPaths(output: string): DirtyPathEntry[] {
     entries.push({
       path: value,
       changeType,
+      isUntracked,
     })
   }
   return entries.sort((left, right) => left.path.localeCompare(right.path))
@@ -289,6 +293,7 @@ async function computeCurrentFiles(repoRoot: string, baseCommit: string | null):
     files.push({
       path: relativePath,
       changeType: entry.changeType,
+      isUntracked: entry.isUntracked,
       patch,
       mimeType,
       size,
@@ -306,6 +311,64 @@ function normalizeRepoRelativePath(inputPath: string) {
   return normalized
 }
+async function findDirtyPath(repoRoot: string, relativePath: string) {
+  const dirtyPaths = await listDirtyPaths(repoRoot)
+  return dirtyPaths.find((entry) => entry.path === relativePath)
+}
+async function discardAddedPath(repoRoot: string, repoHasHead: boolean, relativePath: string) {
+  if (repoHasHead) {
+    const resetResult = await runGit(["reset", "--quiet", "HEAD", "--", relativePath], repoRoot)
+    if (resetResult.exitCode !== 0) {
+      throw new Error(formatGitFailure(resetResult) || "Failed to unstage added file")
+    }
+  } else {
+    const rmCachedResult = await runGit(["rm", "--cached", "--force", "--", relativePath], repoRoot)
+    if (rmCachedResult.exitCode !== 0) {
+      throw new Error(formatGitFailure(rmCachedResult) || "Failed to unstage added file")
+    }
+  }
+}
+async function discardRenamedPath(repoRoot: string, entry: DirtyPathEntry) {
+  if (!entry.previousPath) {
+    throw new Error(`Missing previous path for renamed file: ${entry.path}`)
+  }
+  const resetResult = await runGit(["reset", "--quiet", "HEAD", "--", entry.path], repoRoot)
+  if (resetResult.exitCode !== 0) {
+    throw new Error(formatGitFailure(resetResult) || "Failed to unstage renamed file")
+  }
+  const restoreResult = await runGit(["restore", "--staged", "--worktree", "--source=HEAD", "--", entry.previousPath], repoRoot)
+  if (restoreResult.exitCode !== 0) {
+    throw new Error(formatGitFailure(restoreResult) || "Failed to restore renamed file")
+  }
+  await rm(path.join(repoRoot, entry.path), { recursive: true, force: true })
+}
+export function appendGitIgnoreEntry(currentContents: string | null, entry: string) {
+  const normalizedContents = currentContents ?? ""
+  const existingEntries = normalizedContents
+    .split(/\r?\n/u)
+    .map((line) => line.trim())
+    .filter(Boolean)
+  if (existingEntries.includes(entry)) {
+    return normalizedContents.length > 0 && !normalizedContents.endsWith("\n")
+      ? `${normalizedContents}\n`
+      : normalizedContents
+  }
+  const prefix = normalizedContents.length === 0
+    ? ""
+    : normalizedContents.endsWith("\n")
+      ? normalizedContents
+      : `${normalizedContents}\n`
+  return `${prefix}${entry}\n`
+}
 export class DiffStore {
   private readonly states = new Map<string, StoredChatDiffState>()
@@ -454,4 +517,76 @@ export class DiffStore {
       snapshotChanged,
     } satisfies DiffCommitResult
   }
+  async discardFile(args: {
+    chatId: string
+    projectPath: string
+    path: string
+  }) {
+    const relativePath = normalizeRepoRelativePath(args.path)
+    const repo = await resolveRepo(args.projectPath)
+    if (!repo) {
+      throw new Error("Project is not in a git repository")
+    }
+    const entry = await findDirtyPath(repo.repoRoot, relativePath)
+    if (!entry) {
+      throw new Error(`File is no longer changed: ${relativePath}`)
+    }
+    if (entry.isUntracked) {
+      await rm(path.join(repo.repoRoot, entry.path), { recursive: true, force: true })
+    } else if (entry.changeType === "added") {
+      await discardAddedPath(repo.repoRoot, repo.baseCommit !== null, entry.path)
+      await rm(path.join(repo.repoRoot, entry.path), { recursive: true, force: true })
+    } else if (entry.changeType === "renamed") {
+      if (!repo.baseCommit) {
+        throw new Error("Cannot discard a rename before the repository has an initial commit")
+      }
+      await discardRenamedPath(repo.repoRoot, entry)
+    } else {
+      if (!repo.baseCommit) {
+        throw new Error("Cannot discard tracked changes before the repository has an initial commit")
+      }
+      const restoreResult = await runGit(["restore", "--staged", "--worktree", "--source=HEAD", "--", entry.path], repo.repoRoot)
+      if (restoreResult.exitCode !== 0) {
+        throw new Error(formatGitFailure(restoreResult) || "Failed to discard file changes")
+      }
+    }
+    return {
+      snapshotChanged: await this.refreshSnapshot(args.chatId, args.projectPath),
+    }
+  }
+  async ignoreFile(args: {
+    chatId: string
+    projectPath: string
+    path: string
+  }) {
+    const relativePath = normalizeRepoRelativePath(args.path)
+    const repo = await resolveRepo(args.projectPath)
+    if (!repo) {
+      throw new Error("Project is not in a git repository")
+    }
+    const entry = await findDirtyPath(repo.repoRoot, relativePath)
+    if (!entry) {
+      throw new Error(`File is no longer changed: ${relativePath}`)
+    }
+    if (!entry.isUntracked) {
+      throw new Error("Only untracked files can be ignored from the diff viewer")
+    }
+    const gitignorePath = path.join(repo.repoRoot, ".gitignore")
+    const currentContents = await readFile(gitignorePath, "utf8").catch(() => null)
+    const nextContents = appendGitIgnoreEntry(currentContents, relativePath)
+    if (nextContents !== currentContents) {
+      await writeFile(gitignorePath, nextContents, "utf8")
+    }
+    return {
+      snapshotChanged: await this.refreshSnapshot(args.chatId, args.projectPath),
+    }
+  }
 }

package/src/server/generate-commit-message.test.ts CHANGED Viewed

@@ -11,6 +11,7 @@ describe("generateCommitMessageDetailed", () => {
         files: [{
           path: "app.ts",
           changeType: "modified",
+          isUntracked: false,
           patch: "diff --git a/app.ts b/app.ts\n--- a/app.ts\n+++ b/app.ts\n@@\n-old\n+new\n",
         }],
       },
@@ -38,6 +39,7 @@ describe("generateCommitMessageDetailed", () => {
         files: [{
           path: "src/feature.ts",
           changeType: "modified",
+          isUntracked: false,
           patch: "diff --git a/src/feature.ts b/src/feature.ts\n",
         }],
       },

package/src/server/generate-commit-message.ts CHANGED Viewed

@@ -62,11 +62,11 @@ function buildCommitMessagePrompt(args: {
   const combinedPatch = args.files.map((file) => file.patch).join("\n\n")
   return [
-    "Generate a concise git commit message for the selected changes.",
+    "Generate a git commit message for the selected changes.",
     "Return JSON with keys: subject, body.",
     "Rules:",
     "- subject must be imperative, under 72 chars, and have no trailing period",
-    "- body may be an empty string or short bullet points",
+    "- body may be an empty string or 3-5 bullet points",
     "- capture the primary user-visible or developer-visible change",
     "",
     `Branch: ${args.branchName ?? "current branch"}`,