fix(web): prevent useWorkspaceId crash in AppSidebar (re-apply after merge revert)

AppSidebar renders before workspace hydrates. useWorkspaceId() throws
when workspace is null. Fix: read workspace?.id directly from store,
use enabled guard on inbox query. This fix was in commit 030627c but
got reverted by subsequent merge with main.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

.env.example

@@ -29,6 +29,7 @@ RESEND_FROM_EMAIL=noreply@multica.ai
 GOOGLE_CLIENT_ID=
 GOOGLE_CLIENT_SECRET=
 GOOGLE_REDIRECT_URI=http://localhost:3000/auth/callback
+NEXT_PUBLIC_GOOGLE_CLIENT_ID=
 
 # S3 / CloudFront
 S3_BUCKET=

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,34 @@
+## What
+
+<!-- What does this PR do? Keep it to 1-3 sentences. -->
+
+## Why
+
+<!-- Why is this change needed? Link the related issue. -->
+
+Closes #<!-- issue number -->
+
+## Type of Change
+
+- [ ] Bug fix
+- [ ] New feature
+- [ ] Refactor / code improvement
+- [ ] Documentation
+- [ ] CI / infrastructure
+- [ ] Other (describe below)
+
+## How to Test
+
+<!-- How can a reviewer verify this works? Steps, commands, or screenshots. -->
+
+## Checklist
+
+- [ ] `make check` passes (typecheck, unit tests, Go tests, E2E)
+- [ ] Changes follow existing code patterns and conventions
+- [ ] No unrelated changes included
+
+## AI Disclosure (optional)
+
+<!-- If AI tools were used: -->
+<!-- - Which tool? (e.g., Claude Code, Copilot, Cursor) -->
+<!-- - What prompt did you use? Sharing your prompt helps others learn and lets reviewers understand intent. -->

CLAUDE.md

@@ -24,65 +24,94 @@ The frontend uses a **feature-based architecture** with four layers:
 ```
 apps/web/
 ├── app/          # Routing layer (thin shells — import from features/)
-├── features/     # Business logic, organized by domain
+├── core/         # Headless business logic (TanStack Query, zero JSX, zero react-dom)
+├── features/     # UI business components, organized by domain
 ├── shared/       # Cross-feature utilities (api client, types, logger)
 ```
 
 **`app/`** — Next.js App Router pages. Route files should be thin: import and re-export from `features/`. Layout components and route-specific glue (redirects, auth guards) live here. Shared layout components (e.g. `app-sidebar`) stay in `app/(dashboard)/_components/`.
 
-**`features/`** — Domain modules, each with its own components, hooks, stores, and config:
+**`core/`** — Headless business logic. Query key factories, `queryOptions`, mutation hooks, WS cache updaters. **No JSX, no react-dom.** Designed for future extraction to `packages/core/` in a monorepo.
+
+| Module | Purpose | Key exports |
+|---|---|---|
+| `core/issues/` | Issue queries, mutations, WS updaters | `issueListOptions`, `useUpdateIssue`, `onIssueUpdated` |
+| `core/inbox/` | Inbox queries, mutations, WS updaters | `inboxListOptions`, `useMarkInboxRead` |
+| `core/workspace/` | Member/agent/skill queries, workspace mutations | `memberListOptions`, `agentListOptions` |
+| `core/runtimes/` | Runtime queries | `runtimeListOptions` |
+| `core/query-client.ts` | QueryClient factory | `createQueryClient` |
+| `core/provider.tsx` | QueryClientProvider wrapper | `QueryProvider` |
+| `core/hooks.ts` | Shared hooks | `useWorkspaceId` |
+
+**`features/`** — Domain modules with UI components, client-only stores, and config:
 
 | Feature | Purpose | Exports |
 |---|---|---|
 | `features/auth/` | Authentication state | `useAuthStore`, `AuthInitializer` |
-| `features/workspace/` | Workspace, members, agents | `useWorkspaceStore`, `useActorName` |
-| `features/issues/` | Issue state, components, config | `useIssueStore`, icons, pickers, status/priority config |
-| `features/inbox/` | Inbox notification state | `useInboxStore` |
+| `features/workspace/` | Workspace identity + UI | `useWorkspaceStore` (client-only: workspace/workspaces), `useActorName` |
+| `features/issues/` | Issue UI components + client state | `useIssueStore` (client-only: activeIssueId), icons, pickers, config |
 | `features/realtime/` | WebSocket connection + sync | `WSProvider`, `useWSEvent`, `useRealtimeSync` |
 | `features/modals/` | Modal registry and state | Modal store and components |
 | `features/skills/` | Skill management | Skill components |
 
-**`shared/`** — Code used across multiple features:
+**`shared/`** — Code used across multiple features (will migrate to `core/` in Phase 5):
 - `shared/api/` — `ApiClient` (REST) and `WSClient` (WebSocket) for backend communication, plus the `api` singleton.
 - `shared/types/` — Domain types (Issue, Agent, Workspace, etc.) and WebSocket event types.
 - `shared/logger.ts` — Logger utility.
 
 ### State Management
 
-- **Zustand** for global client state — one store per feature domain (`features/auth/store.ts`, `features/workspace/store.ts`, `features/issues/store.ts`, `features/inbox/store.ts`).
+- **TanStack Query** for all server state — issues, inbox, members, agents, skills, runtimes. Query definitions live in `core/<domain>/queries.ts`, mutations in `core/<domain>/mutations.ts`.
+- **Zustand** for client-only state — UI selections (`activeIssueId`), view filters, modal state, workspace identity, navigation. No API calls in Zustand stores.
 - **React Context** only for connection lifecycle (`WSProvider` in `features/realtime/`).
 - **Local `useState`** for component-scoped UI state (forms, modals, filters).
-- Do not use React Context for data that can be a zustand store.
 
-**Store conventions:**
-- One store per feature domain. Import via `useAuthStore(selector)` or `useWorkspaceStore(selector)`.
+**TanStack Query conventions:**
+- `staleTime: Infinity` — WS events handle cache freshness, no polling or refetch-on-focus.
+- WS events trigger `queryClient.invalidateQueries()` (preferred) or `queryClient.setQueryData()` for granular updates.
+- All workspace-scoped query keys include `wsId` — workspace switch automatically uses new cache.
+- Mutations use `onMutate` for optimistic updates + `onError` for rollback + `onSettled` for invalidation.
+- Components access QueryClient via `useQueryClient()` hook. Non-React contexts (e.g. Tiptap plugin callbacks) receive QueryClient via closure from the parent React component — never use module-level singletons.
+
+**Zustand store conventions:**
+- Stores hold only client state (UI selections, persisted preferences). Zero `api.*` calls in stores.
+- Import via `useAuthStore(selector)` or `useWorkspaceStore(selector)`.
 - Stores must not call `useRouter` or any React hooks — keep navigation in components.
-- Cross-store reads use `useOtherStore.getState()` inside actions (not hooks).
-- Dependency direction: `workspace` → `auth`, `realtime` → `auth`, `issues` → `workspace`. Never reverse.
+- `useWorkspaceStore` manages workspace identity (`workspace`, `workspaces`, `api.setWorkspaceId`, localStorage). Server data (members, agents, skills) is in TanStack Query, not the store.
 
 ### Import Aliases
 
-Use `@/` alias (maps to `apps/web/`):
+Use `@/` alias (maps to `apps/web/`) and `@core/` alias (maps to `apps/web/core/`):
 ```typescript
+// Core (headless business logic)
+import { issueListOptions, issueKeys } from "@core/issues/queries";
+import { useUpdateIssue, useCreateIssue } from "@core/issues/mutations";
+import { memberListOptions, agentListOptions } from "@core/workspace/queries";
+import { useWorkspaceId } from "@core/hooks";
+
+// Shared (api client, types)
 import { api } from "@/shared/api";
 import type { Issue } from "@/shared/types";
+
+// Features (UI components, client stores)
 import { useAuthStore } from "@/features/auth";
 import { useWorkspaceStore } from "@/features/workspace";
-import { useIssueStore } from "@/features/issues";
-import { useInboxStore } from "@/features/inbox";
 import { useWSEvent } from "@/features/realtime";
 import { StatusIcon } from "@/features/issues/components";
 ```
 
-Within a feature, use relative imports. Between features or to shared, use `@/`.
+Within a feature, use relative imports. Between features or to shared, use `@/`. For core modules, use `@core/`.
 
 ### Data Flow
 
 ```
-Browser → ApiClient (shared/api) → REST API (Chi handlers) → sqlc queries → PostgreSQL
-Browser ← WSClient (shared/api) ← WebSocket ← Hub.Broadcast() ← Handlers/TaskService
+Browser → useQuery (core/) → ApiClient (shared/api) → REST API (Chi handlers) → sqlc queries → PostgreSQL
+Browser ← useQuery cache ← invalidateQueries ← WS event handlers ← WSClient ← Hub.Broadcast()
 ```
 
+Mutations: `useMutation (core/)` → optimistic cache update → API call → onSettled invalidation.
+WS events: `use-realtime-sync.ts` → `queryClient.invalidateQueries()` for most events, `setQueryData()` for granular issue/inbox updates.
+
 ### Backend Structure (`server/`)
 
 - **Entry points** (`cmd/`): `server` (HTTP API), `multica` (CLI — daemon, agent management, config), `migrate`
@@ -177,7 +206,7 @@ make start-worktree     # Start using .env.worktree
 - Prefer shadcn components over custom implementations. Install missing components via `npx shadcn add`.
 - **Feature-specific components** → `features/<domain>/components/` — issue icons, pickers, and other domain-bound UI live inside their feature module.
 - Use shadcn design tokens for styling (e.g. `bg-primary`, `text-muted-foreground`, `text-destructive`). Avoid hardcoded color values (e.g. `text-red-500`, `bg-gray-100`).
-- Do not introduce extra state (useState, context, reducers) unless explicitly required by the design. Prefer zustand stores for shared state over React Context.
+- Do not introduce extra state (useState, context, reducers) unless explicitly required by the design. Server data goes through TanStack Query (`core/`), client-only shared state through Zustand, React Context only for connection lifecycle.
 - Pay close attention to **overflow** (truncate long text, scrollable containers), **alignment**, and **spacing** consistency.
 - When unsure about interaction or state design, ask — the user will provide direction.
 

CLI_AND_DAEMON.md

@@ -8,7 +8,7 @@ The `multica` CLI connects your local machine to Multica. It handles authenticat
 
 ```bash
 brew tap multica-ai/tap
-brew install multica-cli
+brew install multica
 ```
 
 ### Build from Source

CLI_INSTALL.md

@@ -0,0 +1,171 @@
+# Multica CLI — Installation Guide for AI Agents
+
+> **Audience:** This document is designed for AI agents (Claude Code, Codex, etc.) to read and execute step-by-step. Each step includes the exact shell commands to run, expected outcomes, and error handling.
+
+## One-Line Instruction for Users
+
+Give this instruction to your AI agent:
+
+```
+Fetch https://github.com/multica-ai/multica/blob/main/CLI_INSTALL.md and follow the instructions to install Multica CLI, log in, and start the daemon on this machine.
+```
+
+---
+
+## Step 1: Check if Multica CLI is already installed
+
+Run:
+
+```bash
+multica version
+```
+
+- **If it prints a version string** (e.g. `multica v0.x.x`): skip to **Step 3**.
+- **If command not found**: continue to **Step 2**.
+
+---
+
+## Step 2: Install the Multica CLI
+
+### Option A: Homebrew (preferred)
+
+Check if Homebrew is available:
+
+```bash
+which brew
+```
+
+If `brew` is found, install via Homebrew:
+
+```bash
+brew tap multica-ai/tap && brew install multica
+```
+
+Then verify:
+
+```bash
+multica version
+```
+
+If the version prints successfully, skip to **Step 3**.
+
+### Option B: Download from GitHub Releases (no Homebrew)
+
+If Homebrew is not available, download the binary directly.
+
+Detect OS and architecture, then download the correct archive:
+
+```bash
+OS=$(uname -s | tr '[:upper:]' '[:lower:]')   # "darwin" or "linux"
+ARCH=$(uname -m)                                # "x86_64" or "arm64"
+
+# Normalize architecture name
+if [ "$ARCH" = "x86_64" ]; then
+  ARCH="amd64"
+fi
+
+# Get the latest release tag from GitHub
+LATEST=$(curl -sI https://github.com/multica-ai/multica/releases/latest | grep -i '^location:' | sed 's/.*tag\///' | tr -d '\r\n')
+
+# Download and extract
+curl -sL "https://github.com/multica-ai/multica/releases/download/${LATEST}/multica_${OS}_${ARCH}.tar.gz" -o /tmp/multica.tar.gz
+tar -xzf /tmp/multica.tar.gz -C /tmp multica
+sudo mv /tmp/multica /usr/local/bin/multica
+rm /tmp/multica.tar.gz
+```
+
+Verify:
+
+```bash
+multica version
+```
+
+**If this fails:**
+- Check that `/usr/local/bin` is in `$PATH`.
+- On Linux, you may need `chmod +x /usr/local/bin/multica`.
+- If `sudo` is not available, install to a user-writable directory: `mv /tmp/multica ~/.local/bin/multica` and ensure `~/.local/bin` is in `$PATH`.
+
+---
+
+## Step 3: Log in
+
+Run:
+
+```bash
+multica login
+```
+
+**Important:** This command opens a browser window for OAuth authentication. Tell the user:
+
+> "A browser window will open for Multica login. Please complete the authentication in your browser, then come back here."
+
+Wait for the command to complete. It will automatically discover and watch all workspaces the user belongs to.
+
+Verify:
+
+```bash
+multica auth status
+```
+
+Expected output should show the authenticated user and server URL.
+
+**If login fails:**
+- If no browser is available (headless environment), the user can generate a Personal Access Token at `https://app.multica.ai/settings` and run: `multica login --token`
+- If the server URL needs to be customized: `multica config set server_url <url>` before logging in.
+
+---
+
+## Step 4: Start the daemon
+
+First, check if the daemon is already running:
+
+```bash
+multica daemon status
+```
+
+- **If status is "running"**: skip to **Step 5**.
+- **If status is "stopped"**: start it:
+
+```bash
+multica daemon start
+```
+
+Wait 3 seconds, then verify:
+
+```bash
+multica daemon status
+```
+
+Expected output should show `running` status with detected agents (e.g. `claude`, `codex`).
+
+**If daemon fails to start:**
+- Check logs: `multica daemon logs`
+- If a port conflict occurs, the daemon may already be running under a different profile.
+- If no agents are detected, ensure at least one AI CLI (`claude` or `codex`) is installed and on the `$PATH`.
+
+---
+
+## Step 5: Verify everything is working
+
+Run:
+
+```bash
+multica daemon status
+```
+
+Confirm:
+1. Status is `running`
+2. At least one agent is listed (e.g. `claude`, `codex`)
+3. At least one workspace is being watched
+
+If the agents list is empty, tell the user:
+
+> "The Multica daemon is running but no AI agent CLIs were detected. Please install at least one: [Claude Code](https://docs.anthropic.com/en/docs/claude-code) (`claude`) or [Codex](https://github.com/openai/codex) (`codex`), then restart the daemon with `multica daemon stop && multica daemon start`."
+
+---
+
+## Summary
+
+When all steps are complete, inform the user:
+
+> "Multica CLI is installed and the daemon is running. Agents in your workspaces can now execute tasks on this machine. You can manage workspaces with `multica workspace list` and view daemon logs with `multica daemon logs -f`."

Makefile

@@ -69,7 +69,12 @@ stop:
 	@echo "Stopping services..."
 	@-lsof -ti:$(PORT) | xargs kill -9 2>/dev/null
 	@-lsof -ti:$(FRONTEND_PORT) | xargs kill -9 2>/dev/null
-	@echo "✓ App processes stopped. Shared PostgreSQL is still running on localhost:5432."
+	@case "$(DATABASE_URL)" in \
+		""|*@localhost:*|*@localhost/*|*@127.0.0.1:*|*@127.0.0.1/*|*@\[::1\]:*|*@\[::1\]/*) \
+			echo "✓ App processes stopped. Shared PostgreSQL is still running on localhost:$(POSTGRES_PORT)." ;; \
+		*) \
+			echo "✓ App processes stopped. Remote PostgreSQL was not affected." ;; \
+	esac
 
 # Full verification: typecheck + unit tests + Go tests + E2E
 check:
@@ -138,10 +143,12 @@ COMMIT  ?= $(shell git rev-parse --short HEAD 2>/dev/null || echo unknown)
 build:
 	cd server && go build -o bin/server ./cmd/server
 	cd server && go build -ldflags "-X main.version=$(VERSION) -X main.commit=$(COMMIT)" -o bin/multica ./cmd/multica
+	cd server && go build -o bin/migrate ./cmd/migrate
 
 test:
 	$(REQUIRE_ENV)
 	@bash scripts/ensure-postgres.sh "$(ENV_FILE)"
+	cd server && go run ./cmd/migrate up
 	cd server && go test ./...
 
 # Database

README.md

@@ -70,6 +70,14 @@ See the [Self-Hosting Guide](SELF_HOSTING.md) for full instructions.
 
 The `multica` CLI connects your local machine to Multica — authenticate, manage workspaces, and run the agent daemon.
 
+**Option A — paste this to your coding agent (Claude Code, Codex, etc.):**
+
+```
+Fetch https://github.com/multica-ai/multica/blob/main/CLI_INSTALL.md and follow the instructions to install Multica CLI, log in, and start the daemon on this machine.
+```
+
+**Option B — install manually:**
+
 ```bash
 # Install
 brew tap multica-ai/tap

README.zh-CN.md

@@ -70,6 +70,14 @@ make start                                         # 启动应用
 
 `multica` CLI 将你的本地机器连接到 Multica — 用于认证、管理工作区和运行 Agent daemon。
 
+**方式 A — 将以下指令粘贴给你的 coding agent（Claude Code、Codex 等）：**
+
+```
+Fetch https://github.com/multica-ai/multica/blob/main/CLI_INSTALL.md and follow the instructions to install Multica CLI, log in, and start the daemon on this machine.
+```
+
+**方式 B — 手动安装：**
+
 ```bash
 # 安装
 brew tap multica-ai/tap

SELF_HOSTING.md

@@ -257,8 +257,14 @@ Each team member who wants to run AI agents locally needs to:
 
    ```bash
    # Point CLI to your server
+   #
+   # For production deployments with TLS:
    export MULTICA_APP_URL=https://app.example.com
    export MULTICA_SERVER_URL=wss://api.example.com/ws
+   #
+   # For local deployments without TLS:
+   # export MULTICA_APP_URL=http://localhost:3000
+   # export MULTICA_SERVER_URL=ws://localhost:8080/ws
 
    # Login (opens browser)
    multica login
@@ -267,6 +273,8 @@ Each team member who wants to run AI agents locally needs to:
    multica daemon start
    ```
 
+   > **Note:** Use `https://` and `wss://` for production deployments behind a TLS-terminating reverse proxy. For local or development deployments without TLS, use `http://` and `ws://` instead.
+
 The daemon auto-detects installed agent CLIs and registers itself with the server. When an agent is assigned a task in Multica, the daemon picks it up, creates an isolated workspace, runs the agent, and reports results back.
 
 ## Upgrading

apps/web/app/(auth)/login/page.tsx

@@ -153,7 +153,8 @@ function LoginPageContent() {
 
         await verifyCode(email, value);
         const wsList = await api.listWorkspaces();
-        await hydrateWorkspace(wsList);
+        const lastWsId = localStorage.getItem("multica_workspace_id");
+        await hydrateWorkspace(wsList, lastWsId);
         router.push(searchParams.get("next") || "/issues");
       } catch (err) {
         setError(
@@ -281,6 +282,22 @@ function LoginPageContent() {
     );
   }
 
+  const googleClientId = process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID;
+
+  const handleGoogleLogin = () => {
+    if (!googleClientId) return;
+    const redirectUri = `${window.location.origin}/auth/callback`;
+    const params = new URLSearchParams({
+      client_id: googleClientId,
+      redirect_uri: redirectUri,
+      response_type: "code",
+      scope: "openid email profile",
+      access_type: "offline",
+      prompt: "select_account",
+    });
+    window.location.href = `https://accounts.google.com/o/oauth2/v2/auth?${params}`;
+  };
+
   return (
     <div className="flex min-h-screen items-center justify-center">
       <Card className="w-full max-w-sm">
@@ -306,7 +323,7 @@ function LoginPageContent() {
             )}
           </form>
         </CardContent>
-        <CardFooter>
+        <CardFooter className="flex flex-col gap-3">
           <Button
             type="submit"
             form="login-form"
@@ -316,6 +333,46 @@ function LoginPageContent() {
           >
             {submitting ? "Sending code..." : "Continue"}
           </Button>
+          {googleClientId && (
+            <>
+              <div className="relative w-full">
+                <div className="absolute inset-0 flex items-center">
+                  <span className="w-full border-t" />
+                </div>
+                <div className="relative flex justify-center text-xs uppercase">
+                  <span className="bg-card px-2 text-muted-foreground">or</span>
+                </div>
+              </div>
+              <Button
+                type="button"
+                variant="outline"
+                className="w-full"
+                size="lg"
+                onClick={handleGoogleLogin}
+                disabled={submitting}
+              >
+                <svg className="mr-2 h-4 w-4" viewBox="0 0 24 24">
+                  <path
+                    d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92a5.06 5.06 0 0 1-2.2 3.32v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.1z"
+                    fill="#4285F4"
+                  />
+                  <path
+                    d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
+                    fill="#34A853"
+                  />
+                  <path
+                    d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
+                    fill="#FBBC05"
+                  />
+                  <path
+                    d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
+                    fill="#EA4335"
+                  />
+                </svg>
+                Continue with Google
+              </Button>
+            </>
+          )}
         </CardFooter>
       </Card>
     </div>

apps/web/app/(dashboard)/_components/app-sidebar.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import React from "react";
 import Link from "next/link";
 import { usePathname, useRouter } from "next/navigation";
 import {
@@ -42,7 +43,9 @@ import {
 import { Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip";
 import { useAuthStore } from "@/features/auth";
 import { useWorkspaceStore } from "@/features/workspace";
-import { useInboxStore } from "@/features/inbox";
+import { useQuery } from "@tanstack/react-query";
+import { inboxKeys, deduplicateInboxItems } from "@core/inbox/queries";
+import { api } from "@/shared/api";
 import { useModalStore } from "@/features/modals";
 
 const primaryNav = [
@@ -73,7 +76,16 @@ export function AppSidebar() {
   const workspaces = useWorkspaceStore((s) => s.workspaces);
   const switchWorkspace = useWorkspaceStore((s) => s.switchWorkspace);
 
-  const unreadCount = useInboxStore((s) => s.unreadCount());
+  const wsId = workspace?.id;
+  const { data: inboxItems = [] } = useQuery({
+    queryKey: wsId ? inboxKeys.list(wsId) : ["inbox", "disabled"],
+    queryFn: () => api.listInbox(),
+    enabled: !!wsId,
+  });
+  const unreadCount = React.useMemo(
+    () => deduplicateInboxItems(inboxItems).filter((i) => !i.read).length,
+    [inboxItems],
+  );
 
   const logout = () => {
     router.push("/");
@@ -132,6 +144,7 @@ export function AppSidebar() {
                         key={ws.id}
                         onClick={() => {
                           if (ws.id !== workspace?.id) {
+                            router.push("/issues");
                             switchWorkspace(ws.id);
                           }
                         }}

apps/web/app/(dashboard)/agents/page.tsx

@@ -8,15 +8,10 @@ import {
   Monitor,
   Plus,
   ListTodo,
-  Wrench,
   FileText,
   BookOpenText,
-  MessageSquare,
-  Timer,
   Trash2,
   Save,
-  Key,
-  Link2,
   Clock,
   CheckCircle2,
   XCircle,
@@ -35,9 +30,6 @@ import type {
   Agent,
   AgentStatus,
   AgentVisibility,
-  AgentTool,
-  AgentTrigger,
-  AgentTriggerType,
   AgentTask,
   RuntimeDevice,
   CreateAgentRequest,
@@ -75,8 +67,11 @@ import { Skeleton } from "@/components/ui/skeleton";
 import { api } from "@/shared/api";
 import { useAuthStore } from "@/features/auth";
 import { useWorkspaceStore } from "@/features/workspace";
-import { useRuntimeStore } from "@/features/runtimes";
-import { useIssueStore } from "@/features/issues";
+import { runtimeListOptions } from "@core/runtimes/queries";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useWorkspaceId } from "@core/hooks";
+import { issueListOptions } from "@core/issues/queries";
+import { skillListOptions, agentListOptions, workspaceKeys } from "@core/workspace/queries";
 import { ActorAvatar } from "@/components/common/actor-avatar";
 import { useFileUpload } from "@/shared/hooks/use-file-upload";
 
@@ -148,10 +143,6 @@ function CreateAgentDialog({
         description: description.trim(),
         runtime_id: selectedRuntime.id,
         visibility,
-        triggers: [
-          { id: generateId(), type: "on_assign", enabled: true, config: {} },
-          { id: generateId(), type: "on_comment", enabled: true, config: {} },
-        ],
       });
       onClose();
     } catch (err) {
@@ -443,8 +434,9 @@ function SkillsTab({
 }: {
   agent: Agent;
 }) {
-  const workspaceSkills = useWorkspaceStore((s) => s.skills);
-  const refreshAgents = useWorkspaceStore((s) => s.refreshAgents);
+  const qc = useQueryClient();
+  const wsId = useWorkspaceId();
+  const { data: workspaceSkills = [] } = useQuery(skillListOptions(wsId));
   const [saving, setSaving] = useState(false);
   const [showPicker, setShowPicker] = useState(false);
 
@@ -456,7 +448,7 @@ function SkillsTab({
     try {
       const newIds = [...agent.skills.map((s) => s.id), skillId];
       await api.setAgentSkills(agent.id, { skill_ids: newIds });
-      await refreshAgents();
+      qc.invalidateQueries({ queryKey: workspaceKeys.agents(wsId) });
     } catch (e) {
       toast.error(e instanceof Error ? e.message : "Failed to add skill");
     } finally {
@@ -470,7 +462,7 @@ function SkillsTab({
     try {
       const newIds = agent.skills.filter((s) => s.id !== skillId).map((s) => s.id);
       await api.setAgentSkills(agent.id, { skill_ids: newIds });
-      await refreshAgents();
+      qc.invalidateQueries({ queryKey: workspaceKeys.agents(wsId) });
     } catch (e) {
       toast.error(e instanceof Error ? e.message : "Failed to remove skill");
     } finally {
@@ -596,459 +588,6 @@ function SkillsTab({
   );
 }
 
-// ---------------------------------------------------------------------------
-// Tools Tab
-// ---------------------------------------------------------------------------
-
-function AddToolDialog({
-  onClose,
-  onAdd,
-}: {
-  onClose: () => void;
-  onAdd: (tool: AgentTool) => void;
-}) {
-  const [name, setName] = useState("");
-  const [description, setDescription] = useState("");
-  const [authType, setAuthType] = useState<"oauth" | "api_key" | "none">("api_key");
-
-  const handleAdd = () => {
-    if (!name.trim()) return;
-    onAdd({
-      id: generateId(),
-      name: name.trim(),
-      description: description.trim(),
-      auth_type: authType,
-      connected: false,
-      config: {},
-    });
-    onClose();
-  };
-
-  return (
-    <Dialog open onOpenChange={(v) => { if (!v) onClose(); }}>
-      <DialogContent className="max-w-md">
-        <DialogHeader>
-          <DialogTitle className="text-sm">Add Tool</DialogTitle>
-          <DialogDescription className="text-xs">
-            Connect an external tool for this agent to use.
-          </DialogDescription>
-        </DialogHeader>
-
-        <div className="space-y-3">
-          <div>
-            <Label className="text-xs text-muted-foreground">Tool Name</Label>
-            <Input
-              autoFocus
-              type="text"
-              value={name}
-              onChange={(e) => setName(e.target.value)}
-              placeholder="e.g. Google Search, Slack, GitHub"
-              className="mt-1"
-              onKeyDown={(e) => e.key === "Enter" && handleAdd()}
-            />
-          </div>
-          <div>
-            <Label className="text-xs text-muted-foreground">Description</Label>
-            <Input
-              type="text"
-              value={description}
-              onChange={(e) => setDescription(e.target.value)}
-              placeholder="What does this tool do?"
-              className="mt-1"
-            />
-          </div>
-          <div>
-            <Label className="text-xs text-muted-foreground">Authentication</Label>
-            <div className="mt-1.5 flex gap-2">
-              {(["api_key", "oauth", "none"] as const).map((type) => (
-                <Button
-                  key={type}
-                  variant={authType === type ? "outline" : "ghost"}
-                  size="xs"
-                  onClick={() => setAuthType(type)}
-                  className={`flex-1 ${
-                    authType === type
-                      ? "border-primary bg-primary/5 font-medium"
-                      : ""
-                  }`}
-                >
-                  {type === "api_key" ? "API Key" : type === "oauth" ? "OAuth" : "None"}
-                </Button>
-              ))}
-            </div>
-          </div>
-        </div>
-
-        <DialogFooter>
-          <Button variant="ghost" onClick={onClose}>
-            Cancel
-          </Button>
-          <Button
-            onClick={handleAdd}
-            disabled={!name.trim()}
-          >
-            Add
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-}
-
-function ToolsTab({
-  agent,
-  onSave,
-}: {
-  agent: Agent;
-  onSave: (tools: AgentTool[]) => Promise<void>;
-}) {
-  const [tools, setTools] = useState<AgentTool[]>(agent.tools ?? []);
-  const [showAdd, setShowAdd] = useState(false);
-  const [saving, setSaving] = useState(false);
-
-  useEffect(() => {
-    setTools(agent.tools ?? []);
-  }, [agent.id, agent.tools]);
-
-  const isDirty = JSON.stringify(tools) !== JSON.stringify(agent.tools ?? []);
-
-  const handleSave = async () => {
-    setSaving(true);
-    try {
-      await onSave(tools);
-    } catch {
-      // toast handled by parent
-    } finally {
-      setSaving(false);
-    }
-  };
-
-  const toggleConnect = (toolId: string) => {
-    setTools((prev) =>
-      prev.map((t) => (t.id === toolId ? { ...t, connected: !t.connected } : t)),
-    );
-  };
-
-  const removeTool = (toolId: string) => {
-    setTools((prev) => prev.filter((t) => t.id !== toolId));
-  };
-
-  return (
-    <div className="space-y-4">
-      <div className="flex items-center justify-between">
-        <div>
-          <h3 className="text-sm font-semibold">Tools</h3>
-          <p className="text-xs text-muted-foreground mt-0.5">
-            External tools and APIs this agent can use during task execution.
-          </p>
-        </div>
-        <div className="flex items-center gap-2">
-          {isDirty && (
-            <Button
-              onClick={handleSave}
-              disabled={saving}
-              size="xs"
-            >
-              <Save className="h-3 w-3" />
-              {saving ? "Saving..." : "Save"}
-            </Button>
-          )}
-          <Button
-            variant="outline"
-            size="xs"
-            onClick={() => setShowAdd(true)}
-          >
-            <Plus className="h-3 w-3" />
-            Add Tool
-          </Button>
-        </div>
-      </div>
-
-      {tools.length === 0 ? (
-        <div className="flex flex-col items-center justify-center rounded-lg border border-dashed py-12">
-          <Wrench className="h-8 w-8 text-muted-foreground/40" />
-          <p className="mt-3 text-sm text-muted-foreground">No tools configured</p>
-          <Button
-            onClick={() => setShowAdd(true)}
-            size="xs"
-            className="mt-3"
-          >
-            <Plus className="h-3 w-3" />
-            Add Tool
-          </Button>
-        </div>
-      ) : (
-        <div className="space-y-2">
-          {tools.map((tool) => (
-            <div
-              key={tool.id}
-              className="flex items-center gap-3 rounded-lg border px-4 py-3"
-            >
-              <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-muted">
-                {tool.auth_type === "oauth" ? (
-                  <Link2 className="h-4 w-4 text-muted-foreground" />
-                ) : tool.auth_type === "api_key" ? (
-                  <Key className="h-4 w-4 text-muted-foreground" />
-                ) : (
-                  <Wrench className="h-4 w-4 text-muted-foreground" />
-                )}
-              </div>
-              <div className="min-w-0 flex-1">
-                <div className="text-sm font-medium">{tool.name}</div>
-                {tool.description && (
-                  <div className="text-xs text-muted-foreground truncate">
-                    {tool.description}
-                  </div>
-                )}
-              </div>
-              <div className="flex items-center gap-2">
-                <Button
-                  variant="ghost"
-                  size="xs"
-                  onClick={() => toggleConnect(tool.id)}
-                  className={
-                    tool.connected
-                      ? "bg-success/10 text-success"
-                      : "bg-muted text-muted-foreground hover:bg-accent"
-                  }
-                >
-                  {tool.connected ? "Connected" : "Connect"}
-                </Button>
-                <Button
-                  variant="ghost"
-                  size="icon-xs"
-                  onClick={() => removeTool(tool.id)}
-                  className="text-muted-foreground hover:text-destructive"
-                >
-                  <Trash2 className="h-3.5 w-3.5" />
-                </Button>
-              </div>
-            </div>
-          ))}
-        </div>
-      )}
-
-      {showAdd && (
-        <AddToolDialog
-          onClose={() => setShowAdd(false)}
-          onAdd={(tool) => setTools((prev) => [...prev, tool])}
-        />
-      )}
-    </div>
-  );
-}
-
-// ---------------------------------------------------------------------------
-// Triggers Tab
-// ---------------------------------------------------------------------------
-
-function TriggersTab({
-  agent,
-  onSave,
-}: {
-  agent: Agent;
-  onSave: (triggers: AgentTrigger[]) => Promise<void>;
-}) {
-  const [triggers, setTriggers] = useState<AgentTrigger[]>(agent.triggers ?? []);
-  const [saving, setSaving] = useState(false);
-
-  useEffect(() => {
-    setTriggers(agent.triggers ?? []);
-  }, [agent.id, agent.triggers]);
-
-  const isDirty = JSON.stringify(triggers) !== JSON.stringify(agent.triggers ?? []);
-
-  const handleSave = async () => {
-    setSaving(true);
-    try {
-      await onSave(triggers);
-    } catch {
-      // toast handled by parent
-    } finally {
-      setSaving(false);
-    }
-  };
-
-  const toggleTrigger = (triggerId: string) => {
-    setTriggers((prev) =>
-      prev.map((t) => (t.id === triggerId ? { ...t, enabled: !t.enabled } : t)),
-    );
-  };
-
-  const removeTrigger = (triggerId: string) => {
-    setTriggers((prev) => prev.filter((t) => t.id !== triggerId));
-  };
-
-  const addTrigger = (type: AgentTriggerType) => {
-    const newTrigger: AgentTrigger = {
-      id: generateId(),
-      type,
-      enabled: true,
-      config: type === "scheduled" ? { cron: "0 9 * * 1-5", timezone: "UTC" } : {},
-    };
-    setTriggers((prev) => [...prev, newTrigger]);
-  };
-
-  const updateTriggerConfig = (triggerId: string, config: Record<string, unknown>) => {
-    setTriggers((prev) =>
-      prev.map((t) => (t.id === triggerId ? { ...t, config } : t)),
-    );
-  };
-
-  return (
-    <div className="space-y-4">
-      <div className="flex items-center justify-between">
-        <div>
-          <h3 className="text-sm font-semibold">Triggers</h3>
-          <p className="text-xs text-muted-foreground mt-0.5">
-            Configure when this agent should start working.
-          </p>
-        </div>
-        <div className="flex items-center gap-2">
-          {isDirty && (
-            <Button
-              onClick={handleSave}
-              disabled={saving}
-              size="xs"
-            >
-              <Save className="h-3 w-3" />
-              {saving ? "Saving..." : "Save"}
-            </Button>
-          )}
-        </div>
-      </div>
-
-      <div className="space-y-2">
-        {triggers.map((trigger) => (
-          <div
-            key={trigger.id}
-            className="rounded-lg border px-4 py-3"
-          >
-            <div className="flex items-center gap-3">
-              <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-muted">
-                {trigger.type === "on_assign" ? (
-                  <Bot className="h-4 w-4 text-muted-foreground" />
-                ) : trigger.type === "on_comment" ? (
-                  <MessageSquare className="h-4 w-4 text-muted-foreground" />
-                ) : (
-                  <Timer className="h-4 w-4 text-muted-foreground" />
-                )}
-              </div>
-              <div className="min-w-0 flex-1">
-                <div className="text-sm font-medium">
-                  {trigger.type === "on_assign"
-                    ? "On Issue Assign"
-                    : trigger.type === "on_comment"
-                      ? "On Comment"
-                      : "Scheduled"}
-                </div>
-                <div className="text-xs text-muted-foreground">
-                  {trigger.type === "on_assign"
-                    ? "Runs when an issue is assigned to this agent"
-                    : trigger.type === "on_comment"
-                      ? "Runs when a member comments on the agent's issue"
-                      : `Cron: ${(trigger.config as { cron?: string }).cron ?? "Not set"}`}
-                </div>
-              </div>
-              <div className="flex items-center gap-2">
-                <button
-                  onClick={() => toggleTrigger(trigger.id)}
-                  className={`relative h-5 w-9 rounded-full transition-colors ${
-                    trigger.enabled ? "bg-primary" : "bg-muted"
-                  }`}
-                >
-                  <span
-                    className={`absolute top-0.5 h-4 w-4 rounded-full bg-white shadow-sm transition-transform ${
-                      trigger.enabled ? "left-4.5" : "left-0.5"
-                    }`}
-                  />
-                </button>
-                <Button
-                  variant="ghost"
-                  size="icon-xs"
-                  onClick={() => removeTrigger(trigger.id)}
-                  className="text-muted-foreground hover:text-destructive"
-                >
-                  <Trash2 className="h-3.5 w-3.5" />
-                </Button>
-              </div>
-            </div>
-
-            {trigger.type === "scheduled" && (
-              <div className="mt-3 grid grid-cols-2 gap-3 pl-12">
-                <div>
-                  <Label className="text-xs text-muted-foreground">
-                    Cron Expression
-                  </Label>
-                  <Input
-                    type="text"
-                    value={(trigger.config as { cron?: string }).cron ?? ""}
-                    onChange={(e) =>
-                      updateTriggerConfig(trigger.id, {
-                        ...trigger.config,
-                        cron: e.target.value,
-                      })
-                    }
-                    placeholder="0 9 * * 1-5"
-                    className="mt-1 text-xs font-mono"
-                  />
-                </div>
-                <div>
-                  <Label className="text-xs text-muted-foreground">
-                    Timezone
-                  </Label>
-                  <Input
-                    type="text"
-                    value={(trigger.config as { timezone?: string }).timezone ?? ""}
-                    onChange={(e) =>
-                      updateTriggerConfig(trigger.id, {
-                        ...trigger.config,
-                        timezone: e.target.value,
-                      })
-                    }
-                    placeholder="UTC"
-                    className="mt-1 text-xs"
-                  />
-                </div>
-              </div>
-            )}
-          </div>
-        ))}
-      </div>
-
-      <div className="flex gap-2">
-        <Button
-          variant="outline"
-          size="xs"
-          onClick={() => addTrigger("on_assign")}
-          className="border-dashed text-muted-foreground hover:text-foreground"
-        >
-          <Bot className="h-3 w-3" />
-          Add On Assign
-        </Button>
-        <Button
-          variant="outline"
-          size="xs"
-          onClick={() => addTrigger("on_comment")}
-          className="border-dashed text-muted-foreground hover:text-foreground"
-        >
-          <MessageSquare className="h-3 w-3" />
-          Add On Comment
-        </Button>
-        <Button
-          variant="outline"
-          size="xs"
-          onClick={() => addTrigger("scheduled")}
-          className="border-dashed text-muted-foreground hover:text-foreground"
-        >
-          <Timer className="h-3 w-3" />
-          Add Scheduled
-        </Button>
-      </div>
-    </div>
-  );
-}
-
 // ---------------------------------------------------------------------------
 // Tasks Tab
 // ---------------------------------------------------------------------------
@@ -1056,7 +595,8 @@ function TriggersTab({
 function TasksTab({ agent }: { agent: Agent }) {
   const [tasks, setTasks] = useState<AgentTask[]>([]);
   const [loading, setLoading] = useState(true);
-  const issues = useIssueStore((s) => s.issues);
+  const wsId = useWorkspaceId();
+  const { data: issues = [] } = useQuery(issueListOptions(wsId));
 
   useEffect(() => {
     setLoading(true);
@@ -1359,13 +899,11 @@ function SettingsTab({
 // Agent Detail
 // ---------------------------------------------------------------------------
 
-type DetailTab = "instructions" | "skills" | "tools" | "triggers" | "tasks" | "settings";
+type DetailTab = "instructions" | "skills" | "tasks" | "settings";
 
 const detailTabs: { id: DetailTab; label: string; icon: typeof FileText }[] = [
   { id: "instructions", label: "Instructions", icon: FileText },
   { id: "skills", label: "Skills", icon: BookOpenText },
-  { id: "tools", label: "Tools", icon: Wrench },
-  { id: "triggers", label: "Triggers", icon: Timer },
   { id: "tasks", label: "Tasks", icon: ListTodo },
   { id: "settings", label: "Settings", icon: Settings },
 ];
@@ -1479,18 +1017,6 @@ function AgentDetail({
         {activeTab === "skills" && (
           <SkillsTab agent={agent} />
         )}
-        {activeTab === "tools" && (
-          <ToolsTab
-            agent={agent}
-            onSave={(tools) => onUpdate(agent.id, { tools })}
-          />
-        )}
-        {activeTab === "triggers" && (
-          <TriggersTab
-            agent={agent}
-            onSave={(triggers) => onUpdate(agent.id, { triggers })}
-          />
-        )}
         {activeTab === "tasks" && <TasksTab agent={agent} />}
         {activeTab === "settings" && (
           <SettingsTab
@@ -1544,21 +1070,17 @@ function AgentDetail({
 export default function AgentsPage() {
   const isLoading = useAuthStore((s) => s.isLoading);
   const workspace = useWorkspaceStore((s) => s.workspace);
-  const agents = useWorkspaceStore((s) => s.agents);
-  const refreshAgents = useWorkspaceStore((s) => s.refreshAgents);
+  const qc = useQueryClient();
+  const wsId = useWorkspaceId();
+  const { data: agents = [] } = useQuery(agentListOptions(wsId));
   const [selectedId, setSelectedId] = useState<string>("");
   const [showArchived, setShowArchived] = useState(false);
   const [showCreate, setShowCreate] = useState(false);
-  const runtimes = useRuntimeStore((s) => s.runtimes);
-  const fetchRuntimes = useRuntimeStore((s) => s.fetchRuntimes);
+  const { data: runtimes = [] } = useQuery(runtimeListOptions(wsId));
   const { defaultLayout, onLayoutChanged } = useDefaultLayout({
     id: "multica_agents_layout",
   });
 
-  useEffect(() => {
-    if (workspace) fetchRuntimes();
-  }, [workspace, fetchRuntimes]);
-
   const filteredAgents = useMemo(
     () => showArchived ? agents.filter((a) => !!a.archived_at) : agents.filter((a) => !a.archived_at),
     [agents, showArchived],
@@ -1575,14 +1097,14 @@ export default function AgentsPage() {
 
   const handleCreate = async (data: CreateAgentRequest) => {
     const agent = await api.createAgent(data);
-    await refreshAgents();
+    qc.invalidateQueries({ queryKey: workspaceKeys.agents(wsId) });
     setSelectedId(agent.id);
   };
 
   const handleUpdate = async (id: string, data: Record<string, unknown>) => {
     try {
       await api.updateAgent(id, data as UpdateAgentRequest);
-      await refreshAgents();
+      qc.invalidateQueries({ queryKey: workspaceKeys.agents(wsId) });
       toast.success("Agent updated");
     } catch (e) {
       toast.error(e instanceof Error ? e.message : "Failed to update agent");
@@ -1593,7 +1115,7 @@ export default function AgentsPage() {
   const handleArchive = async (id: string) => {
     try {
       await api.archiveAgent(id);
-      await refreshAgents();
+      qc.invalidateQueries({ queryKey: workspaceKeys.agents(wsId) });
       toast.success("Agent archived");
     } catch (e) {
       toast.error(e instanceof Error ? e.message : "Failed to archive agent");
@@ -1603,7 +1125,7 @@ export default function AgentsPage() {
   const handleRestore = async (id: string) => {
     try {
       await api.restoreAgent(id);
-      await refreshAgents();
+      qc.invalidateQueries({ queryKey: workspaceKeys.agents(wsId) });
       toast.success("Agent restored");
     } catch (e) {
       toast.error(e instanceof Error ? e.message : "Failed to restore agent");

apps/web/app/(dashboard)/inbox/page.tsx

@@ -1,9 +1,22 @@
 "use client";
 
-import { useState, useEffect, useCallback } from "react";
+import { useState, useEffect, useCallback, useMemo } from "react";
 import { useSearchParams } from "next/navigation";
 import { useDefaultLayout } from "react-resizable-panels";
-import { useInboxStore } from "@/features/inbox";
+import { useQuery } from "@tanstack/react-query";
+import { useWorkspaceId } from "@core/hooks";
+import {
+  inboxListOptions,
+  deduplicateInboxItems,
+} from "@core/inbox/queries";
+import {
+  useMarkInboxRead,
+  useArchiveInbox,
+  useMarkAllInboxRead,
+  useArchiveAllInbox,
+  useArchiveAllReadInbox,
+  useArchiveCompletedInbox,
+} from "@core/inbox/mutations";
 import { IssueDetail, StatusIcon, PriorityIcon } from "@/features/issues/components";
 import { STATUS_CONFIG, PRIORITY_CONFIG } from "@/features/issues/config";
 import { useActorName } from "@/features/workspace";
@@ -33,7 +46,6 @@ import {
   DropdownMenuItem,
   DropdownMenuSeparator,
 } from "@/components/ui/dropdown-menu";
-import { api } from "@/shared/api";
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -235,8 +247,9 @@ export default function InboxPage() {
     window.history.replaceState(null, "", url);
   }, []);
 
-  const items = useInboxStore((s) => s.dedupedItems());
-  const loading = useInboxStore((s) => s.loading);
+  const wsId = useWorkspaceId();
+  const { data: rawItems = [], isLoading: loading } = useQuery(inboxListOptions(wsId));
+  const items = useMemo(() => deduplicateInboxItems(rawItems), [rawItems]);
 
   const { defaultLayout, onLayoutChanged } = useDefaultLayout({
     id: "multica_inbox_layout",
@@ -245,74 +258,58 @@ export default function InboxPage() {
   const selected = items.find((i) => (i.issue_id ?? i.id) === selectedKey) ?? null;
   const unreadCount = items.filter((i) => !i.read).length;
 
+  const markReadMutation = useMarkInboxRead();
+  const archiveMutation = useArchiveInbox();
+  const markAllReadMutation = useMarkAllInboxRead();
+  const archiveAllMutation = useArchiveAllInbox();
+  const archiveAllReadMutation = useArchiveAllReadInbox();
+  const archiveCompletedMutation = useArchiveCompletedInbox();
+
   // Click-to-read: select + auto-mark-read
-  const handleSelect = async (item: InboxItem) => {
+  const handleSelect = (item: InboxItem) => {
     setSelectedKey(item.issue_id ?? item.id);
     if (!item.read) {
-      useInboxStore.getState().markRead(item.id);
-      try {
-        await api.markInboxRead(item.id);
-      } catch {
-        // Rollback: refetch to get server truth
-        useInboxStore.getState().fetch();
-        toast.error("Failed to mark as read");
-      }
+      markReadMutation.mutate(item.id, {
+        onError: () => toast.error("Failed to mark as read"),
+      });
     }
   };
 
-  const handleArchive = async (id: string) => {
-    try {
-      await api.archiveInbox(id);
-      useInboxStore.getState().archive(id);
-      const archived = items.find((i) => i.id === id);
-      if (archived && (archived.issue_id ?? archived.id) === selectedKey) setSelectedKey("");
-    } catch {
-      toast.error("Failed to archive");
-    }
+  const handleArchive = (id: string) => {
+    const archived = items.find((i) => i.id === id);
+    if (archived && (archived.issue_id ?? archived.id) === selectedKey) setSelectedKey("");
+    archiveMutation.mutate(id, {
+      onError: () => toast.error("Failed to archive"),
+    });
   };
 
   // Batch operations
-  const handleMarkAllRead = async () => {
-    try {
-      useInboxStore.getState().markAllRead();
-      await api.markAllInboxRead();
-    } catch {
-      toast.error("Failed to mark all as read");
-      useInboxStore.getState().fetch();
-    }
+  const handleMarkAllRead = () => {
+    markAllReadMutation.mutate(undefined, {
+      onError: () => toast.error("Failed to mark all as read"),
+    });
   };
 
-  const handleArchiveAll = async () => {
-    try {
-      useInboxStore.getState().archiveAll();
-      setSelectedKey("");
-      await api.archiveAllInbox();
-    } catch {
-      toast.error("Failed to archive all");
-      useInboxStore.getState().fetch();
-    }
+  const handleArchiveAll = () => {
+    setSelectedKey("");
+    archiveAllMutation.mutate(undefined, {
+      onError: () => toast.error("Failed to archive all"),
+    });
   };
 
-  const handleArchiveAllRead = async () => {
-    try {
-      const readKeys = items.filter((i) => i.read).map((i) => i.issue_id ?? i.id);
-      useInboxStore.getState().archiveAllRead();
-      if (readKeys.includes(selectedKey)) setSelectedKey("");
-      await api.archiveAllReadInbox();
-    } catch {
-      toast.error("Failed to archive read items");
-      useInboxStore.getState().fetch();
-    }
+  const handleArchiveAllRead = () => {
+    const readKeys = items.filter((i) => i.read).map((i) => i.issue_id ?? i.id);
+    if (readKeys.includes(selectedKey)) setSelectedKey("");
+    archiveAllReadMutation.mutate(undefined, {
+      onError: () => toast.error("Failed to archive read items"),
+    });
   };
 
-  const handleArchiveCompleted = async () => {
-    try {
-      await api.archiveCompletedInbox();
-      setSelectedKey("");
-      await useInboxStore.getState().fetch();
-    } catch {
-      toast.error("Failed to archive completed");
-    }
+  const handleArchiveCompleted = () => {
+    setSelectedKey("");
+    archiveCompletedMutation.mutate(undefined, {
+      onError: () => toast.error("Failed to archive completed"),
+    });
   };
 
   if (loading) {

apps/web/app/(dashboard)/issues/[id]/page.test.tsx

@@ -2,6 +2,7 @@ import { Suspense, forwardRef, useRef, useState, useImperativeHandle } from "rea
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { render, screen, waitFor, act, fireEvent } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import type { Issue, Comment, TimelineEntry } from "@/shared/types";
 
 // Mock next/navigation
@@ -62,34 +63,11 @@ vi.mock("@/features/workspace", () => ({
   }),
 }));
 
-// Mock issue store — supply a stable full issue object so storeIssue
-// doesn't create a new reference each render (avoids infinite effect loop)
-// and has all required fields for rendering.
-const stableStoreIssues = vi.hoisted(() => [
-  {
-    id: "issue-1",
-    workspace_id: "ws-1",
-    number: 1,
-    identifier: "TES-1",
-    title: "Implement authentication",
-    description: "Add JWT auth to the backend",
-    status: "in_progress",
-    priority: "high",
-    assignee_type: "member",
-    assignee_id: "user-1",
-    creator_type: "member",
-    creator_id: "user-1",
-    parent_issue_id: null,
-    position: 0,
-    due_date: "2026-06-01T00:00:00Z",
-    created_at: "2026-01-15T00:00:00Z",
-    updated_at: "2026-01-20T00:00:00Z",
-  },
-]);
+// Mock issue store — only client state remains (activeIssueId)
 vi.mock("@/features/issues", () => ({
   useIssueStore: Object.assign(
-    (selector: (s: any) => any) => selector({ issues: stableStoreIssues }),
-    { getState: () => ({ issues: stableStoreIssues, addIssue: vi.fn(), updateIssue: vi.fn(), removeIssue: vi.fn() }) },
+    (selector: (s: any) => any) => selector({ activeIssueId: null }),
+    { getState: () => ({ activeIssueId: null, setActiveIssue: vi.fn() }) },
   ),
 }));
 
@@ -235,14 +213,26 @@ const mockTimeline: TimelineEntry[] = [
 
 import IssueDetailPage from "./page";
 
+function createTestQueryClient() {
+  return new QueryClient({
+    defaultOptions: {
+      queries: { retry: false, gcTime: 0 },
+      mutations: { retry: false },
+    },
+  });
+}
+
 // React 19 use(Promise) needs the promise to resolve within act + Suspense
 async function renderPage(id = "issue-1") {
+  const queryClient = createTestQueryClient();
   let result: ReturnType<typeof render>;
   await act(async () => {
     result = render(
-      <Suspense fallback={<div>Suspense loading...</div>}>
-        <IssueDetailPage params={Promise.resolve({ id })} />
-      </Suspense>,
+      <QueryClientProvider client={queryClient}>
+        <Suspense fallback={<div>Suspense loading...</div>}>
+          <IssueDetailPage params={Promise.resolve({ id })} />
+        </Suspense>
+      </QueryClientProvider>,
     );
   });
   return result!;

apps/web/app/(dashboard)/issues/page.test.tsx

@@ -1,6 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import type { Issue } from "@/shared/types";
 
 // Mock next/navigation
@@ -61,36 +62,28 @@ vi.mock("sonner", () => ({
 
 // Mock api
 const mockUpdateIssue = vi.fn();
+const mockListIssues = vi.hoisted(() => vi.fn().mockResolvedValue({ issues: [], total: 0 }));
 
 vi.mock("@/shared/api", () => ({
   api: {
-    listIssues: vi.fn().mockResolvedValue({ issues: [], total: 0 }),
+    listIssues: (...args: any[]) => mockListIssues(...args),
     updateIssue: (...args: any[]) => mockUpdateIssue(...args),
   },
 }));
 
-// Mock the issue store
-let mockStoreState: {
-  issues: Issue[];
-  loading: boolean;
-  fetch: () => Promise<void>;
-  setIssues: (issues: Issue[]) => void;
-  addIssue: (issue: Issue) => void;
-  updateIssue: (id: string, updates: Partial<Issue>) => void;
-  removeIssue: (id: string) => void;
-};
-
+// Mock issue store — only client state remains
+const mockIssueClientState = { activeIssueId: null, setActiveIssue: vi.fn() };
 vi.mock("@/features/issues/store", () => ({
   useIssueStore: Object.assign(
-    (selector?: any) => (selector ? selector(mockStoreState) : mockStoreState),
-    { getState: () => mockStoreState },
+    (selector?: any) => (selector ? selector(mockIssueClientState) : mockIssueClientState),
+    { getState: () => mockIssueClientState },
   ),
 }));
 
 vi.mock("@/features/issues", () => ({
   useIssueStore: Object.assign(
-    (selector?: any) => (selector ? selector(mockStoreState) : mockStoreState),
-    { getState: () => mockStoreState },
+    (selector?: any) => (selector ? selector(mockIssueClientState) : mockIssueClientState),
+    { getState: () => mockIssueClientState },
   ),
   StatusIcon: () => null,
   PriorityIcon: () => null,
@@ -282,90 +275,80 @@ const mockIssues: Issue[] = [
 
 import IssuesPage from "./page";
 
+function renderWithQuery(ui: React.ReactElement) {
+  const qc = new QueryClient({ defaultOptions: { queries: { retry: false, gcTime: 0 }, mutations: { retry: false } } });
+  return render(<QueryClientProvider client={qc}>{ui}</QueryClientProvider>);
+}
+
 describe("IssuesPage", () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    mockStoreState = {
-      issues: [],
-      loading: true,
-      fetch: vi.fn(),
-      setIssues: vi.fn(),
-      addIssue: vi.fn(),
-      updateIssue: vi.fn(),
-      removeIssue: vi.fn(),
-    };
+    mockListIssues.mockResolvedValue({ issues: [], total: 0 });
     mockViewState.viewMode = "board";
     mockViewState.statusFilters = [];
     mockViewState.priorityFilters = [];
   });
 
   it("shows loading state initially", () => {
-    mockStoreState.loading = true;
-    mockStoreState.issues = [];
-    render(<IssuesPage />);
+    renderWithQuery(<IssuesPage />);
     expect(screen.getAllByRole("generic").some(el => el.getAttribute("data-slot") === "skeleton")).toBe(true);
   });
 
   it("renders issues in board view after loading", async () => {
-    mockStoreState.loading = false;
-    mockStoreState.issues = mockIssues;
+    // issueListOptions makes 2 calls: open_only + closed page. Return issues for open, empty for closed.
+    mockListIssues.mockImplementation((params: any) =>
+      Promise.resolve(params?.open_only ? { issues: mockIssues, total: mockIssues.length } : { issues: [], total: 0 }),
+    );
 
-    render(<IssuesPage />);
+    renderWithQuery(<IssuesPage />);
 
-    expect(screen.getByText("Implement auth")).toBeInTheDocument();
+    await screen.findByText("Implement auth");
     expect(screen.getByText("Design landing page")).toBeInTheDocument();
     expect(screen.getByText("Write tests")).toBeInTheDocument();
   });
 
   it("renders board columns", async () => {
-    mockStoreState.loading = false;
-    mockStoreState.issues = mockIssues;
+    mockListIssues.mockImplementation((params: any) =>
+      Promise.resolve(params?.open_only ? { issues: mockIssues, total: mockIssues.length } : { issues: [], total: 0 }),
+    );
 
-    render(<IssuesPage />);
+    renderWithQuery(<IssuesPage />);
 
-    expect(screen.getAllByText("Backlog").length).toBeGreaterThanOrEqual(1);
+    await screen.findByText("Backlog");
     expect(screen.getAllByText("Todo").length).toBeGreaterThanOrEqual(1);
     expect(screen.getAllByText("In Progress").length).toBeGreaterThanOrEqual(1);
     expect(screen.getAllByText("In Review").length).toBeGreaterThanOrEqual(1);
     expect(screen.getAllByText("Done").length).toBeGreaterThanOrEqual(1);
   });
 
-  it("shows workspace breadcrumb", () => {
-    mockStoreState.loading = false;
-    mockStoreState.issues = [];
+  it("shows workspace breadcrumb", async () => {
+    renderWithQuery(<IssuesPage />);
 
-    render(<IssuesPage />);
-
-    expect(screen.getByText("Issues")).toBeInTheDocument();
+    await screen.findByText("Issues");
   });
 
-  it("shows scope buttons", () => {
-    mockStoreState.loading = false;
-    mockStoreState.issues = [];
+  it("shows scope buttons", async () => {
+    renderWithQuery(<IssuesPage />);
 
-    render(<IssuesPage />);
-
-    expect(screen.getByText("All")).toBeInTheDocument();
+    await screen.findByText("All");
     expect(screen.getByText("Members")).toBeInTheDocument();
     expect(screen.getByText("Agents")).toBeInTheDocument();
   });
 
-  it("shows filter and display icon buttons", () => {
-    mockStoreState.loading = false;
-    mockStoreState.issues = mockIssues;
+  it("shows filter and display icon buttons", async () => {
+    mockListIssues.mockImplementation((params: any) =>
+      Promise.resolve(params?.open_only ? { issues: mockIssues, total: mockIssues.length } : { issues: [], total: 0 }),
+    );
 
-    render(<IssuesPage />);
+    renderWithQuery(<IssuesPage />);
 
-    // Filter and Display are now icon-only buttons, verify they render as buttons
+    await screen.findByText("Implement auth");
     const buttons = screen.getAllByRole("button");
     expect(buttons.length).toBeGreaterThan(0);
   });
 
   it("shows empty board view when no issues exist", () => {
-    mockStoreState.loading = false;
-    mockStoreState.issues = [];
-
-    render(<IssuesPage />);
+    renderWithQuery(<IssuesPage />);
 
     // Should still render the board/list view, not a "no issues" message
     expect(screen.queryByText("No matching issues")).not.toBeInTheDocument();

apps/web/app/(dashboard)/settings/_components/members-tab.tsx

@@ -36,8 +36,11 @@ import {
   DropdownMenuSubContent,
 } from "@/components/ui/dropdown-menu";
 import { toast } from "sonner";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useAuthStore } from "@/features/auth";
 import { useWorkspaceStore } from "@/features/workspace";
+import { useWorkspaceId } from "@core/hooks";
+import { memberListOptions, workspaceKeys } from "@core/workspace/queries";
 import { api } from "@/shared/api";
 
 const roleConfig: Record<MemberRole, { label: string; icon: typeof Crown; description: string }> = {
@@ -140,8 +143,9 @@ function MemberRow({
 export function MembersTab() {
   const user = useAuthStore((s) => s.user);
   const workspace = useWorkspaceStore((s) => s.workspace);
-  const members = useWorkspaceStore((s) => s.members);
-  const refreshMembers = useWorkspaceStore((s) => s.refreshMembers);
+  const qc = useQueryClient();
+  const wsId = useWorkspaceId();
+  const { data: members = [] } = useQuery(memberListOptions(wsId));
 
   const [inviteEmail, setInviteEmail] = useState("");
   const [inviteRole, setInviteRole] = useState<MemberRole>("member");
@@ -168,7 +172,7 @@ export function MembersTab() {
       });
       setInviteEmail("");
       setInviteRole("member");
-      await refreshMembers();
+      qc.invalidateQueries({ queryKey: workspaceKeys.members(wsId) });
       toast.success("Member added");
     } catch (e) {
       toast.error(e instanceof Error ? e.message : "Failed to add member");
@@ -182,7 +186,7 @@ export function MembersTab() {
     setMemberActionId(memberId);
     try {
       await api.updateMember(workspace.id, memberId, { role });
-      await refreshMembers();
+      qc.invalidateQueries({ queryKey: workspaceKeys.members(wsId) });
       toast.success("Role updated");
     } catch (e) {
       toast.error(e instanceof Error ? e.message : "Failed to update member");
@@ -201,7 +205,7 @@ export function MembersTab() {
         setMemberActionId(member.id);
         try {
           await api.deleteMember(workspace.id, member.id);
-          await refreshMembers();
+          qc.invalidateQueries({ queryKey: workspaceKeys.members(wsId) });
           toast.success("Member removed");
         } catch (e) {
           toast.error(e instanceof Error ? e.message : "Failed to remove member");

apps/web/app/(dashboard)/settings/_components/repositories-tab.tsx

@@ -6,15 +6,19 @@ import { Input } from "@/components/ui/input";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
 import { toast } from "sonner";
+import { useQuery } from "@tanstack/react-query";
 import { useAuthStore } from "@/features/auth";
 import { useWorkspaceStore } from "@/features/workspace";
+import { useWorkspaceId } from "@core/hooks";
+import { memberListOptions } from "@core/workspace/queries";
 import { api } from "@/shared/api";
 import type { WorkspaceRepo } from "@/shared/types";
 
 export function RepositoriesTab() {
   const user = useAuthStore((s) => s.user);
   const workspace = useWorkspaceStore((s) => s.workspace);
-  const members = useWorkspaceStore((s) => s.members);
+  const wsId = useWorkspaceId();
+  const { data: members = [] } = useQuery(memberListOptions(wsId));
   const updateWorkspace = useWorkspaceStore((s) => s.updateWorkspace);
 
   const [repos, setRepos] = useState<WorkspaceRepo[]>(workspace?.repos ?? []);

apps/web/app/(dashboard)/settings/_components/workspace-tab.tsx

@@ -18,14 +18,18 @@ import {
   AlertDialogAction,
 } from "@/components/ui/alert-dialog";
 import { toast } from "sonner";
+import { useQuery } from "@tanstack/react-query";
 import { useAuthStore } from "@/features/auth";
 import { useWorkspaceStore } from "@/features/workspace";
+import { useWorkspaceId } from "@core/hooks";
+import { memberListOptions } from "@core/workspace/queries";
 import { api } from "@/shared/api";
 
 export function WorkspaceTab() {
   const user = useAuthStore((s) => s.user);
   const workspace = useWorkspaceStore((s) => s.workspace);
-  const members = useWorkspaceStore((s) => s.members);
+  const wsId = useWorkspaceId();
+  const { data: members = [] } = useQuery(memberListOptions(wsId));
   const updateWorkspace = useWorkspaceStore((s) => s.updateWorkspace);
   const leaveWorkspace = useWorkspaceStore((s) => s.leaveWorkspace);
   const deleteWorkspace = useWorkspaceStore((s) => s.deleteWorkspace);

apps/web/app/auth/callback/page.tsx

@@ -0,0 +1,90 @@
+"use client";
+
+import { Suspense, useEffect, useState } from "react";
+import { useSearchParams, useRouter } from "next/navigation";
+import { useAuthStore } from "@/features/auth";
+import { useWorkspaceStore } from "@/features/workspace";
+import { api } from "@/shared/api";
+import {
+  Card,
+  CardHeader,
+  CardTitle,
+  CardDescription,
+  CardContent,
+} from "@/components/ui/card";
+import { Loader2 } from "lucide-react";
+
+function CallbackContent() {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const loginWithGoogle = useAuthStore((s) => s.loginWithGoogle);
+  const hydrateWorkspace = useWorkspaceStore((s) => s.hydrateWorkspace);
+  const [error, setError] = useState("");
+
+  useEffect(() => {
+    const code = searchParams.get("code");
+    if (!code) {
+      setError("Missing authorization code");
+      return;
+    }
+
+    const errorParam = searchParams.get("error");
+    if (errorParam) {
+      setError(errorParam === "access_denied" ? "Access denied" : errorParam);
+      return;
+    }
+
+    const redirectUri = `${window.location.origin}/auth/callback`;
+
+    loginWithGoogle(code, redirectUri)
+      .then(async () => {
+        const wsList = await api.listWorkspaces();
+        const lastWsId = localStorage.getItem("multica_workspace_id");
+        await hydrateWorkspace(wsList, lastWsId);
+        router.push("/issues");
+      })
+      .catch((err) => {
+        setError(err instanceof Error ? err.message : "Login failed");
+      });
+  }, [searchParams, loginWithGoogle, hydrateWorkspace, router]);
+
+  if (error) {
+    return (
+      <div className="flex min-h-screen items-center justify-center">
+        <Card className="w-full max-w-sm">
+          <CardHeader className="text-center">
+            <CardTitle className="text-2xl">Login Failed</CardTitle>
+            <CardDescription>{error}</CardDescription>
+          </CardHeader>
+          <CardContent className="flex justify-center">
+            <a href="/login" className="text-primary underline-offset-4 hover:underline">
+              Back to login
+            </a>
+          </CardContent>
+        </Card>
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex min-h-screen items-center justify-center">
+      <Card className="w-full max-w-sm">
+        <CardHeader className="text-center">
+          <CardTitle className="text-2xl">Signing in...</CardTitle>
+          <CardDescription>Please wait while we complete your login</CardDescription>
+        </CardHeader>
+        <CardContent className="flex justify-center">
+          <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
+        </CardContent>
+      </Card>
+    </div>
+  );
+}
+
+export default function CallbackPage() {
+  return (
+    <Suspense fallback={null}>
+      <CallbackContent />
+    </Suspense>
+  );
+}

apps/web/app/layout.tsx

@@ -4,6 +4,7 @@ import { Geist, Geist_Mono } from "next/font/google";
 import { ThemeProvider } from "@/components/theme-provider";
 import { Toaster } from "@/components/ui/sonner";
 import { cn } from "@/lib/utils";
+import { QueryProvider } from "@core/provider";
 import { AuthInitializer } from "@/features/auth";
 import { WSProvider } from "@/features/realtime";
 import { ModalRegistry } from "@/features/modals";
@@ -67,11 +68,13 @@ export default async function RootLayout({
     >
       <body className="h-full overflow-hidden">
         <ThemeProvider>
-          <AuthInitializer>
-            <WSProvider>{children}</WSProvider>
-          </AuthInitializer>
-          <ModalRegistry />
-          <Toaster />
+          <QueryProvider>
+            <AuthInitializer>
+              <WSProvider>{children}</WSProvider>
+            </AuthInitializer>
+            <ModalRegistry />
+            <Toaster />
+          </QueryProvider>
         </ThemeProvider>
       </body>
     </html>

apps/web/components/common/mention-hover-card.tsx

@@ -2,9 +2,11 @@
 
 import type { ReactNode } from "react";
 import { Users } from "lucide-react";
+import { useQuery } from "@tanstack/react-query";
 import { HoverCard, HoverCardTrigger, HoverCardContent } from "@/components/ui/hover-card";
 import { ActorAvatar } from "@/components/common/actor-avatar";
-import { useWorkspaceStore } from "@/features/workspace";
+import { useWorkspaceId } from "@core/hooks";
+import { memberListOptions, agentListOptions } from "@core/workspace/queries";
 
 interface MentionHoverCardProps {
   type: string;
@@ -13,8 +15,9 @@ interface MentionHoverCardProps {
 }
 
 function MentionHoverCard({ type, id, children }: MentionHoverCardProps) {
-  const members = useWorkspaceStore((s) => s.members);
-  const agents = useWorkspaceStore((s) => s.agents);
+  const wsId = useWorkspaceId();
+  const { data: members = [] } = useQuery(memberListOptions(wsId));
+  const { data: agents = [] } = useQuery(agentListOptions(wsId));
 
   if (type === "all") {
     return (

apps/web/core/hooks.ts

@@ -0,0 +1,17 @@
+"use client";
+
+import { useWorkspaceStore } from "@/features/workspace";
+
+/**
+ * Returns the current workspace ID.
+ *
+ * Bridge hook: reads from Zustand workspace store now.
+ * Phase 3 will switch to core/workspace/store.ts — signature stays the same.
+ */
+export function useWorkspaceId(): string {
+  const workspaceId = useWorkspaceStore((s) => s.workspace?.id);
+  if (!workspaceId) {
+    throw new Error("useWorkspaceId: no workspace selected");
+  }
+  return workspaceId;
+}

apps/web/core/inbox/index.ts

@@ -0,0 +1,16 @@
+export {
+  inboxKeys,
+  inboxListOptions,
+  deduplicateInboxItems,
+} from "./queries";
+
+export {
+  useMarkInboxRead,
+  useArchiveInbox,
+  useMarkAllInboxRead,
+  useArchiveAllInbox,
+  useArchiveAllReadInbox,
+  useArchiveCompletedInbox,
+} from "./mutations";
+
+export { onInboxNew, onInboxInvalidate, onInboxIssueStatusChanged } from "./ws-updaters";

apps/web/core/inbox/mutations.ts

@@ -0,0 +1,113 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { api } from "@/shared/api";
+import { inboxKeys } from "./queries";
+import { useWorkspaceId } from "@core/hooks";
+import type { InboxItem } from "@/shared/types";
+
+export function useMarkInboxRead() {
+  const qc = useQueryClient();
+  const wsId = useWorkspaceId();
+  return useMutation({
+    mutationFn: (id: string) => api.markInboxRead(id),
+    onMutate: async (id) => {
+      await qc.cancelQueries({ queryKey: inboxKeys.list(wsId) });
+      const prev = qc.getQueryData<InboxItem[]>(inboxKeys.list(wsId));
+      qc.setQueryData<InboxItem[]>(inboxKeys.list(wsId), (old) =>
+        old?.map((item) => (item.id === id ? { ...item, read: true } : item)),
+      );
+      return { prev };
+    },
+    onError: (_err, _id, ctx) => {
+      if (ctx?.prev) qc.setQueryData(inboxKeys.list(wsId), ctx.prev);
+    },
+    onSettled: () => {
+      qc.invalidateQueries({ queryKey: inboxKeys.list(wsId) });
+    },
+  });
+}
+
+export function useArchiveInbox() {
+  const qc = useQueryClient();
+  const wsId = useWorkspaceId();
+  return useMutation({
+    mutationFn: (id: string) => api.archiveInbox(id),
+    onMutate: async (id) => {
+      await qc.cancelQueries({ queryKey: inboxKeys.list(wsId) });
+      const prev = qc.getQueryData<InboxItem[]>(inboxKeys.list(wsId));
+      // Archive all items for the same issue (same behavior as store)
+      const target = prev?.find((i) => i.id === id);
+      const issueId = target?.issue_id;
+      qc.setQueryData<InboxItem[]>(inboxKeys.list(wsId), (old) =>
+        old?.map((item) =>
+          item.id === id || (issueId && item.issue_id === issueId)
+            ? { ...item, archived: true }
+            : item,
+        ),
+      );
+      return { prev };
+    },
+    onError: (_err, _id, ctx) => {
+      if (ctx?.prev) qc.setQueryData(inboxKeys.list(wsId), ctx.prev);
+    },
+    onSettled: () => {
+      qc.invalidateQueries({ queryKey: inboxKeys.list(wsId) });
+    },
+  });
+}
+
+export function useMarkAllInboxRead() {
+  const qc = useQueryClient();
+  const wsId = useWorkspaceId();
+  return useMutation({
+    mutationFn: () => api.markAllInboxRead(),
+    onMutate: async () => {
+      await qc.cancelQueries({ queryKey: inboxKeys.list(wsId) });
+      const prev = qc.getQueryData<InboxItem[]>(inboxKeys.list(wsId));
+      qc.setQueryData<InboxItem[]>(inboxKeys.list(wsId), (old) =>
+        old?.map((item) =>
+          !item.archived ? { ...item, read: true } : item,
+        ),
+      );
+      return { prev };
+    },
+    onError: (_err, _vars, ctx) => {
+      if (ctx?.prev) qc.setQueryData(inboxKeys.list(wsId), ctx.prev);
+    },
+    onSettled: () => {
+      qc.invalidateQueries({ queryKey: inboxKeys.list(wsId) });
+    },
+  });
+}
+
+export function useArchiveAllInbox() {
+  const qc = useQueryClient();
+  const wsId = useWorkspaceId();
+  return useMutation({
+    mutationFn: () => api.archiveAllInbox(),
+    onSettled: () => {
+      qc.invalidateQueries({ queryKey: inboxKeys.list(wsId) });
+    },
+  });
+}
+
+export function useArchiveAllReadInbox() {
+  const qc = useQueryClient();
+  const wsId = useWorkspaceId();
+  return useMutation({
+    mutationFn: () => api.archiveAllReadInbox(),
+    onSettled: () => {
+      qc.invalidateQueries({ queryKey: inboxKeys.list(wsId) });
+    },
+  });
+}
+
+export function useArchiveCompletedInbox() {
+  const qc = useQueryClient();
+  const wsId = useWorkspaceId();
+  return useMutation({
+    mutationFn: () => api.archiveCompletedInbox(),
+    onSettled: () => {
+      qc.invalidateQueries({ queryKey: inboxKeys.list(wsId) });
+    },
+  });
+}

apps/web/core/inbox/queries.ts

@@ -0,0 +1,43 @@
+import { queryOptions } from "@tanstack/react-query";
+import { api } from "@/shared/api";
+import type { InboxItem } from "@/shared/types";
+
+export const inboxKeys = {
+  all: (wsId: string) => ["inbox", wsId] as const,
+  list: (wsId: string) => [...inboxKeys.all(wsId), "list"] as const,
+};
+
+export function inboxListOptions(wsId: string) {
+  return queryOptions({
+    queryKey: inboxKeys.list(wsId),
+    queryFn: () => api.listInbox(),
+  });
+}
+
+/**
+ * Deduplicate inbox items by issue_id (one entry per issue, Linear-style).
+ * Exported for consumers to use in useMemo — not in queryOptions select
+ * (to avoid new array references on every cache update).
+ */
+export function deduplicateInboxItems(items: InboxItem[]): InboxItem[] {
+  const active = items.filter((i) => !i.archived);
+  const groups = new Map<string, InboxItem[]>();
+  for (const item of active) {
+    const key = item.issue_id ?? item.id;
+    const group = groups.get(key) ?? [];
+    group.push(item);
+    groups.set(key, group);
+  }
+  const merged: InboxItem[] = [];
+  for (const group of groups.values()) {
+    group.sort(
+      (a, b) =>
+        new Date(b.created_at).getTime() - new Date(a.created_at).getTime(),
+    );
+    if (group[0]) merged.push(group[0]);
+  }
+  return merged.sort(
+    (a, b) =>
+      new Date(b.created_at).getTime() - new Date(a.created_at).getTime(),
+  );
+}

apps/web/core/inbox/ws-updaters.ts

@@ -0,0 +1,30 @@
+import type { QueryClient } from "@tanstack/react-query";
+import { inboxKeys } from "./queries";
+import type { InboxItem, IssueStatus } from "@/shared/types";
+
+export function onInboxNew(
+  qc: QueryClient,
+  wsId: string,
+  _item: InboxItem,
+) {
+  // Use invalidateQueries instead of setQueryData — triggers a refetch that
+  // reliably notifies all observers. The inbox list is small so this is cheap.
+  qc.invalidateQueries({ queryKey: inboxKeys.list(wsId) });
+}
+
+export function onInboxIssueStatusChanged(
+  qc: QueryClient,
+  wsId: string,
+  issueId: string,
+  status: IssueStatus,
+) {
+  qc.setQueryData<InboxItem[]>(inboxKeys.list(wsId), (old) =>
+    old?.map((i) =>
+      i.issue_id === issueId ? { ...i, issue_status: status } : i,
+    ),
+  );
+}
+
+export function onInboxInvalidate(qc: QueryClient, wsId: string) {
+  qc.invalidateQueries({ queryKey: inboxKeys.list(wsId) });
+}

apps/web/core/index.ts

@@ -0,0 +1,3 @@
+export { createQueryClient } from "./query-client";
+export { QueryProvider } from "./provider";
+export { useWorkspaceId } from "./hooks";

apps/web/core/issues/index.ts

@@ -0,0 +1,28 @@
+export {
+  issueKeys,
+  issueListOptions,
+  issueDetailOptions,
+  issueTimelineOptions,
+  issueReactionsOptions,
+  issueSubscribersOptions,
+} from "./queries";
+
+export {
+  useCreateIssue,
+  useUpdateIssue,
+  useDeleteIssue,
+  useBatchUpdateIssues,
+  useBatchDeleteIssues,
+  useCreateComment,
+  useUpdateComment,
+  useDeleteComment,
+  useToggleCommentReaction,
+  useToggleIssueReaction,
+  useToggleIssueSubscriber,
+} from "./mutations";
+
+export {
+  onIssueCreated,
+  onIssueUpdated,
+  onIssueDeleted,
+} from "./ws-updaters";

apps/web/core/issues/mutations.ts

@@ -0,0 +1,500 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { api } from "@/shared/api";
+import { issueKeys } from "./queries";
+import { useWorkspaceId } from "@core/hooks";
+import type { Issue, IssueReaction } from "@/shared/types";
+import type {
+  CreateIssueRequest,
+  UpdateIssueRequest,
+  ListIssuesResponse,
+} from "@/shared/types";
+import type { TimelineEntry, IssueSubscriber, Reaction } from "@/shared/types";
+
+// ---------------------------------------------------------------------------
+// Issue CRUD
+// ---------------------------------------------------------------------------
+
+export function useCreateIssue() {
+  const qc = useQueryClient();
+  const wsId = useWorkspaceId();
+  return useMutation({
+    mutationFn: (data: CreateIssueRequest) => api.createIssue(data),
+    onSuccess: (newIssue) => {
+      qc.setQueryData<ListIssuesResponse>(issueKeys.list(wsId), (old) =>
+        old
+          ? { ...old, issues: [...old.issues, newIssue], total: old.total + 1 }
+          : old,
+      );
+    },
+  });
+}
+
+export function useUpdateIssue() {
+  const qc = useQueryClient();
+  const wsId = useWorkspaceId();
+  return useMutation({
+    mutationFn: ({ id, ...data }: { id: string } & UpdateIssueRequest) =>
+      api.updateIssue(id, data),
+    onMutate: ({ id, ...data }) => {
+      // Fire-and-forget cancelQueries — keeps onMutate synchronous so the
+      // cache update happens in the same tick as mutate(). Awaiting would
+      // yield to the event loop, letting @dnd-kit reset its visual state
+      // before the optimistic update lands.
+      qc.cancelQueries({ queryKey: issueKeys.list(wsId) });
+      const prevList = qc.getQueryData<ListIssuesResponse>(issueKeys.list(wsId));
+      const prevDetail = qc.getQueryData<Issue>(issueKeys.detail(wsId, id));
+
+      qc.setQueryData<ListIssuesResponse>(issueKeys.list(wsId), (old) =>
+        old
+          ? {
+              ...old,
+              issues: old.issues.map((i) =>
+                i.id === id ? { ...i, ...data } : i,
+              ),
+            }
+          : old,
+      );
+      qc.setQueryData<Issue>(issueKeys.detail(wsId, id), (old) =>
+        old ? { ...old, ...data } : old,
+      );
+      return { prevList, prevDetail, id };
+    },
+    onError: (_err, _vars, ctx) => {
+      if (ctx?.prevList) qc.setQueryData(issueKeys.list(wsId), ctx.prevList);
+      if (ctx?.prevDetail)
+        qc.setQueryData(issueKeys.detail(wsId, ctx.id), ctx.prevDetail);
+    },
+    onSettled: (_data, _err, vars) => {
+      qc.invalidateQueries({ queryKey: issueKeys.detail(wsId, vars.id) });
+      qc.invalidateQueries({ queryKey: issueKeys.list(wsId) });
+    },
+  });
+}
+
+export function useDeleteIssue() {
+  const qc = useQueryClient();
+  const wsId = useWorkspaceId();
+  return useMutation({
+    mutationFn: (id: string) => api.deleteIssue(id),
+    onMutate: async (id) => {
+      await qc.cancelQueries({ queryKey: issueKeys.list(wsId) });
+      const prevList = qc.getQueryData<ListIssuesResponse>(issueKeys.list(wsId));
+      qc.setQueryData<ListIssuesResponse>(issueKeys.list(wsId), (old) =>
+        old
+          ? {
+              ...old,
+              issues: old.issues.filter((i) => i.id !== id),
+              total: old.total - 1,
+            }
+          : old,
+      );
+      qc.removeQueries({ queryKey: issueKeys.detail(wsId, id) });
+      return { prevList };
+    },
+    onError: (_err, _id, ctx) => {
+      if (ctx?.prevList) qc.setQueryData(issueKeys.list(wsId), ctx.prevList);
+    },
+    onSettled: () => {
+      qc.invalidateQueries({ queryKey: issueKeys.list(wsId) });
+    },
+  });
+}
+
+export function useBatchUpdateIssues() {
+  const qc = useQueryClient();
+  const wsId = useWorkspaceId();
+  return useMutation({
+    mutationFn: ({
+      ids,
+      updates,
+    }: {
+      ids: string[];
+      updates: UpdateIssueRequest;
+    }) => api.batchUpdateIssues(ids, updates),
+    onMutate: async ({ ids, updates }) => {
+      await qc.cancelQueries({ queryKey: issueKeys.list(wsId) });
+      const prevList = qc.getQueryData<ListIssuesResponse>(issueKeys.list(wsId));
+      qc.setQueryData<ListIssuesResponse>(issueKeys.list(wsId), (old) =>
+        old
+          ? {
+              ...old,
+              issues: old.issues.map((i) =>
+                ids.includes(i.id) ? { ...i, ...updates } : i,
+              ),
+            }
+          : old,
+      );
+      return { prevList };
+    },
+    onError: (_err, _vars, ctx) => {
+      if (ctx?.prevList) qc.setQueryData(issueKeys.list(wsId), ctx.prevList);
+    },
+    onSettled: () => {
+      qc.invalidateQueries({ queryKey: issueKeys.list(wsId) });
+    },
+  });
+}
+
+export function useBatchDeleteIssues() {
+  const qc = useQueryClient();
+  const wsId = useWorkspaceId();
+  return useMutation({
+    mutationFn: (ids: string[]) => api.batchDeleteIssues(ids),
+    onMutate: async (ids) => {
+      await qc.cancelQueries({ queryKey: issueKeys.list(wsId) });
+      const prevList = qc.getQueryData<ListIssuesResponse>(issueKeys.list(wsId));
+      qc.setQueryData<ListIssuesResponse>(issueKeys.list(wsId), (old) =>
+        old
+          ? {
+              ...old,
+              issues: old.issues.filter((i) => !ids.includes(i.id)),
+              total: old.total - ids.length,
+            }
+          : old,
+      );
+      return { prevList };
+    },
+    onError: (_err, _ids, ctx) => {
+      if (ctx?.prevList) qc.setQueryData(issueKeys.list(wsId), ctx.prevList);
+    },
+    onSettled: () => {
+      qc.invalidateQueries({ queryKey: issueKeys.list(wsId) });
+    },
+  });
+}
+
+// ---------------------------------------------------------------------------
+// Comments / Timeline
+// ---------------------------------------------------------------------------
+
+export function useCreateComment(issueId: string) {
+  const qc = useQueryClient();
+  return useMutation({
+    mutationFn: ({
+      content,
+      type,
+      parentId,
+      attachmentIds,
+    }: {
+      content: string;
+      type?: string;
+      parentId?: string;
+      attachmentIds?: string[];
+    }) => api.createComment(issueId, content, type, parentId, attachmentIds),
+    onSuccess: (comment) => {
+      qc.setQueryData<TimelineEntry[]>(
+        issueKeys.timeline(issueId),
+        (old) => {
+          if (!old) return old;
+          const entry: TimelineEntry = {
+            type: "comment",
+            id: comment.id,
+            actor_type: comment.author_type,
+            actor_id: comment.author_id,
+            content: comment.content,
+            parent_id: comment.parent_id,
+            comment_type: comment.type,
+            reactions: comment.reactions ?? [],
+            attachments: comment.attachments ?? [],
+            created_at: comment.created_at,
+            updated_at: comment.updated_at,
+          };
+          if (old.some((e) => e.id === comment.id)) return old;
+          return [...old, entry];
+        },
+      );
+    },
+  });
+}
+
+export function useUpdateComment(issueId: string) {
+  const qc = useQueryClient();
+  return useMutation({
+    mutationFn: ({ commentId, content }: { commentId: string; content: string }) =>
+      api.updateComment(commentId, content),
+    onMutate: async ({ commentId, content }) => {
+      await qc.cancelQueries({ queryKey: issueKeys.timeline(issueId) });
+      const prev = qc.getQueryData<TimelineEntry[]>(issueKeys.timeline(issueId));
+      qc.setQueryData<TimelineEntry[]>(
+        issueKeys.timeline(issueId),
+        (old) =>
+          old?.map((e) => (e.id === commentId ? { ...e, content } : e)),
+      );
+      return { prev };
+    },
+    onError: (_err, _vars, ctx) => {
+      if (ctx?.prev)
+        qc.setQueryData(issueKeys.timeline(issueId), ctx.prev);
+    },
+    onSettled: () => {
+      qc.invalidateQueries({ queryKey: issueKeys.timeline(issueId) });
+    },
+  });
+}
+
+export function useDeleteComment(issueId: string) {
+  const qc = useQueryClient();
+  return useMutation({
+    mutationFn: (commentId: string) => api.deleteComment(commentId),
+    onMutate: async (commentId) => {
+      await qc.cancelQueries({ queryKey: issueKeys.timeline(issueId) });
+      const prev = qc.getQueryData<TimelineEntry[]>(issueKeys.timeline(issueId));
+
+      // Cascade: collect all child comment IDs
+      const toRemove = new Set<string>([commentId]);
+      if (prev) {
+        let changed = true;
+        while (changed) {
+          changed = false;
+          for (const e of prev) {
+            if (e.parent_id && toRemove.has(e.parent_id) && !toRemove.has(e.id)) {
+              toRemove.add(e.id);
+              changed = true;
+            }
+          }
+        }
+      }
+
+      qc.setQueryData<TimelineEntry[]>(
+        issueKeys.timeline(issueId),
+        (old) => old?.filter((e) => !toRemove.has(e.id)),
+      );
+      return { prev };
+    },
+    onError: (_err, _id, ctx) => {
+      if (ctx?.prev)
+        qc.setQueryData(issueKeys.timeline(issueId), ctx.prev);
+    },
+    onSettled: () => {
+      qc.invalidateQueries({ queryKey: issueKeys.timeline(issueId) });
+    },
+  });
+}
+
+export function useToggleCommentReaction(issueId: string) {
+  const qc = useQueryClient();
+  return useMutation({
+    mutationFn: async ({
+      commentId,
+      emoji,
+      existing,
+    }: {
+      commentId: string;
+      emoji: string;
+      existing: Reaction | undefined;
+    }) => {
+      if (existing) {
+        await api.removeReaction(commentId, emoji);
+        return null;
+      }
+      return api.addReaction(commentId, emoji);
+    },
+    onMutate: async ({ commentId, emoji, existing }) => {
+      await qc.cancelQueries({ queryKey: issueKeys.timeline(issueId) });
+      const prev = qc.getQueryData<TimelineEntry[]>(issueKeys.timeline(issueId));
+
+      if (existing) {
+        // Remove
+        qc.setQueryData<TimelineEntry[]>(
+          issueKeys.timeline(issueId),
+          (old) =>
+            old?.map((e) =>
+              e.id === commentId
+                ? {
+                    ...e,
+                    reactions: (e.reactions ?? []).filter(
+                      (r) => r.id !== existing.id,
+                    ),
+                  }
+                : e,
+            ),
+        );
+      } else {
+        // Add temp
+        const tempReaction: Reaction = {
+          id: `temp-${Date.now()}`,
+          comment_id: commentId,
+          actor_type: "",
+          actor_id: "",
+          emoji,
+          created_at: new Date().toISOString(),
+        };
+        qc.setQueryData<TimelineEntry[]>(
+          issueKeys.timeline(issueId),
+          (old) =>
+            old?.map((e) =>
+              e.id === commentId
+                ? { ...e, reactions: [...(e.reactions ?? []), tempReaction] }
+                : e,
+            ),
+        );
+      }
+      return { prev };
+    },
+    onSuccess: (reaction, { commentId }) => {
+      if (reaction) {
+        // Replace temp with real
+        qc.setQueryData<TimelineEntry[]>(
+          issueKeys.timeline(issueId),
+          (old) =>
+            old?.map((e) =>
+              e.id === commentId
+                ? {
+                    ...e,
+                    reactions: (e.reactions ?? []).map((r) =>
+                      r.id.startsWith("temp-") && r.emoji === reaction.emoji
+                        ? reaction
+                        : r,
+                    ),
+                  }
+                : e,
+            ),
+        );
+      }
+    },
+    onError: (_err, _vars, ctx) => {
+      if (ctx?.prev)
+        qc.setQueryData(issueKeys.timeline(issueId), ctx.prev);
+    },
+    onSettled: () => {
+      qc.invalidateQueries({ queryKey: issueKeys.timeline(issueId) });
+    },
+  });
+}
+
+// ---------------------------------------------------------------------------
+// Issue-level Reactions
+// ---------------------------------------------------------------------------
+
+export function useToggleIssueReaction(issueId: string) {
+  const qc = useQueryClient();
+  return useMutation({
+    mutationFn: async ({
+      emoji,
+      existing,
+    }: {
+      emoji: string;
+      existing: IssueReaction | undefined;
+    }) => {
+      if (existing) {
+        await api.removeIssueReaction(issueId, emoji);
+        return null;
+      }
+      return api.addIssueReaction(issueId, emoji);
+    },
+    onMutate: async ({ emoji, existing }) => {
+      await qc.cancelQueries({ queryKey: issueKeys.reactions(issueId) });
+      const prev = qc.getQueryData<IssueReaction[]>(issueKeys.reactions(issueId));
+
+      if (existing) {
+        qc.setQueryData<IssueReaction[]>(
+          issueKeys.reactions(issueId),
+          (old) => old?.filter((r) => r.id !== existing.id),
+        );
+      } else {
+        const temp: IssueReaction = {
+          id: `temp-${Date.now()}`,
+          issue_id: issueId,
+          actor_type: "",
+          actor_id: "",
+          emoji,
+          created_at: new Date().toISOString(),
+        };
+        qc.setQueryData<IssueReaction[]>(
+          issueKeys.reactions(issueId),
+          (old) => [...(old ?? []), temp],
+        );
+      }
+      return { prev };
+    },
+    onSuccess: (reaction) => {
+      if (reaction) {
+        qc.setQueryData<IssueReaction[]>(
+          issueKeys.reactions(issueId),
+          (old) =>
+            old?.map((r) =>
+              r.id.startsWith("temp-") && r.emoji === reaction.emoji
+                ? reaction
+                : r,
+            ),
+        );
+      }
+    },
+    onError: (_err, _vars, ctx) => {
+      if (ctx?.prev)
+        qc.setQueryData(issueKeys.reactions(issueId), ctx.prev);
+    },
+    onSettled: () => {
+      qc.invalidateQueries({ queryKey: issueKeys.reactions(issueId) });
+    },
+  });
+}
+
+// ---------------------------------------------------------------------------
+// Issue Subscribers
+// ---------------------------------------------------------------------------
+
+export function useToggleIssueSubscriber(issueId: string) {
+  const qc = useQueryClient();
+  return useMutation({
+    mutationFn: async ({
+      userId,
+      userType,
+      subscribed,
+    }: {
+      userId: string;
+      userType: "member" | "agent";
+      subscribed: boolean;
+    }) => {
+      if (subscribed) {
+        await api.unsubscribeFromIssue(issueId, userId, userType);
+      } else {
+        await api.subscribeToIssue(issueId, userId, userType);
+      }
+    },
+    onMutate: async ({ userId, userType, subscribed }) => {
+      await qc.cancelQueries({ queryKey: issueKeys.subscribers(issueId) });
+      const prev = qc.getQueryData<IssueSubscriber[]>(
+        issueKeys.subscribers(issueId),
+      );
+
+      if (subscribed) {
+        qc.setQueryData<IssueSubscriber[]>(
+          issueKeys.subscribers(issueId),
+          (old) =>
+            old?.filter(
+              (s) => !(s.user_id === userId && s.user_type === userType),
+            ),
+        );
+      } else {
+        const temp: IssueSubscriber = {
+          issue_id: issueId,
+          user_type: userType,
+          user_id: userId,
+          reason: "manual",
+          created_at: new Date().toISOString(),
+        };
+        qc.setQueryData<IssueSubscriber[]>(
+          issueKeys.subscribers(issueId),
+          (old) => {
+            if (
+              old?.some(
+                (s) => s.user_id === userId && s.user_type === userType,
+              )
+            )
+              return old;
+            return [...(old ?? []), temp];
+          },
+        );
+      }
+      return { prev };
+    },
+    onError: (_err, _vars, ctx) => {
+      if (ctx?.prev)
+        qc.setQueryData(issueKeys.subscribers(issueId), ctx.prev);
+    },
+    onSettled: () => {
+      qc.invalidateQueries({ queryKey: issueKeys.subscribers(issueId) });
+    },
+  });
+}

apps/web/core/issues/queries.ts

@@ -0,0 +1,70 @@
+import { queryOptions } from "@tanstack/react-query";
+import { api } from "@/shared/api";
+
+export const issueKeys = {
+  all: (wsId: string) => ["issues", wsId] as const,
+  list: (wsId: string) => [...issueKeys.all(wsId), "list"] as const,
+  detail: (wsId: string, id: string) =>
+    [...issueKeys.all(wsId), "detail", id] as const,
+  timeline: (issueId: string) => ["issues", "timeline", issueId] as const,
+  reactions: (issueId: string) => ["issues", "reactions", issueId] as const,
+  subscribers: (issueId: string) =>
+    ["issues", "subscribers", issueId] as const,
+};
+
+const CLOSED_PAGE_SIZE = 50;
+
+/**
+ * CACHE SHAPE NOTE: The raw cache stores ListIssuesResponse ({ issues, total }),
+ * but `select` transforms it to Issue[] for consumers. Mutations and ws-updaters
+ * must use setQueryData<ListIssuesResponse>(...) — NOT setQueryData<Issue[]>.
+ *
+ * Fetches all open issues + first page of closed issues (matching main's pagination strategy).
+ */
+export function issueListOptions(wsId: string) {
+  return queryOptions({
+    queryKey: issueKeys.list(wsId),
+    queryFn: async () => {
+      const [openRes, closedRes] = await Promise.all([
+        api.listIssues({ open_only: true }),
+        api.listIssues({ status: "done", limit: CLOSED_PAGE_SIZE, offset: 0 }),
+      ]);
+      return {
+        issues: [...openRes.issues, ...closedRes.issues],
+        total: openRes.total + closedRes.total,
+      };
+    },
+    select: (data) => data.issues,
+  });
+}
+
+export function issueDetailOptions(wsId: string, id: string) {
+  return queryOptions({
+    queryKey: issueKeys.detail(wsId, id),
+    queryFn: () => api.getIssue(id),
+  });
+}
+
+export function issueTimelineOptions(issueId: string) {
+  return queryOptions({
+    queryKey: issueKeys.timeline(issueId),
+    queryFn: () => api.listTimeline(issueId),
+  });
+}
+
+export function issueReactionsOptions(issueId: string) {
+  return queryOptions({
+    queryKey: issueKeys.reactions(issueId),
+    queryFn: async () => {
+      const issue = await api.getIssue(issueId);
+      return issue.reactions ?? [];
+    },
+  });
+}
+
+export function issueSubscribersOptions(issueId: string) {
+  return queryOptions({
+    queryKey: issueKeys.subscribers(issueId),
+    queryFn: () => api.listIssueSubscribers(issueId),
+  });
+}

apps/web/core/issues/ws-updaters.ts

@@ -0,0 +1,56 @@
+import type { QueryClient } from "@tanstack/react-query";
+import { issueKeys } from "./queries";
+import type { Issue } from "@/shared/types";
+import type { ListIssuesResponse } from "@/shared/types";
+
+export function onIssueCreated(
+  qc: QueryClient,
+  wsId: string,
+  issue: Issue,
+) {
+  qc.setQueryData<ListIssuesResponse>(issueKeys.list(wsId), (old) =>
+    old && !old.issues.some((i) => i.id === issue.id)
+      ? { ...old, issues: [...old.issues, issue], total: old.total + 1 }
+      : old,
+  );
+}
+
+export function onIssueUpdated(
+  qc: QueryClient,
+  wsId: string,
+  issue: Partial<Issue> & { id: string },
+) {
+  qc.setQueryData<ListIssuesResponse>(issueKeys.list(wsId), (old) =>
+    old
+      ? {
+          ...old,
+          issues: old.issues.map((i) =>
+            i.id === issue.id ? { ...i, ...issue } : i,
+          ),
+        }
+      : old,
+  );
+  qc.setQueryData<Issue>(issueKeys.detail(wsId, issue.id), (old) =>
+    old ? { ...old, ...issue } : old,
+  );
+}
+
+export function onIssueDeleted(
+  qc: QueryClient,
+  wsId: string,
+  issueId: string,
+) {
+  qc.setQueryData<ListIssuesResponse>(issueKeys.list(wsId), (old) =>
+    old
+      ? {
+          ...old,
+          issues: old.issues.filter((i) => i.id !== issueId),
+          total: old.total - 1,
+        }
+      : old,
+  );
+  qc.removeQueries({ queryKey: issueKeys.detail(wsId, issueId) });
+  qc.removeQueries({ queryKey: issueKeys.timeline(issueId) });
+  qc.removeQueries({ queryKey: issueKeys.reactions(issueId) });
+  qc.removeQueries({ queryKey: issueKeys.subscribers(issueId) });
+}

apps/web/core/provider.tsx

@@ -0,0 +1,17 @@
+"use client";
+
+import { useState } from "react";
+import { QueryClientProvider } from "@tanstack/react-query";
+import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
+import { createQueryClient } from "./query-client";
+import type { ReactNode } from "react";
+
+export function QueryProvider({ children }: { children: ReactNode }) {
+  const [queryClient] = useState(createQueryClient);
+  return (
+    <QueryClientProvider client={queryClient}>
+      {children}
+      <ReactQueryDevtools initialIsOpen={false} />
+    </QueryClientProvider>
+  );
+}

apps/web/core/query-client.ts

@@ -0,0 +1,18 @@
+import { QueryClient } from "@tanstack/react-query";
+
+export function createQueryClient(): QueryClient {
+  return new QueryClient({
+    defaultOptions: {
+      queries: {
+        staleTime: Infinity,
+        gcTime: 10 * 60 * 1000, // 10 minutes
+        refetchOnWindowFocus: false,
+        refetchOnReconnect: true,
+        retry: 1,
+      },
+      mutations: {
+        retry: false,
+      },
+    },
+  });
+}

apps/web/core/runtimes/index.ts

@@ -0,0 +1 @@
+export { runtimeKeys, runtimeListOptions } from "./queries";

apps/web/core/runtimes/queries.ts

@@ -0,0 +1,14 @@
+import { queryOptions } from "@tanstack/react-query";
+import { api } from "@/shared/api";
+
+export const runtimeKeys = {
+  all: (wsId: string) => ["runtimes", wsId] as const,
+  list: (wsId: string) => [...runtimeKeys.all(wsId), "list"] as const,
+};
+
+export function runtimeListOptions(wsId: string) {
+  return queryOptions({
+    queryKey: runtimeKeys.list(wsId),
+    queryFn: () => api.listRuntimes({ workspace_id: wsId }),
+  });
+}

apps/web/core/workspace/index.ts

@@ -0,0 +1,13 @@
+export {
+  workspaceKeys,
+  workspaceListOptions,
+  memberListOptions,
+  agentListOptions,
+  skillListOptions,
+} from "./queries";
+
+export {
+  useCreateWorkspace,
+  useLeaveWorkspace,
+  useDeleteWorkspace,
+} from "./mutations";

apps/web/core/workspace/mutations.ts

@@ -0,0 +1,34 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { api } from "@/shared/api";
+import { workspaceKeys } from "./queries";
+
+export function useCreateWorkspace() {
+  const qc = useQueryClient();
+  return useMutation({
+    mutationFn: (data: { name: string; slug: string; description?: string }) =>
+      api.createWorkspace(data),
+    onSettled: () => {
+      qc.invalidateQueries({ queryKey: workspaceKeys.list() });
+    },
+  });
+}
+
+export function useLeaveWorkspace() {
+  const qc = useQueryClient();
+  return useMutation({
+    mutationFn: (workspaceId: string) => api.leaveWorkspace(workspaceId),
+    onSettled: () => {
+      qc.invalidateQueries({ queryKey: workspaceKeys.list() });
+    },
+  });
+}
+
+export function useDeleteWorkspace() {
+  const qc = useQueryClient();
+  return useMutation({
+    mutationFn: (workspaceId: string) => api.deleteWorkspace(workspaceId),
+    onSettled: () => {
+      qc.invalidateQueries({ queryKey: workspaceKeys.list() });
+    },
+  });
+}

apps/web/core/workspace/queries.ts

@@ -0,0 +1,39 @@
+import { queryOptions } from "@tanstack/react-query";
+import { api } from "@/shared/api";
+
+export const workspaceKeys = {
+  all: (wsId: string) => ["workspaces", wsId] as const,
+  list: () => ["workspaces", "list"] as const,
+  members: (wsId: string) => ["workspaces", wsId, "members"] as const,
+  agents: (wsId: string) => ["workspaces", wsId, "agents"] as const,
+  skills: (wsId: string) => ["workspaces", wsId, "skills"] as const,
+};
+
+export function workspaceListOptions() {
+  return queryOptions({
+    queryKey: workspaceKeys.list(),
+    queryFn: () => api.listWorkspaces(),
+  });
+}
+
+export function memberListOptions(wsId: string) {
+  return queryOptions({
+    queryKey: workspaceKeys.members(wsId),
+    queryFn: () => api.listMembers(wsId),
+  });
+}
+
+export function agentListOptions(wsId: string) {
+  return queryOptions({
+    queryKey: workspaceKeys.agents(wsId),
+    queryFn: () =>
+      api.listAgents({ workspace_id: wsId, include_archived: true }),
+  });
+}
+
+export function skillListOptions(wsId: string) {
+  return queryOptions({
+    queryKey: workspaceKeys.skills(wsId),
+    queryFn: () => api.listSkills(),
+  });
+}

apps/web/features/auth/store.ts

@@ -12,6 +12,7 @@ interface AuthState {
   initialize: () => Promise<void>;
   sendCode: (email: string) => Promise<void>;
   verifyCode: (email: string, code: string) => Promise<User>;
+  loginWithGoogle: (code: string, redirectUri: string) => Promise<User>;
   logout: () => void;
   setUser: (user: User) => void;
 }
@@ -36,7 +37,6 @@ export const useAuthStore = create<AuthState>((set) => ({
       api.setToken(null);
       api.setWorkspaceId(null);
       localStorage.removeItem("multica_token");
-      localStorage.removeItem("multica_workspace_id");
       set({ user: null, isLoading: false });
     }
   },
@@ -54,9 +54,17 @@ export const useAuthStore = create<AuthState>((set) => ({
     return user;
   },
 
+  loginWithGoogle: async (code: string, redirectUri: string) => {
+    const { token, user } = await api.googleLogin(code, redirectUri);
+    localStorage.setItem("multica_token", token);
+    api.setToken(token);
+    setLoggedInCookie();
+    set({ user });
+    return user;
+  },
+
   logout: () => {
     localStorage.removeItem("multica_token");
-    localStorage.removeItem("multica_workspace_id");
     api.setToken(null);
     api.setWorkspaceId(null);
     clearLoggedInCookie();

apps/web/features/editor/content-editor.tsx

@@ -34,6 +34,7 @@ import {
 import { useEditor, EditorContent } from "@tiptap/react";
 import { cn } from "@/lib/utils";
 import type { UploadResult } from "@/shared/hooks/use-file-upload";
+import { useQueryClient } from "@tanstack/react-query";
 import { createEditorExtensions } from "./extensions";
 import { uploadAndInsertFile } from "./extensions/file-upload";
 import { preprocessMarkdown } from "./utils/preprocess";
@@ -94,6 +95,8 @@ const ContentEditor = forwardRef<ContentEditorRef, ContentEditorProps>(
     onBlurRef.current = onBlur;
     onUploadFileRef.current = onUploadFile;
 
+    const queryClient = useQueryClient();
+
     const editor = useEditor({
       immediatelyRender: false,
       editable,
@@ -102,6 +105,7 @@ const ContentEditor = forwardRef<ContentEditorRef, ContentEditorProps>(
       extensions: createEditorExtensions({
         editable,
         placeholder: placeholderText,
+        queryClient,
         onSubmitRef,
         onUploadFileRef,
       }),

apps/web/features/editor/extensions/index.ts

@@ -76,6 +76,7 @@ const ImageExtension = Image.extend({
 export interface EditorExtensionsOptions {
   editable: boolean;
   placeholder?: string;
+  queryClient?: import("@tanstack/react-query").QueryClient;
   onSubmitRef?: RefObject<(() => void) | undefined>;
   onUploadFileRef?: RefObject<
     ((file: File) => Promise<UploadResult | null>) | undefined
@@ -107,7 +108,7 @@ export function createEditorExtensions(
     Markdown,
     BaseMentionExtension.configure({
       HTMLAttributes: { class: "mention" },
-      ...(editable ? { suggestion: createMentionSuggestion() } : {}),
+      ...(editable && options.queryClient ? { suggestion: createMentionSuggestion(options.queryClient) } : {}),
     }),
   ];
 

apps/web/features/editor/extensions/mention-suggestion.tsx

@@ -10,8 +10,11 @@ import {
 } from "react";
 import { ReactRenderer } from "@tiptap/react";
 import { computePosition, offset, flip, shift } from "@floating-ui/dom";
+import type { QueryClient } from "@tanstack/react-query";
 import { useWorkspaceStore } from "@/features/workspace";
-import { useIssueStore } from "@/features/issues";
+import { issueKeys } from "@core/issues/queries";
+import { workspaceKeys } from "@core/workspace/queries";
+import type { Issue, ListIssuesResponse, MemberWithUser, Agent } from "@/shared/types";
 import { ActorAvatar } from "@/components/common/actor-avatar";
 import { StatusIcon } from "@/features/issues/components/status-icon";
 import { Badge } from "@/components/ui/badge";
@@ -210,14 +213,19 @@ function MentionRow({
 // Suggestion config factory
 // ---------------------------------------------------------------------------
 
-export function createMentionSuggestion(): Omit<
+export function createMentionSuggestion(qc: QueryClient): Omit<
   SuggestionOptions<MentionItem>,
   "editor"
 > {
   return {
     items: ({ query }) => {
-      const { members, agents } = useWorkspaceStore.getState();
-      const { issues } = useIssueStore.getState();
+      const wsId = useWorkspaceStore.getState().workspace?.id;
+      const members: MemberWithUser[] = wsId ? qc.getQueryData(workspaceKeys.members(wsId)) ?? [] : [];
+      const agents: Agent[] = wsId ? qc.getQueryData(workspaceKeys.agents(wsId)) ?? [] : [];
+      const issues: Issue[] = wsId
+        ? qc.getQueryData<ListIssuesResponse>(issueKeys.list(wsId))?.issues ?? []
+        : [];
+
       const q = query.toLowerCase();
 
       // Show "All members" option when query is empty or matches "all"

apps/web/features/editor/extensions/mention-view.tsx

@@ -20,7 +20,9 @@
 
 import { NodeViewWrapper } from "@tiptap/react";
 import type { NodeViewProps } from "@tiptap/react";
-import { useIssueStore } from "@/features/issues/store";
+import { useQuery } from "@tanstack/react-query";
+import { issueListOptions } from "@core/issues/queries";
+import { useWorkspaceId } from "@core/hooks";
 import { StatusIcon } from "@/features/issues/components/status-icon";
 
 export function MentionView({ node }: NodeViewProps) {
@@ -48,7 +50,9 @@ function IssueMention({
   issueId: string;
   fallbackLabel?: string;
 }) {
-  const issue = useIssueStore((s) => s.issues.find((i) => i.id === issueId));
+  const wsId = useWorkspaceId();
+  const { data: issues = [] } = useQuery(issueListOptions(wsId));
+  const issue = issues.find((i) => i.id === issueId);
 
   const handleClick = (e: React.MouseEvent) => {
     e.preventDefault();

apps/web/features/inbox/index.ts

@@ -1 +1,13 @@
-export { useInboxStore } from "./store";
+// Inbox server state is managed by TanStack Query.
+// See core/inbox/ for queries, mutations, and WS updaters.
+export {
+  inboxKeys,
+  inboxListOptions,
+  deduplicateInboxItems,
+  useMarkInboxRead,
+  useArchiveInbox,
+  useMarkAllInboxRead,
+  useArchiveAllInbox,
+  useArchiveAllReadInbox,
+  useArchiveCompletedInbox,
+} from "@core/inbox";

apps/web/features/inbox/store.ts

@@ -1,127 +0,0 @@
-"use client";
-
-import { create } from "zustand";
-import type { InboxItem, IssueStatus } from "@/shared/types";
-import { toast } from "sonner";
-import { api } from "@/shared/api";
-import { createLogger } from "@/shared/logger";
-
-const logger = createLogger("inbox-store");
-
-/**
- * Deduplicate inbox items by issue_id (one entry per issue, Linear-style),
- * keep latest, sort by time DESC.
- * Memoized by reference — returns the same array if `items` hasn't changed.
- */
-let _prevItems: InboxItem[] = [];
-let _prevDeduped: InboxItem[] = [];
-
-function deduplicateInboxItems(items: InboxItem[]): InboxItem[] {
-  if (items === _prevItems) return _prevDeduped;
-  _prevItems = items;
-
-  const active = items.filter((i) => !i.archived);
-  const groups = new Map<string, InboxItem[]>();
-  active.forEach((item) => {
-    const key = item.issue_id ?? item.id;
-    const group = groups.get(key) ?? [];
-    group.push(item);
-    groups.set(key, group);
-  });
-  const merged: InboxItem[] = [];
-  groups.forEach((group) => {
-    const sorted = group.sort(
-      (a, b) =>
-        new Date(b.created_at).getTime() - new Date(a.created_at).getTime(),
-    );
-    if (sorted[0]) merged.push(sorted[0]);
-  });
-  _prevDeduped = merged.sort(
-    (a, b) =>
-      new Date(b.created_at).getTime() - new Date(a.created_at).getTime(),
-  );
-  return _prevDeduped;
-}
-
-interface InboxState {
-  items: InboxItem[];
-  loading: boolean;
-  fetch: () => Promise<void>;
-  setItems: (items: InboxItem[]) => void;
-  addItem: (item: InboxItem) => void;
-  markRead: (id: string) => void;
-  archive: (id: string) => void;
-  markAllRead: () => void;
-  archiveAll: () => void;
-  archiveAllRead: () => void;
-  updateIssueStatus: (issueId: string, status: IssueStatus) => void;
-  dedupedItems: () => InboxItem[];
-  unreadCount: () => number;
-}
-
-export const useInboxStore = create<InboxState>((set, get) => ({
-  items: [],
-  loading: true,
-
-  fetch: async () => {
-    logger.debug("fetch start");
-    const isInitialLoad = get().items.length === 0;
-    if (isInitialLoad) set({ loading: true });
-    try {
-      const data = await api.listInbox();
-      logger.info("fetched", data.length, "items");
-      set({ items: data, loading: false });
-    } catch (err) {
-      logger.error("fetch failed", err);
-      toast.error("Failed to load inbox");
-      if (isInitialLoad) set({ loading: false });
-    }
-  },
-
-  setItems: (items) => set({ items }),
-  addItem: (item) =>
-    set((s) => ({
-      items: s.items.some((i) => i.id === item.id)
-        ? s.items
-        : [item, ...s.items],
-    })),
-  markRead: (id) =>
-    set((s) => ({
-      items: s.items.map((i) => (i.id === id ? { ...i, read: true } : i)),
-    })),
-  archive: (id) =>
-    set((s) => {
-      const target = s.items.find((i) => i.id === id);
-      const issueId = target?.issue_id;
-      return {
-        items: s.items.map((i) =>
-          i.id === id || (issueId && i.issue_id === issueId)
-            ? { ...i, archived: true }
-            : i,
-        ),
-      };
-    }),
-  markAllRead: () =>
-    set((s) => ({
-      items: s.items.map((i) => (!i.archived ? { ...i, read: true } : i)),
-    })),
-  archiveAll: () =>
-    set((s) => ({
-      items: s.items.map((i) => (!i.archived ? { ...i, archived: true } : i)),
-    })),
-  archiveAllRead: () =>
-    set((s) => ({
-      items: s.items.map((i) =>
-        i.read && !i.archived ? { ...i, archived: true } : i
-      ),
-    })),
-  updateIssueStatus: (issueId, status) =>
-    set((s) => ({
-      items: s.items.map((i) =>
-        i.issue_id === issueId ? { ...i, issue_status: status } : i
-      ),
-    })),
-  dedupedItems: () => deduplicateInboxItems(get().items),
-  unreadCount: () =>
-    get().dedupedItems().filter((i) => !i.read).length,
-}));

apps/web/features/issues/components/agent-live-card.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useState, useEffect, useCallback, useRef } from "react";
-import { Bot, ChevronRight, ChevronUp, Loader2, ArrowDown, Brain, AlertCircle, Clock, CheckCircle2, XCircle, Square } from "lucide-react";
+import { Bot, ChevronRight, ChevronDown, Loader2, ArrowDown, Brain, AlertCircle, Clock, CheckCircle2, XCircle, Square } from "lucide-react";
 import { api } from "@/shared/api";
 import { useWSEvent } from "@/features/realtime";
 import type { TaskMessagePayload, TaskCompletedPayload, TaskFailedPayload, TaskCancelledPayload } from "@/shared/types/events";
@@ -100,7 +100,7 @@ function buildTimeline(msgs: TaskMessagePayload[]): TimelineItem[] {
 interface AgentLiveCardProps {
   issueId: string;
   agentName?: string;
-  /** Scroll container ref — needed for sticky sentinel detection. */
+  /** Scroll container ref — used to auto-collapse timeline on outer scroll. */
   scrollContainerRef?: React.RefObject<HTMLDivElement | null>;
 }
 
@@ -109,11 +109,11 @@ export function AgentLiveCard({ issueId, agentName, scrollContainerRef }: AgentL
   const [activeTask, setActiveTask] = useState<AgentTask | null>(null);
   const [items, setItems] = useState<TimelineItem[]>([]);
   const [elapsed, setElapsed] = useState("");
+  const [open, setOpen] = useState(false);
   const [autoScroll, setAutoScroll] = useState(true);
   const [cancelling, setCancelling] = useState(false);
-  const [isStuck, setIsStuck] = useState(false);
   const scrollRef = useRef<HTMLDivElement>(null);
-  const sentinelRef = useRef<HTMLDivElement>(null);
+  const ignoreScrollRef = useRef(false);
   const seenSeqs = useRef(new Set<string>());
 
   // Check for active task on mount
@@ -163,46 +163,22 @@ export function AgentLiveCard({ issueId, agentName, scrollContainerRef }: AgentL
     }, [issueId]),
   );
 
-  // Handle task completion/failure
-  useWSEvent(
-    "task:completed",
-    useCallback((payload: unknown) => {
-      const p = payload as TaskCompletedPayload;
-      if (p.issue_id !== issueId) return;
-      setActiveTask(null);
-      setItems([]);
-      seenSeqs.current.clear();
-      setCancelling(false);
-    }, [issueId]),
-  );
+  // Handle task completion/failure/cancellation
+  const handleTaskEnd = useCallback((payload: unknown) => {
+    const p = payload as { issue_id: string };
+    if (p.issue_id !== issueId) return;
+    setActiveTask(null);
+    setItems([]);
+    seenSeqs.current.clear();
+    setCancelling(false);
+    setOpen(false);
+  }, [issueId]);
 
-  useWSEvent(
-    "task:failed",
-    useCallback((payload: unknown) => {
-      const p = payload as TaskFailedPayload;
-      if (p.issue_id !== issueId) return;
-      setActiveTask(null);
-      setItems([]);
-      seenSeqs.current.clear();
-      setCancelling(false);
-    }, [issueId]),
-  );
+  useWSEvent("task:completed", handleTaskEnd);
+  useWSEvent("task:failed", handleTaskEnd);
+  useWSEvent("task:cancelled", handleTaskEnd);
 
-  useWSEvent(
-    "task:cancelled",
-    useCallback((payload: unknown) => {
-      const p = payload as TaskCancelledPayload;
-      if (p.issue_id !== issueId) return;
-      setActiveTask(null);
-      setItems([]);
-      seenSeqs.current.clear();
-      setCancelling(false);
-    }, [issueId]),
-  );
-
-  // Pick up new tasks — skip if we're already showing an active task to avoid
-  // replacing its timeline mid-execution (per-issue serialization in the
-  // backend prevents this race, but this is a defensive safeguard).
+  // Pick up new tasks
   useWSEvent(
     "task:dispatch",
     useCallback(() => {
@@ -212,6 +188,7 @@ export function AgentLiveCard({ issueId, agentName, scrollContainerRef }: AgentL
           setActiveTask(task);
           setItems([]);
           seenSeqs.current.clear();
+          setOpen(false);
         }
       }).catch(console.error);
     }, [issueId, activeTask]),
@@ -226,31 +203,22 @@ export function AgentLiveCard({ issueId, agentName, scrollContainerRef }: AgentL
     return () => clearInterval(interval);
   }, [activeTask?.started_at, activeTask?.dispatched_at]);
 
-  // Sentinel pattern: detect when the card is scrolled past and becomes "stuck"
+  // Auto-collapse timeline when outer scroll container scrolls
+  // (ignoreScrollRef prevents layout-induced scroll from collapsing right after expand)
   useEffect(() => {
-    const sentinel = sentinelRef.current;
-    const root = scrollContainerRef?.current;
-    if (!sentinel || !root || !activeTask) {
-      setIsStuck(false);
-      return;
-    }
+    const container = scrollContainerRef?.current;
+    if (!container) return;
 
-    const observer = new IntersectionObserver(
-      (entries) => {
-        if (entries[0]) setIsStuck(!entries[0].isIntersecting);
-      },
-      { root, threshold: 0, rootMargin: "-40px 0px 0px 0px" },
-    );
+    const handleOuterScroll = () => {
+      if (ignoreScrollRef.current) return;
+      setOpen(false);
+    };
 
-    observer.observe(sentinel);
-    return () => observer.disconnect();
-  }, [scrollContainerRef, activeTask]);
+    container.addEventListener("scroll", handleOuterScroll, { passive: true });
+    return () => container.removeEventListener("scroll", handleOuterScroll);
+  }, [scrollContainerRef]);
 
-  const scrollToCard = useCallback(() => {
-    sentinelRef.current?.scrollIntoView({ behavior: "smooth", block: "center" });
-  }, []);
-
-  // Auto-scroll
+  // Auto-scroll timeline to bottom
   useEffect(() => {
     if (autoScroll && scrollRef.current) {
       scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
@@ -263,6 +231,14 @@ export function AgentLiveCard({ issueId, agentName, scrollContainerRef }: AgentL
     setAutoScroll(scrollHeight - scrollTop - clientHeight < 40);
   }, []);
 
+  const toggleOpen = useCallback(() => {
+    if (!open) {
+      ignoreScrollRef.current = true;
+      setTimeout(() => { ignoreScrollRef.current = false; }, 300);
+    }
+    setOpen(!open);
+  }, [open]);
+
   const handleCancel = useCallback(async () => {
     if (!activeTask || cancelling) return;
     setCancelling(true);
@@ -280,77 +256,63 @@ export function AgentLiveCard({ issueId, agentName, scrollContainerRef }: AgentL
   const name = (activeTask.agent_id ? getActorName("agent", activeTask.agent_id) : agentName) ?? "Agent";
 
   return (
-    <>
-      {/* Sentinel — zero-height element that IntersectionObserver watches */}
-      <div ref={sentinelRef} className="mt-4 h-0 pointer-events-none" aria-hidden />
-
+    <div className="mt-4 sticky top-4 z-10 rounded-lg border border-info/20 bg-info/5 backdrop-blur-sm">
+      {/* Header — click to toggle timeline */}
       <div
-        className={cn(
-          "rounded-lg border transition-all duration-200",
-          isStuck
-            ? "sticky top-4 z-10 shadow-md border-brand/30 bg-brand/10 backdrop-blur-md"
-            : "border-info/20 bg-info/5",
-        )}
+        className="group flex items-center gap-2 px-3 py-2 cursor-pointer select-none text-muted-foreground hover:text-foreground transition-colors"
+        role="button"
+        tabIndex={0}
+        aria-expanded={open}
+        onClick={toggleOpen}
+        onKeyDown={(e) => {
+          if (e.key === "Enter" || e.key === " ") {
+            e.preventDefault();
+            toggleOpen();
+          }
+        }}
       >
-        {/* Header */}
-        <div className="flex items-center gap-2 px-3 py-2">
-          {activeTask.agent_id ? (
-            <ActorAvatar actorType="agent" actorId={activeTask.agent_id} size={20} />
-          ) : (
-            <div className={cn(
-              "flex items-center justify-center h-5 w-5 rounded-full shrink-0",
-              isStuck ? "bg-brand/15 text-brand" : "bg-info/10 text-info",
-            )}>
-              <Bot className="h-3 w-3" />
-            </div>
-          )}
-          <div className="flex items-center gap-1.5 text-xs font-medium min-w-0">
-            <Loader2 className={cn("h-3 w-3 animate-spin shrink-0", isStuck ? "text-brand" : "text-info")} />
-            <span className="truncate">{name} is working</span>
+        {activeTask.agent_id ? (
+          <ActorAvatar actorType="agent" actorId={activeTask.agent_id} size={20} />
+        ) : (
+          <div className="flex items-center justify-center h-5 w-5 rounded-full shrink-0 bg-info/10 text-info">
+            <Bot className="h-3 w-3" />
           </div>
-          <span className="ml-auto text-xs text-muted-foreground tabular-nums shrink-0">{elapsed}</span>
-          {!isStuck && toolCount > 0 && (
-            <span className="text-xs text-muted-foreground shrink-0">
-              {toolCount} tool {toolCount === 1 ? "call" : "calls"}
-            </span>
-          )}
-          {isStuck ? (
-            <button
-              onClick={scrollToCard}
-              className="flex items-center gap-1 rounded px-1.5 py-0.5 text-xs text-muted-foreground hover:text-foreground transition-colors shrink-0"
-              title="Scroll to live card"
-            >
-              <ChevronUp className="h-3.5 w-3.5" />
-            </button>
-          ) : (
-            <button
-              onClick={handleCancel}
-              disabled={cancelling}
-              className="flex items-center gap-1 rounded px-1.5 py-0.5 text-xs text-muted-foreground hover:text-destructive hover:bg-destructive/10 transition-colors disabled:opacity-50 shrink-0"
-              title="Stop agent"
-            >
-              {cancelling ? (
-                <Loader2 className="h-3 w-3 animate-spin" />
-              ) : (
-                <Square className="h-3 w-3" />
-              )}
-              <span>Stop</span>
-            </button>
+        )}
+        <div className="flex items-center gap-1.5 text-xs min-w-0">
+          <Loader2 className="h-3 w-3 animate-spin text-info shrink-0" />
+          <span className="font-medium text-foreground truncate">{name} is working</span>
+          <span className="text-muted-foreground tabular-nums shrink-0">{elapsed}</span>
+          {toolCount > 0 && (
+            <span className="text-muted-foreground shrink-0">{toolCount} tools</span>
           )}
         </div>
+        <div className="ml-auto flex items-center gap-1 shrink-0">
+          <button
+            onClick={(e) => { e.stopPropagation(); handleCancel(); }}
+            disabled={cancelling}
+            className="flex items-center gap-1 rounded px-1.5 py-0.5 text-xs text-muted-foreground hover:text-destructive hover:bg-destructive/10 transition-colors disabled:opacity-50"
+            title="Stop agent"
+          >
+            {cancelling ? <Loader2 className="h-3 w-3 animate-spin" /> : <Square className="h-3 w-3" />}
+            <span>Stop</span>
+          </button>
+          <ChevronDown className={cn("h-3.5 w-3.5 transition-transform", open && "rotate-180")} />
+        </div>
+      </div>
 
-        {/* Timeline content — collapses when stuck */}
-        <div
-          className={cn(
-            "overflow-hidden transition-all duration-200",
-            isStuck ? "max-h-0 opacity-0" : "max-h-[20rem] opacity-100",
-          )}
-        >
+      {/* Timeline — grid-rows animation for smooth collapse/expand */}
+      <div
+        className={cn(
+          "grid transition-[grid-template-rows] duration-200 ease-out",
+          open ? "grid-rows-[1fr]" : "grid-rows-[0fr]",
+        )}
+      >
+        <div className="overflow-hidden">
           {items.length > 0 && (
             <div
               ref={scrollRef}
               onScroll={handleScroll}
-              className="relative max-h-80 overflow-y-auto border-t border-info/10 px-3 py-2 space-y-0.5"
+              className="relative max-h-80 overflow-y-auto overscroll-y-contain border-t border-info/10 px-3 py-2 space-y-0.5"
             >
               {items.map((item, idx) => (
                 <TimelineRow key={`${item.seq}-${idx}`} item={item} />
@@ -358,7 +320,8 @@ export function AgentLiveCard({ issueId, agentName, scrollContainerRef }: AgentL
 
               {!autoScroll && (
                 <button
-                  onClick={() => {
+                  onClick={(e) => {
+                    e.stopPropagation();
                     if (scrollRef.current) {
                       scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
                       setAutoScroll(true);
@@ -374,7 +337,7 @@ export function AgentLiveCard({ issueId, agentName, scrollContainerRef }: AgentL
           )}
         </div>
       </div>
-    </>
+    </div>
   );
 }
 

apps/web/features/issues/components/batch-action-toolbar.tsx

@@ -21,9 +21,8 @@ import {
 } from "@/components/ui/popover";
 import type { UpdateIssueRequest } from "@/shared/types";
 import { ALL_STATUSES, STATUS_CONFIG, PRIORITY_ORDER, PRIORITY_CONFIG } from "@/features/issues/config";
-import { useIssueStore } from "@/features/issues/store";
 import { useIssueSelectionStore } from "@/features/issues/stores/selection-store";
-import { api } from "@/shared/api";
+import { useBatchUpdateIssues, useBatchDeleteIssues } from "@core/issues/mutations";
 import { StatusIcon } from "./status-icon";
 import { PriorityIcon } from "./priority-icon";
 import { AssigneePicker } from "./pickers";
@@ -37,46 +36,31 @@ export function BatchActionToolbar() {
   const [priorityOpen, setPriorityOpen] = useState(false);
   const [assigneeOpen, setAssigneeOpen] = useState(false);
   const [deleteOpen, setDeleteOpen] = useState(false);
-  const [loading, setLoading] = useState(false);
+  const batchUpdate = useBatchUpdateIssues();
+  const batchDelete = useBatchDeleteIssues();
+  const loading = batchUpdate.isPending || batchDelete.isPending;
 
   if (count === 0) return null;
 
   const ids = Array.from(selectedIds);
 
   const handleBatchUpdate = async (updates: Partial<UpdateIssueRequest>) => {
-    setLoading(true);
     try {
-      await api.batchUpdateIssues(ids, updates);
-      for (const id of ids) {
-        useIssueStore.getState().updateIssue(id, updates);
-      }
+      await batchUpdate.mutateAsync({ ids, updates });
       toast.success(`Updated ${count} issue${count > 1 ? "s" : ""}`);
     } catch {
       toast.error("Failed to update issues");
-      api.listIssues({ limit: 200 }).then((res) => {
-        useIssueStore.getState().setIssues(res.issues);
-      }).catch(console.error);
-    } finally {
-      setLoading(false);
     }
   };
 
   const handleBatchDelete = async () => {
-    setLoading(true);
     try {
-      await api.batchDeleteIssues(ids);
-      for (const id of ids) {
-        useIssueStore.getState().removeIssue(id);
-      }
+      await batchDelete.mutateAsync(ids);
       clear();
       toast.success(`Deleted ${count} issue${count > 1 ? "s" : ""}`);
     } catch {
       toast.error("Failed to delete issues");
-      api.listIssues({ limit: 200 }).then((res) => {
-        useIssueStore.getState().setIssues(res.issues);
-      }).catch(console.error);
     } finally {
-      setLoading(false);
       setDeleteOpen(false);
     }
   };

apps/web/features/issues/components/board-card.tsx

@@ -2,14 +2,14 @@
 
 import { useCallback, memo } from "react";
 import Link from "next/link";
-import { useSortable } from "@dnd-kit/sortable";
+import { useSortable, defaultAnimateLayoutChanges } from "@dnd-kit/sortable";
+import type { AnimateLayoutChanges } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
 import { toast } from "sonner";
 import type { Issue, UpdateIssueRequest } from "@/shared/types";
 import { CalendarDays } from "lucide-react";
 import { ActorAvatar } from "@/components/common/actor-avatar";
-import { api } from "@/shared/api";
-import { useIssueStore } from "@/features/issues/store";
+import { useUpdateIssue } from "@core/issues/mutations";
 import { PriorityIcon } from "./priority-icon";
 import { PriorityPicker, AssigneePicker, DueDatePicker } from "./pickers";
 import { PRIORITY_CONFIG } from "@/features/issues/config";
@@ -46,16 +46,15 @@ export const BoardCardContent = memo(function BoardCardContent({
   const storeProperties = useViewStore((s) => s.cardProperties);
   const priorityCfg = PRIORITY_CONFIG[issue.priority];
 
+  const updateIssueMutation = useUpdateIssue();
   const handleUpdate = useCallback(
     (updates: Partial<UpdateIssueRequest>) => {
-      const prev = { ...issue };
-      useIssueStore.getState().updateIssue(issue.id, updates);
-      api.updateIssue(issue.id, updates).catch(() => {
-        useIssueStore.getState().updateIssue(issue.id, prev);
-        toast.error("Failed to update issue");
-      });
+      updateIssueMutation.mutate(
+        { id: issue.id, ...updates },
+        { onError: () => toast.error("Failed to update issue") },
+      );
     },
-    [issue],
+    [issue.id, updateIssueMutation],
   );
 
   const showPriority = storeProperties.priority;
@@ -168,6 +167,12 @@ export const BoardCardContent = memo(function BoardCardContent({
   );
 });
 
+const animateLayoutChanges: AnimateLayoutChanges = (args) => {
+  const { isSorting, wasDragging } = args;
+  if (isSorting || wasDragging) return false;
+  return defaultAnimateLayoutChanges(args);
+};
+
 export const DraggableBoardCard = memo(function DraggableBoardCard({ issue }: { issue: Issue }) {
   const {
     attributes,
@@ -179,6 +184,7 @@ export const DraggableBoardCard = memo(function DraggableBoardCard({ issue }: {
   } = useSortable({
     id: issue.id,
     data: { status: issue.status },
+    animateLayoutChanges,
   });
 
   const style = {

apps/web/features/issues/components/board-column.tsx

@@ -15,32 +15,31 @@ import {
 } from "@/components/ui/dropdown-menu";
 import { STATUS_CONFIG } from "@/features/issues/config";
 import { useModalStore } from "@/features/modals";
-import { useViewStore, useViewStoreApi } from "@/features/issues/stores/view-store-context";
-import { sortIssues } from "@/features/issues/utils/sort";
+import { useViewStoreApi } from "@/features/issues/stores/view-store-context";
 import { StatusIcon } from "./status-icon";
 import { DraggableBoardCard } from "./board-card";
 
 export function BoardColumn({
   status,
-  issues,
+  issueIds,
+  issueMap,
 }: {
   status: IssueStatus;
-  issues: Issue[];
+  issueIds: string[];
+  issueMap: Map<string, Issue>;
 }) {
   const cfg = STATUS_CONFIG[status];
   const { setNodeRef, isOver } = useDroppable({ id: status });
   const viewStoreApi = useViewStoreApi();
-  const sortBy = useViewStore((s) => s.sortBy);
-  const sortDirection = useViewStore((s) => s.sortDirection);
 
-  const sortedIssues = useMemo(
-    () => sortIssues(issues, sortBy, sortDirection),
-    [issues, sortBy, sortDirection]
-  );
-
-  const sortedIds = useMemo(
-    () => sortedIssues.map((i) => i.id),
-    [sortedIssues]
+  // Resolve IDs to Issue objects, preserving parent-provided order
+  const resolvedIssues = useMemo(
+    () =>
+      issueIds.flatMap((id) => {
+        const issue = issueMap.get(id);
+        return issue ? [issue] : [];
+      }),
+    [issueIds, issueMap],
   );
 
   return (
@@ -53,7 +52,7 @@ export function BoardColumn({
             {cfg.label}
           </span>
           <span className="text-xs text-muted-foreground">
-            {issues.length}
+            {issueIds.length}
           </span>
         </div>
 
@@ -97,12 +96,12 @@ export function BoardColumn({
           isOver ? "bg-accent/60" : ""
         }`}
       >
-        <SortableContext items={sortedIds} strategy={verticalListSortingStrategy}>
-          {sortedIssues.map((issue) => (
+        <SortableContext items={issueIds} strategy={verticalListSortingStrategy}>
+          {resolvedIssues.map((issue) => (
             <DraggableBoardCard key={issue.id} issue={issue} />
           ))}
         </SortableContext>
-        {issues.length === 0 && (
+        {issueIds.length === 0 && (
           <p className="py-8 text-center text-xs text-muted-foreground">
             No issues
           </p>

apps/web/features/issues/components/board-view.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { useState, useCallback, useMemo } from "react";
+import { useState, useCallback, useMemo, useEffect, useRef } from "react";
 import {
   DndContext,
   DragOverlay,
@@ -12,7 +12,9 @@ import {
   type CollisionDetection,
   type DragStartEvent,
   type DragEndEvent,
+  type DragOverEvent,
 } from "@dnd-kit/core";
+import { arrayMove } from "@dnd-kit/sortable";
 import { Eye, MoreHorizontal } from "lucide-react";
 import type { Issue, IssueStatus } from "@/shared/types";
 import { Button } from "@/components/ui/button";
@@ -23,7 +25,9 @@ import {
   DropdownMenuItem,
 } from "@/components/ui/dropdown-menu";
 import { ALL_STATUSES, STATUS_CONFIG } from "@/features/issues/config";
-import { useViewStoreApi } from "@/features/issues/stores/view-store-context";
+import { useViewStoreApi, useViewStore } from "@/features/issues/stores/view-store-context";
+import type { SortField, SortDirection } from "@/features/issues/stores/view-store";
+import { sortIssues } from "@/features/issues/utils/sort";
 import { StatusIcon } from "./status-icon";
 import { BoardColumn } from "./board-column";
 import { BoardCardContent } from "./board-card";
@@ -44,13 +48,47 @@ const kanbanCollision: CollisionDetection = (args) => {
   return closestCenter(args);
 };
 
-/** Compute a float position to place an item at `targetIndex` within `siblings`. */
-function computePosition(siblings: Issue[], targetIndex: number): number {
-  if (siblings.length === 0) return 0;
-  if (targetIndex <= 0) return siblings[0]!.position - 1;
-  if (targetIndex >= siblings.length)
-    return siblings[siblings.length - 1]!.position + 1;
-  return (siblings[targetIndex - 1]!.position + siblings[targetIndex]!.position) / 2;
+/** Build column ID arrays from TQ issue data, respecting current sort. */
+function buildColumns(
+  issues: Issue[],
+  visibleStatuses: IssueStatus[],
+  sortBy: SortField,
+  sortDirection: SortDirection,
+): Record<IssueStatus, string[]> {
+  const cols = {} as Record<IssueStatus, string[]>;
+  for (const status of visibleStatuses) {
+    const sorted = sortIssues(
+      issues.filter((i) => i.status === status),
+      sortBy,
+      sortDirection,
+    );
+    cols[status] = sorted.map((i) => i.id);
+  }
+  return cols;
+}
+
+/** Compute a float position for `activeId` based on its neighbors in `ids`. */
+function computePosition(ids: string[], activeId: string, issueMap: Map<string, Issue>): number {
+  const idx = ids.indexOf(activeId);
+  if (idx === -1) return 0;
+  const getPos = (id: string) => issueMap.get(id)?.position ?? 0;
+  if (ids.length === 1) return issueMap.get(activeId)?.position ?? 0;
+  if (idx === 0) return getPos(ids[1]!) - 1;
+  if (idx === ids.length - 1) return getPos(ids[idx - 1]!) + 1;
+  return (getPos(ids[idx - 1]!) + getPos(ids[idx + 1]!)) / 2;
+}
+
+/** Find which column (status) contains a given ID (issue or column droppable). */
+function findColumn(
+  columns: Record<IssueStatus, string[]>,
+  id: string,
+  visibleStatuses: IssueStatus[],
+): IssueStatus | null {
+  if (visibleStatuses.includes(id as IssueStatus)) return id as IssueStatus;
+  for (const [status, ids] of Object.entries(columns)) {
+    if (ids.includes(id)) return status as IssueStatus;
+  }
+  return null;
 }
 
 export function BoardView({
@@ -70,7 +108,52 @@ export function BoardView({
     newPosition?: number
   ) => void;
 }) {
+  const sortBy = useViewStore((s) => s.sortBy);
+  const sortDirection = useViewStore((s) => s.sortDirection);
+
+  // --- Drag state ---
   const [activeIssue, setActiveIssue] = useState<Issue | null>(null);
+  const isDraggingRef = useRef(false);
+
+  // --- Local columns state ---
+  // Between drags: follows TQ via useEffect.
+  // During drag: local-only, driven by onDragOver/onDragEnd.
+  const [columns, setColumns] = useState<Record<IssueStatus, string[]>>(() =>
+    buildColumns(issues, visibleStatuses, sortBy, sortDirection),
+  );
+  const columnsRef = useRef(columns);
+  columnsRef.current = columns;
+
+  useEffect(() => {
+    if (!isDraggingRef.current) {
+      setColumns(buildColumns(issues, visibleStatuses, sortBy, sortDirection));
+    }
+  }, [issues, visibleStatuses, sortBy, sortDirection]);
+
+  // After a cross-column move, lock for one animation frame so dnd-kit's
+  // collision detection can stabilize before processing the next move.
+  // Without this, collision oscillates: A→B→A→B… until React bails out.
+  const recentlyMovedRef = useRef(false);
+  useEffect(() => {
+    const id = requestAnimationFrame(() => {
+      recentlyMovedRef.current = false;
+    });
+    return () => cancelAnimationFrame(id);
+  }, [columns]);
+
+  // --- Issue map ---
+  // Frozen during drag so BoardColumn/DraggableBoardCard props stay
+  // referentially stable even if a TQ refetch lands mid-drag.
+  const issueMap = useMemo(() => {
+    const map = new Map<string, Issue>();
+    for (const issue of issues) map.set(issue.id, issue);
+    return map;
+  }, [issues]);
+
+  const issueMapRef = useRef(issueMap);
+  if (!isDraggingRef.current) {
+    issueMapRef.current = issueMap;
+  }
 
   const sensors = useSensors(
     useSensor(PointerSensor, {
@@ -78,89 +161,100 @@ export function BoardView({
     })
   );
 
-  // Pre-sort issues by position per status for position calculations
-  const issuesByStatus = useMemo(() => {
-    const map: Record<string, Issue[]> = {};
-    for (const status of visibleStatuses) {
-      map[status] = issues
-        .filter((i) => i.status === status)
-        .sort((a, b) => a.position - b.position);
-    }
-    return map;
-  }, [issues, visibleStatuses]);
-
   const handleDragStart = useCallback(
     (event: DragStartEvent) => {
-      const issue = issues.find((i) => i.id === event.active.id);
-      if (issue) setActiveIssue(issue);
+      isDraggingRef.current = true;
+      const issue = issueMapRef.current.get(event.active.id as string) ?? null;
+      setActiveIssue(issue);
     },
-    [issues]
+    [],
+  );
+
+  const handleDragOver = useCallback(
+    (event: DragOverEvent) => {
+      const { active, over } = event;
+      if (!over || recentlyMovedRef.current) return;
+
+      const activeId = active.id as string;
+      const overId = over.id as string;
+
+      setColumns((prev) => {
+        const activeCol = findColumn(prev, activeId, visibleStatuses);
+        const overCol = findColumn(prev, overId, visibleStatuses);
+        if (!activeCol || !overCol || activeCol === overCol) return prev;
+
+        recentlyMovedRef.current = true;
+        const oldIds = prev[activeCol]!.filter((id) => id !== activeId);
+        const newIds = [...prev[overCol]!];
+        const overIndex = newIds.indexOf(overId);
+        const insertIndex = overIndex >= 0 ? overIndex : newIds.length;
+        newIds.splice(insertIndex, 0, activeId);
+        return { ...prev, [activeCol]: oldIds, [overCol]: newIds };
+      });
+    },
+    [visibleStatuses],
   );
 
   const handleDragEnd = useCallback(
     (event: DragEndEvent) => {
-      setActiveIssue(null);
       const { active, over } = event;
-      if (!over || active.id === over.id) return;
+      isDraggingRef.current = false;
+      setActiveIssue(null);
 
-      const issueId = active.id as string;
-      const currentIssue = issues.find((i) => i.id === issueId);
-      if (!currentIssue) return;
+      const resetColumns = () =>
+        setColumns(buildColumns(issues, visibleStatuses, sortBy, sortDirection));
 
-      // Determine target status
-      let targetStatus: IssueStatus;
-      let overIsColumn = false;
-
-      if (visibleStatuses.includes(over.id as IssueStatus)) {
-        targetStatus = over.id as IssueStatus;
-        overIsColumn = true;
-      } else {
-        const targetIssue = issues.find((i) => i.id === over.id);
-        if (!targetIssue) return;
-        targetStatus = targetIssue.status;
+      if (!over) {
+        resetColumns();
+        return;
       }
 
-      // Get sorted siblings in the target column (excluding the dragged item)
-      const siblings = (issuesByStatus[targetStatus] ?? []).filter(
-        (i) => i.id !== issueId
-      );
+      const activeId = active.id as string;
+      const overId = over.id as string;
 
-      // Compute new position
-      let newPosition: number;
+      const cols = columnsRef.current;
+      const activeCol = findColumn(cols, activeId, visibleStatuses);
+      const overCol = findColumn(cols, overId, visibleStatuses);
+      if (!activeCol || !overCol) {
+        resetColumns();
+        return;
+      }
 
-      if (overIsColumn) {
-        // Dropped on empty area of column → append to end
-        newPosition = computePosition(siblings, siblings.length);
-      } else {
-        // Dropped on a specific card → insert at that card's index
-        const overIndex = siblings.findIndex((i) => i.id === over.id);
-        if (overIndex === -1) {
-          newPosition = computePosition(siblings, siblings.length);
-        } else {
-          const isSameColumn = currentIssue.status === targetStatus;
-          const overIssuePosition = siblings[overIndex]!.position;
-
-          if (isSameColumn && currentIssue.position < overIssuePosition) {
-            // Moving down → insert after the over card
-            newPosition = computePosition(siblings, overIndex + 1);
-          } else {
-            // Moving up or cross-column → insert before the over card
-            newPosition = computePosition(siblings, overIndex);
-          }
+      // Same-column reorder
+      let finalColumns = cols;
+      if (activeCol === overCol) {
+        const ids = cols[activeCol]!;
+        const oldIndex = ids.indexOf(activeId);
+        const newIndex = ids.indexOf(overId);
+        if (oldIndex !== -1 && newIndex !== -1 && oldIndex !== newIndex) {
+          const reordered = arrayMove(ids, oldIndex, newIndex);
+          finalColumns = { ...cols, [activeCol]: reordered };
+          setColumns(finalColumns);
         }
       }
 
-      // Skip if nothing changed
+      const finalCol = findColumn(finalColumns, activeId, visibleStatuses);
+      if (!finalCol) {
+        resetColumns();
+        return;
+      }
+
+      const map = issueMapRef.current;
+      const finalIds = finalColumns[finalCol]!;
+      const newPosition = computePosition(finalIds, activeId, map);
+      const currentIssue = map.get(activeId);
+
       if (
-        currentIssue.status === targetStatus &&
+        currentIssue &&
+        currentIssue.status === finalCol &&
         currentIssue.position === newPosition
       ) {
         return;
       }
 
-      onMoveIssue(issueId, targetStatus, newPosition);
+      onMoveIssue(activeId, finalCol, newPosition);
     },
-    [issues, issuesByStatus, onMoveIssue, visibleStatuses]
+    [issues, visibleStatuses, sortBy, sortDirection, onMoveIssue],
   );
 
   return (
@@ -168,6 +262,7 @@ export function BoardView({
       sensors={sensors}
       collisionDetection={kanbanCollision}
       onDragStart={handleDragStart}
+      onDragOver={handleDragOver}
       onDragEnd={handleDragEnd}
     >
       <div className="flex flex-1 min-h-0 gap-4 overflow-x-auto p-4">
@@ -175,7 +270,8 @@ export function BoardView({
           <BoardColumn
             key={status}
             status={status}
-            issues={issues.filter((i) => i.status === status)}
+            issueIds={columns[status] ?? []}
+            issueMap={issueMapRef.current}
           />
         ))}
 
@@ -187,9 +283,9 @@ export function BoardView({
         )}
       </div>
 
-      <DragOverlay>
+      <DragOverlay dropAnimation={null}>
         {activeIssue ? (
-          <div className="w-[280px] rotate-1 cursor-grabbing opacity-95 shadow-md">
+          <div className="w-[280px] rotate-2 scale-105 cursor-grabbing opacity-90 shadow-lg shadow-black/10">
             <BoardCardContent issue={activeIssue} />
           </div>
         ) : null}

apps/web/features/issues/components/comment-card.tsx

@@ -148,6 +148,8 @@ function CommentRow({
   };
 
   const reactions = entry.reactions ?? [];
+  const contentText = entry.content ?? "";
+  const isLongContent = contentText.length > 500 || contentText.split("\n").length > 8;
 
   return (
     <div className={`py-3${isTemp ? " opacity-60" : ""}`}>
@@ -252,7 +254,7 @@ function CommentRow({
               reactions={reactions}
               currentUserId={currentUserId}
               onToggle={(emoji) => onToggleReaction(entry.id, emoji)}
-              hideAddButton
+              hideAddButton={!isLongContent}
               className="mt-1.5 pl-8"
             />
           )}
@@ -330,6 +332,8 @@ function CommentCard({
   const replyCount = allNestedReplies.length;
   const contentPreview = (entry.content ?? "").replace(/\n/g, " ").slice(0, 80);
   const reactions = entry.reactions ?? [];
+  const contentText = entry.content ?? "";
+  const isLongContent = contentText.length > 500 || contentText.split("\n").length > 8;
 
   const isHighlighted = highlightedCommentId === entry.id;
 
@@ -458,6 +462,7 @@ function CommentCard({
                     reactions={reactions}
                     currentUserId={currentUserId}
                     onToggle={(emoji) => onToggleReaction(entry.id, emoji)}
+                    hideAddButton={!isLongContent}
                     className="mt-1.5 pl-10"
                   />
                 )}

apps/web/features/issues/components/comment-input.tsx

@@ -16,10 +16,15 @@ function CommentInput({ issueId, onSubmit }: CommentInputProps) {
   const editorRef = useRef<ContentEditorRef>(null);
   const [isEmpty, setIsEmpty] = useState(true);
   const [submitting, setSubmitting] = useState(false);
+  const [attachmentIds, setAttachmentIds] = useState<string[]>([]);
   const { uploadWithToast } = useFileUpload();
 
   const handleUpload = async (file: File) => {
-    return await uploadWithToast(file, { issueId });
+    const result = await uploadWithToast(file, { issueId });
+    if (result) {
+      setAttachmentIds((prev) => [...prev, result.id]);
+    }
+    return result;
   };
 
   const handleSubmit = async () => {
@@ -27,9 +32,10 @@ function CommentInput({ issueId, onSubmit }: CommentInputProps) {
     if (!content || submitting) return;
     setSubmitting(true);
     try {
-      await onSubmit(content);
+      await onSubmit(content, attachmentIds.length > 0 ? attachmentIds : undefined);
       editorRef.current?.clearContent();
       setIsEmpty(true);
+      setAttachmentIds([]);
     } finally {
       setSubmitting(false);
     }

apps/web/features/issues/components/issue-detail.tsx

@@ -63,10 +63,13 @@ import { StatusIcon, PriorityIcon, DueDatePicker, AssigneePicker, canAssignAgent
 import { CommentCard } from "./comment-card";
 import { CommentInput } from "./comment-input";
 import { AgentLiveCard, TaskRunHistory } from "./agent-live-card";
-import { api } from "@/shared/api";
+import { useQuery } from "@tanstack/react-query";
 import { useAuthStore } from "@/features/auth";
 import { useWorkspaceStore, useActorName } from "@/features/workspace";
-import { useIssueStore } from "@/features/issues";
+import { useWorkspaceId } from "@core/hooks";
+import { issueListOptions, issueDetailOptions } from "@core/issues/queries";
+import { memberListOptions, agentListOptions } from "@core/workspace/queries";
+import { useUpdateIssue, useDeleteIssue } from "@core/issues/mutations";
 import { useIssueTimeline } from "@/features/issues/hooks/use-issue-timeline";
 import { useIssueReactions } from "@/features/issues/hooks/use-issue-reactions";
 import { useIssueSubscribers } from "@/features/issues/hooks/use-issue-subscribers";
@@ -175,12 +178,13 @@ export function IssueDetail({ issueId, onDelete, defaultSidebarOpen = true, layo
   const router = useRouter();
   const user = useAuthStore((s) => s.user);
   const workspace = useWorkspaceStore((s) => s.workspace);
-  const members = useWorkspaceStore((s) => s.members);
-  const agents = useWorkspaceStore((s) => s.agents);
-  const currentMemberRole = members.find((m) => m.user_id === user?.id)?.role;
 
-  // Issue navigation
-  const allIssues = useIssueStore((s) => s.issues);
+  // Issue navigation — read from TQ list cache
+  const wsId = useWorkspaceId();
+  const { data: members = [] } = useQuery(memberListOptions(wsId));
+  const { data: agents = [] } = useQuery(agentListOptions(wsId));
+  const currentMemberRole = members.find((m) => m.user_id === user?.id)?.role;
+  const { data: allIssues = [] } = useQuery(issueListOptions(wsId));
   const currentIndex = allIssues.findIndex((i) => i.id === id);
   const prevIssue = currentIndex > 0 ? allIssues[currentIndex - 1] : null;
   const nextIssue = currentIndex < allIssues.length - 1 ? allIssues[currentIndex + 1] : null;
@@ -200,28 +204,11 @@ export function IssueDetail({ issueId, onDelete, defaultSidebarOpen = true, layo
   const [highlightedId, setHighlightedId] = useState<string | null>(null);
   const didHighlightRef = useRef<string | null>(null);
 
-  // Single source of truth: read issue directly from global store
-  const issue = useIssueStore((s) => s.issues.find((i) => i.id === id)) ?? null;
-  const [issueLoading, setIssueLoading] = useState(!issue);
-
-  // If issue isn't in the store yet, fetch and upsert it
-  useEffect(() => {
-    if (issue) {
-      setIssueLoading(false);
-      return;
-    }
-    setIssueLoading(true);
-    api
-      .getIssue(id)
-      .then((iss) => {
-        useIssueStore.getState().addIssue(iss);
-      })
-      .catch((e) => {
-        console.error(e);
-        toast.error("Failed to load issue");
-      })
-      .finally(() => setIssueLoading(false));
-  }, [id, !!issue]);
+  // Issue data from TQ — uses detail query, seeded from list cache if available
+  const { data: issue = null, isLoading: issueLoading } = useQuery({
+    ...issueDetailOptions(wsId, id),
+    initialData: () => allIssues.find((i) => i.id === id),
+  });
 
   // Custom hooks — encapsulate timeline, reactions, subscribers
   const {
@@ -273,18 +260,17 @@ export function IssueDetail({ issueId, onDelete, defaultSidebarOpen = true, layo
     scrollContainerRef.current?.scrollTo({ top: scrollContainerRef.current.scrollHeight, behavior: "smooth" });
   }, []);
 
-  // Issue field updates — write directly to the global store (single source of truth)
+  // Issue field updates via TQ mutation (optimistic update + rollback in mutation hook)
+  const updateIssueMutation = useUpdateIssue();
   const handleUpdateField = useCallback(
     (updates: Partial<UpdateIssueRequest>) => {
       if (!issue) return;
-      const prev = { ...issue };
-      useIssueStore.getState().updateIssue(id, updates);
-      api.updateIssue(id, updates).catch(() => {
-        useIssueStore.getState().updateIssue(id, prev);
-        toast.error("Failed to update issue");
-      });
+      updateIssueMutation.mutate(
+        { id, ...updates },
+        { onError: () => toast.error("Failed to update issue") },
+      );
     },
-    [issue, id],
+    [issue, id, updateIssueMutation],
   );
 
   const descEditorRef = useRef<ContentEditorRef>(null);
@@ -293,11 +279,11 @@ export function IssueDetail({ issueId, onDelete, defaultSidebarOpen = true, layo
     [uploadWithToast, id],
   );
 
+  const deleteIssueMutation = useDeleteIssue();
   const handleDelete = async () => {
     setDeleting(true);
     try {
-      await api.deleteIssue(issue!.id);
-      useIssueStore.getState().removeIssue(issue!.id);
+      await deleteIssueMutation.mutateAsync(issue!.id);
       toast.success("Issue deleted");
       if (onDelete) onDelete();
       else router.push("/issues");

apps/web/features/issues/components/issue-mention-card.tsx

@@ -1,7 +1,9 @@
 "use client";
 
 import Link from "next/link";
-import { useIssueStore } from "@/features/issues/store";
+import { useQuery } from "@tanstack/react-query";
+import { issueListOptions } from "@core/issues/queries";
+import { useWorkspaceId } from "@core/hooks";
 import { StatusIcon } from "./status-icon";
 
 interface IssueMentionCardProps {
@@ -11,7 +13,9 @@ interface IssueMentionCardProps {
 }
 
 export function IssueMentionCard({ issueId, fallbackLabel }: IssueMentionCardProps) {
-  const issue = useIssueStore((s) => s.issues.find((i) => i.id === issueId));
+  const wsId = useWorkspaceId();
+  const { data: issues = [] } = useQuery(issueListOptions(wsId));
+  const issue = issues.find((i) => i.id === issueId);
 
   if (!issue) {
     return (

apps/web/features/issues/components/issues-header.tsx

@@ -43,7 +43,9 @@ import {
   PRIORITY_CONFIG,
 } from "@/features/issues/config";
 import { StatusIcon, PriorityIcon } from "@/features/issues/components";
-import { useWorkspaceStore } from "@/features/workspace";
+import { useQuery } from "@tanstack/react-query";
+import { useWorkspaceId } from "@core/hooks";
+import { memberListOptions, agentListOptions } from "@core/workspace/queries";
 import { ActorAvatar } from "@/components/common/actor-avatar";
 import {
   useIssueViewStore,
@@ -155,8 +157,9 @@ function ActorSubContent({
   noAssigneeCount?: number;
 }) {
   const [search, setSearch] = useState("");
-  const members = useWorkspaceStore((s) => s.members);
-  const agents = useWorkspaceStore((s) => s.agents);
+  const wsId = useWorkspaceId();
+  const { data: members = [] } = useQuery(memberListOptions(wsId));
+  const { data: agents = [] } = useQuery(agentListOptions(wsId));
   const query = search.toLowerCase();
   const filteredMembers = members.filter((m) =>
     m.name.toLowerCase().includes(query),

apps/web/features/issues/components/issues-page.tsx

@@ -5,7 +5,7 @@ import { toast } from "sonner";
 import { ChevronRight, ListTodo } from "lucide-react";
 import type { IssueStatus } from "@/shared/types";
 import { Skeleton } from "@/components/ui/skeleton";
-import { useIssueStore } from "@/features/issues/store";
+import { useQuery } from "@tanstack/react-query";
 import { useIssueViewStore, initFilterWorkspaceSync } from "@/features/issues/stores/view-store";
 import { useIssuesScopeStore } from "@/features/issues/stores/issues-scope-store";
 import { ViewStoreProvider } from "@/features/issues/stores/view-store-context";
@@ -13,7 +13,9 @@ import { filterIssues } from "@/features/issues/utils/filter";
 import { BOARD_STATUSES } from "@/features/issues/config";
 import { useWorkspaceStore } from "@/features/workspace";
 import { WorkspaceAvatar } from "@/features/workspace";
-import { api } from "@/shared/api";
+import { useWorkspaceId } from "@core/hooks";
+import { issueListOptions } from "@core/issues/queries";
+import { useUpdateIssue } from "@core/issues/mutations";
 import { useIssueSelectionStore } from "@/features/issues/stores/selection-store";
 import { IssuesHeader } from "./issues-header";
 import { BoardView } from "./board-view";
@@ -21,8 +23,9 @@ import { ListView } from "./list-view";
 import { BatchActionToolbar } from "./batch-action-toolbar";
 
 export function IssuesPage() {
-  const allIssues = useIssueStore((s) => s.issues);
-  const loading = useIssueStore((s) => s.loading);
+  const wsId = useWorkspaceId();
+  const { data: allIssues = [], isLoading: loading } = useQuery(issueListOptions(wsId));
+
   const workspace = useWorkspaceStore((s) => s.workspace);
   const scope = useIssuesScopeStore((s) => s.scope);
   const viewMode = useIssueViewStore((s) => s.viewMode);
@@ -64,6 +67,7 @@ export function IssuesPage() {
     return BOARD_STATUSES.filter((s) => !visibleStatuses.includes(s));
   }, [visibleStatuses]);
 
+  const updateIssueMutation = useUpdateIssue();
   const handleMoveIssue = useCallback(
     (issueId: string, newStatus: IssueStatus, newPosition?: number) => {
       // Auto-switch to manual sort so drag ordering is preserved
@@ -78,16 +82,12 @@ export function IssuesPage() {
       };
       if (newPosition !== undefined) updates.position = newPosition;
 
-      useIssueStore.getState().updateIssue(issueId, updates);
-
-      api.updateIssue(issueId, updates).catch(() => {
-        toast.error("Failed to move issue");
-        api.listIssues({ limit: 200 }).then((res) => {
-          useIssueStore.getState().setIssues(res.issues);
-        }).catch(console.error);
-      });
+      updateIssueMutation.mutate(
+        { id: issueId, ...updates },
+        { onError: () => toast.error("Failed to move issue") },
+      );
     },
-    []
+    [updateIssueMutation],
   );
 
   if (loading) {

apps/web/features/issues/components/pickers/assignee-picker.tsx

@@ -3,8 +3,11 @@
 import { useState } from "react";
 import { Lock, UserMinus } from "lucide-react";
 import type { Agent, IssueAssigneeType, UpdateIssueRequest } from "@/shared/types";
+import { useQuery } from "@tanstack/react-query";
 import { useAuthStore } from "@/features/auth";
-import { useWorkspaceStore, useActorName } from "@/features/workspace";
+import { useActorName } from "@/features/workspace";
+import { useWorkspaceId } from "@core/hooks";
+import { memberListOptions, agentListOptions } from "@core/workspace/queries";
 import { ActorAvatar } from "@/components/common/actor-avatar";
 import {
   PropertyPicker,
@@ -44,8 +47,9 @@ export function AssigneePicker({
   const setOpen = controlledOnOpenChange ?? setInternalOpen;
   const [filter, setFilter] = useState("");
   const user = useAuthStore((s) => s.user);
-  const members = useWorkspaceStore((s) => s.members);
-  const agents = useWorkspaceStore((s) => s.agents);
+  const wsId = useWorkspaceId();
+  const { data: members = [] } = useQuery(memberListOptions(wsId));
+  const { data: agents = [] } = useQuery(agentListOptions(wsId));
   const { getActorName } = useActorName();
 
   const currentMember = members.find((m) => m.user_id === user?.id);

apps/web/features/issues/components/reply-input.tsx

@@ -38,6 +38,7 @@ function ReplyInput({
   const [isEmpty, setIsEmpty] = useState(true);
   const [isExpanded, setIsExpanded] = useState(false);
   const [submitting, setSubmitting] = useState(false);
+  const [attachmentIds, setAttachmentIds] = useState<string[]>([]);
   const { uploadWithToast } = useFileUpload();
 
   useEffect(() => {
@@ -52,7 +53,11 @@ function ReplyInput({
   }, []);
 
   const handleUpload = async (file: File) => {
-    return await uploadWithToast(file, { issueId });
+    const result = await uploadWithToast(file, { issueId });
+    if (result) {
+      setAttachmentIds((prev) => [...prev, result.id]);
+    }
+    return result;
   };
 
   const handleSubmit = async () => {
@@ -60,9 +65,10 @@ function ReplyInput({
     if (!content || submitting) return;
     setSubmitting(true);
     try {
-      await onSubmit(content);
+      await onSubmit(content, attachmentIds.length > 0 ? attachmentIds : undefined);
       editorRef.current?.clearContent();
       setIsEmpty(true);
+      setAttachmentIds([]);
     } finally {
       setSubmitting(false);
     }

apps/web/features/issues/hooks/use-issue-reactions.ts

@@ -1,38 +1,29 @@
 "use client";
 
-import { useState, useEffect, useCallback } from "react";
+import { useCallback } from "react";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
 import type { IssueReaction } from "@/shared/types";
 import type {
   IssueReactionAddedPayload,
   IssueReactionRemovedPayload,
 } from "@/shared/types";
-import { api } from "@/shared/api";
-import { toast } from "sonner";
+import { issueReactionsOptions, issueKeys } from "@core/issues/queries";
+import { useToggleIssueReaction } from "@core/issues/mutations";
 import { useWSEvent, useWSReconnect } from "@/features/realtime";
 
 export function useIssueReactions(issueId: string, userId?: string) {
-  const [reactions, setReactions] = useState<IssueReaction[]>([]);
-  const [loading, setLoading] = useState(true);
+  const qc = useQueryClient();
+  const { data: reactions = [], isLoading: loading } = useQuery(
+    issueReactionsOptions(issueId),
+  );
 
-  // Initial fetch
-  useEffect(() => {
-    setReactions([]);
-    setLoading(true);
-    api
-      .getIssue(issueId)
-      .then((iss) => setReactions(iss.reactions ?? []))
-      .catch((e) => {
-        console.error(e);
-        toast.error("Failed to load reactions");
-      })
-      .finally(() => setLoading(false));
-  }, [issueId]);
+  const toggleMutation = useToggleIssueReaction(issueId);
 
   // Reconnect recovery
   useWSReconnect(
     useCallback(() => {
-      api.getIssue(issueId).then((iss) => setReactions(iss.reactions ?? [])).catch(console.error);
-    }, [issueId]),
+      qc.invalidateQueries({ queryKey: issueKeys.reactions(issueId) });
+    }, [qc, issueId]),
   );
 
   // --- WS event handlers ---
@@ -43,13 +34,18 @@ export function useIssueReactions(issueId: string, userId?: string) {
       (payload: unknown) => {
         const { reaction, issue_id } = payload as IssueReactionAddedPayload;
         if (issue_id !== issueId) return;
-        if (reaction.actor_type === "member" && reaction.actor_id === userId) return;
-        setReactions((prev) => {
-          if (prev.some((r) => r.id === reaction.id)) return prev;
-          return [...prev, reaction];
-        });
+        if (reaction.actor_type === "member" && reaction.actor_id === userId)
+          return;
+        qc.setQueryData<IssueReaction[]>(
+          issueKeys.reactions(issueId),
+          (old) => {
+            if (!old) return old;
+            if (old.some((r) => r.id === reaction.id)) return old;
+            return [...old, reaction];
+          },
+        );
       },
-      [issueId, userId],
+      [qc, issueId, userId],
     ),
   );
 
@@ -60,13 +56,20 @@ export function useIssueReactions(issueId: string, userId?: string) {
         const p = payload as IssueReactionRemovedPayload;
         if (p.issue_id !== issueId) return;
         if (p.actor_type === "member" && p.actor_id === userId) return;
-        setReactions((prev) =>
-          prev.filter(
-            (r) => !(r.emoji === p.emoji && r.actor_type === p.actor_type && r.actor_id === p.actor_id),
-          ),
+        qc.setQueryData<IssueReaction[]>(
+          issueKeys.reactions(issueId),
+          (old) =>
+            old?.filter(
+              (r) =>
+                !(
+                  r.emoji === p.emoji &&
+                  r.actor_type === p.actor_type &&
+                  r.actor_id === p.actor_id
+                ),
+            ),
         );
       },
-      [issueId, userId],
+      [qc, issueId, userId],
     ),
   );
 
@@ -76,36 +79,14 @@ export function useIssueReactions(issueId: string, userId?: string) {
     async (emoji: string) => {
       if (!userId) return;
       const existing = reactions.find(
-        (r) => r.emoji === emoji && r.actor_type === "member" && r.actor_id === userId,
+        (r) =>
+          r.emoji === emoji &&
+          r.actor_type === "member" &&
+          r.actor_id === userId,
       );
-      if (existing) {
-        setReactions((prev) => prev.filter((r) => r.id !== existing.id));
-        try {
-          await api.removeIssueReaction(issueId, emoji);
-        } catch {
-          setReactions((prev) => [...prev, existing]);
-          toast.error("Failed to remove reaction");
-        }
-      } else {
-        const temp: IssueReaction = {
-          id: `temp-${Date.now()}`,
-          issue_id: issueId,
-          actor_type: "member",
-          actor_id: userId,
-          emoji,
-          created_at: new Date().toISOString(),
-        };
-        setReactions((prev) => [...prev, temp]);
-        try {
-          const reaction = await api.addIssueReaction(issueId, emoji);
-          setReactions((prev) => prev.map((r) => (r.id === temp.id ? reaction : r)));
-        } catch {
-          setReactions((prev) => prev.filter((r) => r.id !== temp.id));
-          toast.error("Failed to add reaction");
-        }
-      }
+      toggleMutation.mutate({ emoji, existing });
     },
-    [issueId, userId, reactions],
+    [userId, reactions, toggleMutation],
   );
 
   return { reactions, loading, toggleReaction };

apps/web/features/issues/hooks/use-issue-subscribers.ts

@@ -1,38 +1,29 @@
 "use client";
 
-import { useState, useEffect, useCallback } from "react";
+import { useCallback } from "react";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
 import type { IssueSubscriber } from "@/shared/types";
 import type {
   SubscriberAddedPayload,
   SubscriberRemovedPayload,
 } from "@/shared/types";
-import { api } from "@/shared/api";
-import { toast } from "sonner";
+import { issueSubscribersOptions, issueKeys } from "@core/issues/queries";
+import { useToggleIssueSubscriber } from "@core/issues/mutations";
 import { useWSEvent, useWSReconnect } from "@/features/realtime";
 
 export function useIssueSubscribers(issueId: string, userId?: string) {
-  const [subscribers, setSubscribers] = useState<IssueSubscriber[]>([]);
-  const [loading, setLoading] = useState(true);
+  const qc = useQueryClient();
+  const { data: subscribers = [], isLoading: loading } = useQuery(
+    issueSubscribersOptions(issueId),
+  );
 
-  // Initial fetch
-  useEffect(() => {
-    setSubscribers([]);
-    setLoading(true);
-    api
-      .listIssueSubscribers(issueId)
-      .then((subs) => setSubscribers(subs))
-      .catch((e) => {
-        console.error(e);
-        toast.error("Failed to load subscribers");
-      })
-      .finally(() => setLoading(false));
-  }, [issueId]);
+  const toggleMutation = useToggleIssueSubscriber(issueId);
 
   // Reconnect recovery
   useWSReconnect(
     useCallback(() => {
-      api.listIssueSubscribers(issueId).then(setSubscribers).catch(console.error);
-    }, [issueId]),
+      qc.invalidateQueries({ queryKey: issueKeys.subscribers(issueId) });
+    }, [qc, issueId]),
   );
 
   // --- WS event handlers ---
@@ -43,21 +34,31 @@ export function useIssueSubscribers(issueId: string, userId?: string) {
       (payload: unknown) => {
         const p = payload as SubscriberAddedPayload;
         if (p.issue_id !== issueId) return;
-        setSubscribers((prev) => {
-          if (prev.some((s) => s.user_id === p.user_id && s.user_type === p.user_type)) return prev;
-          return [
-            ...prev,
-            {
-              issue_id: p.issue_id,
-              user_type: p.user_type as "member" | "agent",
-              user_id: p.user_id,
-              reason: p.reason as IssueSubscriber["reason"],
-              created_at: new Date().toISOString(),
-            },
-          ];
-        });
+        qc.setQueryData<IssueSubscriber[]>(
+          issueKeys.subscribers(issueId),
+          (old) => {
+            if (!old) return old;
+            if (
+              old.some(
+                (s) =>
+                  s.user_id === p.user_id && s.user_type === p.user_type,
+              )
+            )
+              return old;
+            return [
+              ...old,
+              {
+                issue_id: p.issue_id,
+                user_type: p.user_type as "member" | "agent",
+                user_id: p.user_id,
+                reason: p.reason as IssueSubscriber["reason"],
+                created_at: new Date().toISOString(),
+              },
+            ];
+          },
+        );
       },
-      [issueId],
+      [qc, issueId],
     ),
   );
 
@@ -67,11 +68,16 @@ export function useIssueSubscribers(issueId: string, userId?: string) {
       (payload: unknown) => {
         const p = payload as SubscriberRemovedPayload;
         if (p.issue_id !== issueId) return;
-        setSubscribers((prev) =>
-          prev.filter((s) => !(s.user_id === p.user_id && s.user_type === p.user_type)),
+        qc.setQueryData<IssueSubscriber[]>(
+          issueKeys.subscribers(issueId),
+          (old) =>
+            old?.filter(
+              (s) =>
+                !(s.user_id === p.user_id && s.user_type === p.user_type),
+            ),
         );
       },
-      [issueId],
+      [qc, issueId],
     ),
   );
 
@@ -82,50 +88,29 @@ export function useIssueSubscribers(issueId: string, userId?: string) {
   );
 
   const toggleSubscriber = useCallback(
-    async (subUserId: string, userType: "member" | "agent", currentlySubscribed: boolean) => {
-      if (currentlySubscribed) {
-        // Optimistic remove + rollback on error
-        const removed = subscribers.find(
-          (s) => s.user_id === subUserId && s.user_type === userType,
-        );
-        setSubscribers((prev) =>
-          prev.filter((s) => !(s.user_id === subUserId && s.user_type === userType)),
-        );
-        try {
-          await api.unsubscribeFromIssue(issueId, subUserId, userType);
-        } catch {
-          if (removed) setSubscribers((prev) => [...prev, removed]);
-          toast.error("Failed to update subscriber");
-        }
-      } else {
-        // Optimistic add
-        const tempSub: IssueSubscriber = {
-          issue_id: issueId,
-          user_type: userType,
-          user_id: subUserId,
-          reason: "manual" as const,
-          created_at: new Date().toISOString(),
-        };
-        setSubscribers((prev) => {
-          if (prev.some((s) => s.user_id === subUserId && s.user_type === userType)) return prev;
-          return [...prev, tempSub];
-        });
-        try {
-          await api.subscribeToIssue(issueId, subUserId, userType);
-        } catch {
-          setSubscribers((prev) =>
-            prev.filter((s) => !(s.user_id === subUserId && s.user_type === userType && s.reason === "manual")),
-          );
-          toast.error("Failed to update subscriber");
-        }
-      }
+    async (
+      subUserId: string,
+      userType: "member" | "agent",
+      currentlySubscribed: boolean,
+    ) => {
+      toggleMutation.mutate({
+        userId: subUserId,
+        userType,
+        subscribed: currentlySubscribed,
+      });
     },
-    [issueId, subscribers],
+    [toggleMutation],
   );
 
   const toggleSubscribe = useCallback(() => {
     if (userId) toggleSubscriber(userId, "member", isSubscribed);
   }, [userId, isSubscribed, toggleSubscriber]);
 
-  return { subscribers, loading, isSubscribed, toggleSubscribe, toggleSubscriber };
+  return {
+    subscribers,
+    loading,
+    isSubscribed,
+    toggleSubscribe,
+    toggleSubscriber,
+  };
 }

apps/web/features/issues/hooks/use-issue-timeline.ts

@@ -1,7 +1,8 @@
 "use client";
 
-import { useState, useEffect, useCallback } from "react";
-import type { Comment, TimelineEntry } from "@/shared/types";
+import { useState, useCallback } from "react";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import type { Comment, TimelineEntry, Reaction } from "@/shared/types";
 import type {
   CommentCreatedPayload,
   CommentUpdatedPayload,
@@ -10,7 +11,13 @@ import type {
   ReactionAddedPayload,
   ReactionRemovedPayload,
 } from "@/shared/types";
-import { api } from "@/shared/api";
+import { issueTimelineOptions, issueKeys } from "@core/issues/queries";
+import {
+  useCreateComment,
+  useUpdateComment,
+  useDeleteComment,
+  useToggleCommentReaction,
+} from "@core/issues/mutations";
 import { useWSEvent, useWSReconnect } from "@/features/realtime";
 import { toast } from "sonner";
 
@@ -30,29 +37,22 @@ function commentToTimelineEntry(c: Comment): TimelineEntry {
 }
 
 export function useIssueTimeline(issueId: string, userId?: string) {
-  const [timeline, setTimeline] = useState<TimelineEntry[]>([]);
+  const qc = useQueryClient();
+  const { data: timeline = [], isLoading: loading } = useQuery(
+    issueTimelineOptions(issueId),
+  );
   const [submitting, setSubmitting] = useState(false);
-  const [loading, setLoading] = useState(true);
 
-  // Initial fetch + reset on id change
-  useEffect(() => {
-    setTimeline([]);
-    setLoading(true);
-    api
-      .listTimeline(issueId)
-      .then((entries) => setTimeline(entries))
-      .catch((e) => {
-        console.error(e);
-        toast.error("Failed to load activity");
-      })
-      .finally(() => setLoading(false));
-  }, [issueId]);
+  const createCommentMutation = useCreateComment(issueId);
+  const updateCommentMutation = useUpdateComment(issueId);
+  const deleteCommentMutation = useDeleteComment(issueId);
+  const toggleReactionMutation = useToggleCommentReaction(issueId);
 
   // Reconnect recovery
   useWSReconnect(
     useCallback(() => {
-      api.listTimeline(issueId).then(setTimeline).catch(console.error);
-    }, [issueId]),
+      qc.invalidateQueries({ queryKey: issueKeys.timeline(issueId) });
+    }, [qc, issueId]),
   );
 
   // --- WS event handlers ---
@@ -63,13 +63,21 @@ export function useIssueTimeline(issueId: string, userId?: string) {
       (payload: unknown) => {
         const { comment } = payload as CommentCreatedPayload;
         if (comment.issue_id !== issueId) return;
-        if (comment.author_type === "member" && comment.author_id === userId) return;
-        setTimeline((prev) => {
-          if (prev.some((e) => e.id === comment.id)) return prev;
-          return [...prev, commentToTimelineEntry(comment)];
-        });
+        if (
+          comment.author_type === "member" &&
+          comment.author_id === userId
+        )
+          return;
+        qc.setQueryData<TimelineEntry[]>(
+          issueKeys.timeline(issueId),
+          (old) => {
+            if (!old) return old;
+            if (old.some((e) => e.id === comment.id)) return old;
+            return [...old, commentToTimelineEntry(comment)];
+          },
+        );
       },
-      [issueId, userId],
+      [qc, issueId, userId],
     ),
   );
 
@@ -79,12 +87,16 @@ export function useIssueTimeline(issueId: string, userId?: string) {
       (payload: unknown) => {
         const { comment } = payload as CommentUpdatedPayload;
         if (comment.issue_id === issueId) {
-          setTimeline((prev) =>
-            prev.map((e) => (e.id === comment.id ? commentToTimelineEntry(comment) : e)),
+          qc.setQueryData<TimelineEntry[]>(
+            issueKeys.timeline(issueId),
+            (old) =>
+              old?.map((e) =>
+                e.id === comment.id ? commentToTimelineEntry(comment) : e,
+              ),
           );
         }
       },
-      [issueId],
+      [qc, issueId],
     ),
   );
 
@@ -94,23 +106,31 @@ export function useIssueTimeline(issueId: string, userId?: string) {
       (payload: unknown) => {
         const { comment_id, issue_id } = payload as CommentDeletedPayload;
         if (issue_id === issueId) {
-          setTimeline((prev) => {
-            const idsToRemove = new Set<string>([comment_id]);
-            let added = true;
-            while (added) {
-              added = false;
-              for (const e of prev) {
-                if (e.parent_id && idsToRemove.has(e.parent_id) && !idsToRemove.has(e.id)) {
-                  idsToRemove.add(e.id);
-                  added = true;
+          qc.setQueryData<TimelineEntry[]>(
+            issueKeys.timeline(issueId),
+            (old) => {
+              if (!old) return old;
+              const idsToRemove = new Set<string>([comment_id]);
+              let added = true;
+              while (added) {
+                added = false;
+                for (const e of old) {
+                  if (
+                    e.parent_id &&
+                    idsToRemove.has(e.parent_id) &&
+                    !idsToRemove.has(e.id)
+                  ) {
+                    idsToRemove.add(e.id);
+                    added = true;
+                  }
                 }
               }
-            }
-            return prev.filter((e) => !idsToRemove.has(e.id));
-          });
+              return old.filter((e) => !idsToRemove.has(e.id));
+            },
+          );
         }
       },
-      [issueId],
+      [qc, issueId],
     ),
   );
 
@@ -122,12 +142,16 @@ export function useIssueTimeline(issueId: string, userId?: string) {
         if (p.issue_id !== issueId) return;
         const entry = p.entry;
         if (!entry || !entry.id) return;
-        setTimeline((prev) => {
-          if (prev.some((e) => e.id === entry.id)) return prev;
-          return [...prev, entry];
-        });
+        qc.setQueryData<TimelineEntry[]>(
+          issueKeys.timeline(issueId),
+          (old) => {
+            if (!old) return old;
+            if (old.some((e) => e.id === entry.id)) return old;
+            return [...old, entry];
+          },
+        );
       },
-      [issueId],
+      [qc, issueId],
     ),
   );
 
@@ -137,17 +161,23 @@ export function useIssueTimeline(issueId: string, userId?: string) {
       (payload: unknown) => {
         const { reaction, issue_id } = payload as ReactionAddedPayload;
         if (issue_id !== issueId) return;
-        if (reaction.actor_type === "member" && reaction.actor_id === userId) return;
-        setTimeline((prev) =>
-          prev.map((e) => {
-            if (e.id !== reaction.comment_id) return e;
-            const existing = e.reactions ?? [];
-            if (existing.some((r) => r.id === reaction.id)) return e;
-            return { ...e, reactions: [...existing, reaction] };
-          }),
+        if (
+          reaction.actor_type === "member" &&
+          reaction.actor_id === userId
+        )
+          return;
+        qc.setQueryData<TimelineEntry[]>(
+          issueKeys.timeline(issueId),
+          (old) =>
+            old?.map((e) => {
+              if (e.id !== reaction.comment_id) return e;
+              const existing = e.reactions ?? [];
+              if (existing.some((r) => r.id === reaction.id)) return e;
+              return { ...e, reactions: [...existing, reaction] };
+            }),
         );
       },
-      [issueId, userId],
+      [qc, issueId, userId],
     ),
   );
 
@@ -158,19 +188,26 @@ export function useIssueTimeline(issueId: string, userId?: string) {
         const p = payload as ReactionRemovedPayload;
         if (p.issue_id !== issueId) return;
         if (p.actor_type === "member" && p.actor_id === userId) return;
-        setTimeline((prev) =>
-          prev.map((e) => {
-            if (e.id !== p.comment_id) return e;
-            return {
-              ...e,
-              reactions: (e.reactions ?? []).filter(
-                (r) => !(r.emoji === p.emoji && r.actor_type === p.actor_type && r.actor_id === p.actor_id),
-              ),
-            };
-          }),
+        qc.setQueryData<TimelineEntry[]>(
+          issueKeys.timeline(issueId),
+          (old) =>
+            old?.map((e) => {
+              if (e.id !== p.comment_id) return e;
+              return {
+                ...e,
+                reactions: (e.reactions ?? []).filter(
+                  (r) =>
+                    !(
+                      r.emoji === p.emoji &&
+                      r.actor_type === p.actor_type &&
+                      r.actor_id === p.actor_id
+                    ),
+                ),
+              };
+            }),
         );
       },
-      [issueId, userId],
+      [qc, issueId, userId],
     ),
   );
 
@@ -181,10 +218,9 @@ export function useIssueTimeline(issueId: string, userId?: string) {
       if (!content.trim() || submitting || !userId) return;
       setSubmitting(true);
       try {
-        const comment = await api.createComment(issueId, content, undefined, undefined, attachmentIds);
-        setTimeline((prev) => {
-          if (prev.some((e) => e.id === comment.id)) return prev;
-          return [...prev, commentToTimelineEntry(comment)];
+        await createCommentMutation.mutateAsync({
+          content,
+          attachmentIds,
         });
       } catch {
         toast.error("Failed to send comment");
@@ -192,147 +228,61 @@ export function useIssueTimeline(issueId: string, userId?: string) {
         setSubmitting(false);
       }
     },
-    [issueId, userId],
+    [userId, submitting, createCommentMutation],
   );
 
   const submitReply = useCallback(
     async (parentId: string, content: string, attachmentIds?: string[]) => {
       if (!content.trim() || !userId) return;
       try {
-        const comment = await api.createComment(issueId, content, "comment", parentId, attachmentIds);
-        setTimeline((prev) => {
-          if (prev.some((e) => e.id === comment.id)) return prev;
-          return [...prev, commentToTimelineEntry(comment)];
+        await createCommentMutation.mutateAsync({
+          content,
+          type: "comment",
+          parentId,
+          attachmentIds,
         });
       } catch {
         toast.error("Failed to send reply");
       }
     },
-    [issueId, userId],
+    [userId, createCommentMutation],
   );
 
   const editComment = useCallback(
     async (commentId: string, content: string) => {
-      // Optimistic: update content immediately
-      let prevContent: string | undefined;
-      setTimeline((prev) =>
-        prev.map((e) => {
-          if (e.id !== commentId) return e;
-          prevContent = e.content;
-          return { ...e, content, updated_at: new Date().toISOString() };
-        }),
-      );
       try {
-        const updated = await api.updateComment(commentId, content);
-        setTimeline((prev) =>
-          prev.map((e) => (e.id === updated.id ? commentToTimelineEntry(updated) : e)),
-        );
+        await updateCommentMutation.mutateAsync({ commentId, content });
       } catch {
-        // Rollback
-        if (prevContent !== undefined) {
-          setTimeline((prev) =>
-            prev.map((e) => (e.id === commentId ? { ...e, content: prevContent! } : e)),
-          );
-        }
         toast.error("Failed to update comment");
       }
     },
-    [],
+    [updateCommentMutation],
   );
 
   const deleteComment = useCallback(
     async (commentId: string) => {
-      // Capture entries for rollback
-      let removedEntries: TimelineEntry[] = [];
-      setTimeline((prev) => {
-        const idsToRemove = new Set<string>([commentId]);
-        let added = true;
-        while (added) {
-          added = false;
-          for (const e of prev) {
-            if (e.parent_id && idsToRemove.has(e.parent_id) && !idsToRemove.has(e.id)) {
-              idsToRemove.add(e.id);
-              added = true;
-            }
-          }
-        }
-        removedEntries = prev.filter((e) => idsToRemove.has(e.id));
-        return prev.filter((e) => !idsToRemove.has(e.id));
-      });
       try {
-        await api.deleteComment(commentId);
+        await deleteCommentMutation.mutateAsync(commentId);
       } catch {
-        // Rollback: re-add removed entries
-        setTimeline((prev) => [...prev, ...removedEntries]);
         toast.error("Failed to delete comment");
       }
     },
-    [],
+    [deleteCommentMutation],
   );
 
   const toggleReaction = useCallback(
     async (commentId: string, emoji: string) => {
       if (!userId) return;
       const entry = timeline.find((e) => e.id === commentId);
-      const existing = (entry?.reactions ?? []).find(
-        (r) => r.emoji === emoji && r.actor_type === "member" && r.actor_id === userId,
+      const existing: Reaction | undefined = (entry?.reactions ?? []).find(
+        (r) =>
+          r.emoji === emoji &&
+          r.actor_type === "member" &&
+          r.actor_id === userId,
       );
-      if (existing) {
-        setTimeline((prev) =>
-          prev.map((e) => {
-            if (e.id !== commentId) return e;
-            return { ...e, reactions: (e.reactions ?? []).filter((r) => r.id !== existing.id) };
-          }),
-        );
-        try {
-          await api.removeReaction(commentId, emoji);
-        } catch {
-          setTimeline((prev) =>
-            prev.map((e) => {
-              if (e.id !== commentId) return e;
-              return { ...e, reactions: [...(e.reactions ?? []), existing] };
-            }),
-          );
-          toast.error("Failed to remove reaction");
-        }
-      } else {
-        const tempReaction = {
-          id: `temp-${Date.now()}`,
-          comment_id: commentId,
-          actor_type: "member",
-          actor_id: userId,
-          emoji,
-          created_at: new Date().toISOString(),
-        };
-        setTimeline((prev) =>
-          prev.map((e) => {
-            if (e.id !== commentId) return e;
-            return { ...e, reactions: [...(e.reactions ?? []), tempReaction] };
-          }),
-        );
-        try {
-          const reaction = await api.addReaction(commentId, emoji);
-          setTimeline((prev) =>
-            prev.map((e) => {
-              if (e.id !== commentId) return e;
-              return {
-                ...e,
-                reactions: (e.reactions ?? []).map((r) => (r.id === tempReaction.id ? reaction : r)),
-              };
-            }),
-          );
-        } catch {
-          setTimeline((prev) =>
-            prev.map((e) => {
-              if (e.id !== commentId) return e;
-              return { ...e, reactions: (e.reactions ?? []).filter((r) => r.id !== tempReaction.id) };
-            }),
-          );
-          toast.error("Failed to add reaction");
-        }
-      }
+      toggleReactionMutation.mutate({ commentId, emoji, existing });
     },
-    [userId, timeline],
+    [userId, timeline, toggleReactionMutation],
   );
 
   return {

apps/web/features/issues/store.ts

@@ -1,57 +1,13 @@
 "use client";
 
 import { create } from "zustand";
-import type { Issue } from "@/shared/types";
-import { toast } from "sonner";
-import { api } from "@/shared/api";
-import { createLogger } from "@/shared/logger";
 
-const logger = createLogger("issue-store");
-
-interface IssueState {
-  issues: Issue[];
-  loading: boolean;
+interface IssueClientState {
   activeIssueId: string | null;
-  fetch: () => Promise<void>;
-  setIssues: (issues: Issue[]) => void;
-  addIssue: (issue: Issue) => void;
-  updateIssue: (id: string, updates: Partial<Issue>) => void;
-  removeIssue: (id: string) => void;
   setActiveIssue: (id: string | null) => void;
 }
 
-export const useIssueStore = create<IssueState>((set, get) => ({
-  issues: [],
-  loading: true,
+export const useIssueStore = create<IssueClientState>((set) => ({
   activeIssueId: null,
-
-  fetch: async () => {
-    logger.debug("fetch start");
-    const isInitialLoad = get().issues.length === 0;
-    if (isInitialLoad) set({ loading: true });
-    try {
-      const res = await api.listIssues({ limit: 200 });
-      logger.info("fetched", res.issues.length, "issues");
-      set({ issues: res.issues, loading: false });
-    } catch (err) {
-      logger.error("fetch failed", err);
-      toast.error("Failed to load issues");
-      if (isInitialLoad) set({ loading: false });
-    }
-  },
-
-  setIssues: (issues) => set({ issues }),
-  addIssue: (issue) =>
-    set((s) => ({
-      issues: s.issues.some((i) => i.id === issue.id)
-        ? s.issues
-        : [...s.issues, issue],
-    })),
-  updateIssue: (id, updates) =>
-    set((s) => ({
-      issues: s.issues.map((i) => (i.id === id ? { ...i, ...updates } : i)),
-    })),
-  removeIssue: (id) =>
-    set((s) => ({ issues: s.issues.filter((i) => i.id !== id) })),
   setActiveIssue: (id) => set({ activeIssueId: id }),
 }));

apps/web/features/landing/i18n/en.ts

@@ -131,7 +131,7 @@ export const en: LandingDict = {
       {
         title: "Create your first agent",
         description:
-          "Give it a name, write instructions, attach skills, and set triggers. Choose when it activates: on assignment, on comment, or on mention.",
+          "Give it a name, write instructions, and attach skills. Agents automatically activate on assignment, on comment, or on mention.",
       },
       {
         title: "Assign an issue and watch it work",
@@ -272,6 +272,35 @@ export const en: LandingDict = {
     title: "Changelog",
     subtitle: "New updates and improvements to Multica.",
     entries: [
+      {
+        version: "0.1.8",
+        date: "2026-04-07",
+        title: "OAuth, OpenClaw & Issue Loading",
+        changes: [
+          "Google OAuth login",
+          "OpenClaw runtime support for running agents on OpenClaw infrastructure",
+          "Redesigned agent live card — always sticky with manual expand/collapse toggle",
+          "Load all open issues without pagination limit; closed issues paginate on scroll",
+          "JWT and CloudFront cookie expiration extended from 72 hours to 30 days",
+          "Remember last selected workspace after re-login",
+          "Daemon ensures multica CLI is on PATH in agent task environment",
+          "PR template and CLI install guide for agent-driven setup",
+        ],
+      },
+      {
+        version: "0.1.7",
+        date: "2026-04-05",
+        title: "Comment Pagination & CLI Polish",
+        changes: [
+          "Comment list pagination in both the API and CLI",
+          "Inbox archive now dismisses all items for the same issue at once",
+          "CLI help output overhauled to match gh CLI style with examples",
+          "Attachments use UUIDv7 as S3 key and auto-link on issue/comment creation",
+          "@mention assigned agents on done or cancelled issues",
+          "Reply @mention inheritance skips when the reply only mentions members",
+          "Worktree setup preserves existing .env.worktree variables",
+        ],
+      },
       {
         version: "0.1.6",
         date: "2026-04-03",
@@ -356,7 +385,7 @@ export const en: LandingDict = {
         title: "Core Platform",
         changes: [
           "Multi-workspace switching and creation",
-          "Agent management UI with skills, tools, and triggers",
+          "Agent management UI with skills",
           "Unified agent SDK supporting Claude Code and Codex backends",
           "Comment CRUD with real-time WebSocket updates",
           "Task service layer and daemon REST protocol",

apps/web/features/landing/i18n/zh.ts

@@ -272,6 +272,35 @@ export const zh: LandingDict = {
     title: "\u66f4\u65b0\u65e5\u5fd7",
     subtitle: "Multica \u7684\u6700\u65b0\u66f4\u65b0\u548c\u6539\u8fdb\u3002",
     entries: [
+      {
+        version: "0.1.8",
+        date: "2026-04-07",
+        title: "OAuth、OpenClaw 与 Issue 加载优化",
+        changes: [
+          "支持 Google OAuth 登录",
+          "新增 OpenClaw 运行时，支持在 OpenClaw 基础设施上运行 Agent",
+          "Agent 实时卡片重新设计——始终吸顶，支持手动展开/收起",
+          "打开的 Issue 不再分页限制全量加载，已关闭的 Issue 滚动分页",
+          "JWT 和 CloudFront Cookie 有效期从 72 小时延长至 30 天",
+          "重新登录后记住上次选择的工作区",
+          "守护进程确保 Agent 任务环境中 multica CLI 在 PATH 上",
+          "新增 PR 模板和面向 Agent 的 CLI 安装指南",
+        ],
+      },
+      {
+        version: "0.1.7",
+        date: "2026-04-05",
+        title: "评论分页与 CLI 优化",
+        changes: [
+          "评论列表支持分页，API 和 CLI 均已适配",
+          "收件箱归档操作现在一次性归档同一 Issue 的所有通知",
+          "CLI 帮助输出重新设计，匹配 gh CLI 风格并增加示例",
+          "附件使用 UUIDv7 作为 S3 key，创建 Issue/评论时自动关联附件",
+          "支持在已完成或已取消的 Issue 上 @提及已分配的 Agent",
+          "回复仅 @提及成员时跳过父级提及继承逻辑",
+          "Worktree 环境配置保留已有的 .env.worktree 变量",
+        ],
+      },
       {
         version: "0.1.6",
         date: "2026-04-03",

apps/web/features/modals/create-issue.tsx

@@ -30,9 +30,11 @@ import { TitleEditor } from "@/features/editor";
 import { StatusIcon, PriorityIcon } from "@/features/issues/components";
 import { ALL_STATUSES, STATUS_CONFIG, PRIORITY_ORDER, PRIORITY_CONFIG } from "@/features/issues/config";
 import { useWorkspaceStore, useActorName } from "@/features/workspace";
-import { useIssueStore } from "@/features/issues";
+import { useQuery } from "@tanstack/react-query";
+import { useWorkspaceId } from "@core/hooks";
+import { memberListOptions, agentListOptions } from "@core/workspace/queries";
 import { useIssueDraftStore } from "@/features/issues/stores/draft-store";
-import { api } from "@/shared/api";
+import { useCreateIssue } from "@core/issues/mutations";
 import { useFileUpload } from "@/shared/hooks/use-file-upload";
 import { FileUploadButton } from "@/components/common/file-upload-button";
 import { ActorAvatar } from "@/components/common/actor-avatar";
@@ -68,8 +70,9 @@ function PillButton({
 export function CreateIssueModal({ onClose, data }: { onClose: () => void; data?: Record<string, unknown> | null }) {
   const router = useRouter();
   const workspaceName = useWorkspaceStore((s) => s.workspace?.name);
-  const members = useWorkspaceStore((s) => s.members);
-  const agents = useWorkspaceStore((s) => s.agents);
+  const wsId = useWorkspaceId();
+  const { data: members = [] } = useQuery(memberListOptions(wsId));
+  const { data: agents = [] } = useQuery(agentListOptions(wsId));
   const { getActorName } = useActorName();
 
   const draft = useIssueDraftStore((s) => s.draft);
@@ -93,9 +96,16 @@ export function CreateIssueModal({ onClose, data }: { onClose: () => void; data?
   // Due date popover
   const [dueDateOpen, setDueDateOpen] = useState(false);
 
-  // File upload
+  // File upload — collect attachment IDs so we can link them after issue creation.
+  const [attachmentIds, setAttachmentIds] = useState<string[]>([]);
   const { uploadWithToast } = useFileUpload();
-  const handleUpload = (file: File) => uploadWithToast(file);
+  const handleUpload = async (file: File) => {
+    const result = await uploadWithToast(file);
+    if (result) {
+      setAttachmentIds((prev) => [...prev, result.id]);
+    }
+    return result;
+  };
 
   const assigneeQuery = assigneeFilter.toLowerCase();
   const filteredMembers = members.filter((m) => m.name.toLowerCase().includes(assigneeQuery));
@@ -118,11 +128,12 @@ export function CreateIssueModal({ onClose, data }: { onClose: () => void; data?
   };
   const updateDueDate = (v: string | null) => { setDueDate(v); setDraft({ dueDate: v }); };
 
+  const createIssueMutation = useCreateIssue();
   const handleSubmit = async () => {
     if (!title.trim() || submitting) return;
     setSubmitting(true);
     try {
-      const issue = await api.createIssue({
+      const issue = await createIssueMutation.mutateAsync({
         title: title.trim(),
         description: descEditorRef.current?.getMarkdown()?.trim() || undefined,
         status,
@@ -130,8 +141,8 @@ export function CreateIssueModal({ onClose, data }: { onClose: () => void; data?
         assignee_type: assigneeType,
         assignee_id: assigneeId,
         due_date: dueDate || undefined,
+        attachment_ids: attachmentIds.length > 0 ? attachmentIds : undefined,
       });
-      useIssueStore.getState().addIssue(issue);
       clearDraft();
       onClose();
       toast.custom((t) => (

apps/web/features/modals/create-workspace.tsx

@@ -1,6 +1,7 @@
 "use client";
 
 import { useState } from "react";
+import { useRouter } from "next/navigation";
 import { toast } from "sonner";
 import { ArrowLeft } from "lucide-react";
 import { Input } from "@/components/ui/input";
@@ -18,6 +19,7 @@ import { useWorkspaceStore } from "@/features/workspace";
 const SLUG_REGEX = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 
 export function CreateWorkspaceModal({ onClose }: { onClose: () => void }) {
+  const router = useRouter();
   const [name, setName] = useState("");
   const [slug, setSlug] = useState("");
   const [creating, setCreating] = useState(false);
@@ -50,6 +52,7 @@ export function CreateWorkspaceModal({ onClose }: { onClose: () => void }) {
         slug: slug.trim(),
       });
       onClose();
+      router.push("/issues");
       await switchWorkspace(ws.id);
     } catch {
       toast.error("Failed to create workspace");

apps/web/features/my-issues/components/my-issues-page.tsx

@@ -8,7 +8,8 @@ import type { IssueStatus } from "@/shared/types";
 import { Skeleton } from "@/components/ui/skeleton";
 import { useAuthStore } from "@/features/auth";
 import { useWorkspaceStore, WorkspaceAvatar } from "@/features/workspace";
-import { useIssueStore } from "@/features/issues/store";
+import { useQuery } from "@tanstack/react-query";
+import { agentListOptions } from "@core/workspace/queries";
 import { filterIssues } from "@/features/issues/utils/filter";
 import { BOARD_STATUSES } from "@/features/issues/config";
 import { ViewStoreProvider } from "@/features/issues/stores/view-store-context";
@@ -17,16 +18,18 @@ import { BoardView } from "@/features/issues/components/board-view";
 import { ListView } from "@/features/issues/components/list-view";
 import { BatchActionToolbar } from "@/features/issues/components/batch-action-toolbar";
 import { registerViewStoreForWorkspaceSync } from "@/features/issues/stores/view-store";
-import { api } from "@/shared/api";
+import { useWorkspaceId } from "@core/hooks";
+import { issueListOptions } from "@core/issues/queries";
+import { useUpdateIssue } from "@core/issues/mutations";
 import { myIssuesViewStore } from "../stores/my-issues-view-store";
 import { MyIssuesHeader } from "./my-issues-header";
 
 export function MyIssuesPage() {
   const user = useAuthStore((s) => s.user);
   const workspace = useWorkspaceStore((s) => s.workspace);
-  const agents = useWorkspaceStore((s) => s.agents);
-  const allIssues = useIssueStore((s) => s.issues);
-  const loading = useIssueStore((s) => s.loading);
+  const wsId = useWorkspaceId();
+  const { data: agents = [] } = useQuery(agentListOptions(wsId));
+  const { data: allIssues = [], isLoading: loading } = useQuery(issueListOptions(wsId));
 
   const viewMode = useStore(myIssuesViewStore, (s) => s.viewMode);
   const statusFilters = useStore(myIssuesViewStore, (s) => s.statusFilters);
@@ -105,6 +108,7 @@ export function MyIssuesPage() {
     return BOARD_STATUSES.filter((s) => !visibleStatuses.includes(s));
   }, [visibleStatuses]);
 
+  const updateIssueMutation = useUpdateIssue();
   const handleMoveIssue = useCallback(
     (issueId: string, newStatus: IssueStatus, newPosition?: number) => {
       const viewState = myIssuesViewStore.getState();
@@ -118,16 +122,12 @@ export function MyIssuesPage() {
       };
       if (newPosition !== undefined) updates.position = newPosition;
 
-      useIssueStore.getState().updateIssue(issueId, updates);
-
-      api.updateIssue(issueId, updates).catch(() => {
-        toast.error("Failed to move issue");
-        api.listIssues({ limit: 200 }).then((res) => {
-          useIssueStore.getState().setIssues(res.issues);
-        }).catch(console.error);
-      });
+      updateIssueMutation.mutate(
+        { id: issueId, ...updates },
+        { onError: () => toast.error("Failed to move issue") },
+      );
     },
-    [],
+    [updateIssueMutation],
   );
 
   if (loading) {

apps/web/features/realtime/use-realtime-sync.ts

@@ -1,14 +1,21 @@
 "use client";
 
 import { useEffect } from "react";
+import { useQueryClient } from "@tanstack/react-query";
 import type { WSClient } from "@/shared/api";
 import { toast } from "sonner";
-import { useIssueStore } from "@/features/issues";
-import { useInboxStore } from "@/features/inbox";
 import { useWorkspaceStore } from "@/features/workspace";
 import { useAuthStore } from "@/features/auth";
 import { createLogger } from "@/shared/logger";
-import { api } from "@/shared/api";
+import { issueKeys } from "@core/issues/queries";
+import {
+  onIssueCreated,
+  onIssueUpdated,
+  onIssueDeleted,
+} from "@core/issues/ws-updaters";
+import { onInboxNew, onInboxInvalidate, onInboxIssueStatusChanged } from "@core/inbox/ws-updaters";
+import { inboxKeys } from "@core/inbox/queries";
+import { workspaceKeys } from "@core/workspace/queries";
 import type {
   MemberAddedPayload,
   WorkspaceDeletedPayload,
@@ -33,33 +40,31 @@ const logger = createLogger("realtime-sync");
  * by individual components via useWSEvent — not here.
  */
 export function useRealtimeSync(ws: WSClient | null) {
+  const qc = useQueryClient();
   // Main sync: onAny → refreshMap with debounce
   useEffect(() => {
     if (!ws) return;
 
-    // Event types handled by specific handlers below — skip generic refresh
-    const specificEvents = new Set([
-      "issue:updated", "issue:created", "issue:deleted", "inbox:new",
-    ]);
-
     const refreshMap: Record<string, () => void> = {
-      inbox: () => void useInboxStore.getState().fetch(),
-      agent: () => void useWorkspaceStore.getState().refreshAgents(),
-      member: () => void useWorkspaceStore.getState().refreshMembers(),
-      workspace: () => {
-        // Lightweight: only re-fetch workspace list, don't hydrate everything.
-        // workspace:deleted is handled by a precise side-effect handler below.
-        api.listWorkspaces().then((wsList) => {
-          const current = useWorkspaceStore.getState().workspace;
-          const updated = current
-            ? wsList.find((w) => w.id === current.id)
-            : null;
-          if (updated) useWorkspaceStore.getState().updateWorkspace(updated);
-        }).catch((err) => {
-          logger.error("workspace refresh failed", err);
-        });
+      inbox: () => {
+        const wsId = useWorkspaceStore.getState().workspace?.id;
+        if (wsId) onInboxInvalidate(qc, wsId);
+      },
+      agent: () => {
+        const wsId = useWorkspaceStore.getState().workspace?.id;
+        if (wsId) qc.invalidateQueries({ queryKey: workspaceKeys.agents(wsId) });
+      },
+      member: () => {
+        const wsId = useWorkspaceStore.getState().workspace?.id;
+        if (wsId) qc.invalidateQueries({ queryKey: workspaceKeys.members(wsId) });
+      },
+      workspace: () => {
+        qc.invalidateQueries({ queryKey: workspaceKeys.list() });
+      },
+      skill: () => {
+        const wsId = useWorkspaceStore.getState().workspace?.id;
+        if (wsId) qc.invalidateQueries({ queryKey: workspaceKeys.skills(wsId) });
       },
-      skill: () => void useWorkspaceStore.getState().refreshSkills(),
     };
 
     const timers = new Map<string, ReturnType<typeof setTimeout>>();
@@ -75,6 +80,11 @@ export function useRealtimeSync(ws: WSClient | null) {
       );
     };
 
+    // Event types handled by specific handlers below — skip generic refresh
+    const specificEvents = new Set([
+      "issue:updated", "issue:created", "issue:deleted", "inbox:new",
+    ]);
+
     const unsubAny = ws.onAny((msg) => {
       const myUserId = useAuthStore.getState().user?.id;
       if (msg.actor_id && msg.actor_id === myUserId) {
@@ -88,29 +98,40 @@ export function useRealtimeSync(ws: WSClient | null) {
     });
 
     // --- Specific event handlers (granular updates, no full refetch) ---
+    // NOTE: ws.on() passes msg.payload (no actor_id). Self-event suppression
+    // requires WSClient changes to expose actor_id — tracked as separate task.
 
     const unsubIssueUpdated = ws.on("issue:updated", (p) => {
       const { issue } = p as IssueUpdatedPayload;
       if (!issue?.id) return;
-      useIssueStore.getState().updateIssue(issue.id, issue);
-      if (issue.status) {
-        useInboxStore.getState().updateIssueStatus(issue.id, issue.status);
+      const wsId = useWorkspaceStore.getState().workspace?.id;
+      if (wsId) {
+        onIssueUpdated(qc, wsId, issue);
+        if (issue.status) {
+          onInboxIssueStatusChanged(qc, wsId, issue.id, issue.status);
+        }
       }
     });
 
     const unsubIssueCreated = ws.on("issue:created", (p) => {
       const { issue } = p as IssueCreatedPayload;
-      if (issue) useIssueStore.getState().addIssue(issue);
+      if (!issue) return;
+      const wsId = useWorkspaceStore.getState().workspace?.id;
+      if (wsId) onIssueCreated(qc, wsId, issue);
     });
 
     const unsubIssueDeleted = ws.on("issue:deleted", (p) => {
       const { issue_id } = p as IssueDeletedPayload;
-      if (issue_id) useIssueStore.getState().removeIssue(issue_id);
+      if (!issue_id) return;
+      const wsId = useWorkspaceStore.getState().workspace?.id;
+      if (wsId) onIssueDeleted(qc, wsId, issue_id);
     });
 
     const unsubInboxNew = ws.on("inbox:new", (p) => {
       const { item } = p as InboxNewPayload;
-      if (item) useInboxStore.getState().addItem(item);
+      if (!item) return;
+      const wsId = useWorkspaceStore.getState().workspace?.id;
+      if (wsId) onInboxNew(qc, wsId, item);
     });
 
     // --- Side-effect handlers (toast, navigation) ---
@@ -158,7 +179,7 @@ export function useRealtimeSync(ws: WSClient | null) {
       timers.forEach(clearTimeout);
       timers.clear();
     };
-  }, [ws]);
+  }, [ws, qc]);
 
   // Reconnect → refetch all data to recover missed events
   useEffect(() => {
@@ -167,18 +188,20 @@ export function useRealtimeSync(ws: WSClient | null) {
     const unsub = ws.onReconnect(async () => {
       logger.info("reconnected, refetching all data");
       try {
-        await Promise.all([
-          useIssueStore.getState().fetch(),
-          useInboxStore.getState().fetch(),
-          useWorkspaceStore.getState().refreshAgents(),
-          useWorkspaceStore.getState().refreshMembers(),
-          useWorkspaceStore.getState().refreshSkills(),
-        ]);
+        const wsId = useWorkspaceStore.getState().workspace?.id;
+        if (wsId) {
+          qc.invalidateQueries({ queryKey: issueKeys.all(wsId) });
+          qc.invalidateQueries({ queryKey: inboxKeys.all(wsId) });
+          qc.invalidateQueries({ queryKey: workspaceKeys.agents(wsId) });
+          qc.invalidateQueries({ queryKey: workspaceKeys.members(wsId) });
+          qc.invalidateQueries({ queryKey: workspaceKeys.skills(wsId) });
+        }
+        qc.invalidateQueries({ queryKey: workspaceKeys.list() });
       } catch (e) {
         logger.error("reconnect refetch failed", e);
       }
     });
 
     return unsub;
-  }, [ws]);
+  }, [ws, qc]);
 }

apps/web/features/runtimes/components/runtimes-page.tsx

@@ -1,8 +1,9 @@
 "use client";
 
-import { useEffect, useCallback } from "react";
+import { useState, useCallback } from "react";
 import { Server } from "lucide-react";
 import { useDefaultLayout } from "react-resizable-panels";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
 import {
   ResizablePanelGroup,
   ResizablePanel,
@@ -10,38 +11,35 @@ import {
 } from "@/components/ui/resizable";
 import { Skeleton } from "@/components/ui/skeleton";
 import { useAuthStore } from "@/features/auth";
-import { useWorkspaceStore } from "@/features/workspace";
+import { useWorkspaceId } from "@core/hooks";
+import { runtimeListOptions, runtimeKeys } from "@core/runtimes/queries";
 import { useWSEvent } from "@/features/realtime";
-import { useRuntimeStore } from "../store";
 import { RuntimeList } from "./runtime-list";
 import { RuntimeDetail } from "./runtime-detail";
 
 export default function RuntimesPage() {
   const isLoading = useAuthStore((s) => s.isLoading);
-  const workspace = useWorkspaceStore((s) => s.workspace);
-  const runtimes = useRuntimeStore((s) => s.runtimes);
-  const selectedId = useRuntimeStore((s) => s.selectedId);
-  const fetching = useRuntimeStore((s) => s.fetching);
-  const fetchRuntimes = useRuntimeStore((s) => s.fetchRuntimes);
-  const setSelectedId = useRuntimeStore((s) => s.setSelectedId);
+  const wsId = useWorkspaceId();
+  const qc = useQueryClient();
+  const { data: runtimes = [], isLoading: fetching } = useQuery(runtimeListOptions(wsId));
+  const [selectedId, setSelectedId] = useState("");
 
   const { defaultLayout, onLayoutChanged } = useDefaultLayout({
     id: "multica_runtimes_layout",
   });
 
-  useEffect(() => {
-    if (workspace) fetchRuntimes();
-  }, [workspace, fetchRuntimes]);
-
   // Re-fetch on daemon register/deregister events.
-  // Heartbeat events are not broadcast over WS, so no handler needed.
   const handleDaemonEvent = useCallback(() => {
-    fetchRuntimes();
-  }, [fetchRuntimes]);
+    qc.invalidateQueries({ queryKey: runtimeKeys.list(wsId) });
+  }, [qc, wsId]);
 
   useWSEvent("daemon:register", handleDaemonEvent);
 
-  const selected = runtimes.find((r) => r.id === selectedId) ?? null;
+  // Auto-select first runtime if nothing selected
+  const effectiveSelectedId = selectedId && runtimes.some((r) => r.id === selectedId)
+    ? selectedId
+    : runtimes[0]?.id ?? "";
+  const selected = runtimes.find((r) => r.id === effectiveSelectedId) ?? null;
 
   if (isLoading || fetching) {
     return (
@@ -95,7 +93,7 @@ export default function RuntimesPage() {
       >
         <RuntimeList
           runtimes={runtimes}
-          selectedId={selectedId}
+          selectedId={effectiveSelectedId}
           onSelect={setSelectedId}
         />
       </ResizablePanel>

apps/web/features/runtimes/index.ts

@@ -1,2 +1 @@
 export { RuntimesPage } from "./components";
-export { useRuntimeStore } from "./store";

apps/web/features/runtimes/store.ts

@@ -1,70 +0,0 @@
-"use client";
-
-import { create } from "zustand";
-import type { AgentRuntime } from "@/shared/types";
-import { api } from "@/shared/api";
-import { useWorkspaceStore } from "@/features/workspace";
-
-interface RuntimeState {
-  runtimes: AgentRuntime[];
-  selectedId: string;
-  fetching: boolean;
-}
-
-interface RuntimeActions {
-  fetchRuntimes: () => Promise<void>;
-  setSelectedId: (id: string) => void;
-  /** Patch a single runtime in-place (e.g. status/last_seen_at from WS event). */
-  patchRuntime: (id: string, updates: Partial<AgentRuntime>) => void;
-  /** Replace the full runtimes list (used on daemon:register events). */
-  setRuntimes: (runtimes: AgentRuntime[]) => void;
-}
-
-type RuntimeStore = RuntimeState & RuntimeActions;
-
-export const useRuntimeStore = create<RuntimeStore>((set, get) => ({
-  // State
-  runtimes: [],
-  selectedId: "",
-  fetching: true,
-
-  // Actions
-  fetchRuntimes: async () => {
-    const workspace = useWorkspaceStore.getState().workspace;
-    if (!workspace) return;
-    try {
-      const data = await api.listRuntimes({ workspace_id: workspace.id });
-      const { selectedId } = get();
-      set({
-        runtimes: data,
-        fetching: false,
-        // Auto-select first if nothing selected
-        selectedId: selectedId && data.some((r) => r.id === selectedId)
-          ? selectedId
-          : data[0]?.id ?? "",
-      });
-    } catch {
-      set({ fetching: false });
-    }
-  },
-
-  setSelectedId: (id) => set({ selectedId: id }),
-
-  patchRuntime: (id, updates) => {
-    set((state) => ({
-      runtimes: state.runtimes.map((r) =>
-        r.id === id ? { ...r, ...updates } : r,
-      ),
-    }));
-  },
-
-  setRuntimes: (runtimes) => {
-    const { selectedId } = get();
-    set({
-      runtimes,
-      selectedId: selectedId && runtimes.some((r) => r.id === selectedId)
-        ? selectedId
-        : runtimes[0]?.id ?? "",
-    });
-  },
-}));

apps/web/features/skills/components/skills-page.tsx

@@ -33,8 +33,10 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { toast } from "sonner";
 import { Skeleton } from "@/components/ui/skeleton";
 import { api } from "@/shared/api";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useAuthStore } from "@/features/auth";
-import { useWorkspaceStore } from "@/features/workspace";
+import { useWorkspaceId } from "@core/hooks";
+import { skillListOptions, workspaceKeys } from "@core/workspace/queries";
 
 import { FileTree } from "./file-tree";
 import { FileViewer } from "./file-viewer";
@@ -346,6 +348,8 @@ function SkillDetail({
   onUpdate: (id: string, data: UpdateSkillRequest) => Promise<void>;
   onDelete: (id: string) => Promise<void>;
 }) {
+  const qc = useQueryClient();
+  const wsId = useWorkspaceId();
   const [name, setName] = useState(skill.name);
   const [description, setDescription] = useState(skill.description);
   const [content, setContent] = useState(skill.content);
@@ -370,12 +374,12 @@ function SkillDetail({
     setSelectedPath(SKILL_MD);
     setLoadingFiles(true);
     api.getSkill(skill.id).then((full) => {
-      useWorkspaceStore.getState().upsertSkill(full);
+      qc.invalidateQueries({ queryKey: workspaceKeys.skills(wsId) });
       setFiles((full.files ?? []).map((f) => ({ path: f.path, content: f.content })));
     }).catch((e) => {
       toast.error(e instanceof Error ? e.message : "Failed to load skill files");
     }).finally(() => setLoadingFiles(false));
-  }, [skill.id]);
+  }, [skill.id, qc, wsId]);
 
   // Build the virtual file map
   const fileMap = useMemo(() => buildFileMap(content, files), [content, files]);
@@ -610,10 +614,9 @@ function SkillDetail({
 
 export default function SkillsPage() {
   const isLoading = useAuthStore((s) => s.isLoading);
-  const skills = useWorkspaceStore((s) => s.skills);
-  const refreshSkills = useWorkspaceStore((s) => s.refreshSkills);
-  const upsertSkill = useWorkspaceStore((s) => s.upsertSkill);
-  const removeSkill = useWorkspaceStore((s) => s.removeSkill);
+  const qc = useQueryClient();
+  const wsId = useWorkspaceId();
+  const { data: skills = [] } = useQuery(skillListOptions(wsId));
   const [selectedId, setSelectedId] = useState<string>("");
   const [showCreate, setShowCreate] = useState(false);
   const { defaultLayout, onLayoutChanged } = useDefaultLayout({
@@ -628,22 +631,22 @@ export default function SkillsPage() {
 
   const handleCreate = async (data: CreateSkillRequest) => {
     const skill = await api.createSkill(data);
-    upsertSkill(skill);
+    qc.invalidateQueries({ queryKey: workspaceKeys.skills(wsId) });
     setSelectedId(skill.id);
     toast.success("Skill created");
   };
 
   const handleImport = async (url: string) => {
     const skill = await api.importSkill({ url });
-    upsertSkill(skill);
+    qc.invalidateQueries({ queryKey: workspaceKeys.skills(wsId) });
     setSelectedId(skill.id);
     toast.success("Skill imported");
   };
 
   const handleUpdate = async (id: string, data: UpdateSkillRequest) => {
     try {
-      const updated = await api.updateSkill(id, data);
-      upsertSkill(updated);
+      await api.updateSkill(id, data);
+      qc.invalidateQueries({ queryKey: workspaceKeys.skills(wsId) });
       toast.success("Skill saved");
     } catch (e) {
       toast.error(e instanceof Error ? e.message : "Failed to save skill");
@@ -658,7 +661,7 @@ export default function SkillsPage() {
         const remaining = skills.filter((s) => s.id !== id);
         setSelectedId(remaining[0]?.id ?? "");
       }
-      removeSkill(id);
+      qc.invalidateQueries({ queryKey: workspaceKeys.skills(wsId) });
       toast.success("Skill deleted");
     } catch (e) {
       toast.error(e instanceof Error ? e.message : "Failed to delete skill");

apps/web/features/workspace/hooks.ts

@@ -1,10 +1,13 @@
 "use client";
 
-import { useWorkspaceStore } from "./store";
+import { useQuery } from "@tanstack/react-query";
+import { useWorkspaceId } from "@core/hooks";
+import { memberListOptions, agentListOptions } from "@core/workspace/queries";
 
 export function useActorName() {
-  const members = useWorkspaceStore((s) => s.members);
-  const agents = useWorkspaceStore((s) => s.agents);
+  const wsId = useWorkspaceId();
+  const { data: members = [] } = useQuery(memberListOptions(wsId));
+  const { data: agents = [] } = useQuery(agentListOptions(wsId));
 
   const getMemberName = (userId: string) => {
     const m = members.find((m) => m.user_id === userId);

apps/web/features/workspace/store.ts

@@ -1,10 +1,7 @@
 "use client";
 
 import { create } from "zustand";
-import type { Workspace, MemberWithUser, Agent, Skill } from "@/shared/types";
-import { useIssueStore } from "@/features/issues";
-import { useInboxStore } from "@/features/inbox";
-import { useRuntimeStore } from "@/features/runtimes";
+import type { Workspace } from "@/shared/types";
 import { toast } from "sonner";
 import { api } from "@/shared/api";
 import { createLogger } from "@/shared/logger";
@@ -14,30 +11,21 @@ const logger = createLogger("workspace-store");
 interface WorkspaceState {
   workspace: Workspace | null;
   workspaces: Workspace[];
-  members: MemberWithUser[];
-  agents: Agent[];
-  skills: Skill[];
 }
 
 interface WorkspaceActions {
   hydrateWorkspace: (
     wsList: Workspace[],
     preferredWorkspaceId?: string | null,
-  ) => Promise<Workspace | null>;
-  switchWorkspace: (workspaceId: string) => Promise<void>;
+  ) => Workspace | null;
+  switchWorkspace: (workspaceId: string) => void;
   refreshWorkspaces: () => Promise<Workspace[]>;
-  refreshMembers: () => Promise<void>;
-  updateAgent: (id: string, updates: Partial<Agent>) => void;
-  refreshAgents: () => Promise<void>;
-  refreshSkills: () => Promise<void>;
-  upsertSkill: (skill: Skill) => void;
-  removeSkill: (id: string) => void;
+  updateWorkspace: (ws: Workspace) => void;
   createWorkspace: (data: {
     name: string;
     slug: string;
     description?: string;
   }) => Promise<Workspace>;
-  updateWorkspace: (ws: Workspace) => void;
   leaveWorkspace: (workspaceId: string) => Promise<void>;
   deleteWorkspace: (workspaceId: string) => Promise<void>;
   clearWorkspace: () => void;
@@ -49,12 +37,9 @@ export const useWorkspaceStore = create<WorkspaceStore>((set, get) => ({
   // State
   workspace: null,
   workspaces: [],
-  members: [],
-  agents: [],
-  skills: [],
 
   // Actions
-  hydrateWorkspace: async (wsList, preferredWorkspaceId) => {
+  hydrateWorkspace: (wsList, preferredWorkspaceId) => {
     set({ workspaces: wsList });
 
     const nextWorkspace =
@@ -67,56 +52,35 @@ export const useWorkspaceStore = create<WorkspaceStore>((set, get) => ({
     if (!nextWorkspace) {
       api.setWorkspaceId(null);
       localStorage.removeItem("multica_workspace_id");
-      set({ workspace: null, members: [], agents: [], skills: [] });
+      set({ workspace: null });
       return null;
     }
 
     api.setWorkspaceId(nextWorkspace.id);
     localStorage.setItem("multica_workspace_id", nextWorkspace.id);
     set({ workspace: nextWorkspace });
-
     logger.debug("hydrate workspace", nextWorkspace.name, nextWorkspace.id);
-    const [nextMembers, nextAgents, nextSkills] = await Promise.all([
-      api.listMembers(nextWorkspace.id).catch((e) => {
-        logger.error("failed to load members", e);
-        toast.error("Failed to load members");
-        return [] as MemberWithUser[];
-      }),
-      api.listAgents({ workspace_id: nextWorkspace.id, include_archived: true }).catch((e) => {
-        logger.error("failed to load agents", e);
-        toast.error("Failed to load agents");
-        return [] as Agent[];
-      }),
-      api.listSkills().catch(() => [] as Skill[]),
-      useIssueStore.getState().fetch().catch(() => {}),
-      useInboxStore.getState().fetch().catch(() => {}),
-    ]);
-    logger.info("hydrate complete", "members:", nextMembers.length, "agents:", nextAgents.length);
-    set({ members: nextMembers, agents: nextAgents, skills: nextSkills });
+
+    // Members, agents, skills, issues, inbox are all managed by TanStack Query.
+    // They auto-fetch when components mount with the workspace ID in their query key.
 
     return nextWorkspace;
   },
 
-  switchWorkspace: async (workspaceId) => {
+  switchWorkspace: (workspaceId) => {
     logger.info("switching to", workspaceId);
     const { workspaces, hydrateWorkspace } = get();
     const ws = workspaces.find((item) => item.id === workspaceId);
     if (!ws) return;
 
-    // Switch identity FIRST — api client, localStorage, and the
-    // workspace object in this store — so that any in-flight refetch
-    // (e.g. triggered by a WS event during the async gap) already
-    // targets the new workspace.
     api.setWorkspaceId(ws.id);
     localStorage.setItem("multica_workspace_id", ws.id);
 
-    // Clear ALL stale data across every store before hydrating.
-    useIssueStore.getState().setIssues([]);
-    useInboxStore.getState().setItems([]);
-    useRuntimeStore.getState().setRuntimes([]);
-    set({ workspace: ws, members: [], agents: [], skills: [] });
+    // All data caches (issues, inbox, members, agents, skills, runtimes)
+    // are managed by TanStack Query, keyed by wsId — auto-refetch on switch.
+    set({ workspace: ws });
 
-    await hydrateWorkspace(workspaces, ws.id);
+    hydrateWorkspace(workspaces, ws.id);
   },
 
   refreshWorkspaces: async () => {
@@ -124,7 +88,7 @@ export const useWorkspaceStore = create<WorkspaceStore>((set, get) => ({
     const storedWorkspaceId = localStorage.getItem("multica_workspace_id");
     try {
       const wsList = await api.listWorkspaces();
-      await hydrateWorkspace(wsList, workspace?.id ?? storedWorkspaceId);
+      hydrateWorkspace(wsList, workspace?.id ?? storedWorkspaceId);
       return wsList;
     } catch (e) {
       logger.error("failed to refresh workspaces", e);
@@ -133,77 +97,6 @@ export const useWorkspaceStore = create<WorkspaceStore>((set, get) => ({
     }
   },
 
-  refreshMembers: async () => {
-    const { workspace } = get();
-    if (!workspace) return;
-    try {
-      const members = await api.listMembers(workspace.id);
-      set({ members });
-    } catch (e) {
-      logger.error("failed to refresh members", e);
-      toast.error("Failed to refresh members");
-    }
-  },
-
-  updateAgent: (id, updates) =>
-    set((s) => ({
-      agents: s.agents.map((a) => (a.id === id ? { ...a, ...updates } : a)),
-    })),
-
-  refreshAgents: async () => {
-    const { workspace } = get();
-    if (!workspace) return;
-    try {
-      const agents = await api.listAgents({ workspace_id: workspace.id, include_archived: true });
-      set({ agents });
-    } catch (e) {
-      logger.error("failed to refresh agents", e);
-      toast.error("Failed to refresh agents");
-    }
-  },
-
-  refreshSkills: async () => {
-    const { workspace, skills: existing } = get();
-    if (!workspace) return;
-    try {
-      const fetched = await api.listSkills();
-      // listSkills doesn't include files — preserve files from existing entries
-      const filesById = new Map(
-        existing.filter((s) => s.files?.length).map((s) => [s.id, s.files]),
-      );
-      const merged = fetched.map((s) => ({
-        ...s,
-        files: s.files ?? filesById.get(s.id) ?? [],
-      }));
-      set({ skills: merged });
-    } catch (e) {
-      logger.error("failed to refresh skills", e);
-      toast.error("Failed to refresh skills");
-    }
-  },
-
-  upsertSkill: (skill) => {
-    set((state) => {
-      const idx = state.skills.findIndex((s) => s.id === skill.id);
-      if (idx >= 0) {
-        const next = [...state.skills];
-        next[idx] = skill;
-        return { skills: next };
-      }
-      return { skills: [...state.skills, skill] };
-    });
-  },
-
-  removeSkill: (id) => {
-    set((state) => ({ skills: state.skills.filter((s) => s.id !== id) }));
-  },
-
-  createWorkspace: async (data) => {
-    const ws = await api.createWorkspace(data);
-    set((state) => ({ workspaces: [...state.workspaces, ws] }));
-    return ws;
-  },
-
   updateWorkspace: (ws) => {
     set((state) => ({
       workspace: state.workspace?.id === ws.id ? ws : state.workspace,
@@ -213,13 +106,19 @@ export const useWorkspaceStore = create<WorkspaceStore>((set, get) => ({
     }));
   },
 
+  createWorkspace: async (data) => {
+    const ws = await api.createWorkspace(data);
+    set((state) => ({ workspaces: [...state.workspaces, ws] }));
+    return ws;
+  },
+
   leaveWorkspace: async (workspaceId) => {
     await api.leaveWorkspace(workspaceId);
     const { workspace, hydrateWorkspace } = get();
     const wsList = await api.listWorkspaces();
     const preferredWorkspaceId =
       workspace?.id === workspaceId ? null : (workspace?.id ?? null);
-    await hydrateWorkspace(wsList, preferredWorkspaceId);
+    hydrateWorkspace(wsList, preferredWorkspaceId);
   },
 
   deleteWorkspace: async (workspaceId) => {
@@ -228,12 +127,11 @@ export const useWorkspaceStore = create<WorkspaceStore>((set, get) => ({
     const wsList = await api.listWorkspaces();
     const preferredWorkspaceId =
       workspace?.id === workspaceId ? null : (workspace?.id ?? null);
-    await hydrateWorkspace(wsList, preferredWorkspaceId);
+    hydrateWorkspace(wsList, preferredWorkspaceId);
   },
 
   clearWorkspace: () => {
     api.setWorkspaceId(null);
-    localStorage.removeItem("multica_workspace_id");
-    set({ workspace: null, workspaces: [], members: [], agents: [], skills: [] });
+    set({ workspace: null, workspaces: [] });
   },
 }));

apps/web/package.json

@@ -18,11 +18,12 @@
     "@dnd-kit/utilities": "^3.2.2",
     "@emoji-mart/data": "^1.2.1",
     "@floating-ui/dom": "^1.7.6",
+    "@tanstack/react-query": "^5.96.2",
+    "@tanstack/react-query-devtools": "^5.96.2",
     "@tiptap/extension-code-block-lowlight": "^3.22.1",
     "@tiptap/extension-image": "^3.22.1",
     "@tiptap/extension-link": "^3.22.1",
     "@tiptap/extension-mention": "^3.22.1",
-    "@tiptap/suggestion": "^3.22.1",
     "@tiptap/extension-placeholder": "^3.22.1",
     "@tiptap/extension-table": "^3.22.1",
     "@tiptap/extension-table-cell": "^3.22.1",
@@ -33,6 +34,7 @@
     "@tiptap/pm": "^3.22.1",
     "@tiptap/react": "^3.22.1",
     "@tiptap/starter-kit": "^3.22.1",
+    "@tiptap/suggestion": "^3.22.1",
     "@types/linkify-it": "^5.0.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",

apps/web/shared/api/client.ts

@@ -114,7 +114,8 @@ export class ApiClient {
     if (!res.ok) {
       if (res.status === 401) this.handleUnauthorized();
       const message = await this.parseErrorMessage(res, `API error: ${res.status} ${res.statusText}`);
-      this.logger.error(`← ${res.status} ${path}`, { rid, duration: `${Date.now() - start}ms`, error: message });
+      const logLevel = res.status === 404 ? "warn" : "error";
+      this.logger[logLevel](`← ${res.status} ${path}`, { rid, duration: `${Date.now() - start}ms`, error: message });
       throw new Error(message);
     }
 
@@ -143,6 +144,13 @@ export class ApiClient {
     });
   }
 
+  async googleLogin(code: string, redirectUri: string): Promise<LoginResponse> {
+    return this.fetch("/auth/google", {
+      method: "POST",
+      body: JSON.stringify({ code, redirect_uri: redirectUri }),
+    });
+  }
+
   async getMe(): Promise<User> {
     return this.fetch("/api/me");
   }
@@ -164,6 +172,7 @@ export class ApiClient {
     if (params?.status) search.set("status", params.status);
     if (params?.priority) search.set("priority", params.priority);
     if (params?.assignee_id) search.set("assignee_id", params.assignee_id);
+    if (params?.open_only) search.set("open_only", "true");
     return this.fetch(`/api/issues?${search}`);
   }
 

apps/web/shared/types/agent.ts

@@ -4,8 +4,6 @@ export type AgentRuntimeMode = "local" | "cloud";
 
 export type AgentVisibility = "workspace" | "private";
 
-export type AgentTriggerType = "on_assign" | "on_comment" | "scheduled";
-
 export interface RuntimeDevice {
   id: string;
   workspace_id: string;
@@ -23,22 +21,6 @@ export interface RuntimeDevice {
 
 export type AgentRuntime = RuntimeDevice;
 
-export interface AgentTool {
-  id: string;
-  name: string;
-  description: string;
-  auth_type: "oauth" | "api_key" | "none";
-  connected: boolean;
-  config: Record<string, unknown>;
-}
-
-export interface AgentTrigger {
-  id: string;
-  type: AgentTriggerType;
-  enabled: boolean;
-  config: Record<string, unknown>;
-}
-
 export interface AgentTask {
   id: string;
   agent_id: string;
@@ -69,8 +51,6 @@ export interface Agent {
   max_concurrent_tasks: number;
   owner_id: string | null;
   skills: Skill[];
-  tools: AgentTool[];
-  triggers: AgentTrigger[];
   created_at: string;
   updated_at: string;
   archived_at: string | null;
@@ -86,8 +66,6 @@ export interface CreateAgentRequest {
   runtime_config?: Record<string, unknown>;
   visibility?: AgentVisibility;
   max_concurrent_tasks?: number;
-  tools?: AgentTool[];
-  triggers?: AgentTrigger[];
 }
 
 export interface UpdateAgentRequest {
@@ -100,8 +78,6 @@ export interface UpdateAgentRequest {
   visibility?: AgentVisibility;
   status?: AgentStatus;
   max_concurrent_tasks?: number;
-  tools?: AgentTool[];
-  triggers?: AgentTrigger[];
 }
 
 // Skills

apps/web/shared/types/api.ts

@@ -11,6 +11,7 @@ export interface CreateIssueRequest {
   assignee_id?: string;
   parent_issue_id?: string;
   due_date?: string;
+  attachment_ids?: string[];
 }
 
 export interface UpdateIssueRequest {
@@ -31,6 +32,7 @@ export interface ListIssuesParams {
   status?: IssueStatus;
   priority?: IssuePriority;
   assignee_id?: string;
+  open_only?: boolean;
 }
 
 export interface ListIssuesResponse {

apps/web/shared/types/index.ts

@@ -4,9 +4,6 @@ export type {
   AgentStatus,
   AgentRuntimeMode,
   AgentVisibility,
-  AgentTriggerType,
-  AgentTool,
-  AgentTrigger,
   AgentTask,
   AgentRuntime,
   RuntimeDevice,

apps/web/test/helpers.tsx

@@ -58,8 +58,6 @@ export const mockAgents: Agent[] = [
     max_concurrent_tasks: 3,
     owner_id: null,
     skills: [],
-    tools: [],
-    triggers: [],
     created_at: "2026-01-01T00:00:00Z",
     updated_at: "2026-01-01T00:00:00Z",
     archived_at: null,
@@ -85,8 +83,6 @@ export const mockAuthValue: Record<string, any> = {
   leaveWorkspace: vi.fn(),
   deleteWorkspace: vi.fn(),
   refreshWorkspaces: vi.fn(),
-  refreshMembers: vi.fn(),
-  refreshAgents: vi.fn(),
   getMemberName: (userId: string) => {
     const m = mockMembers.find((m) => m.user_id === userId);
     return m?.name ?? "Unknown";

apps/web/tsconfig.json

@@ -28,6 +28,9 @@
     "paths": {
       "@/*": [
         "./*"
+      ],
+      "@core/*": [
+        "./core/*"
       ]
     },
     "noEmit": true,

apps/web/vitest.config.ts

@@ -13,6 +13,7 @@ export default defineConfig({
   resolve: {
     alias: {
       "@": path.resolve(__dirname, "."),
+      "@core": path.resolve(__dirname, "core"),
     },
   },
 });

docs/plans/2026-04-08-board-dnd-rewrite.md

@@ -0,0 +1,511 @@
+# Board DnD Rewrite — dnd-kit Multi-Container Sortable
+
+> **For Claude:** REQUIRED SUB-SKILL: Use superpowers:executing-plans to implement this plan task-by-task.
+
+**Goal:** Rewrite the Kanban board drag-and-drop to use dnd-kit's multi-container sortable pattern correctly — onDragOver for live cross-column movement, local state during drag, insertion indicators, and smooth animations.
+
+**Architecture:** Replace the current "TQ-cache-driven + pendingMove patch" with a "local-state-driven during drag, TQ sync on drop" model. During drag, a local `columns` state (Record<IssueStatus, string[]>) controls which IDs each SortableContext sees. onDragOver moves IDs between columns in real-time. onDragEnd computes final position and fires the mutation. Between drags, local state follows TQ data via useEffect.
+
+**Tech Stack:** @dnd-kit/core ^6.3.1, @dnd-kit/sortable ^10.0.0, @dnd-kit/utilities ^3.2.2, TanStack Query, React useState
+
+---
+
+## Current State (files to modify)
+
+| File | Current Role | Change |
+|------|-------------|--------|
+| `features/issues/components/board-view.tsx` | DndContext + onDragEnd only + pendingMove | **Rewrite**: local columns state, onDragOver, onDragEnd, improved DragOverlay |
+| `features/issues/components/board-column.tsx` | Receives Issue[], sorts internally, useDroppable | **Rewrite**: receives sorted Issue[] from parent, no internal sorting, insertion indicator |
+| `features/issues/components/board-card.tsx` | useSortable with defaults | **Modify**: custom animateLayoutChanges |
+| `features/issues/components/issues-page.tsx` | handleMoveIssue callback | **Minor**: adjust callback signature |
+
+Files NOT changed: `mutations.ts`, `ws-updaters.ts`, `use-realtime-sync.ts`, `view-store.ts`, `sort.ts`
+
+---
+
+## Task 1: Rewrite board-view.tsx — Local State + onDragOver + onDragEnd
+
+**Files:**
+- Rewrite: `apps/web/features/issues/components/board-view.tsx`
+
+This is the core task. The entire DnD orchestration logic changes.
+
+### Data Model
+
+```typescript
+// Local state: maps status → ordered array of issue IDs
+// This is the ONLY source of truth for card positions during drag
+type Columns = Record<IssueStatus, string[]>;
+```
+
+### Step 1: Replace pendingMove with local columns state
+
+Remove `pendingMove` + `displayIssues` + the clearing useEffect. Replace with:
+
+```typescript
+// Build columns from TQ issues + view sort settings
+function buildColumns(
+  issues: Issue[],
+  visibleStatuses: IssueStatus[],
+  sortBy: SortField,
+  sortDirection: SortDirection,
+): Columns {
+  const cols: Columns = {} as Columns;
+  for (const status of visibleStatuses) {
+    const sorted = sortIssues(
+      issues.filter((i) => i.status === status),
+      sortBy,
+      sortDirection,
+    );
+    cols[status] = sorted.map((i) => i.id);
+  }
+  return cols;
+}
+```
+
+In the component:
+
+```typescript
+const sortBy = useViewStore((s) => s.sortBy);
+const sortDirection = useViewStore((s) => s.sortDirection);
+
+// Local columns state — follows TQ between drags, local during drag
+const [columns, setColumns] = useState<Columns>(() =>
+  buildColumns(issues, visibleStatuses, sortBy, sortDirection)
+);
+const isDragging = useRef(false);
+
+// Sync from TQ when NOT dragging
+useEffect(() => {
+  if (!isDragging.current) {
+    setColumns(buildColumns(issues, visibleStatuses, sortBy, sortDirection));
+  }
+}, [issues, visibleStatuses, sortBy, sortDirection]);
+```
+
+`issueMap` for O(1) lookup (needed by BoardColumn to get Issue objects from IDs):
+
+```typescript
+const issueMap = useMemo(() => {
+  const map = new Map<string, Issue>();
+  for (const issue of issues) map.set(issue.id, issue);
+  return map;
+}, [issues]);
+```
+
+### Step 2: Implement findColumn helper
+
+```typescript
+/** Find which column (status) contains a given ID (issue or column). */
+function findColumn(columns: Columns, id: string, visibleStatuses: IssueStatus[]): IssueStatus | null {
+  // Is it a column ID itself?
+  if (visibleStatuses.includes(id as IssueStatus)) return id as IssueStatus;
+  // Search columns for the item
+  for (const [status, ids] of Object.entries(columns)) {
+    if (ids.includes(id)) return status as IssueStatus;
+  }
+  return null;
+}
+```
+
+### Step 3: Implement onDragStart
+
+```typescript
+const handleDragStart = useCallback((event: DragStartEvent) => {
+  isDragging.current = true;
+  const issue = issueMap.get(event.active.id as string) ?? null;
+  setActiveIssue(issue);
+}, [issueMap]);
+```
+
+### Step 4: Implement onDragOver — the key missing piece
+
+This fires continuously during drag. When the pointer crosses into a different column or hovers over a different card, we move the dragged ID in local state. This makes SortableContext aware of the new item → cards shift to make room.
+
+```typescript
+const handleDragOver = useCallback((event: DragOverEvent) => {
+  const { active, over } = event;
+  if (!over) return;
+
+  const activeId = active.id as string;
+  const overId = over.id as string;
+
+  const activeCol = findColumn(columns, activeId, visibleStatuses);
+  const overCol = findColumn(columns, overId, visibleStatuses);
+  if (!activeCol || !overCol || activeCol === overCol) return;
+
+  // Cross-column move: remove from old column, insert into new column
+  setColumns((prev) => {
+    const oldIds = prev[activeCol]!.filter((id) => id !== activeId);
+    const newIds = [...prev[overCol]!];
+
+    // Insert position: if over a card, insert at that index; if over column, append
+    const overIndex = newIds.indexOf(overId);
+    const insertIndex = overIndex >= 0 ? overIndex : newIds.length;
+    newIds.splice(insertIndex, 0, activeId);
+
+    return { ...prev, [activeCol]: oldIds, [overCol]: newIds };
+  });
+}, [columns, visibleStatuses]);
+```
+
+### Step 5: Implement onDragEnd — persist to server
+
+```typescript
+const handleDragEnd = useCallback((event: DragEndEvent) => {
+  const { active, over } = event;
+  isDragging.current = false;
+  setActiveIssue(null);
+
+  if (!over) {
+    // Cancelled — reset to TQ state
+    setColumns(buildColumns(issues, visibleStatuses, sortBy, sortDirection));
+    return;
+  }
+
+  const activeId = active.id as string;
+  const overId = over.id as string;
+
+  const activeCol = findColumn(columns, activeId, visibleStatuses);
+  const overCol = findColumn(columns, overId, visibleStatuses);
+  if (!activeCol || !overCol) return;
+
+  // Same column reorder
+  if (activeCol === overCol) {
+    const ids = columns[activeCol]!;
+    const oldIndex = ids.indexOf(activeId);
+    const newIndex = ids.indexOf(overId);
+    if (oldIndex !== newIndex) {
+      const reordered = arrayMove(ids, oldIndex, newIndex);
+      setColumns((prev) => ({ ...prev, [activeCol]: reordered }));
+    }
+  }
+
+  // Compute final position from the local column order
+  const finalCol = findColumn(columns, activeId, visibleStatuses);
+  if (!finalCol) return;
+
+  // After potential same-col reorder, re-read columns
+  // (for same-col we just did setColumns above, but it's async;
+  //  however we can compute from the intended final order)
+  let finalIds: string[];
+  if (activeCol === overCol) {
+    const ids = columns[activeCol]!;
+    const oldIndex = ids.indexOf(activeId);
+    const newIndex = ids.indexOf(overId);
+    finalIds = oldIndex !== newIndex ? arrayMove(ids, oldIndex, newIndex) : ids;
+  } else {
+    finalIds = columns[finalCol]!;
+  }
+
+  const newPosition = computePosition(finalIds, activeId, issues);
+  const currentIssue = issueMap.get(activeId);
+
+  // Skip if nothing changed
+  if (currentIssue && currentIssue.status === finalCol && currentIssue.position === newPosition) return;
+
+  onMoveIssue(activeId, finalCol, newPosition);
+}, [columns, issues, visibleStatuses, sortBy, sortDirection, issueMap, onMoveIssue]);
+```
+
+### Step 6: Update computePosition to work with ID arrays
+
+The current `computePosition` takes `Issue[]` and a target index. Rewrite to take `string[]` (IDs) + the active ID + the issue map:
+
+```typescript
+/** Compute a float position for `activeId` based on its neighbors in `ids`. */
+function computePosition(ids: string[], activeId: string, allIssues: Issue[]): number {
+  const idx = ids.indexOf(activeId);
+  if (idx === -1) return 0;
+
+  const getPos = (id: string) => allIssues.find((i) => i.id === id)?.position ?? 0;
+
+  if (ids.length === 1) return 0;
+  if (idx === 0) return getPos(ids[1]!) - 1;
+  if (idx === ids.length - 1) return getPos(ids[idx - 1]!) + 1;
+  return (getPos(ids[idx - 1]!) + getPos(ids[idx + 1]!)) / 2;
+}
+```
+
+### Step 7: Update DragOverlay styling
+
+```typescript
+<DragOverlay dropAnimation={null}>
+  {activeIssue ? (
+    <div className="w-[280px] rotate-2 scale-105 cursor-grabbing opacity-90 shadow-lg shadow-black/10">
+      <BoardCardContent issue={activeIssue} />
+    </div>
+  ) : null}
+</DragOverlay>
+```
+
+Key change: `dropAnimation={null}` prevents the overlay from animating back to origin on drop — the card is already in the right position via local state.
+
+### Step 8: Wire it all together
+
+Pass `columns` + `issueMap` to `BoardColumn` instead of `issues`:
+
+```tsx
+{visibleStatuses.map((status) => (
+  <BoardColumn
+    key={status}
+    status={status}
+    issueIds={columns[status] ?? []}
+    issueMap={issueMap}
+  />
+))}
+```
+
+### Step 9: Run typecheck
+
+Run: `pnpm typecheck`
+Expected: May have errors in board-column.tsx (prop changes) — that's Task 2.
+
+### Step 10: Commit
+
+```bash
+git add apps/web/features/issues/components/board-view.tsx
+git commit -m "refactor(board): rewrite DnD with local state + onDragOver for live cross-column sorting"
+```
+
+---
+
+## Task 2: Rewrite board-column.tsx — Receive IDs + issueMap, Add Insertion Indicator
+
+**Files:**
+- Rewrite: `apps/web/features/issues/components/board-column.tsx`
+
+### Step 1: Change props from `issues: Issue[]` to `issueIds: string[]` + `issueMap: Map<string, Issue>`
+
+The column no longer does its own sorting — the parent provides IDs in the correct order. The column just resolves IDs to Issue objects and renders them.
+
+```typescript
+export function BoardColumn({
+  status,
+  issueIds,
+  issueMap,
+}: {
+  status: IssueStatus;
+  issueIds: string[];
+  issueMap: Map<string, Issue>;
+}) {
+  const cfg = STATUS_CONFIG[status];
+  const { setNodeRef, isOver } = useDroppable({ id: status });
+  const viewStoreApi = useViewStoreApi();
+
+  // Resolve IDs to Issue objects (IDs are already sorted by parent)
+  const resolvedIssues = useMemo(
+    () => issueIds.flatMap((id) => {
+      const issue = issueMap.get(id);
+      return issue ? [issue] : [];
+    }),
+    [issueIds, issueMap],
+  );
+
+  return (
+    <div className={`flex w-[280px] shrink-0 flex-col rounded-xl ${cfg.columnBg} p-2`}>
+      <div className="mb-2 flex items-center justify-between px-1.5">
+        <div className="flex items-center gap-2">
+          <span className={`inline-flex items-center gap-1.5 rounded px-2 py-0.5 text-xs font-semibold ${cfg.badgeBg} ${cfg.badgeText}`}>
+            <StatusIcon status={status} className="h-3 w-3" inheritColor />
+            {cfg.label}
+          </span>
+          <span className="text-xs text-muted-foreground">
+            {issueIds.length}
+          </span>
+        </div>
+        {/* Right: add + menu — keep as-is */}
+        <div className="flex items-center gap-1">
+          <DropdownMenu>
+            <DropdownMenuTrigger
+              render={
+                <Button variant="ghost" size="icon-sm" className="rounded-full text-muted-foreground">
+                  <MoreHorizontal className="size-3.5" />
+                </Button>
+              }
+            />
+            <DropdownMenuContent align="end">
+              <DropdownMenuItem onClick={() => viewStoreApi.getState().hideStatus(status)}>
+                <EyeOff className="size-3.5" />
+                Hide column
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </DropdownMenu>
+          <Tooltip>
+            <TooltipTrigger
+              render={
+                <Button
+                  variant="ghost"
+                  size="icon-sm"
+                  className="rounded-full text-muted-foreground"
+                  onClick={() => useModalStore.getState().open("create-issue", { status })}
+                >
+                  <Plus className="size-3.5" />
+                </Button>
+              }
+            />
+            <TooltipContent>Add issue</TooltipContent>
+          </Tooltip>
+        </div>
+      </div>
+      <div
+        ref={setNodeRef}
+        className={`min-h-[200px] flex-1 space-y-2 overflow-y-auto rounded-lg p-1 transition-colors ${
+          isOver ? "bg-accent/60" : ""
+        }`}
+      >
+        <SortableContext items={issueIds} strategy={verticalListSortingStrategy}>
+          {resolvedIssues.map((issue) => (
+            <DraggableBoardCard key={issue.id} issue={issue} />
+          ))}
+        </SortableContext>
+        {issueIds.length === 0 && (
+          <p className="py-8 text-center text-xs text-muted-foreground">
+            No issues
+          </p>
+        )}
+      </div>
+    </div>
+  );
+}
+```
+
+Key changes:
+- No more `useViewStore` for sort — parent handles sorting
+- No more internal `sortIssues` call
+- Uses `issueIds` for SortableContext (already in correct order)
+- Count shows `issueIds.length` instead of `issues.length`
+
+### Step 2: Run typecheck
+
+Run: `pnpm typecheck`
+Expected: PASS (or errors in issues-page.tsx — Task 4)
+
+### Step 3: Commit
+
+```bash
+git add apps/web/features/issues/components/board-column.tsx
+git commit -m "refactor(board): BoardColumn receives sorted IDs from parent, no internal sorting"
+```
+
+---
+
+## Task 3: Modify board-card.tsx — Custom animateLayoutChanges
+
+**Files:**
+- Modify: `apps/web/features/issues/components/board-card.tsx`
+
+### Step 1: Add custom animateLayoutChanges
+
+When a card is dragged across containers, dnd-kit triggers a layout animation on the "entering" card. The default `defaultAnimateLayoutChanges` animates this, causing a jarring jump. We disable animation for the frame when `wasDragging` is true (the card just landed in a new container).
+
+```typescript
+import { useSortable, defaultAnimateLayoutChanges } from "@dnd-kit/sortable";
+import type { AnimateLayoutChanges } from "@dnd-kit/sortable";
+
+const animateLayoutChanges: AnimateLayoutChanges = (args) => {
+  const { isSorting, wasDragging } = args;
+  if (isSorting || wasDragging) return false;
+  return defaultAnimateLayoutChanges(args);
+};
+```
+
+Update useSortable call:
+
+```typescript
+const {
+  attributes,
+  listeners,
+  setNodeRef,
+  transform,
+  transition,
+  isDragging,
+} = useSortable({
+  id: issue.id,
+  data: { status: issue.status },
+  animateLayoutChanges,
+});
+```
+
+### Step 2: Run typecheck
+
+Run: `pnpm typecheck`
+Expected: PASS
+
+### Step 3: Commit
+
+```bash
+git add apps/web/features/issues/components/board-card.tsx
+git commit -m "refactor(board): custom animateLayoutChanges to prevent jarring cross-column animation"
+```
+
+---
+
+## Task 4: Adjust issues-page.tsx — Minor Callback Cleanup
+
+**Files:**
+- Modify: `apps/web/features/issues/components/issues-page.tsx`
+
+### Step 1: Update handleMoveIssue
+
+The callback shape stays the same (`issueId, newStatus, newPosition`), but the auto-switch-to-manual-sort logic should move into board-view or stay here. Keep it here for now since it's a view-level concern.
+
+No functional change needed — the `onMoveIssue` prop signature is unchanged. Just verify that `BoardView`'s new props are correct:
+
+```tsx
+<BoardView
+  issues={issues}
+  allIssues={scopedIssues}
+  visibleStatuses={visibleStatuses}
+  hiddenStatuses={hiddenStatuses}
+  onMoveIssue={handleMoveIssue}
+/>
+```
+
+`BoardView` still receives `issues` (filtered+scoped from TQ) and `onMoveIssue`. The internal state management changes are encapsulated.
+
+### Step 2: Run full typecheck + test
+
+Run: `pnpm typecheck && pnpm test`
+Expected: PASS
+
+### Step 3: Commit
+
+```bash
+git add apps/web/features/issues/components/issues-page.tsx
+git commit -m "refactor(board): verify issues-page props match new BoardView interface"
+```
+
+---
+
+## Task 5: Manual QA Checklist
+
+After all code changes, verify these scenarios in the browser:
+
+1. **Same-column reorder**: Drag a card up/down within one column → cards shift to make room during drag → drop → position persists after refresh
+2. **Cross-column move**: Drag card from Todo to In Progress → card appears in target column DURING drag → target column cards shift → drop → status + position persist
+3. **Drop on empty column**: Drag card to an empty column → card lands there
+4. **Cancel drag**: Start dragging, press Escape → card returns to original position, no mutation fired
+5. **Rapid sequential drags**: Drag card A, drop, immediately drag card B → no flicker or stale state
+6. **WebSocket update during drag**: Have another user change an issue → board updates correctly after drag ends (not during)
+7. **Sort mode switch**: Drag should auto-switch to "Manual" sort → verify after drag, sort dropdown shows "Manual"
+8. **DragOverlay**: Dragged card should have visible shadow, slight rotation, slight scale up
+9. **Hidden columns panel**: Still shows correct counts, "Show column" still works
+
+---
+
+## Summary of Architecture Change
+
+```
+BEFORE (broken):
+  TQ cache → issues prop → displayIssues (with pendingMove patch) → BoardColumn sorts internally
+  onDragEnd → pendingMove + mutate → TQ updates → useEffect clears pendingMove
+  Problem: dual optimistic update, fire-and-forget cancelQueries race, no onDragOver
+
+AFTER (correct):
+  TQ cache → issues prop → buildColumns() → local columns state (when not dragging)
+  onDragStart → isDragging=true, freeze local state
+  onDragOver → move IDs between columns in local state → SortableContext sees new items → cards shift
+  onDragEnd → compute position from local order → mutate → isDragging=false → TQ catches up → local follows
+  Problem: none — single source of truth during drag (local), single source of truth between drags (TQ)
+```

pnpm-lock.yaml

@@ -75,6 +75,12 @@ importers:
       '@floating-ui/dom':
         specifier: ^1.7.6
         version: 1.7.6
+      '@tanstack/react-query':
+        specifier: ^5.96.2
+        version: 5.96.2(react@19.2.3)
+      '@tanstack/react-query-devtools':
+        specifier: ^5.96.2
+        version: 5.96.2(@tanstack/react-query@5.96.2(react@19.2.3))(react@19.2.3)
       '@tiptap/extension-code-block-lowlight':
         specifier: ^3.22.1
         version: 3.22.1(@tiptap/core@3.22.1(@tiptap/pm@3.22.1))(@tiptap/extension-code-block@3.22.1(@tiptap/core@3.22.1(@tiptap/pm@3.22.1))(@tiptap/pm@3.22.1))(@tiptap/pm@3.22.1)(highlight.js@11.11.1)(lowlight@3.3.0)
@@ -1288,6 +1294,23 @@ packages:
   '@tailwindcss/postcss@4.2.2':
     resolution: {integrity: sha512-n4goKQbW8RVXIbNKRB/45LzyUqN451deQK0nzIeauVEqjlI49slUlgKYJM2QyUzap/PcpnS7kzSUmPb1sCRvYQ==}
 
+  '@tanstack/query-core@5.96.2':
+    resolution: {integrity: sha512-hzI6cTVh4KNRk8UtoIBS7Lv9g6BnJPXvBKsvYH1aGWvv0347jT3BnSvztOE+kD76XGvZnRC/t6qdW1CaIfwCeA==}
+
+  '@tanstack/query-devtools@5.96.2':
+    resolution: {integrity: sha512-vBTB1Qhbm3nHSbEUtQwks/EdcAtFfEapr1WyBW4w2ExYKuXVi3jIxUIHf5MlSltiHuL7zNyUuanqT/7sI2sb6g==}
+
+  '@tanstack/react-query-devtools@5.96.2':
+    resolution: {integrity: sha512-nTFKLGuTOFvmFRvcyZ3ArWC/DnMNPoBh6h/2yD6rsf7TCTJCQt+oUWOp2uKPTIuEPtF/vN9Kw5tl5mD1Kbposw==}
+    peerDependencies:
+      '@tanstack/react-query': ^5.96.2
+      react: ^18 || ^19
+
+  '@tanstack/react-query@5.96.2':
+    resolution: {integrity: sha512-sYyzzJT4G0g02azzJ8o55VFFV31XvFpdUpG+unxS0vSaYsJnSPKGoI6WdPwUucJL1wpgGfwfmntNX/Ub1uOViA==}
+    peerDependencies:
+      react: ^18 || ^19
+
   '@testing-library/dom@10.4.1':
     resolution: {integrity: sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==}
     engines: {node: '>=18'}
@@ -4917,6 +4940,21 @@ snapshots:
       postcss: 8.5.8
       tailwindcss: 4.2.2
 
+  '@tanstack/query-core@5.96.2': {}
+
+  '@tanstack/query-devtools@5.96.2': {}
+
+  '@tanstack/react-query-devtools@5.96.2(@tanstack/react-query@5.96.2(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@tanstack/query-devtools': 5.96.2
+      '@tanstack/react-query': 5.96.2(react@19.2.3)
+      react: 19.2.3
+
+  '@tanstack/react-query@5.96.2(react@19.2.3)':
+    dependencies:
+      '@tanstack/query-core': 5.96.2
+      react: 19.2.3
+
   '@testing-library/dom@10.4.1':
     dependencies:
       '@babel/code-frame': 7.29.0

scripts/check.sh

@@ -100,6 +100,8 @@ pnpm test || { EXIT_CODE=1; exit 1; }
 # --------------------------------------------------------------------------
 echo ""
 echo "==> [3/5] Go tests..."
+echo "==> Running database migrations..."
+(cd server && go run ./cmd/migrate up) || { EXIT_CODE=1; exit 1; }
 (cd server && go test ./...) || { EXIT_CODE=1; exit 1; }
 
 # --------------------------------------------------------------------------

scripts/ensure-postgres.sh

@@ -17,26 +17,88 @@ set +a
 POSTGRES_DB="${POSTGRES_DB:-multica}"
 POSTGRES_USER="${POSTGRES_USER:-multica}"
 POSTGRES_PASSWORD="${POSTGRES_PASSWORD:-multica}"
+DATABASE_URL="${DATABASE_URL:-}"
 
 export PGPASSWORD="$POSTGRES_PASSWORD"
 
-echo "==> Ensuring shared PostgreSQL container is running on localhost:5432..."
-docker compose up -d postgres
+db_host=""
+db_port="${POSTGRES_PORT:-5432}"
+db_name="$POSTGRES_DB"
 
-echo "==> Waiting for PostgreSQL to be ready..."
-until docker compose exec -T postgres pg_isready -U "$POSTGRES_USER" -d postgres > /dev/null 2>&1; do
-  sleep 1
-done
+parse_database_url() {
+  local rest authority hostport path port_part
 
-echo "==> Ensuring database '$POSTGRES_DB' exists..."
-db_exists="$(docker compose exec -T postgres \
-  psql -U "$POSTGRES_USER" -d postgres -Atqc "SELECT 1 FROM pg_database WHERE datname = '$POSTGRES_DB'")"
+  rest="${DATABASE_URL#*://}"
+  rest="${rest%%\?*}"
+  authority="${rest%%/*}"
+  path="${rest#*/}"
 
-if [ "$db_exists" != "1" ]; then
-  docker compose exec -T postgres \
-    psql -U "$POSTGRES_USER" -d postgres -v ON_ERROR_STOP=1 \
-    -c "CREATE DATABASE \"$POSTGRES_DB\"" \
-    > /dev/null
+  if [ "$authority" = "$rest" ]; then
+    path=""
+  fi
+
+  hostport="${authority##*@}"
+
+  if [[ "$hostport" == \[* ]]; then
+    db_host="${hostport#\[}"
+    db_host="${db_host%%]*}"
+    port_part="${hostport#*\]}"
+    if [[ "$port_part" == :* ]] && [ -n "${port_part#:}" ]; then
+      db_port="${port_part#:}"
+    fi
+  else
+    db_host="${hostport%%:*}"
+    if [[ "$hostport" == *:* ]] && [ -n "${hostport##*:}" ]; then
+      db_port="${hostport##*:}"
+    fi
+  fi
+
+  if [ -n "$path" ]; then
+    db_name="${path%%/*}"
+  fi
+}
+
+if [ -n "$DATABASE_URL" ]; then
+  parse_database_url
 fi
 
-echo "✓ PostgreSQL ready. Application database: $POSTGRES_DB"
+is_local() {
+  [ -z "$DATABASE_URL" ] || [ "$db_host" = "localhost" ] || [ "$db_host" = "127.0.0.1" ] || [ "$db_host" = "::1" ]
+}
+
+if is_local; then
+  # ---------- Local: use Docker ----------
+  echo "==> Ensuring shared PostgreSQL container is running on localhost:5432..."
+  docker compose up -d postgres
+
+  echo "==> Waiting for PostgreSQL to be ready..."
+  until docker compose exec -T postgres pg_isready -U "$POSTGRES_USER" -d postgres > /dev/null 2>&1; do
+    sleep 1
+  done
+
+  echo "==> Ensuring database '$POSTGRES_DB' exists..."
+  db_exists="$(docker compose exec -T postgres \
+    psql -U "$POSTGRES_USER" -d postgres -Atqc "SELECT 1 FROM pg_database WHERE datname = '$POSTGRES_DB'")"
+
+  if [ "$db_exists" != "1" ]; then
+    docker compose exec -T postgres \
+      psql -U "$POSTGRES_USER" -d postgres -v ON_ERROR_STOP=1 \
+      -c "CREATE DATABASE \"$POSTGRES_DB\"" \
+      > /dev/null
+  fi
+
+  echo "✓ PostgreSQL ready (local Docker). Database: $POSTGRES_DB"
+else
+  # ---------- Remote: skip Docker, verify connectivity ----------
+  echo "==> Remote database detected (host: $db_host). Skipping Docker."
+  if command -v pg_isready > /dev/null 2>&1; then
+    echo "==> Waiting for PostgreSQL at $db_host:$db_port to be ready..."
+    until pg_isready -d "$DATABASE_URL" > /dev/null 2>&1; do
+      sleep 1
+    done
+    echo "✓ PostgreSQL ready (remote: $db_host:$db_port). Database: $db_name"
+  else
+    echo "==> pg_isready not found. Skipping remote connectivity preflight."
+    echo "✓ PostgreSQL configured (remote: $db_host:$db_port). Database: $db_name"
+  fi
+fi

server/cmd/multica/cmd_agent.go

@@ -17,7 +17,7 @@ import (
 
 var agentCmd = &cobra.Command{
 	Use:   "agent",
-	Short: "Manage agents",
+	Short: "Work with agents",
 }
 
 var agentListCmd = &cobra.Command{
@@ -29,7 +29,7 @@ var agentListCmd = &cobra.Command{
 var agentGetCmd = &cobra.Command{
 	Use:   "get <id>",
 	Short: "Get agent details",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runAgentGet,
 }
 
@@ -42,28 +42,28 @@ var agentCreateCmd = &cobra.Command{
 var agentUpdateCmd = &cobra.Command{
 	Use:   "update <id>",
 	Short: "Update an agent",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runAgentUpdate,
 }
 
 var agentArchiveCmd = &cobra.Command{
 	Use:   "archive <id>",
 	Short: "Archive an agent",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runAgentArchive,
 }
 
 var agentRestoreCmd = &cobra.Command{
 	Use:   "restore <id>",
 	Short: "Restore an archived agent",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runAgentRestore,
 }
 
 var agentTasksCmd = &cobra.Command{
 	Use:   "tasks <id>",
 	Short: "List tasks for an agent",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runAgentTasks,
 }
 
@@ -77,14 +77,14 @@ var agentSkillsCmd = &cobra.Command{
 var agentSkillsListCmd = &cobra.Command{
 	Use:   "list <agent-id>",
 	Short: "List skills assigned to an agent",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runAgentSkillsList,
 }
 
 var agentSkillsSetCmd = &cobra.Command{
 	Use:   "set <agent-id>",
 	Short: "Set skills for an agent (replaces all current assignments)",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runAgentSkillsSet,
 }
 

server/cmd/multica/cmd_attachment.go

@@ -14,14 +14,19 @@ import (
 
 var attachmentCmd = &cobra.Command{
 	Use:   "attachment",
-	Short: "Manage attachments",
+	Short: "Work with attachments",
 }
 
 var attachmentDownloadCmd = &cobra.Command{
 	Use:   "download <attachment-id>",
 	Short: "Download an attachment to a local file",
-	Long:  "Fetches the attachment metadata from the API, then downloads the file using its signed URL. Prints the local file path on success.",
-	Args:  cobra.ExactArgs(1),
+	Long:  "Download an attachment by its ID to a local file.",
+	Example: `  # Download an image attachment to the current directory
+  $ multica attachment download abc123
+
+  # Download to a specific directory
+  $ multica attachment download abc123 -o /tmp/images`,
+	Args:  exactArgs(1),
 	RunE:  runAttachmentDownload,
 }
 

server/cmd/multica/cmd_auth.go

@@ -22,7 +22,7 @@ import (
 
 var authCmd = &cobra.Command{
 	Use:   "auth",
-	Short: "Manage authentication",
+	Short: "Authenticate multica with Multica",
 }
 
 var authLoginCmd = &cobra.Command{

server/cmd/multica/cmd_config.go

@@ -11,7 +11,7 @@ import (
 
 var configCmd = &cobra.Command{
 	Use:   "config",
-	Short: "Show CLI configuration",
+	Short: "Manage configuration for multica",
 	RunE:  runConfigShow,
 }
 
@@ -25,7 +25,7 @@ var configSetCmd = &cobra.Command{
 	Use:   "set <key> <value>",
 	Short: "Set a CLI configuration value",
 	Long:  "Supported keys: server_url, app_url, workspace_id",
-	Args:  cobra.ExactArgs(2),
+	Args:  exactArgs(2),
 	RunE:  runConfigSet,
 }
 

server/cmd/multica/cmd_daemon.go

@@ -23,7 +23,7 @@ import (
 
 var daemonCmd = &cobra.Command{
 	Use:   "daemon",
-	Short: "Manage the local agent runtime daemon",
+	Short: "Control the local agent runtime daemon",
 }
 
 var daemonStartCmd = &cobra.Command{
@@ -163,13 +163,14 @@ func runDaemonBackground(cmd *cobra.Command) error {
 		return fmt.Errorf("start daemon: %w", err)
 	}
 	logFile.Close()
+	pid := child.Process.Pid
 
 	// Detach: we don't Wait() on the child — it runs independently.
 	child.Process.Release()
 
 	// Write PID file.
 	pidPath := daemonPIDPathForProfile(profile)
-	if err := os.WriteFile(pidPath, []byte(strconv.Itoa(child.Process.Pid)), 0o644); err != nil {
+	if err := os.WriteFile(pidPath, []byte(strconv.Itoa(pid)), 0o644); err != nil {
 		fmt.Fprintf(os.Stderr, "Warning: could not write PID file: %v\n", err)
 	}
 
@@ -184,9 +185,9 @@ func runDaemonBackground(cmd *cobra.Command) error {
 	}
 
 	if profile != "" {
-		fmt.Fprintf(os.Stderr, "Daemon [%s] started (pid %d, version %s)\n", profile, child.Process.Pid, version)
+		fmt.Fprintf(os.Stderr, "Daemon [%s] started (pid %d, version %s)\n", profile, pid, version)
 	} else {
-		fmt.Fprintf(os.Stderr, "Daemon started (pid %d, version %s)\n", child.Process.Pid, version)
+		fmt.Fprintf(os.Stderr, "Daemon started (pid %d, version %s)\n", pid, version)
 	}
 	fmt.Fprintf(os.Stderr, "Logs: %s\n", logPath)
 	return nil

server/cmd/multica/cmd_issue.go

@@ -16,7 +16,7 @@ import (
 
 var issueCmd = &cobra.Command{
 	Use:   "issue",
-	Short: "Manage issues",
+	Short: "Work with issues",
 }
 
 var issueListCmd = &cobra.Command{
@@ -28,7 +28,7 @@ var issueListCmd = &cobra.Command{
 var issueGetCmd = &cobra.Command{
 	Use:   "get <id>",
 	Short: "Get issue details",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runIssueGet,
 }
 
@@ -41,21 +41,21 @@ var issueCreateCmd = &cobra.Command{
 var issueUpdateCmd = &cobra.Command{
 	Use:   "update <id>",
 	Short: "Update an issue",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runIssueUpdate,
 }
 
 var issueAssignCmd = &cobra.Command{
 	Use:   "assign <id>",
 	Short: "Assign an issue to a member or agent",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runIssueAssign,
 }
 
 var issueStatusCmd = &cobra.Command{
 	Use:   "status <id> <status>",
 	Short: "Change issue status",
-	Args:  cobra.ExactArgs(2),
+	Args:  exactArgs(2),
 	RunE:  runIssueStatus,
 }
 
@@ -63,27 +63,27 @@ var issueStatusCmd = &cobra.Command{
 
 var issueCommentCmd = &cobra.Command{
 	Use:   "comment",
-	Short: "Manage issue comments",
+	Short: "Work with issue comments",
 }
 
 var issueCommentListCmd = &cobra.Command{
 	Use:   "list <issue-id>",
 	Short: "List comments on an issue",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runIssueCommentList,
 }
 
 var issueCommentAddCmd = &cobra.Command{
 	Use:   "add <issue-id>",
 	Short: "Add a comment to an issue",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runIssueCommentAdd,
 }
 
 var issueCommentDeleteCmd = &cobra.Command{
 	Use:   "delete <comment-id>",
 	Short: "Delete a comment",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runIssueCommentDelete,
 }
 
@@ -92,14 +92,14 @@ var issueCommentDeleteCmd = &cobra.Command{
 var issueRunsCmd = &cobra.Command{
 	Use:   "runs <issue-id>",
 	Short: "List execution history for an issue",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runIssueRuns,
 }
 
 var issueRunMessagesCmd = &cobra.Command{
 	Use:   "run-messages <task-id>",
 	Short: "List messages for an execution",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runIssueRunMessages,
 }
 

server/cmd/multica/cmd_repo.go

@@ -14,14 +14,14 @@ import (
 
 var repoCmd = &cobra.Command{
 	Use:   "repo",
-	Short: "Manage repositories",
+	Short: "Work with repositories",
 }
 
 var repoCheckoutCmd = &cobra.Command{
 	Use:   "checkout <url>",
 	Short: "Check out a repository into the working directory",
 	Long:  "Creates a git worktree from the daemon's bare clone cache. Used by agents to check out repos on demand.",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runRepoCheckout,
 }
 

server/cmd/multica/cmd_runtime.go

@@ -13,7 +13,7 @@ import (
 
 var runtimeCmd = &cobra.Command{
 	Use:   "runtime",
-	Short: "Manage agent runtimes",
+	Short: "Work with agent runtimes",
 }
 
 var runtimeListCmd = &cobra.Command{
@@ -25,28 +25,28 @@ var runtimeListCmd = &cobra.Command{
 var runtimeUsageCmd = &cobra.Command{
 	Use:   "usage <runtime-id>",
 	Short: "Get token usage for a runtime",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runRuntimeUsage,
 }
 
 var runtimeActivityCmd = &cobra.Command{
 	Use:   "activity <runtime-id>",
 	Short: "Get hourly task activity for a runtime",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runRuntimeActivity,
 }
 
 var runtimePingCmd = &cobra.Command{
 	Use:   "ping <runtime-id>",
 	Short: "Ping a runtime to check connectivity",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runRuntimePing,
 }
 
 var runtimeUpdateCmd = &cobra.Command{
 	Use:   "update <runtime-id>",
 	Short: "Initiate a CLI update on a runtime",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runRuntimeUpdate,
 }
 

server/cmd/multica/cmd_skill.go

@@ -16,7 +16,7 @@ import (
 
 var skillCmd = &cobra.Command{
 	Use:   "skill",
-	Short: "Manage skills",
+	Short: "Work with skills",
 }
 
 var skillListCmd = &cobra.Command{
@@ -28,7 +28,7 @@ var skillListCmd = &cobra.Command{
 var skillGetCmd = &cobra.Command{
 	Use:   "get <id>",
 	Short: "Get skill details (includes files)",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runSkillGet,
 }
 
@@ -41,14 +41,14 @@ var skillCreateCmd = &cobra.Command{
 var skillUpdateCmd = &cobra.Command{
 	Use:   "update <id>",
 	Short: "Update a skill",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runSkillUpdate,
 }
 
 var skillDeleteCmd = &cobra.Command{
 	Use:   "delete <id>",
 	Short: "Delete a skill",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runSkillDelete,
 }
 
@@ -62,27 +62,27 @@ var skillImportCmd = &cobra.Command{
 
 var skillFilesCmd = &cobra.Command{
 	Use:   "files",
-	Short: "Manage skill files",
+	Short: "Work with skill files",
 }
 
 var skillFilesListCmd = &cobra.Command{
 	Use:   "list <skill-id>",
 	Short: "List files for a skill",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runSkillFilesList,
 }
 
 var skillFilesUpsertCmd = &cobra.Command{
 	Use:   "upsert <skill-id>",
 	Short: "Create or update a skill file",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runSkillFilesUpsert,
 }
 
 var skillFilesDeleteCmd = &cobra.Command{
 	Use:   "delete <skill-id> <file-id>",
 	Short: "Delete a skill file",
-	Args:  cobra.ExactArgs(2),
+	Args:  exactArgs(2),
 	RunE:  runSkillFilesDelete,
 }
 

server/cmd/multica/cmd_workspace.go

@@ -15,7 +15,7 @@ import (
 
 var workspaceCmd = &cobra.Command{
 	Use:   "workspace",
-	Short: "Manage workspaces",
+	Short: "Work with workspaces",
 }
 
 var workspaceListCmd = &cobra.Command{
@@ -41,14 +41,14 @@ var workspaceMembersCmd = &cobra.Command{
 var workspaceWatchCmd = &cobra.Command{
 	Use:   "watch <workspace-id>",
 	Short: "Add a workspace to the daemon watch list",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runWatch,
 }
 
 var workspaceUnwatchCmd = &cobra.Command{
 	Use:   "unwatch <workspace-id>",
 	Short: "Remove a workspace from the daemon watch list",
-	Args:  cobra.ExactArgs(1),
+	Args:  exactArgs(1),
 	RunE:  runUnwatch,
 }
 

server/cmd/multica/help.go

@@ -0,0 +1,173 @@
+package main
+
+import (
+	"fmt"
+	"strings"
+	"text/template"
+
+	"github.com/spf13/cobra"
+)
+
+// Command group IDs used across the CLI.
+const (
+	groupCore       = "core"
+	groupRuntime    = "runtime"
+	groupAdditional = "additional"
+)
+
+// errSilent is returned when the error message has already been printed.
+var errSilent = fmt.Errorf("")
+
+// exactArgs returns a cobra.PositionalArgs that validates the arg count
+// and prints help on failure, so users see usage context with the error.
+func exactArgs(n int) cobra.PositionalArgs {
+	return func(cmd *cobra.Command, args []string) error {
+		if len(args) != n {
+			if n == 1 {
+				fmt.Fprintf(cmd.ErrOrStderr(), "Error: accepts 1 arg, received %d\n\n", len(args))
+			} else {
+				fmt.Fprintf(cmd.ErrOrStderr(), "Error: accepts %d args, received %d\n\n", n, len(args))
+			}
+			cmd.Help()
+			return errSilent
+		}
+		return nil
+	}
+}
+
+
+// initHelp configures the root command to use gh-style help output.
+func initHelp(root *cobra.Command) {
+	root.SetHelpTemplate(rootHelpTemplate)
+	root.SetUsageTemplate(rootHelpTemplate)
+	root.CompletionOptions.HiddenDefaultCmd = true
+
+	root.AddGroup(
+		&cobra.Group{ID: groupCore, Title: "CORE COMMANDS"},
+		&cobra.Group{ID: groupRuntime, Title: "RUNTIME COMMANDS"},
+		&cobra.Group{ID: groupAdditional, Title: "ADDITIONAL COMMANDS"},
+	)
+
+	// Apply gh-style templates to all commands recursively.
+	applyTemplates(root)
+}
+
+func applyTemplates(cmd *cobra.Command) {
+	for _, c := range cmd.Commands() {
+		if c.HasSubCommands() {
+			c.SetHelpTemplate(subHelpTemplate)
+			c.SetUsageTemplate(subHelpTemplate)
+		} else {
+			c.SetHelpTemplate(leafHelpTemplate)
+			c.SetUsageTemplate(leafHelpTemplate)
+		}
+		applyTemplates(c)
+	}
+}
+
+// formatCommandList formats a list of commands in "name:  description" style
+// with automatic alignment, matching gh's output.
+func formatCommandList(cmds []*cobra.Command) string {
+	if len(cmds) == 0 {
+		return ""
+	}
+
+	maxLen := 0
+	for _, c := range cmds {
+		if c.IsAvailableCommand() && len(c.Name()) > maxLen {
+			maxLen = len(c.Name())
+		}
+	}
+
+	var b strings.Builder
+	for _, c := range cmds {
+		if !c.IsAvailableCommand() {
+			continue
+		}
+		padding := strings.Repeat(" ", maxLen-len(c.Name()))
+		fmt.Fprintf(&b, "  %s:%s  %s\n", c.Name(), padding, c.Short)
+	}
+	return b.String()
+}
+
+// commandsInGroup returns commands that belong to a specific group.
+func commandsInGroup(cmds []*cobra.Command, groupID string) []*cobra.Command {
+	var result []*cobra.Command
+	for _, c := range cmds {
+		if c.GroupID == groupID && c.IsAvailableCommand() {
+			result = append(result, c)
+		}
+	}
+	return result
+}
+
+func init() {
+	cobra.AddTemplateFuncs(template.FuncMap{
+		"formatCommandList": formatCommandList,
+		"commandsInGroup":   commandsInGroup,
+	})
+}
+
+var rootHelpTemplate = `Work seamlessly with Multica from the command line.
+
+USAGE
+  multica <command> <subcommand> [flags]
+{{range .Groups}}
+{{.Title}}
+{{formatCommandList (commandsInGroup $.Commands .ID)}}
+{{- end}}
+FLAGS
+{{.LocalFlags.FlagUsages}}
+EXAMPLES
+  $ multica login
+  $ multica issue list --output json
+  $ multica daemon start
+  $ multica agent list --output json
+
+ENVIRONMENT VARIABLES
+  MULTICA_SERVER_URL    Override the default server URL
+  MULTICA_WORKSPACE_ID  Set the active workspace
+
+LEARN MORE
+  Use ` + "`multica <command> <subcommand> --help`" + ` for more information about a command.
+`
+
+var subHelpTemplate = `{{.Short}}
+
+USAGE
+  {{.CommandPath}} <command> [flags]
+
+COMMANDS
+{{formatCommandList .Commands}}
+INHERITED FLAGS
+  --help   Show help for command
+{{- if .Example}}
+
+EXAMPLES
+{{.Example}}
+{{- end}}
+
+LEARN MORE
+  Use ` + "`{{.CommandPath}} <command> --help`" + ` for more information about a command.
+`
+
+var leafHelpTemplate = `{{if .Long}}{{.Long}}{{else}}{{.Short}}{{end}}
+
+USAGE
+  {{.UseLine}}
+{{- if .HasLocalFlags}}
+
+FLAGS
+{{.LocalFlags.FlagUsages}}
+{{- end}}
+INHERITED FLAGS
+  --help   Show help for command
+{{- if .Example}}
+
+EXAMPLES
+{{.Example}}
+{{- end}}
+
+LEARN MORE
+  Use ` + "`multica <command> <subcommand> --help`" + ` for more information about a command.
+`

server/cmd/multica/main.go

@@ -15,7 +15,7 @@ var (
 var rootCmd = &cobra.Command{
 	Use:   "multica",
 	Short: "Multica CLI — local agent runtime and management tool",
-	Long:  "multica manages local agent runtimes and provides control commands for the Multica platform.",
+	Long:  "Work seamlessly with Multica from the command line.",
 	SilenceUsage:  true,
 	SilenceErrors: true,
 }
@@ -25,24 +25,47 @@ func init() {
 	rootCmd.PersistentFlags().String("workspace-id", "", "Workspace ID (env: MULTICA_WORKSPACE_ID)")
 	rootCmd.PersistentFlags().String("profile", "", "Configuration profile name (e.g. dev) — isolates config, daemon state, and workspaces")
 
-	rootCmd.AddCommand(loginCmd)
-	rootCmd.AddCommand(authCmd)
-	rootCmd.AddCommand(daemonCmd)
+	// Core commands
+	issueCmd.GroupID = groupCore
+	agentCmd.GroupID = groupCore
+	workspaceCmd.GroupID = groupCore
+	repoCmd.GroupID = groupCore
+	skillCmd.GroupID = groupCore
+
+	// Runtime commands
+	daemonCmd.GroupID = groupRuntime
+	runtimeCmd.GroupID = groupRuntime
+
+	// Additional commands
+	authCmd.GroupID = groupAdditional
+	loginCmd.GroupID = groupAdditional
+	attachmentCmd.GroupID = groupAdditional
+	configCmd.GroupID = groupAdditional
+	updateCmd.GroupID = groupAdditional
+	versionCmd.GroupID = groupAdditional
+
+	rootCmd.AddCommand(issueCmd)
 	rootCmd.AddCommand(agentCmd)
 	rootCmd.AddCommand(workspaceCmd)
-	rootCmd.AddCommand(configCmd)
-	rootCmd.AddCommand(issueCmd)
-	rootCmd.AddCommand(attachmentCmd)
 	rootCmd.AddCommand(repoCmd)
-	rootCmd.AddCommand(versionCmd)
-	rootCmd.AddCommand(updateCmd)
 	rootCmd.AddCommand(skillCmd)
+	rootCmd.AddCommand(daemonCmd)
 	rootCmd.AddCommand(runtimeCmd)
+	rootCmd.AddCommand(authCmd)
+	rootCmd.AddCommand(loginCmd)
+	rootCmd.AddCommand(attachmentCmd)
+	rootCmd.AddCommand(configCmd)
+	rootCmd.AddCommand(updateCmd)
+	rootCmd.AddCommand(versionCmd)
+
+	initHelp(rootCmd)
 }
 
 func main() {
 	if err := rootCmd.Execute(); err != nil {
-		fmt.Fprintln(os.Stderr, "Error:", err)
+		if err != errSilent {
+			fmt.Fprintln(os.Stderr, "Error:", err)
+		}
 		os.Exit(1)
 	}
 }

server/cmd/server/comment_trigger_integration_test.go

@@ -381,6 +381,34 @@ func TestCommentTriggerThreadInheritedMention(t *testing.T) {
 			t.Errorf("expected 1 pending task (no duplicate), got %d", n)
 		}
 	})
+
+	t.Run("reply mentioning only a member does not inherit agent mention", func(t *testing.T) {
+		clearTasks(t, issueID)
+		// Top-level comment @mentions the agent.
+		content := fmt.Sprintf("[@Agent](mention://agent/%s) can you help?", agentID)
+		threadID := postComment(t, issueID, content, nil)
+		clearTasks(t, issueID)
+		// Reply mentions only a member — should NOT inherit parent's agent mention.
+		reply := fmt.Sprintf("cc [@Someone](mention://member/%s)", testUserID)
+		postComment(t, issueID, reply, strPtr(threadID))
+		if n := countPendingTasks(t, issueID); n != 0 {
+			t.Errorf("expected 0 pending tasks (member-only reply should not inherit agent mention), got %d", n)
+		}
+	})
+
+	t.Run("reply mentioning agent and member still inherits", func(t *testing.T) {
+		clearTasks(t, issueID)
+		// Top-level comment @mentions the agent.
+		content := fmt.Sprintf("[@Agent](mention://agent/%s) review this", agentID)
+		threadID := postComment(t, issueID, content, nil)
+		clearTasks(t, issueID)
+		// Reply mentions both agent and member — should still trigger.
+		reply := fmt.Sprintf("[@Agent](mention://agent/%s) and cc [@Someone](mention://member/%s)", agentID, testUserID)
+		postComment(t, issueID, reply, strPtr(threadID))
+		if n := countPendingTasks(t, issueID); n != 1 {
+			t.Errorf("expected 1 pending task (reply mentions agent explicitly), got %d", n)
+		}
+	})
 }
 
 // TestCommentTriggerCoalescing verifies that rapid-fire comments don't create