+21

![opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com>](/assets/img/avatar_default.png)



![opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>](/assets/img/avatar_default.png)



James Long
Brendan Allan
Kit Langton
opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Affan Ali
affanali2k3
Frank
opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com>
𝓛𝓲𝓽𝓽𝓵𝓮 𝓕𝓻𝓪𝓷𝓴
Aiden Cline
Jay V
Dax Raad
Aarav Sareen
OpeOginni
Luke Parker
Ben Guthrie
Dax
Filip
Max Anderson
Brendan Allan
Jack
Shoubhit Dash
Dustin Deus
starptech
Aiden Cline
usrnk1
Jay
runvip
opencode
Julian Coy
Vladimir Glafirov
8c94e9005f
Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com> Co-authored-by: Kit Langton <kit.langton@gmail.com> Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com> Co-authored-by: Affan Ali <93028901+affanali2k3@users.noreply.github.com> Co-authored-by: affanali2k3 <affanalikhanxx@gmail.com> Co-authored-by: Frank <frank@anoma.ly> Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com> Co-authored-by: 𝓛𝓲𝓽𝓽𝓵𝓮 𝓕𝓻𝓪𝓷𝓴 <little-frank@opencord.local> Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Co-authored-by: Jay V <air@live.ca> Co-authored-by: Dax Raad <d@ironbay.co> Co-authored-by: Aarav Sareen <96787824+arvsrn@users.noreply.github.com> Co-authored-by: OpeOginni <107570612+OpeOginni@users.noreply.github.com> Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com> Co-authored-by: Ben Guthrie <benjee.012@gmail.com> Co-authored-by: Dax <mail@thdxr.com> Co-authored-by: Filip <34747899+neriousy@users.noreply.github.com> Co-authored-by: Max Anderson <max.a.anderson95@gmail.com> Co-authored-by: Brendan Allan <git@brendonovich.dev> Co-authored-by: Jack <jack@anoma.ly> Co-authored-by: Shoubhit Dash <shoubhit2005@gmail.com> Co-authored-by: Dustin Deus <deusdustin@gmail.com> Co-authored-by: starptech <starptech@starptechs-MBP.fritz.box> Co-authored-by: Aiden Cline <aidenpcline@gmail.com> Co-authored-by: usrnk1 <7547651+usrnk1@users.noreply.github.com> Co-authored-by: Jay <53023+jayair@users.noreply.github.com> Co-authored-by: runvip <164729189+runvip@users.noreply.github.com> Co-authored-by: opencode <opencode@sst.dev> Co-authored-by: Julian Coy <julian@ex-machina.co> Co-authored-by: Vladimir Glafirov <vglafirov@gitlab.com>
424 lines
14 KiB
TypeScript
424 lines
14 KiB
TypeScript
import { LayerNode } from "@opencode-ai/core/effect/layer-node"
|
|
import { Effect, Layer, Context, Schema, Scope } from "effect"
|
|
import { formatPatch, structuredPatch } from "diff"
|
|
import { InstanceState } from "@/effect/instance-state"
|
|
import { Watcher } from "@opencode-ai/core/filesystem/watcher"
|
|
import { Git } from "@/git"
|
|
import { EventV2Bridge } from "@/event-v2-bridge"
|
|
import { EventV2 } from "@opencode-ai/core/event"
|
|
import { VcsEvent } from "@opencode-ai/schema/vcs-event"
|
|
|
|
const PATCH_CONTEXT_LINES = 2_147_483_647
|
|
const MAX_PATCH_BYTES = 10_000_000
|
|
const MAX_TOTAL_PATCH_BYTES = 10_000_000
|
|
type DiffOptions = {
|
|
readonly context?: number
|
|
}
|
|
|
|
const emptyPatch = (file: string) => formatPatch(structuredPatch(file, file, "", "", "", "", { context: 0 }))
|
|
|
|
const nums = (list: Git.Stat[]) =>
|
|
new Map(list.map((item) => [item.file, { additions: item.additions, deletions: item.deletions }] as const))
|
|
|
|
const merge = (...lists: Git.Item[][]) => {
|
|
const out = new Map<string, Git.Item>()
|
|
lists.flat().forEach((item) => {
|
|
if (!out.has(item.file)) out.set(item.file, item)
|
|
})
|
|
return [...out.values()]
|
|
}
|
|
|
|
const emptyBatch = () => ({ patches: new Map<string, string>(), capped: false })
|
|
|
|
const parseQuotedPath = (value: string) => {
|
|
let out = ""
|
|
for (let idx = 1; idx < value.length; idx++) {
|
|
const char = value[idx]
|
|
if (char === '"') return { value: out, end: idx + 1 }
|
|
if (char !== "\\") {
|
|
out += char
|
|
continue
|
|
}
|
|
|
|
const next = value[++idx]
|
|
if (next === "t") out += "\t"
|
|
else if (next === "n") out += "\n"
|
|
else if (next === "r") out += "\r"
|
|
else if (next === '"' || next === "\\") out += next
|
|
else out += next ?? ""
|
|
}
|
|
}
|
|
|
|
const parsePathToken = (value: string) => {
|
|
if (!value.startsWith('"')) return value.split("\t")[0]
|
|
return parseQuotedPath(value)?.value ?? value
|
|
}
|
|
|
|
const fileFromDiffPath = (value: string | undefined) => {
|
|
if (!value || value === "/dev/null") return
|
|
const file = parsePathToken(value)
|
|
if (file.startsWith("a/") || file.startsWith("b/")) return file.slice(2)
|
|
return file
|
|
}
|
|
|
|
const fileFromGitHeader = (header: string) => {
|
|
if (header.startsWith('"')) {
|
|
const first = parseQuotedPath(header)
|
|
const second = first ? header.slice(first.end).trimStart() : undefined
|
|
if (!second) return
|
|
if (!second.startsWith('"')) return fileFromDiffPath(second)
|
|
return fileFromDiffPath(parseQuotedPath(second)?.value)
|
|
}
|
|
|
|
const separator = header.indexOf(" b/")
|
|
if (separator === -1) return
|
|
return fileFromDiffPath(header.slice(separator + 1))
|
|
}
|
|
|
|
const fileFromPatchChunk = (chunk: string) => {
|
|
const next = /^\+\+\+ (.+)$/m.exec(chunk)?.[1]
|
|
const before = /^--- (.+)$/m.exec(chunk)?.[1]
|
|
const file = fileFromDiffPath(next) ?? fileFromDiffPath(before)
|
|
if (file) return file
|
|
|
|
const header = /^diff --git (.+)$/m.exec(chunk)?.[1]
|
|
return fileFromGitHeader(header ?? "")
|
|
}
|
|
|
|
const splitGitPatch = (patch: Git.Patch) => {
|
|
const starts = [...patch.text.matchAll(/(?:^|\n)diff --git /g)].map((match) =>
|
|
match[0].startsWith("\n") ? match.index + 1 : match.index,
|
|
)
|
|
const chunks = starts.map((start, index) => patch.text.slice(start, starts[index + 1] ?? patch.text.length))
|
|
if (!patch.truncated) return chunks
|
|
return chunks.slice(0, -1)
|
|
}
|
|
|
|
const batchPatches = Effect.fnUntraced(function* (
|
|
git: Git.Interface,
|
|
cwd: string,
|
|
ref: string,
|
|
list: Git.Item[],
|
|
options?: DiffOptions,
|
|
) {
|
|
if (list.length === 0) return { patches: new Map<string, string>(), capped: false }
|
|
|
|
const result = yield* git.patchAll(cwd, ref, {
|
|
context: options?.context ?? PATCH_CONTEXT_LINES,
|
|
maxOutputBytes: MAX_TOTAL_PATCH_BYTES,
|
|
})
|
|
|
|
return {
|
|
patches: splitGitPatch(result).reduce((acc, patch, index) => {
|
|
const file = fileFromPatchChunk(patch) ?? list[index]?.file
|
|
if (!file) return acc
|
|
acc.set(file, (acc.get(file) ?? "") + patch)
|
|
return acc
|
|
}, new Map<string, string>()),
|
|
capped: result.truncated,
|
|
}
|
|
})
|
|
|
|
const nativePatch = Effect.fnUntraced(function* (
|
|
git: Git.Interface,
|
|
cwd: string,
|
|
ref: string | undefined,
|
|
item: Git.Item,
|
|
options?: DiffOptions,
|
|
) {
|
|
const result =
|
|
item.code === "??" || !ref
|
|
? yield* git.patchUntracked(cwd, item.file, {
|
|
context: options?.context ?? PATCH_CONTEXT_LINES,
|
|
maxOutputBytes: MAX_PATCH_BYTES,
|
|
})
|
|
: yield* git.patch(cwd, ref, item.file, {
|
|
context: options?.context ?? PATCH_CONTEXT_LINES,
|
|
maxOutputBytes: MAX_PATCH_BYTES,
|
|
})
|
|
if (!result.truncated && result.text) return result.text
|
|
|
|
return emptyPatch(item.file)
|
|
})
|
|
|
|
const totalPatch = (file: string, patch: string, total: number) => {
|
|
if (total + Buffer.byteLength(patch) <= MAX_TOTAL_PATCH_BYTES) return { patch, capped: false }
|
|
return { patch: emptyPatch(file), capped: true }
|
|
}
|
|
|
|
const patchForItem = Effect.fnUntraced(function* (
|
|
git: Git.Interface,
|
|
cwd: string,
|
|
ref: string | undefined,
|
|
item: Git.Item,
|
|
batch: { patches: Map<string, string>; capped: boolean },
|
|
capped: boolean,
|
|
options?: DiffOptions,
|
|
) {
|
|
if (capped) return emptyPatch(item.file)
|
|
|
|
const batched = batch.patches.get(item.file)
|
|
if (batched !== undefined) return batched
|
|
if (item.code !== "??" && batch.capped) return emptyPatch(item.file)
|
|
return yield* nativePatch(git, cwd, ref, item, options)
|
|
})
|
|
|
|
const files = Effect.fnUntraced(function* (
|
|
git: Git.Interface,
|
|
cwd: string,
|
|
ref: string | undefined,
|
|
list: Git.Item[],
|
|
map: Map<string, { additions: number; deletions: number }>,
|
|
batch: { patches: Map<string, string>; capped: boolean },
|
|
options?: DiffOptions,
|
|
) {
|
|
const next: FileDiff[] = []
|
|
let total = 0
|
|
let capped = false
|
|
|
|
for (const item of list.toSorted((a, b) => a.file.localeCompare(b.file))) {
|
|
const stat = map.get(item.file) ?? (item.status === "added" ? yield* git.statUntracked(cwd, item.file) : undefined)
|
|
const patch = yield* patchForItem(git, cwd, ref, item, batch, capped, options)
|
|
const result: { patch: string; capped: boolean } = capped
|
|
? { patch, capped: true }
|
|
: totalPatch(item.file, patch, total)
|
|
capped = capped || result.capped
|
|
if (!capped) {
|
|
total += Buffer.byteLength(result.patch)
|
|
capped = total >= MAX_TOTAL_PATCH_BYTES
|
|
}
|
|
next.push({
|
|
file: item.file,
|
|
patch: result.patch,
|
|
additions: stat?.additions ?? 0,
|
|
deletions: stat?.deletions ?? 0,
|
|
status: item.status,
|
|
})
|
|
}
|
|
|
|
return next
|
|
})
|
|
|
|
const diffAgainstRef = Effect.fnUntraced(function* (
|
|
git: Git.Interface,
|
|
cwd: string,
|
|
ref: string,
|
|
options?: DiffOptions,
|
|
) {
|
|
const [list, stats, extra] = yield* Effect.all([git.diff(cwd, ref), git.stats(cwd, ref), git.status(cwd)], {
|
|
concurrency: 3,
|
|
})
|
|
return yield* files(
|
|
git,
|
|
cwd,
|
|
ref,
|
|
merge(
|
|
list,
|
|
extra.filter((item) => item.code === "??"),
|
|
),
|
|
nums(stats),
|
|
yield* batchPatches(git, cwd, ref, list, options),
|
|
options,
|
|
)
|
|
})
|
|
|
|
const track = Effect.fnUntraced(function* (
|
|
git: Git.Interface,
|
|
cwd: string,
|
|
ref: string | undefined,
|
|
options?: DiffOptions,
|
|
) {
|
|
if (!ref) return yield* files(git, cwd, ref, yield* git.status(cwd), new Map(), emptyBatch(), options)
|
|
return yield* diffAgainstRef(git, cwd, ref, options)
|
|
})
|
|
|
|
export const Mode = Schema.Literals(["git", "branch"])
|
|
export type Mode = Schema.Schema.Type<typeof Mode>
|
|
|
|
export const Event = VcsEvent
|
|
|
|
export const Info = Schema.Struct({
|
|
branch: Schema.optional(Schema.String),
|
|
default_branch: Schema.optional(Schema.String),
|
|
}).annotate({ identifier: "VcsInfo" })
|
|
export type Info = Schema.Schema.Type<typeof Info>
|
|
|
|
export const FileDiff = Schema.Struct({
|
|
file: Schema.String,
|
|
// Mirrors Snapshot.FileDiff (see #26574). The current producer always
|
|
// populates patch, but loosening matches the sibling schema so a
|
|
// future code path that omits it can't crash /instance/vcs/diff.
|
|
patch: Schema.optional(Schema.String),
|
|
additions: Schema.Finite,
|
|
deletions: Schema.Finite,
|
|
status: Schema.optional(Schema.Literals(["added", "deleted", "modified"])),
|
|
}).annotate({ identifier: "VcsFileDiff" })
|
|
export type FileDiff = Schema.Schema.Type<typeof FileDiff>
|
|
|
|
export const FileStatus = Schema.Struct({
|
|
file: Schema.String,
|
|
additions: Schema.Finite,
|
|
deletions: Schema.Finite,
|
|
status: Schema.Literals(["added", "deleted", "modified"]),
|
|
}).annotate({ identifier: "VcsFileStatus" })
|
|
export type FileStatus = Schema.Schema.Type<typeof FileStatus>
|
|
|
|
export const ApplyInput = Schema.Struct({
|
|
patch: Schema.String,
|
|
})
|
|
export type ApplyInput = Schema.Schema.Type<typeof ApplyInput>
|
|
|
|
export const ApplyResult = Schema.Struct({
|
|
applied: Schema.Boolean,
|
|
})
|
|
export type ApplyResult = Schema.Schema.Type<typeof ApplyResult>
|
|
|
|
export class PatchApplyError extends Schema.TaggedErrorClass<PatchApplyError>()("VcsPatchApplyError", {
|
|
message: Schema.String,
|
|
reason: Schema.Literals(["non-git", "not-clean"]),
|
|
}) {}
|
|
|
|
export interface Interface {
|
|
readonly init: () => Effect.Effect<void>
|
|
readonly branch: () => Effect.Effect<string | undefined>
|
|
readonly defaultBranch: () => Effect.Effect<string | undefined>
|
|
readonly status: () => Effect.Effect<FileStatus[]>
|
|
readonly diff: (mode: Mode, options?: DiffOptions) => Effect.Effect<FileDiff[]>
|
|
readonly diffRaw: () => Effect.Effect<string>
|
|
readonly apply: (input: ApplyInput) => Effect.Effect<ApplyResult, PatchApplyError>
|
|
}
|
|
|
|
interface State {
|
|
current: string | undefined
|
|
root: Git.Base | undefined
|
|
}
|
|
|
|
export class Service extends Context.Service<Service, Interface>()("@opencode/Vcs") {}
|
|
|
|
const layer: Layer.Layer<Service, never, Git.Service | EventV2Bridge.Service> = Layer.effect(
|
|
Service,
|
|
Effect.gen(function* () {
|
|
const git = yield* Git.Service
|
|
const events = yield* EventV2Bridge.Service
|
|
const scope = yield* Scope.Scope
|
|
|
|
const state = yield* InstanceState.make<State>(
|
|
Effect.fn("Vcs.state")(function* (ctx) {
|
|
if (ctx.project.vcs !== "git") {
|
|
return { current: undefined, root: undefined }
|
|
}
|
|
|
|
const get = Effect.fnUntraced(function* () {
|
|
return yield* git.branch(ctx.directory)
|
|
})
|
|
const [current, root] = yield* Effect.all([git.branch(ctx.directory), git.defaultBranch(ctx.directory)], {
|
|
concurrency: 2,
|
|
})
|
|
const value = { current, root }
|
|
|
|
const unsubscribe = yield* events.listen((event) => {
|
|
if (event.type !== Watcher.Event.Updated.type || event.location?.directory !== ctx.directory)
|
|
return Effect.void
|
|
const data = event.data as EventV2.Data<typeof Watcher.Event.Updated>
|
|
if (!data.file.endsWith("HEAD")) return Effect.void
|
|
return Effect.gen(function* () {
|
|
const next = yield* get()
|
|
if (next !== value.current) {
|
|
value.current = next
|
|
yield* events.publish(Event.BranchUpdated, { branch: next })
|
|
}
|
|
})
|
|
})
|
|
yield* Effect.addFinalizer(() => unsubscribe)
|
|
|
|
return value
|
|
}),
|
|
)
|
|
|
|
return Service.of({
|
|
init: Effect.fn("Vcs.init")(function* () {
|
|
yield* InstanceState.get(state).pipe(Effect.forkIn(scope))
|
|
}),
|
|
branch: Effect.fn("Vcs.branch")(function* () {
|
|
return yield* InstanceState.use(state, (x) => x.current)
|
|
}),
|
|
defaultBranch: Effect.fn("Vcs.defaultBranch")(function* () {
|
|
return yield* InstanceState.use(state, (x) => x.root?.name)
|
|
}),
|
|
status: Effect.fn("Vcs.status")(function* () {
|
|
const ctx = yield* InstanceState.context
|
|
if (ctx.project.vcs !== "git") return []
|
|
const ref = (yield* git.hasHead(ctx.directory)) ? "HEAD" : undefined
|
|
const [list, stats] = yield* Effect.all(
|
|
[git.status(ctx.directory), ref ? git.stats(ctx.directory, ref) : Effect.succeed([])],
|
|
{ concurrency: 2 },
|
|
)
|
|
const map = nums(stats)
|
|
return yield* Effect.forEach(
|
|
list.toSorted((a, b) => a.file.localeCompare(b.file)),
|
|
(item) =>
|
|
Effect.gen(function* () {
|
|
const stat =
|
|
map.get(item.file) ??
|
|
(item.status === "added" ? yield* git.statUntracked(ctx.worktree, item.file) : undefined)
|
|
return {
|
|
file: item.file,
|
|
additions: stat?.additions ?? 0,
|
|
deletions: stat?.deletions ?? 0,
|
|
status: item.status,
|
|
} satisfies FileStatus
|
|
}),
|
|
)
|
|
}),
|
|
diff: Effect.fn("Vcs.diff")(function* (mode: Mode, options?: DiffOptions) {
|
|
const value = yield* InstanceState.get(state)
|
|
const ctx = yield* InstanceState.context
|
|
if (ctx.project.vcs !== "git") return []
|
|
if (mode === "git") {
|
|
return yield* track(git, ctx.directory, (yield* git.hasHead(ctx.directory)) ? "HEAD" : undefined, options)
|
|
}
|
|
|
|
if (!value.root) return []
|
|
if (value.current && value.current === value.root.name) return []
|
|
const ref = yield* git.mergeBase(ctx.directory, value.root.ref)
|
|
if (!ref) return []
|
|
return yield* diffAgainstRef(git, ctx.directory, ref, options)
|
|
}),
|
|
diffRaw: Effect.fn("Vcs.diffRaw")(function* () {
|
|
const ctx = yield* InstanceState.context
|
|
if (ctx.project.vcs !== "git") return ""
|
|
const [hasHead, status] = yield* Effect.all([git.hasHead(ctx.directory), git.status(ctx.directory)], {
|
|
concurrency: 2,
|
|
})
|
|
const tracked = hasHead ? (yield* git.patchAll(ctx.directory, "HEAD")).text : ""
|
|
const untracked = yield* Effect.forEach(
|
|
status.filter((item) => item.code === "??"),
|
|
(item) => git.patchUntracked(ctx.directory, item.file).pipe(Effect.map((patch) => patch.text)),
|
|
)
|
|
return [tracked, ...untracked].filter(Boolean).join("\n")
|
|
}),
|
|
apply: Effect.fn("Vcs.apply")(function* (input: ApplyInput) {
|
|
const ctx = yield* InstanceState.context
|
|
if (ctx.project.vcs !== "git") {
|
|
return yield* new PatchApplyError({
|
|
message: "Patch can't be applied because the project is not git-based",
|
|
reason: "non-git",
|
|
})
|
|
}
|
|
const applied = yield* git.applyPatch(ctx.directory, input.patch)
|
|
if (applied.exitCode !== 0) {
|
|
return yield* new PatchApplyError({
|
|
message: "Patch can't be applied",
|
|
reason: "not-clean",
|
|
})
|
|
}
|
|
return { applied: true }
|
|
}),
|
|
})
|
|
}),
|
|
)
|
|
|
|
export const node = LayerNode.make({ service: Service, layer: layer, deps: [Git.node, EventV2Bridge.node] })
|
|
|
|
export * as Vcs from "./vcs"
|