Merge pull request #1056 from numtide/opencode

opencode: apply packaging fixes from PR #4644

Author: Mic92

packages/opencode/bundle.ts

@@ -0,0 +1,25 @@
+--- a/packages/opencode/src/cli/cmd/tui/thread.ts
++++ b/packages/opencode/src/cli/cmd/tui/thread.ts
+@@ -58,16 +58,14 @@ export const TuiThreadCommand = cmd({
+     // Resolve relative paths against PWD to preserve behavior when using --cwd flag
+     const baseCwd = process.env.PWD ?? process.cwd()
+     const cwd = args.project ? path.resolve(baseCwd, args.project) : process.cwd()
+-    const defaultWorker = new URL("./worker.ts", import.meta.url)
+-    // Nix build creates a bundled worker next to the binary; prefer it when present.
++    const localWorker = new URL("./worker.ts", import.meta.url)
++    const distWorker = new URL("./cli/cmd/tui/worker.js", import.meta.url)
+     const execDir = path.dirname(process.execPath)
+-    const bundledWorker = path.join(execDir, "opencode-worker.js")
+-    const hasBundledWorker = await Bun.file(bundledWorker).exists()
+-    const workerPath = (() => {
++    const workerPath = await iife(async () => {
+       if (typeof OPENCODE_WORKER_PATH !== "undefined") return OPENCODE_WORKER_PATH
+-      if (hasBundledWorker) return bundledWorker
+-      return defaultWorker
+-    })()
++      if (await Bun.file(distWorker).exists()) return distWorker
++      return localWorker
++    })
+     try {
+       process.chdir(cwd)
+     } catch (e) {

packages/opencode/fix-thread-worker-path.patch

@@ -3,6 +3,7 @@
   stdenvNoCC,
   bun,
   fetchFromGitHub,
+  fetchpatch,
   fzf,
   makeBinaryWrapper,
   models-dev,
@@ -93,6 +94,29 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   patches = [
     # NOTE: Relax Bun version check to be a warning instead of an error
     ./relax-bun-version-check.patch
+
+    # NOTE: Packaging improvements from PR #4644
+    # Add bundle.ts for bundling with bun runtime
+    (fetchpatch {
+      url = "https://github.com/sst/opencode/commit/0b0cccaad07a05015ce6cc9c166452e9216a98cd.patch";
+      includes = [ "nix/bundle.ts" ];
+      hash = "sha256-+BXH+nEbiQu3IUKpKxbvKISkndBbyXCKcGqEQCoTsDM=";
+    })
+    # Add patch-wasm.ts script for more robust wasm path rewriting
+    (fetchpatch {
+      url = "https://github.com/sst/opencode/commit/5a1af8917ee213b5c9015283c5158534e5f259d9.patch";
+      includes = [ "nix/scripts/patch-wasm.ts" ];
+      hash = "sha256-GW5TSJ8MpNy1d2t5vZJPjNwVFjhBquxhIk2c2ki7ijA=";
+    })
+    # Update canonicalize-node-modules to skip missing targets
+    (fetchpatch {
+      url = "https://github.com/sst/opencode/commit/d289c9cb77b0f4d17be029a8802faae9df246f8e.patch";
+      includes = [ "nix/scripts/canonicalize-node-modules.ts" ];
+      hash = "sha256-yx+viE+BvGI+sDITRUqRHCRszY8aYyNBsGR1ZoP431k=";
+    })
+
+    # NOTE: Update thread.ts to use new bundled worker paths from PR #4644
+    ./fix-thread-worker-path.patch
   ];
 
   dontConfigure = true;
@@ -108,55 +132,66 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     cp -r ${finalAttrs.node_modules}/node_modules .
     cp -r ${finalAttrs.node_modules}/packages .
 
-    cd packages/opencode
+    (
+      cd packages/opencode
 
-    # Fix symlinks to workspace packages
-    chmod -R u+w ./node_modules
-    mkdir -p ./node_modules/@opencode-ai
-    rm -f ./node_modules/@opencode-ai/{script,sdk,plugin}
-    ln -s $(pwd)/../../packages/script ./node_modules/@opencode-ai/script
-    ln -s $(pwd)/../../packages/sdk/js ./node_modules/@opencode-ai/sdk
-    ln -s $(pwd)/../../packages/plugin ./node_modules/@opencode-ai/plugin
+      # Fix symlinks to workspace packages
+      chmod -R u+w ./node_modules
+      mkdir -p ./node_modules/@opencode-ai
+      rm -f ./node_modules/@opencode-ai/{script,sdk,plugin}
+      ln -s $(pwd)/../../packages/script ./node_modules/@opencode-ai/script
+      ln -s $(pwd)/../../packages/sdk/js ./node_modules/@opencode-ai/sdk
+      ln -s $(pwd)/../../packages/plugin ./node_modules/@opencode-ai/plugin
 
-    # Bundle the application with version defines
-    cp ${./bundle.ts} ./bundle.ts
-    chmod +x ./bundle.ts
-    bun run ./bundle.ts
+      # Use upstream bundle.ts from the patched source
+      cp ../../nix/bundle.ts ./bundle.ts
+      chmod +x ./bundle.ts
+      bun run ./bundle.ts
+    )
 
     runHook postBuild
   '';
 
   installPhase = ''
     runHook preInstall
 
+    cd packages/opencode
+    if [ ! -d dist ]; then
+      echo "ERROR: dist directory missing after bundle step"
+      exit 1
+    fi
+
     mkdir -p $out/lib/opencode
-    # Copy the bundled dist directory
     cp -r dist $out/lib/opencode/
-
-    # Fix WASM paths in worker.ts - use absolute paths to the installed location
-    # Main wasm is tree-sitter-<hash>.wasm, language wasms are tree-sitter-<lang>-<hash>.wasm
-    main_wasm=$(find "$out/lib/opencode/dist" -maxdepth 1 -name 'tree-sitter-[a-z0-9]*.wasm' -print -quit)
-
-    substituteInPlace $out/lib/opencode/dist/worker.ts \
-      --replace-fail 'module2.exports = "../../../tree-sitter-' 'module2.exports = "'"$out"'/lib/opencode/dist/tree-sitter-' \
-      --replace-fail 'new URL("tree-sitter.wasm", import.meta.url).href' "\"$main_wasm\""
-
-    # Copy only the native modules we need (marked as external in bundle.ts)
-    mkdir -p $out/lib/opencode/node_modules/.bun
-    mkdir -p $out/lib/opencode/node_modules/@opentui
-
-    # Copy @opentui/core platform-specific packages
-    for pkg in ../../node_modules/.bun/@opentui+core-*; do
-      if [ -d "$pkg" ]; then
-        cp -r "$pkg" $out/lib/opencode/node_modules/.bun/$(basename "$pkg")
+    chmod -R u+w $out/lib/opencode/dist
+
+    # Select bundled worker assets deterministically (sorted find output)
+    worker_file=$(find "$out/lib/opencode/dist" -type f \( -path '*/tui/worker.*' -o -name 'worker.*' \) | sort | head -n1)
+    parser_worker_file=$(find "$out/lib/opencode/dist" -type f -name 'parser.worker.*' | sort | head -n1)
+    if [ -z "$worker_file" ]; then
+      echo "ERROR: bundled worker not found"
+      exit 1
+    fi
+
+    main_wasm=$(printf '%s\n' "$out"/lib/opencode/dist/tree-sitter-*.wasm | sort | head -n1)
+    wasm_list=$(find "$out/lib/opencode/dist" -maxdepth 1 -name 'tree-sitter-*.wasm' -print)
+    for patch_file in "$worker_file" "$parser_worker_file"; do
+      [ -z "$patch_file" ] && continue
+      [ ! -f "$patch_file" ] && continue
+      if [ -n "$wasm_list" ] && grep -q 'tree-sitter' "$patch_file"; then
+        # Rewrite wasm references to absolute store paths to avoid runtime resolve failures.
+        bun --bun ../../nix/scripts/patch-wasm.ts "$patch_file" "$main_wasm" $wasm_list
       fi
     done
 
+    mkdir -p $out/lib/opencode/node_modules
+    cp -r ../../node_modules/.bun $out/lib/opencode/node_modules/
+    mkdir -p $out/lib/opencode/node_modules/@opentui
 
     mkdir -p $out/bin
     makeWrapper ${bun}/bin/bun $out/bin/opencode \
       --add-flags "run" \
-      --add-flags "$out/lib/opencode/dist/index.js" \
+      --add-flags "$out/lib/opencode/dist/src/index.js" \
       --prefix PATH : ${
         lib.makeBinPath [
           fzf
@@ -170,14 +205,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   postInstall = ''
     # Add symlinks for platform-specific native modules
-    for pkg in $out/lib/opencode/node_modules/.bun/@opentui+core-*; do
+    pkgs=(
+      $out/lib/opencode/node_modules/.bun/@opentui+core-*
+      $out/lib/opencode/node_modules/.bun/@opentui+solid-*
+      $out/lib/opencode/node_modules/.bun/@opentui+core@*
+      $out/lib/opencode/node_modules/.bun/@opentui+solid@*
+    )
+    for pkg in "''${pkgs[@]}"; do
       if [ -d "$pkg" ]; then
-        pkgName=$(basename "$pkg" | sed 's/@opentui+\(core-[^@]*\)@.*/\1/')
+        pkgName=$(basename "$pkg" | sed 's/@opentui+\([^@]*\)@.*/\1/')
         ln -sf ../.bun/$(basename "$pkg")/node_modules/@opentui/$pkgName \
-               $out/lib/opencode/node_modules/@opentui/$pkgName
+          $out/lib/opencode/node_modules/@opentui/$pkgName
       fi
     done
-
   '';
 
   meta = {