@savvy-web/silk 2.2.2 → 2.2.4

package/changesets-markdownlint.js

@@ -394,10 +394,28 @@ const ChangesetConfigLive = Layer.effect(ChangesetConfig, Effect.gen(function* (
 		fixed: (root) => read(root).pipe(Effect.map(Option.match({
 			onNone: () => [],
 			onSome: (cfg) => cfg.fixed ?? []
-		})))
+		}))),
+		refresh: () => Effect.sync(() => cache.clear())
 	};
 }));
 
+//#endregion
+//#region ../silk-effects/dist/dev/pkg/utils/TrailingSlash.js
+/**
+* Trim trailing slashes from a string.
+*
+* @remarks
+* Trims trailing slashes with an index scan rather than `/\/+$/`. That regex is
+* unanchored at the start, so the engine retries the match from every position
+* and degrades to O(n²) on a string of many slashes (CodeQL `js/polynomial-redos`).
+* Only a trailing run of slashes is removed; interior slash runs are untouched.
+*/
+const trimTrailingSlashes = (s) => {
+	let end = s.length;
+	while (end > 0 && s[end - 1] === "/") end -= 1;
+	return s.slice(0, end);
+};
+
 //#endregion
 //#region ../../node_modules/.pnpm/workspaces-effect@2.0.3_@effect+platform@0.96.2_effect@3.21.4__effect@3.21.4/node_modules/workspaces-effect/errors/CatalogAssemblyError.js
 /**
@@ -11064,18 +11082,16 @@ var SilkPublishability = class {
 * normalizes to `.`, matching how a root-directory target is recorded.
 *
 * @remarks
-* Trailing slashes are trimmed with an index scan rather than `/\/+$/`. That
-* regex is unanchored at the start, so the engine retries the match from every
-* position and degrades to O(n²) on a path of many slashes (CodeQL
-* `js/polynomial-redos`). `dir` reaches here from `dist/prod/targets.json`, which
-* the bundler writes but a consumer repo could hand-edit.
+* Trailing-slash trimming is delegated to the shared `trimTrailingSlashes`
+* index-scan helper rather than `/\/+$/`: that regex is unanchored at the
+* start, so the engine retries the match from every position and degrades to
+* O(n²) on a path of many slashes (CodeQL `js/polynomial-redos`). `dir` reaches
+* here from `dist/prod/targets.json`, which the bundler writes but a consumer
+* repo could hand-edit.
 */
 const normalizeDir = (dir) => {
 	const slashed = dir.replaceAll("\\", "/");
-	const withoutPrefix = slashed.startsWith("./") ? slashed.slice(2) : slashed;
-	let end = withoutPrefix.length;
-	while (end > 0 && withoutPrefix[end - 1] === "/") end -= 1;
-	const normalized = withoutPrefix.slice(0, end);
+	const normalized = trimTrailingSlashes(slashed.startsWith("./") ? slashed.slice(2) : slashed);
 	return normalized === "" ? "." : normalized;
 };
 /** True when a built target directory's package.json is `private: true`. Missing/unreadable/malformed → false. */
@@ -38943,9 +38959,14 @@ function makeShape$3(reader, discovery, fs) {
 		const inspected = yield* inspect(cwd);
 		return paths.map((p) => classifyOne(inspected, p));
 	});
+	const refresh = () => Effect.gen(function* () {
+		cache.clear();
+		yield* discovery.refresh();
+	});
 	return {
 		inspect,
-		classify
+		classify,
+		refresh
 	};
 }
 /**
@@ -39015,7 +39036,8 @@ const ConfigInspectorLive = Layer.effect(ConfigInspector, Effect.gen(function* (
 function makeConfigInspectorTest(fixed) {
 	return Layer.succeed(ConfigInspector, {
 		inspect: () => Effect.succeed(fixed),
-		classify: (_cwd, paths) => Effect.succeed(paths.map((p) => classifyOne(fixed, p)))
+		classify: (_cwd, paths) => Effect.succeed(paths.map((p) => classifyOne(fixed, p))),
+		refresh: () => Effect.void
 	});
 }
 
@@ -39533,6 +39555,48 @@ function gitMergeBase(cwd, base) {
 		}
 	});
 }
+/**
+* List the basenames of `.changeset/*.md` files tracked at `ref` (e.g. the
+* merge base), via `git ls-tree -r --name-only`. Used by `DepsRegen.plan()`
+* to protect changesets authored by already-merged PRs from being deleted by
+* an unrelated branch's regen run (#258).
+*
+* @remarks
+* Deliberately tolerant, unlike {@link gitMergeBase}: `cwd` may not be a git
+* repository at all (many `DepsRegen` unit tests pass synthetic refs like
+* `"BEFORE"`/`"AFTER"` against a bare tmpdir), and an unresolvable ref is a
+* plausible caller mistake rather than a fatal condition. Either failure mode
+* resolves to an empty set — "nothing protected" — rather than propagating a
+* {@link GitError}, so a missing/invalid git context degrades the
+* authorship filter to a no-op instead of blocking the whole plan.
+*
+* @internal
+*/
+function gitListChangesetFilesAtRef(cwd, ref) {
+	return Effect.sync(() => {
+		try {
+			const out = execFileSync("git", [
+				"ls-tree",
+				"-r",
+				"--name-only",
+				ref,
+				"--",
+				".changeset"
+			], {
+				cwd,
+				encoding: "utf8",
+				stdio: [
+					"ignore",
+					"pipe",
+					"pipe"
+				]
+			});
+			return new Set(out.split(/\r?\n/).filter((line) => line.trim().length > 0).map((path) => basename(path)));
+		} catch {
+			return /* @__PURE__ */ new Set();
+		}
+	});
+}
 
 //#endregion
 //#region ../silk-effects/dist/dev/pkg/changesets/utils/publishability.js
@@ -39599,6 +39663,15 @@ function listPublishablePackageNames(packages, root) {
 * first, then deleting the stale pure-dependency ones (so an interrupted
 * run loses nothing and is safely re-runnable).
 *
+* A pure dependency changeset is only ever a delete candidate when BOTH:
+* its package is in scope AND actually produced a fresh diff this run
+* (present in {@link RegenPlan.toWrite}), and the file was authored on
+* this branch rather than already committed at the merge-base ref. Either
+* gap silently destroyed a still-relevant release note before this was
+* fixed (#258) — a devDependency-only diff drops all its rows and was
+* never rewritten, and a changeset an earlier, already-merged PR
+* committed was swept away by an unrelated branch's regen run.
+*
 * This is the single source of truth for regen/detect: the CLI commands
 * and MCP tools are thin adapters over this service.
 *
@@ -39818,7 +39891,8 @@ function makeShape$1(pit, inspector, discovery, detector, config, fs) {
 	const plan = (options) => Effect.gen(function* () {
 		const resolvedCwd = resolve(options.cwd);
 		const changesetDir = join(resolvedCwd, ".changeset");
-		yield* discovery.refresh();
+		yield* inspector.refresh();
+		yield* config.refresh();
 		let fromRef = options.from;
 		if (!fromRef) {
 			let baseBranch = options.base;
@@ -39855,7 +39929,10 @@ function makeShape$1(pit, inspector, discovery, detector, config, fs) {
 		}
 		const existingPure = yield* findPureDependencyChangesets(fs, changesetDir);
 		const skippedMixed = yield* findMixedDependencyChangesets(fs, changesetDir);
-		const toDelete = existingPure.filter((p) => inScopeFor(p.package));
+		const rewrittenPackages = new Set(resolved.map((d) => d.package));
+		const atMergeBase = yield* gitListChangesetFilesAtRef(resolvedCwd, fromRef);
+		const authoredOnBranch = (file) => !atMergeBase.has(basename(file));
+		const toDelete = existingPure.filter((p) => inScopeFor(p.package) && rewrittenPackages.has(p.package) && authoredOnBranch(p.file));
 		const chosenFilenames = /* @__PURE__ */ new Set();
 		const toWrite = [];
 		for (const diff of resolved) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/silk",
-	"version": "2.2.2",
+	"version": "2.2.4",
 	"private": false,
 	"description": "The single Silk Suite dev-tooling package — changeset, commitlint, lint, and biome conventions",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/silk",
@@ -67,9 +67,9 @@
 	"dependencies": {
 		"@effect/platform": "^0.96.2",
 		"@savvy-web/changelog": "0.1.1",
-		"@savvy-web/cli": "1.5.5",
-		"@savvy-web/mcp": "1.7.2",
-		"@savvy-web/silk-effects": "3.2.1",
+		"@savvy-web/cli": "1.5.7",
+		"@savvy-web/mcp": "1.7.4",
+		"@savvy-web/silk-effects": "3.2.3",
 		"effect": "^3.21.4",
 		"semver": "^7.8.5"
 	},