@savvy-web/mcp 2.2.1 → 2.3.0

package/README.md

@@ -49,8 +49,8 @@ npx @modelcontextprotocol/inspector savvy-mcp .
 - `changeset_deps_detect` — read-only preview of the cumulative dependency diff (merge-base to working tree): one entry per affected workspace package with its resolved dependency-table rows, `catalog:`/`workspace:` specifiers resolved to concrete versions. It never writes a changeset. Backed by `silk-effects`' `Changesets.DepsRegen.plan`.
 - `changeset_deps_regen` — regenerates pure-dependency changesets: deletes stale ones and writes fresh single-package, patch-bump changesets from the cumulative dependency diff. Mutating unless `dryRun` is set, in which case it reports what it would delete and write without touching the filesystem. Backed by `silk-effects`' `Changesets.DepsRegen`.
 - `biome_check` — run Biome over a path and get structured diagnostics back: `mode=check` (lint, format and organize-imports) or `mode=lint`. Unlike most of the other tools it can mutate — pass `write` for safe fixes or `unsafe` for unsafe ones (both git-reversible) — so it returns the same diagnostics the Biome LSP surfaces for files you have edited.
-- `repos_inspect` — read-only inspection of vendored repositories: `mode=status` reports per-repo presence, the gitlink commit, working-tree dirtiness, and stale note ids; `mode=config` surfaces the validated `.repos/config.json` manifest and its entries; `mode=drift` reconciles the manifest, `.gitmodules`, the worktree, and `git submodule status`, reporting any mismatch as a typed drift kind; `mode=gitmodules` lists the parsed `.gitmodules` entries. Returns markdown-escaped output since vendored-repo content is untrusted input. Backed by the same `silk-effects` `Repos` services the `savvy` CLI uses.
-- `repos_manage` — manages vendored repositories (mutating counterpart to repos_inspect): `action=sync` initializes any missing submodules (`git submodule update --init --depth 1`), applies sparse-checkout from the manifest, and clears stale git locks; `action=pin` fetches and checks out the new ref, staging the updated gitlink and manifest; `action=add` adds a new repo entry; `action=note` appends a short note to a repo; `action=remove` unvendors an entry; `action=rename` renames one in place; `action=restore` hard-resets one or more dirty checkouts back to their pinned commit. Pin, add, remove and rename stage git changes for the caller to commit; restore only resets the submodule's own working tree to its already-staged or already-committed gitlink commit, so there is nothing new to stage. `sync`, `pin`, `add`, `remove`, `rename` and `restore` unlock the vendored tree for the duration of their git work and leave it read-only again afterwards (files `0444`, directories `0555` — an executable file locks at `0555` instead, unlocking back to `0755` rather than losing its executable bit), so an agent that hits `EACCES` writing into `.repos/` should route the change through this tool rather than `chmod`. Backed by the same `silk-effects` `Repos` services the `savvy` CLI uses.
+- `repos_inspect` — read-only inspection of vendored repositories: `mode=status` reports per-repo presence, the gitlink as a staged/committed/checked-out triple, working-tree dirtiness, and stale note ids; `mode=config` surfaces the validated `.repos/config.json` manifest and its entries; `mode=drift` reconciles the manifest, `.gitmodules`, the worktree, `git submodule status` and the repo's local git config, reporting any mismatch as a typed drift kind; `mode=gitmodules` lists the parsed `.gitmodules` entries. Returns markdown-escaped output since vendored-repo content is untrusted input. Backed by the same `silk-effects` `Repos` services the `savvy` CLI uses.
+- `repos_manage` — manages vendored repositories (mutating counterpart to repos_inspect): `action=sync` initializes any missing submodules (`git submodule update --init --depth 1`), applies sparse-checkout from the manifest, and clears stale git locks; `action=pin` fetches and checks out the new ref, staging the updated gitlink and manifest; `action=add` adds a new repo entry, optionally with the `orientation` block a preceding `remove` reported, so a re-vendor keeps it; `action=note` appends a short note to a repo; `action=remove` unvendors an entry and echoes back the entry it removed; `action=rename` renames one in place; `action=restore` hard-resets one or more dirty checkouts back to their pinned commit, and names any that stayed dirty afterwards instead of reporting the reset as a success. Pin, add, remove and rename stage git changes for the caller to commit; restore only resets the submodule's own working tree to its already-staged or already-committed gitlink commit, so there is nothing new to stage. `sync`, `pin`, `add`, `remove`, `rename` and `restore` unlock the vendored worktree for the duration of their git work and leave it read-only again afterwards (files `0444`, directories `0555` — an executable file locks at `0555` instead, unlocking back to `0755` rather than losing its executable bit), so an agent that hits `EACCES` writing into `.repos/` should route the change through this tool rather than `chmod`. The submodule gitdir stays writable and `sync`/`add` mark the boundary in local git config, so ordinary git commands skip these trees rather than failing against them. Backed by the same `silk-effects` `Repos` services the `savvy` CLI uses.
 
 ## License
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/mcp",
-	"version": "2.2.1",
+	"version": "2.3.0",
 	"private": false,
 	"description": "The savvy MCP server — Silk Suite tooling and library knowledge for coding agents",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/mcp",
@@ -34,9 +34,9 @@
 		"@effect/platform-node": "4.0.0-beta.107",
 		"@effected/commands": "^0.4.0",
 		"@effected/git": "^0.7.0",
-		"@effected/workspaces": "^0.11.0",
+		"@effected/workspaces": "^0.11.1",
 		"@modelcontextprotocol/sdk": "^1.29.0",
-		"@savvy-web/silk-effects": "5.5.1",
+		"@savvy-web/silk-effects": "5.6.0",
 		"effect": "4.0.0-beta.107",
 		"zod": "^4.4.3"
 	}

package/server.js

@@ -170,7 +170,7 @@ function buildServer(ctx) {
 	});
 	server.registerTool("repos_manage", {
 		title: "Manage vendored repos",
-		description: "Mutating: sync (initialize/reconcile submodules per the manifest), pin (re-pin a repo to a new ref), add (vendor a new repo), note (add/remove/promote an agent note), remove (unvendor a repo), rename (rename a vendored repo's manifest key and worktree), or restore (hard-reset a repo's worktree back to its pinned gitlink commit and re-apply sparse paths — DESTRUCTIVE to uncommitted worktree edits; never run implicitly). Pass action plus the fields that action needs: pin needs name+ref; add needs url+ref+purpose (name/sparse optional); note needs name+op, plus note (op=add), id (op=remove), or id+into (op=promote); remove needs name; rename needs name (the old name) + newName; restore takes an optional names list — omitted, it restores every dirty repo and reports the clean ones as skipped; given, it restores exactly those repos even if already clean. A decode failure names the missing field. The pin result's markdown surfaces commitMessage and staleNoteIds — review and commit after pinning. The remove result's markdown surfaces commitMessage and removedNotes — promote any durable notes elsewhere, then review and commit. The rename result's markdown surfaces commitMessage — review and commit after renaming. The restore result's markdown names exactly what was discarded.",
+		description: "Mutating: sync (initialize/reconcile submodules per the manifest), pin (re-pin a repo to a new ref), add (vendor a new repo), note (add/remove/promote an agent note), remove (unvendor a repo), rename (rename a vendored repo's manifest key and worktree), or restore (hard-reset a repo's worktree back to its pinned gitlink commit and re-apply sparse paths — DESTRUCTIVE to uncommitted worktree edits; never run implicitly). Pass action plus the fields that action needs: pin needs name+ref; add needs url+ref+purpose (name/sparse/orientation optional — pass orientation back from a preceding remove's removedEntry to make a re-vendor lossless); note needs name+op, plus note (op=add), id (op=remove), or id+into (op=promote); remove needs name; rename needs name (the old name) + newName; restore takes an optional names list — omitted, it restores every dirty repo and reports the clean ones as skipped; given, it restores exactly those repos even if already clean. A decode failure names the missing field. The pin result's markdown surfaces commitMessage and staleNoteIds — review and commit after pinning. The remove result's markdown surfaces commitMessage, removedNotes and the removed entry's orientation block — promote any durable notes elsewhere, keep the orientation if you intend to re-vendor, then review and commit. The rename result's markdown surfaces commitMessage — review and commit after renaming. The restore result's markdown names exactly what was discarded.",
 		inputSchema: {
 			action: z.enum([
 				"sync",
@@ -187,6 +187,11 @@ function buildServer(ctx) {
 			url: z.optional(z.string()).describe("Repo URL to vendor (add)."),
 			purpose: z.optional(z.string()).describe("One-line purpose for the manifest (add)."),
 			sparse: z.optional(z.array(z.string())).describe("Sparse-checkout patterns (add)."),
+			orientation: z.optional(z.object({
+				layout: z.optional(z.string()),
+				keyPaths: z.optional(z.record(z.string(), z.string())),
+				startHere: z.optional(z.string())
+			})).describe("Orientation block to write (add). Pass back what a preceding remove reported as removedEntry.orientation — add does NOT restore it on its own, so a re-vendor loses it otherwise."),
 			op: z.optional(z.enum([
 				"add",
 				"remove",

package/tools/repos-manage.js

@@ -11,13 +11,18 @@ const PinRequest = Schema.TaggedStruct("pin", {
 	name: Schema.String,
 	ref: Schema.String
 });
-/** `add` requires `url`/`ref`/`purpose`; `name` and `sparse` are optional. */
+/**
+* `add` requires `url`/`ref`/`purpose`; `name`, `sparse` and `orientation`
+* are optional. `orientation` is what makes a re-vendor lossless — pass back
+* the block a preceding `remove` reported.
+*/
 const AddRequest = Schema.TaggedStruct("add", {
 	url: Schema.String,
 	ref: Schema.String,
 	purpose: Schema.String,
 	name: Schema.optional(Schema.String),
-	sparse: Schema.optional(Schema.Array(Schema.String))
+	sparse: Schema.optional(Schema.Array(Schema.String)),
+	orientation: Schema.optional(Repos.RepoOrientation)
 });
 /**
 * `note` requires `name` and `op`; the fields required beyond that depend on
@@ -127,7 +132,9 @@ const renderMarkdown = (data) => {
 				``,
 				...section("URL synced", r.urlSynced),
 				``,
-				...section("Registered", r.registered)
+				...section("Registered", r.registered),
+				``,
+				...section("Boundary marked", r.boundaryMarked)
 			].join("\n");
 		}
 		case "pin": {
@@ -186,6 +193,7 @@ const renderMarkdown = (data) => {
 			];
 			if (r.removedNotes.length > 0) lines.push(`Promote any durable ones elsewhere before committing:`, ...r.removedNotes.map((note) => `- ${mdInline(note.id)} (${mdInline(note.ref)}): ${mdInline(note.note)}`));
 			else lines.push("(none)");
+			if (r.removedEntry.orientation) lines.push(``, `## Removed orientation`, ``, `\`add\` does NOT restore this. If you are re-vendoring ${mdInline(r.name)}, pass it back as the \`orientation\` argument:`, ``, "```json", JSON.stringify(r.removedEntry.orientation, null, 2), "```");
 			lines.push(``, `REVIEW AND COMMIT: the manifest, .gitmodules, and gitlink removal are already staged — review and commit using the message above.`);
 			return lines.join("\n");
 		}
@@ -216,6 +224,7 @@ const renderMarkdown = (data) => {
 			lines.push(``, `## Skipped (clean)`, ``);
 			if (r.skippedClean.length > 0) lines.push(...r.skippedClean.map((name) => `- ${mdInline(name)}`));
 			else lines.push("(none)");
+			if (r.stillDirty.length > 0) lines.push(``, `## Still dirty — RESTORE DID NOT FULLY SUCCEED`, ``, `The reset ran but these worktrees remain dirty, so treat the restore as incomplete rather than done:`, ``, ...r.stillDirty.map((name) => `- ${mdInline(name)}`), ``, `Run repos_inspect (mode: drift) — a nestedSubmoduleDivergence or a permission problem is the usual cause.`);
 			return lines.join("\n");
 		}
 	}
@@ -254,7 +263,8 @@ const reposManage = (args, fallbackCwd) => Effect.gen(function* () {
 				ref: request.ref,
 				purpose: request.purpose,
 				...request.name !== void 0 ? { name: request.name } : {},
-				...request.sparse !== void 0 ? { sparse: request.sparse } : {}
+				...request.sparse !== void 0 ? { sparse: request.sparse } : {},
+				...request.orientation !== void 0 ? { orientation: request.orientation } : {}
 			})
 		};
 		case "note": {