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
22 changes: 21 additions & 1 deletion apps/desktop/src/main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,14 @@ import net from "node:net";
import os from "node:os";
import path from "node:path";

import { app, BrowserWindow, dialog, ipcMain } from "electron";
import { app, BrowserWindow, dialog, ipcMain, Menu } from "electron";

import { fixPath } from "./fixPath";

fixPath();

const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const ROOT_DIR = path.resolve(__dirname, "../../..");
const BACKEND_ENTRY = path.join(ROOT_DIR, "apps/server/dist/index.js");
const WEB_ENTRY = path.join(ROOT_DIR, "apps/web/dist/index.html");
Expand DownExpand Up@@ -139,6 +140,25 @@ function registerIpcHandlers(): void {
if (result.canceled) return null;
return result.filePaths[0] ?? null;
});

ipcMain.removeHandler(CONTEXT_MENU_CHANNEL);
ipcMain.handle(CONTEXT_MENU_CHANNEL, async (_event, items: { id: string; label: string }[]) => {
const window = BrowserWindow.getFocusedWindow() ?? mainWindow;
if (!window) return null;

return new Promise<string | null>((resolve) => {
const menu = Menu.buildFromTemplate(
items.map((item) => ({
label: item.label,
click: () => resolve(item.id),
})),
);
menu.popup({
window,
callback: () => resolve(null),
});
});
});
}

function createWindow(): BrowserWindow {
Expand Down
3 changes: 3 additions & 0 deletions apps/desktop/src/preload.ts
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
import { contextBridge, ipcRenderer } from "electron";

const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const wsUrl = process.env.T3CODE_DESKTOP_WS_URL ?? null;

contextBridge.exposeInMainWorld("desktopBridge", {
getWsUrl: () => wsUrl,
pickFolder: () => ipcRenderer.invoke(PICK_FOLDER_CHANNEL) as Promise<string | null>,
showContextMenu: (items: { id: string; label: string }[]) =>
ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items) as Promise<string | null>,
});
32 changes: 32 additions & 0 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,6 +160,31 @@ export default function Sidebar() {
}
};

const handleThreadContextMenu = useCallback(
async (threadId: string, position: { x: number; y: number }) => {
if (!api) return;
const clicked = await api.contextMenu.show([{ id: "delete", label: "Delete" }], position);
if (clicked !== "delete") return;

const thread = state.threads.find((t) => t.id === threadId);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Low

components/Sidebar.tsx:171 The state.threads captured in the closure may become stale while awaiting api.contextMenu.show. Consider re-reading the thread from the current store state after the await returns, before stopping the session.

🚀 Want me to fix this? Reply ex: "fix it for me".

🤖 Prompt for AI
In file apps/web/src/components/Sidebar.tsx around line 171:
The `state.threads` captured in the closure may become stale while awaiting `api.contextMenu.show`. Consider re-reading the thread from the current store state after the await returns, before stopping the session.

if (!thread) return;

// Stop active session if running
if (thread.session?.sessionId) {
try {
await api.providers.stopSession({
sessionId: thread.session.sessionId,
});
} catch {
// Session may already be stopped
}
}

dispatch({ type: "DELETE_THREAD", threadId });
},
[api, dispatch, state.threads],
);
Comment on lines +163 to +186

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Don’t delete the thread if stopping the session fails.
Errors are swallowed and deletion proceeds, which can orphan a running provider session with no UI to stop it. Consider surfacing the error (or at least aborting deletion) unless you can distinguish “already stopped.”

🛡️ Safer flow
 if (thread.session?.sessionId) {
try {
await api.providers.stopSession({
sessionId: thread.session.sessionId,
});
- } catch {- // Session may already be stopped+ } catch (error) {+ // Consider surfacing error so we don't orphan a running session+ return;
}
}
dispatch({ type: "DELETE_THREAD", threadId });
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
consthandleThreadContextMenu=useCallback(
async(threadId: string)=>{
if(!api)return;
constclicked=awaitapi.contextMenu.show([
{id: "delete",label: "Delete"},
]);
if(clicked!=="delete")return;
constthread=state.threads.find((t)=>t.id===threadId);
if(!thread)return;
// Stop active session if running
if(thread.session?.sessionId){
try{
awaitapi.providers.stopSession({
sessionId: thread.session.sessionId,
});
}catch{
// Session may already be stopped
}
}
dispatch({type: "DELETE_THREAD", threadId });
},
[api,dispatch,state.threads],
);
consthandleThreadContextMenu=useCallback(
async(threadId: string)=>{
if(!api)return;
constclicked=awaitapi.contextMenu.show([
{id: "delete",label: "Delete"},
]);
if(clicked!=="delete")return;
constthread=state.threads.find((t)=>t.id===threadId);
if(!thread)return;
// Stop active session if running
if(thread.session?.sessionId){
try{
awaitapi.providers.stopSession({
sessionId: thread.session.sessionId,
});
}catch(error){
// Consider surfacing error so we don't orphan a running session
return;
}
}
dispatch({type: "DELETE_THREAD", threadId });
},
[api,dispatch,state.threads],
);
🤖 Prompt for AI Agents
In `@apps/renderer/src/components/Sidebar.tsx` around lines 87 - 112,
handleThreadContextMenu currently swallows errors from api.providers.stopSession
and proceeds to dispatch DELETE_THREAD, which can orphan an active session;
change the flow in handleThreadContextMenu so that if stopSession throws you do
not delete the thread unless you can detect a harmless "already stopped"
condition—catch the error from api.providers.stopSession, check the error
message/code for an “already stopped” sentinel (or otherwise surface the error
via UI/api.logger) and abort the dispatch({ type: "DELETE_THREAD", ... }) when
stopSession failed, only allowing deletion when stopSession succeeded or the
error explicitly indicates the session was already stopped; reference
handleThreadContextMenu, api.providers.stopSession, and the DELETE_THREAD
dispatch to locate and update the logic.


useEffect(() => {
const onWindowKeyDown = (event: KeyboardEvent) => {
const isNewThreadShortcut =
Expand DownExpand Up@@ -290,6 +315,13 @@ export default function Sidebar() {
threadId: thread.id,
})
}
onContextMenu={(e) => {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Low

components/Sidebar.tsx:320 Consider only calling e.preventDefault() when api.contextMenu.show will actually display a menu. Currently in non-Electron web mode, the native context menu is blocked but nothing appears because desktopBridge is undefined.

🚀 Want me to fix this? Reply ex: "fix it for me".

🤖 Prompt for AI
In file apps/web/src/components/Sidebar.tsx around line 320:
Consider only calling `e.preventDefault()` when `api.contextMenu.show` will actually display a menu. Currently in non-Electron web mode, the native context menu is blocked but nothing appears because `desktopBridge` is undefined.

e.preventDefault();
void handleThreadContextMenu(thread.id, {
x: e.clientX,
y: e.clientY,
});
}}
>
<div className="flex min-w-0 flex-1 items-center gap-1.5">
{threadStatus && (
Expand Down
64 changes: 64 additions & 0 deletions apps/web/src/contextMenuFallback.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
/**
* Imperative DOM-based context menu for non-Electron environments.
* Shows a positioned dropdown and returns a promise that resolves
* with the clicked item id, or null if dismissed.
*/
export function showContextMenuFallback<T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
): Promise<T | null> {
return new Promise<T | null>((resolve) => {
const overlay = document.createElement("div");
overlay.style.cssText = "position:fixed;inset:0;z-index:9999";

const menu = document.createElement("div");
menu.className =
"fixed z-[10000] min-w-[140px] rounded-md border border-border bg-popover py-1 shadow-xl animate-in fade-in zoom-in-95";

const x = position?.x ?? 0;
const y = position?.y ?? 0;
menu.style.top = `${y}px`;
menu.style.left = `${x}px`;

function cleanup(result: T | null) {
document.removeEventListener("keydown", onKeyDown);
overlay.remove();
menu.remove();
resolve(result);
}

function onKeyDown(e: KeyboardEvent) {
if (e.key === "Escape") {
e.preventDefault();
cleanup(null);
}
}

overlay.addEventListener("mousedown", () => cleanup(null));
document.addEventListener("keydown", onKeyDown);

for (const item of items) {
const btn = document.createElement("button");
btn.type = "button";
btn.textContent = item.label;
btn.className =
"flex w-full items-center gap-2 px-3 py-1.5 text-left text-[11px] text-destructive hover:bg-accent cursor-default";
btn.addEventListener("click", () => cleanup(item.id));
menu.appendChild(btn);
}

document.body.appendChild(overlay);
document.body.appendChild(menu);

// Adjust if menu overflows viewport
requestAnimationFrame(() => {
const rect = menu.getBoundingClientRect();
if (rect.right > window.innerWidth) {
menu.style.left = `${window.innerWidth - rect.width - 4}px`;
}
if (rect.bottom > window.innerHeight) {
menu.style.top = `${window.innerHeight - rect.height - 4}px`;
}
});
});
}
12 changes: 11 additions & 1 deletion apps/web/src/store.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,8 @@ type Action =
| { type: "SET_ERROR"; threadId: string; error: string | null }
| { type: "SET_THREAD_TITLE"; threadId: string; title: string }
| { type: "SET_THREAD_MODEL"; threadId: string; model: string }
| { type: "SET_RUNTIME_MODE"; mode: RuntimeMode };
| { type: "SET_RUNTIME_MODE"; mode: RuntimeMode }
| { type: "DELETE_THREAD"; threadId: string };
Comment on lines +36 to +37

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Active-thread fallback should stay within the same project.
When deleting the active thread, picking the first remaining thread globally can jump the user into an unrelated project. Prefer the next thread in the same project (or null if none).

🔧 Suggested adjustment
 case "DELETE_THREAD": {
+ const deleted = state.threads.find((t) => t.id === action.threadId);
const threads = state.threads.filter((t) => t.id !== action.threadId);
- const activeThreadId =- state.activeThreadId === action.threadId- ? (threads[0]?.id ?? null)- : state.activeThreadId;+ const fallback =+ deleted?.projectId+ ? threads.find((t) => t.projectId === deleted.projectId) ?? null+ : threads[0] ?? null;+ const activeThreadId =+ state.activeThreadId === action.threadId+ ? (fallback?.id ?? null)+ : state.activeThreadId;
return { ...state, threads, activeThreadId };
}

Also applies to: 332-338

🤖 Prompt for AI Agents
In `@apps/renderer/src/store.ts` around lines 45 - 46, The DELETE_THREAD action
currently falls back to the first remaining thread globally which can switch
projects; change the reducer logic that handles { type: "DELETE_THREAD";
threadId: string } so that if the deleted thread equals the current active
thread (activeThreadId) you find the next active thread from the same project
only (e.g., filter threads by projectId === deletedThread.projectId) and set
activeThreadId to that thread's id or null if none; apply the same same-project
fallback change to the other deletion-handling block referenced (the logic
duplicated around the other DELETE_THREAD handling at the second location).


// ── State ────────────────────────────────────────────────────────────

Expand DownExpand Up@@ -375,6 +376,15 @@ export function reducer(state: AppState, action: Action): AppState {
runtimeMode: action.mode,
};

case "DELETE_THREAD": {
const threads = state.threads.filter((t) => t.id !== action.threadId);
const activeThreadId =
state.activeThreadId === action.threadId
? (threads[0]?.id ?? null)
: state.activeThreadId;
return { ...state, threads, activeThreadId };
}

default:
return state;
}
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/vite-env.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import type { NativeApi } from "@t3tools/contracts";
interface DesktopBridge {
getWsUrl: () => string | null;
pickFolder: () => Promise<string | null>;
showContextMenu: (items: readonly { id: string; label: string }[]) => Promise<string | null>;
}

declare global {
Expand Down
12 changes: 12 additions & 0 deletions apps/web/src/wsNativeApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { type NativeApi, WS_CHANNELS, WS_METHODS, type WsWelcomePayload } from "@t3tools/contracts";

import { showContextMenuFallback } from "./contextMenuFallback";
import { WsTransport } from "./wsTransport";

let instance: { api: NativeApi; transport: WsTransport } | null = null;
Expand DownExpand Up@@ -95,6 +96,17 @@ export function createWsNativeApi(): NativeApi {
openInEditor: (cwd, editor) =>
transport.request(WS_METHODS.shellOpenInEditor, { cwd, editor }),
},
contextMenu: {
show: async <T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
): Promise<T | null> => {
if (window.desktopBridge) {
return window.desktopBridge.showContextMenu(items) as Promise<T | null>;
}
return showContextMenuFallback(items, position);
},
},
};

instance = { api, transport };
Expand Down
6 changes: 6 additions & 0 deletions packages/contracts/src/ipc.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,4 +62,10 @@ export interface NativeApi {
shell: {
openInEditor: (cwd: string, editor: EditorId) => Promise<void>;
};
contextMenu: {
show: <T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
) => Promise<T | null>;
};
}
, '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
22 changes: 21 additions & 1 deletion apps/desktop/src/main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,14 @@ import net from "node:net";
import os from "node:os";
import path from "node:path";

import { app, BrowserWindow, dialog, ipcMain } from "electron";
import { app, BrowserWindow, dialog, ipcMain, Menu } from "electron";

import { fixPath } from "./fixPath";

fixPath();

const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const ROOT_DIR = path.resolve(__dirname, "../../..");
const BACKEND_ENTRY = path.join(ROOT_DIR, "apps/server/dist/index.js");
const WEB_ENTRY = path.join(ROOT_DIR, "apps/web/dist/index.html");
Expand DownExpand Up@@ -139,6 +140,25 @@ function registerIpcHandlers(): void {
if (result.canceled) return null;
return result.filePaths[0] ?? null;
});

ipcMain.removeHandler(CONTEXT_MENU_CHANNEL);
ipcMain.handle(CONTEXT_MENU_CHANNEL, async (_event, items: { id: string; label: string }[]) => {
const window = BrowserWindow.getFocusedWindow() ?? mainWindow;
if (!window) return null;

return new Promise<string | null>((resolve) => {
const menu = Menu.buildFromTemplate(
items.map((item) => ({
label: item.label,
click: () => resolve(item.id),
})),
);
menu.popup({
window,
callback: () => resolve(null),
});
});
});
}

function createWindow(): BrowserWindow {
Expand Down
3 changes: 3 additions & 0 deletions apps/desktop/src/preload.ts
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
import { contextBridge, ipcRenderer } from "electron";

const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const wsUrl = process.env.T3CODE_DESKTOP_WS_URL ?? null;

contextBridge.exposeInMainWorld("desktopBridge", {
getWsUrl: () => wsUrl,
pickFolder: () => ipcRenderer.invoke(PICK_FOLDER_CHANNEL) as Promise<string | null>,
showContextMenu: (items: { id: string; label: string }[]) =>
ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items) as Promise<string | null>,
});
32 changes: 32 additions & 0 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,6 +160,31 @@ export default function Sidebar() {
}
};

const handleThreadContextMenu = useCallback(
async (threadId: string, position: { x: number; y: number }) => {
if (!api) return;
const clicked = await api.contextMenu.show([{ id: "delete", label: "Delete" }], position);
if (clicked !== "delete") return;

const thread = state.threads.find((t) => t.id === threadId);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Low

components/Sidebar.tsx:171 The state.threads captured in the closure may become stale while awaiting api.contextMenu.show. Consider re-reading the thread from the current store state after the await returns, before stopping the session.

🚀 Want me to fix this? Reply ex: "fix it for me".

🤖 Prompt for AI
In file apps/web/src/components/Sidebar.tsx around line 171:
The `state.threads` captured in the closure may become stale while awaiting `api.contextMenu.show`. Consider re-reading the thread from the current store state after the await returns, before stopping the session.

if (!thread) return;

// Stop active session if running
if (thread.session?.sessionId) {
try {
await api.providers.stopSession({
sessionId: thread.session.sessionId,
});
} catch {
// Session may already be stopped
}
}

dispatch({ type: "DELETE_THREAD", threadId });
},
[api, dispatch, state.threads],
);
Comment on lines +163 to +186

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Don’t delete the thread if stopping the session fails.
Errors are swallowed and deletion proceeds, which can orphan a running provider session with no UI to stop it. Consider surfacing the error (or at least aborting deletion) unless you can distinguish “already stopped.”

🛡️ Safer flow
 if (thread.session?.sessionId) {
try {
await api.providers.stopSession({
sessionId: thread.session.sessionId,
});
- } catch {- // Session may already be stopped+ } catch (error) {+ // Consider surfacing error so we don't orphan a running session+ return;
}
}
dispatch({ type: "DELETE_THREAD", threadId });
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
consthandleThreadContextMenu=useCallback(
async(threadId: string)=>{
if(!api)return;
constclicked=awaitapi.contextMenu.show([
{id: "delete",label: "Delete"},
]);
if(clicked!=="delete")return;
constthread=state.threads.find((t)=>t.id===threadId);
if(!thread)return;
// Stop active session if running
if(thread.session?.sessionId){
try{
awaitapi.providers.stopSession({
sessionId: thread.session.sessionId,
});
}catch{
// Session may already be stopped
}
}
dispatch({type: "DELETE_THREAD", threadId });
},
[api,dispatch,state.threads],
);
consthandleThreadContextMenu=useCallback(
async(threadId: string)=>{
if(!api)return;
constclicked=awaitapi.contextMenu.show([
{id: "delete",label: "Delete"},
]);
if(clicked!=="delete")return;
constthread=state.threads.find((t)=>t.id===threadId);
if(!thread)return;
// Stop active session if running
if(thread.session?.sessionId){
try{
awaitapi.providers.stopSession({
sessionId: thread.session.sessionId,
});
}catch(error){
// Consider surfacing error so we don't orphan a running session
return;
}
}
dispatch({type: "DELETE_THREAD", threadId });
},
[api,dispatch,state.threads],
);
🤖 Prompt for AI Agents
In `@apps/renderer/src/components/Sidebar.tsx` around lines 87 - 112,
handleThreadContextMenu currently swallows errors from api.providers.stopSession
and proceeds to dispatch DELETE_THREAD, which can orphan an active session;
change the flow in handleThreadContextMenu so that if stopSession throws you do
not delete the thread unless you can detect a harmless "already stopped"
condition—catch the error from api.providers.stopSession, check the error
message/code for an “already stopped” sentinel (or otherwise surface the error
via UI/api.logger) and abort the dispatch({ type: "DELETE_THREAD", ... }) when
stopSession failed, only allowing deletion when stopSession succeeded or the
error explicitly indicates the session was already stopped; reference
handleThreadContextMenu, api.providers.stopSession, and the DELETE_THREAD
dispatch to locate and update the logic.


useEffect(() => {
const onWindowKeyDown = (event: KeyboardEvent) => {
const isNewThreadShortcut =
Expand DownExpand Up@@ -290,6 +315,13 @@ export default function Sidebar() {
threadId: thread.id,
})
}
onContextMenu={(e) => {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Low

components/Sidebar.tsx:320 Consider only calling e.preventDefault() when api.contextMenu.show will actually display a menu. Currently in non-Electron web mode, the native context menu is blocked but nothing appears because desktopBridge is undefined.

🚀 Want me to fix this? Reply ex: "fix it for me".

🤖 Prompt for AI
In file apps/web/src/components/Sidebar.tsx around line 320:
Consider only calling `e.preventDefault()` when `api.contextMenu.show` will actually display a menu. Currently in non-Electron web mode, the native context menu is blocked but nothing appears because `desktopBridge` is undefined.

e.preventDefault();
void handleThreadContextMenu(thread.id, {
x: e.clientX,
y: e.clientY,
});
}}
>
<div className="flex min-w-0 flex-1 items-center gap-1.5">
{threadStatus && (
Expand Down
64 changes: 64 additions & 0 deletions apps/web/src/contextMenuFallback.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
/**
* Imperative DOM-based context menu for non-Electron environments.
* Shows a positioned dropdown and returns a promise that resolves
* with the clicked item id, or null if dismissed.
*/
export function showContextMenuFallback<T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
): Promise<T | null> {
return new Promise<T | null>((resolve) => {
const overlay = document.createElement("div");
overlay.style.cssText = "position:fixed;inset:0;z-index:9999";

const menu = document.createElement("div");
menu.className =
"fixed z-[10000] min-w-[140px] rounded-md border border-border bg-popover py-1 shadow-xl animate-in fade-in zoom-in-95";

const x = position?.x ?? 0;
const y = position?.y ?? 0;
menu.style.top = `${y}px`;
menu.style.left = `${x}px`;

function cleanup(result: T | null) {
document.removeEventListener("keydown", onKeyDown);
overlay.remove();
menu.remove();
resolve(result);
}

function onKeyDown(e: KeyboardEvent) {
if (e.key === "Escape") {
e.preventDefault();
cleanup(null);
}
}

overlay.addEventListener("mousedown", () => cleanup(null));
document.addEventListener("keydown", onKeyDown);

for (const item of items) {
const btn = document.createElement("button");
btn.type = "button";
btn.textContent = item.label;
btn.className =
"flex w-full items-center gap-2 px-3 py-1.5 text-left text-[11px] text-destructive hover:bg-accent cursor-default";
btn.addEventListener("click", () => cleanup(item.id));
menu.appendChild(btn);
}

document.body.appendChild(overlay);
document.body.appendChild(menu);

// Adjust if menu overflows viewport
requestAnimationFrame(() => {
const rect = menu.getBoundingClientRect();
if (rect.right > window.innerWidth) {
menu.style.left = `${window.innerWidth - rect.width - 4}px`;
}
if (rect.bottom > window.innerHeight) {
menu.style.top = `${window.innerHeight - rect.height - 4}px`;
}
});
});
}
12 changes: 11 additions & 1 deletion apps/web/src/store.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,8 @@ type Action =
| { type: "SET_ERROR"; threadId: string; error: string | null }
| { type: "SET_THREAD_TITLE"; threadId: string; title: string }
| { type: "SET_THREAD_MODEL"; threadId: string; model: string }
| { type: "SET_RUNTIME_MODE"; mode: RuntimeMode };
| { type: "SET_RUNTIME_MODE"; mode: RuntimeMode }
| { type: "DELETE_THREAD"; threadId: string };
Comment on lines +36 to +37

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Active-thread fallback should stay within the same project.
When deleting the active thread, picking the first remaining thread globally can jump the user into an unrelated project. Prefer the next thread in the same project (or null if none).

🔧 Suggested adjustment
 case "DELETE_THREAD": {
+ const deleted = state.threads.find((t) => t.id === action.threadId);
const threads = state.threads.filter((t) => t.id !== action.threadId);
- const activeThreadId =- state.activeThreadId === action.threadId- ? (threads[0]?.id ?? null)- : state.activeThreadId;+ const fallback =+ deleted?.projectId+ ? threads.find((t) => t.projectId === deleted.projectId) ?? null+ : threads[0] ?? null;+ const activeThreadId =+ state.activeThreadId === action.threadId+ ? (fallback?.id ?? null)+ : state.activeThreadId;
return { ...state, threads, activeThreadId };
}

Also applies to: 332-338

🤖 Prompt for AI Agents
In `@apps/renderer/src/store.ts` around lines 45 - 46, The DELETE_THREAD action
currently falls back to the first remaining thread globally which can switch
projects; change the reducer logic that handles { type: "DELETE_THREAD";
threadId: string } so that if the deleted thread equals the current active
thread (activeThreadId) you find the next active thread from the same project
only (e.g., filter threads by projectId === deletedThread.projectId) and set
activeThreadId to that thread's id or null if none; apply the same same-project
fallback change to the other deletion-handling block referenced (the logic
duplicated around the other DELETE_THREAD handling at the second location).


// ── State ────────────────────────────────────────────────────────────

Expand DownExpand Up@@ -375,6 +376,15 @@ export function reducer(state: AppState, action: Action): AppState {
runtimeMode: action.mode,
};

case "DELETE_THREAD": {
const threads = state.threads.filter((t) => t.id !== action.threadId);
const activeThreadId =
state.activeThreadId === action.threadId
? (threads[0]?.id ?? null)
: state.activeThreadId;
return { ...state, threads, activeThreadId };
}

default:
return state;
}
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/vite-env.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import type { NativeApi } from "@t3tools/contracts";
interface DesktopBridge {
getWsUrl: () => string | null;
pickFolder: () => Promise<string | null>;
showContextMenu: (items: readonly { id: string; label: string }[]) => Promise<string | null>;
}

declare global {
Expand Down
12 changes: 12 additions & 0 deletions apps/web/src/wsNativeApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { type NativeApi, WS_CHANNELS, WS_METHODS, type WsWelcomePayload } from "@t3tools/contracts";

import { showContextMenuFallback } from "./contextMenuFallback";
import { WsTransport } from "./wsTransport";

let instance: { api: NativeApi; transport: WsTransport } | null = null;
Expand DownExpand Up@@ -95,6 +96,17 @@ export function createWsNativeApi(): NativeApi {
openInEditor: (cwd, editor) =>
transport.request(WS_METHODS.shellOpenInEditor, { cwd, editor }),
},
contextMenu: {
show: async <T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
): Promise<T | null> => {
if (window.desktopBridge) {
return window.desktopBridge.showContextMenu(items) as Promise<T | null>;
}
return showContextMenuFallback(items, position);
},
},
};

instance = { api, transport };
Expand Down
6 changes: 6 additions & 0 deletions packages/contracts/src/ipc.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,4 +62,10 @@ export interface NativeApi {
shell: {
openInEditor: (cwd: string, editor: EditorId) => Promise<void>;
};
contextMenu: {
show: <T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
) => Promise<T | null>;
};
}
, '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
22 changes: 21 additions & 1 deletion apps/desktop/src/main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,14 @@ import net from "node:net";
import os from "node:os";
import path from "node:path";

import { app, BrowserWindow, dialog, ipcMain } from "electron";
import { app, BrowserWindow, dialog, ipcMain, Menu } from "electron";

import { fixPath } from "./fixPath";

fixPath();

const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const ROOT_DIR = path.resolve(__dirname, "../../..");
const BACKEND_ENTRY = path.join(ROOT_DIR, "apps/server/dist/index.js");
const WEB_ENTRY = path.join(ROOT_DIR, "apps/web/dist/index.html");
Expand DownExpand Up@@ -139,6 +140,25 @@ function registerIpcHandlers(): void {
if (result.canceled) return null;
return result.filePaths[0] ?? null;
});

ipcMain.removeHandler(CONTEXT_MENU_CHANNEL);
ipcMain.handle(CONTEXT_MENU_CHANNEL, async (_event, items: { id: string; label: string }[]) => {
const window = BrowserWindow.getFocusedWindow() ?? mainWindow;
if (!window) return null;

return new Promise<string | null>((resolve) => {
const menu = Menu.buildFromTemplate(
items.map((item) => ({
label: item.label,
click: () => resolve(item.id),
})),
);
menu.popup({
window,
callback: () => resolve(null),
});
});
});
}

function createWindow(): BrowserWindow {
Expand Down
3 changes: 3 additions & 0 deletions apps/desktop/src/preload.ts
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
import { contextBridge, ipcRenderer } from "electron";

const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const wsUrl = process.env.T3CODE_DESKTOP_WS_URL ?? null;

contextBridge.exposeInMainWorld("desktopBridge", {
getWsUrl: () => wsUrl,
pickFolder: () => ipcRenderer.invoke(PICK_FOLDER_CHANNEL) as Promise<string | null>,
showContextMenu: (items: { id: string; label: string }[]) =>
ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items) as Promise<string | null>,
});
32 changes: 32 additions & 0 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,6 +160,31 @@ export default function Sidebar() {
}
};

const handleThreadContextMenu = useCallback(
async (threadId: string, position: { x: number; y: number }) => {
if (!api) return;
const clicked = await api.contextMenu.show([{ id: "delete", label: "Delete" }], position);
if (clicked !== "delete") return;

const thread = state.threads.find((t) => t.id === threadId);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Low

components/Sidebar.tsx:171 The state.threads captured in the closure may become stale while awaiting api.contextMenu.show. Consider re-reading the thread from the current store state after the await returns, before stopping the session.

🚀 Want me to fix this? Reply ex: "fix it for me".

🤖 Prompt for AI
In file apps/web/src/components/Sidebar.tsx around line 171:
The `state.threads` captured in the closure may become stale while awaiting `api.contextMenu.show`. Consider re-reading the thread from the current store state after the await returns, before stopping the session.

if (!thread) return;

// Stop active session if running
if (thread.session?.sessionId) {
try {
await api.providers.stopSession({
sessionId: thread.session.sessionId,
});
} catch {
// Session may already be stopped
}
}

dispatch({ type: "DELETE_THREAD", threadId });
},
[api, dispatch, state.threads],
);
Comment on lines +163 to +186

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Don’t delete the thread if stopping the session fails.
Errors are swallowed and deletion proceeds, which can orphan a running provider session with no UI to stop it. Consider surfacing the error (or at least aborting deletion) unless you can distinguish “already stopped.”

🛡️ Safer flow
 if (thread.session?.sessionId) {
try {
await api.providers.stopSession({
sessionId: thread.session.sessionId,
});
- } catch {- // Session may already be stopped+ } catch (error) {+ // Consider surfacing error so we don't orphan a running session+ return;
}
}
dispatch({ type: "DELETE_THREAD", threadId });
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
consthandleThreadContextMenu=useCallback(
async(threadId: string)=>{
if(!api)return;
constclicked=awaitapi.contextMenu.show([
{id: "delete",label: "Delete"},
]);
if(clicked!=="delete")return;
constthread=state.threads.find((t)=>t.id===threadId);
if(!thread)return;
// Stop active session if running
if(thread.session?.sessionId){
try{
awaitapi.providers.stopSession({
sessionId: thread.session.sessionId,
});
}catch{
// Session may already be stopped
}
}
dispatch({type: "DELETE_THREAD", threadId });
},
[api,dispatch,state.threads],
);
consthandleThreadContextMenu=useCallback(
async(threadId: string)=>{
if(!api)return;
constclicked=awaitapi.contextMenu.show([
{id: "delete",label: "Delete"},
]);
if(clicked!=="delete")return;
constthread=state.threads.find((t)=>t.id===threadId);
if(!thread)return;
// Stop active session if running
if(thread.session?.sessionId){
try{
awaitapi.providers.stopSession({
sessionId: thread.session.sessionId,
});
}catch(error){
// Consider surfacing error so we don't orphan a running session
return;
}
}
dispatch({type: "DELETE_THREAD", threadId });
},
[api,dispatch,state.threads],
);
🤖 Prompt for AI Agents
In `@apps/renderer/src/components/Sidebar.tsx` around lines 87 - 112,
handleThreadContextMenu currently swallows errors from api.providers.stopSession
and proceeds to dispatch DELETE_THREAD, which can orphan an active session;
change the flow in handleThreadContextMenu so that if stopSession throws you do
not delete the thread unless you can detect a harmless "already stopped"
condition—catch the error from api.providers.stopSession, check the error
message/code for an “already stopped” sentinel (or otherwise surface the error
via UI/api.logger) and abort the dispatch({ type: "DELETE_THREAD", ... }) when
stopSession failed, only allowing deletion when stopSession succeeded or the
error explicitly indicates the session was already stopped; reference
handleThreadContextMenu, api.providers.stopSession, and the DELETE_THREAD
dispatch to locate and update the logic.


useEffect(() => {
const onWindowKeyDown = (event: KeyboardEvent) => {
const isNewThreadShortcut =
Expand DownExpand Up@@ -290,6 +315,13 @@ export default function Sidebar() {
threadId: thread.id,
})
}
onContextMenu={(e) => {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Low

components/Sidebar.tsx:320 Consider only calling e.preventDefault() when api.contextMenu.show will actually display a menu. Currently in non-Electron web mode, the native context menu is blocked but nothing appears because desktopBridge is undefined.

🚀 Want me to fix this? Reply ex: "fix it for me".

🤖 Prompt for AI
In file apps/web/src/components/Sidebar.tsx around line 320:
Consider only calling `e.preventDefault()` when `api.contextMenu.show` will actually display a menu. Currently in non-Electron web mode, the native context menu is blocked but nothing appears because `desktopBridge` is undefined.

e.preventDefault();
void handleThreadContextMenu(thread.id, {
x: e.clientX,
y: e.clientY,
});
}}
>
<div className="flex min-w-0 flex-1 items-center gap-1.5">
{threadStatus && (
Expand Down
64 changes: 64 additions & 0 deletions apps/web/src/contextMenuFallback.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
/**
* Imperative DOM-based context menu for non-Electron environments.
* Shows a positioned dropdown and returns a promise that resolves
* with the clicked item id, or null if dismissed.
*/
export function showContextMenuFallback<T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
): Promise<T | null> {
return new Promise<T | null>((resolve) => {
const overlay = document.createElement("div");
overlay.style.cssText = "position:fixed;inset:0;z-index:9999";

const menu = document.createElement("div");
menu.className =
"fixed z-[10000] min-w-[140px] rounded-md border border-border bg-popover py-1 shadow-xl animate-in fade-in zoom-in-95";

const x = position?.x ?? 0;
const y = position?.y ?? 0;
menu.style.top = `${y}px`;
menu.style.left = `${x}px`;

function cleanup(result: T | null) {
document.removeEventListener("keydown", onKeyDown);
overlay.remove();
menu.remove();
resolve(result);
}

function onKeyDown(e: KeyboardEvent) {
if (e.key === "Escape") {
e.preventDefault();
cleanup(null);
}
}

overlay.addEventListener("mousedown", () => cleanup(null));
document.addEventListener("keydown", onKeyDown);

for (const item of items) {
const btn = document.createElement("button");
btn.type = "button";
btn.textContent = item.label;
btn.className =
"flex w-full items-center gap-2 px-3 py-1.5 text-left text-[11px] text-destructive hover:bg-accent cursor-default";
btn.addEventListener("click", () => cleanup(item.id));
menu.appendChild(btn);
}

document.body.appendChild(overlay);
document.body.appendChild(menu);

// Adjust if menu overflows viewport
requestAnimationFrame(() => {
const rect = menu.getBoundingClientRect();
if (rect.right > window.innerWidth) {
menu.style.left = `${window.innerWidth - rect.width - 4}px`;
}
if (rect.bottom > window.innerHeight) {
menu.style.top = `${window.innerHeight - rect.height - 4}px`;
}
});
});
}
12 changes: 11 additions & 1 deletion apps/web/src/store.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,8 @@ type Action =
| { type: "SET_ERROR"; threadId: string; error: string | null }
| { type: "SET_THREAD_TITLE"; threadId: string; title: string }
| { type: "SET_THREAD_MODEL"; threadId: string; model: string }
| { type: "SET_RUNTIME_MODE"; mode: RuntimeMode };
| { type: "SET_RUNTIME_MODE"; mode: RuntimeMode }
| { type: "DELETE_THREAD"; threadId: string };
Comment on lines +36 to +37

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Active-thread fallback should stay within the same project.
When deleting the active thread, picking the first remaining thread globally can jump the user into an unrelated project. Prefer the next thread in the same project (or null if none).

🔧 Suggested adjustment
 case "DELETE_THREAD": {
+ const deleted = state.threads.find((t) => t.id === action.threadId);
const threads = state.threads.filter((t) => t.id !== action.threadId);
- const activeThreadId =- state.activeThreadId === action.threadId- ? (threads[0]?.id ?? null)- : state.activeThreadId;+ const fallback =+ deleted?.projectId+ ? threads.find((t) => t.projectId === deleted.projectId) ?? null+ : threads[0] ?? null;+ const activeThreadId =+ state.activeThreadId === action.threadId+ ? (fallback?.id ?? null)+ : state.activeThreadId;
return { ...state, threads, activeThreadId };
}

Also applies to: 332-338

🤖 Prompt for AI Agents
In `@apps/renderer/src/store.ts` around lines 45 - 46, The DELETE_THREAD action
currently falls back to the first remaining thread globally which can switch
projects; change the reducer logic that handles { type: "DELETE_THREAD";
threadId: string } so that if the deleted thread equals the current active
thread (activeThreadId) you find the next active thread from the same project
only (e.g., filter threads by projectId === deletedThread.projectId) and set
activeThreadId to that thread's id or null if none; apply the same same-project
fallback change to the other deletion-handling block referenced (the logic
duplicated around the other DELETE_THREAD handling at the second location).


// ── State ────────────────────────────────────────────────────────────

Expand DownExpand Up@@ -375,6 +376,15 @@ export function reducer(state: AppState, action: Action): AppState {
runtimeMode: action.mode,
};

case "DELETE_THREAD": {
const threads = state.threads.filter((t) => t.id !== action.threadId);
const activeThreadId =
state.activeThreadId === action.threadId
? (threads[0]?.id ?? null)
: state.activeThreadId;
return { ...state, threads, activeThreadId };
}

default:
return state;
}
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/vite-env.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import type { NativeApi } from "@t3tools/contracts";
interface DesktopBridge {
getWsUrl: () => string | null;
pickFolder: () => Promise<string | null>;
showContextMenu: (items: readonly { id: string; label: string }[]) => Promise<string | null>;
}

declare global {
Expand Down
12 changes: 12 additions & 0 deletions apps/web/src/wsNativeApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { type NativeApi, WS_CHANNELS, WS_METHODS, type WsWelcomePayload } from "@t3tools/contracts";

import { showContextMenuFallback } from "./contextMenuFallback";
import { WsTransport } from "./wsTransport";

let instance: { api: NativeApi; transport: WsTransport } | null = null;
Expand DownExpand Up@@ -95,6 +96,17 @@ export function createWsNativeApi(): NativeApi {
openInEditor: (cwd, editor) =>
transport.request(WS_METHODS.shellOpenInEditor, { cwd, editor }),
},
contextMenu: {
show: async <T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
): Promise<T | null> => {
if (window.desktopBridge) {
return window.desktopBridge.showContextMenu(items) as Promise<T | null>;
}
return showContextMenuFallback(items, position);
},
},
};

instance = { api, transport };
Expand Down
6 changes: 6 additions & 0 deletions packages/contracts/src/ipc.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,4 +62,10 @@ export interface NativeApi {
shell: {
openInEditor: (cwd: string, editor: EditorId) => Promise<void>;
};
contextMenu: {
show: <T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
) => Promise<T | null>;
};
}
, '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
22 changes: 21 additions & 1 deletion apps/desktop/src/main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,14 @@ import net from "node:net";
import os from "node:os";
import path from "node:path";

import { app, BrowserWindow, dialog, ipcMain } from "electron";
import { app, BrowserWindow, dialog, ipcMain, Menu } from "electron";

import { fixPath } from "./fixPath";

fixPath();

const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const ROOT_DIR = path.resolve(__dirname, "../../..");
const BACKEND_ENTRY = path.join(ROOT_DIR, "apps/server/dist/index.js");
const WEB_ENTRY = path.join(ROOT_DIR, "apps/web/dist/index.html");
Expand DownExpand Up@@ -139,6 +140,25 @@ function registerIpcHandlers(): void {
if (result.canceled) return null;
return result.filePaths[0] ?? null;
});

ipcMain.removeHandler(CONTEXT_MENU_CHANNEL);
ipcMain.handle(CONTEXT_MENU_CHANNEL, async (_event, items: { id: string; label: string }[]) => {
const window = BrowserWindow.getFocusedWindow() ?? mainWindow;
if (!window) return null;

return new Promise<string | null>((resolve) => {
const menu = Menu.buildFromTemplate(
items.map((item) => ({
label: item.label,
click: () => resolve(item.id),
})),
);
menu.popup({
window,
callback: () => resolve(null),
});
});
});
}

function createWindow(): BrowserWindow {
Expand Down
3 changes: 3 additions & 0 deletions apps/desktop/src/preload.ts
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
import { contextBridge, ipcRenderer } from "electron";

const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const wsUrl = process.env.T3CODE_DESKTOP_WS_URL ?? null;

contextBridge.exposeInMainWorld("desktopBridge", {
getWsUrl: () => wsUrl,
pickFolder: () => ipcRenderer.invoke(PICK_FOLDER_CHANNEL) as Promise<string | null>,
showContextMenu: (items: { id: string; label: string }[]) =>
ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items) as Promise<string | null>,
});
32 changes: 32 additions & 0 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,6 +160,31 @@ export default function Sidebar() {
}
};

const handleThreadContextMenu = useCallback(
async (threadId: string, position: { x: number; y: number }) => {
if (!api) return;
const clicked = await api.contextMenu.show([{ id: "delete", label: "Delete" }], position);
if (clicked !== "delete") return;

const thread = state.threads.find((t) => t.id === threadId);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Low

components/Sidebar.tsx:171 The state.threads captured in the closure may become stale while awaiting api.contextMenu.show. Consider re-reading the thread from the current store state after the await returns, before stopping the session.

🚀 Want me to fix this? Reply ex: "fix it for me".

🤖 Prompt for AI
In file apps/web/src/components/Sidebar.tsx around line 171:
The `state.threads` captured in the closure may become stale while awaiting `api.contextMenu.show`. Consider re-reading the thread from the current store state after the await returns, before stopping the session.

if (!thread) return;

// Stop active session if running
if (thread.session?.sessionId) {
try {
await api.providers.stopSession({
sessionId: thread.session.sessionId,
});
} catch {
// Session may already be stopped
}
}

dispatch({ type: "DELETE_THREAD", threadId });
},
[api, dispatch, state.threads],
);
Comment on lines +163 to +186

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Don’t delete the thread if stopping the session fails.
Errors are swallowed and deletion proceeds, which can orphan a running provider session with no UI to stop it. Consider surfacing the error (or at least aborting deletion) unless you can distinguish “already stopped.”

🛡️ Safer flow
 if (thread.session?.sessionId) {
try {
await api.providers.stopSession({
sessionId: thread.session.sessionId,
});
- } catch {- // Session may already be stopped+ } catch (error) {+ // Consider surfacing error so we don't orphan a running session+ return;
}
}
dispatch({ type: "DELETE_THREAD", threadId });
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
consthandleThreadContextMenu=useCallback(
async(threadId: string)=>{
if(!api)return;
constclicked=awaitapi.contextMenu.show([
{id: "delete",label: "Delete"},
]);
if(clicked!=="delete")return;
constthread=state.threads.find((t)=>t.id===threadId);
if(!thread)return;
// Stop active session if running
if(thread.session?.sessionId){
try{
awaitapi.providers.stopSession({
sessionId: thread.session.sessionId,
});
}catch{
// Session may already be stopped
}
}
dispatch({type: "DELETE_THREAD", threadId });
},
[api,dispatch,state.threads],
);
consthandleThreadContextMenu=useCallback(
async(threadId: string)=>{
if(!api)return;
constclicked=awaitapi.contextMenu.show([
{id: "delete",label: "Delete"},
]);
if(clicked!=="delete")return;
constthread=state.threads.find((t)=>t.id===threadId);
if(!thread)return;
// Stop active session if running
if(thread.session?.sessionId){
try{
awaitapi.providers.stopSession({
sessionId: thread.session.sessionId,
});
}catch(error){
// Consider surfacing error so we don't orphan a running session
return;
}
}
dispatch({type: "DELETE_THREAD", threadId });
},
[api,dispatch,state.threads],
);
🤖 Prompt for AI Agents
In `@apps/renderer/src/components/Sidebar.tsx` around lines 87 - 112,
handleThreadContextMenu currently swallows errors from api.providers.stopSession
and proceeds to dispatch DELETE_THREAD, which can orphan an active session;
change the flow in handleThreadContextMenu so that if stopSession throws you do
not delete the thread unless you can detect a harmless "already stopped"
condition—catch the error from api.providers.stopSession, check the error
message/code for an “already stopped” sentinel (or otherwise surface the error
via UI/api.logger) and abort the dispatch({ type: "DELETE_THREAD", ... }) when
stopSession failed, only allowing deletion when stopSession succeeded or the
error explicitly indicates the session was already stopped; reference
handleThreadContextMenu, api.providers.stopSession, and the DELETE_THREAD
dispatch to locate and update the logic.


useEffect(() => {
const onWindowKeyDown = (event: KeyboardEvent) => {
const isNewThreadShortcut =
Expand DownExpand Up@@ -290,6 +315,13 @@ export default function Sidebar() {
threadId: thread.id,
})
}
onContextMenu={(e) => {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Low

components/Sidebar.tsx:320 Consider only calling e.preventDefault() when api.contextMenu.show will actually display a menu. Currently in non-Electron web mode, the native context menu is blocked but nothing appears because desktopBridge is undefined.

🚀 Want me to fix this? Reply ex: "fix it for me".

🤖 Prompt for AI
In file apps/web/src/components/Sidebar.tsx around line 320:
Consider only calling `e.preventDefault()` when `api.contextMenu.show` will actually display a menu. Currently in non-Electron web mode, the native context menu is blocked but nothing appears because `desktopBridge` is undefined.

e.preventDefault();
void handleThreadContextMenu(thread.id, {
x: e.clientX,
y: e.clientY,
});
}}
>
<div className="flex min-w-0 flex-1 items-center gap-1.5">
{threadStatus && (
Expand Down
64 changes: 64 additions & 0 deletions apps/web/src/contextMenuFallback.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
/**
* Imperative DOM-based context menu for non-Electron environments.
* Shows a positioned dropdown and returns a promise that resolves
* with the clicked item id, or null if dismissed.
*/
export function showContextMenuFallback<T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
): Promise<T | null> {
return new Promise<T | null>((resolve) => {
const overlay = document.createElement("div");
overlay.style.cssText = "position:fixed;inset:0;z-index:9999";

const menu = document.createElement("div");
menu.className =
"fixed z-[10000] min-w-[140px] rounded-md border border-border bg-popover py-1 shadow-xl animate-in fade-in zoom-in-95";

const x = position?.x ?? 0;
const y = position?.y ?? 0;
menu.style.top = `${y}px`;
menu.style.left = `${x}px`;

function cleanup(result: T | null) {
document.removeEventListener("keydown", onKeyDown);
overlay.remove();
menu.remove();
resolve(result);
}

function onKeyDown(e: KeyboardEvent) {
if (e.key === "Escape") {
e.preventDefault();
cleanup(null);
}
}

overlay.addEventListener("mousedown", () => cleanup(null));
document.addEventListener("keydown", onKeyDown);

for (const item of items) {
const btn = document.createElement("button");
btn.type = "button";
btn.textContent = item.label;
btn.className =
"flex w-full items-center gap-2 px-3 py-1.5 text-left text-[11px] text-destructive hover:bg-accent cursor-default";
btn.addEventListener("click", () => cleanup(item.id));
menu.appendChild(btn);
}

document.body.appendChild(overlay);
document.body.appendChild(menu);

// Adjust if menu overflows viewport
requestAnimationFrame(() => {
const rect = menu.getBoundingClientRect();
if (rect.right > window.innerWidth) {
menu.style.left = `${window.innerWidth - rect.width - 4}px`;
}
if (rect.bottom > window.innerHeight) {
menu.style.top = `${window.innerHeight - rect.height - 4}px`;
}
});
});
}
12 changes: 11 additions & 1 deletion apps/web/src/store.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,8 @@ type Action =
| { type: "SET_ERROR"; threadId: string; error: string | null }
| { type: "SET_THREAD_TITLE"; threadId: string; title: string }
| { type: "SET_THREAD_MODEL"; threadId: string; model: string }
| { type: "SET_RUNTIME_MODE"; mode: RuntimeMode };
| { type: "SET_RUNTIME_MODE"; mode: RuntimeMode }
| { type: "DELETE_THREAD"; threadId: string };
Comment on lines +36 to +37

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Active-thread fallback should stay within the same project.
When deleting the active thread, picking the first remaining thread globally can jump the user into an unrelated project. Prefer the next thread in the same project (or null if none).

🔧 Suggested adjustment
 case "DELETE_THREAD": {
+ const deleted = state.threads.find((t) => t.id === action.threadId);
const threads = state.threads.filter((t) => t.id !== action.threadId);
- const activeThreadId =- state.activeThreadId === action.threadId- ? (threads[0]?.id ?? null)- : state.activeThreadId;+ const fallback =+ deleted?.projectId+ ? threads.find((t) => t.projectId === deleted.projectId) ?? null+ : threads[0] ?? null;+ const activeThreadId =+ state.activeThreadId === action.threadId+ ? (fallback?.id ?? null)+ : state.activeThreadId;
return { ...state, threads, activeThreadId };
}

Also applies to: 332-338

🤖 Prompt for AI Agents
In `@apps/renderer/src/store.ts` around lines 45 - 46, The DELETE_THREAD action
currently falls back to the first remaining thread globally which can switch
projects; change the reducer logic that handles { type: "DELETE_THREAD";
threadId: string } so that if the deleted thread equals the current active
thread (activeThreadId) you find the next active thread from the same project
only (e.g., filter threads by projectId === deletedThread.projectId) and set
activeThreadId to that thread's id or null if none; apply the same same-project
fallback change to the other deletion-handling block referenced (the logic
duplicated around the other DELETE_THREAD handling at the second location).


// ── State ────────────────────────────────────────────────────────────

Expand DownExpand Up@@ -375,6 +376,15 @@ export function reducer(state: AppState, action: Action): AppState {
runtimeMode: action.mode,
};

case "DELETE_THREAD": {
const threads = state.threads.filter((t) => t.id !== action.threadId);
const activeThreadId =
state.activeThreadId === action.threadId
? (threads[0]?.id ?? null)
: state.activeThreadId;
return { ...state, threads, activeThreadId };
}

default:
return state;
}
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/vite-env.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import type { NativeApi } from "@t3tools/contracts";
interface DesktopBridge {
getWsUrl: () => string | null;
pickFolder: () => Promise<string | null>;
showContextMenu: (items: readonly { id: string; label: string }[]) => Promise<string | null>;
}

declare global {
Expand Down
12 changes: 12 additions & 0 deletions apps/web/src/wsNativeApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { type NativeApi, WS_CHANNELS, WS_METHODS, type WsWelcomePayload } from "@t3tools/contracts";

import { showContextMenuFallback } from "./contextMenuFallback";
import { WsTransport } from "./wsTransport";

let instance: { api: NativeApi; transport: WsTransport } | null = null;
Expand DownExpand Up@@ -95,6 +96,17 @@ export function createWsNativeApi(): NativeApi {
openInEditor: (cwd, editor) =>
transport.request(WS_METHODS.shellOpenInEditor, { cwd, editor }),
},
contextMenu: {
show: async <T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
): Promise<T | null> => {
if (window.desktopBridge) {
return window.desktopBridge.showContextMenu(items) as Promise<T | null>;
}
return showContextMenuFallback(items, position);
},
},
};

instance = { api, transport };
Expand Down
6 changes: 6 additions & 0 deletions packages/contracts/src/ipc.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,4 +62,10 @@ export interface NativeApi {
shell: {
openInEditor: (cwd: string, editor: EditorId) => Promise<void>;
};
contextMenu: {
show: <T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
) => Promise<T | null>;
};
}
, '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
22 changes: 21 additions & 1 deletion apps/desktop/src/main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,14 @@ import net from "node:net";
import os from "node:os";
import path from "node:path";

import { app, BrowserWindow, dialog, ipcMain } from "electron";
import { app, BrowserWindow, dialog, ipcMain, Menu } from "electron";

import { fixPath } from "./fixPath";

fixPath();

const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const ROOT_DIR = path.resolve(__dirname, "../../..");
const BACKEND_ENTRY = path.join(ROOT_DIR, "apps/server/dist/index.js");
const WEB_ENTRY = path.join(ROOT_DIR, "apps/web/dist/index.html");
Expand DownExpand Up@@ -139,6 +140,25 @@ function registerIpcHandlers(): void {
if (result.canceled) return null;
return result.filePaths[0] ?? null;
});

ipcMain.removeHandler(CONTEXT_MENU_CHANNEL);
ipcMain.handle(CONTEXT_MENU_CHANNEL, async (_event, items: { id: string; label: string }[]) => {
const window = BrowserWindow.getFocusedWindow() ?? mainWindow;
if (!window) return null;

return new Promise<string | null>((resolve) => {
const menu = Menu.buildFromTemplate(
items.map((item) => ({
label: item.label,
click: () => resolve(item.id),
})),
);
menu.popup({
window,
callback: () => resolve(null),
});
});
});
}

function createWindow(): BrowserWindow {
Expand Down
3 changes: 3 additions & 0 deletions apps/desktop/src/preload.ts
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
import { contextBridge, ipcRenderer } from "electron";

const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const wsUrl = process.env.T3CODE_DESKTOP_WS_URL ?? null;

contextBridge.exposeInMainWorld("desktopBridge", {
getWsUrl: () => wsUrl,
pickFolder: () => ipcRenderer.invoke(PICK_FOLDER_CHANNEL) as Promise<string | null>,
showContextMenu: (items: { id: string; label: string }[]) =>
ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items) as Promise<string | null>,
});
32 changes: 32 additions & 0 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,6 +160,31 @@ export default function Sidebar() {
}
};

const handleThreadContextMenu = useCallback(
async (threadId: string, position: { x: number; y: number }) => {
if (!api) return;
const clicked = await api.contextMenu.show([{ id: "delete", label: "Delete" }], position);
if (clicked !== "delete") return;

const thread = state.threads.find((t) => t.id === threadId);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Low

components/Sidebar.tsx:171 The state.threads captured in the closure may become stale while awaiting api.contextMenu.show. Consider re-reading the thread from the current store state after the await returns, before stopping the session.

🚀 Want me to fix this? Reply ex: "fix it for me".

🤖 Prompt for AI
In file apps/web/src/components/Sidebar.tsx around line 171:
The `state.threads` captured in the closure may become stale while awaiting `api.contextMenu.show`. Consider re-reading the thread from the current store state after the await returns, before stopping the session.

if (!thread) return;

// Stop active session if running
if (thread.session?.sessionId) {
try {
await api.providers.stopSession({
sessionId: thread.session.sessionId,
});
} catch {
// Session may already be stopped
}
}

dispatch({ type: "DELETE_THREAD", threadId });
},
[api, dispatch, state.threads],
);
Comment on lines +163 to +186

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Don’t delete the thread if stopping the session fails.
Errors are swallowed and deletion proceeds, which can orphan a running provider session with no UI to stop it. Consider surfacing the error (or at least aborting deletion) unless you can distinguish “already stopped.”

🛡️ Safer flow
 if (thread.session?.sessionId) {
try {
await api.providers.stopSession({
sessionId: thread.session.sessionId,
});
- } catch {- // Session may already be stopped+ } catch (error) {+ // Consider surfacing error so we don't orphan a running session+ return;
}
}
dispatch({ type: "DELETE_THREAD", threadId });
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
consthandleThreadContextMenu=useCallback(
async(threadId: string)=>{
if(!api)return;
constclicked=awaitapi.contextMenu.show([
{id: "delete",label: "Delete"},
]);
if(clicked!=="delete")return;
constthread=state.threads.find((t)=>t.id===threadId);
if(!thread)return;
// Stop active session if running
if(thread.session?.sessionId){
try{
awaitapi.providers.stopSession({
sessionId: thread.session.sessionId,
});
}catch{
// Session may already be stopped
}
}
dispatch({type: "DELETE_THREAD", threadId });
},
[api,dispatch,state.threads],
);
consthandleThreadContextMenu=useCallback(
async(threadId: string)=>{
if(!api)return;
constclicked=awaitapi.contextMenu.show([
{id: "delete",label: "Delete"},
]);
if(clicked!=="delete")return;
constthread=state.threads.find((t)=>t.id===threadId);
if(!thread)return;
// Stop active session if running
if(thread.session?.sessionId){
try{
awaitapi.providers.stopSession({
sessionId: thread.session.sessionId,
});
}catch(error){
// Consider surfacing error so we don't orphan a running session
return;
}
}
dispatch({type: "DELETE_THREAD", threadId });
},
[api,dispatch,state.threads],
);
🤖 Prompt for AI Agents
In `@apps/renderer/src/components/Sidebar.tsx` around lines 87 - 112,
handleThreadContextMenu currently swallows errors from api.providers.stopSession
and proceeds to dispatch DELETE_THREAD, which can orphan an active session;
change the flow in handleThreadContextMenu so that if stopSession throws you do
not delete the thread unless you can detect a harmless "already stopped"
condition—catch the error from api.providers.stopSession, check the error
message/code for an “already stopped” sentinel (or otherwise surface the error
via UI/api.logger) and abort the dispatch({ type: "DELETE_THREAD", ... }) when
stopSession failed, only allowing deletion when stopSession succeeded or the
error explicitly indicates the session was already stopped; reference
handleThreadContextMenu, api.providers.stopSession, and the DELETE_THREAD
dispatch to locate and update the logic.


useEffect(() => {
const onWindowKeyDown = (event: KeyboardEvent) => {
const isNewThreadShortcut =
Expand DownExpand Up@@ -290,6 +315,13 @@ export default function Sidebar() {
threadId: thread.id,
})
}
onContextMenu={(e) => {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Low

components/Sidebar.tsx:320 Consider only calling e.preventDefault() when api.contextMenu.show will actually display a menu. Currently in non-Electron web mode, the native context menu is blocked but nothing appears because desktopBridge is undefined.

🚀 Want me to fix this? Reply ex: "fix it for me".

🤖 Prompt for AI
In file apps/web/src/components/Sidebar.tsx around line 320:
Consider only calling `e.preventDefault()` when `api.contextMenu.show` will actually display a menu. Currently in non-Electron web mode, the native context menu is blocked but nothing appears because `desktopBridge` is undefined.

e.preventDefault();
void handleThreadContextMenu(thread.id, {
x: e.clientX,
y: e.clientY,
});
}}
>
<div className="flex min-w-0 flex-1 items-center gap-1.5">
{threadStatus && (
Expand Down
64 changes: 64 additions & 0 deletions apps/web/src/contextMenuFallback.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
/**
* Imperative DOM-based context menu for non-Electron environments.
* Shows a positioned dropdown and returns a promise that resolves
* with the clicked item id, or null if dismissed.
*/
export function showContextMenuFallback<T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
): Promise<T | null> {
return new Promise<T | null>((resolve) => {
const overlay = document.createElement("div");
overlay.style.cssText = "position:fixed;inset:0;z-index:9999";

const menu = document.createElement("div");
menu.className =
"fixed z-[10000] min-w-[140px] rounded-md border border-border bg-popover py-1 shadow-xl animate-in fade-in zoom-in-95";

const x = position?.x ?? 0;
const y = position?.y ?? 0;
menu.style.top = `${y}px`;
menu.style.left = `${x}px`;

function cleanup(result: T | null) {
document.removeEventListener("keydown", onKeyDown);
overlay.remove();
menu.remove();
resolve(result);
}

function onKeyDown(e: KeyboardEvent) {
if (e.key === "Escape") {
e.preventDefault();
cleanup(null);
}
}

overlay.addEventListener("mousedown", () => cleanup(null));
document.addEventListener("keydown", onKeyDown);

for (const item of items) {
const btn = document.createElement("button");
btn.type = "button";
btn.textContent = item.label;
btn.className =
"flex w-full items-center gap-2 px-3 py-1.5 text-left text-[11px] text-destructive hover:bg-accent cursor-default";
btn.addEventListener("click", () => cleanup(item.id));
menu.appendChild(btn);
}

document.body.appendChild(overlay);
document.body.appendChild(menu);

// Adjust if menu overflows viewport
requestAnimationFrame(() => {
const rect = menu.getBoundingClientRect();
if (rect.right > window.innerWidth) {
menu.style.left = `${window.innerWidth - rect.width - 4}px`;
}
if (rect.bottom > window.innerHeight) {
menu.style.top = `${window.innerHeight - rect.height - 4}px`;
}
});
});
}
12 changes: 11 additions & 1 deletion apps/web/src/store.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,8 @@ type Action =
| { type: "SET_ERROR"; threadId: string; error: string | null }
| { type: "SET_THREAD_TITLE"; threadId: string; title: string }
| { type: "SET_THREAD_MODEL"; threadId: string; model: string }
| { type: "SET_RUNTIME_MODE"; mode: RuntimeMode };
| { type: "SET_RUNTIME_MODE"; mode: RuntimeMode }
| { type: "DELETE_THREAD"; threadId: string };
Comment on lines +36 to +37

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Active-thread fallback should stay within the same project.
When deleting the active thread, picking the first remaining thread globally can jump the user into an unrelated project. Prefer the next thread in the same project (or null if none).

🔧 Suggested adjustment
 case "DELETE_THREAD": {
+ const deleted = state.threads.find((t) => t.id === action.threadId);
const threads = state.threads.filter((t) => t.id !== action.threadId);
- const activeThreadId =- state.activeThreadId === action.threadId- ? (threads[0]?.id ?? null)- : state.activeThreadId;+ const fallback =+ deleted?.projectId+ ? threads.find((t) => t.projectId === deleted.projectId) ?? null+ : threads[0] ?? null;+ const activeThreadId =+ state.activeThreadId === action.threadId+ ? (fallback?.id ?? null)+ : state.activeThreadId;
return { ...state, threads, activeThreadId };
}

Also applies to: 332-338

🤖 Prompt for AI Agents
In `@apps/renderer/src/store.ts` around lines 45 - 46, The DELETE_THREAD action
currently falls back to the first remaining thread globally which can switch
projects; change the reducer logic that handles { type: "DELETE_THREAD";
threadId: string } so that if the deleted thread equals the current active
thread (activeThreadId) you find the next active thread from the same project
only (e.g., filter threads by projectId === deletedThread.projectId) and set
activeThreadId to that thread's id or null if none; apply the same same-project
fallback change to the other deletion-handling block referenced (the logic
duplicated around the other DELETE_THREAD handling at the second location).


// ── State ────────────────────────────────────────────────────────────

Expand DownExpand Up@@ -375,6 +376,15 @@ export function reducer(state: AppState, action: Action): AppState {
runtimeMode: action.mode,
};

case "DELETE_THREAD": {
const threads = state.threads.filter((t) => t.id !== action.threadId);
const activeThreadId =
state.activeThreadId === action.threadId
? (threads[0]?.id ?? null)
: state.activeThreadId;
return { ...state, threads, activeThreadId };
}

default:
return state;
}
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/vite-env.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import type { NativeApi } from "@t3tools/contracts";
interface DesktopBridge {
getWsUrl: () => string | null;
pickFolder: () => Promise<string | null>;
showContextMenu: (items: readonly { id: string; label: string }[]) => Promise<string | null>;
}

declare global {
Expand Down
12 changes: 12 additions & 0 deletions apps/web/src/wsNativeApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { type NativeApi, WS_CHANNELS, WS_METHODS, type WsWelcomePayload } from "@t3tools/contracts";

import { showContextMenuFallback } from "./contextMenuFallback";
import { WsTransport } from "./wsTransport";

let instance: { api: NativeApi; transport: WsTransport } | null = null;
Expand DownExpand Up@@ -95,6 +96,17 @@ export function createWsNativeApi(): NativeApi {
openInEditor: (cwd, editor) =>
transport.request(WS_METHODS.shellOpenInEditor, { cwd, editor }),
},
contextMenu: {
show: async <T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
): Promise<T | null> => {
if (window.desktopBridge) {
return window.desktopBridge.showContextMenu(items) as Promise<T | null>;
}
return showContextMenuFallback(items, position);
},
},
};

instance = { api, transport };
Expand Down
6 changes: 6 additions & 0 deletions packages/contracts/src/ipc.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,4 +62,10 @@ export interface NativeApi {
shell: {
openInEditor: (cwd: string, editor: EditorId) => Promise<void>;
};
contextMenu: {
show: <T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
) => Promise<T | null>;
};
}
, '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
22 changes: 21 additions & 1 deletion apps/desktop/src/main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,14 @@ import net from "node:net";
import os from "node:os";
import path from "node:path";

import { app, BrowserWindow, dialog, ipcMain } from "electron";
import { app, BrowserWindow, dialog, ipcMain, Menu } from "electron";

import { fixPath } from "./fixPath";

fixPath();

const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const ROOT_DIR = path.resolve(__dirname, "../../..");
const BACKEND_ENTRY = path.join(ROOT_DIR, "apps/server/dist/index.js");
const WEB_ENTRY = path.join(ROOT_DIR, "apps/web/dist/index.html");
Expand DownExpand Up@@ -139,6 +140,25 @@ function registerIpcHandlers(): void {
if (result.canceled) return null;
return result.filePaths[0] ?? null;
});

ipcMain.removeHandler(CONTEXT_MENU_CHANNEL);
ipcMain.handle(CONTEXT_MENU_CHANNEL, async (_event, items: { id: string; label: string }[]) => {
const window = BrowserWindow.getFocusedWindow() ?? mainWindow;
if (!window) return null;

return new Promise<string | null>((resolve) => {
const menu = Menu.buildFromTemplate(
items.map((item) => ({
label: item.label,
click: () => resolve(item.id),
})),
);
menu.popup({
window,
callback: () => resolve(null),
});
});
});
}

function createWindow(): BrowserWindow {
Expand Down
3 changes: 3 additions & 0 deletions apps/desktop/src/preload.ts
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
import { contextBridge, ipcRenderer } from "electron";

const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const wsUrl = process.env.T3CODE_DESKTOP_WS_URL ?? null;

contextBridge.exposeInMainWorld("desktopBridge", {
getWsUrl: () => wsUrl,
pickFolder: () => ipcRenderer.invoke(PICK_FOLDER_CHANNEL) as Promise<string | null>,
showContextMenu: (items: { id: string; label: string }[]) =>
ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items) as Promise<string | null>,
});
32 changes: 32 additions & 0 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,6 +160,31 @@ export default function Sidebar() {
}
};

const handleThreadContextMenu = useCallback(
async (threadId: string, position: { x: number; y: number }) => {
if (!api) return;
const clicked = await api.contextMenu.show([{ id: "delete", label: "Delete" }], position);
if (clicked !== "delete") return;

const thread = state.threads.find((t) => t.id === threadId);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Low

components/Sidebar.tsx:171 The state.threads captured in the closure may become stale while awaiting api.contextMenu.show. Consider re-reading the thread from the current store state after the await returns, before stopping the session.

🚀 Want me to fix this? Reply ex: "fix it for me".

🤖 Prompt for AI
In file apps/web/src/components/Sidebar.tsx around line 171:
The `state.threads` captured in the closure may become stale while awaiting `api.contextMenu.show`. Consider re-reading the thread from the current store state after the await returns, before stopping the session.

if (!thread) return;

// Stop active session if running
if (thread.session?.sessionId) {
try {
await api.providers.stopSession({
sessionId: thread.session.sessionId,
});
} catch {
// Session may already be stopped
}
}

dispatch({ type: "DELETE_THREAD", threadId });
},
[api, dispatch, state.threads],
);
Comment on lines +163 to +186

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Don’t delete the thread if stopping the session fails.
Errors are swallowed and deletion proceeds, which can orphan a running provider session with no UI to stop it. Consider surfacing the error (or at least aborting deletion) unless you can distinguish “already stopped.”

🛡️ Safer flow
 if (thread.session?.sessionId) {
try {
await api.providers.stopSession({
sessionId: thread.session.sessionId,
});
- } catch {- // Session may already be stopped+ } catch (error) {+ // Consider surfacing error so we don't orphan a running session+ return;
}
}
dispatch({ type: "DELETE_THREAD", threadId });
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
consthandleThreadContextMenu=useCallback(
async(threadId: string)=>{
if(!api)return;
constclicked=awaitapi.contextMenu.show([
{id: "delete",label: "Delete"},
]);
if(clicked!=="delete")return;
constthread=state.threads.find((t)=>t.id===threadId);
if(!thread)return;
// Stop active session if running
if(thread.session?.sessionId){
try{
awaitapi.providers.stopSession({
sessionId: thread.session.sessionId,
});
}catch{
// Session may already be stopped
}
}
dispatch({type: "DELETE_THREAD", threadId });
},
[api,dispatch,state.threads],
);
consthandleThreadContextMenu=useCallback(
async(threadId: string)=>{
if(!api)return;
constclicked=awaitapi.contextMenu.show([
{id: "delete",label: "Delete"},
]);
if(clicked!=="delete")return;
constthread=state.threads.find((t)=>t.id===threadId);
if(!thread)return;
// Stop active session if running
if(thread.session?.sessionId){
try{
awaitapi.providers.stopSession({
sessionId: thread.session.sessionId,
});
}catch(error){
// Consider surfacing error so we don't orphan a running session
return;
}
}
dispatch({type: "DELETE_THREAD", threadId });
},
[api,dispatch,state.threads],
);
🤖 Prompt for AI Agents
In `@apps/renderer/src/components/Sidebar.tsx` around lines 87 - 112,
handleThreadContextMenu currently swallows errors from api.providers.stopSession
and proceeds to dispatch DELETE_THREAD, which can orphan an active session;
change the flow in handleThreadContextMenu so that if stopSession throws you do
not delete the thread unless you can detect a harmless "already stopped"
condition—catch the error from api.providers.stopSession, check the error
message/code for an “already stopped” sentinel (or otherwise surface the error
via UI/api.logger) and abort the dispatch({ type: "DELETE_THREAD", ... }) when
stopSession failed, only allowing deletion when stopSession succeeded or the
error explicitly indicates the session was already stopped; reference
handleThreadContextMenu, api.providers.stopSession, and the DELETE_THREAD
dispatch to locate and update the logic.


useEffect(() => {
const onWindowKeyDown = (event: KeyboardEvent) => {
const isNewThreadShortcut =
Expand DownExpand Up@@ -290,6 +315,13 @@ export default function Sidebar() {
threadId: thread.id,
})
}
onContextMenu={(e) => {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Low

components/Sidebar.tsx:320 Consider only calling e.preventDefault() when api.contextMenu.show will actually display a menu. Currently in non-Electron web mode, the native context menu is blocked but nothing appears because desktopBridge is undefined.

🚀 Want me to fix this? Reply ex: "fix it for me".

🤖 Prompt for AI
In file apps/web/src/components/Sidebar.tsx around line 320:
Consider only calling `e.preventDefault()` when `api.contextMenu.show` will actually display a menu. Currently in non-Electron web mode, the native context menu is blocked but nothing appears because `desktopBridge` is undefined.

e.preventDefault();
void handleThreadContextMenu(thread.id, {
x: e.clientX,
y: e.clientY,
});
}}
>
<div className="flex min-w-0 flex-1 items-center gap-1.5">
{threadStatus && (
Expand Down
64 changes: 64 additions & 0 deletions apps/web/src/contextMenuFallback.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
/**
* Imperative DOM-based context menu for non-Electron environments.
* Shows a positioned dropdown and returns a promise that resolves
* with the clicked item id, or null if dismissed.
*/
export function showContextMenuFallback<T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
): Promise<T | null> {
return new Promise<T | null>((resolve) => {
const overlay = document.createElement("div");
overlay.style.cssText = "position:fixed;inset:0;z-index:9999";

const menu = document.createElement("div");
menu.className =
"fixed z-[10000] min-w-[140px] rounded-md border border-border bg-popover py-1 shadow-xl animate-in fade-in zoom-in-95";

const x = position?.x ?? 0;
const y = position?.y ?? 0;
menu.style.top = `${y}px`;
menu.style.left = `${x}px`;

function cleanup(result: T | null) {
document.removeEventListener("keydown", onKeyDown);
overlay.remove();
menu.remove();
resolve(result);
}

function onKeyDown(e: KeyboardEvent) {
if (e.key === "Escape") {
e.preventDefault();
cleanup(null);
}
}

overlay.addEventListener("mousedown", () => cleanup(null));
document.addEventListener("keydown", onKeyDown);

for (const item of items) {
const btn = document.createElement("button");
btn.type = "button";
btn.textContent = item.label;
btn.className =
"flex w-full items-center gap-2 px-3 py-1.5 text-left text-[11px] text-destructive hover:bg-accent cursor-default";
btn.addEventListener("click", () => cleanup(item.id));
menu.appendChild(btn);
}

document.body.appendChild(overlay);
document.body.appendChild(menu);

// Adjust if menu overflows viewport
requestAnimationFrame(() => {
const rect = menu.getBoundingClientRect();
if (rect.right > window.innerWidth) {
menu.style.left = `${window.innerWidth - rect.width - 4}px`;
}
if (rect.bottom > window.innerHeight) {
menu.style.top = `${window.innerHeight - rect.height - 4}px`;
}
});
});
}
12 changes: 11 additions & 1 deletion apps/web/src/store.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,8 @@ type Action =
| { type: "SET_ERROR"; threadId: string; error: string | null }
| { type: "SET_THREAD_TITLE"; threadId: string; title: string }
| { type: "SET_THREAD_MODEL"; threadId: string; model: string }
| { type: "SET_RUNTIME_MODE"; mode: RuntimeMode };
| { type: "SET_RUNTIME_MODE"; mode: RuntimeMode }
| { type: "DELETE_THREAD"; threadId: string };
Comment on lines +36 to +37

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Active-thread fallback should stay within the same project.
When deleting the active thread, picking the first remaining thread globally can jump the user into an unrelated project. Prefer the next thread in the same project (or null if none).

🔧 Suggested adjustment
 case "DELETE_THREAD": {
+ const deleted = state.threads.find((t) => t.id === action.threadId);
const threads = state.threads.filter((t) => t.id !== action.threadId);
- const activeThreadId =- state.activeThreadId === action.threadId- ? (threads[0]?.id ?? null)- : state.activeThreadId;+ const fallback =+ deleted?.projectId+ ? threads.find((t) => t.projectId === deleted.projectId) ?? null+ : threads[0] ?? null;+ const activeThreadId =+ state.activeThreadId === action.threadId+ ? (fallback?.id ?? null)+ : state.activeThreadId;
return { ...state, threads, activeThreadId };
}

Also applies to: 332-338

🤖 Prompt for AI Agents
In `@apps/renderer/src/store.ts` around lines 45 - 46, The DELETE_THREAD action
currently falls back to the first remaining thread globally which can switch
projects; change the reducer logic that handles { type: "DELETE_THREAD";
threadId: string } so that if the deleted thread equals the current active
thread (activeThreadId) you find the next active thread from the same project
only (e.g., filter threads by projectId === deletedThread.projectId) and set
activeThreadId to that thread's id or null if none; apply the same same-project
fallback change to the other deletion-handling block referenced (the logic
duplicated around the other DELETE_THREAD handling at the second location).


// ── State ────────────────────────────────────────────────────────────

Expand DownExpand Up@@ -375,6 +376,15 @@ export function reducer(state: AppState, action: Action): AppState {
runtimeMode: action.mode,
};

case "DELETE_THREAD": {
const threads = state.threads.filter((t) => t.id !== action.threadId);
const activeThreadId =
state.activeThreadId === action.threadId
? (threads[0]?.id ?? null)
: state.activeThreadId;
return { ...state, threads, activeThreadId };
}

default:
return state;
}
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/vite-env.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import type { NativeApi } from "@t3tools/contracts";
interface DesktopBridge {
getWsUrl: () => string | null;
pickFolder: () => Promise<string | null>;
showContextMenu: (items: readonly { id: string; label: string }[]) => Promise<string | null>;
}

declare global {
Expand Down
12 changes: 12 additions & 0 deletions apps/web/src/wsNativeApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { type NativeApi, WS_CHANNELS, WS_METHODS, type WsWelcomePayload } from "@t3tools/contracts";

import { showContextMenuFallback } from "./contextMenuFallback";
import { WsTransport } from "./wsTransport";

let instance: { api: NativeApi; transport: WsTransport } | null = null;
Expand DownExpand Up@@ -95,6 +96,17 @@ export function createWsNativeApi(): NativeApi {
openInEditor: (cwd, editor) =>
transport.request(WS_METHODS.shellOpenInEditor, { cwd, editor }),
},
contextMenu: {
show: async <T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
): Promise<T | null> => {
if (window.desktopBridge) {
return window.desktopBridge.showContextMenu(items) as Promise<T | null>;
}
return showContextMenuFallback(items, position);
},
},
};

instance = { api, transport };
Expand Down
6 changes: 6 additions & 0 deletions packages/contracts/src/ipc.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,4 +62,10 @@ export interface NativeApi {
shell: {
openInEditor: (cwd: string, editor: EditorId) => Promise<void>;
};
contextMenu: {
show: <T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
) => Promise<T | null>;
};
}
, '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
22 changes: 21 additions & 1 deletion apps/desktop/src/main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,14 @@ import net from "node:net";
import os from "node:os";
import path from "node:path";

import { app, BrowserWindow, dialog, ipcMain } from "electron";
import { app, BrowserWindow, dialog, ipcMain, Menu } from "electron";

import { fixPath } from "./fixPath";

fixPath();

const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const ROOT_DIR = path.resolve(__dirname, "../../..");
const BACKEND_ENTRY = path.join(ROOT_DIR, "apps/server/dist/index.js");
const WEB_ENTRY = path.join(ROOT_DIR, "apps/web/dist/index.html");
Expand DownExpand Up@@ -139,6 +140,25 @@ function registerIpcHandlers(): void {
if (result.canceled) return null;
return result.filePaths[0] ?? null;
});

ipcMain.removeHandler(CONTEXT_MENU_CHANNEL);
ipcMain.handle(CONTEXT_MENU_CHANNEL, async (_event, items: { id: string; label: string }[]) => {
const window = BrowserWindow.getFocusedWindow() ?? mainWindow;
if (!window) return null;

return new Promise<string | null>((resolve) => {
const menu = Menu.buildFromTemplate(
items.map((item) => ({
label: item.label,
click: () => resolve(item.id),
})),
);
menu.popup({
window,
callback: () => resolve(null),
});
});
});
}

function createWindow(): BrowserWindow {
Expand Down
3 changes: 3 additions & 0 deletions apps/desktop/src/preload.ts
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
import { contextBridge, ipcRenderer } from "electron";

const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const wsUrl = process.env.T3CODE_DESKTOP_WS_URL ?? null;

contextBridge.exposeInMainWorld("desktopBridge", {
getWsUrl: () => wsUrl,
pickFolder: () => ipcRenderer.invoke(PICK_FOLDER_CHANNEL) as Promise<string | null>,
showContextMenu: (items: { id: string; label: string }[]) =>
ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items) as Promise<string | null>,
});
32 changes: 32 additions & 0 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,6 +160,31 @@ export default function Sidebar() {
}
};

const handleThreadContextMenu = useCallback(
async (threadId: string, position: { x: number; y: number }) => {
if (!api) return;
const clicked = await api.contextMenu.show([{ id: "delete", label: "Delete" }], position);
if (clicked !== "delete") return;

const thread = state.threads.find((t) => t.id === threadId);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Low

components/Sidebar.tsx:171 The state.threads captured in the closure may become stale while awaiting api.contextMenu.show. Consider re-reading the thread from the current store state after the await returns, before stopping the session.

🚀 Want me to fix this? Reply ex: "fix it for me".

🤖 Prompt for AI
In file apps/web/src/components/Sidebar.tsx around line 171:
The `state.threads` captured in the closure may become stale while awaiting `api.contextMenu.show`. Consider re-reading the thread from the current store state after the await returns, before stopping the session.

if (!thread) return;

// Stop active session if running
if (thread.session?.sessionId) {
try {
await api.providers.stopSession({
sessionId: thread.session.sessionId,
});
} catch {
// Session may already be stopped
}
}

dispatch({ type: "DELETE_THREAD", threadId });
},
[api, dispatch, state.threads],
);
Comment on lines +163 to +186

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Don’t delete the thread if stopping the session fails.
Errors are swallowed and deletion proceeds, which can orphan a running provider session with no UI to stop it. Consider surfacing the error (or at least aborting deletion) unless you can distinguish “already stopped.”

🛡️ Safer flow
 if (thread.session?.sessionId) {
try {
await api.providers.stopSession({
sessionId: thread.session.sessionId,
});
- } catch {- // Session may already be stopped+ } catch (error) {+ // Consider surfacing error so we don't orphan a running session+ return;
}
}
dispatch({ type: "DELETE_THREAD", threadId });
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
consthandleThreadContextMenu=useCallback(
async(threadId: string)=>{
if(!api)return;
constclicked=awaitapi.contextMenu.show([
{id: "delete",label: "Delete"},
]);
if(clicked!=="delete")return;
constthread=state.threads.find((t)=>t.id===threadId);
if(!thread)return;
// Stop active session if running
if(thread.session?.sessionId){
try{
awaitapi.providers.stopSession({
sessionId: thread.session.sessionId,
});
}catch{
// Session may already be stopped
}
}
dispatch({type: "DELETE_THREAD", threadId });
},
[api,dispatch,state.threads],
);
consthandleThreadContextMenu=useCallback(
async(threadId: string)=>{
if(!api)return;
constclicked=awaitapi.contextMenu.show([
{id: "delete",label: "Delete"},
]);
if(clicked!=="delete")return;
constthread=state.threads.find((t)=>t.id===threadId);
if(!thread)return;
// Stop active session if running
if(thread.session?.sessionId){
try{
awaitapi.providers.stopSession({
sessionId: thread.session.sessionId,
});
}catch(error){
// Consider surfacing error so we don't orphan a running session
return;
}
}
dispatch({type: "DELETE_THREAD", threadId });
},
[api,dispatch,state.threads],
);
🤖 Prompt for AI Agents
In `@apps/renderer/src/components/Sidebar.tsx` around lines 87 - 112,
handleThreadContextMenu currently swallows errors from api.providers.stopSession
and proceeds to dispatch DELETE_THREAD, which can orphan an active session;
change the flow in handleThreadContextMenu so that if stopSession throws you do
not delete the thread unless you can detect a harmless "already stopped"
condition—catch the error from api.providers.stopSession, check the error
message/code for an “already stopped” sentinel (or otherwise surface the error
via UI/api.logger) and abort the dispatch({ type: "DELETE_THREAD", ... }) when
stopSession failed, only allowing deletion when stopSession succeeded or the
error explicitly indicates the session was already stopped; reference
handleThreadContextMenu, api.providers.stopSession, and the DELETE_THREAD
dispatch to locate and update the logic.


useEffect(() => {
const onWindowKeyDown = (event: KeyboardEvent) => {
const isNewThreadShortcut =
Expand DownExpand Up@@ -290,6 +315,13 @@ export default function Sidebar() {
threadId: thread.id,
})
}
onContextMenu={(e) => {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Low

components/Sidebar.tsx:320 Consider only calling e.preventDefault() when api.contextMenu.show will actually display a menu. Currently in non-Electron web mode, the native context menu is blocked but nothing appears because desktopBridge is undefined.

🚀 Want me to fix this? Reply ex: "fix it for me".

🤖 Prompt for AI
In file apps/web/src/components/Sidebar.tsx around line 320:
Consider only calling `e.preventDefault()` when `api.contextMenu.show` will actually display a menu. Currently in non-Electron web mode, the native context menu is blocked but nothing appears because `desktopBridge` is undefined.

e.preventDefault();
void handleThreadContextMenu(thread.id, {
x: e.clientX,
y: e.clientY,
});
}}
>
<div className="flex min-w-0 flex-1 items-center gap-1.5">
{threadStatus && (
Expand Down
64 changes: 64 additions & 0 deletions apps/web/src/contextMenuFallback.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
/**
* Imperative DOM-based context menu for non-Electron environments.
* Shows a positioned dropdown and returns a promise that resolves
* with the clicked item id, or null if dismissed.
*/
export function showContextMenuFallback<T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
): Promise<T | null> {
return new Promise<T | null>((resolve) => {
const overlay = document.createElement("div");
overlay.style.cssText = "position:fixed;inset:0;z-index:9999";

const menu = document.createElement("div");
menu.className =
"fixed z-[10000] min-w-[140px] rounded-md border border-border bg-popover py-1 shadow-xl animate-in fade-in zoom-in-95";

const x = position?.x ?? 0;
const y = position?.y ?? 0;
menu.style.top = `${y}px`;
menu.style.left = `${x}px`;

function cleanup(result: T | null) {
document.removeEventListener("keydown", onKeyDown);
overlay.remove();
menu.remove();
resolve(result);
}

function onKeyDown(e: KeyboardEvent) {
if (e.key === "Escape") {
e.preventDefault();
cleanup(null);
}
}

overlay.addEventListener("mousedown", () => cleanup(null));
document.addEventListener("keydown", onKeyDown);

for (const item of items) {
const btn = document.createElement("button");
btn.type = "button";
btn.textContent = item.label;
btn.className =
"flex w-full items-center gap-2 px-3 py-1.5 text-left text-[11px] text-destructive hover:bg-accent cursor-default";
btn.addEventListener("click", () => cleanup(item.id));
menu.appendChild(btn);
}

document.body.appendChild(overlay);
document.body.appendChild(menu);

// Adjust if menu overflows viewport
requestAnimationFrame(() => {
const rect = menu.getBoundingClientRect();
if (rect.right > window.innerWidth) {
menu.style.left = `${window.innerWidth - rect.width - 4}px`;
}
if (rect.bottom > window.innerHeight) {
menu.style.top = `${window.innerHeight - rect.height - 4}px`;
}
});
});
}
12 changes: 11 additions & 1 deletion apps/web/src/store.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,8 @@ type Action =
| { type: "SET_ERROR"; threadId: string; error: string | null }
| { type: "SET_THREAD_TITLE"; threadId: string; title: string }
| { type: "SET_THREAD_MODEL"; threadId: string; model: string }
| { type: "SET_RUNTIME_MODE"; mode: RuntimeMode };
| { type: "SET_RUNTIME_MODE"; mode: RuntimeMode }
| { type: "DELETE_THREAD"; threadId: string };
Comment on lines +36 to +37

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Active-thread fallback should stay within the same project.
When deleting the active thread, picking the first remaining thread globally can jump the user into an unrelated project. Prefer the next thread in the same project (or null if none).

🔧 Suggested adjustment
 case "DELETE_THREAD": {
+ const deleted = state.threads.find((t) => t.id === action.threadId);
const threads = state.threads.filter((t) => t.id !== action.threadId);
- const activeThreadId =- state.activeThreadId === action.threadId- ? (threads[0]?.id ?? null)- : state.activeThreadId;+ const fallback =+ deleted?.projectId+ ? threads.find((t) => t.projectId === deleted.projectId) ?? null+ : threads[0] ?? null;+ const activeThreadId =+ state.activeThreadId === action.threadId+ ? (fallback?.id ?? null)+ : state.activeThreadId;
return { ...state, threads, activeThreadId };
}

Also applies to: 332-338

🤖 Prompt for AI Agents
In `@apps/renderer/src/store.ts` around lines 45 - 46, The DELETE_THREAD action
currently falls back to the first remaining thread globally which can switch
projects; change the reducer logic that handles { type: "DELETE_THREAD";
threadId: string } so that if the deleted thread equals the current active
thread (activeThreadId) you find the next active thread from the same project
only (e.g., filter threads by projectId === deletedThread.projectId) and set
activeThreadId to that thread's id or null if none; apply the same same-project
fallback change to the other deletion-handling block referenced (the logic
duplicated around the other DELETE_THREAD handling at the second location).


// ── State ────────────────────────────────────────────────────────────

Expand DownExpand Up@@ -375,6 +376,15 @@ export function reducer(state: AppState, action: Action): AppState {
runtimeMode: action.mode,
};

case "DELETE_THREAD": {
const threads = state.threads.filter((t) => t.id !== action.threadId);
const activeThreadId =
state.activeThreadId === action.threadId
? (threads[0]?.id ?? null)
: state.activeThreadId;
return { ...state, threads, activeThreadId };
}

default:
return state;
}
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/vite-env.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import type { NativeApi } from "@t3tools/contracts";
interface DesktopBridge {
getWsUrl: () => string | null;
pickFolder: () => Promise<string | null>;
showContextMenu: (items: readonly { id: string; label: string }[]) => Promise<string | null>;
}

declare global {
Expand Down
12 changes: 12 additions & 0 deletions apps/web/src/wsNativeApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { type NativeApi, WS_CHANNELS, WS_METHODS, type WsWelcomePayload } from "@t3tools/contracts";

import { showContextMenuFallback } from "./contextMenuFallback";
import { WsTransport } from "./wsTransport";

let instance: { api: NativeApi; transport: WsTransport } | null = null;
Expand DownExpand Up@@ -95,6 +96,17 @@ export function createWsNativeApi(): NativeApi {
openInEditor: (cwd, editor) =>
transport.request(WS_METHODS.shellOpenInEditor, { cwd, editor }),
},
contextMenu: {
show: async <T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
): Promise<T | null> => {
if (window.desktopBridge) {
return window.desktopBridge.showContextMenu(items) as Promise<T | null>;
}
return showContextMenuFallback(items, position);
},
},
};

instance = { api, transport };
Expand Down
6 changes: 6 additions & 0 deletions packages/contracts/src/ipc.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,4 +62,10 @@ export interface NativeApi {
shell: {
openInEditor: (cwd: string, editor: EditorId) => Promise<void>;
};
contextMenu: {
show: <T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
) => Promise<T | null>;
};
}
, '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
22 changes: 21 additions & 1 deletion apps/desktop/src/main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,14 @@ import net from "node:net";
import os from "node:os";
import path from "node:path";

import { app, BrowserWindow, dialog, ipcMain } from "electron";
import { app, BrowserWindow, dialog, ipcMain, Menu } from "electron";

import { fixPath } from "./fixPath";

fixPath();

const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const ROOT_DIR = path.resolve(__dirname, "../../..");
const BACKEND_ENTRY = path.join(ROOT_DIR, "apps/server/dist/index.js");
const WEB_ENTRY = path.join(ROOT_DIR, "apps/web/dist/index.html");
Expand DownExpand Up@@ -139,6 +140,25 @@ function registerIpcHandlers(): void {
if (result.canceled) return null;
return result.filePaths[0] ?? null;
});

ipcMain.removeHandler(CONTEXT_MENU_CHANNEL);
ipcMain.handle(CONTEXT_MENU_CHANNEL, async (_event, items: { id: string; label: string }[]) => {
const window = BrowserWindow.getFocusedWindow() ?? mainWindow;
if (!window) return null;

return new Promise<string | null>((resolve) => {
const menu = Menu.buildFromTemplate(
items.map((item) => ({
label: item.label,
click: () => resolve(item.id),
})),
);
menu.popup({
window,
callback: () => resolve(null),
});
});
});
}

function createWindow(): BrowserWindow {
Expand Down
3 changes: 3 additions & 0 deletions apps/desktop/src/preload.ts
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
import { contextBridge, ipcRenderer } from "electron";

const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
const wsUrl = process.env.T3CODE_DESKTOP_WS_URL ?? null;

contextBridge.exposeInMainWorld("desktopBridge", {
getWsUrl: () => wsUrl,
pickFolder: () => ipcRenderer.invoke(PICK_FOLDER_CHANNEL) as Promise<string | null>,
showContextMenu: (items: { id: string; label: string }[]) =>
ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items) as Promise<string | null>,
});
32 changes: 32 additions & 0 deletions apps/web/src/components/Sidebar.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,6 +160,31 @@ export default function Sidebar() {
}
};

const handleThreadContextMenu = useCallback(
async (threadId: string, position: { x: number; y: number }) => {
if (!api) return;
const clicked = await api.contextMenu.show([{ id: "delete", label: "Delete" }], position);
if (clicked !== "delete") return;

const thread = state.threads.find((t) => t.id === threadId);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Low

components/Sidebar.tsx:171 The state.threads captured in the closure may become stale while awaiting api.contextMenu.show. Consider re-reading the thread from the current store state after the await returns, before stopping the session.

🚀 Want me to fix this? Reply ex: "fix it for me".

🤖 Prompt for AI
In file apps/web/src/components/Sidebar.tsx around line 171:
The `state.threads` captured in the closure may become stale while awaiting `api.contextMenu.show`. Consider re-reading the thread from the current store state after the await returns, before stopping the session.

if (!thread) return;

// Stop active session if running
if (thread.session?.sessionId) {
try {
await api.providers.stopSession({
sessionId: thread.session.sessionId,
});
} catch {
// Session may already be stopped
}
}

dispatch({ type: "DELETE_THREAD", threadId });
},
[api, dispatch, state.threads],
);
Comment on lines +163 to +186

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Don’t delete the thread if stopping the session fails.
Errors are swallowed and deletion proceeds, which can orphan a running provider session with no UI to stop it. Consider surfacing the error (or at least aborting deletion) unless you can distinguish “already stopped.”

🛡️ Safer flow
 if (thread.session?.sessionId) {
try {
await api.providers.stopSession({
sessionId: thread.session.sessionId,
});
- } catch {- // Session may already be stopped+ } catch (error) {+ // Consider surfacing error so we don't orphan a running session+ return;
}
}
dispatch({ type: "DELETE_THREAD", threadId });
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
consthandleThreadContextMenu=useCallback(
async(threadId: string)=>{
if(!api)return;
constclicked=awaitapi.contextMenu.show([
{id: "delete",label: "Delete"},
]);
if(clicked!=="delete")return;
constthread=state.threads.find((t)=>t.id===threadId);
if(!thread)return;
// Stop active session if running
if(thread.session?.sessionId){
try{
awaitapi.providers.stopSession({
sessionId: thread.session.sessionId,
});
}catch{
// Session may already be stopped
}
}
dispatch({type: "DELETE_THREAD", threadId });
},
[api,dispatch,state.threads],
);
consthandleThreadContextMenu=useCallback(
async(threadId: string)=>{
if(!api)return;
constclicked=awaitapi.contextMenu.show([
{id: "delete",label: "Delete"},
]);
if(clicked!=="delete")return;
constthread=state.threads.find((t)=>t.id===threadId);
if(!thread)return;
// Stop active session if running
if(thread.session?.sessionId){
try{
awaitapi.providers.stopSession({
sessionId: thread.session.sessionId,
});
}catch(error){
// Consider surfacing error so we don't orphan a running session
return;
}
}
dispatch({type: "DELETE_THREAD", threadId });
},
[api,dispatch,state.threads],
);
🤖 Prompt for AI Agents
In `@apps/renderer/src/components/Sidebar.tsx` around lines 87 - 112,
handleThreadContextMenu currently swallows errors from api.providers.stopSession
and proceeds to dispatch DELETE_THREAD, which can orphan an active session;
change the flow in handleThreadContextMenu so that if stopSession throws you do
not delete the thread unless you can detect a harmless "already stopped"
condition—catch the error from api.providers.stopSession, check the error
message/code for an “already stopped” sentinel (or otherwise surface the error
via UI/api.logger) and abort the dispatch({ type: "DELETE_THREAD", ... }) when
stopSession failed, only allowing deletion when stopSession succeeded or the
error explicitly indicates the session was already stopped; reference
handleThreadContextMenu, api.providers.stopSession, and the DELETE_THREAD
dispatch to locate and update the logic.


useEffect(() => {
const onWindowKeyDown = (event: KeyboardEvent) => {
const isNewThreadShortcut =
Expand DownExpand Up@@ -290,6 +315,13 @@ export default function Sidebar() {
threadId: thread.id,
})
}
onContextMenu={(e) => {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Low

components/Sidebar.tsx:320 Consider only calling e.preventDefault() when api.contextMenu.show will actually display a menu. Currently in non-Electron web mode, the native context menu is blocked but nothing appears because desktopBridge is undefined.

🚀 Want me to fix this? Reply ex: "fix it for me".

🤖 Prompt for AI
In file apps/web/src/components/Sidebar.tsx around line 320:
Consider only calling `e.preventDefault()` when `api.contextMenu.show` will actually display a menu. Currently in non-Electron web mode, the native context menu is blocked but nothing appears because `desktopBridge` is undefined.

e.preventDefault();
void handleThreadContextMenu(thread.id, {
x: e.clientX,
y: e.clientY,
});
}}
>
<div className="flex min-w-0 flex-1 items-center gap-1.5">
{threadStatus && (
Expand Down
64 changes: 64 additions & 0 deletions apps/web/src/contextMenuFallback.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
/**
* Imperative DOM-based context menu for non-Electron environments.
* Shows a positioned dropdown and returns a promise that resolves
* with the clicked item id, or null if dismissed.
*/
export function showContextMenuFallback<T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
): Promise<T | null> {
return new Promise<T | null>((resolve) => {
const overlay = document.createElement("div");
overlay.style.cssText = "position:fixed;inset:0;z-index:9999";

const menu = document.createElement("div");
menu.className =
"fixed z-[10000] min-w-[140px] rounded-md border border-border bg-popover py-1 shadow-xl animate-in fade-in zoom-in-95";

const x = position?.x ?? 0;
const y = position?.y ?? 0;
menu.style.top = `${y}px`;
menu.style.left = `${x}px`;

function cleanup(result: T | null) {
document.removeEventListener("keydown", onKeyDown);
overlay.remove();
menu.remove();
resolve(result);
}

function onKeyDown(e: KeyboardEvent) {
if (e.key === "Escape") {
e.preventDefault();
cleanup(null);
}
}

overlay.addEventListener("mousedown", () => cleanup(null));
document.addEventListener("keydown", onKeyDown);

for (const item of items) {
const btn = document.createElement("button");
btn.type = "button";
btn.textContent = item.label;
btn.className =
"flex w-full items-center gap-2 px-3 py-1.5 text-left text-[11px] text-destructive hover:bg-accent cursor-default";
btn.addEventListener("click", () => cleanup(item.id));
menu.appendChild(btn);
}

document.body.appendChild(overlay);
document.body.appendChild(menu);

// Adjust if menu overflows viewport
requestAnimationFrame(() => {
const rect = menu.getBoundingClientRect();
if (rect.right > window.innerWidth) {
menu.style.left = `${window.innerWidth - rect.width - 4}px`;
}
if (rect.bottom > window.innerHeight) {
menu.style.top = `${window.innerHeight - rect.height - 4}px`;
}
});
});
}
12 changes: 11 additions & 1 deletion apps/web/src/store.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,8 @@ type Action =
| { type: "SET_ERROR"; threadId: string; error: string | null }
| { type: "SET_THREAD_TITLE"; threadId: string; title: string }
| { type: "SET_THREAD_MODEL"; threadId: string; model: string }
| { type: "SET_RUNTIME_MODE"; mode: RuntimeMode };
| { type: "SET_RUNTIME_MODE"; mode: RuntimeMode }
| { type: "DELETE_THREAD"; threadId: string };
Comment on lines +36 to +37

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Active-thread fallback should stay within the same project.
When deleting the active thread, picking the first remaining thread globally can jump the user into an unrelated project. Prefer the next thread in the same project (or null if none).

🔧 Suggested adjustment
 case "DELETE_THREAD": {
+ const deleted = state.threads.find((t) => t.id === action.threadId);
const threads = state.threads.filter((t) => t.id !== action.threadId);
- const activeThreadId =- state.activeThreadId === action.threadId- ? (threads[0]?.id ?? null)- : state.activeThreadId;+ const fallback =+ deleted?.projectId+ ? threads.find((t) => t.projectId === deleted.projectId) ?? null+ : threads[0] ?? null;+ const activeThreadId =+ state.activeThreadId === action.threadId+ ? (fallback?.id ?? null)+ : state.activeThreadId;
return { ...state, threads, activeThreadId };
}

Also applies to: 332-338

🤖 Prompt for AI Agents
In `@apps/renderer/src/store.ts` around lines 45 - 46, The DELETE_THREAD action
currently falls back to the first remaining thread globally which can switch
projects; change the reducer logic that handles { type: "DELETE_THREAD";
threadId: string } so that if the deleted thread equals the current active
thread (activeThreadId) you find the next active thread from the same project
only (e.g., filter threads by projectId === deletedThread.projectId) and set
activeThreadId to that thread's id or null if none; apply the same same-project
fallback change to the other deletion-handling block referenced (the logic
duplicated around the other DELETE_THREAD handling at the second location).


// ── State ────────────────────────────────────────────────────────────

Expand DownExpand Up@@ -375,6 +376,15 @@ export function reducer(state: AppState, action: Action): AppState {
runtimeMode: action.mode,
};

case "DELETE_THREAD": {
const threads = state.threads.filter((t) => t.id !== action.threadId);
const activeThreadId =
state.activeThreadId === action.threadId
? (threads[0]?.id ?? null)
: state.activeThreadId;
return { ...state, threads, activeThreadId };
}

default:
return state;
}
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/vite-env.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import type { NativeApi } from "@t3tools/contracts";
interface DesktopBridge {
getWsUrl: () => string | null;
pickFolder: () => Promise<string | null>;
showContextMenu: (items: readonly { id: string; label: string }[]) => Promise<string | null>;
}

declare global {
Expand Down
12 changes: 12 additions & 0 deletions apps/web/src/wsNativeApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { type NativeApi, WS_CHANNELS, WS_METHODS, type WsWelcomePayload } from "@t3tools/contracts";

import { showContextMenuFallback } from "./contextMenuFallback";
import { WsTransport } from "./wsTransport";

let instance: { api: NativeApi; transport: WsTransport } | null = null;
Expand DownExpand Up@@ -95,6 +96,17 @@ export function createWsNativeApi(): NativeApi {
openInEditor: (cwd, editor) =>
transport.request(WS_METHODS.shellOpenInEditor, { cwd, editor }),
},
contextMenu: {
show: async <T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
): Promise<T | null> => {
if (window.desktopBridge) {
return window.desktopBridge.showContextMenu(items) as Promise<T | null>;
}
return showContextMenuFallback(items, position);
},
},
};

instance = { api, transport };
Expand Down
6 changes: 6 additions & 0 deletions packages/contracts/src/ipc.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,4 +62,10 @@ export interface NativeApi {
shell: {
openInEditor: (cwd: string, editor: EditorId) => Promise<void>;
};
contextMenu: {
show: <T extends string>(
items: readonly { id: T; label: string }[],
position?: { x: number; y: number },
) => Promise<T | null>;
};
}