@fml-inc/fml 0.8.9 → 0.8.10

package/dist/{chunk-TWJ62CZX.js → chunk-U4BM27VN.js}

@@ -53,7 +53,7 @@ var PACKAGE_NAME = "@fml-inc/fml";
 var UPDATE_TIMEOUT_MS = 12e4;
 var SETUP_TIMEOUT_MS = 3e5;
 function getCurrentVersion() {
-  return true ? "0.8.9+6863d154" : "unknown";
+  return true ? "0.8.10+45913c27" : "unknown";
 }
 function parseVersion(version) {
   const match = SEMVER_PATTERN.exec(version);

package/dist/{chunk-H5LWJ5PH.js → chunk-XB7EIDWY.js}

@@ -75,7 +75,8 @@ var HOOK_TARGETS = Object.freeze([
   "codex",
   "gemini",
   "grok",
-  "pi"
+  "pi",
+  "mini-swe-agent"
 ]);
 function isHookTarget(value) {
   return typeof value === "string" && HOOK_TARGETS.some((targetId) => targetId === value);
@@ -155,6 +156,14 @@ var hook_events_default = {
     "PreCompact",
     "PostCompact",
     "SessionEnd"
+  ],
+  "mini-swe-agent": [
+    "SessionStart",
+    "UserPromptSubmit",
+    "BeforeModel",
+    "PostToolUse",
+    "Stop",
+    "SessionEnd"
   ]
 };
 
@@ -172,6 +181,9 @@ var GROK_HOOK_EVENTS = Object.freeze([
   ...hook_events_default.grok
 ]);
 var PI_HOOK_EVENTS = Object.freeze([...hook_events_default.pi]);
+var MINI_SWE_AGENT_HOOK_EVENTS = Object.freeze([
+  ...hook_events_default["mini-swe-agent"]
+]);
 
 // ../../packages/agent-targets/src/hooks/read-command.ts
 import path2 from "path";
@@ -547,9 +559,9 @@ function normalizedEvent(target, payload, context) {
     "command"
   );
   const toolName = firstString(payload, ["tool_name", "toolName", "name"]);
-  const filePath = firstString(payload, ["file_path", "filePath", "path"]) ?? (toolInput ? firstString(toolInput, ["file_path", "filePath", "path"]) : void 0) ?? (command && toolName && SHELL_TOOL_NAMES.has(toolName.toLowerCase()) ? extractReadFilePathFromCommand(command) ?? void 0 : void 0);
+  const filePath = firstString(payload, ["file_path", "filePath", "path"]) ?? (toolInput ? firstString(toolInput, ["file_path", "filePath", "path"]) : void 0) ?? (target !== "mini-swe-agent" && command && toolName && SHELL_TOOL_NAMES.has(toolName.toLowerCase()) ? extractReadFilePathFromCommand(command) ?? void 0 : void 0);
   const userPrompt = boundedExtractedText(
-    firstText(payload, ["prompt", "user_prompt", "userPrompt"]) ?? (target === "gemini" ? geminiUserPrompt(payload) : void 0),
+    target === "mini-swe-agent" && eventType !== "UserPromptSubmit" ? void 0 : firstText(payload, ["prompt", "user_prompt", "userPrompt"]) ?? (target === "gemini" ? geminiUserPrompt(payload) : void 0),
     "user_prompt"
   );
   const plan = boundedExtractedText(firstText(payload, ["plan"]), "plan");
@@ -605,7 +617,8 @@ var HOOK_NORMALIZATION_CAPABILITIES = Object.freeze([
   capability("codex", CODEX_HOOK_EVENTS),
   capability("gemini", GEMINI_HOOK_EVENTS),
   capability("grok", GROK_HOOK_EVENTS),
-  capability("pi", PI_HOOK_EVENTS)
+  capability("pi", PI_HOOK_EVENTS),
+  capability("mini-swe-agent", MINI_SWE_AGENT_HOOK_EVENTS)
 ]);
 function parseHookCaptureRequest(value) {
   if (!isRecord(value) || !isHookTarget(value.target)) return null;
@@ -695,6 +708,7 @@ var MAX_HOOK_DESTINATION_IDENTITY_BYTES = 4 * 1024;
 var DEFAULT_OTLP_OUTBOX_BATCH_SIZE = 100;
 var MAX_OTLP_OUTBOX_BATCH_SIZE = 100;
 var MAX_OTLP_ENVELOPE_BYTES = 16 * 1024 * 1024;
+var DEFAULT_OTLP_SPOOL_MAX_AGE_MS = 24 * 60 * 60 * 1e3;
 var DEFAULT_OTLP_SPOOL_MAX_BYTES = 1024 * 1024 * 1024;
 var MAX_OTLP_ENVELOPE_ID_BYTES = 1024;
 var MAX_OTLP_OBSERVER_INSTANCE_ID_BYTES = 4 * 1024;
@@ -703,8 +717,6 @@ var MAX_OTLP_DROP_REASON_BYTES = 4 * 1024;
 var MAX_OTLP_DESTINATION_ORGANIZATION_ID_BYTES = 128;
 var MAX_OTLP_DESTINATION_ORGANIZATION_SLUG_BYTES = 4 * 1024;
 var OWNERLESS_OTLP_DROP_REASON = "ownerless";
-var OTLP_CAPACITY_DROP_REASON = "spool_capacity";
-var OTLP_ENTRY_TOO_LARGE_DROP_REASON = "spool_entry_too_large";
 var OTLP_ROW_FIXED_LOGICAL_BYTES = 256;
 var MAX_TIMESTAMP_MS = 864e13;
 var QUARANTINE_PRUNE_INTERVAL_MS = 5 * 60 * 1e3;
@@ -1002,15 +1014,23 @@ function enforceOwnerOnlyMode(filePath, mode) {
 function openObserverDatabase(databaseFile, options = {}) {
   const maxHookSpoolBytes = options.maxHookSpoolBytes;
   const maxOtlpSpoolBytes = options.maxOtlpSpoolBytes ?? DEFAULT_OTLP_SPOOL_MAX_BYTES;
-  const maxHookQuarantineAgeMs = options.maxHookQuarantineAgeMs;
-  if (maxHookSpoolBytes !== void 0 && (!Number.isSafeInteger(maxHookSpoolBytes) || maxHookSpoolBytes < 1)) {
+  if (!Number.isSafeInteger(maxOtlpSpoolBytes) || maxOtlpSpoolBytes < 1) {
     throw new Error(
-      "Hook spool maximum must be a positive safe integer number of bytes"
+      "OTLP spool maximum must be a positive safe integer number of bytes"
     );
   }
-  if (!Number.isSafeInteger(maxOtlpSpoolBytes) || maxOtlpSpoolBytes < 1) {
+  const otlpLowWaterBytes = Math.floor(maxOtlpSpoolBytes * 0.9);
+  let otlpCapacityCleanupActive = false;
+  const maxOtlpSpoolAgeMs = options.maxOtlpSpoolAgeMs ?? DEFAULT_OTLP_SPOOL_MAX_AGE_MS;
+  if (!Number.isSafeInteger(maxOtlpSpoolAgeMs) || maxOtlpSpoolAgeMs < 1) {
     throw new Error(
-      "OTLP spool maximum must be a positive safe integer number of bytes"
+      "OTLP spool maximum age must be a positive safe integer number of milliseconds"
+    );
+  }
+  const maxHookQuarantineAgeMs = options.maxHookQuarantineAgeMs;
+  if (maxHookSpoolBytes !== void 0 && (!Number.isSafeInteger(maxHookSpoolBytes) || maxHookSpoolBytes < 1)) {
+    throw new Error(
+      "Hook spool maximum must be a positive safe integer number of bytes"
     );
   }
   if (maxHookQuarantineAgeMs !== void 0 && (!Number.isSafeInteger(maxHookQuarantineAgeMs) || maxHookQuarantineAgeMs < 1)) {
@@ -2031,27 +2051,24 @@ function openObserverDatabase(databaseFile, options = {}) {
         last_drop_reason = ?
       WHERE singleton = 1
     `);
-    const otlpCapacityEvictionPlan = database.prepare(`
-      WITH ordered AS (
-        SELECT
-          logical_bytes,
-          length(body) AS body_bytes,
-          SUM(logical_bytes) OVER (ORDER BY id ASC) - logical_bytes
-            AS preceding_bytes
-        FROM otlp_envelope_outbox
-      )
-      SELECT
-        COUNT(*) AS record_count,
-        COALESCE(SUM(logical_bytes), 0) AS logical_bytes,
-        COALESCE(SUM(body_bytes), 0) AS body_bytes
-      FROM ordered
-      WHERE preceding_bytes < ?
+    const hasExpiredOtlpEnvelopes = database.prepare(`
+      SELECT 1 FROM otlp_envelope_outbox WHERE captured_at_ms < ? LIMIT 1
     `);
-    const evictOldestPendingOtlpEnvelopes = database.prepare(`
-      DELETE FROM otlp_envelope_outbox
-      WHERE id IN (
-        SELECT id FROM otlp_envelope_outbox ORDER BY id ASC LIMIT ?
-      )
+    const expiredOtlpEnvelopes = database.prepare(`
+      SELECT id, logical_bytes, length(body) AS body_bytes
+      FROM otlp_envelope_outbox
+      WHERE captured_at_ms < ?
+      ORDER BY captured_at_ms, id
+      LIMIT 100
+    `);
+    const oldestOtlpEnvelopes = database.prepare(`
+      SELECT id, logical_bytes, length(body) AS body_bytes
+      FROM otlp_envelope_outbox
+      ORDER BY captured_at_ms, id
+      LIMIT 100
+    `);
+    const deleteExpiredOtlpEnvelope = database.prepare(`
+      DELETE FROM otlp_envelope_outbox WHERE id = ?
     `);
     const getDestinationPendingOtlpEnvelopeAccounting = database.prepare(`
       SELECT logical_bytes, length(body) AS body_bytes
@@ -2652,42 +2669,6 @@ function openObserverDatabase(databaseFile, options = {}) {
             );
             return null;
           }
-          if (logicalBytes > maxOtlpSpoolBytes) {
-            recordOtlpDrop(
-              1,
-              logicalBytes,
-              envelope.body.byteLength,
-              capturedAtMs,
-              OTLP_ENTRY_TOO_LARGE_DROP_REASON
-            );
-            return null;
-          }
-          const retainedBytes = requireSpoolInteger(
-            getOtlpSpoolState.get(),
-            "logical_bytes"
-          );
-          const bytesToFree = retainedBytes + logicalBytes - maxOtlpSpoolBytes;
-          if (bytesToFree > 0) {
-            const plan = otlpCapacityEvictionPlan.get(bytesToFree);
-            const evictedRecords = requireSpoolInteger(plan, "record_count");
-            const evictedLogicalBytes = requireSpoolInteger(
-              plan,
-              "logical_bytes"
-            );
-            const evictedBodyBytes = requireSpoolInteger(plan, "body_bytes");
-            if (evictedRecords === 0 || evictedLogicalBytes < bytesToFree || evictOldestPendingOtlpEnvelopes.run(evictedRecords).changes !== evictedRecords) {
-              throw new Error(
-                "FML observer OTLP spool accounting could not enforce its limit"
-              );
-            }
-            recordOtlpDrop(
-              evictedRecords,
-              evictedLogicalBytes,
-              evictedBodyBytes,
-              capturedAtMs,
-              OTLP_CAPACITY_DROP_REASON
-            );
-          }
           captureOtlpEnvelope.run(
             envelopeId,
             envelope.observerInstanceId,
@@ -2885,6 +2866,80 @@ function openObserverDatabase(databaseFile, options = {}) {
           return droppedRecords;
         });
       },
+      pruneExpiredOtlpEnvelopes: (nowMs = Date.now()) => {
+        requireTimestamp(nowMs, "OTLP retention timestamp");
+        const cutoffMs = nowMs - maxOtlpSpoolAgeMs;
+        if (!hasExpiredOtlpEnvelopes.get(cutoffMs)) return 0;
+        return runImmediateTransaction(() => {
+          const rows = expiredOtlpEnvelopes.all(cutoffMs);
+          let logicalBytes = 0;
+          let bodyBytes = 0;
+          for (const row of rows) {
+            logicalBytes += requireSpoolInteger(row, "logical_bytes");
+            bodyBytes += requireSpoolInteger(row, "body_bytes");
+            if (deleteExpiredOtlpEnvelope.run(row.id).changes !== 1) {
+              throw new Error(
+                "FML observer OTLP retention deletion was incomplete"
+              );
+            }
+          }
+          recordOtlpDrop(
+            rows.length,
+            logicalBytes,
+            bodyBytes,
+            nowMs,
+            "spool_expired"
+          );
+          return rows.length;
+        });
+      },
+      pruneOtlpCapacity: (nowMs = Date.now()) => {
+        requireTimestamp(nowMs, "OTLP capacity cleanup timestamp");
+        const retainedBytes = requireSpoolInteger(
+          getOtlpSpoolState.get(),
+          "logical_bytes"
+        );
+        if (retainedBytes <= otlpLowWaterBytes)
+          otlpCapacityCleanupActive = false;
+        if (retainedBytes > maxOtlpSpoolBytes) otlpCapacityCleanupActive = true;
+        if (!otlpCapacityCleanupActive) return 0;
+        return runImmediateTransaction(() => {
+          const currentBytes = requireSpoolInteger(
+            getOtlpSpoolState.get(),
+            "logical_bytes"
+          );
+          if (currentBytes <= otlpLowWaterBytes) {
+            otlpCapacityCleanupActive = false;
+            return 0;
+          }
+          let records = 0;
+          let logicalBytes = 0;
+          let bodyBytes = 0;
+          for (const row of oldestOtlpEnvelopes.all()) {
+            logicalBytes += requireSpoolInteger(row, "logical_bytes");
+            bodyBytes += requireSpoolInteger(row, "body_bytes");
+            if (deleteExpiredOtlpEnvelope.run(row.id).changes !== 1) {
+              throw new Error(
+                "FML observer OTLP capacity deletion was incomplete"
+              );
+            }
+            records += 1;
+            if (currentBytes - logicalBytes <= otlpLowWaterBytes) break;
+          }
+          if (records === 0)
+            throw new Error(
+              "FML observer OTLP capacity accounting is inconsistent"
+            );
+          recordOtlpDrop(
+            records,
+            logicalBytes,
+            bodyBytes,
+            nowMs,
+            "spool_capacity"
+          );
+          return records;
+        });
+      },
       getOtlpSpoolStatus: () => {
         const row = getOtlpSpoolState.get();
         const lastDroppedAtMs = row?.last_dropped_at_ms;
@@ -2898,6 +2953,7 @@ function openObserverDatabase(databaseFile, options = {}) {
         return {
           unit: "logical_bytes",
           maxBytes: maxOtlpSpoolBytes,
+          maxAgeMs: maxOtlpSpoolAgeMs,
           logicalBytes: requireSpoolInteger(row, "logical_bytes"),
           bodyBytes: requireSpoolInteger(row, "body_bytes"),
           droppedRecords: requireSpoolInteger(row, "dropped_records"),