@gricha/perry 0.3.10 → 0.3.13

package/dist/agent/file-watcher.js

@@ -14,7 +14,9 @@ export class FileWatcher {
         this.config = options.config;
         this.syncCallback = options.syncCallback;
         this.debounceMs = options.debounceMs ?? 500;
-        this.setupWatchers();
+        this.setupWatchers().catch((err) => {
+            console.error('[file-watcher] Failed to setup watchers:', err);
+        });
     }
     updateConfig(config) {
         this.config = config;
@@ -97,18 +99,18 @@ export class FileWatcher {
             clearTimeout(this.debounceTimer);
         }
         this.pendingSync = true;
-        this.debounceTimer = setTimeout(async () => {
+        this.debounceTimer = setTimeout(() => {
             this.debounceTimer = null;
             if (this.pendingSync) {
                 this.pendingSync = false;
-                try {
-                    console.log('[file-watcher] Triggering sync...');
-                    await this.syncCallback();
+                console.log('[file-watcher] Triggering sync...');
+                this.syncCallback()
+                    .then(() => {
                     console.log('[file-watcher] Sync completed');
-                }
-                catch (err) {
+                })
+                    .catch((err) => {
                     console.error('[file-watcher] Sync failed:', err);
-                }
+                });
             }
         }, this.debounceMs);
     }
@@ -127,7 +129,9 @@ export class FileWatcher {
         }
         for (const filePath of newPaths) {
             if (!currentPaths.has(filePath)) {
-                this.watchFile(filePath);
+                this.watchFile(filePath).catch((err) => {
+                    console.error(`[file-watcher] Failed to watch ${filePath}:`, err);
+                });
             }
         }
     }

package/dist/agent/run.js

@@ -182,10 +182,14 @@ function createAgentServer(configDir, config, port, tailscale) {
                     terminalHandler.handleMessage(ws, data);
                 }
                 else if (type === 'live-claude') {
-                    liveClaudeHandler.handleMessage(ws, data);
+                    liveClaudeHandler.handleMessage(ws, data).catch((err) => {
+                        console.error('[ws] Error handling claude message:', err);
+                    });
                 }
                 else if (type === 'live-opencode') {
-                    liveOpencodeHandler.handleMessage(ws, data);
+                    liveOpencodeHandler.handleMessage(ws, data).catch((err) => {
+                        console.error('[ws] Error handling opencode message:', err);
+                    });
                 }
             },
             close(ws, code, reason) {
@@ -310,9 +314,11 @@ export async function startAgent(options = {}) {
     console.log(`[agent] WebSocket terminal: ws://localhost:${port}/rpc/terminal/:name`);
     console.log(`[agent] WebSocket chat (Claude): ws://localhost:${port}/rpc/live/claude/:name`);
     console.log(`[agent] WebSocket chat (OpenCode): ws://localhost:${port}/rpc/live/opencode/:name`);
-    startEagerImagePull();
+    startEagerImagePull().catch((err) => {
+        console.error('[agent] Error during image pull:', err);
+    });
     let isShuttingDown = false;
-    const shutdown = async () => {
+    const shutdown = () => {
         if (isShuttingDown) {
             console.log('[agent] Force exit');
             process.exit(0);
@@ -326,17 +332,23 @@ export async function startAgent(options = {}) {
         forceExitTimeout.unref();
         stopEagerImagePull();
         fileWatcher.stop();
-        if (tailscaleServeActive) {
-            console.log('[agent] Stopping Tailscale Serve...');
-            await stopTailscaleServe();
-        }
-        liveClaudeHandler.close();
-        liveOpencodeHandler.close();
-        terminalHandler.close();
-        server.stop();
-        clearTimeout(forceExitTimeout);
-        console.log('[agent] Server closed');
-        process.exit(0);
+        const cleanup = async () => {
+            if (tailscaleServeActive) {
+                console.log('[agent] Stopping Tailscale Serve...');
+                await stopTailscaleServe();
+            }
+            liveClaudeHandler.close();
+            liveOpencodeHandler.close();
+            terminalHandler.close();
+            await server.stop();
+            clearTimeout(forceExitTimeout);
+            console.log('[agent] Server closed');
+            process.exit(0);
+        };
+        cleanup().catch((err) => {
+            console.error('[agent] Shutdown error:', err);
+            process.exit(1);
+        });
     };
     process.on('SIGTERM', shutdown);
     process.on('SIGINT', shutdown);

package/dist/agents/index.js

@@ -153,25 +153,6 @@ export async function syncAllAgents(containerName, agentConfig, copier) {
     return results;
 }
 export function getCredentialFilePaths() {
-    const paths = [];
-    for (const agent of Object.values(agents)) {
-        const dummyContext = {
-            containerName: '',
-            agentConfig: { port: 0, credentials: { env: {}, files: {} }, scripts: {} },
-            hostFileExists: async () => false,
-            hostDirExists: async () => false,
-            readHostFile: async () => null,
-            readContainerFile: async () => null,
-        };
-        const filesPromise = agent.sync.getFilesToSync(dummyContext);
-        filesPromise.then((files) => {
-            for (const file of files) {
-                if (file.category === 'credential') {
-                    paths.push(file.source);
-                }
-            }
-        });
-    }
     return ['~/.claude/.credentials.json', '~/.codex/auth.json'];
 }
 export { createDockerFileCopier, createMockFileCopier } from './sync/copier';

package/dist/index.js

@@ -841,6 +841,6 @@ function handleError(err) {
 }
 const isWorkerCommand = process.argv[2] === 'worker';
 if (!isWorkerCommand) {
-    checkForUpdates(pkg.version);
+    checkForUpdates(pkg.version).catch(() => { });
 }
 program.parse();

package/dist/session-manager/adapters/opencode.js

@@ -13,6 +13,19 @@ async function findAvailablePort(containerName) {
     });
     return parseInt(result.stdout.trim(), 10);
 }
+async function findExistingServer(containerName) {
+    try {
+        const result = await execInContainer(containerName, ['sh', '-c', 'pgrep -a -f "opencode serve" | grep -oP "\\--port \\K[0-9]+" | head -1'], { user: 'workspace' });
+        const port = parseInt(result.stdout.trim(), 10);
+        if (port && (await isServerRunning(containerName, port))) {
+            return port;
+        }
+    }
+    catch {
+        // No existing server
+    }
+    return null;
+}
 async function isServerRunning(containerName, port) {
     try {
         const result = await execInContainer(containerName, ['curl', '-s', '-o', '/dev/null', '-w', '%{http_code}', `http://localhost:${port}/session`], { user: 'workspace' });
@@ -34,8 +47,14 @@ async function getServerLogs(containerName) {
     }
 }
 async function startServer(containerName) {
-    const existing = serverPorts.get(containerName);
-    if (existing && (await isServerRunning(containerName, existing))) {
+    const cached = serverPorts.get(containerName);
+    if (cached && (await isServerRunning(containerName, cached))) {
+        return cached;
+    }
+    const existing = await findExistingServer(containerName);
+    if (existing) {
+        console.log(`[opencode] Found existing server on port ${existing} in ${containerName}`);
+        serverPorts.set(containerName, existing);
         return existing;
     }
     const starting = serverStarting.get(containerName);
@@ -148,7 +167,7 @@ export class OpenCodeAdapter {
             fetch: () => new Response(''),
         });
         const port = server.port;
-        server.stop();
+        await server.stop();
         return port;
     }
     async isServerRunningHost(port) {
@@ -176,6 +195,7 @@ export class OpenCodeAdapter {
             if (!this.agentSessionId) {
                 this.agentSessionId = await this.createSession(baseUrl);
                 this.emit({ type: 'system', content: `Session: ${this.agentSessionId.slice(0, 8)}...` });
+                this.statusCallback?.(this.status);
             }
             this.setStatus('running');
             this.emit({ type: 'system', content: 'Processing...' });
@@ -229,7 +249,10 @@ export class OpenCodeAdapter {
         return session.id;
     }
     async sendAndStream(baseUrl, message) {
-        const sseReady = this.startSSEStream();
+        let sseError = null;
+        const sseReady = this.startSSEStream().catch((err) => {
+            sseError = err;
+        });
         await new Promise((resolve) => setTimeout(resolve, 100));
         const payload = { parts: [{ type: 'text', text: message }] };
         if (this.isHost) {
@@ -263,6 +286,9 @@ export class OpenCodeAdapter {
             }
         }
         await sseReady;
+        if (sseError) {
+            throw sseError;
+        }
     }
     startSSEStream() {
         return new Promise((resolve, reject) => {
@@ -284,6 +310,7 @@ export class OpenCodeAdapter {
             this.sseProcess = proc;
             const decoder = new TextDecoder();
             let buffer = '';
+            let eventCount = 0;
             const finish = () => {
                 if (!resolved) {
                     resolved = true;
@@ -316,7 +343,9 @@ export class OpenCodeAdapter {
                                 continue;
                             try {
                                 const event = JSON.parse(data);
+                                eventCount++;
                                 if (event.type === 'session.idle') {
+                                    console.log(`[opencode] SSE received session.idle after ${eventCount} events`);
                                     receivedIdle = true;
                                     clearTimeout(timeout);
                                     proc.kill();
@@ -375,7 +404,7 @@ export class OpenCodeAdapter {
                 }
                 else if (!resolved) {
                     resolved = true;
-                    reject(new Error('SSE stream ended unexpectedly without session.idle'));
+                    reject(new Error(`SSE stream ended unexpectedly without session.idle (received ${eventCount} events)`));
                 }
             })().catch((err) => {
                 clearTimeout(timeout);

package/dist/session-manager/bun-handler.js

@@ -90,7 +90,7 @@ export class LiveChatHandler {
         const agentType = message.agentType || this.agentType;
         if (message.sessionId) {
             // Look up by internal sessionId or agentSessionId (Claude session ID)
-            const found = sessionManager.findSession(message.sessionId);
+            const found = await sessionManager.findSession(message.sessionId);
             if (found) {
                 connection.sessionId = found.sessionId;
                 const sendFn = (msg) => {

package/dist/session-manager/manager.js

@@ -241,18 +241,41 @@ export class SessionManager {
         const session = this.sessions.get(sessionId);
         return session?.info ?? null;
     }
-    findSession(id) {
-        // First try direct lookup by internal sessionId
+    async findSession(id) {
+        // First try direct lookup by internal sessionId (in-memory cache)
         const direct = this.sessions.get(id);
         if (direct) {
             return { sessionId: id, info: direct.info };
         }
-        // Then search by agentSessionId (Claude session ID)
+        // Then search by agentSessionId in memory
         for (const [sessionId, session] of this.sessions) {
             if (session.info.agentSessionId === id) {
                 return { sessionId, info: session.info };
             }
         }
+        // Not in memory - check disk registry
+        if (this.stateDir) {
+            // Try lookup by perrySessionId first
+            let record = await registry.getSession(this.stateDir, id);
+            // Then try by agentSessionId
+            if (!record) {
+                record = await registry.findByAgentSessionId(this.stateDir, id);
+            }
+            // Found on disk - restore the session
+            if (record) {
+                const restoredId = await this.startSession({
+                    sessionId: record.perrySessionId,
+                    workspaceName: record.workspaceName,
+                    agentType: record.agentType,
+                    agentSessionId: record.agentSessionId ?? undefined,
+                    projectPath: record.projectPath ?? undefined,
+                });
+                const restored = this.sessions.get(restoredId);
+                if (restored) {
+                    return { sessionId: restoredId, info: restored.info };
+                }
+            }
+        }
         return null;
     }
     getSessionStatus(sessionId) {

package/dist/session-manager/websocket.js

@@ -29,9 +29,9 @@ export class LiveChatWebSocketServer extends BaseWebSocketServer {
             agentType: this.agentType,
             timestamp: new Date().toISOString(),
         }));
-        ws.on('message', async (data) => {
+        ws.on('message', (data) => {
             const str = typeof data === 'string' ? data : data.toString();
-            try {
+            const handleMessage = async () => {
                 const message = JSON.parse(str);
                 if (message.type === 'connect') {
                     await this.handleConnect(connection, ws, workspaceName, message);
@@ -50,14 +50,14 @@ export class LiveChatWebSocketServer extends BaseWebSocketServer {
                 if (message.type === 'message' && message.content) {
                     await this.handleMessage(connection, ws, workspaceName, message);
                 }
-            }
-            catch (err) {
+            };
+            handleMessage().catch((err) => {
                 safeSend(ws, JSON.stringify({
                     type: 'error',
                     content: err.message,
                     timestamp: new Date().toISOString(),
                 }));
-            }
+            });
         });
         ws.on('close', () => {
             this.handleDisconnect(connection);

package/dist/sessions/registry.js

@@ -98,6 +98,25 @@ export async function getSessionsForWorkspace(stateDir, workspaceName) {
         .filter((record) => record.workspaceName === workspaceName)
         .sort((a, b) => new Date(b.lastActivity).getTime() - new Date(a.lastActivity).getTime());
 }
+/**
+ * Get a specific session by perrySessionId.
+ */
+export async function getSession(stateDir, perrySessionId) {
+    const registry = await loadRegistry(stateDir);
+    return registry.sessions[perrySessionId] ?? null;
+}
+/**
+ * Find a session by agentSessionId.
+ */
+export async function findByAgentSessionId(stateDir, agentSessionId) {
+    const registry = await loadRegistry(stateDir);
+    for (const record of Object.values(registry.sessions)) {
+        if (record.agentSessionId === agentSessionId) {
+            return record;
+        }
+    }
+    return null;
+}
 /**
  * Import an external session (discovered from agent storage).
  * Creates a Perry session record for a session that wasn't started through Perry.

package/dist/worker/server.js

@@ -56,14 +56,18 @@ export async function startWorkerServer(options = {}) {
         },
     });
     console.error(`Worker server listening on port ${server.port}`);
-    process.on('SIGINT', () => {
+    const shutdown = () => {
         sessionIndex.stopWatchers();
-        server.stop();
-        process.exit(0);
-    });
-    process.on('SIGTERM', () => {
-        sessionIndex.stopWatchers();
-        server.stop();
-        process.exit(0);
-    });
+        server
+            .stop()
+            .then(() => {
+            process.exit(0);
+        })
+            .catch((err) => {
+            console.error('[worker] Shutdown error:', err);
+            process.exit(1);
+        });
+    };
+    process.on('SIGINT', shutdown);
+    process.on('SIGTERM', shutdown);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gricha/perry",
-  "version": "0.3.10",
+  "version": "0.3.13",
   "description": "Self-contained CLI for spinning up Docker-in-Docker development environments with SSH and proxy helpers.",
   "type": "module",
   "bin": {
@@ -17,7 +17,7 @@
     "build:web": "cd web && bun run build",
     "test": "vitest run",
     "test:web": "playwright test",
-    "lint": "oxlint src/ mobile/src/",
+    "lint": "oxlint --type-aware --tsconfig=tsconfig.json src/ && oxlint mobile/src/",
     "format:check": "oxfmt --check src/ test/",
     "check": "bun run lint && bun run format:check && bun x tsc --noEmit",
     "lint:web": "cd web && bun run lint",
@@ -45,6 +45,7 @@
     "@types/ws": "^8.18.1",
     "oxfmt": "^0.21.0",
     "oxlint": "^1.36.0",
+    "oxlint-tsgolint": "^0.11.0",
     "typescript": "^5.6.3",
     "vitest": "^4.0.6"
   },