agentbridge-cli 0.1.14__tar.gz → 0.1.16__tar.gz

{agentbridge_cli-0.1.14 → agentbridge_cli-0.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: agentbridge-cli
-Version: 0.1.14
+Version: 0.1.16
 Summary: Bridge OpenAI tools to Claude Code SDK, Codex CLI, and OpenRouter
 Project-URL: Homepage, https://github.com/tsilva/agentbridge
 Project-URL: Repository, https://github.com/tsilva/agentbridge
@@ -177,6 +177,7 @@ uv build                                              # build wheel and source d
 - Claude clients are created lazily, reused by model, and capped by the worker count. Claude sessions do not load filesystem settings and run with built-in tools disabled.
 - Codex runs one ephemeral `codex exec` process per request in a temporary directory with read-only sandboxing, no approvals, and project rules ignored. Multimodal structured-output calls also ignore user config and disable execution and image-generation tools. Native image calls use the same strict profile, keep execution disabled, and enable the image-generation capability needed for the edit.
 - Claude and Codex function calls are represented through prompted JSON; OpenRouter tool calls pass through its SDK. Session logs and extracted image or PDF attachments are saved under `~/.config/agentbridge/logs/sessions` by default.
+- Streaming provider failures emit an OpenAI-shaped `error` object as an SSE `data` event before `[DONE]`; they are not returned as assistant message text.
 - Set `store: false` on chat requests to suppress session-log artifacts. The native image route requires `store: false`, accepts data URLs only, validates both rasters, locates the result from the structured Codex thread ID, and removes that thread's generated-image directory after the request.
 
 ## Publishing

{agentbridge_cli-0.1.14 → agentbridge_cli-0.1.16}/README.md

@@ -145,6 +145,7 @@ uv build                                              # build wheel and source d
 - Claude clients are created lazily, reused by model, and capped by the worker count. Claude sessions do not load filesystem settings and run with built-in tools disabled.
 - Codex runs one ephemeral `codex exec` process per request in a temporary directory with read-only sandboxing, no approvals, and project rules ignored. Multimodal structured-output calls also ignore user config and disable execution and image-generation tools. Native image calls use the same strict profile, keep execution disabled, and enable the image-generation capability needed for the edit.
 - Claude and Codex function calls are represented through prompted JSON; OpenRouter tool calls pass through its SDK. Session logs and extracted image or PDF attachments are saved under `~/.config/agentbridge/logs/sessions` by default.
+- Streaming provider failures emit an OpenAI-shaped `error` object as an SSE `data` event before `[DONE]`; they are not returned as assistant message text.
 - Set `store: false` on chat requests to suppress session-log artifacts. The native image route requires `store: false`, accepts data URLs only, validates both rasters, locates the result from the structured Codex thread ID, and removes that thread's generated-image directory after the request.
 
 ## Publishing

agentbridge_cli-0.1.16/agentbridge/_build_info.py

@@ -0,0 +1 @@
+GIT_HASH = "4d5ec6b"

{agentbridge_cli-0.1.14 → agentbridge_cli-0.1.16}/agentbridge/dashboard.py

@@ -225,6 +225,8 @@ def _parse_log_file(path: Path) -> dict | None:
 
 def _get_recent_logs(limit: int = 20) -> list[dict]:
     """Read recent session log files, newest first."""
+    if limit <= 0:
+        return []
     log_dir = session_log_dir()
     if not log_dir.exists():
         return []
@@ -242,10 +244,12 @@ def _get_recent_logs(limit: int = 20) -> list[dict]:
     )
 
     results = []
-    for path in log_files[:limit]:
+    for path in log_files:
         parsed = _parse_log_file(path)
         if parsed is not None:
             results.append(parsed)
+            if len(results) >= limit:
+                break
 
     return results
 
@@ -366,10 +370,11 @@ def create_dashboard_router(
             if log.get("duration_ms") is None:
                 log["duration_ms"] = timing.get("duration_ms", 0)
             if log.get("input_tokens") is None:
-                usage_data = log.get("usage")
-                if usage_data:
-                    log["input_tokens"] = usage_data.get("input_tokens")
-                    log["output_tokens"] = usage_data.get("output_tokens")
+                usage_data = (
+                    log.get("usage") if isinstance(log.get("usage"), dict) else {}
+                )
+                log["input_tokens"] = usage_data.get("input_tokens")
+                log["output_tokens"] = usage_data.get("output_tokens")
 
         merged = active + completed
         return merged[:limit]
@@ -441,8 +446,8 @@ def create_dashboard_router(
         if parsed is None:
             raise HTTPException(status_code=404, detail="Request not found")
 
-        timing = parsed.get("timing", {})
-        usage = parsed.get("usage", {})
+        timing = parsed.get("timing") if isinstance(parsed.get("timing"), dict) else {}
+        usage = parsed.get("usage") if isinstance(parsed.get("usage"), dict) else {}
         return templates.TemplateResponse(
             request,
             "detail.html",

{agentbridge_cli-0.1.14 → agentbridge_cli-0.1.16}/agentbridge/server.py

@@ -686,6 +686,23 @@ OPENROUTER_TIMEOUT = int(
 )
 
 
+def _stream_error_event(
+    message: str,
+    *,
+    error_type: str = "server_error",
+    code: str | None = None,
+) -> str:
+    """Return a machine-readable OpenAI-shaped error in an SSE data event."""
+    payload = ErrorResponse(
+        error=ErrorDetail(
+            message=message,
+            type=error_type,
+            code=code,
+        )
+    )
+    return f"data: {payload.model_dump_json()}\n\n"
+
+
 class BridgeHTTPException(HTTPException):
     """HTTPException with request_id for error tracing."""
 
@@ -1863,18 +1880,13 @@ async def stream_openrouter_api(
         )
         dashboard_state.request_errored(request_id, f"{type(e).__name__}: {error}")
         _dashboard_handled = True
-        error_chunk = ChatCompletionChunk(
-            id=request_id,
-            created=created,
-            model=request.model,
-            choices=[
-                StreamChoice(
-                    delta=DeltaMessage(content="\n\n[Error: OpenRouter request failed.]"),
-                    finish_reason=None,
-                )
-            ],
+        yield _stream_error_event(
+            "OpenRouter request timed out."
+            if isinstance(e, asyncio.TimeoutError)
+            else "OpenRouter request failed.",
+            error_type="timeout_error" if isinstance(e, asyncio.TimeoutError) else "server_error",
+            code="timeout_error" if isinstance(e, asyncio.TimeoutError) else "provider_error",
         )
-        yield f"data: {error_chunk.model_dump_json()}\n\n"
         yield "data: [DONE]\n\n"
     finally:
         if not _dashboard_handled:
@@ -2186,23 +2198,11 @@ async def stream_claude_sdk(
         )
         dashboard_state.request_errored(request_id, f"Timeout after {CLAUDE_TIMEOUT}s")
         _dashboard_handled = True
-        error_chunk = ChatCompletionChunk(
-            id=request_id,
-            created=created,
-            model=model,
-            choices=[
-                StreamChoice(
-                    delta=DeltaMessage(
-                        content=(
-                            "\n\n[Error: Request timed out. Increase CLAUDE_TIMEOUT "
-                            "env var for longer requests.]"
-                        )
-                    ),
-                    finish_reason=None,
-                )
-            ],
+        yield _stream_error_event(
+            "Request timed out. Increase CLAUDE_TIMEOUT env var for longer requests.",
+            error_type="timeout_error",
+            code="timeout_error",
         )
-        yield f"data: {error_chunk.model_dump_json()}\n\n"
         yield "data: [DONE]\n\n"
         return
     except HTTPException as he:
@@ -2213,16 +2213,11 @@ async def stream_claude_sdk(
         )
         dashboard_state.request_errored(request_id, f"HTTP {he.status_code}: {he.detail}")
         _dashboard_handled = True
-        error_chunk = ChatCompletionChunk(
-            id=request_id,
-            created=created,
-            model=model,
-            choices=[StreamChoice(
-                delta=DeltaMessage(content=f"\n\n[Error: {he.detail}]"),
-                finish_reason=None,
-            )],
+        yield _stream_error_event(
+            str(he.detail),
+            error_type="invalid_request_error" if he.status_code < 500 else "server_error",
+            code="invalid_request_error" if he.status_code < 500 else "server_error",
         )
-        yield f"data: {error_chunk.model_dump_json()}\n\n"
         yield "data: [DONE]\n\n"
         return
     except Exception as e:
@@ -2237,16 +2232,11 @@ async def stream_claude_sdk(
         )
         dashboard_state.request_errored(request_id, f"{type(e).__name__}: {e}")
         _dashboard_handled = True
-        error_chunk = ChatCompletionChunk(
-            id=request_id,
-            created=created,
-            model=model,
-            choices=[StreamChoice(
-                delta=DeltaMessage(content="\n\n[Error: An internal error occurred.]"),
-                finish_reason=None,
-            )],
+        yield _stream_error_event(
+            "An internal error occurred.",
+            error_type="server_error",
+            code="server_error",
         )
-        yield f"data: {error_chunk.model_dump_json()}\n\n"
         yield "data: [DONE]\n\n"
         return
     finally:
@@ -2482,23 +2472,11 @@ async def stream_codex_cli(
         )
         dashboard_state.request_errored(request_id, f"Timeout after {CODEX_TIMEOUT}s")
         _dashboard_handled = True
-        error_chunk = ChatCompletionChunk(
-            id=request_id,
-            created=created,
-            model=model,
-            choices=[
-                StreamChoice(
-                    delta=DeltaMessage(
-                        content=(
-                            "\n\n[Error: Request timed out. Increase CODEX_TIMEOUT "
-                            "env var for longer requests.]"
-                        )
-                    ),
-                    finish_reason=None,
-                )
-            ],
+        yield _stream_error_event(
+            "Request timed out. Increase CODEX_TIMEOUT env var for longer requests.",
+            error_type="timeout_error",
+            code="timeout_error",
         )
-        yield f"data: {error_chunk.model_dump_json()}\n\n"
         yield "data: [DONE]\n\n"
         return
     except Exception as e:
@@ -2514,16 +2492,11 @@ async def stream_codex_cli(
         )
         dashboard_state.request_errored(request_id, f"{type(e).__name__}: {e}")
         _dashboard_handled = True
-        error_chunk = ChatCompletionChunk(
-            id=request_id,
-            created=created,
-            model=model,
-            choices=[StreamChoice(
-                delta=DeltaMessage(content="\n\n[Error: An internal error occurred.]"),
-                finish_reason=None,
-            )],
+        yield _stream_error_event(
+            "An internal error occurred.",
+            error_type="server_error",
+            code="server_error",
         )
-        yield f"data: {error_chunk.model_dump_json()}\n\n"
         yield "data: [DONE]\n\n"
         return
     finally:

{agentbridge_cli-0.1.14 → agentbridge_cli-0.1.16}/agentbridge/templates/dashboard/chat.html

@@ -642,14 +642,14 @@
                         </svg>
                     </button>
                     <textarea id="prompt" placeholder="Send a test message..." rows="1"></textarea>
-                    <button id="send" class="primary" type="button" aria-label="Send message" title="Send message">
+                    <button id="send" class="primary" type="button" disabled aria-label="Send message" title="Send message">
                         <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
                             <path d="m5 12 7-7 7 7"></path>
                             <path d="M12 19V5"></path>
                         </svg>
                     </button>
                 </div>
-                <input id="file-input" class="hidden-input" type="file" multiple accept="image/*,application/pdf,text/plain,.txt">
+                <input id="file-input" class="hidden-input" type="file" tabindex="-1" aria-hidden="true" multiple accept="image/*,application/pdf,text/plain,.txt">
             </section>
         </main>
 {% endblock %}
@@ -670,6 +670,7 @@
             var attachedFiles = [];
             var conversationMessages = [];
             var renderedMessages = [];
+            var isSending = false;
             var chatStateKey = "agentbridge.chat.state.v1";
 
             function endpoint(path) {
@@ -690,6 +691,10 @@
                 promptEl.style.overflowY = promptEl.scrollHeight > maxHeight ? "auto" : "hidden";
             }
 
+            function updateSendAvailability() {
+                sendEl.disabled = isSending || (!promptEl.value.trim() && !attachedFiles.length);
+            }
+
             function clearEmptyState() {
                 var empty = messagesEl.querySelector(".empty");
                 if (empty) empty.remove();
@@ -839,9 +844,26 @@
                 target.innerHTML = '<span class="typing-indicator" aria-hidden="true"><span></span><span></span><span></span></span>';
             }
 
+            function removeRenderedMessage(article) {
+                if (!article) return;
+                if (article.dataset.chatIndex === undefined) {
+                    article.remove();
+                    return;
+                }
+                var index = Number(article.dataset.chatIndex);
+                if (Number.isInteger(index) && index >= 0 && index < renderedMessages.length) {
+                    renderedMessages.splice(index, 1);
+                }
+                article.remove();
+                messagesEl.querySelectorAll(".message[data-chat-index]").forEach(function(message, nextIndex) {
+                    message.dataset.chatIndex = String(nextIndex);
+                });
+                saveChatState();
+            }
+
             function removeMessageBody(target) {
                 var article = target && target.closest ? target.closest(".message") : null;
-                if (article) article.remove();
+                removeRenderedMessage(article);
             }
 
             function messageFileNames(files) {
@@ -993,6 +1015,25 @@
                         if (hasSavedModel) modelEl.value = state.model;
                     }
                     state.renderedMessages.forEach(function(message) {
+                        if (message.role === "error") {
+                            var errorArticle = appendError(
+                                message.status || 0,
+                                message.statusText || "Request failed",
+                                message.body || null,
+                                message.requestId || null,
+                                null,
+                                { persist: false }
+                            );
+                            renderedMessages.push({
+                                role: "error",
+                                status: message.status || 0,
+                                statusText: message.statusText || "Request failed",
+                                body: message.body || null,
+                                requestId: message.requestId || null
+                            });
+                            errorArticle.dataset.chatIndex = String(renderedMessages.length - 1);
+                            return;
+                        }
                         var body = appendMessage(
                             message.role,
                             message.text || "",
@@ -1032,7 +1073,7 @@
             function summarizeError(status, statusText, body, requestId) {
                 var err = body && body.error ? body.error : null;
                 var title = "Server error";
-                var summary = status + (statusText ? " " + statusText : "");
+                var summary = status ? String(status) + (statusText ? " " + statusText : "") : (statusText || "Request failed");
                 if (err && err.message) summary = summary + ": " + err.message;
                 return {
                     title: title,
@@ -1046,7 +1087,8 @@
                 };
             }
 
-            function appendError(status, statusText, body, requestId) {
+            function appendError(status, statusText, body, requestId, retryAction, options) {
+                options = options || {};
                 clearEmptyState();
                 var info = summarizeError(status, statusText, body, requestId);
                 var article = document.createElement("article");
@@ -1073,12 +1115,6 @@
                 var actions = document.createElement("div");
                 actions.className = "error-actions";
 
-                var retry = document.createElement("button");
-                retry.className = "secondary";
-                retry.type = "button";
-                retry.textContent = "Retry";
-                retry.addEventListener("click", sendMessage);
-
                 var copy = document.createElement("button");
                 copy.className = "secondary";
                 copy.type = "button";
@@ -1087,16 +1123,38 @@
                     navigator.clipboard.writeText(compactJson(info.details));
                 });
 
-                actions.appendChild(retry);
+                if (retryAction) {
+                    var retry = document.createElement("button");
+                    retry.className = "secondary";
+                    retry.type = "button";
+                    retry.textContent = "Retry";
+                    retry.addEventListener("click", function() {
+                        removeRenderedMessage(article);
+                        retryAction();
+                    });
+                    actions.appendChild(retry);
+                }
                 actions.appendChild(copy);
 
                 article.appendChild(title);
                 article.appendChild(summary);
                 article.appendChild(details);
                 article.appendChild(actions);
+                if (options.persist !== false) {
+                    article.dataset.chatIndex = String(renderedMessages.length);
+                    renderedMessages.push({
+                        role: "error",
+                        status: status,
+                        statusText: statusText || null,
+                        body: body || null,
+                        requestId: requestId || null
+                    });
+                }
                 messagesEl.appendChild(article);
                 messagesEl.scrollTop = messagesEl.scrollHeight;
                 setStatus("error", "Error");
+                if (options.persist !== false) saveChatState();
+                return article;
             }
 
             function filePill(fileName, removable, index) {
@@ -1111,8 +1169,9 @@
                     var remove = document.createElement("button");
                     remove.className = "remove-file";
                     remove.type = "button";
-                    remove.textContent = "x";
+                    remove.textContent = "×";
                     remove.title = "Remove file";
+                    remove.setAttribute("aria-label", "Remove " + fileName);
                     remove.addEventListener("click", function() {
                         attachedFiles.splice(index, 1);
                         renderAttachedFiles();
@@ -1127,6 +1186,7 @@
                 attachedFiles.forEach(function(file, index) {
                     attachedFilesEl.appendChild(filePill(file.name, true, index));
                 });
+                updateSendAvailability();
             }
 
             function isTextFile(file) {
@@ -1237,12 +1297,19 @@
                         if (data === "[DONE]") return;
                         try {
                             var chunk = JSON.parse(data);
+                            if (chunk.error) {
+                                var error = new Error(chunk.error.message || "Streaming request failed");
+                                error.type = "stream_error";
+                                error.details = chunk;
+                                throw error;
+                            }
                             var choice = chunk.choices && chunk.choices[0];
                             var delta = choice && choice.delta && choice.delta.content;
                             if (delta) {
                                 appendAssistantDelta(target, delta);
                             }
                         } catch (e) {
+                            if (e.type === "stream_error") throw e;
                             appendAssistantDelta(target, data);
                         }
                     });
@@ -1251,31 +1318,13 @@
                 return target.dataset.rawMarkdown || "";
             }
 
-            async function sendMessage() {
-                var text = promptEl.value.trim();
-                if (!text && !attachedFiles.length) return;
-                var assistantTarget = null;
-
-                sendEl.disabled = true;
+            async function submitPreparedMessage(payload, userMessage, userTarget) {
+                isSending = true;
+                updateSendAvailability();
                 setStatus(null, "Sending");
+                var assistantTarget = appendMessage("assistant", "", null, { model: payload.model, loading: true });
 
                 try {
-                    var content = await buildUserContent(text);
-                    var filesForMessage = attachedFiles.slice();
-                    var userMessage = { role: "user", content: content };
-                    var payload = {
-                        model: modelEl.value,
-                        messages: conversationMessages.concat([userMessage]),
-                        stream: true
-                    };
-
-                    var userTarget = appendMessage("user", displayTextForMessage(text, filesForMessage), filesForMessage);
-                    assistantTarget = appendMessage("assistant", "", null, { model: payload.model, loading: true });
-                    promptEl.value = "";
-                    autosizePrompt();
-                    attachedFiles = [];
-                    renderAttachedFiles();
-
                     var response = await fetch(endpoint("/chat/completions"), {
                         method: "POST",
                         headers: { "Content-Type": "application/json" },
@@ -1287,7 +1336,13 @@
 
                     if (!response.ok) {
                         removeMessageBody(assistantTarget);
-                        appendError(response.status, response.statusText, await parseResponseBody(response), requestId);
+                        appendError(
+                            response.status,
+                            response.statusText,
+                            await parseResponseBody(response),
+                            requestId,
+                            function() { submitPreparedMessage(payload, userMessage, userTarget); }
+                        );
                         return;
                     }
 
@@ -1299,15 +1354,54 @@
                     saveChatState();
                 } catch (error) {
                     removeMessageBody(assistantTarget);
-                    appendError(0, "Request failed", {
+                    appendError(0, error.type === "stream_error" ? "Stream failed" : "Request failed", error.details || {
                         error: {
                             message: error && error.message ? error.message : String(error),
                             type: "network_error",
                             code: "request_failed"
                         }
-                    }, null);
+                    }, null, function() { submitPreparedMessage(payload, userMessage, userTarget); });
                 } finally {
-                    sendEl.disabled = false;
+                    isSending = false;
+                    updateSendAvailability();
+                }
+            }
+
+            async function sendMessage() {
+                var text = promptEl.value.trim();
+                if (!text && !attachedFiles.length) return;
+
+                isSending = true;
+                updateSendAvailability();
+                setStatus(null, "Sending");
+
+                try {
+                    var content = await buildUserContent(text);
+                    var filesForMessage = attachedFiles.slice();
+                    var userMessage = { role: "user", content: content };
+                    var payload = {
+                        model: modelEl.value,
+                        messages: conversationMessages.concat([userMessage]),
+                        stream: true
+                    };
+                    var userTarget = appendMessage("user", displayTextForMessage(text, filesForMessage), filesForMessage);
+
+                    promptEl.value = "";
+                    autosizePrompt();
+                    attachedFiles = [];
+                    renderAttachedFiles();
+
+                    await submitPreparedMessage(payload, userMessage, userTarget);
+                } catch (error) {
+                    appendError(0, "Request failed", {
+                        error: {
+                            message: error && error.message ? error.message : String(error),
+                            type: "request_preparation_error",
+                            code: "request_preparation_failed"
+                        }
+                    }, null, sendMessage);
+                    isSending = false;
+                    updateSendAvailability();
                 }
             }
 
@@ -1329,7 +1423,10 @@
             });
             sendEl.addEventListener("click", sendMessage);
             modelEl.addEventListener("change", saveChatState);
-            promptEl.addEventListener("input", autosizePrompt);
+            promptEl.addEventListener("input", function() {
+                autosizePrompt();
+                updateSendAvailability();
+            });
             promptEl.addEventListener("keydown", function(e) {
                 if (e.key !== "Enter" || e.isComposing) return;
                 if (e.altKey) return;
@@ -1356,6 +1453,7 @@
             restoreChatState();
             checkHealth();
             autosizePrompt();
+            updateSendAvailability();
         })();
     </script>
 {% endblock %}