@phenx-inc/ctlsurf 0.3.14 → 0.3.16

package/src/main/index.ts

@@ -21,7 +21,7 @@ function log(...args: unknown[]): void {
   try { console.log(...args) } catch { /* EPIPE safe */ }
 }
 
-import { AgentConfig, getDefaultAgent, getBuiltinAgents } from './agents'
+import { AgentConfig, getDefaultAgent, getAvailableAgents } from './agents'
 import { getSettingsDir } from './settingsDir'
 import { Orchestrator } from './orchestrator'
 
@@ -105,6 +105,7 @@ const orchestrator = new Orchestrator(
     onWorkerStatus: (status) => mainWindow?.webContents.send('worker:status', status),
     onWorkerMessage: (message) => mainWindow?.webContents.send('worker:message', message),
     onWorkerRegistered: (data) => mainWindow?.webContents.send('worker:registered', data),
+    onProjectChanged: (name) => mainWindow?.webContents.send('app:projectChanged', name),
     onCwdChanged: () => {
       mainWindow?.webContents.send('app:cwdChanged')
       updateProjectBadge(orchestrator.cwd)
@@ -165,11 +166,12 @@ ipcMain.handle('pty:setActiveTab', (_event, tabId: string) => {
   orchestrator.setActiveTab(tabId)
 })
 
-ipcMain.handle('agents:list', () => getBuiltinAgents())
+ipcMain.handle('agents:list', () => getAvailableAgents())
 ipcMain.handle('agents:default', () => getDefaultAgent())
 
 ipcMain.handle('app:homePath', () => app.getPath('home'))
 ipcMain.handle('app:cwd', () => process.env.CTLSURF_WORKER_CWD || process.cwd())
+ipcMain.handle('app:projectName', () => orchestrator.projectName)
 
 ipcMain.handle('app:browseCwd', async () => {
   if (!mainWindow) return null

package/src/main/orchestrator.ts

@@ -40,6 +40,9 @@ export interface OrchestratorEvents {
   onWorkerMessage: (message: IncomingMessage) => void
   onWorkerRegistered: (data: { worker_id: string; folder_id: string | null; status: string }) => void
   onCwdChanged: () => void
+  // Human-readable name of the connected ctlsurf project (folder), or null
+  // when no project is connected. Optional — only the desktop header uses it.
+  onProjectChanged?: (name: string | null) => void
 }
 
 interface TabState {
@@ -89,6 +92,7 @@ export class Orchestrator {
   }
   private noProjectPollTimer: ReturnType<typeof setInterval> | null = null
   private noProjectPollCwd: string | null = null
+  private currentProjectName: string | null = null
 
   constructor(settingsDir: string, events: OrchestratorEvents) {
     this.settingsDir = settingsDir
@@ -116,12 +120,14 @@ export class Orchestrator {
         log(`[worker-ws] Registered: worker_id=${data.worker_id}, folder_id=${data.folder_id}, status=${data.status}`)
         events.onWorkerRegistered(data)
         if (!data.folder_id) {
+          this.setProjectName(null)
           events.onWorkerStatus('no_project')
           if (this.currentCwd && data.status !== 'pending_approval') {
             this.startNoProjectPolling(this.currentCwd)
           }
         } else {
           this.stopNoProjectPolling()
+          this.resolveProjectName(data.folder_id)
         }
       },
       onTerminalInput: (data: string) => {
@@ -165,6 +171,29 @@ export class Orchestrator {
     return this.currentCwd
   }
 
+  // Name of the connected ctlsurf project (folder) for the desktop header.
+  get projectName(): string | null {
+    return this.currentProjectName
+  }
+
+  private setProjectName(name: string | null): void {
+    if (this.currentProjectName === name) return
+    this.currentProjectName = name
+    this.events.onProjectChanged?.(name)
+  }
+
+  // Resolve the connected folder's human-readable name. Best-effort: a failed
+  // lookup just leaves the project name unset rather than blocking anything.
+  private async resolveProjectName(folderId: string): Promise<void> {
+    try {
+      const folder = await this.ctlsurfApi.getFolder(folderId)
+      const name = folder?.name ?? folder?.title
+      this.setProjectName(typeof name === 'string' && name ? name : null)
+    } catch (err) {
+      log(`[worker-ws] Failed to resolve project name for folder ${folderId}: ${err}`)
+    }
+  }
+
   get agent(): AgentConfig | null {
     return this.currentAgent
   }

package/src/main/workerWs.ts

@@ -47,13 +47,10 @@ export class WorkerWsClient {
   private workerId: string | null = null
   private _status: WorkerWsStatus = 'disconnected'
   private shouldReconnect = false
-  private fingerprint: string
 
   constructor(events: WorkerWsEvents, baseUrl?: string) {
     this.events = events
     this.baseUrl = baseUrl || 'wss://app.ctlsurf.com'
-    // Generate a stable machine fingerprint
-    this.fingerprint = this.generateFingerprint()
   }
 
   get status(): WorkerWsStatus {
@@ -72,8 +69,12 @@ export class WorkerWsClient {
     this.baseUrl = url
   }
 
-  private generateFingerprint(): string {
-    const data = `${os.hostname()}:${os.userInfo().username}:${os.platform()}:${os.arch()}`
+  // Per-directory fingerprint: each working directory is a distinct worker, so
+  // multiple instances on the same machine (one per project) don't collide as a
+  // single worker server-side. cwd is included so the same folder maps to the
+  // same worker across restarts.
+  private generateFingerprint(cwd: string): string {
+    const data = `${os.hostname()}:${os.userInfo().username}:${os.platform()}:${os.arch()}:${cwd}`
     return crypto.createHash('sha256').update(data).digest('hex').slice(0, 32)
   }
 
@@ -85,7 +86,8 @@ export class WorkerWsClient {
   }
 
   connect(registration: WorkerRegistration): void {
-    this.registration = { ...registration, fingerprint: this.fingerprint }
+    const fingerprint = this.generateFingerprint(registration.cwd)
+    this.registration = { ...registration, fingerprint }
     this.shouldReconnect = true
     this.doConnect()
   }

package/src/preload/index.ts

@@ -44,6 +44,13 @@ const api = {
     ipcRenderer.invoke('app:homePath'),
   getCwd: (): Promise<string> =>
     ipcRenderer.invoke('app:cwd'),
+  getProjectName: (): Promise<string | null> =>
+    ipcRenderer.invoke('app:projectName'),
+  onProjectChanged: (callback: (name: string | null) => void) => {
+    const listener = (_event: Electron.IpcRendererEvent, name: string | null) => callback(name)
+    ipcRenderer.on('app:projectChanged', listener)
+    return () => ipcRenderer.removeListener('app:projectChanged', listener)
+  },
   browseCwd: (): Promise<string | null> =>
     ipcRenderer.invoke('app:browseCwd'),
   getVersion: (): Promise<string> =>

package/src/renderer/App.tsx

@@ -36,6 +36,8 @@ declare global {
       getDefaultAgent: () => Promise<AgentConfig>
       getHomePath: () => Promise<string>
       getCwd: () => Promise<string>
+      getProjectName: () => Promise<string | null>
+      onProjectChanged: (callback: (name: string | null) => void) => () => void
       browseCwd: () => Promise<string | null>
       getSetting: (key: string) => Promise<string | null>
       setSetting: (key: string, value: string) => Promise<{ ok: boolean }>
@@ -112,6 +114,7 @@ export default function App() {
   const [showSettings, setShowSettings] = useState(false)
   const [wsStatus, setWsStatus] = useState('disconnected')
   const [cwd, setCwd] = useState<string | null>(null)
+  const [projectName, setProjectName] = useState<string | null>(null)
   const [updateInfo, setUpdateInfo] = useState<UpdateInfo | null>(null)
 
   // Multi-tab state
@@ -140,10 +143,17 @@ export default function App() {
       const initialCwd = await window.worker.getCwd().catch(() => window.worker.getHomePath())
       setCwd(initialCwd)
       cwdRef.current = initialCwd
+      // Connected ctlsurf project name for the header (null until a worker registers)
+      window.worker.getProjectName().then(setProjectName).catch(() => { /* ignore */ })
     }
     init()
   }, [])
 
+  useEffect(() => {
+    const unsub = window.worker.onProjectChanged((name) => setProjectName(name))
+    return unsub
+  }, [])
+
   useEffect(() => {
     const unsub = window.worker.onWorkerStatus((status) => setWsStatus(status))
     return unsub
@@ -404,7 +414,15 @@ export default function App() {
   return (
     <div className="app">
       <div className="titlebar">
-        <span className="titlebar-title">ctlsurf-worker</span>
+        <span className="titlebar-title">
+          ctlsurf
+          {projectName && (
+            <>
+              <span className="titlebar-title-sep">·</span>
+              <span className="titlebar-project" title={projectName}>{projectName}</span>
+            </>
+          )}
+        </span>
         <div className="titlebar-controls">
           <button className="titlebar-btn" onClick={() => setShowSettings(true)} title="Settings">
             Settings

package/src/renderer/styles.css

@@ -36,6 +36,24 @@ html, body, #root {
 .titlebar-title {
   font-weight: 600;
   color: #c0caf5;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  min-width: 0;
+}
+
+.titlebar-title-sep {
+  color: #565f89;
+  font-weight: 400;
+}
+
+.titlebar-project {
+  color: #7aa2f7;
+  font-weight: 600;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 280px;
 }
 
 .titlebar-controls {