@fml-inc/fml 0.8.10-dev.1 → 0.8.11-rc.1

package/agent-assets/mini-swe-agent/fml_mini_bootstrap.py

@@ -0,0 +1,141 @@
+# <!-- fml-managed-agent-surface:v1 -->
+"""Interpreter-local, fail-open activation for the native mini CLI only.
+
+Imported by the owned .pth on Python startup. Ordinary Python invocations do
+not import mini, read its configuration, or install an import hook. Native mini
+still resolves all configuration itself on every invocation.
+"""
+
+import sys
+
+
+def _explicit_override(arguments):
+    values = {"--model", "--model-class", "--environment-class",
+              "--task", "--cost-limit", "--output"}
+    skip = False
+    for argument in arguments:
+        if skip:
+            skip = False
+            continue
+        if argument == "--":
+            break
+        if (argument in ("--config", "--agent-class")
+                or argument.startswith(("--config=", "--agent-class="))):
+            return True
+        skip = argument in values
+        if argument.startswith("-") and not argument.startswith("--"):
+            # Native mini has one short flag (-y); -c/-m/-t/-l/-o take values.
+            # Click consumes the rest of a cluster, or the next argv, as a value.
+            for index, option in enumerate(argument[1:], 2):
+                if option == "c":
+                    return True
+                if option in "mtlo":
+                    skip = index == len(argument)
+                    break
+                if option != "y":
+                    break  # Unknown short options stop native parsing too.
+
+
+def _native_cli():
+    original = getattr(sys, "orig_argv", ())
+    if sys.argv and sys.argv[0] == "-m" and "-m" in original:
+        index = original.index("-m")
+        return index + 1 < len(original) and original[index + 1] in (
+            "minisweagent", "minisweagent.__main__", "minisweagent.run.mini",
+        )
+    # Console scripts have their real script path in argv at site startup.
+    # Check the entrypoint rather than activating arbitrary programs named mini.
+    filename = sys.argv[0] if sys.argv else ""
+    if filename.replace("\\", "/").rsplit("/", 1)[-1] not in (
+        "mini", "mini.exe", "mini-script.py",
+        "mini-swe-agent", "mini-swe-agent.exe", "mini-swe-agent-script.py",
+    ):
+        return False
+    try:
+        if filename.lower().endswith(".exe"):
+            # Windows pip launchers append a ZIP containing the same entrypoint.
+            import zipfile
+            with zipfile.ZipFile(filename) as script:
+                return b"from minisweagent.run.mini import app" in script.read("__main__.py")
+        with open(filename, "rb") as script:
+            return b"from minisweagent.run.mini import app" in script.read(8192)
+    except Exception:
+        return False
+
+
+def _patch_agents(module):
+    native = module.get_agent
+
+    def get_agent(model, env, config, *, default_type=""):
+        adapted = config
+        try:
+            from minisweagent.agents.default import DefaultAgent
+            from minisweagent.agents.interactive import InteractiveAgent
+            from minisweagent.environments.local import LocalEnvironment
+            # Class identity, not inheritance: custom agents/environments remain native.
+            if type(env) is LocalEnvironment:
+                selected = module.get_agent_class(config.get("agent_class", default_type))
+                if selected is DefaultAgent or selected is InteractiveAgent:
+                    from fml_mini_agent import FmlDefaultAgent, FmlInteractiveAgent
+                    adapted = dict(config)
+                    adapted["agent_class"] = (
+                        "fml_mini_agent.FmlDefaultAgent" if selected is DefaultAgent
+                        else "fml_mini_agent.FmlInteractiveAgent"
+                    )
+        except Exception:
+            # An incompatible/missing adapter must not disable the native CLI.
+            adapted = config
+        return native(model, env, adapted, default_type=default_type)
+
+    module.get_agent = get_agent
+
+
+def _activate(expected_prefix):
+    if not _native_cli() or _explicit_override(sys.argv[1:]):
+        return
+    # Other interpreters can inherit this .pth via system site-packages. Their
+    # executables may resolve to the same binary, but their prefixes are distinct.
+    import os
+    actual_prefix = os.path.normcase(os.path.realpath(sys.prefix))
+    selected_prefix = os.path.normcase(os.path.realpath(expected_prefix))
+    if actual_prefix != selected_prefix:
+        return
+    # All mini/config imports remain lazy; ordinary Python never reaches here.
+    from importlib.machinery import PathFinder
+
+    class Loader:
+        def __init__(self, native):
+            self.native = native
+
+        def __getattr__(self, name):
+            return getattr(self.native, name)
+
+        def create_module(self, spec):
+            return self.native.create_module(spec)
+
+        def exec_module(self, module):
+            self.native.exec_module(module)
+            try:
+                _patch_agents(module)
+            except Exception:
+                pass
+
+    class Finder:
+        def find_spec(self, fullname, path=None, target=None):
+            if fullname != "minisweagent.agents":
+                return None
+            spec = PathFinder.find_spec(fullname, path, target)
+            if spec is not None and spec.loader is not None:
+                spec.loader = Loader(spec.loader)
+                sys.meta_path.remove(self)
+            return spec
+
+    sys.meta_path.insert(0, Finder())
+
+
+def activate(expected_prefix):
+    try:
+        _activate(expected_prefix)
+    except Exception:
+        # .pth startup must remain usable even after a partial upgrade/uninstall.
+        pass

package/bin/fml

@@ -1,6 +1,20 @@
 #!/usr/bin/env node
 
-import("../dist/cli.js").catch((error) => {
-  console.error(error);
-  process.exitCode = 1;
-});
+if (process.argv[2] === "hook") {
+  if (process.argv.includes("--help") || process.argv.includes("-h")) {
+    process.stdout.write(
+      "Usage: fml hook --target <target>\n\nCapture an agent callback from JSON stdin and return optional context JSON.\n",
+    );
+  } else {
+    import("../dist/hook-handler.js").catch(() => {
+      // Agent callbacks remain fail-open even when the integration is unavailable.
+      process.exitCode = 0;
+      process.stdout.write("{}");
+    });
+  }
+} else {
+  import("../dist/cli.js").catch((error) => {
+    console.error(error);
+    process.exitCode = 1;
+  });
+}

package/dist/{chunk-WE7MAWAW.js → chunk-4YLCUJ6C.js}

@@ -1,6 +1,6 @@
 import {
   resolveRepoFromCwdAsync
-} from "./chunk-7V7G7NVF.js";
+} from "./chunk-EX5J3MPG.js";
 import {
   getActiveEnv,
   getSiteUrlForConvexUrl,
@@ -373,8 +373,9 @@ async function prepareHookEvent(record, signal) {
   return { record, repositoryInfo, ...bounded };
 }
 async function repositoryForRecord(record, signal) {
-  if (record.repository) return { repo: record.repository, branch: null };
-  return record.cwd ? await abortable(resolveRepoFromCwdAsync(record.cwd, signal), signal) : null;
+  if (record.target === "pi" && !record.repository) return null;
+  const liveRepository = record.cwd ? await abortable(resolveRepoFromCwdAsync(record.cwd, signal), signal) : null;
+  return record.repository ? { repo: record.repository, branch: liveRepository?.branch ?? null } : liveRepository;
 }
 function hookSessionRow(events) {
   const records = events.map((event) => event.record);

package/dist/{chunk-5PEFBQNX.js → chunk-5VP4C72Z.js}

@@ -1,3 +1,6 @@
+import {
+  canonicalGitHubRepository
+} from "./chunk-CSOFP7MT.js";
 import {
   FML_HOOK_INBOX_DIR,
   FML_OBSERVER_LOCK_FILE,
@@ -75,7 +78,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 +159,14 @@ var hook_events_default = {
     "PreCompact",
     "PostCompact",
     "SessionEnd"
+  ],
+  "mini-swe-agent": [
+    "SessionStart",
+    "UserPromptSubmit",
+    "BeforeModel",
+    "PostToolUse",
+    "Stop",
+    "SessionEnd"
   ]
 };
 
@@ -172,6 +184,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 +562,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,15 +620,18 @@ 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;
   if (!isRecord(value.payload)) return null;
+  const repository = typeof value.repository === "string" && /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/u.test(value.repository) ? canonicalGitHubRepository(`https://github.com/${value.repository}`) : null;
   return {
     target: value.target,
     payload: value.payload,
-    ...typeof value.cwd === "string" && value.cwd.length > 0 ? { cwd: value.cwd } : {}
+    ...typeof value.cwd === "string" && value.cwd.length > 0 ? { cwd: value.cwd } : {},
+    ...repository ? { repository } : {}
   };
 }
 function normalizeTargetHookCapture(request, context) {
@@ -640,6 +658,7 @@ function normalizeObserverHookCapture(request, options = {}) {
     cwd: request.cwd
   });
   if (!normalized) return null;
+  const repository = options.repository ?? request.repository;
   return {
     syncId: options.syncId?.() ?? hookSyncId(
       request,
@@ -653,7 +672,7 @@ function normalizeObserverHookCapture(request, options = {}) {
     target: request.target,
     payload: request.payload,
     ...normalized.cwd ? { cwd: normalized.cwd } : {},
-    ...options.repository ? { repository: options.repository } : {},
+    ...repository ? { repository } : {},
     ...normalized.toolName ? { toolName: normalized.toolName } : {},
     ...normalized.userPrompt ? { userPrompt: normalized.userPrompt } : {},
     ...normalized.filePath ? { filePath: normalized.filePath } : {},

package/dist/{chunk-5SI6S4HW.js → chunk-B46WIVL7.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.10-dev.1+09fae5b6" : "unknown";
+  return true ? "0.8.11-rc.1+80d59e99" : "unknown";
 }
 function parseVersion(version) {
   const match = SEMVER_PATTERN.exec(version);

package/dist/chunk-CSOFP7MT.js

@@ -0,0 +1,67 @@
+// ../../packages/shared/src/github-repository.ts
+var MAX_REPOSITORY_BYTES = 201;
+var UTF8_ENCODER = new TextEncoder();
+function utf8Bytes(value) {
+  return UTF8_ENCODER.encode(value).byteLength;
+}
+function githubRepositoryPath(pathname) {
+  const parts = pathname.replace(/^\/+|\/+$/g, "").split("/");
+  if (parts.length !== 2) return null;
+  const owner = parts[0];
+  const repository = parts[1]?.replace(/\.git$/i, "");
+  if (!owner || !repository) return null;
+  const segmentPattern = /^[A-Za-z0-9_.-]+$/;
+  if (!segmentPattern.test(owner) || !segmentPattern.test(repository)) {
+    return null;
+  }
+  const canonical = `${owner.toLowerCase()}/${repository.toLowerCase()}`;
+  if (canonical.startsWith("./") || canonical.startsWith("../") || repository === "." || repository === ".." || repository.toLowerCase().endsWith(".git")) {
+    return null;
+  }
+  return utf8Bytes(canonical) <= MAX_REPOSITORY_BYTES ? canonical : null;
+}
+function canonicalGitHubRepository(remote) {
+  const trimmed = remote.trim();
+  if (!trimmed || trimmed.includes("\0")) return null;
+  const scp = trimmed.match(/^git@github\.com:([^?#]+)$/i);
+  if (scp?.[1]) return githubRepositoryPath(scp[1]);
+  let url;
+  try {
+    url = new URL(trimmed);
+  } catch {
+    return null;
+  }
+  if (url.hostname.toLowerCase() !== "github.com") return null;
+  if (url.search || url.hash || url.password || url.port) return null;
+  if (url.protocol === "https:" || url.protocol === "http:") {
+    if (url.username) return null;
+  } else if (url.protocol === "ssh:") {
+    if (url.username && url.username !== "git") return null;
+  } else {
+    return null;
+  }
+  return githubRepositoryPath(url.pathname);
+}
+
+// src/package-root.ts
+import fs from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
+function resolvePackageRoot(startDir = path.dirname(fileURLToPath(import.meta.url))) {
+  let directory = startDir;
+  while (true) {
+    if (fs.existsSync(path.join(directory, "package.json")) && fs.existsSync(path.join(directory, "bin"))) {
+      return directory;
+    }
+    const parent = path.dirname(directory);
+    if (parent === directory) {
+      throw new Error(`Could not resolve FML package root from ${startDir}`);
+    }
+    directory = parent;
+  }
+}
+
+export {
+  canonicalGitHubRepository,
+  resolvePackageRoot
+};

package/dist/{chunk-7V7G7NVF.js → chunk-EX5J3MPG.js}

@@ -72,11 +72,11 @@ function gitAsync(cwd, args, signal) {
 }
 function repositorySlug(remote) {
   const ssh = remote.match(/^[^@]+@[^:]+:([^/]+\/[^/]+?)(?:\.git)?$/);
-  if (ssh?.[1]) return ssh[1];
+  if (ssh?.[1]) return ssh[1].toLowerCase();
   try {
     const url = new URL(remote);
     const slug = url.pathname.replace(/^\/+|\/+$/g, "").replace(/\.git$/, "");
-    return /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(slug) ? slug : null;
+    return /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(slug) ? slug.toLowerCase() : null;
   } catch {
     return null;
   }

package/dist/{chunk-GDOXY4W2.js → chunk-IUFDFBU7.js}

@@ -1,6 +1,6 @@
 import {
   resolveRepoFromCwd
-} from "./chunk-7V7G7NVF.js";
+} from "./chunk-EX5J3MPG.js";
 import {
   CONVEX_URL,
   getActiveEnv,

package/dist/{chunk-2DGHAVVR.js → chunk-JK5JGPUN.js}

@@ -1,9 +1,9 @@
 import {
   runRawSyncOnce
-} from "./chunk-JPHN4VKM.js";
+} from "./chunk-VFZWTVPD.js";
 import {
   resolvePackageRoot
-} from "./chunk-F57IFY3K.js";
+} from "./chunk-CSOFP7MT.js";
 
 // src/observer/sync-cycle.ts
 import { fork } from "child_process";