jh-web-gateway 2.2.0 → 2.3.0

package/README.md

@@ -90,7 +90,6 @@ The header shows the gateway status at all times. Use arrow keys to navigate and
 │  Main Menu                                                  │
 │                                                             │
 │  > Start Gateway                                            │
-│    Model                                                    │
 │    Chat                                                     │
 │    Server Info                                              │
 │    Settings                                                 │
@@ -170,38 +169,9 @@ Once all phases complete the gateway is live:
 
 ---
 
-### Model Selector
-
-Choose the AI model for all requests. The currently active model is marked with a filled circle (`●`).
-
-```text
-┌─────────────────────────────────────────────────────────────┐
-│ jh-gateway                         ● Gateway: running       │
-├─────────────────────────────────────────────────────────────┤
-│                                                             │
-│  Select Model                                               │
-│                                                             │
-│  > ● claude-opus-4.5          ← active model                │
-│    ○ claude-sonnet-4.5                                      │
-│    ○ claude-haiku-4.5                                       │
-│    ○ gpt-4.1                                                │
-│    ○ gpt-5                                                  │
-│    ○ gpt-5.1                                                │
-│    ○ o3                                                     │
-│    ○ o3-mini                                                │
-│    ○ llama3-3-70b-instruct                                  │
-│                                                             │
-│  [↑↓] Navigate  [Enter] Select  [b/Esc] Back                │
-└─────────────────────────────────────────────────────────────┘
-```
-
-The selection is saved to `~/.jh-gateway/config.json` as `defaultModel` immediately on press.
-
----
-
 ### Chat Panel
 
-Send a quick test message from inside the TUI — no external tool required. The panel shows the last exchange and streams a response from the running gateway.
+Send a quick test message from inside the TUI — no external tool required. The panel shows the last exchange and streams a response from the running gateway. Use `↑`/`↓` to cycle through models without leaving the chat.
 
 ```text
 ┌─────────────────────────────────────────────────────────────┐
@@ -218,7 +188,7 @@ Send a quick test message from inside the TUI — no external tool required. The
 │ │  Type a message and press Enter… █                  │     │
 │ ╰─────────────────────────────────────────────────────╯     │
 │                                                             │
-│  [Enter] Send  [b/Esc] Back                                 │
+│  [Enter] Send  [↑↓] Model  [b/Esc] Back                     │
 └─────────────────────────────────────────────────────────────┘
 ```
 
@@ -228,6 +198,7 @@ Send a quick test message from inside the TUI — no external tool required. The
 |-----|--------|
 | Type | Compose your message |
 | `Enter` | Send the message |
+| `↑` / `↓` | Cycle through models |
 | `Backspace` | Delete last character |
 | `b` / `Esc` | Back to menu |
 
@@ -235,7 +206,7 @@ Send a quick test message from inside the TUI — no external tool required. The
 
 ### Server Info Panel
 
-Displays the live base URL and API key. Use one-key shortcuts to copy them directly to the clipboard.
+Displays the live base URL, API key, and real-time server activity. Use one-key shortcuts to copy connection details directly to the clipboard.
 
 ```text
 ┌─────────────────────────────────────────────────────────────┐
@@ -249,6 +220,10 @@ Displays the live base URL and API key. Use one-key shortcuts to copy them direc
 │ │  API Key:   jh-local-xxxxxxxxxxxxxxxxxxxxxxxx     │       │
 │ ╰───────────────────────────────────────────────────╯       │
 │                                                             │
+│  Activity                                                   │
+│  ● POST /v1/chat/completions  200  1.2s  claude-opus-4.5   │
+│  ● GET  /v1/models            200  0.1s                     │
+│                                                             │
 │  Copied URL!                                                │
 │                                                             │
 │  [c] Copy URL    [k] Copy Key    [b/Esc] Back               │
@@ -304,7 +279,7 @@ Changes are validated and written to `~/.jh-gateway/config.json` on confirm.
 
 | Key | Context | Action |
 |-----|---------|--------|
-| `↑` / `↓` | Menu, Model, Settings | Navigate items |
+| `↑` / `↓` | Menu, Chat, Settings | Navigate items / cycle models |
 | `Enter` | Main Menu | Open selected panel |
 | `Enter` | Gateway Panel | Start / Stop gateway |
 | `Enter` | Chat | Send message |

package/dist/{chunk-Y2NMKJOG.js → chunk-E6JMUHPA.js}

@@ -958,9 +958,11 @@ function escapeXmlAttr(s) {
 import { randomBytes as randomBytes2 } from "crypto";
 
 // src/core/tool-parser.ts
-var TOOL_CALL_RE = /<tool_call\s+id="([^"]*)"\s+name="([^"]*)">([\s\S]*?)<\/tool_call>/g;
+var TOOL_CALL_RE = /<tool_call\s+(?=[^>]*\bid="([^"]*)")(?=[^>]*\bname="([^"]*)")(?:[^>]*)>([\s\S]*?)<\/tool_call>/g;
+var TOOL_RESPONSE_RE = /<tool_response\b[^>]*>[\s\S]*?<\/tool_response>/g;
 var THINK_RE = /<think>([\s\S]*?)<\/think>/g;
 var PARTIAL_TOOL_CALL_RE = /<tool_call\b[^>]*>(?:(?!<\/tool_call>)[\s\S])*$/;
+var PARTIAL_TOOL_RESPONSE_RE = /<tool_response\b[^>]*>(?:(?!<\/tool_response>)[\s\S])*$/;
 function parseToolsAndThinking(text) {
   const toolCalls = [];
   let thinking = null;
@@ -969,6 +971,7 @@ function parseToolsAndThinking(text) {
     thinking = thinkMatches.map((m) => m[1]).join("\n");
   }
   let remaining = text.replace(THINK_RE, "");
+  remaining = remaining.replace(TOOL_RESPONSE_RE, "");
   const toolMatches = [...remaining.matchAll(TOOL_CALL_RE)];
   for (const match of toolMatches) {
     const id = match[1];
@@ -1002,17 +1005,57 @@ function toOpenAIToolCalls(calls) {
     }
   }));
 }
+var WATCHED_TAGS = ["<tool_call", "<tool_response"];
+var MAX_TAG_PREFIX_LEN = Math.max(...WATCHED_TAGS.map((t) => t.length));
+function findWatchedTagPrefixAtEnd(text) {
+  const maxLen = Math.min(text.length, MAX_TAG_PREFIX_LEN);
+  for (let len = maxLen; len >= 1; len--) {
+    const tail = text.slice(-len);
+    for (const tag of WATCHED_TAGS) {
+      if (tag.startsWith(tail)) {
+        return text.length - len;
+      }
+    }
+  }
+  return -1;
+}
+function findPartialWatchedTag(text) {
+  if (PARTIAL_TOOL_RESPONSE_RE.test(text)) {
+    const idx = text.search(/<tool_response\b/);
+    if (idx >= 0) return idx;
+  }
+  if (PARTIAL_TOOL_CALL_RE.test(text)) {
+    const idx = text.search(/<tool_call\b/);
+    if (idx >= 0) return idx;
+  }
+  return -1;
+}
+function findUnclosedWatchedTag(text) {
+  for (const tag of WATCHED_TAGS) {
+    const idx = text.lastIndexOf(tag);
+    if (idx >= 0) {
+      const afterTag = text.slice(idx);
+      if (!afterTag.includes(">")) {
+        return idx;
+      }
+    }
+  }
+  return -1;
+}
 var StreamingToolBuffer = class {
   buffer = "";
   /**
    * Push a text chunk. Returns an object with:
-   * - `text`: safe-to-emit text (outside any partial tag)
+   * - `text`: safe-to-emit text (outside any partial/complete tag)
    * - `completedCalls`: fully parsed tool calls from this chunk
    */
   push(chunk) {
     this.buffer += chunk;
     const completedCalls = [];
     let safeText = "";
+    this.buffer = this.buffer.replace(TOOL_RESPONSE_RE, (match2, offset) => {
+      return "";
+    });
     let match;
     const re = new RegExp(TOOL_CALL_RE.source, "g");
     let lastIndex = 0;
@@ -1032,15 +1075,27 @@ var StreamingToolBuffer = class {
       lastIndex = match.index + match[0].length;
     }
     const remainder = this.buffer.slice(lastIndex);
-    if (PARTIAL_TOOL_CALL_RE.test(remainder)) {
-      const partialStart = remainder.search(/<tool_call\b/);
-      if (partialStart > 0) {
-        safeText += remainder.slice(0, partialStart);
+    const partialIdx = findPartialWatchedTag(remainder);
+    if (partialIdx >= 0) {
+      if (partialIdx > 0) {
+        safeText += remainder.slice(0, partialIdx);
       }
-      this.buffer = partialStart >= 0 ? remainder.slice(partialStart) : remainder;
+      this.buffer = remainder.slice(partialIdx);
     } else {
-      safeText += remainder;
-      this.buffer = "";
+      const unclosedIdx = findUnclosedWatchedTag(remainder);
+      if (unclosedIdx >= 0) {
+        safeText += remainder.slice(0, unclosedIdx);
+        this.buffer = remainder.slice(unclosedIdx);
+      } else {
+        const prefixStart = findWatchedTagPrefixAtEnd(remainder);
+        if (prefixStart >= 0) {
+          safeText += remainder.slice(0, prefixStart);
+          this.buffer = remainder.slice(prefixStart);
+        } else {
+          safeText += remainder;
+          this.buffer = "";
+        }
+      }
     }
     return { text: safeText, completedCalls };
   }
@@ -1610,10 +1665,27 @@ var Logger = class {
 };
 
 // src/server.ts
+function requestTrackerMiddleware(tracker) {
+  return async (c, next) => {
+    const id = crypto.randomUUID();
+    c.set("requestId", id);
+    tracker.start(id, c.req.method, c.req.path);
+    try {
+      await next();
+      tracker.end(id, c.res.status);
+    } catch (err) {
+      tracker.end(id, 500);
+      throw err;
+    }
+  };
+}
 function createServer(config, deps) {
   const app = new Hono4();
   const startTime = Date.now();
   const logger = new Logger();
+  if (deps?.requestTracker) {
+    app.use("*", requestTrackerMiddleware(deps.requestTracker));
+  }
   app.use("/v1/*", authMiddleware(config));
   app.use("*", async (c, next) => {
     const start = Date.now();
@@ -2323,4 +2395,4 @@ export {
   TokenRefresher,
   ChromeManager
 };
-//# sourceMappingURL=chunk-Y2NMKJOG.js.map
+//# sourceMappingURL=chunk-E6JMUHPA.js.map