@phenx-inc/ctlsurf 0.3.8 → 0.3.10

package/src/main/orchestrator.ts

@@ -8,10 +8,7 @@ import { CtlsurfApi } from './ctlsurfApi'
 import { ConversationBridge } from './bridge'
 import { WorkerWsClient, type WorkerWsStatus, type IncomingMessage } from './workerWs'
 import { TimeTracker } from './timeTracker'
-
-function log(...args: unknown[]): void {
-  try { console.log(...args) } catch { /* EPIPE safe */ }
-}
+import { log } from './logger'
 
 // ─── Types ────────────────────────────────────────
 
@@ -66,6 +63,7 @@ const DEFAULT_PROFILES: Record<string, Profile> = {
 }
 
 const TERM_STREAM_INTERVAL_MS = 50
+const NO_PROJECT_POLL_MS = 5_000
 
 export class Orchestrator {
   private settingsDir: string
@@ -87,6 +85,8 @@ export class Orchestrator {
     profiles: { ...DEFAULT_PROFILES },
     logChat: false,
   }
+  private noProjectPollTimer: ReturnType<typeof setInterval> | null = null
+  private noProjectPollCwd: string | null = null
 
   constructor(settingsDir: string, events: OrchestratorEvents) {
     this.settingsDir = settingsDir
@@ -115,6 +115,11 @@ export class Orchestrator {
         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: string) => {
@@ -398,6 +403,7 @@ export class Orchestrator {
     if (isCodingAgent(agent)) {
       this.connectWorkerWs(agent, cwd)
     } else {
+      this.stopNoProjectPolling()
       this.workerWs.disconnect()
       this.checkProjectStatus(cwd)
     }
@@ -484,6 +490,7 @@ export class Orchestrator {
       return
     }
 
+    this.stopNoProjectPolling()
     this.workerWs.connect({
       machine: os.hostname(),
       cwd,
@@ -491,6 +498,40 @@ export class Orchestrator {
     })
   }
 
+  private startNoProjectPolling(cwd: string): void {
+    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)
+  }
+
+  private stopNoProjectPolling(): void {
+    if (this.noProjectPollTimer) {
+      clearInterval(this.noProjectPollTimer)
+      this.noProjectPollTimer = null
+      this.noProjectPollCwd = null
+    }
+  }
+
+  private async checkForProjectFolder(cwd: string): Promise<void> {
+    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 { /* ignore — retry on next tick */ }
+  }
+
   private async checkProjectStatus(cwd: string): Promise<void> {
     if (!this.ctlsurfApi.getApiKey()) {
       this.events.onWorkerStatus('no_project')
@@ -524,6 +565,7 @@ export class Orchestrator {
   // ─── Shutdown ───────────────────────────────────
 
   async shutdown(): Promise<void> {
+    this.stopNoProjectPolling()
     this.bridge.endSession()
     await this.timeTracker.endAll()
     for (const [, tab] of this.tabs) {

package/src/main/workerWs.ts

@@ -1,14 +1,11 @@
 import os from 'os'
 import crypto from 'crypto'
 import WsModule from 'ws'
+import { log } from './logger'
 
 // Use native WebSocket if available (Node 22+), otherwise fall back to ws package
 const WS: typeof WebSocket = typeof WebSocket !== 'undefined' ? WebSocket : WsModule as any
 
-function log(...args: unknown[]): void {
-  try { console.log(...args) } catch { /* EPIPE safe */ }
-}
-
 const HEARTBEAT_INTERVAL_MS = 30_000
 const RECONNECT_DELAY_MS = 5_000
 const MAX_RECONNECT_DELAY_MS = 60_000
@@ -225,7 +222,7 @@ export class WorkerWsClient {
       case 'registered': {
         this.workerId = data.worker_id as string
         const workerStatus = data.status as string
-        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')
@@ -257,7 +254,7 @@ export class WorkerWsClient {
       case 'message': {
         const msg = data.message as IncomingMessage
         if (msg) {
-          console.log(`[worker-ws] Received message: ${msg.id}`)
+          log(`[worker-ws] Received message: ${msg.id}`)
           this.events.onMessage(msg)
         }
         break
@@ -275,7 +272,7 @@ export class WorkerWsClient {
         break
 
       default:
-        console.log(`[worker-ws] Unknown message type: ${msgType}`)
+        log(`[worker-ws] Unknown message type: ${msgType}`)
     }
   }
 
@@ -302,7 +299,7 @@ export class WorkerWsClient {
 
   private scheduleReconnect(): void {
     if (!this.shouldReconnect) return
-    console.log(`[worker-ws] Reconnecting in ${this.reconnectDelay / 1000}s...`)
+    log(`[worker-ws] Reconnecting in ${this.reconnectDelay / 1000}s...`)
     this.reconnectTimer = setTimeout(() => {
       this.doConnect()
     }, this.reconnectDelay)