@ff-labs/pi-fff 0.10.6 → 0.10.7-nightly.097c6ff

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ff-labs/pi-fff",
   "public": true,
-  "version": "0.10.6",
+  "version": "0.10.7-nightly.097c6ff",
   "description": "pi extension: FFF-powered fuzzy file and content search",
   "type": "module",
   "license": "MIT",
@@ -41,8 +41,8 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@ff-labs/fff-bun": "0.10.6",
-    "@ff-labs/fff-node": "0.10.6"
+    "@ff-labs/fff-bun": "0.10.7-nightly.097c6ff",
+    "@ff-labs/fff-node": "0.10.7-nightly.097c6ff"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "*",

package/src/sdk.ts

@@ -9,6 +9,22 @@ export type FileFinderStatic = {
 
 let sdkPromise: Promise<{ FileFinder: FileFinderStatic }> | null = null;
 
+const SDK_ORDER: Record<"bun" | "node", readonly [string, string]> = {
+  // fff-bun is TS-source only and cannot be imported by Bun-compiled hosts
+  // (e.g. omp) whose module resolver rejects .ts under node_modules, so the
+  // JS-compiled fff-node is kept as a fallback for every runtime.
+  bun: ["@ff-labs/fff-bun", "@ff-labs/fff-node"],
+  node: ["@ff-labs/fff-node", "@ff-labs/fff-bun"],
+};
+
+// Literal dynamic imports so hosts that statically scan extension graphs
+// (omp's legacy-pi-compat loader) discover and hook both SDK packages;
+// a variable `import(pkg)` would bypass that scan and fail at runtime.
+const SDK_IMPORTS = {
+  "@ff-labs/fff-bun": () => import("@ff-labs/fff-bun"),
+  "@ff-labs/fff-node": () => import("@ff-labs/fff-node"),
+} as const;
+
 function detectRuntime(): "bun" | "node" {
   if (typeof (globalThis as { Bun?: unknown }).Bun !== "undefined") return "bun";
   if (
@@ -19,6 +35,26 @@ function detectRuntime(): "bun" | "node" {
   return "node";
 }
 
+/** Preferred SDK order for the detected runtime. */
+export function sdkCandidates(): readonly [string, string] {
+  return SDK_ORDER[detectRuntime()];
+}
+
+export async function loadFirst(
+  candidates: readonly [string, string],
+  loaders: Record<string, () => Promise<unknown>> = SDK_IMPORTS,
+): Promise<{ FileFinder: FileFinderStatic }> {
+  let lastError: unknown;
+  for (const pkg of candidates) {
+    try {
+      return (await loaders[pkg]()) as { FileFinder: FileFinderStatic };
+    } catch (error) {
+      lastError = error;
+    }
+  }
+  throw lastError;
+}
+
 export function loadSdk(): Promise<{ FileFinder: FileFinderStatic }> {
   if (sdkPromise) return sdkPromise;
 
@@ -34,8 +70,7 @@ export function loadSdk(): Promise<{ FileFinder: FileFinderStatic }> {
   }
 
   // default to node as it seems like default option
-  const pkg = detectRuntime() === "bun" ? "@ff-labs/fff-bun" : "@ff-labs/fff-node";
-  const p = import(pkg) as Promise<{ FileFinder: FileFinderStatic }>;
+  const p = loadFirst(sdkCandidates());
   sdkPromise = p;
   (globalThis as Record<string, unknown>).__fffSdkPromiseGlobal = p;
   return p;