feat(ui): mirror delete hover overlay in timeline

feat(ui): highlight delete targets on hover
chore(ui): reorder user message actions
2026-02-25 23:32:32 +00:00 · 2026-02-25 23:08:53 +00:00 · 2026-02-25 22:54:49 +00:00 · 2026-02-25 22:49:14 +00:00 · 2026-02-25 22:29:27 +00:00 · 2026-02-24 22:22:46 +00:00
60 changed files with 1086 additions and 196 deletions
--- a/.github/workflows/build-and-upload.yml
+++ b/.github/workflows/build-and-upload.yml
@@ -3,6 +3,11 @@ name: Build and Upload Binaries
 on:
  workflow_call:
    inputs:
+      ref:
+        description: "Git ref (branch, tag, or SHA) to build from"
+        required: false
+        default: ""
+        type: string
      version:
        description: "Version to apply to workspace packages (release builds)"
        required: false
@@ -45,6 +50,8 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}

      - name: Setup Node
        uses: actions/setup-node@v4
@@ -54,7 +61,21 @@ jobs:

      - name: Set workspace versions
        if: ${{ inputs.set_versions && inputs.version != '' }}
-        run: npm version ${VERSION} --workspaces --include-workspace-root --no-git-tag-version --allow-same-version
+        shell: bash
+        env:
+          NPM_CONFIG_FETCH_RETRIES: 5
+          NPM_CONFIG_FETCH_RETRY_MINTIMEOUT: 20000
+          NPM_CONFIG_FETCH_RETRY_MAXTIMEOUT: 120000
+        run: |
+          set -euo pipefail
+          for attempt in 1 2 3; do
+            if npm version "${VERSION}" --workspaces --include-workspace-root --no-git-tag-version --allow-same-version; then
+              exit 0
+            fi
+            echo "npm version failed (attempt $attempt/3); retrying..." >&2
+            sleep $((attempt * 10))
+          done
+          exit 1

      - name: Install dependencies
        run: npm ci --workspaces --include=optional
@@ -65,6 +86,112 @@ jobs:
      - name: Build macOS binaries (Electron)
        run: npm run build:mac --workspace @neuralnomads/codenomad-electron-app

+      - name: Ad-hoc sign Electron macOS app bundles (seal resources)
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          release_root="packages/electron-app/release"
+          apps=()
+          while IFS= read -r -d '' app; do
+            apps+=("$app")
+          done < <(find "$release_root" -type d -name 'CodeNomad.app' -print0)
+
+          if [ "${#apps[@]}" -eq 0 ]; then
+            echo "No CodeNomad.app found under $release_root" >&2
+            exit 1
+          fi
+
+          # GitHub macOS runners typically have no signing identity. Without any signature,
+          # the shipped .app can fail Gatekeeper with:
+          #   code has no resources but signature indicates they must be present
+          # Ad-hoc signing seals bundle resources and makes the signature internally consistent.
+          if security find-identity -p codesigning -v | grep -q "0 valid identities found"; then
+            echo "No valid macOS codesigning identity found; applying ad-hoc signature"
+            for app in "${apps[@]}"; do
+              echo "codesign (adhoc): $app"
+              codesign --force --deep --sign - "$app"
+              codesign --verify --deep --strict --verbose=2 "$app"
+            done
+          else
+            echo "macOS codesigning identity present; skipping ad-hoc signing"
+          fi
+
+      - name: Repackage Electron macOS zips (ditto)
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          # Prefer the workflow-provided version; fall back to package.json.
+          VERSION_TO_USE="${VERSION:-}"
+          if [ -z "$VERSION_TO_USE" ]; then
+            VERSION_TO_USE=$(node -p "require('./packages/electron-app/package.json').version")
+          fi
+
+          release_root="packages/electron-app/release"
+          # macOS GitHub runners ship /bin/bash 3.2 which doesn't support `shopt -s globstar`.
+          # Use find to locate built app bundles instead of ** globs.
+          apps=()
+          while IFS= read -r -d '' app; do
+            apps+=("$app")
+          done < <(find "$release_root" -type d -name 'CodeNomad.app' -print0)
+          if [ "${#apps[@]}" -eq 0 ]; then
+            echo "No CodeNomad.app found under $release_root" >&2
+            exit 1
+          fi
+
+          for app in "${apps[@]}"; do
+            bundle_dir=$(basename "$(dirname "$app")")
+            arch="x64"
+            if [[ "$bundle_dir" == *"arm64"* ]]; then
+              arch="arm64"
+            fi
+
+            out_zip="$release_root/CodeNomad-${VERSION_TO_USE}-mac-${arch}.zip"
+            rm -f "$out_zip"
+            echo "ditto -ck: $app -> $out_zip"
+            ditto -ck --sequesterRsrc --keepParent "$app" "$out_zip"
+          done
+
+      - name: Validate Electron macOS codesign (unzipped)
+        shell: bash
+        run: |
+          set -euo pipefail
+          shopt -s nullglob
+
+          tmp_dir=$(mktemp -d)
+          trap 'rm -rf "$tmp_dir"' EXIT
+
+          zips=(packages/electron-app/release/CodeNomad-*-mac-*.zip)
+          if [ "${#zips[@]}" -eq 0 ]; then
+            echo "No Electron macOS zip artifacts found to validate" >&2
+            exit 1
+          fi
+
+          for zip in "${zips[@]}"; do
+            echo "Validating codesign for: $zip"
+            extract_dir="$tmp_dir/$(basename "$zip" .zip)"
+            mkdir -p "$extract_dir"
+
+            # Use ditto for extraction as well to preserve bundle metadata.
+            ditto -x -k "$zip" "$extract_dir"
+
+            app_path=""
+            for candidate in "$extract_dir"/*.app "$extract_dir"/*/*.app; do
+              if [ -d "$candidate" ]; then
+                app_path="$candidate"
+                break
+              fi
+            done
+
+            if [ -z "$app_path" ]; then
+              echo "No .app found after extracting $zip" >&2
+              exit 1
+            fi
+
+            codesign --verify --deep --strict --verbose=2 "$app_path"
+          done
+
      - name: Upload release assets
        if: ${{ inputs.upload && inputs.tag != '' }}
        run: |
@@ -85,6 +212,8 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}

      - name: Setup Node
        uses: actions/setup-node@v4
@@ -124,6 +253,8 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}

      - name: Setup Node
        uses: actions/setup-node@v4
@@ -164,6 +295,8 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}

      - name: Setup Node
        uses: actions/setup-node@v4
@@ -237,6 +370,8 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}

      - name: Setup Node
        uses: actions/setup-node@v4
@@ -310,6 +445,8 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}

      - name: Setup Node
        uses: actions/setup-node@v4
@@ -388,6 +525,8 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}

      - name: Setup Node
        uses: actions/setup-node@v4
@@ -490,6 +629,8 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}

      - name: Setup QEMU
        uses: docker/setup-qemu-action@v3
@@ -587,6 +728,8 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}

      - name: Setup Node
        uses: actions/setup-node@v4
--- a/.github/workflows/dev-release.yml
+++ b/.github/workflows/dev-release.yml
@@ -1,12 +1,13 @@
 name: Develop Pre-Release

 on:
-  push:
-    branches:
-      - dev
+  schedule:
+    # Nightly build of dev (only if dev has new commits)
+    - cron: "0 1 * * *"
  workflow_dispatch:

 permissions:
+  actions: read
  id-token: write
  contents: write

@@ -15,25 +16,63 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  prepare:
+  gate:
    runs-on: ubuntu-latest
    outputs:
-      version_suffix: ${{ steps.vars.outputs.version_suffix }}
+      run: ${{ steps.gate.outputs.run }}
+      dev_sha: ${{ steps.gate.outputs.dev_sha }}
+      version_suffix: ${{ steps.gate.outputs.version_suffix }}
    steps:
-      - name: Compute version suffix
-        id: vars
+      - name: Decide whether to run
+        id: gate
        shell: bash
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: |
          set -euo pipefail
-          SHA8="${GITHUB_SHA::8}"
+
+          api() {
+            curl -sS \
+              -H "Authorization: Bearer ${GH_TOKEN}" \
+              -H "Accept: application/vnd.github+json" \
+              -H "X-GitHub-Api-Version: 2022-11-28" \
+              "$1"
+          }
+
+          DEV_SHA=$(api "https://api.github.com/repos/${GITHUB_REPOSITORY}/git/ref/heads/dev" | jq -r '.object.sha')
+          if [ -z "$DEV_SHA" ] || [ "$DEV_SHA" = "null" ]; then
+            echo "Failed to resolve dev head SHA" >&2
+            exit 1
+          fi
+
          DATE=$(date -u +%Y%m%d)
-          echo "version_suffix=-dev-${DATE}-${SHA8}" >> "$GITHUB_OUTPUT"
+          SHA8="${DEV_SHA::8}"
+          VERSION_SUFFIX="-dev-${DATE}-${SHA8}"
+
+          SHOULD_RUN="false"
+          if [ "${GITHUB_EVENT_NAME}" = "workflow_dispatch" ]; then
+            SHOULD_RUN="true"
+          else
+            # Nightly: only run if dev has advanced since last successful dev-release build.
+            LAST_SHA=$(api "https://api.github.com/repos/${GITHUB_REPOSITORY}/actions/workflows/dev-release.yml/runs?branch=dev&status=success&per_page=1" | jq -r '.workflow_runs[0].head_sha // empty')
+            if [ -z "${LAST_SHA}" ]; then
+              SHOULD_RUN="true"
+            elif [ "${LAST_SHA}" != "${DEV_SHA}" ]; then
+              SHOULD_RUN="true"
+            fi
+          fi
+
+          echo "run=${SHOULD_RUN}" >> "$GITHUB_OUTPUT"
+          echo "dev_sha=${DEV_SHA}" >> "$GITHUB_OUTPUT"
+          echo "version_suffix=${VERSION_SUFFIX}" >> "$GITHUB_OUTPUT"

  prerelease:
-    needs: prepare
+    needs: gate
+    if: ${{ needs.gate.outputs.run == 'true' }}
    uses: ./.github/workflows/reusable-release.yml
    with:
-      version_suffix: ${{ needs.prepare.outputs.version_suffix }}
+      ref: ${{ needs.gate.outputs.dev_sha }}
+      version_suffix: ${{ needs.gate.outputs.version_suffix }}
      npm_package_name: "@neuralnomads/codenomad-dev"
      dist_tag: latest
      prerelease: true
--- a/.github/workflows/manual-npm-publish.yml
+++ b/.github/workflows/manual-npm-publish.yml
@@ -19,6 +19,10 @@ on:
        type: string
  workflow_call:
    inputs:
+      ref:
+        required: false
+        default: ""
+        type: string
      version:
        required: true
        type: string
@@ -46,6 +50,8 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}

      - name: Setup Node
        uses: actions/setup-node@v4
--- a/.github/workflows/release-ui.yml
+++ b/.github/workflows/release-ui.yml
@@ -1,7 +1,13 @@
 name: Release UI

 on:
-  workflow_call: {}
+  workflow_call:
+    inputs:
+      ref:
+        description: "Git ref (branch, tag, or SHA) to build from"
+        required: false
+        default: ""
+        type: string
  workflow_dispatch: {}

 permissions:
@@ -18,6 +24,8 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}

      - name: Setup Node
        uses: actions/setup-node@v4
--- a/.github/workflows/reusable-release.yml
+++ b/.github/workflows/reusable-release.yml
@@ -3,6 +3,11 @@ name: Reusable Release
 on:
  workflow_call:
    inputs:
+      ref:
+        description: "Git ref (branch, tag, or SHA) to build from"
+        required: false
+        default: ""
+        type: string
      version_suffix:
        description: "Suffix appended to package.json version"
        required: false
@@ -46,6 +51,8 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}

      - name: Setup Node
        uses: actions/setup-node@v4
@@ -84,6 +91,7 @@ jobs:
    needs: prepare-release
    uses: ./.github/workflows/build-and-upload.yml
    with:
+      ref: ${{ inputs.ref || github.ref }}
      version: ${{ needs.prepare-release.outputs.version }}
      tag: ${{ needs.prepare-release.outputs.tag }}
      release_name: ${{ needs.prepare-release.outputs.release_name }}
@@ -95,6 +103,8 @@ jobs:
    permissions:
      contents: read
    uses: ./.github/workflows/release-ui.yml
+    with:
+      ref: ${{ inputs.ref || github.ref }}
    secrets: inherit

  publish-server:
@@ -103,6 +113,7 @@ jobs:
      - build-and-upload
    uses: ./.github/workflows/manual-npm-publish.yml
    with:
+      ref: ${{ inputs.ref || github.ref }}
      version: ${{ needs.prepare-release.outputs.version }}
      dist_tag: ${{ inputs.dist_tag }}
      package_name: ${{ inputs.npm_package_name }}
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "codenomad-workspace",
-  "version": "0.11.3",
+  "version": "0.11.5",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "codenomad-workspace",
-      "version": "0.11.3",
+      "version": "0.11.5",
      "license": "MIT",
      "dependencies": {
        "7zip-bin": "^5.2.0",
@@ -11985,7 +11985,7 @@
    },
    "packages/electron-app": {
      "name": "@neuralnomads/codenomad-electron-app",
-      "version": "0.11.3",
+      "version": "0.11.5",
      "license": "MIT",
      "dependencies": {
        "@codenomad/ui": "file:../ui",
@@ -12021,7 +12021,7 @@
    },
    "packages/server": {
      "name": "@neuralnomads/codenomad",
-      "version": "0.11.3",
+      "version": "0.11.5",
      "license": "MIT",
      "dependencies": {
        "@fastify/cors": "^8.5.0",
@@ -12062,7 +12062,7 @@
    },
    "packages/tauri-app": {
      "name": "@codenomad/tauri-app",
-      "version": "0.11.3",
+      "version": "0.11.5",
      "license": "MIT",
      "devDependencies": {
        "@tauri-apps/cli": "^2.9.4"
@@ -12070,7 +12070,7 @@
    },
    "packages/ui": {
      "name": "@codenomad/ui",
-      "version": "0.11.3",
+      "version": "0.11.5",
      "license": "MIT",
      "dependencies": {
        "@git-diff-view/solid": "^0.0.8",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "codenomad-workspace",
-  "version": "0.11.3",
+  "version": "0.11.5",
  "private": true,
  "description": "CodeNomad monorepo workspace",
  "license": "MIT",
--- a/packages/cloudflare/release-config.json
+++ b/packages/cloudflare/release-config.json
@@ -1,4 +1,4 @@
 {
-  "minServerVersion": "0.11.1",
+  "minServerVersion": "0.11.4",
  "latestServerUrl": "https://github.com/NeuralNomadsAI/CodeNomad/releases/latest"
 }
--- a/packages/electron-app/electron/main/process-manager.ts
+++ b/packages/electron-app/electron/main/process-manager.ts
@@ -431,7 +431,9 @@ export class CliProcessManager extends EventEmitter {

    if (options.dev) {
      const devServer = process.env.VITE_DEV_SERVER_URL || process.env.ELECTRON_RENDERER_URL || "http://localhost:3000"
-      args.push("--ui-dev-server", devServer, "--log-level", "debug")
+      const rawLogLevel = (process.env.CLI_LOG_LEVEL ?? "info").trim()
+      const logLevel = rawLogLevel.length > 0 ? rawLogLevel.toLowerCase() : "info"
+      args.push("--ui-dev-server", devServer, "--log-level", logLevel)
    }

    return args
--- a/packages/electron-app/package.json
+++ b/packages/electron-app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@neuralnomads/codenomad-electron-app",
-  "version": "0.11.3",
+  "version": "0.11.5",
  "description": "CodeNomad - AI coding assistant",
  "license": "MIT",
  "author": {
@@ -15,7 +15,10 @@
  },
  "homepage": "https://github.com/NeuralNomadsAI/CodeNomad",
  "scripts": {
-    "dev": "electron-vite dev",
+    "dev": "npm run dev:info",
+    "dev:info": "cross-env CLI_LOG_LEVEL=info electron-vite dev",
+    "dev:debug": "cross-env CLI_LOG_LEVEL=debug electron-vite dev",
+    "dev:trace": "cross-env CLI_LOG_LEVEL=trace electron-vite dev",
    "dev:electron": "NODE_ENV=development ELECTRON_ENABLE_LOGGING=1 NODE_OPTIONS=\"--import tsx\" electron electron/main/main.ts",
    "build": "electron-vite build",
    "typecheck": "tsc --noEmit -p tsconfig.json",
@@ -42,6 +45,7 @@
  "devDependencies": {
    "7zip-bin": "^5.2.0",
    "app-builder-bin": "^4.2.0",
+    "cross-env": "^7.0.3",
    "electron": "39.0.0",
    "electron-builder": "^24.0.0",
    "electron-vite": "4.0.1",
--- a/packages/opencode-config/package.json
+++ b/packages/opencode-config/package.json
@@ -4,6 +4,6 @@
  "private": true,
  "license": "MIT",
  "dependencies": {
-    "@opencode-ai/plugin": "1.2.6"
+    "@opencode-ai/plugin": "1.2.10"
  }
 }
--- a/packages/server/README.md
+++ b/packages/server/README.md
@@ -5,18 +5,21 @@
 ## Features & Capabilities

 ### 🌍 Deployment Freedom
+
 - **Remote Access**: Host CodeNomad on a powerful workstation and access it from your lightweight laptop.
 - **Code Anywhere**: Tunnel in via VPN or SSH to code securely from coffee shops or while traveling.
 - **Multi-Device**: The responsive web client works on tablets and iPads, turning any screen into a dev terminal.
 - **Always-On**: Run as a background service so your sessions are always ready when you connect.

 ### ⚡️ Workspace Power
+
 - **Multi-Instance**: Juggle multiple OpenCode sessions side-by-side with per-instance tabs.
 - **Long-Context Native**: Scroll through massive transcripts without hitches.
 - **Deep Task Awareness**: Monitor background tasks and child sessions without losing your flow.
 - **Command Palette**: A single, global palette to jump tabs, launch tools, and fire shortcuts.

 ## Prerequisites
+
 - **OpenCode**: `opencode` must be installed and configured on your system.
 - Node.js 18+ and npm (for running or building from source).
 - A workspace folder on disk you want to serve.
@@ -25,6 +28,7 @@
 ## Usage

 ### Run via npx (Recommended)
+
 You can run CodeNomad directly without installing it:

 ```sh
@@ -43,6 +47,7 @@ On startup, CodeNomad prints two URLs:
 - `Remote Connection URL : ...` (used by browsers/other machines when remote access is enabled)

 ### Install Globally
+
 Or install it globally to use the `codenomad` command:

 ```sh
@@ -51,6 +56,7 @@ codenomad --launch
 ```

 ### Install Locally (per-project)
+
 If you prefer to install CodeNomad into a project and run the local binary:

 ```sh
@@ -61,6 +67,7 @@ npx codenomad --launch
 (`npx codenomad ...` will use `./node_modules/.bin/codenomad` when present.)

 ### Common Flags
+
 You can configure the server using flags or environment variables:

 | Flag | Env Variable | Description |
@@ -74,7 +81,7 @@ You can configure the server using flags or environment variables:
 | `--tls-ca <path>` | `CLI_TLS_CA` | Optional CA chain/bundle (PEM) |
 | `--tlsSANs <list>` | `CLI_TLS_SANS` | Additional TLS SANs (comma-separated) |
 | `--host <addr>` | `CLI_HOST` | Interface to bind (default 127.0.0.1) |
-| `--workspace-root <path>` | `CLI_WORKSPACE_ROOT` | Default root for new workspaces |
+| `--workspace-root <path>` | `CLI_WORKSPACE_ROOT` | Restricts the root path where new workspaces can be opened. Git worktrees are created in `.codenomad/worktrees` inside the project folder. |
 | `--unrestricted-root` | `CLI_UNRESTRICTED_ROOT` | Allow full-filesystem browsing |
 | `--config <path>` | `CLI_CONFIG` | Config file location |
 | `--launch` | `CLI_LAUNCH` | Open the UI in a Chromium-based browser |
@@ -87,10 +94,11 @@ You can configure the server using flags or environment variables:
 | `--ui-dir <path>` | `CLI_UI_DIR` | Directory containing the built UI bundle |
 | `--ui-dev-server <url>` | `CLI_UI_DEV_SERVER` | Proxy UI requests to a running dev server (requires `--https=false --http=true`) |
 | `--ui-no-update` | `CLI_UI_NO_UPDATE` | Disable remote UI updates |
-| `--ui-auto-update <enabled>` | `CLI_UI_AUTO_UPDATE` | Enable remote UI updates (true|false) |
+| `--ui-auto-update <enabled>` | `CLI_UI_AUTO_UPDATE` | Enable remote UI updates (`true` |
 | `--ui-manifest-url <url>` | `CLI_UI_MANIFEST_URL` | Remote UI manifest URL |

 ### Dev Releases (Advanced)
+
 If you want the latest bleeding-edge builds (published as GitHub pre-releases), use the dev package:

 ```sh
@@ -141,12 +149,14 @@ codenomad --tlsSANs "localhost,127.0.0.1,my-hostname,192.168.1.10"
 ```

 ### Authentication
+
 - Default behavior: CodeNomad requires a login (username/password) and stores a session cookie in the browser.
 - `--dangerously-skip-auth` / `CODENOMAD_SKIP_AUTH=true` disables the login prompt and treats all requests as authenticated.
  Use this only when access is already protected by another layer (SSO proxy, VPN, Coder workspace auth, etc.).
  If you bind to `0.0.0.0` while skipping auth, anyone who can reach the port can access the API.

 ### Progressive Web App (PWA)
+
 When running as a server CodeNomad can also be installed as a PWA from any supported browser, giving you a native app experience just like the Electron installation but executing on the remote server instead.

 1. Open the CodeNomad UI in a Chromium-based browser (Chrome, Edge, Brave, etc.).
@@ -158,5 +168,6 @@ When running as a server CodeNomad can also be installed as a PWA from any suppo
 > If you host CodeNomad on a remote machine, use HTTPS. Self-signed certificates generally won't work unless they are explicitly trusted by the device/browser (e.g., via a custom CA).

 ### Data Storage
+
 - **Config**: `~/.config/codenomad/config.json`
 - **Instance Data**: `~/.config/codenomad/instances` (chat history, etc.)
--- a/packages/server/package-lock.json
+++ b/packages/server/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@neuralnomads/codenomad",
-  "version": "0.11.3",
+  "version": "0.11.5",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@neuralnomads/codenomad",
-      "version": "0.11.3",
+      "version": "0.11.5",
      "dependencies": {
        "@fastify/cors": "^8.5.0",
        "@fastify/reply-from": "^9.8.0",
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@neuralnomads/codenomad",
-  "version": "0.11.3",
+  "version": "0.11.5",
  "description": "CodeNomad Server",
  "license": "MIT",
  "author": {
--- a/packages/server/src/index.ts
+++ b/packages/server/src/index.ts
@@ -78,7 +78,7 @@ function parseCliOptions(argv: string[]): CliOptions {
    .addOption(new Option("--tls-ca <path>", "TLS CA chain (PEM)").env("CLI_TLS_CA"))
    .addOption(new Option("--tlsSANs <list>", "Additional TLS SANs (comma-separated)").env("CLI_TLS_SANS"))
    .addOption(
-      new Option("--workspace-root <path>", "Workspace root directory").env("CLI_WORKSPACE_ROOT").default(process.cwd()),
+      new Option("--workspace-root <path>", "Restricts root path where workspaces can be opened").env("CLI_WORKSPACE_ROOT").default(process.cwd()),
    )
    .addOption(new Option("--root <path>").env("CLI_ROOT").hideHelp(true))
    .addOption(new Option("--unrestricted-root", "Allow browsing the full filesystem").env("CLI_UNRESTRICTED_ROOT").default(false))
--- a/packages/tauri-app/package.json
+++ b/packages/tauri-app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@codenomad/tauri-app",
-  "version": "0.11.3",
+  "version": "0.11.5",
  "private": true,
  "license": "MIT",
  "scripts": {
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@codenomad/ui",
-  "version": "0.11.3",
+  "version": "0.11.5",
  "private": true,
  "license": "MIT",
  "type": "module",
--- a/packages/ui/src/components/file-viewer/monaco-diff-viewer.tsx
+++ b/packages/ui/src/components/file-viewer/monaco-diff-viewer.tsx
@@ -61,6 +61,11 @@ export function MonacoDiffViewer(props: MonacoDiffViewerProps) {
        // Keep enough gutter space so unified diffs don't overlap `+`/`-` markers.
        lineNumbersMinChars: 4,
        lineDecorationsWidth: 12,
+        // Use legacy diff algorithm for better performance with large files
+        // See: https://github.com/microsoft/vscode/issues/184037
+        diffAlgorithm: "legacy",
+        // Limit computation time to avoid freezing on large files
+        maxComputationTime: 10000,
      })

      setReady(true)
--- a/packages/ui/src/components/instance/instance-shell2.tsx
+++ b/packages/ui/src/components/instance/instance-shell2.tsx
@@ -115,6 +115,7 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
  const desktopQuery = useMediaQuery("(min-width: 1280px)")

  const tabletQuery = useMediaQuery("(min-width: 768px)")
+  const compactHeaderQuery = useMediaQuery("(max-width: 1024px)")

  const layoutMode = createMemo<LayoutMode>(() => {
    if (desktopQuery()) return "desktop"
@@ -123,6 +124,7 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
  })

  const isPhoneLayout = createMemo(() => layoutMode() === "phone")
+  const compactHeaderLayout = createMemo(() => isPhoneLayout() || compactHeaderQuery())
  const mobileFullscreen = createMemo(() => props.mobileFullscreenMode && isPhoneLayout())
  const compactPromptLayout = createMemo(() => layoutMode() !== "desktop")
  const leftPinningSupported = createMemo(() => layoutMode() !== "phone")
@@ -596,7 +598,7 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
          <AppBar position="sticky" color="default" elevation={0} class="border-b border-base">
            <Toolbar variant="dense" class="session-toolbar flex flex-wrap items-center gap-2 py-0 min-h-[40px]">
              <Show
-                when={!isPhoneLayout()}
+                when={!compactHeaderLayout()}
                fallback={
                  <div class="flex flex-col w-full gap-1.5">
                    <div class="flex flex-wrap items-center justify-between gap-2 w-full">
@@ -625,7 +627,7 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
                    <div class="flex flex-wrap items-center justify-center gap-1">
                      <button
                        type="button"
-                        class="connection-status-button px-2 py-0.5 text-xs"
+                        class="connection-status-button command-palette-button"
                        onClick={handleCommandPaletteClick}
                        aria-label={t("instanceShell.commandPalette.openAriaLabel")}
                        style={{ flex: "0 0 auto", width: "auto" }}
@@ -634,8 +636,8 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
                      </button>
                      <span class="connection-status-shortcut-hint kbd-hint">
                        <Kbd shortcut="cmd+shift+p" />
-                      </span>
-                    </div>
+                     </span>
+                     </div>

                    <div class="flex-1 flex items-center justify-center min-w-0">
                      <span
@@ -646,7 +648,7 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
                      </span>
                    </div>

-                    <Show when={!props.mobileFullscreenMode}>
+                    <Show when={isPhoneLayout() && !props.mobileFullscreenMode}>
                      <IconButton
                        color="inherit"
                        onClick={props.onEnterMobileFullscreen}
@@ -670,16 +672,18 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
                        {rightAppBarButtonIcon()}
                      </IconButton>
                    </Show>
-                  </div>
+                    </div>

                    <div class="flex flex-wrap items-center justify-center gap-2 pb-1">
-                      <ContextMeter
-                        usedTokens={tokenStats().used}
-                        availableTokens={tokenStats().avail}
-                        formatTokens={formatTokenTotal}
-                        usedLabel={t("instanceShell.metrics.usedLabel")}
-                        availableLabel={t("instanceShell.metrics.availableLabel")}
-                      />
+                      <Show when={!showingInfoView()}>
+                        <ContextMeter
+                          usedTokens={tokenStats().used}
+                          availableTokens={tokenStats().avail}
+                          formatTokens={formatTokenTotal}
+                          usedLabel={t("instanceShell.metrics.usedLabel")}
+                          availableLabel={t("instanceShell.metrics.availableLabel")}
+                        />
+                      </Show>
                    </div>
                </div>
              }
@@ -721,7 +725,7 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
              <div class="session-toolbar-center flex items-center justify-center gap-2 min-w-[160px]">
                <button
                  type="button"
-                  class="connection-status-button px-2 py-0.5 text-xs"
+                  class="connection-status-button command-palette-button"
                  onClick={handleCommandPaletteClick}
                  aria-label={t("instanceShell.commandPalette.openAriaLabel")}
                  style={{ flex: "0 0 auto", width: "auto" }}
--- a/packages/ui/src/components/instance/shell/right-panel/RightPanel.tsx
+++ b/packages/ui/src/components/instance/shell/right-panel/RightPanel.tsx
@@ -7,7 +7,7 @@ import {
  type Accessor,
  type Component,
 } from "solid-js"
-import type { ToolState } from "@opencode-ai/sdk"
+import type { ToolState } from "@opencode-ai/sdk/v2"
 import type { FileContent, FileNode, File as GitFileStatus } from "@opencode-ai/sdk/v2/client"
 import IconButton from "@suid/material/IconButton"
 import MenuOpenIcon from "@suid/icons-material/MenuOpen"
--- a/packages/ui/src/components/instance/shell/right-panel/tabs/StatusTab.tsx
+++ b/packages/ui/src/components/instance/shell/right-panel/tabs/StatusTab.tsx
@@ -1,8 +1,9 @@
 import { For, Show, type Accessor, type Component } from "solid-js"
-import type { ToolState } from "@opencode-ai/sdk"
+import type { ToolState } from "@opencode-ai/sdk/v2"
 import { Accordion } from "@kobalte/core"
+import { Tooltip } from "@kobalte/core/tooltip"

-import { ChevronDown, TerminalSquare, Trash2, XOctagon } from "lucide-solid"
+import { ChevronDown, Info, TerminalSquare, Trash2, XOctagon } from "lucide-solid"

 import type { Instance } from "../../../../../types/instance"
 import type { BackgroundProcess } from "../../../../../../../server/src/api-types"
@@ -206,21 +207,25 @@ const StatusTab: Component<StatusTabProps> = (props) => {
    {
      id: "session-changes",
      labelKey: "instanceShell.rightPanel.sections.sessionChanges",
+      tooltipKey: "instanceShell.rightPanel.sections.sessionChanges.tooltip",
      render: renderStatusSessionChanges,
    },
    {
      id: "plan",
      labelKey: "instanceShell.rightPanel.sections.plan",
+      tooltipKey: "instanceShell.rightPanel.sections.plan.tooltip",
      render: renderPlanSectionContent,
    },
    {
      id: "background-processes",
      labelKey: "instanceShell.rightPanel.sections.backgroundProcesses",
+      tooltipKey: "instanceShell.rightPanel.sections.backgroundProcesses.tooltip",
      render: renderBackgroundProcesses,
    },
    {
      id: "mcp",
      labelKey: "instanceShell.rightPanel.sections.mcp",
+      tooltipKey: "instanceShell.rightPanel.sections.mcp.tooltip",
      render: () => (
        <InstanceServiceStatus
          initialInstance={props.instance}
@@ -233,6 +238,7 @@ const StatusTab: Component<StatusTabProps> = (props) => {
    {
      id: "lsp",
      labelKey: "instanceShell.rightPanel.sections.lsp",
+      tooltipKey: "instanceShell.rightPanel.sections.lsp.tooltip",
      render: () => (
        <InstanceServiceStatus
          initialInstance={props.instance}
@@ -245,6 +251,7 @@ const StatusTab: Component<StatusTabProps> = (props) => {
    {
      id: "plugins",
      labelKey: "instanceShell.rightPanel.sections.plugins",
+      tooltipKey: "instanceShell.rightPanel.sections.plugins.tooltip",
      render: () => (
        <InstanceServiceStatus
          initialInstance={props.instance}
@@ -276,7 +283,23 @@ const StatusTab: Component<StatusTabProps> = (props) => {
            <Accordion.Item value={section.id} class="right-panel-accordion-item">
              <Accordion.Header>
                <Accordion.Trigger class="right-panel-accordion-trigger">
-                  <span>{props.t(section.labelKey)}</span>
+                  <span class="section-left">
+                    <Tooltip openDelay={200} gutter={4} placement="top">
+                      <Tooltip.Trigger
+                        class="section-info-trigger"
+                        aria-label={props.t(section.tooltipKey)}
+                        onClick={(e) => e.stopPropagation()}
+                      >
+                        <Info class="section-info-icon" />
+                      </Tooltip.Trigger>
+                      <Tooltip.Portal>
+                        <Tooltip.Content class="section-info-tooltip">
+                          {props.t(section.tooltipKey)}
+                        </Tooltip.Content>
+                      </Tooltip.Portal>
+                    </Tooltip>
+                    <span class="section-label">{props.t(section.labelKey)}</span>
+                  </span>
                  <ChevronDown
                    class={`right-panel-accordion-chevron ${isSectionExpanded(section.id) ? "right-panel-accordion-chevron-expanded" : ""}`}
                  />
--- a/packages/ui/src/components/instance/shell/useInstanceSessionContext.ts
+++ b/packages/ui/src/components/instance/shell/useInstanceSessionContext.ts
@@ -1,5 +1,5 @@
 import { batch, createMemo, type Accessor } from "solid-js"
-import type { ToolState } from "@opencode-ai/sdk"
+import type { ToolState } from "@opencode-ai/sdk/v2"
 import type { Session } from "../../../types/session"
 import {
  activeParentSessionId,
--- a/packages/ui/src/components/message-block-list.tsx
+++ b/packages/ui/src/components/message-block-list.tsx
@@ -2,6 +2,7 @@ import { Index, type Accessor } from "solid-js"
 import VirtualItem from "./virtual-item"
 import MessageBlock from "./message-block"
 import type { InstanceMessageStore } from "../stores/message-v2/instance-store"
+import type { DeleteHoverState } from "../types/delete-hover"

 export function getMessageAnchorId(messageId: string) {
  return `message-anchor-${messageId}`
@@ -23,6 +24,8 @@ interface MessageBlockListProps {
  onRevert?: (messageId: string) => void
  onFork?: (messageId?: string) => void
  onContentRendered?: () => void
+  deleteHover?: Accessor<DeleteHoverState>
+  onDeleteHoverChange?: (state: DeleteHoverState) => void
  setBottomSentinel: (element: HTMLDivElement | null) => void
  suspendMeasurements?: () => boolean
 }
@@ -51,6 +54,8 @@ export default function MessageBlockList(props: MessageBlockListProps) {
              showThinking={props.showThinking}
              thinkingDefaultExpanded={props.thinkingDefaultExpanded}
              showUsageMetrics={props.showUsageMetrics}
+              deleteHover={props.deleteHover}
+              onDeleteHoverChange={props.onDeleteHoverChange}
              onRevert={props.onRevert}
              onFork={props.onFork}
              onContentRendered={props.onContentRendered}
--- a/packages/ui/src/components/message-block.tsx
+++ b/packages/ui/src/components/message-block.tsx
@@ -1,5 +1,5 @@
 import { For, Match, Show, Switch, createEffect, createMemo, createSignal, untrack } from "solid-js"
-import { ChevronsDownUp, ChevronsUpDown, ExternalLink, FoldVertical, Trash2 } from "lucide-solid"
+import { ChevronsDownUp, ChevronsUpDown, ExternalLink, FoldVertical, MessageSquareX, Trash2 } from "lucide-solid"
 import MessageItem from "./message-item"
 import ToolCall from "./tool-call"
 import type { InstanceMessageStore } from "../stores/message-v2/instance-store"
@@ -13,7 +13,9 @@ import { sessions, setActiveParentSession, setActiveSession } from "../stores/se
 import { setActiveInstanceId } from "../stores/instances"
 import { showAlertDialog } from "../stores/alerts"
 import { deleteMessagePart } from "../stores/session-actions"
+import { deleteMessage } from "../stores/session-actions"
 import { useI18n } from "../lib/i18n"
+import type { DeleteHoverState } from "../types/delete-hover"

 const TOOL_ICON = "🔧"
 const USER_BORDER_COLOR = "var(--message-user-border)"
@@ -23,10 +25,10 @@ const TOOL_BORDER_COLOR = "var(--message-tool-border)"
 type ToolCallPart = Extract<ClientPart, { type: "tool" }>


-type ToolState = import("@opencode-ai/sdk").ToolState
-type ToolStateRunning = import("@opencode-ai/sdk").ToolStateRunning
-type ToolStateCompleted = import("@opencode-ai/sdk").ToolStateCompleted
-type ToolStateError = import("@opencode-ai/sdk").ToolStateError
+type ToolState = import("@opencode-ai/sdk/v2").ToolState
+type ToolStateRunning = import("@opencode-ai/sdk/v2").ToolStateRunning
+type ToolStateCompleted = import("@opencode-ai/sdk/v2").ToolStateCompleted
+type ToolStateError = import("@opencode-ai/sdk/v2").ToolStateError

 function isToolStateRunning(state: ToolState | undefined): state is ToolStateRunning {
  return Boolean(state && state.status === "running")
@@ -196,6 +198,8 @@ interface MessageContentItemProps {
  onRevert?: (messageId: string) => void
  onFork?: (messageId?: string) => void
  onContentRendered?: () => void
+  showDeleteMessage?: boolean
+  onDeleteHoverChange?: (state: DeleteHoverState) => void
 }

 function isSupportedPartType(part: unknown): boolean {
@@ -282,6 +286,8 @@ function MessageContentItem(props: MessageContentItemProps) {
          sessionId={props.sessionId}
          isQueued={isQueued()}
          showAgentMeta={showAgentMeta()}
+          showDeleteMessage={props.showDeleteMessage}
+          onDeleteHoverChange={props.onDeleteHoverChange}
          onRevert={props.onRevert}
          onFork={props.onFork}
          onContentRendered={props.onContentRendered}
@@ -298,11 +304,15 @@ interface ToolCallItemProps {
  messageId: string
  partId: string
  onContentRendered?: () => void
+  showDeleteMessage?: boolean
+  onDeleteHoverChange?: (state: DeleteHoverState) => void
 }

 function ToolCallItem(props: ToolCallItemProps) {
  const { t } = useI18n()
  const [deleting, setDeleting] = createSignal(false)
+  const [deletingMessage, setDeletingMessage] = createSignal(false)
+  const [hoverDeletePart, setHoverDeletePart] = createSignal(false)

  const record = createMemo(() => props.store().getMessage(props.messageId))
  const messageInfo = createMemo(() => props.store().getMessageInfo(props.messageId))
@@ -370,10 +380,31 @@ function ToolCallItem(props: ToolCallItemProps) {
    }
  }

+  const handleDeleteMessage = async (event: MouseEvent) => {
+    event.preventDefault()
+    event.stopPropagation()
+
+    if (!props.showDeleteMessage) return
+    if (deletingMessage()) return
+
+    setDeletingMessage(true)
+    try {
+      await deleteMessage(props.instanceId, props.sessionId, props.messageId)
+    } catch (error) {
+      showAlertDialog(t("messageItem.actions.deleteMessageFailedMessage"), {
+        title: t("messageItem.actions.deleteMessageFailedTitle"),
+        detail: error instanceof Error ? error.message : String(error),
+        variant: "error",
+      })
+    } finally {
+      setDeletingMessage(false)
+    }
+  }
+
  return (
    <Show when={toolPart()}>
      {(resolvedToolPart) => (
-        <>
+        <div class="delete-hover-scope" data-delete-part-hover={hoverDeletePart() ? "true" : undefined}>
          <div class="tool-call-header-label">
            <div class="tool-call-header-meta">
              <span class="tool-call-icon">{TOOL_ICON}</span>
@@ -381,7 +412,7 @@ function ToolCallItem(props: ToolCallItemProps) {
              <span class="tool-name">{toolName() || t("messageBlock.tool.unknown")}</span>
            </div>

-            <div class="flex items-center gap-2">
+              <div class="flex items-center gap-2">
              <Show when={taskSessionId()}>
                <button
                  class="tool-call-header-button"
@@ -395,18 +426,41 @@ function ToolCallItem(props: ToolCallItemProps) {
                </button>
              </Show>

-              <button
-                class="tool-call-header-button"
-                type="button"
-                disabled={deleteDisabled()}
-                onClick={handleDeleteToolPart}
-                title={deleting() ? t("messageBlock.tool.deletePart.deleting") : t("messageBlock.tool.deletePart.label")}
-                aria-label={deleting() ? t("messageBlock.tool.deletePart.deleting") : t("messageBlock.tool.deletePart.label")}
-              >
-                <Trash2 class="w-3.5 h-3.5" aria-hidden="true" />
-              </button>
+                <button
+                  class="tool-call-header-button"
+                  type="button"
+                  disabled={deleteDisabled()}
+                  onClick={handleDeleteToolPart}
+                  onMouseEnter={() => {
+                    setHoverDeletePart(true)
+                    props.onDeleteHoverChange?.({ kind: "part", messageId: props.messageId, partId: props.partId, partType: "tool" })
+                  }}
+                  onMouseLeave={() => {
+                    setHoverDeletePart(false)
+                    props.onDeleteHoverChange?.({ kind: "none" })
+                  }}
+                  title={deleting() ? t("messageBlock.tool.deletePart.deleting") : t("messageBlock.tool.deletePart.label")}
+                  aria-label={deleting() ? t("messageBlock.tool.deletePart.deleting") : t("messageBlock.tool.deletePart.label")}
+                >
+                  <Trash2 class="w-3.5 h-3.5" aria-hidden="true" />
+                </button>
+
+                <Show when={props.showDeleteMessage}>
+                  <button
+                    class="tool-call-header-button"
+                    type="button"
+                    disabled={deletingMessage()}
+                    onClick={handleDeleteMessage}
+                    onMouseEnter={() => props.onDeleteHoverChange?.({ kind: "message", messageId: props.messageId })}
+                    onMouseLeave={() => props.onDeleteHoverChange?.({ kind: "none" })}
+                    title={deletingMessage() ? t("messageItem.actions.deletingMessage") : t("messageItem.actions.deleteMessage")}
+                    aria-label={deletingMessage() ? t("messageItem.actions.deletingMessage") : t("messageItem.actions.deleteMessage")}
+                  >
+                    <MessageSquareX class="w-3.5 h-3.5" aria-hidden="true" />
+                  </button>
+                </Show>
+              </div>
            </div>
-          </div>

          <ToolCall
            toolCall={resolvedToolPart()}
@@ -418,7 +472,7 @@ function ToolCallItem(props: ToolCallItemProps) {
            sessionId={props.sessionId}
            onContentRendered={props.onContentRendered}
          />
-        </>
+        </div>
      )}
    </Show>
  )
@@ -470,6 +524,8 @@ interface MessageBlockProps {
  showThinking: () => boolean
  thinkingDefaultExpanded: () => boolean
  showUsageMetrics: () => boolean
+  deleteHover?: () => DeleteHoverState
+  onDeleteHoverChange?: (state: DeleteHoverState) => void
  onRevert?: (messageId: string) => void
  onFork?: (messageId?: string) => void
  onContentRendered?: () => void
@@ -481,6 +537,11 @@ export default function MessageBlock(props: MessageBlockProps) {
  const messageInfo = createMemo(() => props.store().getMessageInfo(props.messageId))
  const sessionCache = getSessionRenderCache(props.instanceId, props.sessionId)

+  const isDeleteMessageHovered = () => {
+    const hover = props.deleteHover?.() ?? ({ kind: "none" } as DeleteHoverState)
+    return hover.kind === "message" && hover.messageId === props.messageId
+  }
+
  const block = createMemo<MessageDisplayBlock | null>(() => {
    const current = record()
    if (!current) return null
@@ -668,9 +729,13 @@ export default function MessageBlock(props: MessageBlockProps) {
  return (
    <Show when={block()}>
      {(resolvedBlock) => (
-        <div class="message-stream-block" data-message-id={resolvedBlock().record.id}>
+        <div
+          class="message-stream-block"
+          data-message-id={resolvedBlock().record.id}
+          data-delete-message-hover={isDeleteMessageHovered() ? "true" : undefined}
+        >
          <For each={resolvedBlock().items}>
-            {(item) => (
+            {(item, index) => (
              <Switch>
                <Match when={item.type === "content"}>
                  <MessageContentItem
@@ -681,6 +746,8 @@ export default function MessageBlock(props: MessageBlockProps) {
                    startPartId={(item as ContentDisplayItem).startPartId}
                    messageIndex={props.messageIndex}
                    lastAssistantIndex={props.lastAssistantIndex}
+                    showDeleteMessage={index() === 0}
+                    onDeleteHoverChange={props.onDeleteHoverChange}
                    onRevert={props.onRevert}
                    onFork={props.onFork}
                    onContentRendered={props.onContentRendered}
@@ -697,6 +764,8 @@ export default function MessageBlock(props: MessageBlockProps) {
                          store={props.store}
                          messageId={toolItem.messageId}
                          partId={toolItem.partId}
+                          showDeleteMessage={index() === 0}
+                          onDeleteHoverChange={props.onDeleteHoverChange}
                          onContentRendered={props.onContentRendered}
                        />
                      </div>
@@ -709,6 +778,11 @@ export default function MessageBlock(props: MessageBlockProps) {
                    part={(item as StepDisplayItem).part}
                    messageInfo={(item as StepDisplayItem).messageInfo}
                    showAgentMeta
+                    showDeleteMessage={index() === 0}
+                    instanceId={props.instanceId}
+                    sessionId={props.sessionId}
+                    messageId={props.messageId}
+                    onDeleteHoverChange={props.onDeleteHoverChange}
                  />
                </Match>
                <Match when={item.type === "step-finish"}>
@@ -718,6 +792,11 @@ export default function MessageBlock(props: MessageBlockProps) {
                    messageInfo={(item as StepDisplayItem).messageInfo}
                    showUsage={props.showUsageMetrics()}
                    borderColor={(item as StepDisplayItem).accentColor}
+                    showDeleteMessage={index() === 0}
+                    instanceId={props.instanceId}
+                    sessionId={props.sessionId}
+                    messageId={props.messageId}
+                    onDeleteHoverChange={props.onDeleteHoverChange}
                  />
                </Match>
                <Match when={item.type === "compaction"}>
@@ -729,6 +808,8 @@ export default function MessageBlock(props: MessageBlockProps) {
                    sessionId={props.sessionId}
                    messageId={(item as CompactionDisplayItem).messageId}
                    partId={(item as CompactionDisplayItem).partId}
+                    showDeleteMessage={index() === 0}
+                    onDeleteHoverChange={props.onDeleteHoverChange}
                  />
                </Match>
                <Match when={item.type === "reasoning"}>
@@ -741,6 +822,8 @@ export default function MessageBlock(props: MessageBlockProps) {
                    partId={(item as ReasoningDisplayItem).partId}
                    showAgentMeta={(item as ReasoningDisplayItem).showAgentMeta}
                    defaultExpanded={(item as ReasoningDisplayItem).defaultExpanded}
+                    showDeleteMessage={index() === 0}
+                    onDeleteHoverChange={props.onDeleteHoverChange}
                  />
                </Match>
              </Switch>
@@ -759,6 +842,11 @@ interface StepCardProps {
  showAgentMeta?: boolean
  showUsage?: boolean
  borderColor?: string
+  showDeleteMessage?: boolean
+  instanceId?: string
+  sessionId?: string
+  messageId?: string
+  onDeleteHoverChange?: (state: DeleteHoverState) => void
 }

 interface CompactionCardProps {
@@ -769,11 +857,15 @@ interface CompactionCardProps {
  sessionId: string
  messageId: string
  partId: string
+  showDeleteMessage?: boolean
+  onDeleteHoverChange?: (state: DeleteHoverState) => void
 }

 function CompactionCard(props: CompactionCardProps) {
  const { t } = useI18n()
  const [deleting, setDeleting] = createSignal(false)
+  const [deletingMessage, setDeletingMessage] = createSignal(false)
+  const [hoverDeletePart, setHoverDeletePart] = createSignal(false)
  const isAuto = () => Boolean((props.part as any)?.auto)
  const label = () => (isAuto() ? t("messageBlock.compaction.autoLabel") : t("messageBlock.compaction.manualLabel"))
  const borderColor = () => props.borderColor ?? (isAuto() ? "var(--session-status-compacting-fg)" : USER_BORDER_COLOR)
@@ -801,22 +893,70 @@ function CompactionCard(props: CompactionCardProps) {
    }
  }

+  const canDeleteMessage = () => Boolean(props.showDeleteMessage) && !deletingMessage()
+
+  const handleDeleteMessage = async (event: MouseEvent) => {
+    event.preventDefault()
+    event.stopPropagation()
+    if (!props.showDeleteMessage) return
+    if (!canDeleteMessage()) return
+    setDeletingMessage(true)
+    try {
+      await deleteMessage(props.instanceId, props.sessionId, props.messageId)
+    } catch (error) {
+      showAlertDialog(t("messageItem.actions.deleteMessageFailedMessage"), {
+        title: t("messageItem.actions.deleteMessageFailedTitle"),
+        detail: error instanceof Error ? error.message : String(error),
+        variant: "error",
+      })
+    } finally {
+      setDeletingMessage(false)
+    }
+  }
+
  return (
    <div
-      class={`${containerClass()} relative`}
+      class={`delete-hover-scope ${containerClass()} relative`}
+      data-delete-part-hover={hoverDeletePart() ? "true" : undefined}
      style={{ "border-left": `4px solid ${borderColor()}` }}
      role="status"
      aria-label={t("messageBlock.compaction.ariaLabel")}
    >
-      <button
-        type="button"
-        class="tool-call-header-button absolute right-2 top-1/2 -translate-y-1/2"
-        disabled={!canDelete()}
-        onClick={handleDelete}
-        title={t("messagePart.actions.deleteTitle")}
-      >
-        {deleting() ? t("messagePart.actions.deleting") : t("messagePart.actions.delete")}
-      </button>
+      <div class="absolute right-2 top-1/2 -translate-y-1/2 flex items-center gap-1">
+        <Show when={props.showDeleteMessage}>
+          <button
+            type="button"
+            class="tool-call-header-button"
+            disabled={!canDeleteMessage()}
+            onClick={handleDeleteMessage}
+            onMouseEnter={() => props.onDeleteHoverChange?.({ kind: "message", messageId: props.messageId })}
+            onMouseLeave={() => props.onDeleteHoverChange?.({ kind: "none" })}
+            title={deletingMessage() ? t("messageItem.actions.deletingMessage") : t("messageItem.actions.deleteMessage")}
+            aria-label={deletingMessage() ? t("messageItem.actions.deletingMessage") : t("messageItem.actions.deleteMessage")}
+          >
+            <MessageSquareX class="w-3.5 h-3.5" aria-hidden="true" />
+          </button>
+        </Show>
+
+        <button
+          type="button"
+          class="tool-call-header-button"
+          disabled={!canDelete()}
+          onClick={handleDelete}
+          onMouseEnter={() => {
+            setHoverDeletePart(true)
+            props.onDeleteHoverChange?.({ kind: "part", messageId: props.messageId, partId: props.partId, partType: "compaction" })
+          }}
+          onMouseLeave={() => {
+            setHoverDeletePart(false)
+            props.onDeleteHoverChange?.({ kind: "none" })
+          }}
+          title={t("messagePart.actions.deleteTitle")}
+          aria-label={t("messagePart.actions.deleteTitle")}
+        >
+          {deleting() ? t("messagePart.actions.deleting") : t("messagePart.actions.delete")}
+        </button>
+      </div>

      <div class="message-compaction-row">
        <FoldVertical class="message-compaction-icon w-4 h-4" aria-hidden="true" />
@@ -828,6 +968,7 @@ function CompactionCard(props: CompactionCardProps) {

 function StepCard(props: StepCardProps) {
  const { t } = useI18n()
+  const [deletingMessage, setDeletingMessage] = createSignal(false)
  const timestamp = () => {
    const value = props.messageInfo?.time?.created ?? (props.part as any)?.time?.start ?? Date.now()
    const date = new Date(value)
@@ -872,6 +1013,27 @@ function StepCard(props: StepCardProps) {

  const finishStyle = () => (props.borderColor ? { "border-left-color": props.borderColor } : undefined)

+  const canDeleteMessage = () =>
+    Boolean(props.showDeleteMessage && props.instanceId && props.sessionId && props.messageId) && !deletingMessage()
+
+  const handleDeleteMessage = async (event: MouseEvent) => {
+    event.preventDefault()
+    event.stopPropagation()
+    if (!canDeleteMessage()) return
+    setDeletingMessage(true)
+    try {
+      await deleteMessage(props.instanceId!, props.sessionId!, props.messageId!)
+    } catch (error) {
+      showAlertDialog(t("messageItem.actions.deleteMessageFailedMessage"), {
+        title: t("messageItem.actions.deleteMessageFailedTitle"),
+        detail: error instanceof Error ? error.message : String(error),
+        variant: "error",
+      })
+    } finally {
+      setDeletingMessage(false)
+    }
+  }
+

  const renderUsageChips = (usage: NonNullable<ReturnType<typeof usageStats>>) => {
    const entries = [
@@ -902,7 +1064,22 @@ function StepCard(props: StepCardProps) {
      return null
    }
    return (
-      <div class={`message-step-card message-step-finish message-step-finish-flush`} style={finishStyle()}>
+      <div class={`message-step-card message-step-finish message-step-finish-flush relative`} style={finishStyle()}>
+        <Show when={props.showDeleteMessage}>
+          <button
+            type="button"
+            class="message-action-button absolute right-2 top-1/2 -translate-y-1/2"
+            disabled={!canDeleteMessage()}
+            onClick={handleDeleteMessage}
+            onMouseEnter={() => props.onDeleteHoverChange?.({ kind: "message", messageId: props.messageId! })}
+            onMouseLeave={() => props.onDeleteHoverChange?.({ kind: "none" })}
+            title={deletingMessage() ? t("messageItem.actions.deletingMessage") : t("messageItem.actions.deleteMessage")}
+            aria-label={deletingMessage() ? t("messageItem.actions.deletingMessage") : t("messageItem.actions.deleteMessage")}
+          >
+            <MessageSquareX class="w-3.5 h-3.5" aria-hidden="true" />
+          </button>
+        </Show>
+
        {renderUsageChips(usage)}
      </div>
    )
@@ -942,12 +1119,16 @@ interface ReasoningCardProps {
  partId: string
  showAgentMeta?: boolean
  defaultExpanded?: boolean
+  showDeleteMessage?: boolean
+  onDeleteHoverChange?: (state: DeleteHoverState) => void
 }

 function ReasoningCard(props: ReasoningCardProps) {
  const { t } = useI18n()
  const [expanded, setExpanded] = createSignal(Boolean(props.defaultExpanded))
  const [deleting, setDeleting] = createSignal(false)
+  const [deletingMessage, setDeletingMessage] = createSignal(false)
+  const [hoverDeletePart, setHoverDeletePart] = createSignal(false)

  createEffect(() => {
    setExpanded(Boolean(props.defaultExpanded))
@@ -1035,8 +1216,29 @@ function ReasoningCard(props: ReasoningCardProps) {
    }
  }

+  const canDeleteMessage = () => Boolean(props.showDeleteMessage) && !deletingMessage()
+
+  const handleDeleteMessage = async (event: MouseEvent) => {
+    event.preventDefault()
+    event.stopPropagation()
+    if (!props.showDeleteMessage) return
+    if (!canDeleteMessage()) return
+    setDeletingMessage(true)
+    try {
+      await deleteMessage(props.instanceId, props.sessionId, props.messageId)
+    } catch (error) {
+      showAlertDialog(t("messageItem.actions.deleteMessageFailedMessage"), {
+        title: t("messageItem.actions.deleteMessageFailedTitle"),
+        detail: error instanceof Error ? error.message : String(error),
+        variant: "error",
+      })
+    } finally {
+      setDeletingMessage(false)
+    }
+  }
+
  return (
-    <div class="message-reasoning-card">
+    <div class="delete-hover-scope message-reasoning-card" data-delete-part-hover={hoverDeletePart() ? "true" : undefined}>
      <div class="message-reasoning-header">
        <button
          type="button"
@@ -1087,6 +1289,14 @@ function ReasoningCard(props: ReasoningCardProps) {
              class="message-action-button"
              onClick={handleDelete}
              disabled={!canDelete()}
+              onMouseEnter={() => {
+                setHoverDeletePart(true)
+                props.onDeleteHoverChange?.({ kind: "part", messageId: props.messageId, partId: props.partId, partType: "reasoning" })
+              }}
+              onMouseLeave={() => {
+                setHoverDeletePart(false)
+                props.onDeleteHoverChange?.({ kind: "none" })
+              }}
              aria-label={t("messagePart.actions.deleteTitle")}
              title={t("messagePart.actions.deleteTitle")}
            >
@@ -1094,6 +1304,21 @@ function ReasoningCard(props: ReasoningCardProps) {
            </button>
          </Show>

+          <Show when={props.showDeleteMessage}>
+            <button
+              type="button"
+              class="message-action-button"
+              onClick={handleDeleteMessage}
+              disabled={!canDeleteMessage()}
+              onMouseEnter={() => props.onDeleteHoverChange?.({ kind: "message", messageId: props.messageId })}
+              onMouseLeave={() => props.onDeleteHoverChange?.({ kind: "none" })}
+              aria-label={deletingMessage() ? t("messageItem.actions.deletingMessage") : t("messageItem.actions.deleteMessage")}
+              title={deletingMessage() ? t("messageItem.actions.deletingMessage") : t("messageItem.actions.deleteMessage")}
+            >
+              <MessageSquareX class="w-3.5 h-3.5" aria-hidden="true" />
+            </button>
+          </Show>
+
          <span class="message-reasoning-time">{timestamp()}</span>
        </div>
      </div>
--- a/packages/ui/src/components/message-item.tsx
+++ b/packages/ui/src/components/message-item.tsx
@@ -1,14 +1,15 @@
 import { For, Show, createSignal } from "solid-js"
-import { Copy, ExternalLink, Split, Trash2, Undo } from "lucide-solid"
-import type { MessageInfo, ClientPart } from "../types/message"
+import { Copy, MessageSquareX, Split, Trash2, Undo } from "lucide-solid"
+import type { MessageInfo, ClientPart, SDKAssistantMessageV2 } from "../types/message"
 import { partHasRenderableText } from "../types/message"
 import type { MessageRecord } from "../stores/message-v2/types"
 import MessagePart from "./message-part"
 import { copyToClipboard } from "../lib/clipboard"
 import { useI18n } from "../lib/i18n"
 import { showAlertDialog } from "../stores/alerts"
-import { deleteMessagePart } from "../stores/session-actions"
+import { deleteMessage, deleteMessagePart } from "../stores/session-actions"
 import { isTauriHost } from "../lib/runtime-env"
+import type { DeleteHoverState } from "../types/delete-hover"

 interface MessageItemProps {
  record: MessageRecord
@@ -21,12 +22,16 @@ interface MessageItemProps {
  onFork?: (messageId?: string) => void
  showAgentMeta?: boolean
  onContentRendered?: () => void
+  showDeleteMessage?: boolean
+  onDeleteHoverChange?: (state: DeleteHoverState) => void
 }

 export default function MessageItem(props: MessageItemProps) {
  const { t } = useI18n()
  const [copied, setCopied] = createSignal(false)
  const [deletingParts, setDeletingParts] = createSignal<Set<string>>(new Set())
+  const [deletingMessage, setDeletingMessage] = createSignal(false)
+  const [hoveredDeletePartId, setHoveredDeletePartId] = createSignal<string | null>(null)

  const isUser = () => props.record.role === "user"
  const createdTimestamp = () => props.messageInfo?.time?.created ?? props.record.createdAt
@@ -234,6 +239,22 @@ export default function MessageItem(props: MessageItemProps) {
    }
  }

+  const handleDeleteMessage = async () => {
+    if (deletingMessage()) return
+    setDeletingMessage(true)
+    try {
+      await deleteMessage(props.instanceId, props.sessionId, props.record.id)
+    } catch (error) {
+      showAlertDialog(t("messageItem.actions.deleteMessageFailedMessage"), {
+        title: t("messageItem.actions.deleteMessageFailedTitle"),
+        detail: error instanceof Error ? error.message : String(error),
+        variant: "error",
+      })
+    } finally {
+      setDeletingMessage(false)
+    }
+  }
+
  if (!isUser() && !hasContent() && !isGenerating()) {
    return null
  }
@@ -258,8 +279,16 @@ export default function MessageItem(props: MessageItemProps) {
    if (!info || info.role !== "assistant") return ""
    const modelID = info.modelID || ""
    const providerID = info.providerID || ""
-    if (modelID && providerID) return `${providerID}/${modelID}`
-    return modelID
+
+    const base = modelID && providerID ? `${providerID}/${modelID}` : modelID
+    if (!base) return ""
+
+    const variant = (info as SDKAssistantMessageV2).variant
+    if (typeof variant === "string" && variant.trim().length > 0) {
+      return `${base} (${variant.trim()})`
+    }
+
+    return base
  }

  const agentMeta = () => {
@@ -290,16 +319,15 @@ export default function MessageItem(props: MessageItemProps) {
          <div class="message-item-actions">
            <Show when={isUser()}>
              <div class="message-action-group">
-                <Show when={props.onRevert}>
-                  <button
-                    class="message-action-button"
-                    onClick={handleRevert}
-                    title={t("messageItem.actions.revert")}
-                    aria-label={t("messageItem.actions.revert")}
-                  >
-                    <Undo class="w-3.5 h-3.5" aria-hidden="true" />
-                  </button>
-                </Show>
+                <button
+                  class="message-action-button"
+                  onClick={handleCopy}
+                  title={copyLabel()}
+                  aria-label={copyLabel()}
+                >
+                  <Copy class="w-3.5 h-3.5" aria-hidden="true" />
+                </button>
+
                <Show when={props.onFork}>
                  <button
                    class="message-action-button"
@@ -310,14 +338,31 @@ export default function MessageItem(props: MessageItemProps) {
                    <Split class="w-3.5 h-3.5" aria-hidden="true" />
                  </button>
                </Show>
-                <button
-                  class="message-action-button"
-                  onClick={handleCopy}
-                  title={copyLabel()}
-                  aria-label={copyLabel()}
-                >
-                  <Copy class="w-3.5 h-3.5" aria-hidden="true" />
-                </button>
+
+                <Show when={props.onRevert}>
+                  <button
+                    class="message-action-button"
+                    onClick={handleRevert}
+                    title={t("messageItem.actions.revertTitle")}
+                    aria-label={t("messageItem.actions.revertTitle")}
+                  >
+                    <Undo class="w-3.5 h-3.5" aria-hidden="true" />
+                  </button>
+                </Show>
+
+                <Show when={props.showDeleteMessage}>
+                  <button
+                    class="message-action-button"
+                    onClick={handleDeleteMessage}
+                    disabled={deletingMessage()}
+                    onMouseEnter={() => props.onDeleteHoverChange?.({ kind: "message", messageId: props.record.id })}
+                    onMouseLeave={() => props.onDeleteHoverChange?.({ kind: "none" })}
+                    title={deletingMessage() ? t("messageItem.actions.deletingMessage") : t("messageItem.actions.deleteMessage")}
+                    aria-label={deletingMessage() ? t("messageItem.actions.deletingMessage") : t("messageItem.actions.deleteMessage")}
+                  >
+                    <MessageSquareX class="w-3.5 h-3.5" aria-hidden="true" />
+                  </button>
+                </Show>
              </div>
            </Show>
            <Show when={!isUser()}>
@@ -337,6 +382,14 @@ export default function MessageItem(props: MessageItemProps) {
                      class="message-action-button"
                      onClick={() => void handleDeletePart(partId())}
                      disabled={isDeletingPart(partId())}
+                      onMouseEnter={() => {
+                        setHoveredDeletePartId(partId())
+                        props.onDeleteHoverChange?.({ kind: "part", messageId: props.record.id, partId: partId(), partType: "text" })
+                      }}
+                      onMouseLeave={() => {
+                        setHoveredDeletePartId(null)
+                        props.onDeleteHoverChange?.({ kind: "none" })
+                      }}
                      title={isDeletingPart(partId()) ? t("messagePart.actions.deleting") : t("messagePart.actions.delete")}
                      aria-label={isDeletingPart(partId()) ? t("messagePart.actions.deleting") : t("messagePart.actions.delete")}
                    >
@@ -344,6 +397,20 @@ export default function MessageItem(props: MessageItemProps) {
                    </button>
                  )}
                </Show>
+
+                <Show when={props.showDeleteMessage}>
+                  <button
+                    class="message-action-button"
+                    onClick={handleDeleteMessage}
+                    disabled={deletingMessage()}
+                    onMouseEnter={() => props.onDeleteHoverChange?.({ kind: "message", messageId: props.record.id })}
+                    onMouseLeave={() => props.onDeleteHoverChange?.({ kind: "none" })}
+                    title={deletingMessage() ? t("messageItem.actions.deletingMessage") : t("messageItem.actions.deleteMessage")}
+                    aria-label={deletingMessage() ? t("messageItem.actions.deletingMessage") : t("messageItem.actions.deleteMessage")}
+                  >
+                    <MessageSquareX class="w-3.5 h-3.5" aria-hidden="true" />
+                  </button>
+                </Show>
              </div>
            </Show>
            <time class="message-timestamp" dateTime={timestampIso()}>{timestamp()}</time>
@@ -378,16 +445,27 @@ export default function MessageItem(props: MessageItemProps) {
        </Show>

        <For each={messageParts()}>
-          {(part) => (
-            <MessagePart
-              part={part}
-              messageType={props.record.role}
-              instanceId={props.instanceId}
-              sessionId={props.sessionId}
-              primaryUserTextPartId={primaryUserTextPartId()}
-              onRendered={props.onContentRendered}
-            />
-          )}
+          {(part) => {
+            const partId = typeof (part as any)?.id === "string" ? ((part as any).id as string) : ""
+            const isHoveredDeleteTarget = () => Boolean(partId) && hoveredDeletePartId() === partId
+
+            return (
+              <div
+                class="delete-hover-scope message-part-shell"
+                data-part-id={partId}
+                data-delete-part-hover={isHoveredDeleteTarget() ? "true" : undefined}
+              >
+                <MessagePart
+                  part={part}
+                  messageType={props.record.role}
+                  instanceId={props.instanceId}
+                  sessionId={props.sessionId}
+                  primaryUserTextPartId={primaryUserTextPartId()}
+                  onRendered={props.onContentRendered}
+                />
+              </div>
+            )
+          }}
        </For>

        <Show when={fileAttachments().length > 0}>
@@ -396,8 +474,13 @@ export default function MessageItem(props: MessageItemProps) {
              {(attachment) => {
                const name = getAttachmentName(attachment)
                const isImage = isImageAttachment(attachment)
+                const isHoveredDeleteTarget = () => hoveredDeletePartId() === attachment.id
                return (
-                  <div class={`attachment-chip ${isImage ? "attachment-chip-image" : ""}`} title={name}>
+                  <div
+                    class={`delete-hover-scope attachment-chip ${isImage ? "attachment-chip-image" : ""}`}
+                    data-delete-part-hover={isHoveredDeleteTarget() ? "true" : undefined}
+                    title={name}
+                  >
                    <Show when={isImage} fallback={
                      <svg class="h-3 w-3" fill="none" viewBox="0 0 24 24" stroke="currentColor">
                        <path
@@ -431,6 +514,16 @@ export default function MessageItem(props: MessageItemProps) {
                      onClick={() => void handleDeletePart(attachment.id)}
                      class="attachment-remove"
                      disabled={isDeletingPart(attachment.id)}
+                      onMouseEnter={() => {
+                        if (attachment.id) {
+                          setHoveredDeletePartId(attachment.id)
+                          props.onDeleteHoverChange?.({ kind: "part", messageId: props.record.id, partId: attachment.id, partType: "file" })
+                        }
+                      }}
+                      onMouseLeave={() => {
+                        setHoveredDeletePartId(null)
+                        props.onDeleteHoverChange?.({ kind: "none" })
+                      }}
                      aria-label={t("messagePart.actions.deleteTitle")}
                      title={t("messagePart.actions.deleteTitle")}
                    >
--- a/packages/ui/src/components/message-list-header.tsx
+++ b/packages/ui/src/components/message-list-header.tsx
@@ -51,7 +51,7 @@ export default function MessageListHeader(props: MessageListHeaderProps) {
        <div class="connection-status-shortcut-action">
          <button
            type="button"
-            class="connection-status-button"
+            class="connection-status-button command-palette-button"
            onClick={props.onCommandPalette}
            aria-label={t("messageListHeader.commandPalette.ariaLabel")}
          >
--- a/packages/ui/src/components/message-section.tsx
+++ b/packages/ui/src/components/message-section.tsx
@@ -10,6 +10,7 @@ import { useI18n } from "../lib/i18n"
 import { copyToClipboard } from "../lib/clipboard"
 import { showToastNotification } from "../lib/notifications"
 import type { InstanceMessageStore } from "../stores/message-v2/instance-store"
+import type { DeleteHoverState } from "../types/delete-hover"

 const SCROLL_SCOPE = "session"
 const SCROLL_SENTINEL_MARGIN_PX = 48
@@ -145,6 +146,8 @@ export default function MessageSection(props: MessageSectionProps) {
    }
  }
  const [activeMessageId, setActiveMessageId] = createSignal<string | null>(null)
+
+  const [deleteHover, setDeleteHover] = createSignal<DeleteHoverState>({ kind: "none" })
 
  const changeToken = createMemo(() => String(sessionRevision()))
  const isActive = createMemo(() => props.isActive !== false)
@@ -899,6 +902,8 @@ export default function MessageSection(props: MessageSectionProps) {
              onRevert={props.onRevert}
              onFork={props.onFork}
              onContentRendered={handleContentRendered}
+              deleteHover={deleteHover}
+              onDeleteHoverChange={setDeleteHover}
              setBottomSentinel={setBottomSentinel}
              suspendMeasurements={() => !isActive()}
            />
@@ -957,6 +962,7 @@ export default function MessageSection(props: MessageSectionProps) {
              instanceId={props.instanceId}
              sessionId={props.sessionId}
              showToolSegments={showTimelineToolsPreference()}
+              deleteHover={deleteHover}
            />
          </div>
        </Show>
--- a/packages/ui/src/components/message-timeline.tsx
+++ b/packages/ui/src/components/message-timeline.tsx
@@ -1,4 +1,4 @@
-import { For, Show, createEffect, createMemo, createSignal, onCleanup, type Component } from "solid-js"
+import { For, Show, createEffect, createMemo, createSignal, onCleanup, on, untrack, type Component } from "solid-js"
 import MessagePreview from "./message-preview"
 import { messageStoreBus } from "../stores/message-v2/bus"
 import type { ClientPart } from "../types/message"
@@ -7,6 +7,7 @@ import { buildRecordDisplayData } from "../stores/message-v2/record-display-cach
 import { getToolIcon } from "./tool-call/utils"
 import { User as UserIcon, Bot as BotIcon, FoldVertical, ShieldAlert } from "lucide-solid"
 import { useI18n } from "../lib/i18n"
+import type { DeleteHoverState } from "../types/delete-hover"

 export type TimelineSegmentType = "user" | "assistant" | "tool" | "compaction"

@@ -19,6 +20,8 @@ export interface TimelineSegment {
  shortLabel?: string
  variant?: "auto" | "manual"
  toolPartIds?: string[]
+  partIds?: string[]
+  partId?: string
 }

 interface MessageTimelineProps {
@@ -28,6 +31,7 @@ interface MessageTimelineProps {
  instanceId: string
  sessionId: string
  showToolSegments?: boolean
+  deleteHover?: () => DeleteHoverState
 }

 const MAX_TOOLTIP_LENGTH = 220
@@ -42,6 +46,7 @@ interface PendingSegment {
  toolTypeLabels: string[]
  toolIcons: string[]
  toolPartIds: string[]
+  partIds: string[]
  hasPrimaryText: boolean
 }

@@ -191,6 +196,7 @@ export function buildTimelineSegments(
      tooltip,
      shortLabel,
      toolPartIds: isToolSegment ? pending.toolPartIds : undefined,
+      partIds: !isToolSegment ? pending.partIds : undefined,
    })
    segmentIndex += 1
    pending = null
@@ -199,7 +205,17 @@ export function buildTimelineSegments(
  const ensureSegment = (type: TimelineSegmentType): PendingSegment => {
    if (!pending || pending.type !== type) {
      flushPending()
-      pending = { type, texts: [], reasoningTexts: [], toolTitles: [], toolTypeLabels: [], toolIcons: [], toolPartIds: [], hasPrimaryText: type !== "assistant" }
+      pending = {
+        type,
+        texts: [],
+        reasoningTexts: [],
+        toolTitles: [],
+        toolTypeLabels: [],
+        toolIcons: [],
+        toolPartIds: [],
+        partIds: [],
+        hasPrimaryText: type !== "assistant",
+      }
    }
    return pending!
  }
@@ -228,6 +244,9 @@ export function buildTimelineSegments(
      const target = ensureSegment(defaultContentType)
      if (target) {
        target.reasoningTexts.push(text)
+        if (typeof (part as any).id === "string" && (part as any).id.length > 0) {
+          target.partIds.push((part as any).id)
+        }
      }
      continue
    }
@@ -235,6 +254,7 @@ export function buildTimelineSegments(
    if (part.type === "compaction") {
      flushPending()
      const isAuto = Boolean((part as any)?.auto)
+      const partId = typeof (part as any)?.id === "string" ? ((part as any).id as string) : ""
      result.push({
        id: `${record.id}:${segmentIndex}`,
        messageId: record.id,
@@ -242,6 +262,7 @@ export function buildTimelineSegments(
        label: segmentLabel("compaction"),
        tooltip: isAuto ? t("messageTimeline.tooltip.compaction.auto") : t("messageTimeline.tooltip.compaction.manual"),
        variant: isAuto ? "auto" : "manual",
+        partId,
      })
      segmentIndex += 1
      continue
@@ -257,6 +278,9 @@ export function buildTimelineSegments(
    if (target) {
      target.texts.push(text)
      target.hasPrimaryText = true
+      if (typeof (part as any).id === "string" && (part as any).id.length > 0) {
+        target.partIds.push((part as any).id)
+      }
    }
  }

@@ -278,6 +302,7 @@ const MessageTimeline: Component<MessageTimelineProps> = (props) => {
  let hoverTimer: number | null = null
  let closeTimer: number | null = null
  const showTools = () => props.showToolSegments ?? true
+  const deleteHover = () => props.deleteHover?.() ?? { kind: "none" as const }
 
  const registerButtonRef = (segmentId: string, element: HTMLButtonElement | null) => {
    if (element) {
@@ -350,11 +375,9 @@ const MessageTimeline: Component<MessageTimelineProps> = (props) => {
    clearCloseTimer()
  })

-  createEffect(() => {
-    const activeId = props.activeMessageId
-
+  createEffect(on(() => props.activeMessageId, (activeId) => {
    if (!activeId) return
-    const targetSegment = props.segments.find((segment) => segment.messageId === activeId)
+    const targetSegment = untrack(() => props.segments).find((segment) => segment.messageId === activeId)
    if (!targetSegment) return
    const element = buttonRefs.get(targetSegment.id)
    if (!element) return
@@ -366,7 +389,7 @@ const MessageTimeline: Component<MessageTimelineProps> = (props) => {
        window.clearTimeout(timer)
      }
    })
-  })
+  }))

  createEffect(() => {
    const element = tooltipElement()
@@ -428,16 +451,34 @@ const MessageTimeline: Component<MessageTimelineProps> = (props) => {
           }

          return (
-             <button
-               ref={(el) => registerButtonRef(segment.id, el)}
-               type="button"
-               data-variant={segment.variant}
-               class={`message-timeline-segment message-timeline-${segment.type} ${hasActivePermission() ? "message-timeline-segment-permission" : ""} ${segment.type === "compaction" ? `message-timeline-compaction-${segment.variant ?? "manual"}` : ""} ${isActive() ? "message-timeline-segment-active" : ""} ${isHidden() ? "message-timeline-segment-hidden" : ""}`}
+              <button
+                ref={(el) => registerButtonRef(segment.id, el)}
+                type="button"
+                data-variant={segment.variant}
+                class={`message-timeline-segment message-timeline-${segment.type} ${hasActivePermission() ? "message-timeline-segment-permission" : ""} ${segment.type === "compaction" ? `message-timeline-compaction-${segment.variant ?? "manual"}` : ""} ${isActive() ? "message-timeline-segment-active" : ""} ${isHidden() ? "message-timeline-segment-hidden" : ""}`}

-              aria-current={isActive() ? "true" : undefined}
-              aria-hidden={isHidden() ? "true" : undefined}
-              onClick={() => props.onSegmentClick?.(segment)}
-              onMouseEnter={(event) => handleMouseEnter(segment, event)}
+                data-delete-hover={(() => {
+                  const hover = deleteHover() as DeleteHoverState
+                  if (hover.kind === "message") {
+                    return hover.messageId === segment.messageId ? "true" : undefined
+                  }
+                  if (hover.kind === "part") {
+                    if (hover.messageId !== segment.messageId) return undefined
+                    if (segment.type === "tool") {
+                      return segment.toolPartIds?.includes(hover.partId) ? "true" : undefined
+                    }
+                    if (segment.type === "compaction") {
+                      return segment.partId === hover.partId ? "true" : undefined
+                    }
+                    return segment.partIds?.includes(hover.partId) ? "true" : undefined
+                  }
+                  return undefined
+                })()}
+
+               aria-current={isActive() ? "true" : undefined}
+               aria-hidden={isHidden() ? "true" : undefined}
+               onClick={() => props.onSegmentClick?.(segment)}
+               onMouseEnter={(event) => handleMouseEnter(segment, event)}
              onMouseLeave={handleMouseLeave}
            >
              <span class="message-timeline-label message-timeline-label-full">{segment.label}</span>
--- a/packages/ui/src/components/tool-call.tsx
+++ b/packages/ui/src/components/tool-call.tsx
@@ -1,5 +1,5 @@
 import { createSignal, Show, createEffect, createMemo, onCleanup } from "solid-js"
-import { ArrowRightSquare, Copy } from "lucide-solid"
+import { ArrowRightSquare, Check, Copy, Hourglass, Loader2, XCircle } from "lucide-solid"
 import { stringify as stringifyYaml } from "yaml"
 import { messageStoreBus } from "../stores/message-v2/bus"
 import { useTheme } from "../lib/theme"
@@ -44,7 +44,7 @@ import { getLogger } from "../lib/logger"

 const log = getLogger("session")

-type ToolState = import("@opencode-ai/sdk").ToolState
+type ToolState = import("@opencode-ai/sdk/v2").ToolState

 const TOOL_CALL_CACHE_SCOPE = "tool-call"
 const TOOL_SCROLL_SENTINEL_MARGIN_PX = 48
@@ -576,13 +576,13 @@ export default function ToolCall(props: ToolCallProps) {
    const status = toolState()?.status || ""
    switch (status) {
      case "pending":
-        return "⏳"
+        return <Hourglass class="w-4 h-4" />
      case "running":
-        return "🔄"
+        return <Loader2 class="w-4 h-4 animate-spin" />
      case "completed":
-        return "✅"
+        return <Check class="w-4 h-4" />
      case "error":
-        return "⚠️"
+        return <XCircle class="w-4 h-4" />
      default:
        return ""
    }
--- a/packages/ui/src/components/tool-call/diagnostics.ts
+++ b/packages/ui/src/components/tool-call/diagnostics.ts
@@ -1,4 +1,4 @@
-import type { ToolState } from "@opencode-ai/sdk"
+import type { ToolState } from "@opencode-ai/sdk/v2"
 import { getRelativePath, isToolStateCompleted, isToolStateError, isToolStateRunning } from "./utils"
 import { tGlobal } from "../../lib/i18n"

--- a/packages/ui/src/components/tool-call/markdown-render.tsx
+++ b/packages/ui/src/components/tool-call/markdown-render.tsx
@@ -1,5 +1,5 @@
 import type { Accessor, JSXElement } from "solid-js"
-import type { ToolState } from "@opencode-ai/sdk"
+import type { ToolState } from "@opencode-ai/sdk/v2"
 import type { TextPart } from "../../types/message"
 import { Markdown } from "../markdown"
 import type { MarkdownRenderOptions, ToolScrollHelpers } from "./types"
--- a/packages/ui/src/components/tool-call/question-block.tsx
+++ b/packages/ui/src/components/tool-call/question-block.tsx
@@ -1,5 +1,5 @@
 import { createMemo, Show, For, createEffect, type Accessor } from "solid-js"
-import type { ToolState } from "@opencode-ai/sdk"
+import type { ToolState } from "@opencode-ai/sdk/v2"
 import type { QuestionRequest } from "@opencode-ai/sdk/v2"
 import { useI18n } from "../../lib/i18n"

--- a/packages/ui/src/components/tool-call/renderers/task.tsx
+++ b/packages/ui/src/components/tool-call/renderers/task.tsx
@@ -1,5 +1,5 @@
 import { For, Show, createEffect, createMemo, createSignal, untrack } from "solid-js"
-import type { ToolState } from "@opencode-ai/sdk"
+import type { ToolState } from "@opencode-ai/sdk/v2"
 import type { ToolRenderer } from "../types"
 import { ensureMarkdownContent, getDefaultToolAction, getToolIcon, getToolName, readToolStatePayload } from "../utils"
 import { resolveTitleForTool } from "../tool-title"
@@ -287,7 +287,9 @@ export const taskRenderer: ToolRenderer = {
                content: promptContent()!,
                cacheKey: "task:prompt",
                disableScrollTracking: true,
-                disableHighlight: true,
+                // Always use the normal markdown render path for prompt (even while running)
+                // so the prompt doesn't visually change between running/completed states.
+                disableHighlight: false,
              })}
            </div>
          </section>
--- a/packages/ui/src/components/tool-call/renderers/todo.tsx
+++ b/packages/ui/src/components/tool-call/renderers/todo.tsx
@@ -1,5 +1,5 @@
 import { For, Show } from "solid-js"
-import type { ToolState } from "@opencode-ai/sdk"
+import type { ToolState } from "@opencode-ai/sdk/v2"
 import type { ToolRenderer } from "../types"
 import { readToolStatePayload } from "../utils"
 import { useI18n, tGlobal } from "../../../lib/i18n"
--- a/packages/ui/src/components/tool-call/tool-title.ts
+++ b/packages/ui/src/components/tool-call/tool-title.ts
@@ -1,4 +1,4 @@
-import type { ToolState } from "@opencode-ai/sdk"
+import type { ToolState } from "@opencode-ai/sdk/v2"
 import type { ToolRendererContext, ToolRenderer, ToolCallPart } from "./types"
 import { getDefaultToolAction, getToolName, isToolStateCompleted, isToolStateRunning } from "./utils"
 import { enMessages } from "../../lib/i18n/messages/en"
--- a/packages/ui/src/components/tool-call/types.ts
+++ b/packages/ui/src/components/tool-call/types.ts
@@ -1,5 +1,5 @@
 import type { Accessor, JSXElement } from "solid-js"
-import type { ToolState } from "@opencode-ai/sdk"
+import type { ToolState } from "@opencode-ai/sdk/v2"
 import type { ClientPart } from "../../types/message"

 export type ToolCallPart = Extract<ClientPart, { type: "tool" }>
--- a/packages/ui/src/components/tool-call/utils.ts
+++ b/packages/ui/src/components/tool-call/utils.ts
@@ -1,15 +1,15 @@
 import { isRenderableDiffText } from "../../lib/diff-utils"
 import { getLanguageFromPath } from "../../lib/markdown"
-import type { ToolState } from "@opencode-ai/sdk"
+import type { ToolState } from "@opencode-ai/sdk/v2"
 import type { DiffPayload } from "./types"
 import { getLogger } from "../../lib/logger"
 import { tGlobal } from "../../lib/i18n"
 const log = getLogger("session")


-export type ToolStateRunning = import("@opencode-ai/sdk").ToolStateRunning
-export type ToolStateCompleted = import("@opencode-ai/sdk").ToolStateCompleted
-export type ToolStateError = import("@opencode-ai/sdk").ToolStateError
+export type ToolStateRunning = import("@opencode-ai/sdk/v2").ToolStateRunning
+export type ToolStateCompleted = import("@opencode-ai/sdk/v2").ToolStateCompleted
+export type ToolStateError = import("@opencode-ai/sdk/v2").ToolStateError

 export const diffCapableTools = new Set(["edit", "patch"])

--- a/packages/ui/src/lib/i18n/messages/en/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/en/instance.ts
@@ -96,11 +96,17 @@ export const instanceMessages = {
  "instanceShell.rightPanel.tabs.ariaLabel": "Right panel tabs",
  "instanceShell.rightPanel.actions.refresh": "Refresh",
  "instanceShell.rightPanel.sections.sessionChanges": "Session Changes",
+  "instanceShell.rightPanel.sections.sessionChanges.tooltip": "Files modified in the current session. Shows additions and deletions for each file.",
  "instanceShell.rightPanel.sections.plan": "Plan",
+  "instanceShell.rightPanel.sections.plan.tooltip": "The agent's roadmap for this session. Tracks tasks, subtasks, and their completion status.",
  "instanceShell.rightPanel.sections.backgroundProcesses": "Background Shells",
+  "instanceShell.rightPanel.sections.backgroundProcesses.tooltip": "Long-running processes started by the agent. You can monitor their output, stop, or terminate them.",
  "instanceShell.rightPanel.sections.mcp": "MCP Servers",
+  "instanceShell.rightPanel.sections.mcp.tooltip": "Model Context Protocol servers that extend the agent's capabilities with external tools and services.",
  "instanceShell.rightPanel.sections.lsp": "LSP Servers",
+  "instanceShell.rightPanel.sections.lsp.tooltip": "Language Server Protocol servers providing code intelligence, diagnostics, and language-specific features.",
  "instanceShell.rightPanel.sections.plugins": "Plugins",
+  "instanceShell.rightPanel.sections.plugins.tooltip": "Plugins that customize the UI and server behavior, adding features beyond MCP and LSP.",

  "instanceShell.sessionChanges.noSessionSelected": "Select a session to view changes.",
  "instanceShell.sessionChanges.loading": "Fetching session changes...",
--- a/packages/ui/src/lib/i18n/messages/en/messaging.ts
+++ b/packages/ui/src/lib/i18n/messages/en/messaging.ts
@@ -41,7 +41,7 @@ export const messagingMessages = {
  "messageBlock.tool.goToSession.label": "Go to Session",
  "messageBlock.tool.goToSession.title": "Go to session",
  "messageBlock.tool.goToSession.unavailableTitle": "Session not available yet",
-  "messageBlock.tool.deletePart.label": "Delete",
+  "messageBlock.tool.deletePart.label": "Delete Part",
  "messageBlock.tool.deletePart.deleting": "Deleting...",
  "messageBlock.tool.deletePart.title": "Delete this tool call output",
  "messageBlock.tool.deletePart.failed.title": "Delete failed",
@@ -71,17 +71,21 @@ export const messagingMessages = {
  "messageItem.speaker.you": "You",
  "messageItem.speaker.assistant": "Assistant",
  "messageItem.actions.revert": "Revert",
-  "messageItem.actions.revertTitle": "Revert to this message",
+  "messageItem.actions.revertTitle": "Undo changes up to here",
  "messageItem.actions.fork": "Fork",
  "messageItem.actions.forkTitle": "Fork from this message",
  "messageItem.actions.copy": "Copy",
  "messageItem.actions.copyTitle": "Copy message",
  "messageItem.actions.copied": "Copied!",
+  "messageItem.actions.deleteMessage": "Delete message",
+  "messageItem.actions.deletingMessage": "Deleting...",
+  "messageItem.actions.deleteMessageFailedTitle": "Delete failed",
+  "messageItem.actions.deleteMessageFailedMessage": "Failed to delete message",
  "messageItem.status.queued": "QUEUED",
  "messageItem.status.generating": "Generating...",
  "messageItem.status.sending": "Sending...",
  "messageItem.status.failedToSend": "Message failed to send",
-  "messagePart.actions.delete": "Delete",
+  "messagePart.actions.delete": "Delete Part",
  "messagePart.actions.deleting": "Deleting...",
  "messagePart.actions.deleteTitle": "Delete this item",
  "messagePart.actions.deleteFailedTitle": "Delete failed",
--- a/packages/ui/src/lib/i18n/messages/es/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/es/instance.ts
@@ -48,7 +48,7 @@ export const instanceMessages = {
  "instanceShell.commandPalette.openAriaLabel": "Abrir paleta de comandos",
  "instanceShell.commandPalette.button": "Paleta de comandos",

-  "instanceShell.connection.ariaLabel": "Connection {status}",
+  "instanceShell.connection.ariaLabel": "Conexión {status}",
  "instanceShell.connection.connected": "Conectada",
  "instanceShell.connection.connecting": "Conectando...",
  "instanceShell.connection.disconnected": "Desconectada",
@@ -93,16 +93,22 @@ export const instanceMessages = {
  "instanceShell.rightPanel.tabs.files": "Archivos",
  "instanceShell.rightPanel.tabs.status": "Estado",
  "instanceShell.rightPanel.tabs.ariaLabel": "Pestañas del panel derecho",
-  "instanceShell.rightPanel.sections.sessionChanges": "Cambios de sesion",
+  "instanceShell.rightPanel.sections.sessionChanges": "Cambios de sesión",
+  "instanceShell.rightPanel.sections.sessionChanges.tooltip": "Archivos modificados en la sesión actual. Muestra las adiciones y eliminaciones de cada archivo.",
  "instanceShell.rightPanel.sections.plan": "Plan",
+  "instanceShell.rightPanel.sections.plan.tooltip": "Hoja de ruta del agente para esta sesión. Realiza el seguimiento de tareas, subtareas y su estado de finalización.",
  "instanceShell.rightPanel.sections.backgroundProcesses": "Shells en segundo plano",
+  "instanceShell.rightPanel.sections.backgroundProcesses.tooltip": "Procesos de larga duración iniciados por el agente. Puedes supervisar su salida, detenerlos o terminarlos.",
  "instanceShell.rightPanel.sections.mcp": "Servidores MCP",
+  "instanceShell.rightPanel.sections.mcp.tooltip": "Servidores del Model Context Protocol (MCP) que amplían las capacidades del agente con herramientas y servicios externos.",
  "instanceShell.rightPanel.sections.lsp": "Servidores LSP",
+  "instanceShell.rightPanel.sections.lsp.tooltip": "Servidores del Language Server Protocol (LSP) que proporcionan inteligencia de código, diagnósticos y funciones específicas del lenguaje.",
  "instanceShell.rightPanel.sections.plugins": "Plugins",
+  "instanceShell.rightPanel.sections.plugins.tooltip": "Plugins que personalizan el comportamiento de la UI y del servidor, y añaden funciones más allá de MCP y LSP.",

-  "instanceShell.sessionChanges.noSessionSelected": "Selecciona una sesion para ver los cambios.",
-  "instanceShell.sessionChanges.loading": "Obteniendo cambios de la sesion...",
-  "instanceShell.sessionChanges.empty": "Aun no hay cambios.",
+  "instanceShell.sessionChanges.noSessionSelected": "Selecciona una sesión para ver los cambios.",
+  "instanceShell.sessionChanges.loading": "Obteniendo cambios de la sesión...",
+  "instanceShell.sessionChanges.empty": "Aún no hay cambios.",
  "instanceShell.sessionChanges.filesChanged": "{count} archivos cambiados",
  "instanceShell.sessionChanges.actions.show": "Mostrar cambios",

--- a/packages/ui/src/lib/i18n/messages/es/messaging.ts
+++ b/packages/ui/src/lib/i18n/messages/es/messaging.ts
@@ -41,7 +41,7 @@ export const messagingMessages = {
  "messageBlock.tool.goToSession.label": "Ir a sesión",
  "messageBlock.tool.goToSession.title": "Ir a la sesión",
  "messageBlock.tool.goToSession.unavailableTitle": "La sesión aún no está disponible",
-  "messageBlock.tool.deletePart.label": "Eliminar",
+  "messageBlock.tool.deletePart.label": "Eliminar parte",
  "messageBlock.tool.deletePart.deleting": "Eliminando...",
  "messageBlock.tool.deletePart.title": "Eliminar esta salida de herramienta",
  "messageBlock.tool.deletePart.failed.title": "Error al eliminar",
@@ -71,17 +71,21 @@ export const messagingMessages = {
  "messageItem.speaker.you": "Tú",
  "messageItem.speaker.assistant": "Asistente",
  "messageItem.actions.revert": "Revertir",
-  "messageItem.actions.revertTitle": "Revertir a este mensaje",
+  "messageItem.actions.revertTitle": "Deshacer cambios hasta aqui",
  "messageItem.actions.fork": "Fork",
  "messageItem.actions.forkTitle": "Fork desde este mensaje",
  "messageItem.actions.copy": "Copiar",
  "messageItem.actions.copyTitle": "Copiar mensaje",
  "messageItem.actions.copied": "¡Copiado!",
+  "messageItem.actions.deleteMessage": "Eliminar mensaje",
+  "messageItem.actions.deletingMessage": "Eliminando...",
+  "messageItem.actions.deleteMessageFailedTitle": "Error al eliminar",
+  "messageItem.actions.deleteMessageFailedMessage": "No se pudo eliminar el mensaje",
  "messageItem.status.queued": "EN COLA",
  "messageItem.status.generating": "Generando...",
  "messageItem.status.sending": "Enviando...",
  "messageItem.status.failedToSend": "No se pudo enviar el mensaje",
-  "messagePart.actions.delete": "Eliminar",
+  "messagePart.actions.delete": "Eliminar parte",
  "messagePart.actions.deleting": "Eliminando...",
  "messagePart.actions.deleteTitle": "Eliminar este elemento",
  "messagePart.actions.deleteFailedTitle": "Error al eliminar",
--- a/packages/ui/src/lib/i18n/messages/fr/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/fr/instance.ts
@@ -94,11 +94,17 @@ export const instanceMessages = {
  "instanceShell.rightPanel.tabs.status": "Statut",
  "instanceShell.rightPanel.tabs.ariaLabel": "Onglets du panneau droit",
  "instanceShell.rightPanel.sections.sessionChanges": "Changements de session",
+  "instanceShell.rightPanel.sections.sessionChanges.tooltip": "Fichiers modifiés dans la session actuelle. Affiche les ajouts et suppressions pour chaque fichier.",
  "instanceShell.rightPanel.sections.plan": "Plan",
+  "instanceShell.rightPanel.sections.plan.tooltip": "Feuille de route de l'agent pour cette session. Suit les tâches et leur statut d'achèvement.",
  "instanceShell.rightPanel.sections.backgroundProcesses": "Shells en arrière-plan",
+  "instanceShell.rightPanel.sections.backgroundProcesses.tooltip": "Processus longs démarrés par l'agent. Vous pouvez surveiller leur sortie, les arrêter ou les terminer.",
  "instanceShell.rightPanel.sections.mcp": "Serveurs MCP",
+  "instanceShell.rightPanel.sections.mcp.tooltip": "Serveurs du protocole Model Context Protocol qui étendent les capacités de l'agent avec des outils externes.",
  "instanceShell.rightPanel.sections.lsp": "Serveurs LSP",
+  "instanceShell.rightPanel.sections.lsp.tooltip": "Serveurs du protocole Language Server Protocol fournissant l'intelligence de code et les diagnostics.",
  "instanceShell.rightPanel.sections.plugins": "Plugins",
+  "instanceShell.rightPanel.sections.plugins.tooltip": "Plugins qui personnalisent le comportement de l'UI et du serveur, ajoutant des fonctionnalités au-delà de MCP et LSP.",

  "instanceShell.sessionChanges.noSessionSelected": "Sélectionnez une session pour voir les changements.",
  "instanceShell.sessionChanges.loading": "Récupération des changements...",
--- a/packages/ui/src/lib/i18n/messages/fr/messaging.ts
+++ b/packages/ui/src/lib/i18n/messages/fr/messaging.ts
@@ -41,7 +41,7 @@ export const messagingMessages = {
  "messageBlock.tool.goToSession.label": "Aller à la session",
  "messageBlock.tool.goToSession.title": "Aller à la session",
  "messageBlock.tool.goToSession.unavailableTitle": "Session pas encore disponible",
-  "messageBlock.tool.deletePart.label": "Supprimer",
+  "messageBlock.tool.deletePart.label": "Supprimer la partie",
  "messageBlock.tool.deletePart.deleting": "Suppression...",
  "messageBlock.tool.deletePart.title": "Supprimer cette sortie d'outil",
  "messageBlock.tool.deletePart.failed.title": "Échec de suppression",
@@ -71,17 +71,21 @@ export const messagingMessages = {
  "messageItem.speaker.you": "Vous",
  "messageItem.speaker.assistant": "Assistant",
  "messageItem.actions.revert": "Revenir",
-  "messageItem.actions.revertTitle": "Revenir à ce message",
+  "messageItem.actions.revertTitle": "Annuler les changements jusqu'ici",
  "messageItem.actions.fork": "Fork",
  "messageItem.actions.forkTitle": "Fork depuis ce message",
  "messageItem.actions.copy": "Copier",
  "messageItem.actions.copyTitle": "Copier le message",
  "messageItem.actions.copied": "Copié !",
+  "messageItem.actions.deleteMessage": "Supprimer le message",
+  "messageItem.actions.deletingMessage": "Suppression...",
+  "messageItem.actions.deleteMessageFailedTitle": "Échec de suppression",
+  "messageItem.actions.deleteMessageFailedMessage": "Impossible de supprimer le message",
  "messageItem.status.queued": "EN FILE",
  "messageItem.status.generating": "Génération...",
  "messageItem.status.sending": "Envoi...",
  "messageItem.status.failedToSend": "Échec de l'envoi du message",
-  "messagePart.actions.delete": "Supprimer",
+  "messagePart.actions.delete": "Supprimer la partie",
  "messagePart.actions.deleting": "Suppression...",
  "messagePart.actions.deleteTitle": "Supprimer cet élément",
  "messagePart.actions.deleteFailedTitle": "Échec de suppression",
--- a/packages/ui/src/lib/i18n/messages/ja/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/ja/instance.ts
@@ -94,11 +94,17 @@ export const instanceMessages = {
  "instanceShell.rightPanel.tabs.status": "ステータス",
  "instanceShell.rightPanel.tabs.ariaLabel": "右パネルのタブ",
  "instanceShell.rightPanel.sections.sessionChanges": "セッション変更",
+  "instanceShell.rightPanel.sections.sessionChanges.tooltip": "現在のセッションで変更されたファイル。各ファイルの追加と削除を表示します。",
  "instanceShell.rightPanel.sections.plan": "計画",
+  "instanceShell.rightPanel.sections.plan.tooltip": "このセッションにおけるエージェントのロードマップ。タスクやサブタスク、および完了状況を追跡します。",
  "instanceShell.rightPanel.sections.backgroundProcesses": "バックグラウンドシェル",
+  "instanceShell.rightPanel.sections.backgroundProcesses.tooltip": "エージェントが開始した長時間実行プロセス。出力を監視し、停止または終了できます。",
  "instanceShell.rightPanel.sections.mcp": "MCP サーバー",
+  "instanceShell.rightPanel.sections.mcp.tooltip": "Model Context Protocol (MCP) サーバー。外部ツールやサービスでエージェントの機能を拡張します。",
  "instanceShell.rightPanel.sections.lsp": "LSP サーバー",
+  "instanceShell.rightPanel.sections.lsp.tooltip": "Language Server Protocolサーバーがコードインテリジェンス、診断、言語固有の機能を提供します。",
  "instanceShell.rightPanel.sections.plugins": "プラグイン",
+  "instanceShell.rightPanel.sections.plugins.tooltip": "UI とサーバーの動作をカスタマイズし、MCP や LSP 以外の機能も追加できるプラグイン。",

  "instanceShell.sessionChanges.noSessionSelected": "変更を表示するにはセッションを選択してください。",
  "instanceShell.sessionChanges.loading": "変更を取得中...",
--- a/packages/ui/src/lib/i18n/messages/ja/messaging.ts
+++ b/packages/ui/src/lib/i18n/messages/ja/messaging.ts
@@ -41,7 +41,7 @@ export const messagingMessages = {
  "messageBlock.tool.goToSession.label": "セッションへ移動",
  "messageBlock.tool.goToSession.title": "セッションへ移動",
  "messageBlock.tool.goToSession.unavailableTitle": "セッションはまだ利用できません",
-  "messageBlock.tool.deletePart.label": "削除",
+  "messageBlock.tool.deletePart.label": "パートを削除",
  "messageBlock.tool.deletePart.deleting": "削除中...",
  "messageBlock.tool.deletePart.title": "このツール出力を削除",
  "messageBlock.tool.deletePart.failed.title": "削除に失敗しました",
@@ -71,17 +71,21 @@ export const messagingMessages = {
  "messageItem.speaker.you": "あなた",
  "messageItem.speaker.assistant": "アシスタント",
  "messageItem.actions.revert": "戻す",
-  "messageItem.actions.revertTitle": "このメッセージまで戻す",
+  "messageItem.actions.revertTitle": "ここまでの変更を元に戻す",
  "messageItem.actions.fork": "フォーク",
  "messageItem.actions.forkTitle": "このメッセージからフォーク",
  "messageItem.actions.copy": "コピー",
  "messageItem.actions.copyTitle": "メッセージをコピー",
  "messageItem.actions.copied": "コピーしました!",
+  "messageItem.actions.deleteMessage": "メッセージを削除",
+  "messageItem.actions.deletingMessage": "削除中...",
+  "messageItem.actions.deleteMessageFailedTitle": "削除に失敗しました",
+  "messageItem.actions.deleteMessageFailedMessage": "メッセージの削除に失敗しました",
  "messageItem.status.queued": "待機中",
  "messageItem.status.generating": "生成中...",
  "messageItem.status.sending": "送信中...",
  "messageItem.status.failedToSend": "メッセージの送信に失敗しました",
-  "messagePart.actions.delete": "削除",
+  "messagePart.actions.delete": "パートを削除",
  "messagePart.actions.deleting": "削除中...",
  "messagePart.actions.deleteTitle": "この項目を削除",
  "messagePart.actions.deleteFailedTitle": "削除に失敗しました",
--- a/packages/ui/src/lib/i18n/messages/ru/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/ru/instance.ts
@@ -94,11 +94,17 @@ export const instanceMessages = {
  "instanceShell.rightPanel.tabs.status": "Статус",
  "instanceShell.rightPanel.tabs.ariaLabel": "Вкладки правой панели",
  "instanceShell.rightPanel.sections.sessionChanges": "Изменения сессии",
+  "instanceShell.rightPanel.sections.sessionChanges.tooltip": "Файлы, измененные в текущей сессии. Показывает добавления и удаления для каждого файла.",
  "instanceShell.rightPanel.sections.plan": "План",
-  "instanceShell.rightPanel.sections.backgroundProcesses": "Фоновые Shell",
+  "instanceShell.rightPanel.sections.plan.tooltip": "Дорожная карта агента для этой сессии. Отслеживает задачи и их статус выполнения.",
+  "instanceShell.rightPanel.sections.backgroundProcesses": "Фоновые оболочки",
+  "instanceShell.rightPanel.sections.backgroundProcesses.tooltip": "Долгоработающие процессы, запущенные агентом. Вы можете следить за их выводом, останавливать или завершать их.",
  "instanceShell.rightPanel.sections.mcp": "MCP-серверы",
+  "instanceShell.rightPanel.sections.mcp.tooltip": "Серверы протокола Model Context Protocol, расширяющие возможности агента внешними инструментами.",
  "instanceShell.rightPanel.sections.lsp": "LSP-серверы",
+  "instanceShell.rightPanel.sections.lsp.tooltip": "Серверы протокола Language Server Protocol, обеспечивающие интеллектуальную поддержку кода и диагностику.",
  "instanceShell.rightPanel.sections.plugins": "Плагины",
+  "instanceShell.rightPanel.sections.plugins.tooltip": "Плагины, настраивающие поведение интерфейса и сервера, добавляющие функции поверх MCP и LSP.",

  "instanceShell.sessionChanges.noSessionSelected": "Выберите сессию, чтобы просмотреть изменения.",
  "instanceShell.sessionChanges.loading": "Загрузка изменений...",
@@ -128,7 +134,7 @@ export const instanceMessages = {
  "versionPill.uiWithVersion": "UI {version}",
  "versionPill.source": " ({source})",

-  "opencodeBinarySelector.title": "OpenCode Binary",
+  "opencodeBinarySelector.title": "Бинарник OpenCode",
  "opencodeBinarySelector.subtitle": "Выберите, какой исполняемый файл OpenCode запускать",
  "opencodeBinarySelector.customPath.placeholder": "Введите путь к бинарнику opencode…",
  "opencodeBinarySelector.actions.add": "Добавить",
--- a/packages/ui/src/lib/i18n/messages/ru/messaging.ts
+++ b/packages/ui/src/lib/i18n/messages/ru/messaging.ts
@@ -41,7 +41,7 @@ export const messagingMessages = {
  "messageBlock.tool.goToSession.label": "Перейти к сессии",
  "messageBlock.tool.goToSession.title": "Перейти к сессии",
  "messageBlock.tool.goToSession.unavailableTitle": "Сессия пока недоступна",
-  "messageBlock.tool.deletePart.label": "Удалить",
+  "messageBlock.tool.deletePart.label": "Удалить часть",
  "messageBlock.tool.deletePart.deleting": "Удаление...",
  "messageBlock.tool.deletePart.title": "Удалить этот вывод инструмента",
  "messageBlock.tool.deletePart.failed.title": "Ошибка удаления",
@@ -71,17 +71,21 @@ export const messagingMessages = {
  "messageItem.speaker.you": "Вы",
  "messageItem.speaker.assistant": "Ассистент",
  "messageItem.actions.revert": "Откатить",
-  "messageItem.actions.revertTitle": "Откатиться к этому сообщению",
+  "messageItem.actions.revertTitle": "Отменить изменения до этого места",
  "messageItem.actions.fork": "Форк",
  "messageItem.actions.forkTitle": "Форкнуть от этого сообщения",
  "messageItem.actions.copy": "Копировать",
  "messageItem.actions.copyTitle": "Копировать сообщение",
  "messageItem.actions.copied": "Скопировано!",
+  "messageItem.actions.deleteMessage": "Удалить сообщение",
+  "messageItem.actions.deletingMessage": "Удаление...",
+  "messageItem.actions.deleteMessageFailedTitle": "Ошибка удаления",
+  "messageItem.actions.deleteMessageFailedMessage": "Не удалось удалить сообщение",
  "messageItem.status.queued": "В ОЧЕРЕДИ",
  "messageItem.status.generating": "Генерация…",
  "messageItem.status.sending": "Отправка…",
  "messageItem.status.failedToSend": "Не удалось отправить сообщение",
-  "messagePart.actions.delete": "Удалить",
+  "messagePart.actions.delete": "Удалить часть",
  "messagePart.actions.deleting": "Удаление...",
  "messagePart.actions.deleteTitle": "Удалить этот элемент",
  "messagePart.actions.deleteFailedTitle": "Ошибка удаления",
--- a/packages/ui/src/lib/i18n/messages/zh-Hans/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/zh-Hans/instance.ts
@@ -94,11 +94,17 @@ export const instanceMessages = {
  "instanceShell.rightPanel.tabs.status": "状态",
  "instanceShell.rightPanel.tabs.ariaLabel": "右侧面板标签页",
  "instanceShell.rightPanel.sections.sessionChanges": "会话更改",
+  "instanceShell.rightPanel.sections.sessionChanges.tooltip": "当前会话中修改的文件。显示每个文件的添加和删除。",
  "instanceShell.rightPanel.sections.plan": "计划",
+  "instanceShell.rightPanel.sections.plan.tooltip": "代理的路线图。跟踪任务、子任务及其完成状态。",
  "instanceShell.rightPanel.sections.backgroundProcesses": "后台 Shell",
+  "instanceShell.rightPanel.sections.backgroundProcesses.tooltip": "代理启动的后台进程。您可以监控其输出、停止或终止它们。",
  "instanceShell.rightPanel.sections.mcp": "MCP 服务器",
+  "instanceShell.rightPanel.sections.mcp.tooltip": "模型上下文协议服务器，使用外部工具和服务扩展代理能力。",
  "instanceShell.rightPanel.sections.lsp": "LSP 服务器",
+  "instanceShell.rightPanel.sections.lsp.tooltip": "语言服务器协议服务器，提供代码智能、诊断和语言特定的功能。",
  "instanceShell.rightPanel.sections.plugins": "插件",
+  "instanceShell.rightPanel.sections.plugins.tooltip": "自定义 UI 和服务器行为的插件，添加超出 MCP 和 LSP 的功能。",

  "instanceShell.sessionChanges.noSessionSelected": "选择会话以查看更改。",
  "instanceShell.sessionChanges.loading": "正在获取会话更改...",
--- a/packages/ui/src/lib/i18n/messages/zh-Hans/messaging.ts
+++ b/packages/ui/src/lib/i18n/messages/zh-Hans/messaging.ts
@@ -41,7 +41,7 @@ export const messagingMessages = {
  "messageBlock.tool.goToSession.label": "前往会话",
  "messageBlock.tool.goToSession.title": "前往会话",
  "messageBlock.tool.goToSession.unavailableTitle": "会话尚不可用",
-  "messageBlock.tool.deletePart.label": "删除",
+  "messageBlock.tool.deletePart.label": "删除部分",
  "messageBlock.tool.deletePart.deleting": "正在删除...",
  "messageBlock.tool.deletePart.title": "删除此工具输出",
  "messageBlock.tool.deletePart.failed.title": "删除失败",
@@ -71,17 +71,21 @@ export const messagingMessages = {
  "messageItem.speaker.you": "你",
  "messageItem.speaker.assistant": "助手",
  "messageItem.actions.revert": "回退",
-  "messageItem.actions.revertTitle": "回退到这条消息",
+  "messageItem.actions.revertTitle": "撤销到此处的更改",
  "messageItem.actions.fork": "分叉",
  "messageItem.actions.forkTitle": "从这条消息分叉",
  "messageItem.actions.copy": "复制",
  "messageItem.actions.copyTitle": "复制消息",
  "messageItem.actions.copied": "已复制！",
+  "messageItem.actions.deleteMessage": "删除消息",
+  "messageItem.actions.deletingMessage": "正在删除...",
+  "messageItem.actions.deleteMessageFailedTitle": "删除失败",
+  "messageItem.actions.deleteMessageFailedMessage": "无法删除消息",
  "messageItem.status.queued": "排队中",
  "messageItem.status.generating": "正在生成...",
  "messageItem.status.sending": "正在发送...",
  "messageItem.status.failedToSend": "消息发送失败",
-  "messagePart.actions.delete": "删除",
+  "messagePart.actions.delete": "删除部分",
  "messagePart.actions.deleting": "正在删除...",
  "messagePart.actions.deleteTitle": "删除此项",
  "messagePart.actions.deleteFailedTitle": "删除失败",
--- a/packages/ui/src/lib/markdown.ts
+++ b/packages/ui/src/lib/markdown.ts
@@ -127,17 +127,23 @@ async function ensureLanguages(content: string) {
  if (highlightSuppressed) {
    return
  }
-  // Parse code fences to extract language tokens
-  // Updated regex to capture optional language tokens and handle trailing annotations
-  const codeBlockRegex = /```[ \t]*([A-Za-z0-9_.+#-]+)?[^`]*?```/g
-  const foundLanguages = new Set<string>()
-  let match

-  while ((match = codeBlockRegex.exec(content)) !== null) {
-    const langToken = match[1]
-    if (langToken && langToken.trim()) {
-      foundLanguages.add(langToken.trim())
-    }
+  // Extract code-fence language tokens via `marked` so we correctly handle code blocks
+  // that contain backticks (e.g. JS template literals). Regex-based fence scans tend
+  // to miss these and prevent languages from loading.
+  const foundLanguages = new Set<string>()
+  try {
+    const tokens = marked.lexer(content) as any
+    marked.walkTokens(tokens, (token: any) => {
+      if (token?.type !== "code") return
+      const langToken = typeof token.lang === "string" ? token.lang : ""
+      if (langToken.trim()) {
+        foundLanguages.add(langToken.trim())
+      }
+    })
+  } catch {
+    // If tokenization fails for any reason, skip language preloading.
+    return
  }

  // Queue language loading tasks
--- a/packages/ui/src/stores/session-actions.ts
+++ b/packages/ui/src/stores/session-actions.ts
@@ -7,7 +7,7 @@ import { providers, sessions, withSession } from "./session-state"
 import { getDefaultModel, isModelValid } from "./session-models"
 import { updateSessionInfo } from "./message-v2/session-info"
 import { messageStoreBus } from "./message-v2/bus"
-import { removeMessagePartV2 } from "./message-v2/bridge"
+import { removeMessagePartV2, removeMessageV2 } from "./message-v2/bridge"
 import { getLogger } from "../lib/logger"
 import { requestData } from "../lib/opencode-api"

@@ -439,8 +439,33 @@ async function deleteMessagePart(instanceId: string, sessionId: string, messageI
  updateSessionInfo(instanceId, sessionId)
 }

+async function deleteMessage(instanceId: string, sessionId: string, messageId: string): Promise<void> {
+  if (!instanceId || !sessionId || !messageId) return
+  const instance = instances().get(instanceId)
+  if (!instance || !instance.client) {
+    throw new Error("Instance not ready")
+  }
+
+  const worktreeSlug = getWorktreeSlugForSession(instanceId, sessionId)
+  const client = getOrCreateWorktreeClient(instanceId, worktreeSlug)
+
+  // The SDK generator does not currently expose a typed method for deleting a message,
+  // but the API is available at DELETE /session/:sessionID/message/:messageID.
+  await requestData(
+    (client as any).client.delete({
+      url: `/session/${encodeURIComponent(sessionId)}/message/${encodeURIComponent(messageId)}`,
+    }),
+    "session.message.delete",
+  )
+
+  // Optimistic removal; SSE will also broadcast a message-removed event.
+  removeMessageV2(instanceId, messageId)
+  updateSessionInfo(instanceId, sessionId)
+}
+
 export {
  abortSession,
+  deleteMessage,
  deleteMessagePart,
  executeCustomCommand,
  renameSession,
--- a/packages/ui/src/stores/session-events.ts
+++ b/packages/ui/src/stores/session-events.ts
@@ -40,7 +40,7 @@ import {
 } from "./instances"
 import { showAlertDialog } from "./alerts"
 import { createClientSession, mapSdkSessionStatus, type Session, type SessionStatus } from "../types/session"
-import { sessions, setSessions, syncInstanceSessionIndicator, withSession } from "./session-state"
+import { ensureSessionParentExpanded, sessions, setSessions, syncInstanceSessionIndicator, withSession } from "./session-state"
 import { normalizeMessagePart } from "./message-v2/normalizers"
 import { updateSessionInfo } from "./message-v2/session-info"
 import { tGlobal } from "../lib/i18n"
@@ -108,6 +108,8 @@ interface TuiToastEvent {
 const ALLOWED_TOAST_VARIANTS = new Set<ToastVariant>(["info", "success", "warning", "error"])

 function applySessionStatus(instanceId: string, sessionId: string, status: SessionStatus) {
+  let parentToExpand: string | null = null
+
  withSession(instanceId, sessionId, (session) => {
    const current = session.status ?? "idle"
    if (current === status) return false
@@ -117,7 +119,17 @@ function applySessionStatus(instanceId: string, sessionId: string, status: Sessi
    }

    session.status = status
+
+    // Auto-expand the parent thread when a child session starts working.
+    // Users can still collapse it; we only expand on the transition.
+    if (session.parentId && status === "working" && current !== "working") {
+      parentToExpand = session.parentId
+    }
  })
+
+  if (parentToExpand) {
+    ensureSessionParentExpanded(instanceId, parentToExpand)
+  }
 }

 async function fetchSessionInfo(instanceId: string, sessionId: string, directory?: string): Promise<Session | null> {
@@ -158,6 +170,7 @@ async function fetchSessionInfo(instanceId: string, sessionId: string, directory
    const fetched = createClientSession(info, instanceId, "", { providerId: "", modelId: "" }, fetchedStatus)

    let updatedInstanceSessions: Map<string, Session> | undefined
+    let shouldExpandParent: string | null = null

    setSessions((prev) => {
      const next = new Map(prev)
@@ -174,11 +187,19 @@ async function fetchSessionInfo(instanceId: string, sessionId: string, directory
      instanceSessions.set(sessionId, merged)
      next.set(instanceId, instanceSessions)
      updatedInstanceSessions = instanceSessions
+
+      if (merged.parentId && merged.status === "working" && (existing?.status ?? "idle") !== "working") {
+        shouldExpandParent = merged.parentId
+      }
      return next
    })

    syncInstanceSessionIndicator(instanceId, updatedInstanceSessions)

+    if (shouldExpandParent) {
+      ensureSessionParentExpanded(instanceId, shouldExpandParent)
+    }
+
    return fetched
  } catch (error) {
    log.error("Failed to fetch session info", error)
--- a/packages/ui/src/stores/session-state.ts
+++ b/packages/ui/src/stores/session-state.ts
@@ -347,10 +347,23 @@ function clearActiveParentSession(instanceId: string): void {
 }

 function setSessionStatus(instanceId: string, sessionId: string, status: SessionStatus): void {
+  let parentToExpand: string | null = null
+
  withSession(instanceId, sessionId, (session) => {
    if (session.status === status) return false
+    const previous = session.status
    session.status = status
+
+    // If a child session starts working, auto-expand its parent thread once.
+    // Users can still collapse it afterwards; we only expand on the transition.
+    if (session.parentId && status === "working" && previous !== "working") {
+      parentToExpand = session.parentId
+    }
  })
+
+  if (parentToExpand) {
+    ensureSessionParentExpanded(instanceId, parentToExpand)
+  }
 }

 function getActiveParentSession(instanceId: string): Session | null {
--- a/packages/ui/src/styles/messaging.css
+++ b/packages/ui/src/styles/messaging.css
@@ -2,6 +2,7 @@
@import "./messaging/prompt-input.css";
@import "./messaging/message-section.css";
@import "./messaging/message-block-list.css";
+@import "./messaging/delete-overlays.css";
@import "./messaging/message-timeline.css";
@import "./messaging/tool-call.css";
@import "./messaging/log-view.css";
@@ -110,4 +111,3 @@
 .reasoning-label {
  font-weight: var(--font-weight-medium);
 }
-
--- a/packages/ui/src/styles/messaging/delete-overlays.css
+++ b/packages/ui/src/styles/messaging/delete-overlays.css
@@ -0,0 +1,37 @@
+/* Hover overlays for destructive actions (delete part / delete message). */
+
+.message-stream-block[data-delete-message-hover="true"] {
+  position: relative;
+}
+
+.message-stream-block[data-delete-message-hover="true"]::before {
+  content: "";
+  position: absolute;
+  inset: -2px;
+  background: var(--status-error-bg);
+  box-shadow: inset 0 0 0 1px var(--status-error-fg);
+  border-radius: 0;
+  pointer-events: none;
+  /* Overlay must sit above the message cards (they have opaque backgrounds). */
+  z-index: 10;
+}
+
+.message-part-shell {
+  display: block;
+}
+
+.delete-hover-scope[data-delete-part-hover="true"] {
+  position: relative;
+}
+
+.delete-hover-scope[data-delete-part-hover="true"]::before {
+  content: "";
+  position: absolute;
+  inset: -2px;
+  background: var(--status-error-bg);
+  box-shadow: inset 0 0 0 1px var(--status-error-fg);
+  border-radius: 0;
+  pointer-events: none;
+  /* Overlay must sit above the part card background. */
+  z-index: 10;
+}
--- a/packages/ui/src/styles/messaging/message-section.css
+++ b/packages/ui/src/styles/messaging/message-section.css
@@ -130,6 +130,19 @@
  color: var(--text-primary);
 }

+/* Make the command palette trigger stand out in the header. */
+.connection-status-button.command-palette-button {
+  border-radius: 0;
+  @apply text-sm px-2 py-1 border border-base transition-colors;
+  background-color: var(--surface-base);
+  color: var(--text-primary);
+}
+
+.connection-status-button.command-palette-button:hover {
+  background-color: var(--surface-hover);
+  color: var(--text-primary);
+}
+
 .connection-status-button:hover {
  background-color: var(--surface-hover);
 }
--- a/packages/ui/src/styles/messaging/message-timeline.css
+++ b/packages/ui/src/styles/messaging/message-timeline.css
@@ -87,6 +87,7 @@
  border-radius: 0;
  border: 1px solid var(--border-base);
  background-color: var(--surface-secondary);
+  position: relative;
  display: flex;
  align-items: center;
  justify-content: center;
@@ -98,6 +99,36 @@
  transition: transform 0.15s ease, background-color 0.2s ease, color 0.2s ease, border-color 0.2s ease, box-shadow 0.2s ease;
 }

+.message-timeline-segment[data-delete-hover="true"]::before {
+  content: "";
+  position: absolute;
+  inset: 0;
+  background: var(--status-error-bg);
+  box-shadow: inset 0 0 0 1px var(--status-error-fg);
+  border-radius: 0;
+  pointer-events: none;
+  z-index: 2;
+}
+
+/* Ensure delete hover is visible even on the active segment styling. */
+.message-timeline-segment[data-delete-hover="true"],
+.message-timeline-segment[data-delete-hover="true"]:hover,
+.message-timeline-segment[data-delete-hover="true"]:focus-visible,
+.message-timeline-segment-active[data-delete-hover="true"],
+.message-timeline-segment-active[data-delete-hover="true"]:hover,
+.message-timeline-segment-active[data-delete-hover="true"]:focus-visible {
+  /* Let the ::before overlay provide the highlight (matches stream behavior). */
+  background-color: transparent !important;
+  border-color: transparent !important;
+  box-shadow: none !important;
+  transform: none !important;
+}
+
+.message-timeline-label {
+  position: relative;
+  z-index: 3;
+}
+
 .message-timeline-segment.message-timeline-segment-hidden {
  display: none !important;
 }
--- a/packages/ui/src/styles/panels/right-panel.css
+++ b/packages/ui/src/styles/panels/right-panel.css
@@ -412,7 +412,7 @@
 }

 .right-panel-accordion-trigger {
-  @apply w-full flex items-center justify-between gap-3 px-3 py-2.5 text-[11px] font-semibold uppercase tracking-wide transition-colors duration-150;
+  @apply w-full flex items-center justify-between px-3 py-2.5 text-[11px] font-semibold uppercase tracking-wide transition-colors duration-150;
  color: var(--text-secondary);
  background-color: transparent;
 }
@@ -422,6 +422,11 @@
  color: var(--text-primary);
 }

+.section-left {
+  @apply flex items-center;
+  flex-shrink: 0;
+}
+
 .right-panel-accordion-chevron {
  @apply h-4 w-4 transition-transform duration-200;
  color: var(--text-muted);
@@ -441,6 +446,51 @@
  min-height: 0;
 }

+/* Section info tooltip */
+.section-info-trigger {
+  @apply inline-flex items-center justify-center p-0.5 rounded transition-all duration-150;
+  color: var(--text-muted);
+  flex-shrink: 0;
+}
+
+.section-info-trigger:hover {
+  color: var(--text-primary);
+  background-color: var(--surface-hover);
+}
+
+.section-label {
+  margin-left: 2px;
+}
+
+.section-info-icon {
+  @apply w-3.5 h-3.5;
+}
+
+.section-info-tooltip {
+  @apply max-w-xs px-3 py-2 text-xs rounded-lg border shadow-lg;
+  background-color: var(--surface-base);
+  border-color: var(--border-base);
+  color: var(--text-primary);
+  animation: tooltipShow 150ms ease-out;
+  transform-origin: var(--kb-tooltip-content-transform-origin);
+  z-index: 9999;
+}
+
+.section-info-tooltip[data-expanded] {
+  animation: tooltipShow 150ms ease-out;
+}
+
+@keyframes tooltipShow {
+  from {
+    opacity: 0;
+    transform: scale(0.95);
+  }
+  to {
+    opacity: 1;
+    transform: scale(1);
+  }
+}
+
 /* Background process cards in status panel */
 .status-process-card {
  @apply rounded-lg border flex flex-col gap-2 p-3 transition-all duration-150;
--- a/packages/ui/src/types/delete-hover.ts
+++ b/packages/ui/src/types/delete-hover.ts
@@ -0,0 +1,4 @@
+export type DeleteHoverState =
+  | { kind: "none" }
+  | { kind: "message"; messageId: string }
+  | { kind: "part"; messageId: string; partId: string; partType?: string }
--- a/packages/ui/src/types/message.ts
+++ b/packages/ui/src/types/message.ts
@@ -1,4 +1,4 @@
-// SDK types
+// SDK v2 types
 import type {
  EventMessageUpdated as MessageUpdateEvent,
  EventMessageRemoved as MessageRemovedEvent,
@@ -6,7 +6,8 @@ import type {
  EventMessagePartRemoved as MessagePartRemovedEvent,
  Part as SDKPart,
  Message as SDKMessage,
-} from "@opencode-ai/sdk"
+  AssistantMessage as SDKAssistantMessageV2,
+} from "@opencode-ai/sdk/v2"

 import type { PermissionRequestLike } from "./permission"

@@ -17,7 +18,8 @@ export type {
  MessagePartUpdatedEvent,
  MessagePartRemovedEvent,
  SDKPart,
-  SDKMessage
+  SDKMessage,
+  SDKAssistantMessageV2,
 }

 // Server streaming event: append-only delta updates.
Author	SHA1	Message	Date
Shantur Rathore	0f9c99e3bd	feat(ui): mirror delete hover overlay in timeline	2026-02-25 23:32:32 +00:00
Shantur Rathore	1122070b9c	feat(ui): highlight delete targets on hover	2026-02-25 23:08:53 +00:00
Shantur Rathore	57b81f00f8	chore(ui): reorder user message actions	2026-02-25 22:54:49 +00:00
Shantur Rathore	362105fe78	feat(ui): add delete message action to stream	2026-02-25 22:49:14 +00:00
Shantur Rathore	5834d2df1b	fix(ui): use v2 message info and show model variant	2026-02-25 22:29:27 +00:00
Shantur Rathore	ef4c8ef425	fix(ci): ad-hoc sign Electron macOS apps	2026-02-24 22:22:46 +00:00
Shantur Rathore	5f755a7e1c	fix(ci): retry workspace version bump on macos	2026-02-24 09:08:32 +00:00
Shantur Rathore	8607fab5b5	fix(ci): skip macOS codesign verify without identity	2026-02-24 08:53:14 +00:00
Shantur Rathore	0368fe8248	fix(ci): avoid bash globstar on macOS	2026-02-24 07:29:26 +00:00
Shantur Rathore	b970281fa7	chore(electron): use cross-env for dev log level scripts Make dev:info/dev:debug/dev:trace work on Windows by setting CLI_LOG_LEVEL via cross-env.	2026-02-24 00:19:39 +00:00
Shantur Rathore	8e5a7fc213	fix(electron): make dev CLI log level configurable Use CLI_LOG_LEVEL when launching the server in desktop dev and add dev:info/dev:debug/dev:trace scripts with dev defaulting to info.	2026-02-24 00:09:49 +00:00
Shantur Rathore	15f362e8b5	Bump v0.11.5	2026-02-23 23:55:52 +00:00
Shantur Rathore	7bbd0a1787	Merge branch 'dev' of github.com:NeuralNomadsAI/CodeNomad into dev	2026-02-23 23:55:32 +00:00
Shantur Rathore	f8aae56728	Merge pull request #190 from VooDisss/issue-187 fix(ui): prevent timeline auto-scroll when removing badges (#189)	2026-02-23 21:50:56 +00:00
Shantur Rathore	027d7fc97d	fix(ui): load shiki languages from marked tokens	2026-02-23 18:39:21 +00:00
Shantur Rathore	e90aef4b3c	fix(ui): stack instance header under 1024px	2026-02-23 18:36:24 +00:00
Shantur Rathore	e4e89008b2	Merge pull request #199 from NeuralNomadsAI/codenomad/issue-198 CI: rezip Electron macOS artifacts with ditto + validate codesign	2026-02-23 08:58:56 +00:00
Shantur Rathore	90baefbb7e	fix(ci): rezip Electron macOS zips with ditto Add a codesign verify step on extracted artifacts to catch signature/resource mismatches before upload.	2026-02-23 08:54:57 +00:00
Shantur Rathore	1c138f4489	Merge pull request #197 from VooDisss/issue-195 fix: Use legacy diff algorithm for better large file performance	2026-02-23 08:27:11 +00:00
VooDisss	d36e568ed0	fix: Use legacy diff algorithm for better large file performance - Set diffAlgorithm to 'legacy' for Monaco DiffEditor - Add maxComputationTime of 10s to avoid UI freeze on huge files This addresses the issue where sessions with large JSON files (50k-100k+ lines) would cause the UI to freeze. The 'legacy' algorithm is faster than 'advanced' for large files, similar to VSCode's workaround for the same issue. See: https://github.com/microsoft/vscode/issues/184037	2026-02-23 02:30:44 +02:00
Shantur Rathore	d6462ef524	Min version 0.11.4	2026-02-22 17:32:28 +00:00
Shantur Rathore	a06884ebce	Bump to v0.11.4	2026-02-22 16:53:51 +00:00
Shantur Rathore	62bd88f6a4	chore(plugin): Upgrade dependency version	2026-02-22 16:48:49 +00:00
Shantur Rathore	6479561779	fix(ui): auto-expand session thread when child starts working	2026-02-22 16:47:04 +00:00
Shantur Rathore	635237c258	fix(ui): render task prompt consistently while running	2026-02-22 08:58:39 +00:00
Shantur Rathore	33f0aa5714	ci: run dev prerelease nightly Replace dev push builds with nightly schedule that only runs when dev head advances; still runs on manual dispatch. Plumb a ref input through reusable workflows so scheduled runs build the dev commit.	2026-02-20 13:58:32 +00:00
Shantur Rathore	7ca6285d58	Merge branch 'dev' of github.com:NeuralNomadsAI/CodeNomad into dev	2026-02-20 13:49:03 +00:00
Shantur Rathore	14c60fef6c	Merge pull request #192 from VooDisss/issue-144 [QOL] Add informational tooltips to Status Panel sections	2026-02-20 13:47:11 +00:00
Shantur Rathore	336de6a19e	fix(i18n): polish Status panel tooltip translations	2026-02-20 13:46:43 +00:00
Shantur Rathore	377c8e2249	Merge branch 'dev' of github.com:NeuralNomadsAI/CodeNomad into dev	2026-02-20 13:31:52 +00:00
VooDisss	697dea21f8	Add informational tooltips to Status Panel sections	2026-02-20 14:09:54 +02:00
Shantur Rathore	34d3f803d5	Merge pull request #191 from kvokka/improve-docs Clarify CLI_WORKSPACE_ROOT usage for worktrees	2026-02-20 11:15:01 +00:00
kvokka	f824a063a5	docs: clarify CLI_WORKSPACE_ROOT usage for worktrees\n\nFixes #184	2026-02-20 14:52:05 +04:00
VooDisss	96fe1b86dd	fix(ui): prevent timeline auto-scroll when removing badges	2026-02-20 12:33:52 +02:00
Shantur Rathore	5fabf286e8	ui: restyle command palette button	2026-02-20 00:32:44 +00:00
Shantur Rathore	e8947d61b1	ui: emphasize command palette button	2026-02-20 00:32:39 +00:00
Shantur Rathore	1ccd14eae8	ui: use Check icon for completed status	2026-02-20 00:32:27 +00:00
Shantur Rathore	b162764ccb	ui: use lucide status icons for tool calls	2026-02-20 00:32:15 +00:00