envpkt 0.14.1 → 0.16.0

package/dist/index.d.ts

@@ -31,6 +31,12 @@ declare const AgentIdentitySchema: import("@sinclair/typebox").TObject<{
   recipient: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
   secrets: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
 }>;
+declare const McpHeaderSchema: import("@sinclair/typebox").TObject<{
+  server: import("@sinclair/typebox").TString;
+  header: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+  scheme: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+}>;
+type McpHeader = Static<typeof McpHeaderSchema>;
 declare const SecretMetaSchema: import("@sinclair/typebox").TObject<{
   service: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
   expires: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
@@ -50,6 +56,11 @@ declare const SecretMetaSchema: import("@sinclair/typebox").TObject<{
   external: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
   tags: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TString>>;
   namespace: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+  mcp: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
+    server: import("@sinclair/typebox").TString;
+    header: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    scheme: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+  }>>>;
 }>;
 type SecretMeta = Static<typeof SecretMetaSchema>;
 declare const LifecycleConfigSchema: import("@sinclair/typebox").TObject<{
@@ -113,6 +124,11 @@ declare const EnvpktConfigSchema: import("@sinclair/typebox").TObject<{
     external: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
     tags: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TString>>;
     namespace: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    mcp: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
+      server: import("@sinclair/typebox").TString;
+      header: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+      scheme: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    }>>>;
   }>>>;
   env: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TObject<{
     value: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
@@ -299,6 +315,35 @@ type AliasError = {
   readonly kind: "secret" | "env";
   readonly field: string;
 };
+/** Structural problems in `mcp` bindings — caught by validation, independent of secret values. */
+type McpConfigError = {
+  readonly _tag: "McpHeaderInvalid";
+  readonly key: string;
+  readonly server: string;
+  readonly header: string;
+} | {
+  readonly _tag: "McpSchemeInvalid";
+  readonly key: string;
+  readonly server: string;
+  readonly scheme: string;
+} | {
+  readonly _tag: "McpHeaderDuplicate";
+  readonly server: string;
+  readonly header: string;
+  readonly keys: ReadonlyArray<string>;
+};
+type McpHeadersError = McpConfigError | {
+  readonly _tag: "McpServerUnknown";
+  readonly server: string;
+} | {
+  readonly _tag: "McpValueUnresolved";
+  readonly server: string;
+  readonly keys: ReadonlyArray<string>;
+} | {
+  readonly _tag: "McpValueInvalid";
+  readonly server: string;
+  readonly keys: ReadonlyArray<string>;
+};
 type BootOptions = {
   readonly configPath?: string;
   readonly profile?: string;
@@ -447,6 +492,19 @@ declare const isEnvAlias: (meta: {
 /** Format an alias error into a human-readable message */
 declare const formatAliasError: (error: AliasError) => string;
 //#endregion
+//#region src/core/mcp-headers.d.ts
+/** Check every `mcp` binding in a config. Used by `envpkt validate` and the write gate. */
+declare const validateMcpHeaders: (config: EnvpktConfig) => Either<McpConfigError, void>;
+/**
+ * Build the HTTP header object for one MCP server: every secret whose `mcp` list names
+ * `server`, merged into one object. `values` is keyed by logical secret name (as in
+ * `BootResult.secrets`), so namespaces and aliases are already resolved by the caller.
+ * Only this server's bindings are checked, so a problem on another server never blocks it.
+ */
+declare const buildMcpHeaders: (config: EnvpktConfig, values: Readonly<Record<string, string>>, server: string) => Either<McpHeadersError, Record<string, string>>;
+/** Human-readable one-liner for any McpHeadersError tag. Never includes a secret value. */
+declare const formatMcpHeadersError: (error: McpHeadersError) => string;
+//#endregion
 //#region src/core/format.d.ts
 type SecretDisplay = "encrypted" | "plaintext";
 type FormatPacketOptions = {
@@ -622,13 +680,14 @@ declare const diffConfigs: (a: EnvpktConfig, b: EnvpktConfig) => ConfigDiff;
 //#region src/core/copy.d.ts
 /**
  * The SecretMeta to write into the destination on copy.
- * - `created` is reset to today: the entry is new *here*, regardless of the source's age.
+ * - `created` comes from the caller, never the source: today for an entry new to the
+ *   destination, or the destination's own `created` when the copy overwrites it.
  * - `last_rotated_at` is dropped — it's the source's rotation history, not the copy's.
  * - `encryptedValue` re-derives the ciphertext: `Some(cipher)` sets the resealed value,
  *   `None` strips it entirely (a metadata-only copy of a secret with no sealed value).
  */
 declare const copyableSecretMeta: (meta: SecretMeta, opts: {
-  readonly today: string;
+  readonly created: string;
   readonly encryptedValue: Option<string>;
 }) => SecretMeta;
 /** Serialize a `[secret.<name>]` block from its metadata, round-trippable by the TOML parser. */
@@ -638,10 +697,15 @@ declare const serializeEnvBlock: (name: string, meta: EnvMeta) => string;
 //#endregion
 //#region src/core/toml-edit.d.ts
 /**
- * Remove a TOML section (e.g. `[secret.X]`) and all its fields through the next section or EOF.
- * Strips trailing blank lines left behind.
+ * Remove a TOML section (e.g. `[secret.X]`) and all its fields. A comment above the next
+ * section stays. The sections on either side end up one blank line apart.
  */
 declare const removeSection: (raw: string, sectionHeader: string) => Either<TomlEditError, string>;
+/**
+ * Replace a TOML section with `block`, in place. Lines outside the section, including the
+ * blank and comment lines between it and the next header, are left as they were.
+ */
+declare const replaceSection: (raw: string, sectionHeader: string, block: string) => Either<TomlEditError, string>;
 /**
  * Rename a TOML section header (e.g. `[secret.OLD]` → `[secret.NEW]`).
  * Errors if old doesn't exist or new already exists.
@@ -721,4 +785,4 @@ type ToolDef = {
 declare const toolDefinitions: readonly ToolDef[];
 declare const callTool: (name: string, args: Record<string, unknown>) => CallToolResult;
 //#endregion
-export { type AgentIdentity, AgentIdentitySchema, type AliasError, type AliasTable, type AuditResult, type BootError, type BootOptions, type BootResult, type CallbackConfig, CallbackConfigSchema, type CatalogError, type ChangedEntry, type CheckResult, type ConfidenceLevel, type ConfigDiff, type ConfigError, type ConfigSource, ConsumerType, type CredentialPattern, type DirectLogger, type DirectTestLoggerHandle, type DotenvEntry, type DriftEntry, type DriftStatus, type EnvAuditResult, type EnvDriftEntry, type EnvDriftStatus, type EnvMeta, EnvMetaSchema, EnvpktBootError, type EnvpktConfig, EnvpktConfigSchema, type FieldChange, type FleetAgent, type FleetHealth, type FnoxConfig, type FnoxError, type FnoxSecret, type FormatDotenvOptions, type FormatPacketOptions, type HealthStatus, type Identity, type IdentityError, IdentitySchema, type KeygenError, type KeygenResult, type LifecycleConfig, LifecycleConfigSchema, type LogEntry, type LogLevel, type LogMetadata, type MatchResult, type ResolveOptions, type ResolveResult, type ResolvedPath, type ScanOptions, type ScanResult, type SealError, type SecretDisplay, type SecretHealth, type SecretMeta, SecretMetaSchema, type SecretStatus, type SectionDiff, type TomlEditError, type ToolsConfig, ToolsConfigSchema, ageAvailable, ageDecrypt, ageEncrypt, appendSection, boot, bootSafe, callTool, compareFnoxAndEnvpkt, computeAudit, computeEnvAudit, copyableSecretMeta, createDirectConsoleLogger, createDirectTestLogger, createServer, deriveServiceFromName, detectFnox, diffConfigs, directSilentLogger, discoverConfig, envCheck, envScan, extractFnoxKeys, findConfigPath, fnoxAvailable, fnoxExport, fnoxGet, formatAliasError, formatDotenv, formatPacket, generateKeypair, generateTomlFromScan, isEnvAlias, isSecretAlias, loadCatalog, loadConfig, loadConfigFromCwd, maskValue, matchEnvVar, matchValueShape, parseToml, quoteDotenvValue, readConfigFile, readFnoxConfig, readResource, removeSection, renameSection, resolveConfig, resolveConfigPath, resolveInlineKey, resolveKeyPath, resolveSecrets, resolveValues, resourceDefinitions, scanEnv, scanFleet, sealSecrets, serializeEnvBlock, serializeSecretBlock, startServer, toolDefinitions, unsealSecrets, unwrapAgentKey, updateConfigIdentity, updateSectionFields, validateAliases, validateConfig };
+export { type AgentIdentity, AgentIdentitySchema, type AliasError, type AliasTable, type AuditResult, type BootError, type BootOptions, type BootResult, type CallbackConfig, CallbackConfigSchema, type CatalogError, type ChangedEntry, type CheckResult, type ConfidenceLevel, type ConfigDiff, type ConfigError, type ConfigSource, ConsumerType, type CredentialPattern, type DirectLogger, type DirectTestLoggerHandle, type DotenvEntry, type DriftEntry, type DriftStatus, type EnvAuditResult, type EnvDriftEntry, type EnvDriftStatus, type EnvMeta, EnvMetaSchema, EnvpktBootError, type EnvpktConfig, EnvpktConfigSchema, type FieldChange, type FleetAgent, type FleetHealth, type FnoxConfig, type FnoxError, type FnoxSecret, type FormatDotenvOptions, type FormatPacketOptions, type HealthStatus, type Identity, type IdentityError, IdentitySchema, type KeygenError, type KeygenResult, type LifecycleConfig, LifecycleConfigSchema, type LogEntry, type LogLevel, type LogMetadata, type MatchResult, type McpConfigError, type McpHeader, McpHeaderSchema, type McpHeadersError, type ResolveOptions, type ResolveResult, type ResolvedPath, type ScanOptions, type ScanResult, type SealError, type SecretDisplay, type SecretHealth, type SecretMeta, SecretMetaSchema, type SecretStatus, type SectionDiff, type TomlEditError, type ToolsConfig, ToolsConfigSchema, ageAvailable, ageDecrypt, ageEncrypt, appendSection, boot, bootSafe, buildMcpHeaders, callTool, compareFnoxAndEnvpkt, computeAudit, computeEnvAudit, copyableSecretMeta, createDirectConsoleLogger, createDirectTestLogger, createServer, deriveServiceFromName, detectFnox, diffConfigs, directSilentLogger, discoverConfig, envCheck, envScan, extractFnoxKeys, findConfigPath, fnoxAvailable, fnoxExport, fnoxGet, formatAliasError, formatDotenv, formatMcpHeadersError, formatPacket, generateKeypair, generateTomlFromScan, isEnvAlias, isSecretAlias, loadCatalog, loadConfig, loadConfigFromCwd, maskValue, matchEnvVar, matchValueShape, parseToml, quoteDotenvValue, readConfigFile, readFnoxConfig, readResource, removeSection, renameSection, replaceSection, resolveConfig, resolveConfigPath, resolveInlineKey, resolveKeyPath, resolveSecrets, resolveValues, resourceDefinitions, scanEnv, scanFleet, sealSecrets, serializeEnvBlock, serializeSecretBlock, startServer, toolDefinitions, unsealSecrets, unwrapAgentKey, updateConfigIdentity, updateSectionFields, validateAliases, validateConfig, validateMcpHeaders };

package/dist/index.js

@@ -46,6 +46,21 @@ const NamespaceSchema = Type.Object({
 		description: "Separator between prefix and key. Default '__' (shell-safe). Note: '.' and ':' are not valid in shell identifiers."
 	}))
 }, { description: "Optional namespace/package prefix for injected environment variable names" });
+const McpHeaderSchema = Type.Object({
+	server: Type.String({
+		minLength: 1,
+		description: "MCP server name, as keyed in .mcp.json"
+	}),
+	header: Type.Optional(Type.String({
+		default: "Authorization",
+		minLength: 1,
+		description: "HTTP header name to send the secret in"
+	})),
+	scheme: Type.Optional(Type.String({
+		default: "Bearer",
+		description: "Prefix placed before the value (e.g. 'Bearer'). Empty string sends the raw value."
+	}))
+}, { description: "Send this secret as an HTTP header to an MCP server" });
 const SecretMetaSchema = Type.Object({
 	service: Type.Optional(Type.String({ description: "Service or system this secret authenticates to" })),
 	expires: Type.Optional(Type.String({
@@ -76,7 +91,8 @@ const SecretMetaSchema = Type.Object({
 	required: Type.Optional(Type.Boolean({ description: "Whether this secret is required for operation" })),
 	external: Type.Optional(Type.Boolean({ description: "Value is managed outside envpkt (e.g. a Cloudflare/Vault secret). The entry registers the name for inventory and dev/prod parity only: seal never touches it, and audit reports it as 'external' rather than 'missing'." })),
 	tags: Type.Optional(Type.Record(Type.String(), Type.String(), { description: "Key-value tags for grouping and filtering" })),
-	namespace: Type.Optional(Type.String({ description: "Override the file-level namespace for this entry's injected name. Empty string opts out of any prefix." }))
+	namespace: Type.Optional(Type.String({ description: "Override the file-level namespace for this entry's injected name. Empty string opts out of any prefix." })),
+	mcp: Type.Optional(Type.Array(McpHeaderSchema, { description: "MCP servers this secret authenticates to. Read by `envpkt headers` (Claude Code headersHelper)." }))
 }, { description: "Metadata about a single secret" });
 const LifecycleConfigSchema = Type.Object({
 	stale_warning_days: Type.Optional(Type.Number({
@@ -209,10 +225,13 @@ const discoverConfig = (cwd) => {
 		template,
 		expanded: expandPath(template)
 	})).filter(({ expanded }) => expanded !== "" && !expanded.startsWith("/.envpkt")).map(({ expanded }) => expandGlobPath(expanded)).find((matches) => matches.length > 0);
-	if (customMatch) return Option({
-		path: customMatch[0],
-		source: "search"
-	});
+	if (customMatch) {
+		const found = {
+			path: customMatch[0],
+			source: "search"
+		};
+		return Option(found);
+	}
 	const platformMatch = buildSearchPaths().find((p) => Fs.existsSync(p));
 	if (platformMatch) return Option({
 		path: platformMatch,
@@ -254,9 +273,10 @@ const parseToml = (raw) => Try(() => parse(raw)).fold((err) => Left({
 /** Validate parsed data against the TypeBox schema */
 const validateConfig = (data) => {
 	if (compiledSchema.Check(data)) return Right(data);
+	const errors = List([...compiledSchema.Errors(data)].map((e) => `${e.path}: ${e.message}`));
 	return Left({
 		_tag: "ValidationError",
-		errors: List([...compiledSchema.Errors(data)].map((e) => `${e.path}: ${e.message}`))
+		errors
 	});
 };
 /** Load and validate an envpkt.toml from a file path */
@@ -505,6 +525,104 @@ const formatAliasError = (error) => {
 	}
 };
 //#endregion
+//#region src/core/mcp-headers.ts
+const DEFAULT_HEADER = "Authorization";
+const DEFAULT_SCHEME = "Bearer";
+/** RFC 9110 `token`: the legal characters of a header name (and of an auth scheme). */
+const TOKEN_RE = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
+/** Characters that would split or corrupt an HTTP header value. */
+const UNSAFE_VALUE_RE = /[\r\n\0]/;
+/** Flatten every `[secret.*].mcp` entry into one binding per (secret, server), with defaults applied. */
+const collectBindings = (config) => Object.entries(config.secret ?? {}).flatMap(([key, meta]) => (meta.mcp ?? []).map((m) => ({
+	key,
+	server: m.server,
+	header: m.header ?? DEFAULT_HEADER,
+	scheme: m.scheme ?? DEFAULT_SCHEME
+})));
+/**
+* Check bindings for structural problems: header names and schemes that are not HTTP
+* tokens, and two bindings claiming the same (server, header) pair. Header names compare
+* case-insensitively, as HTTP does.
+*/
+const validateBindings = (bindings) => {
+	const badHeader = bindings.find((b) => !TOKEN_RE.test(b.header));
+	if (badHeader) return Left({
+		_tag: "McpHeaderInvalid",
+		key: badHeader.key,
+		server: badHeader.server,
+		header: badHeader.header
+	});
+	const badScheme = bindings.find((b) => b.scheme !== "" && !TOKEN_RE.test(b.scheme));
+	if (badScheme) return Left({
+		_tag: "McpSchemeInvalid",
+		key: badScheme.key,
+		server: badScheme.server,
+		scheme: badScheme.scheme
+	});
+	const claims = bindings.reduce((acc, b) => {
+		const id = `${b.server}\u0000${b.header.toLowerCase()}`;
+		return {
+			...acc,
+			[id]: [...acc[id] ?? [], b]
+		};
+	}, {});
+	const clash = Object.values(claims).find((group) => group.length > 1);
+	if (clash) {
+		const first = clash[0];
+		return Left({
+			_tag: "McpHeaderDuplicate",
+			server: first.server,
+			header: first.header,
+			keys: Set$1(clash.map((b) => b.key)).toArray()
+		});
+	}
+	return Right(void 0);
+};
+/** Check every `mcp` binding in a config. Used by `envpkt validate` and the write gate. */
+const validateMcpHeaders = (config) => validateBindings(collectBindings(config));
+/**
+* Build the HTTP header object for one MCP server: every secret whose `mcp` list names
+* `server`, merged into one object. `values` is keyed by logical secret name (as in
+* `BootResult.secrets`), so namespaces and aliases are already resolved by the caller.
+* Only this server's bindings are checked, so a problem on another server never blocks it.
+*/
+const buildMcpHeaders = (config, values, server) => {
+	const matches = collectBindings(config).filter((b) => b.server === server);
+	if (matches.length === 0) return Left({
+		_tag: "McpServerUnknown",
+		server
+	});
+	return validateBindings(matches).flatMap(() => {
+		const unresolved = matches.filter((b) => !values[b.key]).map((b) => b.key);
+		if (unresolved.length > 0) return Left({
+			_tag: "McpValueUnresolved",
+			server,
+			keys: unresolved
+		});
+		const unsafe = matches.filter((b) => UNSAFE_VALUE_RE.test(values[b.key])).map((b) => b.key);
+		if (unsafe.length > 0) return Left({
+			_tag: "McpValueInvalid",
+			server,
+			keys: unsafe
+		});
+		return Right(Object.fromEntries(matches.map((b) => {
+			const value = values[b.key];
+			return [b.header, b.scheme === "" ? value : `${b.scheme} ${value}`];
+		})));
+	});
+};
+/** Human-readable one-liner for any McpHeadersError tag. Never includes a secret value. */
+const formatMcpHeadersError = (error) => {
+	switch (error._tag) {
+		case "McpHeaderInvalid": return `[secret.${error.key}] mcp server "${error.server}": header "${error.header}" is not a valid HTTP header name`;
+		case "McpSchemeInvalid": return `[secret.${error.key}] mcp server "${error.server}": scheme "${error.scheme}" must be a single word or ""`;
+		case "McpHeaderDuplicate": return `MCP server "${error.server}": header "${error.header}" is claimed by more than one binding: ${error.keys.join(", ")}`;
+		case "McpServerUnknown": return `No secret declares mcp server "${error.server}"`;
+		case "McpValueUnresolved": return `MCP server "${error.server}": no value resolved for ${error.keys.join(", ")}`;
+		case "McpValueInvalid": return `MCP server "${error.server}": value of ${error.keys.join(", ")} contains a line break or NUL and cannot be sent as a header`;
+	}
+};
+//#endregion
 //#region src/core/format.ts
 const maskValue = (value) => {
 	if (value.length > 8) return `${value.slice(0, 3)}${"•".repeat(5)}${value.slice(-4)}`;
@@ -690,14 +808,15 @@ const computeAudit = (config, fnoxKeys, today, aliasTable) => {
 	const staleWarningDays = lifecycle.stale_warning_days ?? 90;
 	const requireExpiration = lifecycle.require_expiration ?? false;
 	const requireService = lifecycle.require_service ?? false;
-	const keys = fnoxKeys ?? /* @__PURE__ */ new Set();
+	const keys = fnoxKeys ?? Set$1.empty();
 	const secretEntries = config.secret ?? {};
 	const nonAliasEntries = Object.entries(secretEntries).filter(([, meta]) => meta.from_key === void 0);
 	const aliasEntries = Object.entries(secretEntries).filter(([, meta]) => meta.from_key !== void 0);
 	const nonAliasHealth = nonAliasEntries.map(([key, meta]) => classifySecret(key, meta, keys, staleWarningDays, requireExpiration, requireService, now));
 	const healthByKey = Map$1(nonAliasHealth.map((h) => [h.key, h]));
 	const parseTargetKey = (from_key) => {
-		return Option(from_key.match(/^secret\.(.+)$/)?.[1]);
+		const match = from_key.match(/^secret\.(.+)$/);
+		return Option(match?.[1]);
 	};
 	const aliasHealth = aliasEntries.map(([key, meta]) => {
 		const tableEntry = aliasTable?.entries.get(`secret.${key}`);
@@ -751,8 +870,10 @@ const computeEnvAudit = (config, env = process.env) => {
 	const envWire = (key) => namer(key, envEntries[key]?.namespace);
 	const resolveEffectiveDefault = (entry) => {
 		return Do(function* () {
-			const targetKey = yield* $(Option((yield* $(Option(entry.from_key))).match(/^env\.(.+)$/)?.[1]));
-			return yield* $(Option((yield* $(Option(envEntries[targetKey]))).value));
+			const fk = yield* $(Option(entry.from_key));
+			const targetKey = yield* $(Option(fk.match(/^env\.(.+)$/)?.[1]));
+			const targetEntry = yield* $(Option(envEntries[targetKey]));
+			return yield* $(Option(targetEntry.value));
 		}).orElse(entry.value ?? "");
 	};
 	const entries = Object.entries(envEntries).map(([key, entry]) => {
@@ -1398,7 +1519,8 @@ const VALUE_SHAPE_PATTERNS = [
 ];
 /** Detect service from value prefix/shape */
 const matchValueShape = (value) => {
-	return Option(VALUE_SHAPE_PATTERNS.find((vp) => value.startsWith(vp.prefix))).map((vp) => ({
+	const match = VALUE_SHAPE_PATTERNS.find((vp) => value.startsWith(vp.prefix));
+	return Option(match).map((vp) => ({
 		service: vp.service,
 		description: vp.description
 	}));
@@ -1438,7 +1560,8 @@ const matchEnvVar = (name, value) => {
 		matchedBy: `exact:${exactMatch.pattern}`
 	});
 	return matchValueShape(value).fold(() => {
-		return Option(SUFFIX_PATTERNS.find((sp) => name.endsWith(sp.suffix))).map((sp) => ({
+		const suffixMatch = SUFFIX_PATTERNS.find((sp) => name.endsWith(sp.suffix));
+		return Option(suffixMatch).map((sp) => ({
 			envVar: name,
 			value,
 			service: Option(deriveServiceFromName(name)),
@@ -2075,7 +2198,8 @@ const bootSafe = (options) => {
 			_tag: "ReadError",
 			message: "unexpected"
 		}));
-		const audit = computeAudit(config, detectFnoxKeys(configDir), void 0, aliasTable);
+		const fnoxKeys = detectFnoxKeys(configDir);
+		const audit = computeAudit(config, fnoxKeys, void 0, aliasTable);
 		const sealIdentity = hasSealedValues ? resolveSealIdentity(config, configDir) : Option(void 0);
 		if (hasSealedValues && sealIdentity.isEmpty) return Left({
 			_tag: "SealKeyUnavailable",
@@ -2117,37 +2241,39 @@ const bootSafe = (options) => {
 				}
 			});
 			const remainingKeys = nonAliasMetaKeys.filter((k) => !sealedKeys.has(k));
-			if (remainingKeys.length > 0) if (fnoxAvailable()) fnoxExport(opts.profile, identityKey.orUndefined()).fold((err) => {
-				log.warn("phase.fnox.export_failed", {
-					message: err.message,
-					skipped: remainingKeys.length
-				});
-				warnings.push(`fnox export failed: ${err.message}`);
-				skipped.push(...remainingKeys);
-			}, (exported) => {
-				const found = remainingKeys.filter((key) => key in exported);
-				const notFound = remainingKeys.filter((key) => !(key in exported));
-				found.forEach((key) => {
-					secrets[key] = exported[key];
-					log.debug("phase.fnox.resolved", {
-						key,
-						profile: opts.profile
+			if (remainingKeys.length > 0) {
+				if (fnoxAvailable()) fnoxExport(opts.profile, identityKey.orUndefined()).fold((err) => {
+					log.warn("phase.fnox.export_failed", {
+						message: err.message,
+						skipped: remainingKeys.length
 					});
-				});
-				notFound.forEach((key) => {
-					log.debug("phase.fnox.not_in_export", {
-						key,
-						profile: opts.profile
+					warnings.push(`fnox export failed: ${err.message}`);
+					skipped.push(...remainingKeys);
+				}, (exported) => {
+					const found = remainingKeys.filter((key) => key in exported);
+					const notFound = remainingKeys.filter((key) => !(key in exported));
+					found.forEach((key) => {
+						secrets[key] = exported[key];
+						log.debug("phase.fnox.resolved", {
+							key,
+							profile: opts.profile
+						});
 					});
+					notFound.forEach((key) => {
+						log.debug("phase.fnox.not_in_export", {
+							key,
+							profile: opts.profile
+						});
+					});
+					injected.push(...found);
+					skipped.push(...notFound);
 				});
-				injected.push(...found);
-				skipped.push(...notFound);
-			});
-			else {
-				log.debug("phase.fnox.unavailable", { skipped: remainingKeys.length });
-				if (!hasSealedValues) warnings.push("fnox not available — no secrets injected");
-				else warnings.push("fnox not available — unsealed secrets could not be resolved");
-				skipped.push(...remainingKeys);
+				else {
+					log.debug("phase.fnox.unavailable", { skipped: remainingKeys.length });
+					if (!hasSealedValues) warnings.push("fnox not available — no secrets injected");
+					else warnings.push("fnox not available — unsealed secrets could not be resolved");
+					skipped.push(...remainingKeys);
+				}
 			}
 			aliasSecretKeys.forEach((aliasKey) => {
 				const entry = aliasTable.entries.get(`secret.${aliasKey}`);
@@ -2381,7 +2507,8 @@ const tomlInlineTable = (rec) => {
 };
 /**
 * The SecretMeta to write into the destination on copy.
-* - `created` is reset to today: the entry is new *here*, regardless of the source's age.
+* - `created` comes from the caller, never the source: today for an entry new to the
+*   destination, or the destination's own `created` when the copy overwrites it.
 * - `last_rotated_at` is dropped — it's the source's rotation history, not the copy's.
 * - `encryptedValue` re-derives the ciphertext: `Some(cipher)` sets the resealed value,
 *   `None` strips it entirely (a metadata-only copy of a secret with no sealed value).
@@ -2390,10 +2517,10 @@ const copyableSecretMeta = (meta, opts) => {
 	const { last_rotated_at: _lra, encrypted_value: _ev, ...rest } = meta;
 	return opts.encryptedValue.fold(() => ({
 		...rest,
-		created: opts.today
+		created: opts.created
 	}), (cipher) => ({
 		...rest,
-		created: opts.today,
+		created: opts.created,
 		encrypted_value: cipher
 	}));
 };
@@ -2468,11 +2595,28 @@ const findSectionRange = (lines, sectionHeader) => {
 		end: List(lines.slice(start + 1)).zipWithIndex().foldLeft(initial)((state, entry) => scanSectionBoundary(state, entry[0], start + 1 + entry[1])).end
 	};
 };
+/**
+* End (exclusive) of a section's own lines: through its last field, before the blank and
+* comment lines that run up to the next header. Those trailing lines separate it from its
+* neighbour (or are the neighbour's doc comment), so edits to this section leave them alone.
+*/
+const sectionBodyEnd = (lines, range) => {
+	const lastContent = lines.slice(range.start, range.end).findLastIndex((l) => {
+		const t = l.trim();
+		return t !== "" && !t.startsWith("#");
+	});
+	return range.start + lastContent + 1;
+};
+const dropTrailingBlanks = (xs) => xs.slice(0, xs.findLastIndex((l) => l.trim() !== "") + 1);
+const dropLeadingBlanks = (xs) => {
+	const first = xs.findIndex((l) => l.trim() !== "");
+	return first === -1 ? [] : xs.slice(first);
+};
 /** Check whether a section header exists in the raw TOML */
 const sectionExists = (lines, sectionHeader) => lines.some((l) => l.trim() === sectionHeader);
 /**
-* Remove a TOML section (e.g. `[secret.X]`) and all its fields through the next section or EOF.
-* Strips trailing blank lines left behind.
+* Remove a TOML section (e.g. `[secret.X]`) and all its fields. A comment above the next
+* section stays. The sections on either side end up one blank line apart.
 */
 const removeSection = (raw, sectionHeader) => {
 	const lines = raw.split("\n");
@@ -2481,11 +2625,33 @@ const removeSection = (raw, sectionHeader) => {
 		_tag: "SectionNotFound",
 		section: sectionHeader
 	});
-	const after = lines.slice(range.end);
-	const beforeAll = lines.slice(0, range.start);
-	const lastNonBlank = beforeAll.findLastIndex((l) => l.trim() !== "");
-	const result = [...lastNonBlank === -1 ? [] : beforeAll.slice(0, lastNonBlank + 1), ...after].join("\n");
-	return Either.right(result);
+	const before = dropTrailingBlanks(lines.slice(0, range.start));
+	const after = dropLeadingBlanks(lines.slice(sectionBodyEnd(lines, range)));
+	if (after.length === 0) return Either.right([...before, ...raw.endsWith("\n") ? [""] : []].join("\n"));
+	if (before.length === 0) return Either.right(after.join("\n"));
+	return Either.right([
+		...before,
+		"",
+		...after
+	].join("\n"));
+};
+/**
+* Replace a TOML section with `block`, in place. Lines outside the section, including the
+* blank and comment lines between it and the next header, are left as they were.
+*/
+const replaceSection = (raw, sectionHeader, block) => {
+	const lines = raw.split("\n");
+	const range = findSectionRange(lines, sectionHeader);
+	if (!range) return Either.left({
+		_tag: "SectionNotFound",
+		section: sectionHeader
+	});
+	const replaced = [
+		...lines.slice(0, range.start),
+		...block.trimEnd().split("\n"),
+		...lines.slice(sectionBodyEnd(lines, range))
+	];
+	return Either.right(replaced.join("\n"));
 };
 /**
 * Rename a TOML section header (e.g. `[secret.OLD]` → `[secret.NEW]`).
@@ -2584,7 +2750,7 @@ function* findEnvpktFiles(dir, maxDepth, currentDepth = 0) {
 }
 const scanFleet = (rootDir, options) => {
 	const maxDepth = options?.maxDepth ?? 3;
-	const agentList = List(Array.from(findEnvpktFiles(rootDir, maxDepth)).flatMap((configPath) => loadConfig(configPath).fold(() => [], (config) => {
+	const agents = Array.from(findEnvpktFiles(rootDir, maxDepth)).flatMap((configPath) => loadConfig(configPath).fold(() => [], (config) => {
 		const audit = computeAudit(config);
 		return [{
 			path: configPath,
@@ -2592,7 +2758,8 @@ const scanFleet = (rootDir, options) => {
 			min_expiry_days: audit.secrets.toArray().reduce((min, s) => s.days_remaining.fold(() => min, (d) => min.fold(() => Option(d), (m) => Option(Math.min(m, d)))), Option(void 0)).orUndefined(),
 			audit
 		}];
-	})));
+	}));
+	const agentList = List(agents);
 	const total_agents = agentList.size;
 	const total_secrets = agentList.toArray().reduce((acc, a) => acc + a.audit.total, 0);
 	const expired = agentList.toArray().reduce((acc, a) => acc + a.audit.expired, 0);
@@ -2929,4 +3096,4 @@ const startServer = async () => {
 	await server.connect(transport);
 };
 //#endregion
-export { AgentIdentitySchema, CallbackConfigSchema, ConsumerType, EnvMetaSchema, EnvpktBootError, EnvpktConfigSchema, IdentitySchema, LifecycleConfigSchema, SecretMetaSchema, ToolsConfigSchema, ageAvailable, ageDecrypt, ageEncrypt, appendSection, boot, bootSafe, callTool, compareFnoxAndEnvpkt, computeAudit, computeEnvAudit, copyableSecretMeta, createDirectConsoleLogger, createDirectTestLogger, createServer, deriveServiceFromName, detectFnox, diffConfigs, directSilentLogger, discoverConfig, envCheck, envScan, extractFnoxKeys, findConfigPath, fnoxAvailable, fnoxExport, fnoxGet, formatAliasError, formatDotenv, formatPacket, generateKeypair, generateTomlFromScan, isEnvAlias, isSecretAlias, loadCatalog, loadConfig, loadConfigFromCwd, maskValue, matchEnvVar, matchValueShape, parseToml, quoteDotenvValue, readConfigFile, readFnoxConfig, readResource, removeSection, renameSection, resolveConfig, resolveConfigPath, resolveInlineKey, resolveKeyPath, resolveSecrets, resolveValues, resourceDefinitions, scanEnv, scanFleet, sealSecrets, serializeEnvBlock, serializeSecretBlock, startServer, toolDefinitions, unsealSecrets, unwrapAgentKey, updateConfigIdentity, updateSectionFields, validateAliases, validateConfig };
+export { AgentIdentitySchema, CallbackConfigSchema, ConsumerType, EnvMetaSchema, EnvpktBootError, EnvpktConfigSchema, IdentitySchema, LifecycleConfigSchema, McpHeaderSchema, SecretMetaSchema, ToolsConfigSchema, ageAvailable, ageDecrypt, ageEncrypt, appendSection, boot, bootSafe, buildMcpHeaders, callTool, compareFnoxAndEnvpkt, computeAudit, computeEnvAudit, copyableSecretMeta, createDirectConsoleLogger, createDirectTestLogger, createServer, deriveServiceFromName, detectFnox, diffConfigs, directSilentLogger, discoverConfig, envCheck, envScan, extractFnoxKeys, findConfigPath, fnoxAvailable, fnoxExport, fnoxGet, formatAliasError, formatDotenv, formatMcpHeadersError, formatPacket, generateKeypair, generateTomlFromScan, isEnvAlias, isSecretAlias, loadCatalog, loadConfig, loadConfigFromCwd, maskValue, matchEnvVar, matchValueShape, parseToml, quoteDotenvValue, readConfigFile, readFnoxConfig, readResource, removeSection, renameSection, replaceSection, resolveConfig, resolveConfigPath, resolveInlineKey, resolveKeyPath, resolveSecrets, resolveValues, resourceDefinitions, scanEnv, scanFleet, sealSecrets, serializeEnvBlock, serializeSecretBlock, startServer, toolDefinitions, unsealSecrets, unwrapAgentKey, updateConfigIdentity, updateSectionFields, validateAliases, validateConfig, validateMcpHeaders };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envpkt",
-  "version": "0.14.1",
+  "version": "0.16.0",
   "description": "Credential lifecycle and fleet management for AI agents",
   "keywords": [
     "credentials",
@@ -39,19 +39,19 @@
     "prepublishOnly": "pnpm validate"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.30.0",
+    "@modelcontextprotocol/sdk": "^1.32.1",
     "@sinclair/typebox": "^0.34.52",
     "commander": "^15.0.0",
-    "functype": "^1.8.0",
-    "functype-log": "^1.8.0",
-    "functype-os": "^1.8.0",
-    "smol-toml": "^1.7.1"
+    "functype": "^1.15.0",
+    "functype-log": "^1.15.0",
+    "functype-os": "^1.15.0",
+    "smol-toml": "^1.9.1"
   },
   "devDependencies": {
-    "@types/node": "^24.13.3",
-    "ts-builds": "^3.2.3",
+    "@types/node": "^24.19.2",
+    "ts-builds": "^3.4.3",
     "tsdown": "^0.22.14",
-    "tsx": "^4.23.1"
+    "tsx": "^4.23.15"
   },
   "type": "module",
   "main": "./dist/index.js",
@@ -71,5 +71,5 @@
     "schemas"
   ],
   "prettier": "ts-builds/prettier",
-  "packageManager": "pnpm@11.18.0+sha512.33d83c77da82f49fba836925c6f1b841181ec3132b670639bd012f7075f5c7cf634c5f870147c19aae7478fac01df09d8892e880454896edd23ee9b33757563c"
+  "packageManager": "pnpm@11.27.0+sha512.ad12821463bb143295f1fa3ecde77a6b9b97a7990386da800ff57bffc3964dc64b7b1c7559d5dbe5c337aea659ed9c8937d4370bd198ca2009bc6fa0249808e7"
 }

package/schemas/envpkt.schema.json

@@ -211,6 +211,35 @@
             "namespace": {
               "description": "Override the file-level namespace for this entry's injected name. Empty string opts out of any prefix.",
               "type": "string"
+            },
+            "mcp": {
+              "description": "MCP servers this secret authenticates to. Read by `envpkt headers` (Claude Code headersHelper).",
+              "type": "array",
+              "items": {
+                "description": "Send this secret as an HTTP header to an MCP server",
+                "type": "object",
+                "required": [
+                  "server"
+                ],
+                "properties": {
+                  "server": {
+                    "minLength": 1,
+                    "description": "MCP server name, as keyed in .mcp.json",
+                    "type": "string"
+                  },
+                  "header": {
+                    "default": "Authorization",
+                    "minLength": 1,
+                    "description": "HTTP header name to send the secret in",
+                    "type": "string"
+                  },
+                  "scheme": {
+                    "default": "Bearer",
+                    "description": "Prefix placed before the value (e.g. 'Bearer'). Empty string sends the raw value.",
+                    "type": "string"
+                  }
+                }
+              }
             }
           }
         }