@flydocs/cli 0.6.0-alpha.26 → 0.6.0-alpha.28

package/dist/cli.js

@@ -15,7 +15,7 @@ var CLI_VERSION, CLI_NAME, PACKAGE_NAME, POSTHOG_API_KEY;
 var init_constants = __esm({
   "src/lib/constants.ts"() {
     "use strict";
-    CLI_VERSION = "0.6.0-alpha.26";
+    CLI_VERSION = "0.6.0-alpha.28";
     CLI_NAME = "flydocs";
     PACKAGE_NAME = "@flydocs/cli";
     POSTHOG_API_KEY = "phc_v1MSJTQDFkMS90CBh3mxIz3v8bYCCnKU6v1ir6bz0Xn";
@@ -2928,12 +2928,14 @@ var init_global_config = __esm({
 function resolveRelayUrl() {
   return process.env.FLYDOCS_RELAY_URL?.replace(/\/$/, "") ?? DEFAULT_RELAY_URL;
 }
-function headers(apiKey) {
-  return {
+function headers(apiKey, workspaceId) {
+  const h = {
     Authorization: `Bearer ${apiKey}`,
     "Content-Type": "application/json",
     Accept: "application/json"
   };
+  if (workspaceId) h["X-Workspace"] = workspaceId;
+  return h;
 }
 async function fetchConfigV2(apiKey, options = {}) {
   const baseUrl = resolveRelayUrl();
@@ -2941,7 +2943,7 @@ async function fetchConfigV2(apiKey, options = {}) {
   if (options.includeContext) params.set("includeContext", "true");
   const response = await fetch(`${baseUrl}/config/generate?${params}`, {
     method: "GET",
-    headers: headers(apiKey),
+    headers: headers(apiKey, options.workspaceId),
     signal: AbortSignal.timeout(3e4)
   });
   if (!response.ok) {
@@ -2954,11 +2956,11 @@ async function fetchConfigV2(apiKey, options = {}) {
   }
   return await response.json();
 }
-async function fetchTemplates(apiKey, sinceVersion) {
+async function fetchTemplates(apiKey, sinceVersion, workspaceId) {
   const baseUrl = resolveRelayUrl();
   const response = await fetch(`${baseUrl}/templates?since=${sinceVersion}`, {
     method: "GET",
-    headers: headers(apiKey),
+    headers: headers(apiKey, workspaceId),
     signal: AbortSignal.timeout(15e3)
   });
   if (!response.ok) {
@@ -2987,33 +2989,250 @@ var init_relay_client = __esm({
   }
 });
 
+// src/commands/cleanup.ts
+var cleanup_exports = {};
+__export(cleanup_exports, {
+  default: () => cleanup_default,
+  executeCleanup: () => executeCleanup,
+  scanArtifacts: () => scanArtifacts
+});
+import { defineCommand as defineCommand2 } from "citty";
+import pc7 from "picocolors";
+import { join as join18 } from "path";
+import { readFile as readFile13, writeFile as writeFile11, rm as rm4 } from "fs/promises";
+async function scanArtifacts(targetDir) {
+  const actions = [];
+  const localMePath = join18(targetDir, ".flydocs", "me.json");
+  if (await pathExists(localMePath) && await pathExists(globalMePath())) {
+    actions.push({
+      description: "Remove .flydocs/me.json (migrated to ~/.flydocs/me.json)",
+      path: localMePath,
+      type: "file"
+    });
+  }
+  const validationCachePath = join18(
+    targetDir,
+    ".flydocs",
+    "validation-cache.json"
+  );
+  if (await pathExists(validationCachePath)) {
+    actions.push({
+      description: "Remove .flydocs/validation-cache.json (replaced by configVersion)",
+      path: validationCachePath,
+      type: "file"
+    });
+  }
+  const hasGlobalCreds = await pathExists(credentialsPath());
+  for (const envFile of [".env", ".env.local"]) {
+    const envPath = join18(targetDir, envFile);
+    if (!await pathExists(envPath)) continue;
+    const content = await readFile13(envPath, "utf-8");
+    const lines = content.split("\n");
+    for (const line of lines) {
+      const trimmed = line.trim();
+      if (hasGlobalCreds && trimmed.startsWith("FLYDOCS_API_KEY=")) {
+        actions.push({
+          description: `Remove FLYDOCS_API_KEY from ${envFile} (migrated to ~/.flydocs/credentials)`,
+          path: envPath,
+          type: "line"
+        });
+      }
+      if (trimmed.startsWith("FLYDOCS_RELAY_URL=")) {
+        actions.push({
+          description: `Remove FLYDOCS_RELAY_URL from ${envFile}`,
+          path: envPath,
+          type: "line"
+        });
+      }
+    }
+  }
+  try {
+    const config = await readAnyConfig(targetDir);
+    const rawContent = await readFile13(
+      join18(targetDir, ".flydocs", "config.json"),
+      "utf-8"
+    );
+    const raw = JSON.parse(rawContent);
+    const ghostFields = ["provider", "statusMapping"];
+    for (const field of ghostFields) {
+      if (field in raw) {
+        actions.push({
+          description: `Remove ghost field "${field}" from config.json`,
+          path: join18(targetDir, ".flydocs", "config.json"),
+          type: "field"
+        });
+      }
+    }
+    if (isConfigV2(config)) {
+      const v1OnlyFields = [
+        "workspaceId",
+        "issueLabels",
+        "workspace",
+        "onboardComplete",
+        "sourceRepo",
+        "designSystem",
+        "aiLabor"
+      ];
+      for (const field of v1OnlyFields) {
+        if (field in raw) {
+          actions.push({
+            description: `Remove v1 field "${field}" from config.json (server-owned in v2)`,
+            path: join18(targetDir, ".flydocs", "config.json"),
+            type: "field"
+          });
+        }
+      }
+    }
+  } catch {
+  }
+  return actions;
+}
+async function executeCleanup(targetDir, actions) {
+  const fileRemovals = actions.filter((a) => a.type === "file");
+  const lineRemovals = actions.filter((a) => a.type === "line");
+  const fieldRemovals = actions.filter((a) => a.type === "field");
+  for (const action of fileRemovals) {
+    await rm4(action.path, { force: true });
+  }
+  const envFiles = /* @__PURE__ */ new Map();
+  for (const action of lineRemovals) {
+    if (!envFiles.has(action.path)) {
+      const content = await readFile13(action.path, "utf-8");
+      envFiles.set(action.path, content.split("\n"));
+    }
+  }
+  for (const [envPath, lines] of envFiles) {
+    const filtered = lines.filter((line) => {
+      const trimmed = line.trim();
+      return !trimmed.startsWith("FLYDOCS_API_KEY=") && !trimmed.startsWith("FLYDOCS_RELAY_URL=");
+    });
+    const hasContent = filtered.some(
+      (l) => l.trim().length > 0 && !l.trim().startsWith("#")
+    );
+    if (!hasContent) {
+      await rm4(envPath, { force: true });
+    } else {
+      await writeFile11(envPath, filtered.join("\n"), "utf-8");
+    }
+  }
+  if (fieldRemovals.length > 0) {
+    const configPath = join18(targetDir, ".flydocs", "config.json");
+    const content = await readFile13(configPath, "utf-8");
+    const config = JSON.parse(content);
+    for (const action of fieldRemovals) {
+      const match = action.description.match(/"(\w+)"/);
+      if (match) {
+        delete config[match[1]];
+      }
+    }
+    await writeFile11(
+      configPath,
+      JSON.stringify(config, null, 2) + "\n",
+      "utf-8"
+    );
+  }
+}
+var cleanup_default;
+var init_cleanup = __esm({
+  "src/commands/cleanup.ts"() {
+    "use strict";
+    init_ui();
+    init_fs_ops();
+    init_config();
+    init_types();
+    init_global_config();
+    cleanup_default = defineCommand2({
+      meta: {
+        name: "cleanup",
+        description: "Remove legacy v1 artifacts after migration (dry-run by default)"
+      },
+      args: {
+        confirm: {
+          type: "boolean",
+          description: "Actually remove artifacts (default: dry-run only)",
+          default: false
+        },
+        path: {
+          type: "string",
+          description: "Path to project directory"
+        }
+      },
+      async run({ args }) {
+        const targetDir = args.path ?? process.cwd();
+        console.log();
+        console.log(`  ${pc7.bold("FlyDocs Cleanup")}`);
+        console.log();
+        const hasConfig = await pathExists(
+          join18(targetDir, ".flydocs", "config.json")
+        );
+        if (!hasConfig) {
+          printError("No .flydocs/config.json found. Run flydocs init first.");
+          process.exit(1);
+        }
+        const hasGlobalCreds = await pathExists(credentialsPath());
+        if (!hasGlobalCreds) {
+          printWarning(
+            "No global credentials found. Run flydocs init to set up credentials before cleanup."
+          );
+        }
+        const actions = await scanArtifacts(targetDir);
+        if (actions.length === 0) {
+          printStatus("No legacy artifacts found. Already clean.");
+          console.log();
+          return;
+        }
+        const mode = args.confirm ? "Removing" : "Would remove";
+        printInfo(`${mode} ${actions.length} legacy artifact(s):`);
+        console.log();
+        for (const action of actions) {
+          const icon = args.confirm ? pc7.red("-") : pc7.yellow("?");
+          console.log(`  ${icon} ${action.description}`);
+        }
+        console.log();
+        if (!args.confirm) {
+          printInfo(
+            `Dry-run complete. Run ${pc7.cyan("flydocs cleanup --confirm")} to remove.`
+          );
+          console.log();
+          return;
+        }
+        await executeCleanup(targetDir, actions);
+        printCompletionBox("Cleanup Complete", [
+          `${pc7.green("+")} Removed ${actions.length} legacy artifact(s)`
+        ]);
+        console.log();
+      }
+    });
+  }
+});
+
 // src/lib/workspace.ts
-import { readFile as readFile13, writeFile as writeFile11, readdir as readdir4, stat as stat2 } from "fs/promises";
-import { join as join18, dirname as dirname3, relative, resolve as resolve3 } from "path";
+import { readFile as readFile14, writeFile as writeFile12, readdir as readdir4, stat as stat2 } from "fs/promises";
+import { join as join19, dirname as dirname3, relative, resolve as resolve3 } from "path";
 async function readWorkspaceFile(dir) {
-  const filePath = join18(dir, WORKSPACE_FILENAME);
+  const filePath = join19(dir, WORKSPACE_FILENAME);
   if (!await pathExists(filePath)) return null;
-  const content = await readFile13(filePath, "utf-8");
+  const content = await readFile14(filePath, "utf-8");
   const parsed = JSON.parse(content);
   validateWorkspaceFile(parsed);
   return parsed;
 }
 async function writeWorkspaceFile(dir, workspace) {
-  const filePath = join18(dir, WORKSPACE_FILENAME);
+  const filePath = join19(dir, WORKSPACE_FILENAME);
   const content = JSON.stringify(workspace, null, 2) + "\n";
-  await writeFile11(filePath, content, "utf-8");
+  await writeFile12(filePath, content, "utf-8");
 }
 async function detectSiblingRepos(parentDir) {
   const repos = {};
   const entries = await readdir4(parentDir);
   for (const entry of entries) {
     if (entry.startsWith(".")) continue;
-    const entryPath = join18(parentDir, entry);
+    const entryPath = join19(parentDir, entry);
     const entryStat = await stat2(entryPath).catch(() => null);
     if (!entryStat?.isDirectory()) continue;
-    const hasGit = await pathExists(join18(entryPath, ".git"));
+    const hasGit = await pathExists(join19(entryPath, ".git"));
     const hasFlydocs = await pathExists(
-      join18(entryPath, ".flydocs", "config.json")
+      join19(entryPath, ".flydocs", "config.json")
     );
     if (hasGit || hasFlydocs) {
       repos[entry] = { path: `./${entry}` };
@@ -3028,10 +3247,10 @@ async function readSiblingDescriptors(workspaceDir, repos) {
   const descriptors = [];
   for (const [name, entry] of Object.entries(repos)) {
     const repoDir = resolve3(workspaceDir, entry.path);
-    const serviceJsonPath = join18(repoDir, "flydocs", "context", "service.json");
+    const serviceJsonPath = join19(repoDir, "flydocs", "context", "service.json");
     if (!await pathExists(serviceJsonPath)) continue;
     try {
-      const content = await readFile13(serviceJsonPath, "utf-8");
+      const content = await readFile14(serviceJsonPath, "utf-8");
       const descriptor = JSON.parse(content);
       descriptors.push({ name, path: entry.path, descriptor });
     } catch {
@@ -3139,16 +3358,18 @@ var init_exports = {};
 __export(init_exports, {
   default: () => init_default
 });
-import { defineCommand as defineCommand2 } from "citty";
-import { text as text2, confirm as confirm3, isCancel as isCancel4, cancel as cancel3 } from "@clack/prompts";
-import pc7 from "picocolors";
-import { join as join19 } from "path";
-import { mkdir as mkdir9, writeFile as writeFile12 } from "fs/promises";
+import { defineCommand as defineCommand3 } from "citty";
+import { text as text2, confirm as confirm3, select as select2, isCancel as isCancel4, cancel as cancel3 } from "@clack/prompts";
+import pc8 from "picocolors";
+import { join as join20 } from "path";
+import { mkdir as mkdir9, writeFile as writeFile13 } from "fs/promises";
+import { execFile } from "child_process";
+import { promisify } from "util";
 async function resolveAndValidateKey(keyArg, targetDir) {
   let resolved = await resolveApiKey(keyArg, targetDir);
   if (!resolved) {
     console.log(
-      `  ${pc7.dim("Get your API key (fdk_...) from your FlyDocs dashboard")}`
+      `  ${pc8.dim("Get your API key (fdk_...) from your FlyDocs dashboard")}`
     );
     console.log();
     const keyInput = await text2({
@@ -3178,32 +3399,56 @@ async function resolveAndValidateKey(keyArg, targetDir) {
       printError("Invalid API key. Check your key and try again.");
       process.exit(1);
     }
-    printStatus(`Authenticated with ${pc7.bold(result.org)}`);
+    printStatus(`Authenticated with ${pc8.bold(result.org)}`);
   } catch {
     printError(
       "Could not reach FlyDocs API. Check your network and try again."
     );
     console.log(
-      `  ${pc7.dim("flydocs init requires server access. For offline use, run flydocs install instead.")}`
+      `  ${pc8.dim("flydocs init requires server access. For offline use, run flydocs install instead.")}`
     );
     process.exit(1);
   }
+  const workspaces = await fetchWorkspaces(apiKey);
+  let workspaceId;
+  if (workspaces.length === 0) {
+    printError("No workspaces found. Create one at app.flydocs.ai first.");
+    process.exit(1);
+  } else if (workspaces.length === 1) {
+    workspaceId = workspaces[0].id;
+    printStatus(`Workspace: ${pc8.bold(workspaces[0].name)}`);
+  } else {
+    const choice = await select2({
+      message: "Select workspace",
+      options: workspaces.map((ws) => ({
+        value: ws.id,
+        label: ws.name
+      }))
+    });
+    if (isCancel4(choice)) {
+      cancel3("Init cancelled.");
+      process.exit(0);
+    }
+    workspaceId = choice;
+  }
   await writeGlobalCredential({
     apiKey,
+    workspaceId,
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     lastValidated: (/* @__PURE__ */ new Date()).toISOString()
   });
   await checkCredentialPermissions();
-  return apiKey;
+  return { apiKey, workspaceId };
 }
-async function pullServerConfig(apiKey, targetDir) {
+async function pullServerConfig(apiKey, targetDir, workspaceId) {
   printInfo("Pulling config from server...");
   const isFirstInit = !await pathExists(
-    join19(targetDir, ".flydocs", "config.json")
+    join20(targetDir, ".flydocs", "config.json")
   );
   try {
     const response = await fetchConfigV2(apiKey, {
-      includeContext: isFirstInit
+      includeContext: isFirstInit,
+      workspaceId
     });
     if (!response.valid) {
       printError("Server returned invalid config. Contact support.");
@@ -3215,7 +3460,7 @@ async function pullServerConfig(apiKey, targetDir) {
       printError(`Server error: ${err.message}`);
       if (err.status === 401) {
         console.log(
-          `  ${pc7.dim("Your API key may be revoked. Run flydocs auth with a new key.")}`
+          `  ${pc8.dim("Your API key may be revoked. Run flydocs auth with a new key.")}`
         );
       }
     } else {
@@ -3227,7 +3472,7 @@ async function pullServerConfig(apiKey, targetDir) {
 async function initSingleRepo(targetDir, apiKey, serverResponse) {
   const actions = [];
   const skipped = [];
-  await mkdir9(join19(targetDir, ".flydocs"), { recursive: true });
+  await mkdir9(join20(targetDir, ".flydocs"), { recursive: true });
   const configWithHash = applyConfigHash(serverResponse.config);
   await writeConfig(targetDir, configWithHash);
   actions.push("Wrote .flydocs/config.json (from server)");
@@ -3240,18 +3485,18 @@ async function initSingleRepo(targetDir, apiKey, serverResponse) {
     actions.push("Wrote ~/.flydocs/me.json");
   }
   if (serverResponse.context) {
-    const contextDir = join19(targetDir, "flydocs", "context");
+    const contextDir = join20(targetDir, "flydocs", "context");
     await mkdir9(contextDir, { recursive: true });
-    const projectMdPath = join19(contextDir, "project.md");
+    const projectMdPath = join20(contextDir, "project.md");
     if (!await pathExists(projectMdPath)) {
-      await writeFile12(projectMdPath, serverResponse.context.projectMd, "utf-8");
+      await writeFile13(projectMdPath, serverResponse.context.projectMd, "utf-8");
       actions.push("Wrote flydocs/context/project.md");
     } else {
       skipped.push("flydocs/context/project.md (already exists)");
     }
-    const serviceJsonPath = join19(contextDir, "service.json");
+    const serviceJsonPath = join20(contextDir, "service.json");
     if (serverResponse.context.serviceJson && !await pathExists(serviceJsonPath)) {
-      await writeFile12(
+      await writeFile13(
         serviceJsonPath,
         JSON.stringify(serverResponse.context.serviceJson, null, 2) + "\n",
         "utf-8"
@@ -3264,10 +3509,44 @@ async function initSingleRepo(targetDir, apiKey, serverResponse) {
   await ensureGitignore(targetDir);
   await ensurePlatformIgnores(targetDir);
   actions.push("Updated ignore files");
+  const artifacts = await scanArtifacts(targetDir);
+  if (artifacts.length > 0) {
+    await executeCleanup(targetDir, artifacts);
+    actions.push(`Cleaned ${artifacts.length} legacy artifact(s)`);
+  }
   return { actions, skipped };
 }
+async function checkGitFreshness(repoDir) {
+  const hasGit = await pathExists(join20(repoDir, ".git"));
+  if (!hasGit) return;
+  try {
+    await execFileAsync("git", ["-C", repoDir, "fetch", "--quiet"], {
+      timeout: 15e3
+    });
+    const { stdout } = await execFileAsync(
+      "git",
+      ["-C", repoDir, "rev-list", "--count", "HEAD..@{upstream}"],
+      { timeout: 5e3 }
+    );
+    const behind = parseInt(stdout.trim(), 10);
+    if (behind <= 0) return;
+    printWarning(`Repo is ${behind} commit(s) behind remote.`);
+    const shouldPull = await confirm3({
+      message: "Pull latest before init?"
+    });
+    if (isCancel4(shouldPull) || !shouldPull) {
+      printInfo("Continuing without pulling.");
+      return;
+    }
+    await execFileAsync("git", ["-C", repoDir, "pull", "--ff-only"], {
+      timeout: 3e4
+    });
+    printStatus("Pulled latest from remote.");
+  } catch {
+  }
+}
 async function isParentDirectory(dir) {
-  const hasGit = await pathExists(join19(dir, ".git"));
+  const hasGit = await pathExists(join20(dir, ".git"));
   if (hasGit) return false;
   const repos = await detectSiblingRepos(dir);
   return Object.keys(repos).length >= 2;
@@ -3277,7 +3556,7 @@ async function runMultiRepoInit(parentDir, keyArg) {
   const repoNames = Object.keys(repos).sort();
   printInfo(`Detected ${repoNames.length} repos:`);
   for (const name of repoNames) {
-    console.log(`    ${pc7.cyan(name)}`);
+    console.log(`    ${pc8.cyan(name)}`);
   }
   console.log();
   const shouldContinue = await confirm3({
@@ -3287,8 +3566,11 @@ async function runMultiRepoInit(parentDir, keyArg) {
     cancel3("Init cancelled.");
     process.exit(0);
   }
-  const firstRepoDir = join19(parentDir, repoNames[0]);
-  const apiKey = await resolveAndValidateKey(keyArg, firstRepoDir);
+  const firstRepoDir = join20(parentDir, repoNames[0]);
+  const { apiKey, workspaceId } = await resolveAndValidateKey(
+    keyArg,
+    firstRepoDir
+  );
   const allActions = [
     "Stored credential globally (~/.flydocs/credentials)"
   ];
@@ -3296,10 +3578,11 @@ async function runMultiRepoInit(parentDir, keyArg) {
   let allWarnings = [];
   let firstResponse;
   for (const repoName of repoNames) {
-    const repoDir = join19(parentDir, repoName);
+    const repoDir = join20(parentDir, repoName);
     console.log();
-    printInfo(`Initializing ${pc7.bold(repoName)}...`);
-    const serverResponse = await pullServerConfig(apiKey, repoDir);
+    printInfo(`Initializing ${pc8.bold(repoName)}...`);
+    await checkGitFreshness(repoDir);
+    const serverResponse = await pullServerConfig(apiKey, repoDir, workspaceId);
     if (!firstResponse) firstResponse = serverResponse;
     const { actions, skipped } = await initSingleRepo(
       repoDir,
@@ -3327,47 +3610,60 @@ async function runMultiRepoInit(parentDir, keyArg) {
       await writeWorkspaceFile(parentDir, workspaceFile);
       allActions.push(`.flydocs-workspace.json (${repoNames.length} repos)`);
     }
-    const contextDir = join19(parentDir, "flydocs", "context");
-    const workspaceMdPath = join19(contextDir, "workspace.md");
+    const contextDir = join20(parentDir, "flydocs", "context");
+    const workspaceMdPath = join20(contextDir, "workspace.md");
     if (await pathExists(workspaceMdPath)) {
       allSkipped.push("flydocs/context/workspace.md (already exists)");
     } else {
       await mkdir9(contextDir, { recursive: true });
       const workspaceJson = await readWorkspaceFile(parentDir) ?? buildWorkspaceFile(firstResponse.workspaceId, repos);
       const content = firstResponse.context?.workspaceMd ?? await generateWorkspaceMd(parentDir, workspaceJson);
-      await writeFile12(workspaceMdPath, content, "utf-8");
+      await writeFile13(workspaceMdPath, content, "utf-8");
       const source = firstResponse.context?.workspaceMd ? "from server" : "generated locally";
       allActions.push(`Wrote flydocs/context/workspace.md (${source})`);
     }
   }
   console.log();
-  printInitReport(allActions, allSkipped, allWarnings);
+  printInitReport(
+    allActions,
+    allSkipped,
+    allWarnings,
+    !!firstResponse?.context
+  );
 }
-function printInitReport(actions, skipped, warnings) {
+function printInitReport(actions, skipped, warnings, hasContext) {
   console.log();
   const lines = [];
   for (const action of actions) {
-    lines.push(`${pc7.green("+")} ${action}`);
+    lines.push(`${pc8.green("+")} ${action}`);
   }
   for (const skip of skipped) {
-    lines.push(`${pc7.dim("-")} ${skip}`);
+    lines.push(`${pc8.dim("-")} ${skip}`);
+  }
+  if (!hasContext) {
+    lines.push("");
+    lines.push(
+      `${pc8.yellow("!")} No generated context yet. An admin can generate it from the portal.`
+    );
   }
   if (warnings.length > 0) {
     lines.push("");
     for (const warning of warnings) {
-      lines.push(`${pc7.yellow("!")} ${warning}`);
+      lines.push(`${pc8.yellow("!")} ${warning}`);
     }
   }
   printCompletionBox("FlyDocs Initialized", lines);
   console.log();
   console.log(`  Next steps:`);
   console.log(
-    `    ${pc7.cyan("flydocs sync")}    \u2014 pull latest config and templates`
+    `    ${pc8.cyan("flydocs sync")}       Pull latest config and templates`
+  );
+  console.log(
+    `    ${pc8.cyan("cursor .")} ${pc8.dim("or")} ${pc8.cyan("code .")}   Open your IDE, then use ${pc8.bold("/start-session")}`
   );
-  console.log(`    ${pc7.cyan("/start-session")} \u2014 begin working`);
   console.log();
 }
-var init_default;
+var execFileAsync, init_default;
 var init_init = __esm({
   "src/commands/init.ts"() {
     "use strict";
@@ -3379,8 +3675,10 @@ var init_init = __esm({
     init_gitignore();
     init_fs_ops();
     init_relay_client();
+    init_cleanup();
     init_workspace();
-    init_default = defineCommand2({
+    execFileAsync = promisify(execFile);
+    init_default = defineCommand3({
       meta: {
         name: "init",
         description: "Initialize FlyDocs in this project (unified setup)"
@@ -3398,14 +3696,22 @@ var init_init = __esm({
       async run({ args }) {
         const targetDir = args.path ?? process.cwd();
         console.log();
-        console.log(`  ${pc7.bold("FlyDocs Init")}`);
+        console.log(`  ${pc8.bold("FlyDocs Init")}`);
         console.log();
         if (await isParentDirectory(targetDir)) {
           await runMultiRepoInit(targetDir, args.key);
           return;
         }
-        const apiKey = await resolveAndValidateKey(args.key, targetDir);
-        const serverResponse = await pullServerConfig(apiKey, targetDir);
+        await checkGitFreshness(targetDir);
+        const { apiKey, workspaceId } = await resolveAndValidateKey(
+          args.key,
+          targetDir
+        );
+        const serverResponse = await pullServerConfig(
+          apiKey,
+          targetDir,
+          workspaceId
+        );
         const { actions, skipped } = await initSingleRepo(
           targetDir,
           apiKey,
@@ -3414,7 +3720,7 @@ var init_init = __esm({
         actions.unshift("Stored credential globally (~/.flydocs/credentials)");
         const topology = serverResponse.config.topology;
         if (topology?.type === 4 && topology.label === "sibling-repos") {
-          const parentDir = join19(targetDir, "..");
+          const parentDir = join20(targetDir, "..");
           const existing = await readWorkspaceFile(parentDir);
           if (existing) {
             skipped.push(".flydocs-workspace.json (already exists)");
@@ -3432,7 +3738,12 @@ var init_init = __esm({
             }
           }
         }
-        printInitReport(actions, skipped, serverResponse.warnings);
+        printInitReport(
+          actions,
+          skipped,
+          serverResponse.warnings,
+          !!serverResponse.context
+        );
       }
     });
   }
@@ -3443,11 +3754,11 @@ var update_exports = {};
 __export(update_exports, {
   default: () => update_default
 });
-import { defineCommand as defineCommand3 } from "citty";
-import { resolve as resolve4, join as join20 } from "path";
-import { mkdir as mkdir10, cp as cp2, readFile as readFile14, readdir as readdir5, rm as rm4 } from "fs/promises";
-import { select as select2, text as text3, confirm as confirm4, isCancel as isCancel5, cancel as cancel4 } from "@clack/prompts";
-import pc8 from "picocolors";
+import { defineCommand as defineCommand4 } from "citty";
+import { resolve as resolve4, join as join21 } from "path";
+import { mkdir as mkdir10, cp as cp2, readFile as readFile15, readdir as readdir5, rm as rm5 } from "fs/promises";
+import { select as select3, text as text3, confirm as confirm4, isCancel as isCancel5, cancel as cancel4 } from "@clack/prompts";
+import pc9 from "picocolors";
 var update_default;
 var init_update = __esm({
   "src/commands/update.ts"() {
@@ -3466,7 +3777,7 @@ var init_update = __esm({
     init_update_check();
     init_telemetry();
     init_integrity();
-    update_default = defineCommand3({
+    update_default = defineCommand4({
       meta: {
         name: "update",
         description: "Update an existing FlyDocs installation"
@@ -3515,7 +3826,7 @@ var init_update = __esm({
         } else if (args.here) {
           targetDir = process.cwd();
         } else {
-          const choice = await select2({
+          const choice = await select3({
             message: "Which project would you like to update?",
             options: [
               {
@@ -3553,9 +3864,9 @@ var init_update = __esm({
         }
         targetDir = resolve4(targetDir);
         process.chdir(targetDir);
-        const hasVersion = await pathExists(join20(targetDir, ".flydocs", "version"));
+        const hasVersion = await pathExists(join21(targetDir, ".flydocs", "version"));
         const hasConfig = await pathExists(
-          join20(targetDir, ".flydocs", "config.json")
+          join21(targetDir, ".flydocs", "config.json")
         );
         if (!hasVersion && !hasConfig) {
           printError(`Not a FlyDocs project: ${targetDir}`);
@@ -3566,8 +3877,8 @@ var init_update = __esm({
         console.log();
         let currentVersion = "0.1.0";
         if (hasVersion) {
-          const vContent = await readFile14(
-            join20(targetDir, ".flydocs", "version"),
+          const vContent = await readFile15(
+            join21(targetDir, ".flydocs", "version"),
             "utf-8"
           );
           currentVersion = vContent.trim();
@@ -3601,10 +3912,10 @@ var init_update = __esm({
         });
         console.log(`Updating: v${currentVersion} \u2192 v${version}`);
         console.log();
-        const changelogPath = join20(templateDir, "CHANGELOG.md");
+        const changelogPath = join21(templateDir, "CHANGELOG.md");
         const whatsNew = await getWhatsNew(changelogPath, currentVersion, version);
         if (whatsNew.length > 0) {
-          console.log(pc8.cyan("What's new:"));
+          console.log(pc9.cyan("What's new:"));
           console.log();
           for (const entry of whatsNew) {
             console.log(`  ${entry}`);
@@ -3613,23 +3924,23 @@ var init_update = __esm({
         }
         const now = /* @__PURE__ */ new Date();
         const ts = `${now.getFullYear()}${String(now.getMonth() + 1).padStart(2, "0")}${String(now.getDate()).padStart(2, "0")}-${String(now.getHours()).padStart(2, "0")}${String(now.getMinutes()).padStart(2, "0")}${String(now.getSeconds()).padStart(2, "0")}`;
-        const backupDir = join20(targetDir, ".flydocs", `backup-${ts}`);
+        const backupDir = join21(targetDir, ".flydocs", `backup-${ts}`);
         await mkdir10(backupDir, { recursive: true });
         if (hasConfig) {
           await cp2(
-            join20(targetDir, ".flydocs", "config.json"),
-            join20(backupDir, "config.json")
+            join21(targetDir, ".flydocs", "config.json"),
+            join21(backupDir, "config.json")
           );
           printStatus(`Config backed up to .flydocs/backup-${ts}/`);
         }
         try {
-          const flydocsDir = join20(targetDir, ".flydocs");
+          const flydocsDir = join21(targetDir, ".flydocs");
           const entries = await readdir5(flydocsDir);
           const backups = entries.filter((e) => e.startsWith("backup-")).sort();
           if (backups.length > 3) {
             const toRemove = backups.slice(0, backups.length - 3);
             for (const old of toRemove) {
-              await rm4(join20(flydocsDir, old), { recursive: true, force: true });
+              await rm5(join21(flydocsDir, old), { recursive: true, force: true });
             }
           }
         } catch {
@@ -3668,17 +3979,17 @@ var init_update = __esm({
         await ensureDirectories(targetDir, effectiveTier);
         console.log("Replacing framework directories...");
         await replaceDirectory(
-          join20(templateDir, ".flydocs", "templates"),
-          join20(targetDir, ".flydocs", "templates")
+          join21(templateDir, ".flydocs", "templates"),
+          join21(targetDir, ".flydocs", "templates")
         );
         printStatus(".flydocs/templates");
         await replaceDirectory(
-          join20(templateDir, ".claude", "hooks"),
-          join20(targetDir, ".claude", "hooks")
+          join21(templateDir, ".claude", "hooks"),
+          join21(targetDir, ".claude", "hooks")
         );
         printStatus(".claude/hooks");
         const hasExistingAgents = await pathExists(
-          join20(targetDir, ".claude", "agents")
+          join21(targetDir, ".claude", "agents")
         );
         let installAgents;
         if (args.yes) {
@@ -3687,7 +3998,7 @@ var init_update = __esm({
           installAgents = true;
         } else {
           console.log();
-          console.log(`  ${pc8.bold(pc8.yellow("Sub-Agents (Recommended)"))}`);
+          console.log(`  ${pc9.bold(pc9.yellow("Sub-Agents (Recommended)"))}`);
           console.log();
           console.log(
             "  Sub-agents are specialized roles (PM, implementation, review,"
@@ -3710,20 +4021,20 @@ var init_update = __esm({
           }
         }
         if (installAgents) {
-          const claudeAgentsSrc = join20(templateDir, ".claude", "agents");
+          const claudeAgentsSrc = join21(templateDir, ".claude", "agents");
           if (await pathExists(claudeAgentsSrc)) {
-            await mkdir10(join20(targetDir, ".claude", "agents"), { recursive: true });
+            await mkdir10(join21(targetDir, ".claude", "agents"), { recursive: true });
             await copyDirectoryContents(
               claudeAgentsSrc,
-              join20(targetDir, ".claude", "agents")
+              join21(targetDir, ".claude", "agents")
             );
           }
-          const cursorAgentsSrc = join20(templateDir, ".cursor", "agents");
+          const cursorAgentsSrc = join21(templateDir, ".cursor", "agents");
           if (await pathExists(cursorAgentsSrc)) {
-            await mkdir10(join20(targetDir, ".cursor", "agents"), { recursive: true });
+            await mkdir10(join21(targetDir, ".cursor", "agents"), { recursive: true });
             await copyDirectoryContents(
               cursorAgentsSrc,
-              join20(targetDir, ".cursor", "agents")
+              join21(targetDir, ".cursor", "agents")
             );
           }
           printStatus(
@@ -3737,47 +4048,47 @@ var init_update = __esm({
         console.log();
         console.log("Replacing framework files...");
         await copyFile(
-          join20(templateDir, ".claude", "CLAUDE.md"),
-          join20(targetDir, ".claude", "CLAUDE.md")
+          join21(templateDir, ".claude", "CLAUDE.md"),
+          join21(targetDir, ".claude", "CLAUDE.md")
         );
         await copyFile(
-          join20(templateDir, ".claude", "settings.json"),
-          join20(targetDir, ".claude", "settings.json")
+          join21(templateDir, ".claude", "settings.json"),
+          join21(targetDir, ".claude", "settings.json")
         );
         printStatus(".claude/CLAUDE.md, settings.json");
         await copyDirectoryContents(
-          join20(templateDir, ".claude", "commands"),
-          join20(targetDir, ".claude", "commands")
+          join21(templateDir, ".claude", "commands"),
+          join21(targetDir, ".claude", "commands")
         );
         await copyDirectoryContents(
-          join20(templateDir, ".claude", "commands"),
-          join20(targetDir, ".cursor", "commands")
+          join21(templateDir, ".claude", "commands"),
+          join21(targetDir, ".cursor", "commands")
         );
         printStatus(".claude/commands, .cursor/commands");
-        const skillsReadmeSrc = join20(templateDir, ".claude", "skills", "README.md");
+        const skillsReadmeSrc = join21(templateDir, ".claude", "skills", "README.md");
         if (await pathExists(skillsReadmeSrc)) {
           await copyFile(
             skillsReadmeSrc,
-            join20(targetDir, ".claude", "skills", "README.md")
+            join21(targetDir, ".claude", "skills", "README.md")
           );
         }
         printStatus(".claude/skills/README.md");
         await copyFile(
-          join20(templateDir, ".cursor", "hooks.json"),
-          join20(targetDir, ".cursor", "hooks.json")
+          join21(templateDir, ".cursor", "hooks.json"),
+          join21(targetDir, ".cursor", "hooks.json")
         );
         printStatus(".cursor/hooks.json");
         await copyFile(
-          join20(templateDir, "AGENTS.md"),
-          join20(targetDir, "AGENTS.md")
+          join21(templateDir, "AGENTS.md"),
+          join21(targetDir, "AGENTS.md")
         );
         printStatus("AGENTS.md");
-        const envExampleSrc = join20(templateDir, ".env.example");
+        const envExampleSrc = join21(templateDir, ".env.example");
         if (await pathExists(envExampleSrc)) {
-          await copyFile(envExampleSrc, join20(targetDir, ".env.example"));
+          await copyFile(envExampleSrc, join21(targetDir, ".env.example"));
           printStatus(".env.example");
         }
-        const knowledgeTemplatesDir = join20(
+        const knowledgeTemplatesDir = join21(
           targetDir,
           "flydocs",
           "knowledge",
@@ -3787,8 +4098,8 @@ var init_update = __esm({
           await mkdir10(knowledgeTemplatesDir, { recursive: true });
         }
         for (const tmpl of ["decision.md", "feature.md", "note.md"]) {
-          const src = join20(templateDir, "flydocs", "knowledge", "templates", tmpl);
-          const dest = join20(knowledgeTemplatesDir, tmpl);
+          const src = join21(templateDir, "flydocs", "knowledge", "templates", tmpl);
+          const dest = join21(knowledgeTemplatesDir, tmpl);
           if (await pathExists(src) && !await pathExists(dest)) {
             await copyFile(src, dest);
           }
@@ -3815,18 +4126,18 @@ var init_update = __esm({
           printWarning("Config merge failed \u2014 config.json preserved as-is");
         }
         await copyFile(
-          join20(templateDir, ".flydocs", "version"),
-          join20(targetDir, ".flydocs", "version")
+          join21(templateDir, ".flydocs", "version"),
+          join21(targetDir, ".flydocs", "version")
         );
         printStatus(`.flydocs/version \u2192 ${version}`);
-        const clSrc = join20(templateDir, "CHANGELOG.md");
+        const clSrc = join21(templateDir, "CHANGELOG.md");
         if (await pathExists(clSrc)) {
-          await copyFile(clSrc, join20(targetDir, ".flydocs", "CHANGELOG.md"));
+          await copyFile(clSrc, join21(targetDir, ".flydocs", "CHANGELOG.md"));
           printStatus(".flydocs/CHANGELOG.md");
         }
-        const mfSrc = join20(templateDir, "manifest.json");
+        const mfSrc = join21(templateDir, "manifest.json");
         if (await pathExists(mfSrc)) {
-          await copyFile(mfSrc, join20(targetDir, ".flydocs", "manifest.json"));
+          await copyFile(mfSrc, join21(targetDir, ".flydocs", "manifest.json"));
           printStatus(".flydocs/manifest.json");
         }
         await generateIntegrity(targetDir, version);
@@ -3888,13 +4199,13 @@ var uninstall_exports = {};
 __export(uninstall_exports, {
   default: () => uninstall_default
 });
-import { defineCommand as defineCommand4 } from "citty";
-import { resolve as resolve5, join as join21 } from "path";
-import { readdir as readdir6, rm as rm5, rename as rename2 } from "fs/promises";
-import { confirm as confirm5, select as select3, isCancel as isCancel6, cancel as cancel5 } from "@clack/prompts";
-import pc9 from "picocolors";
+import { defineCommand as defineCommand5 } from "citty";
+import { resolve as resolve5, join as join22 } from "path";
+import { readdir as readdir6, rm as rm6, rename as rename2 } from "fs/promises";
+import { confirm as confirm5, select as select4, isCancel as isCancel6, cancel as cancel5 } from "@clack/prompts";
+import pc10 from "picocolors";
 async function removeOwnedSkills(targetDir) {
-  const skillsDir = join21(targetDir, ".claude", "skills");
+  const skillsDir = join22(targetDir, ".claude", "skills");
   const removed = [];
   if (!await pathExists(skillsDir)) {
     return removed;
@@ -3903,7 +4214,7 @@ async function removeOwnedSkills(targetDir) {
     const entries = await readdir6(skillsDir);
     for (const entry of entries) {
       if (entry.startsWith(OWNED_SKILL_PREFIX)) {
-        await rm5(join21(skillsDir, entry), { recursive: true, force: true });
+        await rm6(join22(skillsDir, entry), { recursive: true, force: true });
         removed.push(`.claude/skills/${entry}`);
       }
     }
@@ -3912,7 +4223,7 @@ async function removeOwnedSkills(targetDir) {
   return removed;
 }
 async function removeOwnedCursorRules(targetDir) {
-  const rulesDir = join21(targetDir, ".cursor", "rules");
+  const rulesDir = join22(targetDir, ".cursor", "rules");
   const removed = [];
   if (!await pathExists(rulesDir)) {
     return removed;
@@ -3921,7 +4232,7 @@ async function removeOwnedCursorRules(targetDir) {
     const entries = await readdir6(rulesDir);
     for (const entry of entries) {
       if (entry.startsWith(OWNED_RULE_PREFIX) && entry.endsWith(".mdc")) {
-        await rm5(join21(rulesDir, entry), { force: true });
+        await rm6(join22(rulesDir, entry), { force: true });
         removed.push(`.cursor/rules/${entry}`);
       }
     }
@@ -3940,9 +4251,9 @@ async function isEmptyDir(dirPath) {
 async function cleanupEmptyParents(targetDir, dirs) {
   const cleaned = [];
   for (const dir of dirs) {
-    const fullPath = join21(targetDir, dir);
+    const fullPath = join22(targetDir, dir);
     if (await pathExists(fullPath) && await isEmptyDir(fullPath)) {
-      await rm5(fullPath, { recursive: true, force: true });
+      await rm6(fullPath, { recursive: true, force: true });
       cleaned.push(dir);
     }
   }
@@ -3972,7 +4283,7 @@ var init_uninstall = __esm({
     ];
     OWNED_SKILL_PREFIX = "flydocs-";
     OWNED_RULE_PREFIX = "flydocs-";
-    uninstall_default = defineCommand4({
+    uninstall_default = defineCommand5({
       meta: {
         name: "uninstall",
         description: "Remove FlyDocs from a project directory"
@@ -4019,8 +4330,8 @@ var init_uninstall = __esm({
           process.exit(1);
         }
         targetDir = resolve5(targetDir);
-        const hasFlydocs = await pathExists(join21(targetDir, ".flydocs"));
-        const hasAgentsMd = await pathExists(join21(targetDir, "AGENTS.md"));
+        const hasFlydocs = await pathExists(join22(targetDir, ".flydocs"));
+        const hasAgentsMd = await pathExists(join22(targetDir, "AGENTS.md"));
         if (!hasFlydocs && !hasAgentsMd) {
           printError(`Not a FlyDocs project: ${targetDir}`);
           printInfo("No .flydocs/ directory or AGENTS.md found.");
@@ -4032,12 +4343,12 @@ var init_uninstall = __esm({
         const removeAll = forceAll || args.all;
         const skipPrompts = forceAll || args.yes;
         let contentAction = "preserve";
-        const hasUserContent = await pathExists(join21(targetDir, "flydocs"));
+        const hasUserContent = await pathExists(join22(targetDir, "flydocs"));
         if (hasUserContent) {
           if (removeAll) {
             contentAction = "remove";
           } else if (!skipPrompts) {
-            const choice = await select3({
+            const choice = await select4({
               message: "What should happen to your flydocs/ content (project docs, knowledge base)?",
               options: [
                 {
@@ -4066,34 +4377,34 @@ var init_uninstall = __esm({
         }
         if (!skipPrompts) {
           console.log();
-          console.log(pc9.bold("The following will be removed:"));
+          console.log(pc10.bold("The following will be removed:"));
           console.log();
           console.log("  Framework files:");
           for (const [path] of ALWAYS_REMOVED) {
-            console.log(`    ${pc9.dim(path)}`);
+            console.log(`    ${pc10.dim(path)}`);
           }
-          console.log(`    ${pc9.dim(".claude/skills/flydocs-*")}`);
-          console.log(`    ${pc9.dim(".cursor/rules/flydocs-*.mdc")}`);
+          console.log(`    ${pc10.dim(".claude/skills/flydocs-*")}`);
+          console.log(`    ${pc10.dim(".cursor/rules/flydocs-*.mdc")}`);
           if (hasUserContent) {
             if (contentAction === "archive") {
               console.log();
               console.log(
-                `  User content: ${pc9.yellow("flydocs/ -> flydocs-archive/")}`
+                `  User content: ${pc10.yellow("flydocs/ -> flydocs-archive/")}`
               );
             } else if (contentAction === "remove") {
               console.log();
-              console.log(`  User content: ${pc9.red("flydocs/ (deleted)")}`);
+              console.log(`  User content: ${pc10.red("flydocs/ (deleted)")}`);
             } else {
               console.log();
-              console.log(`  User content: ${pc9.green("flydocs/ (preserved)")}`);
+              console.log(`  User content: ${pc10.green("flydocs/ (preserved)")}`);
             }
           }
           console.log();
-          console.log(pc9.bold("Preserved:"));
+          console.log(pc10.bold("Preserved:"));
           console.log(
-            `    ${pc9.dim(".claude/skills/ (non-flydocs community skills)")}`
+            `    ${pc10.dim(".claude/skills/ (non-flydocs community skills)")}`
           );
-          console.log(`    ${pc9.dim(".env, .env.local")}`);
+          console.log(`    ${pc10.dim(".env, .env.local")}`);
           console.log();
           const shouldContinue = await confirm5({
             message: "Proceed with uninstall?"
@@ -4115,16 +4426,16 @@ var init_uninstall = __esm({
         const removedRules = await removeOwnedCursorRules(targetDir);
         result.removed.push(...removedRules);
         for (const [relativePath, type] of ALWAYS_REMOVED) {
-          const fullPath = join21(targetDir, relativePath);
+          const fullPath = join22(targetDir, relativePath);
           if (!await pathExists(fullPath)) {
             result.skipped.push(relativePath);
             continue;
           }
           try {
             if (type === "dir") {
-              await rm5(fullPath, { recursive: true, force: true });
+              await rm6(fullPath, { recursive: true, force: true });
             } else {
-              await rm5(fullPath, { force: true });
+              await rm6(fullPath, { force: true });
             }
             result.removed.push(relativePath);
           } catch {
@@ -4133,16 +4444,16 @@ var init_uninstall = __esm({
           }
         }
         if (hasUserContent) {
-          const flydocsPath = join21(targetDir, "flydocs");
+          const flydocsPath = join22(targetDir, "flydocs");
           if (contentAction === "archive") {
-            const archivePath = join21(targetDir, "flydocs-archive");
+            const archivePath = join22(targetDir, "flydocs-archive");
             if (await pathExists(archivePath)) {
-              await rm5(archivePath, { recursive: true, force: true });
+              await rm6(archivePath, { recursive: true, force: true });
             }
             await rename2(flydocsPath, archivePath);
             result.archived.push("flydocs/ -> flydocs-archive/");
           } else if (contentAction === "remove") {
-            await rm5(flydocsPath, { recursive: true, force: true });
+            await rm6(flydocsPath, { recursive: true, force: true });
             result.removed.push("flydocs/");
           }
         }
@@ -4161,17 +4472,17 @@ var init_uninstall = __esm({
           result.restored = originals.map((f) => f.relativePath);
         }
         console.log();
-        console.log(pc9.bold("Uninstall Summary"));
+        console.log(pc10.bold("Uninstall Summary"));
         console.log();
         if (result.removed.length > 0) {
-          console.log(`  ${pc9.green("Removed")} (${result.removed.length}):`);
+          console.log(`  ${pc10.green("Removed")} (${result.removed.length}):`);
           for (const item of result.removed) {
             printStatus(item);
           }
         }
         if (result.archived.length > 0) {
           console.log();
-          console.log(`  ${pc9.yellow("Archived")} (${result.archived.length}):`);
+          console.log(`  ${pc10.yellow("Archived")} (${result.archived.length}):`);
           for (const item of result.archived) {
             printInfo(item);
           }
@@ -4179,7 +4490,7 @@ var init_uninstall = __esm({
         if (result.restored.length > 0) {
           console.log();
           console.log(
-            `  ${pc9.green("Restored")} (${result.restored.length} pre-FlyDocs original(s)):`
+            `  ${pc10.green("Restored")} (${result.restored.length} pre-FlyDocs original(s)):`
           );
           for (const item of result.restored) {
             printInfo(item);
@@ -4188,16 +4499,16 @@ var init_uninstall = __esm({
         if (result.skipped.length > 0) {
           console.log();
           console.log(
-            `  ${pc9.dim("Skipped")} (${result.skipped.length} \u2014 not found):`
+            `  ${pc10.dim("Skipped")} (${result.skipped.length} \u2014 not found):`
           );
           for (const item of result.skipped) {
-            console.log(`  ${pc9.dim(item)}`);
+            console.log(`  ${pc10.dim(item)}`);
           }
         }
         console.log();
         printStatus("FlyDocs has been removed from this project.");
         console.log();
-        printInfo(`To reinstall: ${pc9.cyan("npx @flydocs/cli install --here")}`);
+        printInfo(`To reinstall: ${pc10.cyan("npx @flydocs/cli install --here")}`);
         console.log();
       }
     });
@@ -4209,28 +4520,28 @@ var setup_exports = {};
 __export(setup_exports, {
   default: () => setup_default
 });
-import { defineCommand as defineCommand5 } from "citty";
-import pc10 from "picocolors";
+import { defineCommand as defineCommand6 } from "citty";
+import pc11 from "picocolors";
 var setup_default;
 var init_setup = __esm({
   "src/commands/setup.ts"() {
     "use strict";
-    setup_default = defineCommand5({
+    setup_default = defineCommand6({
       meta: {
         name: "setup",
         description: "Configure FlyDocs settings for this project"
       },
       run() {
         console.log();
-        console.log(`  ${pc10.bold("FlyDocs Setup")}`);
+        console.log(`  ${pc11.bold("FlyDocs Setup")}`);
         console.log();
         console.log(`  Setup runs inside your IDE as an interactive AI command.`);
         console.log();
         console.log(
-          `  ${pc10.cyan("Claude Code:")}  Type ${pc10.bold("/flydocs-setup")} in chat`
+          `  ${pc11.cyan("Claude Code:")}  Type ${pc11.bold("/flydocs-setup")} in chat`
         );
         console.log(
-          `  ${pc10.cyan("Cursor:")}      Type ${pc10.bold("/flydocs-setup")} in chat`
+          `  ${pc11.cyan("Cursor:")}      Type ${pc11.bold("/flydocs-setup")} in chat`
         );
         console.log();
         console.log(`  This configures your project context, detects your stack,`);
@@ -4246,14 +4557,14 @@ var skills_exports = {};
 __export(skills_exports, {
   default: () => skills_default
 });
-import { defineCommand as defineCommand6 } from "citty";
-import pc11 from "picocolors";
+import { defineCommand as defineCommand7 } from "citty";
+import pc12 from "picocolors";
 var list, search, add, remove, skills_default;
 var init_skills2 = __esm({
   "src/commands/skills.ts"() {
     "use strict";
     init_skill_manager();
-    list = defineCommand6({
+    list = defineCommand7({
       meta: {
         name: "list",
         description: "List installed skills"
@@ -4269,26 +4580,26 @@ var init_skills2 = __esm({
         console.log(`${total} skill(s) installed:`);
         if (result.platform.length > 0) {
           console.log();
-          console.log(pc11.bold("Platform"));
+          console.log(pc12.bold("Platform"));
           for (const skill of result.platform) {
             console.log(
-              `  ${skill.name} ${pc11.dim(`(${skill.triggers} triggers)`)}`
+              `  ${skill.name} ${pc12.dim(`(${skill.triggers} triggers)`)}`
             );
           }
         }
         if (result.community.length > 0) {
           console.log();
-          console.log(pc11.bold("Community"));
+          console.log(pc12.bold("Community"));
           for (const skill of result.community) {
             console.log(
-              `  ${skill.name} ${pc11.dim(`(${skill.triggers} triggers)`)}`
+              `  ${skill.name} ${pc12.dim(`(${skill.triggers} triggers)`)}`
             );
           }
         }
         console.log();
       }
     });
-    search = defineCommand6({
+    search = defineCommand7({
       meta: {
         name: "search",
         description: "Search community skills"
@@ -4304,24 +4615,24 @@ var init_skills2 = __esm({
         const results = await searchCatalog(args.keyword);
         if (results.length === 0) {
           console.log(`No skills found for "${args.keyword}".`);
-          console.log(`  Browse the catalog at: ${pc11.cyan("https://skills.sh/")}`);
+          console.log(`  Browse the catalog at: ${pc12.cyan("https://skills.sh/")}`);
           return;
         }
         console.log();
         console.log(`${results.length} skill(s) matching "${args.keyword}":`);
         console.log();
         for (const skill of results) {
-          console.log(`  ${pc11.bold(skill.name)}`);
+          console.log(`  ${pc12.bold(skill.name)}`);
           console.log(`  ${skill.description}`);
-          console.log(`  ${pc11.dim(skill.repo)}`);
+          console.log(`  ${pc12.dim(skill.repo)}`);
           if (skill.tags.length > 0) {
-            console.log(`  ${pc11.dim(skill.tags.join(", "))}`);
+            console.log(`  ${pc12.dim(skill.tags.join(", "))}`);
           }
           console.log();
         }
       }
     });
-    add = defineCommand6({
+    add = defineCommand7({
       meta: {
         name: "add",
         description: "Install a community skill"
@@ -4337,7 +4648,7 @@ var init_skills2 = __esm({
         await addSkill(process.cwd(), args.source);
       }
     });
-    remove = defineCommand6({
+    remove = defineCommand7({
       meta: {
         name: "remove",
         description: "Remove an installed community skill"
@@ -4353,7 +4664,7 @@ var init_skills2 = __esm({
         await removeSkill(process.cwd(), args.name);
       }
     });
-    skills_default = defineCommand6({
+    skills_default = defineCommand7({
       meta: {
         name: "skills",
         description: "Manage FlyDocs skills (list, search, add, remove)"
@@ -4373,10 +4684,10 @@ var connect_exports = {};
 __export(connect_exports, {
   default: () => connect_default
 });
-import { defineCommand as defineCommand7 } from "citty";
+import { defineCommand as defineCommand8 } from "citty";
 import { text as text4, confirm as confirm6, isCancel as isCancel7, cancel as cancel6 } from "@clack/prompts";
-import pc12 from "picocolors";
-import { join as join22 } from "path";
+import pc13 from "picocolors";
+import { join as join23 } from "path";
 var connect_default;
 var init_connect = __esm({
   "src/commands/connect.ts"() {
@@ -4386,7 +4697,7 @@ var init_connect = __esm({
     init_template();
     init_ui();
     init_api_key();
-    connect_default = defineCommand7({
+    connect_default = defineCommand8({
       meta: {
         name: "connect",
         description: "Connect FlyDocs to a cloud provider"
@@ -4411,11 +4722,11 @@ var init_connect = __esm({
       },
       async run({ args }) {
         const targetDir = args.path ?? process.cwd();
-        const configPath = join22(targetDir, ".flydocs", "config.json");
+        const configPath = join23(targetDir, ".flydocs", "config.json");
         if (!await pathExists(configPath)) {
           printError("Not a FlyDocs project (.flydocs/config.json not found).");
           console.log(
-            `  Run ${pc12.cyan("flydocs")} first to install FlyDocs in this project.`
+            `  Run ${pc13.cyan("flydocs")} first to install FlyDocs in this project.`
           );
           process.exit(1);
         }
@@ -4432,10 +4743,10 @@ var init_connect = __esm({
           }
         }
         console.log();
-        console.log(`  ${pc12.bold("Connect to FlyDocs Cloud")}`);
+        console.log(`  ${pc13.bold("Connect to FlyDocs Cloud")}`);
         console.log();
         console.log(
-          `  ${pc12.dim("Get your API key (fdk_...) from your FlyDocs dashboard")}`
+          `  ${pc13.dim("Get your API key (fdk_...) from your FlyDocs dashboard")}`
         );
         console.log();
         let apiKey = args.key ?? "";
@@ -4473,7 +4784,7 @@ var init_connect = __esm({
               console.log(`  Check your key and try again.`);
               process.exit(1);
             }
-            printStatus(`Connected to ${pc12.bold(result.org)}`);
+            printStatus(`Connected to ${pc13.bold(result.org)}`);
           } catch {
             printError(
               "Could not reach relay API. Check your network and try again."
@@ -4481,7 +4792,7 @@ var init_connect = __esm({
             process.exit(1);
           }
           const envFile = await storeEnvKey(targetDir, "FLYDOCS_API_KEY", apiKey);
-          printStatus(`API key stored in ${pc12.dim(envFile)}`);
+          printStatus(`API key stored in ${pc13.dim(envFile)}`);
         } else {
           try {
             const result = await validateLinearKey(apiKey);
@@ -4491,7 +4802,7 @@ var init_connect = __esm({
               process.exit(1);
             }
             printStatus(
-              `Authenticated as ${pc12.bold(result.name)} (${result.email})`
+              `Authenticated as ${pc13.bold(result.name)} (${result.email})`
             );
           } catch {
             printError("Invalid API key or network error.");
@@ -4499,7 +4810,7 @@ var init_connect = __esm({
             process.exit(1);
           }
           const envFile = await storeEnvKey(targetDir, "LINEAR_API_KEY", apiKey);
-          printStatus(`API key stored in ${pc12.dim(envFile)}`);
+          printStatus(`API key stored in ${pc13.dim(envFile)}`);
         }
         const wasLocal = config.tier === "local";
         config.tier = "cloud";
@@ -4515,14 +4826,14 @@ var init_connect = __esm({
         }
         console.log();
         console.log(
-          `  ${pc12.bold("Connected!")} Your project is now on the cloud tier.`
+          `  ${pc13.bold("Connected!")} Your project is now on the cloud tier.`
         );
         console.log();
         console.log(`  Next steps:`);
         console.log(
-          `    1. Run ${pc12.cyan("/flydocs-setup")} in your IDE to configure your project`
+          `    1. Run ${pc13.cyan("/flydocs-setup")} in your IDE to configure your project`
         );
-        console.log(`    2. Run ${pc12.cyan("/start-session")} to begin working`);
+        console.log(`    2. Run ${pc13.cyan("/start-session")} to begin working`);
         console.log();
       }
     });
@@ -4534,9 +4845,9 @@ var auth_exports = {};
 __export(auth_exports, {
   default: () => auth_default
 });
-import { defineCommand as defineCommand8 } from "citty";
+import { defineCommand as defineCommand9 } from "citty";
 import { text as text5, confirm as confirm7, isCancel as isCancel8, cancel as cancel7 } from "@clack/prompts";
-import pc13 from "picocolors";
+import pc14 from "picocolors";
 var auth_default;
 var init_auth = __esm({
   "src/commands/auth.ts"() {
@@ -4544,7 +4855,7 @@ var init_auth = __esm({
     init_ui();
     init_api_key();
     init_global_config();
-    auth_default = defineCommand8({
+    auth_default = defineCommand9({
       meta: {
         name: "auth",
         description: "Store API key globally (~/.flydocs/credentials)"
@@ -4558,13 +4869,13 @@ var init_auth = __esm({
       },
       async run({ args }) {
         console.log();
-        console.log(`  ${pc13.bold("FlyDocs Authentication")}`);
+        console.log(`  ${pc14.bold("FlyDocs Authentication")}`);
         console.log();
         let apiKey = args.key ?? "";
         const existing = await readGlobalCredential();
         if (existing?.apiKey && !apiKey) {
           printInfo(
-            `Existing key found: ${pc13.dim(existing.apiKey.slice(0, 8) + "...")}`
+            `Existing key found: ${pc14.dim(existing.apiKey.slice(0, 8) + "...")}`
           );
           const replace = await confirm7({
             message: "Replace with a new key?"
@@ -4576,7 +4887,7 @@ var init_auth = __esm({
         }
         if (!apiKey) {
           console.log(
-            `  ${pc13.dim("Get your API key (fdk_...) from your FlyDocs dashboard")}`
+            `  ${pc14.dim("Get your API key (fdk_...) from your FlyDocs dashboard")}`
           );
           console.log();
           const keyInput = await text5({
@@ -4612,7 +4923,7 @@ var init_auth = __esm({
             printError("Invalid API key. Check your key and try again.");
             process.exit(1);
           }
-          printStatus(`Authenticated with ${pc13.bold(result.org)}`);
+          printStatus(`Authenticated with ${pc14.bold(result.org)}`);
         } catch {
           printError(
             "Could not reach FlyDocs API. Check your network and try again."
@@ -4627,10 +4938,10 @@ var init_auth = __esm({
           createdAt: (/* @__PURE__ */ new Date()).toISOString(),
           lastValidated: (/* @__PURE__ */ new Date()).toISOString()
         });
-        printStatus(`Key stored at ${pc13.dim(credentialsPath())}`);
+        printStatus(`Key stored at ${pc14.dim(credentialsPath())}`);
         await checkCredentialPermissions();
         console.log();
-        console.log(`  ${pc13.bold("Authenticated!")} Key stored globally.`);
+        console.log(`  ${pc14.bold("Authenticated!")} Key stored globally.`);
         console.log(`  All FlyDocs projects on this machine will use this key.`);
         console.log();
       }
@@ -4643,10 +4954,10 @@ var sync_exports = {};
 __export(sync_exports, {
   default: () => sync_default
 });
-import { defineCommand as defineCommand9 } from "citty";
-import pc14 from "picocolors";
-import { join as join23 } from "path";
-import { mkdir as mkdir11, writeFile as writeFile13 } from "fs/promises";
+import { defineCommand as defineCommand10 } from "citty";
+import pc15 from "picocolors";
+import { join as join24 } from "path";
+import { mkdir as mkdir11, writeFile as writeFile14 } from "fs/promises";
 var sync_default;
 var init_sync = __esm({
   "src/commands/sync.ts"() {
@@ -4658,7 +4969,7 @@ var init_sync = __esm({
     init_fs_ops();
     init_types();
     init_relay_client();
-    sync_default = defineCommand9({
+    sync_default = defineCommand10({
       meta: {
         name: "sync",
         description: "Pull latest config and templates from server"
@@ -4682,6 +4993,14 @@ var init_sync = __esm({
           process.exit(1);
         }
         const apiKey = resolved.key;
+        const cred = await readGlobalCredential();
+        const workspaceId = cred?.workspaceId;
+        if (!workspaceId) {
+          printError(
+            "No workspace ID found. Run `flydocs init` to set up your workspace."
+          );
+          process.exit(1);
+        }
         let currentTemplateVersion = 0;
         try {
           const currentConfig = await readAnyConfig(targetDir);
@@ -4692,7 +5011,7 @@ var init_sync = __esm({
         }
         let serverResponse;
         try {
-          serverResponse = await fetchConfigV2(apiKey);
+          serverResponse = await fetchConfigV2(apiKey, { workspaceId });
         } catch (err) {
           if (err instanceof RelayError) {
             printWarning(
@@ -4701,14 +5020,14 @@ var init_sync = __esm({
           } else {
             printWarning("Server unreachable, using cached config.");
           }
-          console.log(`  ${pc14.dim("Config may be stale. Retry when connected.")}`);
+          console.log(`  ${pc15.dim("Config may be stale. Retry when connected.")}`);
           return;
         }
         if (!serverResponse.valid) {
           printWarning("Server returned invalid config. Keeping current config.");
           return;
         }
-        await mkdir11(join23(targetDir, ".flydocs"), { recursive: true });
+        await mkdir11(join24(targetDir, ".flydocs"), { recursive: true });
         const configWithHash = applyConfigHash(serverResponse.config);
         await writeConfig(targetDir, configWithHash);
         changes.push("Updated .flydocs/config.json");
@@ -4717,10 +5036,11 @@ var init_sync = __esm({
           try {
             const templatesResponse = await fetchTemplates(
               apiKey,
-              currentTemplateVersion
+              currentTemplateVersion,
+              workspaceId
             );
             if (templatesResponse.templates.length > 0) {
-              const templatesDir = join23(
+              const templatesDir = join24(
                 targetDir,
                 ".claude",
                 "skills",
@@ -4731,10 +5051,10 @@ var init_sync = __esm({
               for (const template of templatesResponse.templates) {
                 const filename = `${template.type}.md`;
                 const subdir = template.category === "issue" ? "issues" : template.category === "pr" ? "pr" : template.category === "comment" ? "." : ".";
-                const templateDir = join23(templatesDir, subdir);
+                const templateDir = join24(templatesDir, subdir);
                 await mkdir11(templateDir, { recursive: true });
-                await writeFile13(
-                  join23(templateDir, filename),
+                await writeFile14(
+                  join24(templateDir, filename),
                   template.content,
                   "utf-8"
                 );
@@ -4764,221 +5084,6 @@ var init_sync = __esm({
   }
 });
 
-// src/commands/cleanup.ts
-var cleanup_exports = {};
-__export(cleanup_exports, {
-  default: () => cleanup_default
-});
-import { defineCommand as defineCommand10 } from "citty";
-import pc15 from "picocolors";
-import { join as join24 } from "path";
-import { readFile as readFile15, writeFile as writeFile14, rm as rm6 } from "fs/promises";
-async function scanArtifacts(targetDir) {
-  const actions = [];
-  const localMePath = join24(targetDir, ".flydocs", "me.json");
-  if (await pathExists(localMePath) && await pathExists(globalMePath())) {
-    actions.push({
-      description: "Remove .flydocs/me.json (migrated to ~/.flydocs/me.json)",
-      path: localMePath,
-      type: "file"
-    });
-  }
-  const validationCachePath = join24(
-    targetDir,
-    ".flydocs",
-    "validation-cache.json"
-  );
-  if (await pathExists(validationCachePath)) {
-    actions.push({
-      description: "Remove .flydocs/validation-cache.json (replaced by configVersion)",
-      path: validationCachePath,
-      type: "file"
-    });
-  }
-  const hasGlobalCreds = await pathExists(credentialsPath());
-  for (const envFile of [".env", ".env.local"]) {
-    const envPath = join24(targetDir, envFile);
-    if (!await pathExists(envPath)) continue;
-    const content = await readFile15(envPath, "utf-8");
-    const lines = content.split("\n");
-    for (const line of lines) {
-      const trimmed = line.trim();
-      if (hasGlobalCreds && trimmed.startsWith("FLYDOCS_API_KEY=")) {
-        actions.push({
-          description: `Remove FLYDOCS_API_KEY from ${envFile} (migrated to ~/.flydocs/credentials)`,
-          path: envPath,
-          type: "line"
-        });
-      }
-      if (trimmed.startsWith("FLYDOCS_RELAY_URL=")) {
-        actions.push({
-          description: `Remove FLYDOCS_RELAY_URL from ${envFile}`,
-          path: envPath,
-          type: "line"
-        });
-      }
-    }
-  }
-  try {
-    const config = await readAnyConfig(targetDir);
-    const rawContent = await readFile15(
-      join24(targetDir, ".flydocs", "config.json"),
-      "utf-8"
-    );
-    const raw = JSON.parse(rawContent);
-    const ghostFields = ["provider", "statusMapping"];
-    for (const field of ghostFields) {
-      if (field in raw) {
-        actions.push({
-          description: `Remove ghost field "${field}" from config.json`,
-          path: join24(targetDir, ".flydocs", "config.json"),
-          type: "field"
-        });
-      }
-    }
-    if (isConfigV2(config)) {
-      const v1OnlyFields = [
-        "workspaceId",
-        "issueLabels",
-        "workspace",
-        "onboardComplete",
-        "sourceRepo",
-        "designSystem",
-        "aiLabor"
-      ];
-      for (const field of v1OnlyFields) {
-        if (field in raw) {
-          actions.push({
-            description: `Remove v1 field "${field}" from config.json (server-owned in v2)`,
-            path: join24(targetDir, ".flydocs", "config.json"),
-            type: "field"
-          });
-        }
-      }
-    }
-  } catch {
-  }
-  return actions;
-}
-async function executeCleanup(targetDir, actions) {
-  const fileRemovals = actions.filter((a) => a.type === "file");
-  const lineRemovals = actions.filter((a) => a.type === "line");
-  const fieldRemovals = actions.filter((a) => a.type === "field");
-  for (const action of fileRemovals) {
-    await rm6(action.path, { force: true });
-  }
-  const envFiles = /* @__PURE__ */ new Map();
-  for (const action of lineRemovals) {
-    if (!envFiles.has(action.path)) {
-      const content = await readFile15(action.path, "utf-8");
-      envFiles.set(action.path, content.split("\n"));
-    }
-  }
-  for (const [envPath, lines] of envFiles) {
-    const filtered = lines.filter((line) => {
-      const trimmed = line.trim();
-      return !trimmed.startsWith("FLYDOCS_API_KEY=") && !trimmed.startsWith("FLYDOCS_RELAY_URL=");
-    });
-    const hasContent = filtered.some(
-      (l) => l.trim().length > 0 && !l.trim().startsWith("#")
-    );
-    if (!hasContent) {
-      await rm6(envPath, { force: true });
-    } else {
-      await writeFile14(envPath, filtered.join("\n"), "utf-8");
-    }
-  }
-  if (fieldRemovals.length > 0) {
-    const configPath = join24(targetDir, ".flydocs", "config.json");
-    const content = await readFile15(configPath, "utf-8");
-    const config = JSON.parse(content);
-    for (const action of fieldRemovals) {
-      const match = action.description.match(/"(\w+)"/);
-      if (match) {
-        delete config[match[1]];
-      }
-    }
-    await writeFile14(
-      configPath,
-      JSON.stringify(config, null, 2) + "\n",
-      "utf-8"
-    );
-  }
-}
-var cleanup_default;
-var init_cleanup = __esm({
-  "src/commands/cleanup.ts"() {
-    "use strict";
-    init_ui();
-    init_fs_ops();
-    init_config();
-    init_types();
-    init_global_config();
-    cleanup_default = defineCommand10({
-      meta: {
-        name: "cleanup",
-        description: "Remove legacy v1 artifacts after migration (dry-run by default)"
-      },
-      args: {
-        confirm: {
-          type: "boolean",
-          description: "Actually remove artifacts (default: dry-run only)",
-          default: false
-        },
-        path: {
-          type: "string",
-          description: "Path to project directory"
-        }
-      },
-      async run({ args }) {
-        const targetDir = args.path ?? process.cwd();
-        console.log();
-        console.log(`  ${pc15.bold("FlyDocs Cleanup")}`);
-        console.log();
-        const hasConfig = await pathExists(
-          join24(targetDir, ".flydocs", "config.json")
-        );
-        if (!hasConfig) {
-          printError("No .flydocs/config.json found. Run flydocs init first.");
-          process.exit(1);
-        }
-        const hasGlobalCreds = await pathExists(credentialsPath());
-        if (!hasGlobalCreds) {
-          printWarning(
-            "No global credentials found. Run flydocs init to set up credentials before cleanup."
-          );
-        }
-        const actions = await scanArtifacts(targetDir);
-        if (actions.length === 0) {
-          printStatus("No legacy artifacts found. Already clean.");
-          console.log();
-          return;
-        }
-        const mode = args.confirm ? "Removing" : "Would remove";
-        printInfo(`${mode} ${actions.length} legacy artifact(s):`);
-        console.log();
-        for (const action of actions) {
-          const icon = args.confirm ? pc15.red("-") : pc15.yellow("?");
-          console.log(`  ${icon} ${action.description}`);
-        }
-        console.log();
-        if (!args.confirm) {
-          printInfo(
-            `Dry-run complete. Run ${pc15.cyan("flydocs cleanup --confirm")} to remove.`
-          );
-          console.log();
-          return;
-        }
-        await executeCleanup(targetDir, actions);
-        printCompletionBox("Cleanup Complete", [
-          `${pc15.green("+")} Removed ${actions.length} legacy artifact(s)`
-        ]);
-        console.log();
-      }
-    });
-  }
-});
-
 // src/commands/upgrade.ts
 var upgrade_exports = {};
 __export(upgrade_exports, {