npm - kanna-code - Versions diffs - 0.26.3 → 0.26.5 - Mend

kanna-code 0.26.3 → 0.26.5

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 (10) hide show

package/dist/client/assets/index-BaEB4jie.js +2583 -0
package/dist/client/index.html +1 -1
package/package.json +1 -1
package/src/server/diff-store.test.ts +68 -1
package/src/server/diff-store.ts +39 -9
package/src/server/server.ts +2 -2
package/src/server/uploads.test.ts +2 -2
package/src/server/ws-router.ts +1 -1
package/src/shared/types.ts +1 -0
package/dist/client/assets/index-QXLrswKX.js +0 -2583

package/dist/client/index.html CHANGED Viewed

@@ -5,7 +5,7 @@
     <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-QXLrswKX.js"></script>
+    <script type="module" crossorigin src="/assets/index-BaEB4jie.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-C5RBxQW4.css">
   </head>
   <body>

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "kanna-code",
   "type": "module",
-  "version": "0.26.3",
+  "version": "0.26.5",
   "description": "A beautiful web UI for Claude Code",
   "license": "MIT",
   "keywords": [

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

@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, test } from "bun:test"
-import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises"
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises"
 import { tmpdir } from "node:os"
 import path from "node:path"
 import { appendGitIgnoreEntry, DiffStore, extractGitHubRepoSlug, fetchGitHubPullRequests } from "./diff-store"
@@ -148,6 +148,52 @@ describe("DiffStore", () => {
     expect((await run(["git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"], repoRoot)).trim()).toBe("origin/feature/publish-me")
   })
+  test("commit_and_push degrades to a local commit when origin is missing", 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("project-1", repoRoot)
+    const result = await store.commitFiles({
+      projectId: "project-1",
+      projectPath: repoRoot,
+      paths: ["app.txt"],
+      summary: "Local only",
+      mode: "commit_and_push",
+    })
+    expect(result).toMatchObject({
+      ok: true,
+      mode: "commit_and_push",
+      pushed: false,
+    })
+    expect((await run(["git", "log", "-1", "--pretty=%s"], repoRoot)).trim()).toBe("Local only")
+  })
+  test("refreshSnapshot reports origin presence before the first commit", async () => {
+    const repoRoot = await createRepo()
+    tempDirs.push(repoRoot)
+    await run(["git", "remote", "add", "origin", "https://github.com/jakemor/test224.git"], repoRoot)
+    await writeFile(path.join(repoRoot, "poem.md"), "rose\n", "utf8")
+    const store = new DiffStore(repoRoot)
+    await store.initialize()
+    await store.refreshSnapshot("project-1", repoRoot)
+    expect(store.getProjectSnapshot("project-1")).toMatchObject({
+      status: "ready",
+      branchName: "main",
+      hasOriginRemote: true,
+      originRepoSlug: "jakemor/test224",
+    })
+  })
   test("detects renamed files", async () => {
     const repoRoot = await createRepo()
     tempDirs.push(repoRoot)
@@ -273,6 +319,27 @@ describe("DiffStore", () => {
     expect(await readFile(path.join(repoRoot, ".gitignore"), "utf8")).toBe("scratch.log\n")
   })
+  test("ignoreFile accepts a folder entry for an untracked diff", 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 mkdir(path.join(repoRoot, "tmp/cache"), { recursive: true })
+    await writeFile(path.join(repoRoot, "tmp/cache/output.log"), "tmp\n", "utf8")
+    const store = new DiffStore(repoRoot)
+    await store.initialize()
+    await store.refreshSnapshot("project-1", repoRoot)
+    await store.ignoreFile({
+      projectId: "project-1",
+      projectPath: repoRoot,
+      path: "tmp/cache/",
+    })
+    expect(await readFile(path.join(repoRoot, ".gitignore"), "utf8")).toBe("tmp/cache/\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")

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

@@ -37,6 +37,7 @@ function createEmptyState(): StoredChatDiffState {
     status: "unknown",
     branchName: undefined,
     defaultBranchName: undefined,
+    hasOriginRemote: undefined,
     originRepoSlug: undefined,
     hasUpstream: undefined,
     aheadCount: undefined,
@@ -50,6 +51,7 @@ function createEmptyState(): StoredChatDiffState {
 function branchMetadataEqual(left: BranchMetadata, right: BranchMetadata) {
   return left.branchName === right.branchName
     && left.defaultBranchName === right.defaultBranchName
+    && left.hasOriginRemote === right.hasOriginRemote
     && left.originRepoSlug === right.originRepoSlug
     && left.hasUpstream === right.hasUpstream
 }
@@ -196,6 +198,9 @@ function createPushFailure(mode: DiffCommitMode, detail: string, snapshotChanged
   if (normalized.includes("non-fast-forward") || normalized.includes("fetch first")) {
     title = "Branch is not up to date"
     message = "Your branch is behind its remote. Pull or rebase, then try pushing again."
+  } else if (normalized.includes("does not appear to be a git repository")) {
+    title = "No origin remote configured"
+    message = "This repository does not have an origin remote configured."
   } else if (normalized.includes("has no upstream branch") || normalized.includes("set-upstream")) {
     title = "No upstream branch configured"
     message = "This branch does not have an upstream remote branch configured yet."
@@ -1317,6 +1322,7 @@ export class DiffStore {
       status: state.status,
       branchName: state.branchName,
       defaultBranchName: state.defaultBranchName,
+      hasOriginRemote: state.hasOriginRemote,
       originRepoSlug: state.originRepoSlug,
       hasUpstream: state.hasUpstream,
       aheadCount: state.aheadCount,
@@ -1339,6 +1345,7 @@ export class DiffStore {
         status: "no_repo",
         branchName: undefined,
         defaultBranchName: undefined,
+        hasOriginRemote: undefined,
         originRepoSlug: undefined,
         hasUpstream: undefined,
         aheadCount: undefined,
@@ -1356,6 +1363,7 @@ export class DiffStore {
     const branchName = await getBranchName(repo.repoRoot)
     const defaultBranchName = await resolveDefaultBranchName(repo.repoRoot)
     const originRemoteUrl = await getOriginRemoteUrl(repo.repoRoot)
+    const hasOriginRemote = originRemoteUrl !== null
     const originRepoSlug = extractGitHubRepoSlug(originRemoteUrl) ?? undefined
     const hasUpstream = await hasUpstreamBranch(repo.repoRoot)
     const { aheadCount, behindCount } = hasUpstream
@@ -1373,6 +1381,7 @@ export class DiffStore {
       status: "ready",
       branchName,
       defaultBranchName,
+      hasOriginRemote,
       originRepoSlug,
       hasUpstream,
       aheadCount,
@@ -1808,7 +1817,11 @@ export class DiffStore {
       throw new Error("Project is not in a git repository")
     }
-    const hasUpstream = await hasUpstreamBranch(repo.repoRoot)
+    const [hasUpstream, originRemoteUrl] = await Promise.all([
+      hasUpstreamBranch(repo.repoRoot),
+      getOriginRemoteUrl(repo.repoRoot),
+    ])
+    const hasOriginRemote = originRemoteUrl !== null
     if (args.action === "publish") {
       const publishResult = await runGit(["push", "-u", "origin", "HEAD"], repo.repoRoot)
       if (publishResult.exitCode !== 0) {
@@ -2002,7 +2015,11 @@ export class DiffStore {
     if (!repo) {
       throw new Error("Project is not in a git repository")
     }
-    const hasUpstream = await hasUpstreamBranch(repo.repoRoot)
+    const [hasUpstream, originRemoteUrl] = await Promise.all([
+      hasUpstreamBranch(repo.repoRoot),
+      getOriginRemoteUrl(repo.repoRoot),
+    ])
+    const hasOriginRemote = originRemoteUrl !== null
     const currentDirtyPaths = new Set((await listDirtyPaths(repo.repoRoot)).map((entry) => entry.path))
     const missingPaths = normalizedPaths.filter((relativePath) => !currentDirtyPaths.has(relativePath))
@@ -2039,6 +2056,16 @@ export class DiffStore {
       } satisfies DiffCommitResult
     }
+    if (!hasUpstream && !hasOriginRemote) {
+      return {
+        ok: true,
+        mode: args.mode,
+        branchName,
+        pushed: false,
+        snapshotChanged,
+      } satisfies DiffCommitResult
+    }
     const pushResult = hasUpstream
       ? await runGit(["push"], repo.repoRoot)
       : await runGit(["push", "-u", "origin", "HEAD"], repo.repoRoot)
@@ -2103,23 +2130,26 @@ export class DiffStore {
     projectPath: string
     path: string
   }) {
-    const relativePath = normalizeRepoRelativePath(args.path)
+    const ignoreEntry = 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) {
+    const dirtyPaths = await listDirtyPaths(repo.repoRoot)
+    const exactEntry = dirtyPaths.find((candidate) => candidate.path === ignoreEntry)
+    if (exactEntry && !exactEntry.isUntracked) {
       throw new Error("Only untracked files can be ignored from the diff viewer")
     }
+    const entry = dirtyPaths.find((candidate) => candidate.isUntracked && (candidate.path === ignoreEntry || candidate.path.startsWith(ignoreEntry)))
+    if (!entry) {
+      throw new Error(`File is no longer changed: ${ignoreEntry}`)
+    }
     const gitignorePath = path.join(repo.repoRoot, ".gitignore")
     const currentContents = await readFile(gitignorePath, "utf8").catch(() => null)
-    const nextContents = appendGitIgnoreEntry(currentContents, relativePath)
+    const nextContents = appendGitIgnoreEntry(currentContents, ignoreEntry)
     if (nextContents !== currentContents) {
       await writeFile(gitignorePath, nextContents, "utf8")
     }

package/src/server/server.ts CHANGED Viewed

@@ -15,8 +15,8 @@ import { createWsRouter, type ClientState } from "./ws-router"
 import { deleteProjectUpload, inferAttachmentContentType, inferProjectFileContentType, persistProjectUpload } from "./uploads"
 import { getProjectUploadDir } from "./paths"
-const MAX_UPLOAD_FILES = 10
-const MAX_UPLOAD_SIZE_BYTES = 25 * 1024 * 1024
+const MAX_UPLOAD_FILES = 50
+const MAX_UPLOAD_SIZE_BYTES = 100 * 1024 * 1024
 const STALE_EMPTY_CHAT_PRUNE_INTERVAL_MS = 60 * 1000
 export async function persistUploadedFiles(args: {

package/src/server/uploads.test.ts CHANGED Viewed

@@ -182,7 +182,7 @@ describe("uploads", () => {
     try {
       const project = await server.store.openProject(projectDir, "Project")
       const formData = new FormData()
-      formData.append("files", new File([new Uint8Array(25 * 1024 * 1024 + 1)], "big.bin", { type: "application/octet-stream" }))
+      formData.append("files", new File([new Uint8Array(100 * 1024 * 1024 + 1)], "big.bin", { type: "application/octet-stream" }))
       const response = await fetch(`http://localhost:${server.port}/api/projects/${project.id}/uploads`, {
         method: "POST",
@@ -191,7 +191,7 @@ describe("uploads", () => {
       expect(response.status).toBe(413)
       expect(await response.json()).toEqual({
-        error: "File \"big.bin\" exceeds the 25 MB limit.",
+        error: "File \"big.bin\" exceeds the 100 MB limit.",
       })
     } finally {
       await server.stop()

package/src/server/ws-router.ts CHANGED Viewed

@@ -57,7 +57,7 @@ export function createWsRouter({
 }: CreateWsRouterArgs) {
   const sockets = new Set<ServerWebSocket<ClientState>>()
   const resolvedDiffStore = diffStore ?? {
-    getProjectSnapshot: () => ({ status: "unknown", branchName: undefined, defaultBranchName: undefined, originRepoSlug: undefined, hasUpstream: undefined, aheadCount: undefined, behindCount: undefined, lastFetchedAt: undefined, files: [] as const, branchHistory: { entries: [] as const } }),
+    getProjectSnapshot: () => ({ status: "unknown", branchName: undefined, defaultBranchName: undefined, hasOriginRemote: undefined, originRepoSlug: undefined, hasUpstream: undefined, aheadCount: undefined, behindCount: undefined, lastFetchedAt: undefined, files: [] as const, branchHistory: { entries: [] as const } }),
     refreshSnapshot: async () => false,
     initializeGit: async () => ({ ok: true, branchName: undefined, snapshotChanged: false }),
     getGitHubPublishInfo: async () => ({ ghInstalled: false, authenticated: false, activeAccountLogin: undefined, owners: [], suggestedRepoName: "my-repo" }),

package/src/shared/types.ts CHANGED Viewed

@@ -544,6 +544,7 @@ export interface GitHubRepoAvailabilityResult {
 export interface BranchMetadata {
   branchName?: string
   defaultBranchName?: string
+  hasOriginRemote?: boolean
   originRepoSlug?: string
   hasUpstream?: boolean
 }