@rrlab/cli 0.0.3-git-aeeb52d.0 → 0.0.3

package/dist/cli.usage.kdl

@@ -1,7 +1,7 @@
 // @generated by @usage-spec/commander from Commander.js metadata
 name rr
 bin rr
-version "0.0.3-git-aeeb52d.0"
+version "0.0.3"
 usage "<command...> [options...]"
 flag --usage help="print KDL spec for this CLI (https://kdl.dev)"
 cmd completion help="print shell completion script (usage)" {

package/dist/run.mjs

@@ -863,7 +863,7 @@ async function runAdd(ctx, name, opts) {
 	const ast = new ConfigAstService();
 	const loaded = await ast.load(ctx.appPkg.dirPath);
 	const inConfig = !loaded.isNew && ast.hasPlugin(loaded.mod, exportName);
-	if (inPkg && inConfig && !opts.force) {
+	if (inPkg && inConfig && !opts.force && !spec) {
 		clack.log.warn(`${pkgName} is already installed and configured. Use --force to re-run install.`);
 		clack.outro("Nothing to do.");
 		return;
@@ -872,8 +872,10 @@ async function runAdd(ctx, name, opts) {
 	const wsChoice = resolveWorkspaceChoice(ctx.appPkg, pm);
 	const workspace = toNypmWorkspace(wsChoice);
 	const targetLabel = describeWorkspaceChoice(wsChoice);
+	const willInstall = !inPkg || !!spec;
 	if (opts.dryRun) {
-		clack.log.info(`Would: install ${installSpec} as a devDependency in ${targetLabel}${inPkg ? " (already present, skipped)" : ""}.`);
+		const presence = willInstall ? inPkg ? " (already present, will be updated to this spec)" : "" : " (already present, skipped)";
+		clack.log.info(`Would: install ${installSpec} as a devDependency in ${targetLabel}${presence}.`);
 		if (!inConfig) {
 			const rel = path.relative(ctx.appPkg.dirPath, loaded.filepath) || loaded.filepath;
 			clack.log.info(`Would: add ${exportName}() to ${rel} (plugins[]).`);
@@ -883,7 +885,7 @@ async function runAdd(ctx, name, opts) {
 		return;
 	}
 	let installedNow = false;
-	if (!inPkg) {
+	if (willInstall) {
 		await withSpinner(`Installing ${installSpec}`, async () => {
 			await addDependency([installSpec], {
 				cwd: ctx.appPkg.dirPath,
@@ -892,7 +894,7 @@ async function runAdd(ctx, name, opts) {
 				workspace
 			});
 		});
-		installedNow = true;
+		if (!inPkg) installedNow = true;
 	}
 	let installResult;
 	try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rrlab/cli",
-  "version": "0.0.3-git-aeeb52d.0",
+  "version": "0.0.3",
   "description": "The CLI toolbox to fullstack common scripts in Variable Land",
   "homepage": "https://github.com/variableland/dx/tree/main/run-run/cli#readme",
   "bugs": {
@@ -56,8 +56,8 @@
     "memoize": "10.2.0",
     "nypm": "0.6.0",
     "rimraf": "6.1.3",
-    "@vlandoss/clibuddy": "0.6.1",
-    "@vlandoss/loggy": "0.2.1"
+    "@vlandoss/loggy": "0.2.1",
+    "@vlandoss/clibuddy": "0.6.1"
   },
   "devDependencies": {
     "tsdown": "0.22.0",

package/src/program/commands/plugins.ts

@@ -93,7 +93,7 @@ async function runAdd(ctx: Context, name: string, opts: AddOptions) {
   const loaded = await ast.load(ctx.appPkg.dirPath);
   const inConfig = !loaded.isNew && ast.hasPlugin(loaded.mod, exportName);
 
-  if (inPkg && inConfig && !opts.force) {
+  if (inPkg && inConfig && !opts.force && !spec) {
     clack.log.warn(`${pkgName} is already installed and configured. Use --force to re-run install.`);
     clack.outro("Nothing to do.");
     return;
@@ -103,11 +103,16 @@ async function runAdd(ctx: Context, name: string, opts: AddOptions) {
   const wsChoice = resolveWorkspaceChoice(ctx.appPkg, pm);
   const workspace = toNypmWorkspace(wsChoice);
   const targetLabel = describeWorkspaceChoice(wsChoice);
+  // A spec means "(re)install at this spec" — upgrade even when the package is already in package.json.
+  const willInstall = !inPkg || !!spec;
 
   if (opts.dryRun) {
-    clack.log.info(
-      `Would: install ${installSpec} as a devDependency in ${targetLabel}${inPkg ? " (already present, skipped)" : ""}.`,
-    );
+    const presence = willInstall
+      ? inPkg
+        ? " (already present, will be updated to this spec)"
+        : ""
+      : " (already present, skipped)";
+    clack.log.info(`Would: install ${installSpec} as a devDependency in ${targetLabel}${presence}.`);
     if (!inConfig) {
       const rel = path.relative(ctx.appPkg.dirPath, loaded.filepath) || loaded.filepath;
       clack.log.info(`Would: add ${exportName}() to ${rel} (plugins[]).`);
@@ -118,11 +123,12 @@ async function runAdd(ctx: Context, name: string, opts: AddOptions) {
   }
 
   let installedNow = false;
-  if (!inPkg) {
+  if (willInstall) {
     await withSpinner(`Installing ${installSpec}`, async () => {
       await addDependency([installSpec], { cwd: ctx.appPkg.dirPath, dev: true, silent: true, workspace });
     });
-    installedNow = true;
+    // Only mark for rollback when this was a fresh install — a failed upgrade can't be safely reverted to the previous version.
+    if (!inPkg) installedNow = true;
   }
 
   let installResult: InstallResult | undefined;