Skip to content

feat: use backend-supplied sidebar app id on the /task/$id page #18458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2025
Merged

feat: use backend-supplied sidebar app id on the /task/$id page #18458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions site/src/pages/TaskPage/TaskApps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { type FC, useState } from "react";
import { Link as RouterLink } from "react-router-dom";
import { cn } from "utils/cn";
import { TaskAppIFrame } from "./TaskAppIframe";
import { AI_APP_CHAT_SLUG } from "./constants";

type TaskAppsProps = {
task: Task;
Expand All @@ -30,7 +29,9 @@ export const TaskApps: FC<TaskAppsProps> = ({ task }) => {
// it here
const apps = agents
.flatMap((a) => a?.apps)
.filter((a) => !!a && a.slug !== AI_APP_CHAT_SLUG);
.filter(
(a) => !!a && a.id !== task.workspace.latest_build.ai_task_sidebar_app_id,
);

const embeddedApps = apps.filter((app) => !app.external);
const externalApps = apps.filter((app) => app.external);
Expand Down
180 changes: 133 additions & 47 deletions site/src/pages/TaskPage/TaskPage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import type { Meta, StoryObj } from "@storybook/react";
import { expect, spyOn, within } from "@storybook/test";
import type { Workspace, WorkspaceApp } from "api/typesGenerated";
import type {
Workspace,
WorkspaceApp,
WorkspaceResource,
} from "api/typesGenerated";
import {
MockFailedWorkspace,
MockStartingWorkspace,
Expand All @@ -13,11 +17,12 @@ import {
mockApiError,
} from "testHelpers/entities";
import { withProxyProvider } from "testHelpers/storybook";
import TaskPage, { data } from "./TaskPage";
import TaskPage, { data, WorkspaceDoesNotHaveAITaskError } from "./TaskPage";

const meta: Meta<typeof TaskPage> = {
title: "pages/TaskPage",
component: TaskPage,
decorators: [withProxyProvider()],
parameters: {
layout: "fullscreen",
},
Expand Down Expand Up @@ -96,61 +101,142 @@ export const TerminatedBuildWithStatus: Story = {
},
};

function activeWorkspace(apps: WorkspaceApp[]): Workspace {
export const SidebarAppDisabled: Story = {
beforeEach: () => {
spyOn(data, "fetchTask").mockResolvedValue({
prompt: "Create competitors page",
workspace: {
...MockWorkspace,
latest_build: {
...MockWorkspace.latest_build,
has_ai_task: true,
ai_task_sidebar_app_id: "claude-code",
resources: mockResources({
claudeCodeAppOverrides: {
health: "disabled",
},
}),
},
},
});
},
};

export const SidebarAppLoading: Story = {
beforeEach: () => {
spyOn(data, "fetchTask").mockResolvedValue({
prompt: "Create competitors page",
workspace: {
...MockWorkspace,
latest_build: {
...MockWorkspace.latest_build,
has_ai_task: true,
ai_task_sidebar_app_id: "claude-code",
resources: mockResources({
claudeCodeAppOverrides: {
health: "initializing",
},
}),
},
},
});
},
};

export const SidebarAppHealthy: Story = {
beforeEach: () => {
spyOn(data, "fetchTask").mockResolvedValue({
prompt: "Create competitors page",
workspace: {
...MockWorkspace,
latest_build: {
...MockWorkspace.latest_build,
has_ai_task: true,
ai_task_sidebar_app_id: "claude-code",
resources: mockResources({
claudeCodeAppOverrides: {
health: "healthy",
},
}),
},
},
});
},
};

export const BuildNoAITask: Story = {
beforeEach: () => {
spyOn(data, "fetchTask").mockImplementation(() => {
throw new WorkspaceDoesNotHaveAITaskError(MockWorkspace);
});
},
};

interface MockResourcesProps {
apps?: WorkspaceApp[];
claudeCodeAppOverrides?: Partial<WorkspaceApp>;
}

const mockResources = (
props?: MockResourcesProps,
): readonly WorkspaceResource[] => [
{
...MockWorkspaceResource,
agents: [
{
...MockWorkspaceAgent,
apps: [
...(props?.apps ?? []),
{
...MockWorkspaceApp,
id: "claude-code",
display_name: "Claude Code",
slug: "claude-code",
icon: "/icon/claude.svg",
statuses: [
MockWorkspaceAppStatus,
{
...MockWorkspaceAppStatus,
id: "2",
message: "Planning changes",
state: "working",
},
],
...(props?.claudeCodeAppOverrides ?? {}),
},
{
...MockWorkspaceApp,
id: "vscode",
slug: "vscode",
display_name: "VS Code Web",
icon: "/icon/code.svg",
},
{
...MockWorkspaceApp,
slug: "zed",
id: "zed",
display_name: "Zed",
icon: "/icon/zed.svg",
},
],
},
],
},
];

const activeWorkspace = (apps: WorkspaceApp[]): Workspace => {
return {
...MockWorkspace,
latest_build: {
...MockWorkspace.latest_build,
resources: [
{
...MockWorkspaceResource,
agents: [
{
...MockWorkspaceAgent,
apps: [
...apps,
{
...MockWorkspaceApp,
id: "claude-code",
display_name: "Claude Code",
slug: "claude-code",
icon: "/icon/claude.svg",
statuses: [
MockWorkspaceAppStatus,
{
...MockWorkspaceAppStatus,
id: "2",
message: "Planning changes",
state: "working",
},
],
},
{
...MockWorkspaceApp,
id: "vscode",
slug: "vscode",
display_name: "VS Code Web",
icon: "/icon/code.svg",
},
{
...MockWorkspaceApp,
slug: "zed",
id: "zed",
display_name: "Zed",
icon: "/icon/zed.svg",
},
],
},
],
},
],
resources: mockResources({ apps }),
},
latest_app_status: {
...MockWorkspaceAppStatus,
app_id: "claude-code",
},
};
}
};

export const Active: Story = {
decorators: [withProxyProvider()],
Expand Down
30 changes: 21 additions & 9 deletions site/src/pages/TaskPage/TaskPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { API } from "api/api";
import { getErrorDetail, getErrorMessage } from "api/errors";
import type { WorkspaceStatus } from "api/typesGenerated";
import type { Workspace, WorkspaceStatus } from "api/typesGenerated";
import { Button } from "components/Button/Button";
import { Loader } from "components/Loader/Loader";
import { Margins } from "components/Margins/Margins";
Expand Down Expand Up @@ -164,7 +164,7 @@ const TaskPage = () => {
return (
<>
<Helmet>
<title>{pageTitle(ellipsizeText(task.prompt, 64)!)}</title>
<title>{pageTitle(ellipsizeText(task.prompt, 64) ?? "Task")}</title>
</Helmet>

<div className="h-full flex justify-stretch">
Expand All @@ -177,22 +177,34 @@ const TaskPage = () => {

export default TaskPage;

export class WorkspaceDoesNotHaveAITaskError extends Error {
constructor(workspace: Workspace) {
super(
`Workspace ${workspace.owner_name}/${workspace.name} is not running an AI task`,
);
this.name = "WorkspaceDoesNotHaveAITaskError";
}
}

export const data = {
fetchTask: async (workspaceOwnerUsername: string, workspaceName: string) => {
const workspace = await API.getWorkspaceByOwnerAndName(
workspaceOwnerUsername,
workspaceName,
);
if (
workspace.latest_build.job.completed_at &&
!workspace.latest_build.has_ai_task
) {
throw new WorkspaceDoesNotHaveAITaskError(workspace);
}

const parameters = await API.getWorkspaceBuildParameters(
workspace.latest_build.id,
);
const prompt = parameters.find(
(p) => p.name === AI_PROMPT_PARAMETER_NAME,
)?.value;

if (!prompt) {
return;
}
const prompt =
parameters.find((p) => p.name === AI_PROMPT_PARAMETER_NAME)?.value ??
"Unknown prompt";

return {
workspace,
Expand Down
Loading
Loading