chore: synchronize main into dev

.agents/agent-console.md

@@ -1,28 +1,36 @@
-# Agent console presentation
+# Agent cockpit presentation
 
-The Dev Agents surface combines provider JSONL control records with a Markdown
-conversation. Keep those two layers visually and semantically separate.
+The Dev Agents surface is a worktree-first cockpit: project/worktree
+navigation, named concurrent sessions, a compact tab strip, and one ordered
+conversation/execution timeline.
 
-- Claude `type="system"` is not synonymous with Ready. Only
-  `subtype="init"` becomes `AgentStreamEvent::Ready`; hook and status records
-  must not flood the visible trace.
-- Consecutive identical activity labels collapse. Keep technical activity out
-  of the transcript flow: a round header button opens a bounded popover with
-  the twelve newest labels, so progress never pushes the conversation away.
-- The transcript is chat prose, not a document. Render it with
-  `Markdown::compact()` to retain the shared 8 px conversation rhythm used by
-  Support, Monique, and the assistant.
-- Bound the Markdown renderer to the transcript column with a zero minimum
-  width and clipped overflow. Its horizontal-rule child is absolutely sized
-  and otherwise escapes the 860 px conversation measure on wide windows.
-- Keep the transcript/activity column as the single scroll owner and the
-  composer as its non-shrinking sibling. Do not nest another transcript scroll
-  or place the composer inside it.
-- Keep the prompt on the shared `Composer`; its frame inherits the same theme
-  radius, border, shadow, hover and focus tokens as ShellDeck `Input`. Do not
-  add Agent-only card chrome around it.
-- Treat provider, target, permissions, and workdir as one execution context.
-  The first three use adabraka `Select::context_label` inside one divided
-  frame; workdir is the editable final row. The model override belongs in the
-  Composer footer because it applies to the next message, and must remain a
-  free-form CLI value rather than a hard-coded shortlist.
+- Use `shelldeck_core::agent_session::AgentSessionCollection` as the canonical
+  session, status, attention, message, and trace model. Keep only GPUI draft
+  state and run-to-session routing in the view.
+- Route provider events by run UUID. The compatibility singleton event method
+  is insufficient for parallel agents and background-session attention.
+- Render every structured `AgentTraceKind` inline with conversation messages:
+  commands, file reads, diffs, tests, tools, and fallback activity. Do not hide
+  technical work in a popover.
+- Render agent prose with `Markdown::compact()` and technical details with the
+  shared monospace style. Bound both through the core session/runtime model.
+- Keep provider, status, unread attention, and identity visible in navigator
+  rows and tabs. Selecting an actually visible session marks it read and
+  restores its context and composer draft; hidden selection is navigation
+  identity only.
+- Treat provider, target, permissions, workdir, and model as one execution
+  context, collapsed into the compact session header by default.
+- Change execution context through the core context setter so an opaque resume
+  token never crosses target, permission, workdir, model, or provider changes.
+- Lock execution-context controls once Workspace binds a session to a checkout;
+  worktree navigation creates or selects a separately bound session instead of
+  mutating the context underneath an existing workspace tab.
+- A catalog-bound local run enters its retained Workspace cockpit. Keep its
+  agent tabs in one pane, create the authorized checkout file pane alongside
+  it, and let the typed split controls expose the retained terminal without
+  duplicating one AgentConsole host for different session bindings.
+- Mutating access always requires confirmation. Running sessions cannot be
+  removed, and concurrency limits remain enforced by the core model/runtime.
+- Keep the timeline as the single scroll owner and the composer as its
+  non-shrinking sibling. Do not nest a transcript scroll or put the composer
+  inside it.

.cargo/audit.toml

@@ -5,21 +5,11 @@
 ignore = [
     # GPUI / Linux platform stack. Track removal in
     # docs/security-advisory-baseline.md instead of one bot issue per crate.
-    "RUSTSEC-2024-0370", # proc-macro-error through GTK3 macros
-    "RUSTSEC-2024-0384", # instant through GPUI's futures-lite 1 stack
-    "RUSTSEC-2024-0412", # GTK3 bindings required by the Linux tray
-    "RUSTSEC-2024-0413", # GTK3 bindings required by the Linux tray
-    "RUSTSEC-2024-0415", # GTK3 bindings required by the Linux tray
-    "RUSTSEC-2024-0416", # GTK3 bindings required by the Linux tray
-    "RUSTSEC-2024-0418", # GTK3 bindings required by the Linux tray
-    "RUSTSEC-2024-0419", # GTK3 bindings required by the Linux tray
-    "RUSTSEC-2024-0420", # GTK3 bindings required by the Linux tray
-    "RUSTSEC-2024-0429", # glib VariantStrIter path is unused by ShellDeck
-    "RUSTSEC-2024-0436", # paste through image codecs
-    "RUSTSEC-2025-0052", # async-std through GPUI's HTTP/tar stack
+    "RUSTSEC-2024-0384", # instant through futures-lite 1 in adabraka_util
+    "RUSTSEC-2024-0436", # paste through metal, pulp/exr and rav1e/ravif
+    "RUSTSEC-2025-0052", # async-std through async-tar 0.5 in adabraka_http_client
     "RUSTSEC-2025-0134", # rustls-pemfile through zed-reqwest
-    "RUSTSEC-2026-0173", # proc-macro-error2 through GPUI's stacksafe
-    "RUSTSEC-2026-0192", # ttf-parser through cosmic-text/fontdb and lopdf
+    "RUSTSEC-2026-0192", # ttf-parser through cosmic-text/fontdb; pop-os/cosmic-text#526
 
     # Existing protocol/backend constraints.
     "RUSTSEC-2023-0071", # rsa: no patched release; transitive through russh

.github/workflows/ci.yml

@@ -37,9 +37,7 @@ jobs:
             libxcb1-dev \
             libxkbcommon-x11-dev \
             libdbus-1-dev \
-            libgtk-3-dev \
-            libxdo-dev \
-            libayatana-appindicator3-dev
+            libxdo-dev
 
       - name: Install Rust toolchain
         # Pinned to match rust-toolchain.toml — a floating nightly drops the
@@ -71,7 +69,7 @@ jobs:
       - name: Test portable-pty Unix cwd authority regression
         shell: bash
         run: |
-          crate_dir="$(find "${CARGO_HOME:-$HOME/.cargo}/registry/src" -maxdepth 2 -type d -name 'portable-pty-0.8.1' | head -1)"
+          crate_dir="$(find "${CARGO_HOME:-$HOME/.cargo}/registry/src" -maxdepth 2 -type d -name 'portable-pty-0.9.0' | head -1)"
           test -n "$crate_dir"
           grep -F -q '// SDTEST-1745' "$crate_dir/src/cmdbuilder.rs"
           cargo update --manifest-path "$crate_dir/Cargo.toml"
@@ -130,6 +128,12 @@ jobs:
         shell: bash
         run: ./scripts/apply-crate-patches.sh
 
+      # The changed AppKit/GPUI tray path lives outside shelldeck-core. Keep a
+      # native macOS compile gate for the actual application binary.
+      - name: Check native macOS tray integration
+        if: runner.os == 'macOS'
+        run: cargo check -p shelldeck --bin shelldeck
+
       # ShellDeck's own PTY boundary must reject a vanished authorized cwd on
       # every supported OS before any native PTY or process side effect.
       - name: Test terminal cwd authority boundary
@@ -139,7 +143,7 @@ jobs:
         if: runner.os != 'Windows'
         shell: bash
         run: |
-          crate_dir="$(find "${CARGO_HOME:-$HOME/.cargo}/registry/src" -maxdepth 2 -type d -name 'portable-pty-0.8.1' | head -1)"
+          crate_dir="$(find "${CARGO_HOME:-$HOME/.cargo}/registry/src" -maxdepth 2 -type d -name 'portable-pty-0.9.0' | head -1)"
           test -n "$crate_dir"
           grep -F -q '// SDTEST-1745' "$crate_dir/src/cmdbuilder.rs"
           cargo update --manifest-path "$crate_dir/Cargo.toml"
@@ -155,12 +159,35 @@ jobs:
         if: runner.os == 'Windows'
         shell: bash
         run: |
-          crate_dir="$(find "${CARGO_HOME:-$HOME/.cargo}/registry/src" -maxdepth 2 -type d -name 'portable-pty-0.8.1' | head -1)"
+          crate_dir="$(find "${CARGO_HOME:-$HOME/.cargo}/registry/src" -maxdepth 2 -type d -name 'portable-pty-0.9.0' | head -1)"
           test -n "$crate_dir"
           grep -F -q '// SDTEST-1744' "$crate_dir/src/cmdbuilder.rs"
           cargo update --manifest-path "$crate_dir/Cargo.toml"
           cargo test --manifest-path "$crate_dir/Cargo.toml" explicit_missing_cwd_is_forwarded_instead_of_falling_back_home
 
+      # SDPATCH-120 owns the ICO selector, CreateIconFromResourceEx boundary,
+      # and fail-closed Explorer-restart custody. Run its vendored unit tests
+      # explicitly because dependency tests are not part of ShellDeck's suite.
+      - name: Test native Windows tray integration
+        if: runner.os == 'Windows'
+        shell: bash
+        run: |
+          # Path dependencies are intentionally outside the workspace, so copy
+          # the vendored crate into the disposable runner temp tree to execute
+          # its own unit tests without broadening `cargo test --workspace`.
+          gpui_test_root="${RUNNER_TEMP}/shelldeck-gpui-test"
+          mkdir -p "$gpui_test_root/patches" "$gpui_test_root/packaging/icons"
+          cp -R patches/adabraka-gpui "$gpui_test_root/patches/"
+          cp packaging/icons/shelldeck.ico "$gpui_test_root/packaging/icons/"
+          cp Cargo.lock "$gpui_test_root/patches/adabraka-gpui/Cargo.lock"
+          native_tray_tests="$(CARGO_TARGET_DIR="${GITHUB_WORKSPACE}/target" cargo test --manifest-path "$gpui_test_root/patches/adabraka-gpui/Cargo.toml" --lib -- --list | tr -d '\r')"
+          grep -Fqx 'platform::windows::platform::tests::sdtest_1813_taskbar_created_message_registration_is_live: test' <<<"$native_tray_tests"
+          grep -Fqx 'platform::windows::tray::tests::sdtest_1813_explorer_restart_readd_is_authoritative_and_retains_icon: test' <<<"$native_tray_tests"
+          grep -Fqx 'platform::windows::tray::tests::sdtest_1814_ico_resource_selects_closest_then_highest_depth: test' <<<"$native_tray_tests"
+          grep -Fqx 'platform::windows::tray::tests::sdtest_1815_shell_deck_ico_creates_a_native_hicon: test' <<<"$native_tray_tests"
+          CARGO_TARGET_DIR="${GITHUB_WORKSPACE}/target" \
+            cargo test --manifest-path "$gpui_test_root/patches/adabraka-gpui/Cargo.toml" --lib sdtest_181
+
       - name: Test shelldeck-core
         run: cargo test -p shelldeck-core
 

.github/workflows/release.yml

@@ -108,9 +108,7 @@ jobs:
             libxcb1-dev \
             libxkbcommon-x11-dev \
             libdbus-1-dev \
-            libgtk-3-dev \
             libxdo-dev \
-            libayatana-appindicator3-dev \
             libfuse2
 
       # macOS dependencies

.github/workflows/security.yml

@@ -44,7 +44,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           # Keep this in sync with .cargo/audit.toml. audit-check otherwise opens
           # one scheduled issue per package occurrence, including duplicates.
-          ignore: "RUSTSEC-2023-0071,RUSTSEC-2024-0370,RUSTSEC-2024-0384,RUSTSEC-2024-0412,RUSTSEC-2024-0413,RUSTSEC-2024-0415,RUSTSEC-2024-0416,RUSTSEC-2024-0418,RUSTSEC-2024-0419,RUSTSEC-2024-0420,RUSTSEC-2024-0429,RUSTSEC-2024-0436,RUSTSEC-2025-0052,RUSTSEC-2025-0134,RUSTSEC-2026-0173,RUSTSEC-2026-0192"
+          ignore: "RUSTSEC-2023-0071,RUSTSEC-2024-0384,RUSTSEC-2024-0436,RUSTSEC-2025-0052,RUSTSEC-2025-0134,RUSTSEC-2026-0192"
 
   dependency-policy:
     name: Licenses, bans and sources