Skip to content

fix(ui): separate session row actions from navigation#2566

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
Astro-Han merged 3 commits into from
Aug 12, 2026
Merged

fix(ui): separate session row actions from navigation #2566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f093555
fix(ui): separate session row actions from navigation
me2seeks Aug 9, 2026
f705d50
test(ui): cover session row sibling controls
me2seeks Aug 9, 2026
13571c6
test(ui): use the session type entry point
me2seeks Aug 12, 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
17 changes: 17 additions & 0 deletions apps/desktop/src/renderer/styles/sidebar.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,6 +190,7 @@
}

.maka-session-row {
position: relative;
min-width: 0;
-webkit-app-region: no-drag;
}
Expand DownExpand Up@@ -267,6 +268,22 @@
min-height: var(--h-control-sm, 24px);
}

/* SideNavItem owns the row button and only supports non-interactive
* endContent. The action menu occupies the reserved trailing slot visually,
* but remains its sibling in the DOM so neither control contains the other. */
.maka-session-row-action {
position: absolute;
inset-block-start: calc(
(var(--size-element-md) - var(--size-element-sm)) / 2
);
inset-inline-end: var(--space-2);
z-index: 1;
display: inline-flex;
align-items: center;
justify-content: center;
width: var(--h-control-sm, 24px);
}

.maka-session-row-trailing-spacer {
display: block;
width: 8px;
Expand Down
45 changes: 45 additions & 0 deletions packages/ui/src/__tests__/session-history-row-actions.test.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { renderToStaticMarkup } from 'react-dom/server';
import type { SessionSummary } from '@maka/core/session';
import { LocaleProvider } from '../locale-context.js';
import { SessionHistoryList, type SessionRowActions } from '../session-history-list.js';

const session: SessionSummary = {
id: 'session-1',
name: 'Release notes',
isFlagged: false,
isArchived: false,
labels: [],
hasUnread: false,
status: 'active',
backend: 'ai-sdk',
llmConnectionSlug: 'test-connection',
connectionLocked: true,
model: 'test-model',
permissionMode: 'ask',
};

const rowActions: SessionRowActions = {
onToggleFlag: () => undefined,
onArchive: () => undefined,
onUnarchive: () => undefined,
onRename: () => undefined,
onDelete: () => undefined,
};

test('renders session navigation and row actions as sibling controls', () => {
const markup = renderToStaticMarkup(
<LocaleProvider locale="en">
<SessionHistoryList
sessions={[session]}
onSelectSession={() => undefined}
rowActions={rowActions}
/>
</LocaleProvider>,
);

assert.equal((markup.match(/<button\b/g) ?? []).length, 2);
assert.match(markup, /class="maka-session-row-action"/);
assert.doesNotMatch(markup, /<button\b(?:(?!<\/button>)[\s\S])*<button\b/);
});
237 changes: 129 additions & 108 deletions packages/ui/src/session-history-list.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -440,7 +440,11 @@ const SessionNavRow = memo(function SessionNavRow(props: {
onClick={(event) => {
if (event.detail > 1 && props.actions) {
props.onStartRename(
{ kind: 'session', id: props.session.id, name: props.session.name },
{
kind: 'session',
id: props.session.id,
name: props.session.name,
},
// The row's own button: a double-click starts the rename from
// the row itself, not from the actions menu.
event.currentTarget as HTMLElement,
Expand All@@ -450,17 +454,23 @@ const SessionNavRow = memo(function SessionNavRow(props: {
props.onSelectSession(props.session.id);
}}
endContent={
<SessionItemEndContent
<SessionItemMeta
session={props.session}
active={props.active}
streaming={props.streaming}
stale={props.stale}
worktree={props.worktree}
actions={props.actions}
onStartRename={props.onStartRename}
reserveAction={props.actions !== undefined}
/>
}
/>
{props.actions && (
<SessionItemActions
session={props.session}
actions={props.actions}
onStartRename={props.onStartRename}
/>
)}
</div>
);
});
Expand DownExpand Up@@ -578,49 +588,18 @@ function ProjectItemEndContent(props: {
);
}

const SessionItemEndContent = memo(function SessionItemEndContent(props: {
const SessionItemMeta = memo(function SessionItemMeta(props: {
session: SessionSummary;
active: boolean;
streaming: boolean;
stale: boolean;
worktree: boolean;
actions?: SessionRowActions;
onStartRename(target: SessionRenameTarget, opener: HTMLElement | null): void;
reserveAction: boolean;
}) {
const locale = useUiLocale();
const trailingRef = useRef<HTMLSpanElement>(null);
const copy = getConversationCopy(locale).sessions;
const [menuOpen, setMenuOpen] = useState(false);
const [pendingAction, setPendingAction] = useState<SessionRowActionId | null>(null);
const mountedRef = useMountedRef();
const pendingActionRef = useRef<SessionRowActionId | null>(null);
const pendingMenuIntentRef = useRef<(() => void) | null>(null);
const actions = props.actions;
const statusDot = resolveSessionStatusDot(props.session, props.streaming, props.active, locale);

useEffect(
() => () => {
pendingActionRef.current = null;
},
[],
);

function runRowAction(actionId: SessionRowActionId, action: () => void | Promise<void>) {
if (pendingActionRef.current) return;
pendingActionRef.current = actionId;
setPendingAction(actionId);
void (async () => {
try {
await action();
} catch {
// AppShell owns visible session-action failure feedback.
} finally {
pendingActionRef.current = null;
if (mountedRef.current) setPendingAction(null);
}
})();
}

// Signal (status/unread) and action (MoreMenu) are orthogonal — same as
// project rows (badge + menu). No hover XOR state machine.
const signal = statusDot ? (
Expand All@@ -636,7 +615,7 @@ const SessionItemEndContent = memo(function SessionItemEndContent(props: {
) : null;

return (
<EndContentHitTarget className="maka-session-row-end">
<span className="maka-session-row-end">
{props.stale && (
<Tooltip content={copy.staleTitle}>
{/* `yellow`, not `warning`. Astryx keeps two archives: the semantic
Expand DownExpand Up@@ -666,79 +645,121 @@ const SessionItemEndContent = memo(function SessionItemEndContent(props: {
/>
)}
{signal}
{actions ? (
<span className="maka-session-row-trailing" ref={trailingRef}>
<MoreMenu
size="sm"
label={copy.actionsAriaLabel}
isDisabled={pendingAction !== null}
isMenuOpen={menuOpen}
onOpenChange={(open) => {
setMenuOpen(open);
if (open) return;
const intent = pendingMenuIntentRef.current;
pendingMenuIntentRef.current = null;
if (intent) {
window.requestAnimationFrame(() => {
intent();
});
}
}}
items={[
{
label: props.session.isFlagged ? copy.unpin : copy.pin,
icon: props.session.isFlagged ? PinOff : Pin,
onClick: () =>
runRowAction('flag', () =>
actions.onToggleFlag(props.session.id, !props.session.isFlagged),
),
},
{
label: copy.rename,
icon: Pencil,
onClick: () => {
// Read now, while the trigger is still the thing the user is
// on: by the time the intent runs the menu has closed and
// focus is mid-handover.
const opener = trailingRef.current?.querySelector<HTMLElement>('button') ?? null;
pendingMenuIntentRef.current = () =>
props.onStartRename(
{ kind: 'session', id: props.session.id, name: props.session.name },
opener,
);
},
},
{
label: props.session.isArchived ? copy.unarchive : copy.archive,
icon: props.session.isArchived ? ArchiveRestore : Archive,
onClick: () =>
runRowAction('archive', () =>
props.session.isArchived
? actions.onUnarchive(props.session.id)
: actions.onArchive(props.session.id),
),
},
{ type: 'divider' },
{
label: copy.delete,
icon: Trash2,
onClick: () => {
pendingMenuIntentRef.current = () =>
runRowAction('delete', () => actions.onDelete(props.session.id));
},
},
]}
/>
</span>
) : (
<span className="maka-session-row-trailing">
{signal ? null : <span className="maka-session-row-trailing-spacer" aria-hidden="true" />}
</span>
)}
</EndContentHitTarget>
<span className="maka-session-row-trailing" aria-hidden="true">
{!props.reserveAction && !signal && <span className="maka-session-row-trailing-spacer" />}
</span>
</span>
);
});

function SessionItemActions(props: {
session: SessionSummary;
actions: SessionRowActions;
onStartRename(target: SessionRenameTarget, opener: HTMLElement | null): void;
}) {
const trailingRef = useRef<HTMLSpanElement>(null);
const copy = getConversationCopy(useUiLocale()).sessions;
const [menuOpen, setMenuOpen] = useState(false);
const [pendingAction, setPendingAction] = useState<SessionRowActionId | null>(null);
const mountedRef = useMountedRef();
const pendingActionRef = useRef<SessionRowActionId | null>(null);
const pendingMenuIntentRef = useRef<(() => void) | null>(null);
const actions = props.actions;

useEffect(
() => () => {
pendingActionRef.current = null;
},
[],
);

function runRowAction(actionId: SessionRowActionId, action: () => void | Promise<void>) {
if (pendingActionRef.current) return;
pendingActionRef.current = actionId;
setPendingAction(actionId);
void (async () => {
try {
await action();
} catch {
// AppShell owns visible session-action failure feedback.
} finally {
pendingActionRef.current = null;
if (mountedRef.current) setPendingAction(null);
}
})();
}

return (
<span
className="maka-session-row-action"
ref={trailingRef}
onKeyDown={(event) => event.stopPropagation()}
>
<MoreMenu
size="sm"
label={copy.actionsAriaLabel}
isDisabled={pendingAction !== null}
isMenuOpen={menuOpen}
onOpenChange={(open) => {
setMenuOpen(open);
if (open) return;
const intent = pendingMenuIntentRef.current;
pendingMenuIntentRef.current = null;
if (intent) window.requestAnimationFrame(intent);
}}
items={[
{
label: props.session.isFlagged ? copy.unpin : copy.pin,
icon: props.session.isFlagged ? PinOff : Pin,
onClick: () =>
runRowAction('flag', () =>
actions.onToggleFlag(props.session.id, !props.session.isFlagged),
),
},
{
label: copy.rename,
icon: Pencil,
onClick: () => {
// Read now, while the trigger is still the thing the user is on:
// by the time the intent runs the menu has closed and focus is
// mid-handover.
const opener = trailingRef.current?.querySelector<HTMLElement>('button') ?? null;
pendingMenuIntentRef.current = () =>
props.onStartRename(
{
kind: 'session',
id: props.session.id,
name: props.session.name,
},
opener,
);
},
},
{
label: props.session.isArchived ? copy.unarchive : copy.archive,
icon: props.session.isArchived ? ArchiveRestore : Archive,
onClick: () =>
runRowAction('archive', () =>
props.session.isArchived
? actions.onUnarchive(props.session.id)
: actions.onArchive(props.session.id),
),
},
{ type: 'divider' },
{
label: copy.delete,
icon: Trash2,
onClick: () => {
pendingMenuIntentRef.current = () =>
runRowAction('delete', () => actions.onDelete(props.session.id));
},
},
]}
/>
</span>
);
}

function resolveSessionStatusDot(
session: SessionSummary,
streaming: boolean,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(ui): separate session row actions from navigation by me2seeks · Pull Request #2566 · apache/maka · GitHub
Skip to content
fix(ui): separate session row actions from navigation#2566

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

Astro-Han
merged 3 commits into

from

Aug 12, 2026
 Merged


fix(ui): separate session row actions from navigation
#2566
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f093555

fix(ui): separate session row actions from navigation


me2seeks Aug 9, 2026
f705d50

test(ui): cover session row sibling controls


me2seeks Aug 9, 2026
13571c6

test(ui): use the session type entry point


me2seeks Aug 12, 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


17 changes: 17 additions & 0 deletions
apps/desktop/src/renderer/styles/sidebar.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,6 +190,7 @@
}

.maka-session-row {
 position: relative;
 min-width: 0;
 -webkit-app-region: no-drag;
}
Expand DownExpand Up@@ -267,6 +268,22 @@
 min-height: var(--h-control-sm, 24px);
}

/* SideNavItem owns the row button and only supports non-interactive
 * endContent. The action menu occupies the reserved trailing slot visually,
 * but remains its sibling in the DOM so neither control contains the other. */
.maka-session-row-action {
 position: absolute;
 inset-block-start: calc(
 (var(--size-element-md) - var(--size-element-sm)) / 2
 );
 inset-inline-end: var(--space-2);
 z-index: 1;
 display: inline-flex;
 align-items: center;
 justify-content: center;
 width: var(--h-control-sm, 24px);
}

.maka-session-row-trailing-spacer {
 display: block;
 width: 8px;
Expand Down

45 changes: 45 additions & 0 deletions
packages/ui/src/__tests__/session-history-row-actions.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { renderToStaticMarkup } from 'react-dom/server';
import type { SessionSummary } from '@maka/core/session';
import { LocaleProvider } from '../locale-context.js';
import { SessionHistoryList, type SessionRowActions } from '../session-history-list.js';

const session: SessionSummary = {
 id: 'session-1',
 name: 'Release notes',
 isFlagged: false,
 isArchived: false,
 labels: [],
 hasUnread: false,
 status: 'active',
 backend: 'ai-sdk',
 llmConnectionSlug: 'test-connection',
 connectionLocked: true,
 model: 'test-model',
 permissionMode: 'ask',
};

const rowActions: SessionRowActions = {
 onToggleFlag: () => undefined,
 onArchive: () => undefined,
 onUnarchive: () => undefined,
 onRename: () => undefined,
 onDelete: () => undefined,
};

test('renders session navigation and row actions as sibling controls', () => {
 const markup = renderToStaticMarkup(
 <LocaleProvider locale="en">
 <SessionHistoryList
 sessions={[session]}
 onSelectSession={() => undefined}
 rowActions={rowActions}
 />
 </LocaleProvider>,
 );

 assert.equal((markup.match(/<button\b/g) ?? []).length, 2);
 assert.match(markup, /class="maka-session-row-action"/);
 assert.doesNotMatch(markup, /<button\b(?:(?!<\/button>)[\s\S])*<button\b/);
});

237 changes: 129 additions & 108 deletions
packages/ui/src/session-history-list.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -440,7 +440,11 @@ const SessionNavRow = memo(function SessionNavRow(props: {
 onClick={(event) => {
 if (event.detail > 1 && props.actions) {
 props.onStartRename(
 { kind: 'session', id: props.session.id, name: props.session.name },
 {
 kind: 'session',
 id: props.session.id,
 name: props.session.name,
 },
 // The row's own button: a double-click starts the rename from
 // the row itself, not from the actions menu.
 event.currentTarget as HTMLElement,
Expand All@@ -450,17 +454,23 @@ const SessionNavRow = memo(function SessionNavRow(props: {
 props.onSelectSession(props.session.id);
 }}
 endContent={
 <SessionItemEndContent
 <SessionItemMeta
 session={props.session}
 active={props.active}
 streaming={props.streaming}
 stale={props.stale}
 worktree={props.worktree}
 actions={props.actions}
 onStartRename={props.onStartRename}
 reserveAction={props.actions !== undefined}
 />
 }
 />
 {props.actions && (
 <SessionItemActions
 session={props.session}
 actions={props.actions}
 onStartRename={props.onStartRename}
 />
 )}
 </div>
 );
});
Expand DownExpand Up@@ -578,49 +588,18 @@ function ProjectItemEndContent(props: {
 );
}

const SessionItemEndContent = memo(function SessionItemEndContent(props: {
const SessionItemMeta = memo(function SessionItemMeta(props: {
 session: SessionSummary;
 active: boolean;
 streaming: boolean;
 stale: boolean;
 worktree: boolean;
 actions?: SessionRowActions;
 onStartRename(target: SessionRenameTarget, opener: HTMLElement | null): void;
 reserveAction: boolean;
}) {
 const locale = useUiLocale();
 const trailingRef = useRef<HTMLSpanElement>(null);
 const copy = getConversationCopy(locale).sessions;
 const [menuOpen, setMenuOpen] = useState(false);
 const [pendingAction, setPendingAction] = useState<SessionRowActionId | null>(null);
 const mountedRef = useMountedRef();
 const pendingActionRef = useRef<SessionRowActionId | null>(null);
 const pendingMenuIntentRef = useRef<(() => void) | null>(null);
 const actions = props.actions;
 const statusDot = resolveSessionStatusDot(props.session, props.streaming, props.active, locale);

 useEffect(
 () => () => {
 pendingActionRef.current = null;
 },
 [],
 );

 function runRowAction(actionId: SessionRowActionId, action: () => void | Promise<void>) {
 if (pendingActionRef.current) return;
 pendingActionRef.current = actionId;
 setPendingAction(actionId);
 void (async () => {
 try {
 await action();
 } catch {
 // AppShell owns visible session-action failure feedback.
 } finally {
 pendingActionRef.current = null;
 if (mountedRef.current) setPendingAction(null);
 }
 })();
 }

 // Signal (status/unread) and action (MoreMenu) are orthogonal — same as
 // project rows (badge + menu). No hover XOR state machine.
 const signal = statusDot ? (
Expand All@@ -636,7 +615,7 @@ const SessionItemEndContent = memo(function SessionItemEndContent(props: {
 ) : null;

 return (
 <EndContentHitTarget className="maka-session-row-end">
 <span className="maka-session-row-end">
 {props.stale && (
 <Tooltip content={copy.staleTitle}>
 {/* `yellow`, not `warning`. Astryx keeps two archives: the semantic
Expand DownExpand Up@@ -666,79 +645,121 @@ const SessionItemEndContent = memo(function SessionItemEndContent(props: {
 />
 )}
 {signal}
 {actions ? (
 <span className="maka-session-row-trailing" ref={trailingRef}>
 <MoreMenu
 size="sm"
 label={copy.actionsAriaLabel}
 isDisabled={pendingAction !== null}
 isMenuOpen={menuOpen}
 onOpenChange={(open) => {
 setMenuOpen(open);
 if (open) return;
 const intent = pendingMenuIntentRef.current;
 pendingMenuIntentRef.current = null;
 if (intent) {
 window.requestAnimationFrame(() => {
 intent();
 });
 }
 }}
 items={[
 {
 label: props.session.isFlagged ? copy.unpin : copy.pin,
 icon: props.session.isFlagged ? PinOff : Pin,
 onClick: () =>
 runRowAction('flag', () =>
 actions.onToggleFlag(props.session.id, !props.session.isFlagged),
 ),
 },
 {
 label: copy.rename,
 icon: Pencil,
 onClick: () => {
 // Read now, while the trigger is still the thing the user is
 // on: by the time the intent runs the menu has closed and
 // focus is mid-handover.
 const opener = trailingRef.current?.querySelector<HTMLElement>('button') ?? null;
 pendingMenuIntentRef.current = () =>
 props.onStartRename(
 { kind: 'session', id: props.session.id, name: props.session.name },
 opener,
 );
 },
 },
 {
 label: props.session.isArchived ? copy.unarchive : copy.archive,
 icon: props.session.isArchived ? ArchiveRestore : Archive,
 onClick: () =>
 runRowAction('archive', () =>
 props.session.isArchived
 ? actions.onUnarchive(props.session.id)
 : actions.onArchive(props.session.id),
 ),
 },
 { type: 'divider' },
 {
 label: copy.delete,
 icon: Trash2,
 onClick: () => {
 pendingMenuIntentRef.current = () =>
 runRowAction('delete', () => actions.onDelete(props.session.id));
 },
 },
 ]}
 />
 </span>
 ) : (
 <span className="maka-session-row-trailing">
 {signal ? null : <span className="maka-session-row-trailing-spacer" aria-hidden="true" />}
 </span>
 )}
 </EndContentHitTarget>
 <span className="maka-session-row-trailing" aria-hidden="true">
 {!props.reserveAction && !signal && <span className="maka-session-row-trailing-spacer" />}
 </span>
 </span>
 );
});

function SessionItemActions(props: {
 session: SessionSummary;
 actions: SessionRowActions;
 onStartRename(target: SessionRenameTarget, opener: HTMLElement | null): void;
}) {
 const trailingRef = useRef<HTMLSpanElement>(null);
 const copy = getConversationCopy(useUiLocale()).sessions;
 const [menuOpen, setMenuOpen] = useState(false);
 const [pendingAction, setPendingAction] = useState<SessionRowActionId | null>(null);
 const mountedRef = useMountedRef();
 const pendingActionRef = useRef<SessionRowActionId | null>(null);
 const pendingMenuIntentRef = useRef<(() => void) | null>(null);
 const actions = props.actions;

 useEffect(
 () => () => {
 pendingActionRef.current = null;
 },
 [],
 );

 function runRowAction(actionId: SessionRowActionId, action: () => void | Promise<void>) {
 if (pendingActionRef.current) return;
 pendingActionRef.current = actionId;
 setPendingAction(actionId);
 void (async () => {
 try {
 await action();
 } catch {
 // AppShell owns visible session-action failure feedback.
 } finally {
 pendingActionRef.current = null;
 if (mountedRef.current) setPendingAction(null);
 }
 })();
 }

 return (
 <span
 className="maka-session-row-action"
 ref={trailingRef}
 onKeyDown={(event) => event.stopPropagation()}
 >
 <MoreMenu
 size="sm"
 label={copy.actionsAriaLabel}
 isDisabled={pendingAction !== null}
 isMenuOpen={menuOpen}
 onOpenChange={(open) => {
 setMenuOpen(open);
 if (open) return;
 const intent = pendingMenuIntentRef.current;
 pendingMenuIntentRef.current = null;
 if (intent) window.requestAnimationFrame(intent);
 }}
 items={[
 {
 label: props.session.isFlagged ? copy.unpin : copy.pin,
 icon: props.session.isFlagged ? PinOff : Pin,
 onClick: () =>
 runRowAction('flag', () =>
 actions.onToggleFlag(props.session.id, !props.session.isFlagged),
 ),
 },
 {
 label: copy.rename,
 icon: Pencil,
 onClick: () => {
 // Read now, while the trigger is still the thing the user is on:
 // by the time the intent runs the menu has closed and focus is
 // mid-handover.
 const opener = trailingRef.current?.querySelector<HTMLElement>('button') ?? null;
 pendingMenuIntentRef.current = () =>
 props.onStartRename(
 {
 kind: 'session',
 id: props.session.id,
 name: props.session.name,
 },
 opener,
 );
 },
 },
 {
 label: props.session.isArchived ? copy.unarchive : copy.archive,
 icon: props.session.isArchived ? ArchiveRestore : Archive,
 onClick: () =>
 runRowAction('archive', () =>
 props.session.isArchived
 ? actions.onUnarchive(props.session.id)
 : actions.onArchive(props.session.id),
 ),
 },
 { type: 'divider' },
 {
 label: copy.delete,
 icon: Trash2,
 onClick: () => {
 pendingMenuIntentRef.current = () =>
 runRowAction('delete', () => actions.onDelete(props.session.id));
 },
 },
 ]}
 />
 </span>
 );
}

function resolveSessionStatusDot(
 session: SessionSummary,
 streaming: boolean,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(ui): separate session row actions from navigation by me2seeks · Pull Request #2566 · apache/maka · GitHub
Skip to content
fix(ui): separate session row actions from navigation#2566

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

Astro-Han
merged 3 commits into

from

Aug 12, 2026
 Merged


fix(ui): separate session row actions from navigation
#2566
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f093555

fix(ui): separate session row actions from navigation


me2seeks Aug 9, 2026
f705d50

test(ui): cover session row sibling controls


me2seeks Aug 9, 2026
13571c6

test(ui): use the session type entry point


me2seeks Aug 12, 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


17 changes: 17 additions & 0 deletions
apps/desktop/src/renderer/styles/sidebar.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,6 +190,7 @@
}

.maka-session-row {
 position: relative;
 min-width: 0;
 -webkit-app-region: no-drag;
}
Expand DownExpand Up@@ -267,6 +268,22 @@
 min-height: var(--h-control-sm, 24px);
}

/* SideNavItem owns the row button and only supports non-interactive
 * endContent. The action menu occupies the reserved trailing slot visually,
 * but remains its sibling in the DOM so neither control contains the other. */
.maka-session-row-action {
 position: absolute;
 inset-block-start: calc(
 (var(--size-element-md) - var(--size-element-sm)) / 2
 );
 inset-inline-end: var(--space-2);
 z-index: 1;
 display: inline-flex;
 align-items: center;
 justify-content: center;
 width: var(--h-control-sm, 24px);
}

.maka-session-row-trailing-spacer {
 display: block;
 width: 8px;
Expand Down

45 changes: 45 additions & 0 deletions
packages/ui/src/__tests__/session-history-row-actions.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { renderToStaticMarkup } from 'react-dom/server';
import type { SessionSummary } from '@maka/core/session';
import { LocaleProvider } from '../locale-context.js';
import { SessionHistoryList, type SessionRowActions } from '../session-history-list.js';

const session: SessionSummary = {
 id: 'session-1',
 name: 'Release notes',
 isFlagged: false,
 isArchived: false,
 labels: [],
 hasUnread: false,
 status: 'active',
 backend: 'ai-sdk',
 llmConnectionSlug: 'test-connection',
 connectionLocked: true,
 model: 'test-model',
 permissionMode: 'ask',
};

const rowActions: SessionRowActions = {
 onToggleFlag: () => undefined,
 onArchive: () => undefined,
 onUnarchive: () => undefined,
 onRename: () => undefined,
 onDelete: () => undefined,
};

test('renders session navigation and row actions as sibling controls', () => {
 const markup = renderToStaticMarkup(
 <LocaleProvider locale="en">
 <SessionHistoryList
 sessions={[session]}
 onSelectSession={() => undefined}
 rowActions={rowActions}
 />
 </LocaleProvider>,
 );

 assert.equal((markup.match(/<button\b/g) ?? []).length, 2);
 assert.match(markup, /class="maka-session-row-action"/);
 assert.doesNotMatch(markup, /<button\b(?:(?!<\/button>)[\s\S])*<button\b/);
});

237 changes: 129 additions & 108 deletions
packages/ui/src/session-history-list.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -440,7 +440,11 @@ const SessionNavRow = memo(function SessionNavRow(props: {
 onClick={(event) => {
 if (event.detail > 1 && props.actions) {
 props.onStartRename(
 { kind: 'session', id: props.session.id, name: props.session.name },
 {
 kind: 'session',
 id: props.session.id,
 name: props.session.name,
 },
 // The row's own button: a double-click starts the rename from
 // the row itself, not from the actions menu.
 event.currentTarget as HTMLElement,
Expand All@@ -450,17 +454,23 @@ const SessionNavRow = memo(function SessionNavRow(props: {
 props.onSelectSession(props.session.id);
 }}
 endContent={
 <SessionItemEndContent
 <SessionItemMeta
 session={props.session}
 active={props.active}
 streaming={props.streaming}
 stale={props.stale}
 worktree={props.worktree}
 actions={props.actions}
 onStartRename={props.onStartRename}
 reserveAction={props.actions !== undefined}
 />
 }
 />
 {props.actions && (
 <SessionItemActions
 session={props.session}
 actions={props.actions}
 onStartRename={props.onStartRename}
 />
 )}
 </div>
 );
});
Expand DownExpand Up@@ -578,49 +588,18 @@ function ProjectItemEndContent(props: {
 );
}

const SessionItemEndContent = memo(function SessionItemEndContent(props: {
const SessionItemMeta = memo(function SessionItemMeta(props: {
 session: SessionSummary;
 active: boolean;
 streaming: boolean;
 stale: boolean;
 worktree: boolean;
 actions?: SessionRowActions;
 onStartRename(target: SessionRenameTarget, opener: HTMLElement | null): void;
 reserveAction: boolean;
}) {
 const locale = useUiLocale();
 const trailingRef = useRef<HTMLSpanElement>(null);
 const copy = getConversationCopy(locale).sessions;
 const [menuOpen, setMenuOpen] = useState(false);
 const [pendingAction, setPendingAction] = useState<SessionRowActionId | null>(null);
 const mountedRef = useMountedRef();
 const pendingActionRef = useRef<SessionRowActionId | null>(null);
 const pendingMenuIntentRef = useRef<(() => void) | null>(null);
 const actions = props.actions;
 const statusDot = resolveSessionStatusDot(props.session, props.streaming, props.active, locale);

 useEffect(
 () => () => {
 pendingActionRef.current = null;
 },
 [],
 );

 function runRowAction(actionId: SessionRowActionId, action: () => void | Promise<void>) {
 if (pendingActionRef.current) return;
 pendingActionRef.current = actionId;
 setPendingAction(actionId);
 void (async () => {
 try {
 await action();
 } catch {
 // AppShell owns visible session-action failure feedback.
 } finally {
 pendingActionRef.current = null;
 if (mountedRef.current) setPendingAction(null);
 }
 })();
 }

 // Signal (status/unread) and action (MoreMenu) are orthogonal — same as
 // project rows (badge + menu). No hover XOR state machine.
 const signal = statusDot ? (
Expand All@@ -636,7 +615,7 @@ const SessionItemEndContent = memo(function SessionItemEndContent(props: {
 ) : null;

 return (
 <EndContentHitTarget className="maka-session-row-end">
 <span className="maka-session-row-end">
 {props.stale && (
 <Tooltip content={copy.staleTitle}>
 {/* `yellow`, not `warning`. Astryx keeps two archives: the semantic
Expand DownExpand Up@@ -666,79 +645,121 @@ const SessionItemEndContent = memo(function SessionItemEndContent(props: {
 />
 )}
 {signal}
 {actions ? (
 <span className="maka-session-row-trailing" ref={trailingRef}>
 <MoreMenu
 size="sm"
 label={copy.actionsAriaLabel}
 isDisabled={pendingAction !== null}
 isMenuOpen={menuOpen}
 onOpenChange={(open) => {
 setMenuOpen(open);
 if (open) return;
 const intent = pendingMenuIntentRef.current;
 pendingMenuIntentRef.current = null;
 if (intent) {
 window.requestAnimationFrame(() => {
 intent();
 });
 }
 }}
 items={[
 {
 label: props.session.isFlagged ? copy.unpin : copy.pin,
 icon: props.session.isFlagged ? PinOff : Pin,
 onClick: () =>
 runRowAction('flag', () =>
 actions.onToggleFlag(props.session.id, !props.session.isFlagged),
 ),
 },
 {
 label: copy.rename,
 icon: Pencil,
 onClick: () => {
 // Read now, while the trigger is still the thing the user is
 // on: by the time the intent runs the menu has closed and
 // focus is mid-handover.
 const opener = trailingRef.current?.querySelector<HTMLElement>('button') ?? null;
 pendingMenuIntentRef.current = () =>
 props.onStartRename(
 { kind: 'session', id: props.session.id, name: props.session.name },
 opener,
 );
 },
 },
 {
 label: props.session.isArchived ? copy.unarchive : copy.archive,
 icon: props.session.isArchived ? ArchiveRestore : Archive,
 onClick: () =>
 runRowAction('archive', () =>
 props.session.isArchived
 ? actions.onUnarchive(props.session.id)
 : actions.onArchive(props.session.id),
 ),
 },
 { type: 'divider' },
 {
 label: copy.delete,
 icon: Trash2,
 onClick: () => {
 pendingMenuIntentRef.current = () =>
 runRowAction('delete', () => actions.onDelete(props.session.id));
 },
 },
 ]}
 />
 </span>
 ) : (
 <span className="maka-session-row-trailing">
 {signal ? null : <span className="maka-session-row-trailing-spacer" aria-hidden="true" />}
 </span>
 )}
 </EndContentHitTarget>
 <span className="maka-session-row-trailing" aria-hidden="true">
 {!props.reserveAction && !signal && <span className="maka-session-row-trailing-spacer" />}
 </span>
 </span>
 );
});

function SessionItemActions(props: {
 session: SessionSummary;
 actions: SessionRowActions;
 onStartRename(target: SessionRenameTarget, opener: HTMLElement | null): void;
}) {
 const trailingRef = useRef<HTMLSpanElement>(null);
 const copy = getConversationCopy(useUiLocale()).sessions;
 const [menuOpen, setMenuOpen] = useState(false);
 const [pendingAction, setPendingAction] = useState<SessionRowActionId | null>(null);
 const mountedRef = useMountedRef();
 const pendingActionRef = useRef<SessionRowActionId | null>(null);
 const pendingMenuIntentRef = useRef<(() => void) | null>(null);
 const actions = props.actions;

 useEffect(
 () => () => {
 pendingActionRef.current = null;
 },
 [],
 );

 function runRowAction(actionId: SessionRowActionId, action: () => void | Promise<void>) {
 if (pendingActionRef.current) return;
 pendingActionRef.current = actionId;
 setPendingAction(actionId);
 void (async () => {
 try {
 await action();
 } catch {
 // AppShell owns visible session-action failure feedback.
 } finally {
 pendingActionRef.current = null;
 if (mountedRef.current) setPendingAction(null);
 }
 })();
 }

 return (
 <span
 className="maka-session-row-action"
 ref={trailingRef}
 onKeyDown={(event) => event.stopPropagation()}
 >
 <MoreMenu
 size="sm"
 label={copy.actionsAriaLabel}
 isDisabled={pendingAction !== null}
 isMenuOpen={menuOpen}
 onOpenChange={(open) => {
 setMenuOpen(open);
 if (open) return;
 const intent = pendingMenuIntentRef.current;
 pendingMenuIntentRef.current = null;
 if (intent) window.requestAnimationFrame(intent);
 }}
 items={[
 {
 label: props.session.isFlagged ? copy.unpin : copy.pin,
 icon: props.session.isFlagged ? PinOff : Pin,
 onClick: () =>
 runRowAction('flag', () =>
 actions.onToggleFlag(props.session.id, !props.session.isFlagged),
 ),
 },
 {
 label: copy.rename,
 icon: Pencil,
 onClick: () => {
 // Read now, while the trigger is still the thing the user is on:
 // by the time the intent runs the menu has closed and focus is
 // mid-handover.
 const opener = trailingRef.current?.querySelector<HTMLElement>('button') ?? null;
 pendingMenuIntentRef.current = () =>
 props.onStartRename(
 {
 kind: 'session',
 id: props.session.id,
 name: props.session.name,
 },
 opener,
 );
 },
 },
 {
 label: props.session.isArchived ? copy.unarchive : copy.archive,
 icon: props.session.isArchived ? ArchiveRestore : Archive,
 onClick: () =>
 runRowAction('archive', () =>
 props.session.isArchived
 ? actions.onUnarchive(props.session.id)
 : actions.onArchive(props.session.id),
 ),
 },
 { type: 'divider' },
 {
 label: copy.delete,
 icon: Trash2,
 onClick: () => {
 pendingMenuIntentRef.current = () =>
 runRowAction('delete', () => actions.onDelete(props.session.id));
 },
 },
 ]}
 />
 </span>
 );
}

function resolveSessionStatusDot(
 session: SessionSummary,
 streaming: boolean,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(ui): separate session row actions from navigation by me2seeks · Pull Request #2566 · apache/maka · GitHub
Skip to content
fix(ui): separate session row actions from navigation#2566

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

Astro-Han
merged 3 commits into

from

Aug 12, 2026
 Merged


fix(ui): separate session row actions from navigation
#2566
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f093555

fix(ui): separate session row actions from navigation


me2seeks Aug 9, 2026
f705d50

test(ui): cover session row sibling controls


me2seeks Aug 9, 2026
13571c6

test(ui): use the session type entry point


me2seeks Aug 12, 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


17 changes: 17 additions & 0 deletions
apps/desktop/src/renderer/styles/sidebar.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,6 +190,7 @@
}

.maka-session-row {
 position: relative;
 min-width: 0;
 -webkit-app-region: no-drag;
}
Expand DownExpand Up@@ -267,6 +268,22 @@
 min-height: var(--h-control-sm, 24px);
}

/* SideNavItem owns the row button and only supports non-interactive
 * endContent. The action menu occupies the reserved trailing slot visually,
 * but remains its sibling in the DOM so neither control contains the other. */
.maka-session-row-action {
 position: absolute;
 inset-block-start: calc(
 (var(--size-element-md) - var(--size-element-sm)) / 2
 );
 inset-inline-end: var(--space-2);
 z-index: 1;
 display: inline-flex;
 align-items: center;
 justify-content: center;
 width: var(--h-control-sm, 24px);
}

.maka-session-row-trailing-spacer {
 display: block;
 width: 8px;
Expand Down

45 changes: 45 additions & 0 deletions
packages/ui/src/__tests__/session-history-row-actions.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { renderToStaticMarkup } from 'react-dom/server';
import type { SessionSummary } from '@maka/core/session';
import { LocaleProvider } from '../locale-context.js';
import { SessionHistoryList, type SessionRowActions } from '../session-history-list.js';

const session: SessionSummary = {
 id: 'session-1',
 name: 'Release notes',
 isFlagged: false,
 isArchived: false,
 labels: [],
 hasUnread: false,
 status: 'active',
 backend: 'ai-sdk',
 llmConnectionSlug: 'test-connection',
 connectionLocked: true,
 model: 'test-model',
 permissionMode: 'ask',
};

const rowActions: SessionRowActions = {
 onToggleFlag: () => undefined,
 onArchive: () => undefined,
 onUnarchive: () => undefined,
 onRename: () => undefined,
 onDelete: () => undefined,
};

test('renders session navigation and row actions as sibling controls', () => {
 const markup = renderToStaticMarkup(
 <LocaleProvider locale="en">
 <SessionHistoryList
 sessions={[session]}
 onSelectSession={() => undefined}
 rowActions={rowActions}
 />
 </LocaleProvider>,
 );

 assert.equal((markup.match(/<button\b/g) ?? []).length, 2);
 assert.match(markup, /class="maka-session-row-action"/);
 assert.doesNotMatch(markup, /<button\b(?:(?!<\/button>)[\s\S])*<button\b/);
});

237 changes: 129 additions & 108 deletions
packages/ui/src/session-history-list.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -440,7 +440,11 @@ const SessionNavRow = memo(function SessionNavRow(props: {
 onClick={(event) => {
 if (event.detail > 1 && props.actions) {
 props.onStartRename(
 { kind: 'session', id: props.session.id, name: props.session.name },
 {
 kind: 'session',
 id: props.session.id,
 name: props.session.name,
 },
 // The row's own button: a double-click starts the rename from
 // the row itself, not from the actions menu.
 event.currentTarget as HTMLElement,
Expand All@@ -450,17 +454,23 @@ const SessionNavRow = memo(function SessionNavRow(props: {
 props.onSelectSession(props.session.id);
 }}
 endContent={
 <SessionItemEndContent
 <SessionItemMeta
 session={props.session}
 active={props.active}
 streaming={props.streaming}
 stale={props.stale}
 worktree={props.worktree}
 actions={props.actions}
 onStartRename={props.onStartRename}
 reserveAction={props.actions !== undefined}
 />
 }
 />
 {props.actions && (
 <SessionItemActions
 session={props.session}
 actions={props.actions}
 onStartRename={props.onStartRename}
 />
 )}
 </div>
 );
});
Expand DownExpand Up@@ -578,49 +588,18 @@ function ProjectItemEndContent(props: {
 );
}

const SessionItemEndContent = memo(function SessionItemEndContent(props: {
const SessionItemMeta = memo(function SessionItemMeta(props: {
 session: SessionSummary;
 active: boolean;
 streaming: boolean;
 stale: boolean;
 worktree: boolean;
 actions?: SessionRowActions;
 onStartRename(target: SessionRenameTarget, opener: HTMLElement | null): void;
 reserveAction: boolean;
}) {
 const locale = useUiLocale();
 const trailingRef = useRef<HTMLSpanElement>(null);
 const copy = getConversationCopy(locale).sessions;
 const [menuOpen, setMenuOpen] = useState(false);
 const [pendingAction, setPendingAction] = useState<SessionRowActionId | null>(null);
 const mountedRef = useMountedRef();
 const pendingActionRef = useRef<SessionRowActionId | null>(null);
 const pendingMenuIntentRef = useRef<(() => void) | null>(null);
 const actions = props.actions;
 const statusDot = resolveSessionStatusDot(props.session, props.streaming, props.active, locale);

 useEffect(
 () => () => {
 pendingActionRef.current = null;
 },
 [],
 );

 function runRowAction(actionId: SessionRowActionId, action: () => void | Promise<void>) {
 if (pendingActionRef.current) return;
 pendingActionRef.current = actionId;
 setPendingAction(actionId);
 void (async () => {
 try {
 await action();
 } catch {
 // AppShell owns visible session-action failure feedback.
 } finally {
 pendingActionRef.current = null;
 if (mountedRef.current) setPendingAction(null);
 }
 })();
 }

 // Signal (status/unread) and action (MoreMenu) are orthogonal — same as
 // project rows (badge + menu). No hover XOR state machine.
 const signal = statusDot ? (
Expand All@@ -636,7 +615,7 @@ const SessionItemEndContent = memo(function SessionItemEndContent(props: {
 ) : null;

 return (
 <EndContentHitTarget className="maka-session-row-end">
 <span className="maka-session-row-end">
 {props.stale && (
 <Tooltip content={copy.staleTitle}>
 {/* `yellow`, not `warning`. Astryx keeps two archives: the semantic
Expand DownExpand Up@@ -666,79 +645,121 @@ const SessionItemEndContent = memo(function SessionItemEndContent(props: {
 />
 )}
 {signal}
 {actions ? (
 <span className="maka-session-row-trailing" ref={trailingRef}>
 <MoreMenu
 size="sm"
 label={copy.actionsAriaLabel}
 isDisabled={pendingAction !== null}
 isMenuOpen={menuOpen}
 onOpenChange={(open) => {
 setMenuOpen(open);
 if (open) return;
 const intent = pendingMenuIntentRef.current;
 pendingMenuIntentRef.current = null;
 if (intent) {
 window.requestAnimationFrame(() => {
 intent();
 });
 }
 }}
 items={[
 {
 label: props.session.isFlagged ? copy.unpin : copy.pin,
 icon: props.session.isFlagged ? PinOff : Pin,
 onClick: () =>
 runRowAction('flag', () =>
 actions.onToggleFlag(props.session.id, !props.session.isFlagged),
 ),
 },
 {
 label: copy.rename,
 icon: Pencil,
 onClick: () => {
 // Read now, while the trigger is still the thing the user is
 // on: by the time the intent runs the menu has closed and
 // focus is mid-handover.
 const opener = trailingRef.current?.querySelector<HTMLElement>('button') ?? null;
 pendingMenuIntentRef.current = () =>
 props.onStartRename(
 { kind: 'session', id: props.session.id, name: props.session.name },
 opener,
 );
 },
 },
 {
 label: props.session.isArchived ? copy.unarchive : copy.archive,
 icon: props.session.isArchived ? ArchiveRestore : Archive,
 onClick: () =>
 runRowAction('archive', () =>
 props.session.isArchived
 ? actions.onUnarchive(props.session.id)
 : actions.onArchive(props.session.id),
 ),
 },
 { type: 'divider' },
 {
 label: copy.delete,
 icon: Trash2,
 onClick: () => {
 pendingMenuIntentRef.current = () =>
 runRowAction('delete', () => actions.onDelete(props.session.id));
 },
 },
 ]}
 />
 </span>
 ) : (
 <span className="maka-session-row-trailing">
 {signal ? null : <span className="maka-session-row-trailing-spacer" aria-hidden="true" />}
 </span>
 )}
 </EndContentHitTarget>
 <span className="maka-session-row-trailing" aria-hidden="true">
 {!props.reserveAction && !signal && <span className="maka-session-row-trailing-spacer" />}
 </span>
 </span>
 );
});

function SessionItemActions(props: {
 session: SessionSummary;
 actions: SessionRowActions;
 onStartRename(target: SessionRenameTarget, opener: HTMLElement | null): void;
}) {
 const trailingRef = useRef<HTMLSpanElement>(null);
 const copy = getConversationCopy(useUiLocale()).sessions;
 const [menuOpen, setMenuOpen] = useState(false);
 const [pendingAction, setPendingAction] = useState<SessionRowActionId | null>(null);
 const mountedRef = useMountedRef();
 const pendingActionRef = useRef<SessionRowActionId | null>(null);
 const pendingMenuIntentRef = useRef<(() => void) | null>(null);
 const actions = props.actions;

 useEffect(
 () => () => {
 pendingActionRef.current = null;
 },
 [],
 );

 function runRowAction(actionId: SessionRowActionId, action: () => void | Promise<void>) {
 if (pendingActionRef.current) return;
 pendingActionRef.current = actionId;
 setPendingAction(actionId);
 void (async () => {
 try {
 await action();
 } catch {
 // AppShell owns visible session-action failure feedback.
 } finally {
 pendingActionRef.current = null;
 if (mountedRef.current) setPendingAction(null);
 }
 })();
 }

 return (
 <span
 className="maka-session-row-action"
 ref={trailingRef}
 onKeyDown={(event) => event.stopPropagation()}
 >
 <MoreMenu
 size="sm"
 label={copy.actionsAriaLabel}
 isDisabled={pendingAction !== null}
 isMenuOpen={menuOpen}
 onOpenChange={(open) => {
 setMenuOpen(open);
 if (open) return;
 const intent = pendingMenuIntentRef.current;
 pendingMenuIntentRef.current = null;
 if (intent) window.requestAnimationFrame(intent);
 }}
 items={[
 {
 label: props.session.isFlagged ? copy.unpin : copy.pin,
 icon: props.session.isFlagged ? PinOff : Pin,
 onClick: () =>
 runRowAction('flag', () =>
 actions.onToggleFlag(props.session.id, !props.session.isFlagged),
 ),
 },
 {
 label: copy.rename,
 icon: Pencil,
 onClick: () => {
 // Read now, while the trigger is still the thing the user is on:
 // by the time the intent runs the menu has closed and focus is
 // mid-handover.
 const opener = trailingRef.current?.querySelector<HTMLElement>('button') ?? null;
 pendingMenuIntentRef.current = () =>
 props.onStartRename(
 {
 kind: 'session',
 id: props.session.id,
 name: props.session.name,
 },
 opener,
 );
 },
 },
 {
 label: props.session.isArchived ? copy.unarchive : copy.archive,
 icon: props.session.isArchived ? ArchiveRestore : Archive,
 onClick: () =>
 runRowAction('archive', () =>
 props.session.isArchived
 ? actions.onUnarchive(props.session.id)
 : actions.onArchive(props.session.id),
 ),
 },
 { type: 'divider' },
 {
 label: copy.delete,
 icon: Trash2,
 onClick: () => {
 pendingMenuIntentRef.current = () =>
 runRowAction('delete', () => actions.onDelete(props.session.id));
 },
 },
 ]}
 />
 </span>
 );
}

function resolveSessionStatusDot(
 session: SessionSummary,
 streaming: boolean,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix(ui): separate session row actions from navigation by me2seeks · Pull Request #2566 · apache/maka · GitHub
Skip to content
fix(ui): separate session row actions from navigation#2566

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

Astro-Han
merged 3 commits into

from

Aug 12, 2026
 Merged


fix(ui): separate session row actions from navigation
#2566
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f093555

fix(ui): separate session row actions from navigation


me2seeks Aug 9, 2026
f705d50

test(ui): cover session row sibling controls


me2seeks Aug 9, 2026
13571c6

test(ui): use the session type entry point


me2seeks Aug 12, 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


17 changes: 17 additions & 0 deletions
apps/desktop/src/renderer/styles/sidebar.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,6 +190,7 @@
}

.maka-session-row {
 position: relative;
 min-width: 0;
 -webkit-app-region: no-drag;
}
Expand DownExpand Up@@ -267,6 +268,22 @@
 min-height: var(--h-control-sm, 24px);
}

/* SideNavItem owns the row button and only supports non-interactive
 * endContent. The action menu occupies the reserved trailing slot visually,
 * but remains its sibling in the DOM so neither control contains the other. */
.maka-session-row-action {
 position: absolute;
 inset-block-start: calc(
 (var(--size-element-md) - var(--size-element-sm)) / 2
 );
 inset-inline-end: var(--space-2);
 z-index: 1;
 display: inline-flex;
 align-items: center;
 justify-content: center;
 width: var(--h-control-sm, 24px);
}

.maka-session-row-trailing-spacer {
 display: block;
 width: 8px;
Expand Down

45 changes: 45 additions & 0 deletions
packages/ui/src/__tests__/session-history-row-actions.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { renderToStaticMarkup } from 'react-dom/server';
import type { SessionSummary } from '@maka/core/session';
import { LocaleProvider } from '../locale-context.js';
import { SessionHistoryList, type SessionRowActions } from '../session-history-list.js';

const session: SessionSummary = {
 id: 'session-1',
 name: 'Release notes',
 isFlagged: false,
 isArchived: false,
 labels: [],
 hasUnread: false,
 status: 'active',
 backend: 'ai-sdk',
 llmConnectionSlug: 'test-connection',
 connectionLocked: true,
 model: 'test-model',
 permissionMode: 'ask',
};

const rowActions: SessionRowActions = {
 onToggleFlag: () => undefined,
 onArchive: () => undefined,
 onUnarchive: () => undefined,
 onRename: () => undefined,
 onDelete: () => undefined,
};

test('renders session navigation and row actions as sibling controls', () => {
 const markup = renderToStaticMarkup(
 <LocaleProvider locale="en">
 <SessionHistoryList
 sessions={[session]}
 onSelectSession={() => undefined}
 rowActions={rowActions}
 />
 </LocaleProvider>,
 );

 assert.equal((markup.match(/<button\b/g) ?? []).length, 2);
 assert.match(markup, /class="maka-session-row-action"/);
 assert.doesNotMatch(markup, /<button\b(?:(?!<\/button>)[\s\S])*<button\b/);
});

237 changes: 129 additions & 108 deletions
packages/ui/src/session-history-list.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -440,7 +440,11 @@ const SessionNavRow = memo(function SessionNavRow(props: {
 onClick={(event) => {
 if (event.detail > 1 && props.actions) {
 props.onStartRename(
 { kind: 'session', id: props.session.id, name: props.session.name },
 {
 kind: 'session',
 id: props.session.id,
 name: props.session.name,
 },
 // The row's own button: a double-click starts the rename from
 // the row itself, not from the actions menu.
 event.currentTarget as HTMLElement,
Expand All@@ -450,17 +454,23 @@ const SessionNavRow = memo(function SessionNavRow(props: {
 props.onSelectSession(props.session.id);
 }}
 endContent={
 <SessionItemEndContent
 <SessionItemMeta
 session={props.session}
 active={props.active}
 streaming={props.streaming}
 stale={props.stale}
 worktree={props.worktree}
 actions={props.actions}
 onStartRename={props.onStartRename}
 reserveAction={props.actions !== undefined}
 />
 }
 />
 {props.actions && (
 <SessionItemActions
 session={props.session}
 actions={props.actions}
 onStartRename={props.onStartRename}
 />
 )}
 </div>
 );
});
Expand DownExpand Up@@ -578,49 +588,18 @@ function ProjectItemEndContent(props: {
 );
}

const SessionItemEndContent = memo(function SessionItemEndContent(props: {
const SessionItemMeta = memo(function SessionItemMeta(props: {
 session: SessionSummary;
 active: boolean;
 streaming: boolean;
 stale: boolean;
 worktree: boolean;
 actions?: SessionRowActions;
 onStartRename(target: SessionRenameTarget, opener: HTMLElement | null): void;
 reserveAction: boolean;
}) {
 const locale = useUiLocale();
 const trailingRef = useRef<HTMLSpanElement>(null);
 const copy = getConversationCopy(locale).sessions;
 const [menuOpen, setMenuOpen] = useState(false);
 const [pendingAction, setPendingAction] = useState<SessionRowActionId | null>(null);
 const mountedRef = useMountedRef();
 const pendingActionRef = useRef<SessionRowActionId | null>(null);
 const pendingMenuIntentRef = useRef<(() => void) | null>(null);
 const actions = props.actions;
 const statusDot = resolveSessionStatusDot(props.session, props.streaming, props.active, locale);

 useEffect(
 () => () => {
 pendingActionRef.current = null;
 },
 [],
 );

 function runRowAction(actionId: SessionRowActionId, action: () => void | Promise<void>) {
 if (pendingActionRef.current) return;
 pendingActionRef.current = actionId;
 setPendingAction(actionId);
 void (async () => {
 try {
 await action();
 } catch {
 // AppShell owns visible session-action failure feedback.
 } finally {
 pendingActionRef.current = null;
 if (mountedRef.current) setPendingAction(null);
 }
 })();
 }

 // Signal (status/unread) and action (MoreMenu) are orthogonal — same as
 // project rows (badge + menu). No hover XOR state machine.
 const signal = statusDot ? (
Expand All@@ -636,7 +615,7 @@ const SessionItemEndContent = memo(function SessionItemEndContent(props: {
 ) : null;

 return (
 <EndContentHitTarget className="maka-session-row-end">
 <span className="maka-session-row-end">
 {props.stale && (
 <Tooltip content={copy.staleTitle}>
 {/* `yellow`, not `warning`. Astryx keeps two archives: the semantic
Expand DownExpand Up@@ -666,79 +645,121 @@ const SessionItemEndContent = memo(function SessionItemEndContent(props: {
 />
 )}
 {signal}
 {actions ? (
 <span className="maka-session-row-trailing" ref={trailingRef}>
 <MoreMenu
 size="sm"
 label={copy.actionsAriaLabel}
 isDisabled={pendingAction !== null}
 isMenuOpen={menuOpen}
 onOpenChange={(open) => {
 setMenuOpen(open);
 if (open) return;
 const intent = pendingMenuIntentRef.current;
 pendingMenuIntentRef.current = null;
 if (intent) {
 window.requestAnimationFrame(() => {
 intent();
 });
 }
 }}
 items={[
 {
 label: props.session.isFlagged ? copy.unpin : copy.pin,
 icon: props.session.isFlagged ? PinOff : Pin,
 onClick: () =>
 runRowAction('flag', () =>
 actions.onToggleFlag(props.session.id, !props.session.isFlagged),
 ),
 },
 {
 label: copy.rename,
 icon: Pencil,
 onClick: () => {
 // Read now, while the trigger is still the thing the user is
 // on: by the time the intent runs the menu has closed and
 // focus is mid-handover.
 const opener = trailingRef.current?.querySelector<HTMLElement>('button') ?? null;
 pendingMenuIntentRef.current = () =>
 props.onStartRename(
 { kind: 'session', id: props.session.id, name: props.session.name },
 opener,
 );
 },
 },
 {
 label: props.session.isArchived ? copy.unarchive : copy.archive,
 icon: props.session.isArchived ? ArchiveRestore : Archive,
 onClick: () =>
 runRowAction('archive', () =>
 props.session.isArchived
 ? actions.onUnarchive(props.session.id)
 : actions.onArchive(props.session.id),
 ),
 },
 { type: 'divider' },
 {
 label: copy.delete,
 icon: Trash2,
 onClick: () => {
 pendingMenuIntentRef.current = () =>
 runRowAction('delete', () => actions.onDelete(props.session.id));
 },
 },
 ]}
 />
 </span>
 ) : (
 <span className="maka-session-row-trailing">
 {signal ? null : <span className="maka-session-row-trailing-spacer" aria-hidden="true" />}
 </span>
 )}
 </EndContentHitTarget>
 <span className="maka-session-row-trailing" aria-hidden="true">
 {!props.reserveAction && !signal && <span className="maka-session-row-trailing-spacer" />}
 </span>
 </span>
 );
});

function SessionItemActions(props: {
 session: SessionSummary;
 actions: SessionRowActions;
 onStartRename(target: SessionRenameTarget, opener: HTMLElement | null): void;
}) {
 const trailingRef = useRef<HTMLSpanElement>(null);
 const copy = getConversationCopy(useUiLocale()).sessions;
 const [menuOpen, setMenuOpen] = useState(false);
 const [pendingAction, setPendingAction] = useState<SessionRowActionId | null>(null);
 const mountedRef = useMountedRef();
 const pendingActionRef = useRef<SessionRowActionId | null>(null);
 const pendingMenuIntentRef = useRef<(() => void) | null>(null);
 const actions = props.actions;

 useEffect(
 () => () => {
 pendingActionRef.current = null;
 },
 [],
 );

 function runRowAction(actionId: SessionRowActionId, action: () => void | Promise<void>) {
 if (pendingActionRef.current) return;
 pendingActionRef.current = actionId;
 setPendingAction(actionId);
 void (async () => {
 try {
 await action();
 } catch {
 // AppShell owns visible session-action failure feedback.
 } finally {
 pendingActionRef.current = null;
 if (mountedRef.current) setPendingAction(null);
 }
 })();
 }

 return (
 <span
 className="maka-session-row-action"
 ref={trailingRef}
 onKeyDown={(event) => event.stopPropagation()}
 >
 <MoreMenu
 size="sm"
 label={copy.actionsAriaLabel}
 isDisabled={pendingAction !== null}
 isMenuOpen={menuOpen}
 onOpenChange={(open) => {
 setMenuOpen(open);
 if (open) return;
 const intent = pendingMenuIntentRef.current;
 pendingMenuIntentRef.current = null;
 if (intent) window.requestAnimationFrame(intent);
 }}
 items={[
 {
 label: props.session.isFlagged ? copy.unpin : copy.pin,
 icon: props.session.isFlagged ? PinOff : Pin,
 onClick: () =>
 runRowAction('flag', () =>
 actions.onToggleFlag(props.session.id, !props.session.isFlagged),
 ),
 },
 {
 label: copy.rename,
 icon: Pencil,
 onClick: () => {
 // Read now, while the trigger is still the thing the user is on:
 // by the time the intent runs the menu has closed and focus is
 // mid-handover.
 const opener = trailingRef.current?.querySelector<HTMLElement>('button') ?? null;
 pendingMenuIntentRef.current = () =>
 props.onStartRename(
 {
 kind: 'session',
 id: props.session.id,
 name: props.session.name,
 },
 opener,
 );
 },
 },
 {
 label: props.session.isArchived ? copy.unarchive : copy.archive,
 icon: props.session.isArchived ? ArchiveRestore : Archive,
 onClick: () =>
 runRowAction('archive', () =>
 props.session.isArchived
 ? actions.onUnarchive(props.session.id)
 : actions.onArchive(props.session.id),
 ),
 },
 { type: 'divider' },
 {
 label: copy.delete,
 icon: Trash2,
 onClick: () => {
 pendingMenuIntentRef.current = () =>
 runRowAction('delete', () => actions.onDelete(props.session.id));
 },
 },
 ]}
 />
 </span>
 );
}

function resolveSessionStatusDot(
 session: SessionSummary,
 streaming: boolean,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(ui): separate session row actions from navigation by me2seeks · Pull Request #2566 · apache/maka · GitHub
Skip to content
fix(ui): separate session row actions from navigation#2566

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

Astro-Han
merged 3 commits into

from

Aug 12, 2026
 Merged


fix(ui): separate session row actions from navigation
#2566
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f093555

fix(ui): separate session row actions from navigation


me2seeks Aug 9, 2026
f705d50

test(ui): cover session row sibling controls


me2seeks Aug 9, 2026
13571c6

test(ui): use the session type entry point


me2seeks Aug 12, 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


17 changes: 17 additions & 0 deletions
apps/desktop/src/renderer/styles/sidebar.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,6 +190,7 @@
}

.maka-session-row {
 position: relative;
 min-width: 0;
 -webkit-app-region: no-drag;
}
Expand DownExpand Up@@ -267,6 +268,22 @@
 min-height: var(--h-control-sm, 24px);
}

/* SideNavItem owns the row button and only supports non-interactive
 * endContent. The action menu occupies the reserved trailing slot visually,
 * but remains its sibling in the DOM so neither control contains the other. */
.maka-session-row-action {
 position: absolute;
 inset-block-start: calc(
 (var(--size-element-md) - var(--size-element-sm)) / 2
 );
 inset-inline-end: var(--space-2);
 z-index: 1;
 display: inline-flex;
 align-items: center;
 justify-content: center;
 width: var(--h-control-sm, 24px);
}

.maka-session-row-trailing-spacer {
 display: block;
 width: 8px;
Expand Down

45 changes: 45 additions & 0 deletions
packages/ui/src/__tests__/session-history-row-actions.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { renderToStaticMarkup } from 'react-dom/server';
import type { SessionSummary } from '@maka/core/session';
import { LocaleProvider } from '../locale-context.js';
import { SessionHistoryList, type SessionRowActions } from '../session-history-list.js';

const session: SessionSummary = {
 id: 'session-1',
 name: 'Release notes',
 isFlagged: false,
 isArchived: false,
 labels: [],
 hasUnread: false,
 status: 'active',
 backend: 'ai-sdk',
 llmConnectionSlug: 'test-connection',
 connectionLocked: true,
 model: 'test-model',
 permissionMode: 'ask',
};

const rowActions: SessionRowActions = {
 onToggleFlag: () => undefined,
 onArchive: () => undefined,
 onUnarchive: () => undefined,
 onRename: () => undefined,
 onDelete: () => undefined,
};

test('renders session navigation and row actions as sibling controls', () => {
 const markup = renderToStaticMarkup(
 <LocaleProvider locale="en">
 <SessionHistoryList
 sessions={[session]}
 onSelectSession={() => undefined}
 rowActions={rowActions}
 />
 </LocaleProvider>,
 );

 assert.equal((markup.match(/<button\b/g) ?? []).length, 2);
 assert.match(markup, /class="maka-session-row-action"/);
 assert.doesNotMatch(markup, /<button\b(?:(?!<\/button>)[\s\S])*<button\b/);
});

237 changes: 129 additions & 108 deletions
packages/ui/src/session-history-list.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -440,7 +440,11 @@ const SessionNavRow = memo(function SessionNavRow(props: {
 onClick={(event) => {
 if (event.detail > 1 && props.actions) {
 props.onStartRename(
 { kind: 'session', id: props.session.id, name: props.session.name },
 {
 kind: 'session',
 id: props.session.id,
 name: props.session.name,
 },
 // The row's own button: a double-click starts the rename from
 // the row itself, not from the actions menu.
 event.currentTarget as HTMLElement,
Expand All@@ -450,17 +454,23 @@ const SessionNavRow = memo(function SessionNavRow(props: {
 props.onSelectSession(props.session.id);
 }}
 endContent={
 <SessionItemEndContent
 <SessionItemMeta
 session={props.session}
 active={props.active}
 streaming={props.streaming}
 stale={props.stale}
 worktree={props.worktree}
 actions={props.actions}
 onStartRename={props.onStartRename}
 reserveAction={props.actions !== undefined}
 />
 }
 />
 {props.actions && (
 <SessionItemActions
 session={props.session}
 actions={props.actions}
 onStartRename={props.onStartRename}
 />
 )}
 </div>
 );
});
Expand DownExpand Up@@ -578,49 +588,18 @@ function ProjectItemEndContent(props: {
 );
}

const SessionItemEndContent = memo(function SessionItemEndContent(props: {
const SessionItemMeta = memo(function SessionItemMeta(props: {
 session: SessionSummary;
 active: boolean;
 streaming: boolean;
 stale: boolean;
 worktree: boolean;
 actions?: SessionRowActions;
 onStartRename(target: SessionRenameTarget, opener: HTMLElement | null): void;
 reserveAction: boolean;
}) {
 const locale = useUiLocale();
 const trailingRef = useRef<HTMLSpanElement>(null);
 const copy = getConversationCopy(locale).sessions;
 const [menuOpen, setMenuOpen] = useState(false);
 const [pendingAction, setPendingAction] = useState<SessionRowActionId | null>(null);
 const mountedRef = useMountedRef();
 const pendingActionRef = useRef<SessionRowActionId | null>(null);
 const pendingMenuIntentRef = useRef<(() => void) | null>(null);
 const actions = props.actions;
 const statusDot = resolveSessionStatusDot(props.session, props.streaming, props.active, locale);

 useEffect(
 () => () => {
 pendingActionRef.current = null;
 },
 [],
 );

 function runRowAction(actionId: SessionRowActionId, action: () => void | Promise<void>) {
 if (pendingActionRef.current) return;
 pendingActionRef.current = actionId;
 setPendingAction(actionId);
 void (async () => {
 try {
 await action();
 } catch {
 // AppShell owns visible session-action failure feedback.
 } finally {
 pendingActionRef.current = null;
 if (mountedRef.current) setPendingAction(null);
 }
 })();
 }

 // Signal (status/unread) and action (MoreMenu) are orthogonal — same as
 // project rows (badge + menu). No hover XOR state machine.
 const signal = statusDot ? (
Expand All@@ -636,7 +615,7 @@ const SessionItemEndContent = memo(function SessionItemEndContent(props: {
 ) : null;

 return (
 <EndContentHitTarget className="maka-session-row-end">
 <span className="maka-session-row-end">
 {props.stale && (
 <Tooltip content={copy.staleTitle}>
 {/* `yellow`, not `warning`. Astryx keeps two archives: the semantic
Expand DownExpand Up@@ -666,79 +645,121 @@ const SessionItemEndContent = memo(function SessionItemEndContent(props: {
 />
 )}
 {signal}
 {actions ? (
 <span className="maka-session-row-trailing" ref={trailingRef}>
 <MoreMenu
 size="sm"
 label={copy.actionsAriaLabel}
 isDisabled={pendingAction !== null}
 isMenuOpen={menuOpen}
 onOpenChange={(open) => {
 setMenuOpen(open);
 if (open) return;
 const intent = pendingMenuIntentRef.current;
 pendingMenuIntentRef.current = null;
 if (intent) {
 window.requestAnimationFrame(() => {
 intent();
 });
 }
 }}
 items={[
 {
 label: props.session.isFlagged ? copy.unpin : copy.pin,
 icon: props.session.isFlagged ? PinOff : Pin,
 onClick: () =>
 runRowAction('flag', () =>
 actions.onToggleFlag(props.session.id, !props.session.isFlagged),
 ),
 },
 {
 label: copy.rename,
 icon: Pencil,
 onClick: () => {
 // Read now, while the trigger is still the thing the user is
 // on: by the time the intent runs the menu has closed and
 // focus is mid-handover.
 const opener = trailingRef.current?.querySelector<HTMLElement>('button') ?? null;
 pendingMenuIntentRef.current = () =>
 props.onStartRename(
 { kind: 'session', id: props.session.id, name: props.session.name },
 opener,
 );
 },
 },
 {
 label: props.session.isArchived ? copy.unarchive : copy.archive,
 icon: props.session.isArchived ? ArchiveRestore : Archive,
 onClick: () =>
 runRowAction('archive', () =>
 props.session.isArchived
 ? actions.onUnarchive(props.session.id)
 : actions.onArchive(props.session.id),
 ),
 },
 { type: 'divider' },
 {
 label: copy.delete,
 icon: Trash2,
 onClick: () => {
 pendingMenuIntentRef.current = () =>
 runRowAction('delete', () => actions.onDelete(props.session.id));
 },
 },
 ]}
 />
 </span>
 ) : (
 <span className="maka-session-row-trailing">
 {signal ? null : <span className="maka-session-row-trailing-spacer" aria-hidden="true" />}
 </span>
 )}
 </EndContentHitTarget>
 <span className="maka-session-row-trailing" aria-hidden="true">
 {!props.reserveAction && !signal && <span className="maka-session-row-trailing-spacer" />}
 </span>
 </span>
 );
});

function SessionItemActions(props: {
 session: SessionSummary;
 actions: SessionRowActions;
 onStartRename(target: SessionRenameTarget, opener: HTMLElement | null): void;
}) {
 const trailingRef = useRef<HTMLSpanElement>(null);
 const copy = getConversationCopy(useUiLocale()).sessions;
 const [menuOpen, setMenuOpen] = useState(false);
 const [pendingAction, setPendingAction] = useState<SessionRowActionId | null>(null);
 const mountedRef = useMountedRef();
 const pendingActionRef = useRef<SessionRowActionId | null>(null);
 const pendingMenuIntentRef = useRef<(() => void) | null>(null);
 const actions = props.actions;

 useEffect(
 () => () => {
 pendingActionRef.current = null;
 },
 [],
 );

 function runRowAction(actionId: SessionRowActionId, action: () => void | Promise<void>) {
 if (pendingActionRef.current) return;
 pendingActionRef.current = actionId;
 setPendingAction(actionId);
 void (async () => {
 try {
 await action();
 } catch {
 // AppShell owns visible session-action failure feedback.
 } finally {
 pendingActionRef.current = null;
 if (mountedRef.current) setPendingAction(null);
 }
 })();
 }

 return (
 <span
 className="maka-session-row-action"
 ref={trailingRef}
 onKeyDown={(event) => event.stopPropagation()}
 >
 <MoreMenu
 size="sm"
 label={copy.actionsAriaLabel}
 isDisabled={pendingAction !== null}
 isMenuOpen={menuOpen}
 onOpenChange={(open) => {
 setMenuOpen(open);
 if (open) return;
 const intent = pendingMenuIntentRef.current;
 pendingMenuIntentRef.current = null;
 if (intent) window.requestAnimationFrame(intent);
 }}
 items={[
 {
 label: props.session.isFlagged ? copy.unpin : copy.pin,
 icon: props.session.isFlagged ? PinOff : Pin,
 onClick: () =>
 runRowAction('flag', () =>
 actions.onToggleFlag(props.session.id, !props.session.isFlagged),
 ),
 },
 {
 label: copy.rename,
 icon: Pencil,
 onClick: () => {
 // Read now, while the trigger is still the thing the user is on:
 // by the time the intent runs the menu has closed and focus is
 // mid-handover.
 const opener = trailingRef.current?.querySelector<HTMLElement>('button') ?? null;
 pendingMenuIntentRef.current = () =>
 props.onStartRename(
 {
 kind: 'session',
 id: props.session.id,
 name: props.session.name,
 },
 opener,
 );
 },
 },
 {
 label: props.session.isArchived ? copy.unarchive : copy.archive,
 icon: props.session.isArchived ? ArchiveRestore : Archive,
 onClick: () =>
 runRowAction('archive', () =>
 props.session.isArchived
 ? actions.onUnarchive(props.session.id)
 : actions.onArchive(props.session.id),
 ),
 },
 { type: 'divider' },
 {
 label: copy.delete,
 icon: Trash2,
 onClick: () => {
 pendingMenuIntentRef.current = () =>
 runRowAction('delete', () => actions.onDelete(props.session.id));
 },
 },
 ]}
 />
 </span>
 );
}

function resolveSessionStatusDot(
 session: SessionSummary,
 streaming: boolean,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(ui): separate session row actions from navigation by me2seeks · Pull Request #2566 · apache/maka · GitHub
Skip to content
fix(ui): separate session row actions from navigation#2566

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

Astro-Han
merged 3 commits into

from

Aug 12, 2026
 Merged


fix(ui): separate session row actions from navigation
#2566
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f093555

fix(ui): separate session row actions from navigation


me2seeks Aug 9, 2026
f705d50

test(ui): cover session row sibling controls


me2seeks Aug 9, 2026
13571c6

test(ui): use the session type entry point


me2seeks Aug 12, 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


17 changes: 17 additions & 0 deletions
apps/desktop/src/renderer/styles/sidebar.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,6 +190,7 @@
}

.maka-session-row {
 position: relative;
 min-width: 0;
 -webkit-app-region: no-drag;
}
Expand DownExpand Up@@ -267,6 +268,22 @@
 min-height: var(--h-control-sm, 24px);
}

/* SideNavItem owns the row button and only supports non-interactive
 * endContent. The action menu occupies the reserved trailing slot visually,
 * but remains its sibling in the DOM so neither control contains the other. */
.maka-session-row-action {
 position: absolute;
 inset-block-start: calc(
 (var(--size-element-md) - var(--size-element-sm)) / 2
 );
 inset-inline-end: var(--space-2);
 z-index: 1;
 display: inline-flex;
 align-items: center;
 justify-content: center;
 width: var(--h-control-sm, 24px);
}

.maka-session-row-trailing-spacer {
 display: block;
 width: 8px;
Expand Down

45 changes: 45 additions & 0 deletions
packages/ui/src/__tests__/session-history-row-actions.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { renderToStaticMarkup } from 'react-dom/server';
import type { SessionSummary } from '@maka/core/session';
import { LocaleProvider } from '../locale-context.js';
import { SessionHistoryList, type SessionRowActions } from '../session-history-list.js';

const session: SessionSummary = {
 id: 'session-1',
 name: 'Release notes',
 isFlagged: false,
 isArchived: false,
 labels: [],
 hasUnread: false,
 status: 'active',
 backend: 'ai-sdk',
 llmConnectionSlug: 'test-connection',
 connectionLocked: true,
 model: 'test-model',
 permissionMode: 'ask',
};

const rowActions: SessionRowActions = {
 onToggleFlag: () => undefined,
 onArchive: () => undefined,
 onUnarchive: () => undefined,
 onRename: () => undefined,
 onDelete: () => undefined,
};

test('renders session navigation and row actions as sibling controls', () => {
 const markup = renderToStaticMarkup(
 <LocaleProvider locale="en">
 <SessionHistoryList
 sessions={[session]}
 onSelectSession={() => undefined}
 rowActions={rowActions}
 />
 </LocaleProvider>,
 );

 assert.equal((markup.match(/<button\b/g) ?? []).length, 2);
 assert.match(markup, /class="maka-session-row-action"/);
 assert.doesNotMatch(markup, /<button\b(?:(?!<\/button>)[\s\S])*<button\b/);
});

237 changes: 129 additions & 108 deletions
packages/ui/src/session-history-list.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -440,7 +440,11 @@ const SessionNavRow = memo(function SessionNavRow(props: {
 onClick={(event) => {
 if (event.detail > 1 && props.actions) {
 props.onStartRename(
 { kind: 'session', id: props.session.id, name: props.session.name },
 {
 kind: 'session',
 id: props.session.id,
 name: props.session.name,
 },
 // The row's own button: a double-click starts the rename from
 // the row itself, not from the actions menu.
 event.currentTarget as HTMLElement,
Expand All@@ -450,17 +454,23 @@ const SessionNavRow = memo(function SessionNavRow(props: {
 props.onSelectSession(props.session.id);
 }}
 endContent={
 <SessionItemEndContent
 <SessionItemMeta
 session={props.session}
 active={props.active}
 streaming={props.streaming}
 stale={props.stale}
 worktree={props.worktree}
 actions={props.actions}
 onStartRename={props.onStartRename}
 reserveAction={props.actions !== undefined}
 />
 }
 />
 {props.actions && (
 <SessionItemActions
 session={props.session}
 actions={props.actions}
 onStartRename={props.onStartRename}
 />
 )}
 </div>
 );
});
Expand DownExpand Up@@ -578,49 +588,18 @@ function ProjectItemEndContent(props: {
 );
}

const SessionItemEndContent = memo(function SessionItemEndContent(props: {
const SessionItemMeta = memo(function SessionItemMeta(props: {
 session: SessionSummary;
 active: boolean;
 streaming: boolean;
 stale: boolean;
 worktree: boolean;
 actions?: SessionRowActions;
 onStartRename(target: SessionRenameTarget, opener: HTMLElement | null): void;
 reserveAction: boolean;
}) {
 const locale = useUiLocale();
 const trailingRef = useRef<HTMLSpanElement>(null);
 const copy = getConversationCopy(locale).sessions;
 const [menuOpen, setMenuOpen] = useState(false);
 const [pendingAction, setPendingAction] = useState<SessionRowActionId | null>(null);
 const mountedRef = useMountedRef();
 const pendingActionRef = useRef<SessionRowActionId | null>(null);
 const pendingMenuIntentRef = useRef<(() => void) | null>(null);
 const actions = props.actions;
 const statusDot = resolveSessionStatusDot(props.session, props.streaming, props.active, locale);

 useEffect(
 () => () => {
 pendingActionRef.current = null;
 },
 [],
 );

 function runRowAction(actionId: SessionRowActionId, action: () => void | Promise<void>) {
 if (pendingActionRef.current) return;
 pendingActionRef.current = actionId;
 setPendingAction(actionId);
 void (async () => {
 try {
 await action();
 } catch {
 // AppShell owns visible session-action failure feedback.
 } finally {
 pendingActionRef.current = null;
 if (mountedRef.current) setPendingAction(null);
 }
 })();
 }

 // Signal (status/unread) and action (MoreMenu) are orthogonal — same as
 // project rows (badge + menu). No hover XOR state machine.
 const signal = statusDot ? (
Expand All@@ -636,7 +615,7 @@ const SessionItemEndContent = memo(function SessionItemEndContent(props: {
 ) : null;

 return (
 <EndContentHitTarget className="maka-session-row-end">
 <span className="maka-session-row-end">
 {props.stale && (
 <Tooltip content={copy.staleTitle}>
 {/* `yellow`, not `warning`. Astryx keeps two archives: the semantic
Expand DownExpand Up@@ -666,79 +645,121 @@ const SessionItemEndContent = memo(function SessionItemEndContent(props: {
 />
 )}
 {signal}
 {actions ? (
 <span className="maka-session-row-trailing" ref={trailingRef}>
 <MoreMenu
 size="sm"
 label={copy.actionsAriaLabel}
 isDisabled={pendingAction !== null}
 isMenuOpen={menuOpen}
 onOpenChange={(open) => {
 setMenuOpen(open);
 if (open) return;
 const intent = pendingMenuIntentRef.current;
 pendingMenuIntentRef.current = null;
 if (intent) {
 window.requestAnimationFrame(() => {
 intent();
 });
 }
 }}
 items={[
 {
 label: props.session.isFlagged ? copy.unpin : copy.pin,
 icon: props.session.isFlagged ? PinOff : Pin,
 onClick: () =>
 runRowAction('flag', () =>
 actions.onToggleFlag(props.session.id, !props.session.isFlagged),
 ),
 },
 {
 label: copy.rename,
 icon: Pencil,
 onClick: () => {
 // Read now, while the trigger is still the thing the user is
 // on: by the time the intent runs the menu has closed and
 // focus is mid-handover.
 const opener = trailingRef.current?.querySelector<HTMLElement>('button') ?? null;
 pendingMenuIntentRef.current = () =>
 props.onStartRename(
 { kind: 'session', id: props.session.id, name: props.session.name },
 opener,
 );
 },
 },
 {
 label: props.session.isArchived ? copy.unarchive : copy.archive,
 icon: props.session.isArchived ? ArchiveRestore : Archive,
 onClick: () =>
 runRowAction('archive', () =>
 props.session.isArchived
 ? actions.onUnarchive(props.session.id)
 : actions.onArchive(props.session.id),
 ),
 },
 { type: 'divider' },
 {
 label: copy.delete,
 icon: Trash2,
 onClick: () => {
 pendingMenuIntentRef.current = () =>
 runRowAction('delete', () => actions.onDelete(props.session.id));
 },
 },
 ]}
 />
 </span>
 ) : (
 <span className="maka-session-row-trailing">
 {signal ? null : <span className="maka-session-row-trailing-spacer" aria-hidden="true" />}
 </span>
 )}
 </EndContentHitTarget>
 <span className="maka-session-row-trailing" aria-hidden="true">
 {!props.reserveAction && !signal && <span className="maka-session-row-trailing-spacer" />}
 </span>
 </span>
 );
});

function SessionItemActions(props: {
 session: SessionSummary;
 actions: SessionRowActions;
 onStartRename(target: SessionRenameTarget, opener: HTMLElement | null): void;
}) {
 const trailingRef = useRef<HTMLSpanElement>(null);
 const copy = getConversationCopy(useUiLocale()).sessions;
 const [menuOpen, setMenuOpen] = useState(false);
 const [pendingAction, setPendingAction] = useState<SessionRowActionId | null>(null);
 const mountedRef = useMountedRef();
 const pendingActionRef = useRef<SessionRowActionId | null>(null);
 const pendingMenuIntentRef = useRef<(() => void) | null>(null);
 const actions = props.actions;

 useEffect(
 () => () => {
 pendingActionRef.current = null;
 },
 [],
 );

 function runRowAction(actionId: SessionRowActionId, action: () => void | Promise<void>) {
 if (pendingActionRef.current) return;
 pendingActionRef.current = actionId;
 setPendingAction(actionId);
 void (async () => {
 try {
 await action();
 } catch {
 // AppShell owns visible session-action failure feedback.
 } finally {
 pendingActionRef.current = null;
 if (mountedRef.current) setPendingAction(null);
 }
 })();
 }

 return (
 <span
 className="maka-session-row-action"
 ref={trailingRef}
 onKeyDown={(event) => event.stopPropagation()}
 >
 <MoreMenu
 size="sm"
 label={copy.actionsAriaLabel}
 isDisabled={pendingAction !== null}
 isMenuOpen={menuOpen}
 onOpenChange={(open) => {
 setMenuOpen(open);
 if (open) return;
 const intent = pendingMenuIntentRef.current;
 pendingMenuIntentRef.current = null;
 if (intent) window.requestAnimationFrame(intent);
 }}
 items={[
 {
 label: props.session.isFlagged ? copy.unpin : copy.pin,
 icon: props.session.isFlagged ? PinOff : Pin,
 onClick: () =>
 runRowAction('flag', () =>
 actions.onToggleFlag(props.session.id, !props.session.isFlagged),
 ),
 },
 {
 label: copy.rename,
 icon: Pencil,
 onClick: () => {
 // Read now, while the trigger is still the thing the user is on:
 // by the time the intent runs the menu has closed and focus is
 // mid-handover.
 const opener = trailingRef.current?.querySelector<HTMLElement>('button') ?? null;
 pendingMenuIntentRef.current = () =>
 props.onStartRename(
 {
 kind: 'session',
 id: props.session.id,
 name: props.session.name,
 },
 opener,
 );
 },
 },
 {
 label: props.session.isArchived ? copy.unarchive : copy.archive,
 icon: props.session.isArchived ? ArchiveRestore : Archive,
 onClick: () =>
 runRowAction('archive', () =>
 props.session.isArchived
 ? actions.onUnarchive(props.session.id)
 : actions.onArchive(props.session.id),
 ),
 },
 { type: 'divider' },
 {
 label: copy.delete,
 icon: Trash2,
 onClick: () => {
 pendingMenuIntentRef.current = () =>
 runRowAction('delete', () => actions.onDelete(props.session.id));
 },
 },
 ]}
 />
 </span>
 );
}

function resolveSessionStatusDot(
 session: SessionSummary,
 streaming: boolean,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix(ui): separate session row actions from navigation by me2seeks · Pull Request #2566 · apache/maka · GitHub
Skip to content
fix(ui): separate session row actions from navigation#2566

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

Astro-Han
merged 3 commits into

from

Aug 12, 2026
 Merged


fix(ui): separate session row actions from navigation
#2566
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f093555

fix(ui): separate session row actions from navigation


me2seeks Aug 9, 2026
f705d50

test(ui): cover session row sibling controls


me2seeks Aug 9, 2026
13571c6

test(ui): use the session type entry point


me2seeks Aug 12, 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


17 changes: 17 additions & 0 deletions
apps/desktop/src/renderer/styles/sidebar.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,6 +190,7 @@
}

.maka-session-row {
 position: relative;
 min-width: 0;
 -webkit-app-region: no-drag;
}
Expand DownExpand Up@@ -267,6 +268,22 @@
 min-height: var(--h-control-sm, 24px);
}

/* SideNavItem owns the row button and only supports non-interactive
 * endContent. The action menu occupies the reserved trailing slot visually,
 * but remains its sibling in the DOM so neither control contains the other. */
.maka-session-row-action {
 position: absolute;
 inset-block-start: calc(
 (var(--size-element-md) - var(--size-element-sm)) / 2
 );
 inset-inline-end: var(--space-2);
 z-index: 1;
 display: inline-flex;
 align-items: center;
 justify-content: center;
 width: var(--h-control-sm, 24px);
}

.maka-session-row-trailing-spacer {
 display: block;
 width: 8px;
Expand Down

45 changes: 45 additions & 0 deletions
packages/ui/src/__tests__/session-history-row-actions.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { renderToStaticMarkup } from 'react-dom/server';
import type { SessionSummary } from '@maka/core/session';
import { LocaleProvider } from '../locale-context.js';
import { SessionHistoryList, type SessionRowActions } from '../session-history-list.js';

const session: SessionSummary = {
 id: 'session-1',
 name: 'Release notes',
 isFlagged: false,
 isArchived: false,
 labels: [],
 hasUnread: false,
 status: 'active',
 backend: 'ai-sdk',
 llmConnectionSlug: 'test-connection',
 connectionLocked: true,
 model: 'test-model',
 permissionMode: 'ask',
};

const rowActions: SessionRowActions = {
 onToggleFlag: () => undefined,
 onArchive: () => undefined,
 onUnarchive: () => undefined,
 onRename: () => undefined,
 onDelete: () => undefined,
};

test('renders session navigation and row actions as sibling controls', () => {
 const markup = renderToStaticMarkup(
 <LocaleProvider locale="en">
 <SessionHistoryList
 sessions={[session]}
 onSelectSession={() => undefined}
 rowActions={rowActions}
 />
 </LocaleProvider>,
 );

 assert.equal((markup.match(/<button\b/g) ?? []).length, 2);
 assert.match(markup, /class="maka-session-row-action"/);
 assert.doesNotMatch(markup, /<button\b(?:(?!<\/button>)[\s\S])*<button\b/);
});

237 changes: 129 additions & 108 deletions
packages/ui/src/session-history-list.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -440,7 +440,11 @@ const SessionNavRow = memo(function SessionNavRow(props: {
 onClick={(event) => {
 if (event.detail > 1 && props.actions) {
 props.onStartRename(
 { kind: 'session', id: props.session.id, name: props.session.name },
 {
 kind: 'session',
 id: props.session.id,
 name: props.session.name,
 },
 // The row's own button: a double-click starts the rename from
 // the row itself, not from the actions menu.
 event.currentTarget as HTMLElement,
Expand All@@ -450,17 +454,23 @@ const SessionNavRow = memo(function SessionNavRow(props: {
 props.onSelectSession(props.session.id);
 }}
 endContent={
 <SessionItemEndContent
 <SessionItemMeta
 session={props.session}
 active={props.active}
 streaming={props.streaming}
 stale={props.stale}
 worktree={props.worktree}
 actions={props.actions}
 onStartRename={props.onStartRename}
 reserveAction={props.actions !== undefined}
 />
 }
 />
 {props.actions && (
 <SessionItemActions
 session={props.session}
 actions={props.actions}
 onStartRename={props.onStartRename}
 />
 )}
 </div>
 );
});
Expand DownExpand Up@@ -578,49 +588,18 @@ function ProjectItemEndContent(props: {
 );
}

const SessionItemEndContent = memo(function SessionItemEndContent(props: {
const SessionItemMeta = memo(function SessionItemMeta(props: {
 session: SessionSummary;
 active: boolean;
 streaming: boolean;
 stale: boolean;
 worktree: boolean;
 actions?: SessionRowActions;
 onStartRename(target: SessionRenameTarget, opener: HTMLElement | null): void;
 reserveAction: boolean;
}) {
 const locale = useUiLocale();
 const trailingRef = useRef<HTMLSpanElement>(null);
 const copy = getConversationCopy(locale).sessions;
 const [menuOpen, setMenuOpen] = useState(false);
 const [pendingAction, setPendingAction] = useState<SessionRowActionId | null>(null);
 const mountedRef = useMountedRef();
 const pendingActionRef = useRef<SessionRowActionId | null>(null);
 const pendingMenuIntentRef = useRef<(() => void) | null>(null);
 const actions = props.actions;
 const statusDot = resolveSessionStatusDot(props.session, props.streaming, props.active, locale);

 useEffect(
 () => () => {
 pendingActionRef.current = null;
 },
 [],
 );

 function runRowAction(actionId: SessionRowActionId, action: () => void | Promise<void>) {
 if (pendingActionRef.current) return;
 pendingActionRef.current = actionId;
 setPendingAction(actionId);
 void (async () => {
 try {
 await action();
 } catch {
 // AppShell owns visible session-action failure feedback.
 } finally {
 pendingActionRef.current = null;
 if (mountedRef.current) setPendingAction(null);
 }
 })();
 }

 // Signal (status/unread) and action (MoreMenu) are orthogonal — same as
 // project rows (badge + menu). No hover XOR state machine.
 const signal = statusDot ? (
Expand All@@ -636,7 +615,7 @@ const SessionItemEndContent = memo(function SessionItemEndContent(props: {
 ) : null;

 return (
 <EndContentHitTarget className="maka-session-row-end">
 <span className="maka-session-row-end">
 {props.stale && (
 <Tooltip content={copy.staleTitle}>
 {/* `yellow`, not `warning`. Astryx keeps two archives: the semantic
Expand DownExpand Up@@ -666,79 +645,121 @@ const SessionItemEndContent = memo(function SessionItemEndContent(props: {
 />
 )}
 {signal}
 {actions ? (
 <span className="maka-session-row-trailing" ref={trailingRef}>
 <MoreMenu
 size="sm"
 label={copy.actionsAriaLabel}
 isDisabled={pendingAction !== null}
 isMenuOpen={menuOpen}
 onOpenChange={(open) => {
 setMenuOpen(open);
 if (open) return;
 const intent = pendingMenuIntentRef.current;
 pendingMenuIntentRef.current = null;
 if (intent) {
 window.requestAnimationFrame(() => {
 intent();
 });
 }
 }}
 items={[
 {
 label: props.session.isFlagged ? copy.unpin : copy.pin,
 icon: props.session.isFlagged ? PinOff : Pin,
 onClick: () =>
 runRowAction('flag', () =>
 actions.onToggleFlag(props.session.id, !props.session.isFlagged),
 ),
 },
 {
 label: copy.rename,
 icon: Pencil,
 onClick: () => {
 // Read now, while the trigger is still the thing the user is
 // on: by the time the intent runs the menu has closed and
 // focus is mid-handover.
 const opener = trailingRef.current?.querySelector<HTMLElement>('button') ?? null;
 pendingMenuIntentRef.current = () =>
 props.onStartRename(
 { kind: 'session', id: props.session.id, name: props.session.name },
 opener,
 );
 },
 },
 {
 label: props.session.isArchived ? copy.unarchive : copy.archive,
 icon: props.session.isArchived ? ArchiveRestore : Archive,
 onClick: () =>
 runRowAction('archive', () =>
 props.session.isArchived
 ? actions.onUnarchive(props.session.id)
 : actions.onArchive(props.session.id),
 ),
 },
 { type: 'divider' },
 {
 label: copy.delete,
 icon: Trash2,
 onClick: () => {
 pendingMenuIntentRef.current = () =>
 runRowAction('delete', () => actions.onDelete(props.session.id));
 },
 },
 ]}
 />
 </span>
 ) : (
 <span className="maka-session-row-trailing">
 {signal ? null : <span className="maka-session-row-trailing-spacer" aria-hidden="true" />}
 </span>
 )}
 </EndContentHitTarget>
 <span className="maka-session-row-trailing" aria-hidden="true">
 {!props.reserveAction && !signal && <span className="maka-session-row-trailing-spacer" />}
 </span>
 </span>
 );
});

function SessionItemActions(props: {
 session: SessionSummary;
 actions: SessionRowActions;
 onStartRename(target: SessionRenameTarget, opener: HTMLElement | null): void;
}) {
 const trailingRef = useRef<HTMLSpanElement>(null);
 const copy = getConversationCopy(useUiLocale()).sessions;
 const [menuOpen, setMenuOpen] = useState(false);
 const [pendingAction, setPendingAction] = useState<SessionRowActionId | null>(null);
 const mountedRef = useMountedRef();
 const pendingActionRef = useRef<SessionRowActionId | null>(null);
 const pendingMenuIntentRef = useRef<(() => void) | null>(null);
 const actions = props.actions;

 useEffect(
 () => () => {
 pendingActionRef.current = null;
 },
 [],
 );

 function runRowAction(actionId: SessionRowActionId, action: () => void | Promise<void>) {
 if (pendingActionRef.current) return;
 pendingActionRef.current = actionId;
 setPendingAction(actionId);
 void (async () => {
 try {
 await action();
 } catch {
 // AppShell owns visible session-action failure feedback.
 } finally {
 pendingActionRef.current = null;
 if (mountedRef.current) setPendingAction(null);
 }
 })();
 }

 return (
 <span
 className="maka-session-row-action"
 ref={trailingRef}
 onKeyDown={(event) => event.stopPropagation()}
 >
 <MoreMenu
 size="sm"
 label={copy.actionsAriaLabel}
 isDisabled={pendingAction !== null}
 isMenuOpen={menuOpen}
 onOpenChange={(open) => {
 setMenuOpen(open);
 if (open) return;
 const intent = pendingMenuIntentRef.current;
 pendingMenuIntentRef.current = null;
 if (intent) window.requestAnimationFrame(intent);
 }}
 items={[
 {
 label: props.session.isFlagged ? copy.unpin : copy.pin,
 icon: props.session.isFlagged ? PinOff : Pin,
 onClick: () =>
 runRowAction('flag', () =>
 actions.onToggleFlag(props.session.id, !props.session.isFlagged),
 ),
 },
 {
 label: copy.rename,
 icon: Pencil,
 onClick: () => {
 // Read now, while the trigger is still the thing the user is on:
 // by the time the intent runs the menu has closed and focus is
 // mid-handover.
 const opener = trailingRef.current?.querySelector<HTMLElement>('button') ?? null;
 pendingMenuIntentRef.current = () =>
 props.onStartRename(
 {
 kind: 'session',
 id: props.session.id,
 name: props.session.name,
 },
 opener,
 );
 },
 },
 {
 label: props.session.isArchived ? copy.unarchive : copy.archive,
 icon: props.session.isArchived ? ArchiveRestore : Archive,
 onClick: () =>
 runRowAction('archive', () =>
 props.session.isArchived
 ? actions.onUnarchive(props.session.id)
 : actions.onArchive(props.session.id),
 ),
 },
 { type: 'divider' },
 {
 label: copy.delete,
 icon: Trash2,
 onClick: () => {
 pendingMenuIntentRef.current = () =>
 runRowAction('delete', () => actions.onDelete(props.session.id));
 },
 },
 ]}
 />
 </span>
 );
}

function resolveSessionStatusDot(
 session: SessionSummary,
 streaming: boolean,
Expand Down
Loading