claude: Install typst-gather to bin/tools/{arch}/ during configure

- configure.sh/cmd: Copy built binary to standard tools location
- Simplify cmd.ts files to only use architectureToolsPath()
- prepare-dist.ts: Error if typst-gather binary is missing

Co-Authored-By: Claude Opus 4.5 <[email protected]>

Author: gordonwoodhull

configure.cmd

@@ -89,9 +89,10 @@ IF EXIST !QUARTO_BIN_PATH!\quarto.cmd (
 ECHO NOTE: To use quarto please use quarto.cmd (located in this folder) or add the following path to your PATH
 ECHO !QUARTO_BIN_PATH!
 
-REM Build typst-gather
+REM Build typst-gather and install to tools directory
 ECHO Building typst-gather...
 cargo build --release --manifest-path package\typst-gather\Cargo.toml
+COPY package\typst-gather\target\release\typst-gather.exe "!QUARTO_BIN_PATH!\tools\x86_64\"
 
 endlocal & set QUARTO_BIN_DEV=%QUARTO_BIN_PATH%
 

configure.sh

@@ -103,6 +103,7 @@ else
 	quarto --version
 fi
 
-# Build typst-gather
+# Build typst-gather and install to tools directory
 echo "Building typst-gather..."
 cargo build --release --manifest-path package/typst-gather/Cargo.toml
+cp package/typst-gather/target/release/typst-gather "$QUARTO_BIN_PATH/tools/$DENO_ARCH_DIR/"

package/src/common/prepare-dist.ts

@@ -100,7 +100,7 @@ export async function prepareDist(
     }
   }
 
-  // Stage typst-gather binary if it exists (built by configure.sh)
+  // Stage typst-gather binary (built by configure.sh)
   // Only stage if the build machine architecture matches the target architecture
   // (cross-compilation is not currently supported)
   const buildArch = Deno.build.arch === "aarch64" ? "aarch64" : "x86_64";
@@ -111,15 +111,17 @@ export async function prepareDist(
       "package/typst-gather/target/release",
       typstGatherBinaryName,
     );
-    if (existsSync(typstGatherSrc)) {
-      info("\nStaging typst-gather binary");
-      const typstGatherDest = join(targetDir, config.arch, typstGatherBinaryName);
-      ensureDirSync(join(targetDir, config.arch));
-      copySync(typstGatherSrc, typstGatherDest, { overwrite: true });
-      info(`Copied ${typstGatherSrc} to ${typstGatherDest}`);
-    } else {
-      info("\nNote: typst-gather binary not found, skipping staging");
+    if (!existsSync(typstGatherSrc)) {
+      throw new Error(
+        `typst-gather binary not found at ${typstGatherSrc}\n` +
+          "Run ./configure.sh to build it.",
+      );
     }
+    info("\nStaging typst-gather binary");
+    const typstGatherDest = join(targetDir, config.arch, typstGatherBinaryName);
+    ensureDirSync(join(targetDir, config.arch));
+    copySync(typstGatherSrc, typstGatherDest, { overwrite: true });
+    info(`Copied ${typstGatherSrc} to ${typstGatherDest}`);
   } else {
     info(`\nNote: Skipping typst-gather staging (build arch ${buildArch} != target arch ${config.arch})`);
   }

src/command/call/typst-gather/cmd.ts

@@ -452,36 +452,15 @@ export const typstGatherCommand = new Command()
         Deno.exit(1);
       }
 
-      // Find typst-gather binary
-      // First try architecture-specific path, then fall back to PATH
-      let typstGatherBinary: string;
+      // Find typst-gather binary in standard tools location
       const binaryName = isWindows ? "typst-gather.exe" : "typst-gather";
-
-      const archPath = architectureToolsPath(binaryName);
-      if (existsSync(archPath)) {
-        typstGatherBinary = archPath;
-      } else {
-        // Try to find in PATH or use development location
-        const quartoRoot = Deno.env.get("QUARTO_ROOT");
-        if (quartoRoot) {
-          const devPath = join(
-            quartoRoot,
-            "package/typst-gather/target/release",
-            binaryName,
-          );
-          if (existsSync(devPath)) {
-            typstGatherBinary = devPath;
-          } else {
-            console.error(
-              `typst-gather binary not found.\n` +
-                `Build it with: cd package/typst-gather && cargo build --release`,
-            );
-            Deno.exit(1);
-          }
-        } else {
-          console.error("typst-gather binary not found.");
-          Deno.exit(1);
-        }
+      const typstGatherBinary = architectureToolsPath(binaryName);
+      if (!existsSync(typstGatherBinary)) {
+        console.error(
+          `typst-gather binary not found.\n` +
+            `Run ./configure.sh to build and install it.`,
+        );
+        Deno.exit(1);
       }
 
       // Determine config file to use

src/command/dev-call/typst-gather/cmd.ts

@@ -5,9 +5,11 @@
  */
 
 import { Command } from "cliffy/command/mod.ts";
+import { existsSync } from "../../../deno_ral/fs.ts";
 import { error, info } from "../../../deno_ral/log.ts";
 import { join } from "../../../deno_ral/path.ts";
 import { isWindows } from "../../../deno_ral/platform.ts";
+import { architectureToolsPath } from "../../../core/resources.ts";
 
 export const typstGatherCommand = new Command()
   .name("typst-gather")
@@ -33,21 +35,13 @@ export const typstGatherCommand = new Command()
       "src/command/dev-call/typst-gather/typst-gather.toml",
     );
 
-    // Path to the typst-gather binary
+    // Find typst-gather binary in standard tools location
     const binaryName = isWindows ? "typst-gather.exe" : "typst-gather";
-    const typstGatherBinary = join(
-      quartoRoot,
-      "package/typst-gather/target/release",
-      binaryName,
-    );
-
-    // Check if binary exists
-    try {
-      await Deno.stat(typstGatherBinary);
-    } catch {
+    const typstGatherBinary = architectureToolsPath(binaryName);
+    if (!existsSync(typstGatherBinary)) {
       error(
-        `typst-gather binary not found at ${typstGatherBinary}\n` +
-          "Build it with: cd package/typst-gather && cargo build --release",
+        `typst-gather binary not found.\n` +
+          "Run ./configure.sh to build and install it.",
       );
       Deno.exit(1);
     }