oh-my-opencode 2.0.0 → 2.0.1

package/dist/index.js

@@ -6989,6 +6989,7 @@ function createBackgroundNotificationHook(manager) {
 // src/hooks/auto-update-checker/checker.ts
 import * as fs4 from "fs";
 import * as path4 from "path";
+import { fileURLToPath } from "url";
 
 // src/hooks/auto-update-checker/constants.ts
 import * as path3 from "path";
@@ -7018,6 +7019,9 @@ var USER_OPENCODE_CONFIG = path3.join(USER_CONFIG_DIR, "opencode", "opencode.jso
 function isLocalDevMode(directory) {
   return getLocalDevPath(directory) !== null;
 }
+function stripJsonComments(json) {
+  return json.replace(/^\s*\/\/.*$/gm, "").replace(/,(\s*[}\]])/g, "$1");
+}
 function getLocalDevPath(directory) {
   const projectConfig = path4.join(directory, ".opencode", "opencode.json");
   for (const configPath of [projectConfig, USER_OPENCODE_CONFIG]) {
@@ -7025,7 +7029,7 @@ function getLocalDevPath(directory) {
       if (!fs4.existsSync(configPath))
         continue;
       const content = fs4.readFileSync(configPath, "utf-8");
-      const config = JSON.parse(content);
+      const config = JSON.parse(stripJsonComments(content));
       const plugins = config.plugin ?? [];
       for (const entry of plugins) {
         if (entry.startsWith("file://") && entry.includes(PACKAGE_NAME)) {
@@ -7038,13 +7042,35 @@ function getLocalDevPath(directory) {
   }
   return null;
 }
+function findPackageJsonUp(startPath) {
+  try {
+    const stat = fs4.statSync(startPath);
+    let dir = stat.isDirectory() ? startPath : path4.dirname(startPath);
+    for (let i = 0;i < 10; i++) {
+      const pkgPath = path4.join(dir, "package.json");
+      if (fs4.existsSync(pkgPath)) {
+        try {
+          const content = fs4.readFileSync(pkgPath, "utf-8");
+          const pkg = JSON.parse(content);
+          if (pkg.name === PACKAGE_NAME)
+            return pkgPath;
+        } catch {}
+      }
+      const parent = path4.dirname(dir);
+      if (parent === dir)
+        break;
+      dir = parent;
+    }
+  } catch {}
+  return null;
+}
 function getLocalDevVersion(directory) {
   const localPath = getLocalDevPath(directory);
   if (!localPath)
     return null;
   try {
-    const pkgPath = path4.join(localPath, "package.json");
-    if (!fs4.existsSync(pkgPath))
+    const pkgPath = findPackageJsonUp(localPath);
+    if (!pkgPath)
       return null;
     const content = fs4.readFileSync(pkgPath, "utf-8");
     const pkg = JSON.parse(content);
@@ -7060,7 +7086,7 @@ function findPluginEntry(directory) {
       if (!fs4.existsSync(configPath))
         continue;
       const content = fs4.readFileSync(configPath, "utf-8");
-      const config = JSON.parse(content);
+      const config = JSON.parse(stripJsonComments(content));
       const plugins = config.plugin ?? [];
       for (const entry of plugins) {
         if (entry === PACKAGE_NAME) {
@@ -7088,14 +7114,17 @@ function getCachedVersion() {
     }
   } catch {}
   try {
-    const pkgPath = path4.resolve(import.meta.dirname, "..", "..", "..", "package.json");
-    if (fs4.existsSync(pkgPath)) {
+    const currentDir = path4.dirname(fileURLToPath(import.meta.url));
+    const pkgPath = findPackageJsonUp(currentDir);
+    if (pkgPath) {
       const content = fs4.readFileSync(pkgPath, "utf-8");
       const pkg = JSON.parse(content);
       if (pkg.version)
         return pkg.version;
     }
-  } catch {}
+  } catch (err) {
+    log("[auto-update-checker] Failed to resolve version from current directory:", err);
+  }
   return null;
 }
 async function getLatestVersion() {
@@ -7761,8 +7790,8 @@ function startCallbackServer(timeoutMs = 5 * 60 * 1000) {
   });
   const actualPort = server.port;
   const waitForCallback = () => {
-    return new Promise((resolve6, reject) => {
-      resolveCallback = resolve6;
+    return new Promise((resolve5, reject) => {
+      resolveCallback = resolve5;
       rejectCallback = reject;
       timeoutId = setTimeout(() => {
         cleanup();
@@ -8712,7 +8741,7 @@ async function attemptFetch(options) {
             if (attempt < maxPermissionRetries) {
               const delay = calculateRetryDelay2(attempt);
               debugLog6(`[RETRY] GCP permission error, retry ${attempt + 1}/${maxPermissionRetries} after ${delay}ms`);
-              await new Promise((resolve6) => setTimeout(resolve6, delay));
+              await new Promise((resolve5) => setTimeout(resolve5, delay));
               continue;
             }
             debugLog6(`[RETRY] GCP permission error, max retries exceeded`);
@@ -9816,7 +9845,7 @@ function getAllServers() {
 // src/tools/lsp/client.ts
 var {spawn: spawn4 } = globalThis.Bun;
 import { readFileSync as readFileSync17 } from "fs";
-import { extname, resolve as resolve6 } from "path";
+import { extname, resolve as resolve5 } from "path";
 class LSPServerManager {
   static instance;
   clients = new Map;
@@ -9966,7 +9995,7 @@ class LSPClient {
     }
     this.startReading();
     this.startStderrReading();
-    await new Promise((resolve7) => setTimeout(resolve7, 100));
+    await new Promise((resolve6) => setTimeout(resolve6, 100));
     if (this.proc.exitCode !== null) {
       const stderr = this.stderrBuffer.join(`
 `);
@@ -10103,8 +10132,8 @@ stderr: ${stderr}` : ""));
 \r
 `;
     this.proc.stdin.write(header + msg);
-    return new Promise((resolve7, reject) => {
-      this.pending.set(id, { resolve: resolve7, reject });
+    return new Promise((resolve6, reject) => {
+      this.pending.set(id, { resolve: resolve6, reject });
       setTimeout(() => {
         if (this.pending.has(id)) {
           this.pending.delete(id);
@@ -10212,7 +10241,7 @@ ${msg}`);
     await new Promise((r) => setTimeout(r, 300));
   }
   async openFile(filePath) {
-    const absPath = resolve6(filePath);
+    const absPath = resolve5(filePath);
     if (this.openedFiles.has(absPath))
       return;
     const text = readFileSync17(absPath, "utf-8");
@@ -10230,7 +10259,7 @@ ${msg}`);
     await new Promise((r) => setTimeout(r, 1000));
   }
   async hover(filePath, line, character) {
-    const absPath = resolve6(filePath);
+    const absPath = resolve5(filePath);
     await this.openFile(absPath);
     return this.send("textDocument/hover", {
       textDocument: { uri: `file://${absPath}` },
@@ -10238,7 +10267,7 @@ ${msg}`);
     });
   }
   async definition(filePath, line, character) {
-    const absPath = resolve6(filePath);
+    const absPath = resolve5(filePath);
     await this.openFile(absPath);
     return this.send("textDocument/definition", {
       textDocument: { uri: `file://${absPath}` },
@@ -10246,7 +10275,7 @@ ${msg}`);
     });
   }
   async references(filePath, line, character, includeDeclaration = true) {
-    const absPath = resolve6(filePath);
+    const absPath = resolve5(filePath);
     await this.openFile(absPath);
     return this.send("textDocument/references", {
       textDocument: { uri: `file://${absPath}` },
@@ -10255,7 +10284,7 @@ ${msg}`);
     });
   }
   async documentSymbols(filePath) {
-    const absPath = resolve6(filePath);
+    const absPath = resolve5(filePath);
     await this.openFile(absPath);
     return this.send("textDocument/documentSymbol", {
       textDocument: { uri: `file://${absPath}` }
@@ -10265,7 +10294,7 @@ ${msg}`);
     return this.send("workspace/symbol", { query });
   }
   async diagnostics(filePath) {
-    const absPath = resolve6(filePath);
+    const absPath = resolve5(filePath);
     const uri = `file://${absPath}`;
     await this.openFile(absPath);
     await new Promise((r) => setTimeout(r, 500));
@@ -10280,7 +10309,7 @@ ${msg}`);
     return { items: this.diagnosticsStore.get(uri) ?? [] };
   }
   async prepareRename(filePath, line, character) {
-    const absPath = resolve6(filePath);
+    const absPath = resolve5(filePath);
     await this.openFile(absPath);
     return this.send("textDocument/prepareRename", {
       textDocument: { uri: `file://${absPath}` },
@@ -10288,7 +10317,7 @@ ${msg}`);
     });
   }
   async rename(filePath, line, character, newName) {
-    const absPath = resolve6(filePath);
+    const absPath = resolve5(filePath);
     await this.openFile(absPath);
     return this.send("textDocument/rename", {
       textDocument: { uri: `file://${absPath}` },
@@ -10297,7 +10326,7 @@ ${msg}`);
     });
   }
   async codeAction(filePath, startLine, startChar, endLine, endChar, only) {
-    const absPath = resolve6(filePath);
+    const absPath = resolve5(filePath);
     await this.openFile(absPath);
     return this.send("textDocument/codeAction", {
       textDocument: { uri: `file://${absPath}` },
@@ -10329,10 +10358,10 @@ ${msg}`);
   }
 }
 // src/tools/lsp/utils.ts
-import { extname as extname2, resolve as resolve7 } from "path";
+import { extname as extname2, resolve as resolve6 } from "path";
 import { existsSync as existsSync25, readFileSync as readFileSync18, writeFileSync as writeFileSync9 } from "fs";
 function findWorkspaceRoot(filePath) {
-  let dir = resolve7(filePath);
+  let dir = resolve6(filePath);
   if (!existsSync25(dir) || !__require("fs").statSync(dir).isDirectory()) {
     dir = __require("path").dirname(dir);
   }
@@ -10345,10 +10374,10 @@ function findWorkspaceRoot(filePath) {
     }
     dir = __require("path").dirname(dir);
   }
-  return __require("path").dirname(resolve7(filePath));
+  return __require("path").dirname(resolve6(filePath));
 }
 async function withLspClient(filePath, fn) {
-  const absPath = resolve7(filePath);
+  const absPath = resolve6(filePath);
   const ext = extname2(absPath);
   const server = findServerForExtension(ext);
   if (!server) {
@@ -23264,8 +23293,8 @@ var lsp_code_action_resolve = tool({
 });
 // src/tools/ast-grep/constants.ts
 import { createRequire as createRequire4 } from "module";
-import { dirname as dirname5, join as join33 } from "path";
-import { existsSync as existsSync27, statSync as statSync3 } from "fs";
+import { dirname as dirname6, join as join33 } from "path";
+import { existsSync as existsSync27, statSync as statSync4 } from "fs";
 
 // src/tools/ast-grep/downloader.ts
 var {spawn: spawn5 } = globalThis.Bun;
@@ -23379,7 +23408,7 @@ async function ensureAstGrepBinary() {
 // src/tools/ast-grep/constants.ts
 function isValidBinary(filePath) {
   try {
-    return statSync3(filePath).size > 1e4;
+    return statSync4(filePath).size > 1e4;
   } catch {
     return false;
   }
@@ -23407,7 +23436,7 @@ function findSgCliPathSync() {
   try {
     const require2 = createRequire4(import.meta.url);
     const cliPkgPath = require2.resolve("@ast-grep/cli/package.json");
-    const cliDir = dirname5(cliPkgPath);
+    const cliDir = dirname6(cliPkgPath);
     const sgPath = join33(cliDir, binaryName);
     if (existsSync27(sgPath) && isValidBinary(sgPath)) {
       return sgPath;
@@ -23418,7 +23447,7 @@ function findSgCliPathSync() {
     try {
       const require2 = createRequire4(import.meta.url);
       const pkgPath = require2.resolve(`${platformPkg}/package.json`);
-      const pkgDir = dirname5(pkgPath);
+      const pkgDir = dirname6(pkgPath);
       const astGrepName = process.platform === "win32" ? "ast-grep.exe" : "ast-grep";
       const binaryPath = join33(pkgDir, astGrepName);
       if (existsSync27(binaryPath) && isValidBinary(binaryPath)) {
@@ -23796,7 +23825,7 @@ var {spawn: spawn7 } = globalThis.Bun;
 
 // src/tools/grep/constants.ts
 import { existsSync as existsSync30 } from "fs";
-import { join as join35, dirname as dirname6 } from "path";
+import { join as join35, dirname as dirname7 } from "path";
 import { spawnSync } from "child_process";
 
 // src/tools/grep/downloader.ts
@@ -23831,7 +23860,7 @@ function findExecutable(name) {
 }
 function getOpenCodeBundledRg() {
   const execPath = process.execPath;
-  const execDir = dirname6(execPath);
+  const execDir = dirname7(execPath);
   const isWindows = process.platform === "win32";
   const rgName = isWindows ? "rg.exe" : "rg";
   const candidates = [
@@ -24246,7 +24275,7 @@ var glob = tool({
 // src/tools/slashcommand/tools.ts
 import { existsSync as existsSync31, readdirSync as readdirSync8, readFileSync as readFileSync19 } from "fs";
 import { homedir as homedir15 } from "os";
-import { join as join36, basename as basename3, dirname as dirname7 } from "path";
+import { join as join36, basename as basename3, dirname as dirname8 } from "path";
 function discoverCommandsFromDir(commandsDir, scope) {
   if (!existsSync31(commandsDir)) {
     return [];
@@ -24330,7 +24359,7 @@ async function formatLoadedCommand(cmd) {
 `);
   sections.push(`## Command Instructions
 `);
-  const commandDir = dirname7(cmd.path);
+  const commandDir = dirname8(cmd.path);
   const withFileRefs = await resolveFileReferencesInText(cmd.content, commandDir);
   const resolvedContent = await resolveCommandsInText(withFileRefs);
   sections.push(resolvedContent.trim());
@@ -24745,7 +24774,7 @@ Use \`background_output\` tool with task_id="${task.id}" to check progress:
   });
 }
 function delay(ms) {
-  return new Promise((resolve8) => setTimeout(resolve8, ms));
+  return new Promise((resolve7) => setTimeout(resolve7, ms));
 }
 function truncateText(text, maxLength) {
   if (text.length <= maxLength)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-opencode",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "OpenCode plugin - custom agents (oracle, librarian) and enhanced features",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",