Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions crates/goose/src/conversation/message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crates/goose/src/mcp_utils.rs
Original file line number Diff line number Diff line change
@@ -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>;
6 changes: 0 additions & 6 deletions package-lock.json

This file was deleted.

16 changes: 15 additions & 1 deletion ui/desktop/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import {
useAgent,
} from './hooks/useAgent';
import { useNavigation } from './hooks/useNavigation';
import Pair2 from './components/Pair2';

// Route Components
const HubRouteWrapper = ({
Expand Down Expand Up @@ -93,7 +94,20 @@ const PairRouteWrapper = ({

const resumeSessionId = searchParams.get('resumeSessionId') ?? undefined;

return (
return process.env.ALPHA ? (
<Pair2
chat={chat}
setChat={setChat}
setView={setView}
agentState={agentState}
loadCurrentChat={loadCurrentChat}
setFatalError={setFatalError}
setAgentWaitingMessage={setAgentWaitingMessage}
setIsGoosehintsModalOpen={setIsGoosehintsModalOpen}
resumeSessionId={resumeSessionId}
initialMessage={initialMessage}
/>
) : (
<Pair
chat={chat}
setChat={setChat}
Expand Down
2 changes: 1 addition & 1 deletion ui/desktop/src/components/BaseChat.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading
Loading