Add support for duration units to timeout

Author: AurelienRibon

packages/opencode/src/cli/cmd/run.ts

@@ -83,8 +83,8 @@ export const RunCommand = cmd({
         describe: "title for the session (uses truncated prompt if no value provided)",
       })
       .option("timeout", {
-        type: "number",
-        describe: "timeout in milliseconds for each AI request (default: 300000 ms, 5 mins)",
+        type: "string",
+        describe: "timeout for each AI request (e.g., '60s', '2m', '1h', '500ms', default: '5m')",
       })
   },
   handler: async (args) => {

packages/opencode/src/session/prompt.ts

@@ -51,6 +51,7 @@ import { $, fileURLToPath } from "bun"
 import { ConfigMarkdown } from "../config/markdown"
 import { SessionSummary } from "./summary"
 import { Config } from "@/config/config"
+import { parseTimeout } from "@/util/timeout"
 
 export namespace SessionPrompt {
   const log = Log.create({ service: "session.prompt" })
@@ -98,7 +99,7 @@ export namespace SessionPrompt {
     noReply: z.boolean().optional(),
     system: z.string().optional(),
     tools: z.record(z.string(), z.boolean()).optional(),
-    timeout: z.number().int().positive().optional(),
+    timeout: z.string().optional(),
     parts: z.array(
       z.discriminatedUnion("type", [
         MessageV2.TextPart.omit({
@@ -165,7 +166,7 @@ export namespace SessionPrompt {
     let runtimeOptions: Record<string, unknown> | undefined = undefined
     if (input.timeout) {
       runtimeOptions ??= {}
-      runtimeOptions.timeout = input.timeout
+      runtimeOptions.timeout = parseTimeout(input.timeout)
     }
 
     const agent = await Agent.get(input.agent ?? "build")
@@ -1489,7 +1490,7 @@ export namespace SessionPrompt {
     model: z.string().optional(),
     arguments: z.string(),
     command: z.string(),
-    timeout: z.number().int().positive().optional(),
+    timeout: z.string().optional(),
   })
   export type CommandInput = z.infer<typeof CommandInput>
   const bashRegex = /!`([^`]+)`/g

packages/opencode/src/util/timeout.ts

@@ -12,3 +12,28 @@ export function withTimeout<T>(promise: Promise<T>, ms: number): Promise<T> {
     }),
   ])
 }
+
+export function parseTimeout(timeout: string): number {
+  const match = timeout.match(/^(\d+(?:\.\d+)?)\s*(h|m|s|ms)?$/)
+  if (!match) {
+    throw new Error(
+      `Invalid timeout format (${timeout}). Expected format: "60s", "2m", "1h", "500ms".`,
+    )
+  }
+
+  const value = parseFloat(match[1])
+  const unit = match[2] || "ms"
+
+  switch (unit) {
+    case "h":
+      return value * 60 * 60 * 1000
+    case "m":
+      return value * 60 * 1000
+    case "s":
+      return value * 1000
+    case "ms":
+      return value
+    default:
+      throw new Error(`Invalid timeout unit (${unit}). Expected h, m, s, or ms.`)
+  }
+}