@hasna/instructions 0.4.14 → 0.4.16

package/dist/cli/index.js

@@ -2641,9 +2641,6 @@ function templateizeMachineContent(content, machine) {
   next = next.replace(/~\/workspace/g, "{{WORKSPACE_ROOT}}").replace(/~\/Workspace/g, "{{WORKSPACE_ROOT}}").replace(/\/opt\/homebrew\/bin\/bun/g, "{{BUN_PATH}}");
   return { content: next, changed: next !== content };
 }
-function renderMachineAwareContent(content, variables) {
-  return isTemplate(content) ? renderTemplate(content, variables) : content;
-}
 function renderMachineAwareContentPreview(content, variables) {
   return isTemplate(content) ? renderTemplatePreview(content, variables) : { content, unresolved: [] };
 }
@@ -7532,6 +7529,14 @@ function reasonFor(key, value) {
 function isReferenceValue(value) {
   return /^\{\{[A-Z][A-Z0-9_]*\}\}$/.test(value) || /^\$\{[A-Z][A-Z0-9_]*\}$/.test(value) || /^\$[A-Z][A-Z0-9_]*$/.test(value) || /^%[A-Z][A-Z0-9_]*%$/.test(value);
 }
+function redactFormatForTarget(targetPath, storedFormat) {
+  const p = targetPath.toLowerCase();
+  if (/(^|\/)\.(zshrc|zprofile|bashrc|bash_profile|profile|zshenv|env)$/.test(p) || p.endsWith(".env"))
+    return "shell";
+  if (/(^|\/)\.(npmrc|yarnrc|curlrc|netrc)$/.test(p))
+    return "ini";
+  return storedFormat;
+}
 function redactContent(content, format) {
   switch (format) {
     case "shell":
@@ -11577,8 +11582,9 @@ function normalizeTargetPath(p) {
   }
 }
 async function writeConfigResult(config, targetPath, content, opts, meta = {}) {
-  const renderedTarget = opts.vars ? renderForApply(targetPath, opts.vars, opts.dryRun === true) : { content: targetPath, unresolved: [] };
-  const rendered = opts.vars ? renderForApply(content, opts.vars, opts.dryRun === true) : { content, unresolved: [] };
+  const variables = opts.vars ?? {};
+  const renderedTarget = renderForApply(targetPath, variables);
+  const rendered = renderForApply(content, variables);
   const renderedTargetPath = renderedTarget.content;
   const renderedContent = rendered.content;
   const targetAgent = meta.agent ?? config.agent;
@@ -11617,13 +11623,42 @@ async function writeConfigResult(config, targetPath, content, opts, meta = {}) {
     ...meta
   };
 }
-function renderForApply(content, variables, preview) {
-  if (preview)
-    return renderMachineAwareContentPreview(content, variables);
-  return {
-    content: renderMachineAwareContent(content, variables),
-    unresolved: []
-  };
+function renderForApply(content, variables) {
+  return renderMachineAwareContentPreview(content, variables);
+}
+function wouldDestroyACredential(targetPath, renderedContent, format) {
+  const secretTokens = parseTemplateVars(renderedContent).filter(isSecretVarName);
+  if (secretTokens.length === 0)
+    return [];
+  let current;
+  try {
+    const path = expandPath(targetPath);
+    if (!existsSync7(path))
+      return [];
+    current = readFileSync4(path, "utf-8");
+  } catch {
+    return secretTokens;
+  }
+  if (current === renderedContent)
+    return [];
+  if (scanSecrets(current, redactFormatForTarget(targetPath, format)).length > 0)
+    return secretTokens;
+  return secretTokens.filter((name) => countPlaceholder(current, name) < countPlaceholder(renderedContent, name));
+}
+function countPlaceholder(content, name) {
+  return content.match(new RegExp(`\\{\\{${name}(?::[^}]*)?\\}\\}`, "g"))?.length ?? 0;
+}
+async function resolveApplyVariables(opts) {
+  const machine = detectMachineContext();
+  let base;
+  try {
+    const store = opts.store ?? resolveConfigStore();
+    const profile = await store.resolveProfileForMachine(machine);
+    base = resolveProfileVariables(profile, machine);
+  } catch {
+    base = machineContextToVariables(machine);
+  }
+  return { ...base, ...opts.vars ?? {} };
 }
 function isAntigravityRuleTarget(agent, targetPath) {
   return agent === "antigravity" && /\.(md|mdc|markdown)$/i.test(targetPath);
@@ -11708,7 +11743,8 @@ async function applyConfigs(configs, opts = {}) {
   return report.results;
 }
 async function applyConfigsWithReport(configs, opts = {}) {
-  const prepared = prepareConfigBatch(configs, opts);
+  const effective = { ...opts, vars: await resolveApplyVariables(opts) };
+  const prepared = prepareConfigBatch(configs, effective);
   if (prepared.failures.length > 0) {
     return {
       results: [],
@@ -11722,7 +11758,7 @@ async function applyConfigsWithReport(configs, opts = {}) {
     if (config.kind === "reference" || isRetiredOrUnsupportedConfigAgent(config.agent))
       continue;
     try {
-      results.push(await applyPreparedConfig(config, opts));
+      results.push(await applyPreparedConfig(config, effective));
     } catch (error) {
       failures.push({
         config_id: config.id,
@@ -11762,7 +11798,27 @@ function prepareConfigBatch(configs, opts) {
     }
     return false;
   });
-  const { configs: deduplicated, duplicates } = deduplicateEquivalentProfileConfigs(activeConfigs, opts);
+  const renderSafeConfigs = activeConfigs.filter((config) => {
+    const behavior = canonicalConfigApplyBehavior(config, opts, activeConfigs);
+    const targets = [
+      ...behavior.primary ? [{ path: behavior.primary.path, content: behavior.primary.content }] : [],
+      ...behavior.outputs.map((output) => ({ path: output.path, content: output.content }))
+    ];
+    const blocked = [...new Set(targets.flatMap((target) => wouldDestroyACredential(target.path, target.content, config.format)))].sort();
+    if (blocked.length === 0)
+      return true;
+    for (const target of targets) {
+      skipped.push({
+        config_id: config.id,
+        config_slug: config.slug,
+        path: target.path,
+        owner: "unresolved-secret-placeholder",
+        reason: `no value for ${blocked.map((name) => `{{${name}}}`).join(", ")} and the file holds something else there; writing the placeholder would overwrite a live credential`
+      });
+    }
+    return false;
+  });
+  const { configs: deduplicated, duplicates } = deduplicateEquivalentProfileConfigs(renderSafeConfigs, opts);
   for (const duplicate of duplicates) {
     for (const target of configTargets(duplicate, opts, activeConfigs)) {
       skipped.push({
@@ -11914,6 +11970,8 @@ var init_apply = __esm(() => {
   init_machine();
   init_session_render();
   init_session_render_ownership();
+  init_redact();
+  init_template();
   init_transforms();
 });
 
@@ -12304,14 +12362,6 @@ function redactionPlaceholders(storedLine) {
   }
   return found;
 }
-function redactFormatForTarget(targetPath, storedFormat) {
-  const p = targetPath.toLowerCase();
-  if (/(^|\/)\.(zshrc|zprofile|bashrc|bash_profile|profile|zshenv|env)$/.test(p) || p.endsWith(".env"))
-    return "shell";
-  if (/(^|\/)\.(npmrc|yarnrc|curlrc|netrc)$/.test(p))
-    return "ini";
-  return storedFormat;
-}
 function storedPlaceholderIsLiteralOnDisk(storedLine, diskLine) {
   return redactionPlaceholders(storedLine).some((p) => !diskLine.includes(p));
 }
@@ -15538,6 +15588,9 @@ program.command("apply <id>").description("Apply a config to its target_path and
       const status = opts.dryRun ? chalk.yellow("[dry-run]") : result.primary_changed ? chalk.green("\u2713") : chalk.dim("=");
       const change = result.primary_changed ? "changed" : "unchanged";
       console.log(`${status} ${result.path} ${chalk.dim(`(${change})`)}`);
+      if (result.unresolved_template_vars?.length) {
+        console.log(`  ${chalk.yellow("!")} left unexpanded: ${result.unresolved_template_vars.map((name) => `{{${name}}}`).join(", ")}` + ` ${chalk.dim("(no value for these; secret placeholders are preserved on purpose)")}`);
+      }
       for (const output of result.outputs ?? []) {
         const outputStatus = opts.dryRun ? chalk.yellow("[dry-run]") : output.primary_changed ? chalk.green("\u2713") : chalk.dim("=");
         const outputChange = output.primary_changed ? "changed" : "unchanged";
@@ -15818,11 +15871,10 @@ profileCmd.command("apply [id]").description("Apply all configs in a profile to
     for (const skipped of report.skipped) {
       console.log(`${chalk.dim("[owned]")} ${skipped.path} ${chalk.dim(skipped.owner)}`);
     }
-    if (opts.dryRun) {
-      const unresolved = [...new Set(results.flatMap((result) => result.unresolved_template_vars ?? []))];
-      if (unresolved.length > 0) {
-        console.log(chalk.yellow(`Unresolved secret/runtime template references preserved in preview: ${unresolved.join(", ")}`));
-      }
+    const unresolved = [...new Set(results.flatMap((result) => result.unresolved_template_vars ?? []))];
+    if (unresolved.length > 0) {
+      const where = opts.dryRun ? "would be left unexpanded" : "left unexpanded";
+      console.log(chalk.yellow(`Unresolved secret/runtime template references ${where}: ${unresolved.join(", ")}`));
     }
     for (const failure of report.failures) {
       console.error(chalk.red(`[failed] ${failure.config_slug}: ${failure.message}`));

package/dist/index.js

@@ -5494,6 +5494,14 @@ function reasonFor(key, value) {
 function isReferenceValue(value) {
   return /^\{\{[A-Z][A-Z0-9_]*\}\}$/.test(value) || /^\$\{[A-Z][A-Z0-9_]*\}$/.test(value) || /^\$[A-Z][A-Z0-9_]*$/.test(value) || /^%[A-Z][A-Z0-9_]*%$/.test(value);
 }
+function redactFormatForTarget(targetPath, storedFormat) {
+  const p = targetPath.toLowerCase();
+  if (/(^|\/)\.(zshrc|zprofile|bashrc|bash_profile|profile|zshenv|env)$/.test(p) || p.endsWith(".env"))
+    return "shell";
+  if (/(^|\/)\.(npmrc|yarnrc|curlrc|netrc)$/.test(p))
+    return "ini";
+  return storedFormat;
+}
 function redactContent(content, format) {
   switch (format) {
     case "shell":
@@ -9591,8 +9599,9 @@ function normalizeTargetPath(p) {
   }
 }
 async function writeConfigResult(config, targetPath, content, opts, meta = {}) {
-  const renderedTarget = opts.vars ? renderForApply(targetPath, opts.vars, opts.dryRun === true) : { content: targetPath, unresolved: [] };
-  const rendered = opts.vars ? renderForApply(content, opts.vars, opts.dryRun === true) : { content, unresolved: [] };
+  const variables = opts.vars ?? {};
+  const renderedTarget = renderForApply(targetPath, variables);
+  const rendered = renderForApply(content, variables);
   const renderedTargetPath = renderedTarget.content;
   const renderedContent = rendered.content;
   const targetAgent = meta.agent ?? config.agent;
@@ -9631,13 +9640,42 @@ async function writeConfigResult(config, targetPath, content, opts, meta = {}) {
     ...meta
   };
 }
-function renderForApply(content, variables, preview) {
-  if (preview)
-    return renderMachineAwareContentPreview(content, variables);
-  return {
-    content: renderMachineAwareContent(content, variables),
-    unresolved: []
-  };
+function renderForApply(content, variables) {
+  return renderMachineAwareContentPreview(content, variables);
+}
+function wouldDestroyACredential(targetPath, renderedContent, format) {
+  const secretTokens = parseTemplateVars(renderedContent).filter(isSecretVarName);
+  if (secretTokens.length === 0)
+    return [];
+  let current;
+  try {
+    const path = expandPath(targetPath);
+    if (!existsSync6(path))
+      return [];
+    current = readFileSync4(path, "utf-8");
+  } catch {
+    return secretTokens;
+  }
+  if (current === renderedContent)
+    return [];
+  if (scanSecrets(current, redactFormatForTarget(targetPath, format)).length > 0)
+    return secretTokens;
+  return secretTokens.filter((name) => countPlaceholder(current, name) < countPlaceholder(renderedContent, name));
+}
+function countPlaceholder(content, name) {
+  return content.match(new RegExp(`\\{\\{${name}(?::[^}]*)?\\}\\}`, "g"))?.length ?? 0;
+}
+async function resolveApplyVariables(opts) {
+  const machine = detectMachineContext();
+  let base;
+  try {
+    const store = opts.store ?? resolveConfigStore();
+    const profile = await store.resolveProfileForMachine(machine);
+    base = resolveProfileVariables(profile, machine);
+  } catch {
+    base = machineContextToVariables(machine);
+  }
+  return { ...base, ...opts.vars ?? {} };
 }
 function isAntigravityRuleTarget(agent, targetPath) {
   return agent === "antigravity" && /\.(md|mdc|markdown)$/i.test(targetPath);
@@ -9722,7 +9760,8 @@ async function applyConfigs(configs, opts = {}) {
   return report.results;
 }
 async function applyConfigsWithReport(configs, opts = {}) {
-  const prepared = prepareConfigBatch(configs, opts);
+  const effective = { ...opts, vars: await resolveApplyVariables(opts) };
+  const prepared = prepareConfigBatch(configs, effective);
   if (prepared.failures.length > 0) {
     return {
       results: [],
@@ -9736,7 +9775,7 @@ async function applyConfigsWithReport(configs, opts = {}) {
     if (config.kind === "reference" || isRetiredOrUnsupportedConfigAgent(config.agent))
       continue;
     try {
-      results.push(await applyPreparedConfig(config, opts));
+      results.push(await applyPreparedConfig(config, effective));
     } catch (error) {
       failures.push({
         config_id: config.id,
@@ -9776,7 +9815,27 @@ function prepareConfigBatch(configs, opts) {
     }
     return false;
   });
-  const { configs: deduplicated, duplicates } = deduplicateEquivalentProfileConfigs(activeConfigs, opts);
+  const renderSafeConfigs = activeConfigs.filter((config) => {
+    const behavior = canonicalConfigApplyBehavior(config, opts, activeConfigs);
+    const targets = [
+      ...behavior.primary ? [{ path: behavior.primary.path, content: behavior.primary.content }] : [],
+      ...behavior.outputs.map((output) => ({ path: output.path, content: output.content }))
+    ];
+    const blocked = [...new Set(targets.flatMap((target) => wouldDestroyACredential(target.path, target.content, config.format)))].sort();
+    if (blocked.length === 0)
+      return true;
+    for (const target of targets) {
+      skipped.push({
+        config_id: config.id,
+        config_slug: config.slug,
+        path: target.path,
+        owner: "unresolved-secret-placeholder",
+        reason: `no value for ${blocked.map((name) => `{{${name}}}`).join(", ")} and the file holds something else there; writing the placeholder would overwrite a live credential`
+      });
+    }
+    return false;
+  });
+  const { configs: deduplicated, duplicates } = deduplicateEquivalentProfileConfigs(renderSafeConfigs, opts);
   for (const duplicate of duplicates) {
     for (const target of configTargets(duplicate, opts, activeConfigs)) {
       skipped.push({
@@ -11698,14 +11757,6 @@ function redactionPlaceholders(storedLine) {
   }
   return found;
 }
-function redactFormatForTarget(targetPath, storedFormat) {
-  const p = targetPath.toLowerCase();
-  if (/(^|\/)\.(zshrc|zprofile|bashrc|bash_profile|profile|zshenv|env)$/.test(p) || p.endsWith(".env"))
-    return "shell";
-  if (/(^|\/)\.(npmrc|yarnrc|curlrc|netrc)$/.test(p))
-    return "ini";
-  return storedFormat;
-}
 function storedPlaceholderIsLiteralOnDisk(storedLine, diskLine) {
   return redactionPlaceholders(storedLine).some((p) => !diskLine.includes(p));
 }

package/dist/lib/apply-secret-placeholder-guard.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=apply-secret-placeholder-guard.test.d.ts.map

package/dist/lib/apply-secret-placeholder-guard.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"apply-secret-placeholder-guard.test.d.ts","sourceRoot":"","sources":["../../src/lib/apply-secret-placeholder-guard.test.ts"],"names":[],"mappings":""}

package/dist/lib/apply-text-format-credential-guard.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=apply-text-format-credential-guard.test.d.ts.map

package/dist/lib/apply-text-format-credential-guard.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"apply-text-format-credential-guard.test.d.ts","sourceRoot":"","sources":["../../src/lib/apply-text-format-credential-guard.test.ts"],"names":[],"mappings":""}

package/dist/lib/apply.d.ts

@@ -23,7 +23,7 @@ export interface ConfigApplySkippedTarget {
     config_id: string;
     config_slug: string;
     path: string;
-    owner: typeof SESSION_RENDERER_OWNER_ID | "equivalent-profile-config" | "retired-provider-config";
+    owner: typeof SESSION_RENDERER_OWNER_ID | "equivalent-profile-config" | "retired-provider-config" | "unresolved-secret-placeholder";
     reason: string;
 }
 export interface ConfigApplyPreviewFailure {

package/dist/lib/apply.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../src/lib/apply.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAgB,MAAM,mBAAmB,CAAC;AAE3E,OAAO,EAAsB,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,OAAO,EAGL,yBAAyB,EAC1B,MAAM,qBAAqB,CAAC;AAI7B,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAK5C;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAsBrD;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAC9B;;;;;OAKG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC;AAED,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,yBAAyB,GAAG,2BAA2B,GAAG,yBAAyB,CAAC;IAClG,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,OAAO,EAAE,wBAAwB,EAAE,CAAC;IACpC,QAAQ,EAAE,yBAAyB,EAAE,CAAC;CACvC;AAuHD,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,EACd,IAAI,GAAE,YAAiB,GACtB,OAAO,CAAC,WAAW,CAAC,CA+BtB;AA2ED,wBAAsB,YAAY,CAChC,OAAO,EAAE,MAAM,EAAE,EACjB,IAAI,GAAE,YAAiB,GACtB,OAAO,CAAC,WAAW,EAAE,CAAC,CAMxB;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EAAE,EACjB,IAAI,GAAE,YAAiB,GACtB,OAAO,CAAC,kBAAkB,CAAC,CA4B7B;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EAAE,EACjB,IAAI,GAAE,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAM,GACtC,OAAO,CAAC,kBAAkB,CAAC,CAE7B"}
+{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../src/lib/apply.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAA8B,MAAM,mBAAmB,CAAC;AAEzF,OAAO,EAAsB,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAQ1D,OAAO,EAGL,yBAAyB,EAC1B,MAAM,qBAAqB,CAAC;AAM7B,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAK5C;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAsBrD;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAC9B;;;;;OAKG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC;AAED,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,yBAAyB,GAAG,2BAA2B,GAAG,yBAAyB,GAAG,+BAA+B,CAAC;IACpI,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,OAAO,EAAE,wBAAwB,EAAE,CAAC;IACpC,QAAQ,EAAE,yBAAyB,EAAE,CAAC;CACvC;AA+QD,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,EACd,IAAI,GAAE,YAAiB,GACtB,OAAO,CAAC,WAAW,CAAC,CA+BtB;AA2ED,wBAAsB,YAAY,CAChC,OAAO,EAAE,MAAM,EAAE,EACjB,IAAI,GAAE,YAAiB,GACtB,OAAO,CAAC,WAAW,EAAE,CAAC,CAMxB;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EAAE,EACjB,IAAI,GAAE,YAAiB,GACtB,OAAO,CAAC,kBAAkB,CAAC,CAiC7B;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EAAE,EACjB,IAAI,GAAE,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAM,GACtC,OAAO,CAAC,kBAAkB,CAAC,CAE7B"}

package/dist/lib/redact.d.ts

@@ -21,6 +21,30 @@ export interface RedactedVar {
     reason: string;
 }
 export type RedactFormat = "shell" | "json" | "toml" | "ini" | "markdown" | "text" | "yaml";
+/**
+ * Pick the redaction dialect for the file actually being read, from its PATH.
+ *
+ * `ConfigFormat` — what a stored row declares — is
+ * `text | json | toml | yaml | markdown | ini` and has NO `shell` member, while
+ * `RedactFormat` does. `detectFormat` returns `text` for any extensionless path,
+ * so `~/.zshrc`, `~/.bashrc` and `~/.npmrc` are all stored as `text`, and `text`
+ * routes to `redactGeneric` — which matches token SHAPES only and never key
+ * names. A credential whose key is secret-class but whose value has no
+ * recognisable shape is therefore invisible on exactly the files most likely to
+ * hold one.
+ *
+ * Resolving the dialect from the path closes that. It is deliberately
+ * PATH-KEYED rather than a widening of `ConfigFormat`: `.md` still resolves to
+ * `markdown`, so a rules file documenting `NPM_TOKEN=...` in prose is not
+ * mistaken for a shell assignment and frozen from ever shipping an edit.
+ *
+ * Exported so every caller that must choose a dialect shares ONE definition.
+ * Two surfaces need it and they must not drift: `diff`, the last read before a
+ * value reaches a transcript, and the `apply` guard, the last check before a
+ * value is overwritten. A per-surface copy is how one of them silently keeps the
+ * gap (todos e4d9c22e).
+ */
+export declare function redactFormatForTarget(targetPath: string, storedFormat: RedactFormat): RedactFormat;
 export declare function redactContent(content: string, format: RedactFormat): RedactResult;
 /** Detect secrets without modifying content. Returns list of findings. */
 export declare function scanSecrets(content: string, format: RedactFormat): RedactedVar[];

package/dist/lib/redact.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redact.d.ts","sourceRoot":"","sources":["../../src/lib/redact.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAgND,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC;AAE5F,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,YAAY,CAQjF;AAED,0EAA0E;AAC1E,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,WAAW,EAAE,CAGhF;AAED,+DAA+D;AAC/D,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAEzE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAErD"}
+{"version":3,"file":"redact.d.ts","sourceRoot":"","sources":["../../src/lib/redact.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAgND,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC;AAE5F;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,YAAY,CAKlG;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,YAAY,CAQjF;AAED,0EAA0E;AAC1E,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,WAAW,EAAE,CAGhF;AAED,+DAA+D;AAC/D,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAEzE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAErD"}

package/dist/lib/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/lib/sync.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACrH,OAAO,EAAsB,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAW/E,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;CAC1B;AAED,eAAO,MAAM,qBAAqB,EAAE,YAAY,EAQ/C,CAAC;AAwDF,eAAO,MAAM,aAAa,EAAE,WAAW,EAwDtC,CAAC;AAIF,eAAO,MAAM,oBAAoB;;cAC2B,cAAc;WAAsB,WAAW;YAAwB,YAAY;GAe9I,CAAC;AAEF,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC,CAiE/E;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC3B;AAED,wBAAsB,SAAS,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,UAAU,CAAC,CAqGhF;AAGD,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC3B;AAED,wBAAsB,UAAU,CAAC,IAAI,GAAE,iBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC,CAmClF;AAGD,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB;;;;;;;;OAQG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AA8JD,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE,iBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,CA+B9F;AAGD,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,CAU/D;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,CAgBzD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY,CAQ3D;AAGD,OAAO,EAAE,MAAM,EAAE,CAAC;AAClB,YAAY,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/lib/sync.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACrH,OAAO,EAAsB,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAW/E,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;CAC1B;AAED,eAAO,MAAM,qBAAqB,EAAE,YAAY,EAQ/C,CAAC;AAwDF,eAAO,MAAM,aAAa,EAAE,WAAW,EAwDtC,CAAC;AAIF,eAAO,MAAM,oBAAoB;;cAC2B,cAAc;WAAsB,WAAW;YAAwB,YAAY;GAe9I,CAAC;AAEF,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC,CAiE/E;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC3B;AAED,wBAAsB,SAAS,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,UAAU,CAAC,CAqGhF;AAGD,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC3B;AAED,wBAAsB,UAAU,CAAC,IAAI,GAAE,iBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC,CAmClF;AAGD,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB;;;;;;;;OAQG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAkJD,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE,iBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,CA+B9F;AAGD,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,CAU/D;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,CAgBzD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY,CAQ3D;AAGD,OAAO,EAAE,MAAM,EAAE,CAAC;AAClB,YAAY,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC"}

package/dist/mcp/index.js

@@ -578,9 +578,6 @@ function templateizeMachineContent(content, machine) {
   next = next.replace(/~\/workspace/g, "{{WORKSPACE_ROOT}}").replace(/~\/Workspace/g, "{{WORKSPACE_ROOT}}").replace(/\/opt\/homebrew\/bin\/bun/g, "{{BUN_PATH}}");
   return { content: next, changed: next !== content };
 }
-function renderMachineAwareContent(content, variables) {
-  return isTemplate(content) ? renderTemplate(content, variables) : content;
-}
 function renderMachineAwareContentPreview(content, variables) {
   return isTemplate(content) ? renderTemplatePreview(content, variables) : { content, unresolved: [] };
 }
@@ -5169,6 +5166,7 @@ var init_zod = __esm(() => {
 var exports_redact = {};
 __export(exports_redact, {
   scanSecrets: () => scanSecrets,
+  redactFormatForTarget: () => redactFormatForTarget,
   redactContent: () => redactContent,
   isSecretVarName: () => isSecretVarName,
   hasSecrets: () => hasSecrets
@@ -5323,6 +5321,14 @@ function reasonFor(key, value) {
 function isReferenceValue(value) {
   return /^\{\{[A-Z][A-Z0-9_]*\}\}$/.test(value) || /^\$\{[A-Z][A-Z0-9_]*\}$/.test(value) || /^\$[A-Z][A-Z0-9_]*$/.test(value) || /^%[A-Z][A-Z0-9_]*%$/.test(value);
 }
+function redactFormatForTarget(targetPath, storedFormat) {
+  const p = targetPath.toLowerCase();
+  if (/(^|\/)\.(zshrc|zprofile|bashrc|bash_profile|profile|zshenv|env)$/.test(p) || p.endsWith(".env"))
+    return "shell";
+  if (/(^|\/)\.(npmrc|yarnrc|curlrc|netrc)$/.test(p))
+    return "ini";
+  return storedFormat;
+}
 function redactContent(content, format) {
   switch (format) {
     case "shell":
@@ -5894,8 +5900,9 @@ function normalizeTargetPath(p) {
   }
 }
 async function writeConfigResult(config, targetPath, content, opts, meta = {}) {
-  const renderedTarget = opts.vars ? renderForApply(targetPath, opts.vars, opts.dryRun === true) : { content: targetPath, unresolved: [] };
-  const rendered = opts.vars ? renderForApply(content, opts.vars, opts.dryRun === true) : { content, unresolved: [] };
+  const variables = opts.vars ?? {};
+  const renderedTarget = renderForApply(targetPath, variables);
+  const rendered = renderForApply(content, variables);
   const renderedTargetPath = renderedTarget.content;
   const renderedContent = rendered.content;
   const targetAgent = meta.agent ?? config.agent;
@@ -5934,13 +5941,42 @@ async function writeConfigResult(config, targetPath, content, opts, meta = {}) {
     ...meta
   };
 }
-function renderForApply(content, variables, preview) {
-  if (preview)
-    return renderMachineAwareContentPreview(content, variables);
-  return {
-    content: renderMachineAwareContent(content, variables),
-    unresolved: []
-  };
+function renderForApply(content, variables) {
+  return renderMachineAwareContentPreview(content, variables);
+}
+function wouldDestroyACredential(targetPath, renderedContent, format) {
+  const secretTokens = parseTemplateVars(renderedContent).filter(isSecretVarName);
+  if (secretTokens.length === 0)
+    return [];
+  let current;
+  try {
+    const path = expandPath(targetPath);
+    if (!existsSync4(path))
+      return [];
+    current = readFileSync2(path, "utf-8");
+  } catch {
+    return secretTokens;
+  }
+  if (current === renderedContent)
+    return [];
+  if (scanSecrets(current, redactFormatForTarget(targetPath, format)).length > 0)
+    return secretTokens;
+  return secretTokens.filter((name) => countPlaceholder(current, name) < countPlaceholder(renderedContent, name));
+}
+function countPlaceholder(content, name) {
+  return content.match(new RegExp(`\\{\\{${name}(?::[^}]*)?\\}\\}`, "g"))?.length ?? 0;
+}
+async function resolveApplyVariables(opts) {
+  const machine = detectMachineContext();
+  let base;
+  try {
+    const store = opts.store ?? resolveConfigStore();
+    const profile = await store.resolveProfileForMachine(machine);
+    base = resolveProfileVariables(profile, machine);
+  } catch {
+    base = machineContextToVariables(machine);
+  }
+  return { ...base, ...opts.vars ?? {} };
 }
 function isAntigravityRuleTarget(agent, targetPath) {
   return agent === "antigravity" && /\.(md|mdc|markdown)$/i.test(targetPath);
@@ -6025,7 +6061,8 @@ async function applyConfigs(configs, opts = {}) {
   return report.results;
 }
 async function applyConfigsWithReport(configs, opts = {}) {
-  const prepared = prepareConfigBatch(configs, opts);
+  const effective = { ...opts, vars: await resolveApplyVariables(opts) };
+  const prepared = prepareConfigBatch(configs, effective);
   if (prepared.failures.length > 0) {
     return {
       results: [],
@@ -6039,7 +6076,7 @@ async function applyConfigsWithReport(configs, opts = {}) {
     if (config.kind === "reference" || isRetiredOrUnsupportedConfigAgent(config.agent))
       continue;
     try {
-      results.push(await applyPreparedConfig(config, opts));
+      results.push(await applyPreparedConfig(config, effective));
     } catch (error) {
       failures.push({
         config_id: config.id,
@@ -6079,7 +6116,27 @@ function prepareConfigBatch(configs, opts) {
     }
     return false;
   });
-  const { configs: deduplicated, duplicates } = deduplicateEquivalentProfileConfigs(activeConfigs, opts);
+  const renderSafeConfigs = activeConfigs.filter((config) => {
+    const behavior = canonicalConfigApplyBehavior(config, opts, activeConfigs);
+    const targets = [
+      ...behavior.primary ? [{ path: behavior.primary.path, content: behavior.primary.content }] : [],
+      ...behavior.outputs.map((output) => ({ path: output.path, content: output.content }))
+    ];
+    const blocked = [...new Set(targets.flatMap((target) => wouldDestroyACredential(target.path, target.content, config.format)))].sort();
+    if (blocked.length === 0)
+      return true;
+    for (const target of targets) {
+      skipped.push({
+        config_id: config.id,
+        config_slug: config.slug,
+        path: target.path,
+        owner: "unresolved-secret-placeholder",
+        reason: `no value for ${blocked.map((name) => `{{${name}}}`).join(", ")} and the file holds something else there; writing the placeholder would overwrite a live credential`
+      });
+    }
+    return false;
+  });
+  const { configs: deduplicated, duplicates } = deduplicateEquivalentProfileConfigs(renderSafeConfigs, opts);
   for (const duplicate of duplicates) {
     for (const target of configTargets(duplicate, opts, activeConfigs)) {
       skipped.push({
@@ -6231,6 +6288,8 @@ var init_apply = __esm(() => {
   init_machine();
   init_session_render();
   init_session_render_ownership();
+  init_redact();
+  init_template();
   init_transforms();
 });
 
@@ -6531,14 +6590,6 @@ function redactionPlaceholders(storedLine) {
   }
   return found;
 }
-function redactFormatForTarget(targetPath, storedFormat) {
-  const p = targetPath.toLowerCase();
-  if (/(^|\/)\.(zshrc|zprofile|bashrc|bash_profile|profile|zshenv|env)$/.test(p) || p.endsWith(".env"))
-    return "shell";
-  if (/(^|\/)\.(npmrc|yarnrc|curlrc|netrc)$/.test(p))
-    return "ini";
-  return storedFormat;
-}
 function storedPlaceholderIsLiteralOnDisk(storedLine, diskLine) {
   return redactionPlaceholders(storedLine).some((p) => !diskLine.includes(p));
 }
@@ -6858,7 +6909,7 @@ var init_sync_dir = __esm(() => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@hasna/instructions",
-    version: "0.4.14",
+    version: "0.4.16",
     description: "AI coding agent instruction & configuration manager \u2014 store, version, apply, and share all your AI coding configs. CLI + MCP + HTTP API (instructions-serve) + generated SDK + Dashboard.",
     type: "module",
     main: "dist/index.js",
@@ -6897,7 +6948,7 @@ var require_package = __commonJS((exports, module) => {
       "dev:mcp": "bun run src/mcp/index.ts",
       "dev:serve": "bun run src/server/index.ts",
       seed: "bun run scripts/seed.ts",
-      prepublishOnly: "bun run build",
+      prepublishOnly: "bun run scripts/check-publish-hold.ts && bun run build",
       postinstall: "mkdir -p $HOME/.hasna/instructions $HOME/.hasna/instructions/backups 2>/dev/null || true"
     },
     keywords: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/instructions",
-  "version": "0.4.14",
+  "version": "0.4.16",
   "description": "AI coding agent instruction & configuration manager \u2014 store, version, apply, and share all your AI coding configs. CLI + MCP + HTTP API (instructions-serve) + generated SDK + Dashboard.",
   "type": "module",
   "main": "dist/index.js",
@@ -39,7 +39,7 @@
     "dev:mcp": "bun run src/mcp/index.ts",
     "dev:serve": "bun run src/server/index.ts",
     "seed": "bun run scripts/seed.ts",
-    "prepublishOnly": "bun run build",
+    "prepublishOnly": "bun run scripts/check-publish-hold.ts && bun run build",
     "postinstall": "mkdir -p $HOME/.hasna/instructions $HOME/.hasna/instructions/backups 2>/dev/null || true"
   },
   "keywords": [