feat(curator): add hermes curator usage — all-skills usage view

Surfaces the usage_report()/provenance() data layer added in #36701 as a
user-facing CLI command. Unlike `hermes curator status` (scoped to
curator-managed agent-created candidates), `usage` lists every skill on disk
— bundled built-ins and hub-installed included — with per-skill use/view/patch
counts and an agent/bundled/hub provenance tag.

Flags: --sort {activity,recent,name}, --provenance {agent,bundled,hub} filter,
--json for machine-readable output.

.envrc

@@ -1,5 +1,5 @@
 watch_file pyproject.toml uv.lock
-watch_file package-lock.json package.json web/package.json ui-tui/package.json website/package.json apps/shared/package.json apps/desktop/package.json ui-tui/packages/hermes-ink/package.json
+watch_file ui-tui/package-lock.json ui-tui/package.json
 watch_file flake.nix flake.lock nix/devShell.nix nix/tui.nix nix/package.nix nix/python.nix
 
 use flake

.github/workflows/docker-publish.yml

@@ -26,10 +26,6 @@ on:
 
 permissions:
   contents: read
-  # Needed so the arm64 job can push/pull its registry-backed build cache
-  # to ghcr.io (cache-to/cache-from type=registry).  See the build-arm64
-  # job for why registry cache replaced the gha cache on that arch.
-  packages: write
 
 # Concurrency: push/release runs are NEVER cancelled so every merge gets
 # its own image.  PR runs reuse a PR-scoped group with
@@ -200,34 +196,11 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f  # v3
 
-      # Log in to ghcr.io so the registry-backed build cache below can be
-      # read (cache-from) on every event and written (cache-to) on
-      # push/release.  Uses the workflow's GITHUB_TOKEN, which is valid for
-      # the whole job — unlike the gha cache backend's short-lived Azure SAS
-      # token, which expired mid-build on slow cold-cache arm64 runs and
-      # crashed the build before the smoke test (the reason the gha cache
-      # was removed from arm64 PRs in the first place).
-      - name: Log in to ghcr.io (build cache)
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121  # v4.1.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      # Build once, load into the local daemon for smoke testing.
-      #
-      # PR builds use the registry-backed cache READ-ONLY (cache-from only):
-      # they pull warm layers pushed by the most recent main build but never
-      # write, so rapid PR pushes don't race on cache writes or pollute the
-      # cache ref.  This restores warm-cache speed to arm64 PR builds (which
-      # were running fully uncached and were ~45% slower than amd64, making
-      # them the job most often cancelled on supersede).
-      #
-      # Registry cache (type=registry on ghcr.io) is used instead of the gha
-      # cache that previously broke here: its credential is the job-lifetime
-      # GITHUB_TOKEN, not a short-lived SAS token, so the cold-build-outlives-
-      # token failure mode cannot recur.
-      - name: Build image (arm64, smoke test, cache read-only PR)
+      # Build once, load into the local daemon for smoke testing. PR arm64
+      # builds deliberately avoid the gha cache: cold-cache arm64 builds can
+      # outlive GitHub's short-lived Azure cache SAS token, then fail while
+      # reading or writing cache blobs before the smoke test can run.
+      - name: Build image (arm64, smoke test, uncached PR)
         if: github.event_name == 'pull_request'
         uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f  # v7.1.0
         with:
@@ -238,11 +211,9 @@ jobs:
           tags: ${{ env.IMAGE_NAME }}:test
           build-args: |
             HERMES_GIT_SHA=${{ github.sha }}
-          cache-from: type=registry,ref=ghcr.io/nousresearch/hermes-agent:buildcache-arm64
 
-      # Main/release builds read AND write the registry cache so the digest
-      # push below reuses layers from this smoke-test build, and so the next
-      # PR/main build starts warm.
+      # Main/release builds still use the per-arch gha cache so the digest
+      # push below can reuse layers from this smoke-test build.
       - name: Build image (arm64, smoke test, cached publish)
         if: github.event_name != 'pull_request'
         uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f  # v7.1.0
@@ -254,8 +225,8 @@ jobs:
           tags: ${{ env.IMAGE_NAME }}:test
           build-args: |
             HERMES_GIT_SHA=${{ github.sha }}
-          cache-from: type=registry,ref=ghcr.io/nousresearch/hermes-agent:buildcache-arm64
-          cache-to: type=registry,ref=ghcr.io/nousresearch/hermes-agent:buildcache-arm64,mode=max
+          cache-from: type=gha,scope=docker-arm64
+          cache-to: type=gha,mode=max,scope=docker-arm64
 
       - name: Smoke test image
         uses: ./.github/actions/hermes-smoke-test
@@ -282,8 +253,8 @@ jobs:
           build-args: |
             HERMES_GIT_SHA=${{ github.sha }}
           outputs: type=image,name=${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
-          cache-from: type=registry,ref=ghcr.io/nousresearch/hermes-agent:buildcache-arm64
-          cache-to: type=registry,ref=ghcr.io/nousresearch/hermes-agent:buildcache-arm64,mode=max
+          cache-from: type=gha,scope=docker-arm64
+          cache-to: type=gha,mode=max,scope=docker-arm64
 
       - name: Export digest
         if: github.event_name == 'push' && github.ref == 'refs/heads/main' || github.event_name == 'release'

.github/workflows/nix-lockfile-fix.yml

@@ -4,10 +4,10 @@ on:
   push:
     branches: [main]
     paths:
-      - 'package-lock.json'
-      - 'package.json'
+      - 'ui-tui/package-lock.json'
       - 'ui-tui/package.json'
-      - 'apps/desktop/package.json'
+      - 'apps/dashboard/package-lock.json'
+      - 'apps/dashboard/package.json'
   workflow_dispatch:
     inputs:
       pr_number:
@@ -27,9 +27,9 @@ concurrency:
 
 jobs:
   # ── Auto-fix on main ───────────────────────────────────────────────
-  # Fires when a push to main touches package.json or package-lock.json.
-  # Runs fix-lockfiles and pushes the hash update commit directly to main
-  # so Nix builds never stay broken.
+  # Fires when a push to main touches package.json or package-lock.json
+  # in ui-tui/ or apps/dashboard/. Runs fix-lockfiles and pushes the hash
+  # update commit directly to main so Nix builds never stay broken.
   #
   # Safety invariants:
   #   1. The fix commit only touches nix/*.nix files, which are NOT in
@@ -109,8 +109,8 @@ jobs:
             # our computed hashes are stale. Abort and let the next triggered
             # run recompute from the correct package-lock state.
             pkg_changed="$(git diff --name-only "$BASE_SHA"..origin/main -- \
-              'package-lock.json' 'package.json' \
-              'ui-tui/package.json' 'apps/desktop/package.json' || true)"
+              'ui-tui/package-lock.json' 'ui-tui/package.json' \
+              'apps/dashboard/package-lock.json' 'apps/dashboard/package.json' || true)"
             if [ -n "$pkg_changed" ]; then
               echo "::warning::Package files changed since hash computation — aborting; a fresh run will recompute"
               exit 0

.github/workflows/nix.yml

@@ -37,16 +37,23 @@ jobs:
 
       - name: Check flake
         id: flake
+        if: runner.os == 'Linux'
         continue-on-error: true
         run: nix flake check --print-build-logs
 
-      # When the flake check fails, run a targeted diagnostic to see if
+      - name: Build package
+        id: build
+        if: runner.os == 'Linux'
+        continue-on-error: true
+        run: nix build --print-build-logs
+
+      # When the real Nix build fails, run a targeted diagnostic to see if
       # the failure is specifically a stale npm lockfile hash in one of the
       # known npm subpackages (tui / web).  This avoids surfacing a generic
       # "build failed" message when the fix is a single known command.
       - name: Diagnose npm lockfile hashes
         id: hash_check
-        if: steps.flake.outcome == 'failure' && runner.os == 'Linux'
+        if: (steps.flake.outcome == 'failure' || steps.build.outcome == 'failure') && runner.os == 'Linux'
         continue-on-error: true
         env:
           LINK_SHA: ${{ steps.sha.outputs.full }}
@@ -81,25 +88,30 @@ jobs:
             - Or [run the Nix Lockfile Fix workflow](${{ github.server_url }}/${{ github.repository }}/actions/workflows/nix-lockfile-fix.yml) manually (pass PR `#${{ github.event.pull_request.number }}`)
             - Or locally: `nix run .#fix-lockfiles` and commit the diff
 
-      # Clear the sticky comment when either the flake check passed outright (no
+      # Clear the sticky comment when either the build passed outright (no
       # hash check needed) or the hash check explicitly returned stale=false
-      # (check failed for a non-hash reason).
+      # (build failed for a non-hash reason).
       - name: Clear sticky PR comment (resolved)
         if: |
           github.event_name == 'pull_request' &&
+          runner.os == 'Linux' &&
           (steps.hash_check.outputs.stale == 'false' ||
-           steps.flake.outcome == 'success')
+           (steps.flake.outcome == 'success' && steps.build.outcome == 'success'))
         uses: marocchino/sticky-pull-request-comment@52423e01640425a022ef5fd42c6fb5f633a02728  # v2.9.1
         with:
           header: nix-lockfile-check
           delete: true
 
-      - name: Final fail if flake check failed
-        if: steps.flake.outcome == 'failure'
+      - name: Final fail if build or flake failed
+        if: steps.flake.outcome == 'failure' || steps.build.outcome == 'failure'
         run: |
           if [ "${{ steps.hash_check.outputs.stale }}" == "true" ]; then
             echo "::error::Nix build failed due to stale npm lockfile hash. Run: nix run .#fix-lockfiles"
           else
-            echo "::error::Nix flake check failed. See logs above."
+            echo "::error::Nix build/flake check failed. See logs above."
           fi
           exit 1
+
+      - name: Evaluate flake (macOS)
+        if: runner.os == 'macOS'
+        run: nix flake show --json > /dev/null

.github/workflows/osv-scanner.yml

@@ -28,6 +28,7 @@ on:
       - 'package.json'
       - 'package-lock.json'
       - 'ui-tui/package.json'
+      - 'ui-tui/package-lock.json'
       - 'website/package.json'
       - 'website/package-lock.json'
       - '.github/workflows/osv-scanner.yml'
@@ -38,6 +39,7 @@ on:
       - 'pyproject.toml'
       - 'package.json'
       - 'package-lock.json'
+      - 'ui-tui/package-lock.json'
       - 'website/package-lock.json'
   schedule:
     # Weekly scan against main — catches CVEs published after merge for
@@ -60,6 +62,6 @@ jobs:
       # the three sources of truth and skip vendored / test / worktree dirs.
       scan-args: |-
         --lockfile=uv.lock
-        --lockfile=package-lock.json
+        --lockfile=ui-tui/package-lock.json
         --lockfile=website/package-lock.json
       fail-on-vuln: false

AGENTS.md

@@ -49,8 +49,8 @@ hermes-agent/
 │   ├── hermes-achievements/  # Gamified achievement tracking
 │   ├── observability/    # Metrics / traces / logs plugin
 │   ├── image_gen/        # Image-generation providers
-│   └── <others>/         # disk-cleanup, google_meet, platforms, spotify,
-│                         #   strike-freedom-cockpit, ...
+│   └── <others>/         # disk-cleanup, example-dashboard, google_meet, platforms,
+│                         #   spotify, strike-freedom-cockpit, ...
 ├── optional-skills/      # Heavier/niche skills shipped but NOT active by default
 ├── skills/               # Built-in skills bundled with the repo
 ├── ui-tui/               # Ink (React) terminal UI — `hermes --tui`

Dockerfile

@@ -25,7 +25,7 @@ ENV PLAYWRIGHT_BROWSERS_PATH=/opt/hermes/.playwright
 # hermes process, the dashboard, and per-profile gateways.
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-    ca-certificates curl iputils-ping python3 python-is-python3 ripgrep ffmpeg gcc python3-dev python3-venv libffi-dev procps git openssh-client docker-cli xz-utils && \
+    ca-certificates curl iputils-ping python3 python-is-python3 ripgrep ffmpeg gcc python3-dev libffi-dev procps git openssh-client docker-cli xz-utils && \
     rm -rf /var/lib/apt/lists/*
 
 # ---------- s6-overlay install ----------
@@ -113,8 +113,8 @@ WORKDIR /opt/hermes
 # ui-tui/package.json.  Copying the tree up front lets npm resolve the
 # workspace to real content instead of stopping at a bare package.json.
 COPY package.json package-lock.json ./
-COPY web/package.json web/
-COPY ui-tui/package.json ui-tui/
+COPY web/package.json web/package-lock.json web/
+COPY ui-tui/package.json ui-tui/package-lock.json ui-tui/
 COPY ui-tui/packages/hermes-ink/ ui-tui/packages/hermes-ink/
 
 # `npm_config_install_links=false` forces npm to install `file:` deps as
@@ -131,6 +131,8 @@ ENV npm_config_install_links=false
 
 RUN npm install --prefer-offline --no-audit && \
     npx playwright install --with-deps chromium --only-shell && \
+    (cd web && npm install --prefer-offline --no-audit) && \
+    (cd ui-tui && npm install --prefer-offline --no-audit) && \
     npm cache clean --force
 
 # ---------- Layer-cached Python dependency install ----------

agent/auxiliary_client.py

@@ -1621,47 +1621,6 @@ def _try_nous(vision: bool = False) -> Tuple[Optional[OpenAI], Optional[str]]:
     )
 
 
-def _refresh_nous_recommended_model(
-    *, vision: bool, stale_model: Optional[str]
-) -> Optional[str]:
-    """Re-fetch the Nous Portal's recommended model after a stale-model 404.
-
-    Long-lived processes (gateway, watchers) cache the Portal's
-    ``recommended-models`` payload for 10 minutes and, in practice, can pin a
-    model for the whole process lifetime. When that model is later dropped from
-    the Nous → OpenRouter catalog, every auxiliary call 404s with
-    "model does not exist". This forces a fresh Portal fetch and returns a
-    model name to retry with:
-
-      * the Portal's current recommendation for the task, if it differs from
-        the model that just failed; otherwise
-      * ``_NOUS_MODEL`` (google/gemini-3-flash-preview), the known-good default,
-        if it too differs from the failed model.
-
-    Returns ``None`` when no usable alternative is available (e.g. the Portal
-    still recommends the exact model that just 404'd and the default also
-    matches it) — callers should then let the original error propagate.
-    """
-    stale = (stale_model or "").strip().lower()
-    fresh: Optional[str] = None
-    try:
-        from hermes_cli.models import get_nous_recommended_aux_model
-
-        fresh = get_nous_recommended_aux_model(vision=vision, force_refresh=True)
-    except Exception as exc:
-        logger.debug(
-            "Nous recommended-model refresh failed (%s); using default %s",
-            exc, _NOUS_MODEL,
-        )
-    if fresh and fresh.strip().lower() != stale:
-        return fresh
-    # Portal recommendation unchanged or unavailable — fall back to the
-    # hardcoded known-good default, but only if it's actually different.
-    if _NOUS_MODEL.strip().lower() != stale:
-        return _NOUS_MODEL
-    return None
-
-
 def _read_main_model() -> str:
     """Read the user's configured main model from config.yaml.
 
@@ -2492,46 +2451,6 @@ def _is_unsupported_temperature_error(exc: Exception) -> bool:
     return _is_unsupported_parameter_error(exc, "temperature")
 
 
-def _is_model_not_found_error(exc: Exception) -> bool:
-    """Detect "the requested model doesn't exist" errors (404 / invalid model).
-
-    This fires when a resolved model name is no longer served by the endpoint
-    — most commonly when a long-lived process pinned a Portal-recommended model
-    that has since been dropped from the Nous → OpenRouter catalog. The Nous
-    proxy returns 404 with a body like::
-
-        Model 'gpt-5.4-mini' not found. The requested model does not exist
-        in our configuration or OpenRouter catalog.
-
-    Distinct from :func:`_is_payment_error` (which also matches some 404s for
-    free-tier/credit language) — this one keys on "does not exist / not found /
-    not a valid model" phrasing, and explicitly excludes the billing keywords
-    that the payment path already owns so the two predicates don't overlap.
-    """
-    status = getattr(exc, "status_code", None)
-    err_lower = str(exc).lower()
-    # Billing/quota 404s belong to _is_payment_error — don't claim them here.
-    if any(kw in err_lower for kw in (
-        "credits", "insufficient funds", "billing", "out of funds",
-        "balance_depleted", "no usable credits", "free tier", "free-tier",
-        "not available on the free tier",
-    )):
-        return False
-    if status not in {404, 400, None}:
-        return False
-    return any(kw in err_lower for kw in (
-        "model does not exist",
-        "does not exist in our configuration",
-        "openrouter catalog",
-        "is not a valid model",
-        "no such model",
-        "model not found",
-        "the model `",            # OpenAI-style: "The model `X` does not exist"
-        "model_not_found",
-        "unknown model",
-    ))
-
-
 def _evict_cached_clients(provider: str) -> None:
     """Drop cached auxiliary clients for a provider so fresh creds are used."""
     normalized = _normalize_aux_provider(provider)
@@ -5108,32 +5027,6 @@ def call_llm(
                     raise
                 first_err = retry_err
 
-        # ── Stale-model self-heal (Nous Portal recommendation drift) ───
-        # A long-lived process can pin a Portal-recommended model that has
-        # since been dropped from the Nous → OpenRouter catalog, so every
-        # auxiliary call 404s with "model does not exist". Force a fresh
-        # Portal fetch and retry once with the current recommendation (or the
-        # known-good default). Only applies to Nous-routed calls.
-        _heal_is_nous = (
-            resolved_provider == "nous"
-            or base_url_host_matches(_base_info, "inference-api.nousresearch.com")
-        )
-        if _is_model_not_found_error(first_err) and _heal_is_nous:
-            healed_model = _refresh_nous_recommended_model(
-                vision=(task == "vision"), stale_model=kwargs.get("model"))
-            if healed_model and healed_model != kwargs.get("model"):
-                logger.warning(
-                    "Auxiliary %s: model %r no longer in Nous catalog; "
-                    "retrying with refreshed recommendation %r",
-                    task or "call", kwargs.get("model"), healed_model,
-                )
-                kwargs["model"] = healed_model
-                try:
-                    return _validate_llm_response(
-                        client.chat.completions.create(**kwargs), task)
-                except Exception as retry_err:
-                    first_err = retry_err
-
         # ── Nous auth refresh parity with main agent ──────────────────
         client_is_nous = (
             resolved_provider == "nous"
@@ -5571,31 +5464,6 @@ async def async_call_llm(
                     raise
                 first_err = retry_err
 
-        # ── Stale-model self-heal (Nous Portal recommendation drift) ───
-        # See the sync call_llm() path for the rationale: a long-lived process
-        # can pin a Portal-recommended model that has since been dropped from
-        # the Nous → OpenRouter catalog, 404'ing every auxiliary call. Force a
-        # fresh Portal fetch and retry once with the current recommendation.
-        _heal_is_nous = (
-            resolved_provider == "nous"
-            or base_url_host_matches(_client_base, "inference-api.nousresearch.com")
-        )
-        if _is_model_not_found_error(first_err) and _heal_is_nous:
-            healed_model = _refresh_nous_recommended_model(
-                vision=(task == "vision"), stale_model=kwargs.get("model"))
-            if healed_model and healed_model != kwargs.get("model"):
-                logger.warning(
-                    "Auxiliary %s (async): model %r no longer in Nous catalog; "
-                    "retrying with refreshed recommendation %r",
-                    task or "call", kwargs.get("model"), healed_model,
-                )
-                kwargs["model"] = healed_model
-                try:
-                    return _validate_llm_response(
-                        await client.chat.completions.create(**kwargs), task)
-                except Exception as retry_err:
-                    first_err = retry_err
-
         # ── Nous auth refresh parity with main agent ──────────────────
         client_is_nous = (
             resolved_provider == "nous"

agent/conversation_compression.py

@@ -308,14 +308,11 @@ def compress_context(
     # The check itself sets ``agent._compression_warning`` so the
     # status-callback replay machinery still emits the warning to the user
     # the first time it would matter.
-    if not getattr(agent, "_compression_feasibility_checked", False):
-        # Mark as checked only after the probe completes. If the check
-        # raises (e.g. a fatal aux-context ValueError that aborts the
-        # session), leaving the flag unset is harmless; a non-fatal
-        # transient failure is swallowed inside the function so the flag
-        # is set normally on the next successful pass.
-        check_compression_model_feasibility(agent)
-        agent._compression_feasibility_checked = True
+    if not getattr(agent, "_compression_feasibility_checked", True):
+        try:
+            check_compression_model_feasibility(agent)
+        finally:
+            agent._compression_feasibility_checked = True
 
     _pre_msg_count = len(messages)
     logger.info(

agent/credential_pool.py

@@ -1891,7 +1891,6 @@ def _seed_from_singletons(provider: str, entries: List[PooledCredential]) -> Tup
         # via `hermes auth openai-codex`.
         if isinstance(tokens, dict) and tokens.get("access_token"):
             active_sources.add("device_code")
-            custom_label = str(state.get("label") or "").strip()
             changed |= _upsert_entry(
                 entries,
                 provider,
@@ -1903,7 +1902,7 @@ def _seed_from_singletons(provider: str, entries: List[PooledCredential]) -> Tup
                     "refresh_token": tokens.get("refresh_token"),
                     "base_url": "https://chatgpt.com/backend-api/codex",
                     "last_refresh": state.get("last_refresh"),
-                    "label": custom_label or label_from_token(tokens.get("access_token", ""), "device_code"),
+                    "label": label_from_token(tokens.get("access_token", ""), "device_code"),
                 },
             )
 

agent/file_safety.py

@@ -451,190 +451,3 @@ def get_cross_profile_warning(path: str) -> Optional[str]:
         f"``cross_profile=True``. (Defense-in-depth — not a security "
         f"boundary; the terminal tool can still bypass.)"
     )
-
-
-# ---------------------------------------------------------------------------
-# Sandbox-mirror write guard (#32049)
-#
-# Non-local terminal backends (Docker, Daytona, etc.) bind a sandbox-local
-# directory to the container's ``$HOME``. The on-disk layout looks like
-#
-#   <HERMES_HOME>/profiles/<name>/sandboxes/<backend>/<task>/home/.hermes/...
-#
-# When the agent (running host-side) speculates that authoritative profile
-# state lives at one of those sandbox-mirror paths, the write lands on the
-# mirror — never read by the host process — while the host file is left
-# untouched. The agent reports success, the user sees no change, and on
-# disk two divergent copies accumulate. See #32049 for evidence.
-#
-# This guard is path-shape-only: it detects the
-# ``…/sandboxes/<backend>/<task>/home/.hermes/…`` segment and warns
-# regardless of which Hermes profile is active. It does NOT cover the
-# inner-container case where the bind mount strips the ``sandboxes/`` prefix
-# (the agent's view inside the container is plain ``/root/.hermes/...``);
-# that case needs a separate dispatch-layer or host-side ``profile_state``
-# tool.
-# ---------------------------------------------------------------------------
-
-
-def _find_sandbox_mirror_segments(parts: tuple) -> Optional[int]:
-    """Return the index of the inner ``.hermes`` part in a sandbox-mirror path.
-
-    Matches ``…/sandboxes/<backend>/<task>/home/.hermes/…`` and returns the
-    index where the inner Hermes-state portion starts. Returns ``None`` for
-    paths that do not contain the sandbox-mirror shape.
-    """
-    for i, part in enumerate(parts):
-        if part != "sandboxes":
-            continue
-        # Need at least: sandboxes / <backend> / <task> / home / .hermes / <thing>
-        if i + 5 >= len(parts):
-            continue
-        if parts[i + 3] == "home" and parts[i + 4] == ".hermes":
-            return i + 4
-    return None
-
-
-def classify_sandbox_mirror_target(path: str) -> Optional[dict]:
-    """Classify a write target as a sandbox-mirror of authoritative Hermes state.
-
-    Returns ``None`` when the path does not match the sandbox-mirror shape.
-    Otherwise returns a dict with:
-
-      * ``target_path``: the resolved path string
-      * ``mirror_root``: the ``…/sandboxes/<backend>/<task>/home/.hermes``
-        prefix (so callers can show users which sandbox owns the mirror)
-      * ``inner_path``: the portion under the mirror's ``.hermes`` (what the
-        agent likely meant to address on the host)
-
-    Detection is path-shape-only — does not require any Hermes resolver to
-    succeed, so it works correctly even when called from contexts where
-    HERMES_HOME resolution would be ambiguous.
-    """
-    try:
-        target = Path(os.path.expanduser(str(path))).resolve()
-    except (OSError, RuntimeError):
-        return None
-
-    parts = target.parts
-    inner_idx = _find_sandbox_mirror_segments(parts)
-    if inner_idx is None:
-        return None
-
-    mirror_root = str(Path(*parts[: inner_idx + 1]))
-    inner_path = str(Path(*parts[inner_idx + 1 :])) if inner_idx + 1 < len(parts) else ""
-
-    return {
-        "target_path": str(target),
-        "mirror_root": mirror_root,
-        "inner_path": inner_path,
-    }
-
-
-def get_sandbox_mirror_warning(path: str) -> Optional[str]:
-    """Return a model-facing warning when ``path`` lands in a sandbox mirror.
-
-    Returns ``None`` when the path is not a sandbox-mirror target. Caller
-    is expected to surface the warning to the agent as a tool-result
-    error. The bypass kwarg (``cross_profile=True``) is shared with the
-    cross-profile guard: both are soft "I know what I'm doing" overrides
-    a user can authorise.
-
-    Defense-in-depth, NOT a security boundary: the terminal tool runs as
-    the same OS user and can write the mirror path directly. The guard
-    exists to surface the misclassification before the silent-success +
-    divergent-copy footgun in #32049 fires.
-    """
-    info = classify_sandbox_mirror_target(path)
-    if info is None:
-        return None
-    return (
-        f"Sandbox-mirror write blocked by soft guard: {info['target_path']} "
-        f"sits under {info['mirror_root']!r}, which is a per-task mirror "
-        f"created by a non-local terminal backend (docker/daytona/etc.). "
-        f"Writes here land on a copy that the host Hermes process never "
-        f"reads — the authoritative file is likely {info['inner_path']!r} "
-        f"under the real HERMES_HOME. Use the host-side tool for "
-        f"authoritative state (e.g. ``memory`` for memories), or address "
-        f"the host path directly. To bypass this guard after explicit "
-        f"user direction, retry the call with ``cross_profile=True``. "
-        f"(Defense-in-depth — not a security boundary; the terminal tool "
-        f"can still bypass.)"
-    )
-
-
-# ---------------------------------------------------------------------------
-# Container-context mirror guard (inner-container case — #32049 follow-up)
-#
-# Brian's shape-based detector (#32213) catches paths that still carry the
-# full ``…/sandboxes/<backend>/<task>/home/.hermes/…`` prefix on the host.
-# But when file tools execute *inside* the container the bind-mount strips
-# that prefix: the agent sees plain ``/root/.hermes/…``.  The root:root
-# ownership on the divergent SOUL.md in #32049 confirms this is the primary
-# failure mode.
-#
-# Fix: file_tools passes the active Docker mirror prefix when the terminal
-# backend is docker + persistent. This catches the very first file-tool call,
-# before a DockerEnvironment object necessarily exists.
-# ---------------------------------------------------------------------------
-
-
-def classify_container_mirror_target(
-    path: str,
-    mirror_prefix: str | None = None,
-) -> Optional[dict]:
-    """Classify a write target as a container-side sandbox mirror.
-
-    ``mirror_prefix`` must be supplied by the caller after it has established
-    that file tools are executing in a container whose home is a sandbox
-    mirror. Returns ``None`` when no such context is active or the path is not
-    under the mirror prefix. Otherwise returns:
-
-      * ``target_path``: resolved path string
-      * ``mirror_root``: the declared container mirror prefix
-      * ``inner_path``: portion under the mirror root (what the agent
-        likely meant to address in the host HERMES_HOME)
-    """
-    if not mirror_prefix:
-        return None
-    try:
-        target = Path(os.path.expanduser(str(path))).resolve()
-        mirror = Path(os.path.expanduser(mirror_prefix)).resolve()
-        inner = target.relative_to(mirror)
-    except (OSError, RuntimeError, ValueError):
-        return None
-    return {
-        "target_path": str(target),
-        "mirror_root": str(mirror),
-        "inner_path": inner.as_posix(),
-    }
-
-
-def get_container_mirror_warning(
-    path: str,
-    mirror_prefix: str | None = None,
-) -> Optional[str]:
-    """Return a model-facing warning when *path* lands in the container's
-    sandbox mirror of authoritative Hermes state.
-
-    The caller supplies ``mirror_prefix`` only when the current file-tool
-    backend is known to execute inside a Docker sandbox. Same contract as
-    ``get_cross_profile_warning``: soft guard, returns ``None`` for
-    non-mirror paths, caller surfaces as a tool-result error. Bypass via
-    ``cross_profile=True`` after explicit user direction.
-    """
-    info = classify_container_mirror_target(path, mirror_prefix)
-    if info is None:
-        return None
-    return (
-        f"Sandbox-mirror write blocked by soft guard: {info['target_path']} "
-        f"sits under {info['mirror_root']!r}, which is the container's "
-        f"bind-mounted home — a per-task mirror that the host Hermes "
-        f"process never reads. The authoritative file is "
-        f"{info['inner_path']!r} under the real HERMES_HOME. Use the "
-        f"host-side tool for authoritative state (e.g. ``memory`` for "
-        f"memories), or address the host path directly. To bypass after "
-        f"explicit user direction, retry with ``cross_profile=True``. "
-        f"(Defense-in-depth — not a security boundary; the terminal tool "
-        f"can still bypass.)"
-    )

agent/model_metadata.py

@@ -1128,18 +1128,6 @@ def _model_name_suggests_kimi(model: str) -> bool:
     return lower.startswith("kimi") or "moonshot" in lower
 
 
-def _model_name_suggests_minimax_m3(model: str) -> bool:
-    """Return True if the model name looks like MiniMax M3.
-
-    Catches ``MiniMax-M3``, ``minimax/minimax-m3``, and similar variants
-    across surfaces (native MiniMax-M3, OpenRouter/Nous minimax/minimax-m3).
-    Used as a guard against stale cache entries seeded by pre-catalog builds
-    that resolved M3 via the generic ``minimax`` catch-all (204,800) before
-    the ``minimax-m3`` (1M) entry existed in DEFAULT_CONTEXT_LENGTHS.
-    """
-    return "minimax-m3" in model.lower()
-
-
 def _query_local_context_length(model: str, base_url: str, api_key: str = "") -> Optional[int]:
     """Query a local server for the model's context length."""
     import httpx
@@ -1551,19 +1539,6 @@ def get_model_context_length(
                     model, base_url, f"{cached:,}",
                 )
                 _invalidate_cached_context_length(model, base_url)
-            # Invalidate stale ≤204,800 cache entries for MiniMax-M3.  Pre-catalog
-            # builds resolved M3 via the generic ``minimax`` catch-all (204,800)
-            # and persisted it before the ``minimax-m3`` (1M) entry existed; that
-            # stale value would otherwise stick forever here at step 1.  M3 is 1M,
-            # so any sub-256K cached value for an M3 slug is a leftover — drop it
-            # and fall through to the hardcoded default.
-            elif cached <= 204_800 and _model_name_suggests_minimax_m3(model):
-                logger.info(
-                    "Dropping stale MiniMax-M3 cache entry %s@%s -> %s (pre-catalog value); "
-                    "re-resolving via hardcoded defaults",
-                    model, base_url, f"{cached:,}",
-                )
-                _invalidate_cached_context_length(model, base_url)
             # Nous Portal: the portal /v1/models endpoint is authoritative.
             # Bypass the persistent cache so step 5b can always reconcile
             # against it — this corrects pre-fix entries seeded from the

agent/prompt_builder.py

@@ -14,7 +14,6 @@ from pathlib import Path
 from hermes_constants import get_hermes_home, get_skills_dir, is_wsl
 from typing import Optional
 
-from agent.runtime_cwd import resolve_agent_cwd
 from agent.skill_utils import (
     extract_skill_conditions,
     extract_skill_description,
@@ -803,7 +802,7 @@ def build_environment_hints() -> str:
 
         host_lines.append(f"User home directory: {os.path.expanduser('~')}")
         try:
-            host_lines.append(f"Current working directory: {resolve_agent_cwd()}")
+            host_lines.append(f"Current working directory: {os.getcwd()}")
         except OSError:
             pass
 

agent/runtime_cwd.py

@@ -1,62 +0,0 @@
-"""Single source of truth for the agent working directory.
-
-`TERMINAL_CWD` is the runtime carrier for the configured working directory
-(design #19214/#19242: `terminal.cwd` is bridged once to `TERMINAL_CWD` at
-gateway/cron startup). The local-CLI backend deliberately leaves it unset and
-relies on the launch dir. Reading it in one place keeps the system prompt, the
-tool surfaces, and context-file discovery agreeing on where the agent lives.
-
-Multi-session gateways can pin a logical cwd via the `_SESSION_CWD`
-contextvar; CLI/cron fall through to `TERMINAL_CWD`/launch cwd.
-"""
-
-import os
-from contextvars import ContextVar, Token
-from pathlib import Path
-from typing import Any
-
-_UNSET: Any = object()
-
-_SESSION_CWD: ContextVar = ContextVar("HERMES_SESSION_CWD", default=_UNSET)
-
-
-def set_session_cwd(cwd: str | None) -> Token:
-    """Pin the logical cwd for the current context."""
-    return _SESSION_CWD.set((cwd or "").strip())
-
-
-def clear_session_cwd() -> None:
-    _SESSION_CWD.set("")
-
-
-def _session_cwd_override() -> str:
-    value = _SESSION_CWD.get()
-    if value is _UNSET:
-        return ""
-    return str(value).strip()
-
-
-def resolve_agent_cwd() -> Path:
-    override = _session_cwd_override()
-    if override:
-        p = Path(override).expanduser()
-        if p.is_dir():
-            return p
-    raw = os.environ.get("TERMINAL_CWD", "").strip()
-    if raw:
-        p = Path(raw).expanduser()
-        if p.is_dir():
-            return p
-    return Path(os.getcwd())
-
-
-def resolve_context_cwd() -> Path | None:
-    # None means "no configured cwd": build_context_files_prompt then falls back
-    # to the launch dir (os.getcwd()) — correct for the local CLI. The gateway
-    # avoids slurping its install dir by setting TERMINAL_CWD (see system_prompt.py)
-    # or, per session, the _SESSION_CWD contextvar above.
-    override = _session_cwd_override()
-    if override:
-        return Path(override).expanduser()
-    raw = os.environ.get("TERMINAL_CWD", "").strip()
-    return Path(raw).expanduser() if raw else None

agent/system_prompt.py

@@ -24,6 +24,7 @@ Pure helpers that read the agent's state.  AIAgent keeps thin forwarders.
 from __future__ import annotations
 
 import json
+import os
 from typing import Any, Dict, List, Optional
 
 from agent.prompt_builder import (
@@ -40,7 +41,6 @@ from agent.prompt_builder import (
     TOOL_USE_ENFORCEMENT_GUIDANCE,
     TOOL_USE_ENFORCEMENT_MODELS,
 )
-from agent.runtime_cwd import resolve_context_cwd
 
 
 def _ra():
@@ -288,12 +288,13 @@ def build_system_prompt_parts(agent: Any, system_message: Optional[str] = None)
         context_parts.append(system_message)
 
     if not agent.skip_context_files:
-        # Prefer the configured TERMINAL_CWD (gateway mode). When unset (local
-        # CLI), None lets build_context_files_prompt fall back to the launch
-        # dir — the user's real cwd there, but the install dir for the gateway
-        # daemon, which is why the gateway sets TERMINAL_CWD.
+        # Use TERMINAL_CWD for context file discovery when set (gateway
+        # mode).  The gateway process runs from the hermes-agent install
+        # dir, so os.getcwd() would pick up the repo's AGENTS.md and
+        # other dev files — inflating token usage by ~10k for no benefit.
+        _context_cwd = os.getenv("TERMINAL_CWD") or None
         context_files_prompt = _r.build_context_files_prompt(
-            cwd=resolve_context_cwd(), skip_soul=_soul_loaded)
+            cwd=_context_cwd, skip_soul=_soul_loaded)
         if context_files_prompt:
             context_parts.append(context_files_prompt)
 

apps/bootstrap-installer/index.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Hermes</title>
+    <title>Hermes Setup</title>
   </head>
   <body class="h-full antialiased">
     <div id="root" class="h-full"></div>

apps/bootstrap-installer/src-tauri/build.rs

@@ -8,24 +8,18 @@ fn main() {
     // `option_env!()` macro to default the install-script reference.
     // Precedence (matches install.ps1's own arg precedence): commit > branch.
     //
-    // The COMMIT pin is opt-in. By default a dev build pins ONLY the branch,
-    // so the produced installer follows that branch's HEAD at install time
-    // (tolerant of fast-forwards/new commits, and never references a SHA the
-    // local checkout hasn't pushed). Set HERMES_BUILD_PIN_COMMIT to bake an
-    // immutable commit pin for reproducible/release installers.
-    //
-    // Commit pin resolution:
-    //   - HERMES_BUILD_PIN_COMMIT, if set and non-empty. Accepts a SHA, tag,
-    //     or branch name; resolved to an immutable SHA via `git rev-parse`
-    //     when possible, else used verbatim if it already looks like a SHA.
-    //   - Otherwise: NO commit pin (branch-follow is the default).
-    //
-    // Branch pin resolution:
-    //   1. HERMES_BUILD_PIN_BRANCH, if set and non-empty.
-    //   2. `git rev-parse --abbrev-ref HEAD` of the checkout this build.rs
-    //      lives in — the current branch. (None on a detached HEAD.)
-    //   3. Last-resort fallback handled below: if neither commit nor branch
-    //      resolves, warn — the binary needs a runtime arg or dev-repo env.
+    // Resolution order:
+    //   1. Env var override at build time (HERMES_BUILD_PIN_COMMIT, etc.).
+    //      Useful for CI builds that want to pin to a tagged release SHA
+    //      rather than whatever the checkout's HEAD happens to be.
+    //   2. `git rev-parse HEAD` + `git rev-parse --abbrev-ref HEAD` against
+    //      the repo this build.rs lives in. Default for `cargo tauri build`
+    //      from a dev machine — pins the produced .exe to your current
+    //      checkout state.
+    //   3. Last-resort fallback: hardcoded `main` branch, no commit. The
+    //      installer will fetch HEAD-of-main at runtime. Used when the
+    //      build is happening outside a git checkout (e.g. cargo install
+    //      from a packaged crate, unlikely for this binary but defensive).
     //
     // Build script reruns on git HEAD change so a new commit triggers
     // a rebuild without `cargo clean`.
@@ -36,20 +30,11 @@ fn main() {
 
     if let Some(c) = &commit {
         println!("cargo:rustc-env=BUILD_PIN_COMMIT={c}");
-        println!(
-            "cargo:warning=hermes-bootstrap: pinning to commit {}",
-            short(c)
-        );
+        println!("cargo:warning=hermes-bootstrap: pinning to commit {}", short(c));
     }
     if let Some(b) = &branch {
         println!("cargo:rustc-env=BUILD_PIN_BRANCH={b}");
-        match &commit {
-            Some(_) => println!("cargo:warning=hermes-bootstrap: pinning to branch {b}"),
-            None => println!(
-                "cargo:warning=hermes-bootstrap: following branch {b} HEAD (no commit pin; \
-                 set HERMES_BUILD_PIN_COMMIT for an immutable pin)"
-            ),
-        }
+        println!("cargo:warning=hermes-bootstrap: pinning to branch {b}");
     }
     if commit.is_none() && branch.is_none() {
         // Fail loudly rather than silently produce a binary that errors
@@ -61,11 +46,8 @@ fn main() {
         );
     }
 
-    // Rerun build.rs when HEAD moves. With branch-follow as the default the
-    // baked commit no longer changes per-commit, but a branch *switch* changes
-    // the detected branch name, so we still re-trigger. When an explicit
-    // HERMES_BUILD_PIN_COMMIT resolves a moving ref (tag/branch) to a SHA, a
-    // HEAD move can also change that resolution. .git/HEAD changes on every
+    // Rerun build.rs when HEAD moves so successive builds pick up new
+    // commits without needing `cargo clean`. .git/HEAD changes on every
     // commit / branch switch / rebase.
     let git_dir = locate_git_dir();
     if let Some(gd) = &git_dir {
@@ -101,46 +83,24 @@ fn main() {
 }
 
 fn resolve_commit_pin() -> Option<String> {
-    // Commit pinning is OPT-IN. Only bake a commit when the caller explicitly
-    // asks for one via HERMES_BUILD_PIN_COMMIT. With no env var, we return
-    // None and the installer follows the branch HEAD at install time.
-    let requested = std::env::var("HERMES_BUILD_PIN_COMMIT").ok()?;
-    let requested = requested.trim();
-    if requested.is_empty() {
-        return None;
-    }
-    // Resolve the request (which may be a SHA, tag, or branch name) to an
-    // immutable commit SHA so the baked pin is reproducible. `^{commit}`
-    // dereferences tags to the commit they point at.
-    if let Ok(out) = Command::new("git")
-        .args(["rev-parse", "--verify", &format!("{requested}^{{commit}}")])
-        .output()
-    {
-        if out.status.success() {
-            if let Ok(s) = String::from_utf8(out.stdout) {
-                let s = s.trim().to_string();
-                if !s.is_empty() {
-                    return Some(s);
-                }
-            }
+    if let Ok(v) = std::env::var("HERMES_BUILD_PIN_COMMIT") {
+        if !v.trim().is_empty() {
+            return Some(v.trim().to_string());
         }
     }
-    // Couldn't resolve via git (e.g. building outside a checkout). Accept the
-    // literal value only if it already looks like a SHA; otherwise fail loud
-    // rather than bake an unresolvable ref into the binary.
-    if is_sha(requested) {
-        return Some(requested.to_string());
+    let out = Command::new("git")
+        .args(["rev-parse", "HEAD"])
+        .output()
+        .ok()?;
+    if !out.status.success() {
+        return None;
+    }
+    let s = String::from_utf8(out.stdout).ok()?.trim().to_string();
+    if s.is_empty() {
+        None
+    } else {
+        Some(s)
     }
-    panic!(
-        "HERMES_BUILD_PIN_COMMIT={requested:?} could not be resolved to a commit \
-         (git rev-parse failed and it is not a valid SHA)"
-    );
-}
-
-/// True if `s` looks like an abbreviated-or-full git SHA (7..=40 hex chars).
-fn is_sha(s: &str) -> bool {
-    let len = s.len();
-    (7..=40).contains(&len) && s.chars().all(|c| c.is_ascii_hexdigit())
 }
 
 fn resolve_branch_pin() -> Option<String> {

apps/bootstrap-installer/src-tauri/src/bootstrap.rs

@@ -208,7 +208,7 @@ pub async fn launch_hermes_desktop(
 /// Walks the well-known electron-builder unpacked-app paths under
 /// `install_root`. Mirrors the resolver in `cmd_gui` (apps/desktop/release/
 /// <os>-unpacked/<exe>).
-pub(crate) fn resolve_hermes_desktop_exe(install_root: &std::path::Path) -> Option<PathBuf> {
+fn resolve_hermes_desktop_exe(install_root: &std::path::Path) -> Option<PathBuf> {
     let release_dir = install_root.join("apps").join("desktop").join("release");
     let candidates: &[(&str, &str)] = if cfg!(target_os = "windows") {
         &[
@@ -232,35 +232,6 @@ pub(crate) fn resolve_hermes_desktop_exe(install_root: &std::path::Path) -> Opti
     None
 }
 
-/// True when a prior install completed (bootstrap-complete marker present) AND a
-/// launchable desktop app exists on disk. Used by the installer's launcher fast
-/// path so a bare re-open just opens Hermes instead of re-running setup.
-pub(crate) fn hermes_is_installed(install_root: &std::path::Path) -> bool {
-    install_root.join(".hermes-bootstrap-complete").exists()
-        && resolve_hermes_desktop_exe(install_root).is_some()
-}
-
-/// Spawn the already-built desktop app, detached. Returns Err if no built app
-/// exists or the spawn fails, so the caller can fall back to showing the
-/// installer UI.
-pub(crate) fn spawn_installed_desktop(install_root: &std::path::Path) -> std::io::Result<()> {
-    let exe = resolve_hermes_desktop_exe(install_root).ok_or_else(|| {
-        std::io::Error::new(std::io::ErrorKind::NotFound, "no built Hermes desktop app")
-    })?;
-    let mut cmd = std::process::Command::new(&exe);
-    cmd.current_dir(exe.parent().unwrap_or(install_root));
-    #[cfg(target_os = "windows")]
-    {
-        use std::os::windows::process::CommandExt;
-        // DETACHED_PROCESS = 0x00000008 — keep the desktop alive after the
-        // installer exits, mirroring launch_hermes_desktop. Kept correct here
-        // even though the only caller is macOS-gated today, so future reuse on
-        // Windows doesn't reintroduce the relaunch race.
-        cmd.creation_flags(0x0000_0008);
-    }
-    cmd.spawn().map(|_child| ())
-}
-
 // ---------------------------------------------------------------------------
 // Bootstrap implementation
 // ---------------------------------------------------------------------------

apps/bootstrap-installer/src-tauri/src/lib.rs

@@ -50,20 +50,6 @@ impl AppMode {
     }
 }
 
-/// Returns true when the args request a forced installer UI (repair/reinstall)
-/// via `--reinstall` or `--repair`, which overrides the macOS launcher
-/// fast-path so a broken install can be repaired. Arg-iterator generic so it's
-/// unit-testable, mirroring `AppMode::from_args`. Independent of mode selection:
-/// these flags never flip Install<->Update.
-pub fn force_setup_from_args<I, S>(args: I) -> bool
-where
-    I: IntoIterator<Item = S>,
-    S: AsRef<str>,
-{
-    args.into_iter()
-        .any(|a| a.as_ref() == "--reinstall" || a.as_ref() == "--repair")
-}
-
 /// Process-wide install state, shared across Tauri commands.
 ///
 /// The bootstrap is a one-shot, single-tenant process — we only need one
@@ -99,11 +85,7 @@ pub fn run() {
     let _guard = paths::init_logging();
 
     let mode = AppMode::from_args(std::env::args().skip(1));
-    // Escape hatch: `--reinstall`/`--repair` forces the installer UI even when
-    // Hermes is already installed, so users can re-run setup to repair a broken
-    // install instead of the launcher fast path silently relaunching the app.
-    let force_setup = force_setup_from_args(std::env::args().skip(1));
-    tracing::info!(?mode, force_setup, "Hermes installer starting");
+    tracing::info!(?mode, "Hermes Setup starting");
 
     tauri::Builder::default()
         .plugin(tauri_plugin_dialog::init())
@@ -111,60 +93,6 @@ pub fn run() {
         .plugin(tauri_plugin_process::init())
         .plugin(tauri_plugin_shell::init())
         .manage(Arc::new(AppState::new(mode)))
-        .setup(move |app| {
-            use tauri::Manager;
-            // Launcher fast path (macOS only): a bare ("Install") launch when
-            // Hermes is already installed should NOT show the installer or
-            // rebuild — it should just open the app, so the /Applications
-            // "Hermes" doubles as a normal launcher (first run installs, every
-            // later run launches instantly). The window is kept hidden until
-            // here via `"visible": false` so this path never flashes a window.
-            //
-            // Gated to macOS deliberately: on Windows/Linux the installer keeps
-            // its existing behavior (Windows users relaunch via the Start
-            // Menu/Desktop "Hermes" shortcuts that install.ps1 creates, and a
-            // reliable detached relaunch there needs the DETACHED_PROCESS +
-            // startup-grace handling used by launch_hermes_desktop — out of
-            // scope here). So this is a pure no-op on non-macOS.
-            //
-            // `--reinstall`/`--repair` opts out so a broken install can be
-            // repaired by re-running setup instead of launching the bad app.
-            if cfg!(target_os = "macos") && mode == AppMode::Install && !force_setup {
-                let install_root = paths::hermes_home().join("hermes-agent");
-                if bootstrap::hermes_is_installed(&install_root) {
-                    match bootstrap::spawn_installed_desktop(&install_root) {
-                        Ok(()) => {
-                            // Brief grace so the spawned app is registered
-                            // before we exit (mirrors launch_hermes_desktop).
-                            std::thread::sleep(std::time::Duration::from_millis(200));
-                            tracing::info!(
-                                "hermes already installed — relaunched desktop; exiting installer"
-                            );
-                            app.handle().exit(0);
-                            return Ok(());
-                        }
-                        Err(err) => {
-                            tracing::warn!(
-                                ?err,
-                                "relaunch of installed desktop failed; showing installer UI"
-                            );
-                        }
-                    }
-                }
-            }
-            // First run / repair install, or Update mode: reveal the UI.
-            match app.get_webview_window("main") {
-                Some(win) => {
-                    if let Err(err) = win.show() {
-                        tracing::error!(?err, "failed to show main installer window");
-                    }
-                }
-                None => {
-                    tracing::error!("main installer window not found; installer UI will not appear");
-                }
-            }
-            Ok(())
-        })
         .invoke_handler(tauri::generate_handler![
             // Mode (install vs update)
             get_mode,
@@ -187,7 +115,7 @@ pub fn run() {
 
 #[cfg(test)]
 mod tests {
-    use super::{force_setup_from_args, AppMode};
+    use super::AppMode;
 
     #[test]
     fn bare_args_are_install() {
@@ -203,30 +131,4 @@ mod tests {
             AppMode::Update
         );
     }
-
-    #[test]
-    fn reinstall_and_repair_flags_force_setup() {
-        assert!(force_setup_from_args(["--reinstall"]));
-        assert!(force_setup_from_args(["--repair"]));
-        assert!(force_setup_from_args(["--foo", "--repair", "--bar"]));
-    }
-
-    #[test]
-    fn bare_or_unrelated_args_do_not_force_setup() {
-        assert!(!force_setup_from_args(Vec::<String>::new()));
-        assert!(!force_setup_from_args(["--foo", "bar"]));
-        // --update must not be mistaken for a force-setup flag.
-        assert!(!force_setup_from_args(["--update"]));
-    }
-
-    #[test]
-    fn force_setup_flags_do_not_affect_mode_selection() {
-        // The repair flags must never flip Install<->Update.
-        assert_eq!(AppMode::from_args(["--reinstall"]), AppMode::Install);
-        assert_eq!(AppMode::from_args(["--repair"]), AppMode::Install);
-        assert_eq!(
-            AppMode::from_args(["--update", "--reinstall"]),
-            AppMode::Update
-        );
-    }
 }

apps/bootstrap-installer/src-tauri/tauri.conf.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
-  "productName": "Hermes",
+  "productName": "Hermes Setup",
   "version": "0.0.1",
   "identifier": "com.nousresearch.hermes.setup",
   "build": {
@@ -13,7 +13,7 @@
     "windows": [
       {
         "label": "main",
-        "title": "Hermes",
+        "title": "Hermes Setup",
         "width": 880,
         "height": 620,
         "minWidth": 720,
@@ -22,8 +22,7 @@
         "fullscreen": false,
         "decorations": true,
         "transparent": false,
-        "center": true,
-        "visible": false
+        "center": true
       }
     ],
     "security": {
@@ -34,7 +33,7 @@
   "bundle": {
     "active": true,
     "category": "DeveloperTool",
-    "shortDescription": "Hermes",
+    "shortDescription": "Hermes Setup",
     "longDescription": "Installs Hermes Agent on your machine. Drives scripts/install.ps1 (Windows) and scripts/install.sh (macOS/Linux).",
     "publisher": "Nous Research",
     "copyright": "Copyright © 2026 Nous Research",

apps/desktop/README.md

@@ -111,28 +111,15 @@ npm run test:desktop:all
 
 Boot logs land in `HERMES_HOME/logs/desktop.log` (includes backend output and recent Python tracebacks) — check it first if the app reports a boot failure.
 
-**macOS / Linux:**
-
 ```bash
 # Force a clean first-launch setup
-rm "$HOME/.hermes/hermes-agent/.hermes-bootstrap-complete"
+rm "$HOME/.hermes/hermes-agent/.hermes-bootstrap-complete"   # macOS/Linux
 # Rebuild a broken Python venv
-rm -rf "$HOME/.hermes/hermes-agent/venv"
-# Reset a stuck macOS microphone prompt (macOS only)
+rm -rf "$HOME/.hermes/hermes-agent/venv"                     # macOS/Linux
+# Reset a stuck macOS microphone prompt
 tccutil reset Microphone com.nousresearch.hermes
 ```
 
-**Windows (PowerShell):**
-
-```powershell
-# Force a clean first-launch setup
-Remove-Item "$env:LOCALAPPDATA\hermes\hermes-agent\.hermes-bootstrap-complete"
-# Rebuild a broken Python venv
-Remove-Item -Recurse -Force "$env:LOCALAPPDATA\hermes\hermes-agent\venv"
-```
-
-> The default Hermes home on Windows is `%LOCALAPPDATA%\hermes`. Set the `HERMES_HOME` env var if you've relocated it.
-
 ---
 
 ## Community

apps/desktop/electron/bootstrap-runner.cjs

@@ -482,18 +482,6 @@ async function runBootstrap(opts) {
     writeMarker // callback to write the bootstrap-complete marker; main.cjs provides
   } = opts
 
-  // Bail before spawning anything if the user already cancelled — otherwise an
-  // already-aborted signal would still fetch the manifest (a spawn) before the
-  // in-loop abort check fires.
-  if (abortSignal && abortSignal.aborted) {
-    if (typeof onEvent === 'function') {
-      try {
-        onEvent({ type: 'failed', error: 'bootstrap cancelled by user' })
-      } catch {}
-    }
-    return { ok: false, cancelled: true }
-  }
-
   const runLog = openRunLog(logRoot || path.join(hermesHome, 'logs'))
 
   // Tee every event to the runLog AND the caller's onEvent. This gives us a

apps/desktop/electron/bootstrap-runner.test.cjs

@@ -1,27 +0,0 @@
-const assert = require('node:assert/strict')
-const test = require('node:test')
-
-const { runBootstrap } = require('./bootstrap-runner.cjs')
-
-test('runBootstrap bails immediately when the signal is already aborted', async () => {
-  const controller = new AbortController()
-  controller.abort()
-
-  const events = []
-  const result = await runBootstrap({
-    installStamp: null,
-    activeRoot: '/tmp/hermes-runner-test',
-    sourceRepoRoot: null,
-    hermesHome: '/tmp/hermes-runner-test',
-    logRoot: '/tmp/hermes-runner-test',
-    onEvent: ev => events.push(ev),
-    abortSignal: controller.signal
-  })
-
-  // Cancelled before any install script is spawned.
-  assert.deepEqual(result, { ok: false, cancelled: true })
-  assert.ok(
-    events.some(ev => ev.type === 'failed' && /cancelled/i.test(ev.error)),
-    'should emit a cancelled failure event'
-  )
-})

apps/desktop/electron/entitlements.mac.inherit.plist

@@ -8,7 +8,5 @@
   <true/>
   <key>com.apple.security.cs.disable-library-validation</key>
   <true/>
-  <key>com.apple.security.device.audio-input</key>
-  <true/>
 </dict>
 </plist>

apps/desktop/electron/main.cjs

@@ -8,8 +8,6 @@ const {
   ipcMain,
   nativeImage,
   nativeTheme,
-  net: electronNet,
-  protocol,
   safeStorage,
   session,
   shell,
@@ -366,89 +364,15 @@ app.setAboutPanelOptions({
   copyright: 'Copyright © 2026 Nous Research'
 })
 
-// Custom scheme for streaming local media (video/audio) into the renderer.
-// Reading large media through `readFileDataUrl` failed: it base64-loads the
-// whole file into memory and is hard-capped at DATA_URL_READ_MAX_BYTES (16 MB),
-// so any non-trivial video silently refused to load. Streaming via a protocol
-// handler removes the size cap and gives the <video> element seekable,
-// range-aware playback. Must be registered before the app is ready.
-const MEDIA_PROTOCOL = 'hermes-media'
-// Only audio/video may be streamed. Without this the handler would read any
-// non-blocklisted local file (no size cap) for any `fetch(hermes-media://…)`.
-const STREAMABLE_MEDIA_EXTS = new Set([
-  '.avi',
-  '.flac',
-  '.m4a',
-  '.mkv',
-  '.mov',
-  '.mp3',
-  '.mp4',
-  '.ogg',
-  '.opus',
-  '.wav',
-  '.webm'
-])
-
-protocol.registerSchemesAsPrivileged([
-  {
-    scheme: MEDIA_PROTOCOL,
-    privileges: {
-      secure: true,
-      standard: true,
-      stream: true,
-      supportFetchAPI: true
-    }
-  }
-])
-
-function registerMediaProtocol() {
-  protocol.handle(MEDIA_PROTOCOL, async request => {
-    let resolvedPath
-    try {
-      const url = new URL(request.url)
-      const filePath = decodeURIComponent(url.pathname.replace(/^\/+/, ''))
-      ;({ resolvedPath } = await resolveReadableFileForIpc(filePath, { purpose: 'Media stream' }))
-    } catch {
-      return new Response('Media not found', { status: 404 })
-    }
-
-    if (!STREAMABLE_MEDIA_EXTS.has(path.extname(resolvedPath).toLowerCase())) {
-      return new Response('Unsupported media type', { status: 415 })
-    }
-
-    // Delegate to Electron's net stack on a file:// URL — it resolves the
-    // content-type and honors Range requests so seeking works. Forward the
-    // renderer's headers (notably Range) and skip custom-protocol re-entry.
-    return electronNet.fetch(pathToFileURL(resolvedPath).toString(), {
-      bypassCustomProtocolHandlers: true,
-      headers: request.headers
-    })
-  })
-}
-
 let mainWindow = null
 let hermesProcess = null
 let connectionPromise = null
-// Auto-reload budget for renderer crashes. A deterministic startup crash would
-// otherwise loop forever (reload → crash → reload), pinning CPU and spamming
-// logs. Allow a few reloads per rolling window, then stop and leave the dead
-// window so the user can read the error / quit.
-const RENDERER_RELOAD_WINDOW_MS = 60_000
-const RENDERER_RELOAD_MAX = 3
-let rendererReloadTimes = []
 // Latched bootstrap failure: when the first-launch install fails, we hold
 // onto the error so subsequent startHermes() calls (e.g. the renderer's
 // ensureGatewayOpen retrying after the WS won't open) return the same error
 // instead of re-running install.ps1 in a hot loop. Cleared explicitly by
 // the renderer's "Reload and retry" path or by quitting the app.
 let bootstrapFailure = null
-// Active first-launch install, so the renderer's Cancel button (and app quit)
-// can abort the in-flight install.sh/ps1 instead of leaving it running.
-let bootstrapAbortController = null
-// Set by the renderer's "Repair install" IPC. While true, resolution skips the
-// existing-install adopt branch (3b) so repair re-drives the installer instead
-// of re-adopting the install we're repairing. Cleared once a bootstrap runs.
-let forceBootstrapRepair = false
 let connectionConfigCache = null
 const hermesLog = []
 const previewWatchers = new Map()
@@ -539,39 +463,6 @@ function openExternalUrl(rawUrl) {
     return false
   }
 
-  // `file://` URLs come from the artifacts panel (the renderer can't open
-  // them itself because Chromium blocks file:// navigation from the app
-  // origin). Hand them to `shell.openPath`, which dispatches to the OS
-  // file association. If the OS can't open it (`error` is a non-empty
-  // string), fall back to revealing the file in the system file manager.
-  if (parsed.protocol === 'file:') {
-    let localPath
-    try {
-      localPath = fileURLToPath(parsed.toString())
-    } catch {
-      return false
-    }
-
-    void shell
-      .openPath(localPath)
-      .then(error => {
-        if (!error) {
-          return
-        }
-
-        rememberLog(`[file] openPath failed: ${error}; revealing in folder instead`)
-
-        try {
-          shell.showItemInFolder(localPath)
-        } catch (revealError) {
-          rememberLog(`[file] showItemInFolder failed: ${revealError.message}`)
-        }
-      })
-      .catch(error => rememberLog(`[file] openPath rejected: ${error.message}`))
-
-    return true
-  }
-
   if (!['http:', 'https:', 'mailto:'].includes(parsed.protocol)) {
     return false
   }
@@ -1510,12 +1401,8 @@ function readJson(filePath) {
 // Marker schema (version 1):
 //   {
 //     schemaVersion: 1,
-//     pinnedCommit: "<40-char SHA>" | null, // what install.ps1 was driven against;
-//                                           // may be null for adopted installs
+//     pinnedCommit: "<40-char SHA>",       // what install.ps1 was driven against
 //     pinnedBranch: "<branch name>" | null,
-//     adopted: <bool>,                      // true when we adopted a pre-existing
-//                                           // install rather than bootstrapping it;
-//                                           // treated as authoritative even sans commit
 //     completedAt:  "<ISO 8601>",
 //     desktopVersion: "<app.getVersion()>"  // for forensics
 //   }
@@ -1523,25 +1410,11 @@ function readBootstrapMarker() {
   return readJson(BOOTSTRAP_COMPLETE_MARKER)
 }
 
-// Marker-independent: is the canonical install at ACTIVE_HERMES_ROOT actually
-// runnable right now? A complete CLI install (`install.sh --include-desktop`)
-// or a DMG launch over a prior CLI install satisfies this WITHOUT the desktop
-// ever having written the bootstrap marker -- so we must be able to recognise
-// "already installed" off the filesystem alone, not just the marker.
-function isActiveRuntimeUsable() {
-  return isHermesSourceRoot(ACTIVE_HERMES_ROOT) && fileExists(getVenvPython(VENV_ROOT))
-}
-
 function isBootstrapComplete() {
   const marker = readBootstrapMarker()
   if (!marker || typeof marker !== 'object') return false
   if (marker.schemaVersion !== BOOTSTRAP_MARKER_SCHEMA_VERSION) return false
-  if (typeof marker.pinnedCommit !== 'string' || marker.pinnedCommit.length < 7) {
-    // Adopted markers (an existing install we detected and took ownership of,
-    // possibly without a resolvable commit) are still authoritative -- they
-    // attest a runnable install we deliberately decided to forward to.
-    if (marker.adopted !== true) return false
-  }
+  if (typeof marker.pinnedCommit !== 'string' || marker.pinnedCommit.length < 7) return false
   // We DELIBERATELY do NOT verify that the checkout is currently at the
   // pinned commit -- users update via the in-app update path or `hermes
   // update`, which moves HEAD legitimately. The marker just attests "we
@@ -1549,22 +1422,7 @@ function isBootstrapComplete() {
   // a runnable venv: an interrupted or split-home install can leave the marker
   // + checkout without a venv, and trusting that spawns a dead backend
   // ("gateway offline") instead of re-running bootstrap to repair it.
-  return isActiveRuntimeUsable()
-}
-
-// HEAD commit of ACTIVE_HERMES_ROOT so an adopted marker carries the same
-// provenance a freshly-bootstrapped one would. null when git is unavailable or
-// the root isn't a checkout -- the marker stays valid via its `adopted` flag.
-function readActiveHeadCommit() {
-  try {
-    const sha = execFileSync(resolveGitBinary(), ['-C', ACTIVE_HERMES_ROOT, 'rev-parse', 'HEAD'], {
-      encoding: 'utf8',
-      stdio: ['ignore', 'pipe', 'ignore']
-    }).trim()
-    return /^[0-9a-f]{7,40}$/i.test(sha) ? sha : null
-  } catch {
-    return null
-  }
+  return isHermesSourceRoot(ACTIVE_HERMES_ROOT) && fileExists(getVenvPython(VENV_ROOT))
 }
 
 function writeBootstrapMarker(payload) {
@@ -1573,7 +1431,6 @@ function writeBootstrapMarker(payload) {
     schemaVersion: BOOTSTRAP_MARKER_SCHEMA_VERSION,
     pinnedCommit: payload.pinnedCommit || null,
     pinnedBranch: payload.pinnedBranch || null,
-    adopted: Boolean(payload.adopted),
     completedAt: new Date().toISOString(),
     desktopVersion: app.getVersion()
   }
@@ -1597,18 +1454,10 @@ function resolveRendererIndex() {
 }
 
 function resolveHermesCwd() {
-  // In a packaged build, `process.cwd()` resolves to the install root (e.g.
-  // `…/win-unpacked` on Windows or `/Applications/Hermes.app/Contents/...`
-  // on macOS). Sessions spawned there leave files inside the app bundle
-  // and bewilder users when "where did my files go?" is the install dir.
-  // The user-configurable default project directory wins over everything,
-  // followed by env hints (only honored when packaged if they point at a
-  // real directory), then the home dir.
   const candidates = [
-    readDefaultProjectDir(),
     process.env.HERMES_DESKTOP_CWD,
     process.env.INIT_CWD,
-    IS_PACKAGED ? null : process.cwd(),
+    process.cwd(),
     !IS_PACKAGED ? SOURCE_REPO_ROOT : null,
     app.getPath('home')
   ]
@@ -1622,48 +1471,6 @@ function resolveHermesCwd() {
   return app.getPath('home')
 }
 
-// Persisted "Default project directory" — surfaced as a setting in the
-// renderer (see app/settings/sessions-settings.tsx). Stored as JSON in
-// userData so it survives self-updates without bleeding into the new
-// install. `null` means "no preference, fall back to the usual chain".
-const DEFAULT_PROJECT_DIR_CONFIG_FILENAME = 'project-dir.json'
-
-function defaultProjectDirConfigPath() {
-  return path.join(app.getPath('userData'), DEFAULT_PROJECT_DIR_CONFIG_FILENAME)
-}
-
-function readDefaultProjectDir() {
-  try {
-    const raw = fs.readFileSync(defaultProjectDirConfigPath(), 'utf8')
-    const parsed = JSON.parse(raw)
-
-    if (parsed && typeof parsed.dir === 'string' && parsed.dir.trim()) {
-      const resolved = path.resolve(parsed.dir)
-
-      if (directoryExists(resolved)) {
-        return resolved
-      }
-    }
-  } catch {
-    // Missing / unreadable / malformed → fall through to the rest of the
-    // candidate chain.
-  }
-
-  return null
-}
-
-function writeDefaultProjectDir(dir) {
-  const target = defaultProjectDirConfigPath()
-  const payload = dir ? JSON.stringify({ dir: path.resolve(dir) }, null, 2) : JSON.stringify({}, null, 2)
-
-  try {
-    fs.mkdirSync(path.dirname(target), { recursive: true })
-    fs.writeFileSync(target, payload, 'utf8')
-  } catch (error) {
-    rememberLog(`[settings] write default project dir failed: ${error.message}`)
-  }
-}
-
 function createPythonBackend(root, label, dashboardArgs, options = {}) {
   const python = findPythonForRoot(root)
   if (!python) return null
@@ -1731,24 +1538,6 @@ function resolveHermesBackend(dashboardArgs) {
     return createActiveBackend(dashboardArgs)
   }
 
-  // 3b. Existing-but-unmarked install at ACTIVE_HERMES_ROOT. The marker is
-  //     written only by OUR bootstrap, so a runtime from `install.sh
-  //     --include-desktop` (or a DMG launch over a prior CLI install) is
-  //     runnable yet markerless -- without this we'd fall to step 6 and re-run
-  //     the WHOLE install on top of a working one. ACTIVE_HERMES_ROOT is our
-  //     canonical location (unlike a random `hermes` on PATH), so adopt it:
-  //     stamp the marker once and forward straight to the app. Repair skips
-  //     this so a broken-but-present venv still gets rebuilt.
-  if (!forceBootstrapRepair && isActiveRuntimeUsable()) {
-    rememberLog(`[bootstrap] adopting existing install at ${ACTIVE_HERMES_ROOT}; skipping first-launch setup`)
-    try {
-      writeBootstrapMarker({ pinnedCommit: readActiveHeadCommit(), pinnedBranch: null, adopted: true })
-    } catch (err) {
-      rememberLog(`[bootstrap] could not stamp adopted marker: ${err.message}`)
-    }
-    return createActiveBackend(dashboardArgs)
-  }
-
   // 4. Existing `hermes` on PATH -- installed via install.ps1 / install.sh from
   //    a previous tool-only setup, or pip-installed system-wide. Use it but
   //    do NOT write a bootstrap marker; the user did this themselves and we
@@ -1889,15 +1678,12 @@ async function ensureRuntime(backend) {
       })
     } catch {}
 
-    bootstrapAbortController = new AbortController()
-
     const bootstrapResult = await runBootstrap({
       installStamp: backend.installStamp,
       activeRoot: backend.activeRoot,
       sourceRepoRoot: SOURCE_REPO_ROOT,
       hermesHome: HERMES_HOME,
       logRoot: path.join(HERMES_HOME, 'logs'),
-      abortSignal: bootstrapAbortController.signal,
       onEvent: ev => {
         // Tee every bootstrap event to (a) the desktop log for forensics
         // and (b) the renderer for live progress UI. Either may be absent;
@@ -1913,16 +1699,6 @@ async function ensureRuntime(backend) {
       writeMarker: writeBootstrapMarker
     })
 
-    bootstrapAbortController = null
-
-    if (bootstrapResult.cancelled) {
-      const cancelledError = new Error('Hermes install was cancelled.')
-      cancelledError.isBootstrapFailure = true
-      cancelledError.bootstrapCancelled = true
-      bootstrapFailure = cancelledError
-      throw cancelledError
-    }
-
     if (!bootstrapResult.ok) {
       const bootstrapError = new Error(
         `Hermes bootstrap failed${bootstrapResult.failedStage ? ` at stage '${bootstrapResult.failedStage}'` : ''}: ` +
@@ -1939,9 +1715,6 @@ async function ensureRuntime(backend) {
     }
 
     rememberLog('[bootstrap] bootstrap complete; marker written. Re-resolving backend.')
-    // A repair (if any) has now re-run, so clear the gate -- the re-resolution
-    // below SHOULD land on the fresh marker fast-path rather than skip it.
-    forceBootstrapRepair = false
     // Re-resolve now that the install exists. The new resolution lands in
     // step 3 (bootstrap-complete marker) and we recurse to wire venvPython.
     return ensureRuntime(resolveHermesBackend(backend.args))
@@ -2844,28 +2617,6 @@ function installContextMenu(window) {
       )
     }
 
-    // Spell-check suggestions for the misspelled word under the caret.
-    // Chromium surfaces them on `params.dictionarySuggestions`; we offer the
-    // top 5 plus a "Add to dictionary" affordance.
-    const suggestions = Array.isArray(params.dictionarySuggestions) ? params.dictionarySuggestions : []
-
-    if (isEditable && params.misspelledWord && suggestions.length > 0) {
-      if (template.length) template.push({ type: 'separator' })
-
-      for (const suggestion of suggestions.slice(0, 5)) {
-        template.push({
-          label: suggestion,
-          click: () => window.webContents.replaceMisspelling(suggestion)
-        })
-      }
-
-      template.push({ type: 'separator' })
-      template.push({
-        label: 'Add to dictionary',
-        click: () => window.webContents.session.addWordToSpellCheckerDictionary(params.misspelledWord)
-      })
-    }
-
     if (hasSelection || isEditable) {
       if (template.length) template.push({ type: 'separator' })
       if (isEditable) {
@@ -3393,51 +3144,6 @@ function createWindow() {
     openExternalUrl(url)
   })
 
-  mainWindow.webContents.on('render-process-gone', (_event, details) => {
-    rememberLog(`[renderer] render-process-gone reason=${details?.reason} exitCode=${details?.exitCode}`)
-
-    if (details?.reason === 'crashed' || details?.reason === 'oom') {
-      const now = Date.now()
-      rendererReloadTimes = rendererReloadTimes.filter(t => now - t < RENDERER_RELOAD_WINDOW_MS)
-
-      if (rendererReloadTimes.length >= RENDERER_RELOAD_MAX) {
-        rememberLog(
-          `[renderer] suppressing reload: ${rendererReloadTimes.length} crashes within ${RENDERER_RELOAD_WINDOW_MS}ms (likely a crash loop)`
-        )
-
-        return
-      }
-
-      rendererReloadTimes.push(now)
-      setImmediate(() => {
-        if (!mainWindow || mainWindow.isDestroyed()) return
-        try {
-          mainWindow.webContents.reload()
-        } catch (err) {
-          rememberLog(`[renderer] reload after crash failed: ${err?.message || err}`)
-        }
-      })
-    }
-  })
-
-  mainWindow.webContents.on('unresponsive', () => rememberLog('[renderer] webContents became unresponsive'))
-
-  // Electron always passes the event first. The canonical (Electron 36+) shape
-  // is (event, messageDetails); the deprecated positional shape is
-  // (event, level, message, line, sourceId). Handle both. `level` is numeric
-  // (0..3), where 3 === error.
-  mainWindow.webContents.on('console-message', (_event, detailsOrLevel, message, line, sourceId) => {
-    const details = detailsOrLevel && typeof detailsOrLevel === 'object' ? detailsOrLevel : null
-    const level = details ? details.level : detailsOrLevel
-
-    if (level !== 3) return
-
-    const text = details ? details.message : message
-    const src = details ? details.sourceUrl : sourceId
-    const lineNo = details ? details.lineNumber : line
-    rememberLog(`[renderer console] ${text} (${src}:${lineNo})`)
-  })
-
   if (DEV_SERVER) {
     mainWindow.loadURL(DEV_SERVER)
   } else {
@@ -3458,7 +3164,6 @@ ipcMain.handle('hermes:bootstrap:reset', async () => {
   // full backend flow (including a fresh runBootstrap pass).
   rememberLog('[bootstrap] reset requested by renderer; clearing latched failure')
   bootstrapFailure = null
-  forceBootstrapRepair = false
   connectionPromise = null
   bootstrapState = {
     active: false,
@@ -3486,24 +3191,9 @@ ipcMain.handle('hermes:bootstrap:repair', async () => {
     rememberLog(`[bootstrap] failed to remove marker during repair: ${error.message}`)
   }
   bootstrapFailure = null
-  // Force the next resolution past both the marker fast-path and the adopt
-  // branch so the installer actually re-runs (the whole point of repair).
-  forceBootstrapRepair = true
   resetHermesConnection()
   return { ok: true }
 })
-ipcMain.handle('hermes:bootstrap:cancel', async () => {
-  // Renderer's Cancel button during first-launch install. Abort the running
-  // install script (SIGTERM via the runner's abortSignal). runBootstrap
-  // resolves with { cancelled: true }, which surfaces the recovery overlay.
-  if (bootstrapAbortController) {
-    try {
-      bootstrapAbortController.abort()
-    } catch {}
-    return { ok: true, cancelled: true }
-  }
-  return { ok: false, cancelled: false }
-})
 ipcMain.handle('hermes:boot-progress:get', async () => bootProgressState)
 ipcMain.handle('hermes:bootstrap:get', async () => getBootstrapState())
 ipcMain.handle('hermes:connection-config:get', async () => sanitizeDesktopConnectionConfig())
@@ -3592,21 +3282,13 @@ ipcMain.handle('hermes:readFileText', async (_event, filePath) => {
 })
 
 ipcMain.handle('hermes:selectPaths', async (_event, options = {}) => {
-  const properties = options?.directories ? ['openDirectory'] : ['openFile']
+  const properties = ['openFile']
+  if (options?.directories) properties.push('openDirectory')
   if (options?.multiple !== false) properties.push('multiSelections')
 
-  let resolvedDefaultPath
-  if (options?.defaultPath) {
-    try {
-      resolvedDefaultPath = path.resolve(String(options.defaultPath))
-    } catch {
-      resolvedDefaultPath = undefined
-    }
-  }
-
   const result = await dialog.showOpenDialog(mainWindow, {
     title: options?.title || 'Add context',
-    defaultPath: resolvedDefaultPath,
+    defaultPath: options?.defaultPath ? path.resolve(String(options.defaultPath)) : undefined,
     properties,
     filters: Array.isArray(options?.filters) ? options.filters : undefined
   })
@@ -3665,45 +3347,6 @@ ipcMain.handle('hermes:openExternal', (_event, url) => {
   }
 })
 
-// User-configurable default project directory. The renderer reads this on
-// settings mount and seeds the value into the picker; writing back persists
-// it via writeDefaultProjectDir so resolveHermesCwd picks it up on the next
-// session spawn (no app restart needed).
-ipcMain.handle('hermes:setting:defaultProjectDir:get', async () => ({
-  dir: readDefaultProjectDir(),
-  defaultLabel: path.join(app.getPath('home'), 'hermes-projects')
-}))
-
-ipcMain.handle('hermes:setting:defaultProjectDir:set', async (_event, dir) => {
-  const next = typeof dir === 'string' && dir.trim() ? dir.trim() : null
-
-  if (next) {
-    try {
-      fs.mkdirSync(next, { recursive: true })
-    } catch (error) {
-      throw new Error(`Could not create directory: ${error.message}`)
-    }
-  }
-
-  writeDefaultProjectDir(next)
-
-  return { dir: next }
-})
-
-ipcMain.handle('hermes:setting:defaultProjectDir:pick', async () => {
-  const result = await dialog.showOpenDialog({
-    title: 'Choose default project directory',
-    properties: ['openDirectory', 'createDirectory'],
-    defaultPath: readDefaultProjectDir() || app.getPath('home')
-  })
-
-  if (result.canceled || result.filePaths.length === 0) {
-    return { canceled: true, dir: null }
-  }
-
-  return { canceled: false, dir: result.filePaths[0] }
-})
-
 ipcMain.handle('hermes:fetchLinkTitle', (_event, url) => fetchLinkTitle(url))
 
 ipcMain.handle('hermes:logs:reveal', async () => {
@@ -4004,108 +3647,14 @@ ipcMain.handle('hermes:version', async () => ({
   hermesRoot: resolveUpdateRoot()
 }))
 
-// ---------------------------------------------------------------------------
-// macOS first-launch placement: move into /Applications and pin to the Dock
-// ---------------------------------------------------------------------------
-//
-// The DMG and CLI-built apps launch from wherever the user left them (a DMG
-// mount, ~/Downloads, ~/.hermes/...) -- which means Gatekeeper translocation,
-// no Dock tile, and "which icon do I click?" confusion. On first packaged
-// launch we relocate into /Applications (Electron relaunches from there) and,
-// once we're that canonical copy, pin to the Dock. Both macOS-only,
-// packaged-only, best-effort, run at most once.
-
-// Move the bundle into /Applications and relaunch. Returns true when a relaunch
-// is underway (caller must stop init). No-op in dev, off macOS, or already in
-// /Applications. `existsAndRunning` -> another copy owns the slot; don't fight
-// it. `exists` -> stale copy; replace it so there's exactly one current app.
-function maybeRelocateToApplications() {
-  if (!IS_MAC || !IS_PACKAGED || process.env.HERMES_DESKTOP_NO_AUTO_MOVE === '1') return false
-  try {
-    if (app.isInApplicationsFolder()) return false
-    const moved = app.moveToApplicationsFolder({ conflictHandler: type => type !== 'existsAndRunning' })
-    if (moved) rememberLog('[install] relocated into /Applications; relaunching')
-    return moved
-  } catch (err) {
-    rememberLog(`[install] move to /Applications skipped: ${err.message}`)
-    return false
-  }
-}
-
-const DOCK_PINNED_MARKER = 'dock-pinned.json'
-
-// Pin the /Applications copy to the Dock once. macOS has no Electron API for
-// this, so we append to com.apple.dock's persistent-apps and restart the Dock.
-// Guarded by a userData marker + membership check so we never duplicate the tile.
-function maybePinToDock() {
-  if (!IS_MAC || !IS_PACKAGED || process.env.HERMES_DESKTOP_NO_DOCK_PIN === '1') return
-  const marker = path.join(app.getPath('userData'), DOCK_PINNED_MARKER)
-  if (fileExists(marker)) return
-
-  let bundle
-  try {
-    if (!app.isInApplicationsFolder()) return // don't pin a soon-to-be-stale path
-    bundle = runningAppBundle()
-  } catch {
-    return
-  }
-  if (!bundle) return
-
-  // The Dock stores tiles as file-reference URLs (type 15), e.g.
-  // file:///Applications/Hermes.app/ -- NOT a raw POSIX path. A type-0/raw-path
-  // tile is silently dropped when the Dock rewrites persistent-apps on restart.
-  const url = pathToFileURL(bundle.endsWith('/') ? bundle : `${bundle}/`).href
-
-  const done = (note = {}) => {
-    try {
-      fs.writeFileSync(marker, JSON.stringify({ bundle, pinnedAt: new Date().toISOString(), ...note }) + '\n')
-    } catch {
-      // best-effort; we re-check next launch (membership guard dedupes)
-    }
-  }
-
-  try {
-    const apps = execFileSync('defaults', ['read', 'com.apple.dock', 'persistent-apps'], {
-      encoding: 'utf8',
-      stdio: ['ignore', 'pipe', 'ignore']
-    })
-    if (apps.includes(url)) return done({ alreadyPresent: true })
-  } catch {
-    // persistent-apps may not exist yet; -array-add creates it
-  }
-
-  const tile =
-    '<dict><key>tile-data</key><dict><key>file-data</key><dict>' +
-    `<key>_CFURLString</key><string>${url}</string><key>_CFURLStringType</key><integer>15</integer>` +
-    '</dict></dict></dict>'
-  try {
-    execFileSync('defaults', ['write', 'com.apple.dock', 'persistent-apps', '-array-add', tile], { stdio: 'ignore' })
-    // Flush the write through cfprefsd before restarting the Dock, otherwise the
-    // Dock reloads stale prefs and our tile is lost in the race.
-    execFileSync('defaults', ['read', 'com.apple.dock', 'persistent-apps'], { stdio: 'ignore' })
-    execFileSync('killall', ['Dock'], { stdio: 'ignore' })
-    done()
-    rememberLog(`[install] pinned to Dock: ${url}`)
-  } catch (err) {
-    rememberLog(`[install] Dock pin skipped: ${err.message}`)
-  }
-}
-
 app.whenReady().then(() => {
-  // macOS: relocate into /Applications before anything else so setup + state
-  // land in the final location; on success this relaunches, so bail here.
-  if (maybeRelocateToApplications()) return
-  maybePinToDock()
-
   if (IS_MAC) {
     Menu.setApplicationMenu(buildApplicationMenu())
   } else {
     Menu.setApplicationMenu(null)
   }
   installMediaPermissions()
-  registerMediaProtocol()
   ensureWslWindowsFonts()
-  configureSpellChecker()
   createWindow()
 
   app.on('activate', () => {
@@ -4113,37 +3662,7 @@ app.whenReady().then(() => {
   })
 })
 
-// Seed Chromium's spellchecker with the system locale (falling back to en-US).
-// On macOS Electron uses the native spellchecker which ignores this list, but
-// on Windows/Linux Chromium downloads Hunspell dictionaries on demand and
-// won't enable any without an explicit language.
-function configureSpellChecker() {
-  try {
-    const defaultSession = session.defaultSession
-
-    if (!defaultSession || typeof defaultSession.setSpellCheckerLanguages !== 'function') {
-      return
-    }
-
-    const available = defaultSession.availableSpellCheckerLanguages || []
-    const locale = (app.getLocale && app.getLocale()) || 'en-US'
-    const candidates = [locale, locale.split('-')[0], 'en-US', 'en']
-    const chosen = candidates.find(lang => available.includes(lang)) || 'en-US'
-
-    defaultSession.setSpellCheckerLanguages([chosen])
-  } catch (error) {
-    rememberLog(`Spellchecker setup failed: ${error.message}`)
-  }
-}
-
 app.on('before-quit', () => {
-  // Quitting mid-install should stop the installer, not orphan it.
-  if (bootstrapAbortController) {
-    try {
-      bootstrapAbortController.abort()
-    } catch {}
-  }
-
   if (desktopLogFlushTimer) {
     clearTimeout(desktopLogFlushTimer)
     desktopLogFlushTimer = null

apps/desktop/electron/preload.cjs

@@ -31,11 +31,6 @@ contextBridge.exposeInMainWorld('hermesDesktop', {
   setPreviewShortcutActive: active => ipcRenderer.send('hermes:previewShortcutActive', Boolean(active)),
   openExternal: url => ipcRenderer.invoke('hermes:openExternal', url),
   fetchLinkTitle: url => ipcRenderer.invoke('hermes:fetchLinkTitle', url),
-  settings: {
-    getDefaultProjectDir: () => ipcRenderer.invoke('hermes:setting:defaultProjectDir:get'),
-    setDefaultProjectDir: dir => ipcRenderer.invoke('hermes:setting:defaultProjectDir:set', dir),
-    pickDefaultProjectDir: () => ipcRenderer.invoke('hermes:setting:defaultProjectDir:pick')
-  },
   revealLogs: () => ipcRenderer.invoke('hermes:logs:reveal'),
   getRecentLogs: () => ipcRenderer.invoke('hermes:logs:recent'),
   readDir: dirPath => ipcRenderer.invoke('hermes:fs:readDir', dirPath),
@@ -96,7 +91,6 @@ contextBridge.exposeInMainWorld('hermesDesktop', {
   getBootstrapState: () => ipcRenderer.invoke('hermes:bootstrap:get'),
   resetBootstrap: () => ipcRenderer.invoke('hermes:bootstrap:reset'),
   repairBootstrap: () => ipcRenderer.invoke('hermes:bootstrap:repair'),
-  cancelBootstrap: () => ipcRenderer.invoke('hermes:bootstrap:cancel'),
   onBootstrapEvent: callback => {
     const listener = (_event, payload) => callback(payload)
     ipcRenderer.on('hermes:bootstrap:event', listener)

apps/desktop/index.html

@@ -3,11 +3,8 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="color-scheme" content="light dark" />
-    <meta name="theme-color" content="#0a0a0a" />
-    <link rel="icon" type="image/png" sizes="180x180" href="/apple-touch-icon.png" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
-    <link rel="shortcut icon" href="/apple-touch-icon.png" />
+    <link rel="icon" href="/apple-touch-icon.png" />
+    <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
     <title>Hermes</title>
   </head>
   <body>

apps/desktop/package.json

@@ -32,7 +32,7 @@
     "test:desktop:nsis": "node scripts/test-desktop.mjs nsis",
     "test:desktop:existing": "node scripts/test-desktop.mjs existing",
     "test:desktop:fresh": "node scripts/test-desktop.mjs fresh",
-    "test:desktop:platforms": "node --test electron/bootstrap-platform.test.cjs electron/hardening.test.cjs electron/backend-probes.test.cjs electron/bootstrap-runner.test.cjs",
+    "test:desktop:platforms": "node --test electron/bootstrap-platform.test.cjs electron/hardening.test.cjs electron/backend-probes.test.cjs",
     "type-check": "tsc -b",
     "lint": "eslint src/ electron/",
     "lint:fix": "eslint src/ electron/ --fix",
@@ -50,7 +50,6 @@
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
     "@hermes/shared": "file:../shared",
-    "@icons-pack/react-simple-icons": "^13.13.0",
     "@nanostores/react": "^1.1.0",
     "@nous-research/ui": "^0.13.0",
     "@radix-ui/react-slot": "^1.2.4",

apps/desktop/scripts/diag-scroll-reset.mjs

@@ -1,229 +0,0 @@
-// Reproduce + diagnose the "scroll wheel resets position while reading" bug.
-//
-// The complaint (Windows, mouse wheel): scrolling UP through a chat to re-read
-// older content randomly yanks the view to a different position, so you have to
-// fight the scrollbar. Mac users on trackpads don't see it.
-//
-// Hypothesis: the thread scroller has the browser default `overflow-anchor:
-// auto`, and the thread renders items in natural document flow (padding
-// spacers, NOT transforms). When an item above the viewport is measured by
-// @tanstack/react-virtual (its real height differs a lot from the 220px
-// estimate) — or when Shiki/images/fonts reflow it — TWO mechanisms both
-// adjust scrollTop for the same delta: TanStack's measurement compensation AND
-// the browser's native scroll anchoring. The double-correction lurches the
-// view. A mouse wheel's coarse, discrete notches mount/measure several
-// under-estimated turns per tick, so the over-correction is large and visible;
-// a trackpad's ~1-3px/frame keeps it sub-perceptual.
-//
-// This script drives synthetic mouse-wheel-UP scrolling on a long thread and
-// measures how much a tracked on-screen turn jumps, first with
-// `overflow-anchor: auto` (reproduce) then `overflow-anchor: none` (the fix).
-// If the fix run shows dramatically fewer/smaller jumps, the hypothesis holds.
-//
-// Prereq: a running desktop app with remote debugging on 9222, on a thread
-// with enough history to scroll (the longer / more code+tool blocks, the
-// better the repro). Then:  node apps/desktop/scripts/diag-scroll-reset.mjs
-
-const NOTCHES = 14 // wheel-up ticks per sweep
-const NOTCH_PX = 120 // Windows wheel notch ≈ 120px
-const NOTCH_GAP_MS = 130 // let each smooth-scroll animation settle
-const REVERSE_JUMP_PX = 6 // tracked turn moving UP while scrolling up = wrong way
-const LURCH_PX = 60 // single-frame on-screen jump that reads as a "reset"
-
-const list = await (await fetch('http://127.0.0.1:9222/json/list')).json()
-const tgt = list.find(t => t.type === 'page' && t.url.startsWith('http'))
-if (!tgt) {
-  console.error('No page target on :9222. Is the desktop app running with --remote-debugging-port=9222?')
-  process.exit(1)
-}
-const ws = new WebSocket(tgt.webSocketDebuggerUrl)
-let id = 0
-const pending = new Map()
-ws.addEventListener('message', ev => {
-  const m = JSON.parse(ev.data)
-  if (m.id != null && pending.has(m.id)) {
-    pending.get(m.id)(m)
-    pending.delete(m.id)
-  }
-})
-await new Promise(r => ws.addEventListener('open', r))
-const send = (m, p = {}) =>
-  new Promise(r => {
-    const i = ++id
-    pending.set(i, r)
-    ws.send(JSON.stringify({ id: i, method: m, params: p }))
-  })
-const evalP = async expr => {
-  const r = await send('Runtime.evaluate', { expression: expr, returnByValue: true })
-  if (r.result?.exceptionDetails) throw new Error(r.result.exceptionDetails.text)
-  return r.result.result.value
-}
-const sleep = ms => new Promise(r => setTimeout(r, ms))
-
-// Install per-sweep instrumentation. `mode` is the overflow-anchor value to
-// force inline so we A/B the exact same thread regardless of any CSS fix.
-// Starts from ~45% down the thread so there's room to scroll up into
-// not-yet-measured turns, tags the turn nearest viewport-center as the anchor,
-// then records (per rAF) scrollTop + that turn's on-screen top, plus every
-// scrollTop *setter* write (TanStack compensation) and ResizeObserver hit.
-async function arm(mode) {
-  await evalP(`(() => {
-    const v = document.querySelector('[data-slot="aui_thread-viewport"]')
-    if (!v) throw new Error('thread viewport not found')
-
-    // Force the overflow-anchor behavior under test (inline beats CSS).
-    v.style.overflowAnchor = ${JSON.stringify(mode)}
-
-    // Park ~45% down so a wheel-up sweep climbs into estimated-but-unmeasured
-    // turns above the fold (where the measurement correction fires).
-    v.scrollTop = Math.round(v.scrollHeight * 0.45)
-
-    // Tag the turn closest to viewport center; we track its on-screen top.
-    const vr = v.getBoundingClientRect()
-    const center = vr.top + v.clientHeight / 2
-    let best = null, bestD = Infinity
-    for (const el of v.querySelectorAll('[data-index]')) {
-      const r = el.getBoundingClientRect()
-      const d = Math.abs((r.top + r.height / 2) - center)
-      if (d < bestD) { bestD = d; best = el }
-    }
-    document.querySelectorAll('[data-se-anchor]').forEach(e => e.removeAttribute('data-se-anchor'))
-    if (best) best.setAttribute('data-se-anchor', '1')
-    const anchorIndex = best ? best.getAttribute('data-index') : null
-
-    const samples = []
-    const writes = []
-    const ros = []
-    const t0 = performance.now()
-
-    // Intercept scrollTop writes → these are JS (TanStack) corrections.
-    // Native browser scroll anchoring does NOT go through this setter, so a
-    // scrollTop change with no write in the same frame is a native adjust.
-    const desc = Object.getOwnPropertyDescriptor(Element.prototype, 'scrollTop')
-    Object.defineProperty(v, 'scrollTop', {
-      configurable: true,
-      get() { return desc.get.call(this) },
-      set(val) {
-        writes.push({ t: performance.now() - t0, val, sh: this.scrollHeight })
-        desc.set.call(this, val)
-      }
-    })
-    window.__restoreScrollTop = () => Object.defineProperty(v, 'scrollTop', desc)
-
-    const ro = new ResizeObserver(entries => {
-      for (const e of entries) {
-        ros.push({ t: performance.now() - t0, slot: e.target.getAttribute?.('data-slot') || e.target.tagName, h: Math.round(e.contentRect.height) })
-      }
-    })
-    ro.observe(v)
-    if (v.firstElementChild) ro.observe(v.firstElementChild)
-
-    let running = true
-    const tick = () => {
-      if (!running) return
-      const a = v.querySelector('[data-se-anchor]')
-      const ar = a ? a.getBoundingClientRect() : null
-      samples.push({
-        t: performance.now() - t0,
-        st: Math.round(v.scrollTop * 100) / 100,
-        sh: v.scrollHeight,
-        ch: v.clientHeight,
-        atop: ar ? Math.round(ar.top * 100) / 100 : null,
-        aconn: !!a
-      })
-      requestAnimationFrame(tick)
-    }
-    requestAnimationFrame(tick)
-
-    window.__se = { samples, writes, ros, anchorIndex, dpr: window.devicePixelRatio, stop() { running = false; ro.disconnect(); window.__restoreScrollTop?.() } }
-    return true
-  })()`)
-}
-
-async function wheelUpSweep() {
-  const { x, y } = await evalP(`(() => {
-    const v = document.querySelector('[data-slot="aui_thread-viewport"]')
-    const r = v.getBoundingClientRect()
-    return { x: Math.round(r.left + r.width / 2), y: Math.round(r.top + r.height / 2) }
-  })()`)
-
-  for (let i = 0; i < NOTCHES; i++) {
-    await send('Input.dispatchMouseEvent', { type: 'mouseWheel', x, y, deltaX: 0, deltaY: -NOTCH_PX })
-    await sleep(NOTCH_GAP_MS)
-  }
-  await sleep(400)
-}
-
-async function collect() {
-  const data = JSON.parse(await evalP(`(() => { window.__se.stop(); return JSON.stringify(window.__se) })()`))
-  return data
-}
-
-function analyze(label, data) {
-  const { samples, writes, ros, anchorIndex, dpr } = data
-  let reverseJumps = 0
-  let reverseSum = 0
-  let lurches = 0
-  let maxJump = 0
-  let nativeMoves = 0
-  let prev = null
-  for (const s of samples) {
-    if (prev && prev.aconn && s.aconn && prev.atop != null && s.atop != null) {
-      const dTop = s.atop - prev.atop // wheel-up should move content DOWN → dTop >= 0
-      const dSt = s.st - prev.st
-      // Native (browser-anchoring) move: scrollTop changed with no setter write in this frame window.
-      const wroteThisFrame = writes.some(w => w.t > prev.t && w.t <= s.t)
-      if (Math.abs(dSt) > 0.5 && !wroteThisFrame) nativeMoves++
-      if (dTop < -REVERSE_JUMP_PX) {
-        reverseJumps++
-        reverseSum += -dTop
-      }
-      if (Math.abs(dTop) > LURCH_PX) lurches++
-      if (Math.abs(dTop) > maxJump) maxJump = Math.abs(dTop)
-    }
-    prev = s
-  }
-  console.log(`\n── ${label} ──`)
-  console.log(`  devicePixelRatio:     ${dpr}${Number.isInteger(dpr) ? '' : '  (fractional — Windows scaling, worsens rounding jitter)'}`)
-  console.log(`  tracked turn index:   ${anchorIndex}`)
-  console.log(`  rAF frames:           ${samples.length}`)
-  console.log(`  scrollTop writes:     ${writes.length}   (TanStack measurement corrections)`)
-  console.log(`  ResizeObserver hits:  ${ros.length}`)
-  console.log(`  native scroll moves:  ${nativeMoves}   (scrollTop moved with NO JS write = browser anchoring)`)
-  console.log(`  reverse jumps:        ${reverseJumps}   (tracked turn yanked UP while scrolling up; total ${reverseSum.toFixed(0)}px)`)
-  console.log(`  big lurches (>${LURCH_PX}px):   ${lurches}`)
-  console.log(`  max single-frame jump: ${maxJump.toFixed(0)}px`)
-  return { reverseJumps, reverseSum, lurches, maxJump, nativeMoves }
-}
-
-console.log(`Wheel-up repro: ${NOTCHES} notches × ${NOTCH_PX}px, anchored mid-thread.\n`)
-
-await arm('auto')
-await sleep(150)
-await wheelUpSweep()
-const a = analyze('overflow-anchor: auto  (current / repro)', await collect())
-
-await sleep(300)
-
-await arm('none')
-await sleep(150)
-await wheelUpSweep()
-const b = analyze('overflow-anchor: none  (proposed fix)', await collect())
-
-// Clean up our tag.
-await evalP(`document.querySelectorAll('[data-se-anchor]').forEach(e => e.removeAttribute('data-se-anchor'))`)
-
-console.log('\n══ verdict ══')
-const drop = (x, y) => (x === 0 ? (y === 0 ? '0' : 'n/a') : `${Math.round((1 - y / x) * 100)}% fewer`)
-console.log(`  reverse jumps:  auto=${a.reverseJumps}  none=${b.reverseJumps}  (${drop(a.reverseJumps, b.reverseJumps)})`)
-console.log(`  big lurches:    auto=${a.lurches}  none=${b.lurches}  (${drop(a.lurches, b.lurches)})`)
-console.log(`  max jump:       auto=${a.maxJump.toFixed(0)}px  none=${b.maxJump.toFixed(0)}px`)
-console.log(`  native moves:   auto=${a.nativeMoves}  none=${b.nativeMoves}  (browser anchoring should ~vanish at none)`)
-if (a.reverseJumps + a.lurches > 0 && b.reverseJumps + b.lurches < a.reverseJumps + a.lurches) {
-  console.log('\n  → Jumps drop sharply with overflow-anchor:none → root cause confirmed.')
-} else if (a.reverseJumps + a.lurches === 0) {
-  console.log('\n  → No jumps captured this run. Use a longer thread (many code/tool blocks),')
-  console.log('    raise NOTCHES, and ensure you start scrolled up from the bottom.')
-}
-
-ws.close()

apps/desktop/src/app/chat/composer/completion-drawer.tsx

@@ -24,12 +24,7 @@ export const COMPLETION_DRAWER_BELOW_CLASS = [
 
 export const COMPLETION_DRAWER_ROW_CLASS = [
   'relative flex cursor-default select-none items-center gap-2 rounded-md px-2 py-1',
-  'w-full min-w-0 text-left text-xs outline-hidden',
-  // Keyboard selection (data-highlighted / activeIndex) should feel instant —
-  // no transition on background so the highlight snaps to the new row.
-  // Mouse hover keeps a smooth 200ms color transition for that buttery feel.
-  'transition-[color,border-color,text-decoration-color] duration-0',
-  'hover:transition-colors hover:duration-200',
+  'w-full min-w-0 text-left text-xs outline-hidden transition-colors',
   'hover:bg-(--ui-bg-tertiary)',
   'data-[highlighted]:bg-(--ui-bg-tertiary) data-[highlighted]:text-foreground'
 ].join(' ')

apps/desktop/src/app/chat/composer/context-menu.tsx

@@ -1,20 +1,14 @@
-import { useState } from 'react'
-
 import { Button } from '@/components/ui/button'
 import { Codicon } from '@/components/ui/codicon'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle
-} from '@/components/ui/dialog'
 import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuLabel,
   DropdownMenuSeparator,
+  DropdownMenuSub,
+  DropdownMenuSubContent,
+  DropdownMenuSubTrigger,
   DropdownMenuTrigger
 } from '@/components/ui/dropdown-menu'
 import { Clipboard, FileText, FolderOpen, type IconComponent, ImageIcon, Link, MessageSquareText } from '@/lib/icons'
@@ -23,24 +17,6 @@ import { cn } from '@/lib/utils'
 import { GHOST_ICON_BTN } from './controls'
 import type { ChatBarState } from './types'
 
-const PROMPT_SNIPPETS: readonly PromptSnippet[] = [
-  {
-    description: 'Audit the current change for regressions, dropped edge cases, and missing tests.',
-    label: 'Code review',
-    text: 'Please review this for bugs, regressions, and missing tests.'
-  },
-  {
-    description: 'Outline an approach before touching code so the diff stays focused.',
-    label: 'Implementation plan',
-    text: 'Please make a concise implementation plan before changing code.'
-  },
-  {
-    description: 'Walk through how the selected code works and link to the key files.',
-    label: 'Explain this',
-    text: 'Please explain how this works and point me to the key files.'
-  }
-]
-
 export function ContextMenu({
   state,
   onInsertText,
@@ -49,114 +25,81 @@ export function ContextMenu({
   onPickFiles,
   onPickFolders,
   onPickImages
-}: ContextMenuProps) {
-  // Prompt snippets used to be a Radix submenu. That submenu didn't open
-  // reliably when the parent menu was positioned at the bottom of the
-  // window (composer "+" anchor), so we promoted it to a real Dialog —
-  // easier to grow with search / descriptions, and no positioning math.
-  const [snippetsOpen, setSnippetsOpen] = useState(false)
-
+}: {
+  state: ChatBarState
+  onInsertText: (text: string) => void
+  onOpenUrlDialog: () => void
+  onPasteClipboardImage?: () => void
+  onPickFiles?: () => void
+  onPickFolders?: () => void
+  onPickImages?: () => void
+}) {
   return (
-    <>
-      <DropdownMenu>
-        <DropdownMenuTrigger asChild>
-          <Button
-            aria-label={state.tools.label}
-            className={cn(
-              GHOST_ICON_BTN,
-              'data-[state=open]:bg-(--chrome-action-hover) data-[state=open]:text-foreground'
-            )}
-            disabled={!state.tools.enabled}
-            size="icon"
-            title={state.tools.label}
-            type="button"
-            variant="ghost"
-          >
-            <Codicon name="add" size="1rem" />
-          </Button>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent align="start" className="w-60" side="top" sideOffset={10}>
-          <DropdownMenuLabel className="text-[0.7rem] font-medium uppercase tracking-wide text-muted-foreground/85">
-            Attach
-          </DropdownMenuLabel>
-          <ContextMenuItem disabled={!onPickFiles} icon={FileText} onSelect={onPickFiles}>
-            Files…
-          </ContextMenuItem>
-          <ContextMenuItem disabled={!onPickFolders} icon={FolderOpen} onSelect={onPickFolders}>
-            Folder…
-          </ContextMenuItem>
-          <ContextMenuItem disabled={!onPickImages} icon={ImageIcon} onSelect={onPickImages}>
-            Images…
-          </ContextMenuItem>
-          <ContextMenuItem disabled={!onPasteClipboardImage} icon={Clipboard} onSelect={onPasteClipboardImage}>
-            Paste image
-          </ContextMenuItem>
-          <ContextMenuItem icon={Link} onSelect={onOpenUrlDialog}>
-            URL…
-          </ContextMenuItem>
+    <DropdownMenu>
+      <DropdownMenuTrigger asChild>
+        <Button
+          aria-label={state.tools.label}
+          className={cn(
+            GHOST_ICON_BTN,
+            'data-[state=open]:bg-(--chrome-action-hover) data-[state=open]:text-foreground'
+          )}
+          disabled={!state.tools.enabled}
+          size="icon"
+          title={state.tools.label}
+          type="button"
+          variant="ghost"
+        >
+          <Codicon name="add" size="1rem" />
+        </Button>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="start" className="w-60" side="top" sideOffset={10}>
+        <DropdownMenuLabel className="text-[0.7rem] font-medium uppercase tracking-wide text-muted-foreground/85">
+          Attach
+        </DropdownMenuLabel>
+        <ContextMenuItem disabled={!onPickFiles} icon={FileText} onSelect={onPickFiles}>
+          Files…
+        </ContextMenuItem>
+        <ContextMenuItem disabled={!onPickFolders} icon={FolderOpen} onSelect={onPickFolders}>
+          Folder…
+        </ContextMenuItem>
+        <ContextMenuItem disabled={!onPickImages} icon={ImageIcon} onSelect={onPickImages}>
+          Images…
+        </ContextMenuItem>
+        <ContextMenuItem disabled={!onPasteClipboardImage} icon={Clipboard} onSelect={onPasteClipboardImage}>
+          Paste image
+        </ContextMenuItem>
+        <ContextMenuItem icon={Link} onSelect={onOpenUrlDialog}>
+          URL…
+        </ContextMenuItem>
 
-          <DropdownMenuSeparator />
+        <DropdownMenuSeparator />
 
-          <ContextMenuItem icon={MessageSquareText} onSelect={() => setSnippetsOpen(true)}>
-            Prompt snippets…
-          </ContextMenuItem>
+        <DropdownMenuSub>
+          <DropdownMenuSubTrigger>
+            <MessageSquareText />
+            <span>Prompt snippets</span>
+          </DropdownMenuSubTrigger>
+          <DropdownMenuSubContent className="w-72">
+            {[
+              { label: 'Code review', text: 'Please review this for bugs, regressions, and missing tests.' },
+              { label: 'Implementation plan', text: 'Please make a concise implementation plan before changing code.' },
+              { label: 'Explain this', text: 'Please explain how this works and point me to the key files.' }
+            ].map(snippet => (
+              <ContextMenuItem icon={MessageSquareText} key={snippet.label} onSelect={() => onInsertText(snippet.text)}>
+                {snippet.label}
+              </ContextMenuItem>
+            ))}
+          </DropdownMenuSubContent>
+        </DropdownMenuSub>
 
-          <DropdownMenuSeparator />
+        <DropdownMenuSeparator />
 
-          <div className="px-2 py-1 text-[0.7rem] text-muted-foreground/80">
-            Tip: type <kbd className="rounded bg-muted/70 px-1 py-px font-mono text-[0.65rem]">@</kbd> to reference files
-            inline.
-          </div>
-        </DropdownMenuContent>
-      </DropdownMenu>
-
-      <PromptSnippetsDialog
-        onInsertText={onInsertText}
-        onOpenChange={setSnippetsOpen}
-        open={snippetsOpen}
-        snippets={PROMPT_SNIPPETS}
-      />
-    </>
-  )
-}
-
-function PromptSnippetsDialog({
-  onInsertText,
-  onOpenChange,
-  open,
-  snippets
-}: PromptSnippetsDialogProps) {
-  return (
-    <Dialog onOpenChange={onOpenChange} open={open}>
-      <DialogContent className="max-w-md gap-3">
-        <DialogHeader>
-          <DialogTitle>Prompt snippets</DialogTitle>
-          <DialogDescription>Pick a starter prompt to drop into the composer.</DialogDescription>
-        </DialogHeader>
-        <ul className="grid gap-1">
-          {snippets.map(snippet => (
-            <li key={snippet.label}>
-              <button
-                className="group/snippet flex w-full cursor-pointer items-start gap-2.5 rounded-md border border-transparent px-2.5 py-2 text-left transition-colors hover:border-(--ui-stroke-tertiary) hover:bg-(--ui-control-hover-background) focus-visible:border-(--ui-stroke-tertiary) focus-visible:bg-(--ui-control-hover-background) focus-visible:outline-none"
-                onClick={() => {
-                  onInsertText(snippet.text)
-                  onOpenChange(false)
-                }}
-                type="button"
-              >
-                <MessageSquareText className="mt-0.5 size-3.5 shrink-0 text-(--ui-text-tertiary) group-hover/snippet:text-foreground" />
-                <span className="grid min-w-0 gap-0.5">
-                  <span className="text-sm font-medium text-foreground">{snippet.label}</span>
-                  <span className="text-[length:var(--conversation-caption-font-size)] text-(--ui-text-tertiary)">
-                    {snippet.description}
-                  </span>
-                </span>
-              </button>
-            </li>
-          ))}
-        </ul>
-      </DialogContent>
-    </Dialog>
+        <div className="px-2 py-1 text-[0.7rem] text-muted-foreground/80">
+          Tip: type <kbd className="rounded bg-muted/70 px-1 py-px font-mono text-[0.65rem]">@</kbd> to reference files
+          inline.
+        </div>
+      </DropdownMenuContent>
+    </DropdownMenu>
   )
 }
 
@@ -165,7 +108,12 @@ export function ContextMenuItem({
   disabled,
   icon: Icon,
   onSelect
-}: ContextMenuItemProps) {
+}: {
+  children: string
+  disabled?: boolean
+  icon: IconComponent
+  onSelect?: () => void
+}) {
   return (
     <DropdownMenuItem disabled={disabled} onSelect={onSelect}>
       <Icon />
@@ -173,33 +121,3 @@ export function ContextMenuItem({
     </DropdownMenuItem>
   )
 }
-
-interface ContextMenuItemProps {
-  children: string
-  disabled?: boolean
-  icon: IconComponent
-  onSelect?: () => void
-}
-
-interface ContextMenuProps {
-  onInsertText: (text: string) => void
-  onOpenUrlDialog: () => void
-  onPasteClipboardImage?: () => void
-  onPickFiles?: () => void
-  onPickFolders?: () => void
-  onPickImages?: () => void
-  state: ChatBarState
-}
-
-interface PromptSnippet {
-  description: string
-  label: string
-  text: string
-}
-
-interface PromptSnippetsDialogProps {
-  onInsertText: (text: string) => void
-  onOpenChange: (open: boolean) => void
-  open: boolean
-  snippets: readonly PromptSnippet[]
-}

apps/desktop/src/app/chat/composer/index.tsx

@@ -65,7 +65,7 @@ import {
 } from './rich-editor'
 import { SkinSlashPopover } from './skin-slash-popover'
 import { detectTrigger, extractClipboardImageBlobs, textBeforeCaret, type TriggerState } from './text-utils'
-import { ComposerTriggerPopover, type ComposerTriggerPopoverHandle } from './trigger-popover'
+import { ComposerTriggerPopover } from './trigger-popover'
 import type { ChatBarProps } from './types'
 import { UrlDialog } from './url-dialog'
 import { VoiceActivity, VoicePlaybackActivity } from './voice-activity'
@@ -125,7 +125,6 @@ export function ChatBar({
   const previousBusyRef = useRef(busy)
   const drainingQueueRef = useRef(false)
   const urlInputRef = useRef<HTMLInputElement | null>(null)
-  const triggerPopoverRef = useRef<ComposerTriggerPopoverHandle>(null)
 
   const [urlOpen, setUrlOpen] = useState(false)
   const [urlValue, setUrlValue] = useState('')
@@ -442,19 +441,8 @@ export function ChatBar({
     const before = textBeforeCaret(editor)
     const detected = detectTrigger(before ?? composerPlainText(editor))
 
-    // Only reset the active index when the trigger state actually changed
-    // (new trigger opened, trigger closed, or query text changed). When the
-    // kind + query are the same (e.g. the user just pressed ArrowUp/Down),
-    // preserve the selection so keyboard navigation isn't wiped out by the
-    // keyup→refreshTrigger round-trip.
-    const queryChanged =
-      trigger?.kind !== detected?.kind || trigger?.query !== detected?.query
-
     setTrigger(detected)
-
-    if (queryChanged) {
-      setTriggerActive(0)
-    }
+    setTriggerActive(0)
   }, [trigger])
 
   const handleEditorInput = (event: FormEvent<HTMLDivElement>) => {
@@ -571,7 +559,6 @@ export function ChatBar({
       if (event.key === 'ArrowDown') {
         event.preventDefault()
         setTriggerActive(idx => (idx + 1) % triggerItems.length)
-        requestAnimationFrame(() => triggerPopoverRef.current?.scrollActiveIntoView())
 
         return
       }
@@ -579,7 +566,6 @@ export function ChatBar({
       if (event.key === 'ArrowUp') {
         event.preventDefault()
         setTriggerActive(idx => (idx - 1 + triggerItems.length) % triggerItems.length)
-        requestAnimationFrame(() => triggerPopoverRef.current?.scrollActiveIntoView())
 
         return
       }
@@ -1038,8 +1024,6 @@ export function ChatBar({
     <div className={cn('relative', stacked ? 'w-full' : 'min-w-(--composer-input-inline-min-width) flex-1')}>
       <div
         aria-label="Message"
-        autoCorrect="off"
-        autoCapitalize="off"
         className={cn(
           'min-h-(--composer-input-min-height) max-h-(--composer-input-max-height) overflow-y-auto bg-transparent pb-1 pr-1 pt-1 leading-normal text-foreground outline-none disabled:cursor-not-allowed',
           'empty:before:content-[attr(data-placeholder)] empty:before:text-muted-foreground/60',
@@ -1061,7 +1045,6 @@ export function ChatBar({
         onPaste={handlePaste}
         ref={editorRef}
         role="textbox"
-        spellCheck="true"
         suppressContentEditableWarning
       />
       {/* assistant-ui requires ComposerPrimitive.Input somewhere in the tree
@@ -1106,7 +1089,6 @@ export function ChatBar({
           {showHelpHint && <HelpHint />}
           {trigger && (
             <ComposerTriggerPopover
-              ref={triggerPopoverRef}
               activeIndex={triggerActive}
               items={triggerItems}
               kind={trigger.kind}

apps/desktop/src/app/chat/composer/trigger-popover.tsx

@@ -1,5 +1,4 @@
 import type { Unstable_TriggerItem } from '@assistant-ui/core'
-import { forwardRef, useImperativeHandle, useRef } from 'react'
 
 import { Codicon } from '@/components/ui/codicon'
 import { cn } from '@/lib/utils'
@@ -52,47 +51,21 @@ interface ComposerTriggerPopoverProps {
   placement?: 'bottom' | 'top'
 }
 
-export interface ComposerTriggerPopoverHandle {
-  scrollActiveIntoView: () => void
-}
-
-export const ComposerTriggerPopover = forwardRef<
-  ComposerTriggerPopoverHandle,
-  ComposerTriggerPopoverProps
->(function ComposerTriggerPopover(
-  { activeIndex, items, kind, loading, onHover, onPick, placement = 'top' },
-  ref
-) {
-  const containerRef = useRef<HTMLDivElement | null>(null)
-
-  // Expose scrollActiveIntoView so the keyboard handler in the parent can
-  // trigger a scroll only on arrow-key events — mouse hover never calls this.
-  useImperativeHandle(ref, () => ({
-    scrollActiveIntoView() {
-      const container = containerRef.current
-      if (!container) return
-
-      const highlighted = container.querySelector<HTMLElement>('[data-highlighted]')
-      if (!highlighted) return
-
-      const buttonRect = highlighted.getBoundingClientRect()
-      const containerRect = container.getBoundingClientRect()
-
-      if (buttonRect.top < containerRect.top) {
-        container.scrollTop -= containerRect.top - buttonRect.top
-      } else if (buttonRect.bottom > containerRect.bottom) {
-        container.scrollTop += buttonRect.bottom - containerRect.bottom
-      }
-    }
-  }))
-
+export function ComposerTriggerPopover({
+  activeIndex,
+  items,
+  kind,
+  loading,
+  onHover,
+  onPick,
+  placement = 'top'
+}: ComposerTriggerPopoverProps) {
   return (
     <div
       className={placement === 'bottom' ? COMPLETION_DRAWER_BELOW_CLASS : COMPLETION_DRAWER_CLASS}
       data-slot="composer-completion-drawer"
       data-state="open"
       onMouseDown={event => event.preventDefault()}
-      ref={containerRef}
       role="listbox"
     >
       {items.length === 0 ? (
@@ -113,12 +86,11 @@ export const ComposerTriggerPopover = forwardRef<
           const meta = item.metadata as { display?: string; meta?: string } | undefined
           const display = meta?.display ?? (kind === '/' ? `/${item.label}` : item.label)
           const description = meta?.meta || item.description
-          const isActive = index === activeIndex
 
           return (
             <button
-              className={cn(COMPLETION_DRAWER_ROW_CLASS, isActive && 'bg-(--ui-bg-tertiary)')}
-              data-highlighted={isActive ? '' : undefined}
+              className={cn(COMPLETION_DRAWER_ROW_CLASS, index === activeIndex && 'bg-(--ui-bg-tertiary)')}
+              data-highlighted={index === activeIndex ? '' : undefined}
               key={item.id}
               onClick={() => onPick(item)}
               onMouseEnter={() => onHover(index)}
@@ -137,4 +109,4 @@ export const ComposerTriggerPopover = forwardRef<
       )}
     </div>
   )
-})
+}

apps/desktop/src/app/chat/index.tsx

@@ -97,7 +97,7 @@ function ChatHeader({
   const sessions = useStore($sessions)
   const pinnedSessionIds = useStore($pinnedSessionIds)
   const activeStoredSession = sessions.find(session => session.id === selectedSessionId) || null
-  const title = activeStoredSession ? sessionTitle(activeStoredSession) : 'New session'
+  const title = activeStoredSession ? sessionTitle(activeStoredSession) : 'New agent'
   const selectedIsPinned = selectedSessionId ? pinnedSessionIds.includes(selectedSessionId) : false
 
   return (

apps/desktop/src/app/chat/right-rail/preview.tsx

@@ -97,17 +97,6 @@ export function ChatPreviewRail({ onRestartServer, setTitlebarToolGroup }: ChatP
                     : 'border-r border-(--ui-stroke-quaternary) text-(--ui-text-tertiary) [--tab-bg:var(--ui-sidebar-surface-background)] hover:bg-(--chrome-action-hover) hover:text-foreground'
                 )}
                 key={tab.id}
-                // Middle-click closes the tab, matching browser/IDE muscle
-                // memory. `onMouseDown` swallows the middle-button press so
-                // Chromium doesn't switch into autoscroll mode.
-                onAuxClick={event => {
-                  if (event.button !== 1) return
-                  event.preventDefault()
-                  closeRightRailTab(tab.id)
-                }}
-                onMouseDown={event => {
-                  if (event.button === 1) event.preventDefault()
-                }}
               >
                 {active && (
                   <span aria-hidden="true" className="absolute inset-x-0 top-0 h-px bg-(--ui-stroke-primary)" />

apps/desktop/src/app/chat/sidebar/index.tsx

@@ -17,7 +17,7 @@ import {
 import { CSS } from '@dnd-kit/utilities'
 import { useStore } from '@nanostores/react'
 import type * as React from 'react'
-import { useEffect, useMemo, useState } from 'react'
+import { useMemo, useState } from 'react'
 
 import { Button } from '@/components/ui/button'
 import { Codicon } from '@/components/ui/codicon'
@@ -33,7 +33,7 @@ import {
   SidebarMenuItem
 } from '@/components/ui/sidebar'
 import { Skeleton } from '@/components/ui/skeleton'
-import { searchSessions, type SessionInfo, type SessionSearchResult } from '@/hermes'
+import type { SessionInfo } from '@/hermes'
 import { cn } from '@/lib/utils'
 import {
   $pinnedSessionIds,
@@ -54,8 +54,7 @@ import {
   $sessions,
   $sessionsLoading,
   $sessionsTotal,
-  $workingSessionIds,
-  sessionPinId
+  $workingSessionIds
 } from '@/store/session'
 
 import { type AppView, ARTIFACTS_ROUTE, MESSAGING_ROUTE, SKILLS_ROUTE } from '../../routes'
@@ -67,25 +66,9 @@ import { VirtualSessionList } from './virtual-session-list'
 
 const VIRTUALIZE_THRESHOLD = 25
 
-// Render the modifier key the user actually presses on this platform. The
-// global accelerator is bound to both Cmd+N (macOS) and Ctrl+N (everywhere
-// else) in desktop-controller.tsx, but the hint should match muscle memory.
-const NEW_SESSION_KBD: readonly string[] =
-  typeof navigator !== 'undefined' && navigator.platform.toLowerCase().includes('mac') ? ['⌘', 'N'] : ['Ctrl', 'N']
-
 const SIDEBAR_NAV: SidebarNavItem[] = [
-  {
-    id: 'new-session',
-    label: 'New session',
-    icon: props => <Codicon name="robot" {...props} />,
-    action: 'new-session'
-  },
-  {
-    id: 'skills',
-    label: 'Skills & Tools',
-    icon: props => <Codicon name="symbol-misc" {...props} />,
-    route: SKILLS_ROUTE
-  },
+  { id: 'new-session', label: 'New agent', icon: props => <Codicon name="robot" {...props} />, action: 'new-session' },
+  { id: 'skills', label: 'Skills', icon: props => <Codicon name="symbol-misc" {...props} />, route: SKILLS_ROUTE },
   { id: 'messaging', label: 'Messaging', icon: props => <Codicon name="comment" {...props} />, route: MESSAGING_ROUTE },
   { id: 'artifacts', label: 'Artifacts', icon: props => <Codicon name="files" {...props} />, route: ARTIFACTS_ROUTE }
 ]
@@ -132,31 +115,6 @@ const baseName = (path: string) =>
     .filter(Boolean)
     .pop()
 
-// FTS results cover sessions that aren't in the loaded page; synthesize a
-// minimal SessionInfo so they render in the same row component (resume works
-// by id; the snippet stands in for the preview).
-function searchResultToSession(result: SessionSearchResult): SessionInfo {
-  const ts = result.session_started ?? Date.now() / 1000
-
-  return {
-    archived: false,
-    cwd: null,
-    ended_at: null,
-    id: result.session_id,
-    input_tokens: 0,
-    is_active: false,
-    last_active: ts,
-    message_count: 0,
-    model: result.model ?? null,
-    output_tokens: 0,
-    preview: result.snippet?.trim() || null,
-    source: result.source ?? null,
-    started_at: ts,
-    title: null,
-    tool_call_count: 0
-  }
-}
-
 function workspaceGroupsFor(sessions: SessionInfo[]): SidebarSessionGroup[] {
   const groups = new Map<string, SidebarSessionGroup>()
 
@@ -170,14 +128,6 @@ function workspaceGroupsFor(sessions: SessionInfo[]): SidebarSessionGroup[] {
     groups.set(id, group)
   }
 
-  // Groups keep recency order (Map insertion = first-seen in the recency-sorted
-  // input, so an active project floats up), but rows *within* a group sort by
-  // creation time so they don't reshuffle every time a message lands — keeps
-  // muscle memory intact.
-  for (const group of groups.values()) {
-    group.sessions.sort((a, b) => b.started_at - a.started_at)
-  }
-
   return [...groups.values()]
 }
 
@@ -199,8 +149,6 @@ interface ChatSidebarProps extends React.ComponentProps<typeof Sidebar> {
   onLoadMoreSessions: () => void
   onResumeSession: (sessionId: string) => void
   onDeleteSession: (sessionId: string) => void
-  onArchiveSession: (sessionId: string) => void
-  onNewSessionInWorkspace: (path: null | string) => void
 }
 
 export function ChatSidebar({
@@ -208,9 +156,7 @@ export function ChatSidebar({
   onNavigate,
   onLoadMoreSessions,
   onResumeSession,
-  onDeleteSession,
-  onArchiveSession,
-  onNewSessionInWorkspace
+  onDeleteSession
 }: ChatSidebarProps) {
   const sidebarOpen = useStore($sidebarOpen)
   const agentsGrouped = useStore($sidebarAgentsGrouped)
@@ -224,9 +170,6 @@ export function ChatSidebar({
   const workingSessionIds = useStore($workingSessionIds)
   const [agentOrderIds, setAgentOrderIds] = useState<string[]>([])
   const [workspaceOrderIds, setWorkspaceOrderIds] = useState<string[]>([])
-  const [searchQuery, setSearchQuery] = useState('')
-  const [serverMatches, setServerMatches] = useState<SessionSearchResult[]>([])
-  const trimmedQuery = searchQuery.trim()
 
   const activeSidebarSessionId = currentView === 'chat' ? selectedSessionId : null
 
@@ -237,99 +180,24 @@ export function ChatSidebar({
 
   const sortedSessions = useMemo(() => [...sessions].sort((a, b) => sessionTime(b) - sessionTime(a)), [sessions])
 
+  const sessionsById = useMemo(() => new Map(sessions.map(s => [s.id, s])), [sessions])
   const workingSessionIdSet = useMemo(() => new Set(workingSessionIds), [workingSessionIds])
 
-  // Index sessions by both their live id and their lineage-root id so a pin
-  // stored as the pre-compression root resolves to the live continuation tip.
-  const sessionByAnyId = useMemo(() => {
-    const map = new Map<string, SessionInfo>()
+  const visiblePinnedIds = useMemo(
+    () => pinnedSessionIds.filter(id => sessionsById.has(id)),
+    [pinnedSessionIds, sessionsById]
+  )
 
-    for (const s of sessions) {
-      map.set(s.id, s)
+  const visiblePinnedIdSet = useMemo(() => new Set(visiblePinnedIds), [visiblePinnedIds])
 
-      if (s._lineage_root_id && !map.has(s._lineage_root_id)) {
-        map.set(s._lineage_root_id, s)
-      }
-    }
-
-    return map
-  }, [sessions])
-
-  const pinnedSessions = useMemo(() => {
-    const seen = new Set<string>()
-    const out: SessionInfo[] = []
-
-    for (const pinId of pinnedSessionIds) {
-      const session = sessionByAnyId.get(pinId)
-
-      if (session && !seen.has(session.id)) {
-        seen.add(session.id)
-        out.push(session)
-      }
-    }
-
-    return out
-  }, [pinnedSessionIds, sessionByAnyId])
-
-  const pinnedRealIdSet = useMemo(() => new Set(pinnedSessions.map(s => s.id)), [pinnedSessions])
-
-  // Full-text search across *all* sessions (not just the loaded page) so 699
-  // sessions stay findable. Debounced; loaded sessions are matched instantly
-  // client-side and merged ahead of the server hits.
-  useEffect(() => {
-    if (!trimmedQuery) {
-      setServerMatches([])
-
-      return
-    }
-
-    let cancelled = false
-
-    const id = window.setTimeout(() => {
-      void searchSessions(trimmedQuery)
-        .then(res => {
-          if (!cancelled) {
-            setServerMatches(res.results)
-          }
-        })
-        .catch(() => undefined)
-    }, 200)
-
-    return () => {
-      cancelled = true
-      window.clearTimeout(id)
-    }
-  }, [trimmedQuery])
-
-  const searchResults = useMemo(() => {
-    if (!trimmedQuery) {
-      return []
-    }
-
-    const needle = trimmedQuery.toLowerCase()
-    const out = new Map<string, SessionInfo>()
-
-    for (const s of sortedSessions) {
-      if (`${s.title ?? ''} ${s.preview ?? ''} ${s.cwd ?? ''}`.toLowerCase().includes(needle)) {
-        out.set(s.id, s)
-      }
-    }
-
-    for (const match of serverMatches) {
-      if (out.has(match.session_id)) {
-        continue
-      }
-
-      const loaded = sessionByAnyId.get(match.session_id)
-      out.set(match.session_id, loaded ?? searchResultToSession(match))
-    }
-
-    return [...out.values()]
-  }, [trimmedQuery, sortedSessions, serverMatches, sessionByAnyId])
+  const pinnedSessions = useMemo(
+    () => visiblePinnedIds.map(id => sessionsById.get(id)!).filter(Boolean),
+    [visiblePinnedIds, sessionsById]
+  )
 
   const unpinnedAgentSessions = useMemo(
-    () => sortedSessions.filter(s => !pinnedRealIdSet.has(s.id)),
-    [sortedSessions, pinnedRealIdSet]
+    () => sortedSessions.filter(s => !visiblePinnedIdSet.has(s.id)),
+    [sortedSessions, visiblePinnedIdSet]
   )
 
   const agentSessions = useMemo(
@@ -359,10 +227,7 @@ export function ChatSidebar({
       return
     }
 
-    // Sortable ids are live session ids; the pinned store is keyed by durable
-    // (lineage-root) ids, so translate before reordering.
-    const dragged = sessionByAnyId.get(String(active.id))
-    reorderPinnedSession(dragged ? sessionPinId(dragged) : String(active.id), newIndex)
+    reorderPinnedSession(String(active.id), newIndex)
   }
 
   const handleAgentDragEnd = ({ active, over }: DragEndEvent) => {
@@ -444,7 +309,7 @@ export function ChatSidebar({
                         <>
                           <span className="min-w-0 flex-1 truncate max-[46.25rem]:hidden">{item.label}</span>
                           {item.id === 'new-session' && (
-                            <KbdGroup className="ml-auto max-[46.25rem]:hidden" keys={[...NEW_SESSION_KBD]} />
+                            <KbdGroup className="ml-auto max-[46.25rem]:hidden" keys={['⇧', 'N']} />
                           )}
                         </>
                       )}
@@ -457,63 +322,12 @@ export function ChatSidebar({
         </SidebarGroup>
 
         {sidebarOpen && showSessionSections && (
-          <div className="shrink-0 pb-1 pt-1">
-            <div className="flex items-center gap-1.5 rounded-md border border-transparent bg-transparent px-2 transition-colors focus-within:border-(--ui-stroke-tertiary)">
-              <Codicon className="shrink-0 text-(--ui-text-tertiary)" name="search" size="0.75rem" />
-              <input
-                aria-label="Search sessions"
-                className="h-6 min-w-0 flex-1 bg-transparent text-[0.8125rem] text-foreground placeholder:text-(--ui-text-tertiary) focus:outline-none"
-                onChange={event => setSearchQuery(event.target.value)}
-                placeholder="Search sessions…"
-                type="text"
-                value={searchQuery}
-              />
-              {searchQuery && (
-                <button
-                  aria-label="Clear search"
-                  className="grid size-4 shrink-0 cursor-pointer place-items-center rounded-sm text-(--ui-text-tertiary) hover:bg-(--ui-control-active-background) hover:text-foreground"
-                  onClick={() => setSearchQuery('')}
-                  type="button"
-                >
-                  <Codicon name="close" size="0.75rem" />
-                </button>
-              )}
-            </div>
-          </div>
-        )}
-
-        {sidebarOpen && showSessionSections && trimmedQuery && (
-          <SidebarSessionsSection
-            activeSessionId={activeSidebarSessionId}
-            contentClassName="flex min-h-0 flex-1 flex-col gap-px overflow-y-auto overscroll-contain pb-1.75"
-            emptyState={
-              <div className="grid min-h-24 place-items-center rounded-lg px-2 text-center text-xs text-(--ui-text-tertiary)">
-                No sessions match “{trimmedQuery}”.
-              </div>
-            }
-            label="Results"
-            labelMeta={String(searchResults.length)}
-            onArchiveSession={onArchiveSession}
-            onDeleteSession={onDeleteSession}
-            onResumeSession={onResumeSession}
-            onToggle={() => undefined}
-            onTogglePin={pinSession}
-            open
-            pinned={false}
-            rootClassName="min-h-0 flex-1 p-0"
-            sessions={searchResults}
-            workingSessionIdSet={workingSessionIdSet}
-          />
-        )}
-
-        {sidebarOpen && showSessionSections && !trimmedQuery && (
           <SidebarSessionsSection
             activeSessionId={activeSidebarSessionId}
             contentClassName="flex min-h-10 shrink-0 flex-col gap-px rounded-lg pb-2 pt-1"
             dndSensors={dndSensors}
             emptyState={<SidebarPinnedEmptyState />}
             label="Pinned"
-            onArchiveSession={onArchiveSession}
             onDeleteSession={onDeleteSession}
             onReorder={handlePinnedDragEnd}
             onResumeSession={onResumeSession}
@@ -528,7 +342,7 @@ export function ChatSidebar({
           />
         )}
 
-        {sidebarOpen && showSessionSections && !trimmedQuery && (
+        {sidebarOpen && showSessionSections && (
           <SidebarSessionsSection
             activeSessionId={activeSidebarSessionId}
             contentClassName="flex min-h-0 flex-1 flex-col gap-px overflow-y-auto overscroll-contain pb-1.75"
@@ -546,34 +360,27 @@ export function ChatSidebar({
             forceEmptyState={showSessionSkeletons}
             groups={agentsGrouped ? agentGroups : undefined}
             headerAction={
-              // Grouping operates on unpinned recents; if everything is
-              // pinned the toggle does nothing visible, so hide it to avoid
-              // a phantom click target.
-              agentSessions.length > 0 ? (
-                <Button
-                  aria-label={agentsGrouped ? 'Show sessions as a single list' : 'Group sessions by workspace'}
-                  className={cn(
-                    'cursor-pointer text-(--ui-text-tertiary) opacity-70 hover:bg-(--ui-control-hover-background) hover:text-foreground hover:opacity-100 focus-visible:opacity-100',
-                    agentsGrouped && 'bg-(--ui-control-active-background) text-foreground opacity-100'
-                  )}
-                  onClick={event => {
-                    event.stopPropagation()
-                    setSidebarRecentsOpen(true)
-                    setSidebarAgentsGrouped(!agentsGrouped)
-                  }}
-                  size="icon-xs"
-                  title={agentsGrouped ? 'Ungroup sessions' : 'Group by workspace'}
-                  variant="ghost"
-                >
-                  <Codicon name={agentsGrouped ? 'list-unordered' : 'root-folder'} size="0.75rem" />
-                </Button>
-              ) : null
+              <Button
+                aria-label={agentsGrouped ? 'Show agents as a single list' : 'Group agents by workspace'}
+                className={cn(
+                  'cursor-pointer text-(--ui-text-tertiary) opacity-0 hover:bg-(--ui-control-hover-background) hover:text-foreground hover:opacity-100 focus-visible:opacity-100 group-hover/section:opacity-100',
+                  agentsGrouped && 'bg-(--ui-control-active-background) text-foreground opacity-100'
+                )}
+                onClick={event => {
+                  event.stopPropagation()
+                  setSidebarRecentsOpen(true)
+                  setSidebarAgentsGrouped(!agentsGrouped)
+                }}
+                size="icon-xs"
+                title={agentsGrouped ? 'Ungroup agents' : 'Group by workspace'}
+                variant="ghost"
+              >
+                <Codicon name={agentsGrouped ? 'list-unordered' : 'root-folder'} size="0.75rem" />
+              </Button>
             }
-            label="Sessions"
+            label="Agents"
             labelMeta={countLabel(agentSessions.length, knownSessionTotal)}
-            onArchiveSession={onArchiveSession}
             onDeleteSession={onDeleteSession}
-            onNewSessionInWorkspace={onNewSessionInWorkspace}
             onReorder={handleAgentDragEnd}
             onResumeSession={onResumeSession}
             onToggle={() => setSidebarRecentsOpen(!agentsOpen)}
@@ -644,7 +451,7 @@ function SidebarPinnedEmptyState() {
       <span className="grid w-3.5 shrink-0 place-items-center text-(--ui-text-quaternary)">
         <Codicon name="pin" size="0.75rem" />
       </span>
-      <span>Shift-click a chat to pin · drag to reorder</span>
+      <span>Shift click to pin a chat</span>
     </div>
   )
 }
@@ -665,9 +472,7 @@ interface SidebarSessionsSectionProps {
   workingSessionIdSet: Set<string>
   onResumeSession: (sessionId: string) => void
   onDeleteSession: (sessionId: string) => void
-  onArchiveSession: (sessionId: string) => void
   onTogglePin: (sessionId: string) => void
-  onNewSessionInWorkspace?: (path: null | string) => void
   pinned: boolean
   rootClassName?: string
   contentClassName?: string
@@ -691,9 +496,7 @@ function SidebarSessionsSection({
   workingSessionIdSet,
   onResumeSession,
   onDeleteSession,
-  onArchiveSession,
   onTogglePin,
-  onNewSessionInWorkspace,
   pinned,
   rootClassName,
   contentClassName,
@@ -715,9 +518,8 @@ function SidebarSessionsSection({
       isPinned: pinned,
       isSelected: session.id === activeSessionId,
       isWorking: workingSessionIdSet.has(session.id),
-      onArchive: () => onArchiveSession(session.id),
       onDelete: () => onDeleteSession(session.id),
-      onPin: () => onTogglePin(sessionPinId(session)),
+      onPin: () => onTogglePin(session.id),
       onResume: () => onResumeSession(session.id),
       session
     }
@@ -749,19 +551,9 @@ function SidebarSessionsSection({
   } else if (groups?.length) {
     const groupNodes = groups.map(group =>
       dndActive ? (
-        <SortableSidebarWorkspaceGroup
-          group={group}
-          key={group.id}
-          onNewSession={onNewSessionInWorkspace}
-          renderRows={renderSessionList}
-        />
+        <SortableSidebarWorkspaceGroup group={group} key={group.id} renderRows={renderSessionList} />
       ) : (
-        <SidebarWorkspaceGroup
-          group={group}
-          key={group.id}
-          onNewSession={onNewSessionInWorkspace}
-          renderRows={renderSessionList}
-        />
+        <SidebarWorkspaceGroup group={group} key={group.id} renderRows={renderSessionList} />
       )
     )
 
@@ -776,7 +568,6 @@ function SidebarSessionsSection({
     inner = (
       <VirtualSessionList
         activeSessionId={activeSessionId}
-        onArchiveSession={onArchiveSession}
         onDeleteSession={onDeleteSession}
         onResumeSession={onResumeSession}
         onTogglePin={onTogglePin}
@@ -819,7 +610,6 @@ function SidebarSessionsSection({
 interface SidebarWorkspaceGroupProps extends React.ComponentProps<'div'> {
   group: SidebarSessionGroup
   renderRows: (sessions: SessionInfo[]) => React.ReactNode
-  onNewSession?: (path: null | string) => void
   reorderable?: boolean
   dragging?: boolean
   dragHandleProps?: React.HTMLAttributes<HTMLElement>
@@ -828,7 +618,6 @@ interface SidebarWorkspaceGroupProps extends React.ComponentProps<'div'> {
 function SidebarWorkspaceGroup({
   group,
   renderRows,
-  onNewSession,
   reorderable = false,
   dragging = false,
   dragHandleProps,
@@ -845,31 +634,18 @@ function SidebarWorkspaceGroup({
 
   return (
     <div className={cn('grid gap-px', dragging && 'z-10 opacity-60', className)} ref={ref} style={style} {...rest}>
-      <div className="group/workspace flex min-h-6 items-center gap-1 px-2 pt-1 text-[0.6875rem] font-medium text-(--ui-text-tertiary)">
-        <button
-          className="flex min-w-0 cursor-pointer items-center gap-1 bg-transparent text-left hover:text-(--ui-text-secondary)"
-          onClick={() => setOpen(value => !value)}
-          title={group.path ?? undefined}
-          type="button"
-        >
-          <span className="truncate">{group.label}</span>
-          <SidebarCount>{group.sessions.length}</SidebarCount>
-          <DisclosureCaret
-            className="text-(--ui-text-tertiary) opacity-0 transition group-hover/workspace:opacity-100"
-            open={open}
-          />
-        </button>
-        {onNewSession && (
-          <button
-            aria-label={`New session in ${group.label}`}
-            className="grid size-4 shrink-0 cursor-pointer place-items-center rounded-sm bg-transparent text-(--ui-text-quaternary) opacity-0 transition-opacity hover:bg-(--ui-control-hover-background) hover:text-foreground group-hover/workspace:opacity-100"
-            onClick={() => onNewSession(group.path)}
-            title={`New session in ${group.label}`}
-            type="button"
-          >
-            <Codicon name="add" size="0.75rem" />
-          </button>
-        )}
+      <button
+        className="group/workspace flex min-h-6 cursor-pointer items-center gap-1 px-2 pt-1 text-left text-[0.6875rem] font-medium text-(--ui-text-tertiary) hover:text-(--ui-text-secondary)"
+        onClick={() => setOpen(value => !value)}
+        title={group.path ?? undefined}
+        type="button"
+      >
+        <span className="truncate">{group.label}</span>
+        <SidebarCount>{group.sessions.length}</SidebarCount>
+        <DisclosureCaret
+          className="text-(--ui-text-tertiary) opacity-0 transition group-hover/workspace:opacity-100"
+          open={open}
+        />
         {reorderable && (
           <span
             {...dragHandleProps}
@@ -887,7 +663,7 @@ function SidebarWorkspaceGroup({
             />
           </span>
         )}
-      </div>
+      </button>
       {open && (
         <>
           {renderRows(visibleSessions)}
@@ -911,7 +687,6 @@ function SidebarWorkspaceGroup({
 interface SortableWorkspaceProps {
   group: SidebarSessionGroup
   renderRows: (sessions: SessionInfo[]) => React.ReactNode
-  onNewSession?: (path: null | string) => void
 }
 
 function SortableSidebarWorkspaceGroup(props: SortableWorkspaceProps) {
@@ -927,7 +702,6 @@ interface SortableSessionRowProps {
   isPinned: boolean
   isSelected: boolean
   isWorking: boolean
-  onArchive: () => void
   onDelete: () => void
   onPin: () => void
   onResume: () => void

apps/desktop/src/app/chat/sidebar/session-actions-menu.tsx

@@ -26,7 +26,6 @@ interface SessionActions {
   title: string
   pinned?: boolean
   onPin?: () => void
-  onArchive?: () => void
   onDelete?: () => void
 }
 
@@ -41,7 +40,7 @@ interface ItemSpec {
   variant?: 'destructive'
 }
 
-function useSessionActions({ sessionId, title, pinned = false, onPin, onArchive, onDelete }: SessionActions) {
+function useSessionActions({ sessionId, title, pinned = false, onPin, onDelete }: SessionActions) {
   const [renameOpen, setRenameOpen] = useState(false)
 
   const items: ItemSpec[] = [
@@ -82,15 +81,6 @@ function useSessionActions({ sessionId, title, pinned = false, onPin, onArchive,
         setRenameOpen(true)
       }
     },
-    {
-      disabled: !onArchive,
-      icon: 'archive',
-      label: 'Archive',
-      onSelect: () => {
-        triggerHaptic('selection')
-        onArchive?.()
-      }
-    },
     {
       className: 'text-destructive focus:text-destructive',
       disabled: !onDelete,

apps/desktop/src/app/chat/sidebar/session-row.tsx

@@ -14,7 +14,6 @@ interface SidebarSessionRowProps extends React.ComponentProps<'div'> {
   isPinned: boolean
   isSelected: boolean
   isWorking: boolean
-  onArchive: () => void
   onDelete: () => void
   onPin: () => void
   onResume: () => void
@@ -46,7 +45,6 @@ export function SidebarSessionRow({
   isPinned,
   isSelected,
   isWorking,
-  onArchive,
   onDelete,
   onPin,
   onResume,
@@ -63,14 +61,7 @@ export function SidebarSessionRow({
   const handleLabel = `Reorder ${title}`
 
   return (
-    <SessionContextMenu
-      onArchive={onArchive}
-      onDelete={onDelete}
-      onPin={onPin}
-      pinned={isPinned}
-      sessionId={session.id}
-      title={title}
-    >
+    <SessionContextMenu onDelete={onDelete} onPin={onPin} pinned={isPinned} sessionId={session.id} title={title}>
       <div
         className={cn(
           'group relative grid min-h-[1.625rem] cursor-pointer grid-cols-[minmax(0,1fr)_1.375rem] items-center rounded-md transition-colors duration-100 ease-out hover:bg-(--ui-row-hover-background) hover:transition-none',
@@ -97,15 +88,6 @@ export function SidebarSessionRow({
               return
             }
 
-            if (event.metaKey || event.ctrlKey) {
-              event.preventDefault()
-              event.stopPropagation()
-              triggerHaptic('selection')
-              onArchive()
-
-              return
-            }
-
             onResume()
           }}
           type="button"
@@ -145,14 +127,7 @@ export function SidebarSessionRow({
               {age}
             </span>
           )}
-          <SessionActionsMenu
-            onArchive={onArchive}
-            onDelete={onDelete}
-            onPin={onPin}
-            pinned={isPinned}
-            sessionId={session.id}
-            title={title}
-          >
+          <SessionActionsMenu onDelete={onDelete} onPin={onPin} pinned={isPinned} sessionId={session.id} title={title}>
             <Button
               aria-label={`Actions for ${title}`}
               className="size-5 rounded-md bg-transparent text-transparent transition-colors duration-100 hover:bg-(--ui-control-active-background) hover:text-foreground focus-visible:bg-(--ui-control-active-background) focus-visible:text-foreground focus-visible:ring-0 data-[state=open]:bg-(--ui-control-active-background) data-[state=open]:text-foreground group-hover:text-(--ui-text-tertiary) [&_svg]:size-3.5!"

apps/desktop/src/app/chat/sidebar/virtual-session-list.tsx

@@ -5,7 +5,6 @@ import { type FC, useCallback, useMemo, useRef } from 'react'
 
 import type { SessionInfo } from '@/hermes'
 import { cn } from '@/lib/utils'
-import { sessionPinId } from '@/store/session'
 
 import { SidebarSessionRow } from './session-row'
 
@@ -13,7 +12,6 @@ interface SessionRowCommonProps {
   isPinned: boolean
   isSelected: boolean
   isWorking: boolean
-  onArchive: () => void
   onDelete: () => void
   onPin: () => void
   onResume: () => void
@@ -22,7 +20,6 @@ interface SessionRowCommonProps {
 interface VirtualSessionListProps {
   activeSessionId: null | string
   className?: string
-  onArchiveSession: (sessionId: string) => void
   onDeleteSession: (sessionId: string) => void
   onResumeSession: (sessionId: string) => void
   onTogglePin: (sessionId: string) => void
@@ -38,7 +35,6 @@ const OVERSCAN_ROWS = 12
 export const VirtualSessionList: FC<VirtualSessionListProps> = ({
   activeSessionId,
   className,
-  onArchiveSession,
   onDeleteSession,
   onResumeSession,
   onTogglePin,
@@ -76,9 +72,8 @@ export const VirtualSessionList: FC<VirtualSessionListProps> = ({
       isPinned: pinned,
       isSelected: session.id === activeSessionId,
       isWorking: workingSessionIdSet.has(session.id),
-      onArchive: () => onArchiveSession(session.id),
       onDelete: () => onDeleteSession(session.id),
-      onPin: () => onTogglePin(sessionPinId(session)),
+      onPin: () => onTogglePin(session.id),
       onResume: () => onResumeSession(session.id)
     }
 

apps/desktop/src/app/command-center/index.tsx

@@ -3,29 +3,37 @@ import {
   IconBookmark,
   IconBookmarkFilled,
   IconDownload,
+  IconLoader2,
   IconRefresh,
+  IconSparkles,
   IconTrash
 } from '@tabler/icons-react'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 
 import {
   getActionStatus,
+  getAuxiliaryModels,
+  getGlobalModelInfo,
+  getGlobalModelOptions,
   getLogs,
   getStatus,
   getUsageAnalytics,
   restartGateway,
   searchSessions,
+  setModelAssignment,
   updateHermes
 } from '@/hermes'
 import type {
   ActionStatusResponse,
   AnalyticsResponse,
+  AuxiliaryModelsResponse,
+  ModelOptionProvider,
   SessionInfo,
   SessionSearchResult as SessionSearchApiResult,
   StatusResponse
 } from '@/hermes'
 import { sessionTitle } from '@/lib/chat-runtime'
-import { Activity, AlertCircle, BarChart3, Pin } from '@/lib/icons'
+import { Activity, AlertCircle, BarChart3, Cpu, Pin } from '@/lib/icons'
 import { exportSession } from '@/lib/session-export'
 import { cn } from '@/lib/utils'
 import { upsertDesktopActionTask } from '@/store/activity'
@@ -39,9 +47,30 @@ import { OverlayMain, OverlayNavItem, OverlaySidebar, OverlaySplitLayout } from
 import { OverlayView } from '../overlays/overlay-view'
 import { ARTIFACTS_ROUTE, MESSAGING_ROUTE, NEW_CHAT_ROUTE, SETTINGS_ROUTE, SKILLS_ROUTE } from '../routes'
 
-export type CommandCenterSection = 'sessions' | 'system' | 'usage'
+export type CommandCenterSection = 'models' | 'sessions' | 'system' | 'usage'
 
-const SECTIONS = ['sessions', 'system', 'usage'] as const satisfies readonly CommandCenterSection[]
+const SECTIONS = ['sessions', 'system', 'models', 'usage'] as const satisfies readonly CommandCenterSection[]
+
+// Mirrors `_AUX_TASK_SLOTS` in hermes_cli/web_server.py. Friendly labels and
+// hints make the assignments panel readable; raw task keys (vision, mcp, …)
+// are opaque to most users.
+interface AuxTaskMeta {
+  hint: string
+  key: string
+  label: string
+}
+
+const AUX_TASKS: readonly AuxTaskMeta[] = [
+  { key: 'vision', label: 'Vision', hint: 'Image analysis' },
+  { key: 'web_extract', label: 'Web extract', hint: 'Page summarization' },
+  { key: 'compression', label: 'Compression', hint: 'Context compaction' },
+  { key: 'session_search', label: 'Session search', hint: 'Recall queries' },
+  { key: 'skills_hub', label: 'Skills hub', hint: 'Skill search' },
+  { key: 'approval', label: 'Approval', hint: 'Smart auto-approve' },
+  { key: 'mcp', label: 'MCP', hint: 'MCP tool routing' },
+  { key: 'title_generation', label: 'Title gen', hint: 'Session titles' },
+  { key: 'curator', label: 'Curator', hint: 'Skill-usage review' }
+]
 
 const USAGE_PERIODS = [7, 30, 90] as const
 type UsagePeriod = (typeof USAGE_PERIODS)[number]
@@ -50,6 +79,7 @@ interface CommandCenterViewProps {
   initialSection?: CommandCenterSection
   onClose: () => void
   onDeleteSession: (sessionId: string) => Promise<void>
+  onMainModelChanged?: (provider: string, model: string) => void
   onNavigateRoute: (path: string) => void
   onOpenSession: (sessionId: string) => void
 }
@@ -57,12 +87,14 @@ interface CommandCenterViewProps {
 const SECTION_LABELS: Record<CommandCenterSection, string> = {
   sessions: 'Sessions',
   system: 'System',
+  models: 'Models',
   usage: 'Usage'
 }
 
 const SECTION_DESCRIPTIONS: Record<CommandCenterSection, string> = {
   sessions: 'Search and manage sessions',
   system: 'Status, logs, and system actions',
+  models: 'Global and auxiliary model controls',
   usage: 'Token, cost, and skill activity over time'
 }
 
@@ -81,9 +113,9 @@ interface SectionSearchEntry {
 }
 
 const NAVIGATION_SEARCH_ENTRIES: readonly NavigationSearchEntry[] = [
-  { id: 'nav-new-chat', route: NEW_CHAT_ROUTE, title: 'New session', detail: 'Start a fresh session' },
+  { id: 'nav-new-chat', route: NEW_CHAT_ROUTE, title: 'New agent', detail: 'Start a fresh session' },
   { id: 'nav-settings', route: SETTINGS_ROUTE, title: 'Settings', detail: 'Configure Hermes desktop' },
-  { id: 'nav-skills', route: SKILLS_ROUTE, title: 'Skills & Tools', detail: 'Enable skills, toolsets, and providers' },
+  { id: 'nav-skills', route: SKILLS_ROUTE, title: 'Skills', detail: 'Enable and inspect skills' },
   {
     id: 'nav-messaging',
     route: MESSAGING_ROUTE,
@@ -96,6 +128,7 @@ const NAVIGATION_SEARCH_ENTRIES: readonly NavigationSearchEntry[] = [
 const SECTION_SEARCH_ENTRIES: readonly SectionSearchEntry[] = [
   { id: 'section-sessions', section: 'sessions', title: 'Sessions panel', detail: 'Search, pin, and manage sessions' },
   { id: 'section-system', section: 'system', title: 'System panel', detail: 'Gateway status, logs, restart/update' },
+  { id: 'section-models', section: 'models', title: 'Models panel', detail: 'Main and auxiliary model assignments' },
   { id: 'section-usage', section: 'usage', title: 'Usage panel', detail: 'Token, cost, and skill activity' }
 ]
 
@@ -183,6 +216,7 @@ export function CommandCenterView({
   initialSection,
   onClose,
   onDeleteSession,
+  onMainModelChanged,
   onNavigateRoute,
   onOpenSession
 }: CommandCenterViewProps) {
@@ -199,6 +233,16 @@ export function CommandCenterView({
   const [systemLoading, setSystemLoading] = useState(false)
   const [systemError, setSystemError] = useState('')
   const [systemAction, setSystemAction] = useState<ActionStatusResponse | null>(null)
+  const [modelsLoading, setModelsLoading] = useState(false)
+  const [modelsError, setModelsError] = useState('')
+  const [mainModel, setMainModel] = useState<{ model: string; provider: string } | null>(null)
+  const [providers, setProviders] = useState<ModelOptionProvider[]>([])
+  const [selectedProvider, setSelectedProvider] = useState('')
+  const [selectedModel, setSelectedModel] = useState('')
+  const [auxiliary, setAuxiliary] = useState<AuxiliaryModelsResponse | null>(null)
+  const [applyingModel, setApplyingModel] = useState(false)
+  const [editingAuxTask, setEditingAuxTask] = useState<null | string>(null)
+  const [auxDraft, setAuxDraft] = useState<{ model: string; provider: string }>({ model: '', provider: '' })
   const [usagePeriod, setUsagePeriod] = useState<UsagePeriod>(30)
   const [usage, setUsage] = useState<AnalyticsResponse | null>(null)
   const [usageLoading, setUsageLoading] = useState(false)
@@ -221,6 +265,11 @@ export function CommandCenterView({
     [sessions]
   )
 
+  const selectedProviderModels = useMemo(
+    () => providers.find(provider => provider.slug === selectedProvider)?.models ?? [],
+    [providers, selectedProvider]
+  )
+
   const searchProviders = useMemo<readonly CommandCenterSearchProvider[]>(
     () => [
       {
@@ -293,6 +342,29 @@ export function CommandCenterView({
     }
   }, [])
 
+  const refreshModels = useCallback(async () => {
+    setModelsLoading(true)
+    setModelsError('')
+
+    try {
+      const [modelInfo, modelOptions, auxiliaryModels] = await Promise.all([
+        getGlobalModelInfo(),
+        getGlobalModelOptions(),
+        getAuxiliaryModels()
+      ])
+
+      setMainModel({ model: modelInfo.model, provider: modelInfo.provider })
+      setProviders(modelOptions.providers || [])
+      setSelectedProvider(prev => prev || modelInfo.provider)
+      setSelectedModel(prev => prev || modelInfo.model)
+      setAuxiliary(auxiliaryModels)
+    } catch (error) {
+      setModelsError(error instanceof Error ? error.message : String(error))
+    } finally {
+      setModelsLoading(false)
+    }
+  }, [])
+
   const refreshUsage = useCallback(async (days: UsagePeriod) => {
     const requestId = usageRequestRef.current + 1
     usageRequestRef.current = requestId
@@ -358,12 +430,28 @@ export function CommandCenterView({
     }
   }, [refreshSystem, section, status, systemLoading])
 
+  useEffect(() => {
+    if (section === 'models' && !mainModel && !modelsLoading) {
+      void refreshModels()
+    }
+  }, [mainModel, modelsLoading, refreshModels, section])
+
   useEffect(() => {
     if (section === 'usage') {
       void refreshUsage(usagePeriod)
     }
   }, [refreshUsage, section, usagePeriod])
 
+  useEffect(() => {
+    if (!selectedProviderModels.length) {
+      return
+    }
+
+    if (!selectedProviderModels.includes(selectedModel)) {
+      setSelectedModel(selectedProviderModels[0])
+    }
+  }, [selectedModel, selectedProviderModels])
+
   const showGlobalSearchResults = debouncedQuery.length > 0
   const hasGlobalSearchResults = searchGroups.length > 0
   const sessionListHasResults = filteredSessions.length > 0
@@ -409,6 +497,128 @@ export function CommandCenterView({
     [refreshSystem]
   )
 
+  const applyMainModel = useCallback(async () => {
+    if (!selectedProvider || !selectedModel) {
+      return
+    }
+
+    setApplyingModel(true)
+    setModelsError('')
+
+    try {
+      const result = await setModelAssignment({
+        model: selectedModel,
+        provider: selectedProvider,
+        scope: 'main'
+      })
+
+      const provider = result.provider || selectedProvider
+      const model = result.model || selectedModel
+      setMainModel({ provider, model })
+      onMainModelChanged?.(provider, model)
+      await refreshModels()
+    } catch (error) {
+      setModelsError(error instanceof Error ? error.message : String(error))
+    } finally {
+      setApplyingModel(false)
+    }
+  }, [onMainModelChanged, refreshModels, selectedModel, selectedProvider])
+
+  const setAuxiliaryToMain = useCallback(
+    async (task: string) => {
+      if (!mainModel) {
+        return
+      }
+
+      setApplyingModel(true)
+      setModelsError('')
+
+      try {
+        await setModelAssignment({
+          model: mainModel.model,
+          provider: mainModel.provider,
+          scope: 'auxiliary',
+          task
+        })
+        await refreshModels()
+      } catch (error) {
+        setModelsError(error instanceof Error ? error.message : String(error))
+      } finally {
+        setApplyingModel(false)
+      }
+    },
+    [mainModel, refreshModels]
+  )
+
+  const applyAuxiliaryDraft = useCallback(
+    async (task: string) => {
+      if (!auxDraft.provider || !auxDraft.model) {
+        return
+      }
+
+      setApplyingModel(true)
+      setModelsError('')
+
+      try {
+        await setModelAssignment({
+          model: auxDraft.model,
+          provider: auxDraft.provider,
+          scope: 'auxiliary',
+          task
+        })
+        setEditingAuxTask(null)
+        await refreshModels()
+      } catch (error) {
+        setModelsError(error instanceof Error ? error.message : String(error))
+      } finally {
+        setApplyingModel(false)
+      }
+    },
+    [auxDraft, refreshModels]
+  )
+
+  const beginAuxiliaryEdit = useCallback(
+    (task: string) => {
+      const current = auxiliary?.tasks.find(entry => entry.task === task)
+
+      const initialProvider =
+        current?.provider && current.provider !== 'auto' ? current.provider : (mainModel?.provider ?? '')
+
+      const initialModel = current?.model || mainModel?.model || ''
+      setAuxDraft({ provider: initialProvider, model: initialModel })
+      setEditingAuxTask(task)
+    },
+    [auxiliary, mainModel]
+  )
+
+  const auxDraftProviderModels = useMemo(
+    () => providers.find(provider => provider.slug === auxDraft.provider)?.models ?? [],
+    [auxDraft.provider, providers]
+  )
+
+  const resetAuxiliaryModels = useCallback(async () => {
+    if (!mainModel) {
+      return
+    }
+
+    setApplyingModel(true)
+    setModelsError('')
+
+    try {
+      await setModelAssignment({
+        model: mainModel.model,
+        provider: mainModel.provider,
+        scope: 'auxiliary',
+        task: '__reset__'
+      })
+      await refreshModels()
+    } catch (error) {
+      setModelsError(error instanceof Error ? error.message : String(error))
+    } finally {
+      setApplyingModel(false)
+    }
+  }, [mainModel, refreshModels])
+
   const handleSearchSelect = useCallback(
     (result: CommandCenterSearchResult) => {
       if (result.kind === 'route') {
@@ -448,7 +658,7 @@ export function CommandCenterView({
           {SECTIONS.map(value => (
             <OverlayNavItem
               active={section === value}
-              icon={value === 'sessions' ? Pin : value === 'system' ? Activity : BarChart3}
+              icon={value === 'sessions' ? Pin : value === 'system' ? Activity : value === 'models' ? Cpu : BarChart3}
               key={value}
               label={SECTION_LABELS[value]}
               onClick={() => setSection(value)}
@@ -474,6 +684,12 @@ export function CommandCenterView({
                 {usageLoading ? 'Refreshing...' : 'Refresh'}
               </OverlayActionButton>
             )}
+            {section === 'models' && (
+              <OverlayActionButton disabled={modelsLoading} onClick={() => void refreshModels()}>
+                <IconRefresh className={cn('mr-1.5 size-3.5', modelsLoading && 'animate-spin')} />
+                {modelsLoading ? 'Refreshing...' : 'Refresh'}
+              </OverlayActionButton>
+            )}
           </header>
 
           {showGlobalSearchResults ? (
@@ -628,7 +844,7 @@ export function CommandCenterView({
               period={usagePeriod}
               usage={usage}
             />
-          ) : (
+          ) : section === 'system' ? (
             <div className="grid min-h-0 flex-1 grid-rows-[auto_minmax(0,1fr)] gap-3">
               <OverlayCard className="p-3 text-sm">
                 {status ? (
@@ -686,6 +902,154 @@ export function CommandCenterView({
                 </pre>
               </OverlayCard>
             </div>
+          ) : (
+            <div className="grid min-h-0 flex-1 grid-rows-[auto_auto_minmax(0,1fr)] gap-3">
+              <OverlayCard className="p-3">
+                {mainModel ? (
+                  <>
+                    <div className="text-sm font-medium text-foreground">Main model</div>
+                    <div className="text-xs text-muted-foreground">
+                      {mainModel.provider} / {mainModel.model}
+                    </div>
+                  </>
+                ) : (
+                  <div className="text-xs text-muted-foreground">Loading model state...</div>
+                )}
+              </OverlayCard>
+
+              <OverlayCard className="p-3">
+                <div className="mb-2 text-xs font-medium text-muted-foreground">Set global main model</div>
+                <div className="flex flex-wrap items-center gap-2">
+                  <select
+                    className="h-8 min-w-36 rounded-md border border-border bg-background px-2 text-xs text-foreground"
+                    onChange={event => setSelectedProvider(event.target.value)}
+                    value={selectedProvider}
+                  >
+                    {(providers.length ? providers : [{ name: '—', slug: '', models: [] }]).map(provider => (
+                      <option key={provider.slug || 'none'} value={provider.slug}>
+                        {provider.name}
+                      </option>
+                    ))}
+                  </select>
+                  <select
+                    className="h-8 min-w-58 rounded-md border border-border bg-background px-2 text-xs text-foreground"
+                    onChange={event => setSelectedModel(event.target.value)}
+                    value={selectedModel}
+                  >
+                    {(selectedProviderModels.length ? selectedProviderModels : ['']).map(model => (
+                      <option key={model || 'none'} value={model}>
+                        {model || 'No models available'}
+                      </option>
+                    ))}
+                  </select>
+                  <OverlayActionButton
+                    disabled={!selectedProvider || !selectedModel || applyingModel}
+                    onClick={() => void applyMainModel()}
+                  >
+                    {applyingModel ? (
+                      <IconLoader2 className="mr-1.5 size-3.5 animate-spin" />
+                    ) : (
+                      <IconSparkles className="mr-1.5 size-3.5" />
+                    )}
+                    {applyingModel ? 'Applying...' : 'Apply'}
+                  </OverlayActionButton>
+                </div>
+                {modelsError && <div className="mt-2 text-xs text-destructive">{modelsError}</div>}
+              </OverlayCard>
+
+              <OverlayCard className="min-h-0 overflow-auto p-2">
+                <div className="mb-2 flex items-center justify-between">
+                  <span className="text-xs font-medium text-muted-foreground">Auxiliary assignments</span>
+                  <OverlayActionButton
+                    disabled={!mainModel || applyingModel}
+                    onClick={() => void resetAuxiliaryModels()}
+                    tone="subtle"
+                  >
+                    Reset all
+                  </OverlayActionButton>
+                </div>
+                <div className="grid gap-1.5">
+                  {AUX_TASKS.map(meta => {
+                    const current = auxiliary?.tasks.find(entry => entry.task === meta.key)
+                    const isAuto = !current || !current.provider || current.provider === 'auto'
+                    const isEditing = editingAuxTask === meta.key
+
+                    return (
+                      <OverlayCard className="px-2 py-1.5" key={meta.key}>
+                        <div className="flex items-center gap-2">
+                          <div className="min-w-0 flex-1">
+                            <div className="flex items-baseline gap-2">
+                              <span className="text-xs font-medium text-foreground">{meta.label}</span>
+                              <span className="text-[0.62rem] text-muted-foreground/70">{meta.hint}</span>
+                            </div>
+                            <div className="truncate font-mono text-[0.62rem] text-muted-foreground">
+                              {isAuto
+                                ? 'auto · use main model'
+                                : `${current.provider} · ${current.model || '(provider default)'}`}
+                            </div>
+                          </div>
+                          {!isEditing && (
+                            <>
+                              <OverlayActionButton
+                                disabled={!mainModel || applyingModel}
+                                onClick={() => void setAuxiliaryToMain(meta.key)}
+                                tone="subtle"
+                              >
+                                Set to main
+                              </OverlayActionButton>
+                              <OverlayActionButton
+                                disabled={!providers.length || applyingModel}
+                                onClick={() => beginAuxiliaryEdit(meta.key)}
+                              >
+                                Change
+                              </OverlayActionButton>
+                            </>
+                          )}
+                        </div>
+
+                        {isEditing && (
+                          <div className="mt-2 flex flex-wrap items-center gap-2 border-t border-border/40 pt-2">
+                            <select
+                              className="h-7 min-w-28 rounded-md border border-border bg-background px-2 text-[0.7rem] text-foreground"
+                              onChange={event =>
+                                setAuxDraft(prev => ({ ...prev, provider: event.target.value, model: '' }))
+                              }
+                              value={auxDraft.provider}
+                            >
+                              {(providers.length ? providers : [{ name: '—', slug: '', models: [] }]).map(provider => (
+                                <option key={provider.slug || 'none'} value={provider.slug}>
+                                  {provider.name}
+                                </option>
+                              ))}
+                            </select>
+                            <select
+                              className="h-7 min-w-44 rounded-md border border-border bg-background px-2 text-[0.7rem] text-foreground"
+                              onChange={event => setAuxDraft(prev => ({ ...prev, model: event.target.value }))}
+                              value={auxDraft.model}
+                            >
+                              {(auxDraftProviderModels.length ? auxDraftProviderModels : ['']).map(model => (
+                                <option key={model || 'none'} value={model}>
+                                  {model || 'No models available'}
+                                </option>
+                              ))}
+                            </select>
+                            <OverlayActionButton
+                              disabled={!auxDraft.provider || !auxDraft.model || applyingModel}
+                              onClick={() => void applyAuxiliaryDraft(meta.key)}
+                            >
+                              {applyingModel ? 'Applying...' : 'Apply'}
+                            </OverlayActionButton>
+                            <OverlayActionButton onClick={() => setEditingAuxTask(null)} tone="subtle">
+                              Cancel
+                            </OverlayActionButton>
+                          </div>
+                        )}
+                      </OverlayCard>
+                    )
+                  })}
+                </div>
+              </OverlayCard>
+            </div>
           )}
         </OverlayMain>
       </OverlaySplitLayout>

apps/desktop/src/app/cron/index.tsx

@@ -428,6 +428,14 @@ export function CronView({ setStatusbarItemGroup: _setStatusbarItemGroup, ...pro
   return (
     <PageSearchShell
       {...props}
+      filters={
+        <div className="flex flex-wrap items-center justify-center gap-2">
+          <Button onClick={() => setEditor({ mode: 'create' })} size="sm">
+            <Codicon name="add" />
+            New cron
+          </Button>
+        </div>
+      }
       onSearchChange={setQuery}
       searchPlaceholder="Search cron jobs..."
       searchTrailingAction={
@@ -449,10 +457,6 @@ export function CronView({ setStatusbarItemGroup: _setStatusbarItemGroup, ...pro
       {!jobs ? (
         <PageLoader label="Loading cron jobs..." />
       ) : visibleJobs.length === 0 ? (
-        // Empty state owns the primary "create" CTA — we used to also have
-        // one in the filters bar but it was redundant. Only show the button
-        // when there are zero jobs total; the search-empty case ("No
-        // matches") just asks the user to broaden their query.
         <EmptyState
           actionLabel={totalCount === 0 ? 'Create first cron' : undefined}
           description={
@@ -465,19 +469,6 @@ export function CronView({ setStatusbarItemGroup: _setStatusbarItemGroup, ...pro
         />
       ) : (
         <div className="h-full overflow-y-auto px-4 py-3">
-          {/* Inline header replaces the old top-bar "New cron" button. We
-              still need a single, always-visible affordance to add a job
-              when the list is non-empty (rows themselves only expose
-              edit/pause/trigger/delete). */}
-          <div className="mb-2 flex items-center justify-between">
-            <span className="text-[0.7rem] uppercase tracking-wide text-muted-foreground">
-              {enabledCount}/{totalCount} active
-            </span>
-            <Button onClick={() => setEditor({ mode: 'create' })} size="sm">
-              <Codicon name="add" />
-              New cron
-            </Button>
-          </div>
           <div className="divide-y divide-border/40 rounded-lg border border-border/40 bg-background/70">
             {visibleJobs.map(job => (
               <CronJobRow
@@ -493,6 +484,8 @@ export function CronView({ setStatusbarItemGroup: _setStatusbarItemGroup, ...pro
           </div>
         </div>
       )}
+      <div className="hidden">{totalCount === 0 ? 'No scheduled jobs' : `${enabledCount}/${totalCount} active`}</div>
+
       <CronEditorDialog editor={editor} onClose={() => setEditor({ mode: 'closed' })} onSave={handleEditorSave} />
 
       <Dialog onOpenChange={open => !open && !deleting && setPendingDelete(null)} open={pendingDelete !== null}>

apps/desktop/src/app/desktop-controller.tsx

@@ -1,12 +1,11 @@
 import { useStore } from '@nanostores/react'
 import { useQueryClient } from '@tanstack/react-query'
-import { lazy, Suspense, useCallback, useEffect, useMemo, useRef } from 'react'
+import { lazy, Suspense, useCallback, useEffect, useRef } from 'react'
 import { Navigate, Route, Routes, useLocation, useNavigate, useParams } from 'react-router-dom'
 
 import { BootFailureOverlay } from '@/components/boot-failure-overlay'
 import { DesktopInstallOverlay } from '@/components/desktop-install-overlay'
 import { DesktopOnboardingOverlay } from '@/components/desktop-onboarding-overlay'
-import { GatewayConnectingOverlay } from '@/components/gateway-connecting-overlay'
 import { Pane, PaneMain } from '@/components/pane-shell'
 import { useSkinCommand } from '@/themes/use-skin-command'
 
@@ -32,12 +31,8 @@ import {
   $freshDraftReady,
   $gatewayState,
   $selectedStoredSessionId,
-  $sessions,
-  sessionPinId,
   setAwaitingResponse,
   setBusy,
-  setCurrentBranch,
-  setCurrentCwd,
   setCurrentModel,
   setCurrentProvider,
   setMessages,
@@ -59,11 +54,10 @@ import { ChatSidebar } from './chat/sidebar'
 import { useGatewayBoot } from './gateway/hooks/use-gateway-boot'
 import { useGatewayRequest } from './gateway/hooks/use-gateway-request'
 import { ModelPickerOverlay } from './model-picker-overlay'
-import { ModelVisibilityOverlay } from './model-visibility-overlay'
 import { RightSidebarPane } from './right-sidebar'
 import { $terminalTakeover } from './right-sidebar/store'
 import { PersistentTerminal, TerminalSlot } from './right-sidebar/terminal/persistent'
-import { NEW_CHAT_ROUTE, routeSessionId, sessionRoute, SETTINGS_ROUTE } from './routes'
+import { NEW_CHAT_ROUTE, routeSessionId, sessionRoute } from './routes'
 import { useContextSuggestions } from './session/hooks/use-context-suggestions'
 import { useCwdActions } from './session/hooks/use-cwd-actions'
 import { useHermesConfig } from './session/hooks/use-hermes-config'
@@ -78,7 +72,6 @@ import { AppShell } from './shell/app-shell'
 import { useOverlayRouting } from './shell/hooks/use-overlay-routing'
 import { useStatusSnapshot } from './shell/hooks/use-status-snapshot'
 import { useStatusbarItems } from './shell/hooks/use-statusbar-items'
-import { ModelMenuPanel } from './shell/model-menu-panel'
 import type { StatusbarItem } from './shell/statusbar-controls'
 import type { TitlebarTool } from './shell/titlebar-controls'
 import { useGroupRegistry } from './shell/use-group-registry'
@@ -129,7 +122,6 @@ export function DesktopController() {
     settingsOpen,
     toggleCommandCenter
   } = useOverlayRouting()
-
   const terminalTakeoverActive = chatOpen && terminalTakeover
 
   const titlebarToolGroups = useGroupRegistry<TitlebarTool>()
@@ -200,10 +192,7 @@ export function DesktopController() {
 
     try {
       const limit = $sessionsLimit.get()
-      // Require at least one message so abandoned/empty "Untitled" drafts (one
-      // was created per TUI/desktop launch before the lazy-create fix) don't
-      // clutter the sidebar.
-      const result = await listSessions(limit, 1)
+      const result = await listSessions(limit)
 
       if (refreshSessionsRequestRef.current === requestId) {
         setSessions(result.sessions)
@@ -228,14 +217,10 @@ export function DesktopController() {
       return
     }
 
-    // Pin on the durable lineage-root id so the pin survives auto-compression.
-    const session = $sessions.get().find(s => s.id === sessionId || s._lineage_root_id === sessionId)
-    const pinId = session ? sessionPinId(session) : sessionId
-
-    if ($pinnedSessionIds.get().includes(pinId)) {
-      unpinSession(pinId)
+    if ($pinnedSessionIds.get().includes(sessionId)) {
+      unpinSession(sessionId)
     } else {
-      pinSession(pinId)
+      pinSession(sessionId)
     }
   }, [])
 
@@ -276,22 +261,6 @@ export function DesktopController() {
     requestGateway
   })
 
-  const openProviderSettings = useCallback(() => {
-    navigate(`${SETTINGS_ROUTE}?tab=keys`)
-  }, [navigate])
-
-  const modelMenuContent = useMemo(
-    () =>
-      gatewayState === 'open' ? (
-        <ModelMenuPanel
-          gateway={gatewayRef.current || undefined}
-          onSelectModel={selectModel}
-          requestGateway={requestGateway}
-        />
-      ) : null,
-    [gatewayRef, gatewayState, requestGateway, selectModel]
-  )
-
   useContextSuggestions({
     activeSessionId,
     activeSessionIdRef,
@@ -355,7 +324,6 @@ export function DesktopController() {
   })
 
   const {
-    archiveSession,
     branchCurrentSession,
     createBackendSessionForSend,
     openSettings,
@@ -390,22 +358,14 @@ export function DesktopController() {
         target instanceof HTMLTextAreaElement ||
         target instanceof HTMLSelectElement
 
-      if (event.defaultPrevented || event.repeat || event.altKey || event.code !== 'KeyN') {
+      if (editing || event.defaultPrevented || event.repeat || event.altKey || event.ctrlKey || event.metaKey) {
         return
       }
 
-      // Two accelerators for "new session":
-      //   - Cmd/Ctrl+N (browser-like, works while typing in any input)
-      //   - Shift+N    (single-key, only when no input is focused)
-      const accelerator = event.metaKey || event.ctrlKey
-      const singleKey = !accelerator && !editing && event.shiftKey
-
-      if (!accelerator && !singleKey) {
-        return
+      if (event.shiftKey && event.code === 'KeyN') {
+        event.preventDefault()
+        startFreshSessionDraft()
       }
-
-      event.preventDefault()
-      startFreshSessionDraft()
     }
 
     window.addEventListener('keydown', onKeyDown)
@@ -432,29 +392,6 @@ export function DesktopController() {
     [branchCurrentSession, refreshSessions]
   )
 
-  const startSessionInWorkspace = useCallback(
-    (path: null | string) => {
-      startFreshSessionDraft()
-
-      const target = path?.trim()
-
-      if (!target) {
-        return
-      }
-
-      // The next message creates the backend session in $currentCwd, so seed
-      // it (and the branch) from the workspace the user clicked the + on.
-      setCurrentCwd(target)
-      void requestGateway<{ branch?: string; cwd?: string }>('config.get', { key: 'project', cwd: target })
-        .then(info => {
-          setCurrentCwd(info.cwd || target)
-          setCurrentBranch(info.branch || '')
-        })
-        .catch(() => undefined)
-    },
-    [requestGateway, startFreshSessionDraft]
-  )
-
   const handleSkinCommand = useSkinCommand()
 
   const { cancelRun, editMessage, handleThreadMessagesChange, reloadFromMessage, submitText, transcribeVoiceAudio } =
@@ -515,7 +452,6 @@ export function DesktopController() {
     gatewayLogLines,
     gatewayState,
     inferenceStatus,
-    modelMenuContent,
     openAgents,
     openCommandCenterSection,
     statusSnapshot,
@@ -525,11 +461,9 @@ export function DesktopController() {
   const sidebar = (
     <ChatSidebar
       currentView={currentView}
-      onArchiveSession={sessionId => void archiveSession(sessionId)}
       onDeleteSession={sessionId => void removeSession(sessionId)}
       onLoadMoreSessions={loadMoreSessions}
       onNavigate={selectSidebarItem}
-      onNewSessionInWorkspace={startSessionInWorkspace}
       onResumeSession={sessionId => navigate(sessionRoute(sessionId))}
     />
   )
@@ -550,9 +484,7 @@ export function DesktopController() {
         requestGateway={requestGateway}
       />
       <ModelPickerOverlay gateway={gatewayRef.current || undefined} onSelect={selectModel} />
-      <ModelVisibilityOverlay gateway={gatewayRef.current || undefined} onOpenProviders={openProviderSettings} />
       <UpdatesOverlay />
-      <GatewayConnectingOverlay />
       <BootFailureOverlay />
 
       {settingsOpen && (
@@ -565,13 +497,6 @@ export function DesktopController() {
               void refreshCurrentModel()
               void queryClient.invalidateQueries({ queryKey: ['model-options'] })
             }}
-            onMainModelChanged={(provider, model) => {
-              setCurrentProvider(provider)
-              setCurrentModel(model)
-              updateModelOptionsCache(provider, model, true)
-              void refreshCurrentModel()
-              void queryClient.invalidateQueries({ queryKey: ['model-options'] })
-            }}
           />
         </Suspense>
       )}
@@ -582,6 +507,13 @@ export function DesktopController() {
             initialSection={commandCenterInitialSection}
             onClose={closeOverlayToPreviousRoute}
             onDeleteSession={removeSession}
+            onMainModelChanged={(provider, model) => {
+              setCurrentProvider(provider)
+              setCurrentModel(model)
+              updateModelOptionsCache(provider, model, true)
+              void refreshCurrentModel()
+              void queryClient.invalidateQueries({ queryKey: ['model-options'] })
+            }}
             onNavigateRoute={path => navigate(path)}
             onOpenSession={sessionId => navigate(sessionRoute(sessionId))}
           />
@@ -643,10 +575,10 @@ export function DesktopController() {
       titlebarTools={titlebarToolGroups.flat.right}
     >
       <Pane
-        disabled={terminalTakeoverActive}
         id="chat-sidebar"
         maxWidth={SIDEBAR_MAX_WIDTH}
         minWidth={SIDEBAR_DEFAULT_WIDTH}
+        disabled={terminalTakeoverActive}
         resizable
         side="left"
         width={`${SIDEBAR_DEFAULT_WIDTH}px`}

apps/desktop/src/app/messaging/index.tsx

@@ -21,8 +21,6 @@ import { useRouteEnumParam } from '../hooks/use-route-enum-param'
 import { PageSearchShell } from '../page-search-shell'
 import type { SetStatusbarItemGroup } from '../shell/statusbar-controls'
 
-import { PlatformAvatar } from './platform-icon'
-
 interface MessagingViewProps extends React.ComponentProps<'section'> {
   setStatusbarItemGroup?: SetStatusbarItemGroup
 }
@@ -41,6 +39,29 @@ const STATE_LABELS: Record<string, string> = {
   startup_failed: 'Startup failed'
 }
 
+const PLATFORM_TINTS: Record<string, string> = {
+  telegram: 'bg-sky-500/15 text-sky-600 dark:text-sky-300',
+  discord: 'bg-indigo-500/15 text-indigo-600 dark:text-indigo-300',
+  slack: 'bg-violet-500/15 text-violet-600 dark:text-violet-300',
+  mattermost: 'bg-blue-500/15 text-blue-600 dark:text-blue-300',
+  matrix: 'bg-emerald-500/15 text-emerald-600 dark:text-emerald-300',
+  signal: 'bg-cyan-500/15 text-cyan-600 dark:text-cyan-300',
+  whatsapp: 'bg-green-500/15 text-green-600 dark:text-green-300',
+  bluebubbles: 'bg-blue-500/15 text-blue-600 dark:text-blue-300',
+  homeassistant: 'bg-teal-500/15 text-teal-600 dark:text-teal-300',
+  email: 'bg-amber-500/15 text-amber-600 dark:text-amber-300',
+  sms: 'bg-rose-500/15 text-rose-600 dark:text-rose-300',
+  dingtalk: 'bg-blue-500/15 text-blue-600 dark:text-blue-300',
+  feishu: 'bg-cyan-500/15 text-cyan-600 dark:text-cyan-300',
+  wecom: 'bg-emerald-500/15 text-emerald-600 dark:text-emerald-300',
+  wecom_callback: 'bg-emerald-500/15 text-emerald-600 dark:text-emerald-300',
+  weixin: 'bg-green-500/15 text-green-600 dark:text-green-300',
+  qqbot: 'bg-amber-500/15 text-amber-600 dark:text-amber-300',
+  yuanbao: 'bg-orange-500/15 text-orange-600 dark:text-orange-300',
+  api_server: 'bg-slate-500/15 text-slate-600 dark:text-slate-300',
+  webhook: 'bg-zinc-500/15 text-zinc-600 dark:text-zinc-300'
+}
+
 const PILL_TONE: Record<StatusTone, string> = {
   good: 'bg-primary/10 text-primary',
   muted: 'bg-muted text-muted-foreground',
@@ -421,6 +442,19 @@ function PlatformRow({
   )
 }
 
+function PlatformAvatar({ platformId, platformName }: { platformId: string; platformName: string }) {
+  return (
+    <span
+      className={cn(
+        'inline-flex size-6 shrink-0 items-center justify-center rounded-md text-[length:var(--conversation-caption-font-size)] font-medium',
+        PLATFORM_TINTS[platformId] || 'bg-(--ui-bg-tertiary) text-(--ui-text-tertiary)'
+      )}
+    >
+      {platformName.charAt(0).toUpperCase()}
+    </span>
+  )
+}
+
 function PlatformDetail({
   edits,
   onClear,

apps/desktop/src/app/messaging/platform-icon.tsx

@@ -1,97 +0,0 @@
-import type { ComponentType, SVGProps } from 'react'
-
-import {
-  SiApple,
-  SiBilibili,
-  SiDiscord,
-  SiGmail,
-  SiHomeassistant,
-  SiMatrix,
-  SiMattermost,
-  SiQq,
-  SiSignal,
-  SiTelegram,
-  SiWechat,
-  SiWhatsapp
-} from '@icons-pack/react-simple-icons'
-
-import { Globe, Link as LinkIcon, MessageSquareText } from '@/lib/icons'
-import { cn } from '@/lib/utils'
-
-// We render simpleicons.org brand glyphs for platforms whose owners publish a
-// usable mark (telegram, discord, matrix, ...). A few brands — Slack, Dingtalk,
-// Feishu, WeCom — have been removed from Simple Icons at the brand owner's
-// request, so we fall back to a colored letter monogram for those.
-//
-// `iconColor` is the brand's hex from simpleicons.org so we can paint each
-// glyph in its native color on top of a soft tint. The fallback monogram uses
-// the same hex to keep visual consistency.
-type IconKind = 'brand' | 'generic'
-
-interface PlatformIconSpec {
-  Icon: ComponentType<SVGProps<SVGSVGElement>>
-  color: string
-  kind: IconKind
-}
-
-const PLATFORM_ICONS: Record<string, PlatformIconSpec> = {
-  telegram: { Icon: SiTelegram, color: '#26A5E4', kind: 'brand' },
-  discord: { Icon: SiDiscord, color: '#5865F2', kind: 'brand' },
-  // Slack removed from Simple Icons by Salesforce request — letter monogram.
-  mattermost: { Icon: SiMattermost, color: '#0058CC', kind: 'brand' },
-  matrix: { Icon: SiMatrix, color: '#000000', kind: 'brand' },
-  signal: { Icon: SiSignal, color: '#3A76F0', kind: 'brand' },
-  whatsapp: { Icon: SiWhatsapp, color: '#25D366', kind: 'brand' },
-  bluebubbles: { Icon: SiApple, color: '#0BD318', kind: 'brand' },
-  homeassistant: { Icon: SiHomeassistant, color: '#18BCF2', kind: 'brand' },
-  email: { Icon: SiGmail, color: '#EA4335', kind: 'brand' },
-  sms: { Icon: MessageSquareText, color: '#F43F5E', kind: 'generic' },
-  webhook: { Icon: LinkIcon, color: '#71717A', kind: 'generic' },
-  api_server: { Icon: Globe, color: '#64748B', kind: 'generic' },
-  weixin: { Icon: SiWechat, color: '#07C160', kind: 'brand' },
-  qqbot: { Icon: SiQq, color: '#EB1923', kind: 'brand' },
-  yuanbao: { Icon: SiBilibili, color: '#FB7299', kind: 'brand' }
-}
-
-interface PlatformAvatarProps {
-  platformId: string
-  platformName: string
-  className?: string
-}
-
-export function PlatformAvatar({ className, platformId, platformName }: PlatformAvatarProps) {
-  const spec = PLATFORM_ICONS[platformId]
-
-  const baseClass = cn(
-    'inline-grid size-6 shrink-0 place-items-center rounded-md text-[length:var(--conversation-caption-font-size)] font-medium',
-    className
-  )
-
-  if (!spec) {
-    return (
-      <span
-        aria-hidden="true"
-        className={cn(baseClass, 'bg-(--ui-bg-tertiary) text-(--ui-text-tertiary)')}
-      >
-        {platformName.charAt(0).toUpperCase()}
-      </span>
-    )
-  }
-
-  const { Icon, color } = spec
-
-  return (
-    <span
-      aria-hidden="true"
-      className={baseClass}
-      style={{
-        // 16% tint of the brand color so the glyph reads against any surface
-        // without the avatar dominating the row.
-        backgroundColor: `color-mix(in srgb, ${color} 16%, transparent)`,
-        color
-      }}
-    >
-      <Icon className="size-3.5" />
-    </span>
-  )
-}

apps/desktop/src/app/model-visibility-overlay.tsx

@@ -1,31 +0,0 @@
-import { useStore } from '@nanostores/react'
-
-import { ModelVisibilityDialog } from '@/components/model-visibility-dialog'
-import type { HermesGateway } from '@/hermes'
-import { $modelVisibilityOpen, setModelVisibilityOpen } from '@/store/model-visibility'
-import { $activeSessionId, $gatewayState } from '@/store/session'
-
-interface ModelVisibilityOverlayProps {
-  gateway?: HermesGateway
-  onOpenProviders: () => void
-}
-
-export function ModelVisibilityOverlay({ gateway, onOpenProviders }: ModelVisibilityOverlayProps) {
-  const activeSessionId = useStore($activeSessionId)
-  const gatewayOpen = useStore($gatewayState) === 'open'
-  const open = useStore($modelVisibilityOpen)
-
-  if (!gatewayOpen) {
-    return null
-  }
-
-  return (
-    <ModelVisibilityDialog
-      gw={gateway}
-      onOpenChange={setModelVisibilityOpen}
-      onOpenProviders={onOpenProviders}
-      open={open}
-      sessionId={activeSessionId}
-    />
-  )
-}

apps/desktop/src/app/page-search-shell.tsx

@@ -28,16 +28,10 @@ export function PageSearchShell({
       {...props}
       className={cn('flex h-full min-w-0 flex-col overflow-hidden bg-(--ui-chat-surface-background)', className)}
     >
-      {/*
-        This header sits in the titlebar row, so it overlaps the OS window-drag
-        region painted by the shell. Without `-webkit-app-region: no-drag` on
-        the search row, mousedown on the input gets intercepted as a window-
-        drag start and the input never receives focus (visible as "I can't
-        click the search box" on the messaging/cron/etc pages).
-      */}
-      <div className="relative z-10 grid gap-2 border-b border-(--ui-stroke-tertiary) px-3 py-2.5 [-webkit-app-region:no-drag]">
+      <div className="relative z-10 grid gap-2 border-b border-(--ui-stroke-tertiary) px-3 py-2.5">
         {/* Reserve the top-right titlebar tools + native window-controls
-            footprint so the full-width search input never slides under them. */}
+            footprint so the full-width search input never slides under them
+            (this header sits in the titlebar row at the window top). */}
         <div
           style={{
             paddingRight:

apps/desktop/src/app/right-sidebar/files/tree.tsx

@@ -11,8 +11,6 @@ const ROW_HEIGHT = 22
 const INDENT = 10
 
 interface ProjectTreeProps {
-  collapseNonce: number
-  cwd: string
   data: TreeNode[]
   onActivateFile: (path: string) => void
   onActivateFolder: (path: string) => void
@@ -23,8 +21,6 @@ interface ProjectTreeProps {
 }
 
 export function ProjectTree({
-  collapseNonce,
-  cwd,
   data,
   onActivateFile,
   onActivateFolder,
@@ -67,7 +63,7 @@ export function ProjectTree({
 
       onNodeOpenChange(id, node.isOpen)
 
-      if (node.isOpen && node.data?.isDirectory && node.data.children === undefined) {
+      if (node.isOpen && node.data.children === undefined) {
         void onLoadChildren(id)
       }
     },
@@ -76,7 +72,7 @@ export function ProjectTree({
 
   const handleActivate = useCallback(
     (node: NodeApi<TreeNode>) => {
-      if (node.data && !node.data.isDirectory) {
+      if (!node.data.isDirectory) {
         onPreviewFile?.(node.data.id)
       }
     },
@@ -87,7 +83,7 @@ export function ProjectTree({
     <div className="min-h-0 flex-1 overflow-hidden" ref={containerRef}>
       {size.height > 0 && size.width > 0 ? (
         <Tree<TreeNode>
-          childrenAccessor={node => (node?.isDirectory ? (node.children ?? []) : null)}
+          childrenAccessor={node => (node.isDirectory ? (node.children ?? []) : null)}
           data={data}
           disableDrag
           disableDrop
@@ -95,7 +91,6 @@ export function ProjectTree({
           height={size.height}
           indent={INDENT}
           initialOpenState={openState}
-          key={`${cwd}:${collapseNonce}`}
           onActivate={handleActivate}
           onToggle={handleToggle}
           openByDefault={false}
@@ -140,10 +135,6 @@ function ProjectTreeRow({
   onAttachFolder: (path: string) => void
   onPreviewFile?: (path: string) => void
 }) {
-  if (!node.data) {
-    return <div style={style} />
-  }
-
   const isFolder = node.data.isDirectory
   const isPlaceholder = node.data.id.endsWith('::__loading__')
 

apps/desktop/src/app/right-sidebar/files/use-project-tree.ts

@@ -47,20 +47,16 @@ function placeholderChild(parentId: string): TreeNode {
 }
 
 export interface UseProjectTreeResult {
-  /** Bumped by collapseAll so callers can remount the tree fully collapsed. */
-  collapseNonce: number
   data: TreeNode[]
   openState: Record<string, boolean>
   rootError: string | null
   rootLoading: boolean
-  collapseAll: () => void
   loadChildren: (id: string) => Promise<void>
   refreshRoot: () => Promise<void>
   setNodeOpen: (id: string, open: boolean) => void
 }
 
 interface ProjectTreeState {
-  collapseNonce: number
   cwd: string
   data: TreeNode[]
   loaded: boolean
@@ -71,7 +67,6 @@ interface ProjectTreeState {
 }
 
 const initialState: ProjectTreeState = {
-  collapseNonce: 0,
   cwd: '',
   data: [],
   loaded: false,
@@ -117,7 +112,6 @@ async function loadRoot(cwd: string, { force = false }: { force?: boolean } = {}
   }
 
   $projectTree.set({
-    collapseNonce: current.collapseNonce,
     cwd,
     data: [],
     loaded: false,
@@ -180,19 +174,6 @@ export function useProjectTree(cwd: string): UseProjectTreeResult {
     [cwd]
   )
 
-  // Clears the recorded open state and bumps the nonce; the tree is keyed on
-  // the nonce so it remounts with everything collapsed (loaded children stay
-  // cached in `data`, just hidden).
-  const collapseAll = useCallback(() => {
-    setProjectTree(current => {
-      if (current.cwd !== cwd) {
-        return current
-      }
-
-      return { ...current, collapseNonce: current.collapseNonce + 1, openState: {} }
-    })
-  }, [cwd])
-
   const loadChildren = useCallback(
     async (id: string) => {
       if (!cwd || inflight.has(id)) {
@@ -241,8 +222,6 @@ export function useProjectTree(cwd: string): UseProjectTreeResult {
 
   return useMemo(
     () => ({
-      collapseAll,
-      collapseNonce: state.cwd === cwd ? state.collapseNonce : 0,
       data: state.cwd === cwd ? state.data : [],
       loadChildren,
       openState: state.cwd === cwd ? state.openState : {},
@@ -252,12 +231,10 @@ export function useProjectTree(cwd: string): UseProjectTreeResult {
       setNodeOpen
     }),
     [
-      collapseAll,
       cwd,
       loadChildren,
       refreshRoot,
       setNodeOpen,
-      state.collapseNonce,
       state.cwd,
       state.data,
       state.openState,

apps/desktop/src/app/right-sidebar/index.tsx

@@ -1,7 +1,6 @@
 import { useStore } from '@nanostores/react'
 import type { ReactNode } from 'react'
 
-import { ErrorBoundary } from '@/components/error-boundary'
 import { Button } from '@/components/ui/button'
 import { Codicon } from '@/components/ui/codicon'
 import { Loader } from '@/components/ui/loader'
@@ -53,10 +52,7 @@ export function RightSidebarPane({
         .pop() ?? currentCwd)
     : 'No folder selected'
 
-  const { collapseAll, collapseNonce, data, loadChildren, openState, refreshRoot, rootError, rootLoading, setNodeOpen } =
-    useProjectTree(currentCwd)
-
-  const canCollapse = Object.values(openState).some(Boolean)
+  const { data, loadChildren, openState, refreshRoot, rootError, rootLoading, setNodeOpen } = useProjectTree(currentCwd)
   const effectiveTab: RightSidebarTabId = terminalTakeover ? 'files' : activeTab
 
   const chooseFolder = async () => {
@@ -101,8 +97,6 @@ export function RightSidebarPane({
         <TerminalSlot />
       ) : (
         <FilesystemTab
-          canCollapse={canCollapse}
-          collapseNonce={collapseNonce}
           cwd={currentCwd}
           cwdName={cwdName}
           data={data}
@@ -112,7 +106,6 @@ export function RightSidebarPane({
           onActivateFile={onActivateFile}
           onActivateFolder={onActivateFolder}
           onChangeFolder={chooseFolder}
-          onCollapseAll={collapseAll}
           onLoadChildren={loadChildren}
           onNodeOpenChange={setNodeOpen}
           onPreviewFile={previewFile}
@@ -167,22 +160,13 @@ function RightSidebarChrome({
 }
 
 interface FilesystemTabProps extends FileTreeBodyProps {
-  canCollapse: boolean
   cwdName: string
   hasCwd: boolean
   onChangeFolder: () => Promise<void> | void
-  onCollapseAll: () => void
   onRefresh: () => void
 }
 
-const HEADER_ACTION_CLASS =
-  'size-6 shrink-0 rounded-md text-sidebar-foreground/70 transition-colors hover:bg-sidebar-accent! hover:text-sidebar-accent-foreground! focus-visible:ring-2 focus-visible:ring-sidebar-ring'
-
-const HEADER_ACTION_REVEAL_CLASS = `${HEADER_ACTION_CLASS} pointer-events-none opacity-0 transition-opacity focus-visible:opacity-100 group-focus-within/project-header:pointer-events-auto group-focus-within/project-header:opacity-100 group-hover/project-header:pointer-events-auto group-hover/project-header:opacity-100`
-
 function FilesystemTab({
-  canCollapse,
-  collapseNonce,
   cwd,
   cwdName,
   data,
@@ -192,7 +176,6 @@ function FilesystemTab({
   onActivateFile,
   onActivateFolder,
   onChangeFolder,
-  onCollapseAll,
   onLoadChildren,
   onNodeOpenChange,
   onPreviewFile,
@@ -205,35 +188,14 @@ function FilesystemTab({
         <button
           className="flex min-w-0 flex-1 items-center rounded-md text-left hover:text-(--ui-text-secondary)"
           onClick={() => void onChangeFolder()}
-          title={hasCwd ? `${cwd} — click to change folder` : 'Open a folder'}
+          title={hasCwd ? cwd : 'No folder selected'}
           type="button"
         >
           <SidebarPanelLabel>{cwdName}</SidebarPanelLabel>
         </button>
-        <Button
-          aria-label="Open folder"
-          className={HEADER_ACTION_CLASS}
-          onClick={() => void onChangeFolder()}
-          size="icon"
-          title={hasCwd ? 'Open a different folder' : 'Open a folder'}
-          variant="ghost"
-        >
-          <Codicon name="folder-opened" size="0.8125rem" />
-        </Button>
-        <Button
-          aria-label="Collapse all folders"
-          className={HEADER_ACTION_REVEAL_CLASS}
-          disabled={!hasCwd || !canCollapse}
-          onClick={onCollapseAll}
-          size="icon"
-          title="Collapse all folders"
-          variant="ghost"
-        >
-          <Codicon name="collapse-all" size="0.8125rem" />
-        </Button>
         <Button
           aria-label="Refresh tree"
-          className={HEADER_ACTION_REVEAL_CLASS}
+          className="pointer-events-none size-6 shrink-0 rounded-md text-sidebar-foreground/70 opacity-0 transition-opacity hover:bg-sidebar-accent! hover:text-sidebar-accent-foreground! focus-visible:opacity-100 focus-visible:ring-2 focus-visible:ring-sidebar-ring group-focus-within/project-header:pointer-events-auto group-focus-within/project-header:opacity-100 group-hover/project-header:pointer-events-auto group-hover/project-header:opacity-100"
           disabled={!hasCwd || loading}
           onClick={onRefresh}
           size="icon"
@@ -244,7 +206,6 @@ function FilesystemTab({
         </Button>
       </RightSidebarSectionHeader>
       <FileTreeBody
-        collapseNonce={collapseNonce}
         cwd={cwd}
         data={data}
         error={error}
@@ -265,7 +226,6 @@ export function RightSidebarSectionHeader({ children }: { children: ReactNode })
 }
 
 interface FileTreeBodyProps {
-  collapseNonce: number
   cwd: string
   data: ReturnType<typeof useProjectTree>['data']
   error: string | null
@@ -279,7 +239,6 @@ interface FileTreeBodyProps {
 }
 
 function FileTreeBody({
-  collapseNonce,
   cwd,
   data,
   error,
@@ -308,34 +267,15 @@ function FileTreeBody({
   }
 
   return (
-    <ErrorBoundary
-      fallback={({ reset }) => (
-        <div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-2 px-4 text-center">
-          <EmptyState body="The file tree hit an error rendering this folder." title="Tree error" />
-          <button
-            className="text-[0.68rem] font-medium text-muted-foreground transition hover:text-foreground"
-            onClick={reset}
-            type="button"
-          >
-            Try again
-          </button>
-        </div>
-      )}
-      key={cwd}
-      label="file-tree"
-    >
-      <ProjectTree
-        collapseNonce={collapseNonce}
-        cwd={cwd}
-        data={data}
-        onActivateFile={onActivateFile}
-        onActivateFolder={onActivateFolder}
-        onLoadChildren={onLoadChildren}
-        onNodeOpenChange={onNodeOpenChange}
-        onPreviewFile={onPreviewFile}
-        openState={openState}
-      />
-    </ErrorBoundary>
+    <ProjectTree
+      data={data}
+      onActivateFile={onActivateFile}
+      onActivateFolder={onActivateFolder}
+      onLoadChildren={onLoadChildren}
+      onNodeOpenChange={onNodeOpenChange}
+      onPreviewFile={onPreviewFile}
+      openState={openState}
+    />
   )
 }
 

apps/desktop/src/app/session/hooks/use-cwd-actions.ts

@@ -50,23 +50,16 @@ export function useCwdActions({
       }
 
       if (!activeSessionId) {
-        setCurrentCwd(trimmed)
-
         try {
           const info = await requestGateway<{ branch?: string; cwd?: string }>('config.get', {
             key: 'project',
             cwd: trimmed
           })
 
-          // Adopt the backend's normalized cwd so the persisted workspace and
-          // branch stay consistent with what the agent will use.
-          if (info.cwd) {
-            setCurrentCwd(info.cwd)
-          }
-
+          setCurrentCwd(info.cwd || trimmed)
           setCurrentBranch(info.branch || '')
-        } catch {
-          setCurrentBranch('')
+        } catch (err) {
+          notifyError(err, 'Working directory change failed')
         }
 
         return

apps/desktop/src/app/session/hooks/use-model-controls.ts

@@ -3,7 +3,7 @@ import { useCallback } from 'react'
 
 import { getGlobalModelInfo, setGlobalModel } from '@/hermes'
 import { notifyError } from '@/store/notifications'
-import { $currentModel, $currentProvider, setCurrentModel, setCurrentProvider } from '@/store/session'
+import { setCurrentModel, setCurrentProvider } from '@/store/session'
 import type { ModelOptionsResponse } from '@/types/hermes'
 
 interface ModelSelection {
@@ -48,53 +48,38 @@ export function useModelControls({ activeSessionId, queryClient, requestGateway
     }
   }, [])
 
-  // Returns whether the switch succeeded so callers can await it before
-  // applying follow-up changes (e.g. editing a model's reasoning/fast must land
-  // on the right active model — bail rather than write to the previous one).
   const selectModel = useCallback(
-    async (selection: ModelSelection): Promise<boolean> => {
-      const includeGlobal = selection.persistGlobal || !activeSessionId
-      // Snapshot for rollback: the switch is applied optimistically, so a
-      // failure must restore the prior model/provider (store + query cache)
-      // rather than leave the UI showing a model the backend never selected.
-      const prevModel = $currentModel.get()
-      const prevProvider = $currentProvider.get()
-
+    (selection: ModelSelection) => {
       setCurrentModel(selection.model)
       setCurrentProvider(selection.provider)
-      updateModelOptionsCache(selection.provider, selection.model, includeGlobal)
+      updateModelOptionsCache(selection.provider, selection.model, selection.persistGlobal || !activeSessionId)
 
-      try {
-        if (activeSessionId) {
-          await requestGateway('slash.exec', {
-            session_id: activeSessionId,
-            command: `/model ${selection.model} --provider ${selection.provider}${selection.persistGlobal ? ' --global' : ''}`
-          })
+      void (async () => {
+        try {
+          if (activeSessionId) {
+            await requestGateway('slash.exec', {
+              session_id: activeSessionId,
+              command: `/model ${selection.model} --provider ${selection.provider}${selection.persistGlobal ? ' --global' : ''}`
+            })
 
-          if (selection.persistGlobal) {
-            void refreshCurrentModel()
+            if (selection.persistGlobal) {
+              void refreshCurrentModel()
+            }
+
+            void queryClient.invalidateQueries({
+              queryKey: selection.persistGlobal ? ['model-options'] : ['model-options', activeSessionId]
+            })
+
+            return
           }
 
-          void queryClient.invalidateQueries({
-            queryKey: selection.persistGlobal ? ['model-options'] : ['model-options', activeSessionId]
-          })
-
-          return true
+          await setGlobalModel(selection.provider, selection.model)
+          void refreshCurrentModel()
+          void queryClient.invalidateQueries({ queryKey: ['model-options'] })
+        } catch (err) {
+          notifyError(err, 'Model switch failed')
         }
-
-        await setGlobalModel(selection.provider, selection.model)
-        void refreshCurrentModel()
-        void queryClient.invalidateQueries({ queryKey: ['model-options'] })
-
-        return true
-      } catch (err) {
-        setCurrentModel(prevModel)
-        setCurrentProvider(prevProvider)
-        updateModelOptionsCache(prevProvider, prevModel, includeGlobal)
-        notifyError(err, 'Model switch failed')
-
-        return false
-      }
+      })()
     },
     [activeSessionId, queryClient, refreshCurrentModel, requestGateway, updateModelOptionsCache]
   )

apps/desktop/src/app/session/hooks/use-session-actions.ts

@@ -2,7 +2,7 @@ import type { MutableRefObject } from 'react'
 import { useCallback, useRef } from 'react'
 import type { NavigateFunction } from 'react-router-dom'
 
-import { deleteSession, getSessionMessages, setSessionArchived } from '@/hermes'
+import { deleteSession, getSessionMessages } from '@/hermes'
 import { type ChatMessage, chatMessageText, preserveLocalAssistantErrors, toChatMessages } from '@/lib/chat-messages'
 import { normalizePersonalityValue } from '@/lib/chat-runtime'
 import { embeddedImageUrls, textWithoutEmbeddedImages } from '@/lib/embedded-images'
@@ -15,7 +15,6 @@ import {
   $currentCwd,
   $messages,
   $sessions,
-  getRememberedWorkspaceCwd,
   setActiveSessionId,
   setAwaitingResponse,
   setBusy,
@@ -33,7 +32,6 @@ import {
   setMessages,
   setSelectedStoredSessionId,
   setSessions,
-  setSessionsTotal,
   setSessionStartedAt,
   setTurnStartedAt
 } from '@/store/session'
@@ -293,8 +291,7 @@ export function useSessionActions({
       })
       setSessionStartedAt(null)
       setTurnStartedAt(null)
-      // New chats inherit the current workspace.
-      setCurrentCwd(getRememberedWorkspaceCwd())
+      setCurrentCwd('')
       setCurrentBranch('')
       clearComposerDraft()
       clearComposerAttachments()
@@ -311,7 +308,7 @@ export function useSessionActions({
     creatingSessionRef.current = true
 
     try {
-      const cwd = $currentCwd.get().trim() || getRememberedWorkspaceCwd()
+      const cwd = $currentCwd.get().trim()
       const created = await requestGateway<SessionCreateResponse>('session.create', { cols: 96, ...(cwd && { cwd }) })
       const stored = created.stored_session_id ?? null
 
@@ -690,9 +687,6 @@ export function useSessionActions({
       const previousPinned = $pinnedSessionIds.get()
 
       setSessions(prev => prev.filter(s => s.id !== storedSessionId))
-      // Keep $sessionsTotal in sync so the sidebar's "Load N more" footer
-      // doesn't keep claiming the removed row is still on the server.
-      setSessionsTotal(prev => Math.max(0, prev - 1))
       $pinnedSessionIds.set(previousPinned.filter(id => id !== storedSessionId))
 
       // Tear down before awaiting so the route effect can't resume the
@@ -715,7 +709,6 @@ export function useSessionActions({
       } catch (err) {
         if (removed) {
           setSessions(prev => [removed, ...prev])
-          setSessionsTotal(prev => prev + 1)
         }
 
         $pinnedSessionIds.set(previousPinned)
@@ -758,44 +751,7 @@ export function useSessionActions({
     ]
   )
 
-  const archiveSession = useCallback(
-    async (storedSessionId: string) => {
-      clearNotifications()
-
-      const archived = $sessions.get().find(s => s.id === storedSessionId)
-      const wasSelected = selectedStoredSessionId === storedSessionId
-      const previousPinned = $pinnedSessionIds.get()
-
-      // Soft-hide: drop from the sidebar immediately, keep the data.
-      setSessions(prev => prev.filter(s => s.id !== storedSessionId))
-      // Archived sessions are hidden by the listSessions(min_messages=1) query
-      // on the next refresh, so they count as "removed" for the load-more
-      // footer math.
-      setSessionsTotal(prev => Math.max(0, prev - 1))
-      $pinnedSessionIds.set(previousPinned.filter(id => id !== storedSessionId))
-
-      if (wasSelected) {
-        startFreshSessionDraft(true)
-      }
-
-      try {
-        await setSessionArchived(storedSessionId, true)
-        notify({ durationMs: 2_000, kind: 'success', message: 'Archived' })
-      } catch (err) {
-        if (archived) {
-          setSessions(prev => [archived, ...prev.filter(s => s.id !== storedSessionId)])
-          setSessionsTotal(prev => prev + 1)
-        }
-
-        $pinnedSessionIds.set(previousPinned)
-        notifyError(err, 'Archive failed')
-      }
-    },
-    [selectedStoredSessionId, startFreshSessionDraft]
-  )
-
   return {
-    archiveSession,
     branchCurrentSession,
     closeSettings,
     createBackendSessionForSend,

apps/desktop/src/app/session/hooks/use-session-state-cache.ts

@@ -4,7 +4,7 @@ import { type MutableRefObject, useCallback, useEffect, useRef } from 'react'
 import type { ChatMessage } from '@/lib/chat-messages'
 import { preserveLocalAssistantErrors } from '@/lib/chat-messages'
 import { createClientSessionState } from '@/lib/chat-runtime'
-import { $busy, $messages, noteSessionActivity, setSessionWorking } from '@/store/session'
+import { $busy, $messages, setSessionWorking } from '@/store/session'
 
 import type { ClientSessionState } from '../../types'
 
@@ -140,13 +140,6 @@ export function useSessionStateCache({
       }
 
       setSessionWorking(next.storedSessionId, next.busy)
-      // Every state update is effectively a "still alive" heartbeat for
-      // streaming events. The session-store watchdog uses this to keep the
-      // working flag alive during long-running turns and to clear it once
-      // the stream goes silent.
-      if (next.busy) {
-        noteSessionActivity(next.storedSessionId)
-      }
       syncSessionStateToView(sessionId, next)
 
       return next

apps/desktop/src/app/settings/about-settings.tsx

@@ -1,5 +1,5 @@
 import { useStore } from '@nanostores/react'
-import { useEffect, useState } from 'react'
+import { useState } from 'react'
 
 import { Button } from '@/components/ui/button'
 import { CheckCircle2, ExternalLink, Loader2, RefreshCw, Sparkles } from '@/lib/icons'
@@ -10,8 +10,7 @@ import {
   $updateChecking,
   $updateStatus,
   checkUpdates,
-  openUpdatesWindow,
-  refreshDesktopVersion
+  openUpdatesWindow
 } from '@/store/updates'
 
 import { ListRow, SectionHeading, SettingsContent } from './primitives'
@@ -47,14 +46,6 @@ export function AboutSettings() {
   const checking = useStore($updateChecking)
   const [justChecked, setJustChecked] = useState(false)
 
-  // The version atom is loaded once at app boot, which makes About show a
-  // stale number after a self-update (the running binary is current, the
-  // displayed string is not). Re-read on mount so opening About always
-  // reflects the running build.
-  useEffect(() => {
-    void refreshDesktopVersion()
-  }, [])
-
   const behind = status?.behind ?? 0
   const supported = status?.supported !== false
   const applying = apply.applying || apply.stage === 'restart'

apps/desktop/src/app/settings/config-settings.tsx

@@ -18,7 +18,6 @@ import type { ConfigFieldSchema, HermesConfigRecord } from '@/types/hermes'
 
 import { CONTROL_TEXT, EMPTY_SELECT_VALUE, FIELD_DESCRIPTIONS, FIELD_LABELS, SECTIONS } from './constants'
 import { enumOptionsFor, getNested, includesQuery, prettyName, setNested } from './helpers'
-import { ModelSettings } from './model-settings'
 import { EmptyState, ListRow, LoadingState, SettingsContent } from './primitives'
 import type { SearchProps } from './types'
 
@@ -168,12 +167,10 @@ export function ConfigSettings({
   query,
   activeSectionId,
   onConfigSaved,
-  onMainModelChanged,
   importInputRef
 }: SearchProps & {
   activeSectionId: string
   onConfigSaved?: () => void
-  onMainModelChanged?: (provider: string, model: string) => void
   importInputRef: React.RefObject<HTMLInputElement | null>
 }) {
   const [config, setConfig] = useState<HermesConfigRecord | null>(null)
@@ -325,11 +322,6 @@ export function ConfigSettings({
 
   return (
     <SettingsContent>
-      {activeSectionId === 'model' && !query.trim() && (
-        <div className="mb-6">
-          <ModelSettings onMainModelChanged={onMainModelChanged} />
-        </div>
-      )}
       {query.trim() && (
         <div className="mb-4 text-xs text-muted-foreground">
           {fields.length} result{fields.length === 1 ? '' : 's'}

apps/desktop/src/app/settings/constants.ts

@@ -141,7 +141,13 @@ export const FIELD_LABELS: Record<string, string> = {
   'delegation.max_iterations': 'Subagent Turn Limit',
   'delegation.max_concurrent_children': 'Parallel Subagents',
   'delegation.child_timeout_seconds': 'Subagent Timeout',
-  'delegation.reasoning_effort': 'Subagent Reasoning Effort'
+  'delegation.reasoning_effort': 'Subagent Reasoning Effort',
+  'auxiliary.vision.provider': 'Vision Provider',
+  'auxiliary.vision.model': 'Vision Model',
+  'auxiliary.compression.provider': 'Compression Provider',
+  'auxiliary.compression.model': 'Compression Model',
+  'auxiliary.title_generation.provider': 'Title Provider',
+  'auxiliary.title_generation.model': 'Title Model'
 }
 
 export const FIELD_DESCRIPTIONS: Record<string, string> = {
@@ -177,7 +183,7 @@ export const SECTIONS: DesktopConfigSection[] = [
     id: 'model',
     label: 'Model',
     icon: Sparkles,
-    keys: ['model_context_length', 'fallback_providers']
+    keys: ['model', 'model_context_length', 'fallback_providers']
   },
   {
     id: 'chat',
@@ -281,7 +287,13 @@ export const SECTIONS: DesktopConfigSection[] = [
       'delegation.max_iterations',
       'delegation.max_concurrent_children',
       'delegation.child_timeout_seconds',
-      'delegation.reasoning_effort'
+      'delegation.reasoning_effort',
+      'auxiliary.vision.provider',
+      'auxiliary.vision.model',
+      'auxiliary.compression.provider',
+      'auxiliary.compression.model',
+      'auxiliary.title_generation.provider',
+      'auxiliary.title_generation.model'
     ]
   }
 ]
@@ -299,11 +311,11 @@ export const MODE_OPTIONS: ModeOption[] = [
   { id: 'system', label: 'System', description: 'Follow OS appearance', icon: Monitor }
 ]
 
-export const SEARCH_PLACEHOLDER: Record<'about' | 'config' | 'gateway' | 'keys' | 'mcp' | 'sessions', string> = {
+export const SEARCH_PLACEHOLDER: Record<'about' | 'config' | 'gateway' | 'keys' | 'mcp' | 'tools', string> = {
   about: 'About Hermes Desktop',
   config: 'Search settings...',
   gateway: 'Gateway connection...',
   keys: 'Search API keys...',
   mcp: 'Search MCP servers...',
-  sessions: 'Search archived sessions...'
+  tools: 'Search skills and tools...'
 }

apps/desktop/src/app/settings/index.tsx

@@ -3,7 +3,7 @@ import { useEffect, useRef, useState } from 'react'
 
 import { getHermesConfigDefaults, getHermesConfigRecord, saveHermesConfig } from '@/hermes'
 import { triggerHaptic } from '@/lib/haptics'
-import { Archive, Globe, Info, KeyRound, Wrench } from '@/lib/icons'
+import { Globe, Info, KeyRound, Package, Wrench } from '@/lib/icons'
 import { notifyError } from '@/store/notifications'
 
 import { useRouteEnumParam } from '../hooks/use-route-enum-param'
@@ -19,7 +19,7 @@ import { SEARCH_PLACEHOLDER, SECTIONS } from './constants'
 import { GatewaySettings } from './gateway-settings'
 import { KeysSettings } from './keys-settings'
 import { McpSettings } from './mcp-settings'
-import { SessionsSettings } from './sessions-settings'
+import { ToolsSettings } from './tools-settings'
 import type { SettingsPageProps, SettingsQueryKey, SettingsView as SettingsViewId } from './types'
 
 const SETTINGS_VIEWS: readonly SettingsViewId[] = [
@@ -27,11 +27,11 @@ const SETTINGS_VIEWS: readonly SettingsViewId[] = [
   'gateway',
   'keys',
   'mcp',
-  'sessions',
+  'tools',
   'about'
 ]
 
-export function SettingsView({ gateway, onClose, onConfigSaved, onMainModelChanged }: SettingsPageProps) {
+export function SettingsView({ gateway, onClose, onConfigSaved }: SettingsPageProps) {
   const [activeView, setActiveView] = useRouteEnumParam('tab', SETTINGS_VIEWS, 'config:model' as SettingsViewId)
 
   const [queries, setQueries] = useState<Record<SettingsQueryKey, string>>({
@@ -40,7 +40,7 @@ export function SettingsView({ gateway, onClose, onConfigSaved, onMainModelChang
     gateway: '',
     keys: '',
     mcp: '',
-    sessions: ''
+    tools: ''
   })
 
   const searchInputRef = useRef<HTMLInputElement>(null)
@@ -137,18 +137,18 @@ export function SettingsView({ gateway, onClose, onConfigSaved, onMainModelChang
             label="API Keys"
             onClick={() => setActiveView('keys')}
           />
+          <OverlayNavItem
+            active={activeView === 'tools'}
+            icon={Package}
+            label="Skills & Tools"
+            onClick={() => setActiveView('tools')}
+          />
           <OverlayNavItem
             active={activeView === 'mcp'}
             icon={Wrench}
             label="MCP"
             onClick={() => setActiveView('mcp')}
           />
-          <OverlayNavItem
-            active={activeView === 'sessions'}
-            icon={Archive}
-            label="Archived Chats"
-            onClick={() => setActiveView('sessions')}
-          />
           <div className="my-2 h-px bg-border/30" />
           <OverlayNavItem
             active={activeView === 'about'}
@@ -194,7 +194,6 @@ export function SettingsView({ gateway, onClose, onConfigSaved, onMainModelChang
               activeSectionId={activeView.slice('config:'.length)}
               importInputRef={importInputRef}
               onConfigSaved={onConfigSaved}
-              onMainModelChanged={onMainModelChanged}
               query={queries.config}
             />
           ) : activeView === 'keys' ? (
@@ -202,7 +201,7 @@ export function SettingsView({ gateway, onClose, onConfigSaved, onMainModelChang
           ) : activeView === 'mcp' ? (
             <McpSettings gateway={gateway} onConfigSaved={onConfigSaved} query={queries.mcp} />
           ) : (
-            <SessionsSettings query={queries.sessions} />
+            <ToolsSettings query={queries.tools} />
           )}
         </OverlayMain>
       </OverlaySplitLayout>

apps/desktop/src/app/settings/keys-settings.tsx

@@ -22,6 +22,8 @@ import {
 import { LoadingState, Pill, SectionHeading, SettingsContent } from './primitives'
 import type { EnvPatch, EnvRowProps, ProviderGroup, SearchProps } from './types'
 
+const SHOW_ADVANCED_STORAGE_KEY = 'desktop.settings.keys.show_advanced'
+
 interface EnvActionsProps {
   varKey: string
   info: EnvVarInfo
@@ -184,11 +186,8 @@ function EnvProviderGroup({
   group: ProviderGroup
   rowProps: Omit<EnvRowProps, 'varKey' | 'info'>
 }) {
+  const [expanded, setExpanded] = useState(false)
   const setCount = group.entries.filter(([, info]) => info.is_set).length
-  // Default-expand providers that already have at least one key set; the
-  // user is much more likely to be coming back to edit those than to start
-  // configuring a fresh provider from scratch.
-  const [expanded, setExpanded] = useState(setCount > 0)
 
   return (
     <div className="overflow-hidden rounded-xl bg-background/60">
@@ -223,17 +222,27 @@ export function KeysSettings({ query }: SearchProps) {
   const [revealed, setRevealed] = useState<Record<string, string>>({})
   const [saving, setSaving] = useState<string | null>(null)
 
-  // We used to hide ~80% of rows behind a global "Show advanced" toggle, but
-  // everything in this view is configuration-level — "advanced" was a poor
-  // distinction. The full list is rendered now and provider groups
-  // default-collapsed-unless-set keep the surface manageable.
+  const [showAdvanced, setShowAdvanced] = useState<boolean>(() => {
+    try {
+      const stored = window.localStorage.getItem(SHOW_ADVANCED_STORAGE_KEY)
+
+      if (stored === null) {
+        return false
+      }
+
+      return stored === 'true'
+    } catch {
+      return false
+    }
+  })
+
   useEffect(() => {
     try {
-      window.localStorage.removeItem('desktop.settings.keys.show_advanced')
+      window.localStorage.setItem(SHOW_ADVANCED_STORAGE_KEY, showAdvanced ? 'true' : 'false')
     } catch {
-      // Ignore — old key cleanup is best-effort.
+      // Ignore persistence failures and keep in-memory preference.
     }
-  }, [])
+  }, [showAdvanced])
 
   useEffect(() => {
     let cancelled = false
@@ -253,21 +262,28 @@ export function KeysSettings({ query }: SearchProps) {
     return () => void (cancelled = true)
   }, [])
 
-  const filterEnv = useCallback((info: EnvVarInfo, key: string, q: string, cat: string, extra?: string) => {
-    if (asText(info.category) !== cat) {
-      return false
-    }
+  const filterEnv = useCallback(
+    (info: EnvVarInfo, key: string, q: string, cat: string, extra?: string) => {
+      if (asText(info.category) !== cat) {
+        return false
+      }
 
-    if (!q) {
-      return true
-    }
+      if (!showAdvanced && Boolean(info.advanced)) {
+        return false
+      }
 
-    return (
-      key.toLowerCase().includes(q) ||
-      includesQuery(info.description, q) ||
-      Boolean(extra && extra.toLowerCase().includes(q))
-    )
-  }, [])
+      if (!q) {
+        return true
+      }
+
+      return (
+        key.toLowerCase().includes(q) ||
+        includesQuery(info.description, q) ||
+        Boolean(extra && extra.toLowerCase().includes(q))
+      )
+    },
+    [showAdvanced]
+  )
 
   const providerGroups = useMemo<ProviderGroup[]>(() => {
     if (!vars) {
@@ -399,6 +415,12 @@ export function KeysSettings({ query }: SearchProps) {
 
   return (
     <SettingsContent>
+      <div className="mb-4 flex justify-end">
+        <Button onClick={() => setShowAdvanced(s => !s)} size="sm" variant="outline">
+          {showAdvanced ? 'Hide advanced' : 'Show advanced'}
+        </Button>
+      </div>
+
       <div className="mb-6">
         <SectionHeading
           icon={Zap}

apps/desktop/src/app/settings/model-settings.test.tsx

@@ -1,70 +0,0 @@
-import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const getGlobalModelInfo = vi.fn()
-const getGlobalModelOptions = vi.fn()
-const getAuxiliaryModels = vi.fn()
-const setModelAssignment = vi.fn()
-
-vi.mock('@/hermes', () => ({
-  getGlobalModelInfo: () => getGlobalModelInfo(),
-  getGlobalModelOptions: () => getGlobalModelOptions(),
-  getAuxiliaryModels: () => getAuxiliaryModels(),
-  setModelAssignment: (body: unknown) => setModelAssignment(body)
-}))
-
-beforeEach(() => {
-  getGlobalModelInfo.mockResolvedValue({ provider: 'nous', model: 'hermes-4' })
-  getGlobalModelOptions.mockResolvedValue({
-    providers: [{ name: 'Nous', slug: 'nous', models: ['hermes-4', 'hermes-4-mini'] }]
-  })
-  getAuxiliaryModels.mockResolvedValue({
-    main: { provider: 'nous', model: 'hermes-4' },
-    tasks: [{ task: 'vision', provider: 'auto', model: '', base_url: '' }]
-  })
-  setModelAssignment.mockResolvedValue({ provider: 'nous', model: 'hermes-4', gateway_tools: [] })
-})
-
-afterEach(() => {
-  cleanup()
-  vi.clearAllMocks()
-})
-
-async function renderModelSettings() {
-  const { ModelSettings } = await import('./model-settings')
-
-  return render(<ModelSettings />)
-}
-
-describe('ModelSettings', () => {
-  it('loads and shows the current main model', async () => {
-    await renderModelSettings()
-
-    await waitFor(() => expect(getGlobalModelInfo).toHaveBeenCalled())
-    expect(screen.getByText('nous / hermes-4')).toBeTruthy()
-  })
-
-  it('renders the auxiliary task rows', async () => {
-    await renderModelSettings()
-
-    expect(await screen.findByText('Vision')).toBeTruthy()
-    expect(screen.getAllByText('auto · use main model').length).toBeGreaterThan(0)
-  })
-
-  it('assigns an auxiliary task to the main model via setModelAssignment', async () => {
-    await renderModelSettings()
-
-    // One "Set to main" button per task slot; the first is Vision.
-    const setToMainButtons = await screen.findAllByRole('button', { name: 'Set to main' })
-    fireEvent.click(setToMainButtons[0])
-
-    await waitFor(() =>
-      expect(setModelAssignment).toHaveBeenCalledWith({
-        model: 'hermes-4',
-        provider: 'nous',
-        scope: 'auxiliary',
-        task: 'vision'
-      })
-    )
-  })
-})

apps/desktop/src/app/settings/model-settings.tsx

@@ -1,358 +0,0 @@
-import { useCallback, useEffect, useMemo, useState } from 'react'
-
-import { Button } from '@/components/ui/button'
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue
-} from '@/components/ui/select'
-import { getAuxiliaryModels, getGlobalModelInfo, getGlobalModelOptions, setModelAssignment } from '@/hermes'
-import type { AuxiliaryModelsResponse, ModelOptionProvider } from '@/hermes'
-import { Cpu, Loader2, Sparkles } from '@/lib/icons'
-import { cn } from '@/lib/utils'
-
-import { CONTROL_TEXT } from './constants'
-import { ListRow, LoadingState, Pill, SectionHeading } from './primitives'
-
-// Mirrors `_AUX_TASK_SLOTS` in hermes_cli/web_server.py. Friendly labels and
-// hints make the assignments readable; raw task keys (vision, mcp, …) are
-// opaque to most users.
-interface AuxTaskMeta {
-  hint: string
-  key: string
-  label: string
-}
-
-const AUX_TASKS: readonly AuxTaskMeta[] = [
-  { key: 'vision', label: 'Vision', hint: 'Image analysis' },
-  { key: 'web_extract', label: 'Web extract', hint: 'Page summarization' },
-  { key: 'compression', label: 'Compression', hint: 'Context compaction' },
-  { key: 'session_search', label: 'Session search', hint: 'Recall queries' },
-  { key: 'skills_hub', label: 'Skills hub', hint: 'Skill search' },
-  { key: 'approval', label: 'Approval', hint: 'Smart auto-approve' },
-  { key: 'mcp', label: 'MCP', hint: 'MCP tool routing' },
-  { key: 'title_generation', label: 'Title gen', hint: 'Session titles' },
-  { key: 'curator', label: 'Curator', hint: 'Skill-usage review' }
-]
-
-const NO_PROVIDERS: readonly ModelOptionProvider[] = [{ name: '—', slug: '', models: [] }]
-
-interface ModelSettingsProps {
-  /** Notified after the main model is applied, so live UI stores can sync. */
-  onMainModelChanged?: (provider: string, model: string) => void
-}
-
-export function ModelSettings({ onMainModelChanged }: ModelSettingsProps) {
-  const [loading, setLoading] = useState(true)
-  const [error, setError] = useState('')
-  const [mainModel, setMainModel] = useState<{ model: string; provider: string } | null>(null)
-  const [providers, setProviders] = useState<ModelOptionProvider[]>([])
-  const [selectedProvider, setSelectedProvider] = useState('')
-  const [selectedModel, setSelectedModel] = useState('')
-  const [auxiliary, setAuxiliary] = useState<AuxiliaryModelsResponse | null>(null)
-  const [applying, setApplying] = useState(false)
-  const [editingAuxTask, setEditingAuxTask] = useState<null | string>(null)
-  const [auxDraft, setAuxDraft] = useState<{ model: string; provider: string }>({ model: '', provider: '' })
-
-  const refresh = useCallback(async () => {
-    setLoading(true)
-    setError('')
-
-    try {
-      const [modelInfo, modelOptions, auxiliaryModels] = await Promise.all([
-        getGlobalModelInfo(),
-        getGlobalModelOptions(),
-        getAuxiliaryModels()
-      ])
-
-      setMainModel({ model: modelInfo.model, provider: modelInfo.provider })
-      setProviders(modelOptions.providers || [])
-      setSelectedProvider(prev => prev || modelInfo.provider)
-      setSelectedModel(prev => prev || modelInfo.model)
-      setAuxiliary(auxiliaryModels)
-    } catch (err) {
-      setError(err instanceof Error ? err.message : String(err))
-    } finally {
-      setLoading(false)
-    }
-  }, [])
-
-  useEffect(() => {
-    void refresh()
-  }, [refresh])
-
-  const providerOptions = providers.length ? providers : NO_PROVIDERS
-
-  const selectedProviderModels = useMemo(
-    () => providers.find(provider => provider.slug === selectedProvider)?.models ?? [],
-    [providers, selectedProvider]
-  )
-
-  const auxDraftProviderModels = useMemo(
-    () => providers.find(provider => provider.slug === auxDraft.provider)?.models ?? [],
-    [auxDraft.provider, providers]
-  )
-
-  const applyMainModel = useCallback(async () => {
-    if (!selectedProvider || !selectedModel) {
-      return
-    }
-
-    setApplying(true)
-    setError('')
-
-    try {
-      const result = await setModelAssignment({ model: selectedModel, provider: selectedProvider, scope: 'main' })
-      const provider = result.provider || selectedProvider
-      const model = result.model || selectedModel
-      setMainModel({ provider, model })
-      onMainModelChanged?.(provider, model)
-      await refresh()
-    } catch (err) {
-      setError(err instanceof Error ? err.message : String(err))
-    } finally {
-      setApplying(false)
-    }
-  }, [onMainModelChanged, refresh, selectedModel, selectedProvider])
-
-  const setAuxiliaryToMain = useCallback(
-    async (task: string) => {
-      if (!mainModel) {
-        return
-      }
-
-      setApplying(true)
-      setError('')
-
-      try {
-        await setModelAssignment({ model: mainModel.model, provider: mainModel.provider, scope: 'auxiliary', task })
-        await refresh()
-      } catch (err) {
-        setError(err instanceof Error ? err.message : String(err))
-      } finally {
-        setApplying(false)
-      }
-    },
-    [mainModel, refresh]
-  )
-
-  const applyAuxiliaryDraft = useCallback(
-    async (task: string) => {
-      if (!auxDraft.provider || !auxDraft.model) {
-        return
-      }
-
-      setApplying(true)
-      setError('')
-
-      try {
-        await setModelAssignment({ model: auxDraft.model, provider: auxDraft.provider, scope: 'auxiliary', task })
-        setEditingAuxTask(null)
-        await refresh()
-      } catch (err) {
-        setError(err instanceof Error ? err.message : String(err))
-      } finally {
-        setApplying(false)
-      }
-    },
-    [auxDraft, refresh]
-  )
-
-  const beginAuxiliaryEdit = useCallback(
-    (task: string) => {
-      const current = auxiliary?.tasks.find(entry => entry.task === task)
-
-      const initialProvider =
-        current?.provider && current.provider !== 'auto' ? current.provider : (mainModel?.provider ?? '')
-
-      const initialModel = current?.model || mainModel?.model || ''
-      setAuxDraft({ provider: initialProvider, model: initialModel })
-      setEditingAuxTask(task)
-    },
-    [auxiliary, mainModel]
-  )
-
-  const resetAuxiliaryModels = useCallback(async () => {
-    if (!mainModel) {
-      return
-    }
-
-    setApplying(true)
-    setError('')
-
-    try {
-      await setModelAssignment({
-        model: mainModel.model,
-        provider: mainModel.provider,
-        scope: 'auxiliary',
-        task: '__reset__'
-      })
-      await refresh()
-    } catch (err) {
-      setError(err instanceof Error ? err.message : String(err))
-    } finally {
-      setApplying(false)
-    }
-  }, [mainModel, refresh])
-
-  if (loading && !mainModel) {
-    return <LoadingState label="Loading model configuration..." />
-  }
-
-  return (
-    <div className="grid gap-6">
-      <section>
-        <SectionHeading
-          icon={Sparkles}
-          meta={mainModel ? `${mainModel.provider} / ${mainModel.model}` : undefined}
-          title="Main model"
-        />
-        <p className="mb-3 text-xs text-muted-foreground">
-          Applies to new sessions. Use the model picker in the composer to hot-swap the active chat.
-        </p>
-        <div className="flex flex-wrap items-center gap-2">
-          <Select onValueChange={setSelectedProvider} value={selectedProvider}>
-            <SelectTrigger className={cn('min-w-40', CONTROL_TEXT)}>
-              <SelectValue placeholder="Provider" />
-            </SelectTrigger>
-            <SelectContent>
-              {providerOptions.map(provider => (
-                <SelectItem key={provider.slug || 'none'} value={provider.slug || 'none'}>
-                  {provider.name}
-                </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-          <Select onValueChange={setSelectedModel} value={selectedModel}>
-            <SelectTrigger className={cn('min-w-60', CONTROL_TEXT)}>
-              <SelectValue placeholder="Model" />
-            </SelectTrigger>
-            <SelectContent>
-              {(selectedProviderModels.length ? selectedProviderModels : []).map(model => (
-                <SelectItem key={model} value={model}>
-                  {model}
-                </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-          <Button disabled={!selectedProvider || !selectedModel || applying} onClick={() => void applyMainModel()} size="sm">
-            {applying ? <Loader2 className="size-3.5 animate-spin" /> : <Sparkles className="size-3.5" />}
-            {applying ? 'Applying...' : 'Apply'}
-          </Button>
-        </div>
-        {error && <div className="mt-2 text-xs text-destructive">{error}</div>}
-      </section>
-
-      <section>
-        <div className="mb-2.5 flex items-center justify-between">
-          <SectionHeading icon={Cpu} title="Auxiliary models" />
-          <Button
-            disabled={!mainModel || applying}
-            onClick={() => void resetAuxiliaryModels()}
-            size="sm"
-            variant="outline"
-          >
-            Reset all to main
-          </Button>
-        </div>
-        <p className="mb-2 text-xs text-muted-foreground">
-          Helper tasks run on the main model by default. Assign a dedicated model to any task to override.
-        </p>
-        <div className="divide-y divide-border/40">
-          {AUX_TASKS.map(meta => {
-            const current = auxiliary?.tasks.find(entry => entry.task === meta.key)
-            const isAuto = !current || !current.provider || current.provider === 'auto'
-            const isEditing = editingAuxTask === meta.key
-
-            return (
-              <ListRow
-                action={
-                  !isEditing && (
-                    <div className="flex shrink-0 items-center gap-1.5">
-                      <Button
-                        disabled={!mainModel || applying}
-                        onClick={() => void setAuxiliaryToMain(meta.key)}
-                        size="sm"
-                        variant="ghost"
-                      >
-                        Set to main
-                      </Button>
-                      <Button
-                        disabled={!providers.length || applying}
-                        onClick={() => beginAuxiliaryEdit(meta.key)}
-                        size="sm"
-                        variant="outline"
-                      >
-                        Change
-                      </Button>
-                    </div>
-                  )
-                }
-                below={
-                  isEditing && (
-                    <div className="mt-2 flex flex-wrap items-center gap-2 border-t border-border/40 pt-2">
-                      <Select
-                        onValueChange={value => setAuxDraft(prev => ({ ...prev, provider: value, model: '' }))}
-                        value={auxDraft.provider}
-                      >
-                        <SelectTrigger className={cn('min-w-32', CONTROL_TEXT)}>
-                          <SelectValue placeholder="Provider" />
-                        </SelectTrigger>
-                        <SelectContent>
-                          {providerOptions.map(provider => (
-                            <SelectItem key={provider.slug || 'none'} value={provider.slug || 'none'}>
-                              {provider.name}
-                            </SelectItem>
-                          ))}
-                        </SelectContent>
-                      </Select>
-                      <Select
-                        onValueChange={value => setAuxDraft(prev => ({ ...prev, model: value }))}
-                        value={auxDraft.model}
-                      >
-                        <SelectTrigger className={cn('min-w-48', CONTROL_TEXT)}>
-                          <SelectValue placeholder="Model" />
-                        </SelectTrigger>
-                        <SelectContent>
-                          {(auxDraftProviderModels.length ? auxDraftProviderModels : []).map(model => (
-                            <SelectItem key={model} value={model}>
-                              {model}
-                            </SelectItem>
-                          ))}
-                        </SelectContent>
-                      </Select>
-                      <Button
-                        disabled={!auxDraft.provider || !auxDraft.model || applying}
-                        onClick={() => void applyAuxiliaryDraft(meta.key)}
-                        size="sm"
-                      >
-                        {applying ? 'Applying...' : 'Apply'}
-                      </Button>
-                      <Button onClick={() => setEditingAuxTask(null)} size="sm" variant="ghost">
-                        Cancel
-                      </Button>
-                    </div>
-                  )
-                }
-                description={
-                  <span className="font-mono text-[0.68rem]">
-                    {isAuto ? 'auto · use main model' : `${current.provider} · ${current.model || '(provider default)'}`}
-                  </span>
-                }
-                key={meta.key}
-                title={
-                  <span className="flex items-baseline gap-2">
-                    {meta.label}
-                    <Pill>{meta.hint}</Pill>
-                  </span>
-                }
-              />
-            )
-          })}
-        </div>
-      </section>
-    </div>
-  )
-}

apps/desktop/src/app/settings/sessions-settings.tsx

@@ -1,271 +0,0 @@
-import { useCallback, useEffect, useMemo, useState } from 'react'
-
-import { Button } from '@/components/ui/button'
-import { deleteSession, listSessions, setSessionArchived } from '@/hermes'
-import { sessionTitle } from '@/lib/chat-runtime'
-import { triggerHaptic } from '@/lib/haptics'
-import { Archive, ArchiveOff, FolderOpen, Loader2, Trash2 } from '@/lib/icons'
-import { notify, notifyError } from '@/store/notifications'
-import { setSessions } from '@/store/session'
-import type { SessionInfo } from '@/types/hermes'
-
-import { EmptyState, ListRow, LoadingState, SectionHeading, SettingsContent } from './primitives'
-import type { SearchProps } from './types'
-
-const ARCHIVED_FETCH_LIMIT = 200
-
-function workspaceLabel(cwd: null | string | undefined): string {
-  const path = cwd?.trim()
-
-  if (!path) {
-    return ''
-  }
-
-  return (
-    path
-      .replace(/[/\\]+$/, '')
-      .split(/[/\\]/)
-      .filter(Boolean)
-      .pop() ?? path
-  )
-}
-
-export function SessionsSettings({ query }: SearchProps) {
-  const [sessions, setLocalSessions] = useState<SessionInfo[]>([])
-  const [loading, setLoading] = useState(true)
-  const [busyId, setBusyId] = useState<string | null>(null)
-
-  const load = useCallback(async () => {
-    setLoading(true)
-
-    try {
-      const result = await listSessions(ARCHIVED_FETCH_LIMIT, 0, 'only')
-      setLocalSessions(result.sessions)
-    } catch (err) {
-      notifyError(err, 'Could not load archived sessions')
-    } finally {
-      setLoading(false)
-    }
-  }, [])
-
-  useEffect(() => {
-    void load()
-  }, [load])
-
-  const unarchive = useCallback(async (session: SessionInfo) => {
-    setBusyId(session.id)
-
-    try {
-      await setSessionArchived(session.id, false)
-      setLocalSessions(prev => prev.filter(s => s.id !== session.id))
-      // Surface it again in the sidebar without waiting for a full refresh.
-      setSessions(prev => [{ ...session, archived: false }, ...prev.filter(s => s.id !== session.id)])
-      triggerHaptic('selection')
-      notify({ durationMs: 2_000, kind: 'success', message: 'Restored' })
-    } catch (err) {
-      notifyError(err, 'Unarchive failed')
-    } finally {
-      setBusyId(null)
-    }
-  }, [])
-
-  const remove = useCallback(async (session: SessionInfo) => {
-    if (!window.confirm(`Permanently delete "${sessionTitle(session)}"? This cannot be undone.`)) {
-      return
-    }
-
-    setBusyId(session.id)
-
-    try {
-      await deleteSession(session.id)
-      setLocalSessions(prev => prev.filter(s => s.id !== session.id))
-      triggerHaptic('warning')
-    } catch (err) {
-      notifyError(err, 'Delete failed')
-    } finally {
-      setBusyId(null)
-    }
-  }, [])
-
-  const filtered = useMemo(() => {
-    const needle = query.trim().toLowerCase()
-
-    if (!needle) {
-      return sessions
-    }
-
-    return sessions.filter(session =>
-      [sessionTitle(session), session.preview ?? '', session.cwd ?? ''].join(' ').toLowerCase().includes(needle)
-    )
-  }, [query, sessions])
-
-  if (loading) {
-    return <LoadingState label="Loading archived sessions…" />
-  }
-
-  return (
-    <SettingsContent>
-      <DefaultProjectDirSetting />
-
-      <SectionHeading
-        icon={Archive}
-        meta={sessions.length ? String(sessions.length) : undefined}
-        title="Archived sessions"
-      />
-      <p className="mb-2 text-[length:var(--conversation-caption-font-size)] text-(--ui-text-tertiary)">
-        Archived chats are hidden from the sidebar but keep all their messages. Ctrl/⌘-click a chat in the sidebar to
-        archive it.
-      </p>
-
-      {filtered.length === 0 ? (
-        <EmptyState
-          description={query.trim() ? 'No archived chats match your search.' : 'Archive a chat to hide it here.'}
-          title="Nothing archived"
-        />
-      ) : (
-        <div className="divide-y divide-border/30">
-          {filtered.map(session => {
-            const label = workspaceLabel(session.cwd)
-            const busy = busyId === session.id
-
-            return (
-              <ListRow
-                action={
-                  <div className="flex items-center gap-1.5">
-                    <Button
-                      disabled={busy}
-                      onClick={() => void unarchive(session)}
-                      size="sm"
-                      type="button"
-                      variant="outline"
-                    >
-                      {busy ? <Loader2 className="size-3.5 animate-spin" /> : <ArchiveOff className="size-3.5" />}
-                      <span>Unarchive</span>
-                    </Button>
-                    <Button
-                      aria-label="Delete permanently"
-                      className="text-muted-foreground hover:text-destructive"
-                      disabled={busy}
-                      onClick={() => void remove(session)}
-                      size="icon"
-                      title="Delete permanently"
-                      type="button"
-                      variant="ghost"
-                    >
-                      <Trash2 className="size-3.5" />
-                    </Button>
-                  </div>
-                }
-                description={session.preview || undefined}
-                hint={label ? `${label} · ${session.message_count} messages` : `${session.message_count} messages`}
-                key={session.id}
-                title={sessionTitle(session)}
-              />
-            )
-          })}
-        </div>
-      )}
-    </SettingsContent>
-  )
-}
-
-// Lets the user pin the default cwd for new sessions. Without this, packaged
-// builds on Windows used to spawn sessions in the install dir (`win-unpacked`
-// / Program Files), which buried any files Hermes wrote there.
-function DefaultProjectDirSetting() {
-  const [dir, setDir] = useState<null | string>(null)
-  const [fallback, setFallback] = useState<string>('')
-  const [busy, setBusy] = useState(false)
-
-  useEffect(() => {
-    // The bridge is only present when running inside Electron. In a Vitest
-    // / Storybook / non-Electron context `window.hermesDesktop` is
-    // undefined, so guard the WHOLE call chain rather than chaining
-    // `?.settings.getDefaultProjectDir().then(...)` (the latter would
-    // short-circuit to `undefined.then(...)` and throw at runtime).
-    const settings = window.hermesDesktop?.settings
-
-    if (!settings) {
-      return
-    }
-
-    let alive = true
-
-    void settings.getDefaultProjectDir().then(result => {
-      if (!alive) return
-      setDir(result.dir)
-      setFallback(result.defaultLabel)
-    })
-
-    return () => {
-      alive = false
-    }
-  }, [])
-
-  const choose = useCallback(async () => {
-    const settings = window.hermesDesktop?.settings
-
-    if (!settings) return
-
-    setBusy(true)
-
-    try {
-      const picked = await settings.pickDefaultProjectDir()
-
-      if (picked.canceled || !picked.dir) {
-        return
-      }
-
-      const result = await settings.setDefaultProjectDir(picked.dir)
-      setDir(result.dir)
-      notify({ durationMs: 2_000, kind: 'success', message: 'Default project directory updated' })
-    } catch (err) {
-      notifyError(err, 'Could not update default directory')
-    } finally {
-      setBusy(false)
-    }
-  }, [])
-
-  const clear = useCallback(async () => {
-    const settings = window.hermesDesktop?.settings
-
-    if (!settings) return
-
-    setBusy(true)
-
-    try {
-      await settings.setDefaultProjectDir(null)
-      setDir(null)
-    } catch (err) {
-      notifyError(err, 'Could not clear default directory')
-    } finally {
-      setBusy(false)
-    }
-  }, [])
-
-  return (
-    <div className="mb-6">
-      <SectionHeading icon={FolderOpen} title="Default project directory" />
-      <p className="mb-2 text-[length:var(--conversation-caption-font-size)] text-(--ui-text-tertiary)">
-        New sessions start in this folder unless you pick another. Leave it unset to use your home directory.
-      </p>
-      <ListRow
-        action={
-          <div className="flex items-center gap-1.5">
-            <Button disabled={busy} onClick={() => void choose()} size="sm" type="button" variant="outline">
-              <FolderOpen className="size-3.5" />
-              <span>{dir ? 'Change' : 'Choose'}</span>
-            </Button>
-            {dir && (
-              <Button disabled={busy} onClick={() => void clear()} size="sm" type="button" variant="ghost">
-                Clear
-              </Button>
-            )}
-          </div>
-        }
-        description={dir || `Defaults to ${fallback || '~/hermes-projects'}.`}
-        title={dir ? dir : 'Not set'}
-      />
-    </div>
-  )
-}

apps/desktop/src/app/settings/tools-settings.test.tsx

@@ -1,24 +1,16 @@
 import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
-import { MemoryRouter } from 'react-router-dom'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 const getSkills = vi.fn()
 const getToolsets = vi.fn()
 const toggleSkill = vi.fn()
 const toggleToolset = vi.fn()
-const getToolsetConfig = vi.fn()
-const selectToolsetProvider = vi.fn()
 
 vi.mock('@/hermes', () => ({
   getSkills: () => getSkills(),
   getToolsets: () => getToolsets(),
   toggleSkill: (name: string, enabled: boolean) => toggleSkill(name, enabled),
-  toggleToolset: (name: string, enabled: boolean) => toggleToolset(name, enabled),
-  getToolsetConfig: (name: string) => getToolsetConfig(name),
-  selectToolsetProvider: (toolset: string, provider: string) => selectToolsetProvider(toolset, provider),
-  deleteEnvVar: vi.fn(),
-  revealEnvVar: vi.fn(),
-  setEnvVar: vi.fn()
+  toggleToolset: (name: string, enabled: boolean) => toggleToolset(name, enabled)
 }))
 
 // Notifications hit nanostores/timers we don't care about here.
@@ -40,21 +32,10 @@ function toolset(overrides: Record<string, unknown> = {}) {
   }
 }
 
-function renderSkills() {
-  return import('./index').then(({ SkillsView }) =>
-    render(
-      <MemoryRouter initialEntries={['/skills?tab=toolsets']}>
-        <SkillsView />
-      </MemoryRouter>
-    )
-  )
-}
-
 beforeEach(() => {
   getSkills.mockResolvedValue([])
   getToolsets.mockResolvedValue([toolset()])
   toggleToolset.mockResolvedValue({ ok: true, name: 'web', enabled: false })
-  getToolsetConfig.mockResolvedValue({ has_category: false, active_provider: null, providers: [] })
 })
 
 afterEach(() => {
@@ -62,9 +43,10 @@ afterEach(() => {
   vi.clearAllMocks()
 })
 
-describe('SkillsView toolset management', () => {
+describe('ToolsSettings toolset toggle', () => {
   it('renders a switch for each toolset and toggles it off', async () => {
-    await renderSkills()
+    const { ToolsSettings } = await import('./tools-settings')
+    render(<ToolsSettings query="" />)
 
     const sw = await screen.findByRole('switch', { name: 'Toggle Web Search toolset' })
     expect(sw.getAttribute('aria-checked')).toBe('true')
@@ -75,18 +57,10 @@ describe('SkillsView toolset management', () => {
   })
 
   it('keeps the configured pill alongside the switch', async () => {
-    await renderSkills()
+    const { ToolsSettings } = await import('./tools-settings')
+    render(<ToolsSettings query="" />)
 
     await screen.findByRole('switch', { name: 'Toggle Web Search toolset' })
     expect(screen.getByText('Configured')).toBeTruthy()
   })
-
-  it('expands the provider config panel when the configured pill is clicked', async () => {
-    await renderSkills()
-
-    const configureBtn = await screen.findByRole('button', { name: 'Configure Web Search' })
-    fireEvent.click(configureBtn)
-
-    await waitFor(() => expect(getToolsetConfig).toHaveBeenCalledWith('web'))
-  })
 })

apps/desktop/src/app/settings/tools-settings.tsx

@@ -0,0 +1,229 @@
+import { useCallback, useEffect, useMemo, useState } from 'react'
+
+import { Switch } from '@/components/ui/switch'
+import { getSkills, getToolsets, toggleSkill, toggleToolset } from '@/hermes'
+import { Brain, Wrench } from '@/lib/icons'
+import { notify, notifyError } from '@/store/notifications'
+import type { SkillInfo, ToolsetInfo } from '@/types/hermes'
+
+import { asText, includesQuery, prettyName, toolNames } from './helpers'
+import { ListRow, LoadingState, Pill, SectionHeading, SettingsContent } from './primitives'
+import { ToolsetConfigPanel } from './toolset-config-panel'
+import type { SearchProps } from './types'
+
+export function ToolsSettings({ query }: SearchProps) {
+  const [skills, setSkills] = useState<SkillInfo[] | null>(null)
+  const [toolsets, setToolsets] = useState<ToolsetInfo[] | null>(null)
+  const [savingSkill, setSavingSkill] = useState<string | null>(null)
+  const [savingToolset, setSavingToolset] = useState<string | null>(null)
+  const [expandedToolset, setExpandedToolset] = useState<string | null>(null)
+
+  useEffect(() => {
+    let cancelled = false
+    Promise.all([getSkills(), getToolsets()])
+      .then(([s, t]) => {
+        if (cancelled) {
+          return
+        }
+
+        setSkills(s)
+        setToolsets(t)
+      })
+      .catch(err => notifyError(err, 'Capabilities failed to load'))
+
+    return () => void (cancelled = true)
+  }, [])
+
+  const refreshToolsets = useCallback(() => {
+    getToolsets()
+      .then(setToolsets)
+      .catch(err => notifyError(err, 'Toolsets failed to refresh'))
+  }, [])
+
+  const filteredSkills = useMemo(() => {
+    if (!skills) {
+      return []
+    }
+
+    const q = query.trim().toLowerCase()
+
+    return skills
+      .filter(s => !q || includesQuery(s.name, q) || includesQuery(s.description, q) || includesQuery(s.category, q))
+      .sort(
+        (a, b) => asText(a.category).localeCompare(asText(b.category)) || asText(a.name).localeCompare(asText(b.name))
+      )
+  }, [query, skills])
+
+  const filteredToolsets = useMemo(() => {
+    if (!toolsets) {
+      return []
+    }
+
+    const q = query.trim().toLowerCase()
+
+    return toolsets
+      .filter(t => {
+        if (!q) {
+          return true
+        }
+
+        return (
+          includesQuery(t.name, q) ||
+          includesQuery(t.label, q) ||
+          includesQuery(t.description, q) ||
+          toolNames(t).some(n => includesQuery(n, q))
+        )
+      })
+      .sort((a, b) => asText(a.label || a.name).localeCompare(asText(b.label || b.name)))
+  }, [query, toolsets])
+
+  const skillGroups = useMemo(() => {
+    const groups = new Map<string, SkillInfo[]>()
+
+    for (const skill of filteredSkills) {
+      const cat = asText(skill.category) || 'other'
+      groups.set(cat, [...(groups.get(cat) ?? []), skill])
+    }
+
+    return Array.from(groups).sort(([a], [b]) => a.localeCompare(b))
+  }, [filteredSkills])
+
+  async function handleToggleSkill(skill: SkillInfo, enabled: boolean) {
+    setSavingSkill(skill.name)
+
+    try {
+      await toggleSkill(skill.name, enabled)
+      setSkills(c => c?.map(s => (s.name === skill.name ? { ...s, enabled } : s)) ?? c)
+      notify({
+        kind: 'success',
+        title: enabled ? 'Skill enabled' : 'Skill disabled',
+        message: `${skill.name} applies to new sessions.`
+      })
+    } catch (err) {
+      notifyError(err, `Failed to update ${skill.name}`)
+    } finally {
+      setSavingSkill(null)
+    }
+  }
+
+  async function handleToggleToolset(toolset: ToolsetInfo, enabled: boolean) {
+    setSavingToolset(toolset.name)
+
+    try {
+      await toggleToolset(toolset.name, enabled)
+      setToolsets(c => c?.map(t => (t.name === toolset.name ? { ...t, enabled, available: enabled } : t)) ?? c)
+      notify({
+        kind: 'success',
+        title: enabled ? 'Toolset enabled' : 'Toolset disabled',
+        message: `${asText(toolset.label || toolset.name)} applies to new sessions.`
+      })
+    } catch (err) {
+      notifyError(err, `Failed to update ${asText(toolset.label || toolset.name)}`)
+    } finally {
+      setSavingToolset(null)
+    }
+  }
+
+  if (!skills || !toolsets) {
+    return <LoadingState label="Loading skills and toolsets..." />
+  }
+
+  return (
+    <SettingsContent>
+      <div className="mb-6">
+        <SectionHeading icon={Brain} meta={`${filteredSkills.filter(s => s.enabled).length} enabled`} title="Skills" />
+        {skillGroups.map(([category, list]) => (
+          <div className="mt-4 first:mt-0" key={category}>
+            <div className="mb-1 text-[0.68rem] font-semibold uppercase tracking-[0.12em] text-muted-foreground">
+              {prettyName(category)}
+            </div>
+            <div className="divide-y divide-border/40">
+              {list.map(skill => (
+                <ListRow
+                  action={
+                    <Switch
+                      checked={skill.enabled}
+                      disabled={savingSkill === skill.name}
+                      onCheckedChange={c => void handleToggleSkill(skill, c)}
+                    />
+                  }
+                  description={asText(skill.description)}
+                  key={asText(skill.name)}
+                  title={asText(skill.name)}
+                />
+              ))}
+            </div>
+          </div>
+        ))}
+      </div>
+
+      <div className="mb-6">
+        <SectionHeading
+          icon={Wrench}
+          meta={`${filteredToolsets.filter(t => t.enabled).length} enabled`}
+          title="Toolsets"
+        />
+        <div className="divide-y divide-border/40">
+          {filteredToolsets.map(toolset => {
+            const tools = toolNames(toolset)
+            const label = asText(toolset.label || toolset.name)
+            const expanded = expandedToolset === toolset.name
+
+            return (
+              <ListRow
+                action={
+                  <div className="flex shrink-0 items-center gap-1.5">
+                    <button
+                      aria-expanded={expanded}
+                      aria-label={`Configure ${label}`}
+                      className="cursor-pointer rounded-full outline-none focus-visible:ring-2 focus-visible:ring-ring/50"
+                      onClick={() => setExpandedToolset(c => (c === toolset.name ? null : toolset.name))}
+                      type="button"
+                    >
+                      <Pill tone={toolset.configured ? 'primary' : 'muted'}>
+                        {toolset.configured ? 'Configured' : 'Needs keys'}
+                      </Pill>
+                    </button>
+                    <Switch
+                      aria-label={`Toggle ${label} toolset`}
+                      checked={toolset.enabled}
+                      disabled={savingToolset === toolset.name}
+                      onCheckedChange={c => void handleToggleToolset(toolset, c)}
+                    />
+                  </div>
+                }
+                below={
+                  <>
+                    {tools.length > 0 && (
+                      <div className="mt-3 flex flex-wrap gap-1">
+                        {tools.slice(0, 10).map(t => (
+                          <span
+                            className="rounded-md bg-muted px-1.5 py-0.5 font-mono text-[0.64rem] text-muted-foreground"
+                            key={t}
+                          >
+                            {t}
+                          </span>
+                        ))}
+                        {tools.length > 10 && (
+                          <span className="rounded-md bg-muted px-1.5 py-0.5 text-[0.64rem] text-muted-foreground">
+                            +{tools.length - 10} more
+                          </span>
+                        )}
+                      </div>
+                    )}
+                    {expanded && (
+                      <ToolsetConfigPanel onConfiguredChange={refreshToolsets} toolset={toolset.name} />
+                    )}
+                  </>
+                }
+                description={asText(toolset.description)}
+                key={asText(toolset.name) || label}
+                title={label}
+              />
+            )
+          })}
+        </div>
+      </div>
+    </SettingsContent>
+  )
+}

apps/desktop/src/app/settings/toolset-config-panel.test.tsx

@@ -26,7 +26,6 @@ function config(overrides: Partial<ToolsetConfig> = {}): ToolsetConfig {
   return {
     name: 'tts',
     has_category: true,
-    active_provider: null,
     providers: [
       {
         name: 'Microsoft Edge TTS',
@@ -34,8 +33,7 @@ function config(overrides: Partial<ToolsetConfig> = {}): ToolsetConfig {
         tag: 'No API key needed',
         env_vars: [],
         post_setup: null,
-        requires_nous_auth: false,
-        is_active: false
+        requires_nous_auth: false
       },
       {
         name: 'ElevenLabs',
@@ -45,8 +43,7 @@ function config(overrides: Partial<ToolsetConfig> = {}): ToolsetConfig {
           { key: 'ELEVENLABS_API_KEY', prompt: 'ElevenLabs API key', url: 'https://x', default: null, is_set: false }
         ],
         post_setup: null,
-        requires_nous_auth: false,
-        is_active: false
+        requires_nous_auth: false
       }
     ],
     ...overrides
@@ -102,54 +99,4 @@ describe('ToolsetConfigPanel', () => {
 
     await waitFor(() => expect(setEnvVar).toHaveBeenCalledWith('ELEVENLABS_API_KEY', 'sk-test-123'))
   })
-
-  it('expands the active provider on load, not just the first configured one', async () => {
-    // ElevenLabs is the active provider per config, even though the keyless
-    // Edge TTS provider sorts first and is also "configured". The panel must
-    // honor is_active and expand ElevenLabs (so its API-key field renders)
-    // rather than defaulting to the first keyless provider. Regression test
-    // for the GUI showing the wrong provider selected after relaunch.
-    getToolsetConfig.mockResolvedValue(
-      config({
-        active_provider: 'ElevenLabs',
-        providers: [
-          {
-            name: 'Microsoft Edge TTS',
-            badge: 'free',
-            tag: 'No API key needed',
-            env_vars: [],
-            post_setup: null,
-            requires_nous_auth: false,
-            is_active: false
-          },
-          {
-            name: 'ElevenLabs',
-            badge: 'paid',
-            tag: 'Most natural voices',
-            env_vars: [
-              {
-                key: 'ELEVENLABS_API_KEY',
-                prompt: 'ElevenLabs API key',
-                url: 'https://x',
-                default: null,
-                is_set: true
-              }
-            ],
-            post_setup: null,
-            requires_nous_auth: false,
-            is_active: true
-          }
-        ]
-      })
-    )
-
-    const { ToolsetConfigPanel } = await import('./toolset-config-panel')
-    render(<ToolsetConfigPanel onConfiguredChange={vi.fn()} toolset="tts" />)
-
-    // The active provider's env-var field only renders when it's the expanded
-    // one — so finding it proves ElevenLabs (not Edge TTS) was auto-expanded.
-    expect(await screen.findByText('ELEVENLABS_API_KEY')).toBeTruthy()
-    // No provider selection was triggered — this is purely reflecting state.
-    expect(selectToolsetProvider).not.toHaveBeenCalled()
-  })
 })

apps/desktop/src/app/settings/toolset-config-panel.tsx

@@ -195,23 +195,16 @@ export function ToolsetConfigPanel({ toolset, onConfiguredChange }: ToolsetConfi
 
   const providers = useMemo(() => cfg?.providers ?? [], [cfg])
 
-  // Default the expanded provider to the one actually active in config
-  // (`is_active` / `cfg.active_provider`, mirroring the CLI picker), then the
-  // first fully-configured provider, else the first provider. Without this the
-  // panel highlighted the first keyless provider (e.g. Nous Portal) even when
-  // the user had already selected another (e.g. DuckDuckGo).
+  // Default the expanded provider to the first one that is fully configured,
+  // else the first provider.
   useEffect(() => {
     if (activeProvider || providers.length === 0) {
       return
     }
 
-    const selected =
-      providers.find(p => p.is_active) ??
-      (cfg?.active_provider ? providers.find(p => p.name === cfg.active_provider) : undefined) ??
-      providers.find(p => providerConfigured(p, envState)) ??
-      providers[0]
-    setActiveProvider(selected.name)
-  }, [activeProvider, providers, envState, cfg])
+    const configured = providers.find(p => providerConfigured(p, envState))
+    setActiveProvider((configured ?? providers[0]).name)
+  }, [activeProvider, providers, envState])
 
   async function handleSelect(provider: ToolProvider) {
     setActiveProvider(provider.name)

apps/desktop/src/app/settings/types.ts

@@ -4,15 +4,14 @@ import type { HermesGateway } from '@/hermes'
 import type { IconComponent } from '@/lib/icons'
 import type { EnvVarInfo } from '@/types/hermes'
 
-export type SettingsView = 'about' | 'gateway' | 'keys' | 'mcp' | 'sessions' | `config:${string}`
-export type SettingsQueryKey = 'about' | 'config' | 'gateway' | 'keys' | 'mcp' | 'sessions'
+export type SettingsView = 'about' | 'gateway' | 'keys' | 'mcp' | 'tools' | `config:${string}`
+export type SettingsQueryKey = 'about' | 'config' | 'gateway' | 'keys' | 'mcp' | 'tools'
 export type EnvPatch = Partial<Pick<EnvVarInfo, 'is_set' | 'redacted_value'>>
 
 export interface SettingsPageProps {
   gateway?: HermesGateway | null
   onClose: () => void
   onConfigSaved?: () => void
-  onMainModelChanged?: (provider: string, model: string) => void
 }
 
 export interface SearchProps {

apps/desktop/src/app/shell/hooks/use-overlay-routing.ts

@@ -4,7 +4,7 @@ import { useLocation, useNavigate } from 'react-router-dom'
 import { type CommandCenterSection } from '@/app/command-center'
 import { AGENTS_ROUTE, appViewForPath, COMMAND_CENTER_ROUTE, NEW_CHAT_ROUTE } from '@/app/routes'
 
-const SECTIONS = ['sessions', 'system', 'usage'] as const
+const SECTIONS = ['models', 'sessions', 'system'] as const
 const OVERLAY_VIEWS = new Set(['settings', 'command-center', 'agents'])
 
 export function useOverlayRouting() {

apps/desktop/src/app/shell/hooks/use-statusbar-items.tsx

@@ -1,11 +1,9 @@
 import { useStore } from '@nanostores/react'
-import type { ReactNode } from 'react'
 import { useMemo } from 'react'
 
 import type { CommandCenterSection } from '@/app/command-center'
 import { GatewayMenuPanel } from '@/app/shell/gateway-menu-panel'
-import { Activity, AlertCircle, ChevronDown, Clock, Command, Hash, Loader2, Sparkles } from '@/lib/icons'
-import { formatModelStatusLabel } from '@/lib/model-status-label'
+import { Activity, AlertCircle, Clock, Command, Cpu, Hash, Loader2, Sparkles } from '@/lib/icons'
 import type { RuntimeReadinessResult } from '@/lib/runtime-readiness'
 import { contextBarLabel, LiveDuration, usageContextLabel } from '@/lib/statusbar'
 import { cn } from '@/lib/utils'
@@ -13,10 +11,8 @@ import { $desktopActionTasks } from '@/store/activity'
 import { $previewServerRestartStatus } from '@/store/preview'
 import {
   $busy,
-  $currentFastMode,
   $currentModel,
   $currentProvider,
-  $currentReasoningEffort,
   $currentUsage,
   $sessionStartedAt,
   $turnStartedAt,
@@ -38,7 +34,6 @@ interface StatusbarItemsOptions {
   gatewayLogLines: readonly string[]
   gatewayState: string
   inferenceStatus: RuntimeReadinessResult | null
-  modelMenuContent?: ReactNode
   openAgents: () => void
   openCommandCenterSection: (section: CommandCenterSection) => void
   statusSnapshot: StatusResponse | null
@@ -53,17 +48,14 @@ export function useStatusbarItems({
   gatewayLogLines,
   gatewayState,
   inferenceStatus,
-  modelMenuContent,
   openAgents,
   openCommandCenterSection,
   statusSnapshot,
   toggleCommandCenter
 }: StatusbarItemsOptions) {
   const busy = useStore($busy)
-  const currentFastMode = useStore($currentFastMode)
   const currentModel = useStore($currentModel)
   const currentProvider = useStore($currentProvider)
-  const currentReasoningEffort = useStore($currentReasoningEffort)
   const currentUsage = useStore($currentUsage)
   const desktopActionTasks = useStore($desktopActionTasks)
   const previewServerRestartStatus = useStore($previewServerRestartStatus)
@@ -277,51 +269,17 @@ export function useStatusbarItems({
         variant: 'text'
       },
       {
+        detail: currentProvider || '',
+        icon: <Cpu className="size-3" />,
         id: 'model-summary',
-        label: (
-          <span className="inline-flex min-w-0 items-center gap-0.5">
-            <span className="truncate">
-              {formatModelStatusLabel(currentModel, {
-                fastMode: currentFastMode,
-                reasoningEffort: currentReasoningEffort
-              })}
-            </span>
-            <ChevronDown className="size-2.5 shrink-0 opacity-50" />
-          </span>
-        ),
-        ...(modelMenuContent
-          ? {
-              menuAlign: 'end' as const,
-              menuClassName: 'w-64',
-              menuContent: modelMenuContent,
-              title: currentProvider
-                ? `Model · ${currentProvider}: ${currentModel || 'none'}`
-                : 'Switch model',
-              variant: 'menu' as const
-            }
-          : {
-              onSelect: () => setModelPickerOpen(true),
-              title: currentProvider
-                ? `${currentProvider} · ${currentModel || 'no model'}`
-                : 'Open model picker',
-              variant: 'action' as const
-            })
+        label: currentModel || 'No model selected',
+        onSelect: () => setModelPickerOpen(true),
+        title: currentProvider ? `Switch model · ${currentProvider}: ${currentModel || ''}` : 'Open model picker',
+        variant: 'action'
       },
       versionItem
     ],
-    [
-      busy,
-      contextBar,
-      contextUsage,
-      currentFastMode,
-      currentModel,
-      currentProvider,
-      currentReasoningEffort,
-      modelMenuContent,
-      sessionStartedAt,
-      turnStartedAt,
-      versionItem
-    ]
+    [busy, contextBar, contextUsage, currentModel, currentProvider, sessionStartedAt, turnStartedAt, versionItem]
   )
 
   const leftStatusbarItems = useMemo(

apps/desktop/src/app/shell/model-edit-submenu.tsx

@@ -1,248 +0,0 @@
-import { useStore } from '@nanostores/react'
-
-import {
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuRadioGroup,
-  DropdownMenuRadioItem,
-  dropdownMenuRow,
-  dropdownMenuSectionLabel,
-  DropdownMenuSeparator,
-  DropdownMenuSubContent
-} from '@/components/ui/dropdown-menu'
-import { Switch } from '@/components/ui/switch'
-import { cn } from '@/lib/utils'
-import { notifyError } from '@/store/notifications'
-import {
-  $activeSessionId,
-  $currentReasoningEffort,
-  setCurrentFastMode,
-  setCurrentReasoningEffort
-} from '@/store/session'
-
-// Hermes' real reasoning levels (see VALID_REASONING_EFFORTS); `none` is owned
-// by the Thinking toggle, not the radio.
-const EFFORT_OPTIONS = [
-  { value: 'minimal', label: 'Minimal' },
-  { value: 'low', label: 'Low' },
-  { value: 'medium', label: 'Medium' },
-  { value: 'high', label: 'High' },
-  { value: 'xhigh', label: 'Max' }
-] as const
-
-/** How "fast" is achieved for a given model — two different mechanisms:
- *  - `param`: the Anthropic/OpenAI `speed=fast` request parameter.
- *  - `variant`: a separate `…-fast` sibling model selected via the model field.
- */
-export type FastControl =
-  | { kind: 'none' }
-  | { kind: 'param'; on: boolean }
-  | { kind: 'variant'; baseId: string; fastId: string; on: boolean }
-
-/** Resolve the fast mechanism for a model: prefer the speed=fast parameter
- *  when the backend supports it, else fall back to a `…-fast` sibling model. */
-export function resolveFastControl(
-  model: string,
-  providerModels: readonly string[],
-  paramSupported: boolean,
-  currentFastMode: boolean
-): FastControl {
-  if (paramSupported) {
-    return { kind: 'param', on: currentFastMode }
-  }
-
-  if (/-fast$/i.test(model)) {
-    const baseId = model.replace(/-fast$/i, '')
-
-    // Only a toggle if there's a base to switch back to; otherwise it's a
-    // standalone fast model with no "off" state.
-    return providerModels.includes(baseId)
-      ? { kind: 'variant', baseId, fastId: model, on: true }
-      : { kind: 'none' }
-  }
-
-  const fastId = `${model}-fast`
-
-  if (providerModels.includes(fastId)) {
-    return { kind: 'variant', baseId: model, fastId, on: false }
-  }
-
-  // Fast isn't natively offered here, but if the session still has the speed
-  // param on (carried over from a previous model), expose the toggle so it can
-  // be turned off rather than stranded.
-  if (currentFastMode) {
-    return { kind: 'param', on: true }
-  }
-
-  return { kind: 'none' }
-}
-
-interface ModelEditSubmenuProps {
-  /** How fast mode is offered for this model (param toggle vs. variant swap). */
-  fastControl: FastControl
-  /** Whether this row's model is the active one. */
-  isActive: boolean
-  /** Switch to this model (resolves false on failure). Awaited before applying
-   *  edits when not active so a failed switch doesn't write to the old model. */
-  onActivate: () => Promise<boolean> | void
-  /** Switch to a specific model id (used to swap base ⇄ -fast variant). */
-  onSelectModel: (model: string) => Promise<boolean> | void
-  /** Whether this model supports reasoning effort. */
-  reasoning: boolean
-  requestGateway: <T>(method: string, params?: Record<string, unknown>) => Promise<T>
-}
-
-export function ModelEditSubmenu({
-  fastControl,
-  isActive,
-  onActivate,
-  onSelectModel,
-  reasoning,
-  requestGateway
-}: ModelEditSubmenuProps) {
-  // Reactive session state comes straight from the stores rather than being
-  // drilled through the panel, so editing it re-renders only this submenu.
-  const activeSessionId = useStore($activeSessionId)
-  const currentReasoningEffort = useStore($currentReasoningEffort)
-
-  const effort = normalizeEffort(currentReasoningEffort)
-  const thinkingOn = isThinkingEnabled(currentReasoningEffort)
-
-  // Reasoning/fast are session-scoped (they apply to the active model), so
-  // editing a non-active model first switches to it. Returns false if the
-  // switch failed, so callers skip applying to the wrong (previous) model.
-  const ensureActive = async (): Promise<boolean> => {
-    if (isActive) {
-      return true
-    }
-
-    return (await onActivate()) !== false
-  }
-
-  const patchReasoning = async (next: string, rollback: string) => {
-    setCurrentReasoningEffort(next)
-
-    try {
-      if (!(await ensureActive())) {
-        setCurrentReasoningEffort(rollback)
-
-        return
-      }
-
-      await requestGateway('config.set', {
-        key: 'reasoning',
-        session_id: activeSessionId ?? '',
-        value: next
-      })
-    } catch (err) {
-      setCurrentReasoningEffort(rollback)
-      notifyError(err, 'Model option update failed')
-    }
-  }
-
-  const toggleFast = (enabled: boolean) => {
-    if (fastControl.kind === 'variant') {
-      // Fast is a separate model id — swap to it (or back to the base).
-      void onSelectModel(enabled ? fastControl.fastId : fastControl.baseId)
-
-      return
-    }
-
-    if (fastControl.kind === 'param') {
-      setCurrentFastMode(enabled)
-
-      void (async () => {
-        try {
-          if (!(await ensureActive())) {
-            setCurrentFastMode(!enabled)
-
-            return
-          }
-
-          await requestGateway('config.set', {
-            key: 'fast',
-            session_id: activeSessionId ?? '',
-            value: enabled ? 'fast' : 'normal'
-          })
-        } catch (err) {
-          setCurrentFastMode(!enabled)
-          notifyError(err, 'Fast mode update failed')
-        }
-      })()
-    }
-  }
-
-  const hasFast = fastControl.kind !== 'none'
-  const fastOn = fastControl.kind === 'none' ? false : fastControl.on
-
-  return (
-    <DropdownMenuSubContent className="w-52 p-0" sideOffset={4}>
-      {!hasFast && !reasoning ? (
-        <div className="px-2.5 py-3 text-xs text-(--ui-text-tertiary)">No options for this model</div>
-      ) : (
-        <>
-          <DropdownMenuLabel className={dropdownMenuSectionLabel}>Options</DropdownMenuLabel>
-          {reasoning ? (
-            <DropdownMenuItem
-              className={cn(dropdownMenuRow, 'cursor-pointer')}
-              onSelect={event => event.preventDefault()}
-            >
-              Thinking
-              <Switch
-                checked={thinkingOn}
-                className="ml-auto cursor-pointer"
-                onCheckedChange={checked => void patchReasoning(checked ? effort || 'medium' : 'none', currentReasoningEffort)}
-              />
-            </DropdownMenuItem>
-          ) : null}
-          {hasFast ? (
-            <DropdownMenuItem
-              className={cn(dropdownMenuRow, 'cursor-pointer')}
-              onSelect={event => event.preventDefault()}
-            >
-              Fast
-              <Switch checked={fastOn} className="ml-auto cursor-pointer" onCheckedChange={toggleFast} />
-            </DropdownMenuItem>
-          ) : null}
-          {reasoning ? (
-            <>
-              <DropdownMenuSeparator className="mx-0" />
-              <DropdownMenuLabel className={dropdownMenuSectionLabel}>Effort</DropdownMenuLabel>
-              <DropdownMenuRadioGroup
-                onValueChange={value => void patchReasoning(value, currentReasoningEffort)}
-                value={effort}
-              >
-                {EFFORT_OPTIONS.map(option => (
-                  <DropdownMenuRadioItem
-                    className={cn(dropdownMenuRow, 'cursor-pointer')}
-                    key={option.value}
-                    onSelect={event => event.preventDefault()}
-                    value={option.value}
-                  >
-                    {option.label}
-                  </DropdownMenuRadioItem>
-                ))}
-              </DropdownMenuRadioGroup>
-            </>
-          ) : null}
-        </>
-      )}
-    </DropdownMenuSubContent>
-  )
-}
-
-function isThinkingEnabled(effort: string): boolean {
-  // Empty = Hermes default (medium) = on; only an explicit "none" is off.
-  return (effort || 'medium').trim().toLowerCase() !== 'none'
-}
-
-function normalizeEffort(effort: string): string {
-  const value = (effort || 'medium').trim().toLowerCase()
-
-  // Thinking off → no effort selected in the radio group.
-  if (value === 'none') {
-    return ''
-  }
-
-  return EFFORT_OPTIONS.some(option => option.value === value) ? value : 'medium'
-}

apps/desktop/src/app/shell/model-menu-panel.tsx

@@ -1,289 +0,0 @@
-import { useStore } from '@nanostores/react'
-import { useQuery } from '@tanstack/react-query'
-import { useMemo, useState } from 'react'
-
-import { Codicon } from '@/components/ui/codicon'
-import {
-  DropdownMenuGroup,
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  dropdownMenuRow,
-  DropdownMenuSearch,
-  dropdownMenuSectionLabel,
-  DropdownMenuSeparator,
-  DropdownMenuSub,
-  DropdownMenuSubTrigger
-} from '@/components/ui/dropdown-menu'
-import { Skeleton } from '@/components/ui/skeleton'
-import type { HermesGateway } from '@/hermes'
-import { getGlobalModelOptions } from '@/hermes'
-import { displayModelName, modelDisplayParts, reasoningEffortLabel } from '@/lib/model-status-label'
-import { cn } from '@/lib/utils'
-import {
-  $visibleModels,
-  collapseModelFamilies,
-  DEFAULT_VISIBLE_PER_PROVIDER,
-  type ModelFamily,
-  modelVisibilityKey,
-  setModelVisibilityOpen
-} from '@/store/model-visibility'
-import {
-  $activeSessionId,
-  $currentFastMode,
-  $currentModel,
-  $currentProvider,
-  $currentReasoningEffort
-} from '@/store/session'
-import type { ModelOptionProvider, ModelOptionsResponse } from '@/types/hermes'
-
-import { ModelEditSubmenu, resolveFastControl } from './model-edit-submenu'
-
-interface ModelMenuPanelProps {
-  gateway?: HermesGateway
-  onSelectModel: (selection: { model: string; persistGlobal: boolean; provider: string }) => Promise<boolean> | void
-  requestGateway: <T>(method: string, params?: Record<string, unknown>) => Promise<T>
-}
-
-interface ProviderGroup {
-  families: ModelFamily[]
-  provider: ModelOptionProvider
-}
-
-export function ModelMenuPanel({ gateway, onSelectModel, requestGateway }: ModelMenuPanelProps) {
-  const [search, setSearch] = useState('')
-  // Reactive session state is read from the stores here (not drilled in), so
-  // toggling effort/fast/model re-renders this panel in place without forcing
-  // the parent to rebuild the menu content (which would close the dropdown).
-  const activeSessionId = useStore($activeSessionId)
-  const currentFastMode = useStore($currentFastMode)
-  const currentModel = useStore($currentModel)
-  const currentProvider = useStore($currentProvider)
-  const currentReasoningEffort = useStore($currentReasoningEffort)
-  const visibleModels = useStore($visibleModels)
-
-  const modelOptions = useQuery({
-    queryKey: ['model-options', activeSessionId || 'global'],
-    queryFn: (): Promise<ModelOptionsResponse> => {
-      if (gateway && activeSessionId) {
-        return gateway.request<ModelOptionsResponse>('model.options', { session_id: activeSessionId })
-      }
-
-      return getGlobalModelOptions()
-    }
-  })
-
-  const optionsModel = String(modelOptions.data?.model ?? currentModel ?? '')
-  const optionsProvider = String(modelOptions.data?.provider ?? currentProvider ?? '')
-  const loading = modelOptions.isPending && !modelOptions.data
-
-  const error = modelOptions.error
-    ? modelOptions.error instanceof Error
-      ? modelOptions.error.message
-      : String(modelOptions.error)
-    : null
-
-  const providers = modelOptions.data?.providers
-
-  const switchTo = (model: string, provider: string) =>
-    onSelectModel({ model, persistGlobal: !activeSessionId, provider })
-
-  const groups = useMemo(
-    () => groupModels(providers ?? [], search, { model: optionsModel, provider: optionsProvider }, visibleModels),
-    [providers, search, optionsModel, optionsProvider, visibleModels]
-  )
-
-  return (
-    <>
-      <DropdownMenuSearch
-        aria-label="Search models"
-        onValueChange={setSearch}
-        placeholder="Search models"
-        value={search}
-      />
-
-      <DropdownMenuSeparator className="mx-0" />
-
-      {loading ? (
-        <DropdownMenuGroup className="py-1">
-          {Array.from({ length: 4 }, (_, index) => (
-            <DropdownMenuItem
-              className={dropdownMenuRow}
-              disabled
-              key={index}
-              onSelect={event => event.preventDefault()}
-            >
-              <Skeleton className="h-4 w-full" />
-            </DropdownMenuItem>
-          ))}
-        </DropdownMenuGroup>
-      ) : error ? (
-        <DropdownMenuItem className={dropdownMenuRow} disabled>
-          {error}
-        </DropdownMenuItem>
-      ) : groups.length === 0 ? (
-        <DropdownMenuItem className={dropdownMenuRow} disabled>
-          No models found
-        </DropdownMenuItem>
-      ) : (
-        <div className="max-h-80 overflow-y-auto py-0.5">
-          {groups.map(group => (
-            <DropdownMenuGroup className="py-0.5" key={group.provider.slug}>
-              <DropdownMenuLabel className={dropdownMenuSectionLabel}>{group.provider.name}</DropdownMenuLabel>
-              {group.families.map(family => {
-                // The active id may be the base or its -fast sibling; either
-                // way this one family row represents both.
-                const activeId =
-                  group.provider.slug === optionsProvider &&
-                  (optionsModel === family.id || optionsModel === family.fastId)
-                    ? optionsModel
-                    : null
-
-                const isCurrent = activeId !== null
-                const name = modelDisplayParts(family.id).name
-                // Capabilities are looked up against the active/base id; the
-                // -fast variant carries the same param support as its base.
-                const caps = group.provider.capabilities?.[family.id]
-
-                // Single source of truth for the active row's fast state — keeps
-                // the row label in lock-step with the submenu's Fast toggle and
-                // handles the standalone `-fast` id case.
-                const fastControl = resolveFastControl(
-                  activeId ?? family.id,
-                  group.provider.models ?? [],
-                  caps?.fast ?? false,
-                  currentFastMode
-                )
-
-                // Grayed text: active row shows live state (Fast + effort);
-                // others show a fast-capability hint.
-                const meta = isCurrent
-                  ? [fastControl.kind !== 'none' && fastControl.on ? 'Fast' : null, reasoningEffortLabel(currentReasoningEffort) || 'Med']
-                      .filter(Boolean)
-                      .join(' ')
-                  : caps?.fast || family.fastId
-                    ? 'Fast'
-                    : ''
-
-                // Every row is a hover-Edit submenu trigger. Activating it
-                // (pointer or keyboard) switches to the family's base model;
-                // the Fast toggle inside swaps to the -fast sibling (or flips
-                // the speed param). The sub-trigger has no `onSelect`, so wire
-                // both click and Enter/Space for keyboard parity.
-                const activate = () => {
-                  if (!isCurrent) {
-                    void switchTo(family.id, group.provider.slug)
-                  }
-                }
-
-                return (
-                  <DropdownMenuSub key={`${group.provider.slug}:${family.id}`}>
-                    <DropdownMenuSubTrigger
-                      className={cn(dropdownMenuRow, 'cursor-pointer')}
-                      hideChevron
-                      onClick={activate}
-                      onKeyDown={event => {
-                        if (event.key === 'Enter' || event.key === ' ') {
-                          activate()
-                        }
-                      }}
-                    >
-                      <span className="min-w-0 flex-1 truncate">
-                        {name}
-                        {meta ? <span className="text-(--ui-text-tertiary)"> {meta}</span> : null}
-                      </span>
-                      {isCurrent ? <Codicon className="ml-auto text-foreground" name="check" size="0.75rem" /> : null}
-                    </DropdownMenuSubTrigger>
-                    <ModelEditSubmenu
-                      fastControl={fastControl}
-                      isActive={isCurrent}
-                      onActivate={() => switchTo(family.id, group.provider.slug)}
-                      onSelectModel={nextModel => switchTo(nextModel, group.provider.slug)}
-                      reasoning={caps?.reasoning ?? true}
-                      requestGateway={requestGateway}
-                    />
-                  </DropdownMenuSub>
-                )
-              })}
-            </DropdownMenuGroup>
-          ))}
-        </div>
-      )}
-
-      <DropdownMenuSeparator className="mx-0" />
-
-      <DropdownMenuItem
-        className={cn(dropdownMenuRow, 'cursor-pointer text-(--ui-text-tertiary)')}
-        onSelect={() => setModelVisibilityOpen(true)}
-      >
-        Edit Models…
-      </DropdownMenuItem>
-    </>
-  )
-}
-
-// Collapsed we show the user's chosen models (or the curated default); typing
-// spans every available model so anything is reachable past the cut.
-const PER_PROVIDER_SEARCH = 12
-
-function groupModels(
-  providers: ModelOptionProvider[],
-  search: string,
-  current: { model: string; provider: string },
-  visible: Set<string> | null
-): ProviderGroup[] {
-  const q = search.trim().toLowerCase()
-  const groups: ProviderGroup[] = []
-
-  for (const provider of providers) {
-    const allFamilies = collapseModelFamilies(provider.models ?? [])
-
-    if (allFamilies.length === 0) {
-      continue
-    }
-
-    const matches = (family: ModelFamily) =>
-      `${family.id} ${family.fastId ?? ''} ${provider.name} ${provider.slug} ${displayModelName(family.id)}`
-        .toLowerCase()
-        .includes(q)
-
-    // Which model ids to show (the active one is always added on top of this).
-    let shown: Set<string>
-
-    if (q) {
-      // Search spans every family, regardless of visibility.
-      shown = new Set(allFamilies.filter(matches).map(family => family.id))
-    } else if (visible) {
-      // User has customized which models show — honor their selection exactly.
-      shown = new Set(
-        allFamilies.filter(family => visible.has(modelVisibilityKey(provider.slug, family.id))).map(family => family.id)
-      )
-    } else {
-      // Default: curated top-N families per provider.
-      shown = new Set(allFamilies.slice(0, DEFAULT_VISIBLE_PER_PROVIDER).map(family => family.id))
-    }
-
-    // Always include the active model — but keep every row in the provider's
-    // stable curated order (filter `allFamilies`, never reorder), so selecting
-    // a model can't shuffle the list.
-    const activeId =
-      provider.slug === current.provider && current.model
-        ? allFamilies.find(family => family.id === current.model || family.fastId === current.model)?.id
-        : undefined
-
-    let families = allFamilies.filter(family => shown.has(family.id) || family.id === activeId)
-
-    if (q) {
-      families = families.slice(0, PER_PROVIDER_SEARCH)
-    }
-
-    if (families.length > 0) {
-      groups.push({ families, provider })
-    }
-  }
-
-  // Stable, logical group order: alphabetical by provider name. (The backend
-  // floats the current provider first, which would reshuffle on every switch.)
-  groups.sort((a, b) => a.provider.name.localeCompare(b.provider.name))
-
-  return groups
-}

apps/desktop/src/app/shell/statusbar-controls.tsx

@@ -26,7 +26,6 @@ export interface StatusbarItem {
   disabled?: boolean
   hidden?: boolean
   href?: string
-  menuAlign?: 'center' | 'end' | 'start'
   menuClassName?: string
   menuContent?: ReactNode
   menuItems?: readonly StatusbarMenuItem[]
@@ -55,18 +54,14 @@ export function StatusbarControls({ className, leftItems = [], items = [], ...pr
       )}
       {...props}
     >
-      {/* `overflow-x-clip` (not `overflow-x-auto`) so a wide status item — for
-          example "Connecting…" on a fresh/untitled session — can't paint a
-          horizontal scrollbar across the bottom of the window. Items already
-          `truncate` their labels, so clipping is the right behavior. */}
-      <div className="flex min-w-0 items-stretch gap-0.5 overflow-x-clip">
+      <div className="flex min-w-0 items-stretch gap-0.5 overflow-x-auto">
         {leftItems
           .filter(item => !item.hidden)
           .map(item => (
             <StatusbarItemView item={item} key={`left:${item.id}`} navigate={navigate} />
           ))}
       </div>
-      <div className="flex min-w-0 items-stretch gap-0.5 overflow-x-clip">
+      <div className="flex min-w-0 items-stretch gap-0.5 overflow-x-auto">
         {items
           .filter(item => !item.hidden)
           .map(item => (
@@ -105,7 +100,7 @@ function StatusbarItemView({ item, navigate }: { item: StatusbarItem; navigate:
           </button>
         </DropdownMenuTrigger>
         <DropdownMenuContent
-          align={item.menuAlign ?? 'start'}
+          align="start"
           className={cn('w-56', item.menuContent && 'p-0', item.menuClassName)}
           side="top"
           sideOffset={8}

apps/desktop/src/app/shell/titlebar.ts

@@ -13,7 +13,7 @@ export const TITLEBAR_FALLBACK_WINDOW_BUTTON_X = 24
 export const TITLEBAR_EDGE_INSET = 14
 
 export const titlebarButtonClass =
-  'h-[var(--titlebar-control-height)] w-[var(--titlebar-control-size)] cursor-pointer rounded-md text-muted-foreground/85 transition-colors hover:bg-(--ui-control-hover-background) hover:text-foreground'
+  'h-[var(--titlebar-control-height)] w-[var(--titlebar-control-size)] rounded-md text-muted-foreground/85 transition-colors hover:bg-(--ui-control-hover-background) hover:text-foreground'
 
 export const titlebarHeaderBaseClass =
   'pointer-events-none relative z-3 flex h-(--titlebar-height) shrink-0 items-center justify-start gap-3 border-b border-(--ui-stroke-tertiary) bg-(--ui-chat-surface-background) px-[max(0.75rem,var(--titlebar-content-inset,0rem))]'

apps/desktop/src/app/skills/index.tsx

@@ -6,7 +6,7 @@ import { Button } from '@/components/ui/button'
 import { Codicon } from '@/components/ui/codicon'
 import { Switch } from '@/components/ui/switch'
 import { TextTab, TextTabMeta } from '@/components/ui/text-tab'
-import { getSkills, getToolsets, toggleSkill, toggleToolset } from '@/hermes'
+import { getSkills, getToolsets, toggleSkill } from '@/hermes'
 import { cn } from '@/lib/utils'
 import { notify, notifyError } from '@/store/notifications'
 import type { SkillInfo, ToolsetInfo } from '@/types/hermes'
@@ -14,7 +14,6 @@ import type { SkillInfo, ToolsetInfo } from '@/types/hermes'
 import { useRouteEnumParam } from '../hooks/use-route-enum-param'
 import { PageSearchShell } from '../page-search-shell'
 import { asText, includesQuery, prettyName, toolNames } from '../settings/helpers'
-import { ToolsetConfigPanel } from '../settings/toolset-config-panel'
 import type { SetStatusbarItemGroup } from '../shell/statusbar-controls'
 
 const SKILLS_MODES = ['skills', 'toolsets'] as const
@@ -74,8 +73,6 @@ export function SkillsView({ setStatusbarItemGroup: _setStatusbarItemGroup, ...p
   const [activeCategory, setActiveCategory] = useState<string | null>(null)
   const [refreshing, setRefreshing] = useState(false)
   const [savingSkill, setSavingSkill] = useState<string | null>(null)
-  const [savingToolset, setSavingToolset] = useState<string | null>(null)
-  const [expandedToolset, setExpandedToolset] = useState<string | null>(null)
 
   const refreshCapabilities = useCallback(async () => {
     setRefreshing(true)
@@ -91,12 +88,6 @@ export function SkillsView({ setStatusbarItemGroup: _setStatusbarItemGroup, ...p
     }
   }, [])
 
-  const refreshToolsets = useCallback(() => {
-    getToolsets()
-      .then(setToolsets)
-      .catch(err => notifyError(err, 'Toolsets failed to refresh'))
-  }, [])
-
   useEffect(() => {
     void refreshCapabilities()
   }, [refreshCapabilities])
@@ -157,26 +148,6 @@ export function SkillsView({ setStatusbarItemGroup: _setStatusbarItemGroup, ...p
     }
   }
 
-  async function handleToggleToolset(toolset: ToolsetInfo, enabled: boolean) {
-    setSavingToolset(toolset.name)
-
-    try {
-      await toggleToolset(toolset.name, enabled)
-      setToolsets(current =>
-        current?.map(row => (row.name === toolset.name ? { ...row, enabled, available: enabled } : row)) ?? current
-      )
-      notify({
-        kind: 'success',
-        title: enabled ? 'Toolset enabled' : 'Toolset disabled',
-        message: `${asText(toolset.label || toolset.name)} applies to new sessions.`
-      })
-    } catch (err) {
-      notifyError(err, `Failed to update ${asText(toolset.label || toolset.name)}`)
-    } finally {
-      setSavingToolset(null)
-    }
-  }
-
   return (
     <PageSearchShell
       {...props}
@@ -277,30 +248,16 @@ export function SkillsView({ setStatusbarItemGroup: _setStatusbarItemGroup, ...p
                 {visibleToolsets.map(toolset => {
                   const tools = toolNames(toolset)
                   const label = asText(toolset.label || toolset.name)
-                  const expanded = expandedToolset === toolset.name
 
                   return (
                     <div className="px-0 py-2.5" key={toolset.name}>
                       <div className="flex items-center justify-between gap-2">
                         <div className="truncate text-sm font-medium">{label}</div>
-                        <div className="flex shrink-0 items-center gap-1.5">
-                          <button
-                            aria-expanded={expanded}
-                            aria-label={`Configure ${label}`}
-                            className="cursor-pointer rounded-full outline-none focus-visible:ring-2 focus-visible:ring-ring/50"
-                            onClick={() => setExpandedToolset(current => (current === toolset.name ? null : toolset.name))}
-                            type="button"
-                          >
-                            <StatusPill active={toolset.configured}>
-                              {toolset.configured ? 'Configured' : 'Needs keys'}
-                            </StatusPill>
-                          </button>
-                          <Switch
-                            aria-label={`Toggle ${label} toolset`}
-                            checked={toolset.enabled}
-                            disabled={savingToolset === toolset.name}
-                            onCheckedChange={checked => void handleToggleToolset(toolset, checked)}
-                          />
+                        <div className="flex items-center gap-1.5">
+                          <StatusPill active={toolset.enabled}>{toolset.enabled ? 'Enabled' : 'Disabled'}</StatusPill>
+                          <StatusPill active={toolset.configured}>
+                            {toolset.configured ? 'Configured' : 'Needs keys'}
+                          </StatusPill>
                         </div>
                       </div>
                       <p className="mt-1 text-xs text-muted-foreground">
@@ -318,7 +275,6 @@ export function SkillsView({ setStatusbarItemGroup: _setStatusbarItemGroup, ...p
                           ))}
                         </div>
                       )}
-                      {expanded && <ToolsetConfigPanel onConfiguredChange={refreshToolsets} toolset={toolset.name} />}
                     </div>
                   )
                 })}

apps/desktop/src/components/assistant-ui/ansi-text.tsx

@@ -1,34 +0,0 @@
-import type { FC } from 'react'
-import { useMemo } from 'react'
-
-import { ansiColorClass, hasAnsiCodes, parseAnsi } from '@/lib/ansi'
-import { cn } from '@/lib/utils'
-
-interface AnsiTextProps {
-  text: string
-  className?: string
-}
-
-/** Renders text with embedded ANSI SGR codes as colored / bold spans. Falls
- *  back to a plain string node when no codes are present so the parser cost
- *  is paid only when there's something to colorize. */
-export const AnsiText: FC<AnsiTextProps> = ({ className, text }) => {
-  const segments = useMemo(() => (hasAnsiCodes(text) ? parseAnsi(text) : null), [text])
-
-  if (!segments) {
-    return <span className={className}>{text}</span>
-  }
-
-  return (
-    <span className={className}>
-      {segments.map((segment, index) => (
-        <span
-          className={cn(segment.bold && 'font-semibold', segment.fg && ansiColorClass(segment.fg))}
-          key={`ansi-${index}`}
-        >
-          {segment.text}
-        </span>
-      ))}
-    </span>
-  )
-}

apps/desktop/src/components/assistant-ui/markdown-text.tsx

@@ -19,9 +19,9 @@ import {
   filePathFromMediaPath,
   mediaExternalUrl,
   mediaKind,
+  mediaMime,
   mediaName,
-  mediaPathFromMarkdownHref,
-  mediaStreamUrl
+  mediaPathFromMarkdownHref
 } from '@/lib/media'
 import { previewTargetFromMarkdownHref } from '@/lib/preview-targets'
 import { cn } from '@/lib/utils'
@@ -40,22 +40,24 @@ import { cn } from '@/lib/utils'
 // LLM convention). The default false-setting only accepts `$$...$$`.
 const mathPlugin = createMemoizedMathPlugin({ singleDollarTextMath: true })
 
+async function typedBlobUrl(dataUrl: string, mime: string): Promise<string> {
+  const blob = await fetch(dataUrl).then(response => response.blob())
+
+  return URL.createObjectURL(new Blob([await blob.arrayBuffer()], { type: mime }))
+}
+
 async function mediaSrc(path: string): Promise<string> {
   if (/^(?:https?|data):/i.test(path)) {
     return path
   }
 
-  // Stream audio/video through the custom protocol: data URLs are capped and
-  // load the whole file into memory, which broke playback for larger videos.
-  if (window.hermesDesktop && ['audio', 'video'].includes(mediaKind(path))) {
-    return mediaStreamUrl(path)
-  }
-
   if (!window.hermesDesktop?.readFileDataUrl) {
     return mediaExternalUrl(path)
   }
 
-  return window.hermesDesktop.readFileDataUrl(filePathFromMediaPath(path))
+  const dataUrl = await window.hermesDesktop.readFileDataUrl(filePathFromMediaPath(path))
+
+  return ['audio', 'video'].includes(mediaKind(path)) ? typedBlobUrl(dataUrl, mediaMime(path)) : dataUrl
 }
 
 function OpenMediaButton({ kind, path }: { kind: 'audio' | 'video'; path: string }) {
@@ -276,7 +278,10 @@ const MarkdownTextImpl = () => {
   // render, which churns Streamdown's outer memo + propagates new prop
   // identities into every Block. The plugin set really only varies on
   // `isStreaming`, so memoize on that.
-  const plugins = useMemo(() => (isStreaming ? { math: mathPlugin } : { math: mathPlugin, code }), [isStreaming])
+  const plugins = useMemo(
+    () => (isStreaming ? { math: mathPlugin } : { math: mathPlugin, code }),
+    [isStreaming]
+  )
 
   const components = useMemo(
     () =>

apps/desktop/src/components/assistant-ui/thread.tsx

@@ -48,8 +48,7 @@ import { detectTrigger, textBeforeCaret, type TriggerState } from '@/app/chat/co
 import { ComposerTriggerPopover } from '@/app/chat/composer/trigger-popover'
 import { extractDroppedFiles, HERMES_PATHS_MIME } from '@/app/chat/hooks/use-composer-actions'
 import { ClarifyTool } from '@/components/assistant-ui/clarify-tool'
-import { DirectiveContent } from '@/components/assistant-ui/directive-text'
-import { UserMessageText } from '@/components/assistant-ui/user-message-text'
+import { DirectiveContent, DirectiveText } from '@/components/assistant-ui/directive-text'
 import { hermesDirectiveFormatter } from '@/components/assistant-ui/directive-text'
 import { MarkdownText } from '@/components/assistant-ui/markdown-text'
 import { VirtualizedThread } from '@/components/assistant-ui/thread-virtualizer'
@@ -74,7 +73,6 @@ import {
 } from '@/components/ui/dropdown-menu'
 import { Loader } from '@/components/ui/loader'
 import type { HermesGateway } from '@/hermes'
-import { useResizeObserver } from '@/hooks/use-resize-observer'
 import { DATA_IMAGE_URL_RE } from '@/lib/embedded-images'
 import { triggerHaptic } from '@/lib/haptics'
 import { GitBranchIcon, Loader2Icon, Volume2Icon, VolumeXIcon } from '@/lib/icons'
@@ -638,7 +636,7 @@ function messageAttachmentRefs(value: unknown): string[] {
 function StickyHumanMessageContainer({ children }: { children: ReactNode }) {
   return (
     <div
-      className="group/user-message sticky z-40 -mx-4 flex w-[calc(100%+2rem)] min-w-0 max-w-none flex-col items-stretch gap-0 self-end overflow-visible bg-(--ui-chat-surface-background) px-4 pb-(--conversation-turn-gap) pt-2"
+      className="group/user-message sticky top-0 z-40 -mx-4 flex w-[calc(100%+2rem)] min-w-0 max-w-none flex-col items-stretch gap-0 self-end overflow-visible bg-(--ui-chat-surface-background) px-4 pb-(--conversation-turn-gap) pt-2"
       data-role="user"
       data-slot="aui_user-message-root"
     >
@@ -686,32 +684,6 @@ const UserMessage: FC<{
     return messageAttachmentRefs(custom.attachmentRefs)
   })
 
-  // Sticky human bubbles clamp to ~2 lines with a soft fade so a long prompt
-  // doesn't dominate the viewport while the response streams underneath; the
-  // clamp lifts on hover / focus (see styles.css). We measure the *unclamped*
-  // inner wrapper so the ResizeObserver only fires on real content / width
-  // changes, not on every frame while the outer max-height animates open.
-  const clampInnerRef = useRef<HTMLDivElement | null>(null)
-  const [bodyClamped, setBodyClamped] = useState(false)
-
-  const measureClamp = useCallback(() => {
-    const inner = clampInnerRef.current
-    const outer = inner?.parentElement
-
-    if (!inner || !outer) {
-      return
-    }
-
-    const styles = getComputedStyle(inner)
-    const lineHeight = parseFloat(styles.lineHeight) || 1.5 * parseFloat(styles.fontSize) || 20
-    const fullHeight = inner.scrollHeight
-
-    outer.style.setProperty('--human-msg-full', `${fullHeight}px`)
-    setBodyClamped(fullHeight > lineHeight * 2 + 1)
-  }, [])
-
-  useResizeObserver(measureClamp, clampInnerRef)
-
   const hasBody = messageText.trim().length > 0
   const isLatestUser = messageId === latestUserId
   const showStop = isLatestUser && threadRunning && Boolean(onCancel)
@@ -731,14 +703,9 @@ const UserMessage: FC<{
         </span>
       )}
       {hasBody && (
-        // Render the user's text through a minimal markdown pipeline:
-        // backtick `code` and ``` fenced ``` blocks, with directive chips
-        // (`@file:` etc.) still resolved inside the plain-text spans.
-        <div className="sticky-human-clamp" data-clamped={bodyClamped ? 'true' : undefined}>
-          <div ref={clampInnerRef}>
-            <UserMessageText className="wrap-anywhere" text={messageText} />
-          </div>
-        </div>
+        <span className="wrap-anywhere block whitespace-pre-line">
+          <MessagePrimitive.Parts components={{ Text: DirectiveText }} />
+        </span>
       )}
     </>
   )

apps/desktop/src/components/assistant-ui/tool-fallback-model.ts

@@ -35,18 +35,7 @@ export interface ToolView {
   previewTarget?: string
   rawArgs: string
   rawResult: string
-  /** Set for tools whose output naturally contains ANSI escape codes
-   *  (terminal/execute_code) so the renderer knows to run them through
-   *  the ANSI parser instead of printing them as literals. */
-  rendersAnsi?: boolean
   searchHits?: SearchResultRow[]
-  /** When the backend reports stderr as a separate stream (terminal /
-   *  execute_code), the renderer shows it as its own labeled, neutrally
-   *  tinted block under stdout — distinct from an error tone. */
-  stderr?: string
-  /** When set, the renderer uses stdout+stderr as separate sections and
-   *  ignores the merged `detail`. */
-  stdout?: string
   status: ToolStatus
   subtitle: string
   title: string
@@ -1013,10 +1002,6 @@ function toolDetailText(
   }
 
   if (part.toolName === 'terminal' || part.toolName === 'execute_code') {
-    // Streams are split out into ToolView.stdout / ToolView.stderr by
-    // buildToolView so the renderer can label them separately. The merged
-    // fallback here is only used when the backend doesn't expose either
-    // stream individually.
     const output = firstStringField(resultRecord, ['output', 'stdout', 'stderr'])
 
     const lines = Array.isArray(resultRecord.lines)
@@ -1224,18 +1209,6 @@ export function buildToolView(part: ToolPart, inlineDiff: string): ToolView {
 
   const resultCount = status === 'error' ? null : toolResultCount(part, argsRecord, resultRecord)
 
-  // For shell/code tools we surface stdout and stderr as separate labeled
-  // streams in the renderer. Many CLIs use stderr for informational
-  // messages (npm progress, git hints), so we deliberately don't paint
-  // stderr destructively even though it's tagged.
-  const rendersAnsi = part.toolName === 'terminal' || part.toolName === 'execute_code'
-  const stdout = rendersAnsi ? firstStringField(resultRecord, ['stdout']) : ''
-  const stderrRaw = rendersAnsi ? firstStringField(resultRecord, ['stderr']) : ''
-  // Only attach stderr when the backend actually returned it as its own
-  // field — otherwise the merged `detail` already covers it and double-
-  // rendering would duplicate output.
-  const hasSplitStreams = rendersAnsi && (Boolean(stdout) || Boolean(stderrRaw))
-
   return {
     countLabel: resultCount ? formatCountLabel(resultCount) : undefined,
     detail,
@@ -1247,10 +1220,7 @@ export function buildToolView(part: ToolPart, inlineDiff: string): ToolView {
     previewTarget: toolPreviewTarget(part.toolName, argsRecord, resultRecord),
     rawArgs: prettyJson(part.args),
     rawResult: prettyJson(part.result),
-    rendersAnsi: rendersAnsi || undefined,
     searchHits: searchHits?.length ? searchHits : undefined,
-    stderr: hasSplitStreams ? stderrRaw || undefined : undefined,
-    stdout: hasSplitStreams ? stdout || undefined : undefined,
     status,
     subtitle,
     title,

apps/desktop/src/components/assistant-ui/tool-fallback.tsx

@@ -5,7 +5,6 @@ import { useStore } from '@nanostores/react'
 import { createContext, type FC, type PropsWithChildren, type ReactNode, useContext, useMemo } from 'react'
 import { useShallow } from 'zustand/shallow'
 
-import { AnsiText } from '@/components/assistant-ui/ansi-text'
 import { useElapsedSeconds } from '@/components/chat/activity-timer'
 import { ActivityTimerText } from '@/components/chat/activity-timer-text'
 import { CompactMarkdown } from '@/components/chat/compact-markdown'
@@ -345,41 +344,11 @@ function ToolEntry({ part }: ToolEntryProps) {
                   )}
                 </div>
               ) : null
-            ) : view.stdout || view.stderr ? (
-              // Stdout + stderr split: render both as labeled blocks. stderr
-              // is intentionally NOT painted destructive — many CLIs log
-              // informational output there.
-              <div className="max-w-full text-xs leading-relaxed text-(--ui-text-secondary)">
-                {view.detailLabel && <p className={TOOL_SECTION_LABEL_CLASS}>{view.detailLabel}</p>}
-                {view.stdout && (
-                  <div className="space-y-0.5">
-                    {view.stderr && <p className={TOOL_SECTION_LABEL_CLASS}>stdout</p>}
-                    <pre className={cn(TOOL_SECTION_PRE_CLASS, 'whitespace-pre-wrap wrap-anywhere')}>
-                      {view.rendersAnsi ? <AnsiText text={view.stdout} /> : view.stdout}
-                    </pre>
-                  </div>
-                )}
-                {view.stderr && (
-                  <div className={cn('space-y-0.5', view.stdout && 'mt-1.5')}>
-                    <p className={TOOL_SECTION_LABEL_CLASS}>stderr</p>
-                    <pre
-                      className={cn(
-                        TOOL_SECTION_PRE_CLASS,
-                        'whitespace-pre-wrap wrap-anywhere text-(--ui-text-tertiary)'
-                      )}
-                    >
-                      {view.rendersAnsi ? <AnsiText text={view.stderr} /> : view.stderr}
-                    </pre>
-                  </div>
-                )}
-              </div>
             ) : (
               <div className="max-w-full text-xs leading-relaxed text-(--ui-text-secondary)">
                 {view.detailLabel && <p className={TOOL_SECTION_LABEL_CLASS}>{view.detailLabel}</p>}
                 {renderDetailAsCode ? (
-                  <pre className={cn(TOOL_SECTION_PRE_CLASS, 'whitespace-pre-wrap wrap-anywhere')}>
-                    {view.rendersAnsi ? <AnsiText text={view.detail} /> : view.detail}
-                  </pre>
+                  <pre className={cn(TOOL_SECTION_PRE_CLASS, 'whitespace-pre-wrap wrap-anywhere')}>{view.detail}</pre>
                 ) : (
                   <CompactMarkdown className={cn(TOOL_SECTION_SURFACE_CLASS, 'wrap-anywhere')} text={view.detail} />
                 )}

apps/desktop/src/components/assistant-ui/user-message-text.tsx

@@ -1,150 +0,0 @@
-import type { FC } from 'react'
-import { Fragment, useMemo } from 'react'
-
-import { DirectiveContent } from '@/components/assistant-ui/directive-text'
-import { cn } from '@/lib/utils'
-
-// User messages should render the bare-minimum of markdown: backtick `code`
-// spans and ``` fenced blocks. We deliberately don't pull in the full
-// assistant Markdown pipeline (Streamdown + KaTeX + syntax highlighter)
-// because user input rarely contains structured docs and the heavy pipeline
-// adds a lot of runtime cost per bubble.
-//
-// Directive chips (`@file:`, `@image:`, ...) still resolve via DirectiveContent
-// inside the plain-text segments.
-
-interface FenceSegment {
-  kind: 'fence'
-  code: string
-  lang: string | null
-}
-
-interface InlineSegment {
-  kind: 'inline'
-  text: string
-}
-
-interface InlineCodeSegment {
-  kind: 'inline-code'
-  code: string
-}
-
-interface InlineTextSegment {
-  kind: 'inline-text'
-  text: string
-}
-
-type TopSegment = FenceSegment | InlineSegment
-type InlineNode = InlineCodeSegment | InlineTextSegment
-
-const FENCE_RE = /```([^\n`]*)\n([\s\S]*?)```/g
-
-// Greedy backtick run length so ``code with `backticks` inside`` works.
-const INLINE_CODE_RE = /(`+)([^`\n][\s\S]*?)\1/g
-
-function splitFences(text: string): TopSegment[] {
-  const segments: TopSegment[] = []
-  let cursor = 0
-
-  for (const match of text.matchAll(FENCE_RE)) {
-    const start = match.index ?? 0
-
-    if (start > cursor) {
-      segments.push({ kind: 'inline', text: text.slice(cursor, start) })
-    }
-
-    segments.push({
-      kind: 'fence',
-      lang: (match[1] || '').trim() || null,
-      code: match[2] ?? ''
-    })
-    cursor = start + match[0].length
-  }
-
-  if (cursor < text.length) {
-    segments.push({ kind: 'inline', text: text.slice(cursor) })
-  }
-
-  return segments
-}
-
-function splitInlineCode(text: string): InlineNode[] {
-  const nodes: InlineNode[] = []
-  let cursor = 0
-
-  for (const match of text.matchAll(INLINE_CODE_RE)) {
-    const start = match.index ?? 0
-
-    if (start > cursor) {
-      nodes.push({ kind: 'inline-text', text: text.slice(cursor, start) })
-    }
-
-    nodes.push({ kind: 'inline-code', code: match[2] })
-    cursor = start + match[0].length
-  }
-
-  if (cursor < text.length) {
-    nodes.push({ kind: 'inline-text', text: text.slice(cursor) })
-  }
-
-  return nodes
-}
-
-interface UserMessageTextProps {
-  text: string
-  className?: string
-}
-
-export const UserMessageText: FC<UserMessageTextProps> = ({ className, text }) => {
-  const top = useMemo(() => splitFences(text), [text])
-
-  return (
-    <span className={cn('block', className)} data-slot="aui_user-message-text">
-      {top.map((segment, segmentIndex) => {
-        if (segment.kind === 'fence') {
-          return (
-            <pre
-              className="my-1.5 max-w-full overflow-x-auto rounded-md border border-border/45 bg-[color-mix(in_srgb,currentColor_5%,transparent)] px-2.5 py-2 font-mono text-[0.86em] leading-snug"
-              data-slot="aui_user-fence"
-              key={`fence-${segmentIndex}`}
-            >
-              <code className="block whitespace-pre">{segment.code}</code>
-            </pre>
-          )
-        }
-
-        return (
-          <Fragment key={`inline-${segmentIndex}`}>
-            <InlineSegmentView text={segment.text} />
-          </Fragment>
-        )
-      })}
-    </span>
-  )
-}
-
-const InlineSegmentView: FC<{ text: string }> = ({ text }) => {
-  const nodes = useMemo(() => splitInlineCode(text), [text])
-
-  return (
-    <span className="wrap-anywhere block whitespace-pre-line">
-      {nodes.map((node, nodeIndex) =>
-        node.kind === 'inline-code' ? (
-          <code
-            className="mx-px rounded bg-[color-mix(in_srgb,currentColor_8%,transparent)] px-1 py-px font-mono text-[0.92em]"
-            data-slot="aui_user-inline-code"
-            key={`code-${nodeIndex}`}
-          >
-            {node.code}
-          </code>
-        ) : (
-          // Pass plain-text bits through DirectiveContent so @file:/@url: chips
-          // still render. DirectiveContent already preserves whitespace.
-          <Fragment key={`text-${nodeIndex}`}>
-            <DirectiveContent text={node.text} />
-          </Fragment>
-        )
-      )}
-    </span>
-  )
-}

apps/desktop/src/components/desktop-install-overlay.tsx

@@ -62,7 +62,9 @@ function formatStageName(name: string): string {
   if (name.length <= 3) return name
   return name
     .split('-')
-    .map((word, i) => (i === 0 ? word.charAt(0).toUpperCase() + word.slice(1) : word))
+    .map((word, i) =>
+      i === 0 ? word.charAt(0).toUpperCase() + word.slice(1) : word
+    )
     .join(' ')
 }
 
@@ -114,10 +116,17 @@ function StageRow({ descriptor, result, isCurrent, now }: StageRowProps) {
         state === 'failed' && 'bg-destructive/10'
       )}
     >
-      <div className="flex h-5 w-5 flex-shrink-0 items-center justify-center">{icon}</div>
+      <div className="flex h-5 w-5 flex-shrink-0 items-center justify-center">
+        {icon}
+      </div>
       <div className="min-w-0 flex-1">
         <div className="flex items-baseline justify-between gap-2">
-          <span className={cn('truncate text-sm font-medium', state === 'pending' && 'text-muted-foreground')}>
+          <span
+            className={cn(
+              'truncate text-sm font-medium',
+              state === 'pending' && 'text-muted-foreground'
+            )}
+          >
             {formatStageName(descriptor.name)}
           </span>
           <span className="flex-shrink-0 text-xs tabular-nums text-muted-foreground">
@@ -126,7 +135,9 @@ function StageRow({ descriptor, result, isCurrent, now }: StageRowProps) {
             {state === 'failed' ? STATE_LABEL[state] : null}
           </span>
         </div>
-        {reason && state !== 'pending' && <p className="mt-0.5 truncate text-xs text-muted-foreground">{reason}</p>}
+        {reason && state !== 'pending' && (
+          <p className="mt-0.5 truncate text-xs text-muted-foreground">{reason}</p>
+        )}
       </div>
     </li>
   )
@@ -169,7 +180,7 @@ function applyEvent(state: DesktopBootstrapState, ev: DesktopBootstrapEvent): De
           durationMs: ev.durationMs ?? null,
           // Stamp the start time on the running transition so the UI can show
           // a live elapsed timer; preserve it across repeated running events.
-          startedAt: ev.state === 'running' ? (prev?.startedAt ?? Date.now()) : (prev?.startedAt ?? null),
+          startedAt: ev.state === 'running' ? prev?.startedAt ?? Date.now() : prev?.startedAt ?? null,
           json: ev.json ?? null,
           error: ev.error ?? null
         }
@@ -206,7 +217,6 @@ export function DesktopInstallOverlay({ enabled = true }: DesktopInstallOverlayP
   const [state, setState] = useState<DesktopBootstrapState>(EMPTY_STATE)
   const [logOpen, setLogOpen] = useState(false)
   const [copied, setCopied] = useState(false)
-  const [cancelling, setCancelling] = useState(false)
   const [now, setNow] = useState(() => Date.now())
   const logEndRef = useRef<HTMLDivElement | null>(null)
 
@@ -283,8 +293,8 @@ export function DesktopInstallOverlay({ enabled = true }: DesktopInstallOverlayP
         <div className="w-full max-w-xl rounded-xl border bg-card p-8 shadow-xl">
           <h2 className="text-2xl font-semibold tracking-tight">Hermes needs a one-time install</h2>
           <p className="mt-2 text-sm text-muted-foreground">
-            Automated first-launch install isn{'\u2019'}t available on {platformLabel} yet. Open Terminal and run the
-            command below, then relaunch this app. Subsequent launches will skip this step.
+            Automated first-launch install isn{'\u2019'}t available on {platformLabel} yet. Open Terminal and
+            run the command below, then relaunch this app. Subsequent launches will skip this step.
           </p>
 
           <div className="mt-4">
@@ -318,7 +328,11 @@ export function DesktopInstallOverlay({ enabled = true }: DesktopInstallOverlayP
             <span className="text-xs text-muted-foreground">
               Will install to <code className="rounded bg-muted/50 px-1 py-0.5 font-mono">{ups.activeRoot}</code>
             </span>
-            <Button variant="default" size="sm" onClick={() => window.location.reload()}>
+            <Button
+              variant="default"
+              size="sm"
+              onClick={() => window.location.reload()}
+            >
               I{'\u2019'}ve run it -- retry
             </Button>
           </div>
@@ -348,7 +362,7 @@ export function DesktopInstallOverlay({ enabled = true }: DesktopInstallOverlayP
           </h2>
           <p className="mt-1.5 text-sm text-muted-foreground">
             {failed
-              ? 'One of the install steps failed. On Windows, this can happen if another Hermes CLI or desktop instance is running. Stop any running Hermes instances, then retry. Check the details below or the desktop log for the full transcript.'
+              ? 'One of the install steps failed. Check the details below or the desktop log for the full transcript.'
               : 'This is a one-time setup. The Hermes installer is downloading dependencies and configuring your machine. ' +
                 'Subsequent launches will skip this step.'}
           </p>
@@ -368,7 +382,10 @@ export function DesktopInstallOverlay({ enabled = true }: DesktopInstallOverlayP
               </div>
               <div className="h-1.5 w-full overflow-hidden rounded-full bg-muted">
                 <div
-                  className={cn('h-full transition-all duration-300', failed ? 'bg-destructive' : 'bg-primary')}
+                  className={cn(
+                    'h-full transition-all duration-300',
+                    failed ? 'bg-destructive' : 'bg-primary'
+                  )}
                   style={{ width: `${progressPct}%` }}
                 />
               </div>
@@ -414,18 +431,14 @@ export function DesktopInstallOverlay({ enabled = true }: DesktopInstallOverlayP
             >
               {logOpen ? <ChevronDown className="h-3.5 w-3.5" /> : <ChevronRight className="h-3.5 w-3.5" />}
               <span>{logOpen ? 'Hide installer output' : 'Show installer output'}</span>
-              <span className="ml-1 tabular-nums">
-                ({state.log.length} line{state.log.length === 1 ? '' : 's'})
-              </span>
+              <span className="ml-1 tabular-nums">({state.log.length} line{state.log.length === 1 ? '' : 's'})</span>
             </button>
 
             {logOpen && (
-              <div
-                className={cn(
-                  'mt-2 overflow-auto rounded-md border bg-muted/30 p-2 font-mono text-[11px] leading-relaxed',
-                  failed ? 'max-h-96' : 'max-h-64'
-                )}
-              >
+              <div className={cn(
+                'mt-2 overflow-auto rounded-md border bg-muted/30 p-2 font-mono text-[11px] leading-relaxed',
+                failed ? 'max-h-96' : 'max-h-64'
+              )}>
                 {state.log.length === 0 ? (
                   <div className="text-muted-foreground">No output yet.</div>
                 ) : (
@@ -444,38 +457,12 @@ export function DesktopInstallOverlay({ enabled = true }: DesktopInstallOverlayP
           </div>
         </div>
 
-        {/* Active footer: let the user actually cancel a running install. */}
-        {state.active && !failed && (
-          <div className="flex-shrink-0 border-t bg-card p-4">
-            <div className="flex items-center justify-end">
-              <Button
-                disabled={cancelling}
-                onClick={async () => {
-                  setCancelling(true)
-
-                  try {
-                    await window.hermesDesktop?.cancelBootstrap?.()
-                  } catch {
-                    // ignore -- the failed/cancelled event will surface the result
-                  }
-                }}
-                size="sm"
-                variant="ghost"
-              >
-                {cancelling ? <Loader2 className="h-4 w-4 animate-spin" /> : null}
-                {cancelling ? 'Cancelling...' : 'Cancel install'}
-              </Button>
-            </div>
-          </div>
-        )}
-
         {/* Footer -- always visible, never scrolls; only renders on failure */}
         {failed && (
           <div className="flex-shrink-0 border-t bg-card p-4">
             <div className="flex items-center justify-between gap-2">
               <span className="text-xs text-muted-foreground">
-                Full transcript saved to{' '}
-                <code className="rounded bg-muted/50 px-1 py-0.5 font-mono">%LOCALAPPDATA%\hermes\logs\</code>
+                Full transcript saved to <code className="rounded bg-muted/50 px-1 py-0.5 font-mono">%LOCALAPPDATA%\hermes\logs\</code>
               </span>
               <div className="flex gap-2">
                 <Button

apps/desktop/src/components/desktop-onboarding-overlay.tsx

@@ -107,9 +107,8 @@ const PROVIDER_DISPLAY: Record<string, { order: number; title: string }> = {
   anthropic: { order: 1, title: 'Anthropic Claude' },
   'openai-codex': { order: 2, title: 'OpenAI Codex / ChatGPT' },
   'minimax-oauth': { order: 3, title: 'MiniMax' },
-  'xai-oauth': { order: 4, title: 'xAI Grok' },
-  'claude-code': { order: 5, title: 'Claude Code' },
-  'qwen-oauth': { order: 6, title: 'Qwen Code' }
+  'claude-code': { order: 4, title: 'Claude Code' },
+  'qwen-oauth': { order: 5, title: 'Qwen Code' }
 }
 
 const assetPath = (path: string) => `${import.meta.env.BASE_URL}${path.replace(/^\/+/, '')}`
@@ -117,7 +116,6 @@ const assetPath = (path: string) => `${import.meta.env.BASE_URL}${path.replace(/
 const FLOW_SUBTITLES: Record<OAuthProvider['flow'], string> = {
   pkce: 'Opens your browser to sign in, then continues here',
   device_code: 'Opens a verification page in your browser — Hermes connects automatically',
-  loopback: 'Opens your browser to sign in — Hermes connects automatically',
   external: 'Sign in once in your terminal, then come back to chat'
 }
 
@@ -567,24 +565,6 @@ function FlowPanel({ ctx, flow }: { ctx: OnboardingContext; flow: OnboardingFlow
     )
   }
 
-  if (flow.status === 'awaiting_browser') {
-    return (
-      <Step title={`Sign in with ${title}`}>
-        <p className="text-sm text-muted-foreground">
-          We opened {title} in your browser. Authorize Hermes there and you'll be connected
-          automatically — nothing to copy or paste.
-        </p>
-        <FlowFooter left={<DocsLink href={flow.start.auth_url}>Re-open sign-in page</DocsLink>}>
-          <span className="flex items-center gap-2 text-xs text-muted-foreground">
-            <Loader2 className="size-3 animate-spin" />
-            Waiting for you to authorize...
-          </span>
-          <CancelBtn size="sm" />
-        </FlowFooter>
-      </Step>
-    )
-  }
-
   if (flow.status === 'external_pending') {
     return (
       <Step title={`Sign in with ${title}`}>

apps/desktop/src/components/error-boundary.tsx

@@ -1,91 +0,0 @@
-import { Component, type ErrorInfo, type ReactNode } from 'react'
-
-import { Button } from '@/components/ui/button'
-import { AlertTriangle, RefreshCw } from '@/lib/icons'
-
-export interface ErrorBoundaryFallbackProps {
-  error: Error
-  reset: () => void
-}
-
-interface ErrorBoundaryProps {
-  children: ReactNode
-  fallback?: (props: ErrorBoundaryFallbackProps) => ReactNode
-  label?: string
-  onError?: (error: Error, info: ErrorInfo) => void
-}
-
-interface ErrorBoundaryState {
-  error: Error | null
-}
-
-export class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
-  state: ErrorBoundaryState = { error: null }
-
-  static getDerivedStateFromError(error: Error): ErrorBoundaryState {
-    return { error }
-  }
-
-  componentDidCatch(error: Error, info: ErrorInfo) {
-    const tag = this.props.label ? `[error-boundary:${this.props.label}]` : '[error-boundary]'
-    console.error(tag, error, info.componentStack)
-    this.props.onError?.(error, info)
-  }
-
-  reset = () => {
-    this.setState({ error: null })
-  }
-
-  render() {
-    const { error } = this.state
-
-    if (!error) {
-      return this.props.children
-    }
-
-    if (this.props.fallback) {
-      return this.props.fallback({ error, reset: this.reset })
-    }
-
-    return <RootErrorFallback error={error} reset={this.reset} />
-  }
-}
-
-function RootErrorFallback({ error, reset }: ErrorBoundaryFallbackProps) {
-  return (
-    <div className="fixed inset-0 z-[1500] flex items-center justify-center bg-(--ui-chat-surface-background) p-6">
-      <div className="w-full max-w-[40rem] overflow-hidden rounded-xl border border-(--ui-stroke-secondary) bg-(--ui-chat-bubble-background) shadow-sm">
-        <div className="flex items-start gap-3 border-b border-(--ui-stroke-tertiary) px-5 py-4">
-          <div className="flex size-9 shrink-0 items-center justify-center rounded-lg bg-destructive/10 text-destructive">
-            <AlertTriangle className="size-5" />
-          </div>
-          <div>
-            <h2 className="text-[0.9375rem] font-semibold tracking-tight">Something broke in the interface</h2>
-            <p className="mt-1 text-[0.8125rem] leading-5 text-(--ui-text-tertiary)">
-              The view hit an unexpected error. Your chats and settings are safe - try again, or reload the window.
-            </p>
-          </div>
-        </div>
-
-        <div className="grid gap-4 p-5">
-          <div className="rounded-2xl border border-destructive/30 bg-destructive/10 px-4 py-3 font-mono text-[0.7rem] leading-4 text-destructive">
-            {error.message || String(error)}
-          </div>
-
-          <div className="flex flex-wrap gap-2">
-            <Button onClick={reset}>
-              <RefreshCw className="size-4" />
-              Try again
-            </Button>
-            <Button onClick={() => window.location.reload()} variant="outline">
-              Reload window
-            </Button>
-            <Button onClick={() => void window.hermesDesktop?.revealLogs()?.catch(() => undefined)} variant="ghost">
-              Open logs
-            </Button>
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}

apps/desktop/src/components/gateway-connecting-overlay.tsx

@@ -1,183 +0,0 @@
-import { useStore } from '@nanostores/react'
-import { useEffect, useRef, useState } from 'react'
-
-import { cn } from '@/lib/utils'
-import { $desktopBoot } from '@/store/boot'
-import { $gatewayState } from '@/store/session'
-
-// Static, always-legible prefix; only TAIL ever scrambles. Splitting them at
-// the render level means no timer logic (even a stale HMR one) can ever
-// scramble "CONN".
-const PREFIX = 'CONN'
-const TAIL = 'ECTING'
-// Even-weight mono ascii so cycling glyphs don't jump width (matches the
-// nousnet-web download-button decode effect).
-const SCRAMBLE_CHARS = '/\\|-_=+<>~:*'
-const TICK_MS = 45
-
-// Exit choreography (ms): text fades down + out, hold, then the overlay fades.
-const TEXT_OUT_MS = 360
-const POST_TEXT_HOLD_MS = 300
-const OVERLAY_OUT_MS = 520
-// Preview-only: how long to "connect" for, and the pause before replaying.
-const PREVIEW_CONNECT_MS = 2600
-const PREVIEW_REPLAY_MS = 1100
-
-type Phase = 'live' | 'text-out' | 'overlay-out' | 'gone'
-
-// Dev affordance: a warm Cmd+R reconnects almost instantly, so the overlay
-// only flashes. Load with `?connecting=1` to force a looping preview.
-function forcedPreview(): boolean {
-  if (!import.meta.env.DEV || typeof window === 'undefined') {
-    return false
-  }
-
-  try {
-    return new URLSearchParams(window.location.search).get('connecting') === '1'
-  } catch {
-    return false
-  }
-}
-
-function scrambledTail(resolvedCount: number): string {
-  return Array.from(TAIL, (ch, i) =>
-    i < resolvedCount ? ch : SCRAMBLE_CHARS[(Math.random() * SCRAMBLE_CHARS.length) | 0]
-  ).join('')
-}
-
-export function GatewayConnectingOverlay() {
-  const gatewayState = useStore($gatewayState)
-  const boot = useStore($desktopBoot)
-  const [previewing] = useState(forcedPreview)
-  const [tail, setTail] = useState(TAIL)
-  const [phase, setPhase] = useState<Phase>('live')
-
-  const connecting = gatewayState !== 'open' && !boot.error
-  // Latches once we've actually shown the overlay, so the brief frame where
-  // gatewayState flips to "open" (connecting -> false) before the exit phase
-  // kicks in doesn't unmount us and cause a flash.
-  const shownRef = useRef(false)
-
-  if (previewing || connecting) {
-    shownRef.current = true
-  }
-
-  // Decode loop — only while live (freeze the resolved word during the exit).
-  useEffect(() => {
-    if (phase !== 'live' || (!previewing && !connecting)) {
-      return
-    }
-
-    let resolved = 0
-    let hold = 0
-
-    const id = window.setInterval(() => {
-      if (resolved >= TAIL.length) {
-        hold += 1
-
-        if (hold > 16) {
-          resolved = 0
-          hold = 0
-        }
-
-        setTail(TAIL)
-
-        return
-      }
-
-      resolved += 0.5
-      setTail(scrambledTail(Math.floor(resolved)))
-    }, TICK_MS)
-
-    return () => window.clearInterval(id)
-  }, [phase, previewing, connecting])
-
-  // Kick off the exit when connected: real connect, or a faked timer in preview.
-  useEffect(() => {
-    if (phase !== 'live') {
-      return
-    }
-
-    if (previewing) {
-      const id = window.setTimeout(() => {
-        setTail(TAIL)
-        setPhase('text-out')
-      }, PREVIEW_CONNECT_MS)
-
-      return () => window.clearTimeout(id)
-    }
-
-    if (gatewayState === 'open' && shownRef.current) {
-      setTail(TAIL)
-      setPhase('text-out')
-    }
-  }, [phase, previewing, gatewayState])
-
-  // Advance the exit choreography: text-out -> overlay-out -> gone.
-  useEffect(() => {
-    if (phase === 'text-out') {
-      const id = window.setTimeout(() => setPhase('overlay-out'), TEXT_OUT_MS + POST_TEXT_HOLD_MS)
-
-      return () => window.clearTimeout(id)
-    }
-
-    if (phase === 'overlay-out') {
-      const id = window.setTimeout(() => setPhase('gone'), OVERLAY_OUT_MS)
-
-      return () => window.clearTimeout(id)
-    }
-
-    // Preview replays so we can keep watching the transition.
-    if (phase === 'gone' && previewing) {
-      const id = window.setTimeout(() => {
-        setTail(TAIL)
-        setPhase('live')
-      }, PREVIEW_REPLAY_MS)
-
-      return () => window.clearTimeout(id)
-    }
-  }, [phase, previewing])
-
-  // Boot failed — BootFailureOverlay owns the screen; don't linger behind it.
-  if (boot.error && !previewing) {
-    return null
-  }
-
-  // Real connect: once the fade finishes, get out of the way for good.
-  if (phase === 'gone' && !previewing) {
-    return null
-  }
-
-  // Never showed (e.g. gateway already up on a warm reload) — stay out.
-  if (!previewing && !connecting && !shownRef.current) {
-    return null
-  }
-
-  const leaving = phase !== 'live'
-  const overlayHidden = phase === 'overlay-out' || phase === 'gone'
-
-  return (
-    <div
-      className={cn(
-        'fixed inset-0 z-[1200] grid place-items-center bg-(--ui-chat-surface-background) transition-opacity duration-500 ease-out',
-        overlayHidden ? 'pointer-events-none opacity-0' : 'opacity-100'
-      )}
-    >
-      <style>{'@keyframes gco-cursor { 0%, 49% { opacity: 1 } 50%, 100% { opacity: 0 } }'}</style>
-      <span
-        className={cn(
-          'inline-flex items-center pl-[0.4em] font-mono text-[0.64rem] font-semibold uppercase tracking-[0.4em] tabular-nums text-(--theme-primary) transition duration-300 ease-out',
-          leaving ? 'translate-y-2 opacity-0 saturate-0' : 'translate-y-0 opacity-100 saturate-100'
-        )}
-      >
-        {PREFIX}
-        {tail}
-        <span
-          aria-hidden="true"
-          className="dither ml-0.5 inline-block size-2 shrink-0 -translate-y-px rounded-[1px]"
-          style={{ animation: 'gco-cursor 1s step-end infinite' }}
-        />
-      </span>
-    </div>
-  )
-}

apps/desktop/src/components/model-visibility-dialog.tsx

@@ -1,148 +0,0 @@
-import { useStore } from '@nanostores/react'
-import { useQuery } from '@tanstack/react-query'
-import { useMemo, useState } from 'react'
-
-import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog'
-import { Switch } from '@/components/ui/switch'
-import type { HermesGateway } from '@/hermes'
-import { getGlobalModelOptions } from '@/hermes'
-import { displayModelName, modelDisplayParts } from '@/lib/model-status-label'
-import {
-  $visibleModels,
-  collapseModelFamilies,
-  effectiveVisibleKeys,
-  modelVisibilityKey,
-  setVisibleModels
-} from '@/store/model-visibility'
-import type { ModelOptionProvider, ModelOptionsResponse } from '@/types/hermes'
-
-interface ModelVisibilityDialogProps {
-  gw?: HermesGateway
-  onOpenChange: (open: boolean) => void
-  onOpenProviders: () => void
-  open: boolean
-  sessionId?: string | null
-}
-
-export function ModelVisibilityDialog({ gw, onOpenChange, onOpenProviders, open, sessionId }: ModelVisibilityDialogProps) {
-  const [search, setSearch] = useState('')
-  const stored = useStore($visibleModels)
-
-  const modelOptions = useQuery({
-    queryKey: ['model-options', sessionId || 'global'],
-    queryFn: (): Promise<ModelOptionsResponse> => {
-      if (gw && sessionId) {
-        return gw.request<ModelOptionsResponse>('model.options', { session_id: sessionId })
-      }
-
-      return getGlobalModelOptions()
-    },
-    enabled: open
-  })
-
-  const providers = useMemo(
-    () => (modelOptions.data?.providers ?? []).filter(provider => (provider.models ?? []).length > 0),
-    [modelOptions.data]
-  )
-
-  const visible = effectiveVisibleKeys(stored, providers)
-
-  const toggle = (provider: ModelOptionProvider, model: string) => {
-    const next = new Set(effectiveVisibleKeys($visibleModels.get(), providers))
-    const key = modelVisibilityKey(provider.slug, model)
-
-    if (next.has(key)) {
-      next.delete(key)
-    } else {
-      next.add(key)
-    }
-
-    setVisibleModels(next)
-  }
-
-  const q = search.trim().toLowerCase()
-
-  const matches = (provider: ModelOptionProvider, model: string) =>
-    !q || `${model} ${provider.name} ${provider.slug} ${displayModelName(model)}`.toLowerCase().includes(q)
-
-  return (
-    <Dialog onOpenChange={onOpenChange} open={open}>
-      <DialogContent className="max-w-xs gap-0 overflow-hidden p-0">
-        <DialogHeader className="px-3 pb-1 pt-3">
-          <DialogTitle className="text-[0.8125rem]">Models</DialogTitle>
-        </DialogHeader>
-
-        <div className="px-3 py-1.5">
-          <input
-            autoFocus
-            className="h-5 w-full bg-transparent text-xs text-foreground placeholder:text-(--ui-text-tertiary) focus:outline-none"
-            onChange={event => setSearch(event.target.value)}
-            placeholder="Search models"
-            type="text"
-            value={search}
-          />
-        </div>
-
-        <div className="max-h-[55vh] overflow-y-auto pb-1">
-          {providers.length === 0 ? (
-            <div className="px-3 py-5 text-center text-xs text-muted-foreground">
-              {modelOptions.isPending ? 'Loading…' : 'No authenticated providers.'}
-            </div>
-          ) : (
-            providers.map(provider => {
-              const models = collapseModelFamilies(provider.models ?? []).filter(family =>
-                matches(provider, family.id)
-              )
-
-              if (models.length === 0) {
-                return null
-              }
-
-              return (
-                <div className="py-0.5" key={provider.slug}>
-                  <div className="px-3 pb-0.5 pt-1 text-[0.625rem] font-medium uppercase tracking-wide text-(--ui-text-tertiary)">
-                    {provider.name}
-                  </div>
-                  {models.map(family => {
-                    const { name, tag } = modelDisplayParts(family.id)
-                    const key = modelVisibilityKey(provider.slug, family.id)
-
-                    return (
-                      <label
-                        className="flex cursor-pointer items-center gap-2 px-3 py-1 text-xs hover:bg-accent/50"
-                        key={key}
-                      >
-                        <span className="min-w-0 flex-1 truncate">
-                          {name}
-                          {tag ? <span className="text-(--ui-text-tertiary)"> {tag}</span> : null}
-                        </span>
-                        <Switch
-                          checked={visible.has(key)}
-                          className="cursor-pointer"
-                          onCheckedChange={() => toggle(provider, family.id)}
-                        />
-                      </label>
-                    )
-                  })}
-                </div>
-              )
-            })
-          )}
-        </div>
-
-        <div className="px-3 py-2">
-          <button
-            className="text-xs text-(--ui-text-tertiary) transition-colors hover:text-foreground"
-            onClick={() => {
-              onOpenChange(false)
-              onOpenProviders()
-            }}
-            type="button"
-          >
-            Add provider…
-          </button>
-        </div>
-      </DialogContent>
-    </Dialog>
-  )
-}

apps/desktop/src/components/ui/button.tsx

@@ -5,7 +5,7 @@ import * as React from 'react'
 import { cn } from '@/lib/utils'
 
 const buttonVariants = cva(
-  "inline-flex shrink-0 cursor-pointer items-center justify-center gap-2 rounded-md text-sm font-medium whitespace-nowrap transition-all outline-none focus-visible:border-ring focus-visible:ring-[0.1875rem] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:cursor-default disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+  "inline-flex shrink-0 items-center justify-center gap-2 rounded-md text-sm font-medium whitespace-nowrap transition-all outline-none focus-visible:border-ring focus-visible:ring-[0.1875rem] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
   {
     variants: {
       variant: {

apps/desktop/src/components/ui/dialog.tsx

@@ -46,10 +46,7 @@ function DialogContent({
       <DialogOverlay />
       <DialogPrimitive.Content
         className={cn(
-          // Cap height at 85vh and let long content scroll inside the dialog
-          // instead of overflowing off-screen (long cron titles, tool detail
-          // dumps, etc.). Individual dialogs can still override via className.
-          'fixed left-1/2 top-1/2 z-[130] pointer-events-auto grid max-h-[85vh] w-full max-w-lg -translate-x-1/2 -translate-y-1/2 gap-3 overflow-y-auto rounded-xl border border-(--ui-stroke-secondary) bg-(--ui-chat-bubble-background) p-4 text-[length:var(--conversation-text-font-size)] text-foreground shadow-md duration-200 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95',
+          'fixed left-1/2 top-1/2 z-[130] pointer-events-auto grid w-full max-w-lg -translate-x-1/2 -translate-y-1/2 gap-3 rounded-xl border border-(--ui-stroke-secondary) bg-(--ui-chat-bubble-background) p-4 text-[length:var(--conversation-text-font-size)] text-foreground shadow-md duration-200 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95',
           className
         )}
         data-slot="dialog-content"

apps/desktop/src/components/ui/dropdown-menu.tsx

@@ -4,17 +4,6 @@ import * as React from 'react'
 import { Codicon } from '@/components/ui/codicon'
 import { cn } from '@/lib/utils'
 
-// Shared class tokens for edge-to-edge menus (use with `p-0` content): rows go
-// full-width, square, and compact so the highlight spans the whole surface.
-// Reuse these instead of re-deriving per menu so every searchable/compact menu
-// reads identically.
-export const dropdownMenuRow = 'gap-2 rounded-none px-2.5 py-1 text-xs'
-export const dropdownMenuSectionLabel = 'px-2.5 pt-1 pb-0.5 text-[0.625rem] font-medium uppercase tracking-wide'
-
-// Keys that must reach Radix's menu handler (navigation/close). Everything else
-// is a filter keystroke and is stopped so the menu's typeahead doesn't hijack it.
-const DROPDOWN_NAV_KEYS = new Set(['ArrowDown', 'ArrowUp', 'Enter', 'Escape', 'Tab'])
-
 function DropdownMenu({ ...props }: React.ComponentProps<typeof DropdownMenuPrimitive.Root>) {
   return <DropdownMenuPrimitive.Root data-slot="dropdown-menu" {...props} />
 }
@@ -27,65 +16,18 @@ function DropdownMenuTrigger({ ...props }: React.ComponentProps<typeof DropdownM
   return <DropdownMenuPrimitive.Trigger data-slot="dropdown-menu-trigger" {...props} />
 }
 
-/**
- * Borderless filter input for a searchable dropdown. Autofocuses, keeps the
- * menu's typeahead from eating keystrokes, and still lets arrow/enter/escape
- * drive the list. Drop it in as the first child of a `DropdownMenuContent`.
- */
-function DropdownMenuSearch({
-  className,
-  onChange,
-  onKeyDown,
-  onValueChange,
-  ...props
-}: Omit<React.ComponentProps<'input'>, 'type'> & {
-  onValueChange?: (value: string) => void
-}) {
-  return (
-    <div className="px-2.5 py-1.5" data-slot="dropdown-menu-search">
-      <input
-        autoFocus
-        className={cn(
-          'h-4 w-full bg-transparent text-xs leading-none text-foreground placeholder:text-(--ui-text-tertiary) focus:outline-none',
-          className
-        )}
-        onChange={event => {
-          onChange?.(event)
-          onValueChange?.(event.target.value)
-        }}
-        onKeyDown={event => {
-          if (!DROPDOWN_NAV_KEYS.has(event.key)) {
-            event.stopPropagation()
-          }
-
-          onKeyDown?.(event)
-        }}
-        type="text"
-        {...props}
-      />
-    </div>
-  )
-}
-
 function DropdownMenuContent({
   className,
-  collisionPadding = 8,
   sideOffset = 4,
   ...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.Content>) {
   return (
     <DropdownMenuPrimitive.Portal>
       <DropdownMenuPrimitive.Content
-        // `dt-portal-scrollbar` reproduces the thin themed scrollbar from
-        // `.scrollbar-dt` for portaled overlays (Radix renders this under
-        // document.body, outside #root's scope). See styles.css.
         className={cn(
-          'dt-portal-scrollbar z-50 max-h-(--radix-dropdown-menu-content-available-height) min-w-36 origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-lg border border-(--ui-stroke-secondary) bg-[color-mix(in_srgb,var(--ui-bg-elevated)_96%,transparent)] p-1 text-[length:var(--conversation-text-font-size)] text-popover-foreground shadow-md backdrop-blur-md data-[side=bottom]:slide-in-from-top-1 data-[side=left]:slide-in-from-right-1 data-[side=right]:slide-in-from-left-1 data-[side=top]:slide-in-from-bottom-1 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95',
+          'z-50 max-h-(--radix-dropdown-menu-content-available-height) min-w-36 origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-lg border border-(--ui-stroke-secondary) bg-[color-mix(in_srgb,var(--ui-bg-elevated)_96%,transparent)] p-1 text-[length:var(--conversation-text-font-size)] text-popover-foreground shadow-md backdrop-blur-md data-[side=bottom]:slide-in-from-top-1 data-[side=left]:slide-in-from-right-1 data-[side=right]:slide-in-from-left-1 data-[side=top]:slide-in-from-bottom-1 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95',
           className
         )}
-        // Keep the menu inside the viewport: Radix flips/shifts away from edges
-        // (avoidCollisions defaults on); the padding stops it kissing the edge.
-        collisionPadding={collisionPadding}
         data-slot="dropdown-menu-content"
         sideOffset={sideOffset}
         {...props}
@@ -131,16 +73,18 @@ function DropdownMenuCheckboxItem({
     <DropdownMenuPrimitive.CheckboxItem
       checked={checked}
       className={cn(
-        "relative flex cursor-default items-center gap-2 rounded-md px-2 py-1 text-xs outline-hidden select-none focus:bg-(--ui-control-active-background) focus:text-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5",
+        "relative flex cursor-default items-center gap-2 rounded-md py-1 pr-2 pl-7 text-xs outline-hidden select-none focus:bg-(--ui-control-active-background) focus:text-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5",
         className
       )}
       data-slot="dropdown-menu-checkbox-item"
       {...props}
     >
+      <span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
+        <DropdownMenuPrimitive.ItemIndicator>
+          <Codicon name="check" size="1rem" />
+        </DropdownMenuPrimitive.ItemIndicator>
+      </span>
       {children}
-      <DropdownMenuPrimitive.ItemIndicator className="ml-auto flex items-center pl-2 text-foreground">
-        <Codicon name="check" size="0.75rem" />
-      </DropdownMenuPrimitive.ItemIndicator>
     </DropdownMenuPrimitive.CheckboxItem>
   )
 }
@@ -157,16 +101,18 @@ function DropdownMenuRadioItem({
   return (
     <DropdownMenuPrimitive.RadioItem
       className={cn(
-        "relative flex cursor-default items-center gap-2 rounded-md px-2 py-1 text-xs outline-hidden select-none focus:bg-(--ui-control-active-background) focus:text-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5",
+        "relative flex cursor-default items-center gap-2 rounded-md py-1 pr-2 pl-7 text-xs outline-hidden select-none focus:bg-(--ui-control-active-background) focus:text-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5",
         className
       )}
       data-slot="dropdown-menu-radio-item"
       {...props}
     >
+      <span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
+        <DropdownMenuPrimitive.ItemIndicator>
+          <Codicon name="primitive-dot" size="0.5rem" />
+        </DropdownMenuPrimitive.ItemIndicator>
+      </span>
       {children}
-      <DropdownMenuPrimitive.ItemIndicator className="ml-auto flex items-center pl-2 text-foreground">
-        <Codicon name="check" size="0.75rem" />
-      </DropdownMenuPrimitive.ItemIndicator>
     </DropdownMenuPrimitive.RadioItem>
   )
 }
@@ -215,13 +161,10 @@ function DropdownMenuSub({ ...props }: React.ComponentProps<typeof DropdownMenuP
 function DropdownMenuSubTrigger({
   className,
   inset,
-  hideChevron = false,
   children,
   ...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.SubTrigger> & {
   inset?: boolean
-  /** Suppress the trailing caret — for triggers that own their right-side affordance. */
-  hideChevron?: boolean
 }) {
   return (
     <DropdownMenuPrimitive.SubTrigger
@@ -234,40 +177,24 @@ function DropdownMenuSubTrigger({
       {...props}
     >
       {children}
-      {!hideChevron && <Codicon className="ml-auto text-(--ui-text-tertiary)" name="chevron-right" size="1rem" />}
+      <Codicon className="ml-auto text-(--ui-text-tertiary)" name="chevron-right" size="1rem" />
     </DropdownMenuPrimitive.SubTrigger>
   )
 }
 
 function DropdownMenuSubContent({
   className,
-  collisionPadding = 8,
   ...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.SubContent>) {
   return (
-    // Portal the submenu out of the parent Content so it escapes that Content's
-    // `overflow` clip. Without this, a submenu opening from a scrollable menu
-    // gets visually cut off at the parent's edges. Radix Popper still anchors
-    // it to the SubTrigger and handles collision/flip, so portaling is safe.
-    <DropdownMenuPrimitive.Portal>
-      <DropdownMenuPrimitive.SubContent
-        // `dt-portal-scrollbar` reproduces the themed scrollbar for portaled
-        // overlays (rendered under document.body). Use a fixed `max-h-80`
-        // rather than the Radix available-height variable: that variable is
-        // only published on Content, NOT SubContent — using it here collapses
-        // the submenu to 0px height.
-        className={cn(
-          'dt-portal-scrollbar z-50 max-h-80 min-w-36 origin-(--radix-dropdown-menu-content-transform-origin) overflow-y-auto rounded-lg border border-(--ui-stroke-secondary) bg-[color-mix(in_srgb,var(--ui-bg-elevated)_96%,transparent)] p-1 text-[length:var(--conversation-text-font-size)] text-popover-foreground shadow-md backdrop-blur-md data-[side=bottom]:slide-in-from-top-1 data-[side=left]:slide-in-from-right-1 data-[side=right]:slide-in-from-left-1 data-[side=top]:slide-in-from-bottom-1 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95',
-          className
-        )}
-        // Flip to the other side / shift vertically when near a viewport edge
-        // (e.g. the status bar menu opening from the bottom-right corner) so
-        // the submenu never gets clipped.
-        collisionPadding={collisionPadding}
-        data-slot="dropdown-menu-sub-content"
-        {...props}
-      />
-    </DropdownMenuPrimitive.Portal>
+    <DropdownMenuPrimitive.SubContent
+      className={cn(
+        'z-50 min-w-36 origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-lg border border-(--ui-stroke-secondary) bg-[color-mix(in_srgb,var(--ui-bg-elevated)_96%,transparent)] p-1 text-[length:var(--conversation-text-font-size)] text-popover-foreground shadow-md backdrop-blur-md data-[side=bottom]:slide-in-from-top-1 data-[side=left]:slide-in-from-right-1 data-[side=right]:slide-in-from-left-1 data-[side=top]:slide-in-from-bottom-1 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95',
+        className
+      )}
+      data-slot="dropdown-menu-sub-content"
+      {...props}
+    />
   )
 }
 
@@ -281,7 +208,6 @@ export {
   DropdownMenuPortal,
   DropdownMenuRadioGroup,
   DropdownMenuRadioItem,
-  DropdownMenuSearch,
   DropdownMenuSeparator,
   DropdownMenuShortcut,
   DropdownMenuSub,

apps/desktop/src/global.d.ts

@@ -27,11 +27,6 @@ declare global {
       setPreviewShortcutActive?: (active: boolean) => void
       openExternal: (url: string) => Promise<void>
       fetchLinkTitle: (url: string) => Promise<string>
-      settings: {
-        getDefaultProjectDir: () => Promise<{ defaultLabel: string; dir: null | string }>
-        pickDefaultProjectDir: () => Promise<{ canceled: boolean; dir: null | string }>
-        setDefaultProjectDir: (dir: null | string) => Promise<{ dir: null | string }>
-      }
       revealLogs: () => Promise<{ ok: boolean; path: string; error?: string }>
       getRecentLogs: () => Promise<{ path: string; lines: string[] }>
       readDir: (path: string) => Promise<HermesReadDirResult>
@@ -53,7 +48,6 @@ declare global {
       getBootstrapState: () => Promise<DesktopBootstrapState>
       resetBootstrap: () => Promise<{ ok: boolean }>
       repairBootstrap: () => Promise<{ ok: boolean }>
-      cancelBootstrap: () => Promise<{ ok: boolean; cancelled: boolean }>
       onBootstrapEvent: (callback: (payload: DesktopBootstrapEvent) => void) => () => void
       getVersion: () => Promise<DesktopVersionInfo>
       updates: {
@@ -200,7 +194,12 @@ export interface DesktopBootstrapStageDescriptor {
   needs_user_input?: boolean
 }
 
-export type DesktopBootstrapStageState = 'pending' | 'running' | 'succeeded' | 'skipped' | 'failed'
+export type DesktopBootstrapStageState =
+  | 'pending'
+  | 'running'
+  | 'succeeded'
+  | 'skipped'
+  | 'failed'
 
 export interface DesktopBootstrapStageResult {
   state: DesktopBootstrapStageState
@@ -249,6 +248,7 @@ export type DesktopBootstrapEvent =
       docsUrl: string
     }
 
+
 export interface HermesApiRequest {
   path: string
   method?: string

apps/desktop/src/hermes.ts

@@ -111,14 +111,9 @@ export class HermesGateway extends JsonRpcGatewayClient {
   }
 }
 
-export async function listSessions(
-  limit = 40,
-  minMessages = 0,
-  archived: 'exclude' | 'include' | 'only' = 'exclude',
-  order: 'created' | 'recent' = 'recent'
-): Promise<PaginatedSessions> {
+export async function listSessions(limit = 40, minMessages = 0): Promise<PaginatedSessions> {
   const result = await window.hermesDesktop.api<PaginatedSessions>({
-    path: `/api/sessions?limit=${limit}&offset=0&min_messages=${Math.max(0, minMessages)}&archived=${archived}&order=${order}`
+    path: `/api/sessions?limit=${limit}&offset=0&min_messages=${Math.max(0, minMessages)}`
   })
 
   return {
@@ -128,14 +123,6 @@ export async function listSessions(
   }
 }
 
-export function setSessionArchived(id: string, archived: boolean): Promise<{ ok: boolean }> {
-  return window.hermesDesktop.api<{ ok: boolean }>({
-    path: `/api/sessions/${encodeURIComponent(id)}`,
-    method: 'PATCH',
-    body: { archived }
-  })
-}
-
 export function searchSessions(query: string): Promise<SessionSearchResponse> {
   return window.hermesDesktop.api<SessionSearchResponse>({
     path: `/api/sessions/search?q=${encodeURIComponent(query)}`

apps/desktop/src/lib/ansi.test.ts

@@ -1,123 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { ansiColorClass, hasAnsiCodes, parseAnsi } from './ansi'
-
-const ESC = '\x1b'
-
-describe('parseAnsi', () => {
-  it('returns a single default segment for plain text', () => {
-    expect(parseAnsi('hello world')).toEqual([{ bold: false, fg: null, text: 'hello world' }])
-  })
-
-  it('returns nothing for an empty string', () => {
-    expect(parseAnsi('')).toEqual([])
-  })
-
-  it('parses a basic foreground color sequence and resets', () => {
-    const input = `${ESC}[31merror${ESC}[0m ok`
-
-    expect(parseAnsi(input)).toEqual([
-      { bold: false, fg: 'red', text: 'error' },
-      { bold: false, fg: null, text: ' ok' }
-    ])
-  })
-
-  it('treats bold (1) and bold-off (22) as toggles without affecting fg', () => {
-    const input = `${ESC}[1mloud${ESC}[22m quiet`
-
-    expect(parseAnsi(input)).toEqual([
-      { bold: true, fg: null, text: 'loud' },
-      { bold: false, fg: null, text: ' quiet' }
-    ])
-  })
-
-  it('treats default-fg (39) as a foreground-only reset (keeps bold)', () => {
-    const input = `${ESC}[1;31mboth${ESC}[39mbold-only`
-
-    expect(parseAnsi(input)).toEqual([
-      { bold: true, fg: 'red', text: 'both' },
-      { bold: true, fg: null, text: 'bold-only' }
-    ])
-  })
-
-  it('handles bright colors via the 90-97 range', () => {
-    expect(parseAnsi(`${ESC}[92mgreen`)).toEqual([{ bold: false, fg: 'bright-green', text: 'green' }])
-  })
-
-  it('coalesces adjacent runs with the same style', () => {
-    const input = `${ESC}[31ma${ESC}[31mb${ESC}[31mc`
-
-    expect(parseAnsi(input)).toEqual([{ bold: false, fg: 'red', text: 'abc' }])
-  })
-
-  it('skips 256-color (38;5) trailing args without painting fg or leaking the params as text', () => {
-    // 256-color and truecolor aren't rendered (FG_BY_CODE doesn't cover them),
-    // but the parser must consume the trailing `;5;<n>` / `;2;r;g;b` args so
-    // they never bleed into the visible segment text.
-    const segments = parseAnsi(`${ESC}[38;5;208morange${ESC}[0m`)
-
-    expect(segments).toHaveLength(1)
-    expect(segments[0].fg).toBe(null)
-    expect(segments[0].text).toBe('orange')
-  })
-
-  it('skips truecolor (38;2;r;g;b) trailing args', () => {
-    const segments = parseAnsi(`${ESC}[38;2;10;20;30mrgb${ESC}[0m`)
-
-    expect(segments).toHaveLength(1)
-    expect(segments[0].fg).toBe(null)
-    expect(segments[0].text).toBe('rgb')
-  })
-
-  it('drops non-SGR CSI sequences (cursor motion, erase) without consuming surrounding text', () => {
-    const input = `before${ESC}[2Jmiddle${ESC}[10;5Hafter`
-
-    expect(parseAnsi(input)).toEqual([{ bold: false, fg: null, text: 'beforemiddleafter' }])
-  })
-
-  it('treats an empty SGR parameter (ESC[m) as a full reset', () => {
-    const input = `${ESC}[1;31mfoo${ESC}[mbar`
-
-    expect(parseAnsi(input)).toEqual([
-      { bold: true, fg: 'red', text: 'foo' },
-      { bold: false, fg: null, text: 'bar' }
-    ])
-  })
-})
-
-describe('hasAnsiCodes', () => {
-  it('returns false for plain text', () => {
-    expect(hasAnsiCodes('hello world')).toBe(false)
-  })
-
-  it('returns true when any CSI introducer is present', () => {
-    expect(hasAnsiCodes(`${ESC}[31mred`)).toBe(true)
-  })
-})
-
-describe('ansiColorClass', () => {
-  it('returns a non-empty Tailwind class string for every supported color', () => {
-    const colors = [
-      'black',
-      'red',
-      'green',
-      'yellow',
-      'blue',
-      'magenta',
-      'cyan',
-      'white',
-      'bright-black',
-      'bright-red',
-      'bright-green',
-      'bright-yellow',
-      'bright-blue',
-      'bright-magenta',
-      'bright-cyan',
-      'bright-white'
-    ] as const
-
-    for (const color of colors) {
-      expect(ansiColorClass(color)).toMatch(/\S/)
-    }
-  })
-})

apps/desktop/src/lib/ansi.ts

@@ -1,175 +0,0 @@
-// Minimal ANSI SGR parser for rendering terminal output inside chat tool
-// cards. Only handles the SGR codes that show up in practice (color, bold,
-// reset); cursor motions and other CSI sequences are dropped silently.
-//
-// Returns a flat array of styled segments so callers can render them as
-// React spans without each consumer having to re-implement the parser.
-
-export interface AnsiSegment {
-  bold: boolean
-  /** Tailwind text-color class or null for the default foreground. */
-  fg: AnsiColor | null
-  text: string
-}
-
-export type AnsiColor =
-  | 'black'
-  | 'red'
-  | 'green'
-  | 'yellow'
-  | 'blue'
-  | 'magenta'
-  | 'cyan'
-  | 'white'
-  | 'bright-black'
-  | 'bright-red'
-  | 'bright-green'
-  | 'bright-yellow'
-  | 'bright-blue'
-  | 'bright-magenta'
-  | 'bright-cyan'
-  | 'bright-white'
-
-const FG_BY_CODE: Record<number, AnsiColor> = {
-  30: 'black',
-  31: 'red',
-  32: 'green',
-  33: 'yellow',
-  34: 'blue',
-  35: 'magenta',
-  36: 'cyan',
-  37: 'white',
-  90: 'bright-black',
-  91: 'bright-red',
-  92: 'bright-green',
-  93: 'bright-yellow',
-  94: 'bright-blue',
-  95: 'bright-magenta',
-  96: 'bright-cyan',
-  97: 'bright-white'
-}
-
-// CSI = ESC '[' params 'final'. We only care about SGR (final == 'm'); other
-// final bytes are matched and consumed so they don't leak into the rendered
-// text. Range covers the common CSI command set (A-Z / a-z / @).
-// eslint-disable-next-line no-control-regex
-const CSI_RE = /\x1b\[([\d;]*)([\x40-\x7e])/g
-// Other escape sequences (single-char OSC/SS3/etc.) — strip silently.
-// eslint-disable-next-line no-control-regex
-const OTHER_ESCAPE_RE = /\x1b[@-Z\\-_]|\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g
-
-export function parseAnsi(input: string): AnsiSegment[] {
-  if (!input) {
-    return []
-  }
-
-  // Strip non-CSI escapes upfront — none of them carry text we want to keep
-  // and CSI_RE wouldn't match them.
-  const cleaned = input.replace(OTHER_ESCAPE_RE, '')
-
-  const segments: AnsiSegment[] = []
-  let cursor = 0
-  let bold = false
-  let fg: AnsiColor | null = null
-
-  const pushText = (text: string) => {
-    if (!text) {
-      return
-    }
-
-    const last = segments.at(-1)
-
-    if (last && last.bold === bold && last.fg === fg) {
-      last.text += text
-
-      return
-    }
-
-    segments.push({ bold, fg, text })
-  }
-
-  CSI_RE.lastIndex = 0
-  let match: RegExpExecArray | null
-
-  while ((match = CSI_RE.exec(cleaned)) !== null) {
-    const start = match.index
-
-    if (start > cursor) {
-      pushText(cleaned.slice(cursor, start))
-    }
-
-    if (match[2] === 'm') {
-      const codes = match[1]
-        .split(';')
-        .map(part => (part === '' ? 0 : Number(part)))
-        .filter(value => Number.isFinite(value))
-
-      for (let i = 0; i < codes.length; i += 1) {
-        const code = codes[i]
-
-        if (code === 0) {
-          bold = false
-          fg = null
-        } else if (code === 1) {
-          bold = true
-        } else if (code === 22) {
-          bold = false
-        } else if (code === 39) {
-          fg = null
-        } else if (code in FG_BY_CODE) {
-          fg = FG_BY_CODE[code]
-        } else if (code === 38) {
-          // 256-color / truecolor — skip the trailing args we don't render.
-          if (codes[i + 1] === 5) {
-            i += 2
-          } else if (codes[i + 1] === 2) {
-            i += 4
-          }
-        }
-        // Background colors (40-47, 100-107) and effects we don't render are
-        // intentionally ignored — the segment keeps the prior bold/fg state.
-      }
-    }
-
-    cursor = CSI_RE.lastIndex
-  }
-
-  if (cursor < cleaned.length) {
-    pushText(cleaned.slice(cursor))
-  }
-
-  return segments
-}
-
-const TAILWIND_BY_COLOR: Record<AnsiColor, string> = {
-  // Tuned for legibility against the muted bg-(--ui-bg-tertiary) surface used
-  // in tool cards. We don't paint pure ANSI colors (#000, #fff) because they
-  // disappear into the surface.
-  'black': 'text-zinc-700 dark:text-zinc-300',
-  'red': 'text-red-700 dark:text-red-300',
-  'green': 'text-emerald-700 dark:text-emerald-300',
-  'yellow': 'text-amber-700 dark:text-amber-300',
-  'blue': 'text-blue-700 dark:text-blue-300',
-  'magenta': 'text-fuchsia-700 dark:text-fuchsia-300',
-  'cyan': 'text-cyan-700 dark:text-cyan-300',
-  'white': 'text-zinc-600 dark:text-zinc-200',
-  'bright-black': 'text-zinc-500 dark:text-zinc-400',
-  'bright-red': 'text-rose-600 dark:text-rose-300',
-  'bright-green': 'text-emerald-600 dark:text-emerald-200',
-  'bright-yellow': 'text-amber-600 dark:text-amber-200',
-  'bright-blue': 'text-sky-600 dark:text-sky-300',
-  'bright-magenta': 'text-pink-600 dark:text-pink-300',
-  'bright-cyan': 'text-teal-600 dark:text-teal-200',
-  'bright-white': 'text-zinc-500 dark:text-zinc-100'
-}
-
-export function ansiColorClass(color: AnsiColor): string {
-  return TAILWIND_BY_COLOR[color]
-}
-
-/** Returns true if the input contains at least one CSI sequence. Cheap check
- *  so callers can skip the parser for plain-ASCII output. */
-export function hasAnsiCodes(input: string): boolean {
-  // eslint-disable-next-line no-control-regex
-  return /\x1b\[/.test(input)
-}

apps/desktop/src/lib/desktop-slash-commands.ts

@@ -59,7 +59,7 @@ const DESKTOP_ALIASES = new Map([
 
 const DESKTOP_COMMAND_DESCRIPTIONS: ReadonlyMap<string, string> = new Map(DESKTOP_COMMAND_META)
 
-const PICKER_OWNED_COMMANDS = new Set(['/model'])
+const PICKER_OWNED_COMMANDS = new Set(['/model', '/provider'])
 
 const TERMINAL_ONLY_COMMANDS = new Set([
   '/browser',

apps/desktop/src/lib/icons.ts

@@ -2,8 +2,6 @@ import {
   IconActivity as Activity,
   IconAlertCircle as AlertCircle,
   IconAlertTriangle as AlertTriangle,
-  IconArchive as Archive,
-  IconArchiveOff as ArchiveOff,
   IconArrowUp as ArrowUp,
   IconArrowUpRight as ArrowUpRight,
   IconAt as AtSign,
@@ -100,8 +98,6 @@ export {
   Activity,
   AlertCircle,
   AlertTriangle,
-  Archive,
-  ArchiveOff,
   ArrowUp,
   ArrowUpRight,
   AtSign,

apps/desktop/src/lib/media.ts

@@ -58,13 +58,6 @@ export function mediaExternalUrl(path: string): string {
   return /^(?:https?|file):/i.test(path) ? path : `file://${path}`
 }
 
-// Custom Electron scheme (registered in electron/main.cjs) that streams a local
-// file with Range support. Used for audio/video so playback bypasses the data
-// URL size cap and supports seeking. `path` may be a plain path or `file://…`.
-export function mediaStreamUrl(path: string): string {
-  return `hermes-media://stream/${encodeURIComponent(filePathFromMediaPath(path))}`
-}
-
 export function mediaPathFromMarkdownHref(href?: string): string | null {
   if (!href?.startsWith('#media:')) {
     return null

apps/desktop/src/lib/model-status-label.test.ts

@@ -1,31 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { displayModelName, formatModelStatusLabel, reasoningEffortLabel } from './model-status-label'
-
-describe('model-status-label', () => {
-  it('formats display names consistently', () => {
-    expect(displayModelName('anthropic/claude-opus-4.8-fast')).toBe('Opus 4.8')
-    expect(displayModelName('openai/gpt-5.5')).toBe('GPT-5.5')
-  })
-
-  it('maps reasoning effort to compact labels', () => {
-    expect(reasoningEffortLabel('high')).toBe('High')
-    expect(reasoningEffortLabel('xhigh')).toBe('Max')
-    expect(reasoningEffortLabel('')).toBe('')
-  })
-
-  it('appends fast + effort session state to the status label', () => {
-    expect(formatModelStatusLabel('openai/gpt-5.5', { fastMode: true, reasoningEffort: 'high' })).toBe(
-      'GPT-5.5 · Fast High'
-    )
-  })
-
-  it('always surfaces the effort (default medium) so the level is visible', () => {
-    expect(formatModelStatusLabel('openai/gpt-5.5', { reasoningEffort: 'medium' })).toBe('GPT-5.5 · Med')
-    expect(formatModelStatusLabel('openai/gpt-5.5')).toBe('GPT-5.5 · Med')
-  })
-
-  it('returns just the placeholder name when there is no model', () => {
-    expect(formatModelStatusLabel('')).toBe('No model')
-  })
-})

apps/desktop/src/lib/model-status-label.ts

@@ -1,103 +0,0 @@
-const REASONING_LABELS: Record<string, string> = {
-  none: 'Off',
-  minimal: 'Min',
-  low: 'Low',
-  medium: 'Med',
-  high: 'High',
-  xhigh: 'Max'
-}
-
-export function reasoningEffortLabel(effort: string): string {
-  const key = effort.trim().toLowerCase()
-
-  if (!key) {
-    return ''
-  }
-
-  return REASONING_LABELS[key] ?? effort
-}
-
-/** Strip provider prefix and normalize for display. */
-export function modelBaseId(model: string): string {
-  const trimmed = model.trim()
-  const slash = trimmed.lastIndexOf('/')
-
-  return slash >= 0 ? trimmed.slice(slash + 1) : trimmed
-}
-
-// Trailing model-id variants that should render as a grayed tag beside the
-// name (e.g. "Opus 4.8" + "Fast") rather than collapsing two distinct ids to
-// the same display name.
-const VARIANT_TAGS: ReadonlyArray<readonly [RegExp, string]> = [
-  [/-fast$/i, 'Fast'],
-  [/-thinking$/i, 'Thinking'],
-  [/-preview$/i, 'Preview'],
-  [/-latest$/i, 'Latest']
-]
-
-const titleCase = (text: string): string => text.replace(/\b\w/g, char => char.toUpperCase()).trim()
-
-function prettifyBase(base: string): string {
-  if (/^claude-/i.test(base)) {
-    return titleCase(base.replace(/^claude-/i, '').replace(/-/g, ' '))
-  }
-
-  if (/^gpt-/i.test(base)) {
-    return base.replace(/^gpt-/i, 'GPT-')
-  }
-
-  if (/^gemini-/i.test(base)) {
-    return base.replace(/^gemini-/i, 'Gemini ').replace(/-/g, ' ')
-  }
-
-  return titleCase(base.replace(/-/g, ' '))
-}
-
-/** Split a model id into a clean display name plus an optional grayed variant
- *  tag, so distinct ids (e.g. `…-4.8` vs `…-4.8-fast`) don't collapse. */
-export function modelDisplayParts(model: string): { name: string; tag: string } {
-  let base = modelBaseId(model)
-  let tag = ''
-
-  for (const [pattern, label] of VARIANT_TAGS) {
-    if (pattern.test(base)) {
-      tag = label
-      base = base.replace(pattern, '')
-
-      break
-    }
-  }
-
-  return { name: prettifyBase(base) || model.trim() || 'No model', tag }
-}
-
-/** Friendly one-line model name for menus and the status bar. */
-export function displayModelName(model: string): string {
-  return modelDisplayParts(model).name
-}
-
-/** Status bar trigger label — model name plus the live session state (effort/fast). */
-export function formatModelStatusLabel(
-  model: string,
-  options?: { fastMode?: boolean; reasoningEffort?: string }
-): string {
-  const name = displayModelName(model)
-
-  if (!model.trim()) {
-    return name
-  }
-
-  const parts: string[] = []
-
-  // Fast is shown when the speed=fast param is on (options.fastMode) OR the
-  // active model is a `…-fast` variant (fast via a separate model id).
-  if (options?.fastMode || /-fast$/i.test(modelBaseId(model))) {
-    parts.push('Fast')
-  }
-
-  // Always surface the effort (empty = Hermes default of medium) so the
-  // current reasoning level is visible at a glance, not just when non-default.
-  parts.push(reasoningEffortLabel(options?.reasoningEffort ?? '') || 'Med')
-
-  return `${name} · ${parts.join(' ')}`
-}

apps/desktop/src/lib/tool-result-summary.ts

@@ -20,11 +20,7 @@ const PRIORITY_KEYS = [
 ] as const
 
 const ERROR_KEYS = ['error', 'errors', 'failure', 'exception'] as const
-// 'stderr' deliberately excluded: many CLIs emit informational lines on
-// stderr (npm progress, git's hint:, gcc's `In file included from`) that
-// aren't errors. Treating those as error signal flipped tool cards into
-// destructive styling for healthy commands.
-const ERROR_MSG_KEYS = ['message', 'reason', 'detail'] as const
+const ERROR_MSG_KEYS = ['message', 'reason', 'detail', 'stderr'] as const
 const NON_ERROR_TEXT = new Set(['', '0', 'false', 'none', 'null', 'nil', 'ok', 'success', 'n/a', 'na'])
 
 type Json = Record<string, unknown>

apps/desktop/src/main.tsx

@@ -6,7 +6,6 @@ import { createRoot } from 'react-dom/client'
 import { HashRouter } from 'react-router-dom'
 
 import App from './app'
-import { ErrorBoundary } from './components/error-boundary'
 import { HapticsProvider } from './components/haptics-provider'
 import { installClipboardShim } from './lib/clipboard'
 import { ThemeProvider } from './themes/context'
@@ -33,16 +32,14 @@ const queryClient = new QueryClient({
 
 createRoot(document.getElementById('root')!).render(
   <StrictMode>
-    <ErrorBoundary label="root">
-      <QueryClientProvider client={queryClient}>
-        <ThemeProvider>
-          <HapticsProvider>
-            <HashRouter>
-              <App />
-            </HashRouter>
-          </HapticsProvider>
-        </ThemeProvider>
-      </QueryClientProvider>
-    </ErrorBoundary>
+    <QueryClientProvider client={queryClient}>
+      <ThemeProvider>
+        <HapticsProvider>
+          <HashRouter>
+            <App />
+          </HashRouter>
+        </HapticsProvider>
+      </ThemeProvider>
+    </QueryClientProvider>
   </StrictMode>
 )

apps/desktop/src/store/model-visibility.ts

@@ -1,108 +0,0 @@
-import { atom } from 'nanostores'
-
-import { persistString, storedString } from '@/lib/storage'
-import type { ModelOptionProvider } from '@/types/hermes'
-
-const STORAGE_KEY = 'hermes.desktop.visible-models'
-
-/** Models shown per provider in the status-bar dropdown before the user has
- *  customized the list. Backend `models` are already relevance-ordered. */
-export const DEFAULT_VISIBLE_PER_PROVIDER = 5
-
-/** Stable key for a provider/model pair (`::` avoids colliding with model ids
- *  that contain a single colon, e.g. `model:tag`). */
-export const modelVisibilityKey = (provider: string, model: string): string => `${provider}::${model}`
-
-/** A model and its optional `…-fast` sibling, collapsed into one logical row.
- *  `id` is the canonical (base) model; `fastId` is the fast variant if present. */
-export interface ModelFamily {
-  fastId: string | null
-  id: string
-}
-
-/** Collapse a provider's model list so a base model and its `…-fast` variant
- *  become a single family (one row, one toggle). Order is preserved by the
- *  base model's position. A `…-fast` model with no base stands on its own. */
-export function collapseModelFamilies(models: readonly string[]): ModelFamily[] {
-  const present = new Set(models)
-  const families: ModelFamily[] = []
-  const consumed = new Set<string>()
-
-  for (const model of models) {
-    if (consumed.has(model)) {
-      continue
-    }
-
-    if (/-fast$/i.test(model) && present.has(model.replace(/-fast$/i, ''))) {
-      // Represented by its base entry — the base attaches it as `fastId`.
-      continue
-    }
-
-    const fastId = `${model}-fast`
-    const hasFast = present.has(fastId)
-    families.push({ fastId: hasFast ? fastId : null, id: model })
-    consumed.add(model)
-
-    if (hasFast) {
-      consumed.add(fastId)
-    }
-  }
-
-  return families
-}
-
-function loadVisible(): Set<string> | null {
-  const raw = storedString(STORAGE_KEY)
-
-  if (!raw) {
-    return null
-  }
-
-  try {
-    const parsed = JSON.parse(raw)
-
-    return Array.isArray(parsed) ? new Set(parsed.filter((x): x is string => typeof x === 'string')) : null
-  } catch {
-    return null
-  }
-}
-
-/** Explicit set of visible `provider::model` keys, or null when the user
- *  hasn't customized — in which case the curated default applies. */
-export const $visibleModels = atom<Set<string> | null>(loadVisible())
-
-export const $modelVisibilityOpen = atom(false)
-
-export function setVisibleModels(keys: Set<string>): void {
-  $visibleModels.set(new Set(keys))
-  persistString(STORAGE_KEY, JSON.stringify([...keys]))
-}
-
-export function setModelVisibilityOpen(open: boolean): void {
-  $modelVisibilityOpen.set(open)
-}
-
-/** The default-visible key set: the curated top-N per provider. Used both as
- *  the dropdown fallback and to seed the Edit Models dialog. */
-export function defaultVisibleKeys(providers: readonly ModelOptionProvider[]): Set<string> {
-  const keys = new Set<string>()
-
-  for (const provider of providers) {
-    const families = collapseModelFamilies(provider.models ?? [])
-
-    for (const family of families.slice(0, DEFAULT_VISIBLE_PER_PROVIDER)) {
-      keys.add(modelVisibilityKey(provider.slug, family.id))
-    }
-  }
-
-  return keys
-}
-
-/** Resolve which keys are currently visible: the user's explicit set when
- *  configured, otherwise the curated default for the given providers. */
-export function effectiveVisibleKeys(
-  stored: Set<string> | null,
-  providers: readonly ModelOptionProvider[]
-): Set<string> {
-  return stored ?? defaultVisibleKeys(providers)
-}