@danieldeusing/seedr 0.1.134 → 0.1.136

package/README.md

@@ -34,6 +34,10 @@ paths, no IP stored (the server keeps only the country it derives from the reque
 Events are deleted after 90 days. Nothing is sent for failed installs or `--dry-run`, and a
 failing endpoint never affects an installation.
 
+Only installs from seedr's own registry are counted. With `SEEDR_REGISTRY_URL` or
+`SEEDR_REGISTRY_DIR` pointing at another registry nothing is sent, unless
+`SEEDR_ANALYTICS_URL` names that registry's own endpoint.
+
 Opt out by setting the variable to any value:
 
 ```bash

package/dist/{chunk-7RMRI2TO.js → chunk-D4Y67NUX.js}

@@ -4,7 +4,7 @@
 import { readFile as readFile3, readdir, writeFile as writeFile2, mkdir as mkdir2, mkdtemp, rm as rm2 } from "fs/promises";
 import { existsSync as existsSync11 } from "fs";
 import { tmpdir } from "os";
-import { join as join13, dirname as dirname6 } from "path";
+import { basename as basename6, join as join13, dirname as dirname6 } from "path";
 import { fileURLToPath } from "url";
 
 // ../registry-ops/src/paths.ts
@@ -519,6 +519,7 @@ function resolveLocalRegistryPath() {
 var REGISTRY_PATH = process.env.SEEDR_REGISTRY_DIR || resolveLocalRegistryPath();
 var DEFAULT_REGISTRY_URL = "https://raw.githubusercontent.com/danieldeusing/seedr/main/registry";
 var REGISTRY_URL = (process.env.SEEDR_REGISTRY_URL || DEFAULT_REGISTRY_URL).replace(/\/+$/, "");
+var USES_DEFAULT_REGISTRY = !process.env.SEEDR_REGISTRY_DIR && REGISTRY_URL === DEFAULT_REGISTRY_URL && (REGISTRY_PATH === null || basename6(REGISTRY_PATH) === DEFAULT_REGISTRY_DIR);
 var REGISTRY_ROOT_URL = REGISTRY_URL.replace(/\/registry$/, "");
 function assertSafeNodeName(name) {
   if (name === "" || name === "." || name.includes("/") || name.includes("\\") || name.includes("..")) {
@@ -1368,6 +1369,7 @@ export {
   copyDirectory,
   parseGitHubRepo,
   getEffectiveSourceRevision,
+  USES_DEFAULT_REGISTRY,
   loadManifest,
   getItem,
   getItemsBySlug,

package/dist/cli.js

@@ -6,6 +6,7 @@ import {
   CODING_AGENTS,
   MAX_SLUG_LENGTH,
   SLUG_PATTERN,
+  USES_DEFAULT_REGISTRY,
   assertDirectoryWithin,
   assertOverwritable,
   assertSafePathSegment,
@@ -67,7 +68,7 @@ import {
   writeFileAtomic,
   writeJson,
   writeTextFile
-} from "./chunk-7RMRI2TO.js";
+} from "./chunk-D4Y67NUX.js";
 
 // src/cli.ts
 import { Command as Command5 } from "commander";
@@ -141,17 +142,21 @@ function validateType(value) {
 // src/utils/analytics.ts
 var ANALYTICS_URL = "https://seedr.danieldeusing.de/api/installs";
 var TELEMETRY_OPT_OUT_VARIABLE = "SEEDR_NO_TELEMETRY";
+var ANALYTICS_URL_VARIABLE = "SEEDR_ANALYTICS_URL";
 var REQUEST_TIMEOUT_MS = 4e3;
-var TELEMETRY_HELP_TEXT = `Sends one anonymous install event per successful agent target to ${ANALYTICS_URL}; set ${TELEMETRY_OPT_OUT_VARIABLE}=1 to disable`;
+var TELEMETRY_HELP_TEXT = `Sends one anonymous install event per successful agent target to ${ANALYTICS_URL} (installs from another registry send nothing unless ${ANALYTICS_URL_VARIABLE} names an endpoint); set ${TELEMETRY_OPT_OUT_VARIABLE}=1 to disable`;
 function isTelemetryDisabled(env = process.env) {
   return env[TELEMETRY_OPT_OUT_VARIABLE] !== void 0;
 }
+function analyticsEndpoint(env = process.env) {
+  return env[ANALYTICS_URL_VARIABLE] || (USES_DEFAULT_REGISTRY ? ANALYTICS_URL : null);
+}
 function cliVersion() {
-  return true ? "0.1.134" : "dev";
+  return true ? "0.1.136" : "dev";
 }
-async function sendEvent(event) {
+async function sendEvent(endpoint, event) {
   try {
-    await fetch(ANALYTICS_URL, {
+    await fetch(endpoint, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(event),
@@ -161,9 +166,10 @@ async function sendEvent(event) {
   }
 }
 function trackInstalls(slug, type, results, scope) {
-  if (isTelemetryDisabled()) return Promise.resolve();
+  const endpoint = analyticsEndpoint();
+  if (isTelemetryDisabled() || endpoint === null) return Promise.resolve();
   const version = cliVersion();
-  const sends = results.filter((result) => result.success).map((result) => sendEvent({ slug, type, tool: result.agent, scope, version }));
+  const sends = results.filter((result) => result.success).map((result) => sendEvent(endpoint, { slug, type, tool: result.agent, scope, version }));
   return Promise.all(sends).then(() => void 0);
 }
 
@@ -907,32 +913,59 @@ function transportOf(config) {
 function definedEntries(object) {
   return Object.fromEntries(Object.entries(object).filter(([, value]) => value !== void 0));
 }
+var PLACEHOLDER = /\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g;
+var WHOLE_PLACEHOLDER = /^\$\{([A-Za-z_][A-Za-z0-9_]*)\}$/;
+var BEARER_PLACEHOLDER = /^Bearer \$\{([A-Za-z_][A-Za-z0-9_]*)\}$/;
+var toOpenCodeRef = (value) => value.replace(PLACEHOLDER, "{env:$1}");
+function mapValues(record, map) {
+  return record && Object.fromEntries(Object.entries(record).map(([key, value]) => [key, map(value)]));
+}
 function toOpenCodeServer(config) {
   if (transportOf(config) === "stdio") {
     if (!config.command) throw new Error(NO_COMMAND_ERROR);
     return definedEntries({
       type: "local",
-      command: [config.command, ...config.args ?? []],
-      environment: config.env,
+      command: [config.command, ...config.args ?? []].map(toOpenCodeRef),
+      environment: mapValues(config.env, toOpenCodeRef),
       enabled: true
     });
   }
   if (!config.url) throw new Error(NO_URL_ERROR);
-  return definedEntries({ type: "remote", url: config.url, headers: config.headers, enabled: true });
-}
-function codexMainEntries(config) {
+  return definedEntries({ type: "remote", url: toOpenCodeRef(config.url), headers: mapValues(config.headers, toOpenCodeRef), enabled: true });
+}
+function codexPassthrough(config) {
+  const env = {};
+  const envVars = [];
+  for (const [key, value] of Object.entries(config.env ?? {})) {
+    if (WHOLE_PLACEHOLDER.exec(value)?.[1] === key) envVars.push(key);
+    else env[key] = value;
+  }
+  const headers = {};
+  const envHeaders = {};
+  let bearer = config.bearer_token_env_var || void 0;
+  for (const [key, value] of Object.entries(config.headers ?? {})) {
+    const bearerVar = key.toLowerCase() === "authorization" ? BEARER_PLACEHOLDER.exec(value)?.[1] : void 0;
+    const wholeVar = WHOLE_PLACEHOLDER.exec(value)?.[1];
+    if (bearerVar && !bearer) bearer = bearerVar;
+    else if (wholeVar) envHeaders[key] = wholeVar;
+    else headers[key] = value;
+  }
+  return { env, envVars, headers, envHeaders, bearer };
+}
+function codexMainEntries(config, passthrough) {
   if (transportOf(config) === "stdio") {
     if (!config.command) throw new Error(NO_COMMAND_ERROR);
     return definedEntries({
       command: config.command,
       args: config.args && config.args.length > 0 ? config.args : void 0,
-      cwd: config.cwd || void 0
+      cwd: config.cwd || void 0,
+      env_vars: passthrough.envVars.length > 0 ? passthrough.envVars : void 0
     });
   }
   if (!config.url) throw new Error(NO_URL_ERROR);
   return definedEntries({
     url: config.url,
-    bearer_token_env_var: config.bearer_token_env_var || void 0
+    bearer_token_env_var: passthrough.bearer
   });
 }
 function hasEntries(record) {
@@ -940,12 +973,16 @@ function hasEntries(record) {
 }
 function toCodexTables(name, config) {
   const base = [CODEX_TABLE, name];
-  const tables = [{ keyPath: base, entries: codexMainEntries(config) }];
-  if (hasEntries(config.env)) {
-    tables.push({ keyPath: [...base, "env"], entries: { ...config.env } });
+  const passthrough = codexPassthrough(config);
+  const tables = [{ keyPath: base, entries: codexMainEntries(config, passthrough) }];
+  if (hasEntries(passthrough.env)) {
+    tables.push({ keyPath: [...base, "env"], entries: passthrough.env });
+  }
+  if (hasEntries(passthrough.headers)) {
+    tables.push({ keyPath: [...base, "http_headers"], entries: passthrough.headers });
   }
-  if (hasEntries(config.headers)) {
-    tables.push({ keyPath: [...base, "http_headers"], entries: { ...config.headers } });
+  if (hasEntries(passthrough.envHeaders)) {
+    tables.push({ keyPath: [...base, "env_http_headers"], entries: passthrough.envHeaders });
   }
   return tables;
 }
@@ -2113,19 +2150,22 @@ var claudeTarget = {
   kind: "file",
   dir: (scope, cwd) => join7(scope === "user" ? claudeUserRoot() : join7(cwd, ".claude"), "rules"),
   fileName: markdownFile,
-  keepsFrontmatter: true
+  keepsFrontmatter: true,
+  scopeKey: "paths"
 };
 var antigravityTarget = {
   kind: "file",
   dir: (scope, cwd) => join7(scope === "user" ? join7(home2, ".gemini", "config") : join7(cwd, ".agents"), "rules"),
   fileName: markdownFile,
-  keepsFrontmatter: true
+  keepsFrontmatter: true,
+  scopeKey: "glob"
 };
 var copilotTarget = {
   kind: "file",
   dir: (scope, cwd) => join7(scope === "user" ? copilotUserRoot() : join7(cwd, ".github"), "instructions"),
   fileName: (slug) => `${slug}.instructions.md`,
-  keepsFrontmatter: true
+  keepsFrontmatter: true,
+  scopeKey: "applyTo"
 };
 var codexTarget = {
   kind: "section",
@@ -2159,9 +2199,59 @@ function stripFrontmatter(content) {
   const match = /^---\r?\n[\s\S]*?\r?\n---\r?\n?/.exec(content);
   return match ? content.slice(match[0].length) : content;
 }
+var FRONTMATTER = /^---\r?\n([\s\S]*?)\r?\n---(\r?\n|$)/;
+var SCOPE_LINE = /^(applyTo|paths|glob):(.*)$/;
+var unquote = (value) => value.trim().replace(/^(["'])(.*)\1$/, "$2").trim();
+function continuationLength(lines, index) {
+  let count = 0;
+  while (index + count + 1 < lines.length && /^(\s+\S|-\s)/.test(lines[index + count + 1])) count++;
+  return count;
+}
+function splitGlobs(value) {
+  const parts = [""];
+  let depth = 0;
+  for (const char of value) {
+    if (char === "{") depth++;
+    else if (char === "}") depth = Math.max(0, depth - 1);
+    if (char === "," && depth === 0) parts.push("");
+    else parts[parts.length - 1] += char;
+  }
+  return parts;
+}
+function ruleScope(content) {
+  const lines = FRONTMATTER.exec(content)?.[1]?.split(/\r?\n/) ?? [];
+  for (let i = 0; i < lines.length; i++) {
+    const inline = SCOPE_LINE.exec(lines[i])?.[2]?.trim();
+    if (inline === void 0) continue;
+    const values = inline ? splitGlobs(inline.startsWith("[") ? inline.slice(1, -1) : unquote(inline)) : lines.slice(i + 1, i + 1 + continuationLength(lines, i)).map((line) => line.replace(/^\s*-\s*/, ""));
+    return values.map(unquote).filter((glob) => glob.length > 0);
+  }
+  return [];
+}
+function withScopeKey(content, key) {
+  const globs = ruleScope(content);
+  const match = FRONTMATTER.exec(content);
+  if (globs.length === 0 || !match) return content;
+  const lines = match[1].split(/\r?\n/);
+  if (lines.some((line) => SCOPE_LINE.exec(line)?.[1] === key)) return content;
+  const kept = [];
+  for (let i = 0; i < lines.length; i++) {
+    if (SCOPE_LINE.test(lines[i])) i += continuationLength(lines, i);
+    else kept.push(lines[i]);
+  }
+  const scope = key === "paths" ? ["paths:", ...globs.map((glob) => `  - ${JSON.stringify(glob)}`)] : [`${key}: ${JSON.stringify(globs.join(", "))}`];
+  return `---
+${[...kept, ...scope].join("\n")}
+---${match[2]}${content.slice(match[0].length)}`;
+}
+var scopeProse = (globs) => `Applies to files matching ${globs.map((glob) => `\`${glob}\``).join(", ")}.`;
 function upsertSection(document, slug, content) {
+  const globs = ruleScope(content);
+  const body = stripFrontmatter(content).trim();
   const block = `${sectionStart(slug)}
-${stripFrontmatter(content).trim()}
+${globs.length > 0 ? `${scopeProse(globs)}
+
+` : ""}${body}
 ${sectionEnd(slug)}`;
   const existing = sectionPattern(slug);
   if (existing.test(document)) {
@@ -2220,7 +2310,7 @@ async function installRuleForAgent(item, agent, scope, force, cwd, content) {
       await assertOverwritable(destination, force);
       await writeFile2(
         destination,
-        target.keepsFrontmatter ? content : stripFrontmatter(content),
+        target.keepsFrontmatter ? withScopeKey(content, target.scopeKey) : stripFrontmatter(content),
         "utf-8"
       );
     } else {
@@ -2279,6 +2369,8 @@ async function getInstalledRules(agent, scope, cwd = process.cwd()) {
 async function planRule(item, agents, scope, _method, cwd) {
   assertValidSlug(item.slug, SLUG_LABEL4);
   const changes = [];
+  const merges = agents.some((agent) => ruleTargetFor(agent).kind === "section");
+  const globs = merges ? ruleScope(await readRuleContent(item)) : [];
   for (const agent of agents) {
     const target = ruleTargetFor(agent);
     const destination = await destinationFor(target, item.slug, scope, cwd);
@@ -2287,7 +2379,7 @@ async function planRule(item, agents, scope, _method, cwd) {
       agent,
       kind: present ? "modify" : "create",
       path: destination,
-      detail: target.kind === "file" ? "rule file" : `merged section <!-- seedr:rule:${item.slug} --> (the rest of the file is untouched)`
+      detail: target.kind === "file" ? "rule file" : `merged section <!-- seedr:rule:${item.slug} --> (the rest of the file is untouched)` + (globs.length > 0 ? `; ${CODING_AGENTS[agent].name} has no path scope, so ${globs.map((glob) => `\`${glob}\``).join(", ")} is advisory prose` : "")
     });
   }
   return changes;
@@ -2993,7 +3085,7 @@ var initCommand = new Command4("init").description("Initialize coding agent conf
 // package.json
 var package_default = {
   name: "@danieldeusing/seedr",
-  version: "0.1.134",
+  version: "0.1.136",
   description: "Seed your projects with AI configurations",
   type: "module",
   bin: {

package/dist/index.js

@@ -15,7 +15,7 @@ import {
   loadManifest,
   searchItems,
   uninstallSkill
-} from "./chunk-7RMRI2TO.js";
+} from "./chunk-D4Y67NUX.js";
 export {
   ALL_AGENTS,
   CODING_AGENTS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danieldeusing/seedr",
-  "version": "0.1.134",
+  "version": "0.1.136",
   "description": "Seed your projects with AI configurations",
   "type": "module",
   "bin": {