From 56a7856dafff976ff36a700cb0930df5814b9340 Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Mon, 17 Aug 2026 11:04:51 +0800
Subject: [PATCH 01/22] feat(desktop): expose the Work Board store through
 main-process IPC

Phase 1 slice 1: the Desktop main process owns WorkBoardStore and registers
workBoard:list/create/update/archive/unarchive/remove handlers plus a
workBoard:changed signal. Renderer code stays read-only through IPC; Runtime
Host and model tools are not involved.

Generated-by: Codex
---
 .../__tests__/work-board-ipc-main.test.ts     | 193 ++++++++++++++++++
 apps/desktop/src/main/runtime-host-boot.ts    |   2 +
 apps/desktop/src/main/work-board-ipc-main.ts  | 162 +++++++++++++++
 3 files changed, 357 insertions(+)
 create mode 100644 apps/desktop/src/main/__tests__/work-board-ipc-main.test.ts
 create mode 100644 apps/desktop/src/main/work-board-ipc-main.ts

diff --git a/apps/desktop/src/main/__tests__/work-board-ipc-main.test.ts b/apps/desktop/src/main/__tests__/work-board-ipc-main.test.ts
new file mode 100644
index 0000000000..11c4588253
--- /dev/null
+++ b/apps/desktop/src/main/__tests__/work-board-ipc-main.test.ts
@@ -0,0 +1,193 @@
+import assert from 'node:assert/strict';
+import { mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { describe, test } from 'node:test';
+import type { IpcMain } from 'electron';
+import {
+  registerWorkBoardIpc,
+  type WorkBoardChangedEvent,
+  type WorkBoardIpcResult,
+} from '../work-board-ipc-main.js';
+
+interface FakeIpcMain {
+  handle(channel: string, handler: (...args: unknown[]) => unknown): void;
+  invoke<T>(channel: string, ...args: unknown[]): Promise<T>;
+}
+
+function createFakeIpcMain(): FakeIpcMain & { readonly channels: string[] } {
+  const handlers = new Map<string, (...args: unknown[]) => unknown>();
+  const channels: string[] = [];
+  return {
+    channels,
+    handle(channel, handler) {
+      channels.push(channel);
+      handlers.set(channel, handler);
+    },
+    invoke<T>(channel: string, ...args: unknown[]): Promise<T> {
+      const handler = handlers.get(channel);
+      if (!handler) throw new Error(`No handler registered for ${channel}`);
+      return Promise.resolve(handler(undefined, ...args)) as Promise<T>;
+    },
+  };
+}
+
+function createFakeWindowController(): {
+  readonly events: Array<{ channel: string; args: unknown[] }>;
+  send(channel: string, ...args: unknown[]): void;
+} {
+  const events: Array<{ channel: string; args: unknown[] }> = [];
+  return {
+    events,
+    send(channel, ...args) {
+      events.push({ channel, args });
+    },
+  };
+}
+
+function itemInput(): {
+  scope: { kind: 'inbox' };
+  title: string;
+  creator: { kind: 'user' };
+  provenance: { kind: 'manual' };
+} {
+  return {
+    scope: { kind: 'inbox' },
+    title: 'Review auth',
+    creator: { kind: 'user' },
+    provenance: { kind: 'manual' },
+  };
+}
+
+async function withTempRoot(run: (root: string) => Promise<void>): Promise<void> {
+  const root = await mkdtemp(join(tmpdir(), 'maka-work-board-ipc-'));
+  try {
+    await run(root);
+  } finally {
+    await rm(root, { recursive: true, force: true });
+  }
+}
+
+describe('Work Board IPC', () => {
+  test('creates and lists items and emits change signals', async () => {
+    await withTempRoot(async (root) => {
+      const ipc = createFakeIpcMain();
+      const window = createFakeWindowController();
+      registerWorkBoardIpc({
+        ipcMain: ipc as unknown as Pick<IpcMain, 'handle'>,
+        workspaceRoot: root,
+        mainWindowController: window,
+      });
+
+      const created = await ipc.invoke<WorkBoardIpcResult<{ id: string; revision: number }>>(
+        'workBoard:create',
+        itemInput(),
+      );
+      assert.equal(created.ok, true);
+      assert.ok(created.ok && created.value.id);
+
+      const page = await ipc.invoke<WorkBoardIpcResult<{ items: Array<{ id: string }> }>>(
+        'workBoard:list',
+        {},
+      );
+      assert.equal(page.ok, true);
+      assert.ok(page.ok);
+      assert.equal(page.value.items.length, 1);
+      assert.equal(page.value.items[0]?.id, created.ok ? created.value.id : undefined);
+
+      const changed = window.events.filter(
+        (event) => event.channel === 'workBoard:changed',
+      );
+      assert.equal(changed.length, 1);
+      const event = changed[0]?.args[0] as WorkBoardChangedEvent;
+      assert.equal(event.type, 'work_board_changed');
+      assert.ok(typeof event.ts === 'number');
+      assert.deepEqual(ipc.channels, [
+        'workBoard:list',
+        'workBoard:create',
+        'workBoard:update',
+        'workBoard:archive',
+        'workBoard:unarchive',
+        'workBoard:remove',
+      ]);
+    });
+  });
+
+  test('applies lifecycle mutations and fails closed on invalid input', async () => {
+    await withTempRoot(async (root) => {
+      const ipc = createFakeIpcMain();
+      const window = createFakeWindowController();
+      registerWorkBoardIpc({
+        ipcMain: ipc as unknown as Pick<IpcMain, 'handle'>,
+        workspaceRoot: root,
+        mainWindowController: window,
+      });
+
+      const created = await ipc.invoke<WorkBoardIpcResult<{ id: string; revision: number }>>(
+        'workBoard:create',
+        itemInput(),
+      );
+      assert.ok(created.ok);
+      const id = created.ok ? created.value.id : '';
+
+      const renamed = await ipc.invoke<
+        WorkBoardIpcResult<{ title: string; revision: number; state: string }>
+      >('workBoard:update', id, { title: 'Review auth v2' });
+      assert.ok(renamed.ok);
+      assert.equal(renamed.ok && renamed.value.revision, 2);
+
+      const removedBeforeArchive = await ipc.invoke<WorkBoardIpcResult<null>>(
+        'workBoard:remove',
+        id,
+      );
+      assert.equal(removedBeforeArchive.ok, false);
+      if (!removedBeforeArchive.ok) {
+        assert.equal(removedBeforeArchive.code, 'must_archive_first');
+      }
+
+      const archived = await ipc.invoke<
+        WorkBoardIpcResult<{ archived: boolean; revision: number }>
+      >('workBoard:archive', id);
+      assert.ok(archived.ok);
+      assert.equal(archived.ok && archived.value.archived, true);
+
+      const reopened = await ipc.invoke<
+        WorkBoardIpcResult<{ archived: boolean; revision: number }>
+      >('workBoard:unarchive', id);
+      assert.ok(reopened.ok);
+      assert.equal(reopened.ok && reopened.value.archived, false);
+
+      const invalidPatch = await ipc.invoke<WorkBoardIpcResult<unknown>>(
+        'workBoard:update',
+        id,
+        { titel: 'x' },
+      );
+      assert.equal(invalidPatch.ok, false);
+      if (!invalidPatch.ok) assert.equal(invalidPatch.code, 'invalid_input');
+
+      const invalidCreate = await ipc.invoke<WorkBoardIpcResult<unknown>>(
+        'workBoard:create',
+        { ...itemInput(), notes: null },
+      );
+      assert.equal(invalidCreate.ok, false);
+      if (!invalidCreate.ok) assert.equal(invalidCreate.code, 'invalid_input');
+
+      await ipc.invoke('workBoard:archive', id);
+      const removed = await ipc.invoke<WorkBoardIpcResult<null>>('workBoard:remove', id);
+      assert.ok(removed.ok);
+
+      const page = await ipc.invoke<WorkBoardIpcResult<{ items: unknown[] }>>(
+        'workBoard:list',
+        {},
+      );
+      assert.ok(page.ok);
+      assert.equal(page.ok && page.value.items.length, 0);
+
+      // create, update, archive, unarchive, archive, remove = 6 mutations
+      const changed = window.events.filter(
+        (event) => event.channel === 'workBoard:changed',
+      );
+      assert.equal(changed.length, 6);
+    });
+  });
+});
diff --git a/apps/desktop/src/main/runtime-host-boot.ts b/apps/desktop/src/main/runtime-host-boot.ts
index 9d67cf7ac5..78cbab6f8a 100644
--- a/apps/desktop/src/main/runtime-host-boot.ts
+++ b/apps/desktop/src/main/runtime-host-boot.ts
@@ -121,6 +121,7 @@ import {
 import { registerNotificationsIpc } from "./notifications-ipc-main.js";
 import { registerMarkdownSaveIpc } from "./markdown-save-ipc-main.js";
 import { registerPetPackIpc } from "./pet-pack-import.js";
+import { registerWorkBoardIpc } from "./work-board-ipc-main.js";
 import {
   createPermissionOverlayMain,
   registerPermissionOverlayIpc,
@@ -665,6 +666,7 @@ mcpManager.onChange(() => {
 
 registerPersistentClientIpc();
 registerPetPackIpc({ ipcMain, workspaceRoot, mainWindowController, settingsStore });
+registerWorkBoardIpc({ ipcMain, workspaceRoot, mainWindowController });
 const browserIpc = registerBrowserIpc({
   mainWindowController,
   isHostActive: (scope) => runtimeHostManager?.ownsScope(scope) === true,
diff --git a/apps/desktop/src/main/work-board-ipc-main.ts b/apps/desktop/src/main/work-board-ipc-main.ts
new file mode 100644
index 0000000000..561ceba46d
--- /dev/null
+++ b/apps/desktop/src/main/work-board-ipc-main.ts
@@ -0,0 +1,162 @@
+import type { IpcMain } from 'electron';
+import type { WorkBoardItem, WorkBoardPage } from '@maka/core/work-board';
+import {
+  createWorkBoardStore,
+  WorkBoardStoreError,
+  type WorkBoardStore,
+  type WorkBoardStoreErrorCode,
+  type WorkBoardMutationOptions,
+} from '@maka/storage/work-board-store';
+import type { createMainWindowController } from './main-window.js';
+
+type MainWindowController = Pick<ReturnType<typeof createMainWindowController>, 'send'>;
+
+export type WorkBoardIpcResult<T> =
+  | { readonly ok: true; readonly value: T }
+  | {
+      readonly ok: false;
+      readonly code: WorkBoardStoreErrorCode | 'unknown';
+      readonly message: string;
+    };
+
+export interface WorkBoardChangedEvent {
+  readonly type: 'work_board_changed';
+  readonly ts: number;
+}
+
+/**
+ * Desktop main process owns the Work Board store (the v1 mutation boundary).
+ * Renderer code reads a projection through IPC and reloads on the change
+ * signal; the Runtime Host and model tools are intentionally not involved.
+ */
+export function registerWorkBoardIpc(input: {
+  readonly ipcMain: Pick<IpcMain, 'handle'>;
+  readonly workspaceRoot: string;
+  readonly mainWindowController: MainWindowController;
+  readonly store?: WorkBoardStore;
+  readonly now?: () => number;
+}): void {
+  const store = input.store ?? createWorkBoardStore(input.workspaceRoot);
+  const now = input.now ?? Date.now;
+  const emitChanged = (): void => {
+    input.mainWindowController.send('workBoard:changed', {
+      type: 'work_board_changed',
+      ts: now(),
+    } satisfies WorkBoardChangedEvent);
+  };
+
+  input.ipcMain.handle(
+    'workBoard:list',
+    async (_event, query: unknown): Promise<WorkBoardIpcResult<WorkBoardPage>> => {
+      try {
+        return { ok: true, value: await store.list(query) };
+      } catch (error) {
+        return { ok: false, ...workBoardFailure(error) };
+      }
+    },
+  );
+
+  input.ipcMain.handle(
+    'workBoard:create',
+    async (_event, item: unknown): Promise<WorkBoardIpcResult<WorkBoardItem>> => {
+      try {
+        const created = await store.create(item);
+        emitChanged();
+        return { ok: true, value: created };
+      } catch (error) {
+        return { ok: false, ...workBoardFailure(error) };
+      }
+    },
+  );
+
+  input.ipcMain.handle(
+    'workBoard:update',
+    async (
+      _event,
+      id: unknown,
+      patch: unknown,
+      options?: unknown,
+    ): Promise<WorkBoardIpcResult<WorkBoardItem>> => {
+      try {
+        const updated = await store.update(
+          requireWorkBoardId(id),
+          patch,
+          options as WorkBoardMutationOptions | undefined,
+        );
+        emitChanged();
+        return { ok: true, value: updated };
+      } catch (error) {
+        return { ok: false, ...workBoardFailure(error) };
+      }
+    },
+  );
+
+  input.ipcMain.handle(
+    'workBoard:archive',
+    async (_event, id: unknown, options?: unknown): Promise<WorkBoardIpcResult<WorkBoardItem>> => {
+      try {
+        const archived = await store.archive(
+          requireWorkBoardId(id),
+          options as WorkBoardMutationOptions | undefined,
+        );
+        emitChanged();
+        return { ok: true, value: archived };
+      } catch (error) {
+        return { ok: false, ...workBoardFailure(error) };
+      }
+    },
+  );
+
+  input.ipcMain.handle(
+    'workBoard:unarchive',
+    async (_event, id: unknown, options?: unknown): Promise<WorkBoardIpcResult<WorkBoardItem>> => {
+      try {
+        const unarchived = await store.unarchive(
+          requireWorkBoardId(id),
+          options as WorkBoardMutationOptions | undefined,
+        );
+        emitChanged();
+        return { ok: true, value: unarchived };
+      } catch (error) {
+        return { ok: false, ...workBoardFailure(error) };
+      }
+    },
+  );
+
+  input.ipcMain.handle(
+    'workBoard:remove',
+    async (
+      _event,
+      id: unknown,
+      options?: unknown,
+    ): Promise<WorkBoardIpcResult<null>> => {
+      try {
+        await store.remove(requireWorkBoardId(id), options as WorkBoardMutationOptions | undefined);
+        emitChanged();
+        return { ok: true, value: null };
+      } catch (error) {
+        return { ok: false, ...workBoardFailure(error) };
+      }
+    },
+  );
+}
+
+function requireWorkBoardId(id: unknown): string {
+  if (typeof id !== 'string') {
+    throw new WorkBoardStoreError('invalid_input', 'Work Board item id must be a string');
+  }
+  return id;
+}
+
+function workBoardFailure(error: unknown): {
+  readonly code: WorkBoardStoreErrorCode | 'unknown';
+  readonly message: string;
+} {
+  if (error instanceof WorkBoardStoreError) {
+    return { code: error.code, message: error.message };
+  }
+  return {
+    code: 'unknown',
+    message: error instanceof Error ? error.message : 'Work Board operation failed',
+  };
+}

From 0e05f60b933a9b3256483075374757c7556a3a40 Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Mon, 17 Aug 2026 11:11:06 +0800
Subject: [PATCH 02/22] feat(desktop): expose Work Board IPC through the
 preload bridge

Phase 1 slice 2: shared IPC result/change types, window.maka.workBoard
namespace in the preload bridge, and a renderer useWorkBoard hook that
reloads on the workBoard:changed signal.

Generated-by: Codex
---
 apps/desktop/src/main/work-board-ipc-main.ts  |  16 +--
 apps/desktop/src/preload/bridge-contract.d.ts |  23 ++++
 apps/desktop/src/preload/preload.ts           |  27 +++++
 apps/desktop/src/renderer/use-work-board.ts   | 113 ++++++++++++++++++
 apps/desktop/src/shared/work-board-ipc.ts     |  14 +++
 5 files changed, 180 insertions(+), 13 deletions(-)
 create mode 100644 apps/desktop/src/renderer/use-work-board.ts
 create mode 100644 apps/desktop/src/shared/work-board-ipc.ts

diff --git a/apps/desktop/src/main/work-board-ipc-main.ts b/apps/desktop/src/main/work-board-ipc-main.ts
index 561ceba46d..ae99945fcf 100644
--- a/apps/desktop/src/main/work-board-ipc-main.ts
+++ b/apps/desktop/src/main/work-board-ipc-main.ts
@@ -8,21 +8,11 @@ import {
   type WorkBoardMutationOptions,
 } from '@maka/storage/work-board-store';
 import type { createMainWindowController } from './main-window.js';
+import type { WorkBoardChangedEvent, WorkBoardIpcResult } from '../shared/work-board-ipc.js';
 
-type MainWindowController = Pick<ReturnType<typeof createMainWindowController>, 'send'>;
-
-export type WorkBoardIpcResult<T> =
-  | { readonly ok: true; readonly value: T }
-  | {
-      readonly ok: false;
-      readonly code: WorkBoardStoreErrorCode | 'unknown';
-      readonly message: string;
-    };
+export type { WorkBoardChangedEvent, WorkBoardIpcResult } from '../shared/work-board-ipc.js';
 
-export interface WorkBoardChangedEvent {
-  readonly type: 'work_board_changed';
-  readonly ts: number;
-}
+type MainWindowController = Pick<ReturnType<typeof createMainWindowController>, 'send'>;
 
 /**
  * Desktop main process owns the Work Board store (the v1 mutation boundary).
diff --git a/apps/desktop/src/preload/bridge-contract.d.ts b/apps/desktop/src/preload/bridge-contract.d.ts
index f05bdac90d..f7f1d862c3 100644
--- a/apps/desktop/src/preload/bridge-contract.d.ts
+++ b/apps/desktop/src/preload/bridge-contract.d.ts
@@ -101,6 +101,8 @@ import type {
   DesktopTranscriptHandle,
 } from './transcript-contract.js';
 import type { PetPackManifestV1 } from '@maka/core/pet';
+import type { WorkBoardItem, WorkBoardListQuery, WorkBoardPage } from '@maka/core/work-board';
+import type { WorkBoardMutationOptions } from '@maka/storage/work-board-store';
 import type {
   OperationInput,
   OperationOutput,
@@ -149,6 +151,7 @@ export type AppIconImportResult =
     };
 
 export type { DesktopSessionSummary } from '../shared/desktop-session-projection.js';
+export type { WorkBoardChangedEvent, WorkBoardIpcResult } from '../shared/work-board-ipc.js';
 import type { DesktopConnectionSnapshot } from '../shared/desktop-connection-snapshot.js';
 import type { DesktopExternalSessionCatalogItem } from './external-session-catalog.js';
 import type { DesktopDiagnosticInput } from './diagnostics-contract.js';
@@ -657,6 +660,26 @@ export interface MakaBridge {
     subscribeChanges(handler: (event: PetPackChangedEvent) => void): () => void;
   };
 
+  workBoard: {
+    list(query?: WorkBoardListQuery): Promise<WorkBoardIpcResult<WorkBoardPage>>;
+    create(item: unknown): Promise<WorkBoardIpcResult<WorkBoardItem>>;
+    update(
+      id: string,
+      patch: unknown,
+      options?: WorkBoardMutationOptions,
+    ): Promise<WorkBoardIpcResult<WorkBoardItem>>;
+    archive(
+      id: string,
+      options?: WorkBoardMutationOptions,
+    ): Promise<WorkBoardIpcResult<WorkBoardItem>>;
+    unarchive(
+      id: string,
+      options?: WorkBoardMutationOptions,
+    ): Promise<WorkBoardIpcResult<WorkBoardItem>>;
+    remove(id: string, options?: WorkBoardMutationOptions): Promise<WorkBoardIpcResult<null>>;
+    subscribeChanges(handler: (event: WorkBoardChangedEvent) => void): () => void;
+  };
+
   tasks: {
     list(sessionId: string): Promise<Task[]>;
     subscribeChanges(handler: (event: TaskLedgerChangedEvent) => void): () => void;
diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.ts
index 67b2c15bb7..cd01d8d958 100644
--- a/apps/desktop/src/preload/preload.ts
+++ b/apps/desktop/src/preload/preload.ts
@@ -36,6 +36,7 @@ import type {
   AppUpdateStatus,
   WindowCommand,
   PetPackChangedEvent,
+  WorkBoardChangedEvent,
   DesktopRuntimeHostProfileAddInput,
   DesktopRuntimeHostProfileChangedEvent,
   DesktopRuntimeHostProfileSnapshot,
@@ -1341,6 +1342,32 @@ const makaBridge = {
       return () => ipcRenderer.off('pets:changed', listener);
     },
   },
+  workBoard: {
+    list(query) {
+      return ipcRenderer.invoke('workBoard:list', query);
+    },
+    create(item) {
+      return ipcRenderer.invoke('workBoard:create', item);
+    },
+    update(id, patch, options) {
+      return ipcRenderer.invoke('workBoard:update', id, patch, options);
+    },
+    archive(id, options) {
+      return ipcRenderer.invoke('workBoard:archive', id, options);
+    },
+    unarchive(id, options) {
+      return ipcRenderer.invoke('workBoard:unarchive', id, options);
+    },
+    remove(id, options) {
+      return ipcRenderer.invoke('workBoard:remove', id, options);
+    },
+    subscribeChanges(handler: (event: WorkBoardChangedEvent) => void): () => void {
+      const listener = (_event: Electron.IpcRendererEvent, payload: WorkBoardChangedEvent) =>
+        handler(payload);
+      ipcRenderer.on('workBoard:changed', listener);
+      return () => ipcRenderer.off('workBoard:changed', listener);
+    },
+  },
   tasks: {
     list(sessionId: string): Promise<Task[]> {
       return invokeProjectedSessionRuntimeHost('tasks:list', sessionId);
diff --git a/apps/desktop/src/renderer/use-work-board.ts b/apps/desktop/src/renderer/use-work-board.ts
new file mode 100644
index 0000000000..0c43f073a6
--- /dev/null
+++ b/apps/desktop/src/renderer/use-work-board.ts
@@ -0,0 +1,113 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+import type {
+  CreateWorkBoardItemInput,
+  UpdateWorkBoardItemInput,
+  WorkBoardItem,
+  WorkBoardListQuery,
+} from '@maka/core/work-board';
+import type { WorkBoardMutationOptions } from '@maka/storage/work-board-store';
+import type { WorkBoardChangedEvent, WorkBoardIpcResult } from '../shared/work-board-ipc.js';
+
+interface WorkBoardSnapshot {
+  items: WorkBoardItem[];
+  loading: boolean;
+  error?: string;
+}
+
+export interface UseWorkBoardResult extends WorkBoardSnapshot {
+  retry(): void;
+  create(input: CreateWorkBoardItemInput): Promise<WorkBoardItem>;
+  update(
+    id: string,
+    patch: UpdateWorkBoardItemInput,
+    options?: WorkBoardMutationOptions,
+  ): Promise<WorkBoardItem>;
+  archive(id: string, options?: WorkBoardMutationOptions): Promise<WorkBoardItem>;
+  unarchive(id: string, options?: WorkBoardMutationOptions): Promise<WorkBoardItem>;
+  remove(id: string, options?: WorkBoardMutationOptions): Promise<void>;
+}
+
+const EMPTY_SNAPSHOT: WorkBoardSnapshot = {
+  items: [],
+  loading: false,
+};
+
+function requireResult<T>(result: WorkBoardIpcResult<T>): T {
+  if (result.ok) return result.value;
+  throw new Error(result.message);
+}
+
+/**
+ * Read-only renderer projection of the Work Board store. All mutations are
+ * routed through the Desktop main process; the change signal triggers a reload
+ * so the panel never caches a second execution authority.
+ */
+export function useWorkBoard(query?: WorkBoardListQuery): UseWorkBoardResult {
+  const revisionRef = useRef(0);
+  const [snapshot, setSnapshot] = useState<WorkBoardSnapshot>(EMPTY_SNAPSHOT);
+
+  const load = useCallback(
+    (preserveItems: boolean) => {
+      const revision = ++revisionRef.current;
+      setSnapshot((current) => ({
+        items: preserveItems ? current.items : [],
+        loading: true,
+      }));
+      void window.maka.workBoard.list(query).then(
+        (result) => {
+          if (revision !== revisionRef.current) return;
+          setSnapshot(
+            result.ok
+              ? { items: result.value.items, loading: false }
+              : { items: [], loading: false, error: result.message },
+          );
+        },
+        (error: unknown) => {
+          if (revision !== revisionRef.current) return;
+          setSnapshot((current) => ({
+            items: current.items,
+            loading: false,
+            error: error instanceof Error ? error.message : 'Work Board load failed',
+          }));
+        },
+      );
+    },
+    [query],
+  );
+
+  useEffect(() => {
+    revisionRef.current += 1;
+    const unsubscribe = window.maka.workBoard.subscribeChanges(
+      (_event: WorkBoardChangedEvent) => load(true),
+    );
+    load(false);
+    return () => {
+      revisionRef.current += 1;
+      unsubscribe();
+    };
+  }, [load]);
+
+  const retry = useCallback(() => load(true), [load]);
+
+  const mutate = useCallback(
+    async <T>(operation: () => Promise<WorkBoardIpcResult<T>>): Promise<T> => {
+      const value = requireResult(await operation());
+      await load(true);
+      return value;
+    },
+    [load],
+  );
+
+  return {
+    ...snapshot,
+    retry,
+    create: (input) => mutate(() => window.maka.workBoard.create(input)),
+    update: (id, patch, options) =>
+      mutate(() => window.maka.workBoard.update(id, patch, options)),
+    archive: (id, options) => mutate(() => window.maka.workBoard.archive(id, options)),
+    unarchive: (id, options) => mutate(() => window.maka.workBoard.unarchive(id, options)),
+    remove: async (id, options) => {
+      await mutate(() => window.maka.workBoard.remove(id, options));
+    },
+  };
+}
diff --git a/apps/desktop/src/shared/work-board-ipc.ts b/apps/desktop/src/shared/work-board-ipc.ts
new file mode 100644
index 0000000000..3b0589febf
--- /dev/null
+++ b/apps/desktop/src/shared/work-board-ipc.ts
@@ -0,0 +1,14 @@
+import type { WorkBoardStoreErrorCode } from '@maka/storage/work-board-store';
+
+export type WorkBoardIpcResult<T> =
+  | { readonly ok: true; readonly value: T }
+  | {
+      readonly ok: false;
+      readonly code: WorkBoardStoreErrorCode | 'unknown';
+      readonly message: string;
+    };
+
+export interface WorkBoardChangedEvent {
+  readonly type: 'work_board_changed';
+  readonly ts: number;
+}

From 5a4e5b586b150bf4fe1f9f07a439bd0942c80bd9 Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Mon, 17 Aug 2026 11:15:46 +0800
Subject: [PATCH 03/22] feat(desktop): add the Work Board panel as a workbar
 tab

Phase 1 slice 3: compact capture/list MVP in the session workbar with
Inbox / current-project filtering, manual create, rename, move, complete,
reopen, archive, restore, and delete. The panel is a read-only renderer
projection over the main-process WorkBoardStore IPC.

Generated-by: Codex
---
 .../features/workbar/model/workbar-tabs.ts    |   2 +
 .../features/workbar/ui/workbar-host.tsx      |   2 +
 .../features/workbar/ui/workbar-surface.tsx   | 109 ++++--
 .../src/renderer/locales/conversation-copy.ts |   6 +
 apps/desktop/src/renderer/styles.css          |   1 +
 .../src/renderer/styles/work-board.css        |  81 +++++
 .../desktop/src/renderer/work-board-panel.tsx | 341 ++++++++++++++++++
 7 files changed, 505 insertions(+), 37 deletions(-)
 create mode 100644 apps/desktop/src/renderer/styles/work-board.css
 create mode 100644 apps/desktop/src/renderer/work-board-panel.tsx

diff --git a/apps/desktop/src/renderer/features/workbar/model/workbar-tabs.ts b/apps/desktop/src/renderer/features/workbar/model/workbar-tabs.ts
index b6b49b5b0e..03c9c02817 100644
--- a/apps/desktop/src/renderer/features/workbar/model/workbar-tabs.ts
+++ b/apps/desktop/src/renderer/features/workbar/model/workbar-tabs.ts
@@ -24,6 +24,7 @@ export type SessionWorkbarTabKind =
   | 'review'
   | 'terminal'
   | 'tasks'
+  | 'work-board'
   | 'browser'
   | 'files'
   | 'inspector'
@@ -133,6 +134,7 @@ const STATIC_TAB_IDS: Record<Exclude<SessionWorkbarTabKind, 'side-chat'>, string
   review: 'workbar:review',
   terminal: 'workbar:terminal',
   tasks: 'workbar:tasks',
+  'work-board': 'workbar:work-board',
   browser: 'workbar:browser',
   files: 'workbar:files',
   inspector: 'workbar:inspector',
diff --git a/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx b/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
index 566fe0d94a..6e1805e56e 100644
--- a/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
+++ b/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
@@ -69,6 +69,7 @@ function SessionWorkbarFallback() {
 
 export interface WorkbarHostModel {
   activeId?: string;
+  projectId?: string | null;
   rightCollapsed: boolean;
   bottomOpen: boolean;
   hidden: boolean;
@@ -164,6 +165,7 @@ export function WorkbarHost({ model: props }: { model: WorkbarHostModel }) {
             <WorkbarSurface
               key={props.activeId}
               sessionId={props.activeId}
+              projectId={props.projectId}
               hidden={props.hidden}
               onDismissPanel={props.onDismissPanel}
               panelsState={props.panelsState}
diff --git a/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx b/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx
index 185104b58e..bf56db17af 100644
--- a/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx
+++ b/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx
@@ -52,6 +52,7 @@ import {
 import {
   ICON_SIZE,
   Activity,
+  Clipboard,
   FolderOpen,
   GitBranch,
   Globe,
@@ -87,6 +88,7 @@ import {
 } from '../model/workbar-tabs';
 import { useSessionTasks } from '../tools/tasks/use-session-tasks';
 import { WorkbarToggle } from './workbar-toggle';
+import { WorkBoardPanel } from '../../../work-board-panel.js';
 import { getDesktopConversationCopy } from '../../../locales/conversation-copy.js';
 import type {
   CompanionQuoteTarget,
@@ -94,7 +96,6 @@ import type {
   QuoteCompanionPanelState,
 } from '../tools/side-chat/quote-companion-panel-state';
 import type { CompanionForkVisibilityEvent } from '../tools/side-chat/quote-companion-visibility';
-import { WORKBAR_TOOL_DEFINITIONS } from '../model/workbar-tool-definitions';
 
 const ArtifactPane = lazy(() =>
   import('../tools/artifacts/artifact-pane').then((module) => ({ default: module.ArtifactPane })),
@@ -184,6 +185,8 @@ function tabLabel(
         : copy.terminal;
     case 'tasks':
       return copy.tasks;
+    case 'work-board':
+      return copy.workBoard;
     case 'browser':
       return copy.browser;
     case 'files':
@@ -220,6 +223,8 @@ function tabIcon(tab: SessionWorkbarTab, active: boolean): ReactNode {
         ? Terminal
         : tab.kind === 'tasks'
           ? ListTodo
+          : tab.kind === 'work-board'
+            ? Clipboard
           : tab.kind === 'browser'
             ? Globe
             : tab.kind === 'files'
@@ -575,42 +580,69 @@ function WorkbarLauncher(props: {
   sideChatAvailable: boolean;
 }) {
   const copy = getDesktopConversationCopy(useUiLocale()).workbar;
-  const icons = {
-    activity: Activity,
-    folder: FolderOpen,
-    'git-branch': GitBranch,
-    globe: Globe,
-    'list-todo': ListTodo,
-    'message-circle-question': MessageCircleQuestion,
-    terminal: Terminal,
-  } as const;
-  const actions = WORKBAR_TOOL_DEFINITIONS.map((definition) => {
-    const presentation = (() => {
-      switch (definition.kind) {
-        case 'side-chat':
-          return { label: copy.sideChat, description: copy.launcher.sideChat };
-        case 'review':
-          return { label: copy.review, description: copy.launcher.review };
-        case 'terminal':
-          return { label: copy.terminal, description: copy.launcher.terminal };
-        case 'browser':
-          return { label: copy.browser, description: copy.launcher.browser };
-        case 'files':
-          return { label: copy.files, description: copy.launcher.files };
-        case 'tasks':
-          return { label: copy.tasks, description: copy.launcher.tasks };
-        case 'inspector':
-          return { label: copy.inspector, description: copy.launcher.inspector };
-      }
-    })();
-    return {
-      ...presentation,
-      kind: definition.kind,
-      icon: icons[definition.icon],
-      shortcut: 'shortcut' in definition ? definition.shortcut : undefined,
-      disabled: definition.kind === 'side-chat' && !props.sideChatAvailable,
-    };
-  });
+  const actions: Array<{
+    kind: SessionWorkbarTabKind;
+    label: string;
+    description: string;
+    icon: typeof Activity;
+    shortcut?: string;
+    disabled?: boolean;
+  }> = [
+    {
+      kind: 'side-chat',
+      label: copy.sideChat,
+      description: copy.launcher.sideChat,
+      icon: MessageCircleQuestion,
+      shortcut: 'mod+alt+s',
+      disabled: !props.sideChatAvailable,
+    },
+    {
+      kind: 'review',
+      label: copy.review,
+      description: copy.launcher.review,
+      icon: GitBranch,
+      shortcut: 'ctrl+shift+g',
+    },
+    {
+      kind: 'terminal',
+      label: copy.terminal,
+      description: copy.launcher.terminal,
+      icon: Terminal,
+      shortcut: 'ctrl+`',
+    },
+    {
+      kind: 'browser',
+      label: copy.browser,
+      description: copy.launcher.browser,
+      icon: Globe,
+      shortcut: 'mod+t',
+    },
+    {
+      kind: 'files',
+      label: copy.files,
+      description: copy.launcher.files,
+      icon: FolderOpen,
+      shortcut: 'mod+p',
+    },
+    {
+      kind: 'tasks',
+      label: copy.tasks,
+      description: copy.launcher.tasks,
+      icon: ListTodo,
+    },
+    {
+      kind: 'work-board',
+      label: copy.workBoard,
+      description: copy.launcher.workBoard,
+      icon: Clipboard,
+    },
+    {
+      kind: 'inspector',
+      label: copy.inspector,
+      description: copy.launcher.inspector,
+      icon: Activity,
+    },
+  ];
   return (
     <div className="maka-workbar-launcher">
       <div className="maka-workbar-launcher-frame">
@@ -642,6 +674,7 @@ function WorkbarLauncher(props: {
 
 export function WorkbarSurface(props: {
   sessionId: string;
+  projectId?: string | null;
   hidden: boolean;
   onDismissPanel: (placement: SessionWorkbarPlacement) => void;
   panelsState: SessionWorkbarPanelsState;
@@ -798,6 +831,8 @@ export function WorkbarSurface(props: {
               onRetry={sessionTasks.retry}
             />
           );
+        } else if (tab.kind === 'work-board') {
+          content = <WorkBoardPanel projectId={props.projectId ?? null} />;
         } else if (tab.kind === 'browser') {
           content = (
             <Suspense fallback={<WorkbarPanelLoading label={copy.browser} />}>
diff --git a/apps/desktop/src/renderer/locales/conversation-copy.ts b/apps/desktop/src/renderer/locales/conversation-copy.ts
index 9fc6c9f9a8..27993fb469 100644
--- a/apps/desktop/src/renderer/locales/conversation-copy.ts
+++ b/apps/desktop/src/renderer/locales/conversation-copy.ts
@@ -92,6 +92,7 @@ export interface DesktopConversationCopy {
     terminal: string;
     terminalNumbered(index: number): string;
     tasks: string;
+    workBoard: string;
     browser: string;
     files: string;
     inspector: string;
@@ -114,6 +115,7 @@ export interface DesktopConversationCopy {
       review: string;
       terminal: string;
       tasks: string;
+      workBoard: string;
       browser: string;
       files: string;
       inspector: string;
@@ -414,6 +416,7 @@ const COPY = {
       terminal: '终端',
       terminalNumbered: (index) => `终端 ${index}`,
       tasks: '待办',
+      workBoard: '工作看板',
       browser: '浏览器',
       files: '生成文件',
       inspector: '追踪',
@@ -436,6 +439,7 @@ const COPY = {
         review: '查看当前 Git 工作区变化',
         terminal: '查看当前任务的终端运行和实时输出',
         tasks: '查看和维护这个任务的待办台账',
+        workBoard: '记录和管理暂缓事项',
         browser: '打开内置浏览器并保留当前页面',
         files: '浏览当前任务生成的文件',
         inspector: '检查任务调用、工具与耗时记录',
@@ -612,6 +616,7 @@ const COPY = {
       terminal: 'Terminal',
       terminalNumbered: (index) => `Terminal ${index}`,
       tasks: 'To-do',
+      workBoard: 'Work board',
       browser: 'Browser',
       files: 'Generated files',
       inspector: 'Trace',
@@ -634,6 +639,7 @@ const COPY = {
         review: 'View changes in the current Git workspace',
         terminal: 'Inspect terminal runs and live output for this task',
         tasks: "View and maintain this task's to-do ledger",
+        workBoard: 'Capture and manage deferred work',
         browser: 'Open the embedded browser and keep the current page',
         files: 'Browse files generated by this task',
         inspector: 'Inspect model calls, tools, and timing',
diff --git a/apps/desktop/src/renderer/styles.css b/apps/desktop/src/renderer/styles.css
index e20425f070..00637bce8e 100644
--- a/apps/desktop/src/renderer/styles.css
+++ b/apps/desktop/src/renderer/styles.css
@@ -48,6 +48,7 @@
 @import "./styles/model-switcher.css" layer(components);
 @import "./styles/chat-header.css" layer(components);
 @import "./styles/task-ledger.css" layer(components);
+@import "./styles/work-board.css" layer(components);
 @import "./styles/plan-mode.css" layer(components);
 @import "./styles/agent-graph.css" layer(components);
 @import "./styles/error.css" layer(components);
diff --git a/apps/desktop/src/renderer/styles/work-board.css b/apps/desktop/src/renderer/styles/work-board.css
new file mode 100644
index 0000000000..4f51cbf112
--- /dev/null
+++ b/apps/desktop/src/renderer/styles/work-board.css
@@ -0,0 +1,81 @@
+.maka-work-board-panel {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  min-height: 0;
+  padding: 12px;
+}
+
+.maka-work-board-filters {
+  display: flex;
+  gap: 8px;
+}
+
+.maka-work-board-create {
+  display: flex;
+  gap: 8px;
+}
+
+.maka-work-board-create-input {
+  flex: 1;
+  min-width: 0;
+}
+
+.maka-work-board-list {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  overflow-y: auto;
+}
+
+.maka-work-board-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  padding: 8px;
+  border-radius: 6px;
+}
+
+.maka-work-board-row:hover {
+  background: var(--state-hover-bg);
+}
+
+.maka-work-board-row[data-archived] {
+  opacity: 0.65;
+}
+
+.maka-work-board-row-main {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  min-width: 0;
+}
+
+.maka-work-board-title {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.maka-work-board-archived-tag {
+  font-size: 12px;
+  opacity: 0.7;
+}
+
+.maka-work-board-row-actions {
+  display: flex;
+  gap: 4px;
+  flex-shrink: 0;
+}
+
+.maka-work-board-message {
+  padding: 8px;
+}
+
+.maka-work-board-empty {
+  padding: 16px 8px;
+}
diff --git a/apps/desktop/src/renderer/work-board-panel.tsx b/apps/desktop/src/renderer/work-board-panel.tsx
new file mode 100644
index 0000000000..179225c80a
--- /dev/null
+++ b/apps/desktop/src/renderer/work-board-panel.tsx
@@ -0,0 +1,341 @@
+import { useMemo, useState } from 'react';
+import { Banner, EmptyState, Spinner } from '@astryxdesign/core';
+import { Button } from '@astryxdesign/core/Button';
+import type { UiLocale } from '@maka/core/ui-locale';
+import { useUiLocale } from '@maka/ui';
+import type {
+  CreateWorkBoardItemInput,
+  WorkBoardItem,
+  WorkBoardListQuery,
+  WorkBoardScope,
+} from '@maka/core/work-board';
+import { ListTodo } from '@maka/ui/icons';
+import { useWorkBoard } from './use-work-board.js';
+
+interface WorkBoardPanelCopy {
+  inbox: string;
+  project: string;
+  noProject: string;
+  createPlaceholder: string;
+  create: string;
+  empty: string;
+  loading: string;
+  retry: string;
+  loadFailed: string;
+  actionFailed: string;
+  complete: string;
+  reopen: string;
+  rename: string;
+  renameSave: string;
+  moveToInbox: string;
+  moveToProject: string;
+  archive: string;
+  unarchive: string;
+  delete: string;
+  archived: string;
+}
+
+function getWorkBoardPanelCopy(locale: UiLocale): WorkBoardPanelCopy {
+  return locale === 'zh'
+    ? {
+        inbox: 'Inbox',
+        project: '当前项目',
+        noProject: '未选择项目',
+        createPlaceholder: '记录稍后处理的事项…',
+        create: '添加',
+        empty: '暂无暂缓事项',
+        loading: '正在加载工作看板…',
+        retry: '重试',
+        loadFailed: '工作看板加载失败',
+        actionFailed: '操作失败',
+        complete: '完成',
+        reopen: '重开',
+        rename: '改名',
+        renameSave: '保存',
+        moveToInbox: '移到 Inbox',
+        moveToProject: '移到项目',
+        archive: '归档',
+        unarchive: '恢复',
+        delete: '删除',
+        archived: '已归档',
+      }
+    : {
+        inbox: 'Inbox',
+        project: 'Current project',
+        noProject: 'No project selected',
+        createPlaceholder: 'Capture something for later…',
+        create: 'Add',
+        empty: 'No deferred work',
+        loading: 'Loading work board…',
+        retry: 'Retry',
+        loadFailed: 'Failed to load work board',
+        actionFailed: 'Action failed',
+        complete: 'Complete',
+        reopen: 'Reopen',
+        rename: 'Rename',
+        renameSave: 'Save',
+        moveToInbox: 'Move to Inbox',
+        moveToProject: 'Move to project',
+        archive: 'Archive',
+        unarchive: 'Restore',
+        delete: 'Delete',
+        archived: 'Archived',
+      };
+}
+
+function scopeForFilter(filter: 'inbox' | 'project', projectId: string | null): WorkBoardScope {
+  return filter === 'project' && projectId !== null
+    ? { kind: 'project', projectId }
+    : { kind: 'inbox' };
+}
+
+function WorkBoardRow(props: {
+  item: WorkBoardItem;
+  copy: WorkBoardPanelCopy;
+  projectId: string | null;
+  renaming: boolean;
+  renameValue: string;
+  onRenameStart(): void;
+  onRenameChange(value: string): void;
+  onRenameSave(): void;
+  onRenameCancel(): void;
+  onComplete(): void;
+  onReopen(): void;
+  onMove(): void;
+  onArchive(): void;
+  onUnarchive(): void;
+  onRemove(): void;
+}) {
+  const { item, copy } = props;
+  return (
+    <li className="maka-work-board-row" data-archived={item.archived || undefined}>
+      <div className="maka-work-board-row-main">
+        {props.renaming ? (
+          <input
+            className="maka-work-board-rename-input"
+            value={props.renameValue}
+            onChange={(event) => props.onRenameChange(event.target.value)}
+            onKeyDown={(event) => {
+              if (event.key === 'Enter') props.onRenameSave();
+              if (event.key === 'Escape') props.onRenameCancel();
+            }}
+            aria-label={copy.rename}
+          />
+        ) : (
+          <span className="maka-work-board-title">{item.title}</span>
+        )}
+        {item.archived && <span className="maka-work-board-archived-tag">{copy.archived}</span>}
+      </div>
+      <div className="maka-work-board-row-actions">
+        {item.archived ? (
+          <>
+            <Button size="sm" variant="ghost" label={copy.unarchive} onClick={props.onUnarchive} />
+            <Button size="sm" variant="ghost" label={copy.delete} onClick={props.onRemove} />
+          </>
+        ) : (
+          <>
+            {item.state === 'done' ? (
+              <Button size="sm" variant="ghost" label={copy.reopen} onClick={props.onReopen} />
+            ) : (
+              <Button size="sm" variant="ghost" label={copy.complete} onClick={props.onComplete} />
+            )}
+            {props.renaming ? (
+              <Button
+                size="sm"
+                variant="primary"
+                label={copy.renameSave}
+                onClick={props.onRenameSave}
+              />
+            ) : (
+              <Button size="sm" variant="ghost" label={copy.rename} onClick={props.onRenameStart} />
+            )}
+            <Button
+              size="sm"
+              variant="ghost"
+              label={item.scope.kind === 'project' ? copy.moveToInbox : copy.moveToProject}
+              onClick={props.onMove}
+              isDisabled={props.projectId === null}
+            />
+            <Button size="sm" variant="ghost" label={copy.archive} onClick={props.onArchive} />
+          </>
+        )}
+      </div>
+    </li>
+  );
+}
+
+export function WorkBoardPanel(props: { projectId: string | null }) {
+  const locale = useUiLocale();
+  const copy = getWorkBoardPanelCopy(locale);
+  const [filter, setFilter] = useState<'inbox' | 'project'>('inbox');
+  const query: WorkBoardListQuery = useMemo(
+    () => ({
+      scope: scopeForFilter(filter, props.projectId),
+      includeArchived: true,
+    }),
+    [filter, props.projectId],
+  );
+  const board = useWorkBoard(query);
+  const [newTitle, setNewTitle] = useState('');
+  const [renamingId, setRenamingId] = useState<string | null>(null);
+  const [renamingTitle, setRenamingTitle] = useState('');
+  const [actionError, setActionError] = useState<string | undefined>();
+
+  const activeItems = board.items.filter((item) => !item.archived);
+  const archivedItems = board.items.filter((item) => item.archived);
+
+  const runAction = async (action: () => Promise<unknown>): Promise<void> => {
+    setActionError(undefined);
+    try {
+      await action();
+    } catch (error) {
+      setActionError(error instanceof Error ? error.message : copy.actionFailed);
+    }
+  };
+
+  const create = async (): Promise<void> => {
+    const title = newTitle.trim();
+    if (!title) return;
+    const input: CreateWorkBoardItemInput = {
+      scope: query.scope ?? { kind: 'inbox' },
+      title,
+      creator: { kind: 'user' },
+      provenance: { kind: 'manual' },
+    };
+    await runAction(() => board.create(input));
+    setNewTitle('');
+  };
+
+  const startRename = (item: WorkBoardItem): void => {
+    setRenamingId(item.id);
+    setRenamingTitle(item.title);
+  };
+
+  const saveRename = async (item: WorkBoardItem): Promise<void> => {
+    const title = renamingTitle.trim();
+    if (!title) return;
+    await runAction(() => board.update(item.id, { title }));
+    setRenamingId(null);
+  };
+
+  const moveScope = (item: WorkBoardItem): WorkBoardScope =>
+    item.scope.kind === 'project'
+      ? { kind: 'inbox' }
+      : props.projectId !== null
+        ? { kind: 'project', projectId: props.projectId }
+        : item.scope;
+
+  return (
+    <section className="maka-work-board-panel" aria-label={copy.inbox}>
+      {actionError && (
+        <Banner status="error" role="alert" className="maka-work-board-message" title={actionError} />
+      )}
+      <div className="maka-work-board-filters" role="tablist" aria-label={copy.inbox}>
+        <Button
+          size="sm"
+          variant={filter === 'inbox' ? 'primary' : 'ghost'}
+          label={copy.inbox}
+          onClick={() => setFilter('inbox')}
+        />
+        <Button
+          size="sm"
+          variant={filter === 'project' ? 'primary' : 'ghost'}
+          label={copy.project}
+          onClick={() => setFilter('project')}
+          isDisabled={props.projectId === null}
+          tooltip={props.projectId === null ? copy.noProject : undefined}
+        />
+      </div>
+      <div className="maka-work-board-create">
+        <input
+          className="maka-work-board-create-input"
+          value={newTitle}
+          onChange={(event) => setNewTitle(event.target.value)}
+          onKeyDown={(event) => {
+            if (event.key === 'Enter') void create();
+          }}
+          placeholder={copy.createPlaceholder}
+          aria-label={copy.createPlaceholder}
+        />
+        <Button
+          size="sm"
+          label={copy.create}
+          onClick={() => void create()}
+          isDisabled={newTitle.trim().length === 0}
+        />
+      </div>
+      {board.error ? (
+        <Banner
+          status="error"
+          role="alert"
+          className="maka-work-board-message"
+          title={copy.loadFailed}
+          description={board.error}
+          endContent={
+            <Button size="sm" variant="ghost" label={copy.retry} onClick={board.retry} />
+          }
+        />
+      ) : board.loading && board.items.length === 0 ? (
+        <Spinner size="sm" shade="subtle" label={copy.loading} className="maka-work-board-message" />
+      ) : (
+        <>
+          {activeItems.length === 0 && archivedItems.length === 0 ? (
+            <EmptyState
+              isCompact
+              className="maka-work-board-empty"
+              icon={<ListTodo size={24} aria-hidden="true" />}
+              title={copy.empty}
+            />
+          ) : (
+            <ul className="maka-work-board-list">
+              {activeItems.map((item) => (
+                <WorkBoardRow
+                  key={item.id}
+                  item={item}
+                  copy={copy}
+                  projectId={props.projectId}
+                  renaming={renamingId === item.id}
+                  renameValue={renamingTitle}
+                  onRenameStart={() => startRename(item)}
+                  onRenameChange={setRenamingTitle}
+                  onRenameSave={() => void saveRename(item)}
+                  onRenameCancel={() => setRenamingId(null)}
+                  onComplete={() =>
+                    void runAction(() => board.update(item.id, { state: 'done' }))
+                  }
+                  onReopen={() =>
+                    void runAction(() => board.update(item.id, { state: 'todo' }))
+                  }
+                  onMove={() => void runAction(() => board.update(item.id, { scope: moveScope(item) }))}
+                  onArchive={() => void runAction(() => board.archive(item.id))}
+                  onUnarchive={() => void runAction(() => board.unarchive(item.id))}
+                  onRemove={() => void runAction(() => board.remove(item.id))}
+                />
+              ))}
+              {archivedItems.map((item) => (
+                <WorkBoardRow
+                  key={item.id}
+                  item={item}
+                  copy={copy}
+                  projectId={props.projectId}
+                  renaming={false}
+                  renameValue=""
+                  onRenameStart={() => undefined}
+                  onRenameChange={() => undefined}
+                  onRenameSave={() => undefined}
+                  onRenameCancel={() => undefined}
+                  onComplete={() => undefined}
+                  onReopen={() => undefined}
+                  onMove={() => undefined}
+                  onArchive={() => undefined}
+                  onUnarchive={() => void runAction(() => board.unarchive(item.id))}
+                  onRemove={() => void runAction(() => board.remove(item.id))}
+                />
+              ))}
+            </ul>
+          )}
+        </>
+      )}
+    </section>
+  );
+}

From d9ca23ccf56469898d06f0e49237acc34baae103 Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Mon, 17 Aug 2026 11:16:33 +0800
Subject: [PATCH 04/22] docs(work-board): add the Phase 1 capture/list MVP page

Phase 1 slice 4: document the workbar surface, boundary, and main-process
IPC ownership for the capture/list MVP.

Generated-by: Codex
---
 docs/README.md            |  1 +
 docs/work-board-phase1.md | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 docs/work-board-phase1.md

diff --git a/docs/README.md b/docs/README.md
index d917d57e86..8b3db10d5d 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -45,6 +45,7 @@ This page is the authority map for Maka documentation. Code and contract tests r
 - [Deep Research durable workspace](./deep-research-durable-workspace.md)
 - [Session task ledger lifecycle](./session-task-ledger-lifecycle.md)
 - [Work Board contract](./work-board-contract.md)
+- [Work Board Phase 1 surface](./work-board-phase1.md)
 - [Runtime resume architecture](./architecture/runtime-resume-architecture.md) ([中文](./architecture/runtime-resume-architecture.zh-CN.md))
 - [Runtime Host architecture](./architecture/runtime-host-architecture.md) ([中文](./architecture/runtime-host-architecture.zh-CN.md))
 - [Remote Runtime Host setup](./runtime-host-remote-access.md) ([中文](./runtime-host-remote-access.zh-CN.md))
diff --git a/docs/work-board-phase1.md b/docs/work-board-phase1.md
new file mode 100644
index 0000000000..72fb06e3a9
--- /dev/null
+++ b/docs/work-board-phase1.md
@@ -0,0 +1,28 @@
+# Work Board Phase 1 — capture/list MVP
+
+Status: in development (`feat/2560-work-board-phase1`).
+
+## Surface
+
+A compact Work Board tab in the session workbar, next to Tasks, with:
+
+- global Inbox and current-project filtering;
+- manual create, rename, move (Inbox <-> project), complete / reopen,
+  archive / restore, and delete (archived items only);
+- empty, loading, and error states;
+- local-first persistence through the existing operational-state database.
+
+## Boundary
+
+- The Desktop main process owns `WorkBoardStore`; the renderer is a read-only
+  IPC projection that reloads on the `workBoard:changed` signal.
+- No Runtime Host involvement, no model-visible tools, no turn-tail injection.
+- `linkedSessions` and the linked-session projection remain deferred to Phase 3.
+
+## Implementation
+
+- Main: `apps/desktop/src/main/work-board-ipc-main.ts`
+  (`workBoard:list/create/update/archive/unarchive/remove` + change signal).
+- Preload: `window.maka.workBoard` in `apps/desktop/src/preload/preload.ts`.
+- Renderer: `useWorkBoard` hook and `WorkBoardPanel`, wired as a workbar tab in
+  `session-workbar.tsx`.

From 98645eb851aa8c3a1704f6095ec85b315e918dac Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Mon, 17 Aug 2026 11:30:30 +0800
Subject: [PATCH 05/22] fix(desktop): address Phase 1 review and refresh
 surface inventory

- accept the persisted work-board tab kind in isSessionWorkbarTabKind;
- keep create/rename drafts when a mutation fails;
- drop the incomplete tablist role and derive the panel aria-label from the filter;
- rely on the workBoard:changed signal as the single reload path after mutations;
- move Work Board panel copy into DesktopConversationCopy;
- remove the branch-specific status from the Phase 1 doc;
- regenerate the Astryx surface inventory for the new panel and stylesheet.

Generated-by: Codex
---
 .../features/workbar/model/workbar-tabs.ts    |   1 +
 .../src/renderer/locales/conversation-copy.ts |  66 ++++++++++
 apps/desktop/src/renderer/use-work-board.ts   |  12 +-
 .../desktop/src/renderer/work-board-panel.tsx | 114 +++++-------------
 docs/astryx-surface-file-inventory.md         |   2 +
 docs/astryx-surface-file-inventory.paths      |   2 +
 docs/work-board-phase1.md                     |   2 -
 7 files changed, 105 insertions(+), 94 deletions(-)

diff --git a/apps/desktop/src/renderer/features/workbar/model/workbar-tabs.ts b/apps/desktop/src/renderer/features/workbar/model/workbar-tabs.ts
index 03c9c02817..c73d253ad0 100644
--- a/apps/desktop/src/renderer/features/workbar/model/workbar-tabs.ts
+++ b/apps/desktop/src/renderer/features/workbar/model/workbar-tabs.ts
@@ -659,6 +659,7 @@ export function isSessionWorkbarTabKind(value: unknown): value is SessionWorkbar
     value === 'review' ||
     value === 'terminal' ||
     value === 'tasks' ||
+    value === 'work-board' ||
     value === 'browser' ||
     value === 'files' ||
     value === 'inspector' ||
diff --git a/apps/desktop/src/renderer/locales/conversation-copy.ts b/apps/desktop/src/renderer/locales/conversation-copy.ts
index 27993fb469..8af9c26f0e 100644
--- a/apps/desktop/src/renderer/locales/conversation-copy.ts
+++ b/apps/desktop/src/renderer/locales/conversation-copy.ts
@@ -122,6 +122,28 @@ export interface DesktopConversationCopy {
       sideChat: string;
     };
   };
+  workBoardPanel: {
+    inbox: string;
+    project: string;
+    noProject: string;
+    createPlaceholder: string;
+    create: string;
+    empty: string;
+    loading: string;
+    retry: string;
+    loadFailed: string;
+    actionFailed: string;
+    complete: string;
+    reopen: string;
+    rename: string;
+    renameSave: string;
+    moveToInbox: string;
+    moveToProject: string;
+    archive: string;
+    unarchive: string;
+    delete: string;
+    archived: string;
+  };
   reviewPanel: {
     ariaLabel: string;
     empty: string;
@@ -446,6 +468,28 @@ const COPY = {
         sideChat: '在不打断主任务的情况下追问和只读探索',
       },
     },
+    workBoardPanel: {
+      inbox: 'Inbox',
+      project: '当前项目',
+      noProject: '未选择项目',
+      createPlaceholder: '记录稍后处理的事项…',
+      create: '添加',
+      empty: '暂无暂缓事项',
+      loading: '正在加载工作看板…',
+      retry: '重试',
+      loadFailed: '工作看板加载失败',
+      actionFailed: '操作失败',
+      complete: '完成',
+      reopen: '重开',
+      rename: '改名',
+      renameSave: '保存',
+      moveToInbox: '移到 Inbox',
+      moveToProject: '移到项目',
+      archive: '归档',
+      unarchive: '恢复',
+      delete: '删除',
+      archived: '已归档',
+    },
     reviewPanel: {
       ariaLabel: 'Git 变更',
       empty: '当前 Git 工作区没有变化',
@@ -646,6 +690,28 @@ const COPY = {
         sideChat: 'Ask and explore read-only without interrupting the main task',
       },
     },
+    workBoardPanel: {
+      inbox: 'Inbox',
+      project: 'Current project',
+      noProject: 'No project selected',
+      createPlaceholder: 'Capture something for later…',
+      create: 'Add',
+      empty: 'No deferred work',
+      loading: 'Loading work board…',
+      retry: 'Retry',
+      loadFailed: 'Failed to load work board',
+      actionFailed: 'Action failed',
+      complete: 'Complete',
+      reopen: 'Reopen',
+      rename: 'Rename',
+      renameSave: 'Save',
+      moveToInbox: 'Move to Inbox',
+      moveToProject: 'Move to project',
+      archive: 'Archive',
+      unarchive: 'Restore',
+      delete: 'Delete',
+      archived: 'Archived',
+    },
     reviewPanel: {
       ariaLabel: 'Git changes',
       empty: 'No changes in the current Git workspace',
diff --git a/apps/desktop/src/renderer/use-work-board.ts b/apps/desktop/src/renderer/use-work-board.ts
index 0c43f073a6..db0317edac 100644
--- a/apps/desktop/src/renderer/use-work-board.ts
+++ b/apps/desktop/src/renderer/use-work-board.ts
@@ -89,13 +89,13 @@ export function useWorkBoard(query?: WorkBoardListQuery): UseWorkBoardResult {
 
   const retry = useCallback(() => load(true), [load]);
 
+  // The main process emits workBoard:changed for every successful mutation;
+  // the subscription above is the single reload path, so no second list
+  // request is issued here.
   const mutate = useCallback(
-    async <T>(operation: () => Promise<WorkBoardIpcResult<T>>): Promise<T> => {
-      const value = requireResult(await operation());
-      await load(true);
-      return value;
-    },
-    [load],
+    async <T>(operation: () => Promise<WorkBoardIpcResult<T>>): Promise<T> =>
+      requireResult(await operation()),
+    [],
   );
 
   return {
diff --git a/apps/desktop/src/renderer/work-board-panel.tsx b/apps/desktop/src/renderer/work-board-panel.tsx
index 179225c80a..fc6cc44579 100644
--- a/apps/desktop/src/renderer/work-board-panel.tsx
+++ b/apps/desktop/src/renderer/work-board-panel.tsx
@@ -1,7 +1,7 @@
 import { useMemo, useState } from 'react';
 import { Banner, EmptyState, Spinner } from '@astryxdesign/core';
 import { Button } from '@astryxdesign/core/Button';
-import type { UiLocale } from '@maka/core/ui-locale';
+import { TextInput } from '@astryxdesign/core/TextInput';
 import { useUiLocale } from '@maka/ui';
 import type {
   CreateWorkBoardItemInput,
@@ -11,77 +11,9 @@ import type {
 } from '@maka/core/work-board';
 import { ListTodo } from '@maka/ui/icons';
 import { useWorkBoard } from './use-work-board.js';
+import { getDesktopConversationCopy } from './locales/conversation-copy.js';
 
-interface WorkBoardPanelCopy {
-  inbox: string;
-  project: string;
-  noProject: string;
-  createPlaceholder: string;
-  create: string;
-  empty: string;
-  loading: string;
-  retry: string;
-  loadFailed: string;
-  actionFailed: string;
-  complete: string;
-  reopen: string;
-  rename: string;
-  renameSave: string;
-  moveToInbox: string;
-  moveToProject: string;
-  archive: string;
-  unarchive: string;
-  delete: string;
-  archived: string;
-}
-
-function getWorkBoardPanelCopy(locale: UiLocale): WorkBoardPanelCopy {
-  return locale === 'zh'
-    ? {
-        inbox: 'Inbox',
-        project: '当前项目',
-        noProject: '未选择项目',
-        createPlaceholder: '记录稍后处理的事项…',
-        create: '添加',
-        empty: '暂无暂缓事项',
-        loading: '正在加载工作看板…',
-        retry: '重试',
-        loadFailed: '工作看板加载失败',
-        actionFailed: '操作失败',
-        complete: '完成',
-        reopen: '重开',
-        rename: '改名',
-        renameSave: '保存',
-        moveToInbox: '移到 Inbox',
-        moveToProject: '移到项目',
-        archive: '归档',
-        unarchive: '恢复',
-        delete: '删除',
-        archived: '已归档',
-      }
-    : {
-        inbox: 'Inbox',
-        project: 'Current project',
-        noProject: 'No project selected',
-        createPlaceholder: 'Capture something for later…',
-        create: 'Add',
-        empty: 'No deferred work',
-        loading: 'Loading work board…',
-        retry: 'Retry',
-        loadFailed: 'Failed to load work board',
-        actionFailed: 'Action failed',
-        complete: 'Complete',
-        reopen: 'Reopen',
-        rename: 'Rename',
-        renameSave: 'Save',
-        moveToInbox: 'Move to Inbox',
-        moveToProject: 'Move to project',
-        archive: 'Archive',
-        unarchive: 'Restore',
-        delete: 'Delete',
-        archived: 'Archived',
-      };
-}
+type WorkBoardPanelCopy = ReturnType<typeof getDesktopConversationCopy>['workBoardPanel'];
 
 function scopeForFilter(filter: 'inbox' | 'project', projectId: string | null): WorkBoardScope {
   return filter === 'project' && projectId !== null
@@ -111,15 +43,17 @@ function WorkBoardRow(props: {
     <li className="maka-work-board-row" data-archived={item.archived || undefined}>
       <div className="maka-work-board-row-main">
         {props.renaming ? (
-          <input
+          <TextInput
             className="maka-work-board-rename-input"
+            size="sm"
+            label={copy.rename}
+            isLabelHidden
             value={props.renameValue}
-            onChange={(event) => props.onRenameChange(event.target.value)}
+            onChange={props.onRenameChange}
             onKeyDown={(event) => {
               if (event.key === 'Enter') props.onRenameSave();
               if (event.key === 'Escape') props.onRenameCancel();
             }}
-            aria-label={copy.rename}
           />
         ) : (
           <span className="maka-work-board-title">{item.title}</span>
@@ -165,8 +99,7 @@ function WorkBoardRow(props: {
 }
 
 export function WorkBoardPanel(props: { projectId: string | null }) {
-  const locale = useUiLocale();
-  const copy = getWorkBoardPanelCopy(locale);
+  const copy = getDesktopConversationCopy(useUiLocale()).workBoardPanel;
   const [filter, setFilter] = useState<'inbox' | 'project'>('inbox');
   const query: WorkBoardListQuery = useMemo(
     () => ({
@@ -184,12 +117,14 @@ export function WorkBoardPanel(props: { projectId: string | null }) {
   const activeItems = board.items.filter((item) => !item.archived);
   const archivedItems = board.items.filter((item) => item.archived);
 
-  const runAction = async (action: () => Promise<unknown>): Promise<void> => {
+  const runAction = async (action: () => Promise<unknown>): Promise<boolean> => {
     setActionError(undefined);
     try {
       await action();
+      return true;
     } catch (error) {
       setActionError(error instanceof Error ? error.message : copy.actionFailed);
+      return false;
     }
   };
 
@@ -202,8 +137,9 @@ export function WorkBoardPanel(props: { projectId: string | null }) {
       creator: { kind: 'user' },
       provenance: { kind: 'manual' },
     };
-    await runAction(() => board.create(input));
-    setNewTitle('');
+    if (await runAction(() => board.create(input))) {
+      setNewTitle('');
+    }
   };
 
   const startRename = (item: WorkBoardItem): void => {
@@ -214,8 +150,9 @@ export function WorkBoardPanel(props: { projectId: string | null }) {
   const saveRename = async (item: WorkBoardItem): Promise<void> => {
     const title = renamingTitle.trim();
     if (!title) return;
-    await runAction(() => board.update(item.id, { title }));
-    setRenamingId(null);
+    if (await runAction(() => board.update(item.id, { title }))) {
+      setRenamingId(null);
+    }
   };
 
   const moveScope = (item: WorkBoardItem): WorkBoardScope =>
@@ -226,11 +163,14 @@ export function WorkBoardPanel(props: { projectId: string | null }) {
         : item.scope;
 
   return (
-    <section className="maka-work-board-panel" aria-label={copy.inbox}>
+    <section
+      className="maka-work-board-panel"
+      aria-label={filter === 'project' ? copy.project : copy.inbox}
+    >
       {actionError && (
         <Banner status="error" role="alert" className="maka-work-board-message" title={actionError} />
       )}
-      <div className="maka-work-board-filters" role="tablist" aria-label={copy.inbox}>
+      <div className="maka-work-board-filters">
         <Button
           size="sm"
           variant={filter === 'inbox' ? 'primary' : 'ghost'}
@@ -247,15 +187,17 @@ export function WorkBoardPanel(props: { projectId: string | null }) {
         />
       </div>
       <div className="maka-work-board-create">
-        <input
+        <TextInput
           className="maka-work-board-create-input"
+          size="sm"
+          label={copy.createPlaceholder}
+          isLabelHidden
           value={newTitle}
-          onChange={(event) => setNewTitle(event.target.value)}
+          onChange={setNewTitle}
           onKeyDown={(event) => {
             if (event.key === 'Enter') void create();
           }}
           placeholder={copy.createPlaceholder}
-          aria-label={copy.createPlaceholder}
         />
         <Button
           size="sm"
diff --git a/docs/astryx-surface-file-inventory.md b/docs/astryx-surface-file-inventory.md
index 55dc8f7c78..45314e041a 100644
--- a/docs/astryx-surface-file-inventory.md
+++ b/docs/astryx-surface-file-inventory.md
@@ -167,6 +167,7 @@ Wiki bar: Design Conventions · API Use-the-System · Theming · Container Paddi
 | `apps/desktop/src/renderer/styles/sidebar.css` | shell-chrome-or-panel | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `apps/desktop/src/renderer/styles/task-ledger.css` | styles | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `apps/desktop/src/renderer/styles/theme-glass.css` | styles | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
+| `apps/desktop/src/renderer/styles/work-board.css` | styles | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `apps/desktop/src/renderer/styles/workbar/artifacts.css` | shell-chrome-or-panel | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `apps/desktop/src/renderer/styles/workbar/browser.css` | shell-chrome-or-panel | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `apps/desktop/src/renderer/styles/workbar/inspector.css` | shell-chrome-or-panel | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
@@ -174,6 +175,7 @@ Wiki bar: Design Conventions · API Use-the-System · Theming · Container Paddi
 | `apps/desktop/src/renderer/styles/workbar/shell.css` | shell-chrome-or-panel | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `apps/desktop/src/renderer/styles/workbar/side-chat.css` | shell-chrome-or-panel | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `apps/desktop/src/renderer/styles/workbar/terminal.css` | shell-chrome-or-panel | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
+| `apps/desktop/src/renderer/work-board-panel.tsx` | shell-chrome-or-panel | Banner, Button, EmptyState, Spinner, TextInput | aligned — uses Astryx (Banner, Button, EmptyState, Spinner, TextInput) | aligned |
 | `apps/desktop/src/renderer/styles/workhub.css` | styles | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `apps/desktop/src/renderer/workhub-surface.tsx` | other | Button | aligned — uses Astryx (Button) | aligned |
 | `packages/ui/src/astryx-chat-reasoning.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
diff --git a/docs/astryx-surface-file-inventory.paths b/docs/astryx-surface-file-inventory.paths
index 5f902815a8..4ed78b2a0c 100644
--- a/docs/astryx-surface-file-inventory.paths
+++ b/docs/astryx-surface-file-inventory.paths
@@ -139,6 +139,7 @@ apps/desktop/src/renderer/styles/shell-layout.css
 apps/desktop/src/renderer/styles/sidebar.css
 apps/desktop/src/renderer/styles/task-ledger.css
 apps/desktop/src/renderer/styles/theme-glass.css
+apps/desktop/src/renderer/styles/work-board.css
 apps/desktop/src/renderer/styles/workbar/artifacts.css
 apps/desktop/src/renderer/styles/workbar/browser.css
 apps/desktop/src/renderer/styles/workbar/inspector.css
@@ -146,6 +147,7 @@ apps/desktop/src/renderer/styles/workbar/review.css
 apps/desktop/src/renderer/styles/workbar/shell.css
 apps/desktop/src/renderer/styles/workbar/side-chat.css
 apps/desktop/src/renderer/styles/workbar/terminal.css
+apps/desktop/src/renderer/work-board-panel.tsx
 apps/desktop/src/renderer/styles/workhub.css
 apps/desktop/src/renderer/workhub-surface.tsx
 packages/ui/src/astryx-chat-reasoning.tsx
diff --git a/docs/work-board-phase1.md b/docs/work-board-phase1.md
index 72fb06e3a9..1fa357fbb6 100644
--- a/docs/work-board-phase1.md
+++ b/docs/work-board-phase1.md
@@ -1,7 +1,5 @@
 # Work Board Phase 1 — capture/list MVP
 
-Status: in development (`feat/2560-work-board-phase1`).
-
 ## Surface
 
 A compact Work Board tab in the session workbar, next to Tasks, with:

From 86f17ee5921eb72baa6caf1b4568371da1dcbf85 Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Mon, 17 Aug 2026 15:02:30 +0800
Subject: [PATCH 06/22] docs(work-board): justify the dedicated store and
 resequence validation

Add the maintainer-requested rationale for a store over a project file
(typed provenance, stable identity/CAS under concurrent writers, Session
linking and result refs as the load-bearing reasons) and record the plan to
validate a thin capture -> revisit -> start-as-task loop before Phases 2/4.

Generated-by: Codex
---
 docs/work-board-phase1.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/docs/work-board-phase1.md b/docs/work-board-phase1.md
index 1fa357fbb6..53a6f408d9 100644
--- a/docs/work-board-phase1.md
+++ b/docs/work-board-phase1.md
@@ -17,6 +17,34 @@ A compact Work Board tab in the session workbar, next to Tasks, with:
 - No Runtime Host involvement, no model-visible tools, no turn-tail injection.
 - `linkedSessions` and the linked-session projection remain deferred to Phase 3.
 
+## Why a dedicated store instead of a project file
+
+A project `TODO.md` / issue would satisfy the literal capture-and-list atom,
+but the #2560 acceptance criteria also require:
+
+- side-conversation capture that keeps typed source references and a bounded
+  excerpt after the temporary fork is deleted;
+- per-item user lifecycle (complete / reopen / archive) under concurrent
+  Desktop writes, which needs a stable item identity and revision CAS;
+- Inbox vs project scoping, and later start-as-task linking with typed result
+  refs.
+
+A file would need an ad-hoc parse convention, provide no stable per-item
+identity or CAS for concurrent writers, and cannot carry typed provenance
+without inventing a second format. It would also bypass the operational-state
+database that already owns backup/restore and migrations. The Work Board store
+is therefore not a Linear/Jira-shaped skeleton: it is the smallest
+machine-readable authority that keeps the deferred-intent atom linkable and
+safe under concurrent local writers. Session linking (Phase 3) and result refs
+(Phase 4) are the load-bearing reasons for this shape; if they were not in
+scope, a project file would indeed suffice.
+
+## Sequencing
+
+Per maintainer review, the load-bearing assumption is that users return to the
+board and start tasks from it. The plan is to validate a thin
+capture -> revisit -> start-as-task loop before expanding Phases 2 and 4.
+
 ## Implementation
 
 - Main: `apps/desktop/src/main/work-board-ipc-main.ts`

From 4f610fc257e5fce00ac5afd874c22688d15b5f10 Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Mon, 17 Aug 2026 15:15:13 +0800
Subject: [PATCH 07/22] docs(work-board): record the assumption and the Phase 3
 spike gate

Per maintainer checklist: state provenance + Session linking as the explicit
justification for the store, write down the assumption Phase 3 must prove, and
gate Phases 2/4 behind a thin flag-gated start-as-task spike.

Generated-by: Codex
---
 docs/work-board-phase1.md | 40 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/docs/work-board-phase1.md b/docs/work-board-phase1.md
index 53a6f408d9..b80efc04bb 100644
--- a/docs/work-board-phase1.md
+++ b/docs/work-board-phase1.md
@@ -19,31 +19,27 @@ A compact Work Board tab in the session workbar, next to Tasks, with:
 
 ## Why a dedicated store instead of a project file
 
-A project `TODO.md` / issue would satisfy the literal capture-and-list atom,
-but the #2560 acceptance criteria also require:
-
-- side-conversation capture that keeps typed source references and a bounded
-  excerpt after the temporary fork is deleted;
-- per-item user lifecycle (complete / reopen / archive) under concurrent
-  Desktop writes, which needs a stable item identity and revision CAS;
-- Inbox vs project scoping, and later start-as-task linking with typed result
-  refs.
-
-A file would need an ad-hoc parse convention, provide no stable per-item
-identity or CAS for concurrent writers, and cannot carry typed provenance
-without inventing a second format. It would also bypass the operational-state
-database that already owns backup/restore and migrations. The Work Board store
-is therefore not a Linear/Jira-shaped skeleton: it is the smallest
-machine-readable authority that keeps the deferred-intent atom linkable and
-safe under concurrent local writers. Session linking (Phase 3) and result refs
-(Phase 4) are the load-bearing reasons for this shape; if they were not in
-scope, a project file would indeed suffice.
+A project `TODO.md` / issue would cover the literal capture-and-list atom, but
+the one thing that justifies a store is **provenance + Session linking**:
+side-conversation captures must keep typed source references and a bounded
+excerpt after the temporary fork is deleted, and Phase 3 must link a board item
+to the Session it starts. Typed provenance and stable item identity also let
+concurrent Desktop writers mutate items with revision CAS instead of parsing a
+file. If provenance and Session linking were not in scope, a project file would
+suffice.
+
+## Assumption
+
+We are betting that users will return to the board and start tasks from it.
+Phase 3 must prove this.
 
 ## Sequencing
 
-Per maintainer review, the load-bearing assumption is that users return to the
-board and start tasks from it. The plan is to validate a thin
-capture -> revisit -> start-as-task loop before expanding Phases 2 and 4.
+Per maintainer review, the thin capture -> revisit -> start-as-task loop is
+validated **before** Phase 2 (side-chat capture) and Phase 4 (evidence /
+refinement): a minimal, flag-gated Phase 3 spike wires one hard-coded item ->
+"Start task" -> new Session -> link back, with no polish. Only if the loop
+shows real use do we resume Phases 2 and 4.
 
 ## Implementation
 

From e78e5430ecaf1a31d8ea369a0d3dcd507efa8e33 Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Mon, 17 Aug 2026 17:05:35 +0800
Subject: [PATCH 08/22] fix(desktop): keep pagination, scope, and IME-safe
 inputs in the Work Board panel

Address Astro-Han P2/P3:
- useWorkBoard retains nextCursor and exposes a bounded loadMore path;
- the panel resets to Inbox when the current project disappears, keeping the
  filter, label, query, and create scope identical;
- create and rename ignore Enter while an IME composition is active.

Generated-by: Codex
---
 .../src/renderer/locales/conversation-copy.ts |  3 ++
 apps/desktop/src/renderer/use-work-board.ts   | 46 ++++++++++++++++++-
 .../desktop/src/renderer/work-board-panel.tsx | 21 +++++++--
 3 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/apps/desktop/src/renderer/locales/conversation-copy.ts b/apps/desktop/src/renderer/locales/conversation-copy.ts
index 8af9c26f0e..06f22eb8e7 100644
--- a/apps/desktop/src/renderer/locales/conversation-copy.ts
+++ b/apps/desktop/src/renderer/locales/conversation-copy.ts
@@ -130,6 +130,7 @@ export interface DesktopConversationCopy {
     create: string;
     empty: string;
     loading: string;
+    loadMore: string;
     retry: string;
     loadFailed: string;
     actionFailed: string;
@@ -476,6 +477,7 @@ const COPY = {
       create: '添加',
       empty: '暂无暂缓事项',
       loading: '正在加载工作看板…',
+      loadMore: '加载更多',
       retry: '重试',
       loadFailed: '工作看板加载失败',
       actionFailed: '操作失败',
@@ -698,6 +700,7 @@ const COPY = {
       create: 'Add',
       empty: 'No deferred work',
       loading: 'Loading work board…',
+      loadMore: 'Load more',
       retry: 'Retry',
       loadFailed: 'Failed to load work board',
       actionFailed: 'Action failed',
diff --git a/apps/desktop/src/renderer/use-work-board.ts b/apps/desktop/src/renderer/use-work-board.ts
index db0317edac..273f5acfaa 100644
--- a/apps/desktop/src/renderer/use-work-board.ts
+++ b/apps/desktop/src/renderer/use-work-board.ts
@@ -10,12 +10,14 @@ import type { WorkBoardChangedEvent, WorkBoardIpcResult } from '../shared/work-b
 
 interface WorkBoardSnapshot {
   items: WorkBoardItem[];
+  nextCursor?: string;
   loading: boolean;
   error?: string;
 }
 
 export interface UseWorkBoardResult extends WorkBoardSnapshot {
   retry(): void;
+  loadMore(): void;
   create(input: CreateWorkBoardItemInput): Promise<WorkBoardItem>;
   update(
     id: string,
@@ -29,6 +31,7 @@ export interface UseWorkBoardResult extends WorkBoardSnapshot {
 
 const EMPTY_SNAPSHOT: WorkBoardSnapshot = {
   items: [],
+  nextCursor: undefined,
   loading: false,
 };
 
@@ -51,6 +54,7 @@ export function useWorkBoard(query?: WorkBoardListQuery): UseWorkBoardResult {
       const revision = ++revisionRef.current;
       setSnapshot((current) => ({
         items: preserveItems ? current.items : [],
+        nextCursor: preserveItems ? current.nextCursor : undefined,
         loading: true,
       }));
       void window.maka.workBoard.list(query).then(
@@ -58,7 +62,11 @@ export function useWorkBoard(query?: WorkBoardListQuery): UseWorkBoardResult {
           if (revision !== revisionRef.current) return;
           setSnapshot(
             result.ok
-              ? { items: result.value.items, loading: false }
+              ? {
+                  items: result.value.items,
+                  nextCursor: result.value.nextCursor,
+                  loading: false,
+                }
               : { items: [], loading: false, error: result.message },
           );
         },
@@ -89,6 +97,41 @@ export function useWorkBoard(query?: WorkBoardListQuery): UseWorkBoardResult {
 
   const retry = useCallback(() => load(true), [load]);
 
+  const loadMore = useCallback(() => {
+    const cursor = snapshot.nextCursor;
+    if (!cursor || snapshot.loading) return;
+    const revision = ++revisionRef.current;
+    setSnapshot((current) => ({ ...current, loading: true }));
+    void window.maka.workBoard.list({ ...query, cursor }).then(
+      (result) => {
+        if (revision !== revisionRef.current) return;
+        if (!result.ok) {
+          setSnapshot((current) => ({ ...current, loading: false, error: result.message }));
+          return;
+        }
+        setSnapshot((current) => {
+          const known = new Set(current.items.map((item: WorkBoardItem) => item.id));
+          const appended = result.value.items.filter(
+            (item: WorkBoardItem) => !known.has(item.id),
+          );
+          return {
+            items: [...current.items, ...appended],
+            nextCursor: result.value.nextCursor,
+            loading: false,
+          };
+        });
+      },
+      (error: unknown) => {
+        if (revision !== revisionRef.current) return;
+        setSnapshot((current) => ({
+          ...current,
+          loading: false,
+          error: error instanceof Error ? error.message : 'Work Board load failed',
+        }));
+      },
+    );
+  }, [query, snapshot.loading, snapshot.nextCursor]);
+
   // The main process emits workBoard:changed for every successful mutation;
   // the subscription above is the single reload path, so no second list
   // request is issued here.
@@ -101,6 +144,7 @@ export function useWorkBoard(query?: WorkBoardListQuery): UseWorkBoardResult {
   return {
     ...snapshot,
     retry,
+    loadMore,
     create: (input) => mutate(() => window.maka.workBoard.create(input)),
     update: (id, patch, options) =>
       mutate(() => window.maka.workBoard.update(id, patch, options)),
diff --git a/apps/desktop/src/renderer/work-board-panel.tsx b/apps/desktop/src/renderer/work-board-panel.tsx
index fc6cc44579..085c6a0437 100644
--- a/apps/desktop/src/renderer/work-board-panel.tsx
+++ b/apps/desktop/src/renderer/work-board-panel.tsx
@@ -1,4 +1,4 @@
-import { useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { Banner, EmptyState, Spinner } from '@astryxdesign/core';
 import { Button } from '@astryxdesign/core/Button';
 import { TextInput } from '@astryxdesign/core/TextInput';
@@ -51,7 +51,9 @@ function WorkBoardRow(props: {
             value={props.renameValue}
             onChange={props.onRenameChange}
             onKeyDown={(event) => {
-              if (event.key === 'Enter') props.onRenameSave();
+              if (event.key === 'Enter' && !event.nativeEvent.isComposing) {
+                props.onRenameSave();
+              }
               if (event.key === 'Escape') props.onRenameCancel();
             }}
           />
@@ -114,6 +116,10 @@ export function WorkBoardPanel(props: { projectId: string | null }) {
   const [renamingTitle, setRenamingTitle] = useState('');
   const [actionError, setActionError] = useState<string | undefined>();
 
+  useEffect(() => {
+    if (props.projectId === null) setFilter('inbox');
+  }, [props.projectId]);
+
   const activeItems = board.items.filter((item) => !item.archived);
   const archivedItems = board.items.filter((item) => item.archived);
 
@@ -195,7 +201,7 @@ export function WorkBoardPanel(props: { projectId: string | null }) {
           value={newTitle}
           onChange={setNewTitle}
           onKeyDown={(event) => {
-            if (event.key === 'Enter') void create();
+            if (event.key === 'Enter' && !event.nativeEvent.isComposing) void create();
           }}
           placeholder={copy.createPlaceholder}
         />
@@ -276,6 +282,15 @@ export function WorkBoardPanel(props: { projectId: string | null }) {
               ))}
             </ul>
           )}
+          {board.nextCursor && (
+            <Button
+              size="sm"
+              variant="ghost"
+              label={copy.loadMore}
+              onClick={board.loadMore}
+              isDisabled={board.loading}
+            />
+          )}
         </>
       )}
     </section>

From f1764128f99fe20c25ac7cf6efa95fc1ecd49ed3 Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Mon, 17 Aug 2026 17:15:39 +0800
Subject: [PATCH 09/22] fix(desktop): keep items visible and retry the same
 cursor on continuation failures

Address CodeRabbit: refresh or loadMore failures no longer replace the list
with a fatal error when items already exist; a non-fatal banner keeps the
items visible and retry re-runs the failed cursor (or the first page for
refresh failures).

Generated-by: Codex
---
 apps/desktop/src/renderer/use-work-board.ts   | 75 ++++++++++++++-----
 .../desktop/src/renderer/work-board-panel.tsx | 61 ++++++++++-----
 2 files changed, 99 insertions(+), 37 deletions(-)

diff --git a/apps/desktop/src/renderer/use-work-board.ts b/apps/desktop/src/renderer/use-work-board.ts
index 273f5acfaa..b8b230ff1b 100644
--- a/apps/desktop/src/renderer/use-work-board.ts
+++ b/apps/desktop/src/renderer/use-work-board.ts
@@ -13,10 +13,13 @@ interface WorkBoardSnapshot {
   nextCursor?: string;
   loading: boolean;
   error?: string;
+  continuationError?: string;
+  continuationCursor?: string;
 }
 
 export interface UseWorkBoardResult extends WorkBoardSnapshot {
   retry(): void;
+  retryContinuation(): void;
   loadMore(): void;
   create(input: CreateWorkBoardItemInput): Promise<WorkBoardItem>;
   update(
@@ -33,6 +36,8 @@ const EMPTY_SNAPSHOT: WorkBoardSnapshot = {
   items: [],
   nextCursor: undefined,
   loading: false,
+  continuationError: undefined,
+  continuationCursor: undefined,
 };
 
 function requireResult<T>(result: WorkBoardIpcResult<T>): T {
@@ -60,22 +65,35 @@ export function useWorkBoard(query?: WorkBoardListQuery): UseWorkBoardResult {
       void window.maka.workBoard.list(query).then(
         (result) => {
           if (revision !== revisionRef.current) return;
-          setSnapshot(
-            result.ok
-              ? {
-                  items: result.value.items,
-                  nextCursor: result.value.nextCursor,
-                  loading: false,
-                }
-              : { items: [], loading: false, error: result.message },
-          );
+          if (result.ok) {
+            setSnapshot({
+              items: result.value.items,
+              nextCursor: result.value.nextCursor,
+              loading: false,
+              continuationError: undefined,
+              continuationCursor: undefined,
+            });
+            return;
+          }
+          setSnapshot((current) => ({
+            items: current.items,
+            nextCursor: current.nextCursor,
+            loading: false,
+            error: current.items.length === 0 ? result.message : undefined,
+            continuationError: current.items.length > 0 ? result.message : undefined,
+            continuationCursor: undefined,
+          }));
         },
         (error: unknown) => {
           if (revision !== revisionRef.current) return;
+          const message = error instanceof Error ? error.message : 'Work Board load failed';
           setSnapshot((current) => ({
             items: current.items,
+            nextCursor: current.nextCursor,
             loading: false,
-            error: error instanceof Error ? error.message : 'Work Board load failed',
+            error: current.items.length === 0 ? message : undefined,
+            continuationError: current.items.length > 0 ? message : undefined,
+            continuationCursor: undefined,
           }));
         },
       );
@@ -97,16 +115,24 @@ export function useWorkBoard(query?: WorkBoardListQuery): UseWorkBoardResult {
 
   const retry = useCallback(() => load(true), [load]);
 
-  const loadMore = useCallback(() => {
-    const cursor = snapshot.nextCursor;
-    if (!cursor || snapshot.loading) return;
+  const loadMoreAt = useCallback((cursor: string) => {
     const revision = ++revisionRef.current;
-    setSnapshot((current) => ({ ...current, loading: true }));
+    setSnapshot((current) => ({
+      ...current,
+      loading: true,
+      continuationError: undefined,
+      continuationCursor: undefined,
+    }));
     void window.maka.workBoard.list({ ...query, cursor }).then(
       (result) => {
         if (revision !== revisionRef.current) return;
         if (!result.ok) {
-          setSnapshot((current) => ({ ...current, loading: false, error: result.message }));
+          setSnapshot((current) => ({
+            ...current,
+            loading: false,
+            continuationError: result.message,
+            continuationCursor: cursor,
+          }));
           return;
         }
         setSnapshot((current) => {
@@ -118,19 +144,33 @@ export function useWorkBoard(query?: WorkBoardListQuery): UseWorkBoardResult {
             items: [...current.items, ...appended],
             nextCursor: result.value.nextCursor,
             loading: false,
+            continuationError: undefined,
+            continuationCursor: undefined,
           };
         });
       },
       (error: unknown) => {
         if (revision !== revisionRef.current) return;
+        const message = error instanceof Error ? error.message : 'Work Board load failed';
         setSnapshot((current) => ({
           ...current,
           loading: false,
-          error: error instanceof Error ? error.message : 'Work Board load failed',
+          continuationError: message,
+          continuationCursor: cursor,
         }));
       },
     );
-  }, [query, snapshot.loading, snapshot.nextCursor]);
+  }, [query]);
+
+  const loadMore = useCallback(() => {
+    if (!snapshot.nextCursor || snapshot.loading) return;
+    loadMoreAt(snapshot.nextCursor);
+  }, [loadMoreAt, snapshot.loading, snapshot.nextCursor]);
+
+  const retryContinuation = useCallback(() => {
+    if (snapshot.continuationCursor) loadMoreAt(snapshot.continuationCursor);
+    else load(true);
+  }, [load, loadMoreAt, snapshot.continuationCursor]);
 
   // The main process emits workBoard:changed for every successful mutation;
   // the subscription above is the single reload path, so no second list
@@ -144,6 +184,7 @@ export function useWorkBoard(query?: WorkBoardListQuery): UseWorkBoardResult {
   return {
     ...snapshot,
     retry,
+    retryContinuation,
     loadMore,
     create: (input) => mutate(() => window.maka.workBoard.create(input)),
     update: (id, patch, options) =>
diff --git a/apps/desktop/src/renderer/work-board-panel.tsx b/apps/desktop/src/renderer/work-board-panel.tsx
index 085c6a0437..6fcb8e38fb 100644
--- a/apps/desktop/src/renderer/work-board-panel.tsx
+++ b/apps/desktop/src/renderer/work-board-panel.tsx
@@ -212,7 +212,7 @@ export function WorkBoardPanel(props: { projectId: string | null }) {
           isDisabled={newTitle.trim().length === 0}
         />
       </div>
-      {board.error ? (
+      {board.error && board.items.length === 0 ? (
         <Banner
           status="error"
           role="alert"
@@ -223,19 +223,38 @@ export function WorkBoardPanel(props: { projectId: string | null }) {
             <Button size="sm" variant="ghost" label={copy.retry} onClick={board.retry} />
           }
         />
-      ) : board.loading && board.items.length === 0 ? (
-        <Spinner size="sm" shade="subtle" label={copy.loading} className="maka-work-board-message" />
       ) : (
         <>
-          {activeItems.length === 0 && archivedItems.length === 0 ? (
-            <EmptyState
-              isCompact
-              className="maka-work-board-empty"
-              icon={<ListTodo size={24} aria-hidden="true" />}
-              title={copy.empty}
+          {board.continuationError && (
+            <Banner
+              status="error"
+              role="alert"
+              className="maka-work-board-message"
+              title={copy.loadFailed}
+              description={board.continuationError}
+              endContent={
+                <Button
+                  size="sm"
+                  variant="ghost"
+                  label={copy.retry}
+                  onClick={board.retryContinuation}
+                />
+              }
             />
+          )}
+          {board.loading && board.items.length === 0 ? (
+            <Spinner size="sm" shade="subtle" label={copy.loading} className="maka-work-board-message" />
           ) : (
-            <ul className="maka-work-board-list">
+            <>
+              {activeItems.length === 0 && archivedItems.length === 0 ? (
+                <EmptyState
+                  isCompact
+                  className="maka-work-board-empty"
+                  icon={<ListTodo size={24} aria-hidden="true" />}
+                  title={copy.empty}
+                />
+              ) : (
+                <ul className="maka-work-board-list">
               {activeItems.map((item) => (
                 <WorkBoardRow
                   key={item.id}
@@ -280,16 +299,18 @@ export function WorkBoardPanel(props: { projectId: string | null }) {
                   onRemove={() => void runAction(() => board.remove(item.id))}
                 />
               ))}
-            </ul>
-          )}
-          {board.nextCursor && (
-            <Button
-              size="sm"
-              variant="ghost"
-              label={copy.loadMore}
-              onClick={board.loadMore}
-              isDisabled={board.loading}
-            />
+                </ul>
+              )}
+              {board.nextCursor && (
+                <Button
+                  size="sm"
+                  variant="ghost"
+                  label={copy.loadMore}
+                  onClick={board.loadMore}
+                  isDisabled={board.loading}
+                />
+              )}
+            </>
           )}
         </>
       )}

From 8e0f946c3a0624abdfd417d23d4ae2425db884b5 Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Fri, 21 Aug 2026 09:23:50 +0800
Subject: [PATCH 10/22] fix(desktop): address Work Board review findings

- close the WorkBoardStore during desktop shutdown
- pass revision CAS guards through all renderer mutations
- preserve loaded pagination during mutation refreshes
- use Astryx TextInput with IME-safe create and rename handling

Generated-by: Codex
---
 .../__tests__/work-board-ipc-main.test.ts     | 119 ++++++++++--------
 apps/desktop/src/main/runtime-host-boot.ts    |  10 +-
 apps/desktop/src/main/work-board-ipc-main.ts  |  10 +-
 apps/desktop/src/renderer/use-work-board.ts   |  67 ++++++++--
 .../desktop/src/renderer/work-board-panel.tsx |  50 ++++++--
 5 files changed, 177 insertions(+), 79 deletions(-)

diff --git a/apps/desktop/src/main/__tests__/work-board-ipc-main.test.ts b/apps/desktop/src/main/__tests__/work-board-ipc-main.test.ts
index 11c4588253..f263a50920 100644
--- a/apps/desktop/src/main/__tests__/work-board-ipc-main.test.ts
+++ b/apps/desktop/src/main/__tests__/work-board-ipc-main.test.ts
@@ -73,43 +73,46 @@ describe('Work Board IPC', () => {
     await withTempRoot(async (root) => {
       const ipc = createFakeIpcMain();
       const window = createFakeWindowController();
-      registerWorkBoardIpc({
+      const registration = registerWorkBoardIpc({
         ipcMain: ipc as unknown as Pick<IpcMain, 'handle'>,
         workspaceRoot: root,
         mainWindowController: window,
       });
-
-      const created = await ipc.invoke<WorkBoardIpcResult<{ id: string; revision: number }>>(
-        'workBoard:create',
-        itemInput(),
-      );
-      assert.equal(created.ok, true);
-      assert.ok(created.ok && created.value.id);
-
-      const page = await ipc.invoke<WorkBoardIpcResult<{ items: Array<{ id: string }> }>>(
-        'workBoard:list',
-        {},
-      );
-      assert.equal(page.ok, true);
-      assert.ok(page.ok);
-      assert.equal(page.value.items.length, 1);
-      assert.equal(page.value.items[0]?.id, created.ok ? created.value.id : undefined);
-
-      const changed = window.events.filter(
-        (event) => event.channel === 'workBoard:changed',
-      );
-      assert.equal(changed.length, 1);
-      const event = changed[0]?.args[0] as WorkBoardChangedEvent;
-      assert.equal(event.type, 'work_board_changed');
-      assert.ok(typeof event.ts === 'number');
-      assert.deepEqual(ipc.channels, [
-        'workBoard:list',
-        'workBoard:create',
-        'workBoard:update',
-        'workBoard:archive',
-        'workBoard:unarchive',
-        'workBoard:remove',
-      ]);
+      try {
+        const created = await ipc.invoke<WorkBoardIpcResult<{ id: string; revision: number }>>(
+          'workBoard:create',
+          itemInput(),
+        );
+        assert.equal(created.ok, true);
+        assert.ok(created.ok && created.value.id);
+
+        const page = await ipc.invoke<WorkBoardIpcResult<{ items: Array<{ id: string }> }>>(
+          'workBoard:list',
+          {},
+        );
+        assert.equal(page.ok, true);
+        assert.ok(page.ok);
+        assert.equal(page.value.items.length, 1);
+        assert.equal(page.value.items[0]?.id, created.ok ? created.value.id : undefined);
+
+        const changed = window.events.filter(
+          (event) => event.channel === 'workBoard:changed',
+        );
+        assert.equal(changed.length, 1);
+        const event = changed[0]?.args[0] as WorkBoardChangedEvent;
+        assert.equal(event.type, 'work_board_changed');
+        assert.ok(typeof event.ts === 'number');
+        assert.deepEqual(ipc.channels, [
+          'workBoard:list',
+          'workBoard:create',
+          'workBoard:update',
+          'workBoard:archive',
+          'workBoard:unarchive',
+          'workBoard:remove',
+        ]);
+      } finally {
+        registration.close();
+      }
     });
   });
 
@@ -117,24 +120,33 @@ describe('Work Board IPC', () => {
     await withTempRoot(async (root) => {
       const ipc = createFakeIpcMain();
       const window = createFakeWindowController();
-      registerWorkBoardIpc({
+      const registration = registerWorkBoardIpc({
         ipcMain: ipc as unknown as Pick<IpcMain, 'handle'>,
         workspaceRoot: root,
         mainWindowController: window,
       });
-
-      const created = await ipc.invoke<WorkBoardIpcResult<{ id: string; revision: number }>>(
-        'workBoard:create',
-        itemInput(),
-      );
-      assert.ok(created.ok);
-      const id = created.ok ? created.value.id : '';
-
-      const renamed = await ipc.invoke<
-        WorkBoardIpcResult<{ title: string; revision: number; state: string }>
-      >('workBoard:update', id, { title: 'Review auth v2' });
-      assert.ok(renamed.ok);
-      assert.equal(renamed.ok && renamed.value.revision, 2);
+      try {
+        const created = await ipc.invoke<WorkBoardIpcResult<{ id: string; revision: number }>>(
+          'workBoard:create',
+          itemInput(),
+        );
+        assert.ok(created.ok);
+        const id = created.ok ? created.value.id : '';
+
+        const renamed = await ipc.invoke<
+          WorkBoardIpcResult<{ title: string; revision: number; state: string }>
+        >('workBoard:update', id, { title: 'Review auth v2' });
+        assert.ok(renamed.ok);
+        assert.equal(renamed.ok && renamed.value.revision, 2);
+
+        const staleRename = await ipc.invoke<WorkBoardIpcResult<unknown>>(
+          'workBoard:update',
+          id,
+          { title: 'stale write' },
+          { expectedRevision: 1 },
+        );
+        assert.equal(staleRename.ok, false);
+        if (!staleRename.ok) assert.equal(staleRename.code, 'operation_conflict');
 
       const removedBeforeArchive = await ipc.invoke<WorkBoardIpcResult<null>>(
         'workBoard:remove',
@@ -183,11 +195,14 @@ describe('Work Board IPC', () => {
       assert.ok(page.ok);
       assert.equal(page.ok && page.value.items.length, 0);
 
-      // create, update, archive, unarchive, archive, remove = 6 mutations
-      const changed = window.events.filter(
-        (event) => event.channel === 'workBoard:changed',
-      );
-      assert.equal(changed.length, 6);
+        // create, update, archive, unarchive, archive, remove = 6 mutations
+        const changed = window.events.filter(
+          (event) => event.channel === 'workBoard:changed',
+        );
+        assert.equal(changed.length, 6);
+      } finally {
+        registration.close();
+      }
     });
   });
 });
diff --git a/apps/desktop/src/main/runtime-host-boot.ts b/apps/desktop/src/main/runtime-host-boot.ts
index 78cbab6f8a..c149a42aea 100644
--- a/apps/desktop/src/main/runtime-host-boot.ts
+++ b/apps/desktop/src/main/runtime-host-boot.ts
@@ -55,6 +55,7 @@ import {
 import type { WorkspaceTarget } from "@maka/runtime-host/protocol";
 import { createCredentialMcpOAuthStorage, McpClientManager } from "@maka/mcp";
 import {
+  createWorkBoardStore,
   createSettingsStore,
   createMcpConfigStore,
   createFileCredentialStore,
@@ -309,6 +310,7 @@ const desktopLocale = createDesktopLocaleAuthority({
   preferredSystemLanguages: () => app.getPreferredSystemLanguages(),
 });
 const mcpConfigStore = createMcpConfigStore(workspaceRoot);
+const workBoardStore = createWorkBoardStore(workspaceRoot);
 const mcpManager = new McpClientManager({
   clientName: "maka-desktop",
   clientVersion: app.getVersion(),
@@ -666,7 +668,12 @@ mcpManager.onChange(() => {
 
 registerPersistentClientIpc();
 registerPetPackIpc({ ipcMain, workspaceRoot, mainWindowController, settingsStore });
-registerWorkBoardIpc({ ipcMain, workspaceRoot, mainWindowController });
+const workBoardIpc = registerWorkBoardIpc({
+  ipcMain,
+  workspaceRoot,
+  mainWindowController,
+  store: workBoardStore,
+});
 const browserIpc = registerBrowserIpc({
   mainWindowController,
   isHostActive: (scope) => runtimeHostManager?.ownsScope(scope) === true,
@@ -1564,6 +1571,7 @@ async function closeRuntimeHostDesktop(): Promise<void> {
     Promise.resolve().then(() => runtimeHostManagement.close()),
     runtimeHostManager?.close(),
     runtimeHostOnboarding.close(),
+    Promise.resolve().then(() => workBoardIpc.close()),
     runtimeHostSshTerminal.close(),
     botRegistry.stopAll(),
     mcpManager.close(),
diff --git a/apps/desktop/src/main/work-board-ipc-main.ts b/apps/desktop/src/main/work-board-ipc-main.ts
index ae99945fcf..576bced82a 100644
--- a/apps/desktop/src/main/work-board-ipc-main.ts
+++ b/apps/desktop/src/main/work-board-ipc-main.ts
@@ -14,6 +14,10 @@ export type { WorkBoardChangedEvent, WorkBoardIpcResult } from '../shared/work-b
 
 type MainWindowController = Pick<ReturnType<typeof createMainWindowController>, 'send'>;
 
+export interface WorkBoardIpcRegistration {
+  close(): void;
+}
+
 /**
  * Desktop main process owns the Work Board store (the v1 mutation boundary).
  * Renderer code reads a projection through IPC and reloads on the change
@@ -25,7 +29,7 @@ export function registerWorkBoardIpc(input: {
   readonly mainWindowController: MainWindowController;
   readonly store?: WorkBoardStore;
   readonly now?: () => number;
-}): void {
+}): WorkBoardIpcRegistration {
   const store = input.store ?? createWorkBoardStore(input.workspaceRoot);
   const now = input.now ?? Date.now;
   const emitChanged = (): void => {
@@ -129,6 +133,10 @@ export function registerWorkBoardIpc(input: {
       }
     },
   );
+
+  return {
+    close: () => store.close(),
+  };
 }
 
 function requireWorkBoardId(id: unknown): string {
diff --git a/apps/desktop/src/renderer/use-work-board.ts b/apps/desktop/src/renderer/use-work-board.ts
index b8b230ff1b..b80cdc0283 100644
--- a/apps/desktop/src/renderer/use-work-board.ts
+++ b/apps/desktop/src/renderer/use-work-board.ts
@@ -1,9 +1,11 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
-import type {
-  CreateWorkBoardItemInput,
-  UpdateWorkBoardItemInput,
-  WorkBoardItem,
-  WorkBoardListQuery,
+import {
+  WORK_BOARD_PAGE_SIZE_MAX,
+  type CreateWorkBoardItemInput,
+  type UpdateWorkBoardItemInput,
+  type WorkBoardItem,
+  type WorkBoardListQuery,
+  type WorkBoardPage,
 } from '@maka/core/work-board';
 import type { WorkBoardMutationOptions } from '@maka/storage/work-board-store';
 import type { WorkBoardChangedEvent, WorkBoardIpcResult } from '../shared/work-board-ipc.js';
@@ -40,6 +42,37 @@ const EMPTY_SNAPSHOT: WorkBoardSnapshot = {
   continuationCursor: undefined,
 };
 
+type WorkBoardList = (
+  query?: WorkBoardListQuery,
+) => Promise<WorkBoardIpcResult<WorkBoardPage>>;
+
+async function listWindow(
+  list: WorkBoardList,
+  query: WorkBoardListQuery | undefined,
+  targetCount: number,
+): Promise<WorkBoardIpcResult<WorkBoardPage>> {
+  const first = await list(
+    targetCount > 0
+      ? { ...query, limit: Math.min(WORK_BOARD_PAGE_SIZE_MAX, targetCount) }
+      : query,
+  );
+  if (!first.ok || targetCount <= first.value.items.length || !first.value.nextCursor) {
+    return first;
+  }
+
+  const items = [...first.value.items];
+  let nextCursor: string | undefined = first.value.nextCursor;
+  while (items.length < targetCount && nextCursor) {
+    const page = await list({ ...query, limit: WORK_BOARD_PAGE_SIZE_MAX, cursor: nextCursor });
+    if (!page.ok) return page;
+    const known = new Set(items.map((item) => item.id));
+    items.push(...page.value.items.filter((item) => !known.has(item.id)));
+    nextCursor = page.value.nextCursor;
+    if (page.value.items.length === 0) break;
+  }
+  return { ok: true, value: { items, nextCursor } };
+}
+
 function requireResult<T>(result: WorkBoardIpcResult<T>): T {
   if (result.ok) return result.value;
   throw new Error(result.message);
@@ -52,20 +85,26 @@ function requireResult<T>(result: WorkBoardIpcResult<T>): T {
  */
 export function useWorkBoard(query?: WorkBoardListQuery): UseWorkBoardResult {
   const revisionRef = useRef(0);
+  const loadedItemCountRef = useRef(0);
   const [snapshot, setSnapshot] = useState<WorkBoardSnapshot>(EMPTY_SNAPSHOT);
 
   const load = useCallback(
     (preserveItems: boolean) => {
       const revision = ++revisionRef.current;
-      setSnapshot((current) => ({
-        items: preserveItems ? current.items : [],
-        nextCursor: preserveItems ? current.nextCursor : undefined,
-        loading: true,
-      }));
-      void window.maka.workBoard.list(query).then(
+      const loadedItemCount = preserveItems ? loadedItemCountRef.current : 0;
+      setSnapshot((current) => {
+        if (!preserveItems) loadedItemCountRef.current = 0;
+        return {
+          items: preserveItems ? current.items : [],
+          nextCursor: preserveItems ? current.nextCursor : undefined,
+          loading: true,
+        };
+      });
+      void listWindow(window.maka.workBoard.list, query, loadedItemCount).then(
         (result) => {
           if (revision !== revisionRef.current) return;
           if (result.ok) {
+            loadedItemCountRef.current = result.value.items.length;
             setSnapshot({
               items: result.value.items,
               nextCursor: result.value.nextCursor,
@@ -97,7 +136,7 @@ export function useWorkBoard(query?: WorkBoardListQuery): UseWorkBoardResult {
           }));
         },
       );
-    },
+      },
     [query],
   );
 
@@ -140,8 +179,10 @@ export function useWorkBoard(query?: WorkBoardListQuery): UseWorkBoardResult {
           const appended = result.value.items.filter(
             (item: WorkBoardItem) => !known.has(item.id),
           );
+          const items = [...current.items, ...appended];
+          loadedItemCountRef.current = items.length;
           return {
-            items: [...current.items, ...appended],
+            items,
             nextCursor: result.value.nextCursor,
             loading: false,
             continuationError: undefined,
diff --git a/apps/desktop/src/renderer/work-board-panel.tsx b/apps/desktop/src/renderer/work-board-panel.tsx
index 6fcb8e38fb..2a19a4abc3 100644
--- a/apps/desktop/src/renderer/work-board-panel.tsx
+++ b/apps/desktop/src/renderer/work-board-panel.tsx
@@ -48,13 +48,20 @@ function WorkBoardRow(props: {
             size="sm"
             label={copy.rename}
             isLabelHidden
+            hasAutoFocus
             value={props.renameValue}
             onChange={props.onRenameChange}
             onKeyDown={(event) => {
-              if (event.key === 'Enter' && !event.nativeEvent.isComposing) {
+              event.stopPropagation();
+              if (event.nativeEvent.isComposing || event.key === 'Process') return;
+              if (event.key === 'Enter') {
+                event.preventDefault();
                 props.onRenameSave();
               }
-              if (event.key === 'Escape') props.onRenameCancel();
+              if (event.key === 'Escape') {
+                event.preventDefault();
+                props.onRenameCancel();
+              }
             }}
           />
         ) : (
@@ -156,7 +163,7 @@ export function WorkBoardPanel(props: { projectId: string | null }) {
   const saveRename = async (item: WorkBoardItem): Promise<void> => {
     const title = renamingTitle.trim();
     if (!title) return;
-    if (await runAction(() => board.update(item.id, { title }))) {
+    if (await runAction(() => board.update(item.id, { title }, { expectedRevision: item.revision }))) {
       setRenamingId(null);
     }
   };
@@ -201,7 +208,12 @@ export function WorkBoardPanel(props: { projectId: string | null }) {
           value={newTitle}
           onChange={setNewTitle}
           onKeyDown={(event) => {
-            if (event.key === 'Enter' && !event.nativeEvent.isComposing) void create();
+            event.stopPropagation();
+            if (event.nativeEvent.isComposing || event.key === 'Process') return;
+            if (event.key === 'Enter') {
+              event.preventDefault();
+              void create();
+            }
           }}
           placeholder={copy.createPlaceholder}
         />
@@ -268,15 +280,25 @@ export function WorkBoardPanel(props: { projectId: string | null }) {
                   onRenameSave={() => void saveRename(item)}
                   onRenameCancel={() => setRenamingId(null)}
                   onComplete={() =>
-                    void runAction(() => board.update(item.id, { state: 'done' }))
+                    void runAction(() => board.update(item.id, { state: 'done' }, { expectedRevision: item.revision }))
                   }
                   onReopen={() =>
-                    void runAction(() => board.update(item.id, { state: 'todo' }))
+                    void runAction(() => board.update(item.id, { state: 'todo' }, { expectedRevision: item.revision }))
+                  }
+                  onMove={() =>
+                    void runAction(() =>
+                      board.update(item.id, { scope: moveScope(item) }, { expectedRevision: item.revision }),
+                    )
+                  }
+                  onArchive={() =>
+                    void runAction(() => board.archive(item.id, { expectedRevision: item.revision }))
+                  }
+                  onUnarchive={() =>
+                    void runAction(() => board.unarchive(item.id, { expectedRevision: item.revision }))
+                  }
+                  onRemove={() =>
+                    void runAction(() => board.remove(item.id, { expectedRevision: item.revision }))
                   }
-                  onMove={() => void runAction(() => board.update(item.id, { scope: moveScope(item) }))}
-                  onArchive={() => void runAction(() => board.archive(item.id))}
-                  onUnarchive={() => void runAction(() => board.unarchive(item.id))}
-                  onRemove={() => void runAction(() => board.remove(item.id))}
                 />
               ))}
               {archivedItems.map((item) => (
@@ -295,8 +317,12 @@ export function WorkBoardPanel(props: { projectId: string | null }) {
                   onReopen={() => undefined}
                   onMove={() => undefined}
                   onArchive={() => undefined}
-                  onUnarchive={() => void runAction(() => board.unarchive(item.id))}
-                  onRemove={() => void runAction(() => board.remove(item.id))}
+                  onUnarchive={() =>
+                    void runAction(() => board.unarchive(item.id, { expectedRevision: item.revision }))
+                  }
+                  onRemove={() =>
+                    void runAction(() => board.remove(item.id, { expectedRevision: item.revision }))
+                  }
                 />
               ))}
                 </ul>

From 601c89bd75f54dee50347a759a69bbdc7e651a03 Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Fri, 21 Aug 2026 12:10:51 +0800
Subject: [PATCH 11/22] fix(work-board): include relinked project aliases

Query Work Board project scopes across canonical and absorbed project identities so relinking does not hide existing items. Normalize the identity set and bind pagination cursors to the complete scope.

Generated-by: Codex
---
 apps/desktop/src/renderer/app-shell.tsx       |  7 ++++-
 .../features/workbar/ui/workbar-host.tsx      |  1 +
 .../features/workbar/ui/workbar-surface.tsx   |  8 ++++-
 .../desktop/src/renderer/work-board-panel.tsx | 12 +++++--
 .../core/src/__tests__/work-board.test.ts     | 24 ++++++++++++++
 packages/core/src/work-board.ts               | 30 +++++++++++++++++-
 .../src/__tests__/work-board-store.test.ts    | 31 +++++++++++++++++++
 packages/storage/src/work-board-list-query.ts | 10 ++++--
 8 files changed, 116 insertions(+), 7 deletions(-)

diff --git a/apps/desktop/src/renderer/app-shell.tsx b/apps/desktop/src/renderer/app-shell.tsx
index 29a97fb25b..6aeba4d209 100644
--- a/apps/desktop/src/renderer/app-shell.tsx
+++ b/apps/desktop/src/renderer/app-shell.tsx
@@ -3287,7 +3287,12 @@ function AppShellContent({
             </div>
             {/* Collapse hides the Workbar surface without unmounting its tools;
                 dynamic resources therefore keep their existing lifecycle. */}
-            <WorkbarHost model={workbar.host} />
+            <WorkbarHost
+              model={{
+                ...workbar.host,
+                projectAliases: currentProject?.aliases ?? [],
+              }}
+            />
           </div>
           </MakaUriContext.Provider>
         </AppShellDetailPanel>
diff --git a/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx b/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
index 6e1805e56e..087aec39e6 100644
--- a/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
+++ b/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
@@ -70,6 +70,7 @@ function SessionWorkbarFallback() {
 export interface WorkbarHostModel {
   activeId?: string;
   projectId?: string | null;
+  projectAliases?: readonly string[];
   rightCollapsed: boolean;
   bottomOpen: boolean;
   hidden: boolean;
diff --git a/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx b/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx
index bf56db17af..0b95cbc440 100644
--- a/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx
+++ b/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx
@@ -675,6 +675,7 @@ function WorkbarLauncher(props: {
 export function WorkbarSurface(props: {
   sessionId: string;
   projectId?: string | null;
+  projectAliases?: readonly string[];
   hidden: boolean;
   onDismissPanel: (placement: SessionWorkbarPlacement) => void;
   panelsState: SessionWorkbarPanelsState;
@@ -832,7 +833,12 @@ export function WorkbarSurface(props: {
             />
           );
         } else if (tab.kind === 'work-board') {
-          content = <WorkBoardPanel projectId={props.projectId ?? null} />;
+          content = (
+            <WorkBoardPanel
+              projectId={props.projectId ?? null}
+              projectAliases={props.projectAliases}
+            />
+          );
         } else if (tab.kind === 'browser') {
           content = (
             <Suspense fallback={<WorkbarPanelLoading label={copy.browser} />}>
diff --git a/apps/desktop/src/renderer/work-board-panel.tsx b/apps/desktop/src/renderer/work-board-panel.tsx
index 2a19a4abc3..8700e0dd36 100644
--- a/apps/desktop/src/renderer/work-board-panel.tsx
+++ b/apps/desktop/src/renderer/work-board-panel.tsx
@@ -107,15 +107,23 @@ function WorkBoardRow(props: {
   );
 }
 
-export function WorkBoardPanel(props: { projectId: string | null }) {
+export function WorkBoardPanel(props: {
+  projectId: string | null;
+  projectAliases?: readonly string[];
+}) {
   const copy = getDesktopConversationCopy(useUiLocale()).workBoardPanel;
   const [filter, setFilter] = useState<'inbox' | 'project'>('inbox');
+  const projectScopeIds = useMemo(() => {
+    if (props.projectId === null) return undefined;
+    return [...new Set([props.projectId, ...(props.projectAliases ?? [])])];
+  }, [props.projectAliases, props.projectId]);
   const query: WorkBoardListQuery = useMemo(
     () => ({
       scope: scopeForFilter(filter, props.projectId),
       includeArchived: true,
+      ...(filter === 'project' && projectScopeIds ? { projectIds: projectScopeIds } : {}),
     }),
-    [filter, props.projectId],
+    [filter, projectScopeIds, props.projectId],
   );
   const board = useWorkBoard(query);
   const [newTitle, setNewTitle] = useState('');
diff --git a/packages/core/src/__tests__/work-board.test.ts b/packages/core/src/__tests__/work-board.test.ts
index 846d001097..e37d49efb7 100644
--- a/packages/core/src/__tests__/work-board.test.ts
+++ b/packages/core/src/__tests__/work-board.test.ts
@@ -298,5 +298,29 @@ describe('Work Board contract', () => {
       assert.equal(bounded.value.limit, 25);
       assert.equal(bounded.value.includeArchived, true);
     }
+
+    const aliases = normalizeWorkBoardListQuery({
+      scope: { kind: 'project', projectId: 'canonical' },
+      projectIds: ['absorbed', 'canonical'],
+    });
+    assert.ok(aliases.ok);
+    if (aliases.ok) {
+      assert.deepEqual(aliases.value.projectIds, ['absorbed', 'canonical']);
+    }
+    assert.equal(normalizeWorkBoardListQuery({ projectIds: ['orphan'] }).ok, false);
+    assert.equal(
+      normalizeWorkBoardListQuery({
+        scope: { kind: 'inbox' },
+        projectIds: ['project'],
+      }).ok,
+      false,
+    );
+    assert.equal(
+      normalizeWorkBoardListQuery({
+        scope: { kind: 'project', projectId: 'canonical' },
+        projectIds: ['canonical', 'canonical'],
+      }).ok,
+      false,
+    );
   });
 });
diff --git a/packages/core/src/work-board.ts b/packages/core/src/work-board.ts
index 2084ad07ef..74b858654d 100644
--- a/packages/core/src/work-board.ts
+++ b/packages/core/src/work-board.ts
@@ -118,6 +118,8 @@ export interface UpdateWorkBoardItemInput {
 
 export interface WorkBoardListQuery {
   scope?: WorkBoardScope;
+  /** Project identities included by a canonical project scope after relinking. */
+  projectIds?: readonly string[];
   includeArchived?: boolean;
   limit?: number;
   /** Opaque continuation returned by a previous page. */
@@ -191,7 +193,7 @@ const WORK_BOARD_UPDATE_INPUT_SHAPE = defineObjectShape<UpdateWorkBoardItemInput
 );
 const WORK_BOARD_LIST_QUERY_SHAPE = defineObjectShape<WorkBoardListQuery>()(
   [],
-  ['scope', 'includeArchived', 'limit', 'cursor'],
+  ['scope', 'projectIds', 'includeArchived', 'limit', 'cursor'],
 );
 
 export type WorkBoardNormalizeResult<T> = { ok: true; value: T } | { ok: false; message: string };
@@ -433,6 +435,32 @@ export function normalizeWorkBoardListQuery(
     if (!scope.ok) return scope;
     query.scope = scope.value;
   }
+  if (input.projectIds !== undefined) {
+    if (!Array.isArray(input.projectIds) || input.projectIds.length === 0) {
+      return fail('projectIds must be a non-empty array when provided');
+    }
+    const normalizedProjectIds: string[] = [];
+    for (const projectId of input.projectIds) {
+      const normalized = normalizeIdString(projectId, {
+        field: 'projectIds[]',
+        max: WORK_BOARD_PROJECT_ID_MAX_CHARS,
+      });
+      if (!normalized.ok) return normalized;
+      normalizedProjectIds.push(normalized.value);
+    }
+    const uniqueProjectIds = [...new Set(normalizedProjectIds)];
+    if (uniqueProjectIds.length !== normalizedProjectIds.length) {
+      return fail('projectIds contains duplicates');
+    }
+    if (query.scope?.kind !== 'project') {
+      return fail('projectIds require a project scope');
+    }
+    if (!uniqueProjectIds.includes(query.scope.projectId)) {
+      uniqueProjectIds.push(query.scope.projectId);
+    }
+    uniqueProjectIds.sort((left, right) => left.localeCompare(right));
+    query.projectIds = uniqueProjectIds;
+  }
   if (input.includeArchived !== undefined) {
     if (typeof input.includeArchived !== 'boolean') {
       return fail('includeArchived must be a boolean');
diff --git a/packages/storage/src/__tests__/work-board-store.test.ts b/packages/storage/src/__tests__/work-board-store.test.ts
index 1f43166107..0eb147e00f 100644
--- a/packages/storage/src/__tests__/work-board-store.test.ts
+++ b/packages/storage/src/__tests__/work-board-store.test.ts
@@ -182,6 +182,22 @@ describe('Work Board store', () => {
         await store.archive(ids[0]!, {}, 7);
         assert.equal((await store.list()).items.length, 5);
         assert.equal((await store.list({ includeArchived: true })).items.length, 6);
+
+        const absorbedProjectItem = await store.create(
+          itemInput({
+            title: 'absorbed project item',
+            scope: { kind: 'project', projectId: 'project-stale' },
+          }),
+          8,
+        );
+        const projectWithAliases = await store.list({
+          scope: { kind: 'project', projectId: 'p1' },
+          projectIds: ['p1', 'project-stale'],
+        });
+        assert.deepEqual(
+          projectWithAliases.items.map((item) => item.id),
+          [absorbedProjectItem.id, projectItem.id],
+        );
       } finally {
         store.close();
       }
@@ -268,6 +284,21 @@ describe('Work Board store', () => {
           (error: unknown) =>
             error instanceof WorkBoardStoreError && error.code === 'invalid_input',
         );
+
+        const aliasItem = await store.create(
+          itemInput({ scope: { kind: 'project', projectId: 'absorbed' } }),
+          200,
+        );
+        const aliasPage = await store.list({
+          limit: 1,
+          scope: { kind: 'project', projectId: 'canonical' },
+          projectIds: ['canonical', 'absorbed'],
+        });
+        assert.deepEqual(
+          aliasPage.items.map((item) => item.id),
+          [aliasItem.id],
+        );
+        assert.equal(aliasPage.nextCursor, undefined);
         await assert.rejects(
           store.list({ includeArchived: true, cursor: inboxPage.nextCursor }),
           (error: unknown) =>
diff --git a/packages/storage/src/work-board-list-query.ts b/packages/storage/src/work-board-list-query.ts
index 661dd002d3..f2f55bd086 100644
--- a/packages/storage/src/work-board-list-query.ts
+++ b/packages/storage/src/work-board-list-query.ts
@@ -49,7 +49,7 @@ export function buildWorkBoardListStatement(
     sql += ' AND archived = 0';
   }
   if (value.scope) {
-    sql = appendScopePredicate(sql, params, value.scope);
+    sql = appendScopePredicate(sql, params, value.scope, value.projectIds);
   }
   if (value.cursor) {
     const cursor = decodeWorkBoardCursor(value.cursor);
@@ -69,7 +69,7 @@ export function workBoardFilterFingerprint(value: WorkBoardListQuery): string {
     value.scope === undefined
       ? 'any'
       : value.scope.kind === 'project'
-        ? `project:${value.scope.projectId}`
+        ? `project:${[...(value.projectIds ?? [value.scope.projectId])].sort().join('|')}`
         : 'inbox';
   return `${value.includeArchived ? 'archived-included' : 'active-only'}:${scope}`;
 }
@@ -110,12 +110,18 @@ function appendScopePredicate(
   sql: string,
   params: Array<string | number>,
   scope: WorkBoardScope,
+  projectIds?: readonly string[],
 ): string {
   if (scope.kind === 'inbox') {
     sql += ' AND scope_kind = ? AND project_id IS NULL';
     params.push('inbox');
     return sql;
   }
+  if (projectIds && projectIds.length > 0) {
+    sql += ` AND scope_kind = ? AND project_id IN (${projectIds.map(() => '?').join(', ')})`;
+    params.push('project', ...projectIds);
+    return sql;
+  }
   sql += ' AND scope_kind = ? AND project_id = ?';
   params.push('project', scope.projectId);
   return sql;

From 9af8d7045b8aefce6215b23a72875222bf02d651 Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Fri, 21 Aug 2026 13:18:37 +0800
Subject: [PATCH 12/22] fix(work-board): freeze rename draft revision

Keep the optimistic-concurrency revision captured when rename starts, so a change signal cannot turn a stale draft into an accepted overwrite.

Generated-by: Codex
---
 apps/desktop/src/renderer/work-board-panel.tsx | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/src/renderer/work-board-panel.tsx b/apps/desktop/src/renderer/work-board-panel.tsx
index 8700e0dd36..996a7f259b 100644
--- a/apps/desktop/src/renderer/work-board-panel.tsx
+++ b/apps/desktop/src/renderer/work-board-panel.tsx
@@ -129,6 +129,7 @@ export function WorkBoardPanel(props: {
   const [newTitle, setNewTitle] = useState('');
   const [renamingId, setRenamingId] = useState<string | null>(null);
   const [renamingTitle, setRenamingTitle] = useState('');
+  const [renamingRevision, setRenamingRevision] = useState<number | null>(null);
   const [actionError, setActionError] = useState<string | undefined>();
 
   useEffect(() => {
@@ -166,13 +167,19 @@ export function WorkBoardPanel(props: {
   const startRename = (item: WorkBoardItem): void => {
     setRenamingId(item.id);
     setRenamingTitle(item.title);
+    setRenamingRevision(item.revision);
   };
 
   const saveRename = async (item: WorkBoardItem): Promise<void> => {
     const title = renamingTitle.trim();
     if (!title) return;
-    if (await runAction(() => board.update(item.id, { title }, { expectedRevision: item.revision }))) {
+    if (
+      await runAction(() =>
+        board.update(item.id, { title }, { expectedRevision: renamingRevision ?? item.revision }),
+      )
+    ) {
       setRenamingId(null);
+      setRenamingRevision(null);
     }
   };
 
@@ -286,7 +293,10 @@ export function WorkBoardPanel(props: {
                   onRenameStart={() => startRename(item)}
                   onRenameChange={setRenamingTitle}
                   onRenameSave={() => void saveRename(item)}
-                  onRenameCancel={() => setRenamingId(null)}
+                  onRenameCancel={() => {
+                    setRenamingId(null);
+                    setRenamingRevision(null);
+                  }}
                   onComplete={() =>
                     void runAction(() => board.update(item.id, { state: 'done' }, { expectedRevision: item.revision }))
                   }

From 4670406bd4627e73299e1f3bfa80a734f0ecbfe4 Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Fri, 21 Aug 2026 13:26:11 +0800
Subject: [PATCH 13/22] ci: retrigger Work Board checks

The pull request became ready after the last synchronize event; retrigger the required CI workflow for the verified head.

Generated-by: Codex

From a05df89150c8d5e563749f9cc4e512e10b68e77b Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Sat, 22 Aug 2026 08:38:28 +0800
Subject: [PATCH 14/22] fix(work-board): bound relinked scope cursors

Hash the normalized project identity filter before placing it in an opaque pagination cursor. This preserves the full alias set as the query authority without generating cursors that exceed their own validation limits.

Generated-by: Codex
---
 .../src/__tests__/work-board-store.test.ts    | 39 +++++++++++++++++++
 packages/storage/src/work-board-list-query.ts |  7 +++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/packages/storage/src/__tests__/work-board-store.test.ts b/packages/storage/src/__tests__/work-board-store.test.ts
index 0eb147e00f..377523e912 100644
--- a/packages/storage/src/__tests__/work-board-store.test.ts
+++ b/packages/storage/src/__tests__/work-board-store.test.ts
@@ -350,6 +350,45 @@ describe('Work Board store', () => {
     });
   });
 
+  test('paginates across an unbounded relinked project identity set', async () => {
+    await withTempRoot(async (root) => {
+      const store = createWorkBoardStore(root);
+      try {
+        const projectIds = Array.from(
+          { length: 15 },
+          (_, index) => `00000000-0000-4000-8000-${String(index).padStart(12, '0')}`,
+        );
+        const createdIds: string[] = [];
+        for (let index = 0; index < 101; index += 1) {
+          const item = await store.create(
+            itemInput({
+              title: `aliased-project-${index}`,
+              scope: { kind: 'project', projectId: projectIds[index % projectIds.length]! },
+            }),
+            1_000 + index,
+          );
+          createdIds.push(item.id);
+        }
+
+        const query = {
+          limit: 100,
+          scope: { kind: 'project' as const, projectId: projectIds[0]! },
+          projectIds,
+        };
+        const first = await store.list(query);
+        assert.equal(first.items.length, 100);
+        assert.ok(first.nextCursor);
+        assert.ok(first.nextCursor.length < 512);
+
+        const second = await store.list({ ...query, cursor: first.nextCursor });
+        assert.deepEqual(second.items.map((item) => item.id), [createdIds[0]]);
+        assert.equal(second.nextCursor, undefined);
+      } finally {
+        store.close();
+      }
+    });
+  });
+
   test('keeps mutation timestamps monotonic when now moves backwards', async () => {
     await withTempRoot(async (root) => {
       const store = createWorkBoardStore(root);
diff --git a/packages/storage/src/work-board-list-query.ts b/packages/storage/src/work-board-list-query.ts
index f2f55bd086..1983457980 100644
--- a/packages/storage/src/work-board-list-query.ts
+++ b/packages/storage/src/work-board-list-query.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { createHash } from 'node:crypto';
 import {
   isSafeWorkBoardId,
   type WorkBoardItem,
@@ -71,7 +72,11 @@ export function workBoardFilterFingerprint(value: WorkBoardListQuery): string {
       : value.scope.kind === 'project'
         ? `project:${[...(value.projectIds ?? [value.scope.projectId])].sort().join('|')}`
         : 'inbox';
-  return `${value.includeArchived ? 'archived-included' : 'active-only'}:${scope}`;
+  // Cursors bind to the complete normalized filter without copying an unbounded
+  // project alias set into the public cursor payload.
+  return createHash('sha256')
+    .update(`${value.includeArchived ? 'archived-included' : 'active-only'}:${scope}`)
+    .digest('base64url');
 }
 
 export function encodeWorkBoardCursor(item: WorkBoardItem, filterFingerprint: string): string {

From 3ba508a7b975301adb998ca0f4ee6e0078332788 Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Sat, 22 Aug 2026 17:45:06 +0800
Subject: [PATCH 15/22] style(work-board): format paginated store assertion

---
 packages/storage/src/__tests__/work-board-store.test.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/storage/src/__tests__/work-board-store.test.ts b/packages/storage/src/__tests__/work-board-store.test.ts
index 377523e912..8b58318bf1 100644
--- a/packages/storage/src/__tests__/work-board-store.test.ts
+++ b/packages/storage/src/__tests__/work-board-store.test.ts
@@ -381,7 +381,10 @@ describe('Work Board store', () => {
         assert.ok(first.nextCursor.length < 512);
 
         const second = await store.list({ ...query, cursor: first.nextCursor });
-        assert.deepEqual(second.items.map((item) => item.id), [createdIds[0]]);
+        assert.deepEqual(
+          second.items.map((item) => item.id),
+          [createdIds[0]],
+        );
         assert.equal(second.nextCursor, undefined);
       } finally {
         store.close();

From 3920be681fec9721935715e1a10e13676b42c79c Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Mon, 24 Aug 2026 10:44:24 +0800
Subject: [PATCH 16/22] fix(desktop): sync workbar and composer contracts

---
 .../__tests__/work-board-ipc-main.test.ts     | 19 +++++++++++++++++++
 apps/desktop/src/main/work-board-ipc-main.ts  | 19 +++++++++++++++++++
 .../controller/use-workbar-controller.ts      | 13 +++++++------
 .../workbar/model/workbar-tool-definitions.ts |  8 ++++++++
 .../tools/side-chat/quote-companion-panel.tsx | 12 +++++-------
 .../features/workbar/ui/workbar-host.tsx      | 11 ++++++-----
 .../features/workbar/ui/workbar-surface.tsx   | 11 ++++++-----
 .../src/renderer/styles/work-board.css        | 19 +++++++++++++++++++
 apps/desktop/src/renderer/use-work-board.ts   | 19 +++++++++++++++++++
 .../desktop/src/renderer/work-board-panel.tsx | 19 +++++++++++++++++++
 apps/desktop/src/renderer/workhub-surface.tsx |  1 -
 apps/desktop/src/shared/work-board-ipc.ts     | 19 +++++++++++++++++++
 docs/work-board-phase1.md                     | 19 +++++++++++++++++++
 packages/ui/src/components.tsx                |  1 +
 packages/ui/src/composer.tsx                  |  3 +++
 packages/ui/src/index.ts                      |  1 +
 16 files changed, 170 insertions(+), 24 deletions(-)

diff --git a/apps/desktop/src/main/__tests__/work-board-ipc-main.test.ts b/apps/desktop/src/main/__tests__/work-board-ipc-main.test.ts
index f263a50920..aaabba2f51 100644
--- a/apps/desktop/src/main/__tests__/work-board-ipc-main.test.ts
+++ b/apps/desktop/src/main/__tests__/work-board-ipc-main.test.ts
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import assert from 'node:assert/strict';
 import { mkdtemp, rm } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
diff --git a/apps/desktop/src/main/work-board-ipc-main.ts b/apps/desktop/src/main/work-board-ipc-main.ts
index 576bced82a..780c35e196 100644
--- a/apps/desktop/src/main/work-board-ipc-main.ts
+++ b/apps/desktop/src/main/work-board-ipc-main.ts
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import type { IpcMain } from 'electron';
 import type { WorkBoardItem, WorkBoardPage } from '@maka/core/work-board';
 import {
diff --git a/apps/desktop/src/renderer/features/workbar/controller/use-workbar-controller.ts b/apps/desktop/src/renderer/features/workbar/controller/use-workbar-controller.ts
index cfb88583e5..a445153c32 100644
--- a/apps/desktop/src/renderer/features/workbar/controller/use-workbar-controller.ts
+++ b/apps/desktop/src/renderer/features/workbar/controller/use-workbar-controller.ts
@@ -28,8 +28,9 @@ import {
 } from 'react';
 import type { QuoteRef } from '@maka/core/events';
 import type { SessionSummary } from '@maka/core/session';
-import type { ChatModelChoice, Composer } from '@maka/ui';
-import { useUiLocale } from '@maka/ui';
+import { Composer, useUiLocale } from '@maka/ui';
+import type { ChatModelChoice } from '@maka/ui';
+import type { ComposerProps } from '../../../../../../../packages/ui/dist/composer.d.ts';
 import { safeLocalStorageGet, safeLocalStorageSet } from '../../../browser-storage.js';
 import { getDesktopConversationCopy } from '../../../locales/conversation-copy.js';
 import { localizedShellErrorMessage } from '../../../locales/shell-copy.js';
@@ -89,10 +90,10 @@ export interface UseWorkbarControllerInput {
   authoritativeSessionIds: ReadonlySet<string> | undefined;
   shellObscured: boolean;
   modelChoices: readonly ChatModelChoice[];
-  mentionSkills?: ComponentProps<typeof Composer>['mentionSkills'];
-  mentionSkillsUnavailable?: ComponentProps<typeof Composer>['mentionSkillsUnavailable'];
-  mentionSkillsLoading?: ComponentProps<typeof Composer>['mentionSkillsLoading'];
-  searchMentionFiles?: ComponentProps<typeof Composer>['onSearchMentionFiles'];
+  mentionSkills?: ComposerProps['mentionSkills'];
+  mentionSkillsUnavailable?: ComposerProps['mentionSkillsUnavailable'];
+  mentionSkillsLoading?: ComposerProps['mentionSkillsLoading'];
+  searchMentionFiles?: ComposerProps['onSearchMentionFiles'];
   reportError(title: string, description: string, sessionId: string): void;
 }
 
diff --git a/apps/desktop/src/renderer/features/workbar/model/workbar-tool-definitions.ts b/apps/desktop/src/renderer/features/workbar/model/workbar-tool-definitions.ts
index bb4af2352e..09de048b1f 100644
--- a/apps/desktop/src/renderer/features/workbar/model/workbar-tool-definitions.ts
+++ b/apps/desktop/src/renderer/features/workbar/model/workbar-tool-definitions.ts
@@ -99,6 +99,14 @@ const WORKBAR_TOOL_DEFINITION_BY_KIND = {
     singleton: true,
     defaultPlacement: 'right',
   },
+  'work-board': {
+    kind: 'work-board',
+    labelKey: 'work-board',
+    icon: 'list-todo',
+    persisted: true,
+    singleton: true,
+    defaultPlacement: 'right',
+  },
   inspector: {
     kind: 'inspector',
     labelKey: 'inspector',
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx b/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
index d0e162356f..b49a5794bf 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
@@ -31,6 +31,7 @@ import {
   type ChatModelChoice,
   type ComposerHandle,
 } from '@maka/ui';
+import type { ComposerProps } from '../../../../../../../../packages/ui/dist/composer.d.ts';
 import type { SessionSummary } from '@maka/core/session';
 import { useQuoteCompanion } from './use-quote-companion';
 import { useComposerAttachments } from '../../../../use-composer-attachments';
@@ -66,10 +67,10 @@ export function QuoteCompanionPanel(props: {
   sourceSession: SessionSummary | undefined;
   /** Shared global choice list, only used to render the inherited model's label. */
   modelChoices: readonly ChatModelChoice[];
-  mentionSkills?: ComponentProps<typeof Composer>['mentionSkills'];
-  mentionSkillsUnavailable?: ComponentProps<typeof Composer>['mentionSkillsUnavailable'];
-  mentionSkillsLoading?: ComponentProps<typeof Composer>['mentionSkillsLoading'];
-  onSearchMentionFiles?: ComponentProps<typeof Composer>['onSearchMentionFiles'];
+  mentionSkills?: ComposerProps['mentionSkills'];
+  mentionSkillsUnavailable?: ComposerProps['mentionSkillsUnavailable'];
+  mentionSkillsLoading?: ComposerProps['mentionSkillsLoading'];
+  onSearchMentionFiles?: ComposerProps['onSearchMentionFiles'];
   onQuotesConsumed: (snapshot: CompanionQuoteSnapshot) => void;
   onRemoveQuote?: (target: CompanionQuoteTarget) => void;
   onForkVisibilityChange?: (event: CompanionForkVisibilityEvent) => void;
@@ -207,7 +208,6 @@ export function QuoteCompanionPanel(props: {
     >
       <ChatSurfaceLayout
         conversationKey={companion.companionSession?.id ?? props.sourceSession?.id}
-        scrollToBottomLabel={copy.scrollToBottom}
         composer={
           <>
             {companion.error && (
@@ -268,8 +268,6 @@ export function QuoteCompanionPanel(props: {
               pendingAttachments={pendingAttachments}
               onRemoveAttachment={removeAttachment}
               mentionSkills={props.mentionSkills}
-              mentionSkillsUnavailable={props.mentionSkillsUnavailable}
-              mentionSkillsLoading={props.mentionSkillsLoading}
               onSearchMentionFiles={props.onSearchMentionFiles}
               pendingQuotes={props.quotes.map((quote) => quote.value)}
               contextDrawerDefaultCollapsed
diff --git a/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx b/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
index 087aec39e6..d522dcb75b 100644
--- a/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
+++ b/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
@@ -21,7 +21,8 @@ import { lazy, Suspense, type ComponentProps, type CSSProperties } from 'react';
 import { Card } from '@astryxdesign/core/Card';
 import { ResizeHandle, type ResizableProps } from '@astryxdesign/core/Resizable';
 import { Spinner } from '@astryxdesign/core/Spinner';
-import { useUiLocale, type Composer } from '@maka/ui';
+import { Composer, useUiLocale } from '@maka/ui';
+import type { ComposerProps } from '../../../../../../../packages/ui/dist/composer.d.ts';
 import type { ChatModelChoice } from '@maka/core/chat-model-choice';
 import type { SessionSummary } from '@maka/core/session';
 import { getShellCopy } from '../../../locales/shell-copy';
@@ -116,10 +117,10 @@ export interface WorkbarHostModel {
   activeSideChatPanelIds?: ReadonlySet<string>;
   sourceSession?: SessionSummary;
   modelChoices?: readonly ChatModelChoice[];
-  mentionSkills?: ComponentProps<typeof Composer>['mentionSkills'];
-  mentionSkillsUnavailable?: ComponentProps<typeof Composer>['mentionSkillsUnavailable'];
-  mentionSkillsLoading?: ComponentProps<typeof Composer>['mentionSkillsLoading'];
-  onSearchMentionFiles?: ComponentProps<typeof Composer>['onSearchMentionFiles'];
+  mentionSkills?: ComposerProps['mentionSkills'];
+  mentionSkillsUnavailable?: ComposerProps['mentionSkillsUnavailable'];
+  mentionSkillsLoading?: ComposerProps['mentionSkillsLoading'];
+  onSearchMentionFiles?: ComposerProps['onSearchMentionFiles'];
   closeConfirmation: {
     key: string;
     open: boolean;
diff --git a/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx b/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx
index 0b95cbc440..2788295ec4 100644
--- a/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx
+++ b/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx
@@ -45,10 +45,11 @@ import {
   TaskLedgerPanel,
   deriveTaskLedgerPanelModel,
   IconButton,
+  Composer,
   useUiLocale,
   type ChatModelChoice,
-  type Composer,
 } from '@maka/ui';
+import type { ComposerProps } from '../../../../../../../packages/ui/dist/composer.d.ts';
 import {
   ICON_SIZE,
   Activity,
@@ -717,10 +718,10 @@ export function WorkbarSurface(props: {
   activeSideChatPanelIds?: ReadonlySet<string>;
   sourceSession?: SessionSummary;
   modelChoices?: readonly ChatModelChoice[];
-  mentionSkills?: ComponentProps<typeof Composer>['mentionSkills'];
-  mentionSkillsUnavailable?: ComponentProps<typeof Composer>['mentionSkillsUnavailable'];
-  mentionSkillsLoading?: ComponentProps<typeof Composer>['mentionSkillsLoading'];
-  onSearchMentionFiles?: ComponentProps<typeof Composer>['onSearchMentionFiles'];
+  mentionSkills?: ComposerProps['mentionSkills'];
+  mentionSkillsUnavailable?: ComposerProps['mentionSkillsUnavailable'];
+  mentionSkillsLoading?: ComposerProps['mentionSkillsLoading'];
+  onSearchMentionFiles?: ComposerProps['onSearchMentionFiles'];
 }) {
   const copy = getDesktopConversationCopy(useUiLocale()).workbar;
   const sessionTasks = useSessionTasks(props.sessionId);
diff --git a/apps/desktop/src/renderer/styles/work-board.css b/apps/desktop/src/renderer/styles/work-board.css
index 4f51cbf112..b4bd0deeb8 100644
--- a/apps/desktop/src/renderer/styles/work-board.css
+++ b/apps/desktop/src/renderer/styles/work-board.css
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 .maka-work-board-panel {
   display: flex;
   flex-direction: column;
diff --git a/apps/desktop/src/renderer/use-work-board.ts b/apps/desktop/src/renderer/use-work-board.ts
index b80cdc0283..3589f430c6 100644
--- a/apps/desktop/src/renderer/use-work-board.ts
+++ b/apps/desktop/src/renderer/use-work-board.ts
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import { useCallback, useEffect, useRef, useState } from 'react';
 import {
   WORK_BOARD_PAGE_SIZE_MAX,
diff --git a/apps/desktop/src/renderer/work-board-panel.tsx b/apps/desktop/src/renderer/work-board-panel.tsx
index 996a7f259b..870018ea2c 100644
--- a/apps/desktop/src/renderer/work-board-panel.tsx
+++ b/apps/desktop/src/renderer/work-board-panel.tsx
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import { useEffect, useMemo, useState } from 'react';
 import { Banner, EmptyState, Spinner } from '@astryxdesign/core';
 import { Button } from '@astryxdesign/core/Button';
diff --git a/apps/desktop/src/renderer/workhub-surface.tsx b/apps/desktop/src/renderer/workhub-surface.tsx
index de24b0a3f1..143241c780 100644
--- a/apps/desktop/src/renderer/workhub-surface.tsx
+++ b/apps/desktop/src/renderer/workhub-surface.tsx
@@ -232,7 +232,6 @@ export function WorkHubSurface(props: {
     <ChatSurfaceLayout
       className="workhub-surface"
       conversationKey="workhub"
-      scrollToBottomLabel={copy.scrollToBottom}
       composer={(
         <Composer
           draftKey="workhub"
diff --git a/apps/desktop/src/shared/work-board-ipc.ts b/apps/desktop/src/shared/work-board-ipc.ts
index 3b0589febf..20c9ea9f64 100644
--- a/apps/desktop/src/shared/work-board-ipc.ts
+++ b/apps/desktop/src/shared/work-board-ipc.ts
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import type { WorkBoardStoreErrorCode } from '@maka/storage/work-board-store';
 
 export type WorkBoardIpcResult<T> =
diff --git a/docs/work-board-phase1.md b/docs/work-board-phase1.md
index b80efc04bb..02bc4cd9fc 100644
--- a/docs/work-board-phase1.md
+++ b/docs/work-board-phase1.md
@@ -1,3 +1,22 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
 # Work Board Phase 1 — capture/list MVP
 
 ## Surface
diff --git a/packages/ui/src/components.tsx b/packages/ui/src/components.tsx
index 1d6d0fb683..65c25c64a1 100644
--- a/packages/ui/src/components.tsx
+++ b/packages/ui/src/components.tsx
@@ -57,6 +57,7 @@ export type {
 export { ScheduledTasksPage, DailyReviewPage, SkillsPage } from './module-pages.js';
 export { Composer } from './composer.js';
 export type {
+  ComposerProps,
   ComposerHandle,
   ComposerSendMetadata,
   ComposerSlashCommandOption,
diff --git a/packages/ui/src/composer.tsx b/packages/ui/src/composer.tsx
index 8ea830e990..49a09e979c 100644
--- a/packages/ui/src/composer.tsx
+++ b/packages/ui/src/composer.tsx
@@ -24,6 +24,7 @@ import {
   useMemo,
   useRef,
   useState,
+  type ComponentProps,
   type ClipboardEvent,
   type DragEvent,
   type FormEvent,
@@ -2060,3 +2061,5 @@ export const Composer = forwardRef<
     </>
   );
 });
+
+export type ComposerProps = ComponentProps<typeof Composer>;
diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts
index ed46774b29..247863794c 100644
--- a/packages/ui/src/index.ts
+++ b/packages/ui/src/index.ts
@@ -23,6 +23,7 @@ export * from './chat-empty-hero.js';
 export * from './chat-model-helpers.js';
 export * from './use-mounted-ref.js';
 export * from './components.js';
+export type { ComposerProps } from './components.js';
 export type { SandboxBoundaryPromptProps } from './sandbox-boundary-prompt.js';
 export type { SessionHistoryGroup } from './session-history-list.js';
 export * from './session-status-presentation.js';

From 2d73c9602c15a53f7bdd87c05702d3b8dee25cea Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Mon, 24 Aug 2026 16:01:59 +0800
Subject: [PATCH 17/22] fix(desktop): keep Work Board data behind Workbar host

---
 .../main/__tests__/workbar-boundary.test.ts   | 30 +++++++++++++++++++
 apps/desktop/src/renderer/app-shell.tsx       |  9 ++----
 .../controller/use-workbar-controller.ts      |  4 +++
 .../features/workbar/ui/workbar-host.tsx      |  1 +
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/apps/desktop/src/main/__tests__/workbar-boundary.test.ts b/apps/desktop/src/main/__tests__/workbar-boundary.test.ts
index 11b49820f1..071aad48da 100644
--- a/apps/desktop/src/main/__tests__/workbar-boundary.test.ts
+++ b/apps/desktop/src/main/__tests__/workbar-boundary.test.ts
@@ -113,4 +113,34 @@ describe('Workbar feature boundary', () => {
       true,
     );
   });
+
+  it('projects Work Board project identity through the controller-owned host model', () => {
+    const appShell = readFileSync(
+      join(desktopRoot, 'src', 'renderer', 'app-shell.tsx'),
+      'utf8',
+    );
+    const controller = readFileSync(
+      join(featureRoot, 'controller', 'use-workbar-controller.ts'),
+      'utf8',
+    );
+    const host = readFileSync(
+      join(featureRoot, 'ui', 'workbar-host.tsx'),
+      'utf8',
+    );
+
+    assert.equal(appShell.includes('projectId: currentProjectId'), true);
+    assert.equal(
+      appShell.includes('projectAliases: currentProject?.aliases ?? []'),
+      true,
+    );
+    assert.equal(controller.includes('projectId: input.projectId'), true);
+    assert.equal(
+      controller.includes('projectAliases: input.projectAliases'),
+      true,
+    );
+    assert.equal(
+      host.includes('projectAliases={props.projectAliases}'),
+      true,
+    );
+  });
 });
diff --git a/apps/desktop/src/renderer/app-shell.tsx b/apps/desktop/src/renderer/app-shell.tsx
index 6aeba4d209..e9198f8b27 100644
--- a/apps/desktop/src/renderer/app-shell.tsx
+++ b/apps/desktop/src/renderer/app-shell.tsx
@@ -1720,6 +1720,8 @@ function AppShellContent({
   const workbar = useWorkbarController({
     available: workbarAvailable,
     activeSession: activeSessionForView,
+    projectId: currentProjectId,
+    projectAliases: currentProject?.aliases ?? [],
     authoritativeSessionIds: authoritativeSessionIds ?? undefined,
     shellObscured,
     modelChoices: chatModelChoices,
@@ -3287,12 +3289,7 @@ function AppShellContent({
             </div>
             {/* Collapse hides the Workbar surface without unmounting its tools;
                 dynamic resources therefore keep their existing lifecycle. */}
-            <WorkbarHost
-              model={{
-                ...workbar.host,
-                projectAliases: currentProject?.aliases ?? [],
-              }}
-            />
+            <WorkbarHost model={workbar.host} />
           </div>
           </MakaUriContext.Provider>
         </AppShellDetailPanel>
diff --git a/apps/desktop/src/renderer/features/workbar/controller/use-workbar-controller.ts b/apps/desktop/src/renderer/features/workbar/controller/use-workbar-controller.ts
index a445153c32..4b829e148f 100644
--- a/apps/desktop/src/renderer/features/workbar/controller/use-workbar-controller.ts
+++ b/apps/desktop/src/renderer/features/workbar/controller/use-workbar-controller.ts
@@ -87,6 +87,8 @@ export interface UseWorkbarControllerInput {
   /** Whether the Session workspace (rather than a module page) owns the shell. */
   available: boolean;
   activeSession: SessionSummary | undefined;
+  projectId: string | null | undefined;
+  projectAliases: readonly string[];
   authoritativeSessionIds: ReadonlySet<string> | undefined;
   shellObscured: boolean;
   modelChoices: readonly ChatModelChoice[];
@@ -675,6 +677,8 @@ export function useWorkbarController(
     },
     host: {
       activeId: input.available ? activeSessionId : undefined,
+      projectId: input.projectId,
+      projectAliases: input.projectAliases,
       rightCollapsed: layout.workbarCollapsed,
       bottomOpen: layout.bottomPanelOpen,
       hidden: input.shellObscured,
diff --git a/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx b/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
index d522dcb75b..39b551a566 100644
--- a/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
+++ b/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
@@ -168,6 +168,7 @@ export function WorkbarHost({ model: props }: { model: WorkbarHostModel }) {
               key={props.activeId}
               sessionId={props.activeId}
               projectId={props.projectId}
+              projectAliases={props.projectAliases}
               hidden={props.hidden}
               onDismissPanel={props.onDismissPanel}
               panelsState={props.panelsState}

From 79b7a1ea06ac57ea8a25312acd4c5611954b414e Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Mon, 24 Aug 2026 16:16:26 +0800
Subject: [PATCH 18/22] chore(ci): refresh Astryx surface inventory

---
 docs/astryx-surface-file-inventory.md    | 4 ++--
 docs/astryx-surface-file-inventory.paths | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/astryx-surface-file-inventory.md b/docs/astryx-surface-file-inventory.md
index 45314e041a..60d75c2e87 100644
--- a/docs/astryx-surface-file-inventory.md
+++ b/docs/astryx-surface-file-inventory.md
@@ -5,7 +5,7 @@ Each row is one on-disk product surface file. Regenerated inventory must stay in
 
 Wiki bar: Design Conventions · API Use-the-System · Theming · Container Padding.
 
-**Totals:** 207 files — blocker 0, polish 1, aligned 206.
+**Totals:** 209 files — blocker 0, polish 1, aligned 208.
 
 ## Exclusions (explicit)
 
@@ -175,8 +175,8 @@ Wiki bar: Design Conventions · API Use-the-System · Theming · Container Paddi
 | `apps/desktop/src/renderer/styles/workbar/shell.css` | shell-chrome-or-panel | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `apps/desktop/src/renderer/styles/workbar/side-chat.css` | shell-chrome-or-panel | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `apps/desktop/src/renderer/styles/workbar/terminal.css` | shell-chrome-or-panel | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
-| `apps/desktop/src/renderer/work-board-panel.tsx` | shell-chrome-or-panel | Banner, Button, EmptyState, Spinner, TextInput | aligned — uses Astryx (Banner, Button, EmptyState, Spinner, TextInput) | aligned |
 | `apps/desktop/src/renderer/styles/workhub.css` | styles | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
+| `apps/desktop/src/renderer/work-board-panel.tsx` | shell-chrome-or-panel | Banner, Button, EmptyState, Spinner, TextInput | aligned — uses Astryx (Banner, Button, EmptyState, Spinner, TextInput) | aligned |
 | `apps/desktop/src/renderer/workhub-surface.tsx` | other | Button | aligned — uses Astryx (Button) | aligned |
 | `packages/ui/src/astryx-chat-reasoning.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `packages/ui/src/astryx-i18n.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
diff --git a/docs/astryx-surface-file-inventory.paths b/docs/astryx-surface-file-inventory.paths
index 4ed78b2a0c..6d66b1020f 100644
--- a/docs/astryx-surface-file-inventory.paths
+++ b/docs/astryx-surface-file-inventory.paths
@@ -147,8 +147,8 @@ apps/desktop/src/renderer/styles/workbar/review.css
 apps/desktop/src/renderer/styles/workbar/shell.css
 apps/desktop/src/renderer/styles/workbar/side-chat.css
 apps/desktop/src/renderer/styles/workbar/terminal.css
-apps/desktop/src/renderer/work-board-panel.tsx
 apps/desktop/src/renderer/styles/workhub.css
+apps/desktop/src/renderer/work-board-panel.tsx
 apps/desktop/src/renderer/workhub-surface.tsx
 packages/ui/src/astryx-chat-reasoning.tsx
 packages/ui/src/astryx-i18n.tsx

From 1c8d833f8fb5b1a3b9ac5bf04540593d92c417c8 Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Mon, 24 Aug 2026 17:10:34 +0800
Subject: [PATCH 19/22] fix(desktop): tighten Work Board row and host contracts

---
 .../main/__tests__/workbar-controller.test.ts |  16 +++
 .../desktop/src/renderer/work-board-panel.tsx | 130 +++++++++---------
 2 files changed, 80 insertions(+), 66 deletions(-)

diff --git a/apps/desktop/src/main/__tests__/workbar-controller.test.ts b/apps/desktop/src/main/__tests__/workbar-controller.test.ts
index 292800d55b..286aaa25c7 100644
--- a/apps/desktop/src/main/__tests__/workbar-controller.test.ts
+++ b/apps/desktop/src/main/__tests__/workbar-controller.test.ts
@@ -126,6 +126,8 @@ function input(
   return {
     available: true,
     activeSession,
+    projectId: activeSession?.projectId,
+    projectAliases: [],
     authoritativeSessionIds: new Set(activeSession ? [activeSession.id] : []),
     shellObscured: false,
     modelChoices: [],
@@ -141,6 +143,20 @@ describe('useWorkbarController', () => {
     delete (globalThis as { window?: unknown }).window;
   });
 
+  it('projects the canonical project and absorbed aliases into the host model', async () => {
+    const { root } = installReactRenderer();
+    const controllerInput = input(session('a'));
+    controllerInput.projectId = 'project-canonical';
+    controllerInput.projectAliases = ['project-absorbed'];
+
+    await act(async () =>
+      renderController(root, createFakeWorkbarServices(), controllerInput),
+    );
+
+    assert.equal(controller().host.projectId, 'project-canonical');
+    assert.deepEqual(controller().host.projectAliases, ['project-absorbed']);
+  });
+
   it('keeps the initial Session active after StrictMode replays mount effects', async () => {
     const { root } = installReactRenderer();
     const starts: string[] = [];
diff --git a/apps/desktop/src/renderer/work-board-panel.tsx b/apps/desktop/src/renderer/work-board-panel.tsx
index 870018ea2c..cb4d9e3e10 100644
--- a/apps/desktop/src/renderer/work-board-panel.tsx
+++ b/apps/desktop/src/renderer/work-board-panel.tsx
@@ -40,9 +40,8 @@ function scopeForFilter(filter: 'inbox' | 'project', projectId: string | null):
     : { kind: 'inbox' };
 }
 
-function WorkBoardRow(props: {
-  item: WorkBoardItem;
-  copy: WorkBoardPanelCopy;
+interface ActiveWorkBoardRowActions {
+  kind: 'active';
   projectId: string | null;
   renaming: boolean;
   renameValue: string;
@@ -54,32 +53,42 @@ function WorkBoardRow(props: {
   onReopen(): void;
   onMove(): void;
   onArchive(): void;
+}
+
+interface ArchivedWorkBoardRowActions {
+  kind: 'archived';
   onUnarchive(): void;
   onRemove(): void;
+}
+
+function WorkBoardRow(props: {
+  item: WorkBoardItem;
+  copy: WorkBoardPanelCopy;
+  actions: ActiveWorkBoardRowActions | ArchivedWorkBoardRowActions;
 }) {
-  const { item, copy } = props;
+  const { item, copy, actions } = props;
   return (
     <li className="maka-work-board-row" data-archived={item.archived || undefined}>
       <div className="maka-work-board-row-main">
-        {props.renaming ? (
+        {actions.kind === 'active' && actions.renaming ? (
           <TextInput
             className="maka-work-board-rename-input"
             size="sm"
             label={copy.rename}
             isLabelHidden
             hasAutoFocus
-            value={props.renameValue}
-            onChange={props.onRenameChange}
+            value={actions.renameValue}
+            onChange={actions.onRenameChange}
             onKeyDown={(event) => {
               event.stopPropagation();
               if (event.nativeEvent.isComposing || event.key === 'Process') return;
               if (event.key === 'Enter') {
                 event.preventDefault();
-                props.onRenameSave();
+                actions.onRenameSave();
               }
               if (event.key === 'Escape') {
                 event.preventDefault();
-                props.onRenameCancel();
+                actions.onRenameCancel();
               }
             }}
           />
@@ -89,36 +98,36 @@ function WorkBoardRow(props: {
         {item.archived && <span className="maka-work-board-archived-tag">{copy.archived}</span>}
       </div>
       <div className="maka-work-board-row-actions">
-        {item.archived ? (
+        {actions.kind === 'archived' ? (
           <>
-            <Button size="sm" variant="ghost" label={copy.unarchive} onClick={props.onUnarchive} />
-            <Button size="sm" variant="ghost" label={copy.delete} onClick={props.onRemove} />
+            <Button size="sm" variant="ghost" label={copy.unarchive} onClick={actions.onUnarchive} />
+            <Button size="sm" variant="ghost" label={copy.delete} onClick={actions.onRemove} />
           </>
         ) : (
           <>
             {item.state === 'done' ? (
-              <Button size="sm" variant="ghost" label={copy.reopen} onClick={props.onReopen} />
+              <Button size="sm" variant="ghost" label={copy.reopen} onClick={actions.onReopen} />
             ) : (
-              <Button size="sm" variant="ghost" label={copy.complete} onClick={props.onComplete} />
+              <Button size="sm" variant="ghost" label={copy.complete} onClick={actions.onComplete} />
             )}
-            {props.renaming ? (
+            {actions.renaming ? (
               <Button
                 size="sm"
                 variant="primary"
                 label={copy.renameSave}
-                onClick={props.onRenameSave}
+                onClick={actions.onRenameSave}
               />
             ) : (
-              <Button size="sm" variant="ghost" label={copy.rename} onClick={props.onRenameStart} />
+              <Button size="sm" variant="ghost" label={copy.rename} onClick={actions.onRenameStart} />
             )}
             <Button
               size="sm"
               variant="ghost"
               label={item.scope.kind === 'project' ? copy.moveToInbox : copy.moveToProject}
-              onClick={props.onMove}
-              isDisabled={props.projectId === null}
+              onClick={actions.onMove}
+              isDisabled={actions.projectId === null}
             />
-            <Button size="sm" variant="ghost" label={copy.archive} onClick={props.onArchive} />
+            <Button size="sm" variant="ghost" label={copy.archive} onClick={actions.onArchive} />
           </>
         )}
       </div>
@@ -306,36 +315,33 @@ export function WorkBoardPanel(props: {
                   key={item.id}
                   item={item}
                   copy={copy}
-                  projectId={props.projectId}
-                  renaming={renamingId === item.id}
-                  renameValue={renamingTitle}
-                  onRenameStart={() => startRename(item)}
-                  onRenameChange={setRenamingTitle}
-                  onRenameSave={() => void saveRename(item)}
-                  onRenameCancel={() => {
-                    setRenamingId(null);
-                    setRenamingRevision(null);
+                  actions={{
+                    kind: 'active',
+                    projectId: props.projectId,
+                    renaming: renamingId === item.id,
+                    renameValue: renamingTitle,
+                    onRenameStart: () => startRename(item),
+                    onRenameChange: setRenamingTitle,
+                    onRenameSave: () => void saveRename(item),
+                    onRenameCancel: () => {
+                      setRenamingId(null);
+                      setRenamingRevision(null);
+                    },
+                    onComplete: () =>
+                      void runAction(() =>
+                        board.update(item.id, { state: 'done' }, { expectedRevision: item.revision }),
+                      ),
+                    onReopen: () =>
+                      void runAction(() =>
+                        board.update(item.id, { state: 'todo' }, { expectedRevision: item.revision }),
+                      ),
+                    onMove: () =>
+                      void runAction(() =>
+                        board.update(item.id, { scope: moveScope(item) }, { expectedRevision: item.revision }),
+                      ),
+                    onArchive: () =>
+                      void runAction(() => board.archive(item.id, { expectedRevision: item.revision })),
                   }}
-                  onComplete={() =>
-                    void runAction(() => board.update(item.id, { state: 'done' }, { expectedRevision: item.revision }))
-                  }
-                  onReopen={() =>
-                    void runAction(() => board.update(item.id, { state: 'todo' }, { expectedRevision: item.revision }))
-                  }
-                  onMove={() =>
-                    void runAction(() =>
-                      board.update(item.id, { scope: moveScope(item) }, { expectedRevision: item.revision }),
-                    )
-                  }
-                  onArchive={() =>
-                    void runAction(() => board.archive(item.id, { expectedRevision: item.revision }))
-                  }
-                  onUnarchive={() =>
-                    void runAction(() => board.unarchive(item.id, { expectedRevision: item.revision }))
-                  }
-                  onRemove={() =>
-                    void runAction(() => board.remove(item.id, { expectedRevision: item.revision }))
-                  }
                 />
               ))}
               {archivedItems.map((item) => (
@@ -343,23 +349,15 @@ export function WorkBoardPanel(props: {
                   key={item.id}
                   item={item}
                   copy={copy}
-                  projectId={props.projectId}
-                  renaming={false}
-                  renameValue=""
-                  onRenameStart={() => undefined}
-                  onRenameChange={() => undefined}
-                  onRenameSave={() => undefined}
-                  onRenameCancel={() => undefined}
-                  onComplete={() => undefined}
-                  onReopen={() => undefined}
-                  onMove={() => undefined}
-                  onArchive={() => undefined}
-                  onUnarchive={() =>
-                    void runAction(() => board.unarchive(item.id, { expectedRevision: item.revision }))
-                  }
-                  onRemove={() =>
-                    void runAction(() => board.remove(item.id, { expectedRevision: item.revision }))
-                  }
+                  actions={{
+                    kind: 'archived',
+                    onUnarchive: () =>
+                      void runAction(() =>
+                        board.unarchive(item.id, { expectedRevision: item.revision }),
+                      ),
+                    onRemove: () =>
+                      void runAction(() => board.remove(item.id, { expectedRevision: item.revision })),
+                  }}
                 />
               ))}
                 </ul>

From 5d4481ba648963a9488b78fbc134acbdd9bc0ed7 Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Mon, 24 Aug 2026 18:05:34 +0800
Subject: [PATCH 20/22] test(desktop): cover Work Board paginated refresh

---
 .../src/main/__tests__/use-work-board.test.ts | 132 ++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 apps/desktop/src/main/__tests__/use-work-board.test.ts

diff --git a/apps/desktop/src/main/__tests__/use-work-board.test.ts b/apps/desktop/src/main/__tests__/use-work-board.test.ts
new file mode 100644
index 0000000000..f01c0fde21
--- /dev/null
+++ b/apps/desktop/src/main/__tests__/use-work-board.test.ts
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { strict as assert } from 'node:assert';
+import { afterEach, describe, it } from 'node:test';
+import { act, createElement } from 'react';
+import type { WorkBoardItem } from '@maka/core/work-board';
+import type {
+  WorkBoardChangedEvent,
+  WorkBoardIpcResult,
+} from '../../shared/work-board-ipc.js';
+import { cleanupFakeDom, installReactRenderer } from './fake-dom.js';
+import { useWorkBoard } from '../../renderer/use-work-board.js';
+
+interface Harness {
+  listCalls: Array<{ cursor?: string; limit?: number }>;
+  emitChanged(): void;
+}
+
+function item(id: number): WorkBoardItem {
+  return {
+    schemaVersion: 1,
+    id: `item-${id}`,
+    revision: 1,
+    scope: { kind: 'inbox' },
+    title: `Item ${id}`,
+    state: 'todo',
+    creator: { kind: 'user' },
+    provenance: { kind: 'manual' },
+    createdAt: id,
+    updatedAt: id,
+    archived: false,
+  };
+}
+
+function installHarness(): Harness {
+  const allItems = Array.from({ length: 60 }, (_, index) => item(index));
+  const listCalls: Harness['listCalls'] = [];
+  let changed: ((event: WorkBoardChangedEvent) => void) | undefined;
+  const list = async (query?: { cursor?: string; limit?: number }): Promise<WorkBoardIpcResult<{
+    items: WorkBoardItem[];
+    nextCursor?: string;
+  }>> => {
+    listCalls.push({ cursor: query?.cursor, limit: query?.limit });
+    const start = query?.cursor ? Number(query.cursor) : 0;
+    const limit = query?.limit ?? 50;
+    const end = Math.min(start + limit, allItems.length);
+    return {
+      ok: true,
+      value: {
+        items: allItems.slice(start, end),
+        nextCursor: end < allItems.length ? String(end) : undefined,
+      },
+    };
+  };
+  const unexpectedMutation = async (): Promise<never> => {
+    throw new Error('mutation is not expected in this test');
+  };
+  (globalThis.window as unknown as { maka: unknown }).maka = {
+    workBoard: {
+      list,
+      create: unexpectedMutation,
+      update: unexpectedMutation,
+      archive: unexpectedMutation,
+      unarchive: unexpectedMutation,
+      remove: unexpectedMutation,
+      subscribeChanges(listener: (event: WorkBoardChangedEvent) => void) {
+        changed = listener;
+        return () => {
+          changed = undefined;
+        };
+      },
+    },
+  };
+  return {
+    listCalls,
+    emitChanged() {
+      changed?.({ type: 'work_board_changed', ts: 1 });
+    },
+  };
+}
+
+function Probe(props: { onValue(value: ReturnType<typeof useWorkBoard>): void }) {
+  props.onValue(useWorkBoard());
+  return null;
+}
+
+describe('useWorkBoard', () => {
+  afterEach(() => {
+    cleanupFakeDom();
+  });
+
+  it('preserves the loaded window when a mutation change signal refreshes the board', async () => {
+    const { root } = installReactRenderer();
+    const harness = installHarness();
+    let board: ReturnType<typeof useWorkBoard> | undefined;
+
+    await act(async () => {
+      root.render(createElement(Probe, { onValue: (value) => (board = value) }));
+    });
+    await act(async () => board?.loadMore());
+
+    assert.equal(board?.items.length, 60);
+    assert.equal(board?.nextCursor, undefined);
+    assert.deepEqual(harness.listCalls, [
+      { cursor: undefined, limit: undefined },
+      { cursor: '50', limit: undefined },
+    ]);
+
+    await act(async () => harness.emitChanged());
+
+    assert.equal(board?.items.length, 60);
+    assert.equal(board?.nextCursor, undefined);
+    assert.deepEqual(harness.listCalls.at(-1), { cursor: undefined, limit: 60 });
+  });
+});

From ddeb7410aa87c7c5d55aeabd5306b4b7a44c8e44 Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Mon, 24 Aug 2026 20:04:39 +0800
Subject: [PATCH 21/22] fix(desktop): close Work Board and Quote Companion
 review gaps

---
 .../main/__tests__/work-board-panel.test.ts   | 163 ++++++++++++++++++
 .../main/__tests__/workbar-boundary.test.ts   |  28 +++
 .../tools/side-chat/quote-companion-panel.tsx |   3 +
 .../desktop/src/renderer/work-board-panel.tsx |  20 ++-
 4 files changed, 209 insertions(+), 5 deletions(-)
 create mode 100644 apps/desktop/src/main/__tests__/work-board-panel.test.ts

diff --git a/apps/desktop/src/main/__tests__/work-board-panel.test.ts b/apps/desktop/src/main/__tests__/work-board-panel.test.ts
new file mode 100644
index 0000000000..0a2bcf4eef
--- /dev/null
+++ b/apps/desktop/src/main/__tests__/work-board-panel.test.ts
@@ -0,0 +1,163 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { strict as assert } from 'node:assert';
+import { afterEach, test } from 'node:test';
+import { parseHTML } from 'linkedom';
+import { act, createElement } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import type { WorkBoardItem } from '@maka/core/work-board';
+import { LocaleProvider } from '@maka/ui';
+import type { WorkBoardIpcResult } from '../../shared/work-board-ipc.js';
+import { WorkBoardPanel } from '../../renderer/work-board-panel.js';
+
+const originalGlobals = {
+  document: globalThis.document,
+  window: globalThis.window,
+  matchMedia: globalThis.matchMedia,
+  HTMLElement: globalThis.HTMLElement,
+  HTMLIFrameElement: globalThis.HTMLIFrameElement,
+  requestAnimationFrame: globalThis.requestAnimationFrame,
+  cancelAnimationFrame: globalThis.cancelAnimationFrame,
+  IS_REACT_ACT_ENVIRONMENT: (globalThis as typeof globalThis & {
+    IS_REACT_ACT_ENVIRONMENT?: boolean;
+  }).IS_REACT_ACT_ENVIRONMENT,
+};
+const mountedRoots: Root[] = [];
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((next) => {
+    resolve = next;
+  });
+  return { promise, resolve };
+}
+
+function item(): WorkBoardItem {
+  return {
+    schemaVersion: 1,
+    id: 'created-item',
+    revision: 1,
+    scope: { kind: 'inbox' },
+    title: 'Later',
+    state: 'todo',
+    creator: { kind: 'user' },
+    provenance: { kind: 'manual' },
+    createdAt: 1,
+    updatedAt: 1,
+    archived: false,
+  };
+}
+
+async function renderPanel(create: (input: unknown) => Promise<WorkBoardIpcResult<WorkBoardItem>>) {
+  const { document, window } = parseHTML('<div id="root"></div>');
+  const matchMedia = () => ({
+    matches: false,
+    media: '',
+    onchange: null,
+    addListener() {},
+    removeListener() {},
+    addEventListener() {},
+    removeEventListener() {},
+    dispatchEvent: () => false,
+  });
+  Object.assign(window, { matchMedia });
+  Object.assign(globalThis, {
+    document,
+    window,
+    matchMedia,
+    HTMLElement: window.HTMLElement,
+    HTMLIFrameElement: window.HTMLIFrameElement ?? class HTMLIFrameElement {},
+    requestAnimationFrame: () => 1,
+    cancelAnimationFrame: () => undefined,
+    IS_REACT_ACT_ENVIRONMENT: true,
+  });
+  (globalThis.window as unknown as { maka: unknown }).maka = {
+    workBoard: {
+      list: async () => ({ ok: true, value: { items: [], nextCursor: undefined } }),
+      create,
+      update: async () => ({ ok: true, value: item() }),
+      archive: async () => ({ ok: true, value: item() }),
+      unarchive: async () => ({ ok: true, value: item() }),
+      remove: async () => ({ ok: true, value: undefined }),
+      subscribeChanges: () => () => undefined,
+    },
+  };
+  const container = document.querySelector('#root');
+  assert.ok(container);
+  const root = createRoot(container);
+  mountedRoots.push(root);
+  await act(async () => {
+    root.render(
+      createElement(
+        LocaleProvider,
+        { locale: 'en', children: createElement(WorkBoardPanel, { projectId: null }) },
+      ),
+    );
+    await Promise.resolve();
+  });
+  return { container, window };
+}
+
+afterEach(async () => {
+  for (const root of mountedRoots.splice(0)) await act(() => root.unmount());
+  Object.assign(globalThis, originalGlobals);
+});
+
+test('prevents a second Work Board create while the first request is pending', async () => {
+  const createResult = deferred<WorkBoardIpcResult<WorkBoardItem>>();
+  let createCalls = 0;
+  const harness = await renderPanel(async () => {
+    createCalls += 1;
+    return createResult.promise;
+  });
+  const input = harness.container.querySelector('input');
+  assert.ok(input);
+  input.value = 'Later';
+  const propsKey = Object.keys(input).find((key) => key.startsWith('__reactProps$'));
+  assert.ok(propsKey, 'missing React props on input');
+  const props = (input as unknown as Record<string, unknown>)[propsKey] as {
+    onChange?: (event: { target: HTMLInputElement; defaultPrevented: boolean }) => void;
+  };
+  assert.ok(props.onChange, 'missing React change handler');
+  await act(async () => {
+    props.onChange?.({ target: input, defaultPrevented: false });
+    await Promise.resolve();
+  });
+
+  const add = Array.from(harness.container.querySelectorAll('button')).find(
+    (button) => button.textContent === 'Add',
+  );
+  assert.ok(add);
+  await act(async () => {
+    add.click();
+    add.click();
+  });
+
+  assert.equal(createCalls, 1);
+  assert.equal(add.getAttribute('disabled'), '');
+
+  await act(async () => {
+    createResult.resolve({ ok: true, value: item() });
+    await createResult.promise;
+    await new Promise<void>((resolve) => setImmediate(resolve));
+  });
+  assert.equal(createCalls, 1);
+  assert.equal(input.getAttribute('disabled'), null);
+});
diff --git a/apps/desktop/src/main/__tests__/workbar-boundary.test.ts b/apps/desktop/src/main/__tests__/workbar-boundary.test.ts
index 071aad48da..352a9e7dde 100644
--- a/apps/desktop/src/main/__tests__/workbar-boundary.test.ts
+++ b/apps/desktop/src/main/__tests__/workbar-boundary.test.ts
@@ -143,4 +143,32 @@ describe('Workbar feature boundary', () => {
       true,
     );
   });
+
+  it('keeps Quote Companion catalog state and localized scroll copy at the seam', () => {
+    const quotePanel = readFileSync(
+      join(
+        featureRoot,
+        'tools',
+        'side-chat',
+        'quote-companion-panel.tsx',
+      ),
+      'utf8',
+    );
+    assert.equal(
+      quotePanel.includes(
+        'scrollToBottomLabel={copy.scrollToBottom}',
+      ),
+      true,
+    );
+    assert.equal(
+      quotePanel.includes(
+        'mentionSkillsUnavailable={props.mentionSkillsUnavailable}',
+      ),
+      true,
+    );
+    assert.equal(
+      quotePanel.includes('mentionSkillsLoading={props.mentionSkillsLoading}'),
+      true,
+    );
+  });
 });
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx b/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
index b49a5794bf..05e6e3bc07 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
@@ -208,6 +208,7 @@ export function QuoteCompanionPanel(props: {
     >
       <ChatSurfaceLayout
         conversationKey={companion.companionSession?.id ?? props.sourceSession?.id}
+        scrollToBottomLabel={copy.scrollToBottom}
         composer={
           <>
             {companion.error && (
@@ -270,6 +271,8 @@ export function QuoteCompanionPanel(props: {
               mentionSkills={props.mentionSkills}
               onSearchMentionFiles={props.onSearchMentionFiles}
               pendingQuotes={props.quotes.map((quote) => quote.value)}
+              mentionSkillsUnavailable={props.mentionSkillsUnavailable}
+              mentionSkillsLoading={props.mentionSkillsLoading}
               contextDrawerDefaultCollapsed
               showStaticModelUnavailableStatus={false}
               onRemoveQuote={(index) => {
diff --git a/apps/desktop/src/renderer/work-board-panel.tsx b/apps/desktop/src/renderer/work-board-panel.tsx
index cb4d9e3e10..cec058ea1c 100644
--- a/apps/desktop/src/renderer/work-board-panel.tsx
+++ b/apps/desktop/src/renderer/work-board-panel.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { Banner, EmptyState, Spinner } from '@astryxdesign/core';
 import { Button } from '@astryxdesign/core/Button';
 import { TextInput } from '@astryxdesign/core/TextInput';
@@ -159,6 +159,8 @@ export function WorkBoardPanel(props: {
   const [renamingTitle, setRenamingTitle] = useState('');
   const [renamingRevision, setRenamingRevision] = useState<number | null>(null);
   const [actionError, setActionError] = useState<string | undefined>();
+  const createPendingRef = useRef(false);
+  const [createPending, setCreatePending] = useState(false);
 
   useEffect(() => {
     if (props.projectId === null) setFilter('inbox');
@@ -180,15 +182,22 @@ export function WorkBoardPanel(props: {
 
   const create = async (): Promise<void> => {
     const title = newTitle.trim();
-    if (!title) return;
+    if (!title || createPendingRef.current) return;
+    createPendingRef.current = true;
+    setCreatePending(true);
     const input: CreateWorkBoardItemInput = {
       scope: query.scope ?? { kind: 'inbox' },
       title,
       creator: { kind: 'user' },
       provenance: { kind: 'manual' },
     };
-    if (await runAction(() => board.create(input))) {
-      setNewTitle('');
+    try {
+      if (await runAction(() => board.create(input))) {
+        setNewTitle('');
+      }
+    } finally {
+      createPendingRef.current = false;
+      setCreatePending(false);
     }
   };
 
@@ -250,6 +259,7 @@ export function WorkBoardPanel(props: {
           isLabelHidden
           value={newTitle}
           onChange={setNewTitle}
+          isDisabled={createPending}
           onKeyDown={(event) => {
             event.stopPropagation();
             if (event.nativeEvent.isComposing || event.key === 'Process') return;
@@ -264,7 +274,7 @@ export function WorkBoardPanel(props: {
           size="sm"
           label={copy.create}
           onClick={() => void create()}
-          isDisabled={newTitle.trim().length === 0}
+          isDisabled={createPending || newTitle.trim().length === 0}
         />
       </div>
       {board.error && board.items.length === 0 ? (

From 8ebf4cf88ca3190bf8ae1a90c45c698f1dea9db4 Mon Sep 17 00:00:00 2001
From: QuinnWan <144975606+somewan820@users.noreply.github.com>
Date: Mon, 24 Aug 2026 20:45:17 +0800
Subject: [PATCH 22/22] fix(storage): recognize Work Board entrypoint consumer

---
 packages/storage/src/__tests__/public-entrypoints.test.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/storage/src/__tests__/public-entrypoints.test.ts b/packages/storage/src/__tests__/public-entrypoints.test.ts
index 52409b4a49..f9457b8a6c 100644
--- a/packages/storage/src/__tests__/public-entrypoints.test.ts
+++ b/packages/storage/src/__tests__/public-entrypoints.test.ts
@@ -151,7 +151,6 @@ const PREEXISTING_UNCONSUMED_ENTRYPOINTS = [
   './encrypted-file-managed-secret-store',
   './managed-secret-store',
   './model-call-ledger',
-  './work-board-store',
   './write-queue',
 ];