Merge commit '6541a2dd82402ac85c79811eff69329d6bf30b71'

Author: Pyiner

desktop/garyx-desktop/src/main/gary-client.test.mjs

@@ -174,13 +174,14 @@ test("listTaskForest maps parent and run-state fields", async () => {
         status: "in_progress",
         sourceBot: "test-bot",
         includeDone: true,
+        scope: "active",
       },
     );
 
     assert.equal(urls.length, 1);
     assert.equal(
       urls[0],
-      "http://127.0.0.1:31337/api/tasks/forest?status=in_progress&source_bot_id=test-bot&include_done=true",
+      "http://127.0.0.1:31337/api/tasks/forest?status=in_progress&source_bot_id=test-bot&include_done=true&scope=active",
     );
     assert.equal(page.total, 1);
     assert.equal(page.projectionCurrent, true);

desktop/garyx-desktop/src/main/gary-client.ts

@@ -5203,6 +5203,9 @@ export async function listTaskForest(
   if (input.includeDone !== false) {
     query.set("include_done", "true");
   }
+  if (input.scope) {
+    query.set("scope", input.scope);
+  }
 
   const suffix = query.toString();
   const payload = await requestJson<TaskForestPayload>(

desktop/garyx-desktop/src/renderer/src/app-shell/components/TaskForestConsole.tsx

@@ -243,6 +243,7 @@ export function TaskForestConsole({
   );
 
   useEffect(() => {
+    mountedRef.current = true;
     return () => {
       mountedRef.current = false;
       if (smoothCameraTimeoutRef.current !== null) {
@@ -350,6 +351,7 @@ export function TaskForestConsole({
         try {
           const page = await getDesktopApi().listTaskForest({
             includeDone: true,
+            scope: "active",
             sourceBot,
           });
           if (!mountedRef.current || skipResultForRequestRef.current === requestSequence) {
@@ -904,7 +906,7 @@ export function TaskForestConsole({
         ) : error ? (
           <div className="task-forest-state error">{error}</div>
         ) : !tasks.length ? (
-          <div className="task-forest-state">{t("No tasks yet.")}</div>
+          <div className="task-forest-state">{t("No active tasks right now.")}</div>
         ) : null}
         <div
           className={`task-forest-world ${birdseye ? "birdseye" : ""} ${smoothCamera ? "smooth-camera" : ""}`}

desktop/garyx-desktop/src/renderer/src/app-shell/components/TasksPanel.tsx

@@ -269,7 +269,7 @@ export function TasksPanel({
 }: TasksPanelProps) {
   const { t } = useI18n();
   const { entries: pluginCatalog } = useChannelPluginCatalog();
-  const [viewMode, setViewMode] = useState<TaskViewMode>('board');
+  const [viewMode, setViewMode] = useState<TaskViewMode>('forest');
   const [tasks, setTasks] = useState<DesktopTaskSummary[]>([]);
   const [total, setTotal] = useState(0);
   const [loading, setLoading] = useState(false);

desktop/garyx-desktop/src/renderer/src/app-shell/components/task-forest-layout.test.mjs

@@ -101,6 +101,36 @@ test("summarizes hidden descendants at the depth cap", () => {
   assert.equal(capped.descendantStatusCounts.done, 1);
 });
 
+test("handles rootless cycles without recursing forever", () => {
+  const layout = buildTaskForestLayout(
+    [
+      task({ number: 1, parentTaskNumber: 2 }),
+      task({ number: 2, parentTaskNumber: 1 }),
+    ],
+    { maxDepth: 4 },
+  );
+
+  assert.deepEqual(
+    layout.nodes.map((node) => node.task.number).sort((left, right) => left - right),
+    [1, 2],
+  );
+});
+
+test("lays out a large deep chain within a bounded time", () => {
+  const tasks = Array.from({ length: 1200 }, (_, index) =>
+    task({
+      number: index + 1,
+      parentTaskNumber: index === 0 ? null : index,
+    }),
+  );
+  const start = Date.now();
+  const layout = buildTaskForestLayout(tasks, { maxDepth: tasks.length });
+  const elapsedMs = Date.now() - start;
+
+  assert.equal(layout.nodes.length, tasks.length);
+  assert.ok(elapsedMs < 750, `layout took ${elapsedMs}ms`);
+});
+
 test("selects visible nodes with viewport overscan", () => {
   const layout = buildTaskForestLayout(
     [

desktop/garyx-desktop/src/renderer/src/app-shell/components/task-forest-layout.ts

@@ -166,50 +166,83 @@ export function buildTaskForestLayout(
     children.sort(compareTasks);
   }
 
-  const subtreeCounts = new Map<number, Record<DesktopTaskStatus, number>>();
-  const subtreeSizes = new Map<number, number>();
+  const subtreeValues = new Map<
+    number,
+    { size: number; counts: Record<DesktopTaskStatus, number> }
+  >();
+  const visiting = new Set<number>();
 
-  function collect(task: DesktopTaskForestNode, seen = new Set<number>()): {
+  function collect(task: DesktopTaskForestNode): {
     size: number;
     counts: Record<DesktopTaskStatus, number>;
   } {
-    if (seen.has(task.number)) {
+    const memoized = subtreeValues.get(task.number);
+    if (memoized) {
+      return memoized;
+    }
+    if (visiting.has(task.number)) {
       return { size: 0, counts: { ...EMPTY_STATUS_COUNTS } };
     }
-    seen.add(task.number);
+    visiting.add(task.number);
     let size = 1;
     let counts = { ...EMPTY_STATUS_COUNTS };
     for (const child of childrenByParent.get(task.number) ?? []) {
+      if (visiting.has(child.number)) {
+        continue;
+      }
       counts[child.status] += 1;
-      const childValue = collect(child, new Set(seen));
+      const childValue = collect(child);
       size += childValue.size;
       counts = mergeCounts(counts, childValue.counts);
     }
-    subtreeCounts.set(task.number, counts);
-    subtreeSizes.set(task.number, size);
-    return { size, counts };
+    visiting.delete(task.number);
+    const value = { size, counts };
+    subtreeValues.set(task.number, value);
+    return value;
   }
 
   for (const root of roots) {
     collect(root);
   }
+  for (const task of tasks) {
+    if (!subtreeValues.has(task.number)) {
+      roots.push(task);
+      collect(task);
+    }
+  }
 
   roots.sort((left, right) => {
     const runningDelta = Number(isRunning(right)) - Number(isRunning(left));
     return (
       runningDelta ||
-      (subtreeSizes.get(right.number) ?? 1) - (subtreeSizes.get(left.number) ?? 1) ||
+      (subtreeValues.get(right.number)?.size ?? 1) -
+        (subtreeValues.get(left.number)?.size ?? 1) ||
       updatedTime(right) - updatedTime(left) ||
       left.number - right.number
     );
   });
 
   const nodes: TaskForestLayoutNode[] = [];
+  const placed = new Set<number>();
   let nextY = 24;
 
-  function place(task: DesktopTaskForestNode, depth: number, yHint: number): number {
+  function place(
+    task: DesktopTaskForestNode,
+    depth: number,
+    yHint: number,
+    path = new Set<number>(),
+  ): number {
+    if (placed.has(task.number) || path.has(task.number)) {
+      return yHint;
+    }
+    path.add(task.number);
     const visibleChildren =
-      depth + 1 < maxDepth ? childrenByParent.get(task.number) ?? [] : [];
+      depth + 1 < maxDepth
+        ? (childrenByParent.get(task.number) ?? []).filter(
+            (child) => !path.has(child.number),
+          )
+        : [];
+    const subtree = subtreeValues.get(task.number);
     if (visibleChildren.length === 0) {
       nodes.push({
         task,
@@ -219,16 +252,18 @@ export function buildTaskForestLayout(
         height: nodeHeight,
         depth,
         hiddenDescendantCount:
-          depth + 1 >= maxDepth ? Math.max(0, (subtreeSizes.get(task.number) ?? 1) - 1) : 0,
-        descendantStatusCounts: subtreeCounts.get(task.number) ?? { ...EMPTY_STATUS_COUNTS },
+          depth + 1 >= maxDepth ? Math.max(0, (subtree?.size ?? 1) - 1) : 0,
+        descendantStatusCounts: subtree?.counts ?? { ...EMPTY_STATUS_COUNTS },
       });
+      placed.add(task.number);
+      path.delete(task.number);
       return yHint + nodeHeight + rowGap;
     }
 
     let childY = yHint;
     const childStart = childY;
     for (const child of visibleChildren) {
-      childY = place(child, depth + 1, childY);
+      childY = place(child, depth + 1, childY, path);
     }
     const childEnd = childY - rowGap;
     const y = Math.max(yHint, childStart + (childEnd - childStart - nodeHeight) / 2);
@@ -240,8 +275,10 @@ export function buildTaskForestLayout(
       height: nodeHeight,
       depth,
       hiddenDescendantCount: 0,
-      descendantStatusCounts: subtreeCounts.get(task.number) ?? { ...EMPTY_STATUS_COUNTS },
+      descendantStatusCounts: subtree?.counts ?? { ...EMPTY_STATUS_COUNTS },
     });
+    placed.add(task.number);
+    path.delete(task.number);
     return Math.max(childY, y + nodeHeight + rowGap);
   }
 

desktop/garyx-desktop/src/renderer/src/i18n/index.tsx

@@ -399,6 +399,7 @@ const zhCN: Record<string, string> = {
   'Delete task {taskId}? The task will leave task lists, but the backing thread and transcript stay available.': '删除任务 {taskId}？该任务会从任务列表中移除，但对应线程和转录仍会保留。',
   'Tasks are disabled in the gateway config.': '网关配置中尚未启用任务功能。',
   'No tasks yet.': '还没有任务。',
+  'No active tasks right now.': '当前没有活跃任务。',
   'No tasks from this thread yet.': '当前线程还没有创建任务。',
   'Open a thread to see its tasks.': '打开线程后查看它创建的任务。',
   'No {status} tasks.': '没有{status}任务。',

desktop/garyx-desktop/src/shared/contracts.ts

@@ -267,6 +267,8 @@ export interface DesktopTaskForestPage {
   projectionCurrent: boolean;
 }
 
+export type DesktopTaskForestScope = 'active' | 'all';
+
 export interface DesktopDreamSpan {
   spanId: string;
   dreamId: string;
@@ -336,7 +338,9 @@ export interface ListTasksInput {
   offset?: number;
 }
 
-export interface ListTaskForestInput extends ListTasksInput {}
+export interface ListTaskForestInput extends ListTasksInput {
+  scope?: DesktopTaskForestScope;
+}
 
 export interface GetTaskInput {
   taskId: string;