@prisma/cli 8.0.0-rc.13-dev.95 → 8.0.0-rc.13-dev.96

package/dist/cli.js

@@ -9,7 +9,7 @@ import { AuthError, createManagementApiClient, createManagementApiSdk } from "@p
 import os from "node:os";
 import path from "node:path";
 import { randomBytes, randomUUID } from "node:crypto";
-import fs, { mkdir, readFile, readdir, rename, rm, stat, unlink, writeFile } from "node:fs/promises";
+import fs, { mkdir, readFile, readdir, rename, rm, rmdir, stat, unlink, writeFile } from "node:fs/promises";
 import { mkdir as mkdir$1, readFile as readFile$1, writeFile as writeFile$1 } from "fs/promises";
 import path$1 from "path";
 import events from "node:events";
@@ -2045,9 +2045,14 @@ async function hasPackageJsonWorkspaces(root) {
 }
 //#endregion
 //#region src/lib/skills/status.ts
+/** Reads every skill the installed source packages ship and the state
+*  of each copy in the configured agents' directories, plus the copies
+*  the next sync will remove. */
 async function readSkillsStatus(cwd, options) {
 	const projectRoot = path.resolve(cwd);
-	const dirs = agentSkillDirs(options?.agents ?? DEFAULT_AGENTS);
+	const agents = options?.agents ?? DEFAULT_AGENTS;
+	const dirs = agentSkillDirs(agents);
+	const unconfiguredDirs = agentSkillDirs(KNOWN_AGENTS.filter((agent) => !agents.includes(agent)));
 	const checkDisabled = options?.checkDisabled ?? await readSkillsCheckDisabled(projectRoot);
 	const packages = await findInstalledSourcePackages(projectRoot);
 	const sources = await collectSkillSources(packages);
@@ -2059,7 +2064,7 @@ async function readSkillsStatus(cwd, options) {
 		checkDisabled,
 		packages,
 		skills,
-		orphans: options?.orphans === false ? [] : await findOrphanedSkills(projectRoot, dirs, new Set(sources.keys())),
+		orphans: options?.orphans === false ? [] : await findOrphanedSkills(projectRoot, dirs, new Set(sources.keys()), unconfiguredDirs),
 		upToDate: skills.every((skill) => skill.upToDate)
 	};
 }
@@ -2145,16 +2150,25 @@ async function missingFromDisk(target) {
 }
 /**
 * Copies in the harness directories that this CLI installed — their
-* SKILL.md names an allowlisted package as its `library` — and that no
-* installed package still provides. A skill from anywhere else is
-* someone else's file and is never touched.
+* SKILL.md names an allowlisted package as its `library` — and that
+* nothing wants any more: in a configured directory, one no installed
+* package still provides; in the directory of an agent the config no
+* longer names, every one. A skill from anywhere else is someone
+* else's file and is never touched.
 */
-async function findOrphanedSkills(projectRoot, dirs, provided) {
+async function findOrphanedSkills(projectRoot, dirs, provided, unconfiguredDirs = []) {
 	const orphans = /* @__PURE__ */ new Map();
-	for (const dir of dirs) {
+	const scan = [...dirs.map((dir) => ({
+		dir,
+		wanted: provided
+	})), ...unconfiguredDirs.map((dir) => ({
+		dir,
+		wanted: /* @__PURE__ */ new Set()
+	}))];
+	for (const { dir, wanted } of scan) {
 		const harnessDir = path.join(projectRoot, dir);
 		for (const skill of await skillDirectories(harnessDir)) {
-			if (provided.has(skill)) continue;
+			if (wanted.has(skill)) continue;
 			const stamp = await readSkillStamp(path.join(harnessDir, skill, "SKILL.md"));
 			if (stamp?.library === null || stamp === null) continue;
 			if (!isSkillSourcePackage(stamp.library)) continue;
@@ -5527,11 +5541,12 @@ const gitDisconnectCommand = defineCommand({
 //#region src/lib/skills/sync.ts
 /**
 * Brings the harness skill directories in line with the installed
-* source packages: copies each skill tree whose stamp does not match
-* the package it came from, and removes copies whose source package is
-* gone. A target directory that exists but is not this CLI's copy is
-* refused, never replaced. Doing nothing is the normal outcome and is
-* not an error.
+* source packages and the configured agents: copies each skill tree
+* whose stamp does not match the package it came from, and removes
+* copies whose source package is gone or whose agent the config no
+* longer names. A target directory that exists but is not this CLI's
+* copy is refused, never replaced. Doing nothing is the normal outcome
+* and is not an error.
 */
 async function syncSkills(status) {
 	const synced = [];
@@ -5555,10 +5570,13 @@ async function syncSkills(status) {
 	}
 	const pruned = [];
 	for (const orphan of status.orphans) {
-		for (const dir of orphan.dirs) await rm(path.join(status.projectRoot, dir, orphan.skill), {
-			recursive: true,
-			force: true
-		});
+		for (const dir of orphan.dirs) {
+			await rm(path.join(status.projectRoot, dir, orphan.skill), {
+				recursive: true,
+				force: true
+			});
+			await removeEmptyHarnessDirs(status.projectRoot, dir);
+		}
 		pruned.push({
 			skill: orphan.skill,
 			library: orphan.library,
@@ -5575,6 +5593,20 @@ async function syncSkills(status) {
 		checkDisabled: status.checkDisabled
 	};
 }
+/**
+* A harness directory this CLI emptied by removing its last copy is
+* removed too, and so is its parent (`.claude/skills`, then `.claude`),
+* so opting an agent out leaves nothing behind. `rmdir` refuses a
+* directory holding anything else, which is exactly the user's file
+* that must stay.
+*/
+async function removeEmptyHarnessDirs(projectRoot, dir) {
+	for (let current = dir; current !== "." && current !== ""; current = path.dirname(current)) try {
+		await rmdir(path.join(projectRoot, current));
+	} catch {
+		return;
+	}
+}
 const OLD_CLI_GITIGNORE = /^\*\r?\n?$/;
 async function removeOldCliGitignore(file) {
 	let content;
@@ -5778,7 +5810,7 @@ function bothSwitchesError() {
 const skillsSyncCommand = defineCommand({
 	help: {
 		summary: "Copy the AI-agent instruction files (skills) from installed Prisma packages into this project",
-		description: "Agent skills are instruction files that teach AI coding agents (Claude Code, Cursor, and others) how to use the installed Prisma packages. They ship inside the packages themselves, so they always describe the version in use. Sync copies them into the skill directories the agent harnesses read, and removes copies whose package is gone. It does nothing, and exits 0, when everything is already current.",
+		description: "Agent skills are instruction files that teach AI coding agents (Claude Code, Cursor, and others) how to use the installed Prisma packages. They ship inside the packages themselves, so they always describe the version in use. Sync copies them into the skill directories of the agents that skills.agents in prisma.config.ts names (every known agent when unset), and removes copies whose package is gone or whose agent is no longer named there — agents: [] removes them all. It does nothing, and exits 0, when everything is already current.",
 		examples: ["skills sync", "skills sync --disable"]
 	},
 	needs: { config: skillsConfigSection },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli",
-  "version": "8.0.0-rc.13-dev.95",
+  "version": "8.0.0-rc.13-dev.96",
   "description": "Command-line interface for the Prisma Developer Platform.",
   "type": "module",
   "bin": {
@@ -41,10 +41,10 @@
   "dependencies": {
     "@manypkg/tools": "^2.1.2",
     "@prisma/cli-engine": "0.3.0",
-    "@prisma/composer-cli": "0.17.0-dev.2",
+    "@prisma/composer-cli": "0.17.0-dev.4",
     "@prisma/compute-sdk": "0.42.0",
     "@prisma/management-api-sdk": "1.69.0",
-    "@prisma/orm-toolchain": "8.0.0-rc.9-dev.1",
+    "@prisma/orm-toolchain": "8.0.0-rc.9-dev.2",
     "@vercel/detect-agent": "^1.2.3",
     "better-result": "^2.9.2",
     "cross-spawn": "^7.0.6",
@@ -53,11 +53,11 @@
     "open": "^11.0.0"
   },
   "devDependencies": {
-    "@prisma/composer": "0.17.0-dev.2",
+    "@prisma/composer": "0.17.0-dev.4",
     "@prisma/credentials-store": "^7.8.0",
-    "@repo/cli-conformance": "8.0.0-rc.13-dev.95",
-    "@repo/cli-telemetry": "8.0.0-rc.13-dev.95",
-    "@repo/tsconfig": "8.0.0-rc.13-dev.95",
+    "@repo/cli-conformance": "8.0.0-rc.13-dev.96",
+    "@repo/cli-telemetry": "8.0.0-rc.13-dev.96",
+    "@repo/tsconfig": "8.0.0-rc.13-dev.96",
     "@types/node": "^22.19.19",
     "@types/cross-spawn": "^6.0.6",
     "tsdown": "^0.21.10",