@savvy-web/cli 2.4.2 → 2.5.1

package/README.md

@@ -59,7 +59,9 @@ npx savvy clean --globs dist,.turbo,coverage
 
 ## Vendored repos are read-only
 
-`savvy repos sync`, `add`, `pin`, `remove`, `rename` and `restore` leave every vendored tree under `.repos/` read-only at the OS level — files `0444`, directories `0555` (an executable file locks at `0555` instead, and unlocks back to `0755` rather than losing its executable bit). Reading a vendored source needs no extra step; writing to one fails with `EACCES` by design, because those trees mirror an upstream repo at a pinned ref and any local edit is lost on the next sync. A dirty tree from a hand bypass recovers with `savvy repos restore <name...>` (or with no names, every dirty tree) rather than a manual `git reset`. Restore is destructive by design: it hard-resets each tree it touches to the pinned commit, so uncommitted edits and untracked files in that tree are gone.
+`savvy repos sync`, `add`, `pin`, `remove`, `rename` and `restore` leave every vendored worktree under `.repos/` read-only at the OS level — files `0444`, directories `0555` (an executable file locks at `0555` instead, and unlocks back to `0755` rather than losing its executable bit). Reading a vendored source needs no extra step; writing to one fails with `EACCES` by design, because those trees mirror an upstream repo at a pinned ref and any local edit is lost on the next sync. A dirty tree from a hand bypass recovers with `savvy repos restore <name...>` (or with no names, every dirty tree) rather than a manual `git reset`. Restore is destructive by design: it hard-resets each tree it touches to the pinned commit, so uncommitted edits and untracked files in that tree are gone. When a reset runs but the worktree is still dirty afterwards, restore says so per repo and exits `1`, so a script cannot read an incomplete restore as a clean one.
+
+The lock stops at the worktree. Each submodule's git metadata under `.git/modules/` stays writable, so a plain `git pull` and any GUI client that keeps its own per-gitdir state work normally in a repo that vendors sources this way. `sync` and `add` also declare the boundary to git rather than leaving clients to discover it by failing: they write `submodule.<path>.update = none` per entry and `fetch.recurseSubmodules = false` into the repo's local config, so ordinary git commands skip these trees. A `git checkout` inside a vendored worktree is therefore detected rather than blocked — `savvy repos status --drift` reports it and `savvy repos restore` repairs it.
 
 ```bash
 npx savvy repos sync

package/cli/index.js

@@ -76,7 +76,7 @@ const rootCommand = Command.make("savvy").pipe(Command.withSubcommands([
 * CLI application: reads argv from the Stdio service provided by NodeServices.
 * (v4's `Command.run` takes only `version` — the name comes from the root command.)
 */
-const cli = Command.run(rootCommand, { version: "2.4.2" });
+const cli = Command.run(rootCommand, { version: "2.5.1" });
 /**
 * Shared workspace services from `@effected/workspaces`, wired as a
 * self-contained unit and built ONCE (layers memoize by reference).

package/commands/lint/fmt.js

@@ -1,6 +1,6 @@
 import { Lint } from "@savvy-web/silk-effects";
-import { Effect } from "effect";
-import { Argument, Command } from "effect/unstable/cli";
+import { Effect, Option } from "effect";
+import { Argument, Command, Flag } from "effect/unstable/cli";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { Yaml } from "@effected/yaml";
 
@@ -17,6 +17,15 @@ import { Yaml } from "@effected/yaml";
 */
 /** Repeated file path arguments. */
 const filesArg = Argument.file("files", { mustExist: true }).pipe(Argument.variadic());
+/**
+* Formatting options forwarded from `Lint.Yaml.fmtCommand`.
+*
+* @remarks
+* This subcommand runs in its own process, so options set on the lint-staged
+* handler only reach the formatter across this flag. Omitting it would make
+* `fmtCommand({ format })` and `create({ format })` write different bytes.
+*/
+const yamlFormatOption = Flag.string("format").pipe(Flag.withDescription("JSON-encoded @effected/yaml formatting options"), Flag.optional);
 /** Sort package.json files with sort-package-json. */
 const packageJsonCommand = Command.make("package-json", { files: filesArg }, ({ files }) => Effect.sync(() => {
 	for (const filepath of files) {
@@ -35,9 +44,13 @@ const pnpmWorkspaceCommand = Command.make("pnpm-workspace", {}, () => Effect.gen
 	const formatted = yield* Effect.promise(() => Lint.PnpmWorkspace.formatContent(sorted));
 	writeFileSync(filepath, formatted, "utf-8");
 }));
-/** Format YAML files with Prettier. */
-const yamlCommand = Command.make("yaml", { files: filesArg }, ({ files }) => Effect.gen(function* () {
-	for (const filepath of files) yield* Effect.promise(() => Lint.Yaml.formatFile(filepath));
+/** Format YAML files with @effected/yaml. */
+const yamlCommand = Command.make("yaml", {
+	files: filesArg,
+	format: yamlFormatOption
+}, ({ files, format }) => Effect.sync(() => {
+	const options = Option.isSome(format) ? Lint.Yaml.parseFormatOptions(format.value) : void 0;
+	for (const filepath of files) Lint.Yaml.formatFile(filepath, options);
 }));
 /** Parent fmt command with formatting subcommands. */
 const _fmtCommand = Command.make("fmt").pipe(Command.withSubcommands([

package/commands/repos/commands/remove.js

@@ -47,6 +47,10 @@ const runReposRemove = (cwd, name) => Effect.gen(function* () {
 	yield* Effect.log(result.commitMessage);
 	yield* Effect.log("staged — review and commit");
 	for (const note of result.removedNotes) yield* Effect.log(`warning: note ${note.id} (${note.ref}) was removed with the entry — promote first if durable`);
+	if (result.removedEntry.orientation) {
+		yield* Effect.log(`warning: the orientation block for ${result.name} was removed with the entry and add will NOT restore it — re-vendoring? capture it now:`);
+		yield* Effect.log(JSON.stringify(result.removedEntry.orientation, null, 2));
+	}
 }).pipe(Effect.catchTag("ReposConfigError", (error) => {
 	if (error.kind === "missing") return Effect.log("no .repos/config.json — nothing vendored");
 	process.exitCode = 1;

package/commands/repos/commands/restore.js

@@ -52,6 +52,8 @@ const runReposRestore = (cwd, names) => Effect.gen(function* () {
 	const result = yield* (yield* Repos.ReposManager).restore(cwd, names.length > 0 ? names : void 0);
 	for (const entry of result.restored) yield* Effect.log(`${entry.name}: restored to ${entry.commit}`);
 	for (const name of result.skippedClean) yield* Effect.log(`${name}: clean — skipped`);
+	for (const name of result.stillDirty) yield* Effect.log(`${name}: WARNING — reset ran but the worktree is STILL dirty; run \`savvy repos status --drift\``);
+	if (result.stillDirty.length > 0) process.exitCode = 1;
 	if (result.restored.length === 0 && result.skippedClean.length === 0) yield* Effect.log("nothing to restore");
 }).pipe(Effect.catchTag("ReposConfigError", (error) => {
 	if (error.kind === "missing") return Effect.log("no .repos/config.json — nothing vendored");

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/cli",
-	"version": "2.4.2",
+	"version": "2.5.1",
 	"private": false,
 	"description": "The savvy CLI — unified commit, changeset, and lint commands for the Silk Suite",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/cli",
@@ -36,9 +36,9 @@
 		"@effected/git": "^0.7.0",
 		"@effected/jsonc": "^0.6.0",
 		"@effected/templates": "^0.2.0",
-		"@effected/workspaces": "^0.11.1",
-		"@effected/yaml": "^0.7.0",
-		"@savvy-web/silk-effects": "5.5.2",
+		"@effected/workspaces": "^0.11.2",
+		"@effected/yaml": "^0.8.0",
+		"@savvy-web/silk-effects": "5.7.0",
 		"effect": "4.0.0-beta.107"
 	}
 }