@agents-inc/cli 0.86.0 → 0.87.0

package/dist/commands/diff.js

@@ -2,16 +2,13 @@
 import {
   buildSourceSkillsMap,
   collectScopedSkillDirs,
-  formatColoredDiff,
-  generateSkillDiff,
-  loadSource,
-  source_default
-} from "../chunk-DCVCFBQ7.js";
+  loadSource
+} from "../chunk-5UJJQFET.js";
 import "../chunk-N6A7A4RA.js";
-import "../chunk-O5ZWS26C.js";
-import "../chunk-XQK4S22C.js";
 import "../chunk-FBZR46GC.js";
-import "../chunk-TMTUTUEV.js";
+import {
+  readForkedFromMetadata
+} from "../chunk-TMTUTUEV.js";
 import "../chunk-B6MYECV6.js";
 import "../chunk-ANXHMG32.js";
 import {
@@ -19,11 +16,15 @@ import {
   EXIT_CODES
 } from "../chunk-MMTMXLI4.js";
 import {
-  getErrorMessage
+  fileExists,
+  getErrorMessage,
+  readFile
 } from "../chunk-NUU3U43A.js";
 import "../chunk-6XWHJHNZ.js";
 import {
-  CLI_BIN_NAME
+  CLI_BIN_NAME,
+  LOCAL_SKILLS_PATH,
+  STANDARD_FILES
 } from "../chunk-6PGL2XMY.js";
 import "../chunk-NPMMU4GY.js";
 import {
@@ -33,6 +34,511 @@ import {
 // src/cli/commands/diff.ts
 init_esm_shims();
 import { Args, Flags } from "@oclif/core";
+import path from "path";
+
+// node_modules/chalk/source/index.js
+init_esm_shims();
+
+// node_modules/chalk/source/vendor/ansi-styles/index.js
+init_esm_shims();
+var ANSI_BACKGROUND_OFFSET = 10;
+var wrapAnsi16 = (offset = 0) => (code) => `\x1B[${code + offset}m`;
+var wrapAnsi256 = (offset = 0) => (code) => `\x1B[${38 + offset};5;${code}m`;
+var wrapAnsi16m = (offset = 0) => (red, green, blue) => `\x1B[${38 + offset};2;${red};${green};${blue}m`;
+var styles = {
+  modifier: {
+    reset: [0, 0],
+    // 21 isn't widely supported and 22 does the same thing
+    bold: [1, 22],
+    dim: [2, 22],
+    italic: [3, 23],
+    underline: [4, 24],
+    overline: [53, 55],
+    inverse: [7, 27],
+    hidden: [8, 28],
+    strikethrough: [9, 29]
+  },
+  color: {
+    black: [30, 39],
+    red: [31, 39],
+    green: [32, 39],
+    yellow: [33, 39],
+    blue: [34, 39],
+    magenta: [35, 39],
+    cyan: [36, 39],
+    white: [37, 39],
+    // Bright color
+    blackBright: [90, 39],
+    gray: [90, 39],
+    // Alias of `blackBright`
+    grey: [90, 39],
+    // Alias of `blackBright`
+    redBright: [91, 39],
+    greenBright: [92, 39],
+    yellowBright: [93, 39],
+    blueBright: [94, 39],
+    magentaBright: [95, 39],
+    cyanBright: [96, 39],
+    whiteBright: [97, 39]
+  },
+  bgColor: {
+    bgBlack: [40, 49],
+    bgRed: [41, 49],
+    bgGreen: [42, 49],
+    bgYellow: [43, 49],
+    bgBlue: [44, 49],
+    bgMagenta: [45, 49],
+    bgCyan: [46, 49],
+    bgWhite: [47, 49],
+    // Bright color
+    bgBlackBright: [100, 49],
+    bgGray: [100, 49],
+    // Alias of `bgBlackBright`
+    bgGrey: [100, 49],
+    // Alias of `bgBlackBright`
+    bgRedBright: [101, 49],
+    bgGreenBright: [102, 49],
+    bgYellowBright: [103, 49],
+    bgBlueBright: [104, 49],
+    bgMagentaBright: [105, 49],
+    bgCyanBright: [106, 49],
+    bgWhiteBright: [107, 49]
+  }
+};
+var modifierNames = Object.keys(styles.modifier);
+var foregroundColorNames = Object.keys(styles.color);
+var backgroundColorNames = Object.keys(styles.bgColor);
+var colorNames = [...foregroundColorNames, ...backgroundColorNames];
+function assembleStyles() {
+  const codes = /* @__PURE__ */ new Map();
+  for (const [groupName, group] of Object.entries(styles)) {
+    for (const [styleName, style] of Object.entries(group)) {
+      styles[styleName] = {
+        open: `\x1B[${style[0]}m`,
+        close: `\x1B[${style[1]}m`
+      };
+      group[styleName] = styles[styleName];
+      codes.set(style[0], style[1]);
+    }
+    Object.defineProperty(styles, groupName, {
+      value: group,
+      enumerable: false
+    });
+  }
+  Object.defineProperty(styles, "codes", {
+    value: codes,
+    enumerable: false
+  });
+  styles.color.close = "\x1B[39m";
+  styles.bgColor.close = "\x1B[49m";
+  styles.color.ansi = wrapAnsi16();
+  styles.color.ansi256 = wrapAnsi256();
+  styles.color.ansi16m = wrapAnsi16m();
+  styles.bgColor.ansi = wrapAnsi16(ANSI_BACKGROUND_OFFSET);
+  styles.bgColor.ansi256 = wrapAnsi256(ANSI_BACKGROUND_OFFSET);
+  styles.bgColor.ansi16m = wrapAnsi16m(ANSI_BACKGROUND_OFFSET);
+  Object.defineProperties(styles, {
+    rgbToAnsi256: {
+      value(red, green, blue) {
+        if (red === green && green === blue) {
+          if (red < 8) {
+            return 16;
+          }
+          if (red > 248) {
+            return 231;
+          }
+          return Math.round((red - 8) / 247 * 24) + 232;
+        }
+        return 16 + 36 * Math.round(red / 255 * 5) + 6 * Math.round(green / 255 * 5) + Math.round(blue / 255 * 5);
+      },
+      enumerable: false
+    },
+    hexToRgb: {
+      value(hex) {
+        const matches = /[a-f\d]{6}|[a-f\d]{3}/i.exec(hex.toString(16));
+        if (!matches) {
+          return [0, 0, 0];
+        }
+        let [colorString] = matches;
+        if (colorString.length === 3) {
+          colorString = [...colorString].map((character) => character + character).join("");
+        }
+        const integer = Number.parseInt(colorString, 16);
+        return [
+          /* eslint-disable no-bitwise */
+          integer >> 16 & 255,
+          integer >> 8 & 255,
+          integer & 255
+          /* eslint-enable no-bitwise */
+        ];
+      },
+      enumerable: false
+    },
+    hexToAnsi256: {
+      value: (hex) => styles.rgbToAnsi256(...styles.hexToRgb(hex)),
+      enumerable: false
+    },
+    ansi256ToAnsi: {
+      value(code) {
+        if (code < 8) {
+          return 30 + code;
+        }
+        if (code < 16) {
+          return 90 + (code - 8);
+        }
+        let red;
+        let green;
+        let blue;
+        if (code >= 232) {
+          red = ((code - 232) * 10 + 8) / 255;
+          green = red;
+          blue = red;
+        } else {
+          code -= 16;
+          const remainder = code % 36;
+          red = Math.floor(code / 36) / 5;
+          green = Math.floor(remainder / 6) / 5;
+          blue = remainder % 6 / 5;
+        }
+        const value = Math.max(red, green, blue) * 2;
+        if (value === 0) {
+          return 30;
+        }
+        let result = 30 + (Math.round(blue) << 2 | Math.round(green) << 1 | Math.round(red));
+        if (value === 2) {
+          result += 60;
+        }
+        return result;
+      },
+      enumerable: false
+    },
+    rgbToAnsi: {
+      value: (red, green, blue) => styles.ansi256ToAnsi(styles.rgbToAnsi256(red, green, blue)),
+      enumerable: false
+    },
+    hexToAnsi: {
+      value: (hex) => styles.ansi256ToAnsi(styles.hexToAnsi256(hex)),
+      enumerable: false
+    }
+  });
+  return styles;
+}
+var ansiStyles = assembleStyles();
+var ansi_styles_default = ansiStyles;
+
+// node_modules/chalk/source/vendor/supports-color/index.js
+init_esm_shims();
+import process2 from "process";
+import os from "os";
+import tty from "tty";
+function hasFlag(flag, argv = globalThis.Deno ? globalThis.Deno.args : process2.argv) {
+  const prefix = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
+  const position = argv.indexOf(prefix + flag);
+  const terminatorPosition = argv.indexOf("--");
+  return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
+}
+var { env } = process2;
+var flagForceColor;
+if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false") || hasFlag("color=never")) {
+  flagForceColor = 0;
+} else if (hasFlag("color") || hasFlag("colors") || hasFlag("color=true") || hasFlag("color=always")) {
+  flagForceColor = 1;
+}
+function envForceColor() {
+  if ("FORCE_COLOR" in env) {
+    if (env.FORCE_COLOR === "true") {
+      return 1;
+    }
+    if (env.FORCE_COLOR === "false") {
+      return 0;
+    }
+    return env.FORCE_COLOR.length === 0 ? 1 : Math.min(Number.parseInt(env.FORCE_COLOR, 10), 3);
+  }
+}
+function translateLevel(level) {
+  if (level === 0) {
+    return false;
+  }
+  return {
+    level,
+    hasBasic: true,
+    has256: level >= 2,
+    has16m: level >= 3
+  };
+}
+function _supportsColor(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
+  const noFlagForceColor = envForceColor();
+  if (noFlagForceColor !== void 0) {
+    flagForceColor = noFlagForceColor;
+  }
+  const forceColor = sniffFlags ? flagForceColor : noFlagForceColor;
+  if (forceColor === 0) {
+    return 0;
+  }
+  if (sniffFlags) {
+    if (hasFlag("color=16m") || hasFlag("color=full") || hasFlag("color=truecolor")) {
+      return 3;
+    }
+    if (hasFlag("color=256")) {
+      return 2;
+    }
+  }
+  if ("TF_BUILD" in env && "AGENT_NAME" in env) {
+    return 1;
+  }
+  if (haveStream && !streamIsTTY && forceColor === void 0) {
+    return 0;
+  }
+  const min = forceColor || 0;
+  if (env.TERM === "dumb") {
+    return min;
+  }
+  if (process2.platform === "win32") {
+    const osRelease = os.release().split(".");
+    if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
+      return Number(osRelease[2]) >= 14931 ? 3 : 2;
+    }
+    return 1;
+  }
+  if ("CI" in env) {
+    if (["GITHUB_ACTIONS", "GITEA_ACTIONS", "CIRCLECI"].some((key) => key in env)) {
+      return 3;
+    }
+    if (["TRAVIS", "APPVEYOR", "GITLAB_CI", "BUILDKITE", "DRONE"].some((sign) => sign in env) || env.CI_NAME === "codeship") {
+      return 1;
+    }
+    return min;
+  }
+  if ("TEAMCITY_VERSION" in env) {
+    return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
+  }
+  if (env.COLORTERM === "truecolor") {
+    return 3;
+  }
+  if (env.TERM === "xterm-kitty") {
+    return 3;
+  }
+  if (env.TERM === "xterm-ghostty") {
+    return 3;
+  }
+  if (env.TERM === "wezterm") {
+    return 3;
+  }
+  if ("TERM_PROGRAM" in env) {
+    const version = Number.parseInt((env.TERM_PROGRAM_VERSION || "").split(".")[0], 10);
+    switch (env.TERM_PROGRAM) {
+      case "iTerm.app": {
+        return version >= 3 ? 3 : 2;
+      }
+      case "Apple_Terminal": {
+        return 2;
+      }
+    }
+  }
+  if (/-256(color)?$/i.test(env.TERM)) {
+    return 2;
+  }
+  if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
+    return 1;
+  }
+  if ("COLORTERM" in env) {
+    return 1;
+  }
+  return min;
+}
+function createSupportsColor(stream, options = {}) {
+  const level = _supportsColor(stream, {
+    streamIsTTY: stream && stream.isTTY,
+    ...options
+  });
+  return translateLevel(level);
+}
+var supportsColor = {
+  stdout: createSupportsColor({ isTTY: tty.isatty(1) }),
+  stderr: createSupportsColor({ isTTY: tty.isatty(2) })
+};
+var supports_color_default = supportsColor;
+
+// node_modules/chalk/source/utilities.js
+init_esm_shims();
+function stringReplaceAll(string, substring, replacer) {
+  let index = string.indexOf(substring);
+  if (index === -1) {
+    return string;
+  }
+  const substringLength = substring.length;
+  let endIndex = 0;
+  let returnValue = "";
+  do {
+    returnValue += string.slice(endIndex, index) + substring + replacer;
+    endIndex = index + substringLength;
+    index = string.indexOf(substring, endIndex);
+  } while (index !== -1);
+  returnValue += string.slice(endIndex);
+  return returnValue;
+}
+function stringEncaseCRLFWithFirstIndex(string, prefix, postfix, index) {
+  let endIndex = 0;
+  let returnValue = "";
+  do {
+    const gotCR = string[index - 1] === "\r";
+    returnValue += string.slice(endIndex, gotCR ? index - 1 : index) + prefix + (gotCR ? "\r\n" : "\n") + postfix;
+    endIndex = index + 1;
+    index = string.indexOf("\n", endIndex);
+  } while (index !== -1);
+  returnValue += string.slice(endIndex);
+  return returnValue;
+}
+
+// node_modules/chalk/source/index.js
+var { stdout: stdoutColor, stderr: stderrColor } = supports_color_default;
+var GENERATOR = /* @__PURE__ */ Symbol("GENERATOR");
+var STYLER = /* @__PURE__ */ Symbol("STYLER");
+var IS_EMPTY = /* @__PURE__ */ Symbol("IS_EMPTY");
+var levelMapping = [
+  "ansi",
+  "ansi",
+  "ansi256",
+  "ansi16m"
+];
+var styles2 = /* @__PURE__ */ Object.create(null);
+var applyOptions = (object, options = {}) => {
+  if (options.level && !(Number.isInteger(options.level) && options.level >= 0 && options.level <= 3)) {
+    throw new Error("The `level` option should be an integer from 0 to 3");
+  }
+  const colorLevel = stdoutColor ? stdoutColor.level : 0;
+  object.level = options.level === void 0 ? colorLevel : options.level;
+};
+var chalkFactory = (options) => {
+  const chalk2 = (...strings) => strings.join(" ");
+  applyOptions(chalk2, options);
+  Object.setPrototypeOf(chalk2, createChalk.prototype);
+  return chalk2;
+};
+function createChalk(options) {
+  return chalkFactory(options);
+}
+Object.setPrototypeOf(createChalk.prototype, Function.prototype);
+for (const [styleName, style] of Object.entries(ansi_styles_default)) {
+  styles2[styleName] = {
+    get() {
+      const builder = createBuilder(this, createStyler(style.open, style.close, this[STYLER]), this[IS_EMPTY]);
+      Object.defineProperty(this, styleName, { value: builder });
+      return builder;
+    }
+  };
+}
+styles2.visible = {
+  get() {
+    const builder = createBuilder(this, this[STYLER], true);
+    Object.defineProperty(this, "visible", { value: builder });
+    return builder;
+  }
+};
+var getModelAnsi = (model, level, type, ...arguments_) => {
+  if (model === "rgb") {
+    if (level === "ansi16m") {
+      return ansi_styles_default[type].ansi16m(...arguments_);
+    }
+    if (level === "ansi256") {
+      return ansi_styles_default[type].ansi256(ansi_styles_default.rgbToAnsi256(...arguments_));
+    }
+    return ansi_styles_default[type].ansi(ansi_styles_default.rgbToAnsi(...arguments_));
+  }
+  if (model === "hex") {
+    return getModelAnsi("rgb", level, type, ...ansi_styles_default.hexToRgb(...arguments_));
+  }
+  return ansi_styles_default[type][model](...arguments_);
+};
+var usedModels = ["rgb", "hex", "ansi256"];
+for (const model of usedModels) {
+  styles2[model] = {
+    get() {
+      const { level } = this;
+      return function(...arguments_) {
+        const styler = createStyler(getModelAnsi(model, levelMapping[level], "color", ...arguments_), ansi_styles_default.color.close, this[STYLER]);
+        return createBuilder(this, styler, this[IS_EMPTY]);
+      };
+    }
+  };
+  const bgModel = "bg" + model[0].toUpperCase() + model.slice(1);
+  styles2[bgModel] = {
+    get() {
+      const { level } = this;
+      return function(...arguments_) {
+        const styler = createStyler(getModelAnsi(model, levelMapping[level], "bgColor", ...arguments_), ansi_styles_default.bgColor.close, this[STYLER]);
+        return createBuilder(this, styler, this[IS_EMPTY]);
+      };
+    }
+  };
+}
+var proto = Object.defineProperties(() => {
+}, {
+  ...styles2,
+  level: {
+    enumerable: true,
+    get() {
+      return this[GENERATOR].level;
+    },
+    set(level) {
+      this[GENERATOR].level = level;
+    }
+  }
+});
+var createStyler = (open, close, parent) => {
+  let openAll;
+  let closeAll;
+  if (parent === void 0) {
+    openAll = open;
+    closeAll = close;
+  } else {
+    openAll = parent.openAll + open;
+    closeAll = close + parent.closeAll;
+  }
+  return {
+    open,
+    close,
+    openAll,
+    closeAll,
+    parent
+  };
+};
+var createBuilder = (self, _styler, _isEmpty) => {
+  const builder = (...arguments_) => applyStyle(builder, arguments_.length === 1 ? "" + arguments_[0] : arguments_.join(" "));
+  Object.setPrototypeOf(builder, proto);
+  builder[GENERATOR] = self;
+  builder[STYLER] = _styler;
+  builder[IS_EMPTY] = _isEmpty;
+  return builder;
+};
+var applyStyle = (self, string) => {
+  if (self.level <= 0 || !string) {
+    return self[IS_EMPTY] ? "" : string;
+  }
+  let styler = self[STYLER];
+  if (styler === void 0) {
+    return string;
+  }
+  const { openAll, closeAll } = styler;
+  if (string.includes("\x1B")) {
+    while (styler !== void 0) {
+      string = stringReplaceAll(string, styler.close, styler.open);
+      styler = styler.parent;
+    }
+  }
+  const lfIndex = string.indexOf("\n");
+  if (lfIndex !== -1) {
+    string = stringEncaseCRLFWithFirstIndex(string, closeAll, openAll, lfIndex);
+  }
+  return openAll + string + closeAll;
+};
+Object.defineProperties(createChalk.prototype, styles2);
+var chalk = createChalk();
+var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
+var source_default = chalk;
+
+// src/cli/commands/diff.ts
+import { createTwoFilesPatch } from "diff";
 var Diff = class _Diff extends BaseCommand {
   static summary = "Show differences between local forked skills and their source versions";
   static description = "Compare local forked skills with their source versions and display differences using unified diff format with colored output";
@@ -67,96 +573,189 @@ var Diff = class _Diff extends BaseCommand {
   async run() {
     const { args, flags } = await this.parse(_Diff);
     const projectDir = process.cwd();
-    const { dirs: scopedDirs, hasProject, hasGlobal } = await collectScopedSkillDirs(projectDir);
-    if (!hasProject && !hasGlobal) {
+    const scopedDirs = await this.loadScopedDirs(projectDir, flags.quiet);
+    if (!scopedDirs) return;
+    try {
+      const { sourceResult, sourceSkills } = await this.loadSource(flags, projectDir);
+      const filteredDirs = this.filterBySkillArg(args.skill, scopedDirs, flags.quiet);
+      const results = await this.generateDiffs(filteredDirs, sourceResult.sourcePath, sourceSkills);
+      this.reportResults(results, flags.quiet);
+    } catch (error) {
       if (!flags.quiet) {
+        this.error(`Failed to compare skills: ${getErrorMessage(error)}`, {
+          exit: EXIT_CODES.ERROR
+        });
+      } else {
+        this.exit(EXIT_CODES.ERROR);
+      }
+    }
+  }
+  async loadScopedDirs(projectDir, quiet) {
+    const { dirs, hasProject, hasGlobal } = await collectScopedSkillDirs(projectDir);
+    if (!hasProject && !hasGlobal) {
+      if (!quiet) {
         this.warn(
           `No local skills found. Run '${CLI_BIN_NAME} init' or '${CLI_BIN_NAME} edit' first.`
         );
       }
-      return;
+      return null;
     }
-    try {
-      if (!flags.quiet) {
-        this.log("Loading skills...");
-      }
-      const { sourceResult } = await loadSource({
-        sourceFlag: flags.source,
-        projectDir
-      });
-      const { matrix, sourcePath, isLocal } = sourceResult;
-      if (!flags.quiet) {
-        this.log(source_default.dim(`Loaded from ${isLocal ? "local" : "remote"}: ${sourcePath}`));
-      }
-      const sourceSkills = buildSourceSkillsMap(matrix);
-      let filteredDirs = scopedDirs;
-      if (args.skill) {
-        filteredDirs = scopedDirs.filter((d) => d.dirName === args.skill);
-        if (filteredDirs.length === 0) {
-          if (!flags.quiet) {
-            this.error(`Skill '${args.skill}' not found in local skills`, {
-              exit: EXIT_CODES.ERROR
-            });
-          }
-        }
+    return dirs;
+  }
+  async loadSource(flags, projectDir) {
+    if (!flags.quiet) {
+      this.log("Loading skills...");
+    }
+    const { sourceResult } = await loadSource({
+      sourceFlag: flags.source,
+      projectDir
+    });
+    const { matrix, sourcePath, isLocal } = sourceResult;
+    if (!flags.quiet) {
+      this.log(source_default.dim(`Loaded from ${isLocal ? "local" : "remote"}: ${sourcePath}`));
+    }
+    const sourceSkills = buildSourceSkillsMap(matrix);
+    return { sourceResult: { sourcePath, isLocal }, sourceSkills };
+  }
+  filterBySkillArg(skillArg, scopedDirs, quiet) {
+    if (!skillArg) return scopedDirs;
+    const filtered = scopedDirs.filter((d) => d.dirName === skillArg);
+    if (filtered.length === 0) {
+      if (!quiet) {
+        this.error(`Skill '${skillArg}' not found in local skills`, {
+          exit: EXIT_CODES.ERROR
+        });
       }
-      const results = [];
-      const skillsWithoutForkedFrom = [];
-      for (const { dirName, localSkillsPath } of filteredDirs) {
-        const result = await generateSkillDiff(localSkillsPath, dirName, sourcePath, sourceSkills);
-        results.push(result);
-        if (!result.forkedFrom) {
-          skillsWithoutForkedFrom.push(dirName);
+    }
+    return filtered;
+  }
+  async generateDiffs(dirs, sourcePath, sourceSkills) {
+    const results = [];
+    for (const { dirName, localSkillsPath } of dirs) {
+      const result = await generateSkillDiff(localSkillsPath, dirName, sourcePath, sourceSkills);
+      results.push(result);
+    }
+    return results;
+  }
+  reportResults(results, quiet) {
+    const skillsWithDiffs = results.filter((r) => r.hasDiff);
+    const skillsWithoutForkedFrom = results.filter((r) => !r.forkedFrom).map((r) => r.skillDirName);
+    if (!quiet) {
+      this.log("");
+      if (skillsWithoutForkedFrom.length > 0) {
+        for (const skillName of skillsWithoutForkedFrom) {
+          this.warn(`Skill '${skillName}' has no forkedFrom metadata - cannot compare`);
         }
-      }
-      const skillsWithDiffs = results.filter((r) => r.hasDiff);
-      if (!flags.quiet) {
         this.log("");
-        if (skillsWithoutForkedFrom.length > 0) {
-          for (const skillName of skillsWithoutForkedFrom) {
-            this.warn(`Skill '${skillName}' has no forkedFrom metadata - cannot compare`);
-          }
-          this.log("");
-        }
-        const forkedSkills = results.filter((r) => r.forkedFrom);
-        if (forkedSkills.length === 0) {
-          this.logInfo("No forked skills to compare.");
-        } else if (skillsWithDiffs.length === 0) {
-          this.logSuccess(`All ${forkedSkills.length} forked skill(s) are up to date with source.`);
-        } else {
-          for (const result of skillsWithDiffs) {
-            this.log(
-              source_default.bold(
-                `
+      }
+      const forkedSkills = results.filter((r) => r.forkedFrom);
+      if (forkedSkills.length === 0) {
+        this.logInfo("No forked skills to compare.");
+      } else if (skillsWithDiffs.length === 0) {
+        this.logSuccess(`All ${forkedSkills.length} forked skill(s) are up to date with source.`);
+      } else {
+        for (const result of skillsWithDiffs) {
+          this.log(
+            source_default.bold(
+              `
 === ${result.skillDirName} (forked from ${result.forkedFrom?.skillId}) ===
 `
-              )
-            );
-            this.log(formatColoredDiff(result.diffOutput));
-          }
-          this.log("");
-          this.logInfo(
-            `Found differences in ${source_default.yellow(String(skillsWithDiffs.length))} skill(s).`
+            )
           );
+          this.log(formatColoredDiff(result.diffOutput));
         }
         this.log("");
+        this.logInfo(
+          `Found differences in ${source_default.yellow(String(skillsWithDiffs.length))} skill(s).`
+        );
       }
-      if (skillsWithDiffs.length > 0) {
-        this.exit(EXIT_CODES.ERROR);
-      }
-      this.exit(EXIT_CODES.SUCCESS);
-    } catch (error) {
-      if (!flags.quiet) {
-        const message = getErrorMessage(error);
-        this.error(`Failed to compare skills: ${message}`, {
-          exit: EXIT_CODES.ERROR
-        });
-      } else {
-        this.exit(EXIT_CODES.ERROR);
-      }
+      this.log("");
+    }
+    if (skillsWithDiffs.length > 0) {
+      this.exit(EXIT_CODES.ERROR);
     }
+    this.exit(EXIT_CODES.SUCCESS);
   }
 };
+async function generateSkillDiff(localSkillsPath, skillDirName, sourcePath, sourceSkills) {
+  const skillDir = path.join(localSkillsPath, skillDirName);
+  const forkedFrom = await readForkedFromMetadata(skillDir);
+  if (!forkedFrom) {
+    return {
+      skillDirName,
+      forkedFrom: null,
+      hasDiff: false,
+      diffOutput: ""
+    };
+  }
+  const sourceSkill = sourceSkills[forkedFrom.skillId];
+  if (!sourceSkill) {
+    return {
+      skillDirName,
+      forkedFrom,
+      hasDiff: false,
+      diffOutput: `Source skill '${forkedFrom.skillId}' no longer exists`
+    };
+  }
+  const sourceSkillMdPath = path.join(sourcePath, "src", sourceSkill.path, STANDARD_FILES.SKILL_MD);
+  if (!await fileExists(sourceSkillMdPath)) {
+    return {
+      skillDirName,
+      forkedFrom,
+      hasDiff: false,
+      diffOutput: `Source ${STANDARD_FILES.SKILL_MD} not found at ${sourceSkillMdPath}`
+    };
+  }
+  const sourceContent = await readFile(sourceSkillMdPath);
+  const localSkillMdPath = path.join(skillDir, STANDARD_FILES.SKILL_MD);
+  if (!await fileExists(localSkillMdPath)) {
+    return {
+      skillDirName,
+      forkedFrom,
+      hasDiff: false,
+      diffOutput: `Local ${STANDARD_FILES.SKILL_MD} not found at ${localSkillMdPath}`
+    };
+  }
+  const localContent = await readFile(localSkillMdPath);
+  const sourceLabel = `source/${sourceSkill.path}/SKILL.md`;
+  const localLabel = `local/${LOCAL_SKILLS_PATH}/${skillDirName}/SKILL.md`;
+  const diff = createTwoFilesPatch(
+    sourceLabel,
+    localLabel,
+    sourceContent,
+    localContent,
+    "",
+    // No source header
+    ""
+    // No local header
+  );
+  const hasDiff = diff.split("\n").some((line) => {
+    return (line.startsWith("+") || line.startsWith("-")) && !line.startsWith("+++") && !line.startsWith("---");
+  });
+  return {
+    skillDirName,
+    forkedFrom,
+    hasDiff,
+    diffOutput: diff
+  };
+}
+function formatColoredDiff(diffText) {
+  return diffText.split("\n").map((line) => {
+    if (line.startsWith("+++") || line.startsWith("---")) {
+      return source_default.bold(line);
+    }
+    if (line.startsWith("+")) {
+      return source_default.green(line);
+    }
+    if (line.startsWith("-")) {
+      return source_default.red(line);
+    }
+    if (line.startsWith("@@")) {
+      return source_default.cyan(line);
+    }
+    return line;
+  }).join("\n");
+}
 export {
   Diff as default
 };