chore: cleanup versioned zod imports (#3460)

jerome-benoit · opencode-agent[bot] · rekram1-node · web-flow · commit 0eb899a9500a · 2025-10-26T14:50:41.000-05:00
Signed-off-by: Jérôme Benoit &lt;jerome.benoit@sap.com&gt;
Co-authored-by: opencode-agent[bot] &lt;opencode-agent[bot]@users.noreply.github.com&gt;
Co-authored-by: rekram1-node &lt;rekram1-node@users.noreply.github.com&gt;
diff --git a/packages/opencode/script/schema.ts b/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]
diff --git a/packages/opencode/src/agent/agent.ts b/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"
diff --git a/packages/opencode/src/auth/github-copilot.ts b/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"
 
diff --git a/packages/opencode/src/auth/index.ts b/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
diff --git a/packages/opencode/src/bun/index.ts b/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"
diff --git a/packages/opencode/src/bus/index.ts b/packages/opencode/src/bus/index.ts
@@ -1,5 +1,5 @@
-import z from "zod/v4"
-import type { ZodType } from "zod/v4"
+import z from "zod"
+import type { ZodType } from "zod"
 import { Log } from "../util/log"
 import { Instance } from "../project/instance"
 
diff --git a/packages/opencode/src/cli/ui.ts b/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"
 
diff --git a/packages/opencode/src/command/index.ts b/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"
 
diff --git a/packages/opencode/src/config/config.ts b/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"
diff --git a/packages/opencode/src/file/fzf.ts b/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"
diff --git a/packages/opencode/src/file/index.ts b/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"
diff --git a/packages/opencode/src/file/ripgrep.ts b/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, {
diff --git a/packages/opencode/src/file/watcher.ts b/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"
diff --git a/packages/opencode/src/id/id.ts b/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 {
diff --git a/packages/opencode/src/ide/index.ts b/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"
diff --git a/packages/opencode/src/installation/index.ts b/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"
diff --git a/packages/opencode/src/lsp/client.ts b/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"
diff --git a/packages/opencode/src/lsp/index.ts b/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"
diff --git a/packages/opencode/src/mcp/index.ts b/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"
diff --git a/packages/opencode/src/permission/index.ts b/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"
diff --git a/packages/opencode/src/project/project.ts b/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"
diff --git a/packages/opencode/src/provider/models.ts b/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"
 
diff --git a/packages/opencode/src/provider/provider.ts b/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"
diff --git a/packages/opencode/src/server/server.ts b/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"
diff --git a/packages/opencode/src/session/compaction.ts b/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"
diff --git a/packages/opencode/src/session/index.ts b/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"
diff --git a/packages/opencode/src/session/lock.ts b/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"
diff --git a/packages/opencode/src/session/message-v2.ts b/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"
diff --git a/packages/opencode/src/session/message.ts b/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 {
diff --git a/packages/opencode/src/session/prompt.ts b/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"
diff --git a/packages/opencode/src/session/revert.ts b/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"
diff --git a/packages/opencode/src/session/todo.ts b/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"
 
diff --git a/packages/opencode/src/snapshot/index.ts b/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"
 
diff --git a/packages/opencode/src/tool/bash.ts b/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"
diff --git a/packages/opencode/src/tool/edit.ts b/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"
diff --git a/packages/opencode/src/tool/glob.ts b/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"
diff --git a/packages/opencode/src/tool/grep.ts b/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"
 
diff --git a/packages/opencode/src/tool/invalid.ts b/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", {
diff --git a/packages/opencode/src/tool/ls.ts b/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"
diff --git a/packages/opencode/src/tool/lsp-diagnostics.ts b/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"
diff --git a/packages/opencode/src/tool/lsp-hover.ts b/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"
diff --git a/packages/opencode/src/tool/multiedit.ts b/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"
diff --git a/packages/opencode/src/tool/patch.ts b/packages/opencode/src/tool/patch.ts
diff --git a/packages/opencode/src/tool/read.ts b/packages/opencode/src/tool/read.ts
diff --git a/packages/opencode/src/tool/registry.ts b/packages/opencode/src/tool/registry.ts
diff --git a/packages/opencode/src/tool/task.ts b/packages/opencode/src/tool/task.ts
diff --git a/packages/opencode/src/tool/todo.ts b/packages/opencode/src/tool/todo.ts
diff --git a/packages/opencode/src/tool/tool.ts b/packages/opencode/src/tool/tool.ts
diff --git a/packages/opencode/src/tool/webfetch.ts b/packages/opencode/src/tool/webfetch.ts
diff --git a/packages/opencode/src/tool/write.ts b/packages/opencode/src/tool/write.ts
diff --git a/packages/opencode/src/util/error.ts b/packages/opencode/src/util/error.ts
diff --git a/packages/opencode/src/util/log.ts b/packages/opencode/src/util/log.ts
diff --git a/packages/plugin/src/tool.ts b/packages/plugin/src/tool.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import z from "zod/v4"`
	`1`	`+import z from "zod"`
`2`	`2`	`import { Auth } from "./index"`
`3`	`3`	`import { NamedError } from "../util/error"`
`4`	`4`