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>

packages/opencode/script/schema.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env bun
 
-import { z } from "zod/v4"
+import { z } from "zod"
 import { Config } from "../src/config/config"
 
 const file = process.argv[2]

packages/opencode/src/agent/agent.ts

@@ -1,5 +1,5 @@
 import { Config } from "../config/config"
-import z from "zod/v4"
+import z from "zod"
 import { Provider } from "../provider/provider"
 import { generateObject, type ModelMessage } from "ai"
 import PROMPT_GENERATE from "./generate.txt"

packages/opencode/src/auth/github-copilot.ts

@@ -1,4 +1,4 @@
-import z from "zod/v4"
+import z from "zod"
 import { Auth } from "./index"
 import { NamedError } from "../util/error"
 

packages/opencode/src/auth/index.ts

@@ -1,7 +1,7 @@
 import path from "path"
 import { Global } from "../global"
 import fs from "fs/promises"
-import z from "zod/v4"
+import z from "zod"
 
 export namespace Auth {
   export const Oauth = z

packages/opencode/src/bun/index.ts

@@ -1,4 +1,4 @@
-import z from "zod/v4"
+import z from "zod"
 import { Global } from "../global"
 import { Log } from "../util/log"
 import path from "path"

packages/opencode/src/bus/index.ts

@@ -1,5 +1,5 @@
-import z from "zod/v4"
+import z from "zod"
-import type { ZodType } from "zod/v4"
+import type { ZodType } from "zod"
 import { Log } from "../util/log"
 import { Instance } from "../project/instance"
 

packages/opencode/src/cli/ui.ts

@@ -1,4 +1,4 @@
-import z from "zod/v4"
+import z from "zod"
 import { EOL } from "os"
 import { NamedError } from "../util/error"
 

packages/opencode/src/command/index.ts

@@ -1,4 +1,4 @@
-import z from "zod/v4"
+import z from "zod"
 import { Config } from "../config/config"
 import { Instance } from "../project/instance"
 

packages/opencode/src/config/config.ts

@@ -1,7 +1,7 @@
 import { Log } from "../util/log"
 import path from "path"
 import os from "os"
-import z from "zod/v4"
+import z from "zod"
 import { Filesystem } from "../util/filesystem"
 import { ModelsDev } from "../provider/models"
 import { mergeDeep, pipe } from "remeda"

packages/opencode/src/file/fzf.ts

@@ -1,7 +1,7 @@
 import path from "path"
 import { Global } from "../global"
 import fs from "fs/promises"
-import z from "zod/v4"
+import z from "zod"
 import { NamedError } from "../util/error"
 import { lazy } from "../util/lazy"
 import { Log } from "../util/log"

packages/opencode/src/file/index.ts

@@ -1,4 +1,4 @@
-import z from "zod/v4"
+import z from "zod"
 import { Bus } from "../bus"
 import { $ } from "bun"
 import type { BunFile } from "bun"

packages/opencode/src/file/ripgrep.ts

@@ -2,7 +2,7 @@
 import path from "path"
 import { Global } from "../global"
 import fs from "fs/promises"
-import z from "zod/v4"
+import z from "zod"
 import { NamedError } from "../util/error"
 import { lazy } from "../util/lazy"
 import { $ } from "bun"
@@ -218,7 +218,7 @@ export namespace Ripgrep {
         code: "ENOENT",
         errno: -2,
         path: input.cwd,
-      });
+      })
     }
 
     const proc = Bun.spawn(args, {

packages/opencode/src/file/watcher.ts

@@ -1,4 +1,4 @@
-import z from "zod/v4"
+import z from "zod"
 import { Bus } from "../bus"
 import { Flag } from "../flag/flag"
 import { Instance } from "../project/instance"

packages/opencode/src/id/id.ts

@@ -1,4 +1,4 @@
-import z from "zod/v4"
+import z from "zod"
 import { randomBytes } from "crypto"
 
 export namespace Identifier {

packages/opencode/src/ide/index.ts

@@ -1,5 +1,5 @@
 import { spawn } from "bun"
-import z from "zod/v4"
+import z from "zod"
 import { NamedError } from "../util/error"
 import { Log } from "../util/log"
 import { Bus } from "../bus"

packages/opencode/src/installation/index.ts

@@ -1,6 +1,6 @@
 import path from "path"
 import { $ } from "bun"
-import z from "zod/v4"
+import z from "zod"
 import { NamedError } from "../util/error"
 import { Bus } from "../bus"
 import { Log } from "../util/log"

packages/opencode/src/lsp/client.ts

@@ -4,7 +4,7 @@ import type { Diagnostic as VSCodeDiagnostic } from "vscode-languageserver-types
 import { Log } from "../util/log"
 import { LANGUAGE_EXTENSIONS } from "./language"
 import { Bus } from "../bus"
-import z from "zod/v4"
+import z from "zod"
 import type { LSPServer } from "./server"
 import { NamedError } from "../util/error"
 import { withTimeout } from "../util/timeout"

packages/opencode/src/lsp/index.ts

@@ -2,7 +2,7 @@ import { Log } from "../util/log"
 import { LSPClient } from "./client"
 import path from "path"
 import { LSPServer } from "./server"
-import z from "zod/v4"
+import z from "zod"
 import { Config } from "../config/config"
 import { spawn } from "child_process"
 import { Instance } from "../project/instance"

packages/opencode/src/mcp/index.ts

@@ -5,7 +5,7 @@ import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js"
 import { Config } from "../config/config"
 import { Log } from "../util/log"
 import { NamedError } from "../util/error"
-import z from "zod/v4"
+import z from "zod"
 import { Session } from "../session"
 import { Bus } from "../bus"
 import { Instance } from "../project/instance"

packages/opencode/src/permission/index.ts

@@ -1,4 +1,4 @@
-import z from "zod/v4"
+import z from "zod"
 import { Bus } from "../bus"
 import { Log } from "../util/log"
 import { Identifier } from "../id/id"

packages/opencode/src/project/project.ts

@@ -1,4 +1,4 @@
-import z from "zod/v4"
+import z from "zod"
 import { Filesystem } from "../util/filesystem"
 import path from "path"
 import { $ } from "bun"

packages/opencode/src/provider/models.ts

@@ -1,7 +1,7 @@
 import { Global } from "../global"
 import { Log } from "../util/log"
 import path from "path"
-import z from "zod/v4"
+import z from "zod"
 import { data } from "./models-macro" with { type: "macro" }
 import { Installation } from "../installation"
 

packages/opencode/src/provider/provider.ts

@@ -1,4 +1,4 @@
-import z from "zod/v4"
+import z from "zod"
 import path from "path"
 import { Config } from "../config/config"
 import { mergeDeep, sortBy } from "remeda"

packages/opencode/src/server/server.ts

@@ -5,7 +5,7 @@ import { Hono } from "hono"
 import { cors } from "hono/cors"
 import { stream, streamSSE } from "hono/streaming"
 import { Session } from "../session"
-import z from "zod/v4"
+import z from "zod"
 import { Provider } from "../provider/provider"
 import { mapValues } from "remeda"
 import { NamedError } from "../util/error"

packages/opencode/src/session/compaction.ts

@@ -7,7 +7,7 @@ import { defer } from "../util/defer"
 import { MessageV2 } from "./message-v2"
 import { SystemPrompt } from "./system"
 import { Bus } from "../bus"
-import z from "zod/v4"
+import z from "zod"
 import type { ModelsDev } from "../provider/models"
 import { SessionPrompt } from "./prompt"
 import { Flag } from "../flag/flag"

packages/opencode/src/session/index.ts

@@ -1,5 +1,5 @@
 import { Decimal } from "decimal.js"
-import z from "zod/v4"
+import z from "zod"
 import { type LanguageModelUsage, type ProviderMetadata } from "ai"
 
 import PROMPT_INITIALIZE from "../session/prompt/initialize.txt"

packages/opencode/src/session/lock.ts

@@ -1,4 +1,4 @@
-import z from "zod/v4"
+import z from "zod"
 import { Instance } from "../project/instance"
 import { Log } from "../util/log"
 import { NamedError } from "../util/error"

packages/opencode/src/session/message-v2.ts

@@ -1,4 +1,4 @@
-import z from "zod/v4"
+import z from "zod"
 import { Bus } from "../bus"
 import { NamedError } from "../util/error"
 import { Message } from "./message"

packages/opencode/src/session/message.ts

@@ -1,4 +1,4 @@
-import z from "zod/v4"
+import z from "zod"
 import { NamedError } from "../util/error"
 
 export namespace Message {

packages/opencode/src/session/prompt.ts

@@ -1,7 +1,7 @@
 import path from "path"
 import os from "os"
 import fs from "fs/promises"
-import z from "zod/v4"
+import z from "zod"
 import { Identifier } from "../id/id"
 import { MessageV2 } from "./message-v2"
 import { Log } from "../util/log"

packages/opencode/src/session/revert.ts

@@ -1,4 +1,4 @@
-import z from "zod/v4"
+import z from "zod"
 import { Identifier } from "../id/id"
 import { Snapshot } from "../snapshot"
 import { MessageV2 } from "./message-v2"

packages/opencode/src/session/todo.ts

@@ -1,4 +1,4 @@
-import z from "zod/v4"
+import z from "zod"
 import { Bus } from "../bus"
 import { Storage } from "../storage/storage"
 

packages/opencode/src/snapshot/index.ts

@@ -3,7 +3,7 @@ import path from "path"
 import fs from "fs/promises"
 import { Log } from "../util/log"
 import { Global } from "../global"
-import z from "zod/v4"
+import z from "zod"
 import { Config } from "../config/config"
 import { Instance } from "../project/instance"
 

packages/opencode/src/tool/bash.ts

@@ -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"

packages/opencode/src/tool/edit.ts

@@ -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"

packages/opencode/src/tool/glob.ts

@@ -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"

packages/opencode/src/tool/grep.ts

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

packages/opencode/src/tool/invalid.ts

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

packages/opencode/src/tool/ls.ts

@@ -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"

packages/opencode/src/tool/lsp-diagnostics.ts

@@ -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"

packages/opencode/src/tool/lsp-hover.ts

@@ -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"

packages/opencode/src/tool/multiedit.ts

@@ -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"

packages/opencode/src/tool/patch.ts

@@ -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")}`,
     }
   },
-})
+})

packages/opencode/src/tool/read.ts

@@ -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"

packages/opencode/src/tool/registry.ts

@@ -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 {

packages/opencode/src/tool/task.ts

@@ -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"

packages/opencode/src/tool/todo.ts

@@ -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"

packages/opencode/src/tool/tool.ts

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

packages/opencode/src/tool/webfetch.ts

@@ -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"

packages/opencode/src/tool/write.ts

@@ -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"

packages/opencode/src/util/error.ts

@@ -1,4 +1,4 @@
-import z from "zod/v4"
+import z from "zod"
 
 export abstract class NamedError extends Error {
   abstract schema(): z.core.$ZodType

packages/opencode/src/util/log.ts

@@ -1,7 +1,7 @@
 import path from "path"
 import fs from "fs/promises"
 import { Global } from "../global"
-import z from "zod/v4"
+import z from "zod"
 
 export namespace Log {
   export const Level = z.enum(["DEBUG", "INFO", "WARN", "ERROR"]).meta({ ref: "LogLevel", description: "Log level" })

packages/plugin/src/tool.ts

@@ -1,4 +1,4 @@
-import { z } from "zod/v4"
+import { z } from "zod"
 
 export type ToolContext = {
   sessionID: string