Skip to content

The open-source app everyone uses to manage agents at work

Merge public-gh/master into pap-1239-ui-ux

dottab578bf1f51a4
diff --cc ui/src/pages/Inbox.tsx
index 8926dd0e7d,6a6e404b08..b92f858848
--- a/ui/src/pages/Inbox.tsx
+++ b/ui/src/pages/Inbox.tsx
@@@ -84,11 -86,10 +84,12 @@@ import
getInboxKeyboardSelectionIndex,
getLatestFailedRunsByAgent,
getRecentTouchedIssues,
+ isInboxEntityDismissed,
isMineInboxTab,
loadInboxIssueColumns,
+ loadInboxNesting,
normalizeInboxIssueColumns,
+ resolveInboxNestingEnabled,
resolveIssueWorkspaceName,
resolveInboxSelectionIndex,
saveInboxIssueColumns,
@@@ -100,10 -100,8 +101,10 @@@
type InboxTab,
type InboxWorkItem,
} from "../lib/inbox";
- import { useDismissedInboxItems, useReadInboxItems } from "../hooks/useInboxBadge";
+ import { useDismissedInboxAlerts, useInboxDismissals, useReadInboxItems } from "../hooks/useInboxBadge";
+export { InboxIssueMetaLeading, InboxIssueTrailingColumns } from "../components/IssueColumns";
+
type InboxCategoryFilter =
| "everything"
| "issues_i_touched"
@@@ -1414,9 -1599,9 +1433,9 @@@ export function Inbox()
!!dashboard &&
dashboard.costs.monthBudgetCents > 0 &&
dashboard.costs.monthUtilizationPercent >= 80 &&
- !dismissed.has("alert:budget");
+ !dismissedAlerts.has("alert:budget");
const hasAlerts = showAggregateAgentError || showBudgetAlert;
- const showWorkItemsSection = filteredWorkItems.length > 0;
+ const showWorkItemsSection = nestedWorkItems.length > 0;
const showAlertsSection = shouldShowInboxSection({
tab,
hasItems: hasAlerts,
diff --cc ui/src/pages/IssueDetail.tsx
index 73407936f0,554d7d4015..21e612ded1
--- a/ui/src/pages/IssueDetail.tsx
+++ b/ui/src/pages/IssueDetail.tsx
@@@ -66,9 -56,9 +66,10 @@@ import { Separator } from "@/components
import { Popover, PopoverTrigger, PopoverContent } from "@/components/ui/popover";
import { Button } from "@/components/ui/button";
import { Sheet, SheetContent, SheetHeader, SheetTitle } from "@/components/ui/sheet";
+import { Skeleton } from "@/components/ui/skeleton";
import { ScrollArea } from "@/components/ui/scroll-area";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+ import { formatIssueActivityAction } from "@/lib/activity-format";
import {
Activity as ActivityIcon,
Check,
@@@ -109,44 -100,7 +111,12 @@@ const ACTIVE_ISSUE_RUN_POLL_INTERVAL_M
const IDLE_ISSUE_RUN_POLL_INTERVAL_MS = 30000;
const ACTIVE_ISSUE_TIMELINE_POLL_INTERVAL_MS = 5000;
const IDLE_ISSUE_TIMELINE_POLL_INTERVAL_MS = 30000;
-
- const ACTION_LABELS: Record<string, string> = {
- "issue.created": "created the issue",
- "issue.updated": "updated the issue",
- "issue.checked_out": "checked out the issue",
- "issue.released": "released the issue",
- "issue.comment_added": "added a comment",
- "issue.feedback_vote_saved": "saved feedback on an AI output",
- "issue.attachment_added": "added an attachment",
- "issue.attachment_removed": "removed an attachment",
- "issue.document_created": "created a document",
- "issue.document_updated": "updated a document",
- "issue.document_deleted": "deleted a document",
- "issue.deleted": "deleted the issue",
- "agent.created": "created an agent",
- "agent.updated": "updated the agent",
- "agent.paused": "paused the agent",
- "agent.resumed": "resumed the agent",
- "agent.terminated": "terminated the agent",
- "heartbeat.invoked": "invoked a heartbeat",
- "heartbeat.cancelled": "cancelled a heartbeat",
- "approval.created": "requested approval",
- "approval.approved": "approved",
- "approval.rejected": "rejected",
- };
-
- const FEEDBACK_TERMS_URL = import.meta.env.VITE_FEEDBACK_TERMS_URL?.trim() || "https://paperclip.ing/tos";
+const ISSUE_COMMENT_PAGE_SIZE = 50;
+
+function keepPreviousData<T>(previousData: T | undefined) {
+ return previousData;
+}
- function humanizeValue(value: unknown): string {
- if (typeof value !== "string") return String(value ?? "none");
- return value.replace(/_/g, " ");
- }
-
function asRecord(value: unknown): Record<string, unknown> | null {
if (typeof value !== "object" || value === null || Array.isArray(value)) return null;
return value as Record<string, unknown>;
@@@ -2222,20 -1785,20 +2148,20 @@@ export function IssueDetail()
)}
</div>
)}
- </div>
- )}
- {!activity || activity.length === 0 ? (
- <p className="text-xs text-muted-foreground">No activity yet.</p>
- ) : (
- <div className="space-y-1.5">
- {activity.slice(0, 20).map((evt) => (
- <div key={evt.id} className="flex items-center gap-1.5 text-xs text-muted-foreground">
- <ActorIdentity evt={evt} agentMap={agentMap} />
- <span>{formatIssueActivityAction(evt.action, evt.details, { agentMap, currentUserId })}</span>
- <span className="ml-auto shrink-0">{relativeTime(evt.createdAt)}</span>
+ {!activity || activity.length === 0 ? (
+ <p className="text-xs text-muted-foreground">No activity yet.</p>
+ ) : (
+ <div className="space-y-1.5">
+ {activity.slice(0, 20).map((evt) => (
+ <div key={evt.id} className="flex items-center gap-1.5 text-xs text-muted-foreground">
+ <ActorIdentity evt={evt} agentMap={agentMap} />
- <span>{formatAction(evt.action, evt.details)}</span>
++ <span>{formatIssueActivityAction(evt.action, evt.details, { agentMap, currentUserId })}</span>
+ <span className="ml-auto shrink-0">{relativeTime(evt.createdAt)}</span>
+ </div>
+ ))}
</div>
- ))}
- </div>
+ )}
+ </>
)}
</TabsContent>