(null);
+ const { ref: panelRef, position } = useClampedFixedPosition(anchor, label);
+
+ const cancelClose = useCallback(() => {
+ if (closeTimerRef.current == null) return;
+ clearTimeout(closeTimerRef.current);
+ closeTimerRef.current = null;
+ }, []);
+
+ const close = useCallback(() => {
+ cancelClose();
+ setAnchor(null);
+ }, [cancelClose]);
+
+ const scheduleClose = useCallback(() => {
+ const activeElement = typeof document !== "undefined" ? document.activeElement : null;
+ if (activeElement && (triggerRef.current?.contains(activeElement) || panelRef.current?.contains(activeElement))) {
+ return;
+ }
+ cancelClose();
+ closeTimerRef.current = setTimeout(() => {
+ closeTimerRef.current = null;
+ setAnchor(null);
+ }, CLOSE_DELAY_MS);
+ }, [cancelClose, panelRef]);
+
+ const open = useCallback(() => {
+ const trigger = triggerRef.current;
+ if (!trigger) return;
+ cancelClose();
+ const rect = trigger.getBoundingClientRect();
+ setAnchor({ x: rect.left, y: rect.bottom + GAP });
+ }, [cancelClose]);
+
+ const isWithinCard = useCallback((target: EventTarget | null): boolean => {
+ return target instanceof Node && Boolean(
+ triggerRef.current?.contains(target) || panelRef.current?.contains(target),
+ );
+ }, [panelRef]);
+
+ useEffect(() => {
+ if (!anchor) return undefined;
+ const closeOnViewportChange = () => close();
+ window.addEventListener("scroll", closeOnViewportChange, true);
+ window.addEventListener("resize", closeOnViewportChange);
+ return () => {
+ window.removeEventListener("scroll", closeOnViewportChange, true);
+ window.removeEventListener("resize", closeOnViewportChange);
+ };
+ }, [anchor, close]);
+
+ useEffect(() => () => {
+ if (closeTimerRef.current != null) clearTimeout(closeTimerRef.current);
+ }, []);
+
+ const trigger = (
+ {
+ event.stopPropagation();
+ }}
+ onMouseDown={(event) => {
+ event.stopPropagation();
+ }}
+ onMouseEnter={open}
+ onMouseLeave={scheduleClose}
+ onFocus={open}
+ onBlur={(event) => {
+ if (!isWithinCard(event.relatedTarget)) scheduleClose();
+ }}
+ >
+ {children}
+
+ );
+
+ if (!anchor || typeof document === "undefined" || !document.body) return trigger;
+
+ const fallbackLeft = Math.min(
+ Math.max(VIEWPORT_PADDING, anchor.x),
+ Math.max(VIEWPORT_PADDING, window.innerWidth - width - VIEWPORT_PADDING),
+ );
+ const panel = (
+ {
+ if (!isWithinCard(event.relatedTarget)) scheduleClose();
+ }}
+ style={{
+ position: "fixed",
+ zIndex: 9999,
+ left: position?.left ?? fallbackLeft,
+ top: position?.top ?? anchor.y,
+ width,
+ maxWidth: `calc(100vw - ${VIEWPORT_PADDING * 2}px)`,
+ maxHeight: `calc(100vh - ${VIEWPORT_PADDING * 2}px)`,
+ overflowY: "auto",
+ }}
+ >
+ {content}
+
+ );
+
+ return (
+ <>
+ {trigger}
+ {createPortal(panel, document.body)}
+
+ );
+}
diff --git a/apps/desktop/src/renderer/components/terminals/LanePrBadge.test.tsx b/apps/desktop/src/renderer/components/terminals/LanePrBadge.test.tsx
index 073a2dbef..3339eb7fa 100644
--- a/apps/desktop/src/renderer/components/terminals/LanePrBadge.test.tsx
+++ b/apps/desktop/src/renderer/components/terminals/LanePrBadge.test.tsx
@@ -1,8 +1,8 @@
/* @vitest-environment jsdom */
import React from "react";
-import { fireEvent, render, screen } from "@testing-library/react";
-import { describe, expect, it, vi } from "vitest";
+import { cleanup, fireEvent, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, it, vi } from "vitest";
import type { PrSummary } from "../../../shared/types";
import { LanePrBadge } from "./LanePrBadge";
import { LanePrBadgePopover } from "../lanes/LanePrBadgePopover";
@@ -50,6 +50,16 @@ function tag(overrides: Partial = {}): LaneTabPrTag {
};
}
+function openLanePrHoverCard(): HTMLElement {
+ const cluster = screen.getByTitle("2 pull requests on this lane");
+ const trigger = cluster.firstElementChild;
+ if (!(trigger instanceof HTMLElement)) throw new Error("lane PR hover trigger not found");
+ fireEvent.mouseEnter(trigger);
+ return screen.getByTestId("lane-pr-hover-card");
+}
+
+afterEach(cleanup);
+
describe("LanePrBadge", () => {
it("keeps a single PR as the compact chip", () => {
render();
@@ -78,6 +88,8 @@ describe("LanePrBadge", () => {
);
expect(screen.getByRole("button", { name: "Open 2 pull requests for this lane" })).toBeTruthy();
+ const hoverCard = openLanePrHoverCard();
+ expect(hoverCard.parentElement).toBe(document.body);
fireEvent.click(screen.getByTitle("Pull request #100 · Merged · Previous work"));
expect(onOpen).toHaveBeenCalledWith(previous);
@@ -94,6 +106,7 @@ describe("LanePrBadge", () => {
/>,
);
+ openLanePrHoverCard();
expect(screen.getByRole("img", { name: "CI failing; Review changes requested" })).toBeTruthy();
});
diff --git a/apps/desktop/src/renderer/components/terminals/LanePrBadge.tsx b/apps/desktop/src/renderer/components/terminals/LanePrBadge.tsx
index 0d045c476..211a5a5ba 100644
--- a/apps/desktop/src/renderer/components/terminals/LanePrBadge.tsx
+++ b/apps/desktop/src/renderer/components/terminals/LanePrBadge.tsx
@@ -7,9 +7,11 @@ import {
lanePrAttentionColor,
lanePrStateColor,
lanePrStateLabel,
+ pickPrimaryPr,
} from "../../lib/lanePrBadge";
import { GitHubStackBadge } from "../prs/shared/GitHubStackBadge";
import { getPrCiDotColor, getPrReviewDotColor } from "../prs/shared/prVisuals";
+import { LanePrHoverCard } from "../lanes/LanePrHoverCard";
function StatusDot({ color, title }: { color: string; title?: string }) {
return (
@@ -63,17 +65,18 @@ export function LanePrBadge({
onOpenList?: () => void;
}) {
const allPrs = prs.length > 0 ? prs : [pr];
- const stackDescription = pr.stack
- ? `, position ${pr.stack.position} of ${pr.stack.size} in GitHub Stack #${pr.stack.number}`
+ const primaryPr = pickPrimaryPr(allPrs) ?? pr;
+ const stackDescription = primaryPr.stack
+ ? `, position ${primaryPr.stack.position} of ${primaryPr.stack.size} in GitHub Stack #${primaryPr.stack.number}`
: "";
- const open = (event: React.SyntheticEvent, target: PrSummary = pr) => {
+ const open = (event: React.SyntheticEvent, target: PrSummary = primaryPr) => {
event.stopPropagation();
onOpen(target);
};
if (allPrs.length === 1) {
- const color = lanePrStateColor(pr.state);
- const label = lanePrStateLabel(pr.state);
+ const color = lanePrStateColor(primaryPr.state);
+ const label = lanePrStateLabel(primaryPr.state);
return (
- #{pr.githubPrNumber}
-
+ #{primaryPr.githubPrNumber}
+
{label}
);
@@ -102,58 +105,15 @@ export function LanePrBadge({
const canOpenList = typeof onOpenList === "function";
return (
event.stopPropagation()}
- onMouseDown={(event) => event.stopPropagation()}
+ className="inline-flex shrink-0 items-center gap-1"
title={`${allPrs.length} pull requests on this lane`}
>
- open(event)}
- onKeyDown={(event) => {
- if (event.key === "Enter" || event.key === " ") {
- event.preventDefault();
- open(event);
- }
- }}
- className="inline-flex shrink-0 items-center gap-1 rounded-full border border-white/10 bg-white/[0.04] px-1.5 py-px text-[10px] font-medium leading-none text-muted-fg/70 transition-colors hover:bg-white/[0.09]"
- aria-label={`${prTitle(pr)}; ${allPrs.length - 1} other pull requests on this lane`}
- >
-
- #{pr.githubPrNumber}
-
- {lanePrStateLabel(pr.state)}
-
- {
- if (!onOpenList) return;
- event.stopPropagation();
- onOpenList();
- }}
- onKeyDown={(event) => {
- if (!onOpenList) return;
- if (event.key === "Enter" || event.key === " ") {
- event.preventDefault();
- event.stopPropagation();
- onOpenList();
- }
- }}
- >
- +{allPrs.length - 1}
-
-
-
-
+
Pull requests · {allPrs.length}
@@ -199,8 +159,54 @@ export function LanePrBadge({
);
})}
+
+ )}
+ >
+ open(event)}
+ onKeyDown={(event) => {
+ if (event.key === "Enter" || event.key === " ") {
+ event.preventDefault();
+ open(event);
+ }
+ }}
+ className="inline-flex shrink-0 items-center gap-1 rounded-full border border-white/10 bg-white/[0.04] px-1.5 py-px text-[10px] font-medium leading-none text-muted-fg/70 transition-colors hover:bg-white/[0.09]"
+ aria-label={`${prTitle(primaryPr)}; ${allPrs.length - 1} other pull requests on this lane`}
+ >
+
+ #{primaryPr.githubPrNumber}
+
+ {lanePrStateLabel(primaryPr.state)}
-
+ {
+ if (!onOpenList) return;
+ event.stopPropagation();
+ onOpenList();
+ }}
+ onKeyDown={(event) => {
+ if (!onOpenList) return;
+ if (event.key === "Enter" || event.key === " ") {
+ event.preventDefault();
+ event.stopPropagation();
+ onOpenList();
+ }
+ }}
+ >
+ +{allPrs.length - 1}
+
+
);
}
diff --git a/apps/desktop/src/renderer/lib/lanePrBadge.test.ts b/apps/desktop/src/renderer/lib/lanePrBadge.test.ts
index 18e290941..decd1ec90 100644
--- a/apps/desktop/src/renderer/lib/lanePrBadge.test.ts
+++ b/apps/desktop/src/renderer/lib/lanePrBadge.test.ts
@@ -100,7 +100,7 @@ describe("selectPrimaryLanePr", () => {
updatedAt: "2026-07-02T00:00:00.000Z",
};
- it("lets an actionable failing historical PR win over a healthy current PR", () => {
+ it("keeps the newest open PR on the collapsed lane badge", () => {
const healthyCurrent = {
...base,
id: "current",
@@ -110,6 +110,7 @@ describe("selectPrimaryLanePr", () => {
headBranch: "current",
checksStatus: "passing" as const,
reviewStatus: "approved" as const,
+ updatedAt: "2026-07-02T00:00:00.000Z",
};
const failingPrevious = {
...base,
@@ -120,10 +121,38 @@ describe("selectPrimaryLanePr", () => {
headBranch: "old-branch",
checksStatus: "failing" as const,
reviewStatus: "approved" as const,
+ updatedAt: "2026-07-03T00:00:00.000Z",
};
expect(selectPrimaryLanePr(lane, [healthyCurrent, failingPrevious])?.id).toBe("previous");
});
+
+ it("uses the latest activity when multiple terminal PRs remain", () => {
+ const olderMerged = {
+ ...base,
+ id: "older-merged",
+ githubPrNumber: 8,
+ title: "Older merged",
+ state: "merged" as const,
+ headBranch: "older",
+ checksStatus: "passing" as const,
+ reviewStatus: "approved" as const,
+ updatedAt: "2026-07-02T00:00:00.000Z",
+ };
+ const newerMerged = {
+ ...base,
+ id: "newer-merged",
+ githubPrNumber: 7,
+ title: "Newer merged",
+ state: "merged" as const,
+ headBranch: "newer",
+ checksStatus: "passing" as const,
+ reviewStatus: "approved" as const,
+ updatedAt: "2026-07-04T00:00:00.000Z",
+ };
+
+ expect(selectPrimaryLanePr(lane, [olderMerged, newerMerged])?.id).toBe("newer-merged");
+ });
});
describe("lane PR attention", () => {
diff --git a/apps/desktop/src/renderer/lib/lanePrBadge.ts b/apps/desktop/src/renderer/lib/lanePrBadge.ts
index 66c9ab90b..7772d40f6 100644
--- a/apps/desktop/src/renderer/lib/lanePrBadge.ts
+++ b/apps/desktop/src/renderer/lib/lanePrBadge.ts
@@ -21,13 +21,17 @@ export function primaryPrStateRank(state: PrState): number {
}
}
-type PrimaryPrComparable = Pick;
+type PrimaryPrComparable = {
+ state: PrSummary["state"];
+ updatedAt?: string | null;
+ githubPrNumber: number;
+};
function comparePrimaryPr(a: PrimaryPrComparable, b: PrimaryPrComparable): number {
const byRank = primaryPrStateRank(a.state) - primaryPrStateRank(b.state);
if (byRank !== 0) return byRank;
- const aUpdated = Date.parse(a.updatedAt);
- const bUpdated = Date.parse(b.updatedAt);
+ const aUpdated = Date.parse(a.updatedAt ?? "");
+ const bUpdated = Date.parse(b.updatedAt ?? "");
if (Number.isFinite(aUpdated) && Number.isFinite(bUpdated) && aUpdated !== bUpdated) {
return bUpdated - aUpdated;
}
@@ -40,7 +44,7 @@ function comparePrimaryPr(a: PrimaryPrComparable, b: PrimaryPrComparable): numbe
* number) wins. Returns null for an empty list. Pure — the caller pre-filters
* to a lane's PRs.
*/
-export function pickPrimaryPr(prs: T[]): T | null {
+export function pickPrimaryPr(prs: readonly T[]): T | null {
let best: T | null = null;
for (const pr of prs) {
if (best === null || comparePrimaryPr(pr, best) < 0) best = pr;
@@ -49,9 +53,10 @@ export function pickPrimaryPr(prs: T[]): T | null
}
/**
- * Choose the lane badge's attention target. A failing or blocked historical PR
- * must be able to win over a healthy current PR so the collapsed chip never
- * hides the lane's most actionable problem.
+ * Choose the PR represented by a lane badge. The collapsed card should point
+ * to the newest open work first; when no work is open, the latest draft or
+ * terminal PR activity is the useful fallback. Attention remains an aggregate
+ * signal on the badge, but it must not replace the user's current PR context.
*/
export function selectPrimaryLanePr(
lane: Pick,
@@ -64,17 +69,7 @@ export function selectPrimaryLanePr(
const candidates = lanePrs.length > 0
? lanePrs
: prs.filter((pr) => pr.laneId === lane.id && !pr.detached);
- let best: PrSummary | null = null;
- for (const pr of candidates) {
- if (!best || compareLanePrimaryPr(pr, best) < 0) best = pr;
- }
- return best;
-}
-
-function compareLanePrimaryPr(a: PrSummary, b: PrSummary): number {
- const byAttention = lanePrAttentionRank(b) - lanePrAttentionRank(a);
- if (byAttention !== 0) return byAttention;
- return comparePrimaryPr(a, b);
+ return pickPrimaryPr(candidates);
}
export function lanePrsForLane(
diff --git a/apps/desktop/src/shared/composerTriggers.test.ts b/apps/desktop/src/shared/composerTriggers.test.ts
index 9389bf051..6b477e44a 100644
--- a/apps/desktop/src/shared/composerTriggers.test.ts
+++ b/apps/desktop/src/shared/composerTriggers.test.ts
@@ -51,6 +51,19 @@ describe("detectComposerTrigger", () => {
expect(detectComposerTrigger(text, text.length)).toEqual({ type: "at", query: "src/foo.ts", start: 4 });
});
+ it("keeps an at trigger open across spaces for multi-word chat names", () => {
+ expect(detectComposerTrigger("@a b c", 6)).toEqual({ type: "at", query: "a b c", start: 0 });
+ // A trailing space is still part of the in-progress query. The menu trims
+ // it for searching, so cached suggestions remain visible while the next
+ // word is being typed.
+ expect(detectComposerTrigger("@a ", 3)).toEqual({ type: "at", query: "a ", start: 0 });
+ });
+
+ it("does not let an at query cross a newline or another at sign", () => {
+ expect(detectComposerTrigger("@a\nb", 4)).toBeNull();
+ expect(detectComposerTrigger("@a@b", 4)).toBeNull();
+ });
+
it("does not trigger on emails", () => {
const text = "mail user@doma";
expect(detectComposerTrigger(text, text.length)).toBeNull();
diff --git a/apps/desktop/src/shared/composerTriggers.ts b/apps/desktop/src/shared/composerTriggers.ts
index 4d7398815..932578669 100644
--- a/apps/desktop/src/shared/composerTriggers.ts
+++ b/apps/desktop/src/shared/composerTriggers.ts
@@ -1,7 +1,7 @@
// Cursor-relative trigger detection for the prompt composers (desktop chat
// composer, ade-code TUI prompt, mirrored on iOS). A trigger is an in-progress
-// `/command` or `@file` token that ends exactly at the cursor, so suggestion
-// menus can open anywhere in the draft — not just at position 0.
+// `/command` or `@` query that ends exactly at the cursor, so suggestion menus
+// can open anywhere in the draft — not just at position 0.
export type ComposerTriggerType = "slash" | "at";
@@ -14,11 +14,12 @@ export type ComposerTrigger = {
};
// Both triggers must sit at a word boundary (start of text or after
-// whitespace) and their token must run unbroken to the cursor. The slash token
-// is a command name only: no whitespace and no `/` inside, so paths like
+// whitespace) and their token must run to the cursor. The slash token is a
+// command name only: no whitespace and no `/` inside, so paths like
// `/usr/bin` and fractions like `3/4` never trigger. The `@` token allows `/`
-// (file paths) but not another `@`, so emails never trigger.
-const AT_TRIGGER_RE = /(?:^|\s)(@([^\s@]*))$/;
+// (file paths) and spaces (chat names are commonly multi-word), but not
+// another `@` or a newline, so emails and cross-line prose never trigger.
+const AT_TRIGGER_RE = /(?:^|[ \t\r\n])(@([^@\r\n]*))$/;
const SLASH_TRIGGER_RE = /(?:^|\s)(\/([^\s/]*))$/;
export function detectComposerTrigger(text: string, cursorPos: number): ComposerTrigger | null {
diff --git a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
index 32829ea9d..b8cba1131 100644
--- a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
+++ b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
@@ -152,14 +152,16 @@ struct WorkComposerTriggerMatch: Equatable {
}
/// Pure, cursor-relative trigger detection shared by the composer text view.
+/// Applied to the substring before the cursor. When both match (rare), the one
+/// whose trigger char sits closest to the cursor wins.
/// Mirrors the desktop/TUI regexes exactly:
/// slash — `(?:^|\s)/([^\s/]*)$`
-/// at — `(?:^|\s)@([^\s@]*)$`
-/// applied to the substring before the cursor. When both match (rare), the one
-/// whose trigger char sits closest to the cursor wins.
+/// at — `(?:^|[ \t\r\n])@([^@\r\n]*)$`
+/// The `@` query may contain spaces for multi-word entity names, but it stops
+/// at a newline or another `@`.
enum WorkComposerTriggerDetector {
private static let slashRegex = try! NSRegularExpression(pattern: "(?:^|\\s)/([^\\s/]*)$")
- private static let atRegex = try! NSRegularExpression(pattern: "(?:^|\\s)@([^\\s@]*)$")
+ private static let atRegex = try! NSRegularExpression(pattern: "(?:^|[ \\t\\r\\n])@([^@\\r\\n]*)$")
static func detect(in text: NSString, cursor: Int) -> WorkComposerTriggerMatch? {
guard cursor >= 0, cursor <= text.length else { return nil }
diff --git a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
index 6819fb1ab..3147ff0d8 100644
--- a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
+++ b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
@@ -4,7 +4,8 @@ import SwiftUI
@testable import ADE
/// Pure-logic coverage for the cursor-relative trigger detector that mirrors the
-/// shared desktop/TUI regexes (`(?:^|\s)/([^\s/]*)$` and `(?:^|\s)@([^\s@]*)$`).
+/// shared desktop/TUI regexes (`(?:^|\s)/([^\s/]*)$` and
+/// `(?:^|[ \t\r\n])@([^@\r\n]*)$`).
/// Locks in the boundary rules that keep paths, fractions, and emails from
/// opening the suggestion strip, plus the closest-to-cursor tie-break.
final class WorkComposerTriggerDetectorTests: XCTestCase {
@@ -64,6 +65,18 @@ final class WorkComposerTriggerDetectorTests: XCTestCase {
XCTAssertEqual(match?.query, "a/b/c")
}
+ func testAtSupportsMultiWordQueries() {
+ let match = detect("@a b c")
+ XCTAssertEqual(match?.kind, .at)
+ XCTAssertEqual(match?.query, "a b c")
+ XCTAssertEqual(match?.range, NSRange(location: 0, length: 6))
+ }
+
+ func testAtDoesNotCrossNewlinesOrAnotherAtSign() {
+ XCTAssertNil(detect("@a\nb"))
+ XCTAssertNil(detect("@a@b"))
+ }
+
func testEmailDoesNotTrigger() {
// The `@` is glued to a preceding non-space char, so emails never trigger.
XCTAssertNil(detect("ping foo@bar"))
diff --git a/docs/features/chat/composer-and-ui.md b/docs/features/chat/composer-and-ui.md
index fdb3fa7ea..46056e39c 100644
--- a/docs/features/chat/composer-and-ui.md
+++ b/docs/features/chat/composer-and-ui.md
@@ -31,8 +31,8 @@ subagents, computer use). The pane derives all visible state from the
| `ChatSurfaceShell.tsx` | Floating chat header, body, footer layout. Backdrop-blur glass-morphism styling. |
| `ChatComposerShell.tsx` | Input container chrome reused by the composer. |
| `ChatAttachmentTray.tsx` | Inline file/image attachment tray inside the composer. Image attachments render an inline thumbnail, open a full-size lightbox on click, and expose a copy-to-clipboard button that ships the image bytes via `window.ade.app.writeClipboardImage` so the user can paste them into another app. Pasted images can pass a seeded preview URL from the composer while the temp file is being saved; tray-only image refs fall back to `window.ade.app.getImageDataUrl`. Non-image attachments fall back to the file glyph. |
-| `ChatCommandMenu.tsx` | Popover for slash commands and the sectioned `@` menu: Files plus Chats / Lanes / Terminals entity mentions. Consumes a `ComposerTrigger` from `shared/composerTriggers.ts` (so the menu opens for a mid-draft trigger, not just a leading one). Files and mentions are two independently debounced (40 ms) `useDebouncedSuggestions` sources sharing one hook; each keeps a per-menu-session query cache (`QUERY_CACHE_MAX = 40`) so cached queries render same-frame while a background revalidation still runs, and both caches clear when the menu closes or the provider identity changes. A bare `@` is a browse: the file index returns shallowest-first results and the mention action returns recency-ranked entities, so the menu is never empty before typing. Flat keyboard-nav indices are precomputed in the sections memo (no render-time counters); all three row types share the `MenuRow` chrome. Selecting a mention inserts an opaque `@chat:` / `@lane:` / `@term:` chip (see `shared/chatMentions.ts`). |
-| `apps/desktop/src/shared/composerTriggers.ts` | Cursor-relative typed-trigger detection shared by the desktop chat composer (rich + textarea), the `WorkViewArea` continue composer, and the ade-code TUI (iOS mirrors the same regexes in Swift). `detectComposerTrigger(text, cursorPos)` finds an in-progress `/command` / `@file` token ending at the cursor at any position; `replaceComposerTriggerSpan` splices exactly that span; `findConfirmedComposerTokens` locates confirmed chip tokens for overlay/prompt styling (`ComposerTokenKind` is `"file" | "command" | "mention"`; mention bodies are self-identifying via the `chat:`/`lane:`/`term:` prefix grammar, so callers pass a purely syntactic `isMention` predicate); `composerTriggerSpansWholeDraft` distinguishes a lone leading command from a mid-sentence one. |
+| `ChatCommandMenu.tsx` | Popover for slash commands and the sectioned `@` menu: Files plus Chats / Lanes / Terminals entity mentions. Consumes a `ComposerTrigger` from `shared/composerTriggers.ts` (so the menu opens for a mid-draft trigger, not just a leading one). Files and mentions are two independently debounced (40 ms) `useDebouncedSuggestions` sources sharing one hook; each keeps a per-menu-session query cache (`QUERY_CACHE_MAX = 40`) so cached queries render same-frame while a background revalidation still runs, and both caches clear when the menu closes or the provider identity changes. A bare `@` is a browse: the file index returns shallowest-first results and the mention action returns recency-ranked entities, so the menu is never empty before typing. Multi-word `@` queries stay active through spaces and use the same cached/debounced search path. Flat keyboard-nav indices are precomputed in the sections memo (no render-time counters); all three row types share the `MenuRow` chrome. Selecting a mention inserts an opaque `@chat:` / `@lane:` / `@term:` pointer while the composer displays the selected entity title (see `shared/chatMentions.ts`). |
+| `apps/desktop/src/shared/composerTriggers.ts` | Cursor-relative typed-trigger detection shared by the desktop chat composer (rich + textarea), the `WorkViewArea` continue composer, and the ade-code TUI (iOS mirrors the same regexes in Swift). `detectComposerTrigger(text, cursorPos)` finds an in-progress `/command` / `@` query ending at the cursor at any position; `@` queries may contain spaces for multi-word entity names but stop at a newline or another `@`; `replaceComposerTriggerSpan` splices exactly that span; `findConfirmedComposerTokens` locates confirmed chip tokens for overlay/prompt styling (`ComposerTokenKind` is `"file" | "command" | "mention"`; mention bodies are self-identifying via the `chat:`/`lane:`/`term:` prefix grammar, so callers pass a purely syntactic `isMention` predicate); `composerTriggerSpansWholeDraft` distinguishes a lone leading command from a mid-sentence one. |
| `apps/desktop/src/shared/smartLinks.ts` | Cross-client URL catalog and deterministic fallback labels. Recognizes GitHub PR/issue/repo/commit/action-run links, Linear issues, `ade://` deeplinks, and generic HTTP(S) pages; trims sentence punctuation, caps each draft at 12 matches, and keeps the canonical URL separate from optional title/favicon metadata. Desktop, hosted web, and ADE Code import this contract; iOS mirrors it in `WorkSmartLinkDetector`. |
| `apps/desktop/src/main/services/chat/smartLinkPreviewService.ts` | Runtime-owned best-effort metadata resolver. GitHub and Linear titles use configured provider services; generic pages use bounded public-network HTML/favicon reads with DNS pinning and SSRF checks. Generic previews cache at most 256 public entries for 30 minutes (five minutes for metadata misses); credential-backed provider results are never stored in that process-global cache. Any error returns the deterministic local preview rather than blocking composition. |
| `ChatTasksPanel.tsx` | Todo list rendered from `todo_update` events. |
@@ -1513,7 +1513,9 @@ These modules are pure and unit-testable:
word boundary before `/` and allow no whitespace or `/` inside, so
paths (`/usr/bin`), URLs, and fractions never open the menu. Don't
reintroduce `startsWith("/")` gates — that regresses mid-sentence
- commands. In the rich editor, detection runs on the DOM text run
+ commands. `@` queries may contain spaces so multi-word chat names remain
+ searchable; the trigger still stops at a newline or another `@`. In the
+ rich editor, detection runs on the DOM text run
around the caret (`getRichTriggerContext`), NOT on serialized-draft
offsets: serialization collapses whitespace and flattens chips, so
serialized indices cannot be mapped back onto DOM positions.
diff --git a/docs/features/lanes/README.md b/docs/features/lanes/README.md
index 57e362067..ffc3d92f4 100644
--- a/docs/features/lanes/README.md
+++ b/docs/features/lanes/README.md
@@ -77,8 +77,9 @@ Renderer components:
|------|---------------|
| `renderer/components/app/App.tsx` | Project tab host and route keep-alive shell. Keeps the Work surface mounted after first visit and now does the same for `/lanes`, parking the inactive Lanes surface with `inert` / `aria-hidden` instead of unmounting it. Parked route and project surfaces also set `data-ade-animation-state="paused"`, which lets the global renderer stylesheet stop hidden CSS animations until the surface is active again. Surfaces are keyed by runtime binding (`local:` or the remote binding key) so local and remote views of the same root do not share lane/work state. During cold project switches it renders a transition veil over the old project surface until the target project hydrates. |
| `renderer/components/app/toast/{toastStore.ts,ToastStack.tsx,useLaneEventToasts.ts}` | Shared renderer toast primitive mounted from `AppShell`. `useLaneEventToasts` subscribes to `lanes.onLifecycleEvent` and `lanes.rebaseSubscribe`, turning lane-created/archive/delete and final automated rebase outcomes into compact global notices; created-lane toasts include a `View` action that routes to `/lanes?laneId=...&focus=single`. |
-| `renderer/components/lanes/LanesPage.tsx` | 3-pane cockpit, tab management, dialog coordination. Create-lane state lives in `CreateLaneDialogHost`; `LanesPage` owns only open/prefill routing, blocks forced close while the host is busy, and focuses the new lane after the host refreshes the lane list while the dialog stays open for setup progress. The lane filter, pinned lane ids, and expanded lane id live in the active project's `WorkProjectViewState`, not component-local state, so route/tab/project remounts restore the correct project's view. Each lane row renders the lane's retained live PR set: the current-branch PR is `active`, older PRs from previous branches are `previous`, and two or more rows collapse to a primary state-aware tag plus a `+N` counter. Hover/focus reveals every PR with its own state, CI, review, and previous-branch signals; the counter opens the lane-filtered PR workspace. The pure selectors in `lanePageModel.ts` prefer live same-branch GitHub repo inventory over terminal/stale ADE rows, then fall back to ADE-linked PR rows, so externally created PRs and open-after-closed branch reuse stay visible; linked PRs route to the PR workspace, while unlinked GitHub-only matches open externally. The page forces one GitHub snapshot refresh on project/branch-signature changes and otherwise uses cached snapshot/event refreshes to avoid repeated PR polling from the Lanes tab. Those forced refreshes are marked `automaticRefresh` — nobody pressed anything — so they stay inside the service's GitHub failure ladder and a rate-limited GitHub is not re-asked on every branch-signature change (see [pull-requests](../pull-requests/README.md#github-read-failure-ladder)); `refreshLaneGithubPrTags` returns `false` when it fell back to the last usable snapshot, which is what the retry logic keys on. Runtime activity refreshes use `refreshLanes({ includeStatus: false, includeSnapshots: true, ... })` so PTY/chat buckets update without recomputing git status. Expanding Git Actions suppresses the hidden inline duplicate pane via `shouldMountGitActionsPane` while keeping the fullscreen pane mounted. Lane delete kicks off optimistically: the page subscribes to `lanes.delete.event`, tracks per-lane `LaneDeleteProgress` through `useAppStore().laneDeleteProgressByLaneId`, immediately closes the manage dialog, and excludes deleting lanes from the selectable lane id sets used by keyboard navigation (`selectableFilteredLaneIds`, `sortedSelectableLaneIds`). On mount/project switch it hydrates active backend delete progress when available, but also keeps stored active delete progress long enough to move selection away and queue a refresh if the backend list is missing, stale, or temporarily failed. Batch deletes still run selected child lanes before their selected parents; within each dependency-safe batch the page dispatches up to two lane deletes at a time and records per-lane failures, and a parent remains blocked if a selected descendant fails. Lane tabs for deleting lanes render a non-interactive overlay with a spinning `CircleNotch` and a `Deleting` / `Deleted` / `Deleted with warnings` label; selection / pinning / context menu / split / git-actions surfaces are all suppressed for those rows. `resolveLaneDeleteStartSelection` (also used by tests) computes a fallback selection so the user is moved to the next available lane the moment delete starts, and a top-bar lane action chip surfaces failures and non-fatal cleanup warnings through `laneActionError`. Work-tab action deeplinks scrub `action`, `laneId`, and `laneIds` after handling so modal routing cannot also rewrite split selection state. |
-| `renderer/components/lanes/lanePageModel.ts` | Pure lane-page selectors and URL/deletion helpers used by `LanesPage` and unit tests. Owns lane branch/PR role derivation (`active` vs `previous`), multi-PR ordering and attention selection, same-repo GitHub PR guardrails for fork branch-name collisions, ADE-vs-GitHub PR tag precedence, terminal-state GitHub overrides for stale ADE PR rows, deep-link lane selection, action-deeplink query cleanup, create-lane request normalization, delete-start selection fallback, parent-before-child-safe batch delete planning, and `runLaneDeleteBatchWithConcurrency` for limited parallel teardown inside each dependency-safe batch. |
+| `renderer/components/lanes/LanesPage.tsx` | 3-pane cockpit, tab management, dialog coordination. Create-lane state lives in `CreateLaneDialogHost`; `LanesPage` owns only open/prefill routing, blocks forced close while the host is busy, and focuses the new lane after the host refreshes the lane list while the dialog stays open for setup progress. The lane filter, pinned lane ids, and expanded lane id live in the active project's `WorkProjectViewState`, not component-local state, so route/tab/project remounts restore the correct project's view. Each lane row renders the lane's retained live PR set: the current-branch PR is `active`, older PRs from previous branches are `previous`, and two or more rows collapse to the newest open/draft PR (or newest terminal activity) plus a `+N` counter. Hover/focus reveals every PR with its own state, CI, review, and previous-branch signals; the fixed, viewport-clamped hover card is rendered outside row overflow, and the counter opens the lane-filtered PR workspace. The pure selectors in `lanePageModel.ts` prefer live same-branch GitHub repo inventory over terminal/stale ADE rows, then fall back to ADE-linked PR rows, so externally created PRs and open-after-closed branch reuse stay visible; linked PRs route to the PR workspace, while unlinked GitHub-only matches open externally. The page forces one GitHub snapshot refresh on project/branch-signature changes and otherwise uses cached snapshot/event refreshes to avoid repeated PR polling from the Lanes tab. Those forced refreshes are marked `automaticRefresh` — nobody pressed anything — so they stay inside the service's GitHub failure ladder and a rate-limited GitHub is not re-asked on every branch-signature change (see [pull-requests](../pull-requests/README.md#github-read-failure-ladder)); `refreshLaneGithubPrTags` returns `false` when it fell back to the last usable snapshot, which is what the retry logic keys on. Runtime activity refreshes use `refreshLanes({ includeStatus: false, includeSnapshots: true, ... })` so PTY/chat buckets update without recomputing git status. Expanding Git Actions suppresses the hidden inline duplicate pane via `shouldMountGitActionsPane` while keeping the fullscreen pane mounted. Lane delete kicks off optimistically: the page subscribes to `lanes.delete.event`, tracks per-lane `LaneDeleteProgress` through `useAppStore().laneDeleteProgressByLaneId`, immediately closes the manage dialog, and excludes deleting lanes from the selectable lane id sets used by keyboard navigation (`selectableFilteredLaneIds`, `sortedSelectableLaneIds`). On mount/project switch it hydrates active backend delete progress when available, but also keeps stored active delete progress long enough to move selection away and queue a refresh if the backend list is missing, stale, or temporarily failed. Batch deletes still run selected child lanes before their selected parents; within each dependency-safe batch the page dispatches up to two lane deletes at a time and records per-lane failures, and a parent remains blocked if a selected descendant fails. Lane tabs for deleting lanes render a non-interactive overlay with a spinning `CircleNotch` and a `Deleting` / `Deleted` / `Deleted with warnings` label; selection / pinning / context menu / split / git-actions surfaces are all suppressed for those rows. `resolveLaneDeleteStartSelection` (also used by tests) computes a fallback selection so the user is moved to the next available lane the moment delete starts, and a top-bar lane action chip surfaces failures and non-fatal cleanup warnings through `laneActionError`. Work-tab action deeplinks scrub `action`, `laneId`, and `laneIds` after handling so modal routing cannot also rewrite split selection state. |
+| `renderer/components/lanes/LanePrBadgePopover.tsx`, `LanePrHoverCard.tsx` | Multi-PR lane badge and its shared fixed-position portal. The primary chip chooses the newest open/draft PR before falling back to recent terminal activity; the complete list is clamped to the viewport and dismissed on scroll/resize so row/card overflow cannot hide it. |
+| `renderer/components/lanes/lanePageModel.ts` | Pure lane-page selectors and URL/deletion helpers used by `LanesPage` and unit tests. Owns lane branch/PR role derivation (`active` vs `previous`), multi-PR ordering, same-repo GitHub PR guardrails for fork branch-name collisions, ADE-vs-GitHub PR tag precedence, terminal-state GitHub overrides for stale ADE PR rows, deep-link lane selection, action-deeplink query cleanup, create-lane request normalization, delete-start selection fallback, parent-before-child-safe batch delete planning, and `runLaneDeleteBatchWithConcurrency` for limited parallel teardown inside each dependency-safe batch. |
| `renderer/hooks/useLaneListInvalidation.ts` | Shared lane-list invalidation hook used by Lanes, Graph, and PRs. It subscribes to `window.ade.lanes.onLifecycleEvent`, clears renderer read coalescing immediately, debounces a decorated `refreshLanes` call, runs one delayed follow-up refresh to cover daemon/write-to-read races, and self-heals stale visible lists on focus/visibility without polling. Hidden lifecycle events are replayed when the surface becomes visible. |
| `renderer/lib/laneReadCache.ts` | Renderer-side in-flight coalescing for lane list/snapshot/keybinding reads. Lane lifecycle invalidation clears lane list/snapshot requests and bumps a generation token so a newly requested read never reuses an older in-flight lane snapshot. |
| `renderer/state/appStore.ts` | Shared renderer project/lane state. Stores `laneDeleteProgressByLaneId` so in-flight lane deletion UI survives local `LanesPage` remounts and project metadata updates; the map clears only when the project root changes or the project is closed/reset. `WorkProjectViewState` also owns the per-project Lanes filter, pinned ids, and expanded id. Warm project-tab switches restore cached lanes/snapshots, lane selection, focused session, and loading state before the backend round trip finishes, and cache pruning retains Work/lane/session state for all open project tabs in addition to the active and recent projects. `refreshLanes` discards stale responses with a version token so older lane-list reads cannot overwrite a newer refresh, and it does not prune persisted lane scopes from the empty transitional list seen during project switches or remote reconnects. |
diff --git a/docs/features/terminals-and-sessions/README.md b/docs/features/terminals-and-sessions/README.md
index bffc77896..599dd2664 100644
--- a/docs/features/terminals-and-sessions/README.md
+++ b/docs/features/terminals-and-sessions/README.md
@@ -1267,12 +1267,16 @@ Renderer surfaces:
`ade.agentChat.delete`. Fixed-position menus measure and clamp to the renderer
viewport.
- `apps/desktop/src/renderer/components/terminals/LanePrBadge.tsx`,
+ `apps/desktop/src/renderer/components/lanes/LanePrHoverCard.tsx`,
`apps/desktop/src/renderer/lib/lanePrBadge.ts`,
`LaneActionsSubmenu.tsx`, and
`apps/desktop/src/renderer/components/ui/MenuSubmenu.tsx` — the shared
compact PR state badge, its selection/presentation/navigation helpers, the
singleton session row's lane submenu, and the pointer-safe/keyboard-accessible
- submenu primitive. The badge is presentation-only; where it opens is decided
+ submenu primitive. Multi-PR badges choose the newest open/draft PR (or newest
+ terminal activity) for the collapsed chip and render their detail list in a
+ viewport-clamped portal, so session-card overflow cannot hide it. The badge
+ is presentation-only; where it opens is decided
once by `openLanePr`, which sends a PR on the machine you are bound to into
the PRs tab and a foreign one to GitHub, since a PR id resolves only on the
machine that owns it. `LaneActionsSubmenu` renders the same
diff --git a/docs/features/terminals-and-sessions/ui-surfaces.md b/docs/features/terminals-and-sessions/ui-surfaces.md
index dc9fbe4ab..df3cf55b9 100644
--- a/docs/features/terminals-and-sessions/ui-surfaces.md
+++ b/docs/features/terminals-and-sessions/ui-surfaces.md
@@ -278,7 +278,10 @@ The full card is one full-bleed row with three lines:
and stays untruncated. A card whose lane lives on this machine deep-links to
the PR in ADE; a card on another machine badges from that machine's own PR
rows and opens the PR on GitHub, because the PRs tab can only resolve a PR
- id on the machine the project tab is bound to. While the owning lane is
+ id on the machine the project tab is bound to. When a lane has multiple PRs,
+ the badge represents the newest open/draft PR, or the newest terminal
+ activity when no PR is active, and its `+N` list is rendered in a
+ viewport-clamped portal so the session card cannot clip the details. While the owning lane is
mid background AI naming, every visible lane-label position (singleton row,
hover detail, or grouped header) uses the shared animated `Naming lane…`
placeholder; the persisted deterministic fallback stays hidden unless
From f8ef13debfcea8f266d5b9083b7f2c23e42da1d7 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Mon, 10 Aug 2026 03:59:29 -0400
Subject: [PATCH 02/17] =?UTF-8?q?ship:=20iteration=201=20=E2=80=94=20addre?=
=?UTF-8?q?ss=20review=20findings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apps/ade-cli/src/tuiClient/app.tsx | 38 ++++++-----
.../chat/AgentChatComposer.test.tsx | 25 ++++++++
.../components/chat/AgentChatComposer.tsx | 49 ++++++++++++---
.../components/lanes/LanePrHoverCard.tsx | 63 +++++++++++++++++--
.../components/terminals/LanePrBadge.test.tsx | 40 +++++++++++-
.../src/renderer/lib/lanePrBadge.test.ts | 12 +++-
apps/desktop/src/renderer/lib/lanePrBadge.ts | 5 +-
apps/desktop/src/shared/chatMentions.test.ts | 13 ++++
apps/desktop/src/shared/chatMentions.ts | 4 ++
.../src/shared/composerTriggers.test.ts | 18 ++++++
apps/desktop/src/shared/composerTriggers.ts | 28 +++++++++
.../Work/WorkComposerTypedTriggers.swift | 42 ++++++++++++-
.../WorkComposerTriggerDetectorTests.swift | 19 ++++++
docs/features/chat/composer-and-ui.md | 12 ++--
docs/features/lanes/README.md | 2 +-
.../features/terminals-and-sessions/README.md | 4 +-
.../terminals-and-sessions/ui-surfaces.md | 4 +-
17 files changed, 336 insertions(+), 42 deletions(-)
diff --git a/apps/ade-cli/src/tuiClient/app.tsx b/apps/ade-cli/src/tuiClient/app.tsx
index 7328fca8a..3775a299e 100644
--- a/apps/ade-cli/src/tuiClient/app.tsx
+++ b/apps/ade-cli/src/tuiClient/app.tsx
@@ -15,6 +15,7 @@ import { resolveStableLaneBaseBranch } from "../../../desktop/src/shared/laneBas
import { LAUNCH_PROFILE_TITLE, LAUNCH_PROFILE_TOOL_TYPE, resolveClaudeCliModelForLaunch } from "../../../desktop/src/shared/cliLaunch";
import { getAgentSkillRootCandidates } from "../../../desktop/src/shared/agentSkillRoots";
import {
+ composerTriggerForSelection,
composerTriggerSpansWholeDraft,
detectComposerTrigger,
findConfirmedComposerTokens,
@@ -7339,7 +7340,17 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
return;
}
let cancelled = false;
- const query = range.query.toLowerCase();
+ const query = range.query.trim().toLowerCase();
+ const matchesMentionQuery = (suggestion: MentionSuggestion): boolean => {
+ if (!query) return true;
+ const label = suggestion.label.toLowerCase();
+ return (
+ label.includes(query)
+ || query.startsWith(`${label} `)
+ || suggestion.insertText.toLowerCase().includes(query)
+ || Boolean(suggestion.detail?.toLowerCase().includes(query))
+ );
+ };
const localSuggestions = (): MentionSuggestion[] => [
...lanes.map((lane) => ({
kind: "lane" as const,
@@ -7353,20 +7364,10 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
insertText: `@chat:${session.sessionId}`,
detail: session.laneId,
})),
- ].filter((suggestion) => (
- !query
- || suggestion.label.toLowerCase().includes(query)
- || suggestion.insertText.toLowerCase().includes(query)
- || suggestion.detail?.toLowerCase().includes(query)
- ));
+ ].filter(matchesMentionQuery);
const attachedSuggestions = (): MentionSuggestion[] => selectedMentions
.filter((suggestion) => suggestion.attachment && suggestion.filePath)
- .filter((suggestion) => (
- !query
- || suggestion.label.toLowerCase().includes(query)
- || suggestion.insertText.toLowerCase().includes(query)
- || suggestion.detail?.toLowerCase().includes(query)
- ));
+ .filter(matchesMentionQuery);
const publishSuggestions = (remote: MentionSuggestion[] = []) => {
if (cancelled) return;
@@ -7452,7 +7453,8 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
.filter((pr) => {
const title = String(pr.title ?? "");
const number = String(pr.number ?? pr.prNumber ?? "");
- return !query || title.toLowerCase().includes(query) || number.includes(query);
+ const loweredTitle = title.toLowerCase();
+ return !query || loweredTitle.includes(query) || query.startsWith(`${loweredTitle} `) || number.includes(query);
})
.slice(0, 5)
.map((pr) => {
@@ -12331,8 +12333,12 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
}, [addNotice, chatRowBudget, lanes, models, refreshState, registerOptimisticTerminalSession, selectedMentions, setChatScrollOffset, setDraftChatMode, terminalPaneWidth]);
const insertMention = useCallback((suggestion: MentionSuggestion) => {
- const trigger = detectComposerTrigger(prompt, promptCursorRef.current);
- if (trigger?.type !== "at") return;
+ const detectedTrigger = detectComposerTrigger(prompt, promptCursorRef.current);
+ if (detectedTrigger?.type !== "at") return;
+ const trigger = composerTriggerForSelection(
+ detectedTrigger,
+ suggestion.kind === "file" ? suggestion.filePath ?? suggestion.label : suggestion.label,
+ );
const next = replaceComposerTriggerSpan(prompt, trigger, `${suggestion.insertText} `);
setPromptValue(next.text, next.caret);
setSelectedMentions((prev) => {
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx b/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
index 9d9db1766..94bb6d8c1 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
@@ -714,6 +714,31 @@ describe("AgentChatComposer", () => {
expect(view.container.querySelector("[aria-hidden]")?.textContent).not.toContain("@chat:chat-1");
});
+ it("does not consume prose after a matching spaced chat mention", async () => {
+ const onSearchMentions = vi.fn().mockResolvedValue([{
+ kind: "chat" as const,
+ id: "chat-1",
+ title: "a b c",
+ }]);
+ const props = buildComposerProps({
+ turnActive: false,
+ draft: "",
+ onSearchMentions,
+ });
+ const view = render();
+ const textbox = screen.getByRole("textbox");
+ const draft = "ask @a b c about this";
+
+ fireEvent.change(textbox, {
+ target: { value: draft, selectionStart: draft.length },
+ });
+ view.rerender();
+
+ fireEvent.click(await screen.findByText("a b c"));
+
+ expect(props.onDraftChange).toHaveBeenLastCalledWith("ask @chat:chat-1 about this");
+ });
+
it("uses lane attachment search for at-command suggestions before a session exists", async () => {
const onSearchAttachments = vi.fn().mockResolvedValue([{ path: "docs/README.md", type: "file" }]);
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx b/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
index c9bb77b7d..47140ad11 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
@@ -41,6 +41,7 @@ import type {
} from "../../../shared/types/orchestration";
import { getModelById, modelSupportsFastMode, type ProviderFamily } from "../../../shared/modelRegistry";
import {
+ composerTriggerForSelection,
composerTriggerSpansWholeDraft,
detectComposerTrigger,
findConfirmedComposerTokens,
@@ -2723,7 +2724,7 @@ export function AgentChatComposer({
// and flattens chips, so serialized indices cannot be mapped back onto DOM
// positions. Chips,
, and block edges terminate the run and act as
// word boundaries.
- const getRichTriggerContext = useCallback((): { trigger: ComposerTrigger; range: Range } | null => {
+ const getRichTriggerContext = useCallback((queryOverride?: string): { trigger: ComposerTrigger; range: Range } | null => {
const editor = richEditorRef.current;
if (!editor) return null;
const selection = window.getSelection();
@@ -2751,8 +2752,11 @@ export function AgentChatComposer({
walker = walker.previousSibling;
}
- const trigger = detectComposerTrigger(runText, runText.length);
- if (!trigger) return null;
+ const detectedTrigger = detectComposerTrigger(runText, runText.length);
+ if (!detectedTrigger) return null;
+ const trigger = queryOverride == null
+ ? detectedTrigger
+ : { ...detectedTrigger, query: queryOverride };
let remaining = trigger.start;
let startNode: Text = caretNode;
@@ -2767,9 +2771,22 @@ export function AgentChatComposer({
remaining -= length;
}
+ let endRemaining = trigger.start + 1 + trigger.query.length;
+ let endNode: Text = caretNode;
+ let endOffset = caretOffset;
+ for (const node of runNodes) {
+ const length = node === caretNode ? caretOffset : (node.textContent ?? "").length;
+ if (endRemaining <= length) {
+ endNode = node;
+ endOffset = endRemaining;
+ break;
+ }
+ endRemaining -= length;
+ }
+
const range = document.createRange();
range.setStart(startNode, startOffset);
- range.setEnd(caretNode, caretOffset);
+ range.setEnd(endNode, endOffset);
return { trigger, range };
}, []);
@@ -2778,7 +2795,7 @@ export function AgentChatComposer({
// no trigger span can be located (caller falls back to caret insertion).
const replaceRichTriggerWith = useCallback((insertion:
| { text: string }
- | { chipKind: "file" | "command" | "mention"; chipText: string; chipLabel?: string }
+ | { chipKind: "file" | "command" | "mention"; chipText: string; chipLabel?: string; triggerLabel?: string }
): boolean => {
const editor = richEditorRef.current;
if (!editor) return false;
@@ -2789,7 +2806,14 @@ export function AgentChatComposer({
selection?.removeAllRanges();
selection?.addRange(saved);
}
- const context = getRichTriggerContext();
+ const detectedContext = getRichTriggerContext();
+ if (!detectedContext) return false;
+ const trigger = "triggerLabel" in insertion
+ ? composerTriggerForSelection(detectedContext.trigger, insertion.triggerLabel ?? "")
+ : detectedContext.trigger;
+ const context = trigger.query === detectedContext.trigger.query
+ ? detectedContext
+ : getRichTriggerContext(trigger.query);
if (!context) return false;
selection?.removeAllRanges();
selection?.addRange(context.range);
@@ -3883,11 +3907,16 @@ export function AgentChatComposer({
}
// Replace exactly the @query trigger span with the confirmed token.
if (useRichComposer) {
- if (!replaceRichTriggerWith({ chipKind: "file", chipText: `@${item.path}` })) {
+ if (!replaceRichTriggerWith({
+ chipKind: "file",
+ chipText: `@${item.path}`,
+ triggerLabel: item.path,
+ })) {
insertTextIntoRichEditor(`@${item.path} `);
}
} else {
- const next = replaceComposerTriggerSpan(draft, commandMenuTrigger, `@${item.path} `);
+ const trigger = composerTriggerForSelection(commandMenuTrigger, item.path);
+ const next = replaceComposerTriggerSpan(draft, trigger, `@${item.path} `);
onDraftChange(next.text);
restoreTextareaCaret(next.caret);
}
@@ -3902,11 +3931,13 @@ export function AgentChatComposer({
chipKind: "mention",
chipText: token,
chipLabel: item.mention.title,
+ triggerLabel: item.mention.title,
})) {
insertTextIntoRichEditor(`${token} `);
}
} else {
- const next = replaceComposerTriggerSpan(draft, commandMenuTrigger, `${token} `);
+ const trigger = composerTriggerForSelection(commandMenuTrigger, item.mention.title);
+ const next = replaceComposerTriggerSpan(draft, trigger, `${token} `);
onDraftChange(next.text);
restoreTextareaCaret(next.caret);
}
diff --git a/apps/desktop/src/renderer/components/lanes/LanePrHoverCard.tsx b/apps/desktop/src/renderer/components/lanes/LanePrHoverCard.tsx
index 8367c9e97..34bd49032 100644
--- a/apps/desktop/src/renderer/components/lanes/LanePrHoverCard.tsx
+++ b/apps/desktop/src/renderer/components/lanes/LanePrHoverCard.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useRef, useState } from "react";
+import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";
import { createPortal } from "react-dom";
import { useClampedFixedPosition, type FixedAnchor } from "../../hooks/useClampedFixedPosition";
@@ -8,8 +8,9 @@ const VIEWPORT_PADDING = 8;
/**
* PR detail lists live outside their lane/session card so card overflow cannot
- * clip them. The anchor is measured only when the card opens; scroll/resize
- * dismisses it instead of installing a hot-path reposition listener.
+ * clip them. The anchor is measured only when the card opens; viewport
+ * scroll/resize dismisses it instead of installing a hot-path reposition
+ * listener. Internal panel scrolling remains available for long PR lists.
*/
export function LanePrHoverCard({
children,
@@ -26,6 +27,7 @@ export function LanePrHoverCard({
}) {
const triggerRef = useRef(null);
const closeTimerRef = useRef | null>(null);
+ const focusPanelOnOpenRef = useRef(false);
const [anchor, setAnchor] = useState(null);
const { ref: panelRef, position } = useClampedFixedPosition(anchor, label);
@@ -37,6 +39,7 @@ export function LanePrHoverCard({
const close = useCallback(() => {
cancelClose();
+ focusPanelOnOpenRef.current = false;
setAnchor(null);
}, [cancelClose]);
@@ -60,6 +63,25 @@ export function LanePrHoverCard({
setAnchor({ x: rect.left, y: rect.bottom + GAP });
}, [cancelClose]);
+ const focusTrigger = useCallback(() => {
+ const trigger = triggerRef.current;
+ if (!trigger) return;
+ const focusable = trigger.querySelector(
+ "button, a[href], input, select, textarea, [tabindex]:not([tabindex=\"-1\"])",
+ );
+ focusable?.focus();
+ }, []);
+
+ const openFromKeyboard = useCallback(() => {
+ focusPanelOnOpenRef.current = true;
+ open();
+ }, [open]);
+
+ const closeAndRestoreFocus = useCallback(() => {
+ close();
+ requestAnimationFrame(focusTrigger);
+ }, [close, focusTrigger]);
+
const isWithinCard = useCallback((target: EventTarget | null): boolean => {
return target instanceof Node && Boolean(
triggerRef.current?.contains(target) || panelRef.current?.contains(target),
@@ -68,14 +90,28 @@ export function LanePrHoverCard({
useEffect(() => {
if (!anchor) return undefined;
- const closeOnViewportChange = () => close();
+ const closeOnViewportChange = (event: Event) => {
+ if (event.type === "scroll" && event.target instanceof Node && panelRef.current?.contains(event.target)) {
+ return;
+ }
+ close();
+ };
window.addEventListener("scroll", closeOnViewportChange, true);
window.addEventListener("resize", closeOnViewportChange);
return () => {
window.removeEventListener("scroll", closeOnViewportChange, true);
window.removeEventListener("resize", closeOnViewportChange);
};
- }, [anchor, close]);
+ }, [anchor, close, panelRef]);
+
+ useLayoutEffect(() => {
+ if (!anchor || !focusPanelOnOpenRef.current || !panelRef.current) return;
+ focusPanelOnOpenRef.current = false;
+ const firstInteractive = panelRef.current.querySelector(
+ "button, a[href], input, select, textarea, [role=\"button\"], [tabindex]:not([tabindex=\"-1\"])",
+ );
+ firstInteractive?.focus();
+ }, [anchor, panelRef]);
useEffect(() => () => {
if (closeTimerRef.current != null) clearTimeout(closeTimerRef.current);
@@ -94,6 +130,17 @@ export function LanePrHoverCard({
onMouseEnter={open}
onMouseLeave={scheduleClose}
onFocus={open}
+ onKeyDown={(event) => {
+ if (event.key === "ArrowDown") {
+ event.preventDefault();
+ event.stopPropagation();
+ openFromKeyboard();
+ } else if (event.key === "Escape" && anchor) {
+ event.preventDefault();
+ event.stopPropagation();
+ closeAndRestoreFocus();
+ }
+ }}
onBlur={(event) => {
if (!isWithinCard(event.relatedTarget)) scheduleClose();
}}
@@ -117,6 +164,12 @@ export function LanePrHoverCard({
onMouseEnter={cancelClose}
onMouseLeave={scheduleClose}
onFocus={cancelClose}
+ onKeyDown={(event) => {
+ if (event.key !== "Escape") return;
+ event.preventDefault();
+ event.stopPropagation();
+ closeAndRestoreFocus();
+ }}
onBlur={(event) => {
if (!isWithinCard(event.relatedTarget)) scheduleClose();
}}
diff --git a/apps/desktop/src/renderer/components/terminals/LanePrBadge.test.tsx b/apps/desktop/src/renderer/components/terminals/LanePrBadge.test.tsx
index 3339eb7fa..57ab8f014 100644
--- a/apps/desktop/src/renderer/components/terminals/LanePrBadge.test.tsx
+++ b/apps/desktop/src/renderer/components/terminals/LanePrBadge.test.tsx
@@ -1,7 +1,7 @@
/* @vitest-environment jsdom */
import React from "react";
-import { cleanup, fireEvent, render, screen } from "@testing-library/react";
+import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
import { afterEach, describe, expect, it, vi } from "vitest";
import type { PrSummary } from "../../../shared/types";
import { LanePrBadge } from "./LanePrBadge";
@@ -110,6 +110,44 @@ describe("LanePrBadge", () => {
expect(screen.getByRole("img", { name: "CI failing; Review changes requested" })).toBeTruthy();
});
+ it("keeps the lane PR hover card open while its own panel scrolls", () => {
+ render(
+ ,
+ );
+
+ const hoverCard = openLanePrHoverCard();
+ fireEvent.scroll(hoverCard);
+
+ expect(screen.getByTestId("lane-pr-hover-card")).toBe(hoverCard);
+ });
+
+ it("moves focus into the multi-PR hover card from the trigger", async () => {
+ render(
+ ,
+ );
+
+ const trigger = screen.getByRole("button", { name: /Pull request #101/ });
+ trigger.focus();
+ fireEvent.keyDown(trigger, { key: "ArrowDown" });
+
+ const hoverCard = await screen.findByTestId("lane-pr-hover-card");
+ const firstRow = hoverCard.querySelector('[role="button"]');
+ expect(firstRow).not.toBeNull();
+ await waitFor(() => expect(document.activeElement).toBe(firstRow));
+
+ fireEvent.keyDown(firstRow!, { key: "Escape" });
+ await waitFor(() => expect(screen.queryByTestId("lane-pr-hover-card")).toBeNull());
+ await waitFor(() => expect(document.activeElement).toBe(trigger));
+ });
+
it("keeps a popover count non-interactive without a list handler", () => {
render(
{
],
expected: "merged",
},
+ {
+ name: "valid activity beats a missing timestamp",
+ prs: [
+ pr("missing", "open", null, 99),
+ pr("known", "open", "2026-07-03T00:00:00Z", 1),
+ ],
+ expected: "known",
+ },
];
for (const { name, prs, expected } of cases) {
diff --git a/apps/desktop/src/renderer/lib/lanePrBadge.ts b/apps/desktop/src/renderer/lib/lanePrBadge.ts
index 7772d40f6..315a33678 100644
--- a/apps/desktop/src/renderer/lib/lanePrBadge.ts
+++ b/apps/desktop/src/renderer/lib/lanePrBadge.ts
@@ -32,7 +32,10 @@ function comparePrimaryPr(a: PrimaryPrComparable, b: PrimaryPrComparable): numbe
if (byRank !== 0) return byRank;
const aUpdated = Date.parse(a.updatedAt ?? "");
const bUpdated = Date.parse(b.updatedAt ?? "");
- if (Number.isFinite(aUpdated) && Number.isFinite(bUpdated) && aUpdated !== bUpdated) {
+ const aHasUpdated = Number.isFinite(aUpdated);
+ const bHasUpdated = Number.isFinite(bUpdated);
+ if (aHasUpdated !== bHasUpdated) return aHasUpdated ? -1 : 1;
+ if (aHasUpdated && aUpdated !== bUpdated) {
return bUpdated - aUpdated;
}
return b.githubPrNumber - a.githubPrNumber;
diff --git a/apps/desktop/src/shared/chatMentions.test.ts b/apps/desktop/src/shared/chatMentions.test.ts
index 6798d14ba..185ead212 100644
--- a/apps/desktop/src/shared/chatMentions.test.ts
+++ b/apps/desktop/src/shared/chatMentions.test.ts
@@ -257,6 +257,19 @@ describe("chat mention ranking", () => {
expect(ranked.map((r) => r.id)).toEqual(["exact", "prefix", "sub"]);
});
+ it("keeps a title match when prose follows the mention", () => {
+ const ranked = rankChatMentionSuggestions(
+ [
+ { id: "short", title: "a b c", lastActivityAt: 10 },
+ { id: "other", title: "unrelated", lastActivityAt: 100 },
+ ],
+ "a b c about this",
+ 10,
+ );
+
+ expect(ranked.map((r) => r.id)).toEqual(["short"]);
+ });
+
it("honors the per-kind cap and is stable for equal rows", () => {
const ties = [
{ id: "z", title: "same", lastActivityAt: 5 },
diff --git a/apps/desktop/src/shared/chatMentions.ts b/apps/desktop/src/shared/chatMentions.ts
index a4d01652d..200faa017 100644
--- a/apps/desktop/src/shared/chatMentions.ts
+++ b/apps/desktop/src/shared/chatMentions.ts
@@ -251,6 +251,10 @@ function scoreChatMentionMatch(
if (!loweredQuery.length) return 0;
const target = haystack.toLowerCase();
if (target === loweredQuery) return 0;
+ // Once a title is an exact prefix, keep it visible while the user continues
+ // ordinary prose after the mention. Exact longer titles still win above this
+ // fallback, so a real multi-word title is selected before a shorter prefix.
+ if (loweredQuery.startsWith(`${target} `)) return 1;
if (target.startsWith(loweredQuery)) return 1;
if (target.includes(loweredQuery)) return 2;
// Subsequence fallback: every query char appears in order.
diff --git a/apps/desktop/src/shared/composerTriggers.test.ts b/apps/desktop/src/shared/composerTriggers.test.ts
index 6b477e44a..9a7a27ff0 100644
--- a/apps/desktop/src/shared/composerTriggers.test.ts
+++ b/apps/desktop/src/shared/composerTriggers.test.ts
@@ -1,5 +1,6 @@
import { describe, expect, it } from "vitest";
import {
+ composerTriggerForSelection,
composerTriggerSpansWholeDraft,
detectComposerTrigger,
findConfirmedComposerTokens,
@@ -91,6 +92,23 @@ describe("detectComposerTrigger", () => {
});
describe("replaceComposerTriggerSpan", () => {
+ it("keeps prose after a selected mention prefix", () => {
+ const trigger = detectComposerTrigger("ask @a b c about this", 20)!;
+ const selected = composerTriggerForSelection(trigger, "a b c");
+
+ expect(selected.query).toBe("a b c ");
+ expect(replaceComposerTriggerSpan("ask @a b c about this", selected, "@chat:chat-1 ")).toEqual({
+ text: "ask @chat:chat-1 about this",
+ caret: 17,
+ });
+ });
+
+ it("does not shorten a partial or non-prefix selection", () => {
+ const trigger = detectComposerTrigger("@abc", 4)!;
+ expect(composerTriggerForSelection(trigger, "a b c")).toEqual(trigger);
+ expect(composerTriggerForSelection(trigger, "other")).toEqual(trigger);
+ });
+
it("replaces exactly the trigger span mid-sentence", () => {
const text = "fix @src/f then run /te tomorrow";
const trigger = { start: 20, query: "te" };
diff --git a/apps/desktop/src/shared/composerTriggers.ts b/apps/desktop/src/shared/composerTriggers.ts
index 932578669..5746dfd68 100644
--- a/apps/desktop/src/shared/composerTriggers.ts
+++ b/apps/desktop/src/shared/composerTriggers.ts
@@ -37,6 +37,34 @@ export function detectComposerTrigger(text: string, cursorPos: number): Composer
return { type: "slash", query: slash![2] ?? "", start: slashStart };
}
+/**
+ * Narrow an @ trigger to the selected item's leading label when the user has
+ * continued typing prose after it. The menu can keep a prefix suggestion
+ * visible while the query grows, but replacing the raw trigger must not erase
+ * that prose. Whitespace after the label belongs to the selected trigger so
+ * the replacement can add its own single separator.
+ */
+export function composerTriggerForSelection(
+ trigger: ComposerTrigger,
+ label: string,
+): ComposerTrigger {
+ const selectedLabel = label.trim();
+ if (trigger.type !== "at" || !selectedLabel) return trigger;
+
+ const matchedPrefix = trigger.query.slice(0, selectedLabel.length);
+ if (matchedPrefix.toLowerCase() !== selectedLabel.toLowerCase()) return trigger;
+
+ const remainder = trigger.query.slice(selectedLabel.length);
+ if (remainder.length > 0 && !/^[ \t]/.test(remainder)) {
+ return trigger;
+ }
+ const separator = remainder.match(/^[ \t]*/)?.[0] ?? "";
+ return {
+ ...trigger,
+ query: `${matchedPrefix}${separator}`,
+ };
+}
+
/**
* Replace exactly the trigger span (trigger character through the end of the
* typed query) with `insertion`, leaving surrounding text untouched so
diff --git a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
index b8cba1131..dad59cc40 100644
--- a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
+++ b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
@@ -194,6 +194,45 @@ enum WorkComposerTriggerDetector {
return nil
}
}
+
+ /// Keep prose typed after a selected @ item outside the replacement range.
+ /// The trigger detector intentionally accepts spaces for multi-word names;
+ /// this second pass uses the selected row's label to distinguish that name
+ /// from a trailing sentence.
+ static func matchForSelection(
+ _ match: WorkComposerTriggerMatch,
+ suggestion: WorkComposerSuggestion
+ ) -> WorkComposerTriggerMatch {
+ guard match.kind == .at else { return match }
+ let rawLabel = suggestion.insertText.hasPrefix("@")
+ ? String(suggestion.insertText.dropFirst())
+ : suggestion.title
+ let label = rawLabel.trimmingCharacters(in: .whitespacesAndNewlines)
+ guard !label.isEmpty else { return match }
+
+ let query = match.query as NSString
+ let labelLength = (label as NSString).length
+ guard query.length >= labelLength else { return match }
+ let prefix = query.substring(to: labelLength)
+ guard prefix.lowercased() == label.lowercased() else { return match }
+
+ let remainder = query.substring(from: labelLength) as NSString
+ guard remainder.length == 0 || remainder.character(at: 0) == 0x20 || remainder.character(at: 0) == 0x09 else {
+ return match
+ }
+ var separatorLength = 0
+ while separatorLength < remainder.length {
+ let character = remainder.character(at: separatorLength)
+ guard character == 0x20 || character == 0x09 else { break }
+ separatorLength += 1
+ }
+ let consumedQuery = query.substring(to: labelLength + separatorLength)
+ return WorkComposerTriggerMatch(
+ kind: match.kind,
+ query: consumedQuery,
+ range: NSRange(location: match.range.location, length: 1 + (consumedQuery as NSString).length)
+ )
+ }
}
// MARK: - Suggestion model
@@ -368,7 +407,8 @@ final class WorkComposerSuggestionController: ObservableObject {
func commit(_ suggestion: WorkComposerSuggestion) {
guard let match = activeMatch else { return }
- onCommit?(suggestion, match.range)
+ let commitMatch = WorkComposerTriggerDetector.matchForSelection(match, suggestion: suggestion)
+ onCommit?(suggestion, commitMatch.range)
clear()
}
diff --git a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
index 3147ff0d8..691d1e620 100644
--- a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
+++ b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
@@ -77,6 +77,25 @@ final class WorkComposerTriggerDetectorTests: XCTestCase {
XCTAssertNil(detect("@a@b"))
}
+ func testAtSelectionRangePreservesTrailingProse() {
+ let text = "ask @src/foo.swift about this"
+ let match = try! XCTUnwrap(detect(text))
+ let suggestion = WorkComposerSuggestion(
+ id: "file:src/foo.swift",
+ kind: .at,
+ title: "foo.swift",
+ subtitle: "src",
+ insertText: "@src/foo.swift"
+ )
+
+ let narrowed = WorkComposerTriggerDetector.matchForSelection(match, suggestion: suggestion)
+ XCTAssertEqual(narrowed.query, "src/foo.swift ")
+ XCTAssertEqual(
+ narrowed.range,
+ NSRange(location: 4, length: ("@src/foo.swift " as NSString).length)
+ )
+ }
+
func testEmailDoesNotTrigger() {
// The `@` is glued to a preceding non-space char, so emails never trigger.
XCTAssertNil(detect("ping foo@bar"))
diff --git a/docs/features/chat/composer-and-ui.md b/docs/features/chat/composer-and-ui.md
index 46056e39c..49826c2a6 100644
--- a/docs/features/chat/composer-and-ui.md
+++ b/docs/features/chat/composer-and-ui.md
@@ -32,7 +32,7 @@ subagents, computer use). The pane derives all visible state from the
| `ChatComposerShell.tsx` | Input container chrome reused by the composer. |
| `ChatAttachmentTray.tsx` | Inline file/image attachment tray inside the composer. Image attachments render an inline thumbnail, open a full-size lightbox on click, and expose a copy-to-clipboard button that ships the image bytes via `window.ade.app.writeClipboardImage` so the user can paste them into another app. Pasted images can pass a seeded preview URL from the composer while the temp file is being saved; tray-only image refs fall back to `window.ade.app.getImageDataUrl`. Non-image attachments fall back to the file glyph. |
| `ChatCommandMenu.tsx` | Popover for slash commands and the sectioned `@` menu: Files plus Chats / Lanes / Terminals entity mentions. Consumes a `ComposerTrigger` from `shared/composerTriggers.ts` (so the menu opens for a mid-draft trigger, not just a leading one). Files and mentions are two independently debounced (40 ms) `useDebouncedSuggestions` sources sharing one hook; each keeps a per-menu-session query cache (`QUERY_CACHE_MAX = 40`) so cached queries render same-frame while a background revalidation still runs, and both caches clear when the menu closes or the provider identity changes. A bare `@` is a browse: the file index returns shallowest-first results and the mention action returns recency-ranked entities, so the menu is never empty before typing. Multi-word `@` queries stay active through spaces and use the same cached/debounced search path. Flat keyboard-nav indices are precomputed in the sections memo (no render-time counters); all three row types share the `MenuRow` chrome. Selecting a mention inserts an opaque `@chat:` / `@lane:` / `@term:` pointer while the composer displays the selected entity title (see `shared/chatMentions.ts`). |
-| `apps/desktop/src/shared/composerTriggers.ts` | Cursor-relative typed-trigger detection shared by the desktop chat composer (rich + textarea), the `WorkViewArea` continue composer, and the ade-code TUI (iOS mirrors the same regexes in Swift). `detectComposerTrigger(text, cursorPos)` finds an in-progress `/command` / `@` query ending at the cursor at any position; `@` queries may contain spaces for multi-word entity names but stop at a newline or another `@`; `replaceComposerTriggerSpan` splices exactly that span; `findConfirmedComposerTokens` locates confirmed chip tokens for overlay/prompt styling (`ComposerTokenKind` is `"file" | "command" | "mention"`; mention bodies are self-identifying via the `chat:`/`lane:`/`term:` prefix grammar, so callers pass a purely syntactic `isMention` predicate); `composerTriggerSpansWholeDraft` distinguishes a lone leading command from a mid-sentence one. |
+| `apps/desktop/src/shared/composerTriggers.ts` | Cursor-relative typed-trigger detection shared by the desktop chat composer (rich + textarea), the `WorkViewArea` continue composer, and the ade-code TUI (iOS mirrors the same regexes in Swift). `detectComposerTrigger(text, cursorPos)` finds an in-progress `/command` / `@` query ending at the cursor at any position; `@` queries may contain spaces for multi-word entity names but stop at a newline or another `@`; selecting a matching suggestion narrows the replacement span to its label so trailing prose is preserved; `replaceComposerTriggerSpan` splices exactly that span; `findConfirmedComposerTokens` locates confirmed chip tokens for overlay/prompt styling (`ComposerTokenKind` is `"file" | "command" | "mention"`; mention bodies are self-identifying via the `chat:`/`lane:`/`term:` prefix grammar, so callers pass a purely syntactic `isMention` predicate); `composerTriggerSpansWholeDraft` distinguishes a lone leading command from a mid-sentence one. |
| `apps/desktop/src/shared/smartLinks.ts` | Cross-client URL catalog and deterministic fallback labels. Recognizes GitHub PR/issue/repo/commit/action-run links, Linear issues, `ade://` deeplinks, and generic HTTP(S) pages; trims sentence punctuation, caps each draft at 12 matches, and keeps the canonical URL separate from optional title/favicon metadata. Desktop, hosted web, and ADE Code import this contract; iOS mirrors it in `WorkSmartLinkDetector`. |
| `apps/desktop/src/main/services/chat/smartLinkPreviewService.ts` | Runtime-owned best-effort metadata resolver. GitHub and Linear titles use configured provider services; generic pages use bounded public-network HTML/favicon reads with DNS pinning and SSRF checks. Generic previews cache at most 256 public entries for 30 minutes (five minutes for metadata misses); credential-backed provider results are never stored in that process-global cache. Any error returns the deterministic local preview rather than blocking composition. |
| `ChatTasksPanel.tsx` | Todo list rendered from `todo_update` events. |
@@ -299,12 +299,16 @@ that could not work without it.
block — see [features/linear-integration/README.md](../linear-integration/README.md).
- **Typed triggers anywhere.** `detectComposerTrigger(text, cursorPos)`
(`shared/composerTriggers.ts`) finds an in-progress `/command` or
- `@file` token that ends at the cursor — at any position in the draft,
+ `@file` or multi-word `@chat` token that ends at the cursor — at any position
+ in the draft,
not just position 0 (`fix @src/foo.ts then run /test`). Both the rich
contenteditable and the plain textarea consume it (as do the
`WorkViewArea` continue-composer and the ade-code TUI, which import
- the same module). Selecting a suggestion replaces exactly the trigger
- span (`replaceComposerTriggerSpan`); a lone leading command keeps the
+ the same module). A matching multi-word suggestion remains available while
+ following prose is typed, and selecting it replaces only the `@` plus the
+ selected label (`composerTriggerForSelection`), preserving that prose.
+ Selecting a suggestion otherwise replaces exactly the trigger span
+ (`replaceComposerTriggerSpan`); a lone leading command keeps the
legacy fill-the-draft path so the local `/clear` intercept and
argument-hint scaffold still work. Confirmed tokens render as chips:
the rich editor inserts non-editable chip nodes
diff --git a/docs/features/lanes/README.md b/docs/features/lanes/README.md
index ffc3d92f4..8b3f9cd76 100644
--- a/docs/features/lanes/README.md
+++ b/docs/features/lanes/README.md
@@ -78,7 +78,7 @@ Renderer components:
| `renderer/components/app/App.tsx` | Project tab host and route keep-alive shell. Keeps the Work surface mounted after first visit and now does the same for `/lanes`, parking the inactive Lanes surface with `inert` / `aria-hidden` instead of unmounting it. Parked route and project surfaces also set `data-ade-animation-state="paused"`, which lets the global renderer stylesheet stop hidden CSS animations until the surface is active again. Surfaces are keyed by runtime binding (`local:` or the remote binding key) so local and remote views of the same root do not share lane/work state. During cold project switches it renders a transition veil over the old project surface until the target project hydrates. |
| `renderer/components/app/toast/{toastStore.ts,ToastStack.tsx,useLaneEventToasts.ts}` | Shared renderer toast primitive mounted from `AppShell`. `useLaneEventToasts` subscribes to `lanes.onLifecycleEvent` and `lanes.rebaseSubscribe`, turning lane-created/archive/delete and final automated rebase outcomes into compact global notices; created-lane toasts include a `View` action that routes to `/lanes?laneId=...&focus=single`. |
| `renderer/components/lanes/LanesPage.tsx` | 3-pane cockpit, tab management, dialog coordination. Create-lane state lives in `CreateLaneDialogHost`; `LanesPage` owns only open/prefill routing, blocks forced close while the host is busy, and focuses the new lane after the host refreshes the lane list while the dialog stays open for setup progress. The lane filter, pinned lane ids, and expanded lane id live in the active project's `WorkProjectViewState`, not component-local state, so route/tab/project remounts restore the correct project's view. Each lane row renders the lane's retained live PR set: the current-branch PR is `active`, older PRs from previous branches are `previous`, and two or more rows collapse to the newest open/draft PR (or newest terminal activity) plus a `+N` counter. Hover/focus reveals every PR with its own state, CI, review, and previous-branch signals; the fixed, viewport-clamped hover card is rendered outside row overflow, and the counter opens the lane-filtered PR workspace. The pure selectors in `lanePageModel.ts` prefer live same-branch GitHub repo inventory over terminal/stale ADE rows, then fall back to ADE-linked PR rows, so externally created PRs and open-after-closed branch reuse stay visible; linked PRs route to the PR workspace, while unlinked GitHub-only matches open externally. The page forces one GitHub snapshot refresh on project/branch-signature changes and otherwise uses cached snapshot/event refreshes to avoid repeated PR polling from the Lanes tab. Those forced refreshes are marked `automaticRefresh` — nobody pressed anything — so they stay inside the service's GitHub failure ladder and a rate-limited GitHub is not re-asked on every branch-signature change (see [pull-requests](../pull-requests/README.md#github-read-failure-ladder)); `refreshLaneGithubPrTags` returns `false` when it fell back to the last usable snapshot, which is what the retry logic keys on. Runtime activity refreshes use `refreshLanes({ includeStatus: false, includeSnapshots: true, ... })` so PTY/chat buckets update without recomputing git status. Expanding Git Actions suppresses the hidden inline duplicate pane via `shouldMountGitActionsPane` while keeping the fullscreen pane mounted. Lane delete kicks off optimistically: the page subscribes to `lanes.delete.event`, tracks per-lane `LaneDeleteProgress` through `useAppStore().laneDeleteProgressByLaneId`, immediately closes the manage dialog, and excludes deleting lanes from the selectable lane id sets used by keyboard navigation (`selectableFilteredLaneIds`, `sortedSelectableLaneIds`). On mount/project switch it hydrates active backend delete progress when available, but also keeps stored active delete progress long enough to move selection away and queue a refresh if the backend list is missing, stale, or temporarily failed. Batch deletes still run selected child lanes before their selected parents; within each dependency-safe batch the page dispatches up to two lane deletes at a time and records per-lane failures, and a parent remains blocked if a selected descendant fails. Lane tabs for deleting lanes render a non-interactive overlay with a spinning `CircleNotch` and a `Deleting` / `Deleted` / `Deleted with warnings` label; selection / pinning / context menu / split / git-actions surfaces are all suppressed for those rows. `resolveLaneDeleteStartSelection` (also used by tests) computes a fallback selection so the user is moved to the next available lane the moment delete starts, and a top-bar lane action chip surfaces failures and non-fatal cleanup warnings through `laneActionError`. Work-tab action deeplinks scrub `action`, `laneId`, and `laneIds` after handling so modal routing cannot also rewrite split selection state. |
-| `renderer/components/lanes/LanePrBadgePopover.tsx`, `LanePrHoverCard.tsx` | Multi-PR lane badge and its shared fixed-position portal. The primary chip chooses the newest open/draft PR before falling back to recent terminal activity; the complete list is clamped to the viewport and dismissed on scroll/resize so row/card overflow cannot hide it. |
+| `renderer/components/lanes/LanePrBadgePopover.tsx`, `LanePrHoverCard.tsx` | Multi-PR lane badge and its shared fixed-position portal. The primary chip chooses the newest open/draft PR before falling back to recent terminal activity; the complete list is clamped to the viewport and dismissed on viewport scroll/resize so row/card overflow cannot hide it, while its own list remains scrollable. |
| `renderer/components/lanes/lanePageModel.ts` | Pure lane-page selectors and URL/deletion helpers used by `LanesPage` and unit tests. Owns lane branch/PR role derivation (`active` vs `previous`), multi-PR ordering, same-repo GitHub PR guardrails for fork branch-name collisions, ADE-vs-GitHub PR tag precedence, terminal-state GitHub overrides for stale ADE PR rows, deep-link lane selection, action-deeplink query cleanup, create-lane request normalization, delete-start selection fallback, parent-before-child-safe batch delete planning, and `runLaneDeleteBatchWithConcurrency` for limited parallel teardown inside each dependency-safe batch. |
| `renderer/hooks/useLaneListInvalidation.ts` | Shared lane-list invalidation hook used by Lanes, Graph, and PRs. It subscribes to `window.ade.lanes.onLifecycleEvent`, clears renderer read coalescing immediately, debounces a decorated `refreshLanes` call, runs one delayed follow-up refresh to cover daemon/write-to-read races, and self-heals stale visible lists on focus/visibility without polling. Hidden lifecycle events are replayed when the surface becomes visible. |
| `renderer/lib/laneReadCache.ts` | Renderer-side in-flight coalescing for lane list/snapshot/keybinding reads. Lane lifecycle invalidation clears lane list/snapshot requests and bumps a generation token so a newly requested read never reuses an older in-flight lane snapshot. |
diff --git a/docs/features/terminals-and-sessions/README.md b/docs/features/terminals-and-sessions/README.md
index 599dd2664..83aa97720 100644
--- a/docs/features/terminals-and-sessions/README.md
+++ b/docs/features/terminals-and-sessions/README.md
@@ -1275,7 +1275,9 @@ Renderer surfaces:
singleton session row's lane submenu, and the pointer-safe/keyboard-accessible
submenu primitive. Multi-PR badges choose the newest open/draft PR (or newest
terminal activity) for the collapsed chip and render their detail list in a
- viewport-clamped portal, so session-card overflow cannot hide it. The badge
+ viewport-clamped portal, so session-card overflow cannot hide it; the list
+ remains scrollable and keyboard reachable (ArrowDown opens it, Escape closes it and restores
+ focus). The badge
is presentation-only; where it opens is decided
once by `openLanePr`, which sends a PR on the machine you are bound to into
the PRs tab and a foreign one to GitHub, since a PR id resolves only on the
diff --git a/docs/features/terminals-and-sessions/ui-surfaces.md b/docs/features/terminals-and-sessions/ui-surfaces.md
index df3cf55b9..bbd87dba9 100644
--- a/docs/features/terminals-and-sessions/ui-surfaces.md
+++ b/docs/features/terminals-and-sessions/ui-surfaces.md
@@ -281,7 +281,9 @@ The full card is one full-bleed row with three lines:
id on the machine the project tab is bound to. When a lane has multiple PRs,
the badge represents the newest open/draft PR, or the newest terminal
activity when no PR is active, and its `+N` list is rendered in a
- viewport-clamped portal so the session card cannot clip the details. While the owning lane is
+ viewport-clamped portal so the session card cannot clip the details. The portal remains
+ keyboard reachable (ArrowDown opens it, Escape closes it and restores focus) and its own
+ list can scroll without dismissing. While the owning lane is
mid background AI naming, every visible lane-label position (singleton row,
hover detail, or grouped header) uses the shared animated `Naming lane…`
placeholder; the persisted deterministic fallback stays hidden unless
From 431fa9921e7e1d5ae3aec64a75aeed7ee9ea0edc Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Mon, 10 Aug 2026 04:21:28 -0400
Subject: [PATCH 03/17] =?UTF-8?q?ship:=20iteration=202=20=E2=80=94=20addre?=
=?UTF-8?q?ss=20current-head=20review=20findings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/chat/AgentChatComposer.test.tsx | 3 ++-
.../components/chat/AgentChatComposer.tsx | 16 +++++++++++++++-
apps/desktop/src/shared/chatMentions.test.ts | 10 ++++++++++
apps/desktop/src/shared/chatMentions.ts | 10 ++++++----
4 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx b/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
index 94bb6d8c1..562cad3b8 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
@@ -711,7 +711,8 @@ describe("AgentChatComposer", () => {
const chip = await screen.findByText("a b c");
expect(chip.textContent).toBe("a b c");
expect(chip.closest("[aria-hidden]")).not.toBeNull();
- expect(view.container.querySelector("[aria-hidden]")?.textContent).not.toContain("@chat:chat-1");
+ expect(view.container.querySelector("[data-composer-mention-layout]")?.textContent).toBe("@chat:chat-1");
+ expect(view.container.querySelector("[data-composer-mention-display]")?.textContent).toBe("a b c");
});
it("does not consume prose after a matching spaced chat mention", async () => {
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx b/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
index 47140ad11..e4a6f7a50 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
@@ -2015,12 +2015,26 @@ export function AgentChatComposer({
const displayText = token.kind === "mention"
? mentionLabelsRef.current.get(tokenText)?.trim() || tokenText
: tokenText;
+ const isLabeledMention = token.kind === "mention" && displayText !== tokenText;
segments.push(
- {displayText}
+ {isLabeledMention ? (
+ // Keep the textarea's canonical token as an invisible layout slot.
+ // The visible title is positioned inside that slot so a longer or
+ // shorter label cannot move the caret or following prose out of
+ // alignment with the real textarea value.
+
+
+ {tokenText}
+
+
+ {displayText}
+
+
+ ) : displayText}
,
);
pos = token.end;
diff --git a/apps/desktop/src/shared/chatMentions.test.ts b/apps/desktop/src/shared/chatMentions.test.ts
index 185ead212..7400ea69e 100644
--- a/apps/desktop/src/shared/chatMentions.test.ts
+++ b/apps/desktop/src/shared/chatMentions.test.ts
@@ -270,6 +270,16 @@ describe("chat mention ranking", () => {
expect(ranked.map((r) => r.id)).toEqual(["short"]);
});
+ it("does not keep a subtitle-only prefix when prose follows it", () => {
+ const ranked = rankChatMentionSuggestions(
+ [{ id: "subtitle", title: "Unrelated", subtitle: "Primary · codex", lastActivityAt: 10 }],
+ "Primary · codex please review",
+ 10,
+ );
+
+ expect(ranked).toEqual([]);
+ });
+
it("honors the per-kind cap and is stable for equal rows", () => {
const ties = [
{ id: "z", title: "same", lastActivityAt: 5 },
diff --git a/apps/desktop/src/shared/chatMentions.ts b/apps/desktop/src/shared/chatMentions.ts
index 200faa017..77eb7df79 100644
--- a/apps/desktop/src/shared/chatMentions.ts
+++ b/apps/desktop/src/shared/chatMentions.ts
@@ -247,14 +247,16 @@ export function carryChatMentionBlocks(source: string, target: string): string {
function scoreChatMentionMatch(
haystack: string,
loweredQuery: string,
+ allowTrailingProse = false,
): number | null {
if (!loweredQuery.length) return 0;
const target = haystack.toLowerCase();
if (target === loweredQuery) return 0;
// Once a title is an exact prefix, keep it visible while the user continues
- // ordinary prose after the mention. Exact longer titles still win above this
- // fallback, so a real multi-word title is selected before a shorter prefix.
- if (loweredQuery.startsWith(`${target} `)) return 1;
+ // ordinary prose after the mention. This is intentionally title-only: a
+ // subtitle prefix is not a confirmed label, so it must not widen the
+ // replacement span and consume the prose that follows it.
+ if (allowTrailingProse && loweredQuery.startsWith(`${target} `)) return 1;
if (target.startsWith(loweredQuery)) return 1;
if (target.includes(loweredQuery)) return 2;
// Subsequence fallback: every query char appears in order.
@@ -282,7 +284,7 @@ export function rankChatMentionSuggestions<
scored.push({ item, score: 0 });
continue;
}
- const titleScore = scoreChatMentionMatch(item.title, trimmed);
+ const titleScore = scoreChatMentionMatch(item.title, trimmed, true);
const subtitleScore = item.subtitle
? scoreChatMentionMatch(item.subtitle, trimmed)
: null;
From c6ba626d20718b084e595e5e063e701544dfe2ab Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Mon, 10 Aug 2026 04:42:33 -0400
Subject: [PATCH 04/17] =?UTF-8?q?ship:=20iteration=203=20=E2=80=94=20prese?=
=?UTF-8?q?rve=20file=20matches=20after=20prose?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apps/ade-cli/src/tuiClient/app.tsx | 10 ++++++----
.../chat/AgentChatComposer.test.tsx | 19 ++++++++++++++++++
.../components/chat/ChatCommandMenu.tsx | 5 +++--
.../src/shared/composerTriggers.test.ts | 7 +++++++
apps/desktop/src/shared/composerTriggers.ts | 15 ++++++++++++++
.../Work/WorkComposerTypedTriggers.swift | 20 +++++++++++++++++--
.../WorkComposerTriggerDetectorTests.swift | 15 ++++++++++++++
7 files changed, 83 insertions(+), 8 deletions(-)
diff --git a/apps/ade-cli/src/tuiClient/app.tsx b/apps/ade-cli/src/tuiClient/app.tsx
index 3775a299e..8ac42b809 100644
--- a/apps/ade-cli/src/tuiClient/app.tsx
+++ b/apps/ade-cli/src/tuiClient/app.tsx
@@ -15,6 +15,7 @@ import { resolveStableLaneBaseBranch } from "../../../desktop/src/shared/laneBas
import { LAUNCH_PROFILE_TITLE, LAUNCH_PROFILE_TOOL_TYPE, resolveClaudeCliModelForLaunch } from "../../../desktop/src/shared/cliLaunch";
import { getAgentSkillRootCandidates } from "../../../desktop/src/shared/agentSkillRoots";
import {
+ composerFileSearchQuery,
composerTriggerForSelection,
composerTriggerSpansWholeDraft,
detectComposerTrigger,
@@ -7341,6 +7342,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
}
let cancelled = false;
const query = range.query.trim().toLowerCase();
+ const fileQuery = composerFileSearchQuery(range.query).toLowerCase();
const matchesMentionQuery = (suggestion: MentionSuggestion): boolean => {
if (!query) return true;
const label = suggestion.label.toLowerCase();
@@ -7391,16 +7393,16 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
// (shallowest paths first) instead of returning nothing, matching the
// desktop composer's `@` behavior. The cache keys on the query string,
// so "" caches like any typed query.
- const filesPromise = cache.filesByQuery.get(query)
- ? Promise.resolve(cache.filesByQuery.get(query)!)
+ const filesPromise = cache.filesByQuery.get(fileQuery)
+ ? Promise.resolve(cache.filesByQuery.get(fileQuery)!)
: Promise.resolve(conn.action>("file", "quickOpen", {
workspaceId: laneId,
- query,
+ query: fileQuery,
limit: MENTION_FILE_ROWS,
}))
.then((files) => {
const safeFiles = Array.isArray(files) ? files : [];
- cache.filesByQuery.set(query, safeFiles);
+ cache.filesByQuery.set(fileQuery, safeFiles);
return safeFiles;
})
.catch(() => []);
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx b/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
index 562cad3b8..6be988401 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
@@ -682,6 +682,25 @@ describe("AgentChatComposer", () => {
expect(await screen.findByText("App.tsx")).toBeTruthy();
});
+ it("keeps an exact file match available after trailing prose", async () => {
+ const onSearchAttachments = vi.fn().mockResolvedValue([{ path: "src/foo.ts", type: "file" }]);
+
+ renderComposer({
+ turnActive: false,
+ draft: "",
+ sessionId: "session-1",
+ onSearchAttachments,
+ });
+
+ const draft = "ask @src/foo.ts about this";
+ fireEvent.change(screen.getByRole("textbox"), {
+ target: { value: draft, selectionStart: draft.length },
+ });
+
+ await waitFor(() => expect(onSearchAttachments).toHaveBeenCalledWith("src/foo.ts"));
+ expect(await screen.findByText("foo.ts")).toBeTruthy();
+ });
+
it("keeps spaced chat mentions searchable and displays the chat title in the chip", async () => {
const onSearchMentions = vi.fn().mockResolvedValue([{
kind: "chat" as const,
diff --git a/apps/desktop/src/renderer/components/chat/ChatCommandMenu.tsx b/apps/desktop/src/renderer/components/chat/ChatCommandMenu.tsx
index 15948d986..1fc17923a 100644
--- a/apps/desktop/src/renderer/components/chat/ChatCommandMenu.tsx
+++ b/apps/desktop/src/renderer/components/chat/ChatCommandMenu.tsx
@@ -20,7 +20,7 @@ import {
Terminal as TerminalIcon,
type Icon as PhosphorIcon,
} from "@phosphor-icons/react";
-import type { ComposerTrigger } from "../../../shared/composerTriggers";
+import { composerFileSearchQuery, type ComposerTrigger } from "../../../shared/composerTriggers";
import { CHAT_MENTION_KINDS, CHAT_MENTION_MAX_PER_KIND } from "../../../shared/chatMentions";
import type { ChatMentionKind, ChatMentionSuggestion } from "../../../shared/types/chatMentions";
import { cn } from "../ui/cn";
@@ -294,12 +294,13 @@ export const ChatCommandMenu = forwardRef(
atActive,
- atQuery,
+ fileQuery,
onFileSearch,
MAX_FILE_RESULTS,
triggerType,
diff --git a/apps/desktop/src/shared/composerTriggers.test.ts b/apps/desktop/src/shared/composerTriggers.test.ts
index 9a7a27ff0..9891fcb2f 100644
--- a/apps/desktop/src/shared/composerTriggers.test.ts
+++ b/apps/desktop/src/shared/composerTriggers.test.ts
@@ -1,5 +1,6 @@
import { describe, expect, it } from "vitest";
import {
+ composerFileSearchQuery,
composerTriggerForSelection,
composerTriggerSpansWholeDraft,
detectComposerTrigger,
@@ -60,6 +61,12 @@ describe("detectComposerTrigger", () => {
expect(detectComposerTrigger("@a ", 3)).toEqual({ type: "at", query: "a ", start: 0 });
});
+ it("narrows path-like file queries before trailing prose", () => {
+ expect(composerFileSearchQuery("src/foo.ts about this")).toBe("src/foo.ts");
+ expect(composerFileSearchQuery("src/my file.ts about this")).toBe("src/my file.ts");
+ expect(composerFileSearchQuery("a b c")).toBe("a b c");
+ });
+
it("does not let an at query cross a newline or another at sign", () => {
expect(detectComposerTrigger("@a\nb", 4)).toBeNull();
expect(detectComposerTrigger("@a@b", 4)).toBeNull();
diff --git a/apps/desktop/src/shared/composerTriggers.ts b/apps/desktop/src/shared/composerTriggers.ts
index 5746dfd68..a0f6da775 100644
--- a/apps/desktop/src/shared/composerTriggers.ts
+++ b/apps/desktop/src/shared/composerTriggers.ts
@@ -21,6 +21,10 @@ export type ComposerTrigger = {
// another `@` or a newline, so emails and cross-line prose never trigger.
const AT_TRIGGER_RE = /(?:^|[ \t\r\n])(@([^@\r\n]*))$/;
const SLASH_TRIGGER_RE = /(?:^|\s)(\/([^\s/]*))$/;
+// A path-like leading label can be separated from prose without making the
+// same assumption for ordinary multiword chat titles. This covers the common
+// `src/foo.ts about this` form, including paths whose filename contains spaces.
+const FILE_QUERY_RE = /^((?:.+?\.[A-Za-z0-9_-]+)|(?:\S+[\\/]\S+))(?:[ \t]+.*)?$/;
export function detectComposerTrigger(text: string, cursorPos: number): ComposerTrigger | null {
const cursor = Math.max(0, Math.min(Math.floor(cursorPos), text.length));
@@ -37,6 +41,17 @@ export function detectComposerTrigger(text: string, cursorPos: number): Composer
return { type: "slash", query: slash![2] ?? "", start: slashStart };
}
+/**
+ * Remove trailing prose from an @ file query while leaving chat-name queries
+ * untouched. File selection still uses the raw trigger below, so the shared
+ * label-narrowing helper preserves the prose in the replacement range.
+ */
+export function composerFileSearchQuery(query: string): string {
+ const trimmed = query.trim();
+ if (!trimmed) return "";
+ return FILE_QUERY_RE.exec(trimmed)?.[1] ?? trimmed;
+}
+
/**
* Narrow an @ trigger to the selected item's leading label when the user has
* continued typing prose after it. The menu can keep a prefix suggestion
diff --git a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
index dad59cc40..8d982d752 100644
--- a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
+++ b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
@@ -162,6 +162,9 @@ struct WorkComposerTriggerMatch: Equatable {
enum WorkComposerTriggerDetector {
private static let slashRegex = try! NSRegularExpression(pattern: "(?:^|\\s)/([^\\s/]*)$")
private static let atRegex = try! NSRegularExpression(pattern: "(?:^|[ \\t\\r\\n])@([^@\\r\\n]*)$")
+ private static let fileQueryRegex = try! NSRegularExpression(
+ pattern: "^((?:.+?\\.[A-Za-z0-9_-]+)|(?:\\S+[\\\\/]\\S+))(?:[ \\t]+.*)?$"
+ )
static func detect(in text: NSString, cursor: Int) -> WorkComposerTriggerMatch? {
guard cursor >= 0, cursor <= text.length else { return nil }
@@ -195,6 +198,19 @@ enum WorkComposerTriggerDetector {
}
}
+ /// Keep path-like file labels searchable when the user continues ordinary
+ /// prose, while leaving multiword chat-name queries untouched.
+ static func fileSearchQuery(for query: String) -> String {
+ let trimmed = query.trimmingCharacters(in: .whitespacesAndNewlines)
+ guard !trimmed.isEmpty else { return "" }
+ let nsQuery = trimmed as NSString
+ let range = NSRange(location: 0, length: nsQuery.length)
+ guard let match = fileQueryRegex.firstMatch(in: trimmed, range: range) else { return trimmed }
+ let labelRange = match.range(at: 1)
+ guard labelRange.location != NSNotFound else { return trimmed }
+ return nsQuery.substring(with: labelRange)
+ }
+
/// Keep prose typed after a selected @ item outside the replacement range.
/// The trigger detector intentionally accepts spaces for multi-word names;
/// this second pass uses the selected row's label to distinguish that name
@@ -333,7 +349,7 @@ final class WorkComposerSuggestionController: ObservableObject {
if let match = activeMatch, match.kind == .at {
// An @ trigger typed against the previous lane re-fetches against
// the new one instead of keeping the superseded results.
- scheduleFileFetch(query: match.query)
+ scheduleFileFetch(query: WorkComposerTriggerDetector.fileSearchQuery(for: match.query))
} else if isLoading {
isLoading = false
}
@@ -401,7 +417,7 @@ final class WorkComposerSuggestionController: ObservableObject {
isLoading = false
suggestions = WorkComposerSlashCatalog.suggestions(provider: provider, query: match.query)
case .at:
- scheduleFileFetch(query: match.query)
+ scheduleFileFetch(query: WorkComposerTriggerDetector.fileSearchQuery(for: match.query))
}
}
diff --git a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
index 691d1e620..b58363cd6 100644
--- a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
+++ b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
@@ -96,6 +96,21 @@ final class WorkComposerTriggerDetectorTests: XCTestCase {
)
}
+ func testFileSearchQueryPreservesPathBeforeTrailingProse() {
+ XCTAssertEqual(
+ WorkComposerTriggerDetector.fileSearchQuery(for: "src/foo.ts about this"),
+ "src/foo.ts"
+ )
+ XCTAssertEqual(
+ WorkComposerTriggerDetector.fileSearchQuery(for: "src/my file.ts about this"),
+ "src/my file.ts"
+ )
+ XCTAssertEqual(
+ WorkComposerTriggerDetector.fileSearchQuery(for: "a b c"),
+ "a b c"
+ )
+ }
+
func testEmailDoesNotTrigger() {
// The `@` is glued to a preceding non-space char, so emails never trigger.
XCTAssertNil(detect("ping foo@bar"))
From e1567fcd4cd0e47e1c76fe36099b55132611275a Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Mon, 10 Aug 2026 05:11:16 -0400
Subject: [PATCH 05/17] =?UTF-8?q?ship:=20iteration=204=20=E2=80=94=20prese?=
=?UTF-8?q?rve=20mention=20labels=20and=20path=20matches?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apps/ade-cli/src/tuiClient/app.tsx | 9 ++-
.../services/files/fileSearchIndexService.ts | 33 +++++++--
.../main/services/files/fileService.test.ts | 23 ++++++
.../chat/AgentChatComposer.test.tsx | 58 +++++++++++++++
.../components/chat/AgentChatComposer.tsx | 70 +++++++++++++++++--
.../components/chat/AgentChatPane.tsx | 32 +++++++++
.../src/renderer/lib/lanePrBadge.test.ts | 12 +++-
apps/desktop/src/renderer/lib/lanePrBadge.ts | 9 +--
.../src/shared/composerTriggers.test.ts | 1 +
apps/desktop/src/shared/composerTriggers.ts | 15 ++--
.../Work/WorkComposerTypedTriggers.swift | 2 +-
.../WorkComposerTriggerDetectorTests.swift | 4 ++
12 files changed, 241 insertions(+), 27 deletions(-)
diff --git a/apps/ade-cli/src/tuiClient/app.tsx b/apps/ade-cli/src/tuiClient/app.tsx
index 8ac42b809..5f49c525b 100644
--- a/apps/ade-cli/src/tuiClient/app.tsx
+++ b/apps/ade-cli/src/tuiClient/app.tsx
@@ -2514,6 +2514,10 @@ export const MENTION_MAX_ROWS = 10;
export const MENTION_FILE_ROWS = 5;
const STARTUP_RECONNECT_DELAY_MS = 3_000;
+function matchesMentionTarget(target: string, query: string): boolean {
+ return target.includes(query) || query.startsWith(`${target} `);
+}
+
type MentionRemoteCacheEntry = {
filesByQuery: Map>;
commits: Array> | null;
@@ -7347,8 +7351,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
if (!query) return true;
const label = suggestion.label.toLowerCase();
return (
- label.includes(query)
- || query.startsWith(`${label} `)
+ matchesMentionTarget(label, query)
|| suggestion.insertText.toLowerCase().includes(query)
|| Boolean(suggestion.detail?.toLowerCase().includes(query))
);
@@ -7456,7 +7459,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
const title = String(pr.title ?? "");
const number = String(pr.number ?? pr.prNumber ?? "");
const loweredTitle = title.toLowerCase();
- return !query || loweredTitle.includes(query) || query.startsWith(`${loweredTitle} `) || number.includes(query);
+ return !query || matchesMentionTarget(loweredTitle, query) || number.includes(query);
})
.slice(0, 5)
.map((pr) => {
diff --git a/apps/desktop/src/main/services/files/fileSearchIndexService.ts b/apps/desktop/src/main/services/files/fileSearchIndexService.ts
index 5591d10a1..bbac391ea 100644
--- a/apps/desktop/src/main/services/files/fileSearchIndexService.ts
+++ b/apps/desktop/src/main/services/files/fileSearchIndexService.ts
@@ -85,15 +85,38 @@ function scoreBrowseDepth(normalizedPath: string): number {
return Math.max(1, BROWSE_BASE_SCORE - depth);
}
+function scorePathForNeedle(normalized: string, needle: string): number {
+ if (normalized === needle) return 1000;
+ if (normalized.endsWith(`/${needle}`) || normalized.endsWith(`\\${needle}`)) return 900;
+ const idx = normalized.indexOf(needle);
+ return idx < 0 ? -1 : 600 - idx;
+}
+
function scorePath(pathValue: string, query: string): number {
const normalized = pathValue.toLowerCase();
const needle = query.toLowerCase().trim();
if (!needle) return scoreBrowseDepth(normalized);
- if (normalized === needle) return 1000;
- if (normalized.endsWith(`/${needle}`) || normalized.endsWith(`\\${needle}`)) return 900;
- const idx = normalized.indexOf(needle);
- if (idx < 0) return -1;
- return 600 - idx;
+ const directScore = scorePathForNeedle(normalized, needle);
+ if (directScore >= 0) return directScore;
+
+ // Composer @-file queries can contain ordinary prose after an extensionless
+ // path whose filename or directory contains spaces. A path index cannot
+ // know that boundary from the string alone, so try progressively shorter
+ // space-delimited prefixes and keep the longest matching one. Restrict this
+ // fallback to path-like queries so ordinary multiword quick-open searches
+ // keep their existing whole-query semantics.
+ if (!needle.includes("/") && !needle.includes("\\")) return -1;
+ const words = needle.split(/[ \t]+/);
+ let best = -1;
+ for (let end = words.length - 1; end > 0; end -= 1) {
+ const prefix = words.slice(0, end).join(" ");
+ const score = scorePathForNeedle(normalized, prefix);
+ if (score < 0) continue;
+ // Prefer a longer path prefix when multiple indexed paths share the same
+ // beginning. The tiny fractional tie-break preserves existing score tiers.
+ best = Math.max(best, score + Math.min(prefix.length, 999) / 1000);
+ }
+ return best;
}
async function cooperativeYield(): Promise {
diff --git a/apps/desktop/src/main/services/files/fileService.test.ts b/apps/desktop/src/main/services/files/fileService.test.ts
index 18c655830..8da0b3d22 100644
--- a/apps/desktop/src/main/services/files/fileService.test.ts
+++ b/apps/desktop/src/main/services/files/fileService.test.ts
@@ -539,6 +539,29 @@ describe("fileService", () => {
}
});
+ it("matches an extensionless path with spaces before trailing prose", async () => {
+ const rootPath = fs.mkdtempSync(path.join(os.tmpdir(), "ade-file-service-spaced-path-"));
+ const { execSync } = await import("node:child_process");
+ execSync("git init", { cwd: rootPath, stdio: "ignore" });
+ const laneService = createLaneServiceStub(rootPath);
+ const service = createFileService({ laneService });
+
+ try {
+ fs.mkdirSync(path.join(rootPath, "src"), { recursive: true });
+ fs.writeFileSync(path.join(rootPath, "src", "my folder"), "extensionless path\n", "utf8");
+
+ const quickOpen = await service.quickOpen({
+ workspaceId: "workspace-1",
+ query: "src/my folder about this",
+ includeIgnored: true,
+ });
+
+ expect(quickOpen.map((item) => item.path)).toContain("src/my folder");
+ } finally {
+ removeTestTree(rootPath);
+ }
+ });
+
it("warms the quick open index for subsequent lookups", async () => {
const rootPath = fs.mkdtempSync(path.join(os.tmpdir(), "ade-file-service-warm-search-"));
const { execSync } = await import("node:child_process");
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx b/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
index 6be988401..1d7a94d95 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
@@ -701,6 +701,25 @@ describe("AgentChatComposer", () => {
expect(await screen.findByText("foo.ts")).toBeTruthy();
});
+ it("keeps an extensionless spaced file path intact before trailing prose", async () => {
+ const onSearchAttachments = vi.fn().mockResolvedValue([{ path: "src/my folder", type: "file" }]);
+
+ renderComposer({
+ turnActive: false,
+ draft: "",
+ sessionId: "session-1",
+ onSearchAttachments,
+ });
+
+ const draft = "ask @src/my folder about this";
+ fireEvent.change(screen.getByRole("textbox"), {
+ target: { value: draft, selectionStart: draft.length },
+ });
+
+ await waitFor(() => expect(onSearchAttachments).toHaveBeenCalledWith("src/my folder about this"));
+ expect(await screen.findByText("my folder")).toBeTruthy();
+ });
+
it("keeps spaced chat mentions searchable and displays the chat title in the chip", async () => {
const onSearchMentions = vi.fn().mockResolvedValue([{
kind: "chat" as const,
@@ -734,6 +753,45 @@ describe("AgentChatComposer", () => {
expect(view.container.querySelector("[data-composer-mention-display]")?.textContent).toBe("a b c");
});
+ it("restores persisted mention titles after a plain composer remount", () => {
+ const props = buildComposerProps({
+ turnActive: false,
+ draft: "@chat:chat-1 ",
+ mentionLabels: { "@chat:chat-1": "a b c" },
+ });
+ const first = render();
+ expect(first.container.querySelector("[data-composer-mention-display]")?.textContent).toBe("a b c");
+
+ first.unmount();
+ const second = render();
+ expect(second.container.querySelector("[data-composer-mention-display]")?.textContent).toBe("a b c");
+ });
+
+ it("restores persisted mention titles after a rich composer remount", () => {
+ const iosContext = {
+ kind: "ios_element" as const,
+ id: "ios-1",
+ componentId: "PrimaryButton",
+ sourceFile: null,
+ sourceLine: null,
+ frame: null,
+ metadata: { label: "Primary" },
+ selectedAt: "2026-05-07T00:00:00.000Z",
+ };
+ const props = buildComposerProps({
+ turnActive: false,
+ draft: "@chat:chat-1 ",
+ mentionLabels: { "@chat:chat-1": "a b c" },
+ iosElementContextItems: [iosContext],
+ });
+ const first = render();
+ expect(first.container.querySelector("[data-composer-chip='mention']")?.textContent).toBe("a b c");
+
+ first.unmount();
+ const second = render();
+ expect(second.container.querySelector("[data-composer-chip='mention']")?.textContent).toBe("a b c");
+ });
+
it("does not consume prose after a matching spaced chat mention", async () => {
const onSearchMentions = vi.fn().mockResolvedValue([{
kind: "chat" as const,
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx b/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
index e4a6f7a50..ad9f7f88d 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
@@ -51,6 +51,7 @@ import {
import {
formatChatMentionToken,
isChatMentionTokenBody,
+ parseChatMentions,
} from "../../../shared/chatMentions";
import type { ChatMentionSuggestion } from "../../../shared/types/chatMentions";
import { cn } from "../ui/cn";
@@ -1509,6 +1510,8 @@ export function AgentChatComposer({
onReasoningEffortChange,
onFastModeChange,
onDraftChange,
+ mentionLabels,
+ onMentionLabelChange,
onClearDraft,
onSubmit,
onSubmitBlocked,
@@ -1663,6 +1666,9 @@ export function AgentChatComposer({
onReasoningEffortChange: (reasoningEffort: string | null) => void;
onFastModeChange?: (enabled: boolean) => void;
onDraftChange: (value: string) => void;
+ /** Persisted display labels keyed by their canonical mention token. */
+ mentionLabels?: Record;
+ onMentionLabelChange?: (token: string, title: string) => void;
onClearDraft?: () => void;
onSubmit: () => void;
onSubmitBlocked?: (message: string) => void;
@@ -1859,7 +1865,10 @@ export function AgentChatComposer({
// selected row's title separately so the visible chip stays user-facing.
// This is a presentation cache only; send-time parsing still uses the
// canonical @chat: token in `draft`.
- const mentionLabelsRef = useRef>(new Map());
+ const mentionLabelsRef = useRef>(new Map(Object.entries(mentionLabels ?? {})));
+ useLayoutEffect(() => {
+ mentionLabelsRef.current = new Map(Object.entries(mentionLabels ?? {}));
+ }, [mentionLabels]);
const lastSerializedDraftRef = useRef("");
const lastPlainSelectionRef = useRef(null);
const fileAddInProgressRef = useRef(false);
@@ -2013,7 +2022,7 @@ export function AgentChatComposer({
if (token.start > pos) segments.push(draft.slice(pos, token.start));
const tokenText = draft.slice(token.start, token.end);
const displayText = token.kind === "mention"
- ? mentionLabelsRef.current.get(tokenText)?.trim() || tokenText
+ ? mentionLabels?.[tokenText]?.trim() || mentionLabelsRef.current.get(tokenText)?.trim() || tokenText
: tokenText;
const isLabeledMention = token.kind === "mention" && displayText !== tokenText;
segments.push(
@@ -2044,7 +2053,7 @@ export function AgentChatComposer({
// measurable so the overlay height matches the textarea's scrollHeight.
segments.push("");
return segments;
- }, [draft, plainComposerTokens]);
+ }, [draft, mentionLabels, plainComposerTokens]);
// Pre-warm the lane's quick-open file index as soon as the composer is
// bound to a session so the first "@" query is served from a warm index.
@@ -2732,6 +2741,54 @@ export function AgentChatComposer({
return chip;
}, []);
+ const hydrateMentionChipsInEditor = useCallback((): boolean => {
+ const editor = richEditorRef.current;
+ const labels = mentionLabelsRef.current;
+ if (!editor || !labels.size) return false;
+
+ let changed = false;
+ editor.querySelectorAll("[data-composer-chip='mention']").forEach((chip) => {
+ const token = chip.dataset.composerChipText;
+ const label = token ? labels.get(token)?.trim() : undefined;
+ if (!token || !label) return;
+ const labelNode = chip.firstElementChild;
+ if (labelNode) labelNode.textContent = label;
+ chip.title = `${label} — ${token}`;
+ });
+
+ const walker = document.createTreeWalker(editor, NodeFilter.SHOW_TEXT, {
+ acceptNode(node) {
+ const parent = node.parentElement;
+ if (!parent || parent.closest("[data-composer-chip], [data-ios-context-id], [data-app-control-context-id], [data-built-in-browser-context-id]")) {
+ return NodeFilter.FILTER_REJECT;
+ }
+ return NodeFilter.FILTER_ACCEPT;
+ },
+ });
+ const nodes: Text[] = [];
+ let current = walker.nextNode();
+ while (current) {
+ nodes.push(current as Text);
+ current = walker.nextNode();
+ }
+ for (const node of nodes) {
+ const text = node.textContent ?? "";
+ const mentions = parseChatMentions(text).filter((mention) => labels.has(mention.token));
+ if (!mentions.length) continue;
+ const fragment = document.createDocumentFragment();
+ let offset = 0;
+ for (const mention of mentions) {
+ if (mention.start > offset) fragment.append(document.createTextNode(text.slice(offset, mention.start)));
+ fragment.append(createComposerTokenChipNode("mention", mention.token, labels.get(mention.token)));
+ offset = mention.end;
+ }
+ if (offset < text.length) fragment.append(document.createTextNode(text.slice(offset)));
+ node.replaceWith(fragment);
+ changed = true;
+ }
+ return changed;
+ }, [createComposerTokenChipNode]);
+
// Finds the in-progress /command or @file token that ends at the caret in
// the rich contenteditable. Works on the DOM text run around the caret
// instead of serialized-draft offsets: serialization collapses whitespace
@@ -3059,6 +3116,8 @@ export function AgentChatComposer({
}
}
+ hydrateMentionChipsInEditor();
+
const isFocusedInsideEditor = document.activeElement === editor;
const insertChipFragment = (chip: HTMLElement) => {
const before = document.createTextNode(" ");
@@ -3136,7 +3195,7 @@ export function AgentChatComposer({
if (next === lastSerializedDraftRef.current) return;
lastSerializedDraftRef.current = next;
onDraftChange(next);
- }, [appControlContextItems, builtInBrowserContextItems, createAppControlContextChipNode, createBuiltInBrowserContextChipNode, createIosContextChipNode, draft, insertNodeAtTextOffset, iosElementContextItems, onDraftChange, serializeRichEditor, tokenizeSmartLinksInEditor, useRichComposer]);
+ }, [appControlContextItems, builtInBrowserContextItems, createAppControlContextChipNode, createBuiltInBrowserContextChipNode, createIosContextChipNode, draft, hydrateMentionChipsInEditor, insertNodeAtTextOffset, iosElementContextItems, mentionLabels, onDraftChange, serializeRichEditor, tokenizeSmartLinksInEditor, useRichComposer]);
// ── Chip selection highlight ─────────────────────────────────────────────
// The native selection is not painted over contentEditable="false" chips, so
@@ -3940,6 +3999,7 @@ export function AgentChatComposer({
// now. The token is expanded into an block at send time.
const token = formatChatMentionToken(item.mention.kind, item.mention.id);
mentionLabelsRef.current.set(token, item.mention.title);
+ onMentionLabelChange?.(token, item.mention.title);
if (useRichComposer) {
if (!replaceRichTriggerWith({
chipKind: "mention",
@@ -3977,7 +4037,7 @@ export function AgentChatComposer({
}
}
setCommandMenuTrigger(null);
- }, [attachBlockedReason, canAttach, commandMenuTrigger, composerInputLocked, draft, effectiveSlashCommands, handleSlashSelect, insertTextIntoRichEditor, onDraftChange, onAddAttachment, replaceRichTriggerWith, restoreTextareaCaret, useRichComposer]);
+ }, [attachBlockedReason, canAttach, commandMenuTrigger, composerInputLocked, draft, effectiveSlashCommands, handleSlashSelect, insertTextIntoRichEditor, onAddAttachment, onDraftChange, onMentionLabelChange, replaceRichTriggerWith, restoreTextareaCaret, useRichComposer]);
const handleRichEditorInput = useCallback((event?: React.FormEvent) => {
const editor = richEditorRef.current;
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatPane.tsx b/apps/desktop/src/renderer/components/chat/AgentChatPane.tsx
index b01c1bf01..426cdec08 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatPane.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatPane.tsx
@@ -68,6 +68,7 @@ import {
normalizeChatContextAttachments,
removeChatContextAttachment,
} from "../../../shared/chatContextAttachments";
+import { isChatMentionTokenBody } from "../../../shared/chatMentions";
import type {
OrchestrationAnnotationEventDetail,
OrchestrationContextItem,
@@ -1447,6 +1448,7 @@ type LastLaunchConfig = {
type ComposerDraftStorageSnapshot = {
version: 1;
text: string;
+ mentionLabels: Record;
modelId: string;
reasoningEffort: string | null;
fastMode: boolean;
@@ -2707,6 +2709,20 @@ function mergeComposerItemsById(current: T[], incoming
return [...merged.values()];
}
+function normalizeComposerMentionLabels(value: unknown): Record {
+ if (!isRecord(value)) return {};
+ const labels: Record = {};
+ for (const [token, rawLabel] of Object.entries(value)) {
+ if (!token.startsWith("@") || !isChatMentionTokenBody(token.slice(1))) continue;
+ if (typeof rawLabel !== "string") continue;
+ const label = rawLabel.trim();
+ if (!label || token.length > 300 || label.length > 500) continue;
+ labels[token] = label;
+ if (Object.keys(labels).length >= 64) break;
+ }
+ return labels;
+}
+
function normalizeStoredComposerDraft(
value: unknown,
defaults: NativeControlState,
@@ -2717,6 +2733,7 @@ function normalizeStoredComposerDraft(
return {
version: 1,
text: typeof value.text === "string" ? value.text : "",
+ mentionLabels: normalizeComposerMentionLabels(value.mentionLabels),
modelId,
reasoningEffort: nonEmptyString(value.reasoningEffort),
fastMode: modelSupportsFastMode(desc) && readStoredFastMode(value),
@@ -3592,6 +3609,7 @@ export function AgentChatPane({
const [sdkSlashCommands, setSdkSlashCommands] = useState([]);
const [sendOnEnter, setSendOnEnter] = useState(true);
const [draft, setDraft] = useState("");
+ const [mentionLabels, setMentionLabels] = useState>({});
const draftsPerSessionRef = useRef>(new Map());
const composerDraftWriteTimerRef = useRef(null);
const pendingComposerDraftWriteRef = useRef<{
@@ -4121,6 +4139,13 @@ export function AgentChatPane({
draftsPerSessionRef.current.set(companionStateKey, value);
if (value.length > 0) clearPromptSuggestionForSession(selectedSessionId);
}, [clearPromptSuggestionForSession, companionStateKey, selectedSessionId]);
+ const updateComposerMentionLabel = useCallback((token: string, title: string) => {
+ const label = title.trim();
+ if (!label) return;
+ setMentionLabels((current) => current[token] === label
+ ? current
+ : { ...current, [token]: label });
+ }, []);
const insertComposerDraft = useCallback((value: string) => {
setDraft((current) => {
const next = current.trim().length ? `${current.trimEnd()}\n\n${value}` : value;
@@ -8180,6 +8205,7 @@ export function AgentChatPane({
writeComposerDraftSnapshot(storageKey, saved);
}
draftsPerSessionRef.current.set(companionStateKey, saved.text);
+ setMentionLabels(saved.mentionLabels);
setDraft(saved.text);
draftAttachmentOwnerBindingRef.current = saved.attachmentOwnerBinding;
setAttachments(saved.attachments);
@@ -8204,6 +8230,7 @@ export function AgentChatPane({
return;
}
const savedText = draftsPerSessionRef.current.get(companionStateKey) ?? "";
+ setMentionLabels({});
setDraft(savedText);
draftAttachmentOwnerBindingRef.current = null;
setAttachments([]);
@@ -8232,6 +8259,7 @@ export function AgentChatPane({
const snapshot: ComposerDraftStorageSnapshot = {
version: 1,
text: draft,
+ mentionLabels,
modelId,
reasoningEffort,
fastMode,
@@ -8278,6 +8306,7 @@ export function AgentChatPane({
executionMode,
iosElementContextItems,
modelId,
+ mentionLabels,
reasoningEffort,
]);
@@ -12198,6 +12227,8 @@ export function AgentChatPane({
onReasoningEffortChange={handleReasoningEffortChange}
onFastModeChange={handleFastModeChange}
onDraftChange={updateComposerDraft}
+ mentionLabels={mentionLabels}
+ onMentionLabelChange={updateComposerMentionLabel}
onClearDraft={() => updateComposerDraft("")}
onSubmit={() => {
void submit();
@@ -12245,6 +12276,7 @@ export function AgentChatPane({
const draftSnapshot: ComposerDraftStorageSnapshot = {
version: 1,
text: draft,
+ mentionLabels,
modelId,
reasoningEffort,
fastMode,
diff --git a/apps/desktop/src/renderer/lib/lanePrBadge.test.ts b/apps/desktop/src/renderer/lib/lanePrBadge.test.ts
index fa1d1f009..42b04dde1 100644
--- a/apps/desktop/src/renderer/lib/lanePrBadge.test.ts
+++ b/apps/desktop/src/renderer/lib/lanePrBadge.test.ts
@@ -16,10 +16,10 @@ function pr(id: string, state: PrState, updatedAt: string | null | undefined, gi
}
describe("primaryPrStateRank", () => {
- it("ranks open < draft < merged < closed", () => {
+ it("ranks open < draft < terminal history", () => {
expect(primaryPrStateRank("open")).toBeLessThan(primaryPrStateRank("draft"));
expect(primaryPrStateRank("draft")).toBeLessThan(primaryPrStateRank("merged"));
- expect(primaryPrStateRank("merged")).toBeLessThan(primaryPrStateRank("closed"));
+ expect(primaryPrStateRank("merged")).toBe(primaryPrStateRank("closed"));
});
});
@@ -68,6 +68,14 @@ describe("pickPrimaryPr", () => {
],
expected: "merged",
},
+ {
+ name: "newer closed activity beats older merged history",
+ prs: [
+ pr("old-merged", "merged", "2026-07-01T00:00:00Z", 20),
+ pr("new-closed", "closed", "2026-07-04T00:00:00Z", 1),
+ ],
+ expected: "new-closed",
+ },
{
name: "valid activity beats a missing timestamp",
prs: [
diff --git a/apps/desktop/src/renderer/lib/lanePrBadge.ts b/apps/desktop/src/renderer/lib/lanePrBadge.ts
index 315a33678..35d1197a7 100644
--- a/apps/desktop/src/renderer/lib/lanePrBadge.ts
+++ b/apps/desktop/src/renderer/lib/lanePrBadge.ts
@@ -5,8 +5,9 @@ import { COLORS } from "../components/lanes/laneDesignTokens";
/**
* Rank used to choose the one PR that represents a lane in a dense list:
- * an open PR is the most actionable, then a draft, then a merged/closed one.
- * Lower rank wins.
+ * an open PR is the most actionable, then a draft, then terminal history.
+ * Merged and closed PRs share the terminal rank so their activity timestamps
+ * decide which history is most useful. Lower rank wins.
*/
export function primaryPrStateRank(state: PrState): number {
switch (state) {
@@ -17,7 +18,7 @@ export function primaryPrStateRank(state: PrState): number {
case "merged":
return 2;
default:
- return 3; // closed
+ return 2; // closed
}
}
@@ -43,7 +44,7 @@ function comparePrimaryPr(a: PrimaryPrComparable, b: PrimaryPrComparable): numbe
/**
* Pick the single PR that best represents a set of PRs: prefer open over draft
- * over merged/closed; among equals the most recently updated (then highest
+ * over terminal history; among equals the most recently updated (then highest
* number) wins. Returns null for an empty list. Pure — the caller pre-filters
* to a lane's PRs.
*/
diff --git a/apps/desktop/src/shared/composerTriggers.test.ts b/apps/desktop/src/shared/composerTriggers.test.ts
index 9891fcb2f..2a0fa508a 100644
--- a/apps/desktop/src/shared/composerTriggers.test.ts
+++ b/apps/desktop/src/shared/composerTriggers.test.ts
@@ -64,6 +64,7 @@ describe("detectComposerTrigger", () => {
it("narrows path-like file queries before trailing prose", () => {
expect(composerFileSearchQuery("src/foo.ts about this")).toBe("src/foo.ts");
expect(composerFileSearchQuery("src/my file.ts about this")).toBe("src/my file.ts");
+ expect(composerFileSearchQuery("src/my folder about this")).toBe("src/my folder about this");
expect(composerFileSearchQuery("a b c")).toBe("a b c");
});
diff --git a/apps/desktop/src/shared/composerTriggers.ts b/apps/desktop/src/shared/composerTriggers.ts
index a0f6da775..b0d83dc41 100644
--- a/apps/desktop/src/shared/composerTriggers.ts
+++ b/apps/desktop/src/shared/composerTriggers.ts
@@ -21,10 +21,11 @@ export type ComposerTrigger = {
// another `@` or a newline, so emails and cross-line prose never trigger.
const AT_TRIGGER_RE = /(?:^|[ \t\r\n])(@([^@\r\n]*))$/;
const SLASH_TRIGGER_RE = /(?:^|\s)(\/([^\s/]*))$/;
-// A path-like leading label can be separated from prose without making the
-// same assumption for ordinary multiword chat titles. This covers the common
-// `src/foo.ts about this` form, including paths whose filename contains spaces.
-const FILE_QUERY_RE = /^((?:.+?\.[A-Za-z0-9_-]+)|(?:\S+[\\/]\S+))(?:[ \t]+.*)?$/;
+// A path with a recognizable extension can be separated from prose without
+// making the same assumption for ordinary multiword chat titles. Extensionless
+// paths are kept intact; the file index resolves a leading path prefix when
+// prose follows it, which also preserves spaces in directory/file names.
+const FILE_QUERY_RE = /^(.+?\.[A-Za-z0-9_-]+)(?:[ \t]+.*)?$/;
export function detectComposerTrigger(text: string, cursorPos: number): ComposerTrigger | null {
const cursor = Math.max(0, Math.min(Math.floor(cursorPos), text.length));
@@ -42,9 +43,9 @@ export function detectComposerTrigger(text: string, cursorPos: number): Composer
}
/**
- * Remove trailing prose from an @ file query while leaving chat-name queries
- * untouched. File selection still uses the raw trigger below, so the shared
- * label-narrowing helper preserves the prose in the replacement range.
+ * Remove trailing prose from an @ file query when a filename extension gives
+ * us an unambiguous boundary. Leave extensionless paths and chat-name queries
+ * intact; file quick-open handles a path prefix followed by prose.
*/
export function composerFileSearchQuery(query: string): string {
const trimmed = query.trim();
diff --git a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
index 8d982d752..c9c5de7dd 100644
--- a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
+++ b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
@@ -163,7 +163,7 @@ enum WorkComposerTriggerDetector {
private static let slashRegex = try! NSRegularExpression(pattern: "(?:^|\\s)/([^\\s/]*)$")
private static let atRegex = try! NSRegularExpression(pattern: "(?:^|[ \\t\\r\\n])@([^@\\r\\n]*)$")
private static let fileQueryRegex = try! NSRegularExpression(
- pattern: "^((?:.+?\\.[A-Za-z0-9_-]+)|(?:\\S+[\\\\/]\\S+))(?:[ \\t]+.*)?$"
+ pattern: "^(.+?\\.[A-Za-z0-9_-]+)(?:[ \\t]+.*)?$"
)
static func detect(in text: NSString, cursor: Int) -> WorkComposerTriggerMatch? {
diff --git a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
index b58363cd6..50237df22 100644
--- a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
+++ b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
@@ -105,6 +105,10 @@ final class WorkComposerTriggerDetectorTests: XCTestCase {
WorkComposerTriggerDetector.fileSearchQuery(for: "src/my file.ts about this"),
"src/my file.ts"
)
+ XCTAssertEqual(
+ WorkComposerTriggerDetector.fileSearchQuery(for: "src/my folder about this"),
+ "src/my folder about this"
+ )
XCTAssertEqual(
WorkComposerTriggerDetector.fileSearchQuery(for: "a b c"),
"a b c"
From 1e4610c48fdd4f0cda2d5c9c117856ae1521ba0b Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Mon, 10 Aug 2026 05:28:02 -0400
Subject: [PATCH 06/17] =?UTF-8?q?ship:=20iteration=205=20=E2=80=94=20isola?=
=?UTF-8?q?te=20portal=20row=20events?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/lanes/LanePrHoverCard.tsx | 5 +++++
.../components/terminals/LanePrBadge.test.tsx | 21 +++++++++++++++++++
2 files changed, 26 insertions(+)
diff --git a/apps/desktop/src/renderer/components/lanes/LanePrHoverCard.tsx b/apps/desktop/src/renderer/components/lanes/LanePrHoverCard.tsx
index 34bd49032..991b1110a 100644
--- a/apps/desktop/src/renderer/components/lanes/LanePrHoverCard.tsx
+++ b/apps/desktop/src/renderer/components/lanes/LanePrHoverCard.tsx
@@ -161,6 +161,11 @@ export function LanePrHoverCard({
role="dialog"
aria-label={label}
data-testid="lane-pr-hover-card"
+ // React portals retain their logical parent event path. Keep clicks on
+ // panel chrome from selecting the enclosing lane/session row while
+ // allowing candidate-row handlers to run before this bubble listener.
+ onClick={(event) => event.stopPropagation()}
+ onMouseDown={(event) => event.stopPropagation()}
onMouseEnter={cancelClose}
onMouseLeave={scheduleClose}
onFocus={cancelClose}
diff --git a/apps/desktop/src/renderer/components/terminals/LanePrBadge.test.tsx b/apps/desktop/src/renderer/components/terminals/LanePrBadge.test.tsx
index 57ab8f014..78400f6e5 100644
--- a/apps/desktop/src/renderer/components/terminals/LanePrBadge.test.tsx
+++ b/apps/desktop/src/renderer/components/terminals/LanePrBadge.test.tsx
@@ -125,6 +125,27 @@ describe("LanePrBadge", () => {
expect(screen.getByTestId("lane-pr-hover-card")).toBe(hoverCard);
});
+ it("does not bubble portaled panel clicks into the enclosing row", () => {
+ const onRowClick = vi.fn();
+ const onRowMouseDown = vi.fn();
+ render(
+
+
+
,
+ );
+
+ const hoverCard = openLanePrHoverCard();
+ fireEvent.mouseDown(hoverCard);
+ fireEvent.click(hoverCard);
+
+ expect(onRowMouseDown).not.toHaveBeenCalled();
+ expect(onRowClick).not.toHaveBeenCalled();
+ });
+
it("moves focus into the multi-PR hover card from the trigger", async () => {
render(
Date: Mon, 10 Aug 2026 05:44:39 -0400
Subject: [PATCH 07/17] =?UTF-8?q?ship:=20iteration=206=20=E2=80=94=20prese?=
=?UTF-8?q?rve=20shorthand=20path=20prose?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../chat/AgentChatComposer.test.tsx | 22 +++++++
.../src/shared/composerTriggers.test.ts | 18 ++++++
apps/desktop/src/shared/composerTriggers.ts | 40 +++++++++----
.../Work/WorkComposerTypedTriggers.swift | 59 ++++++++++++-------
.../WorkComposerTriggerDetectorTests.swift | 19 ++++++
5 files changed, 127 insertions(+), 31 deletions(-)
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx b/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
index 1d7a94d95..779514b4e 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
@@ -701,6 +701,28 @@ describe("AgentChatComposer", () => {
expect(await screen.findByText("foo.ts")).toBeTruthy();
});
+ it("keeps trailing prose when selecting a shorthand file match", async () => {
+ const onSearchAttachments = vi.fn().mockResolvedValue([{ path: "src/foo.ts", type: "file" }]);
+ const props = buildComposerProps({
+ turnActive: false,
+ draft: "",
+ sessionId: "session-1",
+ onSearchAttachments,
+ });
+ const view = render();
+ const draft = "ask @foo.ts about this";
+
+ fireEvent.change(screen.getByRole("textbox"), {
+ target: { value: draft, selectionStart: draft.length },
+ });
+ view.rerender();
+
+ await waitFor(() => expect(onSearchAttachments).toHaveBeenCalledWith("foo.ts"));
+ fireEvent.click(await screen.findByText("foo.ts"));
+
+ expect(props.onDraftChange).toHaveBeenLastCalledWith("ask @src/foo.ts about this");
+ });
+
it("keeps an extensionless spaced file path intact before trailing prose", async () => {
const onSearchAttachments = vi.fn().mockResolvedValue([{ path: "src/my folder", type: "file" }]);
diff --git a/apps/desktop/src/shared/composerTriggers.test.ts b/apps/desktop/src/shared/composerTriggers.test.ts
index 2a0fa508a..6765bfbfc 100644
--- a/apps/desktop/src/shared/composerTriggers.test.ts
+++ b/apps/desktop/src/shared/composerTriggers.test.ts
@@ -117,6 +117,24 @@ describe("replaceComposerTriggerSpan", () => {
expect(composerTriggerForSelection(trigger, "other")).toEqual(trigger);
});
+ it("narrows shorthand file labels without consuming trailing prose", () => {
+ const text = "ask @foo.ts about this";
+ const trigger = detectComposerTrigger(text, text.length)!;
+ const selected = composerTriggerForSelection(trigger, "src/foo.ts");
+
+ expect(selected.query).toBe("foo.ts ");
+ expect(replaceComposerTriggerSpan(text, selected, "@src/foo.ts ").text).toBe("ask @src/foo.ts about this");
+ });
+
+ it("narrows a spaced extensionless basename without consuming trailing prose", () => {
+ const text = "ask @my folder about this";
+ const trigger = detectComposerTrigger(text, text.length)!;
+ const selected = composerTriggerForSelection(trigger, "src/my folder");
+
+ expect(selected.query).toBe("my folder ");
+ expect(replaceComposerTriggerSpan(text, selected, "@src/my folder ").text).toBe("ask @src/my folder about this");
+ });
+
it("replaces exactly the trigger span mid-sentence", () => {
const text = "fix @src/f then run /te tomorrow";
const trigger = { start: 20, query: "te" };
diff --git a/apps/desktop/src/shared/composerTriggers.ts b/apps/desktop/src/shared/composerTriggers.ts
index b0d83dc41..8f453d260 100644
--- a/apps/desktop/src/shared/composerTriggers.ts
+++ b/apps/desktop/src/shared/composerTriggers.ts
@@ -53,6 +53,11 @@ export function composerFileSearchQuery(query: string): string {
return FILE_QUERY_RE.exec(trimmed)?.[1] ?? trimmed;
}
+function composerPathBasename(pathValue: string): string {
+ const separator = Math.max(pathValue.lastIndexOf("/"), pathValue.lastIndexOf("\\"));
+ return separator >= 0 ? pathValue.slice(separator + 1) : pathValue;
+}
+
/**
* Narrow an @ trigger to the selected item's leading label when the user has
* continued typing prose after it. The menu can keep a prefix suggestion
@@ -67,18 +72,33 @@ export function composerTriggerForSelection(
const selectedLabel = label.trim();
if (trigger.type !== "at" || !selectedLabel) return trigger;
- const matchedPrefix = trigger.query.slice(0, selectedLabel.length);
- if (matchedPrefix.toLowerCase() !== selectedLabel.toLowerCase()) return trigger;
+ const candidateLabels = [selectedLabel];
+ const addCandidateLabel = (candidate: string) => {
+ if (!candidate || candidateLabels.some((existing) => existing.toLowerCase() === candidate.toLowerCase())) return;
+ candidateLabels.push(candidate);
+ };
+ // File suggestions can be selected from a basename or a shorter path
+ // suffix even though the row inserts the full path. Treat those as the
+ // selected prefix so prose after the shorthand remains outside the splice.
+ addCandidateLabel(composerPathBasename(selectedLabel));
+ const searchableQuery = composerFileSearchQuery(trigger.query);
+ if (searchableQuery !== trigger.query && selectedLabel.toLowerCase().endsWith(searchableQuery.toLowerCase())) {
+ addCandidateLabel(searchableQuery);
+ }
- const remainder = trigger.query.slice(selectedLabel.length);
- if (remainder.length > 0 && !/^[ \t]/.test(remainder)) {
- return trigger;
+ for (const candidateLabel of candidateLabels) {
+ const matchedPrefix = trigger.query.slice(0, candidateLabel.length);
+ if (matchedPrefix.toLowerCase() !== candidateLabel.toLowerCase()) continue;
+
+ const remainder = trigger.query.slice(candidateLabel.length);
+ if (remainder.length > 0 && !/^[ \t]/.test(remainder)) continue;
+ const separator = remainder.match(/^[ \t]*/)?.[0] ?? "";
+ return {
+ ...trigger,
+ query: `${matchedPrefix}${separator}`,
+ };
}
- const separator = remainder.match(/^[ \t]*/)?.[0] ?? "";
- return {
- ...trigger,
- query: `${matchedPrefix}${separator}`,
- };
+ return trigger;
}
/**
diff --git a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
index c9c5de7dd..6381d2fa2 100644
--- a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
+++ b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
@@ -226,28 +226,45 @@ enum WorkComposerTriggerDetector {
let label = rawLabel.trimmingCharacters(in: .whitespacesAndNewlines)
guard !label.isEmpty else { return match }
+ var candidateLabels = [label]
+ if let basename = label.split(whereSeparator: { $0 == "/" || $0 == "\\" }).last {
+ let basenameString = String(basename)
+ if !candidateLabels.contains(where: { $0.lowercased() == basenameString.lowercased() }) {
+ candidateLabels.append(basenameString)
+ }
+ }
+ let searchableQuery = fileSearchQuery(for: match.query)
+ if searchableQuery != match.query,
+ label.lowercased().hasSuffix(searchableQuery.lowercased()),
+ !candidateLabels.contains(where: { $0.lowercased() == searchableQuery.lowercased() }) {
+ candidateLabels.append(searchableQuery)
+ }
+
let query = match.query as NSString
- let labelLength = (label as NSString).length
- guard query.length >= labelLength else { return match }
- let prefix = query.substring(to: labelLength)
- guard prefix.lowercased() == label.lowercased() else { return match }
-
- let remainder = query.substring(from: labelLength) as NSString
- guard remainder.length == 0 || remainder.character(at: 0) == 0x20 || remainder.character(at: 0) == 0x09 else {
- return match
- }
- var separatorLength = 0
- while separatorLength < remainder.length {
- let character = remainder.character(at: separatorLength)
- guard character == 0x20 || character == 0x09 else { break }
- separatorLength += 1
- }
- let consumedQuery = query.substring(to: labelLength + separatorLength)
- return WorkComposerTriggerMatch(
- kind: match.kind,
- query: consumedQuery,
- range: NSRange(location: match.range.location, length: 1 + (consumedQuery as NSString).length)
- )
+ for candidateLabel in candidateLabels {
+ let labelLength = (candidateLabel as NSString).length
+ guard query.length >= labelLength else { continue }
+ let prefix = query.substring(to: labelLength)
+ guard prefix.lowercased() == candidateLabel.lowercased() else { continue }
+
+ let remainder = query.substring(from: labelLength) as NSString
+ guard remainder.length == 0 || remainder.character(at: 0) == 0x20 || remainder.character(at: 0) == 0x09 else {
+ continue
+ }
+ var separatorLength = 0
+ while separatorLength < remainder.length {
+ let character = remainder.character(at: separatorLength)
+ guard character == 0x20 || character == 0x09 else { break }
+ separatorLength += 1
+ }
+ let consumedQuery = query.substring(to: labelLength + separatorLength)
+ return WorkComposerTriggerMatch(
+ kind: match.kind,
+ query: consumedQuery,
+ range: NSRange(location: match.range.location, length: 1 + (consumedQuery as NSString).length)
+ )
+ }
+ return match
}
}
diff --git a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
index 50237df22..300a14502 100644
--- a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
+++ b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
@@ -96,6 +96,25 @@ final class WorkComposerTriggerDetectorTests: XCTestCase {
)
}
+ func testAtSelectionRangePreservesTrailingProseAfterShorthandFileQuery() {
+ let text = "ask @foo.swift about this"
+ let match = try! XCTUnwrap(detect(text))
+ let suggestion = WorkComposerSuggestion(
+ id: "file:src/foo.swift",
+ kind: .at,
+ title: "foo.swift",
+ subtitle: "src",
+ insertText: "@src/foo.swift"
+ )
+
+ let narrowed = WorkComposerTriggerDetector.matchForSelection(match, suggestion: suggestion)
+ XCTAssertEqual(narrowed.query, "foo.swift ")
+ XCTAssertEqual(
+ narrowed.range,
+ NSRange(location: 4, length: ("@foo.swift " as NSString).length)
+ )
+ }
+
func testFileSearchQueryPreservesPathBeforeTrailingProse() {
XCTAssertEqual(
WorkComposerTriggerDetector.fileSearchQuery(for: "src/foo.ts about this"),
From 48130cee002c9fbfead06743e3d9cd4f62472c60 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Mon, 10 Aug 2026 06:00:51 -0400
Subject: [PATCH 08/17] fix: close confirmed mention triggers
---
.../chat/AgentChatComposer.test.tsx | 42 +++++++++++++++++++
.../components/chat/AgentChatComposer.tsx | 10 ++++-
apps/desktop/src/shared/chatMentions.test.ts | 13 ++++++
apps/desktop/src/shared/chatMentions.ts | 37 ++++++++++------
.../src/shared/composerTriggers.test.ts | 21 ++++++++++
apps/desktop/src/shared/composerTriggers.ts | 39 +++++++++++++++++
6 files changed, 149 insertions(+), 13 deletions(-)
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx b/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
index 779514b4e..f532b6826 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
@@ -701,6 +701,26 @@ describe("AgentChatComposer", () => {
expect(await screen.findByText("foo.ts")).toBeTruthy();
});
+ it("does not reopen the file menu after a confirmed token and trailing prose", () => {
+ const onSearchAttachments = vi.fn().mockResolvedValue([{ path: "src/foo.ts", type: "file" }]);
+
+ renderComposer({
+ turnActive: false,
+ draft: "",
+ sessionId: "session-1",
+ attachments: [{ path: "src/foo.ts", type: "file" }],
+ onSearchAttachments,
+ });
+
+ const draft = "ask @src/foo.ts about this";
+ fireEvent.change(screen.getByRole("textbox"), {
+ target: { value: draft, selectionStart: draft.length },
+ });
+
+ expect(document.body.querySelector(".ade-chat-drawer-glass")).toBeNull();
+ expect(onSearchAttachments).not.toHaveBeenCalled();
+ });
+
it("keeps trailing prose when selecting a shorthand file match", async () => {
const onSearchAttachments = vi.fn().mockResolvedValue([{ path: "src/foo.ts", type: "file" }]);
const props = buildComposerProps({
@@ -742,6 +762,28 @@ describe("AgentChatComposer", () => {
expect(await screen.findByText("my folder")).toBeTruthy();
});
+ it("preserves trailing prose when selecting an extensionless path prefix", async () => {
+ const onSearchAttachments = vi.fn().mockResolvedValue([{ path: "src/my folder", type: "file" }]);
+ const props = buildComposerProps({
+ turnActive: false,
+ draft: "",
+ sessionId: "session-1",
+ onSearchAttachments,
+ });
+ const view = render();
+ const draft = "ask @src/my review this";
+
+ fireEvent.change(screen.getByRole("textbox"), {
+ target: { value: draft, selectionStart: draft.length },
+ });
+ view.rerender();
+
+ await waitFor(() => expect(onSearchAttachments).toHaveBeenCalledWith("src/my review this"));
+ fireEvent.click(await screen.findByText("my folder"));
+
+ expect(props.onDraftChange).toHaveBeenLastCalledWith("ask @src/my folder review this");
+ });
+
it("keeps spaced chat mentions searchable and displays the chat title in the chip", async () => {
const onSearchMentions = vi.fn().mockResolvedValue([{
kind: "chat" as const,
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx b/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
index ad9f7f88d..f78d0a55e 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
@@ -42,6 +42,7 @@ import type {
import { getModelById, modelSupportsFastMode, type ProviderFamily } from "../../../shared/modelRegistry";
import {
composerTriggerForSelection,
+ composerTriggerHasConfirmedPrefix,
composerTriggerSpansWholeDraft,
detectComposerTrigger,
findConfirmedComposerTokens,
@@ -2689,6 +2690,13 @@ export function AgentChatComposer({
setCommandMenuTrigger(null);
return;
}
+ if (composerTriggerHasConfirmedPrefix(node.value, trigger, {
+ isFile: (body) => attachedPaths.has(body),
+ isMention: isChatMentionTokenBody,
+ })) {
+ setCommandMenuTrigger(null);
+ return;
+ }
if (!openIfNew) {
setCommandMenuTrigger((current) => {
if (!current) return current;
@@ -2701,7 +2709,7 @@ export function AgentChatComposer({
setCommandMenuTrigger(trigger);
const anchor = getCommandMenuAnchor(node);
if (anchor) setCommandMenuAnchor(anchor);
- }, []);
+ }, [attachedPaths]);
const restoreTextareaCaret = useCallback((caret: number) => {
lastPlainSelectionRef.current = caret;
diff --git a/apps/desktop/src/shared/chatMentions.test.ts b/apps/desktop/src/shared/chatMentions.test.ts
index 7400ea69e..d90dd0765 100644
--- a/apps/desktop/src/shared/chatMentions.test.ts
+++ b/apps/desktop/src/shared/chatMentions.test.ts
@@ -270,6 +270,19 @@ describe("chat mention ranking", () => {
expect(ranked.map((r) => r.id)).toEqual(["short"]);
});
+ it("prefers the longest title prefix before recency", () => {
+ const ranked = rankChatMentionSuggestions(
+ [
+ { id: "short", title: "Foo", lastActivityAt: 900 },
+ { id: "long", title: "Foo Bar", lastActivityAt: 1 },
+ ],
+ "Foo Bar please",
+ 10,
+ );
+
+ expect(ranked.map((r) => r.id)).toEqual(["long", "short"]);
+ });
+
it("does not keep a subtitle-only prefix when prose follows it", () => {
const ranked = rankChatMentionSuggestions(
[{ id: "subtitle", title: "Unrelated", subtitle: "Primary · codex", lastActivityAt: 10 }],
diff --git a/apps/desktop/src/shared/chatMentions.ts b/apps/desktop/src/shared/chatMentions.ts
index 77eb7df79..79c0cc67f 100644
--- a/apps/desktop/src/shared/chatMentions.ts
+++ b/apps/desktop/src/shared/chatMentions.ts
@@ -244,21 +244,29 @@ export function carryChatMentionBlocks(source: string, target: string): string {
* `null` means "no match, drop the row". Mirrors the tiering the ⌘K palette
* uses: exact > prefix > substring > subsequence.
*/
+type ChatMentionMatch = {
+ score: number;
+ /** Length of a confirmed title prefix, used to prefer the longest label. */
+ titlePrefixLength: number;
+};
+
function scoreChatMentionMatch(
haystack: string,
loweredQuery: string,
allowTrailingProse = false,
-): number | null {
- if (!loweredQuery.length) return 0;
+): ChatMentionMatch | null {
+ if (!loweredQuery.length) return { score: 0, titlePrefixLength: 0 };
const target = haystack.toLowerCase();
- if (target === loweredQuery) return 0;
+ if (target === loweredQuery) return { score: 0, titlePrefixLength: 0 };
// Once a title is an exact prefix, keep it visible while the user continues
// ordinary prose after the mention. This is intentionally title-only: a
// subtitle prefix is not a confirmed label, so it must not widen the
// replacement span and consume the prose that follows it.
- if (allowTrailingProse && loweredQuery.startsWith(`${target} `)) return 1;
- if (target.startsWith(loweredQuery)) return 1;
- if (target.includes(loweredQuery)) return 2;
+ if (allowTrailingProse && loweredQuery.startsWith(`${target} `)) {
+ return { score: 1, titlePrefixLength: target.length };
+ }
+ if (target.startsWith(loweredQuery)) return { score: 1, titlePrefixLength: 0 };
+ if (target.includes(loweredQuery)) return { score: 2, titlePrefixLength: 0 };
// Subsequence fallback: every query char appears in order.
let cursor = 0;
for (const char of loweredQuery) {
@@ -266,7 +274,7 @@ function scoreChatMentionMatch(
if (found < 0) return null;
cursor = found + 1;
}
- return 3;
+ return { score: 3, titlePrefixLength: 0 };
}
/**
@@ -278,10 +286,10 @@ export function rankChatMentionSuggestions<
T extends { id: string; title: string; subtitle?: string; lastActivityAt?: number | null },
>(candidates: T[], query: string, limit: number): T[] {
const trimmed = query.trim().toLowerCase();
- const scored: Array<{ item: T; score: number }> = [];
+ const scored: Array<{ item: T; score: number; titlePrefixLength: number }> = [];
for (const item of candidates) {
if (!trimmed.length) {
- scored.push({ item, score: 0 });
+ scored.push({ item, score: 0, titlePrefixLength: 0 });
continue;
}
const titleScore = scoreChatMentionMatch(item.title, trimmed, true);
@@ -289,12 +297,17 @@ export function rankChatMentionSuggestions<
? scoreChatMentionMatch(item.subtitle, trimmed)
: null;
// A subtitle hit is always weaker than any title hit.
- const score = titleScore ?? (subtitleScore === null ? null : subtitleScore + 4);
- if (score === null) continue;
- scored.push({ item, score });
+ const match = titleScore ?? (subtitleScore === null
+ ? null
+ : { score: subtitleScore.score + 4, titlePrefixLength: 0 });
+ if (match === null) continue;
+ scored.push({ item, score: match.score, titlePrefixLength: match.titlePrefixLength });
}
scored.sort((a, b) => {
if (a.score !== b.score) return a.score - b.score;
+ if (a.titlePrefixLength !== b.titlePrefixLength) {
+ return b.titlePrefixLength - a.titlePrefixLength;
+ }
const aAt = a.item.lastActivityAt ?? 0;
const bAt = b.item.lastActivityAt ?? 0;
if (aAt !== bAt) return bAt - aAt;
diff --git a/apps/desktop/src/shared/composerTriggers.test.ts b/apps/desktop/src/shared/composerTriggers.test.ts
index 6765bfbfc..273a7e0c9 100644
--- a/apps/desktop/src/shared/composerTriggers.test.ts
+++ b/apps/desktop/src/shared/composerTriggers.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
import {
composerFileSearchQuery,
composerTriggerForSelection,
+ composerTriggerHasConfirmedPrefix,
composerTriggerSpansWholeDraft,
detectComposerTrigger,
findConfirmedComposerTokens,
@@ -135,6 +136,26 @@ describe("replaceComposerTriggerSpan", () => {
expect(replaceComposerTriggerSpan(text, selected, "@src/my folder ").text).toBe("ask @src/my folder about this");
});
+ it("preserves prose after an extensionless path-prefix match", () => {
+ const text = "ask @src/my review this";
+ const trigger = detectComposerTrigger(text, text.length)!;
+ const selected = composerTriggerForSelection(trigger, "src/my folder");
+
+ expect(selected.query).toBe("src/my ");
+ expect(replaceComposerTriggerSpan(text, selected, "@src/my folder ").text).toBe(
+ "ask @src/my folder review this",
+ );
+ });
+
+ it("recognizes a confirmed @ token as a terminated trigger", () => {
+ const text = "ask @src/foo.ts about this";
+ const trigger = detectComposerTrigger(text, text.length)!;
+ const confirm = { isFile: (body: string) => body === "src/foo.ts" };
+
+ expect(composerTriggerHasConfirmedPrefix(text, trigger, confirm)).toBe(true);
+ expect(composerTriggerHasConfirmedPrefix("ask @src/foo.ts", detectComposerTrigger("ask @src/foo.ts", 15)!, confirm)).toBe(false);
+ });
+
it("replaces exactly the trigger span mid-sentence", () => {
const text = "fix @src/f then run /te tomorrow";
const trigger = { start: 20, query: "te" };
diff --git a/apps/desktop/src/shared/composerTriggers.ts b/apps/desktop/src/shared/composerTriggers.ts
index 8f453d260..099f3eefe 100644
--- a/apps/desktop/src/shared/composerTriggers.ts
+++ b/apps/desktop/src/shared/composerTriggers.ts
@@ -58,6 +58,17 @@ function composerPathBasename(pathValue: string): string {
return separator >= 0 ? pathValue.slice(separator + 1) : pathValue;
}
+function composerPathPrefixForSelection(query: string, selectedLabel: string): string {
+ if (!/[\\/]/.test(selectedLabel)) return "";
+ const words = query.trim().split(/[ \t]+/).filter(Boolean);
+ for (let wordCount = words.length - 1; wordCount > 0; wordCount -= 1) {
+ const prefix = words.slice(0, wordCount).join(" ");
+ if (!/[\\/]/.test(prefix)) continue;
+ if (selectedLabel.toLowerCase().startsWith(prefix.toLowerCase())) return prefix;
+ }
+ return "";
+}
+
/**
* Narrow an @ trigger to the selected item's leading label when the user has
* continued typing prose after it. The menu can keep a prefix suggestion
@@ -85,6 +96,12 @@ export function composerTriggerForSelection(
if (searchableQuery !== trigger.query && selectedLabel.toLowerCase().endsWith(searchableQuery.toLowerCase())) {
addCandidateLabel(searchableQuery);
}
+ // Extensionless path searches accept the longest space-delimited prefix that
+ // exists in the index, so the selected canonical path may continue beyond
+ // what the user typed before adding prose (for example, `src/my review`
+ // selecting `src/my folder`). Preserve that accepted prefix as the splice
+ // boundary without applying this heuristic to ordinary chat titles.
+ addCandidateLabel(composerPathPrefixForSelection(trigger.query, selectedLabel));
for (const candidateLabel of candidateLabels) {
const matchedPrefix = trigger.query.slice(0, candidateLabel.length);
@@ -163,6 +180,28 @@ export function findConfirmedComposerTokens(
return tokens;
}
+/**
+ * True when an @ trigger begins with an already-confirmed file or mention
+ * token and the user has typed a separator after it. Confirmed tokens are
+ * complete attachments/pointers, not new searches, so the menu must stay
+ * closed while the user continues ordinary prose after them.
+ */
+export function composerTriggerHasConfirmedPrefix(
+ text: string,
+ trigger: Pick,
+ confirm: {
+ isFile: (body: string) => boolean;
+ isMention?: (body: string) => boolean;
+ },
+): boolean {
+ if (trigger.type !== "at") return false;
+ const end = Math.min(text.length, trigger.start + 1 + trigger.query.length);
+ const query = text.slice(trigger.start + 1, end);
+ const match = /^(\S+)[ \t]/.exec(query);
+ if (!match) return false;
+ return confirm.isFile(match[1]!) || confirm.isMention?.(match[1]!) === true;
+}
+
/** True when the trigger token is the only content in the draft. */
export function composerTriggerSpansWholeDraft(
text: string,
From 6ed00841303bcf3012e934e6add37f1e44b0f735 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Mon, 10 Aug 2026 06:21:23 -0400
Subject: [PATCH 09/17] fix: preserve iOS path-prefix prose
---
.../Work/WorkComposerTypedTriggers.swift | 21 +++++++++++++++++
.../WorkComposerTriggerDetectorTests.swift | 23 +++++++++++++++++++
2 files changed, 44 insertions(+)
diff --git a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
index 6381d2fa2..fa9b31513 100644
--- a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
+++ b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
@@ -211,6 +211,22 @@ enum WorkComposerTriggerDetector {
return nsQuery.substring(with: labelRange)
}
+ /// Keep extensionless path prefixes separate from prose when the selected
+ /// file's canonical path continues past the words typed before that prose.
+ /// Ordinary multiword chat titles intentionally do not use this heuristic.
+ static func pathPrefixForSelection(query: String, selectedLabel: String) -> String {
+ guard selectedLabel.contains(where: { $0 == "/" || $0 == "\\" }) else { return "" }
+ let words = query.split(whereSeparator: { $0 == " " || $0 == "\t" })
+ guard words.count > 1 else { return "" }
+
+ for wordCount in stride(from: words.count - 1, through: 1, by: -1) {
+ let prefix = words.prefix(wordCount).joined(separator: " ")
+ guard prefix.contains("/") || prefix.contains("\\") else { continue }
+ if selectedLabel.lowercased().hasPrefix(prefix.lowercased()) { return prefix }
+ }
+ return ""
+ }
+
/// Keep prose typed after a selected @ item outside the replacement range.
/// The trigger detector intentionally accepts spaces for multi-word names;
/// this second pass uses the selected row's label to distinguish that name
@@ -239,6 +255,11 @@ enum WorkComposerTriggerDetector {
!candidateLabels.contains(where: { $0.lowercased() == searchableQuery.lowercased() }) {
candidateLabels.append(searchableQuery)
}
+ let pathPrefix = pathPrefixForSelection(query: match.query, selectedLabel: label)
+ if !pathPrefix.isEmpty,
+ !candidateLabels.contains(where: { $0.lowercased() == pathPrefix.lowercased() }) {
+ candidateLabels.append(pathPrefix)
+ }
let query = match.query as NSString
for candidateLabel in candidateLabels {
diff --git a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
index 300a14502..4d28f725e 100644
--- a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
+++ b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
@@ -115,6 +115,29 @@ final class WorkComposerTriggerDetectorTests: XCTestCase {
)
}
+ func testAtSelectionRangePreservesTrailingProseAfterExtensionlessPathPrefix() {
+ let text = "ask @src/my review this"
+ let match = try! XCTUnwrap(detect(text))
+ let suggestion = WorkComposerSuggestion(
+ id: "file:src/my folder",
+ kind: .at,
+ title: "my folder",
+ subtitle: "src",
+ insertText: "@src/my folder"
+ )
+
+ let narrowed = WorkComposerTriggerDetector.matchForSelection(match, suggestion: suggestion)
+ XCTAssertEqual(narrowed.query, "src/my ")
+ XCTAssertEqual(
+ narrowed.range,
+ NSRange(location: 4, length: ("@src/my " as NSString).length)
+ )
+ XCTAssertEqual(
+ (text as NSString).replacingCharacters(in: narrowed.range, with: suggestion.insertText + " "),
+ "ask @src/my folder review this"
+ )
+ }
+
func testFileSearchQueryPreservesPathBeforeTrailingProse() {
XCTAssertEqual(
WorkComposerTriggerDetector.fileSearchQuery(for: "src/foo.ts about this"),
From 484b9622f7a036545594763991ab1936325731b7 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Mon, 10 Aug 2026 06:41:42 -0400
Subject: [PATCH 10/17] fix: finish spaced mention parity
---
.../tuiClient/__tests__/appPolling.test.tsx | 33 ++++++++++
apps/ade-cli/src/tuiClient/app.tsx | 17 ++++-
.../services/files/fileSearchIndexService.ts | 7 ++-
.../main/services/files/fileService.test.ts | 22 +++++++
.../src/shared/composerTriggers.test.ts | 12 ++++
apps/desktop/src/shared/composerTriggers.ts | 62 +++++++++++++++----
6 files changed, 137 insertions(+), 16 deletions(-)
diff --git a/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx b/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
index 5fc5055c0..75d770bc1 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
+++ b/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
@@ -561,6 +561,39 @@ describe("AdeCodeApp polling", () => {
await unmountApp(instance);
});
+
+ it("closes a confirmed spaced-file mention while typing trailing prose", async () => {
+ const actionMock = vi.fn(async (domain: string, action: string) => {
+ if (domain === "file" && action === "quickOpen") return [{ path: "src/my folder" }];
+ return [];
+ });
+ connection.action = actionMock as unknown as AdeCodeConnection["action"];
+
+ const instance = await renderApp();
+
+ await act(async () => {
+ instance.stdin.write("@src/my");
+ });
+ await flushInkFrame();
+ await act(async () => {
+ await vi.advanceTimersByTimeAsync(MENTION_REMOTE_DEBOUNCE_MS);
+ });
+ await flushAsyncEffects();
+
+ expect(actionMock.mock.calls.filter(([domain, action]) => domain === "file" && action === "quickOpen"))
+ .toHaveLength(1);
+
+ await act(async () => {
+ instance.stdin.write("\t");
+ await flushAsyncEffects();
+ instance.stdin.write(" review this");
+ });
+ await flushInkFrame();
+
+ expect(actionMock.mock.calls.filter(([domain, action]) => domain === "file" && action === "quickOpen"))
+ .toHaveLength(1);
+ await unmountApp(instance);
+ });
});
describe("TUI product analytics policy", () => {
diff --git a/apps/ade-cli/src/tuiClient/app.tsx b/apps/ade-cli/src/tuiClient/app.tsx
index 5f49c525b..82f3cdf71 100644
--- a/apps/ade-cli/src/tuiClient/app.tsx
+++ b/apps/ade-cli/src/tuiClient/app.tsx
@@ -17,12 +17,14 @@ import { getAgentSkillRootCandidates } from "../../../desktop/src/shared/agentSk
import {
composerFileSearchQuery,
composerTriggerForSelection,
+ composerTriggerHasConfirmedPrefix,
composerTriggerSpansWholeDraft,
detectComposerTrigger,
findConfirmedComposerTokens,
replaceComposerTriggerSpan,
type ComposerTokenRange,
} from "../../../desktop/src/shared/composerTriggers";
+import { isChatMentionTokenBody } from "../../../desktop/src/shared/chatMentions";
import { findSmartLinks } from "../../../desktop/src/shared/smartLinks";
import type {
AgentChatClaudePlugin,
@@ -4970,9 +4972,18 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
setSelectedDrawerChatAction(action);
applyDrawerChatSelection({ session: session ?? null, action });
}, [applyDrawerChatSelection, openDrawerSessions, selectActiveLaneId]);
- const activeComposerTrigger = useMemo(() => (
- activePane === "chat" ? detectComposerTrigger(prompt, promptCursor) : null
- ), [activePane, prompt, promptCursor]);
+ const activeComposerTrigger = useMemo(() => {
+ if (activePane !== "chat") return null;
+ const trigger = detectComposerTrigger(prompt, promptCursor);
+ if (!trigger) return null;
+ const confirmedFile = (body: string) => selectedMentions.some(
+ (mention) => mention.kind === "file" && mention.insertText === `@${body}`,
+ );
+ return composerTriggerHasConfirmedPrefix(prompt, trigger, {
+ isFile: confirmedFile,
+ isMention: isChatMentionTokenBody,
+ }) ? null : trigger;
+ }, [activePane, prompt, promptCursor, selectedMentions]);
const activeMentionRange = useMemo(() => (
activeComposerTrigger?.type === "at"
? { start: activeComposerTrigger.start, query: activeComposerTrigger.query }
diff --git a/apps/desktop/src/main/services/files/fileSearchIndexService.ts b/apps/desktop/src/main/services/files/fileSearchIndexService.ts
index bbac391ea..6cc675ddb 100644
--- a/apps/desktop/src/main/services/files/fileSearchIndexService.ts
+++ b/apps/desktop/src/main/services/files/fileSearchIndexService.ts
@@ -105,12 +105,15 @@ function scorePath(pathValue: string, query: string): number {
// space-delimited prefixes and keep the longest matching one. Restrict this
// fallback to path-like queries so ordinary multiword quick-open searches
// keep their existing whole-query semantics.
- if (!needle.includes("/") && !needle.includes("\\")) return -1;
+ const isRootLevelPath = !normalized.includes("/") && !normalized.includes("\\");
+ if (!needle.includes("/") && !needle.includes("\\") && !isRootLevelPath) return -1;
const words = needle.split(/[ \t]+/);
let best = -1;
for (let end = words.length - 1; end > 0; end -= 1) {
const prefix = words.slice(0, end).join(" ");
- const score = scorePathForNeedle(normalized, prefix);
+ const score = isRootLevelPath
+ ? (normalized.startsWith(prefix) ? 600 : -1)
+ : scorePathForNeedle(normalized, prefix);
if (score < 0) continue;
// Prefer a longer path prefix when multiple indexed paths share the same
// beginning. The tiny fractional tie-break preserves existing score tiers.
diff --git a/apps/desktop/src/main/services/files/fileService.test.ts b/apps/desktop/src/main/services/files/fileService.test.ts
index 8da0b3d22..7b153ec5d 100644
--- a/apps/desktop/src/main/services/files/fileService.test.ts
+++ b/apps/desktop/src/main/services/files/fileService.test.ts
@@ -562,6 +562,28 @@ describe("fileService", () => {
}
});
+ it("matches a root-level extensionless file before trailing prose", async () => {
+ const rootPath = fs.mkdtempSync(path.join(os.tmpdir(), "ade-file-service-root-spaced-prose-"));
+ const { execSync } = await import("node:child_process");
+ execSync("git init", { cwd: rootPath, stdio: "ignore" });
+ const laneService = createLaneServiceStub(rootPath);
+ const service = createFileService({ laneService });
+
+ try {
+ fs.writeFileSync(path.join(rootPath, "README"), "extensionless root file\n", "utf8");
+
+ const quickOpen = await service.quickOpen({
+ workspaceId: "workspace-1",
+ query: "README review this",
+ includeIgnored: true,
+ });
+
+ expect(quickOpen.map((item) => item.path)).toContain("README");
+ } finally {
+ removeTestTree(rootPath);
+ }
+ });
+
it("warms the quick open index for subsequent lookups", async () => {
const rootPath = fs.mkdtempSync(path.join(os.tmpdir(), "ade-file-service-warm-search-"));
const { execSync } = await import("node:child_process");
diff --git a/apps/desktop/src/shared/composerTriggers.test.ts b/apps/desktop/src/shared/composerTriggers.test.ts
index 273a7e0c9..79cee0bdb 100644
--- a/apps/desktop/src/shared/composerTriggers.test.ts
+++ b/apps/desktop/src/shared/composerTriggers.test.ts
@@ -156,6 +156,18 @@ describe("replaceComposerTriggerSpan", () => {
expect(composerTriggerHasConfirmedPrefix("ask @src/foo.ts", detectComposerTrigger("ask @src/foo.ts", 15)!, confirm)).toBe(false);
});
+ it("recognizes a confirmed file token with spaces as terminated", () => {
+ const text = "ask @src/my folder about this";
+ const trigger = detectComposerTrigger(text, text.length)!;
+ const confirm = { isFile: (body: string) => body === "src/my folder" };
+
+ expect(composerTriggerHasConfirmedPrefix(text, trigger, confirm)).toBe(true);
+ expect(findConfirmedComposerTokens(text, {
+ ...confirm,
+ isCommand: () => false,
+ })).toEqual([{ start: 4, end: 18, kind: "file" }]);
+ });
+
it("replaces exactly the trigger span mid-sentence", () => {
const text = "fix @src/f then run /te tomorrow";
const trigger = { start: 20, query: "te" };
diff --git a/apps/desktop/src/shared/composerTriggers.ts b/apps/desktop/src/shared/composerTriggers.ts
index 099f3eefe..2539b19b2 100644
--- a/apps/desktop/src/shared/composerTriggers.ts
+++ b/apps/desktop/src/shared/composerTriggers.ts
@@ -145,7 +145,35 @@ export type ComposerTokenRange = {
kind: ComposerTokenKind;
};
-const CONFIRMED_TOKEN_RE = /(^|\s)([@/])(\S+)/g;
+const CONFIRMED_TRIGGER_RE = /(^|\s)([@/])/g;
+
+function plainComposerTokenEnd(text: string, start: number, limit: number): number | null {
+ let end = start;
+ while (end < limit && !/\s/.test(text[end]!)) end += 1;
+ return end > start ? end : null;
+}
+
+function confirmedFileTokenEnd(
+ text: string,
+ start: number,
+ limit: number,
+ isFile: (body: string) => boolean,
+): number | null {
+ let end = start;
+ let bestEnd: number | null = null;
+ while (end < limit) {
+ const character = text[end]!;
+ if (character === "@" || character === "\r" || character === "\n") break;
+ if (character === " " || character === "\t") {
+ if (isFile(text.slice(start, end))) bestEnd = end;
+ end += 1;
+ continue;
+ }
+ end += 1;
+ }
+ if (end === limit && end > start && isFile(text.slice(start, end))) bestEnd = end;
+ return bestEnd;
+}
/**
* Find the confirmed chip tokens in a draft: word-boundary `@body` / `/body`
@@ -169,13 +197,21 @@ export function findConfirmedComposerTokens(
): ComposerTokenRange[] {
if (!text) return [];
const tokens: ComposerTokenRange[] = [];
- for (const match of text.matchAll(CONFIRMED_TOKEN_RE)) {
+ for (const match of text.matchAll(CONFIRMED_TRIGGER_RE)) {
const start = (match.index ?? 0) + match[1]!.length;
- const body = match[3]!;
- const kind: ComposerTokenKind | null = match[2] === "@"
- ? (confirm.isMention?.(body) ? "mention" : confirm.isFile(body) ? "file" : null)
- : (confirm.isCommand(body) ? "command" : null);
- if (kind) tokens.push({ start, end: start + 1 + body.length, kind });
+ const bodyStart = start + 1;
+ const plainEnd = plainComposerTokenEnd(text, bodyStart, text.length);
+ const plainBody = plainEnd == null ? "" : text.slice(bodyStart, plainEnd);
+ if (match[2] === "@") {
+ if (plainBody && confirm.isMention?.(plainBody)) {
+ tokens.push({ start, end: plainEnd!, kind: "mention" });
+ continue;
+ }
+ const fileEnd = confirmedFileTokenEnd(text, bodyStart, text.length, confirm.isFile);
+ if (fileEnd != null) tokens.push({ start, end: fileEnd, kind: "file" });
+ } else if (plainBody && confirm.isCommand(plainBody)) {
+ tokens.push({ start, end: plainEnd!, kind: "command" });
+ }
}
return tokens;
}
@@ -196,10 +232,14 @@ export function composerTriggerHasConfirmedPrefix(
): boolean {
if (trigger.type !== "at") return false;
const end = Math.min(text.length, trigger.start + 1 + trigger.query.length);
- const query = text.slice(trigger.start + 1, end);
- const match = /^(\S+)[ \t]/.exec(query);
- if (!match) return false;
- return confirm.isFile(match[1]!) || confirm.isMention?.(match[1]!) === true;
+ const bodyStart = trigger.start + 1;
+ const plainEnd = plainComposerTokenEnd(text, bodyStart, end);
+ if (plainEnd != null && plainEnd < end) {
+ const body = text.slice(bodyStart, plainEnd);
+ if (confirm.isFile(body) || confirm.isMention?.(body) === true) return true;
+ }
+ const fileEnd = confirmedFileTokenEnd(text, bodyStart, end, confirm.isFile);
+ return fileEnd != null && fileEnd < end && /[ \t]/.test(text[fileEnd]!);
}
/** True when the trigger token is the only content in the draft. */
From 328240be64c120b023d849b1b2dfa95f1bf2b09b Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Mon, 10 Aug 2026 07:01:18 -0400
Subject: [PATCH 11/17] fix composer file boundaries and chip termination
---
.../main/services/files/fileService.test.ts | 8 ++--
.../components/chat/AgentChatComposer.tsx | 10 +++--
.../src/shared/composerTriggers.test.ts | 18 ++++++--
apps/desktop/src/shared/composerTriggers.ts | 19 ++++++--
.../Work/WorkComposerTypedTriggers.swift | 38 +++++++++++++---
.../WorkComposerTriggerDetectorTests.swift | 44 +++++++++++++++++++
6 files changed, 118 insertions(+), 19 deletions(-)
diff --git a/apps/desktop/src/main/services/files/fileService.test.ts b/apps/desktop/src/main/services/files/fileService.test.ts
index 7b153ec5d..99ba59d9a 100644
--- a/apps/desktop/src/main/services/files/fileService.test.ts
+++ b/apps/desktop/src/main/services/files/fileService.test.ts
@@ -562,7 +562,7 @@ describe("fileService", () => {
}
});
- it("matches a root-level extensionless file before trailing prose", async () => {
+ it("matches a root-level spaced extensionless file before trailing prose", async () => {
const rootPath = fs.mkdtempSync(path.join(os.tmpdir(), "ade-file-service-root-spaced-prose-"));
const { execSync } = await import("node:child_process");
execSync("git init", { cwd: rootPath, stdio: "ignore" });
@@ -570,15 +570,15 @@ describe("fileService", () => {
const service = createFileService({ laneService });
try {
- fs.writeFileSync(path.join(rootPath, "README"), "extensionless root file\n", "utf8");
+ fs.writeFileSync(path.join(rootPath, "my file"), "extensionless root file\n", "utf8");
const quickOpen = await service.quickOpen({
workspaceId: "workspace-1",
- query: "README review this",
+ query: "my review this",
includeIgnored: true,
});
- expect(quickOpen.map((item) => item.path)).toContain("README");
+ expect(quickOpen.map((item) => item.path)).toContain("my file");
} finally {
removeTestTree(rootPath);
}
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx b/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
index f78d0a55e..d17408779 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
@@ -2888,7 +2888,11 @@ export function AgentChatComposer({
const detectedContext = getRichTriggerContext();
if (!detectedContext) return false;
const trigger = "triggerLabel" in insertion
- ? composerTriggerForSelection(detectedContext.trigger, insertion.triggerLabel ?? "")
+ ? composerTriggerForSelection(
+ detectedContext.trigger,
+ insertion.triggerLabel ?? "",
+ insertion.chipKind === "file" ? "file" : "mention",
+ )
: detectedContext.trigger;
const context = trigger.query === detectedContext.trigger.query
? detectedContext
@@ -3996,7 +4000,7 @@ export function AgentChatComposer({
insertTextIntoRichEditor(`@${item.path} `);
}
} else {
- const trigger = composerTriggerForSelection(commandMenuTrigger, item.path);
+ const trigger = composerTriggerForSelection(commandMenuTrigger, item.path, "file");
const next = replaceComposerTriggerSpan(draft, trigger, `@${item.path} `);
onDraftChange(next.text);
restoreTextareaCaret(next.caret);
@@ -4018,7 +4022,7 @@ export function AgentChatComposer({
insertTextIntoRichEditor(`${token} `);
}
} else {
- const trigger = composerTriggerForSelection(commandMenuTrigger, item.mention.title);
+ const trigger = composerTriggerForSelection(commandMenuTrigger, item.mention.title, "mention");
const next = replaceComposerTriggerSpan(draft, trigger, `${token} `);
onDraftChange(next.text);
restoreTextareaCaret(next.caret);
diff --git a/apps/desktop/src/shared/composerTriggers.test.ts b/apps/desktop/src/shared/composerTriggers.test.ts
index 79cee0bdb..2ee10aee9 100644
--- a/apps/desktop/src/shared/composerTriggers.test.ts
+++ b/apps/desktop/src/shared/composerTriggers.test.ts
@@ -121,7 +121,7 @@ describe("replaceComposerTriggerSpan", () => {
it("narrows shorthand file labels without consuming trailing prose", () => {
const text = "ask @foo.ts about this";
const trigger = detectComposerTrigger(text, text.length)!;
- const selected = composerTriggerForSelection(trigger, "src/foo.ts");
+ const selected = composerTriggerForSelection(trigger, "src/foo.ts", "file");
expect(selected.query).toBe("foo.ts ");
expect(replaceComposerTriggerSpan(text, selected, "@src/foo.ts ").text).toBe("ask @src/foo.ts about this");
@@ -130,7 +130,7 @@ describe("replaceComposerTriggerSpan", () => {
it("narrows a spaced extensionless basename without consuming trailing prose", () => {
const text = "ask @my folder about this";
const trigger = detectComposerTrigger(text, text.length)!;
- const selected = composerTriggerForSelection(trigger, "src/my folder");
+ const selected = composerTriggerForSelection(trigger, "src/my folder", "file");
expect(selected.query).toBe("my folder ");
expect(replaceComposerTriggerSpan(text, selected, "@src/my folder ").text).toBe("ask @src/my folder about this");
@@ -139,7 +139,7 @@ describe("replaceComposerTriggerSpan", () => {
it("preserves prose after an extensionless path-prefix match", () => {
const text = "ask @src/my review this";
const trigger = detectComposerTrigger(text, text.length)!;
- const selected = composerTriggerForSelection(trigger, "src/my folder");
+ const selected = composerTriggerForSelection(trigger, "src/my folder", "file");
expect(selected.query).toBe("src/my ");
expect(replaceComposerTriggerSpan(text, selected, "@src/my folder ").text).toBe(
@@ -147,6 +147,18 @@ describe("replaceComposerTriggerSpan", () => {
);
});
+ it("narrows a root-level spaced file prefix without consuming trailing prose", () => {
+ const text = "ask @my review this";
+ const trigger = detectComposerTrigger(text, text.length)!;
+ const selected = composerTriggerForSelection(trigger, "my file", "file");
+
+ expect(selected.query).toBe("my ");
+ expect(replaceComposerTriggerSpan(text, selected, "@my file ").text).toBe(
+ "ask @my file review this",
+ );
+ expect(composerTriggerForSelection(trigger, "my file", "mention")).toEqual(trigger);
+ });
+
it("recognizes a confirmed @ token as a terminated trigger", () => {
const text = "ask @src/foo.ts about this";
const trigger = detectComposerTrigger(text, text.length)!;
diff --git a/apps/desktop/src/shared/composerTriggers.ts b/apps/desktop/src/shared/composerTriggers.ts
index 2539b19b2..a95538be9 100644
--- a/apps/desktop/src/shared/composerTriggers.ts
+++ b/apps/desktop/src/shared/composerTriggers.ts
@@ -13,6 +13,8 @@ export type ComposerTrigger = {
start: number;
};
+export type ComposerSelectionKind = "file" | "mention";
+
// Both triggers must sit at a word boundary (start of text or after
// whitespace) and their token must run to the cursor. The slash token is a
// command name only: no whitespace and no `/` inside, so paths like
@@ -58,12 +60,16 @@ function composerPathBasename(pathValue: string): string {
return separator >= 0 ? pathValue.slice(separator + 1) : pathValue;
}
-function composerPathPrefixForSelection(query: string, selectedLabel: string): string {
- if (!/[\\/]/.test(selectedLabel)) return "";
+function composerPathPrefixForSelection(
+ query: string,
+ selectedLabel: string,
+ allowRootLevelFile: boolean,
+): string {
+ if (!allowRootLevelFile && !/[\\/]/.test(selectedLabel)) return "";
const words = query.trim().split(/[ \t]+/).filter(Boolean);
for (let wordCount = words.length - 1; wordCount > 0; wordCount -= 1) {
const prefix = words.slice(0, wordCount).join(" ");
- if (!/[\\/]/.test(prefix)) continue;
+ if (!allowRootLevelFile && !/[\\/]/.test(prefix)) continue;
if (selectedLabel.toLowerCase().startsWith(prefix.toLowerCase())) return prefix;
}
return "";
@@ -79,6 +85,7 @@ function composerPathPrefixForSelection(query: string, selectedLabel: string): s
export function composerTriggerForSelection(
trigger: ComposerTrigger,
label: string,
+ selectionKind: ComposerSelectionKind = "mention",
): ComposerTrigger {
const selectedLabel = label.trim();
if (trigger.type !== "at" || !selectedLabel) return trigger;
@@ -101,7 +108,11 @@ export function composerTriggerForSelection(
// what the user typed before adding prose (for example, `src/my review`
// selecting `src/my folder`). Preserve that accepted prefix as the splice
// boundary without applying this heuristic to ordinary chat titles.
- addCandidateLabel(composerPathPrefixForSelection(trigger.query, selectedLabel));
+ addCandidateLabel(composerPathPrefixForSelection(
+ trigger.query,
+ selectedLabel,
+ selectionKind === "file",
+ ));
for (const candidateLabel of candidateLabels) {
const matchedPrefix = trigger.query.slice(0, candidateLabel.length);
diff --git a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
index fa9b31513..dfe3ea97f 100644
--- a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
+++ b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
@@ -213,20 +213,41 @@ enum WorkComposerTriggerDetector {
/// Keep extensionless path prefixes separate from prose when the selected
/// file's canonical path continues past the words typed before that prose.
- /// Ordinary multiword chat titles intentionally do not use this heuristic.
static func pathPrefixForSelection(query: String, selectedLabel: String) -> String {
- guard selectedLabel.contains(where: { $0 == "/" || $0 == "\\" }) else { return "" }
let words = query.split(whereSeparator: { $0 == " " || $0 == "\t" })
guard words.count > 1 else { return "" }
for wordCount in stride(from: words.count - 1, through: 1, by: -1) {
let prefix = words.prefix(wordCount).joined(separator: " ")
- guard prefix.contains("/") || prefix.contains("\\") else { continue }
if selectedLabel.lowercased().hasPrefix(prefix.lowercased()) { return prefix }
}
return ""
}
+ /// A committed @ chip is complete once the following character is whitespace.
+ /// The live detector still accepts spaces for multiword queries, so the chip
+ /// range must explicitly terminate that otherwise ambiguous trigger.
+ static func hasConfirmedChipPrefix(
+ _ match: WorkComposerTriggerMatch,
+ in text: NSString,
+ chipRanges: [NSRange]
+ ) -> Bool {
+ guard match.kind == .at else { return false }
+ let matchEnd = NSMaxRange(match.range)
+ for chipRange in chipRanges {
+ guard chipRange.location == match.range.location,
+ chipRange.location >= 0,
+ NSMaxRange(chipRange) <= matchEnd,
+ NSMaxRange(chipRange) < text.length,
+ text.character(at: chipRange.location) == 0x40 else { continue }
+ let following = text.character(at: NSMaxRange(chipRange))
+ if following == 0x20 || following == 0x09 || following == 0x0A || following == 0x0D {
+ return true
+ }
+ }
+ return false
+ }
+
/// Keep prose typed after a selected @ item outside the replacement range.
/// The trigger detector intentionally accepts spaces for multi-word names;
/// this second pass uses the selected row's label to distinguish that name
@@ -1276,8 +1297,15 @@ struct WorkComposerTextView: UIViewRepresentable {
in: textView.text as NSString,
cursor: selection.location
)
- applyPromptInputTraits(protectingTrigger: match != nil)
- parent.controller.update(match: match)
+ let resolvedMatch = match.flatMap { candidate in
+ WorkComposerTriggerDetector.hasConfirmedChipPrefix(
+ candidate,
+ in: textView.text as NSString,
+ chipRanges: chips.map { $0.range }
+ ) ? nil : candidate
+ }
+ applyPromptInputTraits(protectingTrigger: resolvedMatch != nil)
+ parent.controller.update(match: resolvedMatch)
}
func commit(_ suggestion: WorkComposerSuggestion, replacing range: NSRange) {
diff --git a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
index 4d28f725e..54379287d 100644
--- a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
+++ b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
@@ -138,6 +138,50 @@ final class WorkComposerTriggerDetectorTests: XCTestCase {
)
}
+ func testAtSelectionRangePreservesTrailingProseAfterRootLevelSpacedFilePrefix() {
+ let text = "ask @my review this"
+ let match = try! XCTUnwrap(detect(text))
+ let suggestion = WorkComposerSuggestion(
+ id: "file:my file",
+ kind: .at,
+ title: "my file",
+ subtitle: nil,
+ insertText: "@my file"
+ )
+
+ let narrowed = WorkComposerTriggerDetector.matchForSelection(match, suggestion: suggestion)
+ XCTAssertEqual(narrowed.query, "my ")
+ XCTAssertEqual(
+ narrowed.range,
+ NSRange(location: 4, length: ("@my " as NSString).length)
+ )
+ XCTAssertEqual(
+ (text as NSString).replacingCharacters(in: narrowed.range, with: suggestion.insertText + " "),
+ "ask @my file review this"
+ )
+ }
+
+ func testConfirmedFileChipTerminatesBeforeTrailingProse() {
+ let text = "ask @src/foo.swift about this" as NSString
+ let match = try! XCTUnwrap(detect(text as String))
+ let chipRange = NSRange(location: 4, length: ("@src/foo.swift" as NSString).length)
+
+ XCTAssertTrue(
+ WorkComposerTriggerDetector.hasConfirmedChipPrefix(
+ match,
+ in: text,
+ chipRanges: [chipRange]
+ )
+ )
+ XCTAssertFalse(
+ WorkComposerTriggerDetector.hasConfirmedChipPrefix(
+ try! XCTUnwrap(detect("ask @src/foo.swift")),
+ in: "ask @src/foo.swift" as NSString,
+ chipRanges: [chipRange]
+ )
+ )
+ }
+
func testFileSearchQueryPreservesPathBeforeTrailingProse() {
XCTAssertEqual(
WorkComposerTriggerDetector.fileSearchQuery(for: "src/foo.ts about this"),
From 3aa444f9ebc38da46a6340564ab5397494d61a44 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Mon, 10 Aug 2026 07:23:01 -0400
Subject: [PATCH 12/17] fix chat mention trailing prose review findings
---
.../tuiClient/__tests__/appPolling.test.tsx | 33 +++++++++++++++++++
apps/ade-cli/src/tuiClient/app.tsx | 4 ++-
.../services/files/fileSearchIndexService.ts | 19 +++++++----
.../main/services/files/fileService.test.ts | 33 ++++++++++++++++++-
.../src/main/services/files/fileService.ts | 1 +
.../chat/AgentChatComposer.test.tsx | 17 ++++++++++
.../components/chat/AgentChatComposer.tsx | 17 +++++++---
.../components/chat/AgentChatPane.tsx | 3 +-
apps/desktop/src/shared/types/files.ts | 2 ++
apps/desktop/src/shared/types/sync.ts | 2 +-
10 files changed, 115 insertions(+), 16 deletions(-)
diff --git a/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx b/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
index 75d770bc1..72902f9a7 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
+++ b/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
@@ -589,11 +589,44 @@ describe("AdeCodeApp polling", () => {
instance.stdin.write(" review this");
});
await flushInkFrame();
+ await act(async () => {
+ await vi.advanceTimersByTimeAsync(MENTION_REMOTE_DEBOUNCE_MS);
+ });
+ await flushAsyncEffects();
expect(actionMock.mock.calls.filter(([domain, action]) => domain === "file" && action === "quickOpen"))
.toHaveLength(1);
await unmountApp(instance);
});
+
+ it("keeps a commit suggestion available after trailing prose", async () => {
+ const actionMock = vi.fn(async (domain: string, action: string) => {
+ if (domain === "git" && action === "listRecentCommits") {
+ return [{ shortSha: "abc1234", subject: "Fix parser" }];
+ }
+ return [];
+ });
+ connection.action = actionMock as unknown as AdeCodeConnection["action"];
+
+ const instance = await renderApp();
+
+ await act(async () => {
+ instance.stdin.write("@Fix parser please inspect");
+ });
+ await flushInkFrame();
+ await act(async () => {
+ await vi.advanceTimersByTimeAsync(MENTION_REMOTE_DEBOUNCE_MS);
+ });
+ await flushAsyncEffects();
+
+ await act(async () => {
+ instance.stdin.write("\t");
+ });
+ await flushInkFrame();
+
+ expect(stripAnsi(instance.frames.join("\n"))).toContain("@commit:abc1234 please inspect");
+ await unmountApp(instance);
+ });
});
describe("TUI product analytics policy", () => {
diff --git a/apps/ade-cli/src/tuiClient/app.tsx b/apps/ade-cli/src/tuiClient/app.tsx
index 82f3cdf71..7109ccec6 100644
--- a/apps/ade-cli/src/tuiClient/app.tsx
+++ b/apps/ade-cli/src/tuiClient/app.tsx
@@ -7413,6 +7413,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
workspaceId: laneId,
query: fileQuery,
limit: MENTION_FILE_ROWS,
+ allowComposerPrefixFallback: true,
}))
.then((files) => {
const safeFiles = Array.isArray(files) ? files : [];
@@ -7453,7 +7454,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
.filter((commit) => {
const subject = String(commit.subject ?? commit.message ?? "");
const sha = String(commit.shortSha ?? commit.sha ?? "");
- return !query || subject.toLowerCase().includes(query) || sha.toLowerCase().includes(query);
+ return !query || matchesMentionTarget(subject.toLowerCase(), query) || sha.toLowerCase().includes(query);
})
.slice(0, 5)
.map((commit) => {
@@ -12354,6 +12355,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
const trigger = composerTriggerForSelection(
detectedTrigger,
suggestion.kind === "file" ? suggestion.filePath ?? suggestion.label : suggestion.label,
+ suggestion.kind === "file" ? "file" : "mention",
);
const next = replaceComposerTriggerSpan(prompt, trigger, `${suggestion.insertText} `);
setPromptValue(next.text, next.caret);
diff --git a/apps/desktop/src/main/services/files/fileSearchIndexService.ts b/apps/desktop/src/main/services/files/fileSearchIndexService.ts
index 6cc675ddb..a81a73975 100644
--- a/apps/desktop/src/main/services/files/fileSearchIndexService.ts
+++ b/apps/desktop/src/main/services/files/fileSearchIndexService.ts
@@ -92,19 +92,21 @@ function scorePathForNeedle(normalized: string, needle: string): number {
return idx < 0 ? -1 : 600 - idx;
}
-function scorePath(pathValue: string, query: string): number {
+function scorePath(pathValue: string, query: string, allowComposerPrefixFallback: boolean): number {
const normalized = pathValue.toLowerCase();
const needle = query.toLowerCase().trim();
if (!needle) return scoreBrowseDepth(normalized);
const directScore = scorePathForNeedle(normalized, needle);
if (directScore >= 0) return directScore;
+ if (!allowComposerPrefixFallback) return -1;
+
// Composer @-file queries can contain ordinary prose after an extensionless
// path whose filename or directory contains spaces. A path index cannot
// know that boundary from the string alone, so try progressively shorter
- // space-delimited prefixes and keep the longest matching one. Restrict this
- // fallback to path-like queries so ordinary multiword quick-open searches
- // keep their existing whole-query semantics.
+ // space-delimited prefixes and keep the longest matching one. This is kept
+ // behind an explicit composer-only mode so generic quick-open searches keep
+ // their whole-query semantics.
const isRootLevelPath = !normalized.includes("/") && !normalized.includes("\\");
if (!needle.includes("/") && !needle.includes("\\") && !isRootLevelPath) return -1;
const words = needle.split(/[ \t]+/);
@@ -248,7 +250,8 @@ export function createFileSearchIndexService() {
}
};
- const quickOpenCacheKey = (query: string, limit: number): string => `${query.toLowerCase().trim()}\0${limit}`;
+ const quickOpenCacheKey = (query: string, limit: number, allowComposerPrefixFallback: boolean): string =>
+ `${query.toLowerCase().trim()}\0${limit}\0${allowComposerPrefixFallback ? "composer" : "generic"}`;
const rememberQuickOpenCache = (index: WorkspaceIndex, cacheKey: string, items: FilesQuickOpenItem[]): void => {
if (index.quickOpenCache.has(cacheKey)) {
@@ -360,6 +363,7 @@ export function createFileSearchIndexService() {
query: string;
limit: number;
includeIgnored: boolean;
+ allowComposerPrefixFallback?: boolean;
shouldIgnore: (relPath: string, includeIgnored: boolean) => Promise;
primeIgnoreCache?: (relPaths: string[], includeIgnored: boolean) => Promise;
}): Promise {
@@ -369,13 +373,14 @@ export function createFileSearchIndexService() {
primeIgnoreCache: args.primeIgnoreCache
});
- const cacheKey = quickOpenCacheKey(args.query, args.limit);
+ const allowComposerPrefixFallback = Boolean(args.allowComposerPrefixFallback);
+ const cacheKey = quickOpenCacheKey(args.query, args.limit, allowComposerPrefixFallback);
const cached = index.quickOpenCache.get(cacheKey);
if (cached) return cloneQuickOpenItems(cached);
const scored: FilesQuickOpenItem[] = [];
for (const entry of index.files.values()) {
- const score = scorePath(entry.lowerPath, args.query);
+ const score = scorePath(entry.lowerPath, args.query, allowComposerPrefixFallback);
if (score < 0) continue;
scored.push({ path: entry.path, score });
}
diff --git a/apps/desktop/src/main/services/files/fileService.test.ts b/apps/desktop/src/main/services/files/fileService.test.ts
index 99ba59d9a..f0cfb523b 100644
--- a/apps/desktop/src/main/services/files/fileService.test.ts
+++ b/apps/desktop/src/main/services/files/fileService.test.ts
@@ -554,6 +554,7 @@ describe("fileService", () => {
workspaceId: "workspace-1",
query: "src/my folder about this",
includeIgnored: true,
+ allowComposerPrefixFallback: true,
});
expect(quickOpen.map((item) => item.path)).toContain("src/my folder");
@@ -574,8 +575,9 @@ describe("fileService", () => {
const quickOpen = await service.quickOpen({
workspaceId: "workspace-1",
- query: "my review this",
+ query: "my file review this",
includeIgnored: true,
+ allowComposerPrefixFallback: true,
});
expect(quickOpen.map((item) => item.path)).toContain("my file");
@@ -584,6 +586,35 @@ describe("fileService", () => {
}
});
+ it("keeps composer prefix fallback out of generic quickOpen", async () => {
+ const rootPath = fs.mkdtempSync(path.join(os.tmpdir(), "ade-file-service-generic-prefix-"));
+ const { execSync } = await import("node:child_process");
+ execSync("git init", { cwd: rootPath, stdio: "ignore" });
+ const laneService = createLaneServiceStub(rootPath);
+ const service = createFileService({ laneService });
+
+ try {
+ fs.writeFileSync(path.join(rootPath, "package.json"), "{}\n", "utf8");
+
+ const generic = await service.quickOpen({
+ workspaceId: "workspace-1",
+ query: "package manager",
+ includeIgnored: true,
+ });
+ const composer = await service.quickOpen({
+ workspaceId: "workspace-1",
+ query: "package manager",
+ includeIgnored: true,
+ allowComposerPrefixFallback: true,
+ });
+
+ expect(generic.map((item) => item.path)).not.toContain("package.json");
+ expect(composer.map((item) => item.path)).toContain("package.json");
+ } finally {
+ removeTestTree(rootPath);
+ }
+ });
+
it("warms the quick open index for subsequent lookups", async () => {
const rootPath = fs.mkdtempSync(path.join(os.tmpdir(), "ade-file-service-warm-search-"));
const { execSync } = await import("node:child_process");
diff --git a/apps/desktop/src/main/services/files/fileService.ts b/apps/desktop/src/main/services/files/fileService.ts
index c3aa954bf..0e9511c17 100644
--- a/apps/desktop/src/main/services/files/fileService.ts
+++ b/apps/desktop/src/main/services/files/fileService.ts
@@ -1461,6 +1461,7 @@ export function createFileService({
query,
limit,
includeIgnored: Boolean(args.includeIgnored),
+ allowComposerPrefixFallback: Boolean(args.allowComposerPrefixFallback),
shouldIgnore: shouldIgnoreForRoot(workspace.rootPath),
primeIgnoreCache: primeIgnoreCacheForRoot(workspace.rootPath)
});
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx b/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
index f532b6826..1e6dda513 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
@@ -856,6 +856,23 @@ describe("AgentChatComposer", () => {
expect(second.container.querySelector("[data-composer-chip='mention']")?.textContent).toBe("a b c");
});
+ it("falls back to the canonical mention token when a persisted rich mention label is cleared", () => {
+ const props = buildComposerProps({
+ turnActive: false,
+ draft: "@chat:chat-1 ",
+ mentionLabels: { "@chat:chat-1": "a b c" },
+ iosElementContextItems: [makeIosContextItem("ios-1")],
+ });
+ const view = render();
+ const chip = () => view.container.querySelector("[data-composer-chip='mention']");
+
+ expect(chip()?.textContent).toBe("a b c");
+ view.rerender();
+
+ expect(chip()?.textContent).toBe("@chat:chat-1");
+ expect(chip()?.title).toBe("@chat:chat-1");
+ });
+
it("does not consume prose after a matching spaced chat mention", async () => {
const onSearchMentions = vi.fn().mockResolvedValue([{
kind: "chat" as const,
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx b/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
index d17408779..bb49e689e 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
@@ -2752,16 +2752,23 @@ export function AgentChatComposer({
const hydrateMentionChipsInEditor = useCallback((): boolean => {
const editor = richEditorRef.current;
const labels = mentionLabelsRef.current;
- if (!editor || !labels.size) return false;
+ if (!editor) return false;
let changed = false;
editor.querySelectorAll("[data-composer-chip='mention']").forEach((chip) => {
const token = chip.dataset.composerChipText;
- const label = token ? labels.get(token)?.trim() : undefined;
- if (!token || !label) return;
+ if (!token) return;
+ const label = labels.get(token)?.trim() || token;
const labelNode = chip.firstElementChild;
- if (labelNode) labelNode.textContent = label;
- chip.title = `${label} — ${token}`;
+ if (labelNode && labelNode.textContent !== label) {
+ labelNode.textContent = label;
+ changed = true;
+ }
+ const title = label === token ? token : `${label} — ${token}`;
+ if (chip.title !== title) {
+ chip.title = title;
+ changed = true;
+ }
});
const walker = document.createTreeWalker(editor, NodeFilter.SHOW_TEXT, {
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatPane.tsx b/apps/desktop/src/renderer/components/chat/AgentChatPane.tsx
index 426cdec08..185fd2363 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatPane.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatPane.tsx
@@ -7657,7 +7657,8 @@ export function AgentChatPane({
const hits = await window.ade.files.quickOpen({
workspaceId: laneId,
query: trimmed,
- limit: 60
+ limit: 60,
+ allowComposerPrefixFallback: true,
}, pin);
return hits.map((hit) => ({
path: hit.path,
diff --git a/apps/desktop/src/shared/types/files.ts b/apps/desktop/src/shared/types/files.ts
index 467d8121c..c450afe49 100644
--- a/apps/desktop/src/shared/types/files.ts
+++ b/apps/desktop/src/shared/types/files.ts
@@ -246,6 +246,8 @@ export type FilesQuickOpenArgs = {
query: string;
limit?: number;
includeIgnored?: boolean;
+ /** Allow the composer-only path-prefix match for trailing prose. */
+ allowComposerPrefixFallback?: boolean;
};
export type FilesQuickOpenItem = {
diff --git a/apps/desktop/src/shared/types/sync.ts b/apps/desktop/src/shared/types/sync.ts
index 872dcb7a0..d218201c6 100644
--- a/apps/desktop/src/shared/types/sync.ts
+++ b/apps/desktop/src/shared/types/sync.ts
@@ -1336,7 +1336,7 @@ export type SyncFileRequest =
| { action: "deletePath"; args: { workspaceId: string; path: string } }
| { action: "watchChanges"; args: { workspaceId: string; includeIgnored?: boolean } }
| { action: "stopWatching"; args: { workspaceId: string; includeIgnored?: boolean } }
- | { action: "quickOpen"; args: { workspaceId: string; query: string; limit?: number; includeIgnored?: boolean } }
+ | { action: "quickOpen"; args: { workspaceId: string; query: string; limit?: number; includeIgnored?: boolean; allowComposerPrefixFallback?: boolean } }
| { action: "searchText"; args: { workspaceId: string; query: string; limit?: number; includeIgnored?: boolean } }
| { action: "readArtifact"; args: { artifactId?: string; uri?: string; path?: string } };
From 8a0a6e1ae0ff3a8f0c115d9d3f66f12d68d56a2b Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Mon, 10 Aug 2026 07:43:48 -0400
Subject: [PATCH 13/17] fix composer mention selection termination
---
.../tuiClient/__tests__/appPolling.test.tsx | 33 ++++++++++++++-
apps/ade-cli/src/tuiClient/app.tsx | 6 ++-
apps/ios/ADE/Services/SyncService.swift | 41 +++++++++++++++----
.../Work/WorkComposerTypedTriggers.swift | 3 +-
.../WorkComposerTriggerDetectorTests.swift | 20 +++++++++
5 files changed, 93 insertions(+), 10 deletions(-)
diff --git a/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx b/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
index 72902f9a7..320e89f44 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
+++ b/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
@@ -599,7 +599,7 @@ describe("AdeCodeApp polling", () => {
await unmountApp(instance);
});
- it("keeps a commit suggestion available after trailing prose", async () => {
+ it("closes a commit mention trigger after trailing prose", async () => {
const actionMock = vi.fn(async (domain: string, action: string) => {
if (domain === "git" && action === "listRecentCommits") {
return [{ shortSha: "abc1234", subject: "Fix parser" }];
@@ -625,6 +625,37 @@ describe("AdeCodeApp polling", () => {
await flushInkFrame();
expect(stripAnsi(instance.frames.join("\n"))).toContain("@commit:abc1234 please inspect");
+ expect(stripAnsi(instance.lastFrame() ?? "")).not.toContain("References ·");
+ await unmountApp(instance);
+ });
+
+ it("closes a PR mention trigger after trailing prose", async () => {
+ const actionMock = vi.fn(async (domain: string, action: string) => {
+ if (domain === "pr" && action === "listAll") {
+ return [{ id: "42", number: 42, title: "Fix parser" }];
+ }
+ return [];
+ });
+ connection.action = actionMock as unknown as AdeCodeConnection["action"];
+
+ const instance = await renderApp();
+
+ await act(async () => {
+ instance.stdin.write("@Fix parser please inspect");
+ });
+ await flushInkFrame();
+ await act(async () => {
+ await vi.advanceTimersByTimeAsync(MENTION_REMOTE_DEBOUNCE_MS);
+ });
+ await flushAsyncEffects();
+
+ await act(async () => {
+ instance.stdin.write("\t");
+ });
+ await flushInkFrame();
+
+ expect(stripAnsi(instance.frames.join("\n"))).toContain("@pr:42 please inspect");
+ expect(stripAnsi(instance.lastFrame() ?? "")).not.toContain("References ·");
await unmountApp(instance);
});
});
diff --git a/apps/ade-cli/src/tuiClient/app.tsx b/apps/ade-cli/src/tuiClient/app.tsx
index 7109ccec6..4caa20779 100644
--- a/apps/ade-cli/src/tuiClient/app.tsx
+++ b/apps/ade-cli/src/tuiClient/app.tsx
@@ -4979,9 +4979,13 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
const confirmedFile = (body: string) => selectedMentions.some(
(mention) => mention.kind === "file" && mention.insertText === `@${body}`,
);
+ const confirmedMention = (body: string) => isChatMentionTokenBody(body)
+ || selectedMentions.some(
+ (mention) => mention.kind !== "file" && mention.insertText === `@${body}`,
+ );
return composerTriggerHasConfirmedPrefix(prompt, trigger, {
isFile: confirmedFile,
- isMention: isChatMentionTokenBody,
+ isMention: confirmedMention,
}) ? null : trigger;
}, [activePane, prompt, promptCursor, selectedMentions]);
const activeMentionRange = useMemo(() => (
diff --git a/apps/ios/ADE/Services/SyncService.swift b/apps/ios/ADE/Services/SyncService.swift
index 7e5fcfe46..675dd5428 100644
--- a/apps/ios/ADE/Services/SyncService.swift
+++ b/apps/ios/ADE/Services/SyncService.swift
@@ -22,6 +22,28 @@ enum WidgetReloadBridge {
private let syncConnectLog = Logger(subsystem: "com.ade.sync", category: "connect")
private let syncChatLog = Logger(subsystem: "com.ade.ios", category: "WorkChatSync")
+/// Build the host request payload for file quick-open. The composer-only
+/// prefix fallback is intentionally omitted for generic Files searches so a
+/// multiword query keeps its normal exact-search semantics everywhere else.
+func syncQuickOpenRequestArgs(
+ workspaceId: String,
+ query: String,
+ limit: Int,
+ includeIgnored: Bool,
+ allowComposerPrefixFallback: Bool
+) -> [String: Any] {
+ var args: [String: Any] = [
+ "workspaceId": workspaceId,
+ "query": query,
+ "limit": limit,
+ "includeIgnored": includeIgnored,
+ ]
+ if allowComposerPrefixFallback {
+ args["allowComposerPrefixFallback"] = true
+ }
+ return args
+}
+
/// Transport-level attachment to a machine. There is deliberately no separate
/// "hydrating"/"syncing" state: attachment is a fact the moment `hello_ok` is
/// applied, and per-domain hydration progress is carried by `SyncDomainStatus`
@@ -9925,16 +9947,21 @@ final class SyncService: ObservableObject {
workspaceId: String,
query: String,
limit: Int = 30,
- includeIgnored: Bool = true
+ includeIgnored: Bool = true,
+ allowComposerPrefixFallback: Bool = false
) async throws -> [FilesQuickOpenItem] {
let boundedLimit = min(max(limit, 1), 1000)
return try decode(
- try await sendFileRequest(action: "quickOpen", args: [
- "workspaceId": workspaceId,
- "query": query,
- "limit": boundedLimit,
- "includeIgnored": includeIgnored,
- ]),
+ try await sendFileRequest(
+ action: "quickOpen",
+ args: syncQuickOpenRequestArgs(
+ workspaceId: workspaceId,
+ query: query,
+ limit: boundedLimit,
+ includeIgnored: includeIgnored,
+ allowComposerPrefixFallback: allowComposerPrefixFallback
+ )
+ ),
as: [FilesQuickOpenItem].self
)
}
diff --git a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
index dfe3ea97f..8fcd83749 100644
--- a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
+++ b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
@@ -533,7 +533,8 @@ final class WorkComposerSuggestionController: ObservableObject {
workspaceId: workspaceId,
query: query,
limit: 20,
- includeIgnored: true
+ includeIgnored: true,
+ allowComposerPrefixFallback: true
)
guard !Task.isCancelled, self.laneGeneration == generation else { return }
let mapped = items.map { item -> WorkComposerSuggestion in
diff --git a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
index 54379287d..fd8060efc 100644
--- a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
+++ b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
@@ -201,6 +201,26 @@ final class WorkComposerTriggerDetectorTests: XCTestCase {
)
}
+ func testComposerQuickOpenRequestEnablesPrefixFallbackWithoutChangingGenericSearch() {
+ let generic = syncQuickOpenRequestArgs(
+ workspaceId: "workspace-1",
+ query: "src/my folder review this",
+ limit: 20,
+ includeIgnored: true,
+ allowComposerPrefixFallback: false
+ )
+ XCTAssertNil(generic["allowComposerPrefixFallback"])
+
+ let composer = syncQuickOpenRequestArgs(
+ workspaceId: "workspace-1",
+ query: "src/my folder review this",
+ limit: 20,
+ includeIgnored: true,
+ allowComposerPrefixFallback: true
+ )
+ XCTAssertEqual(composer["allowComposerPrefixFallback"] as? Bool, true)
+ }
+
func testEmailDoesNotTrigger() {
// The `@` is glued to a preceding non-space char, so emails never trigger.
XCTAssertNil(detect("ping foo@bar"))
From c144a5e9492b505dd372c61ad24f384af211c37b Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Mon, 10 Aug 2026 07:51:46 -0400
Subject: [PATCH 14/17] rank overlapping mention suggestions
---
.../tuiClient/__tests__/appPolling.test.tsx | 15 +++++++-
apps/ade-cli/src/tuiClient/app.tsx | 34 +++++++++++++++++--
2 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx b/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
index 320e89f44..d356c14f3 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
+++ b/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
@@ -73,7 +73,8 @@ vi.mock("node:fs", async () => {
};
});
-import { AdeCodeApp, BACKGROUND_REFRESH_DEBOUNCE_MS, isLaneWorktreeAvailable, LANE_STATUS_REFRESH_MS, MENTION_REMOTE_DEBOUNCE_MS, shouldHydrateRefreshHistory } from "../app";
+import { AdeCodeApp, BACKGROUND_REFRESH_DEBOUNCE_MS, isLaneWorktreeAvailable, LANE_STATUS_REFRESH_MS, MENTION_REMOTE_DEBOUNCE_MS, rankMentionSuggestions, shouldHydrateRefreshHistory } from "../app";
+import type { MentionSuggestion } from "../types";
const reactActGlobal = globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean };
let previousReactActEnvironment: boolean | undefined;
@@ -268,6 +269,17 @@ describe("AdeCodeApp polling", () => {
vi.clearAllMocks();
});
+ it("ranks longer confirmed mention prefixes before shorter matches", () => {
+ const suggestions: MentionSuggestion[] = [
+ { kind: "lane", label: "Foo", insertText: "@lane:foo", detail: "foo" },
+ { kind: "commit", label: "Foo Bar", insertText: "@commit:abc1234", detail: "abc1234" },
+ { kind: "pr", label: "Foo Bar", insertText: "@pr:42", detail: "#42" },
+ ];
+
+ expect(rankMentionSuggestions(suggestions, "foo bar please").map((suggestion) => suggestion.insertText))
+ .toEqual(["@commit:abc1234", "@pr:42", "@lane:foo"]);
+ });
+
it("polls summary refreshes without hydrating chat history", async () => {
const instance = await renderApp();
@@ -607,6 +619,7 @@ describe("AdeCodeApp polling", () => {
return [];
});
connection.action = actionMock as unknown as AdeCodeConnection["action"];
+ mocks.listLanes.mockResolvedValue([lane({ name: "Fix" })]);
const instance = await renderApp();
diff --git a/apps/ade-cli/src/tuiClient/app.tsx b/apps/ade-cli/src/tuiClient/app.tsx
index 4caa20779..f5a662de0 100644
--- a/apps/ade-cli/src/tuiClient/app.tsx
+++ b/apps/ade-cli/src/tuiClient/app.tsx
@@ -2520,6 +2520,29 @@ function matchesMentionTarget(target: string, query: string): boolean {
return target.includes(query) || query.startsWith(`${target} `);
}
+/**
+ * Prefer the longest label that is a confirmed prefix of the query. This lets
+ * `@Foo Bar please` select `Foo Bar` before a shorter `Foo` lane while keeping
+ * the existing source order for unrelated or equally long matches.
+ */
+export function rankMentionSuggestions(
+ suggestions: MentionSuggestion[],
+ query: string,
+): MentionSuggestion[] {
+ const normalizedQuery = query.trim().toLowerCase();
+ if (!normalizedQuery) return suggestions;
+
+ return suggestions
+ .map((suggestion, index) => {
+ const label = suggestion.label.trim().toLowerCase();
+ const isConfirmedPrefix = label.length > 0
+ && (normalizedQuery === label || normalizedQuery.startsWith(`${label} `));
+ return { suggestion, index, prefixLength: isConfirmedPrefix ? label.length : 0 };
+ })
+ .sort((left, right) => right.prefixLength - left.prefixLength || left.index - right.index)
+ .map(({ suggestion }) => suggestion);
+}
+
type MentionRemoteCacheEntry = {
filesByQuery: Map>;
commits: Array> | null;
@@ -7393,11 +7416,16 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
if (cancelled) return;
const local = localSuggestions();
// On a bare `@` every lane and chat matches, so without a reservation the
- // row cap would drop the whole browse list of files. Only browse mode
- // trims locals; typed queries keep their existing ordering untouched.
+ // row cap would drop the whole browse list of files. Typed queries keep
+ // all local candidates long enough for prefix ranking to choose the most
+ // specific target before the row cap is applied.
const fileRows = query ? 0 : Math.min(remote.filter((s) => s.kind === "file").length, MENTION_FILE_ROWS);
const localBudget = Math.max(0, MENTION_MAX_ROWS - fileRows);
- const next = [...local.slice(0, localBudget), ...remote, ...attachedSuggestions()].slice(0, MENTION_MAX_ROWS);
+ const localCandidates = query ? local : local.slice(0, localBudget);
+ const next = rankMentionSuggestions(
+ [...localCandidates, ...remote, ...attachedSuggestions()],
+ query,
+ ).slice(0, MENTION_MAX_ROWS);
setMentionSuggestions(next);
setMentionIndex((index) => Math.min(index, Math.max(0, next.length - 1)));
};
From 337a5f302caa1ab9ac10c019a2779a94def01c1e Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Mon, 10 Aug 2026 08:07:43 -0400
Subject: [PATCH 15/17] support nested basename composer matches
---
.../services/files/fileSearchIndexService.ts | 1 -
.../main/services/files/fileService.test.ts | 24 +++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/apps/desktop/src/main/services/files/fileSearchIndexService.ts b/apps/desktop/src/main/services/files/fileSearchIndexService.ts
index a81a73975..f7464ee8c 100644
--- a/apps/desktop/src/main/services/files/fileSearchIndexService.ts
+++ b/apps/desktop/src/main/services/files/fileSearchIndexService.ts
@@ -108,7 +108,6 @@ function scorePath(pathValue: string, query: string, allowComposerPrefixFallback
// behind an explicit composer-only mode so generic quick-open searches keep
// their whole-query semantics.
const isRootLevelPath = !normalized.includes("/") && !normalized.includes("\\");
- if (!needle.includes("/") && !needle.includes("\\") && !isRootLevelPath) return -1;
const words = needle.split(/[ \t]+/);
let best = -1;
for (let end = words.length - 1; end > 0; end -= 1) {
diff --git a/apps/desktop/src/main/services/files/fileService.test.ts b/apps/desktop/src/main/services/files/fileService.test.ts
index f0cfb523b..1936d8f92 100644
--- a/apps/desktop/src/main/services/files/fileService.test.ts
+++ b/apps/desktop/src/main/services/files/fileService.test.ts
@@ -586,6 +586,30 @@ describe("fileService", () => {
}
});
+ it("matches a nested extensionless basename before trailing prose", async () => {
+ const rootPath = fs.mkdtempSync(path.join(os.tmpdir(), "ade-file-service-nested-basename-prose-"));
+ const { execSync } = await import("node:child_process");
+ execSync("git init", { cwd: rootPath, stdio: "ignore" });
+ const laneService = createLaneServiceStub(rootPath);
+ const service = createFileService({ laneService });
+
+ try {
+ fs.mkdirSync(path.join(rootPath, "docs"), { recursive: true });
+ fs.writeFileSync(path.join(rootPath, "docs", "README"), "nested extensionless file\n", "utf8");
+
+ const quickOpen = await service.quickOpen({
+ workspaceId: "workspace-1",
+ query: "README review this",
+ includeIgnored: true,
+ allowComposerPrefixFallback: true,
+ });
+
+ expect(quickOpen.map((item) => item.path)).toContain("docs/README");
+ } finally {
+ removeTestTree(rootPath);
+ }
+ });
+
it("keeps composer prefix fallback out of generic quickOpen", async () => {
const rootPath = fs.mkdtempSync(path.join(os.tmpdir(), "ade-file-service-generic-prefix-"));
const { execSync } = await import("node:child_process");
From ae5201d0a2c05a1ec53e773f3f656c204fe51fb6 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Mon, 10 Aug 2026 08:26:54 -0400
Subject: [PATCH 16/17] preserve prose for component file matches
---
.../src/shared/composerTriggers.test.ts | 22 +++++++++++
apps/desktop/src/shared/composerTriggers.ts | 16 +++++---
.../Work/WorkComposerTypedTriggers.swift | 11 +++++-
.../WorkComposerTriggerDetectorTests.swift | 38 +++++++++++++++++++
4 files changed, 81 insertions(+), 6 deletions(-)
diff --git a/apps/desktop/src/shared/composerTriggers.test.ts b/apps/desktop/src/shared/composerTriggers.test.ts
index 2ee10aee9..473b89006 100644
--- a/apps/desktop/src/shared/composerTriggers.test.ts
+++ b/apps/desktop/src/shared/composerTriggers.test.ts
@@ -159,6 +159,28 @@ describe("replaceComposerTriggerSpan", () => {
expect(composerTriggerForSelection(trigger, "my file", "mention")).toEqual(trigger);
});
+ it("preserves prose after an intermediate path-component match", () => {
+ const text = "ask @my review this";
+ const trigger = detectComposerTrigger(text, text.length)!;
+ const selected = composerTriggerForSelection(trigger, "src/my/file", "file");
+
+ expect(selected.query).toBe("my ");
+ expect(replaceComposerTriggerSpan(text, selected, "@src/my/file ").text).toBe(
+ "ask @src/my/file review this",
+ );
+ });
+
+ it("preserves prose after a nested basename prefix match", () => {
+ const text = "ask @my review this";
+ const trigger = detectComposerTrigger(text, text.length)!;
+ const selected = composerTriggerForSelection(trigger, "docs/my file", "file");
+
+ expect(selected.query).toBe("my ");
+ expect(replaceComposerTriggerSpan(text, selected, "@docs/my file ").text).toBe(
+ "ask @docs/my file review this",
+ );
+ });
+
it("recognizes a confirmed @ token as a terminated trigger", () => {
const text = "ask @src/foo.ts about this";
const trigger = detectComposerTrigger(text, text.length)!;
diff --git a/apps/desktop/src/shared/composerTriggers.ts b/apps/desktop/src/shared/composerTriggers.ts
index a95538be9..96736b309 100644
--- a/apps/desktop/src/shared/composerTriggers.ts
+++ b/apps/desktop/src/shared/composerTriggers.ts
@@ -65,12 +65,16 @@ function composerPathPrefixForSelection(
selectedLabel: string,
allowRootLevelFile: boolean,
): string {
- if (!allowRootLevelFile && !/[\\/]/.test(selectedLabel)) return "";
+ if (!allowRootLevelFile) return "";
+ const pathComponents = selectedLabel.split(/[\\/]/).filter(Boolean);
const words = query.trim().split(/[ \t]+/).filter(Boolean);
for (let wordCount = words.length - 1; wordCount > 0; wordCount -= 1) {
const prefix = words.slice(0, wordCount).join(" ");
- if (!allowRootLevelFile && !/[\\/]/.test(prefix)) continue;
- if (selectedLabel.toLowerCase().startsWith(prefix.toLowerCase())) return prefix;
+ const normalizedPrefix = prefix.toLowerCase();
+ const matchesPath = /[\\/]/.test(prefix)
+ ? selectedLabel.toLowerCase().startsWith(normalizedPrefix)
+ : pathComponents.some((component) => component.toLowerCase().startsWith(normalizedPrefix));
+ if (matchesPath) return prefix;
}
return "";
}
@@ -106,8 +110,10 @@ export function composerTriggerForSelection(
// Extensionless path searches accept the longest space-delimited prefix that
// exists in the index, so the selected canonical path may continue beyond
// what the user typed before adding prose (for example, `src/my review`
- // selecting `src/my folder`). Preserve that accepted prefix as the splice
- // boundary without applying this heuristic to ordinary chat titles.
+ // selecting `src/my folder`, or `my review` selecting `src/my/file`). Match
+ // against the full path for path-like prefixes and each component for
+ // basename/intermediate-component prefixes, without applying this heuristic
+ // to ordinary chat titles.
addCandidateLabel(composerPathPrefixForSelection(
trigger.query,
selectedLabel,
diff --git a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
index 8fcd83749..1476e4e75 100644
--- a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
+++ b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
@@ -216,10 +216,19 @@ enum WorkComposerTriggerDetector {
static func pathPrefixForSelection(query: String, selectedLabel: String) -> String {
let words = query.split(whereSeparator: { $0 == " " || $0 == "\t" })
guard words.count > 1 else { return "" }
+ let pathComponents = selectedLabel
+ .split(whereSeparator: { $0 == "/" || $0 == "\\" })
+ .map(String.init)
for wordCount in stride(from: words.count - 1, through: 1, by: -1) {
let prefix = words.prefix(wordCount).joined(separator: " ")
- if selectedLabel.lowercased().hasPrefix(prefix.lowercased()) { return prefix }
+ let matchesPath: Bool
+ if prefix.contains("/") || prefix.contains("\\") {
+ matchesPath = selectedLabel.lowercased().hasPrefix(prefix.lowercased())
+ } else {
+ matchesPath = pathComponents.contains { $0.lowercased().hasPrefix(prefix.lowercased()) }
+ }
+ if matchesPath { return prefix }
}
return ""
}
diff --git a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
index fd8060efc..e4d6b2c78 100644
--- a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
+++ b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
@@ -161,6 +161,44 @@ final class WorkComposerTriggerDetectorTests: XCTestCase {
)
}
+ func testAtSelectionRangePreservesTrailingProseAfterIntermediatePathComponent() {
+ let text = "ask @my review this"
+ let match = try! XCTUnwrap(detect(text))
+ let suggestion = WorkComposerSuggestion(
+ id: "file:src/my/file",
+ kind: .at,
+ title: "file",
+ subtitle: "src/my",
+ insertText: "@src/my/file"
+ )
+
+ let narrowed = WorkComposerTriggerDetector.matchForSelection(match, suggestion: suggestion)
+ XCTAssertEqual(narrowed.query, "my ")
+ XCTAssertEqual(
+ (text as NSString).replacingCharacters(in: narrowed.range, with: suggestion.insertText + " "),
+ "ask @src/my/file review this"
+ )
+ }
+
+ func testAtSelectionRangePreservesTrailingProseAfterNestedBasenamePrefix() {
+ let text = "ask @my review this"
+ let match = try! XCTUnwrap(detect(text))
+ let suggestion = WorkComposerSuggestion(
+ id: "file:docs/my file",
+ kind: .at,
+ title: "my file",
+ subtitle: "docs",
+ insertText: "@docs/my file"
+ )
+
+ let narrowed = WorkComposerTriggerDetector.matchForSelection(match, suggestion: suggestion)
+ XCTAssertEqual(narrowed.query, "my ")
+ XCTAssertEqual(
+ (text as NSString).replacingCharacters(in: narrowed.range, with: suggestion.insertText + " "),
+ "ask @docs/my file review this"
+ )
+ }
+
func testConfirmedFileChipTerminatesBeforeTrailingProse() {
let text = "ask @src/foo.swift about this" as NSString
let match = try! XCTUnwrap(detect(text as String))
From 61ce2735993b0e978cc733a426a3dcca878c6a07 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Mon, 10 Aug 2026 08:40:55 -0400
Subject: [PATCH 17/17] handle substring and at-sign file matches
---
.../src/shared/composerTriggers.test.ts | 20 +++++++++++++++++++
apps/desktop/src/shared/composerTriggers.ts | 6 +++---
.../Work/WorkComposerTypedTriggers.swift | 4 ++--
.../WorkComposerTriggerDetectorTests.swift | 19 ++++++++++++++++++
4 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/apps/desktop/src/shared/composerTriggers.test.ts b/apps/desktop/src/shared/composerTriggers.test.ts
index 473b89006..550554214 100644
--- a/apps/desktop/src/shared/composerTriggers.test.ts
+++ b/apps/desktop/src/shared/composerTriggers.test.ts
@@ -181,6 +181,17 @@ describe("replaceComposerTriggerSpan", () => {
);
});
+ it("preserves prose after a substring path-component match", () => {
+ const text = "ask @ead review this";
+ const trigger = detectComposerTrigger(text, text.length)!;
+ const selected = composerTriggerForSelection(trigger, "docs/README", "file");
+
+ expect(selected.query).toBe("ead ");
+ expect(replaceComposerTriggerSpan(text, selected, "@docs/README ").text).toBe(
+ "ask @docs/README review this",
+ );
+ });
+
it("recognizes a confirmed @ token as a terminated trigger", () => {
const text = "ask @src/foo.ts about this";
const trigger = detectComposerTrigger(text, text.length)!;
@@ -250,6 +261,15 @@ describe("findConfirmedComposerTokens", () => {
expect(findConfirmedComposerTokens("path/@src/foo.ts", confirm)).toEqual([]);
expect(findConfirmedComposerTokens("a/test", confirm)).toEqual([]);
});
+
+ it("finds confirmed files whose names contain an at sign", () => {
+ const token = "@assets/icon@2x.png";
+ const text = `fix ${token} then continue`;
+ expect(findConfirmedComposerTokens(text, {
+ isFile: (body: string) => body === "assets/icon@2x.png",
+ isCommand: () => false,
+ })).toEqual([{ start: 4, end: 4 + token.length, kind: "file" }]);
+ });
});
describe("composerTriggerSpansWholeDraft", () => {
diff --git a/apps/desktop/src/shared/composerTriggers.ts b/apps/desktop/src/shared/composerTriggers.ts
index 96736b309..010bf1ef8 100644
--- a/apps/desktop/src/shared/composerTriggers.ts
+++ b/apps/desktop/src/shared/composerTriggers.ts
@@ -72,8 +72,8 @@ function composerPathPrefixForSelection(
const prefix = words.slice(0, wordCount).join(" ");
const normalizedPrefix = prefix.toLowerCase();
const matchesPath = /[\\/]/.test(prefix)
- ? selectedLabel.toLowerCase().startsWith(normalizedPrefix)
- : pathComponents.some((component) => component.toLowerCase().startsWith(normalizedPrefix));
+ ? selectedLabel.toLowerCase().includes(normalizedPrefix)
+ : pathComponents.some((component) => component.toLowerCase().includes(normalizedPrefix));
if (matchesPath) return prefix;
}
return "";
@@ -180,7 +180,7 @@ function confirmedFileTokenEnd(
let bestEnd: number | null = null;
while (end < limit) {
const character = text[end]!;
- if (character === "@" || character === "\r" || character === "\n") break;
+ if (character === "\r" || character === "\n") break;
if (character === " " || character === "\t") {
if (isFile(text.slice(start, end))) bestEnd = end;
end += 1;
diff --git a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
index 1476e4e75..a4cc0d9ad 100644
--- a/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
+++ b/apps/ios/ADE/Views/Work/WorkComposerTypedTriggers.swift
@@ -224,9 +224,9 @@ enum WorkComposerTriggerDetector {
let prefix = words.prefix(wordCount).joined(separator: " ")
let matchesPath: Bool
if prefix.contains("/") || prefix.contains("\\") {
- matchesPath = selectedLabel.lowercased().hasPrefix(prefix.lowercased())
+ matchesPath = selectedLabel.lowercased().contains(prefix.lowercased())
} else {
- matchesPath = pathComponents.contains { $0.lowercased().hasPrefix(prefix.lowercased()) }
+ matchesPath = pathComponents.contains { $0.lowercased().contains(prefix.lowercased()) }
}
if matchesPath { return prefix }
}
diff --git a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
index e4d6b2c78..bea8bf4de 100644
--- a/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
+++ b/apps/ios/ADETests/WorkComposerTriggerDetectorTests.swift
@@ -199,6 +199,25 @@ final class WorkComposerTriggerDetectorTests: XCTestCase {
)
}
+ func testAtSelectionRangePreservesTrailingProseAfterSubstringPathComponent() {
+ let text = "ask @ead review this"
+ let match = try! XCTUnwrap(detect(text))
+ let suggestion = WorkComposerSuggestion(
+ id: "file:docs/README",
+ kind: .at,
+ title: "README",
+ subtitle: "docs",
+ insertText: "@docs/README"
+ )
+
+ let narrowed = WorkComposerTriggerDetector.matchForSelection(match, suggestion: suggestion)
+ XCTAssertEqual(narrowed.query, "ead ")
+ XCTAssertEqual(
+ (text as NSString).replacingCharacters(in: narrowed.range, with: suggestion.insertText + " "),
+ "ask @docs/README review this"
+ )
+ }
+
func testConfirmedFileChipTerminatesBeforeTrailingProse() {
let text = "ask @src/foo.swift about this" as NSString
let match = try! XCTUnwrap(detect(text as String))