vibefast-cli 0.7.12 → 0.7.14

package/recipes/chatbot/apps/native/src/features/chatbot/app/index.tsx

@@ -1,11 +1,10 @@
-
 import { useAuthToken } from '@convex-dev/auth/react';
 import { api } from '@vibefast/backend/_generated/api';
 import type { Id } from '@vibefast/backend/_generated/dataModel';
 import { useQuery } from 'convex/react';
 import { Stack } from 'expo-router';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { Keyboard, TouchableWithoutFeedback, View } from 'react-native';
+import { Keyboard, View } from 'react-native';
 import Animated from 'react-native-reanimated';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
@@ -236,68 +235,65 @@ export default function ChatConversationScreen() {
 
   return (
     <NetworkConnectivityWrapper>
-      <TouchableWithoutFeedback
-        onPress={Keyboard.dismiss}
-        accessible={false}
-        touchSoundDisabled
-      >
-        <View style={{ flex: 1 }}>
-          <Stack.Screen
-            options={{
-              title: translate('chatbot.title'),
-              headerRight: clearChatButton,
-            }}
+      <View style={{ flex: 1 }}>
+        <Stack.Screen
+          options={{
+            title: translate('chatbot.title'),
+            headerRight: clearChatButton,
+          }}
+        />
+        <FocusAwareStatusBar />
+
+        <View
+          style={{ flex: 1, paddingTop: insets.top }}
+          onTouchStart={() => Keyboard.dismiss()}
+        >
+          <MessageList
+            messages={messagesWithUrls}
+            onReportMessage={handleReportMessage}
+            testID="chat-conversation-screen"
           />
-          <FocusAwareStatusBar />
-
-          <View style={{ flex: 1, paddingTop: insets.top + 12 }}>
-            <MessageList
-              messages={messagesWithUrls}
-              onReportMessage={handleReportMessage}
-              testID="chat-conversation-screen"
-            />
-          </View>
+        </View>
 
-          {statusLabel ? (
-            <View className="pb-6 pl-5 pr-4 pt-2">
-              <View className="flex-row gap-3">
-                <Spinner
-                  size="sm"
-                  variant="pulse"
-                  color={theme.colors.foreground}
-                />
-                <Text className="text-base font-medium text-neutral-400 dark:text-neutral-500">
-                  {statusLabel}
-                </Text>
-              </View>
+        {statusLabel ? (
+          <View className="pb-6 pl-5 pr-4 pt-2">
+            <View className="flex-row gap-3">
+              <Spinner
+                size="sm"
+                variant="pulse"
+                color={theme.colors.foreground}
+              />
+              <Text className="text-base font-medium text-neutral-400 dark:text-neutral-500">
+                {statusLabel}
+              </Text>
             </View>
-          ) : null}
-
-          <ChatInputBar
-            input={input}
-            onInputChange={handleTextInputChange}
-            onSubmit={handleSubmitWithKeyboardReset}
-            isLoading={conversationLoading || isChatLoading}
-            showSuggestedMessages={messages.length === 0}
-            selectedModel={selectedModel}
-            onModelChange={handleModelChange}
-          />
-
-          {/* Animated spacer for keyboard */}
-          <Animated.View
-            pointerEvents="none"
-            style={keyboardCoordinator.keyboardPadding}
+          </View>
+        ) : null}
+
+        <ChatInputBar
+          input={input}
+          onInputChange={handleTextInputChange}
+          onSubmit={handleSubmitWithKeyboardReset}
+          isLoading={conversationLoading || isChatLoading}
+          showSuggestedMessages={messages.length === 0}
+          selectedModel={selectedModel}
+          onModelChange={handleModelChange}
+        />
+
+        {/* Animated spacer for keyboard */}
+        <Animated.View
+          pointerEvents="none"
+          style={keyboardCoordinator.keyboardPadding}
+        />
+
+        {messageToReport && (
+          <ReportContentModal
+            message={messageToReport}
+            onSubmit={handleSubmitReport}
+            onCancel={handleCancelReport}
           />
-
-          {messageToReport && (
-            <ReportContentModal
-              message={messageToReport}
-              onSubmit={handleSubmitReport}
-              onCancel={handleCancelReport}
-            />
-          )}
-        </View>
-      </TouchableWithoutFeedback>
+        )}
+      </View>
     </NetworkConnectivityWrapper>
   );
 }

package/recipes/chatbot/apps/native/src/features/chatbot/components/chat-header-buttons.tsx

@@ -1,4 +1,3 @@
-
 import type React from 'react';
 import { View } from 'react-native';
 

package/recipes/chatbot/apps/native/src/features/chatbot/components/chat-input-bar.tsx

@@ -1,4 +1,3 @@
-
 import { AntDesign, Feather } from '@expo/vector-icons';
 import type React from 'react';
 import { useCallback, useMemo, useRef, useState } from 'react';

package/recipes/chatbot/apps/native/src/features/chatbot/components/chat-markdown.tsx

@@ -1,4 +1,3 @@
-
 /**
  * ChatMarkdown component for rendering markdown content in chat messages.
  *

package/recipes/chatbot/apps/native/src/features/chatbot/components/chat-message-bubble.tsx

@@ -1,7 +1,5 @@
-
 import { Feather, Ionicons } from '@expo/vector-icons';
 import type { Id } from '@vibefast/backend/_generated/dataModel';
-import type { Message } from 'ai'; // Base Message type
 import * as Clipboard from 'expo-clipboard';
 import React from 'react';
 import { View } from 'react-native';
@@ -9,45 +7,24 @@ import { View } from 'react-native';
 import { Image, Pressable, Text } from '@/components/ui';
 import { useToast } from '@/components/ui/utils';
 import { ChatMarkdown } from '@/features/chatbot/components/chat-markdown';
+import type { AppMessage } from '@/features/chatbot/types';
 import { translate } from '@/lib';
 import { useThemeConfig } from '@/lib/use-theme-config';
 
-// Local definition for MessageContentPart compatible with Vercel AI SDK structure
-// This should be consistent with how `useChat` hook and AI SDK handle content.
-export type LocalMessageContentPart =
-  | { type: 'text'; text: string }
-  | { type: 'image'; image: string | URL }; // Allow string for input from client, server can convert to URL
-
-type ConvexAttachment = {
-  type: 'image';
-  storageId: Id<'_storage'>;
-  url?: string; // This is now pre-fetched from the parent component
-  fileName?: string;
-  mimeType?: string;
-};
-
-// The message prop for ChatMessageBubble
-export type AppMessage = Omit<Message, 'content'> & {
-  content: string | LocalMessageContentPart[]; // Content matches AI SDK
-  attachments?: ConvexAttachment[]; // Custom prop for Convex-stored attachments
-};
-
 type ChatMessageBubbleProps = {
   message: AppMessage;
-  onReportMessage?: (message: AppMessage) => void; // AppMessage type for handler
+  onReportMessage?: (message: AppMessage) => void;
 };
 
 const ConvexImage: React.FC<{
   storageId: Id<'_storage'>;
   isUser: boolean;
   fileName?: string;
-  preloadedUrl?: string | null; // Pre-fetched URL from parent
+  preloadedUrl?: string | null;
 }> = React.memo(({ storageId, isUser, fileName, preloadedUrl }) => {
-  // Use pre-loaded URL if available, otherwise show loading
   const imageUrl = preloadedUrl;
   const theme = useThemeConfig();
 
-  // Fixed aspect ratio container to prevent layout shift when image loads
   return (
     <View
       className="my-1 w-48 overflow-hidden rounded-lg"

package/recipes/chatbot/apps/native/src/features/chatbot/components/chat-settings-modal.tsx

@@ -1,4 +1,3 @@
-
 import React from 'react';
 import { View } from 'react-native';
 

package/recipes/chatbot/apps/native/src/features/chatbot/components/image-preview-list.tsx

@@ -1,4 +1,3 @@
-
 import { Feather } from '@expo/vector-icons';
 import type React from 'react';
 import { ActivityIndicator, ScrollView, View } from 'react-native';

package/recipes/chatbot/apps/native/src/features/chatbot/components/markdown/code-block.tsx

@@ -1,4 +1,3 @@
-
 import { Feather } from '@expo/vector-icons';
 import React, { useCallback, useState } from 'react';
 import {

package/recipes/chatbot/apps/native/src/features/chatbot/components/markdown/index.ts

@@ -1,4 +1,3 @@
-
 /**
  * Markdown rendering components for chatbot messages.
  *

package/recipes/chatbot/apps/native/src/features/chatbot/components/markdown/table-renderer.tsx

@@ -1,4 +1,3 @@
-
 import React from 'react';
 import { ScrollView, View, type ViewStyle } from 'react-native';
 

package/recipes/chatbot/apps/native/src/features/chatbot/components/message-error-boundary.tsx

@@ -1,4 +1,3 @@
-
 import React from 'react';
 import { View } from 'react-native';
 

package/recipes/chatbot/apps/native/src/features/chatbot/components/message-list.tsx

@@ -1,23 +1,16 @@
-
 import type { FlashListRef } from '@shopify/flash-list';
 import { FlashList } from '@shopify/flash-list';
-import type { Message } from 'ai';
 import React, { useCallback, useEffect, useRef } from 'react';
 import { Keyboard, View } from 'react-native';
 
-import { Text } from '@/components/ui';
-import type { AppMessage } from '@/features/chatbot/components/chat-message-bubble';
 import { ChatMessageBubble } from '@/features/chatbot/components/chat-message-bubble';
 import { MessageErrorBoundary } from '@/features/chatbot/components/message-error-boundary';
 import { useSmartScrollManager } from '@/features/chatbot/hooks/use-smart-scroll-manager';
-import { translate } from '@/lib';
+import type { AppMessage } from '@/features/chatbot/types';
 
 type MessageListProps = {
-  /** Array of messages to display */
-  messages: AppMessage[]; // Use AppMessage
-  /** Handler for reporting a message */
-  onReportMessage?: (message: Message) => void; // Base Message type for handler is fine
-  /** Test ID for E2E testing */
+  messages: AppMessage[];
+  onReportMessage?: (message: AppMessage) => void;
   testID?: string;
 };
 
@@ -140,10 +133,13 @@ export const MessageList: React.FC<MessageListProps> = ({
   return (
     <View className="flex-1 px-4" testID={testID}>
       {messages.length === 0 ? (
-        <View className="flex-1 items-center justify-center px-6">
-          <Text className="text-center text-base text-muted-foreground">
+        <View
+          className="flex-1 items-center justify-center px-6"
+          onTouchStart={handleTouchStart}
+        >
+          {/* <Text className="text-center text-base text-muted-foreground">
             {translate('chatbot.start_conversation')}
-          </Text>
+          </Text> */}
         </View>
       ) : (
         <FlashList<AppMessage>
@@ -163,7 +159,7 @@ export const MessageList: React.FC<MessageListProps> = ({
           scrollEventThrottle={16}
           keyboardShouldPersistTaps="handled"
           keyboardDismissMode="on-drag"
-          contentContainerStyle={{ paddingVertical: 16, paddingBottom: 8 }}
+          contentContainerStyle={{ paddingTop: 50, paddingBottom: 8 }}
           accessibilityLabel="Chat messages"
           accessibilityRole="list"
           testID="messages-flashlist"

package/recipes/chatbot/apps/native/src/features/chatbot/components/model-selector.tsx

@@ -1,4 +1,3 @@
-
 import { Feather } from '@expo/vector-icons';
 import type React from 'react';
 import { Alert, ScrollView, View } from 'react-native';

package/recipes/chatbot/apps/native/src/features/chatbot/components/report-content-modal.tsx

@@ -1,4 +1,3 @@
-
 import React, { useState } from 'react';
 import { View } from 'react-native';
 

package/recipes/chatbot/apps/native/src/features/chatbot/components/suggested-messages.tsx

@@ -1,4 +1,3 @@
-
 import type React from 'react';
 import { useCallback } from 'react';
 import { ScrollView, View } from 'react-native';

package/recipes/chatbot/apps/native/src/features/chatbot/constants/models.ts

@@ -1,4 +1,3 @@
-
 // DEPRECATED: This file has been moved to src/features/chatbot/models/
 // Please import from '@/features/chatbot/models' instead
 // This file is kept for backward compatibility

package/recipes/chatbot/apps/native/src/features/chatbot/constants/report-reasons.ts

@@ -1,4 +1,3 @@
-
 export const REPORT_REASONS = [
   { label: 'Inaccurate Information', value: 'inaccurate' },
   { label: 'Offensive Content', value: 'offensive' },

package/recipes/chatbot/apps/native/src/features/chatbot/hooks/use-attachment-cache.ts

@@ -1,4 +1,3 @@
-
 import type { Id } from '@vibefast/backend/_generated/dataModel';
 import { useCallback, useEffect, useRef } from 'react';
 

package/recipes/chatbot/apps/native/src/features/chatbot/hooks/use-chat-config.ts

@@ -1,4 +1,3 @@
-
 import type { Id } from '@vibefast/backend/_generated/dataModel';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 

package/recipes/chatbot/apps/native/src/features/chatbot/hooks/use-chat-handlers.ts

@@ -1,4 +1,3 @@
-
 import type { Id } from '@vibefast/backend/_generated/dataModel';
 import React, { useCallback, useMemo, useState } from 'react';
 import { Alert, Keyboard } from 'react-native';

package/recipes/chatbot/apps/native/src/features/chatbot/hooks/use-chatbot-settings.ts

@@ -1,4 +1,3 @@
-
 import { useCallback, useEffect, useState } from 'react';
 
 import { defaultCacheService } from '@/core/cache';

package/recipes/chatbot/apps/native/src/features/chatbot/hooks/use-conversation.ts

@@ -1,4 +1,3 @@
-
 import type { Id } from '@vibefast/backend/_generated/dataModel';
 import { useEffect, useMemo, useState } from 'react';
 

package/recipes/chatbot/apps/native/src/features/chatbot/hooks/use-image-picker.ts

@@ -1,4 +1,3 @@
-
 import * as ImagePicker from 'expo-image-picker';
 import { useCallback } from 'react';
 import { Alert } from 'react-native';

package/recipes/chatbot/apps/native/src/features/chatbot/hooks/use-keyboard-coordinator.ts

@@ -1,4 +1,3 @@
-
 import { useCallback, useEffect, useRef } from 'react';
 import { Keyboard } from 'react-native';
 import {

package/recipes/chatbot/apps/native/src/features/chatbot/hooks/use-smart-scroll-manager.ts

@@ -1,4 +1,3 @@
-
 import type { FlashListRef } from '@shopify/flash-list';
 import { useCallback, useEffect, useMemo, useRef } from 'react';
 import type { NativeScrollEvent, NativeSyntheticEvent } from 'react-native';

package/recipes/chatbot/apps/native/src/features/chatbot/models/index.ts

@@ -1,4 +1,3 @@
-
 // Import directly to avoid circular dependencies
 import { DEFAULT_MODELS, MODELS } from './models';
 import type { ModelConfig, ModelId, Provider } from './types';

package/recipes/chatbot/apps/native/src/features/chatbot/models/models.ts

@@ -1,4 +1,3 @@
-
 import type { ModelConfig, Provider } from './types';
 
 export const MODELS: ModelConfig[] = [

package/recipes/chatbot/apps/native/src/features/chatbot/models/providers.ts

@@ -1,4 +1,3 @@
-
 import type React from 'react';
 
 import { ClaudeIcon } from '@/components/ui/icons/claude';

package/recipes/chatbot/apps/native/src/features/chatbot/models/types.ts

@@ -1,4 +1,3 @@
-
 export type Provider = 'claude' | 'openai' | 'gemini';
 
 export type ModelCategory = 'free' | 'premium' | 'specialized';

package/recipes/chatbot/apps/native/src/features/chatbot/services/file-uploader.ts

@@ -1,4 +1,3 @@
-
 import { manipulateAsync, SaveFormat } from 'expo-image-manipulator';
 import { Image } from 'react-native';
 

package/recipes/chatbot/apps/native/src/features/chatbot/services/message-handler-service.ts

@@ -1,4 +1,3 @@
-
 import type { Id } from '@vibefast/backend/_generated/dataModel';
 import { Alert } from 'react-native';
 

package/recipes/chatbot/apps/native/src/features/chatbot/types/index.ts

@@ -1,6 +1,4 @@
-
 import type { Id } from '@vibefast/backend/_generated/dataModel';
-import type { Message } from 'ai';
 
 export type LocalMessageContentPart =
   | { type: 'text'; text: string }
@@ -43,8 +41,12 @@ export type AgentStatus =
       startedAt: number;
     };
 
-export type AppMessage = Omit<Message, 'content'> & {
+export type AppMessage = {
+  id: string;
+  role: 'user' | 'assistant' | 'data';
   content: string | LocalMessageContentPart[];
+  createdAt?: Date;
+  parts?: unknown; // Optional hook into AI SDK shapes when present
   attachments?: ConvexMessageAttachment[];
   toolCalls?: ToolCallRecord[];
   metadata?: MessageMetadata;

package/recipes/chatbot/apps/native/src/features/chatbot/utils/chat-telemetry.ts

@@ -1,4 +1,3 @@
-
 import type { TelemetryMode } from '@/core/config';
 import { getChatTelemetryMode } from '@/core/config/telemetry';
 

package/recipes/chatbot/packages/backend/convex/agents.ts

@@ -1,6 +1,5 @@
 import { createGoogleGenerativeAI } from '@ai-sdk/google';
 import { openai } from '@ai-sdk/openai';
-import type { LanguageModelV1 } from '@ai-sdk/provider';
 import { Agent } from '@convex-dev/agent';
 
 import { components } from './_generated/api';
@@ -15,14 +14,14 @@ const google = createGoogleGenerativeAI();
 type ModelProvider = 'openai' | 'google';
 
 type ModelResolver = () => {
-  model: LanguageModelV1;
+  model: any;
   provider: ModelProvider;
   modelId: string;
 };
 
 const PROVIDER_CHAT_FACTORIES: Record<
   ModelProvider,
-  (modelId: string) => LanguageModelV1
+  (modelId: string) => unknown
 > = {
   openai: (modelId) => openai.chat(modelId),
   google: (modelId) => google.chat(modelId),
@@ -86,7 +85,7 @@ export function resolveChatModel(preferredModel?: string) {
 
 export const agent: Agent = new Agent(components.agent, {
   name: 'VibeFast Assistant',
-  chat: MODEL_RESOLVERS[DEFAULT_MODEL]().model,
+  languageModel: MODEL_RESOLVERS[DEFAULT_MODEL]().model as any,
   instructions: `
 You are VibeFast, a proactive mobile AI assistant. Produce concise, friendly responses with clear structure.
 

package/recipes/chatbot/packages/backend/convex/chatbot/content.ts

@@ -0,0 +1,35 @@
+import type { FilePart, ImagePart, TextPart } from 'ai';
+
+import type { Doc } from '../_generated/dataModel';
+import type { MutationCtx } from '../_generated/server';
+
+export async function buildUserContent(
+  ctx: Pick<MutationCtx, 'storage'>,
+  message: Doc<'messages'>,
+): Promise<string | (TextPart | ImagePart | FilePart)[]> {
+  const attachments = message.attachments ?? [];
+  if (attachments.length === 0) {
+    return message.text ?? '';
+  }
+
+  const parts: (TextPart | ImagePart)[] = [];
+  if (message.text) {
+    parts.push({ type: 'text', text: message.text });
+  }
+
+  for (const attachment of attachments) {
+    try {
+      const url = await ctx.storage.getUrl(attachment.storageId);
+      if (url) {
+        parts.push({ type: 'image', image: new URL(url) });
+      }
+    } catch (error) {
+      console.error('[chatbotAgent] Failed to resolve attachment URL', {
+        storageId: attachment.storageId,
+        error,
+      });
+    }
+  }
+
+  return parts.length > 0 ? parts : (message.text ?? '');
+}

package/recipes/chatbot/packages/backend/convex/chatbot/sessions.ts

@@ -0,0 +1,52 @@
+import type { MutationCtx, QueryCtx } from '../_generated/server';
+import type { Doc, Id } from '../_generated/dataModel';
+import { agent, DEFAULT_MODEL } from '../agents';
+
+type AgentSessionDoc = Doc<'agentSessions'>;
+
+export async function getSessionForConversation(
+  ctx: Pick<MutationCtx, 'db'> | Pick<QueryCtx, 'db'>,
+  conversationId: Id<'conversations'>,
+) {
+  return await ctx.db
+    .query('agentSessions')
+    .withIndex('by_conversationId', (q) =>
+      q.eq('conversationId', conversationId),
+    )
+    .first();
+}
+
+export async function ensureAgentSession(
+  ctx: MutationCtx,
+  conversationId: Id<'conversations'>,
+  userId: Id<'users'>,
+  preferredModel?: string,
+): Promise<{ session: AgentSessionDoc; wasCreated: boolean }> {
+  const existing = await getSessionForConversation(ctx, conversationId);
+  if (existing) {
+    return { session: existing, wasCreated: false };
+  }
+
+  const { threadId } = await agent.createThread(ctx, {
+    userId,
+  });
+
+  const sessionId = await ctx.db.insert('agentSessions', {
+    conversationId,
+    userId,
+    agentThreadId: threadId,
+    activeStreamId: undefined,
+    lastUserMessageId: undefined,
+    lastAssistantMessageId: undefined,
+    preferredModel: preferredModel ?? DEFAULT_MODEL,
+    updatedAt: Date.now(),
+    lastErrorMessage: undefined,
+    lastErrorAt: undefined,
+  });
+
+  const session = await ctx.db.get(sessionId);
+  if (!session) {
+    throw new Error('Failed to create agent session');
+  }
+  return { session, wasCreated: true };
+}