mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-11 08:42:11 +00:00
* feat: better composer etc * docs: add desktop and dashboard run instructions * fix(desktop): address security scan findings * fix(dashboard): resolve @nous-research/ui path under npm workspaces The sync-assets prebuild step shelled out to 'cp -r node_modules/@nous-research/ui/dist/fonts ...' with a path relative to apps/dashboard/. That works only when the dep is installed locally in the dashboard workspace, but 'npm install' at the repo root (the documented setup — see apps/desktop/README.md) hoists shared deps to the root node_modules under npm workspaces. The relative cp then fails with 'No such file or directory', sync-assets exits 1, the Vite build aborts, and 'hermes dashboard' surfaces a generic 'Web UI build failed' message. Replace the shell one-liner with scripts/sync-assets.cjs, which walks up from the dashboard directory looking for node_modules/ @nous-research/ui — working in both the hoisted (workspaces) and co-located (standalone) layouts. Also guards against a missing dist/fonts or dist/assets with a clearer error pointing at a rebuild of the UI package rather than silently copying nothing. * feat(desktop): support connecting to a remote Hermes backend Add HERMES_DESKTOP_REMOTE_URL and HERMES_DESKTOP_REMOTE_TOKEN env vars that, when set, short-circuit the local-child spawn in startHermes() and connect the Electron renderer to an already- running 'hermes dashboard' server reachable over the network. Motivating use case: WSL2 users who want to run the Hermes core (agent loop, tools, filesystem access) inside their WSL distribution while rendering the Electron GUI on native Windows. Before this change, the desktop app always spawned a local Python child on the same host as the renderer, which doesn't cross the WSL/Windows boundary. The remote path reuses waitForHermes() as a liveness probe (/api/status is in the backend's public endpoint allowlist), so the connection is only returned once the backend is actually ready. WebSocket URL derivation picks ws:// or wss:// based on the input scheme. URL validation rejects non-http(s) schemes and requires both env vars together to avoid a half-configured connection that would silently fall through to the spawn path. No behaviour change when the env vars are unset — the default local-spawn flow is untouched. Typical usage: # in WSL2 hermes dashboard --tui --no-open --host 0.0.0.0 --port 9119 --insecure # on Windows set HERMES_DESKTOP_REMOTE_URL=http://localhost:9119 set HERMES_DESKTOP_REMOTE_TOKEN=<session token> set HERMES_DESKTOP_IGNORE_EXISTING=1 (launch Hermes desktop) * ci(desktop): automate desktop releases Add GitHub Actions release channels for signed desktop installers and document the stable/nightly download paths. * feat: file tabs * refactor(desktop): tighten right-rail tab close API Promote closeRightRailTab/closeActiveRightRailTab as the single public entry point. Drops the activeTabRef + handleCloseDocument indirection in ChatPreviewRail, the unused $rightRailHasContent atom, and the legacy dismissFilePreviewTarget alias. -70 LOC. * feat(desktop): polish composer pill toward reference look Solid foreground-on-background send/voice-conversation circle (black-on-white in light, white-on-black in dark) anchors the right edge as the primary CTA instead of the orange theme primary. Bumps the primary control to 2.125rem so it visually outranks the ghost mic/plus controls. Opens up the surface padding (0.625rem x / 0.5rem y) so the input row breathes around its controls, and nudges the corner radius from 20 to 24px for a slightly pill-ier silhouette. LiquidGlass distortion is preserved. * feat(desktop): add startup and onboarding flow Add phase-based desktop boot progress, fresh-install sandbox testing, and first-run provider credential onboarding so packaged installs can start cleanly without manual settings detours. * fix(desktop): gate prompts on provider setup Show the desktop provider onboarding flow before prompt submission when no inference provider is configured, preventing fresh installs from falling through to backend credential errors. * fix(desktop): surface provider onboarding from session warnings Propagate credential warnings through session runtime info and open desktop onboarding whenever a session reports no usable provider, so unconfigured installs cannot fall through to prompt errors. * fix(desktop): route gateway provider errors to onboarding The "No inference provider configured" auth error reaches the renderer through gateway error events, not the prompt.submit promise; the previous patch only caught the latter, so the error toast still surfaced and onboarding never opened. Also strip credential-shaped env vars from the test:desktop:fresh sandbox so the packaged backend can't see provider keys leaking from the launching shell. * fix(desktop): use strict runtime check to drive onboarding setup.status returned True whenever any provider auth state was discoverable, including indirect fallbacks like a gh-CLI Copilot token. That made desktop think the user was set up while the agent's actual resolve_runtime_provider call still raised AuthError, leaving the user with a useless toast and no onboarding. Add a setup.runtime_check gateway method that runs the same resolver the agent uses on session creation, and switch the desktop onboarding overlay and prompt precheck to use it. * feat(desktop): OAuth-first onboarding using existing dashboard provider API Replace the engineer-flavored API key form with a Sign-in-first onboarding overlay that uses the dashboard's existing /api/providers/oauth catalog and PKCE/device-code endpoints (Anthropic, Nous, OpenAI Codex, etc.). API key entry is now a fallback tab with friendly provider names instead of env var prefixes, and the loud raw resolver error is gone in favor of a one-line welcome message. * fix(desktop): polish onboarding provider list Reorder OAuth providers so Nous Portal is first, give the segmented Sign in / API key control equal column widths, and replace the engineer-flavored backend names like "Anthropic (Claude API)" / "MiniMax (OAuth)" with friendlier in-app titles. External-CLI providers now show a softer subtitle and an external-link icon instead of a chevron. * refactor(desktop): split onboarding overlay into store + view Move the OAuth state machine, runtime check, copy-to-clipboard, and api-key save into store/onboarding.ts (matching the boot.ts pattern), leaving the overlay as a presentation layer that subscribes via useStore. Tabs are now table-driven, child panels read flow from the store instead of prop-drilling, and the polling/PKCE/error/success branches share a small Status atom. * fix(desktop): external CLI providers + center mode tabs External-CLI providers (Claude Code, Qwen Code) now open an in-overlay panel with the CLI command, copy button, and an "I've signed in" recheck instead of firing an invisible toast. Center the Sign in / API key tab control so it sits under the heading instead of hugging the left edge. * fix(desktop): drop onboarding tabs for an inline link, group device-code waiting state Replace the Sign in / API key tab pair with an "I have an API key" footer link under the OAuth provider list, with a "Back to sign in" affordance inside the API key form. Group the device-code "Waiting for you to authorize..." status next to the Cancel button so the alignment matches the action. * refactor(desktop): tighten onboarding store + overlay Drop the dead isOnboardingBusy/BUSY set, factor the catch-fallback dance into safeReq, and share a single reloadAndConnect helper between PKCE submit, device-code success, external recheck, and api-key save. In the overlay, extract Step / CodeBlock / FlowFooter / CancelBtn / DocsLink atoms so the four sign-in panels share the same chrome instead of repeating it inline. Net effect: fewer literal divs, one place to touch the spacing, and the code-block + footer rows are reusable across future flows. * fix(desktop): mount onboarding from frame 1 to kill the FOUT Default onboarding.configured to null (unknown until the runtime check resolves) and have the onboarding overlay render whenever it's not yet confirmed true. The boot overlay now yields to it, so the very first paint is the Welcome card with a "While we get you set up..." progress strip instead of a flash of the chat shell between boot dismiss and onboarding mount. The picker swaps in cleanly once the gateway opens and the runtime check confirms the user is not configured. Already-configured users see the same prep card briefly while their existing runtime warms up, then the overlay dismisses without touching the chat shell. * fix(desktop): top-align empty sessions placeholder The "Start a chat to build your history." empty state used a min-h-35 grid place-items-center container, which floated the text in a tall dead zone. Render it as a flat paragraph that sits right under the section header like the empty pinned state does. * refactor(desktop): drop dead boot overlay Onboarding overlay subsumes the boot card now that it mounts from frame 1 and renders boot progress inline. The standalone DesktopBootOverlay is unreachable in every flow (yields whenever onboarding has not confirmed configured, dismisses once it has). * fix(desktop): hide pinned/recents sections until first session A fresh sidebar showed the Pinned and Recent chats headers with floating empty-state copy underneath. Drop both sections (and the now-orphan SidebarEmptySessionState) when there are no sessions yet — they reappear after the first chat. Skeletons during initial load are unchanged. * feat(gui): route embedded TUI through dashboard gateway (#21979) Inject HERMES_TUI_GATEWAY_URL into dashboard PTY sessions so embedded ui-tui instances attach to the in-process websocket gateway, with coverage for the new env wiring. * Add desktop remote gateway settings Make the desktop gateway connection configurable from settings so local remains the default while remote backends can be saved, tested, and applied without environment variables. * feat(gui): first-class Messaging page + gateway menu redesign - Add Messaging page to the desktop app with per-platform setup, status, and inline guidance. Catalog derives from gateway.config Platform enum + plugin registry, so every messaging adapter the CLI supports (Telegram, Discord, Slack, Mattermost, Matrix, WhatsApp, Signal, BlueBubbles, Home Assistant, Email, SMS, DingTalk, Feishu, WeCom, Weixin, QQ, Yuanbao, API server, Webhooks, plugins) shows up without per-platform code. - New REST endpoints: GET /api/messaging/platforms, PUT and POST /test on the same path. Secrets go through the existing .env pipeline; enable/disable writes config.yaml. - Replace gateway statusbar dropdown with a richer panel: status row, icon-only restart + system-panel actions, recent activity (with timestamps trimmed in display, full text on hover), platform list. - Auto-poll the messaging page every 6s (paused when hidden) so status updates without a manual check. - Drop Settings / Command Center from the sidebar nav (still reachable via shortcuts and the titlebar cog). - Flatten top corners on Messaging/Skills/Artifacts/Chat panes. - Share new StatusDot component across messaging + gateway menu. - Fix gateway/config.py so an explicit platforms.<name>.enabled=false in config.yaml is honored when env tokens are present. - pb-9 on the chat content area for breathing room above the composer. * Potential fix for pull request finding 'CodeQL / Clear-text logging of sensitive information' Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * pin electron version * hide application menu on non-mac systems * interpret compactPreview for non-string vlaues as JSON or an empty string * fix(desktop): keep composer contenteditable mounted across stacked toggle The composer rendered {input} inside two different parent fragments depending on `stacked`. When auto-expand flipped `stacked` (e.g. the moment typed text wrapped past two lines), React reconciled the two branches as different positions and unmounted/remounted the contenteditable. The fresh mount started empty, so any in-flight characters — most reliably reproduced by holding a key — were lost. Replace the conditional with a single CSS Grid whose template-areas swap on `stacked`. The three children (menu, input, controls) keep stable identities across the toggle; only their grid placement changes, which the browser handles without React tearing down the editor. * refactor(desktop): align install layout with install.ps1 / install.sh Make the desktop app's runtime layout match what scripts/install.ps1 and scripts/install.sh produce, so a desktop-only user and a CLI-only user end up with the same files in the same places and can share one install. Layout - ACTIVE_HERMES_ROOT = HERMES_HOME/hermes-agent (was: process.resourcesPath/hermes-agent, read-only) - VENV_ROOT = HERMES_HOME/hermes-agent/venv (was: userData/hermes-runtime) - desktop.log = HERMES_HOME/logs/desktop.log (was: userData/desktop.log) - HERMES_HOME default: %LOCALAPPDATA%\hermes on Windows, ~/.hermes elsewhere The packaged .app/.exe still ships a read-only payload at process.resourcesPath/hermes-agent (FACTORY_HERMES_ROOT). On first launch or after an installer-driven upgrade we sync factory -> active, then provision the venv and run pip install -e . against the active root. Key behaviors - Pin HERMES_HOME in the spawned Python's env so get_hermes_home() resolves to the same path resolveHermesHome() picked. Without this, Python falls back to ~/.hermes on every platform - fine on mac/linux, a split-state bug on Windows where our default is %LOCALAPPDATA%\hermes. - Detect developer installs by .git presence at ACTIVE; never overwrite a user's checkout via factory sync. - Marker at ACTIVE/.hermes-desktop-runtime.json (schema v4) tracks pyproject hash + factory version + runtime schema version. depsFresh fast-paths when nothing changed. - Dev (npm run dev) prefers SOURCE_REPO_ROOT over ACTIVE so devs run their local edits, not whatever's under HERMES_HOME. - Better error messages distinguish "no payload" from "no Python". - Preserve a legacy ~/.hermes on Windows when no %LOCALAPPDATA%\hermes exists, so users with prior pip/manual installs aren't orphaned. pyproject.toml - Promote fastapi, uvicorn[standard], ptyprocess (non-Windows), and pywinpty (Windows) to main dependencies. The dashboard backend (hermes dashboard) needs them at runtime; the previous lazy-import fallback was a footgun for fresh installs. - Empty the [pty] optional-extra; kept as a no-op back-compat alias for any existing pip install hermes-agent[pty] invocations. Drops the hardcoded BUNDLED_RUNTIME_REQUIREMENTS list in main.cjs - the desktop now installs whatever pyproject.toml says, single source of truth. Files - apps/desktop/electron/main.cjs: runtime layout, HERMES_HOME pin, factory->active sync, marker v4 - apps/desktop/scripts/test-desktop.mjs: track new venv location - apps/desktop/README.md: new Setup, Runtime Bootstrap, and Debugging sections - pyproject.toml: fastapi/uvicorn/pty backends in main dependencies; [pty] extra emptied Tested locally on Windows: npm run dev boots cleanly, sessions land at the new location, type-check + lint + test:desktop:platforms all pass. Verified end-to-end on a fresh Win11 VM via dist:win installer. Known gaps (filed as follow-ups, not in this PR): - Skills not seeded on packaged installs (sync_skills only runs in cmd_chat, not cmd_dashboard). Need to move to shared pre-dispatch. - Git Bash not bundled or detected; agent's terminal tool errors out with a useful message but desktop bootstrapper should pre-flight it. - install.ps1 / install.sh should be decomposed into composable phase libraries so the desktop bootstrapper can reuse them as a single source of truth across all install surfaces. * feat(desktop): theme polish, prose chat typography, composer chrome - DS tokens/midground, Backdrop, scoped scrollbars, typography plugin + prose - Composer liquid/radius utilities, thread font parity, tool/thinking cues - File tree label scale, preview flex, thread retry loading + streaming tests * feat(desktop): NSIS prereq detection page + auto-install via winget The packaged Windows installer now detects Python 3.11+ and Git for Windows at install time and offers to install missing prereqs via winget. Mirrors the prereq logic scripts/install.ps1 already runs for CLI installs, so desktop installer users get the same out-of-the-box experience as install.ps1 users. Why - Hermes' terminal tool calls bash.exe directly (tools/environments/ local.py); on Windows that's Git Bash from Git for Windows. Without it, the agent fails on the first terminal() call. - Hermes' Python runtime needs 3.11+. Without it, the desktop bootstrapper errors out at venv creation. - Both gaps surfaced on a fresh Windows 11 VM smoke test: VM had Python pre-installed but no Git, so the agent's first terminal call failed with "Git Bash isn't installed." - install.ps1 has had Install-Git + Install-Uv functions for ages. The desktop installer was the asymmetric outlier. How — NSIS prereq page - New file: apps/desktop/installer/prereq-check.nsh (plugged into electron-builder via build.nsis.include) - Real Wizard page using nsDialogs, inserted via customPageAfterChangeDir hook (between the Directory page and InstFiles). - Group boxes for Python and Git, each showing detection status. - Pre-checked install checkboxes when winget is available. - Auto-skips silently if both prereqs are already installed. - Falls back to manual download URLs when winget itself is missing. - Detection: - Python: probes `py -3.11`/`-3.12`/`-3.13`/`-3.14` via the Python launcher. Microsoft Store "Python stub" (no py.exe) is correctly classified as not-installed. - Git: `where git`. - winget: `where winget` (Win10 1809+ / Win11 with App Installer). - Install execution (in customInstall macro): - Python: nsExec::ExecToLog with `--scope user --silent`. Per-user install, no UAC prompt, output streams to install log. - Git: ExecShellWait via Windows ShellExecute. Critical because Git always installs per-machine and triggers UAC; ShellExecute preserves the foreground focus chain across non-elevated → elevated process spawns, so UAC actually comes to the foreground. nsExec::ExecToLog breaks the chain because winget runs hidden. - Both pass `--disable-interactivity --accept-package-agreements --accept-source-agreements` to suppress winget's own dialogs. - Verification: probes Git's standard install locations via FileExists rather than `where git`. NSIS's process inherits PATH at startup, so a freshly-installed Git won't be visible to `where` until restart. - Silent installs (/S) skip the prompts; managed deploys handle prereqs out-of-band via Group Policy / Intune. How — Electron-side safety net - New findGitBash() in main.cjs, parallel to findSystemPython(). Probes the same locations as tools/environments/local.py:_find_bash() so a positive result here means the agent's terminal tool will work. - ensureRuntime now throws a clear, actionable error on Windows when Git Bash isn't found, matching the existing "Python 3.11+ is required" error path. - Catches users the NSIS page doesn't: .msi installer users (NSIS prereq page doesn't run for MSI), `npm run dev` users, manual installers, anyone who unchecked the install boxes on the NSIS prereq page. - All gated on `IS_WINDOWS`; macOS / Linux unaffected. NSIS build issue (resolved) - electron-builder defaults to `-WX` (warnings as errors). NSIS optimizer emits "warning 6010: function not referenced" for our page functions because Page custom directives don't count as references in its static-analysis pass. The functions ARE called at runtime when NSIS invokes the page; the optimizer just can't see it statically. - Set `build.nsis.warningsAsErrors=false` in package.json so this spurious warning doesn't fail the build. (Documented option from electron-builder's nsisOptions.) Out of scope (filed for future work) - MSI prereq detection: Windows Installer custom actions are a different mechanism. Enterprise deploys typically handle prereqs via GP/Intune. - Bundle PortableGit + python-build-standalone in extraResources for zero-network installs. ~80MB increase. - Mac / Linux GUI prereq flows (different installer formats; Xcode CLT covers most macOS prereqs already; Linux is per-distro hard). Files - apps/desktop/installer/prereq-check.nsh (new, ~290 lines NSIS) - apps/desktop/package.json (build.nsis.include + warningsAsErrors) - apps/desktop/electron/main.cjs (findGitBash + preflight) - apps/desktop/README.md (Runtime prerequisites section) Cross-platform impact - macOS / Linux builds (dist:mac, dist:mac:dmg, dist:mac:zip): nsis config is ignored entirely; .nsh is dormant. - npm run dev: .nsh dormant; main.cjs preflight gated on IS_WINDOWS. - scripts/install.ps1, scripts/install.sh: no reference to any new files; CLI install paths untouched. - Hermes CLI / dashboard / gateway: no reference; runtime untouched. - All checks: node --check on main.cjs and test-desktop.mjs pass; npm run test:desktop:platforms 4/4 passing; node --test green. Tested - npm run dist:win produces signed .exe and .msi without errors. - Fresh Win11 VM (Python pre-installed, no Git): prereq page renders, Python check shows detected, Git checkbox pre-checked. Click Next → Git installs via winget with UAC prompt in foreground. - After install completes, Hermes launches and the agent's terminal tool can run bash commands. Verified Git Bash is detected at `C:\Program Files\Git\bin\bash.exe` by ensureRuntime's preflight. * feat: theme changes, composer tweaks, in app update ux, finesse * fix(cli): seed bundled skills on dashboard + gateway entrypoints `sync_skills(quiet=True)` was only being called from inside `cmd_chat`, which meant `hermes dashboard` (the desktop GUI's backend) and `hermes gateway` (Telegram/Discord/Slack/etc daemons) never seeded the bundled skill library into ~/.hermes/skills/. This surfaced as "No skills found" in the desktop GUI's skills panel on fresh installs, despite the agent having access to the full bundled library when invoked via `hermes chat`. scripts/install.ps1 worked around it by running skills_sync.py as part of Copy-ConfigTemplates, but that's not part of the desktop installer's bootstrap chain. Fix - Extract the skills-sync block from cmd_chat into a module-level `_sync_bundled_skills_quietly()` helper. - Call the helper from cmd_chat (preserving existing behavior), cmd_dashboard (after the --status/--stop early-return paths and fastapi import check, so we don't run skills_sync on management commands or when deps aren't installed), and cmd_gateway. Why these three entrypoints - cmd_chat: the user's primary CLI entrypoint - cmd_dashboard: the desktop GUI's backend; this is what `hermes dashboard --tui` invokes when the desktop bootstrapper spawns Hermes - cmd_gateway: long-running daemons where the user expects the agent to have full skill access Other entrypoints (cmd_config, cmd_doctor, cmd_login, cmd_status, etc.) are management commands that don't need skill discovery and were never running skills_sync in the first place — leaving them alone. Idempotence - tools/skills_sync.py is manifest-based: skipped skills cost milliseconds. Calling it from multiple entrypoints adds no real cost, and users running `hermes chat` then `hermes dashboard` get two fast no-ops on the second call. Failure handling - Helper wraps skills_sync in try/except. Skills are an enhancement, not a hard dependency — Hermes runs fine with an empty skills/ dir. Files - hermes_cli/main.py: + new helper `_sync_bundled_skills_quietly()` at module level + cmd_chat: replace inline block with helper call + cmd_dashboard: add helper call after fastapi import succeeds + cmd_gateway: add helper call before delegating to gateway_command * feat(desktop): hoisted todo widget, JSON tool summaries, history grouping & timer fixes - Hoist todo to first-class widget (shadcn checkboxes, brand colors, no tool-accordion). Header derives label from active task; non-active rows fade. - Replace raw JSON dumps with structured key/value summaries via formatToolResultSummary; nested error extraction for clearer failures. - Fix loaded-session grouping: stitch interleaved assistant/tool iterations into one bubble instead of orphaned synthetic messages. - Stable tool/thinking timers via keyed registry so unmount/scroll doesn't reset elapsed counts; gate "running" on real live thread state. - Reorganize chat-only assistant-ui components under components/chat/. * fix(desktop): address CodeQL alerts on PR #20059 - settings/helpers.ts: harden setNested against prototype pollution. POLLUTING_PATH_PARTS check is now applied at every assignment site (loop + leaf) and uses Object.defineProperty so CodeQL can see the guard inline rather than via a helper function call. - lib/markdown-preprocess.ts: rebuild the dangling-fence close regex from a fence-char + length instead of marker.replace(...). The marker is captured by `(`{3,}|~{3,})` so it can only be backticks or tildes, but CodeQL was tracing tainted input text into the RegExp source and flagging hostname dots from input as part of the pattern (false positive js/incomplete-hostname-regexp on the test fixture URLs). Reconstructing from a literal char breaks the dataflow. - scripts/notarize-artifact.cjs: drop args from the run() rejection message. Args carry --key-id / --issuer / key file path; the existing outer catch already squashes errors to a generic line, but CodeQL was flagging the args.join(' ') as clear-text logging of APPLE_API_KEY_ID. Composer DOM-text-as-HTML alerts (composer/index.tsx:379, :547) are already addressed in4dd9732a9— innerHTML assignment was replaced with renderComposerContents which builds DOM via replaceChildren / append text nodes (no HTML interpretation). * fix(desktop): inline prototype-pollution guard so CodeQL sees it CodeQL's dataflow doesn't follow the helper-function guard inside `safeSet`, so it kept flagging Object.defineProperty as prototype- polluting. Inline the literal `__proto__`/`constructor`/`prototype` check at the assignment site to break the dataflow. Behavior unchanged — same set of disallowed keys, same throw. * feat(ui-tui): resolve links to readable page titles Mirror desktop pretty-link behavior in the TUI by resolving HTTP links to page titles with shared caching and safe fetch filters, plus slug-based fallbacks so chat links stay readable even when title fetch fails. * fix(desktop): drop RegExp from dangling-fence close detection Previous attempt tried to break the dataflow by reconstructing the close-fence regex from a literal char + marker.length, but CodeQL still traced marker.length back to input and kept flagging the test-fixture URLs as hostname-regex sources (js/incomplete-hostname-regexp). Replace `new RegExp(...)` + `closeRe.test(body)` with a string-only hasCloseFenceLine() helper that splits on '\n' and uses ===. No regex on this path now, so input data can no longer reach a RegExp source. Behavior preserved: matches lines that are (whitespace + marker + whitespace), which is what the original `\n[ \t]*${marker}[ \t]*(?=\n|$)` matched. All 12 markdown-text tests still pass. * fix(process-registry): suppress windows-footgun false positive on guarded killpg Keep the existing POSIX-only process-group teardown path, but make the signal selection explicit via getattr and add an inline windows-footgun suppression marker on the guarded os.killpg line so the Windows footgun check no longer blocks CI on this intentionally platform-gated code. * feat(desktop): reconcile live tool events, polish thread chrome, harden boot - chat-messages: match tool rows by overlapping query/context/preview values so preview-first `tool.progress` rows reliably adopt later stable-id `tool.start` payloads instead of spawning ghost rows or mis-merging parallel same-name calls; preserve prior args/result across phases. - tui_gateway: emit full args + parsed result on `tool.start` / `tool.complete`, drop redundant `tool.started` re-emit from `tool.progress`. - electron/main: prefer SOURCE_REPO_ROOT before PATH `hermes` in dev so local backend edits actually run; split hardening helpers into `electron/hardening.cjs` with tests. - thread/tool UI: one-shot enter animation keyed by stable ids, braille spinner for running rows, Cursor-like disclosure rows, drill-down + duration/count formatting via new tool-fallback-model. - composer: extract `text-utils`, drop liquid-glass overrides. - right-rail: split preview-pane into preview-console / preview-file. - runtime: incremental external-store runtime + runtime-readiness gate; onboarding store + tests; route-resume hook test. - regression tests for live tool reconciliation (parallel tools, id-less progress, preview-first rows, structured args/results). * feat(desktop): add ripgrep to NSIS prereq page + polish layout Add ripgrep as a third (recommended) prereq alongside Python and Git in the NSIS prereq detection page, and clean up the page layout based on on-VM testing. Why ripgrep - Hermes' search_files tool calls `rg` directly for content + filename search (tools/file_operations.py:1382). Falls back to grep/find from Git Bash when missing — works but slower and noisier (no .gitignore awareness). - ~5MB winget install via `BurntSushi.ripgrep.MSVC --scope user` — no UAC prompt, parallel to how Python installs. - scripts/install.ps1 already installs ripgrep as part of Install-SystemPackages; this brings the desktop installer to parity. Why "recommended" not "required" - Python and Git are hard requirements: without them the agent runtime or terminal tool refuses to start. The bootstrapper preflight throws. - ripgrep is a performance enhancement: missing it just means slower searches. Page wording reflects this; failure to install is logged but doesn't show a MessageBox or block. Layout polish (response to on-VM screenshot review) - Wizard header now correctly reads "System Requirements" instead of the leftover "Choose Install Location" from the previous page. Set via `GetDlgItem $HWNDPARENT 1037/1038` + WM_SETTEXT — the standard NSIS pattern for overriding the page header on a custom Page. - Removed redundant in-body title + verbose intro paragraph; the wizard header IS the title now. Body has one short intro line. - Group boxes tightened to 26u with content positioned just below the groupbox title (not top-anchored status + bottom-anchored checkbox with empty space in the middle). All three panels + footer fit comfortably in 126u, well under the 140u page limit. - Checkbox labels simplified: dropped "(per-user, no admin prompt)" and "(administrator approval required)" suffixes. The footer note still calls out UAC for Git when relevant. - Footer text trimmed to fit cleanly without clipping. Install order (in customInstall macro) - Python → ripgrep → Git - Python and ripgrep are silent and run first; Git's UAC prompt comes last so the user's approval interaction isn't interrupted by silent activity afterwards. Skip behavior unchanged - All three detected → page auto-skips via Abort - Silent install (/S) → customInstall winget block skips - User unchecks all → page advances without running winget Files - apps/desktop/installer/prereq-check.nsh: ripgrep detection block, ripgrep page panel + checkbox, ripgrep customInstall block, GetDlgItem header override, layout reflow - apps/desktop/README.md: Runtime prerequisites section updated to list ripgrep as recommended, with manual winget command * feat(desktop): add model-confirmation step to onboarding After OAuth/API-key login completes, onboarding now shows a confirmation card with the curated default model and a Change button before dropping the user into chat. Closes the gap where the desktop's `model.default` was empty after first launch and the agent had to fall back to whatever heuristic happened to fire — leaving users wondering "why am I getting sonnet-4 when I logged into Nous Portal?" Why - Desktop onboarding only persisted credentials, never `model.default`. The CLI's `hermes model` command pairs provider + model selection, but the desktop's onboarding skipped the model step entirely. - Result: users saw whichever model the agent's auto-fallback picked, unpredictably and undocumented. - For the BUILD demo we want users to land on the model they expect for their provider, with a clear "this is what you're getting" UI and a one-click path to change it before chatting. How - New `confirming_model` flow status carries the just-authenticated provider slug, current default model, label, and a saving flag. - `completeWithModelConfirm()` runs after credentials succeed: reloads env, verifies runtime, fetches /api/model/options to find the curated first-model for the provider, persists it via /api/model/set, then transitions into `confirming_model`. - If anything fails (no providers returned, network error), falls through to the previous behaviour — onboarding completes without the confirm step. Polish, not a hard requirement. - All four credential paths (device_code OAuth, PKCE OAuth, external CLI flow, API key) now use completeWithModelConfirm instead of reloadAndConnect. UI - `ConfirmingModelPanel` shows: green "<provider> connected" banner, card with "Default model: <name>" + Change button, and a "Start chatting" CTA that finalises onboarding. - Reuses the existing `ModelPickerDialog` (the same picker available from the chat shell) for the change-model UX. Search, filtering, multi-provider listing — all already built. - Stacking: ModelPickerDialog defaults to z-130, which renders UNDER the onboarding overlay (z-1300) and breaks pointer events. Added optional `contentClassName` prop to ModelPickerDialog so callers can override; onboarding passes `z-[1310]`. Provider-slug matching - For OAuth flows: pass `provider.id` directly as the preferred slug. - For API-key flows: `OPENROUTER_API_KEY` → "openrouter" via env-key prefix strip. Also includes the user-visible label as a fallback candidate. - fetchProviderDefaultModel falls back to the first authenticated provider in the response if no preferred slug matches — so even a miss still surfaces a reasonable default. Files - apps/desktop/src/store/onboarding.ts: + new `confirming_model` flow variant + fetchProviderDefaultModel + completeWithModelConfirm helpers + setOnboardingModel (optimistic update + revert on failure) + confirmOnboardingModel (finalises onboarding from the card) - reloadAndConnect (replaced; the four call sites now go through completeWithModelConfirm) - apps/desktop/src/components/desktop-onboarding-overlay.tsx: + ConfirmingModelPanel component + new branch in FlowPanel for status `confirming_model` + ModelPickerDialog usage with z-[1310] content class - apps/desktop/src/components/model-picker.tsx: + optional `contentClassName` prop on ModelPickerDialog so the dialog can be stacked on top of other fixed overlays Tested - `npm run type-check` passes - `npx eslint` clean on touched files - Live test in `npm run dev`: cleared onboarding cache, walked through Nous device-code flow, saw confirm card with curated default, clicked Change → ModelPickerDialog rendered above the onboarding overlay with working pointer events, picked a different model, "Start chatting" persisted to ~/.hermes/config.yaml. * fix(desktop): suppress generic provider warning in onboarding Hide the red setup notice when the message is the generic missing-provider guidance, since onboarding already presents provider auth actions. Centralize provider-setup matching across desktop hooks and add coverage for the matcher. * fix(desktop): add 2u clearance below prereq checkboxes Group box bottom border was clipping the checkboxes by 1-2px. Bumped each box height 26u→30u; checkboxes now sit 2u above the bottom border. * fix(nix): refresh dashboard lockfile hash Update the web npm deps hash in nix/web.nix to match the committed apps/dashboard/package-lock.json so bb/gui passes the nix lockfile check. * fix(desktop): install TUI deps in release workflow Ensure desktop release builds install the standalone ui-tui package before bundling the TUI payload. * fix(desktop): run release builder from app package Invoke the desktop builder through the package script so electron-builder uses apps/desktop/package.json. * fix(desktop): expand release artifact names safely Build desktop artifact names from workflow version/channel while preserving electron-builder platform macros. * fix(desktop): use package artifact naming in release workflow Let electron-builder's desktop package config provide platform-specific artifact extensions while the workflow injects the release version/channel metadata. * fix(nix): fetch dashboard npm deps from package root Point the dashboard npm dependency fetch at apps/dashboard so Nix can find the package lockfile after the dashboard move. * fix(nix): build dashboard from package directory Set the web package source root to apps/dashboard so npm patch/build phases run beside the dashboard lockfile while keeping apps/shared available as a sibling. * feat(desktop): render LaTeX math via KaTeX after streaming completes Add @streamdown/math plugin to the chat markdown renderer. Inline ($x^2$) and block ($$...$$) math both supported with singleDollarTextMath enabled. Plugin is gated to non-streaming state to match the existing pattern for syntax highlighting — math renders when the message completes, avoiding KaTeX re-render churn during streaming. KaTeX CSS is imported in styles.css; ~30KB CSS + ~430KB JS added to the bundle. Smoothness improvements during streaming deferred to a follow-up. * perf(desktop): memoize KaTeX renders so math streams without re-rendering Wrap rehype-katex with a per-equation LRU cache (keyed by displayMode + source text) and re-enable math during streaming. Stock @streamdown/math runs rehype-katex on every markdown commit, so each new token re-katexes every equation in the message. For math-heavy responses (an equation derived step-by-step) that's hundreds of ms of wasted work per token and the streaming UI chokes. With memoization, each equation pays katex.renderToString exactly once; subsequent tokens re-walk the tree but hit cache for unchanged equations. The wrapper mirrors rehype-katex's semantics exactly: same class detection (language-math, math-inline, math-display), same <pre>-walk-up for fenced math blocks, same parent.children.splice replacement, same SKIP traversal, same strict-then-lenient render strategy with VFile message reporting. Cached children are structuredCloned on each splice so downstream rehype plugins or toJsxRuntime can't mutate the cache. * fix(desktop): declare katex-memo deps directly + drop per-app lockfile katex-memo.ts (added in112cad59b) imports hast-util-from-html-isomorphic, hast-util-to-text, remark-math, katex, and unist-util-visit-parents but those were never added to apps/desktop/package.json. They were silently resolving via @streamdown/math at the workspace root, which broke the moment `npm i --prefix apps/desktop` ran with the per-workspace lockfile because that install only consults apps/desktop/package.json. Add them as direct deps, plus unified/vfile/@types/hast for the type imports. Also delete apps/desktop/package-lock.json — root package.json declares workspaces: ["apps/*"], so npm manages all lockfile state at the root. The stale per-app lockfile is what made `npm i --prefix apps/desktop` diverge from the workspace install in the first place and left an empty apps/desktop/node_modules/@assistant-ui/ stub that Vite's dep optimizer then tried (and failed) to open at @assistant-ui/core/dist/internal.js. * feat(desktop): disable Backdrop noise overlay by default The noise overlay defaulted to on, which adds a busy speckle layer over the whole window for every new user. Flip the Leva default to off; the toggle stays in Backdrop / Noise for anyone who wants it back. * fix(desktop): polish LaTeX rendering — currency, code blocks, brackets Five distinct bugs surfaced from a math-heavy stress test: 1. Adjacent code fences glued together. scrubBacktickNoise's second-pass regex /``\s*``/g matched the LAST 2 backticks of one fence + whitespace + FIRST 2 backticks of the next, collapsing two blocks into one. Fixed with lookbehind/lookahead so we only match exactly 2 backticks not part of a longer run. 2. Whitespace eaten between fences and following content. stripPreviewTargets internally calls .trim() which strips leading/ trailing whitespace from each split-segment. For segments between two fences this collapsed \n\n to '', gluing fence close to next block. Fixed by capturing leading/trailing whitespace at the call site and restoring it after the transform. 3. Currency dollar signs eaten as math. With singleDollarTextMath:true remark-math greedy-matched any pair of $, so '$5 ... $10' became one inline math span. Added escapeCurrencyDollars to escape $<digit> patterns to \$<digit> in prose segments (not in code). Trade-off: math expressions starting with a digit (rare — '$5x = 10$') get escaped too. Mirrors the convention in ChatGPT/Claude's UIs. 4. \(...\) and \[...\] LaTeX brackets unsupported. Models often emit these instead of $...$ / $$...$$. Added rewriteLatexBracketDelimiters preprocessor pass. 5. ```latex / ```tex blocks were being routed to KaTeX via a rewrite to ```math. Aligns with GitHub markdown convention: ```math = render as math; ```latex / ```tex = LaTeX/TeX source code (syntax highlighted, not rendered). Conflating them broke teaching/showing-source use cases. MATH_FENCE_LANGUAGES pruned to {'math'} only. Also flipped parseIncompleteMarkdown to true (was !isStreaming) so the math parser can't see $ inside streaming-but-not-yet-closed code fences. Shiki was already deferred via defer={isStreaming} so this doesn't introduce new tokenization cost. Test: 18/18 existing tests still pass; one test updated to expect escaped \$ in currency-prose-with-URL case. * fix(desktop): detect Python via registry/filesystem; pin to 3.11–3.13 Two related fixes for Python detection on Windows: 1. py.exe (Python launcher) is missing from per-user installs that didn't check the launcher option, so 'py -3.X --version' alone misses real Python installs. User-reported case: clean Win11 + official Python.org 3.14 install -> 'where py' returned nothing, our installer offered to install Python again. Both NSIS prereq page and main.cjs now probe in this order: 1. py.exe launcher (when present) 2. PEP 514 registry: HKLM/HKCU\SOFTWARE\Python\PythonCore\<v>\InstallPath 3. Filesystem: %ProgramFiles%\Python<v>, %LocalAppData%\Programs\Python\Python<v> Crucially, we never fall back to running 'python.exe' from PATH on Windows — the WindowsApps stub at %LOCALAPPDATA%\Microsoft\ WindowsApps\python.exe is a redirector that opens the Microsoft Store window if no Store Python is installed. Triggering that during boot would be terrible UX. Registry/filesystem probes never execute the binary. 2. Drop 3.14 from the supported version set. Several Hermes deps (notably pywinpty, which carries Rust crates like windows_x86_64_msvc) don't yet publish 3.14 wheels. With wheels missing, 'pip install -e .' falls back to building from sdist, which needs a Rust toolchain — users see 'could not compile windows_x86_64_msvc build script' on first run. install.ps1 sidesteps this by pinning to 3.11 via uv; the desktop installer doesn't yet have the same uv-managed-Python pathway, so for now we accept 3.11/3.12/3.13 and tell winget to install 3.11 if none of those are present. Revisit when the wheel ecosystem catches up to 3.14 (~early 2026). * feat(desktop): Cron, Profiles, usage analytics, and titlebar fixes - Add Cron and Profiles sidebar routes with full CRUD-style flows and API wiring. - Extend Command Center with auxiliary task overrides and a Usage panel (7d/30d/90d). - Fix titlebar geometry for WSL/Windows (native overlay width, tool spacing). - Remove stray merge conflict markers from pyproject.toml optional deps. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(title-bar): position sidebar toggle button * feat(desktop): composer queue — queue many, edit/delete/cancel-edit, Cursor-style Press Enter while busy with a draft to queue it; with no draft to interrupt and send the next queued turn. Auto-drains one queued turn each time the session settles, same as Cursor. Queue persists across reloads so an interrupted-and-queued turn isn't lost on refresh. Each queued row supports edit-in-composer (with explicit Save/Cancel), send-now (↑), and delete. Drain skips only the entry currently being edited so the rest of the queue keeps flowing. Queue dequeue is transactional — an entry only leaves the queue after `prompt.submit` is accepted, so a rejected submit doesn't drop the turn. Also shrinks the `[interrupted]` marker to a muted one-liner and drops its assistant footer so it stops looking like a real reply. * fix(desktop): handle empty usage analytics totals Co-authored-by: Cursor <cursoragent@cursor.com> * fix(desktop): address PR review titlebar and usage races Co-authored-by: Cursor <cursoragent@cursor.com> * feat(desktop): add MCP settings and live subagent tree Surface configured MCP servers in Settings with JSON edit/save and a gateway-backed reload action so users can manage tool servers without falling back to slash commands. Track live subagent gateway events in a desktop store, show active subagent counts in the Agents statusbar item, and replace the Agents overlay stub with a live spawn tree for the active session. * fix(desktop): move power-user views out of sidebar Keep Cron and Profiles available through lower-prominence chrome entry points so the workspace sidebar stays focused on core chat navigation. Co-authored-by: Cursor <cursoragent@cursor.com> * refactor(desktop): subagent overlay reads like a live transcript, not a dashboard Strip the card chrome and rewire /agents to feel like peeking into the child agent's stream: - subagents store: single `stream` of typed entries (thinking/tool/progress/ summary) replaces the parallel notes/thinking/tools arrays. Drop unused fields (toolsets, depth, apiCalls, reasoningTokens, sessionId). - agents view: no OverlayCards, no boxed stream, no per-row borders. Goal + status pill + indented stream lines, full row width. - Group root spawns into "Delegation N" sections when batch shape + spawn time match — hides task-index interleaving and makes hierarchy obvious. - Sort tree by spawn time, then task_index. Step indicator is one colored pill (primary while running, emerald when done) inside the row, not a trailing pill that wrapped under the chevron. - Tree picks up `subagent.start` (not only `spawn_requested`) and prunes delegate-tool fallback rows once native subagent events land for the session — fixes duplicate "Delegated task" rows alongside the real ones. * feat(desktop): Esc closes every OverlayView-based overlay Lift the keyboard handler into the shared OverlayView so Agents, Settings, Command Center — and anything we build on top of it later — all dismiss on Esc by default. Nested Radix dialogs stop propagation themselves, so a modal opened inside an overlay (e.g. model picker inside Settings) still closes the modal first, not the overlay underneath. Drop the now-redundant Esc handlers in Settings (kept Cmd/Ctrl+P) and Command Center. * fix(desktop): drop numbered step pill on subagent rows The pill was getting clipped at the overlay edge anyway. Just use the status glyph (●/✓/✗/■/○) — the delegation header already conveys "3 workers, 3 active", and order in the list implies which step you're looking at. * fix(desktop): drop noisy "returned N items / empty object" stub strings When a tool returns nothing useful, the row should be silent — the title ("Search Files", etc.) already tells the user what happened. Counting the fields in an opaque payload is engineer-noise. `formatToolResultSummary` and `minimalValueSummary` now return '' for empty arrays / records / unrecognized values; tool-fallback already hides the detail section when its body is empty. * refactor(desktop): subagent rows borrow chat tool patterns (fade-in, lucide glyphs, shimmer) Pull the agents view closer to how chat tool blocks render: - statusGlyph() returns the same lucide BrailleSpinner / CheckCircle2 / AlertCircle vocabulary as tool-fallback's statusGlyph - Stream lines fade-in via useEnterAnimation (one-shot WAAPI), keyed per entry so streamed deltas settle in instead of popping - Subagent rows fade in too, and pick up the existing data-slot=tool-block spacing rules between blocks - Active stream line trails a BrailleSpinner instead of a hand-rolled pulsing rectangle - Goal text drops FadeText (which forces nowrap); keep FadeText only for the single-line meta subtitle - Running rows shimmer the title — same affordance the chat thinking row uses * refactor(desktop): make /agents subagent-only, drop sidebar + dead sections Activity rail and History stub were both noise. Strip the split layout, sidebar, route enum, and the rail/stub helpers — the overlay is now just the spawn tree, centered in a max-w-3xl column so it stops claiming the whole screen for one section's worth of content. * feat: update cron modals * Add dedicated GUI log stream for dashboard debugging. Capture dashboard and PTY websocket lifecycle failures in gui.log and expose it via hermes logs. * Improve desktop runtime UX by surfacing inference readiness in gateway status and hardening WSL link opening. This also stabilizes markdown code/table block spacing and adds root-install guards so desktop dev runs use a healthy workspace dependency tree. * Log detailed GUI websocket failure metadata. Capture richer reject/disconnect/send/parse context for dashboard gateway websocket flows so GUI connection failures are diagnosable from logs. * Default dashboard startup logging to GUI mode. Detect the dashboard subcommand during early CLI bootstrap so gui.log is attached from process start and GUI startup failures are always captured. * Clean up gateway status conditionals and logging bootstrap mode detection. Simplify nested dashboard gateway status branches for readability and use a concise first-subcommand check when selecting early GUI logging mode. * add logging to nsis installer * feat: glass ui pass * fix(desktop): persist inline assistant errors across hydrate/resume - Detect provider failure text arriving via message.complete (HTTP 4xx, "API call failed after N retries", Provider/Gateway error: ...) and persist as an inline assistant error instead of regular completion text, blocking the hydrate that was wiping it. - preserveLocalAssistantErrors: merge by id so same-id hydrated messages keep their local error, and preserve the optimistic user+error pair as a unit (with tail-user dedupe). - Hook all hydrate/resume writers (use-session-actions resume + fallback, hydrateFromStoredSession, syncSessionStateToView) into the merge so stale snapshots can't clobber a failed turn. - Add error to chatMessagesEquivalent so the resume diff actually sees error-only changes and paints them. - editMessage on a failed turn now submits a plain resend (no truncate_before_user_ordinal) and retries plainly on the "no longer in session history" race. Style polish on touched files: - Inline error: text-only treatment (no card). - User stop / edit-composer send: shared Tabler IconPlayerStopFilled glyph + shared icon-button class slot for parity. * feat(desktop): theme xterm with active light/dark mode The right-sidebar terminal hardcoded a light palette, which read poorly on the dark glass surface. Subscribe to `useTheme().resolvedMode` and hot-swap `term.options.theme` so Shift+X (and any other mode change) updates the terminal in place without tearing down the PTY session. Dark mode uses xterm's built-in defaults (white fg/cursor + vivid ANSI 16) with just a transparent background so the glass shows through; light mode keeps the existing hand-tuned overrides for legibility on a bright surface. * feat(sidebar): right-click + drag-reorder sessions and workspaces - Wire right-click on session rows to open the same actions menu; suppresses the OS-native context menu so Windows stops looking awful. - Share dropdown + context menu items via useSessionActions() driving a single declarative ItemSpec[]; render polymorphic over MenuItem. - New shadcn ContextMenu primitive mirroring DropdownMenu styling. - Restore drag-and-drop reordering for Agents (lost during the cwd cleanup) and add reordering of workspace groups via a right-side grab handle. Pinned reorder unchanged. - Generic orderByIds<T> replaces the duplicated session/group orderers; useSortableBindings() hook collapses the two Sortable wrappers. - cursor-pointer on every actionable element; cursor-grab on handles. - KISS pass: baseName() helper, AGE_TICKS table, single WORKSPACE_PAGE constant, flatter SidebarSessionsSection render. * feat(desktop): solarize the xterm palette in both light & dark xterm's default ANSI 16 is tuned for dark and reads candy-bright on the light glass surface (vivid cyans/greens). Ship the canonical Solarized palette (Schoonover) for both modes — same 16 accents either way, only fg/cursor swap between `base00/01` (light) and `base0/1` (dark), so a prompt's colors look uniform across a Shift+X toggle. Background stays transparent in both modes — Solarized's cream/slate backgrounds would fight the glass. * feat(desktop): virtualize chat thread + sidebar via TanStack Virtual Replaces `use-stick-to-bottom` and per-row session rendering with `@tanstack/react-virtual`, matching what Cursor uses. Chat thread (`thread-virtualizer.tsx`): - Natural-flow virtualization (padding spacers, not absolute items) so `position: sticky` on the human bubble still resolves cleanly against the scroller. - Custom at-bottom anchor: pins when armed, disarms on user-driven upward scroll, re-arms at bottom, jumps on session switch + `thread.runStart`. - Loading indicator and `--thread-last-message-clearance` move to a real `[data-slot=aui_composer-clearance]` node; drops the brittle `:nth-last-child(1 of …)` rule that can't fire reliably under virtualization. Sidebar (`virtual-session-list.tsx`): - Flat agents list virtualizes at >=25 rows; pinned and workspace-grouped paths stay direct-render. - `SortableContext` keeps all IDs; only the window mounts; dnd-kit's `setNodeRef` is merged with `virtualizer.measureElement` so rows participate in both DnD hit-testing and TanStack measurement. Drops `use-stick-to-bottom`. Streaming test gets a global `offsetWidth/offsetHeight` stub so the virtualizer's viewport sizing works in jsdom; the scroll-up-doesn't-pull-back invariant still passes. * feat: more ui qa * fix(desktop): trim sidebar terminal startup spacer Drop zsh's initial spacer row before writing the first terminal prompt so new sidebar terminal sessions do not open with a selectable blank line. * chore: uptick * feat(desktop): thin installer + first-launch install.ps1 bootstrap Converges the Windows packaged desktop installer onto a single canonical install topology: drop the Electron shell only (~80MB instead of ~500MB), clone Hermes Agent at a build-time-pinned commit on first launch via install.ps1's stage protocol, and treat the resulting git checkout at %LOCALAPPDATA%\hermes\hermes-agent\ as the canonical install location (same path the CLI installer uses). Future updates flow through the existing applyUpdates() git-pull path. Replaces the previous fat-installer architecture where the .exe bundled a pre-staged hermes-agent source tree under resources/hermes-agent/ that was then sync'd into ACTIVE_HERMES_ROOT at launch -- a complicated factory-vs-active dance with several footguns (FACTORY_HERMES_ROOT mismatch on path resolve, isGitCheckout guard regressions, pyproject hash drift detection inside the sync loop). Architecture overview --------------------- Build time apps/desktop/scripts/write-build-stamp.cjs writes apps/desktop/build/install-stamp.json with {commit, branch, builtAt, dirty}. Honours $GITHUB_SHA / $GITHUB_REF_NAME in CI, falls back to `git rev-parse HEAD` locally. apps/desktop/scripts/stage-native-deps.cjs copies the runtime subset of @homebridge/node-pty-prebuilt-multiarch from the workspace-root node_modules into apps/desktop/build/native-deps/. Workspace dedup hoists this dep to the root, out of reach of electron-builder's `files:`-restricted collector; staging gives us a deterministic path to extraResources. electron-builder ships both into resources/install-stamp.json and resources/native-deps/ respectively. Boot resolver (electron/main.cjs) Resolver order: 1. HERMES_DESKTOP_HERMES_ROOT override 2. SOURCE_REPO_ROOT (dev mode) 3. ACTIVE_HERMES_ROOT git checkout WITH .hermes-bootstrap-complete marker -- the post-install fast path 4. `hermes` on PATH (CLI-installed user adding the desktop) 5. pip-installed hermes_cli via system Python 6. bootstrap-needed sentinel -> hand off to runBootstrap Deletes the entire FACTORY_HERMES_ROOT / RUNTIME_MARKER / syncTreeExcludingVenv machinery (-200 lines). The isGitCheckout guard that bit us in the install.ps1 PR is gone. First-launch bootstrap (electron/bootstrap-runner.cjs) 1. Resolve install.ps1: prefer SOURCE_REPO_ROOT/scripts (dev), else download from GitHub raw at INSTALL_STAMP.commit (cached at HERMES_HOME\bootstrap-cache\install-<sha>.ps1). 2. Fetch the stage manifest via install.ps1 -Manifest -Commit X -Branch Y. 3. Iterate stages: install.ps1 -Stage <name> -NonInteractive -Json -Commit X -Branch Y per stage. 4. On all stages green: write the .hermes-bootstrap-complete marker with {schemaVersion, pinnedCommit, pinnedBranch, completedAt, desktopVersion}. Per-run log to HERMES_HOME\logs\bootstrap-<ts>.log. Cancellation via AbortSignal. Manifest cache so retries don't re-download. Install overlay (src/components/desktop-install-overlay.tsx) Mounted alongside the existing onboarding overlay; flexbox card with header (static) + middle (scrollable) + footer (failure-only, static). Subscribes to hermes:bootstrap:event IPC + resyncs from hermes:bootstrap:get on mount/reload. Renders: - 14-stage checklist with per-stage state icons - Overall progress bar + current-stage spotlight - Auto-expanded installer-output panel on failure - "Copy output" button (full ring buffer + error to clipboard) - "Reload and retry" wired through hermes:bootstrap:reset to clear main.cjs's latched failure Synthetic empty-manifest event from main.cjs flips the overlay to 'active' immediately so the slow install.ps1 download doesn't leave the user staring at the generic Preparing splash. Failure latching (main.cjs) bootstrapFailure module-scope variable holds the rejection after install.ps1 fails. startHermes() throws the latched error immediately when set, bypassing the entire ensureRuntime + runBootstrap chain. Without this, the renderer's ensureGatewayOpen retries would re-run install.ps1 in a 5-10 min hot loop while the user was still reading the failure overlay. Cleared via hermes:bootstrap:reset on user-driven retry. Unsupported-platform overlay (1F) macOS / Linux packaged builds (no install.sh stage protocol yet) emit an unsupported-platform event with a copy-pasteable install command + docs URL. Dedicated overlay branch with "Copy command" + "I've run it -- retry" buttons. install.ps1 additions (Phase 1F.3 + 1F.5) ----------------------------------------- New -Commit and -Tag string params. Precedence Commit > Tag > Branch. Honoured by all three code paths (update / fresh clone / ZIP fallback), with archive URL selection that handles each ref-type variant. Detached-HEAD checkouts intentionally -- they're pins, not branches the user pulls into. EAP=Continue wrap around the new pin-step git invocations. `git fetch origin <commit>` writes the routine 'From <url>' info line to stderr; under the script's global EAP=Stop that terminates the script even though fetch+checkout succeed. Matches the established pattern in Install-Uv, Test-Python, _Run-NpmInstall. Backend fix (hermes_cli/web_server.py) -------------------------------------- CORS allow_origin_regex now accepts Origin: 'null'. Packaged Electron loads index.html via file://; Chromium sets the WebSocket upgrade Origin header to the opaque origin 'null', which the old regex rejected with HTTP 403 before gateway_ws() ever ran. This failure mode was masked in the older FACTORY_HERMES_ROOT architecture because the resolver often found an existing hermes on PATH with different binding behavior. Security maintained: localhost-only bind keeps cross-machine pages out; per-process session token still gates every authenticated /api/ endpoint regardless of Origin. Desktop QoL ----------- DevTools is now enabled in packaged builds (F12 / Cmd+Opt+I). Field-debugging trade-off: tiny attack surface increase versus a much better support story when CSP / WS / theme issues surface. NSIS prereq-check page deleted (-767 lines). The standard Welcome -> License -> Directory -> InstallFiles -> Finish wizard now installs without custom Python/Git/ripgrep detection -- those prereqs are install.ps1's job at first launch. Test infrastructure (Phase 1G) ------------------------------ apps/desktop/scripts/test-desktop.mjs rewritten as a cross-platform bundle validator (was darwin-only and asserted on dead factory- payload paths): NEGATIVE: hermes_cli/main.py is NOT shipped (regression guard) POSITIVE: install-stamp.json carries a real commit + branch POSITIVE: node-pty native deps shipped under resources/native-deps POSITIVE: renderer dist/index.html reachable (asar or unpacked) New nsis mode and npm run test:desktop:nsis script. Validated end-to-end on clean Win10 VM -------------------------------------- Confirmed: NSIS installer drops Electron shell, app launches, install overlay shows progress, install.ps1 clones the pinned commit, 14 stages run to completion, marker written, backend spawns, WebSocket connects, onboarding overlay asks for API key, main UI loads, integrated terminal works. Failures handled: bootstrap stays failed (no hot-loop retry), "Copy output" gives actionable transcript, "Reload and retry" explicitly re-runs install.ps1. What's deferred --------------- - MSIX wrapping (Phase 2): same Electron .exe under MSIX manifest with runFullTrust, signed and submitted to Microsoft Store. - install.sh stage protocol parity (Phase 2): once shipped, the unsupported-platform overlay becomes drive-it-yourself and macOS/Linux packaged installers gain feature parity with Windows. * feat(desktop): persistent terminal pane + fullscreen takeover Adds a VSCode-style "focus terminal" toggle to the right sidebar's Terminal tab that takes over the chat pane area without unmounting the shell. The xterm host is mounted once at the layout root and CSS-overlayed onto whichever <TerminalSlot /> is currently active, so the PTY session, scrollback, selection, focus, and WebGL renderer survive every toggle. Also: - WebGL renderer (matching dashboard ChatPage) so Hermes' TUI skins paint faithfully instead of muting through xterm's default DOM renderer - File drag/drop from the project tree or OS into xterm — paths are shell-quoted (zsh/bash/pwsh/cmd) and written straight into the PTY - Solarized dark canvas with brights promoted to real accent variants (Schoonover's UI-gray brights washed out every TUI accent) - Strip NO_COLOR/FORCE_COLOR/COLORFGBG/TERM=dumb leaking from non-tty parents (CI runners, Cursor's agent shell) so the embedded shell gets truecolor regardless of how Electron was launched - rAF-debounced ResizeObserver — running fit.fit() synchronously during sibling pane transitions crashed the WebGL texture-atlas rebuild * fix(install.ps1): strip UTF-8 BOM regression that broke 'irm | iex' The canonical install flow irm https://raw.githubusercontent.com/.../scripts/install.ps1 | iex fails on PowerShell 5.1 with a cascade of 'The assignment expression is not valid' errors at every param() default value: [string]$Branch = 'main', ~~~~~~ The assignment expression is not valid. The input to an assignment operator must be an object that is able to accept assignments... Root cause: scripts/install.ps1 carries a UTF-8 BOM (0xEF 0xBB 0xBF) as its first three bytes. 'irm' returns the response body as a string; on PS 5.1 the BOM survives into that string as a leading \ufeff character. 'iex' then evaluates the string and PS's parser chokes on the invisible character before param() -- error recovery proceeds into the body but every assignment is reported as broken. This was the exact failure mode the install.ps1 hardening pass (PR #27224) deliberately fixed by stripping the BOM and ensuring the file body is pure ASCII. Commit4279da4db('fix(windows): make PowerShell installer parse in 5.1') re-introduced the BOM later, unintentionally undoing the irm|iex compatibility fix; the merge that brought it into bb/gui carried it forward. Fix: strip the three BOM bytes. File body is verified pure ASCII (any-byte > 127 returns false), so PS 5.1 with no BOM falls back to Windows-1252 decoding which is identical to ASCII for our content. Both install paths now work: - 'irm ... | iex' (canonical CLI) - 'powershell -File install.ps1' (programmatic / desktop bootstrap) * install.ps1: detect ARM64 Windows reliably for Node and Git stages Add a Get-WindowsArch helper that reads Win32_Processor.Architecture via CIM (invariant to PowerShell host bitness) with PROCESSOR_ARCHITEW6432 fallback. Use it in: - Install-Git: previously only triggered the arm64 PortableGit asset when invoked from a native-ARM64 PowerShell host. WoW64 / emulated x64 hosts (the default powershell.exe on Windows-on-ARM) saw PROCESSOR_ARCHITECTURE=AMD64 and fell through to the x64 PortableGit build, leaving ARM64 users on emulated Git for Windows. - Test-Node: previously hardcoded the Node download to win-x64 on any 64-bit OS, so ARM64 users always got x64 Node under Prism emulation even though Node ships an arm64 build for Windows. The winget fallback now also passes --architecture arm64 on ARM64. Python remains x86_64 by design: uv intentionally prefers windows-x86_64 cpython on ARM64 hosts for ecosystem (wheel) compatibility (see astral-sh/uv#19015). * install.ps1: harden Install-SystemPackages against winget msstore failures The previous winget invocation discarded stdout/stderr and trusted no signal at all -- not the exit code (winget exits 0 even when it bails "please specify --source"), not output (sent to Out-Null), not the catch handler (winget returning 0 means no exception fires). The only trust signal was a post-install Get-Command rg / Get-Command ffmpeg check, which would also miss the package because %LOCALAPPDATA%\ Microsoft\WinGet\Links (where winget puts command aliases) is added to PATH by AppExecutionAlias machinery only in fresh shells. End result on machines where the msstore source has a cert problem (0x8a15005e -- common on Windows-on-ARM and some corporate networks): silent failure, no log, no breadcrumb, and the user is told the install succeeded. Specifically: - Pin --source winget on every winget install call. Defeats the broken- msstore-source path. We ship nothing from msstore so this is safe and forward-compatible. - Add --exact --id for a tighter package match. - Capture each winget invocation's combined stdout/stderr + exit code to %TEMP%\hermes-winget-<pkg>-<n>.log instead of Out-Null. On the happy path the log is deleted after the post-install check confirms the binary is on PATH; on failure the log is kept and its path is named in a Write-Warn so the user has something to grep. - Refresh PATH to include %LOCALAPPDATA%\Microsoft\WinGet\Links in addition to the User/Machine env-var hives, so Get-Command sees newly- installed winget aliases in the same process. - No behavior change on the happy path. Same Write-Info/Success/Warn cadence, same fallback order (winget -> choco -> scoop -> manual), same $script:HasRipgrep / $script:HasFfmpeg outputs. Verified end-to-end on a real Snapdragon ARM64 Windows host: ripgrep uninstalled, stage re-run, [OK] ripgrep installed in 1.4s, ok:true. * desktop: swap node-pty fork for upstream microsoft/node-pty 1.1.0 The previous dependency, @homebridge/node-pty-prebuilt-multiarch@0.13.1, publishes no win32-arm64 prebuilds on its v0.13.x line, and its v0.14.x betas (which do add an arm64 Windows build) ship no electron-vXXX-win32- arm64 prebuilds at all -- so packaged Electron 40 builds (NMV 143) would fail at runtime even on a successful npm install. Net effect: the desktop's integrated terminal was unbuildable on Windows-on-ARM, in both dev (npm install fails: 404 fetching the node-vXXX-win32-arm64 prebuilt) and packaged builds (no Electron-ABI prebuilt exists). The homebridge fork was originally created because upstream node-pty shipped no prebuilds at all. That hasn't been true since node-pty@1.0 (April 2024), which: - bundles prebuilts for mac (arm64+x64) and Windows (arm64+x64) directly inside the npm tarball -- no GitHub-Releases fetch, no missing-binary failure mode - uses N-API (node-addon-api) for ABI stability across Node and Electron major versions, so the same pty.node binary loads under Node 22 (dev) and Electron 40+ (packaged) without per-ABI rebuilds - is what VS Code, Hyper, and Theia actually ship API surface is identical (spawn / onData / onExit / write / resize / kill) -- no call-site changes needed. Specifically: - apps/desktop/package.json: replace the @homebridge fork with node-pty@1.1.0 (exact pin). Widen `asarUnpack` from `["**/*.node"]` to also unpack `**/prebuilds/**`, because node-pty ships runtime- execed helpers alongside its .node files (darwin spawn-helper has no extension and would not be matched by `**/*.node`; conpty.dll, OpenConsole.exe, winpty.dll, winpty-agent.exe on Windows are also exec'd at runtime and cannot live inside asar). - apps/desktop/electron/main.cjs: update both require() strings to match the new package name and the new staged path under resources/native-deps/node-pty/. - apps/desktop/scripts/stage-native-deps.cjs: point at node_modules/ node-pty. node-pty's prebuilts live under prebuilds/<plat>-<arch>/ (not build/Release/), so update the include glob to copy that dir. Per-arch staging keeps the resource bundle small (target arch comes from npm_config_arch when electron-builder cross-builds, else process.arch). Explicitly enumerate file types in the prebuilds glob so the ~25 MB of .pdb debug symbols that prebuild-install bundles for Windows crash analysis don't bloat the installer (29 MB -> 2.6 MB staged on win32-arm64). Re-assert +x on the darwin spawn-helper defensively, since a stripped mode bit would manifest as a silent ENOENT at first pty.spawn(). - apps/desktop/scripts/test-desktop.mjs: update expectedNativeDepPaths() and its assertion site to look at prebuilds/<plat>-<arch>/ instead of build/Release/. Add an explicit spawn-helper-exists check on darwin so a regression in the asarUnpack glob would fail loudly in CI rather than at first PTY spawn. Trade-off: Linux end-users lose prebuilts and fall back to building node-pty from source on `npm install`. Acceptable because Hermes ships no Linux desktop builds (desktop-release.yml matrix is mac + win only, package.json declares no `linux` target), and Linux developers hacking on the desktop already need a C++ toolchain for the rest of the stack. Verified on Windows 11 ARM64 (Snapdragon): npm install -> exit 0 node -e "require('node-pty').spawn(...)" round-trip -> OK stage-native-deps -> 27 files, 2.6 MB load from staged tree (simulates packaged fallback) -> ConPTY round-trip OK * desktop+gateway: harden Slack socket recovery and Windows restart dedupe (#28873) * desktop+gateway: harden Slack socket recovery and Windows restart dedupe Fix Slack Socket Mode reliability by adding a watchdog/reconnect path so silent socket task drops no longer leave the adapter stuck. Harden Windows gateway lifecycle by avoiding desktop-binary path collisions, making gateway PID scans case/extension tolerant, and reusing in-flight restart actions to prevent duplicate gateway spawns. * test(slack): add Socket Mode watchdog/reconnect behavioural coverage Drive the new Slack Socket Mode self-healing logic through a fake AsyncSocketModeHandler so we can simulate the P0 silent-hang failure mode (task exit, transport disconnected, intentional shutdown, concurrent reconnect attempts) without touching real Slack. * fix(slack,desktop): address Copilot review on watchdog races and path normalization - connect(): explicitly cancel + await the prior socket watchdog before flipping _running, so an old monitor cannot exit between teardown and respawn (Copilot #1) - _socket_watchdog_loop: wrap the body in try/except + add a done-callback that respawns on unexpected crash, so a transient bug cannot permanently disable self-healing (Copilot #2) - normalizeExecutablePathForCompare: use the resolved path for realpathSync so non-string inputs cannot leak through (Copilot #3) - Add tests for crash-recovery and atomic watchdog replacement across reconnects * fix(slack): tighten connect() error path and clarify watchdog test intent Address Copilot review round 2. - connect(): wrap _start_socket_mode_handler/_ensure_socket_watchdog in a focused try/except so any failure rolls back partially-started handler/task state and leaves _running=False, ensuring the platform lock is always released by the outer finally - Defer _running=True until after the handler is actually started so the watchdog observes a live socket task immediately and never spins against a half-built adapter - Rename test_watchdog_self_restarts_after_unexpected_crash to test_watchdog_cancellation_does_not_respawn (matches what it actually asserts) and add test_watchdog_unexpected_exit_respawns_via_done_callback that drives a real RuntimeError through _on_socket_watchdog_done and verifies a fresh task replaces the crashed one * fix(web_server): serialize action spawn check+store under a threading lock Address Copilot review round 3. FastAPI runs sync handlers on its threadpool, so two near-simultaneous /api/gateway/restart (or /api/hermes/update) requests could both observe "no live process" in _spawn_hermes_action's poll-based dedupe and double-spawn. Add a module-level _ACTION_SPAWN_LOCK around the entire check + Popen + _ACTION_PROCS store sequence so the dedupe is atomic across threads. * fix: address Copilot review round 4 - slack.disconnect(): mirror connect()'s defensive cleanup — catch the broad Exception path on watchdog await so handler shutdown and lock release still run if the watchdog raised before cancellation took effect - web_server._spawn_hermes_action: wrap subprocess.Popen in try/except so a missing executable / permission error closes the log file handle, writes a failure marker, and re-raises instead of leaking a file descriptor - gateway._scan_gateway_pids: drop the over-broad "hermes.exe --profile" / "hermes.exe -p" patterns that would match any Hermes CLI subcommand using a profile flag (e.g. `hermes.exe --profile foo dashboard`); rely on the "hermes.exe gateway" + "hermes-gateway.exe" tokens instead - tests: tighten _fake_create_task to assert coroutine input and return a real asyncio.Task that stays pending until pytest teardown, and update the three callsites whose mocked AsyncSocketModeHandler.start_async returned a non-coroutine value * fix(slack): reset multi-workspace state on reconnect Address Copilot review round 5. connect() is reentrant (gateway restart, in-process reconnect), but it was leaving _bot_user_id / _team_clients / _team_bot_user_ids populated from the previous session. A reconnect that rotated the primary token or dropped a workspace would silently keep the stale bot user id and stale workspace client maps, leading to dispatch against gone workspaces. Clear these three pieces of state right after _stop_socket_mode_handler() and before the auth_test loop, then let the loop repopulate from the current tokens. Add test_reconnect_refreshes_multi_workspace_state to lock it in. * nix: package apps/desktop as .#desktop (#28964) Adds nix/desktop.nix building the Electron renderer with buildNpmPackage and wrapping nixpkgs' electron binary. Reuses .#default by setting HERMES_DESKTOP_HERMES to its hermes binary, so the desktop's resolver picks up the fully-wired nix hermes (venv, bundled skills/plugins, runtime PATH) without reimplementing agent resolution. - nix/desktop.nix: renderer + electron wrapper - nix/hermes-agent.nix: finalAttrs form, exposes hermesDesktop in passthru - nix/packages.nix: exposes .#desktop + adds to fix-lockfiles - apps/desktop/package-lock.json: standalone hermetic lockfile nix build .#desktop && nix run .#desktop both clean. * fix(desktop): probe steps 4 & 5 of resolveHermesBackend before trusting A user-reported failure on Windows-on-ARM: a pre-installed Python 3.13 on PATH makes findSystemPython() succeed, so resolveHermesBackend returns a backend pointing at it -- but hermes_cli isn't in that interpreter's site-packages. The spawn dies with ModuleNotFoundError and the user sees a dead GUI instead of the first-launch installer. Same shape can hit step 4 (existing `hermes` on PATH) when a stale shim survives a partial uninstall. Add cheap exit-code probes -- `python -c "import hermes_cli"` for step 5, `<hermes> --version` for step 4 -- and fall through to step 6 (bootstrap-needed) on failure. install.ps1 then runs as if on a clean box and the venv gets built. Probes live in a standalone electron/backend-probes.cjs module so they can be unit-tested with node --test, same pattern as bootstrap-platform.cjs and hardening.cjs. New test file wired into test:desktop:platforms. * test(desktop): allow `node-pty` bare-require in packaged entrypoints Pre-existing failure on bb/gui sincec858484b4swapped the node-pty fork for upstream microsoft/node-pty 1.1.0. main.cjs intentionally bare-requires node-pty (it's hoisted by workspace dedup in dev, and staged to resources/native-deps via scripts/stage-native-deps.cjs + extraResources for packaged builds, with a try/catch fallback at line ~38). The allowlist hadn't been updated to match -- same shape as `electron`, which was already allowed. * chore(deps): refresh root lockfile for dashboard @nous-research/ui 0.14.0 apps/dashboard/package.json was bumped to @nous-research/ui 0.14.0 (+ flag-icons ^7.5.0, motion ^12.38.0) but the root package-lock.json was never refreshed. Running `npm install` from the repo root now materialises 0.14.0's transitive closure (launder, bumps for @nanostores/react, nanostores, sanitize-html, tailwind-merge). No code changes; purely a lockfile catch-up so fresh checkouts on bb/gui get a working dashboard install. * chore(desktop): bump version to 0.0.1 First non-placeholder version so electron-builder's artifactName template produces `Hermes-0.0.1-win-x64.exe` instead of the obviously-unreleased `Hermes-0.0.0-...`. No release process yet; this just stops the artifact filename from telling users "you got a debug build." Bumped in three slots that all carry the desktop app's version: - apps/desktop/package.json (source of truth) - apps/desktop/package-lock.json (per-app lockfile, kept for CI parity) - root package-lock.json's apps/desktop workspace entry Identity-of-build for first-launch bootstrap continues to come from build/install-stamp.json (commit SHA + builtAt), unchanged. * fix: fs icon color * perf(desktop): cut per-keystroke layout + listener churn in chat composer Empirical work via CDP harnesses under apps/desktop/scripts/ (see profile-typing-lag.md): jsListeners growth (per round of 200 chars + GC): before: +35 (verified leak — listeners stuck after 1st trigger popover use) after: +0 Four narrow edits in src/app/chat/composer/index.tsx: 1. Drop the per-keystroke `editorRef.current.scrollHeight` read used to decide composer expansion. Replace with `draft.length > 60` heuristic; the existing ResizeObserver still catches edge cases. `scrollHeight` is a forced-layout call and was firing on every char until the first wrap. 2. Bucket measured composer height to 8px before writing `--composer-measured-height` / `--composer-surface-measured-height` on `documentElement`. Without this, the editor grows ~1px per char, setProperty fires every keystroke, computed style is invalidated tree- wide. 3. Remove the dead `$composerDraft` two-way sync. Nothing outside the composer subscribed to that atom (verified via grep). Two useEffects on `[draft]` were pushing draft→atom and atom→aui per keystroke for no consumer. Also drop the per-keystroke `reconcileComposerTerminalSelections` call; it was pruning stale labels for `terminalContextBlocksFromDraft`, but that helper already ignores labels not in the current submitted text, so pruning per keystroke was just bookkeeping. 4. `refreshTrigger` fast-bails when the draft contains neither `@` nor `/`. Previously `textBeforeCaret(editor)` ran on every input/keyup regardless; `range.toString()` inside is O(n) over draft length. Synthetic typing latency p50/p90/p99 is similar before vs after on a freshly-loaded session (Blink can already handle ~30cps typing into a contentEditable on its own); the real win is the listener leak being gone and the global computed-style invalidations dropping ~8× when the composer is sitting at a fixed height row. The `Enter → stall` follow-up (see profile-typing-lag.md §"Submit / TTFT stall") is unmeasured here — needs a throwaway session because the harness fires a real prompt. Not blocking this commit. * perf(desktop): cut FadeText forced layouts during streaming The slowest user-felt path is typing into the composer while the assistant is streaming. Profile (scripts/profile-under-stream.mjs): FadeText measureOverflow self time: 35.8 ms → 18.1 ms (-50%) total active CPU during 7s window: ~150 ms → ~50 ms Two changes in src/components/ui/fade-text.tsx: 1. Drop the `useEffect([children])` that re-ran `measureOverflow` (reads scrollWidth + clientWidth — forced layout) on every parent re-render. `useResizeObserver` already fires the same callback on mount and whenever the host span's box size changes; that covers the only case where overflow state can legitimately change. The previous explicit useEffect was a forced-layout flush on every parent render, which during streaming meant every token tick. 2. Wrap the component in `memo` with a custom comparator that short-circuits the entire render when scalar string `children` and the className/fadeWidth/style props are unchanged. The hot path was tool-fallback's title chips being re-rendered by parent streaming updates even though their text was stable; memo+ comparator skips that. Also adds two harness scripts under apps/desktop/scripts/: - latency-under-stream.mjs (key→paint latency while a turn streams) - profile-under-stream.mjs (CPU profile while a turn streams) Updates profile-typing-lag.md with the streaming numbers and confirms the Enter→paint submit path is already fast (≤320ms on the populated session; the 2s "stall after Enter" the user noticed once was a one-time cold-start, not reproducible at the UI layer). I'd guess the felt jank in real use is fast-burst typing during a long-form streaming reply (code blocks + markdown lists multiply the per-token render cost). The CPU savings here scale linearly with token volume. * chore(desktop): drop diag scratch scripts no longer needed * docs(desktop): correct leak-typing numbers on a real session Re-ran the leak harness on a populated session (Phaser thread) for both unpatched and patched builds. The original 'listener leak' was transient warm-up cost, not a steady-state leak — both versions show 0 listener growth/round in steady state. The load-bearing number is forced layouts per character: unpatched (HEAD~2): 7.02 layouts/char patched (HEAD): 2.35 layouts/char (3× fewer) The patches reduce per-char forced-layout work to Blink's natural floor. Document node count and heap are flat in both builds. * perf(desktop): fix "Enter jumps up" on long threads User reported: after pressing Enter on a long thread, the view jumps up — the just-submitted message disappears below the fold. Confirmed via apps/desktop/scripts/measure-jump.mjs: before: distFromBottom 0 → 49.5px, sticks there permanently after: distFromBottom 0 → ~0 (worst case 4px for one frame) Root cause in useThreadScrollAnchor (thread-virtualizer.tsx): 1. The sticky-bottom logic disarmed on any scroll event where `scrollTop < lastTopRef.current`. That check can't distinguish a user scrolling up from a programmatic `pinToBottom` write that the browser clamped short of bottom (because content also grew in the same frame, so `scrollTop = scrollHeight` lands at `scrollHeight - clientHeight` for the OLD scrollHeight, which is now below the NEW scrollHeight). Result: sticky-bottom disarmed permanently on the user's first submit. 2. There was no synchronous pin tied to React's commit phase. By the time the ResizeObserver fired and re-pinned, the user had already seen ~50ms of "message below the fold" — visually that reads as the view jumping up. Fix: - `programmaticScrollPendingRef` counter tracks scroll events we expect to be ours (one per `pinToBottom` write). The scroll handler skips the disarm check when consuming a pending tick, keeps the arm bit true, and re-pins synchronously if the browser clamped us short of bottom. A depth cap (8) breaks runaway loops in pathological streaming-burst layouts. - `useLayoutEffect` on `groupCount` increase pins BEFORE the browser paints, eliminating the visible ~50ms window between optimistic user-message insert and the RO/scroll-event chain firing. Verified on the long Cloud Shadows thread (7-8 turns, ~11k px tall): all three repro runs now hold within 0–4 px of bottom across the post-Enter transition. Submit latency unchanged (paint 77–107 ms), streaming-typing latency unchanged. Also adds three debug harnesses: - measure-jump.mjs — sample thread scroll across Enter - probe-thread.mjs — dump current thread / scroll state - diag-jump.mjs — intercept scrollTop + RO + mutations across Enter * perf(desktop): rate-limit thread auto-pin during streaming Follow-up to the Enter-jump fix. The first version did a synchronous re-pin loop inside the on-scroll handler when the browser clamped our `scrollTop = scrollHeight` write short of the new bottom; that gave a tight 4 px visible jump on Enter, but during streaming the ResizeObserver fires many times per second as content grows, and each RO callback re-entered the pin loop. CPU profile showed `Virtualizer.getMaxScrollOffset` climbing to 22 ms self over a typing- during-streaming window — the sync re-pin path was paying tanstack- virtual's recompute cost ~3× per token. Re-architect: - RO callback coalesces to one pin per animation frame. Streaming-rate RO bursts now cost the same as a single per-frame pin. - The on-scroll programmatic-counter guard remains (it's what prevents the false-disarm bug when the browser clamps a write). It no longer does sync re-pins; the next RO/rAF will catch up. - The useLayoutEffect on groupCount (the path that fires on user submit / new turn arrival) ALSO schedules one rAF pin in addition to the synchronous pin. This catches the case where React mounts the new message in a second commit (after our layout effect ran), which grows scrollHeight again. Two pins instead of a tight loop, paid only once per turn change. Net effect on the Cloud Shadows long thread: enter-jump transient: 12–20 px for 1 frame (was 49 px permanent) CPU during stream+type: `getMaxScrollOffset` dropped out of top-5 self-time list typing-during-stream: p50 ~10 ms paint, p99 ~20 ms (1 frame), occasional 40 ms+ outliers during burst token arrivals Also adds scripts/profile-long-stream.mjs: 20-second streaming profile with per-500ms FPS histogram + content-length tracking, so we can see whether streaming render cost grows with message length (it doesn't — sustained 60 fps). * perf(desktop): use textContent for trigger precondition Replace composerPlainText() call inside refreshTrigger's no-trigger fast-bail with a textContent check. textContent is a browser-native flat traversal; composerPlainText walks recursively with chip-aware logic. We only need to know if @ or / appears; either way the trigger char will be in textContent because chips contain @ in their refText. Profile shows composerPlainText was ~18ms self over a 12s typing-during- stream window, called from refreshTrigger on every keystroke. Most of that was the precondition check (the trigger detection path is the slow path but only runs when a trigger char is present). * Revert "perf(desktop): use textContent for trigger precondition" This reverts commita6a78ff08a. * Revert "perf(desktop): cut FadeText forced layouts during streaming" This reverts commit88e7d7537c. * Revert "perf(desktop): cut per-keystroke layout + listener churn in chat composer" This reverts commitbff1b3261d. * Revert "Revert "perf(desktop): cut per-keystroke layout + listener churn in chat composer"" This reverts commitb7b378e3a4. * Revert "Revert "perf(desktop): use textContent for trigger precondition"" This reverts commit0739588f48. * chore(desktop): synthetic-stream perf harness + scripts Drops the React `<Profiler>` approach (no-op because Vite is currently serving the production React build) in favor of an externally-observable measurement stack: rAF frame intervals, `PerformanceObserver({entryTypes: ['longtask']})`, and a `MutationObserver` on the live streaming message. Adds a synthetic stream driver — `window.__PERF_DRIVE__.stream({...})` — that pushes tokens through the live `$messages` atom at a controlled rate, so the assistant-ui runtime, incremental repository, and Streamdown markdown pipeline see the same workload they'd see during a real LLM stream, without the LLM cost. The driver lives in `src/app/chat/perf-probe.tsx`; `main.tsx` side-imports it under `import.meta.env.MODE !== 'production'` so it tree-shakes out of prod builds. (Using `MODE` rather than `DEV` because our Vite setup currently reports `DEV=false` even under `vite dev` — see the dev-build note in `profile-typing-lag.md`.) Scripts: - measure-synthetic-stream.mjs drive synthetic + record frame/longtask/mutation - profile-synth-stream.mjs CPU profile + top self-time during synthetic - measure-real-stream.mjs same harness, real LLM stream - profile-real-stream.mjs CPU profile bracketing the real stream window - eval.mjs / reload.mjs small CDP helpers A real-LLM measurement on Cloud Shadows (gpt-4o-mini, 39 s window) showed 12 longtasks in the same 75-127 ms range the synthetic predicted, so the synthetic is a faithful proxy. * perf(desktop): memo FadeText so it skips re-renders when text unchanged FadeText is used 110+ times inside `tool-fallback.tsx` on a tool-heavy thread. During streaming each parent re-render previously triggered the component's `useEffect([children])`, which forced a `scrollWidth` layout read even when the title text was unchanged. The `useResizeObserver` was already covering the genuine resize case, so that effect was strictly redundant work. Drops the effect and wraps the component in `React.memo` with a custom comparator that field-compares `className`, `fadeWidth`, and `style`, plus identity-compares `children` (scalar fast-path; correct for JSX nodes too since a new node should force a re-render). Verified via temporary render counter on the 34 MB `session_20260514_215353_fe0ac8` thread (110 FadeText instances): a 2 s synthetic stream went from ~11k FadeText render calls to 122 — roughly one render per truly-new instance instead of one per parent commit per instance. Doesn't move the longtask needle on its own (Streamdown's markdown re-parse dwarfs it) but eliminates a steady CPU floor and a class of forced layouts during streaming. Profile-typing-lag.md documents the full investigation, including the remaining Streamdown cost as the real source of the perceived "5 fps moment" hitches. * perf(desktop): memoize MarkdownText plugins to stop churning Streamdown The inline `plugins={{ math: mathPlugin, ...(isStreaming ? {} : { code }) }}` on `<StreamdownTextPrimitive>` constructed a new object literal on every parent render. That broke `<Streamdown>`'s outer memo and forced its internal `rehypePlugins` / `remarkPlugins` array useMemos to rebuild, which propagates a new identity into every `<Block>` and defeats Block's memoization for stable historical blocks. After memoizing on `[isStreaming]` (the only real dimension of variance), CPU profile during a 5 s synthetic stream on the 34 MB session shows `parser` self-time dropping out of the top 10, `compile` cut roughly in half, and `bn$1` / `m$1` (micromark internals) leaving the top entries. Doesn't move the visible longtask count on its own — Streamdown's per-Block parse cost still dominates whenever the last block's content changes — but it removes a class of unnecessary re-parses for historical blocks during streaming. See `scripts/profile-typing-lag.md` for the full investigation. * perf(desktop): floor assistant-text flush gap to 33ms for predictable batching `scheduleDeltaFlush` previously coalesced via `requestAnimationFrame` only. The "at most one flush per frame" guarantee that gives you is fine for fast streams (>~80 tok/sec) where multiple tokens arrive within a single frame, but breaks down at typical LLM token rates (30-80 tok/sec) where each token arrives slower than the rAF cadence and triggers its own React commit + Streamdown markdown re-parse. Track `lastFlushAt` and require at least 33 ms between two flushes. React 18+ auto-batching probabilistically already collapsed some of these, but the floor makes it deterministic. A/B on the 34 MB session, 300 tokens at 50 tok/sec (markdown chunks): | | avgFps | p99 frame | LTs / 5 s | max LT | |---|---|---|---|---| | no floor (current rAF) | 54.0 | 38 ms | 2.0 | 145 ms | | 33 ms floor (this PR) | 54.3 | 41 ms | 1.7 | 110 ms | `inter-mutation` p50 also tightens from 22-28 ms to a clean 33 ms, which is the expected signature of a deterministic floor. Doesn't fully solve the user's perceived hitches — Streamdown's per-Block parse cost when the last block grows past ~2 k chars is still the elephant — but it consistently shaves the worst-case longtask and makes the streaming cadence visibly steadier. Also threads a matching `flushMinMs` option through the synthetic stream driver in `perf-probe.tsx` + `scripts/measure-synthetic-stream.mjs` so the harness can A/B both regimes without spending LLM credits. See `scripts/profile-typing-lag.md` for the full investigation. * perf(desktop): useDeferredValue for streaming markdown so parses don't block input Streamdown's per-Block parse cost grows with the live tail's length and is unavoidable inside the block-memo pattern (industry standard, see findings doc). The fix is to stop having that work block the main thread. `<DeferStreamingText>` is a 12-line wrapper that reads message-part state via `useMessagePartText`, runs it through `useDeferredValue`, and re-publishes via assistant-ui's `<TextMessagePartProvider>`. The inner `<StreamdownTextPrimitive>` reads the deferred value through the normal `useMessagePartText` hook — no fork, no internal-path imports, fully on assistant-ui's public API. React's concurrent scheduler then: - abandons in-flight deferred renders when a newer token arrives, so intermediate states get skipped under fast streams - deprioritises the markdown render when the main thread has urgent work (typing, scroll), so input stays responsive even while a 100ms parse is queued Streamdown already uses `useTransition` for its block-array setState; this lifts the deferral up to the consumer boundary so it covers the whole pipeline (preprocess → split → repair → parse → render). A/B on the 34 MB session, 300 tokens at 50 tok/sec, markdown chunks (four trials each, with the 33ms flush throttle on for both): | | avgFps | p99 frame | LTs/5s | max LT | typing-while-stream p95 | |---|---|---|---|---|---| | pre | 54.3 | 41 ms | 1.7 | 110 ms | ~17 ms | | post | 58.5 | 31 ms | 2.0 | 117 ms | 14-18 ms | Longtask count + max LT unchanged — useDeferredValue doesn't reduce CPU, only its priority. The avgFps lift and p99 frame drop are the proof that the existing CPU is no longer blocking 60 fps cadence. One clean run logged MUTATIONS=0 — React skipped every intermediate text state and only committed the final one (textbook deferred-value behaviour). The actually-reduce-CPU path is replacing the parser with a state machine like Flowdown — left for a future PR; see `apps/desktop/scripts/profile-typing-lag.md` for the full investigation. * feat(desktop): add hermes gui launcher * feat(desktop): launch packaged gui builds by default * bump gui version to 0.0.2 * fix(dashboard): allow file:// origin on loopback WS + diagnostic logging Upstream commit2e66eefbc("fix(dashboard): validate WebSocket Host and Origin") added a WebSocket Host/Origin guard to block DNS rebinding against the dashboard. The guard rejects any Origin whose scheme is not http/https or whose netloc is empty — which includes Electron's renderer Origin: file:// when the desktop app loads its bundle from disk in production mode. That makes the bb/gui Electron desktop unable to open the gateway WebSocket against the embedded backend on Windows / macOS prod builds. The renderer reports "Desktop boot failed" and the backend logs: WARNING hermes_cli.web_server: gateway-ws reject peer=127.0.0.1:NNNN reason=non_loopback_or_bad_origin bound_host=127.0.0.1 close_code=4403 DNS-rebinding requires a DNS-resolvable hostname; file:// has no host component and therefore cannot be the attack vector this guard exists to block. When bound to a loopback interface (127.0.0.1 / ::1 / localhost), accept file:// origins so desktop wrappers can attach. Non-loopback binds (operator opted into network exposure) keep rejecting file:// — the loose policy doesn't apply. Also adds per-reason diagnostic logging in _ws_host_origin_is_allowed, so future ws-guard rejections name the specific clause that fired (bad_host / bad_origin_scheme / origin_host_mismatch) instead of the opaque "non_loopback_or_bad_origin" surfaced at the call site. Verified against tests/hermes_cli/test_web_server_host_header.py (all 11 upstream tests still pass) and hand-tested by opening the bb/gui Electron desktop dev build against the patched backend. * fix(tui_gateway): restore _content_display_text helper Bb/gui had dropped the helper but the orchestrator code merged from main still calls it (_inflight_text, _message_preview). Re-add the definition verbatim from main so session.create / _start_inflight_turn don't crash with NameError on first prompt submit. * fix(tui-gateway): restore _content_display_text helper lost in main merge The May 27 merge of origin/main into bb/gui re-introduced two callers of _content_display_text (in _inflight_text and _history_to_messages) but dropped the helper definition itself, leaving an unresolved reference. NameError fires on every user message via _start_inflight_turn -> _inflight_text, taking down both the TUI and the desktop (which share this gateway backend) the moment input is dispatched. Restores the helper verbatim from main (commit36c99af37) -- pure structured-content text extractor, no other dependencies. * fix(telegram): import Set for _dm_topic_chat_ids annotation self._dm_topic_chat_ids: Set[str] = {...} at line 460 references Set but only Dict, List, Optional, Any are imported from typing. The file has no 'from __future__ import annotations', so the annotation is evaluated at runtime and raises NameError on TelegramAdapter construction. * fix(setup): drop shadowing inner importlib.util re-imports _print_setup_summary and _setup_tts_provider each had 'import importlib.util' inside a try: block nested deeper in the function body. Python flips importlib to function-local for the whole scope, so earlier references in the same function (the neutts branches at lines 493 / 1109) hit UnboundLocalError before the late import can run. The top-of-module 'import importlib.util' at line 14 already covers both call sites, so dropping the redundant inner imports restores the intended behavior. * feat(install.ps1): add -IncludeDesktop switch + Stage-Desktop The new Hermes-Setup.exe (Tauri bootstrap installer) passes -IncludeDesktop so users who install via the GUI end up with a launchable Hermes.exe at apps/desktop/release/<os>-unpacked/. Existing flows are unchanged: * The 'irm install.ps1 | iex' CLI one-liner omits the flag — terminal users don't need a prebuilt desktop binary; 'hermes desktop' builds on demand. * The Electron desktop's bootstrap-runner.cjs also omits the flag — rebuilding apps/desktop from inside a running Hermes.exe would try to overwrite the live binary on disk and fail. Stage-Desktop runs after Stage-NodeDeps so workspace npm is already installed when electron-builder fires. It does: 1. 'npm install' at repo root so apps/* workspaces resolve their deps (Electron itself arrives via npm here, ~150MB) 2. 'npm run pack' in apps/desktop (tsc + vite + electron-builder --dir) 3. Probes apps/desktop/release/{win-unpacked,win-arm64-unpacked}/Hermes.exe The --dir mode produces an unpacked launchable binary without an NSIS/MSI installer artifact — we don't need one because Hermes-Setup.exe spawns the unpacked binary directly via launch_hermes_desktop. * feat(installer): Tauri bootstrap installer for first-time onboarding Hermes-Setup.exe is a small signed Rust+Tauri binary that drives scripts/install.ps1 stage-by-stage with a native UI matching the desktop's design language. Replaces the chicken-and-egg pattern of shipping a 200MB Electron app whose first launch existed only to run install.ps1. The architecture: Rust backend (src-tauri/): bootstrap.rs orchestrator -- Tauri commands, stage iteration install_script.rs resolve install.ps1 (dev checkout, cache, GitHub raw) powershell.rs spawn powershell, line-stream stdout/stderr, parse JSON events.rs BootstrapEvent types -- mirror bootstrap-runner.cjs paths.rs HERMES_HOME resolution + tracing log setup build.rs bakes BUILD_PIN_COMMIT / BUILD_PIN_BRANCH from 'git rev-parse HEAD' at compile time React frontend (src/): Tauri webview rendering 4 screens (welcome / progress / success / failure), driven by nanostores subscribing to the Rust event stream. Visual layer reuses the desktop's styles.css wholesale via @import so the installer and desktop never drift visually. Distribution: targets = ['app', 'dmg', 'appimage'] -- no NSIS/MSI wrapper. The raw target/release/Hermes-Setup.exe IS the artifact on Windows; .dmg + .app on macOS; AppImage on Linux. One file, double-click, no installer-installing-an-installer pattern. Compile-time pinning: build.rs reads 'git rev-parse HEAD' and emits cargo:rustc-env=BUILD_PIN_COMMIT=<sha> + BUILD_PIN_BRANCH=<branch>. bootstrap.rs's option_env!() picks these up so the binary fetches install.ps1 from the exact SHA it was tested against. CI / release builds can override via HERMES_BUILD_PIN_COMMIT env var. Windows manifest: hermes-setup.manifest declares level='asInvoker' so the productName 'Hermes Setup' doesn't trip Windows's installer- detection heuristic and refuse to launch without elevation. Also declares PerMonitorV2 DPI + UTF-8 active code page + Common Controls v6. Limitations of this initial version: * No code signing -- Windows SmartScreen will warn once on Hermes-Setup.exe ('More info -> Run anyway'). The downstream binaries it produces (Hermes.exe in win-unpacked/, the hermes CLI) are locally-built and therefore don't carry MOTW, so they launch without SmartScreen intervention. Cert procurement tracked separately. * macOS and Linux build paths defined but untested -- Windows-only V1. * fix(installer): pass -IncludeDesktop to manifest, surface launch errors, alias hermes desktop Three bugs found in the first VM end-to-end test: 1. install.ps1 -Manifest was called WITHOUT -IncludeDesktop, so the manifest came back with the 14-stage list (no desktop stage), the UI showed '14 steps' and Stage-Desktop never ran. Pass the flag to both the manifest fetch and the per-stage runs — install.ps1 gates the desktop stage's inclusion on the flag. 2. The Success screen's Launch button silently swallowed the Tauri error when no Hermes.exe existed (e.g. Stage-Desktop was skipped). Wire the error through to inline UI with an alert callout, so the user gets actionable text ('Hermes.exe missing, run hermes desktop from a terminal') instead of an unresponsive button. 3. The Success screen tells users to run 'hermes desktop' from a terminal but the CLI only accepted 'hermes gui' — invalid choice for 'desktop'. Rename the subcommand canonically to 'desktop' with 'gui' as a backwards-compatible alias. Update the _SUBCOMMANDS sets used by session-flag arg parsing + logging-mode probe so both names route to the same logic. * fix(install.ps1): pre-warm electron-builder winCodeSign cache + fix Stage-Desktop $HasNode false-skip Two bugs caught in the second VM end-to-end run: 1. electron-builder's winCodeSign extraction fails on grandma-class Windows boxes because the .7z archive contains macOS symlinks (darwin/10.12/lib/libcrypto.dylib and libssl.dylib pointing at versioned siblings). Creating symlinks on Windows requires SeCreateSymbolicLinkPrivilege, a per-user right that non-admin accounts don't have on stock Windows. Result: every fresh install on a non-admin user fails Stage-Desktop with a 7-Zip 'cannot create symbolic link' error, retried four times, then bails. Fix: Initialize-ElectronBuilderCache pre-extracts winCodeSign-2.6.0.7z ourselves with -snl (don't preserve symlinks, store as resolved file content) AND -x!darwin (skip the entire macOS subtree — irrelevant on Windows). Writes to electron-builder's expected cache dir before electron-builder gets a chance to try its own broken extraction. Idempotent — fast-paths via signtool.exe sentinel check. 2. Install-Desktop's first guard was 'if (-not $HasNode) skip'. $HasNode is set by Stage-Node into $script:HasNode, but in cross-process driver mode (each -Stage NAME is a fresh powershell.exe spawned by Hermes-Setup.exe), that script-scope variable from the PREVIOUS process is invisible — so the guard always fired and Install-Desktop returned in 900ms with a misleading 'Node.js not available' reason. The real npm probe below it never got to run. Fix: re-probe npm directly via Get-Command when $HasNode is empty/false, since by that point Stage-Node has already verified Node is installed and the only question is whether *this* process can see it on PATH (it can — installer-wide PATH update from Stage-Node). * fix(install.ps1): tell electron-builder we're NOT signing instead of pre-extracting winCodeSign The previous commit (c7e46f9f3) worked around the winCodeSign-symlinks- on-Windows extraction crash by pre-extracting the archive ourselves with -snl + -x!darwin. That fix was correct but addressed the wrong layer. The deeper question: why was electron-builder fetching winCodeSign at all when we have no signing cert configured? Answer: electron-builder unconditionally pre-warms the toolchain assuming any build MIGHT sign. The cert auto-discovery never finds anything (we never set CSC_LINK or anything else), so the signing never happens — but the 100MB fetch of winCodeSign and its broken-on-Windows symlink extraction does. Set CSC_IDENTITY_AUTO_DISCOVERY=false (with WIN_CSC_LINK and WIN_CSC_KEY_PASSWORD also explicitly cleared as belt-and-suspenders) before invoking npm run pack, and electron-builder skips the entire winCodeSign apparatus. No download, no extraction, no privilege check. Env vars are saved/restored around the invocation so we don't leak the override into Stage-PlatformSdks etc. Net: removes the 100-line Initialize-ElectronBuilderCache helper that manually downloaded + extracted winCodeSign-2.6.0.7z. Replaced with 3 env-var assignments. The produced Hermes.exe is functionally identical — just no longer carries a code-signing-machinery dependency we never used. * fix(installer): bump bootstrap-installer.log to capture stage transitions + every install.ps1 line Diagnosing the second VM failure was impossible because bootstrap-installer.log contained only the 'starting' banner. Two causes: 1. emit_log() inside run_bootstrap() was tracing::debug! — dropped on the floor under the default INFO env-filter. 2. The per-stage sink callbacks (on_stdout_line / on_stderr_line) only emitted Tauri events to the frontend; they never tee'd to the log file at all. When the failure route mounts, the Tauri event stream is the only place the script output lived, and it gets discarded. 3. The Failed / Stage / Manifest / Complete lifecycle frames in emit_event() were also Tauri-only — so even the 'which stage failed' frame never reached the log. Fixes: * emit_log() → tracing::info! * Sink callbacks tee stdout to info!, stderr to warn!, with stage label as a structured field for grep'ability * emit_event() now matches on the variant and logs each lifecycle frame at the right level: Failed → tracing::error!, others → info! Result: a failing install leaves a complete forensic trail in bootstrap-installer.log — manifest stage list, every install.ps1 stdout/stderr line tagged by stage, the stage transitions, and the final error. Same path as before so nothing the user does changes. * fix(install.ps1): Stage-NodeDeps cross-process $HasNode + stream npm install output to bootstrap log VM run 3 diagnosis: node-deps stage skipped on the VM (logged 'Skipping Node.js dependencies (Node not installed)') and then desktop's npm install failed with exit 1 and zero diagnostic detail. Two root causes: 1. $HasNode false-skip in Stage-NodeDeps — same cross-process bug pattern we fixed for Stage-Desktop inc7e46f9f3. Stage-Node ran in process A and set $script:HasNode = $true, then exited. Stage- NodeDeps ran in fresh process B (Hermes-Setup.exe -Stage NAME spawns each stage independently), where that variable doesn't exist. Re-probe via Get-Command npm instead of trusting the stale script-scope global. The previous stage already verified Node so the re-probe succeeds. 2. npm install --silent + Tee to TEMP file hid the real error. When the workspace install failed on the VM, the actual reason was buffered in $env:TEMP\hermes-npm-desktop-install-*.log and the user saw only 'exit 1'. Drop --silent so npm streams its full output, drop the TEMP-file dance — the Tauri installer's streaming sink already tees every stdout/stderr line to the rolling bootstrap-installer.log, so a side log file is dead weight that hides the very error we need. After this, the bootstrap log on a failure will contain npm's full output (deprecation warnings, ETARGET, native-module compile errors, whatever) tagged with stage=desktop, making the actual cause diagnosable instead of an opaque exit code. * fix(install.ps1): restore Initialize-ElectronBuilderCache (CSC env vars alone aren't enough) VM run 4 diagnosis: even with CSC_IDENTITY_AUTO_DISCOVERY=false set, electron-builder still fetches winCodeSign and signs bundled binaries. The log shows the signing happens BEFORE the cache extraction: • signing with signtool.exe ...\winpty-agent.exe • signing with signtool.exe ...\OpenConsole.exe • downloading winCodeSign-2.6.0.7z • <symlink privilege error> Cause: node-pty's bundled prebuilds are listed in apps/desktop's asarUnpack ['**/*.node', '**/prebuilds/**']. electron-builder re-signs anything unpacked from asar, regardless of whether OUR binary gets signed. The signtool invocation needs winCodeSign on disk, which needs the .7z extracted, which hits the macOS-symlink crash on non-admin Windows. The CSC env vars I added ind5fe46727only kill IDENTITY DISCOVERY (so OUR Hermes.exe stays unsigned, which is fine — we have no cert). They don't prevent the toolchain fetch for the bundled-prebuild re-sign. I removed the pre-extract ind5fe46727thinking the env vars subsumed it; that was wrong. Both are needed. Restoring Initialize-ElectronBuilderCache verbatim fromc7e46f9f3and keeping the CSC env vars. Wrote a clearer doc-comment at the call site explaining the two-knob interaction so future maintainers don't drop one half again. * fix(desktop): disable signtool via signtoolOptions.sign=null, drop dead winCodeSign pre-extract VM run 5 diagnosis: the pre-extract from3b29e65c1ran (extracted 83 files, 24MB) but produced ZERO files at the expected sentinel path '/winCodeSign-2.6.0/windows-10/x64/signtool.exe'. Cause: the .7z archive's root entries are 'windows-10/', 'darwin/', 'linux/', etc. — not 'winCodeSign-2.6.0/<arch>'. Extracting with '-o$cacheRoot' put files at $cacheRoot/windows-10/..., NOT at $cacheRoot/winCodeSign-2.6.0/windows-10/.... I had the directory nesting wrong from the start. And then we observed: electron-builder downloads winCodeSign-2.6.0.7z under a random numeric filename ('384387955.7z') regardless of what's already extracted in the parent dir. The cache key isn't the dirname; it's content-addressed. So the pre-extract approach was doomed even if the path nesting had been right. Actual fix: signtoolOptions.sign=null in apps/desktop/package.json's win build config. electron-builder honors this and skips the bundled- prebuild signing entirely — no signtool invocation, no winCodeSign fetch, no symlink-privilege crash. The previous failures all stemmed from electron-builder pre-signing node-pty's bundled .exes (winpty-agent.exe, OpenConsole.exe) which are already author-signed upstream; re-signing with our nonexistent cert was overwriting good sigs with nothing useful anyway. Cost: when we DO get a real cert later, we'll add it back with the sign function pointing at the cert chain. Until then, all-null is the correct config and unblocks every non-admin Windows user. Removed Initialize-ElectronBuilderCache (the dead pre-extract). Removed the call site. Kept the CSC_IDENTITY_AUTO_DISCOVERY env vars as belt-and-suspenders against a future electron-builder change that might revive cert auto-discovery. * fix(desktop): use no-op sign function instead of sign=null VM run 6 still hit the symlink crash even with signtoolOptions.sign=null. electron-builder 26.8.1 treats null as 'use the default signtool path' rather than 'skip signing', so the winCodeSign fetch + extraction still fired for the bundled prebuild re-sign. The Electron docs (electronjs.org/docs/latest/tutorial/code-signing) make it clear signing is OPTIONAL and unsigned apps work fine — users just see SmartScreen on first launch. The electron-builder mechanism for 'don't actually sign anything' is to supply a custom sign function (via signtoolOptions.sign: '<path-to-cjs-module>') that resolves without invoking signtool. build-noop-sign.cjs is that module — a 5-line async function that returns undefined. electron-builder calls it for every binary it would have signed, gets back a resolved promise, and considers each binary 'signed.' No signtool spawn, no winCodeSign fetch, no symlink crash. When Nous's cert arrives, replace this file with a real signing hook (@electron/windows-sign-based or a direct signtool invocation). The architecture's signing-ready and the cutover is a one-file edit. * fix(desktop): signAndEditExecutable=false to skip signtool path entirely After reading app-builder-lib/winPackager.js line 216 + 231 directly: signAndEditExecutable is the ACTUAL hardcoded gate that short-circuits both signApp() (which signs Hermes.exe + every shouldSignFile match including bundled prebuilds) AND createTransformerForExtraFiles(). None of signtoolOptions.sign / sign:null / sign:<custom-fn> gate the winCodeSign download — that happens before they're consulted. What we lose: rcedit also runs through signAndEditResources, so disabling this drops PE metadata (file properties showing 'Hermes' / 'Nous Research' / file description). Cost is real but bounded: * Hermes.exe filename, icon, asar contents, app identity intact * Task Manager shows 'Hermes.exe' (the filename) not 'Hermes' (PE description) — minor downgrade * Start menu, taskbar, window title all work normally * SmartScreen will warn once (unsigned, same as before) When the cert lands, flip signAndEditExecutable back to default true, both signing AND rcedit return, PE metadata is restored. Removes the no-op sign function (build-noop-sign.cjs) since signAndEditExecutable=false prevents signtool from being invoked at all — the custom hook never gets called either. * feat(install.ps1): write .hermes-bootstrap-complete marker at end of install The desktop app's main.cjs resolver ladder has a 'bootstrap-needed' rung that fires when .hermes-bootstrap-complete is missing from ACTIVE_HERMES_ROOT. Pre-Hermes-Setup, this marker was written by the packaged-desktop's own bootstrap-runner.cjs at the end of its install flow. Now that Hermes-Setup.exe runs install.ps1 directly, install.ps1 needs to own the marker — otherwise the desktop sees no marker on first launch and triggers its legacy first-launch bootstrap (re-running install.ps1 from inside Electron, the exact recursion Hermes-Setup.exe was supposed to obviate). Implementation: * New Stage-BootstrapMarker (worker) → Write-BootstrapMarker (helper) * Slotted in the manifest right after platform-sdks, before the interactive configure/gateway stages, so it runs unconditionally when the install reaches the finalize phase * Schema mirrors apps/desktop/electron/main.cjs writeBootstrapMarker / isBootstrapComplete EXACTLY: {schemaVersion: 1, pinnedCommit, pinnedBranch, completedAt}. Schema version stays at 1 so old desktops that read marker files written by future install.ps1s can still parse them. * pinnedCommit comes from -Commit flag (Hermes-Setup.exe passes it) or falls back to 'git rev-parse HEAD' in InstallDir * pinnedBranch from -Branch flag, defaults to 'main' matching install.ps1's own param default Two PS-5.1 gotchas baked into comments: * The ?. null-conditional operator doesn't exist pre-PS7; use explicit if-checks on Get-Command results * Set-Content -Encoding UTF8 emits a BOM in 5.1 and Node's plain JSON.parse rejects BOM — write via .NET's UTF8Encoding(false) to produce BOM-less JSON the desktop's readJson() can parse * feat(installer): drive in-app updates through the Tauri installer Converge update on the same principle as bootstrap: one driver owns all repo mutation. The desktop becomes a pure consumer that hands off to Hermes-Setup.exe --update instead of re-implementing git/pip in Electron. - hermes desktop --build-only: build without launching, so the installer owns the post-update launch (CLI keeps build logic single-sourced). - Installer AppMode {Install,Update} from argv; get_mode exposed to the UI. - Installer self-copies to HERMES_HOME/hermes-setup.exe on install success (no-op guard during --update re-invocation to avoid the locked-exe copy). - Installer --update flow (update.rs): wait for the desktop to release the venv shim, run 'hermes update --yes --gateway' (branch on exit 0/2/other), then 'hermes desktop --build-only', then launch the rebuilt desktop. Reuses the bootstrap event channel + progress UI via a synthetic two-stage manifest. - Desktop applyUpdates() gutted (~105 lines of git/stash/pull/pyproject/pip removed) -> thin handoff: spawn updater, app.quit() to free the shim. Detection (checkUpdates, commit changelog, behind-count) kept intact. - install.ps1 creates Start Menu + Desktop shortcuts to the packed Hermes.exe (never bare 'hermes desktop', which would rebuild every launch). * test update * fix(installer): pass --branch to hermes update in the --update flow The install is a detached-HEAD checkout of a pinned commit. Without --branch, 'hermes update' fell back to its default (main) and switched the checkout to main — a divergent branch that lacks the desktop CLI command — so the update targeted the wrong branch and the rebuild stage failed with 'invalid choice: desktop'. Thread BUILD_PIN_BRANCH (the branch this installer was built against, and the same branch the desktop detected the update on) into 'hermes update --branch <b>' so update + rebuild stay on-branch. * test update * fix(installer): stamp Hermes icon onto Hermes.exe via rcedit (no winCodeSign) The unpacked Hermes.exe showed the stock Electron icon + name in the taskbar because build.win.signAndEditExecutable=false disables BOTH electron-builder's signing AND its rcedit metadata/icon stamping. That flag is load-bearing: enabling it re-triggers signtool -> winCodeSign, whose macOS symlinks crash 7-Zip on non-admin Windows (unfixable dead end). Decouple identity-stamping from signing entirely: after npm run pack, run rcedit ourselves on the produced exe. - Add rcedit as a direct devDependency of apps/desktop (the transitive electron-winstaller copy is fragile). - apps/desktop/scripts/set-exe-identity.cjs: Node helper that calls rcedit's named export to set icon + ProductName/FileDescription/ CompanyName. Node builds argv natively — avoids the PowerShell->exe ->JSON double-escaping that broke the app-builder rcedit path. - install.ps1 Set-DesktopExeIdentity invokes the script after the build, before shortcuts. Best-effort: failure keeps the stock icon, never fails the install. rcedit is a pure PE editor — no signtool, no winCodeSign, no symlinks. Verified locally: stamping a copy of the built Hermes.exe embeds the 32x32 icon and sets ProductName=Hermes. Also fix update-path success-screen flash: in update mode the installer hands off + exits in ~600ms, so don't route to the 'launch Hermes' success view (it flashed before the window closed). * update test * fix(desktop): show 'hermes update' guidance for CLI installs instead of dead-end error A user who installed via the CLI (irm|iex / install.sh) then ran `hermes desktop` has no staged hermes-setup.exe, so clicking Update in-app hit resolveUpdaterBinary()=null and showed a misleading error ('re-run the Hermes installer') with a Try-again button that could never succeed — a dead loop for a perfectly valid install. Treat the no-updater case as an intentional outcome, not a failure: - main.cjs applyUpdates returns { ok:true, manual:true, command:'hermes update' } (no throw, no 'error' stage) when no updater binary exists. - New 'manual' update stage + apply-state.command thread the command to the UI. - updates-overlay ManualView: a polished terminal-native card with the exact command and a copy button, framed as the correct path for a CLI user rather than an error. GUI-installer users are unaffected — hermes-setup.exe present => seamless auto-update runs as before. Zero new process orchestration; can't fail the update demo. * update test * fix(gui): pin /api/hermes/update to the current branch The desktop command-center 'update' action hits POST /api/hermes/update, which spawned bare `hermes update` with no --branch. cmd_update then falls back to its default (main) and checks the working tree OUT of the tracked branch — a bb/gui install silently jumped to main and lost the desktop CLI. Resolve the checkout's current branch and pass --branch <current> from this endpoint only. The engine default (main) is DELIBERATELY unchanged: bare `hermes update` from a terminal, the gateway /update bot command, and the CLI/TUI relaunch path all keep their long-standing 'update against main' contract for the existing user base. Only the GUI button is scoped to update-the-branch-you're-on. Detached HEAD / git failure falls back to the bare default. * update test * fix(desktop): branch-pin the CLI manual-update command card The 'Update from your terminal' card (shown to CLI installs with no staged updater) hardcoded bare `hermes update` — which defaults to main and would switch a bb/gui (or any non-main) checkout off-branch. Same bug we fixed for the GUI button, leaked into the card's copy text. Resolve the checkout's current branch and show `hermes update --branch <current>` for non-main checkouts; keep it bare for main so the card stays clean. Best-effort: bare fallback if branch detection fails. Matches the GUI button + installer --update contract; bare terminal/bot/TUI update paths still default to main, unchanged. * docs: phragg was here * feat(desktop): lead onboarding with Nous Portal + fix fresh-install detection (#34970) - Feature Nous Portal as the primary onboarding card (Recommended tag, app logo, single pitch line); collapse other OAuth providers behind an "Other providers" disclosure whose open/closed state persists. - Surface OpenRouter as a one-click API-key option inside the disclosure; move "I have an API key" to a quiet bottom-right link. - Treat "no provider configured" as a normal onboarding state, not a red error banner (provider-setup-errors copy match). - Fix setup.runtime_check: it reported ready when the resolved runtime had an empty credential or only implicit Bedrock/IAM, so fresh installs never saw onboarding. Now requires a usable credential. - Auto-wire Windows fonts for WSL2 users so the renderer renders real Segoe UI instead of the DejaVu fallback; make WSL detection env-independent via the /proc kernel marker. * feat(desktop): live elapsed timer on install bootstrap steps The first-launch install overlay showed a static "Installing" with no motion, so long steps (notably the repo clone) looked frozen. Stamp each stage's start time on the running transition and tick once a second so the active step shows live elapsed (e.g. "Installing · 1:23"), plus elapsed on the overall current-step line. Completed steps keep their final duration. * fix(desktop): resolve PortableGit for update checks + reserve titlebar tools space - runGit() hardcoded spawn('git'), which ENOENTs on fresh installer-driven Windows installs (git is PortableGit under %LOCALAPPDATA%\hermes\git, never on PATH) — so "Check for updates" failed with "Couldn't check for updates". Add resolveGitBinary() mirroring findGitBash (PortableGit → Git-for-Windows → PATH) and use it in runGit. - PageSearchShell rendered a full-width search input in the titlebar row, so on Windows its right edge slid under the fixed top-right tools + native window controls. Reserve that footprint via --titlebar-tools-* vars. * fix(desktop): stop streaming caret from shifting layout on completion The streaming caret (::after on the running message's last child) was an in-flow inline-block adding ~0.78em of inline width, which could wrap the last line mid-stream; when the caret is removed on completion the line un-wraps and reflows — the visible post-response layout shift. Net-zero its inline advance with a compensating negative margin so it paints at the text end without consuming layout width. * fix(desktop): stop completed-message layout shift while streaming The assistant message action bar used `hideWhenRunning`, which unmounts it whenever the thread is streaming. Since the bar reserves vertical space in each completed assistant message's footer (it's invisible-until-hover via opacity, not via mount), unmounting it collapsed every prior turn by the bar's height — then remounting on resolve grew them back, shifting the whole conversation (visible as "padding appears above the last user message"). Drop hideWhenRunning so the footer height is constant; the bar stays invisible during streaming via its existing opacity/pointer-events gating. * fix(merge): keep windows-footgun suppressions inline * fix(merge): keep remaining gateway footgun suppressions inline * fix(merge): restore contracts caught by main-target CI * fix(dashboard): honor injected HERMES_DASHBOARD_SESSION_TOKEN The desktop shell mints a session token and signs its /api + /api/ws calls with it via HERMES_DASHBOARD_SESSION_TOKEN, but the main-merge restored a web_server.py that ignored the env var and minted its own random _SESSION_TOKEN -- so every desktop request 401'd and the UI reported "gateway offline". Read the injected token (fall back to a fresh random one) so loopback HTTP + WS auth line up. Adds a regression test so a future merge can't silently drop the read. * fix(desktop): align fresh-install home so upgraders don't brick Two related first-launch bugs on machines with a legacy ~/.hermes: - install.ps1 hardcoded $HermesHome/$InstallDir to %LOCALAPPDATA%\hermes and ignored the HERMES_HOME the desktop passes through. The desktop freezes HERMES_HOME at module load and prefers a legacy ~/.hermes when %LOCALAPPDATA%\hermes is absent, so the installer wrote to a different home than the shell read -> "Could not connect to Hermes gateway". Honor $env:HERMES_HOME in the param defaults. - isBootstrapComplete() trusted the marker + checkout without verifying a runnable venv, so an interrupted/split install spawned a dead backend instead of re-bootstrapping. Also require the venv python to exist. * fix(dashboard): allow packaged desktop file:// origin on loopback WS The packaged Electron desktop loads its renderer over file://, so its /api/ws handshake carries Origin: file:// (or null). The DNS-rebinding WebSocket Origin guard only accepted http(s) origins matching the bound host, so it rejected the desktop's own renderer with 4403 -> "Could not connect to Hermes gateway" on macOS. A browser DNS-rebinding attacker can only ever present an http(s) origin (the site hosting the malicious page); it cannot forge file://, null, or a custom app scheme AND hold the loopback session token. So on loopback binds we now trust non-web origins -- the token in _ws_auth_ok remains the real authenticator. Public/gated binds still reject them, and cross-site http(s) origins are still rejected everywhere. * fix(desktop): resolve renderer assets relative to BASE_URL Absolute public asset paths (/apple-touch-icon.png, /ds-assets/...) work under the dev server but break in the packaged app, where the renderer is loaded from file://.../index.html and a leading slash resolves to the filesystem root -> broken onboarding provider icon and backdrop image on macOS. Prefix these with import.meta.env.BASE_URL so they resolve next to the bundled index.html in both dev and packaged builds. * feat(desktop): automate first-launch bootstrap on macOS/Linux Previously a packaged macOS/Linux app with no Hermes install hit a dead-end ("first-launch install is not yet automated -- run install.sh manually") because install.sh lacked the staged protocol install.ps1 exposes. Now both platforms bootstrap on first launch with the same structured, per-step progress UI as Windows. - install.sh: add --manifest / --stage / --json / --non-interactive plus a stage dispatcher (prerequisites, repository, venv, python-deps, node-deps, path, config, setup, gateway, complete). User-input stages (setup, gateway) are skipped under --non-interactive; the in-app onboarding overlay owns API keys/model, matching the Windows flow. Each stage runs inside the install dir (its own process) and a new --commit flag pins the checkout to the build-stamp SHA. - bootstrap-runner.cjs: drive the staged manifest/stage/JSON protocol for both install.ps1 (PowerShell) and install.sh (bash), selected by installer kind; removed the single-blob POSIX shim. - main.cjs: drop the macOS/Linux unsupported-platform dead-end so the bootstrap-needed path runs the installer on every platform. * fix(dashboard): return 404 JSON for unmatched /api paths instead of SPA HTML The SPA catch-all (serve_spa) served index.html for any unmatched GET, including unregistered /api/* endpoints. A missing API route therefore came back as <!doctype html> with status 200, and JSON clients (the desktop app's fetchJson) crashed with an opaque 'SyntaxError: Unexpected token <' instead of a clear error. - web_server.py: unmatched /api or /api/... now returns 404 JSON ('No such API endpoint'); non-api paths still serve the SPA for client-side routing. - main.cjs fetchJson: detect an HTML body / text/html content-type on a 2xx response and reject with a clear message naming the URL, rather than a raw JSON.parse SyntaxError. Empty bodies resolve to null; malformed JSON reports the URL plus a snippet. * say 'OS appearance' instead of 'macOS appearance' * feat(install): add --include-desktop stage + PowerShell-style flags to install.sh Brings install.sh to parity with install.ps1's bootstrap surface so the shared Rust/Tauri bootstrapper (apps/bootstrap-installer) can drive a macOS/Linux install the same way it drives Windows. - Accept the PowerShell-style aliases the bootstrapper emits to both installers: -Commit / -Branch (alongside existing -Manifest / -Stage / -Json / -NonInteractive). - Add --include-desktop / -IncludeDesktop. When set, the manifest gains a 'desktop' stage (immediately before 'complete'), and a new install_desktop runs a root workspace `npm install` + `npm run pack` (electron-builder --dir, signing auto-discovery disabled) to produce release/mac*/Hermes.app -- mirroring install.ps1's Install-Desktop / Stage-Desktop. - The flag is opt-in, exactly like Windows: the signed bootstrap installer passes it; the Electron app's own first-launch bootstrap and the CLI one-liner omit it (building the desktop from inside the running app would clobber it). * fix: tts endpoints * macOS desktop: install + in-app self-update (#35607) * fix(installer): align macOS HERMES_HOME with the rest of the stack paths.rs computed the macOS Hermes home as ~/Library/Application Support/ hermes, but nothing else does: hermes_constants.get_hermes_home() (Python), scripts/install.sh, and the Electron desktop's resolveHermesHome() all use ~/.hermes on macOS. The drift meant the Tauri installer wrote the install to one directory and the desktop looked for it in another, so a fresh GUI install never found its backend (the file's own comment warned this exact drift would break things). Use ~/.hermes on macOS to match. * fix(install.sh): always emit a stage result frame on failure Stage helpers (clone_repo, install_deps, check_python, …) were written for the monolithic flow and call `exit 1` on failure. Under `--stage`, that terminated the process before the JSON result frame was printed, so the installer's parse_stage_result saw "no frame" instead of a clean {ok:false,...} contract response. Run the stage body in a subshell so an `exit` only unwinds the subshell and the parent still emits the frame. * feat(install.sh): auto-provision git on macOS/Linux (parity with install.ps1) install.ps1 downloads PortableGit on Windows, but install.sh just printed a "please install git" hint and exited — so a fresh Mac with no developer tools (no Xcode CLT → no git) couldn't get past the clone step. check_git now tries to install git before bailing: - macOS: Homebrew if present (headless), else `xcode-select --install` (the CLT prompt also provides the compiler some wheels need), polling for git to appear. - Linux: apt/dnf/pacman via sudo when available. Falls back to the manual instructions only if auto-provision fails. * feat(desktop): in-app GUI+backend self-update on macOS/Linux On Windows the staged Hermes-Setup binary drives updates (quit → hermes update → hermes desktop --build-only → relaunch). The mac drag-install has no such binary, so "Update now" previously just printed `hermes update`. Since there's no venv-shim file lock on POSIX, the desktop can drive the whole update itself. applyUpdates now, when no staged updater exists on mac/linux: 1. runs `hermes update --yes [--branch <current>]` (backend git pull + deps), 2. runs `hermes desktop --build-only` (OS-aware GUI rebuild) with the Hermes-managed Node + venv on PATH, 3. spawns a detached swapper that waits for this process to exit, dittos the freshly built Hermes.app over the running bundle, clears quarantine, and relaunches. Degrades to "backend updated — restart to load the new GUI" if the rebuild fails or there's no .app bundle to swap (dev run, Linux AppImage). * chore: uptick * chore: uptick * chore: linux build * fix(install): detect xcode-select git stub on fresh macOS * chore: bump * fix(desktop): repair voice dictation on Windows Voice dictation was broken on Windows in two ways: 1. Mic access was denied. The Electron permission request handler only granted 'media' requests whose details.mediaTypes included 'audio', but Chromium on Windows frequently fires the mic request with an empty mediaTypes array, so getUserMedia threw NotAllowedError. The handler now grants audio-capture when mediaTypes includes 'audio' OR is empty/absent, handles the 'audioCapture' permission name, and adds a setPermissionCheckHandler (the synchronous path Chromium also consults for getUserMedia on Windows). Video is still denied. 2. Transcripts went nowhere. The composer's insertText handler (used by dictation and other inserts) only updated the assistant-ui composer store via setText, never the contentEditable editor DOM. The draft->editor sync effect only re-renders the editor when it is NOT focused, and dictation runs while the editor has/regains focus, so the transcript was stored but never shown and could not be sent. insertText now renders into the editor DOM and places the caret, mirroring appendExternalText. Also hardens fetchJson: a 2xx response with an HTML body (or text/html content-type) now rejects with a clear message naming the URL instead of an opaque JSON.parse 'Unexpected token <' error. * feat(desktop): route Nous subscribers onto the Tool Gateway from the GUI When the GUI sets the main provider to Nous via POST /api/model/set, call the same apply_nous_managed_defaults the CLI uses after model selection, so GUI/onboarding users land on the Nous Tool Gateway the same way CLI users do — no separate prompt, no duplicated logic. Purely additive: apply_nous_managed_defaults skips any tool where the user has a direct key (FIRECRAWL_API_KEY, FAL_KEY, etc.) or explicit config, so it never overwrites a user's own setup. Only unconfigured tools get routed. - web_server.py: in set_model_assignment (scope=main, provider=nous), resolve enabled toolsets and apply managed defaults; guarded so a Portal hiccup never blocks saving the model. Returns routed tools as gateway_tools. - onboarding.ts: surface a 'Tool Gateway enabled' toast listing routed tools. - types/hermes.ts: add gateway_tools to ModelAssignmentResponse. - tests: cover nous-applies, non-nous-skips, and failure-doesnt-block-save. * feat(desktop): mirror hermes model free/paid curation in GUI onboarding GUI onboarding picked models[0] from /api/model/options, which ignores the Nous free/paid tier — a free user could land on a paid default (e.g. anthropic/claude-opus-4). Now the recommended default mirrors what `hermes model` does. - web_server.py: new GET /api/model/recommended-default?provider=<slug>. For Nous it runs the same curation as the CLI (get_curated_nous_model_ids + pricing + check_nous_free_tier + union_with_portal_{free,paid}_recommendations + partition_nous_models_by_tier) so free users get a free model and paid users get the curated default. Other providers fall back to the first curated model. Never 500s — returns empty model on error so onboarding degrades gracefully. - hermes.ts: getRecommendedDefaultModel client + RecommendedDefaultModel type. - onboarding.ts: fetchProviderDefaultModel prefers the recommended endpoint, falls back to models[0] when unavailable. - tests: free-tier picks free model, paid-tier picks curated default, failure returns empty without 500. * feat(desktop): show model pricing + free/paid tier gating in GUI picker The CLI `hermes model` picker shows per-model $/Mtok pricing and gates paid models on free Nous accounts. The GUI picker showed bare model names. Bring it to parity across both the model-picker dialog and onboarding confirm card. Backend: - inventory.build_models_payload gains a pricing=True flag → _apply_pricing enriches each provider row with formatted per-model pricing ({input,output,cache,free}) via the same _format_price_per_mtok the CLI uses, and for Nous adds free_tier + unavailable_models (paid models a free user can't select) via check_nous_free_tier + partition_nous_models_by_tier. Best-effort: any pricing/tier failure is swallowed and fails open (no gating). - /api/model/options and TUI model.options now pass pricing=True so the global picker and in-session picker both carry pricing. Frontend: - ModelOptionProvider gains pricing/free_tier/unavailable_models; new ModelPricing type. - model-picker dialog renders In/Out $/Mtok (or a Free pill) per model, a Free tier/Pro badge on the Nous heading, and disables + grays unavailable paid models for free users with a 'Pro models need a paid subscription' note. - onboarding confirm card shows the chosen model's price + tier badge. Tests: test_inventory_pricing covers price formatting, free-tier gating, paid no-gating, providers without pricing, and swallowed failures. * fix(desktop): GUI model picker shows curated Nous list in curated order Two bugs made the GUI Nous model list diverge from the `hermes model` CLI picker: 1. Backend (model_switch.py): the Nous row in list_authenticated_providers fell through to cached_provider_model_ids("nous"), dumping the full live /v1/models catalog (~50 vendor-prefixed models, alphabetical). Now it uses the curated list AND applies the Portal free/paid recommendation union — exactly like _model_flow_nous in main.py — so newly-launched models such as stepfun/step-3.7-flash:free surface in curated order. Best-effort: falls back to the curated list alone if the Portal fetch fails. 2. Frontend (model-picker.tsx): cmdk's Command had shouldFilter on (default), which re-sorts items by fuzzy-match score (≈alphabetical) and ignores array order. Set shouldFilter={false} + own the search term and do an order-preserving substring filter, so the backend's curated order is shown verbatim. * feat(desktop): add/switch providers from the model picker via onboarding reuse The model picker could only select models from already-authenticated providers. Switching to a new provider had no in-app path. Rather than duplicate provider UI, reuse the existing onboarding provider selector (featured Nous + other providers + API-key form + device-code/PKCE flow + model-confirm with pricing/tier). - onboarding store: add a 'manual' flag with startManualOnboarding() / closeManualOnboarding(). Manual mode forces the onboarding overlay to show even when configured===true and refreshOnboarding no longer auto-dismisses on runtime-ready (the app is already working — the user is just adding or switching a provider). - onboarding overlay: render when manual even if configured; show a Close button (the first-run flow has none since the app can't run yet). - model picker: 'Add provider' footer button opens the onboarding selector; ModelResults lists only configured (model-bearing) providers. * feat(desktop): add PUT /api/tools/toolsets/{name} enable/disable endpoint * feat(desktop): add toggleToolset RPC binding * feat(desktop): toolset enable/disable switch in Tools settings * feat(desktop): tool configuration parity in GUI Tools settings Bring the desktop GUI Tools settings to parity with the CLI `hermes tools` for provider selection and API-key configuration. Backend (hermes_cli/web_server.py): - GET /api/tools/toolsets/{name}/config - provider matrix + key status - PUT /api/tools/toolsets/{name}/provider - persist provider selection Shared core (hermes_cli/tools_config.py): - Extract apply_provider_selection / _write_provider_config from the interactive _configure_provider so the CLI and GUI write identical config keys (web.backend, tts.provider, browser.cloud_provider, plugin image/video providers, use_gateway flags) through one code path. Desktop UI: - ToolsetConfigPanel: provider list with select, per-provider API-key entry (set/replace/clear/reveal via the shared env RPCs), Ready/Needs keys state, guidance for Nous-auth and post-setup providers. - Wire the Configured/Needs keys pill to expand the panel inline; refresh the toolset list after key changes so the pill updates live. - Add getToolsetConfig / selectToolsetProvider RPC bindings + types. Post-setup (OAuth/install) flows still defer to the CLI; see docs spike findings for the planned /api/tools/setup/* endpoint family. Tests: backend round-trip + 400 cases for the new endpoints and apply_provider_selection; desktop vitest coverage for the config panel (provider render, select, key save). No change-detector tests. Also removes three stale completed plan docs. * fix(desktop): show real Hermes version + sync package.json on release The desktop app version was disconnected from the Hermes version: the release script bumped pyproject.toml + hermes_cli/__init__.py but never touched apps/desktop/package.json, which sat stale at 0.0.2 (lockfile at 0.0.1). - main.cjs: hermes:version IPC now resolves __version__ from hermes_cli/__init__.py (the canonical source release.py bumps) via a new resolveHermesVersion() helper, falling back to app.getVersion() when the source tree isn't readable. The About panel now always shows the live Hermes version and can't drift. - release.py: update_version_files() also bumps apps/desktop/package.json in lockstep with pyproject (top-level version only; dep specs untouched). - One-time catch-up: package.json 0.0.2 -> 0.15.1 and the lockfile root mirrors 0.0.1 -> 0.15.1. * fix(desktop): stamp exe identity in afterPack hook so updates stay branded The packed Hermes.exe reverted to the stock Electron icon + "Electron" name after an in-app update. The icon/identity stamp (rcedit) lived only in install.ps1, but the installer's --update path rebuilds the desktop via `hermes desktop --build-only` -> `npm run pack`, which never ran install.ps1 and so never stamped the rebuilt exe. Move the stamp into an electron-builder afterPack hook so it runs for EVERY packed build regardless of caller (first install, hermes desktop, the update rebuild, or a manual npm run pack): - set-exe-identity.cjs: refactor to export stampExeIdentity(exe, desktopRoot); still runnable as a standalone CLI. - after-pack.cjs (new): afterPack hook calling stampExeIdentity. Windows-only guard; best-effort (logs + resolves on failure, never fails the build). - package.json: register build.afterPack. - install.ps1: remove the now-redundant Set-DesktopExeIdentity function + call; the hook handles it during npm run pack. electron-builder's own rcedit step stays disabled (signAndEditExecutable=false) to avoid the signtool -> winCodeSign -> 7-Zip macOS-symlink crash on non-admin Windows; the hook runs rcedit directly (pure PE resource edit, no signing). * fix(desktop): export afterPack hook as exports.default so electron-builder runs it The afterPack hook used `module.exports = fn`, which electron-builder's hook loader doesn't pick up — it expects the function as the module's default export (the same shape afterSign/notarize.cjs uses). The hook silently never ran, so even first install shipped the stock "Electron" exe. Switch to `exports.default = async function afterPack(...)`. Verified with a real `npm run pack`: electron-builder now invokes the hook and the produced release/win-unpacked/Hermes.exe carries ProductName/FileDescription=Hermes. * chore(desktop): drop auto-build release CI in favor of manual build + upload Remove desktop-release.yml (nightly-on-main + stable publish). Installers are now built locally per platform and uploaded to a GitHub Release by hand; the website points at them via NEXT_PUBLIC_HERMES_DL_* env. Update README + docs and drop the dead desktop-nightly channel links. * fix(desktop): stable shortcut icon + bust icon cache so updates repaint Symptom on a freshly-installed laptop: Hermes.exe itself shows the correct Hermes icon (Explorer reads the live exe's stamped PE resource), but the desktop shortcut still draws the stock Electron icon. Cause: New-DesktopShortcuts set IconLocation to "<exe>,0", so Windows cached the icon it extracted from the exe at shortcut-creation time. On an update the exe gets re-stamped, but the shortcut keeps rendering the stale cached bitmap. - package.json: ship assets/icon.ico beside the exe via extraResources (-> resources/icon.ico). Verified with a real npm run pack. - install.ps1 New-DesktopShortcuts: point IconLocation at resources/icon.ico (fallback to <exe>,0 if absent) — a dedicated .ico is cache-stable and skips the per-exe extraction that goes stale. Then run `ie4uinit.exe -show` to bust the shell icon cache so the shortcut repaints immediately instead of showing the old Electron icon until reboot. Both best-effort; never fail an otherwise-good install. * dummy update * feat(desktop): self-heal update branch + backend contract guard Two fixes for the bb/gui→main transition: - Self-update self-heals: if the tracked branch (e.g. bb/gui) no longer exists on origin (merged + deleted), the desktop updater falls back to main and persists it. Read-only ls-remote probe that only flips on a definitive "ref absent" (exit 2), never on a transient network error, so already-installed clients migrate themselves with no manual flip. - Backend contract guard: tui_gateway reports DESKTOP_BACKEND_CONTRACT in session runtime info; the desktop warns with a one-click "Update Hermes" when the backend predates the GUI's required contract (e.g. a bb/gui app pointed at a main checkout) instead of failing cryptically downstream. * docs(desktop): rewrite README to match current install/update/build flow The old README contradicted itself (claimed a bundled Python payload while also saying it no longer bundles source) and predated cross-platform support. Rewrite for accuracy: Linux is a first-class build target, install.sh/install.ps1 both drive the staged bootstrap, the real self-update handoff (Windows Hermes-Setup vs in-app macOS/Linux), and the bb/gui→main self-heal + backend contract guard. * docs(desktop): rewrite README as a real product readme Lead with what the app is and how to get it (download an installer, or `hermes desktop` for existing CLI users) plus a plain-language feature list, then keep contributor/build/internals as a clearly separated secondary section. * docs(desktop): fix install framing — releases no longer auto-build installers Lead with the install-with-Hermes path (`--include-desktop` / `hermes desktop`), which always works, and describe prebuilt installers as manually published when a release ships them rather than implying CI attaches them to every release. * docs(desktop): match base repo README style Adopt the root README's conventions: centered title + badge row, bold one-liner intro, a feature <table> grid, --- section dividers, and a Community / License footer. * feat(desktop): recover from gateway boot failures + validate API keys on entry (#35864) Fresh installs that hit a gateway boot failure had no recovery path: the shell rendered dead ("gateway offline"), logs were undiscoverable, and a mistyped API key was accepted because onboarding only checked credential presence, not validity. - Add BootFailureOverlay: a top-level recovery surface (Retry, Repair install, Use local gateway, Open logs + inline recent logs) that mounts on any hard boot failure, including post-install. Trims the now-redundant recovery button from the onboarding Preparing panel. - Add hermes:logs:reveal / :recent IPC (reveal desktop.log) and a hermes:bootstrap:repair IPC that drops the bootstrap marker to force a clean reinstall. Surface "Open logs" in Gateway settings too. - Add POST /api/providers/validate: a live per-provider probe (OpenRouter/OpenAI/xAI/Gemini key check, local endpoint connectivity) wired into saveOnboardingApiKey so a rejected key blocks before it's persisted, while an unreachable probe falls through (offline-safe). * test(model-catalog): fix stale nous picker test after curated-list changeac2e48907made the GUI/picker Nous row use the curated list (curated["nous"] = get_curated_nous_model_ids()) + Portal union, matching the `hermes model` CLI — but test_picker_nous_row_uses_manifest still asserted the old 2-model manifest snapshot, breaking the test shard. Rewrite it as an invariant: stub the Portal union to passthrough and assert the row equals get_curated_nous_model_ids() computed under the same conditions, so it tracks the real contract instead of a hardcoded model list that rots on every catalog update. --------- Co-authored-by: emozilla <emozilla@nousresearch.com> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Co-authored-by: Austin Pickett <pickett.austin@gmail.com> Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: ethernet <arilotter@gmail.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
5961 lines
254 KiB
Python
5961 lines
254 KiB
Python
"""Unit tests for run_agent.py (AIAgent).
|
|
|
|
Tests cover pure functions, state/structure methods, and conversation loop
|
|
pieces. The OpenAI client and tool loading are mocked so no network calls
|
|
are made.
|
|
"""
|
|
|
|
import io
|
|
import json
|
|
import logging
|
|
import re
|
|
import uuid
|
|
from logging.handlers import RotatingFileHandler
|
|
from pathlib import Path
|
|
from types import SimpleNamespace
|
|
from unittest.mock import AsyncMock, MagicMock, patch
|
|
|
|
import pytest
|
|
from agent.codex_responses_adapter import _normalize_codex_response
|
|
|
|
import run_agent
|
|
from run_agent import AIAgent
|
|
from agent.error_classifier import FailoverReason
|
|
from agent.prompt_builder import DEFAULT_AGENT_IDENTITY
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Fixtures
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _make_tool_defs(*names: str) -> list:
|
|
"""Build minimal tool definition list accepted by AIAgent.__init__."""
|
|
return [
|
|
{
|
|
"type": "function",
|
|
"function": {
|
|
"name": n,
|
|
"description": f"{n} tool",
|
|
"parameters": {"type": "object", "properties": {}},
|
|
},
|
|
}
|
|
for n in names
|
|
]
|
|
|
|
|
|
def test_is_destructive_command_treats_cp_as_mutating():
|
|
assert run_agent._is_destructive_command("cp .env.local .env") is True
|
|
|
|
|
|
def test_is_destructive_command_treats_install_as_mutating():
|
|
assert run_agent._is_destructive_command("install template.env .env") is True
|
|
|
|
|
|
@pytest.fixture()
|
|
def agent():
|
|
"""Minimal AIAgent with mocked OpenAI client and tool loading."""
|
|
with (
|
|
patch(
|
|
"run_agent.get_tool_definitions", return_value=_make_tool_defs("web_search")
|
|
),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
):
|
|
a = AIAgent(
|
|
api_key="test-key-1234567890",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
a.client = MagicMock()
|
|
return a
|
|
|
|
|
|
@pytest.fixture()
|
|
def agent_with_memory_tool():
|
|
"""Agent whose valid_tool_names includes 'memory'."""
|
|
with (
|
|
patch(
|
|
"run_agent.get_tool_definitions",
|
|
return_value=_make_tool_defs("web_search", "memory"),
|
|
),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
):
|
|
a = AIAgent(
|
|
api_key="test-k...7890",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
a.client = MagicMock()
|
|
return a
|
|
|
|
|
|
def test_aiagent_reuses_existing_errors_log_handler():
|
|
"""Repeated AIAgent init should not accumulate duplicate errors.log handlers."""
|
|
root_logger = logging.getLogger()
|
|
original_handlers = list(root_logger.handlers)
|
|
error_log_path = (run_agent._hermes_home / "logs" / "errors.log").resolve()
|
|
|
|
try:
|
|
for handler in list(root_logger.handlers):
|
|
root_logger.removeHandler(handler)
|
|
|
|
error_log_path.parent.mkdir(parents=True, exist_ok=True)
|
|
preexisting_handler = RotatingFileHandler(
|
|
error_log_path,
|
|
maxBytes=2 * 1024 * 1024,
|
|
backupCount=2,
|
|
)
|
|
root_logger.addHandler(preexisting_handler)
|
|
|
|
with (
|
|
patch(
|
|
"run_agent.get_tool_definitions",
|
|
return_value=_make_tool_defs("web_search"),
|
|
),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
):
|
|
AIAgent(
|
|
api_key="test-k...7890",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
AIAgent(
|
|
api_key="test-k...7890",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
|
|
matching_handlers = [
|
|
handler for handler in root_logger.handlers
|
|
if isinstance(handler, RotatingFileHandler)
|
|
and error_log_path == Path(handler.baseFilename).resolve()
|
|
]
|
|
assert len(matching_handlers) == 1
|
|
finally:
|
|
for handler in list(root_logger.handlers):
|
|
root_logger.removeHandler(handler)
|
|
if handler not in original_handlers:
|
|
handler.close()
|
|
for handler in original_handlers:
|
|
root_logger.addHandler(handler)
|
|
|
|
|
|
class TestProviderModelNormalization:
|
|
def test_aiagent_strips_matching_native_provider_prefix(self):
|
|
with (
|
|
patch(
|
|
"run_agent.get_tool_definitions", return_value=_make_tool_defs("web_search")
|
|
),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
):
|
|
agent = AIAgent(
|
|
model="zai/glm-5.1",
|
|
provider="zai",
|
|
base_url="https://api.z.ai/api/paas/v4",
|
|
api_key="test-key-1234567890",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
|
|
assert agent.model == "glm-5.1"
|
|
|
|
def test_aiagent_keeps_aggregator_vendor_slug(self):
|
|
with (
|
|
patch(
|
|
"run_agent.get_tool_definitions", return_value=_make_tool_defs("web_search")
|
|
),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
):
|
|
agent = AIAgent(
|
|
model="anthropic/claude-sonnet-4.6",
|
|
provider="openrouter",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
api_key="test-key-1234567890",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
|
|
assert agent.model == "anthropic/claude-sonnet-4.6"
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Helper to build mock assistant messages (API response objects)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _mock_assistant_msg(
|
|
content="Hello",
|
|
tool_calls=None,
|
|
reasoning=None,
|
|
reasoning_content=None,
|
|
reasoning_details=None,
|
|
):
|
|
"""Return a SimpleNamespace mimicking an OpenAI ChatCompletionMessage."""
|
|
msg = SimpleNamespace(content=content, tool_calls=tool_calls)
|
|
if reasoning is not None:
|
|
msg.reasoning = reasoning
|
|
if reasoning_content is not None:
|
|
msg.reasoning_content = reasoning_content
|
|
if reasoning_details is not None:
|
|
msg.reasoning_details = reasoning_details
|
|
return msg
|
|
|
|
|
|
def _mock_tool_call(name="web_search", arguments="{}", call_id=None):
|
|
"""Return a SimpleNamespace mimicking a tool call object."""
|
|
return SimpleNamespace(
|
|
id=call_id or f"call_{uuid.uuid4().hex[:8]}",
|
|
type="function",
|
|
function=SimpleNamespace(name=name, arguments=arguments),
|
|
)
|
|
|
|
|
|
def _mock_response(
|
|
content="Hello",
|
|
finish_reason="stop",
|
|
tool_calls=None,
|
|
reasoning=None,
|
|
reasoning_content=None,
|
|
reasoning_details=None,
|
|
usage=None,
|
|
):
|
|
"""Return a SimpleNamespace mimicking an OpenAI ChatCompletion response."""
|
|
msg = _mock_assistant_msg(
|
|
content=content,
|
|
tool_calls=tool_calls,
|
|
reasoning=reasoning,
|
|
reasoning_content=reasoning_content,
|
|
reasoning_details=reasoning_details,
|
|
)
|
|
choice = SimpleNamespace(message=msg, finish_reason=finish_reason)
|
|
resp = SimpleNamespace(choices=[choice], model="test/model")
|
|
if usage:
|
|
resp.usage = SimpleNamespace(**usage)
|
|
else:
|
|
resp.usage = None
|
|
return resp
|
|
|
|
|
|
# ===================================================================
|
|
# Group 1: Pure Functions
|
|
# ===================================================================
|
|
|
|
|
|
class TestHasContentAfterThinkBlock:
|
|
def test_none_returns_false(self, agent):
|
|
assert agent._has_content_after_think_block(None) is False
|
|
|
|
def test_empty_returns_false(self, agent):
|
|
assert agent._has_content_after_think_block("") is False
|
|
|
|
def test_only_think_block_returns_false(self, agent):
|
|
assert agent._has_content_after_think_block("<think>reasoning</think>") is False
|
|
|
|
def test_content_after_think_returns_true(self, agent):
|
|
assert (
|
|
agent._has_content_after_think_block("<think>r</think> actual answer")
|
|
is True
|
|
)
|
|
|
|
def test_no_think_block_returns_true(self, agent):
|
|
assert agent._has_content_after_think_block("just normal content") is True
|
|
|
|
|
|
class TestStripThinkBlocks:
|
|
def test_none_returns_empty(self, agent):
|
|
assert agent._strip_think_blocks(None) == ""
|
|
|
|
def test_no_blocks_unchanged(self, agent):
|
|
assert agent._strip_think_blocks("hello world") == "hello world"
|
|
|
|
def test_single_block_removed(self, agent):
|
|
result = agent._strip_think_blocks("<think>reasoning</think> answer")
|
|
assert "reasoning" not in result
|
|
assert "answer" in result
|
|
|
|
def test_multiline_block_removed(self, agent):
|
|
text = "<think>\nline1\nline2\n</think>\nvisible"
|
|
result = agent._strip_think_blocks(text)
|
|
assert "line1" not in result
|
|
assert "visible" in result
|
|
|
|
def test_orphaned_closing_think_tag(self, agent):
|
|
result = agent._strip_think_blocks("some reasoning</think>actual answer")
|
|
assert "</think>" not in result
|
|
assert "actual answer" in result
|
|
|
|
def test_orphaned_closing_thinking_tag(self, agent):
|
|
result = agent._strip_think_blocks("reasoning</thinking>answer")
|
|
assert "</thinking>" not in result
|
|
assert "answer" in result
|
|
|
|
def test_orphaned_opening_think_tag(self, agent):
|
|
result = agent._strip_think_blocks("<think>orphaned reasoning without close")
|
|
assert "<think>" not in result
|
|
|
|
def test_mixed_orphaned_and_paired_tags(self, agent):
|
|
text = "stray</think><think>paired reasoning</think> visible"
|
|
result = agent._strip_think_blocks(text)
|
|
assert "</think>" not in result
|
|
assert "<think>" not in result
|
|
assert "visible" in result
|
|
|
|
def test_thought_block_removed(self, agent):
|
|
"""Gemma 4 uses <thought> tags for inline reasoning."""
|
|
result = agent._strip_think_blocks("<thought>internal reasoning</thought> answer")
|
|
assert "internal reasoning" not in result
|
|
assert "<thought>" not in result
|
|
assert "answer" in result
|
|
|
|
def test_orphaned_thought_tag(self, agent):
|
|
result = agent._strip_think_blocks("<thought>orphaned reasoning without close")
|
|
assert "<thought>" not in result
|
|
|
|
# ─── Unterminated-block coverage (#8878, #9568, #10408) ──────────────
|
|
# Reasoning models served via NIM / MiniMax M2.7 frequently drop the
|
|
# closing tag, leaking raw reasoning into assistant content. The open
|
|
# tag appears at a block boundary (start of text or after a newline);
|
|
# everything from that tag to end-of-string is stripped.
|
|
|
|
def test_unterminated_think_block_content_stripped(self, agent):
|
|
"""Content after unterminated <think> is fully stripped."""
|
|
result = agent._strip_think_blocks("<think>orphaned reasoning without close")
|
|
assert "orphaned reasoning" not in result
|
|
assert result.strip() == ""
|
|
|
|
def test_unterminated_thought_block_content_stripped(self, agent):
|
|
"""Gemma-style <thought> with no close is fully stripped."""
|
|
result = agent._strip_think_blocks("<thought>orphaned reasoning without close")
|
|
assert "orphaned reasoning" not in result
|
|
assert result.strip() == ""
|
|
|
|
def test_unterminated_multiline_block_stripped(self, agent):
|
|
"""Multi-line unterminated blocks are stripped in full."""
|
|
result = agent._strip_think_blocks(
|
|
"<think>\nmulti\nline\nreasoning\nthat never closes"
|
|
)
|
|
assert "multi" not in result
|
|
assert "never closes" not in result
|
|
|
|
def test_unterminated_block_after_answer_preserves_prefix(self, agent):
|
|
"""Visible answer before a line-starting unterminated tag is kept."""
|
|
result = agent._strip_think_blocks(
|
|
"Answer is 42.\n<think>actually let me reconsider"
|
|
)
|
|
assert "Answer is 42." in result
|
|
assert "reconsider" not in result
|
|
|
|
def test_inline_think_mention_in_prose_not_over_stripped(self, agent):
|
|
"""Mid-line `<think>` mentioned in prose must not swallow the rest
|
|
of the content (the block-boundary check prevents this)."""
|
|
text = "Use the <think> tag like this in your prose."
|
|
result = agent._strip_think_blocks(text)
|
|
# Block-boundary check prevents unterminated-strip from firing
|
|
assert "prose" in result
|
|
assert "Use the" in result
|
|
|
|
def test_mixed_case_closed_pair_stripped(self, agent):
|
|
"""Mixed-case variants <THINK>…</THINK>, <Thinking>…</Thinking> are
|
|
handled by case-insensitive closed-pair regex, so the trailing
|
|
content is preserved."""
|
|
result = agent._strip_think_blocks("<THINK>upper</THINK>final")
|
|
assert "upper" not in result
|
|
assert "final" in result
|
|
result = agent._strip_think_blocks("<Thinking>mixed</Thinking>final")
|
|
assert "mixed" not in result
|
|
assert "final" in result
|
|
|
|
# ─── Tool-call XML block stripping (openclaw/openclaw#67318) ─────────
|
|
# Some open models (notably Gemma variants via OpenRouter) emit
|
|
# standalone tool-call XML inside assistant content instead of via the
|
|
# structured `tool_calls` field. Left unstripped, raw XML leaks to
|
|
# gateway users (Discord/Telegram/Matrix) and the CLI.
|
|
|
|
def test_tool_call_block_stripped(self, agent):
|
|
text = '<tool_call>{"name": "read_file", "arguments": {"path": "/tmp/x"}}</tool_call> done'
|
|
result = agent._strip_think_blocks(text)
|
|
assert "<tool_call>" not in result
|
|
assert "read_file" not in result
|
|
assert "done" in result
|
|
|
|
def test_function_calls_block_stripped(self, agent):
|
|
text = '<function_calls>[{"name":"x"}]</function_calls>after'
|
|
result = agent._strip_think_blocks(text)
|
|
assert "<function_calls>" not in result
|
|
assert "after" in result
|
|
|
|
def test_gemma_function_name_block_stripped(self, agent):
|
|
"""Gemma-style: <function name="read"><parameter>...</parameter></function>."""
|
|
text = (
|
|
'Let me check the file.\n'
|
|
'<function name="read_file"><parameter name="path">/tmp/x.md</parameter></function>\n'
|
|
'Here is the result.'
|
|
)
|
|
result = agent._strip_think_blocks(text)
|
|
assert '<function name="read_file">' not in result
|
|
assert "/tmp/x.md" not in result
|
|
assert "Let me check the file." in result
|
|
assert "Here is the result." in result
|
|
|
|
def test_gemma_function_multiline_payload_stripped(self, agent):
|
|
text = (
|
|
'Reading now.\n'
|
|
'<function name="read_file">\n'
|
|
' <parameter name="path">/etc/passwd</parameter>\n'
|
|
'</function>\n'
|
|
'Done.'
|
|
)
|
|
result = agent._strip_think_blocks(text)
|
|
assert "/etc/passwd" not in result
|
|
assert "Reading now." in result
|
|
assert "Done." in result
|
|
|
|
def test_function_mention_in_prose_preserved(self, agent):
|
|
"""'Use <function> in JavaScript.' — no name attr, not at block boundary
|
|
in a way that suggests tool call. Must survive."""
|
|
text = "In JS you can use <function> declarations for hoisting."
|
|
result = agent._strip_think_blocks(text)
|
|
# Prose mention has no name="..." attribute -> not stripped
|
|
assert "declarations for hoisting" in result
|
|
|
|
def test_function_with_attr_in_middle_of_sentence_preserved(self, agent):
|
|
"""Docs example: 'Use <function name="x">...</function> in docs.'
|
|
The sentence-middle position without a preceding punctuation block
|
|
boundary means it is NOT stripped. Prose context remains."""
|
|
text = 'You can write <function name="x">y</function> inline.'
|
|
result = agent._strip_think_blocks(text)
|
|
# Without a leading block boundary (no punctuation before), leaves intact
|
|
assert "You can write" in result
|
|
assert "inline" in result
|
|
|
|
def test_stray_function_close_tag_removed(self, agent):
|
|
text = "answer</function> trailing"
|
|
result = agent._strip_think_blocks(text)
|
|
assert "</function>" not in result
|
|
assert "answer" in result
|
|
assert "trailing" in result
|
|
|
|
def test_dangling_function_open_tag_preserved(self, agent):
|
|
"""A streamed-but-truncated <function name="..."> block with no close
|
|
is intentionally NOT stripped (OpenClaw's asymmetry). The tail of a
|
|
streaming reply may still be valuable to the user."""
|
|
text = 'Checking: <function name="read">'
|
|
result = agent._strip_think_blocks(text)
|
|
assert "Checking:" in result
|
|
|
|
def test_mixed_reasoning_and_tool_call_both_stripped(self, agent):
|
|
text = '<think>let me plan</think><tool_call>{"name":"x"}</tool_call>final answer'
|
|
result = agent._strip_think_blocks(text)
|
|
assert "let me plan" not in result
|
|
assert "<tool_call>" not in result
|
|
assert "final answer" in result
|
|
|
|
|
|
class TestExtractReasoning:
|
|
def test_reasoning_field(self, agent):
|
|
msg = _mock_assistant_msg(reasoning="thinking hard")
|
|
assert agent._extract_reasoning(msg) == "thinking hard"
|
|
|
|
def test_reasoning_content_field(self, agent):
|
|
msg = _mock_assistant_msg(reasoning_content="deep thought")
|
|
assert agent._extract_reasoning(msg) == "deep thought"
|
|
|
|
def test_reasoning_details_array(self, agent):
|
|
msg = _mock_assistant_msg(
|
|
reasoning_details=[{"summary": "step-by-step analysis"}],
|
|
)
|
|
assert "step-by-step analysis" in agent._extract_reasoning(msg)
|
|
|
|
def test_no_reasoning_returns_none(self, agent):
|
|
msg = _mock_assistant_msg()
|
|
assert agent._extract_reasoning(msg) is None
|
|
|
|
def test_combined_reasoning(self, agent):
|
|
msg = _mock_assistant_msg(
|
|
reasoning="part1",
|
|
reasoning_content="part2",
|
|
)
|
|
result = agent._extract_reasoning(msg)
|
|
assert "part1" in result
|
|
assert "part2" in result
|
|
|
|
def test_deduplication(self, agent):
|
|
msg = _mock_assistant_msg(
|
|
reasoning="same text",
|
|
reasoning_content="same text",
|
|
)
|
|
result = agent._extract_reasoning(msg)
|
|
assert result == "same text"
|
|
|
|
@pytest.mark.parametrize(
|
|
("content", "expected"),
|
|
[
|
|
("<think>thinking hard</think>", "thinking hard"),
|
|
("<thinking>step by step</thinking>", "step by step"),
|
|
(
|
|
"<REASONING_SCRATCHPAD>scratch analysis</REASONING_SCRATCHPAD>",
|
|
"scratch analysis",
|
|
),
|
|
],
|
|
)
|
|
def test_inline_reasoning_blocks_fallback(self, agent, content, expected):
|
|
msg = _mock_assistant_msg(content=content)
|
|
assert agent._extract_reasoning(msg) == expected
|
|
|
|
def test_content_list_thinking_blocks_extracted(self, agent):
|
|
"""DeepSeek V4 Pro returns content as a typed-block list (issue #21944).
|
|
|
|
Without this branch thinking text is silently dropped → HTTP 400 on
|
|
the next turn ("thinking must be passed back to the API").
|
|
"""
|
|
msg = _mock_assistant_msg(
|
|
content=[
|
|
{"type": "thinking", "thinking": "deep analysis here"},
|
|
{"type": "output", "text": "final answer"},
|
|
]
|
|
)
|
|
result = agent._extract_reasoning(msg)
|
|
assert result == "deep analysis here"
|
|
|
|
def test_content_list_non_thinking_blocks_ignored(self, agent):
|
|
"""Non-thinking blocks in a content list must not be treated as reasoning."""
|
|
msg = _mock_assistant_msg(
|
|
content=[
|
|
{"type": "text", "text": "just a regular response"},
|
|
]
|
|
)
|
|
assert agent._extract_reasoning(msg) is None
|
|
|
|
def test_content_list_thinking_prefers_structured_field(self, agent):
|
|
"""Structured ``reasoning`` field wins over content-list thinking blocks."""
|
|
msg = _mock_assistant_msg(
|
|
reasoning="from structured field",
|
|
content=[
|
|
{"type": "thinking", "thinking": "from content list"},
|
|
],
|
|
)
|
|
result = agent._extract_reasoning(msg)
|
|
# structured field was found first → content-list branch skipped
|
|
assert result == "from structured field"
|
|
|
|
|
|
class TestSessionJsonSnapshotOptIn:
|
|
"""Regression: per-session JSON snapshot writer is opt-in via config.
|
|
|
|
state.db is canonical (PR #29182). ``sessions.write_json_snapshots``
|
|
defaults to False, so the agent must NOT write ``session_{sid}.json``
|
|
files by default — that behavior caused multi-GB sessions directories
|
|
on heavy users. Users can opt back in for external tooling that reads
|
|
the JSON files directly.
|
|
"""
|
|
|
|
def test_session_json_disabled_by_default(self, agent):
|
|
# Default config: writer is gated off.
|
|
assert getattr(agent, "_session_json_enabled", False) is False, (
|
|
"sessions.write_json_snapshots must default to False"
|
|
)
|
|
|
|
def test_save_session_log_noops_when_disabled(self, agent, tmp_path):
|
|
# When disabled, calling the method must not write any file even
|
|
# if logs_dir is writable and messages are non-empty.
|
|
agent._session_json_enabled = False
|
|
agent.logs_dir = tmp_path
|
|
agent._session_messages = [{"role": "user", "content": "hello"}]
|
|
agent._save_session_log()
|
|
# No session_*.json must appear under logs_dir.
|
|
assert list(tmp_path.glob("session_*.json")) == []
|
|
|
|
def test_save_session_log_writes_when_enabled(self, agent, tmp_path):
|
|
# Opt-in path: with the flag on and a session_id, the writer must
|
|
# produce ``session_{sid}.json`` under logs_dir.
|
|
agent._session_json_enabled = True
|
|
agent.logs_dir = tmp_path
|
|
messages = [{"role": "user", "content": "hello"}]
|
|
agent._save_session_log(messages)
|
|
expected = tmp_path / f"session_{agent.session_id}.json"
|
|
assert expected.exists(), (
|
|
"Opt-in writer must produce session_{sid}.json under logs_dir"
|
|
)
|
|
|
|
def test_logs_dir_retained_for_request_dumps(self, agent):
|
|
# logs_dir is kept unconditionally because
|
|
# agent_runtime_helpers.dump_api_request_debug still writes
|
|
# request_dump_*.json there (debug breadcrumb path), independent of
|
|
# the session JSON opt-in.
|
|
assert hasattr(agent, "logs_dir")
|
|
|
|
|
|
class TestSaveSessionLogRedactsSecrets:
|
|
"""Regression: session_*.json must not contain plaintext credentials (#19798, #19845)."""
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _ensure_redaction_enabled(self, monkeypatch):
|
|
"""Force redaction on regardless of host HERMES_REDACT_SECRETS state.
|
|
The hermetic conftest blanks the env var; the module-level
|
|
``_REDACT_ENABLED`` constant is captured at import time, so we
|
|
flip it directly for the duration of these tests."""
|
|
monkeypatch.delenv("HERMES_REDACT_SECRETS", raising=False)
|
|
monkeypatch.setattr("agent.redact._REDACT_ENABLED", True)
|
|
|
|
def test_redacts_api_key_in_tool_content(self, agent, tmp_path):
|
|
agent._session_json_enabled = True
|
|
agent.logs_dir = tmp_path
|
|
messages = [
|
|
{"role": "user", "content": "Hello"},
|
|
{
|
|
"role": "tool",
|
|
"content": "Response: Authorization: Bearer sk-proj-abc123def456ghi789jkl012mno",
|
|
},
|
|
]
|
|
agent._save_session_log(messages)
|
|
|
|
snapshot = (tmp_path / f"session_{agent.session_id}.json").read_text(encoding="utf-8")
|
|
assert "sk-proj-abc123def456ghi789jkl012mno" not in snapshot
|
|
|
|
def test_redacts_api_key_in_user_message(self, agent, tmp_path):
|
|
agent._session_json_enabled = True
|
|
agent.logs_dir = tmp_path
|
|
messages = [
|
|
{"role": "user", "content": "My key is sk-ant-api03-abc123def456ghi789jkl012mno please use it"},
|
|
]
|
|
agent._save_session_log(messages)
|
|
|
|
snapshot = (tmp_path / f"session_{agent.session_id}.json").read_text(encoding="utf-8")
|
|
assert "sk-ant-api03-abc123def456ghi789jkl012mno" not in snapshot
|
|
|
|
def test_redacts_system_prompt_credentials(self, agent, tmp_path):
|
|
agent._session_json_enabled = True
|
|
agent.logs_dir = tmp_path
|
|
agent._cached_system_prompt = "Use key sk-proj-realkey1234567890123456 for API calls"
|
|
agent._save_session_log([{"role": "user", "content": "test"}])
|
|
|
|
snapshot = (tmp_path / f"session_{agent.session_id}.json").read_text(encoding="utf-8")
|
|
assert "sk-proj-realkey1234567890123456" not in snapshot
|
|
|
|
def test_redacts_list_type_multimodal_content(self, agent, tmp_path):
|
|
"""OpenAI/Anthropic multimodal shape: content = list of {type, text|image_url} parts."""
|
|
agent._session_json_enabled = True
|
|
agent.logs_dir = tmp_path
|
|
messages = [
|
|
{
|
|
"role": "user",
|
|
"content": [
|
|
{"type": "text", "text": "Key: gsk_abc123def456ghi789jkl012mno"},
|
|
{"type": "image_url", "image_url": {"url": "data:image/png;base64,abc"}},
|
|
],
|
|
},
|
|
]
|
|
agent._save_session_log(messages)
|
|
|
|
snapshot_text = (tmp_path / f"session_{agent.session_id}.json").read_text(encoding="utf-8")
|
|
snapshot = json.loads(snapshot_text)
|
|
parts = snapshot["messages"][0]["content"]
|
|
assert "gsk_abc123def456ghi789jkl012mno" not in parts[0]["text"]
|
|
# Image part preserved untouched
|
|
assert parts[1]["image_url"]["url"].startswith("data:image")
|
|
|
|
|
|
class TestGetMessagesUpToLastAssistant:
|
|
def test_empty_list(self, agent):
|
|
assert agent._get_messages_up_to_last_assistant([]) == []
|
|
|
|
def test_no_assistant_returns_copy(self, agent):
|
|
msgs = [{"role": "user", "content": "hi"}]
|
|
result = agent._get_messages_up_to_last_assistant(msgs)
|
|
assert result == msgs
|
|
assert result is not msgs # should be a copy
|
|
|
|
def test_single_assistant(self, agent):
|
|
msgs = [
|
|
{"role": "user", "content": "hi"},
|
|
{"role": "assistant", "content": "hello"},
|
|
]
|
|
result = agent._get_messages_up_to_last_assistant(msgs)
|
|
assert len(result) == 1
|
|
assert result[0]["role"] == "user"
|
|
|
|
def test_multiple_assistants_returns_up_to_last(self, agent):
|
|
msgs = [
|
|
{"role": "user", "content": "q1"},
|
|
{"role": "assistant", "content": "a1"},
|
|
{"role": "user", "content": "q2"},
|
|
{"role": "assistant", "content": "a2"},
|
|
]
|
|
result = agent._get_messages_up_to_last_assistant(msgs)
|
|
assert len(result) == 3
|
|
assert result[-1]["content"] == "q2"
|
|
|
|
def test_assistant_then_tool_messages(self, agent):
|
|
msgs = [
|
|
{"role": "user", "content": "do something"},
|
|
{"role": "assistant", "content": "ok", "tool_calls": [{"id": "1"}]},
|
|
{"role": "tool", "content": "result", "tool_call_id": "1"},
|
|
]
|
|
# Last assistant is at index 1, so result = msgs[:1]
|
|
result = agent._get_messages_up_to_last_assistant(msgs)
|
|
assert len(result) == 1
|
|
assert result[0]["role"] == "user"
|
|
|
|
|
|
class TestMaskApiKey:
|
|
def test_none_returns_none(self, agent):
|
|
assert agent._mask_api_key_for_logs(None) is None
|
|
|
|
def test_short_key_returns_stars(self, agent):
|
|
assert agent._mask_api_key_for_logs("short") == "***"
|
|
|
|
def test_long_key_masked(self, agent):
|
|
key = "sk-or-v1-abcdefghijklmnop"
|
|
result = agent._mask_api_key_for_logs(key)
|
|
assert result.startswith("sk-or-v1")
|
|
assert result.endswith("mnop")
|
|
assert "..." in result
|
|
|
|
|
|
# ===================================================================
|
|
# Group 2: State / Structure Methods
|
|
# ===================================================================
|
|
|
|
|
|
class TestInit:
|
|
def test_anthropic_base_url_accepted(self):
|
|
"""Anthropic base URLs should route to native Anthropic client."""
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=[]),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("agent.anthropic_adapter._anthropic_sdk") as mock_anthropic,
|
|
):
|
|
agent = AIAgent(
|
|
api_key="test-key-1234567890",
|
|
base_url="https://api.anthropic.com/v1/",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
assert agent.api_mode == "anthropic_messages"
|
|
mock_anthropic.Anthropic.assert_called_once()
|
|
|
|
def test_prompt_caching_claude_openrouter(self):
|
|
"""Claude model via OpenRouter should enable prompt caching."""
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=[]),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
):
|
|
a = AIAgent(
|
|
api_key="test-k...7890",
|
|
model="anthropic/claude-sonnet-4-20250514",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
assert a._use_prompt_caching is True
|
|
|
|
def test_prompt_caching_non_claude(self):
|
|
"""Non-Claude model should disable prompt caching."""
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=[]),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
):
|
|
a = AIAgent(
|
|
api_key="test-key-1234567890",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
model="openai/gpt-4o",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
assert a._use_prompt_caching is False
|
|
|
|
def test_prompt_caching_non_openrouter(self):
|
|
"""Custom base_url (not OpenRouter) should disable prompt caching."""
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=[]),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
):
|
|
a = AIAgent(
|
|
api_key="test-key-1234567890",
|
|
model="anthropic/claude-sonnet-4-20250514",
|
|
base_url="http://localhost:8080/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
assert a._use_prompt_caching is False
|
|
|
|
def test_prompt_caching_native_anthropic(self):
|
|
"""Native Anthropic provider should enable prompt caching."""
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=[]),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("agent.anthropic_adapter._anthropic_sdk"),
|
|
):
|
|
a = AIAgent(
|
|
api_key="test-key-1234567890",
|
|
base_url="https://api.anthropic.com/v1/",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
assert a.api_mode == "anthropic_messages"
|
|
assert a._use_prompt_caching is True
|
|
|
|
def test_prompt_caching_cache_ttl_defaults_without_config(self):
|
|
"""cache_ttl stays 5m when prompt_caching is absent from config."""
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=[]),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
patch("hermes_cli.config.load_config", return_value={}),
|
|
):
|
|
a = AIAgent(
|
|
api_key="test-k...7890",
|
|
model="anthropic/claude-sonnet-4-20250514",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
assert a._cache_ttl == "5m"
|
|
|
|
def test_prompt_caching_cache_ttl_custom_1h(self):
|
|
"""prompt_caching.cache_ttl 1h is applied when present in config."""
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=[]),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
patch(
|
|
"hermes_cli.config.load_config",
|
|
return_value={"prompt_caching": {"cache_ttl": "1h"}},
|
|
),
|
|
):
|
|
a = AIAgent(
|
|
api_key="test-k...7890",
|
|
model="anthropic/claude-sonnet-4-20250514",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
assert a._cache_ttl == "1h"
|
|
|
|
def test_model_max_tokens_from_config(self):
|
|
"""model.max_tokens config populates the chat-completions request cap."""
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=_make_tool_defs("terminal")),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
patch(
|
|
"hermes_cli.config.load_config",
|
|
return_value={"model": {"max_tokens": 4096}},
|
|
),
|
|
):
|
|
a = AIAgent(
|
|
api_key="test-k...7890",
|
|
provider="custom",
|
|
model="claude-opus-4-6-thinking",
|
|
base_url="http://proxy.example/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
|
|
kwargs = a._build_api_kwargs([{"role": "user", "content": "Hi"}])
|
|
|
|
assert a.max_tokens == 4096
|
|
assert kwargs["max_tokens"] == 4096
|
|
|
|
def test_constructor_max_tokens_wins_over_config(self):
|
|
"""Explicit constructor max_tokens keeps programmatic callers stable."""
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=[]),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
patch(
|
|
"hermes_cli.config.load_config",
|
|
return_value={"model": {"max_tokens": 4096}},
|
|
),
|
|
):
|
|
a = AIAgent(
|
|
api_key="test-k...7890",
|
|
provider="custom",
|
|
model="claude-opus-4-6-thinking",
|
|
base_url="http://proxy.example/v1",
|
|
max_tokens=8192,
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
|
|
assert a.max_tokens == 8192
|
|
|
|
def test_prompt_caching_cache_ttl_invalid_falls_back(self):
|
|
"""Non-Anthropic TTL values keep default 5m without raising."""
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=[]),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
patch(
|
|
"hermes_cli.config.load_config",
|
|
return_value={"prompt_caching": {"cache_ttl": "30m"}},
|
|
),
|
|
):
|
|
a = AIAgent(
|
|
api_key="test-k...7890",
|
|
model="anthropic/claude-sonnet-4-20250514",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
assert a._cache_ttl == "5m"
|
|
|
|
def test_valid_tool_names_populated(self):
|
|
"""valid_tool_names should contain names from loaded tools."""
|
|
tools = _make_tool_defs("web_search", "terminal")
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=tools),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
):
|
|
a = AIAgent(
|
|
api_key="test-key-1234567890",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
assert a.valid_tool_names == {"web_search", "terminal"}
|
|
|
|
def test_session_id_auto_generated(self):
|
|
"""Session ID should be auto-generated in YYYYMMDD_HHMMSS_<hex6> format."""
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=[]),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
):
|
|
a = AIAgent(
|
|
api_key="test-key-1234567890",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
# Format: YYYYMMDD_HHMMSS_<6 hex chars>
|
|
assert re.match(r"^\d{8}_\d{6}_[0-9a-f]{6}$", a.session_id), (
|
|
f"session_id doesn't match expected format: {a.session_id}"
|
|
)
|
|
|
|
|
|
class TestInterrupt:
|
|
def test_interrupt_sets_flag(self, agent):
|
|
with patch("run_agent._set_interrupt"):
|
|
agent.interrupt()
|
|
assert agent._interrupt_requested is True
|
|
|
|
def test_interrupt_with_message(self, agent):
|
|
with patch("run_agent._set_interrupt"):
|
|
agent.interrupt("new question")
|
|
assert agent._interrupt_message == "new question"
|
|
|
|
def test_clear_interrupt(self, agent):
|
|
with patch("run_agent._set_interrupt"):
|
|
agent.interrupt("msg")
|
|
agent.clear_interrupt()
|
|
assert agent._interrupt_requested is False
|
|
assert agent._interrupt_message is None
|
|
|
|
def test_is_interrupted_property(self, agent):
|
|
assert agent.is_interrupted is False
|
|
with patch("run_agent._set_interrupt"):
|
|
agent.interrupt()
|
|
assert agent.is_interrupted is True
|
|
|
|
|
|
class TestHydrateTodoStore:
|
|
def test_no_todo_in_history(self, agent):
|
|
history = [
|
|
{"role": "user", "content": "hello"},
|
|
{"role": "assistant", "content": "hi"},
|
|
]
|
|
with patch("run_agent._set_interrupt"):
|
|
agent._hydrate_todo_store(history)
|
|
assert not agent._todo_store.has_items()
|
|
|
|
def test_recovers_from_history(self, agent):
|
|
todos = [{"id": "1", "content": "do thing", "status": "pending"}]
|
|
history = [
|
|
{"role": "user", "content": "plan"},
|
|
{"role": "assistant", "content": "ok"},
|
|
{
|
|
"role": "tool",
|
|
"content": json.dumps({"todos": todos}),
|
|
"tool_call_id": "c1",
|
|
},
|
|
]
|
|
with patch("run_agent._set_interrupt"):
|
|
agent._hydrate_todo_store(history)
|
|
assert agent._todo_store.has_items()
|
|
|
|
def test_skips_non_todo_tools(self, agent):
|
|
history = [
|
|
{
|
|
"role": "tool",
|
|
"content": '{"result": "search done"}',
|
|
"tool_call_id": "c1",
|
|
},
|
|
]
|
|
with patch("run_agent._set_interrupt"):
|
|
agent._hydrate_todo_store(history)
|
|
assert not agent._todo_store.has_items()
|
|
|
|
def test_invalid_json_skipped(self, agent):
|
|
history = [
|
|
{
|
|
"role": "tool",
|
|
"content": 'not valid json "todos" oops',
|
|
"tool_call_id": "c1",
|
|
},
|
|
]
|
|
with patch("run_agent._set_interrupt"):
|
|
agent._hydrate_todo_store(history)
|
|
assert not agent._todo_store.has_items()
|
|
|
|
|
|
class TestBuildSystemPrompt:
|
|
def test_always_has_identity(self, agent):
|
|
prompt = agent._build_system_prompt()
|
|
assert DEFAULT_AGENT_IDENTITY in prompt
|
|
|
|
def test_can_use_soul_identity_even_when_context_files_are_skipped(self):
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=_make_tool_defs("terminal")),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
patch("run_agent.load_soul_md", return_value="SOUL IDENTITY"),
|
|
):
|
|
agent = AIAgent(
|
|
api_key="test-k...7890",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
load_soul_identity=True,
|
|
skip_memory=True,
|
|
)
|
|
prompt = agent._build_system_prompt()
|
|
|
|
assert "SOUL IDENTITY" in prompt
|
|
assert DEFAULT_AGENT_IDENTITY not in prompt
|
|
|
|
def test_includes_system_message(self, agent):
|
|
prompt = agent._build_system_prompt(system_message="Custom instruction")
|
|
assert "Custom instruction" in prompt
|
|
|
|
def test_memory_guidance_when_memory_tool_loaded(self, agent_with_memory_tool):
|
|
from agent.prompt_builder import MEMORY_GUIDANCE
|
|
|
|
prompt = agent_with_memory_tool._build_system_prompt()
|
|
assert MEMORY_GUIDANCE in prompt
|
|
|
|
def test_no_memory_guidance_without_tool(self, agent):
|
|
from agent.prompt_builder import MEMORY_GUIDANCE
|
|
|
|
prompt = agent._build_system_prompt()
|
|
assert MEMORY_GUIDANCE not in prompt
|
|
|
|
def test_includes_datetime(self, agent):
|
|
prompt = agent._build_system_prompt()
|
|
# Should contain current date info like "Conversation started:"
|
|
assert "Conversation started:" in prompt
|
|
|
|
def test_datetime_is_date_only_not_minute_precision(self, agent):
|
|
"""Timestamp must be date-only (no HH:MM) so the system prompt
|
|
stays byte-stable for the full day. Minute precision invalidates
|
|
prefix-cache KV on every rebuild path (compression, fresh-agent
|
|
gateway turns, session resume without a stored prompt)."""
|
|
prompt = agent._build_system_prompt()
|
|
# Find the line and strip it for inspection
|
|
for line in prompt.splitlines():
|
|
if line.startswith("Conversation started:"):
|
|
# Must NOT contain AM/PM indicator (minute precision had %I:%M %p)
|
|
assert " AM" not in line and " PM" not in line, (
|
|
f"Timestamp line has time-of-day, breaks daily cache stability: {line!r}"
|
|
)
|
|
# Must NOT contain a colon followed by two digits (HH:MM pattern)
|
|
import re as _re
|
|
assert not _re.search(r":\d{2}", line), (
|
|
f"Timestamp line has HH:MM, breaks daily cache stability: {line!r}"
|
|
)
|
|
break
|
|
else:
|
|
assert False, "Expected a 'Conversation started:' line in the system prompt"
|
|
|
|
def test_includes_nous_subscription_prompt(self, agent, monkeypatch):
|
|
monkeypatch.setattr(run_agent, "build_nous_subscription_prompt", lambda tool_names: "NOUS SUBSCRIPTION BLOCK")
|
|
prompt = agent._build_system_prompt()
|
|
assert "NOUS SUBSCRIPTION BLOCK" in prompt
|
|
|
|
def test_skills_prompt_derives_available_toolsets_from_loaded_tools(self):
|
|
tools = _make_tool_defs("web_search", "skills_list", "skill_view", "skill_manage")
|
|
toolset_map = {
|
|
"web_search": "web",
|
|
"skills_list": "skills",
|
|
"skill_view": "skills",
|
|
"skill_manage": "skills",
|
|
}
|
|
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=tools),
|
|
patch(
|
|
"run_agent.check_toolset_requirements",
|
|
side_effect=AssertionError("should not re-check toolset requirements"),
|
|
),
|
|
patch("run_agent.get_toolset_for_tool", create=True, side_effect=toolset_map.get),
|
|
patch("run_agent.build_skills_system_prompt", return_value="SKILLS_PROMPT") as mock_skills,
|
|
patch("run_agent.OpenAI"),
|
|
):
|
|
agent = AIAgent(
|
|
api_key="test-k...7890",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
|
|
prompt = agent._build_system_prompt()
|
|
|
|
assert "SKILLS_PROMPT" in prompt
|
|
assert mock_skills.call_args.kwargs["available_tools"] == set(toolset_map)
|
|
assert mock_skills.call_args.kwargs["available_toolsets"] == {"web", "skills"}
|
|
|
|
|
|
class TestToolUseEnforcementConfig:
|
|
"""Tests for the agent.tool_use_enforcement config option."""
|
|
|
|
def _make_agent(self, model="openai/gpt-4.1", tool_use_enforcement="auto"):
|
|
"""Create an agent with tools and a specific enforcement config."""
|
|
with (
|
|
patch(
|
|
"run_agent.get_tool_definitions",
|
|
return_value=_make_tool_defs("terminal", "web_search"),
|
|
),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
patch(
|
|
"hermes_cli.config.load_config",
|
|
return_value={"agent": {"tool_use_enforcement": tool_use_enforcement}},
|
|
),
|
|
):
|
|
a = AIAgent(
|
|
model=model,
|
|
api_key="test-key-1234567890",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
a.client = MagicMock()
|
|
return a
|
|
|
|
def test_auto_injects_for_gpt(self):
|
|
from agent.prompt_builder import TOOL_USE_ENFORCEMENT_GUIDANCE
|
|
agent = self._make_agent(model="openai/gpt-4.1", tool_use_enforcement="auto")
|
|
prompt = agent._build_system_prompt()
|
|
assert TOOL_USE_ENFORCEMENT_GUIDANCE in prompt
|
|
|
|
def test_auto_injects_for_codex(self):
|
|
from agent.prompt_builder import TOOL_USE_ENFORCEMENT_GUIDANCE
|
|
agent = self._make_agent(model="openai/codex-mini", tool_use_enforcement="auto")
|
|
prompt = agent._build_system_prompt()
|
|
assert TOOL_USE_ENFORCEMENT_GUIDANCE in prompt
|
|
|
|
def test_auto_skips_for_claude(self):
|
|
from agent.prompt_builder import TOOL_USE_ENFORCEMENT_GUIDANCE
|
|
agent = self._make_agent(model="anthropic/claude-sonnet-4", tool_use_enforcement="auto")
|
|
prompt = agent._build_system_prompt()
|
|
assert TOOL_USE_ENFORCEMENT_GUIDANCE not in prompt
|
|
|
|
def test_auto_injects_for_grok(self):
|
|
"""xAI Grok / xai-oauth models hit the same enforcement path as GPT."""
|
|
from agent.prompt_builder import TOOL_USE_ENFORCEMENT_GUIDANCE
|
|
agent = self._make_agent(model="x-ai/grok-4.3", tool_use_enforcement="auto")
|
|
prompt = agent._build_system_prompt()
|
|
assert TOOL_USE_ENFORCEMENT_GUIDANCE in prompt
|
|
|
|
def test_auto_injects_for_qwen(self):
|
|
"""Qwen models default to chatty/hallucinatory tool use without enforcement."""
|
|
from agent.prompt_builder import TOOL_USE_ENFORCEMENT_GUIDANCE
|
|
agent = self._make_agent(model="qwen/qwen-plus", tool_use_enforcement="auto")
|
|
prompt = agent._build_system_prompt()
|
|
assert TOOL_USE_ENFORCEMENT_GUIDANCE in prompt
|
|
|
|
def test_auto_injects_for_deepseek(self):
|
|
"""DeepSeek models default to chatty/hallucinatory tool use without enforcement."""
|
|
from agent.prompt_builder import TOOL_USE_ENFORCEMENT_GUIDANCE
|
|
agent = self._make_agent(model="deepseek/deepseek-r1", tool_use_enforcement="auto")
|
|
prompt = agent._build_system_prompt()
|
|
assert TOOL_USE_ENFORCEMENT_GUIDANCE in prompt
|
|
|
|
def test_auto_injects_execution_guidance_for_grok(self):
|
|
"""Grok also gets OPENAI_MODEL_EXECUTION_GUIDANCE (verification,
|
|
mandatory_tool_use, act_dont_ask). Same failure modes as GPT in
|
|
practice — claims completion without tool calls, suggests workarounds
|
|
instead of using existing tools.
|
|
"""
|
|
from agent.prompt_builder import OPENAI_MODEL_EXECUTION_GUIDANCE
|
|
agent = self._make_agent(model="x-ai/grok-4.3", tool_use_enforcement="auto")
|
|
prompt = agent._build_system_prompt()
|
|
assert OPENAI_MODEL_EXECUTION_GUIDANCE in prompt
|
|
|
|
def test_auto_injects_execution_guidance_for_xai_oauth_model(self):
|
|
"""xai-oauth bare model names (no slash) also match the grok pattern."""
|
|
from agent.prompt_builder import OPENAI_MODEL_EXECUTION_GUIDANCE
|
|
agent = self._make_agent(model="grok-4.3", tool_use_enforcement="auto")
|
|
prompt = agent._build_system_prompt()
|
|
assert OPENAI_MODEL_EXECUTION_GUIDANCE in prompt
|
|
|
|
def test_auto_does_not_inject_execution_guidance_for_claude(self):
|
|
"""Sanity: execution guidance stays off for non-targeted families."""
|
|
from agent.prompt_builder import OPENAI_MODEL_EXECUTION_GUIDANCE
|
|
agent = self._make_agent(
|
|
model="anthropic/claude-sonnet-4", tool_use_enforcement="auto"
|
|
)
|
|
prompt = agent._build_system_prompt()
|
|
assert OPENAI_MODEL_EXECUTION_GUIDANCE not in prompt
|
|
|
|
def test_true_forces_for_all_models(self):
|
|
from agent.prompt_builder import TOOL_USE_ENFORCEMENT_GUIDANCE
|
|
agent = self._make_agent(model="anthropic/claude-sonnet-4", tool_use_enforcement=True)
|
|
prompt = agent._build_system_prompt()
|
|
assert TOOL_USE_ENFORCEMENT_GUIDANCE in prompt
|
|
|
|
def test_string_true_forces_for_all_models(self):
|
|
from agent.prompt_builder import TOOL_USE_ENFORCEMENT_GUIDANCE
|
|
agent = self._make_agent(model="anthropic/claude-sonnet-4", tool_use_enforcement="true")
|
|
prompt = agent._build_system_prompt()
|
|
assert TOOL_USE_ENFORCEMENT_GUIDANCE in prompt
|
|
|
|
def test_always_forces_for_all_models(self):
|
|
from agent.prompt_builder import TOOL_USE_ENFORCEMENT_GUIDANCE
|
|
agent = self._make_agent(model="deepseek/deepseek-r1", tool_use_enforcement="always")
|
|
prompt = agent._build_system_prompt()
|
|
assert TOOL_USE_ENFORCEMENT_GUIDANCE in prompt
|
|
|
|
def test_false_disables_for_gpt(self):
|
|
from agent.prompt_builder import TOOL_USE_ENFORCEMENT_GUIDANCE
|
|
agent = self._make_agent(model="openai/gpt-4.1", tool_use_enforcement=False)
|
|
prompt = agent._build_system_prompt()
|
|
assert TOOL_USE_ENFORCEMENT_GUIDANCE not in prompt
|
|
|
|
def test_string_false_disables(self):
|
|
from agent.prompt_builder import TOOL_USE_ENFORCEMENT_GUIDANCE
|
|
agent = self._make_agent(model="openai/gpt-4.1", tool_use_enforcement="off")
|
|
prompt = agent._build_system_prompt()
|
|
assert TOOL_USE_ENFORCEMENT_GUIDANCE not in prompt
|
|
|
|
def test_custom_list_matches(self):
|
|
from agent.prompt_builder import TOOL_USE_ENFORCEMENT_GUIDANCE
|
|
agent = self._make_agent(
|
|
model="deepseek/deepseek-r1",
|
|
tool_use_enforcement=["deepseek", "gemini"],
|
|
)
|
|
prompt = agent._build_system_prompt()
|
|
assert TOOL_USE_ENFORCEMENT_GUIDANCE in prompt
|
|
|
|
def test_custom_list_no_match(self):
|
|
from agent.prompt_builder import TOOL_USE_ENFORCEMENT_GUIDANCE
|
|
agent = self._make_agent(
|
|
model="anthropic/claude-sonnet-4",
|
|
tool_use_enforcement=["deepseek", "gemini"],
|
|
)
|
|
prompt = agent._build_system_prompt()
|
|
assert TOOL_USE_ENFORCEMENT_GUIDANCE not in prompt
|
|
|
|
def test_custom_list_case_insensitive(self):
|
|
from agent.prompt_builder import TOOL_USE_ENFORCEMENT_GUIDANCE
|
|
agent = self._make_agent(
|
|
model="openai/GPT-4.1",
|
|
tool_use_enforcement=["GPT", "Codex"],
|
|
)
|
|
prompt = agent._build_system_prompt()
|
|
assert TOOL_USE_ENFORCEMENT_GUIDANCE in prompt
|
|
|
|
def test_no_tools_never_injects(self):
|
|
"""Even with enforcement=true, no injection when agent has no tools."""
|
|
from agent.prompt_builder import TOOL_USE_ENFORCEMENT_GUIDANCE
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=[]),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
patch(
|
|
"hermes_cli.config.load_config",
|
|
return_value={"agent": {"tool_use_enforcement": True}},
|
|
),
|
|
):
|
|
a = AIAgent(
|
|
api_key="test-key-1234567890",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
enabled_toolsets=[],
|
|
)
|
|
a.client = MagicMock()
|
|
prompt = a._build_system_prompt()
|
|
assert TOOL_USE_ENFORCEMENT_GUIDANCE not in prompt
|
|
|
|
|
|
class TestTaskCompletionGuidance:
|
|
"""Tests for the universal task-completion / no-fabrication guidance
|
|
(config.yaml ``agent.task_completion_guidance``).
|
|
|
|
Unlike tool_use_enforcement, this block is model-family-agnostic — it
|
|
targets cross-model failure modes (stopping after a stub; fabricating
|
|
output when blocked) and should appear for every model by default."""
|
|
|
|
def _make_agent(self, model="anthropic/claude-opus-4.8",
|
|
task_completion_guidance=True, **extra_cfg):
|
|
agent_cfg = {"task_completion_guidance": task_completion_guidance}
|
|
agent_cfg.update(extra_cfg)
|
|
with (
|
|
patch(
|
|
"run_agent.get_tool_definitions",
|
|
return_value=_make_tool_defs("terminal", "web_search"),
|
|
),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
patch(
|
|
"hermes_cli.config.load_config",
|
|
return_value={"agent": agent_cfg},
|
|
),
|
|
):
|
|
a = AIAgent(
|
|
model=model,
|
|
api_key="test-key-1234567890",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
a.client = MagicMock()
|
|
return a
|
|
|
|
def test_default_injects_for_claude(self):
|
|
"""The block must reach Claude by default — that's the
|
|
primary motivating model family."""
|
|
from agent.prompt_builder import TASK_COMPLETION_GUIDANCE
|
|
agent = self._make_agent(model="anthropic/claude-opus-4.8")
|
|
prompt = agent._build_system_prompt()
|
|
assert TASK_COMPLETION_GUIDANCE in prompt
|
|
|
|
def test_default_injects_for_deepseek(self):
|
|
"""And for DeepSeek — the other model that failed the Sarasota
|
|
real-estate task by fabricating output."""
|
|
from agent.prompt_builder import TASK_COMPLETION_GUIDANCE
|
|
agent = self._make_agent(model="deepseek/deepseek-v4-flash")
|
|
prompt = agent._build_system_prompt()
|
|
assert TASK_COMPLETION_GUIDANCE in prompt
|
|
|
|
def test_default_injects_for_gpt(self):
|
|
"""Also reaches model families that already get enforcement —
|
|
it's additive, not exclusive."""
|
|
from agent.prompt_builder import TASK_COMPLETION_GUIDANCE
|
|
agent = self._make_agent(model="openai/gpt-5.4")
|
|
prompt = agent._build_system_prompt()
|
|
assert TASK_COMPLETION_GUIDANCE in prompt
|
|
|
|
def test_false_disables(self):
|
|
from agent.prompt_builder import TASK_COMPLETION_GUIDANCE
|
|
agent = self._make_agent(
|
|
model="anthropic/claude-opus-4.8", task_completion_guidance=False
|
|
)
|
|
prompt = agent._build_system_prompt()
|
|
assert TASK_COMPLETION_GUIDANCE not in prompt
|
|
|
|
def test_no_tools_no_injection(self):
|
|
"""Same gate as tool_use_enforcement — no tools means no guidance.
|
|
The guidance refers to ``tool calls`` and ``tool output``; without
|
|
tools it would be advice for a capability the agent doesn't have."""
|
|
from agent.prompt_builder import TASK_COMPLETION_GUIDANCE
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=[]),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
patch(
|
|
"hermes_cli.config.load_config",
|
|
return_value={"agent": {"task_completion_guidance": True}},
|
|
),
|
|
):
|
|
a = AIAgent(
|
|
api_key="test-key-1234567890",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
enabled_toolsets=[],
|
|
)
|
|
a.client = MagicMock()
|
|
assert TASK_COMPLETION_GUIDANCE not in a._build_system_prompt()
|
|
|
|
|
|
class TestEnvironmentProbeIntegration:
|
|
"""Tests for the local Python toolchain probe wiring (config.yaml
|
|
``agent.environment_probe``). The probe itself is unit-tested in
|
|
tests/tools/test_env_probe.py; this class confirms it lands in the
|
|
system prompt when enabled and stays out when disabled."""
|
|
|
|
def _make_agent(self, model="anthropic/claude-opus-4.8",
|
|
environment_probe=True):
|
|
with (
|
|
patch(
|
|
"run_agent.get_tool_definitions",
|
|
return_value=_make_tool_defs("terminal"),
|
|
),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
patch(
|
|
"hermes_cli.config.load_config",
|
|
return_value={"agent": {"environment_probe": environment_probe}},
|
|
),
|
|
):
|
|
a = AIAgent(
|
|
model=model,
|
|
api_key="test-key-1234567890",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
a.client = MagicMock()
|
|
return a
|
|
|
|
def test_probe_appears_when_problem_detected(self, monkeypatch):
|
|
"""When the probe finds something off, the line lands in the prompt."""
|
|
from tools import env_probe
|
|
env_probe._reset_cache_for_tests()
|
|
monkeypatch.setattr(env_probe, "_python_version_of",
|
|
lambda b: {"python3": "3.11.15"}.get(b))
|
|
monkeypatch.setattr(env_probe, "_has_pip_module", lambda b: False)
|
|
monkeypatch.setattr(env_probe, "_detect_pep668", lambda b: True)
|
|
monkeypatch.setattr(env_probe, "_pip_python_version", lambda: "3.12")
|
|
monkeypatch.setattr(env_probe.shutil, "which",
|
|
lambda name: None if name == "uv" else "/usr/bin/" + name)
|
|
|
|
agent = self._make_agent(environment_probe=True)
|
|
prompt = agent._build_system_prompt()
|
|
assert "Python toolchain:" in prompt
|
|
assert "3.11.15" in prompt
|
|
|
|
def test_probe_silent_on_clean_env(self, monkeypatch):
|
|
"""Clean environment → probe emits nothing → no line in prompt."""
|
|
from tools import env_probe
|
|
env_probe._reset_cache_for_tests()
|
|
monkeypatch.setattr(env_probe, "_python_version_of",
|
|
lambda b: "3.13.3" if b == "python3" else None)
|
|
monkeypatch.setattr(env_probe, "_has_pip_module", lambda b: True)
|
|
monkeypatch.setattr(env_probe, "_detect_pep668", lambda b: False)
|
|
monkeypatch.setattr(env_probe, "_pip_python_version", lambda: "3.13")
|
|
monkeypatch.setattr(env_probe.shutil, "which", lambda name: None)
|
|
|
|
agent = self._make_agent(environment_probe=True)
|
|
prompt = agent._build_system_prompt()
|
|
assert "Python toolchain:" not in prompt
|
|
|
|
def test_probe_disabled_by_config(self, monkeypatch):
|
|
"""Even with detectable problems, the probe stays out when disabled."""
|
|
from tools import env_probe
|
|
env_probe._reset_cache_for_tests()
|
|
monkeypatch.setattr(env_probe, "_python_version_of",
|
|
lambda b: {"python3": "3.11.15"}.get(b))
|
|
monkeypatch.setattr(env_probe, "_has_pip_module", lambda b: False)
|
|
monkeypatch.setattr(env_probe, "_detect_pep668", lambda b: True)
|
|
monkeypatch.setattr(env_probe, "_pip_python_version", lambda: "3.12")
|
|
monkeypatch.setattr(env_probe.shutil, "which", lambda name: None)
|
|
|
|
agent = self._make_agent(environment_probe=False)
|
|
prompt = agent._build_system_prompt()
|
|
assert "Python toolchain:" not in prompt
|
|
|
|
|
|
class TestInvalidateSystemPrompt:
|
|
def test_clears_cache(self, agent):
|
|
agent._cached_system_prompt = "cached value"
|
|
agent._invalidate_system_prompt()
|
|
assert agent._cached_system_prompt is None
|
|
|
|
def test_reloads_memory_store(self, agent):
|
|
mock_store = MagicMock()
|
|
agent._memory_store = mock_store
|
|
agent._cached_system_prompt = "cached"
|
|
agent._invalidate_system_prompt()
|
|
mock_store.load_from_disk.assert_called_once()
|
|
|
|
|
|
class TestBuildApiKwargs:
|
|
def test_basic_kwargs(self, agent):
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
assert kwargs["model"] == agent.model
|
|
assert kwargs["messages"] is messages
|
|
assert kwargs["timeout"] == 1800.0
|
|
|
|
def test_public_moonshot_kimi_k2_5_omits_temperature(self, agent):
|
|
"""Kimi models should NOT have client-side temperature overrides.
|
|
|
|
The Kimi gateway selects the correct temperature server-side.
|
|
"""
|
|
agent.base_url = "https://api.moonshot.ai/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.model = "kimi-k2.5"
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
|
|
assert "temperature" not in kwargs
|
|
|
|
def test_public_moonshot_cn_kimi_k2_5_omits_temperature(self, agent):
|
|
agent.base_url = "https://api.moonshot.cn/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.model = "kimi-k2.5"
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
|
|
assert "temperature" not in kwargs
|
|
|
|
def test_kimi_coding_endpoint_omits_temperature(self, agent):
|
|
agent.provider = "kimi-coding"
|
|
agent.base_url = "https://api.kimi.com/coding/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.model = "kimi-k2.5"
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
|
|
assert "temperature" not in kwargs
|
|
|
|
def test_kimi_coding_endpoint_sends_max_tokens_and_reasoning(self, agent):
|
|
"""Kimi endpoint should send max_tokens=32000 and reasoning_effort as
|
|
top-level params, matching Kimi CLI's default behavior."""
|
|
agent.provider = "kimi-coding"
|
|
agent.base_url = "https://api.kimi.com/coding/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.model = "kimi-for-coding"
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
|
|
assert kwargs["max_tokens"] == 32000
|
|
assert kwargs["reasoning_effort"] == "medium"
|
|
|
|
def test_kimi_coding_endpoint_respects_custom_effort(self, agent):
|
|
"""reasoning_effort should reflect reasoning_config.effort when set."""
|
|
agent.provider = "kimi-coding"
|
|
agent.base_url = "https://api.kimi.com/coding/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.model = "kimi-for-coding"
|
|
agent.reasoning_config = {"enabled": True, "effort": "high"}
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
|
|
assert kwargs["reasoning_effort"] == "high"
|
|
|
|
def test_kimi_coding_endpoint_sends_thinking_extra_body(self, agent):
|
|
"""Kimi endpoint should send extra_body.thinking={"type":"enabled"}
|
|
to activate reasoning mode, mirroring Kimi CLI's with_thinking()."""
|
|
agent.provider = "kimi-coding"
|
|
agent.base_url = "https://api.kimi.com/coding/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.model = "kimi-for-coding"
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
|
|
assert kwargs["extra_body"]["thinking"] == {"type": "enabled"}
|
|
|
|
def test_kimi_coding_endpoint_disables_thinking(self, agent):
|
|
"""When reasoning_config.enabled=False, thinking should be disabled
|
|
and reasoning_effort should be omitted entirely — mirroring Kimi
|
|
CLI's with_thinking("off") which maps to reasoning_effort=None."""
|
|
agent.provider = "kimi-coding"
|
|
agent.base_url = "https://api.kimi.com/coding/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.model = "kimi-for-coding"
|
|
agent.reasoning_config = {"enabled": False}
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
|
|
assert kwargs["extra_body"]["thinking"] == {"type": "disabled"}
|
|
assert "reasoning_effort" not in kwargs
|
|
|
|
def test_moonshot_endpoint_sends_max_tokens_and_reasoning(self, agent):
|
|
"""api.moonshot.ai should get the same Kimi-compatible params."""
|
|
agent.provider = "kimi-coding"
|
|
agent.base_url = "https://api.moonshot.ai/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.model = "kimi-k2.5"
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
|
|
assert kwargs["max_tokens"] == 32000
|
|
assert kwargs["reasoning_effort"] == "medium"
|
|
assert kwargs["extra_body"]["thinking"] == {"type": "enabled"}
|
|
|
|
def test_moonshot_cn_endpoint_sends_max_tokens_and_reasoning(self, agent):
|
|
"""api.moonshot.cn (China endpoint) should get the same params."""
|
|
agent.provider = "kimi-coding-cn"
|
|
agent.base_url = "https://api.moonshot.cn/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.model = "kimi-k2.5"
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
|
|
assert kwargs["max_tokens"] == 32000
|
|
assert kwargs["reasoning_effort"] == "medium"
|
|
assert kwargs["extra_body"]["thinking"] == {"type": "enabled"}
|
|
|
|
def test_provider_preferences_injected(self, agent):
|
|
agent.provider = "openrouter"
|
|
agent.base_url = "https://openrouter.ai/api/v1"
|
|
agent.providers_allowed = ["Anthropic"]
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
assert kwargs["extra_body"]["provider"]["only"] == ["Anthropic"]
|
|
|
|
def test_reasoning_config_default_openrouter(self, agent):
|
|
"""Default reasoning config for OpenRouter should be medium."""
|
|
agent.provider = "openrouter"
|
|
agent.base_url = "https://openrouter.ai/api/v1"
|
|
agent.model = "anthropic/claude-sonnet-4-20250514"
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
reasoning = kwargs["extra_body"]["reasoning"]
|
|
assert reasoning["enabled"] is True
|
|
assert reasoning["effort"] == "medium"
|
|
|
|
def test_reasoning_config_custom(self, agent):
|
|
agent.provider = "openrouter"
|
|
agent.base_url = "https://openrouter.ai/api/v1"
|
|
agent.model = "anthropic/claude-sonnet-4-20250514"
|
|
agent.reasoning_config = {"enabled": False}
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
assert kwargs["extra_body"]["reasoning"] == {"enabled": False}
|
|
|
|
def test_reasoning_not_sent_for_unsupported_openrouter_model(self, agent):
|
|
agent.base_url = "https://openrouter.ai/api/v1"
|
|
agent.model = "minimax/minimax-m2.5"
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
assert "reasoning" not in kwargs.get("extra_body", {})
|
|
|
|
def test_reasoning_sent_for_supported_openrouter_model(self, agent):
|
|
agent.provider = "openrouter"
|
|
agent.base_url = "https://openrouter.ai/api/v1"
|
|
agent.model = "qwen/qwen3.5-plus-02-15"
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
assert kwargs["extra_body"]["reasoning"]["effort"] == "medium"
|
|
|
|
def test_reasoning_sent_for_nous_route(self, agent):
|
|
agent.provider = "nous"
|
|
agent.base_url = "https://inference-api.nousresearch.com/v1"
|
|
agent.model = "minimax/minimax-m2.5"
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
assert kwargs["extra_body"]["reasoning"]["effort"] == "medium"
|
|
|
|
def test_reasoning_sent_for_copilot_gpt5(self, agent):
|
|
"""Copilot/GitHub Models: GPT-5 reasoning goes in extra_body.reasoning."""
|
|
from agent.transports import get_transport
|
|
from providers import get_provider_profile
|
|
|
|
transport = get_transport("chat_completions")
|
|
profile = get_provider_profile("copilot")
|
|
msgs = [{"role": "user", "content": "hi"}]
|
|
kwargs = transport.build_kwargs(
|
|
model="gpt-5.4",
|
|
messages=msgs,
|
|
tools=None,
|
|
supports_reasoning=True,
|
|
provider_profile=profile,
|
|
)
|
|
assert kwargs["extra_body"]["reasoning"] == {"effort": "medium"}
|
|
|
|
def test_reasoning_xhigh_normalized_for_copilot(self, agent):
|
|
"""xhigh effort should normalize to high for Copilot GitHub Models."""
|
|
from agent.transports import get_transport
|
|
from providers import get_provider_profile
|
|
|
|
transport = get_transport("chat_completions")
|
|
profile = get_provider_profile("copilot")
|
|
msgs = [{"role": "user", "content": "hi"}]
|
|
kwargs = transport.build_kwargs(
|
|
model="gpt-5.4",
|
|
messages=msgs,
|
|
tools=None,
|
|
supports_reasoning=True,
|
|
reasoning_config={"enabled": True, "effort": "xhigh"},
|
|
provider_profile=profile,
|
|
)
|
|
assert kwargs["extra_body"]["reasoning"] == {"effort": "high"}
|
|
|
|
def test_reasoning_omitted_for_non_reasoning_copilot_model(self, agent):
|
|
agent.base_url = "https://api.githubcopilot.com"
|
|
agent.model = "gpt-4.1"
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
assert "reasoning" not in kwargs.get("extra_body", {})
|
|
|
|
def test_max_tokens_injected(self, agent):
|
|
agent.max_tokens = 4096
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
assert kwargs["max_tokens"] == 4096
|
|
|
|
|
|
def test_qwen_portal_formats_messages_and_metadata(self, agent):
|
|
agent.provider = "qwen-oauth"
|
|
agent.base_url = "https://portal.qwen.ai/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.session_id = "sess-123"
|
|
messages = [
|
|
{"role": "system", "content": "You are helpful"},
|
|
{"role": "assistant", "content": "Got it"},
|
|
{"role": "user", "content": "hi"},
|
|
]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
assert kwargs["metadata"]["sessionId"] == "sess-123"
|
|
assert kwargs["extra_body"]["vl_high_resolution_images"] is True
|
|
assert isinstance(kwargs["messages"][0]["content"], list)
|
|
assert kwargs["messages"][0]["content"][0]["cache_control"] == {"type": "ephemeral"}
|
|
assert kwargs["messages"][2]["content"][0]["text"] == "hi"
|
|
|
|
def test_qwen_portal_normalizes_bare_string_content_parts(self, agent):
|
|
agent.provider = "qwen-oauth"
|
|
agent.base_url = "https://portal.qwen.ai/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
messages = [
|
|
{"role": "system", "content": [{"type": "text", "text": "system"}]},
|
|
{"role": "user", "content": ["hello", {"type": "text", "text": "world"}]},
|
|
]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
user_content = kwargs["messages"][1]["content"]
|
|
assert user_content[0] == {"type": "text", "text": "hello"}
|
|
assert user_content[1] == {"type": "text", "text": "world"}
|
|
|
|
def test_qwen_portal_no_system_message(self, agent):
|
|
agent.provider = "qwen-oauth"
|
|
agent.base_url = "https://portal.qwen.ai/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
# Should not crash even without a system message
|
|
assert kwargs["messages"][0]["content"][0]["text"] == "hi"
|
|
assert "cache_control" not in kwargs["messages"][0]["content"][0]
|
|
|
|
def test_qwen_portal_sends_explicit_max_tokens(self, agent):
|
|
"""When the user explicitly sets max_tokens, it should be sent to Qwen Portal."""
|
|
agent.base_url = "https://portal.qwen.ai/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.max_tokens = 4096
|
|
messages = [{"role": "system", "content": "sys"}, {"role": "user", "content": "hi"}]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
assert kwargs["max_tokens"] == 4096
|
|
|
|
def test_qwen_portal_default_max_tokens(self, agent):
|
|
"""When max_tokens is None, Qwen Portal gets a default of 65536
|
|
to prevent reasoning models from exhausting their output budget."""
|
|
agent.provider = "qwen-oauth"
|
|
agent.base_url = "https://portal.qwen.ai/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.max_tokens = None
|
|
messages = [{"role": "system", "content": "sys"}, {"role": "user", "content": "hi"}]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
assert kwargs["max_tokens"] == 65536
|
|
|
|
def test_ollama_think_false_on_effort_none(self, agent):
|
|
"""Custom (Ollama) provider with effort=none should inject think=false."""
|
|
agent.provider = "custom"
|
|
agent.base_url = "http://localhost:11434/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.reasoning_config = {"effort": "none"}
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
assert kwargs.get("extra_body", {}).get("think") is False
|
|
|
|
def test_ollama_think_false_on_enabled_false(self, agent):
|
|
"""Custom (Ollama) provider with enabled=false should inject think=false."""
|
|
agent.provider = "custom"
|
|
agent.base_url = "http://localhost:11434/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.reasoning_config = {"enabled": False}
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
assert kwargs.get("extra_body", {}).get("think") is False
|
|
|
|
def test_ollama_no_think_param_when_reasoning_enabled(self, agent):
|
|
"""Custom provider with reasoning enabled should NOT inject think=false."""
|
|
agent.provider = "custom"
|
|
agent.base_url = "http://localhost:11434/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.reasoning_config = {"enabled": True, "effort": "medium"}
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
assert kwargs.get("extra_body", {}).get("think") is None
|
|
|
|
def test_non_custom_provider_unaffected(self, agent):
|
|
"""OpenRouter provider with effort=none should NOT inject think=false."""
|
|
agent.provider = "openrouter"
|
|
agent.model = "qwen/qwen3.5-plus-02-15"
|
|
agent.reasoning_config = {"effort": "none"}
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
kwargs = agent._build_api_kwargs(messages)
|
|
assert kwargs.get("extra_body", {}).get("think") is None
|
|
|
|
|
|
|
|
class TestBuildAssistantMessage:
|
|
def test_basic_message(self, agent):
|
|
msg = _mock_assistant_msg(content="Hello!")
|
|
result = agent._build_assistant_message(msg, "stop")
|
|
assert result["role"] == "assistant"
|
|
assert result["content"] == "Hello!"
|
|
assert result["finish_reason"] == "stop"
|
|
|
|
def test_with_reasoning(self, agent):
|
|
msg = _mock_assistant_msg(content="answer", reasoning="thinking")
|
|
result = agent._build_assistant_message(msg, "stop")
|
|
assert result["reasoning"] == "thinking"
|
|
|
|
def test_reasoning_content_preserved_separately(self, agent):
|
|
msg = _mock_assistant_msg(
|
|
content="answer",
|
|
reasoning="summary",
|
|
reasoning_content="provider scratchpad",
|
|
)
|
|
result = agent._build_assistant_message(msg, "stop")
|
|
assert result["reasoning_content"] == "provider scratchpad"
|
|
|
|
def test_with_tool_calls(self, agent):
|
|
tc = _mock_tool_call(name="web_search", arguments='{"q":"test"}', call_id="c1")
|
|
msg = _mock_assistant_msg(content="", tool_calls=[tc])
|
|
result = agent._build_assistant_message(msg, "tool_calls")
|
|
assert len(result["tool_calls"]) == 1
|
|
assert result["tool_calls"][0]["function"]["name"] == "web_search"
|
|
|
|
def test_with_reasoning_details(self, agent):
|
|
details = [{"type": "reasoning.summary", "text": "step1", "signature": "sig1"}]
|
|
msg = _mock_assistant_msg(content="ans", reasoning_details=details)
|
|
result = agent._build_assistant_message(msg, "stop")
|
|
assert "reasoning_details" in result
|
|
assert result["reasoning_details"][0]["text"] == "step1"
|
|
|
|
def test_empty_content(self, agent):
|
|
msg = _mock_assistant_msg(content=None)
|
|
result = agent._build_assistant_message(msg, "stop")
|
|
assert result["content"] == ""
|
|
|
|
def test_streaming_only_reasoning_promoted_to_reasoning_content(self, agent):
|
|
"""Refs #16844 / #16884. Streaming-only providers (glm, MiniMax,
|
|
gpt-5.x via aigw, Anthropic via openai-compat shims) accumulate
|
|
reasoning through delta chunks but never expose
|
|
``reasoning_content`` as a top-level attribute on the finalized
|
|
message — only ``reasoning`` (or the internal accumulator).
|
|
|
|
Without write-side promotion, the persisted message stores the
|
|
chain-of-thought under the internal ``reasoning`` key and omits
|
|
``reasoning_content``. When the user later replays that history
|
|
through a DeepSeek-v4 / Kimi thinking model, the missing field
|
|
causes HTTP 400 ("The reasoning_content in the thinking mode
|
|
must be passed back to the API.").
|
|
|
|
Fix: when ``reasoning_content`` wasn't written by an earlier
|
|
branch AND we captured reasoning text from streaming deltas,
|
|
promote it to ``reasoning_content`` at write time.
|
|
"""
|
|
# SDK-style object that exposes ``reasoning`` but NOT
|
|
# ``reasoning_content`` — the streaming-only provider shape.
|
|
msg = _mock_assistant_msg(content="answer", reasoning="hidden thinking")
|
|
assert not hasattr(msg, "reasoning_content")
|
|
|
|
result = agent._build_assistant_message(msg, "stop")
|
|
|
|
assert result["reasoning"] == "hidden thinking"
|
|
assert result["reasoning_content"] == "hidden thinking"
|
|
|
|
def test_sdk_reasoning_content_still_wins_over_fallback(self, agent):
|
|
"""Additive fallback must not override SDK-supplied reasoning_content.
|
|
|
|
When both ``reasoning`` and ``reasoning_content`` are present, the
|
|
SDK's own ``reasoning_content`` is authoritative (may carry
|
|
structured data the accumulator doesn't have).
|
|
"""
|
|
msg = _mock_assistant_msg(
|
|
content="answer",
|
|
reasoning="summary only",
|
|
reasoning_content="structured provider scratchpad",
|
|
)
|
|
result = agent._build_assistant_message(msg, "stop")
|
|
assert result["reasoning_content"] == "structured provider scratchpad"
|
|
|
|
def test_no_reasoning_text_leaves_field_absent(self, agent):
|
|
"""Non-thinking turns with no reasoning leave reasoning_content absent.
|
|
|
|
This preserves ``_copy_reasoning_content_for_api``'s downstream
|
|
tiers at replay time — cross-provider leak guard (#15748),
|
|
promote-from-``reasoning``, and DeepSeek/Kimi " "-pad — which
|
|
would all be bypassed if we eagerly wrote ``reasoning_content=" "``
|
|
on every assistant turn regardless of provider.
|
|
"""
|
|
msg = _mock_assistant_msg(content="plain answer")
|
|
result = agent._build_assistant_message(msg, "stop")
|
|
assert "reasoning_content" not in result
|
|
|
|
def test_tool_call_extra_content_preserved(self, agent):
|
|
"""Gemini thinking models attach extra_content with thought_signature
|
|
to tool calls. This must be preserved so subsequent API calls include it."""
|
|
tc = _mock_tool_call(
|
|
name="get_weather", arguments='{"city":"NYC"}', call_id="c2"
|
|
)
|
|
tc.extra_content = {"google": {"thought_signature": "abc123"}}
|
|
msg = _mock_assistant_msg(content="", tool_calls=[tc])
|
|
result = agent._build_assistant_message(msg, "tool_calls")
|
|
assert result["tool_calls"][0]["extra_content"] == {
|
|
"google": {"thought_signature": "abc123"}
|
|
}
|
|
|
|
def test_tool_call_without_extra_content(self, agent):
|
|
"""Standard tool calls (no thinking model) should not have extra_content."""
|
|
tc = _mock_tool_call(name="web_search", arguments="{}", call_id="c3")
|
|
msg = _mock_assistant_msg(content="", tool_calls=[tc])
|
|
result = agent._build_assistant_message(msg, "tool_calls")
|
|
assert "extra_content" not in result["tool_calls"][0]
|
|
|
|
def test_think_blocks_stripped_from_content(self, agent):
|
|
"""Inline <think> blocks are stripped from stored content (#8878, #9568).
|
|
|
|
The reasoning is captured into ``msg['reasoning']`` via the inline
|
|
fallback in ``_extract_reasoning``; the raw tags in ``content`` are
|
|
redundant and leak to messaging platforms / pollute titles /
|
|
inflate context if left in place.
|
|
"""
|
|
msg = _mock_assistant_msg(
|
|
content="<think>internal reasoning</think>The actual answer."
|
|
)
|
|
result = agent._build_assistant_message(msg, "stop")
|
|
assert "<think>" not in result["content"]
|
|
assert "internal reasoning" not in result["content"]
|
|
assert "The actual answer." in result["content"]
|
|
# Reasoning preserved separately via inline extraction fallback
|
|
assert result["reasoning"] == "internal reasoning"
|
|
|
|
def test_think_blocks_stripped_preserves_normal_content(self, agent):
|
|
"""Content without reasoning tags passes through unchanged."""
|
|
msg = _mock_assistant_msg(content="No thinking here.")
|
|
result = agent._build_assistant_message(msg, "stop")
|
|
assert result["content"] == "No thinking here."
|
|
|
|
def test_memory_context_in_stored_content_is_preserved(self, agent):
|
|
"""`_build_assistant_message` must not silently mutate model output
|
|
containing literal <memory-context> markers — that's legitimate text
|
|
(e.g. documentation, code) that the model may emit. Streaming-path
|
|
leak prevention is handled by StreamingContextScrubber upstream."""
|
|
original = (
|
|
"<memory-context>\n"
|
|
"[System note: The following is recalled memory context, NOT new user input. Treat as informational background data.]\n\n"
|
|
"## Honcho Context\n"
|
|
"stale memory\n"
|
|
"</memory-context>\n\n"
|
|
"Visible answer"
|
|
)
|
|
msg = _mock_assistant_msg(content=original)
|
|
result = agent._build_assistant_message(msg, "stop")
|
|
assert "<memory-context>" in result["content"]
|
|
assert "Visible answer" in result["content"]
|
|
|
|
def test_unterminated_think_block_stripped(self, agent):
|
|
"""Unterminated <think> block (MiniMax / NIM dropped close tag) is
|
|
fully stripped from stored content."""
|
|
msg = _mock_assistant_msg(
|
|
content="<think>reasoning that never closes on this NIM endpoint"
|
|
)
|
|
result = agent._build_assistant_message(msg, "stop")
|
|
assert "<think>" not in result["content"]
|
|
assert "reasoning that never closes" not in result["content"]
|
|
assert result["content"] == ""
|
|
|
|
|
|
class TestFormatToolsForSystemMessage:
|
|
def test_no_tools_returns_empty_array(self, agent):
|
|
agent.tools = []
|
|
assert agent._format_tools_for_system_message() == "[]"
|
|
|
|
def test_formats_single_tool(self, agent):
|
|
agent.tools = _make_tool_defs("web_search")
|
|
result = agent._format_tools_for_system_message()
|
|
parsed = json.loads(result)
|
|
assert len(parsed) == 1
|
|
assert parsed[0]["name"] == "web_search"
|
|
|
|
def test_formats_multiple_tools(self, agent):
|
|
agent.tools = _make_tool_defs("web_search", "terminal", "read_file")
|
|
result = agent._format_tools_for_system_message()
|
|
parsed = json.loads(result)
|
|
assert len(parsed) == 3
|
|
names = {t["name"] for t in parsed}
|
|
assert names == {"web_search", "terminal", "read_file"}
|
|
|
|
|
|
# ===================================================================
|
|
# Group 3: Conversation Loop Pieces (OpenAI mock)
|
|
# ===================================================================
|
|
|
|
|
|
class TestExecuteToolCalls:
|
|
def test_single_tool_executed(self, agent):
|
|
tc = _mock_tool_call(name="web_search", arguments='{"q":"test"}', call_id="c1")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc])
|
|
messages = []
|
|
with patch(
|
|
"run_agent.handle_function_call", return_value="search result"
|
|
) as mock_hfc:
|
|
agent._execute_tool_calls(mock_msg, messages, "task-1")
|
|
# enabled_tools passes the agent's own valid_tool_names
|
|
args, kwargs = mock_hfc.call_args
|
|
assert args[:3] == ("web_search", {"q": "test"}, "task-1")
|
|
assert set(kwargs.get("enabled_tools", [])) == agent.valid_tool_names
|
|
assert len(messages) == 1
|
|
assert messages[0]["role"] == "tool"
|
|
assert "search result" in messages[0]["content"]
|
|
|
|
def test_interrupt_skips_remaining(self, agent):
|
|
tc1 = _mock_tool_call(name="web_search", arguments="{}", call_id="c1")
|
|
tc2 = _mock_tool_call(name="web_search", arguments="{}", call_id="c2")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
|
|
with patch("run_agent._set_interrupt"):
|
|
agent.interrupt()
|
|
|
|
agent._execute_tool_calls(mock_msg, messages, "task-1")
|
|
# Both calls should be skipped with cancellation messages
|
|
assert len(messages) == 2
|
|
assert (
|
|
"cancelled" in messages[0]["content"].lower()
|
|
or "interrupted" in messages[0]["content"].lower()
|
|
)
|
|
|
|
def test_invalid_json_args_defaults_empty(self, agent):
|
|
tc = _mock_tool_call(
|
|
name="web_search", arguments="not valid json", call_id="c1"
|
|
)
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc])
|
|
messages = []
|
|
with patch("run_agent.handle_function_call", return_value="ok") as mock_hfc:
|
|
agent._execute_tool_calls(mock_msg, messages, "task-1")
|
|
# Invalid JSON args should fall back to empty dict
|
|
args, kwargs = mock_hfc.call_args
|
|
assert args[:3] == ("web_search", {}, "task-1")
|
|
assert set(kwargs.get("enabled_tools", [])) == agent.valid_tool_names
|
|
assert len(messages) == 1
|
|
assert messages[0]["role"] == "tool"
|
|
assert messages[0]["tool_call_id"] == "c1"
|
|
|
|
def test_result_truncation_over_100k(self, agent, tmp_path, monkeypatch):
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path / ".hermes"))
|
|
(tmp_path / ".hermes").mkdir()
|
|
tc = _mock_tool_call(name="web_search", arguments="{}", call_id="c1")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc])
|
|
messages = []
|
|
big_result = "x" * 150_000
|
|
with patch("run_agent.handle_function_call", return_value=big_result):
|
|
agent._execute_tool_calls(mock_msg, messages, "task-1")
|
|
# Content should be replaced with persisted-output or truncation
|
|
assert len(messages[0]["content"]) < 150_000
|
|
assert ("Truncated" in messages[0]["content"] or "<persisted-output>" in messages[0]["content"])
|
|
|
|
def test_quiet_tool_output_suppressed_when_progress_callback_present(self, agent):
|
|
tc = _mock_tool_call(name="web_search", arguments='{"q":"test"}', call_id="c1")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc])
|
|
messages = []
|
|
agent.tool_progress_callback = lambda *args, **kwargs: None
|
|
|
|
with patch("run_agent.handle_function_call", return_value="search result"), \
|
|
patch.object(agent, "_safe_print") as mock_print:
|
|
agent._execute_tool_calls(mock_msg, messages, "task-1")
|
|
|
|
mock_print.assert_not_called()
|
|
assert len(messages) == 1
|
|
assert messages[0]["role"] == "tool"
|
|
|
|
def test_quiet_tool_output_prints_without_progress_callback(self, agent):
|
|
tc = _mock_tool_call(name="web_search", arguments='{"q":"test"}', call_id="c1")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc])
|
|
messages = []
|
|
agent.platform = "cli"
|
|
agent.tool_progress_callback = None
|
|
|
|
with patch("run_agent.handle_function_call", return_value="search result"), \
|
|
patch.object(agent, "_safe_print") as mock_print:
|
|
agent._execute_tool_calls(mock_msg, messages, "task-1")
|
|
|
|
mock_print.assert_called_once()
|
|
assert "search" in str(mock_print.call_args.args[0]).lower()
|
|
assert len(messages) == 1
|
|
assert messages[0]["role"] == "tool"
|
|
|
|
def test_quiet_tool_output_suppressed_without_progress_callback_for_non_cli_agent(self, agent):
|
|
tc = _mock_tool_call(name="web_search", arguments='{"q":"test"}', call_id="c1")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc])
|
|
messages = []
|
|
agent.platform = None
|
|
agent.tool_progress_callback = None
|
|
|
|
with patch("run_agent.handle_function_call", return_value="search result"), \
|
|
patch.object(agent, "_safe_print") as mock_print:
|
|
agent._execute_tool_calls(mock_msg, messages, "task-1")
|
|
|
|
mock_print.assert_not_called()
|
|
assert len(messages) == 1
|
|
assert messages[0]["role"] == "tool"
|
|
|
|
def test_vprint_suppressed_in_parseable_quiet_mode(self, agent):
|
|
agent.suppress_status_output = True
|
|
|
|
with patch.object(agent, "_safe_print") as mock_print:
|
|
agent._vprint("status line", force=True)
|
|
agent._vprint("normal line")
|
|
|
|
mock_print.assert_not_called()
|
|
|
|
def test_run_conversation_suppresses_retry_noise_in_parseable_quiet_mode(self, agent):
|
|
class _RateLimitError(Exception):
|
|
status_code = 429
|
|
|
|
def __str__(self):
|
|
return "Error code: 429 - Rate limit exceeded."
|
|
|
|
responses = [_RateLimitError(), _mock_response(content="Recovered")]
|
|
|
|
def _fake_api_call(api_kwargs):
|
|
result = responses.pop(0)
|
|
if isinstance(result, Exception):
|
|
raise result
|
|
return result
|
|
|
|
agent.suppress_status_output = True
|
|
agent._interruptible_api_call = _fake_api_call
|
|
agent._persist_session = lambda *args, **kwargs: None
|
|
agent._save_trajectory = lambda *args, **kwargs: None
|
|
|
|
captured = io.StringIO()
|
|
agent._print_fn = lambda *args, **kw: print(*args, file=captured, **kw)
|
|
|
|
with patch("run_agent.time.sleep", return_value=None):
|
|
result = agent.run_conversation("hello")
|
|
|
|
assert result["completed"] is True
|
|
assert result["final_response"] == "Recovered"
|
|
output = captured.getvalue()
|
|
assert "API call failed" not in output
|
|
assert "Rate limit reached" not in output
|
|
|
|
|
|
class TestConcurrentToolExecution:
|
|
"""Tests for _execute_tool_calls_concurrent and dispatch logic."""
|
|
|
|
def test_single_tool_uses_sequential_path(self, agent):
|
|
"""Single tool call should use sequential path, not concurrent."""
|
|
tc = _mock_tool_call(name="web_search", arguments='{"q":"test"}', call_id="c1")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc])
|
|
messages = []
|
|
with patch.object(agent, "_execute_tool_calls_sequential") as mock_seq:
|
|
with patch.object(agent, "_execute_tool_calls_concurrent") as mock_con:
|
|
agent._execute_tool_calls(mock_msg, messages, "task-1")
|
|
mock_seq.assert_called_once()
|
|
mock_con.assert_not_called()
|
|
|
|
def test_clarify_forces_sequential(self, agent):
|
|
"""Batch containing clarify should use sequential path."""
|
|
tc1 = _mock_tool_call(name="web_search", arguments='{}', call_id="c1")
|
|
tc2 = _mock_tool_call(name="clarify", arguments='{"question":"ok?"}', call_id="c2")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
with patch.object(agent, "_execute_tool_calls_sequential") as mock_seq:
|
|
with patch.object(agent, "_execute_tool_calls_concurrent") as mock_con:
|
|
agent._execute_tool_calls(mock_msg, messages, "task-1")
|
|
mock_seq.assert_called_once()
|
|
mock_con.assert_not_called()
|
|
|
|
def test_multiple_tools_uses_concurrent_path(self, agent):
|
|
"""Multiple read-only tools should use concurrent path."""
|
|
tc1 = _mock_tool_call(name="web_search", arguments='{}', call_id="c1")
|
|
tc2 = _mock_tool_call(name="read_file", arguments='{"path":"x.py"}', call_id="c2")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
with patch.object(agent, "_execute_tool_calls_sequential") as mock_seq:
|
|
with patch.object(agent, "_execute_tool_calls_concurrent") as mock_con:
|
|
agent._execute_tool_calls(mock_msg, messages, "task-1")
|
|
mock_con.assert_called_once()
|
|
mock_seq.assert_not_called()
|
|
|
|
def test_terminal_batch_forces_sequential(self, agent):
|
|
"""Stateful tools should not share the concurrent execution path."""
|
|
tc1 = _mock_tool_call(name="web_search", arguments='{}', call_id="c1")
|
|
tc2 = _mock_tool_call(name="terminal", arguments='{"command":"pwd"}', call_id="c2")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
with patch.object(agent, "_execute_tool_calls_sequential") as mock_seq:
|
|
with patch.object(agent, "_execute_tool_calls_concurrent") as mock_con:
|
|
agent._execute_tool_calls(mock_msg, messages, "task-1")
|
|
mock_seq.assert_called_once()
|
|
mock_con.assert_not_called()
|
|
|
|
def test_write_batch_forces_sequential(self, agent):
|
|
"""File mutations should stay ordered within a turn."""
|
|
tc1 = _mock_tool_call(name="read_file", arguments='{"path":"x.py"}', call_id="c1")
|
|
tc2 = _mock_tool_call(name="write_file", arguments='{"path":"x.py","content":"print(1)"}', call_id="c2")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
with patch.object(agent, "_execute_tool_calls_sequential") as mock_seq:
|
|
with patch.object(agent, "_execute_tool_calls_concurrent") as mock_con:
|
|
agent._execute_tool_calls(mock_msg, messages, "task-1")
|
|
mock_seq.assert_called_once()
|
|
mock_con.assert_not_called()
|
|
|
|
def test_disjoint_write_batch_uses_concurrent_path(self, agent):
|
|
"""Independent file writes should still run concurrently."""
|
|
tc1 = _mock_tool_call(
|
|
name="write_file",
|
|
arguments='{"path":"src/a.py","content":"print(1)"}',
|
|
call_id="c1",
|
|
)
|
|
tc2 = _mock_tool_call(
|
|
name="write_file",
|
|
arguments='{"path":"src/b.py","content":"print(2)"}',
|
|
call_id="c2",
|
|
)
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
with patch.object(agent, "_execute_tool_calls_sequential") as mock_seq:
|
|
with patch.object(agent, "_execute_tool_calls_concurrent") as mock_con:
|
|
agent._execute_tool_calls(mock_msg, messages, "task-1")
|
|
mock_con.assert_called_once()
|
|
mock_seq.assert_not_called()
|
|
|
|
def test_overlapping_write_batch_forces_sequential(self, agent):
|
|
"""Writes to the same file must stay ordered."""
|
|
tc1 = _mock_tool_call(
|
|
name="write_file",
|
|
arguments='{"path":"src/a.py","content":"print(1)"}',
|
|
call_id="c1",
|
|
)
|
|
tc2 = _mock_tool_call(
|
|
name="patch",
|
|
arguments='{"path":"src/a.py","old_string":"1","new_string":"2"}',
|
|
call_id="c2",
|
|
)
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
with patch.object(agent, "_execute_tool_calls_sequential") as mock_seq:
|
|
with patch.object(agent, "_execute_tool_calls_concurrent") as mock_con:
|
|
agent._execute_tool_calls(mock_msg, messages, "task-1")
|
|
mock_seq.assert_called_once()
|
|
mock_con.assert_not_called()
|
|
|
|
def test_malformed_json_args_forces_sequential(self, agent):
|
|
"""Unparseable tool arguments should fall back to sequential."""
|
|
tc1 = _mock_tool_call(name="web_search", arguments='{}', call_id="c1")
|
|
tc2 = _mock_tool_call(name="web_search", arguments="NOT JSON {{{", call_id="c2")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
with patch.object(agent, "_execute_tool_calls_sequential") as mock_seq:
|
|
with patch.object(agent, "_execute_tool_calls_concurrent") as mock_con:
|
|
agent._execute_tool_calls(mock_msg, messages, "task-1")
|
|
mock_seq.assert_called_once()
|
|
mock_con.assert_not_called()
|
|
|
|
def test_non_dict_args_forces_sequential(self, agent):
|
|
"""Tool arguments that parse to a non-dict type should fall back to sequential."""
|
|
tc1 = _mock_tool_call(name="web_search", arguments='{}', call_id="c1")
|
|
tc2 = _mock_tool_call(name="web_search", arguments='"just a string"', call_id="c2")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
with patch.object(agent, "_execute_tool_calls_sequential") as mock_seq:
|
|
with patch.object(agent, "_execute_tool_calls_concurrent") as mock_con:
|
|
agent._execute_tool_calls(mock_msg, messages, "task-1")
|
|
mock_seq.assert_called_once()
|
|
mock_con.assert_not_called()
|
|
|
|
def test_concurrent_executes_all_tools(self, agent):
|
|
"""Concurrent path should execute all tools and append results in order."""
|
|
tc1 = _mock_tool_call(name="web_search", arguments='{"q":"alpha"}', call_id="c1")
|
|
tc2 = _mock_tool_call(name="web_search", arguments='{"q":"beta"}', call_id="c2")
|
|
tc3 = _mock_tool_call(name="web_search", arguments='{"q":"gamma"}', call_id="c3")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2, tc3])
|
|
messages = []
|
|
|
|
call_log = []
|
|
|
|
def fake_handle(name, args, task_id, **kwargs):
|
|
call_log.append(name)
|
|
return json.dumps({"result": args.get("q", "")})
|
|
|
|
with patch("run_agent.handle_function_call", side_effect=fake_handle):
|
|
agent._execute_tool_calls_concurrent(mock_msg, messages, "task-1")
|
|
|
|
assert len(messages) == 3
|
|
# Results must be in original order
|
|
assert messages[0]["tool_call_id"] == "c1"
|
|
assert messages[1]["tool_call_id"] == "c2"
|
|
assert messages[2]["tool_call_id"] == "c3"
|
|
# All should be tool messages
|
|
assert all(m["role"] == "tool" for m in messages)
|
|
# Content should contain the query results
|
|
assert "alpha" in messages[0]["content"]
|
|
assert "beta" in messages[1]["content"]
|
|
assert "gamma" in messages[2]["content"]
|
|
|
|
def test_concurrent_preserves_order_despite_timing(self, agent):
|
|
"""Even if tools finish in different order, messages should be in original order."""
|
|
import time as _time
|
|
|
|
tc1 = _mock_tool_call(name="web_search", arguments='{"q":"slow"}', call_id="c1")
|
|
tc2 = _mock_tool_call(name="web_search", arguments='{"q":"fast"}', call_id="c2")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
|
|
def fake_handle(name, args, task_id, **kwargs):
|
|
q = args.get("q", "")
|
|
if q == "slow":
|
|
_time.sleep(0.1) # Slow tool
|
|
return f"result_{q}"
|
|
|
|
with patch("run_agent.handle_function_call", side_effect=fake_handle):
|
|
agent._execute_tool_calls_concurrent(mock_msg, messages, "task-1")
|
|
|
|
assert messages[0]["tool_call_id"] == "c1"
|
|
assert "result_slow" in messages[0]["content"]
|
|
assert messages[1]["tool_call_id"] == "c2"
|
|
assert "result_fast" in messages[1]["content"]
|
|
|
|
def test_concurrent_handles_tool_error(self, agent):
|
|
"""If one tool raises, others should still complete."""
|
|
tc1 = _mock_tool_call(name="web_search", arguments='{}', call_id="c1")
|
|
tc2 = _mock_tool_call(name="web_search", arguments='{}', call_id="c2")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
|
|
call_count = [0]
|
|
def fake_handle(name, args, task_id, **kwargs):
|
|
call_count[0] += 1
|
|
if call_count[0] == 1:
|
|
raise RuntimeError("boom")
|
|
return "success"
|
|
|
|
with patch("run_agent.handle_function_call", side_effect=fake_handle):
|
|
agent._execute_tool_calls_concurrent(mock_msg, messages, "task-1")
|
|
|
|
assert len(messages) == 2
|
|
# First tool should have error
|
|
assert "Error" in messages[0]["content"] or "boom" in messages[0]["content"]
|
|
# Second tool should succeed
|
|
assert "success" in messages[1]["content"]
|
|
|
|
def test_concurrent_interrupt_before_start(self, agent):
|
|
"""If interrupt is requested before concurrent execution, all tools are skipped."""
|
|
tc1 = _mock_tool_call(name="web_search", arguments='{}', call_id="c1")
|
|
tc2 = _mock_tool_call(name="read_file", arguments='{}', call_id="c2")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
|
|
with patch("run_agent._set_interrupt"):
|
|
agent.interrupt()
|
|
|
|
agent._execute_tool_calls_concurrent(mock_msg, messages, "task-1")
|
|
assert len(messages) == 2
|
|
assert "cancelled" in messages[0]["content"].lower() or "skipped" in messages[0]["content"].lower()
|
|
assert "cancelled" in messages[1]["content"].lower() or "skipped" in messages[1]["content"].lower()
|
|
|
|
def test_concurrent_truncates_large_results(self, agent, tmp_path, monkeypatch):
|
|
"""Concurrent path should save oversized results to file."""
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path / ".hermes"))
|
|
(tmp_path / ".hermes").mkdir()
|
|
tc1 = _mock_tool_call(name="web_search", arguments='{}', call_id="c1")
|
|
tc2 = _mock_tool_call(name="web_search", arguments='{}', call_id="c2")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
big_result = "x" * 150_000
|
|
|
|
with patch("run_agent.handle_function_call", return_value=big_result):
|
|
agent._execute_tool_calls_concurrent(mock_msg, messages, "task-1")
|
|
|
|
assert len(messages) == 2
|
|
for m in messages:
|
|
assert len(m["content"]) < 150_000
|
|
assert ("Truncated" in m["content"] or "<persisted-output>" in m["content"])
|
|
|
|
def test_invoke_tool_dispatches_to_handle_function_call(self, agent):
|
|
"""_invoke_tool should route regular tools through handle_function_call."""
|
|
with patch("run_agent.handle_function_call", return_value="result") as mock_hfc:
|
|
result = agent._invoke_tool("web_search", {"q": "test"}, "task-1")
|
|
mock_hfc.assert_called_once_with(
|
|
"web_search", {"q": "test"}, "task-1",
|
|
tool_call_id=None,
|
|
session_id=agent.session_id,
|
|
enabled_tools=list(agent.valid_tool_names),
|
|
skip_pre_tool_call_hook=True,
|
|
enabled_toolsets=agent.enabled_toolsets,
|
|
disabled_toolsets=agent.disabled_toolsets,
|
|
)
|
|
assert result == "result"
|
|
|
|
def test_sequential_tool_callbacks_fire_in_order(self, agent):
|
|
tool_call = _mock_tool_call(name="web_search", arguments='{"query":"hello"}', call_id="c1")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tool_call])
|
|
messages = []
|
|
starts = []
|
|
completes = []
|
|
agent.tool_start_callback = lambda tool_call_id, function_name, function_args: starts.append((tool_call_id, function_name, function_args))
|
|
agent.tool_complete_callback = lambda tool_call_id, function_name, function_args, function_result: completes.append((tool_call_id, function_name, function_args, function_result))
|
|
|
|
with patch("run_agent.handle_function_call", return_value='{"success": true}'):
|
|
agent._execute_tool_calls_sequential(mock_msg, messages, "task-1")
|
|
|
|
assert starts == [("c1", "web_search", {"query": "hello"})]
|
|
assert completes == [("c1", "web_search", {"query": "hello"}, '{"success": true}')]
|
|
|
|
def test_concurrent_tool_callbacks_fire_for_each_tool(self, agent):
|
|
tc1 = _mock_tool_call(name="web_search", arguments='{"query":"one"}', call_id="c1")
|
|
tc2 = _mock_tool_call(name="web_search", arguments='{"query":"two"}', call_id="c2")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
starts = []
|
|
completes = []
|
|
agent.tool_start_callback = lambda tool_call_id, function_name, function_args: starts.append((tool_call_id, function_name, function_args))
|
|
agent.tool_complete_callback = lambda tool_call_id, function_name, function_args, function_result: completes.append((tool_call_id, function_name, function_args, function_result))
|
|
|
|
with patch("run_agent.handle_function_call", side_effect=['{"id":1}', '{"id":2}']):
|
|
agent._execute_tool_calls_concurrent(mock_msg, messages, "task-1")
|
|
|
|
assert starts == [
|
|
("c1", "web_search", {"query": "one"}),
|
|
("c2", "web_search", {"query": "two"}),
|
|
]
|
|
assert len(completes) == 2
|
|
assert {entry[0] for entry in completes} == {"c1", "c2"}
|
|
assert {entry[3] for entry in completes} == {'{"id":1}', '{"id":2}'}
|
|
|
|
def test_invoke_tool_handles_agent_level_tools(self, agent):
|
|
"""_invoke_tool should handle todo tool directly."""
|
|
with patch("tools.todo_tool.todo_tool", return_value='{"ok":true}') as mock_todo:
|
|
result = agent._invoke_tool("todo", {"todos": []}, "task-1")
|
|
mock_todo.assert_called_once()
|
|
assert "ok" in result
|
|
|
|
def test_invoke_tool_blocked_returns_error_and_skips_execution(self, agent, monkeypatch):
|
|
"""_invoke_tool should return error JSON when a plugin blocks the tool."""
|
|
monkeypatch.setattr(
|
|
"hermes_cli.plugins.get_pre_tool_call_block_message",
|
|
lambda *args, **kwargs: "Blocked by test policy",
|
|
)
|
|
with patch("tools.todo_tool.todo_tool", side_effect=AssertionError("should not run")) as mock_todo:
|
|
result = agent._invoke_tool("todo", {"todos": []}, "task-1")
|
|
|
|
assert json.loads(result) == {"error": "Blocked by test policy"}
|
|
mock_todo.assert_not_called()
|
|
|
|
def test_invoke_tool_blocked_skips_handle_function_call(self, agent, monkeypatch):
|
|
"""Blocked registry tools should not reach handle_function_call."""
|
|
monkeypatch.setattr(
|
|
"hermes_cli.plugins.get_pre_tool_call_block_message",
|
|
lambda *args, **kwargs: "Blocked",
|
|
)
|
|
with patch("run_agent.handle_function_call", side_effect=AssertionError("should not run")):
|
|
result = agent._invoke_tool("web_search", {"q": "test"}, "task-1")
|
|
|
|
assert json.loads(result) == {"error": "Blocked"}
|
|
|
|
def test_sequential_blocked_tool_skips_checkpoints_and_callbacks(self, agent, monkeypatch):
|
|
"""Sequential path: blocked tool should not trigger checkpoints or start callbacks."""
|
|
tool_call = _mock_tool_call(name="write_file",
|
|
arguments='{"path":"test.txt","content":"hello"}',
|
|
call_id="c1")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tool_call])
|
|
messages = []
|
|
|
|
monkeypatch.setattr(
|
|
"hermes_cli.plugins.get_pre_tool_call_block_message",
|
|
lambda *args, **kwargs: "Blocked by policy",
|
|
)
|
|
agent._checkpoint_mgr.enabled = True
|
|
agent._checkpoint_mgr.ensure_checkpoint = MagicMock(
|
|
side_effect=AssertionError("checkpoint should not run")
|
|
)
|
|
|
|
starts = []
|
|
agent.tool_start_callback = lambda *a: starts.append(a)
|
|
|
|
with patch("run_agent.handle_function_call", side_effect=AssertionError("should not run")):
|
|
agent._execute_tool_calls_sequential(mock_msg, messages, "task-1")
|
|
|
|
agent._checkpoint_mgr.ensure_checkpoint.assert_not_called()
|
|
assert starts == []
|
|
assert len(messages) == 1
|
|
assert messages[0]["role"] == "tool"
|
|
assert json.loads(messages[0]["content"]) == {"error": "Blocked by policy"}
|
|
|
|
def test_blocked_memory_tool_does_not_reset_counter(self, agent, monkeypatch):
|
|
"""Blocked memory tool should not reset the nudge counter."""
|
|
agent._turns_since_memory = 5
|
|
monkeypatch.setattr(
|
|
"hermes_cli.plugins.get_pre_tool_call_block_message",
|
|
lambda *args, **kwargs: "Blocked",
|
|
)
|
|
with patch("tools.memory_tool.memory_tool", side_effect=AssertionError("should not run")):
|
|
result = agent._invoke_tool(
|
|
"memory", {"action": "add", "target": "memory", "content": "x"}, "task-1",
|
|
)
|
|
|
|
assert json.loads(result) == {"error": "Blocked"}
|
|
assert agent._turns_since_memory == 5
|
|
|
|
def test_concurrent_blocked_write_skips_checkpoint(self, agent, monkeypatch):
|
|
"""Concurrent path: blocked write_file should not trigger checkpoint."""
|
|
tc1 = _mock_tool_call(name="write_file",
|
|
arguments='{"path":"test.txt","content":"hello"}',
|
|
call_id="c1")
|
|
tc2 = _mock_tool_call(name="read_file",
|
|
arguments='{"path":"other.py"}',
|
|
call_id="c2")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
|
|
monkeypatch.setattr(
|
|
"hermes_cli.plugins.get_pre_tool_call_block_message",
|
|
lambda *args, **kwargs: "Blocked" if args[0] == "write_file" else None,
|
|
)
|
|
|
|
agent._checkpoint_mgr.enabled = True
|
|
|
|
def fake_handle(name, args, task_id, **kwargs):
|
|
return f"result_{name}"
|
|
|
|
with patch("run_agent.handle_function_call", side_effect=fake_handle):
|
|
with patch.object(agent._checkpoint_mgr, "ensure_checkpoint") as cp_mock:
|
|
agent._execute_tool_calls_concurrent(mock_msg, messages, "task-1")
|
|
|
|
cp_mock.assert_not_called()
|
|
|
|
def test_concurrent_blocked_patch_skips_checkpoint(self, agent, monkeypatch):
|
|
"""Concurrent path: blocked patch should not trigger checkpoint."""
|
|
tc1 = _mock_tool_call(name="patch",
|
|
arguments='{"path":"f.py","old":"a","new":"b"}',
|
|
call_id="c1")
|
|
tc2 = _mock_tool_call(name="read_file",
|
|
arguments='{"path":"other.py"}',
|
|
call_id="c2")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
|
|
monkeypatch.setattr(
|
|
"hermes_cli.plugins.get_pre_tool_call_block_message",
|
|
lambda *args, **kwargs: "Blocked" if args[0] == "patch" else None,
|
|
)
|
|
|
|
agent._checkpoint_mgr.enabled = True
|
|
|
|
def fake_handle(name, args, task_id, **kwargs):
|
|
return f"result_{name}"
|
|
|
|
with patch("run_agent.handle_function_call", side_effect=fake_handle):
|
|
with patch.object(agent._checkpoint_mgr, "ensure_checkpoint") as cp_mock:
|
|
agent._execute_tool_calls_concurrent(mock_msg, messages, "task-1")
|
|
|
|
cp_mock.assert_not_called()
|
|
|
|
def test_concurrent_blocked_terminal_skips_checkpoint(self, agent, monkeypatch):
|
|
"""Concurrent path: blocked terminal should not trigger checkpoint."""
|
|
tc1 = _mock_tool_call(name="terminal",
|
|
arguments='{"command":"rm -rf /tmp/foo"}',
|
|
call_id="c1")
|
|
tc2 = _mock_tool_call(name="read_file",
|
|
arguments='{"path":"other.py"}',
|
|
call_id="c2")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
|
|
monkeypatch.setattr(
|
|
"hermes_cli.plugins.get_pre_tool_call_block_message",
|
|
lambda *args, **kwargs: "Blocked" if args[0] == "terminal" else None,
|
|
)
|
|
|
|
agent._checkpoint_mgr.enabled = True
|
|
|
|
def fake_handle(name, args, task_id, **kwargs):
|
|
return f"result_{name}"
|
|
|
|
with patch("run_agent.handle_function_call", side_effect=fake_handle):
|
|
with patch.object(agent._checkpoint_mgr, "ensure_checkpoint") as cp_mock:
|
|
with patch("agent.tool_executor._is_destructive_command", return_value=True):
|
|
agent._execute_tool_calls_concurrent(mock_msg, messages, "task-1")
|
|
|
|
cp_mock.assert_not_called()
|
|
|
|
def test_concurrent_blocked_write_does_not_steal_slot_from_allowed_write(self, agent, monkeypatch):
|
|
"""When write_file is blocked, its dedup slot must not be consumed,
|
|
so a subsequent allowed write_file for the same path still checkpoints."""
|
|
tc1 = _mock_tool_call(name="write_file",
|
|
arguments='{"path":"dup.txt","content":"blocked"}',
|
|
call_id="c1")
|
|
tc2 = _mock_tool_call(name="write_file",
|
|
arguments='{"path":"dup.txt","content":"allowed"}',
|
|
call_id="c2")
|
|
mock_msg = _mock_assistant_msg(content="", tool_calls=[tc1, tc2])
|
|
messages = []
|
|
|
|
call_count = {"n": 0}
|
|
def block_first_only(*args, **kwargs):
|
|
call_count["n"] += 1
|
|
return "Blocked" if call_count["n"] == 1 else None
|
|
|
|
monkeypatch.setattr(
|
|
"hermes_cli.plugins.get_pre_tool_call_block_message",
|
|
block_first_only,
|
|
)
|
|
|
|
agent._checkpoint_mgr.enabled = True
|
|
|
|
def fake_handle(name, args, task_id, **kwargs):
|
|
return f"result_{name}"
|
|
|
|
with patch("run_agent.handle_function_call", side_effect=fake_handle):
|
|
with patch.object(agent._checkpoint_mgr, "ensure_checkpoint") as cp_mock:
|
|
agent._execute_tool_calls_concurrent(mock_msg, messages, "task-1")
|
|
|
|
# Second (allowed) write must checkpoint even though first was blocked.
|
|
cp_mock.assert_called_once()
|
|
|
|
|
|
class TestPathsOverlap:
|
|
"""Unit tests for the _paths_overlap helper."""
|
|
|
|
def test_same_path_overlaps(self):
|
|
from run_agent import _paths_overlap
|
|
assert _paths_overlap(Path("src/a.py"), Path("src/a.py"))
|
|
|
|
def test_siblings_do_not_overlap(self):
|
|
from run_agent import _paths_overlap
|
|
assert not _paths_overlap(Path("src/a.py"), Path("src/b.py"))
|
|
|
|
def test_parent_child_overlap(self):
|
|
from run_agent import _paths_overlap
|
|
assert _paths_overlap(Path("src"), Path("src/sub/a.py"))
|
|
|
|
def test_different_roots_do_not_overlap(self):
|
|
from run_agent import _paths_overlap
|
|
assert not _paths_overlap(Path("src/a.py"), Path("other/a.py"))
|
|
|
|
def test_nested_vs_flat_do_not_overlap(self):
|
|
from run_agent import _paths_overlap
|
|
assert not _paths_overlap(Path("src/sub/a.py"), Path("src/a.py"))
|
|
|
|
def test_empty_paths_do_not_overlap(self):
|
|
from run_agent import _paths_overlap
|
|
assert not _paths_overlap(Path(""), Path(""))
|
|
|
|
def test_one_empty_path_does_not_overlap(self):
|
|
from run_agent import _paths_overlap
|
|
assert not _paths_overlap(Path(""), Path("src/a.py"))
|
|
assert not _paths_overlap(Path("src/a.py"), Path(""))
|
|
|
|
|
|
class TestParallelScopePathNormalization:
|
|
def test_extract_parallel_scope_path_normalizes_relative_to_cwd(self, tmp_path, monkeypatch):
|
|
from run_agent import _extract_parallel_scope_path
|
|
|
|
monkeypatch.chdir(tmp_path)
|
|
|
|
scoped = _extract_parallel_scope_path("write_file", {"path": "./notes.txt"})
|
|
|
|
assert scoped == tmp_path / "notes.txt"
|
|
|
|
def test_extract_parallel_scope_path_treats_relative_and_absolute_same_file_as_same_scope(self, tmp_path, monkeypatch):
|
|
from run_agent import _extract_parallel_scope_path, _paths_overlap
|
|
|
|
monkeypatch.chdir(tmp_path)
|
|
abs_path = tmp_path / "notes.txt"
|
|
|
|
rel_scoped = _extract_parallel_scope_path("write_file", {"path": "notes.txt"})
|
|
abs_scoped = _extract_parallel_scope_path("write_file", {"path": str(abs_path)})
|
|
|
|
assert rel_scoped == abs_scoped
|
|
assert _paths_overlap(rel_scoped, abs_scoped)
|
|
|
|
def test_should_parallelize_tool_batch_rejects_same_file_with_mixed_path_spellings(self, tmp_path, monkeypatch):
|
|
from run_agent import _should_parallelize_tool_batch
|
|
|
|
monkeypatch.chdir(tmp_path)
|
|
tc1 = _mock_tool_call(name="write_file", arguments='{"path":"notes.txt","content":"one"}', call_id="c1")
|
|
tc2 = _mock_tool_call(name="write_file", arguments=f'{{"path":"{tmp_path / "notes.txt"}","content":"two"}}', call_id="c2")
|
|
|
|
assert not _should_parallelize_tool_batch([tc1, tc2])
|
|
|
|
|
|
class TestMcpParallelToolBatch:
|
|
"""Integration test: _should_parallelize_tool_batch respects MCP parallel flag."""
|
|
|
|
def test_mcp_tools_default_sequential(self):
|
|
"""MCP tools without supports_parallel_tool_calls are sequential."""
|
|
from run_agent import _should_parallelize_tool_batch
|
|
tc1 = _mock_tool_call(name="mcp_github_list_repos", arguments='{"org":"openai"}', call_id="c1")
|
|
tc2 = _mock_tool_call(name="mcp_github_search_code", arguments='{"q":"test"}', call_id="c2")
|
|
assert not _should_parallelize_tool_batch([tc1, tc2])
|
|
|
|
def test_mcp_tools_parallel_when_server_opted_in(self):
|
|
"""MCP tools from a parallel-safe server can run concurrently."""
|
|
from run_agent import _should_parallelize_tool_batch
|
|
from tools.mcp_tool import _mcp_tool_server_names, _parallel_safe_servers, _lock
|
|
with _lock:
|
|
_parallel_safe_servers.add("github")
|
|
_mcp_tool_server_names["mcp_github_list_repos"] = "github"
|
|
_mcp_tool_server_names["mcp_github_search_code"] = "github"
|
|
try:
|
|
tc1 = _mock_tool_call(name="mcp_github_list_repos", arguments='{"org":"openai"}', call_id="c1")
|
|
tc2 = _mock_tool_call(name="mcp_github_search_code", arguments='{"q":"test"}', call_id="c2")
|
|
assert _should_parallelize_tool_batch([tc1, tc2])
|
|
finally:
|
|
with _lock:
|
|
_parallel_safe_servers.discard("github")
|
|
_mcp_tool_server_names.pop("mcp_github_list_repos", None)
|
|
_mcp_tool_server_names.pop("mcp_github_search_code", None)
|
|
|
|
def test_mixed_mcp_and_builtin_parallel(self):
|
|
"""MCP parallel tools mixed with built-in parallel-safe tools."""
|
|
from run_agent import _should_parallelize_tool_batch
|
|
from tools.mcp_tool import _mcp_tool_server_names, _parallel_safe_servers, _lock
|
|
with _lock:
|
|
_parallel_safe_servers.add("docs")
|
|
_mcp_tool_server_names["mcp_docs_search"] = "docs"
|
|
try:
|
|
tc1 = _mock_tool_call(name="mcp_docs_search", arguments='{"query":"api"}', call_id="c1")
|
|
tc2 = _mock_tool_call(name="web_search", arguments='{"query":"test"}', call_id="c2")
|
|
assert _should_parallelize_tool_batch([tc1, tc2])
|
|
finally:
|
|
with _lock:
|
|
_parallel_safe_servers.discard("docs")
|
|
_mcp_tool_server_names.pop("mcp_docs_search", None)
|
|
|
|
def test_mixed_parallel_and_serial_mcp_servers(self):
|
|
"""One parallel MCP server + one non-parallel MCP server = sequential."""
|
|
from run_agent import _should_parallelize_tool_batch
|
|
from tools.mcp_tool import _mcp_tool_server_names, _parallel_safe_servers, _lock
|
|
with _lock:
|
|
_parallel_safe_servers.add("docs")
|
|
# "github" is NOT in _parallel_safe_servers
|
|
_mcp_tool_server_names["mcp_docs_search"] = "docs"
|
|
_mcp_tool_server_names["mcp_github_list_repos"] = "github"
|
|
try:
|
|
tc1 = _mock_tool_call(name="mcp_docs_search", arguments='{"query":"api"}', call_id="c1")
|
|
tc2 = _mock_tool_call(name="mcp_github_list_repos", arguments='{"org":"openai"}', call_id="c2")
|
|
assert not _should_parallelize_tool_batch([tc1, tc2])
|
|
finally:
|
|
with _lock:
|
|
_parallel_safe_servers.discard("docs")
|
|
_mcp_tool_server_names.pop("mcp_docs_search", None)
|
|
_mcp_tool_server_names.pop("mcp_github_list_repos", None)
|
|
|
|
|
|
class TestHandleMaxIterations:
|
|
def test_returns_summary(self, agent):
|
|
resp = _mock_response(content="Here is a summary of what I did.")
|
|
agent.client.chat.completions.create.return_value = resp
|
|
agent._cached_system_prompt = "You are helpful."
|
|
messages = [{"role": "user", "content": "do stuff"}]
|
|
result = agent._handle_max_iterations(messages, 60)
|
|
assert isinstance(result, str)
|
|
assert len(result) > 0
|
|
assert "summary" in result.lower()
|
|
|
|
def test_api_failure_returns_error(self, agent):
|
|
agent.client.chat.completions.create.side_effect = Exception("API down")
|
|
agent._cached_system_prompt = "You are helpful."
|
|
messages = [{"role": "user", "content": "do stuff"}]
|
|
result = agent._handle_max_iterations(messages, 60)
|
|
assert isinstance(result, str)
|
|
assert "error" in result.lower()
|
|
assert "API down" in result
|
|
|
|
def test_summary_skips_reasoning_for_unsupported_openrouter_model(self, agent):
|
|
agent.base_url = "https://openrouter.ai/api/v1"
|
|
agent.model = "minimax/minimax-m2.5"
|
|
resp = _mock_response(content="Summary")
|
|
agent.client.chat.completions.create.return_value = resp
|
|
agent._cached_system_prompt = "You are helpful."
|
|
messages = [{"role": "user", "content": "do stuff"}]
|
|
|
|
result = agent._handle_max_iterations(messages, 60)
|
|
|
|
assert result == "Summary"
|
|
kwargs = agent.client.chat.completions.create.call_args.kwargs
|
|
assert "reasoning" not in kwargs.get("extra_body", {})
|
|
|
|
def test_summary_request_removes_orphan_tool_result(self, agent):
|
|
"""Regression: max-iterations summary request must NOT contain
|
|
orphan tool results (tool_call_id with no matching assistant tool_call)."""
|
|
resp = _mock_response(content="Summary of work done.")
|
|
agent.client.chat.completions.create.return_value = resp
|
|
agent._cached_system_prompt = "You are helpful."
|
|
messages = [
|
|
{"role": "user", "content": "Analyze finance-data-router"},
|
|
{"role": "assistant", "content": "[Session Arc Summary] ..."},
|
|
{"role": "tool", "tool_call_id": "call_cfedFhJjGmu1RvRc1OUC38j8", "content": "file content here"},
|
|
{"role": "assistant", "tool_calls": [{"id": "call_8fXBXsT592Vpvm7wnW4obPEu", "function": {"name": "patch", "arguments": "{}"}}]},
|
|
{"role": "tool", "tool_call_id": "call_8fXBXsT592Vpvm7wnW4obPEu", "content": "patch result"},
|
|
{"role": "assistant", "content": "Done."},
|
|
]
|
|
|
|
result = agent._handle_max_iterations(messages, 120)
|
|
|
|
assert result == "Summary of work done."
|
|
kwargs = agent.client.chat.completions.create.call_args.kwargs
|
|
sent_msgs = kwargs.get("messages", [])
|
|
orphan_ids = [
|
|
m.get("tool_call_id") for m in sent_msgs
|
|
if m.get("role") == "tool" and m.get("tool_call_id") == "call_cfedFhJjGmu1RvRc1OUC38j8"
|
|
]
|
|
assert len(orphan_ids) == 0, f"Orphan tool result still present: {orphan_ids}"
|
|
|
|
def test_summary_request_inserts_stub_for_missing_tool_result(self, agent):
|
|
"""If an assistant tool_call has no matching tool result in the
|
|
summary request, a stub must be inserted to satisfy the API contract."""
|
|
resp = _mock_response(content="Summary")
|
|
agent.client.chat.completions.create.return_value = resp
|
|
agent._cached_system_prompt = "You are helpful."
|
|
messages = [
|
|
{"role": "user", "content": "do stuff"},
|
|
{"role": "assistant", "tool_calls": [{"id": "call_no_result", "function": {"name": "terminal", "arguments": "{}"}}]},
|
|
{"role": "assistant", "content": "Continuing..."},
|
|
]
|
|
|
|
result = agent._handle_max_iterations(messages, 60)
|
|
|
|
assert result == "Summary"
|
|
kwargs = agent.client.chat.completions.create.call_args.kwargs
|
|
sent_msgs = kwargs.get("messages", [])
|
|
stub_ids = [
|
|
m.get("tool_call_id") for m in sent_msgs
|
|
if m.get("role") == "tool" and m.get("tool_call_id") == "call_no_result"
|
|
]
|
|
assert len(stub_ids) >= 1, f"No stub result for assistant tool_call: {stub_ids}"
|
|
|
|
def test_summary_strips_strict_schema_foreign_fields(self, agent):
|
|
"""Regression: the max-iterations summary request must NOT carry
|
|
Chat-Completions-schema-foreign keys — tool_name (SQLite FTS
|
|
bookkeeping), codex_* reasoning carriers, or internal _-prefixed
|
|
scaffolding. Strict gateways (Fireworks-backed OpenCode Go, Mistral,
|
|
Kimi) reject these with 'Extra inputs are not permitted, field:
|
|
messages[N].tool_name'. The transport's convert_messages() strips
|
|
them on the main loop; this hand-built summary path must mirror it."""
|
|
agent.client.chat.completions.create.return_value = _mock_response(content="Summary")
|
|
agent._cached_system_prompt = "You are helpful."
|
|
messages = [
|
|
{"role": "user", "content": "do stuff"},
|
|
{
|
|
"role": "assistant",
|
|
"tool_calls": [{"id": "call_1", "function": {"name": "execute_code", "arguments": "{}"}}],
|
|
"codex_reasoning_items": [{"id": "rs_1"}],
|
|
},
|
|
{"role": "tool", "tool_call_id": "call_1", "content": "result", "tool_name": "execute_code"},
|
|
{"role": "assistant", "content": "Done.", "_empty_recovery_synthetic": True},
|
|
]
|
|
|
|
result = agent._handle_max_iterations(messages, 60)
|
|
|
|
assert result == "Summary"
|
|
sent_msgs = agent.client.chat.completions.create.call_args.kwargs.get("messages", [])
|
|
for m in sent_msgs:
|
|
assert "tool_name" not in m, m
|
|
assert "codex_reasoning_items" not in m, m
|
|
assert "codex_message_items" not in m, m
|
|
assert not any(isinstance(k, str) and k.startswith("_") for k in m), m
|
|
# Internal history is untouched — the path copies each message.
|
|
assert messages[2]["tool_name"] == "execute_code"
|
|
assert messages[1]["codex_reasoning_items"] == [{"id": "rs_1"}]
|
|
|
|
def test_summary_omits_provider_preferences_for_non_openrouter(self, agent):
|
|
agent.base_url = "https://api.openai.com/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.provider = "openai"
|
|
agent.providers_allowed = ["Anthropic"]
|
|
agent.client.chat.completions.create.return_value = _mock_response(content="Summary")
|
|
agent._cached_system_prompt = "You are helpful."
|
|
|
|
result = agent._handle_max_iterations([{"role": "user", "content": "do stuff"}], 60)
|
|
|
|
assert result == "Summary"
|
|
kwargs = agent.client.chat.completions.create.call_args.kwargs
|
|
assert "provider" not in kwargs.get("extra_body", {})
|
|
|
|
def test_summary_keeps_provider_preferences_for_openrouter(self, agent):
|
|
agent.base_url = "https://openrouter.ai/api/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.provider = "openrouter"
|
|
agent.providers_allowed = ["Anthropic"]
|
|
agent.client.chat.completions.create.return_value = _mock_response(content="Summary")
|
|
agent._cached_system_prompt = "You are helpful."
|
|
|
|
result = agent._handle_max_iterations([{"role": "user", "content": "do stuff"}], 60)
|
|
|
|
assert result == "Summary"
|
|
kwargs = agent.client.chat.completions.create.call_args.kwargs
|
|
assert kwargs["extra_body"]["provider"]["only"] == ["Anthropic"]
|
|
|
|
def test_codex_summary_sanitizes_orphan_tool_results(self, agent):
|
|
agent.api_mode = "codex_responses"
|
|
agent.provider = "openai-codex"
|
|
agent.base_url = "https://chatgpt.com/backend-api/codex"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent._base_url_hostname = "chatgpt.com"
|
|
agent.model = "gpt-5.5"
|
|
agent._cached_system_prompt = "You are helpful."
|
|
captured = {}
|
|
|
|
def fake_run_codex_stream(kwargs):
|
|
captured.update(kwargs)
|
|
return SimpleNamespace(
|
|
status="completed",
|
|
output=[
|
|
SimpleNamespace(
|
|
type="message",
|
|
status="completed",
|
|
content=[SimpleNamespace(type="output_text", text="Summary")],
|
|
)
|
|
],
|
|
)
|
|
|
|
messages = [
|
|
{"role": "user", "content": "do stuff"},
|
|
{
|
|
"role": "tool",
|
|
"tool_call_id": "call_orphan",
|
|
"content": "orphaned result from compressed history",
|
|
},
|
|
]
|
|
|
|
with patch.object(agent, "_run_codex_stream", side_effect=fake_run_codex_stream):
|
|
result = agent._handle_max_iterations(messages, 90)
|
|
|
|
assert result == "Summary"
|
|
input_items = captured["input"]
|
|
assert not any(
|
|
item.get("type") == "function_call_output"
|
|
and item.get("call_id") == "call_orphan"
|
|
for item in input_items
|
|
)
|
|
|
|
def test_api_sanitizer_matches_responses_call_id_when_id_differs(self, agent):
|
|
messages = [
|
|
{
|
|
"role": "assistant",
|
|
"content": "",
|
|
"tool_calls": [
|
|
{
|
|
"id": "fc_123",
|
|
"call_id": "call_123",
|
|
"response_item_id": "fc_123",
|
|
"type": "function",
|
|
"function": {"name": "web_search", "arguments": "{}"},
|
|
}
|
|
],
|
|
},
|
|
{"role": "tool", "tool_call_id": "call_123", "content": "result"},
|
|
]
|
|
|
|
sanitized = agent._sanitize_api_messages(messages)
|
|
|
|
assert [m.get("tool_call_id") for m in sanitized if m.get("role") == "tool"] == [
|
|
"call_123"
|
|
]
|
|
|
|
|
|
class TestRunConversation:
|
|
"""Tests for the main run_conversation method.
|
|
|
|
Each test mocks client.chat.completions.create to return controlled
|
|
responses, exercising different code paths without real API calls.
|
|
"""
|
|
|
|
def _setup_agent(self, agent):
|
|
"""Common setup for run_conversation tests."""
|
|
agent._cached_system_prompt = "You are helpful."
|
|
agent._use_prompt_caching = False
|
|
agent.tool_delay = 0
|
|
agent.compression_enabled = False
|
|
agent.save_trajectories = False
|
|
|
|
def test_stop_finish_reason_returns_response(self, agent):
|
|
self._setup_agent(agent)
|
|
resp = _mock_response(content="Final answer", finish_reason="stop")
|
|
agent.client.chat.completions.create.return_value = resp
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("hello")
|
|
assert result["final_response"] == "Final answer"
|
|
assert result["completed"] is True
|
|
|
|
def test_ollama_small_runtime_context_fails_before_api_call(self, agent, caplog):
|
|
self._setup_agent(agent)
|
|
agent.model = "qwen3.5:9b"
|
|
agent.provider = "custom"
|
|
agent.base_url = "http://host.docker.internal:11434/v1"
|
|
agent._ollama_num_ctx = 4096
|
|
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
caplog.at_level(logging.WARNING, logger="agent.conversation_loop"),
|
|
):
|
|
result = agent.run_conversation("Call ps -aux")
|
|
|
|
assert result["failed"] is True
|
|
assert result["completed"] is False
|
|
assert result["api_calls"] == 0
|
|
assert result["turn_exit_reason"] == "ollama_runtime_context_too_small"
|
|
assert "Ollama loaded `qwen3.5:9b` with only 4,096 tokens" in result["final_response"]
|
|
assert "model.ollama_num_ctx: 65536" in result["final_response"]
|
|
assert not agent.client.chat.completions.create.called
|
|
assert "Ollama runtime context too small for Hermes tool use" in caplog.text
|
|
assert "runtime_context=4096" in caplog.text
|
|
|
|
def test_tool_calls_then_stop(self, agent):
|
|
self._setup_agent(agent)
|
|
tc = _mock_tool_call(name="web_search", arguments="{}", call_id="c1")
|
|
resp1 = _mock_response(content="", finish_reason="tool_calls", tool_calls=[tc])
|
|
resp2 = _mock_response(content="Done searching", finish_reason="stop")
|
|
agent.client.chat.completions.create.side_effect = [resp1, resp2]
|
|
with (
|
|
patch("run_agent.handle_function_call", return_value="search result") as mock_handle_function_call,
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("search something")
|
|
assert result["final_response"] == "Done searching"
|
|
assert result["api_calls"] == 2
|
|
assert mock_handle_function_call.call_args.kwargs["tool_call_id"] == "c1"
|
|
assert mock_handle_function_call.call_args.kwargs["session_id"] == agent.session_id
|
|
|
|
def test_request_scoped_api_hooks_fire_for_each_api_call(self, agent):
|
|
self._setup_agent(agent)
|
|
tc = _mock_tool_call(name="web_search", arguments="{}", call_id="c1")
|
|
resp1 = _mock_response(content="", finish_reason="tool_calls", tool_calls=[tc])
|
|
resp2 = _mock_response(content="Done searching", finish_reason="stop")
|
|
agent.client.chat.completions.create.side_effect = [resp1, resp2]
|
|
|
|
hook_calls = []
|
|
|
|
def _record_hook(name, **kwargs):
|
|
hook_calls.append((name, kwargs))
|
|
return []
|
|
|
|
with (
|
|
patch("run_agent.handle_function_call", return_value="search result"),
|
|
patch("hermes_cli.plugins.invoke_hook", side_effect=_record_hook),
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("search something")
|
|
|
|
assert result["final_response"] == "Done searching"
|
|
pre_request_calls = [kw for name, kw in hook_calls if name == "pre_api_request"]
|
|
post_request_calls = [kw for name, kw in hook_calls if name == "post_api_request"]
|
|
assert len(pre_request_calls) == 2
|
|
assert len(post_request_calls) == 2
|
|
assert [call["api_call_count"] for call in pre_request_calls] == [1, 2]
|
|
assert [call["api_call_count"] for call in post_request_calls] == [1, 2]
|
|
assert all(call["session_id"] == agent.session_id for call in pre_request_calls)
|
|
assert all("message_count" in c and isinstance(c.get("request_messages"), list) for c in pre_request_calls)
|
|
assert any(msg.get("role") == "user" and msg.get("content") == "search something" for msg in pre_request_calls[0]["request_messages"])
|
|
assert all("usage" in c and "response" in c and "assistant_message" in c for c in post_request_calls)
|
|
|
|
def test_content_with_tool_calls_stays_silent_for_non_cli_quiet_mode(self, agent):
|
|
self._setup_agent(agent)
|
|
agent.platform = None
|
|
tc = _mock_tool_call(name="web_search", arguments="{}", call_id="c1")
|
|
resp1 = _mock_response(
|
|
content="I'll search for that.",
|
|
finish_reason="tool_calls",
|
|
tool_calls=[tc],
|
|
)
|
|
resp2 = _mock_response(content="Done searching", finish_reason="stop")
|
|
agent.client.chat.completions.create.side_effect = [resp1, resp2]
|
|
|
|
with (
|
|
patch("run_agent.handle_function_call", return_value="search result"),
|
|
patch.object(agent, "_safe_print") as mock_print,
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("search something")
|
|
|
|
assert result["final_response"] == "Done searching"
|
|
mock_print.assert_not_called()
|
|
|
|
def test_interrupt_breaks_loop(self, agent):
|
|
self._setup_agent(agent)
|
|
|
|
def interrupt_side_effect(api_kwargs):
|
|
agent._interrupt_requested = True
|
|
raise InterruptedError("Agent interrupted during API call")
|
|
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
patch("run_agent._set_interrupt"),
|
|
patch.object(
|
|
agent, "_interruptible_api_call", side_effect=interrupt_side_effect
|
|
),
|
|
):
|
|
result = agent.run_conversation("hello")
|
|
assert result["interrupted"] is True
|
|
|
|
def test_invalid_tool_name_retry(self, agent):
|
|
"""Model hallucinates an invalid tool name, agent retries and succeeds."""
|
|
self._setup_agent(agent)
|
|
bad_tc = _mock_tool_call(name="nonexistent_tool", arguments="{}", call_id="c1")
|
|
resp_bad = _mock_response(
|
|
content="", finish_reason="tool_calls", tool_calls=[bad_tc]
|
|
)
|
|
resp_good = _mock_response(content="Got it", finish_reason="stop")
|
|
agent.client.chat.completions.create.side_effect = [resp_bad, resp_good]
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("do something")
|
|
assert result["final_response"] == "Got it"
|
|
assert result["completed"] is True
|
|
assert result["api_calls"] == 2
|
|
|
|
def test_reasoning_only_local_resumed_no_compression_triggered(self, agent):
|
|
"""Reasoning-only responses no longer trigger compression — prefill then accepted."""
|
|
self._setup_agent(agent)
|
|
agent.base_url = "http://127.0.0.1:1234/v1"
|
|
agent.compression_enabled = True
|
|
empty_resp = _mock_response(
|
|
content=None,
|
|
finish_reason="stop",
|
|
reasoning_content="reasoning only",
|
|
)
|
|
prefill = [
|
|
{"role": "user", "content": "old question"},
|
|
{"role": "assistant", "content": "old answer"},
|
|
]
|
|
|
|
# 6 responses: original + 2 prefill + 3 retries after prefill exhaustion
|
|
with (
|
|
patch.object(agent, "_interruptible_api_call", side_effect=[empty_resp] * 6),
|
|
patch.object(agent, "_compress_context") as mock_compress,
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("hello", conversation_history=prefill)
|
|
|
|
mock_compress.assert_not_called() # no compression triggered
|
|
assert result["completed"] is True
|
|
# #34452: the bare "(empty)" sentinel is now replaced by a
|
|
# user-visible end-of-turn explanation so the failure isn't silent.
|
|
assert result["final_response"] != "(empty)"
|
|
assert "No reply:" in result["final_response"]
|
|
assert result["turn_exit_reason"] == "empty_response_exhausted"
|
|
assert result["api_calls"] == 6 # 1 original + 2 prefill + 3 retries
|
|
|
|
def test_reasoning_only_response_prefill_then_empty(self, agent):
|
|
"""Structured reasoning-only triggers prefill (2), then retries (3), then (empty)."""
|
|
self._setup_agent(agent)
|
|
empty_resp = _mock_response(
|
|
content=None,
|
|
finish_reason="stop",
|
|
reasoning_content="structured reasoning answer",
|
|
)
|
|
# 6 responses: 1 original + 2 prefill + 3 retries after prefill exhaustion
|
|
agent.client.chat.completions.create.side_effect = [empty_resp] * 6
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("answer me")
|
|
assert result["completed"] is True
|
|
# #34452: explanation replaces the bare "(empty)" sentinel.
|
|
assert result["final_response"] != "(empty)"
|
|
assert "No reply:" in result["final_response"]
|
|
assert result["api_calls"] == 6 # 1 original + 2 prefill + 3 retries
|
|
|
|
def test_reasoning_only_prefill_succeeds_on_continuation(self, agent):
|
|
"""When prefill continuation produces content, it becomes the final response."""
|
|
self._setup_agent(agent)
|
|
empty_resp = _mock_response(
|
|
content=None,
|
|
finish_reason="stop",
|
|
reasoning_content="structured reasoning answer",
|
|
)
|
|
content_resp = _mock_response(
|
|
content="Here is the actual answer.",
|
|
finish_reason="stop",
|
|
)
|
|
agent.client.chat.completions.create.side_effect = [empty_resp, content_resp]
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("answer me")
|
|
assert result["completed"] is True
|
|
assert result["final_response"] == "Here is the actual answer."
|
|
assert result["api_calls"] == 2 # 1 original + 1 prefill continuation
|
|
# Prefill message should be cleaned up — no consecutive assistant messages
|
|
roles = [m.get("role") for m in result["messages"]]
|
|
for i in range(len(roles) - 1):
|
|
if roles[i] == "assistant" and roles[i + 1] == "assistant":
|
|
raise AssertionError("Consecutive assistant messages found in history")
|
|
|
|
def test_truly_empty_response_retries_3_times_then_empty(self, agent):
|
|
"""Truly empty response (no content, no reasoning) retries 3 times then falls through to (empty)."""
|
|
self._setup_agent(agent)
|
|
agent.base_url = "http://127.0.0.1:1234/v1"
|
|
empty_resp = _mock_response(content=None, finish_reason="stop")
|
|
# 4 responses: 1 original + 3 nudge retries, all empty
|
|
agent.client.chat.completions.create.side_effect = [
|
|
empty_resp, empty_resp, empty_resp, empty_resp,
|
|
]
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("answer me")
|
|
assert result["completed"] is True
|
|
# #34452: explanation replaces the bare "(empty)" sentinel.
|
|
assert result["final_response"] != "(empty)"
|
|
assert "No reply:" in result["final_response"]
|
|
assert result["api_calls"] == 4 # 1 original + 3 retries
|
|
|
|
def test_truly_empty_response_succeeds_on_nudge(self, agent):
|
|
"""Model produces content after being nudged for empty response."""
|
|
self._setup_agent(agent)
|
|
agent.base_url = "http://127.0.0.1:1234/v1"
|
|
empty_resp = _mock_response(content=None, finish_reason="stop")
|
|
content_resp = _mock_response(
|
|
content="Here is the actual answer.",
|
|
finish_reason="stop",
|
|
)
|
|
# 1 empty response, then model produces content on nudge
|
|
agent.client.chat.completions.create.side_effect = [empty_resp, content_resp]
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("answer me")
|
|
assert result["completed"] is True
|
|
assert result["final_response"] == "Here is the actual answer."
|
|
assert result["api_calls"] == 2 # 1 original + 1 nudge retry
|
|
|
|
def test_empty_response_triggers_fallback_provider(self, agent):
|
|
"""After 3 empty retries, fallback provider is activated and produces content."""
|
|
self._setup_agent(agent)
|
|
agent.base_url = "http://127.0.0.1:1234/v1"
|
|
# Configure a fallback chain
|
|
agent._fallback_chain = [{"provider": "openrouter", "model": "anthropic/claude-sonnet-4"}]
|
|
agent._fallback_index = 0
|
|
agent._fallback_activated = False
|
|
|
|
empty_resp = _mock_response(content=None, finish_reason="stop")
|
|
content_resp = _mock_response(content="Fallback answer.", finish_reason="stop")
|
|
# 4 empty (1 orig + 3 retries), then fallback model answers
|
|
agent.client.chat.completions.create.side_effect = [
|
|
empty_resp, empty_resp, empty_resp, empty_resp, content_resp,
|
|
]
|
|
|
|
fallback_called = {"called": False}
|
|
|
|
def _mock_fallback():
|
|
fallback_called["called"] = True
|
|
# Simulate what _try_activate_fallback does: just advance the
|
|
# index and set the flag (the client is already mocked).
|
|
agent._fallback_index = 1
|
|
agent._fallback_activated = True
|
|
agent.model = "anthropic/claude-sonnet-4"
|
|
agent.provider = "openrouter"
|
|
return True
|
|
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
patch.object(agent, "_try_activate_fallback", side_effect=_mock_fallback),
|
|
):
|
|
result = agent.run_conversation("answer me")
|
|
assert fallback_called["called"], "Fallback should have been triggered"
|
|
assert result["completed"] is True
|
|
assert result["final_response"] == "Fallback answer."
|
|
|
|
def test_empty_response_fallback_also_empty_returns_empty(self, agent):
|
|
"""If fallback also returns empty, final response is (empty)."""
|
|
self._setup_agent(agent)
|
|
agent.base_url = "http://127.0.0.1:1234/v1"
|
|
agent._fallback_chain = [{"provider": "openrouter", "model": "anthropic/claude-sonnet-4"}]
|
|
agent._fallback_index = 0
|
|
agent._fallback_activated = False
|
|
|
|
empty_resp = _mock_response(content=None, finish_reason="stop")
|
|
# 4 empty from primary (1 + 3 retries), fallback activated,
|
|
# then 4 more empty from fallback (1 + 3 retries), no more fallbacks
|
|
agent.client.chat.completions.create.side_effect = [
|
|
empty_resp, empty_resp, empty_resp, empty_resp, # primary exhausted
|
|
empty_resp, empty_resp, empty_resp, empty_resp, # fallback exhausted
|
|
]
|
|
|
|
def _mock_fallback():
|
|
if agent._fallback_index >= len(agent._fallback_chain):
|
|
return False
|
|
agent._fallback_index += 1
|
|
agent._fallback_activated = True
|
|
agent.model = "anthropic/claude-sonnet-4"
|
|
agent.provider = "openrouter"
|
|
return True
|
|
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
patch.object(agent, "_try_activate_fallback", side_effect=_mock_fallback),
|
|
):
|
|
result = agent.run_conversation("answer me")
|
|
assert result["completed"] is True
|
|
# #34452: explanation replaces the bare "(empty)" sentinel.
|
|
assert result["final_response"] != "(empty)"
|
|
assert "No reply:" in result["final_response"]
|
|
|
|
def test_empty_response_emits_status_for_gateway(self, agent):
|
|
"""_emit_status is called during empty retries so gateway users see feedback."""
|
|
self._setup_agent(agent)
|
|
agent.base_url = "http://127.0.0.1:1234/v1"
|
|
|
|
empty_resp = _mock_response(content=None, finish_reason="stop")
|
|
# 4 empty: 1 original + 3 retries, all empty, no fallback
|
|
agent.client.chat.completions.create.side_effect = [
|
|
empty_resp, empty_resp, empty_resp, empty_resp,
|
|
]
|
|
|
|
status_messages = []
|
|
|
|
def _capture_status(msg):
|
|
status_messages.append(msg)
|
|
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
patch.object(agent, "_emit_status", side_effect=_capture_status),
|
|
):
|
|
result = agent.run_conversation("answer me")
|
|
|
|
# #34452: explanation replaces the bare "(empty)" sentinel, but the
|
|
# status emissions during retries are unchanged.
|
|
assert result["final_response"] != "(empty)"
|
|
assert "No reply:" in result["final_response"]
|
|
# Should have emitted retry statuses (3 retries) + final failure
|
|
retry_msgs = [m for m in status_messages if "retrying" in m.lower()]
|
|
assert len(retry_msgs) == 3, f"Expected 3 retry status messages, got {len(retry_msgs)}: {status_messages}"
|
|
failure_msgs = [m for m in status_messages if "no content" in m.lower() or "no fallback" in m.lower()]
|
|
assert len(failure_msgs) >= 1, f"Expected at least 1 failure status, got: {status_messages}"
|
|
|
|
def test_partial_stream_recovery_uses_streamed_content(self, agent):
|
|
"""When streaming fails after partial delivery, recovered partial content becomes final response."""
|
|
self._setup_agent(agent)
|
|
# Simulate a partial-stream-stub response: content recovered from streaming
|
|
partial_resp = _mock_response(
|
|
content="Here is the partial answer that was stream",
|
|
finish_reason="stop",
|
|
)
|
|
agent.client.chat.completions.create.return_value = partial_resp
|
|
# Simulate that streaming had already delivered this text
|
|
agent._current_streamed_assistant_text = "Here is the partial answer that was stream"
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("explain something")
|
|
# The partial content should be used as-is (not empty, not retried)
|
|
assert result["completed"] is True
|
|
assert result["final_response"] == "Here is the partial answer that was stream"
|
|
assert result["api_calls"] == 1 # No retries
|
|
|
|
def test_partial_stream_recovery_on_empty_stub(self, agent):
|
|
"""When stub response has no content but text was streamed, use streamed text."""
|
|
self._setup_agent(agent)
|
|
# Stub response with no content (old behavior before fix)
|
|
empty_stub = _mock_response(content=None, finish_reason="stop")
|
|
|
|
def _fake_api_call(api_kwargs):
|
|
# Simulate what streaming does: accumulate text before returning
|
|
# a stub with no content (connection died mid-stream)
|
|
agent._current_streamed_assistant_text = "The answer to your question is that"
|
|
return empty_stub
|
|
|
|
status_messages = []
|
|
|
|
def _capture_status(msg):
|
|
status_messages.append(msg)
|
|
|
|
with (
|
|
patch.object(agent, "_interruptible_api_call", side_effect=_fake_api_call),
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
patch.object(agent, "_emit_status", side_effect=_capture_status),
|
|
):
|
|
result = agent.run_conversation("ask me")
|
|
# Should recover partial streamed content, not fall through to (empty)
|
|
assert result["completed"] is True
|
|
assert result["final_response"] == "The answer to your question is that"
|
|
assert result["api_calls"] == 1 # No wasted retries
|
|
# Should emit the stream-interrupted status, NOT the empty-retry status
|
|
recovery_msgs = [m for m in status_messages if "stream interrupted" in m.lower()]
|
|
assert len(recovery_msgs) >= 1, f"Expected stream recovery status, got: {status_messages}"
|
|
# Should NOT have retry statuses
|
|
retry_msgs = [m for m in status_messages if "retrying" in m.lower()]
|
|
assert len(retry_msgs) == 0, f"Should not retry when stream content exists: {status_messages}"
|
|
|
|
def test_partial_stream_recovery_preempts_prior_turn_fallback(self, agent):
|
|
"""Partial streamed content takes priority over _last_content_with_tools fallback."""
|
|
self._setup_agent(agent)
|
|
# Set up the prior-turn fallback content (from a previous turn with tool calls)
|
|
agent._last_content_with_tools = "Old content from prior turn with tools"
|
|
# Stub response with no content
|
|
empty_stub = _mock_response(content=None, finish_reason="stop")
|
|
|
|
def _fake_api_call(api_kwargs):
|
|
# Simulate partial streaming before connection death
|
|
agent._current_streamed_assistant_text = "Fresh partial content from this turn"
|
|
return empty_stub
|
|
|
|
with (
|
|
patch.object(agent, "_interruptible_api_call", side_effect=_fake_api_call),
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("question")
|
|
# Should use the streamed content, not the old prior-turn fallback
|
|
assert result["final_response"] == "Fresh partial content from this turn"
|
|
assert result["api_calls"] == 1
|
|
|
|
def test_nous_401_refreshes_after_remint_and_retries(self, agent):
|
|
self._setup_agent(agent)
|
|
agent.provider = "nous"
|
|
agent.api_mode = "chat_completions"
|
|
|
|
calls = {"api": 0, "refresh": 0}
|
|
|
|
class _UnauthorizedError(RuntimeError):
|
|
def __init__(self):
|
|
super().__init__("Error code: 401 - unauthorized")
|
|
self.status_code = 401
|
|
|
|
def _fake_api_call(api_kwargs):
|
|
calls["api"] += 1
|
|
if calls["api"] == 1:
|
|
raise _UnauthorizedError()
|
|
return _mock_response(
|
|
content="Recovered after remint", finish_reason="stop"
|
|
)
|
|
|
|
def _fake_refresh(*, force=True):
|
|
calls["refresh"] += 1
|
|
assert force is True
|
|
return True
|
|
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
patch.object(agent, "_interruptible_api_call", side_effect=_fake_api_call),
|
|
patch.object(
|
|
agent, "_try_refresh_nous_client_credentials", side_effect=_fake_refresh
|
|
),
|
|
):
|
|
result = agent.run_conversation("hello")
|
|
|
|
assert calls["api"] == 2
|
|
assert calls["refresh"] == 1
|
|
assert result["completed"] is True
|
|
assert result["final_response"] == "Recovered after remint"
|
|
|
|
def test_context_compression_triggered(self, agent):
|
|
"""When compressor says should_compress, compression runs."""
|
|
self._setup_agent(agent)
|
|
agent.compression_enabled = True
|
|
|
|
tc = _mock_tool_call(name="web_search", arguments="{}", call_id="c1")
|
|
resp1 = _mock_response(content="", finish_reason="tool_calls", tool_calls=[tc])
|
|
resp2 = _mock_response(content="All done", finish_reason="stop")
|
|
agent.client.chat.completions.create.side_effect = [resp1, resp2]
|
|
|
|
with (
|
|
patch("run_agent.handle_function_call", return_value="result"),
|
|
patch.object(
|
|
agent.context_compressor, "should_compress", return_value=True
|
|
),
|
|
patch.object(agent, "_compress_context") as mock_compress,
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
# _compress_context should return (messages, system_prompt)
|
|
mock_compress.return_value = (
|
|
[{"role": "user", "content": "search something"}],
|
|
"compressed system prompt",
|
|
)
|
|
result = agent.run_conversation("search something")
|
|
mock_compress.assert_called_once()
|
|
assert result["final_response"] == "All done"
|
|
assert result["completed"] is True
|
|
|
|
def test_glm_prompt_exceeds_max_length_triggers_compression(self, agent):
|
|
"""GLM/Z.AI uses 'Prompt exceeds max length' for context overflow."""
|
|
self._setup_agent(agent)
|
|
err_400 = Exception(
|
|
"Error code: 400 - {'error': {'code': '1261', 'message': 'Prompt exceeds max length'}}"
|
|
)
|
|
err_400.status_code = 400
|
|
ok_resp = _mock_response(content="Recovered after compression", finish_reason="stop")
|
|
agent.client.chat.completions.create.side_effect = [err_400, ok_resp]
|
|
prefill = [
|
|
{"role": "user", "content": "previous question"},
|
|
{"role": "assistant", "content": "previous answer"},
|
|
]
|
|
|
|
with (
|
|
patch.object(agent, "_compress_context") as mock_compress,
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
mock_compress.return_value = (
|
|
[{"role": "user", "content": "hello"}],
|
|
"compressed system prompt",
|
|
)
|
|
result = agent.run_conversation("hello", conversation_history=prefill)
|
|
|
|
mock_compress.assert_called_once()
|
|
assert result["final_response"] == "Recovered after compression"
|
|
assert result["completed"] is True
|
|
|
|
def test_minimax_delta_overflow_keeps_known_context_length(self, agent):
|
|
"""MiniMax reports overflow deltas like 'limit (2013)' without the real window.
|
|
|
|
Keep the known 204,800-token window and compress instead of probing down
|
|
to the generic 128K fallback tier.
|
|
"""
|
|
self._setup_agent(agent)
|
|
agent.provider = "minimax"
|
|
agent.model = "MiniMax-M2.7-highspeed"
|
|
agent.base_url = "https://api.minimax.io/anthropic"
|
|
agent.context_compressor.context_length = 204_800
|
|
agent.context_compressor.threshold_tokens = int(
|
|
agent.context_compressor.context_length * agent.context_compressor.threshold_percent
|
|
)
|
|
|
|
err_400 = Exception(
|
|
"HTTP 400: invalid params, context window exceeds limit (2013)"
|
|
)
|
|
err_400.status_code = 400
|
|
ok_resp = _mock_response(content="Recovered after compression", finish_reason="stop")
|
|
agent.client.chat.completions.create.side_effect = [err_400, ok_resp]
|
|
prefill = [
|
|
{"role": "user", "content": "previous question"},
|
|
{"role": "assistant", "content": "previous answer"},
|
|
]
|
|
|
|
with (
|
|
patch.object(agent, "_compress_context") as mock_compress,
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
mock_compress.return_value = (
|
|
[{"role": "user", "content": "hello"}],
|
|
"compressed system prompt",
|
|
)
|
|
result = agent.run_conversation("hello", conversation_history=prefill)
|
|
|
|
mock_compress.assert_called_once()
|
|
assert agent.context_compressor.context_length == 204_800
|
|
assert agent.context_compressor._context_probed is False
|
|
assert result["final_response"] == "Recovered after compression"
|
|
assert result["completed"] is True
|
|
|
|
def test_non_minimax_overflow_without_provider_limit_keeps_context(self, agent):
|
|
"""Generic overflow without a provider-reported max must NOT probe-step down.
|
|
|
|
Previously a 200K configured window would silently drop to the 128K probe
|
|
tier on a generic overflow error. Now we keep the configured window and
|
|
rely on compression — see #33669 / PR #33826.
|
|
"""
|
|
self._setup_agent(agent)
|
|
agent.provider = "openrouter"
|
|
agent.model = "some/unknown-model"
|
|
agent.base_url = "https://openrouter.ai/api/v1"
|
|
agent.context_compressor.context_length = 200_000
|
|
agent.context_compressor.threshold_tokens = int(
|
|
agent.context_compressor.context_length * agent.context_compressor.threshold_percent
|
|
)
|
|
|
|
err_400 = Exception(
|
|
"HTTP 400: invalid params, context window exceeds limit (2013)"
|
|
)
|
|
err_400.status_code = 400
|
|
ok_resp = _mock_response(content="Recovered after compression", finish_reason="stop")
|
|
agent.client.chat.completions.create.side_effect = [err_400, ok_resp]
|
|
prefill = [
|
|
{"role": "user", "content": "previous question"},
|
|
{"role": "assistant", "content": "previous answer"},
|
|
]
|
|
|
|
with (
|
|
patch.object(agent, "_compress_context") as mock_compress,
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
mock_compress.return_value = (
|
|
[{"role": "user", "content": "hello"}],
|
|
"compressed system prompt",
|
|
)
|
|
result = agent.run_conversation("hello", conversation_history=prefill)
|
|
|
|
mock_compress.assert_called_once()
|
|
# Context length preserved — no guessed probe-tier step-down.
|
|
assert agent.context_compressor.context_length == 200_000
|
|
assert result["final_response"] == "Recovered after compression"
|
|
assert result["completed"] is True
|
|
|
|
def test_length_finish_reason_requests_continuation(self, agent):
|
|
"""Normal truncation (partial real content) triggers continuation."""
|
|
self._setup_agent(agent)
|
|
first = _mock_response(content="Part 1 ", finish_reason="length")
|
|
second = _mock_response(content="Part 2", finish_reason="stop")
|
|
agent.client.chat.completions.create.side_effect = [first, second]
|
|
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("hello")
|
|
|
|
assert result["completed"] is True
|
|
assert result["api_calls"] == 2
|
|
assert result["final_response"] == "Part 1 Part 2"
|
|
|
|
second_call_messages = agent.client.chat.completions.create.call_args_list[1].kwargs["messages"]
|
|
assert second_call_messages[-1]["role"] == "user"
|
|
assert "truncated by the output length limit" in second_call_messages[-1]["content"]
|
|
|
|
def test_ollama_glm_stop_after_tools_without_terminal_boundary_requests_continuation(self, agent):
|
|
"""Ollama-hosted GLM responses can misreport truncated output as stop."""
|
|
self._setup_agent(agent)
|
|
agent.base_url = "http://localhost:11434/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.model = "glm-5.1:cloud"
|
|
|
|
tool_turn = _mock_response(
|
|
content="",
|
|
finish_reason="tool_calls",
|
|
tool_calls=[_mock_tool_call(name="web_search", arguments="{}", call_id="c1")],
|
|
)
|
|
misreported_stop = _mock_response(
|
|
content="Based on the search results, the best next",
|
|
finish_reason="stop",
|
|
)
|
|
continued = _mock_response(
|
|
content=" step is to update the config.",
|
|
finish_reason="stop",
|
|
)
|
|
agent.client.chat.completions.create.side_effect = [
|
|
tool_turn,
|
|
misreported_stop,
|
|
continued,
|
|
]
|
|
|
|
with (
|
|
patch("run_agent.handle_function_call", return_value="search result"),
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("hello")
|
|
|
|
assert result["completed"] is True
|
|
assert result["api_calls"] == 3
|
|
assert (
|
|
result["final_response"]
|
|
== "Based on the search results, the best next step is to update the config."
|
|
)
|
|
|
|
third_call_messages = agent.client.chat.completions.create.call_args_list[2].kwargs["messages"]
|
|
assert third_call_messages[-1]["role"] == "user"
|
|
assert "truncated by the output length limit" in third_call_messages[-1]["content"]
|
|
|
|
def test_ollama_glm_stop_with_terminal_boundary_does_not_continue(self, agent):
|
|
"""Complete Ollama/GLM responses should not be reclassified as truncated."""
|
|
self._setup_agent(agent)
|
|
agent.base_url = "http://localhost:11434/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.model = "glm-5.1:cloud"
|
|
|
|
tool_turn = _mock_response(
|
|
content="",
|
|
finish_reason="tool_calls",
|
|
tool_calls=[_mock_tool_call(name="web_search", arguments="{}", call_id="c1")],
|
|
)
|
|
complete_stop = _mock_response(
|
|
content="Based on the search results, the best next step is to update the config.",
|
|
finish_reason="stop",
|
|
)
|
|
agent.client.chat.completions.create.side_effect = [tool_turn, complete_stop]
|
|
|
|
with (
|
|
patch("run_agent.handle_function_call", return_value="search result"),
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("hello")
|
|
|
|
assert result["completed"] is True
|
|
assert result["api_calls"] == 2
|
|
assert (
|
|
result["final_response"]
|
|
== "Based on the search results, the best next step is to update the config."
|
|
)
|
|
|
|
def test_non_ollama_stop_without_terminal_boundary_does_not_continue(self, agent):
|
|
"""The stop->length workaround should stay scoped to Ollama/GLM backends."""
|
|
self._setup_agent(agent)
|
|
agent.base_url = "https://api.openai.com/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.model = "gpt-4o-mini"
|
|
|
|
tool_turn = _mock_response(
|
|
content="",
|
|
finish_reason="tool_calls",
|
|
tool_calls=[_mock_tool_call(name="web_search", arguments="{}", call_id="c1")],
|
|
)
|
|
normal_stop = _mock_response(
|
|
content="Based on the search results, the best next",
|
|
finish_reason="stop",
|
|
)
|
|
agent.client.chat.completions.create.side_effect = [tool_turn, normal_stop]
|
|
|
|
with (
|
|
patch("run_agent.handle_function_call", return_value="search result"),
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("hello")
|
|
|
|
assert result["completed"] is True
|
|
assert result["api_calls"] == 2
|
|
assert result["final_response"] == "Based on the search results, the best next"
|
|
|
|
def test_length_thinking_exhausted_skips_continuation(self, agent):
|
|
"""When finish_reason='length' but content is only thinking, skip retries."""
|
|
self._setup_agent(agent)
|
|
resp = _mock_response(
|
|
content="<think>internal reasoning</think>",
|
|
finish_reason="length",
|
|
)
|
|
agent.client.chat.completions.create.return_value = resp
|
|
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("hello")
|
|
|
|
# Should return immediately — no continuation, only 1 API call
|
|
assert result["completed"] is False
|
|
assert result["api_calls"] == 1
|
|
assert "reasoning" in result["error"].lower()
|
|
assert "output tokens" in result["error"].lower()
|
|
# Should have a user-friendly response (not None)
|
|
assert result["final_response"] is not None
|
|
assert "Thinking Budget Exhausted" in result["final_response"]
|
|
assert "/thinkon" in result["final_response"]
|
|
|
|
def test_length_empty_content_without_think_tags_retries_normally(self, agent):
|
|
"""When finish_reason='length' and content is None but no think tags,
|
|
fall through to normal continuation retry (not thinking-exhaustion)."""
|
|
self._setup_agent(agent)
|
|
resp = _mock_response(content=None, finish_reason="length")
|
|
agent.client.chat.completions.create.return_value = resp
|
|
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("hello")
|
|
|
|
# Without think tags, the agent should attempt continuation retries
|
|
# (up to 3), not immediately fire thinking-exhaustion.
|
|
assert result["api_calls"] == 3
|
|
assert result["completed"] is False
|
|
|
|
def test_length_with_tool_calls_returns_partial_without_executing_tools(self, agent):
|
|
self._setup_agent(agent)
|
|
bad_tc = _mock_tool_call(
|
|
name="write_file",
|
|
arguments='{"path":"report.md","content":"partial',
|
|
call_id="c1",
|
|
)
|
|
resp = _mock_response(content="", finish_reason="length", tool_calls=[bad_tc])
|
|
agent.client.chat.completions.create.return_value = resp
|
|
|
|
with (
|
|
patch("run_agent.handle_function_call") as mock_handle_function_call,
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("write the report")
|
|
|
|
assert result["completed"] is False
|
|
assert result["partial"] is True
|
|
assert "truncated due to output length limit" in result["error"]
|
|
mock_handle_function_call.assert_not_called()
|
|
|
|
def test_truncated_tool_call_retries_once_before_refusing(self, agent):
|
|
"""When tool call args are truncated, the agent retries the API call
|
|
once. If the retry succeeds (valid JSON args), tool execution proceeds."""
|
|
self._setup_agent(agent)
|
|
agent.valid_tool_names.add("write_file")
|
|
bad_tc = _mock_tool_call(
|
|
name="write_file",
|
|
arguments='{"path":"report.md","content":"partial',
|
|
call_id="c1",
|
|
)
|
|
truncated_resp = _mock_response(
|
|
content="", finish_reason="length", tool_calls=[bad_tc],
|
|
)
|
|
good_tc = _mock_tool_call(
|
|
name="write_file",
|
|
arguments='{"path":"report.md","content":"full content"}',
|
|
call_id="c2",
|
|
)
|
|
good_resp = _mock_response(
|
|
content="", finish_reason="stop", tool_calls=[good_tc],
|
|
)
|
|
with (
|
|
patch("run_agent.handle_function_call", return_value='{"success":true}') as mock_hfc,
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
# First call: truncated → retry. Second: valid → execute tool.
|
|
# Third: final text response.
|
|
final_resp = _mock_response(content="Done!", finish_reason="stop")
|
|
agent.client.chat.completions.create.side_effect = [
|
|
truncated_resp, good_resp, final_resp,
|
|
]
|
|
result = agent.run_conversation("write the report")
|
|
|
|
# Tool was executed on the retry (good_resp)
|
|
mock_hfc.assert_called_once()
|
|
assert result["final_response"] == "Done!"
|
|
|
|
def test_truncated_tool_args_detected_when_finish_reason_not_length(self, agent):
|
|
"""When a router rewrites finish_reason from 'length' to 'tool_calls',
|
|
truncated JSON arguments should still be detected and refused rather
|
|
than wasting 3 retry attempts."""
|
|
self._setup_agent(agent)
|
|
agent.valid_tool_names.add("write_file")
|
|
bad_tc = _mock_tool_call(
|
|
name="write_file",
|
|
arguments='{"path":"report.md","content":"partial',
|
|
call_id="c1",
|
|
)
|
|
resp = _mock_response(
|
|
content="", finish_reason="tool_calls", tool_calls=[bad_tc],
|
|
)
|
|
agent.client.chat.completions.create.return_value = resp
|
|
|
|
with (
|
|
patch("run_agent.handle_function_call") as mock_handle_function_call,
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("write the report")
|
|
|
|
assert result["completed"] is False
|
|
assert result["partial"] is True
|
|
assert "truncated due to output length limit" in result["error"]
|
|
mock_handle_function_call.assert_not_called()
|
|
|
|
def test_kanban_block_called_on_iteration_exhaustion(self, agent, monkeypatch):
|
|
"""Regression: kanban worker must signal the dispatcher when its
|
|
iteration budget is exhausted, otherwise the task silently re-runs
|
|
forever without ever tripping the failure_limit circuit breaker
|
|
(issue #23216 / #29747 gap 2).
|
|
|
|
As of #29747, the exhaustion path routes through
|
|
``kanban_db._record_task_failure(outcome="timed_out")`` so the
|
|
``consecutive_failures`` counter increments and the dispatcher's
|
|
``failure_limit`` breaker eventually trips. The legacy
|
|
``kanban_block`` call was replaced because blocked-outcome runs
|
|
bypass the failure counter.
|
|
"""
|
|
self._setup_agent(agent)
|
|
agent.max_iterations = 2
|
|
|
|
monkeypatch.setenv("HERMES_KANBAN_TASK", "t_test_task_123")
|
|
|
|
# Return a tool call for every iteration to exhaust the budget.
|
|
tc = _mock_tool_call(name="web_search", arguments="{}", call_id="c1")
|
|
tool_resp = _mock_response(
|
|
content="", finish_reason="tool_calls", tool_calls=[tc],
|
|
)
|
|
# Final summary response from _handle_max_iterations.
|
|
summary_resp = _mock_response(
|
|
content="Could not finish — budget exhausted.", finish_reason="stop",
|
|
)
|
|
agent.client.chat.completions.create.side_effect = [
|
|
tool_resp, tool_resp, summary_resp,
|
|
]
|
|
|
|
mock_record_failure = MagicMock(return_value=False)
|
|
mock_connect = MagicMock(return_value=MagicMock())
|
|
|
|
with (
|
|
patch("run_agent.handle_function_call", return_value="ok"),
|
|
patch("hermes_cli.kanban_db._record_task_failure",
|
|
mock_record_failure),
|
|
patch("hermes_cli.kanban_db.connect", mock_connect),
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation("do the kanban work")
|
|
|
|
# The agent should have reported the task as not completed.
|
|
assert result["completed"] is False
|
|
|
|
# _record_task_failure should have been called exactly once for
|
|
# the exhaustion event, with outcome="timed_out".
|
|
assert mock_record_failure.call_count == 1, (
|
|
f"Expected exactly 1 _record_task_failure call, "
|
|
f"got {mock_record_failure.call_count}. "
|
|
f"Calls: {mock_record_failure.call_args_list}"
|
|
)
|
|
call = mock_record_failure.call_args_list[0]
|
|
# Positional: (conn, task_id, ...)
|
|
assert call.args[1] == "t_test_task_123"
|
|
assert call.kwargs.get("outcome") == "timed_out"
|
|
assert call.kwargs.get("release_claim") is True
|
|
assert call.kwargs.get("end_run") is True
|
|
assert "Iteration budget exhausted" in call.kwargs.get("error", "")
|
|
|
|
def test_no_kanban_block_when_not_in_kanban_mode(self, agent, monkeypatch):
|
|
"""The exhaustion bridge must NOT fire when HERMES_KANBAN_TASK
|
|
is unset (non-kanban runs are unaffected by #29747 gap 2)."""
|
|
self._setup_agent(agent)
|
|
agent.max_iterations = 2
|
|
|
|
monkeypatch.delenv("HERMES_KANBAN_TASK", raising=False)
|
|
|
|
tc = _mock_tool_call(name="web_search", arguments="{}", call_id="c1")
|
|
tool_resp = _mock_response(
|
|
content="", finish_reason="tool_calls", tool_calls=[tc],
|
|
)
|
|
summary_resp = _mock_response(
|
|
content="Summary.", finish_reason="stop",
|
|
)
|
|
agent.client.chat.completions.create.side_effect = [
|
|
tool_resp, tool_resp, summary_resp,
|
|
]
|
|
|
|
mock_record_failure = MagicMock(return_value=False)
|
|
|
|
with (
|
|
patch("run_agent.handle_function_call", return_value="ok"),
|
|
patch("hermes_cli.kanban_db._record_task_failure",
|
|
mock_record_failure),
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
agent.run_conversation("do stuff")
|
|
|
|
assert mock_record_failure.call_count == 0, (
|
|
"_record_task_failure should not be called outside kanban mode"
|
|
)
|
|
|
|
|
|
class TestRetryExhaustion:
|
|
"""Regression: retry_count > max_retries was dead code (off-by-one).
|
|
|
|
When retries were exhausted the condition never triggered, causing
|
|
the loop to exit and fall through to response.choices[0] on an
|
|
invalid response, raising IndexError.
|
|
"""
|
|
|
|
def _setup_agent(self, agent):
|
|
agent._cached_system_prompt = "You are helpful."
|
|
agent._use_prompt_caching = False
|
|
agent.tool_delay = 0
|
|
agent.compression_enabled = False
|
|
agent.save_trajectories = False
|
|
|
|
@staticmethod
|
|
def _make_fast_time_mock():
|
|
"""Return a mock time module where sleep loops exit instantly."""
|
|
mock_time = MagicMock()
|
|
_t = [1000.0]
|
|
|
|
def _advancing_time():
|
|
_t[0] += 500.0 # jump 500s per call so sleep_end is always in the past
|
|
return _t[0]
|
|
|
|
mock_time.time.side_effect = _advancing_time
|
|
mock_time.sleep = MagicMock() # no-op
|
|
mock_time.monotonic.return_value = 12345.0
|
|
return mock_time
|
|
|
|
def test_invalid_response_returns_error_not_crash(self, agent):
|
|
"""Exhausted retries on invalid (empty choices) response must not IndexError."""
|
|
self._setup_agent(agent)
|
|
# Return response with empty choices every time
|
|
bad_resp = SimpleNamespace(
|
|
choices=[],
|
|
model="test/model",
|
|
usage=None,
|
|
)
|
|
agent.client.chat.completions.create.return_value = bad_resp
|
|
# The conversation loop was extracted out of run_agent.py and pulls
|
|
# in time/jittered_backoff at module level — patch BOTH so the
|
|
# retry waits don't burn 18+ seconds of real wall-clock time here.
|
|
from agent import conversation_loop as _conv_loop
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
patch("run_agent.time", self._make_fast_time_mock()),
|
|
patch.object(_conv_loop, "time", self._make_fast_time_mock()),
|
|
patch.object(_conv_loop, "jittered_backoff", lambda *a, **k: 0.0),
|
|
):
|
|
result = agent.run_conversation("hello")
|
|
assert result.get("completed") is False, (
|
|
f"Expected completed=False, got: {result}"
|
|
)
|
|
assert result.get("failed") is True
|
|
assert "error" in result
|
|
assert "Invalid API response" in result["error"]
|
|
|
|
def test_api_error_returns_gracefully_after_retries(self, agent):
|
|
"""Exhausted retries on API errors must return error result, not crash."""
|
|
self._setup_agent(agent)
|
|
agent.client.chat.completions.create.side_effect = RuntimeError("rate limited")
|
|
from agent import conversation_loop as _conv_loop
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
patch("run_agent.time", self._make_fast_time_mock()),
|
|
patch.object(_conv_loop, "time", self._make_fast_time_mock()),
|
|
patch.object(_conv_loop, "jittered_backoff", lambda *a, **k: 0.0),
|
|
):
|
|
result = agent.run_conversation("hello")
|
|
assert result.get("completed") is False
|
|
assert result.get("failed") is True
|
|
assert "error" in result
|
|
assert "rate limited" in result["error"]
|
|
|
|
def test_build_api_kwargs_error_no_unbound_local(self, agent):
|
|
"""When _build_api_kwargs raises, except handler must not crash with UnboundLocalError.
|
|
|
|
Regression: _dump_api_request_debug(api_kwargs, ...) in the except block
|
|
referenced api_kwargs before it was assigned when _build_api_kwargs threw.
|
|
"""
|
|
self._setup_agent(agent)
|
|
with (
|
|
patch.object(agent, "_build_api_kwargs", side_effect=ValueError("bad messages")),
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
patch("run_agent.time", self._make_fast_time_mock()),
|
|
):
|
|
result = agent.run_conversation("hello")
|
|
# Must surface the real error, not UnboundLocalError
|
|
assert result.get("completed") is False
|
|
assert result.get("failed") is True
|
|
assert "error" in result
|
|
assert "UnboundLocalError" not in result.get("error", "")
|
|
assert "bad messages" in result["error"]
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Conversation history mutation
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestConversationHistoryNotMutated:
|
|
"""run_conversation must not mutate the caller's conversation_history list."""
|
|
|
|
def test_caller_list_unchanged_after_run(self, agent):
|
|
"""Passing conversation_history should not modify the original list."""
|
|
history = [
|
|
{"role": "user", "content": "previous question"},
|
|
{"role": "assistant", "content": "previous answer"},
|
|
]
|
|
original_len = len(history)
|
|
|
|
resp = _mock_response(content="new answer", finish_reason="stop")
|
|
agent.client.chat.completions.create.return_value = resp
|
|
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation(
|
|
"new question", conversation_history=history
|
|
)
|
|
|
|
# Caller's list must be untouched
|
|
assert len(history) == original_len, (
|
|
f"conversation_history was mutated: expected {original_len} items, got {len(history)}"
|
|
)
|
|
# Result should have more messages than the original history
|
|
assert len(result["messages"]) > original_len
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# _max_tokens_param consistency
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestNousCredentialRefresh:
|
|
"""Verify Nous credential refresh rebuilds the runtime client."""
|
|
|
|
def test_try_refresh_nous_client_credentials_rebuilds_client(
|
|
self, agent, monkeypatch
|
|
):
|
|
agent.provider = "nous"
|
|
agent.api_mode = "chat_completions"
|
|
|
|
closed = {"value": False}
|
|
rebuilt = {"kwargs": None}
|
|
captured = {}
|
|
|
|
class _ExistingClient:
|
|
def close(self):
|
|
closed["value"] = True
|
|
|
|
class _RebuiltClient:
|
|
pass
|
|
|
|
def _fake_resolve(**kwargs):
|
|
captured.update(kwargs)
|
|
return {
|
|
"api_key": "new-nous-key",
|
|
"base_url": "https://inference-api.nousresearch.com/v1",
|
|
}
|
|
|
|
def _fake_openai(**kwargs):
|
|
rebuilt["kwargs"] = kwargs
|
|
return _RebuiltClient()
|
|
|
|
monkeypatch.setattr(
|
|
"hermes_cli.auth.resolve_nous_runtime_credentials", _fake_resolve
|
|
)
|
|
|
|
agent.client = _ExistingClient()
|
|
with patch("run_agent.OpenAI", side_effect=_fake_openai):
|
|
ok = agent._try_refresh_nous_client_credentials(force=True)
|
|
|
|
assert ok is True
|
|
assert closed["value"] is True
|
|
assert captured["force_refresh"] is True
|
|
assert rebuilt["kwargs"]["api_key"] == "new-nous-key"
|
|
assert (
|
|
rebuilt["kwargs"]["base_url"] == "https://inference-api.nousresearch.com/v1"
|
|
)
|
|
assert "default_headers" not in rebuilt["kwargs"]
|
|
assert isinstance(agent.client, _RebuiltClient)
|
|
|
|
|
|
class TestCredentialPoolRecovery:
|
|
def test_recover_with_pool_rotates_on_402(self, agent):
|
|
current = SimpleNamespace(label="primary")
|
|
next_entry = SimpleNamespace(label="secondary")
|
|
|
|
class _Pool:
|
|
def current(self):
|
|
return current
|
|
|
|
def mark_exhausted_and_rotate(self, *, status_code, error_context=None):
|
|
assert status_code == 402
|
|
assert error_context is None
|
|
return next_entry
|
|
|
|
agent._credential_pool = _Pool()
|
|
agent._swap_credential = MagicMock()
|
|
|
|
recovered, retry_same = agent._recover_with_credential_pool(
|
|
status_code=402,
|
|
has_retried_429=False,
|
|
)
|
|
|
|
assert recovered is True
|
|
assert retry_same is False
|
|
agent._swap_credential.assert_called_once_with(next_entry)
|
|
|
|
def test_recover_with_pool_rotates_on_billing_reason_even_with_http_400(self, agent):
|
|
next_entry = SimpleNamespace(label="secondary")
|
|
|
|
class _Pool:
|
|
def mark_exhausted_and_rotate(self, *, status_code, error_context=None):
|
|
assert status_code == 400
|
|
assert error_context == {"reason": "out_of_extra_usage"}
|
|
return next_entry
|
|
|
|
agent._credential_pool = _Pool()
|
|
agent._swap_credential = MagicMock()
|
|
|
|
recovered, retry_same = agent._recover_with_credential_pool(
|
|
status_code=400,
|
|
has_retried_429=False,
|
|
classified_reason=FailoverReason.billing,
|
|
error_context={"reason": "out_of_extra_usage"},
|
|
)
|
|
|
|
assert recovered is True
|
|
assert retry_same is False
|
|
agent._swap_credential.assert_called_once_with(next_entry)
|
|
|
|
def test_recover_with_pool_retries_first_429_then_rotates(self, agent):
|
|
next_entry = SimpleNamespace(label="secondary")
|
|
|
|
class _Pool:
|
|
def current(self):
|
|
return SimpleNamespace(label="primary")
|
|
|
|
def mark_exhausted_and_rotate(self, *, status_code, error_context=None):
|
|
assert status_code == 429
|
|
assert error_context is None
|
|
return next_entry
|
|
|
|
agent._credential_pool = _Pool()
|
|
agent._swap_credential = MagicMock()
|
|
|
|
recovered, retry_same = agent._recover_with_credential_pool(
|
|
status_code=429,
|
|
has_retried_429=False,
|
|
)
|
|
assert recovered is False
|
|
assert retry_same is True
|
|
agent._swap_credential.assert_not_called()
|
|
|
|
recovered, retry_same = agent._recover_with_credential_pool(
|
|
status_code=429,
|
|
has_retried_429=True,
|
|
)
|
|
assert recovered is True
|
|
assert retry_same is False
|
|
agent._swap_credential.assert_called_once_with(next_entry)
|
|
|
|
|
|
def test_recover_with_pool_refreshes_on_401(self, agent):
|
|
"""401 with successful refresh should swap to refreshed credential."""
|
|
refreshed_entry = SimpleNamespace(label="refreshed-primary", id="abc")
|
|
|
|
class _Pool:
|
|
def try_refresh_current(self):
|
|
return refreshed_entry
|
|
|
|
agent._credential_pool = _Pool()
|
|
agent._swap_credential = MagicMock()
|
|
|
|
recovered, retry_same = agent._recover_with_credential_pool(
|
|
status_code=401,
|
|
has_retried_429=False,
|
|
)
|
|
|
|
assert recovered is True
|
|
agent._swap_credential.assert_called_once_with(refreshed_entry)
|
|
|
|
def test_recover_with_pool_rotates_on_401_when_refresh_fails(self, agent):
|
|
"""401 with failed refresh should rotate to next credential."""
|
|
next_entry = SimpleNamespace(label="secondary", id="def")
|
|
|
|
class _Pool:
|
|
def try_refresh_current(self):
|
|
return None # refresh failed
|
|
|
|
def mark_exhausted_and_rotate(self, *, status_code, error_context=None):
|
|
assert status_code == 401
|
|
assert error_context is None
|
|
return next_entry
|
|
|
|
agent._credential_pool = _Pool()
|
|
agent._swap_credential = MagicMock()
|
|
|
|
recovered, retry_same = agent._recover_with_credential_pool(
|
|
status_code=401,
|
|
has_retried_429=False,
|
|
)
|
|
|
|
assert recovered is True
|
|
assert retry_same is False
|
|
agent._swap_credential.assert_called_once_with(next_entry)
|
|
|
|
def test_recover_with_pool_401_refresh_fails_no_more_credentials(self, agent):
|
|
"""401 with failed refresh and no other credentials returns not recovered."""
|
|
|
|
class _Pool:
|
|
def try_refresh_current(self):
|
|
return None
|
|
|
|
def mark_exhausted_and_rotate(self, *, status_code, error_context=None):
|
|
assert error_context is None
|
|
return None # no more credentials
|
|
|
|
agent._credential_pool = _Pool()
|
|
agent._swap_credential = MagicMock()
|
|
|
|
recovered, retry_same = agent._recover_with_credential_pool(
|
|
status_code=401,
|
|
has_retried_429=False,
|
|
)
|
|
|
|
assert recovered is False
|
|
agent._swap_credential.assert_not_called()
|
|
|
|
def test_extract_api_error_context_uses_reset_timestamp_and_reason(self, agent):
|
|
response = SimpleNamespace(headers={})
|
|
error = SimpleNamespace(
|
|
body={
|
|
"error": {
|
|
"code": "device_code_exhausted",
|
|
"message": "Weekly credits exhausted.",
|
|
"resets_at": "2026-04-12T10:30:00Z",
|
|
}
|
|
},
|
|
response=response,
|
|
)
|
|
|
|
context = agent._extract_api_error_context(error)
|
|
|
|
assert context["reason"] == "device_code_exhausted"
|
|
assert context["message"] == "Weekly credits exhausted."
|
|
assert context["reset_at"] == "2026-04-12T10:30:00Z"
|
|
|
|
def test_extract_api_error_context_uses_type_as_reason(self, agent):
|
|
error = SimpleNamespace(
|
|
body={
|
|
"error": {
|
|
"type": "usage_limit_reached",
|
|
"message": "The usage limit has been reached",
|
|
}
|
|
},
|
|
response=SimpleNamespace(headers={}),
|
|
)
|
|
|
|
context = agent._extract_api_error_context(error)
|
|
|
|
assert context["reason"] == "usage_limit_reached"
|
|
assert context["message"] == "The usage limit has been reached"
|
|
|
|
def test_extract_api_error_context_parses_resets_in_hours_and_minutes(self, agent, monkeypatch):
|
|
from agent import agent_runtime_helpers
|
|
|
|
monkeypatch.setattr(agent_runtime_helpers.time, "time", lambda: 1_000.0)
|
|
error = SimpleNamespace(
|
|
body={
|
|
"error": {
|
|
"type": "GoUsageLimitError",
|
|
"message": "Weekly usage limit reached. Resets in 6hr 29min.",
|
|
}
|
|
},
|
|
response=SimpleNamespace(headers={}),
|
|
)
|
|
|
|
context = agent._extract_api_error_context(error)
|
|
|
|
assert context["reason"] == "GoUsageLimitError"
|
|
assert context["reset_at"] == 1_000.0 + (6 * 60 * 60) + (29 * 60)
|
|
|
|
def test_recover_with_pool_passes_error_context_on_rotated_429(self, agent):
|
|
next_entry = SimpleNamespace(label="secondary")
|
|
captured = {}
|
|
|
|
class _Pool:
|
|
def current(self):
|
|
return SimpleNamespace(label="primary")
|
|
|
|
def mark_exhausted_and_rotate(self, *, status_code, error_context=None):
|
|
captured["status_code"] = status_code
|
|
captured["error_context"] = error_context
|
|
return next_entry
|
|
|
|
agent._credential_pool = _Pool()
|
|
agent._swap_credential = MagicMock()
|
|
|
|
recovered, retry_same = agent._recover_with_credential_pool(
|
|
status_code=429,
|
|
has_retried_429=True,
|
|
error_context={"reason": "device_code_exhausted", "reset_at": "2026-04-12T10:30:00Z"},
|
|
)
|
|
|
|
assert recovered is True
|
|
assert retry_same is False
|
|
assert captured["status_code"] == 429
|
|
assert captured["error_context"]["reason"] == "device_code_exhausted"
|
|
|
|
|
|
class TestMaxTokensParam:
|
|
"""Verify _max_tokens_param returns the correct key for each provider."""
|
|
|
|
def test_returns_max_completion_tokens_for_direct_openai(self, agent):
|
|
agent.base_url = "https://api.openai.com/v1"
|
|
result = agent._max_tokens_param(4096)
|
|
assert result == {"max_completion_tokens": 4096}
|
|
|
|
def test_returns_max_tokens_for_openrouter(self, agent):
|
|
agent.base_url = "https://openrouter.ai/api/v1"
|
|
result = agent._max_tokens_param(4096)
|
|
assert result == {"max_tokens": 4096}
|
|
|
|
def test_returns_max_tokens_for_local(self, agent):
|
|
agent.base_url = "http://localhost:11434/v1"
|
|
result = agent._max_tokens_param(4096)
|
|
assert result == {"max_tokens": 4096}
|
|
|
|
def test_not_tricked_by_openai_in_openrouter_url(self, agent):
|
|
agent.base_url = "https://openrouter.ai/api/v1/api.openai.com"
|
|
result = agent._max_tokens_param(4096)
|
|
assert result == {"max_tokens": 4096}
|
|
|
|
def test_returns_max_completion_tokens_for_azure(self, agent):
|
|
"""Azure OpenAI requires max_completion_tokens for gpt-5.x models."""
|
|
agent.base_url = "https://my-resource.openai.azure.com/openai/v1"
|
|
result = agent._max_tokens_param(4096)
|
|
assert result == {"max_completion_tokens": 4096}
|
|
|
|
def test_returns_max_completion_tokens_for_github_copilot(self, agent):
|
|
"""GitHub Copilot's OpenAI-compatible API rejects max_tokens for newer models."""
|
|
agent.base_url = "https://api.githubcopilot.com"
|
|
result = agent._max_tokens_param(4096)
|
|
assert result == {"max_completion_tokens": 4096}
|
|
|
|
def test_returns_max_completion_tokens_for_github_copilot_path(self, agent):
|
|
"""Detect Copilot by hostname even when the configured URL includes a path."""
|
|
agent.base_url = "https://api.githubcopilot.com/chat/completions"
|
|
result = agent._max_tokens_param(4096)
|
|
assert result == {"max_completion_tokens": 4096}
|
|
|
|
|
|
class TestGpt5ApiModeRouting:
|
|
"""Verify provider-specific GPT-5 API-mode routing."""
|
|
|
|
def test_azure_gpt5_stays_on_chat_completions(self, agent):
|
|
"""Azure serves gpt-5.x on /chat/completions — must not upgrade to codex_responses."""
|
|
agent.base_url = "https://my-resource.openai.azure.com/openai/v1"
|
|
agent.api_mode = "chat_completions"
|
|
agent.model = "gpt-5.4-mini"
|
|
# Mirror the routing logic from __init__
|
|
if (
|
|
agent.api_mode == "chat_completions"
|
|
and not agent._is_azure_openai_url()
|
|
and (
|
|
agent._is_direct_openai_url()
|
|
or agent._provider_model_requires_responses_api(
|
|
agent.model, provider=agent.provider,
|
|
)
|
|
)
|
|
):
|
|
agent.api_mode = "codex_responses"
|
|
assert agent.api_mode == "chat_completions"
|
|
|
|
def test_non_azure_gpt5_upgrades_to_codex_responses(self, agent):
|
|
"""On api.openai.com, gpt-5.x must still upgrade to codex_responses."""
|
|
agent.base_url = "https://api.openai.com/v1"
|
|
agent.api_mode = "chat_completions"
|
|
agent.model = "gpt-5.4-mini"
|
|
if (
|
|
agent.api_mode == "chat_completions"
|
|
and not agent._is_azure_openai_url()
|
|
and (
|
|
agent._is_direct_openai_url()
|
|
or agent._provider_model_requires_responses_api(
|
|
agent.model, provider=agent.provider,
|
|
)
|
|
)
|
|
):
|
|
agent.api_mode = "codex_responses"
|
|
assert agent.api_mode == "codex_responses"
|
|
|
|
def test_nous_gpt5_stays_on_chat_completions(self, agent):
|
|
"""Nous serves gpt-5.x on /chat/completions — must not upgrade to codex_responses."""
|
|
agent.provider = "nous"
|
|
agent.base_url = "https://inference-api.nousresearch.com/v1"
|
|
agent.api_mode = "chat_completions"
|
|
agent.model = "openai/gpt-5.5"
|
|
if (
|
|
agent.api_mode == "chat_completions"
|
|
and not agent._is_azure_openai_url()
|
|
and (
|
|
agent._is_direct_openai_url()
|
|
or agent._provider_model_requires_responses_api(
|
|
agent.model, provider=agent.provider,
|
|
)
|
|
)
|
|
):
|
|
agent.api_mode = "codex_responses"
|
|
assert agent.api_mode == "chat_completions"
|
|
|
|
def test_is_azure_openai_url_detection(self, agent):
|
|
assert agent._is_azure_openai_url("https://foo.openai.azure.com/openai/v1") is True
|
|
assert agent._is_azure_openai_url("https://api.openai.com/v1") is False
|
|
assert agent._is_azure_openai_url("https://openrouter.ai/api/v1") is False
|
|
# Path-embedded azure string should still detect — we're ~substring matching
|
|
agent.base_url = "https://my-resource.openai.azure.com/openai/v1"
|
|
assert agent._is_azure_openai_url() is True
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# System prompt stability for prompt caching
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestSystemPromptStability:
|
|
"""Verify that the system prompt stays stable across turns for cache hits."""
|
|
|
|
def test_stored_prompt_reused_for_continuing_session(self, agent):
|
|
"""When conversation_history is non-empty and session DB has a stored
|
|
prompt, it should be reused instead of rebuilding from disk."""
|
|
stored = "You are helpful. [stored from turn 1]"
|
|
mock_db = MagicMock()
|
|
mock_db.get_session.return_value = {"system_prompt": stored}
|
|
agent._session_db = mock_db
|
|
|
|
# Simulate a continuing session with history
|
|
history = [
|
|
{"role": "user", "content": "hello"},
|
|
{"role": "assistant", "content": "hi"},
|
|
]
|
|
|
|
# First call — _cached_system_prompt is None, history is non-empty
|
|
agent._cached_system_prompt = None
|
|
|
|
# Patch run_conversation internals to just test the system prompt logic.
|
|
# We'll call the prompt caching block directly by simulating what
|
|
# run_conversation does.
|
|
conversation_history = history
|
|
|
|
# The block under test (from run_conversation):
|
|
if agent._cached_system_prompt is None:
|
|
stored_prompt = None
|
|
if conversation_history and agent._session_db:
|
|
try:
|
|
session_row = agent._session_db.get_session(agent.session_id)
|
|
if session_row:
|
|
stored_prompt = session_row.get("system_prompt") or None
|
|
except Exception:
|
|
pass
|
|
|
|
if stored_prompt:
|
|
agent._cached_system_prompt = stored_prompt
|
|
|
|
assert agent._cached_system_prompt == stored
|
|
mock_db.get_session.assert_called_once_with(agent.session_id)
|
|
|
|
def test_fresh_build_when_no_history(self, agent):
|
|
"""On the first turn (no history), system prompt should be built fresh."""
|
|
mock_db = MagicMock()
|
|
agent._session_db = mock_db
|
|
|
|
agent._cached_system_prompt = None
|
|
conversation_history = []
|
|
|
|
# The block under test:
|
|
if agent._cached_system_prompt is None:
|
|
stored_prompt = None
|
|
if conversation_history and agent._session_db:
|
|
session_row = agent._session_db.get_session(agent.session_id)
|
|
if session_row:
|
|
stored_prompt = session_row.get("system_prompt") or None
|
|
|
|
if stored_prompt:
|
|
agent._cached_system_prompt = stored_prompt
|
|
else:
|
|
agent._cached_system_prompt = agent._build_system_prompt()
|
|
|
|
# Should have built fresh, not queried the DB
|
|
mock_db.get_session.assert_not_called()
|
|
assert agent._cached_system_prompt is not None
|
|
assert "Hermes Agent" in agent._cached_system_prompt
|
|
|
|
def test_fresh_build_when_db_has_no_prompt(self, agent):
|
|
"""If the session DB has no stored prompt, build fresh even with history."""
|
|
mock_db = MagicMock()
|
|
mock_db.get_session.return_value = {"system_prompt": ""}
|
|
agent._session_db = mock_db
|
|
|
|
agent._cached_system_prompt = None
|
|
conversation_history = [{"role": "user", "content": "hi"}]
|
|
|
|
if agent._cached_system_prompt is None:
|
|
stored_prompt = None
|
|
if conversation_history and agent._session_db:
|
|
try:
|
|
session_row = agent._session_db.get_session(agent.session_id)
|
|
if session_row:
|
|
stored_prompt = session_row.get("system_prompt") or None
|
|
except Exception:
|
|
pass
|
|
|
|
if stored_prompt:
|
|
agent._cached_system_prompt = stored_prompt
|
|
else:
|
|
agent._cached_system_prompt = agent._build_system_prompt()
|
|
|
|
# Empty string is falsy, so should fall through to fresh build
|
|
assert "Hermes Agent" in agent._cached_system_prompt
|
|
|
|
class TestBudgetPressure:
|
|
"""Budget exhaustion grace call system."""
|
|
|
|
def test_grace_call_flags_initialized(self, agent):
|
|
"""Agent should have budget grace call flags."""
|
|
assert agent._budget_exhausted_injected is False
|
|
assert agent._budget_grace_call is False
|
|
|
|
|
|
class TestSafeWriter:
|
|
"""Verify _SafeWriter guards stdout against OSError (broken pipes)."""
|
|
|
|
def test_write_delegates_normally(self):
|
|
"""When stdout is healthy, _SafeWriter is transparent."""
|
|
from run_agent import _SafeWriter
|
|
from io import StringIO
|
|
inner = StringIO()
|
|
writer = _SafeWriter(inner)
|
|
writer.write("hello")
|
|
assert inner.getvalue() == "hello"
|
|
|
|
def test_write_catches_oserror(self):
|
|
"""OSError on write is silently caught, returns len(data)."""
|
|
from run_agent import _SafeWriter
|
|
from unittest.mock import MagicMock
|
|
inner = MagicMock()
|
|
inner.write.side_effect = OSError(5, "Input/output error")
|
|
writer = _SafeWriter(inner)
|
|
result = writer.write("hello")
|
|
assert result == 5 # len("hello")
|
|
|
|
def test_flush_catches_oserror(self):
|
|
"""OSError on flush is silently caught."""
|
|
from run_agent import _SafeWriter
|
|
from unittest.mock import MagicMock
|
|
inner = MagicMock()
|
|
inner.flush.side_effect = OSError(5, "Input/output error")
|
|
writer = _SafeWriter(inner)
|
|
writer.flush() # should not raise
|
|
|
|
def test_print_survives_broken_stdout(self, monkeypatch):
|
|
"""print() through _SafeWriter doesn't crash on broken pipe."""
|
|
import sys
|
|
from run_agent import _SafeWriter
|
|
from unittest.mock import MagicMock
|
|
broken = MagicMock()
|
|
broken.write.side_effect = OSError(5, "Input/output error")
|
|
original = sys.stdout
|
|
sys.stdout = _SafeWriter(broken)
|
|
try:
|
|
print("this should not crash") # would raise without _SafeWriter
|
|
finally:
|
|
sys.stdout = original
|
|
|
|
def test_installed_in_run_conversation(self, agent):
|
|
"""run_conversation installs _SafeWriter on stdio."""
|
|
import sys
|
|
from run_agent import _SafeWriter
|
|
resp = _mock_response(content="Done", finish_reason="stop")
|
|
agent.client.chat.completions.create.return_value = resp
|
|
original_stdout = sys.stdout
|
|
original_stderr = sys.stderr
|
|
try:
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
agent.run_conversation("test")
|
|
assert isinstance(sys.stdout, _SafeWriter)
|
|
assert isinstance(sys.stderr, _SafeWriter)
|
|
finally:
|
|
sys.stdout = original_stdout
|
|
sys.stderr = original_stderr
|
|
|
|
# test_installed_before_init_time_honcho_error_prints removed —
|
|
# Honcho integration extracted to plugin (PR #4154).
|
|
|
|
def test_double_wrap_prevented(self):
|
|
"""Wrapping an already-wrapped stream doesn't add layers."""
|
|
from run_agent import _SafeWriter
|
|
from io import StringIO
|
|
inner = StringIO()
|
|
wrapped = _SafeWriter(inner)
|
|
# isinstance check should prevent double-wrapping
|
|
assert isinstance(wrapped, _SafeWriter)
|
|
# The guard in run_conversation checks isinstance before wrapping
|
|
if not isinstance(wrapped, _SafeWriter):
|
|
wrapped = _SafeWriter(wrapped)
|
|
# Still just one layer
|
|
wrapped.write("test")
|
|
assert inner.getvalue() == "test"
|
|
|
|
|
|
|
|
|
|
# ===================================================================
|
|
# Anthropic adapter integration fixes
|
|
# ===================================================================
|
|
|
|
|
|
class TestBuildApiKwargsAnthropicMaxTokens:
|
|
"""Bug fix: max_tokens was always None for Anthropic mode, ignoring user config."""
|
|
|
|
def test_max_tokens_passed_to_anthropic(self, agent):
|
|
agent.api_mode = "anthropic_messages"
|
|
agent.max_tokens = 4096
|
|
agent.reasoning_config = None
|
|
|
|
with patch("agent.anthropic_adapter.build_anthropic_kwargs") as mock_build:
|
|
mock_build.return_value = {"model": "claude-sonnet-4-20250514", "messages": [], "max_tokens": 4096}
|
|
agent._build_api_kwargs([{"role": "user", "content": "test"}])
|
|
_, kwargs = mock_build.call_args
|
|
if not kwargs:
|
|
kwargs = dict(zip(
|
|
["model", "messages", "tools", "max_tokens", "reasoning_config"],
|
|
mock_build.call_args[0],
|
|
))
|
|
assert kwargs.get("max_tokens") == 4096 or mock_build.call_args[1].get("max_tokens") == 4096
|
|
|
|
def test_max_tokens_none_when_unset(self, agent):
|
|
agent.api_mode = "anthropic_messages"
|
|
agent.max_tokens = None
|
|
agent.reasoning_config = None
|
|
|
|
with patch("agent.anthropic_adapter.build_anthropic_kwargs") as mock_build:
|
|
mock_build.return_value = {"model": "claude-sonnet-4-20250514", "messages": [], "max_tokens": 16384}
|
|
agent._build_api_kwargs([{"role": "user", "content": "test"}])
|
|
call_args = mock_build.call_args
|
|
# max_tokens should be None (let adapter use its default)
|
|
if call_args[1]:
|
|
assert call_args[1].get("max_tokens") is None
|
|
else:
|
|
assert call_args[0][3] is None
|
|
|
|
|
|
class TestAnthropicImageFallback:
|
|
def test_build_api_kwargs_converts_multimodal_user_image_to_text(self, agent):
|
|
agent.api_mode = "anthropic_messages"
|
|
agent.reasoning_config = None
|
|
|
|
api_messages = [{
|
|
"role": "user",
|
|
"content": [
|
|
{"type": "text", "text": "Can you see this now?"},
|
|
{"type": "image_url", "image_url": {"url": "https://example.com/cat.png"}},
|
|
],
|
|
}]
|
|
|
|
with (
|
|
patch("tools.vision_tools.vision_analyze_tool", new=AsyncMock(return_value=json.dumps({"success": True, "analysis": "A cat sitting on a chair."}))),
|
|
patch("agent.anthropic_adapter.build_anthropic_kwargs") as mock_build,
|
|
):
|
|
mock_build.return_value = {"model": "claude-sonnet-4-20250514", "messages": [], "max_tokens": 4096}
|
|
agent._build_api_kwargs(api_messages)
|
|
|
|
kwargs = mock_build.call_args.kwargs or dict(zip(
|
|
["model", "messages", "tools", "max_tokens", "reasoning_config"],
|
|
mock_build.call_args.args,
|
|
))
|
|
transformed = kwargs["messages"]
|
|
assert isinstance(transformed[0]["content"], str)
|
|
assert "A cat sitting on a chair." in transformed[0]["content"]
|
|
assert "Can you see this now?" in transformed[0]["content"]
|
|
assert "vision_analyze with image_url: https://example.com/cat.png" in transformed[0]["content"]
|
|
|
|
def test_build_api_kwargs_reuses_cached_image_analysis_for_duplicate_images(self, agent):
|
|
agent.api_mode = "anthropic_messages"
|
|
agent.reasoning_config = None
|
|
data_url = "data:image/png;base64,QUFBQQ=="
|
|
|
|
api_messages = [
|
|
{
|
|
"role": "user",
|
|
"content": [
|
|
{"type": "text", "text": "first"},
|
|
{"type": "input_image", "image_url": data_url},
|
|
],
|
|
},
|
|
{
|
|
"role": "user",
|
|
"content": [
|
|
{"type": "text", "text": "second"},
|
|
{"type": "input_image", "image_url": data_url},
|
|
],
|
|
},
|
|
]
|
|
|
|
mock_vision = AsyncMock(return_value=json.dumps({"success": True, "analysis": "A small test image."}))
|
|
with (
|
|
patch("tools.vision_tools.vision_analyze_tool", new=mock_vision),
|
|
patch("agent.anthropic_adapter.build_anthropic_kwargs") as mock_build,
|
|
):
|
|
mock_build.return_value = {"model": "claude-sonnet-4-20250514", "messages": [], "max_tokens": 4096}
|
|
agent._build_api_kwargs(api_messages)
|
|
|
|
assert mock_vision.await_count == 1
|
|
|
|
|
|
class TestFallbackAnthropicProvider:
|
|
"""Bug fix: _try_activate_fallback had no case for anthropic provider."""
|
|
|
|
def test_fallback_to_anthropic_sets_api_mode(self, agent):
|
|
agent._fallback_activated = False
|
|
agent._fallback_model = {"provider": "anthropic", "model": "claude-sonnet-4-20250514"}
|
|
agent._fallback_chain = [agent._fallback_model]
|
|
agent._fallback_index = 0
|
|
|
|
mock_client = MagicMock()
|
|
mock_client.base_url = "https://api.anthropic.com/v1"
|
|
mock_client.api_key = "sk-ant-api03-test"
|
|
|
|
with (
|
|
patch("agent.auxiliary_client.resolve_provider_client", return_value=(mock_client, None)),
|
|
patch("agent.anthropic_adapter.build_anthropic_client") as mock_build,
|
|
patch("agent.anthropic_adapter.resolve_anthropic_token", return_value=None),
|
|
):
|
|
mock_build.return_value = MagicMock()
|
|
result = agent._try_activate_fallback()
|
|
|
|
assert result is True
|
|
assert agent.api_mode == "anthropic_messages"
|
|
assert agent._anthropic_client is not None
|
|
assert agent.client is None
|
|
|
|
def test_fallback_to_anthropic_enables_prompt_caching(self, agent):
|
|
agent._fallback_activated = False
|
|
agent._fallback_model = {"provider": "anthropic", "model": "claude-sonnet-4-20250514"}
|
|
agent._fallback_chain = [agent._fallback_model]
|
|
agent._fallback_index = 0
|
|
|
|
mock_client = MagicMock()
|
|
mock_client.base_url = "https://api.anthropic.com/v1"
|
|
mock_client.api_key = "sk-ant-api03-test"
|
|
|
|
with (
|
|
patch("agent.auxiliary_client.resolve_provider_client", return_value=(mock_client, None)),
|
|
patch("agent.anthropic_adapter.build_anthropic_client", return_value=MagicMock()),
|
|
patch("agent.anthropic_adapter.resolve_anthropic_token", return_value=None),
|
|
):
|
|
agent._try_activate_fallback()
|
|
|
|
assert agent._use_prompt_caching is True
|
|
|
|
def test_fallback_to_openrouter_uses_openai_client(self, agent):
|
|
agent._fallback_activated = False
|
|
agent._fallback_model = {"provider": "openrouter", "model": "anthropic/claude-sonnet-4"}
|
|
agent._fallback_chain = [agent._fallback_model]
|
|
agent._fallback_index = 0
|
|
|
|
mock_client = MagicMock()
|
|
mock_client.base_url = "https://openrouter.ai/api/v1"
|
|
mock_client.api_key = "sk-or-test"
|
|
|
|
with patch("agent.auxiliary_client.resolve_provider_client", return_value=(mock_client, None)):
|
|
result = agent._try_activate_fallback()
|
|
|
|
assert result is True
|
|
assert agent.api_mode == "chat_completions"
|
|
assert agent.client is mock_client
|
|
|
|
|
|
def test_aiagent_uses_copilot_acp_client():
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=_make_tool_defs("web_search")),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI") as mock_openai,
|
|
patch("agent.copilot_acp_client.CopilotACPClient") as mock_acp_client,
|
|
):
|
|
acp_client = MagicMock()
|
|
mock_acp_client.return_value = acp_client
|
|
|
|
agent = AIAgent(
|
|
api_key="copilot-acp",
|
|
base_url="acp://copilot",
|
|
provider="copilot-acp",
|
|
acp_command="/usr/local/bin/copilot",
|
|
acp_args=["--acp", "--stdio"],
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
|
|
assert agent.client is acp_client
|
|
mock_openai.assert_not_called()
|
|
mock_acp_client.assert_called_once()
|
|
assert mock_acp_client.call_args.kwargs["base_url"] == "acp://copilot"
|
|
assert mock_acp_client.call_args.kwargs["api_key"] == "copilot-acp"
|
|
assert mock_acp_client.call_args.kwargs["command"] == "/usr/local/bin/copilot"
|
|
assert mock_acp_client.call_args.kwargs["args"] == ["--acp", "--stdio"]
|
|
|
|
|
|
def test_quiet_spinner_allowed_with_explicit_print_fn(agent):
|
|
agent._print_fn = lambda *_a, **_kw: None
|
|
with patch.object(run_agent.sys.stdout, "isatty", return_value=False):
|
|
assert agent._should_start_quiet_spinner() is True
|
|
|
|
|
|
def test_quiet_spinner_allowed_on_real_tty(agent):
|
|
agent._print_fn = None
|
|
with patch.object(run_agent.sys.stdout, "isatty", return_value=True):
|
|
assert agent._should_start_quiet_spinner() is True
|
|
|
|
|
|
def test_quiet_spinner_suppressed_on_non_tty_without_print_fn(agent):
|
|
agent._print_fn = None
|
|
with patch.object(run_agent.sys.stdout, "isatty", return_value=False):
|
|
assert agent._should_start_quiet_spinner() is False
|
|
|
|
|
|
def test_is_openai_client_closed_honors_custom_client_flag():
|
|
assert AIAgent._is_openai_client_closed(SimpleNamespace(is_closed=True)) is True
|
|
assert AIAgent._is_openai_client_closed(SimpleNamespace(is_closed=False)) is False
|
|
|
|
|
|
def test_is_openai_client_closed_handles_method_form():
|
|
"""Fix for issue #4377: is_closed as method (openai SDK) vs property (httpx).
|
|
|
|
The openai SDK's is_closed is a method, not a property. Prior to this fix,
|
|
getattr(client, "is_closed", False) returned the bound method object, which
|
|
is always truthy, causing the function to incorrectly report all clients as
|
|
closed and triggering unnecessary client recreation on every API call.
|
|
"""
|
|
|
|
class MethodFormClient:
|
|
"""Mimics openai.OpenAI where is_closed() is a method."""
|
|
|
|
def __init__(self, closed: bool):
|
|
self._closed = closed
|
|
|
|
def is_closed(self) -> bool:
|
|
return self._closed
|
|
|
|
# Method returning False - client is open
|
|
open_client = MethodFormClient(closed=False)
|
|
assert AIAgent._is_openai_client_closed(open_client) is False
|
|
|
|
# Method returning True - client is closed
|
|
closed_client = MethodFormClient(closed=True)
|
|
assert AIAgent._is_openai_client_closed(closed_client) is True
|
|
|
|
|
|
def test_is_openai_client_closed_falls_back_to_http_client():
|
|
"""Verify fallback to _client.is_closed when top-level is_closed is None."""
|
|
|
|
class ClientWithHttpClient:
|
|
is_closed = None # No top-level is_closed
|
|
|
|
def __init__(self, http_closed: bool):
|
|
self._client = SimpleNamespace(is_closed=http_closed)
|
|
|
|
assert AIAgent._is_openai_client_closed(ClientWithHttpClient(http_closed=False)) is False
|
|
assert AIAgent._is_openai_client_closed(ClientWithHttpClient(http_closed=True)) is True
|
|
|
|
|
|
class TestAnthropicBaseUrlPassthrough:
|
|
"""Bug fix: base_url was filtered with 'anthropic in base_url', blocking proxies."""
|
|
|
|
def test_custom_proxy_base_url_passed_through(self):
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=_make_tool_defs("web_search")),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("agent.anthropic_adapter.build_anthropic_client") as mock_build,
|
|
):
|
|
mock_build.return_value = MagicMock()
|
|
a = AIAgent(
|
|
api_key="sk-ant-api03-test1234567890",
|
|
base_url="https://llm-proxy.company.com/v1",
|
|
api_mode="anthropic_messages",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
call_args = mock_build.call_args
|
|
# base_url should be passed through, not filtered out
|
|
assert call_args[0][1] == "https://llm-proxy.company.com/v1"
|
|
|
|
def test_none_base_url_passed_as_none(self):
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=_make_tool_defs("web_search")),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("agent.anthropic_adapter.build_anthropic_client") as mock_build,
|
|
):
|
|
mock_build.return_value = MagicMock()
|
|
a = AIAgent(
|
|
api_key="sk-ant...7890",
|
|
api_mode="anthropic_messages",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
call_args = mock_build.call_args
|
|
# No base_url provided, should be default empty string or None
|
|
passed_url = call_args[0][1]
|
|
assert not passed_url or passed_url is None
|
|
|
|
|
|
class TestAnthropicCredentialRefresh:
|
|
def test_try_refresh_anthropic_client_credentials_rebuilds_client(self):
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=_make_tool_defs("web_search")),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("agent.anthropic_adapter.build_anthropic_client") as mock_build,
|
|
):
|
|
old_client = MagicMock()
|
|
new_client = MagicMock()
|
|
mock_build.side_effect = [old_client, new_client]
|
|
agent = AIAgent(
|
|
api_key="sk-ant-oat01-stale-token",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
api_mode="anthropic_messages",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
|
|
agent._anthropic_client = old_client
|
|
agent._anthropic_api_key = "sk-ant-oat01-stale-token"
|
|
agent._anthropic_base_url = "https://api.anthropic.com"
|
|
agent.provider = "anthropic"
|
|
|
|
with (
|
|
patch("agent.anthropic_adapter.resolve_anthropic_token", return_value="sk-ant-oat01-fresh-token"),
|
|
patch("agent.anthropic_adapter.build_anthropic_client", return_value=new_client) as rebuild,
|
|
):
|
|
assert agent._try_refresh_anthropic_client_credentials() is True
|
|
|
|
old_client.close.assert_called_once()
|
|
rebuild.assert_called_once_with(
|
|
"sk-ant-oat01-fresh-token", "https://api.anthropic.com", timeout=None,
|
|
)
|
|
assert agent._anthropic_client is new_client
|
|
assert agent._anthropic_api_key == "sk-ant-oat01-fresh-token"
|
|
|
|
def test_try_refresh_anthropic_client_credentials_returns_false_when_token_unchanged(self):
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=_make_tool_defs("web_search")),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("agent.anthropic_adapter.build_anthropic_client", return_value=MagicMock()),
|
|
):
|
|
agent = AIAgent(
|
|
api_key="sk-ant-oat01-same-token",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
api_mode="anthropic_messages",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
|
|
old_client = MagicMock()
|
|
agent._anthropic_client = old_client
|
|
agent._anthropic_api_key = "sk-ant-oat01-same-token"
|
|
|
|
with (
|
|
patch("agent.anthropic_adapter.resolve_anthropic_token", return_value="sk-ant-oat01-same-token"),
|
|
patch("agent.anthropic_adapter.build_anthropic_client") as rebuild,
|
|
):
|
|
assert agent._try_refresh_anthropic_client_credentials() is False
|
|
|
|
old_client.close.assert_not_called()
|
|
rebuild.assert_not_called()
|
|
|
|
def test_anthropic_messages_create_preflights_refresh(self):
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=_make_tool_defs("web_search")),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("agent.anthropic_adapter.build_anthropic_client", return_value=MagicMock()),
|
|
):
|
|
agent = AIAgent(
|
|
api_key="sk-ant-oat01-current-token",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
api_mode="anthropic_messages",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
|
|
response = SimpleNamespace(content=[])
|
|
agent._anthropic_client = MagicMock()
|
|
agent._anthropic_client.messages.create.return_value = response
|
|
|
|
with patch.object(agent, "_try_refresh_anthropic_client_credentials", return_value=True) as refresh:
|
|
result = agent._anthropic_messages_create({"model": "claude-sonnet-4-20250514"})
|
|
|
|
refresh.assert_called_once_with()
|
|
agent._anthropic_client.messages.create.assert_called_once_with(model="claude-sonnet-4-20250514")
|
|
assert result is response
|
|
|
|
|
|
# ===================================================================
|
|
# _streaming_api_call tests
|
|
# ===================================================================
|
|
|
|
def _make_chunk(content=None, tool_calls=None, finish_reason=None, model="test/model"):
|
|
"""Build a SimpleNamespace mimicking an OpenAI streaming chunk."""
|
|
delta = SimpleNamespace(content=content, tool_calls=tool_calls)
|
|
choice = SimpleNamespace(delta=delta, finish_reason=finish_reason)
|
|
return SimpleNamespace(model=model, choices=[choice])
|
|
|
|
|
|
def _make_tc_delta(index=0, tc_id=None, name=None, arguments=None):
|
|
"""Build a SimpleNamespace mimicking a streaming tool_call delta."""
|
|
func = SimpleNamespace(name=name, arguments=arguments)
|
|
return SimpleNamespace(index=index, id=tc_id, function=func)
|
|
|
|
|
|
class TestStreamingApiCall:
|
|
"""Tests for _streaming_api_call — voice TTS streaming pipeline."""
|
|
|
|
def test_content_assembly(self, agent):
|
|
chunks = [
|
|
_make_chunk(content="Hel"),
|
|
_make_chunk(content="lo "),
|
|
_make_chunk(content="World"),
|
|
_make_chunk(finish_reason="stop"),
|
|
]
|
|
agent.client.chat.completions.create.return_value = iter(chunks)
|
|
callback = MagicMock()
|
|
agent.stream_delta_callback = callback
|
|
|
|
resp = agent._interruptible_streaming_api_call({"messages": []})
|
|
|
|
assert resp.choices[0].message.content == "Hello World"
|
|
assert resp.choices[0].finish_reason == "stop"
|
|
assert callback.call_count == 3
|
|
callback.assert_any_call("Hel")
|
|
callback.assert_any_call("lo ")
|
|
callback.assert_any_call("World")
|
|
|
|
def test_tool_call_accumulation(self, agent):
|
|
# Per OpenAI streaming spec, function names are delivered atomically
|
|
# in the first chunk; only `arguments` is fragmented across chunks.
|
|
# The accumulator uses assignment for names (immune to MiniMax/NIM
|
|
# resends of the full name) and `+=` for arguments.
|
|
chunks = [
|
|
_make_chunk(tool_calls=[_make_tc_delta(0, "call_1", "web_search", '{"q":')]),
|
|
_make_chunk(tool_calls=[_make_tc_delta(0, None, None, '"test"}')]),
|
|
_make_chunk(finish_reason="tool_calls"),
|
|
]
|
|
agent.client.chat.completions.create.return_value = iter(chunks)
|
|
|
|
resp = agent._interruptible_streaming_api_call({"messages": []})
|
|
|
|
tc = resp.choices[0].message.tool_calls
|
|
assert len(tc) == 1
|
|
assert tc[0].function.name == "web_search"
|
|
assert tc[0].function.arguments == '{"q":"test"}'
|
|
assert tc[0].id == "call_1"
|
|
|
|
def test_multiple_tool_calls(self, agent):
|
|
chunks = [
|
|
_make_chunk(tool_calls=[_make_tc_delta(0, "call_a", "search", '{}')]),
|
|
_make_chunk(tool_calls=[_make_tc_delta(1, "call_b", "read", '{}')]),
|
|
_make_chunk(finish_reason="tool_calls"),
|
|
]
|
|
agent.client.chat.completions.create.return_value = iter(chunks)
|
|
|
|
resp = agent._interruptible_streaming_api_call({"messages": []})
|
|
|
|
tc = resp.choices[0].message.tool_calls
|
|
assert len(tc) == 2
|
|
assert tc[0].function.name == "search"
|
|
assert tc[1].function.name == "read"
|
|
|
|
def test_truncated_tool_call_args_upgrade_finish_reason_to_length(self, agent):
|
|
chunks = [
|
|
_make_chunk(tool_calls=[_make_tc_delta(0, "call_1", "write_file", '{"path":"x.txt","content":"hel')]),
|
|
]
|
|
agent.client.chat.completions.create.return_value = iter(chunks)
|
|
|
|
resp = agent._interruptible_streaming_api_call({"messages": []})
|
|
|
|
tc = resp.choices[0].message.tool_calls
|
|
assert len(tc) == 1
|
|
assert tc[0].function.name == "write_file"
|
|
assert tc[0].function.arguments == '{"path":"x.txt","content":"hel'
|
|
assert resp.choices[0].finish_reason == "length"
|
|
|
|
def test_ollama_reused_index_separate_tool_calls(self, agent):
|
|
"""Ollama sends every tool call at index 0 with different ids.
|
|
|
|
Without the fix, names and arguments get concatenated into one slot.
|
|
"""
|
|
chunks = [
|
|
_make_chunk(tool_calls=[_make_tc_delta(0, "call_a", "search", '{"q":"hello"}')]),
|
|
# Second tool call at the SAME index 0, but different id
|
|
_make_chunk(tool_calls=[_make_tc_delta(0, "call_b", "read_file", '{"path":"x.py"}')]),
|
|
_make_chunk(finish_reason="tool_calls"),
|
|
]
|
|
agent.client.chat.completions.create.return_value = iter(chunks)
|
|
|
|
resp = agent._interruptible_streaming_api_call({"messages": []})
|
|
|
|
tc = resp.choices[0].message.tool_calls
|
|
assert len(tc) == 2, f"Expected 2 tool calls, got {len(tc)}: {[t.function.name for t in tc]}"
|
|
assert tc[0].function.name == "search"
|
|
assert tc[0].function.arguments == '{"q":"hello"}'
|
|
assert tc[0].id == "call_a"
|
|
assert tc[1].function.name == "read_file"
|
|
assert tc[1].function.arguments == '{"path":"x.py"}'
|
|
assert tc[1].id == "call_b"
|
|
|
|
def test_ollama_reused_index_streamed_args(self, agent):
|
|
"""Ollama with streamed arguments across multiple chunks at same index."""
|
|
chunks = [
|
|
_make_chunk(tool_calls=[_make_tc_delta(0, "call_a", "search", '{"q":')]),
|
|
_make_chunk(tool_calls=[_make_tc_delta(0, None, None, '"hello"}')]),
|
|
# New tool call, same index 0
|
|
_make_chunk(tool_calls=[_make_tc_delta(0, "call_b", "read", '{}')]),
|
|
_make_chunk(finish_reason="tool_calls"),
|
|
]
|
|
agent.client.chat.completions.create.return_value = iter(chunks)
|
|
|
|
resp = agent._interruptible_streaming_api_call({"messages": []})
|
|
|
|
tc = resp.choices[0].message.tool_calls
|
|
assert len(tc) == 2
|
|
assert tc[0].function.name == "search"
|
|
assert tc[0].function.arguments == '{"q":"hello"}'
|
|
assert tc[1].function.name == "read"
|
|
assert tc[1].function.arguments == '{}'
|
|
|
|
def test_content_and_tool_calls_together(self, agent):
|
|
chunks = [
|
|
_make_chunk(content="I'll search"),
|
|
_make_chunk(tool_calls=[_make_tc_delta(0, "call_1", "search", '{}')]),
|
|
_make_chunk(finish_reason="tool_calls"),
|
|
]
|
|
agent.client.chat.completions.create.return_value = iter(chunks)
|
|
|
|
resp = agent._interruptible_streaming_api_call({"messages": []})
|
|
|
|
assert resp.choices[0].message.content == "I'll search"
|
|
assert len(resp.choices[0].message.tool_calls) == 1
|
|
|
|
def test_empty_content_returns_none(self, agent):
|
|
chunks = [_make_chunk(finish_reason="stop")]
|
|
agent.client.chat.completions.create.return_value = iter(chunks)
|
|
|
|
resp = agent._interruptible_streaming_api_call({"messages": []})
|
|
|
|
assert resp.choices[0].message.content is None
|
|
assert resp.choices[0].message.tool_calls is None
|
|
|
|
def test_callback_exception_swallowed(self, agent):
|
|
chunks = [
|
|
_make_chunk(content="Hello"),
|
|
_make_chunk(content=" World"),
|
|
_make_chunk(finish_reason="stop"),
|
|
]
|
|
agent.client.chat.completions.create.return_value = iter(chunks)
|
|
agent.stream_delta_callback = MagicMock(side_effect=ValueError("boom"))
|
|
|
|
resp = agent._interruptible_streaming_api_call({"messages": []})
|
|
|
|
assert resp.choices[0].message.content == "Hello World"
|
|
|
|
def test_model_name_captured(self, agent):
|
|
chunks = [
|
|
_make_chunk(content="Hi", model="gpt-4o"),
|
|
_make_chunk(finish_reason="stop", model="gpt-4o"),
|
|
]
|
|
agent.client.chat.completions.create.return_value = iter(chunks)
|
|
|
|
resp = agent._interruptible_streaming_api_call({"messages": []})
|
|
|
|
assert resp.model == "gpt-4o"
|
|
|
|
def test_stream_kwarg_injected(self, agent):
|
|
chunks = [_make_chunk(content="x"), _make_chunk(finish_reason="stop")]
|
|
agent.client.chat.completions.create.return_value = iter(chunks)
|
|
|
|
agent._interruptible_streaming_api_call({"messages": [], "model": "test"})
|
|
|
|
call_kwargs = agent.client.chat.completions.create.call_args
|
|
assert call_kwargs[1].get("stream") is True or call_kwargs.kwargs.get("stream") is True
|
|
|
|
def test_api_exception_propagates_no_non_streaming_fallback(self, agent):
|
|
"""When streaming fails before any deltas, error propagates to the main retry loop."""
|
|
agent.client.chat.completions.create.side_effect = ConnectionError("fail")
|
|
# Prevent stream retry logic from replacing the mock client
|
|
with patch.object(agent, "_replace_primary_openai_client", return_value=False):
|
|
# The fallback also uses the same client, so it'll fail too
|
|
with pytest.raises(ConnectionError, match="fail"):
|
|
agent._interruptible_streaming_api_call({"messages": []})
|
|
|
|
def test_response_has_uuid_id(self, agent):
|
|
chunks = [_make_chunk(content="x"), _make_chunk(finish_reason="stop")]
|
|
agent.client.chat.completions.create.return_value = iter(chunks)
|
|
|
|
resp = agent._interruptible_streaming_api_call({"messages": []})
|
|
|
|
assert resp.id.startswith("stream-")
|
|
assert len(resp.id) > len("stream-")
|
|
|
|
def test_empty_choices_chunk_skipped(self, agent):
|
|
empty_chunk = SimpleNamespace(model="gpt-4", choices=[])
|
|
chunks = [
|
|
empty_chunk,
|
|
_make_chunk(content="Hello", model="gpt-4"),
|
|
_make_chunk(finish_reason="stop", model="gpt-4"),
|
|
]
|
|
agent.client.chat.completions.create.return_value = iter(chunks)
|
|
|
|
resp = agent._interruptible_streaming_api_call({"messages": []})
|
|
|
|
assert resp.choices[0].message.content == "Hello"
|
|
assert resp.model == "gpt-4"
|
|
|
|
|
|
# ===================================================================
|
|
# Interrupt _vprint force=True verification
|
|
# ===================================================================
|
|
|
|
|
|
class TestInterruptVprintForceTrue:
|
|
"""All interrupt _vprint calls must use force=True so they are always visible."""
|
|
|
|
def test_all_interrupt_vprint_have_force_true(self):
|
|
"""Scan source for _vprint calls containing 'Interrupt' — each must have force=True."""
|
|
import inspect
|
|
source = inspect.getsource(AIAgent)
|
|
lines = source.split("\n")
|
|
violations = []
|
|
for i, line in enumerate(lines, 1):
|
|
stripped = line.strip()
|
|
if "_vprint(" in stripped and "Interrupt" in stripped:
|
|
if "force=True" not in stripped:
|
|
violations.append(f"line {i}: {stripped}")
|
|
assert not violations, (
|
|
f"Interrupt _vprint calls missing force=True:\n"
|
|
+ "\n".join(violations)
|
|
)
|
|
|
|
|
|
# ===================================================================
|
|
# Anthropic interrupt handler in _interruptible_api_call
|
|
# ===================================================================
|
|
|
|
|
|
class TestAnthropicInterruptHandler:
|
|
"""_interruptible_api_call must handle Anthropic mode when interrupted."""
|
|
|
|
def test_interruptible_has_anthropic_branch(self):
|
|
"""The interrupt handler must check api_mode == 'anthropic_messages'."""
|
|
import inspect
|
|
from agent.chat_completion_helpers import interruptible_api_call
|
|
source = inspect.getsource(interruptible_api_call)
|
|
assert "anthropic_messages" in source, \
|
|
"interruptible_api_call must handle Anthropic interrupt (api_mode check)"
|
|
|
|
def test_interruptible_rebuilds_anthropic_client(self):
|
|
"""After interrupting, the Anthropic client should be rebuilt."""
|
|
import inspect
|
|
from agent.chat_completion_helpers import interruptible_api_call
|
|
source = inspect.getsource(interruptible_api_call)
|
|
assert "build_anthropic_client" in source, \
|
|
"interruptible_api_call must rebuild Anthropic client after interrupt"
|
|
|
|
def test_streaming_has_anthropic_branch(self):
|
|
"""_streaming_api_call must also handle Anthropic interrupt."""
|
|
import inspect
|
|
from agent.chat_completion_helpers import interruptible_streaming_api_call
|
|
source = inspect.getsource(interruptible_streaming_api_call)
|
|
assert "anthropic_messages" in source, \
|
|
"interruptible_streaming_api_call must handle Anthropic interrupt"
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Bugfix: stream_callback forwarding for non-streaming providers
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestStreamCallbackNonStreamingProvider:
|
|
"""When api_mode != chat_completions, stream_callback must still receive
|
|
the response content so TTS works (batch delivery)."""
|
|
|
|
def test_callback_receives_chat_completions_response(self, agent):
|
|
"""For chat_completions-shaped responses, callback gets content."""
|
|
agent.api_mode = "anthropic_messages"
|
|
mock_response = SimpleNamespace(
|
|
choices=[SimpleNamespace(
|
|
message=SimpleNamespace(content="Hello", tool_calls=None, reasoning_content=None),
|
|
finish_reason="stop", index=0,
|
|
)],
|
|
usage=None, model="test", id="test-id",
|
|
)
|
|
agent._interruptible_api_call = MagicMock(return_value=mock_response)
|
|
|
|
received = []
|
|
cb = lambda delta: received.append(delta)
|
|
agent._stream_callback = cb
|
|
|
|
_cb = getattr(agent, "_stream_callback", None)
|
|
response = agent._interruptible_api_call({})
|
|
if _cb is not None and response:
|
|
try:
|
|
if agent.api_mode == "anthropic_messages":
|
|
text_parts = [
|
|
block.text for block in getattr(response, "content", [])
|
|
if getattr(block, "type", None) == "text" and getattr(block, "text", None)
|
|
]
|
|
content = " ".join(text_parts) if text_parts else None
|
|
else:
|
|
content = response.choices[0].message.content
|
|
if content:
|
|
_cb(content)
|
|
except Exception:
|
|
pass
|
|
|
|
# Anthropic format not matched above; fallback via except
|
|
# Test the actual code path by checking chat_completions branch
|
|
received2 = []
|
|
agent.api_mode = "some_other_mode"
|
|
agent._stream_callback = lambda d: received2.append(d)
|
|
_cb2 = agent._stream_callback
|
|
if _cb2 is not None and mock_response:
|
|
try:
|
|
content = mock_response.choices[0].message.content
|
|
if content:
|
|
_cb2(content)
|
|
except Exception:
|
|
pass
|
|
assert received2 == ["Hello"]
|
|
|
|
def test_callback_receives_anthropic_content(self, agent):
|
|
"""For Anthropic responses, text blocks are extracted and forwarded."""
|
|
agent.api_mode = "anthropic_messages"
|
|
mock_response = SimpleNamespace(
|
|
content=[SimpleNamespace(type="text", text="Hello from Claude")],
|
|
stop_reason="end_turn",
|
|
)
|
|
|
|
received = []
|
|
cb = lambda d: received.append(d)
|
|
agent._stream_callback = cb
|
|
_cb = agent._stream_callback
|
|
|
|
if _cb is not None and mock_response:
|
|
try:
|
|
if agent.api_mode == "anthropic_messages":
|
|
text_parts = [
|
|
block.text for block in getattr(mock_response, "content", [])
|
|
if getattr(block, "type", None) == "text" and getattr(block, "text", None)
|
|
]
|
|
content = " ".join(text_parts) if text_parts else None
|
|
else:
|
|
content = mock_response.choices[0].message.content
|
|
if content:
|
|
_cb(content)
|
|
except Exception:
|
|
pass
|
|
|
|
assert received == ["Hello from Claude"]
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Bugfix: API-only user message prefixes must not persist
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestPersistUserMessageOverride:
|
|
"""Synthetic API-only user prefixes should never leak into transcripts."""
|
|
|
|
def test_persist_session_rewrites_current_turn_user_message(self, agent):
|
|
agent._session_db = MagicMock()
|
|
agent.session_id = "session-123"
|
|
agent._last_flushed_db_idx = 0
|
|
agent._persist_user_message_idx = 0
|
|
agent._persist_user_message_override = "Hello there"
|
|
messages = [
|
|
{
|
|
"role": "user",
|
|
"content": (
|
|
"[Voice input — respond concisely and conversationally, "
|
|
"2-3 sentences max. No code blocks or markdown.] Hello there"
|
|
),
|
|
},
|
|
{"role": "assistant", "content": "Hi!"},
|
|
]
|
|
|
|
agent._persist_session(messages, [])
|
|
|
|
assert messages[0]["content"] == "Hello there"
|
|
first_db_write = agent._session_db.append_message.call_args_list[0].kwargs
|
|
assert first_db_write["content"] == "Hello there"
|
|
|
|
|
|
class TestReasoningReplayForStrictProviders:
|
|
"""Assistant replay must preserve provider-native reasoning fields."""
|
|
|
|
def _setup_agent(self, agent):
|
|
agent._cached_system_prompt = "You are helpful."
|
|
agent._use_prompt_caching = False
|
|
agent.tool_delay = 0
|
|
agent.compression_enabled = False
|
|
agent.save_trajectories = False
|
|
|
|
def test_kimi_tool_replay_includes_space_reasoning_content(self, agent):
|
|
self._setup_agent(agent)
|
|
agent.base_url = "https://api.kimi.com/coding/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.provider = "kimi-coding"
|
|
|
|
prior_assistant = {
|
|
"role": "assistant",
|
|
"content": "",
|
|
"tool_calls": [
|
|
{
|
|
"id": "c1",
|
|
"type": "function",
|
|
"function": {"name": "terminal", "arguments": "{\"command\":\"date\"}"},
|
|
}
|
|
],
|
|
}
|
|
tool_result = {"role": "tool", "tool_call_id": "c1", "content": "Tue Apr 21"}
|
|
final_resp = _mock_response(content="done", finish_reason="stop")
|
|
agent.client.chat.completions.create.return_value = final_resp
|
|
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation(
|
|
"next step",
|
|
conversation_history=[prior_assistant, tool_result],
|
|
)
|
|
|
|
assert result["completed"] is True
|
|
sent_messages = agent.client.chat.completions.create.call_args.kwargs["messages"]
|
|
replayed_assistant = next(msg for msg in sent_messages if msg.get("role") == "assistant")
|
|
assert replayed_assistant["role"] == "assistant"
|
|
assert replayed_assistant["tool_calls"][0]["function"]["name"] == "terminal"
|
|
assert "reasoning_content" in replayed_assistant
|
|
assert replayed_assistant["reasoning_content"] == " "
|
|
|
|
def test_explicit_reasoning_content_beats_normalized_reasoning_on_replay(self, agent):
|
|
self._setup_agent(agent)
|
|
prior_assistant = {
|
|
"role": "assistant",
|
|
"content": "",
|
|
"tool_calls": [
|
|
{
|
|
"id": "c1",
|
|
"type": "function",
|
|
"function": {"name": "web_search", "arguments": "{\"q\":\"test\"}"},
|
|
}
|
|
],
|
|
"reasoning": "summary reasoning",
|
|
"reasoning_content": "provider-native scratchpad",
|
|
}
|
|
tool_result = {"role": "tool", "tool_call_id": "c1", "content": "ok"}
|
|
final_resp = _mock_response(content="done", finish_reason="stop")
|
|
agent.client.chat.completions.create.return_value = final_resp
|
|
|
|
with (
|
|
patch.object(agent, "_persist_session"),
|
|
patch.object(agent, "_save_trajectory"),
|
|
patch.object(agent, "_cleanup_task_resources"),
|
|
):
|
|
result = agent.run_conversation(
|
|
"next step",
|
|
conversation_history=[prior_assistant, tool_result],
|
|
)
|
|
|
|
assert result["completed"] is True
|
|
sent_messages = agent.client.chat.completions.create.call_args.kwargs["messages"]
|
|
replayed_assistant = next(msg for msg in sent_messages if msg.get("role") == "assistant")
|
|
assert replayed_assistant["reasoning_content"] == "provider-native scratchpad"
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Bugfix: _vprint force=True on error messages during TTS
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestVprintForceOnErrors:
|
|
"""Error/warning messages must be visible during streaming TTS."""
|
|
|
|
def test_forced_message_shown_during_tts(self, agent):
|
|
agent._stream_callback = lambda x: None
|
|
printed = []
|
|
with patch("builtins.print", side_effect=lambda *a, **kw: printed.append(a)):
|
|
agent._vprint("error msg", force=True)
|
|
assert len(printed) == 1
|
|
|
|
def test_non_forced_suppressed_during_tts(self, agent):
|
|
agent._stream_callback = lambda x: None
|
|
printed = []
|
|
with patch("builtins.print", side_effect=lambda *a, **kw: printed.append(a)):
|
|
agent._vprint("debug info")
|
|
assert len(printed) == 0
|
|
|
|
def test_all_shown_without_tts(self, agent):
|
|
agent._stream_callback = None
|
|
printed = []
|
|
with patch("builtins.print", side_effect=lambda *a, **kw: printed.append(a)):
|
|
agent._vprint("debug")
|
|
agent._vprint("error", force=True)
|
|
assert len(printed) == 2
|
|
|
|
|
|
class TestNormalizeCodexDictArguments:
|
|
"""_normalize_codex_response must produce valid JSON strings for tool
|
|
call arguments, even when the Responses API returns them as dicts."""
|
|
|
|
def _make_codex_response(self, item_type, arguments, item_status="completed"):
|
|
"""Build a minimal Responses API response with a single tool call."""
|
|
item = SimpleNamespace(
|
|
type=item_type,
|
|
status=item_status,
|
|
)
|
|
if item_type == "function_call":
|
|
item.name = "web_search"
|
|
item.arguments = arguments
|
|
item.call_id = "call_abc123"
|
|
item.id = "fc_abc123"
|
|
elif item_type == "custom_tool_call":
|
|
item.name = "web_search"
|
|
item.input = arguments
|
|
item.call_id = "call_abc123"
|
|
item.id = "fc_abc123"
|
|
return SimpleNamespace(
|
|
output=[item],
|
|
status="completed",
|
|
)
|
|
|
|
def test_function_call_dict_arguments_produce_valid_json(self, agent):
|
|
"""dict arguments from function_call must be serialised with
|
|
json.dumps, not str(), so downstream json.loads() succeeds."""
|
|
args_dict = {"query": "weather in NYC", "units": "celsius"}
|
|
response = self._make_codex_response("function_call", args_dict)
|
|
msg, _ = _normalize_codex_response(response)
|
|
tc = msg.tool_calls[0]
|
|
parsed = json.loads(tc.function.arguments)
|
|
assert parsed == args_dict
|
|
|
|
def test_custom_tool_call_dict_arguments_produce_valid_json(self, agent):
|
|
"""dict arguments from custom_tool_call must also use json.dumps."""
|
|
args_dict = {"path": "/tmp/test.txt", "content": "hello"}
|
|
response = self._make_codex_response("custom_tool_call", args_dict)
|
|
msg, _ = _normalize_codex_response(response)
|
|
tc = msg.tool_calls[0]
|
|
parsed = json.loads(tc.function.arguments)
|
|
assert parsed == args_dict
|
|
|
|
def test_string_arguments_unchanged(self, agent):
|
|
"""String arguments must pass through without modification."""
|
|
args_str = '{"query": "test"}'
|
|
response = self._make_codex_response("function_call", args_str)
|
|
msg, _ = _normalize_codex_response(response)
|
|
tc = msg.tool_calls[0]
|
|
assert tc.function.arguments == args_str
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# OAuth flag and nudge counter fixes (salvaged from PR #1797)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestOAuthFlagAfterCredentialRefresh:
|
|
"""_is_anthropic_oauth must update when token type changes during refresh."""
|
|
|
|
def test_oauth_flag_updates_api_key_to_oauth(self, agent):
|
|
"""Refreshing from API key to OAuth token must set flag to True."""
|
|
agent.api_mode = "anthropic_messages"
|
|
agent.provider = "anthropic"
|
|
agent._anthropic_api_key = "sk-ant-api-old"
|
|
agent._anthropic_client = MagicMock()
|
|
agent._is_anthropic_oauth = False
|
|
|
|
with (
|
|
patch("agent.anthropic_adapter.resolve_anthropic_token",
|
|
return_value="sk-ant-setup-oauth-token"),
|
|
patch("agent.anthropic_adapter.build_anthropic_client",
|
|
return_value=MagicMock()),
|
|
):
|
|
result = agent._try_refresh_anthropic_client_credentials()
|
|
|
|
assert result is True
|
|
assert agent._is_anthropic_oauth is True
|
|
|
|
def test_oauth_flag_updates_oauth_to_api_key(self, agent):
|
|
"""Refreshing from OAuth to API key must set flag to False."""
|
|
agent.api_mode = "anthropic_messages"
|
|
agent.provider = "anthropic"
|
|
agent._anthropic_api_key = "sk-ant-setup-old"
|
|
agent._anthropic_client = MagicMock()
|
|
agent._is_anthropic_oauth = True
|
|
|
|
with (
|
|
patch("agent.anthropic_adapter.resolve_anthropic_token",
|
|
return_value="sk-ant-api03-new-key"),
|
|
patch("agent.anthropic_adapter.build_anthropic_client",
|
|
return_value=MagicMock()),
|
|
):
|
|
result = agent._try_refresh_anthropic_client_credentials()
|
|
|
|
assert result is True
|
|
assert agent._is_anthropic_oauth is False
|
|
|
|
|
|
class TestFallbackSetsOAuthFlag:
|
|
"""_try_activate_fallback must set _is_anthropic_oauth for Anthropic fallbacks."""
|
|
|
|
def test_fallback_to_anthropic_oauth_sets_flag(self, agent):
|
|
agent._fallback_activated = False
|
|
agent._fallback_model = {"provider": "anthropic", "model": "claude-sonnet-4-6"}
|
|
agent._fallback_chain = [agent._fallback_model]
|
|
agent._fallback_index = 0
|
|
|
|
mock_client = MagicMock()
|
|
mock_client.base_url = "https://api.anthropic.com/v1"
|
|
mock_client.api_key = "sk-ant-setup-oauth-token"
|
|
|
|
with (
|
|
patch("agent.auxiliary_client.resolve_provider_client",
|
|
return_value=(mock_client, None)),
|
|
patch("agent.anthropic_adapter.build_anthropic_client",
|
|
return_value=MagicMock()),
|
|
patch("agent.anthropic_adapter.resolve_anthropic_token",
|
|
return_value=None),
|
|
):
|
|
result = agent._try_activate_fallback()
|
|
|
|
assert result is True
|
|
assert agent._is_anthropic_oauth is True
|
|
|
|
def test_fallback_to_anthropic_api_key_clears_flag(self, agent):
|
|
agent._fallback_activated = False
|
|
agent._fallback_model = {"provider": "anthropic", "model": "claude-sonnet-4-6"}
|
|
agent._fallback_chain = [agent._fallback_model]
|
|
agent._fallback_index = 0
|
|
|
|
mock_client = MagicMock()
|
|
mock_client.base_url = "https://api.anthropic.com/v1"
|
|
mock_client.api_key = "sk-ant-api03-regular-key"
|
|
|
|
with (
|
|
patch("agent.auxiliary_client.resolve_provider_client",
|
|
return_value=(mock_client, None)),
|
|
patch("agent.anthropic_adapter.build_anthropic_client",
|
|
return_value=MagicMock()),
|
|
patch("agent.anthropic_adapter.resolve_anthropic_token",
|
|
return_value=None),
|
|
):
|
|
result = agent._try_activate_fallback()
|
|
|
|
assert result is True
|
|
assert agent._is_anthropic_oauth is False
|
|
|
|
|
|
class TestMemoryNudgeCounterPersistence:
|
|
"""_turns_since_memory must persist across run_conversation calls."""
|
|
|
|
def test_counters_initialized_in_init(self):
|
|
"""Counters must exist on the agent after __init__."""
|
|
with patch("run_agent.get_tool_definitions", return_value=[]):
|
|
a = AIAgent(
|
|
model="test", api_key="test-key", base_url="http://localhost:1234/v1",
|
|
provider="openrouter", skip_context_files=True, skip_memory=True,
|
|
)
|
|
assert hasattr(a, "_turns_since_memory")
|
|
assert hasattr(a, "_iters_since_skill")
|
|
assert a._turns_since_memory == 0
|
|
assert a._iters_since_skill == 0
|
|
|
|
def test_counters_not_reset_in_preamble(self):
|
|
"""The run_conversation preamble must not zero the nudge counters."""
|
|
import inspect
|
|
from agent.conversation_loop import run_conversation as _rc
|
|
src = inspect.getsource(_rc)
|
|
# The preamble resets many fields (retry counts, budget, etc.)
|
|
# before the main loop. Find that reset block and verify our
|
|
# counters aren't in it. The reset block ends at iteration_budget.
|
|
# The extracted body uses ``agent.X`` (not ``self.X``). Anchor
|
|
# exactly on ``agent.iteration_budget = IterationBudget`` so an
|
|
# unrelated identifier ending in ``iteration_budget`` (e.g.
|
|
# ``_iteration_budget`` or ``shared_iteration_budget``) can't
|
|
# match the boundary.
|
|
preamble_end = src.index("agent.iteration_budget = IterationBudget")
|
|
preamble = src[:preamble_end]
|
|
assert "agent._turns_since_memory = 0" not in preamble
|
|
assert "agent._iters_since_skill = 0" not in preamble
|
|
|
|
|
|
class TestDeadRetryCode:
|
|
"""Unreachable retry_count >= max_retries after raise must not exist."""
|
|
|
|
def test_no_unreachable_max_retries_after_backoff(self):
|
|
import inspect
|
|
from agent.conversation_loop import run_conversation as _rc
|
|
source = inspect.getsource(_rc)
|
|
occurrences = source.count("if retry_count >= max_retries:")
|
|
assert occurrences == 2, (
|
|
f"Expected 2 occurrences of 'if retry_count >= max_retries:' "
|
|
f"but found {occurrences}"
|
|
)
|
|
|
|
|
|
class TestSupportsReasoningExtraBody:
|
|
def _make_agent(self):
|
|
agent = object.__new__(AIAgent)
|
|
agent.provider = "openrouter"
|
|
agent.base_url = "https://openrouter.ai/api/v1"
|
|
agent._base_url_lower = agent.base_url.lower()
|
|
agent.model = ""
|
|
return agent
|
|
|
|
def test_xiaomi_models_are_treated_as_reasoning_capable(self):
|
|
agent = self._make_agent()
|
|
for model in (
|
|
"xiaomi/mimo-v2.5-pro",
|
|
"xiaomi/mimo-v2.5",
|
|
"xiaomi/mimo-v2-omni",
|
|
"xiaomi/mimo-v2-pro",
|
|
"xiaomi/mimo-v2-flash",
|
|
):
|
|
agent.model = model
|
|
assert agent._supports_reasoning_extra_body() is True, model
|
|
|
|
|
|
class TestMemoryContextSanitization:
|
|
"""sanitize_context() helper correctness — used at provider boundaries."""
|
|
|
|
def test_user_message_is_not_mutated_by_run_conversation(self):
|
|
"""User input must reach run_conversation untouched — if a user types
|
|
a literal <memory-context> tag we don't silently delete their text.
|
|
The streaming scrubber + plugin-side scrub cover real leak paths."""
|
|
import inspect
|
|
from agent.conversation_loop import run_conversation as _rc
|
|
src = inspect.getsource(_rc)
|
|
assert "sanitize_context(user_message)" not in src
|
|
assert "sanitize_context(persist_user_message)" not in src
|
|
|
|
def test_sanitize_context_strips_full_block(self):
|
|
"""Helper-level: a string with an embedded memory-context block is
|
|
cleaned to just the surrounding text. Used by build_memory_context_block
|
|
(input-validation) and by plugins on their own backend boundary."""
|
|
from agent.memory_manager import sanitize_context
|
|
user_text = "how is the honcho working"
|
|
injected = (
|
|
user_text + "\n\n"
|
|
"<memory-context>\n"
|
|
"[System note: The following is recalled memory context, "
|
|
"NOT new user input. Treat as informational background data.]\n\n"
|
|
"## User Representation\n"
|
|
"[2026-01-13 02:13:00] stale observation about AstroMap\n"
|
|
"</memory-context>"
|
|
)
|
|
result = sanitize_context(injected)
|
|
assert "memory-context" not in result.lower()
|
|
assert "stale observation" not in result
|
|
assert "how is the honcho working" in result
|
|
|
|
|
|
class TestMemoryProviderTurnStart:
|
|
"""run_conversation() must call memory_manager.on_turn_start() before prefetch_all().
|
|
|
|
Without this call, providers like Honcho never update _turn_count, so cadence
|
|
checks (contextCadence, dialecticCadence) are always satisfied — every turn
|
|
fires both context refresh and dialectic, ignoring the configured cadence.
|
|
"""
|
|
|
|
def test_on_turn_start_called_before_prefetch(self):
|
|
"""Source-level check: on_turn_start appears before prefetch_all in run_conversation."""
|
|
import inspect
|
|
from agent.conversation_loop import run_conversation as _rc
|
|
src = inspect.getsource(_rc)
|
|
# Find the actual method calls, not comments
|
|
idx_turn_start = src.index(".on_turn_start(")
|
|
idx_prefetch = src.index(".prefetch_all(")
|
|
assert idx_turn_start < idx_prefetch, (
|
|
"on_turn_start() must be called before prefetch_all() in run_conversation "
|
|
"so that memory providers have the correct turn count for cadence checks"
|
|
)
|
|
|
|
def test_on_turn_start_uses_user_turn_count(self):
|
|
"""Source-level check: on_turn_start receives the user_turn_count."""
|
|
import inspect
|
|
from agent.conversation_loop import run_conversation as _rc
|
|
src = inspect.getsource(_rc)
|
|
# The extracted body uses ``agent.X`` rather than ``self.X``;
|
|
# assert the extracted-form spelling directly.
|
|
assert "on_turn_start(agent._user_turn_count" in src
|