@phenx-inc/ctlsurf 0.3.8 → 0.3.10

package/bin/ctlsurf-worker.js

@@ -238,50 +238,36 @@ if (mode === 'desktop') {
   try {
     electronPath = require('electron')
   } catch {
-    // 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
+    // Electron not installed (devDependency, or wiped by `npm update`).
+    // Auto-install silently so npm-installed users don't have to think about it.
+    if (!installElectron()) {
+      // Install failed — fall back to terminal mode
+      console.error(`\n${Y}!${R} Falling back to terminal mode.\n`)
+      runTerminal()
+      process.exit(0)
     }
-    // Non-interactive: fall back silently
-    runTerminal()
-    process.exit(0)
+    try {
+      // Bust require cache (electron's index.js reads path.txt at require time)
+      delete require.cache[require.resolve('electron')]
+      electronPath = require('electron')
+    } catch (err) {
+      console.error(`\n${Y}!${R} Electron resolution failed after install: ${err.message}\n`)
+      process.exit(1)
+    }
+  }
+
+  // Rebrand Electron.app → ctlsurf.app (idempotent; sentinel file inside
+  // node_modules/electron). Re-runs automatically after npm update wipes it.
+  try {
+    const { rebrand } = require(path.join(ROOT, 'scripts', 'rebrand-electron.js'))
+    if (rebrand()) {
+      // Path may have changed — re-resolve
+      delete require.cache[require.resolve('electron')]
+      electronPath = require('electron')
+    }
+  } catch (err) {
+    // Non-fatal — app still launches, just shows as "Electron"
+    console.error(`${D}[ctlsurf] rebrand skipped: ${err.message}${R}`)
   }
 
   try {
@@ -296,6 +282,23 @@ if (mode === 'desktop') {
   runTerminal()
 }
 
+function installElectron() {
+  console.log(`\n${B}  ctlsurf${R}  ${D}— first-run setup${R}\n`)
+  console.log(`  ${D}Installing Electron (one-time, ~100 MB)...${R}`)
+  try {
+    execSync('npm install electron --no-save --silent', {
+      cwd: ROOT,
+      stdio: ['ignore', 'ignore', 'inherit']
+    })
+    console.log(`  ${G}✓${R} Electron installed.\n`)
+    return true
+  } catch (err) {
+    console.error(`\n${Y}!${R} Electron install failed: ${err.message}`)
+    console.error(`  Try manually: cd ${ROOT} && npm install electron\n`)
+    return false
+  }
+}
+
 function runTerminal() {
   const terminalPath = path.join(ROOT, 'out/headless/index.mjs')
   if (!fs.existsSync(terminalPath)) {

package/out/headless/index.mjs

@@ -5471,7 +5471,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@phenx-inc/ctlsurf",
-      version: "0.3.8",
+      version: "0.3.10",
       description: "Agent-agnostic terminal and desktop app for ctlsurf \u2014 run Claude Code, Codex, or any coding agent with live session logging and remote control",
       main: "out/main/index.js",
       bin: {
@@ -5548,6 +5548,19 @@ var require_package = __commonJS({
   }
 });
 
+// src/main/logger.ts
+var silent = false;
+function setSilent(value) {
+  silent = value;
+}
+function log(...args) {
+  if (silent) return;
+  try {
+    console.log(...args);
+  } catch {
+  }
+}
+
 // src/main/orchestrator.ts
 import path from "path";
 import fs from "fs";
@@ -6051,12 +6064,6 @@ import os from "os";
 import crypto from "crypto";
 import WsModule from "ws";
 var WS = typeof WebSocket !== "undefined" ? WebSocket : WsModule;
-function log(...args) {
-  try {
-    console.log(...args);
-  } catch {
-  }
-}
 var HEARTBEAT_INTERVAL_MS = 3e4;
 var RECONNECT_DELAY_MS = 5e3;
 var MAX_RECONNECT_DELAY_MS = 6e4;
@@ -6220,7 +6227,7 @@ var WorkerWsClient = class {
       case "registered": {
         this.workerId = data.worker_id;
         const workerStatus = data.status;
-        console.log(`[worker-ws] Registered as ${this.workerId}, status: ${workerStatus}`);
+        log(`[worker-ws] Registered as ${this.workerId}, status: ${workerStatus}`);
         if (workerStatus === "pending_approval") {
           this.setStatus("pending_approval");
         } else {
@@ -6246,7 +6253,7 @@ var WorkerWsClient = class {
       case "message": {
         const msg = data.message;
         if (msg) {
-          console.log(`[worker-ws] Received message: ${msg.id}`);
+          log(`[worker-ws] Received message: ${msg.id}`);
           this.events.onMessage(msg);
         }
         break;
@@ -6261,7 +6268,7 @@ var WorkerWsClient = class {
       case "heartbeat_ack":
         break;
       default:
-        console.log(`[worker-ws] Unknown message type: ${msgType}`);
+        log(`[worker-ws] Unknown message type: ${msgType}`);
     }
   }
   send(data) {
@@ -6283,7 +6290,7 @@ var WorkerWsClient = class {
   }
   scheduleReconnect() {
     if (!this.shouldReconnect) return;
-    console.log(`[worker-ws] Reconnecting in ${this.reconnectDelay / 1e3}s...`);
+    log(`[worker-ws] Reconnecting in ${this.reconnectDelay / 1e3}s...`);
     this.reconnectTimer = setTimeout(() => {
       this.doConnect();
     }, this.reconnectDelay);
@@ -6601,12 +6608,6 @@ var TimeTracker = class {
 };
 
 // src/main/orchestrator.ts
-function log3(...args) {
-  try {
-    console.log(...args);
-  } catch {
-  }
-}
 var DEFAULT_IDLE_TIMEOUT_MIN = 15;
 var DEFAULT_PROFILES = {
   production: {
@@ -6619,6 +6620,7 @@ var DEFAULT_PROFILES = {
   }
 };
 var TERM_STREAM_INTERVAL_MS = 50;
+var NO_PROJECT_POLL_MS = 5e3;
 var Orchestrator = class {
   settingsDir;
   events;
@@ -6637,16 +6639,18 @@ var Orchestrator = class {
     profiles: { ...DEFAULT_PROFILES },
     logChat: false
   };
+  noProjectPollTimer = null;
+  noProjectPollCwd = null;
   constructor(settingsDir, events) {
     this.settingsDir = settingsDir;
     this.events = events;
     this.workerWs = new WorkerWsClient({
       onStatusChange: (status) => {
-        log3(`[worker-ws] Status: ${status}`);
+        log(`[worker-ws] Status: ${status}`);
         events.onWorkerStatus(status);
       },
       onMessage: (message) => {
-        log3(`[worker-ws] Incoming message: ${message.id} (${message.type})`);
+        log(`[worker-ws] Incoming message: ${message.id} (${message.type})`);
         events.onWorkerMessage(message);
         this.workerWs.sendAck(message.id);
         if (message.type === "prompt" || message.type === "task_dispatch") {
@@ -6658,10 +6662,15 @@ var Orchestrator = class {
         }
       },
       onRegistered: (data) => {
-        log3(`[worker-ws] Registered: worker_id=${data.worker_id}, folder_id=${data.folder_id}, status=${data.status}`);
+        log(`[worker-ws] Registered: worker_id=${data.worker_id}, folder_id=${data.folder_id}, status=${data.status}`);
         events.onWorkerRegistered(data);
         if (!data.folder_id) {
           events.onWorkerStatus("no_project");
+          if (this.currentCwd && data.status !== "pending_approval") {
+            this.startNoProjectPolling(this.currentCwd);
+          }
+        } else {
+          this.stopNoProjectPolling();
         }
       },
       onTerminalInput: (data) => {
@@ -6711,7 +6720,7 @@ var Orchestrator = class {
     const baseUrl = profile.baseUrl || process.env.CTLSURF_BASE_URL || "https://app.ctlsurf.com";
     this.ctlsurfApi.setBaseUrl(baseUrl);
     this.workerWs.setBaseUrl(baseUrl);
-    log3(`[settings] Profile applied: ${profile.name} (${baseUrl})`);
+    log(`[settings] Profile applied: ${profile.name} (${baseUrl})`);
   }
   loadSettings() {
     try {
@@ -6736,7 +6745,7 @@ var Orchestrator = class {
             logChat: !!raw.logChat
           };
           this.saveSettings();
-          log3("[settings] Migrated legacy settings to profiles");
+          log("[settings] Migrated legacy settings to profiles");
         } else {
           this.settings = raw;
           if (!this.settings.profiles.production) {
@@ -6763,7 +6772,7 @@ var Orchestrator = class {
       fs.mkdirSync(this.settingsDir, { recursive: true });
       fs.writeFileSync(settingsPath, JSON.stringify(this.settings, null, 2));
     } catch (err) {
-      log3("[settings] Failed to save:", err.message);
+      log("[settings] Failed to save:", err.message);
     }
   }
   overrideApiKey(key) {
@@ -6901,6 +6910,7 @@ var Orchestrator = class {
     if (isCodingAgent(agent)) {
       this.connectWorkerWs(agent, cwd);
     } else {
+      this.stopNoProjectPolling();
       this.workerWs.disconnect();
       this.checkProjectStatus(cwd);
     }
@@ -6972,15 +6982,50 @@ var Orchestrator = class {
     const profile = this.getActiveProfile();
     const apiKey = profile.apiKey || process.env.CTLSURF_API_KEY;
     if (!apiKey) {
-      log3("[worker-ws] No API key, skipping WS connect");
+      log("[worker-ws] No API key, skipping WS connect");
       return;
     }
+    this.stopNoProjectPolling();
     this.workerWs.connect({
       machine: os3.hostname(),
       cwd,
       agent: agent.name
     });
   }
+  startNoProjectPolling(cwd) {
+    if (this.noProjectPollTimer && this.noProjectPollCwd === cwd) return;
+    this.stopNoProjectPolling();
+    this.noProjectPollCwd = cwd;
+    log(`[worker-ws] Polling for project folder at ${cwd}`);
+    this.noProjectPollTimer = setInterval(() => {
+      void this.checkForProjectFolder(cwd);
+    }, NO_PROJECT_POLL_MS);
+  }
+  stopNoProjectPolling() {
+    if (this.noProjectPollTimer) {
+      clearInterval(this.noProjectPollTimer);
+      this.noProjectPollTimer = null;
+      this.noProjectPollCwd = null;
+    }
+  }
+  async checkForProjectFolder(cwd) {
+    if (this.currentCwd !== cwd || !this.currentAgent) {
+      this.stopNoProjectPolling();
+      return;
+    }
+    if (!this.ctlsurfApi.getApiKey()) return;
+    try {
+      const folder = await this.ctlsurfApi.findFolderByPath(cwd);
+      if (folder?.id && this.currentCwd === cwd && this.currentAgent) {
+        log(`[worker-ws] Project folder appeared (${folder.id}); reconnecting`);
+        const agent = this.currentAgent;
+        this.stopNoProjectPolling();
+        this.workerWs.disconnect();
+        this.connectWorkerWs(agent, cwd);
+      }
+    } catch {
+    }
+  }
   async checkProjectStatus(cwd) {
     if (!this.ctlsurfApi.getApiKey()) {
       this.events.onWorkerStatus("no_project");
@@ -7011,6 +7056,7 @@ var Orchestrator = class {
   }
   // ─── Shutdown ───────────────────────────────────
   async shutdown() {
+    this.stopNoProjectPolling();
     this.bridge.endSession();
     await this.timeTracker.endAll();
     for (const [, tab] of this.tabs) {
@@ -7348,6 +7394,7 @@ process.on("uncaughtException", (err) => {
   } catch {
   }
 });
+setSilent(true);
 function getCurrentVersion() {
   try {
     const pkg = require_package();