7ea50aac14
* tweak: use theme tokens for debug bar surface * chore: update nix node_modules hashes * feat(tui): add heap snapshot functionality for TUI and server (#19028) * ci * change model for changelog * release: v1.3.2 * fix(opencode): skip typechecking generated models snapshot (#19018) * Revert "fix(app): more startup efficiency (#18985)" This reverts commit98b3340cee. * Revert "fix(app): startup efficiency (#18854)" This reverts commit546748a461. * effectify Worktree service (#18679) * fix: increase operations-per-run to 1000 and pin stale action to v10.2.0 The stale-issues workflow was hitting the default 30 operations limit, preventing it from processing all 2900+ issues/PRs. Increased to 1000 to handle the full backlog. Also pinned to exact v10.2.0 for reproducibility. * Add close-issues script and GitHub Action - Create script/github/close-issues.ts to close stale issues after 60 days - Add GitHub Action workflow to run daily at 2 AM - Remove old stale-issues workflow to avoid conflicts * Fix close-issues workflow permissions - Add contents: read permission for checkout - Use github.token instead of secrets.GITHUB_TOKEN * Process issues sequentially to avoid rate limits * Change issue close reason from not_planned to completed * fix(opencode): avoid snapshotting files over 2MB (#19043) * fix: provide merge context to beta conflict resolver (#19055) * tweak: only spawn lsp servers for files in current instance (or cwd if instance is global) (#19058) * fix: beta resolver typecheck + build smoke check (#19060) * fix: unblock beta conflict recovery (#19068) * electron: add createDirectory to open directory picker (#19071) * electron: remove file extension from electron-store wrapper (#19082) * app: pre-warm project globalSync state when navigate project via keybind (#19088) * fix(app): move message navigation off cmd+arrow (#18728) * Reapply "fix(app): startup efficiency (#18854)" This reverts commita379eb3867. * Reapply "fix(app): more startup efficiency (#18985)" This reverts commitcbe1337f24. * fix(app): hash inline script for csp * Revert "fix(app): startup efficiency" * Reapply "fix(app): startup efficiency" This reverts commit898456a25c. * fix(app): opencode web server url * chore(app): markdown playground in storyboard * chore(app): markdown playground in storyboard * feat(core): initial implementation of syncing (#17814) * chore: generate * chore: bump modelcontextprotocol/sdk to 1.27.1 (#19064) * chore: storybook tweaks * feat: restore git-backed review modes with effectful git service (#18900) * chore: generate * chore: update nix node_modules hashes * chore: cleanup * chore: remove dead code for todoread tool (#19128) * chore: storybook tweaks * fix(opencode): classify ZlibError from Bun fetch as retryable instead of unknown (#19104) Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> * fix(task): respect agent permission config for todowrite tool (#19125) * fix(app): agent normalization (#19169) * fix: Windows e2e stability (CrossSpawnSpawner, snapshot isolation, session race guards) (#19163) * fix+refactor(mcp): lifecycle tests, cancelPending fix, Effect migration (#19042) * effectify Bus service: migrate to Effect PubSub + InstanceState (#18579) * file: use Effect.cached for scan deduplication (#19164) * ignore: update disavowed list (#19184) * skill: use Effect.cached for load deduplication (#19165) * chore: generate * fix: bump gitlab-ai-provider to 5.3.3 for DWS tool approval support (#19185) * test: restore 5 workers on Windows e2e (#19188) * fix(opencode): image paste on Windows Terminal 1.25+ with kitty keyboard (#17674) * chore: update nix node_modules hashes * wip: zen * wip: zen * go: do not respect disabled zen models * fix: ensure enterprise url is set properly during auth flow (#19212) * revert: roll back git-backed review modes (#19295) * chore: generate * tui: bypass local SSE event streaming in worker (#19183) * feat: embed WebUI in binary with proxy flags (#19299) Co-authored-by: BlankParticle <blankparticle@gmail.com> * release: v1.3.3 * refactor: kilo compat for v1.3.3 * fix: Typecheck issues * fix(build): normalize backslashes in web UI bundle import paths Replace backslashes with forward slashes in embedded web UI file import paths to ensure correct module resolution on Windows. * fix: Add mcp reconnect error handling * chore(script): use forward slashes in web UI bundle export keys Ensure embedded file map keys use POSIX-style paths so lookups are consistent across platforms. * chore: regenerate source links --------- Co-authored-by: Jay V <air@live.ca> Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com> Co-authored-by: Dax <mail@thdxr.com> Co-authored-by: Dax Raad <d@ironbay.co> Co-authored-by: opencode <opencode@sst.dev> Co-authored-by: Kit Langton <kit.langton@gmail.com> Co-authored-by: Adam <2363879+adamdotdevin@users.noreply.github.com> Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com> Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Co-authored-by: Brendan Allan <brendonovich@outlook.com> Co-authored-by: Shoubhit Dash <shoubhit2005@gmail.com> Co-authored-by: James Long <longster@gmail.com> Co-authored-by: André Cruz <acruz@cloudflare.com> Co-authored-by: Ariane Emory <97994360+ariane-emory@users.noreply.github.com> Co-authored-by: Vladimir Glafirov <vglafirov@gitlab.com> Co-authored-by: Frank <frank@anoma.ly> Co-authored-by: BlankParticle <blankparticle@gmail.com> Co-authored-by: Imanol Maiztegui <imanol.mzd@gmail.com>
229 lines
7.1 KiB
TypeScript
229 lines
7.1 KiB
TypeScript
import { $ } from "bun"
|
|
import { afterEach, describe, expect, test } from "bun:test"
|
|
import fs from "fs/promises"
|
|
import path from "path"
|
|
import { tmpdir } from "../fixture/fixture"
|
|
import { FileWatcher } from "../../src/file/watcher"
|
|
import { Instance } from "../../src/project/instance"
|
|
import { GlobalBus } from "../../src/bus/global"
|
|
import { Vcs } from "../../src/project/vcs"
|
|
|
|
// Skip in CI — native @parcel/watcher binding needed
|
|
const describeVcs = FileWatcher.hasNativeBinding() && !process.env.CI ? describe : describe.skip
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Helpers
|
|
// ---------------------------------------------------------------------------
|
|
|
|
async function withVcs(directory: string, body: () => Promise<void>) {
|
|
return Instance.provide({
|
|
directory,
|
|
fn: async () => {
|
|
FileWatcher.init()
|
|
Vcs.init()
|
|
await Bun.sleep(500)
|
|
await body()
|
|
},
|
|
})
|
|
}
|
|
|
|
function withVcsOnly(directory: string, body: () => Promise<void>) {
|
|
return Instance.provide({
|
|
directory,
|
|
fn: async () => {
|
|
Vcs.init()
|
|
await body()
|
|
},
|
|
})
|
|
}
|
|
|
|
type BranchEvent = { directory?: string; payload: { type: string; properties: { branch?: string } } }
|
|
const weird = process.platform === "win32" ? "space file.txt" : "tab\tfile.txt"
|
|
|
|
/** Wait for a Vcs.Event.BranchUpdated event on GlobalBus, with retry polling as fallback */
|
|
function nextBranchUpdate(directory: string, timeout = 10_000) {
|
|
return new Promise<string | undefined>((resolve, reject) => {
|
|
let settled = false
|
|
|
|
const timer = setTimeout(() => {
|
|
if (settled) return
|
|
settled = true
|
|
GlobalBus.off("event", on)
|
|
reject(new Error("timed out waiting for BranchUpdated event"))
|
|
}, timeout)
|
|
|
|
function on(evt: BranchEvent) {
|
|
if (evt.directory !== directory) return
|
|
if (evt.payload.type !== Vcs.Event.BranchUpdated.type) return
|
|
if (settled) return
|
|
settled = true
|
|
clearTimeout(timer)
|
|
GlobalBus.off("event", on)
|
|
resolve(evt.payload.properties.branch)
|
|
}
|
|
|
|
GlobalBus.on("event", on)
|
|
})
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Tests
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describeVcs("Vcs", () => {
|
|
afterEach(async () => {
|
|
await Instance.disposeAll()
|
|
})
|
|
|
|
test("branch() returns current branch name", async () => {
|
|
await using tmp = await tmpdir({ git: true })
|
|
|
|
await withVcs(tmp.path, async () => {
|
|
const branch = await Vcs.branch()
|
|
expect(branch).toBeDefined()
|
|
expect(typeof branch).toBe("string")
|
|
})
|
|
})
|
|
|
|
test("branch() returns undefined for non-git directories", async () => {
|
|
await using tmp = await tmpdir()
|
|
|
|
await withVcs(tmp.path, async () => {
|
|
const branch = await Vcs.branch()
|
|
expect(branch).toBeUndefined()
|
|
})
|
|
})
|
|
|
|
test("publishes BranchUpdated when .git/HEAD changes", async () => {
|
|
await using tmp = await tmpdir({ git: true })
|
|
const branch = `test-${Math.random().toString(36).slice(2)}`
|
|
await $`git branch ${branch}`.cwd(tmp.path).quiet()
|
|
|
|
await withVcs(tmp.path, async () => {
|
|
const pending = nextBranchUpdate(tmp.path)
|
|
|
|
const head = path.join(tmp.path, ".git", "HEAD")
|
|
await fs.writeFile(head, `ref: refs/heads/${branch}\n`)
|
|
|
|
const updated = await pending
|
|
expect(updated).toBe(branch)
|
|
})
|
|
})
|
|
|
|
test("branch() reflects the new branch after HEAD change", async () => {
|
|
await using tmp = await tmpdir({ git: true })
|
|
const branch = `test-${Math.random().toString(36).slice(2)}`
|
|
await $`git branch ${branch}`.cwd(tmp.path).quiet()
|
|
|
|
await withVcs(tmp.path, async () => {
|
|
const pending = nextBranchUpdate(tmp.path)
|
|
|
|
const head = path.join(tmp.path, ".git", "HEAD")
|
|
await fs.writeFile(head, `ref: refs/heads/${branch}\n`)
|
|
|
|
await pending
|
|
const current = await Vcs.branch()
|
|
expect(current).toBe(branch)
|
|
})
|
|
})
|
|
})
|
|
|
|
describe("Vcs diff", () => {
|
|
afterEach(async () => {
|
|
await Instance.disposeAll()
|
|
})
|
|
|
|
test("defaultBranch() falls back to main", async () => {
|
|
await using tmp = await tmpdir({ git: true })
|
|
await $`git branch -M main`.cwd(tmp.path).quiet()
|
|
|
|
await withVcsOnly(tmp.path, async () => {
|
|
const branch = await Vcs.defaultBranch()
|
|
expect(branch).toBe("main")
|
|
})
|
|
})
|
|
|
|
test("defaultBranch() uses init.defaultBranch when available", async () => {
|
|
await using tmp = await tmpdir({ git: true })
|
|
await $`git branch -M trunk`.cwd(tmp.path).quiet()
|
|
await $`git config init.defaultBranch trunk`.cwd(tmp.path).quiet()
|
|
|
|
await withVcsOnly(tmp.path, async () => {
|
|
const branch = await Vcs.defaultBranch()
|
|
expect(branch).toBe("trunk")
|
|
})
|
|
})
|
|
|
|
test("detects current branch from the active worktree", async () => {
|
|
await using tmp = await tmpdir({ git: true })
|
|
await using wt = await tmpdir()
|
|
await $`git branch -M main`.cwd(tmp.path).quiet()
|
|
const dir = path.join(wt.path, "feature")
|
|
await $`git worktree add -b feature/test ${dir} HEAD`.cwd(tmp.path).quiet()
|
|
|
|
await withVcsOnly(dir, async () => {
|
|
const [branch, base] = await Promise.all([Vcs.branch(), Vcs.defaultBranch()])
|
|
expect(branch).toBe("feature/test")
|
|
expect(base).toBe("main")
|
|
})
|
|
})
|
|
|
|
test("diff('git') returns uncommitted changes", async () => {
|
|
await using tmp = await tmpdir({ git: true })
|
|
await fs.writeFile(path.join(tmp.path, "file.txt"), "original\n", "utf-8")
|
|
await $`git add .`.cwd(tmp.path).quiet()
|
|
await $`git commit --no-gpg-sign -m "add file"`.cwd(tmp.path).quiet()
|
|
await fs.writeFile(path.join(tmp.path, "file.txt"), "changed\n", "utf-8")
|
|
|
|
await withVcsOnly(tmp.path, async () => {
|
|
const diff = await Vcs.diff("git")
|
|
expect(diff).toEqual(
|
|
expect.arrayContaining([
|
|
expect.objectContaining({
|
|
file: "file.txt",
|
|
status: "modified",
|
|
}),
|
|
]),
|
|
)
|
|
})
|
|
})
|
|
|
|
test("diff('git') handles special filenames", async () => {
|
|
await using tmp = await tmpdir({ git: true })
|
|
await fs.writeFile(path.join(tmp.path, weird), "hello\n", "utf-8")
|
|
|
|
await withVcsOnly(tmp.path, async () => {
|
|
const diff = await Vcs.diff("git")
|
|
expect(diff).toEqual(
|
|
expect.arrayContaining([
|
|
expect.objectContaining({
|
|
file: weird,
|
|
status: "added",
|
|
}),
|
|
]),
|
|
)
|
|
})
|
|
})
|
|
|
|
test("diff('branch') returns changes against default branch", async () => {
|
|
await using tmp = await tmpdir({ git: true })
|
|
await $`git branch -M main`.cwd(tmp.path).quiet()
|
|
await $`git checkout -b feature/test`.cwd(tmp.path).quiet()
|
|
await fs.writeFile(path.join(tmp.path, "branch.txt"), "hello\n", "utf-8")
|
|
await $`git add .`.cwd(tmp.path).quiet()
|
|
await $`git commit --no-gpg-sign -m "branch file"`.cwd(tmp.path).quiet()
|
|
|
|
await withVcsOnly(tmp.path, async () => {
|
|
const diff = await Vcs.diff("branch")
|
|
expect(diff).toEqual(
|
|
expect.arrayContaining([
|
|
expect.objectContaining({
|
|
file: "branch.txt",
|
|
status: "added",
|
|
}),
|
|
]),
|
|
)
|
|
})
|
|
})
|
|
})
|