@savvy-web/silk-effects 5.8.0 → 5.9.0

package/index.d.ts

@@ -9188,6 +9188,25 @@ declare const ReposRestoreResult: Schema.Struct<{
 }>;
 /** @public */
 type ReposRestoreResult = typeof ReposRestoreResult.Type;
+/**
+ * Result of clearing a stale submodule registration from the superproject's
+ * LOCAL git config.
+ *
+ * @remarks
+ * `section` is the registration name the section was cleared under (e.g.
+ * `.repos/effect-old`), and `removedKeys` lists the full config keys the
+ * removed section actually carried — the achieved-state report, read from the
+ * config BEFORE the removal so a caller can see exactly what is gone. There
+ * is no `commitMessage`: the local config is unversioned, so a deregister
+ * stages nothing and leaves nothing to commit.
+ * @public
+ */
+declare const ReposDeregisterResult: Schema.Struct<{
+  readonly section: Schema.String;
+  readonly removedKeys: Schema.$Array<Schema.String>;
+}>;
+/** @public */
+type ReposDeregisterResult = typeof ReposDeregisterResult.Type;
 /**
  * Result of an agent-note mutation against a vendored repo.
  * @public
@@ -9233,6 +9252,24 @@ declare class ReposConfigStore extends ReposConfigStore_base {
 }
 //#endregion
 //#region src/repos/services/drift.d.ts
+/**
+ * Extracts the submodule NAME from a `submodule.<name>.<property>` config key.
+ *
+ * @remarks
+ * A submodule's name is routinely a PATH (`git submodule add` derives the
+ * section name from the path), so the name itself contains dots — which means
+ * the key cannot be split on `.` and read positionally. Strip the fixed
+ * `submodule.` prefix and the final `.<property>` segment instead; everything
+ * between is the name, dots and all. Returns `undefined` for any key that is
+ * not a `submodule.*.*` key.
+ *
+ * Shared with `ReposManager.deregister`, which must attribute config keys to
+ * a registration name the exact same way this check does — two parsers here
+ * would let the report and the remedy disagree about what a section is named.
+ *
+ * @internal
+ */
+declare const submoduleNameFromKey: (key: string) => string | undefined;
 /**
  * The {@link ReposDrift} service shape.
  * @public
@@ -9424,6 +9461,31 @@ interface ReposManagerShape {
    */
   readonly rename: (root: string, oldName: string, newName: string) => Effect.Effect<ReposRenameResult, ReposConfigError | GitSubmoduleError | RepoNotFoundError | ReposLockdownError>;
   readonly restore: (root: string, names?: ReadonlyArray<string>) => Effect.Effect<ReposRestoreResult, ReposConfigError | GitSubmoduleError | RepoNotFoundError | ReposLockdownError>;
+  /**
+   * Clears a STALE submodule registration — a `submodule.<section>.*`
+   * section in the superproject's LOCAL git config left behind by a rename
+   * or an unvendoring, which `git submodule status` then lists as a phantom
+   * entry the manifest has never heard of (`ReposDrift` reports it as
+   * `localRegistrationDivergence`).
+   *
+   * `section` is the registration name exactly as the drift report states it
+   * (e.g. `.repos/effect-old`) — the `submodule.` prefix is implied, never
+   * passed. Refuses (typed `ReposConfigError`): a section outside
+   * `.repos/` (this machinery does not own it — it may be a real submodule
+   * of the host repo), the canonical registration of a live manifest entry,
+   * and a registration whose module gitdir still backs a live entry under a
+   * DIVERGED name (the same gitdir attribution `ReposDrift` uses — that
+   * state's remedy is a re-vendor, not a deregister) — UNLESS that entry's
+   * canonical section is also registered, in which case the old-named twin
+   * is a genuine orphan and removing it is a crashed-rename recovery's own
+   * final step. Reconciling a LIVE
+   * registration is `sync`'s job and unvendoring is `remove`'s, so
+   * deregistration only ever touches state nothing else owns. Touches only
+   * the superproject's local config — no vendored worktree — so unlike the
+   * other mutating ops it needs no lockdown bracket and stages nothing to
+   * commit.
+   */
+  readonly deregister: (root: string, section: string) => Effect.Effect<ReposDeregisterResult, ReposConfigError | GitSubmoduleError>;
 }
 declare const ReposManager_base: Context.ServiceClass<ReposManager, "@savvy-web/silk-effects/ReposManager", ReposManagerShape>;
 /**
@@ -9431,8 +9493,10 @@ declare const ReposManager_base: Context.ServiceClass<ReposManager, "@savvy-web/
  * (presence, dirtiness, stale notes), reconciles the working tree with the
  * manifest, vendors new entries (`add`), re-pins existing entries to a new
  * ref (`pin`), adds/removes/promotes agent notes (`note`), unvendors
- * (`remove`), renames (`rename`), and explicitly hard-resets dirty
- * checkouts back to their pinned commit (`restore`).
+ * (`remove`), renames (`rename`), explicitly hard-resets dirty
+ * checkouts back to their pinned commit (`restore`), and clears stale
+ * submodule registrations from the superproject's local git config
+ * (`deregister`).
  * @public
  */
 declare class ReposManager extends ReposManager_base {
@@ -9450,7 +9514,7 @@ declare class ReposManager extends ReposManager_base {
   static readonly layer: Layer.Layer<ReposManager, never, ReposConfigStore | Git | FileSystem.FileSystem | Path.Path | ReposLockdown>;
 }
 declare namespace index_d_exports$4 {
-  export { DriftKind, GitSubmoduleError, GitSubmoduleErrorBase, MANIFEST_PATH, NOTE_LIMIT, NoteNotFoundError, NoteNotFoundErrorBase, REPOS_DIR, RepoDrift, RepoEntry, RepoName, RepoNotFoundError, RepoNotFoundErrorBase, RepoNote, RepoOrientation, RepoStatusEntry, ReposAddResult, ReposConfigError, ReposConfigErrorBase, ReposConfigStore, ReposConfigStoreShape, ReposDrift, ReposDriftReport, ReposDriftShape, ReposLockdown, ReposLockdownError, ReposLockdownErrorBase, ReposLockdownShape, ReposManager, ReposManagerShape, ReposManifestFile, ReposNoteResult, ReposPinResult, ReposRemoveResult, ReposRenameResult, ReposRestoreResult, ReposStatusReport, ReposSyncReport, STALE_LOCK_MAX_AGE_MS, resolveModuleDir };
+  export { DriftKind, GitSubmoduleError, GitSubmoduleErrorBase, MANIFEST_PATH, NOTE_LIMIT, NoteNotFoundError, NoteNotFoundErrorBase, REPOS_DIR, RepoDrift, RepoEntry, RepoName, RepoNotFoundError, RepoNotFoundErrorBase, RepoNote, RepoOrientation, RepoStatusEntry, ReposAddResult, ReposConfigError, ReposConfigErrorBase, ReposConfigStore, ReposConfigStoreShape, ReposDeregisterResult, ReposDrift, ReposDriftReport, ReposDriftShape, ReposLockdown, ReposLockdownError, ReposLockdownErrorBase, ReposLockdownShape, ReposManager, ReposManagerShape, ReposManifestFile, ReposNoteResult, ReposPinResult, ReposRemoveResult, ReposRenameResult, ReposRestoreResult, ReposStatusReport, ReposSyncReport, STALE_LOCK_MAX_AGE_MS, resolveModuleDir, submoduleNameFromKey };
 }
 //#endregion
 //#region src/schemas/BiomeConfig.d.ts

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/silk-effects",
-	"version": "5.8.0",
+	"version": "5.9.0",
 	"private": false,
 	"description": "Shared Effect library for Silk Suite conventions",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/silk-effects",
@@ -34,13 +34,13 @@
 		"@changesets/get-github-info": "^1.0.0",
 		"@changesets/get-release-plan": "^5.0.0",
 		"@effected/commands": "^0.4.0",
-		"@effected/git": "^0.7.0",
+		"@effected/git": "^0.8.0",
 		"@effected/glob": "^0.3.0",
 		"@effected/jsonc": "^0.6.0",
-		"@effected/package-json": "^0.8.0",
+		"@effected/package-json": "^0.9.0",
 		"@effected/templates": "^0.2.0",
 		"@effected/walker": "^0.4.0",
-		"@effected/workspaces": "^0.12.0",
+		"@effected/workspaces": "^0.13.0",
 		"@effected/yaml": "^0.8.0",
 		"@manypkg/get-packages": "^3.1.0",
 		"mdast-util-heading-range": "^4.0.0",

package/repos/index.js

@@ -3,10 +3,10 @@ import { MANIFEST_PATH, REPOS_DIR } from "./constants.js";
 import { GitSubmoduleError, GitSubmoduleErrorBase, NoteNotFoundError, NoteNotFoundErrorBase, RepoNotFoundError, RepoNotFoundErrorBase, ReposConfigError, ReposConfigErrorBase, ReposLockdownError, ReposLockdownErrorBase } from "./errors.js";
 import { DriftKind, RepoDrift, ReposDriftReport } from "./schemas/drift.js";
 import { RepoEntry, RepoName, RepoNote, RepoOrientation, ReposManifestFile } from "./schemas/manifest.js";
-import { RepoStatusEntry, ReposAddResult, ReposNoteResult, ReposPinResult, ReposRemoveResult, ReposRenameResult, ReposRestoreResult, ReposStatusReport, ReposSyncReport } from "./schemas/reports.js";
+import { RepoStatusEntry, ReposAddResult, ReposDeregisterResult, ReposNoteResult, ReposPinResult, ReposRemoveResult, ReposRenameResult, ReposRestoreResult, ReposStatusReport, ReposSyncReport } from "./schemas/reports.js";
 import { ReposConfigStore } from "./services/config-store.js";
 import { ReposLockdown, resolveModuleDir } from "./services/lockdown.js";
-import { ReposDrift } from "./services/drift.js";
+import { ReposDrift, submoduleNameFromKey } from "./services/drift.js";
 import { ReposManager, STALE_LOCK_MAX_AGE_MS } from "./services/manager.js";
 
 //#region src/repos/index.ts
@@ -31,6 +31,7 @@ var repos_exports = /* @__PURE__ */ __exportAll({
 	ReposConfigError: () => ReposConfigError,
 	ReposConfigErrorBase: () => ReposConfigErrorBase,
 	ReposConfigStore: () => ReposConfigStore,
+	ReposDeregisterResult: () => ReposDeregisterResult,
 	ReposDrift: () => ReposDrift,
 	ReposDriftReport: () => ReposDriftReport,
 	ReposLockdown: () => ReposLockdown,
@@ -46,8 +47,9 @@ var repos_exports = /* @__PURE__ */ __exportAll({
 	ReposStatusReport: () => ReposStatusReport,
 	ReposSyncReport: () => ReposSyncReport,
 	STALE_LOCK_MAX_AGE_MS: () => STALE_LOCK_MAX_AGE_MS,
-	resolveModuleDir: () => resolveModuleDir
+	resolveModuleDir: () => resolveModuleDir,
+	submoduleNameFromKey: () => submoduleNameFromKey
 });
 
 //#endregion
-export { DriftKind, GitSubmoduleError, GitSubmoduleErrorBase, MANIFEST_PATH, NoteNotFoundError, NoteNotFoundErrorBase, REPOS_DIR, RepoDrift, RepoEntry, RepoName, RepoNotFoundError, RepoNotFoundErrorBase, RepoNote, RepoOrientation, RepoStatusEntry, ReposAddResult, ReposConfigError, ReposConfigErrorBase, ReposConfigStore, ReposDrift, ReposDriftReport, ReposLockdown, ReposLockdownError, ReposLockdownErrorBase, ReposManager, ReposManifestFile, ReposNoteResult, ReposPinResult, ReposRemoveResult, ReposRenameResult, ReposRestoreResult, ReposStatusReport, ReposSyncReport, STALE_LOCK_MAX_AGE_MS, repos_exports, resolveModuleDir };
+export { DriftKind, GitSubmoduleError, GitSubmoduleErrorBase, MANIFEST_PATH, NoteNotFoundError, NoteNotFoundErrorBase, REPOS_DIR, RepoDrift, RepoEntry, RepoName, RepoNotFoundError, RepoNotFoundErrorBase, RepoNote, RepoOrientation, RepoStatusEntry, ReposAddResult, ReposConfigError, ReposConfigErrorBase, ReposConfigStore, ReposDeregisterResult, ReposDrift, ReposDriftReport, ReposLockdown, ReposLockdownError, ReposLockdownErrorBase, ReposManager, ReposManifestFile, ReposNoteResult, ReposPinResult, ReposRemoveResult, ReposRenameResult, ReposRestoreResult, ReposStatusReport, ReposSyncReport, STALE_LOCK_MAX_AGE_MS, repos_exports, resolveModuleDir, submoduleNameFromKey };

package/repos/schemas/reports.js

@@ -150,6 +150,23 @@ const ReposRestoreResult = Schema.Struct({
 	stillDirty: Schema.Array(Schema.String)
 });
 /**
+* Result of clearing a stale submodule registration from the superproject's
+* LOCAL git config.
+*
+* @remarks
+* `section` is the registration name the section was cleared under (e.g.
+* `.repos/effect-old`), and `removedKeys` lists the full config keys the
+* removed section actually carried — the achieved-state report, read from the
+* config BEFORE the removal so a caller can see exactly what is gone. There
+* is no `commitMessage`: the local config is unversioned, so a deregister
+* stages nothing and leaves nothing to commit.
+* @public
+*/
+const ReposDeregisterResult = Schema.Struct({
+	section: Schema.String,
+	removedKeys: Schema.Array(Schema.String)
+});
+/**
 * Result of an agent-note mutation against a vendored repo.
 * @public
 */
@@ -165,4 +182,4 @@ const ReposNoteResult = Schema.Struct({
 });
 
 //#endregion
-export { RepoStatusEntry, ReposAddResult, ReposNoteResult, ReposPinResult, ReposRemoveResult, ReposRenameResult, ReposRestoreResult, ReposStatusReport, ReposSyncReport };
+export { RepoStatusEntry, ReposAddResult, ReposDeregisterResult, ReposNoteResult, ReposPinResult, ReposRemoveResult, ReposRenameResult, ReposRestoreResult, ReposStatusReport, ReposSyncReport };

package/repos/services/drift.js

@@ -17,6 +17,12 @@ import { Git, Gitmodules } from "@effected/git";
 * `submodule.` prefix and the final `.<property>` segment instead; everything
 * between is the name, dots and all. Returns `undefined` for any key that is
 * not a `submodule.*.*` key.
+*
+* Shared with `ReposManager.deregister`, which must attribute config keys to
+* a registration name the exact same way this check does — two parsers here
+* would let the report and the remedy disagree about what a section is named.
+*
+* @internal
 */
 const submoduleNameFromKey = (key) => {
 	if (!key.startsWith("submodule.")) return;
@@ -91,7 +97,7 @@ var ReposDrift = class extends Context.Service()("@savvy-web/silk-effects/ReposD
 				found.push(RepoDrift.make({
 					name: registeredName,
 					kind: "localRegistrationDivergence",
-					detail: `local git config registers submodule "${registeredName}", which matches no manifest entry — a stale registration left behind by a rename or an unvendoring; clear it with \`git config --remove-section submodule.${registeredName}\``,
+					detail: `local git config registers submodule "${registeredName}", which matches no manifest entry — a stale registration left behind by a rename or an unvendoring; clear it with \`savvy repos deregister ${registeredName}\``,
 					observedValue: registeredName
 				}));
 			}
@@ -247,4 +253,4 @@ var ReposDrift = class extends Context.Service()("@savvy-web/silk-effects/ReposD
 };
 
 //#endregion
-export { ReposDrift };
+export { ReposDrift, submoduleNameFromKey };

package/repos/services/manager.js

@@ -3,6 +3,7 @@ import { GitSubmoduleError, NoteNotFoundError, RepoNotFoundError, ReposConfigErr
 import { RepoName } from "../schemas/manifest.js";
 import { ReposConfigStore } from "./config-store.js";
 import { ReposLockdown, resolveModuleDir } from "./lockdown.js";
+import { submoduleNameFromKey } from "./drift.js";
 import { Clock, Context, Effect, Exit, FileSystem, Layer, Option, Path, Result, Schema } from "effect";
 import { Git, GitConfig, Gitmodules, LsRemoteEntry } from "@effected/git";
 import { createHash } from "node:crypto";
@@ -31,8 +32,10 @@ const STALE_LOCK_MAX_AGE_MS = 6e5;
 * (presence, dirtiness, stale notes), reconciles the working tree with the
 * manifest, vendors new entries (`add`), re-pins existing entries to a new
 * ref (`pin`), adds/removes/promotes agent notes (`note`), unvendors
-* (`remove`), renames (`rename`), and explicitly hard-resets dirty
-* checkouts back to their pinned commit (`restore`).
+* (`remove`), renames (`rename`), explicitly hard-resets dirty
+* checkouts back to their pinned commit (`restore`), and clears stale
+* submodule registrations from the superproject's local git config
+* (`deregister`).
 * @public
 */
 var ReposManager = class extends Context.Service()("@savvy-web/silk-effects/ReposManager") {
@@ -158,12 +161,12 @@ var ReposManager = class extends Context.Service()("@savvy-web/silk-effects/Repo
 						yield* git.add(root, [".gitmodules", repoPathRel]).pipe(Effect.mapError(asSubmoduleError(`git add .gitmodules ${repoPathRel}`, root)));
 						registered.push(name);
 					} else if (!present) {
-						yield* git.configSet(root, updateKey, "checkout").pipe(Effect.mapError(asSubmoduleError(`git config ${updateKey} checkout`, root)));
 						yield* git.submoduleUpdate(root, {
 							init: true,
+							checkout: true,
 							depth: 1,
 							paths: [repoPathRel]
-						}).pipe(Effect.mapError(asSubmoduleError(`git submodule update --init --depth 1 -- ${repoPathRel}`, root)), Effect.ensuring(Effect.ignore(assertBoundaryMarker)));
+						}).pipe(Effect.mapError(asSubmoduleError(`git submodule update --init --checkout --depth 1 -- ${repoPathRel}`, root)));
 						initialized.push(name);
 					} else upToDate.push(name);
 					if (entry.sparse && entry.sparse.length > 0) {
@@ -647,6 +650,70 @@ var ReposManager = class extends Context.Service()("@savvy-web/silk-effects/Repo
 				stillDirty
 			};
 		});
+		/**
+		* Resolve the file git's `--local` scope actually targets for `root`.
+		* A plain checkout is `<root>/.git/config`; a LINKED WORKTREE's
+		* `<root>/.git` is a pointer FILE whose `gitdir:` names
+		* `.git/worktrees/<name>`, and the local config git uses there is the
+		* SHARED one at the main gitdir named by that dir's `commondir` file.
+		* Every unreadable/malformed step degrades to the plain
+		* `<root>/.git/config` path rather than failing — the same
+		* never-fails posture as `resolveModuleDir`.
+		*/
+		const resolveLocalConfigPath = (root) => Effect.gen(function* () {
+			const dotGit = path.join(root, ".git");
+			const fallback = path.join(dotGit, "config");
+			const info = yield* fs.stat(dotGit).pipe(Effect.option);
+			if (Option.isNone(info) || info.value.type === "Directory") return fallback;
+			const content = yield* fs.readFileString(dotGit).pipe(Effect.option);
+			if (Option.isNone(content)) return fallback;
+			const match = /^gitdir:\s*(.+)$/m.exec(content.value);
+			if (!match?.[1]) return fallback;
+			const pointer = match[1].trim();
+			const gitdir = path.isAbsolute(pointer) ? pointer : path.resolve(root, pointer);
+			const commondir = yield* fs.readFileString(path.join(gitdir, "commondir")).pipe(Effect.option);
+			if (Option.isSome(commondir)) {
+				const common = commondir.value.trim();
+				return path.join(path.isAbsolute(common) ? common : path.resolve(gitdir, common), "config");
+			}
+			return path.join(gitdir, "config");
+		});
+		const deregister = (root, section) => Effect.gen(function* () {
+			if (!section.startsWith(`${".repos"}/`) || section === `${".repos"}/`) return yield* Effect.fail(new ReposConfigError({
+				path: MANIFEST_PATH,
+				reason: `"${section}" is not a ${REPOS_DIR}/ registration — deregister only clears stale vendored-repo sections; clear an unrelated submodule registration with git directly`,
+				kind: "invalid"
+			}));
+			const manifest = yield* configStore.read(root).pipe(Effect.catchTag("ReposConfigError", (error) => error.kind === "missing" ? Effect.succeed({ repos: {} }) : Effect.fail(error)));
+			for (const name of Object.keys(manifest.repos)) if (section === `${".repos"}/${name}`) return yield* Effect.fail(new ReposConfigError({
+				path: MANIFEST_PATH,
+				reason: `"${section}" is the canonical registration of manifest entry "${name}" — deregister clears STALE registrations only; use remove to unvendor, or sync to reconcile`,
+				kind: "invalid"
+			}));
+			const localConfigPath = yield* resolveLocalConfigPath(root);
+			const configEntries = yield* git.configList(root, { file: localConfigPath }).pipe(Effect.mapError(asSubmoduleError(`git config -f ${localConfigPath} --list`, root)));
+			const registeredNames = new Set(configEntries.map((configEntry) => submoduleNameFromKey(configEntry.key)).filter((registeredName) => registeredName !== void 0));
+			const removedKeys = configEntries.map((configEntry) => configEntry.key).filter((key) => submoduleNameFromKey(key) === section);
+			if (removedKeys.length === 0) return yield* Effect.fail(new ReposConfigError({
+				path: localConfigPath,
+				reason: `no submodule.${section} section registered in the local git config — nothing to deregister`,
+				kind: "invalid"
+			}));
+			const modulesRoot = path.join(root, ".git", "modules");
+			for (const name of Object.keys(manifest.repos)) {
+				const moduleDir = yield* resolveModuleDir(fs, path, root, name);
+				if (path.relative(modulesRoot, moduleDir) === section && !registeredNames.has(`${".repos"}/${name}`)) return yield* Effect.fail(new ReposConfigError({
+					path: MANIFEST_PATH,
+					reason: `"${section}" is the registration backing manifest entry "${name}" (its module gitdir lives there under a diverged name, and no canonical submodule.${REPOS_DIR}/${name} registration exists) — deregister clears STALE registrations only; re-vendor the entry instead (remove, then add with the orientation the remove result hands back)`,
+					kind: "invalid"
+				}));
+			}
+			yield* git.configRemoveSection(root, `submodule.${section}`).pipe(Effect.mapError(asSubmoduleError(`git config --remove-section submodule.${section}`, root)));
+			return {
+				section,
+				removedKeys
+			};
+		});
 		return {
 			status,
 			sync,
@@ -655,7 +722,8 @@ var ReposManager = class extends Context.Service()("@savvy-web/silk-effects/Repo
 			note,
 			remove,
 			rename,
-			restore
+			restore,
+			deregister
 		};
 	}));
 };