aegis-bridge 2.3.4 → 2.3.6

package/README.md

@@ -103,7 +103,7 @@ All endpoints under `/v1/`.
 | Method | Endpoint | Description |
 |--------|----------|-------------|
 | `GET` | `/v1/health` | Server health & uptime |
-| `POST` | `/v1/sessions` | Create a session |
+| `POST` | `/v1/sessions` | Create (or reuse) a session |
 | `GET` | `/v1/sessions` | List sessions |
 | `GET` | `/v1/sessions/:id` | Session details |
 | `GET` | `/v1/sessions/:id/read` | Parsed transcript |
@@ -144,9 +144,38 @@ All endpoints under `/v1/`.
 
 </details>
 
----
+<details>
+<summary>Session Reuse</summary>
+
+When you `POST /v1/sessions` (or `POST /sessions`) with a `workDir` that already has an **idle** session, Aegis reuses that session instead of creating a duplicate. The existing session's prompt is delivered and you get the same session object back.
+
+**Response differences:**
+
+| | New Session | Reused Session |
+|---|---|---|
+| Status | `201 Created` | `200 OK` |
+| `reused` | `false` | `true` |
+| `promptDelivery` | `{ delivered, attempts }` | `{ delivered, attempts }` |
+
+```bash
+# First call → creates session (201)
+curl -s -o /dev/null -w "%{http_code}" -X POST http://localhost:9100/v1/sessions \
+  -H "Content-Type: application/json" \
+  -d '{"workDir": "/home/user/project", "prompt": "Fix the tests"}'
+# → 201
 
-## Integrations
+# Same workDir while idle → reuses session (200)
+curl -s -o /dev/null -w "%{http_code}" -X POST http://localhost:9100/v1/sessions \
+  -H "Content-Type: application/json" \
+  -d '{"workDir": "/home/user/project", "prompt": "Now add error handling"}'
+# → 200, body includes "reused": true
+```
+
+Only **idle** sessions are reused. Working, stalled, or permission-prompt sessions are ignored — a new one is created.
+
+</details>
+
+---
 
 ### Telegram
 

package/dist/auth.js

@@ -155,8 +155,9 @@ export class AuthManager {
         const previous = this.sseMutex;
         this.sseMutex = lock;
         // #509: await + try/finally together so release() fires even if previous rejects
+        // #573: catch prior rejection so it doesn't propagate and block subsequent callers
         try {
-            await previous;
+            await previous.catch(() => { });
             // Cleanup expired tokens first
             this.cleanExpiredSSETokens();
             // Enforce per-key limit

package/dist/server.js

@@ -34,7 +34,7 @@ import { MetricsCollector } from './metrics.js';
 import { registerHookRoutes } from './hooks.js';
 import { registerWsTerminalRoute } from './ws-terminal.js';
 import { SwarmMonitor } from './swarm-monitor.js';
-import { execSync } from 'node:child_process';
+import { execFileSync } from 'node:child_process';
 import { authKeySchema, sendMessageSchema, commandSchema, bashSchema, screenshotSchema, permissionHookSchema, stopHookSchema, batchSessionSchema, pipelineSchema, parseIntSafe, isValidUUID, } from './validation.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -448,19 +448,30 @@ app.get('/v1/sessions', async (req) => {
 app.get('/sessions', async () => sessions.listSessions());
 /** Validate workDir — delegates to validation.ts (Issue #435). */
 const validateWorkDirWithConfig = (workDir) => validateWorkDir(workDir, config.allowedWorkDirs);
-// Create session
+// Create session (Issue #607: reuse idle session for same workDir)
 app.post('/v1/sessions', async (req, reply) => {
     const parsed = createSessionSchema.safeParse(req.body);
     if (!parsed.success) {
         return reply.status(400).send({ error: 'Invalid request body', details: parsed.error.issues });
     }
     const { workDir, name, prompt, resumeSessionId, claudeCommand, env, stallThresholdMs, permissionMode, autoApprove } = parsed.data;
-    console.time("POST_CREATE_SESSION");
     if (!workDir)
         return reply.status(400).send({ error: 'workDir is required' });
     const safeWorkDir = await validateWorkDirWithConfig(workDir);
     if (typeof safeWorkDir === 'object')
         return reply.status(400).send({ error: safeWorkDir.error, code: safeWorkDir.code });
+    // Issue #607: Check for an existing idle session with the same workDir
+    const existing = sessions.findIdleSessionByWorkDir(safeWorkDir);
+    if (existing) {
+        // Send prompt to the existing session if provided
+        let promptDelivery;
+        if (prompt) {
+            promptDelivery = await sessions.sendInitialPrompt(existing.id, prompt);
+            metrics.promptSent(promptDelivery.delivered);
+        }
+        return reply.status(200).send({ ...existing, reused: true, promptDelivery });
+    }
+    console.time("POST_CREATE_SESSION");
     const session = await sessions.createSession({ workDir: safeWorkDir, name, resumeSessionId, claudeCommand, env, stallThresholdMs, permissionMode, autoApprove });
     console.timeEnd("POST_CREATE_SESSION");
     console.time("POST_CHANNEL_CREATED");
@@ -490,7 +501,7 @@ app.post('/v1/sessions', async (req, reply) => {
     }
     return reply.status(201).send({ ...session, promptDelivery });
 });
-// Backwards compat
+// Backwards compat (Issue #607: same reuse logic as v1 route)
 app.post('/sessions', async (req, reply) => {
     const parsed = createSessionSchema.safeParse(req.body);
     if (!parsed.success) {
@@ -502,6 +513,16 @@ app.post('/sessions', async (req, reply) => {
     const safeWorkDir = await validateWorkDirWithConfig(workDir);
     if (typeof safeWorkDir === 'object')
         return reply.status(400).send({ error: safeWorkDir.error, code: safeWorkDir.code });
+    // Issue #607: Check for an existing idle session with the same workDir
+    const existing = sessions.findIdleSessionByWorkDir(safeWorkDir);
+    if (existing) {
+        let promptDelivery;
+        if (prompt) {
+            promptDelivery = await sessions.sendInitialPrompt(existing.id, prompt);
+            metrics.promptSent(promptDelivery.delivered);
+        }
+        return reply.status(200).send({ ...existing, reused: true, promptDelivery });
+    }
     const session = await sessions.createSession({ workDir: safeWorkDir, name, resumeSessionId, claudeCommand, env, stallThresholdMs, permissionMode, autoApprove });
     // Issue #46: Topic first, then prompt (same fix as v1 route)
     await channels.sessionCreated({
@@ -1323,7 +1344,7 @@ async function killStalePortHolder(port) {
     // Small random delay to reduce race window with systemd restarts
     await new Promise(resolve => setTimeout(resolve, 100 + Math.random() * 400));
     try {
-        const output = execSync(`lsof -ti tcp:${port}`, { encoding: 'utf-8', timeout: 5_000 }).trim();
+        const output = execFileSync('lsof', ['-ti', `tcp:${port}`], { encoding: 'utf-8', timeout: 5_000 }).trim();
         if (!output)
             return false;
         const pids = output.split('\n').map(s => parseInt(s.trim(), 10)).filter(n => !isNaN(n));

package/dist/session.d.ts

@@ -154,6 +154,10 @@ export declare class SessionManager {
     isWindowAlive(id: string): Promise<boolean>;
     /** List all sessions. */
     listSessions(): SessionInfo[];
+    /** Issue #607: Find an idle session for the given workDir.
+     *  Returns the most recently active idle session, or null if none found.
+     *  Used to resume existing sessions instead of creating duplicates. */
+    findIdleSessionByWorkDir(workDir: string): SessionInfo | null;
     /** Get health info for a session.
      *  Issue #2: Returns comprehensive health status for orchestrators.
      */

package/dist/session.js

@@ -489,12 +489,13 @@ export class SessionManager {
         await this.save();
         // Issue #353: Fetch CC process PID for swarm parent matching.
         // Fire-and-forget — PID is not needed synchronously.
+        // Issue #574: Add .catch() to prevent unhandled rejection if tmux fails mid-lookup.
         void this.tmux.listPanePid(windowId).then(pid => {
             if (pid !== null) {
                 session.ccPid = pid;
-                void this.save();
+                void this.save().catch(e => console.error(`Session: failed to save PID for ${id}:`, e));
             }
-        });
+        }).catch(e => console.error(`Session: failed to list pane PID for ${id}:`, e));
         // Start BOTH discovery methods in parallel:
         // 1. Hook-based: fast, relies on SessionStart hook writing session_map.json
         // 2. Filesystem-based: slower, scans for new .jsonl files — works when hooks fail
@@ -652,6 +653,17 @@ export class SessionManager {
     listSessions() {
         return Object.values(this.state.sessions);
     }
+    /** Issue #607: Find an idle session for the given workDir.
+     *  Returns the most recently active idle session, or null if none found.
+     *  Used to resume existing sessions instead of creating duplicates. */
+    findIdleSessionByWorkDir(workDir) {
+        const candidates = Object.values(this.state.sessions).filter((s) => s.workDir === workDir && s.status === 'idle');
+        if (candidates.length === 0)
+            return null;
+        // Return the most recently active session
+        candidates.sort((a, b) => b.lastActivity - a.lastActivity);
+        return candidates[0];
+    }
     /** Get health info for a session.
      *  Issue #2: Returns comprehensive health status for orchestrators.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aegis-bridge",
-  "version": "2.3.4",
+  "version": "2.3.6",
   "type": "module",
   "description": "Orchestrate Claude Code sessions via API. Create, brief, monitor, refine, ship.",
   "main": "dist/server.js",