Skip to content
Merged
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
26 changes: 19 additions & 7 deletions apps/desktop/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@ import {
unlinkTaskPullRequest,
type BoardTask,
} from "./taskboard/taskBoard";
import { continueTaskBoardPrompt } from "./taskboard/taskBoardContinuation";

import {
actionForEvent,
Expand Down Expand Up @@ -7760,14 +7761,25 @@ export default function App() {
void selectSession(id);
}}
onAskSession={(id, prompt) => {
const paneId =
paneBoundToSession(paneContentsRef.current, id) ??
focusedPaneRef.current;
setShowTaskBoard(false);
void selectSession(id).then(() => {
clearEditorRef.current?.();
setDocMode(true);
setTimeout(() => {
void insertMarkdownRef.current?.(prompt, "replace");
focusEditorRef.current?.();
}, 0);
void continueTaskBoardPrompt({
target: { paneId, sessionId: id },
prompt,
selectSession: (sessionId, targetPaneId) =>
selectSession(sessionId, targetPaneId),
isTargetActive: () =>
focusedPaneRef.current === paneId &&
paneContentsRef.current[paneId]?.sessionId === id,
openDocumentMode: () => setDocMode(true),
insertMarkdown: (markdown, mode) =>
paneEditorRefsFor(paneId).insertMarkdownRef.current?.(
markdown,
mode,
) ?? Promise.resolve(),
focusEditor: () => paneEditorRefsFor(paneId).focusRef.current?.(),
});
}}
onStartTask={startBoardTask}
Expand Down
12 changes: 8 additions & 4 deletions apps/desktop/src/components/business/page-header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@ import type { ReactNode } from "react"

interface PageHeaderProps {
title: ReactNode
titleAccessory?: ReactNode
description?: ReactNode
actions?: ReactNode
}

function PageHeader({ title, description, actions }: PageHeaderProps) {
function PageHeader({ title, titleAccessory, description, actions }: PageHeaderProps) {
return (
<header
data-slot="page-header"
className="flex flex-col items-start justify-between gap-section sm:flex-row"
>
<div className="min-w-0 flex-1">
<h1 data-slot="page-header-title" className="text-page font-semibold tracking-tight">
{title}
</h1>
<div className="flex items-center gap-module-inset">
<h1 data-slot="page-header-title" className="text-page font-semibold tracking-tight">
{title}
</h1>
{titleAccessory}
</div>
{description ? (
<p
data-slot="page-header-description"
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src/design/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ interface ToneScale {

const TONE_SCALE: Record<ColorScheme, ToneScale> = {
light: {
surface: 1,
surface: 2,
raised: 0.25,
sidebar: 3,
muted: 6,
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src/design/tokens.css
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
/* Foundation: light palette. */
--ds-foundation-light-canvas: oklch(0.976 0.003 250);
--ds-foundation-light-sidebar: oklch(0.956 0.004 250);
--ds-foundation-light-surface: oklch(0.992 0.002 250);
--ds-foundation-light-surface: oklch(0.984 0.002 250);
--ds-foundation-light-raised: oklch(0.998 0.001 250);
--ds-foundation-light-modal: oklch(1 0 0);
--ds-foundation-light-text: oklch(0.18 0.02 265);
Expand Down
12 changes: 10 additions & 2 deletions apps/desktop/src/i18n/strings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1992,26 +1992,30 @@ export const en = {
"taskboard.expandTask": "Expand task: {title}",
"taskboard.collapseTask": "Collapse task: {title}",
"taskboard.taskSessions": "Sessions for {title}",
"taskboard.selectSession": "Select Session {number}: {title}",
"taskboard.selectSession": "Select Session {number}: {title}, status: {status}",
"taskboard.sessionOrdinal": "S-{number}",
"taskboard.currentSession": "Current",
"taskboard.archivedSession": "Archived",
"taskboard.openPullRequestCount": "{count} open pull requests",
"taskboard.openPullRequestCountPending": "Open pull request count is still loading",
"taskboard.noSessions": "No Sessions",
"taskboard.noSessionsDescription": "Start this Task to create its first execution Session.",
"taskboard.noCheckout": "No checkout",
"taskboard.worktreeDiscarded": "Worktree discarded",
"taskboard.noPullRequest": "No PR",
"taskboard.checkingPullRequest": "Checking PR…",
"taskboard.noPullRequestForSession": "This Session's checkout has no current pull request.",
"taskboard.inspector": "Task inspector",
"taskboard.inspectorViews": "Inspector views",
"taskboard.inspector.agent": "Agent",
"taskboard.inspector.details": "Details",
"taskboard.inspector.insights": "Insights",
"taskboard.showInspector": "Show inspector",
"taskboard.backToTasks": "Back to tasks",
"taskboard.hideInspector": "Hide inspector",
"taskboard.selectTask": "Select a Task to inspect it.",
"taskboard.currentSessionTitle": "Current Session",
"taskboard.selectedSession": "Selected Session",
"taskboard.taskLabel": "Task",
"taskboard.activityLabel": "Activity",
"taskboard.checkoutTitle": "Checkout",
Expand Down Expand Up @@ -4560,26 +4564,30 @@ export const zhCN: Record<StringKey, string> = {
"taskboard.expandTask": "展开任务:{title}",
"taskboard.collapseTask": "收起任务:{title}",
"taskboard.taskSessions": "{title} 的 Sessions",
"taskboard.selectSession": "选择 Session {number}:{title}",
"taskboard.selectSession": "选择 Session {number}:{title},状态:{status}",
"taskboard.sessionOrdinal": "S-{number}",
"taskboard.currentSession": "当前",
"taskboard.archivedSession": "已归档",
"taskboard.openPullRequestCount": "{count} 个打开的 pull request",
"taskboard.openPullRequestCountPending": "正在加载打开的 pull request 数量",
"taskboard.noSessions": "暂无 Session",
"taskboard.noSessionsDescription": "开始这个任务以创建第一个执行 Session。",
"taskboard.noCheckout": "没有检出目录",
"taskboard.worktreeDiscarded": "Worktree 已丢弃",
"taskboard.noPullRequest": "无 PR",
"taskboard.checkingPullRequest": "正在检查 PR…",
"taskboard.noPullRequestForSession": "这个 Session 的检出目录没有当前 pull request。",
"taskboard.inspector": "任务检查器",
"taskboard.inspectorViews": "检查器视图",
"taskboard.inspector.agent": "Agent",
"taskboard.inspector.details": "详情",
"taskboard.inspector.insights": "洞察",
"taskboard.showInspector": "显示检查器",
"taskboard.backToTasks": "返回任务列表",
"taskboard.hideInspector": "隐藏检查器",
"taskboard.selectTask": "选择一个任务以查看详情。",
"taskboard.currentSessionTitle": "当前 Session",
"taskboard.selectedSession": "选中的 Session",
"taskboard.taskLabel": "任务",
"taskboard.activityLabel": "状态",
"taskboard.checkoutTitle": "检出目录",
Expand Down
52 changes: 11 additions & 41 deletions apps/desktop/src/taskboard/TaskBoardHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type { ReactNode } from "react"

import { ChevronRight, Filter, PanelRight, Plus } from "@/components/ui/icons"
import { Filter, Plus } from "@/components/ui/icons"
import { PageHeader } from "@/components/business/page-header"
import { SearchField } from "@/components/business/search-field"
import { Badge } from "@/components/ui/badge"
import { Button } from "@/components/ui/button"
Expand All @@ -21,9 +20,6 @@ import { taskPriorityLabel } from "./TaskEditorDialog"
interface TaskBoardHeaderProps {
t: Translate
taskCount: number
headerLeadingAction?: ReactNode
inspectorOpen: boolean
onShowInspector: () => void
filtersOpen: boolean
onFiltersOpenChange: (open: boolean) => void
activeFilterCount: number
Expand All @@ -42,43 +38,16 @@ export function TaskBoardHeader(props: TaskBoardHeaderProps) {
const { t } = props
return (
<header className="shrink-0 bg-background">
<div className="flex h-layout-titlebar items-center gap-3 border-b border-border px-4 sm:px-6">
{props.headerLeadingAction ? (
<div data-taskboard-leading-action className="shrink-0">{props.headerLeadingAction}</div>
) : null}
<nav aria-label={t("taskboard.breadcrumb")} className="flex min-w-0 items-center gap-2 text-body">
<span className="text-muted-foreground">{t("taskboard.title")}</span>
<ChevronRight aria-hidden className="size-3.5 text-muted-foreground" />
<strong className="truncate">{t("taskboard.allTasks")}</strong>
</nav>
<div className="flex-1" />
{!props.inspectorOpen ? (
<Button
type="button"
variant="ghost"
size="icon-sm"
aria-label={t("taskboard.showInspector")}
onClick={props.onShowInspector}
>
<PanelRight aria-hidden />
</Button>
) : null}
</div>

<div className="flex flex-wrap items-start gap-4 px-4 py-5 sm:px-6">
<div className="min-w-0 flex-1">
<div className="flex items-center gap-2">
<h1 className="text-page font-semibold tracking-tight">{t("taskboard.allTasks")}</h1>
<div className="task-board-panel-header px-4 py-5 sm:px-6">
<PageHeader
title={t("taskboard.allTasks")}
titleAccessory={
<Badge variant="secondary" className="tabular-nums text-muted-foreground">
{props.taskCount}
</Badge>
</div>
<p className="mt-1 max-w-2xl text-body text-muted-foreground">
{t("taskboard.workspaceDescription")}
</p>
</div>

<div data-page-header-controls className="flex shrink-0 items-center gap-2">
}
description={t("taskboard.workspaceDescription")}
actions={<>
<Popover open={props.filtersOpen} onOpenChange={props.onFiltersOpenChange}>
<PopoverTrigger
render={
Expand Down Expand Up @@ -146,7 +115,8 @@ export function TaskBoardHeader(props: TaskBoardHeaderProps) {
<Plus aria-hidden />
{t("taskboard.new")}
</Button>
</div>
</>}
/>
</div>
</header>
)
Expand Down
5 changes: 4 additions & 1 deletion apps/desktop/src/taskboard/TaskBoardList.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Button } from "@/components/ui/button"
import { Separator } from "@/components/ui/separator"
import type { Locale, Translate } from "@/i18n"
import type { SidebarPullRequestStatus } from "@/sidebar/sidebarGitStatus"

Expand Down Expand Up @@ -31,13 +32,15 @@ export function TaskBoardList(props: TaskBoardListProps) {
const { t } = props
return (
<div className="min-h-0 flex-1 overflow-auto px-4 pb-4 sm:px-6 sm:pb-6">
<div className="task-board-list min-w-0 border-y border-border">
<Separator />
<div className="task-board-list min-w-0">
<div className="task-board-list-header items-center px-3 py-2 text-metadata text-muted-foreground" aria-hidden>
<span>{t("taskboard.titleHeader")}</span>
<span className="task-board-task-sessions text-center">{t("taskboard.sessionsHeader")}</span>
<span className="task-board-task-prs text-center">{t("taskboard.openPullRequestsHeader")}</span>
<span className="text-right">{t("taskboard.updatedHeader")}</span>
</div>
<Separator />
{props.renderedTasks.length > 0 ? (
<ul aria-label={t("taskboard.taskList")}>
{props.renderedTasks.map((projected) => (
Expand Down
Loading
Loading