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
1 change: 1 addition & 0 deletions apps/desktop/src/settings/DesktopClientSettings.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ const clientSettings: ClientSettings = {
confirmQuit: true,
confirmThreadArchive: true,
confirmThreadDelete: false,
confirmThreadUnpin: false,
dismissedProviderUpdateNotificationKeys: [],
diffIgnoreWhitespace: true,
environmentIdentificationMode: "artwork",
Expand Down
28 changes: 15 additions & 13 deletions apps/web/src/components/ChatView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1273,7 +1273,7 @@ function ChatViewContent(props: ChatViewProps) {
const threadSyncPhase = routeKind === "server" ? (props.threadSyncPhase ?? null) : null;
const threadDetailLoading = threadSyncPhase === "loading";
const handleNewThread = useNewThreadHandler();
const { settleThread, pinThread, unpinThread } = useThreadActions();
const { settleThread, pinThread, confirmAndUnpinThread } = useThreadActions();
const routeThreadRef = useMemo(
() => scopeThreadRef(environmentId, threadId),
[environmentId, threadId],
Expand DownExpand Up@@ -5146,17 +5146,19 @@ function ChatViewContent(props: ChatViewProps) {
event.stopPropagation();
if (!isServerThread || !activeThreadRef || !supportsPinning) return;
const pinned = activeThreadPinned;
void (pinned ? unpinThread(activeThreadRef) : pinThread(activeThreadRef)).then((result) => {
if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
});
void (pinned ? confirmAndUnpinThread(activeThreadRef) : pinThread(activeThreadRef)).then(
(result) => {
if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
},
);
return;
}

Expand DownExpand Up@@ -5284,7 +5286,7 @@ function ChatViewContent(props: ChatViewProps) {
settleThread,
supportsPinning,
supportsSettlement,
unpinThread,
confirmAndUnpinThread,
toggleRightPanel,
toggleRightPanelMaximized,
toggleTerminalVisibility,
Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1749,7 +1749,7 @@ export default function Sidebar() {
snoozeThread,
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
reorderPinnedThread,
archiveThread,
deleteThread,
Expand DownExpand Up@@ -2709,7 +2709,7 @@ export default function Sidebar() {
const attemptUnpin = useCallback(
(threadRef: ScopedThreadRef) => {
void (async () => {
const result = await unpinThread(threadRef);
const result = await confirmAndUnpinThread(threadRef);
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
const error = squashAtomCommandFailure(result);
toastManager.add(
Expand All@@ -2722,7 +2722,7 @@ export default function Sidebar() {
}
})();
},
[unpinThread],
[confirmAndUnpinThread],
);

const handlePinnedDragEnd = useCallback(
Expand Down
31 changes: 31 additions & 0 deletions apps/web/src/components/settings/SettingsPanels.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,6 +526,9 @@ export function useSettingsRestore(onRestored?: () => void) {
...(settings.addProjectBaseDirectory !== DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory
? ["Add project base directory"]
: []),
...(settings.confirmThreadUnpin !== DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin
? ["Unpin confirmation"]
: []),
...(settings.confirmThreadArchive !== DEFAULT_UNIFIED_SETTINGS.confirmThreadArchive
? ["Archive confirmation"]
: []),
Expand DownExpand Up@@ -554,6 +557,7 @@ export function useSettingsRestore(onRestored?: () => void) {
settings.confirmQuit,
settings.confirmThreadArchive,
settings.confirmThreadDelete,
settings.confirmThreadUnpin,
settings.addProjectBaseDirectory,
settings.defaultThreadEnvMode,
settings.newWorktreesStartFromOrigin,
Expand DownExpand Up@@ -666,6 +670,7 @@ export function useSettingsRestore(onRestored?: () => void) {
addProjectBaseDirectory: DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory,
confirmThreadArchive: DEFAULT_UNIFIED_SETTINGS.confirmThreadArchive,
confirmThreadDelete: DEFAULT_UNIFIED_SETTINGS.confirmThreadDelete,
confirmThreadUnpin: DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin,
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Outdated
Comment thread
cursor[bot] marked this conversation as resolved.
confirmQuit: DEFAULT_UNIFIED_SETTINGS.confirmQuit,
textGenerationModelSelection: DEFAULT_UNIFIED_SETTINGS.textGenerationModelSelection,
fontFamilySans: DEFAULT_UNIFIED_SETTINGS.fontFamilySans,
Expand DownExpand Up@@ -2313,6 +2318,32 @@ export function GeneralSettingsPanel() {
}
/>

<SettingsRow
Comment thread
UtkarshUsername marked this conversation as resolved.
Outdated
{...searchableSetting("unpin-confirmation")}
description="Ask before unpinning a thread from the pinned section."
resetAction={
settings.confirmThreadUnpin !== DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin ? (
<SettingResetButton
label="unpin confirmation"
onClick={() =>
updateSettings({
confirmThreadUnpin: DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin,
})
}
/>
) : null
}
control={
<Switch
checked={settings.confirmThreadUnpin}
onCheckedChange={(checked) =>
updateSettings({ confirmThreadUnpin: Boolean(checked) })
}
aria-label="Confirm thread unpinning"
/>
}
/>

<SettingsRow
{...searchableSetting("archive-confirmation")}
description="Require a second click on the inline archive action before a thread is archived."
Expand Down
8 changes: 8 additions & 0 deletions apps/web/src/components/settings/settingsSearch.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,14 @@ describe("searchSettings", () => {
]);
});

it("lists thread confirmations in panel order", () => {
expect(searchSettings("confirmation").map((item) => item.id)).toEqual([
"unpin-confirmation",
"archive-confirmation",
"delete-confirmation",
]);
});

it("returns no results for an empty query", () => {
expect(searchSettings(" ", ITEMS)).toEqual([]);
});
Expand Down
5 changes: 5 additions & 0 deletions apps/web/src/components/settings/settingsSearch.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,6 +152,11 @@ export const SETTINGS_SEARCH_ITEMS = [
title: "Add project starts in",
to: "/settings/general",
},
{
id: "unpin-confirmation",
title: "Unpin confirmation",
to: "/settings/general",
},
{
id: "archive-confirmation",
title: "Archive confirmation",
Expand Down
9 changes: 5 additions & 4 deletions apps/web/src/hooks/useThreadActionMenu.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ export function useThreadActionMenu(input: {
snoozeThread,
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
archiveThread,
deleteThread,
} = useThreadActions();
Expand DownExpand Up@@ -215,9 +215,10 @@ export function useThreadActionMenu(input: {
case "pin":
await reportFailure("Failed to pin thread", () => pinThread(threadRef));
return;
case "unpin":
await reportFailure("Failed to unpin thread", () => unpinThread(threadRef));
case "unpin": {
await reportFailure("Failed to unpin thread", () => confirmAndUnpinThread(threadRef));
return;
}
case "rename":
onStartRename();
return;
Expand DownExpand Up@@ -315,6 +316,7 @@ export function useThreadActionMenu(input: {
changeRequest,
confirmThreadArchive,
confirmThreadDelete,
confirmAndUnpinThread,
copyBranchToClipboard,
copyPathToClipboard,
copyThreadIdToClipboard,
Expand All@@ -328,7 +330,6 @@ export function useThreadActionMenu(input: {
snoozeThread,
threadRef,
timestampFormat,
unpinThread,
unsettleThread,
unsnoozeThread,
updateThreadMetadata,
Expand Down
56 changes: 55 additions & 1 deletion apps/web/src/hooks/useThreadActions.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { EnvironmentId, ThreadId } from "@t3tools/contracts";
import { describe, expect, it } from "vite-plus/test";

import { ThreadArchiveBlockedError } from "./useThreadActions";
import { requestThreadUnpinConfirmation, ThreadArchiveBlockedError } from "./useThreadActions";

describe("ThreadArchiveBlockedError", () => {
it("keeps the blocked thread context with the fixed message", () => {
Expand All@@ -17,3 +17,57 @@ describe("ThreadArchiveBlockedError", () => {
expect(error.message).toBe("Cannot archive a running thread.");
});
});

describe("requestThreadUnpinConfirmation", () => {
it("skips the dialog when confirmation is disabled", async () => {
let callCount = 0;
const result = await requestThreadUnpinConfirmation({
enabled: false,
title: "Pinned thread",
confirm: async () => {
callCount += 1;
return false;
},
});

expect(result).toMatchObject({ _tag: "Success", value: true });
expect(callCount).toBe(0);
});

it("degrades gracefully when dialogs are unavailable", async () => {
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Pinned thread",
confirm: null,
});

expect(result).toMatchObject({ _tag: "Success", value: true });
});

it("uses the thread title and returns the user's decision", async () => {
let message = "";
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Release prep",
confirm: async (nextMessage) => {
message = nextMessage;
return false;
},
});

expect(message).toBe(
'Unpin thread "Release prep"?\nThis will move the thread out of your pinned section.',
);
expect(result).toMatchObject({ _tag: "Success", value: false });
});

it("keeps dialog failures observable", async () => {
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Pinned thread",
confirm: () => Promise.reject(new Error("dialog unavailable")),
});

expect(result._tag).toBe("Failure");
});
});
43 changes: 43 additions & 0 deletions apps/web/src/hooks/useThreadActions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,26 @@ export class ThreadPinReorderUnsupportedError extends Schema.TaggedErrorClass<Th
}
}

export async function requestThreadUnpinConfirmation(input: {
enabled: boolean;
title: string;
confirm: ((message: string) => Promise<boolean>) | null;
}) {
const { confirm } = input;
if (!input.enabled || confirm === null) {
return AsyncResult.success(true);
}

return settlePromise(() =>
confirm(
[
`Unpin thread "${input.title}"?`,
"This will move the thread out of your pinned section.",
].join("\n"),
),
);
}

export function useThreadActions() {
const closeTerminal = useAtomCommand(terminalEnvironment.close);
const archiveThreadMutation = useAtomCommand(threadEnvironment.archive, {
Expand DownExpand Up@@ -177,6 +197,7 @@ export function useThreadActions() {
});
const sidebarThreadSortOrder = useClientSettings((settings) => settings.sidebarThreadSortOrder);
const confirmThreadDelete = useClientSettings((settings) => settings.confirmThreadDelete);
const confirmThreadUnpin = useClientSettings((settings) => settings.confirmThreadUnpin);
const clearComposerDraftForThread = useComposerDraftStore((store) => store.clearDraftThread);
const clearProjectDraftThreadById = useComposerDraftStore(
(store) => store.clearProjectDraftThreadById,
Expand DownExpand Up@@ -590,6 +611,26 @@ export function useThreadActions() {
[unpinThreadMutation],
);

const confirmAndUnpinThread = useCallback(
async (target: ScopedThreadRef) => {
const localApi = readLocalApi();
const resolved = resolveThreadTarget(target);
const confirmationResult = await requestThreadUnpinConfirmation({
enabled: confirmThreadUnpin,
title: resolved?.thread.title ?? "this thread",
confirm: localApi ? (message) => localApi.dialogs.confirm(message) : null,
});
if (confirmationResult._tag === "Failure") {
return confirmationResult;
}
if (!confirmationResult.value) {
return AsyncResult.success(undefined);
}
return unpinThread(target);
},
[confirmThreadUnpin, resolveThreadTarget, unpinThread],
);

const reorderPinnedThread = useCallback(
async (target: ScopedThreadRef, orderKey: string) => {
// Callers (the sidebar drag handler) only enable dragging on
Expand DownExpand Up@@ -709,11 +750,13 @@ export function useThreadActions() {
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
reorderPinnedThread,
}),
[
archiveThread,
confirmAndDeleteThread,
confirmAndUnpinThread,
deleteThread,
pinThread,
reorderPinnedThread,
Expand Down
3 changes: 3 additions & 0 deletions docs/user/thread-sidebar.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,9 @@ Pin a thread from its context menu to keep it in the pinned section above your a
`mod+shift+p` pins or unpins the thread you have open. Pinned threads are shown independently of
their project, including when you connect to more than one environment.

To require confirmation before unpinning, enable **Settings → General → Unpin confirmation**. The
confirmation applies to the sidebar controls, thread menus, and the `mod+shift+p` shortcut.

Pinned threads follow the auto-settle policy in **Settings → General**. Choose exactly one policy:
settle when a pull request merges or closes, settle after a configurable period of inactivity, or
never auto-settle. **Never** leaves every automatic path off, so threads settle only when you choose
Expand Down
6 changes: 6 additions & 0 deletions packages/contracts/src/settings.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,12 @@ describe("ClientSettings sidebar", () => {
);
});

it("keeps unpin confirmation opt-in and patchable", () => {
expect(decodeClientSettings({}).confirmThreadUnpin).toBe(false);
expect(decodeClientSettingsPatch({ confirmThreadUnpin: true }).confirmThreadUnpin).toBe(true);
expect(() => decodeClientSettingsPatch({ confirmThreadUnpin: "yes" })).toThrow();
});

it("allows auto-settle by inactivity to be disabled", () => {
expect(
decodeClientSettings({ sidebarAutoSettleAfterDays: null }).sidebarAutoSettleAfterDays,
Expand Down
2 changes: 2 additions & 0 deletions packages/contracts/src/settings.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,6 +170,7 @@ export const ClientSettingsSchema = Schema.Struct({
confirmQuit: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
confirmThreadArchive: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
confirmThreadDelete: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
confirmThreadUnpin: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
dismissedProviderUpdateNotificationKeys: Schema.Array(TrimmedNonEmptyString).pipe(
Schema.withDecodingDefault(Effect.succeed([])),
),
Expand DownExpand Up@@ -913,6 +914,7 @@ export const ClientSettingsPatch = Schema.Struct({
confirmQuit: Schema.optionalKey(Schema.Boolean),
confirmThreadArchive: Schema.optionalKey(Schema.Boolean),
confirmThreadDelete: Schema.optionalKey(Schema.Boolean),
confirmThreadUnpin: Schema.optionalKey(Schema.Boolean),
diffIgnoreWhitespace: Schema.optionalKey(Schema.Boolean),
environmentIdentificationMode: Schema.optionalKey(EnvironmentIdentificationMode),
glassOpacity: Schema.optionalKey(GlassOpacity),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} 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
1 change: 1 addition & 0 deletions apps/desktop/src/settings/DesktopClientSettings.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ const clientSettings: ClientSettings = {
confirmQuit: true,
confirmThreadArchive: true,
confirmThreadDelete: false,
confirmThreadUnpin: false,
dismissedProviderUpdateNotificationKeys: [],
diffIgnoreWhitespace: true,
environmentIdentificationMode: "artwork",
Expand Down
28 changes: 15 additions & 13 deletions apps/web/src/components/ChatView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1273,7 +1273,7 @@ function ChatViewContent(props: ChatViewProps) {
const threadSyncPhase = routeKind === "server" ? (props.threadSyncPhase ?? null) : null;
const threadDetailLoading = threadSyncPhase === "loading";
const handleNewThread = useNewThreadHandler();
const { settleThread, pinThread, unpinThread } = useThreadActions();
const { settleThread, pinThread, confirmAndUnpinThread } = useThreadActions();
const routeThreadRef = useMemo(
() => scopeThreadRef(environmentId, threadId),
[environmentId, threadId],
Expand DownExpand Up@@ -5146,17 +5146,19 @@ function ChatViewContent(props: ChatViewProps) {
event.stopPropagation();
if (!isServerThread || !activeThreadRef || !supportsPinning) return;
const pinned = activeThreadPinned;
void (pinned ? unpinThread(activeThreadRef) : pinThread(activeThreadRef)).then((result) => {
if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
});
void (pinned ? confirmAndUnpinThread(activeThreadRef) : pinThread(activeThreadRef)).then(
(result) => {
if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
},
);
return;
}

Expand DownExpand Up@@ -5284,7 +5286,7 @@ function ChatViewContent(props: ChatViewProps) {
settleThread,
supportsPinning,
supportsSettlement,
unpinThread,
confirmAndUnpinThread,
toggleRightPanel,
toggleRightPanelMaximized,
toggleTerminalVisibility,
Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1749,7 +1749,7 @@ export default function Sidebar() {
snoozeThread,
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
reorderPinnedThread,
archiveThread,
deleteThread,
Expand DownExpand Up@@ -2709,7 +2709,7 @@ export default function Sidebar() {
const attemptUnpin = useCallback(
(threadRef: ScopedThreadRef) => {
void (async () => {
const result = await unpinThread(threadRef);
const result = await confirmAndUnpinThread(threadRef);
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
const error = squashAtomCommandFailure(result);
toastManager.add(
Expand All@@ -2722,7 +2722,7 @@ export default function Sidebar() {
}
})();
},
[unpinThread],
[confirmAndUnpinThread],
);

const handlePinnedDragEnd = useCallback(
Expand Down
31 changes: 31 additions & 0 deletions apps/web/src/components/settings/SettingsPanels.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,6 +526,9 @@ export function useSettingsRestore(onRestored?: () => void) {
...(settings.addProjectBaseDirectory !== DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory
? ["Add project base directory"]
: []),
...(settings.confirmThreadUnpin !== DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin
? ["Unpin confirmation"]
: []),
...(settings.confirmThreadArchive !== DEFAULT_UNIFIED_SETTINGS.confirmThreadArchive
? ["Archive confirmation"]
: []),
Expand DownExpand Up@@ -554,6 +557,7 @@ export function useSettingsRestore(onRestored?: () => void) {
settings.confirmQuit,
settings.confirmThreadArchive,
settings.confirmThreadDelete,
settings.confirmThreadUnpin,
settings.addProjectBaseDirectory,
settings.defaultThreadEnvMode,
settings.newWorktreesStartFromOrigin,
Expand DownExpand Up@@ -666,6 +670,7 @@ export function useSettingsRestore(onRestored?: () => void) {
addProjectBaseDirectory: DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory,
confirmThreadArchive: DEFAULT_UNIFIED_SETTINGS.confirmThreadArchive,
confirmThreadDelete: DEFAULT_UNIFIED_SETTINGS.confirmThreadDelete,
confirmThreadUnpin: DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin,
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Outdated
Comment thread
cursor[bot] marked this conversation as resolved.
confirmQuit: DEFAULT_UNIFIED_SETTINGS.confirmQuit,
textGenerationModelSelection: DEFAULT_UNIFIED_SETTINGS.textGenerationModelSelection,
fontFamilySans: DEFAULT_UNIFIED_SETTINGS.fontFamilySans,
Expand DownExpand Up@@ -2313,6 +2318,32 @@ export function GeneralSettingsPanel() {
}
/>

<SettingsRow
Comment thread
UtkarshUsername marked this conversation as resolved.
Outdated
{...searchableSetting("unpin-confirmation")}
description="Ask before unpinning a thread from the pinned section."
resetAction={
settings.confirmThreadUnpin !== DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin ? (
<SettingResetButton
label="unpin confirmation"
onClick={() =>
updateSettings({
confirmThreadUnpin: DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin,
})
}
/>
) : null
}
control={
<Switch
checked={settings.confirmThreadUnpin}
onCheckedChange={(checked) =>
updateSettings({ confirmThreadUnpin: Boolean(checked) })
}
aria-label="Confirm thread unpinning"
/>
}
/>

<SettingsRow
{...searchableSetting("archive-confirmation")}
description="Require a second click on the inline archive action before a thread is archived."
Expand Down
8 changes: 8 additions & 0 deletions apps/web/src/components/settings/settingsSearch.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,14 @@ describe("searchSettings", () => {
]);
});

it("lists thread confirmations in panel order", () => {
expect(searchSettings("confirmation").map((item) => item.id)).toEqual([
"unpin-confirmation",
"archive-confirmation",
"delete-confirmation",
]);
});

it("returns no results for an empty query", () => {
expect(searchSettings(" ", ITEMS)).toEqual([]);
});
Expand Down
5 changes: 5 additions & 0 deletions apps/web/src/components/settings/settingsSearch.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,6 +152,11 @@ export const SETTINGS_SEARCH_ITEMS = [
title: "Add project starts in",
to: "/settings/general",
},
{
id: "unpin-confirmation",
title: "Unpin confirmation",
to: "/settings/general",
},
{
id: "archive-confirmation",
title: "Archive confirmation",
Expand Down
9 changes: 5 additions & 4 deletions apps/web/src/hooks/useThreadActionMenu.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ export function useThreadActionMenu(input: {
snoozeThread,
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
archiveThread,
deleteThread,
} = useThreadActions();
Expand DownExpand Up@@ -215,9 +215,10 @@ export function useThreadActionMenu(input: {
case "pin":
await reportFailure("Failed to pin thread", () => pinThread(threadRef));
return;
case "unpin":
await reportFailure("Failed to unpin thread", () => unpinThread(threadRef));
case "unpin": {
await reportFailure("Failed to unpin thread", () => confirmAndUnpinThread(threadRef));
return;
}
case "rename":
onStartRename();
return;
Expand DownExpand Up@@ -315,6 +316,7 @@ export function useThreadActionMenu(input: {
changeRequest,
confirmThreadArchive,
confirmThreadDelete,
confirmAndUnpinThread,
copyBranchToClipboard,
copyPathToClipboard,
copyThreadIdToClipboard,
Expand All@@ -328,7 +330,6 @@ export function useThreadActionMenu(input: {
snoozeThread,
threadRef,
timestampFormat,
unpinThread,
unsettleThread,
unsnoozeThread,
updateThreadMetadata,
Expand Down
56 changes: 55 additions & 1 deletion apps/web/src/hooks/useThreadActions.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { EnvironmentId, ThreadId } from "@t3tools/contracts";
import { describe, expect, it } from "vite-plus/test";

import { ThreadArchiveBlockedError } from "./useThreadActions";
import { requestThreadUnpinConfirmation, ThreadArchiveBlockedError } from "./useThreadActions";

describe("ThreadArchiveBlockedError", () => {
it("keeps the blocked thread context with the fixed message", () => {
Expand All@@ -17,3 +17,57 @@ describe("ThreadArchiveBlockedError", () => {
expect(error.message).toBe("Cannot archive a running thread.");
});
});

describe("requestThreadUnpinConfirmation", () => {
it("skips the dialog when confirmation is disabled", async () => {
let callCount = 0;
const result = await requestThreadUnpinConfirmation({
enabled: false,
title: "Pinned thread",
confirm: async () => {
callCount += 1;
return false;
},
});

expect(result).toMatchObject({ _tag: "Success", value: true });
expect(callCount).toBe(0);
});

it("degrades gracefully when dialogs are unavailable", async () => {
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Pinned thread",
confirm: null,
});

expect(result).toMatchObject({ _tag: "Success", value: true });
});

it("uses the thread title and returns the user's decision", async () => {
let message = "";
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Release prep",
confirm: async (nextMessage) => {
message = nextMessage;
return false;
},
});

expect(message).toBe(
'Unpin thread "Release prep"?\nThis will move the thread out of your pinned section.',
);
expect(result).toMatchObject({ _tag: "Success", value: false });
});

it("keeps dialog failures observable", async () => {
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Pinned thread",
confirm: () => Promise.reject(new Error("dialog unavailable")),
});

expect(result._tag).toBe("Failure");
});
});
43 changes: 43 additions & 0 deletions apps/web/src/hooks/useThreadActions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,26 @@ export class ThreadPinReorderUnsupportedError extends Schema.TaggedErrorClass<Th
}
}

export async function requestThreadUnpinConfirmation(input: {
enabled: boolean;
title: string;
confirm: ((message: string) => Promise<boolean>) | null;
}) {
const { confirm } = input;
if (!input.enabled || confirm === null) {
return AsyncResult.success(true);
}

return settlePromise(() =>
confirm(
[
`Unpin thread "${input.title}"?`,
"This will move the thread out of your pinned section.",
].join("\n"),
),
);
}

export function useThreadActions() {
const closeTerminal = useAtomCommand(terminalEnvironment.close);
const archiveThreadMutation = useAtomCommand(threadEnvironment.archive, {
Expand DownExpand Up@@ -177,6 +197,7 @@ export function useThreadActions() {
});
const sidebarThreadSortOrder = useClientSettings((settings) => settings.sidebarThreadSortOrder);
const confirmThreadDelete = useClientSettings((settings) => settings.confirmThreadDelete);
const confirmThreadUnpin = useClientSettings((settings) => settings.confirmThreadUnpin);
const clearComposerDraftForThread = useComposerDraftStore((store) => store.clearDraftThread);
const clearProjectDraftThreadById = useComposerDraftStore(
(store) => store.clearProjectDraftThreadById,
Expand DownExpand Up@@ -590,6 +611,26 @@ export function useThreadActions() {
[unpinThreadMutation],
);

const confirmAndUnpinThread = useCallback(
async (target: ScopedThreadRef) => {
const localApi = readLocalApi();
const resolved = resolveThreadTarget(target);
const confirmationResult = await requestThreadUnpinConfirmation({
enabled: confirmThreadUnpin,
title: resolved?.thread.title ?? "this thread",
confirm: localApi ? (message) => localApi.dialogs.confirm(message) : null,
});
if (confirmationResult._tag === "Failure") {
return confirmationResult;
}
if (!confirmationResult.value) {
return AsyncResult.success(undefined);
}
return unpinThread(target);
},
[confirmThreadUnpin, resolveThreadTarget, unpinThread],
);

const reorderPinnedThread = useCallback(
async (target: ScopedThreadRef, orderKey: string) => {
// Callers (the sidebar drag handler) only enable dragging on
Expand DownExpand Up@@ -709,11 +750,13 @@ export function useThreadActions() {
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
reorderPinnedThread,
}),
[
archiveThread,
confirmAndDeleteThread,
confirmAndUnpinThread,
deleteThread,
pinThread,
reorderPinnedThread,
Expand Down
3 changes: 3 additions & 0 deletions docs/user/thread-sidebar.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,9 @@ Pin a thread from its context menu to keep it in the pinned section above your a
`mod+shift+p` pins or unpins the thread you have open. Pinned threads are shown independently of
their project, including when you connect to more than one environment.

To require confirmation before unpinning, enable **Settings → General → Unpin confirmation**. The
confirmation applies to the sidebar controls, thread menus, and the `mod+shift+p` shortcut.

Pinned threads follow the auto-settle policy in **Settings → General**. Choose exactly one policy:
settle when a pull request merges or closes, settle after a configurable period of inactivity, or
never auto-settle. **Never** leaves every automatic path off, so threads settle only when you choose
Expand Down
6 changes: 6 additions & 0 deletions packages/contracts/src/settings.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,12 @@ describe("ClientSettings sidebar", () => {
);
});

it("keeps unpin confirmation opt-in and patchable", () => {
expect(decodeClientSettings({}).confirmThreadUnpin).toBe(false);
expect(decodeClientSettingsPatch({ confirmThreadUnpin: true }).confirmThreadUnpin).toBe(true);
expect(() => decodeClientSettingsPatch({ confirmThreadUnpin: "yes" })).toThrow();
});

it("allows auto-settle by inactivity to be disabled", () => {
expect(
decodeClientSettings({ sidebarAutoSettleAfterDays: null }).sidebarAutoSettleAfterDays,
Expand Down
2 changes: 2 additions & 0 deletions packages/contracts/src/settings.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,6 +170,7 @@ export const ClientSettingsSchema = Schema.Struct({
confirmQuit: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
confirmThreadArchive: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
confirmThreadDelete: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
confirmThreadUnpin: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
dismissedProviderUpdateNotificationKeys: Schema.Array(TrimmedNonEmptyString).pipe(
Schema.withDecodingDefault(Effect.succeed([])),
),
Expand DownExpand Up@@ -913,6 +914,7 @@ export const ClientSettingsPatch = Schema.Struct({
confirmQuit: Schema.optionalKey(Schema.Boolean),
confirmThreadArchive: Schema.optionalKey(Schema.Boolean),
confirmThreadDelete: Schema.optionalKey(Schema.Boolean),
confirmThreadUnpin: Schema.optionalKey(Schema.Boolean),
diffIgnoreWhitespace: Schema.optionalKey(Schema.Boolean),
environmentIdentificationMode: Schema.optionalKey(EnvironmentIdentificationMode),
glassOpacity: Schema.optionalKey(GlassOpacity),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } 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
1 change: 1 addition & 0 deletions apps/desktop/src/settings/DesktopClientSettings.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ const clientSettings: ClientSettings = {
confirmQuit: true,
confirmThreadArchive: true,
confirmThreadDelete: false,
confirmThreadUnpin: false,
dismissedProviderUpdateNotificationKeys: [],
diffIgnoreWhitespace: true,
environmentIdentificationMode: "artwork",
Expand Down
28 changes: 15 additions & 13 deletions apps/web/src/components/ChatView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1273,7 +1273,7 @@ function ChatViewContent(props: ChatViewProps) {
const threadSyncPhase = routeKind === "server" ? (props.threadSyncPhase ?? null) : null;
const threadDetailLoading = threadSyncPhase === "loading";
const handleNewThread = useNewThreadHandler();
const { settleThread, pinThread, unpinThread } = useThreadActions();
const { settleThread, pinThread, confirmAndUnpinThread } = useThreadActions();
const routeThreadRef = useMemo(
() => scopeThreadRef(environmentId, threadId),
[environmentId, threadId],
Expand DownExpand Up@@ -5146,17 +5146,19 @@ function ChatViewContent(props: ChatViewProps) {
event.stopPropagation();
if (!isServerThread || !activeThreadRef || !supportsPinning) return;
const pinned = activeThreadPinned;
void (pinned ? unpinThread(activeThreadRef) : pinThread(activeThreadRef)).then((result) => {
if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
});
void (pinned ? confirmAndUnpinThread(activeThreadRef) : pinThread(activeThreadRef)).then(
(result) => {
if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
},
);
return;
}

Expand DownExpand Up@@ -5284,7 +5286,7 @@ function ChatViewContent(props: ChatViewProps) {
settleThread,
supportsPinning,
supportsSettlement,
unpinThread,
confirmAndUnpinThread,
toggleRightPanel,
toggleRightPanelMaximized,
toggleTerminalVisibility,
Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1749,7 +1749,7 @@ export default function Sidebar() {
snoozeThread,
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
reorderPinnedThread,
archiveThread,
deleteThread,
Expand DownExpand Up@@ -2709,7 +2709,7 @@ export default function Sidebar() {
const attemptUnpin = useCallback(
(threadRef: ScopedThreadRef) => {
void (async () => {
const result = await unpinThread(threadRef);
const result = await confirmAndUnpinThread(threadRef);
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
const error = squashAtomCommandFailure(result);
toastManager.add(
Expand All@@ -2722,7 +2722,7 @@ export default function Sidebar() {
}
})();
},
[unpinThread],
[confirmAndUnpinThread],
);

const handlePinnedDragEnd = useCallback(
Expand Down
31 changes: 31 additions & 0 deletions apps/web/src/components/settings/SettingsPanels.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,6 +526,9 @@ export function useSettingsRestore(onRestored?: () => void) {
...(settings.addProjectBaseDirectory !== DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory
? ["Add project base directory"]
: []),
...(settings.confirmThreadUnpin !== DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin
? ["Unpin confirmation"]
: []),
...(settings.confirmThreadArchive !== DEFAULT_UNIFIED_SETTINGS.confirmThreadArchive
? ["Archive confirmation"]
: []),
Expand DownExpand Up@@ -554,6 +557,7 @@ export function useSettingsRestore(onRestored?: () => void) {
settings.confirmQuit,
settings.confirmThreadArchive,
settings.confirmThreadDelete,
settings.confirmThreadUnpin,
settings.addProjectBaseDirectory,
settings.defaultThreadEnvMode,
settings.newWorktreesStartFromOrigin,
Expand DownExpand Up@@ -666,6 +670,7 @@ export function useSettingsRestore(onRestored?: () => void) {
addProjectBaseDirectory: DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory,
confirmThreadArchive: DEFAULT_UNIFIED_SETTINGS.confirmThreadArchive,
confirmThreadDelete: DEFAULT_UNIFIED_SETTINGS.confirmThreadDelete,
confirmThreadUnpin: DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin,
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Outdated
Comment thread
cursor[bot] marked this conversation as resolved.
confirmQuit: DEFAULT_UNIFIED_SETTINGS.confirmQuit,
textGenerationModelSelection: DEFAULT_UNIFIED_SETTINGS.textGenerationModelSelection,
fontFamilySans: DEFAULT_UNIFIED_SETTINGS.fontFamilySans,
Expand DownExpand Up@@ -2313,6 +2318,32 @@ export function GeneralSettingsPanel() {
}
/>

<SettingsRow
Comment thread
UtkarshUsername marked this conversation as resolved.
Outdated
{...searchableSetting("unpin-confirmation")}
description="Ask before unpinning a thread from the pinned section."
resetAction={
settings.confirmThreadUnpin !== DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin ? (
<SettingResetButton
label="unpin confirmation"
onClick={() =>
updateSettings({
confirmThreadUnpin: DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin,
})
}
/>
) : null
}
control={
<Switch
checked={settings.confirmThreadUnpin}
onCheckedChange={(checked) =>
updateSettings({ confirmThreadUnpin: Boolean(checked) })
}
aria-label="Confirm thread unpinning"
/>
}
/>

<SettingsRow
{...searchableSetting("archive-confirmation")}
description="Require a second click on the inline archive action before a thread is archived."
Expand Down
8 changes: 8 additions & 0 deletions apps/web/src/components/settings/settingsSearch.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,14 @@ describe("searchSettings", () => {
]);
});

it("lists thread confirmations in panel order", () => {
expect(searchSettings("confirmation").map((item) => item.id)).toEqual([
"unpin-confirmation",
"archive-confirmation",
"delete-confirmation",
]);
});

it("returns no results for an empty query", () => {
expect(searchSettings(" ", ITEMS)).toEqual([]);
});
Expand Down
5 changes: 5 additions & 0 deletions apps/web/src/components/settings/settingsSearch.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,6 +152,11 @@ export const SETTINGS_SEARCH_ITEMS = [
title: "Add project starts in",
to: "/settings/general",
},
{
id: "unpin-confirmation",
title: "Unpin confirmation",
to: "/settings/general",
},
{
id: "archive-confirmation",
title: "Archive confirmation",
Expand Down
9 changes: 5 additions & 4 deletions apps/web/src/hooks/useThreadActionMenu.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ export function useThreadActionMenu(input: {
snoozeThread,
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
archiveThread,
deleteThread,
} = useThreadActions();
Expand DownExpand Up@@ -215,9 +215,10 @@ export function useThreadActionMenu(input: {
case "pin":
await reportFailure("Failed to pin thread", () => pinThread(threadRef));
return;
case "unpin":
await reportFailure("Failed to unpin thread", () => unpinThread(threadRef));
case "unpin": {
await reportFailure("Failed to unpin thread", () => confirmAndUnpinThread(threadRef));
return;
}
case "rename":
onStartRename();
return;
Expand DownExpand Up@@ -315,6 +316,7 @@ export function useThreadActionMenu(input: {
changeRequest,
confirmThreadArchive,
confirmThreadDelete,
confirmAndUnpinThread,
copyBranchToClipboard,
copyPathToClipboard,
copyThreadIdToClipboard,
Expand All@@ -328,7 +330,6 @@ export function useThreadActionMenu(input: {
snoozeThread,
threadRef,
timestampFormat,
unpinThread,
unsettleThread,
unsnoozeThread,
updateThreadMetadata,
Expand Down
56 changes: 55 additions & 1 deletion apps/web/src/hooks/useThreadActions.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { EnvironmentId, ThreadId } from "@t3tools/contracts";
import { describe, expect, it } from "vite-plus/test";

import { ThreadArchiveBlockedError } from "./useThreadActions";
import { requestThreadUnpinConfirmation, ThreadArchiveBlockedError } from "./useThreadActions";

describe("ThreadArchiveBlockedError", () => {
it("keeps the blocked thread context with the fixed message", () => {
Expand All@@ -17,3 +17,57 @@ describe("ThreadArchiveBlockedError", () => {
expect(error.message).toBe("Cannot archive a running thread.");
});
});

describe("requestThreadUnpinConfirmation", () => {
it("skips the dialog when confirmation is disabled", async () => {
let callCount = 0;
const result = await requestThreadUnpinConfirmation({
enabled: false,
title: "Pinned thread",
confirm: async () => {
callCount += 1;
return false;
},
});

expect(result).toMatchObject({ _tag: "Success", value: true });
expect(callCount).toBe(0);
});

it("degrades gracefully when dialogs are unavailable", async () => {
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Pinned thread",
confirm: null,
});

expect(result).toMatchObject({ _tag: "Success", value: true });
});

it("uses the thread title and returns the user's decision", async () => {
let message = "";
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Release prep",
confirm: async (nextMessage) => {
message = nextMessage;
return false;
},
});

expect(message).toBe(
'Unpin thread "Release prep"?\nThis will move the thread out of your pinned section.',
);
expect(result).toMatchObject({ _tag: "Success", value: false });
});

it("keeps dialog failures observable", async () => {
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Pinned thread",
confirm: () => Promise.reject(new Error("dialog unavailable")),
});

expect(result._tag).toBe("Failure");
});
});
43 changes: 43 additions & 0 deletions apps/web/src/hooks/useThreadActions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,26 @@ export class ThreadPinReorderUnsupportedError extends Schema.TaggedErrorClass<Th
}
}

export async function requestThreadUnpinConfirmation(input: {
enabled: boolean;
title: string;
confirm: ((message: string) => Promise<boolean>) | null;
}) {
const { confirm } = input;
if (!input.enabled || confirm === null) {
return AsyncResult.success(true);
}

return settlePromise(() =>
confirm(
[
`Unpin thread "${input.title}"?`,
"This will move the thread out of your pinned section.",
].join("\n"),
),
);
}

export function useThreadActions() {
const closeTerminal = useAtomCommand(terminalEnvironment.close);
const archiveThreadMutation = useAtomCommand(threadEnvironment.archive, {
Expand DownExpand Up@@ -177,6 +197,7 @@ export function useThreadActions() {
});
const sidebarThreadSortOrder = useClientSettings((settings) => settings.sidebarThreadSortOrder);
const confirmThreadDelete = useClientSettings((settings) => settings.confirmThreadDelete);
const confirmThreadUnpin = useClientSettings((settings) => settings.confirmThreadUnpin);
const clearComposerDraftForThread = useComposerDraftStore((store) => store.clearDraftThread);
const clearProjectDraftThreadById = useComposerDraftStore(
(store) => store.clearProjectDraftThreadById,
Expand DownExpand Up@@ -590,6 +611,26 @@ export function useThreadActions() {
[unpinThreadMutation],
);

const confirmAndUnpinThread = useCallback(
async (target: ScopedThreadRef) => {
const localApi = readLocalApi();
const resolved = resolveThreadTarget(target);
const confirmationResult = await requestThreadUnpinConfirmation({
enabled: confirmThreadUnpin,
title: resolved?.thread.title ?? "this thread",
confirm: localApi ? (message) => localApi.dialogs.confirm(message) : null,
});
if (confirmationResult._tag === "Failure") {
return confirmationResult;
}
if (!confirmationResult.value) {
return AsyncResult.success(undefined);
}
return unpinThread(target);
},
[confirmThreadUnpin, resolveThreadTarget, unpinThread],
);

const reorderPinnedThread = useCallback(
async (target: ScopedThreadRef, orderKey: string) => {
// Callers (the sidebar drag handler) only enable dragging on
Expand DownExpand Up@@ -709,11 +750,13 @@ export function useThreadActions() {
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
reorderPinnedThread,
}),
[
archiveThread,
confirmAndDeleteThread,
confirmAndUnpinThread,
deleteThread,
pinThread,
reorderPinnedThread,
Expand Down
3 changes: 3 additions & 0 deletions docs/user/thread-sidebar.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,9 @@ Pin a thread from its context menu to keep it in the pinned section above your a
`mod+shift+p` pins or unpins the thread you have open. Pinned threads are shown independently of
their project, including when you connect to more than one environment.

To require confirmation before unpinning, enable **Settings → General → Unpin confirmation**. The
confirmation applies to the sidebar controls, thread menus, and the `mod+shift+p` shortcut.

Pinned threads follow the auto-settle policy in **Settings → General**. Choose exactly one policy:
settle when a pull request merges or closes, settle after a configurable period of inactivity, or
never auto-settle. **Never** leaves every automatic path off, so threads settle only when you choose
Expand Down
6 changes: 6 additions & 0 deletions packages/contracts/src/settings.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,12 @@ describe("ClientSettings sidebar", () => {
);
});

it("keeps unpin confirmation opt-in and patchable", () => {
expect(decodeClientSettings({}).confirmThreadUnpin).toBe(false);
expect(decodeClientSettingsPatch({ confirmThreadUnpin: true }).confirmThreadUnpin).toBe(true);
expect(() => decodeClientSettingsPatch({ confirmThreadUnpin: "yes" })).toThrow();
});

it("allows auto-settle by inactivity to be disabled", () => {
expect(
decodeClientSettings({ sidebarAutoSettleAfterDays: null }).sidebarAutoSettleAfterDays,
Expand Down
2 changes: 2 additions & 0 deletions packages/contracts/src/settings.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,6 +170,7 @@ export const ClientSettingsSchema = Schema.Struct({
confirmQuit: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
confirmThreadArchive: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
confirmThreadDelete: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
confirmThreadUnpin: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
dismissedProviderUpdateNotificationKeys: Schema.Array(TrimmedNonEmptyString).pipe(
Schema.withDecodingDefault(Effect.succeed([])),
),
Expand DownExpand Up@@ -913,6 +914,7 @@ export const ClientSettingsPatch = Schema.Struct({
confirmQuit: Schema.optionalKey(Schema.Boolean),
confirmThreadArchive: Schema.optionalKey(Schema.Boolean),
confirmThreadDelete: Schema.optionalKey(Schema.Boolean),
confirmThreadUnpin: Schema.optionalKey(Schema.Boolean),
diffIgnoreWhitespace: Schema.optionalKey(Schema.Boolean),
environmentIdentificationMode: Schema.optionalKey(EnvironmentIdentificationMode),
glassOpacity: Schema.optionalKey(GlassOpacity),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } 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
1 change: 1 addition & 0 deletions apps/desktop/src/settings/DesktopClientSettings.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ const clientSettings: ClientSettings = {
confirmQuit: true,
confirmThreadArchive: true,
confirmThreadDelete: false,
confirmThreadUnpin: false,
dismissedProviderUpdateNotificationKeys: [],
diffIgnoreWhitespace: true,
environmentIdentificationMode: "artwork",
Expand Down
28 changes: 15 additions & 13 deletions apps/web/src/components/ChatView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1273,7 +1273,7 @@ function ChatViewContent(props: ChatViewProps) {
const threadSyncPhase = routeKind === "server" ? (props.threadSyncPhase ?? null) : null;
const threadDetailLoading = threadSyncPhase === "loading";
const handleNewThread = useNewThreadHandler();
const { settleThread, pinThread, unpinThread } = useThreadActions();
const { settleThread, pinThread, confirmAndUnpinThread } = useThreadActions();
const routeThreadRef = useMemo(
() => scopeThreadRef(environmentId, threadId),
[environmentId, threadId],
Expand DownExpand Up@@ -5146,17 +5146,19 @@ function ChatViewContent(props: ChatViewProps) {
event.stopPropagation();
if (!isServerThread || !activeThreadRef || !supportsPinning) return;
const pinned = activeThreadPinned;
void (pinned ? unpinThread(activeThreadRef) : pinThread(activeThreadRef)).then((result) => {
if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
});
void (pinned ? confirmAndUnpinThread(activeThreadRef) : pinThread(activeThreadRef)).then(
(result) => {
if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
},
);
return;
}

Expand DownExpand Up@@ -5284,7 +5286,7 @@ function ChatViewContent(props: ChatViewProps) {
settleThread,
supportsPinning,
supportsSettlement,
unpinThread,
confirmAndUnpinThread,
toggleRightPanel,
toggleRightPanelMaximized,
toggleTerminalVisibility,
Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1749,7 +1749,7 @@ export default function Sidebar() {
snoozeThread,
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
reorderPinnedThread,
archiveThread,
deleteThread,
Expand DownExpand Up@@ -2709,7 +2709,7 @@ export default function Sidebar() {
const attemptUnpin = useCallback(
(threadRef: ScopedThreadRef) => {
void (async () => {
const result = await unpinThread(threadRef);
const result = await confirmAndUnpinThread(threadRef);
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
const error = squashAtomCommandFailure(result);
toastManager.add(
Expand All@@ -2722,7 +2722,7 @@ export default function Sidebar() {
}
})();
},
[unpinThread],
[confirmAndUnpinThread],
);

const handlePinnedDragEnd = useCallback(
Expand Down
31 changes: 31 additions & 0 deletions apps/web/src/components/settings/SettingsPanels.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,6 +526,9 @@ export function useSettingsRestore(onRestored?: () => void) {
...(settings.addProjectBaseDirectory !== DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory
? ["Add project base directory"]
: []),
...(settings.confirmThreadUnpin !== DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin
? ["Unpin confirmation"]
: []),
...(settings.confirmThreadArchive !== DEFAULT_UNIFIED_SETTINGS.confirmThreadArchive
? ["Archive confirmation"]
: []),
Expand DownExpand Up@@ -554,6 +557,7 @@ export function useSettingsRestore(onRestored?: () => void) {
settings.confirmQuit,
settings.confirmThreadArchive,
settings.confirmThreadDelete,
settings.confirmThreadUnpin,
settings.addProjectBaseDirectory,
settings.defaultThreadEnvMode,
settings.newWorktreesStartFromOrigin,
Expand DownExpand Up@@ -666,6 +670,7 @@ export function useSettingsRestore(onRestored?: () => void) {
addProjectBaseDirectory: DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory,
confirmThreadArchive: DEFAULT_UNIFIED_SETTINGS.confirmThreadArchive,
confirmThreadDelete: DEFAULT_UNIFIED_SETTINGS.confirmThreadDelete,
confirmThreadUnpin: DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin,
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Outdated
Comment thread
cursor[bot] marked this conversation as resolved.
confirmQuit: DEFAULT_UNIFIED_SETTINGS.confirmQuit,
textGenerationModelSelection: DEFAULT_UNIFIED_SETTINGS.textGenerationModelSelection,
fontFamilySans: DEFAULT_UNIFIED_SETTINGS.fontFamilySans,
Expand DownExpand Up@@ -2313,6 +2318,32 @@ export function GeneralSettingsPanel() {
}
/>

<SettingsRow
Comment thread
UtkarshUsername marked this conversation as resolved.
Outdated
{...searchableSetting("unpin-confirmation")}
description="Ask before unpinning a thread from the pinned section."
resetAction={
settings.confirmThreadUnpin !== DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin ? (
<SettingResetButton
label="unpin confirmation"
onClick={() =>
updateSettings({
confirmThreadUnpin: DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin,
})
}
/>
) : null
}
control={
<Switch
checked={settings.confirmThreadUnpin}
onCheckedChange={(checked) =>
updateSettings({ confirmThreadUnpin: Boolean(checked) })
}
aria-label="Confirm thread unpinning"
/>
}
/>

<SettingsRow
{...searchableSetting("archive-confirmation")}
description="Require a second click on the inline archive action before a thread is archived."
Expand Down
8 changes: 8 additions & 0 deletions apps/web/src/components/settings/settingsSearch.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,14 @@ describe("searchSettings", () => {
]);
});

it("lists thread confirmations in panel order", () => {
expect(searchSettings("confirmation").map((item) => item.id)).toEqual([
"unpin-confirmation",
"archive-confirmation",
"delete-confirmation",
]);
});

it("returns no results for an empty query", () => {
expect(searchSettings(" ", ITEMS)).toEqual([]);
});
Expand Down
5 changes: 5 additions & 0 deletions apps/web/src/components/settings/settingsSearch.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,6 +152,11 @@ export const SETTINGS_SEARCH_ITEMS = [
title: "Add project starts in",
to: "/settings/general",
},
{
id: "unpin-confirmation",
title: "Unpin confirmation",
to: "/settings/general",
},
{
id: "archive-confirmation",
title: "Archive confirmation",
Expand Down
9 changes: 5 additions & 4 deletions apps/web/src/hooks/useThreadActionMenu.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ export function useThreadActionMenu(input: {
snoozeThread,
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
archiveThread,
deleteThread,
} = useThreadActions();
Expand DownExpand Up@@ -215,9 +215,10 @@ export function useThreadActionMenu(input: {
case "pin":
await reportFailure("Failed to pin thread", () => pinThread(threadRef));
return;
case "unpin":
await reportFailure("Failed to unpin thread", () => unpinThread(threadRef));
case "unpin": {
await reportFailure("Failed to unpin thread", () => confirmAndUnpinThread(threadRef));
return;
}
case "rename":
onStartRename();
return;
Expand DownExpand Up@@ -315,6 +316,7 @@ export function useThreadActionMenu(input: {
changeRequest,
confirmThreadArchive,
confirmThreadDelete,
confirmAndUnpinThread,
copyBranchToClipboard,
copyPathToClipboard,
copyThreadIdToClipboard,
Expand All@@ -328,7 +330,6 @@ export function useThreadActionMenu(input: {
snoozeThread,
threadRef,
timestampFormat,
unpinThread,
unsettleThread,
unsnoozeThread,
updateThreadMetadata,
Expand Down
56 changes: 55 additions & 1 deletion apps/web/src/hooks/useThreadActions.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { EnvironmentId, ThreadId } from "@t3tools/contracts";
import { describe, expect, it } from "vite-plus/test";

import { ThreadArchiveBlockedError } from "./useThreadActions";
import { requestThreadUnpinConfirmation, ThreadArchiveBlockedError } from "./useThreadActions";

describe("ThreadArchiveBlockedError", () => {
it("keeps the blocked thread context with the fixed message", () => {
Expand All@@ -17,3 +17,57 @@ describe("ThreadArchiveBlockedError", () => {
expect(error.message).toBe("Cannot archive a running thread.");
});
});

describe("requestThreadUnpinConfirmation", () => {
it("skips the dialog when confirmation is disabled", async () => {
let callCount = 0;
const result = await requestThreadUnpinConfirmation({
enabled: false,
title: "Pinned thread",
confirm: async () => {
callCount += 1;
return false;
},
});

expect(result).toMatchObject({ _tag: "Success", value: true });
expect(callCount).toBe(0);
});

it("degrades gracefully when dialogs are unavailable", async () => {
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Pinned thread",
confirm: null,
});

expect(result).toMatchObject({ _tag: "Success", value: true });
});

it("uses the thread title and returns the user's decision", async () => {
let message = "";
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Release prep",
confirm: async (nextMessage) => {
message = nextMessage;
return false;
},
});

expect(message).toBe(
'Unpin thread "Release prep"?\nThis will move the thread out of your pinned section.',
);
expect(result).toMatchObject({ _tag: "Success", value: false });
});

it("keeps dialog failures observable", async () => {
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Pinned thread",
confirm: () => Promise.reject(new Error("dialog unavailable")),
});

expect(result._tag).toBe("Failure");
});
});
43 changes: 43 additions & 0 deletions apps/web/src/hooks/useThreadActions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,26 @@ export class ThreadPinReorderUnsupportedError extends Schema.TaggedErrorClass<Th
}
}

export async function requestThreadUnpinConfirmation(input: {
enabled: boolean;
title: string;
confirm: ((message: string) => Promise<boolean>) | null;
}) {
const { confirm } = input;
if (!input.enabled || confirm === null) {
return AsyncResult.success(true);
}

return settlePromise(() =>
confirm(
[
`Unpin thread "${input.title}"?`,
"This will move the thread out of your pinned section.",
].join("\n"),
),
);
}

export function useThreadActions() {
const closeTerminal = useAtomCommand(terminalEnvironment.close);
const archiveThreadMutation = useAtomCommand(threadEnvironment.archive, {
Expand DownExpand Up@@ -177,6 +197,7 @@ export function useThreadActions() {
});
const sidebarThreadSortOrder = useClientSettings((settings) => settings.sidebarThreadSortOrder);
const confirmThreadDelete = useClientSettings((settings) => settings.confirmThreadDelete);
const confirmThreadUnpin = useClientSettings((settings) => settings.confirmThreadUnpin);
const clearComposerDraftForThread = useComposerDraftStore((store) => store.clearDraftThread);
const clearProjectDraftThreadById = useComposerDraftStore(
(store) => store.clearProjectDraftThreadById,
Expand DownExpand Up@@ -590,6 +611,26 @@ export function useThreadActions() {
[unpinThreadMutation],
);

const confirmAndUnpinThread = useCallback(
async (target: ScopedThreadRef) => {
const localApi = readLocalApi();
const resolved = resolveThreadTarget(target);
const confirmationResult = await requestThreadUnpinConfirmation({
enabled: confirmThreadUnpin,
title: resolved?.thread.title ?? "this thread",
confirm: localApi ? (message) => localApi.dialogs.confirm(message) : null,
});
if (confirmationResult._tag === "Failure") {
return confirmationResult;
}
if (!confirmationResult.value) {
return AsyncResult.success(undefined);
}
return unpinThread(target);
},
[confirmThreadUnpin, resolveThreadTarget, unpinThread],
);

const reorderPinnedThread = useCallback(
async (target: ScopedThreadRef, orderKey: string) => {
// Callers (the sidebar drag handler) only enable dragging on
Expand DownExpand Up@@ -709,11 +750,13 @@ export function useThreadActions() {
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
reorderPinnedThread,
}),
[
archiveThread,
confirmAndDeleteThread,
confirmAndUnpinThread,
deleteThread,
pinThread,
reorderPinnedThread,
Expand Down
3 changes: 3 additions & 0 deletions docs/user/thread-sidebar.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,9 @@ Pin a thread from its context menu to keep it in the pinned section above your a
`mod+shift+p` pins or unpins the thread you have open. Pinned threads are shown independently of
their project, including when you connect to more than one environment.

To require confirmation before unpinning, enable **Settings → General → Unpin confirmation**. The
confirmation applies to the sidebar controls, thread menus, and the `mod+shift+p` shortcut.

Pinned threads follow the auto-settle policy in **Settings → General**. Choose exactly one policy:
settle when a pull request merges or closes, settle after a configurable period of inactivity, or
never auto-settle. **Never** leaves every automatic path off, so threads settle only when you choose
Expand Down
6 changes: 6 additions & 0 deletions packages/contracts/src/settings.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,12 @@ describe("ClientSettings sidebar", () => {
);
});

it("keeps unpin confirmation opt-in and patchable", () => {
expect(decodeClientSettings({}).confirmThreadUnpin).toBe(false);
expect(decodeClientSettingsPatch({ confirmThreadUnpin: true }).confirmThreadUnpin).toBe(true);
expect(() => decodeClientSettingsPatch({ confirmThreadUnpin: "yes" })).toThrow();
});

it("allows auto-settle by inactivity to be disabled", () => {
expect(
decodeClientSettings({ sidebarAutoSettleAfterDays: null }).sidebarAutoSettleAfterDays,
Expand Down
2 changes: 2 additions & 0 deletions packages/contracts/src/settings.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,6 +170,7 @@ export const ClientSettingsSchema = Schema.Struct({
confirmQuit: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
confirmThreadArchive: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
confirmThreadDelete: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
confirmThreadUnpin: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
dismissedProviderUpdateNotificationKeys: Schema.Array(TrimmedNonEmptyString).pipe(
Schema.withDecodingDefault(Effect.succeed([])),
),
Expand DownExpand Up@@ -913,6 +914,7 @@ export const ClientSettingsPatch = Schema.Struct({
confirmQuit: Schema.optionalKey(Schema.Boolean),
confirmThreadArchive: Schema.optionalKey(Schema.Boolean),
confirmThreadDelete: Schema.optionalKey(Schema.Boolean),
confirmThreadUnpin: Schema.optionalKey(Schema.Boolean),
diffIgnoreWhitespace: Schema.optionalKey(Schema.Boolean),
environmentIdentificationMode: Schema.optionalKey(EnvironmentIdentificationMode),
glassOpacity: Schema.optionalKey(GlassOpacity),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } 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
1 change: 1 addition & 0 deletions apps/desktop/src/settings/DesktopClientSettings.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ const clientSettings: ClientSettings = {
confirmQuit: true,
confirmThreadArchive: true,
confirmThreadDelete: false,
confirmThreadUnpin: false,
dismissedProviderUpdateNotificationKeys: [],
diffIgnoreWhitespace: true,
environmentIdentificationMode: "artwork",
Expand Down
28 changes: 15 additions & 13 deletions apps/web/src/components/ChatView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1273,7 +1273,7 @@ function ChatViewContent(props: ChatViewProps) {
const threadSyncPhase = routeKind === "server" ? (props.threadSyncPhase ?? null) : null;
const threadDetailLoading = threadSyncPhase === "loading";
const handleNewThread = useNewThreadHandler();
const { settleThread, pinThread, unpinThread } = useThreadActions();
const { settleThread, pinThread, confirmAndUnpinThread } = useThreadActions();
const routeThreadRef = useMemo(
() => scopeThreadRef(environmentId, threadId),
[environmentId, threadId],
Expand DownExpand Up@@ -5146,17 +5146,19 @@ function ChatViewContent(props: ChatViewProps) {
event.stopPropagation();
if (!isServerThread || !activeThreadRef || !supportsPinning) return;
const pinned = activeThreadPinned;
void (pinned ? unpinThread(activeThreadRef) : pinThread(activeThreadRef)).then((result) => {
if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
});
void (pinned ? confirmAndUnpinThread(activeThreadRef) : pinThread(activeThreadRef)).then(
(result) => {
if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
},
);
return;
}

Expand DownExpand Up@@ -5284,7 +5286,7 @@ function ChatViewContent(props: ChatViewProps) {
settleThread,
supportsPinning,
supportsSettlement,
unpinThread,
confirmAndUnpinThread,
toggleRightPanel,
toggleRightPanelMaximized,
toggleTerminalVisibility,
Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1749,7 +1749,7 @@ export default function Sidebar() {
snoozeThread,
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
reorderPinnedThread,
archiveThread,
deleteThread,
Expand DownExpand Up@@ -2709,7 +2709,7 @@ export default function Sidebar() {
const attemptUnpin = useCallback(
(threadRef: ScopedThreadRef) => {
void (async () => {
const result = await unpinThread(threadRef);
const result = await confirmAndUnpinThread(threadRef);
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
const error = squashAtomCommandFailure(result);
toastManager.add(
Expand All@@ -2722,7 +2722,7 @@ export default function Sidebar() {
}
})();
},
[unpinThread],
[confirmAndUnpinThread],
);

const handlePinnedDragEnd = useCallback(
Expand Down
31 changes: 31 additions & 0 deletions apps/web/src/components/settings/SettingsPanels.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,6 +526,9 @@ export function useSettingsRestore(onRestored?: () => void) {
...(settings.addProjectBaseDirectory !== DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory
? ["Add project base directory"]
: []),
...(settings.confirmThreadUnpin !== DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin
? ["Unpin confirmation"]
: []),
...(settings.confirmThreadArchive !== DEFAULT_UNIFIED_SETTINGS.confirmThreadArchive
? ["Archive confirmation"]
: []),
Expand DownExpand Up@@ -554,6 +557,7 @@ export function useSettingsRestore(onRestored?: () => void) {
settings.confirmQuit,
settings.confirmThreadArchive,
settings.confirmThreadDelete,
settings.confirmThreadUnpin,
settings.addProjectBaseDirectory,
settings.defaultThreadEnvMode,
settings.newWorktreesStartFromOrigin,
Expand DownExpand Up@@ -666,6 +670,7 @@ export function useSettingsRestore(onRestored?: () => void) {
addProjectBaseDirectory: DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory,
confirmThreadArchive: DEFAULT_UNIFIED_SETTINGS.confirmThreadArchive,
confirmThreadDelete: DEFAULT_UNIFIED_SETTINGS.confirmThreadDelete,
confirmThreadUnpin: DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin,
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Outdated
Comment thread
cursor[bot] marked this conversation as resolved.
confirmQuit: DEFAULT_UNIFIED_SETTINGS.confirmQuit,
textGenerationModelSelection: DEFAULT_UNIFIED_SETTINGS.textGenerationModelSelection,
fontFamilySans: DEFAULT_UNIFIED_SETTINGS.fontFamilySans,
Expand DownExpand Up@@ -2313,6 +2318,32 @@ export function GeneralSettingsPanel() {
}
/>

<SettingsRow
Comment thread
UtkarshUsername marked this conversation as resolved.
Outdated
{...searchableSetting("unpin-confirmation")}
description="Ask before unpinning a thread from the pinned section."
resetAction={
settings.confirmThreadUnpin !== DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin ? (
<SettingResetButton
label="unpin confirmation"
onClick={() =>
updateSettings({
confirmThreadUnpin: DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin,
})
}
/>
) : null
}
control={
<Switch
checked={settings.confirmThreadUnpin}
onCheckedChange={(checked) =>
updateSettings({ confirmThreadUnpin: Boolean(checked) })
}
aria-label="Confirm thread unpinning"
/>
}
/>

<SettingsRow
{...searchableSetting("archive-confirmation")}
description="Require a second click on the inline archive action before a thread is archived."
Expand Down
8 changes: 8 additions & 0 deletions apps/web/src/components/settings/settingsSearch.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,14 @@ describe("searchSettings", () => {
]);
});

it("lists thread confirmations in panel order", () => {
expect(searchSettings("confirmation").map((item) => item.id)).toEqual([
"unpin-confirmation",
"archive-confirmation",
"delete-confirmation",
]);
});

it("returns no results for an empty query", () => {
expect(searchSettings(" ", ITEMS)).toEqual([]);
});
Expand Down
5 changes: 5 additions & 0 deletions apps/web/src/components/settings/settingsSearch.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,6 +152,11 @@ export const SETTINGS_SEARCH_ITEMS = [
title: "Add project starts in",
to: "/settings/general",
},
{
id: "unpin-confirmation",
title: "Unpin confirmation",
to: "/settings/general",
},
{
id: "archive-confirmation",
title: "Archive confirmation",
Expand Down
9 changes: 5 additions & 4 deletions apps/web/src/hooks/useThreadActionMenu.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ export function useThreadActionMenu(input: {
snoozeThread,
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
archiveThread,
deleteThread,
} = useThreadActions();
Expand DownExpand Up@@ -215,9 +215,10 @@ export function useThreadActionMenu(input: {
case "pin":
await reportFailure("Failed to pin thread", () => pinThread(threadRef));
return;
case "unpin":
await reportFailure("Failed to unpin thread", () => unpinThread(threadRef));
case "unpin": {
await reportFailure("Failed to unpin thread", () => confirmAndUnpinThread(threadRef));
return;
}
case "rename":
onStartRename();
return;
Expand DownExpand Up@@ -315,6 +316,7 @@ export function useThreadActionMenu(input: {
changeRequest,
confirmThreadArchive,
confirmThreadDelete,
confirmAndUnpinThread,
copyBranchToClipboard,
copyPathToClipboard,
copyThreadIdToClipboard,
Expand All@@ -328,7 +330,6 @@ export function useThreadActionMenu(input: {
snoozeThread,
threadRef,
timestampFormat,
unpinThread,
unsettleThread,
unsnoozeThread,
updateThreadMetadata,
Expand Down
56 changes: 55 additions & 1 deletion apps/web/src/hooks/useThreadActions.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { EnvironmentId, ThreadId } from "@t3tools/contracts";
import { describe, expect, it } from "vite-plus/test";

import { ThreadArchiveBlockedError } from "./useThreadActions";
import { requestThreadUnpinConfirmation, ThreadArchiveBlockedError } from "./useThreadActions";

describe("ThreadArchiveBlockedError", () => {
it("keeps the blocked thread context with the fixed message", () => {
Expand All@@ -17,3 +17,57 @@ describe("ThreadArchiveBlockedError", () => {
expect(error.message).toBe("Cannot archive a running thread.");
});
});

describe("requestThreadUnpinConfirmation", () => {
it("skips the dialog when confirmation is disabled", async () => {
let callCount = 0;
const result = await requestThreadUnpinConfirmation({
enabled: false,
title: "Pinned thread",
confirm: async () => {
callCount += 1;
return false;
},
});

expect(result).toMatchObject({ _tag: "Success", value: true });
expect(callCount).toBe(0);
});

it("degrades gracefully when dialogs are unavailable", async () => {
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Pinned thread",
confirm: null,
});

expect(result).toMatchObject({ _tag: "Success", value: true });
});

it("uses the thread title and returns the user's decision", async () => {
let message = "";
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Release prep",
confirm: async (nextMessage) => {
message = nextMessage;
return false;
},
});

expect(message).toBe(
'Unpin thread "Release prep"?\nThis will move the thread out of your pinned section.',
);
expect(result).toMatchObject({ _tag: "Success", value: false });
});

it("keeps dialog failures observable", async () => {
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Pinned thread",
confirm: () => Promise.reject(new Error("dialog unavailable")),
});

expect(result._tag).toBe("Failure");
});
});
43 changes: 43 additions & 0 deletions apps/web/src/hooks/useThreadActions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,26 @@ export class ThreadPinReorderUnsupportedError extends Schema.TaggedErrorClass<Th
}
}

export async function requestThreadUnpinConfirmation(input: {
enabled: boolean;
title: string;
confirm: ((message: string) => Promise<boolean>) | null;
}) {
const { confirm } = input;
if (!input.enabled || confirm === null) {
return AsyncResult.success(true);
}

return settlePromise(() =>
confirm(
[
`Unpin thread "${input.title}"?`,
"This will move the thread out of your pinned section.",
].join("\n"),
),
);
}

export function useThreadActions() {
const closeTerminal = useAtomCommand(terminalEnvironment.close);
const archiveThreadMutation = useAtomCommand(threadEnvironment.archive, {
Expand DownExpand Up@@ -177,6 +197,7 @@ export function useThreadActions() {
});
const sidebarThreadSortOrder = useClientSettings((settings) => settings.sidebarThreadSortOrder);
const confirmThreadDelete = useClientSettings((settings) => settings.confirmThreadDelete);
const confirmThreadUnpin = useClientSettings((settings) => settings.confirmThreadUnpin);
const clearComposerDraftForThread = useComposerDraftStore((store) => store.clearDraftThread);
const clearProjectDraftThreadById = useComposerDraftStore(
(store) => store.clearProjectDraftThreadById,
Expand DownExpand Up@@ -590,6 +611,26 @@ export function useThreadActions() {
[unpinThreadMutation],
);

const confirmAndUnpinThread = useCallback(
async (target: ScopedThreadRef) => {
const localApi = readLocalApi();
const resolved = resolveThreadTarget(target);
const confirmationResult = await requestThreadUnpinConfirmation({
enabled: confirmThreadUnpin,
title: resolved?.thread.title ?? "this thread",
confirm: localApi ? (message) => localApi.dialogs.confirm(message) : null,
});
if (confirmationResult._tag === "Failure") {
return confirmationResult;
}
if (!confirmationResult.value) {
return AsyncResult.success(undefined);
}
return unpinThread(target);
},
[confirmThreadUnpin, resolveThreadTarget, unpinThread],
);

const reorderPinnedThread = useCallback(
async (target: ScopedThreadRef, orderKey: string) => {
// Callers (the sidebar drag handler) only enable dragging on
Expand DownExpand Up@@ -709,11 +750,13 @@ export function useThreadActions() {
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
reorderPinnedThread,
}),
[
archiveThread,
confirmAndDeleteThread,
confirmAndUnpinThread,
deleteThread,
pinThread,
reorderPinnedThread,
Expand Down
3 changes: 3 additions & 0 deletions docs/user/thread-sidebar.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,9 @@ Pin a thread from its context menu to keep it in the pinned section above your a
`mod+shift+p` pins or unpins the thread you have open. Pinned threads are shown independently of
their project, including when you connect to more than one environment.

To require confirmation before unpinning, enable **Settings → General → Unpin confirmation**. The
confirmation applies to the sidebar controls, thread menus, and the `mod+shift+p` shortcut.

Pinned threads follow the auto-settle policy in **Settings → General**. Choose exactly one policy:
settle when a pull request merges or closes, settle after a configurable period of inactivity, or
never auto-settle. **Never** leaves every automatic path off, so threads settle only when you choose
Expand Down
6 changes: 6 additions & 0 deletions packages/contracts/src/settings.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,12 @@ describe("ClientSettings sidebar", () => {
);
});

it("keeps unpin confirmation opt-in and patchable", () => {
expect(decodeClientSettings({}).confirmThreadUnpin).toBe(false);
expect(decodeClientSettingsPatch({ confirmThreadUnpin: true }).confirmThreadUnpin).toBe(true);
expect(() => decodeClientSettingsPatch({ confirmThreadUnpin: "yes" })).toThrow();
});

it("allows auto-settle by inactivity to be disabled", () => {
expect(
decodeClientSettings({ sidebarAutoSettleAfterDays: null }).sidebarAutoSettleAfterDays,
Expand Down
2 changes: 2 additions & 0 deletions packages/contracts/src/settings.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,6 +170,7 @@ export const ClientSettingsSchema = Schema.Struct({
confirmQuit: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
confirmThreadArchive: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
confirmThreadDelete: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
confirmThreadUnpin: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
dismissedProviderUpdateNotificationKeys: Schema.Array(TrimmedNonEmptyString).pipe(
Schema.withDecodingDefault(Effect.succeed([])),
),
Expand DownExpand Up@@ -913,6 +914,7 @@ export const ClientSettingsPatch = Schema.Struct({
confirmQuit: Schema.optionalKey(Schema.Boolean),
confirmThreadArchive: Schema.optionalKey(Schema.Boolean),
confirmThreadDelete: Schema.optionalKey(Schema.Boolean),
confirmThreadUnpin: Schema.optionalKey(Schema.Boolean),
diffIgnoreWhitespace: Schema.optionalKey(Schema.Boolean),
environmentIdentificationMode: Schema.optionalKey(EnvironmentIdentificationMode),
glassOpacity: Schema.optionalKey(GlassOpacity),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } 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
1 change: 1 addition & 0 deletions apps/desktop/src/settings/DesktopClientSettings.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ const clientSettings: ClientSettings = {
confirmQuit: true,
confirmThreadArchive: true,
confirmThreadDelete: false,
confirmThreadUnpin: false,
dismissedProviderUpdateNotificationKeys: [],
diffIgnoreWhitespace: true,
environmentIdentificationMode: "artwork",
Expand Down
28 changes: 15 additions & 13 deletions apps/web/src/components/ChatView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1273,7 +1273,7 @@ function ChatViewContent(props: ChatViewProps) {
const threadSyncPhase = routeKind === "server" ? (props.threadSyncPhase ?? null) : null;
const threadDetailLoading = threadSyncPhase === "loading";
const handleNewThread = useNewThreadHandler();
const { settleThread, pinThread, unpinThread } = useThreadActions();
const { settleThread, pinThread, confirmAndUnpinThread } = useThreadActions();
const routeThreadRef = useMemo(
() => scopeThreadRef(environmentId, threadId),
[environmentId, threadId],
Expand DownExpand Up@@ -5146,17 +5146,19 @@ function ChatViewContent(props: ChatViewProps) {
event.stopPropagation();
if (!isServerThread || !activeThreadRef || !supportsPinning) return;
const pinned = activeThreadPinned;
void (pinned ? unpinThread(activeThreadRef) : pinThread(activeThreadRef)).then((result) => {
if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
});
void (pinned ? confirmAndUnpinThread(activeThreadRef) : pinThread(activeThreadRef)).then(
(result) => {
if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
},
);
return;
}

Expand DownExpand Up@@ -5284,7 +5286,7 @@ function ChatViewContent(props: ChatViewProps) {
settleThread,
supportsPinning,
supportsSettlement,
unpinThread,
confirmAndUnpinThread,
toggleRightPanel,
toggleRightPanelMaximized,
toggleTerminalVisibility,
Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1749,7 +1749,7 @@ export default function Sidebar() {
snoozeThread,
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
reorderPinnedThread,
archiveThread,
deleteThread,
Expand DownExpand Up@@ -2709,7 +2709,7 @@ export default function Sidebar() {
const attemptUnpin = useCallback(
(threadRef: ScopedThreadRef) => {
void (async () => {
const result = await unpinThread(threadRef);
const result = await confirmAndUnpinThread(threadRef);
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
const error = squashAtomCommandFailure(result);
toastManager.add(
Expand All@@ -2722,7 +2722,7 @@ export default function Sidebar() {
}
})();
},
[unpinThread],
[confirmAndUnpinThread],
);

const handlePinnedDragEnd = useCallback(
Expand Down
31 changes: 31 additions & 0 deletions apps/web/src/components/settings/SettingsPanels.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,6 +526,9 @@ export function useSettingsRestore(onRestored?: () => void) {
...(settings.addProjectBaseDirectory !== DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory
? ["Add project base directory"]
: []),
...(settings.confirmThreadUnpin !== DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin
? ["Unpin confirmation"]
: []),
...(settings.confirmThreadArchive !== DEFAULT_UNIFIED_SETTINGS.confirmThreadArchive
? ["Archive confirmation"]
: []),
Expand DownExpand Up@@ -554,6 +557,7 @@ export function useSettingsRestore(onRestored?: () => void) {
settings.confirmQuit,
settings.confirmThreadArchive,
settings.confirmThreadDelete,
settings.confirmThreadUnpin,
settings.addProjectBaseDirectory,
settings.defaultThreadEnvMode,
settings.newWorktreesStartFromOrigin,
Expand DownExpand Up@@ -666,6 +670,7 @@ export function useSettingsRestore(onRestored?: () => void) {
addProjectBaseDirectory: DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory,
confirmThreadArchive: DEFAULT_UNIFIED_SETTINGS.confirmThreadArchive,
confirmThreadDelete: DEFAULT_UNIFIED_SETTINGS.confirmThreadDelete,
confirmThreadUnpin: DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin,
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Outdated
Comment thread
cursor[bot] marked this conversation as resolved.
confirmQuit: DEFAULT_UNIFIED_SETTINGS.confirmQuit,
textGenerationModelSelection: DEFAULT_UNIFIED_SETTINGS.textGenerationModelSelection,
fontFamilySans: DEFAULT_UNIFIED_SETTINGS.fontFamilySans,
Expand DownExpand Up@@ -2313,6 +2318,32 @@ export function GeneralSettingsPanel() {
}
/>

<SettingsRow
Comment thread
UtkarshUsername marked this conversation as resolved.
Outdated
{...searchableSetting("unpin-confirmation")}
description="Ask before unpinning a thread from the pinned section."
resetAction={
settings.confirmThreadUnpin !== DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin ? (
<SettingResetButton
label="unpin confirmation"
onClick={() =>
updateSettings({
confirmThreadUnpin: DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin,
})
}
/>
) : null
}
control={
<Switch
checked={settings.confirmThreadUnpin}
onCheckedChange={(checked) =>
updateSettings({ confirmThreadUnpin: Boolean(checked) })
}
aria-label="Confirm thread unpinning"
/>
}
/>

<SettingsRow
{...searchableSetting("archive-confirmation")}
description="Require a second click on the inline archive action before a thread is archived."
Expand Down
8 changes: 8 additions & 0 deletions apps/web/src/components/settings/settingsSearch.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,14 @@ describe("searchSettings", () => {
]);
});

it("lists thread confirmations in panel order", () => {
expect(searchSettings("confirmation").map((item) => item.id)).toEqual([
"unpin-confirmation",
"archive-confirmation",
"delete-confirmation",
]);
});

it("returns no results for an empty query", () => {
expect(searchSettings(" ", ITEMS)).toEqual([]);
});
Expand Down
5 changes: 5 additions & 0 deletions apps/web/src/components/settings/settingsSearch.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,6 +152,11 @@ export const SETTINGS_SEARCH_ITEMS = [
title: "Add project starts in",
to: "/settings/general",
},
{
id: "unpin-confirmation",
title: "Unpin confirmation",
to: "/settings/general",
},
{
id: "archive-confirmation",
title: "Archive confirmation",
Expand Down
9 changes: 5 additions & 4 deletions apps/web/src/hooks/useThreadActionMenu.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ export function useThreadActionMenu(input: {
snoozeThread,
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
archiveThread,
deleteThread,
} = useThreadActions();
Expand DownExpand Up@@ -215,9 +215,10 @@ export function useThreadActionMenu(input: {
case "pin":
await reportFailure("Failed to pin thread", () => pinThread(threadRef));
return;
case "unpin":
await reportFailure("Failed to unpin thread", () => unpinThread(threadRef));
case "unpin": {
await reportFailure("Failed to unpin thread", () => confirmAndUnpinThread(threadRef));
return;
}
case "rename":
onStartRename();
return;
Expand DownExpand Up@@ -315,6 +316,7 @@ export function useThreadActionMenu(input: {
changeRequest,
confirmThreadArchive,
confirmThreadDelete,
confirmAndUnpinThread,
copyBranchToClipboard,
copyPathToClipboard,
copyThreadIdToClipboard,
Expand All@@ -328,7 +330,6 @@ export function useThreadActionMenu(input: {
snoozeThread,
threadRef,
timestampFormat,
unpinThread,
unsettleThread,
unsnoozeThread,
updateThreadMetadata,
Expand Down
56 changes: 55 additions & 1 deletion apps/web/src/hooks/useThreadActions.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { EnvironmentId, ThreadId } from "@t3tools/contracts";
import { describe, expect, it } from "vite-plus/test";

import { ThreadArchiveBlockedError } from "./useThreadActions";
import { requestThreadUnpinConfirmation, ThreadArchiveBlockedError } from "./useThreadActions";

describe("ThreadArchiveBlockedError", () => {
it("keeps the blocked thread context with the fixed message", () => {
Expand All@@ -17,3 +17,57 @@ describe("ThreadArchiveBlockedError", () => {
expect(error.message).toBe("Cannot archive a running thread.");
});
});

describe("requestThreadUnpinConfirmation", () => {
it("skips the dialog when confirmation is disabled", async () => {
let callCount = 0;
const result = await requestThreadUnpinConfirmation({
enabled: false,
title: "Pinned thread",
confirm: async () => {
callCount += 1;
return false;
},
});

expect(result).toMatchObject({ _tag: "Success", value: true });
expect(callCount).toBe(0);
});

it("degrades gracefully when dialogs are unavailable", async () => {
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Pinned thread",
confirm: null,
});

expect(result).toMatchObject({ _tag: "Success", value: true });
});

it("uses the thread title and returns the user's decision", async () => {
let message = "";
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Release prep",
confirm: async (nextMessage) => {
message = nextMessage;
return false;
},
});

expect(message).toBe(
'Unpin thread "Release prep"?\nThis will move the thread out of your pinned section.',
);
expect(result).toMatchObject({ _tag: "Success", value: false });
});

it("keeps dialog failures observable", async () => {
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Pinned thread",
confirm: () => Promise.reject(new Error("dialog unavailable")),
});

expect(result._tag).toBe("Failure");
});
});
43 changes: 43 additions & 0 deletions apps/web/src/hooks/useThreadActions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,26 @@ export class ThreadPinReorderUnsupportedError extends Schema.TaggedErrorClass<Th
}
}

export async function requestThreadUnpinConfirmation(input: {
enabled: boolean;
title: string;
confirm: ((message: string) => Promise<boolean>) | null;
}) {
const { confirm } = input;
if (!input.enabled || confirm === null) {
return AsyncResult.success(true);
}

return settlePromise(() =>
confirm(
[
`Unpin thread "${input.title}"?`,
"This will move the thread out of your pinned section.",
].join("\n"),
),
);
}

export function useThreadActions() {
const closeTerminal = useAtomCommand(terminalEnvironment.close);
const archiveThreadMutation = useAtomCommand(threadEnvironment.archive, {
Expand DownExpand Up@@ -177,6 +197,7 @@ export function useThreadActions() {
});
const sidebarThreadSortOrder = useClientSettings((settings) => settings.sidebarThreadSortOrder);
const confirmThreadDelete = useClientSettings((settings) => settings.confirmThreadDelete);
const confirmThreadUnpin = useClientSettings((settings) => settings.confirmThreadUnpin);
const clearComposerDraftForThread = useComposerDraftStore((store) => store.clearDraftThread);
const clearProjectDraftThreadById = useComposerDraftStore(
(store) => store.clearProjectDraftThreadById,
Expand DownExpand Up@@ -590,6 +611,26 @@ export function useThreadActions() {
[unpinThreadMutation],
);

const confirmAndUnpinThread = useCallback(
async (target: ScopedThreadRef) => {
const localApi = readLocalApi();
const resolved = resolveThreadTarget(target);
const confirmationResult = await requestThreadUnpinConfirmation({
enabled: confirmThreadUnpin,
title: resolved?.thread.title ?? "this thread",
confirm: localApi ? (message) => localApi.dialogs.confirm(message) : null,
});
if (confirmationResult._tag === "Failure") {
return confirmationResult;
}
if (!confirmationResult.value) {
return AsyncResult.success(undefined);
}
return unpinThread(target);
},
[confirmThreadUnpin, resolveThreadTarget, unpinThread],
);

const reorderPinnedThread = useCallback(
async (target: ScopedThreadRef, orderKey: string) => {
// Callers (the sidebar drag handler) only enable dragging on
Expand DownExpand Up@@ -709,11 +750,13 @@ export function useThreadActions() {
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
reorderPinnedThread,
}),
[
archiveThread,
confirmAndDeleteThread,
confirmAndUnpinThread,
deleteThread,
pinThread,
reorderPinnedThread,
Expand Down
3 changes: 3 additions & 0 deletions docs/user/thread-sidebar.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,9 @@ Pin a thread from its context menu to keep it in the pinned section above your a
`mod+shift+p` pins or unpins the thread you have open. Pinned threads are shown independently of
their project, including when you connect to more than one environment.

To require confirmation before unpinning, enable **Settings → General → Unpin confirmation**. The
confirmation applies to the sidebar controls, thread menus, and the `mod+shift+p` shortcut.

Pinned threads follow the auto-settle policy in **Settings → General**. Choose exactly one policy:
settle when a pull request merges or closes, settle after a configurable period of inactivity, or
never auto-settle. **Never** leaves every automatic path off, so threads settle only when you choose
Expand Down
6 changes: 6 additions & 0 deletions packages/contracts/src/settings.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,12 @@ describe("ClientSettings sidebar", () => {
);
});

it("keeps unpin confirmation opt-in and patchable", () => {
expect(decodeClientSettings({}).confirmThreadUnpin).toBe(false);
expect(decodeClientSettingsPatch({ confirmThreadUnpin: true }).confirmThreadUnpin).toBe(true);
expect(() => decodeClientSettingsPatch({ confirmThreadUnpin: "yes" })).toThrow();
});

it("allows auto-settle by inactivity to be disabled", () => {
expect(
decodeClientSettings({ sidebarAutoSettleAfterDays: null }).sidebarAutoSettleAfterDays,
Expand Down
2 changes: 2 additions & 0 deletions packages/contracts/src/settings.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,6 +170,7 @@ export const ClientSettingsSchema = Schema.Struct({
confirmQuit: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
confirmThreadArchive: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
confirmThreadDelete: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
confirmThreadUnpin: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
dismissedProviderUpdateNotificationKeys: Schema.Array(TrimmedNonEmptyString).pipe(
Schema.withDecodingDefault(Effect.succeed([])),
),
Expand DownExpand Up@@ -913,6 +914,7 @@ export const ClientSettingsPatch = Schema.Struct({
confirmQuit: Schema.optionalKey(Schema.Boolean),
confirmThreadArchive: Schema.optionalKey(Schema.Boolean),
confirmThreadDelete: Schema.optionalKey(Schema.Boolean),
confirmThreadUnpin: Schema.optionalKey(Schema.Boolean),
diffIgnoreWhitespace: Schema.optionalKey(Schema.Boolean),
environmentIdentificationMode: Schema.optionalKey(EnvironmentIdentificationMode),
glassOpacity: Schema.optionalKey(GlassOpacity),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } 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
1 change: 1 addition & 0 deletions apps/desktop/src/settings/DesktopClientSettings.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ const clientSettings: ClientSettings = {
confirmQuit: true,
confirmThreadArchive: true,
confirmThreadDelete: false,
confirmThreadUnpin: false,
dismissedProviderUpdateNotificationKeys: [],
diffIgnoreWhitespace: true,
environmentIdentificationMode: "artwork",
Expand Down
28 changes: 15 additions & 13 deletions apps/web/src/components/ChatView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1273,7 +1273,7 @@ function ChatViewContent(props: ChatViewProps) {
const threadSyncPhase = routeKind === "server" ? (props.threadSyncPhase ?? null) : null;
const threadDetailLoading = threadSyncPhase === "loading";
const handleNewThread = useNewThreadHandler();
const { settleThread, pinThread, unpinThread } = useThreadActions();
const { settleThread, pinThread, confirmAndUnpinThread } = useThreadActions();
const routeThreadRef = useMemo(
() => scopeThreadRef(environmentId, threadId),
[environmentId, threadId],
Expand DownExpand Up@@ -5146,17 +5146,19 @@ function ChatViewContent(props: ChatViewProps) {
event.stopPropagation();
if (!isServerThread || !activeThreadRef || !supportsPinning) return;
const pinned = activeThreadPinned;
void (pinned ? unpinThread(activeThreadRef) : pinThread(activeThreadRef)).then((result) => {
if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
});
void (pinned ? confirmAndUnpinThread(activeThreadRef) : pinThread(activeThreadRef)).then(
(result) => {
if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
},
);
return;
}

Expand DownExpand Up@@ -5284,7 +5286,7 @@ function ChatViewContent(props: ChatViewProps) {
settleThread,
supportsPinning,
supportsSettlement,
unpinThread,
confirmAndUnpinThread,
toggleRightPanel,
toggleRightPanelMaximized,
toggleTerminalVisibility,
Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1749,7 +1749,7 @@ export default function Sidebar() {
snoozeThread,
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
reorderPinnedThread,
archiveThread,
deleteThread,
Expand DownExpand Up@@ -2709,7 +2709,7 @@ export default function Sidebar() {
const attemptUnpin = useCallback(
(threadRef: ScopedThreadRef) => {
void (async () => {
const result = await unpinThread(threadRef);
const result = await confirmAndUnpinThread(threadRef);
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
const error = squashAtomCommandFailure(result);
toastManager.add(
Expand All@@ -2722,7 +2722,7 @@ export default function Sidebar() {
}
})();
},
[unpinThread],
[confirmAndUnpinThread],
);

const handlePinnedDragEnd = useCallback(
Expand Down
31 changes: 31 additions & 0 deletions apps/web/src/components/settings/SettingsPanels.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,6 +526,9 @@ export function useSettingsRestore(onRestored?: () => void) {
...(settings.addProjectBaseDirectory !== DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory
? ["Add project base directory"]
: []),
...(settings.confirmThreadUnpin !== DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin
? ["Unpin confirmation"]
: []),
...(settings.confirmThreadArchive !== DEFAULT_UNIFIED_SETTINGS.confirmThreadArchive
? ["Archive confirmation"]
: []),
Expand DownExpand Up@@ -554,6 +557,7 @@ export function useSettingsRestore(onRestored?: () => void) {
settings.confirmQuit,
settings.confirmThreadArchive,
settings.confirmThreadDelete,
settings.confirmThreadUnpin,
settings.addProjectBaseDirectory,
settings.defaultThreadEnvMode,
settings.newWorktreesStartFromOrigin,
Expand DownExpand Up@@ -666,6 +670,7 @@ export function useSettingsRestore(onRestored?: () => void) {
addProjectBaseDirectory: DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory,
confirmThreadArchive: DEFAULT_UNIFIED_SETTINGS.confirmThreadArchive,
confirmThreadDelete: DEFAULT_UNIFIED_SETTINGS.confirmThreadDelete,
confirmThreadUnpin: DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin,
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Outdated
Comment thread
cursor[bot] marked this conversation as resolved.
confirmQuit: DEFAULT_UNIFIED_SETTINGS.confirmQuit,
textGenerationModelSelection: DEFAULT_UNIFIED_SETTINGS.textGenerationModelSelection,
fontFamilySans: DEFAULT_UNIFIED_SETTINGS.fontFamilySans,
Expand DownExpand Up@@ -2313,6 +2318,32 @@ export function GeneralSettingsPanel() {
}
/>

<SettingsRow
Comment thread
UtkarshUsername marked this conversation as resolved.
Outdated
{...searchableSetting("unpin-confirmation")}
description="Ask before unpinning a thread from the pinned section."
resetAction={
settings.confirmThreadUnpin !== DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin ? (
<SettingResetButton
label="unpin confirmation"
onClick={() =>
updateSettings({
confirmThreadUnpin: DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin,
})
}
/>
) : null
}
control={
<Switch
checked={settings.confirmThreadUnpin}
onCheckedChange={(checked) =>
updateSettings({ confirmThreadUnpin: Boolean(checked) })
}
aria-label="Confirm thread unpinning"
/>
}
/>

<SettingsRow
{...searchableSetting("archive-confirmation")}
description="Require a second click on the inline archive action before a thread is archived."
Expand Down
8 changes: 8 additions & 0 deletions apps/web/src/components/settings/settingsSearch.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,14 @@ describe("searchSettings", () => {
]);
});

it("lists thread confirmations in panel order", () => {
expect(searchSettings("confirmation").map((item) => item.id)).toEqual([
"unpin-confirmation",
"archive-confirmation",
"delete-confirmation",
]);
});

it("returns no results for an empty query", () => {
expect(searchSettings(" ", ITEMS)).toEqual([]);
});
Expand Down
5 changes: 5 additions & 0 deletions apps/web/src/components/settings/settingsSearch.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,6 +152,11 @@ export const SETTINGS_SEARCH_ITEMS = [
title: "Add project starts in",
to: "/settings/general",
},
{
id: "unpin-confirmation",
title: "Unpin confirmation",
to: "/settings/general",
},
{
id: "archive-confirmation",
title: "Archive confirmation",
Expand Down
9 changes: 5 additions & 4 deletions apps/web/src/hooks/useThreadActionMenu.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ export function useThreadActionMenu(input: {
snoozeThread,
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
archiveThread,
deleteThread,
} = useThreadActions();
Expand DownExpand Up@@ -215,9 +215,10 @@ export function useThreadActionMenu(input: {
case "pin":
await reportFailure("Failed to pin thread", () => pinThread(threadRef));
return;
case "unpin":
await reportFailure("Failed to unpin thread", () => unpinThread(threadRef));
case "unpin": {
await reportFailure("Failed to unpin thread", () => confirmAndUnpinThread(threadRef));
return;
}
case "rename":
onStartRename();
return;
Expand DownExpand Up@@ -315,6 +316,7 @@ export function useThreadActionMenu(input: {
changeRequest,
confirmThreadArchive,
confirmThreadDelete,
confirmAndUnpinThread,
copyBranchToClipboard,
copyPathToClipboard,
copyThreadIdToClipboard,
Expand All@@ -328,7 +330,6 @@ export function useThreadActionMenu(input: {
snoozeThread,
threadRef,
timestampFormat,
unpinThread,
unsettleThread,
unsnoozeThread,
updateThreadMetadata,
Expand Down
56 changes: 55 additions & 1 deletion apps/web/src/hooks/useThreadActions.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { EnvironmentId, ThreadId } from "@t3tools/contracts";
import { describe, expect, it } from "vite-plus/test";

import { ThreadArchiveBlockedError } from "./useThreadActions";
import { requestThreadUnpinConfirmation, ThreadArchiveBlockedError } from "./useThreadActions";

describe("ThreadArchiveBlockedError", () => {
it("keeps the blocked thread context with the fixed message", () => {
Expand All@@ -17,3 +17,57 @@ describe("ThreadArchiveBlockedError", () => {
expect(error.message).toBe("Cannot archive a running thread.");
});
});

describe("requestThreadUnpinConfirmation", () => {
it("skips the dialog when confirmation is disabled", async () => {
let callCount = 0;
const result = await requestThreadUnpinConfirmation({
enabled: false,
title: "Pinned thread",
confirm: async () => {
callCount += 1;
return false;
},
});

expect(result).toMatchObject({ _tag: "Success", value: true });
expect(callCount).toBe(0);
});

it("degrades gracefully when dialogs are unavailable", async () => {
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Pinned thread",
confirm: null,
});

expect(result).toMatchObject({ _tag: "Success", value: true });
});

it("uses the thread title and returns the user's decision", async () => {
let message = "";
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Release prep",
confirm: async (nextMessage) => {
message = nextMessage;
return false;
},
});

expect(message).toBe(
'Unpin thread "Release prep"?\nThis will move the thread out of your pinned section.',
);
expect(result).toMatchObject({ _tag: "Success", value: false });
});

it("keeps dialog failures observable", async () => {
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Pinned thread",
confirm: () => Promise.reject(new Error("dialog unavailable")),
});

expect(result._tag).toBe("Failure");
});
});
43 changes: 43 additions & 0 deletions apps/web/src/hooks/useThreadActions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,26 @@ export class ThreadPinReorderUnsupportedError extends Schema.TaggedErrorClass<Th
}
}

export async function requestThreadUnpinConfirmation(input: {
enabled: boolean;
title: string;
confirm: ((message: string) => Promise<boolean>) | null;
}) {
const { confirm } = input;
if (!input.enabled || confirm === null) {
return AsyncResult.success(true);
}

return settlePromise(() =>
confirm(
[
`Unpin thread "${input.title}"?`,
"This will move the thread out of your pinned section.",
].join("\n"),
),
);
}

export function useThreadActions() {
const closeTerminal = useAtomCommand(terminalEnvironment.close);
const archiveThreadMutation = useAtomCommand(threadEnvironment.archive, {
Expand DownExpand Up@@ -177,6 +197,7 @@ export function useThreadActions() {
});
const sidebarThreadSortOrder = useClientSettings((settings) => settings.sidebarThreadSortOrder);
const confirmThreadDelete = useClientSettings((settings) => settings.confirmThreadDelete);
const confirmThreadUnpin = useClientSettings((settings) => settings.confirmThreadUnpin);
const clearComposerDraftForThread = useComposerDraftStore((store) => store.clearDraftThread);
const clearProjectDraftThreadById = useComposerDraftStore(
(store) => store.clearProjectDraftThreadById,
Expand DownExpand Up@@ -590,6 +611,26 @@ export function useThreadActions() {
[unpinThreadMutation],
);

const confirmAndUnpinThread = useCallback(
async (target: ScopedThreadRef) => {
const localApi = readLocalApi();
const resolved = resolveThreadTarget(target);
const confirmationResult = await requestThreadUnpinConfirmation({
enabled: confirmThreadUnpin,
title: resolved?.thread.title ?? "this thread",
confirm: localApi ? (message) => localApi.dialogs.confirm(message) : null,
});
if (confirmationResult._tag === "Failure") {
return confirmationResult;
}
if (!confirmationResult.value) {
return AsyncResult.success(undefined);
}
return unpinThread(target);
},
[confirmThreadUnpin, resolveThreadTarget, unpinThread],
);

const reorderPinnedThread = useCallback(
async (target: ScopedThreadRef, orderKey: string) => {
// Callers (the sidebar drag handler) only enable dragging on
Expand DownExpand Up@@ -709,11 +750,13 @@ export function useThreadActions() {
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
reorderPinnedThread,
}),
[
archiveThread,
confirmAndDeleteThread,
confirmAndUnpinThread,
deleteThread,
pinThread,
reorderPinnedThread,
Expand Down
3 changes: 3 additions & 0 deletions docs/user/thread-sidebar.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,9 @@ Pin a thread from its context menu to keep it in the pinned section above your a
`mod+shift+p` pins or unpins the thread you have open. Pinned threads are shown independently of
their project, including when you connect to more than one environment.

To require confirmation before unpinning, enable **Settings → General → Unpin confirmation**. The
confirmation applies to the sidebar controls, thread menus, and the `mod+shift+p` shortcut.

Pinned threads follow the auto-settle policy in **Settings → General**. Choose exactly one policy:
settle when a pull request merges or closes, settle after a configurable period of inactivity, or
never auto-settle. **Never** leaves every automatic path off, so threads settle only when you choose
Expand Down
6 changes: 6 additions & 0 deletions packages/contracts/src/settings.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,12 @@ describe("ClientSettings sidebar", () => {
);
});

it("keeps unpin confirmation opt-in and patchable", () => {
expect(decodeClientSettings({}).confirmThreadUnpin).toBe(false);
expect(decodeClientSettingsPatch({ confirmThreadUnpin: true }).confirmThreadUnpin).toBe(true);
expect(() => decodeClientSettingsPatch({ confirmThreadUnpin: "yes" })).toThrow();
});

it("allows auto-settle by inactivity to be disabled", () => {
expect(
decodeClientSettings({ sidebarAutoSettleAfterDays: null }).sidebarAutoSettleAfterDays,
Expand Down
2 changes: 2 additions & 0 deletions packages/contracts/src/settings.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,6 +170,7 @@ export const ClientSettingsSchema = Schema.Struct({
confirmQuit: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
confirmThreadArchive: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
confirmThreadDelete: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
confirmThreadUnpin: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
dismissedProviderUpdateNotificationKeys: Schema.Array(TrimmedNonEmptyString).pipe(
Schema.withDecodingDefault(Effect.succeed([])),
),
Expand DownExpand Up@@ -913,6 +914,7 @@ export const ClientSettingsPatch = Schema.Struct({
confirmQuit: Schema.optionalKey(Schema.Boolean),
confirmThreadArchive: Schema.optionalKey(Schema.Boolean),
confirmThreadDelete: Schema.optionalKey(Schema.Boolean),
confirmThreadUnpin: Schema.optionalKey(Schema.Boolean),
diffIgnoreWhitespace: Schema.optionalKey(Schema.Boolean),
environmentIdentificationMode: Schema.optionalKey(EnvironmentIdentificationMode),
glassOpacity: Schema.optionalKey(GlassOpacity),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } 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
1 change: 1 addition & 0 deletions apps/desktop/src/settings/DesktopClientSettings.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ const clientSettings: ClientSettings = {
confirmQuit: true,
confirmThreadArchive: true,
confirmThreadDelete: false,
confirmThreadUnpin: false,
dismissedProviderUpdateNotificationKeys: [],
diffIgnoreWhitespace: true,
environmentIdentificationMode: "artwork",
Expand Down
28 changes: 15 additions & 13 deletions apps/web/src/components/ChatView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1273,7 +1273,7 @@ function ChatViewContent(props: ChatViewProps) {
const threadSyncPhase = routeKind === "server" ? (props.threadSyncPhase ?? null) : null;
const threadDetailLoading = threadSyncPhase === "loading";
const handleNewThread = useNewThreadHandler();
const { settleThread, pinThread, unpinThread } = useThreadActions();
const { settleThread, pinThread, confirmAndUnpinThread } = useThreadActions();
const routeThreadRef = useMemo(
() => scopeThreadRef(environmentId, threadId),
[environmentId, threadId],
Expand DownExpand Up@@ -5146,17 +5146,19 @@ function ChatViewContent(props: ChatViewProps) {
event.stopPropagation();
if (!isServerThread || !activeThreadRef || !supportsPinning) return;
const pinned = activeThreadPinned;
void (pinned ? unpinThread(activeThreadRef) : pinThread(activeThreadRef)).then((result) => {
if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
});
void (pinned ? confirmAndUnpinThread(activeThreadRef) : pinThread(activeThreadRef)).then(
(result) => {
if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
const error = squashAtomCommandFailure(result);
toastManager.add(
stackedThreadToast({
type: "error",
title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
},
);
return;
}

Expand DownExpand Up@@ -5284,7 +5286,7 @@ function ChatViewContent(props: ChatViewProps) {
settleThread,
supportsPinning,
supportsSettlement,
unpinThread,
confirmAndUnpinThread,
toggleRightPanel,
toggleRightPanelMaximized,
toggleTerminalVisibility,
Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -1749,7 +1749,7 @@ export default function Sidebar() {
snoozeThread,
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
reorderPinnedThread,
archiveThread,
deleteThread,
Expand DownExpand Up@@ -2709,7 +2709,7 @@ export default function Sidebar() {
const attemptUnpin = useCallback(
(threadRef: ScopedThreadRef) => {
void (async () => {
const result = await unpinThread(threadRef);
const result = await confirmAndUnpinThread(threadRef);
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
const error = squashAtomCommandFailure(result);
toastManager.add(
Expand All@@ -2722,7 +2722,7 @@ export default function Sidebar() {
}
})();
},
[unpinThread],
[confirmAndUnpinThread],
);

const handlePinnedDragEnd = useCallback(
Expand Down
31 changes: 31 additions & 0 deletions apps/web/src/components/settings/SettingsPanels.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,6 +526,9 @@ export function useSettingsRestore(onRestored?: () => void) {
...(settings.addProjectBaseDirectory !== DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory
? ["Add project base directory"]
: []),
...(settings.confirmThreadUnpin !== DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin
? ["Unpin confirmation"]
: []),
...(settings.confirmThreadArchive !== DEFAULT_UNIFIED_SETTINGS.confirmThreadArchive
? ["Archive confirmation"]
: []),
Expand DownExpand Up@@ -554,6 +557,7 @@ export function useSettingsRestore(onRestored?: () => void) {
settings.confirmQuit,
settings.confirmThreadArchive,
settings.confirmThreadDelete,
settings.confirmThreadUnpin,
settings.addProjectBaseDirectory,
settings.defaultThreadEnvMode,
settings.newWorktreesStartFromOrigin,
Expand DownExpand Up@@ -666,6 +670,7 @@ export function useSettingsRestore(onRestored?: () => void) {
addProjectBaseDirectory: DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory,
confirmThreadArchive: DEFAULT_UNIFIED_SETTINGS.confirmThreadArchive,
confirmThreadDelete: DEFAULT_UNIFIED_SETTINGS.confirmThreadDelete,
confirmThreadUnpin: DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin,
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Outdated
Comment thread
cursor[bot] marked this conversation as resolved.
confirmQuit: DEFAULT_UNIFIED_SETTINGS.confirmQuit,
textGenerationModelSelection: DEFAULT_UNIFIED_SETTINGS.textGenerationModelSelection,
fontFamilySans: DEFAULT_UNIFIED_SETTINGS.fontFamilySans,
Expand DownExpand Up@@ -2313,6 +2318,32 @@ export function GeneralSettingsPanel() {
}
/>

<SettingsRow
Comment thread
UtkarshUsername marked this conversation as resolved.
Outdated
{...searchableSetting("unpin-confirmation")}
description="Ask before unpinning a thread from the pinned section."
resetAction={
settings.confirmThreadUnpin !== DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin ? (
<SettingResetButton
label="unpin confirmation"
onClick={() =>
updateSettings({
confirmThreadUnpin: DEFAULT_UNIFIED_SETTINGS.confirmThreadUnpin,
})
}
/>
) : null
}
control={
<Switch
checked={settings.confirmThreadUnpin}
onCheckedChange={(checked) =>
updateSettings({ confirmThreadUnpin: Boolean(checked) })
}
aria-label="Confirm thread unpinning"
/>
}
/>

<SettingsRow
{...searchableSetting("archive-confirmation")}
description="Require a second click on the inline archive action before a thread is archived."
Expand Down
8 changes: 8 additions & 0 deletions apps/web/src/components/settings/settingsSearch.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,14 @@ describe("searchSettings", () => {
]);
});

it("lists thread confirmations in panel order", () => {
expect(searchSettings("confirmation").map((item) => item.id)).toEqual([
"unpin-confirmation",
"archive-confirmation",
"delete-confirmation",
]);
});

it("returns no results for an empty query", () => {
expect(searchSettings(" ", ITEMS)).toEqual([]);
});
Expand Down
5 changes: 5 additions & 0 deletions apps/web/src/components/settings/settingsSearch.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,6 +152,11 @@ export const SETTINGS_SEARCH_ITEMS = [
title: "Add project starts in",
to: "/settings/general",
},
{
id: "unpin-confirmation",
title: "Unpin confirmation",
to: "/settings/general",
},
{
id: "archive-confirmation",
title: "Archive confirmation",
Expand Down
9 changes: 5 additions & 4 deletions apps/web/src/hooks/useThreadActionMenu.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ export function useThreadActionMenu(input: {
snoozeThread,
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
archiveThread,
deleteThread,
} = useThreadActions();
Expand DownExpand Up@@ -215,9 +215,10 @@ export function useThreadActionMenu(input: {
case "pin":
await reportFailure("Failed to pin thread", () => pinThread(threadRef));
return;
case "unpin":
await reportFailure("Failed to unpin thread", () => unpinThread(threadRef));
case "unpin": {
await reportFailure("Failed to unpin thread", () => confirmAndUnpinThread(threadRef));
return;
}
case "rename":
onStartRename();
return;
Expand DownExpand Up@@ -315,6 +316,7 @@ export function useThreadActionMenu(input: {
changeRequest,
confirmThreadArchive,
confirmThreadDelete,
confirmAndUnpinThread,
copyBranchToClipboard,
copyPathToClipboard,
copyThreadIdToClipboard,
Expand All@@ -328,7 +330,6 @@ export function useThreadActionMenu(input: {
snoozeThread,
threadRef,
timestampFormat,
unpinThread,
unsettleThread,
unsnoozeThread,
updateThreadMetadata,
Expand Down
56 changes: 55 additions & 1 deletion apps/web/src/hooks/useThreadActions.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { EnvironmentId, ThreadId } from "@t3tools/contracts";
import { describe, expect, it } from "vite-plus/test";

import { ThreadArchiveBlockedError } from "./useThreadActions";
import { requestThreadUnpinConfirmation, ThreadArchiveBlockedError } from "./useThreadActions";

describe("ThreadArchiveBlockedError", () => {
it("keeps the blocked thread context with the fixed message", () => {
Expand All@@ -17,3 +17,57 @@ describe("ThreadArchiveBlockedError", () => {
expect(error.message).toBe("Cannot archive a running thread.");
});
});

describe("requestThreadUnpinConfirmation", () => {
it("skips the dialog when confirmation is disabled", async () => {
let callCount = 0;
const result = await requestThreadUnpinConfirmation({
enabled: false,
title: "Pinned thread",
confirm: async () => {
callCount += 1;
return false;
},
});

expect(result).toMatchObject({ _tag: "Success", value: true });
expect(callCount).toBe(0);
});

it("degrades gracefully when dialogs are unavailable", async () => {
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Pinned thread",
confirm: null,
});

expect(result).toMatchObject({ _tag: "Success", value: true });
});

it("uses the thread title and returns the user's decision", async () => {
let message = "";
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Release prep",
confirm: async (nextMessage) => {
message = nextMessage;
return false;
},
});

expect(message).toBe(
'Unpin thread "Release prep"?\nThis will move the thread out of your pinned section.',
);
expect(result).toMatchObject({ _tag: "Success", value: false });
});

it("keeps dialog failures observable", async () => {
const result = await requestThreadUnpinConfirmation({
enabled: true,
title: "Pinned thread",
confirm: () => Promise.reject(new Error("dialog unavailable")),
});

expect(result._tag).toBe("Failure");
});
});
43 changes: 43 additions & 0 deletions apps/web/src/hooks/useThreadActions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,26 @@ export class ThreadPinReorderUnsupportedError extends Schema.TaggedErrorClass<Th
}
}

export async function requestThreadUnpinConfirmation(input: {
enabled: boolean;
title: string;
confirm: ((message: string) => Promise<boolean>) | null;
}) {
const { confirm } = input;
if (!input.enabled || confirm === null) {
return AsyncResult.success(true);
}

return settlePromise(() =>
confirm(
[
`Unpin thread "${input.title}"?`,
"This will move the thread out of your pinned section.",
].join("\n"),
),
);
}

export function useThreadActions() {
const closeTerminal = useAtomCommand(terminalEnvironment.close);
const archiveThreadMutation = useAtomCommand(threadEnvironment.archive, {
Expand DownExpand Up@@ -177,6 +197,7 @@ export function useThreadActions() {
});
const sidebarThreadSortOrder = useClientSettings((settings) => settings.sidebarThreadSortOrder);
const confirmThreadDelete = useClientSettings((settings) => settings.confirmThreadDelete);
const confirmThreadUnpin = useClientSettings((settings) => settings.confirmThreadUnpin);
const clearComposerDraftForThread = useComposerDraftStore((store) => store.clearDraftThread);
const clearProjectDraftThreadById = useComposerDraftStore(
(store) => store.clearProjectDraftThreadById,
Expand DownExpand Up@@ -590,6 +611,26 @@ export function useThreadActions() {
[unpinThreadMutation],
);

const confirmAndUnpinThread = useCallback(
async (target: ScopedThreadRef) => {
const localApi = readLocalApi();
const resolved = resolveThreadTarget(target);
const confirmationResult = await requestThreadUnpinConfirmation({
enabled: confirmThreadUnpin,
title: resolved?.thread.title ?? "this thread",
confirm: localApi ? (message) => localApi.dialogs.confirm(message) : null,
});
if (confirmationResult._tag === "Failure") {
return confirmationResult;
}
if (!confirmationResult.value) {
return AsyncResult.success(undefined);
}
return unpinThread(target);
},
[confirmThreadUnpin, resolveThreadTarget, unpinThread],
);

const reorderPinnedThread = useCallback(
async (target: ScopedThreadRef, orderKey: string) => {
// Callers (the sidebar drag handler) only enable dragging on
Expand DownExpand Up@@ -709,11 +750,13 @@ export function useThreadActions() {
unsnoozeThread,
pinThread,
unpinThread,
confirmAndUnpinThread,
reorderPinnedThread,
}),
[
archiveThread,
confirmAndDeleteThread,
confirmAndUnpinThread,
deleteThread,
pinThread,
reorderPinnedThread,
Expand Down
3 changes: 3 additions & 0 deletions docs/user/thread-sidebar.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,9 @@ Pin a thread from its context menu to keep it in the pinned section above your a
`mod+shift+p` pins or unpins the thread you have open. Pinned threads are shown independently of
their project, including when you connect to more than one environment.

To require confirmation before unpinning, enable **Settings → General → Unpin confirmation**. The
confirmation applies to the sidebar controls, thread menus, and the `mod+shift+p` shortcut.

Pinned threads follow the auto-settle policy in **Settings → General**. Choose exactly one policy:
settle when a pull request merges or closes, settle after a configurable period of inactivity, or
never auto-settle. **Never** leaves every automatic path off, so threads settle only when you choose
Expand Down
6 changes: 6 additions & 0 deletions packages/contracts/src/settings.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,12 @@ describe("ClientSettings sidebar", () => {
);
});

it("keeps unpin confirmation opt-in and patchable", () => {
expect(decodeClientSettings({}).confirmThreadUnpin).toBe(false);
expect(decodeClientSettingsPatch({ confirmThreadUnpin: true }).confirmThreadUnpin).toBe(true);
expect(() => decodeClientSettingsPatch({ confirmThreadUnpin: "yes" })).toThrow();
});

it("allows auto-settle by inactivity to be disabled", () => {
expect(
decodeClientSettings({ sidebarAutoSettleAfterDays: null }).sidebarAutoSettleAfterDays,
Expand Down
2 changes: 2 additions & 0 deletions packages/contracts/src/settings.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,6 +170,7 @@ export const ClientSettingsSchema = Schema.Struct({
confirmQuit: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
confirmThreadArchive: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
confirmThreadDelete: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
confirmThreadUnpin: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
dismissedProviderUpdateNotificationKeys: Schema.Array(TrimmedNonEmptyString).pipe(
Schema.withDecodingDefault(Effect.succeed([])),
),
Expand DownExpand Up@@ -913,6 +914,7 @@ export const ClientSettingsPatch = Schema.Struct({
confirmQuit: Schema.optionalKey(Schema.Boolean),
confirmThreadArchive: Schema.optionalKey(Schema.Boolean),
confirmThreadDelete: Schema.optionalKey(Schema.Boolean),
confirmThreadUnpin: Schema.optionalKey(Schema.Boolean),
diffIgnoreWhitespace: Schema.optionalKey(Schema.Boolean),
environmentIdentificationMode: Schema.optionalKey(EnvironmentIdentificationMode),
glassOpacity: Schema.optionalKey(GlassOpacity),
Expand Down
Loading