@comfanion/usethis_todo 0.1.16-dev.12 → 0.1.16-dev.13

package/index.ts

@@ -2,7 +2,7 @@ import type { Plugin } from "@opencode-ai/plugin"
 import path from "path"
 import fs from "fs/promises"
 
-import { write, read, read_five, read_by_id, setNativeStorageBase, readTodos } from "./tools"
+import { write, read, read_five, read_by_id, setNativeStorageBase, readTodos, setClientStorage } from "./tools"
 
 interface TodoPruneState {
   lastToolCallId: string | null
@@ -11,6 +11,9 @@ interface TodoPruneState {
 const pruneStates = new Map<string, TodoPruneState>()
 
 const UsethisTodoPlugin: Plugin = async ({ directory, client }) => {
+  // Set client storage API for native Storage operations
+  setClientStorage(client)
+
   // Resolve the authoritative state path from OpenCode server (non-blocking).
   // Must NOT await — server may block until plugin init completes → deadlock.
   client.path.get().then((pathInfo: any) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comfanion/usethis_todo",
-  "version": "0.1.16-dev.12",
+  "version": "0.1.16-dev.13",
   "description": "OpenCode plugin: enhanced TODO tools (dual storage + dependency graph)",
   "type": "module",
   "main": "./index.ts",

package/tools.ts

@@ -8,8 +8,8 @@
  *   usethis_todo_read_by_id({ id })       - read task by id with its blockers
  *
  * Storage:
- *   Unified: Native OpenCode storage (TUI compatible)
- *   Path resolved via client.path.get()
+ *   Dual: Native OpenCode storage (via client.storage) + Local file backup (.opencode/session-todo/)
+ *   Native storage uses await client.storage.write(["todo", sessionID], todos)
  *
  * Features:
  *   - Stores FULL enhanced schema (blockedBy, priority, etc) in the native file
@@ -23,6 +23,44 @@ import path from "path"
 import os from "os"
 import fs from "fs/promises"
 
+// ============================================================================
+// Client Storage Wrapper
+// ============================================================================
+
+let _clientStorage: any = null
+
+/**
+ * Set the OpenCode client storage API.
+ * Called during plugin initialization.
+ */
+export function setClientStorage(client: any): void {
+  _clientStorage = client
+}
+
+/**
+ * Write to native OpenCode storage.
+ */
+async function writeNativeStorage(key: string[], value: any): Promise<void> {
+  if (!_clientStorage?.write) return
+  try {
+    await _clientStorage.write(key, value)
+  } catch {
+    // ignore - native storage may not be available
+  }
+}
+
+/**
+ * Read from native OpenCode storage.
+ */
+async function readNativeStorage<T>(key: string[]): Promise<T | null> {
+  if (!_clientStorage?.read) return null
+  try {
+    return await _clientStorage.read(key)
+  } catch {
+    return null
+  }
+}
+
 // ============================================================================
 // Types
 // ============================================================================
@@ -195,12 +233,30 @@ function toNativePriority(priority: string): string {
 // ============================================================================
 
 export async function readTodos(sid: string, directory?: string): Promise<Todo[]> {
+  // 1. Try Native OpenCode Storage first (primary)
+  try {
+    const nativeData = await readNativeStorage<Todo[]>(["todo", sid])
+    if (Array.isArray(nativeData) && nativeData.length > 0) {
+      await logAction(directory || "", "debug", `Reading from native storage: todo/${sid}`)
+      return nativeData.map((t: any) => {
+        // Restore "ready" status if it was saved
+        const realStatus = t.usethisStatus || t.status
+        const realPriority = t.usethisPriority || t.priority
+        return normalizeTodo({ ...t, status: realStatus, priority: realPriority })
+      })
+    }
+  } catch (e) {
+    await logAction(directory || "", "debug", `Native storage read failed, falling back to files: ${String(e)}`)
+  }
+
+  // 2. Fallback to file storage
   try {
     const storagePaths = await getStoragePaths(sid)
     for (const storagePath of storagePaths) {
       try {
         const raw = JSON.parse(await fs.readFile(storagePath, "utf-8"))
         if (Array.isArray(raw)) {
+          await logAction(directory || "", "debug", `Reading from global file: ${storagePath}`)
           return raw.map((t: any) => {
             // Restore "ready" status if it was saved
             const realStatus = t.usethisStatus || t.status
@@ -224,12 +280,12 @@ function getEnhancedPath(sid: string, directory?: string): string {
 async function writeTodos(todos: Todo[], sid: string, directory?: string): Promise<void> {
   const storagePaths = await getStoragePaths(sid)
   const enhancedPath = getEnhancedPath(sid, directory)
-  
+
   const storageTodos = todos.map(t => {
     // Status is already native — map "ready" to "in_progress" for native storage
     const nativeStatus = t.status === "ready" ? "in_progress" : t.status
     const nativePriority = toNativePriority(t.priority)
-    
+
     return {
       ...t,
       status: nativeStatus,
@@ -242,7 +298,15 @@ async function writeTodos(todos: Todo[], sid: string, directory?: string): Promi
 
   const json = JSON.stringify(storageTodos, null, 2)
 
-  // 1. Write to Global Storages (for Sidebar)
+  // 1. Write to Native OpenCode Storage (primary)
+  try {
+    await writeNativeStorage(["todo", sid], storageTodos)
+    await logAction(directory || "", "debug", `Writing to native storage: todo/${sid}`)
+  } catch (e) {
+    await logAction(directory || "", "error", `Native storage write failed: ${String(e)}`)
+  }
+
+  // 2. Write to Global Storages (for Sidebar - fallback)
   await Promise.allSettled(
     storagePaths.map(async (p) => {
       try {
@@ -255,7 +319,7 @@ async function writeTodos(todos: Todo[], sid: string, directory?: string): Promi
     })
   )
 
-  // 2. Write to Local Storage (for User visibility/Git)
+  // 3. Write to Local Storage (for User visibility/Git - backup)
   try {
     await fs.mkdir(path.dirname(enhancedPath), { recursive: true })
     await fs.writeFile(enhancedPath, json, "utf-8")