Clean room implementation of the chat process

crates/goose/src/conversation/message.rs

@@ -13,6 +13,12 @@ use utoipa::ToSchema;
 use crate::conversation::tool_result_serde;
 use crate::utils::sanitize_unicode_tags;
 
+#[derive(ToSchema)]
+pub enum ToolCallResult<T> {
+    Success { value: T },
+    Error { error: String },
+}
+
 /// Custom deserializer for MessageContent that sanitizes Unicode Tags in text content
 fn deserialize_sanitized_content<'de, D>(deserializer: D) -> Result<Vec<MessageContent>, D::Error>
 where

crates/goose/src/mcp_utils.rs

@@ -1,4 +1,4 @@
 pub use rmcp::model::ErrorData;
 
 /// Type alias for tool results
-pub type ToolResult<T> = std::result::Result<T, ErrorData>;
+pub type ToolResult<T> = Result<T, ErrorData>;

ui/desktop/src/App.tsx

@@ -44,6 +44,7 @@ import {
   useAgent,
 } from './hooks/useAgent';
 import { useNavigation } from './hooks/useNavigation';
+import Pair2 from './components/Pair2';
 
 // Route Components
 const HubRouteWrapper = ({
@@ -93,7 +94,16 @@ const PairRouteWrapper = ({
 
   const resumeSessionId = searchParams.get('resumeSessionId') ?? undefined;
 
-  return (
+  return process.env.ALPHA ? (
+    <Pair2
+      chat={chat}
+      setChat={setChat}
+      setView={setView}
+      setIsGoosehintsModalOpen={setIsGoosehintsModalOpen}
+      resumeSessionId={resumeSessionId}
+      initialMessage={initialMessage}
+    />
+  ) : (
     <Pair
       chat={chat}
       setChat={setChat}
@@ -332,7 +342,6 @@ export function AppInner() {
             setAgentWaitingMessage,
             setIsExtensionsLoading,
           });
-          // Update the chat state with the loaded session to ensure sessionId is available globally
           setChat(loadedChat);
         } catch (e) {
           if (e instanceof NoProviderOrModelError) {

ui/desktop/src/components/BaseChat.tsx

@@ -61,10 +61,10 @@ import { useChatEngine } from '../hooks/useChatEngine';
 import { useRecipeManager } from '../hooks/useRecipeManager';
 import { useFileDrop } from '../hooks/useFileDrop';
 import { useCostTracking } from '../hooks/useCostTracking';
-import { Message } from '../types/message';
 import { ChatState } from '../types/chatState';
 import { ChatType } from '../types/chat';
 import { useToolCount } from './alerts/useToolCount';
+import { Message } from '../api';
 
 // Context for sharing current model info
 const CurrentModelContext = createContext<{ model: string; mode: string } | null>(null);