@cogitator-ai/koa 0.8.6 → 0.10.0

package/dist/middleware/error-handler.js

@@ -1,4 +1,5 @@
-import { CogitatorError, ERROR_STATUS_CODES, ErrorCode } from '@cogitator-ai/types';
+import { INTERNAL_ERROR, describeHttpError } from '@cogitator-ai/server-shared';
+import { sendError } from '../utils/errors.js';
 export function createErrorHandler() {
     return async (ctx, next) => {
         try {
@@ -7,46 +8,25 @@ export function createErrorHandler() {
         catch (err) {
             if (ctx.headerSent)
                 return;
-            if (CogitatorError.isCogitatorError(err)) {
-                ctx.status = err.statusCode ?? ERROR_STATUS_CODES[err.code] ?? 500;
-                ctx.body = {
-                    error: {
-                        message: err.message,
-                        code: err.code,
-                    },
-                };
+            const described = describeHttpError(err);
+            if (described) {
+                sendError(ctx, described);
                 return;
             }
-            const status = err.status;
-            if (status && status >= 400 && status < 600) {
-                ctx.status = status;
-                if (status >= 500) {
-                    console.error('[CogitatorKoa] Unhandled error:', err);
-                    ctx.body = {
-                        error: {
-                            message: 'Internal server error',
-                            code: ErrorCode.INTERNAL_ERROR,
-                        },
-                    };
-                }
-                else {
-                    ctx.body = {
-                        error: {
-                            message: err instanceof Error ? err.message : 'HTTP error',
-                            code: status === 413 ? 'PAYLOAD_TOO_LARGE' : 'HTTP_ERROR',
-                        },
-                    };
-                }
+            const status = err?.status;
+            if (status && status >= 400 && status < 500) {
+                sendError(ctx, {
+                    status,
+                    code: status === 413 ? 'PAYLOAD_TOO_LARGE' : 'HTTP_ERROR',
+                    message: err instanceof Error ? err.message : 'HTTP error',
+                });
                 return;
             }
             console.error('[CogitatorKoa] Unhandled error:', err);
-            ctx.status = 500;
-            ctx.body = {
-                error: {
-                    message: 'Internal server error',
-                    code: ErrorCode.INTERNAL_ERROR,
-                },
-            };
+            sendError(ctx, {
+                ...INTERNAL_ERROR,
+                ...(status && status >= 500 && status < 600 && { status }),
+            });
         }
     };
 }

package/dist/middleware/error-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../src/middleware/error-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEpF,MAAM,UAAU,kBAAkB;IAChC,OAAO,KAAK,EAAE,GAAY,EAAE,IAAU,EAAE,EAAE;QACxC,IAAI,CAAC;YACH,MAAM,IAAI,EAAE,CAAC;QACf,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,CAAC,UAAU;gBAAE,OAAO;YAE3B,IAAI,cAAc,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC;gBACzC,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,UAAU,IAAI,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;gBACnE,GAAG,CAAC,IAAI,GAAG;oBACT,KAAK,EAAE;wBACL,OAAO,EAAE,GAAG,CAAC,OAAO;wBACpB,IAAI,EAAE,GAAG,CAAC,IAAI;qBACf;iBACF,CAAC;gBACF,OAAO;YACT,CAAC;YAED,MAAM,MAAM,GAAI,GAA2B,CAAC,MAAM,CAAC;YACnD,IAAI,MAAM,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,GAAG,GAAG,EAAE,CAAC;gBAC5C,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;gBACpB,IAAI,MAAM,IAAI,GAAG,EAAE,CAAC;oBAClB,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,GAAG,CAAC,CAAC;oBACtD,GAAG,CAAC,IAAI,GAAG;wBACT,KAAK,EAAE;4BACL,OAAO,EAAE,uBAAuB;4BAChC,IAAI,EAAE,SAAS,CAAC,cAAc;yBAC/B;qBACF,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,IAAI,GAAG;wBACT,KAAK,EAAE;4BACL,OAAO,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY;4BAC1D,IAAI,EAAE,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,YAAY;yBAC1D;qBACF,CAAC;gBACJ,CAAC;gBACD,OAAO;YACT,CAAC;YAED,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,GAAG,CAAC,CAAC;YAEtD,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG;gBACT,KAAK,EAAE;oBACL,OAAO,EAAE,uBAAuB;oBAChC,IAAI,EAAE,SAAS,CAAC,cAAc;iBAC/B;aACF,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../src/middleware/error-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,MAAM,UAAU,kBAAkB;IAChC,OAAO,KAAK,EAAE,GAAY,EAAE,IAAU,EAAE,EAAE;QACxC,IAAI,CAAC;YACH,MAAM,IAAI,EAAE,CAAC;QACf,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,CAAC,UAAU;gBAAE,OAAO;YAE3B,MAAM,SAAS,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;YACzC,IAAI,SAAS,EAAE,CAAC;gBACd,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;gBAC1B,OAAO;YACT,CAAC;YAED,MAAM,MAAM,GAAI,GAAkC,EAAE,MAAM,CAAC;YAC3D,IAAI,MAAM,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,GAAG,GAAG,EAAE,CAAC;gBAC5C,SAAS,CAAC,GAAG,EAAE;oBACb,MAAM;oBACN,IAAI,EAAE,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,YAAY;oBACzD,OAAO,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY;iBAC3D,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YAED,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,GAAG,CAAC,CAAC;YACtD,SAAS,CAAC,GAAG,EAAE;gBACb,GAAG,cAAc;gBACjB,GAAG,CAAC,MAAM,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,GAAG,GAAG,IAAI,EAAE,MAAM,EAAE,CAAC;aAC3D,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/dist/middleware/index.d.ts

@@ -1,5 +1,5 @@
 export { createContextMiddleware } from './context.js';
-export { createAuthMiddleware } from './auth.js';
+export { createAnonymousMiddleware, createAuthMiddleware } from './auth.js';
 export { createBodyParser } from './body-parser.js';
 export { createErrorHandler } from './error-handler.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/middleware/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC"}

package/dist/middleware/index.js

@@ -1,5 +1,5 @@
 export { createContextMiddleware } from './context.js';
-export { createAuthMiddleware } from './auth.js';
+export { createAnonymousMiddleware, createAuthMiddleware } from './auth.js';
 export { createBodyParser } from './body-parser.js';
 export { createErrorHandler } from './error-handler.js';
 //# sourceMappingURL=index.js.map

package/dist/middleware/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC"}

package/dist/middleware/unmatched.d.ts

@@ -0,0 +1,20 @@
+import type Router from '@koa/router';
+import type { Middleware } from 'koa';
+import type { CogitatorState } from '../types.js';
+/**
+ * `middleware`, for the requests a route of the router serves. Any other request passes
+ * through untouched, so the middleware downstream of the router gets it as it came.
+ */
+export declare function forRoutes(middleware: Middleware): Middleware;
+/**
+ * Registers the last route of the router, the one for the requests no other route serves. It
+ * lets the middleware downstream of the router answer them first. What is left unanswered goes
+ * through `guards`, the authentication and anonymous policy of the API, and is answered with
+ * `404 NOT_FOUND` in the error envelope, so under `anonymous: 'deny'` an anonymous caller gets
+ * `401` on every path and cannot tell which paths exist. An `OPTIONS` request for a path a route
+ * serves answers `204` with the methods it serves in `Allow`, which `router.allowedMethods()`
+ * would answer for every path once this route matches them all, so the app needs no
+ * `allowedMethods()`.
+ */
+export declare function routeUnmatched(router: Router<CogitatorState>, guards: readonly Middleware[]): void;
+//# sourceMappingURL=unmatched.d.ts.map

package/dist/middleware/unmatched.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"unmatched.d.ts","sourceRoot":"","sources":["../../src/middleware/unmatched.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AAEtC,OAAO,KAAK,EAAW,UAAU,EAAQ,MAAM,KAAK,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAqBlD;;;GAGG;AACH,wBAAgB,SAAS,CAAC,UAAU,EAAE,UAAU,GAAG,UAAU,CAE5D;AA8BD;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,EAC9B,MAAM,EAAE,SAAS,UAAU,EAAE,GAC5B,IAAI,CAqBN"}

package/dist/middleware/unmatched.js

@@ -0,0 +1,83 @@
+import { notFound } from '../utils/errors.js';
+/** The name of the route that answers what no other route of the router serves */
+const UNMATCHED_ROUTE = 'cogitator:unmatched';
+/**
+ * A path that matches every request, in the syntax of each path-to-regexp major `@koa/router`
+ * has shipped with: 8 first, then 6. A router compiles a path when it is registered and throws
+ * on the syntax of the other one.
+ */
+const ANY_PATH = ['{/*rest}', '(.*)'];
+/** Whether a route of the router other than the unmatched one serves the request */
+function servedByRoute(ctx) {
+    const matched = ctx.matched ?? [];
+    return matched.some((layer) => layer.name !== UNMATCHED_ROUTE && layer.methods.includes(ctx.method));
+}
+/**
+ * `middleware`, for the requests a route of the router serves. Any other request passes
+ * through untouched, so the middleware downstream of the router gets it as it came.
+ */
+export function forRoutes(middleware) {
+    return (ctx, next) => (servedByRoute(ctx) ? middleware(ctx, next) : next());
+}
+/**
+ * The methods the routes of the router serve on the request's path, besides the unmatched one,
+ * with `HEAD` wherever `GET` is served and `OPTIONS`; none when no route serves the path
+ */
+function allowedMethods(ctx) {
+    const matched = ctx.matched ?? [];
+    const methods = new Set(matched.filter((layer) => layer.name !== UNMATCHED_ROUTE).flatMap((layer) => layer.methods));
+    if (methods.size === 0)
+        return [];
+    if (methods.has('GET'))
+        methods.add('HEAD');
+    methods.add('OPTIONS');
+    return [...methods].sort();
+}
+function unanswered(ctx) {
+    return ctx.respond !== false && !ctx.headerSent && ctx.status === 404 && ctx.body == null;
+}
+async function runChain(chain, ctx, last) {
+    const dispatch = async (at) => {
+        const middleware = chain[at];
+        if (middleware)
+            await middleware(ctx, () => dispatch(at + 1));
+        else
+            last();
+    };
+    await dispatch(0);
+}
+/**
+ * Registers the last route of the router, the one for the requests no other route serves. It
+ * lets the middleware downstream of the router answer them first. What is left unanswered goes
+ * through `guards`, the authentication and anonymous policy of the API, and is answered with
+ * `404 NOT_FOUND` in the error envelope, so under `anonymous: 'deny'` an anonymous caller gets
+ * `401` on every path and cannot tell which paths exist. An `OPTIONS` request for a path a route
+ * serves answers `204` with the methods it serves in `Allow`, which `router.allowedMethods()`
+ * would answer for every path once this route matches them all, so the app needs no
+ * `allowedMethods()`.
+ */
+export function routeUnmatched(router, guards) {
+    const answer = async (ctx, next) => {
+        const allowed = ctx.method === 'OPTIONS' ? allowedMethods(ctx) : [];
+        if (allowed.length > 0) {
+            ctx.set('Allow', allowed.join(', '));
+            ctx.status = 204;
+            return;
+        }
+        await next();
+        if (!unanswered(ctx))
+            return;
+        await runChain(guards, ctx, () => notFound(ctx, 'Not found'));
+    };
+    for (const [at, path] of ANY_PATH.entries()) {
+        try {
+            router.all(UNMATCHED_ROUTE, path, answer);
+            return;
+        }
+        catch (error) {
+            if (at === ANY_PATH.length - 1)
+                throw error;
+        }
+    }
+}
+//# sourceMappingURL=unmatched.js.map

package/dist/middleware/unmatched.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unmatched.js","sourceRoot":"","sources":["../../src/middleware/unmatched.ts"],"names":[],"mappings":"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"}

package/dist/routes/agents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../../src/routes/agents.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,KAAK,EAAE,cAAc,EAAqB,MAAM,aAAa,CAAC;AAYrE,wBAAgB,iBAAiB,IAAI,MAAM,CAAC,cAAc,CAAC,CAsJ1D"}
+{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../../src/routes/agents.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAGjC,OAAO,KAAK,EAAE,cAAc,EAAqB,MAAM,aAAa,CAAC;AAkDrE,wBAAgB,iBAAiB,IAAI,MAAM,CAAC,cAAc,CAAC,CA6K1D"}

package/dist/routes/agents.js

@@ -2,8 +2,33 @@ import Router from '@koa/router';
 import { KoaStreamWriter, setupSSEHeaders } from '../streaming/index.js';
 import { AgentStreamSession, parseResumeRequest, parseRunRequest, toAgentRunResponse, } from '@cogitator-ai/server-shared';
 import { getOwn } from '../utils/lookup.js';
-import { resolveError } from '../utils/errors.js';
-import { getRequestBody, onClientDisconnect } from '../utils/request.js';
+import { describeError, invalidInput, notFound, respondWithError, sendError, } from '../utils/errors.js';
+import { getRequestBody, onClientDisconnect, refuseThread, runDeps } from '../utils/request.js';
+async function streamAgent(ctx, threadId, errorLabel, execute) {
+    setupSSEHeaders(ctx);
+    const writer = new KoaStreamWriter(ctx, {
+        heartbeatMs: ctx.state.cogitator.sseHeartbeatMs,
+    });
+    const session = new AgentStreamSession((event) => writer.send(event), { threadId });
+    const abortController = new AbortController();
+    onClientDisconnect(ctx, () => {
+        writer.close();
+        abortController.abort();
+    });
+    session.start();
+    try {
+        session.complete(await execute(session, abortController.signal));
+    }
+    catch (error) {
+        if (!abortController.signal.aborted) {
+            const failure = describeError(error, errorLabel);
+            session.fail(failure.message, failure.code);
+        }
+    }
+    finally {
+        writer.close();
+    }
+}
 export function createAgentRoutes() {
     const router = new Router();
     router.get('/agents', (ctx) => {
@@ -21,24 +46,29 @@ export function createAgentRoutes() {
         const { name } = ctx.params;
         const agent = getOwn(agents, name);
         if (!agent) {
-            ctx.status = 404;
-            ctx.body = { error: { message: `Agent '${name}' not found`, code: 'NOT_FOUND' } };
+            notFound(ctx, `Agent '${name}' not found`);
             return;
         }
         const parsed = parseRunRequest(getRequestBody(ctx), {
             acceptContext: ctx.state.cogitator.acceptContext,
         });
         if (!parsed.ok) {
-            ctx.status = 400;
-            ctx.body = { error: { message: parsed.message, code: 'INVALID_INPUT' } };
+            invalidInput(ctx, parsed.message);
             return;
         }
+        const refusal = await refuseThread(ctx, parsed.value.threadId);
+        if (refusal) {
+            sendError(ctx, refusal);
+            return;
+        }
+        const deps = await runDeps(ctx);
         const abortController = new AbortController();
         onClientDisconnect(ctx, () => abortController.abort());
         try {
             const result = await runtime.run(agent, {
                 ...parsed.value,
                 userId: ctx.state.auth?.userId,
+                ...deps,
                 signal: abortController.signal,
             });
             ctx.body = toAgentRunResponse(result);
@@ -46,9 +76,7 @@ export function createAgentRoutes() {
         catch (error) {
             if (abortController.signal.aborted)
                 return;
-            const { status, body } = resolveError(error, 'Agent run error');
-            ctx.status = status;
-            ctx.body = body;
+            respondWithError(ctx, error, 'Agent run error');
         }
     });
     router.post('/agents/:name/resume', async (ctx) => {
@@ -56,22 +84,27 @@ export function createAgentRoutes() {
         const { name } = ctx.params;
         const agent = getOwn(agents, name);
         if (!agent) {
-            ctx.status = 404;
-            ctx.body = { error: { message: `Agent '${name}' not found`, code: 'NOT_FOUND' } };
+            notFound(ctx, `Agent '${name}' not found`);
             return;
         }
         const parsed = parseResumeRequest(getRequestBody(ctx));
         if (!parsed.ok) {
-            ctx.status = 400;
-            ctx.body = { error: { message: parsed.message, code: 'INVALID_INPUT' } };
+            invalidInput(ctx, parsed.message);
             return;
         }
         const { threadId, decisions, defaultDecision } = parsed.value;
+        const refusal = await refuseThread(ctx, threadId);
+        if (refusal) {
+            sendError(ctx, refusal);
+            return;
+        }
+        const deps = await runDeps(ctx);
         const abortController = new AbortController();
         onClientDisconnect(ctx, () => abortController.abort());
         try {
             const result = await runtime.resume(agent, threadId, {
                 userId: ctx.state.auth?.userId,
+                ...deps,
                 decisions,
                 defaultDecision,
                 signal: abortController.signal,
@@ -81,9 +114,7 @@ export function createAgentRoutes() {
         catch (error) {
             if (abortController.signal.aborted)
                 return;
-            const { status, body } = resolveError(error, 'Agent resume error');
-            ctx.status = status;
-            ctx.body = body;
+            respondWithError(ctx, error, 'Agent resume error');
         }
     });
     router.post('/agents/:name/stream', async (ctx) => {
@@ -91,51 +122,61 @@ export function createAgentRoutes() {
         const { name } = ctx.params;
         const agent = getOwn(agents, name);
         if (!agent) {
-            ctx.status = 404;
-            ctx.body = { error: { message: `Agent '${name}' not found`, code: 'NOT_FOUND' } };
+            notFound(ctx, `Agent '${name}' not found`);
             return;
         }
         const parsed = parseRunRequest(getRequestBody(ctx), {
             acceptContext: ctx.state.cogitator.acceptContext,
         });
         if (!parsed.ok) {
-            ctx.status = 400;
-            ctx.body = { error: { message: parsed.message, code: 'INVALID_INPUT' } };
+            invalidInput(ctx, parsed.message);
             return;
         }
-        setupSSEHeaders(ctx);
-        const writer = new KoaStreamWriter(ctx, {
-            heartbeatMs: ctx.state.cogitator.sseHeartbeatMs,
-        });
-        const session = new AgentStreamSession((event) => writer.send(event), {
-            threadId: parsed.value.threadId,
-        });
-        const abortController = new AbortController();
-        onClientDisconnect(ctx, () => {
-            writer.close();
-            abortController.abort();
-        });
-        session.start();
-        try {
-            const result = await runtime.run(agent, {
-                ...parsed.value,
-                threadId: session.threadId,
-                userId: ctx.state.auth?.userId,
-                stream: true,
-                signal: abortController.signal,
-                ...session.callbacks,
-            });
-            session.complete(result);
+        const refusal = await refuseThread(ctx, parsed.value.threadId);
+        if (refusal) {
+            sendError(ctx, refusal);
+            return;
         }
-        catch (error) {
-            if (!abortController.signal.aborted) {
-                const { body } = resolveError(error, 'Agent stream error');
-                session.fail(body.error.message, body.error.code);
-            }
+        const deps = await runDeps(ctx);
+        await streamAgent(ctx, parsed.value.threadId, 'Agent stream error', (session, signal) => runtime.run(agent, {
+            ...parsed.value,
+            threadId: session.threadId,
+            userId: ctx.state.auth?.userId,
+            ...deps,
+            stream: true,
+            signal,
+            ...session.callbacks,
+        }));
+    });
+    router.post('/agents/:name/resume/stream', async (ctx) => {
+        const { agents, runtime } = ctx.state.cogitator;
+        const { name } = ctx.params;
+        const agent = getOwn(agents, name);
+        if (!agent) {
+            notFound(ctx, `Agent '${name}' not found`);
+            return;
+        }
+        const parsed = parseResumeRequest(getRequestBody(ctx));
+        if (!parsed.ok) {
+            invalidInput(ctx, parsed.message);
+            return;
         }
-        finally {
-            writer.close();
+        const { threadId, decisions, defaultDecision } = parsed.value;
+        const refusal = await refuseThread(ctx, threadId);
+        if (refusal) {
+            sendError(ctx, refusal);
+            return;
         }
+        const deps = await runDeps(ctx);
+        await streamAgent(ctx, threadId, 'Agent resume stream error', (session, signal) => runtime.resume(agent, threadId, {
+            userId: ctx.state.auth?.userId,
+            ...deps,
+            decisions,
+            defaultDecision,
+            stream: true,
+            signal,
+            ...session.callbacks,
+        }));
     });
     return router;
 }

package/dist/routes/agents.js.map

@@ -1 +1 @@
-{"version":3,"file":"agents.js","sourceRoot":"","sources":["../../src/routes/agents.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,eAAe,EACf,kBAAkB,GACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzE,MAAM,UAAU,iBAAiB;IAC/B,MAAM,MAAM,GAAG,IAAI,MAAM,EAAkB,CAAC;IAE5C,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE;QAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC;QACvC,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/D,IAAI;YACJ,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,WAAW;YACrC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE;SACpD,CAAC,CAAC,CAAC;QAEJ,MAAM,QAAQ,GAAsB,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QAC1D,GAAG,CAAC,IAAI,GAAG,QAAQ,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QAC7C,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC;QAChD,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAEnC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,IAAI,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC;YAClF,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,eAAe,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;YAClD,aAAa,EAAE,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,aAAa;SACjD,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,CAAC;YACzE,OAAO;QACT,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAC9C,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC;QAEvD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE;gBACtC,GAAG,MAAM,CAAC,KAAK;gBACf,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM;gBAC9B,MAAM,EAAE,eAAe,CAAC,MAAM;aAC/B,CAAC,CAAC;YAEH,GAAG,CAAC,IAAI,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,eAAe,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAO;YAC3C,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;YAChE,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;YACpB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QAChD,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC;QAChD,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAEnC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,IAAI,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC;YAClF,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,CAAC;YACzE,OAAO;QACT,CAAC;QACD,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC;QAE9D,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAC9C,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC;QAEvD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE;gBACnD,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM;gBAC9B,SAAS;gBACT,eAAe;gBACf,MAAM,EAAE,eAAe,CAAC,MAAM;aAC/B,CAAC,CAAC;YAEH,GAAG,CAAC,IAAI,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,eAAe,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAO;YAC3C,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;YACnE,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;YACpB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QAChD,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC;QAChD,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAEnC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,IAAI,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC;YAClF,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,eAAe,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;YAClD,aAAa,EAAE,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,aAAa;SACjD,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,CAAC;YACzE,OAAO;QACT,CAAC;QAED,eAAe,CAAC,GAAG,CAAC,CAAC;QACrB,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,GAAG,EAAE;YACtC,WAAW,EAAE,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,cAAc;SAChD,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,kBAAkB,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACpE,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ;SAChC,CAAC,CAAC;QACH,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAE9C,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE;YAC3B,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,eAAe,CAAC,KAAK,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE;gBACtC,GAAG,MAAM,CAAC,KAAK;gBACf,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM;gBAC9B,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,eAAe,CAAC,MAAM;gBAC9B,GAAG,OAAO,CAAC,SAAS;aACrB,CAAC,CAAC;YACH,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpC,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;gBAC3D,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"agents.js","sourceRoot":"","sources":["../../src/routes/agents.ts"],"names":[],"mappings":"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"}

package/dist/routes/swarms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swarms.d.ts","sourceRoot":"","sources":["../../src/routes/swarms.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,KAAK,EAAE,cAAc,EAAyC,MAAM,aAAa,CAAC;AAczF,wBAAgB,iBAAiB,IAAI,MAAM,CAAC,cAAc,CAAC,CA6L1D"}
+{"version":3,"file":"swarms.d.ts","sourceRoot":"","sources":["../../src/routes/swarms.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,KAAK,EAAE,cAAc,EAAyC,MAAM,aAAa,CAAC;AAuBzF,wBAAgB,iBAAiB,IAAI,MAAM,CAAC,cAAc,CAAC,CAmM1D"}

package/dist/routes/swarms.js

@@ -1,9 +1,9 @@
 import Router from '@koa/router';
 import { KoaStreamWriter, setupSSEHeaders } from '../streaming/index.js';
-import { generateId, parseSwarmRunRequest, swarmAgentNames, withSwarm, } from '@cogitator-ai/server-shared';
+import { generateId, parseSwarmRunRequest, swarmAgentNames, swarmTimeoutWithin, withSwarm, } from '@cogitator-ai/server-shared';
 import { getOwn } from '../utils/lookup.js';
-import { isModuleNotFoundError, resolveError } from '../utils/errors.js';
-import { getRequestBody, onClientDisconnect } from '../utils/request.js';
+import { describeError, invalidInput, isModuleNotFoundError, notFound, notInstalled, respondWithError, sendError, } from '../utils/errors.js';
+import { getRequestBody, onClientDisconnect, refuseThread } from '../utils/request.js';
 import { serializeSwarmUsage, toSwarmRunResponse } from '../utils/results.js';
 export function createSwarmRoutes() {
     const router = new Router();
@@ -25,18 +25,22 @@ export function createSwarmRoutes() {
         const { name } = ctx.params;
         const swarmConfig = getOwn(swarms, name);
         if (!swarmConfig) {
-            ctx.status = 404;
-            ctx.body = { error: { message: `Swarm '${name}' not found`, code: 'NOT_FOUND' } };
+            notFound(ctx, `Swarm '${name}' not found`);
             return;
         }
         const parsed = parseSwarmRunRequest(getRequestBody(ctx), {
             acceptContext: ctx.state.cogitator.acceptContext,
         });
         if (!parsed.ok) {
-            ctx.status = 400;
-            ctx.body = { error: { message: parsed.message, code: 'INVALID_INPUT' } };
+            invalidInput(ctx, parsed.message);
             return;
         }
+        const refusal = await refuseThread(ctx, parsed.value.threadId);
+        if (refusal) {
+            sendError(ctx, refusal);
+            return;
+        }
+        const timeout = swarmTimeoutWithin(parsed.value.timeout, ctx.state.cogitator.limits);
         let aborted = false;
         let abortSwarm;
         onClientDisconnect(ctx, () => {
@@ -49,7 +53,11 @@ export function createSwarmRoutes() {
                 return;
             const response = await withSwarm(new Swarm(runtime, swarmConfig), async (swarm) => {
                 abortSwarm = () => swarm.abort();
-                const result = await swarm.run({ ...parsed.value, userId: ctx.state.auth?.userId });
+                const result = await swarm.run({
+                    ...parsed.value,
+                    timeout,
+                    userId: ctx.state.auth?.userId,
+                });
                 return toSwarmRunResponse(swarm, result);
             });
             if (aborted)
@@ -60,13 +68,10 @@ export function createSwarmRoutes() {
             if (aborted)
                 return;
             if (isModuleNotFoundError(error)) {
-                ctx.status = 501;
-                ctx.body = { error: { message: 'Swarms package not installed', code: 'UNIMPLEMENTED' } };
+                notInstalled(ctx, 'Swarms');
                 return;
             }
-            const { status, body } = resolveError(error, 'Swarm run error');
-            ctx.status = status;
-            ctx.body = body;
+            respondWithError(ctx, error, 'Swarm run error');
         }
     });
     router.post('/swarms/:name/stream', async (ctx) => {
@@ -74,18 +79,22 @@ export function createSwarmRoutes() {
         const { name } = ctx.params;
         const swarmConfig = getOwn(swarms, name);
         if (!swarmConfig) {
-            ctx.status = 404;
-            ctx.body = { error: { message: `Swarm '${name}' not found`, code: 'NOT_FOUND' } };
+            notFound(ctx, `Swarm '${name}' not found`);
             return;
         }
         const parsed = parseSwarmRunRequest(getRequestBody(ctx), {
             acceptContext: ctx.state.cogitator.acceptContext,
         });
         if (!parsed.ok) {
-            ctx.status = 400;
-            ctx.body = { error: { message: parsed.message, code: 'INVALID_INPUT' } };
+            invalidInput(ctx, parsed.message);
+            return;
+        }
+        const refusal = await refuseThread(ctx, parsed.value.threadId);
+        if (refusal) {
+            sendError(ctx, refusal);
             return;
         }
+        const timeout = swarmTimeoutWithin(parsed.value.timeout, ctx.state.cogitator.limits);
         setupSSEHeaders(ctx);
         const writer = new KoaStreamWriter(ctx, {
             heartbeatMs: ctx.state.cogitator.sseHeartbeatMs,
@@ -107,6 +116,7 @@ export function createSwarmRoutes() {
                 writer.start(messageId);
                 const result = await swarm.run({
                     ...parsed.value,
+                    timeout,
                     userId: ctx.state.auth?.userId,
                     onAgentStart: (agentName) => {
                         writer.swarmEvent('agent_start', { agentName, timestamp: Date.now() });
@@ -121,7 +131,7 @@ export function createSwarmRoutes() {
                     onAgentError: (agentName, error) => {
                         writer.swarmEvent('agent_error', {
                             agentName,
-                            error: resolveError(error, `Swarm agent ${agentName} error`).body.error.message,
+                            error: describeError(error, `Swarm agent ${agentName} error`).message,
                         });
                     },
                     onMessage: (message) => {
@@ -148,8 +158,8 @@ export function createSwarmRoutes() {
                 writer.error('Swarms package not installed', 'UNIMPLEMENTED');
             }
             else {
-                const { body } = resolveError(error, 'Swarm stream error');
-                writer.error(body.error.message, body.error.code);
+                const failure = describeError(error, 'Swarm stream error');
+                writer.error(failure.message, failure.code);
             }
         }
         finally {
@@ -161,15 +171,11 @@ export function createSwarmRoutes() {
         const { name } = ctx.params;
         const swarmConfig = getOwn(swarms, name);
         if (!swarmConfig) {
-            ctx.status = 404;
-            ctx.body = { error: { message: `Swarm '${name}' not found`, code: 'NOT_FOUND' } };
+            notFound(ctx, `Swarm '${name}' not found`);
             return;
         }
         if (!swarmConfig.blackboard?.enabled) {
-            ctx.status = 400;
-            ctx.body = {
-                error: { message: 'Blackboard not enabled for this swarm', code: 'INVALID_INPUT' },
-            };
+            invalidInput(ctx, 'Blackboard not enabled for this swarm');
             return;
         }
         const response = {