Skip to content
Closed
Show file tree
Hide file tree
Changes from all 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
4 changes: 2 additions & 2 deletions site/src/pages/AgentsPage/AgentChatPageErrorView.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { RotateCcwIcon } from "lucide-react";
import { getErrorDetail, getErrorMessage } from "#/api/errors";
import { Button } from "#/components/Button/Button";
import { ChatTopBar } from "./components/ChatTopBar";
import { ChatTopBarFrame } from "./components/ChatTopBar";

type AgentChatPageErrorViewProps = {
error: unknown;
Expand All @@ -16,7 +16,7 @@ export const AgentChatPageErrorView: React.FC<AgentChatPageErrorViewProps> = ({

return (
<div className="flex h-full min-h-0 min-w-0 flex-1 flex-col">
<ChatTopBar
<ChatTopBarFrame
panel={{
showSidebarPanel: false,
onToggleSidebar: () => {},
Expand Down
20 changes: 20 additions & 0 deletions site/src/pages/AgentsPage/AgentChatPageView.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,14 @@ const StoryAgentChatPageView: React.FC<StoryProps> = ({
canConfigureAgentSetup: true,
providerCount: 1,
modelCount: 1,
unsupportedProviderNames: [],
onReasoningEffortChange: fn(),
isModelCatalogLoading: false,
onPlanModeToggle: fn(),
isWorkspaceLoading: false,
onImplementPlan: fn(),
onSendAskUserQuestionResponse: fn(),
urlTransform: (url: string) => url,
initialMessages: [],
...overrides,
store,
Expand Down Expand Up @@ -758,6 +766,9 @@ export const Loading: Story = {
modelOptions={defaultModelOptions}
modelSelectorPlaceholder="Select a model"
hasModelOptions
isModelCatalogLoading={false}
planModeEnabled={false}
onPlanModeToggle={fn()}
showRightPanel={false}
/>
),
Expand All @@ -778,6 +789,9 @@ export const LoadingWithModelOptions: Story = {
modelOptions={defaultModelOptions}
modelSelectorPlaceholder="Select a model"
hasModelOptions
isModelCatalogLoading={false}
planModeEnabled={false}
onPlanModeToggle={fn()}
showRightPanel={false}
/>
),
Expand All @@ -797,6 +811,9 @@ export const LoadingWithRightPanel: Story = {
modelOptions={defaultModelOptions}
modelSelectorPlaceholder="Select a model"
hasModelOptions
isModelCatalogLoading={false}
planModeEnabled={false}
onPlanModeToggle={fn()}
showRightPanel
/>
),
Expand All @@ -818,6 +835,9 @@ export const LoadingSidebarCollapsed: Story = {
modelOptions={defaultModelOptions}
modelSelectorPlaceholder="Select a model"
hasModelOptions
isModelCatalogLoading={false}
planModeEnabled={false}
onPlanModeToggle={fn()}
showRightPanel={false}
/>
),
Expand Down
38 changes: 18 additions & 20 deletions site/src/pages/AgentsPage/AgentChatPageView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import { ChatPageInput, ChatPageTimeline } from "./components/ChatPageContent";
import { ChatSummaryPanel } from "./components/ChatSummaryPanel";
import { getEffectiveTabId } from "./components/ChatsSidebar/tabs/getEffectiveTabId";
import { SidebarTabView } from "./components/ChatsSidebar/tabs/SidebarTabView";
import { ChatTopBar } from "./components/ChatTopBar";
import { ChatTopBar, ChatTopBarFrame } from "./components/ChatTopBar";
import { GitPanel } from "./components/GitPanel/GitPanel";
import { DebugPanel } from "./components/RightPanel/DebugPanel/DebugPanel";
import { DesktopPanel } from "./components/RightPanel/DesktopPanel";
Expand Down Expand Up @@ -122,21 +122,21 @@ type AgentChatPageViewProps = {
modelCatalogError?: unknown;
unavailableModelNotice?: string;
reasoningEffort?: string;
onReasoningEffortChange?: (value: string) => void;
onReasoningEffortChange: (value: string) => void;
canConfigureAgentSetup: boolean;
providerCount?: number;
modelCount?: number;
unsupportedProviderNames?: readonly string[];
unsupportedProviderNames: readonly string[];
aiGatewayDisabled?: boolean;
hasModelOptions: boolean;
isModelCatalogLoading?: boolean;
onPlanModeToggle?: (enabled: boolean) => void;
isModelCatalogLoading: boolean;
onPlanModeToggle: (enabled: boolean) => void;
onManageAutomationsToggle?: (enabled: boolean) => void;
isInputDisabled: boolean;
isSubmissionPending: boolean;
isInterruptPending: boolean;
onWorkspaceChange?: (workspaceId: string | null) => void;
isWorkspaceLoading?: boolean;
isWorkspaceLoading: boolean;

// Right panel state (owned by the parent so loading and
// loaded views share the same layout).
Expand All @@ -161,8 +161,8 @@ type AgentChatPageViewProps = {
handleDeleteQueuedMessage: (id: number) => Promise<void>;
handlePromoteQueuedMessage: (id: number) => Promise<void>;

onImplementPlan?: () => Promise<void> | void;
onSendAskUserQuestionResponse?: (message: string) => Promise<void> | void;
onImplementPlan: () => Promise<void> | void;
onSendAskUserQuestionResponse: (message: string) => Promise<void> | void;

// Pagination for loading older messages.
hasMoreMessages: boolean;
Expand All @@ -171,7 +171,7 @@ type AgentChatPageViewProps = {
hasFetchMoreError: boolean;
onFetchMoreMessages: () => Promise<unknown>;

urlTransform?: UrlTransform;
urlTransform: UrlTransform;

// MCP server state.
mcpServers: readonly TypesGen.MCPServerConfig[];
Expand Down Expand Up @@ -292,14 +292,14 @@ export const AgentChatPageView: React.FC<AgentChatPageViewProps> = ({
unsupportedProviderNames,
aiGatewayDisabled,
hasModelOptions,
isModelCatalogLoading = false,
isModelCatalogLoading,
onPlanModeToggle,
onManageAutomationsToggle,
isInputDisabled,
isSubmissionPending,
isInterruptPending,
onWorkspaceChange,
isWorkspaceLoading = false,
isWorkspaceLoading,
showSidebarPanel,
onSetShowSidebarPanel,
debugLoggingEnabled,
Expand Down Expand Up @@ -445,9 +445,7 @@ export const AgentChatPageView: React.FC<AgentChatPageViewProps> = ({
// needs a workspace to render; the agent arrives once the build runs.
const availableDesktopChatId = workspace ? desktopChatId : undefined;

const availableBrowserApp = workspace
? getAgentBrowserApp(workspaceAgent)
: undefined;
const availableBrowserApp = getAgentBrowserApp(workspaceAgent);

const singletonTabSupport: Record<SingletonRightPanelTabId, boolean> = {
browser: availableBrowserApp !== undefined,
Expand Down Expand Up @@ -1052,9 +1050,9 @@ type AgentChatPageLoadingViewProps = {
modelOptions: readonly ModelSelectorOption[];
modelSelectorPlaceholder: string;
hasModelOptions: boolean;
isModelCatalogLoading?: boolean;
planModeEnabled?: boolean;
onPlanModeToggle?: (enabled: boolean) => void;
isModelCatalogLoading: boolean;
planModeEnabled: boolean;
onPlanModeToggle: (enabled: boolean) => void;
showRightPanel: boolean;
};

Expand All @@ -1072,7 +1070,7 @@ export const AgentChatPageLoadingView: React.FC<
modelOptions,
modelSelectorPlaceholder,
hasModelOptions,
isModelCatalogLoading = false,
isModelCatalogLoading,
planModeEnabled,
onPlanModeToggle,
showRightPanel,
Expand All @@ -1086,7 +1084,7 @@ export const AgentChatPageLoadingView: React.FC<
)}
>
<div className="relative flex h-full min-h-0 min-w-0 flex-1 flex-col sm:min-w-(--agents-chat-panel-min-width,0px)">
<ChatTopBar
<ChatTopBarFrame
panel={{
showSidebarPanel: false,
onToggleSidebar: () => {},
Expand Down Expand Up @@ -1143,7 +1141,7 @@ export const AgentChatPageLoadingView: React.FC<
export const AgentChatPageNotFoundView: React.FC = () => {
return (
<div className="flex h-full min-h-0 min-w-0 flex-1 flex-col">
<ChatTopBar
<ChatTopBarFrame
panel={{
showSidebarPanel: false,
onToggleSidebar: () => {},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ const meta: Meta<typeof AgentChatInput> = {
modelOptions: [...defaultModelOptions],
modelSelectorPlaceholder: "Select model",
hasModelOptions: true,
planModeEnabled: false,
onPlanModeToggle: fn(),
isModelCatalogLoading: false,
},
};

Expand Down Expand Up @@ -1145,13 +1148,6 @@ export const DisablePlanModeFromBadge: Story = {
},
};

export const PlanningIndicatorWithoutToggle: Story = {
args: {
planModeEnabled: true,
onPlanModeToggle: undefined,
},
};

export const PlanFirstCheckedState: Story = {
args: {
planModeEnabled: true,
Expand Down
68 changes: 68 additions & 0 deletions site/src/pages/AgentsPage/components/AgentChatInput.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ const inputProps = {
modelSelectorPlaceholder: "Select model",
hasModelOptions: true,
canConfigureAgentSetup: false,
initialValue: "",
onContentChange: vi.fn(),
planModeEnabled: false,
onPlanModeToggle: vi.fn(),
isModelCatalogLoading: false,
} satisfies React.ComponentProps<typeof AgentChatInput>;

const mockSentryMCP: TypesGen.MCPServerConfig = {
Expand Down Expand Up @@ -142,6 +147,11 @@ describe("AgentChatInput", () => {
modelSelectorPlaceholder="Select model"
hasModelOptions
canConfigureAgentSetup={false}
initialValue=""
onContentChange={vi.fn()}
planModeEnabled={false}
onPlanModeToggle={vi.fn()}
isModelCatalogLoading={false}
/>,
);

Expand Down Expand Up @@ -171,6 +181,11 @@ describe("AgentChatInput", () => {
modelSelectorPlaceholder="Select model"
hasModelOptions
canConfigureAgentSetup={false}
initialValue=""
onContentChange={vi.fn()}
planModeEnabled={false}
onPlanModeToggle={vi.fn()}
isModelCatalogLoading={false}
/>,
);

Expand Down Expand Up @@ -315,6 +330,11 @@ describe("AgentChatInput", () => {
modelSelectorPlaceholder="Select model"
hasModelOptions
canConfigureAgentSetup={false}
initialValue=""
onContentChange={vi.fn()}
planModeEnabled={false}
onPlanModeToggle={vi.fn()}
isModelCatalogLoading={false}
/>,
);

Expand Down Expand Up @@ -363,6 +383,10 @@ describe("AgentChatInput", () => {
modelSelectorPlaceholder="Select model"
hasModelOptions
canConfigureAgentSetup={false}
onContentChange={vi.fn()}
planModeEnabled={false}
onPlanModeToggle={vi.fn()}
isModelCatalogLoading={false}
/>,
);

Expand All @@ -387,6 +411,10 @@ describe("AgentChatInput", () => {
modelSelectorPlaceholder: "Select model",
hasModelOptions: true,
canConfigureAgentSetup: false,
onContentChange: vi.fn(),
planModeEnabled: false,
onPlanModeToggle: vi.fn(),
isModelCatalogLoading: false,
};

stubViewport(false);
Expand Down Expand Up @@ -432,6 +460,11 @@ describe("AgentChatInput", () => {
modelSelectorPlaceholder="Select model"
hasModelOptions
canConfigureAgentSetup={false}
initialValue=""
onContentChange={vi.fn()}
planModeEnabled={false}
onPlanModeToggle={vi.fn()}
isModelCatalogLoading={false}
/>,
);

Expand Down Expand Up @@ -472,6 +505,11 @@ describe("AgentChatInput", () => {
modelSelectorPlaceholder="Select model"
hasModelOptions
canConfigureAgentSetup={false}
initialValue=""
onContentChange={vi.fn()}
planModeEnabled={false}
onPlanModeToggle={vi.fn()}
isModelCatalogLoading={false}
/>,
);

Expand All @@ -498,6 +536,11 @@ describe("AgentChatInput", () => {
modelSelectorPlaceholder="Select model"
hasModelOptions
canConfigureAgentSetup={false}
initialValue=""
onContentChange={vi.fn()}
planModeEnabled={false}
onPlanModeToggle={vi.fn()}
isModelCatalogLoading={false}
/>,
);

Expand Down Expand Up @@ -543,6 +586,11 @@ describe("AgentChatInput", () => {
modelSelectorPlaceholder="Select model"
hasModelOptions
canConfigureAgentSetup={false}
initialValue=""
onContentChange={vi.fn()}
planModeEnabled={false}
onPlanModeToggle={vi.fn()}
isModelCatalogLoading={false}
/>,
);

Expand Down Expand Up @@ -578,6 +626,11 @@ describe("AgentChatInput", () => {
modelSelectorPlaceholder="Select model"
hasModelOptions
canConfigureAgentSetup={false}
initialValue=""
onContentChange={vi.fn()}
planModeEnabled={false}
onPlanModeToggle={vi.fn()}
isModelCatalogLoading={false}
/>,
);

Expand Down Expand Up @@ -617,6 +670,11 @@ describe("AgentChatInput", () => {
modelSelectorPlaceholder="Select model"
hasModelOptions
canConfigureAgentSetup={false}
initialValue=""
onContentChange={vi.fn()}
planModeEnabled={false}
onPlanModeToggle={vi.fn()}
isModelCatalogLoading={false}
/>,
);

Expand Down Expand Up @@ -659,6 +717,11 @@ describe("AgentChatInput", () => {
modelSelectorPlaceholder="Select model"
hasModelOptions
canConfigureAgentSetup={false}
initialValue=""
onContentChange={vi.fn()}
planModeEnabled={false}
onPlanModeToggle={vi.fn()}
isModelCatalogLoading={false}
/>,
);

Expand Down Expand Up @@ -699,6 +762,11 @@ describe("AgentChatInput", () => {
modelSelectorPlaceholder="Select model"
hasModelOptions
canConfigureAgentSetup={false}
initialValue=""
onContentChange={vi.fn()}
planModeEnabled={false}
onPlanModeToggle={vi.fn()}
isModelCatalogLoading={false}
/>,
);

Expand Down
Loading
Loading