.md`
+- only execute the document when Maestro starts the native Auto Run flow
+
Please respond to this request.{{READ_ONLY_INSTRUCTION}}
diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index 7d7fbcd8ce..41803f7fe4 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -151,6 +151,8 @@ import { useModalActions, useModalStore } from './stores/modalStore';
import { GitStatusProvider } from './contexts/GitStatusContext';
import { InputProvider, useInputContext } from './contexts/InputContext';
import { useGroupChatStore } from './stores/groupChatStore';
+import { registerGroupChatAutoRun } from './utils/groupChatAutoRunRegistry';
+import { resolveGroupChatAutoRunTarget } from './utils/groupChatAutoRun';
import { useBatchStore } from './stores/batchStore';
// All session state is read directly from useSessionStore in MaestroConsoleInner.
import { useSessionStore, selectActiveSession } from './stores/sessionStore';
@@ -846,6 +848,7 @@ function MaestroConsoleInner() {
handleOpenModeratorSession,
handleJumpToGroupChatMessage,
handleGroupChatRightTabChange,
+ handleStopAll,
handleSendGroupChatMessage,
handleGroupChatDraftChange,
handleRemoveGroupChatQueueItem,
@@ -1257,6 +1260,91 @@ function MaestroConsoleInner() {
handleClearAgentError,
});
+ // --- GROUP CHAT AUTO RUN BRIDGE ---
+ // When the moderator issues !autorun @AgentName, the main process emits
+ // groupChat:autoRunTriggered. Here we intercept that, find the session,
+ // and start a proper batch run via useBatchProcessor for full UI feedback.
+ const startBatchRunRef = useRef(startBatchRun);
+ startBatchRunRef.current = startBatchRun;
+
+ useEffect(() => {
+ const unsub = window.maestro.groupChat.onAutoRunTriggered?.(
+ (groupChatId, participantName, targetFilename) => {
+ // Helper: report failure back to the group chat as a system message so the
+ // moderator and user can see what went wrong and take corrective action.
+ const reportFailure = (reason: string) => {
+ console.warn(`[GroupChat:AutoRun] ${reason}`);
+ window.maestro.groupChat
+ .reportAutoRunComplete(
+ groupChatId,
+ participantName,
+ `⚠️ Auto Run could not start for @${participantName}: ${reason}`
+ )
+ .catch((e) =>
+ console.error('[GroupChat:AutoRun] Failed to report failure to moderator:', e)
+ );
+ };
+
+ const sessions = useSessionStore.getState().sessions;
+ const session = sessions.find((s) => s.name === participantName);
+ if (!session) {
+ reportFailure(
+ `No Maestro agent named "${participantName}" found. Make sure the agent exists and is open.`
+ );
+ return;
+ }
+ if (!session.autoRunFolderPath) {
+ reportFailure(
+ `Agent "${participantName}" has no Auto Run folder configured. Open the agent, go to the Auto Run tab, and configure a folder first.`
+ );
+ return;
+ }
+
+ // Fetch the document list, then start the batch run
+ window.maestro.autorun
+ .listDocs(session.autoRunFolderPath, session.sshRemoteId || undefined)
+ .then((result) => {
+ const allFiles = result.files || [];
+ if (allFiles.length === 0) {
+ reportFailure(
+ `No Auto Run documents found in "${session.autoRunFolderPath}". Create a document in the Auto Run tab first.`
+ );
+ return;
+ }
+
+ const resolvedTarget = resolveGroupChatAutoRunTarget(allFiles, targetFilename);
+ if ('error' in resolvedTarget) {
+ reportFailure(
+ `${resolvedTarget.error} in "${session.autoRunFolderPath}" for "${participantName}".`
+ );
+ return;
+ }
+ const files = resolvedTarget.files;
+
+ const documents = files.map((filename, i) => ({
+ id: `${session.id}-${i}`,
+ filename,
+ resetOnCompletion: false,
+ isDuplicate: false,
+ }));
+ const config = {
+ documents,
+ prompt: '',
+ loopEnabled: false,
+ maxLoops: null,
+ };
+ // Register AFTER validating docs exist so no stale entry on failure
+ registerGroupChatAutoRun(session.id, groupChatId, participantName);
+ startBatchRunRef.current(session.id, config, session.autoRunFolderPath!);
+ })
+ .catch((err) => {
+ reportFailure(`Failed to read Auto Run folder: ${String(err)}`);
+ });
+ }
+ );
+ return () => unsub?.();
+ }, []); // Stable — reads sessions and startBatchRun from refs/store at call time
+
// --- AGENT IPC LISTENERS ---
// Extracted hook for all window.maestro.process.onXxx listeners
// (onData, onExit, onSessionId, onSlashCommands, onStderr, onCommandExit,
@@ -3077,6 +3165,7 @@ function MaestroConsoleInner() {
return anyParticipantMissingCost || moderatorMissingCost;
})()}
onSendMessage={handleSendGroupChatMessage}
+ onStopAll={handleStopAll}
onRename={() =>
activeGroupChatId && handleOpenRenameGroupChatModal(activeGroupChatId)
}
diff --git a/src/renderer/components/GroupChatHeader.tsx b/src/renderer/components/GroupChatHeader.tsx
index 637a899b5c..436df04982 100644
--- a/src/renderer/components/GroupChatHeader.tsx
+++ b/src/renderer/components/GroupChatHeader.tsx
@@ -5,8 +5,8 @@
* and provides actions for rename and info.
*/
-import { Info, Edit2, Columns, DollarSign } from 'lucide-react';
-import type { Theme, Shortcut } from '../types';
+import { Info, Edit2, Columns, DollarSign, StopCircle } from 'lucide-react';
+import type { Theme, Shortcut, GroupChatState } from '../types';
import { formatShortcutKeys } from '../utils/shortcutFormatter';
interface GroupChatHeaderProps {
@@ -17,6 +17,8 @@ interface GroupChatHeaderProps {
totalCost?: number;
/** True if one or more participants don't have cost data (makes total incomplete) */
costIncomplete?: boolean;
+ state: GroupChatState;
+ onStopAll: () => void;
onRename: () => void;
onShowInfo: () => void;
rightPanelOpen: boolean;
@@ -30,6 +32,8 @@ export function GroupChatHeader({
participantCount,
totalCost,
costIncomplete,
+ state,
+ onStopAll,
onRename,
onShowInfo,
rightPanelOpen,
@@ -72,6 +76,22 @@ export function GroupChatHeader({
+ {/* Stop All button - only shown when active */}
+ {state !== 'idle' && (
+
+ )}
void;
+ onStopAll: () => void;
onRename: () => void;
onShowInfo: () => void;
rightPanelOpen: boolean;
@@ -80,6 +81,7 @@ export function GroupChatPanel({
totalCost,
costIncomplete,
onSendMessage,
+ onStopAll,
onRename,
onShowInfo,
rightPanelOpen,
@@ -117,6 +119,8 @@ export function GroupChatPanel({
participantCount={groupChat.participants.length}
totalCost={totalCost}
costIncomplete={costIncomplete}
+ state={state}
+ onStopAll={onStopAll}
onRename={onRename}
onShowInfo={onShowInfo}
rightPanelOpen={rightPanelOpen}
diff --git a/src/renderer/components/GroupChatParticipants.tsx b/src/renderer/components/GroupChatParticipants.tsx
index 362db0fda8..27e9d12610 100644
--- a/src/renderer/components/GroupChatParticipants.tsx
+++ b/src/renderer/components/GroupChatParticipants.tsx
@@ -13,6 +13,7 @@ import { ParticipantCard } from './ParticipantCard';
import { formatShortcutKeys } from '../utils/shortcutFormatter';
import { buildParticipantColorMap } from '../utils/participantColors';
import { useResizablePanel } from '../hooks';
+import { useGroupChatStore } from '../stores/groupChatStore';
interface GroupChatParticipantsProps {
theme: Theme;
@@ -62,6 +63,8 @@ export function GroupChatParticipants({
side: 'right',
});
+ const participantLiveOutput = useGroupChatStore((s) => s.participantLiveOutput);
+
// Generate consistent colors for all participants (including "Moderator" for the moderator card)
const participantColors = useMemo(() => {
return buildParticipantColorMap(['Moderator', ...participants.map((p) => p.name)], theme);
@@ -164,10 +167,11 @@ export function GroupChatParticipants({
key={participant.sessionId}
theme={theme}
participant={participant}
- state={participantStates.get(participant.sessionId) || 'idle'}
+ state={participantStates.get(participant.name) || 'idle'}
color={participantColors[participant.name]}
groupChatId={groupChatId}
onContextReset={handleContextReset}
+ liveOutput={participantLiveOutput.get(participant.name)}
/>
))
)}
diff --git a/src/renderer/components/GroupChatRightPanel.tsx b/src/renderer/components/GroupChatRightPanel.tsx
index b8a2ee41c3..cbdf0b8406 100644
--- a/src/renderer/components/GroupChatRightPanel.tsx
+++ b/src/renderer/components/GroupChatRightPanel.tsx
@@ -20,6 +20,7 @@ import {
type ParticipantColorInfo,
} from '../utils/participantColors';
import { useResizablePanel } from '../hooks';
+import { useGroupChatStore } from '../stores/groupChatStore';
export type GroupChatRightTab = 'participants' | 'history';
@@ -80,6 +81,8 @@ export function GroupChatRightPanel({
onJumpToMessage,
onColorsComputed,
}: GroupChatRightPanelProps): JSX.Element | null {
+ const participantLiveOutput = useGroupChatStore((s) => s.participantLiveOutput);
+
// Color preferences state
const [colorPreferences, setColorPreferences] = useState>({});
const { panelRef, onResizeStart, transitionClass } = useResizablePanel({
@@ -322,6 +325,7 @@ export function GroupChatRightPanel({
color={participantColors[participant.name]}
groupChatId={groupChatId}
onContextReset={handleContextReset}
+ liveOutput={participantLiveOutput.get(`${groupChatId}:${participant.name}`)}
/>
);
})
diff --git a/src/renderer/components/ParticipantCard.tsx b/src/renderer/components/ParticipantCard.tsx
index 2aec2b916c..c31e4f2de1 100644
--- a/src/renderer/components/ParticipantCard.tsx
+++ b/src/renderer/components/ParticipantCard.tsx
@@ -5,8 +5,17 @@
* session ID, context usage, stats, and cost.
*/
-import { MessageSquare, Copy, Check, DollarSign, RotateCcw, Server } from 'lucide-react';
-import { useState, useCallback } from 'react';
+import {
+ MessageSquare,
+ Copy,
+ Check,
+ DollarSign,
+ RotateCcw,
+ Server,
+ Eye,
+ EyeOff,
+} from 'lucide-react';
+import { useState, useCallback, useEffect, useRef } from 'react';
import type { Theme, GroupChatParticipant, SessionState } from '../types';
import { getStatusColor } from '../utils/theme';
import { formatCost } from '../utils/formatters';
@@ -19,6 +28,7 @@ interface ParticipantCardProps {
color?: string;
groupChatId?: string;
onContextReset?: (participantName: string) => void;
+ liveOutput?: string;
}
/**
@@ -39,9 +49,19 @@ export function ParticipantCard({
color,
groupChatId,
onContextReset,
+ liveOutput,
}: ParticipantCardProps): JSX.Element {
const [copied, setCopied] = useState(false);
const [isResetting, setIsResetting] = useState(false);
+ const [peekOpen, setPeekOpen] = useState(false);
+ const peekRef = useRef(null);
+
+ // Auto-scroll peek output to bottom
+ useEffect(() => {
+ if (peekOpen && peekRef.current) {
+ peekRef.current.scrollTop = peekRef.current.scrollHeight;
+ }
+ }, [peekOpen, liveOutput]);
// Use agent's session ID (clean GUID) when available, otherwise show pending
const agentSessionId = participant.agentSessionId;
@@ -236,7 +256,41 @@ export function ParticipantCard({
Resetting...
)}
+ {/* Peek button - always visible */}
+
+
+ {/* Live output peek panel */}
+ {peekOpen && (
+
+ {liveOutput
+ ? liveOutput.length > 4096
+ ? liveOutput.slice(-4096)
+ : liveOutput
+ : '(no live output yet)'}
+
+ )}
);
}
diff --git a/src/renderer/components/Settings/SettingsModal.tsx b/src/renderer/components/Settings/SettingsModal.tsx
index a1d665dc0a..2aaa2a9b50 100644
--- a/src/renderer/components/Settings/SettingsModal.tsx
+++ b/src/renderer/components/Settings/SettingsModal.tsx
@@ -10,6 +10,7 @@ import {
FlaskConical,
Server,
Monitor,
+ Users,
} from 'lucide-react';
import { useSettings } from '../../hooks';
import type { Theme, LLMProvider } from '../../types';
@@ -45,6 +46,7 @@ interface SettingsModalProps {
| 'theme'
| 'notifications'
| 'aicommands'
+ | 'groupchat'
| 'ssh'
| 'encore';
hasNoAgents?: boolean;
@@ -92,6 +94,9 @@ export const SettingsModal = memo(function SettingsModal(props: SettingsModalPro
setSshRemoteIgnorePatterns,
sshRemoteHonorGitignore,
setSshRemoteHonorGitignore,
+ // Group Chat settings
+ moderatorStandingInstructions,
+ setModeratorStandingInstructions,
} = useSettings();
const [activeTab, setActiveTab] = useState<
@@ -102,6 +107,7 @@ export const SettingsModal = memo(function SettingsModal(props: SettingsModalPro
| 'theme'
| 'notifications'
| 'aicommands'
+ | 'groupchat'
| 'ssh'
| 'encore'
>('general');
@@ -166,6 +172,7 @@ export const SettingsModal = memo(function SettingsModal(props: SettingsModalPro
| 'theme'
| 'notifications'
| 'aicommands'
+ | 'groupchat'
| 'ssh'
| 'encore'
> = FEATURE_FLAGS.LLM_SETTINGS
@@ -177,6 +184,7 @@ export const SettingsModal = memo(function SettingsModal(props: SettingsModalPro
'theme',
'notifications',
'aicommands',
+ 'groupchat',
'ssh',
'encore',
]
@@ -187,6 +195,7 @@ export const SettingsModal = memo(function SettingsModal(props: SettingsModalPro
'theme',
'notifications',
'aicommands',
+ 'groupchat',
'ssh',
'encore',
];
@@ -391,6 +400,14 @@ export const SettingsModal = memo(function SettingsModal(props: SettingsModalPro
{activeTab === 'aicommands' && AI Commands}
+