runwork 0.19.1 → 0.20.0

package/dist/index.js

@@ -853,6 +853,28 @@ var init_client = __esm(() => {
   init_http();
 });
 
+// src/utils/atomic-json.ts
+import { existsSync, mkdirSync, readFileSync as readFileSync2, renameSync, writeFileSync } from "fs";
+import { dirname } from "path";
+function writeJsonAtomic(path, value, opts = {}) {
+  mkdirSync(dirname(path), { recursive: true });
+  const json = JSON.stringify(value, null, 2);
+  const tmpPath = `${path}.${process.pid}.tmp`;
+  writeFileSync(tmpPath, json, opts.mode !== undefined ? { mode: opts.mode } : {});
+  renameSync(tmpPath, path);
+}
+function readJsonOrNull(path) {
+  if (!existsSync(path))
+    return null;
+  try {
+    const parsed = JSON.parse(readFileSync2(path, "utf-8"));
+    return parsed && typeof parsed === "object" ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+var init_atomic_json = () => {};
+
 // src/auth/store.ts
 var exports_store = {};
 __export(exports_store, {
@@ -861,7 +883,7 @@ __export(exports_store, {
   getCredentials: () => getCredentials,
   clearCredentials: () => clearCredentials
 });
-import { readFileSync as readFileSync2, writeFileSync, mkdirSync, existsSync, unlinkSync } from "fs";
+import { readFileSync as readFileSync3, existsSync as existsSync2, unlinkSync } from "fs";
 import { join as join2 } from "path";
 import { homedir } from "os";
 function getCredentials() {
@@ -880,21 +902,20 @@ function getCredentials() {
       defaultWorkspaceName: undefined
     };
   }
-  if (!existsSync(CREDENTIALS_FILE))
+  if (!existsSync2(CREDENTIALS_FILE))
     return null;
   try {
-    const raw = readFileSync2(CREDENTIALS_FILE, "utf-8");
+    const raw = readFileSync3(CREDENTIALS_FILE, "utf-8");
     return JSON.parse(raw);
   } catch {
     return null;
   }
 }
 function saveCredentials(credentials) {
-  mkdirSync(RUNWORK_DIR, { recursive: true });
-  writeFileSync(CREDENTIALS_FILE, JSON.stringify(credentials, null, 2), { mode: 384 });
+  writeJsonAtomic(CREDENTIALS_FILE, credentials, { mode: 384 });
 }
 function clearCredentials() {
-  if (existsSync(CREDENTIALS_FILE)) {
+  if (existsSync2(CREDENTIALS_FILE)) {
     unlinkSync(CREDENTIALS_FILE);
   }
 }
@@ -917,6 +938,7 @@ function requireAuth() {
 }
 var RUNWORK_DIR, CREDENTIALS_FILE;
 var init_store = __esm(() => {
+  init_atomic_json();
   RUNWORK_DIR = join2(homedir(), ".runwork");
   CREDENTIALS_FILE = join2(RUNWORK_DIR, ".credentials");
 });
@@ -934,7 +956,7 @@ var execFileSync = (file, args, options) => {
 var init_subprocess = () => {};
 
 // src/git/credentials.ts
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync3 } from "fs";
 function buildHelperValue(execPath, scriptPath) {
   const normalised = execPath.replace(/\\/g, "/");
   const runtimeName = normalised.split("/").pop()?.toLowerCase() ?? "";
@@ -1015,7 +1037,7 @@ function helperBinaryStatus(value) {
   const helperPath = pathMatch?.[1] ?? pathMatch?.[2] ?? "";
   if (!helperPath)
     return { ok: true, path: null };
-  return { ok: existsSync2(helperPath), path: helperPath };
+  return { ok: existsSync3(helperPath), path: helperPath };
 }
 async function ensureGitCredentialHelper(baseUrl) {
   let origin;
@@ -1291,7 +1313,7 @@ var init_identity = __esm(() => {
 });
 
 // src/git/preflight.ts
-import { existsSync as existsSync3 } from "fs";
+import { existsSync as existsSync4 } from "fs";
 import { win32 as winPath } from "path";
 import { homedir as homedir2 } from "os";
 function tryRun(bin) {
@@ -1313,9 +1335,9 @@ function whereGit() {
     const out = buf.toString("utf-8");
     const lines = out.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
     const exe = lines.find((line) => /\.exe$/i.test(line));
-    if (exe && existsSync3(exe))
+    if (exe && existsSync4(exe))
       return exe;
-    const fallback = lines.find((line) => existsSync3(line));
+    const fallback = lines.find((line) => existsSync4(line));
     return fallback ?? null;
   } catch {
     return null;
@@ -1340,7 +1362,7 @@ function registryGit() {
         continue;
       const installRoot = match[1].trim();
       const gitExe = winPath.join(installRoot, "cmd", "git.exe");
-      if (existsSync3(gitExe))
+      if (existsSync4(gitExe))
         return gitExe;
     } catch {}
   }
@@ -1408,7 +1430,7 @@ function probeGit() {
       }
     }
     for (const candidate of canonicalGitCandidates()) {
-      if (!existsSync3(candidate))
+      if (!existsSync4(candidate))
         continue;
       const verify = tryRun(candidate);
       if (verify.ok) {
@@ -1547,7 +1569,7 @@ async function resolveApp(client, nameOrId, workspaceId) {
 }
 
 // src/utils/ignore-matcher.ts
-import { existsSync as existsSync4, readFileSync as readFileSync3 } from "fs";
+import { existsSync as existsSync5, readFileSync as readFileSync4 } from "fs";
 import { basename, join as join3 } from "path";
 function defaultIgnoreSets() {
   return {
@@ -1589,10 +1611,10 @@ function parseGitignoreContent(content) {
 }
 function loadGitignoreFromDir(dir) {
   const path = join3(dir, ".gitignore");
-  if (!existsSync4(path))
+  if (!existsSync5(path))
     return { dirs: new Set, files: new Set };
   try {
-    return parseGitignoreContent(readFileSync3(path, "utf-8"));
+    return parseGitignoreContent(readFileSync4(path, "utf-8"));
   } catch {
     return { dirs: new Set, files: new Set };
   }
@@ -1648,7 +1670,7 @@ var init_ignore_matcher = __esm(() => {
 
 // src/template/manifest.ts
 import { createHash } from "crypto";
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync2, existsSync as existsSync5, readdirSync, mkdirSync as mkdirSync2 } from "fs";
+import { readFileSync as readFileSync5, writeFileSync as writeFileSync2, existsSync as existsSync6, readdirSync, mkdirSync as mkdirSync2 } from "fs";
 import { join as join4, relative, sep } from "path";
 function sha256(data) {
   return "sha256:" + createHash("sha256").update(data).digest("hex");
@@ -1680,24 +1702,24 @@ async function generateManifest(dir) {
   const sets = buildIgnoreSets(dir);
   const allFiles = walkDir(dir, dir, sets);
   for (const relPath of allFiles) {
-    const content = readFileSync4(join4(dir, relPath));
+    const content = readFileSync5(join4(dir, relPath));
     files[relPath] = sha256(content);
   }
   return { version: 1, files };
 }
 async function saveManifest(dir, manifest) {
   const manifestDir = join4(dir, ".runwork");
-  if (!existsSync5(manifestDir)) {
+  if (!existsSync6(manifestDir)) {
     mkdirSync2(manifestDir, { recursive: true });
   }
   writeFileSync2(join4(manifestDir, "template-manifest.json"), JSON.stringify(manifest, null, 2));
 }
 async function loadManifest(dir) {
   const manifestPath = join4(dir, ".runwork", "template-manifest.json");
-  if (!existsSync5(manifestPath))
+  if (!existsSync6(manifestPath))
     return null;
   try {
-    const manifest = JSON.parse(readFileSync4(manifestPath, "utf-8"));
+    const manifest = JSON.parse(readFileSync5(manifestPath, "utf-8"));
     const files = {};
     for (const [relPath, hash] of Object.entries(manifest.files)) {
       files[relPath.split("\\").join("/")] = hash;
@@ -1730,7 +1752,7 @@ async function detectUserEdits(dir, manifest) {
         continue;
       const expectedHash = manifest.files[relPath];
       if (expectedHash) {
-        const content = readFileSync4(join4(dir, relPath));
+        const content = readFileSync5(join4(dir, relPath));
         if (sha256(content) === expectedHash)
           continue;
       }
@@ -1754,7 +1776,7 @@ async function detectUserEdits(dir, manifest) {
       continue;
     const filePath = join4(dir, relPath);
     try {
-      const content = readFileSync4(filePath);
+      const content = readFileSync5(filePath);
       if (sha256(content) !== expectedHash) {
         edits.push(relPath);
       }
@@ -1768,8 +1790,8 @@ var init_manifest = __esm(() => {
 });
 
 // src/utils/zip.ts
-import { mkdirSync as mkdirSync3, readdirSync as readdirSync2, readFileSync as readFileSync5, statSync, writeFileSync as writeFileSync3 } from "fs";
-import { join as join5, dirname, relative as relative2, sep as sep2 } from "path";
+import { mkdirSync as mkdirSync3, readdirSync as readdirSync2, readFileSync as readFileSync6, statSync, writeFileSync as writeFileSync3 } from "fs";
+import { join as join5, dirname as dirname2, relative as relative2, sep as sep2 } from "path";
 import { unzipSync, zipSync } from "fflate";
 function ensureDirSync(dir) {
   try {
@@ -1787,7 +1809,7 @@ function extractZip(zipData, targetDir) {
       ensureDirSync(fullPath);
       continue;
     }
-    ensureDirSync(dirname(fullPath));
+    ensureDirSync(dirname2(fullPath));
     writeFileSync3(fullPath, data);
   }
 }
@@ -1801,13 +1823,13 @@ function createZipFromDir(sourceDir, outputPath) {
         walk(absPath);
       } else if (stats.isFile()) {
         const relPath = relative2(sourceDir, absPath).split(sep2).join("/");
-        files[relPath] = readFileSync5(absPath);
+        files[relPath] = readFileSync6(absPath);
       }
     }
   };
   walk(sourceDir);
   const zipped = zipSync(files);
-  ensureDirSync(dirname(outputPath));
+  ensureDirSync(dirname2(outputPath));
   writeFileSync3(outputPath, zipped);
 }
 var init_zip = () => {};
@@ -2103,18 +2125,18 @@ __export(exports_init, {
   DEFAULT_APPS_DIR: () => DEFAULT_APPS_DIR
 });
 import { Command as Command2 } from "commander";
-import { writeFileSync as writeFileSync4, existsSync as existsSync6, mkdirSync as mkdirSync4 } from "fs";
+import { writeFileSync as writeFileSync4, existsSync as existsSync7, mkdirSync as mkdirSync4 } from "fs";
 import { join as join7, resolve } from "path";
 import { homedir as homedir4 } from "os";
 async function execInit(client, appName, workspace, options = {}, creds) {
   const app = await client.initApp(workspace.id, appName);
   const slug = app.slug || appName.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
   const parentDir = options.here ? process.cwd() : DEFAULT_APPS_DIR;
-  if (!options.here && !existsSync6(parentDir)) {
+  if (!options.here && !existsSync7(parentDir)) {
     mkdirSync4(parentDir, { recursive: true });
   }
   const dir = join7(parentDir, slug);
-  if (existsSync6(dir)) {
+  if (existsSync7(dir)) {
     console.error(`Directory "${dir}" already exists.`);
     process.exit(1);
   }
@@ -2141,7 +2163,7 @@ async function execInit(client, appName, workspace, options = {}, creds) {
     appName: app.name
   };
   writeFileSync4(join7(dir, ".runwork.json"), JSON.stringify(config, null, 2));
-  if (!existsSync6(join7(dir, ".git"))) {
+  if (!existsSync7(join7(dir, ".git"))) {
     try {
       execFileSync("git", ["init"], { cwd: dir, stdio: "pipe" });
     } catch (err) {
@@ -2159,7 +2181,7 @@ async function execInit(client, appName, workspace, options = {}, creds) {
   } catch {
     execFileSync("git", ["remote", "set-url", "runwork", remoteUrl], { cwd: dir, stdio: "pipe" });
   }
-  if (!existsSync6(join7(dir, ".gitignore"))) {
+  if (!existsSync7(join7(dir, ".gitignore"))) {
     writeFileSync4(join7(dir, ".gitignore"), `node_modules/
 .runwork/
 .dev.vars
@@ -2412,7 +2434,7 @@ __export(exports_clone, {
   RESTRICTED_FS_HELP: () => RESTRICTED_FS_HELP
 });
 import { Command as Command3 } from "commander";
-import { writeFileSync as writeFileSync5, mkdirSync as mkdirSync5, existsSync as existsSync7 } from "fs";
+import { writeFileSync as writeFileSync5, mkdirSync as mkdirSync5, existsSync as existsSync8 } from "fs";
 import { join as join8, resolve as resolve2 } from "path";
 async function execClone(client, app, directory, creds) {
   const slug = app.slug || app.name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
@@ -2430,7 +2452,7 @@ async function execClone(client, app, directory, creds) {
   }
   const manifest = await generateManifest(dir);
   await saveManifest(dir, manifest);
-  if (!existsSync7(join8(dir, ".git"))) {
+  if (!existsSync8(join8(dir, ".git"))) {
     try {
       execFileSync("git", ["init"], { cwd: dir, stdio: "pipe" });
     } catch (err) {
@@ -2603,7 +2625,7 @@ App "${cloneResult.appName}" cloned to ${cloneResult.directory}`);
 });
 
 // src/git/auto-commit.ts
-import { readFileSync as readFileSync6 } from "fs";
+import { readFileSync as readFileSync7 } from "fs";
 import { watch } from "chokidar";
 import { join as join9, relative as relative4 } from "path";
 async function watchAndAutoCommit(directory, client, appId, callbacks) {
@@ -2665,7 +2687,7 @@ async function executeFastSync(directory, client, appId) {
       if (BINARY_EXTENSIONS.has(ext.toLowerCase()))
         continue;
       try {
-        const contents = readFileSync6(join9(directory, filePath), "utf-8");
+        const contents = readFileSync7(join9(directory, filePath), "utf-8");
         files.push({ filePath, fileContents: contents });
       } catch {}
     }
@@ -2959,16 +2981,16 @@ var init_sync = __esm(() => {
 });
 
 // src/git/critical-files.ts
-import { readFileSync as readFileSync7, writeFileSync as writeFileSync6, existsSync as existsSync8 } from "fs";
+import { readFileSync as readFileSync8, writeFileSync as writeFileSync6, existsSync as existsSync9 } from "fs";
 import { join as join11 } from "path";
 function snapshotCriticalFiles(cwd) {
   const snapshots = [];
   for (const rel of CRITICAL_FILES) {
     const abs = join11(cwd, rel);
-    if (!existsSync8(abs))
+    if (!existsSync9(abs))
       continue;
     try {
-      snapshots.push({ path: rel, contents: readFileSync7(abs, "utf-8") });
+      snapshots.push({ path: rel, contents: readFileSync8(abs, "utf-8") });
     } catch {}
   }
   return snapshots;
@@ -2977,7 +2999,7 @@ function restoreMissingCriticalFiles(cwd, snapshots) {
   const restored = [];
   for (const snap of snapshots) {
     const abs = join11(cwd, snap.path);
-    if (existsSync8(abs))
+    if (existsSync9(abs))
       continue;
     try {
       writeFileSync6(abs, snap.contents, "utf-8");
@@ -3020,7 +3042,7 @@ function buildStartupSyncSummary(input) {
 
 // src/logs/tailer.ts
 import { appendFileSync, mkdirSync as mkdirSync6, writeFileSync as writeFileSync7 } from "fs";
-import { join as join12, dirname as dirname2 } from "path";
+import { join as join12, dirname as dirname3 } from "path";
 function formatTime() {
   const now = new Date;
   return [
@@ -3070,7 +3092,7 @@ function startLogTailer(options) {
   } = options;
   const logFilePath = join12(projectDir, LOG_FILE);
   if (toFile) {
-    mkdirSync6(dirname2(logFilePath), { recursive: true });
+    mkdirSync6(dirname3(logFilePath), { recursive: true });
     writeFileSync7(logFilePath, `# Runwork dev logs - started ${new Date().toISOString()}
 
 `, "utf-8");
@@ -7480,13 +7502,13 @@ export {};
 });
 
 // src/types-manager.ts
-import { existsSync as existsSync13, mkdirSync as mkdirSync9, readdirSync as readdirSync4, copyFileSync, writeFileSync as writeFileSync9 } from "fs";
+import { existsSync as existsSync14, mkdirSync as mkdirSync9, readdirSync as readdirSync4, copyFileSync, writeFileSync as writeFileSync9 } from "fs";
 import { join as join14 } from "path";
 async function populateTypes(projectDir) {
   const typesDir = join14(projectDir, TYPES_DIR);
   mkdirSync9(typesDir, { recursive: true });
   const frameworkDist = join14(projectDir, "node_modules/@runworkai/framework/dist");
-  if (existsSync13(frameworkDist)) {
+  if (existsSync14(frameworkDist)) {
     copyDtsFiles(frameworkDist, typesDir);
     console.log("Types populated from node_modules/@runworkai/framework");
     return;
@@ -7623,7 +7645,7 @@ function createKeyboardListener() {
 }
 
 // src/generated/version.ts
-var VERSION = "0.19.1";
+var VERSION = "0.20.0";
 
 // src/commands/dev.ts
 var exports_dev = {};
@@ -7632,7 +7654,7 @@ __export(exports_dev, {
   devCommand: () => devCommand
 });
 import { Command as Command4, Option } from "commander";
-import { readFileSync as readFileSync11, writeFileSync as writeFileSync10, existsSync as existsSync14 } from "fs";
+import { readFileSync as readFileSync12, writeFileSync as writeFileSync10, existsSync as existsSync15 } from "fs";
 import { join as join15 } from "path";
 async function populateSkill(projectDir, client, appId) {
   try {
@@ -7643,11 +7665,11 @@ async function populateSkill(projectDir, client, appId) {
   } catch {}
 }
 function readConfig() {
-  if (!existsSync14(".runwork.json")) {
+  if (!existsSync15(".runwork.json")) {
     console.error("No .runwork.json found. Run `runwork init` first.");
     process.exit(1);
   }
-  return JSON.parse(readFileSync11(".runwork.json", "utf-8"));
+  return JSON.parse(readFileSync12(".runwork.json", "utf-8"));
 }
 async function execDev(options) {
   const useJson = options?.json ?? false;
@@ -8527,7 +8549,7 @@ var exports_welcome = {};
 __export(exports_welcome, {
   runWelcomeWizard: () => runWelcomeWizard
 });
-import { basename as basename3 } from "path";
+import { basename as basename4 } from "path";
 async function runWelcomeWizard() {
   console.log(getWelcomeBanner());
   let creds = getCredentials();
@@ -8593,7 +8615,7 @@ async function runWelcomeWizard() {
     const { execDev: execDev2 } = await Promise.resolve().then(() => (init_dev(), exports_dev));
     await execDev2();
   } else {
-    const slug = basename3(appDir) || appDir;
+    const slug = basename4(appDir) || appDir;
     console.log("");
     console.log(`Next: ${cyan(`cd ${slug} && runwork dev`)}`);
   }
@@ -8608,7 +8630,7 @@ var init_welcome = __esm(() => {
 });
 
 // src/index.ts
-import { Command as Command36 } from "commander";
+import { Command as Command37 } from "commander";
 
 // src/commands/login.ts
 init_login_flow();
@@ -8655,12 +8677,12 @@ init_store();
 init_client();
 init_colors();
 import { Command as Command5, Option as Option2 } from "commander";
-import { readFileSync as readFileSync14, existsSync as existsSync17 } from "fs";
+import { readFileSync as readFileSync15, existsSync as existsSync18 } from "fs";
 
 // src/deploy/deploy-state.ts
 init_subprocess();
-import { existsSync as existsSync15, mkdirSync as mkdirSync10, readFileSync as readFileSync12, writeFileSync as writeFileSync11 } from "fs";
-import { dirname as dirname3, join as join16 } from "path";
+import { existsSync as existsSync16, mkdirSync as mkdirSync10, readFileSync as readFileSync13, writeFileSync as writeFileSync11 } from "fs";
+import { dirname as dirname4, join as join16 } from "path";
 function deployStatePath(cwd) {
   return join16(cwd, ".runwork", "last-deploy.json");
 }
@@ -8674,17 +8696,17 @@ function getHeadSha(cwd) {
 function writeDeployState(cwd, state) {
   const path2 = deployStatePath(cwd);
   try {
-    if (!existsSync15(dirname3(path2)))
-      mkdirSync10(dirname3(path2), { recursive: true });
+    if (!existsSync16(dirname4(path2)))
+      mkdirSync10(dirname4(path2), { recursive: true });
     writeFileSync11(path2, JSON.stringify(state, null, 2));
   } catch {}
 }
 function readDeployState(cwd) {
   const path2 = deployStatePath(cwd);
-  if (!existsSync15(path2))
+  if (!existsSync16(path2))
     return null;
   try {
-    const parsed = JSON.parse(readFileSync12(path2, "utf-8"));
+    const parsed = JSON.parse(readFileSync13(path2, "utf-8"));
     if (typeof parsed.sha === "string" && typeof parsed.deployedAt === "string") {
       return { sha: parsed.sha, deployedAt: parsed.deployedAt, url: parsed.url ?? "" };
     }
@@ -8712,8 +8734,8 @@ function getDeploySummary(cwd) {
 
 // src/deploy/deploy-status.ts
 init_session();
-import { existsSync as existsSync16, mkdirSync as mkdirSync11, readFileSync as readFileSync13, writeFileSync as writeFileSync12 } from "fs";
-import { dirname as dirname4, join as join17 } from "path";
+import { existsSync as existsSync17, mkdirSync as mkdirSync11, readFileSync as readFileSync14, writeFileSync as writeFileSync12 } from "fs";
+import { dirname as dirname5, join as join17 } from "path";
 function evaluateDeployStatus(status, deps = {}) {
   if (status.state !== "in-progress") {
     return { status, effectiveState: status.state };
@@ -8737,17 +8759,17 @@ function deployLogPath(cwd) {
 function writeDeployStatus(cwd, status) {
   const path2 = statusPath(cwd);
   try {
-    if (!existsSync16(dirname4(path2)))
-      mkdirSync11(dirname4(path2), { recursive: true });
+    if (!existsSync17(dirname5(path2)))
+      mkdirSync11(dirname5(path2), { recursive: true });
     writeFileSync12(path2, JSON.stringify(status, null, 2));
   } catch {}
 }
 function readDeployStatus(cwd) {
   const path2 = statusPath(cwd);
-  if (!existsSync16(path2))
+  if (!existsSync17(path2))
     return null;
   try {
-    const parsed = JSON.parse(readFileSync13(path2, "utf-8"));
+    const parsed = JSON.parse(readFileSync14(path2, "utf-8"));
     if ((parsed.state === "in-progress" || parsed.state === "succeeded" || parsed.state === "failed") && typeof parsed.startedAt === "string") {
       return parsed;
     }
@@ -8853,7 +8875,7 @@ init_prompt();
 var deployCommand = new Command5("deploy").description("Deploy the current app to production").option("-y, --yes", "Skip the confirmation prompt when the working tree differs from the preview").option("--detach", "Run the deploy in the background and return immediately. Logs go to .runwork/deploy-{stdout,stderr}.log; poll `runwork deploy --status`.").option("--status", "Show the status (in-progress/succeeded/failed) of the last deploy started from this machine, plus the deployed-vs-local commit.").addOption(new Option2(DEPLOY_DETACHED_CHILD_FLAG).hideHelp()).action(async (opts, command) => {
   const useJson = shouldOutputJson(command.optsWithGlobals().json);
   const cwd = process.cwd();
-  if (!existsSync17(".runwork.json")) {
+  if (!existsSync18(".runwork.json")) {
     if (useJson) {
       jsonOut(buildErrorResponse("deploy", "No .runwork.json found", "This directory is not a Runwork app.", ["Run runwork init to create an app first", "Or cd into an existing app directory"]));
       process.exit(1);
@@ -8866,7 +8888,7 @@ var deployCommand = new Command5("deploy").description("Deploy the current app t
     return;
   }
   requireGit("deploy");
-  const config = JSON.parse(readFileSync14(".runwork.json", "utf-8"));
+  const config = JSON.parse(readFileSync15(".runwork.json", "utf-8"));
   const isChild = isInternalDeployChild(process.argv);
   if (opts.detach && !isChild) {
     const startedAt = new Date().toISOString();
@@ -9079,7 +9101,7 @@ init_client();
 init_colors();
 init_preflight();
 import { Command as Command6 } from "commander";
-import { readFileSync as readFileSync15, existsSync as existsSync18 } from "fs";
+import { readFileSync as readFileSync16, existsSync as existsSync19 } from "fs";
 
 // src/validate/freshness.ts
 init_subprocess();
@@ -9151,7 +9173,7 @@ var BUILD_FOLLOWUP = "In-sandbox typecheck/lint requires a worker exec endpoint
 var validateCommand = new Command6("validate").description("Validate the app before deploy: git sync state + preview liveness (no local deps needed)").action(async (_opts, command) => {
   const useJson = shouldOutputJson(command.optsWithGlobals().json);
   const cwd = process.cwd();
-  if (!existsSync18(".runwork.json")) {
+  if (!existsSync19(".runwork.json")) {
     if (useJson) {
       jsonOut({ success: false, command: "validate", error: "No .runwork.json found. Run inside a Runwork app." });
       process.exit(1);
@@ -9160,7 +9182,7 @@ var validateCommand = new Command6("validate").description("Validate the app bef
     process.exit(1);
   }
   requireGit("validate");
-  const config = JSON.parse(readFileSync15(".runwork.json", "utf-8"));
+  const config = JSON.parse(readFileSync16(".runwork.json", "utf-8"));
   const creds = requireAuth();
   const client = new ApiClient(creds);
   const sync = getGitFreshness(cwd);
@@ -9216,13 +9238,13 @@ var validateCommand = new Command6("validate").description("Validate the app bef
 init_store();
 init_client();
 import { Command as Command7 } from "commander";
-import { readFileSync as readFileSync16, existsSync as existsSync19 } from "fs";
+import { readFileSync as readFileSync17, existsSync as existsSync20 } from "fs";
 function readConfig2() {
-  if (!existsSync19(".runwork.json")) {
+  if (!existsSync20(".runwork.json")) {
     console.error("No .runwork.json found. Run `runwork init` first.");
     process.exit(1);
   }
-  return JSON.parse(readFileSync16(".runwork.json", "utf-8"));
+  return JSON.parse(readFileSync17(".runwork.json", "utf-8"));
 }
 function formatEvent(event) {
   const time = new Date(event.timestamp).toLocaleTimeString();
@@ -9643,12 +9665,12 @@ var logoutCommand = new Command9("logout").description("Remove stored Runwork cr
 init_store();
 init_client();
 import { Command as Command10 } from "commander";
-import { readFileSync as readFileSync18, existsSync as existsSync21 } from "fs";
+import { readFileSync as readFileSync19, existsSync as existsSync22 } from "fs";
 
 // src/workspace/resolve.ts
 init_store();
 init_prompt();
-import { existsSync as existsSync20, readFileSync as readFileSync17 } from "fs";
+import { existsSync as existsSync21, readFileSync as readFileSync18 } from "fs";
 var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 async function resolveWorkspace2(client, options = {}) {
   if (options.workspace) {
@@ -9661,9 +9683,9 @@ async function resolveWorkspace2(client, options = {}) {
   if (process.env.WORKSPACE_ID) {
     return { workspaceId: process.env.WORKSPACE_ID, workspaceName: "", source: "flag" };
   }
-  if (existsSync20(".runwork.json")) {
+  if (existsSync21(".runwork.json")) {
     try {
-      const config = JSON.parse(readFileSync17(".runwork.json", "utf-8"));
+      const config = JSON.parse(readFileSync18(".runwork.json", "utf-8"));
       if (config.workspaceId) {
         return {
           workspaceId: config.workspaceId,
@@ -9708,7 +9730,7 @@ function saveDefaultWorkspace(workspaceId, workspaceName) {
   }
 }
 function hasProjectConfig() {
-  return existsSync20(".runwork.json");
+  return existsSync21(".runwork.json");
 }
 async function resolveApp2(client, workspaceId, options = {}) {
   if (options.app) {
@@ -9720,9 +9742,9 @@ async function resolveApp2(client, workspaceId, options = {}) {
     }
     return { appId: match.id, appName: match.name, source: "flag" };
   }
-  if (existsSync20(".runwork.json")) {
+  if (existsSync21(".runwork.json")) {
     try {
-      const config = JSON.parse(readFileSync17(".runwork.json", "utf-8"));
+      const config = JSON.parse(readFileSync18(".runwork.json", "utf-8"));
       if (config.appId) {
         return { appId: config.appId, appName: config.appName || "", source: "project" };
       }
@@ -10055,11 +10077,11 @@ var callCommand = new Command10("call").description("Make a proxy call to a conn
     let curlStr = opts.curl;
     if (opts.curlFile) {
       const filePath = opts.curlFile;
-      if (!existsSync21(filePath)) {
+      if (!existsSync22(filePath)) {
         console.error(`File not found: ${filePath}`);
         process.exit(1);
       }
-      curlStr = readFileSync18(filePath, "utf-8");
+      curlStr = readFileSync19(filePath, "utf-8");
     }
     try {
       const result = await parseCurlToRequest(curlStr);
@@ -10122,14 +10144,14 @@ init_store();
 init_client();
 init_colors();
 import { Command as Command11 } from "commander";
-import { readFileSync as readFileSync19, existsSync as existsSync22 } from "fs";
+import { readFileSync as readFileSync20, existsSync as existsSync23 } from "fs";
 var openCommand = new Command11("open").description("Open app preview or dashboard in browser").argument("[target]", "What to open: preview (default), dashboard", "preview").action(async (target, _opts, command) => {
   const useJson = shouldOutputJson(command.optsWithGlobals().json);
-  if (!existsSync22(".runwork.json")) {
+  if (!existsSync23(".runwork.json")) {
     console.error("No .runwork.json found. Run `runwork init` first.");
     process.exit(1);
   }
-  const config = JSON.parse(readFileSync19(".runwork.json", "utf-8"));
+  const config = JSON.parse(readFileSync20(".runwork.json", "utf-8"));
   const creds = requireAuth();
   const client = new ApiClient(creds);
   const open = await import("open");
@@ -10170,7 +10192,7 @@ var openCommand = new Command11("open").description("Open app preview or dashboa
 // src/commands/info.ts
 init_agent_guidance();
 import { Command as Command12 } from "commander";
-import { readFileSync as readFileSync20, existsSync as existsSync23 } from "fs";
+import { readFileSync as readFileSync21, existsSync as existsSync24 } from "fs";
 import { join as join20 } from "path";
 
 // src/utils/app-info.ts
@@ -10362,20 +10384,20 @@ function readLocalDevSession(appDir, appId) {
   };
 }
 function tryReadConfig() {
-  if (!existsSync23(".runwork.json"))
+  if (!existsSync24(".runwork.json"))
     return null;
   try {
-    return JSON.parse(readFileSync20(".runwork.json", "utf-8"));
+    return JSON.parse(readFileSync21(".runwork.json", "utf-8"));
   } catch {
     return null;
   }
 }
 function readBlueprint(cwd) {
   const blueprintPath = join20(cwd, "blueprint.json");
-  if (!existsSync23(blueprintPath))
+  if (!existsSync24(blueprintPath))
     return null;
   try {
-    return JSON.parse(readFileSync20(blueprintPath, "utf-8"));
+    return JSON.parse(readFileSync21(blueprintPath, "utf-8"));
   } catch {
     return null;
   }
@@ -10719,7 +10741,7 @@ var infoCommand = new Command12("info").description("Show app context, registrie
 init_store();
 init_client();
 import { Command as Command13 } from "commander";
-import { readFileSync as readFileSync21, existsSync as existsSync24 } from "fs";
+import { readFileSync as readFileSync22, existsSync as existsSync25 } from "fs";
 function truncate(text2, max) {
   if (!text2)
     return "";
@@ -10797,7 +10819,7 @@ var pushCommand = new Command13("push").description("Upload a local skill file t
     nameArg = first;
     filePath = second;
   } else if (first) {
-    if (existsSync24(first)) {
+    if (existsSync25(first)) {
       filePath = first;
     } else if (!process.stdin.isTTY) {
       nameArg = first;
@@ -10814,11 +10836,11 @@ var pushCommand = new Command13("push").description("Upload a local skill file t
   }
   let content;
   if (filePath) {
-    if (!existsSync24(filePath)) {
+    if (!existsSync25(filePath)) {
       console.error(`File not found: ${filePath}`);
       process.exit(1);
     }
-    content = readFileSync21(filePath, "utf-8");
+    content = readFileSync22(filePath, "utf-8");
   } else {
     content = await readStdin2();
     if (!content.trim()) {
@@ -11030,8 +11052,8 @@ var skillsCommand = new Command13("skills").description("Manage workspace skills
 // src/commands/reflect.ts
 init_subprocess();
 import { Command as Command14 } from "commander";
-import { writeFileSync as writeFileSync27, mkdirSync as mkdirSync26 } from "fs";
-import { join as join34 } from "path";
+import { writeFileSync as writeFileSync25, mkdirSync as mkdirSync25 } from "fs";
+import { join as join37 } from "path";
 
 // src/utils/which.ts
 init_subprocess();
@@ -11069,9 +11091,9 @@ init_client();
 
 // src/agents/claude-code.ts
 init_subprocess();
-import { chmodSync, existsSync as existsSync27, mkdirSync as mkdirSync15, readFileSync as readFileSync24, readdirSync as readdirSync5, rmSync as rmSync4, statSync as statSync3, writeFileSync as writeFileSync16 } from "fs";
-import { join as join21 } from "path";
-import { homedir as homedir5, platform as platform2 } from "os";
+import { chmodSync, existsSync as existsSync30, mkdirSync as mkdirSync16, readFileSync as readFileSync25, readdirSync as readdirSync7, rmSync as rmSync5, statSync as statSync4, writeFileSync as writeFileSync16 } from "fs";
+import { join as join23 } from "path";
+import { homedir as homedir6, platform as platform2 } from "os";
 
 // ../../shared/skill/skill-canonical.ts
 function toSkillSlug(value) {
@@ -11180,6 +11202,10 @@ function buildSkillMd(parts) {
 var RUNWORK_MCP_PREFIX = "Runwork: ";
 var RUNWORK_MCP_PREFIX_LEGACY = "runwork-";
 var RUNWORK_WORKSPACE_MCP_NAME = "Runwork";
+var RUNWORK_PLUGIN_MARKETPLACE = "runwork";
+function isRunworkPluginKey(key) {
+  return key.endsWith(`@${RUNWORK_PLUGIN_MARKETPLACE}`);
+}
 function appendTokenToUrl(url, token) {
   const parsed = new URL(url);
   parsed.searchParams.set("token", token);
@@ -11515,9 +11541,70 @@ function skillNameFromPath(path2) {
   return canonical || null;
 }
 
+// src/utils/trash.ts
+init_atomic_json();
+import { cpSync, existsSync as existsSync26, mkdirSync as mkdirSync13, readdirSync as readdirSync5, renameSync as renameSync3, rmSync as rmSync4, statSync as statSync3 } from "fs";
+import { basename as basename2, dirname as dirname6, join as join21 } from "path";
+import { homedir as homedir5 } from "os";
+var TRASH_RETENTION_DAYS = 30;
+function trashRoot() {
+  return join21(homedir5(), ".runwork", "trash");
+}
+function batchDir(now) {
+  const stamp = now.toISOString().replace(/[:.]/g, "-");
+  return join21(trashRoot(), `${stamp}-${process.pid}`);
+}
+function pruneTrash(now = new Date) {
+  const root = trashRoot();
+  if (!existsSync26(root))
+    return;
+  const cutoff = now.getTime() - TRASH_RETENTION_DAYS * 24 * 60 * 60 * 1000;
+  for (const entry of readdirSync5(root)) {
+    const dir = join21(root, entry);
+    try {
+      if (statSync3(dir).mtimeMs < cutoff)
+        rmSync4(dir, { recursive: true, force: true });
+    } catch {}
+  }
+}
+var activeBatch = null;
+function moveToTrash(sourcePath, reason, now = new Date) {
+  if (!existsSync26(sourcePath))
+    return null;
+  if (!activeBatch || !activeBatch.startsWith(trashRoot())) {
+    activeBatch = batchDir(now);
+    pruneTrash(now);
+  }
+  const parent = basename2(dirname6(sourcePath));
+  const grandparent = basename2(dirname6(dirname6(sourcePath)));
+  const destDir = join21(activeBatch, `${grandparent}__${parent}`.replace(/[^a-zA-Z0-9._-]/g, "-"));
+  const dest = join21(destDir, basename2(sourcePath));
+  try {
+    mkdirSync13(destDir, { recursive: true });
+    try {
+      renameSync3(sourcePath, dest);
+    } catch {
+      cpSync(sourcePath, dest, { recursive: true });
+      rmSync4(sourcePath, { recursive: true, force: true });
+    }
+  } catch {
+    return null;
+  }
+  const manifestPath = join21(activeBatch, "manifest.json");
+  const manifest = readJsonOrNull(manifestPath) ?? { entries: [] };
+  manifest.entries.push({ from: sourcePath, to: dest, reason, at: now.toISOString() });
+  try {
+    writeJsonAtomic(manifestPath, manifest);
+  } catch {}
+  return dest;
+}
+function currentTrashBatch() {
+  return activeBatch;
+}
+
 // src/agents/utils/json-config.ts
-import { readFileSync as readFileSync22, writeFileSync as writeFileSync14, mkdirSync as mkdirSync13, existsSync as existsSync25 } from "fs";
-import { dirname as dirname5 } from "path";
+import { readFileSync as readFileSync23, writeFileSync as writeFileSync14, mkdirSync as mkdirSync14, existsSync as existsSync27 } from "fs";
+import { dirname as dirname7 } from "path";
 
 // src/sync/hash.ts
 import { createHash as createHash2 } from "crypto";
@@ -11549,21 +11636,21 @@ function isRunworkManagedKey(key) {
   return key === RUNWORK_WORKSPACE_MCP_NAME || key.startsWith(RUNWORK_MCP_PREFIX) || key.startsWith(RUNWORK_MCP_PREFIX_LEGACY);
 }
 function readJsonConfig(filePath) {
-  if (!existsSync25(filePath))
+  if (!existsSync27(filePath))
     return {};
   try {
-    return JSON.parse(readFileSync22(filePath, "utf-8"));
+    return JSON.parse(readFileSync23(filePath, "utf-8"));
   } catch {
     return {};
   }
 }
 function writeJsonConfig(filePath, config) {
-  mkdirSync13(dirname5(filePath), { recursive: true });
+  mkdirSync14(dirname7(filePath), { recursive: true });
   writeFileSync14(filePath, JSON.stringify(config, null, 2) + `
 `);
 }
 function removeRunworkMcpServers(filePath, topKey) {
-  if (!existsSync25(filePath))
+  if (!existsSync27(filePath))
     return false;
   const config = readJsonConfig(filePath);
   const existing = config[topKey] || {};
@@ -11602,18 +11689,46 @@ function mergeJsonMcpServers(filePath, servers, topKey) {
   return true;
 }
 
+// src/agents/utils/skill-removal.ts
+import { existsSync as existsSync28, readdirSync as readdirSync6 } from "fs";
+import { join as join22 } from "path";
+function removeMatchingSkillDirs(dir, allowed, reason = "skill removed") {
+  if (!allowed.size || !existsSync28(dir))
+    return;
+  for (const entry of readdirSync6(dir)) {
+    if (!allowed.has(entry))
+      continue;
+    moveToTrash(join22(dir, entry), reason);
+  }
+}
+function removeMatchingSkillFiles(dir, allowed, suffix, reason = "skill removed") {
+  if (!allowed.size || !existsSync28(dir))
+    return;
+  const names = new Set([...allowed].map((slug) => `${slug}${suffix}`));
+  for (const entry of readdirSync6(dir)) {
+    if (!names.has(entry))
+      continue;
+    moveToTrash(join22(dir, entry), reason);
+  }
+}
+
 // src/agents/utils/instruction-hint.ts
-import { existsSync as existsSync26, readFileSync as readFileSync23, writeFileSync as writeFileSync15, mkdirSync as mkdirSync14 } from "fs";
-import { dirname as dirname6 } from "path";
+import { existsSync as existsSync29, readFileSync as readFileSync24, writeFileSync as writeFileSync15, mkdirSync as mkdirSync15 } from "fs";
+import { dirname as dirname8 } from "path";
 var START_MARKER = "<!-- runwork:start -->";
 var END_MARKER = "<!-- runwork:end -->";
 var TEAM_START_MARKER = "<!-- runwork-team:start -->";
 var TEAM_END_MARKER = "<!-- runwork-team:end -->";
 function writeHintToFile(filePath, hint) {
-  mkdirSync14(dirname6(filePath), { recursive: true });
+  mkdirSync15(dirname8(filePath), { recursive: true });
+  if (!hint.includes(START_MARKER) || !hint.includes(END_MARKER)) {
+    hint = `${START_MARKER}
+${hint}
+${END_MARKER}`;
+  }
   let content = "";
-  if (existsSync26(filePath)) {
-    content = readFileSync23(filePath, "utf-8");
+  if (existsSync29(filePath)) {
+    content = readFileSync24(filePath, "utf-8");
   }
   const startIdx = content.indexOf(START_MARKER);
   const endIdx = content.indexOf(END_MARKER);
@@ -11635,9 +11750,9 @@ function writeHintToFile(filePath, hint) {
   writeFileSync15(filePath, content);
 }
 function removeHintFromFile(filePath) {
-  if (!existsSync26(filePath))
+  if (!existsSync29(filePath))
     return false;
-  let content = readFileSync23(filePath, "utf-8");
+  let content = readFileSync24(filePath, "utf-8");
   const startIdx = content.indexOf(START_MARKER);
   const endIdx = content.indexOf(END_MARKER);
   if (startIdx < 0 || endIdx < 0)
@@ -11655,9 +11770,9 @@ function removeHintFromFile(filePath) {
   return true;
 }
 function removeTeamInstructionsFromFile(filePath) {
-  if (!existsSync26(filePath))
+  if (!existsSync29(filePath))
     return false;
-  let content = readFileSync23(filePath, "utf-8");
+  let content = readFileSync24(filePath, "utf-8");
   const startIdx = content.indexOf(TEAM_START_MARKER);
   const endIdx = content.indexOf(TEAM_END_MARKER);
   if (startIdx < 0 || endIdx < 0)
@@ -11675,10 +11790,10 @@ function removeTeamInstructionsFromFile(filePath) {
   return true;
 }
 function writeTeamInstructionsToFile(filePath, instructions) {
-  mkdirSync14(dirname6(filePath), { recursive: true });
+  mkdirSync15(dirname8(filePath), { recursive: true });
   let content = "";
-  if (existsSync26(filePath)) {
-    content = readFileSync23(filePath, "utf-8");
+  if (existsSync29(filePath)) {
+    content = readFileSync24(filePath, "utf-8");
   }
   const block = `${TEAM_START_MARKER}
 ${instructions}
@@ -11985,7 +12100,7 @@ class ClaudeCodeAdapter {
     if (whichBinary("claude"))
       return true;
     if (platform2() === "darwin")
-      return existsSync27("/Applications/Claude.app");
+      return existsSync30("/Applications/Claude.app");
     return false;
   }
   supportsMcpScope(_scope) {
@@ -11996,7 +12111,7 @@ class ClaudeCodeAdapter {
   }
   async writeMcpServers(servers, scope) {
     if (scope === "project") {
-      const filePath = join21(process.cwd(), ".mcp.json");
+      const filePath = join23(process.cwd(), ".mcp.json");
       const entries = {};
       for (const s of servers) {
         entries[s.name] = {
@@ -12008,7 +12123,7 @@ class ClaudeCodeAdapter {
       }
       mergeJsonMcpServers(filePath, entries, "mcpServers");
     } else {
-      const settingsPath = join21(homedir5(), ".claude", "settings.json");
+      const settingsPath = join23(homedir6(), ".claude", "settings.json");
       const entries = {};
       for (const s of servers) {
         entries[s.name] = {
@@ -12020,11 +12135,11 @@ class ClaudeCodeAdapter {
       }
       mergeJsonMcpServers(settingsPath, entries, "mcpServers");
       const pluginDir = this.getPluginDir();
-      mkdirSync15(pluginDir, { recursive: true });
-      const pluginMcpPath = join21(pluginDir, ".mcp.json");
+      mkdirSync16(pluginDir, { recursive: true });
+      const pluginMcpPath = join23(pluginDir, ".mcp.json");
       const marketDir = this.getMarketplaceDir();
-      mkdirSync15(marketDir, { recursive: true });
-      const marketplaceMcpPath = join21(marketDir, ".mcp.json");
+      mkdirSync16(marketDir, { recursive: true });
+      const marketplaceMcpPath = join23(marketDir, ".mcp.json");
       const pluginEntries = {};
       for (const s of servers) {
         pluginEntries[s.name] = {
@@ -12039,44 +12154,44 @@ class ClaudeCodeAdapter {
     }
   }
   installSessionStartHook(pluginDir, label) {
-    const hooksDir = join21(pluginDir, "hooks");
-    mkdirSync15(hooksDir, { recursive: true });
-    const scriptPath = join21(hooksDir, "on-session-start.sh");
+    const hooksDir = join23(pluginDir, "hooks");
+    mkdirSync16(hooksDir, { recursive: true });
+    const scriptPath = join23(hooksDir, "on-session-start.sh");
     writeFileSync16(scriptPath, SESSION_START_HOOK_SCRIPT);
     try {
       chmodSync(scriptPath, 493);
     } catch {}
-    writeFileSync16(join21(hooksDir, "hooks.json"), JSON.stringify(SESSION_START_HOOKS_MANIFEST, null, 2));
+    writeFileSync16(join23(hooksDir, "hooks.json"), JSON.stringify(SESSION_START_HOOKS_MANIFEST, null, 2));
     vlog(`  [Claude Code] Installed SessionStart hook (${label}) -> ${scriptPath}`);
   }
   async writeSkills(skills, scope) {
-    const baseDir = scope === "project" ? join21(process.cwd(), ".claude", "skills") : join21(homedir5(), ".claude", "skills");
+    const baseDir = scope === "project" ? join23(process.cwd(), ".claude", "skills") : join23(homedir6(), ".claude", "skills");
     for (const skill of skills) {
-      const skillDir = join21(baseDir, skill.filename);
+      const skillDir = join23(baseDir, skill.filename);
       cleanupOldSkillDir(baseDir, skill);
-      mkdirSync15(skillDir, { recursive: true });
-      writeFileSync16(join21(skillDir, "SKILL.md"), buildSkillMd2(skill));
+      mkdirSync16(skillDir, { recursive: true });
+      writeFileSync16(join23(skillDir, "SKILL.md"), buildSkillMd2(skill));
     }
     if (scope === "user") {
       const pluginDir = this.getPluginDir();
-      const pluginJsonDir = join21(pluginDir, ".claude-plugin");
-      mkdirSync15(pluginJsonDir, { recursive: true });
-      writeFileSync16(join21(pluginJsonDir, "plugin.json"), JSON.stringify(getPluginJson(), null, 2));
+      const pluginJsonDir = join23(pluginDir, ".claude-plugin");
+      mkdirSync16(pluginJsonDir, { recursive: true });
+      writeFileSync16(join23(pluginJsonDir, "plugin.json"), JSON.stringify(getPluginJson(), null, 2));
       for (const skill of skills) {
-        const skillDir = join21(pluginDir, "skills", skill.filename);
-        cleanupOldSkillDir(join21(pluginDir, "skills"), skill);
-        mkdirSync15(skillDir, { recursive: true });
-        writeFileSync16(join21(skillDir, "SKILL.md"), buildSkillMd2(skill));
+        const skillDir = join23(pluginDir, "skills", skill.filename);
+        cleanupOldSkillDir(join23(pluginDir, "skills"), skill);
+        mkdirSync16(skillDir, { recursive: true });
+        writeFileSync16(join23(skillDir, "SKILL.md"), buildSkillMd2(skill));
       }
       const marketDir = this.getMarketplaceDir();
-      const marketPluginJsonDir = join21(marketDir, ".claude-plugin");
-      mkdirSync15(marketPluginJsonDir, { recursive: true });
-      writeFileSync16(join21(marketPluginJsonDir, "plugin.json"), JSON.stringify(getPluginJson(), null, 2));
+      const marketPluginJsonDir = join23(marketDir, ".claude-plugin");
+      mkdirSync16(marketPluginJsonDir, { recursive: true });
+      writeFileSync16(join23(marketPluginJsonDir, "plugin.json"), JSON.stringify(getPluginJson(), null, 2));
       for (const skill of skills) {
-        const skillDir = join21(marketDir, "skills", skill.filename);
-        cleanupOldSkillDir(join21(marketDir, "skills"), skill);
-        mkdirSync15(skillDir, { recursive: true });
-        writeFileSync16(join21(skillDir, "SKILL.md"), buildSkillMd2(skill));
+        const skillDir = join23(marketDir, "skills", skill.filename);
+        cleanupOldSkillDir(join23(marketDir, "skills"), skill);
+        mkdirSync16(skillDir, { recursive: true });
+        writeFileSync16(join23(skillDir, "SKILL.md"), buildSkillMd2(skill));
       }
       this.registerPlugin(pluginDir);
     }
@@ -12087,19 +12202,19 @@ class ClaudeCodeAdapter {
       return;
     const pluginDir = this.getPluginDir();
     const marketDir = this.getMarketplaceDir();
-    if (existsSync27(pluginDir)) {
+    if (existsSync30(pluginDir)) {
       this.installSessionStartHook(pluginDir, "plugin cache");
     }
-    if (existsSync27(marketDir)) {
+    if (existsSync30(marketDir)) {
       this.installSessionStartHook(marketDir, "marketplace");
     }
   }
   async writeInstructionHint(hint, scope) {
-    const filePath = scope === "project" ? join21(process.cwd(), ".claude", "CLAUDE.md") : join21(homedir5(), ".claude", "CLAUDE.md");
+    const filePath = scope === "project" ? join23(process.cwd(), ".claude", "CLAUDE.md") : join23(homedir6(), ".claude", "CLAUDE.md");
     writeHintToFile(filePath, hint);
   }
   async writeTeamInstructions(instructions, scope) {
-    const filePath = scope === "project" ? join21(process.cwd(), ".claude", "CLAUDE.md") : join21(homedir5(), ".claude", "CLAUDE.md");
+    const filePath = scope === "project" ? join23(process.cwd(), ".claude", "CLAUDE.md") : join23(homedir6(), ".claude", "CLAUDE.md");
     writeTeamInstructionsToFile(filePath, instructions);
     if (scope === "user") {
       const skillContent = `---
@@ -12111,21 +12226,21 @@ ${instructions}`;
       const pluginDir = this.getPluginDir();
       const marketDir = this.getMarketplaceDir();
       for (const dir of [
-        join21(pluginDir, "skills", "runwork-team-instructions"),
-        join21(marketDir, "skills", "runwork-team-instructions")
+        join23(pluginDir, "skills", "runwork-team-instructions"),
+        join23(marketDir, "skills", "runwork-team-instructions")
       ]) {
-        mkdirSync15(dir, { recursive: true });
-        writeFileSync16(join21(dir, "SKILL.md"), skillContent);
+        mkdirSync16(dir, { recursive: true });
+        writeFileSync16(join23(dir, "SKILL.md"), skillContent);
       }
     }
   }
   async writeAgentConfig(config, scope, baseline) {
-    const settingsPath = scope === "project" ? join21(process.cwd(), ".claude", "settings.json") : join21(homedir5(), ".claude", "settings.json");
-    const hadFile = existsSync27(settingsPath);
+    const settingsPath = scope === "project" ? join23(process.cwd(), ".claude", "settings.json") : join23(homedir6(), ".claude", "settings.json");
+    const hadFile = existsSync30(settingsPath);
     let settings = {};
     if (hadFile) {
       try {
-        settings = JSON.parse(readFileSync24(settingsPath, "utf-8"));
+        settings = JSON.parse(readFileSync25(settingsPath, "utf-8"));
       } catch {}
     }
     if (settings.permissions && typeof settings.permissions === "object") {
@@ -12155,37 +12270,39 @@ ${instructions}`;
     }
     if (!hadFile && !config.modelPreference && !config.permissionRules)
       return;
-    mkdirSync15(join21(settingsPath, ".."), { recursive: true });
+    mkdirSync16(join23(settingsPath, ".."), { recursive: true });
     writeFileSync16(settingsPath, JSON.stringify(settings, null, 2));
   }
   async readManagedBlock(_scope) {
     return;
   }
+  async removeSkills(skillFilenames, scope) {
+    if (!skillFilenames.length)
+      return;
+    const allowed = new Set(skillFilenames);
+    const roots = scope === "project" ? [join23(process.cwd(), ".claude", "skills")] : [
+      join23(homedir6(), ".claude", "skills"),
+      join23(this.getPluginDir(), "skills"),
+      join23(this.getMarketplaceDir(), "skills")
+    ];
+    for (const dir of roots)
+      removeMatchingSkillDirs(dir, allowed);
+  }
   async cleanup(scope, manifest) {
     if (scope === "project") {
-      removeRunworkMcpServers(join21(process.cwd(), ".mcp.json"), "mcpServers");
+      removeRunworkMcpServers(join23(process.cwd(), ".mcp.json"), "mcpServers");
     } else {
-      removeRunworkMcpServers(join21(homedir5(), ".claude", "settings.json"), "mcpServers");
-    }
-    const skillsDir = scope === "project" ? join21(process.cwd(), ".claude", "skills") : join21(homedir5(), ".claude", "skills");
-    if (existsSync27(skillsDir) && manifest?.skillFilenames.length) {
-      const allowed = new Set(manifest.skillFilenames);
-      for (const entry of readdirSync5(skillsDir)) {
-        if (!allowed.has(entry))
-          continue;
-        try {
-          rmSync4(join21(skillsDir, entry), { recursive: true, force: true });
-        } catch {}
-      }
+      removeRunworkMcpServers(join23(homedir6(), ".claude", "settings.json"), "mcpServers");
     }
-    const instructionFile = scope === "project" ? join21(process.cwd(), ".claude", "CLAUDE.md") : join21(homedir5(), ".claude", "CLAUDE.md");
+    await this.removeSkills(manifest?.skillFilenames ?? [], scope);
+    const instructionFile = scope === "project" ? join23(process.cwd(), ".claude", "CLAUDE.md") : join23(homedir6(), ".claude", "CLAUDE.md");
     removeHintFromFile(instructionFile);
     removeTeamInstructionsFromFile(instructionFile);
     if (scope === "user") {
-      const settingsPath = join21(homedir5(), ".claude", "settings.json");
-      if (existsSync27(settingsPath)) {
+      const settingsPath = join23(homedir6(), ".claude", "settings.json");
+      if (existsSync30(settingsPath)) {
         try {
-          const settings = JSON.parse(readFileSync24(settingsPath, "utf-8"));
+          const settings = JSON.parse(readFileSync25(settingsPath, "utf-8"));
           if (settings.permissions) {
             for (const key of ["allow", "deny"]) {
               const arr = settings.permissions[key];
@@ -12196,7 +12313,10 @@ ${instructions}`;
             }
           }
           if (settings.enabledPlugins) {
-            delete settings.enabledPlugins[`${PLUGIN_NAME}@runwork`];
+            for (const key of Object.keys(settings.enabledPlugins)) {
+              if (isRunworkPluginKey(key))
+                delete settings.enabledPlugins[key];
+            }
           }
           writeFileSync16(settingsPath, JSON.stringify(settings, null, 2));
         } catch {}
@@ -12204,25 +12324,28 @@ ${instructions}`;
       const pluginDir = this.getPluginDir();
       const marketRoot = this.getMarketplaceRoot();
       for (const dir of [pluginDir, marketRoot]) {
-        if (existsSync27(dir)) {
+        if (existsSync30(dir)) {
           try {
-            rmSync4(dir, { recursive: true, force: true });
+            rmSync5(dir, { recursive: true, force: true });
           } catch {}
         }
       }
       const pluginsBase = this.getPluginsBaseDir();
-      const installedPath = join21(pluginsBase, "installed_plugins.json");
-      if (existsSync27(installedPath)) {
+      const installedPath = join23(pluginsBase, "installed_plugins.json");
+      if (existsSync30(installedPath)) {
         try {
           const installed = readJsonConfig(installedPath);
           if (installed.plugins) {
-            delete installed.plugins[`${PLUGIN_NAME}@runwork`];
+            for (const key of Object.keys(installed.plugins)) {
+              if (isRunworkPluginKey(key))
+                delete installed.plugins[key];
+            }
             writeJsonConfig(installedPath, installed);
           }
         } catch {}
       }
-      const marketplacesPath = join21(pluginsBase, "known_marketplaces.json");
-      if (existsSync27(marketplacesPath)) {
+      const marketplacesPath = join23(pluginsBase, "known_marketplaces.json");
+      if (existsSync30(marketplacesPath)) {
         try {
           const marketplaces = readJsonConfig(marketplacesPath);
           delete marketplaces["runwork"];
@@ -12233,11 +12356,11 @@ ${instructions}`;
   }
   async readUsageStats(lastSyncAt) {
     try {
-      const claudeDir = join21(homedir5(), ".claude");
-      if (!existsSync27(claudeDir))
+      const claudeDir = join23(homedir6(), ".claude");
+      if (!existsSync30(claudeDir))
         return null;
-      const projectsDir = join21(claudeDir, "projects");
-      if (!existsSync27(projectsDir))
+      const projectsDir = join23(claudeDir, "projects");
+      if (!existsSync30(projectsDir))
         return null;
       const sinceMs = lastSyncAt ? new Date(lastSyncAt).getTime() : 0;
       let sessionCount = 0;
@@ -12251,25 +12374,25 @@ ${instructions}`;
       const seenEntries = new Set;
       let cwdEntries;
       try {
-        cwdEntries = readdirSync5(projectsDir);
+        cwdEntries = readdirSync7(projectsDir);
       } catch {
         return null;
       }
       for (const cwd of cwdEntries) {
-        const cwdPath = join21(projectsDir, cwd);
+        const cwdPath = join23(projectsDir, cwd);
         let files;
         try {
-          files = readdirSync5(cwdPath);
+          files = readdirSync7(cwdPath);
         } catch {
           continue;
         }
         for (const file of files) {
           if (!file.endsWith(".jsonl"))
             continue;
-          const filePath = join21(cwdPath, file);
+          const filePath = join23(cwdPath, file);
           let stat;
           try {
-            stat = statSync3(filePath);
+            stat = statSync4(filePath);
           } catch {
             continue;
           }
@@ -12277,7 +12400,7 @@ ${instructions}`;
             continue;
           let content;
           try {
-            content = readFileSync24(filePath, "utf-8");
+            content = readFileSync25(filePath, "utf-8");
           } catch {
             continue;
           }
@@ -12363,32 +12486,32 @@ ${instructions}`;
   }
   async readSessionDigests(sinceISO) {
     try {
-      const projectsDir = join21(homedir5(), ".claude", "projects");
-      if (!existsSync27(projectsDir))
+      const projectsDir = join23(homedir6(), ".claude", "projects");
+      if (!existsSync30(projectsDir))
         return null;
       const sinceMs = sinceISO ? new Date(sinceISO).getTime() : 0;
       let cwdEntries;
       try {
-        cwdEntries = readdirSync5(projectsDir);
+        cwdEntries = readdirSync7(projectsDir);
       } catch {
         return null;
       }
       const digests = [];
       for (const cwd of cwdEntries) {
-        const cwdPath = join21(projectsDir, cwd);
+        const cwdPath = join23(projectsDir, cwd);
         let files;
         try {
-          files = readdirSync5(cwdPath);
+          files = readdirSync7(cwdPath);
         } catch {
           continue;
         }
         for (const file of files) {
           if (!file.endsWith(".jsonl"))
             continue;
-          const filePath = join21(cwdPath, file);
+          const filePath = join23(cwdPath, file);
           let stat;
           try {
-            stat = statSync3(filePath);
+            stat = statSync4(filePath);
           } catch {
             continue;
           }
@@ -12396,7 +12519,7 @@ ${instructions}`;
             continue;
           let content;
           try {
-            content = readFileSync24(filePath, "utf-8");
+            content = readFileSync25(filePath, "utf-8");
           } catch {
             continue;
           }
@@ -12412,8 +12535,8 @@ ${instructions}`;
   }
   async readSkillUsage(lastSyncAt) {
     try {
-      const projectsDir = join21(homedir5(), ".claude", "projects");
-      if (!existsSync27(projectsDir))
+      const projectsDir = join23(homedir6(), ".claude", "projects");
+      if (!existsSync30(projectsDir))
         return null;
       const sinceMs = lastSyncAt ? new Date(lastSyncAt).getTime() : 0;
       const skillCounts = new Map;
@@ -12429,25 +12552,25 @@ ${instructions}`;
       };
       let cwdEntries;
       try {
-        cwdEntries = readdirSync5(projectsDir);
+        cwdEntries = readdirSync7(projectsDir);
       } catch {
         return null;
       }
       for (const cwd of cwdEntries) {
-        const cwdPath = join21(projectsDir, cwd);
+        const cwdPath = join23(projectsDir, cwd);
         let files;
         try {
-          files = readdirSync5(cwdPath);
+          files = readdirSync7(cwdPath);
         } catch {
           continue;
         }
         for (const file of files) {
           if (!file.endsWith(".jsonl"))
             continue;
-          const filePath = join21(cwdPath, file);
+          const filePath = join23(cwdPath, file);
           let fileStat;
           try {
-            fileStat = statSync3(filePath);
+            fileStat = statSync4(filePath);
           } catch {
             continue;
           }
@@ -12455,7 +12578,7 @@ ${instructions}`;
             continue;
           let content;
           try {
-            content = readFileSync24(filePath, "utf-8");
+            content = readFileSync25(filePath, "utf-8");
           } catch {
             continue;
           }
@@ -12545,21 +12668,21 @@ ${instructions}`;
     }
   }
   getPluginsBaseDir() {
-    return join21(homedir5(), ".claude", "plugins");
+    return join23(homedir6(), ".claude", "plugins");
   }
   getPluginDir() {
-    return join21(this.getPluginsBaseDir(), "cache", "runwork", PLUGIN_NAME, PLUGIN_VERSION);
+    return join23(this.getPluginsBaseDir(), "cache", "runwork", PLUGIN_NAME, PLUGIN_VERSION);
   }
   getMarketplaceRoot() {
-    return join21(this.getPluginsBaseDir(), "marketplaces", "runwork");
+    return join23(this.getPluginsBaseDir(), "marketplaces", "runwork");
   }
   getMarketplaceDir() {
-    return join21(this.getMarketplaceRoot(), "plugins", PLUGIN_NAME);
+    return join23(this.getMarketplaceRoot(), "plugins", PLUGIN_NAME);
   }
   registerPlugin(pluginDir) {
     const pluginsBase = this.getPluginsBaseDir();
-    mkdirSync15(pluginsBase, { recursive: true });
-    const installedPath = join21(pluginsBase, "installed_plugins.json");
+    mkdirSync16(pluginsBase, { recursive: true });
+    const installedPath = join23(pluginsBase, "installed_plugins.json");
     const installed = readJsonConfig(installedPath);
     if (!installed.version)
       installed.version = 2;
@@ -12576,10 +12699,10 @@ ${instructions}`;
     }];
     writeJsonConfig(installedPath, installed);
     const marketRoot = this.getMarketplaceRoot();
-    const marketCatalogDir = join21(marketRoot, ".claude-plugin");
-    mkdirSync15(marketCatalogDir, { recursive: true });
-    writeFileSync16(join21(marketCatalogDir, "marketplace.json"), JSON.stringify(getMarketplaceJson(), null, 2));
-    const marketplacesPath = join21(pluginsBase, "known_marketplaces.json");
+    const marketCatalogDir = join23(marketRoot, ".claude-plugin");
+    mkdirSync16(marketCatalogDir, { recursive: true });
+    writeFileSync16(join23(marketCatalogDir, "marketplace.json"), JSON.stringify(getMarketplaceJson(), null, 2));
+    const marketplacesPath = join23(pluginsBase, "known_marketplaces.json");
     const marketplaces = readJsonConfig(marketplacesPath);
     marketplaces["runwork"] = {
       source: { source: "directory", path: marketRoot },
@@ -12588,7 +12711,7 @@ ${instructions}`;
     };
     writeJsonConfig(marketplacesPath, marketplaces);
     vlog(`  [Claude Code] ${wasRegistered ? "Refreshed" : "Registered"} plugin ` + `${pluginKey} v${PLUGIN_VERSION} -> ${installedPath}`);
-    const settingsPath = join21(homedir5(), ".claude", "settings.json");
+    const settingsPath = join23(homedir6(), ".claude", "settings.json");
     const settings = readJsonConfig(settingsPath);
     if (!settings["enabledPlugins"]) {
       settings["enabledPlugins"] = {};
@@ -12603,27 +12726,23 @@ ${instructions}`;
 function cleanupOldSkillDir(baseDir, skill) {
   if (skill.name === skill.filename)
     return;
-  const oldDir = join21(baseDir, skill.name);
-  if (existsSync27(oldDir)) {
-    try {
-      rmSync4(oldDir, { recursive: true, force: true });
-    } catch {}
-  }
+  const oldDir = join23(baseDir, skill.name);
+  moveToTrash(oldDir, `skill renamed to ${skill.filename}`);
 }
 
 // src/agents/claude-desktop.ts
-import { existsSync as existsSync29, mkdtempSync as mkdtempSync3, readdirSync as readdirSync6, readFileSync as readFileSync25, rmSync as rmSync6, statSync as statSync4, writeFileSync as writeFileSync18, mkdirSync as mkdirSync17 } from "fs";
-import { dirname as dirname7, join as join23 } from "path";
-import { homedir as homedir6, platform as platform3, tmpdir as tmpdir3 } from "os";
+import { existsSync as existsSync32, mkdtempSync as mkdtempSync3, readdirSync as readdirSync8, readFileSync as readFileSync26, rmSync as rmSync7, statSync as statSync5, writeFileSync as writeFileSync18, mkdirSync as mkdirSync18 } from "fs";
+import { dirname as dirname9, join as join25 } from "path";
+import { homedir as homedir7, platform as platform3, tmpdir as tmpdir3 } from "os";
 init_zip();
 
 // src/agents/claude-desktop-plugin-tree.ts
-import { chmodSync as chmodSync2, mkdirSync as mkdirSync16, rmSync as rmSync5, existsSync as existsSync28, writeFileSync as writeFileSync17 } from "fs";
-import { join as join22 } from "path";
+import { chmodSync as chmodSync2, mkdirSync as mkdirSync17, rmSync as rmSync6, existsSync as existsSync31, writeFileSync as writeFileSync17 } from "fs";
+import { join as join24 } from "path";
 function writePluginMetadata(destDir, metadata) {
-  const pluginJsonDir = join22(destDir, ".claude-plugin");
-  mkdirSync16(pluginJsonDir, { recursive: true });
-  writeFileSync17(join22(pluginJsonDir, "plugin.json"), JSON.stringify({
+  const pluginJsonDir = join24(destDir, ".claude-plugin");
+  mkdirSync17(pluginJsonDir, { recursive: true });
+  writeFileSync17(join24(pluginJsonDir, "plugin.json"), JSON.stringify({
     name: metadata.pluginName,
     version: metadata.pluginVersion,
     description: metadata.description,
@@ -12631,7 +12750,7 @@ function writePluginMetadata(destDir, metadata) {
   }, null, 2));
 }
 function writePluginMcpConfig(destDir, mcpServers) {
-  mkdirSync16(destDir, { recursive: true });
+  mkdirSync17(destDir, { recursive: true });
   const mcpEntries = {};
   for (const server of mcpServers) {
     if (server.name === RUNWORK_WORKSPACE_MCP_NAME) {
@@ -12650,49 +12769,49 @@ function writePluginMcpConfig(destDir, mcpServers) {
       };
     }
   }
-  writeFileSync17(join22(destDir, ".mcp.json"), JSON.stringify({ mcpServers: mcpEntries }, null, 2));
+  writeFileSync17(join24(destDir, ".mcp.json"), JSON.stringify({ mcpServers: mcpEntries }, null, 2));
 }
 function writePluginTeamInstructions(destDir, instructions) {
-  const skillDir = join22(destDir, "skills", "runwork-team-instructions");
-  mkdirSync16(skillDir, { recursive: true });
+  const skillDir = join24(destDir, "skills", "runwork-team-instructions");
+  mkdirSync17(skillDir, { recursive: true });
   const skillContent = `---
 name: runwork-team-instructions
 description: Team instructions from your Runwork workspace. Always follow these guidelines.
 ---
 
 ${instructions}`;
-  writeFileSync17(join22(skillDir, "SKILL.md"), skillContent);
+  writeFileSync17(join24(skillDir, "SKILL.md"), skillContent);
 }
 function writePluginSkills(destDir, skills) {
-  const skillsRoot = join22(destDir, "skills");
-  mkdirSync16(skillsRoot, { recursive: true });
+  const skillsRoot = join24(destDir, "skills");
+  mkdirSync17(skillsRoot, { recursive: true });
   for (const skill of skills) {
     if (skill.name !== skill.filename) {
-      const legacyDir = join22(skillsRoot, skill.name);
-      if (existsSync28(legacyDir)) {
+      const legacyDir = join24(skillsRoot, skill.name);
+      if (existsSync31(legacyDir)) {
         try {
-          rmSync5(legacyDir, { recursive: true, force: true });
+          rmSync6(legacyDir, { recursive: true, force: true });
         } catch {}
       }
     }
-    const skillDir = join22(skillsRoot, skill.filename);
-    mkdirSync16(skillDir, { recursive: true });
-    writeFileSync17(join22(skillDir, "SKILL.md"), buildSkillMd2(skill));
+    const skillDir = join24(skillsRoot, skill.filename);
+    mkdirSync17(skillDir, { recursive: true });
+    writeFileSync17(join24(skillDir, "SKILL.md"), buildSkillMd2(skill));
   }
 }
 function writePluginSessionStartHook(destDir) {
-  const hooksDir = join22(destDir, "hooks");
-  mkdirSync16(hooksDir, { recursive: true });
-  const scriptPath = join22(hooksDir, "on-session-start.sh");
+  const hooksDir = join24(destDir, "hooks");
+  mkdirSync17(hooksDir, { recursive: true });
+  const scriptPath = join24(hooksDir, "on-session-start.sh");
   writeFileSync17(scriptPath, SESSION_START_HOOK_SCRIPT);
   try {
     chmodSync2(scriptPath, 493);
   } catch {}
-  writeFileSync17(join22(hooksDir, "hooks.json"), JSON.stringify(SESSION_START_HOOKS_MANIFEST, null, 2));
+  writeFileSync17(join24(hooksDir, "hooks.json"), JSON.stringify(SESSION_START_HOOKS_MANIFEST, null, 2));
   console.log(`  [Claude Desktop (Cowork)] Bundled SessionStart hook -> ${scriptPath}`);
 }
 function writePluginTree(destDir, input) {
-  mkdirSync16(destDir, { recursive: true });
+  mkdirSync17(destDir, { recursive: true });
   writePluginMetadata(destDir, {
     pluginName: input.pluginName,
     pluginVersion: input.pluginVersion,
@@ -12709,6 +12828,9 @@ var PLUGIN_NAME2 = "runwork";
 var PLUGIN_VERSION2 = "1.0.0";
 var PLUGIN_DESCRIPTION = "Skills and tools from your Runwork workspace";
 var PLUGIN_AUTHOR_NAME = "Runwork";
+function isRunworkRpmPluginName(name) {
+  return !!name && (name === PLUGIN_NAME2 || name.startsWith(`${PLUGIN_NAME2}-`));
+}
 function getPluginMetadata() {
   return {
     pluginName: PLUGIN_NAME2,
@@ -12720,39 +12842,59 @@ function getPluginMetadata() {
 function getMcpConfigPath() {
   const os2 = platform3();
   if (os2 === "darwin") {
-    return join23(homedir6(), "Library", "Application Support", "Claude", "claude_desktop_config.json");
+    return join25(homedir7(), "Library", "Application Support", "Claude", "claude_desktop_config.json");
   }
   if (os2 === "win32") {
-    return join23(process.env.APPDATA || join23(homedir6(), "AppData", "Roaming"), "Claude", "claude_desktop_config.json");
+    return join25(process.env.APPDATA || join25(homedir7(), "AppData", "Roaming"), "Claude", "claude_desktop_config.json");
   }
-  return join23(homedir6(), ".config", "Claude", "claude_desktop_config.json");
+  return join25(homedir7(), ".config", "Claude", "claude_desktop_config.json");
 }
 function getCoworkBaseDir() {
   const os2 = platform3();
   if (os2 === "darwin") {
-    return join23(homedir6(), "Library", "Application Support", "Claude", "local-agent-mode-sessions");
+    return join25(homedir7(), "Library", "Application Support", "Claude", "local-agent-mode-sessions");
   }
   if (os2 === "win32") {
-    return join23(process.env.APPDATA || join23(homedir6(), "AppData", "Roaming"), "Claude", "local-agent-mode-sessions");
+    return join25(process.env.APPDATA || join25(homedir7(), "AppData", "Roaming"), "Claude", "local-agent-mode-sessions");
   }
-  return join23(homedir6(), ".config", "Claude", "local-agent-mode-sessions");
+  return join25(homedir7(), ".config", "Claude", "local-agent-mode-sessions");
+}
+function listOrgDirs() {
+  const baseDir = getCoworkBaseDir();
+  if (!existsSync32(baseDir))
+    return [];
+  const dirs = [];
+  try {
+    const sessionDirs = readdirSync8(baseDir).filter((d) => !d.startsWith(".") && d !== "skills-plugin");
+    for (const sessionId of sessionDirs) {
+      const sessionPath = join25(baseDir, sessionId);
+      try {
+        for (const orgId of readdirSync8(sessionPath).filter((d) => !d.startsWith("."))) {
+          dirs.push(join25(sessionPath, orgId));
+        }
+      } catch {
+        continue;
+      }
+    }
+  } catch {}
+  return dirs;
 }
 function walkOrgDirs(visit) {
   const baseDir = getCoworkBaseDir();
-  if (!existsSync29(baseDir))
+  if (!existsSync32(baseDir))
     return null;
   try {
-    const sessionDirs = readdirSync6(baseDir).filter((d) => !d.startsWith(".") && d !== "skills-plugin");
+    const sessionDirs = readdirSync8(baseDir).filter((d) => !d.startsWith(".") && d !== "skills-plugin");
     for (const sessionId of sessionDirs) {
-      const sessionPath = join23(baseDir, sessionId);
+      const sessionPath = join25(baseDir, sessionId);
       let orgDirs;
       try {
-        orgDirs = readdirSync6(sessionPath).filter((d) => !d.startsWith("."));
+        orgDirs = readdirSync8(sessionPath).filter((d) => !d.startsWith("."));
       } catch {
         continue;
       }
       for (const orgId of orgDirs) {
-        const orgDir = join23(sessionPath, orgId);
+        const orgDir = join25(sessionPath, orgId);
         const result = visit(orgDir);
         if (result !== null)
           return result;
@@ -12764,20 +12906,20 @@ function walkOrgDirs(visit) {
 function getCoworkMemoryClaudeMdPaths() {
   const paths = [];
   const baseDir = getCoworkBaseDir();
-  if (!existsSync29(baseDir))
+  if (!existsSync32(baseDir))
     return paths;
   try {
-    const sessionDirs = readdirSync6(baseDir).filter((d) => !d.startsWith(".") && d !== "skills-plugin");
+    const sessionDirs = readdirSync8(baseDir).filter((d) => !d.startsWith(".") && d !== "skills-plugin");
     for (const sessionId of sessionDirs) {
-      const sessionPath = join23(baseDir, sessionId);
+      const sessionPath = join25(baseDir, sessionId);
       let orgDirs;
       try {
-        orgDirs = readdirSync6(sessionPath).filter((d) => !d.startsWith("."));
+        orgDirs = readdirSync8(sessionPath).filter((d) => !d.startsWith("."));
       } catch {
         continue;
       }
       for (const orgId of orgDirs) {
-        paths.push(join23(sessionPath, orgId, "memory", "CLAUDE.md"));
+        paths.push(join25(sessionPath, orgId, "memory", "CLAUDE.md"));
       }
     }
   } catch {}
@@ -12785,22 +12927,22 @@ function getCoworkMemoryClaudeMdPaths() {
 }
 function findCoworkPluginsDir() {
   return walkOrgDirs((orgDir) => {
-    const pluginsDir = join23(orgDir, "cowork_plugins");
-    return existsSync29(join23(pluginsDir, "installed_plugins.json")) ? pluginsDir : null;
+    const pluginsDir = join25(orgDir, "cowork_plugins");
+    return existsSync32(join25(pluginsDir, "installed_plugins.json")) ? pluginsDir : null;
   });
 }
 function findRpmPluginByName(pluginName) {
   return walkOrgDirs((orgDir) => {
-    const manifestPath = join23(orgDir, "rpm", "manifest.json");
-    if (!existsSync29(manifestPath))
+    const manifestPath = join25(orgDir, "rpm", "manifest.json");
+    if (!existsSync32(manifestPath))
       return null;
     try {
-      const manifest = JSON.parse(readFileSync25(manifestPath, "utf-8"));
+      const manifest = JSON.parse(readFileSync26(manifestPath, "utf-8"));
       const entry = manifest.plugins?.find((p) => p.name === pluginName);
       if (!entry?.id)
         return null;
       return {
-        pluginPath: join23(orgDir, "rpm", entry.id),
+        pluginPath: join25(orgDir, "rpm", entry.id),
         orgDir
       };
     } catch {
@@ -12822,7 +12964,7 @@ function getMarketplaceJson2() {
   };
 }
 function getCoworkSettingsPath(pluginsDir) {
-  return join23(dirname7(pluginsDir), "cowork_settings.json");
+  return join25(dirname9(pluginsDir), "cowork_settings.json");
 }
 function setCoworkPluginEnabled(pluginsDir, enabled) {
   const settingsPath = getCoworkSettingsPath(pluginsDir);
@@ -12839,8 +12981,8 @@ class ClaudeDesktopAdapter {
   async detect() {
     const os2 = platform3();
     if (os2 === "darwin")
-      return existsSync29("/Applications/Claude.app");
-    return existsSync29(getMcpConfigPath());
+      return existsSync32("/Applications/Claude.app");
+    return existsSync32(getMcpConfigPath());
   }
   supportsMcpScope(scope) {
     return scope === "user";
@@ -12870,8 +13012,8 @@ class ClaudeDesktopAdapter {
     }
     const pluginsDir = findCoworkPluginsDir();
     if (pluginsDir) {
-      const cacheDir = join23(pluginsDir, "cache", "runwork", PLUGIN_NAME2, PLUGIN_VERSION2);
-      const marketDir = join23(pluginsDir, "marketplaces", "runwork", "plugins", PLUGIN_NAME2);
+      const cacheDir = join25(pluginsDir, "cache", "runwork", PLUGIN_NAME2, PLUGIN_VERSION2);
+      const marketDir = join25(pluginsDir, "marketplaces", "runwork", "plugins", PLUGIN_NAME2);
       for (const dir of [cacheDir, marketDir]) {
         writePluginMcpConfig(dir, servers);
       }
@@ -12889,14 +13031,14 @@ class ClaudeDesktopAdapter {
       console.warn("  [Claude Desktop] Cowork plugins directory not found. Open Claude Desktop at least once first.");
       return 0;
     }
-    const cacheDir = join23(pluginsDir, "cache", "runwork", PLUGIN_NAME2, PLUGIN_VERSION2);
-    const marketRoot = join23(pluginsDir, "marketplaces", "runwork");
-    const marketDir = join23(marketRoot, "plugins", PLUGIN_NAME2);
+    const cacheDir = join25(pluginsDir, "cache", "runwork", PLUGIN_NAME2, PLUGIN_VERSION2);
+    const marketRoot = join25(pluginsDir, "marketplaces", "runwork");
+    const marketDir = join25(marketRoot, "plugins", PLUGIN_NAME2);
     for (const dir of [cacheDir, marketDir]) {
       writePluginMetadata(dir, getPluginMetadata());
       writePluginSkills(dir, skills);
     }
-    const installedPath = join23(pluginsDir, "installed_plugins.json");
+    const installedPath = join25(pluginsDir, "installed_plugins.json");
     const installed = readJsonConfig(installedPath);
     if (!installed.version)
       installed.version = 2;
@@ -12910,10 +13052,10 @@ class ClaudeDesktopAdapter {
       lastUpdated: new Date().toISOString()
     }];
     writeJsonConfig(installedPath, installed);
-    const marketCatalogDir = join23(marketRoot, ".claude-plugin");
-    mkdirSync17(marketCatalogDir, { recursive: true });
-    writeFileSync18(join23(marketCatalogDir, "marketplace.json"), JSON.stringify(getMarketplaceJson2(), null, 2));
-    const marketplacesPath = join23(pluginsDir, "known_marketplaces.json");
+    const marketCatalogDir = join25(marketRoot, ".claude-plugin");
+    mkdirSync18(marketCatalogDir, { recursive: true });
+    writeFileSync18(join25(marketCatalogDir, "marketplace.json"), JSON.stringify(getMarketplaceJson2(), null, 2));
+    const marketplacesPath = join25(pluginsDir, "known_marketplaces.json");
     const marketplaces = readJsonConfig(marketplacesPath);
     marketplaces["runwork"] = {
       source: { source: "directory", path: marketRoot },
@@ -12932,8 +13074,8 @@ class ClaudeDesktopAdapter {
     }
   }
   async buildPluginZip(skills, mcpServers, teamInstructions, outputPath) {
-    const stagingRoot = mkdtempSync3(join23(tmpdir3(), "runwork-plugin-"));
-    const pluginStagingDir = join23(stagingRoot, PLUGIN_NAME2);
+    const stagingRoot = mkdtempSync3(join25(tmpdir3(), "runwork-plugin-"));
+    const pluginStagingDir = join25(stagingRoot, PLUGIN_NAME2);
     try {
       writePluginTree(pluginStagingDir, {
         ...getPluginMetadata(),
@@ -12946,7 +13088,7 @@ class ClaudeDesktopAdapter {
       createZipFromDir(pluginStagingDir, outputPath);
     } finally {
       try {
-        rmSync6(stagingRoot, { recursive: true, force: true });
+        rmSync7(stagingRoot, { recursive: true, force: true });
       } catch {}
     }
   }
@@ -12964,15 +13106,15 @@ class ClaudeDesktopAdapter {
     const pluginsDir = findCoworkPluginsDir();
     if (!pluginsDir)
       return;
-    writePluginTeamInstructions(join23(pluginsDir, "cache", "runwork", PLUGIN_NAME2, PLUGIN_VERSION2), instructions);
-    writePluginTeamInstructions(join23(pluginsDir, "marketplaces", "runwork", "plugins", PLUGIN_NAME2), instructions);
+    writePluginTeamInstructions(join25(pluginsDir, "cache", "runwork", PLUGIN_NAME2, PLUGIN_VERSION2), instructions);
+    writePluginTeamInstructions(join25(pluginsDir, "marketplaces", "runwork", "plugins", PLUGIN_NAME2), instructions);
   }
   async writeAgentConfig(config, _scope) {
     const configPath = getMcpConfigPath();
     let desktopConfig = {};
-    if (existsSync29(configPath)) {
+    if (existsSync32(configPath)) {
       try {
-        desktopConfig = JSON.parse(readFileSync25(configPath, "utf-8"));
+        desktopConfig = JSON.parse(readFileSync26(configPath, "utf-8"));
       } catch {}
     }
     if (!desktopConfig.preferences)
@@ -13006,62 +13148,71 @@ class ClaudeDesktopAdapter {
         removeTeamInstructionsFromFile(path2);
       } catch {}
     }
-    const rpm = findRpmPluginByName(PLUGIN_NAME2);
-    if (rpm) {
-      if (existsSync29(rpm.pluginPath)) {
-        try {
-          rmSync6(rpm.pluginPath, { recursive: true, force: true });
-        } catch {}
-      }
-      const manifestPath = join23(rpm.orgDir, "rpm", "manifest.json");
-      if (existsSync29(manifestPath)) {
-        try {
-          const manifest = JSON.parse(readFileSync25(manifestPath, "utf-8"));
-          if (Array.isArray(manifest.plugins)) {
-            manifest.plugins = manifest.plugins.filter((p) => p.name !== PLUGIN_NAME2);
-            manifest.lastUpdated = Date.now();
-            writeFileSync18(manifestPath, JSON.stringify(manifest, null, 2));
-          }
-        } catch {}
-      }
+    for (const orgDir of listOrgDirs()) {
+      const manifestPath = join25(orgDir, "rpm", "manifest.json");
+      if (!existsSync32(manifestPath))
+        continue;
+      try {
+        const manifest = JSON.parse(readFileSync26(manifestPath, "utf-8"));
+        if (!Array.isArray(manifest.plugins))
+          continue;
+        const ours = manifest.plugins.filter((p) => isRunworkRpmPluginName(p.name));
+        if (!ours.length)
+          continue;
+        for (const entry of ours) {
+          if (!entry.id)
+            continue;
+          moveToTrash(join25(orgDir, "rpm", entry.id), `claude-desktop-plugin:${entry.name}`);
+        }
+        manifest.plugins = manifest.plugins.filter((p) => !isRunworkRpmPluginName(p.name));
+        manifest.lastUpdated = Date.now();
+        writeFileSync18(manifestPath, JSON.stringify(manifest, null, 2));
+      } catch {}
     }
-    const pluginsDir = findCoworkPluginsDir();
-    if (pluginsDir) {
-      const cacheRunwork = join23(pluginsDir, "cache", "runwork");
-      const marketRunwork = join23(pluginsDir, "marketplaces", "runwork");
+    for (const orgDir of listOrgDirs()) {
+      const pluginsDir = join25(orgDir, "cowork_plugins");
+      if (!existsSync32(join25(pluginsDir, "installed_plugins.json")))
+        continue;
+      const cacheRunwork = join25(pluginsDir, "cache", "runwork");
+      const marketRunwork = join25(pluginsDir, "marketplaces", "runwork");
       for (const dir of [cacheRunwork, marketRunwork]) {
-        if (existsSync29(dir)) {
+        if (existsSync32(dir)) {
           try {
-            rmSync6(dir, { recursive: true, force: true });
+            rmSync7(dir, { recursive: true, force: true });
           } catch {}
         }
       }
-      const installedPath = join23(pluginsDir, "installed_plugins.json");
-      if (existsSync29(installedPath)) {
-        try {
-          const installed = readJsonConfig(installedPath);
-          if (installed.plugins) {
-            delete installed.plugins[`${PLUGIN_NAME2}@runwork`];
-            writeJsonConfig(installedPath, installed);
+      const installedPath = join25(pluginsDir, "installed_plugins.json");
+      try {
+        const installed = readJsonConfig(installedPath);
+        if (installed.plugins) {
+          for (const key of Object.keys(installed.plugins)) {
+            if (isRunworkPluginKey(key))
+              delete installed.plugins[key];
           }
-        } catch {}
-      }
-      const marketplacesPath = join23(pluginsDir, "known_marketplaces.json");
-      if (existsSync29(marketplacesPath)) {
+          writeJsonConfig(installedPath, installed);
+        }
+      } catch {}
+      const marketplacesPath = join25(pluginsDir, "known_marketplaces.json");
+      if (existsSync32(marketplacesPath)) {
         try {
           const marketplaces = readJsonConfig(marketplacesPath);
-          delete marketplaces["runwork"];
+          delete marketplaces[RUNWORK_PLUGIN_MARKETPLACE];
           writeJsonConfig(marketplacesPath, marketplaces);
         } catch {}
       }
       const coworkSettingsPath = getCoworkSettingsPath(pluginsDir);
-      if (existsSync29(coworkSettingsPath)) {
+      if (existsSync32(coworkSettingsPath)) {
         try {
           const settings = readJsonConfig(coworkSettingsPath);
           const enabledPlugins = settings.enabledPlugins;
           if (enabledPlugins && typeof enabledPlugins === "object" && !Array.isArray(enabledPlugins)) {
-            delete enabledPlugins[`${PLUGIN_NAME2}@runwork`];
-            settings.enabledPlugins = enabledPlugins;
+            const flags = enabledPlugins;
+            for (const key of Object.keys(flags)) {
+              if (isRunworkPluginKey(key))
+                delete flags[key];
+            }
+            settings.enabledPlugins = flags;
             writeJsonConfig(coworkSettingsPath, settings);
           }
         } catch {}
@@ -13073,22 +13224,22 @@ class ClaudeDesktopAdapter {
       const os2 = platform3();
       let claudeAppDir;
       if (os2 === "darwin") {
-        claudeAppDir = join23(homedir6(), "Library", "Application Support", "Claude");
+        claudeAppDir = join25(homedir7(), "Library", "Application Support", "Claude");
       } else if (os2 === "win32") {
-        claudeAppDir = join23(process.env.APPDATA || join23(homedir6(), "AppData", "Roaming"), "Claude");
+        claudeAppDir = join25(process.env.APPDATA || join25(homedir7(), "AppData", "Roaming"), "Claude");
       } else {
-        claudeAppDir = join23(homedir6(), ".config", "Claude");
+        claudeAppDir = join25(homedir7(), ".config", "Claude");
       }
-      if (!existsSync29(claudeAppDir))
+      if (!existsSync32(claudeAppDir))
         return null;
       const sinceMs = lastSyncAt ? new Date(lastSyncAt).getTime() : 0;
       let sessionCount = 0;
       let latestActivity = 0;
       const modelsUsed = new Set;
       let maxMcpTools = 0;
-      const agentSessionsDir = join23(claudeAppDir, "local-agent-mode-sessions");
+      const agentSessionsDir = join25(claudeAppDir, "local-agent-mode-sessions");
       const activeDays = new Set;
-      if (existsSync29(agentSessionsDir)) {
+      if (existsSync32(agentSessionsDir)) {
         this.walkSessionDirs(agentSessionsDir, sinceMs, (session) => {
           const sessionTime = session.lastActivityAt ?? session.createdAt ?? 0;
           if (sessionTime > sinceMs) {
@@ -13106,8 +13257,8 @@ class ClaudeDesktopAdapter {
           }
         });
       }
-      const codeSessionsDir = join23(claudeAppDir, "claude-code-sessions");
-      if (existsSync29(codeSessionsDir)) {
+      const codeSessionsDir = join25(claudeAppDir, "claude-code-sessions");
+      if (existsSync32(codeSessionsDir)) {
         this.walkSessionDirs(codeSessionsDir, sinceMs, (session) => {
           const sessionTime = session.lastActivityAt ?? session.createdAt ?? 0;
           if (sessionTime > sinceMs) {
@@ -13121,10 +13272,10 @@ class ClaudeDesktopAdapter {
         });
       }
       let scheduledTaskRuns = 0;
-      const scheduledTasksPath = join23(claudeAppDir, "scheduled-tasks.json");
-      if (existsSync29(scheduledTasksPath)) {
+      const scheduledTasksPath = join25(claudeAppDir, "scheduled-tasks.json");
+      if (existsSync32(scheduledTasksPath)) {
         try {
-          const raw = readFileSync25(scheduledTasksPath, "utf-8");
+          const raw = readFileSync26(scheduledTasksPath, "utf-8");
           const parsed = JSON.parse(raw);
           const tasks = Array.isArray(parsed) ? parsed : Object.values(parsed);
           for (const task of tasks) {
@@ -13160,15 +13311,15 @@ class ClaudeDesktopAdapter {
       const os2 = platform3();
       let claudeAppDir;
       if (os2 === "darwin") {
-        claudeAppDir = join23(homedir6(), "Library", "Application Support", "Claude");
+        claudeAppDir = join25(homedir7(), "Library", "Application Support", "Claude");
       } else if (os2 === "win32") {
-        claudeAppDir = join23(process.env.APPDATA || join23(homedir6(), "AppData", "Roaming"), "Claude");
+        claudeAppDir = join25(process.env.APPDATA || join25(homedir7(), "AppData", "Roaming"), "Claude");
       } else {
-        claudeAppDir = join23(homedir6(), ".config", "Claude");
+        claudeAppDir = join25(homedir7(), ".config", "Claude");
       }
-      const versionPath = join23(claudeAppDir, "claude-code", "sdk-version");
-      if (existsSync29(versionPath)) {
-        return readFileSync25(versionPath, "utf-8").trim();
+      const versionPath = join25(claudeAppDir, "claude-code", "sdk-version");
+      if (existsSync32(versionPath)) {
+        return readFileSync26(versionPath, "utf-8").trim();
       }
       return null;
     } catch {
@@ -13177,31 +13328,31 @@ class ClaudeDesktopAdapter {
   }
   walkSessionDirs(baseDir, _sinceMs, onSession) {
     try {
-      for (const orgDir of readdirSync6(baseDir)) {
+      for (const orgDir of readdirSync8(baseDir)) {
         if (orgDir.startsWith(".") || orgDir === "skills-plugin")
           continue;
-        const orgPath = join23(baseDir, orgDir);
+        const orgPath = join25(baseDir, orgDir);
         try {
-          if (!statSync4(orgPath).isDirectory())
+          if (!statSync5(orgPath).isDirectory())
             continue;
         } catch {
           continue;
         }
-        for (const userDir of readdirSync6(orgPath)) {
+        for (const userDir of readdirSync8(orgPath)) {
           if (userDir.startsWith("."))
             continue;
-          const userPath = join23(orgPath, userDir);
+          const userPath = join25(orgPath, userDir);
           try {
-            if (!statSync4(userPath).isDirectory())
+            if (!statSync5(userPath).isDirectory())
               continue;
           } catch {
             continue;
           }
-          for (const file of readdirSync6(userPath)) {
+          for (const file of readdirSync8(userPath)) {
             if (!file.endsWith(".json"))
               continue;
             try {
-              const session = JSON.parse(readFileSync25(join23(userPath, file), "utf-8"));
+              const session = JSON.parse(readFileSync26(join25(userPath, file), "utf-8"));
               onSession(session);
             } catch {
               continue;
@@ -13215,9 +13366,9 @@ class ClaudeDesktopAdapter {
 
 // src/agents/cursor.ts
 init_subprocess();
-import { existsSync as existsSync30, mkdirSync as mkdirSync18, readdirSync as readdirSync7, unlinkSync as unlinkSync4, writeFileSync as writeFileSync19 } from "fs";
-import { join as join24 } from "path";
-import { homedir as homedir7, platform as platform4 } from "os";
+import { existsSync as existsSync33, mkdirSync as mkdirSync19, unlinkSync as unlinkSync4, writeFileSync as writeFileSync19 } from "fs";
+import { join as join26 } from "path";
+import { homedir as homedir8, platform as platform4 } from "os";
 
 // src/utils/sqlite-adapter.ts
 var adapter = null;
@@ -13309,7 +13460,7 @@ class CursorAdapter {
   mcpProvidesSkills = true;
   async detect() {
     const os2 = platform4();
-    if (os2 === "darwin" && existsSync30("/Applications/Cursor.app"))
+    if (os2 === "darwin" && existsSync33("/Applications/Cursor.app"))
       return true;
     return !!whichBinary("cursor");
   }
@@ -13320,7 +13471,7 @@ class CursorAdapter {
     return true;
   }
   async writeMcpServers(servers, scope) {
-    const filePath = scope === "project" ? join24(process.cwd(), ".cursor", "mcp.json") : join24(homedir7(), ".cursor", "mcp.json");
+    const filePath = scope === "project" ? join26(process.cwd(), ".cursor", "mcp.json") : join26(homedir8(), ".cursor", "mcp.json");
     const entries = {};
     for (const s of servers) {
       entries[s.name] = {
@@ -13333,8 +13484,8 @@ class CursorAdapter {
   async writeSkills(skills, scope) {
     if (scope === "user")
       return 0;
-    const rulesDir = join24(process.cwd(), ".cursor", "rules");
-    mkdirSync18(rulesDir, { recursive: true });
+    const rulesDir = join26(process.cwd(), ".cursor", "rules");
+    mkdirSync19(rulesDir, { recursive: true });
     for (const skill of skills) {
       const mdcContent = `---
 description: "${skill.description}"
@@ -13342,30 +13493,30 @@ alwaysApply: false
 ---
 
 ${skill.content}`;
-      writeFileSync19(join24(rulesDir, `${skill.filename}.mdc`), mdcContent);
+      writeFileSync19(join26(rulesDir, `${skill.filename}.mdc`), mdcContent);
     }
     return skills.length;
   }
   async writeInstructionHint(hint, scope) {
-    const filePath = scope === "project" ? join24(process.cwd(), ".cursor", "rules", "runwork.mdc") : join24(homedir7(), ".cursor", "rules", "runwork.mdc");
+    const filePath = scope === "project" ? join26(process.cwd(), ".cursor", "rules", "runwork.mdc") : join26(homedir8(), ".cursor", "rules", "runwork.mdc");
     const mdcContent = `---
 description: "Runwork workspace connection"
 alwaysApply: true
 ---
 
 ${hint}`;
-    mkdirSync18(join24(filePath, ".."), { recursive: true });
+    mkdirSync19(join26(filePath, ".."), { recursive: true });
     writeFileSync19(filePath, mdcContent);
   }
   async writeTeamInstructions(instructions, scope) {
-    const filePath = scope === "project" ? join24(process.cwd(), ".cursor", "rules", "runwork-team.mdc") : join24(homedir7(), ".cursor", "rules", "runwork-team.mdc");
+    const filePath = scope === "project" ? join26(process.cwd(), ".cursor", "rules", "runwork-team.mdc") : join26(homedir8(), ".cursor", "rules", "runwork-team.mdc");
     const mdcContent = `---
 description: "Team instructions from Runwork workspace"
 alwaysApply: true
 ---
 
 ${instructions}`;
-    mkdirSync18(join24(filePath, ".."), { recursive: true });
+    mkdirSync19(join26(filePath, ".."), { recursive: true });
     writeFileSync19(filePath, mdcContent);
   }
   async writeAgentConfig(config, scope, baseline) {
@@ -13375,7 +13526,7 @@ ${instructions}`;
       this.mergeSandboxAllowlist(config.networkAllowlist);
     }
     const globalDbPath = this.globalStorageDbPath();
-    if (!existsSync30(globalDbPath))
+    if (!existsSync33(globalDbPath))
       return;
     const db = openWritableSqlite(globalDbPath);
     if (!db) {
@@ -13411,7 +13562,7 @@ ${instructions}`;
     return;
   }
   mergeSandboxAllowlist(domains) {
-    const configPath = join24(homedir7(), ".cursor", "sandbox.json");
+    const configPath = join26(homedir8(), ".cursor", "sandbox.json");
     try {
       const config = readJsonConfig(configPath);
       if (!config.networkPolicy)
@@ -13426,29 +13577,25 @@ ${instructions}`;
       writeJsonConfig(configPath, config);
     } catch {}
   }
+  async removeSkills(skillFilenames, scope) {
+    if (scope !== "project")
+      return;
+    removeMatchingSkillFiles(join26(process.cwd(), ".cursor", "rules"), new Set(skillFilenames), ".mdc");
+  }
   async cleanup(scope, manifest) {
-    const mcpPath = scope === "project" ? join24(process.cwd(), ".cursor", "mcp.json") : join24(homedir7(), ".cursor", "mcp.json");
+    const mcpPath = scope === "project" ? join26(process.cwd(), ".cursor", "mcp.json") : join26(homedir8(), ".cursor", "mcp.json");
     removeRunworkMcpServers(mcpPath, "mcpServers");
-    const rulesDir = scope === "project" ? join24(process.cwd(), ".cursor", "rules") : join24(homedir7(), ".cursor", "rules");
-    if (existsSync30(rulesDir)) {
+    const rulesDir = scope === "project" ? join26(process.cwd(), ".cursor", "rules") : join26(homedir8(), ".cursor", "rules");
+    if (existsSync33(rulesDir)) {
       for (const file of ["runwork.mdc", "runwork-team.mdc"]) {
-        const filePath = join24(rulesDir, file);
-        if (existsSync30(filePath)) {
+        const filePath = join26(rulesDir, file);
+        if (existsSync33(filePath)) {
           try {
             unlinkSync4(filePath);
           } catch {}
         }
       }
-      if (manifest?.skillFilenames.length) {
-        const allowed = new Set(manifest.skillFilenames.map((f) => `${f}.mdc`));
-        for (const entry of readdirSync7(rulesDir)) {
-          if (allowed.has(entry)) {
-            try {
-              unlinkSync4(join24(rulesDir, entry));
-            } catch {}
-          }
-        }
-      }
+      await this.removeSkills(manifest?.skillFilenames ?? [], scope);
     }
   }
   async readUsageStats(lastSyncAt) {
@@ -13465,7 +13612,7 @@ ${instructions}`;
       let latestActivity = 0;
       let agenticSessions = 0;
       let chatSessions = 0;
-      if (existsSync30(globalDbPath)) {
+      if (existsSync33(globalDbPath)) {
         const composerResult = queryReadonlySqlite(globalDbPath, `SELECT value FROM cursorDiskKV WHERE key LIKE 'composerData:%'`);
         if (composerResult) {
           for (const line of composerResult.split(`
@@ -13523,10 +13670,10 @@ ${instructions}`;
         }
       }
       const sessionCount = newComposersWithoutId + activeComposerIds.size;
-      const trackingDbPath = join24(homedir7(), ".cursor", "ai-tracking", "ai-code-tracking.db");
+      const trackingDbPath = join26(homedir8(), ".cursor", "ai-tracking", "ai-code-tracking.db");
       let aiCommitCount = 0;
       let avgAiPercent = 0;
-      if (existsSync30(trackingDbPath)) {
+      if (existsSync33(trackingDbPath)) {
         const sinceSec = Math.floor(sinceMs / 1000);
         const commitResult = queryReadonlySqlite(trackingDbPath, `SELECT count(*), avg(CAST(v2AiPercentage AS REAL)) FROM scored_commits WHERE scoredAt > ${sinceSec}`);
         if (commitResult) {
@@ -13569,17 +13716,17 @@ ${instructions}`;
   globalStorageDbPath() {
     const os2 = platform4();
     if (os2 === "darwin") {
-      return join24(homedir7(), "Library", "Application Support", "Cursor", "User", "globalStorage", "state.vscdb");
+      return join26(homedir8(), "Library", "Application Support", "Cursor", "User", "globalStorage", "state.vscdb");
     }
     if (os2 === "win32") {
-      return join24(process.env.APPDATA || join24(homedir7(), "AppData", "Roaming"), "Cursor", "User", "globalStorage", "state.vscdb");
+      return join26(process.env.APPDATA || join26(homedir8(), "AppData", "Roaming"), "Cursor", "User", "globalStorage", "state.vscdb");
     }
-    return join24(homedir7(), ".config", "Cursor", "User", "globalStorage", "state.vscdb");
+    return join26(homedir8(), ".config", "Cursor", "User", "globalStorage", "state.vscdb");
   }
   async readSessionDigests(sinceISO) {
     try {
       const dbPath = this.globalStorageDbPath();
-      if (!existsSync30(dbPath) || !sqliteAvailable())
+      if (!existsSync33(dbPath) || !sqliteAvailable())
         return null;
       const composerRows = queryReadonlySqlite(dbPath, `SELECT json_object('id', json_extract(value,'$.composerId'), 'createdAt', json_extract(value,'$.createdAt')) FROM cursorDiskKV WHERE key LIKE 'composerData:%'`);
       const bubbleRows = queryReadonlySqlite(dbPath, `SELECT json_object('k', key, 'type', json_extract(value,'$.type'), 'text', substr(json_extract(value,'$.text'),1,2000), 'ts', json_extract(value,'$.createdAt'), 'tool', json_extract(value,'$.toolFormerData.name'), 'status', json_extract(value,'$.toolFormerData.status')) FROM cursorDiskKV WHERE key LIKE 'bubbleId:%'`);
@@ -13593,17 +13740,17 @@ ${instructions}`;
 }
 
 // src/agents/windsurf.ts
-import { existsSync as existsSync31, mkdirSync as mkdirSync19, readdirSync as readdirSync8, unlinkSync as unlinkSync5, writeFileSync as writeFileSync20 } from "fs";
-import { join as join25 } from "path";
-import { homedir as homedir8, platform as platform5 } from "os";
+import { existsSync as existsSync34, mkdirSync as mkdirSync20, unlinkSync as unlinkSync5, writeFileSync as writeFileSync20 } from "fs";
+import { join as join27 } from "path";
+import { homedir as homedir9, platform as platform5 } from "os";
 function getWindsurfDataDir() {
   if (platform5() === "win32") {
-    return join25(process.env.APPDATA || join25(homedir8(), "AppData", "Roaming"), "Codeium", "windsurf");
+    return join27(process.env.APPDATA || join27(homedir9(), "AppData", "Roaming"), "Codeium", "windsurf");
   }
-  return join25(homedir8(), ".codeium", "windsurf");
+  return join27(homedir9(), ".codeium", "windsurf");
 }
 function getConfigPath() {
-  return join25(getWindsurfDataDir(), "mcp_config.json");
+  return join27(getWindsurfDataDir(), "mcp_config.json");
 }
 
 class WindsurfAdapter {
@@ -13612,7 +13759,7 @@ class WindsurfAdapter {
   mcpProvidesSkills = true;
   async detect() {
     const os2 = platform5();
-    if (os2 === "darwin" && existsSync31("/Applications/Windsurf.app"))
+    if (os2 === "darwin" && existsSync34("/Applications/Windsurf.app"))
       return true;
     return !!whichBinary("windsurf");
   }
@@ -13635,84 +13782,80 @@ class WindsurfAdapter {
   async writeSkills(skills, scope) {
     if (scope === "user")
       return 0;
-    const rulesDir = join25(process.cwd(), ".windsurf", "rules");
-    mkdirSync19(rulesDir, { recursive: true });
+    const rulesDir = join27(process.cwd(), ".windsurf", "rules");
+    mkdirSync20(rulesDir, { recursive: true });
     for (const skill of skills) {
       const content = `---
 trigger: manual
 ---
 
 ${skill.content}`;
-      writeFileSync20(join25(rulesDir, `${skill.filename}.md`), content);
+      writeFileSync20(join27(rulesDir, `${skill.filename}.md`), content);
     }
     return skills.length;
   }
   async writeTeamInstructions(instructions, scope) {
-    const filePath = scope === "project" ? join25(process.cwd(), ".windsurf", "rules", "runwork-team.md") : join25(getWindsurfDataDir(), "rules", "runwork-team.md");
+    const filePath = scope === "project" ? join27(process.cwd(), ".windsurf", "rules", "runwork-team.md") : join27(getWindsurfDataDir(), "rules", "runwork-team.md");
     const content = `---
 trigger: always_on
 description: "Team instructions from Runwork workspace"
 ---
 
 ${instructions}`;
-    mkdirSync19(join25(filePath, ".."), { recursive: true });
+    mkdirSync20(join27(filePath, ".."), { recursive: true });
     writeFileSync20(filePath, content);
   }
   async writeInstructionHint(hint, scope) {
-    const filePath = scope === "project" ? join25(process.cwd(), ".windsurf", "rules", "runwork.md") : join25(getWindsurfDataDir(), "rules", "runwork.md");
+    const filePath = scope === "project" ? join27(process.cwd(), ".windsurf", "rules", "runwork.md") : join27(getWindsurfDataDir(), "rules", "runwork.md");
     const content = `---
 trigger: always
 ---
 
 ${hint}`;
-    mkdirSync19(join25(filePath, ".."), { recursive: true });
+    mkdirSync20(join27(filePath, ".."), { recursive: true });
     writeFileSync20(filePath, content);
   }
+  async removeSkills(skillFilenames, scope) {
+    if (scope !== "project")
+      return;
+    removeMatchingSkillFiles(join27(process.cwd(), ".windsurf", "rules"), new Set(skillFilenames), ".md");
+  }
   async cleanup(scope, manifest) {
     if (scope === "user") {
       removeRunworkMcpServers(getConfigPath(), "mcpServers");
     }
-    const rulesDir = scope === "project" ? join25(process.cwd(), ".windsurf", "rules") : join25(getWindsurfDataDir(), "rules");
-    if (existsSync31(rulesDir)) {
+    const rulesDir = scope === "project" ? join27(process.cwd(), ".windsurf", "rules") : join27(getWindsurfDataDir(), "rules");
+    if (existsSync34(rulesDir)) {
       for (const file of ["runwork.md", "runwork-team.md"]) {
-        const filePath = join25(rulesDir, file);
-        if (existsSync31(filePath)) {
+        const filePath = join27(rulesDir, file);
+        if (existsSync34(filePath)) {
           try {
             unlinkSync5(filePath);
           } catch {}
         }
       }
-      if (manifest?.skillFilenames.length) {
-        const allowed = new Set(manifest.skillFilenames.map((f) => `${f}.md`));
-        for (const entry of readdirSync8(rulesDir)) {
-          if (allowed.has(entry)) {
-            try {
-              unlinkSync5(join25(rulesDir, entry));
-            } catch {}
-          }
-        }
-      }
+      await this.removeSkills(manifest?.skillFilenames ?? [], scope);
     }
   }
 }
 
 // src/agents/codex.ts
-import { existsSync as existsSync34, mkdirSync as mkdirSync20, readdirSync as readdirSync9, readFileSync as readFileSync26, rmSync as rmSync8, statSync as statSync5, writeFileSync as writeFileSync21 } from "fs";
-import { join as join28 } from "path";
-import { homedir as homedir11 } from "os";
+import { existsSync as existsSync37, mkdirSync as mkdirSync21, readdirSync as readdirSync11, readFileSync as readFileSync27, statSync as statSync6, writeFileSync as writeFileSync21 } from "fs";
+import { join as join30 } from "path";
+import { homedir as homedir12 } from "os";
 import { parse, stringify } from "smol-toml";
 
 // src/agents/detection.ts
 import { execFile } from "child_process";
-import { existsSync as existsSync33 } from "fs";
-import { homedir as homedir10, platform as platform7 } from "os";
-import { isAbsolute as isAbsolute2, join as join27 } from "path";
+import { existsSync as existsSync36 } from "fs";
+import { homedir as homedir11, platform as platform7 } from "os";
+import { isAbsolute as isAbsolute2, join as join29 } from "path";
 import { promisify } from "util";
 
 // src/agents/registry.ts
-import { platform as platform6, homedir as homedir9 } from "os";
-import { isAbsolute, join as join26 } from "path";
-import { existsSync as existsSync32 } from "fs";
+import { platform as platform6, homedir as homedir10 } from "os";
+import { isAbsolute, join as join28 } from "path";
+import { existsSync as existsSync35 } from "fs";
 
 // src/agents/registry-data.ts
 var CLAUDE_CODE_NATIVE_INSTALL_PATHS = [
@@ -14309,7 +14452,7 @@ function resolveToAbsolute(ps, scope) {
   const resolved = resolvePlatformString(ps);
   if (!resolved)
     return;
-  return scope === "global" ? join26(homedir9(), resolved) : join26(process.cwd(), resolved);
+  return scope === "global" ? join28(homedir10(), resolved) : join28(process.cwd(), resolved);
 }
 function resolveAgentCliCommand(slug) {
   const agent = getAgent(slug);
@@ -14322,8 +14465,8 @@ function resolveAgentCliCommand(slug) {
     const resolved = resolvePlatformString(candidate);
     if (!resolved)
       continue;
-    const absolute = isAbsolute(resolved) ? resolved : join26(homedir9(), resolved);
-    if (existsSync32(absolute))
+    const absolute = isAbsolute(resolved) ? resolved : join28(homedir10(), resolved);
+    if (existsSync35(absolute))
       return absolute;
   }
   return null;
@@ -14366,13 +14509,13 @@ function resolveDetectionPath(target) {
   const resolved = resolvePlatformString(target);
   if (!resolved)
     return null;
-  return isAbsolute2(resolved) ? resolved : join27(homedir10(), resolved);
+  return isAbsolute2(resolved) ? resolved : join29(homedir11(), resolved);
 }
 function checkPath(target) {
   const absolute = resolveDetectionPath(target);
   if (!absolute)
     return null;
-  return existsSync33(absolute) ? absolute : null;
+  return existsSync36(absolute) ? absolute : null;
 }
 async function checkMacosBundleId(target) {
   if (platform7() !== "darwin")
@@ -14452,10 +14595,10 @@ class CodexAdapter {
     return true;
   }
   async writeMcpServers(servers, _scope) {
-    const configPath = join28(homedir11(), ".codex", "config.toml");
+    const configPath = join30(homedir12(), ".codex", "config.toml");
     let parsed = {};
-    if (existsSync34(configPath)) {
-      parsed = parse(readFileSync26(configPath, "utf-8"));
+    if (existsSync37(configPath)) {
+      parsed = parse(readFileSync27(configPath, "utf-8"));
     }
     if (!parsed.mcp_servers || typeof parsed.mcp_servers !== "object") {
       parsed.mcp_servers = {};
@@ -14478,48 +14621,39 @@ class CodexAdapter {
       }
       mcpServers[safeName] = entry;
     }
-    mkdirSync20(join28(configPath, ".."), { recursive: true });
+    mkdirSync21(join30(configPath, ".."), { recursive: true });
     writeFileSync21(configPath, stringify(parsed));
   }
   async writeSkills(skills, scope) {
-    const root = scope === "project" ? process.cwd() : homedir11();
-    const baseDir = join28(root, ".agents", "skills");
-    const legacyBaseDir = join28(root, ".codex", "skills");
+    const root = scope === "project" ? process.cwd() : homedir12();
+    const baseDir = join30(root, ".agents", "skills");
+    const legacyBaseDir = join30(root, ".codex", "skills");
     for (const skill of skills) {
       if (skill.name !== skill.filename) {
-        for (const dir of [join28(baseDir, skill.name), join28(legacyBaseDir, skill.name)]) {
-          if (existsSync34(dir)) {
-            try {
-              rmSync8(dir, { recursive: true, force: true });
-            } catch {}
-          }
+        for (const dir of [join30(baseDir, skill.name), join30(legacyBaseDir, skill.name)]) {
+          moveToTrash(dir, `skill renamed to ${skill.filename}`);
         }
       }
-      const legacyDir = join28(legacyBaseDir, skill.filename);
-      if (existsSync34(legacyDir)) {
-        try {
-          rmSync8(legacyDir, { recursive: true, force: true });
-        } catch {}
-      }
-      const skillDir = join28(baseDir, skill.filename);
-      mkdirSync20(skillDir, { recursive: true });
-      writeFileSync21(join28(skillDir, "SKILL.md"), buildSkillMd2(skill));
+      moveToTrash(join30(legacyBaseDir, skill.filename), "duplicate skill root consolidated");
+      const skillDir = join30(baseDir, skill.filename);
+      mkdirSync21(skillDir, { recursive: true });
+      writeFileSync21(join30(skillDir, "SKILL.md"), buildSkillMd2(skill));
     }
     return skills.length;
   }
   async writeInstructionHint(hint, scope) {
-    const filePath = scope === "project" ? join28(process.cwd(), "AGENTS.md") : join28(homedir11(), ".codex", "AGENTS.md");
+    const filePath = scope === "project" ? join30(process.cwd(), "AGENTS.md") : join30(homedir12(), ".codex", "AGENTS.md");
     writeHintToFile(filePath, hint);
   }
   async writeTeamInstructions(instructions, scope) {
-    const filePath = scope === "project" ? join28(process.cwd(), "AGENTS.md") : join28(homedir11(), ".codex", "AGENTS.md");
+    const filePath = scope === "project" ? join30(process.cwd(), "AGENTS.md") : join30(homedir12(), ".codex", "AGENTS.md");
     writeTeamInstructionsToFile(filePath, instructions);
   }
   async writeAgentConfig(config, scope) {
-    const configPath = scope === "project" ? join28(process.cwd(), ".codex", "config.toml") : join28(homedir11(), ".codex", "config.toml");
+    const configPath = scope === "project" ? join30(process.cwd(), ".codex", "config.toml") : join30(homedir12(), ".codex", "config.toml");
     let parsed = {};
-    if (existsSync34(configPath)) {
-      parsed = parse(readFileSync26(configPath, "utf-8"));
+    if (existsSync37(configPath)) {
+      parsed = parse(readFileSync27(configPath, "utf-8"));
     }
     if (config.modelPreference) {
       parsed.model = config.modelPreference;
@@ -14562,14 +14696,23 @@ class CodexAdapter {
           sww.network_access = true;
       }
     }
-    mkdirSync20(join28(configPath, ".."), { recursive: true });
+    mkdirSync21(join30(configPath, ".."), { recursive: true });
     writeFileSync21(configPath, stringify(parsed));
   }
+  async removeSkills(skillFilenames, scope) {
+    if (!skillFilenames.length)
+      return;
+    const allowed = new Set(skillFilenames);
+    const root = scope === "project" ? process.cwd() : homedir12();
+    for (const skillsDir of [join30(root, ".agents", "skills"), join30(root, ".codex", "skills")]) {
+      removeMatchingSkillDirs(skillsDir, allowed);
+    }
+  }
   async cleanup(scope, manifest) {
-    const configPath = join28(homedir11(), ".codex", "config.toml");
-    if (existsSync34(configPath)) {
+    const configPath = join30(homedir12(), ".codex", "config.toml");
+    if (existsSync37(configPath)) {
       try {
-        const parsed = parse(readFileSync26(configPath, "utf-8"));
+        const parsed = parse(readFileSync27(configPath, "utf-8"));
         if (parsed.mcp_servers && typeof parsed.mcp_servers === "object") {
           const mcpServers = parsed.mcp_servers;
           for (const key of Object.keys(mcpServers)) {
@@ -14581,27 +14724,15 @@ class CodexAdapter {
         writeFileSync21(configPath, stringify(parsed));
       } catch {}
     }
-    const cleanupRoot = scope === "project" ? process.cwd() : homedir11();
-    for (const skillsDir of [join28(cleanupRoot, ".agents", "skills"), join28(cleanupRoot, ".codex", "skills")]) {
-      if (!existsSync34(skillsDir) || !manifest?.skillFilenames.length)
-        continue;
-      const allowed = new Set(manifest.skillFilenames);
-      for (const entry of readdirSync9(skillsDir)) {
-        if (!allowed.has(entry))
-          continue;
-        try {
-          rmSync8(join28(skillsDir, entry), { recursive: true, force: true });
-        } catch {}
-      }
-    }
-    const instructionFile = scope === "project" ? join28(process.cwd(), "AGENTS.md") : join28(homedir11(), ".codex", "AGENTS.md");
+    await this.removeSkills(manifest?.skillFilenames ?? [], scope);
+    const instructionFile = scope === "project" ? join30(process.cwd(), "AGENTS.md") : join30(homedir12(), ".codex", "AGENTS.md");
     removeHintFromFile(instructionFile);
     removeTeamInstructionsFromFile(instructionFile);
   }
   async readUsageStats(lastSyncAt) {
     try {
-      const codexDir = join28(homedir11(), ".codex");
-      if (!existsSync34(codexDir))
+      const codexDir = join30(homedir12(), ".codex");
+      if (!existsSync37(codexDir))
         return null;
       const sinceMs = lastSyncAt ? new Date(lastSyncAt).getTime() : 0;
       const sinceSec = Math.floor(sinceMs / 1000);
@@ -14610,8 +14741,8 @@ class CodexAdapter {
       let tokensUsed = rollout.tokensUsed;
       let latestMs = rollout.latestMs;
       let versions = [];
-      const dbPath = join28(codexDir, "state_5.sqlite");
-      if (existsSync34(dbPath)) {
+      const dbPath = join30(codexDir, "state_5.sqlite");
+      if (existsSync37(dbPath)) {
         const countResult = queryReadonlySqlite(dbPath, `SELECT count(*) FROM threads WHERE updated_at > ${sinceSec}`);
         const dbSessionCount = parseInt(countResult) || 0;
         const tokensResult = queryReadonlySqlite(dbPath, `SELECT coalesce(sum(tokens_used), 0) FROM threads WHERE updated_at > ${sinceSec}`);
@@ -14628,9 +14759,9 @@ class CodexAdapter {
       }
       let messageCount = rollout.messageCount;
       if (messageCount === 0) {
-        const historyPath = join28(codexDir, "history.jsonl");
-        if (existsSync34(historyPath)) {
-          const content = readFileSync26(historyPath, "utf-8").trim();
+        const historyPath = join30(codexDir, "history.jsonl");
+        if (existsSync37(historyPath)) {
+          const content = readFileSync27(historyPath, "utf-8").trim();
           if (content) {
             for (const line of content.split(/[\r\n]+/)) {
               try {
@@ -14673,19 +14804,19 @@ class CodexAdapter {
       latestMs: 0,
       activeDays: []
     };
-    const sessionsDir = join28(homedir11(), ".codex", "sessions");
-    if (!existsSync34(sessionsDir))
+    const sessionsDir = join30(homedir12(), ".codex", "sessions");
+    if (!existsSync37(sessionsDir))
       return result;
     const files = [];
     const walk = (dir) => {
       let entries;
       try {
-        entries = readdirSync9(dir, { withFileTypes: true });
+        entries = readdirSync11(dir, { withFileTypes: true });
       } catch {
         return;
       }
       for (const e of entries) {
-        const full = join28(dir, e.name);
+        const full = join30(dir, e.name);
         if (e.isDirectory())
           walk(full);
         else if (e.name.startsWith("rollout-") && e.name.endsWith(".jsonl"))
@@ -14696,7 +14827,7 @@ class CodexAdapter {
     for (const file of files) {
       let stat;
       try {
-        stat = statSync5(file);
+        stat = statSync6(file);
       } catch {
         continue;
       }
@@ -14704,7 +14835,7 @@ class CodexAdapter {
         continue;
       let content;
       try {
-        content = readFileSync26(file, "utf-8");
+        content = readFileSync27(file, "utf-8");
       } catch {
         continue;
       }
@@ -14763,20 +14894,20 @@ class CodexAdapter {
   }
   async readSessionDigests(sinceISO) {
     try {
-      const sessionsDir = join28(homedir11(), ".codex", "sessions");
-      if (!existsSync34(sessionsDir))
+      const sessionsDir = join30(homedir12(), ".codex", "sessions");
+      if (!existsSync37(sessionsDir))
         return null;
       const sinceMs = sinceISO ? new Date(sinceISO).getTime() : 0;
       const files = [];
       const walk = (dir) => {
         let entries;
         try {
-          entries = readdirSync9(dir, { withFileTypes: true });
+          entries = readdirSync11(dir, { withFileTypes: true });
         } catch {
           return;
         }
         for (const e of entries) {
-          const full = join28(dir, e.name);
+          const full = join30(dir, e.name);
           if (e.isDirectory())
             walk(full);
           else if (e.name.startsWith("rollout-") && e.name.endsWith(".jsonl"))
@@ -14788,7 +14919,7 @@ class CodexAdapter {
       for (const file of files) {
         let stat;
         try {
-          stat = statSync5(file);
+          stat = statSync6(file);
         } catch {
           continue;
         }
@@ -14796,7 +14927,7 @@ class CodexAdapter {
           continue;
         let content;
         try {
-          content = readFileSync26(file, "utf-8");
+          content = readFileSync27(file, "utf-8");
         } catch {
           continue;
         }
@@ -14811,9 +14942,9 @@ class CodexAdapter {
   }
   async readVersion() {
     try {
-      const versionPath = join28(homedir11(), ".codex", "version.json");
-      if (existsSync34(versionPath)) {
-        const data = JSON.parse(readFileSync26(versionPath, "utf-8"));
+      const versionPath = join30(homedir12(), ".codex", "version.json");
+      if (existsSync37(versionPath)) {
+        const data = JSON.parse(readFileSync27(versionPath, "utf-8"));
         return data.latest_version ?? null;
       }
     } catch {}
@@ -14821,24 +14952,24 @@ class CodexAdapter {
   }
   async readSkillUsage(lastSyncAt) {
     try {
-      const sessionsDir = join28(homedir11(), ".codex", "sessions");
-      if (!existsSync34(sessionsDir))
+      const sessionsDir = join30(homedir12(), ".codex", "sessions");
+      if (!existsSync37(sessionsDir))
         return null;
       const sinceMs = lastSyncAt ? new Date(lastSyncAt).getTime() : 0;
       const skillCounts = new Map;
       const walkDir2 = (dir) => {
         let entries;
         try {
-          entries = readdirSync9(dir);
+          entries = readdirSync11(dir);
         } catch {
           return;
         }
         for (const entry of entries) {
-          const fullPath = join28(dir, entry);
+          const fullPath = join30(dir, entry);
           if (entry.endsWith(".jsonl")) {
             let fileStat;
             try {
-              fileStat = statSync5(fullPath);
+              fileStat = statSync6(fullPath);
             } catch {
               continue;
             }
@@ -14847,7 +14978,7 @@ class CodexAdapter {
             this.parseRolloutForSkills(fullPath, sinceMs, skillCounts);
           } else {
             try {
-              if (statSync5(fullPath).isDirectory())
+              if (statSync6(fullPath).isDirectory())
                 walkDir2(fullPath);
             } catch {
               continue;
@@ -14874,7 +15005,7 @@ class CodexAdapter {
   parseRolloutForSkills(filePath, sinceMs, skillCounts) {
     let content;
     try {
-      content = readFileSync26(filePath, "utf-8");
+      content = readFileSync27(filePath, "utf-8");
     } catch {
       return;
     }
@@ -14923,11 +15054,11 @@ class CodexAdapter {
     }
   }
   registerDesktopWorkspace(workspacePath, label) {
-    const statePath = join28(homedir11(), ".codex", ".codex-global-state.json");
+    const statePath = join30(homedir12(), ".codex", ".codex-global-state.json");
     let state = {};
-    if (existsSync34(statePath)) {
+    if (existsSync37(statePath)) {
       try {
-        state = JSON.parse(readFileSync26(statePath, "utf-8"));
+        state = JSON.parse(readFileSync27(statePath, "utf-8"));
       } catch {
         return "app_running";
       }
@@ -14954,7 +15085,7 @@ class CodexAdapter {
     }
     labels[workspacePath] = label;
     state["electron-workspace-root-labels"] = labels;
-    mkdirSync20(join28(statePath, ".."), { recursive: true });
+    mkdirSync21(join30(statePath, ".."), { recursive: true });
     writeFileSync21(statePath, JSON.stringify(state));
     return "written";
   }
@@ -14975,9 +15106,9 @@ class CodexDesktopAdapter extends CodexAdapter {
 }
 
 // src/agents/cline.ts
-import { existsSync as existsSync35, mkdirSync as mkdirSync21, readFileSync as readFileSync27, readdirSync as readdirSync10, rmSync as rmSync9, unlinkSync as unlinkSync6, writeFileSync as writeFileSync22 } from "fs";
-import { join as join29 } from "path";
-import { homedir as homedir12 } from "os";
+import { existsSync as existsSync38, mkdirSync as mkdirSync22, readFileSync as readFileSync28, readdirSync as readdirSync12, rmSync as rmSync10, unlinkSync as unlinkSync6, writeFileSync as writeFileSync22 } from "fs";
+import { join as join31 } from "path";
+import { homedir as homedir13 } from "os";
 class ClineAdapter {
   name = "Cline";
   slug = "cline";
@@ -14992,7 +15123,7 @@ class ClineAdapter {
     return true;
   }
   async writeMcpServers(servers, _scope) {
-    const configPath = join29(homedir12(), ".cline", "data", "settings", "cline_mcp_settings.json");
+    const configPath = join31(homedir13(), ".cline", "data", "settings", "cline_mcp_settings.json");
     const entries = {};
     for (const s of servers) {
       entries[s.name] = {
@@ -15005,35 +15136,35 @@ class ClineAdapter {
   async writeSkills(skills, scope) {
     if (scope === "user")
       return 0;
-    const rulesDir = join29(process.cwd(), ".clinerules");
-    mkdirSync21(rulesDir, { recursive: true });
+    const rulesDir = join31(process.cwd(), ".clinerules");
+    mkdirSync22(rulesDir, { recursive: true });
     for (const skill of skills) {
-      writeFileSync22(join29(rulesDir, `${skill.filename}.md`), buildSkillMd2(skill));
+      writeFileSync22(join31(rulesDir, `${skill.filename}.md`), buildSkillMd2(skill));
     }
     return skills.length;
   }
   async writeInstructionHint(hint, scope) {
     if (scope === "user")
       return;
-    const filePath = join29(process.cwd(), ".clinerules", "runwork.md");
-    mkdirSync21(join29(filePath, ".."), { recursive: true });
+    const filePath = join31(process.cwd(), ".clinerules", "runwork.md");
+    mkdirSync22(join31(filePath, ".."), { recursive: true });
     writeFileSync22(filePath, hint);
   }
   async writeTeamInstructions(instructions, scope) {
     if (scope === "user")
       return;
-    const filePath = join29(process.cwd(), ".clinerules", "runwork-team.md");
-    mkdirSync21(join29(filePath, ".."), { recursive: true });
+    const filePath = join31(process.cwd(), ".clinerules", "runwork-team.md");
+    mkdirSync22(join31(filePath, ".."), { recursive: true });
     writeFileSync22(filePath, instructions);
   }
   async writeAgentConfig(config, scope) {
     if (scope !== "user")
       return;
-    const globalStatePath = join29(homedir12(), ".cline", "data", "globalState.json");
+    const globalStatePath = join31(homedir13(), ".cline", "data", "globalState.json");
     let state = {};
-    if (existsSync35(globalStatePath)) {
+    if (existsSync38(globalStatePath)) {
       try {
-        state = JSON.parse(readFileSync27(globalStatePath, "utf-8"));
+        state = JSON.parse(readFileSync28(globalStatePath, "utf-8"));
       } catch {}
     }
     if (config.modelPreference) {
@@ -15054,38 +15185,34 @@ class ClineAdapter {
         state.autoApprovalSettings.enabled = false;
       }
     }
-    mkdirSync21(join29(globalStatePath, ".."), { recursive: true });
+    mkdirSync22(join31(globalStatePath, ".."), { recursive: true });
     writeFileSync22(globalStatePath, JSON.stringify(state, null, 2));
   }
+  async removeSkills(skillFilenames, scope) {
+    if (scope !== "project")
+      return;
+    removeMatchingSkillFiles(join31(process.cwd(), ".clinerules"), new Set(skillFilenames), ".md");
+  }
   async cleanup(scope, manifest) {
     if (scope === "user") {
-      const configPath = join29(homedir12(), ".cline", "data", "settings", "cline_mcp_settings.json");
+      const configPath = join31(homedir13(), ".cline", "data", "settings", "cline_mcp_settings.json");
       removeRunworkMcpServers(configPath, "mcpServers");
     }
     if (scope === "project") {
-      const rulesDir = join29(process.cwd(), ".clinerules");
-      if (existsSync35(rulesDir)) {
+      const rulesDir = join31(process.cwd(), ".clinerules");
+      if (existsSync38(rulesDir)) {
         for (const file of ["runwork.md", "runwork-team.md"]) {
-          const filePath = join29(rulesDir, file);
-          if (existsSync35(filePath)) {
+          const filePath = join31(rulesDir, file);
+          if (existsSync38(filePath)) {
             try {
               unlinkSync6(filePath);
             } catch {}
           }
         }
-        if (manifest?.skillFilenames.length) {
-          const allowed = new Set(manifest.skillFilenames.map((f) => `${f}.md`));
-          for (const entry of readdirSync10(rulesDir)) {
-            if (allowed.has(entry)) {
-              try {
-                unlinkSync6(join29(rulesDir, entry));
-              } catch {}
-            }
-          }
-        }
+        await this.removeSkills(manifest?.skillFilenames ?? [], scope);
         try {
-          if (readdirSync10(rulesDir).length === 0)
-            rmSync9(rulesDir, { recursive: true });
+          if (readdirSync12(rulesDir).length === 0)
+            rmSync10(rulesDir, { recursive: true });
         } catch {}
       }
     }
@@ -15093,9 +15220,9 @@ class ClineAdapter {
 }
 
 // src/agents/gemini.ts
-import { existsSync as existsSync36, mkdirSync as mkdirSync22, readdirSync as readdirSync11, readFileSync as readFileSync28, rmSync as rmSync10, statSync as statSync6, writeFileSync as writeFileSync23 } from "fs";
-import { join as join30 } from "path";
-import { homedir as homedir13 } from "os";
+import { existsSync as existsSync39, mkdirSync as mkdirSync23, readdirSync as readdirSync13, readFileSync as readFileSync29, statSync as statSync7, writeFileSync as writeFileSync23 } from "fs";
+import { join as join32 } from "path";
+import { homedir as homedir14 } from "os";
 class GeminiAdapter {
   name = "Gemini CLI";
   slug = "gemini";
@@ -15110,7 +15237,7 @@ class GeminiAdapter {
     return true;
   }
   async writeMcpServers(servers, _scope) {
-    const configPath = join30(homedir13(), ".gemini", "settings.json");
+    const configPath = join32(homedir14(), ".gemini", "settings.json");
     const entries = {};
     for (const s of servers) {
       entries[s.name] = {
@@ -15121,36 +15248,31 @@ class GeminiAdapter {
     mergeJsonMcpServers(configPath, entries, "mcpServers");
   }
   async writeSkills(skills, scope) {
-    const baseDir = scope === "project" ? join30(process.cwd(), ".gemini", "skills") : join30(homedir13(), ".gemini", "skills");
+    const baseDir = scope === "project" ? join32(process.cwd(), ".gemini", "skills") : join32(homedir14(), ".gemini", "skills");
     for (const skill of skills) {
       if (skill.name !== skill.filename) {
-        const oldDir = join30(baseDir, skill.name);
-        if (existsSync36(oldDir)) {
-          try {
-            rmSync10(oldDir, { recursive: true, force: true });
-          } catch {}
-        }
+        moveToTrash(join32(baseDir, skill.name), `skill renamed to ${skill.filename}`);
       }
-      const skillDir = join30(baseDir, skill.filename);
-      mkdirSync22(skillDir, { recursive: true });
-      writeFileSync23(join30(skillDir, "SKILL.md"), buildSkillMd2(skill));
+      const skillDir = join32(baseDir, skill.filename);
+      mkdirSync23(skillDir, { recursive: true });
+      writeFileSync23(join32(skillDir, "SKILL.md"), buildSkillMd2(skill));
     }
     return skills.length;
   }
   async writeInstructionHint(hint, scope) {
-    const filePath = scope === "project" ? join30(process.cwd(), "GEMINI.md") : join30(homedir13(), ".gemini", "GEMINI.md");
+    const filePath = scope === "project" ? join32(process.cwd(), "GEMINI.md") : join32(homedir14(), ".gemini", "GEMINI.md");
     writeHintToFile(filePath, hint);
   }
   async writeTeamInstructions(instructions, scope) {
-    const filePath = scope === "project" ? join30(process.cwd(), "GEMINI.md") : join30(homedir13(), ".gemini", "GEMINI.md");
+    const filePath = scope === "project" ? join32(process.cwd(), "GEMINI.md") : join32(homedir14(), ".gemini", "GEMINI.md");
     writeTeamInstructionsToFile(filePath, instructions);
   }
   async writeAgentConfig(config, scope) {
-    const settingsPath = scope === "project" ? join30(process.cwd(), ".gemini", "settings.json") : join30(homedir13(), ".gemini", "settings.json");
+    const settingsPath = scope === "project" ? join32(process.cwd(), ".gemini", "settings.json") : join32(homedir14(), ".gemini", "settings.json");
     let settings = {};
-    if (existsSync36(settingsPath)) {
+    if (existsSync39(settingsPath)) {
       try {
-        settings = JSON.parse(readFileSync28(settingsPath, "utf-8"));
+        settings = JSON.parse(readFileSync29(settingsPath, "utf-8"));
       } catch {}
     }
     if (config.modelPreference) {
@@ -15168,13 +15290,13 @@ class GeminiAdapter {
         settings.tools = {};
       settings.tools.exclude = config.permissionRules.deny;
     }
-    mkdirSync22(join30(settingsPath, ".."), { recursive: true });
+    mkdirSync23(join32(settingsPath, ".."), { recursive: true });
     writeFileSync23(settingsPath, JSON.stringify(settings, null, 2));
   }
   async readUsageStats(lastSyncAt) {
     try {
-      const tmpDir = join30(homedir13(), ".gemini", "tmp");
-      if (!existsSync36(tmpDir))
+      const tmpDir = join32(homedir14(), ".gemini", "tmp");
+      if (!existsSync39(tmpDir))
         return null;
       const sinceMs = lastSyncAt ? new Date(lastSyncAt).getTime() : 0;
       let sessionCount = 0;
@@ -15183,27 +15305,27 @@ class GeminiAdapter {
       const activeDays = new Set;
       let projects;
       try {
-        projects = readdirSync11(tmpDir, { withFileTypes: true });
+        projects = readdirSync13(tmpDir, { withFileTypes: true });
       } catch {
         return null;
       }
       for (const project of projects) {
         if (!project.isDirectory())
           continue;
-        const chatsDir = join30(tmpDir, project.name, "chats");
+        const chatsDir = join32(tmpDir, project.name, "chats");
         let files;
         try {
-          files = readdirSync11(chatsDir, { withFileTypes: true });
+          files = readdirSync13(chatsDir, { withFileTypes: true });
         } catch {
           continue;
         }
         for (const file of files) {
           if (!file.name.startsWith("session-") || !file.name.endsWith(".json"))
             continue;
-          const filePath = join30(chatsDir, file.name);
+          const filePath = join32(chatsDir, file.name);
           let stat;
           try {
-            stat = statSync6(filePath);
+            stat = statSync7(filePath);
           } catch {
             continue;
           }
@@ -15211,7 +15333,7 @@ class GeminiAdapter {
             continue;
           let session;
           try {
-            session = JSON.parse(readFileSync28(filePath, "utf-8"));
+            session = JSON.parse(readFileSync29(filePath, "utf-8"));
           } catch {
             continue;
           }
@@ -15251,31 +15373,25 @@ class GeminiAdapter {
       return null;
     }
   }
+  async removeSkills(skillFilenames, scope) {
+    const skillsDir = scope === "project" ? join32(process.cwd(), ".gemini", "skills") : join32(homedir14(), ".gemini", "skills");
+    removeMatchingSkillDirs(skillsDir, new Set(skillFilenames));
+  }
   async cleanup(scope, manifest) {
     if (scope === "user") {
-      removeRunworkMcpServers(join30(homedir13(), ".gemini", "settings.json"), "mcpServers");
+      removeRunworkMcpServers(join32(homedir14(), ".gemini", "settings.json"), "mcpServers");
     }
-    const skillsDir = scope === "project" ? join30(process.cwd(), ".gemini", "skills") : join30(homedir13(), ".gemini", "skills");
-    if (existsSync36(skillsDir) && manifest?.skillFilenames.length) {
-      const allowed = new Set(manifest.skillFilenames);
-      for (const entry of readdirSync11(skillsDir)) {
-        if (!allowed.has(entry))
-          continue;
-        try {
-          rmSync10(join30(skillsDir, entry), { recursive: true, force: true });
-        } catch {}
-      }
-    }
-    const instructionFile = scope === "project" ? join30(process.cwd(), "GEMINI.md") : join30(homedir13(), ".gemini", "GEMINI.md");
+    await this.removeSkills(manifest?.skillFilenames ?? [], scope);
+    const instructionFile = scope === "project" ? join32(process.cwd(), "GEMINI.md") : join32(homedir14(), ".gemini", "GEMINI.md");
     removeHintFromFile(instructionFile);
     removeTeamInstructionsFromFile(instructionFile);
   }
 }
 
 // src/agents/generic-adapter.ts
-import { existsSync as existsSync37, mkdirSync as mkdirSync23, readdirSync as readdirSync12, rmSync as rmSync11, writeFileSync as writeFileSync24 } from "fs";
-import { join as join31 } from "path";
-import { homedir as homedir14 } from "os";
+import { existsSync as existsSync40, mkdirSync as mkdirSync24, rmSync as rmSync12, writeFileSync as writeFileSync24 } from "fs";
+import { join as join33 } from "path";
+import { homedir as homedir15 } from "os";
 class GenericAgentAdapter {
   name;
   slug;
@@ -15300,7 +15416,7 @@ class GenericAgentAdapter {
   async writeMcpServers(servers, _scope) {
     if (!this.def.mcpConfigPath)
       return;
-    const filePath = join31(homedir14(), resolvePlatformString(this.def.mcpConfigPath) || "");
+    const filePath = join33(homedir15(), resolvePlatformString(this.def.mcpConfigPath) || "");
     if (!filePath)
       return;
     const entries = {};
@@ -15324,16 +15440,16 @@ class GenericAgentAdapter {
       return 0;
     for (const skill of skills) {
       if (skill.name !== skill.filename) {
-        const oldDir = join31(baseDir, skill.name);
-        if (existsSync37(oldDir)) {
+        const oldDir = join33(baseDir, skill.name);
+        if (existsSync40(oldDir)) {
           try {
-            rmSync11(oldDir, { recursive: true, force: true });
+            rmSync12(oldDir, { recursive: true, force: true });
           } catch {}
         }
       }
-      const skillDir = join31(baseDir, skill.filename);
-      mkdirSync23(skillDir, { recursive: true });
-      writeFileSync24(join31(skillDir, "SKILL.md"), buildSkillMd2(skill));
+      const skillDir = join33(baseDir, skill.filename);
+      mkdirSync24(skillDir, { recursive: true });
+      writeFileSync24(join33(skillDir, "SKILL.md"), buildSkillMd2(skill));
     }
     return skills.length;
   }
@@ -15359,31 +15475,25 @@ class GenericAgentAdapter {
       return;
     writeTeamInstructionsToFile(filePath, instructions);
   }
+  async removeSkills(skillFilenames, scope) {
+    if (!this.def.skillsPaths || !skillFilenames.length)
+      return;
+    const pathTemplate = scope === "project" ? this.def.skillsPaths.project : this.def.skillsPaths.global;
+    if (!pathTemplate)
+      return;
+    const baseDir = resolveToAbsolute(pathTemplate, scope === "project" ? "project" : "global");
+    if (baseDir)
+      removeMatchingSkillDirs(baseDir, new Set(skillFilenames));
+  }
   async cleanup(scope, manifest) {
     if (this.def.mcpConfigPath && scope === "user") {
       const resolved = resolvePlatformString(this.def.mcpConfigPath);
       if (resolved) {
-        const filePath = join31(homedir14(), resolved);
+        const filePath = join33(homedir15(), resolved);
         removeRunworkMcpServers(filePath, this.def.mcpConfigKey || "mcpServers");
       }
     }
-    if (this.def.skillsPaths && manifest?.skillFilenames.length) {
-      const pathTemplate = scope === "project" ? this.def.skillsPaths.project : this.def.skillsPaths.global;
-      if (pathTemplate) {
-        const baseDir = resolveToAbsolute(pathTemplate, scope === "project" ? "project" : "global");
-        if (baseDir && existsSync37(baseDir)) {
-          const allowed = new Set(manifest.skillFilenames);
-          for (const entry of readdirSync12(baseDir)) {
-            if (!allowed.has(entry))
-              continue;
-            const entryPath = join31(baseDir, entry);
-            try {
-              rmSync11(entryPath, { recursive: true, force: true });
-            } catch {}
-          }
-        }
-      }
-    }
+    await this.removeSkills(manifest?.skillFilenames ?? [], scope);
     if (this.def.instructionFile) {
       const pathTemplate = scope === "project" ? this.def.instructionFile.project : this.def.instructionFile.global;
       if (pathTemplate) {
@@ -15459,27 +15569,26 @@ function insightLocalKey(teaches, slug) {
 }
 
 // src/reflect/insight-store.ts
-import { existsSync as existsSync38, mkdirSync as mkdirSync24, readFileSync as readFileSync29, writeFileSync as writeFileSync25 } from "fs";
-import { join as join32 } from "path";
-import { homedir as homedir15 } from "os";
+init_atomic_json();
+import { existsSync as existsSync41, readFileSync as readFileSync30 } from "fs";
+import { join as join34 } from "path";
+import { homedir as homedir16 } from "os";
 function storePath() {
-  return join32(homedir15(), ".runwork", "insights.json");
+  return join34(homedir16(), ".runwork", "insights.json");
 }
 function readAll() {
   const path2 = storePath();
-  if (!existsSync38(path2))
+  if (!existsSync41(path2))
     return {};
   try {
-    const parsed = JSON.parse(readFileSync29(path2, "utf-8"));
+    const parsed = JSON.parse(readFileSync30(path2, "utf-8"));
     return parsed && typeof parsed === "object" ? parsed : {};
   } catch {
     return {};
   }
 }
 function writeAll(store) {
-  const path2 = storePath();
-  mkdirSync24(join32(homedir15(), ".runwork"), { recursive: true });
-  writeFileSync25(path2, JSON.stringify(store, null, 2));
+  writeJsonAtomic(storePath(), store);
 }
 function notExpired(i, now) {
   const t = new Date(i.expiresAt).getTime();
@@ -15499,37 +15608,43 @@ function loadInsights(opts = {}) {
   const now = Date.now();
   return Object.values(readAll()).filter((i) => notExpired(i, now) && (!opts.workspaceId || i.workspaceId === opts.workspaceId)).sort((a, b) => (b.createdAt ?? "").localeCompare(a.createdAt ?? ""));
 }
-function getInsight(id) {
+function getInsight(id, opts = {}) {
   const i = readAll()[id];
-  return i && notExpired(i, Date.now()) ? i : null;
+  if (!i || !notExpired(i, Date.now()))
+    return null;
+  const allowed = (opts.workspaceIds ?? []).filter((w) => !!w);
+  if (allowed.length && i.workspaceId && i.workspaceId !== "local" && !allowed.includes(i.workspaceId)) {
+    return null;
+  }
+  return i;
 }
 
 // src/reflect/cadence.ts
-import { existsSync as existsSync39, mkdirSync as mkdirSync25, readFileSync as readFileSync30, writeFileSync as writeFileSync26 } from "fs";
-import { join as join33 } from "path";
-import { homedir as homedir16 } from "os";
+init_atomic_json();
+import { existsSync as existsSync42, readFileSync as readFileSync31 } from "fs";
+import { join as join35 } from "path";
+import { homedir as homedir17 } from "os";
 var DEFAULT_STATE = { enabled: false, lastReflectedAt: null };
 var COOLDOWN_HOURS = 20;
 var ACTIVE_SESSION_THRESHOLD = 10;
 var MAX_INTERVAL_HOURS = 7 * 24;
 var MIN_SESSIONS_FIRST_RUN = 3;
 function statePath() {
-  return join33(homedir16(), ".runwork", "reflect-state.json");
+  return join35(homedir17(), ".runwork", "reflect-state.json");
 }
 function loadCadenceState() {
   try {
     const p = statePath();
-    if (!existsSync39(p))
+    if (!existsSync42(p))
       return { ...DEFAULT_STATE };
-    const parsed = JSON.parse(readFileSync30(p, "utf-8"));
+    const parsed = JSON.parse(readFileSync31(p, "utf-8"));
     return { ...DEFAULT_STATE, ...parsed && typeof parsed === "object" ? parsed : {} };
   } catch {
     return { ...DEFAULT_STATE };
   }
 }
 function saveCadenceState(state) {
-  mkdirSync25(join33(homedir16(), ".runwork"), { recursive: true });
-  writeFileSync26(statePath(), JSON.stringify(state, null, 2));
+  writeJsonAtomic(statePath(), state);
 }
 function recordReflection(now = new Date) {
   saveCadenceState({ ...loadCadenceState(), lastReflectedAt: now.toISOString() });
@@ -15551,7 +15666,40 @@ function isReflectionDue(state, newSessionCount, now = new Date) {
   return hoursSince >= MAX_INTERVAL_HOURS;
 }
 
+// src/utils/workspace-state.ts
+init_atomic_json();
+import { join as join36 } from "path";
+import { homedir as homedir18 } from "os";
+function storePath2() {
+  return join36(homedir18(), ".runwork", "workspaces.json");
+}
+function readFile() {
+  const parsed = readJsonOrNull(storePath2());
+  if (parsed && parsed.workspaces && typeof parsed.workspaces === "object")
+    return parsed;
+  return { workspaces: {} };
+}
+function loadWorkspaceRecord(workspaceId) {
+  return readFile().workspaces[workspaceId] ?? {};
+}
+function updateWorkspaceRecord(workspaceId, patch) {
+  if (!workspaceId)
+    return;
+  const file = readFile();
+  file.workspaces[workspaceId] = { ...file.workspaces[workspaceId], ...patch };
+  writeJsonAtomic(storePath2(), file);
+}
+function clearParkedState(workspaceId) {
+  const file = readFile();
+  const record = file.workspaces[workspaceId];
+  if (!record?.parked)
+    return;
+  delete record.parked;
+  writeJsonAtomic(storePath2(), file);
+}
+
 // src/commands/reflect.ts
+init_atomic_json();
 init_colors();
 var MAX_NAMES = 40;
 function cap(names) {
@@ -15667,7 +15815,7 @@ function runAnalyst(binary, args, prompt, timeoutMs = ANALYST_TIMEOUT_MS) {
     }
   });
 }
-function enrichInsights(evidence, userSeed) {
+function enrichInsights(evidence, userSeed, workspaceScope) {
   const insights = evidence?.insights;
   if (!Array.isArray(insights))
     return [];
@@ -15681,7 +15829,7 @@ function enrichInsights(evidence, userSeed) {
     if (!teaches || !slug)
       continue;
     items.push({
-      id: computeInsightId(userSeed, insightLocalKey(teaches, slug)),
+      id: computeInsightId(userSeed, `${workspaceScope}:${insightLocalKey(teaches, slug)}`),
       source: "reflection",
       teaches,
       dimension: typeof r.dimension === "string" ? r.dimension : undefined,
@@ -15760,8 +15908,8 @@ var reflectCommand = new Command14("reflect").description("Weekly reflection: an
   const save = (file, content) => {
     if (!outDir)
       return;
-    mkdirSync26(outDir, { recursive: true });
-    writeFileSync27(join34(outDir, file), content);
+    mkdirSync25(outDir, { recursive: true });
+    writeFileSync25(join37(outDir, file), content);
   };
   const adapters = await detectAgents();
   const digests = [];
@@ -15819,14 +15967,23 @@ Skipping: ${cadence.enabled ? "not enough new work since the last reflection" :
       return;
     }
   }
+  let client;
+  let workspaceId;
+  try {
+    client = new ApiClient(requireAuth());
+    workspaceId = (await resolveWorkspace2(client, {})).workspaceId;
+  } catch {
+    try {
+      workspaceId = requireAuth().defaultWorkspaceId;
+    } catch {}
+  }
   {
-    let allowed = loadCadenceState().workspaceReflectionEnabled ?? true;
+    const perWorkspace = workspaceId ? loadWorkspaceRecord(workspaceId).reflectionEnabled : undefined;
+    let allowed = perWorkspace ?? loadCadenceState().workspaceReflectionEnabled ?? true;
     try {
-      const client = new ApiClient(requireAuth());
-      const { workspaceId } = await resolveWorkspace2(client, {});
-      if (workspaceId) {
+      if (client && workspaceId) {
         allowed = (await client.getReflectionSetting(workspaceId)).reflectionEnabled;
-        saveCadenceState({ ...loadCadenceState(), workspaceReflectionEnabled: allowed });
+        updateWorkspaceRecord(workspaceId, { reflectionEnabled: allowed });
       }
     } catch {}
     if (!allowed) {
@@ -15901,21 +16058,11 @@ Analyst failed: ${e instanceof Error ? e.message : String(e)}`));
       return "local";
     }
   })();
-  const items = evidence ? enrichInsights(evidence, userSeed) : [];
+  const items = evidence ? enrichInsights(evidence, userSeed, workspaceId ?? "local") : [];
   if (evidence)
     save("evidence.json", JSON.stringify(evidence, null, 2));
   save("insights.json", JSON.stringify(items, null, 2));
   if (items.length > 0) {
-    let client;
-    let workspaceId;
-    try {
-      client = new ApiClient(requireAuth());
-      workspaceId = (await resolveWorkspace2(client, {})).workspaceId;
-    } catch {
-      try {
-        workspaceId = requireAuth().defaultWorkspaceId;
-      } catch {}
-    }
     const nowIso = new Date().toISOString();
     const expiresIso = new Date(Date.now() + 30 * 24 * 60 * 60 * 1000).toISOString();
     saveInsights(items.map((it) => ({
@@ -15985,8 +16132,9 @@ reflectCommand.command("show [id]").description("Show reflection insights stored
   try {
     workspaceId = requireAuth().defaultWorkspaceId;
   } catch {}
+  const projectWorkspaceId = readJsonOrNull(join37(process.cwd(), ".runwork.json"))?.workspaceId;
   if (id) {
-    const insight = getInsight(id);
+    const insight = getInsight(id, { workspaceIds: [projectWorkspaceId, workspaceId] });
     if (!insight) {
       if (wantJson) {
         jsonOut({ error: "not-found", id });
@@ -16027,16 +16175,16 @@ import * as path3 from "node:path";
 init_prompt();
 
 // src/utils/data-input.ts
-import { readFileSync as readFileSync31, existsSync as existsSync40 } from "fs";
+import { readFileSync as readFileSync32, existsSync as existsSync43 } from "fs";
 async function parseDataInput(dataFlag) {
   if (dataFlag) {
     if (dataFlag.startsWith("@")) {
       const filePath = dataFlag.slice(1);
-      if (!existsSync40(filePath)) {
+      if (!existsSync43(filePath)) {
         console.error(`File not found: ${filePath}`);
         process.exit(1);
       }
-      const content = readFileSync31(filePath, "utf-8");
+      const content = readFileSync32(filePath, "utf-8");
       return parseJson(content, filePath);
     }
     return parseJson(dataFlag, "--data");
@@ -17051,8 +17199,8 @@ var endpointsCommand = new Command18("endpoints").alias("routes").description("M
 init_store();
 init_client();
 import { Command as Command19 } from "commander";
-import { writeFileSync as writeFileSync29, readFileSync as readFileSync32 } from "fs";
-import { basename as basename2 } from "path";
+import { writeFileSync as writeFileSync27, readFileSync as readFileSync33 } from "fs";
+import { basename as basename3 } from "path";
 init_prompt();
 init_http();
 function formatSize(bytes) {
@@ -17138,14 +17286,14 @@ var downloadCommand = new Command19("download").description("Download a file fro
   const credentials = requireAuth();
   const client = new ApiClient(credentials);
   const { workspaceId } = await resolveWorkspace2(client, opts);
-  const outputPath = output || basename2(key);
+  const outputPath = output || basename3(key);
   try {
     const { url } = await client.getPresignedUrl(workspaceId, bucket, { action: "read", key });
     const response = await httpFetch(url);
     if (!response.ok) {
       throw new Error(`Download failed: ${response.status} ${response.statusText}`);
     }
-    writeFileSync29(outputPath, Buffer.from(await response.arrayBuffer()));
+    writeFileSync27(outputPath, Buffer.from(await response.arrayBuffer()));
     if (useJson) {
       jsonOut({ success: true, bucket, key, outputPath });
       return;
@@ -17161,9 +17309,9 @@ var uploadCommand = new Command19("upload").description("Upload a local file to
   const credentials = requireAuth();
   const client = new ApiClient(credentials);
   const { workspaceId } = await resolveWorkspace2(client, opts);
-  const objectKey = key || basename2(localPath);
+  const objectKey = key || basename3(localPath);
   try {
-    const fileBuffer = readFileSync32(localPath);
+    const fileBuffer = readFileSync33(localPath);
     const { url } = await client.getPresignedUrl(workspaceId, bucket, { action: "write", key: objectKey });
     const response = await httpFetch(url, { method: "PUT", body: fileBuffer });
     if (!response.ok) {
@@ -17659,21 +17807,21 @@ function truncateUrl(url, max) {
 var mcpCommand = new Command23("mcp").description("Manage workspace MCP servers").addCommand(listCommand11).addCommand(addCommand).addCommand(removeCommand).addCommand(searchCommand3).addCommand(installCommand2);
 
 // src/commands/setup.ts
+init_atomic_json();
 init_store();
 init_client();
 import { Command as Command25 } from "commander";
-import { writeFileSync as writeFileSync31, mkdirSync as mkdirSync28 } from "fs";
-import { join as join39 } from "path";
-import { homedir as homedir19 } from "os";
+import { join as join41 } from "path";
+import { homedir as homedir20 } from "os";
 init_prompt();
 
 // src/commands/sync.ts
 init_store();
 init_client();
 import { Command as Command24 } from "commander";
-import { readFileSync as readFileSync33, writeFileSync as writeFileSync30, existsSync as existsSync42 } from "fs";
-import { join as join37 } from "path";
-import { homedir as homedir17 } from "os";
+import { readFileSync as readFileSync34, existsSync as existsSync45 } from "fs";
+import { join as join40 } from "path";
+import { homedir as homedir19 } from "os";
 
 // src/commands/mcp-entries.ts
 function buildExternalMcpEntries(mcpServers, resolvedCredentials) {
@@ -18651,6 +18799,9 @@ function computeSyncPlan(input) {
   return plan;
 }
 
+// src/commands/sync.ts
+init_atomic_json();
+
 // src/sync/conflict-ui.ts
 init_prompt();
 init_colors();
@@ -18837,8 +18988,20 @@ async function executeSyncPlan(plan, resolvedConflicts, ctx) {
     }
   }
   for (const _action of plan.skips) {}
-  for (const action of plan.deletions) {
-    vlog(`  Deleted locally: ${action.name}`);
+  const deletionSlugs = plan.deletions.map((action) => toSlug(action.name));
+  if (deletionSlugs.length) {
+    for (const adapter2 of ctx.adapters) {
+      if (!adapter2.supportsSkills() || !adapter2.removeSkills)
+        continue;
+      for (const scope of ctx.scopes) {
+        try {
+          await adapter2.removeSkills(deletionSlugs, scope);
+        } catch {}
+      }
+    }
+    for (const action of plan.deletions) {
+      vlog(`  Deleted locally: ${action.name}`);
+    }
   }
   return newHashes;
 }
@@ -18931,10 +19094,10 @@ Tip: ${hint.title}`);
   } catch {}
 }
 function loadSetupState(filePath) {
-  if (!existsSync42(filePath))
+  if (!existsSync45(filePath))
     return null;
   try {
-    return JSON.parse(readFileSync33(filePath, "utf-8"));
+    return JSON.parse(readFileSync34(filePath, "utf-8"));
   } catch {
     return null;
   }
@@ -18955,15 +19118,15 @@ function readLocalSkills(state) {
     if (!baseDir)
       continue;
     for (const skillName of state.skills) {
-      const skillMdPath = join37(baseDir, skillName, "SKILL.md");
-      if (existsSync42(skillMdPath)) {
-        results.push({ name: skillName, content: readFileSync33(skillMdPath, "utf-8") });
+      const skillMdPath = join40(baseDir, skillName, "SKILL.md");
+      if (existsSync45(skillMdPath)) {
+        results.push({ name: skillName, content: readFileSync34(skillMdPath, "utf-8") });
         continue;
       }
       const filename = skillName.toLowerCase().replace(/[^a-z0-9]+/g, "-");
-      const flatPath = join37(baseDir, `${filename}.md`);
-      if (existsSync42(flatPath)) {
-        results.push({ name: skillName, content: readFileSync33(flatPath, "utf-8") });
+      const flatPath = join40(baseDir, `${filename}.md`);
+      if (existsSync45(flatPath)) {
+        results.push({ name: skillName, content: readFileSync34(flatPath, "utf-8") });
       }
     }
     if (results.length > 0)
@@ -19167,9 +19330,9 @@ async function syncFromState(state, statePath2, credentials, opts) {
     persona: state.persona
   });
   let projectAppSkillFilter = null;
-  if (existsSync42(".runwork.json")) {
+  if (existsSync45(".runwork.json")) {
     try {
-      const config = JSON.parse(readFileSync33(".runwork.json", "utf-8"));
+      const config = JSON.parse(readFileSync34(".runwork.json", "utf-8"));
       if (config.appName) {
         projectAppSkillFilter = config.appName.toLowerCase().replace(/[^a-z0-9]+/g, "-");
       }
@@ -19406,7 +19569,7 @@ async function syncFromState(state, statePath2, credentials, opts) {
   }
   for (const adapter2 of adapters) {
     if (adapter2 instanceof CodexAdapter) {
-      const runworkDir = join37(homedir17(), ".runwork");
+      const runworkDir = join40(homedir19(), ".runwork");
       const result = adapter2.registerDesktopWorkspace(runworkDir, "Runwork");
       if (result === "written") {
         vlog(`  [${adapter2.name}] Registered workspace in Codex desktop app`);
@@ -19481,7 +19644,7 @@ async function syncFromState(state, statePath2, credentials, opts) {
     delete mergedHashes[del.name];
   }
   state.skillHashes = mergedHashes;
-  writeFileSync30(statePath2, JSON.stringify(state, null, 2));
+  writeJsonAtomic(statePath2, state);
   try {
     const telemetryNow = new Date().toISOString();
     const telemetry = await collectTelemetryEvents({
@@ -19501,7 +19664,13 @@ async function syncFromState(state, statePath2, credentials, opts) {
     if (telemetry.healthReported) {
       state.lastHealthReportAt = new Date().toISOString();
     }
-    writeFileSync30(statePath2, JSON.stringify(state, null, 2));
+    writeJsonAtomic(statePath2, state);
+    updateWorkspaceRecord(state.workspaceId, {
+      workspaceName: state.workspaceName || undefined,
+      workspaceSlug: state.workspaceSlug,
+      lastTelemetryAt: state.lastTelemetryAt,
+      lastHealthReportAt: state.lastHealthReportAt
+    });
   } catch {}
   const failedNote = summary.adaptersFailed > 0 ? ` (${summary.adaptersFailed} failed)` : "";
   if (isVerbose()) {
@@ -19539,8 +19708,8 @@ var syncCommand = new Command24("sync").description("Sync skills bidirectionally
     verbose: !!opts.verbose,
     redetect: !!opts.redetect
   };
-  const projectStatePath = join37(process.cwd(), ".runwork", "setup.json");
-  const userStatePath = join37(homedir17(), ".runwork", "setup.json");
+  const projectStatePath = join40(process.cwd(), ".runwork", "setup.json");
+  const userStatePath = join40(homedir19(), ".runwork", "setup.json");
   const projectState = loadSetupState(projectStatePath);
   const userState = loadSetupState(userStatePath);
   if (!projectState && !userState) {
@@ -19560,25 +19729,6 @@ Sync complete.`);
   }
 });
 
-// src/utils/setup-state.ts
-import { existsSync as existsSync43, readFileSync as readFileSync34 } from "fs";
-import { join as join38 } from "path";
-import { homedir as homedir18 } from "os";
-function loadSetupState2() {
-  const projectPath = join38(process.cwd(), ".runwork", "setup.json");
-  const userPath = join38(homedir18(), ".runwork", "setup.json");
-  for (const p of [projectPath, userPath]) {
-    if (existsSync43(p)) {
-      try {
-        return JSON.parse(readFileSync34(p, "utf-8"));
-      } catch {
-        continue;
-      }
-    }
-  }
-  return null;
-}
-
 // src/commands/setup.ts
 var PERSONA_LABELS = {
   1: "everyday",
@@ -19594,7 +19744,7 @@ function resolvePersona(flag, existing) {
   }
   return existing;
 }
-async function resolveAndPersistWorkspace(client, opts) {
+async function resolveSetupWorkspace(client, opts) {
   const resolved = await resolveWorkspace2(client, opts);
   const { workspaceId } = resolved;
   let allWorkspaces = [];
@@ -19606,29 +19756,89 @@ async function resolveAndPersistWorkspace(client, opts) {
     console.error(`Workspace "${opts.workspace}" not found or not accessible.`);
     process.exit(1);
   }
-  const workspaceName = resolved.workspaceName || workspaceMeta?.name || "";
-  const workspaceSlug = workspaceMeta?.slug;
+  return {
+    workspaceId,
+    workspaceName: resolved.workspaceName || workspaceMeta?.name || "",
+    workspaceSlug: workspaceMeta?.slug
+  };
+}
+function persistDefaultWorkspace(workspaceId, workspaceName) {
   const freshCreds = getCredentials();
-  if (freshCreds) {
-    saveCredentials({
-      ...freshCreds,
-      defaultWorkspaceId: workspaceId,
-      defaultWorkspaceName: workspaceName
-    });
+  if (!freshCreds)
+    return;
+  saveCredentials({
+    ...freshCreds,
+    defaultWorkspaceId: workspaceId,
+    defaultWorkspaceName: workspaceName
+  });
+}
+function toSkillFilename(name) {
+  return name.toLowerCase().replace(/[^a-z0-9]+/g, "-");
+}
+function loadSetupStateForScope(scope) {
+  const path4 = scope === "project" ? join41(process.cwd(), ".runwork", "setup.json") : join41(homedir20(), ".runwork", "setup.json");
+  return readJsonOrNull(path4);
+}
+async function parkAndTeardownWorkspace(previous, scopes) {
+  const cleanupScopes = scopes ?? (previous.scope === "both" ? ["project", "user"] : [previous.scope ?? "user"]);
+  const skillFilenames = previous.skillFilenames ?? (previous.skills ?? []).map(toSkillFilename);
+  const patch = {
+    parked: {
+      skillFilenames,
+      mcpServers: previous.mcpServers ?? [],
+      agentDefaults: previous.agentDefaults,
+      agentDefaultsVersion: previous.agentDefaultsVersion,
+      parkedAt: new Date().toISOString()
+    }
+  };
+  if (previous.workspaceName)
+    patch.workspaceName = previous.workspaceName;
+  if (previous.workspaceSlug)
+    patch.workspaceSlug = previous.workspaceSlug;
+  if (previous.lastTelemetryAt)
+    patch.lastTelemetryAt = previous.lastTelemetryAt;
+  if (previous.lastHealthReportAt)
+    patch.lastHealthReportAt = previous.lastHealthReportAt;
+  updateWorkspaceRecord(previous.workspaceId, patch);
+  const manifest = {
+    skillFilenames,
+    mcpServerNames: previous.mcpServers ?? []
+  };
+  for (const slug of previous.configuredAgents ?? []) {
+    const adapter2 = getAdapterBySlug(slug);
+    if (!adapter2?.cleanup)
+      continue;
+    for (const scope of cleanupScopes) {
+      try {
+        await adapter2.cleanup(scope, manifest);
+        console.log(`  [${adapter2.name}] Previous workspace removed (${scope})`);
+      } catch (err) {
+        console.warn(`  [${adapter2.name}] Cleanup failed (${scope}): ${err instanceof Error ? err.message : err}`);
+      }
+    }
+  }
+}
+function resolveTelemetryCursor(carry, targetRecord, now = new Date) {
+  if (carry?.lastTelemetryAt)
+    return carry.lastTelemetryAt;
+  const watermark = targetRecord.lastTelemetryAt;
+  const parkedAt = targetRecord.parked?.parkedAt;
+  if (watermark && parkedAt) {
+    return Date.parse(parkedAt) > Date.parse(watermark) ? parkedAt : watermark;
   }
-  return { workspaceId, workspaceName, workspaceSlug };
+  return parkedAt ?? watermark ?? now.toISOString();
 }
-var setupCommand = new Command25("setup").description("Configure local AI agents with workspace skills and MCP servers").option("--workspace <name-or-id>", "Workspace name or ID").option("--agent <slug>", "Only configure a specific agent (e.g. claude-code, cursor)").option("--dry-run", "Show what would be configured without writing files").option("-y, --yes", "Skip all prompts, configure all detected agents with user scope").option("--persona <level>", "Technical-level persona for agent instructions (1=everyday, 2=curious, 3=engineer)").action(async (opts) => {
+async function runSetup(opts) {
   const credentials = requireAuth();
   const client = new ApiClient(credentials);
-  const { workspaceId, workspaceName, workspaceSlug } = await resolveAndPersistWorkspace(client, opts);
+  const { workspaceId, workspaceName, workspaceSlug } = await resolveSetupWorkspace(client, opts);
   console.log(`
 Workspace: ${workspaceName || workspaceId}
 `);
   let agents = await detectAgents();
   if (agents.length === 0) {
     printNoAgentsMessage();
-    process.exit(0);
+    process.exit(1);
   }
   if (opts.agent) {
     agents = agents.filter((a) => a.slug === opts.agent);
@@ -19660,8 +19870,8 @@ Configuring all agents (--yes).
       }
       agents = kept;
       if (agents.length === 0) {
-        console.log("No agents selected.");
-        return;
+        console.log("No agents selected. Nothing was changed.");
+        process.exit(1);
       }
     }
   }
@@ -19675,6 +19885,37 @@ Configuring all agents (--yes).
     const chosen = await promptSelect("Configure for:", scopeChoices);
     scope = chosen.value;
   }
+  const scopes = scope === "both" ? ["project", "user"] : [scope];
+  const outgoing = new Map;
+  for (const s of scopes) {
+    const prior = loadSetupStateForScope(s);
+    if (prior?.workspaceId && prior.workspaceId !== workspaceId) {
+      outgoing.set(s, prior);
+    }
+  }
+  const previous = loadSetupStateForScope(scopes.includes("user") ? "user" : "project");
+  const isSwitch = outgoing.size > 0;
+  if (isSwitch && !opts.dryRun) {
+    const names = [...new Set([...outgoing.values()].map((p) => p.workspaceName || p.workspaceId))];
+    console.log(`Switching workspace: ${names.join(", ")} -> ${workspaceName || workspaceId}`);
+    console.log(`Removing the previous workspace's skills and connections from your AI tools...
+`);
+    for (const [s, prior] of outgoing) {
+      await parkAndTeardownWorkspace(prior, [s]);
+    }
+    const trashed = currentTrashBatch();
+    if (trashed) {
+      console.log(`  A copy of everything removed is kept for ${TRASH_RETENTION_DAYS} days in:`);
+      console.log(`  ${trashed}`);
+    }
+    console.log("");
+  } else if (isSwitch && opts.dryRun) {
+    const names = [...new Set([...outgoing.values()].map((p) => p.workspaceName || p.workspaceId))];
+    console.log(`[Dry run] Would switch workspace: ${names.join(", ")} -> ${workspaceName || workspaceId} (teardown + re-setup).`);
+  }
+  const carry = !isSwitch && previous?.workspaceId === workspaceId ? previous : undefined;
+  const targetRecord = loadWorkspaceRecord(workspaceId);
+  const restored = carry ? undefined : targetRecord.parked;
   const state = {
     workspaceId,
     workspaceName: workspaceName || "",
@@ -19684,19 +19925,17 @@ Configuring all agents (--yes).
     lastSyncAt: "",
     mcpServers: [],
     skills: [],
-    skillHashes: {},
+    skillHashes: carry?.skillHashes ?? {},
+    agentDefaults: carry?.agentDefaults ?? restored?.agentDefaults,
+    agentDefaultsVersion: carry?.agentDefaultsVersion ?? restored?.agentDefaultsVersion,
+    lastTelemetryAt: resolveTelemetryCursor(carry, targetRecord),
+    lastHealthReportAt: carry?.lastHealthReportAt ?? targetRecord.lastHealthReportAt,
     lastDetectedAt: new Date().toISOString(),
-    persona: resolvePersona(opts.persona, loadSetupState2()?.persona)
+    persona: resolvePersona(opts.persona, previous?.persona)
   };
-  const scopes = scope === "both" ? ["project", "user"] : [scope];
-  for (const s of scopes) {
-    const dir = s === "project" ? ".runwork" : join39(homedir19(), ".runwork");
-    mkdirSync28(dir, { recursive: true });
-    writeFileSync31(join39(dir, "setup.json"), JSON.stringify(state, null, 2));
-  }
   if (opts.dryRun) {
     console.log(`
-[Dry run] Saved setup state. Would sync:
+[Dry run] Nothing written. Would save setup state and sync:
 `);
     console.log(`  Agents: ${agents.map((a) => a.name).join(", ")}`);
     console.log(`  Scope: ${scope}`);
@@ -19704,11 +19943,18 @@ Configuring all agents (--yes).
 Re-run without --dry-run to sync workspace data.`);
     return;
   }
+  persistDefaultWorkspace(workspaceId, workspaceName);
+  for (const s of scopes) {
+    const dir = s === "project" ? ".runwork" : join41(homedir20(), ".runwork");
+    writeJsonAtomic(join41(dir, "setup.json"), state);
+  }
+  if (restored)
+    clearParkedState(workspaceId);
   console.log(`
 Syncing workspace data...
 `);
   for (const s of scopes) {
-    const statePath2 = s === "project" ? join39(process.cwd(), ".runwork", "setup.json") : join39(homedir19(), ".runwork", "setup.json");
+    const statePath2 = s === "project" ? join41(process.cwd(), ".runwork", "setup.json") : join41(homedir20(), ".runwork", "setup.json");
     await syncFromState(state, statePath2, credentials, {
       dryRun: false,
       pullOnly: true,
@@ -19719,25 +19965,94 @@ Syncing workspace data...
   }
   console.log("\nSetup complete. Run `runwork sync` anytime to refresh.");
   await printAdoptionHint(credentials, workspaceId);
+}
+var setupCommand = new Command25("setup").description("Configure local AI agents with workspace skills and MCP servers").option("--workspace <name-or-id>", "Workspace name or ID").option("--agent <slug>", "Only configure a specific agent (e.g. claude-code, cursor)").option("--dry-run", "Show what would be configured without writing files").option("-y, --yes", "Skip all prompts, configure all detected agents with user scope").option("--persona <level>", "Technical-level persona for agent instructions (1=everyday, 2=curious, 3=engineer)").action(async (opts) => runSetup(opts));
+
+// src/commands/workspace.ts
+init_store();
+init_client();
+import { Command as Command26 } from "commander";
+
+// src/utils/setup-state.ts
+import { existsSync as existsSync46, readFileSync as readFileSync35 } from "fs";
+import { join as join42 } from "path";
+import { homedir as homedir21 } from "os";
+function loadSetupState2() {
+  const projectPath = join42(process.cwd(), ".runwork", "setup.json");
+  const userPath = join42(homedir21(), ".runwork", "setup.json");
+  for (const p of [projectPath, userPath]) {
+    if (existsSync46(p)) {
+      try {
+        return JSON.parse(readFileSync35(p, "utf-8"));
+      } catch {
+        continue;
+      }
+    }
+  }
+  return null;
+}
+
+// src/commands/workspace.ts
+var workspaceCommand = new Command26("workspace").description("Inspect or switch the workspace this machine is set up for");
+workspaceCommand.command("list").description("List workspaces you belong to (the active one is marked)").action(async (_opts, command) => {
+  const json = command.optsWithGlobals().json === true;
+  const credentials = requireAuth();
+  const client = new ApiClient(credentials);
+  const workspaces = await client.listWorkspaces();
+  const activeId = loadSetupState2()?.workspaceId ?? credentials.defaultWorkspaceId;
+  if (json) {
+    jsonOut({
+      workspaces: workspaces.map((w) => ({ id: w.id, name: w.name, slug: w.slug, active: w.id === activeId }))
+    });
+    return;
+  }
+  if (workspaces.length === 0) {
+    console.log("No workspaces found for this account.");
+    return;
+  }
+  for (const w of workspaces) {
+    const marker = w.id === activeId ? "*" : " ";
+    console.log(`  ${marker} ${w.name}  (${w.id})`);
+  }
+  console.log("\n* = active on this machine. Switch with `runwork workspace switch <name-or-id>`.");
+});
+workspaceCommand.command("current").description("Show the workspace this machine is currently set up for").action(async (_opts, command) => {
+  const json = command.optsWithGlobals().json === true;
+  const state = loadSetupState2();
+  const credentials = requireAuth();
+  const workspaceId = state?.workspaceId ?? credentials.defaultWorkspaceId ?? null;
+  const workspaceName = state?.workspaceName || credentials.defaultWorkspaceName || null;
+  if (json) {
+    jsonOut({ workspaceId, workspaceName, source: state?.workspaceId ? "setup" : "credentials" });
+    return;
+  }
+  if (!workspaceId) {
+    console.log("This machine is not set up for a workspace yet. Run `runwork setup`.");
+    return;
+  }
+  console.log(`${workspaceName || workspaceId} (${workspaceId})`);
+});
+workspaceCommand.command("switch <name-or-id>").description("Re-setup this machine for another workspace (removes the current workspace's skills and connections from your AI tools, then sets up the new one)").option("--persona <level>", "Technical-level persona for agent instructions (1=everyday, 2=curious, 3=engineer)").action(async (target, opts) => {
+  await runSetup({ workspace: target, yes: true, persona: opts.persona });
 });
 
 // src/commands/build-plugin.ts
 init_store();
 init_client();
-import { Command as Command26 } from "commander";
-import { existsSync as existsSync44, readFileSync as readFileSync35 } from "fs";
-import { resolve as resolve3, join as join40 } from "path";
-import { homedir as homedir20 } from "os";
+import { Command as Command27 } from "commander";
+import { existsSync as existsSync47, readFileSync as readFileSync36 } from "fs";
+import { resolve as resolve3, join as join43 } from "path";
+import { homedir as homedir22 } from "os";
 function loadSetupState3(filePath) {
-  if (!existsSync44(filePath))
+  if (!existsSync47(filePath))
     return null;
   try {
-    return JSON.parse(readFileSync35(filePath, "utf-8"));
+    return JSON.parse(readFileSync36(filePath, "utf-8"));
   } catch {
     return null;
   }
 }
-var buildPluginCommand = new Command26("build-plugin").description("Build an installable plugin archive for an agent (e.g. Claude Desktop)").requiredOption("--agent <slug>", "Target agent slug (e.g. claude-desktop)").option("--output <path>", "Output zip path", "runwork-plugin.zip").action(async (opts) => {
+var buildPluginCommand = new Command27("build-plugin").description("Build an installable plugin archive for an agent (e.g. Claude Desktop)").requiredOption("--agent <slug>", "Target agent slug (e.g. claude-desktop)").option("--output <path>", "Output zip path", "runwork-plugin.zip").action(async (opts) => {
   const adapter2 = getAdapterBySlug(opts.agent);
   if (!adapter2) {
     console.error(`Unknown agent: ${opts.agent}`);
@@ -19748,8 +20063,8 @@ var buildPluginCommand = new Command26("build-plugin").description("Build an ins
     process.exit(1);
   }
   const credentials = requireAuth();
-  const projectStatePath = join40(process.cwd(), ".runwork", "setup.json");
-  const userStatePath = join40(homedir20(), ".runwork", "setup.json");
+  const projectStatePath = join43(process.cwd(), ".runwork", "setup.json");
+  const userStatePath = join43(homedir22(), ".runwork", "setup.json");
   const state = loadSetupState3(projectStatePath) ?? loadSetupState3(userStatePath);
   if (!state) {
     console.error("No setup state found. Run `runwork setup` first.");
@@ -19838,23 +20153,23 @@ var buildPluginCommand = new Command26("build-plugin").description("Build an ins
 });
 
 // src/commands/uninstall.ts
-import { Command as Command27 } from "commander";
-import { existsSync as existsSync45, readFileSync as readFileSync36, rmSync as rmSync12, unlinkSync as unlinkSync7 } from "fs";
-import { join as join41 } from "path";
-import { homedir as homedir21 } from "os";
+import { Command as Command28 } from "commander";
+import { existsSync as existsSync48, readFileSync as readFileSync37, rmSync as rmSync13, unlinkSync as unlinkSync7 } from "fs";
+import { join as join44 } from "path";
+import { homedir as homedir23 } from "os";
 init_prompt();
 function loadSetupState4(filePath) {
-  if (!existsSync45(filePath))
+  if (!existsSync48(filePath))
     return null;
   try {
-    return JSON.parse(readFileSync36(filePath, "utf-8"));
+    return JSON.parse(readFileSync37(filePath, "utf-8"));
   } catch {
     return null;
   }
 }
-var uninstallCommand = new Command27("uninstall").description("Remove all Runwork configuration from local agents (MCP servers, skills, instructions)").option("-y, --yes", "Skip confirmation prompt").option("--keep-auth", "Keep authentication credentials (only remove agent configs)").action(async (opts) => {
-  const projectStatePath = join41(process.cwd(), ".runwork", "setup.json");
-  const userStatePath = join41(homedir21(), ".runwork", "setup.json");
+var uninstallCommand = new Command28("uninstall").description("Remove all Runwork configuration from local agents (MCP servers, skills, instructions)").option("-y, --yes", "Skip confirmation prompt").option("--keep-auth", "Keep authentication credentials (only remove agent configs)").action(async (opts) => {
+  const projectStatePath = join44(process.cwd(), ".runwork", "setup.json");
+  const userStatePath = join44(homedir23(), ".runwork", "setup.json");
   const projectState = loadSetupState4(projectStatePath);
   const userState = loadSetupState4(userStatePath);
   if (!projectState && !userState) {
@@ -19934,10 +20249,10 @@ This will remove all Runwork configuration from your local agents:
         }
       }
     }
-    const stateDir = label === "project" ? join41(process.cwd(), ".runwork") : join41(homedir21(), ".runwork");
+    const stateDir = label === "project" ? join44(process.cwd(), ".runwork") : join44(homedir23(), ".runwork");
     if (opts.keepAuth && label === "user") {
-      const setupFile = join41(stateDir, "setup.json");
-      if (existsSync45(setupFile)) {
+      const setupFile = join44(stateDir, "setup.json");
+      if (existsSync48(setupFile)) {
         try {
           unlinkSync7(setupFile);
           console.log(`  Removed ${setupFile} (kept credentials)`);
@@ -19946,9 +20261,9 @@ This will remove all Runwork configuration from your local agents:
           errors++;
         }
       }
-    } else if (existsSync45(stateDir)) {
+    } else if (existsSync48(stateDir)) {
       try {
-        rmSync12(stateDir, { recursive: true, force: true });
+        rmSync13(stateDir, { recursive: true, force: true });
         console.log(`  Removed ${stateDir}`);
       } catch (err) {
         console.warn(`  Failed to remove ${stateDir}: ${err instanceof Error ? err.message : err}`);
@@ -19968,9 +20283,9 @@ This will remove all Runwork configuration from your local agents:
 // src/commands/apps.ts
 init_store();
 init_client();
-import { Command as Command28 } from "commander";
+import { Command as Command29 } from "commander";
 init_init();
-var listCommand12 = new Command28("list").description("List apps in workspace").option("--workspace <name-or-id>", "Workspace name or ID").action(async (opts, command) => {
+var listCommand12 = new Command29("list").description("List apps in workspace").option("--workspace <name-or-id>", "Workspace name or ID").action(async (opts, command) => {
   const useJson = shouldOutputJson(command.optsWithGlobals().json);
   const credentials = requireAuth();
   const client = new ApiClient(credentials);
@@ -20000,10 +20315,10 @@ Workspace: ${workspaceName || workspaceId}
     process.exit(1);
   }
 });
-var createCommand3 = new Command28("create").description("Create a new Runwork app").argument("[name]", "App name").action(async (name) => {
+var createCommand3 = new Command29("create").description("Create a new Runwork app").argument("[name]", "App name").action(async (name) => {
   await runCreateFlow(name);
 });
-var infoCommand2 = new Command28("info").description("Show detailed app info, preview status, and registries").argument("[app]", "App ID, name, or slug").option("--workspace <name-or-id>", "Workspace name or ID").action(async (appArg, opts, command) => {
+var infoCommand2 = new Command29("info").description("Show detailed app info, preview status, and registries").argument("[app]", "App ID, name, or slug").option("--workspace <name-or-id>", "Workspace name or ID").action(async (appArg, opts, command) => {
   const useJson = shouldOutputJson(command.optsWithGlobals().json);
   const credentials = requireAuth();
   const client = new ApiClient(credentials);
@@ -20028,12 +20343,12 @@ var infoCommand2 = new Command28("info").description("Show detailed app info, pr
   }
   printAppInfo(data);
 });
-var appsCommand = new Command28("apps").description("Manage workspace apps").addCommand(listCommand12).addCommand(createCommand3).addCommand(infoCommand2);
+var appsCommand = new Command29("apps").description("Manage workspace apps").addCommand(listCommand12).addCommand(createCommand3).addCommand(infoCommand2);
 
 // src/commands/members.ts
 init_store();
 init_client();
-import { Command as Command29 } from "commander";
+import { Command as Command30 } from "commander";
 function formatMemberRows(members) {
   return members.map((m) => ({
     name: m.user.displayName || m.user.email,
@@ -20043,7 +20358,7 @@ function formatMemberRows(members) {
     userId: m.userId
   }));
 }
-var listCommand13 = new Command29("list").description("List members of a workspace (name, email, role)").option("--workspace <name-or-id>", "Workspace name or ID").action(async (opts, command) => {
+var listCommand13 = new Command30("list").description("List members of a workspace (name, email, role)").option("--workspace <name-or-id>", "Workspace name or ID").action(async (opts, command) => {
   const useJson = shouldOutputJson(command.optsWithGlobals().json);
   const credentials = requireAuth();
   const client = new ApiClient(credentials);
@@ -20072,13 +20387,13 @@ Workspace: ${workspaceName || workspaceId}
     process.exit(1);
   }
 });
-var membersCommand = new Command29("members").description("List workspace members").addCommand(listCommand13);
+var membersCommand = new Command30("members").description("List workspace members").addCommand(listCommand13);
 
 // src/commands/api.ts
 init_store();
 init_client();
-import { Command as Command30 } from "commander";
-import { readFileSync as readFileSync37 } from "fs";
+import { Command as Command31 } from "commander";
+import { readFileSync as readFileSync38 } from "fs";
 function normalizeApiPath(rawPath, baseUrl) {
   if (/^https?:\/\//i.test(rawPath)) {
     const target = new URL(rawPath);
@@ -20090,7 +20405,7 @@ function normalizeApiPath(rawPath, baseUrl) {
   }
   return rawPath.startsWith("/") ? rawPath : `/${rawPath}`;
 }
-var apiCommand = new Command30("api").description("Make an authenticated request to the Runwork platform API (escape hatch for endpoints the CLI does not cover)").argument("<method>", "HTTP method (GET, POST, PUT, DELETE, etc.)").argument("[path]", "API path (e.g. /api/workspaces); optional with --curl").option("--body <json>", "Request body JSON (or @file.json)").option("--header <header>", 'Request header (format: "Key: Value", repeatable)', (val, prev) => [...prev, val], []).option("--query <query>", "Query string (e.g. limit=10&offset=0)").option("--curl <command>", "Parse a curl command (method, path, headers, body)").option("--curl-file <file>", "Read curl command from a file").addHelpText("after", `
+var apiCommand = new Command31("api").description("Make an authenticated request to the Runwork platform API (escape hatch for endpoints the CLI does not cover)").argument("<method>", "HTTP method (GET, POST, PUT, DELETE, etc.)").argument("[path]", "API path (e.g. /api/workspaces); optional with --curl").option("--body <json>", "Request body JSON (or @file.json)").option("--header <header>", 'Request header (format: "Key: Value", repeatable)', (val, prev) => [...prev, val], []).option("--query <query>", "Query string (e.g. limit=10&offset=0)").option("--curl <command>", "Parse a curl command (method, path, headers, body)").option("--curl-file <file>", "Read curl command from a file").addHelpText("after", `
 Examples:
   runwork api GET /api/workspaces
   runwork api GET /api/workspaces/<id>/members
@@ -20111,7 +20426,7 @@ to be read or pasted manually. Prefer a dedicated command when one exists
     let curlStr = opts.curl;
     if (opts.curlFile) {
       try {
-        curlStr = readFileSync37(opts.curlFile, "utf-8");
+        curlStr = readFileSync38(opts.curlFile, "utf-8");
       } catch (err) {
         console.error(`Could not read --curl-file: ${err instanceof Error ? err.message : err}`);
         process.exit(1);
@@ -20131,7 +20446,7 @@ to be read or pasted manually. Prefer a dedicated command when one exists
     let raw = opts.body;
     if (raw.startsWith("@")) {
       try {
-        raw = readFileSync37(raw.slice(1), "utf-8");
+        raw = readFileSync38(raw.slice(1), "utf-8");
       } catch (err) {
         console.error(`Could not read body file: ${err instanceof Error ? err.message : err}`);
         process.exit(1);
@@ -20173,16 +20488,16 @@ to be read or pasted manually. Prefer a dedicated command when one exists
 
 // src/commands/doctor.ts
 init_colors();
-import { Command as Command31 } from "commander";
+import { Command as Command32 } from "commander";
 
 // src/health/checks.ts
 init_subprocess();
 init_store();
 init_client();
 import { parse as parse2 } from "smol-toml";
-import { existsSync as existsSync46, readFileSync as readFileSync38 } from "fs";
-import { join as join42, sep as sep4 } from "path";
-import { homedir as homedir22, platform as osPlatform2, arch as osArch } from "os";
+import { existsSync as existsSync49, readFileSync as readFileSync39 } from "fs";
+import { join as join45, sep as sep4 } from "path";
+import { homedir as homedir24, platform as osPlatform2, arch as osArch } from "os";
 init_http();
 init_preflight();
 init_credentials();
@@ -20213,10 +20528,10 @@ function buildContext() {
   const credentials = getCredentials();
   const client = credentials ? new ApiClient(credentials) : null;
   let config = null;
-  const configPath = join42(process.cwd(), ".runwork.json");
-  if (existsSync46(configPath)) {
+  const configPath = join45(process.cwd(), ".runwork.json");
+  if (existsSync49(configPath)) {
     try {
-      config = JSON.parse(readFileSync38(configPath, "utf-8"));
+      config = JSON.parse(readFileSync39(configPath, "utf-8"));
     } catch {}
   }
   return { credentials, client, config, cwd: process.cwd() };
@@ -20317,9 +20632,9 @@ async function checkCliArtifactReachable() {
 }
 async function checkCliInstallLocation() {
   const isWindows2 = osPlatform2() === "win32";
-  const home = homedir22();
-  const canonicalDir = join42(home, ".runwork", "bin");
-  const canonicalBinary = isWindows2 ? join42(canonicalDir, "runwork.exe") : join42(canonicalDir, "runwork");
+  const home = homedir24();
+  const canonicalDir = join45(home, ".runwork", "bin");
+  const canonicalBinary = isWindows2 ? join45(canonicalDir, "runwork.exe") : join45(canonicalDir, "runwork");
   const candidates = [process.execPath, process.argv[1] || ""].filter(Boolean);
   const runsFromCanonical = candidates.some((p) => normalizePath(p) === normalizePath(canonicalBinary));
   if (runsFromCanonical) {
@@ -20329,7 +20644,7 @@ async function checkCliInstallLocation() {
       message: `canonical (${canonicalBinary})`
     };
   }
-  if (existsSync46(canonicalBinary)) {
+  if (existsSync49(canonicalBinary)) {
     return {
       name: "cli-install-location",
       status: "warn",
@@ -20451,8 +20766,8 @@ async function checkGitCredentialHelper(ctx) {
   };
 }
 async function checkProjectConfig(ctx) {
-  const configPath = join42(ctx.cwd, ".runwork.json");
-  if (!existsSync46(configPath)) {
+  const configPath = join45(ctx.cwd, ".runwork.json");
+  if (!existsSync49(configPath)) {
     if (!ctx.credentials) {
       return { name: "project-config", status: "skip", message: "no project (not logged in)" };
     }
@@ -20514,7 +20829,7 @@ async function checkGitRemote(ctx) {
   if (!ctx.config) {
     return { name: "git-remote", status: "skip", message: "skipped (no project)" };
   }
-  if (!existsSync46(join42(ctx.cwd, ".git"))) {
+  if (!existsSync49(join45(ctx.cwd, ".git"))) {
     return {
       name: "git-remote",
       status: "fail",
@@ -20568,12 +20883,12 @@ async function checkDeployFreshness(ctx) {
   return { name: "deploy-freshness", status: "skip", message: "local HEAD unknown" };
 }
 function loadSetupState5() {
-  const projectPath = join42(process.cwd(), ".runwork", "setup.json");
-  const userPath = join42(homedir22(), ".runwork", "setup.json");
+  const projectPath = join45(process.cwd(), ".runwork", "setup.json");
+  const userPath = join45(homedir24(), ".runwork", "setup.json");
   for (const p of [projectPath, userPath]) {
-    if (existsSync46(p)) {
+    if (existsSync49(p)) {
       try {
-        return JSON.parse(readFileSync38(p, "utf-8"));
+        return JSON.parse(readFileSync39(p, "utf-8"));
       } catch {
         continue;
       }
@@ -20588,13 +20903,13 @@ async function checkCodexNetwork() {
   if (!state || !state.configuredAgents.includes("codex")) {
     return { name, status: "skip", message: "Codex not configured for Runwork" };
   }
-  const configPath = join42(homedir22(), ".codex", "config.toml");
-  if (!existsSync46(configPath)) {
+  const configPath = join45(homedir24(), ".codex", "config.toml");
+  if (!existsSync49(configPath)) {
     return { name, status: "skip", message: "no Codex config found" };
   }
   let parsed;
   try {
-    parsed = parse2(readFileSync38(configPath, "utf-8"));
+    parsed = parse2(readFileSync39(configPath, "utf-8"));
   } catch {
     return { name, status: "warn", message: "could not parse ~/.codex/config.toml" };
   }
@@ -20647,19 +20962,19 @@ async function checkCodexDesktopProject() {
   if (!usesCodex) {
     return { name, status: "skip", message: "Codex not configured for Runwork" };
   }
-  const statePath2 = join42(homedir22(), ".codex", ".codex-global-state.json");
-  if (!existsSync46(statePath2)) {
+  const statePath2 = join45(homedir24(), ".codex", ".codex-global-state.json");
+  if (!existsSync49(statePath2)) {
     return { name, status: "skip", message: "Codex desktop app not detected" };
   }
   let savedRoots = [];
   try {
-    const parsed = JSON.parse(readFileSync38(statePath2, "utf-8"));
+    const parsed = JSON.parse(readFileSync39(statePath2, "utf-8"));
     const roots = parsed["electron-saved-workspace-roots"];
     savedRoots = Array.isArray(roots) ? roots.filter((r) => typeof r === "string") : [];
   } catch {
     return { name, status: "warn", message: "could not read Codex desktop state" };
   }
-  const runworkDir = join42(homedir22(), ".runwork");
+  const runworkDir = join45(homedir24(), ".runwork");
   if (savedRoots.includes(runworkDir)) {
     return { name, status: "pass", message: "Runwork project added to Codex desktop sidebar" };
   }
@@ -20712,9 +21027,9 @@ async function checkAgentSetup() {
     if (!adapter2 || !adapter2.supportsMcpScope("user"))
       continue;
     const mcpConfigPath = getMcpConfigPath2(slug, "user");
-    if (mcpConfigPath && existsSync46(mcpConfigPath)) {
+    if (mcpConfigPath && existsSync49(mcpConfigPath)) {
       try {
-        const content = readFileSync38(mcpConfigPath, "utf-8");
+        const content = readFileSync39(mcpConfigPath, "utf-8");
         const missingMcp = state.mcpServers.filter((name) => !content.includes(name));
         if (missingMcp.length > 0) {
           details.push(`${missingMcp.length} MCP server(s) missing from ${slug} config`);
@@ -20737,8 +21052,8 @@ async function checkAgentSetup() {
     if (!skillsDir)
       continue;
     const missingSkills = state.skills.filter((name) => {
-      const skillPath = join42(skillsDir, name, "SKILL.md");
-      return !existsSync46(skillPath);
+      const skillPath = join45(skillsDir, name, "SKILL.md");
+      return !existsSync49(skillPath);
     });
     if (missingSkills.length > 0) {
       details.push(`${missingSkills.length} skill(s) missing from ${slug}`);
@@ -20763,33 +21078,66 @@ async function checkAgentSetup() {
   };
 }
 function getMcpConfigPath2(slug, scope) {
-  const home = homedir22();
+  const home = homedir24();
   switch (slug) {
     case "claude-code":
-      return scope === "project" ? join42(process.cwd(), ".mcp.json") : join42(home, ".claude", "settings.json");
+      return scope === "project" ? join45(process.cwd(), ".mcp.json") : join45(home, ".claude", "settings.json");
     case "cursor":
-      return scope === "project" ? join42(process.cwd(), ".cursor", "mcp.json") : join42(home, ".cursor", "mcp.json");
+      return scope === "project" ? join45(process.cwd(), ".cursor", "mcp.json") : join45(home, ".cursor", "mcp.json");
     case "windsurf":
-      return scope === "project" ? join42(process.cwd(), ".windsurf", "mcp.json") : join42(home, ".windsurf", "mcp.json");
+      return scope === "project" ? join45(process.cwd(), ".windsurf", "mcp.json") : join45(home, ".windsurf", "mcp.json");
     case "codex":
     case "codex-app":
-      return scope === "user" ? join42(home, ".codex", "config.toml") : null;
+      return scope === "user" ? join45(home, ".codex", "config.toml") : null;
     case "gemini":
-      return scope === "user" ? join42(home, ".gemini", "settings.json") : null;
+      return scope === "user" ? join45(home, ".gemini", "settings.json") : null;
     default:
       return null;
   }
 }
+async function checkWorkspacePointers() {
+  const userStatePath = join45(homedir24(), ".runwork", "setup.json");
+  const state = existsSync49(userStatePath) ? (() => {
+    try {
+      return JSON.parse(readFileSync39(userStatePath, "utf-8"));
+    } catch {
+      return null;
+    }
+  })() : null;
+  const credentials = getCredentials();
+  if (!state) {
+    return { name: "workspace-pointers", status: "skip", message: "setup has not run on this machine" };
+  }
+  if (!credentials?.defaultWorkspaceId) {
+    return { name: "workspace-pointers", status: "skip", message: "no default workspace in credentials" };
+  }
+  if (credentials.defaultWorkspaceId === state.workspaceId) {
+    const label = state.workspaceName || state.workspaceId;
+    return { name: "workspace-pointers", status: "pass", message: `${label} everywhere` };
+  }
+  const configured = state.workspaceName || state.workspaceId;
+  const selected = credentials.defaultWorkspaceName || credentials.defaultWorkspaceId;
+  return {
+    name: "workspace-pointers",
+    status: "fail",
+    message: `your AI tools are set up for ${configured}, but ${selected} is selected`,
+    details: [
+      `setup.json (drives sync): ${state.workspaceId}`,
+      `credentials (selected):   ${credentials.defaultWorkspaceId}`
+    ],
+    fix: `runwork workspace switch ${credentials.defaultWorkspaceId}`
+  };
+}
 function getSkillsDir(slug, scope) {
-  const home = homedir22();
+  const home = homedir24();
   switch (slug) {
     case "claude-code":
-      return scope === "project" ? join42(process.cwd(), ".claude", "skills") : join42(home, ".claude", "skills");
+      return scope === "project" ? join45(process.cwd(), ".claude", "skills") : join45(home, ".claude", "skills");
     case "codex":
     case "codex-app":
-      return scope === "project" ? join42(process.cwd(), ".agents", "skills") : join42(home, ".agents", "skills");
+      return scope === "project" ? join45(process.cwd(), ".agents", "skills") : join45(home, ".agents", "skills");
     case "gemini":
-      return scope === "project" ? join42(process.cwd(), ".gemini", "skills") : join42(home, ".gemini", "skills");
+      return scope === "project" ? join45(process.cwd(), ".gemini", "skills") : join45(home, ".gemini", "skills");
     default:
       return null;
   }
@@ -20815,7 +21163,8 @@ var CHECK_RUNNERS = [
   { names: ["deploy-freshness"], run: async (ctx) => [await checkDeployFreshness(ctx)] },
   { names: ["agent-setup"], run: async () => [await checkAgentSetup()] },
   { names: ["codex-network"], run: async () => [await checkCodexNetwork()] },
-  { names: ["codex-desktop-project"], run: async () => [await checkCodexDesktopProject()] }
+  { names: ["codex-desktop-project"], run: async () => [await checkCodexDesktopProject()] },
+  { names: ["workspace-pointers"], run: async () => [await checkWorkspacePointers()] }
 ];
 var ALL_CHECK_NAMES = CHECK_RUNNERS.flatMap((r) => r.names);
 async function runAllChecks(options) {
@@ -20841,8 +21190,8 @@ async function runAllChecks(options) {
 // src/health/fix.ts
 init_credentials();
 init_remote();
-import { existsSync as existsSync47 } from "fs";
-import { join as join43 } from "path";
+import { existsSync as existsSync50 } from "fs";
+import { join as join46 } from "path";
 async function applyDoctorFixes(ctx, failingNames) {
   const failing = new Set(failingNames);
   const outcomes = [];
@@ -20869,7 +21218,7 @@ async function applyDoctorFixes(ctx, failingNames) {
         applied: false,
         message: "no project config -- run inside an app directory"
       });
-    } else if (!existsSync47(join43(ctx.cwd, ".git"))) {
+    } else if (!existsSync50(join46(ctx.cwd, ".git"))) {
       outcomes.push({
         name: "git-remote",
         applied: false,
@@ -20888,10 +21237,10 @@ async function applyDoctorFixes(ctx, failingNames) {
 }
 
 // src/agents/runtime-detection.ts
-import { existsSync as existsSync48, readFileSync as readFileSync39, statSync as statSync8, readdirSync as readdirSync13 } from "fs";
-import { homedir as homedir23 } from "os";
-import { join as join44 } from "path";
-var RUNWORK_SESSIONS_DIR = join44(homedir23(), ".runwork", "sessions");
+import { existsSync as existsSync51, readFileSync as readFileSync40, statSync as statSync9, readdirSync as readdirSync15 } from "fs";
+import { homedir as homedir25 } from "os";
+import { join as join47 } from "path";
+var RUNWORK_SESSIONS_DIR = join47(homedir25(), ".runwork", "sessions");
 function detectCurrentAgent() {
   const claudeCodeSessionId = process.env.CLAUDE_CODE_SESSION_ID;
   if (claudeCodeSessionId) {
@@ -20954,11 +21303,11 @@ function detectCurrentAgent() {
   return null;
 }
 function readHookSessionInfo(sessionId) {
-  const path4 = join44(RUNWORK_SESSIONS_DIR, `${sessionId}.json`);
-  if (!existsSync48(path4))
+  const path4 = join47(RUNWORK_SESSIONS_DIR, `${sessionId}.json`);
+  if (!existsSync51(path4))
     return null;
   try {
-    const raw = readFileSync39(path4, "utf8");
+    const raw = readFileSync40(path4, "utf8");
     const parsed = JSON.parse(raw);
     return parsed;
   } catch {
@@ -20966,40 +21315,40 @@ function readHookSessionInfo(sessionId) {
   }
 }
 function findClaudeCodeSessionFile(sessionId) {
-  const root = join44(homedir23(), ".claude", "projects");
-  if (!existsSync48(root))
+  const root = join47(homedir25(), ".claude", "projects");
+  if (!existsSync51(root))
     return null;
   let projectDirs;
   try {
-    projectDirs = readdirSync13(root);
+    projectDirs = readdirSync15(root);
   } catch {
     return null;
   }
   for (const dir of projectDirs) {
-    const candidate = join44(root, dir, `${sessionId}.jsonl`);
-    if (existsSync48(candidate))
+    const candidate = join47(root, dir, `${sessionId}.jsonl`);
+    if (existsSync51(candidate))
       return candidate;
   }
   return null;
 }
 function findCodexRolloutFile(threadId) {
-  const root = join44(homedir23(), ".codex", "sessions");
-  if (!existsSync48(root))
+  const root = join47(homedir25(), ".codex", "sessions");
+  if (!existsSync51(root))
     return null;
   const stack = [root];
   while (stack.length > 0) {
     const dir = stack.pop();
     let entries;
     try {
-      entries = readdirSync13(dir);
+      entries = readdirSync15(dir);
     } catch {
       continue;
     }
     for (const entry of entries) {
-      const full = join44(dir, entry);
+      const full = join47(dir, entry);
       let s;
       try {
-        s = statSync8(full);
+        s = statSync9(full);
       } catch {
         continue;
       }
@@ -21013,30 +21362,30 @@ function findCodexRolloutFile(threadId) {
   return null;
 }
 function findNewestClaudeCodeSession() {
-  const root = join44(homedir23(), ".claude", "projects");
-  if (!existsSync48(root))
+  const root = join47(homedir25(), ".claude", "projects");
+  if (!existsSync51(root))
     return null;
   let projectDirs;
   try {
-    projectDirs = readdirSync13(root);
+    projectDirs = readdirSync15(root);
   } catch {
     return null;
   }
   let best = null;
   for (const dir of projectDirs) {
-    const projectPath = join44(root, dir);
+    const projectPath = join47(root, dir);
     let files;
     try {
-      files = readdirSync13(projectPath);
+      files = readdirSync15(projectPath);
     } catch {
       continue;
     }
     for (const file of files) {
       if (!file.endsWith(".jsonl"))
         continue;
-      const full = join44(projectPath, file);
+      const full = join47(projectPath, file);
       try {
-        const s = statSync8(full);
+        const s = statSync9(full);
         if (!best || s.mtimeMs > best.mtime) {
           best = {
             sessionId: file.replace(/\.jsonl$/, ""),
@@ -21052,8 +21401,8 @@ function findNewestClaudeCodeSession() {
   return best ? { sessionId: best.sessionId, path: best.path } : null;
 }
 function findNewestCodexRollout() {
-  const root = join44(homedir23(), ".codex", "sessions");
-  if (!existsSync48(root))
+  const root = join47(homedir25(), ".codex", "sessions");
+  if (!existsSync51(root))
     return null;
   const stack = [root];
   let best = null;
@@ -21061,15 +21410,15 @@ function findNewestCodexRollout() {
     const dir = stack.pop();
     let entries;
     try {
-      entries = readdirSync13(dir);
+      entries = readdirSync15(dir);
     } catch {
       continue;
     }
     for (const entry of entries) {
-      const full = join44(dir, entry);
+      const full = join47(dir, entry);
       let s;
       try {
-        s = statSync8(full);
+        s = statSync9(full);
       } catch {
         continue;
       }
@@ -21245,7 +21594,7 @@ function parseCheckNames(raw) {
   const unknown = requested.filter((n) => !known.has(n));
   return { only, unknown };
 }
-var doctorCommand = new Command31("doctor").description("Check system health: auth, network, project config, agent setup").option("-v, --verbose", "Include host-agent detection results, runtime info, and allowlisted env vars (useful for AI agents debugging their own environment)").option("--check <names>", `Run only the named checks (comma-separated). Available: ${ALL_CHECK_NAMES.join(", ")}`).option("--fix", "Auto-remediate fixable failures (git credential helper, runwork remote), then re-check").action(async (opts, command) => {
+var doctorCommand = new Command32("doctor").description("Check system health: auth, network, project config, agent setup").option("-v, --verbose", "Include host-agent detection results, runtime info, and allowlisted env vars (useful for AI agents debugging their own environment)").option("--check <names>", `Run only the named checks (comma-separated). Available: ${ALL_CHECK_NAMES.join(", ")}`).option("--fix", "Auto-remediate fixable failures (git credential helper, runwork remote), then re-check").action(async (opts, command) => {
   const asJson = shouldOutputJson(command.optsWithGlobals().json);
   let only;
   if (opts.check) {
@@ -21296,8 +21645,8 @@ var doctorCommand = new Command31("doctor").description("Check system health: au
 // src/commands/share-convo.ts
 init_store();
 init_client();
-import { Command as Command32 } from "commander";
-import { readFileSync as readFileSync40, existsSync as existsSync49 } from "fs";
+import { Command as Command33 } from "commander";
+import { readFileSync as readFileSync41, existsSync as existsSync52 } from "fs";
 import { createHash as createHash4 } from "crypto";
 function nativeBundleFormatForAgent(slug) {
   if (slug === "claude-code" || slug === "claude-desktop")
@@ -21318,7 +21667,7 @@ async function runShareConvo(opts, command, isPersonalAlias = false) {
     console.error("Error: --transcript-file is required. Pass the path to the LLM-emitted markdown transcript.");
     process.exit(1);
   }
-  if (!existsSync49(opts.transcriptFile)) {
+  if (!existsSync52(opts.transcriptFile)) {
     console.error(`Error: transcript file does not exist: ${opts.transcriptFile}`);
     process.exit(1);
   }
@@ -21339,7 +21688,7 @@ async function runShareConvo(opts, command, isPersonalAlias = false) {
   const credentials = requireAuth();
   const client = new ApiClient(credentials);
   const { workspaceId } = await resolveWorkspace2(client, { workspace: opts.workspace });
-  const transcriptContent = readFileSync40(opts.transcriptFile, "utf8");
+  const transcriptContent = readFileSync41(opts.transcriptFile, "utf8");
   const bundles = [
     {
       format: "transcript",
@@ -21352,19 +21701,19 @@ async function runShareConvo(opts, command, isPersonalAlias = false) {
   const sourceAgent = opts.sourceAgent ?? detected?.slug ?? "generic";
   let nativeFilePath = null;
   if (opts.nativeFile) {
-    if (!existsSync49(opts.nativeFile)) {
+    if (!existsSync52(opts.nativeFile)) {
       console.error(`Error: --native-file path does not exist: ${opts.nativeFile}`);
       process.exit(1);
     }
     nativeFilePath = opts.nativeFile;
-  } else if (detected?.sessionFilePath && existsSync49(detected.sessionFilePath)) {
+  } else if (detected?.sessionFilePath && existsSync52(detected.sessionFilePath)) {
     nativeFilePath = detected.sessionFilePath;
   }
   if (nativeFilePath) {
     const nativeFormat = nativeBundleFormatForAgent(sourceAgent);
     if (nativeFormat) {
       try {
-        const content = readFileSync40(nativeFilePath, "utf8");
+        const content = readFileSync41(nativeFilePath, "utf8");
         bundles.push({
           format: nativeFormat,
           content,
@@ -21380,7 +21729,7 @@ async function runShareConvo(opts, command, isPersonalAlias = false) {
   let metadata = {};
   if (opts.metadataFile) {
     try {
-      metadata = JSON.parse(readFileSync40(opts.metadataFile, "utf8"));
+      metadata = JSON.parse(readFileSync41(opts.metadataFile, "utf8"));
     } catch (err) {
       console.error(`Error: --metadata-file is not valid JSON: ${err instanceof Error ? err.message : err}`);
       process.exit(1);
@@ -21435,17 +21784,17 @@ Skipped: ${result.skipped.map((s) => `${s.identifier} (${s.reason})`).join(", ")
     process.exit(1);
   }
 }
-var shareConvoCommand = new Command32("share-convo").description("Share the current AI conversation with a teammate").option("--to <email>", "Recipient email (repeatable)", (value, prev = []) => [...prev, value], []).option("--transcript-file <path>", "Path to the LLM-emitted markdown transcript (required)").option("--native-file <path>", "Path to the native session file (optional; auto-detected from env vars otherwise)").option("--source-agent <slug>", "Override host-agent detection (e.g. claude-code, codex, claude-desktop)").option("--title <string>", "Short title for the conversation (required)").option("--note <string>", "Optional personal note to recipients").option("--ttl-days <n>", "Days until expiration (1-30, default 7)").option("--metadata-json <json>", "Inline JSON object with workMode, openQuestions, suggestedNextStep, etc.").option("--metadata-file <path>", "Path to a JSON file with the same metadata fields").option("--workspace <name-or-id>", "Workspace name or ID").action((opts, command) => runShareConvo(opts, command, false));
+var shareConvoCommand = new Command33("share-convo").description("Share the current AI conversation with a teammate").option("--to <email>", "Recipient email (repeatable)", (value, prev = []) => [...prev, value], []).option("--transcript-file <path>", "Path to the LLM-emitted markdown transcript (required)").option("--native-file <path>", "Path to the native session file (optional; auto-detected from env vars otherwise)").option("--source-agent <slug>", "Override host-agent detection (e.g. claude-code, codex, claude-desktop)").option("--title <string>", "Short title for the conversation (required)").option("--note <string>", "Optional personal note to recipients").option("--ttl-days <n>", "Days until expiration (1-30, default 7)").option("--metadata-json <json>", "Inline JSON object with workMode, openQuestions, suggestedNextStep, etc.").option("--metadata-file <path>", "Path to a JSON file with the same metadata fields").option("--workspace <name-or-id>", "Workspace name or ID").action((opts, command) => runShareConvo(opts, command, false));
 
 // src/commands/save-convo.ts
-import { Command as Command33 } from "commander";
-var saveConvoCommand = new Command33("save-convo").description("Save the current AI conversation as a personal checkpoint").option("--transcript-file <path>", "Path to the LLM-emitted markdown transcript (required)").option("--native-file <path>", "Path to the native session file (optional; auto-detected from env vars)").option("--source-agent <slug>", "Override host-agent detection").option("--title <string>", "Short title for the conversation (required)").option("--note <string>", "Optional note to your future self").option("--ttl-days <n>", "Days until expiration (1-30, default 7)").option("--metadata-json <json>", "Inline JSON object with workMode, openQuestions, etc.").option("--metadata-file <path>", "Path to a JSON file with metadata fields").option("--workspace <name-or-id>", "Workspace name or ID").action((opts, command) => runShareConvo({ ...opts, personal: true }, command, true));
+import { Command as Command34 } from "commander";
+var saveConvoCommand = new Command34("save-convo").description("Save the current AI conversation as a personal checkpoint").option("--transcript-file <path>", "Path to the LLM-emitted markdown transcript (required)").option("--native-file <path>", "Path to the native session file (optional; auto-detected from env vars)").option("--source-agent <slug>", "Override host-agent detection").option("--title <string>", "Short title for the conversation (required)").option("--note <string>", "Optional note to your future self").option("--ttl-days <n>", "Days until expiration (1-30, default 7)").option("--metadata-json <json>", "Inline JSON object with workMode, openQuestions, etc.").option("--metadata-file <path>", "Path to a JSON file with metadata fields").option("--workspace <name-or-id>", "Workspace name or ID").action((opts, command) => runShareConvo({ ...opts, personal: true }, command, true));
 
 // src/commands/inbox.ts
 init_store();
 init_client();
-import { Command as Command34 } from "commander";
-var inboxCommand = new Command34("inbox").description("List shared conversations visible to you").option("--filter <scope>", "Filter: all | received | sent | saved", "all").option("--limit <n>", "Max rows to return", "50").option("--workspace <name-or-id>", "Workspace name or ID").action(async (opts, command) => {
+import { Command as Command35 } from "commander";
+var inboxCommand = new Command35("inbox").description("List shared conversations visible to you").option("--filter <scope>", "Filter: all | received | sent | saved", "all").option("--limit <n>", "Max rows to return", "50").option("--workspace <name-or-id>", "Workspace name or ID").action(async (opts, command) => {
   const useJson = shouldOutputJson(command.optsWithGlobals().json);
   const scope = opts.filter === "received" || opts.filter === "sent" || opts.filter === "saved" ? opts.filter : "all";
   const limit = opts.limit ? parseInt(opts.limit, 10) : 50;
@@ -21485,10 +21834,10 @@ Shared conversations (${scope}, ${total}):
 // src/commands/resume.ts
 init_store();
 init_client();
-import { Command as Command35 } from "commander";
-import { writeFileSync as writeFileSync32, mkdirSync as mkdirSync29, realpathSync } from "fs";
-import { homedir as homedir24 } from "os";
-import { join as join45 } from "path";
+import { Command as Command36 } from "commander";
+import { writeFileSync as writeFileSync29, mkdirSync as mkdirSync27, realpathSync } from "fs";
+import { homedir as homedir26 } from "os";
+import { join as join48 } from "path";
 import { spawn as spawn5 } from "child_process";
 function encodeClaudeCodeCwd(cwd) {
   let canonical;
@@ -21525,10 +21874,10 @@ function extractCodexUuid(rolloutContent) {
 }
 function placeClaudeJsonl(uuid, content, recipientCwd) {
   const encoded = encodeClaudeCodeCwd(recipientCwd);
-  const projectDir = join45(homedir24(), ".claude", "projects", encoded);
-  mkdirSync29(projectDir, { recursive: true });
-  const placedAt = join45(projectDir, `${uuid}.jsonl`);
-  writeFileSync32(placedAt, content);
+  const projectDir = join48(homedir26(), ".claude", "projects", encoded);
+  mkdirSync27(projectDir, { recursive: true });
+  const placedAt = join48(projectDir, `${uuid}.jsonl`);
+  writeFileSync29(placedAt, content);
   return { placedAt, runFromCwd: recipientCwd };
 }
 function placeCodexRollout(uuid, content) {
@@ -21536,11 +21885,11 @@ function placeCodexRollout(uuid, content) {
   const yyyy = String(now.getUTCFullYear());
   const mm = String(now.getUTCMonth() + 1).padStart(2, "0");
   const dd = String(now.getUTCDate()).padStart(2, "0");
-  const dir = join45(homedir24(), ".codex", "sessions", yyyy, mm, dd);
-  mkdirSync29(dir, { recursive: true });
+  const dir = join48(homedir26(), ".codex", "sessions", yyyy, mm, dd);
+  mkdirSync27(dir, { recursive: true });
   const ts = now.toISOString().replace(/\.\d+Z$/, "").replace(/:/g, "-");
-  const placedAt = join45(dir, `rollout-${ts}-${uuid}.jsonl`);
-  writeFileSync32(placedAt, content);
+  const placedAt = join48(dir, `rollout-${ts}-${uuid}.jsonl`);
+  writeFileSync29(placedAt, content);
   return { placedAt };
 }
 function pickTargetAgent(opts, sourceAgent) {
@@ -21559,7 +21908,7 @@ function isAgentInstalled(agent) {
   }
   return false;
 }
-var resumeCommand2 = new Command35("resume").description("Resume a shared conversation locally in your agent of choice").argument("<share-id>", "The share ID (sc_*) returned by share-convo or save-convo").option("--agent <slug>", "Override target agent (e.g. claude-code, codex)").option("--into <path>", "Override target cwd (defaults to current $PWD)").option("--dry-run", "Print the resume command instead of executing it").option("--pick", "Show interactive picker (requires TTY) - not yet implemented").option("--workspace <name-or-id>", "Workspace name or ID").action(async (shareId, opts, command) => {
+var resumeCommand2 = new Command36("resume").description("Resume a shared conversation locally in your agent of choice").argument("<share-id>", "The share ID (sc_*) returned by share-convo or save-convo").option("--agent <slug>", "Override target agent (e.g. claude-code, codex)").option("--into <path>", "Override target cwd (defaults to current $PWD)").option("--dry-run", "Print the resume command instead of executing it").option("--pick", "Show interactive picker (requires TTY) - not yet implemented").option("--workspace <name-or-id>", "Workspace name or ID").action(async (shareId, opts, command) => {
   const useJson = shouldOutputJson(command.optsWithGlobals().json);
   const credentials = requireAuth();
   const client = new ApiClient(credentials);
@@ -21789,7 +22138,7 @@ process.on("uncaughtException", (err) => {
   console.error(`Uncaught exception: ${formatError(err)}`);
   process.exit(1);
 });
-var program = new Command36;
+var program = new Command37;
 program.name("runwork").description("Runwork CLI - local development for Runwork apps").version(VERSION).option("--json", "Output as JSON (auto-enabled when stdout is not a TTY)");
 program.addCommand(infoCommand);
 program.addCommand(loginCommand);
@@ -21814,6 +22163,7 @@ program.addCommand(apiKeysCommand);
 program.addCommand(agentsCommand);
 program.addCommand(mcpCommand);
 program.addCommand(setupCommand);
+program.addCommand(workspaceCommand);
 program.addCommand(syncCommand);
 program.addCommand(buildPluginCommand);
 program.addCommand(uninstallCommand);