@fabriccode/cli 7.0.115 → 7.0.117

package/bin/fabriccode

@@ -5,6 +5,8 @@ const fs = require("fs")
 const path = require("path")
 const os = require("os")
 
+const forwardedSignals = ["SIGINT", "SIGTERM", "SIGHUP"]
+
 // fabriccode_change start
 function code(signal) {
   const num = os.constants.signals?.[signal]
@@ -12,38 +14,106 @@ function code(signal) {
   return 1
 }
 
-function fail(target, result) {
-  if (result.signal === "SIGSEGV" && target.includes("cli-linux-x64-baseline")) {
+function reportCrash(target, signal) {
+  if (signal === "SIGSEGV" && target.includes("cli-linux-x64-baseline")) {
     console.error("Fabric's Linux x64 baseline binary crashed inside Bun on a non-AVX CPU.")
     console.error("This host is not currently supported by the npm-distributed baseline build.")
     console.error("Use a machine with AVX support for now, or build and run Fabric from source on a supported host.")
   }
-  if (result.signal) {
-    console.error(`Fabric binary crashed with ${result.signal}: ${target}`)
-    process.exit(code(result.signal))
+  console.error(`Fabric binary crashed with ${signal}: ${target}`)
+}
+// fabriccode_change end
+
+// fabriccode_change start - point packaged binaries at co-located tree-sitter WASM resources
+function configureTreeSitterResources(target) {
+  const wasmDir = path.join(path.dirname(target), "tree-sitter")
+  if (!process.env.FABRIC_TREE_SITTER_WASM_DIR && fs.existsSync(path.join(wasmDir, "tree-sitter.wasm"))) {
+    process.env.FABRIC_TREE_SITTER_WASM_DIR = wasmDir
   }
-  const status = typeof result.status === "number" ? result.status : 1
-  process.exit(status)
 }
+// fabriccode_change end
 
-function run(target) {
-  const result = childProcess.spawnSync(target, process.argv.slice(2), {
-    stdio: "inherit",
-  })
-  if (result.error) {
-    console.error(result.error.message)
+function run(target, fallback) {
+  // fabriccode_change - preserve cached binary fallback
+  configureTreeSitterResources(target) // fabriccode_change
+  // fabriccode_change start - fall through if the cached binary cannot be spawned
+  const child = (() => {
+    try {
+      return childProcess.spawn(target, process.argv.slice(2), {
+        stdio: "inherit",
+      })
+    } catch (error) {
+      if (fallback) {
+        run(fallback)
+        return
+      }
+      console.error(error.message)
+      process.exit(1)
+    }
+  })()
+  if (!child) return
+  // fabriccode_change end
+
+  const forwarders = {}
+  const clear = () => {
+    // fabriccode_change - remove listeners before cached binary fallback
+    for (const signal of forwardedSignals) {
+      process.removeListener(signal, forwarders[signal])
+    }
+  }
+
+  child.on("error", (error) => {
+    clear() // fabriccode_change
+    // fabriccode_change start - fall through to findBinary() if cached binary fails
+    if (fallback) {
+      run(fallback)
+      return
+    }
+    // fabriccode_change end
+    console.error(error.message)
     process.exit(1)
+  })
+
+  for (const signal of forwardedSignals) {
+    forwarders[signal] = () => {
+      try {
+        child.kill(signal)
+      } catch {
+        // The child may have already exited.
+      }
+    }
+    process.on(signal, forwarders[signal])
   }
-  if (result.signal) fail(target, result)
-  const status = typeof result.status === "number" ? result.status : 1
-  process.exit(status)
-}
 
-const envPath = process.env.FABRIC_BIN_PATH
-if (envPath) {
-  run(envPath)
+  child.on("exit", (exitCode, signal) => {
+    clear() // fabriccode_change
+
+    if (signal) {
+      // fabriccode_change start - SIGILL on a non-baseline x64 binary: retry the baseline build
+      if (signal === "SIGILL") {
+        const baseline = findFallback(scriptDir, target)
+        if (baseline) {
+          console.error(`Fabric binary crashed with SIGILL, retrying baseline build: ${baseline}`)
+          run(baseline)
+          return
+        }
+      }
+      reportCrash(target, signal)
+      process.exit(code(signal))
+      // fabriccode_change end
+    }
+
+    process.exit(typeof exitCode === "number" ? exitCode : 0)
+  })
 }
 
+const envPath = process.env.FABRIC_BIN_PATH // fabriccode_change
+
+const scriptPath = fs.realpathSync(__filename)
+const scriptDir = path.dirname(scriptPath)
+
+const cached = path.join(scriptDir, ".fabriccode") // fabriccode_change
+
 const platformMap = {
   darwin: "darwin",
   linux: "linux",
@@ -199,10 +269,7 @@ function findFallback(startDir, target) {
 }
 // fabriccode_change end
 
-const scriptPath = fs.realpathSync(__filename)
-const scriptDir = path.dirname(scriptPath)
-
-const resolved = findBinary(scriptDir)
+const resolved = envPath || (fs.existsSync(cached) ? cached : findBinary(scriptDir))
 if (!resolved) {
   console.error(
     "It seems that your package manager failed to install the right version of Fabric Code for your platform. You can try manually installing " +
@@ -212,22 +279,4 @@ if (!resolved) {
   process.exit(1)
 }
 
-const result = childProcess.spawnSync(resolved, process.argv.slice(2), {
-  stdio: "inherit",
-})
-if (result.error) {
-  console.error(result.error.message)
-  process.exit(1)
-}
-// fabriccode_change start
-if (result.signal === "SIGILL") {
-  const fallback = findFallback(scriptDir, resolved)
-  if (fallback) {
-    console.error(`Fabric binary crashed with SIGILL, retrying baseline build: ${fallback}`)
-    run(fallback)
-  }
-}
-// fabriccode_change end
-if (result.signal) fail(resolved, result)
-const status = typeof result.status === "number" ? result.status : 1
-process.exit(status)
+run(resolved, resolved === cached ? findBinary(scriptDir) : undefined) // fabriccode_change - preserve cached binary fallback

package/package.json

@@ -6,21 +6,21 @@
   "scripts": {
     "postinstall": "bun ./postinstall.mjs || node ./postinstall.mjs"
   },
-  "version": "7.0.115",
+  "version": "7.0.117",
   "license": "MIT",
   "optionalDependencies": {
-    "@fabriccode/cli-linux-x64-baseline-musl": "7.0.115",
-    "@fabriccode/cli-linux-x64-musl": "7.0.115",
-    "@fabriccode/cli-darwin-x64-baseline": "7.0.115",
-    "@fabriccode/cli-darwin-x64": "7.0.115",
-    "@fabriccode/cli-linux-arm64": "7.0.115",
-    "@fabriccode/cli-linux-x64": "7.0.115",
-    "@fabriccode/cli-windows-x64-baseline": "7.0.115",
-    "@fabriccode/cli-linux-arm64-musl": "7.0.115",
-    "@fabriccode/cli-windows-arm64": "7.0.115",
-    "@fabriccode/cli-windows-x64": "7.0.115",
-    "@fabriccode/cli-linux-x64-baseline": "7.0.115",
-    "@fabriccode/cli-darwin-arm64": "7.0.115"
+    "@fabriccode/cli-linux-arm64-musl": "7.0.117",
+    "@fabriccode/cli-darwin-x64-baseline": "7.0.117",
+    "@fabriccode/cli-windows-arm64": "7.0.117",
+    "@fabriccode/cli-linux-arm64": "7.0.117",
+    "@fabriccode/cli-linux-x64": "7.0.117",
+    "@fabriccode/cli-darwin-arm64": "7.0.117",
+    "@fabriccode/cli-windows-x64": "7.0.117",
+    "@fabriccode/cli-linux-x64-musl": "7.0.117",
+    "@fabriccode/cli-windows-x64-baseline": "7.0.117",
+    "@fabriccode/cli-darwin-x64": "7.0.117",
+    "@fabriccode/cli-linux-x64-baseline-musl": "7.0.117",
+    "@fabriccode/cli-linux-x64-baseline": "7.0.117"
   },
   "repository": {
     "type": "git",

package/postinstall.mjs

@@ -126,6 +126,19 @@ function findBinary() {
 }
 // fabriccode_change end
 
+// fabriccode_change start - copy tree-sitter WASM resources next to cached binary
+function copyTreeSitterResources(binaryPath) {
+  const source = path.join(path.dirname(binaryPath), "tree-sitter")
+  const target = path.join(__dirname, "bin", "tree-sitter")
+  const runtime = path.join(source, "tree-sitter.wasm")
+
+  if (!fs.existsSync(runtime)) return
+
+  fs.rmSync(target, { recursive: true, force: true })
+  fs.cpSync(source, target, { recursive: true })
+}
+// fabriccode_change end
+
 function main() {
   if (os.platform() === "win32") {
     // On Windows, the .exe is already included in the package and bin field points to it
@@ -141,6 +154,7 @@ function main() {
   } catch {
     fs.copyFileSync(binaryPath, target)
   }
+  copyTreeSitterResources(binaryPath) // fabriccode_change
   fs.chmodSync(target, 0o755)
 }
 

package/bin/kilo

@@ -1,188 +0,0 @@
-#!/usr/bin/env node
-
-const childProcess = require("child_process")
-const fs = require("fs")
-const path = require("path")
-const os = require("os")
-
-function run(target) {
-  const result = childProcess.spawnSync(target, process.argv.slice(2), {
-    stdio: "inherit",
-  })
-  if (result.error) {
-    console.error(result.error.message)
-    process.exit(1)
-  }
-  const code = typeof result.status === "number" ? result.status : 0
-  process.exit(code)
-}
-
-const envPath = process.env.FABRIC_BIN_PATH
-if (envPath) {
-  run(envPath)
-}
-
-const scriptPath = fs.realpathSync(__filename)
-const scriptDir = path.dirname(scriptPath)
-
-// fabriccode_change start - fall through to findBinary() if cached binary fails
-const cached = path.join(scriptDir, ".kilo")
-if (fs.existsSync(cached)) {
-  const result = childProcess.spawnSync(cached, process.argv.slice(2), {
-    stdio: "inherit",
-  })
-  if (!result.error) {
-    const code = typeof result.status === "number" ? result.status : 0
-    process.exit(code)
-  }
-  // cached binary failed (e.g. wrong platform/arch, missing dynamic linker),
-  // fall through to findBinary() which has better variant detection
-}
-// fabriccode_change end
-
-const platformMap = {
-  darwin: "darwin",
-  linux: "linux",
-  win32: "windows",
-}
-const archMap = {
-  x64: "x64",
-  arm64: "arm64",
-  arm: "arm",
-}
-
-let platform = platformMap[os.platform()]
-if (!platform) {
-  platform = os.platform()
-}
-let arch = archMap[os.arch()]
-if (!arch) {
-  arch = os.arch()
-}
-const base = "@fabriccode/cli-" + platform + "-" + arch
-const binary = platform === "windows" ? "fabric.exe" : "fabric" // fabriccode_change: binary is built as "fabric" not "kilo"
-
-function supportsAvx2() {
-  if (arch !== "x64") return false
-
-  if (platform === "linux") {
-    try {
-      return /(^|\s)avx2(\s|$)/i.test(fs.readFileSync("/proc/cpuinfo", "utf8"))
-    } catch {
-      return false
-    }
-  }
-
-  if (platform === "darwin") {
-    try {
-      const result = childProcess.spawnSync("sysctl", ["-n", "hw.optional.avx2_0"], {
-        encoding: "utf8",
-        timeout: 1500,
-      })
-      if (result.status !== 0) return false
-      return (result.stdout || "").trim() === "1"
-    } catch {
-      return false
-    }
-  }
-
-  if (platform === "windows") {
-    const cmd =
-      '(Add-Type -MemberDefinition "[DllImport(""kernel32.dll"")] public static extern bool IsProcessorFeaturePresent(int ProcessorFeature);" -Name Kernel32 -Namespace Win32 -PassThru)::IsProcessorFeaturePresent(40)'
-
-    for (const exe of ["powershell.exe", "pwsh.exe", "pwsh", "powershell"]) {
-      try {
-        const result = childProcess.spawnSync(exe, ["-NoProfile", "-NonInteractive", "-Command", cmd], {
-          encoding: "utf8",
-          timeout: 3000,
-          windowsHide: true,
-        })
-        if (result.status !== 0) continue
-        const out = (result.stdout || "").trim().toLowerCase()
-        if (out === "true" || out === "1") return true
-        if (out === "false" || out === "0") return false
-      } catch {
-        continue
-      }
-    }
-
-    return false
-  }
-
-  return false
-}
-
-const names = (() => {
-  const avx2 = supportsAvx2()
-  const baseline = arch === "x64" && !avx2
-
-  if (platform === "linux") {
-    const musl = (() => {
-      try {
-        if (fs.existsSync("/etc/alpine-release")) return true
-      } catch {
-        // ignore
-      }
-
-      try {
-        const result = childProcess.spawnSync("ldd", ["--version"], { encoding: "utf8" })
-        const text = ((result.stdout || "") + (result.stderr || "")).toLowerCase()
-        if (text.includes("musl")) return true
-      } catch {
-        // ignore
-      }
-
-      return false
-    })()
-
-    if (musl) {
-      if (arch === "x64") {
-        if (baseline) return [`${base}-baseline-musl`, `${base}-musl`, `${base}-baseline`, base]
-        return [`${base}-musl`, `${base}-baseline-musl`, base, `${base}-baseline`]
-      }
-      return [`${base}-musl`, base]
-    }
-
-    if (arch === "x64") {
-      if (baseline) return [`${base}-baseline`, base, `${base}-baseline-musl`, `${base}-musl`]
-      return [base, `${base}-baseline`, `${base}-musl`, `${base}-baseline-musl`]
-    }
-    return [base, `${base}-musl`]
-  }
-
-  if (arch === "x64") {
-    if (baseline) return [`${base}-baseline`, base]
-    return [base, `${base}-baseline`]
-  }
-  return [base]
-})()
-
-function findBinary(startDir) {
-  let current = startDir
-  for (;;) {
-    const modules = path.join(current, "node_modules")
-    if (fs.existsSync(modules)) {
-      for (const name of names) {
-        const candidate = path.join(modules, name, "bin", binary)
-        if (fs.existsSync(candidate)) return candidate
-      }
-    }
-    const parent = path.dirname(current)
-    if (parent === current) {
-      return
-    }
-    current = parent
-  }
-}
-
-const resolved = findBinary(scriptDir)
-if (!resolved) {
-  console.error(
-    "It seems that your package manager failed to install the right version of the Fabric CLI for your platform. You can try manually installing " +
-      names.map((n) => `\"${n}\"`).join(" or ") +
-      " package",
-  )
-  process.exit(1)
-}
-
-run(resolved)