From 824225bfa39742d46cc2b1cad9dac0f664bc1702 Mon Sep 17 00:00:00 2001
From: mkorwel <matt.korwel@gmail.com>
Date: Fri, 13 Mar 2026 18:05:46 -0700
Subject: [PATCH] feat(deep-review): improve setup script robustness and
 quoting

---
 .gemini/skills/deep-review/scripts/setup.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gemini/skills/deep-review/scripts/setup.ts b/.gemini/skills/deep-review/scripts/setup.ts
index d01b3d3fda..d87229a5b7 100644
--- a/.gemini/skills/deep-review/scripts/setup.ts
+++ b/.gemini/skills/deep-review/scripts/setup.ts
@@ -81,16 +81,17 @@ async function main() {
   const terminalType = await prompt('\nTerminal Automation (iterm2 / terminal / none)', 'iterm2');
 
   // Local Dependencies Install (Isolated)
-  const envLoader = 'export NVM_DIR="$HOME/.nvm"; [ -s "$NVM_DIR/nvm.sh" ] && \\. "$NVM_DIR/nvm.sh"; [ -s "$NVM_DIR/bash_completion" ] && \\. "$NVM_DIR/bash_completion"';
+  const envLoader = 'export NVM_DIR="$HOME/.nvm"; [ -s "$NVM_DIR/nvm.sh" ] && \\. "$NVM_DIR/nvm.sh"';
   
   console.log(`\n📦 Checking isolated dependencies in ${remoteWorkDir}...`);
-  const depCheck = spawnSync('ssh', [remoteHost, `${envLoader} && [ -f ${remoteWorkDir}/node_modules/.bin/tsx ] && [ -f ${remoteWorkDir}/node_modules/.bin/gemini ]`], { shell: true });
+  // Use a single string for ssh command to avoid quoting issues with spawnSync shell:true
+  const checkCmd = `ssh ${remoteHost} ${q(`${envLoader} && [ -x ${remoteWorkDir}/node_modules/.bin/tsx ] && [ -x ${remoteWorkDir}/node_modules/.bin/gemini ]`)}`;
+  const depCheck = spawnSync(checkCmd, { shell: true });
 
   if (depCheck.status !== 0) {
     console.log(`📦 Installing isolated dependencies (nightly CLI & tsx) in ${remoteWorkDir}...`);
-    // Note: we create a package.json first to prevent npm from walking up the tree looking for one if it doesn't exist
-    const installCmd = `${envLoader} && mkdir -p ${remoteWorkDir} && cd ${remoteWorkDir} && [ -f package.json ] || npm init -y > /dev/null && npm install tsx @google/gemini-cli@nightly`;
-    spawnSync('ssh', [remoteHost, q(installCmd)], { stdio: 'inherit', shell: true });
+    const installCmd = `ssh ${remoteHost} ${q(`${envLoader} && mkdir -p ${remoteWorkDir} && cd ${remoteWorkDir} && [ -f package.json ] || npm init -y > /dev/null && npm install tsx @google/gemini-cli@nightly`)}`;
+    spawnSync(installCmd, { stdio: 'inherit', shell: true });
   } else {
     console.log('✅ Isolated dependencies already present.');
   }