refactor(hooks): optimize command execution and path resolution

- Refactor `getExecCommand` to use `docker exec` directly instead of `ddev exec` for better performance.
- Implement robust UID/GID handling for DDEV containers (host UID on Linux, 1000 on macOS/Windows).
- Centralize tool path resolution in `workflow.ts` to automatically prepend `vendor/bin/` or `node_modules/.bin/`.
- Simplify `tools.ts` configuration by removing hardcoded paths.
- Update CI workflow to generate distribution lockfile on dependency updates.

Author: TerrorSquad

.github/workflows/update-booster-dependencies.yml

@@ -123,7 +123,7 @@ jobs:
           echo "Updated @types/node to version ^$NODE_MAJOR"
 
       - name: Update NPM dependencies if needed
-        if: env.updated == 'true' && steps.npm-updates.outputs.has_updates == 'true'
+        if: steps.npm-updates.outputs.has_updates == 'true'
         working-directory: booster
         run: |
           echo "Updating NPM packages to latest versions..."
@@ -147,6 +147,18 @@ jobs:
 
           echo "NPM package versions updated in package.json"
           echo "Note: pnpm-lock.yaml NOT updated - run 'pnpm install' locally to test"
+          echo "updated=true" >> $GITHUB_ENV
+
+      - name: Update pnpm-lock.dist.yaml
+        if: steps.npm-updates.outputs.has_updates == 'true'
+        working-directory: booster
+        run: |
+          echo "Installing pnpm..."
+          npm install -g pnpm
+          echo "Updating pnpm-lock.dist.yaml..."
+          chmod +x generate_dist_lockfile.sh
+          ./generate_dist_lockfile.sh
+          echo "pnpm-lock.dist.yaml updated"
 
       - name: Check PHP package updates
         id: php-updates
@@ -283,6 +295,11 @@ jobs:
           if [ "$NPM_CHANGED" = true ] || [ "$NODE_CHANGED" = true ]; then
             echo "- \`booster/package.json\`" >> update-summary.md
           fi
+          if [ "$NPM_CHANGED" = true ]; then
+             if ! git diff --quiet HEAD booster/pnpm-lock.dist.yaml; then
+               echo "- \`booster/pnpm-lock.dist.yaml\`" >> update-summary.md
+             fi
+          fi
           if [ "${{ steps.php-updates.outputs.has_updates }}" == "true" ]; then
             if ! git diff --quiet HEAD booster/composer.json; then
               echo "- \`booster/composer.json\`" >> update-summary.md
@@ -317,6 +334,7 @@ jobs:
             booster/mise.toml
             booster/package.json
             booster/composer.json
+            booster/pnpm-lock.dist.yaml
 
       - name: No updates needed
         if: env.updated != 'true'

.prettierignore

@@ -3,3 +3,6 @@
 # Un-ignore booster directory
 !booster/
 !booster/**
+
+# Ignore pnpm lock file in booster directory
+booster/pnpm-lock.yaml

booster/.husky/commit-msg.ts

@@ -42,7 +42,7 @@ interface ProcessedConfig {
 /**
  * Load and parse validate-branch-name configuration
  */
-function loadConfig(): BranchConfig {
+export function loadConfig(): BranchConfig {
   const config = validateBranchNameConfig.config
 
   // Validate required properties and apply defaults
@@ -60,15 +60,15 @@ function loadConfig(): BranchConfig {
 /**
  * Check if the current branch should skip validation
  */
-function isBranchSkipped(branchName: string, config: BranchConfig): boolean {
+export function isBranchSkipped(branchName: string, config: BranchConfig): boolean {
   const skipped = config.skipped || []
   return skipped.includes(branchName)
 }
 
 /**
  * Process configuration and determine ticket requirements
  */
-function processConfig(config: BranchConfig): ProcessedConfig {
+export function processConfig(config: BranchConfig): ProcessedConfig {
   // Use explicit requireTickets flag, but validate that patterns exist if tickets are required
   const needTicket =
     config.requireTickets && !!(config.ticketIdPrefix && config.ticketNumberPattern)
@@ -94,7 +94,7 @@ function processConfig(config: BranchConfig): ProcessedConfig {
 /**
  * Extract ticket ID from branch name
  */
-function extractTicketId(branchName: string, config: BranchConfig): string | null {
+export function extractTicketId(branchName: string, config: BranchConfig): string | null {
   if (!config.ticketIdPrefix || !config.ticketNumberPattern) {
     return null
   }
@@ -155,7 +155,7 @@ async function lintCommitMessage(commitFile: string): Promise<boolean> {
 /**
  * Append ticket footer to commit message if needed
  */
-async function appendTicketFooter(commitFile: string): Promise<boolean> {
+export async function appendTicketFooter(commitFile: string): Promise<boolean> {
   try {
     // Load and process configuration
     const config = loadConfig()

booster/.husky/pre-push.ts

@@ -22,7 +22,7 @@ import {
 const SKIP_COMMIT_MSG = 'chore: update API documentation'
 const SKIP_DEPTRAC_MSG = 'chore: update deptrac image'
 
-async function shouldSkip(): Promise<boolean> {
+export async function shouldSkip(): Promise<boolean> {
   const lastCommitMsg = (await $`git log -1 --pretty=%B`).stdout.trim()
   if (lastCommitMsg.includes(SKIP_COMMIT_MSG) || lastCommitMsg.includes(SKIP_DEPTRAC_MSG)) {
     log.info('Skipping pre-push hook for auto-generated commit.')
@@ -31,7 +31,7 @@ async function shouldSkip(): Promise<boolean> {
   return false
 }
 
-async function runTests(): Promise<boolean> {
+export async function runTests(): Promise<boolean> {
   if (await fs.pathExists('vendor/bin/pest')) {
     log.tool('Pest', 'Running tests...')
     try {
@@ -45,7 +45,7 @@ async function runTests(): Promise<boolean> {
   return true
 }
 
-async function handleApiDocs(): Promise<boolean> {
+export async function handleApiDocs(): Promise<boolean> {
   // Allow skipping API docs generation explicitly via env var
   if (isSkipped('api_docs')) {
     log.info('Skipping API docs generation (SKIP_API_DOCS environment variable set)')

booster/.husky/shared/core.ts

@@ -150,8 +150,8 @@ export async function isDdevProject(): Promise<boolean> {
  */
 async function getDdevProjectName(): Promise<string | null> {
   try {
-    const configPath = '.ddev/config.yaml'
-    const configContent = await fs.readFile(configPath, 'utf-8')
+    // isDdevProject() already confirmed .ddev/config.yaml exists in CWD
+    const configContent = await fs.readFile('.ddev/config.yaml', 'utf-8')
     const match = configContent.match(/^name:\s*(.+)$/m)
     return match ? match[1].trim() : null
   } catch {
@@ -163,7 +163,6 @@ async function getDdevProjectName(): Promise<string | null> {
  * Get the command to execute, wrapping in ddev exec if necessary
  * @param command The command parts (e.g. ['php', '-v'])
  * @param type The tool type ('node', 'php', 'system')
- * @throws Error if DDEV project name cannot be determined
  * @returns The modified command array ready for execution
  */
 async function getExecCommand(command: string[], type: string): Promise<string[]> {
@@ -180,31 +179,34 @@ async function getExecCommand(command: string[], type: string): Promise<string[]
     throw new Error('Could not determine DDEV project name from .ddev/config.yaml')
   }
 
-  // Use docker exec for performance instead of ddev exec
-  // Run as current user to avoid permission issues with generated files
-  const uid = process.getuid ? process.getuid() : 1000
-  const gid = process.getgid ? process.getgid() : 1000
-  const containerName = `ddev-${projectName}-web`
+  // Since isDdevProject() confirms we are at the project root (where .ddev exists),
+  // we map directly to the container's web root.
+  const containerPath = '/var/www/html'
+
+  // Determine User ID
+  // On Linux, we use the host UID so file permissions match.
+  // On macOS/Windows, DDEV handles permissions via filesystem mounts (VirtioFS/Mutagen),
+  // so we use the default container user (1000) to ensure tools like Composer work correctly.
+  let uid = 1000
+  let gid = 1000
 
-  // Adjust command path for docker exec
-  // If command is not 'php' or 'composer' and doesn't start with '/', assume it's in vendor/bin
-  let cmd = command[0]
-  if (cmd !== 'php' && cmd !== 'composer' && !cmd.startsWith('/') && !cmd.startsWith('./')) {
-    cmd = `vendor/bin/${cmd}`
+  if (process.platform === 'linux') {
+    uid = process.getuid ? process.getuid() : 1000
+    gid = process.getgid ? process.getgid() : 1000
   }
 
-  const newCommand = [cmd, ...command.slice(1)]
+  const containerName = `ddev-${projectName}-web`
 
   return [
     'docker',
     'exec',
-    '-t',
+    '-t', // Allocate pseudo-TTY
     '-u',
     `${uid}:${gid}`,
     '-w',
-    process.cwd(),
+    containerPath,
     containerName,
-    ...newCommand,
+    ...command,
   ]
 }
 

booster/.husky/shared/workflow.ts

@@ -1,4 +1,4 @@
-import { $, which } from 'zx'
+import { $, which, fs } from 'zx'
 import {
   ensureMutagenSync,
   exec,
@@ -48,13 +48,60 @@ export async function runStep(
   }
 }
 
+/**
+ * Resolve the full path to a tool command based on its type
+ */
+function resolveCommandPath(tool: ToolConfig): string {
+  // Don't modify absolute paths or paths starting with ./
+  if (tool.command.startsWith('/') || tool.command.startsWith('./')) {
+    return tool.command
+  }
+
+  // If the command already contains a path separator, assume it's a relative path
+  // (e.g. "bin/console" or "vendor/bin/rector") and don't modify it
+  if (tool.command.includes('/')) {
+    return tool.command
+  }
+
+  // Don't modify standard system commands
+  if (['php', 'composer', 'git', 'npm', 'pnpm', 'yarn', 'node'].includes(tool.command)) {
+    return tool.command
+  }
+
+  if (tool.type === 'php') {
+    return `vendor/bin/${tool.command}`
+  }
+
+  if (tool.type === 'node') {
+    return `node_modules/.bin/${tool.command}`
+  }
+
+  return tool.command
+}
+
 /**
  * Check if a tool is available to run
  */
 async function isToolAvailable(tool: ToolConfig): Promise<boolean> {
+  const commandPath = resolveCommandPath(tool)
+
   if (tool.type === 'php' && (await isDdevProject())) {
+    // For standard PHP tools (php, composer), assume they exist in the container
+    if (tool.command === 'php' || tool.command === 'composer') {
+      return true
+    }
+    // For other tools (phpstan, ecs, rector), check if they exist
+    // This prevents trying to run tools that aren't installed
+    return await fs.pathExists(commandPath)
+  }
+
+  // For node tools or system tools, check if the command exists as a file
+  // (e.g. node_modules/.bin/eslint)
+  if (await fs.pathExists(commandPath)) {
     return true
   }
+
+  // Fallback to checking PATH (for system tools like git)
   return await which(tool.command)
     .then(() => true)
     .catch(() => false)
@@ -65,6 +112,7 @@ async function isToolAvailable(tool: ToolConfig): Promise<boolean> {
  */
 async function execTool(tool: ToolConfig, files: string[]): Promise<void> {
   const args = [...(tool.args || [])]
+  const command = resolveCommandPath(tool)
 
   if (tool.runForEachFile) {
     // Run command for each file individually with concurrency limit
@@ -77,7 +125,7 @@ async function execTool(tool: ToolConfig, files: string[]): Promise<void> {
     for (const chunk of chunks) {
       await Promise.all(
         chunk.map((file) =>
-          exec([tool.command, ...args, file], {
+          exec([command, ...args, file], {
             quiet: true,
             type: tool.type,
           }),
@@ -90,7 +138,7 @@ async function execTool(tool: ToolConfig, files: string[]): Promise<void> {
     if (tool.passFiles !== false) {
       cmdArgs.push(...files)
     }
-    await exec([tool.command, ...cmdArgs], { type: tool.type })
+    await exec([command, ...cmdArgs], { type: tool.type })
   }
 }