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 numberDiff line numberDiff line change
Expand Up@@ -420,6 +420,7 @@ import {
unlinkTaskPullRequest,
type BoardTask,
} from "./taskboard/taskBoard";
import { continueTaskBoardPrompt } from "./taskboard/taskBoardContinuation";

import {
actionForEvent,
Expand DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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 numberDiff line numberDiff line change
Expand Up@@ -420,6 +420,7 @@ import {
unlinkTaskPullRequest,
type BoardTask,
} from "./taskboard/taskBoard";
import { continueTaskBoardPrompt } from "./taskboard/taskBoardContinuation";

import {
actionForEvent,
Expand DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff line change
Expand Up@@ -420,6 +420,7 @@ import {
unlinkTaskPullRequest,
type BoardTask,
} from "./taskboard/taskBoard";
import { continueTaskBoardPrompt } from "./taskboard/taskBoardContinuation";

import {
actionForEvent,
Expand DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff line change
Expand Up@@ -420,6 +420,7 @@ import {
unlinkTaskPullRequest,
type BoardTask,
} from "./taskboard/taskBoard";
import { continueTaskBoardPrompt } from "./taskboard/taskBoardContinuation";

import {
actionForEvent,
Expand DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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 numberDiff line numberDiff line change
Expand Up@@ -420,6 +420,7 @@ import {
unlinkTaskPullRequest,
type BoardTask,
} from "./taskboard/taskBoard";
import { continueTaskBoardPrompt } from "./taskboard/taskBoardContinuation";

import {
actionForEvent,
Expand DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff line change
Expand Up@@ -420,6 +420,7 @@ import {
unlinkTaskPullRequest,
type BoardTask,
} from "./taskboard/taskBoard";
import { continueTaskBoardPrompt } from "./taskboard/taskBoardContinuation";

import {
actionForEvent,
Expand DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff line change
Expand Up@@ -420,6 +420,7 @@ import {
unlinkTaskPullRequest,
type BoardTask,
} from "./taskboard/taskBoard";
import { continueTaskBoardPrompt } from "./taskboard/taskBoardContinuation";

import {
actionForEvent,
Expand DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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 numberDiff line numberDiff line change
Expand Up@@ -420,6 +420,7 @@ import {
unlinkTaskPullRequest,
type BoardTask,
} from "./taskboard/taskBoard";
import { continueTaskBoardPrompt } from "./taskboard/taskBoardContinuation";

import {
actionForEvent,
Expand DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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