@comet/cli 9.0.0-beta.2 → 9.0.0-beta.4

package/lib/commands/site-configs.js

@@ -116,7 +116,7 @@ exports.injectSiteConfigsCommand = new commander_1.Command("inject-site-configs"
     .option("--base64", "use base64 encoding")
     .option("-f, --site-config-file <file>", "Path to ts-file which provides a default export with (env: string) => SiteConfig[]")
     .action(function (options) { return __awaiter(void 0, void 0, void 0, function () {
-    var configFile, getSiteConfigs, str, getUrlFromDomain, replacerFunctions;
+    var configFile, getSiteConfigs, siteConfigsCache, getCachedSiteConfigs, str, getUrlFromDomain, replacerFunctions;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -124,6 +124,23 @@ exports.injectSiteConfigsCommand = new commander_1.Command("inject-site-configs"
                 return [4 /*yield*/, Promise.resolve("".concat(configFile)).then(function (s) { return __importStar(require(s)); })];
             case 1:
                 getSiteConfigs = (_a.sent()).default;
+                siteConfigsCache = new Map();
+                getCachedSiteConfigs = function (env) { return __awaiter(void 0, void 0, void 0, function () {
+                    var cached;
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                cached = siteConfigsCache.get(env);
+                                if (!!cached) return [3 /*break*/, 2];
+                                return [4 /*yield*/, getSiteConfigs(env)];
+                            case 1:
+                                cached = _a.sent();
+                                siteConfigsCache.set(env, cached);
+                                _a.label = 2;
+                            case 2: return [2 /*return*/, cached];
+                        }
+                    });
+                }); };
                 console.log("inject-site-configs: Replace site-configs in ".concat(options.inFile));
                 str = fs_1.default.readFileSync((0, path_1.resolve)(process.cwd(), options.inFile)).toString();
                 getUrlFromDomain = function (domain) {
@@ -151,7 +168,7 @@ exports.injectSiteConfigsCommand = new commander_1.Command("inject-site-configs"
                         var siteConfigs, ret;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
-                                case 0: return [4 /*yield*/, getSiteConfigs(env)];
+                                case 0: return [4 /*yield*/, getCachedSiteConfigs(env)];
                                 case 1:
                                     siteConfigs = _a.sent();
                                     console.log("inject-site-configs: - ".concat(substr, " (").concat(siteConfigs.length, " sites)"));
@@ -175,7 +192,7 @@ exports.injectSiteConfigsCommand = new commander_1.Command("inject-site-configs"
                         var siteConfigs, filteredSiteConfigs;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
-                                case 0: return [4 /*yield*/, getSiteConfigs(env)];
+                                case 0: return [4 /*yield*/, getCachedSiteConfigs(env)];
                                 case 1:
                                     siteConfigs = _a.sent();
                                     console.log("inject-site-domains: - ".concat(substr, " (").concat(siteConfigs.length, " sites)"));
@@ -199,8 +216,9 @@ exports.injectSiteConfigsCommand = new commander_1.Command("inject-site-configs"
 }); });
 var resolveOpReferences = function (input) {
     var opRefs = input.match(/\{\{ op:\/\/[^ }]+ \}\}/g);
-    if (!opRefs)
+    if (!opRefs) {
         return input;
+    }
     try {
         (0, child_process_1.execSync)("op --version", { stdio: "ignore" });
     }
@@ -208,12 +226,17 @@ var resolveOpReferences = function (input) {
         throw new Error("inject-site-configs: Config contains 1Password references (op://) but the 1Password CLI (op) is not installed. " +
             "Install from https://developer.1password.com/docs/cli/");
     }
+    var opCache = new Map();
     var result = input;
     for (var _i = 0, opRefs_1 = opRefs; _i < opRefs_1.length; _i++) {
         var ref = opRefs_1[_i];
         var opUri = ref.replace("{{ ", "").replace(" }}", "");
         try {
-            var secret = (0, child_process_1.execSync)("op read \"".concat(opUri, "\""), { encoding: "utf-8" }).trim();
+            var secret = opCache.get(opUri);
+            if (!secret) {
+                secret = (0, child_process_1.execSync)("op read \"".concat(opUri, "\""), { encoding: "utf-8" }).trim();
+                opCache.set(opUri, secret);
+            }
             console.log("inject-site-configs: - Resolved ".concat(ref));
             result = result.replace(ref, secret);
         }

package/lib/commands/site-configs.test.js

@@ -14,10 +14,12 @@ var mockedExecSync = vitest_1.vi.mocked(child_process_1.execSync);
 (0, vitest_1.describe)("resolveOpReferences", function () {
     (0, vitest_1.it)("should resolve op:// references", function () {
         mockedExecSync.mockImplementation(function (cmd) {
-            if (cmd === "op --version")
+            if (cmd === "op --version") {
                 return Buffer.from("2.0.0");
-            if (cmd === 'op read "op://vault/item/password"')
+            }
+            if (cmd === 'op read "op://vault/item/password"') {
                 return "resolved-secret\n";
+            }
             return "";
         });
         var result = (0, site_configs_1.resolveOpReferences)('{"key":"{{ op://vault/item/password }}"}');
@@ -31,8 +33,9 @@ var mockedExecSync = vitest_1.vi.mocked(child_process_1.execSync);
     });
     (0, vitest_1.it)("should throw an error when op reference resolution fails", function () {
         mockedExecSync.mockImplementation(function (cmd) {
-            if (cmd === "op --version")
+            if (cmd === "op --version") {
                 return Buffer.from("2.0.0");
+            }
             if (cmd === 'op read "op://vault/item/password"') {
                 throw new Error("Item not found");
             }
@@ -42,14 +45,18 @@ var mockedExecSync = vitest_1.vi.mocked(child_process_1.execSync);
     });
     (0, vitest_1.it)("should resolve multiple op:// references", function () {
         mockedExecSync.mockImplementation(function (cmd) {
-            if (cmd === "op --version")
+            if (cmd === "op --version") {
                 return Buffer.from("2.0.0");
-            if (cmd === 'op read "op://vault/item/api-key"')
+            }
+            if (cmd === 'op read "op://vault/item/api-key"') {
                 return "resolved-api-key\n";
-            if (cmd === 'op read "op://vault/item/api-secret"')
+            }
+            if (cmd === 'op read "op://vault/item/api-secret"') {
                 return "resolved-api-secret\n";
-            if (cmd === 'op read "op://vault/database/password"')
+            }
+            if (cmd === 'op read "op://vault/database/password"') {
                 return "resolved-db-password\n";
+            }
             return "";
         });
         var result = (0, site_configs_1.resolveOpReferences)('{"apiKey":"{{ op://vault/item/api-key }}","apiSecret":"{{ op://vault/item/api-secret }}","dbPassword":"{{ op://vault/database/password }}"}');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/cli",
-  "version": "9.0.0-beta.2",
+  "version": "9.0.0-beta.4",
   "description": "A collection of CLI tools for Comet projects",
   "repository": {
     "directory": "packages/cli",
@@ -14,25 +14,26 @@
   "bin": {
     "comet": "bin/comet.js"
   },
+  "sideEffects": false,
   "files": [
     "bin/**/*.js",
     "lib/*"
   ],
   "dependencies": {
     "commander": "^9.5.0",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^4.1.1",
     "prettier": "^3.6.2",
     "ts-node": "^10.9.2"
   },
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^24.12.0",
-    "eslint": "^9.39.2",
+    "@types/node": "^24.12.4",
+    "eslint": "^9.39.4",
     "npm-run-all2": "^8.0.4",
     "rimraf": "^6.1.2",
     "typescript": "^5.9.3",
     "vitest": "^4.0.16",
-    "@comet/eslint-config": "9.0.0-beta.2"
+    "@comet/eslint-config": "9.0.0-beta.4"
   },
   "engines": {
     "node": ">=22.0.0"

package/lib/commands/install-agent-skills.d.ts

@@ -1,15 +0,0 @@
-import { Command } from "commander";
-export interface SkillSource {
-    label: string;
-    directory: string;
-    /** If true, create symlinks; if false, copy files (used for tmp clone dirs) */
-    symlink: boolean;
-    /** If true, skills with metadata.internal: true in their SKILL.md are excluded */
-    filterInternal?: boolean;
-}
-export interface InstallOptions {
-    dryRun: boolean;
-}
-export declare function isInternalSkill(skillFolderPath: string): boolean;
-export declare function installSkills(sources: SkillSource[], targetDirs: string[], { dryRun }: InstallOptions): void;
-export declare const installAgentSkillsCommand: Command;

package/lib/commands/install-agent-skills.js

@@ -1,244 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.installAgentSkillsCommand = void 0;
-exports.isInternalSkill = isInternalSkill;
-exports.installSkills = installSkills;
-/* eslint-disable no-console */
-var child_process_1 = require("child_process");
-var commander_1 = require("commander");
-var fs = __importStar(require("fs"));
-var yaml = __importStar(require("js-yaml"));
-var os = __importStar(require("os"));
-var path = __importStar(require("path"));
-function parseRepoUrl(rawUrl) {
-    var hashIndex = rawUrl.lastIndexOf("#");
-    if (hashIndex === -1) {
-        return { repoUrl: rawUrl, ref: undefined };
-    }
-    return { repoUrl: rawUrl.slice(0, hashIndex), ref: rawUrl.slice(hashIndex + 1) || undefined };
-}
-function cloneRepo(rawUrl) {
-    var _a = parseRepoUrl(rawUrl), repoUrl = _a.repoUrl, ref = _a.ref;
-    var tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "comet-agent-skills-"));
-    // Use sparse checkout to fetch only the skills/ folder
-    (0, child_process_1.execFileSync)("git", ["init", tmpDir], { stdio: "pipe" });
-    (0, child_process_1.execFileSync)("git", ["-C", tmpDir, "remote", "add", "origin", "--", repoUrl], { stdio: "pipe" });
-    (0, child_process_1.execFileSync)("git", ["-C", tmpDir, "config", "core.sparseCheckout", "true"], { stdio: "pipe" });
-    fs.writeFileSync(path.join(tmpDir, ".git", "info", "sparse-checkout"), "skills/\n");
-    var fetchRef = ref !== null && ref !== void 0 ? ref : "HEAD";
-    try {
-        console.log("Fetching ".concat(repoUrl, " ref \"").concat(fetchRef, "\" (sparse, skills/ only)..."));
-        (0, child_process_1.execFileSync)("git", ["-C", tmpDir, "fetch", "--depth", "1", "origin", fetchRef], { stdio: "pipe" });
-        (0, child_process_1.execFileSync)("git", ["-C", tmpDir, "checkout", "FETCH_HEAD"], { stdio: "pipe" });
-    }
-    catch (_b) {
-        console.log("Shallow fetch failed for ref \"".concat(fetchRef, "\"; falling back to full fetch..."));
-        (0, child_process_1.execFileSync)("git", ["-C", tmpDir, "fetch", "origin", fetchRef], { stdio: "pipe" });
-        (0, child_process_1.execFileSync)("git", ["-C", tmpDir, "checkout", "FETCH_HEAD"], { stdio: "pipe" });
-    }
-    return tmpDir;
-}
-function pathExists(p) {
-    try {
-        fs.lstatSync(p);
-        return true;
-    }
-    catch (_a) {
-        return false;
-    }
-}
-function isInternalSkill(skillFolderPath) {
-    var _a;
-    var skillMdPath = path.join(skillFolderPath, "SKILL.md");
-    var skillMdContent;
-    try {
-        skillMdContent = fs.readFileSync(skillMdPath, "utf-8");
-    }
-    catch (_b) {
-        return false;
-    }
-    var frontmatterMatch = skillMdContent.match(/^---\n([\s\S]*?)\n---/);
-    if (!frontmatterMatch)
-        return false;
-    try {
-        var parsed = yaml.load(frontmatterMatch[1]);
-        return ((_a = parsed === null || parsed === void 0 ? void 0 : parsed.metadata) === null || _a === void 0 ? void 0 : _a.internal) === true;
-    }
-    catch (_c) {
-        return false;
-    }
-}
-function listSkillFolders(directory, filterInternal) {
-    if (filterInternal === void 0) { filterInternal = false; }
-    if (!fs.existsSync(directory))
-        return [];
-    return fs
-        .readdirSync(directory)
-        .filter(function (f) { return fs.statSync(path.join(directory, f)).isDirectory(); })
-        .filter(function (folder) { return !filterInternal || !isInternalSkill(path.join(directory, folder)); })
-        .sort();
-}
-function installSkills(sources, targetDirs, _a) {
-    var dryRun = _a.dryRun;
-    var installed = new Set();
-    for (var _i = 0, sources_1 = sources; _i < sources_1.length; _i++) {
-        var _b = sources_1[_i], label = _b.label, directory = _b.directory, symlink = _b.symlink, filterInternal = _b.filterInternal;
-        var folders = listSkillFolders(directory, filterInternal);
-        if (folders.length === 0) {
-            console.log("No skills found in ".concat(label));
-            continue;
-        }
-        console.log("Installing ".concat(folders.length, " skill(s) from ").concat(label, "..."));
-        for (var _c = 0, folders_1 = folders; _c < folders_1.length; _c++) {
-            var folder = folders_1[_c];
-            if (installed.has(folder)) {
-                console.warn("  CONFLICT: \"".concat(folder, "\" from ").concat(label, " skipped (already installed from a higher-priority source)"));
-                continue;
-            }
-            var srcPath = path.resolve(path.join(directory, folder));
-            for (var _d = 0, targetDirs_1 = targetDirs; _d < targetDirs_1.length; _d++) {
-                var targetDir = targetDirs_1[_d];
-                var destPath = path.join(targetDir, folder);
-                var exists = pathExists(destPath);
-                if (dryRun) {
-                    console.log("  [dry-run] Would ".concat(symlink ? "symlink" : "copy", ": ").concat(srcPath, " -> ").concat(destPath));
-                }
-                else {
-                    if (exists)
-                        fs.rmSync(destPath, { recursive: true, force: true });
-                    if (symlink) {
-                        fs.symlinkSync(srcPath, destPath);
-                    }
-                    else {
-                        fs.cpSync(srcPath, destPath, { recursive: true });
-                    }
-                    console.log("  ".concat(symlink ? "Symlinked" : "Copied", ": ").concat(folder));
-                }
-            }
-            installed.add(folder);
-        }
-    }
-    console.log("\nTotal skills installed: ".concat(installed.size));
-}
-function loadConfig(configPath) {
-    var resolved = path.resolve(configPath);
-    if (!fs.existsSync(resolved)) {
-        throw new Error("Config file not found: ".concat(resolved));
-    }
-    var raw = fs.readFileSync(resolved, "utf-8");
-    return JSON.parse(raw);
-}
-exports.installAgentSkillsCommand = new commander_1.Command("install-agent-skills")
-    .description("Install agent skills from local directories and optional external git repos")
-    .option("--config <path>", "Path to a JSON config file specifying repos to install skills from", "agent-skills.json")
-    .option("--dry-run", "Show which symlinks/copies would be created without making changes", false)
-    .action(function (options) { return __awaiter(void 0, void 0, void 0, function () {
-    var configPath, dryRun, resolvedConfig, repos, cwd, targetDirs, _i, targetDirs_2, dir, sources, tempDirs, _a, repos_1, rawUrl, cloneDir, _b, tempDirs_1, tmpDir;
-    var _c;
-    return __generator(this, function (_d) {
-        configPath = options.config, dryRun = options.dryRun;
-        resolvedConfig = path.resolve(configPath);
-        repos = fs.existsSync(resolvedConfig) ? ((_c = loadConfig(configPath).repos) !== null && _c !== void 0 ? _c : []) : [];
-        console.log("=== Installing agent skills".concat(dryRun ? " (dry run)" : "", " ==="));
-        cwd = process.cwd();
-        targetDirs = [path.join(cwd, ".agents", "skills"), path.join(cwd, ".claude", "skills")];
-        // Ensure target directories exist (without clearing existing contents)
-        for (_i = 0, targetDirs_2 = targetDirs; _i < targetDirs_2.length; _i++) {
-            dir = targetDirs_2[_i];
-            fs.mkdirSync(dir, { recursive: true });
-        }
-        sources = [{ label: "local skills/", directory: path.join(cwd, "skills"), symlink: true }];
-        tempDirs = [];
-        try {
-            for (_a = 0, repos_1 = repos; _a < repos_1.length; _a++) {
-                rawUrl = repos_1[_a];
-                cloneDir = cloneRepo(rawUrl);
-                tempDirs.push(cloneDir);
-                sources.push({
-                    label: "external ".concat(rawUrl),
-                    directory: path.join(cloneDir, "skills"),
-                    symlink: false,
-                    filterInternal: true,
-                });
-            }
-            installSkills(sources, targetDirs, { dryRun: dryRun });
-        }
-        finally {
-            for (_b = 0, tempDirs_1 = tempDirs; _b < tempDirs_1.length; _b++) {
-                tmpDir = tempDirs_1[_b];
-                fs.rmSync(tmpDir, { recursive: true, force: true });
-            }
-        }
-        console.log("=== Finished ===");
-        return [2 /*return*/];
-    });
-}); });