@fml-inc/fml 0.6.1 → 0.7.0

package/dist/cli.js

@@ -2,13 +2,14 @@
 import {
   createFmlClient,
   getAuthenticatedClient
-} from "./chunk-2H6D7RUN.js";
+} from "./chunk-PTUZMKSN.js";
 import {
   CONVEX_URL,
   DEFAULT_SYNC_URL,
   DEFAULT_TARGET_NAME,
   FML_DATA_DIR,
   FML_LOG_DIR,
+  SERVICE_TOKEN_LOGIN_USER_ID,
   Sentry,
   WORKOS_API_URL,
   WORKOS_AUTH_URL,
@@ -22,16 +23,19 @@ import {
   isValidEnvName,
   readTokens,
   setSelectedOrg,
+  storeServiceRefreshToken,
   writeEnvConfig,
   writeTokens
-} from "./chunk-VDW5L7OB.js";
+} from "./chunk-VV4JHH4H.js";
 import {
-  handleStart,
-  handleStop,
+  handleFmlStart,
+  handleFmlStop,
+  handlePanopticonStart,
+  handlePanopticonStop,
   handleSyncStart,
   handleSyncStop,
   parsePanopticonRunning
-} from "./chunk-ZFUJ5ZQP.js";
+} from "./chunk-S4TJNLEN.js";
 import {
   execBinSync,
   panopticonExec,
@@ -88,7 +92,7 @@ async function handleDoctor(opts) {
     token = await getValidToken();
     if (token) {
       const stored = readTokens();
-      const detail = stored?.user?.email ? `Logged in as ${stored.user.email}` : "Token present";
+      const detail = stored?.tokenType === "service" && stored.user.id === SERVICE_TOKEN_LOGIN_USER_ID ? "Service token configured" : stored?.user?.email ? `Logged in as ${stored.user.email}` : "Token present";
       pushAndReport({ label: "Auth", status: "ok", detail }, spinner);
     } else {
       pushAndReport(
@@ -705,7 +709,7 @@ function handleUninstall(opts) {
 // src/commands/update.ts
 import { execSync as execSync2 } from "child_process";
 async function handleUpdate() {
-  const currentVersion = true ? "0.6.1+569d0d2" : "unknown";
+  const currentVersion = true ? "0.7.0+8fe6800" : "unknown";
   console.log(`Current: ${currentVersion}`);
   console.log("Updating via npm...\n");
   try {
@@ -1022,7 +1026,60 @@ async function linkGitHubIdentity() {
     console.warn(`[fml] Failed to link GitHub identity: ${msg}`);
   }
 }
-function upgradeSyncTargetAfterLogin() {
+function promptHidden(question) {
+  if (!process.stdin.isTTY) {
+    return new Promise((resolve, reject) => {
+      let input = "";
+      process.stdin.setEncoding("utf8");
+      process.stdin.on("data", (chunk) => {
+        input += chunk;
+      });
+      process.stdin.once("end", () => resolve(input.trim()));
+      process.stdin.once("error", reject);
+    });
+  }
+  return new Promise((resolve, reject) => {
+    const stdin = process.stdin;
+    const wasRaw = stdin.isRaw === true;
+    let value = "";
+    let settled = false;
+    const cleanup = () => {
+      stdin.off("data", onData);
+      stdin.setRawMode(wasRaw);
+      stdin.pause();
+      process.stderr.write("\n");
+    };
+    const finish = (fn) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      fn();
+    };
+    const onData = (chunk) => {
+      const text = chunk.toString("utf8");
+      for (const char of text) {
+        if (char === "") {
+          finish(() => reject(new Error("Canceled")));
+          return;
+        }
+        if (char === "\r" || char === "\n") {
+          finish(() => resolve(value.trim()));
+          return;
+        }
+        if (char === "\x7F" || char === "\b") {
+          value = value.slice(0, -1);
+          continue;
+        }
+        value += char;
+      }
+    };
+    process.stderr.write(question);
+    stdin.setRawMode(true);
+    stdin.resume();
+    stdin.on("data", onData);
+  });
+}
+function upgradeSyncTargetAfterLogin(opts) {
   try {
     const { name: envName } = getActiveEnv();
     if (!isValidEnvName(envName)) {
@@ -1044,11 +1101,12 @@ function upgradeSyncTargetAfterLogin() {
       console.log("Restart panopticon to apply: fml stop && fml start");
       return;
     }
-    if (existing.token) return;
+    if (existing.token && !opts?.forceTokenCommand) return;
     if (existing.tokenCommand === pinnedCmd) return;
-    if (existing.tokenCommand && existing.tokenCommand !== "fml sync-token") {
+    if (!opts?.forceTokenCommand && existing.tokenCommand && existing.tokenCommand !== "fml sync-token") {
       return;
     }
+    delete existing.token;
     existing.tokenCommand = pinnedCmd;
     saveSyncConfig(config2);
     console.log(`Sync target "${envName}" now using ${pinnedCmd}.`);
@@ -1058,32 +1116,75 @@ function upgradeSyncTargetAfterLogin() {
     console.warn(`[fml] Could not update sync target: ${msg}`);
   }
 }
-async function selectOrg() {
+async function selectOrg(envName) {
   try {
-    const token = await getValidToken();
+    const token = await getValidToken({ env: envName });
     if (!token) return;
     const api = createFmlClient(token);
     const orgs = await api.queryOrgs();
     if (orgs.length === 0) return;
-    const current = getSelectedOrg();
+    const current = getSelectedOrg(envName);
     const org = current && orgs.find((o) => (o.slug ?? o.name) === current) || orgs[0];
     const slug = org.slug ?? org.name;
-    setSelectedOrg(slug);
+    setSelectedOrg(slug, envName);
     console.log(`Selected org: ${org.name} (${slug})`);
   } catch {
   }
 }
+async function runServiceTokenLogin(refreshToken) {
+  const { name: envName } = getActiveEnv();
+  if (!isValidEnvName(envName)) {
+    throw new Error(
+      `Cannot store service-token login for unsafe env name "${envName}".`
+    );
+  }
+  console.log(`Signing in to FML with a service token (${envName})...`);
+  const token = refreshToken ?? await promptHidden("Paste FML service refresh token (fml_srt_*): ");
+  const ok = await storeServiceRefreshToken(token, { env: envName });
+  if (!ok) {
+    throw new Error("Service token login failed.");
+  }
+  await selectOrg(envName);
+  upgradeSyncTargetAfterLogin({ forceTokenCommand: true });
+  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.");
+}
+async function handleServiceTokenLogin(refreshToken) {
+  try {
+    await runServiceTokenLogin(refreshToken);
+    process.exit(0);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    if (msg === "Canceled") {
+      console.error("Login canceled.");
+      process.exit(1);
+    }
+    Sentry.captureException(err);
+    console.error(`Login failed: ${msg}`);
+    process.exit(1);
+  }
+}
 async function handleLogin(opts) {
+  if (opts?.serviceToken) {
+    await handleServiceTokenLogin();
+    return;
+  }
   const { name: envName } = getActiveEnv();
   const existingToken = await getValidToken();
   if (existingToken) {
-    const { readTokens: readTokens2 } = await import("./token-store-JZJ3FJHA.js");
+    const { readTokens: readTokens2 } = await import("./token-store-3IQSLOTQ.js");
     const stored = readTokens2();
-    console.log(
-      `Already logged in as ${stored?.user.name} (${stored?.user.email}) on ${envName}.`
-    );
+    if (stored?.tokenType === "service") {
+      const label = stored.user.id === SERVICE_TOKEN_LOGIN_USER_ID ? "a service token" : `${stored.user.name} (${stored.user.email})`;
+      console.log(`Already logged in with ${label} on ${envName}.`);
+    } else {
+      console.log(
+        `Already logged in as ${stored?.user.name} (${stored?.user.email}) on ${envName}.`
+      );
+    }
     await linkGitHubIdentity();
-    await selectOrg();
+    await selectOrg(envName);
     upgradeSyncTargetAfterLogin();
     console.log("You're all set! Restart Claude Code to use FML tools.");
     process.exit(0);
@@ -1100,7 +1201,7 @@ async function handleLogin(opts) {
     console.log(`
 Logged in as ${result.name} (${result.email})`);
     await linkGitHubIdentity();
-    await selectOrg();
+    await selectOrg(envName);
     upgradeSyncTargetAfterLogin();
     console.log("You're all set! Restart Claude Code to use FML tools.");
     process.exit(0);
@@ -1204,7 +1305,11 @@ async function handleStatus() {
   }
   const tokenValid = await getValidToken();
   console.log("Authentication:");
-  console.log(`  User:  ${tokens.user.name} (${tokens.user.email})`);
+  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(
     `  Token: ${tokenValid ? "valid" : "expired (needs refresh/re-login)"}`
   );
@@ -1386,9 +1491,9 @@ async function handleEnvSwitch(target) {
   writeEnvConfig({ active: target });
   const convexUrl = match.url.replace(".convex.site", ".convex.cloud");
   console.log(`Switched to ${target}: ${convexUrl}`);
-  console.log("\nRestarting daemons...");
-  handleStop();
-  await handleStart();
+  console.log("\nRestarting local collection...");
+  handlePanopticonStop();
+  await handlePanopticonStart();
   console.log(
     "MCP server will pick up the change on next Claude Code session."
   );
@@ -1961,7 +2066,7 @@ async function handleConfigDetail(opts) {
 // src/commands/tools.ts
 import { readFileSync } from "fs";
 import path3 from "path";
-var pluginVersion = true ? "0.6.1+569d0d2" : void 0;
+var pluginVersion = true ? "0.7.0+8fe6800" : void 0;
 async function getApi() {
   const api = await getAuthenticatedClient();
   if (!api) {
@@ -2017,6 +2122,12 @@ async function handleToolsList(opts) {
     console.log("No tools found.");
     return;
   }
+  console.log("Backend tools available to this FML session.\n");
+  console.log("Next steps:");
+  console.log("  fml tools describe <tool> --json        Inspect args/schema");
+  console.log("  fml tools call <tool> --args '{...}'   Run a tool");
+  console.log("  fml tools list --json                  Machine-readable catalog");
+  console.log("");
   const nameW = Math.min(
     40,
     Math.max(...descriptors.map((d) => d.name.length), 4)
@@ -2091,56 +2202,60 @@ await initSentry();
 if (process.argv.length <= 2 || process.argv.includes("--help") || process.argv.includes("-h")) {
   printBanner();
 }
-var program = new Command().name("fml").description("FML agent tools for Claude Code").version(
-  true ? "0.6.1+569d0d2" : "dev"
+var program = new Command().name("fml").description("FML CLI and agent tools").version(
+  true ? "0.7.0+8fe6800" : "dev"
 );
-var tools = program.command("tools", { hidden: true }).description("List all available CLI commands (including hidden agent tools)").action(() => {
-  function formatCmd(cmd, prefix = "") {
-    const name = prefix ? `${prefix} ${cmd.name()}` : cmd.name();
-    const args = cmd.registeredArguments.map((a) => a.required ? `<${a.name()}>` : `[${a.name()}]`).join(" ");
-    const opts = cmd.options.filter(
-      (o) => !o.hidden && o.long !== "--help" && o.long !== "--version"
-    ).map((o) => o.mandatory ? o.flags : `[${o.flags}]`).join(" ");
-    const usage = [name, args, opts].filter(Boolean).join(" ");
-    return `${usage}
+function formatCommandInventory(cmd, prefix = "") {
+  const name = prefix ? `${prefix} ${cmd.name()}` : cmd.name();
+  const args = cmd.registeredArguments.map((a) => a.required ? `<${a.name()}>` : `[${a.name()}]`).join(" ");
+  const opts = cmd.options.filter((o) => !o.hidden && o.long !== "--help" && o.long !== "--version").map((o) => o.mandatory ? o.flags : `[${o.flags}]`).join(" ");
+  const usage = [name, args, opts].filter(Boolean).join(" ");
+  return `${usage}
   ${cmd.description()}`;
-  }
-  const lines = program.commands.filter((c) => c.name() !== "tools" && c.name() !== "help").flatMap((c) => {
+}
+var tools = program.command("tools").description("List backend tools available via the dynamic catalog").option("--category <category>", "Filter by category").option("--json", "Output as JSON").action((opts) => handleToolsList(opts));
+program.command("commands", { hidden: true }).description("List CLI commands, including hidden/internal commands").action(() => {
+  const lines = program.commands.filter((c) => c.name() !== "commands" && c.name() !== "help").flatMap((c) => {
     if (c.commands.length > 0) {
-      return c.commands.map((s) => formatCmd(s, c.name()));
+      return c.commands.map((s) => formatCommandInventory(s, c.name()));
     }
-    return [formatCmd(c)];
+    return [formatCommandInventory(c)];
   });
   console.log(lines.join("\n\n"));
 });
 tools.command("list").description("List backend tools available via the dynamic catalog").option("--category <category>", "Filter by category").option("--json", "Output as JSON").action((opts) => handleToolsList(opts));
 tools.command("describe").description("Show description and input schema for a backend tool").argument("<name>", "Tool name (e.g. integration-github)").option("--json", "Output as JSON").action((name, opts) => handleToolsDescribe(name, opts));
 tools.command("call").description("Invoke a backend tool by name with JSON args").argument("<name>", "Tool name").option("--args <json>", "Args as a JSON string (defaults to {})").option("--file <path>", "Path to a JSON file containing args").action((name, opts) => handleToolsCall(name, opts));
-program.command("install").description("Register plugin, hooks, and daemons").option(
+program.command("install").description("Set up FML for local agent use").option(
   "--force",
   "Reinstall even if already set up (upgrades panopticon, re-registers plugin)"
 ).action((opts) => handleInstall(opts));
-program.command("uninstall").description("Remove fml plugin, hooks, and optionally all data").option(
+program.command("uninstall").description("Remove FML agent integrations and optionally local data").option(
   "--target <target>",
   "Target CLI: claude, gemini, codex, claude-desktop, all"
 ).option("--purge", "Also remove all data, logs, and auth tokens").action((opts) => handleUninstall(opts));
 program.command("update").description("Update fml to the latest version").action(() => handleUpdate());
-program.command("login").description("Sign in to your FML account").option("--device", "Use device authorization flow (no browser needed)").action((opts) => handleLogin(opts));
+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_*)"
+).action(
+  (opts) => handleLogin(opts)
+);
 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 current auth and daemon status").action(() => handleStatus());
+program.command("status").description("Show auth and local service status").action(() => handleStatus());
 program.command("doctor").description("Check FML and panopticon configuration 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 environment (dev/prod)").argument("[target]", 'Environment name ("dev", "prod") or custom Convex URL').action((target) => {
+program.command("env").description("Show or switch FML backend environment").argument("[target]", "Environment name or backend URL").action((target) => {
   if (target) handleEnvSwitch(target);
   else handleEnvShow();
 });
-program.command("start").description("Start the panopticon server").action(() => handleStart());
-program.command("stop").description("Stop the panopticon server").action(() => handleStop());
-var panopticon = program.command("panopticon").description("Start or stop the panopticon server");
-panopticon.command("start").description("Start the panopticon server").action(() => handleStart());
-panopticon.command("stop").description("Stop the panopticon server").action(() => handleStop());
-var sync = program.command("sync").description("Manage sync configuration");
+program.command("start").description("Start FML local collection and sync").action(() => handleFmlStart());
+program.command("stop").description("Stop FML local collection and sync").action(() => handleFmlStop());
+var panopticon = program.command("panopticon", { hidden: true }).description("Start or stop the panopticon server");
+panopticon.command("start").description("Start the panopticon server").action(() => handlePanopticonStart());
+panopticon.command("stop").description("Stop the panopticon server").action(() => handlePanopticonStop());
+var sync = program.command("sync").description("Manage sync configuration and troubleshooting");
 sync.command("start").description("Start syncing to configured targets (enable sync)").action(() => handleSyncStart());
 sync.command("stop").description("Stop syncing (disable sync; leaves targets configured)").action(() => handleSyncStop());
 sync.command("setup").description("Configure sync targets (convenience shortcut)").action(() => handleSyncSetup());
@@ -2162,9 +2277,9 @@ program.command("sync-token", { hidden: true }).description(
 ).action((opts) => handleSyncToken(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));
-program.command("timeline").description("Get events for a session").argument("<session-id>", "Session ID").option("--limit <n>", "Max events to return").option("--offset <n>", "Events to skip").action((sessionId, opts) => handleTimeline(sessionId, opts));
+program.command("timeline").description("Get events for a session from `fml sessions`").argument("<session-id>", "Session ID from `fml sessions`").option("--limit <n>", "Max events to return").option("--offset <n>", "Events to skip").action((sessionId, opts) => handleTimeline(sessionId, opts));
 program.command("spending").description("AI token usage and cost breakdown").option("--since <duration>", 'Time filter, e.g. "24h", "7d"').option("--group-by <key>", "Group by: session, model, or day").action((opts) => handleSpending(opts));
-program.command("search").description("Search across all sessions").argument("<query>", "Text to search for").option("--since <duration>", 'Time filter, e.g. "24h", "7d"').option("--limit <n>", "Max results").action((query, opts) => handleSearch(query, opts));
+program.command("search").description("Search FML agent sessions").argument("<query>", "Text to search for").option("--since <duration>", 'Time filter, e.g. "24h", "7d"').option("--limit <n>", "Max results").action((query, opts) => handleSearch(query, opts));
 program.command("query", { hidden: true }).description("Query a connected integration").argument(
   "<provider>",
   "Provider name (sentry, slack, github, linear, notion, freshdesk, stripe, posthog, amplitude, meta-ads)"