agent-conf 2.1.0 → 2.2.0

package/dist/index.js

@@ -67,10 +67,6 @@ var LockfileSchema = z.object({
 // src/core/lockfile.ts
 var CONFIG_DIR = ".agent-conf";
 var LOCKFILE_NAME = "lockfile.json";
-var CLI_VERSION = "0.1.0";
-function getBuildCommit() {
-  return true ? "495cb19c3410dc3d585d83d93279944ff665eb9e" : "unknown";
-}
 function getLockfilePath(targetDir) {
   return path.join(targetDir, CONFIG_DIR, LOCKFILE_NAME);
 }
@@ -103,7 +99,7 @@ async function writeLockfile(targetDir, options) {
       targets: options.targets ?? ["claude"],
       marker_prefix: options.markerPrefix
     },
-    cli_version: CLI_VERSION
+    cli_version: getCliVersion()
   };
   await fs.mkdir(path.dirname(lockfilePath), { recursive: true });
   await fs.writeFile(lockfilePath, `${JSON.stringify(lockfile, null, 2)}
@@ -115,28 +111,30 @@ function hashContent(content) {
   return `sha256:${hash.slice(0, 12)}`;
 }
 function getCliVersion() {
-  return CLI_VERSION;
+  return true ? "2.2.0" : "0.0.0";
 }
 async function checkCliVersionMismatch(targetDir) {
   const lockfile = await readLockfile(targetDir);
   if (!lockfile) {
     return null;
   }
-  if (lockfile.source.type !== "github") {
-    return null;
-  }
-  const cliCommit = getBuildCommit();
-  const lockfileCommit = lockfile.source.commit_sha;
-  if (cliCommit === "unknown") {
+  const currentVersion = getCliVersion();
+  const lockfileVersion = lockfile.cli_version;
+  if (!currentVersion || !lockfileVersion) {
     return null;
   }
-  const cliShort = cliCommit.slice(0, 7);
-  const lockfileShort = lockfileCommit.slice(0, 7);
-  if (cliShort !== lockfileShort) {
-    return {
-      cliCommit: cliShort,
-      lockfileCommit: lockfileShort
-    };
+  const current = currentVersion.split(".").map(Number);
+  const lockfile_ = lockfileVersion.split(".").map(Number);
+  for (let i = 0; i < 3; i++) {
+    if ((lockfile_[i] || 0) > (current[i] || 0)) {
+      return {
+        currentVersion,
+        lockfileVersion
+      };
+    }
+    if ((current[i] || 0) > (lockfile_[i] || 0)) {
+      return null;
+    }
   }
   return null;
 }
@@ -897,6 +895,7 @@ async function deleteOrphanedSkills(targetDir, orphanedSkills, targets, previous
 }
 
 // src/commands/shared.ts
+import * as fs12 from "fs/promises";
 import * as path12 from "path";
 import * as prompts3 from "@clack/prompts";
 import pc5 from "picocolors";
@@ -1661,8 +1660,7 @@ async function resolveVersion(options, status, _commandName, repo) {
       releaseInfo: release
     };
   } catch {
-    spinner.fail("Failed to fetch latest release, falling back to master");
-    logger.warn("Could not fetch latest release. Using master branch instead.");
+    spinner.info("No releases found, using master branch");
     return {
       ref: "master",
       version: void 0,
@@ -1850,6 +1848,7 @@ async function performSync(options) {
       workflowSpinner.stop();
     }
     const hookResult = await installPreCommitHook(targetDir);
+    const summaryLines = [];
     console.log();
     console.log(pc5.bold("Sync complete:"));
     console.log();
@@ -1857,38 +1856,71 @@ async function performSync(options) {
     if (result.agentsMd.merged) {
       const label = context.commandName === "sync" ? "(updated)" : "(merged)";
       console.log(`  ${pc5.green("+")} ${agentsMdPath} ${pc5.dim(label)}`);
+      summaryLines.push(`- \`AGENTS.md\` ${label}`);
     } else {
       console.log(`  ${pc5.green("+")} ${agentsMdPath} ${pc5.dim("(created)")}`);
+      summaryLines.push("- `AGENTS.md` (created)");
     }
     for (const targetResult of result.targets) {
       const config = getTargetConfig(targetResult.target);
       if (config.instructionsFile) {
         const instructionsPath = targetResult.instructionsMd.location === "root" ? formatPath(path12.join(targetDir, config.instructionsFile)) : formatPath(path12.join(targetDir, config.dir, config.instructionsFile));
+        const instructionsRelPath = targetResult.instructionsMd.location === "root" ? config.instructionsFile : `${config.dir}/${config.instructionsFile}`;
         if (targetResult.instructionsMd.created) {
           console.log(`  ${pc5.green("+")} ${instructionsPath} ${pc5.dim("(created)")}`);
+          summaryLines.push(`- \`${instructionsRelPath}\` (created)`);
         } else if (targetResult.instructionsMd.updated) {
           const hint = targetResult.instructionsMd.contentMerged ? "(content merged into AGENTS.md, reference added)" : "(reference added)";
           console.log(`  ${pc5.yellow("~")} ${instructionsPath} ${pc5.dim(hint)}`);
+          summaryLines.push(`- \`${instructionsRelPath}\` ${hint}`);
         } else {
           console.log(`  ${pc5.dim("-")} ${instructionsPath} ${pc5.dim("(unchanged)")}`);
+          summaryLines.push(`- \`${instructionsRelPath}\` (unchanged)`);
         }
       }
       const skillsPath = formatPath(path12.join(targetDir, config.dir, "skills"));
+      const skillsRelPath = `${config.dir}/skills/`;
+      const newSkills = result.skills.synced.filter((s) => !previousSkills.includes(s)).sort();
+      const updatedSkills = result.skills.synced.filter((s) => previousSkills.includes(s)).sort();
+      const removedSkills = orphanResult.deleted.sort();
       console.log(
         `  ${pc5.green("+")} ${skillsPath}/ ${pc5.dim(`(${result.skills.synced.length} skills, ${targetResult.skills.copied} files)`)}`
       );
-      if (orphanResult.deleted.length > 0) {
-        for (const skill of orphanResult.deleted) {
-          const orphanPath = formatPath(path12.join(targetDir, config.dir, "skills", skill));
-          console.log(
-            `  ${pc5.red("-")} ${orphanPath}/ ${pc5.dim("(removed - no longer in source)")}`
-          );
+      summaryLines.push(
+        `- \`${skillsRelPath}\` (${result.skills.synced.length} skills, ${targetResult.skills.copied} files)`
+      );
+      const MAX_ITEMS_DEFAULT = 5;
+      const shouldExpand = options.expandChanges === true;
+      const formatSkillList = (skills, icon, colorFn, label, mdLabel) => {
+        if (skills.length === 0) return;
+        const maxDisplay = shouldExpand ? skills.length : MAX_ITEMS_DEFAULT;
+        const displaySkills = skills.slice(0, maxDisplay);
+        const hiddenCount = skills.length - displaySkills.length;
+        for (const skill of displaySkills) {
+          const skillPath = formatPath(path12.join(targetDir, config.dir, "skills", skill));
+          const skillRelPath = `${config.dir}/skills/${skill}/`;
+          console.log(`    ${colorFn(icon)} ${skillPath}/ ${pc5.dim(`(${label})`)}`);
+          summaryLines.push(`  - \`${skillRelPath}\` (${mdLabel})`);
         }
+        if (hiddenCount > 0) {
+          console.log(`    ${pc5.dim(`  ... ${hiddenCount} more ${label}`)}`);
+          summaryLines.push(`  - ... ${hiddenCount} more ${mdLabel}`);
+        }
+      };
+      formatSkillList(newSkills, "+", pc5.green, "new", "new");
+      formatSkillList(updatedSkills, "~", pc5.yellow, "updated", "updated");
+      for (const skill of removedSkills) {
+        const orphanPath = formatPath(path12.join(targetDir, config.dir, "skills", skill));
+        const orphanRelPath = `${config.dir}/skills/${skill}/`;
+        console.log(`    ${pc5.red("-")} ${orphanPath}/ ${pc5.dim("(removed)")}`);
+        summaryLines.push(`  - \`${orphanRelPath}\` (removed)`);
       }
       if (orphanResult.skipped.length > 0) {
         for (const skill of orphanResult.skipped) {
           const orphanPath = formatPath(path12.join(targetDir, config.dir, "skills", skill));
-          console.log(`  ${pc5.yellow("!")} ${orphanPath}/ ${pc5.dim("(orphaned but skipped)")}`);
+          const orphanRelPath = `${config.dir}/skills/${skill}/`;
+          console.log(`    ${pc5.yellow("!")} ${orphanPath}/ ${pc5.dim("(orphaned but skipped)")}`);
+          summaryLines.push(`  - \`${orphanRelPath}\` (orphaned but skipped)`);
         }
       }
     }
@@ -1896,29 +1928,37 @@ async function performSync(options) {
       for (const filename of workflowResult.created) {
         const workflowPath = formatPath(path12.join(targetDir, ".github/workflows", filename));
         console.log(`  ${pc5.green("+")} ${workflowPath} ${pc5.dim("(created)")}`);
+        summaryLines.push(`- \`.github/workflows/${filename}\` (created)`);
       }
       for (const filename of workflowResult.updated) {
         const workflowPath = formatPath(path12.join(targetDir, ".github/workflows", filename));
         console.log(`  ${pc5.yellow("~")} ${workflowPath} ${pc5.dim("(updated)")}`);
+        summaryLines.push(`- \`.github/workflows/${filename}\` (updated)`);
       }
       for (const filename of workflowResult.unchanged) {
         const workflowPath = formatPath(path12.join(targetDir, ".github/workflows", filename));
         console.log(`  ${pc5.dim("-")} ${workflowPath} ${pc5.dim("(unchanged)")}`);
+        summaryLines.push(`- \`.github/workflows/${filename}\` (unchanged)`);
       }
     }
     const lockfilePath = formatPath(path12.join(targetDir, ".agent-conf", "agent-conf.lock"));
     console.log(`  ${pc5.green("+")} ${lockfilePath}`);
+    summaryLines.push("- `.agent-conf/lockfile.json` (updated)");
     const hookPath = formatPath(path12.join(targetDir, ".git/hooks/pre-commit"));
     if (hookResult.installed) {
       if (hookResult.alreadyExisted && !hookResult.wasUpdated) {
         console.log(`  ${pc5.dim("-")} ${hookPath} ${pc5.dim("(unchanged)")}`);
+        summaryLines.push("- `.git/hooks/pre-commit` (unchanged)");
       } else if (hookResult.wasUpdated) {
         console.log(`  ${pc5.yellow("~")} ${hookPath} ${pc5.dim("(updated)")}`);
+        summaryLines.push("- `.git/hooks/pre-commit` (updated)");
       } else {
         console.log(`  ${pc5.green("+")} ${hookPath} ${pc5.dim("(installed)")}`);
+        summaryLines.push("- `.git/hooks/pre-commit` (installed)");
       }
     } else if (hookResult.alreadyExisted) {
       console.log(`  ${pc5.yellow("!")} ${hookPath} ${pc5.dim("(skipped - custom hook exists)")}`);
+      summaryLines.push("- `.git/hooks/pre-commit` (skipped - custom hook exists)");
     }
     console.log();
     console.log(pc5.dim(`Source: ${formatSourceString(resolvedSource.source)}`));
@@ -1928,6 +1968,19 @@ async function performSync(options) {
     if (targets.length > 1) {
       console.log(pc5.dim(`Targets: ${targets.join(", ")}`));
     }
+    if (options.summaryFile) {
+      const sourceStr = formatSourceString(resolvedSource.source);
+      const versionStr = resolvedVersion.version ? `v${resolvedVersion.version}` : resolvedVersion.ref;
+      const summary = `## Changes
+
+${summaryLines.join("\n")}
+
+---
+**Source:** ${sourceStr}
+**Version:** ${versionStr}
+`;
+      await fs12.writeFile(options.summaryFile, summary, "utf-8");
+    }
     prompts3.outro(pc5.green("Done!"));
   } catch (error) {
     syncSpinner.fail("Sync failed");
@@ -1978,7 +2031,7 @@ async function initCommand(options) {
 }
 
 // src/commands/init-canonical-repo.ts
-import * as fs12 from "fs/promises";
+import * as fs13 from "fs/promises";
 import * as path13 from "path";
 import * as prompts5 from "@clack/prompts";
 import pc7 from "picocolors";
@@ -2161,7 +2214,7 @@ jobs:
         run: npm install -g agent-conf
 
       - name: Run sync
-        run: agent-conf sync --yes
+        run: agent-conf sync --yes --summary-file /tmp/sync-summary.md --expand-changes
         env:
           GITHUB_TOKEN: \${{ secrets.token }}
 
@@ -2205,10 +2258,17 @@ jobs:
         env:
           GH_TOKEN: \${{ github.token }}
         run: |
+          # Read sync summary if available
+          if [ -f /tmp/sync-summary.md ]; then
+            SYNC_SUMMARY=$(cat /tmp/sync-summary.md)
+          else
+            SYNC_SUMMARY="## Changes
+          - Synced agent configuration from canonical repository"
+          fi
+
           PR_BODY="This PR was automatically created by the ${prefix} sync workflow.
 
-          ## Changes
-          - Synced agent configuration from canonical repository
+          $SYNC_SUMMARY
 
           ---
           *This is an automated PR. Review the changes and merge when ready.*"
@@ -2398,27 +2458,27 @@ async function initCanonicalRepoCommand(options) {
     await ensureDir(skillsDir);
     await ensureDir(workflowsDir);
     const configPath = path13.join(resolvedOptions.targetDir, "agent-conf.yaml");
-    await fs12.writeFile(configPath, generateConfigYaml(resolvedOptions), "utf-8");
+    await fs13.writeFile(configPath, generateConfigYaml(resolvedOptions), "utf-8");
     const agentsMdPath = path13.join(instructionsDir, "AGENTS.md");
-    await fs12.writeFile(agentsMdPath, generateAgentsMd(resolvedOptions), "utf-8");
+    await fs13.writeFile(agentsMdPath, generateAgentsMd(resolvedOptions), "utf-8");
     if (resolvedOptions.includeExamples) {
       const exampleSkillDir = path13.join(skillsDir, "example-skill");
       const referencesDir = path13.join(exampleSkillDir, "references");
       await ensureDir(referencesDir);
       const skillMdPath = path13.join(exampleSkillDir, "SKILL.md");
-      await fs12.writeFile(skillMdPath, generateExampleSkillMd(), "utf-8");
+      await fs13.writeFile(skillMdPath, generateExampleSkillMd(), "utf-8");
       const gitkeepPath = path13.join(referencesDir, ".gitkeep");
-      await fs12.writeFile(gitkeepPath, "", "utf-8");
+      await fs13.writeFile(gitkeepPath, "", "utf-8");
     }
     const syncWorkflowPath = path13.join(workflowsDir, "sync-reusable.yml");
     const checkWorkflowPath = path13.join(workflowsDir, "check-reusable.yml");
     const repoFullName = resolvedOptions.organization ? `${resolvedOptions.organization}/${resolvedOptions.name}` : resolvedOptions.name;
-    await fs12.writeFile(
+    await fs13.writeFile(
       syncWorkflowPath,
       generateSyncWorkflow2(repoFullName, resolvedOptions.markerPrefix),
       "utf-8"
     );
-    await fs12.writeFile(
+    await fs13.writeFile(
       checkWorkflowPath,
       generateCheckWorkflow2(repoFullName, resolvedOptions.markerPrefix),
       "utf-8"
@@ -2603,7 +2663,9 @@ async function syncCommand(options) {
     },
     tempDir,
     yes: options.yes,
-    sourceRepo: repository
+    sourceRepo: repository,
+    summaryFile: options.summaryFile,
+    expandChanges: options.expandChanges
   });
 }
 
@@ -2690,14 +2752,10 @@ async function warnIfCliOutdated() {
       console.log();
       console.log(
         pc11.yellow(
-          `\u26A0 CLI is outdated: built from ${mismatch.cliCommit}, but repo was synced from ${mismatch.lockfileCommit}`
-        )
-      );
-      console.log(
-        pc11.yellow(
-          "  Rebuild the CLI: cd <agent-conf-repo>/cli && pnpm build && pnpm link --global"
+          `\u26A0 CLI is outdated: v${mismatch.currentVersion} installed, but repo was synced with v${mismatch.lockfileVersion}`
         )
       );
+      console.log(pc11.yellow("  Run: agent-conf upgrade-cli"));
       console.log();
     }
   } catch {
@@ -2719,7 +2777,7 @@ function createCli() {
   program.command("sync").description("Sync content from canonical repository (fetches latest by default)").option(
     "-s, --source <repo>",
     "Canonical repository in owner/repo format (e.g., acme/standards)"
-  ).option("--local [path]", "Use local canonical repository (auto-discover or specify path)").option("-y, --yes", "Non-interactive mode (merge by default)").option("--override", "Override existing AGENTS.md instead of merging").option("--ref <ref>", "GitHub ref/version to sync from").option("--pinned", "Use lockfile version without fetching latest").option("-t, --target <targets...>", "Target platforms (claude, codex)", ["claude"]).action(
+  ).option("--local [path]", "Use local canonical repository (auto-discover or specify path)").option("-y, --yes", "Non-interactive mode (merge by default)").option("--override", "Override existing AGENTS.md instead of merging").option("--ref <ref>", "GitHub ref/version to sync from").option("--pinned", "Use lockfile version without fetching latest").option("-t, --target <targets...>", "Target platforms (claude, codex)", ["claude"]).option("--summary-file <path>", "Write sync summary to file (markdown, for CI)").option("--expand-changes", "Show all items in output (default: first 5)").action(
     async (options) => {
       await syncCommand(options);
     }