@savvy-web/cli 3.7.15 → 3.7.17

package/cli/index.js

@@ -1,10 +1,10 @@
 import { changesetCommand } from "../commands/changeset/index.js";
 import { checkCommand } from "../commands/check.js";
+import { cleanCommand } from "../commands/clean.js";
 import { commitCommand } from "../commands/commit/index.js";
 import { initCommand } from "../commands/init.js";
 import { lintCommand } from "../commands/lint/index.js";
 import { reposCommand } from "../commands/repos/index.js";
-import { cleanCommand } from "../commands/clean.js";
 import { CliConfig, Command, GlobalFlag } from "effect/cli";
 import { CliAudience } from "@effected/cli";
 import { BiomeSchemaSync, ChangesetConfigReader, Changesets, ConfigDiscovery, Repos, SilkPublishability } from "@savvy-web/silk-effects";

package/commands/changeset/commands/deps-detect.js

@@ -1,9 +1,9 @@
 import { Report } from "../../../internal/report.js";
 import { Command, Flag } from "effect/cli";
 import { resolve } from "node:path";
-import { CliExit } from "@effected/cli";
+import { CliExit, CliFormat } from "@effected/cli";
 import { Changesets } from "@savvy-web/silk-effects";
-import { Console, Effect, Option } from "effect";
+import { Effect, Option } from "effect";
 
 // src/commands/changeset/commands/deps-detect.ts
 /**
@@ -72,7 +72,7 @@ function runDepsDetect(cwd, from, to, pkg, json, markdown) {
 			yield* Report.print([Report.verbatim(renderMarkdownBlocks(diffs))]);
 			return;
 		}
-		yield* Console.log(JSON.stringify(diffs, null, 2));
+		yield* CliFormat.printJson(diffs);
 	});
 }
 /* v8 ignore next 7 */

package/commands/changeset/commands/init.js

@@ -1,12 +1,12 @@
-import { Report } from "../../../internal/report.js";
 import { CommandError } from "../../../internal/command-error.js";
+import { Report } from "../../../internal/report.js";
 import { join } from "node:path";
 import { CliDoc, CliExit, Doc, Fmt } from "@effected/cli";
 import { Changesets } from "@savvy-web/silk-effects";
 import { Data, Effect, Option, Result, Schema } from "effect";
-import { TerminalEnv } from "@effected/env";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { Git } from "@effected/git";
+import { TerminalEnv } from "@effected/env";
+import { Git, GitRemote } from "@effected/git";
 import { Jsonc, JsoncEdit, JsoncModifier } from "@effected/jsonc";
 import { WorkspaceRoot } from "@effected/workspaces";
 
@@ -124,11 +124,14 @@ function detectGitHubRepo(cwd) {
 	return Effect.gen(function* () {
 		const url = yield* (yield* Git).remoteUrl(cwd).pipe(Effect.catch(() => Effect.succeed(Option.none())));
 		if (Option.isNone(url)) return null;
-		const https = url.value.match(/github\.com\/([^/]+)\/([^/.]+)/);
-		if (https) return `${https[1]}/${https[2]}`;
-		const ssh = url.value.match(/github\.com:([^/]+)\/([^/.]+)/);
-		if (ssh) return `${ssh[1]}/${ssh[2]}`;
-		return null;
+		const remote = GitRemote.parse(url.value);
+		if (Option.isNone(remote)) return null;
+		const form = remote.value._tag === "GitRemoteTransport" ? remote.value.address : remote.value;
+		if (form._tag !== "GitRemoteUrl" && form._tag !== "GitRemoteScp") return null;
+		if (form._tag === "GitRemoteUrl" && form.user !== void 0 && /[/?#]/.test(form.user)) return null;
+		if (form.host.toLowerCase() !== "github.com") return null;
+		const [owner, repo] = GitRemote.repositoryPath(form).split("/");
+		return owner && repo ? `${owner}/${repo}` : null;
 	});
 }
 /**

package/commands/changeset/commands/validate-file.js

@@ -1,5 +1,5 @@
-import { Report } from "../../../internal/report.js";
 import { CommandError } from "../../../internal/command-error.js";
+import { Report } from "../../../internal/report.js";
 import { Argument, Command } from "effect/cli";
 import { CliExit } from "@effected/cli";
 import { Changesets } from "@savvy-web/silk-effects";

package/commands/clean.js

@@ -1,5 +1,5 @@
-import { Report } from "../internal/report.js";
 import { CommandError } from "../internal/command-error.js";
+import { Report } from "../internal/report.js";
 import { Command, Flag } from "effect/cli";
 import { join, sep } from "node:path";
 import { CliInteractive, Fmt } from "@effected/cli";

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 { lintCommand } from "./lint.js";
+import { runCommitCheck } from "./check.js";
+import { runCommitInit } from "./init.js";
 import { Command } from "effect/cli";
 
 // src/commands/commit/index.ts

package/commands/commit/init.js

@@ -1,5 +1,5 @@
-import { Report } from "../../internal/report.js";
 import { CommandError } from "../../internal/command-error.js";
+import { Report } from "../../internal/report.js";
 import { HUSKY_HOOK_PATH, POST_CHECKOUT_HOOK_PATH, POST_COMMIT_HOOK_PATH, POST_MERGE_HOOK_PATH } from "./constants.js";
 import { dirname } from "node:path";
 import { SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, savvyBasePreamble, savvyHooksHygiene, savvyInstallBlock, savvyToolSection, savvyToolchainCheck } from "@savvy-web/silk-effects";

package/commands/init.js

@@ -1,10 +1,10 @@
-import { Report } from "../internal/report.js";
 import { CommandError } from "../internal/command-error.js";
+import { confirmDestructive, yesFlag } from "../internal/confirm.js";
 import { runChangesetInit } from "./changeset/commands/init.js";
+import { Report } from "../internal/report.js";
 import "./changeset/index.js";
 import { HUSKY_HOOK_PATH } from "./commit/constants.js";
 import { runCommitInit } from "./commit/init.js";
-import { confirmDestructive, yesFlag } from "../internal/confirm.js";
 import { runLintInit } from "./lint/init.js";
 import { Command, Flag } from "effect/cli";
 import { Lint } from "@savvy-web/silk-effects";

package/commands/lint/biome-version.js

@@ -19,6 +19,6 @@
 *
 * @internal
 */
-const BIOME_VERSION = "2.6.3";
+const BIOME_VERSION = "2.6.4";
 
 export { BIOME_VERSION };

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 { runLintText, textCommand } from "./text.js";
+import { runLintCheck } from "./check.js";
+import { runLintInit } from "./init.js";
 import { Command } from "effect/cli";
 
 // src/commands/lint/index.ts

package/commands/lint/init.js

@@ -1,5 +1,5 @@
-import { Report } from "../../internal/report.js";
 import { CommandError } from "../../internal/command-error.js";
+import { Report } from "../../internal/report.js";
 import { BIOME_VERSION } from "./biome-version.js";
 import { dirname, join } from "node:path";
 import { BiomeSchemaSync, LIFECYCLE_SCRIPTS_CONFIG_KEY, Lint, SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, publishesBuiltLinkDirectory, savvyBasePreamble, savvyHooksHygiene, savvyInstallBlock, savvyOkfBlock, savvyToolchainCheck } from "@savvy-web/silk-effects";

package/commands/repos/commands/remove.js

@@ -1,5 +1,5 @@
-import { Report } from "../../../internal/report.js";
 import { confirmDestructive, yesFlag } from "../../../internal/confirm.js";
+import { Report } from "../../../internal/report.js";
 import { ReposCli } from "../shared.js";
 import { Argument, Command, Flag } from "effect/cli";
 import { Doc } from "@effected/cli";

package/commands/repos/commands/restore.js

@@ -1,5 +1,5 @@
-import { Report } from "../../../internal/report.js";
 import { confirmDestructive, yesFlag } from "../../../internal/confirm.js";
+import { Report } from "../../../internal/report.js";
 import { ReposCli } from "../shared.js";
 import { Argument, Command, Flag } from "effect/cli";
 import { CliExit, CliInteractive } from "@effected/cli";

package/commands/repos/commands/status.js

@@ -1,9 +1,9 @@
 import { Report } from "../../../internal/report.js";
 import { ReposCli } from "../shared.js";
 import { Command, Flag } from "effect/cli";
-import { CliExit, Doc, Status } from "@effected/cli";
+import { CliExit, CliFormat, Doc, Status } from "@effected/cli";
 import { Repos } from "@savvy-web/silk-effects";
-import { Console, Effect } from "effect";
+import { Effect } from "effect";
 
 // src/commands/repos/commands/status.ts
 /** The human status report: a table of repos, and one of drifts under `--drift`. */
@@ -61,7 +61,7 @@ const runReposStatus = (cwd, json, drift = false) => Effect.gen(function* () {
 			...report,
 			drift: driftReport
 		};
-		yield* Console.log(JSON.stringify(payload, null, 2));
+		yield* CliFormat.printJson(payload);
 		return;
 	}
 	const blocks = [report.repos.length > 0 ? ReposStatusView.repos(report.repos) : Report.skip("the manifest lists no repos")];
@@ -69,21 +69,21 @@ const runReposStatus = (cwd, json, drift = false) => Effect.gen(function* () {
 	yield* Report.print(blocks);
 }).pipe(Effect.catchTag("ReposConfigError", (error) => {
 	if (error.kind === "missing") {
-		if (json) return Console.log(JSON.stringify({
+		if (json) return CliFormat.printJson({
 			repos: [],
 			clean: true
-		}, null, 2));
+		});
 		return Report.print([Report.skip("no .repos/config.json — nothing vendored")]);
 	}
-	if (json) return CliExit.set(1).pipe(Effect.andThen(Console.log(JSON.stringify({
+	if (json) return CliExit.set(1).pipe(Effect.andThen(CliFormat.printJson({
 		error: error.message,
 		clean: false
-	}, null, 2))), Effect.andThen(Effect.logError(error.message)));
+	})), Effect.andThen(Effect.logError(error.message)));
 	return ReposCli.fail("read the repos manifest")(error);
-}), Effect.catchTag("GitSubmoduleError", (error) => json ? CliExit.set(1).pipe(Effect.andThen(Console.log(JSON.stringify({
+}), Effect.catchTag("GitSubmoduleError", (error) => json ? CliExit.set(1).pipe(Effect.andThen(CliFormat.printJson({
 	error: error.message,
 	clean: false
-}, null, 2))), Effect.andThen(Effect.logError(error.message))) : ReposCli.fail("check the vendored repos")(error)));
+})), Effect.andThen(Effect.logError(error.message))) : ReposCli.fail("check the vendored repos")(error)));
 /* v8 ignore start -- CLI registration; handler tested via runReposStatus */
 const statusCommand = Command.make("status", {
 	json: jsonOption,

package/commands/repos/shared.js

@@ -1,6 +1,6 @@
-import { Report } from "../../internal/report.js";
-import { FailureLine } from "../../internal/failure-line.js";
 import { CommandError } from "../../internal/command-error.js";
+import { FailureLine } from "../../internal/failure-line.js";
+import { Report } from "../../internal/report.js";
 import { CliError } from "effect/cli";
 import { CliInteractive } from "@effected/cli";
 import { Repos } from "@savvy-web/silk-effects";

package/internal/report.js

@@ -1,6 +1,4 @@
 import { Doc, Status } from "@effected/cli";
-import { Effect } from "effect";
-import { TerminalEnv } from "@effected/env";
 
 // src/internal/report.ts
 /** A status line, with any detail lines muted and indented under it. */
@@ -89,12 +87,13 @@ var Report = class {
 	* Render `doc` for the run's audience and write it to stdout.
 	*
 	* @remarks
-	* A terminal wraps to its width. A pipe has no width to honour — the kit
-	* would otherwise wrap a person's piped output at 80 columns and split a
-	* long path or a `file:line:col` finding a caller greps — so off a terminal
-	* nothing is wrapped.
+	* A terminal wraps to its width. A pipe has no width to honour, so off a
+	* terminal nothing is wrapped and a long path or a `file:line:col` finding
+	* a caller greps stays on one line — the kit's own default for a human
+	* whose stdout is not a terminal (an agent's and CI's width is unbounded
+	* too).
 	*/
-	static print = (doc) => Effect.flatMap(TerminalEnv, (terminal) => Doc.print(doc, terminal.stdout.isTerminal ? {} : { width: Number.POSITIVE_INFINITY }));
+	static print = (doc) => Doc.print(doc);
 };
 
 export { Report };

package/internal/version-line.js

@@ -1,18 +1,23 @@
-import { distributionSuffix } from "@effected/engine";
-
 // src/internal/version-line.ts
 /**
+* The `--version` line.
+*
+* @packageDocumentation
+*/
+/**
 * Renders the `savvy --version` line: the same `<name> v<version>` shape
-* `effect/cli`'s default formatter prints, plus the
-* `" via <carrier> <version>"` suffix when the bin was installed through a
-* carrier such as `@savvy-web/silk`.
+* `effect/cli`'s default formatter prints, but plain even at a terminal (core's
+* default paints it). The `" via <carrier> <version>"` suffix for a bin
+* installed through a carrier such as `@savvy-web/silk` is not added here:
+* `CliRuntime.main`'s `distribution` option appends it to whatever
+* `formatVersion` is in effect.
 *
 * @internal
 */
 var VersionLine = class {
 	constructor() {}
-	/** `savvy v1.2.3`, or `savvy v1.2.3 via @savvy-web/silk 4.5.6`. */
-	static format = (name, version, distribution) => `${name} v${version}${distributionSuffix(distribution)}`;
+	/** `savvy v1.2.3`. */
+	static format = (name, version) => `${name} v${version}`;
 };
 
 export { VersionLine };

package/main.js

@@ -1,11 +1,10 @@
-import { FailureLine } from "./internal/failure-line.js";
 import { AppLive, CliConfigLive, CliPlatform, rootCommand } from "./cli/index.js";
+import { FailureLine } from "./internal/failure-line.js";
 import { VersionLine } from "./internal/version-line.js";
 import { CLI_VERSION } from "./version.js";
 import { CliAudience, CliRuntime } from "@effected/cli";
-import { Effect, Layer, Option } from "effect";
+import { Effect, Layer } from "effect";
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
-import { CurrentDistribution } from "@effected/engine";
 
 // src/main.ts
 /**
@@ -21,7 +20,8 @@ import { CurrentDistribution } from "@effected/engine";
 * audience (overridable through `SAVVY_AUDIENCE`), the terminal, the theme,
 * editor links and the prompt gate — installs `CliLog` (diagnostics opt-in
 * through `SAVVY_LOG_LEVEL`, every log line on stderr) and the coloured help
-* formatter with the carrier-aware `--version` line. `main` reports failures
+* formatter with a plain `--version` line, to which `distribution` appends
+* the carrier suffix. `main` reports failures
 * through that logger (a typed failure as one line, a defect as a bug
 * report), applies the `CliExit` code a command set, and exits `64` on a
 * usage error with the help document on stderr, so stdout stays clean for a
@@ -37,16 +37,16 @@ import { CurrentDistribution } from "@effected/engine";
 * @public
 */
 const main = (options = {}) => {
-	const distribution = Option.fromNullishOr(options.distribution);
-	const program = CliAudience.run(rootCommand, { version: CLI_VERSION }).pipe(Effect.provide(Layer.merge(AppLive, CliConfigLive)), Effect.provideService(CurrentDistribution, distribution));
+	const program = CliAudience.run(rootCommand, { version: CLI_VERSION }).pipe(Effect.provide(Layer.merge(AppLive, CliConfigLive)));
 	NodeRuntime.runMain(CliRuntime.main(program, {
 		platform: CliPlatform,
 		env: {
 			audienceEnvVar: "SAVVY_AUDIENCE",
 			stderrIsTerminal: Effect.sync(() => process.stderr.isTTY === true),
 			log: { envVar: "SAVVY_LOG_LEVEL" },
-			formatter: { formatVersion: (name, version) => VersionLine.format(name, version, distribution) }
+			formatter: { formatVersion: VersionLine.format }
 		},
+		distribution: options.distribution ?? null,
 		render: FailureLine.render,
 		helpOnUsageError: "stderr"
 	}));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/cli",
-	"version": "3.7.15",
+	"version": "3.7.17",
 	"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,22 +36,22 @@
 		"savvy": "bin/savvy.js"
 	},
 	"dependencies": {
-		"@effect/platform-node": "^4.0.6",
-		"@effected/cli": "^0.23.0",
-		"@effected/commands": "^0.17.0",
-		"@effected/config-file": "^0.21.0",
-		"@effected/engine": "^0.9.0",
-		"@effected/env": "^0.6.0",
-		"@effected/git": "^0.26.0",
-		"@effected/glob": "^0.15.0",
-		"@effected/jsonc": "^0.20.1",
-		"@effected/templates": "^0.14.1",
-		"@effected/toml": "^0.16.0",
-		"@effected/walker": "^0.21.0",
-		"@effected/workspaces": "^0.39.1",
-		"@effected/yaml": "^0.25.1",
-		"@savvy-web/silk-effects": "^10.2.0",
-		"effect": "^4.0.6",
+		"@effect/platform-node": "~4.1.1",
+		"@effected/cli": "^0.25.0",
+		"@effected/commands": "^0.19.0",
+		"@effected/config-file": "^0.23.0",
+		"@effected/engine": "^0.11.0",
+		"@effected/env": "^0.9.0",
+		"@effected/git": "^0.29.0",
+		"@effected/glob": "^0.17.0",
+		"@effected/jsonc": "^0.22.0",
+		"@effected/templates": "^0.16.0",
+		"@effected/toml": "^0.18.0",
+		"@effected/walker": "^0.24.0",
+		"@effected/workspaces": "^0.41.0",
+		"@effected/yaml": "^0.27.0",
+		"@savvy-web/silk-effects": "^11.0.0",
+		"effect": "~4.1.1",
 		"ink": "^8.0.0",
 		"react": "^19.3.1"
 	}

package/version.js

@@ -7,6 +7,6 @@
 * @packageDocumentation
 */
 /** @internal */
-const CLI_VERSION = "3.7.15";
+const CLI_VERSION = "3.7.17";
 
 export { CLI_VERSION };