Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1600,6 +1600,7 @@ export default function Sidebar() {
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
const confirmThreadArchive = useClientSettings((s) => s.confirmThreadArchive);
const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
const timestampFormat = useClientSettings((s) => s.timestampFormat);
const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
Expand All@@ -1611,6 +1612,7 @@ export default function Sidebar() {
pinThread,
unpinThread,
reorderPinnedThread,
archiveThread,
deleteThread,
} = useThreadActions();
const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
Expand DownExpand Up@@ -2962,6 +2964,8 @@ export default function Sidebar() {
isSnoozed,
canSnoozeNow: canSnooze(thread, { now: new Date().toISOString() }),
isRegeneratingTitle,
isRunning:
thread.session?.status === "running" && thread.session.activeTurnId != null,
supports: {
settlement: supportsSettlement,
snooze: supportsSnooze,
Expand DownExpand Up@@ -3065,6 +3069,34 @@ export default function Sidebar() {
case "copy-thread-id":
copyThreadIdToClipboard(thread.id, { threadId: thread.id });
return;
case "archive": {
if (confirmThreadArchive) {
const confirmed = await settlePromise(() =>
api.dialogs.confirm(`Archive thread "${thread.title}"?`),
);
if (confirmed._tag === "Failure" || !confirmed.value) return;
}
let didArchive = false;
const result = await archiveThread(threadRef, {
onArchived: () => {
didArchive = true;
},
});
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: didArchive
? "Thread archived, but navigation failed"
: "Failed to archive thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
return;
}
return;
}
case "delete": {
if (confirmThreadDelete) {
const confirmed = await settlePromise(() =>
Expand DownExpand Up@@ -3098,12 +3130,14 @@ export default function Sidebar() {
})();
},
[
archiveThread,
attemptPin,
attemptSettle,
attemptSnooze,
attemptUnpin,
attemptUnsettle,
attemptUnsnooze,
confirmThreadArchive,
confirmThreadDelete,
copyBranchToClipboard,
copyPathToClipboard,
Expand Down
27 changes: 26 additions & 1 deletion apps/web/src/components/threadActionMenu.logic.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ const baseState: ThreadActionMenuState = {
isSnoozed: false,
canSnoozeNow: true,
isRegeneratingTitle: false,
isRunning: false,
supports: { settlement: true, snooze: true, pinning: true, titleRegeneration: true },
snoozePresets: [
{ id: "hour", label: "In 1 hour", whenLabel: "3:00 PM", snoozedUntil: "2026-08-07T15:00:00Z" },
Expand All@@ -26,7 +27,7 @@ describe("buildThreadActionMenuItems", () => {
...baseState,
supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
}),
).toEqual(["rename", "mark-unread", "copy-path", "copy-thread-id", "delete"]);
).toEqual(["rename", "mark-unread", "copy-path", "copy-thread-id", "archive", "delete"]);
});

it("includes branch items only for threads with a branch", () => {
Expand DownExpand Up@@ -63,4 +64,28 @@ describe("buildThreadActionMenuItems", () => {
const items = buildThreadActionMenuItems({ ...baseState, branch: "main" });
expect(items.at(-1)).toMatchObject({ id: "delete", destructive: true });
});

it("offers archive as a non-destructive action right before delete", () => {
const items = buildThreadActionMenuItems(baseState);
const archiveItem = items.at(-2);
expect(archiveItem?.id).toBe("archive");
expect(archiveItem?.destructive).toBeFalsy();
expect(items.at(-1)?.id).toBe("delete");
});

it("keeps archive available even when the environment lacks every other capability", () => {
expect(
ids({
...baseState,
supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
}),
).toContain("archive");
});

it("disables archive while the thread is running", () => {
const archiveItem = buildThreadActionMenuItems({ ...baseState, isRunning: true }).find(
(item) => item.id === "archive",
);
expect(archiveItem?.disabled).toBe(true);
});
});
9 changes: 9 additions & 0 deletions apps/web/src/components/threadActionMenu.logic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ export type ThreadActionMenuId =
| "copy-path"
| "copy-branch"
| "copy-thread-id"
| "archive"
| "delete";

export interface ThreadActionMenuState {
Expand All@@ -30,6 +31,8 @@ export interface ThreadActionMenuState {
readonly isSnoozed: boolean;
readonly canSnoozeNow: boolean;
readonly isRegeneratingTitle: boolean;
/** Archive rejects a thread with an active turn, so disable it here rather than let the action fail. */
readonly isRunning: boolean;
readonly supports: {
readonly settlement: boolean;
readonly snooze: boolean;
Expand DownExpand Up@@ -102,6 +105,12 @@ export function buildThreadActionMenuItems(
{ id: "copy-path", label: "Copy path", icon: "copy" },
...(state.branch ? [{ id: "copy-branch" as const, label: "Copy branch", icon: "copy" }] : []),
{ id: "copy-thread-id", label: "Copy thread ID", icon: "copy" },
// Archive removes the thread from the sidebar while keeping its
// conversation under Settings > Archived threads — distinct from Settle
// (stays visible in the Settled shelf) and Delete (clears history for
// good), so it sits beside Delete without borrowing its destructive
// styling.
{ id: "archive", label: "Archive thread", disabled: state.isRunning },
{ id: "delete", label: "Delete", destructive: true, icon: "trash" },
];
}
26 changes: 26 additions & 0 deletions apps/web/src/hooks/useThreadActionMenu.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ export function useThreadActionMenu(input: {
unsnoozeThread,
pinThread,
unpinThread,
archiveThread,
deleteThread,
} = useThreadActions();
const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
Expand All@@ -81,6 +82,7 @@ export function useThreadActionMenu(input: {
const markThreadUnread = useUiStateStore((s) => s.markThreadUnread);
const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
const confirmThreadArchive = useClientSettings((s) => s.confirmThreadArchive);
const timestampFormat = useClientSettings((s) => s.timestampFormat);
const { copyToClipboard: copyPathToClipboard } = useCopyToClipboard<{ path: string }>({
onCopy: ({ path }) => {
Expand DownExpand Up@@ -137,6 +139,7 @@ export function useThreadActionMenu(input: {
isSnoozed: supports.snooze && effectiveSnoozed(thread, { now: now.toISOString() }),
canSnoozeNow: canSnooze(thread, { now: now.toISOString() }),
isRegeneratingTitle,
isRunning: thread.session?.status === "running" && thread.session.activeTurnId != null,
supports,
snoozePresets,
});
Expand DownExpand Up@@ -251,6 +254,27 @@ export function useThreadActionMenu(input: {
case "copy-thread-id":
copyThreadIdToClipboard(thread.id, { threadId: thread.id });
return;
case "archive": {
if (confirmThreadArchive) {
const confirmed = await settlePromise(() =>
api.dialogs.confirm(`Archive thread "${thread.title}"?`),
);
if (confirmed._tag === "Failure" || !confirmed.value) return;
}
let didArchive = false;
const result = await archiveThread(threadRef, {
onArchived: () => {
didArchive = true;
},
});
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
failureToast(
didArchive ? "Thread archived, but navigation failed" : "Failed to archive thread",
squashAtomCommandFailure(result),
);
}
return;
}
case "delete": {
if (confirmThreadDelete) {
const confirmed = await settlePromise(() =>
Expand DownExpand Up@@ -283,8 +307,10 @@ export function useThreadActionMenu(input: {
})();
},
[
archiveThread,
autoSettleAfterDays,
changeRequestState,
confirmThreadArchive,
confirmThreadDelete,
copyBranchToClipboard,
copyPathToClipboard,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1600,6 +1600,7 @@ export default function Sidebar() {
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
const confirmThreadArchive = useClientSettings((s) => s.confirmThreadArchive);
const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
const timestampFormat = useClientSettings((s) => s.timestampFormat);
const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
Expand All@@ -1611,6 +1612,7 @@ export default function Sidebar() {
pinThread,
unpinThread,
reorderPinnedThread,
archiveThread,
deleteThread,
} = useThreadActions();
const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
Expand DownExpand Up@@ -2962,6 +2964,8 @@ export default function Sidebar() {
isSnoozed,
canSnoozeNow: canSnooze(thread, { now: new Date().toISOString() }),
isRegeneratingTitle,
isRunning:
thread.session?.status === "running" && thread.session.activeTurnId != null,
supports: {
settlement: supportsSettlement,
snooze: supportsSnooze,
Expand DownExpand Up@@ -3065,6 +3069,34 @@ export default function Sidebar() {
case "copy-thread-id":
copyThreadIdToClipboard(thread.id, { threadId: thread.id });
return;
case "archive": {
if (confirmThreadArchive) {
const confirmed = await settlePromise(() =>
api.dialogs.confirm(`Archive thread "${thread.title}"?`),
);
if (confirmed._tag === "Failure" || !confirmed.value) return;
}
let didArchive = false;
const result = await archiveThread(threadRef, {
onArchived: () => {
didArchive = true;
},
});
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: didArchive
? "Thread archived, but navigation failed"
: "Failed to archive thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
return;
}
return;
}
case "delete": {
if (confirmThreadDelete) {
const confirmed = await settlePromise(() =>
Expand DownExpand Up@@ -3098,12 +3130,14 @@ export default function Sidebar() {
})();
},
[
archiveThread,
attemptPin,
attemptSettle,
attemptSnooze,
attemptUnpin,
attemptUnsettle,
attemptUnsnooze,
confirmThreadArchive,
confirmThreadDelete,
copyBranchToClipboard,
copyPathToClipboard,
Expand Down
27 changes: 26 additions & 1 deletion apps/web/src/components/threadActionMenu.logic.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ const baseState: ThreadActionMenuState = {
isSnoozed: false,
canSnoozeNow: true,
isRegeneratingTitle: false,
isRunning: false,
supports: { settlement: true, snooze: true, pinning: true, titleRegeneration: true },
snoozePresets: [
{ id: "hour", label: "In 1 hour", whenLabel: "3:00 PM", snoozedUntil: "2026-08-07T15:00:00Z" },
Expand All@@ -26,7 +27,7 @@ describe("buildThreadActionMenuItems", () => {
...baseState,
supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
}),
).toEqual(["rename", "mark-unread", "copy-path", "copy-thread-id", "delete"]);
).toEqual(["rename", "mark-unread", "copy-path", "copy-thread-id", "archive", "delete"]);
});

it("includes branch items only for threads with a branch", () => {
Expand DownExpand Up@@ -63,4 +64,28 @@ describe("buildThreadActionMenuItems", () => {
const items = buildThreadActionMenuItems({ ...baseState, branch: "main" });
expect(items.at(-1)).toMatchObject({ id: "delete", destructive: true });
});

it("offers archive as a non-destructive action right before delete", () => {
const items = buildThreadActionMenuItems(baseState);
const archiveItem = items.at(-2);
expect(archiveItem?.id).toBe("archive");
expect(archiveItem?.destructive).toBeFalsy();
expect(items.at(-1)?.id).toBe("delete");
});

it("keeps archive available even when the environment lacks every other capability", () => {
expect(
ids({
...baseState,
supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
}),
).toContain("archive");
});

it("disables archive while the thread is running", () => {
const archiveItem = buildThreadActionMenuItems({ ...baseState, isRunning: true }).find(
(item) => item.id === "archive",
);
expect(archiveItem?.disabled).toBe(true);
});
});
9 changes: 9 additions & 0 deletions apps/web/src/components/threadActionMenu.logic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ export type ThreadActionMenuId =
| "copy-path"
| "copy-branch"
| "copy-thread-id"
| "archive"
| "delete";

export interface ThreadActionMenuState {
Expand All@@ -30,6 +31,8 @@ export interface ThreadActionMenuState {
readonly isSnoozed: boolean;
readonly canSnoozeNow: boolean;
readonly isRegeneratingTitle: boolean;
/** Archive rejects a thread with an active turn, so disable it here rather than let the action fail. */
readonly isRunning: boolean;
readonly supports: {
readonly settlement: boolean;
readonly snooze: boolean;
Expand DownExpand Up@@ -102,6 +105,12 @@ export function buildThreadActionMenuItems(
{ id: "copy-path", label: "Copy path", icon: "copy" },
...(state.branch ? [{ id: "copy-branch" as const, label: "Copy branch", icon: "copy" }] : []),
{ id: "copy-thread-id", label: "Copy thread ID", icon: "copy" },
// Archive removes the thread from the sidebar while keeping its
// conversation under Settings > Archived threads — distinct from Settle
// (stays visible in the Settled shelf) and Delete (clears history for
// good), so it sits beside Delete without borrowing its destructive
// styling.
{ id: "archive", label: "Archive thread", disabled: state.isRunning },
{ id: "delete", label: "Delete", destructive: true, icon: "trash" },
];
}
26 changes: 26 additions & 0 deletions apps/web/src/hooks/useThreadActionMenu.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ export function useThreadActionMenu(input: {
unsnoozeThread,
pinThread,
unpinThread,
archiveThread,
deleteThread,
} = useThreadActions();
const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
Expand All@@ -81,6 +82,7 @@ export function useThreadActionMenu(input: {
const markThreadUnread = useUiStateStore((s) => s.markThreadUnread);
const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
const confirmThreadArchive = useClientSettings((s) => s.confirmThreadArchive);
const timestampFormat = useClientSettings((s) => s.timestampFormat);
const { copyToClipboard: copyPathToClipboard } = useCopyToClipboard<{ path: string }>({
onCopy: ({ path }) => {
Expand DownExpand Up@@ -137,6 +139,7 @@ export function useThreadActionMenu(input: {
isSnoozed: supports.snooze && effectiveSnoozed(thread, { now: now.toISOString() }),
canSnoozeNow: canSnooze(thread, { now: now.toISOString() }),
isRegeneratingTitle,
isRunning: thread.session?.status === "running" && thread.session.activeTurnId != null,
supports,
snoozePresets,
});
Expand DownExpand Up@@ -251,6 +254,27 @@ export function useThreadActionMenu(input: {
case "copy-thread-id":
copyThreadIdToClipboard(thread.id, { threadId: thread.id });
return;
case "archive": {
if (confirmThreadArchive) {
const confirmed = await settlePromise(() =>
api.dialogs.confirm(`Archive thread "${thread.title}"?`),
);
if (confirmed._tag === "Failure" || !confirmed.value) return;
}
let didArchive = false;
const result = await archiveThread(threadRef, {
onArchived: () => {
didArchive = true;
},
});
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
failureToast(
didArchive ? "Thread archived, but navigation failed" : "Failed to archive thread",
squashAtomCommandFailure(result),
);
}
return;
}
case "delete": {
if (confirmThreadDelete) {
const confirmed = await settlePromise(() =>
Expand DownExpand Up@@ -283,8 +307,10 @@ export function useThreadActionMenu(input: {
})();
},
[
archiveThread,
autoSettleAfterDays,
changeRequestState,
confirmThreadArchive,
confirmThreadDelete,
copyBranchToClipboard,
copyPathToClipboard,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1600,6 +1600,7 @@ export default function Sidebar() {
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
const confirmThreadArchive = useClientSettings((s) => s.confirmThreadArchive);
const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
const timestampFormat = useClientSettings((s) => s.timestampFormat);
const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
Expand All@@ -1611,6 +1612,7 @@ export default function Sidebar() {
pinThread,
unpinThread,
reorderPinnedThread,
archiveThread,
deleteThread,
} = useThreadActions();
const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
Expand DownExpand Up@@ -2962,6 +2964,8 @@ export default function Sidebar() {
isSnoozed,
canSnoozeNow: canSnooze(thread, { now: new Date().toISOString() }),
isRegeneratingTitle,
isRunning:
thread.session?.status === "running" && thread.session.activeTurnId != null,
supports: {
settlement: supportsSettlement,
snooze: supportsSnooze,
Expand DownExpand Up@@ -3065,6 +3069,34 @@ export default function Sidebar() {
case "copy-thread-id":
copyThreadIdToClipboard(thread.id, { threadId: thread.id });
return;
case "archive": {
if (confirmThreadArchive) {
const confirmed = await settlePromise(() =>
api.dialogs.confirm(`Archive thread "${thread.title}"?`),
);
if (confirmed._tag === "Failure" || !confirmed.value) return;
}
let didArchive = false;
const result = await archiveThread(threadRef, {
onArchived: () => {
didArchive = true;
},
});
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: didArchive
? "Thread archived, but navigation failed"
: "Failed to archive thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
return;
}
return;
}
case "delete": {
if (confirmThreadDelete) {
const confirmed = await settlePromise(() =>
Expand DownExpand Up@@ -3098,12 +3130,14 @@ export default function Sidebar() {
})();
},
[
archiveThread,
attemptPin,
attemptSettle,
attemptSnooze,
attemptUnpin,
attemptUnsettle,
attemptUnsnooze,
confirmThreadArchive,
confirmThreadDelete,
copyBranchToClipboard,
copyPathToClipboard,
Expand Down
27 changes: 26 additions & 1 deletion apps/web/src/components/threadActionMenu.logic.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ const baseState: ThreadActionMenuState = {
isSnoozed: false,
canSnoozeNow: true,
isRegeneratingTitle: false,
isRunning: false,
supports: { settlement: true, snooze: true, pinning: true, titleRegeneration: true },
snoozePresets: [
{ id: "hour", label: "In 1 hour", whenLabel: "3:00 PM", snoozedUntil: "2026-08-07T15:00:00Z" },
Expand All@@ -26,7 +27,7 @@ describe("buildThreadActionMenuItems", () => {
...baseState,
supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
}),
).toEqual(["rename", "mark-unread", "copy-path", "copy-thread-id", "delete"]);
).toEqual(["rename", "mark-unread", "copy-path", "copy-thread-id", "archive", "delete"]);
});

it("includes branch items only for threads with a branch", () => {
Expand DownExpand Up@@ -63,4 +64,28 @@ describe("buildThreadActionMenuItems", () => {
const items = buildThreadActionMenuItems({ ...baseState, branch: "main" });
expect(items.at(-1)).toMatchObject({ id: "delete", destructive: true });
});

it("offers archive as a non-destructive action right before delete", () => {
const items = buildThreadActionMenuItems(baseState);
const archiveItem = items.at(-2);
expect(archiveItem?.id).toBe("archive");
expect(archiveItem?.destructive).toBeFalsy();
expect(items.at(-1)?.id).toBe("delete");
});

it("keeps archive available even when the environment lacks every other capability", () => {
expect(
ids({
...baseState,
supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
}),
).toContain("archive");
});

it("disables archive while the thread is running", () => {
const archiveItem = buildThreadActionMenuItems({ ...baseState, isRunning: true }).find(
(item) => item.id === "archive",
);
expect(archiveItem?.disabled).toBe(true);
});
});
9 changes: 9 additions & 0 deletions apps/web/src/components/threadActionMenu.logic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ export type ThreadActionMenuId =
| "copy-path"
| "copy-branch"
| "copy-thread-id"
| "archive"
| "delete";

export interface ThreadActionMenuState {
Expand All@@ -30,6 +31,8 @@ export interface ThreadActionMenuState {
readonly isSnoozed: boolean;
readonly canSnoozeNow: boolean;
readonly isRegeneratingTitle: boolean;
/** Archive rejects a thread with an active turn, so disable it here rather than let the action fail. */
readonly isRunning: boolean;
readonly supports: {
readonly settlement: boolean;
readonly snooze: boolean;
Expand DownExpand Up@@ -102,6 +105,12 @@ export function buildThreadActionMenuItems(
{ id: "copy-path", label: "Copy path", icon: "copy" },
...(state.branch ? [{ id: "copy-branch" as const, label: "Copy branch", icon: "copy" }] : []),
{ id: "copy-thread-id", label: "Copy thread ID", icon: "copy" },
// Archive removes the thread from the sidebar while keeping its
// conversation under Settings > Archived threads — distinct from Settle
// (stays visible in the Settled shelf) and Delete (clears history for
// good), so it sits beside Delete without borrowing its destructive
// styling.
{ id: "archive", label: "Archive thread", disabled: state.isRunning },
{ id: "delete", label: "Delete", destructive: true, icon: "trash" },
];
}
26 changes: 26 additions & 0 deletions apps/web/src/hooks/useThreadActionMenu.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ export function useThreadActionMenu(input: {
unsnoozeThread,
pinThread,
unpinThread,
archiveThread,
deleteThread,
} = useThreadActions();
const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
Expand All@@ -81,6 +82,7 @@ export function useThreadActionMenu(input: {
const markThreadUnread = useUiStateStore((s) => s.markThreadUnread);
const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
const confirmThreadArchive = useClientSettings((s) => s.confirmThreadArchive);
const timestampFormat = useClientSettings((s) => s.timestampFormat);
const { copyToClipboard: copyPathToClipboard } = useCopyToClipboard<{ path: string }>({
onCopy: ({ path }) => {
Expand DownExpand Up@@ -137,6 +139,7 @@ export function useThreadActionMenu(input: {
isSnoozed: supports.snooze && effectiveSnoozed(thread, { now: now.toISOString() }),
canSnoozeNow: canSnooze(thread, { now: now.toISOString() }),
isRegeneratingTitle,
isRunning: thread.session?.status === "running" && thread.session.activeTurnId != null,
supports,
snoozePresets,
});
Expand DownExpand Up@@ -251,6 +254,27 @@ export function useThreadActionMenu(input: {
case "copy-thread-id":
copyThreadIdToClipboard(thread.id, { threadId: thread.id });
return;
case "archive": {
if (confirmThreadArchive) {
const confirmed = await settlePromise(() =>
api.dialogs.confirm(`Archive thread "${thread.title}"?`),
);
if (confirmed._tag === "Failure" || !confirmed.value) return;
}
let didArchive = false;
const result = await archiveThread(threadRef, {
onArchived: () => {
didArchive = true;
},
});
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
failureToast(
didArchive ? "Thread archived, but navigation failed" : "Failed to archive thread",
squashAtomCommandFailure(result),
);
}
return;
}
case "delete": {
if (confirmThreadDelete) {
const confirmed = await settlePromise(() =>
Expand DownExpand Up@@ -283,8 +307,10 @@ export function useThreadActionMenu(input: {
})();
},
[
archiveThread,
autoSettleAfterDays,
changeRequestState,
confirmThreadArchive,
confirmThreadDelete,
copyBranchToClipboard,
copyPathToClipboard,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1600,6 +1600,7 @@ export default function Sidebar() {
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
const confirmThreadArchive = useClientSettings((s) => s.confirmThreadArchive);
const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
const timestampFormat = useClientSettings((s) => s.timestampFormat);
const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
Expand All@@ -1611,6 +1612,7 @@ export default function Sidebar() {
pinThread,
unpinThread,
reorderPinnedThread,
archiveThread,
deleteThread,
} = useThreadActions();
const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
Expand DownExpand Up@@ -2962,6 +2964,8 @@ export default function Sidebar() {
isSnoozed,
canSnoozeNow: canSnooze(thread, { now: new Date().toISOString() }),
isRegeneratingTitle,
isRunning:
thread.session?.status === "running" && thread.session.activeTurnId != null,
supports: {
settlement: supportsSettlement,
snooze: supportsSnooze,
Expand DownExpand Up@@ -3065,6 +3069,34 @@ export default function Sidebar() {
case "copy-thread-id":
copyThreadIdToClipboard(thread.id, { threadId: thread.id });
return;
case "archive": {
if (confirmThreadArchive) {
const confirmed = await settlePromise(() =>
api.dialogs.confirm(`Archive thread "${thread.title}"?`),
);
if (confirmed._tag === "Failure" || !confirmed.value) return;
}
let didArchive = false;
const result = await archiveThread(threadRef, {
onArchived: () => {
didArchive = true;
},
});
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: didArchive
? "Thread archived, but navigation failed"
: "Failed to archive thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
return;
}
return;
}
case "delete": {
if (confirmThreadDelete) {
const confirmed = await settlePromise(() =>
Expand DownExpand Up@@ -3098,12 +3130,14 @@ export default function Sidebar() {
})();
},
[
archiveThread,
attemptPin,
attemptSettle,
attemptSnooze,
attemptUnpin,
attemptUnsettle,
attemptUnsnooze,
confirmThreadArchive,
confirmThreadDelete,
copyBranchToClipboard,
copyPathToClipboard,
Expand Down
27 changes: 26 additions & 1 deletion apps/web/src/components/threadActionMenu.logic.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ const baseState: ThreadActionMenuState = {
isSnoozed: false,
canSnoozeNow: true,
isRegeneratingTitle: false,
isRunning: false,
supports: { settlement: true, snooze: true, pinning: true, titleRegeneration: true },
snoozePresets: [
{ id: "hour", label: "In 1 hour", whenLabel: "3:00 PM", snoozedUntil: "2026-08-07T15:00:00Z" },
Expand All@@ -26,7 +27,7 @@ describe("buildThreadActionMenuItems", () => {
...baseState,
supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
}),
).toEqual(["rename", "mark-unread", "copy-path", "copy-thread-id", "delete"]);
).toEqual(["rename", "mark-unread", "copy-path", "copy-thread-id", "archive", "delete"]);
});

it("includes branch items only for threads with a branch", () => {
Expand DownExpand Up@@ -63,4 +64,28 @@ describe("buildThreadActionMenuItems", () => {
const items = buildThreadActionMenuItems({ ...baseState, branch: "main" });
expect(items.at(-1)).toMatchObject({ id: "delete", destructive: true });
});

it("offers archive as a non-destructive action right before delete", () => {
const items = buildThreadActionMenuItems(baseState);
const archiveItem = items.at(-2);
expect(archiveItem?.id).toBe("archive");
expect(archiveItem?.destructive).toBeFalsy();
expect(items.at(-1)?.id).toBe("delete");
});

it("keeps archive available even when the environment lacks every other capability", () => {
expect(
ids({
...baseState,
supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
}),
).toContain("archive");
});

it("disables archive while the thread is running", () => {
const archiveItem = buildThreadActionMenuItems({ ...baseState, isRunning: true }).find(
(item) => item.id === "archive",
);
expect(archiveItem?.disabled).toBe(true);
});
});
9 changes: 9 additions & 0 deletions apps/web/src/components/threadActionMenu.logic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ export type ThreadActionMenuId =
| "copy-path"
| "copy-branch"
| "copy-thread-id"
| "archive"
| "delete";

export interface ThreadActionMenuState {
Expand All@@ -30,6 +31,8 @@ export interface ThreadActionMenuState {
readonly isSnoozed: boolean;
readonly canSnoozeNow: boolean;
readonly isRegeneratingTitle: boolean;
/** Archive rejects a thread with an active turn, so disable it here rather than let the action fail. */
readonly isRunning: boolean;
readonly supports: {
readonly settlement: boolean;
readonly snooze: boolean;
Expand DownExpand Up@@ -102,6 +105,12 @@ export function buildThreadActionMenuItems(
{ id: "copy-path", label: "Copy path", icon: "copy" },
...(state.branch ? [{ id: "copy-branch" as const, label: "Copy branch", icon: "copy" }] : []),
{ id: "copy-thread-id", label: "Copy thread ID", icon: "copy" },
// Archive removes the thread from the sidebar while keeping its
// conversation under Settings > Archived threads — distinct from Settle
// (stays visible in the Settled shelf) and Delete (clears history for
// good), so it sits beside Delete without borrowing its destructive
// styling.
{ id: "archive", label: "Archive thread", disabled: state.isRunning },
{ id: "delete", label: "Delete", destructive: true, icon: "trash" },
];
}
26 changes: 26 additions & 0 deletions apps/web/src/hooks/useThreadActionMenu.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ export function useThreadActionMenu(input: {
unsnoozeThread,
pinThread,
unpinThread,
archiveThread,
deleteThread,
} = useThreadActions();
const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
Expand All@@ -81,6 +82,7 @@ export function useThreadActionMenu(input: {
const markThreadUnread = useUiStateStore((s) => s.markThreadUnread);
const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
const confirmThreadArchive = useClientSettings((s) => s.confirmThreadArchive);
const timestampFormat = useClientSettings((s) => s.timestampFormat);
const { copyToClipboard: copyPathToClipboard } = useCopyToClipboard<{ path: string }>({
onCopy: ({ path }) => {
Expand DownExpand Up@@ -137,6 +139,7 @@ export function useThreadActionMenu(input: {
isSnoozed: supports.snooze && effectiveSnoozed(thread, { now: now.toISOString() }),
canSnoozeNow: canSnooze(thread, { now: now.toISOString() }),
isRegeneratingTitle,
isRunning: thread.session?.status === "running" && thread.session.activeTurnId != null,
supports,
snoozePresets,
});
Expand DownExpand Up@@ -251,6 +254,27 @@ export function useThreadActionMenu(input: {
case "copy-thread-id":
copyThreadIdToClipboard(thread.id, { threadId: thread.id });
return;
case "archive": {
if (confirmThreadArchive) {
const confirmed = await settlePromise(() =>
api.dialogs.confirm(`Archive thread "${thread.title}"?`),
);
if (confirmed._tag === "Failure" || !confirmed.value) return;
}
let didArchive = false;
const result = await archiveThread(threadRef, {
onArchived: () => {
didArchive = true;
},
});
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
failureToast(
didArchive ? "Thread archived, but navigation failed" : "Failed to archive thread",
squashAtomCommandFailure(result),
);
}
return;
}
case "delete": {
if (confirmThreadDelete) {
const confirmed = await settlePromise(() =>
Expand DownExpand Up@@ -283,8 +307,10 @@ export function useThreadActionMenu(input: {
})();
},
[
archiveThread,
autoSettleAfterDays,
changeRequestState,
confirmThreadArchive,
confirmThreadDelete,
copyBranchToClipboard,
copyPathToClipboard,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1600,6 +1600,7 @@ export default function Sidebar() {
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
const confirmThreadArchive = useClientSettings((s) => s.confirmThreadArchive);
const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
const timestampFormat = useClientSettings((s) => s.timestampFormat);
const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
Expand All@@ -1611,6 +1612,7 @@ export default function Sidebar() {
pinThread,
unpinThread,
reorderPinnedThread,
archiveThread,
deleteThread,
} = useThreadActions();
const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
Expand DownExpand Up@@ -2962,6 +2964,8 @@ export default function Sidebar() {
isSnoozed,
canSnoozeNow: canSnooze(thread, { now: new Date().toISOString() }),
isRegeneratingTitle,
isRunning:
thread.session?.status === "running" && thread.session.activeTurnId != null,
supports: {
settlement: supportsSettlement,
snooze: supportsSnooze,
Expand DownExpand Up@@ -3065,6 +3069,34 @@ export default function Sidebar() {
case "copy-thread-id":
copyThreadIdToClipboard(thread.id, { threadId: thread.id });
return;
case "archive": {
if (confirmThreadArchive) {
const confirmed = await settlePromise(() =>
api.dialogs.confirm(`Archive thread "${thread.title}"?`),
);
if (confirmed._tag === "Failure" || !confirmed.value) return;
}
let didArchive = false;
const result = await archiveThread(threadRef, {
onArchived: () => {
didArchive = true;
},
});
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: didArchive
? "Thread archived, but navigation failed"
: "Failed to archive thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
return;
}
return;
}
case "delete": {
if (confirmThreadDelete) {
const confirmed = await settlePromise(() =>
Expand DownExpand Up@@ -3098,12 +3130,14 @@ export default function Sidebar() {
})();
},
[
archiveThread,
attemptPin,
attemptSettle,
attemptSnooze,
attemptUnpin,
attemptUnsettle,
attemptUnsnooze,
confirmThreadArchive,
confirmThreadDelete,
copyBranchToClipboard,
copyPathToClipboard,
Expand Down
27 changes: 26 additions & 1 deletion apps/web/src/components/threadActionMenu.logic.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ const baseState: ThreadActionMenuState = {
isSnoozed: false,
canSnoozeNow: true,
isRegeneratingTitle: false,
isRunning: false,
supports: { settlement: true, snooze: true, pinning: true, titleRegeneration: true },
snoozePresets: [
{ id: "hour", label: "In 1 hour", whenLabel: "3:00 PM", snoozedUntil: "2026-08-07T15:00:00Z" },
Expand All@@ -26,7 +27,7 @@ describe("buildThreadActionMenuItems", () => {
...baseState,
supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
}),
).toEqual(["rename", "mark-unread", "copy-path", "copy-thread-id", "delete"]);
).toEqual(["rename", "mark-unread", "copy-path", "copy-thread-id", "archive", "delete"]);
});

it("includes branch items only for threads with a branch", () => {
Expand DownExpand Up@@ -63,4 +64,28 @@ describe("buildThreadActionMenuItems", () => {
const items = buildThreadActionMenuItems({ ...baseState, branch: "main" });
expect(items.at(-1)).toMatchObject({ id: "delete", destructive: true });
});

it("offers archive as a non-destructive action right before delete", () => {
const items = buildThreadActionMenuItems(baseState);
const archiveItem = items.at(-2);
expect(archiveItem?.id).toBe("archive");
expect(archiveItem?.destructive).toBeFalsy();
expect(items.at(-1)?.id).toBe("delete");
});

it("keeps archive available even when the environment lacks every other capability", () => {
expect(
ids({
...baseState,
supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
}),
).toContain("archive");
});

it("disables archive while the thread is running", () => {
const archiveItem = buildThreadActionMenuItems({ ...baseState, isRunning: true }).find(
(item) => item.id === "archive",
);
expect(archiveItem?.disabled).toBe(true);
});
});
9 changes: 9 additions & 0 deletions apps/web/src/components/threadActionMenu.logic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ export type ThreadActionMenuId =
| "copy-path"
| "copy-branch"
| "copy-thread-id"
| "archive"
| "delete";

export interface ThreadActionMenuState {
Expand All@@ -30,6 +31,8 @@ export interface ThreadActionMenuState {
readonly isSnoozed: boolean;
readonly canSnoozeNow: boolean;
readonly isRegeneratingTitle: boolean;
/** Archive rejects a thread with an active turn, so disable it here rather than let the action fail. */
readonly isRunning: boolean;
readonly supports: {
readonly settlement: boolean;
readonly snooze: boolean;
Expand DownExpand Up@@ -102,6 +105,12 @@ export function buildThreadActionMenuItems(
{ id: "copy-path", label: "Copy path", icon: "copy" },
...(state.branch ? [{ id: "copy-branch" as const, label: "Copy branch", icon: "copy" }] : []),
{ id: "copy-thread-id", label: "Copy thread ID", icon: "copy" },
// Archive removes the thread from the sidebar while keeping its
// conversation under Settings > Archived threads — distinct from Settle
// (stays visible in the Settled shelf) and Delete (clears history for
// good), so it sits beside Delete without borrowing its destructive
// styling.
{ id: "archive", label: "Archive thread", disabled: state.isRunning },
{ id: "delete", label: "Delete", destructive: true, icon: "trash" },
];
}
26 changes: 26 additions & 0 deletions apps/web/src/hooks/useThreadActionMenu.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ export function useThreadActionMenu(input: {
unsnoozeThread,
pinThread,
unpinThread,
archiveThread,
deleteThread,
} = useThreadActions();
const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
Expand All@@ -81,6 +82,7 @@ export function useThreadActionMenu(input: {
const markThreadUnread = useUiStateStore((s) => s.markThreadUnread);
const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
const confirmThreadArchive = useClientSettings((s) => s.confirmThreadArchive);
const timestampFormat = useClientSettings((s) => s.timestampFormat);
const { copyToClipboard: copyPathToClipboard } = useCopyToClipboard<{ path: string }>({
onCopy: ({ path }) => {
Expand DownExpand Up@@ -137,6 +139,7 @@ export function useThreadActionMenu(input: {
isSnoozed: supports.snooze && effectiveSnoozed(thread, { now: now.toISOString() }),
canSnoozeNow: canSnooze(thread, { now: now.toISOString() }),
isRegeneratingTitle,
isRunning: thread.session?.status === "running" && thread.session.activeTurnId != null,
supports,
snoozePresets,
});
Expand DownExpand Up@@ -251,6 +254,27 @@ export function useThreadActionMenu(input: {
case "copy-thread-id":
copyThreadIdToClipboard(thread.id, { threadId: thread.id });
return;
case "archive": {
if (confirmThreadArchive) {
const confirmed = await settlePromise(() =>
api.dialogs.confirm(`Archive thread "${thread.title}"?`),
);
if (confirmed._tag === "Failure" || !confirmed.value) return;
}
let didArchive = false;
const result = await archiveThread(threadRef, {
onArchived: () => {
didArchive = true;
},
});
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
failureToast(
didArchive ? "Thread archived, but navigation failed" : "Failed to archive thread",
squashAtomCommandFailure(result),
);
}
return;
}
case "delete": {
if (confirmThreadDelete) {
const confirmed = await settlePromise(() =>
Expand DownExpand Up@@ -283,8 +307,10 @@ export function useThreadActionMenu(input: {
})();
},
[
archiveThread,
autoSettleAfterDays,
changeRequestState,
confirmThreadArchive,
confirmThreadDelete,
copyBranchToClipboard,
copyPathToClipboard,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1600,6 +1600,7 @@ export default function Sidebar() {
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
const confirmThreadArchive = useClientSettings((s) => s.confirmThreadArchive);
const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
const timestampFormat = useClientSettings((s) => s.timestampFormat);
const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
Expand All@@ -1611,6 +1612,7 @@ export default function Sidebar() {
pinThread,
unpinThread,
reorderPinnedThread,
archiveThread,
deleteThread,
} = useThreadActions();
const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
Expand DownExpand Up@@ -2962,6 +2964,8 @@ export default function Sidebar() {
isSnoozed,
canSnoozeNow: canSnooze(thread, { now: new Date().toISOString() }),
isRegeneratingTitle,
isRunning:
thread.session?.status === "running" && thread.session.activeTurnId != null,
supports: {
settlement: supportsSettlement,
snooze: supportsSnooze,
Expand DownExpand Up@@ -3065,6 +3069,34 @@ export default function Sidebar() {
case "copy-thread-id":
copyThreadIdToClipboard(thread.id, { threadId: thread.id });
return;
case "archive": {
if (confirmThreadArchive) {
const confirmed = await settlePromise(() =>
api.dialogs.confirm(`Archive thread "${thread.title}"?`),
);
if (confirmed._tag === "Failure" || !confirmed.value) return;
}
let didArchive = false;
const result = await archiveThread(threadRef, {
onArchived: () => {
didArchive = true;
},
});
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: didArchive
? "Thread archived, but navigation failed"
: "Failed to archive thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
return;
}
return;
}
case "delete": {
if (confirmThreadDelete) {
const confirmed = await settlePromise(() =>
Expand DownExpand Up@@ -3098,12 +3130,14 @@ export default function Sidebar() {
})();
},
[
archiveThread,
attemptPin,
attemptSettle,
attemptSnooze,
attemptUnpin,
attemptUnsettle,
attemptUnsnooze,
confirmThreadArchive,
confirmThreadDelete,
copyBranchToClipboard,
copyPathToClipboard,
Expand Down
27 changes: 26 additions & 1 deletion apps/web/src/components/threadActionMenu.logic.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ const baseState: ThreadActionMenuState = {
isSnoozed: false,
canSnoozeNow: true,
isRegeneratingTitle: false,
isRunning: false,
supports: { settlement: true, snooze: true, pinning: true, titleRegeneration: true },
snoozePresets: [
{ id: "hour", label: "In 1 hour", whenLabel: "3:00 PM", snoozedUntil: "2026-08-07T15:00:00Z" },
Expand All@@ -26,7 +27,7 @@ describe("buildThreadActionMenuItems", () => {
...baseState,
supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
}),
).toEqual(["rename", "mark-unread", "copy-path", "copy-thread-id", "delete"]);
).toEqual(["rename", "mark-unread", "copy-path", "copy-thread-id", "archive", "delete"]);
});

it("includes branch items only for threads with a branch", () => {
Expand DownExpand Up@@ -63,4 +64,28 @@ describe("buildThreadActionMenuItems", () => {
const items = buildThreadActionMenuItems({ ...baseState, branch: "main" });
expect(items.at(-1)).toMatchObject({ id: "delete", destructive: true });
});

it("offers archive as a non-destructive action right before delete", () => {
const items = buildThreadActionMenuItems(baseState);
const archiveItem = items.at(-2);
expect(archiveItem?.id).toBe("archive");
expect(archiveItem?.destructive).toBeFalsy();
expect(items.at(-1)?.id).toBe("delete");
});

it("keeps archive available even when the environment lacks every other capability", () => {
expect(
ids({
...baseState,
supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
}),
).toContain("archive");
});

it("disables archive while the thread is running", () => {
const archiveItem = buildThreadActionMenuItems({ ...baseState, isRunning: true }).find(
(item) => item.id === "archive",
);
expect(archiveItem?.disabled).toBe(true);
});
});
9 changes: 9 additions & 0 deletions apps/web/src/components/threadActionMenu.logic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ export type ThreadActionMenuId =
| "copy-path"
| "copy-branch"
| "copy-thread-id"
| "archive"
| "delete";

export interface ThreadActionMenuState {
Expand All@@ -30,6 +31,8 @@ export interface ThreadActionMenuState {
readonly isSnoozed: boolean;
readonly canSnoozeNow: boolean;
readonly isRegeneratingTitle: boolean;
/** Archive rejects a thread with an active turn, so disable it here rather than let the action fail. */
readonly isRunning: boolean;
readonly supports: {
readonly settlement: boolean;
readonly snooze: boolean;
Expand DownExpand Up@@ -102,6 +105,12 @@ export function buildThreadActionMenuItems(
{ id: "copy-path", label: "Copy path", icon: "copy" },
...(state.branch ? [{ id: "copy-branch" as const, label: "Copy branch", icon: "copy" }] : []),
{ id: "copy-thread-id", label: "Copy thread ID", icon: "copy" },
// Archive removes the thread from the sidebar while keeping its
// conversation under Settings > Archived threads — distinct from Settle
// (stays visible in the Settled shelf) and Delete (clears history for
// good), so it sits beside Delete without borrowing its destructive
// styling.
{ id: "archive", label: "Archive thread", disabled: state.isRunning },
{ id: "delete", label: "Delete", destructive: true, icon: "trash" },
];
}
26 changes: 26 additions & 0 deletions apps/web/src/hooks/useThreadActionMenu.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ export function useThreadActionMenu(input: {
unsnoozeThread,
pinThread,
unpinThread,
archiveThread,
deleteThread,
} = useThreadActions();
const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
Expand All@@ -81,6 +82,7 @@ export function useThreadActionMenu(input: {
const markThreadUnread = useUiStateStore((s) => s.markThreadUnread);
const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
const confirmThreadArchive = useClientSettings((s) => s.confirmThreadArchive);
const timestampFormat = useClientSettings((s) => s.timestampFormat);
const { copyToClipboard: copyPathToClipboard } = useCopyToClipboard<{ path: string }>({
onCopy: ({ path }) => {
Expand DownExpand Up@@ -137,6 +139,7 @@ export function useThreadActionMenu(input: {
isSnoozed: supports.snooze && effectiveSnoozed(thread, { now: now.toISOString() }),
canSnoozeNow: canSnooze(thread, { now: now.toISOString() }),
isRegeneratingTitle,
isRunning: thread.session?.status === "running" && thread.session.activeTurnId != null,
supports,
snoozePresets,
});
Expand DownExpand Up@@ -251,6 +254,27 @@ export function useThreadActionMenu(input: {
case "copy-thread-id":
copyThreadIdToClipboard(thread.id, { threadId: thread.id });
return;
case "archive": {
if (confirmThreadArchive) {
const confirmed = await settlePromise(() =>
api.dialogs.confirm(`Archive thread "${thread.title}"?`),
);
if (confirmed._tag === "Failure" || !confirmed.value) return;
}
let didArchive = false;
const result = await archiveThread(threadRef, {
onArchived: () => {
didArchive = true;
},
});
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
failureToast(
didArchive ? "Thread archived, but navigation failed" : "Failed to archive thread",
squashAtomCommandFailure(result),
);
}
return;
}
case "delete": {
if (confirmThreadDelete) {
const confirmed = await settlePromise(() =>
Expand DownExpand Up@@ -283,8 +307,10 @@ export function useThreadActionMenu(input: {
})();
},
[
archiveThread,
autoSettleAfterDays,
changeRequestState,
confirmThreadArchive,
confirmThreadDelete,
copyBranchToClipboard,
copyPathToClipboard,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1600,6 +1600,7 @@ export default function Sidebar() {
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
const confirmThreadArchive = useClientSettings((s) => s.confirmThreadArchive);
const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
const timestampFormat = useClientSettings((s) => s.timestampFormat);
const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
Expand All@@ -1611,6 +1612,7 @@ export default function Sidebar() {
pinThread,
unpinThread,
reorderPinnedThread,
archiveThread,
deleteThread,
} = useThreadActions();
const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
Expand DownExpand Up@@ -2962,6 +2964,8 @@ export default function Sidebar() {
isSnoozed,
canSnoozeNow: canSnooze(thread, { now: new Date().toISOString() }),
isRegeneratingTitle,
isRunning:
thread.session?.status === "running" && thread.session.activeTurnId != null,
supports: {
settlement: supportsSettlement,
snooze: supportsSnooze,
Expand DownExpand Up@@ -3065,6 +3069,34 @@ export default function Sidebar() {
case "copy-thread-id":
copyThreadIdToClipboard(thread.id, { threadId: thread.id });
return;
case "archive": {
if (confirmThreadArchive) {
const confirmed = await settlePromise(() =>
api.dialogs.confirm(`Archive thread "${thread.title}"?`),
);
if (confirmed._tag === "Failure" || !confirmed.value) return;
}
let didArchive = false;
const result = await archiveThread(threadRef, {
onArchived: () => {
didArchive = true;
},
});
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: didArchive
? "Thread archived, but navigation failed"
: "Failed to archive thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
return;
}
return;
}
case "delete": {
if (confirmThreadDelete) {
const confirmed = await settlePromise(() =>
Expand DownExpand Up@@ -3098,12 +3130,14 @@ export default function Sidebar() {
})();
},
[
archiveThread,
attemptPin,
attemptSettle,
attemptSnooze,
attemptUnpin,
attemptUnsettle,
attemptUnsnooze,
confirmThreadArchive,
confirmThreadDelete,
copyBranchToClipboard,
copyPathToClipboard,
Expand Down
27 changes: 26 additions & 1 deletion apps/web/src/components/threadActionMenu.logic.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ const baseState: ThreadActionMenuState = {
isSnoozed: false,
canSnoozeNow: true,
isRegeneratingTitle: false,
isRunning: false,
supports: { settlement: true, snooze: true, pinning: true, titleRegeneration: true },
snoozePresets: [
{ id: "hour", label: "In 1 hour", whenLabel: "3:00 PM", snoozedUntil: "2026-08-07T15:00:00Z" },
Expand All@@ -26,7 +27,7 @@ describe("buildThreadActionMenuItems", () => {
...baseState,
supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
}),
).toEqual(["rename", "mark-unread", "copy-path", "copy-thread-id", "delete"]);
).toEqual(["rename", "mark-unread", "copy-path", "copy-thread-id", "archive", "delete"]);
});

it("includes branch items only for threads with a branch", () => {
Expand DownExpand Up@@ -63,4 +64,28 @@ describe("buildThreadActionMenuItems", () => {
const items = buildThreadActionMenuItems({ ...baseState, branch: "main" });
expect(items.at(-1)).toMatchObject({ id: "delete", destructive: true });
});

it("offers archive as a non-destructive action right before delete", () => {
const items = buildThreadActionMenuItems(baseState);
const archiveItem = items.at(-2);
expect(archiveItem?.id).toBe("archive");
expect(archiveItem?.destructive).toBeFalsy();
expect(items.at(-1)?.id).toBe("delete");
});

it("keeps archive available even when the environment lacks every other capability", () => {
expect(
ids({
...baseState,
supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
}),
).toContain("archive");
});

it("disables archive while the thread is running", () => {
const archiveItem = buildThreadActionMenuItems({ ...baseState, isRunning: true }).find(
(item) => item.id === "archive",
);
expect(archiveItem?.disabled).toBe(true);
});
});
9 changes: 9 additions & 0 deletions apps/web/src/components/threadActionMenu.logic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ export type ThreadActionMenuId =
| "copy-path"
| "copy-branch"
| "copy-thread-id"
| "archive"
| "delete";

export interface ThreadActionMenuState {
Expand All@@ -30,6 +31,8 @@ export interface ThreadActionMenuState {
readonly isSnoozed: boolean;
readonly canSnoozeNow: boolean;
readonly isRegeneratingTitle: boolean;
/** Archive rejects a thread with an active turn, so disable it here rather than let the action fail. */
readonly isRunning: boolean;
readonly supports: {
readonly settlement: boolean;
readonly snooze: boolean;
Expand DownExpand Up@@ -102,6 +105,12 @@ export function buildThreadActionMenuItems(
{ id: "copy-path", label: "Copy path", icon: "copy" },
...(state.branch ? [{ id: "copy-branch" as const, label: "Copy branch", icon: "copy" }] : []),
{ id: "copy-thread-id", label: "Copy thread ID", icon: "copy" },
// Archive removes the thread from the sidebar while keeping its
// conversation under Settings > Archived threads — distinct from Settle
// (stays visible in the Settled shelf) and Delete (clears history for
// good), so it sits beside Delete without borrowing its destructive
// styling.
{ id: "archive", label: "Archive thread", disabled: state.isRunning },
{ id: "delete", label: "Delete", destructive: true, icon: "trash" },
];
}
26 changes: 26 additions & 0 deletions apps/web/src/hooks/useThreadActionMenu.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ export function useThreadActionMenu(input: {
unsnoozeThread,
pinThread,
unpinThread,
archiveThread,
deleteThread,
} = useThreadActions();
const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
Expand All@@ -81,6 +82,7 @@ export function useThreadActionMenu(input: {
const markThreadUnread = useUiStateStore((s) => s.markThreadUnread);
const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
const confirmThreadArchive = useClientSettings((s) => s.confirmThreadArchive);
const timestampFormat = useClientSettings((s) => s.timestampFormat);
const { copyToClipboard: copyPathToClipboard } = useCopyToClipboard<{ path: string }>({
onCopy: ({ path }) => {
Expand DownExpand Up@@ -137,6 +139,7 @@ export function useThreadActionMenu(input: {
isSnoozed: supports.snooze && effectiveSnoozed(thread, { now: now.toISOString() }),
canSnoozeNow: canSnooze(thread, { now: now.toISOString() }),
isRegeneratingTitle,
isRunning: thread.session?.status === "running" && thread.session.activeTurnId != null,
supports,
snoozePresets,
});
Expand DownExpand Up@@ -251,6 +254,27 @@ export function useThreadActionMenu(input: {
case "copy-thread-id":
copyThreadIdToClipboard(thread.id, { threadId: thread.id });
return;
case "archive": {
if (confirmThreadArchive) {
const confirmed = await settlePromise(() =>
api.dialogs.confirm(`Archive thread "${thread.title}"?`),
);
if (confirmed._tag === "Failure" || !confirmed.value) return;
}
let didArchive = false;
const result = await archiveThread(threadRef, {
onArchived: () => {
didArchive = true;
},
});
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
failureToast(
didArchive ? "Thread archived, but navigation failed" : "Failed to archive thread",
squashAtomCommandFailure(result),
);
}
return;
}
case "delete": {
if (confirmThreadDelete) {
const confirmed = await settlePromise(() =>
Expand DownExpand Up@@ -283,8 +307,10 @@ export function useThreadActionMenu(input: {
})();
},
[
archiveThread,
autoSettleAfterDays,
changeRequestState,
confirmThreadArchive,
confirmThreadDelete,
copyBranchToClipboard,
copyPathToClipboard,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1600,6 +1600,7 @@ export default function Sidebar() {
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
const confirmThreadArchive = useClientSettings((s) => s.confirmThreadArchive);
const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
const timestampFormat = useClientSettings((s) => s.timestampFormat);
const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
Expand All@@ -1611,6 +1612,7 @@ export default function Sidebar() {
pinThread,
unpinThread,
reorderPinnedThread,
archiveThread,
deleteThread,
} = useThreadActions();
const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
Expand DownExpand Up@@ -2962,6 +2964,8 @@ export default function Sidebar() {
isSnoozed,
canSnoozeNow: canSnooze(thread, { now: new Date().toISOString() }),
isRegeneratingTitle,
isRunning:
thread.session?.status === "running" && thread.session.activeTurnId != null,
supports: {
settlement: supportsSettlement,
snooze: supportsSnooze,
Expand DownExpand Up@@ -3065,6 +3069,34 @@ export default function Sidebar() {
case "copy-thread-id":
copyThreadIdToClipboard(thread.id, { threadId: thread.id });
return;
case "archive": {
if (confirmThreadArchive) {
const confirmed = await settlePromise(() =>
api.dialogs.confirm(`Archive thread "${thread.title}"?`),
);
if (confirmed._tag === "Failure" || !confirmed.value) return;
}
let didArchive = false;
const result = await archiveThread(threadRef, {
onArchived: () => {
didArchive = true;
},
});
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: didArchive
? "Thread archived, but navigation failed"
: "Failed to archive thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
return;
}
return;
}
case "delete": {
if (confirmThreadDelete) {
const confirmed = await settlePromise(() =>
Expand DownExpand Up@@ -3098,12 +3130,14 @@ export default function Sidebar() {
})();
},
[
archiveThread,
attemptPin,
attemptSettle,
attemptSnooze,
attemptUnpin,
attemptUnsettle,
attemptUnsnooze,
confirmThreadArchive,
confirmThreadDelete,
copyBranchToClipboard,
copyPathToClipboard,
Expand Down
27 changes: 26 additions & 1 deletion apps/web/src/components/threadActionMenu.logic.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ const baseState: ThreadActionMenuState = {
isSnoozed: false,
canSnoozeNow: true,
isRegeneratingTitle: false,
isRunning: false,
supports: { settlement: true, snooze: true, pinning: true, titleRegeneration: true },
snoozePresets: [
{ id: "hour", label: "In 1 hour", whenLabel: "3:00 PM", snoozedUntil: "2026-08-07T15:00:00Z" },
Expand All@@ -26,7 +27,7 @@ describe("buildThreadActionMenuItems", () => {
...baseState,
supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
}),
).toEqual(["rename", "mark-unread", "copy-path", "copy-thread-id", "delete"]);
).toEqual(["rename", "mark-unread", "copy-path", "copy-thread-id", "archive", "delete"]);
});

it("includes branch items only for threads with a branch", () => {
Expand DownExpand Up@@ -63,4 +64,28 @@ describe("buildThreadActionMenuItems", () => {
const items = buildThreadActionMenuItems({ ...baseState, branch: "main" });
expect(items.at(-1)).toMatchObject({ id: "delete", destructive: true });
});

it("offers archive as a non-destructive action right before delete", () => {
const items = buildThreadActionMenuItems(baseState);
const archiveItem = items.at(-2);
expect(archiveItem?.id).toBe("archive");
expect(archiveItem?.destructive).toBeFalsy();
expect(items.at(-1)?.id).toBe("delete");
});

it("keeps archive available even when the environment lacks every other capability", () => {
expect(
ids({
...baseState,
supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
}),
).toContain("archive");
});

it("disables archive while the thread is running", () => {
const archiveItem = buildThreadActionMenuItems({ ...baseState, isRunning: true }).find(
(item) => item.id === "archive",
);
expect(archiveItem?.disabled).toBe(true);
});
});
9 changes: 9 additions & 0 deletions apps/web/src/components/threadActionMenu.logic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ export type ThreadActionMenuId =
| "copy-path"
| "copy-branch"
| "copy-thread-id"
| "archive"
| "delete";

export interface ThreadActionMenuState {
Expand All@@ -30,6 +31,8 @@ export interface ThreadActionMenuState {
readonly isSnoozed: boolean;
readonly canSnoozeNow: boolean;
readonly isRegeneratingTitle: boolean;
/** Archive rejects a thread with an active turn, so disable it here rather than let the action fail. */
readonly isRunning: boolean;
readonly supports: {
readonly settlement: boolean;
readonly snooze: boolean;
Expand DownExpand Up@@ -102,6 +105,12 @@ export function buildThreadActionMenuItems(
{ id: "copy-path", label: "Copy path", icon: "copy" },
...(state.branch ? [{ id: "copy-branch" as const, label: "Copy branch", icon: "copy" }] : []),
{ id: "copy-thread-id", label: "Copy thread ID", icon: "copy" },
// Archive removes the thread from the sidebar while keeping its
// conversation under Settings > Archived threads — distinct from Settle
// (stays visible in the Settled shelf) and Delete (clears history for
// good), so it sits beside Delete without borrowing its destructive
// styling.
{ id: "archive", label: "Archive thread", disabled: state.isRunning },
{ id: "delete", label: "Delete", destructive: true, icon: "trash" },
];
}
26 changes: 26 additions & 0 deletions apps/web/src/hooks/useThreadActionMenu.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ export function useThreadActionMenu(input: {
unsnoozeThread,
pinThread,
unpinThread,
archiveThread,
deleteThread,
} = useThreadActions();
const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
Expand All@@ -81,6 +82,7 @@ export function useThreadActionMenu(input: {
const markThreadUnread = useUiStateStore((s) => s.markThreadUnread);
const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
const confirmThreadArchive = useClientSettings((s) => s.confirmThreadArchive);
const timestampFormat = useClientSettings((s) => s.timestampFormat);
const { copyToClipboard: copyPathToClipboard } = useCopyToClipboard<{ path: string }>({
onCopy: ({ path }) => {
Expand DownExpand Up@@ -137,6 +139,7 @@ export function useThreadActionMenu(input: {
isSnoozed: supports.snooze && effectiveSnoozed(thread, { now: now.toISOString() }),
canSnoozeNow: canSnooze(thread, { now: now.toISOString() }),
isRegeneratingTitle,
isRunning: thread.session?.status === "running" && thread.session.activeTurnId != null,
supports,
snoozePresets,
});
Expand DownExpand Up@@ -251,6 +254,27 @@ export function useThreadActionMenu(input: {
case "copy-thread-id":
copyThreadIdToClipboard(thread.id, { threadId: thread.id });
return;
case "archive": {
if (confirmThreadArchive) {
const confirmed = await settlePromise(() =>
api.dialogs.confirm(`Archive thread "${thread.title}"?`),
);
if (confirmed._tag === "Failure" || !confirmed.value) return;
}
let didArchive = false;
const result = await archiveThread(threadRef, {
onArchived: () => {
didArchive = true;
},
});
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
failureToast(
didArchive ? "Thread archived, but navigation failed" : "Failed to archive thread",
squashAtomCommandFailure(result),
);
}
return;
}
case "delete": {
if (confirmThreadDelete) {
const confirmed = await settlePromise(() =>
Expand DownExpand Up@@ -283,8 +307,10 @@ export function useThreadActionMenu(input: {
})();
},
[
archiveThread,
autoSettleAfterDays,
changeRequestState,
confirmThreadArchive,
confirmThreadDelete,
copyBranchToClipboard,
copyPathToClipboard,
Expand Down
Loading