orchid-ai 1.3.1 → 1.3.8

package/dist/cli/components/ChatPanel.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { type IconName } from './Icon';
-import { CommandTheme, ChatMessage, ModelInfo, ChatTheme, ServerConfig } from '../types/types';
+import { CommandTheme, CommandSuggestion, ChatMessage, ModelInfo, ChatTheme, ServerConfig } from '../types/types';
 interface ChatPanelProps {
     isOpen: boolean;
     setIsOpen?: (isOpen: boolean) => void;
@@ -53,6 +53,19 @@ interface ChatPanelProps {
     headerIcon?: IconName | React.ReactElement;
     headerTitle?: string;
     headerSubtitle?: string;
+    /** When set, replaces default behavior (setFormState + onNavigate + onClose) for command suggestions. */
+    onSuggestionSelect?: (s: CommandSuggestion) => void;
+    /**
+     * Applied to the full-screen modal root so the chat stacks above app chrome that uses high z-index
+     * (e.g. MUI AppBar ~1100, custom sidebars ~999). Default Tailwind z-50 is too low for many shells.
+     */
+    overlayZIndex?: number;
+    /**
+     * When true (default) and `showHistory` is on, only the chat history column is a narrow strip
+     * until hover (or tap) expands it; the main conversation area stays full width.
+     * Set to false to keep the history sidebar always fully expanded (~150px).
+     */
+    expandOnHover?: boolean;
 }
 /**
  * ChatPanel component
@@ -91,7 +104,7 @@ showHistory, // Default to hidden
 showProfileBubbles, // Default to hidden
 modalPosition, // Default to left position
 serverConfig, models, defaultModel, showUsageStats, maxFileSize, features, showFloatingButton, floatingButtonIcon, floatingButtonPosition, floatingButtonSize, floatingButtonClassName, chats, setChats, currentChatId, setCurrentChatId, chatLevel, initialQuery, setInitialQuery, headerIcon, // Default to bot icon
-headerTitle, headerSubtitle, }: ChatPanelProps): import("react/jsx-runtime").JSX.Element;
+headerTitle, headerSubtitle, onSuggestionSelect, overlayZIndex, expandOnHover, }: ChatPanelProps): import("react/jsx-runtime").JSX.Element;
 /**
  * ChatInput component
  * @param query - The current query
@@ -118,6 +131,7 @@ type FloatingChatButtonProps = {
     className?: string;
     position?: 'bottom-right' | 'bottom-left' | 'top-right' | 'top-left';
     size?: 'sm' | 'md' | 'lg';
+    zIndex?: number;
 };
 /**
  * FloatingChatButton component
@@ -128,5 +142,5 @@ type FloatingChatButtonProps = {
  * @param position - Position of the floating button
  * @param size - Size of the floating button
  */
-export declare function FloatingChatButton({ onClick, theme, icon, className, position, size, }: FloatingChatButtonProps): import("react/jsx-runtime").JSX.Element;
+export declare function FloatingChatButton({ onClick, theme, icon, className, position, size, zIndex: floatingZIndex, }: FloatingChatButtonProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/cli/components/Conversation.d.ts

@@ -61,6 +61,10 @@ interface ConversationProps {
     showClearChat?: boolean;
     onClearChat?: () => void;
     additionalContext?: string | Record<string, unknown>;
+    /** Optional ref to the main chat textarea (for parent focus control). */
+    chatInputRef?: React.RefObject<HTMLTextAreaElement | null>;
+    /** Increment to move focus to the main input (panel open, chat switch, new chat). */
+    focusChatNonce?: number;
 }
 /**
  * Conversation component - displays a single chat conversation
@@ -72,5 +76,5 @@ interface ConversationProps {
  * @param autoScroll - Whether to auto-scroll to bottom on new messages
  * @param maxHeight - Maximum height of the conversation container
  */
-export declare function Conversation({ chat: externalChat, onSuggestionClick, theme, showProfileBubbles, className, autoScroll, maxHeight, userId, serverConfig, formData, setFormState, onNavigate, chatLevel, chats: externalChats, setChats: externalSetChats, currentChatId: externalCurrentChatId, setCurrentChatId: externalSetCurrentChatId, query: externalQuery, setQuery: externalSetQuery, onSend: externalOnSend, isLoading: externalIsLoading, attachedFiles: externalAttachedFiles, setAttachedFiles: externalSetAttachedFiles, models, defaultModel, showUsageStats, maxFileSize, features, currentModelSelection: externalCurrentModelSelection, onModelSelectionChange: externalOnModelSelectionChange, showInput, initialQuery, setInitialQuery, showClearChat, onClearChat, additionalContext, }: ConversationProps): import("react/jsx-runtime").JSX.Element;
+export declare function Conversation({ chat: externalChat, onSuggestionClick, theme, showProfileBubbles, className, autoScroll, maxHeight, userId, serverConfig, formData, chatLevel, chats: externalChats, setChats: externalSetChats, currentChatId: externalCurrentChatId, setCurrentChatId: externalSetCurrentChatId, query: externalQuery, setQuery: externalSetQuery, onSend: externalOnSend, isLoading: externalIsLoading, attachedFiles: externalAttachedFiles, setAttachedFiles: externalSetAttachedFiles, models, defaultModel, showUsageStats, maxFileSize, features, currentModelSelection: externalCurrentModelSelection, onModelSelectionChange: externalOnModelSelectionChange, showInput, initialQuery, setInitialQuery, showClearChat, onClearChat, additionalContext, chatInputRef: externalChatInputRef, focusChatNonce, }: ConversationProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/cli/generate-schemas.js

@@ -10,6 +10,7 @@ const commandTrainingRules = {
     components: {
         patterns: {
             // React component patterns
+            // Has /g for matchAll in training.ts; do not use String.match(componentName) (groups break).
             componentName: /(?:export\s+)?(?:function|const)\s+(\w+)(?:\s*<[^>]*>)?\s*[=(]/g,
             props: /interface\s+(\w+)Props\s*{([^}]*)}/g,
             state: /useState<([^>]*)>/g,
@@ -34,7 +35,8 @@ const commandTrainingRules = {
     schemas: {
         patterns: {
             // Monastery schema patterns - updated for actual file format
-            modelName: /\/\/\s*(\w+)\s+model\s+for\s+monastery/g,
+            // No /g: training.ts uses String.match(); with g, capture groups are omitted and modelName is always lost.
+            modelName: /\/\/\s*(\w+)\s+model\s+for\s+monastery/,
             fields: /fields:\s*{([^}]*)}/g,
             fieldDefinitions: /(\w+):\s*{\s*(?:required:\s*(true|false),?\s*)?type:\s*['"]([^'"]+)['"](?:,\s*required:\s*(true|false))?(?:,\s*default:\s*[^,}]+)?/g,
             indexes: /indexes:\s*\[([^\]]*)\]/g,
@@ -557,6 +559,7 @@ class CommandTrainingCollector {
             if (content.formFields?.length > 0) {
                 const form = {
                     name: content.componentName || 'Unknown Form',
+                    sourceFile: path.relative(this.rootDir, component.filePath),
                     purpose: `Form component for data entry`,
                     fields: content.formFields.map((fieldName) => ({
                         name: fieldName,
@@ -685,12 +688,15 @@ class CommandTrainingCollector {
     guessEntityFromComponent(componentName) {
         if (!componentName)
             return 'Unknown';
-        // Simple heuristic: remove common suffixes
+        // Strip common create/edit wrappers, then UI suffixes (order matters)
         const cleaned = componentName
+            .replace(/^(?:Create|Edit|View|New|Batch)/i, '')
             .replace(/Form$/, '')
+            .replace(/Modal$/, '')
+            .replace(/Drawer$/, '')
+            .replace(/Dialog$/, '')
             .replace(/Page$/, '')
-            .replace(/Component$/, '')
-            .replace(/Modal$/, '');
+            .replace(/Component$/, '');
         return cleaned || 'Unknown';
     }
     guessEntitiesFromComponent(content) {
@@ -804,7 +810,7 @@ class CommandTrainingCollector {
                 this.log(`❌ Error expanding pattern "${pattern}":`, err.message);
             }
         }
-        return expandedPaths;
+        return [...new Set(expandedPaths)];
     }
     extractFileInfo(fieldName, content) {
         switch (fieldName) {
@@ -848,11 +854,22 @@ class CommandTrainingCollector {
             hooks: [],
             eventHandlers: [],
         };
-        // Extract component name
-        const componentMatch = content.match(patterns.componentName);
-        if (componentMatch) {
-            result.componentName = componentMatch[1];
-        }
+        // Do not use String.match() on patterns.componentName — it has /g, so match[1] is the *second*
+        // full match, not capture group 1 (yields strings like `const CustomerForm =`).
+        const declRe = /(?:export\s+)?(?:function|const)\s+(\w+)(?:\s*<[^>]*>)?\s*[=(]/g;
+        const declNames = [];
+        for (const m of content.matchAll(declRe)) {
+            declNames.push(m[1]);
+        }
+        const isLikelyComponentSymbol = (n) => /^[A-Z]/.test(n) &&
+            !/^use[A-Z]/.test(n) &&
+            !/^Styled/i.test(n);
+        const preferred = [...declNames].reverse().find((n) => isLikelyComponentSymbol(n) &&
+            (/(?:Form|Modal|Drawer|Dialog)$/.test(n) ||
+                /^FormStep/i.test(n) ||
+                (n.includes('Form') && n.length > 4)));
+        const fallback = [...declNames].reverse().find(isLikelyComponentSymbol);
+        result.componentName = preferred ?? fallback ?? null;
         // Extract props interfaces
         const propsMatches = content.matchAll(patterns.props);
         for (const match of propsMatches) {
@@ -887,6 +904,7 @@ class CommandTrainingCollector {
         for (const match of fieldMatches) {
             result.formFields.push(match[1]);
         }
+        result.formFields = [...new Set(result.formFields)];
         // Extract imports
         const importMatches = content.matchAll(patterns.imports);
         for (const match of importMatches) {
@@ -1635,6 +1653,7 @@ class SchemaGenerator extends CommandTrainingCollector {
             };
             this.log(`    ✅ Generated schema with ${Object.keys(properties).length} properties`);
         }
+        this.mergeFormUiFieldsIntoEntitySchemas(trainingData, schemas);
         // If no entities found, try to extract from components
         if (Object.keys(schemas).length === 0) {
             this.log('  ⚠️  No entities found in training data, extracting from components...');
@@ -1642,6 +1661,87 @@ class SchemaGenerator extends CommandTrainingCollector {
         }
         return schemas;
     }
+    /**
+     * Merge `name="..."` fields collected from UI forms/modals into existing entity schemas
+     * (server models stay canonical; this adds frontend surface hints).
+     * Optional `customTrainingData.options.formEntityHints`: map form component name -> schema entity key.
+     * Optional `formEntityPathPatterns`: `{ includes, entity }` — first match on `form.sourceFile` wins
+     * (disambiguates reused names like `FormStepDetails` in different feature folders).
+     */
+    mergeFormUiFieldsIntoEntitySchemas(trainingData, schemas) {
+        const forms = trainingData.customTrainingData?.structuredData?.components?.forms || [];
+        if (!forms.length || !Object.keys(schemas).length)
+            return;
+        const hints = (trainingData.customTrainingData?.options?.formEntityHints || {});
+        const pathPatterns = (trainingData.customTrainingData?.options?.formEntityPathPatterns ||
+            []);
+        /** Short UI stems that don't match lowered model names */
+        const STEM_ALIASES = {
+            hs: 'hsreport',
+            incident: 'incidentreport',
+        };
+        const schemaKeys = new Set(Object.keys(schemas));
+        const resolveKey = (form) => {
+            if (form.sourceFile) {
+                for (const p of pathPatterns) {
+                    if (!p?.includes || !p?.entity)
+                        continue;
+                    if (form.sourceFile.includes(p.includes)) {
+                        const k = p.entity.toLowerCase();
+                        if (schemaKeys.has(k))
+                            return k;
+                    }
+                }
+            }
+            const tryKey = (raw) => {
+                if (!raw)
+                    return undefined;
+                const mapped = hints[raw];
+                const stem = raw
+                    .replace(/^(?:Create|Edit|View|New|Batch)/i, '')
+                    .replace(/(?:Form|Modal|Drawer|Dialog)$/i, '');
+                const stemLc = stem.toLowerCase();
+                const alias = STEM_ALIASES[stemLc];
+                if (alias && schemaKeys.has(alias))
+                    return alias;
+                const candidates = [
+                    (mapped || raw).toLowerCase(),
+                    stemLc,
+                ];
+                for (const c of candidates) {
+                    if (c && schemaKeys.has(c))
+                        return c;
+                }
+                return undefined;
+            };
+            return tryKey(form.name) || tryKey(form.relatedEntity) || undefined;
+        };
+        let mergedForms = 0;
+        let mergedFields = 0;
+        for (const form of forms) {
+            const entityKey = resolveKey(form);
+            if (!entityKey)
+                continue;
+            const gen = schemas[entityKey];
+            if (!gen?.schema?.properties)
+                continue;
+            const props = gen.schema.properties;
+            for (const f of form.fields || []) {
+                const n = f?.name;
+                if (!n || typeof n !== 'string' || props[n])
+                    continue;
+                props[n] = {
+                    type: 'string',
+                    description: `UI form field (from ${form.name}). Cross-check server model; may overlap sharing/base shapes.`,
+                };
+                mergedFields += 1;
+            }
+            mergedForms += 1;
+        }
+        if (mergedForms > 0) {
+            this.log(`\n📎 Merged UI form fields into ${mergedForms} entity schema(s) (+${mergedFields} properties)`);
+        }
+    }
     /**
      * Extract schemas from component analysis if no explicit entities found
      */
@@ -1955,6 +2055,9 @@ class SchemaGenerator extends CommandTrainingCollector {
      * Map training data field types to JSON Schema types
      */
     mapFieldType(type) {
+        if (type == null || typeof type !== 'string') {
+            return 'string';
+        }
         const typeMap = {
             string: 'string',
             number: 'number',

package/dist/cli/index.d.ts

@@ -1,3 +1,4 @@
+import './orchid-chat.css';
 export { useStreamingAI } from './hooks/useStreamingAI';
 export type { StreamingModelSelection } from './hooks/useStreamingAI';
 export { useSuggestions, useDebouncedSuggestions, } from './hooks/useSuggestions';

package/dist/cli/server/schema-generator.d.ts

@@ -55,6 +55,14 @@ export declare class SchemaGenerator extends CommandTrainingCollector {
      * Generate schemas from collected training data
      */
     private generateSchemas;
+    /**
+     * Merge `name="..."` fields collected from UI forms/modals into existing entity schemas
+     * (server models stay canonical; this adds frontend surface hints).
+     * Optional `customTrainingData.options.formEntityHints`: map form component name -> schema entity key.
+     * Optional `formEntityPathPatterns`: `{ includes, entity }` — first match on `form.sourceFile` wins
+     * (disambiguates reused names like `FormStepDetails` in different feature folders).
+     */
+    private mergeFormUiFieldsIntoEntitySchemas;
     /**
      * Extract schemas from component analysis if no explicit entities found
      */

package/dist/components/ChatPanel.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { type IconName } from './Icon';
-import { CommandTheme, ChatMessage, ModelInfo, ChatTheme, ServerConfig } from '../types/types';
+import { CommandTheme, CommandSuggestion, ChatMessage, ModelInfo, ChatTheme, ServerConfig } from '../types/types';
 interface ChatPanelProps {
     isOpen: boolean;
     setIsOpen?: (isOpen: boolean) => void;
@@ -53,6 +53,19 @@ interface ChatPanelProps {
     headerIcon?: IconName | React.ReactElement;
     headerTitle?: string;
     headerSubtitle?: string;
+    /** When set, replaces default behavior (setFormState + onNavigate + onClose) for command suggestions. */
+    onSuggestionSelect?: (s: CommandSuggestion) => void;
+    /**
+     * Applied to the full-screen modal root so the chat stacks above app chrome that uses high z-index
+     * (e.g. MUI AppBar ~1100, custom sidebars ~999). Default Tailwind z-50 is too low for many shells.
+     */
+    overlayZIndex?: number;
+    /**
+     * When true (default) and `showHistory` is on, only the chat history column is a narrow strip
+     * until hover (or tap) expands it; the main conversation area stays full width.
+     * Set to false to keep the history sidebar always fully expanded (~150px).
+     */
+    expandOnHover?: boolean;
 }
 /**
  * ChatPanel component
@@ -91,7 +104,7 @@ showHistory, // Default to hidden
 showProfileBubbles, // Default to hidden
 modalPosition, // Default to left position
 serverConfig, models, defaultModel, showUsageStats, maxFileSize, features, showFloatingButton, floatingButtonIcon, floatingButtonPosition, floatingButtonSize, floatingButtonClassName, chats, setChats, currentChatId, setCurrentChatId, chatLevel, initialQuery, setInitialQuery, headerIcon, // Default to bot icon
-headerTitle, headerSubtitle, }: ChatPanelProps): import("react/jsx-runtime").JSX.Element;
+headerTitle, headerSubtitle, onSuggestionSelect, overlayZIndex, expandOnHover, }: ChatPanelProps): import("react/jsx-runtime").JSX.Element;
 /**
  * ChatInput component
  * @param query - The current query
@@ -118,6 +131,7 @@ type FloatingChatButtonProps = {
     className?: string;
     position?: 'bottom-right' | 'bottom-left' | 'top-right' | 'top-left';
     size?: 'sm' | 'md' | 'lg';
+    zIndex?: number;
 };
 /**
  * FloatingChatButton component
@@ -128,5 +142,5 @@ type FloatingChatButtonProps = {
  * @param position - Position of the floating button
  * @param size - Size of the floating button
  */
-export declare function FloatingChatButton({ onClick, theme, icon, className, position, size, }: FloatingChatButtonProps): import("react/jsx-runtime").JSX.Element;
+export declare function FloatingChatButton({ onClick, theme, icon, className, position, size, zIndex: floatingZIndex, }: FloatingChatButtonProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/Conversation.d.ts

@@ -61,6 +61,10 @@ interface ConversationProps {
     showClearChat?: boolean;
     onClearChat?: () => void;
     additionalContext?: string | Record<string, unknown>;
+    /** Optional ref to the main chat textarea (for parent focus control). */
+    chatInputRef?: React.RefObject<HTMLTextAreaElement | null>;
+    /** Increment to move focus to the main input (panel open, chat switch, new chat). */
+    focusChatNonce?: number;
 }
 /**
  * Conversation component - displays a single chat conversation
@@ -72,5 +76,5 @@ interface ConversationProps {
  * @param autoScroll - Whether to auto-scroll to bottom on new messages
  * @param maxHeight - Maximum height of the conversation container
  */
-export declare function Conversation({ chat: externalChat, onSuggestionClick, theme, showProfileBubbles, className, autoScroll, maxHeight, userId, serverConfig, formData, setFormState, onNavigate, chatLevel, chats: externalChats, setChats: externalSetChats, currentChatId: externalCurrentChatId, setCurrentChatId: externalSetCurrentChatId, query: externalQuery, setQuery: externalSetQuery, onSend: externalOnSend, isLoading: externalIsLoading, attachedFiles: externalAttachedFiles, setAttachedFiles: externalSetAttachedFiles, models, defaultModel, showUsageStats, maxFileSize, features, currentModelSelection: externalCurrentModelSelection, onModelSelectionChange: externalOnModelSelectionChange, showInput, initialQuery, setInitialQuery, showClearChat, onClearChat, additionalContext, }: ConversationProps): import("react/jsx-runtime").JSX.Element;
+export declare function Conversation({ chat: externalChat, onSuggestionClick, theme, showProfileBubbles, className, autoScroll, maxHeight, userId, serverConfig, formData, chatLevel, chats: externalChats, setChats: externalSetChats, currentChatId: externalCurrentChatId, setCurrentChatId: externalSetCurrentChatId, query: externalQuery, setQuery: externalSetQuery, onSend: externalOnSend, isLoading: externalIsLoading, attachedFiles: externalAttachedFiles, setAttachedFiles: externalSetAttachedFiles, models, defaultModel, showUsageStats, maxFileSize, features, currentModelSelection: externalCurrentModelSelection, onModelSelectionChange: externalOnModelSelectionChange, showInput, initialQuery, setInitialQuery, showClearChat, onClearChat, additionalContext, chatInputRef: externalChatInputRef, focusChatNonce, }: ConversationProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import './orchid-chat.css';
 export { useStreamingAI } from './hooks/useStreamingAI';
 export type { StreamingModelSelection } from './hooks/useStreamingAI';
 export { useSuggestions, useDebouncedSuggestions, } from './hooks/useSuggestions';