Merge pull request #365 from RunMaestro/0.15.0-polish

pedramamini · web-flow · commit b03bbe8b2c20 · 2026-02-14T16:44:33.000-06:00
fix: 0.15.0 polish — ToC, worktree dupes, Auto Run targeting
diff --git a/src/__tests__/renderer/components/MainPanel.test.tsx b/src/__tests__/renderer/components/MainPanel.test.tsx
@@ -1088,8 +1088,9 @@ describe('MainPanel', () => {
 			expect(screen.getByText('Stopping')).toBeInTheDocument();
 		});
 
-		it('should call onStopBatchRun directly when Auto button is clicked', () => {
+		it('should call onStopBatchRun with active session ID when Auto button is clicked', () => {
 			const onStopBatchRun = vi.fn();
+			const session = createSession({ id: 'session-abc', name: 'My Agent' });
 			const currentSessionBatchState: BatchRunState = {
 				isRunning: true,
 				isStopping: false,
@@ -1113,15 +1114,16 @@ describe('MainPanel', () => {
 			render(
 				<MainPanel
 					{...defaultProps}
+					activeSession={session}
 					currentSessionBatchState={currentSessionBatchState}
 					onStopBatchRun={onStopBatchRun}
 				/>
 			);
 
 			fireEvent.click(screen.getByText('Auto'));
 
-			// onStopBatchRun handles its own confirmation modal, so it should be called directly
-			expect(onStopBatchRun).toHaveBeenCalled();
+			// onStopBatchRun should be called with the active session's ID
+			expect(onStopBatchRun).toHaveBeenCalledWith('session-abc');
 		});
 
 		it('should not call onStopBatchRun when Auto button is clicked while stopping', () => {
diff --git a/src/__tests__/renderer/utils/contextUsage.test.ts b/src/__tests__/renderer/utils/contextUsage.test.ts
@@ -6,6 +6,7 @@ import { describe, it, expect } from 'vitest';
 import {
 	estimateContextUsage,
 	calculateContextTokens,
+	calculateContextDisplay,
 	estimateAccumulatedGrowth,
 	DEFAULT_CONTEXT_WINDOWS,
 } from '../../../renderer/utils/contextUsage';
@@ -348,6 +349,104 @@ describe('estimateAccumulatedGrowth', () => {
 	});
 });
 
+describe('calculateContextDisplay', () => {
+	it('should calculate tokens and percentage for normal usage', () => {
+		const result = calculateContextDisplay(
+			{ inputTokens: 50000, cacheReadInputTokens: 30000, cacheCreationInputTokens: 20000 },
+			200000,
+			'claude-code'
+		);
+		// (50000 + 30000 + 20000) / 200000 = 50%
+		expect(result.tokens).toBe(100000);
+		expect(result.percentage).toBe(50);
+		expect(result.contextWindow).toBe(200000);
+	});
+
+	it('should fall back to fallbackPercentage when tokens exceed context window', () => {
+		const result = calculateContextDisplay(
+			{
+				inputTokens: 50000,
+				cacheReadInputTokens: 758000,
+				cacheCreationInputTokens: 200000,
+			},
+			200000,
+			'claude-code',
+			75 // preserved contextUsage from session
+		);
+		// Raw = 1008000 > 200000, so falls back: tokens = round(75/100 * 200000) = 150000
+		expect(result.tokens).toBe(150000);
+		expect(result.percentage).toBe(75);
+	});
+
+	it('should cap percentage at 100 when tokens are close to window', () => {
+		const result = calculateContextDisplay(
+			{ inputTokens: 190000, cacheReadInputTokens: 15000, cacheCreationInputTokens: 0 },
+			200000,
+			'claude-code'
+		);
+		// (190000 + 15000) / 200000 = 102.5% -> capped at 100%
+		expect(result.percentage).toBe(100);
+	});
+
+	it('should return zeros when context window is 0', () => {
+		const result = calculateContextDisplay(
+			{ inputTokens: 50000 },
+			0,
+			'claude-code'
+		);
+		expect(result.tokens).toBe(0);
+		expect(result.percentage).toBe(0);
+		expect(result.contextWindow).toBe(0);
+	});
+
+	it('should not fall back when no fallbackPercentage is provided', () => {
+		const result = calculateContextDisplay(
+			{
+				inputTokens: 50000,
+				cacheReadInputTokens: 758000,
+				cacheCreationInputTokens: 200000,
+			},
+			200000,
+			'claude-code'
+			// no fallback
+		);
+		// Raw = 1008000 > 200000, but no fallback, so tokens stay at raw value
+		// Percentage is capped at 100%
+		expect(result.tokens).toBe(1008000);
+		expect(result.percentage).toBe(100);
+	});
+
+	it('should use Codex semantics (includes output tokens)', () => {
+		const result = calculateContextDisplay(
+			{ inputTokens: 50000, outputTokens: 30000, cacheCreationInputTokens: 20000 },
+			200000,
+			'codex'
+		);
+		// Codex: (50000 + 20000 + 30000) / 200000 = 50%
+		expect(result.tokens).toBe(100000);
+		expect(result.percentage).toBe(50);
+	});
+
+	it('should handle history entries with accumulated tokens and preserved contextUsage', () => {
+		// Simulates what HistoryDetailModal sees: accumulated stats + entry.contextUsage
+		const result = calculateContextDisplay(
+			{
+				inputTokens: 5676,
+				outputTokens: 8522,
+				cacheReadInputTokens: 1128700,
+				cacheCreationInputTokens: 0,
+			},
+			200000,
+			undefined, // history entries don't have agent type
+			100 // the screenshot showed 100% context
+		);
+		// Raw = 5676 + 1128700 + 0 = 1134376 > 200000
+		// Falls back to: round(100/100 * 200000) = 200000
+		expect(result.tokens).toBe(200000);
+		expect(result.percentage).toBe(100);
+	});
+});
+
 describe('DEFAULT_CONTEXT_WINDOWS', () => {
 	it('should have context windows defined for all ToolType agent types', () => {
 		// Only ToolType values have context windows defined
diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
@@ -1949,7 +1949,17 @@ function MaestroConsoleInner() {
 
 		const unsubModeratorUsage = window.maestro.groupChat.onModeratorUsage?.((id, usage) => {
 			if (id === activeGroupChatId) {
-				setModeratorUsage(usage);
+				// When contextUsage is -1, tokens were accumulated from multi-tool turns.
+				// Preserve previous context/token values; only update cost.
+				if (usage.contextUsage < 0) {
+					setModeratorUsage((prev) =>
+						prev
+							? { ...prev, totalCost: usage.totalCost }
+							: { contextUsage: 0, totalCost: usage.totalCost, tokenCount: 0 }
+					);
+				} else {
+					setModeratorUsage(usage);
+				}
 			}
 		});
 
@@ -2048,6 +2058,7 @@ function MaestroConsoleInner() {
 	const fileTreeContainerRef = useRef<HTMLDivElement>(null);
 	const fileTreeFilterInputRef = useRef<HTMLInputElement>(null);
 	const fileTreeKeyboardNavRef = useRef(false); // Track if selection change came from keyboard
+	const recentlyCreatedWorktreePathsRef = useRef(new Set<string>()); // Prevent duplicate UI entries from file watcher
 	const rightPanelRef = useRef<RightPanelHandle>(null);
 	const mainPanelRef = useRef<MainPanelHandle>(null);
 
@@ -6234,6 +6245,11 @@ You are taking over this conversation. Based on the context above, provide a bri
 		const cleanup = window.maestro.git.onWorktreeDiscovered(async (data) => {
 			const { sessionId, worktree } = data;
 
+			// Skip worktrees that were just manually created (prevents duplicate UI entries)
+			if (recentlyCreatedWorktreePathsRef.current.has(worktree.path)) {
+				return;
+			}
+
 			// Skip main/master/HEAD branches (already filtered by main process, but double-check)
 			if (
 				worktree.branch === 'main' ||
@@ -6669,13 +6685,14 @@ You are taking over this conversation. Based on the context above, provide a bri
 
 	// Handler to stop batch run (with confirmation)
 	// If targetSessionId is provided, stops that specific session's batch run.
-	// Otherwise, stops the first active batch run or falls back to active session.
+	// Otherwise, falls back to active session, then first active batch run.
 	const handleStopBatchRun = useCallback(
 		(targetSessionId?: string) => {
-			// Use provided targetSessionId, or fall back to first active batch, or active session
+			// Use provided targetSessionId, or fall back to active session, or first active batch
 			const sessionId =
 				targetSessionId ??
-				(activeBatchSessionIds.length > 0 ? activeBatchSessionIds[0] : activeSession?.id);
+				activeSession?.id ??
+				(activeBatchSessionIds.length > 0 ? activeBatchSessionIds[0] : undefined);
 			console.log(
 				'[App:handleStopBatchRun] targetSessionId:',
 				targetSessionId,
@@ -9918,6 +9935,10 @@ You are taking over this conversation. Based on the context above, provide a bri
 					sessionSshRemoteConfig: activeSession.sessionSshRemoteConfig,
 				};
 
+				// Mark path so the file watcher discovery handler skips it
+				recentlyCreatedWorktreePathsRef.current.add(worktreePath);
+				setTimeout(() => recentlyCreatedWorktreePathsRef.current.delete(worktreePath), 10000);
+
 				setSessions((prev) => [...prev, worktreeSession]);
 
 				// Expand parent's worktrees
@@ -10071,6 +10092,10 @@ You are taking over this conversation. Based on the context above, provide a bri
 				sessionSshRemoteConfig: createWorktreeSession.sessionSshRemoteConfig,
 			};
 
+			// Mark path so the file watcher discovery handler skips it
+			recentlyCreatedWorktreePathsRef.current.add(worktreePath);
+			setTimeout(() => recentlyCreatedWorktreePathsRef.current.delete(worktreePath), 10000);
+
 			setSessions((prev) => [...prev, worktreeSession]);
 
 			// Expand parent's worktrees
diff --git a/src/renderer/components/FilePreview.tsx b/src/renderer/components/FilePreview.tsx
@@ -11,6 +11,7 @@ import ReactMarkdown from 'react-markdown';
 import remarkGfm from 'remark-gfm';
 import rehypeRaw from 'rehype-raw';
 import rehypeSlug from 'rehype-slug';
+import GithubSlugger from 'github-slugger';
 import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
 import { vscDarkPlus } from 'react-syntax-highlighter/dist/esm/styles/prism';
 import {
@@ -308,6 +309,7 @@ const extractHeadings = (content: string): TocEntry[] => {
 	const headings: TocEntry[] = [];
 	const lines = content.split('\n');
 	let inCodeFence = false;
+	const slugger = new GithubSlugger();
 
 	for (const line of lines) {
 		// Track code fence boundaries (``` or ~~~, optionally with language specifier)
@@ -326,12 +328,8 @@ const extractHeadings = (content: string): TocEntry[] => {
 		if (match) {
 			const level = match[1].length;
 			const text = match[2].trim();
-			// Generate slug same way rehype-slug does (lowercase, replace spaces with hyphens, remove special chars)
-			const slug = text
-				.toLowerCase()
-				.replace(/[^\w\s-]/g, '')
-				.replace(/\s+/g, '-')
-				.replace(/^-+|-+$/g, '');
+			// Use github-slugger to match rehype-slug's ID generation exactly
+			const slug = slugger.slug(text);
 			headings.push({ level, text, slug });
 		}
 	}
diff --git a/src/renderer/components/HistoryDetailModal.tsx b/src/renderer/components/HistoryDetailModal.tsx
@@ -24,7 +24,7 @@ import { formatElapsedTime } from '../utils/formatters';
 import { stripAnsiCodes } from '../../shared/stringUtils';
 import { MarkdownRenderer } from './MarkdownRenderer';
 import { generateTerminalProseStyles } from '../utils/markdownConfig';
-import { calculateContextTokens } from '../utils/contextUsage';
+import { calculateContextDisplay } from '../utils/contextUsage';
 import { getContextColor } from '../utils/theme';
 
 // Double checkmark SVG component for validated entries
@@ -400,20 +400,18 @@ export function HistoryDetailModal({
 										</span>
 									</div>
 									{(() => {
-										// Context usage using agent-specific calculation
-										// Note: History entries don't store agent type, defaults to Claude behavior
-										// SYNC: Uses calculateContextTokens() from shared/contextUsage.ts
-										// See that file for the canonical formula and all locations that must stay in sync.
-										const contextTokens = calculateContextTokens({
-											inputTokens: entry.usageStats!.inputTokens,
-											outputTokens: entry.usageStats!.outputTokens,
-											cacheCreationInputTokens: entry.usageStats!.cacheCreationInputTokens ?? 0,
-											cacheReadInputTokens: entry.usageStats!.cacheReadInputTokens ?? 0,
-										});
-										const contextUsage = Math.min(
-											100,
-											Math.round((contextTokens / entry.usageStats!.contextWindow) * 100)
-										);
+										const { tokens: contextTokens, percentage: contextUsage } =
+											calculateContextDisplay(
+												{
+													inputTokens: entry.usageStats!.inputTokens,
+													outputTokens: entry.usageStats!.outputTokens,
+													cacheCreationInputTokens: entry.usageStats!.cacheCreationInputTokens ?? 0,
+													cacheReadInputTokens: entry.usageStats!.cacheReadInputTokens ?? 0,
+												},
+												entry.usageStats!.contextWindow,
+												undefined,
+												entry.contextUsage
+											);
 										return (
 											<div className="flex flex-col gap-1">
 												<div className="flex items-center gap-2">
diff --git a/src/renderer/components/MainPanel.tsx b/src/renderer/components/MainPanel.tsx
@@ -37,7 +37,7 @@ import { gitService } from '../services/git';
 import { remoteUrlToBrowserUrl } from '../../shared/gitUtils';
 import { useGitBranch, useGitDetail, useGitFileStatus } from '../contexts/GitStatusContext';
 import { formatShortcutKeys } from '../utils/shortcutFormatter';
-import { calculateContextTokens } from '../utils/contextUsage';
+import { calculateContextDisplay } from '../utils/contextUsage';
 import { useAgentCapabilities, useHoverTooltip } from '../hooks';
 import type {
 	Session,
@@ -594,47 +594,28 @@ export const MainPanel = React.memo(
 			return configured > 0 ? configured : reported;
 		}, [configuredContextWindow, activeTab?.usageStats?.contextWindow]);
 
-		// Compute context tokens using agent-specific calculation.
-		// Claude: input + cacheRead + cacheCreation (total input for the request)
-		// Codex: input + output (combined limit)
-		// When values are accumulated from multi-tool turns, total may exceed contextWindow.
-		// In that case, derive tokens from session.contextUsage (preserved last valid percentage).
-		const activeTabContextTokens = useMemo(() => {
-			if (!activeTab?.usageStats) return 0;
-			const raw = calculateContextTokens(
+		// Compute context tokens and percentage using the shared helper.
+		// Handles accumulated multi-tool turns by falling back to session.contextUsage.
+		const { tokens: activeTabContextTokens, percentage: activeTabContextUsage } = useMemo(() => {
+			if (!activeTab?.usageStats) return { tokens: 0, percentage: 0 };
+			return calculateContextDisplay(
 				{
 					inputTokens: activeTab.usageStats.inputTokens,
 					outputTokens: activeTab.usageStats.outputTokens,
 					cacheCreationInputTokens: activeTab.usageStats.cacheCreationInputTokens ?? 0,
 					cacheReadInputTokens: activeTab.usageStats.cacheReadInputTokens ?? 0,
 				},
-				activeSession?.toolType
+				activeTabContextWindow,
+				activeSession?.toolType,
+				activeSession?.contextUsage
 			);
-
-			// If raw exceeds window, values are accumulated from multi-tool turns.
-			// Fall back to deriving from the preserved contextUsage percentage.
-			const effectiveWindow = activeTabContextWindow || 200000;
-			if (raw > effectiveWindow && activeSession?.contextUsage != null) {
-				return Math.round((activeSession.contextUsage / 100) * effectiveWindow);
-			}
-
-			return raw;
 		}, [
 			activeTab?.usageStats,
 			activeSession?.toolType,
 			activeTabContextWindow,
 			activeSession?.contextUsage,
 		]);
 
-		// Compute context usage percentage from context tokens and window size.
-		// Since we already handle accumulated values in activeTabContextTokens,
-		// we just calculate the percentage directly.
-		const activeTabContextUsage = useMemo(() => {
-			if (!activeTabContextWindow || activeTabContextWindow === 0) return 0;
-			if (activeTabContextTokens === 0) return 0;
-			return Math.round((activeTabContextTokens / activeTabContextWindow) * 100);
-		}, [activeTabContextTokens, activeTabContextWindow]);
-
 		// PERF: Track panel width for responsive widget hiding with threshold-based updates
 		// Only update state when width crosses a meaningful threshold (20px) to prevent
 		// unnecessary re-renders during window resize animations
@@ -1861,7 +1842,7 @@ export const MainPanel = React.memo(
 											thinkingSessions={thinkingSessions}
 											onSessionClick={handleSessionClick}
 											autoRunState={currentSessionBatchState || undefined}
-											onStopAutoRun={onStopBatchRun}
+											onStopAutoRun={() => onStopBatchRun?.(activeSession.id)}
 											onOpenQueueBrowser={onOpenQueueBrowser}
 											tabReadOnlyMode={activeTab?.readOnlyMode ?? false}
 											onToggleTabReadOnlyMode={props.onToggleTabReadOnlyMode}
diff --git a/src/renderer/components/TabSwitcherModal.tsx b/src/renderer/components/TabSwitcherModal.tsx
diff --git a/src/renderer/utils/contextUsage.ts b/src/renderer/utils/contextUsage.ts
