chore: cleanup versioned zod imports (#3460)

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: rekram1-node <rekram1-node@users.noreply.github.com>
This commit is contained in:
Jérôme Benoit
2025-10-26 20:50:41 +01:00
committed by GitHub
parent 3241f6b8bb
commit 0eb899a950
53 changed files with 78 additions and 77 deletions

View File

@@ -1,4 +1,4 @@
import z from "zod/v4"
import z from "zod"
import { spawn } from "child_process"
import { Tool } from "./tool"
import DESCRIPTION from "./bash.txt"

View File

@@ -3,7 +3,7 @@
// https://github.com/google-gemini/gemini-cli/blob/main/packages/core/src/utils/editCorrector.ts
// https://github.com/cline/cline/blob/main/evals/diff-edits/diff-apply/diff-06-26-25.ts
import z from "zod/v4"
import z from "zod"
import * as path from "path"
import { Tool } from "./tool"
import { LSP } from "../lsp"

View File

@@ -1,4 +1,4 @@
import z from "zod/v4"
import z from "zod"
import path from "path"
import { Tool } from "./tool"
import DESCRIPTION from "./glob.txt"

View File

@@ -1,4 +1,4 @@
import z from "zod/v4"
import z from "zod"
import { Tool } from "./tool"
import { Ripgrep } from "../file/ripgrep"

View File

@@ -1,4 +1,4 @@
import z from "zod/v4"
import z from "zod"
import { Tool } from "./tool"
export const InvalidTool = Tool.define("invalid", {

View File

@@ -1,4 +1,4 @@
import z from "zod/v4"
import z from "zod"
import { Tool } from "./tool"
import * as path from "path"
import DESCRIPTION from "./ls.txt"

View File

@@ -1,4 +1,4 @@
import z from "zod/v4"
import z from "zod"
import { Tool } from "./tool"
import path from "path"
import { LSP } from "../lsp"

View File

@@ -1,4 +1,4 @@
import z from "zod/v4"
import z from "zod"
import { Tool } from "./tool"
import path from "path"
import { LSP } from "../lsp"

View File

@@ -1,4 +1,4 @@
import z from "zod/v4"
import z from "zod"
import { Tool } from "./tool"
import { EditTool } from "./edit"
import DESCRIPTION from "./multiedit.txt"

View File

@@ -1,4 +1,4 @@
import z from "zod/v4"
import z from "zod"
import * as path from "path"
import * as fs from "fs/promises"
import { Tool } from "./tool"
@@ -17,7 +17,8 @@ const PatchParams = z.object({
})
export const PatchTool = Tool.define("patch", {
description: "Apply a patch to modify multiple files. Supports adding, updating, and deleting files with context-aware changes.",
description:
"Apply a patch to modify multiple files. Supports adding, updating, and deleting files with context-aware changes.",
parameters: PatchParams,
async execute(params, ctx) {
if (!params.patchText) {
@@ -46,12 +47,12 @@ export const PatchTool = Tool.define("patch", {
type: "add" | "update" | "delete" | "move"
movePath?: string
}> = []
let totalDiff = ""
for (const hunk of hunks) {
const filePath = path.resolve(Instance.directory, hunk.path)
if (!Filesystem.contains(Instance.directory, filePath)) {
throw new Error(`File ${filePath} is not in the current working directory`)
}
@@ -62,30 +63,30 @@ export const PatchTool = Tool.define("patch", {
const oldContent = ""
const newContent = hunk.contents
const diff = createTwoFilesPatch(filePath, filePath, oldContent, newContent)
fileChanges.push({
filePath,
oldContent,
newContent,
type: "add",
})
totalDiff += diff + "\n"
}
break
case "update":
// Check if file exists for update
const stats = await fs.stat(filePath).catch(() => null)
if (!stats || stats.isDirectory()) {
throw new Error(`File not found or is directory: ${filePath}`)
}
// Read file and update time tracking (like edit tool does)
await FileTime.assert(ctx.sessionID, filePath)
const oldContent = await fs.readFile(filePath, "utf-8")
let newContent = oldContent
// Apply the update chunks to get new content
try {
const fileUpdate = Patch.deriveNewContentsFromChunks(filePath, hunk.chunks)
@@ -93,9 +94,9 @@ export const PatchTool = Tool.define("patch", {
} catch (error) {
throw new Error(`Failed to apply update to ${filePath}: ${error}`)
}
const diff = createTwoFilesPatch(filePath, filePath, oldContent, newContent)
fileChanges.push({
filePath,
oldContent,
@@ -103,23 +104,23 @@ export const PatchTool = Tool.define("patch", {
type: hunk.move_path ? "move" : "update",
movePath: hunk.move_path ? path.resolve(Instance.directory, hunk.move_path) : undefined,
})
totalDiff += diff + "\n"
break
case "delete":
// Check if file exists for deletion
await FileTime.assert(ctx.sessionID, filePath)
const contentToDelete = await fs.readFile(filePath, "utf-8")
const deleteDiff = createTwoFilesPatch(filePath, filePath, contentToDelete, "")
fileChanges.push({
filePath,
oldContent: contentToDelete,
newContent: "",
type: "delete",
})
totalDiff += deleteDiff + "\n"
break
}
@@ -141,7 +142,7 @@ export const PatchTool = Tool.define("patch", {
// Apply the changes
const changedFiles: string[] = []
for (const change of fileChanges) {
switch (change.type) {
case "add":
@@ -153,12 +154,12 @@ export const PatchTool = Tool.define("patch", {
await fs.writeFile(change.filePath, change.newContent, "utf-8")
changedFiles.push(change.filePath)
break
case "update":
await fs.writeFile(change.filePath, change.newContent, "utf-8")
changedFiles.push(change.filePath)
break
case "move":
if (change.movePath) {
// Create parent directories for destination
@@ -173,13 +174,13 @@ export const PatchTool = Tool.define("patch", {
changedFiles.push(change.movePath)
}
break
case "delete":
await fs.unlink(change.filePath)
changedFiles.push(change.filePath)
break
}
// Update file time tracking
FileTime.read(ctx.sessionID, change.filePath)
if (change.movePath) {
@@ -193,7 +194,7 @@ export const PatchTool = Tool.define("patch", {
}
// Generate output summary
const relativePaths = changedFiles.map(filePath => path.relative(Instance.worktree, filePath))
const relativePaths = changedFiles.map((filePath) => path.relative(Instance.worktree, filePath))
const summary = `${fileChanges.length} files changed`
return {
@@ -201,7 +202,7 @@ export const PatchTool = Tool.define("patch", {
metadata: {
diff: totalDiff,
},
output: `Patch applied successfully. ${summary}:\n${relativePaths.map(p => ` ${p}`).join("\n")}`,
output: `Patch applied successfully. ${summary}:\n${relativePaths.map((p) => ` ${p}`).join("\n")}`,
}
},
})
})

View File

@@ -1,4 +1,4 @@
import z from "zod/v4"
import z from "zod"
import * as fs from "fs"
import * as path from "path"
import { Tool } from "./tool"

View File

@@ -16,7 +16,7 @@ import { Instance } from "../project/instance"
import { Config } from "../config/config"
import path from "path"
import { type ToolDefinition } from "@opencode-ai/plugin"
import z from "zod/v4"
import z from "zod"
import { Plugin } from "../plugin"
export namespace ToolRegistry {

View File

@@ -1,6 +1,6 @@
import { Tool } from "./tool"
import DESCRIPTION from "./task.txt"
import z from "zod/v4"
import z from "zod"
import { Session } from "../session"
import { Bus } from "../bus"
import { MessageV2 } from "../session/message-v2"

View File

@@ -1,4 +1,4 @@
import z from "zod/v4"
import z from "zod"
import { Tool } from "./tool"
import DESCRIPTION_WRITE from "./todowrite.txt"
import { Todo } from "../session/todo"

View File

@@ -1,4 +1,4 @@
import z from "zod/v4"
import z from "zod"
import type { MessageV2 } from "../session/message-v2"
export namespace Tool {

View File

@@ -1,4 +1,4 @@
import z from "zod/v4"
import z from "zod"
import { Tool } from "./tool"
import TurndownService from "turndown"
import DESCRIPTION from "./webfetch.txt"

View File

@@ -1,4 +1,4 @@
import z from "zod/v4"
import z from "zod"
import * as path from "path"
import { Tool } from "./tool"
import { LSP } from "../lsp"