Merge pull request #22 from hawkff/upstream/issue-11-workspace-tool-context

Fix workspace-aware tool execution for Cursor agents

Author: Nomadcxx

src/plugin.ts

@@ -3,7 +3,7 @@ import { tool } from "@opencode-ai/plugin";
 import type { Auth } from "@opencode-ai/sdk";
 import { mkdir } from "fs/promises";
 import { homedir } from "os";
-import { join } from "path";
+import { isAbsolute, join, resolve } from "path";
 import { ToolMapper, type ToolUpdate } from "./acp/tools.js";
 import { startCursorOAuth } from "./auth";
 import { LineBuffer } from "./streaming/line-buffer.js";
@@ -1321,13 +1321,71 @@ function jsonSchemaToZod(jsonSchema: any): any {
   return zodShape;
 }
 
+function resolveToolContextBaseDir(context: any): string | null {
+  const candidates = [context?.worktree, context?.directory];
+  for (const candidate of candidates) {
+    if (typeof candidate === "string" && candidate.trim().length > 0) {
+      return candidate;
+    }
+  }
+  return null;
+}
+
+function toAbsoluteWithBase(value: unknown, baseDir: string): unknown {
+  if (typeof value !== "string") {
+    return value;
+  }
+  const trimmed = value.trim();
+  if (trimmed.length === 0 || isAbsolute(trimmed)) {
+    return value;
+  }
+  return resolve(baseDir, trimmed);
+}
+
+function applyToolContextDefaults(
+  toolName: string,
+  rawArgs: Record<string, unknown>,
+  context: any,
+): Record<string, unknown> {
+  const baseDir = resolveToolContextBaseDir(context);
+  if (!baseDir) {
+    return rawArgs;
+  }
+
+  const args: Record<string, unknown> = { ...rawArgs };
+
+  for (const key of [
+    "path",
+    "filePath",
+    "targetPath",
+    "directory",
+    "dir",
+    "folder",
+    "targetDirectory",
+    "targetFile",
+    "cwd",
+    "workdir",
+  ]) {
+    args[key] = toAbsoluteWithBase(args[key], baseDir);
+  }
+
+  if ((toolName === "bash" || toolName === "shell") && args.cwd === undefined && args.workdir === undefined) {
+    args.cwd = baseDir;
+  }
+
+  if ((toolName === "grep" || toolName === "glob" || toolName === "ls") && args.path === undefined) {
+    args.path = baseDir;
+  }
+
+  return args;
+}
+
 /**
  * Build tool hook entries from local registry
  */
 function buildToolHookEntries(registry: CoreRegistry): Record<string, any> {
   const entries: Record<string, any> = {};
   const tools = registry.list();
-
   for (const t of tools) {
     const handler = registry.getHandler(t.name);
     if (!handler) continue;
@@ -1339,7 +1397,8 @@ function buildToolHookEntries(registry: CoreRegistry): Record<string, any> {
       args: zodArgs,
       async execute(args: any, context: any) {
         try {
-          return await handler(args);
+          const normalizedArgs = applyToolContextDefaults(t.name, args, context);
+          return await handler(normalizedArgs);
         } catch (error: any) {
           log.warn("Tool hook execution failed", { tool: t.name, error: String(error?.message || error) });
           throw error;

tests/unit/plugin-tools-hook.test.ts

@@ -1,22 +1,41 @@
 import { describe, it, expect } from "bun:test";
+import { mkdtempSync, readFileSync, realpathSync, rmSync } from "fs";
+import { tmpdir } from "os";
+import { join } from "path";
 import { CursorPlugin } from "../../src/plugin";
 import type { PluginInput } from "@opencode-ai/plugin";
 
+function createMockInput(directory: string): PluginInput {
+  return {
+    directory,
+    worktree: directory,
+    serverUrl: new URL("http://localhost:8080"),
+    client: {
+      tool: {
+        list: async () => [],
+      },
+    } as any,
+    project: {} as any,
+    $: {} as any,
+  };
+}
+
+function createToolContext(directory: string): any {
+  return {
+    sessionID: "test-session",
+    messageID: "test-message",
+    agent: "test-agent",
+    directory,
+    worktree: directory,
+    abort: new AbortController().signal,
+    metadata: () => {},
+    ask: async () => {},
+  };
+}
+
 describe("Plugin tool hook", () => {
   it("should register default tools via tool hook", async () => {
-    // Mock PluginInput
-    const mockInput: PluginInput = {
-      directory: "/test/dir",
-      worktree: "/test/dir",
-      serverUrl: new URL("http://localhost:8080"),
-      client: {
-        tool: {
-          list: async () => [],
-        },
-      } as any,
-      project: {} as any,
-      $: {} as any,
-    };
+    const mockInput = createMockInput("/test/dir");
 
     // Initialize plugin
     const hooks = await CursorPlugin(mockInput);
@@ -42,4 +61,41 @@ describe("Plugin tool hook", () => {
     expect(bashTool?.args).toBeDefined();
     expect(typeof bashTool?.execute).toBe("function");
   });
+
+  it("resolves relative write paths against context directory", async () => {
+    const projectDir = mkdtempSync(join(tmpdir(), "plugin-hook-write-"));
+    try {
+      const hooks = await CursorPlugin(createMockInput(projectDir));
+      const out = await hooks.tool?.write?.execute(
+        {
+          path: "nested/output.txt",
+          content: "hello from context",
+        },
+        createToolContext(projectDir),
+      );
+
+      const expectedPath = join(projectDir, "nested/output.txt");
+      expect(readFileSync(expectedPath, "utf-8")).toBe("hello from context");
+      expect(out).toContain(expectedPath);
+    } finally {
+      rmSync(projectDir, { recursive: true, force: true });
+    }
+  });
+
+  it("defaults bash cwd to context directory", async () => {
+    const projectDir = mkdtempSync(join(tmpdir(), "plugin-hook-bash-"));
+    try {
+      const hooks = await CursorPlugin(createMockInput(projectDir));
+      const out = await hooks.tool?.bash?.execute(
+        {
+          command: "pwd",
+        },
+        createToolContext(projectDir),
+      );
+
+      expect(realpathSync((out || "").trim())).toBe(realpathSync(projectDir));
+    } finally {
+      rmSync(projectDir, { recursive: true, force: true });
+    }
+  });
 });