@savvy-web/silk-effects 5.4.0 → 5.5.1

package/README.md

@@ -13,7 +13,7 @@ Shared [Effect](https://effect.website/) library providing Silk Suite convention
 - Supply the Silk commitlint config, its prompt and formatter, and the `silk/body-no-markdown` rule
 - Run the lint-staged handlers and the `savvy lint fmt` formatters from a single implementation so the hook and the CLI cannot drift
 - Inspect a Turborepo read-only — diagnose per-package cache hits, derive the task graph and compute affected packages, all over `turbo --dry`
-- Manage the vendored reference repos declared in `.repos/config.json` — submodule status, sync, pinning and notes — and keep every vendored tree read-only between mutations
+- Manage the vendored reference repos declared in `.repos/config.json` — submodule status, drift detection, sync, add, pin, note, remove, rename and restore — and keep every vendored tree read-only between mutations
 - Locate config files and keep Biome schema URLs in sync across workspaces
 
 ## Install
@@ -364,13 +364,13 @@ const diagnosis = await Effect.runPromise(
 // => CacheDiagnosis: per-package HIT/MISS breakdown for the task
 ```
 
-#### ReposManager and ReposLockdown
+#### ReposManager, ReposDrift and ReposLockdown
 
-The `Repos` namespace drives vendored reference repos — upstream sources checked out as git submodules under `.repos/`, declared in a `.repos/config.json` manifest. `ReposConfigStore` reads and writes that manifest, and `ReposManager` does the git work: `status(root)` reports presence, the pinned commit, working-tree dirtiness and stale notes, `sync(root)` initializes missing submodules and applies each entry's sparse-checkout, `pin(root, name, ref)` moves an entry to a new ref, `add(root, options)` vendors a new one, and `note(root, name, op)` adds, removes or promotes an agent note.
+The `Repos` namespace drives vendored reference repos — upstream sources checked out as git submodules under `.repos/`, declared in a `.repos/config.json` manifest. `ReposConfigStore` reads and writes that manifest, and `ReposManager` does the git work: `status(root)` reports presence, the pinned commit, working-tree dirtiness and stale notes, `sync(root)` initializes missing submodules and applies each entry's sparse-checkout, `pin(root, name, ref)` moves an entry to a new ref, `add(root, options)` vendors a new one, `note(root, name, op)` adds, removes or promotes an agent note, `remove(root, name)` unvendors an entry, `rename(root, oldName, newName)` renames one in place, and `restore(root, names?)` hard-resets one or more dirty checkouts back to their pinned commit. `ReposDrift.check(root)` is a read-only companion — it reconciles the manifest, `.gitmodules`, the worktree, and `git submodule status`, reporting any mismatch as a typed drift kind.
 
-`ReposLockdown` is the permissions boundary around all of that. `lock(root, name)` chmods a vendored worktree and its submodule git metadata to files `0444` and directories `0555`; `unlock` reverses it; `withUnlocked(root, name, effect)` brackets an effect between the two. `ReposManager`'s `sync`, `add` and `pin` run their git mutations inside that bracket and re-lock afterwards, so a vendored tree is read-only whenever the manager is not mid-write. Reads are unaffected — a locked tree needs no special handling to open a file.
+`ReposLockdown` is the permissions boundary around all of that. `lock(root, name)` chmods a vendored worktree and its submodule git metadata to files `0444` and directories `0555` (an executable file locks at `0555` instead, preserving its executable bit); `unlock` reverses it, restoring `0644`/`0755` (`0755` for a file that was executable); `withUnlocked(root, name, effect)` brackets an effect between the two. `ReposManager`'s `sync`, `add`, `pin`, `remove` and `restore` run their git mutations inside that bracket and re-lock afterwards, and `rename` hand-rolls the same unlock/relock contract across its `oldName`→`newName` move, so a vendored tree is read-only whenever the manager is not mid-write. Reads are unaffected — a locked tree needs no special handling to open a file.
 
-Two consequences for callers: `ReposManager.layer` now requires `ReposLockdown` alongside `ReposConfigStore`, `Git`, `FileSystem` and `Path`, and `sync`, `add` and `pin` widen their error channel with `ReposLockdownError`, which carries the offending `path` and a `reason`.
+Two consequences for callers: `ReposManager.layer` requires `ReposLockdown` alongside `ReposConfigStore`, `Git`, `FileSystem` and `Path`, and `sync`, `add`, `pin`, `remove`, `rename` and `restore` widen their error channel with `ReposLockdownError`, which carries the offending `path` and a `reason`.
 
 ```typescript
 import { Effect, Layer } from "effect";

package/changesets/changelog/formatting.js

@@ -95,10 +95,12 @@ function formatChangelogEntry(entry, options) {
 */
 function formatPRAndUserAttribution(pr, user, links) {
 	let prReference = "";
-	if (pr) if (links?.pull) {
-		const pullUrl = extractUrlFromMarkdown(links.pull);
-		prReference = ` [#${String(pr)}](${pullUrl})`;
-	} else prReference = ` (#${String(pr)})`;
+	if (pr) {
+		if (links?.pull) {
+			const pullUrl = extractUrlFromMarkdown(links.pull);
+			prReference = ` [#${String(pr)}](${pullUrl})`;
+		} else prReference = ` (#${String(pr)})`;
+	}
 	if (user) {
 		if (links?.user) {
 			const userUrl = extractUrlFromMarkdown(links.user);

package/commitlint/hook/diagnostics/signing.js

@@ -69,18 +69,20 @@ function readSigningDiagnostic() {
 		const isSsh = gpgFormat === "ssh";
 		let keyResolves = false;
 		let keyExpiry = null;
-		if (signingKey) if (isSsh) keyResolves = yield* Effect.tryPromise(async () => {
-			await stat(signingKey);
-			return true;
-		}).pipe(Effect.orElseSucceed(() => false));
-		else {
-			const stdout = yield* spawner.string(ChildProcess.make("gpg", [
-				"--list-secret-keys",
-				"--with-colons",
-				signingKey
-			])).pipe(Effect.orElseSucceed(() => ""));
-			keyResolves = stdout.trim().length > 0;
-			keyExpiry = parseGpgKeyExpiry(stdout);
+		if (signingKey) {
+			if (isSsh) keyResolves = yield* Effect.tryPromise(async () => {
+				await stat(signingKey);
+				return true;
+			}).pipe(Effect.orElseSucceed(() => false));
+			else {
+				const stdout = yield* spawner.string(ChildProcess.make("gpg", [
+					"--list-secret-keys",
+					"--with-colons",
+					signingKey
+				])).pipe(Effect.orElseSucceed(() => ""));
+				keyResolves = stdout.trim().length > 0;
+				keyExpiry = parseGpgKeyExpiry(stdout);
+			}
 		}
 		let agentResponsive = true;
 		if (!isSsh) agentResponsive = yield* spawner.exitCode(ChildProcess.make("gpg-connect-agent", ["/bye"])).pipe(Effect.timeout("1 second"), Effect.map((code) => code === 0), Effect.orElseSucceed(() => false));

package/index.d.ts

@@ -8296,6 +8296,46 @@ declare class ReposLockdownError extends ReposLockdownErrorBase<{
   get message(): string;
 }
 //#endregion
+//#region src/repos/schemas/drift.d.ts
+/**
+ * The kinds of drift {@link ReposDrift} can detect between the four
+ * authorities it reconciles: the manifest, `.gitmodules`, the worktree, and
+ * `git submodule status`.
+ * @public
+ */
+declare const DriftKind: Schema.Literals<readonly ["urlMismatch", "pathMismatch", "unregisteredManifestEntry", "orphanGitmodulesEntry", "missingWorktree", "checkoutDiverged", "missingShallow", "gitmodulesUnparsable"]>;
+/** @public */
+type DriftKind = typeof DriftKind.Type;
+declare const RepoDrift_base: Schema.Class<RepoDrift, Schema.Struct<{
+  readonly name: Schema.String;
+  readonly kind: Schema.Literals<readonly ["urlMismatch", "pathMismatch", "unregisteredManifestEntry", "orphanGitmodulesEntry", "missingWorktree", "checkoutDiverged", "missingShallow", "gitmodulesUnparsable"]>;
+  readonly detail: Schema.String;
+  readonly manifestValue: Schema.optionalKey<Schema.String>;
+  readonly observedValue: Schema.optionalKey<Schema.String>;
+}>, {}>;
+/**
+ * One detected disagreement between two (or more) of the four authorities
+ * for a single vendored repo.
+ *
+ * @remarks
+ * `manifestValue`/`observedValue` carry the two disagreeing values when the
+ * drift is a value mismatch (`urlMismatch`, `pathMismatch`); other kinds
+ * populate whichever side has a value to show (or neither, for
+ * `gitmodulesUnparsable`, which is not about one repo).
+ * @public
+ */
+declare class RepoDrift extends RepoDrift_base {}
+declare const ReposDriftReport_base: Schema.Class<ReposDriftReport, Schema.Struct<{
+  readonly drifts: Schema.$Array<typeof RepoDrift>;
+  readonly clean: Schema.Boolean;
+}>, {}>;
+/**
+ * The result of reconciling the manifest, `.gitmodules`, the worktree, and
+ * `git submodule status` for every vendored repo.
+ * @public
+ */
+declare class ReposDriftReport extends ReposDriftReport_base {}
+//#endregion
 //#region src/repos/schemas/manifest.d.ts
 /**
  * A vendored-repo manifest key: non-empty, contains no `/` or `\`, and is
@@ -8382,6 +8422,21 @@ type ReposManifestFile = typeof ReposManifestFile.Type;
 /**
  * Status of one vendored repo: gitlink presence and dirtiness, plus notes
  * that no longer match the pinned ref.
+ *
+ * @remarks
+ * `commit` is an alias of `stagedCommit`, retained for one release so an
+ * existing consumer reading `entry.commit` keeps working while it migrates to
+ * the index-aware triple. It carries no independent release tag beyond
+ * `@public` (this schema has no narrower audience to gate it behind).
+ * Removal is scheduled by a tracked issue, not gated on a renderer migration
+ * precondition here.
+ *
+ * Not fully behavior-preserving: `commit: stagedCommit ?? null` reads `null`
+ * for a gitlink committed at `HEAD` but staged for REMOVAL, where the prior
+ * single-`commit` field showed the committed oid. `stagedCommit` is `None`
+ * in exactly that case (nothing is staged), so the alias reports "nothing
+ * staged" rather than "here is what HEAD still has" — a real, if narrow,
+ * difference from the pre-triple `commit` field's behavior.
  * @public
  */
 declare const RepoStatusEntry: Schema.Struct<{
@@ -8389,7 +8444,14 @@ declare const RepoStatusEntry: Schema.Struct<{
   readonly ref: Schema.String;
   readonly purpose: Schema.String;
   readonly present: Schema.Boolean;
+  /** @deprecated alias of `stagedCommit`; retained for one release. */
   readonly commit: Schema.NullOr<Schema.String>;
+  /** The gitlink oid staged in the index (`git ls-files --stage`) — sees a pin BEFORE it is committed. */
+  readonly stagedCommit: Schema.optionalKey<Schema.String>;
+  /** The gitlink oid committed at `HEAD` (`git ls-tree HEAD`). */
+  readonly committedCommit: Schema.optionalKey<Schema.String>;
+  /** The commit actually checked out in the submodule worktree (`git rev-parse HEAD` inside it); absent when there is no checkout. */
+  readonly checkedOutCommit: Schema.optionalKey<Schema.String>;
   readonly dirty: Schema.Boolean;
   readonly staleNoteIds: Schema.$Array<Schema.String>;
 }>;
@@ -8405,7 +8467,14 @@ declare const ReposStatusReport: Schema.Struct<{
     readonly ref: Schema.String;
     readonly purpose: Schema.String;
     readonly present: Schema.Boolean;
+    /** @deprecated alias of `stagedCommit`; retained for one release. */
     readonly commit: Schema.NullOr<Schema.String>;
+    /** The gitlink oid staged in the index (`git ls-files --stage`) — sees a pin BEFORE it is committed. */
+    readonly stagedCommit: Schema.optionalKey<Schema.String>;
+    /** The gitlink oid committed at `HEAD` (`git ls-tree HEAD`). */
+    readonly committedCommit: Schema.optionalKey<Schema.String>;
+    /** The commit actually checked out in the submodule worktree (`git rev-parse HEAD` inside it); absent when there is no checkout. */
+    readonly checkedOutCommit: Schema.optionalKey<Schema.String>;
     readonly dirty: Schema.Boolean;
     readonly staleNoteIds: Schema.$Array<Schema.String>;
   }>>;
@@ -8416,7 +8485,8 @@ type ReposStatusReport = typeof ReposStatusReport.Type;
 /**
  * Result of reconciling working-tree submodules with the manifest: missing
  * repos initialized, sparse-checkout patterns re-applied, already-present
- * repos left alone, and stale locks cleared.
+ * repos left alone, stale locks cleared, drifted submodule URLs reconciled,
+ * and orphan manifest entries (no gitlink at all) registered.
  * @public
  */
 declare const ReposSyncReport: Schema.Struct<{
@@ -8424,6 +8494,8 @@ declare const ReposSyncReport: Schema.Struct<{
   readonly sparseApplied: Schema.$Array<Schema.String>;
   readonly upToDate: Schema.$Array<Schema.String>;
   readonly clearedLocks: Schema.$Array<Schema.String>;
+  readonly urlSynced: Schema.$Array<Schema.String>;
+  readonly registered: Schema.$Array<Schema.String>;
 }>;
 /** @public */
 type ReposSyncReport = typeof ReposSyncReport.Type;
@@ -8452,6 +8524,62 @@ declare const ReposAddResult: Schema.Struct<{
 }>;
 /** @public */
 type ReposAddResult = typeof ReposAddResult.Type;
+/**
+ * Result of removing a vendored repo from the manifest: the gitlink, module
+ * gitdir, and `.gitmodules` section are all gone, and the entry's notes are
+ * surfaced so any durable ones can be promoted elsewhere before this result
+ * is committed.
+ * @public
+ */
+declare const ReposRemoveResult: Schema.Struct<{
+  readonly name: Schema.String;
+  readonly path: Schema.String;
+  readonly commitMessage: Schema.String;
+  readonly removedNotes: Schema.$Array<Schema.Struct<{
+    readonly id: Schema.String;
+    readonly date: Schema.String;
+    readonly ref: Schema.String;
+    readonly note: Schema.String;
+  }>>;
+}>;
+/** @public */
+type ReposRemoveResult = typeof ReposRemoveResult.Type;
+/**
+ * Result of renaming a vendored repo's manifest key: the `.repos/<name>`
+ * worktree moved, the module gitdir's `core.worktree` values re-pointed, the
+ * `.gitmodules` section canonicalized to the new name, and the manifest key
+ * renamed.
+ * @public
+ */
+declare const ReposRenameResult: Schema.Struct<{
+  readonly oldName: Schema.String;
+  readonly newName: Schema.String;
+  readonly path: Schema.String;
+  readonly commitMessage: Schema.String;
+}>;
+/** @public */
+type ReposRenameResult = typeof ReposRenameResult.Type;
+/**
+ * Result of hard-resetting one or more vendored repos to their staged (or
+ * committed) gitlink commit and re-applying sparse-checkout paths.
+ *
+ * @remarks
+ * `restored` lists every repo actually reset, paired with the commit it was
+ * reset to. `skippedClean` is populated ONLY by the names-omitted form of
+ * {@link ReposManagerShape.restore} — repos left untouched because `status`
+ * reported them clean; an explicit-names call never skips anything (an
+ * explicit ask is always honored), so it always reports an empty array.
+ * @public
+ */
+declare const ReposRestoreResult: Schema.Struct<{
+  readonly restored: Schema.$Array<Schema.Struct<{
+    readonly name: Schema.String;
+    readonly commit: Schema.String;
+  }>>;
+  readonly skippedClean: Schema.$Array<Schema.String>;
+}>;
+/** @public */
+type ReposRestoreResult = typeof ReposRestoreResult.Type;
 /**
  * Result of an agent-note mutation against a vendored repo.
  * @public
@@ -8474,6 +8602,14 @@ interface ReposConfigStoreShape {
   readonly exists: (root: string) => Effect.Effect<boolean>;
   readonly read: (root: string) => Effect.Effect<ReposManifestFile, ReposConfigError>;
   readonly write: (root: string, manifest: ReposManifestFile) => Effect.Effect<void, ReposConfigError>;
+  /**
+   * Serialized read-modify-write: acquires an exclusive-create lock file
+   * beside the manifest, reads the current manifest (an absent manifest is
+   * passed to `fn` as `{ repos: {} }` — `update` can initialize), runs `fn`,
+   * writes the result, and always releases the lock. Concurrent callers
+   * queue behind the lock rather than racing a lost update.
+   */
+  readonly update: (root: string, fn: (manifest: ReposManifestFile) => ReposManifestFile | Effect.Effect<ReposManifestFile, ReposConfigError>) => Effect.Effect<ReposManifestFile, ReposConfigError>;
 }
 declare const ReposConfigStore_base: Context.ServiceClass<ReposConfigStore, "@savvy-web/silk-effects/ReposConfigStore", ReposConfigStoreShape>;
 /**
@@ -8488,6 +8624,31 @@ declare class ReposConfigStore extends ReposConfigStore_base {
   static readonly layer: Layer.Layer<ReposConfigStore, never, FileSystem.FileSystem | Path.Path>;
 }
 //#endregion
+//#region src/repos/services/drift.d.ts
+/**
+ * The {@link ReposDrift} service shape.
+ * @public
+ */
+interface ReposDriftShape {
+  readonly check: (root: string) => Effect.Effect<ReposDriftReport, ReposConfigError | GitSubmoduleError>;
+}
+declare const ReposDrift_base: Context.ServiceClass<ReposDrift, "@savvy-web/silk-effects/ReposDrift", ReposDriftShape>;
+/**
+ * Reconciles the four authorities a vendored repo's state is spread across —
+ * the manifest, `.gitmodules`, the worktree, and `git submodule status` —
+ * and reports every disagreement found. Read-only: no staging, no lockdown
+ * interaction, so it runs unmodified against a locked (`ReposLockdown`)
+ * tree.
+ * @public
+ */
+declare class ReposDrift extends ReposDrift_base {
+  /**
+   * Production implementation of {@link ReposDrift}.
+   * @public
+   */
+  static readonly layer: Layer.Layer<ReposDrift, never, ReposConfigStore | Git | FileSystem.FileSystem | Path.Path>;
+}
+//#endregion
 //#region src/repos/services/lockdown.d.ts
 /**
  * The {@link ReposLockdown} service shape.
@@ -8578,13 +8739,36 @@ interface ReposManagerShape {
     readonly id: string;
     readonly into: "layout" | "startHere";
   }) => Effect.Effect<ReposNoteResult, ReposConfigError | RepoNotFoundError | NoteNotFoundError>;
+  readonly remove: (root: string, name: string) => Effect.Effect<ReposRemoveResult, ReposConfigError | GitSubmoduleError | RepoNotFoundError | ReposLockdownError>;
+  /**
+   * Crash contract: unlike {@link add}, `rename` has no compensating
+   * rollback. `Effect.uninterruptibleMask` guards fiber interruption, not a
+   * hard process kill, so a `kill -9` between `git mv` and the manifest
+   * write can leave the tree renamed in git, the manifest still holding
+   * the old key, and the tree unlocked (the relock finalizer never runs).
+   * This is a deliberate asymmetry with `add`, which DOES roll back —
+   * `rename` does not, because unlike a fresh vendor there is no "nothing
+   * happened yet" state to unwind back to.
+   *
+   * Recovery is NOT a guaranteed clean "just run it again": `git mv` is not
+   * idempotent (a real-git probe confirms a second `git mv <old> <new>`
+   * after the first already succeeded fails with "bad source"), so a crash
+   * after `git mv` lands makes the next `rename` call fail at that same
+   * step rather than resume past it. A crash in that window needs manual
+   * inspection (`git status`, `.repos/config.json`, `.gitmodules`) before
+   * retrying, not a blind re-invocation.
+   */
+  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>;
 }
 declare const ReposManager_base: Context.ServiceClass<ReposManager, "@savvy-web/silk-effects/ReposManager", ReposManagerShape>;
 /**
  * Drives the vendored `.repos/` submodules over git: reports status
  * (presence, dirtiness, stale notes), reconciles the working tree with the
  * manifest, vendors new entries (`add`), re-pins existing entries to a new
- * ref (`pin`), and adds, removes, or promotes agent notes (`note`).
+ * ref (`pin`), adds/removes/promotes agent notes (`note`), unvendors
+ * (`remove`), renames (`rename`), and explicitly hard-resets dirty
+ * checkouts back to their pinned commit (`restore`).
  * @public
  */
 declare class ReposManager extends ReposManager_base {
@@ -8602,7 +8786,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$3 {
-  export { GitSubmoduleError, GitSubmoduleErrorBase, MANIFEST_PATH, NOTE_LIMIT, NoteNotFoundError, NoteNotFoundErrorBase, REPOS_DIR, RepoEntry, RepoName, RepoNotFoundError, RepoNotFoundErrorBase, RepoNote, RepoOrientation, RepoStatusEntry, ReposAddResult, ReposConfigError, ReposConfigErrorBase, ReposConfigStore, ReposConfigStoreShape, ReposLockdown, ReposLockdownError, ReposLockdownErrorBase, ReposLockdownShape, ReposManager, ReposManagerShape, ReposManifestFile, ReposNoteResult, ReposPinResult, 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, ReposDrift, ReposDriftReport, ReposDriftShape, ReposLockdown, ReposLockdownError, ReposLockdownErrorBase, ReposLockdownShape, ReposManager, ReposManagerShape, ReposManifestFile, ReposNoteResult, ReposPinResult, ReposRemoveResult, ReposRenameResult, ReposRestoreResult, ReposStatusReport, ReposSyncReport, STALE_LOCK_MAX_AGE_MS, resolveModuleDir };
 }
 //#endregion
 //#region src/schemas/BiomeConfig.d.ts

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/silk-effects",
-	"version": "5.4.0",
+	"version": "5.5.1",
 	"private": false,
 	"description": "Shared Effect library for Silk Suite conventions",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/silk-effects",
@@ -33,15 +33,15 @@
 		"@changesets/config": "^4.0.0-next.6",
 		"@changesets/get-github-info": "^1.0.0-next.4",
 		"@changesets/get-release-plan": "^5.0.0-next.9",
-		"@effected/commands": "^0.3.1",
-		"@effected/git": "^0.5.2",
-		"@effected/glob": "^0.2.2",
-		"@effected/jsonc": "^0.5.2",
-		"@effected/package-json": "^0.7.3",
-		"@effected/templates": "^0.1.1",
-		"@effected/walker": "^0.3.4",
-		"@effected/workspaces": "^0.10.0",
-		"@effected/yaml": "^0.6.1",
+		"@effected/commands": "^0.4.0",
+		"@effected/git": "^0.7.0",
+		"@effected/glob": "^0.3.0",
+		"@effected/jsonc": "^0.6.0",
+		"@effected/package-json": "^0.8.0",
+		"@effected/templates": "^0.2.0",
+		"@effected/walker": "^0.4.0",
+		"@effected/workspaces": "^0.11.0",
+		"@effected/yaml": "^0.7.0",
 		"@manypkg/get-packages": "^3.1.0",
 		"mdast-util-heading-range": "^4.0.0",
 		"mdast-util-to-string": "^4.0.0",
@@ -56,6 +56,6 @@
 		"yaml-lint": "^1.7.0"
 	},
 	"peerDependencies": {
-		"effect": "4.0.0-beta.101"
+		"effect": "4.0.0-beta.107"
 	}
 }

package/repos/index.js

@@ -1,14 +1,17 @@
 import { __exportAll } from "../_virtual/_rolldown/runtime.js";
 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, ReposStatusReport, ReposSyncReport } from "./schemas/reports.js";
+import { RepoStatusEntry, ReposAddResult, ReposNoteResult, ReposPinResult, ReposRemoveResult, ReposRenameResult, ReposRestoreResult, ReposStatusReport, ReposSyncReport } from "./schemas/reports.js";
 import { ReposConfigStore } from "./services/config-store.js";
+import { ReposDrift } from "./services/drift.js";
 import { ReposLockdown, resolveModuleDir } from "./services/lockdown.js";
 import { ReposManager, STALE_LOCK_MAX_AGE_MS } from "./services/manager.js";
 
 //#region src/repos/index.ts
 var repos_exports = /* @__PURE__ */ __exportAll({
+	DriftKind: () => DriftKind,
 	GitSubmoduleError: () => GitSubmoduleError,
 	GitSubmoduleErrorBase: () => GitSubmoduleErrorBase,
 	MANIFEST_PATH: () => MANIFEST_PATH,
@@ -16,6 +19,7 @@ var repos_exports = /* @__PURE__ */ __exportAll({
 	NoteNotFoundError: () => NoteNotFoundError,
 	NoteNotFoundErrorBase: () => NoteNotFoundErrorBase,
 	REPOS_DIR: () => REPOS_DIR,
+	RepoDrift: () => RepoDrift,
 	RepoEntry: () => RepoEntry,
 	RepoName: () => RepoName,
 	RepoNotFoundError: () => RepoNotFoundError,
@@ -27,6 +31,8 @@ var repos_exports = /* @__PURE__ */ __exportAll({
 	ReposConfigError: () => ReposConfigError,
 	ReposConfigErrorBase: () => ReposConfigErrorBase,
 	ReposConfigStore: () => ReposConfigStore,
+	ReposDrift: () => ReposDrift,
+	ReposDriftReport: () => ReposDriftReport,
 	ReposLockdown: () => ReposLockdown,
 	ReposLockdownError: () => ReposLockdownError,
 	ReposLockdownErrorBase: () => ReposLockdownErrorBase,
@@ -34,6 +40,9 @@ var repos_exports = /* @__PURE__ */ __exportAll({
 	ReposManifestFile: () => ReposManifestFile,
 	ReposNoteResult: () => ReposNoteResult,
 	ReposPinResult: () => ReposPinResult,
+	ReposRemoveResult: () => ReposRemoveResult,
+	ReposRenameResult: () => ReposRenameResult,
+	ReposRestoreResult: () => ReposRestoreResult,
 	ReposStatusReport: () => ReposStatusReport,
 	ReposSyncReport: () => ReposSyncReport,
 	STALE_LOCK_MAX_AGE_MS: () => STALE_LOCK_MAX_AGE_MS,
@@ -41,4 +50,4 @@ var repos_exports = /* @__PURE__ */ __exportAll({
 });
 
 //#endregion
-export { GitSubmoduleError, GitSubmoduleErrorBase, MANIFEST_PATH, NoteNotFoundError, NoteNotFoundErrorBase, REPOS_DIR, RepoEntry, RepoName, RepoNotFoundError, RepoNotFoundErrorBase, RepoNote, RepoOrientation, RepoStatusEntry, ReposAddResult, ReposConfigError, ReposConfigErrorBase, ReposConfigStore, ReposLockdown, ReposLockdownError, ReposLockdownErrorBase, ReposManager, ReposManifestFile, ReposNoteResult, ReposPinResult, 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, ReposDrift, ReposDriftReport, ReposLockdown, ReposLockdownError, ReposLockdownErrorBase, ReposManager, ReposManifestFile, ReposNoteResult, ReposPinResult, ReposRemoveResult, ReposRenameResult, ReposRestoreResult, ReposStatusReport, ReposSyncReport, STALE_LOCK_MAX_AGE_MS, repos_exports, resolveModuleDir };

package/repos/schemas/drift.js

@@ -0,0 +1,49 @@
+import { Schema } from "effect";
+
+//#region src/repos/schemas/drift.ts
+/**
+* The kinds of drift {@link ReposDrift} can detect between the four
+* authorities it reconciles: the manifest, `.gitmodules`, the worktree, and
+* `git submodule status`.
+* @public
+*/
+const DriftKind = Schema.Literals([
+	"urlMismatch",
+	"pathMismatch",
+	"unregisteredManifestEntry",
+	"orphanGitmodulesEntry",
+	"missingWorktree",
+	"checkoutDiverged",
+	"missingShallow",
+	"gitmodulesUnparsable"
+]);
+/**
+* One detected disagreement between two (or more) of the four authorities
+* for a single vendored repo.
+*
+* @remarks
+* `manifestValue`/`observedValue` carry the two disagreeing values when the
+* drift is a value mismatch (`urlMismatch`, `pathMismatch`); other kinds
+* populate whichever side has a value to show (or neither, for
+* `gitmodulesUnparsable`, which is not about one repo).
+* @public
+*/
+var RepoDrift = class extends Schema.Class("RepoDrift")({
+	name: Schema.String,
+	kind: DriftKind,
+	detail: Schema.String,
+	manifestValue: Schema.optionalKey(Schema.String),
+	observedValue: Schema.optionalKey(Schema.String)
+}) {};
+/**
+* The result of reconciling the manifest, `.gitmodules`, the worktree, and
+* `git submodule status` for every vendored repo.
+* @public
+*/
+var ReposDriftReport = class extends Schema.Class("ReposDriftReport")({
+	drifts: Schema.Array(RepoDrift),
+	clean: Schema.Boolean
+}) {};
+
+//#endregion
+export { DriftKind, RepoDrift, ReposDriftReport };

package/repos/schemas/reports.js

@@ -1,9 +1,25 @@
+import { RepoNote } from "./manifest.js";
 import { Schema } from "effect";
 
 //#region src/repos/schemas/reports.ts
 /**
 * Status of one vendored repo: gitlink presence and dirtiness, plus notes
 * that no longer match the pinned ref.
+*
+* @remarks
+* `commit` is an alias of `stagedCommit`, retained for one release so an
+* existing consumer reading `entry.commit` keeps working while it migrates to
+* the index-aware triple. It carries no independent release tag beyond
+* `@public` (this schema has no narrower audience to gate it behind).
+* Removal is scheduled by a tracked issue, not gated on a renderer migration
+* precondition here.
+*
+* Not fully behavior-preserving: `commit: stagedCommit ?? null` reads `null`
+* for a gitlink committed at `HEAD` but staged for REMOVAL, where the prior
+* single-`commit` field showed the committed oid. `stagedCommit` is `None`
+* in exactly that case (nothing is staged), so the alias reports "nothing
+* staged" rather than "here is what HEAD still has" — a real, if narrow,
+* difference from the pre-triple `commit` field's behavior.
 * @public
 */
 const RepoStatusEntry = Schema.Struct({
@@ -11,7 +27,14 @@ const RepoStatusEntry = Schema.Struct({
 	ref: Schema.String,
 	purpose: Schema.String,
 	present: Schema.Boolean,
+	/** @deprecated alias of `stagedCommit`; retained for one release. */
 	commit: Schema.NullOr(Schema.String),
+	/** The gitlink oid staged in the index (`git ls-files --stage`) — sees a pin BEFORE it is committed. */
+	stagedCommit: Schema.optionalKey(Schema.String),
+	/** The gitlink oid committed at `HEAD` (`git ls-tree HEAD`). */
+	committedCommit: Schema.optionalKey(Schema.String),
+	/** The commit actually checked out in the submodule worktree (`git rev-parse HEAD` inside it); absent when there is no checkout. */
+	checkedOutCommit: Schema.optionalKey(Schema.String),
 	dirty: Schema.Boolean,
 	staleNoteIds: Schema.Array(Schema.String)
 });
@@ -26,14 +49,17 @@ const ReposStatusReport = Schema.Struct({
 /**
 * Result of reconciling working-tree submodules with the manifest: missing
 * repos initialized, sparse-checkout patterns re-applied, already-present
-* repos left alone, and stale locks cleared.
+* repos left alone, stale locks cleared, drifted submodule URLs reconciled,
+* and orphan manifest entries (no gitlink at all) registered.
 * @public
 */
 const ReposSyncReport = Schema.Struct({
 	initialized: Schema.Array(Schema.String),
 	sparseApplied: Schema.Array(Schema.String),
 	upToDate: Schema.Array(Schema.String),
-	clearedLocks: Schema.Array(Schema.String)
+	clearedLocks: Schema.Array(Schema.String),
+	urlSynced: Schema.Array(Schema.String),
+	registered: Schema.Array(Schema.String)
 });
 /**
 * Result of re-pinning a vendored repo to a new ref.
@@ -57,6 +83,51 @@ const ReposAddResult = Schema.Struct({
 	path: Schema.String
 });
 /**
+* Result of removing a vendored repo from the manifest: the gitlink, module
+* gitdir, and `.gitmodules` section are all gone, and the entry's notes are
+* surfaced so any durable ones can be promoted elsewhere before this result
+* is committed.
+* @public
+*/
+const ReposRemoveResult = Schema.Struct({
+	name: Schema.String,
+	path: Schema.String,
+	commitMessage: Schema.String,
+	removedNotes: Schema.Array(RepoNote)
+});
+/**
+* Result of renaming a vendored repo's manifest key: the `.repos/<name>`
+* worktree moved, the module gitdir's `core.worktree` values re-pointed, the
+* `.gitmodules` section canonicalized to the new name, and the manifest key
+* renamed.
+* @public
+*/
+const ReposRenameResult = Schema.Struct({
+	oldName: Schema.String,
+	newName: Schema.String,
+	path: Schema.String,
+	commitMessage: Schema.String
+});
+/**
+* Result of hard-resetting one or more vendored repos to their staged (or
+* committed) gitlink commit and re-applying sparse-checkout paths.
+*
+* @remarks
+* `restored` lists every repo actually reset, paired with the commit it was
+* reset to. `skippedClean` is populated ONLY by the names-omitted form of
+* {@link ReposManagerShape.restore} — repos left untouched because `status`
+* reported them clean; an explicit-names call never skips anything (an
+* explicit ask is always honored), so it always reports an empty array.
+* @public
+*/
+const ReposRestoreResult = Schema.Struct({
+	restored: Schema.Array(Schema.Struct({
+		name: Schema.String,
+		commit: Schema.String
+	})),
+	skippedClean: Schema.Array(Schema.String)
+});
+/**
 * Result of an agent-note mutation against a vendored repo.
 * @public
 */
@@ -72,4 +143,4 @@ const ReposNoteResult = Schema.Struct({
 });
 
 //#endregion
-export { RepoStatusEntry, ReposAddResult, ReposNoteResult, ReposPinResult, ReposStatusReport, ReposSyncReport };
+export { RepoStatusEntry, ReposAddResult, ReposNoteResult, ReposPinResult, ReposRemoveResult, ReposRenameResult, ReposRestoreResult, ReposStatusReport, ReposSyncReport };