@fml-inc/fml 0.7.0 → 0.8.0-rc.2

package/dist/mcp/server.js

@@ -2,22 +2,23 @@
 import {
   createFmlClient,
   getAuthenticatedClient
-} from "../chunk-PTUZMKSN.js";
+} from "../chunk-R45CWWZO.js";
+import {
+  resolveRepoFromCwd
+} from "../chunk-7V7G7NVF.js";
 import {
   FML_DATA_DIR,
   FML_LOG_DIR,
   Sentry,
-  authStorePath,
+  authStorePathFor,
+  getActiveEnv,
   getSelectedOrg,
+  getSiteUrlForConvexUrl,
   getValidToken,
   initSentry,
   readTokens
-} from "../chunk-VV4JHH4H.js";
-import {
-  parsePanopticonRunning
-} from "../chunk-S4TJNLEN.js";
-import "../chunk-YH5ROR7G.js";
-import "../chunk-PZ5AY32C.js";
+} from "../chunk-A6HAEVJX.js";
+import "../chunk-MLKGABMK.js";
 
 // src/mcp/server.ts
 import fs from "fs";
@@ -27,7 +28,6 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 
 // src/mcp/tools.ts
 import { z } from "zod";
-import { resolveRepoFromCwd } from "@fml-inc/panopticon/repo";
 function textResult(data) {
   return {
     content: [{ type: "text", text: JSON.stringify(data, null, 2) }]
@@ -39,38 +39,76 @@ function errorResult(message) {
     isError: true
   };
 }
-var PANOPTICON_HINT = "\n\nFor local data, use the panopticon MCP tools instead (e.g. panopticon__sessions, panopticon__costs, panopticon__search, panopticon__timeline).";
-async function toolHandler(toolName, args) {
+function restrictedSessionToolError(toolName, args) {
+  const allowedSessionId = process.env.FML_MCP_ALLOWED_SESSION_ID;
+  if (allowedSessionId === void 0) return null;
+  if (toolName !== "get-session-timeline" || args.sessionId !== allowedSessionId) {
+    return errorResult(
+      "This system task is restricted to its assigned session timeline."
+    );
+  }
+  return null;
+}
+async function toolHandler(toolName, args, environment) {
   try {
-    const api = await getAuthenticatedClient();
+    const restrictionError = restrictedSessionToolError(toolName, args);
+    if (restrictionError) return restrictionError;
+    const api = await getAuthenticatedClient(environment);
     if (!api) {
       return errorResult(
-        "Not authenticated. Run `fml login` to sign in, then restart Claude Code." + PANOPTICON_HINT
+        "Not authenticated. Run `fml login` to sign in, then restart Claude Code."
       );
     }
     const result = await api.callBackend(toolName, args);
     if (!result.ok) {
-      return errorResult((result.error ?? "Unknown error") + PANOPTICON_HINT);
+      return errorResult(result.error ?? "Unknown error");
     }
     return textResult(result.result);
   } catch (err) {
     Sentry.captureException(err);
     const msg = err instanceof Error ? err.message : String(err);
-    return errorResult(`Unexpected error: ${msg}` + PANOPTICON_HINT);
+    return errorResult(`Unexpected error: ${msg}`);
   }
 }
-function registerTools(server2) {
+function registerTools(server2, environment = getActiveEnv()) {
+  const handleTool = (toolName, args) => toolHandler(toolName, args, environment);
+  const registerSessionTimelineTool = () => {
+    server2.tool(
+      "get_session_timeline",
+      'Get chronological timeline for a coding agent session. Returns messages, hook events, and transcript-derived scanner events interleaved by timestamp. Use source="events" for the scanner event stream (thinking, tool_call, permission_mode, stop_hook_summary, ...); source="hooks" only returns live hook-capture events and is empty for scanner-only sessions. REQUIRES: sessionId from list_engineering_sessions.',
+      {
+        sessionId: z.string().describe("The session ID to get details for."),
+        includeSystemMessages: z.boolean().optional().describe("Include system messages (default false)."),
+        source: z.enum(["messages", "hooks", "events", "all"]).optional().describe(
+          'Filter by source: "messages" (scanner messages only), "hooks" (live hook-capture events only), "events" (transcript-derived scanner events), "all" (everything interleaved). Default "all".'
+        ),
+        eventType: z.string().optional().describe(
+          'Filter hook/scanner events by type (hook: "PermissionRequest", "PreToolUse", "Stop"; scanner: "tool_call", "permission_mode", "stop_hook_summary"). Only applies when source includes hooks or events.'
+        ),
+        limit: z.number().optional().describe("Max entries to return (default 50, max 200)."),
+        offset: z.number().optional().describe("Skip first N entries for pagination.")
+      },
+      async (args) => handleTool("get-session-timeline", args)
+    );
+  };
+  if (process.env.FML_MCP_ALLOWED_SESSION_ID !== void 0) {
+    registerSessionTimelineTool();
+    return;
+  }
   server2.tool(
     "whoami",
     "Show current authenticated user and available organizations",
     {},
     async () => {
-      const tokens = readTokens();
-      const token = tokens ? await getValidToken() : null;
+      const tokens = readTokens(environment.name);
+      const token = tokens ? await getValidToken({ env: environment.name }) : null;
       let orgs = null;
       if (token) {
         try {
-          orgs = await createFmlClient(token).queryOrgs();
+          orgs = await createFmlClient(token, {
+            envName: environment.name,
+            siteUrl: getSiteUrlForConvexUrl(environment.convexUrl)
+          }).queryOrgs();
         } catch {
         }
       }
@@ -96,7 +134,7 @@ function registerTools(server2) {
       ),
       cursor: z.string().optional().describe("Pagination cursor from previous result to get next page")
     },
-    async (args) => toolHandler("list-messages", args)
+    async (args) => handleTool("list-messages", args)
   );
   server2.tool(
     "fml_list_messages_with_context",
@@ -110,7 +148,7 @@ function registerTools(server2) {
         "Number of messages to retrieve after the target (default: 5)"
       )
     },
-    async (args) => toolHandler("list-messages-with-context", args)
+    async (args) => handleTool("list-messages-with-context", args)
   );
   server2.tool(
     "fml_get_slack_channel_history",
@@ -121,7 +159,7 @@ function registerTools(server2) {
       ),
       limit: z.number().optional().describe("Number of messages to fetch (default 20, max 50)")
     },
-    async (args) => toolHandler("get-slack-channel-history", args)
+    async (args) => handleTool("get-slack-channel-history", args)
   );
   server2.tool(
     "fml_get_slack_message",
@@ -140,13 +178,13 @@ function registerTools(server2) {
         "If true, fetches thread replies along with the message (default false)"
       )
     },
-    async (args) => toolHandler("get-slack-message", args)
+    async (args) => handleTool("get-slack-message", args)
   );
   server2.tool(
     "fml_list_skills",
     "List all available FML skills. Skills provide detailed knowledge about FML features.",
     {},
-    async () => toolHandler("list-skills", {})
+    async () => handleTool("list-skills", {})
   );
   server2.tool(
     "fml_load_skill",
@@ -154,7 +192,7 @@ function registerTools(server2) {
     {
       skillId: z.string().describe("The skill ID to load (e.g., 'fml-help', 'fml-navigation')")
     },
-    async (args) => toolHandler("load-skill", args)
+    async (args) => handleTool("load-skill", args)
   );
   server2.tool(
     "fml_search_analysis",
@@ -172,7 +210,7 @@ function registerTools(server2) {
         "Limit to one repository. Omit to search every repo in the caller's organization."
       )
     },
-    async (args) => toolHandler("search-analysis", args)
+    async (args) => handleTool("search-analysis", args)
   );
   server2.tool(
     "fml_run_analysis_workflow",
@@ -197,23 +235,13 @@ function registerTools(server2) {
         "Target repository ID. Omit for single-repo orgs (auto-pick). Required when the org has multiple repos \u2014 the tool will list them in its error if not provided."
       )
     },
-    async (args) => toolHandler("run-analysis-workflow", args)
-  );
-  server2.tool(
-    "fml_run_team_analysis",
-    "Run a team-wide AI coding practice analysis for the caller's organization. Produces a structured report with per-person narratives covering tool usage, collaboration patterns, configuration, and notable changes. Use for prompts like 'run team analysis for the last 14 days' or 'how is the team doing?'. Kicks a durable Convex workflow and returns immediately with a reportId; when called inside a conversation, a completion message is posted back to that conversation when the workflow finishes \u2014 wait for that follow-up turn, do not poll. Idempotent: if a run is already in flight, returns the existing reportId with started=false. Requires org-owner access and at least one running dev environment.",
-    {
-      windowDays: z.number().int().min(1).max(90).optional().describe(
-        "Size of the analysis window in days. Defaults to 30. Clamped to [1, 90]. Match the user's phrasing: 'last 14 days' \u2192 14, 'last month' \u2192 30, 'this week' \u2192 7."
-      )
-    },
-    async (args) => toolHandler("run-team-analysis", args)
+    async (args) => handleTool("run-analysis-workflow", args)
   );
   server2.tool(
     "fml_list_integrations",
     "List integrations for this project \u2014 both connected and available. Use to check what integrations are active.",
     {},
-    async () => toolHandler("list-integrations", {})
+    async () => handleTool("list-integrations", {})
   );
   const integrationTools = [
     {
@@ -271,7 +299,7 @@ function registerTools(server2) {
           "Optional project ID to scope this query. Required for GitHub (needs repo context)."
         )
       },
-      async (args) => toolHandler(tool.mastraId, args)
+      async (args) => handleTool(tool.mastraId, args)
     );
   }
   server2.tool(
@@ -285,7 +313,7 @@ function registerTools(server2) {
       scope: z.enum(["org", "project", "user"]).optional().describe("Query scope. 'org' (default), 'project', or 'user'."),
       githubUsername: z.string().optional().describe("Required when scope is 'user'. GitHub username.")
     },
-    async (args) => toolHandler("get-engineering-activity", args)
+    async (args) => handleTool("get-engineering-activity", args)
   );
   server2.tool(
     "list_engineering_sessions",
@@ -299,25 +327,9 @@ function registerTools(server2) {
       until: z.string().optional().describe("ISO 8601 end timestamp."),
       limit: z.number().optional().describe("Max sessions to return (default 20, max 50).")
     },
-    async (args) => toolHandler("list-engineering-sessions", args)
-  );
-  server2.tool(
-    "get_session_timeline",
-    'Get chronological timeline for a coding agent session. Returns messages and/or hook events interleaved by timestamp. Use source="hooks" to see permission requests, tool approvals, etc. REQUIRES: sessionId from list_engineering_sessions.',
-    {
-      sessionId: z.string().describe("The session ID to get details for."),
-      includeSystemMessages: z.boolean().optional().describe("Include system messages (default false)."),
-      source: z.enum(["messages", "hooks", "all"]).optional().describe(
-        'Filter by source: "messages" (scanner messages only), "hooks" (hook events only), "all" (both interleaved). Default "all".'
-      ),
-      eventType: z.string().optional().describe(
-        'Filter hook events by type (e.g. "PermissionRequest", "PreToolUse", "Stop"). Only applies when source includes hooks.'
-      ),
-      limit: z.number().optional().describe("Max entries to return (default 50, max 200)."),
-      offset: z.number().optional().describe("Skip first N entries for pagination.")
-    },
-    async (args) => toolHandler("get-session-timeline", args)
+    async (args) => handleTool("list-engineering-sessions", args)
   );
+  registerSessionTimelineTool();
   server2.tool(
     "get_session_turns",
     "Get per-turn token accounting for a coding agent session. USE FOR: understanding cost per turn, model used at each step, cache hit analysis. REQUIRES: sessionId from list_engineering_sessions.",
@@ -326,7 +338,7 @@ function registerTools(server2) {
       limit: z.number().optional().describe("Max turns to return (default 50, max 200)."),
       offset: z.number().optional().describe("Skip first N turns for pagination.")
     },
-    async (args) => toolHandler("get-session-turns", args)
+    async (args) => handleTool("get-session-turns", args)
   );
   server2.tool(
     "get_ai_spending",
@@ -335,10 +347,12 @@ function registerTools(server2) {
       timeRange: z.enum(["1h", "6h", "24h", "7d", "30d"]).optional().describe("Default '7d'."),
       since: z.string().optional().describe("ISO 8601 start timestamp."),
       until: z.string().optional().describe("ISO 8601 end timestamp."),
-      groupBy: z.enum(["session", "model", "day"]).optional().describe("How to group results."),
-      target: z.enum(["claude", "codex", "gemini", "mastra"]).optional().describe("Filter by agent type. Omit for all.")
+      groupBy: z.enum(["session", "model", "day", "user"]).optional().describe("How to group results."),
+      target: z.enum(["claude", "codex", "gemini", "mastra"]).optional().describe("Filter by agent type. Omit for all."),
+      limit: z.number().int().min(1).max(500).optional().describe("Maximum groups to return, default 100."),
+      offset: z.number().int().min(0).optional().describe("Groups to skip; use nextOffset from the previous page.")
     },
-    async (args) => toolHandler("get-ai-spending", args)
+    async (args) => handleTool("get-ai-spending", args)
   );
   server2.tool(
     "search_engineering_sessions",
@@ -351,7 +365,7 @@ function registerTools(server2) {
       target: z.enum(["claude", "codex", "gemini", "mastra"]).optional().describe("Filter by agent type. Omit for all."),
       limit: z.number().optional().describe("Max results (default 20).")
     },
-    async (args) => toolHandler("search-engineering-sessions", args)
+    async (args) => handleTool("search-engineering-sessions", args)
   );
   server2.tool(
     "list_user_configs",
@@ -359,9 +373,9 @@ function registerTools(server2) {
     {},
     async () => {
       try {
-        const orgSlug = getSelectedOrg();
+        const orgSlug = getSelectedOrg(environment.name);
         if (!orgSlug) return errorResult("No org selected. Run `fml login`.");
-        const api = await getAuthenticatedClient();
+        const api = await getAuthenticatedClient(environment);
         if (!api) return errorResult("Not authenticated. Run `fml login`.");
         const result = await api.listUserConfigSnapshots(orgSlug);
         return textResult(result);
@@ -381,9 +395,9 @@ function registerTools(server2) {
     },
     async (args) => {
       try {
-        const orgSlug = getSelectedOrg();
+        const orgSlug = getSelectedOrg(environment.name);
         if (!orgSlug) return errorResult("No org selected. Run `fml login`.");
-        const api = await getAuthenticatedClient();
+        const api = await getAuthenticatedClient(environment);
         if (!api) return errorResult("Not authenticated. Run `fml login`.");
         const result = await api.getUserConfigDetail(
           orgSlug,
@@ -408,9 +422,9 @@ function registerTools(server2) {
     },
     async (args) => {
       try {
-        const orgSlug = getSelectedOrg();
+        const orgSlug = getSelectedOrg(environment.name);
         if (!orgSlug) return errorResult("No org selected. Run `fml login`.");
-        const api = await getAuthenticatedClient();
+        const api = await getAuthenticatedClient(environment);
         if (!api) return errorResult("Not authenticated. Run `fml login`.");
         const result = await api.listRepoConfigSnapshots(
           orgSlug,
@@ -433,9 +447,9 @@ function registerTools(server2) {
     },
     async (args) => {
       try {
-        const orgSlug = getSelectedOrg();
+        const orgSlug = getSelectedOrg(environment.name);
         if (!orgSlug) return errorResult("No org selected. Run `fml login`.");
-        const api = await getAuthenticatedClient();
+        const api = await getAuthenticatedClient(environment);
         if (!api) return errorResult("Not authenticated. Run `fml login`.");
         const result = await api.getRepoConfigDetail(orgSlug, args.repository);
         if (!result)
@@ -458,6 +472,16 @@ function registerTools(server2) {
     }
   };
   const anamnesisResult = (result) => result.ok ? textResult(result.result) : errorResult(result.error ?? "Unknown error");
+  const withAnamnesisErrors = async (handler) => {
+    try {
+      return await handler();
+    } catch (err) {
+      Sentry.captureException(err);
+      return errorResult(
+        `Error: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  };
   server2.tool(
     "fml_path_history",
     "Ground-truth history for a file path: PRs that touched it and review comments on it (newest first). USE FOR: understanding why a file looks the way it does, who changed it, related PRs.",
@@ -466,13 +490,13 @@ function registerTools(server2) {
       repo: z.string().optional().describe("owner/repo. Defaults to the current working repo."),
       limit: z.number().optional().describe("Max items per list (default 25).")
     },
-    async (args) => {
+    async (args) => await withAnamnesisErrors(async () => {
       const repo = resolveRepoArg(args.repo);
       if (!repo)
         return errorResult(
           "Could not determine repo \u2014 pass `repo` (owner/repo)."
         );
-      const api = await getAuthenticatedClient();
+      const api = await getAuthenticatedClient(environment);
       if (!api) return errorResult("Not authenticated. Run `fml login`.");
       return anamnesisResult(
         await api.anamnesisContext("path", {
@@ -481,7 +505,7 @@ function registerTools(server2) {
           limit: args.limit
         })
       );
-    }
+    })
   );
   server2.tool(
     "fml_commit_context",
@@ -490,18 +514,18 @@ function registerTools(server2) {
       sha: z.string().describe("Commit sha (full or abbreviated)."),
       repo: z.string().optional().describe("owner/repo. Defaults to the current working repo.")
     },
-    async (args) => {
+    async (args) => await withAnamnesisErrors(async () => {
       const repo = resolveRepoArg(args.repo);
       if (!repo)
         return errorResult(
           "Could not determine repo \u2014 pass `repo` (owner/repo)."
         );
-      const api = await getAuthenticatedClient();
+      const api = await getAuthenticatedClient(environment);
       if (!api) return errorResult("Not authenticated. Run `fml login`.");
       return anamnesisResult(
         await api.anamnesisContext("commit", { repo, sha: args.sha })
       );
-    }
+    })
   );
   server2.tool(
     "fml_pr_context",
@@ -511,13 +535,13 @@ function registerTools(server2) {
       repo: z.string().optional().describe("owner/repo. Defaults to the current working repo."),
       limit: z.number().optional().describe("Max items per list (default 25).")
     },
-    async (args) => {
+    async (args) => await withAnamnesisErrors(async () => {
       const repo = resolveRepoArg(args.repo);
       if (!repo)
         return errorResult(
           "Could not determine repo \u2014 pass `repo` (owner/repo)."
         );
-      const api = await getAuthenticatedClient();
+      const api = await getAuthenticatedClient(environment);
       if (!api) return errorResult("Not authenticated. Run `fml login`.");
       return anamnesisResult(
         await api.anamnesisContext("pr", {
@@ -526,7 +550,7 @@ function registerTools(server2) {
           limit: args.limit
         })
       );
-    }
+    })
   );
   server2.tool(
     "fml_anamnesis_query",
@@ -540,16 +564,16 @@ function registerTools(server2) {
       repo: z.string().optional().describe("owner/repo. Defaults to the current working repo."),
       limit: z.number().optional().describe("Max facts (default 25).")
     },
-    async (args) => {
+    async (args) => await withAnamnesisErrors(async () => {
       const repo = resolveRepoArg(args.repo);
       if (!repo)
         return errorResult(
           "Could not determine repo \u2014 pass `repo` (owner/repo)."
         );
-      const api = await getAuthenticatedClient();
+      const api = await getAuthenticatedClient(environment);
       if (!api) return errorResult("Not authenticated. Run `fml login`.");
       return anamnesisResult(await api.anamnesisQuery({ ...args, repo }));
-    }
+    })
   );
 }
 
@@ -559,9 +583,10 @@ var server = new McpServer({
   name: "fml",
   version: "0.1.0"
 });
-registerTools(server);
 async function main() {
   await initSentry();
+  const environment = getActiveEnv();
+  registerTools(server, environment);
   if (!fs.existsSync(FML_LOG_DIR)) {
     fs.mkdirSync(FML_LOG_DIR, { recursive: true });
   }
@@ -570,10 +595,10 @@ async function main() {
   process.stderr.write = logStream.write.bind(
     logStream
   );
-  const tokens = readTokens();
-  const tokenValid = tokens ? await getValidToken() : null;
+  const tokens = readTokens(environment.name);
+  const tokenValid = tokens ? await getValidToken({ env: environment.name }) : null;
   if (!tokens) {
-    const storePath = authStorePath();
+    const storePath = authStorePathFor(environment.name);
     try {
       const files = fs.readdirSync(FML_DATA_DIR).join(", ") || "(empty)";
       console.error(
@@ -596,20 +621,9 @@ async function main() {
   }
   const transport = new StdioServerTransport();
   await server.connect(transport);
-  if (!parsePanopticonRunning()) {
-    try {
-      const { handlePanopticonStart } = await import("../daemon-MSLDHLMH.js");
-      await handlePanopticonStart();
-    } catch {
-      console.error(
-        "[fml] Warning: could not start panopticon. Run `fml start` manually"
-      );
-    }
-  }
 }
 main().catch((err) => {
   Sentry.captureException(err);
   console.error("FML MCP server error:", err);
   process.exit(1);
 });
-//# sourceMappingURL=server.js.map