@tankpkg/cli 0.15.3 → 0.15.5

package/dist/bin/tank.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as VERSION, i as USER_AGENT, l as setConfig, n as flushLogs, o as getConfig, s as getConfigDir, t as authFlowLog } from "../debug-logger-DcMV-j0P.js";
+import { a as VERSION, i as USER_AGENT, l as setConfig, n as flushLogs, o as getConfig, s as getConfigDir, t as authFlowLog } from "../debug-logger-BjqA9j5b.js";
 import { t as logger } from "../logger-BhULz3Uz.js";
 import { createRequire } from "node:module";
 import { Command } from "commander";
@@ -8856,6 +8856,28 @@ function mkdirSafeNoSymlinks(targetDir) {
 		} else fs.mkdirSync(current);
 	}
 }
+function isDirNonEmpty(dir) {
+	try {
+		return fs.readdirSync(dir).length > 0;
+	} catch {
+		return false;
+	}
+}
+function moveEntryAcrossDevices(src, dst) {
+	try {
+		fs.renameSync(src, dst);
+	} catch (err) {
+		if (err.code === "EXDEV") {
+			fs.cpSync(src, dst, { recursive: true });
+			fs.rmSync(src, {
+				recursive: true,
+				force: true
+			});
+			return;
+		}
+		throw err;
+	}
+}
 async function extractSafely(tarball, destDir) {
 	if (tarball.length > MAX_DOWNLOAD_BYTES) throw new TankIntegrityError(`Tarball exceeds ${MAX_DOWNLOAD_BYTES} byte limit`);
 	const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "tank-extract-"));
@@ -8863,6 +8885,7 @@ async function extractSafely(tarball, destDir) {
 	fs.writeFileSync(tmpTarball, tarball, { flag: "wx" });
 	let entryCount = 0;
 	let totalBytes = 0;
+	let backupDir = null;
 	try {
 		await extract({
 			file: tmpTarball,
@@ -8882,22 +8905,31 @@ async function extractSafely(tarball, destDir) {
 			}
 		});
 		mkdirSafeNoSymlinks(destDir);
+		if (isDirNonEmpty(destDir)) {
+			backupDir = `${destDir}.tank-old-${crypto$1.randomUUID()}`;
+			fs.renameSync(destDir, backupDir);
+			mkdirSafeNoSymlinks(destDir);
+		}
 		for (const entry of fs.readdirSync(tmpDir)) {
 			if (entry === path.basename(tmpTarball)) continue;
-			const src = path.join(tmpDir, entry);
-			const dst = path.join(destDir, entry);
-			try {
-				fs.renameSync(src, dst);
-			} catch (err) {
-				if (err.code === "EXDEV") {
-					fs.cpSync(src, dst, { recursive: true });
-					fs.rmSync(src, {
-						recursive: true,
-						force: true
-					});
-				} else throw err;
-			}
+			moveEntryAcrossDevices(path.join(tmpDir, entry), path.join(destDir, entry));
 		}
+		if (backupDir !== null) {
+			fs.rmSync(backupDir, {
+				recursive: true,
+				force: true
+			});
+			backupDir = null;
+		}
+	} catch (err) {
+		if (backupDir !== null && fs.existsSync(backupDir)) try {
+			fs.rmSync(destDir, {
+				recursive: true,
+				force: true
+			});
+			fs.renameSync(backupDir, destDir);
+		} catch {}
+		throw err;
 	} finally {
 		fs.rmSync(tmpDir, {
 			recursive: true,
@@ -11900,7 +11932,11 @@ program.command("install").alias("i").description("Install a skill from the Tank
 		process.exit(1);
 	}
 });
-program.command("remove").aliases(["rm", "r"]).description("Remove an installed skill").argument("<name>", "Skill name (e.g., @org/skill-name)").option("-g, --global", "Remove a globally installed skill").action(async (name, opts) => {
+program.command("remove").aliases([
+	"rm",
+	"r",
+	"uninstall"
+]).description("Remove an installed skill").argument("<name>", "Skill name (e.g., @org/skill-name)").option("-g, --global", "Remove a globally installed skill").action(async (name, opts) => {
 	try {
 		await removeCommand({
 			name,