greptile 2.2.10 → 2.4.0

package/build-app.sh

@@ -24,12 +24,37 @@ APP_PATH="$OUTPUT_DIR/$APP_NAME.app"
 
 echo "Building $APP_NAME.app..."
 
-# 1. Compile AppleScript into .app bundle
+# Resolve the absolute path to greptile-fix at install time so the .app
+# works even when launched by macOS with a minimal PATH (e.g. nvm/fnm/volta users).
+GREPTILE_FIX_BIN="$(command -v greptile-fix 2>/dev/null || echo "")"
+if [ -z "$GREPTILE_FIX_BIN" ]; then
+  # Fallback: it should be next to this script in bin/
+  GREPTILE_FIX_BIN="$SCRIPT_DIR/bin/greptile-fix.js"
+fi
+GREPTILE_FIX_DIR="$(dirname "$GREPTILE_FIX_BIN")"
+echo "Resolved greptile-fix: $GREPTILE_FIX_BIN"
+
+# 1. Compile AppleScript into .app bundle — inject the resolved bin directory
+#    into the PATH so it works regardless of node version manager.
 if [ -d "$APP_PATH" ]; then
   rm -rf "$APP_PATH"
 fi
 
-osacompile -o "$APP_PATH" "$SCRIPT_DIR/greptile-fix.applescript"
+TEMP_SCRIPT="$(mktemp /tmp/greptile-fix-XXXXXX.applescript)"
+# Clean up temp file on exit (success or failure)
+trap 'rm -f "$TEMP_SCRIPT"' EXIT
+
+# Escape sed special characters in the directory path (& \ /)
+ESCAPED_DIR="$(printf '%s' "$GREPTILE_FIX_DIR" | sed 's/[&\\/]/\\&/g')"
+sed "s|PATH=/opt/homebrew/bin:/usr/local/bin:|PATH=$ESCAPED_DIR:/opt/homebrew/bin:/usr/local/bin:|" \
+  "$SCRIPT_DIR/greptile-fix.applescript" > "$TEMP_SCRIPT"
+
+osacompile -o "$APP_PATH" "$TEMP_SCRIPT"
+
+if [ ! -d "$APP_PATH" ]; then
+  echo "Error: osacompile failed to create $APP_PATH"
+  exit 1
+fi
 
 # 2. Add URL scheme to Info.plist
 PLIST="$APP_PATH/Contents/Info.plist"

package/com.greptile.health.plist

@@ -16,8 +16,8 @@
 	<key>KeepAlive</key>
 	<true/>
 	<key>StandardOutPath</key>
-	<string>/tmp/greptile-health.log</string>
+	<string>__HOME__/.cache/greptile/greptile-health.log</string>
 	<key>StandardErrorPath</key>
-	<string>/tmp/greptile-health.log</string>
+	<string>__HOME__/.cache/greptile/greptile-health.log</string>
 </dict>
 </plist>

package/greptile-fix

@@ -15,11 +15,23 @@
 
 set -euo pipefail
 
+# Verify python3 is available (used for URL decoding and JSON operations)
+if ! command -v python3 &>/dev/null; then
+  echo "Error: python3 is required but not found in PATH." >&2
+  osascript -e 'display dialog "Greptile Fix requires Python 3, which was not found on this system.\n\nPlease install it via: xcode-select --install" buttons {"OK"} default button "OK" with icon caution' 2>/dev/null || true
+  exit 1
+fi
+
 CONFIG_DIR="$HOME/.greptile"
 REPOS_FILE="$CONFIG_DIR/repos.json"
-LOG_FILE="/tmp/greptile-fix.log"
+CACHE_DIR="$HOME/.cache/greptile"
+LOG_FILE="$CACHE_DIR/greptile-fix.log"
 
 log() {
+  # Rotate log if it exceeds 1MB
+  if [ -f "$LOG_FILE" ] && [ "$(wc -c < "$LOG_FILE" 2>/dev/null || echo 0)" -gt 1048576 ]; then
+    mv -f "$LOG_FILE" "$LOG_FILE.old" 2>/dev/null || true
+  fi
   echo "[$(date '+%Y-%m-%d %H:%M:%S')] $*" >> "$LOG_FILE"
 }
 
@@ -54,11 +66,15 @@ parse_url_param() {
   done
 }
 
-# Ensure config directory exists
+# Ensure config and cache directories exist
 ensure_config_dir() {
   if [ ! -d "$CONFIG_DIR" ]; then
     mkdir -p "$CONFIG_DIR"
   fi
+  if [ ! -d "$CACHE_DIR" ]; then
+    mkdir -p "$CACHE_DIR"
+    chmod 700 "$CACHE_DIR"
+  fi
   if [ ! -f "$REPOS_FILE" ]; then
     echo '{}' > "$REPOS_FILE"
   fi
@@ -120,13 +136,13 @@ create_runner_script() {
   # Write args to a temp file — avoids all shell quoting issues.
   # Line 1: repo path, Line 2+: prompt (may be multiline)
   local argsfile
-  argsfile=$(mktemp /tmp/greptile-fix-args-XXXXXX)
+  argsfile=$(mktemp "$CACHE_DIR/greptile-fix-args-XXXXXX")
   printf '%s\n' "$repo_path" > "$argsfile"
   printf '%s' "$prompt" >> "$argsfile"
 
   # Write a runner script that reads args from the file, then cleans up
   local runner
-  runner=$(mktemp /tmp/greptile-fix-run-XXXXXX)
+  runner=$(mktemp "$CACHE_DIR/greptile-fix-run-XXXXXX")
   chmod +x "$runner"
 
   # Note: $argsfile and $cli_cmd are safe to interpolate (mktemp path and validated CLI name)
@@ -171,6 +187,7 @@ esac
 # Parse URL parameters
 PROMPT=$(parse_url_param "$URL" "prompt")
 REPO=$(parse_url_param "$URL" "repo")
+ACK_ID=$(parse_url_param "$URL" "ack")
 
 if [ -z "$PROMPT" ]; then
   log "ERROR: No prompt parameter in URL"
@@ -218,5 +235,9 @@ log "Runner script: $RUNNER"
 # Print the runner path to stdout — the AppleScript app reads this
 # and uses it to open Terminal (which requires Automation permission
 # that only the .app bundle has).
+# Line 1: runner path, Line 2 (optional): ACK ID for auto-redirect
 echo "$RUNNER"
+if [ -n "$ACK_ID" ]; then
+  echo "$ACK_ID"
+fi
 log "Done"

package/greptile-fix.applescript

@@ -10,8 +10,18 @@
 
 on open location theURL
 	try
-		-- Call greptile-fix to parse URL and create runner script; it prints the runner path to stdout
-		set runnerPath to do shell script "PATH=/opt/homebrew/bin:/usr/local/bin:$PATH greptile-fix " & quoted form of theURL & " 2>> /tmp/greptile-fix.log"
+		-- Ensure log directory exists
+		do shell script "mkdir -p $HOME/.cache/greptile"
+		-- Call greptile-fix to parse URL and create runner script
+		-- Output: line 1 = runner path, line 2 (optional) = ACK ID for auto-redirect
+		set fixOutput to do shell script "PATH=/opt/homebrew/bin:/usr/local/bin:$PATH greptile-fix " & quoted form of theURL & " 2>> $HOME/.cache/greptile/greptile-fix.log"
+
+		set outputLines to paragraphs of fixOutput
+		set runnerPath to item 1 of outputLines
+		set ackId to ""
+		if (count of outputLines) > 1 then
+			set ackId to item 2 of outputLines
+		end if
 
 		if runnerPath is not "" then
 			-- Detect terminal by checking running processes via shell (no accessibility permissions needed).
@@ -34,28 +44,35 @@ on open location theURL
 				end if
 			end try
 
-			do shell script "echo 'Detected terminal: " & termApp & "' >> /tmp/greptile-fix.log"
+			do shell script "echo 'Detected terminal: " & termApp & "' >> $HOME/.cache/greptile/greptile-fix.log"
 
 			-- Terminal-specific launch commands for macOS.
 			-- Ghostty/kitty/WezTerm/Alacritty close the window when the -e command exits,
 			-- so we launch bash and source the runner script to keep the shell session alive
 			-- after the IDE command (claude/codex/cursor) finishes.
 			-- Unset CLAUDECODE so the new session doesn't think it's nested inside an existing one.
-			set cleanEnv to "unset CLAUDECODE; source " & runnerPath & " ; exec zsh"
+			set cleanEnv to "unset CLAUDECODE; source " & quoted form of runnerPath & " ; exec zsh"
 			if termApp is "Ghostty" then
-				do shell script "open -na Ghostty --args -e zsh -li -c '" & cleanEnv & "' &>/dev/null &"
+				do shell script "open -na Ghostty --args -e zsh -li -c " & quoted form of cleanEnv & " &>/dev/null &"
 			else if termApp is "kitty" then
-				do shell script "open -na kitty --args zsh -li -c '" & cleanEnv & "' &>/dev/null &"
+				do shell script "open -na kitty --args zsh -li -c " & quoted form of cleanEnv & " &>/dev/null &"
 			else if termApp is "WezTerm" then
-				do shell script "open -na WezTerm --args start -- zsh -li -c '" & cleanEnv & "' &>/dev/null &"
+				do shell script "open -na WezTerm --args start -- zsh -li -c " & quoted form of cleanEnv & " &>/dev/null &"
 			else if termApp is "Alacritty" then
-				do shell script "open -na Alacritty --args -e zsh -li -c '" & cleanEnv & "' &>/dev/null &"
+				do shell script "open -na Alacritty --args -e zsh -li -c " & quoted form of cleanEnv & " &>/dev/null &"
 			else
 				-- Terminal.app, iTerm, and Warp natively execute scripts via "open -a"
 				do shell script "open -a " & quoted form of termApp & " " & quoted form of runnerPath
 			end if
+
+			-- Send ACK to health server so the web page can auto-redirect back to the PR
+			if ackId is not "" then
+				try
+					do shell script "curl -s -X POST http://127.0.0.1:4747/ack/" & quoted form of ackId & " --max-time 2 &>/dev/null &"
+				end try
+			end if
 		end if
 	on error errMsg
-		do shell script "echo '[ERROR] " & quoted form of errMsg & "' >> /tmp/greptile-fix.log"
+		do shell script "echo '[ERROR] " & quoted form of errMsg & "' >> $HOME/.cache/greptile/greptile-fix.log"
 	end try
 end open location

package/health-server.js

@@ -7,6 +7,21 @@ const { spawn } = require('child_process')
 
 const PORT = 4747
 
+/**
+ * Compare two semver strings. Returns true if b is newer than a.
+ * Handles x.y.z format; ignores pre-release suffixes.
+ */
+function isNewerVersion(current, latest) {
+  const parse = (v) => (v || '').replace(/^v/, '').split('-')[0].split('.').map(Number)
+  const a = parse(current)
+  const b = parse(latest)
+  for (let i = 0; i < 3; i++) {
+    if ((b[i] || 0) > (a[i] || 0)) return true
+    if ((b[i] || 0) < (a[i] || 0)) return false
+  }
+  return false
+}
+
 // Self-destruct: if the package has been uninstalled, clean up and exit.
 // Checks that package.json next to this script still exists.
 // Note: we intentionally don't check `command -v greptile-fix` because
@@ -72,10 +87,52 @@ function checkForUpdate() {
     res.on('end', () => {
       try {
         const latest = JSON.parse(data)
-        if (latest.version && latest.version !== localVersion) {
+        if (latest.version && isNewerVersion(localVersion, latest.version)) {
           console.log(`Update available: ${localVersion} → ${latest.version}. Installing...`)
-          // Resolve npm path — launchd has minimal PATH
-          const npmPaths = ['/opt/homebrew/bin/npm', '/usr/local/bin/npm']
+          // Resolve npm path — launchd has minimal PATH.
+          // Check well-known locations including node version managers.
+          const home = process.env.HOME || ''
+          const npmPaths = [
+            '/opt/homebrew/bin/npm',
+            '/usr/local/bin/npm',
+            ...(home
+              ? [
+                  path.join(home, '.volta/bin/npm'),
+                  path.join(home, '.asdf/shims/npm'),
+                  path.join(home, '.local/bin/npm'),
+                ]
+              : []),
+          ]
+          // Also check nvm: find the current default node version's npm
+          if (home) {
+            try {
+              const nvmDir = path.join(home, '.nvm/versions/node')
+              if (fs.existsSync(nvmDir)) {
+                const versions = fs.readdirSync(nvmDir).sort().reverse()
+                for (const v of versions) {
+                  const candidate = path.join(nvmDir, v, 'bin/npm')
+                  if (fs.existsSync(candidate)) {
+                    npmPaths.push(candidate)
+                    break
+                  }
+                }
+              }
+            } catch {}
+            // Also check fnm
+            try {
+              const fnmDir = path.join(home, '.local/share/fnm/node-versions')
+              if (fs.existsSync(fnmDir)) {
+                const versions = fs.readdirSync(fnmDir).sort().reverse()
+                for (const v of versions) {
+                  const candidate = path.join(fnmDir, v, 'installation/bin/npm')
+                  if (fs.existsSync(candidate)) {
+                    npmPaths.push(candidate)
+                    break
+                  }
+                }
+              }
+            } catch {}
+          }
           let npmBin = 'npm'
           for (const p of npmPaths) {
             if (fs.existsSync(p)) {
@@ -83,16 +140,17 @@ function checkForUpdate() {
               break
             }
           }
+          isUpdating = true
           let child
           try {
             child = spawn(npmBin, ['install', '-g', 'greptile@latest'], {
               stdio: 'inherit',
             })
           } catch (err) {
+            isUpdating = false
             console.error('Failed to spawn npm:', err.message)
             return
           }
-          isUpdating = true
           child.on('close', (code) => {
             isUpdating = false
             if (code === 0) {
@@ -117,18 +175,42 @@ function checkForUpdate() {
   })
 }
 
+// --- ACK store for "Fix in X" auto-redirect ---
+const ackStore = new Map() // id → timestamp
+const ACK_TTL_MS = 60_000
+
+function pruneAcks() {
+  const now = Date.now()
+  for (const [id, ts] of ackStore) {
+    if (now - ts > ACK_TTL_MS) ackStore.delete(id)
+  }
+}
+setInterval(pruneAcks, 30_000)
+
+const ACK_PATH_RE = /^\/ack\/([a-zA-Z0-9_-]+)$/
+
 const ALLOWED_ORIGINS = ['https://app.greptile.com', 'https://app.staging.greptile.com', 'http://localhost:3000']
 
+function isAllowedOrigin(origin) {
+  if (ALLOWED_ORIGINS.includes(origin)) return true
+  // Allow Vercel preview deployments (e.g. https://greptilia-abc123.vercel.app)
+  if (/^https:\/\/greptilia-[a-z0-9-]+\.vercel\.app$/.test(origin)) return true
+  return false
+}
+
 const server = http.createServer((req, res) => {
   const origin = req.headers.origin || ''
-  if (ALLOWED_ORIGINS.includes(origin)) {
+  const allowed = isAllowedOrigin(origin)
+
+  if (allowed) {
     res.setHeader('Access-Control-Allow-Origin', origin)
+    res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS')
+    res.setHeader('Access-Control-Allow-Headers', 'Content-Type')
+    res.setHeader('Access-Control-Allow-Private-Network', 'true')
   }
-  res.setHeader('Access-Control-Allow-Methods', 'GET, OPTIONS')
-  res.setHeader('Access-Control-Allow-Headers', 'Content-Type')
 
   if (req.method === 'OPTIONS') {
-    res.writeHead(204)
+    res.writeHead(allowed ? 204 : 403)
     res.end()
     return
   }
@@ -139,6 +221,26 @@ const server = http.createServer((req, res) => {
     return
   }
 
+  // ACK endpoints for "Fix in X" auto-redirect
+  const urlPath = (req.url || '').split('?')[0]
+  const ackMatch = urlPath.match(ACK_PATH_RE)
+  if (ackMatch) {
+    const id = ackMatch[1]
+    if (req.method === 'POST') {
+      ackStore.set(id, Date.now())
+      res.writeHead(200, { 'Content-Type': 'application/json' })
+      res.end(JSON.stringify({ ok: true }))
+      return
+    }
+    if (req.method === 'GET') {
+      const acked = ackStore.has(id)
+      if (acked) ackStore.delete(id)
+      res.writeHead(200, { 'Content-Type': 'application/json' })
+      res.end(JSON.stringify({ acked }))
+      return
+    }
+  }
+
   res.writeHead(404)
   res.end()
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "greptile",
-  "version": "2.2.10",
+  "version": "2.4.0",
   "description": "Bridge for Greptile code review 'Fix in Claude Code' and 'Fix in Codex' links",
   "bin": {
     "greptile-fix": "bin/greptile-fix.js"
@@ -19,6 +19,9 @@
     "health-server.js",
     "com.greptile.health.plist"
   ],
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "os": [
     "darwin"
   ],

package/postinstall.sh

@@ -20,7 +20,10 @@ APP_DIR="$HOME/Applications"
 mkdir -p "$APP_DIR"
 
 # Build the .app bundle into ~/Applications
-bash "$SCRIPT_DIR/build-app.sh" "$APP_DIR"
+if ! bash "$SCRIPT_DIR/build-app.sh" "$APP_DIR"; then
+  echo "greptile: Warning — failed to build .app bundle. The greptile:// URL scheme may not work."
+  echo "greptile: You can retry by running: bash $(printf '%q' "$SCRIPT_DIR/build-app.sh") $(printf '%q' "$APP_DIR")"
+fi
 
 # --- Health server LaunchAgent ---
 PLIST_NAME="com.greptile.health.plist"
@@ -31,18 +34,39 @@ if [ -f "$PLIST_SRC" ]; then
   # Ensure LaunchAgents directory exists
   mkdir -p "$HOME/Library/LaunchAgents"
 
-  # Resolve the node binary path
-  NODE_BIN="$(command -v node 2>/dev/null || echo "/usr/local/bin/node")"
+  # Resolve the node binary path (check common locations for Apple Silicon and Intel Macs)
+  NODE_BIN="$(command -v node 2>/dev/null || echo "")"
+  if [ -z "$NODE_BIN" ]; then
+    for candidate in /opt/homebrew/bin/node /usr/local/bin/node; do
+      if [ -x "$candidate" ]; then
+        NODE_BIN="$candidate"
+        break
+      fi
+    done
+  fi
+  if [ -z "$NODE_BIN" ]; then
+    echo "greptile: Warning — could not find node binary. Health server may not start."
+    NODE_BIN="/usr/local/bin/node"
+  fi
+
+  # Ensure log directory exists
+  mkdir -p "$HOME/.cache/greptile"
+  chmod 700 "$HOME/.cache/greptile"
 
   # Create a configured copy with the correct paths
   sed -e "s|__PACKAGE_DIR__|$SCRIPT_DIR|g" \
+      -e "s|__HOME__|$HOME|g" \
       -e "s|/usr/local/bin/node|$NODE_BIN|g" \
       "$PLIST_SRC" > "$PLIST_DST"
 
   # Load the agent (unload first in case it's already loaded)
   launchctl unload "$PLIST_DST" 2>/dev/null || true
-  launchctl load "$PLIST_DST"
-  echo "Greptile health server installed and started."
+  if launchctl load "$PLIST_DST" 2>/dev/null; then
+    echo "Greptile health server installed and started."
+  else
+    echo "greptile: Warning — failed to load health server LaunchAgent."
+    echo "greptile: You can retry by running: launchctl load $(printf '%q' "$PLIST_DST")"
+  fi
 fi
 
 echo ""