@zenobius/opencode-skillful 1.2.2 → 1.2.4-next.1

package/dist/index.js

@@ -16152,6 +16152,7 @@ function createInstructionInjector(ctx) {
     await ctx.client.session.prompt({
       path: { id: props.sessionId },
       body: {
+        agent: props.agent,
         noReply: true,
         parts: [{ type: "text", text }]
       }
@@ -17763,9 +17764,10 @@ function createSkillFinder(provider) {
 }
 
 // src/tools/SkillResourceReader.ts
-import path from "path";
+import path2 from "path";
 
 // src/services/SkillResourceResolver.ts
+import path from "path";
 function createSkillResourceResolver(provider) {
   const resolveResourceMap = (skill, type) => {
     if (type === "script" || type === "scripts") {
@@ -17787,7 +17789,7 @@ function createSkillResourceResolver(provider) {
     if (!resourceMap) {
       throw new Error(`Skill "${args.skill_name}" does not have any resources of type "${args.type}"`);
     }
-    const resourceEntry = resourceMap.get(args.relative_path);
+    const resourceEntry = resourceMap.get(path.join(args.type, args.relative_path));
     if (!resourceEntry) {
       throw new Error(`Resource not found: Skill "${args.skill_name}" does not have a ${args.type} at path "${args.relative_path}"`);
     }
@@ -17813,7 +17815,7 @@ function createSkillResourceReader(provider) {
     const resource = await skillResourceResolver({
       skill_name: args.skill_name,
       type,
-      relative_path: path.join(...restPath)
+      relative_path: path2.join(...restPath)
     });
     const injection = {
       skill_name: args.skill_name,
@@ -17880,7 +17882,7 @@ import { join as join2, relative as relative3, resolve as resolve2 } from "path"
 import process2 from "process";
 import { existsSync as existsSync22, mkdirSync, readdirSync, writeFileSync } from "fs";
 import { dirname as dirname4, resolve } from "path";
-import process from "process";
+import process3 from "process";
 import { Buffer as Buffer2 } from "buffer";
 import { createCipheriv, createDecipheriv, randomBytes } from "crypto";
 import { closeSync, createReadStream, createWriteStream, existsSync as existsSync222, fsyncSync, openSync, writeFileSync as writeFileSync2 } from "fs";
@@ -17890,7 +17892,7 @@ import process5 from "process";
 import { pipeline } from "stream/promises";
 import { createGzip } from "zlib";
 import process4 from "process";
-import process3 from "process";
+import process32 from "process";
 import { Buffer as Buffer22 } from "buffer";
 import { createCipheriv as createCipheriv2, createDecipheriv as createDecipheriv2, randomBytes as randomBytes2 } from "crypto";
 import { closeSync as closeSync2, createReadStream as createReadStream2, createWriteStream as createWriteStream2, existsSync as existsSync4, fsyncSync as fsyncSync2, openSync as openSync2, writeFileSync as writeFileSync4 } from "fs";
@@ -18292,7 +18294,7 @@ async function loadConfig({
   cwd,
   defaultConfig
 }) {
-  const baseDir = cwd || process.cwd();
+  const baseDir = cwd || process3.cwd();
   const extensions = [".ts", ".js", ".mjs", ".cjs", ".json"];
   const configPaths = [
     `${name}.config`,
@@ -18323,13 +18325,13 @@ async function loadConfig({
   } catch {}
   return defaultConfig;
 }
-var defaultConfigDir = resolve(process.cwd(), "config");
-var defaultGeneratedDir = resolve(process.cwd(), "src/generated");
+var defaultConfigDir = resolve(process3.cwd(), "config");
+var defaultGeneratedDir = resolve(process3.cwd(), "src/generated");
 function getProjectRoot(filePath, options2 = {}) {
-  let path2 = process2.cwd();
-  while (path2.includes("storage"))
-    path2 = resolve2(path2, "..");
-  const finalPath = resolve2(path2, filePath || "");
+  let path3 = process2.cwd();
+  while (path3.includes("storage"))
+    path3 = resolve2(path3, "..");
+  const finalPath = resolve2(path3, filePath || "");
   if (options2?.relative)
     return relative3(process2.cwd(), finalPath);
   return finalPath;
@@ -18373,24 +18375,24 @@ async function loadConfig2() {
 }
 var config2 = await loadConfig2();
 function isBrowserProcess() {
-  if (process3.env.NODE_ENV === "test" || process3.env.BUN_ENV === "test") {
+  if (process32.env.NODE_ENV === "test" || process32.env.BUN_ENV === "test") {
     return false;
   }
   return typeof window !== "undefined";
 }
 async function isServerProcess() {
-  if (process3.env.NODE_ENV === "test" || process3.env.BUN_ENV === "test") {
+  if (process32.env.NODE_ENV === "test" || process32.env.BUN_ENV === "test") {
     return true;
   }
   if (typeof navigator !== "undefined" && navigator.product === "ReactNative") {
     return true;
   }
-  if (typeof process3 !== "undefined") {
-    const type = process3.type;
+  if (typeof process32 !== "undefined") {
+    const type = process32.type;
     if (type === "renderer" || type === "worker") {
       return false;
     }
-    return !!(process3.versions && (process3.versions.node || process3.versions.bun));
+    return !!(process32.versions && (process32.versions.node || process32.versions.bun));
   }
   return false;
 }
@@ -19776,10 +19778,10 @@ function applyEnvVarsToConfig(name, config3, verbose = false) {
     return config3;
   const envPrefix = name.toUpperCase().replace(/-/g, "_");
   const result = { ...config3 };
-  function processObject(obj, path2 = []) {
+  function processObject(obj, path3 = []) {
     const result2 = { ...obj };
     for (const [key, value] of Object.entries(obj)) {
-      const envPath = [...path2, key];
+      const envPath = [...path3, key];
       const formatKey = (k) => k.replace(/([A-Z])/g, "_$1").toUpperCase();
       const envKey = `${envPrefix}_${envPath.map(formatKey).join("_")}`;
       const oldEnvKey = `${envPrefix}_${envPath.map((p) => p.toUpperCase()).join("_")}`;
@@ -19961,10 +19963,10 @@ async function loadConfig3({
 var defaultConfigDir2 = resolve3(process6.cwd(), "config");
 var defaultGeneratedDir2 = resolve3(process6.cwd(), "src/generated");
 function getProjectRoot2(filePath, options2 = {}) {
-  let path2 = process7.cwd();
-  while (path2.includes("storage"))
-    path2 = resolve4(path2, "..");
-  const finalPath = resolve4(path2, filePath || "");
+  let path3 = process7.cwd();
+  while (path3.includes("storage"))
+    path3 = resolve4(path3, "..");
+  const finalPath = resolve4(path3, filePath || "");
   if (options2?.relative)
     return relative2(process7.cwd(), finalPath);
   return finalPath;
@@ -21401,10 +21403,10 @@ class EnvVarError extends BunfigError {
 
 class FileSystemError extends BunfigError {
   code = "FILE_SYSTEM_ERROR";
-  constructor(operation, path2, cause) {
-    super(`File system ${operation} failed for "${path2}": ${cause.message}`, {
+  constructor(operation, path3, cause) {
+    super(`File system ${operation} failed for "${path3}": ${cause.message}`, {
       operation,
-      path: path2,
+      path: path3,
       originalError: cause.name,
       originalMessage: cause.message
     });
@@ -21477,8 +21479,8 @@ var ErrorFactory = {
   envVar(envKey, envValue, expectedType, configName) {
     return new EnvVarError(envKey, envValue, expectedType, configName);
   },
-  fileSystem(operation, path2, cause) {
-    return new FileSystemError(operation, path2, cause);
+  fileSystem(operation, path3, cause) {
+    return new FileSystemError(operation, path3, cause);
   },
   typeGeneration(configDir, outputPath, cause) {
     return new TypeGenerationError(configDir, outputPath, cause);
@@ -21614,9 +21616,9 @@ class EnvProcessor {
     }
     return key.replace(/([A-Z])/g, "_$1").toUpperCase();
   }
-  processObject(obj, path2, envPrefix, options2) {
+  processObject(obj, path3, envPrefix, options2) {
     for (const [key, value] of Object.entries(obj)) {
-      const envPath = [...path2, key];
+      const envPath = [...path3, key];
       const formattedKeys = envPath.map((k) => this.formatEnvKey(k, options2.useCamelCase));
       const envKey = `${envPrefix}_${formattedKeys.join("_")}`;
       const oldEnvKey = options2.useBackwardCompatibility ? `${envPrefix}_${envPath.map((p) => p.toUpperCase()).join("_")}` : null;
@@ -21701,9 +21703,9 @@ class EnvProcessor {
         return this.formatAsText(envVars, configName);
     }
   }
-  extractEnvVarInfo(obj, path2, prefix, envVars) {
+  extractEnvVarInfo(obj, path3, prefix, envVars) {
     for (const [key, value] of Object.entries(obj)) {
-      const envPath = [...path2, key];
+      const envPath = [...path3, key];
       const envKey = `${prefix}_${envPath.map((k) => this.formatEnvKey(k, true)).join("_")}`;
       if (typeof value === "object" && value !== null && !Array.isArray(value)) {
         this.extractEnvVarInfo(value, envPath, prefix, envVars);
@@ -22118,15 +22120,15 @@ class ConfigFileLoader {
   }
   async preloadConfigurations(configPaths, options2 = {}) {
     const preloaded = new Map;
-    await Promise.allSettled(configPaths.map(async (path2) => {
+    await Promise.allSettled(configPaths.map(async (path3) => {
       try {
-        const result = await this.loadFromPath(path2, {}, options2);
+        const result = await this.loadFromPath(path3, {}, options2);
         if (result) {
-          preloaded.set(path2, result.config);
+          preloaded.set(path3, result.config);
         }
       } catch (error45) {
         if (options2.verbose) {
-          console.warn(`Failed to preload ${path2}:`, error45);
+          console.warn(`Failed to preload ${path3}:`, error45);
         }
       }
     }));
@@ -22205,13 +22207,13 @@ class ConfigValidator {
       warnings
     };
   }
-  validateObjectAgainstSchema(value, schema, path2, errors3, warnings, options2) {
+  validateObjectAgainstSchema(value, schema, path3, errors3, warnings, options2) {
     if (options2.validateTypes && schema.type) {
       const actualType = Array.isArray(value) ? "array" : typeof value;
       const expectedTypes = Array.isArray(schema.type) ? schema.type : [schema.type];
       if (!expectedTypes.includes(actualType)) {
         errors3.push({
-          path: path2,
+          path: path3,
           message: `Expected type ${expectedTypes.join(" or ")}, got ${actualType}`,
           expected: expectedTypes.join(" or "),
           actual: actualType,
@@ -22223,7 +22225,7 @@ class ConfigValidator {
     }
     if (schema.enum && !schema.enum.includes(value)) {
       errors3.push({
-        path: path2,
+        path: path3,
         message: `Value must be one of: ${schema.enum.join(", ")}`,
         expected: schema.enum.join(", "),
         actual: value,
@@ -22235,7 +22237,7 @@ class ConfigValidator {
     if (typeof value === "string") {
       if (schema.minLength !== undefined && value.length < schema.minLength) {
         errors3.push({
-          path: path2,
+          path: path3,
           message: `String length must be at least ${schema.minLength}`,
           expected: `>= ${schema.minLength}`,
           actual: value.length,
@@ -22244,7 +22246,7 @@ class ConfigValidator {
       }
       if (schema.maxLength !== undefined && value.length > schema.maxLength) {
         errors3.push({
-          path: path2,
+          path: path3,
           message: `String length must not exceed ${schema.maxLength}`,
           expected: `<= ${schema.maxLength}`,
           actual: value.length,
@@ -22255,7 +22257,7 @@ class ConfigValidator {
         const regex = new RegExp(schema.pattern);
         if (!regex.test(value)) {
           errors3.push({
-            path: path2,
+            path: path3,
             message: `String does not match pattern ${schema.pattern}`,
             expected: schema.pattern,
             actual: value,
@@ -22267,7 +22269,7 @@ class ConfigValidator {
     if (typeof value === "number") {
       if (schema.minimum !== undefined && value < schema.minimum) {
         errors3.push({
-          path: path2,
+          path: path3,
           message: `Value must be at least ${schema.minimum}`,
           expected: `>= ${schema.minimum}`,
           actual: value,
@@ -22276,7 +22278,7 @@ class ConfigValidator {
       }
       if (schema.maximum !== undefined && value > schema.maximum) {
         errors3.push({
-          path: path2,
+          path: path3,
           message: `Value must not exceed ${schema.maximum}`,
           expected: `<= ${schema.maximum}`,
           actual: value,
@@ -22286,7 +22288,7 @@ class ConfigValidator {
     }
     if (Array.isArray(value) && schema.items) {
       for (let i = 0;i < value.length; i++) {
-        const itemPath = path2 ? `${path2}[${i}]` : `[${i}]`;
+        const itemPath = path3 ? `${path3}[${i}]` : `[${i}]`;
         this.validateObjectAgainstSchema(value[i], schema.items, itemPath, errors3, warnings, options2);
         if (options2.stopOnFirstError && errors3.length > 0)
           return;
@@ -22298,7 +22300,7 @@ class ConfigValidator {
         for (const requiredProp of schema.required) {
           if (!(requiredProp in obj)) {
             errors3.push({
-              path: path2 ? `${path2}.${requiredProp}` : requiredProp,
+              path: path3 ? `${path3}.${requiredProp}` : requiredProp,
               message: `Missing required property '${requiredProp}'`,
               expected: "required",
               rule: "required"
@@ -22311,7 +22313,7 @@ class ConfigValidator {
       if (schema.properties) {
         for (const [propName, propSchema] of Object.entries(schema.properties)) {
           if (propName in obj) {
-            const propPath = path2 ? `${path2}.${propName}` : propName;
+            const propPath = path3 ? `${path3}.${propName}` : propName;
             this.validateObjectAgainstSchema(obj[propName], propSchema, propPath, errors3, warnings, options2);
             if (options2.stopOnFirstError && errors3.length > 0)
               return;
@@ -22323,7 +22325,7 @@ class ConfigValidator {
         for (const propName of Object.keys(obj)) {
           if (!allowedProps.has(propName)) {
             warnings.push({
-              path: path2 ? `${path2}.${propName}` : propName,
+              path: path3 ? `${path3}.${propName}` : propName,
               message: `Additional property '${propName}' is not allowed`,
               rule: "additionalProperties"
             });
@@ -22357,12 +22359,12 @@ class ConfigValidator {
       warnings
     };
   }
-  validateWithRule(value, rule, path2) {
+  validateWithRule(value, rule, path3) {
     const errors3 = [];
     if (rule.required && (value === undefined || value === null)) {
       errors3.push({
-        path: path2,
-        message: rule.message || `Property '${path2}' is required`,
+        path: path3,
+        message: rule.message || `Property '${path3}' is required`,
         expected: "required",
         rule: "required"
       });
@@ -22375,7 +22377,7 @@ class ConfigValidator {
       const actualType = Array.isArray(value) ? "array" : typeof value;
       if (actualType !== rule.type) {
         errors3.push({
-          path: path2,
+          path: path3,
           message: rule.message || `Expected type ${rule.type}, got ${actualType}`,
           expected: rule.type,
           actual: actualType,
@@ -22387,7 +22389,7 @@ class ConfigValidator {
       const length = Array.isArray(value) ? value.length : typeof value === "string" ? value.length : typeof value === "number" ? value : 0;
       if (length < rule.min) {
         errors3.push({
-          path: path2,
+          path: path3,
           message: rule.message || `Value must be at least ${rule.min}`,
           expected: `>= ${rule.min}`,
           actual: length,
@@ -22399,7 +22401,7 @@ class ConfigValidator {
       const length = Array.isArray(value) ? value.length : typeof value === "string" ? value.length : typeof value === "number" ? value : 0;
       if (length > rule.max) {
         errors3.push({
-          path: path2,
+          path: path3,
           message: rule.message || `Value must not exceed ${rule.max}`,
           expected: `<= ${rule.max}`,
           actual: length,
@@ -22410,7 +22412,7 @@ class ConfigValidator {
     if (rule.pattern && typeof value === "string") {
       if (!rule.pattern.test(value)) {
         errors3.push({
-          path: path2,
+          path: path3,
           message: rule.message || `Value does not match pattern ${rule.pattern}`,
           expected: rule.pattern.toString(),
           actual: value,
@@ -22420,7 +22422,7 @@ class ConfigValidator {
     }
     if (rule.enum && !rule.enum.includes(value)) {
       errors3.push({
-        path: path2,
+        path: path3,
         message: rule.message || `Value must be one of: ${rule.enum.join(", ")}`,
         expected: rule.enum.join(", "),
         actual: value,
@@ -22431,7 +22433,7 @@ class ConfigValidator {
       const customError = rule.validator(value);
       if (customError) {
         errors3.push({
-          path: path2,
+          path: path3,
           message: rule.message || customError,
           rule: "custom"
         });
@@ -22439,10 +22441,10 @@ class ConfigValidator {
     }
     return errors3;
   }
-  getValueByPath(obj, path2) {
-    if (!path2)
+  getValueByPath(obj, path3) {
+    if (!path3)
       return obj;
-    const keys = path2.split(".");
+    const keys = path3.split(".");
     let current = obj;
     for (const key of keys) {
       if (current && typeof current === "object" && key in current) {
@@ -22868,10 +22870,10 @@ async function loadConfig5(options2) {
 function applyEnvVarsToConfig2(name, config4, verbose = false) {
   const _envProcessor = new EnvProcessor;
   const envPrefix = name.toUpperCase().replace(/[^A-Z0-9]/g, "_");
-  function processConfigLevel(obj, path2 = []) {
+  function processConfigLevel(obj, path3 = []) {
     const result = { ...obj };
     for (const [key, value] of Object.entries(obj)) {
-      const currentPath = [...path2, key];
+      const currentPath = [...path3, key];
       const envKeys = [
         `${envPrefix}_${currentPath.join("_").toUpperCase()}`,
         `${envPrefix}_${currentPath.map((k) => k.toUpperCase()).join("")}`,
@@ -22916,72 +22918,43 @@ var defaultConfigDir3 = resolve7(process12.cwd(), "config");
 var defaultGeneratedDir3 = resolve7(process12.cwd(), "src/generated");
 
 // src/config.ts
+import { homedir as homedir3 } from "os";
 import { join as join4 } from "path";
-
-// node_modules/env-paths/index.js
-import path2 from "path";
-import os from "os";
-import process13 from "process";
-var homedir3 = os.homedir();
-var tmpdir = os.tmpdir();
-var { env } = process13;
-var macos = (name) => {
-  const library = path2.join(homedir3, "Library");
-  return {
-    data: path2.join(library, "Application Support", name),
-    config: path2.join(library, "Preferences", name),
-    cache: path2.join(library, "Caches", name),
-    log: path2.join(library, "Logs", name),
-    temp: path2.join(tmpdir, name)
-  };
-};
-var windows = (name) => {
-  const appData = env.APPDATA || path2.join(homedir3, "AppData", "Roaming");
-  const localAppData = env.LOCALAPPDATA || path2.join(homedir3, "AppData", "Local");
-  return {
-    data: path2.join(localAppData, name, "Data"),
-    config: path2.join(appData, name, "Config"),
-    cache: path2.join(localAppData, name, "Cache"),
-    log: path2.join(localAppData, name, "Log"),
-    temp: path2.join(tmpdir, name)
-  };
-};
-var linux = (name) => {
-  const username = path2.basename(homedir3);
-  return {
-    data: path2.join(env.XDG_DATA_HOME || path2.join(homedir3, ".local", "share"), name),
-    config: path2.join(env.XDG_CONFIG_HOME || path2.join(homedir3, ".config"), name),
-    cache: path2.join(env.XDG_CACHE_HOME || path2.join(homedir3, ".cache"), name),
-    log: path2.join(env.XDG_STATE_HOME || path2.join(homedir3, ".local", "state"), name),
-    temp: path2.join(tmpdir, username, name)
-  };
-};
-function envPaths(name, { suffix = "nodejs" } = {}) {
-  if (typeof name !== "string") {
-    throw new TypeError(`Expected a string, got ${typeof name}`);
-  }
-  if (suffix) {
-    name += `-${suffix}`;
+function getOpenCodeConfigPaths() {
+  const home = homedir3();
+  const paths = [];
+  const xdgConfig = process.env.XDG_CONFIG_HOME;
+  if (xdgConfig) {
+    paths.push(join4(xdgConfig, "opencode"));
+  }
+  if (process.platform === "win32") {
+    const localAppData = process.env.LOCALAPPDATA;
+    if (localAppData) {
+      paths.push(join4(localAppData, "opencode"));
+    }
+    paths.push(join4(home, ".config", "opencode"));
+  } else {
+    paths.push(join4(home, ".config", "opencode"));
   }
-  if (process13.platform === "darwin") {
-    return macos(name);
+  paths.push(join4(home, ".opencode"));
+  return paths;
+}
+function expandTildePath(path3) {
+  if (path3 === "~") {
+    return homedir3();
   }
-  if (process13.platform === "win32") {
-    return windows(name);
+  if (path3.startsWith("~/")) {
+    return join4(homedir3(), path3.slice(2));
   }
-  return linux(name);
+  return path3;
 }
-
-// src/config.ts
-var OpenCodePaths = envPaths("opencode", { suffix: "" });
+var defaultSkillBasePaths = getOpenCodeConfigPaths().map((configPath) => join4(configPath, "skills"));
 var options2 = {
   name: "opencode-skillful",
   cwd: "./",
   defaultConfig: {
     debug: false,
-    basePaths: [
-      join4(OpenCodePaths.config, "skills")
-    ],
+    basePaths: defaultSkillBasePaths,
     promptRenderer: "xml",
     modelRenderers: {}
   }
@@ -22989,6 +22962,7 @@ var options2 = {
 async function getPluginConfig(ctx) {
   const resolvedConfig = await loadConfig5(options2);
   resolvedConfig.basePaths.push(join4(ctx.directory, ".opencode", "skills"));
+  resolvedConfig.basePaths = resolvedConfig.basePaths.map(expandTildePath);
   return resolvedConfig;
 }
 
@@ -23451,7 +23425,8 @@ var SkillsPlugin = async (ctx) => {
           const results = await api2.loadSkill(args.skill_names);
           for await (const skill of results.loaded) {
             await sendPrompt(renderer({ data: skill, type: "Skill" }), {
-              sessionId: toolCtx.sessionID
+              sessionId: toolCtx.sessionID,
+              agent: toolCtx.agent
             });
           }
           return JSON.stringify({
@@ -23501,7 +23476,8 @@ var SkillsPlugin = async (ctx) => {
             throw new Error("Failed to read resource");
           }
           await sendPrompt(renderer({ data: result.injection, type: "SkillResource" }), {
-            sessionId: toolCtx.sessionID
+            sessionId: toolCtx.sessionID,
+            agent: toolCtx.agent
           });
           return JSON.stringify({
             result: "Resource injected successfully",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenobius/opencode-skillful",
-  "version": "1.2.2",
+  "version": "1.2.4-next.1",
   "description": "OpenCode Skills Plugin - Anthropic Agent Skills Specification implementation",
   "type": "module",
   "module": "src/index.ts",
@@ -22,7 +22,6 @@
     "@opencode-ai/plugin": "1.0.85",
     "bunfig": "^0.15.6",
     "dedent": "^1.7.1",
-    "env-paths": "^3.0.0",
     "gray-matter": "^4.0.3",
     "mime": "^4.1.0",
     "ramda": "^0.30.0",