@comet/cli 9.0.0-beta.1 → 9.0.0-beta.3

package/lib/commands/generate-block-types.js

@@ -100,8 +100,9 @@ function writeFieldType(field, blockNamePostfix) {
         content += "{\n";
         field.object.fields.forEach(function (f) {
             content += f.name;
-            if (f.nullable)
+            if (f.nullable) {
                 content += "?";
+            }
             content += ": ";
             writeFieldType(f, blockNamePostfix);
             content += ";\n";
@@ -112,8 +113,9 @@ function writeFieldType(field, blockNamePostfix) {
         content += "Array<{\n";
         field.object.fields.forEach(function (f) {
             content += f.name;
-            if (f.nullable)
+            if (f.nullable) {
                 content += "?";
+            }
             content += ": ";
             writeFieldType(f, blockNamePostfix);
             content += ";\n";
@@ -146,8 +148,9 @@ var generateBlockTypes = new commander_1.Command("generate-block-types")
                     content += "export interface ".concat(block.name, "BlockData {\n");
                     block.fields.forEach(function (field) {
                         content += field.name;
-                        if (field.nullable)
+                        if (field.nullable) {
                             content += "?";
+                        }
                         content += ": ";
                         writeFieldType(field, "BlockData");
                         content += ";\n";
@@ -159,8 +162,9 @@ var generateBlockTypes = new commander_1.Command("generate-block-types")
                         content += "export interface ".concat(block.name, "BlockInput {\n");
                         block.inputFields.forEach(function (field) {
                             content += field.name;
-                            if (field.nullable)
+                            if (field.nullable) {
                                 content += "?";
+                            }
                             content += ": ";
                             writeFieldType(field, "BlockInput");
                             content += ";\n";

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

@@ -86,17 +86,18 @@ function parseRepoUrl(rawUrl) {
     }
     return { repoUrl: rawUrl.slice(0, hashIndex), ref: rawUrl.slice(hashIndex + 1) || undefined };
 }
+var SKILL_SOURCE_PATHS = ["skills", "agentic-plugin/skills"];
 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
+    // Use sparse checkout to fetch only the skill source folders
     (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");
+    fs.writeFileSync(path.join(tmpDir, ".git", "info", "sparse-checkout"), SKILL_SOURCE_PATHS.map(function (p) { return "".concat(p, "/\n"); }).join(""));
     var fetchRef = ref !== null && ref !== void 0 ? ref : "HEAD";
     try {
-        console.log("Fetching ".concat(repoUrl, " ref \"").concat(fetchRef, "\" (sparse, skills/ only)..."));
+        console.log("Fetching ".concat(repoUrl, " ref \"").concat(fetchRef, "\" (sparse, ").concat(SKILL_SOURCE_PATHS.map(function (p) { return "".concat(p, "/"); }).join(", "), " 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" });
     }
@@ -127,8 +128,9 @@ function isInternalSkill(skillFolderPath) {
         return false;
     }
     var frontmatterMatch = skillMdContent.match(/^---\n([\s\S]*?)\n---/);
-    if (!frontmatterMatch)
+    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;
@@ -139,8 +141,9 @@ function isInternalSkill(skillFolderPath) {
 }
 function listSkillFolders(directory, filterInternal) {
     if (filterInternal === void 0) { filterInternal = false; }
-    if (!fs.existsSync(directory))
+    if (!fs.existsSync(directory)) {
         return [];
+    }
     return fs
         .readdirSync(directory)
         .filter(function (f) { return fs.statSync(path.join(directory, f)).isDirectory(); })
@@ -173,8 +176,9 @@ function installSkills(sources, targetDirs, _a) {
                     console.log("  [dry-run] Would ".concat(symlink ? "symlink" : "copy", ": ").concat(srcPath, " -> ").concat(destPath));
                 }
                 else {
-                    if (exists)
+                    if (exists) {
                         fs.rmSync(destPath, { recursive: true, force: true });
+                    }
                     if (symlink) {
                         fs.symlinkSync(srcPath, destPath);
                     }
@@ -202,12 +206,12 @@ exports.installAgentSkillsCommand = new commander_1.Command("install-agent-skill
     .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) {
+    var configPath, dryRun, resolvedConfig, repos, cwd, targetDirs, _i, targetDirs_2, dir, sources, tempDirs, _a, repos_1, rawUrl, cloneDir, _b, SKILL_SOURCE_PATHS_1, p, _c, tempDirs_1, tmpDir;
+    var _d;
+    return __generator(this, function (_e) {
         configPath = options.config, dryRun = options.dryRun;
         resolvedConfig = path.resolve(configPath);
-        repos = fs.existsSync(resolvedConfig) ? ((_c = loadConfig(configPath).repos) !== null && _c !== void 0 ? _c : []) : [];
+        repos = fs.existsSync(resolvedConfig) ? ((_d = loadConfig(configPath).repos) !== null && _d !== void 0 ? _d : []) : [];
         console.log("=== Installing agent skills".concat(dryRun ? " (dry run)" : "", " ==="));
         cwd = process.cwd();
         targetDirs = [path.join(cwd, ".agents", "skills"), path.join(cwd, ".claude", "skills")];
@@ -216,25 +220,32 @@ exports.installAgentSkillsCommand = new commander_1.Command("install-agent-skill
             dir = targetDirs_2[_i];
             fs.mkdirSync(dir, { recursive: true });
         }
-        sources = [{ label: "local skills/", directory: path.join(cwd, "skills"), symlink: true }];
+        sources = SKILL_SOURCE_PATHS.map(function (p) { return ({
+            label: "local ".concat(p, "/"),
+            directory: path.join(cwd, p),
+            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,
-                });
+                for (_b = 0, SKILL_SOURCE_PATHS_1 = SKILL_SOURCE_PATHS; _b < SKILL_SOURCE_PATHS_1.length; _b++) {
+                    p = SKILL_SOURCE_PATHS_1[_b];
+                    sources.push({
+                        label: "external ".concat(rawUrl, " (").concat(p, "/)"),
+                        directory: path.join(cloneDir, p),
+                        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];
+            for (_c = 0, tempDirs_1 = tempDirs; _c < tempDirs_1.length; _c++) {
+                tmpDir = tempDirs_1[_c];
                 fs.rmSync(tmpDir, { recursive: true, force: true });
             }
         }

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

@@ -59,14 +59,16 @@ function mockFilesystem(skillMap, existingDests, skillMdContents) {
         return { isDirectory: function () { return isDir; } };
     });
     vitest_1.vi.mocked(fs.lstatSync).mockImplementation(function (p) {
-        if (existingDests.includes(String(p)))
+        if (existingDests.includes(String(p))) {
             return {};
+        }
         throw Object.assign(new Error("ENOENT"), { code: "ENOENT" });
     });
     vitest_1.vi.mocked(fs.readFileSync).mockImplementation(function (p) {
         var content = skillMdContents[String(p)];
-        if (content !== undefined)
+        if (content !== undefined) {
             return content;
+        }
         throw Object.assign(new Error("ENOENT"), { code: "ENOENT" });
     });
 }

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.1",
+  "version": "9.0.0-beta.3",
   "description": "A collection of CLI tools for Comet projects",
   "repository": {
     "directory": "packages/cli",
@@ -20,19 +20,19 @@
   ],
   "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",
+    "@types/node": "^24.12.2",
     "eslint": "^9.39.2",
     "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.1"
+    "@comet/eslint-config": "9.0.0-beta.3"
   },
   "engines": {
     "node": ">=22.0.0"
@@ -48,6 +48,9 @@
     "lint": "run-p lint:prettier lint:eslint lint:tsc",
     "lint:ci": "pnpm run lint",
     "lint:eslint": "eslint --max-warnings 0 src/ '**/*.json' --no-warn-ignored",
+    "lint:fix": "run-p lint:fix:eslint lint:fix:prettier",
+    "lint:fix:eslint": "pnpm run lint:eslint --fix",
+    "lint:fix:prettier": "pnpm run lint:prettier --write",
     "lint:prettier": "pnpm exec prettier --check '*.{ts,js,json,md,yml,yaml}'",
     "lint:tsc": "tsc",
     "test": "vitest --run",