greptile 2.2.4 → 2.2.6

package/greptile-fix.applescript

@@ -14,55 +14,42 @@ on open location theURL
 		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"
 
 		if runnerPath is not "" then
-			-- Detect terminal app: prefer frontmost if it's a terminal, else first running terminal, else Terminal.app
+			-- Detect terminal by checking running processes via shell (no accessibility permissions needed).
+			-- Check non-default terminals first; fall back to Terminal.app.
 			set termApp to "Terminal"
-			set knownTerminals to {"iTerm2", "Ghostty", "Warp", "kitty", "WezTerm", "Alacritty", "Terminal"}
-			-- Map process names to the app name expected by "open -a"
-			-- (iTerm2's process name is "iTerm2" but the app name is "iTerm")
-			set termAppNames to {"iTerm", "Ghostty", "Warp", "kitty", "WezTerm", "Alacritty", "Terminal"}
 			try
-				tell application "System Events"
-					set frontName to name of first application process whose frontmost is true
-					set runningApps to name of every application process whose background only is false
-				end tell
-				-- If the frontmost app is a known terminal, use it
-				set foundFront to false
-				repeat with i from 1 to count of knownTerminals
-					if frontName is equal to item i of knownTerminals then
-						set termApp to item i of termAppNames
-						set foundFront to true
-						exit repeat
-					end if
-				end repeat
-				-- Otherwise pick the first running terminal we recognize
-				if not foundFront then
-					repeat with i from 1 to count of knownTerminals
-						if item i of knownTerminals is in runningApps then
-							set termApp to item i of termAppNames
-							exit repeat
-						end if
-					end repeat
+				set ps to do shell script "ps -eo comm= 2>/dev/null"
+				if ps contains "/Ghostty.app/" then
+					set termApp to "Ghostty"
+				else if ps contains "/iTerm.app/" then
+					set termApp to "iTerm"
+				else if ps contains "/Warp.app/" then
+					set termApp to "Warp"
+				else if ps contains "/kitty.app/" then
+					set termApp to "kitty"
+				else if ps contains "/WezTerm.app/" then
+					set termApp to "WezTerm"
+				else if ps contains "/Alacritty.app/" then
+					set termApp to "Alacritty"
 				end if
 			end try
 
 			do shell script "echo 'Detected terminal: " & termApp & "' >> /tmp/greptile-fix.log"
 
 			-- Terminal-specific launch commands for macOS.
-			-- "open -a <app> <script>" only works for Terminal.app and iTerm which
-			-- natively execute scripts passed this way. Other terminals need explicit flags.
-			-- References:
-			--   Ghostty: https://github.com/ghostty-org/ghostty/discussions/5739
-			--   kitty:   https://sw.kovidgoyal.net/kitty/invocation/
-			--   WezTerm: https://wezterm.org/cli/start.html
-			--   Alacritty: https://man.archlinux.org/man/alacritty.1
+			-- 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 " & quoted form of runnerPath & " ; exec zsh"
 			if termApp is "Ghostty" then
-				do shell script "open -na Ghostty --args -e " & quoted form of runnerPath & " &>/dev/null &"
+				do shell script "open -na Ghostty --args -e zsh -li -c '" & cleanEnv & "' &>/dev/null &"
 			else if termApp is "kitty" then
-				do shell script "open -na kitty --args " & quoted form of runnerPath & " &>/dev/null &"
+				do shell script "open -na kitty --args zsh -li -c '" & cleanEnv & "' &>/dev/null &"
 			else if termApp is "WezTerm" then
-				do shell script "open -na WezTerm --args start -- " & quoted form of runnerPath & " &>/dev/null &"
+				do shell script "open -na WezTerm --args start -- zsh -li -c '" & cleanEnv & "' &>/dev/null &"
 			else if termApp is "Alacritty" then
-				do shell script "open -na Alacritty --args -e " & quoted form of runnerPath & " &>/dev/null &"
+				do shell script "open -na Alacritty --args -e zsh -li -c '" & 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

package/health-server.js

@@ -5,24 +5,44 @@ const path = require('path')
 
 const PORT = 4747
 
-// Self-destruct: if the package has been uninstalled (package.json gone),
-// clean up the LaunchAgent and exit so the health server doesn't linger.
+// Self-destruct: if the package has been uninstalled, clean up and exit.
+// Checks two signals: 1) package.json next to this script is gone, or
+// 2) greptile-fix is no longer in PATH (handles npm global uninstall).
 const PACKAGE_MARKER = path.join(__dirname, 'package.json')
 const SELF_CHECK_INTERVAL_MS = 30_000
 
 function selfCheck() {
-  if (!fs.existsSync(PACKAGE_MARKER)) {
+  const markerGone = !fs.existsSync(PACKAGE_MARKER)
+  let cliGone = false
+  try {
+    const { execSync } = require('child_process')
+    execSync('command -v greptile-fix', { stdio: 'ignore' })
+  } catch {
+    cliGone = true
+  }
+
+  if (markerGone || cliGone) {
     console.log('Package uninstalled — cleaning up and exiting.')
-    const plistPath = path.join(process.env.HOME || '', 'Library/LaunchAgents/com.greptile.health.plist')
+    const { execSync } = require('child_process')
+    const home = process.env.HOME || ''
+    const plistPath = path.join(home, 'Library/LaunchAgents/com.greptile.health.plist')
+    // Remove .app bundle and plist file
+    try {
+      fs.rmSync(path.join(home, 'Applications/Greptile Fix.app'), { recursive: true, force: true })
+    } catch {}
     try {
       fs.unlinkSync(plistPath)
     } catch {}
     server.close()
+    // Remove the launchd job by label so KeepAlive won't restart us
+    try {
+      execSync('launchctl remove com.greptile.health 2>/dev/null')
+    } catch {}
     process.exit(0)
   }
 }
 
-const ALLOWED_ORIGINS = ['https://app.greptile.com', 'https://staging.greptile.com', 'http://localhost:3000']
+const ALLOWED_ORIGINS = ['https://app.greptile.com', 'https://app.staging.greptile.com', 'http://localhost:3000']
 
 const server = http.createServer((req, res) => {
   const origin = req.headers.origin || ''

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "greptile",
-  "version": "2.2.4",
+  "version": "2.2.6",
   "description": "Bridge for Greptile code review 'Fix in Claude Code' and 'Fix in Codex' links",
   "bin": {
     "greptile-fix": "bin/greptile-fix.js"