t.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+ const escapedTerms = terms.map((t) => t.replace(REGEX_ESCAPE, '\\$&'));
const regex = new RegExp(`(${escapedTerms.join('|')})`, 'gi');
const parts = text.split(regex);
diff --git a/src/renderer/global.d.ts b/src/renderer/global.d.ts
index ea75b671fb..4615760030 100644
--- a/src/renderer/global.d.ts
+++ b/src/renderer/global.d.ts
@@ -453,6 +453,7 @@ interface MaestroAPI {
agentId: string;
sessionId?: string;
timestamp: number;
+ rateLimitResetAt?: number;
raw?: {
exitCode?: number;
stderr?: string;
diff --git a/src/renderer/hooks/agent/useAgentListeners.ts b/src/renderer/hooks/agent/useAgentListeners.ts
index 6f7c0a7ed3..79b61cdcbb 100644
--- a/src/renderer/hooks/agent/useAgentListeners.ts
+++ b/src/renderer/hooks/agent/useAgentListeners.ts
@@ -1142,6 +1142,7 @@ export function useAgentListeners(deps: UseAgentListenersDeps): void {
agentId: error.agentId,
sessionId: error.sessionId,
timestamp: error.timestamp,
+ rateLimitResetAt: error.rateLimitResetAt,
raw: error.raw,
parsedJson: error.parsedJson,
};
diff --git a/src/renderer/hooks/remote/useAppRemoteEventListeners.ts b/src/renderer/hooks/remote/useAppRemoteEventListeners.ts
index e32e46a1e4..4b3a994d5c 100644
--- a/src/renderer/hooks/remote/useAppRemoteEventListeners.ts
+++ b/src/renderer/hooks/remote/useAppRemoteEventListeners.ts
@@ -421,6 +421,7 @@ export function useAppRemoteEventListeners(deps: UseAppRemoteEventListenersDeps)
unifiedClosedTabHistory: [],
groupId: groupId || undefined,
autoRunFolderPath: `${cwd}/${PLAYBOOKS_DIR}`,
+ createdAt: Date.now(),
};
setSessions((prev: Session[]) => [...prev, newSession]);
diff --git a/src/renderer/hooks/remote/useLiveOverlay.ts b/src/renderer/hooks/remote/useLiveOverlay.ts
index d8d0c25c4b..800be993af 100644
--- a/src/renderer/hooks/remote/useLiveOverlay.ts
+++ b/src/renderer/hooks/remote/useLiveOverlay.ts
@@ -119,6 +119,56 @@ export function useLiveOverlay(isLiveMode: boolean): UseLiveOverlayReturn {
}
}, [isLiveMode]);
+ // Keep tunnel UI aligned with the actual cloudflared process state.
+ useEffect(() => {
+ if (!isLiveMode || (tunnelStatus !== 'starting' && tunnelStatus !== 'connected')) {
+ return;
+ }
+
+ let cancelled = false;
+ const syncStatus = async () => {
+ try {
+ const status = await window.maestro.tunnel.getStatus();
+ if (cancelled) return;
+
+ if (status.isRunning && status.url) {
+ setTunnelStatus('connected');
+ setTunnelUrl(status.url);
+ setTunnelError(null);
+ return;
+ }
+
+ if (status.error) {
+ setTunnelStatus('error');
+ setTunnelError(status.error);
+ } else {
+ setTunnelStatus('off');
+ }
+ setTunnelUrl(null);
+ setActiveUrlTab('local');
+ } catch (error) {
+ if (cancelled) return;
+ setTunnelStatus('error');
+ setTunnelError(error instanceof Error ? error.message : 'Failed to read tunnel status');
+ setTunnelUrl(null);
+ setActiveUrlTab('local');
+ }
+ };
+
+ void syncStatus();
+ const intervalId = window.setInterval(
+ () => {
+ void syncStatus();
+ },
+ tunnelStatus === 'starting' ? 500 : 2000
+ );
+
+ return () => {
+ cancelled = true;
+ window.clearInterval(intervalId);
+ };
+ }, [isLiveMode, tunnelStatus]);
+
// Handle tunnel toggle (start/stop remote access)
const handleTunnelToggle = useCallback(async () => {
if (tunnelStatus === 'connected') {
diff --git a/src/renderer/hooks/session/useSessionCrud.ts b/src/renderer/hooks/session/useSessionCrud.ts
index 718d9c5af0..d3a8674062 100644
--- a/src/renderer/hooks/session/useSessionCrud.ts
+++ b/src/renderer/hooks/session/useSessionCrud.ts
@@ -212,6 +212,7 @@ export function useSessionCrud(deps: UseSessionCrudDeps): UseSessionCrudReturn {
cwd: workingDir,
fullPath: workingDir,
projectRoot: workingDir,
+ createdAt: Date.now(),
isGitRepo,
gitBranches,
gitTags,
diff --git a/src/renderer/hooks/symphony/useSymphonyContribution.ts b/src/renderer/hooks/symphony/useSymphonyContribution.ts
index b429c46cea..48e4f5a49a 100644
--- a/src/renderer/hooks/symphony/useSymphonyContribution.ts
+++ b/src/renderer/hooks/symphony/useSymphonyContribution.ts
@@ -137,6 +137,7 @@ export function useSymphonyContribution(
cwd: data.localPath,
fullPath: data.localPath,
projectRoot: data.localPath,
+ createdAt: Date.now(),
isGitRepo,
gitBranches,
gitTags,
diff --git a/src/renderer/hooks/wizard/useWizardHandlers.ts b/src/renderer/hooks/wizard/useWizardHandlers.ts
index 1bf3df5a91..bd16661525 100644
--- a/src/renderer/hooks/wizard/useWizardHandlers.ts
+++ b/src/renderer/hooks/wizard/useWizardHandlers.ts
@@ -1147,6 +1147,7 @@ export function useWizardHandlers(deps: UseWizardHandlersDeps): UseWizardHandler
cwd: directoryPath,
fullPath: directoryPath,
projectRoot: directoryPath,
+ createdAt: Date.now(),
isGitRepo,
gitBranches,
gitTags,
diff --git a/src/renderer/stores/agentStore.ts b/src/renderer/stores/agentStore.ts
index b3a85cc1a8..56b784c52a 100644
--- a/src/renderer/stores/agentStore.ts
+++ b/src/renderer/stores/agentStore.ts
@@ -30,6 +30,7 @@ import { createTab, getActiveTab } from '../utils/tabHelpers';
import { getStdinFlags } from '../utils/spawnHelpers';
import { generateId } from '../utils/ids';
import { useSessionStore } from './sessionStore';
+import { useSettingsStore } from './settingsStore';
import { DEFAULT_IMAGE_ONLY_PROMPT } from '../hooks/input/useInputProcessing';
import { maestroSystemPrompt } from '../../prompts';
import { substituteTemplateVariables } from '../utils/templateVariables';
@@ -204,7 +205,131 @@ export const useAgentStore = create
()((set, get) => ({
},
retryAfterError: (sessionId) => {
+ const session = getSession(sessionId);
+ if (!session) return;
+
+ // 1. Find the target tab so we can grab the last user message
+ const targetTabId = session.agentErrorTabId;
+ const targetTab = targetTabId
+ ? session.aiTabs.find((tab) => tab.id === targetTabId)
+ : getActiveTab(session);
+
+ if (!targetTab) return;
+
+ // 2. Clear the error state (sets session to idle)
get().clearAgentError(sessionId);
+
+ // 3. Find the last user string in the logs
+ const logs = targetTab.logs || [];
+ const lastUserLog = [...logs].reverse().find((l) => l.source === 'user');
+
+ if (!lastUserLog) {
+ console.warn('[retryAfterError] No user message found to retry.');
+ return;
+ }
+
+ const hasImages = Array.isArray(lastUserLog.images) && lastUserLog.images.length > 0;
+ const hasText = !!lastUserLog.text?.trim();
+
+ if (!hasText && !hasImages) {
+ console.warn('[retryAfterError] Last user message is empty (no text, no images).');
+ return;
+ }
+
+ // 4. Re-construct a QueuedItem 'message' to re-dispatch.
+ // By sending it as a 'message' (even if it originally was a command),
+ // we avoid double-substituting template variables, as the text in the log
+ // is already the final rendered prompt. Also, processQueuedItem does not
+ // push duplicate logs for 'message' types.
+ const queuedItem: QueuedItem = {
+ id: generateId(),
+ timestamp: Date.now(),
+ tabId: targetTab.id,
+ type: 'message',
+ text: !hasText && hasImages ? DEFAULT_IMAGE_ONLY_PROMPT : lastUserLog.text!,
+ images: lastUserLog.images,
+ tabName:
+ targetTab.name ||
+ (targetTab.agentSessionId ? targetTab.agentSessionId.split('-')[0].toUpperCase() : 'New'),
+ readOnlyMode: targetTab.readOnlyMode,
+ };
+
+ // 5. Gather required deps (we only strictly need conductorProfile for plain messages)
+ const settings = useSettingsStore.getState();
+ const deps: ProcessQueuedItemDeps = {
+ conductorProfile: settings.conductorProfile,
+ customAICommands: settings.customAICommands,
+ speckitCommands: [],
+ openspecCommands: [],
+ bmadCommands: [],
+ };
+
+ // 6. Reset session to busy/thinking state so the UI reflects the retry
+ useSessionStore.getState().setSessions((prev) =>
+ prev.map((s) => {
+ if (s.id !== sessionId) return s;
+ const updatedAiTabs = s.aiTabs?.map((tab) =>
+ tab.id === targetTab.id
+ ? {
+ ...tab,
+ state: 'busy' as const,
+ thinkingStartTime: Date.now(),
+ }
+ : tab
+ );
+ return {
+ ...s,
+ state: 'busy' as SessionState,
+ busySource: 'ai',
+ aiTabs: updatedAiTabs,
+ };
+ })
+ );
+
+ // 7. Dispatch to agent!
+ setTimeout(() => {
+ get()
+ .processQueuedItem(sessionId, queuedItem, deps)
+ .catch((err) => {
+ console.error('[retryAfterError] Failed to retry item:', err);
+ import('../utils/sentry').then((mod) => {
+ mod.captureException(err, { extra: { operation: 'retryAfterError' } });
+ });
+
+ // Re-surface the error modal
+ import('./sessionStore').then(({ useSessionStore }) => {
+ useSessionStore.getState().setSessions((prev) =>
+ prev.map((s) => {
+ if (s.id !== sessionId) return s;
+ // Put the error back on the session and target tab
+ const updatedAiTabs = s.aiTabs?.map((tab) =>
+ tab.id === targetTab.id
+ ? {
+ ...tab,
+ state: 'idle' as const,
+ }
+ : tab
+ );
+ return {
+ ...s,
+ state: 'error' as SessionState,
+ busySource: undefined,
+ aiTabs: updatedAiTabs,
+ agentError: {
+ type: 'agent_crashed',
+ message: err instanceof Error ? err.message : String(err),
+ recoverable: true,
+ agentId: s.toolType,
+ timestamp: Date.now(),
+ },
+ agentErrorTabId: targetTab.id,
+ agentErrorPaused: true,
+ };
+ })
+ );
+ });
+ });
+ }, 0);
},
restartAgentAfterError: async (sessionId) => {
diff --git a/src/renderer/types/index.ts b/src/renderer/types/index.ts
index e983280567..d3ae4f7d09 100644
--- a/src/renderer/types/index.ts
+++ b/src/renderer/types/index.ts
@@ -533,6 +533,7 @@ export interface Session {
cwd: string;
fullPath: string;
projectRoot: string; // The initial working directory (never changes, used for Claude session storage)
+ createdAt: number; // Timestamp when the session was created
aiLogs: LogEntry[];
// DEPRECATED: Legacy shell output logs — terminal tabs use xterm.js with direct PTY streaming
shellLogs: LogEntry[];
diff --git a/src/renderer/utils/contextUsage.ts b/src/renderer/utils/contextUsage.ts
index 762aa59638..ce6a47c2b0 100644
--- a/src/renderer/utils/contextUsage.ts
+++ b/src/renderer/utils/contextUsage.ts
@@ -168,11 +168,17 @@ export function calculateContextDisplay(
let tokens = raw;
if (raw > contextWindow) {
- if (fallbackPercentage != null && fallbackPercentage >= 0) {
+ if (
+ fallbackPercentage != null &&
+ Number.isFinite(fallbackPercentage) &&
+ fallbackPercentage >= 0
+ ) {
// Accumulated multi-tool turn: derive tokens from preserved percentage
- tokens = Math.round((fallbackPercentage / 100) * contextWindow);
+ const boundedFallback = Math.min(100, fallbackPercentage);
+ tokens = Math.round((boundedFallback / 100) * contextWindow);
} else {
- // No fallback available: cap to context window
+ // We don't have a trustworthy fallback percentage yet, so clamp to the
+ // configured window instead of displaying an impossible token total.
tokens = contextWindow;
}
}
diff --git a/src/renderer/utils/tabHelpers.ts b/src/renderer/utils/tabHelpers.ts
index b2d3eeea28..4c33986360 100644
--- a/src/renderer/utils/tabHelpers.ts
+++ b/src/renderer/utils/tabHelpers.ts
@@ -1996,6 +1996,7 @@ export function createMergedSession(
cwd: projectRoot,
fullPath: projectRoot,
projectRoot, // Never changes, used for session storage
+ createdAt: Date.now(),
isGitRepo: false, // Will be updated by caller if needed
aiLogs: [], // Deprecated - logs are in aiTabs
shellLogs: [
diff --git a/src/renderer/utils/worktreeSession.ts b/src/renderer/utils/worktreeSession.ts
index e7e956879a..97c6f3072d 100644
--- a/src/renderer/utils/worktreeSession.ts
+++ b/src/renderer/utils/worktreeSession.ts
@@ -61,6 +61,7 @@ export function buildWorktreeSession(params: BuildWorktreeSessionParams): Sessio
cwd: params.path,
fullPath: params.path,
projectRoot: params.path,
+ createdAt: Date.now(),
isGitRepo: true,
gitBranches: params.gitBranches,
gitTags: params.gitTags,
diff --git a/src/shared/agentMetadata.ts b/src/shared/agentMetadata.ts
index dae2f52710..e10af9304e 100644
--- a/src/shared/agentMetadata.ts
+++ b/src/shared/agentMetadata.ts
@@ -64,11 +64,7 @@ export function getReadOnlyModeTooltip(agentId: AgentId | string): string {
* Agents currently in beta/experimental status.
* Used to render "(Beta)" badges throughout the UI.
*/
-export const BETA_AGENTS: ReadonlySet = new Set([
- 'codex',
- 'opencode',
- 'factory-droid',
-]);
+export const BETA_AGENTS: ReadonlySet = new Set(['opencode', 'factory-droid']);
/**
* Check whether an agent is in beta status.
diff --git a/src/shared/types.ts b/src/shared/types.ts
index 09b3eaf5b1..1285ad0f8b 100644
--- a/src/shared/types.ts
+++ b/src/shared/types.ts
@@ -196,6 +196,9 @@ export interface AgentError {
/** Timestamp when the error occurred */
timestamp: number;
+ /** Epoch ms when rate limit resets (parsed from error text, e.g. "resets 3pm") */
+ rateLimitResetAt?: number;
+
/** Original error data for debugging (stderr, exit code, etc.) */
raw?: {
exitCode?: number;