@phenx-inc/ctlsurf 0.1.1 → 0.1.2

package/bin/ctlsurf-worker.js

@@ -238,13 +238,57 @@ if (mode === 'desktop') {
   try {
     electronPath = require('electron')
   } catch {
-    console.error('[ctlsurf] Electron not found, falling back to terminal mode')
+    // Electron not installed — prompt to install or fall back
+    if (process.stdin.isTTY && !args.includes('--terminal')) {
+      console.log(`\n${B}  ctlsurf${R}\n`)
+      console.log(`  Electron is not installed. Desktop mode requires Electron.\n`)
+      console.log(`  ${D}1)${R} Install Electron and launch desktop mode`)
+      console.log(`  ${D}2)${R} Launch in terminal mode instead`)
+      console.log(`  ${D}3)${R} Exit\n`)
+
+      const readline = require('readline')
+      const rl = readline.createInterface({ input: process.stdin, output: process.stdout })
+      rl.question(`  Choice ${D}(1/2/3)${R}: `, (answer) => {
+        rl.close()
+        answer = answer.trim()
+        if (answer === '1') {
+          console.log(`\n${D}Installing Electron (this may take a minute)...${R}\n`)
+          try {
+            execSync('npm install electron --no-save', { cwd: ROOT, stdio: 'inherit' })
+            console.log(`\n${G}✓${R} Electron installed. Launching desktop mode...\n`)
+            try {
+              const ep = require('electron')
+              execFileSync(String(ep), [ROOT, ...args], {
+                stdio: 'inherit',
+                env: { ...process.env, CTLSURF_WORKER_CWD: process.env.CTLSURF_WORKER_CWD || process.cwd() }
+              })
+            } catch (err) {
+              process.exit(err.status || 0)
+            }
+          } catch (err) {
+            console.error(`\n${Y}!${R} Electron install failed: ${err.message}`)
+            console.error(`  Try manually: cd ${ROOT} && npm install electron\n`)
+            process.exit(1)
+          }
+        } else if (answer === '2') {
+          console.log('')
+          runTerminal()
+        } else {
+          process.exit(0)
+        }
+      })
+      return
+    }
+    // Non-interactive: fall back silently
     runTerminal()
     process.exit(0)
   }
 
   try {
-    execFileSync(String(electronPath), [ROOT, ...args], { stdio: 'inherit' })
+    execFileSync(String(electronPath), [ROOT, ...args], {
+      stdio: 'inherit',
+      env: { ...process.env, CTLSURF_WORKER_CWD: process.env.CTLSURF_WORKER_CWD || process.cwd() }
+    })
   } catch (err) {
     process.exit(err.status || 0)
   }
@@ -259,7 +303,10 @@ function runTerminal() {
     process.exit(1)
   }
   try {
-    execFileSync(process.execPath, [terminalPath, ...args], { stdio: 'inherit' })
+    execFileSync(process.execPath, [terminalPath, ...args], {
+      stdio: 'inherit',
+      env: { ...process.env, CTLSURF_WORKER_CWD: process.env.CTLSURF_WORKER_CWD || process.cwd() }
+    })
   } catch (err) {
     process.exit(err.status || 0)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phenx-inc/ctlsurf",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Agent-agnostic terminal and desktop app for ctlsurf — run Claude Code, Codex, or any coding agent with live session logging and remote control",
   "main": "out/main/index.js",
   "bin": {

package/scripts/setup-mcp.sh

@@ -199,10 +199,62 @@ if [ "$FOUND_CLAUDE_CLI" = false ] && [ "$FOUND_CLAUDE_VSCODE" = false ] && \
     exit 1
 fi
 
-# Get API key (read from /dev/tty for curl|bash compatibility)
-echo "Get your API key from: https://app.ctlsurf.com/settings (API Keys tab)"
-echo -n "Enter your ctlsurf API key: "
-read API_KEY < /dev/tty
+# Check for existing API key in environment or shell profile
+EXISTING_KEY=""
+EXISTING_URL=""
+
+# Check env var
+if [ -n "$CTLSURF_API_KEY" ]; then
+    EXISTING_KEY="$CTLSURF_API_KEY"
+fi
+
+# Check shell profile
+if [ -z "$EXISTING_KEY" ]; then
+    for rc in "$HOME/.zshrc" "$HOME/.bashrc" "$HOME/.bash_profile"; do
+        if [ -f "$rc" ]; then
+            KEY_FROM_RC=$(grep '^export CTLSURF_API_KEY=' "$rc" 2>/dev/null | tail -1 | sed 's/^export CTLSURF_API_KEY="//' | sed 's/"$//')
+            if [ -n "$KEY_FROM_RC" ]; then
+                EXISTING_KEY="$KEY_FROM_RC"
+                break
+            fi
+        fi
+    done
+fi
+
+# Check CTLSURF_URL from env or profile
+if [ -n "$CTLSURF_URL" ]; then
+    EXISTING_URL="$CTLSURF_URL"
+else
+    for rc in "$HOME/.zshrc" "$HOME/.bashrc" "$HOME/.bash_profile"; do
+        if [ -f "$rc" ]; then
+            URL_FROM_RC=$(grep '^export CTLSURF_URL=' "$rc" 2>/dev/null | tail -1 | sed 's/^export CTLSURF_URL="//' | sed 's/"$//')
+            if [ -n "$URL_FROM_RC" ]; then
+                EXISTING_URL="$URL_FROM_RC"
+                break
+            fi
+        fi
+    done
+fi
+
+# Use existing credentials or prompt
+if [ -n "$EXISTING_KEY" ]; then
+    MASKED_KEY="${EXISTING_KEY:0:8}...${EXISTING_KEY: -4}"
+    echo -e "${GREEN}✓ Found existing API key: ${MASKED_KEY}${NC}"
+    echo -n "Use this key? (Y/n): "
+    read USE_EXISTING < /dev/tty
+    if [ -z "$USE_EXISTING" ] || [ "$USE_EXISTING" = "y" ] || [ "$USE_EXISTING" = "Y" ]; then
+        API_KEY="$EXISTING_KEY"
+    else
+        echo ""
+        echo "Get your API key from: https://app.ctlsurf.com/settings (API Keys tab)"
+        echo -n "Enter your ctlsurf API key: "
+        read API_KEY < /dev/tty
+    fi
+else
+    echo "Get your API key from: https://app.ctlsurf.com/settings (API Keys tab)"
+    echo -n "Enter your ctlsurf API key: "
+    read API_KEY < /dev/tty
+fi
 
 if [ -z "$API_KEY" ]; then
     echo -e "${RED}ERROR: API key is required${NC}"
@@ -210,9 +262,25 @@ if [ -z "$API_KEY" ]; then
 fi
 
 echo ""
-echo -n "Server URL [https://app.ctlsurf.com]: "
-read SERVER_URL < /dev/tty
-SERVER_URL=${SERVER_URL:-https://app.ctlsurf.com}
+
+if [ -n "$EXISTING_URL" ]; then
+    # Strip /api/mcp suffix for display
+    DISPLAY_URL=$(echo "$EXISTING_URL" | sed 's|/api/mcp$||' | sed 's|/api$||')
+    echo -e "${GREEN}✓ Found existing server URL: ${DISPLAY_URL}${NC}"
+    echo -n "Use this URL? (Y/n): "
+    read USE_EXISTING_URL < /dev/tty
+    if [ -z "$USE_EXISTING_URL" ] || [ "$USE_EXISTING_URL" = "y" ] || [ "$USE_EXISTING_URL" = "Y" ]; then
+        SERVER_URL="$DISPLAY_URL"
+    else
+        echo -n "Server URL [https://app.ctlsurf.com]: "
+        read SERVER_URL < /dev/tty
+        SERVER_URL=${SERVER_URL:-https://app.ctlsurf.com}
+    fi
+else
+    echo -n "Server URL [https://app.ctlsurf.com]: "
+    read SERVER_URL < /dev/tty
+    SERVER_URL=${SERVER_URL:-https://app.ctlsurf.com}
+fi
 # Normalize URL
 SERVER_URL="${SERVER_URL%/}"
 SERVER_URL="${SERVER_URL%/api}"