@wingman-ai/gateway 0.2.2 → 0.2.4

package/dist/gateway/http/types.d.ts

@@ -1,8 +1,9 @@
-import type { GatewayRouter } from "../router.js";
-import type { GatewayAuth } from "../auth.js";
-import type { Logger } from "@/logger.js";
+import type { TerminalSessionManager } from "@/agent/tools/terminal_session_manager.js";
 import type { WingmanConfigType } from "@/cli/config/schema.js";
 import type { SessionManager } from "@/cli/core/sessionManager.js";
+import type { Logger } from "@/logger.js";
+import type { GatewayAuth } from "../auth.js";
+import type { GatewayRouter } from "../router.js";
 export type GatewayHttpContext = {
     workspace: string;
     configDir: string;
@@ -21,5 +22,6 @@ export type GatewayHttpContext = {
     resolveFsRoots: () => string[];
     resolveFsPath: (path: string) => string;
     isPathWithinRoots: (path: string, roots: string[]) => boolean;
+    getTerminalSessionManager: () => TerminalSessionManager;
     getBuiltInTools: () => string[];
 };

package/dist/gateway/http/webhooks.cjs

@@ -28,12 +28,12 @@ __webpack_require__.d(__webpack_exports__, {
     createWebhookStore: ()=>createWebhookStore,
     handleWebhookInvoke: ()=>handleWebhookInvoke
 });
-const agentInvoker_cjs_namespaceObject = require("../../cli/core/agentInvoker.cjs");
-const outputManager_cjs_namespaceObject = require("../../cli/core/outputManager.cjs");
-const agentLoader_cjs_namespaceObject = require("../../agent/config/agentLoader.cjs");
 const external_node_crypto_namespaceObject = require("node:crypto");
 const external_node_fs_namespaceObject = require("node:fs");
 const external_node_path_namespaceObject = require("node:path");
+const agentLoader_cjs_namespaceObject = require("../../agent/config/agentLoader.cjs");
+const agentInvoker_cjs_namespaceObject = require("../../cli/core/agentInvoker.cjs");
+const outputManager_cjs_namespaceObject = require("../../cli/core/outputManager.cjs");
 const WEBHOOK_PRESETS = new Set([
     "gog-gmail"
 ]);
@@ -192,12 +192,12 @@ const handleWebhooksApi = async (ctx, store, req, url)=>{
         if (!agentExists(ctx, nextAgentId)) return new Response("Invalid agentId", {
             status: 400
         });
-        const hasPreset = Object.prototype.hasOwnProperty.call(body ?? {}, "preset");
+        const hasPreset = Object.hasOwn(body ?? {}, "preset");
         const presetValue = hasPreset ? normalizePreset(body?.preset) : webhook.preset;
         if (hasPreset && body?.preset && !presetValue && "custom" !== body.preset.trim()) return new Response("Invalid preset", {
             status: 400
         });
-        const hasSessionId = Object.prototype.hasOwnProperty.call(body ?? {}, "sessionId");
+        const hasSessionId = Object.hasOwn(body ?? {}, "sessionId");
         let nextSessionId = webhook.sessionId;
         if (hasSessionId) {
             const trimmed = body?.sessionId?.trim();
@@ -316,6 +316,7 @@ const handleWebhookInvoke = async (ctx, store, req, url)=>{
             outputManager,
             logger: ctx.logger,
             sessionManager,
+            terminalSessionManager: ctx.getTerminalSessionManager(),
             workdir,
             defaultOutputDir
         });

package/dist/gateway/http/webhooks.js

@@ -1,9 +1,9 @@
-import { AgentInvoker } from "../../cli/core/agentInvoker.js";
-import { OutputManager } from "../../cli/core/outputManager.js";
-import { AgentLoader } from "../../agent/config/agentLoader.js";
 import { randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
+import { AgentLoader } from "../../agent/config/agentLoader.js";
+import { AgentInvoker } from "../../cli/core/agentInvoker.js";
+import { OutputManager } from "../../cli/core/outputManager.js";
 const WEBHOOK_PRESETS = new Set([
     "gog-gmail"
 ]);
@@ -162,12 +162,12 @@ const handleWebhooksApi = async (ctx, store, req, url)=>{
         if (!agentExists(ctx, nextAgentId)) return new Response("Invalid agentId", {
             status: 400
         });
-        const hasPreset = Object.prototype.hasOwnProperty.call(body ?? {}, "preset");
+        const hasPreset = Object.hasOwn(body ?? {}, "preset");
         const presetValue = hasPreset ? normalizePreset(body?.preset) : webhook.preset;
         if (hasPreset && body?.preset && !presetValue && "custom" !== body.preset.trim()) return new Response("Invalid preset", {
             status: 400
         });
-        const hasSessionId = Object.prototype.hasOwnProperty.call(body ?? {}, "sessionId");
+        const hasSessionId = Object.hasOwn(body ?? {}, "sessionId");
         let nextSessionId = webhook.sessionId;
         if (hasSessionId) {
             const trimmed = body?.sessionId?.trim();
@@ -286,6 +286,7 @@ const handleWebhookInvoke = async (ctx, store, req, url)=>{
             outputManager,
             logger: ctx.logger,
             sessionManager,
+            terminalSessionManager: ctx.getTerminalSessionManager(),
             workdir,
             defaultOutputDir
         });

package/dist/gateway/server.cjs

@@ -29,31 +29,32 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     GatewayServer: ()=>GatewayServer
 });
-const external_node_cjs_namespaceObject = require("./node.cjs");
-const external_broadcast_cjs_namespaceObject = require("./broadcast.cjs");
-const external_auth_cjs_namespaceObject = require("./auth.cjs");
-const external_validation_cjs_namespaceObject = require("./validation.cjs");
-const external_env_cjs_namespaceObject = require("./env.cjs");
-const index_cjs_namespaceObject = require("./discovery/index.cjs");
-const external_logger_cjs_namespaceObject = require("../logger.cjs");
+const external_node_fs_namespaceObject = require("node:fs");
+const external_node_os_namespaceObject = require("node:os");
+const external_node_path_namespaceObject = require("node:path");
+const external_node_url_namespaceObject = require("node:url");
+const terminal_session_manager_cjs_namespaceObject = require("../agent/tools/terminal_session_manager.cjs");
 const loader_cjs_namespaceObject = require("../cli/config/loader.cjs");
-const external_router_cjs_namespaceObject = require("./router.cjs");
-const outputManager_cjs_namespaceObject = require("../cli/core/outputManager.cjs");
 const agentInvoker_cjs_namespaceObject = require("../cli/core/agentInvoker.cjs");
+const outputManager_cjs_namespaceObject = require("../cli/core/outputManager.cjs");
 const sessionManager_cjs_namespaceObject = require("../cli/core/sessionManager.cjs");
+const external_logger_cjs_namespaceObject = require("../logger.cjs");
+const discord_cjs_namespaceObject = require("./adapters/discord.cjs");
+const external_auth_cjs_namespaceObject = require("./auth.cjs");
+const external_broadcast_cjs_namespaceObject = require("./broadcast.cjs");
+const index_cjs_namespaceObject = require("./discovery/index.cjs");
+const external_env_cjs_namespaceObject = require("./env.cjs");
+const registry_cjs_namespaceObject = require("./hooks/registry.cjs");
 const agents_cjs_namespaceObject = require("./http/agents.cjs");
 const fs_cjs_namespaceObject = require("./http/fs.cjs");
 const providers_cjs_namespaceObject = require("./http/providers.cjs");
-const voice_cjs_namespaceObject = require("./http/voice.cjs");
+const routines_cjs_namespaceObject = require("./http/routines.cjs");
 const sessions_cjs_namespaceObject = require("./http/sessions.cjs");
+const voice_cjs_namespaceObject = require("./http/voice.cjs");
 const webhooks_cjs_namespaceObject = require("./http/webhooks.cjs");
-const routines_cjs_namespaceObject = require("./http/routines.cjs");
-const discord_cjs_namespaceObject = require("./adapters/discord.cjs");
-const registry_cjs_namespaceObject = require("./hooks/registry.cjs");
-const external_node_os_namespaceObject = require("node:os");
-const external_node_path_namespaceObject = require("node:path");
-const external_node_fs_namespaceObject = require("node:fs");
-const external_node_url_namespaceObject = require("node:url");
+const external_node_cjs_namespaceObject = require("./node.cjs");
+const external_router_cjs_namespaceObject = require("./router.cjs");
+const external_validation_cjs_namespaceObject = require("./validation.cjs");
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
         value: value,
@@ -107,6 +108,7 @@ class GatewayServer {
                     });
                     return;
                 }
+                if (url.pathname.startsWith("/api/")) return this.handleUiRequest(req);
                 const webhookResponse = await (0, webhooks_cjs_namespaceObject.handleWebhookInvoke)(this.getHttpContext(), this.webhookStore, req, url);
                 if (webhookResponse) return webhookResponse;
                 if (this.controlUiSamePort) return this.handleUiRequest(req);
@@ -163,6 +165,7 @@ class GatewayServer {
             this.uiServer.stop();
             this.uiServer = null;
         }
+        this.terminalSessionManager.dispose();
         this.log("info", "Gateway stopped");
     }
     getPort() {
@@ -350,6 +353,7 @@ class GatewayServer {
             existing?.abortController.abort();
             this.activeAgentRequests.delete(msg.id);
         }
+        this.removeQueuedRequestById(msg.id);
         const payload = msg.payload;
         const content = "string" == typeof payload?.content ? payload.content : "";
         const attachments = Array.isArray(payload?.attachments) ? payload.attachments : [];
@@ -359,6 +363,7 @@ class GatewayServer {
         const agentId = this.router.selectAgent(payload.agentId, payload.routing);
         if (!agentId) return void this.sendAgentError(ws, msg.id, "No agent matched the request");
         const sessionKey = payload.sessionKey || this.router.buildSessionKey(agentId, payload.routing);
+        const sessionQueueKey = this.buildSessionQueueKey(agentId, sessionKey);
         const sessionManager = await this.getSessionManager(agentId);
         const existingSession = sessionManager.getSession(sessionKey);
         const session = existingSession || sessionManager.getOrCreateSession(sessionKey, agentId);
@@ -409,9 +414,70 @@ class GatewayServer {
             ],
             skipSessionId: sessionKey
         });
+        const request = {
+            ws,
+            msg,
+            payload,
+            agentId,
+            sessionKey,
+            sessionQueueKey,
+            content,
+            attachments,
+            sessionManager,
+            workdir,
+            defaultOutputDir
+        };
+        this.requestSessionKeys.set(msg.id, sessionQueueKey);
+        const queueIfBusy = false !== payload.queueIfBusy;
+        const activeRequestId = this.activeSessionRequests.get(sessionQueueKey);
+        if (activeRequestId && queueIfBusy) {
+            const queued = this.queuedSessionRequests.get(sessionQueueKey) || [];
+            queued.push(request);
+            this.queuedSessionRequests.set(sessionQueueKey, queued);
+            const position = queued.length;
+            this.sendMessage(ws, {
+                type: "ack",
+                id: msg.id,
+                payload: {
+                    action: "req:agent",
+                    status: "queued",
+                    requestId: msg.id,
+                    sessionId: sessionKey,
+                    agentId,
+                    position
+                },
+                timestamp: Date.now()
+            });
+            this.sendMessage(ws, {
+                type: "event:agent",
+                id: msg.id,
+                clientId: ws.data.clientId,
+                payload: this.attachSessionContext({
+                    type: "request-queued",
+                    position
+                }, sessionKey, agentId),
+                timestamp: Date.now()
+            });
+            return;
+        }
+        if (activeRequestId && !queueIfBusy) {
+            this.requestSessionKeys.delete(msg.id);
+            this.sendAgentError(ws, msg.id, "Session already has an in-flight request. Set queueIfBusy=true to enqueue.", {
+                sessionId: sessionKey,
+                agentId
+            });
+            return;
+        }
+        this.executeAgentRequest(request);
+    }
+    async executeAgentRequest(request) {
+        const { ws, msg, agentId, sessionKey, sessionQueueKey, content, attachments, sessionManager, workdir, defaultOutputDir } = request;
+        this.activeSessionRequests.set(sessionQueueKey, msg.id);
         const outputManager = new outputManager_cjs_namespaceObject.OutputManager("interactive");
+        let emittedAgentError = false;
         const outputHandler = (event)=>{
             const payloadWithSession = this.attachSessionContext(event, sessionKey, agentId);
+            if (payloadWithSession && "object" == typeof payloadWithSession && !Array.isArray(payloadWithSession) && "agent-error" === payloadWithSession.type) emittedAgentError = true;
             const baseMessage = {
                 type: "event:agent",
                 id: msg.id,
@@ -432,6 +498,7 @@ class GatewayServer {
             outputManager,
             logger: this.logger,
             sessionManager,
+            terminalSessionManager: this.terminalSessionManager,
             workdir,
             defaultOutputDir
         });
@@ -450,41 +517,111 @@ class GatewayServer {
             });
         } catch (error) {
             this.logger.error("Agent invocation failed", error);
+            if (!emittedAgentError) {
+                const message = error instanceof Error ? error.message : String(error);
+                const stack = error instanceof Error ? error.stack : void 0;
+                this.sendAgentError(ws, msg.id, message, {
+                    sessionId: sessionKey,
+                    agentId,
+                    stack,
+                    broadcastToSession: true,
+                    exclude: ws
+                });
+            }
         } finally{
             this.activeAgentRequests.delete(msg.id);
+            this.activeSessionRequests.delete(sessionQueueKey);
+            this.requestSessionKeys.delete(msg.id);
             outputManager.off("output-event", outputHandler);
+            this.processNextQueuedAgentRequest(sessionQueueKey);
         }
     }
+    processNextQueuedAgentRequest(sessionQueueKey) {
+        if (this.activeSessionRequests.has(sessionQueueKey)) return;
+        const queue = this.queuedSessionRequests.get(sessionQueueKey);
+        if (!queue || 0 === queue.length) return void this.queuedSessionRequests.delete(sessionQueueKey);
+        const next = queue.shift();
+        if (!next) return;
+        if (0 === queue.length) this.queuedSessionRequests.delete(sessionQueueKey);
+        else this.queuedSessionRequests.set(sessionQueueKey, queue);
+        this.sendMessage(next.ws, {
+            type: "ack",
+            id: next.msg.id,
+            payload: {
+                action: "req:agent",
+                status: "dequeued",
+                requestId: next.msg.id,
+                sessionId: next.sessionKey,
+                agentId: next.agentId,
+                remaining: queue.length
+            },
+            timestamp: Date.now()
+        });
+        this.executeAgentRequest(next);
+    }
     handleAgentCancel(ws, msg) {
         if (!ws.data.authenticated) return void this.sendError(ws, "AUTH_FAILED", "Client is not authenticated");
         const payload = msg.payload;
         const requestId = "string" == typeof payload?.requestId && payload.requestId || void 0;
         if (!requestId) return void this.sendError(ws, "INVALID_REQUEST", "Missing requestId for cancellation");
         const active = this.activeAgentRequests.get(requestId);
-        if (!active) return void this.sendMessage(ws, {
-            type: "ack",
-            id: msg.id,
-            payload: {
-                action: "req:agent:cancel",
-                requestId,
-                status: "not_found"
-            },
-            timestamp: Date.now()
-        });
-        if (active.socket !== ws) return void this.sendError(ws, "FORBIDDEN", "Cannot cancel a request started by another client");
-        active.abortController.abort();
-        this.activeAgentRequests.delete(requestId);
+        if (active) {
+            if (active.socket !== ws) return void this.sendError(ws, "FORBIDDEN", "Cannot cancel a request started by another client");
+            active.abortController.abort();
+            this.activeAgentRequests.delete(requestId);
+            this.sendMessage(ws, {
+                type: "ack",
+                id: msg.id,
+                payload: {
+                    action: "req:agent:cancel",
+                    requestId,
+                    status: "cancelled"
+                },
+                timestamp: Date.now()
+            });
+            return;
+        }
+        const queued = this.removeQueuedRequestById(requestId);
+        if (queued) {
+            if (queued.ws !== ws) return void this.sendError(ws, "FORBIDDEN", "Cannot cancel a request started by another client");
+            this.sendMessage(ws, {
+                type: "ack",
+                id: msg.id,
+                payload: {
+                    action: "req:agent:cancel",
+                    requestId,
+                    status: "cancelled_queued"
+                },
+                timestamp: Date.now()
+            });
+            return;
+        }
         this.sendMessage(ws, {
             type: "ack",
             id: msg.id,
             payload: {
                 action: "req:agent:cancel",
                 requestId,
-                status: "cancelled"
+                status: "not_found"
             },
             timestamp: Date.now()
         });
     }
+    buildSessionQueueKey(agentId, sessionKey) {
+        return `${agentId}:${sessionKey}`;
+    }
+    removeQueuedRequestById(requestId) {
+        for (const [queueKey, queue] of this.queuedSessionRequests){
+            const index = queue.findIndex((item)=>item.msg.id === requestId);
+            if (-1 === index) continue;
+            const [removed] = queue.splice(index, 1);
+            if (0 === queue.length) this.queuedSessionRequests.delete(queueKey);
+            else this.queuedSessionRequests.set(queueKey, queue);
+            this.requestSessionKeys.delete(requestId);
+            return removed || null;
+        }
+        return null;
+    }
     handleRegister(ws, msg) {
         const payload = msg.payload;
         if (!this.auth.validate({
@@ -647,23 +784,39 @@ class GatewayServer {
             timestamp: Date.now()
         });
     }
-    sendAgentError(ws, requestId, message) {
-        this.sendMessage(ws, {
+    sendAgentError(ws, requestId, message, options) {
+        let payload = {
+            type: "agent-error",
+            error: message,
+            timestamp: new Date().toISOString()
+        };
+        if (options?.stack) payload.stack = options.stack;
+        if (options?.sessionId && options?.agentId) payload = this.attachSessionContext(payload, options.sessionId, options.agentId);
+        const baseMessage = {
             type: "event:agent",
             id: requestId,
-            payload: {
-                type: "agent-error",
-                error: message,
-                timestamp: new Date().toISOString()
-            },
+            payload,
             timestamp: Date.now()
+        };
+        this.sendMessage(ws, {
+            ...baseMessage,
+            clientId: ws.data.clientId
         });
+        if (options?.broadcastToSession && options.sessionId) this.broadcastSessionEvent(options.sessionId, baseMessage, options.exclude);
     }
     cancelSocketAgentRequests(ws) {
         for (const [requestId, active] of this.activeAgentRequests)if (active.socket === ws) {
             active.abortController.abort();
             this.activeAgentRequests.delete(requestId);
         }
+        for (const [queueKey, queue] of this.queuedSessionRequests){
+            const nextQueue = queue.filter((request)=>request.ws !== ws);
+            if (nextQueue.length !== queue.length) {
+                for (const request of queue)if (request.ws === ws && request.msg.id) this.requestSessionKeys.delete(request.msg.id);
+                if (0 === nextQueue.length) this.queuedSessionRequests.delete(queueKey);
+                else this.queuedSessionRequests.set(queueKey, nextQueue);
+            }
+        }
     }
     attachSessionContext(event, sessionId, agentId) {
         if (event && "object" == typeof event && !Array.isArray(event)) return {
@@ -783,6 +936,7 @@ class GatewayServer {
             resolveFsRoots: ()=>this.resolveFsRoots(),
             resolveFsPath: (path)=>this.resolveFsPath(path),
             isPathWithinRoots: (path, roots)=>this.isPathWithinRoots(path, roots),
+            getTerminalSessionManager: ()=>this.terminalSessionManager,
             getBuiltInTools: ()=>this.getBuiltInTools()
         };
     }
@@ -855,9 +1009,7 @@ class GatewayServer {
         ];
         for (const candidate of candidates)try {
             if ((0, external_node_fs_namespaceObject.existsSync)(candidate) && (0, external_node_fs_namespaceObject.statSync)(candidate).isDirectory() && (0, external_node_fs_namespaceObject.existsSync)((0, external_node_path_namespaceObject.join)(candidate, "index.html"))) return candidate;
-        } catch  {
-            continue;
-        }
+        } catch  {}
         return null;
     }
     async getSessionManager(agentId) {
@@ -1181,6 +1333,10 @@ class GatewayServer {
         _define_property(this, "socketSubscriptions", new Map());
         _define_property(this, "connectedClients", new Set());
         _define_property(this, "activeAgentRequests", new Map());
+        _define_property(this, "activeSessionRequests", new Map());
+        _define_property(this, "queuedSessionRequests", new Map());
+        _define_property(this, "requestSessionKeys", new Map());
+        _define_property(this, "terminalSessionManager", void 0);
         _define_property(this, "bridgeQueues", new Map());
         _define_property(this, "bridgePollWaiters", new Map());
         this.workspace = config.workspace || process.cwd();
@@ -1231,6 +1387,7 @@ class GatewayServer {
         this.controlUiPort = controlUi?.port || 18790;
         this.controlUiSamePort = this.controlUiEnabled && this.controlUiPort === this.config.port;
         this.uiDistDir = this.controlUiEnabled ? this.resolveControlUiDir() : null;
+        this.terminalSessionManager = new terminal_session_manager_cjs_namespaceObject.TerminalSessionManager();
     }
 }
 function buildAttachmentPreview(attachments) {

package/dist/gateway/server.d.ts

@@ -1,5 +1,5 @@
-import type { GatewayConfig } from "./types.js";
 import { GatewayAuth } from "./auth.js";
+import type { GatewayConfig } from "./types.js";
 /**
  * Wingman Gateway Server
  * Manages WebSocket connections for AI agent swarming
@@ -34,6 +34,10 @@ export declare class GatewayServer {
     private socketSubscriptions;
     private connectedClients;
     private activeAgentRequests;
+    private activeSessionRequests;
+    private queuedSessionRequests;
+    private requestSessionKeys;
+    private terminalSessionManager;
     private bridgeQueues;
     private bridgePollWaiters;
     constructor(config?: Partial<GatewayConfig>);
@@ -76,7 +80,11 @@ export declare class GatewayServer {
      * Handle agent execution request
      */
     private handleAgentRequest;
+    private executeAgentRequest;
+    private processNextQueuedAgentRequest;
     private handleAgentCancel;
+    private buildSessionQueueKey;
+    private removeQueuedRequestById;
     /**
      * Handle node registration
      */