aegis-bridge 2.2.2 → 2.2.5

package/dist/server.js

@@ -35,7 +35,7 @@ import { registerHookRoutes } from './hooks.js';
 import { registerWsTerminalRoute } from './ws-terminal.js';
 import { SwarmMonitor } from './swarm-monitor.js';
 import { execSync } from 'node:child_process';
-import { authKeySchema, sendMessageSchema, commandSchema, bashSchema, screenshotSchema, permissionHookSchema, stopHookSchema, batchSessionSchema, pipelineSchema, parseIntSafe, } from './validation.js';
+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);
 // ── Configuration ────────────────────────────────────────────────────
@@ -211,6 +211,13 @@ function setupAuth(authManager) {
     });
 }
 // ── v1 API Routes ───────────────────────────────────────────────────
+// #412: Reject non-UUID session IDs at the routing layer
+app.addHook('onRequest', async (req, reply) => {
+    const id = req.params.id;
+    if (id !== undefined && !isValidUUID(id)) {
+        return reply.status(400).send({ error: 'Invalid session ID — must be a UUID' });
+    }
+});
 // #226: Zod schema for session creation
 const createSessionSchema = z.object({
     workDir: z.string().min(1),
@@ -1378,7 +1385,11 @@ async function main() {
     await app.register(fastifyWebsocket);
     registerWsTerminalRoute(app, sessions, tmux, auth);
     // #217: CORS configuration — restrictive by default
+    // #413: Reject wildcard CORS_ORIGIN — * is insecure and allows any origin
     const corsOrigin = process.env.CORS_ORIGIN;
+    if (corsOrigin === '*') {
+        throw new Error('CORS_ORIGIN=* wildcard is not allowed. Specify explicit origins (comma-separated) or leave unset to disable CORS.');
+    }
     await app.register(fastifyCors, {
         origin: corsOrigin ? corsOrigin.split(',').map(s => s.trim()) : false,
     });

package/dist/session.d.ts

@@ -99,6 +99,12 @@ export declare class SessionManager {
     }>;
     /** Wait for CC idle prompt, then send. Single attempt. */
     private waitForReadyAndSend;
+    /**
+     * Issue #561: After sending an initial prompt, verify CC actually accepted it
+     * by polling for a state transition away from idle/unknown.
+     * Returns true if CC transitions to a recognized active state within the timeout.
+     */
+    private verifyPromptAccepted;
     createSession(opts: {
         workDir: string;
         name?: string;

package/dist/session.js

@@ -293,16 +293,52 @@ export class SessionManager {
             // At session creation, no other code is writing to this pane,
             // so queue serialization is unnecessary and adds latency.
             const paneText = await this.tmux.capturePaneDirect(session.windowId);
-            // CC shows ❯ (U+276F) when ready for input. Avoid checking for plain >
-            // which appears frequently in tool output, diffs, and prompts.
-            if (paneText && paneText.includes('❯')) {
-                return this.sendMessageDirect(sessionId, prompt);
+            // Issue #561: Use detectUIState for robust readiness detection.
+            // Requires both ❯ prompt AND chrome separators (─────) to confirm idle.
+            // Naive includes('❯') matched splash/startup output, causing premature sends.
+            if (paneText && detectUIState(paneText) === 'idle') {
+                const result = await this.sendMessageDirect(sessionId, prompt);
+                if (!result.delivered)
+                    return result;
+                // Issue #561: Post-send verification. Wait for CC to transition to a
+                // recognized active state. If CC stays in idle/unknown, the prompt was
+                // swallowed — report as undelivered so the retry loop can re-attempt.
+                const verified = await this.verifyPromptAccepted(session.windowId);
+                return verified
+                    ? result
+                    : { delivered: false, attempts: result.attempts };
             }
             await new Promise(r => setTimeout(r, pollInterval));
             pollInterval = Math.min(pollInterval * 2, MAX_POLL_MS);
         }
         return { delivered: false, attempts: 0 };
     }
+    /**
+     * Issue #561: After sending an initial prompt, verify CC actually accepted it
+     * by polling for a state transition away from idle/unknown.
+     * Returns true if CC transitions to a recognized active state within the timeout.
+     */
+    async verifyPromptAccepted(windowId) {
+        const VERIFY_TIMEOUT_MS = 5_000;
+        const VERIFY_POLL_MS = 500;
+        const verifyStart = Date.now();
+        while (Date.now() - verifyStart < VERIFY_TIMEOUT_MS) {
+            const paneText = await this.tmux.capturePaneDirect(windowId);
+            const state = detectUIState(paneText);
+            // Active states mean CC received and is processing the prompt.
+            // waiting_for_input = CC accepted prompt, awaiting follow-up (no chrome yet).
+            if (state === 'working' || state === 'permission_prompt' ||
+                state === 'bash_approval' || state === 'plan_mode' ||
+                state === 'ask_question' || state === 'compacting' ||
+                state === 'context_warning' || state === 'waiting_for_input') {
+                return true;
+            }
+            // idle or unknown — keep polling
+            await new Promise(r => setTimeout(r, VERIFY_POLL_MS));
+        }
+        console.warn(`verifyPromptAccepted: CC did not transition from idle/unknown within ${VERIFY_TIMEOUT_MS}ms`);
+        return false;
+    }
     async createSession(opts) {
         const id = crypto.randomUUID();
         const windowName = opts.name || `cc-${id.slice(0, 8)}`;

package/dist/validation.d.ts

@@ -12,6 +12,8 @@ export declare const authKeySchema: z.ZodObject<{
     name: z.ZodString;
     rateLimit: z.ZodOptional<z.ZodNumber>;
 }, z.core.$strict>;
+/** Maximum length for user-supplied prompts/commands (Issue #411). */
+export declare const MAX_INPUT_LENGTH = 10000;
 /** POST /v1/sessions/:id/send */
 export declare const sendMessageSchema: z.ZodObject<{
     text: z.ZodString;

package/dist/validation.js

@@ -15,17 +15,19 @@ export const authKeySchema = z.object({
     name: z.string().min(1),
     rateLimit: z.number().int().positive().optional(),
 }).strict();
+/** Maximum length for user-supplied prompts/commands (Issue #411). */
+export const MAX_INPUT_LENGTH = 10_000;
 /** POST /v1/sessions/:id/send */
 export const sendMessageSchema = z.object({
-    text: z.string().min(1),
+    text: z.string().min(1).max(MAX_INPUT_LENGTH),
 }).strict();
 /** POST /v1/sessions/:id/command */
 export const commandSchema = z.object({
-    command: z.string().min(1),
+    command: z.string().min(1).max(MAX_INPUT_LENGTH),
 }).strict();
 /** POST /v1/sessions/:id/bash */
 export const bashSchema = z.object({
-    command: z.string().min(1),
+    command: z.string().min(1).max(MAX_INPUT_LENGTH),
 }).strict();
 /** POST /v1/sessions/:id/screenshot */
 export const screenshotSchema = z.object({
@@ -70,7 +72,7 @@ export const batchSessionSchema = z.object({
 const pipelineStageSchema = z.object({
     name: z.string().min(1),
     workDir: z.string().min(1).optional(),
-    prompt: z.string().min(1),
+    prompt: z.string().min(1).max(MAX_INPUT_LENGTH),
     dependsOn: z.array(z.string()).optional(),
     permissionMode: z.enum(['default', 'bypassPermissions', 'plan']).optional(),
     autoApprove: z.boolean().optional(),

package/dist/ws-terminal.js

@@ -19,7 +19,7 @@
  *   - Shared tmux capture polls (one per session, not per connection)
  *   - Ping/pong keep-alive with dead connection detection
  */
-import { clamp, wsInboundMessageSchema } from './validation.js';
+import { clamp, wsInboundMessageSchema, isValidUUID } from './validation.js';
 const POLL_INTERVAL_MS = 500;
 const KEEPALIVE_INTERVAL_TICKS = 60; // 30s at 500ms intervals
 const KEEPALIVE_TIMEOUT_MS = 35_000; // 30s interval + 5s grace
@@ -69,6 +69,12 @@ export function registerWsTerminalRoute(app, sessions, tmux, auth) {
         },
     }, (socket, req) => {
         const sessionId = req.params.id;
+        // #412: Validate session ID is a UUID before lookup
+        if (!isValidUUID(sessionId)) {
+            sendError(socket, 'Invalid session ID — must be a UUID');
+            socket.close();
+            return;
+        }
         const session = sessions.getSession(sessionId);
         if (!session) {
             sendError(socket, 'Session not found');

package/package.json

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