@happyvertical/smrt-cli 0.57.37 → 0.57.39

package/dist/index.js

@@ -51,77 +51,77 @@ var _cookbookCommands = null;
 var _kitchenCommands = null;
 async function getGnodeCommands() {
 	if (!_gnodeCommands) {
-		const { gnodeCommands } = await import("./commands-uveaWifl.js");
+		const { gnodeCommands } = await import("./commands-CX6k0tWj.js");
 		_gnodeCommands = gnodeCommands;
 	}
 	return _gnodeCommands;
 }
 async function getGitCommands() {
 	if (!_gitCommands) {
-		const { gitCommands } = await import("./commands-uveaWifl.js");
+		const { gitCommands } = await import("./commands-CX6k0tWj.js");
 		_gitCommands = gitCommands;
 	}
 	return _gitCommands;
 }
 async function getGenerateCommands() {
 	if (!_generateCommands) {
-		const { generateCommands } = await import("./commands-uveaWifl.js");
+		const { generateCommands } = await import("./commands-CX6k0tWj.js");
 		_generateCommands = generateCommands;
 	}
 	return _generateCommands;
 }
 async function getInitCommands() {
 	if (!_initCommands) {
-		const { initCommands } = await import("./commands-uveaWifl.js");
+		const { initCommands } = await import("./commands-CX6k0tWj.js");
 		_initCommands = initCommands;
 	}
 	return _initCommands;
 }
 async function getUtilityCommands() {
 	if (!_utilityCommands) {
-		const { utilityCommands } = await import("./commands-uveaWifl.js");
+		const { utilityCommands } = await import("./commands-CX6k0tWj.js");
 		_utilityCommands = utilityCommands;
 	}
 	return _utilityCommands;
 }
 async function getDispatchCommands() {
 	if (!_dispatchCommands) {
-		const { dispatchCommands } = await import("./commands-uveaWifl.js");
+		const { dispatchCommands } = await import("./commands-CX6k0tWj.js");
 		_dispatchCommands = dispatchCommands;
 	}
 	return _dispatchCommands;
 }
 async function getDocsCommands() {
 	if (!_docsCommands) {
-		const { docsCommands } = await import("./commands-uveaWifl.js");
+		const { docsCommands } = await import("./commands-CX6k0tWj.js");
 		_docsCommands = docsCommands;
 	}
 	return _docsCommands;
 }
 async function getPlaygroundCommands() {
 	if (!_playgroundCommands) {
-		const { playgroundCommands } = await import("./commands-uveaWifl.js");
+		const { playgroundCommands } = await import("./commands-CX6k0tWj.js");
 		_playgroundCommands = playgroundCommands;
 	}
 	return _playgroundCommands;
 }
 async function getCookbookCommands() {
 	if (!_cookbookCommands) {
-		const { cookbookCommands } = await import("./commands-uveaWifl.js");
+		const { cookbookCommands } = await import("./commands-CX6k0tWj.js");
 		_cookbookCommands = cookbookCommands;
 	}
 	return _cookbookCommands;
 }
 async function getKitchenCommands() {
 	if (!_kitchenCommands) {
-		const { kitchenCommands } = await import("./commands-uveaWifl.js");
+		const { kitchenCommands } = await import("./commands-CX6k0tWj.js");
 		_kitchenCommands = kitchenCommands;
 	}
 	return _kitchenCommands;
 }
 async function getWorkbenchCommands() {
 	if (!_workbenchCommands) {
-		const { workbenchCommands } = await import("./commands-uveaWifl.js");
+		const { workbenchCommands } = await import("./commands-CX6k0tWj.js");
 		_workbenchCommands = workbenchCommands;
 	}
 	return _workbenchCommands;
@@ -207,11 +207,17 @@ function rescopeGlobalFlag(argv, commands, builtInCommands) {
 	const aliasFlag = `--${SCOPED_GLOBAL_FLAG_ALIAS}`;
 	const { command, wordCount } = matchLeadingCommand(argv.slice(start), commands, builtInCommands);
 	const firstOptionIndex = start + Math.max(wordCount, 1);
+	const shortVOption = Object.entries(command?.options ?? {}).find(([name, option]) => option.short === "v" && name !== SCOPED_GLOBAL_FLAG)?.[0];
 	let rewritten = false;
 	const rescoped = [...argv];
 	for (let index = firstOptionIndex; index < rescoped.length; index += 1) {
 		const token = rescoped[index];
 		if (token === "--") break;
+		if (token === "-v" && shortVOption) {
+			rescoped[index] = `--${shortVOption}`;
+			rewritten = true;
+			continue;
+		}
 		if (token === flag) {
 			rescoped[index] = aliasFlag;
 			rewritten = true;
@@ -788,6 +794,14 @@ var CLIGenerator = class {
 		return commands;
 	}
 	/**
+	* True when argv starts with a command word other than the version command
+	* itself (so a `-v` after it is not the global `smrt -v`).
+	*/
+	leadsWithOtherCommand(argv, version) {
+		const leading = argv[firstArgumentIndex(argv)];
+		return !!leading && !leading.startsWith("-") && leading !== version.name && !version.aliases?.includes(leading);
+	}
+	/**
 	* Execute a parsed command
 	*/
 	async executeCommand(parsed, commands, processedArgv = process.argv.slice(2)) {
@@ -805,6 +819,8 @@ var CLIGenerator = class {
 				parsed.options = reParsed.options;
 			}
 		}
+		const swallowedVersion = command?.name === "version" && this.leadsWithOtherCommand(processedArgv, command) ? command : void 0;
+		if (swallowedVersion) command = void 0;
 		if (command) {
 			const requiredArgCount = countRequiredArgs(command.args);
 			if (parsed.args.length < requiredArgCount) {
@@ -851,7 +867,10 @@ var CLIGenerator = class {
 			...kitchenCommands
 		};
 		const builtInMatch = matchLeadingCommand(processedArgv, [], builtInCommands);
-		const builtInCommand = builtInMatch.command ?? builtInCommands[parsed.command] ?? Object.values(builtInCommands).find((cmd) => cmd.name === parsed.command || cmd.aliases?.includes(parsed.command ?? ""));
+		let builtInCommand = builtInMatch.command ?? builtInCommands[parsed.command] ?? Object.values(builtInCommands).find((cmd) => cmd.name === parsed.command || cmd.aliases?.includes(parsed.command ?? ""));
+		if (swallowedVersion) {
+			if (!Object.values(builtInMatch.command?.options ?? {}).some((option) => option.short === "v")) builtInCommand = swallowedVersion;
+		}
 		if (builtInCommand) {
 			const requiredArgCount = countRequiredArgs(builtInCommand.args);
 			if (parsed.args.length < requiredArgCount) {

package/dist/{oidcProvisioningPrimitives-Dl9qIcYS-CTF3hQeX.js → oidcProvisioningPrimitives-KpIiLmG4-4hAwGsZT.js}

@@ -1,11 +1,11 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
 import { n as __exportAll$1 } from "./NostrIdentity-RJaATTCt-BbRHWyee.js";
-import { t as OidcIdentity } from "./OidcIdentity-MVVO3MfG-DMmkDwKt.js";
-import { c as saveOidcRaceArbiter, n as ProfileCollection, t as Profile } from "./ProfileCollection-CMS9dFc0-DjuUyO1a.js";
-import { t as ProfileTypeCollection } from "./ProfileTypeCollection-B7m698Bl-Dfp1YzXi.js";
+import { t as OidcIdentity } from "./OidcIdentity-COeMidoC-RnoC3a6R.js";
+import { c as saveOidcRaceArbiter, n as ProfileCollection, t as Profile } from "./ProfileCollection-CmRaiE9U-Bz_8He8o.js";
+import { t as ProfileTypeCollection } from "./ProfileTypeCollection-BRLK8cHS-DYTDj03n.js";
 import { smrt } from "@happyvertical/smrt-core";
-//#region ../profiles/dist/chunks/oidcProvisioningPrimitives-Dl9qIcYS.js
-var oidcProvisioningPrimitives_Dl9qIcYS_exports = /* @__PURE__ */ __exportAll({
+//#region ../profiles/dist/chunks/oidcProvisioningPrimitives-KpIiLmG4.js
+var oidcProvisioningPrimitives_KpIiLmG4_exports = /* @__PURE__ */ __exportAll({
 	a: () => Person,
 	i: () => Organization,
 	n: () => insertOidcProvisioningIdentity,
@@ -90,4 +90,4 @@ function requireProvisioningId(value, label) {
 	return value;
 }
 //#endregion
-export { insertOidcProvisioningIdentity as n, oidcProvisioningPrimitives_Dl9qIcYS_exports as r, createOidcProvisioningPerson as t };
+export { insertOidcProvisioningIdentity as n, oidcProvisioningPrimitives_KpIiLmG4_exports as r, createOidcProvisioningPerson as t };

package/dist/{operator-BECPOEBe.js → operator-BhTvp0Ap.js}

@@ -1,5 +1,5 @@
-import { m as withSystemContext } from "./dist-ByULuJzU.js";
-import { Ct as TenantStatus, E as PasswordCredentialService, K as UserCollection, N as RoleCollection, Q as UsersPasswordCredentialCollection, V as TenantCollection, dt as normalizeUsername, g as MembershipCollection, ht as verifySecretHash, j as PermissionResolver, lt as normalizeEmail, st as isValidEmail, wt as UserStatus, yt as MembershipStatus } from "./PasswordCredentialService-DA2Y6H2X-BbB7uowA.js";
+import { m as withSystemContext } from "./dist-BUqQudaA.js";
+import { Ct as TenantStatus, E as PasswordCredentialService, K as UserCollection, N as RoleCollection, Q as UsersPasswordCredentialCollection, V as TenantCollection, dt as normalizeUsername, g as MembershipCollection, ht as verifySecretHash, j as PermissionResolver, lt as normalizeEmail, st as isValidEmail, wt as UserStatus, yt as MembershipStatus } from "./PasswordCredentialService-bedKxkaa-5sB-LtBc.js";
 import { isPostgresDatabase, withEmbeddedWriteTransaction } from "@happyvertical/smrt-core";
 //#region ../users/dist/operator.js
 var OperatorProvisioningError = class extends Error {

package/dist/{resolveIdentity-CR5p_g7K-DtKbI5rI.js → resolveIdentity-j2WFuKDT-CUKGgK2U.js}

@@ -1,13 +1,13 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { m as withSystemContext } from "./dist-ByULuJzU.js";
+import { m as withSystemContext } from "./dist-BUqQudaA.js";
 import { a as verifyAuthEvent, n as __exportAll$1, t as NostrIdentity } from "./NostrIdentity-RJaATTCt-BbRHWyee.js";
 import { t as ApiKey } from "./ApiKey-9YuYcpWy-BdrXOe-N.js";
-import { t as OidcIdentity } from "./OidcIdentity-MVVO3MfG-DMmkDwKt.js";
-import { a as coordinateOidcProvisioning, o as isOidcProvisioningRaceConflict, s as normalizeIdentityEmail } from "./ProfileCollection-CMS9dFc0-DjuUyO1a.js";
-import { n as insertOidcProvisioningIdentity, t as createOidcProvisioningPerson } from "./oidcProvisioningPrimitives-Dl9qIcYS-CTF3hQeX.js";
+import { t as OidcIdentity } from "./OidcIdentity-COeMidoC-RnoC3a6R.js";
+import { a as coordinateOidcProvisioning, o as isOidcProvisioningRaceConflict, s as normalizeIdentityEmail } from "./ProfileCollection-CmRaiE9U-Bz_8He8o.js";
+import { n as insertOidcProvisioningIdentity, t as createOidcProvisioningPerson } from "./oidcProvisioningPrimitives-KpIiLmG4-4hAwGsZT.js";
 import { resolveDatabase } from "@happyvertical/smrt-core";
-//#region ../profiles/dist/chunks/resolveIdentity-CR5p_g7K.js
-var resolveIdentity_CR5p_g7K_exports = /* @__PURE__ */ __exportAll({
+//#region ../profiles/dist/chunks/resolveIdentity-j2WFuKDT.js
+var resolveIdentity_j2WFuKDT_exports = /* @__PURE__ */ __exportAll({
 	i: () => resolveIdentity_exports,
 	n: () => createProfileFromOidc,
 	r: () => resolveIdentity,
@@ -72,13 +72,13 @@ async function resolveIdentity(context) {
 	};
 }
 async function findProfileByExternalId(provider, externalId, options) {
-	const { OidcIdentityCollection } = await import("./OidcIdentityCollection-s4mp3n62-BDTHgQQt.js").then((n) => n.r).then((n) => n.r);
+	const { OidcIdentityCollection } = await import("./OidcIdentityCollection-D4DIZv0K-glNIGyfG.js").then((n) => n.r).then((n) => n.r);
 	const identities = await (await OidcIdentityCollection.create(options)).findByProvider(provider);
 	for (const identity of identities) if (identity.subject === externalId || identity.email?.includes(externalId)) {
 		const profile = await identity.getProfile();
 		if (profile) return profile;
 	}
-	const { ProfileCollection } = await import("./ProfileCollection-CMS9dFc0-DjuUyO1a.js").then((n) => n.r).then((n) => n.r);
+	const { ProfileCollection } = await import("./ProfileCollection-CmRaiE9U-Bz_8He8o.js").then((n) => n.r).then((n) => n.r);
 	const profiles = await (await ProfileCollection.create(options)).list({
 		where: { email: `${externalId}@users.noreply.github.com` },
 		limit: 1
@@ -99,7 +99,7 @@ async function reuseExistingOidcIdentityForProfile(profileId, claims, provider,
 		createConcurrencyError: (cause) => new Error("Concurrent exact OIDC identity reuse did not converge.", cause === void 0 ? void 0 : { cause }),
 		rebindRootResult: rebindOidcProfileResult,
 		provision: (tx) => withSystemContext(async () => {
-			const { OidcIdentityCollection } = await import("./OidcIdentityCollection-s4mp3n62-BDTHgQQt.js").then((n) => n.r).then((n) => n.r);
+			const { OidcIdentityCollection } = await import("./OidcIdentityCollection-D4DIZv0K-glNIGyfG.js").then((n) => n.r).then((n) => n.r);
 			const identity = await (await OidcIdentityCollection.create({ db: tx })).findBySubject(normalizedClaims.iss, normalizedClaims.sub);
 			if (!identity) throw new Error("OidcIdentity.findOrCreate() no longer creates authentication links; use UserCollection.getOrCreateFromOidc() or createProfileFromOidc().");
 			if (identity.profileId !== profileId) throw new Error(`OIDC identity ${normalizedClaims.iss} subject ${normalizedClaims.sub} belongs to a different Profile.`);
@@ -133,7 +133,7 @@ async function coordinateProfileOidcProvisioning(claims, provider, options) {
 	});
 }
 async function provisionOidcProfile(claims, provider, options) {
-	const { OidcIdentityCollection } = await import("./OidcIdentityCollection-s4mp3n62-BDTHgQQt.js").then((n) => n.r).then((n) => n.r);
+	const { OidcIdentityCollection } = await import("./OidcIdentityCollection-D4DIZv0K-glNIGyfG.js").then((n) => n.r).then((n) => n.r);
 	const existingIdentity = await (await OidcIdentityCollection.create(options)).findBySubject(claims.iss, claims.sub);
 	if (existingIdentity) {
 		const profile2 = await existingIdentity.getProfile();
@@ -148,7 +148,7 @@ async function provisionOidcProfile(claims, provider, options) {
 			created: false
 		};
 	}
-	const { ProfileCollection } = await import("./ProfileCollection-CMS9dFc0-DjuUyO1a.js").then((n) => n.r).then((n) => n.r);
+	const { ProfileCollection } = await import("./ProfileCollection-CmRaiE9U-Bz_8He8o.js").then((n) => n.r).then((n) => n.r);
 	const profileCollection = await ProfileCollection.create(options);
 	if (claims.email) {
 		if (await profileCollection.findUniqueGlobalPersonByEmail(claims.email)) {
@@ -175,8 +175,8 @@ async function provisionOidcProfile(claims, provider, options) {
 	};
 }
 async function rebindOidcProfileResult(result, rootDb) {
-	const { OidcIdentityCollection } = await import("./OidcIdentityCollection-s4mp3n62-BDTHgQQt.js").then((n) => n.r).then((n) => n.r);
-	const { ProfileCollection } = await import("./ProfileCollection-CMS9dFc0-DjuUyO1a.js").then((n) => n.r).then((n) => n.r);
+	const { OidcIdentityCollection } = await import("./OidcIdentityCollection-D4DIZv0K-glNIGyfG.js").then((n) => n.r).then((n) => n.r);
+	const { ProfileCollection } = await import("./ProfileCollection-CmRaiE9U-Bz_8He8o.js").then((n) => n.r).then((n) => n.r);
 	const profileId = requireOidcProfileId(result.profile.id);
 	const identityId = requireOidcProfileId(result.oidcIdentity.id);
 	const [profile, oidcIdentity] = await withSystemContext(async () => {
@@ -225,11 +225,11 @@ async function createProfileFromNostr(email, nostrData, options) {
 			created: false
 		};
 	}
-	const { Person } = await import("./oidcProvisioningPrimitives-Dl9qIcYS-CTF3hQeX.js").then((n) => n.r).then((n) => n.o);
-	const { ProfileTypeCollection } = await import("./ProfileTypeCollection-B7m698Bl-Dfp1YzXi.js").then((n) => n.n).then((n) => n.n);
+	const { Person } = await import("./oidcProvisioningPrimitives-KpIiLmG4-4hAwGsZT.js").then((n) => n.r).then((n) => n.o);
+	const { ProfileTypeCollection } = await import("./ProfileTypeCollection-BRLK8cHS-DYTDj03n.js").then((n) => n.n).then((n) => n.n);
 	let personType = await (await ProfileTypeCollection.create(options)).getBySlug("person");
 	if (!personType) {
-		const { ProfileType } = await import("./ProfileCollection-CMS9dFc0-DjuUyO1a.js").then((n) => n.r).then((n) => n.h);
+		const { ProfileType } = await import("./ProfileCollection-CmRaiE9U-Bz_8He8o.js").then((n) => n.r).then((n) => n.h);
 		personType = new ProfileType({
 			...options,
 			slug: "person",
@@ -266,4 +266,4 @@ async function createProfileFromNostr(email, nostrData, options) {
 	};
 }
 //#endregion
-export { resolveIdentity_CR5p_g7K_exports as t };
+export { resolveIdentity_j2WFuKDT_exports as t };

package/dist/{server-DEBTDsmH.js → server-D4xtz9_R.js}

@@ -1,4 +1,4 @@
-import { c as SMRT_SCOPE, l as loadRegistryManifest, r as cliVersion, s as validateCookbookText, t as createCookbookApplier, u as resolveRecipeIndex } from "./apply-D8dV3HUh.js";
+import { c as SMRT_SCOPE, l as loadRegistryManifest, r as cliVersion, s as validateCookbookText, t as createCookbookApplier, u as resolveRecipeIndex } from "./apply-C-lZnBtC.js";
 import { closeSync, existsSync, mkdirSync, openSync, readFileSync, readdirSync, renameSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
 import { dirname, isAbsolute, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@happyvertical/smrt-cli",
-  "version": "0.57.37",
+  "version": "0.57.39",
   "description": "Developer CLI for SMRT framework - introspection, testing, and project management",
   "type": "module",
   "main": "./dist/index.js",
@@ -30,20 +30,20 @@
     }
   },
   "dependencies": {
-    "@happyvertical/ai": "^0.110.0",
-    "@happyvertical/files": "^0.110.0",
-    "@happyvertical/logger": "^0.110.0",
-    "@happyvertical/smrt-agents": "0.57.37",
-    "@happyvertical/smrt-app-runtime": "0.57.37",
-    "@happyvertical/smrt-config": "0.57.37",
-    "@happyvertical/smrt-core": "0.57.37",
-    "@happyvertical/smrt-dev-mcp": "0.57.37",
-    "@happyvertical/smrt-ledgers": "0.57.37",
-    "@happyvertical/smrt-playground": "0.57.37",
-    "@happyvertical/smrt-types": "0.57.37",
-    "@happyvertical/smrt-users": "0.57.37",
-    "@happyvertical/sql": "^0.110.0",
-    "@happyvertical/utils": "^0.110.0",
+    "@happyvertical/ai": "^0.111.0",
+    "@happyvertical/files": "^0.111.0",
+    "@happyvertical/logger": "^0.111.0",
+    "@happyvertical/smrt-agents": "0.57.39",
+    "@happyvertical/smrt-app-runtime": "0.57.39",
+    "@happyvertical/smrt-config": "0.57.39",
+    "@happyvertical/smrt-core": "0.57.39",
+    "@happyvertical/smrt-dev-mcp": "0.57.39",
+    "@happyvertical/smrt-ledgers": "0.57.39",
+    "@happyvertical/smrt-playground": "0.57.39",
+    "@happyvertical/smrt-types": "0.57.39",
+    "@happyvertical/smrt-users": "0.57.39",
+    "@happyvertical/sql": "^0.111.0",
+    "@happyvertical/utils": "^0.111.0",
     "@modelcontextprotocol/server": "2.3.1",
     "acorn": "^8.18.0",
     "ajv": "8.20.0",