Files
Kilo-Org_kilocode/packages/opencode/src/commit-message/git-context.ts
T
Mark IJbema bc27d8924b fix: address kiloconnect review comments on commit message generation
- Use trimEnd() instead of trim() in git() to preserve leading whitespace
  in porcelain output (fixes status parsing for ' M file' lines)
- Remove unused 'untracked' from FileChange status union
- Use repository.rootUri.fsPath instead of workspaceFolders[0]
- Add explicit null-check for client after try/catch
- Fix test mocks: add isActive/activate, use mockImplementation to throw,
  fix expected error message to match production code
2026-02-19 16:26:10 +01:00

231 lines
5.1 KiB
TypeScript

import type { GitContext, FileChange } from "./types"
const LOCK_FILES = new Set([
// --- JavaScript / Node.js ---
"package-lock.json",
"npm-shrinkwrap.json",
"yarn.lock",
"pnpm-lock.yaml",
"shrinkwrap.yaml",
"bun.lockb",
"bun.lock",
".pnp.js",
".pnp.cjs",
"jspm.lock",
// --- Python ---
"Pipfile.lock",
"poetry.lock",
"pdm.lock",
".pdm-lock.toml",
"uv.lock",
"conda-lock.yml",
"pylock.toml",
// --- Ruby ---
"Gemfile.lock",
// --- PHP ---
"composer.lock",
// --- Java / JVM ---
"gradle.lockfile",
"lockfile.json",
"dependency-lock.json",
"dependency-reduced-pom.xml",
"coursier.lock",
// --- Scala ---
"build.sbt.lock",
// --- .NET ---
"packages.lock.json",
"paket.lock",
"project.assets.json",
// --- Rust ---
"Cargo.lock",
// --- Go ---
"go.sum",
"Gopkg.lock",
"glide.lock",
// --- Zig ---
"build.zig.zon.lock",
// --- OCaml ---
"dune.lock",
"opam.lock",
// --- Swift / iOS ---
"Package.resolved",
"Podfile.lock",
"Cartfile.resolved",
// --- Dart / Flutter ---
"pubspec.lock",
// --- Elixir / Erlang ---
"mix.lock",
"rebar.lock",
// --- Haskell ---
"stack.yaml.lock",
"cabal.project.freeze",
// --- Elm ---
"exact-dependencies.json",
// --- Crystal ---
"shard.lock",
// --- Julia ---
"Manifest.toml",
"JuliaManifest.toml",
// --- R ---
"renv.lock",
"packrat.lock",
// --- Nim ---
"nimble.lock",
// --- D ---
"dub.selections.json",
// --- Lua ---
"rocks.lock",
// --- Perl ---
"carton.lock",
"cpanfile.snapshot",
// --- C/C++ ---
"conan.lock",
"vcpkg-lock.json",
// --- Infrastructure as Code ---
".terraform.lock.hcl",
"Berksfile.lock",
"Puppetfile.lock",
"MODULE.bazel.lock",
// --- Nix ---
"flake.lock",
// --- Deno ---
"deno.lock",
// --- DevContainers ---
"devcontainer.lock.json",
])
const MAX_DIFF_LENGTH = 4000
function isLockFile(filepath: string): boolean {
const name = filepath.split("/").pop() ?? filepath
return LOCK_FILES.has(name)
}
function git(args: string[], cwd: string): string {
const result = Bun.spawnSync(["git", ...args], {
cwd,
stdout: "pipe",
stderr: "pipe",
})
return result.stdout.toString().trimEnd()
}
function parseNameStatus(output: string): Array<{ status: string; path: string }> {
if (!output) return []
return output.split("\n").map((line) => {
const [status, ...rest] = line.split("\t")
let path: string
if (status!.startsWith("R")) {
// Rename: rest = ["old.ts", "new.ts"], use the new path
path = rest[1] ?? rest[0]
} else {
path = rest.join("\t")
}
return { status: status!, path }
})
}
function parsePorcelain(output: string): Array<{ status: string; path: string }> {
if (!output) return []
return output
.split("\n")
.filter((line) => line.length > 0)
.map((line) => {
const xy = line.slice(0, 2)
const filepath = line.slice(3)
return { status: xy.trim(), path: filepath }
})
}
function mapStatus(code: string): FileChange["status"] {
if (code.startsWith("R")) return "renamed"
if (code === "A" || code === "??" || code === "?") return "added"
if (code === "D") return "deleted"
if (code === "M") return "modified"
return "modified"
}
function isUntracked(code: string): boolean {
return code === "??" || code === "?"
}
export async function getGitContext(repoPath: string, selectedFiles?: string[]): Promise<GitContext> {
const branch = git(["branch", "--show-current"], repoPath) || "HEAD"
const log = git(["log", "--oneline", "-5"], repoPath)
const recentCommits = log ? log.split("\n") : []
// Check staged files first
const staged = parseNameStatus(git(["diff", "--name-status", "--cached"], repoPath))
const useStaged = staged.length > 0
// Fall back to all changes if nothing staged
const raw = useStaged ? staged : parsePorcelain(git(["status", "--porcelain"], repoPath))
const selected = selectedFiles ? new Set(selectedFiles) : undefined
const files: FileChange[] = []
for (const entry of raw) {
if (isLockFile(entry.path)) continue
if (selected && !selected.has(entry.path)) continue
const status = mapStatus(entry.status)
const untracked = isUntracked(entry.status)
let diff: string
if (untracked) {
diff = `New untracked file: ${entry.path}`
} else if (status === "deleted") {
diff = useStaged
? git(["diff", "--cached", "--", entry.path], repoPath)
: git(["diff", "--", entry.path], repoPath)
} else {
const raw = useStaged
? git(["diff", "--cached", "--", entry.path], repoPath)
: git(["diff", "--", entry.path], repoPath)
// Detect binary files
if (raw.includes("Binary files") || raw.includes("GIT binary patch")) {
diff = `Binary file ${entry.path} has been modified`
} else {
diff = raw
}
}
// Truncate large diffs
if (diff.length > MAX_DIFF_LENGTH) {
diff = diff.slice(0, MAX_DIFF_LENGTH) + "\n... [truncated]"
}
files.push({ status, path: entry.path, diff })
}
return { branch, recentCommits, files }
}