@xh/hoist 83.1.0 → 84.0.1

package/icon/index.ts

@@ -70,6 +70,7 @@ import {
     faChevronRight as faChevronRightLight,
     faChevronUp as faChevronUpLight,
     faCircle as faCircleLight,
+    faCircleNotch as faCircleNotchLight,
     faClipboard as faClipboardLight,
     faClock as faClockLight,
     faCloudDownload as faCloudDownloadLight,
@@ -183,6 +184,8 @@ import {
     faSlidersHSquare as faSlidersHSquareLight,
     faSparkles as faSparklesLight,
     faSpinner as faSpinnerLight,
+    faSpinnerScale as faSpinnerScaleLight,
+    faSpinnerThird as faSpinnerThirdLight,
     faSquare as faSquareLight,
     faSquareMinus as faSquareMinusLight,
     faStar as faStarLight,
@@ -283,6 +286,7 @@ import {
     faChevronRight,
     faChevronUp,
     faCircle,
+    faCircleNotch,
     faClipboard,
     faClock,
     faCloudDownload,
@@ -395,6 +399,8 @@ import {
     faSlidersHSquare,
     faSparkles,
     faSpinner,
+    faSpinnerScale,
+    faSpinnerThird,
     faSquare,
     faSquareMinus,
     faStar,
@@ -496,6 +502,7 @@ import {
     faChevronRight as faChevronRightSolid,
     faChevronUp as faChevronUpSolid,
     faCircle as faCircleSolid,
+    faCircleNotch as faCircleNotchSolid,
     faClipboard as faClipboardSolid,
     faClock as faClockSolid,
     faCloudDownload as faCloudDownloadSolid,
@@ -609,6 +616,8 @@ import {
     faSlidersHSquare as faSlidersHSquareSolid,
     faSparkles as faSparklesSolid,
     faSpinner as faSpinnerSolid,
+    faSpinnerScale as faSpinnerScaleSolid,
+    faSpinnerThird as faSpinnerThirdSolid,
     faSquare as faSquareSolid,
     faSquareMinus as faSquareMinusSolid,
     faStar as faStarSolid,
@@ -710,6 +719,7 @@ import {
     faChevronRight as faChevronRightThin,
     faChevronUp as faChevronUpThin,
     faCircle as faCircleThin,
+    faCircleNotch as faCircleNotchThin,
     faClipboard as faClipboardThin,
     faClock as faClockThin,
     faCloudDownload as faCloudDownloadThin,
@@ -823,6 +833,8 @@ import {
     faSlidersHSquare as faSlidersHSquareThin,
     faSparkles as faSparklesThin,
     faSpinner as faSpinnerThin,
+    faSpinnerScale as faSpinnerScaleThin,
+    faSpinnerThird as faSpinnerThirdThin,
     faSquare as faSquareThin,
     faSquareMinus as faSquareMinusThin,
     faStar as faStarThin,
@@ -1104,6 +1116,10 @@ library.add(
     faCircleLight,
     faCircleSolid,
     faCircleThin,
+    faCircleNotch,
+    faCircleNotchLight,
+    faCircleNotchSolid,
+    faCircleNotchThin,
     faClipboard,
     faClipboardLight,
     faClipboardSolid,
@@ -1556,6 +1572,14 @@ library.add(
     faSpinnerLight,
     faSpinnerSolid,
     faSpinnerThin,
+    faSpinnerScale,
+    faSpinnerScaleLight,
+    faSpinnerScaleSolid,
+    faSpinnerScaleThin,
+    faSpinnerThird,
+    faSpinnerThirdLight,
+    faSpinnerThirdSolid,
+    faSpinnerThirdThin,
     faSquare,
     faSquareLight,
     faSquareSolid,

package/kit/README.md

@@ -177,8 +177,14 @@ import {button} from '@xh/hoist/desktop/cmp/button';
 import {button} from '@xh/hoist/kit/blueprint';
 ```
 
-The exception is if you need a Blueprint or other library component that Hoist does not wrap (e.g.
-`Tree`, `EditableText`).
+The notable exception is **Blueprint's `dialog`** — Hoist does not yet provide its own Dialog
+component wrapper ([#861](https://github.com/xh/hoist-react/issues/861)), so applications import
+`dialog` directly from `@xh/hoist/kit/blueprint` for custom modal dialogs. This is the
+established pattern used throughout the framework and applications. See the
+[Dialogs section](../desktop/README.md#dialogs) of the desktop README for usage guidance.
+
+Other Blueprint or library components that Hoist does not wrap (e.g. `Tree`, `EditableText`)
+can also be imported from Kit when needed.
 
 ## Common Pitfalls
 

package/kit/blueprint/Wrappers.ts

@@ -120,7 +120,6 @@ export const alert = elementFactory(Alert),
     button = elementFactory(Button),
     controlGroup = elementFactory(ControlGroup),
     checkbox = elementFactory(Checkbox),
-    dialog = elementFactory(Dialog),
     datePicker = elementFactory(DatePicker),
     menuDivider = elementFactory(MenuDivider),
     menuItem = elementFactory(MenuItem),
@@ -161,3 +160,15 @@ export const buttonGroup = elementFactory(ButtonGroup),
     tab = elementFactory(Tab),
     tag = elementFactory(Tag),
     text = elementFactory(Text);
+
+/**
+ * Blueprint Dialog wrapped with transitions disabled. This is the standard way to create
+ * custom modal dialogs in Hoist apps - import from `@xh/hoist/kit/blueprint` rather than
+ * from Blueprint directly.
+ *
+ * Pair with a HoistModel that manages an observable `isOpen` property. The parent component
+ * renders the dialog factory alongside its other children - it shows/hides based on `isOpen`.
+ *
+ * See the desktop package README (`desktop/README.md#dialogs`) for the full usage pattern.
+ */
+export const dialog = elementFactory(Dialog);

package/mcp/README.md

@@ -1,5 +1,17 @@
 # MCP Server and CLI Tools
 
+| Section | Description |
+|---------|-------------|
+| [Overview](#overview) | Purpose, audience, and design rationale |
+| [Architecture](#architecture) | Directory structure, data flow, and design decisions |
+| [CLI Tools](#cli-tools) | `hoist-docs` and `hoist-ts` shell commands |
+| [MCP Server Setup](#mcp-server-setup) | Prerequisites, startup methods, and debug logging |
+| [MCP Tools Reference](#mcp-tools-reference) | Documentation and TypeScript tool APIs |
+| [MCP Resources](#mcp-resources) | Direct URI-based access to documentation files |
+| [Maintaining the Developer Tools](#maintaining-the-developer-tools) | Registry sync, maintenance checklist, and update points |
+| [Extending the Developer Tools](#extending-the-developer-tools) | Adding new tools, resources, and doc registry entries |
+| [Common Pitfalls](#common-pitfalls) | Stdout corruption, path traversal, and naming conventions |
+
 ## Overview
 
 The Hoist developer tools give AI coding assistants structured access to hoist-react's documentation
@@ -169,14 +181,15 @@ Run `npx hoist-docs --help` for full usage.
 ### `hoist-ts` -- TypeScript Symbol Exploration
 
 ```bash
-# Search for symbols and class members by name
+# Search for symbols by name, keyword, or multi-word query
 npx hoist-ts search GridModel
 npx hoist-ts search lastLoadCompleted
 npx hoist-ts search Store --kind class
+npx hoist-ts search "panel modal"           # Matches name + JSDoc content
 
 # Get detailed type information for a symbol
 npx hoist-ts symbol GridModel
-npx hoist-ts symbol HoistModel
+npx hoist-ts symbol View --file data/cube/View.ts   # Disambiguate by file path
 
 # List all members of a class or interface
 npx hoist-ts members GridModel
@@ -293,13 +306,15 @@ Verify the MCP server is running and responsive. Takes no parameters.
 
 #### `hoist-search-symbols`
 
-Search for TypeScript classes, interfaces, types, and functions by name. Also searches public
-members (properties, methods, accessors) of key framework classes, returning results in two sections:
-matching symbols and matching members with their owning class and role description.
+Search for TypeScript classes, interfaces, types, and functions by name and JSDoc content.
+Multi-word queries split into tokens matched with AND logic against the combined symbol name +
+JSDoc text, so queries like `"panel modal"` find `ModalSupportModel` (which mentions Panel in
+its JSDoc). Results are ranked with name matches above JSDoc-only matches. Also searches public
+members (properties, methods, accessors) of key framework classes.
 
 | Parameter | Type | Required | Description |
 |-----------|------|----------|-------------|
-| `query` | string | Yes | Symbol or member name to search for (e.g. `"GridModel"`, `"lastLoadCompleted"`, `"setSortBy"`) |
+| `query` | string | Yes | Search query - a symbol name (e.g. `"GridModel"`), keyword (e.g. `"tooltip"`), or multiple terms (e.g. `"panel modal"`, `"cube view store"`) |
 | `kind` | enum | No | Filter symbols by kind: `class`, `interface`, `type`, `function`, `const`, `enum`. Does not affect member results. |
 | `exported` | boolean | No | Exported symbols only. Default: `true` |
 | `limit` | number | No | Max symbol results, 1-50. Default: 20. Member results have a separate cap of 15. |
@@ -328,6 +343,10 @@ For classes that use the config-object constructor pattern (e.g. `GridModel`, `F
 the output includes a `Constructor:` line showing the config type name. This gives agents a natural
 follow-up: call `hoist-get-members` on the config interface to see available options.
 
+When multiple exported symbols share the same name (e.g. `View` in both `cmp/viewmanager` and
+`data/cube`), the output appends a disambiguation note listing alternates with their file paths.
+Pass `filePath` to select a specific one. Dynamics stubs are excluded from the alternates list.
+
 | Parameter | Type | Required | Description |
 |-----------|------|----------|-------------|
 | `name` | string | Yes | Exact symbol name (e.g. `"GridModel"`) |
@@ -425,10 +444,12 @@ are needed.
 
 ### Doc Registry Entries
 
-**File:** `mcp/data/doc-registry.ts` (function `getRawEntries()`)
+**File:** `docs/doc-registry.json`
 
-The doc registry is the single source of truth for all documentation that both the MCP server and
-CLI tools can search and serve. Each entry specifies an `id`, `title`, `file` path, `category`,
+The doc registry is the single source of truth for all documentation that both the MCP server
+and CLI tools can search and serve. It is a JSON file loaded at startup by
+`mcp/data/doc-registry.ts`. Each entry in the `entries` array specifies an `id` (which doubles
+as the file path relative to repo root), `title`, `mcpCategory`, `viewerCategory`,
 `description`, and `keywords` array.
 
 **When to update:**
@@ -438,9 +459,9 @@ CLI tools can search and serve. Each entry specifies an `id`, `title`, `file` pa
 - A documentation file is removed
 - The description or key topics for a doc change significantly
 
-**How to update:** Add, modify, or remove the corresponding `RawEntry` object in the
-`getRawEntries()` function. The `file` path is relative to the repo root. The `keywords` string
-is comma-separated and split automatically.
+**How to update:** Add, modify, or remove the corresponding entry object in the `entries` array
+of `docs/doc-registry.json`. The `id` field is the file path relative to the repo root (e.g.
+`cmp/grid/README.md`). Keywords are a JSON array of strings.
 
 **Automated support:** The `xh-update-doc-links` Claude Code skill
 (`.claude/skills/xh-update-doc-links/`) includes a dedicated step that reconciles the doc registry
@@ -492,8 +513,8 @@ View, FormModel, BaseFieldModel, FieldModel, TabContainerModel
 
 | Change | Files to Update |
 |--------|----------------|
-| Add/rename/remove a documentation file | `mcp/data/doc-registry.ts`, `docs/README.md` |
-| Add upgrade notes for a new major version | `mcp/data/doc-registry.ts`, `docs/README.md` |
+| Add/rename/remove a documentation file | `docs/doc-registry.json`, `docs/README.md` |
+| Add upgrade notes for a new major version | `docs/doc-registry.json`, `docs/README.md` |
 | Add/rename/remove a top-level package | `mcp/data/ts-registry.ts` |
 | Add/rename/remove a member-indexed class | `mcp/data/ts-registry.ts` (constant `MEMBER_INDEXED_CLASSES`) |
 
@@ -561,22 +582,22 @@ server.registerResource(
 
 ### Adding a Doc Registry Entry
 
-Add a new `RawEntry` to the `getRawEntries()` function in `mcp/data/doc-registry.ts`:
+Add a new entry to the `entries` array in `docs/doc-registry.json`:
 
-```typescript
+```json
 {
-    id: 'my-package',
-    title: 'My Package',
-    file: 'my-package/README.md',        // Relative to repo root
-    category: 'package',
-    packageName: 'my-package',
-    description: 'What this package does.',
-    keywords: splitKeywords('keyword1, keyword2, keyword3')
-},
+    "id": "my-package/README.md",
+    "title": "My Package",
+    "mcpCategory": "package",
+    "viewerCategory": "components",
+    "description": "What this package does.",
+    "keywords": ["keyword1", "keyword2", "keyword3"]
+}
 ```
 
-**Categories:** `package` (package READMEs), `concept` (cross-cutting docs), `devops` (build/deploy
-docs), `conventions` (AGENTS.md), `index` (docs/README.md).
+**MCP categories:** `package`, `concept`, `devops`, `conventions`, `index`.
+**Viewer categories:** `overview`, `concepts`, `core`, `components`, `desktop`, `mobile`,
+`utilities`, `supporting`, `devops`, `upgrade`.
 
 ## Common Pitfalls
 

package/mcp/cli/ts.ts

@@ -11,7 +11,8 @@ import {
     searchMembers,
     getSymbolDetail,
     getMembers,
-    getCompanionSymbols
+    getCompanionSymbols,
+    findAlternateEntries
 } from '../data/ts-registry.js';
 import {formatSymbolSearch, formatSymbolDetail, formatMembers} from '../formatters/typescript.js';
 
@@ -44,6 +45,7 @@ Examples:
   hoist-ts search GridModel                     Search for symbols named GridModel
   hoist-ts search Store --kind class             Search only classes
   hoist-ts search lastLoadCompleted              Search symbols and class members
+  hoist-ts search "panel modal"                  Multi-word search (matches name + JSDoc)
   hoist-ts symbol GridModel                      Get full details for GridModel
   hoist-ts members GridModel                     List all GridModel properties and methods
   hoist-ts members Store                         List all Store members`
@@ -55,9 +57,12 @@ Examples:
 program
     .command('search')
     .description(
-        'Search for TypeScript symbols and class members by name. Searches both top-level symbols (classes, interfaces, types, functions) and public members of key framework classes.'
+        'Search for TypeScript symbols and class members by name and JSDoc content. Multi-word queries match all terms against names and documentation. Also searches public members of key framework classes.'
+    )
+    .argument(
+        '<query>',
+        'Search query — symbol name, keyword, or multiple terms (e.g. "panel modal")'
     )
-    .argument('<query>', 'Symbol or member name to search for')
     .option(
         '-k, --kind <kind>',
         'Filter symbols by kind: class, interface, type, function, const, enum'
@@ -113,6 +118,20 @@ program
             text +=
                 '\n\nTip: Use `hoist-ts members ' + name + '` to see all properties and methods.';
         }
+
+        if (!opts.file) {
+            const alternates = findAlternateEntries(name, detail.filePath);
+            if (alternates.length > 0) {
+                const altList = alternates
+                    .map(
+                        a =>
+                            `  - [${a.kind}] ${a.sourcePackage} (${a.filePath.replace(/.*\/hoist-react\//, '')})`
+                    )
+                    .join('\n');
+                text += `\n\nNote: ${alternates.length + 1} symbols named "${name}" exist. Use --file to disambiguate:\n${altList}`;
+            }
+        }
+
         process.stdout.write(text + '\n');
     });
 
@@ -132,7 +151,23 @@ program
             console.error(formatMembers(result, name));
             process.exit(1);
         }
-        process.stdout.write(formatMembers(result, name) + '\n');
+
+        let text = formatMembers(result, name);
+
+        if (!opts.file) {
+            const alternates = findAlternateEntries(name, result.symbol.filePath);
+            if (alternates.length > 0) {
+                const altList = alternates
+                    .map(
+                        a =>
+                            `  - [${a.kind}] ${a.sourcePackage} (${a.filePath.replace(/.*\/hoist-react\//, '')})`
+                    )
+                    .join('\n');
+                text += `\n\nNote: ${alternates.length + 1} symbols named "${name}" exist. Use --file to disambiguate:\n${altList}`;
+            }
+        }
+
+        process.stdout.write(text + '\n');
     });
 
 program.parseAsync();

package/mcp/data/ts-registry.ts

@@ -612,7 +612,10 @@ export async function ensureInitialized(): Promise<void> {
 /**
  * Search the symbol index by query string.
  *
- * Supports case-insensitive substring matching against symbol names.
+ * Supports case-insensitive matching against symbol names and JSDoc. Multi-word queries
+ * are split into tokens — all tokens must match (AND logic) against the combined name +
+ * JSDoc text. Results are scored: name matches rank above JSDoc-only matches.
+ *
  * Optionally filter by kind and/or export status.
  */
 export async function searchSymbols(
@@ -624,39 +627,51 @@ export async function searchSymbols(
     const queryLower = query.toLowerCase().trim();
     if (!queryLower) return [];
 
+    const tokens = queryLower.split(/\s+/);
     const limit = options?.limit ?? 50;
-    const results: SymbolEntry[] = [];
+    const scored: {entry: SymbolEntry; nameMatches: number}[] = [];
 
     for (const [key, entries] of symbolIndex!) {
-        if (!key.includes(queryLower)) continue;
-
         for (const entry of entries) {
             if (options?.kind && entry.kind !== options.kind) continue;
             if (options?.exported !== undefined && entry.isExported !== options.exported) continue;
-            results.push(entry);
+
+            const jsDocLower = entry.jsDoc?.toLowerCase() ?? '';
+            const searchable = key + ' ' + jsDocLower;
+
+            // All tokens must match somewhere in the combined name + JSDoc text.
+            if (!tokens.every(t => searchable.includes(t))) continue;
+
+            // Count how many tokens matched the name specifically (for ranking).
+            const nameMatches = tokens.filter(t => key.includes(t)).length;
+            scored.push({entry, nameMatches});
         }
     }
 
-    // Sort: exact matches first, then exported before non-exported, then alphabetically
-    results.sort((a, b) => {
-        const aExact = a.name.toLowerCase() === queryLower ? 0 : 1;
-        const bExact = b.name.toLowerCase() === queryLower ? 0 : 1;
+    // Sort: most name-token matches first, then exact name match, then exported, then alpha.
+    scored.sort((a, b) => {
+        // Prefer entries where more tokens matched the name itself
+        if (a.nameMatches !== b.nameMatches) return b.nameMatches - a.nameMatches;
+
+        const aExact = a.entry.name.toLowerCase() === queryLower ? 0 : 1;
+        const bExact = b.entry.name.toLowerCase() === queryLower ? 0 : 1;
         if (aExact !== bExact) return aExact - bExact;
 
-        const aExported = a.isExported ? 0 : 1;
-        const bExported = b.isExported ? 0 : 1;
+        const aExported = a.entry.isExported ? 0 : 1;
+        const bExported = b.entry.isExported ? 0 : 1;
         if (aExported !== bExported) return aExported - bExported;
 
-        return a.name.localeCompare(b.name);
+        return a.entry.name.localeCompare(b.entry.name);
     });
 
-    return results.slice(0, limit);
+    return scored.slice(0, limit).map(s => s.entry);
 }
 
 /**
  * Search the member index by query string.
  *
- * Supports case-insensitive substring matching against member names.
+ * Supports case-insensitive substring matching against member names. Multi-word queries
+ * are split into tokens — all tokens must appear in the member name (AND logic).
  * Only searches members of classes in MEMBER_INDEXED_CLASSES.
  */
 export async function searchMembers(
@@ -668,11 +683,12 @@ export async function searchMembers(
     const queryLower = query.toLowerCase().trim();
     if (!queryLower) return [];
 
+    const tokens = queryLower.split(/\s+/);
     const limit = options?.limit ?? 15;
     const results: MemberIndexEntry[] = [];
 
     for (const [key, entries] of memberIndex!) {
-        if (!key.includes(queryLower)) continue;
+        if (!tokens.every(t => key.includes(t))) continue;
         results.push(...entries);
     }
 
@@ -915,6 +931,24 @@ function extractInterfaceMembersWithInheritance(filePath: string, name: string):
     return allMembers;
 }
 
+/**
+ * Find other exported symbols with the same name as the given entry, excluding
+ * dynamics stubs. Used to surface disambiguation hints when multiple real symbols
+ * share a name (e.g. `View` in both `cmp/viewmanager` and `data/cube`).
+ */
+export function findAlternateEntries(name: string, selectedFilePath: string): SymbolEntry[] {
+    const key = name.toLowerCase();
+    const entries = symbolIndex!.get(key);
+    if (!entries) return [];
+    return entries.filter(
+        e =>
+            e.name === name &&
+            e.isExported &&
+            e.filePath !== selectedFilePath &&
+            !e.sourcePackage.startsWith('dynamics')
+    );
+}
+
 /**
  * Find a symbol in the index by exact name.
  * Prefers exported symbols when multiple matches exist and no filePath filter.
@@ -935,8 +969,14 @@ function findIndexEntry(name: string, filePath?: string): SymbolEntry | null {
         return exact.find(e => e.filePath === resolved) ?? null;
     }
 
-    // Prefer exported symbols
-    return exact.find(e => e.isExported) ?? exact[0];
+    // Prefer exported symbols, and among those prefer class/interface over const/type stubs
+    // (e.g. dynamics/desktop.ts re-exports `export let Foo = null` alongside the real class).
+    const exported = exact.filter(e => e.isExported);
+    if (exported.length > 1) {
+        const preferred = exported.find(e => e.kind === 'class' || e.kind === 'interface');
+        if (preferred) return preferred;
+    }
+    return exported[0] ?? exact[0];
 }
 
 /**

package/mcp/tools/typescript.ts

@@ -13,7 +13,8 @@ import {
     searchMembers,
     getSymbolDetail,
     getMembers,
-    getCompanionSymbols
+    getCompanionSymbols,
+    findAlternateEntries
 } from '../data/ts-registry.js';
 import {formatSymbolSearch, formatSymbolDetail, formatMembers} from '../formatters/typescript.js';
 
@@ -33,12 +34,12 @@ export function registerTsTools(server: McpServer): void {
         {
             title: 'Search Hoist TypeScript Symbols',
             description:
-                'Search for TypeScript classes, interfaces, types, and functions across the hoist-react framework by name. Also searches public members (properties, methods, accessors) of key framework classes like HoistModel, GridModel, Store, and others. Returns matching symbols and members with their kind, source, and context.',
+                'Search for TypeScript classes, interfaces, types, and functions across the hoist-react framework by name and JSDoc content. Multi-word queries match all terms (AND logic) against symbol names and their documentation — e.g. "panel modal" finds ModalSupportModel via its JSDoc. Also searches public members of key framework classes. Results are ranked: name matches above JSDoc-only matches.',
             inputSchema: z.object({
                 query: z
                     .string()
                     .describe(
-                        'Symbol or member name to search for (e.g. "GridModel", "Store", "lastLoadCompleted", "setSortBy")'
+                        'Search query — a symbol name (e.g. "GridModel"), a keyword (e.g. "tooltip"), or multiple terms (e.g. "panel modal", "cube view store")'
                     ),
                 kind: z
                     .enum(['class', 'interface', 'type', 'function', 'const', 'enum'])
@@ -113,6 +114,19 @@ export function registerTsTools(server: McpServer): void {
                 text += '\n\nUse hoist-get-members to see all properties and methods.';
             }
 
+            if (detail && !filePath) {
+                const alternates = findAlternateEntries(name, detail.filePath);
+                if (alternates.length > 0) {
+                    const altList = alternates
+                        .map(
+                            a =>
+                                `  - [${a.kind}] ${a.sourcePackage} (${a.filePath.replace(/.*\/hoist-react\//, '')})`
+                        )
+                        .join('\n');
+                    text += `\n\nNote: ${alternates.length + 1} symbols named "${name}" exist. Pass filePath to disambiguate:\n${altList}`;
+                }
+            }
+
             return {content: [{type: 'text' as const, text}]};
         }
     );
@@ -146,7 +160,21 @@ export function registerTsTools(server: McpServer): void {
         },
         async ({name, filePath}) => {
             const result = await getMembers(name, filePath);
-            const text = formatMembers(result, name);
+            let text = formatMembers(result, name);
+
+            if (result && !filePath) {
+                const alternates = findAlternateEntries(name, result.symbol.filePath);
+                if (alternates.length > 0) {
+                    const altList = alternates
+                        .map(
+                            a =>
+                                `  - [${a.kind}] ${a.sourcePackage} (${a.filePath.replace(/.*\/hoist-react\//, '')})`
+                        )
+                        .join('\n');
+                    text += `\n\nNote: ${alternates.length + 1} symbols named "${name}" exist. Pass filePath to disambiguate:\n${altList}`;
+                }
+            }
+
             return {content: [{type: 'text' as const, text}]};
         }
     );

package/mobile/appcontainer/AboutDialog.ts

@@ -28,12 +28,14 @@ export const aboutDialog = hoistCmp.factory({
             icon: Icon.info(),
             title: `About ${XH.appName}`,
             className: 'xh-about-dialog',
+            testId: 'xh-about-dialog',
             item: model.getTable(),
             isOpen: model.isOpen,
             bbar: [
                 button({
                     text: 'Send Client Health Report',
                     icon: Icon.health(),
+                    testId: 'xh-about-health-report-btn',
                     omit: !XH.clientHealthService.enabled,
                     onClick: async () => {
                         try {
@@ -51,6 +53,7 @@ export const aboutDialog = hoistCmp.factory({
                 button({
                     text: 'Close',
                     outlined: true,
+                    testId: 'xh-about-close-btn',
                     onClick: () => model.hide()
                 })
             ]

package/mobile/appcontainer/Banner.ts

@@ -61,6 +61,7 @@ const actionButton = hoistCmp.factory<BannerModel>(({model}) => {
     return button({
         className: 'xh-banner__action-button',
         outlined: true,
+        testId: `xh-banner-${model.category}-action-btn`,
         ...actionButtonProps
     });
 });
@@ -73,6 +74,7 @@ const dismissButton = hoistCmp.factory<BannerModel>(({model}) => {
         icon: Icon.close(),
         minimal: true,
         className: 'xh-banner__dismiss-button',
+        testId: `xh-banner-${category}-dismiss-btn`,
         onClick: () => {
             XH.hideBanner(category);
             if (isFunction(onClose)) onClose(model);

package/mobile/appcontainer/ExceptionDialog.ts

@@ -47,6 +47,7 @@ export const exceptionDialog = hoistCmp.factory({
                     button({
                         icon: Icon.search(),
                         text: 'Details',
+                        testId: 'xh-exception-details-btn',
                         onClick: () => model.openDetails(),
                         omit: !options.showAsError
                     }),
@@ -54,6 +55,7 @@ export const exceptionDialog = hoistCmp.factory({
                         omit: !identityService?.isImpersonating,
                         text: 'End Impers',
                         minimal: true,
+                        testId: 'xh-exception-end-impersonation-btn',
                         onClick: () => identityService.endImpersonateAsync()
                     }),
                     filler(),
@@ -74,10 +76,12 @@ export const dismissButton = hoistCmp.factory<ExceptionDialogModel>(({model}) =>
         ? button({
               icon: Icon.refresh(),
               text: 'Reload App',
+              testId: 'xh-exception-dismiss-btn',
               onClick: () => XH.reloadApp()
           })
         : button({
               text: 'Close',
+              testId: 'xh-exception-dismiss-btn',
               onClick: () => model.close()
           });
 });

package/mobile/appcontainer/ExceptionDialogDetails.ts

@@ -51,6 +51,7 @@ export const exceptionDialogDetails = hoistCmp.factory({
                 button({
                     icon: Icon.envelope(),
                     text: 'Send Message',
+                    testId: 'xh-exception-details-send-btn',
                     onClick: () => {
                         XH.prompt<string>({
                             title: 'Send Message',

package/mobile/appcontainer/FeedbackDialog.ts

@@ -31,13 +31,15 @@ export const feedbackDialog = hoistCmp.factory({
             content: textArea({
                 placeholder: 'Please enter your comments...',
                 bind: 'message',
-                height: 250
+                height: 250,
+                testId: 'xh-feedback-message'
             }),
             buttons: [
                 filler(),
                 button({
                     text: 'Cancel',
                     minimal: true,
+                    testId: 'xh-feedback-cancel-btn',
                     onClick: () => model.hide()
                 }),
                 button({
@@ -45,6 +47,7 @@ export const feedbackDialog = hoistCmp.factory({
                     icon: Icon.mail(),
                     intent: 'primary',
                     outlined: true,
+                    testId: 'xh-feedback-send-btn',
                     onClick: () => model.submitAsync()
                 })
             ]