diff --git a/packages/opencode/src/tool/todo.ts b/packages/opencode/src/tool/todo.ts
index 9b4efddb..63180eb6 100644
--- a/packages/opencode/src/tool/todo.ts
+++ b/packages/opencode/src/tool/todo.ts
@@ -1,31 +1,18 @@
 import z from "zod/v4"
 import { Tool } from "./tool"
 import DESCRIPTION_WRITE from "./todowrite.txt"
-import { Instance } from "../project/instance"
-
-const TodoInfo = z.object({
-  content: z.string().describe("Brief description of the task"),
-  status: z.string().describe("Current status of the task: pending, in_progress, completed, cancelled"),
-  priority: z.string().describe("Priority level of the task: high, medium, low"),
-  id: z.string().describe("Unique identifier for the todo item"),
-})
-type TodoInfo = z.infer<typeof TodoInfo>
-
-const state = Instance.state(() => {
-  const todos: {
-    [sessionId: string]: TodoInfo[]
-  } = {}
-  return todos
-})
+import { Todo } from "../session/todo"
 
 export const TodoWriteTool = Tool.define("todowrite", {
   description: DESCRIPTION_WRITE,
   parameters: z.object({
-    todos: z.array(TodoInfo).describe("The updated todo list"),
+    todos: z.array(Todo.Info).describe("The updated todo list"),
   }),
   async execute(params, opts) {
-    const todos = state()
-    todos[opts.sessionID] = params.todos
+    await Todo.update({
+      sessionID: opts.sessionID,
+      todos: params.todos,
+    })
     return {
       title: `${params.todos.filter((x) => x.status !== "completed").length} todos`,
       output: JSON.stringify(params.todos, null, 2),
@@ -40,7 +27,7 @@ export const TodoReadTool = Tool.define("todoread", {
   description: "Use this tool to read your todo list",
   parameters: z.object({}),
   async execute(_params, opts) {
-    const todos = state()[opts.sessionID] ?? []
+    const todos = await Todo.get(opts.sessionID)
     return {
       title: `${todos.filter((x) => x.status !== "completed").length} todos`,
       metadata: {