Skip to content

feat(desktop): compact add button + presets dropdown #1762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kitenite merged 12 commits into from
Feb 25, 2026
Merged

feat(desktop): compact add button + presets dropdown #1762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
42052f3
feat(desktop): support big and compact terminal add buttons
Kitenite Feb 24, 2026
62cb2c8
Merge remote-tracking branch 'origin' into kitenite/add-button-allow-…
Kitenite Feb 24, 2026
8b34389
fix(desktop): unblock dev startup by externalizing mastracode native …
Kitenite Feb 24, 2026
d7e6682
fix(desktop): show presets in add-tab dropdown when bar is hidden
Kitenite Feb 24, 2026
3be486f
refactor(desktop): move add-tab presets into submenu component
Kitenite Feb 24, 2026
2d4c053
chore(desktop): rename add-button toggle to show expanded button
Kitenite Feb 24, 2026
ab1aca1
fix(desktop): default expanded add button to off
Kitenite Feb 24, 2026
b451075
chore(desktop): invert add-button toggle to compact mode
Kitenite Feb 24, 2026
566091f
chore(desktop): rename compact add-button toggle label
Kitenite Feb 24, 2026
8d69fc5
refactor(desktop): rename add-button setting to compact mode
Kitenite Feb 24, 2026
928b9fd
fix(local-db): replace big add button migration with compact setting
Kitenite Feb 25, 2026
98bdbfc
Merge remote-tracking branch 'origin/main' into kitenite/add-button-a…
Kitenite Feb 25, 2026
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
9 changes: 8 additions & 1 deletion apps/desktop/electron.vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,14 @@ export default defineConfig({
output: {
dir: resolve(devPath, "main"),
},
external: ["electron", "better-sqlite3", "node-pty", "pg-native"],
external: [
"electron",
"better-sqlite3",
"node-pty",
"pg-native",
"mastracode",
"@ast-grep/napi",
],
Comment on lines +105 to +112
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot Feb 25, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "== Locate and inspect native-module copy script(s) =="
fd 'copy-native-modules\.ts$' apps/desktop -t f -x sh -c 'echo "--- {} ---"; sed -n "1,260p" "{}"'

echo
echo "== Check where mastracode / `@ast-grep/napi` are imported =="
rg -n -C2 --type=ts --type=tsx \
  'from\s+["'"'"'](mastracode|@ast-grep/napi)["'"'"']|require\(["'"'"'](mastracode|@ast-grep/napi)["'"'"']\)' \
  apps/desktop/src/main apps/desktop/src/preload apps/desktop/src/renderer

echo
echo "== Inspect electron-builder config for files/asarUnpack handling =="
fd '^electron-builder\.(ts|json|ya?ml)$' apps/desktop -t f -x sh -c 'echo "--- {} ---"; sed -n "1,320p" "{}"'

Repository: superset-sh/superset

Length of output: 2812

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "== Check where mastracode / `@ast-grep/napi` are imported =="
rg -n -C2 'from\s+["'"'"'](mastracode|@ast-grep/napi)["'"'"']|require\(["'"'"'](mastracode|@ast-grep/napi)["'"'"']\)' \
  apps/desktop/src/ || echo "No imports found for these modules"

echo
echo "== Inspect electron-builder config for files/asarUnpack handling =="
fd '(electron-builder|builder)' apps/desktop -t f | head -20
fd 'electron-builder' . -t f | head -20

echo
echo "== Check for any references to mastracode or `@ast-grep` in config/build files =="
rg 'mastracode|@ast-grep' apps/desktop -t ts -t json 2>/dev/null || echo "Not found in configs"

Repository: superset-sh/superset

Length of output: 682

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "== Check where mastracode / `@ast-grep/napi` are imported =="
rg -n -C2 'mastracode|@ast-grep/napi' apps/desktop/src/ || echo "No imports found for these modules"

echo
echo "== List all .ts and .json files in apps/desktop root and check for electron-builder config =="
fd -t f '\.json$|\.ts$' apps/desktop | grep -E '(builder|vite|package)' | head -20

echo
echo "== Inspect package.json in apps/desktop for dependencies =="
fd 'package\.json$' apps/desktop -x sh -c 'echo "--- {} ---"; cat "{}"'

echo
echo "== Check for any references to mastracode or `@ast-grep` in vite or build config =="
rg 'mastracode|@ast-grep' apps/desktop --type-list | grep -E 'ts|json' || true
rg -t json -t ts 'mastracode|@ast-grep' apps/desktop || echo "Not found"

Repository: superset-sh/superset

Length of output: 8908

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "== Inspect electron-builder.ts =="
cat apps/desktop/electron-builder.ts

echo
echo "== Inspect electron-builder.canary.ts =="
cat apps/desktop/electron-builder.canary.ts

Repository: superset-sh/superset

Length of output: 6859

Add mastracode and @ast-grep/napi to packaging configuration.

Both modules are externalized but missing from the packaging pipeline:

  • Not in copy-native-modules.ts (won't de-symlink if Bun created symlinks)
  • Not in electron-builder.ts asarUnpack array
  • Not in electron-builder.ts files section

Since these are dependencies (likely pulled in by workspace packages like @superset/chat-mastra), they must be explicitly handled during build to avoid runtime module resolution failures, especially if they contain native artifacts or encounter the Bun 1.3+ symlink issue that affects better-sqlite3 and node-pty.

Add them to:

  1. copy-native-modules.ts NATIVE_MODULE_DEPS array (or NATIVE_MODULES if required)
  2. electron-builder.ts asarUnpack patterns
  3. electron-builder.ts files section with explicit copy rules matching the pattern used for better-sqlite3
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@apps/desktop/electron.vite.config.ts` around lines 105 - 112, The packaging
misses two external modules — mastracode and `@ast-grep/napi` — that must be
explicitly included: add "mastracode" and "@ast-grep/napi" to the
NATIVE_MODULE_DEPS (or NATIVE_MODULES) array in copy-native-modules.ts so they
are de-symlinked/copied; add matching glob patterns for these packages to the
asarUnpack array in electron-builder.ts so native artifacts are unpacked at
runtime; and add corresponding entries to the electron-builder.ts files section
using the same copy rules/patterns you used for "better-sqlite3" so the built
app includes the modules. Ensure you reference the exact symbol names
NATIVE_MODULE_DEPS/NATIVE_MODULES, asarUnpack, and files when making the
changes.

plugins: [sentryPlugin].filter(Boolean),
},
},
Expand Down
2 changes: 2 additions & 0 deletions apps/desktop/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
},
"dependencies": {
"@ai-sdk/react": "^3.0.0",
"@ast-grep/napi": "^0.41.0",
"@better-auth/stripe": "1.4.18",
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/sortable": "^10.0.0",
Expand Down Expand Up @@ -140,6 +141,7 @@
"lowdb": "^7.0.1",
"lowlight": "^3.3.0",
"lucide-react": "^0.563.0",
"mastracode": "^0.3.0",
"monaco-editor": "^0.55.1",
"nanoid": "^5.1.6",
"node-addon-api": "^7.1.0",
Expand Down
24 changes: 24 additions & 0 deletions apps/desktop/src/lib/trpc/routers/settings/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
DEFAULT_SHOW_PRESETS_BAR,
DEFAULT_SHOW_RESOURCE_MONITOR,
DEFAULT_TERMINAL_LINK_BEHAVIOR,
DEFAULT_USE_COMPACT_TERMINAL_ADD_BUTTON,
} from "shared/constants";
import {
CUSTOM_RINGTONE_ID,
Expand Down Expand Up @@ -412,6 +413,29 @@ export const createSettingsRouter = () => {
return { success: true };
}),

getUseCompactTerminalAddButton: publicProcedure.query(() => {
const row = getSettings();
return (
row.useCompactTerminalAddButton ??
DEFAULT_USE_COMPACT_TERMINAL_ADD_BUTTON
);
}),

setUseCompactTerminalAddButton: publicProcedure
.input(z.object({ enabled: z.boolean() }))
.mutation(({ input }) => {
localDb
.insert(settings)
.values({ id: 1, useCompactTerminalAddButton: input.enabled })
.onConflictDoUpdate({
target: settings.id,
set: { useCompactTerminalAddButton: input.enabled },
})
.run();

return { success: true };
}),

getTerminalLinkBehavior: publicProcedure.query(() => {
const row = getSettings();
return row.terminalLinkBehavior ?? DEFAULT_TERMINAL_LINK_BEHAVIOR;
Expand Down
140 changes: 79 additions & 61 deletions ...r/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupStrip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
import type { TerminalPreset } from "@superset/local-db";
import { FEATURE_FLAGS } from "@superset/shared/constants";
import { Button } from "@superset/ui/button";
import {
DropdownMenu,
DropdownMenuCheckboxItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@superset/ui/dropdown-menu";
import { useLiveQuery } from "@tanstack/react-db";
import { useParams } from "@tanstack/react-router";
import { useNavigate, useParams } from "@tanstack/react-router";
import { useFeatureFlagEnabled } from "posthog-js/react";
import {
useCallback,
Expand All @@ -19,21 +11,22 @@ import {
useRef,
useState,
} from "react";
import { BsTerminalPlus } from "react-icons/bs";
import { LuPlus } from "react-icons/lu";
import { TbMessageCirclePlus, TbWorld } from "react-icons/tb";
import { HotkeyMenuShortcut } from "renderer/components/HotkeyMenuShortcut";
import { electronTrpc } from "renderer/lib/electron-trpc";
import { usePresets } from "renderer/react-query/presets";
import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
import { useTabsStore } from "renderer/stores/tabs/store";
import { useTabsWithPresets } from "renderer/stores/tabs/useTabsWithPresets";
import {
isLastPaneInTab,
resolveActiveTabIdForWorkspace,
} from "renderer/stores/tabs/utils";
import {
DEFAULT_SHOW_PRESETS_BAR,
DEFAULT_USE_COMPACT_TERMINAL_ADD_BUTTON,
} from "shared/constants";
import { type ActivePaneStatus, pickHigherStatus } from "shared/tabs-types";
import { AddTabButton } from "./components/AddTabButton";
import { GroupItem } from "./GroupItem";
import { NewTabDropZone } from "./NewTabDropZone";

export function GroupStrip() {
const { workspaceId: activeWorkspaceId } = useParams({ strict: false });
Expand All @@ -42,7 +35,7 @@ export function GroupStrip() {
const panes = useTabsStore((s) => s.panes);
const activeTabIds = useTabsStore((s) => s.activeTabIds);
const tabHistoryStacks = useTabsStore((s) => s.tabHistoryStacks);
const { addTab } = useTabsWithPresets();
const { addTab, openPreset } = useTabsWithPresets();
const addChatMastraTab = useTabsStore((s) => s.addChatMastraTab);
const addBrowserTab = useTabsStore((s) => s.addBrowserTab);
const renameTab = useTabsStore((s) => s.renameTab);
Expand All @@ -53,6 +46,8 @@ export function GroupStrip() {
const reorderTabs = useTabsStore((s) => s.reorderTabs);

const setTabAutoTitle = useTabsStore((s) => s.setTabAutoTitle);
const { presets } = usePresets();
const navigate = useNavigate();

const hasAiChat = useFeatureFlagEnabled(FEATURE_FLAGS.AI_CHAT);
const scrollContainerRef = useRef<HTMLDivElement>(null);
Expand All @@ -61,6 +56,8 @@ export function GroupStrip() {
const utils = electronTrpc.useUtils();
const { data: showPresetsBar } =
electronTrpc.settings.getShowPresetsBar.useQuery();
const { data: useCompactTerminalAddButton } =
electronTrpc.settings.getUseCompactTerminalAddButton.useQuery();
const setShowPresetsBar = electronTrpc.settings.setShowPresetsBar.useMutation(
{
onMutate: async ({ enabled }) => {
Expand All @@ -79,6 +76,30 @@ export function GroupStrip() {
},
},
);
const setUseCompactTerminalAddButton =
electronTrpc.settings.setUseCompactTerminalAddButton.useMutation({
onMutate: async ({ enabled }) => {
await utils.settings.getUseCompactTerminalAddButton.cancel();
const previous =
utils.settings.getUseCompactTerminalAddButton.getData();
utils.settings.getUseCompactTerminalAddButton.setData(
undefined,
enabled,
);
return { previous };
},
onError: (_err, _vars, context) => {
if (context?.previous !== undefined) {
utils.settings.getUseCompactTerminalAddButton.setData(
undefined,
context.previous,
);
}
},
onSettled: () => {
utils.settings.getUseCompactTerminalAddButton.invalidate();
},
});

const tabs = useMemo(
() =>
Expand Down Expand Up @@ -160,6 +181,18 @@ export function GroupStrip() {
addBrowserTab(activeWorkspaceId);
};

const handleOpenPreset = useCallback(
(preset: TerminalPreset) => {
if (!activeWorkspaceId) return;
openPreset(activeWorkspaceId, preset, { target: "active-tab" });
},
[activeWorkspaceId, openPreset],
);

const handleOpenPresetsSettings = useCallback(() => {
navigate({ to: "/settings/presets" });
}, [navigate]);

const handleSelectGroup = (tabId: string) => {
if (activeWorkspaceId) {
setActiveTab(activeWorkspaceId, tabId);
Expand Down Expand Up @@ -219,52 +252,29 @@ export function GroupStrip() {
requestAnimationFrame(updateOverflow);
}, [updateOverflow]);

const useCompactAddButton =
useCompactTerminalAddButton ?? DEFAULT_USE_COMPACT_TERMINAL_ADD_BUTTON;

const plusControl = (
<NewTabDropZone
onDrop={(paneId) => movePaneToNewTab(paneId)}
<AddTabButton
hasAiChat={hasAiChat === true}
useCompactAddButton={useCompactAddButton}
showPresetsBar={showPresetsBar ?? DEFAULT_SHOW_PRESETS_BAR}
presets={presets}
onDropToNewTab={movePaneToNewTab}
isLastPaneInTab={checkIsLastPaneInTab}
>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
variant="ghost"
size="icon"
className="size-7 px-1 shrink-0 rounded-md border border-border/60 bg-muted/30 text-muted-foreground hover:bg-accent/60 hover:text-foreground"
>
<LuPlus className="size-3.5" strokeWidth={1.8} />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" className="w-56">
<DropdownMenuItem onClick={handleAddGroup} className="gap-2">
<BsTerminalPlus className="size-4" />
<span>Terminal</span>
<HotkeyMenuShortcut hotkeyId="NEW_GROUP" />
</DropdownMenuItem>
{hasAiChat && (
<DropdownMenuItem onClick={handleAddChat} className="gap-2">
<TbMessageCirclePlus className="size-4" />
<span>Chat</span>
<HotkeyMenuShortcut hotkeyId="NEW_CHAT" />
</DropdownMenuItem>
)}
<DropdownMenuItem onClick={handleAddBrowser} className="gap-2">
<TbWorld className="size-4" />
<span>Browser</span>
<HotkeyMenuShortcut hotkeyId="NEW_BROWSER" />
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuCheckboxItem
checked={showPresetsBar ?? false}
onCheckedChange={(checked) =>
setShowPresetsBar.mutate({ enabled: checked })
}
onSelect={(e) => e.preventDefault()}
>
Show Preset Bar
</DropdownMenuCheckboxItem>
</DropdownMenuContent>
</DropdownMenu>
</NewTabDropZone>
onAddTerminal={handleAddGroup}
onAddChat={handleAddChat}
onAddBrowser={handleAddBrowser}
onOpenPreset={handleOpenPreset}
onConfigurePresets={handleOpenPresetsSettings}
onToggleShowPresetsBar={(enabled) =>
setShowPresetsBar.mutate({ enabled })
}
onToggleCompactAddButton={(enabled) =>
setUseCompactTerminalAddButton.mutate({ enabled })
}
/>
);

return (
Expand Down Expand Up @@ -301,7 +311,15 @@ export function GroupStrip() {
</div>
)}
{hasHorizontalOverflow ? (
<div className="h-full w-10 shrink-0" />
<div
className={`h-full shrink-0 ${
!useCompactAddButton
? hasAiChat
? "w-[220px]"
: "w-[170px]"
: "w-10"
}`}
/>
) : (
<div className="shrink-0">{plusControl}</div>
)}
Expand Down
Loading
Loading