@fml-inc/fml 0.8.3 → 0.8.4-rc.2

package/dist/hook-handler.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import {
   hookCaptureIsDisabled
-} from "./chunk-UZG65JUB.js";
+} from "./chunk-IIGTUGO5.js";
 import {
   getActiveHookDestinationBinding
-} from "./chunk-E6YIJCIE.js";
+} from "./chunk-ZGA57JPY.js";
 import {
   SHELL_TOOL_NAMES,
   createHookInboxEntry,
@@ -12,7 +12,7 @@ import {
   normalizeObserverHookCapture,
   persistHookInboxEntry,
   readObserverAuthToken
-} from "./chunk-F4A2POJX.js";
+} from "./chunk-732O7ISN.js";
 import {
   resolveRepositoryRootFromCwd,
   resolveRepositorySlugFromCwd
@@ -23,7 +23,7 @@ import {
   FML_OBSERVER_AUTH_TOKEN_FILE,
   FML_OBSERVER_ENDPOINT_FILE,
   getValidToken
-} from "./chunk-TNJVAET3.js";
+} from "./chunk-ZBSC57CW.js";
 import "./chunk-MLKGABMK.js";
 
 // src/hooks/handler.ts

package/dist/mcp/server.js

@@ -2,7 +2,7 @@
 import {
   createFmlClient,
   getAuthenticatedClient
-} from "../chunk-26RJC76L.js";
+} from "../chunk-P4HOUZXC.js";
 import {
   resolveRepoFromCwd
 } from "../chunk-7V7G7NVF.js";
@@ -17,7 +17,7 @@ import {
   getValidToken,
   initSentry,
   readTokens
-} from "../chunk-TNJVAET3.js";
+} from "../chunk-ZBSC57CW.js";
 import "../chunk-MLKGABMK.js";
 
 // src/mcp/server.ts
@@ -342,13 +342,16 @@ function registerTools(server2, environment = getActiveEnv()) {
   );
   server2.tool(
     "get_ai_spending",
-    "Get AI spending and token usage data. Groups by 'session' (default), 'model', or 'day'.",
+    "Get AI spending and token usage data. Groups by 'session' (default), 'model', 'day', or 'user'. Usage is event-time attributed: day groups reflect when tokens were actually consumed, in each author's local timezone, not session start times. Time windows have 15-minute bucket resolution.",
     {
       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", "user"]).optional().describe("How to group results."),
       target: z.enum(["claude", "codex", "gemini", "mastra"]).optional().describe("Filter by agent type. Omit for all."),
+      timezone: z.string().optional().describe(
+        "IANA timezone fallback for day grouping when a session's author has no recorded timezone (author-recorded timezones win). Defaults to UTC."
+      ),
       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.")
     },

package/dist/observer-server.js

@@ -1,16 +1,21 @@
 #!/usr/bin/env node
 import {
   ObserverStateMutationBusyError,
+  checkForUpdate,
   claimObserverState,
   createInitialObserverState,
+  isUpdatableVersion,
+  isWinShim,
   observerLeaseIsOwned,
+  quoteWinArg,
   removeObserverStateIfOwned,
+  resolveBin,
   updateObserverState
-} from "./chunk-3WDAKM5B.js";
+} from "./chunk-NP7HI4UC.js";
 import {
   createHookSyncLoop,
   getActiveHookDestinationBinding
-} from "./chunk-E6YIJCIE.js";
+} from "./chunk-ZGA57JPY.js";
 import {
   OBSERVER_PROTOCOL_VERSION,
   OBSERVER_SERVICE_NAME,
@@ -25,15 +30,15 @@ import {
   parseHookInboxMetadata,
   readHookInboxStatusAsync,
   retireHookInboxEntry
-} from "./chunk-F4A2POJX.js";
+} from "./chunk-732O7ISN.js";
 import "./chunk-7V7G7NVF.js";
 import {
   ObserverSyncCycleAbortedError,
   runObserverSyncCycleSubprocess
-} from "./chunk-IZH4MDS4.js";
+} from "./chunk-LWOINL4K.js";
 import {
   createCliRawSync
-} from "./chunk-UGUYQVUW.js";
+} from "./chunk-T3ZFT3QP.js";
 import {
   FML_OBSERVER_AUTH_TOKEN_FILE,
   FML_OBSERVER_ENDPOINT_FILE,
@@ -44,17 +49,167 @@ import {
   FML_PANOPTICON_DB_FILE,
   FML_PANOPTICON_DB_OBSERVER_LOCK_FILE,
   FML_PANOPTICON_DB_OBSERVER_STATE_FILE,
+  FML_UPDATE_LOG_FILE,
   ensureDirs,
   getActiveEnv,
   getSiteUrlForConvexUrl,
   getSyncDestinationAuthBinding,
   getValidToken,
   observerOnlyOverrideWarning
-} from "./chunk-TNJVAET3.js";
+} from "./chunk-ZBSC57CW.js";
 import "./chunk-MLKGABMK.js";
 
 // src/observer-server.ts
+import fs2 from "fs";
+
+// src/observer/update-runner.ts
+import { spawn } from "child_process";
 import fs from "fs";
+import os from "os";
+import path from "path";
+var NPM_VIEW_TIMEOUT_MS = 6e4;
+var LOG_ROTATE_BYTES = 10 * 1024 * 1024;
+var LOG_ROTATE_FILES = 3;
+function errorMessage(error) {
+  return error instanceof Error ? error.message : String(error);
+}
+function buildSpawnInvocation(bin, args, winShim) {
+  if (winShim) {
+    return {
+      command: [bin, ...args].map(quoteWinArg).join(" "),
+      args: [],
+      shell: true
+    };
+  }
+  return { command: bin, args, shell: false };
+}
+function runNpmView(target, env, deps = {}) {
+  const spawnFn = deps.spawn ?? spawn;
+  const resolveBinFn = deps.resolveBin ?? resolveBin;
+  const timeoutMs = deps.timeoutMs ?? NPM_VIEW_TIMEOUT_MS;
+  const npm = resolveBinFn("npm");
+  if (!npm) {
+    return Promise.reject(new Error("npm was not found on PATH"));
+  }
+  const invocation = buildSpawnInvocation(
+    npm,
+    ["view", target, "version", "--json"],
+    isWinShim(npm)
+  );
+  return new Promise((resolve, reject) => {
+    const child = spawnFn(invocation.command, invocation.args, {
+      cwd: os.homedir(),
+      env,
+      stdio: ["ignore", "pipe", "pipe"],
+      shell: invocation.shell,
+      windowsHide: true
+    });
+    let stdout = "";
+    let stderr = "";
+    let settled = false;
+    let timer;
+    const settle = (callback) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      callback();
+    };
+    timer = setTimeout(() => {
+      settle(() => {
+        child.kill("SIGKILL");
+        reject(new Error(`npm view timed out after ${timeoutMs}ms`));
+      });
+    }, timeoutMs);
+    timer.unref();
+    child.stdout?.setEncoding("utf8");
+    child.stdout?.on("data", (chunk) => {
+      stdout += chunk;
+    });
+    child.stderr?.setEncoding("utf8");
+    child.stderr?.on("data", (chunk) => {
+      stderr += chunk;
+    });
+    child.once("error", (error) => {
+      settle(() => reject(error));
+    });
+    child.once("close", (code, signal) => {
+      settle(() => {
+        if (code !== 0) {
+          reject(
+            new Error(
+              stderr.trim() || `npm view exited with ${signal ? `signal ${signal}` : `status ${code}`}`
+            )
+          );
+          return;
+        }
+        resolve(stdout);
+      });
+    });
+  });
+}
+function rotateUpdateLog() {
+  let size = 0;
+  try {
+    size = fs.statSync(FML_UPDATE_LOG_FILE).size;
+  } catch {
+    return;
+  }
+  if (size < LOG_ROTATE_BYTES) return;
+  try {
+    fs.rmSync(`${FML_UPDATE_LOG_FILE}.${LOG_ROTATE_FILES}`, { force: true });
+    for (let index = LOG_ROTATE_FILES - 1; index >= 1; index -= 1) {
+      const source = `${FML_UPDATE_LOG_FILE}.${index}`;
+      if (fs.existsSync(source)) {
+        fs.renameSync(source, `${FML_UPDATE_LOG_FILE}.${index + 1}`);
+      }
+    }
+    fs.renameSync(FML_UPDATE_LOG_FILE, `${FML_UPDATE_LOG_FILE}.1`);
+  } catch {
+  }
+}
+function openUpdateLog() {
+  try {
+    fs.mkdirSync(path.dirname(FML_UPDATE_LOG_FILE), {
+      recursive: true,
+      mode: 448
+    });
+    rotateUpdateLog();
+    return fs.openSync(FML_UPDATE_LOG_FILE, "a", 384);
+  } catch (error) {
+    console.warn(`[fml] Auto-update log unavailable: ${errorMessage(error)}`);
+    return "ignore";
+  }
+}
+function spawnObserverUpdate(deps = {}) {
+  const spawnFn = deps.spawn ?? spawn;
+  const resolve = deps.resolveBin ?? resolveBin;
+  const warn = deps.warn ?? console.warn;
+  const openLog = deps.openLog ?? openUpdateLog;
+  const closeLog = deps.closeLog ?? fs.closeSync;
+  const fml = resolve("fml");
+  if (!fml) {
+    warn("[fml] Auto-update skipped: fml was not found on PATH");
+    return;
+  }
+  const log = openLog();
+  const invocation = buildSpawnInvocation(
+    fml,
+    ["update", "--non-interactive"],
+    isWinShim(fml)
+  );
+  const child = spawnFn(invocation.command, invocation.args, {
+    cwd: os.homedir(),
+    detached: true,
+    stdio: ["ignore", log, log],
+    shell: invocation.shell,
+    windowsHide: true
+  });
+  child.once("error", (error) => {
+    warn(`[fml] Auto-update failed to start: ${error.message}`);
+  });
+  child.unref();
+  if (typeof log === "number") closeLog(log);
+}
 
 // src/otel/sync-loop.ts
 import { createHash } from "crypto";
@@ -157,17 +312,17 @@ function validateProtobufPartialSuccess(body) {
       continue;
     }
     if (fieldNumber === 2n && wireType === 2) {
-      const errorMessage = parseLengthDelimited(body, offset);
-      if (!errorMessage) {
+      const errorMessage3 = parseLengthDelimited(body, offset);
+      if (!errorMessage3) {
         return {
           error: "OTLP partial-success response has a malformed error message"
         };
       }
-      offset = errorMessage.nextOffset;
+      offset = errorMessage3.nextOffset;
       let decoded;
       try {
         decoded = new TextDecoder("utf-8", { fatal: true }).decode(
-          errorMessage.value
+          errorMessage3.value
         );
       } catch {
         return {
@@ -1044,6 +1199,60 @@ function createObserverSyncLoop(opts) {
   };
 }
 
+// src/observer/auto-update.ts
+var AUTO_UPDATE_INTERVAL_MS = 60 * 60 * 1e3;
+var AUTO_UPDATE_JITTER_MS = 10 * 60 * 1e3;
+function errorMessage2(error) {
+  return error instanceof Error ? error.message : String(error);
+}
+function createAutoUpdater(dependencies) {
+  let timer;
+  let stopped = true;
+  let generation = 0;
+  const nextDelay = () => {
+    if (dependencies.jitterMs <= 0) return dependencies.intervalMs;
+    const range = dependencies.jitterMs * 2 + 1;
+    const offset = dependencies.nowMs() % range - dependencies.jitterMs;
+    return Math.max(0, dependencies.intervalMs + offset);
+  };
+  const schedule = () => {
+    if (stopped) return;
+    timer = setTimeout(onTick, nextDelay());
+    timer.unref();
+  };
+  const onTick = async () => {
+    const tickGeneration = generation;
+    timer = void 0;
+    try {
+      const result = await dependencies.runCheck();
+      if (!stopped && result.newer) dependencies.spawnUpdate();
+    } catch (error) {
+      if (!stopped) {
+        dependencies.log(
+          `[fml] Auto-update check failed: ${errorMessage2(error)}`
+        );
+      }
+    } finally {
+      if (tickGeneration === generation) schedule();
+    }
+  };
+  return {
+    start() {
+      if (!stopped || !isUpdatableVersion(dependencies.currentVersion) || process.env.FML_AUTO_UPDATE === "off") {
+        return;
+      }
+      stopped = false;
+      schedule();
+    },
+    stop() {
+      stopped = true;
+      generation += 1;
+      clearTimeout(timer);
+      timer = void 0;
+    }
+  };
+}
+
 // src/observer-server.ts
 var HEARTBEAT_INTERVAL_MS = 5e3;
 var STATE_UPDATE_RETRY_MS = 50;
@@ -1073,7 +1282,7 @@ function removeInitialLeasesBestEffort(instanceId) {
 function persistedPort() {
   try {
     const parsed = JSON.parse(
-      fs.readFileSync(FML_OBSERVER_ENDPOINT_FILE, "utf8")
+      fs2.readFileSync(FML_OBSERVER_ENDPOINT_FILE, "utf8")
     );
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
       return null;
@@ -1086,7 +1295,7 @@ function persistedPort() {
 }
 function writeEndpoint(port) {
   const tempFile = `${FML_OBSERVER_ENDPOINT_FILE}.${process.pid}.tmp`;
-  fs.writeFileSync(
+  fs2.writeFileSync(
     tempFile,
     `${JSON.stringify({
       service: OBSERVER_SERVICE_NAME,
@@ -1097,7 +1306,7 @@ function writeEndpoint(port) {
 `,
     { mode: 384 }
   );
-  fs.renameSync(tempFile, FML_OBSERVER_ENDPOINT_FILE);
+  fs2.renameSync(tempFile, FML_OBSERVER_ENDPOINT_FILE);
 }
 async function tryListen(server2, port) {
   return await new Promise((resolve, reject) => {
@@ -1193,6 +1402,7 @@ var hookQuarantinePruneTimer = null;
 var stateUpdateRetryTimer = null;
 var syncLoop = null;
 var hookSyncLoop = null;
+var autoUpdater = null;
 var otlpSyncLoop = null;
 var pendingStateUpdate = null;
 var authToken;
@@ -1239,7 +1449,7 @@ var hookRejectionStatus = () => ({
   ...lastRejectedReason !== void 0 ? { lastRejectedReason } : {},
   ...lastRejectedTarget !== void 0 ? { lastRejectedTarget } : {}
 });
-var packageVersion = true ? "0.8.3+499a546c" : "dev";
+var packageVersion = true ? "0.8.4-rc.2+f282df41" : "dev";
 var health = () => ({
   status: "ok",
   service: OBSERVER_SERVICE_NAME,
@@ -1305,6 +1515,7 @@ var shutdown = async () => {
   if (hookInboxDrainTimer) clearInterval(hookInboxDrainTimer);
   if (hookQuarantinePruneTimer) clearInterval(hookQuarantinePruneTimer);
   if (stateUpdateRetryTimer) clearTimeout(stateUpdateRetryTimer);
+  autoUpdater?.stop();
   if (bothObserverLeasesAreOwned(state.instanceId)) {
     try {
       state = updateBothObserverStates(state, {
@@ -1511,6 +1722,20 @@ try {
     updateState({ heartbeatAtMs: Date.now() });
   }, HEARTBEAT_INTERVAL_MS);
   heartbeatTimer.unref();
+  autoUpdater = createAutoUpdater({
+    currentVersion: packageVersion,
+    nowMs: Date.now,
+    runCheck: () => checkForUpdate({
+      currentVersion: packageVersion,
+      env: process.env,
+      runNpmView
+    }),
+    spawnUpdate: spawnObserverUpdate,
+    intervalMs: AUTO_UPDATE_INTERVAL_MS,
+    jitterMs: AUTO_UPDATE_JITTER_MS,
+    log: console.warn
+  });
+  autoUpdater.start();
   await drainPendingHookInbox();
   hookInboxDrainTimer = setInterval(() => {
     void drainPendingHookInbox();

package/dist/pi/extension.js

@@ -830,6 +830,7 @@ var FML_OBSERVER_ENDPOINT_FILE = path3.join(
   "endpoint.json"
 );
 var FML_OBSERVER_LOG_FILE = path3.join(FML_LOG_DIR, "observer.log");
+var FML_UPDATE_LOG_FILE = path3.join(FML_LOG_DIR, "update.log");
 var FML_INSTALLATION_ID_FILE = path3.join(
   FML_STATE_DIR,
   "installation_id"

package/dist/sync-cycle.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import {
   runObserverSyncCycle
-} from "./chunk-IZH4MDS4.js";
-import "./chunk-UGUYQVUW.js";
-import "./chunk-TNJVAET3.js";
+} from "./chunk-LWOINL4K.js";
+import "./chunk-T3ZFT3QP.js";
+import "./chunk-ZBSC57CW.js";
 import "./chunk-MLKGABMK.js";
 
 // src/sync-cycle.ts

package/dist/{token-store-7OI3CMM4.js → token-store-QYXUL4NG.js}

@@ -10,7 +10,7 @@ import {
   setSelectedOrg,
   storeServiceRefreshToken,
   writeTokens
-} from "./chunk-TNJVAET3.js";
+} from "./chunk-ZBSC57CW.js";
 import "./chunk-MLKGABMK.js";
 export {
   SERVICE_TOKEN_LOGIN_USER_ID,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fml-inc/fml",
-  "version": "0.8.3",
+  "version": "0.8.4-rc.2",
   "description": "FML CLI and agent tools",
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",