@fml-inc/fml 0.8.0-rc.1 → 0.8.0-rc.3

package/dist/cli.js

@@ -2,7 +2,7 @@
 import {
   createFmlClient,
   getAuthenticatedClient
-} from "./chunk-P3QLARXE.js";
+} from "./chunk-R45CWWZO.js";
 import {
   OBSERVER_HEARTBEAT_STALE_MS,
   getProcessIdentity,
@@ -10,13 +10,13 @@ import {
   isPidAlive,
   readObserverStateStatus,
   removeObserverStateIfOwned
-} from "./chunk-HUR2HCUG.js";
+} from "./chunk-7DWFJENY.js";
 import {
   readJsonFile,
   setHookCaptureDisabled,
   writeJsonFile,
   writeTextFileAtomic
-} from "./chunk-I4GZPTBM.js";
+} from "./chunk-ENW2GJNO.js";
 import {
   CODEX_HOOK_EVENTS,
   GEMINI_HOOK_EVENTS,
@@ -24,8 +24,8 @@ import {
   isObserverHealth,
   readHookInboxStatus,
   readObserverAuthToken
-} from "./chunk-DEMVOVVY.js";
-import "./chunk-T5YVLSUC.js";
+} from "./chunk-KBT5RMAU.js";
+import "./chunk-7V7G7NVF.js";
 import {
   claudeConfigDirectory,
   createCliRawSync,
@@ -34,7 +34,7 @@ import {
   initializeSyncSettings,
   resolvePackageRoot,
   runRawSyncOnce
-} from "./chunk-JXSSPQ5B.js";
+} from "./chunk-YSU5CS2V.js";
 import {
   DEFAULT_PROD_URL,
   DEFAULT_TARGET_NAME,
@@ -76,7 +76,7 @@ import {
   storeServiceRefreshToken,
   writeEnvConfig,
   writeTokens
-} from "./chunk-7DR5X7XI.js";
+} from "./chunk-A6HAEVJX.js";
 import "./chunk-MLKGABMK.js";
 
 // src/cli.ts
@@ -124,7 +124,7 @@ var POLL_INTERVAL_MS = 50;
 var LOG_ROTATE_BYTES = 10 * 1024 * 1024;
 var LOG_ROTATE_FILES = 3;
 function expectedObserverVersion() {
-  return true ? "0.8.0-rc.1+60c9b7e1" : "dev";
+  return true ? "0.8.0-rc.3+246af775" : "dev";
 }
 function delay(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -776,20 +776,58 @@ function probeLocalStorage() {
     });
   }
 }
+function humanCheckResult(result) {
+  switch (result.label) {
+    case "Auth":
+      return { label: "Account", detail: result.detail };
+    case "Environment": {
+      const environmentName = result.detail.replace(
+        / has no backend URL$/u,
+        ""
+      );
+      return {
+        label: "Environment",
+        detail: result.status === "ok" ? result.detail.split(" \u2192 ")[0] ?? result.detail : `No service URL is configured for ${environmentName}. Run \`fml env <name-or-url>\`.`
+      };
+    }
+    case "Organization":
+      return { label: "Organization", detail: result.detail };
+    case "Local data":
+      return { label: "Local storage", detail: result.detail };
+    case "Database lease":
+      return {
+        label: "Runtime state",
+        detail: result.detail.replace("observer", "FML service")
+      };
+    case "Raw sync":
+      return {
+        label: "Agent activity sync",
+        detail: result.detail.replace("observer state", "FML service state").replace("raw sync", "agent activity sync")
+      };
+    case "API":
+      return { label: "FML API", detail: result.detail };
+    case "Observer":
+      return {
+        label: "FML service",
+        detail: result.detail.replace("observer", "FML service").replace("continuous sync", "agent activity sync").replace("raw sync", "agent activity sync")
+      };
+  }
+  return null;
+}
 function reportResult(result, spinner) {
-  const text = `${result.label} \u2014 ${result.detail}`;
   if (spinner) {
-    if (result.status === "ok") spinner.succeed(text);
-    if (result.status === "warn") spinner.warn(text);
-    if (result.status === "fail") spinner.fail(text);
-    return;
+    spinner.indent = 0;
+    spinner.stop();
   }
+  const humanResult = humanCheckResult(result);
+  if (!humanResult) return;
   const icon = result.status === "ok" ? pc.green("\u2713") : result.status === "warn" ? pc.yellow("!") : pc.red("\u2717");
-  console.log(`  ${icon}  ${text}`);
+  console.log(`  ${icon}  ${humanResult.label} \u2014 ${humanResult.detail}`);
 }
 async function handleDoctor(opts) {
   const environment = getActiveEnv();
   const isTTY = !opts.json && process.stdout.isTTY === true;
+  if (!opts.json) console.log("FML doctor\n");
   const checks = [];
   const startSpinner = (label) => isTTY ? ora({ text: `Checking ${label}...`, indent: 2 }).start() : null;
   const record = (result, spinner) => {
@@ -909,7 +947,7 @@ async function handleDoctor(opts) {
     }
   }
   {
-    const spinner = startSpinner("raw sync");
+    const spinner = startSpinner("agent activity sync");
     try {
       try {
         probeDurableDirectory(FML_OBSERVER_DIR, {
@@ -977,7 +1015,7 @@ async function handleDoctor(opts) {
     }
   }
   {
-    const spinner = startSpinner("local observer");
+    const spinner = startSpinner("FML service");
     const rawSync2 = createRawArtifactSync({ stateDir: FML_OBSERVER_DIR });
     const syncEnabled = rawSync2.getSettings().enabled;
     const observer = await readObserverRuntimeStatus();
@@ -1018,12 +1056,15 @@ async function handleDoctor(opts) {
   console.log(`
   ${parts.join(", ")}
 `);
+  if (failed > 0) {
+    console.log("Fix the failed checks above, then run `fml doctor` again.");
+  }
 }
 
 // src/commands/install.ts
-import fs9 from "fs";
+import fs10 from "fs";
 import os5 from "os";
-import path21 from "path";
+import path22 from "path";
 import { fileURLToPath } from "url";
 
 // ../../packages/agent-targets/src/install/claude/index.ts
@@ -1264,39 +1305,166 @@ var CLAUDE_PLUGIN_INSTALLER = Object.freeze({
   })
 });
 
-// src/banner.ts
-import pc2 from "picocolors";
-var LOGO_LINES = [
-  " \u2584\u2588\u2588\u2580   \u2588\u2588\u2584\u2588\u2588\u2584\u2588\u2588  \u2588\u2588",
-  " \u2588\u2588     \u2588\u2588 \u2588\u2588 \u2588\u2588  \u2588\u2588",
-  "\u2588\u2588\u2588\u2588\u2588   \u2588\u2588    \u2588\u2588  \u2588\u2588",
-  " \u2588\u2588     \u2588\u2588    \u2588\u2588  \u2588\u2588\u2588\u2588",
-  " \u2580\u2580     \u2580\u2580    \u2580\u2580  \u2580\u2580\u2580\u2580"
-];
-function printBanner() {
-  console.log("");
-  for (let i = 0; i < LOGO_LINES.length; i++) {
-    const color = i < 3 ? pc2.blue : pc2.cyan;
-    console.log("  " + color(LOGO_LINES[i]));
+// ../../packages/agent-targets/src/install/pi/index.ts
+import fs3 from "fs";
+import path4 from "path";
+import { randomUUID as randomUUID2 } from "crypto";
+var FML_PI_EXTENSION_MARKER = "__FML_PI_EXTENSION_V1__";
+var LEGACY_PI_EXTENSION_MARKER = "__panopticonPiExtensionTest";
+var LEGACY_PI_EXTENSION_SIGNATURES = Object.freeze([
+  "PANOPTICON_PORT",
+  '"/hooks"',
+  "UserPromptSubmit",
+  "PreToolUse",
+  "PostToolUse",
+  "SessionEnd"
+]);
+function pathApiFor(platform) {
+  return platform === "win32" ? path4.win32 : path4.posix;
+}
+function resolvePiAgentDir(context, pathApi) {
+  const configured = context.env.PI_CODING_AGENT_DIR?.trim();
+  if (!configured) {
+    return pathApi.join(context.homeDir, ".pi", "agent");
+  }
+  if (configured === "~") return context.homeDir;
+  if (configured.startsWith("~/") || configured.startsWith("~\\")) {
+    return pathApi.join(context.homeDir, configured.slice(2));
+  }
+  return pathApi.normalize(configured);
+}
+function readFileIfPresent(filePath) {
+  try {
+    return fs3.readFileSync(filePath, "utf8");
+  } catch (error) {
+    if (error.code === "ENOENT") return null;
+    throw error;
+  }
+}
+function isOwnedExtension(source, legacy = false) {
+  return source.includes(FML_PI_EXTENSION_MARKER) || legacy && (source.includes(LEGACY_PI_EXTENSION_MARKER) || LEGACY_PI_EXTENSION_SIGNATURES.every(
+    (signature) => source.includes(signature)
+  ));
+}
+function removeLegacyExtension(filePath) {
+  const source = readFileIfPresent(filePath);
+  if (source === null) return { removed: false, preserved: false };
+  if (!isOwnedExtension(source, true)) {
+    return { removed: false, preserved: true };
+  }
+  fs3.rmSync(filePath);
+  return { removed: true, preserved: false };
+}
+function writeExtensionAtomically(filePath, source) {
+  fs3.mkdirSync(path4.dirname(filePath), { recursive: true, mode: 448 });
+  const temporaryPath = path4.join(
+    path4.dirname(filePath),
+    `.${path4.basename(filePath)}.${process.pid}.${randomUUID2()}.tmp`
+  );
+  try {
+    fs3.writeFileSync(temporaryPath, source, { encoding: "utf8", mode: 384 });
+    if (process.platform === "win32" && fs3.existsSync(filePath)) {
+      fs3.rmSync(filePath);
+    }
+    fs3.renameSync(temporaryPath, filePath);
+  } finally {
+    fs3.rmSync(temporaryPath, { force: true });
   }
-  console.log("");
 }
+var PI_EXTENSION_INSTALLER = Object.freeze({
+  resolvePaths(context) {
+    const pathApi = pathApiFor(context.platform);
+    const extensionsDir = pathApi.join(
+      resolvePiAgentDir(context, pathApi),
+      "extensions"
+    );
+    return {
+      sourcePath: pathApi.join(
+        context.packageRoot,
+        "dist",
+        "pi",
+        "extension.js"
+      ),
+      extensionsDir,
+      destinationPath: pathApi.join(extensionsDir, "fml.js"),
+      legacyDestinationPath: pathApi.join(extensionsDir, "panopticon.js")
+    };
+  },
+  install(paths) {
+    const source = fs3.readFileSync(paths.sourcePath, "utf8");
+    if (!source.includes(FML_PI_EXTENSION_MARKER)) {
+      throw new Error(
+        `Packaged Pi extension is invalid: ${paths.sourcePath} does not contain the FML ownership marker`
+      );
+    }
+    const existing = readFileIfPresent(paths.destinationPath);
+    if (existing !== null && !isOwnedExtension(existing)) {
+      const legacy2 = removeLegacyExtension(paths.legacyDestinationPath);
+      return {
+        status: "preserved",
+        destinationPath: paths.destinationPath,
+        reason: "an extension not managed by FML already exists at this path",
+        legacyRemoved: legacy2.removed,
+        legacyPreserved: legacy2.preserved
+      };
+    }
+    const status = existing === null ? "installed" : existing === source ? "unchanged" : "updated";
+    if (status !== "unchanged") {
+      writeExtensionAtomically(paths.destinationPath, source);
+    }
+    const legacy = removeLegacyExtension(paths.legacyDestinationPath);
+    return {
+      status,
+      destinationPath: paths.destinationPath,
+      legacyRemoved: legacy.removed,
+      legacyPreserved: legacy.preserved
+    };
+  },
+  uninstall(paths) {
+    const existing = readFileIfPresent(paths.destinationPath);
+    const legacy = removeLegacyExtension(paths.legacyDestinationPath);
+    if (existing === null) {
+      return {
+        status: "absent",
+        destinationPath: paths.destinationPath,
+        legacyRemoved: legacy.removed,
+        legacyPreserved: legacy.preserved
+      };
+    }
+    if (!isOwnedExtension(existing)) {
+      return {
+        status: "preserved",
+        destinationPath: paths.destinationPath,
+        reason: "the existing extension is not managed by FML",
+        legacyRemoved: legacy.removed,
+        legacyPreserved: legacy.preserved
+      };
+    }
+    fs3.rmSync(paths.destinationPath);
+    return {
+      status: "removed",
+      destinationPath: paths.destinationPath,
+      legacyRemoved: legacy.removed,
+      legacyPreserved: legacy.preserved
+    };
+  }
+});
 
 // src/bin-utils.ts
-import fs3 from "fs";
-import path4 from "path";
+import fs4 from "fs";
+import path5 from "path";
 import { execFileSync, execSync } from "child_process";
 var IS_WIN = process.platform === "win32";
 var DEFAULT_PATHEXT = ".COM;.EXE;.BAT;.CMD";
 function resolveBin(name) {
-  const pathDirs = (process.env.PATH ?? "").split(path4.delimiter).filter(Boolean);
-  const hasExt = path4.extname(name) !== "";
+  const pathDirs = (process.env.PATH ?? "").split(path5.delimiter).filter(Boolean);
+  const hasExt = path5.extname(name) !== "";
   const exts = !IS_WIN || hasExt ? [""] : (process.env.PATHEXT ?? DEFAULT_PATHEXT).split(";").filter(Boolean);
   for (const dir of pathDirs) {
     for (const ext of exts) {
-      const candidate = path4.join(dir, name + ext);
+      const candidate = path5.join(dir, name + ext);
       try {
-        if (fs3.statSync(candidate).isFile()) return candidate;
+        if (fs4.statSync(candidate).isFile()) return candidate;
       } catch {
       }
     }
@@ -1328,18 +1496,18 @@ function execBinSync(bin, args, opts = {}) {
 }
 
 // src/managed-directories.ts
-import fs4 from "fs";
+import fs5 from "fs";
 import os from "os";
-import path5 from "path";
+import path6 from "path";
 var FML_MANAGED_DIRECTORY_MARKER = ".fml-managed-root";
 var FML_MANAGED_DIRECTORY_MARKER_CONTENT = "fml-managed-directory-v1\n";
 function comparisonPathApi(platform, targetPaths) {
   if (platform === "win32" && targetPaths.some(
     (targetPath) => /^[A-Za-z]:[\\/]/u.test(targetPath) || targetPath.startsWith("\\\\") || targetPath.startsWith("//")
   )) {
-    return path5.win32;
+    return path6.win32;
   }
-  return path5;
+  return path6;
 }
 function resolveComparisonPath(targetPath, platform) {
   return comparisonPathApi(platform, [targetPath]).resolve(targetPath);
@@ -1412,7 +1580,7 @@ function configuredManagedRoots(platform = process.platform) {
   );
 }
 function managedDirectoryMarker(directory) {
-  return path5.join(directory, FML_MANAGED_DIRECTORY_MARKER);
+  return path6.join(directory, FML_MANAGED_DIRECTORY_MARKER);
 }
 function ownershipStatus(stats, platform) {
   if (platform === "win32") return "unverifiable";
@@ -1423,8 +1591,8 @@ function ownershipStatus(stats, platform) {
 function hasManagedDirectoryMarkerContents(directory) {
   const marker = managedDirectoryMarker(directory);
   try {
-    const stats = fs4.lstatSync(marker);
-    return stats.isFile() && fs4.readFileSync(marker, "utf8") === FML_MANAGED_DIRECTORY_MARKER_CONTENT;
+    const stats = fs5.lstatSync(marker);
+    return stats.isFile() && fs5.readFileSync(marker, "utf8") === FML_MANAGED_DIRECTORY_MARKER_CONTENT;
   } catch {
     return false;
   }
@@ -1432,11 +1600,11 @@ function hasManagedDirectoryMarkerContents(directory) {
 function hasManagedDirectoryMarker(directory, platform = process.platform) {
   const marker = managedDirectoryMarker(directory);
   try {
-    const stats = fs4.lstatSync(marker);
+    const stats = fs5.lstatSync(marker);
     if (!stats.isFile() || ownershipStatus(stats, platform) !== "owned") {
       return false;
     }
-    return fs4.readFileSync(marker, "utf8") === FML_MANAGED_DIRECTORY_MARKER_CONTENT;
+    return fs5.readFileSync(marker, "utf8") === FML_MANAGED_DIRECTORY_MARKER_CONTENT;
   } catch {
     return false;
   }
@@ -1444,7 +1612,7 @@ function hasManagedDirectoryMarker(directory, platform = process.platform) {
 function writeManagedDirectoryMarker(directory, platform) {
   const marker = managedDirectoryMarker(directory);
   try {
-    fs4.writeFileSync(marker, FML_MANAGED_DIRECTORY_MARKER_CONTENT, {
+    fs5.writeFileSync(marker, FML_MANAGED_DIRECTORY_MARKER_CONTENT, {
       encoding: "utf8",
       flag: "wx",
       mode: 384
@@ -1469,23 +1637,23 @@ function prepareManagedDirectory(root, platform = process.platform) {
   let created = false;
   let existingStats = null;
   try {
-    existingStats = fs4.lstatSync(root.directory);
+    existingStats = fs5.lstatSync(root.directory);
   } catch (error) {
     if (error.code !== "ENOENT") throw error;
     existed = false;
   }
   if (!existed) {
-    fs4.mkdirSync(path5.dirname(root.directory), {
+    fs5.mkdirSync(path6.dirname(root.directory), {
       recursive: true,
       mode: 448
     });
     try {
-      fs4.mkdirSync(root.directory, { mode: 448 });
+      fs5.mkdirSync(root.directory, { mode: 448 });
       created = true;
     } catch (error) {
       if (error.code !== "EEXIST") throw error;
       existed = true;
-      existingStats = fs4.lstatSync(root.directory);
+      existingStats = fs5.lstatSync(root.directory);
     }
   }
   if (hasSymlinkedParentBelowTrustedAnchor(root.directory, platform)) {
@@ -1495,7 +1663,7 @@ function prepareManagedDirectory(root, platform = process.platform) {
       markerCreated: false
     };
   }
-  const directoryStats = existingStats ?? fs4.lstatSync(root.directory);
+  const directoryStats = existingStats ?? fs5.lstatSync(root.directory);
   const ownership = ownershipStatus(directoryStats, platform);
   const recognizedWindowsMarker = platform === "win32" && hasManagedDirectoryMarkerContents(root.directory);
   if (directoryStats.isSymbolicLink() || !directoryStats.isDirectory() || ownership === "foreign" || !root.nativeDefault && ownership !== "owned" && !(created && ownership === "unverifiable") && !recognizedWindowsMarker) {
@@ -1519,7 +1687,7 @@ function prepareManagedDirectory(root, platform = process.platform) {
       markerCreated: false
     };
   }
-  const mayClaim = fs4.readdirSync(root.directory).length === 0;
+  const mayClaim = fs5.readdirSync(root.directory).length === 0;
   if (!mayClaim) {
     return {
       directory: root.directory,
@@ -1578,7 +1746,7 @@ function hasSymlinkedParentBelowTrustedAnchor(targetPath, platform = process.pla
   for (const component of relativeParent.split(pathApi.sep)) {
     current = pathApi.join(current, component);
     try {
-      if (fs4.lstatSync(current).isSymbolicLink()) return true;
+      if (fs5.lstatSync(current).isSymbolicLink()) return true;
     } catch (error) {
       if (error.code === "ENOENT") return false;
       return true;
@@ -1603,7 +1771,7 @@ function unsafePurgeRoots(roots, platform = process.platform) {
     }
     let stats;
     try {
-      stats = fs4.lstatSync(root.directory);
+      stats = fs5.lstatSync(root.directory);
     } catch (error) {
       if (error.code === "ENOENT") continue;
       unsafe.push({
@@ -1652,14 +1820,14 @@ function unsafePurgeRoots(roots, platform = process.platform) {
 }
 
 // src/commands/hook-config.ts
-import fs5 from "fs";
+import fs6 from "fs";
 import os2 from "os";
-import path10 from "path";
+import path11 from "path";
 
 // ../../packages/agent-targets/src/install/hooks/codex.ts
 import { createHash } from "crypto";
 import { isDeepStrictEqual as isDeepStrictEqual2 } from "util";
-import path7 from "path";
+import path8 from "path";
 import { parse as parse2 } from "smol-toml";
 
 // ../../packages/agent-targets/src/toml.ts
@@ -1669,7 +1837,7 @@ function asRecord2(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
 function singlePath(value) {
-  const path29 = [];
+  const path30 = [];
   let current = value;
   while (true) {
     if (Array.isArray(current) && current.length === 1) {
@@ -1677,13 +1845,13 @@ function singlePath(value) {
       continue;
     }
     const record = asRecord2(current);
-    if (!record) return path29;
+    if (!record) return path30;
     const keys = Object.keys(record);
-    if (keys.length === 0) return path29;
+    if (keys.length === 0) return path30;
     if (keys.length !== 1) throw new Error("ambiguous TOML statement path");
     const key = keys[0];
     if (key === void 0) throw new Error("missing TOML statement key");
-    path29.push(key);
+    path30.push(key);
     current = record[key];
   }
 }
@@ -1765,8 +1933,8 @@ function scanStatements(source) {
   }
   return statements;
 }
-function startsWithPath(path29, prefix) {
-  return prefix.every((part, index) => path29[index] === part);
+function startsWithPath(path30, prefix) {
+  return prefix.every((part, index) => path30[index] === part);
 }
 function pathsEqual(left, right) {
   return left.length === right.length && left.every((part, index) => part === right[index]);
@@ -1792,9 +1960,9 @@ function appendToml(source, addition) {
 function hasOwn(record, key) {
   return Object.prototype.hasOwnProperty.call(record, key);
 }
-function updatedValueAtPath(updated, path29) {
+function updatedValueAtPath(updated, path30) {
   let current = updated;
-  for (const part of path29) {
+  for (const part of path30) {
     const record = asRecord2(current);
     if (!record || !hasOwn(record, part)) return { exists: false };
     current = record[part];
@@ -1808,22 +1976,22 @@ function normalizedPaths(updates) {
       throw new Error("TOML update path cannot be empty");
     }
     if (paths.some(
-      (path29) => pathsEqual(path29, update.path) || startsWithPath(update.path, path29)
+      (path30) => pathsEqual(path30, update.path) || startsWithPath(update.path, path30)
     )) {
       continue;
     }
     for (let index = paths.length - 1; index >= 0; index -= 1) {
-      const path29 = paths[index];
-      if (path29 && startsWithPath(path29, update.path)) paths.splice(index, 1);
+      const path30 = paths[index];
+      if (path30 && startsWithPath(path30, update.path)) paths.splice(index, 1);
     }
     paths.push([...update.path]);
   }
   return paths;
 }
-function valueDocument(path29, value) {
+function valueDocument(path30, value) {
   let nested = value;
-  for (let index = path29.length - 1; index >= 0; index -= 1) {
-    const part = path29[index];
+  for (let index = path30.length - 1; index >= 0; index -= 1) {
+    const part = path30[index];
     if (part === void 0) throw new Error("TOML update path is invalid");
     nested = { [part]: nested };
   }
@@ -1842,12 +2010,12 @@ function insertAfterStatement(source, statement, addition) {
   const separator = before.endsWith(eol) ? "" : eol;
   return `${before}${separator}${normalized}${eol}${source.slice(statement.end)}`;
 }
-function insertUpdatedValue(source, path29, value) {
-  const key = path29.at(-1);
+function insertUpdatedValue(source, path30, value) {
+  const key = path30.at(-1);
   if (key === void 0) throw new Error("TOML update path cannot be empty");
   const assignment = localAssignment(key, value);
   if (assignment !== null) {
-    const parent = path29.slice(0, -1);
+    const parent = path30.slice(0, -1);
     const parentTables = scanStatements(source).filter(
       (statement) => statement.isTable && pathsEqual(statement.path, parent)
     );
@@ -1861,17 +2029,17 @@ function insertUpdatedValue(source, path29, value) {
       return insertAfterStatement(source, parentTable, assignment);
     }
   }
-  return appendToml(source, stringify(valueDocument(path29, value)));
+  return appendToml(source, stringify(valueDocument(path30, value)));
 }
 function updateTomlPaths(source, updated, updates) {
   const paths = normalizedPaths(updates);
   if (paths.length === 0) return source;
   const stripped = removeStatements(source, scanStatements(source), paths);
   let result = stripped;
-  for (const path29 of paths) {
-    const next = updatedValueAtPath(updated, path29);
+  for (const path30 of paths) {
+    const next = updatedValueAtPath(updated, path30);
     if (!next.exists) continue;
-    result = insertUpdatedValue(result, path29, next.value);
+    result = insertUpdatedValue(result, path30, next.value);
   }
   let reparsed;
   try {
@@ -1890,7 +2058,7 @@ function updateTomlPaths(source, updated, updates) {
 }
 
 // ../../packages/agent-targets/src/install/hooks/shared.ts
-import path6 from "path";
+import path7 from "path";
 function asRecord3(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
@@ -1950,7 +2118,7 @@ function changedMutation(snapshot, after) {
   return before === after ? null : { path: snapshot.path, before, after };
 }
 function fmlHookCommand(pluginRoot, target2) {
-  const handlerPath = path6.join(pluginRoot, "bin", "hook-handler");
+  const handlerPath = path7.join(pluginRoot, "bin", "hook-handler");
   const encodedPath = Buffer.from(handlerPath, "utf8").toString("base64url");
   return `node -e "${FML_HOOK_LOADER}" ${encodedPath} ${target2}`;
 }
@@ -2063,11 +2231,11 @@ function uniquePaths(paths) {
 function codexPaths(context) {
   const configuredHome = context.env.CODEX_HOME;
   const trimmedHome = typeof configuredHome === "string" ? configuredHome.trim() : "";
-  const dir = path7.resolve(
-    trimmedHome.length > 0 ? trimmedHome : path7.join(context.homeDir, ".codex")
+  const dir = path8.resolve(
+    trimmedHome.length > 0 ? trimmedHome : path8.join(context.homeDir, ".codex")
   );
-  const configPath4 = path7.join(dir, "config.toml");
-  const hooksPath = path7.join(dir, "hooks.json");
+  const configPath4 = path8.join(dir, "config.toml");
+  const hooksPath = path8.join(dir, "hooks.json");
   return {
     configPath: configPath4,
     hooksPath,
@@ -2499,7 +2667,7 @@ function codexConfigUpdatePaths(original, updated) {
       }
     }
   }
-  return paths.map((path29) => ({ path: path29 }));
+  return paths.map((path30) => ({ path: path30 }));
 }
 function updateCodexConfigToml(source, original, updated) {
   return updateTomlPaths(
@@ -2949,7 +3117,7 @@ var CODEX_HOOK_INSTALLER = Object.freeze({
 
 // ../../packages/agent-targets/src/install/hooks/gemini.ts
 import { isDeepStrictEqual as isDeepStrictEqual4 } from "util";
-import path8 from "path";
+import path9 from "path";
 
 // ../../packages/agent-targets/src/mcp/jsonc.ts
 import { isDeepStrictEqual as isDeepStrictEqual3 } from "util";
@@ -3005,7 +3173,7 @@ function longestCommonArraySubsequence(original, updated) {
   }
   return matches;
 }
-function arrayDiff(original, updated, path29) {
+function arrayDiff(original, updated, path30) {
   const updates = [];
   const matches = longestCommonArraySubsequence(original, updated);
   let originalStart = 0;
@@ -3023,19 +3191,19 @@ function arrayDiff(original, updated, path29) {
         ...jsoncUpdatesForObjectDiff(
           original[originalStart + offset],
           updated[updatedStart + offset],
-          [...path29, currentIndex + offset]
+          [...path30, currentIndex + offset]
         )
       );
     }
     for (let offset = pairedCount; offset < originalCount; offset += 1) {
       updates.push({
-        path: [...path29, currentIndex + pairedCount],
+        path: [...path30, currentIndex + pairedCount],
         value: void 0
       });
     }
     for (let offset = pairedCount; offset < updatedCount; offset += 1) {
       updates.push({
-        path: [...path29, currentIndex + offset],
+        path: [...path30, currentIndex + offset],
         value: updated[updatedStart + offset],
         isArrayInsertion: true
       });
@@ -3048,21 +3216,21 @@ function arrayDiff(original, updated, path29) {
   }
   return updates;
 }
-function jsoncUpdatesForObjectDiff(original, updated, path29 = []) {
+function jsoncUpdatesForObjectDiff(original, updated, path30 = []) {
   if (isDeepStrictEqual3(original, updated)) return [];
   if (Array.isArray(original) && Array.isArray(updated)) {
-    return arrayDiff(original, updated, path29);
+    return arrayDiff(original, updated, path30);
   }
   const originalObject = asObject(original);
   const updatedObject = asObject(updated);
-  if (!originalObject || !updatedObject) return [{ path: path29, value: updated }];
+  if (!originalObject || !updatedObject) return [{ path: path30, value: updated }];
   const keys = /* @__PURE__ */ new Set([
     ...Object.keys(originalObject),
     ...Object.keys(updatedObject)
   ]);
   return [...keys].flatMap(
     (key) => jsoncUpdatesForObjectDiff(originalObject[key], updatedObject[key], [
-      ...path29,
+      ...path30,
       key
     ])
   );
@@ -3110,7 +3278,7 @@ var TARGET_ID3 = TARGET3.id;
 var DISPLAY_NAME3 = TARGET3.displayName;
 var MANAGED_HOOK_NAME = "fml-capture";
 function settingsPath(context) {
-  return path8.join(geminiConfigDirectory(context), "settings.json");
+  return path9.join(geminiConfigDirectory(context), "settings.json");
 }
 function readGeminiSettings(snapshot) {
   const failure = snapshotError(snapshot);
@@ -3343,15 +3511,15 @@ var GEMINI_HOOK_INSTALLER = Object.freeze({
 });
 
 // ../../packages/agent-targets/src/install/hooks/grok.ts
-import path9 from "path";
+import path10 from "path";
 var TARGET4 = agentTarget("grok");
 var TARGET_ID4 = TARGET4.id;
 var DISPLAY_NAME4 = TARGET4.displayName;
 var HOOK_TIMEOUT_SECONDS2 = 10;
 function grokHooksPath(context) {
   const configuredHome = context.env.GROK_HOME?.trim();
-  const grokHome = configuredHome ? path9.resolve(configuredHome) : path9.join(context.homeDir, ".grok");
-  return path9.join(grokHome, "hooks", "fml.json");
+  const grokHome = configuredHome ? path10.resolve(configuredHome) : path10.join(context.homeDir, ".grok");
+  return path10.join(grokHome, "hooks", "fml.json");
 }
 function planInstall3(context) {
   const configPath4 = grokHooksPath(context);
@@ -3470,14 +3638,14 @@ var HOOK_REGISTRATION_CAPABILITIES = Object.freeze([
 ]);
 
 // src/commands/hook-config.ts
-var DEFAULT_CODEX_HOOK_OWNERSHIP_STATE_PATH = path10.join(
+var DEFAULT_CODEX_HOOK_OWNERSHIP_STATE_PATH = path11.join(
   FML_DATA_DIR,
   "codex-hook-install.json"
 );
 function readHookFile(filePath) {
   let stat;
   try {
-    stat = fs5.lstatSync(filePath);
+    stat = fs6.lstatSync(filePath);
   } catch (error) {
     if (error.code === "ENOENT") {
       return { path: filePath, kind: "missing" };
@@ -3506,7 +3674,7 @@ function readHookFile(filePath) {
     return {
       path: filePath,
       kind: "file",
-      contents: fs5.readFileSync(filePath, "utf8")
+      contents: fs6.readFileSync(filePath, "utf8")
     };
   } catch (error) {
     return {
@@ -3518,17 +3686,17 @@ function readHookFile(filePath) {
 }
 function canonicalizePath(filePath) {
   try {
-    return fs5.realpathSync(filePath);
+    return fs6.realpathSync(filePath);
   } catch {
     const missingSegments = [];
     let ancestor = filePath;
     while (true) {
-      const parent = path10.dirname(ancestor);
+      const parent = path11.dirname(ancestor);
       if (parent === ancestor) return filePath;
-      missingSegments.unshift(path10.basename(ancestor));
+      missingSegments.unshift(path11.basename(ancestor));
       ancestor = parent;
       try {
-        return path10.join(fs5.realpathSync(ancestor), ...missingSegments);
+        return path11.join(fs6.realpathSync(ancestor), ...missingSegments);
       } catch {
       }
     }
@@ -3547,7 +3715,7 @@ function assertMutationPrecondition(mutation) {
 }
 function applyMutation(mutation) {
   if (mutation.after === null) {
-    fs5.rmSync(mutation.path);
+    fs6.rmSync(mutation.path);
   } else {
     writeTextFileAtomic(mutation.path, mutation.after);
   }
@@ -3560,7 +3728,7 @@ function rollbackMutation(mutation) {
   };
   assertMutationPrecondition(inverse);
   if (inverse.after === null) {
-    fs5.rmSync(inverse.path);
+    fs6.rmSync(inverse.path);
   } else {
     writeTextFileAtomic(inverse.path, inverse.after);
   }
@@ -3628,7 +3796,7 @@ function applyPlan(plan, warn, onFailure) {
   };
 }
 function plannerContext(packageRoot, options) {
-  const ownershipStatePath = options.ownershipStatePath ?? (options.homeDir ? path10.join(options.homeDir, ".fml", "codex-hook-install.json") : DEFAULT_CODEX_HOOK_OWNERSHIP_STATE_PATH);
+  const ownershipStatePath = options.ownershipStatePath ?? (options.homeDir ? path11.join(options.homeDir, ".fml", "codex-hook-install.json") : DEFAULT_CODEX_HOOK_OWNERSHIP_STATE_PATH);
   return {
     packageRoot,
     homeDir: options.homeDir ?? os2.homedir(),
@@ -3659,10 +3827,10 @@ function removeFmlHooks(options = {}) {
 }
 
 // src/commands/marketplace-link.ts
-import fs6 from "fs";
+import fs7 from "fs";
 function existingPathKind(linkPath) {
   try {
-    return fs6.lstatSync(linkPath).isSymbolicLink() ? "symlink" : "other";
+    return fs7.lstatSync(linkPath).isSymbolicLink() ? "symlink" : "other";
   } catch (error) {
     if (error.code === "ENOENT") return "missing";
     throw error;
@@ -3671,15 +3839,15 @@ function existingPathKind(linkPath) {
 function replaceMarketplaceLink(linkPath, targetPath, type) {
   const existing = existingPathKind(linkPath);
   if (existing === "other") return "preserved";
-  if (existing === "symlink") fs6.unlinkSync(linkPath);
-  fs6.symlinkSync(targetPath, linkPath, type);
+  if (existing === "symlink") fs7.unlinkSync(linkPath);
+  fs7.symlinkSync(targetPath, linkPath, type);
   return existing === "symlink" ? "replaced" : "created";
 }
 function removeMarketplaceLink(linkPath) {
   const existing = existingPathKind(linkPath);
   if (existing === "missing") return "missing";
   if (existing === "other") return "preserved";
-  fs6.unlinkSync(linkPath);
+  fs7.unlinkSync(linkPath);
   return "removed";
 }
 
@@ -3774,10 +3942,10 @@ function configRecord(value) {
 }
 
 // ../../packages/agent-targets/src/mcp/targets/claude-desktop.ts
-import path12 from "path";
+import path13 from "path";
 
 // ../../packages/agent-targets/src/mcp/capability.ts
-import path11 from "path";
+import path12 from "path";
 import { parse as parse4 } from "smol-toml";
 
 // ../../packages/agent-targets/src/mcp/toml.ts
@@ -3883,7 +4051,7 @@ function changedConfigPlan(target2, current, before, data) {
 function generatedServer(target2, context) {
   return fmlMcpServerConfig(
     target2.command,
-    path11.join(context.packageRoot, "bin", "mcp-server")
+    path12.join(context.packageRoot, "bin", "mcp-server")
   );
 }
 function planInstall4(target2, context) {
@@ -3963,7 +4131,7 @@ var CLAUDE_DESKTOP_DIRECT_MCP = createDirectMcpCapability({
   configKey: "mcpServers",
   configPath: ({ env, homeDir, platform }) => {
     if (platform === "darwin") {
-      return path12.join(
+      return path13.join(
         homeDir,
         "Library",
         "Application Support",
@@ -3972,14 +4140,14 @@ var CLAUDE_DESKTOP_DIRECT_MCP = createDirectMcpCapability({
       );
     }
     if (platform === "win32") {
-      return path12.join(
-        env.APPDATA ?? path12.join(homeDir, "AppData", "Roaming"),
+      return path13.join(
+        env.APPDATA ?? path13.join(homeDir, "AppData", "Roaming"),
         "Claude",
         "claude_desktop_config.json"
       );
     }
-    return path12.join(
-      env.XDG_CONFIG_HOME ?? path12.join(homeDir, ".config"),
+    return path13.join(
+      env.XDG_CONFIG_HOME ?? path13.join(homeDir, ".config"),
       "Claude",
       "claude_desktop_config.json"
     );
@@ -3988,7 +4156,7 @@ var CLAUDE_DESKTOP_DIRECT_MCP = createDirectMcpCapability({
 });
 
 // ../../packages/agent-targets/src/mcp/targets/codex.ts
-import path13 from "path";
+import path14 from "path";
 var TARGET6 = agentTarget("codex");
 var CODEX_DIRECT_MCP = createDirectMcpCapability({
   targetId: TARGET6.id,
@@ -3997,26 +4165,26 @@ var CODEX_DIRECT_MCP = createDirectMcpCapability({
   configKey: "mcp_servers",
   configPath: ({ env, homeDir }) => {
     const configuredHome = env.CODEX_HOME;
-    const codexHome = typeof configuredHome === "string" && configuredHome.length > 0 ? path13.resolve(configuredHome) : path13.join(homeDir, ".codex");
-    return path13.join(codexHome, "config.toml");
+    const codexHome = typeof configuredHome === "string" && configuredHome.length > 0 ? path14.resolve(configuredHome) : path14.join(homeDir, ".codex");
+    return path14.join(codexHome, "config.toml");
   },
   command: () => "node"
 });
 
 // ../../packages/agent-targets/src/mcp/targets/gemini.ts
-import path14 from "path";
+import path15 from "path";
 var TARGET7 = agentTarget("gemini");
 var GEMINI_DIRECT_MCP = createDirectMcpCapability({
   targetId: TARGET7.id,
   displayName: TARGET7.displayName,
   configFormat: "json",
   configKey: "mcpServers",
-  configPath: (context) => path14.join(geminiConfigDirectory(context), "settings.json"),
+  configPath: (context) => path15.join(geminiConfigDirectory(context), "settings.json"),
   command: () => "node"
 });
 
 // ../../packages/agent-targets/src/mcp/targets/grok.ts
-import path15 from "path";
+import path16 from "path";
 var TARGET8 = agentTarget("grok");
 var GROK_DIRECT_MCP = createDirectMcpCapability({
   targetId: TARGET8.id,
@@ -4025,8 +4193,8 @@ var GROK_DIRECT_MCP = createDirectMcpCapability({
   configKey: "mcp_servers",
   configPath: ({ env, homeDir }) => {
     const configuredHome = env.GROK_HOME;
-    const grokHome = typeof configuredHome === "string" && configuredHome.length > 0 ? path15.resolve(configuredHome) : path15.join(homeDir, ".grok");
-    return path15.join(grokHome, "config.toml");
+    const grokHome = typeof configuredHome === "string" && configuredHome.length > 0 ? path16.resolve(configuredHome) : path16.join(homeDir, ".grok");
+    return path16.join(grokHome, "config.toml");
   },
   command: () => "node"
 });
@@ -4040,7 +4208,7 @@ var DIRECT_MCP_CAPABILITIES = Object.freeze([
 ]);
 
 // src/commands/mcp-config.ts
-import fs7 from "fs";
+import fs8 from "fs";
 import os3 from "os";
 function resolutionContext(options) {
   return {
@@ -4053,7 +4221,7 @@ function resolutionContext(options) {
 function readMcpFile(filePath) {
   let stat;
   try {
-    stat = fs7.lstatSync(filePath);
+    stat = fs8.lstatSync(filePath);
   } catch (error) {
     if (error.code === "ENOENT") {
       return { path: filePath, kind: "missing" };
@@ -4082,7 +4250,7 @@ function readMcpFile(filePath) {
     return {
       path: filePath,
       kind: "file",
-      contents: fs7.readFileSync(filePath, "utf8")
+      contents: fs8.readFileSync(filePath, "utf8")
     };
   } catch (error) {
     return {
@@ -4118,21 +4286,21 @@ function preflightMutation(mutation) {
 }
 function writeMutation(mutation) {
   if (mutation.after === null) {
-    fs7.rmSync(mutation.path, { force: true });
+    fs8.rmSync(mutation.path, { force: true });
     return;
   }
   writeTextFileAtomic(mutation.path, mutation.after);
 }
 function rollbackMutation2(mutation) {
   if (mutation.before === null) {
-    fs7.rmSync(mutation.path, { force: true });
+    fs8.rmSync(mutation.path, { force: true });
     return;
   }
   writeTextFileAtomic(mutation.path, mutation.before);
 }
 function warnSkippedPlan(plan, error, warn) {
   warn(
-    `warn: skipped ${plan.displayName} MCP config at ${plan.configPath}: ${error}`
+    `Warning: skipped ${plan.displayName} MCP config at ${plan.configPath}: ${error}`
   );
 }
 function applyPlan2(plan, warn) {
@@ -4176,14 +4344,17 @@ function reportPlan(plan, warn, log) {
   for (const note of plan.notes) log(note);
 }
 function configureFmlDirectMcp(pluginRoot, options = {}) {
-  const warn = options.warn ?? console.warn;
+  const emitWarning = (message) => {
+    (options.warn ?? console.warn)(message);
+    options.onFailure?.(message);
+  };
   const log = options.log ?? console.log;
   const context = plannerContext2(pluginRoot, options);
   const changes = [];
   for (const capability of DIRECT_MCP_CAPABILITIES) {
     const plan = capability.planInstall(context);
-    reportPlan(plan, warn, log);
-    if (!applyPlan2(plan, warn)) continue;
+    reportPlan(plan, emitWarning, log);
+    if (!applyPlan2(plan, emitWarning)) continue;
     changes.push({
       targetId: plan.targetId,
       displayName: plan.displayName,
@@ -4212,13 +4383,13 @@ function removeFmlDirectMcp(target2 = "all", options = {}) {
 }
 
 // src/commands/agent-skills.ts
-import { createHash as createHash2, randomUUID as randomUUID2 } from "crypto";
-import fs8 from "fs";
+import { createHash as createHash2, randomUUID as randomUUID3 } from "crypto";
+import fs9 from "fs";
 import os4 from "os";
-import path20 from "path";
+import path21 from "path";
 
 // ../../packages/agent-targets/src/install/surfaces/capability.ts
-import path16 from "path";
+import path17 from "path";
 var SOURCE_PATH_SEGMENTS = ["agent-assets", "fml", "SKILL.md"];
 var DESTINATION_PATH_SEGMENTS = ["skills", "fml", "SKILL.md"];
 function createAgentSkillCapability(definition) {
@@ -4231,8 +4402,8 @@ function createAgentSkillCapability(definition) {
     resolve: (context) => Object.freeze({
       targetId: definition.targetId,
       displayName: definition.displayName,
-      sourcePath: path16.join(context.packageRoot, ...SOURCE_PATH_SEGMENTS),
-      destinationPath: path16.join(
+      sourcePath: path17.join(context.packageRoot, ...SOURCE_PATH_SEGMENTS),
+      destinationPath: path17.join(
         definition.destinationRoot(context),
         ...DESTINATION_PATH_SEGMENTS
       ),
@@ -4255,7 +4426,7 @@ var CLAUDE_AGENT_SKILL = createAgentSkillCapability({
 });
 
 // ../../packages/agent-targets/src/install/surfaces/targets/codex.ts
-import path17 from "path";
+import path18 from "path";
 var TARGET10 = agentTarget("codex");
 var CODEX_AGENT_SKILL = createAgentSkillCapability({
   targetId: TARGET10.id,
@@ -4263,11 +4434,11 @@ var CODEX_AGENT_SKILL = createAgentSkillCapability({
   invocation: "$fml",
   deliveryMode: "instruction-read",
   argumentMode: "user-input",
-  destinationRoot: ({ homeDir }) => path17.join(homeDir, ".agents")
+  destinationRoot: ({ homeDir }) => path18.join(homeDir, ".agents")
 });
 
 // ../../packages/agent-targets/src/install/surfaces/targets/gemini.ts
-import path18 from "path";
+import path19 from "path";
 var TARGET11 = agentTarget("gemini");
 var GEMINI_AGENT_SKILL = createAgentSkillCapability({
   targetId: TARGET11.id,
@@ -4277,13 +4448,13 @@ var GEMINI_AGENT_SKILL = createAgentSkillCapability({
   argumentMode: "post-submit-prompt",
   destinationRoot: ({ env, homeDir }) => {
     const configuredHome = env.GEMINI_CLI_HOME?.trim();
-    const homeRoot = configuredHome ? path18.resolve(configuredHome) : homeDir;
-    return path18.join(homeRoot, ".agents");
+    const homeRoot = configuredHome ? path19.resolve(configuredHome) : homeDir;
+    return path19.join(homeRoot, ".agents");
   }
 });
 
 // ../../packages/agent-targets/src/install/surfaces/targets/grok.ts
-import path19 from "path";
+import path20 from "path";
 var TARGET12 = agentTarget("grok");
 var GROK_AGENT_SKILL = createAgentSkillCapability({
   targetId: TARGET12.id,
@@ -4291,7 +4462,7 @@ var GROK_AGENT_SKILL = createAgentSkillCapability({
   invocation: "/fml",
   deliveryMode: "prompt-expansion",
   argumentMode: "template-or-append",
-  destinationRoot: ({ homeDir }) => path19.join(homeDir, ".agents")
+  destinationRoot: ({ homeDir }) => path20.join(homeDir, ".agents")
 });
 
 // ../../packages/agent-targets/src/install/surfaces/registry.ts
@@ -4305,7 +4476,7 @@ var AGENT_SKILL_CAPABILITIES = Object.freeze([
 // src/commands/agent-skills.ts
 var FML_AGENT_SKILL_MARKER = "<!-- fml-managed-agent-surface:v1 -->";
 var AGENT_SKILL_STATE_SCHEMA_VERSION = 1;
-var DEFAULT_STATE_PATH = path20.join(FML_DATA_DIR, "agent-skills.json");
+var DEFAULT_STATE_PATH = path21.join(FML_DATA_DIR, "agent-skills.json");
 function emptyState() {
   return Object.freeze({
     schemaVersion: AGENT_SKILL_STATE_SCHEMA_VERSION,
@@ -4318,7 +4489,7 @@ function sha256(contents) {
 function readSkillFile(filePath) {
   let stat;
   try {
-    stat = fs8.lstatSync(filePath);
+    stat = fs9.lstatSync(filePath);
   } catch (error) {
     if (error.code === "ENOENT") {
       return { kind: "missing" };
@@ -4341,7 +4512,7 @@ function readSkillFile(filePath) {
     };
   }
   try {
-    const contents = fs8.readFileSync(filePath, "utf8");
+    const contents = fs9.readFileSync(filePath, "utf8");
     return { kind: "file", contents, sha256: sha256(contents) };
   } catch (error) {
     return {
@@ -4410,7 +4581,7 @@ function parseState(source, statePath) {
     }
     entries.push(
       Object.freeze({
-        path: path20.resolve(entry.path),
+        path: path21.resolve(entry.path),
         sha256: entry.sha256,
         targetIds: Object.freeze([...entry.targetIds])
       })
@@ -4436,7 +4607,7 @@ function loadState(statePath) {
 }
 function serializeState(entries) {
   const sorted = [...entries].map((entry) => ({
-    path: path20.resolve(entry.path),
+    path: path21.resolve(entry.path),
     sha256: entry.sha256,
     targetIds: [...entry.targetIds].sort()
   })).sort((left, right) => left.path.localeCompare(right.path));
@@ -4475,7 +4646,7 @@ function resolvedGroups(pluginRoot, options) {
   const groups = /* @__PURE__ */ new Map();
   for (const capability of AGENT_SKILL_CAPABILITIES) {
     const resolved = capability.resolve(context);
-    const destinationPath = path20.resolve(resolved.destinationPath);
+    const destinationPath = path21.resolve(resolved.destinationPath);
     const key = process.platform === "win32" ? destinationPath.toLowerCase() : destinationPath;
     const current = groups.get(key) ?? [];
     current.push({ ...resolved, destinationPath });
@@ -4512,10 +4683,10 @@ function resultFor(group, status, reason) {
   });
 }
 function destinationDirectoryIssue(destinationPath, requireEmpty) {
-  const skillDir = path20.dirname(destinationPath);
+  const skillDir = path21.dirname(destinationPath);
   let stat;
   try {
-    stat = fs8.lstatSync(skillDir);
+    stat = fs9.lstatSync(skillDir);
   } catch (error) {
     if (error.code === "ENOENT") return null;
     return error instanceof Error ? error.message : String(error);
@@ -4523,7 +4694,7 @@ function destinationDirectoryIssue(destinationPath, requireEmpty) {
   if (stat.isSymbolicLink()) return "skill directory is a symbolic link";
   if (!stat.isDirectory()) return "skill directory is not a directory";
   try {
-    if (!requireEmpty || fs8.readdirSync(skillDir).length === 0) return null;
+    if (!requireEmpty || fs9.readdirSync(skillDir).length === 0) return null;
     return "skill directory contains unmanaged files";
   } catch (error) {
     return error instanceof Error ? error.message : String(error);
@@ -4540,9 +4711,9 @@ function rollbackSkillWrite(destinationPath, before) {
     writeTextFileAtomic(destinationPath, before.contents);
     return;
   }
-  fs8.rmSync(destinationPath, { force: true });
+  fs9.rmSync(destinationPath, { force: true });
   try {
-    fs8.rmdirSync(path20.dirname(destinationPath));
+    fs9.rmdirSync(path21.dirname(destinationPath));
   } catch {
   }
 }
@@ -4585,12 +4756,12 @@ function installManagedAgentSkills(pluginRoot, options = {}) {
   const loaded = loadState(statePath);
   let stateSource = loaded.source;
   const entries = new Map(
-    loaded.state.entries.map((entry) => [path20.resolve(entry.path), entry])
+    loaded.state.entries.map((entry) => [path21.resolve(entry.path), entry])
   );
   const results = [];
   for (const group of resolvedGroups(pluginRoot, options)) {
     const source = sourceSkill(group.sourcePath);
-    const destinationPath = path20.resolve(group.destinationPath);
+    const destinationPath = path21.resolve(group.destinationPath);
     const current = readSkillFile(destinationPath);
     const previous = entries.get(destinationPath);
     const nextEntry = stateEntryFor(
@@ -4675,11 +4846,11 @@ function removeSkillFile(args) {
       `Agent skill changed before ${args.destinationPath} could be removed.`
     );
   }
-  const backupPath = path20.join(
-    path20.dirname(args.destinationPath),
-    `.${path20.basename(args.destinationPath)}.${process.pid}.${randomUUID2()}.bak`
+  const backupPath = path21.join(
+    path21.dirname(args.destinationPath),
+    `.${path21.basename(args.destinationPath)}.${process.pid}.${randomUUID3()}.bak`
   );
-  fs8.renameSync(args.destinationPath, backupPath);
+  fs9.renameSync(args.destinationPath, backupPath);
   let stateSource;
   try {
     stateSource = writeState(
@@ -4689,7 +4860,7 @@ function removeSkillFile(args) {
     );
   } catch (error) {
     try {
-      fs8.renameSync(backupPath, args.destinationPath);
+      fs9.renameSync(backupPath, args.destinationPath);
     } catch (rollbackError) {
       const message = error instanceof Error ? error.message : String(error);
       const rollbackMessage = rollbackError instanceof Error ? rollbackError.message : String(rollbackError);
@@ -4701,12 +4872,12 @@ function removeSkillFile(args) {
   }
   let warning;
   try {
-    fs8.rmSync(backupPath, { force: true });
+    fs9.rmSync(backupPath, { force: true });
   } catch (error) {
     warning = `agent skill removal was committed, but backup cleanup failed at ${backupPath}: ${error instanceof Error ? error.message : String(error)}`;
   }
   try {
-    fs8.rmdirSync(path20.dirname(args.destinationPath));
+    fs9.rmdirSync(path21.dirname(args.destinationPath));
   } catch {
   }
   return { stateSource, ...warning ? { warning } : {} };
@@ -4716,16 +4887,16 @@ function removeManagedAgentSkills(pluginRoot, options = {}) {
   const loaded = loadState(statePath);
   let stateSource = loaded.source;
   const entries = new Map(
-    loaded.state.entries.map((entry) => [path20.resolve(entry.path), entry])
+    loaded.state.entries.map((entry) => [path21.resolve(entry.path), entry])
   );
   const candidates = /* @__PURE__ */ new Map();
   const currentGroups = resolvedGroups(pluginRoot, options);
-  const packagedSourcePath = currentGroups[0]?.sourcePath ?? path20.join(pluginRoot, "agent-assets", "fml", "SKILL.md");
+  const packagedSourcePath = currentGroups[0]?.sourcePath ?? path21.join(pluginRoot, "agent-assets", "fml", "SKILL.md");
   for (const group of currentGroups) {
-    candidates.set(path20.resolve(group.destinationPath), group);
+    candidates.set(path21.resolve(group.destinationPath), group);
   }
   for (const entry of entries.values()) {
-    const destinationPath = path20.resolve(entry.path);
+    const destinationPath = path21.resolve(entry.path);
     if (candidates.has(destinationPath)) continue;
     const targets = entry.targetIds.filter(isAgentSkillTargetId).map(targetForId);
     if (targets.length === 0) continue;
@@ -4740,7 +4911,7 @@ function removeManagedAgentSkills(pluginRoot, options = {}) {
   for (const group of [...candidates.values()].sort(
     (left, right) => left.destinationPath.localeCompare(right.destinationPath)
   )) {
-    const destinationPath = path20.resolve(group.destinationPath);
+    const destinationPath = path21.resolve(group.destinationPath);
     const current = readSkillFile(destinationPath);
     const previous = entries.get(destinationPath);
     if (current.kind === "missing") {
@@ -4798,13 +4969,13 @@ function removeManagedAgentSkills(pluginRoot, options = {}) {
 }
 
 // src/commands/install.ts
-function resolvePluginRoot(startDir = path21.dirname(fileURLToPath(import.meta.url))) {
+function resolvePluginRoot(startDir = path22.dirname(fileURLToPath(import.meta.url))) {
   let directory = startDir;
   while (true) {
-    if (fs9.existsSync(path21.join(directory, "package.json")) && fs9.existsSync(path21.join(directory, "bin"))) {
+    if (fs10.existsSync(path22.join(directory, "package.json")) && fs10.existsSync(path22.join(directory, "bin"))) {
       return directory;
     }
-    const parent = path21.dirname(directory);
+    const parent = path22.dirname(directory);
     if (parent === directory) {
       throw new Error(
         `Could not locate the FML package root: no ancestor of ${startDir} contains both package.json and bin/. Reinstall @fml-inc/fml and retry.`
@@ -4819,7 +4990,7 @@ function getPluginRoot() {
 function readJsonFileForUpdate(filePath) {
   let source;
   try {
-    source = fs9.readFileSync(filePath, "utf8");
+    source = fs10.readFileSync(filePath, "utf8");
   } catch (error) {
     if (error.code === "ENOENT") {
       return { ok: true, exists: false, data: {} };
@@ -4867,14 +5038,13 @@ async function handleInstall(opts = {}) {
     homeDir: os5.homedir(),
     packageRoot: pluginRoot
   });
-  console.log("Installing fml...\n");
-  console.log("[1/5] Creating FML directories...");
+  console.log("Configuring FML integrations...");
   for (const root of configuredManagedRoots()) {
     const preparation = prepareManagedDirectory(root);
     if (!preparation.managed) {
       const recovery = process.platform === "win32" ? "use a dedicated FML directory in a native location; custom Windows roots require manual cleanup" : "use a dedicated FML directory or follow the inspected custom-root adoption steps in https://github.com/fml-inc/fml/blob/main/docs/plugin-cleanup.md#adopt-an-existing-custom-root";
       console.warn(
-        `      warn: ${root.directory} could not be safely marked as FML-owned because it is non-empty, symlinked, or not owned by the current user; ${recovery} before using \`fml uninstall --purge\``
+        `Warning: ${root.directory} could not be safely marked as FML-owned because it is non-empty, symlinked, or not owned by the current user; ${recovery} before using \`fml uninstall --purge\`.`
       );
     }
   }
@@ -4884,12 +5054,9 @@ async function handleInstall(opts = {}) {
     FML_LOG_DIR,
     FML_OBSERVER_DIR
   ])) {
-    fs9.mkdirSync(directory, { recursive: true, mode: 448 });
-    console.log(`      ${directory}`);
+    fs10.mkdirSync(directory, { recursive: true, mode: 448 });
   }
-  initializeSyncSettings(path21.join(FML_OBSERVER_DIR, "sync.json"));
-  console.log();
-  console.log("[2/5] Installing agent-native /fml skills...");
+  initializeSyncSettings(path22.join(FML_OBSERVER_DIR, "sync.json"));
   let skillReady = false;
   try {
     const skillResults = installManagedAgentSkills(pluginRoot);
@@ -4897,52 +5064,71 @@ async function handleInstall(opts = {}) {
     for (const result of skillResults) {
       const targets = result.displayNames.join(", ");
       if (result.status === "preserved") {
-        console.log(
-          `      warn: preserved ${result.destinationPath} for ${targets}: ${result.reason}`
-        );
-      } else {
-        console.log(
-          `      ${targets}: ${result.destinationPath} (${result.status})`
+        console.warn(
+          `Warning: preserved ${result.destinationPath} for ${targets}: ${result.reason}`
         );
       }
     }
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.warn(
+      `Warning: agent-native skill setup could not be completed: ${message}`
+    );
+  }
+  let piExtensionReady = false;
+  try {
+    const piPaths = PI_EXTENSION_INSTALLER.resolvePaths({
+      env: process.env,
+      homeDir: os5.homedir(),
+      packageRoot: pluginRoot,
+      platform: process.platform
+    });
+    const piResult = PI_EXTENSION_INSTALLER.install(piPaths);
+    piExtensionReady = piResult.status !== "preserved";
+    if (piResult.status === "preserved") {
+      console.log(
+        `      warn: preserved ${piResult.destinationPath} for Pi: ${piResult.reason}`
+      );
+    }
+    if (piResult.legacyRemoved) {
+      console.log("      Removed the legacy Panopticon Pi extension");
+    } else if (piResult.legacyPreserved) {
+      console.log(
+        `      warn: preserved unrecognized Pi extension ${piPaths.legacyDestinationPath}; inspect and remove it if it belongs to Panopticon`
+      );
+    }
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     console.log(
-      `      warn: agent-native skill setup could not be completed: ${message}`
+      `      warn: Pi extension setup could not be completed: ${message}`
     );
   }
-  console.log();
-  console.log("[3/5] Writing plugin manifest...");
-  const packageJson = readJsonFile(path21.join(pluginRoot, "package.json"));
+  const packageJson = readJsonFile(path22.join(pluginRoot, "package.json"));
   const generatedManifest = readJsonFile(paths.pluginManifestPath);
   const version = typeof generatedManifest?.version === "string" ? generatedManifest.version : typeof packageJson?.version === "string" ? packageJson.version : "0.0.0-dev";
   writeJsonFile(
     paths.pluginManifestPath,
     CLAUDE_PLUGIN_INSTALLER.pluginManifest(version)
   );
-  console.log(`      Version: ${version}
-`);
-  console.log("[4/5] Registering the FML plugin...");
   const claudeBin = resolveBin("claude");
   const marketplaceResult = readJsonFileForUpdate(
     paths.marketplaceManifestPath
   );
   let marketplaceReady = false;
   if (!marketplaceResult.ok) {
-    console.log(
-      `      warn: preserved unreadable marketplace config ${paths.marketplaceManifestPath}: ${marketplaceResult.error}`
+    console.warn(
+      `Warning: preserved unreadable marketplace config ${paths.marketplaceManifestPath}: ${marketplaceResult.error}`
     );
   } else {
-    fs9.mkdirSync(paths.marketplaceDir, { recursive: true, mode: 448 });
+    fs10.mkdirSync(paths.marketplaceDir, { recursive: true, mode: 448 });
     const linkUpdate = replaceMarketplaceLink(
       paths.marketplaceLinkPath,
       pluginRoot,
       marketplaceSymlinkType()
     );
     if (linkUpdate === "preserved") {
-      console.log(
-        `      warn: preserved non-symlink marketplace path ${paths.marketplaceLinkPath}; remove it manually to enable the FML Claude plugin`
+      console.warn(
+        `Warning: preserved non-symlink marketplace path ${paths.marketplaceLinkPath}; remove it manually to enable the FML Claude plugin`
       );
     } else {
       const marketplace = CLAUDE_PLUGIN_INSTALLER.addMarketplaceEntry(
@@ -4955,8 +5141,8 @@ async function handleInstall(opts = {}) {
   const settingsResult = readJsonFileForUpdate(paths.settingsPath);
   let settingsReady = false;
   if (!settingsResult.ok) {
-    console.log(
-      `      warn: preserved unreadable Claude settings ${paths.settingsPath}: ${settingsResult.error}`
+    console.warn(
+      `Warning: preserved unreadable Claude settings ${paths.settingsPath}: ${settingsResult.error}`
     );
   } else if (marketplaceReady) {
     const settings = CLAUDE_PLUGIN_INSTALLER.enableInSettings(
@@ -4966,21 +5152,23 @@ async function handleInstall(opts = {}) {
     writeJsonFile(paths.settingsPath, settings);
     settingsReady = true;
   }
-  for (const target2 of configureFmlDirectMcp(pluginRoot)) {
-    console.log(`      MCP: ${target2.displayName} -> fml`);
-  }
+  let mcpReady = true;
+  let claudePluginReady = true;
+  configureFmlDirectMcp(pluginRoot, {
+    warn: (message) => console.warn(message.replace(/^warn:/u, "Warning:")),
+    onFailure: () => {
+      mcpReady = false;
+    }
+  });
   let hooksReady = true;
-  const hookTargets = configureFmlHooks(pluginRoot, {
+  configureFmlHooks(pluginRoot, {
     onFailure: () => {
       hooksReady = false;
     }
   });
-  for (const target2 of hookTargets) {
-    console.log(`      Hooks: ${target2.displayName} -> fml`);
-  }
   if (!marketplaceReady || !settingsReady) {
-    console.log(
-      "      warn: skipped Claude plugin registration until its existing config is repaired"
+    console.warn(
+      "Warning: skipped Claude plugin registration until its existing config is repaired"
     );
   } else if (claudeBin) {
     try {
@@ -4995,16 +5183,14 @@ async function handleInstall(opts = {}) {
           timeout: command.timeoutMs
         });
       }
-      console.log("      Plugin registered via Claude Code CLI");
     } catch (error) {
+      claudePluginReady = false;
       const message = error instanceof Error ? error.message : String(error);
-      console.log(`      warn: Claude plugin registration failed: ${message}`);
+      console.warn(`Warning: Claude plugin registration failed: ${message}`);
     }
   } else {
-    console.log("      warn: claude CLI not found; plugin files are ready");
+    console.warn("Warning: claude CLI not found; plugin files are ready");
   }
-  console.log();
-  console.log("[5/5] Initializing the FML environment...");
   if (!envConfigExists()) {
     writeEnvConfig({
       schemaVersion: 1,
@@ -5013,13 +5199,10 @@ async function handleInstall(opts = {}) {
         [DEFAULT_TARGET_NAME]: { convexUrl: DEFAULT_PROD_URL }
       }
     });
-    console.log(`      ${DEFAULT_TARGET_NAME}: ${DEFAULT_PROD_URL}`);
-  } else {
-    console.log("      Preserved existing environment selection");
   }
-  if (!skillReady || !marketplaceReady || !settingsReady || !hooksReady) {
+  if (!skillReady || !piExtensionReady || !marketplaceReady || !settingsReady || !hooksReady) {
     throw new Error(
-      "FML install is incomplete: repair the preserved agent skill, hook configuration, Claude plugin path, or configuration reported above, then run `fml install` again."
+      "FML install is incomplete: repair the preserved agent skill, Pi extension, hook configuration, Claude plugin path, or configuration reported above, then run `fml install` again."
     );
   }
   try {
@@ -5030,29 +5213,28 @@ async function handleInstall(opts = {}) {
       `FML install is incomplete: hook capture remains paused because its state could not be cleared: ${message}`
     );
   }
-  console.log("");
-  printBanner();
-  console.log("Done! Start a new coding session to activate.\n");
-  console.log("Next steps:");
-  console.log("  fml login          Sign in to your FML account");
-  console.log("  fml org            Select organization");
-  console.log("  fml start          Start hook capture and raw artifact sync");
-  console.log("  fml doctor         Verify setup");
+  console.log("\u2713  Agent skills configured");
+  if (mcpReady && claudePluginReady) {
+    console.log("\u2713  Coding-agent integrations configured");
+    console.log("FML integrations configured.");
+  } else {
+    console.warn(
+      "Warning: Coding-agent integrations were not fully configured. See warnings above."
+    );
+    console.log("FML integration configuration finished with warnings.");
+  }
 }
 
-// src/commands/uninstall.ts
-import fs12 from "fs";
-import os7 from "os";
-import path27 from "path";
-import readline from "readline/promises";
+// src/commands/sync.ts
+import { statSync } from "fs";
 
 // src/commands/otel-config.ts
-import fs11 from "fs";
+import fs12 from "fs";
 import os6 from "os";
-import path26 from "path";
+import path27 from "path";
 
 // ../../packages/agent-targets/src/install/otel/claude.ts
-import path22 from "path";
+import path23 from "path";
 
 // ../../packages/agent-targets/src/install/otel/shared.ts
 import { isDeepStrictEqual as isDeepStrictEqual7 } from "util";
@@ -5189,9 +5371,9 @@ var MANAGED_MARKER = "FML_OTEL_MANAGED";
 var CLAUDE_OTEL_SOURCE_LIMITATION = "Claude Code may truncate inline raw API bodies and tool content at 60 KiB and redact extended-thinking content before export";
 function configPath(context) {
   if (context.configPathOverride) {
-    return path22.resolve(context.configPathOverride);
+    return path23.resolve(context.configPathOverride);
   }
-  return path22.join(
+  return path23.join(
     claudeConfigDirectory({ env: context.env, homeDir: context.homeDir }),
     "settings.json"
   );
@@ -5362,7 +5544,7 @@ var CLAUDE_OTEL_INSTALLER = Object.freeze({
 
 // ../../packages/agent-targets/src/install/otel/codex.ts
 import { isDeepStrictEqual as isDeepStrictEqual8 } from "util";
-import path23 from "path";
+import path24 from "path";
 import { parse as parse5 } from "smol-toml";
 var TARGET14 = agentTarget("codex");
 var TARGET_ID6 = TARGET14.id;
@@ -5371,13 +5553,13 @@ var AUTHENTICATION2 = "bearer-header";
 var CODEX_OTEL_SOURCE_LIMITATION = "Codex OTel has no documented raw API body or full tool-content export switch; tool-result content is an output snippet";
 function configPath2(context) {
   if (context.configPathOverride) {
-    return path23.resolve(context.configPathOverride);
+    return path24.resolve(context.configPathOverride);
   }
   const configuredHome = context.env.CODEX_HOME;
-  const codexHome = path23.resolve(
-    typeof configuredHome === "string" && configuredHome.trim().length > 0 ? configuredHome : path23.join(context.homeDir, ".codex")
+  const codexHome = path24.resolve(
+    typeof configuredHome === "string" && configuredHome.trim().length > 0 ? configuredHome : path24.join(context.homeDir, ".codex")
   );
-  return path23.join(codexHome, "config.toml");
+  return path24.join(codexHome, "config.toml");
 }
 function readToml(snapshot) {
   const failure = snapshotError2(snapshot);
@@ -5597,7 +5779,7 @@ var CODEX_OTEL_INSTALLER = Object.freeze({
 });
 
 // ../../packages/agent-targets/src/install/otel/gemini.ts
-import path24 from "path";
+import path25 from "path";
 var TARGET15 = agentTarget("gemini");
 var TARGET_ID7 = TARGET15.id;
 var DISPLAY_NAME7 = TARGET15.displayName;
@@ -5605,9 +5787,9 @@ var AUTHENTICATION3 = "path-token";
 var GEMINI_OTEL_SOURCE_LIMITATION = "Gemini CLI has no documented OTLP header setting; FML uses an observer-local tokenized loopback path";
 function configPath3(context) {
   if (context.configPathOverride) {
-    return path24.resolve(context.configPathOverride);
+    return path25.resolve(context.configPathOverride);
   }
-  return path24.join(geminiConfigDirectory(context), "settings.json");
+  return path25.join(geminiConfigDirectory(context), "settings.json");
 }
 function managedTelemetry(context) {
   const destination = resolveDestination(context.observer);
@@ -5761,8 +5943,8 @@ var OTEL_INSTALLER_CAPABILITIES = Object.freeze([
 ]);
 
 // src/commands/otel-config-state.ts
-import fs10 from "fs";
-import path25 from "path";
+import fs11 from "fs";
+import path26 from "path";
 var OTEL_CONFIG_STATE_SCHEMA_VERSION = 1;
 function emptyState2() {
   return Object.freeze({
@@ -5776,12 +5958,12 @@ function invalidState2(statePath, reason) {
   );
 }
 function enforceOwnerOnlyMode(statePath) {
-  if (process.platform !== "win32") fs10.chmodSync(statePath, 384);
+  if (process.platform !== "win32") fs11.chmodSync(statePath, 384);
 }
 function readStateFile(statePath) {
   let stat;
   try {
-    stat = fs10.lstatSync(statePath);
+    stat = fs11.lstatSync(statePath);
   } catch (error) {
     if (error.code === "ENOENT") {
       return { kind: "missing" };
@@ -5799,7 +5981,7 @@ function readStateFile(statePath) {
   }
   try {
     enforceOwnerOnlyMode(statePath);
-    return { kind: "file", contents: fs10.readFileSync(statePath, "utf8") };
+    return { kind: "file", contents: fs11.readFileSync(statePath, "utf8") };
   } catch (error) {
     return {
       kind: "invalid",
@@ -5808,7 +5990,7 @@ function readStateFile(statePath) {
   }
 }
 function otelConfigStateEntryKey(targetId, configPath4) {
-  const resolved = path25.resolve(configPath4);
+  const resolved = path26.resolve(configPath4);
   const pathKey = process.platform === "win32" ? resolved.toLowerCase() : resolved;
   return `${targetId}\0${pathKey}`;
 }
@@ -5844,7 +6026,7 @@ function parseState2(source, statePath) {
     if (typeof observerRecord.baseUrl !== "string" || observerRecord.baseUrl.length === 0 || typeof observerRecord.authToken !== "string" || observerRecord.authToken.length === 0) {
       throw invalidState2(statePath, "contains an invalid observer destination");
     }
-    const resolvedPath = path25.resolve(entry.path);
+    const resolvedPath = path26.resolve(entry.path);
     const key = otelConfigStateEntryKey(entry.targetId, resolvedPath);
     if (keys.has(key)) {
       throw invalidState2(statePath, "contains duplicate entries");
@@ -5882,7 +6064,7 @@ function loadFmlOtelConfigState(statePath) {
 function serializeState2(entries) {
   const sorted = [...entries].map((entry) => ({
     targetId: entry.targetId,
-    path: path25.resolve(entry.path),
+    path: path26.resolve(entry.path),
     observer: {
       baseUrl: entry.observer.baseUrl,
       authToken: entry.observer.authToken
@@ -5919,7 +6101,7 @@ function isKnownOtelTargetId(targetId) {
 }
 
 // src/commands/otel-config.ts
-var DEFAULT_OTEL_CONFIG_STATE_PATH = path26.join(
+var DEFAULT_OTEL_CONFIG_STATE_PATH = path27.join(
   FML_DATA_DIR,
   "otel-config.json"
 );
@@ -5928,7 +6110,7 @@ function readLocalObserverOtelDestination(options) {
   if (!authToken) return null;
   try {
     const parsed = JSON.parse(
-      fs11.readFileSync(options.endpointFile, "utf8")
+      fs12.readFileSync(options.endpointFile, "utf8")
     );
     const endpoint = parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
     const host = endpoint?.host;
@@ -5945,7 +6127,7 @@ function readLocalObserverOtelDestination(options) {
 function readOtelFile(filePath) {
   let stat;
   try {
-    stat = fs11.lstatSync(filePath);
+    stat = fs12.lstatSync(filePath);
   } catch (error) {
     if (error.code === "ENOENT") {
       return { path: filePath, kind: "missing" };
@@ -5974,7 +6156,7 @@ function readOtelFile(filePath) {
     return {
       path: filePath,
       kind: "file",
-      contents: fs11.readFileSync(filePath, "utf8")
+      contents: fs12.readFileSync(filePath, "utf8")
     };
   } catch (error) {
     return {
@@ -5996,7 +6178,7 @@ function assertMutationPrecondition2(mutation) {
   throw new Error(`configuration changed while planning ${mutation.path}`);
 }
 function applyMutation2(mutation) {
-  if (mutation.after === null) fs11.rmSync(mutation.path);
+  if (mutation.after === null) fs12.rmSync(mutation.path);
   else writeTextFileAtomic(mutation.path, mutation.after);
 }
 function enforceOwnerOnlyConfigPermissions(filePath) {
@@ -6009,7 +6191,7 @@ function enforceOwnerOnlyConfigPermissions(filePath) {
     );
   }
   try {
-    fs11.chmodSync(filePath, 384);
+    fs12.chmodSync(filePath, 384);
   } catch (error) {
     const detail = error instanceof Error ? error.message : String(error);
     throw new Error(
@@ -6040,7 +6222,7 @@ function applyPlan3(plan, warn, commitOwnership) {
       } catch (error) {
         const detail = error instanceof Error ? error.message : String(error);
         warn(
-          `warn: skipped ${plan.displayName} OpenTelemetry at ${plan.configPath}: ${detail}`
+          `Warning: skipped ${plan.displayName} OpenTelemetry at ${plan.configPath}: ${detail}`
         );
         return null;
       }
@@ -6049,7 +6231,7 @@ function applyPlan3(plan, warn, commitOwnership) {
       } catch (error) {
         const detail = error instanceof Error ? error.message : String(error);
         warn(
-          `warn: could not record ${plan.displayName} OpenTelemetry ownership at ${plan.configPath}: ${detail}`
+          `Warning: could not record ${plan.displayName} OpenTelemetry ownership at ${plan.configPath}: ${detail}`
         );
       }
     }
@@ -6058,7 +6240,7 @@ function applyPlan3(plan, warn, commitOwnership) {
   const uniquePaths2 = new Set(plan.mutations.map((mutation) => mutation.path));
   if (uniquePaths2.size !== plan.mutations.length) {
     warn(
-      `warn: skipped ${plan.displayName} OpenTelemetry at ${plan.configPath}: plan contains duplicate paths`
+      `Warning: skipped ${plan.displayName} OpenTelemetry at ${plan.configPath}: plan contains duplicate paths`
     );
     return null;
   }
@@ -6089,7 +6271,7 @@ function applyPlan3(plan, warn, commitOwnership) {
     const detail = error instanceof Error ? error.message : String(error);
     const rollbackDetail = rollbackErrors.length === 0 ? "" : `; rollback failed: ${rollbackErrors.join("; ")}`;
     warn(
-      `warn: skipped ${plan.displayName} OpenTelemetry at ${plan.configPath}: ${detail}${rollbackDetail}`
+      `Warning: skipped ${plan.displayName} OpenTelemetry at ${plan.configPath}: ${detail}${rollbackDetail}`
     );
     return null;
   }
@@ -6104,7 +6286,7 @@ function plannerContext3(observer, options, configPathOverride, configOwnershipR
     observer,
     homeDir: options.homeDir ?? os6.homedir(),
     env: options.env ?? process.env,
-    ...configPathOverride ? { configPathOverride: path26.resolve(configPathOverride) } : {},
+    ...configPathOverride ? { configPathOverride: path27.resolve(configPathOverride) } : {},
     ...configOwnershipRecorded ? { configOwnershipRecorded: true } : {},
     readFile: readOtelFile
   };
@@ -6124,7 +6306,7 @@ function loadOtelConfigState(options, warn) {
       )
     };
   } catch (error) {
-    warn(`warn: ${error instanceof Error ? error.message : String(error)}`);
+    warn(`Warning: ${error instanceof Error ? error.message : String(error)}`);
     return null;
   }
 }
@@ -6147,7 +6329,7 @@ function commitStateEntry(state, key, next) {
 function stateEntry(plan, observer) {
   return Object.freeze({
     targetId: plan.targetId,
-    path: path26.resolve(plan.configPath),
+    path: path27.resolve(plan.configPath),
     observer: Object.freeze({
       baseUrl: observer.baseUrl,
       authToken: observer.authToken
@@ -6171,7 +6353,7 @@ function planSafely(capability, operation, context, warn) {
     return operation === "install" ? capability.planInstall(context) : capability.planUninstall(context);
   } catch (error) {
     warn(
-      `warn: skipped ${capability.displayName} OpenTelemetry: ${error instanceof Error ? error.message : String(error)}`
+      `Warning: skipped ${capability.displayName} OpenTelemetry: ${error instanceof Error ? error.message : String(error)}`
     );
     return null;
   }
@@ -6181,7 +6363,7 @@ function pruneMissingRecordedEntry(state, key, entry, warn) {
     commitStateEntry(state, key, null);
   } catch (error) {
     warn(
-      `warn: could not prune missing ${entry.targetId} OpenTelemetry ownership at ${entry.path}: ${error instanceof Error ? error.message : String(error)}`
+      `Warning: could not prune missing ${entry.targetId} OpenTelemetry ownership at ${entry.path}: ${error instanceof Error ? error.message : String(error)}`
     );
   }
 }
@@ -6283,13 +6465,13 @@ function removeFmlOtel(observer, options = {}) {
     }
     if (candidate.recorded && candidate.plan.mutations.length === 0 && candidate.plan.warnings.length === 0 && state) {
       warn(
-        `warn: preserved ${candidate.plan.displayName} OpenTelemetry at ${candidate.plan.configPath}: managed fields were modified or removed after installation`
+        `Warning: preserved ${candidate.plan.displayName} OpenTelemetry at ${candidate.plan.configPath}: managed fields were modified or removed after installation`
       );
       try {
         commitStateEntry(state, key, null);
       } catch (error) {
         warn(
-          `warn: could not relinquish ${candidate.plan.displayName} OpenTelemetry ownership at ${candidate.plan.configPath}: ${error instanceof Error ? error.message : String(error)}`
+          `Warning: could not relinquish ${candidate.plan.displayName} OpenTelemetry ownership at ${candidate.plan.configPath}: ${error instanceof Error ? error.message : String(error)}`
         );
       }
     }
@@ -6297,437 +6479,407 @@ function removeFmlOtel(observer, options = {}) {
   return changes;
 }
 
-// src/commands/uninstall.ts
-var PURGE_WARNING = "This deletes FML credentials for ALL environments, logs, sync state, and every pending best-effort OTLP envelope.";
-function tryDisableHookCapture() {
-  try {
-    setHookCaptureDisabled(true);
-    return true;
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    console.warn(
-      `Could not persist the hook-capture pause at ${FML_HOOK_CAPTURE_DISABLED_FILE}: ${message}`
-    );
-    return false;
-  }
+// src/commands/sync.ts
+function rawSync() {
+  return createCliRawSync();
 }
-function resolvePreservedPaths(preservedFile) {
-  const logicalPath = path27.resolve(preservedFile);
-  try {
-    const canonicalPath = fs12.realpathSync(preservedFile);
-    return pathsAreSame(canonicalPath, logicalPath) ? [logicalPath] : [logicalPath, canonicalPath];
-  } catch {
-    return [logicalPath];
+function formatBytes(bytes) {
+  if (bytes < 1024) return `${bytes} B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KiB`;
+  if (bytes < 1024 * 1024 * 1024) {
+    return `${(bytes / (1024 * 1024)).toFixed(1)} MiB`;
   }
+  return `${(bytes / (1024 * 1024 * 1024)).toFixed(2)} GiB`;
 }
-function purgeDirectoryPreservingPaths(directory, preservedPaths, configuredRoot = false) {
-  const resolvedDirectory = path27.resolve(directory);
-  let directoryStats;
-  try {
-    directoryStats = fs12.lstatSync(directory);
-  } catch (error) {
-    if (error.code === "ENOENT") return true;
-    throw error;
-  }
-  if (directoryStats.isSymbolicLink()) {
-    if (configuredRoot) return false;
-    const containsLogicalMarker = preservedPaths.some(
-      (preservedPath) => pathContains(resolvedDirectory, preservedPath)
+function formatDuration(durationMs) {
+  if (durationMs < 1e3) return `${Math.round(durationMs)} ms`;
+  return `${(durationMs / 1e3).toFixed(2)} s`;
+}
+function printRepositoryResolution(metrics) {
+  if (metrics.attempted === 0 && metrics.budgetSkipped === 0) return;
+  console.log(
+    `  Repo checks:      ${metrics.attempted} (${metrics.resolved} resolved, ${metrics.unresolved} unresolved, ${metrics.cacheHits} cached, ${metrics.budgetSkipped} skipped by budget)`
+  );
+  console.log(
+    `  Repo check time:  ${formatDuration(metrics.elapsedMs)} total, ${formatDuration(metrics.slowestMs)} slowest`
+  );
+}
+function writeJson(value) {
+  console.log(JSON.stringify(value, null, 2));
+}
+function warnRetainedLegacyDatabase(retained) {
+  if (retained.pendingEvents !== null && retained.pendingHookEvents !== null && retained.pendingOtlpEnvelopes !== null) {
+    console.warn(
+      `Warning: Retained legacy observer database at ${retained.databaseFile} with ${retained.pendingEvents} pending rows (${retained.pendingHookEvents} hook, ${retained.pendingOtlpEnvelopes} OTLP); FML will not sync those rows automatically.`
     );
-    if (!containsLogicalMarker) {
-      fs12.rmSync(directory, { force: true });
-      return true;
-    }
-    return false;
-  }
-  const directoryPaths = [resolvedDirectory];
-  try {
-    const canonicalDirectory = fs12.realpathSync(directory);
-    if (!pathsAreSame(canonicalDirectory, resolvedDirectory)) {
-      directoryPaths.push(canonicalDirectory);
-    }
-  } catch {
-  }
-  const containsPreservedPath = directoryPaths.some(
-    (directoryPath) => preservedPaths.some(
-      (preservedPath) => pathContains(directoryPath, preservedPath)
-    )
-  );
-  if (!containsPreservedPath) {
-    fs12.rmSync(directory, { recursive: true, force: true });
-    return true;
+    return;
   }
-  const isPreservedPath = directoryPaths.some(
-    (directoryPath) => preservedPaths.some(
-      (preservedPath) => pathsAreSame(directoryPath, path27.resolve(preservedPath))
-    )
+  console.warn(
+    `Warning: Retained legacy observer database at ${retained.databaseFile}; pending row count unavailable. FML will not sync that database automatically.`
   );
-  if (isPreservedPath) return true;
-  if (!directoryStats.isDirectory()) return false;
-  let entries;
-  try {
-    entries = fs12.readdirSync(directory);
-  } catch (error) {
-    if (error.code === "ENOENT") return true;
-    throw error;
-  }
-  let complete = true;
-  for (const entry of entries) {
-    const entryPath = path27.join(directory, entry);
-    if (!purgeDirectoryPreservingPaths(entryPath, preservedPaths, false)) {
-      complete = false;
-    }
-  }
-  return complete;
 }
-function purgeDirectoryPreservingFiles(directory, preservedFiles) {
-  if (hasSymlinkedParentBelowTrustedAnchor(directory)) return false;
-  return purgeDirectoryPreservingPaths(
-    directory,
-    preservedFiles.flatMap(
-      (preservedFile) => resolvePreservedPaths(preservedFile)
-    ),
-    true
+function printStatus(status) {
+  const { queue } = status;
+  console.log(
+    `Raw artifact sync: ${status.settings.enabled ? "enabled" : "disabled"}`
   );
-}
-function finishCustomRootPurge(directory) {
-  const marker = managedDirectoryMarker(directory);
-  fs12.rmSync(marker, { force: true });
-  try {
-    fs12.rmdirSync(directory);
-  } catch (error) {
-    if (error.code === "ENOENT") return;
-    try {
-      fs12.writeFileSync(marker, FML_MANAGED_DIRECTORY_MARKER_CONTENT, {
-        encoding: "utf8",
-        flag: "wx",
-        mode: 384
-      });
-    } catch (markerError) {
-      if (markerError.code === "EEXIST" && hasManagedDirectoryMarker(directory)) {
-        throw error;
-      }
-      const removalMessage = error instanceof Error ? error.message : String(error);
-      const markerMessage = markerError instanceof Error ? markerError.message : String(markerError);
-      throw new Error(
-        `could not remove ${directory} (${removalMessage}) or restore its FML ownership marker (${markerMessage})`
-      );
-    }
-    throw error;
-  }
-}
-function cleanInstalledPluginScopes(paths) {
-  const installedPlugins = readJsonFile(paths.installedPluginsPath);
-  if (!installedPlugins) return;
-  const update = CLAUDE_PLUGIN_INSTALLER.removeInstalledPlugin(
-    installedPlugins,
-    CLAUDE_PLUGIN_INSTALLER.pluginId
+  console.log(`  State:     ${FML_OBSERVER_DIR}`);
+  console.log(`  Tracked:   ${queue.tracked}`);
+  console.log(`  Pending:   ${queue.pending}`);
+  console.log(`  Raw work:  ${queue.rawPending}`);
+  console.log(`  Metadata:  ${queue.metadataPending}`);
+  console.log(`  Uploaded:  ${queue.uploaded}`);
+  console.log(`  Failed:    ${queue.failed}`);
+  console.log(
+    `  Watermark: ${formatBytes(queue.uploadedBytes)} / ${formatBytes(queue.totalBytes)}`
   );
-  if (!update.changed) return;
-  for (const settingsPath2 of CLAUDE_PLUGIN_INSTALLER.projectSettingsPaths(
-    installedPlugins,
-    CLAUDE_PLUGIN_INSTALLER.pluginId
-  )) {
-    if (removeEnabledPluginFromSettings(
-      settingsPath2,
-      CLAUDE_PLUGIN_INSTALLER.pluginId
-    )) {
-      console.log(`      Cleaned ${settingsPath2}`);
-    }
-  }
-  writeJsonFile(paths.installedPluginsPath, update.installedPlugins);
-  console.log("      Cleaned installed_plugins.json");
-}
-function purgeWarning(roots) {
-  return `${PURGE_WARNING}
-Purge roots:
-${roots.map((root) => `  - ${root.directory}`).join("\n")}`;
+  console.log(`  Remaining: ${formatBytes(queue.remainingBytes)}`);
 }
-async function confirmPurge(opts, roots) {
-  const warning = purgeWarning(roots);
-  if (opts.assumeYes) {
-    console.log(warning);
-    return true;
-  }
-  const input = opts.input ?? process.stdin;
-  if (input.isTTY !== true) {
-    console.error(
-      `${warning}
-Re-run with --yes to confirm in a non-interactive session.`
-    );
-    return false;
-  }
-  const rl = readline.createInterface({
-    input,
-    output: opts.output ?? process.stdout
-  });
-  try {
-    const closed = new Promise((resolve) => {
-      rl.once("close", () => resolve(null));
-    });
-    const answer = await Promise.race([
-      rl.question(`${warning}
-Type y to continue: `).catch(() => null),
-      closed
-    ]);
-    if (answer !== null && answer.trim().toLowerCase() === "y") return true;
-  } finally {
-    rl.close();
-  }
-  console.error("Uninstall canceled; nothing was removed.");
-  return false;
+function syncExitCode(result) {
+  if (result.outcome === "failed" || result.outcome === "exhausted") return 1;
+  if (result.outcome === "busy") return 1;
+  return 0;
 }
-function refuseUnsafePurge(roots) {
-  const unsafeRoots = unsafePurgeRoots(roots);
-  if (unsafeRoots.length === 0) return false;
-  console.error("Refusing to purge unsafe FML directories:");
-  for (const root of unsafeRoots) {
-    console.error(`  - ${root.directory}: ${root.reason}`);
+async function handleSyncRun(opts = {}) {
+  const sync2 = rawSync();
+  if (!sync2.getSettings().enabled) {
+    const result2 = {
+      ok: true,
+      outcome: "disabled",
+      status: sync2.status()
+    };
+    if (opts.json) writeJson(result2);
+    else printStatus(result2.status);
+    return;
   }
-  console.error(
-    "Inspect and remove those roots manually, or reconfigure FML to fresh dedicated empty data, state, log, and observer directories and run `fml install` before retrying."
-  );
-  process.exitCode = 1;
-  return true;
-}
-async function handleUninstall(opts) {
-  const purgeRoots = opts.purge ? configuredManagedRoots() : [];
-  if (opts.purge) {
-    if (refuseUnsafePurge(purgeRoots)) return;
-    if (!await confirmPurge(opts, purgeRoots)) {
-      process.exitCode = 1;
-      return;
+  if (opts.dryRun) {
+    const discovery = sync2.discover();
+    const bySource = {};
+    let totalBytes = 0;
+    for (const candidate of discovery.candidates) {
+      bySource[candidate.source] = (bySource[candidate.source] ?? 0) + 1;
+      try {
+        totalBytes += statSync(candidate.sourcePath).size;
+      } catch {
+      }
     }
-    for (const root of purgeRoots) {
-      if (!fs12.existsSync(root.directory) && pathContains(root.directory, FML_OBSERVER_DIR)) {
-        prepareManagedDirectory(root);
+    const result2 = {
+      ok: true,
+      dryRun: true,
+      targetUrl: getSiteUrl(),
+      discovered: {
+        count: discovery.candidates.length,
+        totalBytes,
+        bySource
+      },
+      repositoryResolution: discovery.repositoryResolution,
+      oversized: discovery.oversized,
+      status: sync2.status()
+    };
+    if (opts.json) writeJson(result2);
+    else {
+      console.log("FML raw artifact sync dry-run");
+      console.log(`  Target:     ${result2.targetUrl}`);
+      console.log(`  Discovered: ${result2.discovered.count}`);
+      console.log(`  Bytes:      ${formatBytes(result2.discovered.totalBytes)}`);
+      for (const [source, count] of Object.entries(bySource).sort()) {
+        console.log(`    ${source}: ${count}`);
+      }
+      printRepositoryResolution(discovery.repositoryResolution);
+      console.log(`  Oversized:  ${discovery.oversized.length}`);
+      if (discovery.compressedArtifactsUnsupportedReason) {
+        console.log(
+          `  Compressed: skipped \u2014 ${discovery.compressedArtifactsUnsupportedReason}`
+        );
       }
     }
-    if (refuseUnsafePurge(purgeRoots)) return;
-  }
-  console.log("Uninstalling fml...\n");
-  const otelDestination = readLocalObserverOtelDestination({
-    endpointFile: FML_OBSERVER_ENDPOINT_FILE,
-    authTokenFile: FML_OBSERVER_AUTH_TOKEN_FILE
-  });
-  let observer;
-  try {
-    observer = await stopObserver();
-  } catch (error) {
-    console.error(error instanceof Error ? error.message : String(error));
-    console.error(
-      "Could not safely stop the FML observer; uninstall was aborted. Repair the reported files and rerun `fml uninstall`."
-    );
-    process.exitCode = 1;
     return;
   }
-  if (observer.status === "permission_denied" || observer.status === "foreign_listener" || observer.status === "ambiguous_live_process" || observer.status === "unresponsive" || observer.status === "signal_sent") {
-    console.error(
-      `Could not safely stop FML observer PID ${observer.pid}; uninstall was aborted.`
-    );
+  const attempt = await runRawSyncOnce();
+  if (attempt.kind === "unauthenticated") {
+    console.error("Raw artifact sync requires an FML login.");
+    console.error("Run `fml login` or set FML_TOKEN.");
     process.exitCode = 1;
     return;
   }
-  let hookCapturePaused = tryDisableHookCapture();
-  createRawArtifactSync({ stateDir: FML_OBSERVER_DIR }).setEnabled(false);
-  const paths = CLAUDE_PLUGIN_INSTALLER.resolvePaths({
-    env: process.env,
-    homeDir: os7.homedir()
-  });
-  console.log("[1/7] Unregistering the Claude Code plugin...");
-  const claudeBin = resolveBin("claude");
-  if (claudeBin) {
-    try {
-      const command = CLAUDE_PLUGIN_INSTALLER.uninstallCommand;
-      execBinSync(claudeBin, [...command.args], {
-        timeout: command.timeoutMs
-      });
-    } catch {
+  if (attempt.kind === "disabled") {
+    if (opts.json) {
+      writeJson({ ok: true, outcome: "disabled", status: attempt.status });
+    } else {
+      printStatus(attempt.status);
     }
+    return;
   }
-  cleanInstalledPluginScopes(paths);
-  const settings = readJsonFile(paths.settingsPath);
-  if (settings) {
-    const marketplace2 = readJsonFile(paths.marketplaceManifestPath);
-    const keepLocalMarketplace = CLAUDE_PLUGIN_INSTALLER.hasOtherLocalMarketplacePlugins(
-      settings,
-      marketplace2
-    );
-    writeJsonFile(
-      paths.settingsPath,
-      CLAUDE_PLUGIN_INSTALLER.disableInSettings(settings, keepLocalMarketplace)
+  const { result, targetUrl } = attempt;
+  if (opts.json) {
+    writeJson({ ok: syncExitCode(result) === 0, targetUrl, result });
+  } else {
+    console.log("FML raw artifact sync");
+    console.log(`  Target:          ${targetUrl}`);
+    console.log(`  Outcome:         ${result.outcome}`);
+    console.log(`  Sync passes:     ${result.syncPasses}`);
+    console.log(`  Discovered:      ${result.discovery.candidates.length}`);
+    if (result.discovery.compressedArtifactsUnsupportedReason) {
+      console.log(
+        `  Compressed:      skipped \u2014 ${result.discovery.compressedArtifactsUnsupportedReason}`
+      );
+    }
+    printRepositoryResolution(result.discovery.repositoryResolution);
+    console.log(`  Uploaded files:  ${result.upload.uploaded}`);
+    console.log(`  Uploaded chunks: ${result.upload.uploadedChunks}`);
+    console.log(
+      `  Uploaded bytes:  ${formatBytes(result.upload.uploadedBytes)}`
     );
+    console.log(`  Failed:          ${result.upload.failed}`);
+    console.log(`  Exhausted:       ${result.upload.exhausted}`);
+    if (result.upload.retryAtMs !== void 0) {
+      console.log(
+        `  Retry at:        ${new Date(result.upload.retryAtMs).toISOString()}`
+      );
+    }
+    console.log(`  Drained:         ${result.drained ? "yes" : "no"}`);
+    if (result.outcome === "pending") {
+      console.log(
+        "  Next:            More data remains; run `fml sync` again or `fml start` for continuous syncing."
+      );
+    } else if (result.outcome === "backing_off") {
+      const nextRetryAtMs = result.upload.nextRetryAtMs;
+      console.log(
+        `  Next:            Remaining items are backing off after upload errors${nextRetryAtMs !== void 0 ? `; next retry due ${new Date(nextRetryAtMs).toISOString()}` : ""}. \`fml start\` retries automatically.`
+      );
+    }
+    console.log("");
+    printStatus(result.status);
   }
-  console.log("      Plugin settings removed");
-  console.log("[2/7] Removing agent-native /fml skills...");
+  process.exitCode = syncExitCode(result);
+}
+function setRawSyncEnabled(enabled) {
+  return rawSync().setEnabled(enabled);
+}
+async function handleSyncEnable(opts = {}) {
+  const sync2 = rawSync();
+  const settings = sync2.setEnabled(true);
+  const isolationWarning = observerOnlyOverrideWarning();
+  if (isolationWarning) console.warn(isolationWarning);
+  let retainedLegacyDatabase;
   try {
-    for (const result of removeManagedAgentSkills(resolvePackageRoot())) {
-      const targets = result.displayNames.join(", ");
-      if (result.status === "preserved") {
-        console.warn(
-          `      Preserved ${result.destinationPath} for ${targets}: ${result.reason}`
-        );
-      } else if (result.reason) {
-        console.warn(
-          `      ${targets}: ${result.destinationPath} (${result.status}); ${result.reason}`
+    const observer = await startObserver({
+      onLegacyDatabaseRetained: (retained) => {
+        retainedLegacyDatabase = retained;
+        if (!opts.json) warnRetainedLegacyDatabase(retained);
+      }
+    });
+    setHookCaptureDisabled(false);
+    if (observer.status === "already_running") {
+      await wakeObserverSync();
+    }
+    const port = observer.runtime.health?.port;
+    const authToken = port ? readObserverAuthToken(FML_OBSERVER_AUTH_TOKEN_FILE) : null;
+    if (port && authToken) {
+      configureFmlOtel({
+        baseUrl: `http://127.0.0.1:${port}`,
+        authToken
+      });
+    } else if (!opts.json) {
+      console.warn(
+        "Warning: Could not configure native OpenTelemetry: the healthy observer endpoint or local token is unavailable."
+      );
+    }
+    if (opts.json) {
+      writeJson({
+        ok: true,
+        sync: settings,
+        observer,
+        ...observer.retainedLegacyDatabase ? { retainedLegacyDatabase: observer.retainedLegacyDatabase } : {}
+      });
+    } else {
+      const pid = observer.runtime.health?.pid;
+      if (observer.status === "started") {
+        console.log(
+          pid ? `FML observer started (PID ${pid}).` : "FML observer started."
         );
+        console.log("Agent activity will sync automatically.");
       } else {
         console.log(
-          `      ${targets}: ${result.destinationPath} (${result.status})`
+          pid ? `FML observer is already running (PID ${pid}).` : "FML observer is already running."
         );
+        console.log("Agent activity sync is on.");
       }
     }
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    console.warn(
-      `      Agent-native skill cleanup could not be completed: ${message}`
-    );
-  }
-  console.log("[3/7] Removing the local marketplace entry...");
-  if (removeMarketplaceLink(paths.marketplaceLinkPath) === "preserved") {
-    console.warn(
-      `      Preserved non-symlink marketplace path ${paths.marketplaceLinkPath}`
-    );
-  }
-  const marketplace = readJsonFile(paths.marketplaceManifestPath);
-  if (marketplace && Array.isArray(marketplace.plugins)) {
-    writeJsonFile(
-      paths.marketplaceManifestPath,
-      CLAUDE_PLUGIN_INSTALLER.removeMarketplaceEntry(
-        marketplace,
-        CLAUDE_PLUGIN_INSTALLER.pluginName
-      )
-    );
-  }
-  fs12.rmSync(paths.pluginCacheDir, { recursive: true, force: true });
-  console.log("      Marketplace and plugin cache removed");
-  console.log("[4/7] Removing FML hook registrations...");
-  let hookRemovalComplete = true;
-  for (const target2 of removeFmlHooks({
-    onFailure: () => {
-      hookRemovalComplete = false;
-    }
-  })) {
-    console.log(`      Removed FML hooks from ${target2.displayName}`);
-  }
-  if (!hookRemovalComplete) {
+    if (opts.json) {
+      writeJson({
+        ok: false,
+        sync: settings,
+        error: message,
+        ...retainedLegacyDatabase ? { retainedLegacyDatabase } : {}
+      });
+    } else console.error(message);
     process.exitCode = 1;
-    console.warn(
-      "      Some FML hook registrations were preserved; repair the paths reported above and rerun `fml uninstall`."
-    );
   }
-  console.log("[5/7] Removing native OpenTelemetry configuration...");
-  for (const target2 of removeFmlOtel(otelDestination)) {
-    console.log(`      Removed FML OpenTelemetry from ${target2.displayName}`);
+}
+async function handleSyncDisable(opts = {}) {
+  const sync2 = rawSync();
+  const settings = sync2.setEnabled(false);
+  const observerWoken = await wakeObserverSync();
+  if (opts.json) {
+    writeJson({ ok: true, sync: settings, observerWoken });
+  } else {
+    console.log("Agent activity sync is paused.");
+    const observer = await readObserverRuntimeStatus();
+    if (observer.running) {
+      console.log("FML observer remains available for local integrations");
+    }
   }
-  if (!otelDestination) {
-    console.warn(
-      "      The local observer endpoint or token is unavailable; only recorded OpenTelemetry profiles could be cleaned"
+}
+async function handleSyncStatus(opts = {}) {
+  const status = rawSync().status();
+  const observer = await readObserverRuntimeStatus();
+  if (opts.json) writeJson({ ok: true, status, observer });
+  else {
+    printStatus(status);
+    const state = observer.stateStatus.state;
+    console.log(
+      `  Observer:  ${observer.healthy ? "running" : observer.running ? "unhealthy" : "stopped"}`
     );
-  }
-  console.log("[6/7] Removing direct MCP registrations...");
-  for (const target2 of removeFmlDirectMcp("all")) {
-    console.log(`      Removed FML MCP from ${target2.displayName}`);
-  }
-  console.log("[7/7] Handling local data...");
-  let purgeComplete = true;
-  if (opts.purge) {
-    if (refuseUnsafePurge(purgeRoots)) {
-      purgeComplete = false;
-    } else {
-      for (const root of purgeRoots) {
-        if (refuseUnsafePurge([root])) {
-          purgeComplete = false;
-          continue;
-        }
-        const containsObserverDirectory = pathContains(
-          root.directory,
-          FML_OBSERVER_DIR
+    if (state) {
+      console.log(`  PID:       ${state.pid}`);
+      console.log(`  Phase:     ${state.phase}`);
+      if (state.lastOutcome) {
+        console.log(`  Last run:  ${state.lastOutcome}`);
+      }
+      if (state.nextAttemptAtMs) {
+        console.log(
+          `  Next run:  ${new Date(state.nextAttemptAtMs).toISOString()}`
         );
-        const customManagedRoot = !root.nativeDefault;
-        try {
-          const purged = purgeDirectoryPreservingFiles(root.directory, [
-            ...customManagedRoot ? [managedDirectoryMarker(root.directory)] : [],
-            ...containsObserverDirectory && hookCapturePaused ? [FML_HOOK_CAPTURE_DISABLED_FILE] : []
-          ]);
-          if (!purged) {
-            purgeComplete = false;
-            console.warn(
-              `      Preserved ${root.directory}: a symbolic link prevents a complete safe purge`
-            );
-            continue;
-          }
-          if (customManagedRoot && !containsObserverDirectory) {
-            finishCustomRootPurge(root.directory);
-          }
-          console.log(`      Purged ${root.directory}`);
-        } catch (error) {
-          purgeComplete = false;
-          const message = error instanceof Error ? error.message : String(error);
-          console.warn(
-            `      Preserved ${root.directory}: the safe purge was incomplete: ${message}`
-          );
-        }
       }
     }
-    if (!hookCapturePaused) hookCapturePaused = tryDisableHookCapture();
+    console.log(`  Log:       ${observer.logFile}`);
+  }
+}
+async function handleSyncReset(opts = {}) {
+  const result = rawSync().reset();
+  if (opts.json) writeJson({ ok: !result.skipped, reset: result });
+  else if (result.skipped) {
+    console.error(
+      "Raw artifact reset skipped: another sync owns the queue lock"
+    );
   } else {
     console.log(
-      "      Preserved auth, logs, raw-sync watermarks, and the bounded OTLP spool"
+      `Reset raw upload watermarks for ${result.reset} artifact${result.reset === 1 ? "" : "s"}.`
     );
-  }
-  if (!hookCapturePaused) {
-    process.exitCode = 1;
-    console.warn(
-      "FML integrations were removed, but cached agent processes may keep invoking hooks until they exit."
+    if (result.removed > 0) {
+      console.log(`Removed ${result.removed} missing artifact entries.`);
+    }
+    console.log(
+      "The next enabled sync will replay each artifact from byte zero."
     );
   }
-  if (opts.purge && !purgeComplete) {
+  if (result.skipped) {
     process.exitCode = 1;
-    console.warn(
-      "FML integrations were removed, but local data remains because a purge target could not be removed safely. Repair the reported path and rerun `fml uninstall --purge`."
-    );
+  } else {
+    await wakeObserverSync();
   }
-  console.log("\nDone! FML has been uninstalled.");
 }
 
-// src/commands/update.ts
-async function handleUpdate() {
-  const currentVersion = true ? "0.8.0-rc.1+60c9b7e1" : "unknown";
-  console.log(`Current: ${currentVersion}`);
-  console.log("Updating via pnpm...\n");
-  try {
-    const pnpm = resolveBin("pnpm");
-    if (!pnpm) throw new Error("pnpm was not found on PATH");
-    const env = { ...process.env };
-    delete env.npm_config_registry;
-    execBinSync(pnpm, ["add", "--global", "@fml-inc/fml@latest"], {
-      timeout: 12e4,
-      env
-    });
-    console.log("\nUpdated. Run `fml install` to reconfigure.");
-  } catch (err) {
-    Sentry.captureException(err);
-    const msg = err instanceof Error ? err.stderr?.toString() ?? err.message : String(err);
-    console.error("Update failed:", msg);
-    process.exit(1);
-  }
+// src/commands/daemon.ts
+async function handleFmlStart() {
+  await handleSyncEnable();
 }
-
-// src/auth/oauth.ts
-import crypto from "crypto";
-import http from "http";
-async function fetchWorkosClientId(siteUrl) {
-  const response = await fetch(`${siteUrl}/api/auth/config`);
-  const data = await response.json();
-  if (!response.ok || data.ok === false || !data.workosClientId) {
-    throw new Error(data.error ?? `HTTP ${response.status}`);
+async function stopFml(opts = {}) {
+  setRawSyncEnabled(false);
+  const result = await stopObserver({ force: opts.force });
+  let stopped = result.status === "stopped" || result.status === "killed" || result.status === "not_running" || result.status === "stale_state";
+  if (stopped) {
+    try {
+      setHookCaptureDisabled(true);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      console.error(
+        `FML observer stopped, but the hook-capture pause could not be persisted: ${message}`
+      );
+      process.exitCode = 1;
+      stopped = false;
+    }
   }
-  return data.workosClientId;
-}
-async function canOpenBrowser() {
-  if (process.env.FML_DEVICE_FLOW === "1") return false;
-  if (process.env.FML_NO_BROWSER === "1") return false;
+  switch (result.status) {
+    case "stopped":
+      console.log(`FML observer stopped (PID ${result.pid}).`);
+      console.log("Agent activity sync is paused.");
+      break;
+    case "killed":
+      console.log(`FML observer stopped (PID ${result.pid}).`);
+      console.log("Agent activity sync is paused.");
+      break;
+    case "not_running":
+      console.log("FML observer is already stopped.");
+      console.log("Agent activity sync is paused.");
+      break;
+    case "stale_state":
+      console.log(
+        "FML observer is stopped. Old process state will be cleaned on the next start."
+      );
+      console.log("Agent activity sync is paused.");
+      break;
+    case "permission_denied":
+      console.error(
+        `Could not stop FML observer PID ${result.pid}: permission denied`
+      );
+      process.exitCode = 1;
+      break;
+    case "foreign_listener":
+      console.error("Refused to stop a different local observer instance");
+      process.exitCode = 1;
+      break;
+    case "ambiguous_live_process":
+      console.error(
+        `Refused to treat unverifiable live PID ${result.pid} as a stopped FML observer`
+      );
+      process.exitCode = 1;
+      break;
+    case "unresponsive":
+      console.error(
+        `Refused to signal unverifiable FML observer PID ${result.pid}; retry with \`fml stop --force\` to escalate`
+      );
+      process.exitCode = 1;
+      break;
+    case "signal_sent":
+      console.error(`FML observer PID ${result.pid} did not stop`);
+      process.exitCode = 1;
+      break;
+    case "force_stop_unverified":
+      console.error(
+        `Could not corroborate that PID ${result.pid} is the FML observer; refusing to signal it. If the observer is not running, remove ${result.stateFile}, ${result.lockFile}, ${result.databaseStateFile}, and ${result.databaseLockFile} manually.`
+      );
+      process.exitCode = 1;
+      break;
+  }
+  return stopped;
+}
+async function handleFmlStop(opts = {}) {
+  await stopFml(opts);
+}
+async function handleFmlRestart() {
+  if (await stopFml()) {
+    await handleFmlStart();
+  }
+}
+
+// src/auth/oauth.ts
+import crypto from "crypto";
+import http from "http";
+async function fetchWorkosClientId(siteUrl) {
+  const response = await fetch(`${siteUrl}/api/auth/config`);
+  const data = await response.json();
+  if (!response.ok || data.ok === false || !data.workosClientId) {
+    throw new Error(data.error ?? `HTTP ${response.status}`);
+  }
+  return data.workosClientId;
+}
+async function canOpenBrowser() {
+  if (process.env.FML_DEVICE_FLOW === "1") return false;
+  if (process.env.FML_NO_BROWSER === "1") return false;
   if (process.platform === "linux" && !process.env.DISPLAY && !process.env.WAYLAND_DISPLAY) {
     return false;
   }
@@ -6735,8 +6887,8 @@ async function canOpenBrowser() {
   if (process.env.CODESPACES) return false;
   if (process.env.REMOTE_CONTAINERS) return false;
   try {
-    const fs13 = await import("fs");
-    if (fs13.existsSync("/.dockerenv")) return false;
+    const fs14 = await import("fs");
+    if (fs14.existsSync("/.dockerenv")) return false;
   } catch {
   }
   return true;
@@ -7194,8 +7346,9 @@ async function runServiceTokenLogin(refreshToken) {
   }
   await selectOrg(environment);
   console.log("Logged in with FML service token.");
-  console.log("Queries and sync will use the stored service token.");
-  console.log("You're all set! Restart Claude Code to use FML tools.");
+  console.log(
+    "Queries and agent activity sync will use the stored service token."
+  );
 }
 async function handleServiceTokenLogin(refreshToken) {
   try {
@@ -7212,16 +7365,12 @@ async function handleServiceTokenLogin(refreshToken) {
     process.exit(1);
   }
 }
-async function handleLogin(opts) {
-  if (opts?.serviceToken) {
-    await handleServiceTokenLogin();
-    return;
-  }
+async function runInteractiveLogin(opts = {}) {
   const environment = captureLoginEnvironment();
   const envName = environment.envName;
   const existingToken = await getValidToken({ env: envName });
   if (existingToken) {
-    const { readTokens: readTokens2 } = await import("./token-store-R7WXEPLI.js");
+    const { readTokens: readTokens2 } = await import("./token-store-BT5THIAJ.js");
     const stored = readTokens2(envName);
     if (stored?.tokenType === "service") {
       const label = stored.user.id === SERVICE_TOKEN_LOGIN_USER_ID ? "a service token" : `${stored.user.name} (${stored.user.email})`;
@@ -7233,23 +7382,27 @@ async function handleLogin(opts) {
     }
     await linkGitHubIdentity(environment);
     await selectOrg(environment);
-    console.log("You're all set! Restart Claude Code to use FML tools.");
-    process.exit(0);
+    return;
   }
   console.log(`Signing in to FML (${envName})...`);
+  const useDeviceFlow = opts.device || !await canOpenBrowser();
+  let result;
+  if (useDeviceFlow) {
+    result = await deviceLogin(environment);
+  } else {
+    result = await login(environment);
+  }
+  console.log(`Logged in as ${result.name} (${result.email})`);
+  await linkGitHubIdentity(environment);
+  await selectOrg(environment);
+}
+async function handleLogin(opts) {
+  if (opts?.serviceToken) {
+    await handleServiceTokenLogin();
+    return;
+  }
   try {
-    const useDeviceFlow = opts?.device || !await canOpenBrowser();
-    let result;
-    if (useDeviceFlow) {
-      result = await deviceLogin(environment);
-    } else {
-      result = await login(environment);
-    }
-    console.log(`
-Logged in as ${result.name} (${result.email})`);
-    await linkGitHubIdentity(environment);
-    await selectOrg(environment);
-    console.log("You're all set! Restart Claude Code to use FML tools.");
+    await runInteractiveLogin({ device: opts?.device });
     process.exit(0);
   } catch (err) {
     Sentry.captureException(err);
@@ -7259,742 +7412,923 @@ Logged in as ${result.name} (${result.email})`);
   }
 }
 
-// src/commands/logout.ts
-async function handleLogout() {
-  const { name } = getActiveEnv();
-  await clearStoredCredentials(name);
-  console.log(`Logged out of "${name}". Stored credentials cleared.`);
+// src/commands/setup.ts
+var defaultDependencies = {
+  install: () => handleInstall(),
+  getActiveToken: () => getValidToken({ env: getActiveEnv().name }),
+  login: () => runInteractiveLogin(),
+  stop: () => handleFmlStop(),
+  start: () => handleFmlStart()
+};
+async function runStep(name, operation) {
+  const priorExitCode = process.exitCode;
+  await operation();
+  if (process.exitCode && process.exitCode !== priorExitCode) {
+    throw new Error(`FML setup could not complete ${name}.`);
+  }
+}
+async function handleSetup(dependencies = defaultDependencies) {
+  if (process.exitCode) {
+    throw new Error("FML setup cannot run after an earlier command failure.");
+  }
+  console.log("Setting up FML...");
+  await runStep("integration installation", dependencies.install);
+  const token = await dependencies.getActiveToken();
+  if (token) {
+    console.log("Already signed in.");
+  } else {
+    await runStep("login", dependencies.login);
+  }
+  await runStep("observer stop", dependencies.stop);
+  await runStep("observer start", dependencies.start);
+  console.log("FML is ready.");
+  console.log("Start a new agent session to load FML tools.");
+  console.log("Run `fml doctor` to verify setup.");
 }
 
-// src/commands/org.ts
-async function handleOrg(slug) {
-  const environment = getActiveEnv();
-  const token = await getValidToken({ env: environment.name });
-  if (!token) {
-    console.error("Not logged in. Run `fml login` first.");
-    process.exit(1);
+// src/commands/uninstall.ts
+import fs13 from "fs";
+import os7 from "os";
+import path28 from "path";
+import readline from "readline/promises";
+var PURGE_WARNING = "This deletes FML credentials for ALL environments, logs, sync state, and every pending best-effort OTLP envelope.";
+function tryDisableHookCapture() {
+  try {
+    setHookCaptureDisabled(true);
+    return true;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.warn(
+      `Warning: Could not persist the hook-capture pause at ${FML_HOOK_CAPTURE_DISABLED_FILE}: ${message}`
+    );
+    return false;
   }
-  const api = createFmlClient(token, {
-    envName: environment.name,
-    siteUrl: getSiteUrlForConvexUrl(environment.convexUrl)
-  });
-  const orgs = await api.queryOrgs();
-  if (orgs.length === 0) {
-    console.error("No organizations found.");
-    process.exit(1);
+}
+function resolvePreservedPaths(preservedFile) {
+  const logicalPath = path28.resolve(preservedFile);
+  try {
+    const canonicalPath = fs13.realpathSync(preservedFile);
+    return pathsAreSame(canonicalPath, logicalPath) ? [logicalPath] : [logicalPath, canonicalPath];
+  } catch {
+    return [logicalPath];
   }
-  const current = getSelectedOrg(environment.name);
-  const currentId = getSelectedOrgId(environment.name);
-  if (!slug) {
-    console.log("Organizations:\n");
-    for (const org of orgs) {
-      const orgSlug = org.slug ?? org.name;
-      const marker = org._id === currentId || !currentId && orgSlug === current ? " (selected)" : "";
-      console.log(`  ${orgSlug}${marker}`);
+}
+function purgeDirectoryPreservingPaths(directory, preservedPaths, configuredRoot = false) {
+  const resolvedDirectory = path28.resolve(directory);
+  let directoryStats;
+  try {
+    directoryStats = fs13.lstatSync(directory);
+  } catch (error) {
+    if (error.code === "ENOENT") return true;
+    throw error;
+  }
+  if (directoryStats.isSymbolicLink()) {
+    if (configuredRoot) return false;
+    const containsLogicalMarker = preservedPaths.some(
+      (preservedPath) => pathContains(resolvedDirectory, preservedPath)
+    );
+    if (!containsLogicalMarker) {
+      fs13.rmSync(directory, { force: true });
+      return true;
     }
-    if (!currentId && !current) {
-      console.log("\nNo org selected. Run `fml org <slug>` to select one.");
+    return false;
+  }
+  const directoryPaths = [resolvedDirectory];
+  try {
+    const canonicalDirectory = fs13.realpathSync(directory);
+    if (!pathsAreSame(canonicalDirectory, resolvedDirectory)) {
+      directoryPaths.push(canonicalDirectory);
     }
-    return;
+  } catch {
   }
-  const match = orgs.find(
-    (o) => (o.slug ?? o.name) === slug || o.name === slug
+  const containsPreservedPath = directoryPaths.some(
+    (directoryPath) => preservedPaths.some(
+      (preservedPath) => pathContains(directoryPath, preservedPath)
+    )
   );
-  if (!match) {
-    console.error(
-      `Organization "${slug}" not found. Available: ${orgs.map((o) => o.slug ?? o.name).join(", ")}`
-    );
-    process.exit(1);
+  if (!containsPreservedPath) {
+    fs13.rmSync(directory, { recursive: true, force: true });
+    return true;
   }
-  const matchSlug = match.slug ?? match.name;
-  await setSelectedOrg(matchSlug, match._id, environment.name);
-  console.log(`Selected org: ${match.name} (${matchSlug})`);
+  const isPreservedPath = directoryPaths.some(
+    (directoryPath) => preservedPaths.some(
+      (preservedPath) => pathsAreSame(directoryPath, path28.resolve(preservedPath))
+    )
+  );
+  if (isPreservedPath) return true;
+  if (!directoryStats.isDirectory()) return false;
+  let entries;
+  try {
+    entries = fs13.readdirSync(directory);
+  } catch (error) {
+    if (error.code === "ENOENT") return true;
+    throw error;
+  }
+  let complete = true;
+  for (const entry of entries) {
+    const entryPath = path28.join(directory, entry);
+    if (!purgeDirectoryPreservingPaths(entryPath, preservedPaths, false)) {
+      complete = false;
+    }
+  }
+  return complete;
 }
-
-// src/commands/open.ts
-var DEFAULT_APP_BASE_URL = "https://app.fml.app";
-function appBaseUrl() {
-  const configured = process.env.FML_APP_URL?.trim();
-  return (configured || DEFAULT_APP_BASE_URL).replace(/\/+$/, "");
+function purgeDirectoryPreservingFiles(directory, preservedFiles) {
+  if (hasSymlinkedParentBelowTrustedAnchor(directory)) return false;
+  return purgeDirectoryPreservingPaths(
+    directory,
+    preservedFiles.flatMap(
+      (preservedFile) => resolvePreservedPaths(preservedFile)
+    ),
+    true
+  );
 }
-async function handleOpen(opts) {
-  const environment = getActiveEnv();
-  const api = await getAuthenticatedClient(environment);
-  if (!api) {
-    console.error("Not authenticated. Run `fml login` first.");
-    process.exit(1);
-  }
-  let slug;
+function finishCustomRootPurge(directory) {
+  const marker = managedDirectoryMarker(directory);
+  fs13.rmSync(marker, { force: true });
   try {
-    const orgs = await api.queryOrgs();
-    if (orgs.length === 0) {
-      console.error("No organizations found.");
-      process.exit(1);
+    fs13.rmdirSync(directory);
+  } catch (error) {
+    if (error.code === "ENOENT") return;
+    try {
+      fs13.writeFileSync(marker, FML_MANAGED_DIRECTORY_MARKER_CONTENT, {
+        encoding: "utf8",
+        flag: "wx",
+        mode: 384
+      });
+    } catch (markerError) {
+      if (markerError.code === "EEXIST" && hasManagedDirectoryMarker(directory)) {
+        throw error;
+      }
+      const removalMessage = error instanceof Error ? error.message : String(error);
+      const markerMessage = markerError instanceof Error ? markerError.message : String(markerError);
+      throw new Error(
+        `could not remove ${directory} (${removalMessage}) or restore its FML ownership marker (${markerMessage})`
+      );
     }
-    const selected = getSelectedOrg(environment.name);
-    const org = selected && orgs.find((candidate) => {
-      const candidateSlug = candidate.slug ?? candidate.name;
-      return candidateSlug === selected || candidate.name === selected;
-    }) || orgs[0];
-    slug = org.slug ?? org.name;
-  } catch {
-    console.error("Could not fetch organizations. Opening base URL.");
-    slug = "";
-  }
-  const baseUrl = appBaseUrl();
-  const url = slug ? `${baseUrl}/${slug}` : baseUrl;
-  if (opts.json) {
-    console.log(JSON.stringify({ url }));
-  } else {
-    const openBrowser = (await import("open")).default;
-    await openBrowser(url);
+    throw error;
   }
 }
-
-// src/commands/status.ts
-function formatBytes(bytes) {
-  if (bytes < 1024) return `${bytes} B`;
-  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KiB`;
-  if (bytes < 1024 * 1024 * 1024) {
-    return `${(bytes / (1024 * 1024)).toFixed(1)} MiB`;
-  }
-  return `${(bytes / (1024 * 1024 * 1024)).toFixed(2)} GiB`;
-}
-function hookSpoolStatus(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
-    return void 0;
-  }
-  const record = value;
-  const nonNegativeInteger = (field) => {
-    const candidate = record[field];
-    return typeof candidate === "number" && Number.isSafeInteger(candidate) && candidate >= 0 ? candidate : void 0;
-  };
-  const logicalBytes = nonNegativeInteger("logicalBytes");
-  const evictedRecords = nonNegativeInteger("evictedRecords");
-  const evictedBytes = nonNegativeInteger("evictedBytes");
-  const evictedPendingRecords = nonNegativeInteger("evictedPendingRecords");
-  const evictedQuarantinedRecords = nonNegativeInteger(
-    "evictedQuarantinedRecords"
+function cleanInstalledPluginScopes(paths) {
+  const installedPlugins = readJsonFile(paths.installedPluginsPath);
+  if (!installedPlugins) return;
+  const update = CLAUDE_PLUGIN_INSTALLER.removeInstalledPlugin(
+    installedPlugins,
+    CLAUDE_PLUGIN_INSTALLER.pluginId
   );
-  const maxBytes = record.maxBytes;
-  const quarantineMaxAgeMs = record.quarantineMaxAgeMs;
-  if (record.unit !== "logical_bytes" || logicalBytes === void 0 || evictedRecords === void 0 || evictedBytes === void 0 || evictedPendingRecords === void 0 || evictedQuarantinedRecords === void 0 || maxBytes !== null && (typeof maxBytes !== "number" || !Number.isSafeInteger(maxBytes) || maxBytes < 1)) {
-    return void 0;
+  if (!update.changed) return;
+  for (const settingsPath2 of CLAUDE_PLUGIN_INSTALLER.projectSettingsPaths(
+    installedPlugins,
+    CLAUDE_PLUGIN_INSTALLER.pluginId
+  )) {
+    removeEnabledPluginFromSettings(
+      settingsPath2,
+      CLAUDE_PLUGIN_INSTALLER.pluginId
+    );
   }
-  const lastEvictedAtMsValue = nonNegativeInteger("lastEvictedAtMs");
-  const lastEvictedAtMs = lastEvictedAtMsValue !== void 0 && lastEvictedAtMsValue <= 864e13 ? lastEvictedAtMsValue : void 0;
-  return {
-    logicalBytes,
-    maxBytes,
-    ...quarantineMaxAgeMs === null ? { quarantineMaxAgeMs: null } : typeof quarantineMaxAgeMs === "number" && Number.isSafeInteger(quarantineMaxAgeMs) && quarantineMaxAgeMs > 0 ? { quarantineMaxAgeMs } : {},
-    evictedRecords,
-    evictedBytes,
-    evictedPendingRecords,
-    evictedQuarantinedRecords,
-    ...lastEvictedAtMs === void 0 ? {} : { lastEvictedAtMs }
-  };
+  writeJsonFile(paths.installedPluginsPath, update.installedPlugins);
 }
-function otlpSpoolStatus(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
-    return void 0;
+function purgeWarning(roots) {
+  return `${PURGE_WARNING}
+Purge roots:
+${roots.map((root) => `  - ${root.directory}`).join("\n")}`;
+}
+async function confirmPurge(opts, roots) {
+  const warning = purgeWarning(roots);
+  if (opts.assumeYes) {
+    console.log(warning);
+    return true;
   }
-  const record = value;
-  const nonNegativeInteger = (field) => {
-    const candidate = record[field];
-    return typeof candidate === "number" && Number.isSafeInteger(candidate) && candidate >= 0 ? candidate : void 0;
-  };
-  const logicalBytes = nonNegativeInteger("logicalBytes");
-  const bodyBytes = nonNegativeInteger("bodyBytes");
-  const maxBytes = nonNegativeInteger("maxBytes");
-  const droppedRecords = nonNegativeInteger("droppedRecords");
-  const droppedLogicalBytes = nonNegativeInteger("droppedLogicalBytes");
-  const droppedBodyBytes = nonNegativeInteger("droppedBodyBytes");
-  if (record.unit !== "logical_bytes" || logicalBytes === void 0 || bodyBytes === void 0 || maxBytes === void 0 || maxBytes < 1 || droppedRecords === void 0 || droppedLogicalBytes === void 0 || droppedBodyBytes === void 0 || bodyBytes > logicalBytes || droppedBodyBytes > droppedLogicalBytes) {
-    return void 0;
+  const input = opts.input ?? process.stdin;
+  if (input.isTTY !== true) {
+    console.error(
+      `${warning}
+Re-run with --yes to confirm in a non-interactive session.`
+    );
+    return false;
   }
-  return {
-    logicalBytes,
-    bodyBytes,
-    maxBytes,
-    droppedRecords,
-    droppedLogicalBytes,
-    droppedBodyBytes,
-    ...typeof record.lastDroppedAtMs === "number" && Number.isSafeInteger(record.lastDroppedAtMs) && record.lastDroppedAtMs >= 0 && Number.isFinite(new Date(record.lastDroppedAtMs).getTime()) ? { lastDroppedAtMs: record.lastDroppedAtMs } : {},
-    ...typeof record.lastDropReason === "string" ? { lastDropReason: record.lastDropReason } : {}
-  };
-}
-function observerQueueStatus(value, key) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) return null;
-  const queue = value[key];
-  if (!queue || typeof queue !== "object" || Array.isArray(queue)) return null;
-  const record = queue;
-  if (typeof record.phase !== "string" || typeof record.pending !== "number" || !Number.isSafeInteger(record.pending) || record.pending < 0) {
-    return null;
+  const rl = readline.createInterface({
+    input,
+    output: opts.output ?? process.stdout
+  });
+  try {
+    const closed = new Promise((resolve) => {
+      rl.once("close", () => resolve(null));
+    });
+    const answer = await Promise.race([
+      rl.question(`${warning}
+Type y to continue: `).catch(() => null),
+      closed
+    ]);
+    if (answer !== null && answer.trim().toLowerCase() === "y") return true;
+  } finally {
+    rl.close();
   }
-  return {
-    phase: record.phase,
-    pending: record.pending,
-    ...typeof record.quarantined === "number" && Number.isSafeInteger(record.quarantined) && record.quarantined >= 0 ? { quarantined: record.quarantined } : {},
-    ...typeof record.lastError === "string" ? { lastError: record.lastError } : {},
-    ...typeof record.lastWarning === "string" ? { lastWarning: record.lastWarning } : {},
-    ...typeof record.nextAttemptAtMs === "number" && Number.isSafeInteger(record.nextAttemptAtMs) && record.nextAttemptAtMs >= 0 && Number.isFinite(new Date(record.nextAttemptAtMs).getTime()) ? { nextAttemptAtMs: record.nextAttemptAtMs } : {}
-  };
+  console.error("Uninstall canceled; nothing was removed.");
+  return false;
 }
-function hookStatus(value) {
-  const status = observerQueueStatus(value, "hooks");
-  if (!status || !value || typeof value !== "object" || Array.isArray(value)) {
-    return null;
+function refuseUnsafePurge(roots) {
+  const unsafeRoots = unsafePurgeRoots(roots);
+  if (unsafeRoots.length === 0) return false;
+  console.error("Refusing to purge unsafe FML directories:");
+  for (const root of unsafeRoots) {
+    console.error(`  - ${root.directory}: ${root.reason}`);
   }
-  const hooks = value.hooks;
-  if (!hooks || typeof hooks !== "object" || Array.isArray(hooks)) return null;
-  const record = hooks;
-  const spool = hookSpoolStatus(record.spool);
-  return {
-    ...status,
-    ...typeof record.rejected === "number" && Number.isSafeInteger(record.rejected) && record.rejected >= 0 ? { rejected: record.rejected } : {},
-    ...typeof record.lastRejectedReason === "string" ? { lastRejectedReason: record.lastRejectedReason } : {},
-    ...typeof record.lastRejectedTarget === "string" ? { lastRejectedTarget: record.lastRejectedTarget } : {},
-    ...spool === void 0 ? {} : { spool }
-  };
+  console.error(
+    "Inspect and remove those roots manually, or reconfigure FML to fresh dedicated empty data, state, log, and observer directories and run `fml install` before retrying."
+  );
+  process.exitCode = 1;
+  return true;
 }
-function otlpStatus(value) {
-  const status = observerQueueStatus(value, "otlp");
-  if (!status || !value || typeof value !== "object" || Array.isArray(value)) {
-    return null;
+async function handleUninstall(opts) {
+  const purgeRoots = opts.purge ? configuredManagedRoots() : [];
+  if (opts.purge) {
+    if (refuseUnsafePurge(purgeRoots)) return;
+    if (!await confirmPurge(opts, purgeRoots)) {
+      process.exitCode = 1;
+      return;
+    }
+    for (const root of purgeRoots) {
+      if (!fs13.existsSync(root.directory) && pathContains(root.directory, FML_OBSERVER_DIR)) {
+        prepareManagedDirectory(root);
+      }
+    }
+    if (refuseUnsafePurge(purgeRoots)) return;
   }
-  const otlp = value.otlp;
-  if (!otlp || typeof otlp !== "object" || Array.isArray(otlp)) return null;
-  const spool = otlpSpoolStatus(otlp.spool);
-  return {
-    ...status,
-    ...spool === void 0 ? {} : { spool }
-  };
-}
-async function handleStatus() {
-  const { name, convexUrl } = getActiveEnv();
-  console.log(`Environment: ${name}`);
-  console.log(`  Convex: ${convexUrl ?? "not configured"}
-`);
-  const tokens = readTokens(name);
-  if (!tokens) {
-    console.log("Authentication:");
-    console.log("  Not authenticated. Run `fml login` to sign in.");
-  } else {
-    const tokenValid = await getValidToken({ env: name });
-    console.log("Authentication:");
-    if (tokens.tokenType === "service" && tokens.user.id === SERVICE_TOKEN_LOGIN_USER_ID) {
-      console.log("  Auth:  service token");
-    } else {
-      console.log(`  User:  ${tokens.user.name} (${tokens.user.email})`);
+  console.log("Removing FML integrations...\n");
+  const otelDestination = readLocalObserverOtelDestination({
+    endpointFile: FML_OBSERVER_ENDPOINT_FILE,
+    authTokenFile: FML_OBSERVER_AUTH_TOKEN_FILE
+  });
+  let observer;
+  try {
+    observer = await stopObserver();
+  } catch (error) {
+    console.error(error instanceof Error ? error.message : String(error));
+    console.error(
+      "Could not safely stop the FML observer; uninstall was aborted. Repair the reported files and rerun `fml uninstall`."
+    );
+    process.exitCode = 1;
+    return;
+  }
+  if (observer.status === "permission_denied" || observer.status === "foreign_listener" || observer.status === "ambiguous_live_process" || observer.status === "unresponsive" || observer.status === "signal_sent") {
+    console.error(
+      `Could not safely stop FML observer PID ${observer.pid}; uninstall was aborted.`
+    );
+    process.exitCode = 1;
+    return;
+  }
+  let hookCapturePaused = tryDisableHookCapture();
+  createRawArtifactSync({ stateDir: FML_OBSERVER_DIR }).setEnabled(false);
+  const paths = CLAUDE_PLUGIN_INSTALLER.resolvePaths({
+    env: process.env,
+    homeDir: os7.homedir()
+  });
+  const claudeBin = resolveBin("claude");
+  if (claudeBin) {
+    try {
+      const command = CLAUDE_PLUGIN_INSTALLER.uninstallCommand;
+      execBinSync(claudeBin, [...command.args], {
+        timeout: command.timeoutMs
+      });
+    } catch {
     }
-    console.log(
-      `  Token: ${tokenValid ? "valid" : "expired (needs refresh/re-login)"}`
+  }
+  cleanInstalledPluginScopes(paths);
+  const settings = readJsonFile(paths.settingsPath);
+  if (settings) {
+    const marketplace2 = readJsonFile(paths.marketplaceManifestPath);
+    const keepLocalMarketplace = CLAUDE_PLUGIN_INSTALLER.hasOtherLocalMarketplacePlugins(
+      settings,
+      marketplace2
     );
-    console.log(
-      `  Org:   ${tokens.orgSlug ?? "(none \u2014 run `fml org <slug>`)"}`
+    writeJsonFile(
+      paths.settingsPath,
+      CLAUDE_PLUGIN_INSTALLER.disableInSettings(settings, keepLocalMarketplace)
     );
   }
-  const syncStatus = createRawArtifactSync({
-    stateDir: FML_OBSERVER_DIR
-  }).status();
-  console.log("\nRaw artifact sync:");
-  console.log(`  Enabled:   ${syncStatus.settings.enabled ? "yes" : "no"}`);
-  console.log(`  Tracked:   ${syncStatus.queue.tracked}`);
-  console.log(`  Pending:   ${syncStatus.queue.pending}`);
-  console.log(`  Raw work:  ${syncStatus.queue.rawPending}`);
-  console.log(`  Metadata:  ${syncStatus.queue.metadataPending}`);
-  console.log(`  Uploaded:  ${syncStatus.queue.uploaded}`);
-  console.log(`  Failed:    ${syncStatus.queue.failed}`);
-  console.log(
-    `  Watermark: ${formatBytes(syncStatus.queue.uploadedBytes)} / ${formatBytes(syncStatus.queue.totalBytes)}`
-  );
-  console.log(`  Remaining: ${formatBytes(syncStatus.queue.remainingBytes)}`);
-  const observer = await readObserverRuntimeStatus();
-  const protectedStatus = observer.healthy ? await readObserverProtectedStatus() : null;
-  const observerState = observer.stateStatus.state;
-  console.log("\nLocal observer:");
-  console.log(
-    `  Status: ${observer.healthy ? "running" : observer.running ? "unhealthy" : "stopped"}`
-  );
-  if (observerState) {
-    console.log(`  PID:    ${observerState.pid}`);
-    console.log(`  Phase:  ${observerState.phase}`);
-    if (observerState.lastOutcome) {
-      console.log(`  Last:   ${observerState.lastOutcome}`);
+  let skillsRemoved = true;
+  try {
+    for (const result of removeManagedAgentSkills(resolvePackageRoot())) {
+      if (result.status !== "preserved" && !result.reason) continue;
+      skillsRemoved = false;
+      const targets = result.displayNames.join(", ");
+      console.warn(
+        `Warning: Preserved ${result.destinationPath} for ${targets}: ${result.reason ?? "cleanup could not be verified"}`
+      );
     }
+  } catch (error) {
+    skillsRemoved = false;
+    const message = error instanceof Error ? error.message : String(error);
+    console.warn(
+      `Warning: Agent skill cleanup could not be completed: ${message}`
+    );
   }
-  console.log(`  Log:    ${observer.logFile}`);
-  const hooks = hookStatus(protectedStatus);
-  const hookInbox = readHookInboxStatus();
-  console.log("\nHook capture:");
-  if (!hooks) {
-    console.log(`  Status:  ${observer.healthy ? "unavailable" : "stopped"}`);
-  } else {
-    console.log(`  Status:  ${hooks.phase}`);
-    console.log(`  Pending: ${hooks.pending}`);
-    if (hooks.quarantined && hooks.quarantined > 0) {
-      console.log(`  Quarantined: ${hooks.quarantined}`);
-    }
-    if (hooks.rejected && hooks.rejected > 0) {
-      console.log(`  Rejected: ${hooks.rejected}`);
-      if (hooks.lastRejectedReason) {
-        console.log(
-          `  Last rejection: ${hooks.lastRejectedReason}${hooks.lastRejectedTarget ? ` (${hooks.lastRejectedTarget})` : ""}`
-        );
-      }
+  let integrationsRemoved = true;
+  try {
+    const piPaths = PI_EXTENSION_INSTALLER.resolvePaths({
+      env: process.env,
+      homeDir: os7.homedir(),
+      packageRoot: resolvePackageRoot(),
+      platform: process.platform
+    });
+    const piResult = PI_EXTENSION_INSTALLER.uninstall(piPaths);
+    if (piResult.status === "preserved") {
+      integrationsRemoved = false;
+      process.exitCode = 1;
+      console.warn(
+        `Warning: Preserved ${piResult.destinationPath} for Pi: ${piResult.reason}`
+      );
     }
-    if (hooks.spool) {
-      console.log(
-        `  Spool:   ${formatBytes(hooks.spool.logicalBytes)} / ${hooks.spool.maxBytes === null ? "unbounded" : formatBytes(hooks.spool.maxBytes)} (logical content)`
+    if (piResult.legacyRemoved) {
+      console.log("Removed the legacy Panopticon Pi extension");
+    } else if (piResult.legacyPreserved) {
+      integrationsRemoved = false;
+      process.exitCode = 1;
+      console.warn(
+        `Warning: Preserved unrecognized Pi extension ${piPaths.legacyDestinationPath}; inspect and remove it if it belongs to Panopticon`
       );
-      if (hooks.spool.quarantineMaxAgeMs !== void 0) {
-        console.log(
-          `  Quarantine retention: ${hooks.spool.quarantineMaxAgeMs === null ? "unbounded" : `${Math.round(hooks.spool.quarantineMaxAgeMs / 864e5)} day(s)`}`
-        );
-      }
-      if (hooks.spool.evictedRecords > 0) {
-        console.log(
-          `  Evicted: ${hooks.spool.evictedRecords} record(s), ${formatBytes(hooks.spool.evictedBytes)} (${hooks.spool.evictedQuarantinedRecords} quarantined, ${hooks.spool.evictedPendingRecords} pending)`
-        );
-        if (hooks.spool.lastEvictedAtMs !== void 0) {
-          console.log(
-            `  Last eviction: ${new Date(hooks.spool.lastEvictedAtMs).toISOString()}`
-          );
-        }
-      }
     }
-    if (hooks.lastError) console.log(`  Error:   ${hooks.lastError}`);
+  } catch (error) {
+    integrationsRemoved = false;
+    process.exitCode = 1;
+    const message = error instanceof Error ? error.message : String(error);
+    console.warn(
+      `Warning: Pi extension cleanup could not be completed: ${message}`
+    );
   }
-  if (hookInbox.unreadable) {
-    console.log("  Inbox:   unavailable");
-  } else {
-    console.log(
-      `  Inbox:   ${hookInbox.pendingEntries} pending (${formatBytes(hookInbox.pendingBytes)})`
+  if (removeMarketplaceLink(paths.marketplaceLinkPath) === "preserved") {
+    integrationsRemoved = false;
+    console.warn(
+      `Warning: Preserved non-symlink marketplace path ${paths.marketplaceLinkPath}`
     );
-    console.log(
-      `  Inbox limits: ${hookInbox.maxBytes === null ? "unbounded bytes" : formatBytes(hookInbox.maxBytes)}, ${hookInbox.maxEntries === null ? "unbounded entries" : `${hookInbox.maxEntries} entries`}`
+  }
+  const marketplace = readJsonFile(paths.marketplaceManifestPath);
+  if (marketplace && Array.isArray(marketplace.plugins)) {
+    writeJsonFile(
+      paths.marketplaceManifestPath,
+      CLAUDE_PLUGIN_INSTALLER.removeMarketplaceEntry(
+        marketplace,
+        CLAUDE_PLUGIN_INSTALLER.pluginName
+      )
     );
-    if (hookInbox.capacityRejectedEntries > 0) {
-      console.log(
-        `  Inbox capacity refusals: ${hookInbox.capacityRejectedEntries} record(s), ${formatBytes(hookInbox.capacityRejectedBytes)}`
-      );
-      if (hookInbox.lastCapacityRejectedAtMs !== void 0) {
-        console.log(
-          `  Last inbox refusal: ${new Date(hookInbox.lastCapacityRejectedAtMs).toISOString()}${hookInbox.lastCapacityRejectionReason ? ` (${hookInbox.lastCapacityRejectionReason})` : ""}`
-        );
-      }
-    }
-    if (hookInbox.retiredEntries > 0) {
-      console.log(
-        `  Inbox retired: ${hookInbox.retiredEntries} record(s), ${formatBytes(hookInbox.retiredBytes)}`
+  }
+  fs13.rmSync(paths.pluginCacheDir, { recursive: true, force: true });
+  const reportIntegrationWarning = (message) => {
+    integrationsRemoved = false;
+    console.warn(message.replace(/^warn:/u, "Warning:"));
+  };
+  let hookRemovalComplete = true;
+  removeFmlHooks({
+    onFailure: (target2) => {
+      hookRemovalComplete = false;
+      reportIntegrationWarning(
+        `Warning: Preserved FML hook registration at ${target2.configPath}: ${target2.reason}`
       );
     }
+  });
+  if (!hookRemovalComplete) {
+    integrationsRemoved = false;
+    process.exitCode = 1;
+    console.warn(
+      "Warning: Some FML hook registrations were preserved; repair the paths reported above and rerun `fml uninstall`."
+    );
   }
-  const otlp = otlpStatus(protectedStatus);
-  console.log("\nNative OpenTelemetry:");
-  if (!otlp) {
-    console.log(`  Status:  ${observer.healthy ? "unavailable" : "stopped"}`);
-  } else {
-    console.log(`  Status:  ${otlp.phase}`);
-    console.log(`  Pending: ${otlp.pending}`);
-    if (otlp.spool) {
-      const usedPercent = otlp.spool.logicalBytes / otlp.spool.maxBytes * 100;
-      console.log(
-        `  Spool:   ${formatBytes(otlp.spool.logicalBytes)} / ${formatBytes(otlp.spool.maxBytes)} (${usedPercent.toFixed(1)}%; ${formatBytes(otlp.spool.bodyBytes)} encoded bodies)`
-      );
-      if (usedPercent >= 80) {
-        console.log(
-          `  Attention: the oldest pending telemetry is dropped when the spool reaches ${formatBytes(otlp.spool.maxBytes)}`
-        );
-      }
-      if (otlp.spool.droppedRecords > 0) {
-        console.log(
-          `  Dropped: ${otlp.spool.droppedRecords} envelope(s), ${formatBytes(otlp.spool.droppedLogicalBytes)} logical; ${formatBytes(otlp.spool.droppedBodyBytes)} encoded bodies`
+  removeFmlOtel(otelDestination, { warn: reportIntegrationWarning });
+  if (!otelDestination) {
+    integrationsRemoved = false;
+    console.warn(
+      "Warning: The local observer endpoint or token is unavailable; only recorded OpenTelemetry profiles could be cleaned"
+    );
+  }
+  removeFmlDirectMcp("all", {
+    log: () => void 0,
+    warn: reportIntegrationWarning
+  });
+  let purgeComplete = true;
+  if (opts.purge) {
+    if (refuseUnsafePurge(purgeRoots)) {
+      purgeComplete = false;
+    } else {
+      for (const root of purgeRoots) {
+        if (refuseUnsafePurge([root])) {
+          purgeComplete = false;
+          continue;
+        }
+        const containsObserverDirectory = pathContains(
+          root.directory,
+          FML_OBSERVER_DIR
         );
-        if (otlp.spool.lastDropReason) {
-          console.log(
-            `  Last drop: ${otlp.spool.lastDropReason}${otlp.spool.lastDroppedAtMs === void 0 ? "" : ` at ${new Date(otlp.spool.lastDroppedAtMs).toISOString()}`}`
+        const customManagedRoot = !root.nativeDefault;
+        try {
+          const purged = purgeDirectoryPreservingFiles(root.directory, [
+            ...customManagedRoot ? [managedDirectoryMarker(root.directory)] : [],
+            ...containsObserverDirectory && hookCapturePaused ? [FML_HOOK_CAPTURE_DISABLED_FILE] : []
+          ]);
+          if (!purged) {
+            purgeComplete = false;
+            console.warn(
+              `Warning: Preserved ${root.directory}: a symbolic link prevents a complete safe purge`
+            );
+            continue;
+          }
+          if (customManagedRoot && !containsObserverDirectory) {
+            finishCustomRootPurge(root.directory);
+          }
+        } catch (error) {
+          purgeComplete = false;
+          const message = error instanceof Error ? error.message : String(error);
+          console.warn(
+            `Warning: Preserved ${root.directory}: the safe purge was incomplete: ${message}`
           );
         }
       }
     }
-    if (otlp.lastError) console.log(`  Error:   ${otlp.lastError}`);
-    if (otlp.lastWarning) console.log(`  Warning: ${otlp.lastWarning}`);
-    if (otlp.nextAttemptAtMs !== void 0) {
-      console.log(
-        `  Next attempt: ${new Date(otlp.nextAttemptAtMs).toISOString()}`
-      );
-    }
+    if (!hookCapturePaused) hookCapturePaused = tryDisableHookCapture();
+  }
+  if (!hookCapturePaused) {
+    process.exitCode = 1;
+    integrationsRemoved = false;
+    console.warn(
+      "Warning: FML cleanup is incomplete; cached agent processes may keep invoking hooks until they exit."
+    );
+  }
+  if (opts.purge && !purgeComplete) {
+    process.exitCode = 1;
+    console.warn(
+      "Warning: Some local data remains because a purge target could not be removed safely. Repair the reported path and rerun `fml uninstall --purge`."
+    );
+  }
+  if (skillsRemoved) {
+    console.log("\u2713  Agent skills removed");
+  } else {
+    console.warn(
+      "Warning: Agent skills were not fully removed. See warnings above."
+    );
+  }
+  if (integrationsRemoved) {
+    console.log("\u2713  Coding-agent integrations removed");
+  } else {
+    console.warn(
+      "Warning: Coding-agent integrations were not fully removed. See warnings above."
+    );
+  }
+  if (!opts.purge) {
+    console.log("\u2713  Local data preserved");
+  } else if (purgeComplete && hookCapturePaused) {
+    console.log("\u2713  Local data deleted");
+  } else {
+    console.warn(
+      "Warning: Local data was not fully deleted. See warnings above."
+    );
+  }
+  const removalComplete = skillsRemoved && integrationsRemoved && (!opts.purge || purgeComplete && hookCapturePaused);
+  if (removalComplete) {
+    console.log("\nFML integrations removed.");
+  } else {
+    console.warn(
+      "FML integration removal is incomplete; review the warnings above."
+    );
   }
 }
 
-// src/commands/sync.ts
-import { statSync } from "fs";
-function rawSync() {
-  return createCliRawSync();
-}
-function formatBytes2(bytes) {
-  if (bytes < 1024) return `${bytes} B`;
-  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KiB`;
-  if (bytes < 1024 * 1024 * 1024) {
-    return `${(bytes / (1024 * 1024)).toFixed(1)} MiB`;
+// src/commands/update.ts
+var SEMVER_PATTERN = /^(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/;
+function getCurrentVersion() {
+  return true ? "0.8.0-rc.3+246af775" : "unknown";
+}
+function resolveUpdateChannel(version) {
+  const match = SEMVER_PATTERN.exec(version);
+  if (!match) return "latest";
+  const prerelease = match[1];
+  if (!prerelease) return "latest";
+  return prerelease.split(".").every((identifier) => {
+    return !(identifier.length > 1 && identifier.startsWith("0") && /^[0-9]+$/u.test(identifier));
+  }) ? "next" : "latest";
+}
+function resolveUpdateTarget(version) {
+  return `@fml-inc/fml@${resolveUpdateChannel(version)}`;
+}
+function createUpdateEnvironment(env) {
+  const updateEnv = { ...env };
+  for (const key of Object.keys(updateEnv)) {
+    if (key.toLowerCase() === "npm_config_registry") {
+      delete updateEnv[key];
+    }
+  }
+  return updateEnv;
+}
+function formatUpdateError(err) {
+  if (!(err instanceof Error)) return String(err);
+  const stderr = err.stderr;
+  if (typeof stderr === "string") return stderr;
+  if (Buffer.isBuffer(stderr)) return stderr.toString();
+  return err.message;
+}
+async function handleUpdate(overrides = {}) {
+  const dependencies = {
+    currentVersion: getCurrentVersion(),
+    env: process.env,
+    resolveBin,
+    execBinSync,
+    captureException: Sentry.captureException,
+    log: console.log,
+    error: console.error,
+    exit: process.exit,
+    ...overrides
+  };
+  const channel = resolveUpdateChannel(dependencies.currentVersion);
+  const target2 = resolveUpdateTarget(dependencies.currentVersion);
+  dependencies.log(`Current version: ${dependencies.currentVersion}`);
+  dependencies.log(`Updating FML from the ${channel} channel...
+`);
+  try {
+    const npm = dependencies.resolveBin("npm");
+    if (!npm) throw new Error("npm was not found on PATH");
+    dependencies.execBinSync(npm, ["install", "--global", target2], {
+      timeout: 12e4,
+      env: createUpdateEnvironment(dependencies.env)
+    });
+    dependencies.log(`
+FML update complete (${channel} channel).`);
+    dependencies.log("Run `fml setup` to refresh integrations.");
+  } catch (err) {
+    dependencies.captureException(err);
+    dependencies.error("Update failed:", formatUpdateError(err));
+    dependencies.exit(1);
   }
-  return `${(bytes / (1024 * 1024 * 1024)).toFixed(2)} GiB`;
-}
-function formatDuration(durationMs) {
-  if (durationMs < 1e3) return `${Math.round(durationMs)} ms`;
-  return `${(durationMs / 1e3).toFixed(2)} s`;
 }
-function printRepositoryResolution(metrics) {
-  if (metrics.attempted === 0 && metrics.budgetSkipped === 0) return;
-  console.log(
-    `  Repo checks:      ${metrics.attempted} (${metrics.resolved} resolved, ${metrics.unresolved} unresolved, ${metrics.cacheHits} cached, ${metrics.budgetSkipped} skipped by budget)`
-  );
+
+// src/commands/logout.ts
+async function handleLogout() {
+  const { name } = getActiveEnv();
+  await clearStoredCredentials(name);
   console.log(
-    `  Repo check time:  ${formatDuration(metrics.elapsedMs)} total, ${formatDuration(metrics.slowestMs)} slowest`
+    `Logged out. Stored credentials for the ${name} environment were cleared.`
   );
 }
-function writeJson(value) {
-  console.log(JSON.stringify(value, null, 2));
-}
-function warnRetainedLegacyDatabase(retained) {
-  if (retained.pendingEvents !== null && retained.pendingHookEvents !== null && retained.pendingOtlpEnvelopes !== null) {
-    console.warn(
-      `Retained legacy observer database at ${retained.databaseFile} with ${retained.pendingEvents} pending rows (${retained.pendingHookEvents} hook, ${retained.pendingOtlpEnvelopes} OTLP); FML will not sync those rows automatically.`
-    );
-    return;
+
+// src/commands/org.ts
+async function handleOrg(slug) {
+  const environment = getActiveEnv();
+  const token = await getValidToken({ env: environment.name });
+  if (!token) {
+    console.error("Not logged in. Run `fml login` first.");
+    process.exit(1);
   }
-  console.warn(
-    `Retained legacy observer database at ${retained.databaseFile}; pending row count unavailable. FML will not sync that database automatically.`
-  );
-}
-function printStatus(status) {
-  const { queue } = status;
-  console.log(
-    `Raw artifact sync: ${status.settings.enabled ? "enabled" : "disabled"}`
-  );
-  console.log(`  State:     ${FML_OBSERVER_DIR}`);
-  console.log(`  Tracked:   ${queue.tracked}`);
-  console.log(`  Pending:   ${queue.pending}`);
-  console.log(`  Raw work:  ${queue.rawPending}`);
-  console.log(`  Metadata:  ${queue.metadataPending}`);
-  console.log(`  Uploaded:  ${queue.uploaded}`);
-  console.log(`  Failed:    ${queue.failed}`);
-  console.log(
-    `  Watermark: ${formatBytes2(queue.uploadedBytes)} / ${formatBytes2(queue.totalBytes)}`
-  );
-  console.log(`  Remaining: ${formatBytes2(queue.remainingBytes)}`);
-}
-function syncExitCode(result) {
-  if (result.outcome === "failed" || result.outcome === "exhausted") return 1;
-  if (result.outcome === "busy") return 1;
-  return 0;
-}
-async function handleSyncRun(opts = {}) {
-  const sync2 = rawSync();
-  if (!sync2.getSettings().enabled) {
-    const result2 = {
-      ok: true,
-      outcome: "disabled",
-      status: sync2.status()
-    };
-    if (opts.json) writeJson(result2);
-    else printStatus(result2.status);
-    return;
+  const api = createFmlClient(token, {
+    envName: environment.name,
+    siteUrl: getSiteUrlForConvexUrl(environment.convexUrl)
+  });
+  const orgs = await api.queryOrgs();
+  if (orgs.length === 0) {
+    console.error("No organizations found.");
+    process.exit(1);
   }
-  if (opts.dryRun) {
-    const discovery = sync2.discover();
-    const bySource = {};
-    let totalBytes = 0;
-    for (const candidate of discovery.candidates) {
-      bySource[candidate.source] = (bySource[candidate.source] ?? 0) + 1;
-      try {
-        totalBytes += statSync(candidate.sourcePath).size;
-      } catch {
-      }
+  const current = getSelectedOrg(environment.name);
+  const currentId = getSelectedOrgId(environment.name);
+  if (!slug) {
+    console.log("Organizations:\n");
+    for (const org of orgs) {
+      const orgSlug = org.slug ?? org.name;
+      const marker = org._id === currentId || !currentId && orgSlug === current ? " (selected)" : "";
+      console.log(`  ${orgSlug}${marker}`);
     }
-    const result2 = {
-      ok: true,
-      dryRun: true,
-      targetUrl: getSiteUrl(),
-      discovered: {
-        count: discovery.candidates.length,
-        totalBytes,
-        bySource
-      },
-      repositoryResolution: discovery.repositoryResolution,
-      oversized: discovery.oversized,
-      status: sync2.status()
-    };
-    if (opts.json) writeJson(result2);
-    else {
-      console.log("FML raw artifact sync dry-run");
-      console.log(`  Target:     ${result2.targetUrl}`);
-      console.log(`  Discovered: ${result2.discovered.count}`);
-      console.log(`  Bytes:      ${formatBytes2(result2.discovered.totalBytes)}`);
-      for (const [source, count] of Object.entries(bySource).sort()) {
-        console.log(`    ${source}: ${count}`);
-      }
-      printRepositoryResolution(discovery.repositoryResolution);
-      console.log(`  Oversized:  ${discovery.oversized.length}`);
-      if (discovery.compressedArtifactsUnsupportedReason) {
-        console.log(
-          `  Compressed: skipped \u2014 ${discovery.compressedArtifactsUnsupportedReason}`
-        );
-      }
+    if (!currentId && !current) {
+      console.log("\nNo org selected. Run `fml org <slug>` to select one.");
     }
     return;
   }
-  const attempt = await runRawSyncOnce();
-  if (attempt.kind === "unauthenticated") {
-    console.error("Raw artifact sync requires an FML login.");
-    console.error("Run `fml login` or set FML_TOKEN.");
-    process.exitCode = 1;
-    return;
+  const match = orgs.find(
+    (o) => (o.slug ?? o.name) === slug || o.name === slug
+  );
+  if (!match) {
+    console.error(
+      `Organization "${slug}" not found. Available: ${orgs.map((o) => o.slug ?? o.name).join(", ")}`
+    );
+    process.exit(1);
   }
-  if (attempt.kind === "disabled") {
-    if (opts.json) {
-      writeJson({ ok: true, outcome: "disabled", status: attempt.status });
-    } else {
-      printStatus(attempt.status);
+  const matchSlug = match.slug ?? match.name;
+  await setSelectedOrg(matchSlug, match._id, environment.name);
+  console.log(`Selected org: ${match.name} (${matchSlug})`);
+}
+
+// src/commands/open.ts
+var DEFAULT_APP_BASE_URL = "https://app.fml.inc";
+function appBaseUrl() {
+  const configured = process.env.FML_APP_URL?.trim();
+  return (configured || DEFAULT_APP_BASE_URL).replace(/\/+$/, "");
+}
+async function handleOpen(opts) {
+  const environment = getActiveEnv();
+  const api = await getAuthenticatedClient(environment);
+  if (!api) {
+    console.error("Not signed in. Run `fml login` first.");
+    process.exit(1);
+  }
+  let slug;
+  try {
+    const orgs = await api.queryOrgs();
+    if (orgs.length === 0) {
+      console.error("No organizations are available for this account.");
+      process.exit(1);
     }
-    return;
+    const selected = getSelectedOrg(environment.name);
+    const org = selected && orgs.find((candidate) => {
+      const candidateSlug = candidate.slug ?? candidate.name;
+      return candidateSlug === selected || candidate.name === selected;
+    }) || orgs[0];
+    slug = org.slug ?? org.name;
+  } catch {
+    console.error(
+      "Could not load your organizations. Opening the FML dashboard."
+    );
+    slug = "";
   }
-  const { result, targetUrl } = attempt;
+  const baseUrl = appBaseUrl();
+  const url = slug ? `${baseUrl}/${slug}` : baseUrl;
   if (opts.json) {
-    writeJson({ ok: syncExitCode(result) === 0, targetUrl, result });
+    console.log(JSON.stringify({ url }));
   } else {
-    console.log("FML raw artifact sync");
-    console.log(`  Target:          ${targetUrl}`);
-    console.log(`  Outcome:         ${result.outcome}`);
-    console.log(`  Sync passes:     ${result.syncPasses}`);
-    console.log(`  Discovered:      ${result.discovery.candidates.length}`);
-    if (result.discovery.compressedArtifactsUnsupportedReason) {
-      console.log(
-        `  Compressed:      skipped \u2014 ${result.discovery.compressedArtifactsUnsupportedReason}`
-      );
+    const openBrowser = (await import("open")).default;
+    await openBrowser(url);
+  }
+}
+
+// src/commands/status.ts
+function formatBytes2(bytes) {
+  if (bytes < 1024) return `${bytes} B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KiB`;
+  if (bytes < 1024 * 1024 * 1024) {
+    return `${(bytes / (1024 * 1024)).toFixed(1)} MiB`;
+  }
+  return `${(bytes / (1024 * 1024 * 1024)).toFixed(2)} GiB`;
+}
+function hookSpoolStatus(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return void 0;
+  }
+  const record = value;
+  const nonNegativeInteger = (field) => {
+    const candidate = record[field];
+    return typeof candidate === "number" && Number.isSafeInteger(candidate) && candidate >= 0 ? candidate : void 0;
+  };
+  const logicalBytes = nonNegativeInteger("logicalBytes");
+  const evictedRecords = nonNegativeInteger("evictedRecords");
+  const evictedBytes = nonNegativeInteger("evictedBytes");
+  const evictedPendingRecords = nonNegativeInteger("evictedPendingRecords");
+  const evictedQuarantinedRecords = nonNegativeInteger(
+    "evictedQuarantinedRecords"
+  );
+  const maxBytes = record.maxBytes;
+  const quarantineMaxAgeMs = record.quarantineMaxAgeMs;
+  if (record.unit !== "logical_bytes" || logicalBytes === void 0 || evictedRecords === void 0 || evictedBytes === void 0 || evictedPendingRecords === void 0 || evictedQuarantinedRecords === void 0 || maxBytes !== null && (typeof maxBytes !== "number" || !Number.isSafeInteger(maxBytes) || maxBytes < 1)) {
+    return void 0;
+  }
+  const lastEvictedAtMsValue = nonNegativeInteger("lastEvictedAtMs");
+  const lastEvictedAtMs = lastEvictedAtMsValue !== void 0 && lastEvictedAtMsValue <= 864e13 ? lastEvictedAtMsValue : void 0;
+  return {
+    logicalBytes,
+    maxBytes,
+    ...quarantineMaxAgeMs === null ? { quarantineMaxAgeMs: null } : typeof quarantineMaxAgeMs === "number" && Number.isSafeInteger(quarantineMaxAgeMs) && quarantineMaxAgeMs > 0 ? { quarantineMaxAgeMs } : {},
+    evictedRecords,
+    evictedBytes,
+    evictedPendingRecords,
+    evictedQuarantinedRecords,
+    ...lastEvictedAtMs === void 0 ? {} : { lastEvictedAtMs }
+  };
+}
+function otlpSpoolStatus(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return void 0;
+  }
+  const record = value;
+  const nonNegativeInteger = (field) => {
+    const candidate = record[field];
+    return typeof candidate === "number" && Number.isSafeInteger(candidate) && candidate >= 0 ? candidate : void 0;
+  };
+  const logicalBytes = nonNegativeInteger("logicalBytes");
+  const bodyBytes = nonNegativeInteger("bodyBytes");
+  const maxBytes = nonNegativeInteger("maxBytes");
+  const droppedRecords = nonNegativeInteger("droppedRecords");
+  const droppedLogicalBytes = nonNegativeInteger("droppedLogicalBytes");
+  const droppedBodyBytes = nonNegativeInteger("droppedBodyBytes");
+  if (record.unit !== "logical_bytes" || logicalBytes === void 0 || bodyBytes === void 0 || maxBytes === void 0 || maxBytes < 1 || droppedRecords === void 0 || droppedLogicalBytes === void 0 || droppedBodyBytes === void 0 || bodyBytes > logicalBytes || droppedBodyBytes > droppedLogicalBytes) {
+    return void 0;
+  }
+  return {
+    logicalBytes,
+    bodyBytes,
+    maxBytes,
+    droppedRecords,
+    droppedLogicalBytes,
+    droppedBodyBytes,
+    ...typeof record.lastDroppedAtMs === "number" && Number.isSafeInteger(record.lastDroppedAtMs) && record.lastDroppedAtMs >= 0 && Number.isFinite(new Date(record.lastDroppedAtMs).getTime()) ? { lastDroppedAtMs: record.lastDroppedAtMs } : {},
+    ...typeof record.lastDropReason === "string" ? { lastDropReason: record.lastDropReason } : {}
+  };
+}
+function observerQueueStatus(value, key) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+  const queue = value[key];
+  if (!queue || typeof queue !== "object" || Array.isArray(queue)) return null;
+  const record = queue;
+  if (typeof record.phase !== "string" || typeof record.pending !== "number" || !Number.isSafeInteger(record.pending) || record.pending < 0) {
+    return null;
+  }
+  return {
+    phase: record.phase,
+    pending: record.pending,
+    ...typeof record.quarantined === "number" && Number.isSafeInteger(record.quarantined) && record.quarantined >= 0 ? { quarantined: record.quarantined } : {},
+    ...typeof record.lastError === "string" ? { lastError: record.lastError } : {},
+    ...typeof record.lastWarning === "string" ? { lastWarning: record.lastWarning } : {},
+    ...typeof record.nextAttemptAtMs === "number" && Number.isSafeInteger(record.nextAttemptAtMs) && record.nextAttemptAtMs >= 0 && Number.isFinite(new Date(record.nextAttemptAtMs).getTime()) ? { nextAttemptAtMs: record.nextAttemptAtMs } : {}
+  };
+}
+function hookStatus(value) {
+  const status = observerQueueStatus(value, "hooks");
+  if (!status || !value || typeof value !== "object" || Array.isArray(value)) {
+    return null;
+  }
+  const hooks = value.hooks;
+  if (!hooks || typeof hooks !== "object" || Array.isArray(hooks)) return null;
+  const record = hooks;
+  const spool = hookSpoolStatus(record.spool);
+  return {
+    ...status,
+    ...typeof record.rejected === "number" && Number.isSafeInteger(record.rejected) && record.rejected >= 0 ? { rejected: record.rejected } : {},
+    ...typeof record.lastRejectedReason === "string" ? { lastRejectedReason: record.lastRejectedReason } : {},
+    ...typeof record.lastRejectedTarget === "string" ? { lastRejectedTarget: record.lastRejectedTarget } : {},
+    ...spool === void 0 ? {} : { spool }
+  };
+}
+function otlpStatus(value) {
+  const status = observerQueueStatus(value, "otlp");
+  if (!status || !value || typeof value !== "object" || Array.isArray(value)) {
+    return null;
+  }
+  const otlp = value.otlp;
+  if (!otlp || typeof otlp !== "object" || Array.isArray(otlp)) return null;
+  const spool = otlpSpoolStatus(otlp.spool);
+  return {
+    ...status,
+    ...spool === void 0 ? {} : { spool }
+  };
+}
+async function handleStatus() {
+  const { name, convexUrl } = getActiveEnv();
+  console.log(`Environment: ${name}`);
+  console.log(`  Convex: ${convexUrl ?? "not configured"}
+`);
+  const tokens = readTokens(name);
+  if (!tokens) {
+    console.log("Authentication:");
+    console.log("  Not authenticated. Run `fml login` to sign in.");
+  } else {
+    const tokenValid = await getValidToken({ env: name });
+    console.log("Authentication:");
+    if (tokens.tokenType === "service" && tokens.user.id === SERVICE_TOKEN_LOGIN_USER_ID) {
+      console.log("  Auth:  service token");
+    } else {
+      console.log(`  User:  ${tokens.user.name} (${tokens.user.email})`);
     }
-    printRepositoryResolution(result.discovery.repositoryResolution);
-    console.log(`  Uploaded files:  ${result.upload.uploaded}`);
-    console.log(`  Uploaded chunks: ${result.upload.uploadedChunks}`);
     console.log(
-      `  Uploaded bytes:  ${formatBytes2(result.upload.uploadedBytes)}`
+      `  Token: ${tokenValid ? "valid" : "expired (needs refresh/re-login)"}`
     );
-    console.log(`  Failed:          ${result.upload.failed}`);
-    console.log(`  Exhausted:       ${result.upload.exhausted}`);
-    if (result.upload.retryAtMs !== void 0) {
-      console.log(
-        `  Retry at:        ${new Date(result.upload.retryAtMs).toISOString()}`
-      );
-    }
-    console.log(`  Drained:         ${result.drained ? "yes" : "no"}`);
-    if (result.outcome === "pending") {
-      console.log(
-        "  Next:            More data remains; run `fml sync` again or `fml start` for continuous syncing."
-      );
-    } else if (result.outcome === "backing_off") {
-      const nextRetryAtMs = result.upload.nextRetryAtMs;
-      console.log(
-        `  Next:            Remaining items are backing off after upload errors${nextRetryAtMs !== void 0 ? `; next retry due ${new Date(nextRetryAtMs).toISOString()}` : ""}. \`fml start\` retries automatically.`
-      );
+    console.log(
+      `  Org:   ${tokens.orgSlug ?? "(none \u2014 run `fml org <slug>`)"}`
+    );
+  }
+  const syncStatus = createRawArtifactSync({
+    stateDir: FML_OBSERVER_DIR
+  }).status();
+  console.log("\nRaw artifact sync:");
+  console.log(`  Enabled:   ${syncStatus.settings.enabled ? "yes" : "no"}`);
+  console.log(`  Tracked:   ${syncStatus.queue.tracked}`);
+  console.log(`  Pending:   ${syncStatus.queue.pending}`);
+  console.log(`  Raw work:  ${syncStatus.queue.rawPending}`);
+  console.log(`  Metadata:  ${syncStatus.queue.metadataPending}`);
+  console.log(`  Uploaded:  ${syncStatus.queue.uploaded}`);
+  console.log(`  Failed:    ${syncStatus.queue.failed}`);
+  console.log(
+    `  Watermark: ${formatBytes2(syncStatus.queue.uploadedBytes)} / ${formatBytes2(syncStatus.queue.totalBytes)}`
+  );
+  console.log(`  Remaining: ${formatBytes2(syncStatus.queue.remainingBytes)}`);
+  const observer = await readObserverRuntimeStatus();
+  const protectedStatus = observer.healthy ? await readObserverProtectedStatus() : null;
+  const observerState = observer.stateStatus.state;
+  console.log("\nLocal observer:");
+  console.log(
+    `  Status: ${observer.healthy ? "running" : observer.running ? "unhealthy" : "stopped"}`
+  );
+  if (observerState) {
+    console.log(`  PID:    ${observerState.pid}`);
+    console.log(`  Phase:  ${observerState.phase}`);
+    if (observerState.lastOutcome) {
+      console.log(`  Last:   ${observerState.lastOutcome}`);
     }
-    console.log("");
-    printStatus(result.status);
   }
-  process.exitCode = syncExitCode(result);
-}
-function setRawSyncEnabled(enabled) {
-  return rawSync().setEnabled(enabled);
-}
-async function handleSyncEnable(opts = {}) {
-  const sync2 = rawSync();
-  const settings = sync2.setEnabled(true);
-  const isolationWarning = observerOnlyOverrideWarning();
-  if (isolationWarning) console.warn(isolationWarning);
-  let retainedLegacyDatabase;
-  try {
-    const observer = await startObserver({
-      onLegacyDatabaseRetained: (retained) => {
-        retainedLegacyDatabase = retained;
-        if (!opts.json) warnRetainedLegacyDatabase(retained);
-      }
-    });
-    setHookCaptureDisabled(false);
-    if (observer.status === "already_running") {
-      await wakeObserverSync();
+  console.log(`  Log:    ${observer.logFile}`);
+  const hooks = hookStatus(protectedStatus);
+  const hookInbox = readHookInboxStatus();
+  console.log("\nHook capture:");
+  if (!hooks) {
+    console.log(`  Status:  ${observer.healthy ? "unavailable" : "stopped"}`);
+  } else {
+    console.log(`  Status:  ${hooks.phase}`);
+    console.log(`  Pending: ${hooks.pending}`);
+    if (hooks.quarantined && hooks.quarantined > 0) {
+      console.log(`  Quarantined: ${hooks.quarantined}`);
     }
-    const port = observer.runtime.health?.port;
-    const authToken = port ? readObserverAuthToken(FML_OBSERVER_AUTH_TOKEN_FILE) : null;
-    if (port && authToken) {
-      for (const target2 of configureFmlOtel({
-        baseUrl: `http://127.0.0.1:${port}`,
-        authToken
-      })) {
-        if (!opts.json) {
-          console.log(`OpenTelemetry: ${target2.displayName} -> FML observer`);
-        }
+    if (hooks.rejected && hooks.rejected > 0) {
+      console.log(`  Rejected: ${hooks.rejected}`);
+      if (hooks.lastRejectedReason) {
+        console.log(
+          `  Last rejection: ${hooks.lastRejectedReason}${hooks.lastRejectedTarget ? ` (${hooks.lastRejectedTarget})` : ""}`
+        );
       }
-    } else if (!opts.json) {
-      console.warn(
-        "Could not configure native OpenTelemetry: the healthy observer endpoint or local token is unavailable."
-      );
     }
-    if (opts.json) {
-      writeJson({
-        ok: true,
-        sync: settings,
-        observer,
-        ...observer.retainedLegacyDatabase ? { retainedLegacyDatabase: observer.retainedLegacyDatabase } : {}
-      });
-    } else {
-      console.log("FML raw artifact sync is enabled");
-      const pid = observer.runtime.health?.pid;
+    if (hooks.spool) {
       console.log(
-        observer.status === "started" ? `FML observer started${pid ? ` (PID ${pid})` : ""}` : `FML observer is already running${pid ? ` (PID ${pid})` : ""}`
+        `  Spool:   ${formatBytes2(hooks.spool.logicalBytes)} / ${hooks.spool.maxBytes === null ? "unbounded" : formatBytes2(hooks.spool.maxBytes)} (logical content)`
       );
-    }
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    if (opts.json) {
-      writeJson({
-        ok: false,
-        sync: settings,
-        error: message,
-        ...retainedLegacyDatabase ? { retainedLegacyDatabase } : {}
-      });
-    } else console.error(message);
-    process.exitCode = 1;
-  }
-}
-async function handleSyncDisable(opts = {}) {
-  const sync2 = rawSync();
-  const settings = sync2.setEnabled(false);
-  const observerWoken = await wakeObserverSync();
-  if (opts.json) {
-    writeJson({ ok: true, sync: settings, observerWoken });
-  } else {
-    console.log("FML raw artifact sync is disabled");
-    const observer = await readObserverRuntimeStatus();
-    if (observer.running) {
-      console.log("FML observer remains available for local integrations");
-    }
-  }
-}
-async function handleSyncStatus(opts = {}) {
-  const status = rawSync().status();
-  const observer = await readObserverRuntimeStatus();
-  if (opts.json) writeJson({ ok: true, status, observer });
-  else {
-    printStatus(status);
-    const state = observer.stateStatus.state;
-    console.log(
-      `  Observer:  ${observer.healthy ? "running" : observer.running ? "unhealthy" : "stopped"}`
-    );
-    if (state) {
-      console.log(`  PID:       ${state.pid}`);
-      console.log(`  Phase:     ${state.phase}`);
-      if (state.lastOutcome) {
-        console.log(`  Last run:  ${state.lastOutcome}`);
+      if (hooks.spool.quarantineMaxAgeMs !== void 0) {
+        console.log(
+          `  Quarantine retention: ${hooks.spool.quarantineMaxAgeMs === null ? "unbounded" : `${Math.round(hooks.spool.quarantineMaxAgeMs / 864e5)} day(s)`}`
+        );
       }
-      if (state.nextAttemptAtMs) {
+      if (hooks.spool.evictedRecords > 0) {
         console.log(
-          `  Next run:  ${new Date(state.nextAttemptAtMs).toISOString()}`
+          `  Evicted: ${hooks.spool.evictedRecords} record(s), ${formatBytes2(hooks.spool.evictedBytes)} (${hooks.spool.evictedQuarantinedRecords} quarantined, ${hooks.spool.evictedPendingRecords} pending)`
         );
+        if (hooks.spool.lastEvictedAtMs !== void 0) {
+          console.log(
+            `  Last eviction: ${new Date(hooks.spool.lastEvictedAtMs).toISOString()}`
+          );
+        }
       }
     }
-    console.log(`  Log:       ${observer.logFile}`);
+    if (hooks.lastError) console.log(`  Error:   ${hooks.lastError}`);
   }
-}
-async function handleSyncReset(opts = {}) {
-  const result = rawSync().reset();
-  if (opts.json) writeJson({ ok: !result.skipped, reset: result });
-  else if (result.skipped) {
-    console.error(
-      "Raw artifact reset skipped: another sync owns the queue lock"
-    );
+  if (hookInbox.unreadable) {
+    console.log("  Inbox:   unavailable");
   } else {
     console.log(
-      `Reset raw upload watermarks for ${result.reset} artifact${result.reset === 1 ? "" : "s"}.`
+      `  Inbox:   ${hookInbox.pendingEntries} pending (${formatBytes2(hookInbox.pendingBytes)})`
     );
-    if (result.removed > 0) {
-      console.log(`Removed ${result.removed} missing artifact entries.`);
-    }
     console.log(
-      "The next enabled sync will replay each artifact from byte zero."
+      `  Inbox limits: ${hookInbox.maxBytes === null ? "unbounded bytes" : formatBytes2(hookInbox.maxBytes)}, ${hookInbox.maxEntries === null ? "unbounded entries" : `${hookInbox.maxEntries} entries`}`
     );
-  }
-  if (result.skipped) {
-    process.exitCode = 1;
-  } else {
-    await wakeObserverSync();
-  }
-}
-
-// src/commands/daemon.ts
-async function handleFmlStart() {
-  await handleSyncEnable();
-}
-async function handleFmlStop(opts = {}) {
-  setRawSyncEnabled(false);
-  const result = await stopObserver({ force: opts.force });
-  if (result.status === "stopped" || result.status === "killed" || result.status === "not_running" || result.status === "stale_state") {
-    try {
-      setHookCaptureDisabled(true);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      console.error(
-        `FML observer stopped, but the hook-capture pause could not be persisted: ${message}`
+    if (hookInbox.capacityRejectedEntries > 0) {
+      console.log(
+        `  Inbox capacity refusals: ${hookInbox.capacityRejectedEntries} record(s), ${formatBytes2(hookInbox.capacityRejectedBytes)}`
       );
-      process.exitCode = 1;
+      if (hookInbox.lastCapacityRejectedAtMs !== void 0) {
+        console.log(
+          `  Last inbox refusal: ${new Date(hookInbox.lastCapacityRejectedAtMs).toISOString()}${hookInbox.lastCapacityRejectionReason ? ` (${hookInbox.lastCapacityRejectionReason})` : ""}`
+        );
+      }
     }
-  }
-  switch (result.status) {
-    case "stopped":
-      console.log(`FML observer stopped (PID ${result.pid})`);
-      break;
-    case "killed":
-      console.log(`FML observer force stopped (PID ${result.pid})`);
-      break;
-    case "not_running":
-      console.log("FML observer was not running");
-      break;
-    case "stale_state":
+    if (hookInbox.retiredEntries > 0) {
       console.log(
-        "FML observer is not running; stale state will be reclaimed on the next start"
-      );
-      break;
-    case "permission_denied":
-      console.error(
-        `Could not stop FML observer PID ${result.pid}: permission denied`
-      );
-      process.exitCode = 1;
-      break;
-    case "foreign_listener":
-      console.error("Refused to stop a different local observer instance");
-      process.exitCode = 1;
-      break;
-    case "ambiguous_live_process":
-      console.error(
-        `Refused to treat unverifiable live PID ${result.pid} as a stopped FML observer`
+        `  Inbox retired: ${hookInbox.retiredEntries} record(s), ${formatBytes2(hookInbox.retiredBytes)}`
       );
-      process.exitCode = 1;
-      break;
-    case "unresponsive":
-      console.error(
-        `Refused to signal unverifiable FML observer PID ${result.pid}; retry with \`fml stop --force\` to escalate`
+    }
+  }
+  const otlp = otlpStatus(protectedStatus);
+  console.log("\nNative OpenTelemetry:");
+  if (!otlp) {
+    console.log(`  Status:  ${observer.healthy ? "unavailable" : "stopped"}`);
+  } else {
+    console.log(`  Status:  ${otlp.phase}`);
+    console.log(`  Pending: ${otlp.pending}`);
+    if (otlp.spool) {
+      const usedPercent = otlp.spool.logicalBytes / otlp.spool.maxBytes * 100;
+      console.log(
+        `  Spool:   ${formatBytes2(otlp.spool.logicalBytes)} / ${formatBytes2(otlp.spool.maxBytes)} (${usedPercent.toFixed(1)}%; ${formatBytes2(otlp.spool.bodyBytes)} encoded bodies)`
       );
-      process.exitCode = 1;
-      break;
-    case "signal_sent":
-      console.error(`FML observer PID ${result.pid} did not stop`);
-      process.exitCode = 1;
-      break;
-    case "force_stop_unverified":
-      console.error(
-        `Could not corroborate that PID ${result.pid} is the FML observer; refusing to signal it. If the observer is not running, remove ${result.stateFile}, ${result.lockFile}, ${result.databaseStateFile}, and ${result.databaseLockFile} manually.`
+      if (usedPercent >= 80) {
+        console.log(
+          `  Attention: the oldest pending telemetry is dropped when the spool reaches ${formatBytes2(otlp.spool.maxBytes)}`
+        );
+      }
+      if (otlp.spool.droppedRecords > 0) {
+        console.log(
+          `  Dropped: ${otlp.spool.droppedRecords} envelope(s), ${formatBytes2(otlp.spool.droppedLogicalBytes)} logical; ${formatBytes2(otlp.spool.droppedBodyBytes)} encoded bodies`
+        );
+        if (otlp.spool.lastDropReason) {
+          console.log(
+            `  Last drop: ${otlp.spool.lastDropReason}${otlp.spool.lastDroppedAtMs === void 0 ? "" : ` at ${new Date(otlp.spool.lastDroppedAtMs).toISOString()}`}`
+          );
+        }
+      }
+    }
+    if (otlp.lastError) console.log(`  Error:   ${otlp.lastError}`);
+    if (otlp.lastWarning) console.log(`  Warning: ${otlp.lastWarning}`);
+    if (otlp.nextAttemptAtMs !== void 0) {
+      console.log(
+        `  Next attempt: ${new Date(otlp.nextAttemptAtMs).toISOString()}`
       );
-      process.exitCode = 1;
-      break;
+    }
   }
 }
 
@@ -8002,7 +8336,7 @@ async function handleFmlStop(opts = {}) {
 function handleEnvShow() {
   const { name, convexUrl } = getActiveEnv();
   console.log(`Environment: ${name}`);
-  console.log(`  Convex URL: ${convexUrl ?? "not configured"}`);
+  console.log(`  Service URL: ${convexUrl ?? "not configured"}`);
 }
 function handleEnvSwitch(target2) {
   let name = target2;
@@ -8025,17 +8359,20 @@ function handleEnvSwitch(target2) {
     return;
   }
   if (!convexUrl) {
-    console.error(`FML environment "${name}" has no configured backend URL.`);
+    console.error(`Environment ${name} has no configured service URL.`);
     console.error(
-      `Run FML_CONVEX_URL=https://<deployment>.convex.cloud fml env ${name}`
+      `Set FML_CONVEX_URL=https://<deployment>.convex.cloud and run \`fml env ${name}\` again.`
     );
     process.exitCode = 1;
     return;
   }
   setActiveEnvironment(name, convexUrl);
-  console.log(`Switched to ${name}: ${convexUrl}`);
-  console.log("New CLI and sync operations will use this environment.");
-  console.log("Restart running MCP clients to switch their backend and auth.");
+  console.log(`Environment switched to ${name}.`);
+  console.log(`Service URL: ${convexUrl}`);
+  console.log("CLI commands and agent activity sync now use this environment.");
+  console.log(
+    "Start a new agent session to use the new environment and credentials."
+  );
 }
 
 // src/commands/data.ts
@@ -8591,8 +8928,8 @@ async function handleConfigDetail(opts) {
 
 // src/commands/tools.ts
 import { readFileSync } from "fs";
-import path28 from "path";
-var pluginVersion = true ? "0.8.0-rc.1+60c9b7e1" : void 0;
+import path29 from "path";
+var pluginVersion = true ? "0.8.0-rc.3+246af775" : void 0;
 async function getApi() {
   const api = await getAuthenticatedClient();
   if (!api) {
@@ -8699,7 +9036,7 @@ async function handleToolsCall(name, opts) {
   }
   const raw = opts.file ? (() => {
     try {
-      return readFileSync(path28.resolve(opts.file), "utf8");
+      return readFileSync(path29.resolve(opts.file), "utf8");
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       console.error(`Could not read args file: ${msg}`);
@@ -8725,13 +9062,31 @@ async function handleToolsCall(name, opts) {
   console.log(JSON.stringify(result.result, null, 2));
 }
 
+// src/banner.ts
+import pc2 from "picocolors";
+var LOGO_LINES = [
+  " \u2584\u2588\u2588\u2580   \u2588\u2588\u2584\u2588\u2588\u2584\u2588\u2588  \u2588\u2588",
+  " \u2588\u2588     \u2588\u2588 \u2588\u2588 \u2588\u2588  \u2588\u2588",
+  "\u2588\u2588\u2588\u2588\u2588   \u2588\u2588    \u2588\u2588  \u2588\u2588",
+  " \u2588\u2588     \u2588\u2588    \u2588\u2588  \u2588\u2588\u2588\u2588",
+  " \u2580\u2580     \u2580\u2580    \u2580\u2580  \u2580\u2580\u2580\u2580"
+];
+function printBanner() {
+  console.log("");
+  for (let i = 0; i < LOGO_LINES.length; i++) {
+    const color = i < 3 ? pc2.blue : pc2.cyan;
+    console.log("  " + color(LOGO_LINES[i]));
+  }
+  console.log("");
+}
+
 // src/cli.ts
 await initSentry();
 if (process.argv.length <= 2 || process.argv.includes("--help") || process.argv.includes("-h")) {
   printBanner();
 }
 var program = new Command().name("fml").description("FML CLI and agent tools").version(
-  true ? "0.8.0-rc.1+60c9b7e1" : "dev"
+  true ? "0.8.0-rc.3+246af775" : "dev"
 );
 function formatCommandInventory(cmd, prefix = "") {
   const name = prefix ? `${prefix} ${cmd.name()}` : cmd.name();
@@ -8760,11 +9115,12 @@ tools.command("call").description("Invoke a backend tool by name with JSON args"
 program.command("mcp-server", { hidden: true }).description("Run the FML MCP server on stdio").action(async () => {
   await import("./mcp/server.js");
 });
-program.command("install").description("Set up FML for local agent use").action(() => handleInstall());
+program.command("setup").description("Install integrations, sign in if needed, and start FML").action(() => handleSetup());
+program.command("install").description("Register FML agent integrations and the MCP server").action(() => handleInstall());
 program.command("uninstall").description("Remove FML agent integrations and optionally local data").option("--purge", "Also remove all data, logs, and auth tokens").option("-y, --yes", "Skip the purge confirmation prompt").action(
   (opts) => handleUninstall({ purge: opts.purge, assumeYes: opts.yes })
 );
-program.command("update").description("Update fml to the latest version").action(() => handleUpdate());
+program.command("update").description("Update fml from its release channel").action(() => handleUpdate());
 program.command("login").description("Sign in to your FML account").option("--device", "Use device authorization flow (no browser needed)").option(
   "--service-token",
   "Sign in with an org service refresh token (prompts for fml_srt_*)"
@@ -8774,28 +9130,29 @@ program.command("login").description("Sign in to your FML account").option("--de
 program.command("logout").description("Sign out and clear stored credentials").action(() => handleLogout());
 program.command("org").description("Show or select organization").argument("[slug]", "Org slug to select").action((slug) => handleOrg(slug));
 program.command("status").description("Show auth, environment, and raw sync watermarks").action(() => handleStatus());
-program.command("doctor").description("Check FML configuration, raw sync, and connectivity").option("--json", "Output as JSON").action((opts) => handleDoctor(opts));
+program.command("doctor").description("Check FML configuration, agent activity sync, and connectivity").option("--json", "Output as JSON").action((opts) => handleDoctor(opts));
 program.command("open").description("Open FML dashboard in browser").option("--json", "Output URL as JSON instead of opening browser").action((opts) => handleOpen(opts));
 program.command("env").description("Show or switch FML backend environment").argument("[target]", "Environment name or backend URL").action((target2) => {
   if (target2) handleEnvSwitch(target2);
   else handleEnvShow();
 });
-program.command("start").description("Start the local observer and continuous raw artifact sync").action(() => handleFmlStart());
-program.command("stop").description("Stop the local observer and disable raw artifact sync").option("--force", "Escalate to SIGTERM/SIGKILL if the observer is hung").action((opts) => handleFmlStop({ force: opts.force }));
-var sync = program.command("sync").description("Sync raw local artifacts to FML").option("--dry-run", "Discover artifacts without changing queue state").option("--json", "Output as JSON").action((opts) => handleSyncRun(opts));
-sync.command("enable").description("Enable raw artifact sync").option("--json", "Output as JSON").action(
+program.command("start").description("Start the local observer and continuous agent activity sync").action(() => handleFmlStart());
+program.command("restart").description("Restart the local observer and continuous agent activity sync").action(() => handleFmlRestart());
+program.command("stop").description("Stop the local observer and pause agent activity sync").option("--force", "Escalate to SIGTERM/SIGKILL if the observer is hung").action((opts) => handleFmlStop({ force: opts.force }));
+var sync = program.command("sync").description("Sync Agent activity to FML").option("--dry-run", "Discover artifacts without changing queue state").option("--json", "Output as JSON").action((opts) => handleSyncRun(opts));
+sync.command("enable").description("Enable Agent activity sync").option("--json", "Output as JSON").action(
   (_opts, command) => handleSyncEnable(command.optsWithGlobals())
 );
-sync.command("disable").description("Disable raw artifact sync").option("--json", "Output as JSON").action(
+sync.command("disable").description("Pause Agent activity sync").option("--json", "Output as JSON").action(
   (_opts, command) => handleSyncDisable(command.optsWithGlobals())
 );
-sync.command("status").description("Show raw artifact queue watermarks").option("--json", "Output as JSON").action(
+sync.command("status").description("Show Agent activity queue watermarks").option("--json", "Output as JSON").action(
   (_opts, command) => handleSyncStatus(command.optsWithGlobals())
 );
-sync.command("reset").description("Replay all raw artifacts from byte zero").option("--json", "Output as JSON").action(
+sync.command("reset").description("Replay Agent activity uploads from byte zero").option("--json", "Output as JSON").action(
   (_opts, command) => handleSyncReset(command.optsWithGlobals())
 );
-var artifacts = program.command("artifacts", { hidden: true }).description("Compatibility alias for raw artifact sync");
+var artifacts = program.command("artifacts", { hidden: true }).description("Compatibility alias for Agent activity sync");
 artifacts.command("sync").option("--dry-run", "Discover artifacts without changing queue state").option("--json", "Output as JSON").action((opts) => handleSyncRun(opts));
 program.command("activity").description("Activity summary \u2014 sessions, prompts, tools, costs").option("--since <duration>", 'Time window, e.g. "24h", "7d"').action((opts) => handleActivity(opts));
 program.command("sessions").description("List recent sessions").option("--since <duration>", 'Time filter, e.g. "24h", "7d"').option("--limit <n>", "Max sessions to return").action((opts) => handleSessions(opts));