v2 message format and upgrade to ai sdk v5 (#743)

Co-authored-by: GitHub Action <action@github.com> Co-authored-by: Liang-Shih Lin <liangshihlin@proton.me> Co-authored-by: Dominik Engelhardt <dominikengelhardt@ymail.com> Co-authored-by: Jay V <air@live.ca> Co-authored-by: adamdottv <2363879+adamdottv@users.noreply.github.com>
2026-04-01 06:42:26 +00:00 · 2025-07-07 15:53:43 -04:00
parent 76b2e4539c
commit f884766445
116 changed files with 4707 additions and 6950 deletions
--- a/packages/opencode/src/tool/bash.ts
+++ b/packages/opencode/src/tool/bash.ts
@@ -12,12 +12,7 @@ export const BashTool = Tool.define({
  description: DESCRIPTION,
  parameters: z.object({
    command: z.string().describe("The command to execute"),
-    timeout: z
-      .number()
-      .min(0)
-      .max(MAX_TIMEOUT)
-      .describe("Optional timeout in milliseconds")
-      .optional(),
+    timeout: z.number().min(0).max(MAX_TIMEOUT).describe("Optional timeout in milliseconds").optional(),
    description: z
      .string()
      .describe(
@@ -41,21 +36,14 @@ export const BashTool = Tool.define({
    const stderr = await new Response(process.stderr).text()

    return {
+      title: params.command,
      metadata: {
        stderr,
        stdout,
        exit: process.exitCode,
        description: params.description,
-        title: params.command,
      },
-      output: [
-        `<stdout>`,
-        stdout ?? "",
-        `</stdout>`,
-        `<stderr>`,
-        stderr ?? "",
-        `</stderr>`,
-      ].join("\n"),
+      output: [`<stdout>`, stdout ?? "", `</stdout>`, `<stderr>`, stderr ?? "", `</stderr>`].join("\n"),
    }
  },
 })
--- a/packages/opencode/src/tool/edit.ts
+++ b/packages/opencode/src/tool/edit.ts
@@ -20,15 +20,8 @@ export const EditTool = Tool.define({
  parameters: z.object({
    filePath: z.string().describe("The absolute path to the file to modify"),
    oldString: z.string().describe("The text to replace"),
-    newString: z
-      .string()
-      .describe(
-        "The text to replace it with (must be different from old_string)",
-      ),
-    replaceAll: z
-      .boolean()
-      .optional()
-      .describe("Replace all occurrences of old_string (default false)"),
+    newString: z.string().describe("The text to replace it with (must be different from old_string)"),
+    replaceAll: z.boolean().optional().describe("Replace all occurrences of old_string (default false)"),
  }),
  async execute(params, ctx) {
    if (!params.filePath) {
@@ -40,9 +33,7 @@ export const EditTool = Tool.define({
    }

    const app = App.info()
-    const filepath = path.isAbsolute(params.filePath)
-      ? params.filePath
-      : path.join(app.path.cwd, params.filePath)
+    const filepath = path.isAbsolute(params.filePath) ? params.filePath : path.join(app.path.cwd, params.filePath)

    await Permission.ask({
      id: "edit",
@@ -70,17 +61,11 @@ export const EditTool = Tool.define({
      const file = Bun.file(filepath)
      const stats = await file.stat().catch(() => {})
      if (!stats) throw new Error(`File ${filepath} not found`)
-      if (stats.isDirectory())
-        throw new Error(`Path is a directory, not a file: ${filepath}`)
+      if (stats.isDirectory()) throw new Error(`Path is a directory, not a file: ${filepath}`)
      await FileTime.assert(ctx.sessionID, filepath)
      contentOld = await file.text()

-      contentNew = replace(
-        contentOld,
-        params.oldString,
-        params.newString,
-        params.replaceAll,
-      )
+      contentNew = replace(contentOld, params.oldString, params.newString, params.replaceAll)
      await file.write(contentNew)
      await Bus.publish(File.Event.Edited, {
        file: filepath,
@@ -88,9 +73,7 @@ export const EditTool = Tool.define({
      contentNew = await file.text()
    })()

-    const diff = trimDiff(
-      createTwoFilesPatch(filepath, filepath, contentOld, contentNew),
-    )
+    const diff = trimDiff(createTwoFilesPatch(filepath, filepath, contentOld, contentNew))

    FileTime.read(ctx.sessionID, filepath)

@@ -110,17 +93,14 @@ export const EditTool = Tool.define({
      metadata: {
        diagnostics,
        diff,
-        title: `${path.relative(app.path.root, filepath)}`,
      },
+      title: `${path.relative(app.path.root, filepath)}`,
      output,
    }
  },
 })

-export type Replacer = (
-  content: string,
-  find: string,
-) => Generator<string, void, unknown>
+export type Replacer = (content: string, find: string) => Generator<string, void, unknown>

 export const SimpleReplacer: Replacer = function* (_content, find) {
  yield find
@@ -208,10 +188,7 @@ export const BlockAnchorReplacer: Replacer = function* (content, find) {
  }
 }

-export const WhitespaceNormalizedReplacer: Replacer = function* (
-  content,
-  find,
-) {
+export const WhitespaceNormalizedReplacer: Replacer = function* (content, find) {
  const normalizeWhitespace = (text: string) => text.replace(/\s+/g, " ").trim()
  const normalizedFind = normalizeWhitespace(find)

@@ -229,9 +206,7 @@ export const WhitespaceNormalizedReplacer: Replacer = function* (
      // Find the actual substring in the original line that matches
      const words = find.trim().split(/\s+/)
      if (words.length > 0) {
-        const pattern = words
-          .map((word) => word.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
-          .join("\\s+")
+        const pattern = words.map((word) => word.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("\\s+")
        try {
          const regex = new RegExp(pattern)
          const match = line.match(regex)
@@ -270,9 +245,7 @@ export const IndentationFlexibleReplacer: Replacer = function* (content, find) {
      }),
    )

-    return lines
-      .map((line) => (line.trim().length === 0 ? line : line.slice(minIndent)))
-      .join("\n")
+    return lines.map((line) => (line.trim().length === 0 ? line : line.slice(minIndent))).join("\n")
  }

  const normalizedFind = removeIndentation(find)
@@ -423,10 +396,7 @@ export const ContextAwareReplacer: Replacer = function* (content, find) {
            }
          }

-          if (
-            totalNonEmptyLines === 0 ||
-            matchingLines / totalNonEmptyLines >= 0.5
-          ) {
+          if (totalNonEmptyLines === 0 || matchingLines / totalNonEmptyLines >= 0.5) {
            yield block
            break // Only match the first occurrence
          }
@@ -473,12 +443,7 @@ function trimDiff(diff: string): string {
  return trimmedLines.join("\n")
 }

-export function replace(
-  content: string,
-  oldString: string,
-  newString: string,
-  replaceAll = false,
-): string {
+export function replace(content: string, oldString: string, newString: string, replaceAll = false): string {
  if (oldString === newString) {
    throw new Error("oldString and newString must be different")
  }
@@ -502,11 +467,7 @@ export function replace(
      }
      const lastIndex = content.lastIndexOf(search)
      if (index !== lastIndex) continue
-      return (
-        content.substring(0, index) +
-        newString +
-        content.substring(index + search.length)
-      )
+      return content.substring(0, index) + newString + content.substring(index + search.length)
    }
  }
  throw new Error("oldString not found in content or was found multiple times")
--- a/packages/opencode/src/tool/glob.ts
+++ b/packages/opencode/src/tool/glob.ts
@@ -20,9 +20,7 @@ export const GlobTool = Tool.define({
  async execute(params) {
    const app = App.info()
    let search = params.path ?? app.path.cwd
-    search = path.isAbsolute(search)
-      ? search
-      : path.resolve(app.path.cwd, search)
+    search = path.isAbsolute(search) ? search : path.resolve(app.path.cwd, search)

    const limit = 100
    const files = []
@@ -53,17 +51,15 @@ export const GlobTool = Tool.define({
      output.push(...files.map((f) => f.path))
      if (truncated) {
        output.push("")
-        output.push(
-          "(Results are truncated. Consider using a more specific path or pattern.)",
-        )
+        output.push("(Results are truncated. Consider using a more specific path or pattern.)")
      }
    }

    return {
+      title: path.relative(app.path.root, search),
      metadata: {
        count: files.length,
        truncated,
-        title: path.relative(app.path.root, search),
      },
      output: output.join("\n"),
    }
--- a/packages/opencode/src/tool/grep.ts
+++ b/packages/opencode/src/tool/grep.ts
@@ -9,21 +9,9 @@ export const GrepTool = Tool.define({
  id: "grep",
  description: DESCRIPTION,
  parameters: z.object({
-    pattern: z
-      .string()
-      .describe("The regex pattern to search for in file contents"),
-    path: z
-      .string()
-      .optional()
-      .describe(
-        "The directory to search in. Defaults to the current working directory.",
-      ),
-    include: z
-      .string()
-      .optional()
-      .describe(
-        'File pattern to include in the search (e.g. "*.js", "*.{ts,tsx}")',
-      ),
+    pattern: z.string().describe("The regex pattern to search for in file contents"),
+    path: z.string().optional().describe("The directory to search in. Defaults to the current working directory."),
+    include: z.string().optional().describe('File pattern to include in the search (e.g. "*.js", "*.{ts,tsx}")'),
  }),
  async execute(params) {
    if (!params.pattern) {
@@ -51,7 +39,8 @@ export const GrepTool = Tool.define({

    if (exitCode === 1) {
      return {
-        metadata: { matches: 0, truncated: false, title: params.pattern },
+        title: params.pattern,
+        metadata: { matches: 0, truncated: false },
        output: "No files found",
      }
    }
@@ -93,7 +82,8 @@ export const GrepTool = Tool.define({

    if (finalMatches.length === 0) {
      return {
-        metadata: { matches: 0, truncated: false, title: params.pattern },
+        title: params.pattern,
+        metadata: { matches: 0, truncated: false },
        output: "No files found",
      }
    }
@@ -114,16 +104,14 @@ export const GrepTool = Tool.define({

    if (truncated) {
      outputLines.push("")
-      outputLines.push(
-        "(Results are truncated. Consider using a more specific path or pattern.)",
-      )
+      outputLines.push("(Results are truncated. Consider using a more specific path or pattern.)")
    }

    return {
+      title: params.pattern,
      metadata: {
        matches: finalMatches.length,
        truncated,
-        title: params.pattern,
      },
      output: outputLines.join("\n"),
    }
--- a/packages/opencode/src/tool/ls.ts
+++ b/packages/opencode/src/tool/ls.ts
@@ -24,16 +24,8 @@ export const ListTool = Tool.define({
  id: "list",
  description: DESCRIPTION,
  parameters: z.object({
-    path: z
-      .string()
-      .describe(
-        "The absolute path to the directory to list (must be absolute, not relative)",
-      )
-      .optional(),
-    ignore: z
-      .array(z.string())
-      .describe("List of glob patterns to ignore")
-      .optional(),
+    path: z.string().describe("The absolute path to the directory to list (must be absolute, not relative)").optional(),
+    ignore: z.array(z.string()).describe("List of glob patterns to ignore").optional(),
  }),
  async execute(params) {
    const app = App.info()
@@ -44,8 +36,7 @@ export const ListTool = Tool.define({

    for await (const file of glob.scan({ cwd: searchPath, dot: true })) {
      if (IGNORE_PATTERNS.some((p) => file.includes(p))) continue
-      if (params.ignore?.some((pattern) => new Bun.Glob(pattern).match(file)))
-        continue
+      if (params.ignore?.some((pattern) => new Bun.Glob(pattern).match(file))) continue
      files.push(file)
      if (files.length >= LIMIT) break
    }
@@ -99,10 +90,10 @@ export const ListTool = Tool.define({
    const output = `${searchPath}/\n` + renderDir(".", 0)

    return {
+      title: path.relative(app.path.root, searchPath),
      metadata: {
        count: files.length,
        truncated: files.length >= LIMIT,
-        title: path.relative(app.path.root, searchPath),
      },
      output,
    }
--- a/packages/opencode/src/tool/lsp-diagnostics.ts
+++ b/packages/opencode/src/tool/lsp-diagnostics.ts
@@ -13,20 +13,16 @@ export const LspDiagnosticTool = Tool.define({
  }),
  execute: async (args) => {
    const app = App.info()
-    const normalized = path.isAbsolute(args.path)
-      ? args.path
-      : path.join(app.path.cwd, args.path)
+    const normalized = path.isAbsolute(args.path) ? args.path : path.join(app.path.cwd, args.path)
    await LSP.touchFile(normalized, true)
    const diagnostics = await LSP.diagnostics()
    const file = diagnostics[normalized]
    return {
+      title: path.relative(app.path.root, normalized),
      metadata: {
        diagnostics,
-        title: path.relative(app.path.root, normalized),
      },
-      output: file?.length
-        ? file.map(LSP.Diagnostic.pretty).join("\n")
-        : "No errors found",
+      output: file?.length ? file.map(LSP.Diagnostic.pretty).join("\n") : "No errors found",
    }
  },
 })
--- a/packages/opencode/src/tool/lsp-hover.ts
+++ b/packages/opencode/src/tool/lsp-hover.ts
@@ -15,9 +15,7 @@ export const LspHoverTool = Tool.define({
  }),
  execute: async (args) => {
    const app = App.info()
-    const file = path.isAbsolute(args.file)
-      ? args.file
-      : path.join(app.path.cwd, args.file)
+    const file = path.isAbsolute(args.file) ? args.file : path.join(app.path.cwd, args.file)
    await LSP.touchFile(file, true)
    const result = await LSP.hover({
      ...args,
@@ -25,14 +23,9 @@ export const LspHoverTool = Tool.define({
    })

    return {
+      title: path.relative(app.path.root, file) + ":" + args.line + ":" + args.character,
      metadata: {
        result,
-        title:
-          path.relative(app.path.root, file) +
-          ":" +
-          args.line +
-          ":" +
-          args.character,
      },
      output: JSON.stringify(result, null, 2),
    }
--- a/packages/opencode/src/tool/multiedit.ts
+++ b/packages/opencode/src/tool/multiedit.ts
@@ -10,9 +10,7 @@ export const MultiEditTool = Tool.define({
  description: DESCRIPTION,
  parameters: z.object({
    filePath: z.string().describe("The absolute path to the file to modify"),
-    edits: z
-      .array(EditTool.parameters)
-      .describe("Array of edit operations to perform sequentially on the file"),
+    edits: z.array(EditTool.parameters).describe("Array of edit operations to perform sequentially on the file"),
  }),
  async execute(params, ctx) {
    const results = []
@@ -30,9 +28,9 @@ export const MultiEditTool = Tool.define({
    }
    const app = App.info()
    return {
+      title: path.relative(app.path.root, params.filePath),
      metadata: {
        results: results.map((r) => r.metadata),
-        title: path.relative(app.path.root, params.filePath),
      },
      output: results.at(-1)!.output,
    }
--- a/packages/opencode/src/tool/patch.ts
+++ b/packages/opencode/src/tool/patch.ts
@@ -6,9 +6,7 @@ import { FileTime } from "../file/time"
 import DESCRIPTION from "./patch.txt"

 const PatchParams = z.object({
-  patchText: z
-    .string()
-    .describe("The full patch text that describes all changes to be made"),
+  patchText: z.string().describe("The full patch text that describes all changes to be made"),
 })

 interface Change {
@@ -42,10 +40,7 @@ function identifyFilesNeeded(patchText: string): string[] {
  const files: string[] = []
  const lines = patchText.split("\n")
  for (const line of lines) {
-    if (
-      line.startsWith("*** Update File:") ||
-      line.startsWith("*** Delete File:")
-    ) {
+    if (line.startsWith("*** Update File:") || line.startsWith("*** Delete File:")) {
      const filePath = line.split(":", 2)[1]?.trim()
      if (filePath) files.push(filePath)
    }
@@ -65,10 +60,7 @@ function identifyFilesAdded(patchText: string): string[] {
  return files
 }

-function textToPatch(
-  patchText: string,
-  _currentFiles: Record<string, string>,
-): [PatchOperation[], number] {
+function textToPatch(patchText: string, _currentFiles: Record<string, string>): [PatchOperation[], number] {
  const operations: PatchOperation[] = []
  const lines = patchText.split("\n")
  let i = 0
@@ -93,11 +85,7 @@ function textToPatch(
          const changes: PatchChange[] = []
          i++

-          while (
-            i < lines.length &&
-            !lines[i].startsWith("@@") &&
-            !lines[i].startsWith("***")
-          ) {
+          while (i < lines.length && !lines[i].startsWith("@@") && !lines[i].startsWith("***")) {
            const changeLine = lines[i]
            if (changeLine.startsWith(" ")) {
              changes.push({ type: "keep", content: changeLine.substring(1) })
@@ -151,10 +139,7 @@ function textToPatch(
  return [operations, fuzz]
 }

-function patchToCommit(
-  operations: PatchOperation[],
-  currentFiles: Record<string, string>,
-): Commit {
+function patchToCommit(operations: PatchOperation[], currentFiles: Record<string, string>): Commit {
  const changes: Record<string, Change> = {}

  for (const op of operations) {
@@ -173,9 +158,7 @@ function patchToCommit(
      const lines = originalContent.split("\n")

      for (const hunk of op.hunks) {
-        const contextIndex = lines.findIndex((line) =>
-          line.includes(hunk.contextLine),
-        )
+        const contextIndex = lines.findIndex((line) => line.includes(hunk.contextLine))
        if (contextIndex === -1) {
          throw new Error(`Context line not found: ${hunk.contextLine}`)
        }
@@ -204,11 +187,7 @@ function patchToCommit(
  return { changes }
 }

-function generateDiff(
-  oldContent: string,
-  newContent: string,
-  filePath: string,
-): [string, number, number] {
+function generateDiff(oldContent: string, newContent: string, filePath: string): [string, number, number] {
  // Mock implementation - would need actual diff generation
  const lines1 = oldContent.split("\n")
  const lines2 = newContent.split("\n")
@@ -296,9 +275,7 @@ export const PatchTool = Tool.define({
    // Process the patch
    const [patch, fuzz] = textToPatch(params.patchText, currentFiles)
    if (fuzz > 3) {
-      throw new Error(
-        `patch contains fuzzy matches (fuzz level: ${fuzz}). Please make your context lines more precise`,
-      )
+      throw new Error(`patch contains fuzzy matches (fuzz level: ${fuzz}). Please make your context lines more precise`)
    }

    // Convert patch to commit
@@ -343,11 +320,7 @@ export const PatchTool = Tool.define({
      const newContent = change.new_content || ""

      // Calculate diff statistics
-      const [, additions, removals] = generateDiff(
-        oldContent,
-        newContent,
-        filePath,
-      )
+      const [, additions, removals] = generateDiff(oldContent, newContent, filePath)
      totalAdditions += additions
      totalRemovals += removals

@@ -358,11 +331,11 @@ export const PatchTool = Tool.define({
    const output = result

    return {
+      title: `${filesToRead.length} files`,
      metadata: {
        changed: changedFiles,
        additions: totalAdditions,
        removals: totalRemovals,
-        title: `${filesToRead.length} files`,
      },
      output,
    }
--- a/packages/opencode/src/tool/read.ts
+++ b/packages/opencode/src/tool/read.ts
@@ -16,14 +16,8 @@ export const ReadTool = Tool.define({
  description: DESCRIPTION,
  parameters: z.object({
    filePath: z.string().describe("The path to the file to read"),
-    offset: z
-      .number()
-      .describe("The line number to start reading from (0-based)")
-      .optional(),
-    limit: z
-      .number()
-      .describe("The number of lines to read (defaults to 2000)")
-      .optional(),
+    offset: z.number().describe("The line number to start reading from (0-based)").optional(),
+    limit: z.number().describe("The number of lines to read (defaults to 2000)").optional(),
  }),
  async execute(params, ctx) {
    let filePath = params.filePath
@@ -40,16 +34,13 @@ export const ReadTool = Tool.define({
      const suggestions = dirEntries
        .filter(
          (entry) =>
-            entry.toLowerCase().includes(base.toLowerCase()) ||
-            base.toLowerCase().includes(entry.toLowerCase()),
+            entry.toLowerCase().includes(base.toLowerCase()) || base.toLowerCase().includes(entry.toLowerCase()),
        )
        .map((entry) => path.join(dir, entry))
        .slice(0, 3)

      if (suggestions.length > 0) {
-        throw new Error(
-          `File not found: ${filePath}\n\nDid you mean one of these?\n${suggestions.join("\n")}`,
-        )
+        throw new Error(`File not found: ${filePath}\n\nDid you mean one of these?\n${suggestions.join("\n")}`)
      }

      throw new Error(`File not found: ${filePath}`)
@@ -57,21 +48,14 @@ export const ReadTool = Tool.define({
    const stats = await file.stat()

    if (stats.size > MAX_READ_SIZE)
-      throw new Error(
-        `File is too large (${stats.size} bytes). Maximum size is ${MAX_READ_SIZE} bytes`,
-      )
+      throw new Error(`File is too large (${stats.size} bytes). Maximum size is ${MAX_READ_SIZE} bytes`)
    const limit = params.limit ?? DEFAULT_READ_LIMIT
    const offset = params.offset || 0
    const isImage = isImageFile(filePath)
-    if (isImage)
-      throw new Error(
-        `This is an image file of type: ${isImage}\nUse a different tool to process images`,
-      )
+    if (isImage) throw new Error(`This is an image file of type: ${isImage}\nUse a different tool to process images`)
    const lines = await file.text().then((text) => text.split("\n"))
    const raw = lines.slice(offset, offset + limit).map((line) => {
-      return line.length > MAX_LINE_LENGTH
-        ? line.substring(0, MAX_LINE_LENGTH) + "..."
-        : line
+      return line.length > MAX_LINE_LENGTH ? line.substring(0, MAX_LINE_LENGTH) + "..." : line
    })
    const content = raw.map((line, index) => {
      return `${(index + offset + 1).toString().padStart(5, "0")}| ${line}`
@@ -82,9 +66,7 @@ export const ReadTool = Tool.define({
    output += content.join("\n")

    if (lines.length > offset + content.length) {
-      output += `\n\n(File has more lines. Use 'offset' parameter to read beyond line ${
-        offset + content.length
-      })`
+      output += `\n\n(File has more lines. Use 'offset' parameter to read beyond line ${offset + content.length})`
    }
    output += "\n</file>"

@@ -93,10 +75,10 @@ export const ReadTool = Tool.define({
    FileTime.read(ctx.sessionID, filePath)

    return {
+      title: path.relative(App.info().path.root, filePath),
      output,
      metadata: {
        preview,
-        title: path.relative(App.info().path.root, filePath),
      },
    }
  },
--- a/packages/opencode/src/tool/task.ts
+++ b/packages/opencode/src/tool/task.ts
@@ -3,41 +3,36 @@ import DESCRIPTION from "./task.txt"
 import { z } from "zod"
 import { Session } from "../session"
 import { Bus } from "../bus"
-import { Message } from "../session/message"
+import { MessageV2 } from "../session/message-v2"

 export const TaskTool = Tool.define({
  id: "task",
  description: DESCRIPTION,
  parameters: z.object({
-    description: z
-      .string()
-      .describe("A short (3-5 words) description of the task"),
+    description: z.string().describe("A short (3-5 words) description of the task"),
    prompt: z.string().describe("The task for the agent to perform"),
  }),
  async execute(params, ctx) {
    const session = await Session.create(ctx.sessionID)
-    const msg = await Session.getMessage(ctx.sessionID, ctx.messageID)
-    const metadata = msg.metadata.assistant!
+    const msg = (await Session.getMessage(ctx.sessionID, ctx.messageID)) as MessageV2.Assistant

-    function summary(input: Message.Info) {
+    function summary(input: MessageV2.Info) {
      const result = []
-
      for (const part of input.parts) {
-        if (part.type === "tool-invocation") {
-          result.push({
-            toolInvocation: part.toolInvocation,
-            metadata: input.metadata.tool[part.toolInvocation.toolCallId],
-          })
+        if (part.type === "tool" && part.state.status === "completed") {
+          result.push(part)
        }
      }
      return result
    }

-    const unsub = Bus.subscribe(Message.Event.Updated, async (evt) => {
-      if (evt.properties.info.metadata.sessionID !== session.id) return
+    const unsub = Bus.subscribe(MessageV2.Event.Updated, async (evt) => {
+      if (evt.properties.info.sessionID !== session.id) return
      ctx.metadata({
        title: params.description,
-        summary: summary(evt.properties.info),
+        metadata: {
+          summary: summary(evt.properties.info),
+        },
      })
    })

@@ -46,8 +41,8 @@ export const TaskTool = Tool.define({
    })
    const result = await Session.chat({
      sessionID: session.id,
-      modelID: metadata.modelID,
-      providerID: metadata.providerID,
+      modelID: msg.modelID,
+      providerID: msg.providerID,
      parts: [
        {
          type: "text",
@@ -57,8 +52,8 @@ export const TaskTool = Tool.define({
    })
    unsub()
    return {
+      title: params.description,
      metadata: {
-        title: params.description,
        summary: summary(result),
      },
      output: result.parts.findLast((x) => x.type === "text")!.text,
--- a/packages/opencode/src/tool/todo.ts
+++ b/packages/opencode/src/tool/todo.ts
@@ -5,12 +5,8 @@ import { App } from "../app/app"

 const TodoInfo = z.object({
  content: z.string().min(1).describe("Brief description of the task"),
-  status: z
-    .enum(["pending", "in_progress", "completed"])
-    .describe("Current status of the task"),
-  priority: z
-    .enum(["high", "medium", "low"])
-    .describe("Priority level of the task"),
+  status: z.enum(["pending", "in_progress", "completed"]).describe("Current status of the task"),
+  priority: z.enum(["high", "medium", "low"]).describe("Priority level of the task"),
  id: z.string().describe("Unique identifier for the todo item"),
 })
 type TodoInfo = z.infer<typeof TodoInfo>
@@ -32,9 +28,9 @@ export const TodoWriteTool = Tool.define({
    const todos = state()
    todos[opts.sessionID] = params.todos
    return {
+      title: `${params.todos.filter((x) => x.status !== "completed").length} todos`,
      output: JSON.stringify(params.todos, null, 2),
      metadata: {
-        title: `${params.todos.filter((x) => x.status !== "completed").length} todos`,
        todos: params.todos,
      },
    }
@@ -48,9 +44,9 @@ export const TodoReadTool = Tool.define({
  async execute(_params, opts) {
    const todos = state()[opts.sessionID] ?? []
    return {
+      title: `${todos.filter((x) => x.status !== "completed").length} todos`,
      metadata: {
        todos,
-        title: `${todos.filter((x) => x.status !== "completed").length} todos`,
      },
      output: JSON.stringify(todos, null, 2),
    }
--- a/packages/opencode/src/tool/tool.ts
+++ b/packages/opencode/src/tool/tool.ts
@@ -2,19 +2,15 @@ import type { StandardSchemaV1 } from "@standard-schema/spec"

 export namespace Tool {
  interface Metadata {
-    title: string
    [key: string]: any
  }
  export type Context<M extends Metadata = Metadata> = {
    sessionID: string
    messageID: string
    abort: AbortSignal
-    metadata(meta: M): void
+    metadata(input: { title?: string; metadata?: M }): void
  }
-  export interface Info<
-    Parameters extends StandardSchemaV1 = StandardSchemaV1,
-    M extends Metadata = Metadata,
-  > {
+  export interface Info<Parameters extends StandardSchemaV1 = StandardSchemaV1, M extends Metadata = Metadata> {
    id: string
    description: string
    parameters: Parameters
@@ -22,15 +18,15 @@ export namespace Tool {
      args: StandardSchemaV1.InferOutput<Parameters>,
      ctx: Context,
    ): Promise<{
+      title: string
      metadata: M
      output: string
    }>
  }

-  export function define<
-    Parameters extends StandardSchemaV1,
-    Result extends Metadata,
-  >(input: Info<Parameters, Result>): Info<Parameters, Result> {
+  export function define<Parameters extends StandardSchemaV1, Result extends Metadata>(
+    input: Info<Parameters, Result>,
+  ): Info<Parameters, Result> {
    return input
  }
 }
--- a/packages/opencode/src/tool/webfetch.ts
+++ b/packages/opencode/src/tool/webfetch.ts
@@ -14,9 +14,7 @@ export const WebFetchTool = Tool.define({
    url: z.string().describe("The URL to fetch content from"),
    format: z
      .enum(["text", "markdown", "html"])
-      .describe(
-        "The format to return the content in (text, markdown, or html)",
-      ),
+      .describe("The format to return the content in (text, markdown, or html)"),
    timeout: z
      .number()
      .min(0)
@@ -26,17 +24,11 @@ export const WebFetchTool = Tool.define({
  }),
  async execute(params, ctx) {
    // Validate URL
-    if (
-      !params.url.startsWith("http://") &&
-      !params.url.startsWith("https://")
-    ) {
+    if (!params.url.startsWith("http://") && !params.url.startsWith("https://")) {
      throw new Error("URL must start with http:// or https://")
    }

-    const timeout = Math.min(
-      (params.timeout ?? DEFAULT_TIMEOUT / 1000) * 1000,
-      MAX_TIMEOUT,
-    )
+    const timeout = Math.min((params.timeout ?? DEFAULT_TIMEOUT / 1000) * 1000, MAX_TIMEOUT)

    const controller = new AbortController()
    const timeoutId = setTimeout(() => controller.abort(), timeout)
@@ -46,8 +38,7 @@ export const WebFetchTool = Tool.define({
      headers: {
        "User-Agent":
          "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
-        Accept:
-          "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8",
+        Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8",
        "Accept-Language": "en-US,en;q=0.9",
      },
    })
@@ -79,16 +70,14 @@ export const WebFetchTool = Tool.define({
          const text = await extractTextFromHTML(content)
          return {
            output: text,
-            metadata: {
-              title,
-            },
+            title,
+            metadata: {},
          }
        }
        return {
          output: content,
-          metadata: {
-            title,
-          },
+          title,
+          metadata: {},
        }

      case "markdown":
@@ -96,32 +85,28 @@ export const WebFetchTool = Tool.define({
          const markdown = convertHTMLToMarkdown(content)
          return {
            output: markdown,
-            metadata: {
-              title,
-            },
+            title,
+            metadata: {},
          }
        }
        return {
          output: "```\n" + content + "\n```",
-          metadata: {
-            title,
-          },
+          title,
+          metadata: {},
        }

      case "html":
        return {
          output: content,
-          metadata: {
-            title,
-          },
+          title,
+          metadata: {},
        }

      default:
        return {
          output: content,
-          metadata: {
-            title,
-          },
+          title,
+          metadata: {},
        }
    }
  },
@@ -143,16 +128,7 @@ async function extractTextFromHTML(html: string) {
    .on("*", {
      element(element) {
        // Reset skip flag when entering other elements
-        if (
-          ![
-            "script",
-            "style",
-            "noscript",
-            "iframe",
-            "object",
-            "embed",
-          ].includes(element.tagName)
-        ) {
+        if (!["script", "style", "noscript", "iframe", "object", "embed"].includes(element.tagName)) {
          skipContent = false
        }
      },
--- a/packages/opencode/src/tool/write.ts
+++ b/packages/opencode/src/tool/write.ts
@@ -13,18 +13,12 @@ export const WriteTool = Tool.define({
  id: "write",
  description: DESCRIPTION,
  parameters: z.object({
-    filePath: z
-      .string()
-      .describe(
-        "The absolute path to the file to write (must be absolute, not relative)",
-      ),
+    filePath: z.string().describe("The absolute path to the file to write (must be absolute, not relative)"),
    content: z.string().describe("The content to write to the file"),
  }),
  async execute(params, ctx) {
    const app = App.info()
-    const filepath = path.isAbsolute(params.filePath)
-      ? params.filePath
-      : path.join(app.path.cwd, params.filePath)
+    const filepath = path.isAbsolute(params.filePath) ? params.filePath : path.join(app.path.cwd, params.filePath)

    const file = Bun.file(filepath)
    const exists = await file.exists()
@@ -33,9 +27,7 @@ export const WriteTool = Tool.define({
    await Permission.ask({
      id: "write",
      sessionID: ctx.sessionID,
-      title: exists
-        ? "Overwrite this file: " + filepath
-        : "Create new file: " + filepath,
+      title: exists ? "Overwrite this file: " + filepath : "Create new file: " + filepath,
      metadata: {
        filePath: filepath,
        content: params.content,
@@ -62,11 +54,11 @@ export const WriteTool = Tool.define({
    }

    return {
+      title: path.relative(app.path.root, filepath),
      metadata: {
        diagnostics,
        filepath,
        exists: exists,
-        title: path.relative(app.path.root, filepath),
      },
      output,
    }