echoes-vault-opencode 2.0.0 → 2.0.1

package/index.ts

@@ -3,7 +3,7 @@ import { tool } from "@opencode-ai/plugin"
 import * as fs from "node:fs/promises"
 import * as path from "node:path"
 import { fileURLToPath } from "node:url"
-import { runEchoes } from "./runtime.ts"
+import { resolveEchoesWorkspace, runEchoes } from "./runtime.ts"
 
 const PLUGIN_ROOT = path.dirname(fileURLToPath(import.meta.url))
 
@@ -48,7 +48,8 @@ const OpenCodeEchoes: Plugin = async ({ directory, worktree }) => {
 
   // Lifecycle tools are one-shot capabilities granted only by the matching explicit slash command.
   const authorizedStatusActions = new Map<string, StatusAction>()
-  const fallbackWorkspace = worktree || directory
+  const workspaceFor = (contextDirectory?: string, contextWorktree?: string): string =>
+    resolveEchoesWorkspace(contextDirectory, contextWorktree, directory, worktree)
 
   const requireAuthorization = (sessionID: string, expected: StatusAction): void => {
     if (authorizedStatusActions.get(sessionID) !== expected) {
@@ -81,7 +82,7 @@ const OpenCodeEchoes: Plugin = async ({ directory, worktree }) => {
         async execute(_args, ctx) {
           requireAuthorization(ctx.sessionID, "init")
           const output = displayOutput(
-            await runEchoes(ctx.worktree || ctx.directory || fallbackWorkspace, "init", {
+            await runEchoes(workspaceFor(ctx.directory, ctx.worktree), "init", {
               signal: ctx.abort,
             }),
           )
@@ -97,7 +98,7 @@ const OpenCodeEchoes: Plugin = async ({ directory, worktree }) => {
         async execute(_args, ctx) {
           requireAuthorization(ctx.sessionID, "start")
           const output = displayOutput(
-            await runEchoes(ctx.worktree || ctx.directory || fallbackWorkspace, "start", {
+            await runEchoes(workspaceFor(ctx.directory, ctx.worktree), "start", {
               args: ["--recent", "3"],
               signal: ctx.abort,
             }),
@@ -113,7 +114,7 @@ const OpenCodeEchoes: Plugin = async ({ directory, worktree }) => {
         args: {},
         async execute(_args, ctx) {
           return displayOutput(
-            await runEchoes(ctx.worktree || ctx.directory || fallbackWorkspace, "status", {
+            await runEchoes(workspaceFor(ctx.directory, ctx.worktree), "status", {
               args: ["--format", "card"],
               signal: ctx.abort,
             }),
@@ -148,7 +149,7 @@ const OpenCodeEchoes: Plugin = async ({ directory, worktree }) => {
         async execute(args, ctx) {
           requireAuthorization(ctx.sessionID, "end")
           const output = displayOutput(
-            await runEchoes(ctx.worktree || ctx.directory || fallbackWorkspace, "end", {
+            await runEchoes(workspaceFor(ctx.directory, ctx.worktree), "end", {
               args: ["--confirm-explicit-user-end", "--payload", "-"],
               payload: {
                 dailySummary: args.dailySummary,
@@ -173,7 +174,7 @@ const OpenCodeEchoes: Plugin = async ({ directory, worktree }) => {
         },
         async execute(args, ctx) {
           return displayOutput(
-            await runEchoes(ctx.worktree || ctx.directory || fallbackWorkspace, "append", {
+            await runEchoes(workspaceFor(ctx.directory, ctx.worktree), "append", {
               args: ["--payload", "-"],
               payload: { entry: args.logEntry },
               signal: ctx.abort,
@@ -193,7 +194,7 @@ const OpenCodeEchoes: Plugin = async ({ directory, worktree }) => {
           const runtimeArgs = [args.query]
           if (args.limit !== undefined) runtimeArgs.push("--limit", String(args.limit))
           return displayOutput(
-            await runEchoes(ctx.worktree || ctx.directory || fallbackWorkspace, "search", {
+            await runEchoes(workspaceFor(ctx.directory, ctx.worktree), "search", {
               args: runtimeArgs,
               signal: ctx.abort,
             }),
@@ -209,7 +210,7 @@ const OpenCodeEchoes: Plugin = async ({ directory, worktree }) => {
         },
         async execute(args, ctx) {
           return displayOutput(
-            await runEchoes(ctx.worktree || ctx.directory || fallbackWorkspace, "hash", {
+            await runEchoes(workspaceFor(ctx.directory, ctx.worktree), "hash", {
               args: [args.filename],
               signal: ctx.abort,
             }),
@@ -233,7 +234,7 @@ const OpenCodeEchoes: Plugin = async ({ directory, worktree }) => {
         },
         async execute(args, ctx) {
           return displayOutput(
-            await runEchoes(ctx.worktree || ctx.directory || fallbackWorkspace, "upsert", {
+            await runEchoes(workspaceFor(ctx.directory, ctx.worktree), "upsert", {
               args: ["--payload", "-"],
               payload: {
                 filename: args.filename,
@@ -252,7 +253,7 @@ const OpenCodeEchoes: Plugin = async ({ directory, worktree }) => {
         args: {},
         async execute(_args, ctx) {
           return displayOutput(
-            await runEchoes(ctx.worktree || ctx.directory || fallbackWorkspace, "hydrate", {
+            await runEchoes(workspaceFor(ctx.directory, ctx.worktree), "hydrate", {
               signal: ctx.abort,
             }),
           )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "echoes-vault-opencode",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "OpenCode adapter for the agent-neutral EchoesVault Protocol and repository-local Markdown memory runtime.",
   "type": "module",
   "main": "index.ts",

package/runtime.ts

@@ -45,6 +45,24 @@ export class EchoesRuntimeError extends Error {
   }
 }
 
+/**
+ * Prefer OpenCode's current session directory over its worktree hint. Some global-plugin launches
+ * report `/` as the worktree even when the session directory points at the real project.
+ */
+export const resolveEchoesWorkspace = (...candidates: Array<string | undefined>): string => {
+  for (const candidate of candidates) {
+    if (!candidate?.trim()) continue
+    const resolved = path.resolve(candidate)
+    if (resolved !== path.parse(resolved).root) return resolved
+  }
+  throw new EchoesRuntimeError(
+    "OpenCode did not provide a safe project directory. Refusing to use the filesystem root as the EchoesVault workspace.",
+    null,
+    "",
+    "",
+  )
+}
+
 let adapterVersionPromise: Promise<string> | undefined
 
 export const getAdapterVersion = async (): Promise<string> => {
@@ -81,6 +99,7 @@ export const runEchoes = async (
   command: EchoesCommand,
   options: RunEchoesOptions = {},
 ): Promise<string> => {
+  const resolvedWorkspace = resolveEchoesWorkspace(workspace)
   const adapterVersion = options.adapterVersion ?? (await getAdapterVersion())
   const launcher = options.launcherPath ?? BUNDLED_RUNTIME
   const commandArgs = options.args ?? []
@@ -90,7 +109,7 @@ export const runEchoes = async (
   const argv = [
     launcher,
     "--workspace",
-    workspace,
+    resolvedWorkspace,
     "--agent",
     "opencode",
     "--adapter-version",
@@ -101,7 +120,7 @@ export const runEchoes = async (
 
   return await new Promise<string>((resolve, reject) => {
     const child = spawn(python, argv, {
-      cwd: workspace,
+      cwd: resolvedWorkspace,
       stdio: [payload === undefined ? "ignore" : "pipe", "pipe", "pipe"],
     })
     const stdout: Buffer[] = []

package/tui.tsx

@@ -50,7 +50,7 @@ const readSnapshot = (workspace: string): VaultSnapshot => ({
 
 const tui: TuiPlugin = async (api, _options, meta) => {
   const theme = api.theme.current
-  const workspace = api.state.path.worktree || api.state.path.directory || process.cwd()
+  const workspace = api.state.path.directory || api.state.path.worktree || process.cwd()
 
   api.slots.register({
     slots: {