oh-my-opencode 1.0.1 → 1.0.2

package/dist/index.js

@@ -2586,13 +2586,42 @@ function log(message, data) {
     fs.appendFileSync(logFile, logEntry);
   } catch {}
 }
+// src/shared/deep-merge.ts
+var DANGEROUS_KEYS = new Set(["__proto__", "constructor", "prototype"]);
+var MAX_DEPTH = 50;
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) && Object.prototype.toString.call(value) === "[object Object]";
+}
+function deepMerge(base, override, depth = 0) {
+  if (!base && !override)
+    return;
+  if (!base)
+    return override;
+  if (!override)
+    return base;
+  if (depth > MAX_DEPTH)
+    return override ?? base;
+  const result = { ...base };
+  for (const key of Object.keys(override)) {
+    if (DANGEROUS_KEYS.has(key))
+      continue;
+    const baseValue = base[key];
+    const overrideValue = override[key];
+    if (overrideValue === undefined)
+      continue;
+    if (isPlainObject(baseValue) && isPlainObject(overrideValue)) {
+      result[key] = deepMerge(baseValue, overrideValue, depth + 1);
+    } else {
+      result[key] = overrideValue;
+    }
+  }
+  return result;
+}
+
 // src/shared/snake-case.ts
 function camelToSnake(str) {
   return str.replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
 }
-function isPlainObject(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 function objectToSnakeCase(obj, deep = true) {
   const result = {};
   for (const [key, value] of Object.entries(obj)) {
@@ -2665,36 +2694,22 @@ function isHookDisabled(config, hookType) {
   }
   return false;
 }
-// src/shared/deep-merge.ts
-var DANGEROUS_KEYS = new Set(["__proto__", "constructor", "prototype"]);
-var MAX_DEPTH = 50;
-function isPlainObject2(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) && Object.prototype.toString.call(value) === "[object Object]";
+// src/shared/file-utils.ts
+import { lstatSync, readlinkSync } from "fs";
+import { resolve } from "path";
+function isMarkdownFile(entry) {
+  return !entry.name.startsWith(".") && entry.name.endsWith(".md") && entry.isFile();
 }
-function deepMerge(base, override, depth = 0) {
-  if (!base && !override)
-    return;
-  if (!base)
-    return override;
-  if (!override)
-    return base;
-  if (depth > MAX_DEPTH)
-    return override ?? base;
-  const result = { ...base };
-  for (const key of Object.keys(override)) {
-    if (DANGEROUS_KEYS.has(key))
-      continue;
-    const baseValue = base[key];
-    const overrideValue = override[key];
-    if (overrideValue === undefined)
-      continue;
-    if (isPlainObject2(baseValue) && isPlainObject2(overrideValue)) {
-      result[key] = deepMerge(baseValue, overrideValue, depth + 1);
-    } else {
-      result[key] = overrideValue;
+function resolveSymlink(filePath) {
+  try {
+    const stats = lstatSync(filePath, { throwIfNoEntry: false });
+    if (stats?.isSymbolicLink()) {
+      return resolve(filePath, "..", readlinkSync(filePath));
     }
+    return filePath;
+  } catch {
+    return filePath;
   }
-  return result;
 }
 // src/agents/utils.ts
 var allBuiltinAgents = {
@@ -4042,7 +4057,7 @@ function createGrepOutputTruncatorHook(ctx) {
 }
 // src/hooks/directory-agents-injector/index.ts
 import { existsSync as existsSync8, readFileSync as readFileSync4 } from "fs";
-import { dirname as dirname2, join as join9, resolve } from "path";
+import { dirname as dirname2, join as join9, resolve as resolve2 } from "path";
 
 // src/hooks/directory-agents-injector/storage.ts
 import {
@@ -4108,7 +4123,7 @@ function createDirectoryAgentsInjectorHook(ctx) {
       return null;
     if (title.startsWith("/"))
       return title;
-    return resolve(ctx.directory, title);
+    return resolve2(ctx.directory, title);
   }
   function findAgentsMdUp(startDir) {
     const found = [];
@@ -4183,7 +4198,7 @@ ${content}`;
 }
 // src/hooks/directory-readme-injector/index.ts
 import { existsSync as existsSync10, readFileSync as readFileSync6 } from "fs";
-import { dirname as dirname3, join as join12, resolve as resolve2 } from "path";
+import { dirname as dirname3, join as join12, resolve as resolve3 } from "path";
 
 // src/hooks/directory-readme-injector/storage.ts
 import {
@@ -4249,7 +4264,7 @@ function createDirectoryReadmeInjectorHook(ctx) {
       return null;
     if (title.startsWith("/"))
       return title;
-    return resolve2(ctx.directory, title);
+    return resolve3(ctx.directory, title);
   }
   function findReadmeMdUp(startDir) {
     const found = [];
@@ -5974,7 +5989,7 @@ ${result.message}`;
 // src/hooks/rules-injector/index.ts
 import { readFileSync as readFileSync9 } from "fs";
 import { homedir as homedir7 } from "os";
-import { relative as relative3, resolve as resolve3 } from "path";
+import { relative as relative3, resolve as resolve4 } from "path";
 
 // src/hooks/rules-injector/finder.ts
 import {
@@ -6331,7 +6346,7 @@ function createRulesInjectorHook(ctx) {
       return null;
     if (title.startsWith("/"))
       return title;
-    return resolve3(ctx.directory, title);
+    return resolve4(ctx.directory, title);
   }
   const toolExecuteAfter = async (input, output) => {
     if (!TRACKED_TOOLS.includes(input.tool.toLowerCase()))
@@ -6927,8 +6942,8 @@ function startCallbackServer(timeoutMs = 5 * 60 * 1000) {
   });
   const actualPort = server.port;
   const waitForCallback = () => {
-    return new Promise((resolve4, reject) => {
-      resolveCallback = resolve4;
+    return new Promise((resolve5, reject) => {
+      resolveCallback = resolve5;
       rejectCallback = reject;
       timeoutId = setTimeout(() => {
         cleanup();
@@ -7874,7 +7889,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((resolve4) => setTimeout(resolve4, delay));
+              await new Promise((resolve5) => setTimeout(resolve5, delay));
               continue;
             }
             debugLog6(`[RETRY] GCP permission error, max retries exceeded`);
@@ -8189,9 +8204,6 @@ async function createGoogleAntigravityAuthPlugin({
 import { existsSync as existsSync19, readdirSync as readdirSync4, readFileSync as readFileSync11 } from "fs";
 import { homedir as homedir9 } from "os";
 import { join as join24, basename } from "path";
-function isMarkdownFile(entry) {
-  return !entry.name.startsWith(".") && entry.name.endsWith(".md") && entry.isFile();
-}
 function loadCommandsFromDir(commandsDir, scope) {
   if (!existsSync19(commandsDir)) {
     return [];
@@ -8263,9 +8275,9 @@ function loadOpencodeProjectCommands() {
   return commandsToRecord(commands);
 }
 // src/features/claude-code-skill-loader/loader.ts
-import { existsSync as existsSync20, readdirSync as readdirSync5, readFileSync as readFileSync12, lstatSync, readlinkSync } from "fs";
+import { existsSync as existsSync20, readdirSync as readdirSync5, readFileSync as readFileSync12 } from "fs";
 import { homedir as homedir10 } from "os";
-import { join as join25, resolve as resolve4 } from "path";
+import { join as join25 } from "path";
 function loadSkillsFromDir(skillsDir, scope) {
   if (!existsSync20(skillsDir)) {
     return [];
@@ -8278,14 +8290,7 @@ function loadSkillsFromDir(skillsDir, scope) {
     const skillPath = join25(skillsDir, entry.name);
     if (!entry.isDirectory() && !entry.isSymbolicLink())
       continue;
-    let resolvedPath = skillPath;
-    try {
-      if (lstatSync(skillPath, { throwIfNoEntry: false })?.isSymbolicLink()) {
-        resolvedPath = resolve4(skillPath, "..", readlinkSync(skillPath));
-      }
-    } catch {
-      continue;
-    }
+    const resolvedPath = resolveSymlink(skillPath);
     const skillMdPath = join25(resolvedPath, "SKILL.md");
     if (!existsSync20(skillMdPath))
       continue;
@@ -8352,9 +8357,6 @@ function parseToolsConfig(toolsStr) {
   }
   return result;
 }
-function isMarkdownFile2(entry) {
-  return !entry.name.startsWith(".") && entry.name.endsWith(".md") && entry.isFile();
-}
 function loadAgentsFromDir(agentsDir, scope) {
   if (!existsSync21(agentsDir)) {
     return [];
@@ -8362,7 +8364,7 @@ function loadAgentsFromDir(agentsDir, scope) {
   const entries = readdirSync6(agentsDir, { withFileTypes: true });
   const agents = [];
   for (const entry of entries) {
-    if (!isMarkdownFile2(entry))
+    if (!isMarkdownFile(entry))
       continue;
     const agentPath = join26(agentsDir, entry.name);
     const agentName = basename2(entry.name, ".md");
@@ -10325,7 +10327,7 @@ __export(exports_util, {
   jsonStringifyReplacer: () => jsonStringifyReplacer,
   joinValues: () => joinValues,
   issue: () => issue,
-  isPlainObject: () => isPlainObject3,
+  isPlainObject: () => isPlainObject2,
   isObject: () => isObject,
   hexToUint8Array: () => hexToUint8Array,
   getSizableOrigin: () => getSizableOrigin,
@@ -10507,7 +10509,7 @@ var allowsEval = cached(() => {
     return false;
   }
 });
-function isPlainObject3(o) {
+function isPlainObject2(o) {
   if (isObject(o) === false)
     return false;
   const ctor = o.constructor;
@@ -10522,7 +10524,7 @@ function isPlainObject3(o) {
   return true;
 }
 function shallowClone(o) {
-  if (isPlainObject3(o))
+  if (isPlainObject2(o))
     return { ...o };
   if (Array.isArray(o))
     return [...o];
@@ -10705,7 +10707,7 @@ function omit(schema, mask) {
   return clone(schema, def);
 }
 function extend(schema, shape) {
-  if (!isPlainObject3(shape)) {
+  if (!isPlainObject2(shape)) {
     throw new Error("Invalid input to extend: expected a plain object");
   }
   const checks = schema._zod.def.checks;
@@ -10724,7 +10726,7 @@ function extend(schema, shape) {
   return clone(schema, def);
 }
 function safeExtend(schema, shape) {
-  if (!isPlainObject3(shape)) {
+  if (!isPlainObject2(shape)) {
     throw new Error("Invalid input to safeExtend: expected a plain object");
   }
   const def = {
@@ -12874,7 +12876,7 @@ function mergeValues(a, b) {
   if (a instanceof Date && b instanceof Date && +a === +b) {
     return { valid: true, data: a };
   }
-  if (isPlainObject3(a) && isPlainObject3(b)) {
+  if (isPlainObject2(a) && isPlainObject2(b)) {
     const bKeys = Object.keys(b);
     const sharedKeys = Object.keys(a).filter((key) => bKeys.indexOf(key) !== -1);
     const newObj = { ...a, ...b };
@@ -13004,7 +13006,7 @@ var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
   $ZodType.init(inst, def);
   inst._zod.parse = (payload, ctx) => {
     const input = payload.value;
-    if (!isPlainObject3(input)) {
+    if (!isPlainObject2(input)) {
       payload.issues.push({
         expected: "record",
         code: "invalid_type",
@@ -23351,11 +23353,7 @@ function discoverCommandsFromDir(commandsDir, scope) {
   const entries = readdirSync7(commandsDir, { withFileTypes: true });
   const commands = [];
   for (const entry of entries) {
-    if (entry.name.startsWith("."))
-      continue;
-    if (!entry.name.endsWith(".md"))
-      continue;
-    if (!entry.isFile())
+    if (!isMarkdownFile(entry))
       continue;
     const commandPath = join32(commandsDir, entry.name);
     const commandName = basename3(entry.name, ".md");
@@ -23519,9 +23517,9 @@ var SkillFrontmatterSchema = exports_external.object({
   metadata: exports_external.record(exports_external.string(), exports_external.string()).optional()
 });
 // src/tools/skill/tools.ts
-import { existsSync as existsSync30, readdirSync as readdirSync8, lstatSync as lstatSync2, readlinkSync as readlinkSync2, readFileSync as readFileSync18 } from "fs";
+import { existsSync as existsSync30, readdirSync as readdirSync8, readFileSync as readFileSync18 } from "fs";
 import { homedir as homedir16 } from "os";
-import { join as join33, resolve as resolve7, basename as basename4 } from "path";
+import { join as join33, basename as basename4 } from "path";
 function parseSkillFrontmatter(data) {
   return {
     name: typeof data.name === "string" ? data.name : "",
@@ -23542,15 +23540,7 @@ function discoverSkillsFromDir(skillsDir, scope) {
       continue;
     const skillPath = join33(skillsDir, entry.name);
     if (entry.isDirectory() || entry.isSymbolicLink()) {
-      let resolvedPath = skillPath;
-      try {
-        const stats = lstatSync2(skillPath, { throwIfNoEntry: false });
-        if (stats?.isSymbolicLink()) {
-          resolvedPath = resolve7(skillPath, "..", readlinkSync2(skillPath));
-        }
-      } catch {
-        continue;
-      }
+      const resolvedPath = resolveSymlink(skillPath);
       const skillMdPath = join33(resolvedPath, "SKILL.md");
       if (!existsSync30(skillMdPath))
         continue;
@@ -23579,17 +23569,6 @@ function discoverSkillsSync() {
 var availableSkills = discoverSkillsSync();
 var skillListForDescription = availableSkills.map((s) => `- ${s.name}: ${s.description} (${s.scope})`).join(`
 `);
-function resolveSymlink(skillPath) {
-  try {
-    const stats = lstatSync2(skillPath, { throwIfNoEntry: false });
-    if (stats?.isSymbolicLink()) {
-      return resolve7(skillPath, "..", readlinkSync2(skillPath));
-    }
-    return skillPath;
-  } catch {
-    return skillPath;
-  }
-}
 async function parseSkillMd(skillPath) {
   const resolvedPath = resolveSymlink(skillPath);
   const skillMdPath = join33(resolvedPath, "SKILL.md");
@@ -23861,7 +23840,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/dist/shared/deep-merge.d.ts

@@ -1,3 +1,4 @@
+export declare function isPlainObject(value: unknown): value is Record<string, unknown>;
 /**
  * Deep merges two objects, with override values taking precedence.
  * - Objects are recursively merged

package/dist/shared/file-utils.d.ts

@@ -0,0 +1,6 @@
+export declare function isMarkdownFile(entry: {
+    name: string;
+    isFile: () => boolean;
+}): boolean;
+export declare function isSymbolicLink(filePath: string): boolean;
+export declare function resolveSymlink(filePath: string): string;

package/dist/shared/index.d.ts

@@ -8,3 +8,4 @@ export * from "./tool-name";
 export * from "./pattern-matcher";
 export * from "./hook-disabled";
 export * from "./deep-merge";
+export * from "./file-utils";

package/package.json

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