@savvy-web/cli 1.6.0 → 2.0.0

package/commands/changeset/index.js

@@ -7,7 +7,7 @@ import { transformCommand } from "./commands/transform.js";
 import { validateFileCommand } from "./commands/validate-file.js";
 import { versionCommand } from "./commands/version.js";
 import { runChangesetInit } from "./commands/init.js";
-import { Command } from "@effect/cli";
+import { Command } from "effect/unstable/cli";
 
 //#region src/commands/changeset/index.ts
 /* v8 ignore start -- CLI registration; each command tested via exported handler */
@@ -26,9 +26,12 @@ const _changesetCommand = Command.make("changeset").pipe(Command.withSubcommands
 * The `savvy changeset` command group for use in Task B7 root assembly.
 *
 * @remarks
-* Typed as `unknown` at the export boundary to avoid TypeScript declaration-emit
-* errors from Effect's internal types. Task B7 should import and use this via
-* `Command.withSubcommands([changesetCommand as never])` or re-infer the type.
+* Annotated with the exact five-parameter `Command.Command` instantiation
+* (verified against the inferred type): the bare inferred type additionally
+* prints the structural `subcommands` tree, whose inline command types
+* reference effect's non-exported `Inspectable` module (TS4023). The
+* annotation preserves the exact Error/Requirements channels, so the root
+* layer graph stays compiler-validated.
 */
 const changesetCommand = _changesetCommand;
 

package/commands/check.js

@@ -2,8 +2,8 @@ import { runChangesetCheck } from "./changeset/commands/check.js";
 import "./changeset/index.js";
 import { runCommitCheck } from "./commit/check.js";
 import { runLintCheck } from "./lint/check.js";
-import { Command, Options } from "@effect/cli";
-import { Effect } from "effect";
+import { Effect, Result } from "effect";
+import { Command, Flag } from "effect/unstable/cli";
 
 //#region src/commands/check.ts
 /**
@@ -25,8 +25,8 @@ import { Effect } from "effect";
 * @internal
 */
 /* v8 ignore start -- CLI option definitions; orchestration logic tested via runCheck */
-const changesetDirOption = Options.text("changeset-dir").pipe(Options.withDescription("Path to the changeset directory"), Options.withDefault(".changeset"));
-const quietOption = Options.boolean("quiet").pipe(Options.withAlias("q"), Options.withDescription("Only output warnings from lint check"), Options.withDefault(false));
+const changesetDirOption = Flag.string("changeset-dir").pipe(Flag.withDescription("Path to the changeset directory"), Flag.withDefault(".changeset"));
+const quietOption = Flag.boolean("quiet").pipe(Flag.withAlias("q"), Flag.withDescription("Only output warnings from lint check"), Flag.withDefault(false));
 /* v8 ignore stop */
 /**
 * Run all three check step Effects without short-circuiting.
@@ -41,14 +41,14 @@ const quietOption = Options.boolean("quiet").pipe(Options.withAlias("q"), Option
 *   union of all failing steps' errors.
 */
 function runCheck(steps) {
-	return Effect.all([
-		steps.changeset,
-		steps.commit,
-		steps.lint
-	], {
-		concurrency: 1,
-		mode: "validate"
-	}).pipe(Effect.asVoid);
+	return Effect.gen(function* () {
+		const results = yield* Effect.all([
+			Effect.result(steps.changeset),
+			Effect.result(steps.commit),
+			Effect.result(steps.lint)
+		], { concurrency: 1 });
+		for (const result of results) if (Result.isFailure(result)) return yield* Effect.fail(result.failure);
+	});
 }
 /* v8 ignore start -- CLI registration; orchestration logic tested via runCheck */
 const _checkCommand = Command.make("check", {

package/commands/clean.js

@@ -1,6 +1,6 @@
-import { Command, Options } from "@effect/cli";
+import { WorkspaceDiscovery } from "@effected/workspaces";
 import { Data, Effect } from "effect";
-import { WorkspaceDiscovery } from "workspaces-effect";
+import { Command, Flag } from "effect/unstable/cli";
 import { join, sep } from "node:path";
 import { glob, realpath, rm } from "node:fs/promises";
 
@@ -113,12 +113,12 @@ function parseGlobs(raw) {
 function runClean(opts) {
 	const patterns = parseGlobs(opts.globs);
 	return Effect.gen(function* () {
-		const packages = yield* (yield* WorkspaceDiscovery).listPackages(process.cwd()).pipe(Effect.mapError((e) => new CleanError({
+		const packages = yield* (yield* WorkspaceDiscovery).listPackages().pipe(Effect.mapError((e) => new CleanError({
 			step: "discover workspaces",
 			reason: e.message
 		})));
-		const leaves = packages.filter((p) => !p.isRootWorkspace);
-		const roots = packages.filter((p) => p.isRootWorkspace);
+		const leaves = packages.filter((p) => !(p.relativePath === "."));
+		const roots = packages.filter((p) => p.relativePath === ".");
 		const ordered = [...leaves, ...roots];
 		const planned = yield* Effect.forEach(ordered, (pkg) => collectTargets(pkg.path, patterns).pipe(Effect.map((targets) => ({
 			pkg,
@@ -135,8 +135,8 @@ function runClean(opts) {
 				})
 			};
 		});
-		const leafGroups = groups.filter((g) => !g.pkg.isRootWorkspace);
-		const rootGroups = groups.filter((g) => g.pkg.isRootWorkspace);
+		const leafGroups = groups.filter((g) => !(g.pkg.relativePath === "."));
+		const rootGroups = groups.filter((g) => g.pkg.relativePath === ".");
 		const verb = opts.dryRun ? "would remove" : "removed";
 		let total = 0;
 		const failures = [];
@@ -165,8 +165,8 @@ function runClean(opts) {
 	});
 }
 /* v8 ignore start -- CLI option/registration; orchestration tested via runClean */
-const globsOption = Options.text("globs").pipe(Options.withAlias("g"), Options.withDescription(`Comma-separated glob patterns to remove from each workspace root (default: ${DEFAULT_GLOBS.join(",")})`), Options.withDefault(DEFAULT_GLOBS.join(",")));
-const dryRunOption = Options.boolean("dry-run").pipe(Options.withAlias("n"), Options.withDescription("Report what would be removed without deleting anything"), Options.withDefault(false));
+const globsOption = Flag.string("globs").pipe(Flag.withAlias("g"), Flag.withDescription(`Comma-separated glob patterns to remove from each workspace root (default: ${DEFAULT_GLOBS.join(",")})`), Flag.withDefault(DEFAULT_GLOBS.join(",")));
+const dryRunOption = Flag.boolean("dry-run").pipe(Flag.withAlias("n"), Flag.withDescription("Report what would be removed without deleting anything"), Flag.withDefault(false));
 const _cleanCommand = Command.make("clean", {
 	globs: globsOption,
 	dryRun: dryRunOption

package/commands/commit/check.js

@@ -1,9 +1,8 @@
 import { HUSKY_HOOK_PATH, POST_CHECKOUT_HOOK_PATH, POST_COMMIT_HOOK_PATH, POST_MERGE_HOOK_PATH } from "./constants.js";
 import { SECTION_DEF, savvyCommitBlock } from "./init.js";
+import { WorkspaceDiscovery } from "@effected/workspaces";
 import { CheckResult, Commitlint, ManagedSection, SavvyBaseSection, SavvyHooksSection, VersioningStrategy, savvyBasePreamble, savvyHooksHygiene } from "@savvy-web/silk-effects";
-import { Effect } from "effect";
-import { WorkspaceDiscovery } from "workspaces-effect";
-import { FileSystem } from "@effect/platform";
+import { Effect, FileSystem } from "effect";
 
 //#region src/commands/commit/check.ts
 /**
@@ -78,8 +77,8 @@ function extractConfigPathFromManaged(managedContent) {
 const detectReleaseFormat = Effect.gen(function* () {
 	const versioning = yield* VersioningStrategy;
 	const discovery = yield* WorkspaceDiscovery;
-	const publishableNames = (yield* Effect.catchAll(discovery.listPackages(), () => Effect.succeed([]))).filter((pkg) => !pkg.private || pkg.publishConfig?.access !== void 0).map((pkg) => pkg.name);
-	const result = yield* Effect.catchAll(versioning.detect(publishableNames, process.cwd()), () => Effect.succeed({ type: "single" }));
+	const publishableNames = (yield* Effect.catch(discovery.listPackages(), () => Effect.succeed([]))).filter((pkg) => !pkg.private || pkg.publishConfig?.access !== void 0).map((pkg) => pkg.name);
+	const result = yield* Effect.catch(versioning.detect(publishableNames, process.cwd()), () => Effect.succeed({ type: "single" }));
 	return STRATEGY_TO_FORMAT[result.type] ?? "semver";
 });
 /**
@@ -159,7 +158,7 @@ function runCommitCheck() {
 		yield* Effect.log(`  DCO required: ${Commitlint.detectDCO()}`);
 		const releaseFormat = yield* detectReleaseFormat;
 		yield* Effect.log(`  Release format: ${releaseFormat}`);
-		const scopes = yield* Effect.catchAll(Commitlint.detectScopes, () => Effect.succeed([]));
+		const scopes = yield* Effect.catch(Commitlint.detectScopes, () => Effect.succeed([]));
 		const scopeDisplay = scopes.length > 0 ? scopes.join(", ") : "(none - not a monorepo or no packages found)";
 		yield* Effect.log(`  Detected scopes: ${scopeDisplay}`);
 		yield* Effect.log("");

package/commands/commit/hook.js

@@ -1,7 +1,7 @@
 import { postCommitVerifyCommand } from "./hooks/post-commit-verify.js";
 import { preCommitMessageCommand } from "./hooks/pre-commit-message.js";
 import { sessionStartCommand } from "./hooks/session-start.js";
-import { Command } from "@effect/cli";
+import { Command } from "effect/unstable/cli";
 
 //#region src/commands/commit/hook.ts
 /**

package/commands/commit/hooks/post-commit-verify.js

@@ -1,8 +1,9 @@
-import { Command } from "@effect/cli";
+import { Git } from "@effected/git";
 import { Commitlint } from "@savvy-web/silk-effects";
 import { Effect } from "effect";
-import { execFile } from "node:child_process";
+import { Command } from "effect/unstable/cli";
 import { promisify } from "node:util";
+import { execFile } from "node:child_process";
 
 //#region src/commands/commit/hooks/post-commit-verify.ts
 /**
@@ -57,54 +58,33 @@ function buildCommitlintInvocation(pm, configPath) {
 		};
 	}
 }
-async function getRepoRoot() {
-	try {
-		const { stdout } = await execFileP("git", ["rev-parse", "--show-toplevel"]);
-		return stdout.trim();
-	} catch {
-		return process.cwd();
-	}
-}
-async function runCommitlintLast() {
-	const root = await getRepoRoot();
-	const { command, args } = buildCommitlintInvocation(await Commitlint.detectPackageManager(root), await Commitlint.readCommitlintConfigPath(root));
-	try {
-		await execFileP(command, args, { cwd: root });
-		return false;
-	} catch {
-		return true;
-	}
-}
-async function readSignatureStatus() {
-	try {
-		const { stdout } = await execFileP("git", [
-			"log",
-			"-1",
-			"--format=%G?"
-		]);
-		return stdout.trim();
-	} catch {
-		return "N";
-	}
-}
-async function readLastCommitBody() {
-	try {
-		const { stdout } = await execFileP("git", [
-			"log",
-			"-1",
-			"--format=%B"
-		]);
-		return stdout;
-	} catch {
-		return "";
-	}
+/** The repo root via `@effected/git`, degrading to `process.cwd()` — the prior execFile contract. */
+const getRepoRoot = Effect.gen(function* () {
+	return yield* (yield* Git).repoRoot(process.cwd()).pipe(Effect.catch(() => Effect.succeed(process.cwd())));
+});
+function runCommitlintLast(root) {
+	return (async () => {
+		const { command, args } = buildCommitlintInvocation(await Commitlint.detectPackageManager(root), await Commitlint.readCommitlintConfigPath(root));
+		try {
+			await execFileP(command, args, { cwd: root });
+			return false;
+		} catch {
+			return true;
+		}
+	})();
 }
 const postCommitVerifyCommand = Command.make("post-commit-verify", {}, () => Effect.gen(function* () {
+	const git = yield* Git;
 	const branch = yield* Commitlint.readBranchInfo();
 	const signing = yield* Commitlint.readSigningDiagnostic();
-	const commitlintFailed = yield* Effect.promise(runCommitlintLast);
-	const sigStatus = yield* Effect.promise(readSignatureStatus);
-	const body = yield* Effect.promise(readLastCommitBody);
+	const root = yield* getRepoRoot;
+	const commitlintFailed = yield* Effect.promise(() => runCommitlintLast(root));
+	const lastCommit = yield* git.commitInfo(root).pipe(Effect.catch(() => Effect.succeed({
+		signatureStatus: "N",
+		message: ""
+	})));
+	const sigStatus = lastCommit.signatureStatus;
+	const body = lastCommit.message;
 	const bodyHasClosing = branch.inferredTicketId !== null && Commitlint.hasClosingTrailer(body, branch.inferredTicketId);
 	const advice = buildPostCommitAdvice({
 		commitlintFailed,

package/commands/commit/hooks/pre-commit-message.js

@@ -1,6 +1,6 @@
-import { Command } from "@effect/cli";
 import { Commitlint } from "@savvy-web/silk-effects";
 import { Effect, Schema } from "effect";
+import { Command } from "effect/unstable/cli";
 import { resolve } from "node:path";
 
 //#region src/commands/commit/hooks/pre-commit-message.ts

package/commands/commit/hooks/session-start.js

@@ -1,6 +1,6 @@
-import { Command } from "@effect/cli";
 import { Commitlint } from "@savvy-web/silk-effects";
 import { Effect } from "effect";
+import { Command } from "effect/unstable/cli";
 import { resolve } from "node:path";
 
 //#region src/commands/commit/hooks/session-start.ts

package/commands/commit/index.js

@@ -1,7 +1,7 @@
 import { runCommitInit } from "./init.js";
 import { runCommitCheck } from "./check.js";
 import { hookCommand } from "./hook.js";
-import { Command } from "@effect/cli";
+import { Command } from "effect/unstable/cli";
 
 //#region src/commands/commit/index.ts
 /* v8 ignore start -- CLI registration; each command tested via exported handler */

package/commands/commit/init.js

@@ -1,8 +1,7 @@
 import { HUSKY_HOOK_PATH, POST_CHECKOUT_HOOK_PATH, POST_COMMIT_HOOK_PATH, POST_MERGE_HOOK_PATH } from "./constants.js";
 import { ManagedSection, SavvyBaseSection, SavvyHooksSection, SectionDefinition, savvyBasePreamble, savvyHooksHygiene, savvyToolSection } from "@savvy-web/silk-effects";
-import { Effect } from "effect";
+import { Effect, FileSystem } from "effect";
 import { dirname } from "node:path";
-import { FileSystem } from "@effect/platform";
 import { chmod } from "node:fs/promises";
 
 //#region src/commands/commit/init.ts

package/commands/init.js

@@ -2,8 +2,8 @@ import { runChangesetInit } from "./changeset/commands/init.js";
 import "./changeset/index.js";
 import { runCommitInit } from "./commit/init.js";
 import { runLintInit } from "./lint/init.js";
-import { Command, Options } from "@effect/cli";
 import { Effect } from "effect";
+import { Command, Flag } from "effect/unstable/cli";
 
 //#region src/commands/init.ts
 /**
@@ -24,14 +24,14 @@ import { Effect } from "effect";
 const DEFAULT_COMMIT_CONFIG = "lib/configs/commitlint.config.ts";
 const DEFAULT_LINT_CONFIG = "lib/configs/lint-staged.config.ts";
 /* v8 ignore start -- CLI option definitions; orchestration logic tested via runInit */
-const forceOption = Options.boolean("force").pipe(Options.withAlias("f"), Options.withDescription("Overwrite existing config files and hooks across all tools"), Options.withDefault(false));
-const commitConfigOption = Options.text("commit-config").pipe(Options.withDescription("Relative path for the commitlint config file"), Options.withDefault(DEFAULT_COMMIT_CONFIG));
-const lintConfigOption = Options.text("lint-config").pipe(Options.withDescription("Relative path for the lint-staged config file"), Options.withDefault(DEFAULT_LINT_CONFIG));
-const lintPresetOption = Options.choice("lint-preset", [
+const forceOption = Flag.boolean("force").pipe(Flag.withAlias("f"), Flag.withDescription("Overwrite existing config files and hooks across all tools"), Flag.withDefault(false));
+const commitConfigOption = Flag.string("commit-config").pipe(Flag.withDescription("Relative path for the commitlint config file"), Flag.withDefault(DEFAULT_COMMIT_CONFIG));
+const lintConfigOption = Flag.string("lint-config").pipe(Flag.withDescription("Relative path for the lint-staged config file"), Flag.withDefault(DEFAULT_LINT_CONFIG));
+const lintPresetOption = Flag.choice("lint-preset", [
 	"minimal",
 	"standard",
 	"silk"
-]).pipe(Options.withDescription("lint-staged preset: minimal, standard, or silk"), Options.withDefault("silk"));
+]).pipe(Flag.withDescription("lint-staged preset: minimal, standard, or silk"), Flag.withDefault("silk"));
 /* v8 ignore stop */
 /**
 * Run the three init step Effects in order: changeset → commit → lint.

package/commands/lint/check.js

@@ -1,8 +1,7 @@
 import { BIOME_VERSION } from "./biome-version.js";
 import { CheckResult, ConfigDiscovery, Lint, ManagedSection, SavvyBaseSection, SavvyHooksSection, ToolDefinition, ToolDiscovery, savvyBasePreamble, savvyHooksHygiene } from "@savvy-web/silk-effects";
-import { Effect } from "effect";
-import { parse } from "jsonc-effect";
-import { FileSystem } from "@effect/platform";
+import { Effect, FileSystem } from "effect";
+import { Jsonc } from "@effected/jsonc";
 import { isDeepStrictEqual } from "node:util";
 
 //#region src/commands/lint/check.ts
@@ -83,7 +82,7 @@ function extractConfigPathFromManaged(managedContent) {
 */
 function checkMarkdownlintConfig(content) {
 	return Effect.gen(function* () {
-		const parsed = yield* parse(content);
+		const parsed = yield* Jsonc.parse(content);
 		const schemaMatches = parsed.$schema === Lint.MARKDOWNLINT_SCHEMA;
 		const existingConfig = parsed.config;
 		const configMatches = existingConfig !== void 0 && isDeepStrictEqual(existingConfig, Lint.MARKDOWNLINT_CONFIG);
@@ -111,16 +110,19 @@ function checkBiomeSchemas() {
 		const warnings = [];
 		const expectedSchema = `https://biomejs.dev/schemas/${BIOME_VERSION}/schema.json`;
 		const configPaths = Lint.Biome.findAllConfigs();
-		for (const configPath of configPaths) if ((yield* parse(yield* fs.readFileString(configPath))).$schema === expectedSchema) statuses.push({
-			path: configPath,
-			matches: true
-		});
-		else {
-			statuses.push({
+		for (const configPath of configPaths) {
+			const content = yield* fs.readFileString(configPath);
+			if ((yield* Jsonc.parse(content)).$schema === expectedSchema) statuses.push({
 				path: configPath,
-				matches: false
+				matches: true
 			});
-			warnings.push(`${WARNING}  ${configPath}: biome $schema is outdated.\n   Run 'savvy init' to update it.`);
+			else {
+				statuses.push({
+					path: configPath,
+					matches: false
+				});
+				warnings.push(`${WARNING}  ${configPath}: biome $schema is outdated.\n   Run 'savvy init' to update it.`);
+			}
 		}
 		return {
 			statuses,
@@ -214,7 +216,7 @@ function runLintCheck(opts) {
 				warnings.push(`${WARNING}  ${hookPath} savvy-hooks section is outdated.\n   Run 'savvy init' to update.`);
 			}
 		}
-		const biomeSchemaStatus = yield* checkBiomeSchemas().pipe(Effect.catchAll(() => Effect.succeed({
+		const biomeSchemaStatus = yield* checkBiomeSchemas().pipe(Effect.catch(() => Effect.succeed({
 			statuses: [],
 			warnings: [`${WARNING}  Could not check biome $schema URLs.`]
 		})));

package/commands/lint/fmt.js

@@ -1,8 +1,8 @@
-import { Args, Command } from "@effect/cli";
 import { Lint } from "@savvy-web/silk-effects";
 import { Effect } from "effect";
+import { Argument, Command } from "effect/unstable/cli";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { parse, stringify } from "yaml";
+import { Yaml, YamlStringifyOptions } from "@effected/yaml";
 
 //#region src/commands/lint/fmt.ts
 /**
@@ -15,17 +15,13 @@ import { parse, stringify } from "yaml";
 *
 * @internal
 */
-/** Default YAML stringify options matching PnpmWorkspace handler. */
-const YAML_STRINGIFY_OPTIONS = {
+/** Default YAML stringify options matching PnpmWorkspace handler (plain scalars = the v3 singleQuote:false posture). */
+const YAML_STRINGIFY_OPTIONS = YamlStringifyOptions.make({
 	indent: 2,
-	lineWidth: 0,
-	singleQuote: false
-};
+	lineWidth: 0
+});
 /** Repeated file path arguments. */
-const filesArg = Args.repeated(Args.file({
-	name: "files",
-	exists: "yes"
-}));
+const filesArg = Argument.file("files", { mustExist: true }).pipe(Argument.variadic());
 /** 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,11 +31,13 @@ const packageJsonCommand = Command.make("package-json", { files: filesArg }, ({
 	}
 }));
 /** Sort and format pnpm-workspace.yaml. */
-const pnpmWorkspaceCommand = Command.make("pnpm-workspace", {}, () => Effect.sync(() => {
+const pnpmWorkspaceCommand = Command.make("pnpm-workspace", {}, () => Effect.gen(function* () {
 	const filepath = "pnpm-workspace.yaml";
 	if (!existsSync(filepath)) return;
-	const parsed = parse(readFileSync(filepath, "utf-8"));
-	writeFileSync(filepath, stringify(Lint.PnpmWorkspace.sortContent(parsed), YAML_STRINGIFY_OPTIONS), "utf-8");
+	const content = readFileSync(filepath, "utf-8");
+	const parsed = yield* Yaml.parse(content);
+	const sorted = Lint.PnpmWorkspace.sortContent(parsed);
+	writeFileSync(filepath, yield* Yaml.stringify(sorted, YAML_STRINGIFY_OPTIONS), "utf-8");
 }));
 /** Format YAML files with Prettier. */
 const yamlCommand = Command.make("yaml", { files: filesArg }, ({ files }) => Effect.gen(function* () {

package/commands/lint/index.js

@@ -1,7 +1,7 @@
 import { runLintCheck } from "./check.js";
 import { runLintInit } from "./init.js";
 import { fmtCommand } from "./fmt.js";
-import { Command } from "@effect/cli";
+import { Command } from "effect/unstable/cli";
 
 //#region src/commands/lint/index.ts
 /* v8 ignore start -- CLI registration; each command tested via exported handler */

package/commands/lint/init.js

@@ -1,9 +1,8 @@
 import { BIOME_VERSION } from "./biome-version.js";
 import { BiomeSchemaSync, Lint, ManagedSection, SavvyBaseSection, SavvyHooksSection, savvyBasePreamble, savvyHooksHygiene } from "@savvy-web/silk-effects";
-import { Effect } from "effect";
+import { Effect, FileSystem } from "effect";
 import { dirname } from "node:path";
-import { applyEdits, modify, parse } from "jsonc-effect";
-import { FileSystem } from "@effect/platform";
+import { Jsonc, JsoncEdit, JsoncModifier } from "@effected/jsonc";
 import { chmod } from "node:fs/promises";
 import { isDeepStrictEqual } from "node:util";
 
@@ -90,20 +89,20 @@ function writeMarkdownlintConfig(fs, preset, force) {
 			return;
 		}
 		const existingText = yield* fs.readFileString(Lint.MARKDOWNLINT_CONFIG_PATH);
-		const existingParsed = yield* parse(existingText);
+		const existingParsed = yield* Jsonc.parse(existingText);
 		let updatedText = existingText;
 		const applied = [];
 		if (existingParsed.$schema !== Lint.MARKDOWNLINT_SCHEMA) {
-			const edits = yield* modify(updatedText, ["$schema"], Lint.MARKDOWNLINT_SCHEMA, { formattingOptions: JSONC_FORMAT });
-			updatedText = yield* applyEdits(updatedText, edits);
+			const edits = yield* JsoncModifier.modify(updatedText, ["$schema"], Lint.MARKDOWNLINT_SCHEMA, { formattingOptions: JSONC_FORMAT });
+			updatedText = JsoncEdit.applyAll(updatedText, edits);
 			applied.push("$schema");
 		}
 		const existingIgnores = Array.isArray(existingParsed.ignores) ? existingParsed.ignores : [];
 		const missingIgnores = Lint.MARKDOWNLINT_TEMPLATE.ignores.filter((glob) => !existingIgnores.includes(glob));
 		if (missingIgnores.length > 0) {
 			const mergedIgnores = [...existingIgnores, ...missingIgnores];
-			const edits = yield* modify(updatedText, ["ignores"], mergedIgnores, { formattingOptions: JSONC_FORMAT });
-			updatedText = yield* applyEdits(updatedText, edits);
+			const edits = yield* JsoncModifier.modify(updatedText, ["ignores"], mergedIgnores, { formattingOptions: JSONC_FORMAT });
+			updatedText = JsoncEdit.applyAll(updatedText, edits);
 			applied.push(`ignores (+${missingIgnores.length})`);
 		}
 		const existingConfig = existingParsed.config;

package/commands/repos/commands/add.js

@@ -1,6 +1,6 @@
-import { Args, Command, Options } from "@effect/cli";
 import { Repos } from "@savvy-web/silk-effects";
 import { Effect, Option } from "effect";
+import { Argument, Command, Flag } from "effect/unstable/cli";
 
 //#region src/commands/repos/commands/add.ts
 /**
@@ -28,12 +28,12 @@ import { Effect, Option } from "effect";
 * @internal
 */
 /* v8 ignore start -- CLI option/arg definitions */
-const urlArg = Args.text({ name: "url" });
-const refOption = Options.text("ref").pipe(Options.withDescription("Ref (tag, branch, or commit) to check out"));
-const purposeOption = Options.text("purpose").pipe(Options.withDescription("Why this repo is vendored"));
-const nameOption = Options.text("name").pipe(Options.withDescription("Vendored directory name; defaults to the URL's last path segment"), Options.optional);
-const sparseOption = Options.text("sparse").pipe(Options.withDescription("Sparse-checkout path; repeatable"), Options.repeated);
-const cwdOption = Options.directory("cwd").pipe(Options.withDescription("Repo root to add within"), Options.withDefault("."));
+const urlArg = Argument.string("url");
+const refOption = Flag.string("ref").pipe(Flag.withDescription("Ref (tag, branch, or commit) to check out"));
+const purposeOption = Flag.string("purpose").pipe(Flag.withDescription("Why this repo is vendored"));
+const nameOption = Flag.string("name").pipe(Flag.withDescription("Vendored directory name; defaults to the URL's last path segment"), Flag.optional);
+const sparseOption = Flag.string("sparse").pipe(Flag.withDescription("Sparse-checkout path; repeatable"), Flag.atLeast(0));
+const cwdOption = Flag.directory("cwd").pipe(Flag.withDescription("Repo root to add within"), Flag.withDefault("."));
 /* v8 ignore stop */
 /**
 * Add handler; exported for tests.

package/commands/repos/commands/note.js

@@ -1,6 +1,6 @@
-import { Args, Command, Options } from "@effect/cli";
 import { Repos } from "@savvy-web/silk-effects";
 import { Effect } from "effect";
+import { Argument, Command, Flag } from "effect/unstable/cli";
 
 //#region src/commands/repos/commands/note.ts
 /**
@@ -52,34 +52,38 @@ const runReposNote = (cwd, name, op) => Effect.gen(function* () {
 	return Effect.log(error.message);
 }));
 /* v8 ignore start -- CLI registration; handler tested via runReposNote */
-const nameArg = Args.text({ name: "name" });
-const noteTextArg = Args.text({ name: "text" });
-const noteIdArg = Args.text({ name: "id" });
-const intoOption = Options.choice("into", ["layout", "startHere"]).pipe(Options.withDescription("Curated orientation field to promote the note into"));
-const cwdOption = Options.directory("cwd").pipe(Options.withDescription("Repo root whose manifest holds the notes"), Options.withDefault("."));
-const _noteGroup = Command.make("note", {
+const nameArg = Argument.string("name");
+const noteTextArg = Argument.string("text");
+const noteIdArg = Argument.string("id");
+const intoOption = Flag.choice("into", ["layout", "startHere"]).pipe(Flag.withDescription("Curated orientation field to promote the note into"));
+const cwdOption = Flag.directory("cwd").pipe(Flag.withDescription("Repo root whose manifest holds the notes"), Flag.withDefault("."));
+const _noteGroup = Command.make("note").pipe(Command.withSharedFlags({ cwd: cwdOption }));
+const addLeaf = Command.make("add", {
 	name: nameArg,
-	cwd: cwdOption
-});
-const addLeaf = Command.make("add", { note: noteTextArg }, ({ note }) => Effect.gen(function* () {
-	const { name, cwd } = yield* _noteGroup;
+	note: noteTextArg
+}, ({ name, note }) => Effect.gen(function* () {
+	const { cwd } = yield* _noteGroup;
 	yield* runReposNote(cwd, name, {
 		op: "add",
 		note
 	});
 })).pipe(Command.withDescription("Append an agent note to a vendored repo"));
-const removeLeaf = Command.make("remove", { id: noteIdArg }, ({ id }) => Effect.gen(function* () {
-	const { name, cwd } = yield* _noteGroup;
+const removeLeaf = Command.make("remove", {
+	name: nameArg,
+	id: noteIdArg
+}, ({ name, id }) => Effect.gen(function* () {
+	const { cwd } = yield* _noteGroup;
 	yield* runReposNote(cwd, name, {
 		op: "remove",
 		id
 	});
 })).pipe(Command.withDescription("Remove an agent note from a vendored repo"));
 const promoteLeaf = Command.make("promote", {
+	name: nameArg,
 	id: noteIdArg,
 	into: intoOption
-}, ({ id, into }) => Effect.gen(function* () {
-	const { name, cwd } = yield* _noteGroup;
+}, ({ name, id, into }) => Effect.gen(function* () {
+	const { cwd } = yield* _noteGroup;
 	yield* runReposNote(cwd, name, {
 		op: "promote",
 		id,
@@ -93,11 +97,6 @@ const _noteCommand = _noteGroup.pipe(Command.withSubcommands([
 ]), Command.withDescription("Agent notes for a vendored repo: add, remove, promote"));
 /**
 * The `savvy repos note` command group.
-*
-* @remarks
-* Typed as `unknown` at the export boundary to avoid TypeScript declaration-emit
-* errors from Effect's internal types (TS4023), matching the `reposCommand`
-* export pattern.
 */
 const noteCommand = _noteCommand;
 /* v8 ignore stop */

package/commands/repos/commands/pin.js

@@ -1,6 +1,6 @@
-import { Args, Command, Options } from "@effect/cli";
 import { Repos } from "@savvy-web/silk-effects";
 import { Effect } from "effect";
+import { Argument, Command, Flag } from "effect/unstable/cli";
 
 //#region src/commands/repos/commands/pin.ts
 /**
@@ -26,9 +26,9 @@ import { Effect } from "effect";
 * @internal
 */
 /* v8 ignore start -- CLI option/arg definitions */
-const nameArg = Args.text({ name: "name" });
-const refArg = Args.text({ name: "ref" });
-const cwdOption = Options.directory("cwd").pipe(Options.withDescription("Repo root to pin within"), Options.withDefault("."));
+const nameArg = Argument.string("name");
+const refArg = Argument.string("ref");
+const cwdOption = Flag.directory("cwd").pipe(Flag.withDescription("Repo root to pin within"), Flag.withDefault("."));
 /* v8 ignore stop */
 /**
 * Pin handler; exported for tests.

package/commands/repos/commands/status.js

@@ -1,6 +1,6 @@
-import { Command, Options } from "@effect/cli";
 import { Repos } from "@savvy-web/silk-effects";
 import { Console, Effect } from "effect";
+import { Command, Flag } from "effect/unstable/cli";
 
 //#region src/commands/repos/commands/status.ts
 /**
@@ -25,8 +25,8 @@ import { Console, Effect } from "effect";
 * @internal
 */
 /* v8 ignore start -- CLI option definitions */
-const jsonOption = Options.boolean("json").pipe(Options.withDescription("Emit the structured drift report as JSON"), Options.withDefault(false));
-const cwdOption = Options.directory("cwd").pipe(Options.withDescription("Repo root to inspect"), Options.withDefault("."));
+const jsonOption = Flag.boolean("json").pipe(Flag.withDescription("Emit the structured drift report as JSON"), Flag.withDefault(false));
+const cwdOption = Flag.directory("cwd").pipe(Flag.withDescription("Repo root to inspect"), Flag.withDefault("."));
 /* v8 ignore stop */
 /**
 * Drift report handler; exported for tests.