@rcrsr/rill-agent-chat 0.20.0 → 0.21.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Andre Bremer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/index.d.ts

@@ -62,7 +62,6 @@ export interface ChatMessage {
 	content: string;
 }
 export interface ChatRequest {
-	model?: string | undefined;
 	messages: ChatMessage[];
 	stream?: boolean | undefined;
 }

package/dist/index.js

@@ -19,18 +19,33 @@ function createHarnessLifecycle(options) {
     if (server !== void 0) {
       throw new Error("Server is already listening");
     }
-    return new Promise((resolve) => {
-      server = serve({ fetch: app.fetch, port }, () => {
-        options?.serverTweaks?.(server);
+    return new Promise((resolve, reject) => {
+      const started = serve({ fetch: app.fetch, port }, () => {
+        started.off("error", onError);
+        options?.serverTweaks?.(started);
         resolve();
       });
+      function onError(err) {
+        server = void 0;
+        reject(err);
+      }
+      started.once("error", onError);
+      server = started;
     });
   }
   async function close() {
-    if (server !== void 0) {
-      server.close();
-      server = void 0;
+    if (server === void 0) return;
+    const current = server;
+    server = void 0;
+    if ("closeAllConnections" in current) {
+      current.closeAllConnections();
     }
+    await new Promise((resolve, reject) => {
+      current.close((err) => {
+        if (err) reject(err);
+        else resolve();
+      });
+    });
   }
   return { app, listen, close };
 }
@@ -165,12 +180,6 @@ function inspectChatHandler(handler) {
 
 // src/stream.ts
 var encoder = new TextEncoder();
-function toAsyncIterable(source) {
-  if (Symbol.asyncIterator in source) {
-    return source;
-  }
-  return source;
-}
 function fillChunk(chunk, defaults) {
   return {
     id: chunk.id ?? defaults.id,
@@ -198,7 +207,7 @@ function buildErrorChunk(defaults) {
   };
 }
 async function createChatStreamResponse(source, options) {
-  const iterable = toAsyncIterable(source);
+  const iterable = source;
   const iter = iterable[Symbol.asyncIterator]();
   const streamId = `chatcmpl-${crypto.randomUUID()}`;
   const created = Math.floor(Date.now() / 1e3);
@@ -255,7 +264,7 @@ function checkChunkForError(chunk) {
   }
 }
 async function createChatCompletionResponse(source, options) {
-  const iterable = toAsyncIterable(source);
+  const iterable = source;
   const iter = iterable[Symbol.asyncIterator]();
   const id = `chatcmpl-${crypto.randomUUID()}`;
   const created = Math.floor(Date.now() / 1e3);
@@ -372,6 +381,15 @@ function validateMessages(value) {
 function getHandlerFromRouter(router, name) {
   return router.manifest.agents.get(name);
 }
+function isValidChatChunkShape(value) {
+  if (typeof value !== "object" || value === null) return false;
+  const choices = value["choices"];
+  if (!Array.isArray(choices) || choices.length === 0) return false;
+  const first = choices[0];
+  if (typeof first !== "object" || first === null) return false;
+  const delta = first["delta"];
+  return typeof delta === "object" && delta !== null;
+}
 function invokeHandlerAsStream(handler, messages, abortController) {
   return new ReadableStream({
     start(controller) {
@@ -383,6 +401,14 @@ function invokeHandlerAsStream(handler, messages, abortController) {
               signal: abortController.signal,
               onChunk: async (chunk) => {
                 if (abortController.signal.aborted) return;
+                if (!isValidChatChunkShape(chunk)) {
+                  controller.error(
+                    new ChatChunkError(
+                      "Malformed chunk from handler: choices must be a non-empty array whose first entry has a delta object"
+                    )
+                  );
+                  return;
+                }
                 controller.enqueue(chunk);
               }
             }
@@ -458,26 +484,19 @@ function createChatHarness(router, options) {
     (async () => {
       const writer = writable.getWriter();
       try {
-        if (Symbol.asyncIterator in source) {
-          for await (const chunk of source) {
-            if (abortController.signal.aborted) break;
-            await writer.write(chunk);
-          }
-        } else {
-          const reader = source.getReader();
-          try {
-            let result = await reader.read();
-            while (!result.done) {
-              if (abortController.signal.aborted) {
-                await reader.cancel();
-                break;
-              }
-              await writer.write(result.value);
-              result = await reader.read();
+        const reader = source.getReader();
+        try {
+          let result = await reader.read();
+          while (!result.done) {
+            if (abortController.signal.aborted) {
+              await reader.cancel();
+              break;
             }
-          } finally {
-            reader.releaseLock();
+            await writer.write(result.value);
+            result = await reader.read();
           }
+        } finally {
+          reader.releaseLock();
         }
         if (abortController.signal.aborted) {
           await writer.abort();
@@ -578,6 +597,17 @@ function createChatHarness(router, options) {
           { error: { message: "No default agent configured" } },
           500
         );
+      } else if (router.agents().includes(agentName) && ineligibleReasons.has(agentName)) {
+        errors++;
+        requests++;
+        return c.json(
+          {
+            error: {
+              message: `Agent "${agentName}" is not chat-eligible: ${ineligibleReasons.get(agentName)}`
+            }
+          },
+          403
+        );
       } else {
         errors++;
         requests++;
@@ -589,10 +619,17 @@ function createChatHarness(router, options) {
     }
     const chatReq = {
       messages: validation.messages,
-      ...typeof body["model"] === "string" ? { model: body["model"] } : {},
       ...typeof body["stream"] === "boolean" ? { stream: body["stream"] } : {}
     };
     const abortController = new AbortController();
+    const requestSignal = c.req.raw.signal;
+    if (requestSignal.aborted) {
+      abortController.abort();
+    } else {
+      requestSignal.addEventListener("abort", () => abortController.abort(), {
+        once: true
+      });
+    }
     const handler = getHandlerFromRouter(router, resolvedAgent);
     if (handler === void 0) {
       errors++;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rcrsr/rill-agent-chat",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "rill agent chat harness — Hono-based chat endpoint wrapping AgentRouter",
   "license": "MIT",
   "author": "Andre Bremer",
@@ -14,22 +14,15 @@
       "default": "./dist/index.js"
     }
   },
-  "scripts": {
-    "build": "tsup && dts-bundle-generator --config dts-bundle-generator.config.cjs && node -e \"const fs=require('fs');const walk=(d)=>fs.readdirSync(d,{withFileTypes:true}).flatMap(e=>e.isDirectory()?walk(d+'/'+e.name):[d+'/'+e.name]);const hits=walk('dist').filter(f=>fs.readFileSync(f,'utf8').includes('@rcrsr/rill-agent-hono-kit'));if(hits.length){console.error('hono-kit leak in dist:',hits);process.exit(1);}\"",
-    "test": "vitest run",
-    "typecheck": "tsc --noEmit",
-    "lint": "oxlint --config ../../../.oxlintrc.json src/ tests/",
-    "check": "pnpm run build && pnpm run test && pnpm run lint"
-  },
   "dependencies": {
-    "@rcrsr/rill-agent": "workspace:~",
-    "@hono/node-server": "^2.0.1",
-    "hono": "^4.12.16"
+    "@hono/node-server": "^2.1.1",
+    "@rcrsr/rill-agent": "~0.21.0",
+    "hono": "^4.13.7"
   },
   "devDependencies": {
-    "@rcrsr/rill-agent-hono-kit": "workspace:^",
+    "@rcrsr/rill-agent-hono-kit": "^0.21.0",
     "dts-bundle-generator": "^9.5.1",
-    "tsup": "^8.5.0"
+    "tsup": "^8.5.1"
   },
   "files": [
     "dist"
@@ -41,5 +34,12 @@
     "type": "git",
     "url": "git+https://github.com/rcrsr/rill-agent.git",
     "directory": "packages/agent/chat"
+  },
+  "scripts": {
+    "build": "tsup && dts-bundle-generator --config dts-bundle-generator.config.cjs && node -e \"const fs=require('fs');const walk=(d)=>fs.readdirSync(d,{withFileTypes:true}).flatMap(e=>e.isDirectory()?walk(d+'/'+e.name):[d+'/'+e.name]);const hits=walk('dist').filter(f=>fs.readFileSync(f,'utf8').includes('@rcrsr/rill-agent-hono-kit'));if(hits.length){console.error('hono-kit leak in dist:',hits);process.exit(1);}\"",
+    "test": "vitest run",
+    "typecheck": "tsc --noEmit",
+    "lint": "oxlint --config ../../../.oxlintrc.json src/ tests/",
+    "check": "pnpm run build && pnpm run test && pnpm run lint"
   }
-}
+}