The open-source app everyone uses to manage agents at work
TypeScript acpxagent-orchestrationagent-skillsagentic-aiai-agentsai-engineeringai-governanceai-toolsautonomous-agentsclaudeclaude-codeclaude-skillscodexhermesllmmcpmulti-agentopenclawproject-managementworkflow-automation
feat(inbox): add operator search and keyboard controls
dotta3ab7d52f00eb
diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.tsindex 325ccbdb20..a69da428df 100644--- a/packages/shared/src/index.ts+++ b/packages/shared/src/index.ts@@ -255,6 +255,8 @@ export type {FinanceSummary,FinanceByBiller,FinanceByKind,+ AgentWakeupResponse,+ AgentWakeupSkipped,HeartbeatRun,HeartbeatRunEvent,AgentRuntimeState,diff --git a/packages/shared/src/types/heartbeat.ts b/packages/shared/src/types/heartbeat.tsindex c399b6da8e..5e8dd21709 100644--- a/packages/shared/src/types/heartbeat.ts+++ b/packages/shared/src/types/heartbeat.ts@@ -42,6 +42,18 @@ export interface HeartbeatRun {updatedAt: Date;}+export interface AgentWakeupSkipped {+ status: "skipped";+ reason: string;+ message: string | null;+ issueId: string | null;+ executionRunId: string | null;+ executionAgentId: string | null;+ executionAgentName: string | null;+}++export type AgentWakeupResponse = HeartbeatRun | AgentWakeupSkipped;+export interface HeartbeatRunEvent {id: number;companyId: string;diff --git a/packages/shared/src/types/index.ts b/packages/shared/src/types/index.tsindex d76b37a8f7..f11ce54d50 100644--- a/packages/shared/src/types/index.ts+++ b/packages/shared/src/types/index.ts@@ -141,6 +141,8 @@ export type {export type { CostEvent, CostSummary, CostByAgent, CostByProviderModel, CostByBiller, CostByAgentModel, CostWindowSpendRow, CostByProject } from "./cost.js";export type { FinanceEvent, FinanceSummary, FinanceByBiller, FinanceByKind } from "./finance.js";export type {+ AgentWakeupResponse,+ AgentWakeupSkipped,HeartbeatRun,HeartbeatRunEvent,AgentRuntimeState,diff --git a/packages/shared/src/types/instance.ts b/packages/shared/src/types/instance.tsindex ec156d8956..70599868f7 100644--- a/packages/shared/src/types/instance.ts+++ b/packages/shared/src/types/instance.ts@@ -2,6 +2,7 @@ import type { FeedbackDataSharingPreference } from "./feedback.js";export interface InstanceGeneralSettings {censorUsernameInLogs: boolean;+ keyboardShortcuts: boolean;feedbackDataSharingPreference: FeedbackDataSharingPreference;}diff --git a/packages/shared/src/types/issue.ts b/packages/shared/src/types/issue.tsindex d55f8e157f..9ef7f2d468 100644--- a/packages/shared/src/types/issue.ts+++ b/packages/shared/src/types/issue.ts@@ -143,6 +143,7 @@ export interface Issue {mentionedProjects?: Project[];myLastTouchAt?: Date | null;lastExternalCommentAt?: Date | null;+ lastActivityAt?: Date | null;isUnreadForMe?: boolean;createdAt: Date;updatedAt: Date;diff --git a/packages/shared/src/validators/instance.ts b/packages/shared/src/validators/instance.tsindex 4afad283a7..5634c8f6a7 100644--- a/packages/shared/src/validators/instance.ts+++ b/packages/shared/src/validators/instance.ts@@ -4,6 +4,7 @@ import { feedbackDataSharingPreferenceSchema } from "./feedback.js";export const instanceGeneralSettingsSchema = z.object({censorUsernameInLogs: z.boolean().default(false),+ keyboardShortcuts: z.boolean().default(false),feedbackDataSharingPreference: feedbackDataSharingPreferenceSchema.default(DEFAULT_FEEDBACK_DATA_SHARING_PREFERENCE,),diff --git a/server/src/__tests__/agent-skills-routes.test.ts b/server/src/__tests__/agent-skills-routes.test.tsindex 801e0991bb..8590d9884e 100644--- a/server/src/__tests__/agent-skills-routes.test.ts+++ b/server/src/__tests__/agent-skills-routes.test.ts@@ -231,11 +231,31 @@ describe("agent skill routes", () => {);});- it("keeps runtime materialization for persistent skill adapters", async () => {+ it("skips runtime materialization when listing Codex skills", async () => {mockAgentService.getById.mockResolvedValue(makeAgent("codex_local"));mockAdapter.listSkills.mockResolvedValue({adapterType: "codex_local",supported: true,+ mode: "ephemeral",+ desiredSkills: ["paperclipai/paperclip/paperclip"],+ entries: [],+ warnings: [],+ });++ const res = await request(createApp())+ .get("/api/agents/11111111-1111-4111-8111-111111111111/skills?companyId=company-1");++ expect(res.status, JSON.stringify(res.body)).toBe(200);+ expect(mockCompanySkillService.listRuntimeSkillEntries).toHaveBeenCalledWith("company-1", {+ materializeMissing: false,+ });+ });++ it("keeps runtime materialization for persistent skill adapters", async () => {+ mockAgentService.getById.mockResolvedValue(makeAgent("cursor"));+ mockAdapter.listSkills.mockResolvedValue({+ adapterType: "cursor",+ supported: true,mode: "persistent",desiredSkills: ["paperclipai/paperclip/paperclip"],entries: [],diff --git a/server/src/__tests__/instance-settings-routes.test.ts b/server/src/__tests__/instance-settings-routes.test.tsindex 4d8e12b177..08abfd19ec 100644--- a/server/src/__tests__/instance-settings-routes.test.ts+++ b/server/src/__tests__/instance-settings-routes.test.ts@@ -35,6 +35,7 @@ describe("instance settings routes", () => {vi.clearAllMocks();mockInstanceSettingsService.getGeneral.mockResolvedValue({censorUsernameInLogs: false,+ keyboardShortcuts: false,feedbackDataSharingPreference: "prompt",});mockInstanceSettingsService.getExperimental.mockResolvedValue({@@ -45,6 +46,7 @@ describe("instance settings routes", () => {id: "instance-settings-1",general: {censorUsernameInLogs: true,+ keyboardShortcuts: true,feedbackDataSharingPreference: "allowed",},});@@ -114,6 +116,7 @@ describe("instance settings routes", () => {expect(getRes.status).toBe(200);expect(getRes.body).toEqual({censorUsernameInLogs: false,+ keyboardShortcuts: false,feedbackDataSharingPreference: "prompt",});@@ -121,18 +124,20 @@ describe("instance settings routes", () => {.patch("/api/instance/settings/general").send({censorUsernameInLogs: true,+ keyboardShortcuts: true,feedbackDataSharingPreference: "allowed",});expect(patchRes.status).toBe(200);expect(mockInstanceSettingsService.updateGeneral).toHaveBeenCalledWith({censorUsernameInLogs: true,+ keyboardShortcuts: true,feedbackDataSharingPreference: "allowed",});expect(mockLogActivity).toHaveBeenCalledTimes(2);});- it("rejects non-admin board users", async () => {+ it("allows non-admin board users to read general settings", async () => {const app = createApp({type: "board",userId: "user-1",@@ -143,8 +148,25 @@ describe("instance settings routes", () => {const res = await request(app).get("/api/instance/settings/general");+ expect(res.status).toBe(200);+ expect(mockInstanceSettingsService.getGeneral).toHaveBeenCalled();+ });++ it("rejects non-admin board users from updating general settings", async () => {+ const app = createApp({+ type: "board",+ userId: "user-1",+ source: "session",+ isInstanceAdmin: false,+ companyIds: ["company-1"],+ });++ const res = await request(app)+ .patch("/api/instance/settings/general")+ .send({ censorUsernameInLogs: true, keyboardShortcuts: true });+expect(res.status).toBe(403);- expect(mockInstanceSettingsService.getGeneral).not.toHaveBeenCalled();+ expect(mockInstanceSettingsService.updateGeneral).not.toHaveBeenCalled();});it("rejects agent callers", async () => {diff --git a/server/src/routes/agents.ts b/server/src/routes/agents.tsindex c2cacfe492..c2ed8ee231 100644--- a/server/src/routes/agents.ts+++ b/server/src/routes/agents.ts@@ -2,7 +2,7 @@ import { Router, type Request } from "express";import { generateKeyPairSync, randomUUID } from "node:crypto";import path from "node:path";import type { Db } from "@paperclipai/db";-import { agents as agentsTable, companies, heartbeatRuns } from "@paperclipai/db";+import { agents as agentsTable, companies, heartbeatRuns, issues as issuesTable } from "@paperclipai/db";import { and, desc, eq, inArray, not, sql } from "drizzle-orm";import {agentSkillSyncSchema,@@ -220,6 +220,73 @@ export function agentRoutes(db: Db) {return allowedByGrant || canCreateAgents(actorAgent);}+ async function buildSkippedWakeupResponse(+ agent: NonNullable<Awaited<ReturnType<typeof svc.getById>>>,+ payload: Record<string, unknown> | null | undefined,+ ) {+ const issueId = typeof payload?.issueId === "string" && payload.issueId.trim() ? payload.issueId : null;+ if (!issueId) {+ return {+ status: "skipped" as const,+ reason: "wakeup_skipped",+ message: "Wakeup was skipped.",+ issueId: null,+ executionRunId: null,+ executionAgentId: null,+ executionAgentName: null,+ };+ }++ const issue = await db+ .select({+ id: issuesTable.id,+ executionRunId: issuesTable.executionRunId,+ })+ .from(issuesTable)+ .where(and(eq(issuesTable.id, issueId), eq(issuesTable.companyId, agent.companyId)))+ .then((rows) => rows[0] ?? null);++ if (!issue?.executionRunId) {+ return {+ status: "skipped" as const,+ reason: "wakeup_skipped",+ message: "Wakeup was skipped.",+ issueId,+ executionRunId: null,+ executionAgentId: null,+ executionAgentName: null,+ };+ }++ const executionRun = await heartbeat.getRun(issue.executionRunId);+ if (!executionRun || (executionRun.status !== "queued" && executionRun.status !== "running")) {+ return {+ status: "skipped" as const,+ reason: "wakeup_skipped",+ message: "Wakeup was skipped.",+ issueId,+ executionRunId: issue.executionRunId,+ executionAgentId: null,+ executionAgentName: null,+ };+ }++ const executionAgent = await svc.getById(executionRun.agentId);+ const executionAgentName = executionAgent?.name ?? null;++ return {+ status: "skipped" as const,+ reason: "issue_execution_deferred",+ message: executionAgentName+ ? `Wakeup was deferred because this issue is already being executed by ${executionAgentName}.`+ : "Wakeup was deferred because this issue already has an active execution run.",+ issueId,+ executionRunId: executionRun.id,+ executionAgentId: executionRun.agentId,+ executionAgentName,+ };+ }+async function assertCanUpdateAgent(req: Request, targetAgent: { id: string; companyId: string }) {assertCompanyAccess(req, targetAgent.companyId);if (req.actor.type === "board") return;@@ -532,8 +599,15 @@ export function agentRoutes(db: Db) {};}+ const ADAPTERS_REQUIRING_MATERIALIZED_RUNTIME_SKILLS = new Set([+ "cursor",+ "gemini_local",+ "opencode_local",+ "pi_local",+ ]);+function shouldMaterializeRuntimeSkillsForAdapter(adapterType: string) {- return adapterType !== "claude_local";+ return ADAPTERS_REQUIRING_MATERIALIZED_RUNTIME_SKILLS.has(adapterType);}async function buildRuntimeSkillConfig(@@ -1001,6 +1075,7 @@ export function agentRoutes(db: Db) {projectId: issue.projectId,goalId: issue.goalId,parentId: issue.parentId,+ lastActivityAt: (issue as typeof issue & { lastActivityAt?: Date | null }).lastActivityAt ?? issue.updatedAt,updatedAt: issue.updatedAt,activeRun: issue.activeRun,})),@@ -1994,7 +2069,7 @@ export function agentRoutes(db: Db) {});if (!run) {- res.status(202).json({ status: "skipped" });+ res.status(202).json(await buildSkippedWakeupResponse(agent, req.body.payload ?? null));return;}diff --git a/server/src/routes/instance-settings.ts b/server/src/routes/instance-settings.tsindex 1c9493caa3..7bd24e36a3 100644--- a/server/src/routes/instance-settings.ts+++ b/server/src/routes/instance-settings.ts@@ -21,7 +21,11 @@ export function instanceSettingsRoutes(db: Db) {const svc = instanceSettingsService(db);router.get("/instance/settings/general", async (req, res) => {- assertCanManageInstanceSettings(req);+ // General settings (e.g. keyboardShortcuts) are readable by any+ // authenticated board user. Only PATCH requires instance-admin.+ if (req.actor.type !== "board") {+ throw forbidden("Board access required");+ }res.json(await svc.getGeneral());});@@ -56,7 +60,11 @@ export function instanceSettingsRoutes(db: Db) {);router.get("/instance/settings/experimental", async (req, res) => {- assertCanManageInstanceSettings(req);+ // Experimental settings are readable by any authenticated board user.+ // Only PATCH requires instance-admin.+ if (req.actor.type !== "board") {+ throw forbidden("Board access required");+ }res.json(await svc.getExperimental());});diff --git a/server/src/services/instance-settings.ts b/server/src/services/instance-settings.tsindex f1d2afcd24..7856591d68 100644--- a/server/src/services/instance-settings.ts+++ b/server/src/services/instance-settings.ts@@ -19,12 +19,14 @@ function normalizeGeneralSettings(raw: unknown): InstanceGeneralSettings {if (parsed.success) {return {censorUsernameInLogs: parsed.data.censorUsernameInLogs ?? false,+ keyboardShortcuts: parsed.data.keyboardShortcuts ?? false,feedbackDataSharingPreference:parsed.data.feedbackDataSharingPreference ?? DEFAULT_FEEDBACK_DATA_SHARING_PREFERENCE,};}return {censorUsernameInLogs: false,+ keyboardShortcuts: false,feedbackDataSharingPreference: DEFAULT_FEEDBACK_DATA_SHARING_PREFERENCE,};}diff --git a/ui/src/api/agents.ts b/ui/src/api/agents.tsindex ec090b4310..bda8bf7ac8 100644--- a/ui/src/api/agents.ts+++ b/ui/src/api/agents.ts@@ -8,6 +8,7 @@ import type {AgentKeyCreated,AgentRuntimeState,AgentTaskSession,+ AgentWakeupResponse,HeartbeatRun,Approval,AgentConfigRevision,@@ -189,7 +190,7 @@ export const agentsApi = {idempotencyKey?: string | null;},companyId?: string,- ) => api.post<HeartbeatRun | { status: "skipped" }>(agentPath(id, companyId, "/wakeup"), data),+ ) => api.post<AgentWakeupResponse>(agentPath(id, companyId, "/wakeup"), data),loginWithClaude: (id: string, companyId?: string) =>api.post<ClaudeLoginResult>(agentPath(id, companyId, "/claude-login"), {}),availableSkills: () =>diff --git a/ui/src/components/IssueRow.test.tsx b/ui/src/components/IssueRow.test.tsxindex 3273d96cbf..04deb423c5 100644--- a/ui/src/components/IssueRow.test.tsx+++ b/ui/src/components/IssueRow.test.tsx@@ -113,4 +113,27 @@ describe("IssueRow", () => {root.unmount();});});++ it("preserves the issue detail breadcrumb source and href in the link target", () => {+ const root = createRoot(container);+ const issue = createIssue();+ const state = {+ issueDetailBreadcrumb: { label: "Inbox", href: "/PAP/inbox/mine" },+ issueDetailSource: "inbox",+ };++ act(() => {+ root.render(<IssueRow issue={issue} issueLinkState={state} />);+ });++ const link = container.querySelector("[data-inbox-issue-link]") as HTMLAnchorElement | null;+ expect(link).not.toBeNull();+ expect(link?.getAttribute("to") ?? link?.getAttribute("href")).toContain(+ "/issues/PAP-1?from=inbox&fromHref=%2FPAP%2Finbox%2Fmine",+ );++ act(() => {+ root.unmount();+ });+ });});diff --git a/ui/src/components/Layout.tsx b/ui/src/components/Layout.tsxindex 8761b71c9b..694573562c 100644--- a/ui/src/components/Layout.tsx+++ b/ui/src/components/Layout.tsx@@ -24,6 +24,7 @@ import { useTheme } from "../context/ThemeContext";import { useKeyboardShortcuts } from "../hooks/useKeyboardShortcuts";import { useCompanyPageMemory } from "../hooks/useCompanyPageMemory";import { healthApi } from "../api/health";+import { instanceSettingsApi } from "../api/instanceSettings";import { shouldSyncCompanySelectionFromRoute } from "../lib/company-selection";import {DEFAULT_INSTANCE_SETTINGS_PATH,@@ -85,6 +86,10 @@ export function Layout() {},refetchIntervalInBackground: true,});+ const keyboardShortcutsEnabled = useQuery({+ queryKey: queryKeys.instance.generalSettings,+ queryFn: () => instanceSettingsApi.getGeneral(),+ }).data?.keyboardShortcuts === true;useEffect(() => {if (companiesLoading || onboardingTriggered.current) return;@@ -141,6 +146,7 @@ export function Layout() {useCompanyPageMemory();useKeyboardShortcuts({+ enabled: keyboardShortcutsEnabled,onNewIssue: () => openNewIssue(),onToggleSidebar: toggleSidebar,onTogglePanel: togglePanel,diff --git a/ui/src/hooks/useKeyboardShortcuts.ts b/ui/src/hooks/useKeyboardShortcuts.tsindex 6120da80d5..6f5b33c48a 100644--- a/ui/src/hooks/useKeyboardShortcuts.ts+++ b/ui/src/hooks/useKeyboardShortcuts.ts@@ -1,17 +1,25 @@import { useEffect } from "react";+import { isKeyboardShortcutTextInputTarget } from "../lib/keyboardShortcuts";interface ShortcutHandlers {+ enabled?: boolean;onNewIssue?: () => void;onToggleSidebar?: () => void;onTogglePanel?: () => void;}-export function useKeyboardShortcuts({ onNewIssue, onToggleSidebar, onTogglePanel }: ShortcutHandlers) {+export function useKeyboardShortcuts({+ enabled = true,+ onNewIssue,+ onToggleSidebar,+ onTogglePanel,+}: ShortcutHandlers) {useEffect(() => {+ if (!enabled) return;+function handleKeyDown(e: KeyboardEvent) {// Don't fire shortcuts when typing in inputs- const target = e.target as HTMLElement;- if (target.tagName === "INPUT" || target.tagName === "TEXTAREA" || target.isContentEditable) {+ if (isKeyboardShortcutTextInputTarget(e.target)) {return;}@@ -36,5 +44,5 @@ export function useKeyboardShortcuts({ onNewIssue, onToggleSidebar, onTogglePanedocument.addEventListener("keydown", handleKeyDown);return () => document.removeEventListener("keydown", handleKeyDown);- }, [onNewIssue, onToggleSidebar, onTogglePanel]);+ }, [enabled, onNewIssue, onToggleSidebar, onTogglePanel]);}diff --git a/ui/src/index.css b/ui/src/index.cssindex c220e8cd60..12b1c9660f 100644--- a/ui/src/index.css+++ b/ui/src/index.css@@ -193,13 +193,24 @@.scrollbar-auto-hide::-webkit-scrollbar-thumb {background: transparent !important;}+/* Light mode scrollbar on hover */.scrollbar-auto-hide:hover::-webkit-scrollbar-track {- background: oklch(0.205 0 0) !important;+ background: oklch(0.92 0 0) !important;}.scrollbar-auto-hide:hover::-webkit-scrollbar-thumb {- background: oklch(0.4 0 0) !important;+ background: oklch(0.7 0 0) !important;}.scrollbar-auto-hide:hover::-webkit-scrollbar-thumb:hover {+ background: oklch(0.6 0 0) !important;+}+/* Dark mode scrollbar on hover */+.dark .scrollbar-auto-hide:hover::-webkit-scrollbar-track {+ background: oklch(0.205 0 0) !important;+}+.dark .scrollbar-auto-hide:hover::-webkit-scrollbar-thumb {+ background: oklch(0.4 0 0) !important;+}+.dark .scrollbar-auto-hide:hover::-webkit-scrollbar-thumb:hover {background: oklch(0.5 0 0) !important;}diff --git a/ui/src/lib/inbox.test.ts b/ui/src/lib/inbox.test.tsindex 9befeaa0c8..784e38cb9f 100644--- a/ui/src/lib/inbox.test.ts+++ b/ui/src/lib/inbox.test.ts@@ -1,18 +1,32 @@// @vitest-environment nodeimport { beforeEach, describe, expect, it } from "vitest";-import type { Approval, DashboardSummary, HeartbeatRun, Issue, JoinRequest } from "@paperclipai/shared";+import type {+ Approval,+ DashboardSummary,+ ExecutionWorkspace,+ HeartbeatRun,+ Issue,+ JoinRequest,+ ProjectWorkspace,+} from "@paperclipai/shared";import {+ DEFAULT_INBOX_ISSUE_COLUMNS,computeInboxBadgeData,+ getAvailableInboxIssueColumns,getApprovalsForTab,getInboxWorkItems,getInboxKeyboardSelectionIndex,getRecentTouchedIssues,getUnreadTouchedIssues,isMineInboxTab,+ loadInboxIssueColumns,loadLastInboxTab,+ normalizeInboxIssueColumns,RECENT_ISSUES_LIMIT,+ resolveIssueWorkspaceName,resolveInboxSelectionIndex,+ saveInboxIssueColumns,saveLastInboxTab,shouldShowInboxSection,} from "./inbox";@@ -166,10 +180,68 @@ function makeIssue(id: string, isUnreadForMe: boolean): Issue {labelIds: [],myLastTouchAt: new Date("2026-03-11T00:00:00.000Z"),lastExternalCommentAt: new Date("2026-03-11T01:00:00.000Z"),+ lastActivityAt: new Date("2026-03-11T01:00:00.000Z"),isUnreadForMe,};}+function makeProjectWorkspace(overrides: Partial<ProjectWorkspace> = {}): ProjectWorkspace {+ return {+ id: "project-workspace-1",+ companyId: "company-1",+ projectId: "project-1",+ name: "Primary workspace",+ sourceType: "local_path",+ cwd: "/tmp/project",+ repoUrl: null,+ repoRef: null,+ defaultRef: null,+ visibility: "default",+ setupCommand: null,+ cleanupCommand: null,+ remoteProvider: null,+ remoteWorkspaceRef: null,+ sharedWorkspaceKey: null,+ metadata: null,+ runtimeConfig: null,+ isPrimary: true,+ createdAt: new Date("2026-03-11T00:00:00.000Z"),+ updatedAt: new Date("2026-03-11T00:00:00.000Z"),+ ...overrides,+ };+}++function makeExecutionWorkspace(overrides: Partial<ExecutionWorkspace> = {}): ExecutionWorkspace {+ return {+ id: "execution-workspace-1",+ companyId: "company-1",+ projectId: "project-1",+ projectWorkspaceId: "project-workspace-1",+ sourceIssueId: "issue-1",+ mode: "isolated_workspace",+ strategyType: "git_worktree",+ name: "PAP-1 branch",+ status: "active",+ cwd: "/tmp/project/worktree",+ repoUrl: null,+ baseRef: null,+ branchName: "pap-1",+ providerType: "git_worktree",+ providerRef: null,+ derivedFromExecutionWorkspaceId: null,+ lastUsedAt: new Date("2026-03-11T00:00:00.000Z"),+ openedAt: new Date("2026-03-11T00:00:00.000Z"),+ closedAt: null,+ cleanupEligibleAt: null,+ cleanupReason: null,+ config: null,+ metadata: null,+ createdAt: new Date("2026-03-11T00:00:00.000Z"),+ updatedAt: new Date("2026-03-11T00:00:00.000Z"),+ ...overrides,+ };+}+const dashboard: DashboardSummary = {companyId: "company-1",agents: {@@ -286,10 +358,10 @@ describe("inbox helpers", () => {it("mixes approvals into the inbox feed by most recent activity", () => {const newerIssue = makeIssue("1", true);- newerIssue.lastExternalCommentAt = new Date("2026-03-11T04:00:00.000Z");+ newerIssue.lastActivityAt = new Date("2026-03-11T04:00:00.000Z");const olderIssue = makeIssue("2", false);- olderIssue.lastExternalCommentAt = new Date("2026-03-11T02:00:00.000Z");+ olderIssue.lastActivityAt = new Date("2026-03-11T02:00:00.000Z");const approval = makeApprovalWithTimestamps("approval-between",@@ -314,9 +386,21 @@ describe("inbox helpers", () => {]);});+ it("prefers canonical lastActivityAt over comment-only timestamps", () => {+ const activityIssue = makeIssue("1", true);+ activityIssue.lastExternalCommentAt = new Date("2026-03-11T01:00:00.000Z");+ activityIssue.lastActivityAt = new Date("2026-03-11T05:00:00.000Z");++ const commentIssue = makeIssue("2", true);+ commentIssue.lastExternalCommentAt = new Date("2026-03-11T04:00:00.000Z");+ commentIssue.lastActivityAt = new Date("2026-03-11T04:00:00.000Z");++ expect(getRecentTouchedIssues([commentIssue, activityIssue]).map((issue) => issue.id)).toEqual(["1", "2"]);+ });+it("mixes join requests into the inbox feed by most recent activity", () => {const issue = makeIssue("1", true);- issue.lastExternalCommentAt = new Date("2026-03-11T04:00:00.000Z");+ issue.lastActivityAt = new Date("2026-03-11T04:00:00.000Z");const joinRequest = makeJoinRequest("join-1");joinRequest.createdAt = new Date("2026-03-11T03:00:00.000Z");@@ -401,7 +485,7 @@ describe("inbox helpers", () => {it("limits recent touched issues before unread badge counting", () => {const issues = Array.from({ length: RECENT_ISSUES_LIMIT + 5 }, (_, index) => {const issue = makeIssue(String(index + 1), index < 3);- issue.lastExternalCommentAt = new Date(Date.UTC(2026, 2, 31, 0, 0, 0, 0) - index * 60_000);+ issue.lastActivityAt = new Date(Date.UTC(2026, 2, 31, 0, 0, 0, 0) - index * 60_000);return issue;});@@ -419,6 +503,116 @@ describe("inbox helpers", () => {expect(loadLastInboxTab()).toBe("all");});+ it("defaults issue columns to the current inbox layout", () => {+ expect(loadInboxIssueColumns()).toEqual(DEFAULT_INBOX_ISSUE_COLUMNS);+ });++ it("normalizes saved issue columns to valid values in canonical order", () => {+ saveInboxIssueColumns(["labels", "updated", "status", "workspace", "labels", "assignee"]);++ expect(loadInboxIssueColumns()).toEqual(["status", "assignee", "workspace", "labels", "updated"]);+ expect(normalizeInboxIssueColumns(["project", "workspace", "wat", "id"])).toEqual(["id", "project", "workspace"]);+ });++ it("hides the workspace column option unless isolated workspaces are enabled", () => {+ expect(getAvailableInboxIssueColumns(false)).toEqual(["status", "id", "assignee", "project", "labels", "updated"]);+ expect(getAvailableInboxIssueColumns(true)).toEqual([+ "status",+ "id",+ "assignee",+ "project",+ "workspace",+ "labels",+ "updated",+ ]);+ });++ it("allows hiding every optional issue column down to the title-only view", () => {+ saveInboxIssueColumns([]);+ expect(loadInboxIssueColumns()).toEqual([]);+ });++ it("shows explicit workspace names but leaves the default workspace blank", () => {+ const issue = makeIssue("1", true);+ issue.projectId = "project-1";+ issue.projectWorkspaceId = "project-workspace-1";+ issue.executionWorkspaceId = "execution-workspace-1";++ const executionWorkspace = makeExecutionWorkspace();+ const defaultWorkspace = makeProjectWorkspace();+ const secondaryWorkspace = makeProjectWorkspace({+ id: "project-workspace-2",+ name: "Secondary workspace",+ isPrimary: false,+ });++ expect(+ resolveIssueWorkspaceName(issue, {+ executionWorkspaceById: new Map([[executionWorkspace.id, executionWorkspace]]),+ projectWorkspaceById: new Map([+ [defaultWorkspace.id, defaultWorkspace],+ [secondaryWorkspace.id, secondaryWorkspace],+ ]),+ defaultProjectWorkspaceIdByProjectId: new Map([[issue.projectId!, defaultWorkspace.id]]),+ }),+ ).toBe("PAP-1 branch");++ issue.executionWorkspaceId = null;+ expect(+ resolveIssueWorkspaceName(issue, {+ projectWorkspaceById: new Map([+ [defaultWorkspace.id, defaultWorkspace],+ [secondaryWorkspace.id, secondaryWorkspace],+ ]),+ defaultProjectWorkspaceIdByProjectId: new Map([[issue.projectId!, defaultWorkspace.id]]),+ }),+ ).toBeNull();++ issue.projectWorkspaceId = secondaryWorkspace.id;+ expect(+ resolveIssueWorkspaceName(issue, {+ projectWorkspaceById: new Map([+ [defaultWorkspace.id, defaultWorkspace],+ [secondaryWorkspace.id, secondaryWorkspace],+ ]),+ defaultProjectWorkspaceIdByProjectId: new Map([[issue.projectId!, defaultWorkspace.id]]),+ }),+ ).toBe("Secondary workspace");++ issue.projectWorkspaceId = null;+ expect(+ resolveIssueWorkspaceName(issue, {+ projectWorkspaceById: new Map([+ [defaultWorkspace.id, defaultWorkspace],+ [secondaryWorkspace.id, secondaryWorkspace],+ ]),+ defaultProjectWorkspaceIdByProjectId: new Map([[issue.projectId!, defaultWorkspace.id]]),+ }),+ ).toBeNull();++ issue.executionWorkspaceId = "execution-workspace-shared-default";+ issue.projectWorkspaceId = defaultWorkspace.id;+ expect(+ resolveIssueWorkspaceName(issue, {+ executionWorkspaceById: new Map([[+ issue.executionWorkspaceId,+ makeExecutionWorkspace({+ id: issue.executionWorkspaceId,+ mode: "shared_workspace",+ strategyType: "project_primary",+ projectWorkspaceId: defaultWorkspace.id,+ name: "PAP-1067",+ }),+ ]]),+ projectWorkspaceById: new Map([+ [defaultWorkspace.id, defaultWorkspace],+ [secondaryWorkspace.id, secondaryWorkspace],+ ]),+ defaultProjectWorkspaceIdByProjectId: new Map([[issue.projectId!, defaultWorkspace.id]]),+ }),+ ).toBeNull();+ });+it("maps legacy new-tab storage to mine", () => {localStorage.setItem("paperclip:inbox:last-tab", "new");expect(loadLastInboxTab()).toBe("mine");diff --git a/ui/src/lib/inbox.ts b/ui/src/lib/inbox.tsindex e42152a2c1..9f26e99892 100644--- a/ui/src/lib/inbox.ts+++ b/ui/src/lib/inbox.ts@@ -1,10 +1,4 @@-import type {- Approval,- DashboardSummary,- HeartbeatRun,- Issue,- JoinRequest,-} from "@paperclipai/shared";+import type { Approval, DashboardSummary, HeartbeatRun, Issue, JoinRequest } from "@paperclipai/shared";export const RECENT_ISSUES_LIMIT = 100;export const FAILED_RUN_STATUSES = new Set(["failed", "timed_out"]);@@ -12,8 +6,12 @@ export const ACTIONABLE_APPROVAL_STATUSES = new Set(["pending", "revision_requesexport const DISMISSED_KEY = "paperclip:inbox:dismissed";export const READ_ITEMS_KEY = "paperclip:inbox:read-items";export const INBOX_LAST_TAB_KEY = "paperclip:inbox:last-tab";+export const INBOX_ISSUE_COLUMNS_KEY = "paperclip:inbox:issue-columns";export type InboxTab = "mine" | "recent" | "unread" | "all";export type InboxApprovalFilter = "all" | "actionable" | "resolved";+export const inboxIssueColumns = ["status", "id", "assignee", "project", "workspace", "labels", "updated"] as const;+export type InboxIssueColumn = (typeof inboxIssueColumns)[number];+export const DEFAULT_INBOX_ISSUE_COLUMNS: InboxIssueColumn[] = ["status", "id", "updated"];export type InboxWorkItem =| {kind: "issue";@@ -79,6 +77,80 @@ export function saveReadInboxItems(ids: Set<string>) {}}+export function normalizeInboxIssueColumns(columns: Iterable<string | InboxIssueColumn>): InboxIssueColumn[] {+ const selected = new Set(columns);+ return inboxIssueColumns.filter((column) => selected.has(column));+}++export function getAvailableInboxIssueColumns(enableWorkspaceColumn: boolean): InboxIssueColumn[] {+ if (enableWorkspaceColumn) return [...inboxIssueColumns];+ return inboxIssueColumns.filter((column) => column !== "workspace");+}++export function loadInboxIssueColumns(): InboxIssueColumn[] {+ try {+ const raw = localStorage.getItem(INBOX_ISSUE_COLUMNS_KEY);+ if (raw === null) return DEFAULT_INBOX_ISSUE_COLUMNS;+ const parsed = JSON.parse(raw);+ if (!Array.isArray(parsed)) return DEFAULT_INBOX_ISSUE_COLUMNS;+ return normalizeInboxIssueColumns(parsed);+ } catch {+ return DEFAULT_INBOX_ISSUE_COLUMNS;+ }+}++export function saveInboxIssueColumns(columns: InboxIssueColumn[]) {+ try {+ localStorage.setItem(+ INBOX_ISSUE_COLUMNS_KEY,+ JSON.stringify(normalizeInboxIssueColumns(columns)),+ );+ } catch {+ // Ignore localStorage failures.+ }+}++export function resolveIssueWorkspaceName(+ issue: Pick<Issue, "executionWorkspaceId" | "projectId" | "projectWorkspaceId">,+ {+ executionWorkspaceById,+ projectWorkspaceById,+ defaultProjectWorkspaceIdByProjectId,+ }: {+ executionWorkspaceById?: ReadonlyMap<string, {+ name: string;+ mode: "shared_workspace" | "isolated_workspace" | "operator_branch" | "adapter_managed" | "cloud_sandbox";+ projectWorkspaceId: string | null;+ }>;+ projectWorkspaceById?: ReadonlyMap<string, { name: string }>;+ defaultProjectWorkspaceIdByProjectId?: ReadonlyMap<string, string>;+ },+): string | null {+ const defaultProjectWorkspaceId = issue.projectId+ ? defaultProjectWorkspaceIdByProjectId?.get(issue.projectId) ?? null+ : null;++ if (issue.executionWorkspaceId) {+ const executionWorkspace = executionWorkspaceById?.get(issue.executionWorkspaceId) ?? null;+ const linkedProjectWorkspaceId =+ executionWorkspace?.projectWorkspaceId ?? issue.projectWorkspaceId ?? null;+ const isDefaultSharedExecutionWorkspace =+ executionWorkspace?.mode === "shared_workspace" && linkedProjectWorkspaceId === defaultProjectWorkspaceId;+ if (isDefaultSharedExecutionWorkspace) return null;++ const workspaceName = executionWorkspace?.name;+ if (workspaceName) return workspaceName;+ }++ if (issue.projectWorkspaceId) {+ if (issue.projectWorkspaceId === defaultProjectWorkspaceId) return null;+ const workspaceName = projectWorkspaceById?.get(issue.projectWorkspaceId)?.name;+ if (workspaceName) return workspaceName;+ }++ return null;+}+export function loadLastInboxTab(): InboxTab {try {const raw = localStorage.getItem(INBOX_LAST_TAB_KEY);@@ -145,6 +217,9 @@ export function normalizeTimestamp(value: string | Date | null | undefined): num}export function issueLastActivityTimestamp(issue: Issue): number {+ const lastActivityAt = normalizeTimestamp(issue.lastActivityAt);+ if (lastActivityAt > 0) return lastActivityAt;+const lastExternalCommentAt = normalizeTimestamp(issue.lastExternalCommentAt);if (lastExternalCommentAt > 0) return lastExternalCommentAt;diff --git a/ui/src/lib/issueDetailBreadcrumb.test.ts b/ui/src/lib/issueDetailBreadcrumb.test.tsindex dcb1847979..cebf65bf43 100644--- a/ui/src/lib/issueDetailBreadcrumb.test.ts+++ b/ui/src/lib/issueDetailBreadcrumb.test.ts@@ -1,8 +1,10 @@import { describe, expect, it } from "vitest";import {+ armIssueDetailInboxQuickArchive,createIssueDetailLocationState,createIssueDetailPath,readIssueDetailBreadcrumb,+ shouldArmIssueDetailInboxQuickArchive,} from "./issueDetailBreadcrumb";describe("issueDetailBreadcrumb", () => {@@ -25,10 +27,30 @@ describe("issueDetailBreadcrumb", () => {it("adds the source query param when building an issue detail path", () => {const state = createIssueDetailLocationState("Inbox", "/inbox/mine", "inbox");- expect(createIssueDetailPath("PAP-465", state)).toBe("/issues/PAP-465?from=inbox");+ expect(createIssueDetailPath("PAP-465", state)).toBe(+ "/issues/PAP-465?from=inbox&fromHref=%2Finbox%2Fmine",+ );});it("reuses the current source query param when state has been dropped", () => {- expect(createIssueDetailPath("PAP-465", null, "?from=issues")).toBe("/issues/PAP-465?from=issues");+ expect(createIssueDetailPath("PAP-465", null, "?from=issues&fromHref=%2Fissues%3Fq%3Dabc")).toBe(+ "/issues/PAP-465?from=issues&fromHref=%2Fissues%3Fq%3Dabc",+ );+ });++ it("restores the exact breadcrumb href from the query fallback", () => {+ expect(+ readIssueDetailBreadcrumb(null, "?from=inbox&fromHref=%2FPAP%2Finbox%2Funread"),+ ).toEqual({+ label: "Inbox",+ href: "/PAP/inbox/unread",+ });+ });++ it("can arm quick archive only for explicit inbox keyboard entry state", () => {+ const state = createIssueDetailLocationState("Inbox", "/inbox/mine", "inbox");++ expect(shouldArmIssueDetailInboxQuickArchive(state)).toBe(false);+ expect(shouldArmIssueDetailInboxQuickArchive(armIssueDetailInboxQuickArchive(state))).toBe(true);});});diff --git a/ui/src/lib/issueDetailBreadcrumb.ts b/ui/src/lib/issueDetailBreadcrumb.tsindex 1f940ef887..a53864e47e 100644--- a/ui/src/lib/issueDetailBreadcrumb.ts+++ b/ui/src/lib/issueDetailBreadcrumb.ts@@ -8,9 +8,11 @@ type IssueDetailBreadcrumb = {type IssueDetailLocationState = {issueDetailBreadcrumb?: IssueDetailBreadcrumb;issueDetailSource?: IssueDetailSource;+ issueDetailInboxQuickArchiveArmed?: boolean;};const ISSUE_DETAIL_SOURCE_QUERY_PARAM = "from";+const ISSUE_DETAIL_BREADCRUMB_HREF_QUERY_PARAM = "fromHref";function isIssueDetailBreadcrumb(value: unknown): value is IssueDetailBreadcrumb {if (typeof value !== "object" || value === null) return false;@@ -35,6 +37,13 @@ function readIssueDetailSourceFromSearch(search?: string): IssueDetailSource | nreturn isIssueDetailSource(source) ? source : null;}+function readIssueDetailBreadcrumbHrefFromSearch(search?: string): string | null {+ if (!search) return null;+ const params = new URLSearchParams(search);+ const href = params.get(ISSUE_DETAIL_BREADCRUMB_HREF_QUERY_PARAM);+ return href && href.startsWith("/") ? href : null;+}+function breadcrumbForSource(source: IssueDetailSource): IssueDetailBreadcrumb {if (source === "inbox") return { label: "Inbox", href: "/inbox" };return { label: "Issues", href: "/issues" };@@ -51,11 +60,30 @@ export function createIssueDetailLocationState(};}+export function armIssueDetailInboxQuickArchive(state: unknown): IssueDetailLocationState {+ if (typeof state !== "object" || state === null) {+ return { issueDetailInboxQuickArchiveArmed: true };+ }++ return {+ ...(state as IssueDetailLocationState),+ issueDetailInboxQuickArchiveArmed: true,+ };+}+export function createIssueDetailPath(issuePathId: string, state?: unknown, search?: string): string {const source = readIssueDetailSource(state) ?? readIssueDetailSourceFromSearch(search);+ const breadcrumb =+ (typeof state === "object" && state !== null+ ? (state as IssueDetailLocationState).issueDetailBreadcrumb+ : null);+ const breadcrumbHref =+ (isIssueDetailBreadcrumb(breadcrumb) ? breadcrumb.href : null) ??+ readIssueDetailBreadcrumbHrefFromSearch(search);if (!source) return `/issues/${issuePathId}`;const params = new URLSearchParams();params.set(ISSUE_DETAIL_SOURCE_QUERY_PARAM, source);+ if (breadcrumbHref) params.set(ISSUE_DETAIL_BREADCRUMB_HREF_QUERY_PARAM, breadcrumbHref);return `/issues/${issuePathId}?${params.toString()}`;}@@ -66,5 +94,14 @@ export function readIssueDetailBreadcrumb(state: unknown, search?: string): Issu}const source = readIssueDetailSourceFromSearch(search);- return source ? breadcrumbForSource(source) : null;+ if (!source) return null;++ const fallback = breadcrumbForSource(source);+ const href = readIssueDetailBreadcrumbHrefFromSearch(search);+ return href ? { ...fallback, href } : fallback;+}++export function shouldArmIssueDetailInboxQuickArchive(state: unknown): boolean {+ if (typeof state !== "object" || state === null) return false;+ return (state as IssueDetailLocationState).issueDetailInboxQuickArchiveArmed === true;}diff --git a/ui/src/lib/keyboardShortcuts.test.ts b/ui/src/lib/keyboardShortcuts.test.tsnew file mode 100644index 0000000000..90d4281ad9--- /dev/null+++ b/ui/src/lib/keyboardShortcuts.test.ts@@ -0,0 +1,106 @@+// @vitest-environment jsdom++import { describe, expect, it } from "vitest";+import {+ hasBlockingShortcutDialog,+ isKeyboardShortcutTextInputTarget,+ resolveInboxQuickArchiveKeyAction,+} from "./keyboardShortcuts";++describe("keyboardShortcuts helpers", () => {+ it("detects editable shortcut targets", () => {+ const wrapper = document.createElement("div");+ wrapper.innerHTML = `+ <div contenteditable="true"><span id="contenteditable-child">Editable</span></div>+ <div role="textbox"><span id="textbox-child">Textbox</span></div>+ <button id="button">Action</button>+ `;++ const editableChild = wrapper.querySelector("#contenteditable-child");+ const textboxChild = wrapper.querySelector("#textbox-child");+ const button = wrapper.querySelector("#button");++ expect(isKeyboardShortcutTextInputTarget(editableChild)).toBe(true);+ expect(isKeyboardShortcutTextInputTarget(textboxChild)).toBe(true);+ expect(isKeyboardShortcutTextInputTarget(button)).toBe(false);+ });++ it("reports when a modal dialog is open", () => {+ const root = document.createElement("div");+ root.innerHTML = `<div role="dialog" aria-modal="true"></div>`;++ expect(hasBlockingShortcutDialog(root)).toBe(true);+ expect(hasBlockingShortcutDialog(document.createElement("div"))).toBe(false);+ });++ it("archives only the first clean y press", () => {+ const button = document.createElement("button");++ expect(resolveInboxQuickArchiveKeyAction({+ armed: true,+ defaultPrevented: false,+ key: "y",+ metaKey: false,+ ctrlKey: false,+ altKey: false,+ target: button,+ hasOpenDialog: false,+ })).toBe("archive");+ });++ it("disarms on the first non-y keypress", () => {+ const button = document.createElement("button");++ expect(resolveInboxQuickArchiveKeyAction({+ armed: true,+ defaultPrevented: false,+ key: "n",+ metaKey: false,+ ctrlKey: false,+ altKey: false,+ target: button,+ hasOpenDialog: false,+ })).toBe("disarm");+ });++ it("stays inert for modifier combos before a real keypress", () => {+ const button = document.createElement("button");++ expect(resolveInboxQuickArchiveKeyAction({+ armed: true,+ defaultPrevented: false,+ key: "Meta",+ metaKey: false,+ ctrlKey: false,+ altKey: false,+ target: button,+ hasOpenDialog: false,+ })).toBe("ignore");++ expect(resolveInboxQuickArchiveKeyAction({+ armed: true,+ defaultPrevented: false,+ key: "y",+ metaKey: true,+ ctrlKey: false,+ altKey: false,+ target: button,+ hasOpenDialog: false,+ })).toBe("ignore");+ });++ it("disarms instead of archiving when typing into an editor", () => {+ const input = document.createElement("input");++ expect(resolveInboxQuickArchiveKeyAction({+ armed: true,+ defaultPrevented: false,+ key: "y",+ metaKey: false,+ ctrlKey: false,+ altKey: false,+ target: input,+ hasOpenDialog: false,+ })).toBe("disarm");+ });+});diff --git a/ui/src/lib/keyboardShortcuts.ts b/ui/src/lib/keyboardShortcuts.tsnew file mode 100644index 0000000000..0983e21847--- /dev/null+++ b/ui/src/lib/keyboardShortcuts.ts@@ -0,0 +1,54 @@+export const KEYBOARD_SHORTCUT_TEXT_INPUT_SELECTOR = [+ "input",+ "textarea",+ "select",+ "[contenteditable='true']",+ "[contenteditable='plaintext-only']",+ "[role='textbox']",+ "[role='combobox']",+].join(", ");++const MODIFIER_ONLY_KEYS = new Set(["Shift", "Meta", "Control", "Alt"]);++export type InboxQuickArchiveKeyAction = "ignore" | "archive" | "disarm";++export function isKeyboardShortcutTextInputTarget(target: EventTarget | null): boolean {+ if (!(target instanceof HTMLElement)) return false;+ if (target.isContentEditable) return true;+ return !!target.closest(KEYBOARD_SHORTCUT_TEXT_INPUT_SELECTOR);+}++export function hasBlockingShortcutDialog(root: ParentNode = document): boolean {+ return !!root.querySelector("[role='dialog'], [aria-modal='true']");+}++export function isModifierOnlyKey(key: string): boolean {+ return MODIFIER_ONLY_KEYS.has(key);+}++export function resolveInboxQuickArchiveKeyAction({+ armed,+ defaultPrevented,+ key,+ metaKey,+ ctrlKey,+ altKey,+ target,+ hasOpenDialog,+}: {+ armed: boolean;+ defaultPrevented: boolean;+ key: string;+ metaKey: boolean;+ ctrlKey: boolean;+ altKey: boolean;+ target: EventTarget | null;+ hasOpenDialog: boolean;+}): InboxQuickArchiveKeyAction {+ if (!armed) return "ignore";+ if (defaultPrevented) return "disarm";+ if (metaKey || ctrlKey || altKey || isModifierOnlyKey(key)) return "ignore";+ if (hasOpenDialog || isKeyboardShortcutTextInputTarget(target)) return "disarm";+ if (key === "y") return "archive";+ return "disarm";+}diff --git a/ui/src/pages/Inbox.test.tsx b/ui/src/pages/Inbox.test.tsxindex c103a52315..adb161c2ed 100644--- a/ui/src/pages/Inbox.test.tsx+++ b/ui/src/pages/Inbox.test.tsx@@ -5,7 +5,7 @@ import type { ComponentProps } from "react";import { createRoot } from "react-dom/client";import type { Issue } from "@paperclipai/shared";import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";-import { FailedRunInboxRow, InboxIssueMetaLeading } from "./Inbox";+import { FailedRunInboxRow, InboxIssueMetaLeading, InboxIssueTrailingColumns } from "./Inbox";vi.mock("@/lib/router", () => ({Link: ({ children, className, ...props }: ComponentProps<"a">) => (@@ -56,6 +56,7 @@ function createIssue(overrides: Partial<Issue> = {}): Issue {labelIds: [],myLastTouchAt: null,lastExternalCommentAt: null,+ lastActivityAt: new Date("2026-03-11T00:00:00.000Z"),isUnreadForMe: false,...overrides,};@@ -148,31 +149,91 @@ describe("InboxIssueMetaLeading", () => {container.remove();});- it("neutralizes selected status and live accents", () => {+ it("keeps status and live accents visible", () => {const root = createRoot(container);act(() => {- root.render(<InboxIssueMetaLeading issue={createIssue()} selected isLive />);+ root.render(<InboxIssueMetaLeading issue={createIssue()} isLive />);});- const statusIcon = container.querySelector('span[class*="border-muted-foreground"]');- const liveBadge = container.querySelector('span[class*="px-1.5"][class*="bg-muted"]');+ const statusIcon = container.querySelector('span[class*="border-blue-600"]');+ const liveBadge = container.querySelector('span[class*="px-1.5"][class*="bg-blue-500/10"]');const liveBadgeLabel = Array.from(container.querySelectorAll("span")).find((node) => node.textContent === "Live" && node.className.includes("text-"),);- const liveDot = container.querySelector('span[class*="bg-muted-foreground/70"]');+ const liveDot = container.querySelector('span[class*="bg-blue-500"]');const pulseRing = container.querySelector('span[class*="animate-pulse"]');expect(statusIcon).not.toBeNull();- expect(statusIcon?.className).toContain("!border-muted-foreground");- expect(statusIcon?.className).toContain("!text-muted-foreground");+ expect(statusIcon?.className).not.toContain("!border-muted-foreground");+ expect(statusIcon?.className).not.toContain("!text-muted-foreground");expect(liveBadge).not.toBeNull();- expect(liveBadge?.className).toContain("bg-muted");+ expect(liveBadge?.className).toContain("bg-blue-500/10");expect(liveBadgeLabel).not.toBeNull();- expect(liveBadgeLabel?.className).toContain("text-muted-foreground");- expect(liveBadgeLabel?.className).not.toContain("text-blue-600");+ expect(liveBadgeLabel?.className).toContain("text-blue-600");expect(liveDot).not.toBeNull();- expect(pulseRing).toBeNull();+ expect(pulseRing).not.toBeNull();++ act(() => {+ root.unmount();+ });+ });+});++describe("InboxIssueTrailingColumns", () => {+ let container: HTMLDivElement;++ beforeEach(() => {+ container = document.createElement("div");+ document.body.appendChild(container);+ });++ afterEach(() => {+ container.remove();+ });++ it("renders an empty tags cell when an issue has no labels", () => {+ const root = createRoot(container);++ act(() => {+ root.render(+ <InboxIssueTrailingColumns+ issue={createIssue({ labels: [], labelIds: [] })}+ columns={["labels"]}+ projectName={null}+ projectColor={null}+ workspaceName={null}+ assigneeName={null}+ currentUserId={null}+ />,+ );+ });++ expect(container.textContent).toBe("");++ act(() => {+ root.unmount();+ });+ });++ it("leaves the workspace cell blank when no explicit workspace label should be shown", () => {+ const root = createRoot(container);++ act(() => {+ root.render(+ <InboxIssueTrailingColumns+ issue={createIssue()}+ columns={["workspace"]}+ projectName={null}+ projectColor={null}+ workspaceName={null}+ assigneeName={null}+ currentUserId={null}+ />,+ );+ });++ expect(container.textContent).toBe("");act(() => {root.unmount();diff --git a/ui/src/pages/Inbox.tsx b/ui/src/pages/Inbox.tsxindex 9c86b04b95..1a35658012 100644--- a/ui/src/pages/Inbox.tsx+++ b/ui/src/pages/Inbox.tsx@@ -4,15 +4,24 @@ import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";import { INBOX_MINE_ISSUE_STATUS_FILTER } from "@paperclipai/shared";import { approvalsApi } from "../api/approvals";import { accessApi } from "../api/access";+import { authApi } from "../api/auth";import { ApiError } from "../api/client";import { dashboardApi } from "../api/dashboard";+import { executionWorkspacesApi } from "../api/execution-workspaces";import { issuesApi } from "../api/issues";import { agentsApi } from "../api/agents";import { heartbeatsApi } from "../api/heartbeats";+import { instanceSettingsApi } from "../api/instanceSettings";+import { projectsApi } from "../api/projects";import { useCompany } from "../context/CompanyContext";import { useBreadcrumbs } from "../context/BreadcrumbContext";import { queryKeys } from "../lib/queryKeys";-import { createIssueDetailLocationState, createIssueDetailPath } from "../lib/issueDetailBreadcrumb";+import {+ armIssueDetailInboxQuickArchive,+ createIssueDetailLocationState,+ createIssueDetailPath,+} from "../lib/issueDetailBreadcrumb";+import { hasBlockingShortcutDialog, isKeyboardShortcutTextInputTarget } from "../lib/keyboardShortcuts";import { EmptyState } from "../components/EmptyState";import { PageSkeleton } from "../components/PageSkeleton";import { IssueRow } from "../components/IssueRow";@@ -21,11 +30,31 @@ import { SwipeToArchive } from "../components/SwipeToArchive";import { StatusIcon } from "../components/StatusIcon";import { cn } from "../lib/utils";import { StatusBadge } from "../components/StatusBadge";+import { Identity } from "../components/Identity";import { approvalLabel, defaultTypeIcon, typeIcon } from "../components/ApprovalPayload";+import { pickTextColorForPillBg } from "@/lib/color-contrast";import { timeAgo } from "../lib/timeAgo";+import { formatAssigneeUserLabel } from "../lib/assignees";import { Button } from "@/components/ui/button";+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from "@/components/ui/dialog";import { Separator } from "@/components/ui/separator";import { Tabs } from "@/components/ui/tabs";+import {+ DropdownMenu,+ DropdownMenuCheckboxItem,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuLabel,+ DropdownMenuSeparator,+ DropdownMenuTrigger,+} from "@/components/ui/dropdown-menu";import {Select,SelectContent,@@ -40,19 +69,29 @@ import {X,RotateCcw,UserPlus,+ Columns3,+ Search,} from "lucide-react";+import { Input } from "@/components/ui/input";import { PageTabBar } from "../components/PageTabBar";import type { Approval, HeartbeatRun, Issue, JoinRequest } from "@paperclipai/shared";import {ACTIONABLE_APPROVAL_STATUSES,+ DEFAULT_INBOX_ISSUE_COLUMNS,+ getAvailableInboxIssueColumns,getApprovalsForTab,getInboxWorkItems,getInboxKeyboardSelectionIndex,getLatestFailedRunsByAgent,getRecentTouchedIssues,isMineInboxTab,+ loadInboxIssueColumns,+ normalizeInboxIssueColumns,+ resolveIssueWorkspaceName,resolveInboxSelectionIndex,+ saveInboxIssueColumns,InboxApprovalFilter,+ type InboxIssueColumn,saveLastInboxTab,shouldShowInboxSection,type InboxTab,@@ -100,58 +139,69 @@ function readIssueIdFromRun(run: HeartbeatRun): string | null {type NonIssueUnreadState = "visible" | "fading" | "hidden" | null;-const selectedInboxAccentClass = "!text-muted-foreground !border-muted-foreground";--function getSelectedUnreadButtonClass(selected: boolean): string {- return selected ? "hover:bg-muted/80" : "hover:bg-blue-500/20";-}--function getSelectedUnreadDotClass(selected: boolean): string {- return selected ? "bg-muted-foreground/70" : "bg-blue-600 dark:bg-blue-400";-}+const trailingIssueColumns: InboxIssueColumn[] = ["assignee", "project", "workspace", "labels", "updated"];+const inboxIssueColumnLabels: Record<InboxIssueColumn, string> = {+ status: "Status",+ id: "ID",+ assignee: "Assignee",+ project: "Project",+ workspace: "Workspace",+ labels: "Tags",+ updated: "Last updated",+};+const inboxIssueColumnDescriptions: Record<InboxIssueColumn, string> = {+ status: "Issue state chip on the left edge.",+ id: "Ticket identifier like PAP-1009.",+ assignee: "Assigned agent or board user.",+ project: "Linked project pill with its color.",+ workspace: "Execution or project workspace used for the issue.",+ labels: "Issue labels and tags.",+ updated: "Latest visible activity time.",+};export function InboxIssueMetaLeading({issue,- selected,isLive,+ showStatus = true,+ showIdentifier = true,}: {issue: Issue;- selected: boolean;isLive: boolean;+ showStatus?: boolean;+ showIdentifier?: boolean;}) {return (<>- <span className="hidden shrink-0 sm:inline-flex">- <StatusIcon- status={issue.status}- className={selected ? selectedInboxAccentClass : undefined}- />- </span>- <span className="shrink-0 font-mono text-xs text-muted-foreground">- {issue.identifier ?? issue.id.slice(0, 8)}- </span>+ {showStatus ? (+ <span className="hidden shrink-0 sm:inline-flex">+ <StatusIcon status={issue.status} />+ </span>+ ) : null}+ {showIdentifier ? (+ <span className="shrink-0 font-mono text-xs text-muted-foreground">+ {issue.identifier ?? issue.id.slice(0, 8)}+ </span>+ ) : null}{isLive && (<spanclassName={cn("inline-flex items-center gap-1 rounded-full px-1.5 py-0.5 sm:gap-1.5 sm:px-2",- selected ? "bg-muted" : "bg-blue-500/10",+ "bg-blue-500/10",)}><span className="relative flex h-2 w-2">- {!selected ? (- <span className="absolute inline-flex h-full w-full animate-pulse rounded-full bg-blue-400 opacity-75" />- ) : null}+ <span className="absolute inline-flex h-full w-full animate-pulse rounded-full bg-blue-400 opacity-75" /><spanclassName={cn("relative inline-flex h-2 w-2 rounded-full",- selected ? "bg-muted-foreground/70" : "bg-blue-500",+ "bg-blue-500",)}/></span><spanclassName={cn("hidden text-[11px] font-medium sm:inline",- selected ? "text-muted-foreground" : "text-blue-600 dark:text-blue-400",+ "text-blue-600 dark:text-blue-400",)}>Live@@ -162,6 +212,150 @@ export function InboxIssueMetaLeading({);}+function issueActivityText(issue: Issue): string {+ return `Updated ${timeAgo(issue.lastActivityAt ?? issue.lastExternalCommentAt ?? issue.updatedAt)}`;+}++function issueTrailingGridTemplate(columns: InboxIssueColumn[]): string {+ return columns+ .map((column) => {+ if (column === "assignee") return "minmax(7.5rem, 9.5rem)";+ if (column === "project") return "minmax(6.5rem, 8.5rem)";+ if (column === "workspace") return "minmax(9rem, 12rem)";+ if (column === "labels") return "minmax(8rem, 10rem)";+ return "minmax(6rem, 7rem)";+ })+ .join(" ");+}++export function InboxIssueTrailingColumns({+ issue,+ columns,+ projectName,+ projectColor,+ workspaceName,+ assigneeName,+ currentUserId,+}: {+ issue: Issue;+ columns: InboxIssueColumn[];+ projectName: string | null;+ projectColor: string | null;+ workspaceName: string | null;+ assigneeName: string | null;+ currentUserId: string | null;+}) {+ const activityText = timeAgo(issue.lastActivityAt ?? issue.lastExternalCommentAt ?? issue.updatedAt);+ const userLabel = formatAssigneeUserLabel(issue.assigneeUserId, currentUserId) ?? "User";++ return (+ <span+ className="grid items-center gap-2"+ style={{ gridTemplateColumns: issueTrailingGridTemplate(columns) }}+ >+ {columns.map((column) => {+ if (column === "assignee") {+ if (issue.assigneeAgentId) {+ return (+ <span key={column} className="min-w-0 text-xs text-foreground">+ <Identity+ name={assigneeName ?? issue.assigneeAgentId.slice(0, 8)}+ size="sm"+ className="min-w-0"+ />+ </span>+ );+ }++ if (issue.assigneeUserId) {+ return (+ <span key={column} className="min-w-0 truncate text-xs font-medium text-muted-foreground">+ {userLabel}+ </span>+ );+ }++ return (+ <span key={column} className="min-w-0 truncate text-xs text-muted-foreground">+ Unassigned+ </span>+ );+ }++ if (column === "project") {+ if (projectName) {+ const accentColor = projectColor ?? "#64748b";+ return (+ <span+ key={column}+ className="inline-flex min-w-0 items-center gap-2 text-xs font-medium"+ style={{ color: pickTextColorForPillBg(accentColor, 0.12) }}+ >+ <span+ className="h-1.5 w-1.5 shrink-0 rounded-full"+ style={{ backgroundColor: accentColor }}+ />+ <span className="truncate">{projectName}</span>+ </span>+ );+ }++ return (+ <span key={column} className="min-w-0 truncate text-xs text-muted-foreground">+ No project+ </span>+ );+ }++ if (column === "labels") {+ if ((issue.labels ?? []).length > 0) {+ return (+ <span key={column} className="flex min-w-0 items-center gap-1 overflow-hidden text-[11px]">+ {(issue.labels ?? []).slice(0, 2).map((label) => (+ <span+ key={label.id}+ className="inline-flex min-w-0 max-w-full items-center font-medium"+ style={{+ color: pickTextColorForPillBg(label.color, 0.12),+ }}+ >+ <span className="truncate">{label.name}</span>+ </span>+ ))}+ {(issue.labels ?? []).length > 2 ? (+ <span className="shrink-0 text-[11px] font-medium text-muted-foreground">+ +{(issue.labels ?? []).length - 2}+ </span>+ ) : null}+ </span>+ );+ }++ return <span key={column} className="min-w-0" aria-hidden="true" />;+ }++ if (column === "workspace") {+ if (!workspaceName) {+ return <span key={column} className="min-w-0" aria-hidden="true" />;+ }++ return (+ <span key={column} className="min-w-0 truncate text-xs text-muted-foreground">+ {workspaceName}+ </span>+ );+ }++ return (+ <span key={column} className="min-w-0 truncate text-right text-[11px] font-medium text-muted-foreground">+ {activityText}+ </span>+ );+ })}+ </span>+ );+}+export function FailedRunInboxRow({run,issueById,@@ -211,13 +405,13 @@ export function FailedRunInboxRow({onClick={onMarkRead}className={cn("inline-flex h-4 w-4 items-center justify-center rounded-full transition-colors",- getSelectedUnreadButtonClass(selected),+ "hover:bg-blue-500/20",)}aria-label="Mark as read"><span className={cn("block h-2 w-2 rounded-full transition-opacity duration-300",- getSelectedUnreadDotClass(selected),+ "bg-blue-600 dark:bg-blue-400",unreadState === "fading" ? "opacity-0" : "opacity-100",)} /></button>@@ -367,13 +561,13 @@ function ApprovalInboxRow({onClick={onMarkRead}className={cn("inline-flex h-4 w-4 items-center justify-center rounded-full transition-colors",- getSelectedUnreadButtonClass(selected),+ "hover:bg-blue-500/20",)}aria-label="Mark as read"><span className={cn("block h-2 w-2 rounded-full transition-opacity duration-300",- getSelectedUnreadDotClass(selected),+ "bg-blue-600 dark:bg-blue-400",unreadState === "fading" ? "opacity-0" : "opacity-100",)} /></button>@@ -506,13 +700,13 @@ function JoinRequestInboxRow({onClick={onMarkRead}className={cn("inline-flex h-4 w-4 items-center justify-center rounded-full transition-colors",- getSelectedUnreadButtonClass(selected),+ "hover:bg-blue-500/20",)}aria-label="Mark as read"><span className={cn("block h-2 w-2 rounded-full transition-opacity duration-300",- getSelectedUnreadDotClass(selected),+ "bg-blue-600 dark:bg-blue-400",unreadState === "fading" ? "opacity-0" : "opacity-100",)} /></button>@@ -597,8 +791,19 @@ export function Inbox() {const location = useLocation();const queryClient = useQueryClient();const [actionError, setActionError] = useState<string | null>(null);+ const keyboardShortcutsEnabled = useQuery({+ queryKey: queryKeys.instance.generalSettings,+ queryFn: () => instanceSettingsApi.getGeneral(),+ }).data?.keyboardShortcuts === true;+ const { data: experimentalSettings } = useQuery({+ queryKey: queryKeys.instance.experimentalSettings,+ queryFn: () => instanceSettingsApi.getExperimental(),+ retry: false,+ });+ const [searchQuery, setSearchQuery] = useState("");const [allCategoryFilter, setAllCategoryFilter] = useState<InboxCategoryFilter>("everything");const [allApprovalFilter, setAllApprovalFilter] = useState<InboxApprovalFilter>("all");+ const [visibleIssueColumns, setVisibleIssueColumns] = useState<InboxIssueColumn[]>(loadInboxIssueColumns);const { dismissed, dismiss } = useDismissedInboxItems();const { readItems, markRead: markItemRead, markUnread: markItemUnread } = useReadInboxItems();@@ -618,12 +823,31 @@ export function Inbox() {[location.pathname, location.search, location.hash],);+ const { data: session } = useQuery({+ queryKey: queryKeys.auth.session,+ queryFn: () => authApi.getSession(),+ });+const { data: agents } = useQuery({queryKey: queryKeys.agents.list(selectedCompanyId!),queryFn: () => agentsApi.list(selectedCompanyId!),enabled: !!selectedCompanyId,});+ const { data: projects } = useQuery({+ queryKey: queryKeys.projects.list(selectedCompanyId!),+ queryFn: () => projectsApi.list(selectedCompanyId!),+ enabled: !!selectedCompanyId,+ });+ const isolatedWorkspacesEnabled = experimentalSettings?.enableIsolatedWorkspaces === true;+ const { data: executionWorkspaces = [] } = useQuery({+ queryKey: selectedCompanyId+ ? queryKeys.executionWorkspaces.list(selectedCompanyId)+ : ["execution-workspaces", "__disabled__"],+ queryFn: () => executionWorkspacesApi.list(selectedCompanyId!),+ enabled: !!selectedCompanyId && isolatedWorkspacesEnabled,+ });+useEffect(() => {setBreadcrumbs([{ label: "Inbox" }]);}, [setBreadcrumbs]);@@ -631,6 +855,7 @@ export function Inbox() {useEffect(() => {saveLastInboxTab(tab);setSelectedIndex(-1);+ setSearchQuery("");}, [tab]);const {@@ -731,6 +956,59 @@ export function Inbox() {for (const issue of issues ?? []) map.set(issue.id, issue);return map;}, [issues]);+ const projectById = useMemo(() => {+ const map = new Map<string, { name: string; color: string | null }>();+ for (const project of projects ?? []) {+ map.set(project.id, { name: project.name, color: project.color });+ }+ return map;+ }, [projects]);+ const projectWorkspaceById = useMemo(() => {+ const map = new Map<string, { name: string }>();+ for (const project of projects ?? []) {+ for (const workspace of project.workspaces ?? []) {+ map.set(workspace.id, { name: workspace.name });+ }+ }+ return map;+ }, [projects]);+ const defaultProjectWorkspaceIdByProjectId = useMemo(() => {+ const map = new Map<string, string>();+ for (const project of projects ?? []) {+ const defaultWorkspaceId =+ project.executionWorkspacePolicy?.defaultProjectWorkspaceId+ ?? project.primaryWorkspace?.id+ ?? null;+ if (defaultWorkspaceId) map.set(project.id, defaultWorkspaceId);+ }+ return map;+ }, [projects]);+ const executionWorkspaceById = useMemo(() => {+ const map = new Map<string, {+ name: string;+ mode: "shared_workspace" | "isolated_workspace" | "operator_branch" | "adapter_managed" | "cloud_sandbox";+ projectWorkspaceId: string | null;+ }>();+ for (const workspace of executionWorkspaces) {+ map.set(workspace.id, {+ name: workspace.name,+ mode: workspace.mode,+ projectWorkspaceId: workspace.projectWorkspaceId ?? null,+ });+ }+ return map;+ }, [executionWorkspaces]);+ const visibleIssueColumnSet = useMemo(() => new Set(visibleIssueColumns), [visibleIssueColumns]);+ const availableIssueColumns = useMemo(+ () => getAvailableInboxIssueColumns(isolatedWorkspacesEnabled),+ [isolatedWorkspacesEnabled],+ );+ const availableIssueColumnSet = useMemo(() => new Set(availableIssueColumns), [availableIssueColumns]);+ const visibleTrailingIssueColumns = useMemo(+ () => trailingIssueColumns.filter((column) => visibleIssueColumnSet.has(column) && availableIssueColumnSet.has(column)),+ [availableIssueColumnSet, visibleIssueColumnSet],+ );+ const currentUserId = session?.user.id ?? session?.session.userId ?? null;const failedRuns = useMemo(() => getLatestFailedRunsByAgent(heartbeatRuns ?? []).filter((r) => !dismissed.has(`run:${r.id}`)),@@ -784,10 +1062,81 @@ export function Inbox() {[approvalsToRender, issuesToRender, showApprovalsCategory, showTouchedCategory, tab, failedRunsForTab, joinRequestsForTab],);+ const filteredWorkItems = useMemo(() => {+ const q = searchQuery.trim().toLowerCase();+ if (!q) return workItemsToRender;+ return workItemsToRender.filter((item) => {+ if (item.kind === "issue") {+ const issue = item.issue;+ if (issue.title.toLowerCase().includes(q)) return true;+ if (issue.identifier?.toLowerCase().includes(q)) return true;+ if (issue.description?.toLowerCase().includes(q)) return true;+ if (isolatedWorkspacesEnabled) {+ const workspaceName = resolveIssueWorkspaceName(issue, {+ executionWorkspaceById,+ projectWorkspaceById,+ defaultProjectWorkspaceIdByProjectId,+ });+ if (workspaceName?.toLowerCase().includes(q)) return true;+ }+ return false;+ }+ if (item.kind === "approval") {+ const a = item.approval;+ const label = approvalLabel(a.type, a.payload as Record<string, unknown> | null);+ if (label.toLowerCase().includes(q)) return true;+ if (a.type.toLowerCase().includes(q)) return true;+ return false;+ }+ if (item.kind === "failed_run") {+ const run = item.run;+ const name = agentById.get(run.agentId);+ if (name?.toLowerCase().includes(q)) return true;+ const msg = runFailureMessage(run);+ if (msg.toLowerCase().includes(q)) return true;+ const issueId = readIssueIdFromRun(run);+ if (issueId) {+ const issue = issueById.get(issueId);+ if (issue?.title.toLowerCase().includes(q)) return true;+ if (issue?.identifier?.toLowerCase().includes(q)) return true;+ }+ return false;+ }+ if (item.kind === "join_request") {+ const jr = item.joinRequest;+ if (jr.agentName?.toLowerCase().includes(q)) return true;+ if (jr.capabilities?.toLowerCase().includes(q)) return true;+ return false;+ }+ return false;+ });+ }, [+ workItemsToRender,+ searchQuery,+ agentById,+ defaultProjectWorkspaceIdByProjectId,+ executionWorkspaceById,+ issueById,+ isolatedWorkspacesEnabled,+ projectWorkspaceById,+ ]);+const agentName = (id: string | null) => {if (!id) return null;return agentById.get(id) ?? null;};+ const setIssueColumns = useCallback((next: InboxIssueColumn[]) => {+ const normalized = normalizeInboxIssueColumns(next);+ setVisibleIssueColumns(normalized);+ saveInboxIssueColumns(normalized);+ }, []);+ const toggleIssueColumn = useCallback((column: InboxIssueColumn, enabled: boolean) => {+ if (enabled) {+ setIssueColumns([...visibleIssueColumns, column]);+ return;+ }+ setIssueColumns(visibleIssueColumns.filter((value) => value !== column));+ }, [setIssueColumns, visibleIssueColumns]);const approveMutation = useMutation({mutationFn: (id: string) => approvalsApi.approve(id),@@ -858,7 +1207,7 @@ export function Inbox() {payload,});if (!("id" in result)) {- throw new Error("Retry was skipped because the agent is not currently invokable.");+ throw new Error(result.message ?? "Retry was skipped.");}return { newRun: result, originalRun: run };},@@ -881,6 +1230,7 @@ export function Inbox() {});const [fadingOutIssues, setFadingOutIssues] = useState<Set<string>>(new Set());+ const [showMarkAllReadConfirm, setShowMarkAllReadConfirm] = useState(false);const [archivingIssueIds, setArchivingIssueIds] = useState<Set<string>>(new Set());const [fadingNonIssueItems, setFadingNonIssueItems] = useState<Set<string>>(new Set());const [archivingNonIssueIds, setArchivingNonIssueIds] = useState<Set<string>>(new Set());@@ -1017,12 +1367,12 @@ export function Inbox() {// Keep selection valid when the list shape changes, but do not auto-select on initial load.useEffect(() => {- setSelectedIndex((prev) => resolveInboxSelectionIndex(prev, workItemsToRender.length));- }, [workItemsToRender.length]);+ setSelectedIndex((prev) => resolveInboxSelectionIndex(prev, filteredWorkItems.length));+ }, [filteredWorkItems.length]);// Use refs for keyboard handler to avoid stale closuresconst kbStateRef = useRef({- workItems: workItemsToRender,+ workItems: filteredWorkItems,selectedIndex,canArchive: canArchiveFromTab,archivingIssueIds,@@ -1031,7 +1381,7 @@ export function Inbox() {readItems,});kbStateRef.current = {- workItems: workItemsToRender,+ workItems: filteredWorkItems,selectedIndex,canArchive: canArchiveFromTab,archivingIssueIds,@@ -1061,6 +1411,8 @@ export function Inbox() {// Keyboard shortcuts (mail-client style) — single stable listener using refsuseEffect(() => {+ if (!keyboardShortcutsEnabled) return;+const handleKeyDown = (e: KeyboardEvent) => {if (e.defaultPrevented) return;@@ -1068,9 +1420,8 @@ export function Inbox() {const target = e.target;if (!(target instanceof HTMLElement) ||- target.closest("input, textarea, select, [contenteditable='true'], [role='textbox'], [role='combobox']") ||- target.isContentEditable ||- document.querySelector("[role='dialog'], [aria-modal='true']") ||+ isKeyboardShortcutTextInputTarget(target) ||+ hasBlockingShortcutDialog(document) ||e.metaKey ||e.ctrlKey ||e.altKey@@ -1148,7 +1499,8 @@ export function Inbox() {const item = st.workItems[st.selectedIndex];if (item.kind === "issue") {const pathId = item.issue.identifier ?? item.issue.id;- act.navigate(createIssueDetailPath(pathId, issueLinkState), { state: issueLinkState });+ const detailState = armIssueDetailInboxQuickArchive(issueLinkState);+ act.navigate(createIssueDetailPath(pathId, detailState), { state: detailState });} else if (item.kind === "approval") {act.navigate(`/approvals/${item.approval.id}`);} else if (item.kind === "failed_run") {@@ -1162,7 +1514,7 @@ export function Inbox() {};window.addEventListener("keydown", handleKeyDown);return () => window.removeEventListener("keydown", handleKeyDown);- }, [getWorkItemKey, issueLinkState]);+ }, [getWorkItemKey, issueLinkState, keyboardShortcutsEnabled]);// Scroll selected item into viewuseEffect(() => {@@ -1184,7 +1536,7 @@ export function Inbox() {dashboard.costs.monthUtilizationPercent >= 80 &&!dismissed.has("alert:budget");const hasAlerts = showAggregateAgentError || showBudgetAlert;- const showWorkItemsSection = workItemsToRender.length > 0;+ const showWorkItemsSection = filteredWorkItems.length > 0;const showAlertsSection = shouldShowInboxSection({tab,hasItems: hasAlerts,@@ -1214,7 +1566,6 @@ export function Inbox() {const unreadIssueIds = markAllReadIssues.map((issue) => issue.id);const canMarkAllRead = unreadIssueIds.length > 0;-return (<div className="space-y-6"><div className="flex items-center justify-between gap-2">@@ -1236,17 +1587,104 @@ export function Inbox() {</Tabs><div className="flex items-center gap-2">+ <div className="relative">+ <Search className="pointer-events-none absolute left-2.5 top-1/2 h-3.5 w-3.5 -translate-y-1/2 text-muted-foreground" />+ <Input+ type="search"+ placeholder="Search inbox…"+ value={searchQuery}+ onChange={(e) => setSearchQuery(e.target.value)}+ className="h-8 w-[180px] pl-8 text-xs sm:w-[220px]"+ />+ </div>+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button+ type="button"+ variant="ghost"+ size="sm"+ className="h-8 shrink-0 px-2 text-xs text-muted-foreground hover:text-foreground"+ >+ <Columns3 className="mr-1 h-3.5 w-3.5" />+ Show / hide columns+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end" className="w-[300px] rounded-xl border-border/70 p-1.5 shadow-xl shadow-black/10">+ <DropdownMenuLabel className="px-2 pb-1 pt-1.5">+ <div className="space-y-1">+ <div className="text-[10px] font-semibold uppercase tracking-[0.22em] text-muted-foreground">+ Desktop issue rows+ </div>+ <div className="text-sm font-medium text-foreground">+ Choose which inbox columns stay visible+ </div>+ </div>+ </DropdownMenuLabel>+ <DropdownMenuSeparator />+ {availableIssueColumns.map((column) => (+ <DropdownMenuCheckboxItem+ key={column}+ checked={visibleIssueColumnSet.has(column)}+ onSelect={(event) => event.preventDefault()}+ onCheckedChange={(checked) => toggleIssueColumn(column, checked === true)}+ className="items-start rounded-lg px-3 py-2.5 pl-8"+ >+ <span className="flex flex-col gap-0.5">+ <span className="text-sm font-medium text-foreground">+ {inboxIssueColumnLabels[column]}+ </span>+ <span className="text-xs leading-relaxed text-muted-foreground">+ {inboxIssueColumnDescriptions[column]}+ </span>+ </span>+ </DropdownMenuCheckboxItem>+ ))}+ <DropdownMenuSeparator />+ <DropdownMenuItem+ onSelect={() => setIssueColumns(DEFAULT_INBOX_ISSUE_COLUMNS)}+ className="rounded-lg px-3 py-2 text-sm"+ >+ Reset defaults+ <span className="ml-auto text-xs text-muted-foreground">status, id, updated</span>+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>{canMarkAllRead && (- <Button- type="button"- variant="outline"- size="sm"- className="h-8 shrink-0"- onClick={() => markAllReadMutation.mutate(unreadIssueIds)}- disabled={markAllReadMutation.isPending}- >- {markAllReadMutation.isPending ? "Marking…" : "Mark all as read"}- </Button>+ <>+ <Button+ type="button"+ variant="outline"+ size="sm"+ className="h-8 shrink-0"+ onClick={() => setShowMarkAllReadConfirm(true)}+ disabled={markAllReadMutation.isPending}+ >+ {markAllReadMutation.isPending ? "Marking…" : "Mark all as read"}+ </Button>+ <Dialog open={showMarkAllReadConfirm} onOpenChange={setShowMarkAllReadConfirm}>+ <DialogContent className="sm:max-w-md">+ <DialogHeader>+ <DialogTitle>Mark all as read?</DialogTitle>+ <DialogDescription>+ This will mark {unreadIssueIds.length} unread {unreadIssueIds.length === 1 ? "item" : "items"} as read.+ </DialogDescription>+ </DialogHeader>+ <DialogFooter>+ <Button variant="outline" onClick={() => setShowMarkAllReadConfirm(false)}>+ Cancel+ </Button>+ <Button+ onClick={() => {+ setShowMarkAllReadConfirm(false);+ markAllReadMutation.mutate(unreadIssueIds);+ }}+ >+ Mark all as read+ </Button>+ </DialogFooter>+ </DialogContent>+ </Dialog>+ </>)}</div></div>@@ -1297,9 +1735,11 @@ export function Inbox() {{allLoaded && visibleSections.length === 0 && (<EmptyState- icon={InboxIcon}+ icon={searchQuery.trim() ? Search : InboxIcon}message={- tab === "mine"+ searchQuery.trim()+ ? "No inbox items match your search."+ : tab === "mine"? "Inbox zero.": tab === "unread"? "No new inbox items."@@ -1315,7 +1755,7 @@ export function Inbox() {{showSeparatorBefore("work_items") && <Separator />}<div><div ref={listRef} className="overflow-hidden rounded-xl border border-border bg-card">- {workItemsToRender.flatMap((item, index) => {+ {filteredWorkItems.flatMap((item, index) => {const wrapItem = (key: string, isSelected: boolean, child: ReactNode) => (<divkey={`sel-${key}`}@@ -1331,14 +1771,14 @@ export function Inbox() {index > 0 &&item.timestamp > 0 &&item.timestamp < todayCutoff &&- workItemsToRender[index - 1].timestamp >= todayCutoff;+ filteredWorkItems[index - 1].timestamp >= todayCutoff;const elements: ReactNode[] = [];if (showTodayDivider) {elements.push(<div key="today-divider" className="flex items-center gap-3 px-4 my-2">- <div className="flex-1 border-t border-border" />- <span className="shrink-0 text-[11px] font-medium uppercase tracking-wider text-muted-foreground">- Earlier+ <div className="flex-1 border-t border-zinc-600" />+ <span className="shrink-0 text-[11px] font-medium uppercase tracking-wider text-zinc-500">+ Today</span></div>,);@@ -1458,6 +1898,7 @@ export function Inbox() {const isUnread = issue.isUnreadForMe && !fadingOutIssues.has(issue.id);const isFading = fadingOutIssues.has(issue.id);const isArchiving = archivingIssueIds.has(issue.id);+ const issueProject = issue.projectId ? projectById.get(issue.projectId) ?? null : null;const row = (<IssueRowkey={`issue:${issue.id}`}@@ -1472,15 +1913,12 @@ export function Inbox() {desktopMetaLeading={<InboxIssueMetaLeadingissue={issue}- selected={isSelected}isLive={liveIssueIds.has(issue.id)}+ showStatus={visibleIssueColumnSet.has("status") && availableIssueColumnSet.has("status")}+ showIdentifier={visibleIssueColumnSet.has("id") && availableIssueColumnSet.has("id")}/>}- mobileMeta={- issue.lastExternalCommentAt- ? `commented ${timeAgo(issue.lastExternalCommentAt)}`- : `updated ${timeAgo(issue.updatedAt)}`- }+ mobileMeta={issueActivityText(issue).toLowerCase()}unreadState={isUnread ? "visible" : isFading ? "fading" : "hidden"}@@ -1491,10 +1929,22 @@ export function Inbox() {: undefined}archiveDisabled={isArchiving || archiveIssueMutation.isPending}- trailingMeta={- issue.lastExternalCommentAt- ? `commented ${timeAgo(issue.lastExternalCommentAt)}`- : `updated ${timeAgo(issue.updatedAt)}`+ desktopTrailing={+ visibleTrailingIssueColumns.length > 0 ? (+ <InboxIssueTrailingColumns+ issue={issue}+ columns={visibleTrailingIssueColumns}+ projectName={issueProject?.name ?? null}+ projectColor={issueProject?.color ?? null}+ workspaceName={resolveIssueWorkspaceName(issue, {+ executionWorkspaceById,+ projectWorkspaceById,+ defaultProjectWorkspaceIdByProjectId,+ })}+ assigneeName={agentName(issue.assigneeAgentId)}+ currentUserId={currentUserId}+ />+ ) : undefined}/>);diff --git a/ui/src/pages/InstanceGeneralSettings.tsx b/ui/src/pages/InstanceGeneralSettings.tsxindex 4ab15ac466..4b5e6b9c36 100644--- a/ui/src/pages/InstanceGeneralSettings.tsx+++ b/ui/src/pages/InstanceGeneralSettings.tsx@@ -1,5 +1,6 @@import { useEffect, useState } from "react";import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";+import type { PatchInstanceGeneralSettings } from "@paperclipai/shared";import { SlidersHorizontal } from "lucide-react";import { instanceSettingsApi } from "@/api/instanceSettings";import { useBreadcrumbs } from "../context/BreadcrumbContext";@@ -51,6 +52,7 @@ export function InstanceGeneralSettings() {}const censorUsernameInLogs = generalQuery.data?.censorUsernameInLogs === true;+ const keyboardShortcuts = generalQuery.data?.keyboardShortcuts === true;const feedbackDataSharingPreference = generalQuery.data?.feedbackDataSharingPreference ?? "prompt";return (@@ -106,6 +108,36 @@ export function InstanceGeneralSettings() {</div></section>+ <section className="rounded-xl border border-border bg-card p-5">+ <div className="flex items-start justify-between gap-4">+ <div className="space-y-1.5">+ <h2 className="text-sm font-semibold">Keyboard shortcuts</h2>+ <p className="max-w-2xl text-sm text-muted-foreground">+ Enable app keyboard shortcuts, including inbox navigation and global shortcuts like creating issues or+ toggling panels. This is off by default.+ </p>+ </div>+ <button+ type="button"+ data-slot="toggle"+ aria-label="Toggle keyboard shortcuts"+ disabled={updateGeneralMutation.isPending}+ className={cn(+ "relative inline-flex h-5 w-9 items-center rounded-full transition-colors disabled:cursor-not-allowed disabled:opacity-60",+ keyboardShortcuts ? "bg-green-600" : "bg-muted",+ )}+ onClick={() => updateGeneralMutation.mutate({ keyboardShortcuts: !keyboardShortcuts })}+ >+ <span+ className={cn(+ "inline-block h-3.5 w-3.5 rounded-full bg-white transition-transform",+ keyboardShortcuts ? "translate-x-4.5" : "translate-x-0.5",+ )}+ />+ </button>+ </div>+ </section>+<section className="rounded-xl border border-border bg-card p-5"><div className="space-y-4"><div className="space-y-1.5">