Appimage refactor - Step 2

.agents/codebase-insights.txt: 
appimage-scripts/build_appimage2.sh: 
nix/packages/default.nix: 
node-packages/yarn-project.nix: 
result-bin: 
result-man: 

Signed-off-by: Tzanko Matev <[email protected]>

Author: tzanko-matev

.agents/codebase-insights.txt

@@ -24,3 +24,4 @@
 - `ct record` verifies that `codetracer_python_recorder` is importable before launching the db backend and prints actionable guidance if the module is missing or broken.
 - Sudoku test-program datasets include intentionally invalid boards (e.g., examples #3 and #6) with duplicate digits inside a sub-grid; solvers should detect and report these gracefully.
 - `appimage-scripts/build_appimage.sh` assumes a devshell: it invokes `nix build`/`nix eval` directly and runs `npm install`/`npx yarn`, so it needs host network access and the git worktree metadata that a pure derivation build lacks.
+- `appimage-scripts/build_appimage2.sh` relies on `packages.${system}.appimageDeps` producing an AppDir-like tree (bin/, lib/), letting the script populate dependencies with a single `cp`.

appimage-scripts/build_appimage2.sh

@@ -28,80 +28,19 @@ if [ -e "${ROOT_PATH}/CodeTracer.AppImage" ]; then
 fi
 
 rm -rf "${APP_DIR}"
-mkdir -p "${APP_DIR}/"{bin,src,lib,views}
+mkdir -p "${APP_DIR}"
 
 # This environment variable controls where build artifacts and static resources end up.
 export NIX_CODETRACER_EXE_DIR="${APP_DIR}"
 
 CURRENT_NIX_SYSTEM=$(nix eval --impure --raw --expr 'builtins.currentSystem')
 APPIMAGE_DEPS=$(nix build "${ROOT_PATH}#packages.${CURRENT_NIX_SYSTEM}.appimageDeps" --no-link --print-out-paths | tail -n1)
 
-copy_lib_from_derivation() {
-  local lib_name=$1
-  local copied=false
+cp -Lr "${APPIMAGE_DEPS}/." "${APP_DIR}/"
 
-  if [ -f "${APPIMAGE_DEPS}/lib/${lib_name}" ]; then
-    cp -L "${APPIMAGE_DEPS}/lib/${lib_name}" "${APP_DIR}/lib/"
-    copied=true
-  fi
+chmod -R u+rwX "${APP_DIR}"
 
-  if [ -f "${APPIMAGE_DEPS}/lib64/${lib_name}" ]; then
-    cp -L "${APPIMAGE_DEPS}/lib64/${lib_name}" "${APP_DIR}/lib/"
-    copied=true
-  fi
-
-  if [ "${copied}" = false ]; then
-    return 1
-  fi
-
-  return 0
-}
-
-copy_required_lib() {
-  local lib_name=$1
-  if ! copy_lib_from_derivation "${lib_name}"; then
-    echo "Required library ${lib_name} is missing from ${APPIMAGE_DEPS}" >&2
-    exit 1
-  fi
-}
-
-copy_optional_lib() {
-  local lib_name=$1
-  if ! copy_lib_from_derivation "${lib_name}"; then
-    echo "Optional library ${lib_name} not found; continuing." >&2
-  fi
-}
-
-copy_binary_from_derivation() {
-  local binary_name=$1
-  local destination="${APP_DIR}/bin/${binary_name}"
-
-  if [ ! -f "${APPIMAGE_DEPS}/bin/${binary_name}" ]; then
-    echo "Required binary ${binary_name} is missing from ${APPIMAGE_DEPS}" >&2
-    exit 1
-  fi
-
-  cp -L "${APPIMAGE_DEPS}/bin/${binary_name}" "${destination}"
-}
-
-# Copy shared libraries that were previously fetched via individual nix build/eval calls.
-copy_required_lib "libsqlite3.so.0"
-copy_optional_lib "libsqlite3.so"
-copy_required_lib "libpcre.so.1"
-copy_required_lib "libzip.so.5"
-copy_required_lib "libssl.so.3"
-copy_optional_lib "libssl.so"
-copy_required_lib "libcrypto.so.3"
-copy_optional_lib "libcrypto.so"
-copy_required_lib "libuv.so.1"
-
-# Copy binaries sourced from Nix packages.
-copy_binary_from_derivation "wazero"
-copy_binary_from_derivation "cargo-stylus"
-copy_binary_from_derivation "nargo"
-copy_binary_from_derivation "ctags"
-copy_binary_from_derivation "curl"
-copy_binary_from_derivation "node"
+mkdir -p "${APP_DIR}/bin" "${APP_DIR}/src" "${APP_DIR}/views"
 
 # Install Ruby
 bash "${ROOT_PATH}/appimage-scripts/install_ruby.sh"

nix/packages/default.nix

@@ -127,22 +127,50 @@
           '';
         };
 
-        appimageDeps = pkgs.symlinkJoin {
-          name = "codetracer-appimage-deps";
-          paths = [
-            sqlite
-            pcre
-            libzip
-            openssl
-            libuv
-            cargo-stylus
-            wazero
-            noir
-            pkgs.universal-ctags
-            pkgs.curl
-            pkgs.nodejs_20
+        appimageDeps = pkgs.runCommand "codetracer-appimage-deps" {
+          nativeBuildInputs = [
+            pkgs.bashInteractive
+            pkgs.coreutils
           ];
-        };
+        } ''
+          set -euo pipefail
+          shopt -s nullglob
+
+          mkdir -p "$out/bin" "$out/lib"
+
+          copy_libs() {
+            for pattern in "$@"; do
+              for lib in $pattern; do
+                cp -L "$lib" "$out/lib/"
+              done
+            done
+          }
+
+          copy_bins() {
+            while [ "$#" -gt 0 ]; do
+              cp -L "$1" "$out/bin/"
+              shift
+            done
+          }
+
+          copy_libs \
+            ${sqlite.out}/lib/libsqlite3.so* \
+            ${pcre.out}/lib/libpcre.so* \
+            ${libzip.out}/lib/libzip.so* \
+            ${openssl.out}/lib/libssl.so* \
+            ${openssl.out}/lib/libcrypto.so* \
+            ${libuv.out}/lib/libuv.so*
+
+          copy_bins \
+            ${cargo-stylus}/bin/cargo-stylus \
+            ${wazero}/bin/wazero \
+            ${noir}/bin/nargo \
+            ${pkgs.universal-ctags}/bin/ctags \
+            ${pkgs.curl}/bin/curl \
+            ${pkgs.nodejs_20}/bin/node
+
+          chmod +x "$out/bin"/*
+        '';
 
         indexJavascript = stdenv.mkDerivation {
           name = "index.js";