@aion0/forge 0.5.8 → 0.5.12

package/components/WorkspaceView.tsx

@@ -446,13 +446,15 @@ function AgentConfigModal({ initial, mode, existingAgents, projectPath, onConfir
   const [role, setRole] = useState(initial.role || '');
   const [backend, setBackend] = useState<'api' | 'cli'>(initial.backend === 'api' ? 'api' : 'cli');
   const [agentId, setAgentId] = useState(initial.agentId || 'claude');
-  const [availableAgents, setAvailableAgents] = useState<{ id: string; name: string; isProfile?: boolean; backendType?: string }[]>([]);
+  const [availableAgents, setAvailableAgents] = useState<{ id: string; name: string; isProfile?: boolean; backendType?: string; base?: string; cliType?: string }[]>([]);
 
   useEffect(() => {
     fetch('/api/agents').then(r => r.json()).then(data => {
       const list = (data.agents || data || []).map((a: any) => ({
         id: a.id, name: a.name || a.id,
         isProfile: a.isProfile || a.base,
+        base: a.base,
+        cliType: a.cliType,
         backendType: a.backendType || 'cli',
       }));
       setAvailableAgents(list);
@@ -681,24 +683,38 @@ function AgentConfigModal({ initial, mode, existingAgents, projectPath, onConfir
             <label htmlFor="requiresApproval" className="text-[9px] text-gray-400">Require approval before processing inbox messages</label>
           </div>
 
-          {/* Persistent Session */}
-          <div className="flex items-center gap-2">
-            <input type="checkbox" id="persistentSession" checked={persistentSession} onChange={e => !isPrimary && setPersistentSession(e.target.checked)}
-              disabled={isPrimary}
-              className={`accent-[#3fb950] ${isPrimary ? 'opacity-50 cursor-not-allowed' : ''}`} />
-            <label htmlFor="persistentSession" className={`text-[9px] text-gray-400 ${isPrimary ? 'opacity-50' : ''}`}>
-              Terminal mode {isPrimary ? '(required for primary)' : '— run in terminal instead of headless (claude -p)'}
-            </label>
-          </div>
-          {persistentSession && (
-            <div className="flex flex-col gap-1.5 ml-4">
-              <div className="flex items-center gap-2">
-                <input type="checkbox" id="skipPermissions" checked={skipPermissions} onChange={e => setSkipPermissions(e.target.checked)}
-                  className="accent-[#f0883e]" />
-                <label htmlFor="skipPermissions" className="text-[9px] text-gray-400">Skip permissions (auto-approve all tool calls)</label>
+          {/* Persistent Session — only for claude-code based agents */}
+          {(() => {
+            // Check if selected agent supports terminal mode (claude-code or its profiles)
+            const selectedAgent = availableAgents.find(a => a.id === agentId);
+            const isClaude = agentId === 'claude' || selectedAgent?.base === 'claude' || selectedAgent?.cliType === 'claude-code' || !selectedAgent;
+            const canTerminal = isClaude || isPrimary;
+            return canTerminal ? (
+              <>
+                <div className="flex items-center gap-2">
+                  <input type="checkbox" id="persistentSession" checked={persistentSession} onChange={e => !isPrimary && setPersistentSession(e.target.checked)}
+                    disabled={isPrimary}
+                    className={`accent-[#3fb950] ${isPrimary ? 'opacity-50 cursor-not-allowed' : ''}`} />
+                  <label htmlFor="persistentSession" className={`text-[9px] text-gray-400 ${isPrimary ? 'opacity-50' : ''}`}>
+                    Terminal mode {isPrimary ? '(required for primary)' : '— run in terminal instead of headless'}
+                  </label>
+                </div>
+                {persistentSession && (
+                  <div className="flex flex-col gap-1.5 ml-4">
+                    <div className="flex items-center gap-2">
+                      <input type="checkbox" id="skipPermissions" checked={skipPermissions} onChange={e => setSkipPermissions(e.target.checked)}
+                        className="accent-[#f0883e]" />
+                      <label htmlFor="skipPermissions" className="text-[9px] text-gray-400">Skip permissions (auto-approve all tool calls)</label>
+                    </div>
+                  </div>
+                )}
+              </>
+            ) : (
+              <div className="text-[8px] text-gray-500 bg-gray-500/10 px-2 py-1 rounded">
+                Headless mode only — {agentId} does not support terminal mode
               </div>
-            </div>
-          )}
+            );
+          })()}
 
           {/* Steps */}
           <div className="flex flex-col gap-1">
@@ -766,6 +782,7 @@ function AgentConfigModal({ initial, mode, existingAgents, projectPath, onConfir
                       <option value="agent_log">Agent Log</option>
                       <option value="session">Session Output</option>
                       <option value="command">Command</option>
+                      <option value="agent_status">Agent Status</option>
                     </select>
                     {t.type === 'directory' && (
                       <select value={t.path || ''} onChange={e => {
@@ -777,6 +794,29 @@ function AgentConfigModal({ initial, mode, existingAgents, projectPath, onConfir
                         {projectDirs.map(d => <option key={d} value={d + '/'}>{d}/</option>)}
                       </select>
                     )}
+                    {t.type === 'agent_status' && (<>
+                      <select value={t.path || ''} onChange={e => {
+                        const next = [...watchTargets];
+                        next[i] = { ...t, path: e.target.value };
+                        setWatchTargets(next);
+                      }} className="text-[10px] bg-[#161b22] border border-[#30363d] rounded px-1 py-0.5 text-white flex-1">
+                        <option value="">Select agent...</option>
+                        {existingAgents.filter(a => a.id !== initial.id).map(a =>
+                          <option key={a.id} value={a.id}>{a.icon} {a.label}</option>
+                        )}
+                      </select>
+                      <select value={t.pattern || ''} onChange={e => {
+                        const next = [...watchTargets];
+                        next[i] = { ...t, pattern: e.target.value };
+                        setWatchTargets(next);
+                      }} className="text-[10px] bg-[#161b22] border border-[#30363d] rounded px-1 py-0.5 text-white w-20">
+                        <option value="">Any change</option>
+                        <option value="done">done</option>
+                        <option value="failed">failed</option>
+                        <option value="running">running</option>
+                        <option value="idle">idle</option>
+                      </select>
+                    </>)}
                     {t.type === 'agent_output' && (
                       <select value={t.path || ''} onChange={e => {
                         const next = [...watchTargets];
@@ -810,7 +850,7 @@ function AgentConfigModal({ initial, mode, existingAgents, projectPath, onConfir
                     {t.type === 'session' && (
                       <SessionTargetSelector
                         target={t}
-                        agents={existingAgents.filter(a => a.id !== initial.id && (!a.agentId || a.agentId === 'claude'))}
+                        agents={existingAgents.filter(a => a.id !== initial.id)}
                         projectPath={projectPath}
                         onChange={(updated) => {
                           const next = [...watchTargets];
@@ -1357,11 +1397,17 @@ function InboxPanel({ agentId, agentLabel, busLog, agents, workspaceId, onClose
                     </button>
                   </div>
                 )}
-                {msg.status === 'pending' && msg.type !== 'ack' && (
-                  <button onClick={() => wsApi(workspaceId, 'abort_message', { messageId: msg.id })}
-                    className="text-[7px] px-1.5 py-0.5 rounded bg-red-600/20 text-red-400 hover:bg-red-600/30 ml-auto">
-                    ✕ Abort
-                  </button>
+                {(msg.status === 'pending' || msg.status === 'running') && msg.type !== 'ack' && (
+                  <div className="flex gap-1 ml-auto">
+                    <button onClick={() => wsApi(workspaceId, 'message_done', { messageId: msg.id })}
+                      className="text-[7px] px-1.5 py-0.5 rounded bg-green-600/20 text-green-400 hover:bg-green-600/30">
+                      ✓ Done
+                    </button>
+                    <button onClick={() => wsApi(workspaceId, 'abort_message', { messageId: msg.id })}
+                      className="text-[7px] px-1.5 py-0.5 rounded bg-red-600/20 text-red-400 hover:bg-red-600/30">
+                      ✕ Abort
+                    </button>
+                  </div>
                 )}
                 {(msg.status === 'done' || msg.status === 'failed') && msg.type !== 'ack' && (
                   <div className="flex gap-1 ml-auto">
@@ -1735,13 +1781,18 @@ function FloatingTerminalInline({ agentLabel, agentIcon, projectPath, agentCliId
               const envWithoutModel = profileEnv ? Object.fromEntries(
                 Object.entries(profileEnv).filter(([k]) => k !== 'CLAUDE_MODEL')
               ) : {};
-              // Unset old profile vars + set new ones
+              // Build commands as separate short lines
+              const commands: string[] = [];
               const profileVarsToReset = ['ANTHROPIC_AUTH_TOKEN', 'ANTHROPIC_BASE_URL', 'ANTHROPIC_SMALL_FAST_MODEL', 'CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC', 'DISABLE_TELEMETRY', 'DISABLE_ERROR_REPORTING', 'DISABLE_AUTOUPDATER', 'DISABLE_NON_ESSENTIAL_MODEL_CALLS', 'CLAUDE_MODEL'];
-              const unsetPrefix = profileVarsToReset.map(v => `unset ${v}`).join(' && ') + ' && ';
-              const envExportsClean = unsetPrefix + (Object.keys(envWithoutModel).length > 0
-                ? Object.entries(envWithoutModel).map(([k, v]) => `export ${k}="${v}"`).join(' && ') + ' && '
-                : '');
-              // Resolve session: explicit > boundSessionId > fixedSession (primary) > fresh
+              commands.push(profileVarsToReset.map(v => `unset ${v}`).join('; '));
+              const envWithoutForge = Object.entries(envWithoutModel).filter(([k]) => !k.startsWith('FORGE_'));
+              if (envWithoutForge.length > 0) {
+                commands.push(envWithoutForge.map(([k, v]) => `export ${k}="${v}"`).join('; '));
+              }
+              const forgeVars = Object.entries(envWithoutModel).filter(([k]) => k.startsWith('FORGE_'));
+              if (forgeVars.length > 0) {
+                commands.push(forgeVars.map(([k, v]) => `export ${k}="${v}"`).join('; '));
+              }
               let resumeId = resumeSessionId || boundSessionId;
               if (isClaude && !resumeId && isPrimary) {
                 try {
@@ -1753,10 +1804,12 @@ function FloatingTerminalInline({ agentLabel, agentIcon, projectPath, agentCliId
               let mcpFlag = '';
               if (isClaude) { try { const { getMcpFlag } = await import('@/lib/session-utils'); mcpFlag = await getMcpFlag(projectPath); } catch {} }
               const sf = skipPermissions ? (cliType === 'codex' ? ' --full-auto' : cliType === 'aider' ? ' --yes' : ' --dangerously-skip-permissions') : '';
-              const cmd = `${envExportsClean}${cdCmd} && ${cli}${resumeFlag}${modelFlag}${sf}${mcpFlag}\n`;
-              setTimeout(() => {
-                if (!disposed && ws.readyState === WebSocket.OPEN) ws.send(JSON.stringify({ type: 'input', data: cmd }));
-              }, 300);
+              commands.push(`${cdCmd} && ${cli}${resumeFlag}${modelFlag}${sf}${mcpFlag}`);
+              commands.forEach((cmd, i) => {
+                setTimeout(() => {
+                  if (!disposed && ws.readyState === WebSocket.OPEN) ws.send(JSON.stringify({ type: 'input', data: cmd + '\n' }));
+                }, 300 + i * 300);
+              });
             }
           }
         } catch {}
@@ -1779,7 +1832,7 @@ function FloatingTerminalInline({ agentLabel, agentIcon, projectPath, agentCliId
   return <div ref={containerRef} className="w-full h-full" style={{ background: '#0d1117' }} />;
 }
 
-function FloatingTerminal({ agentLabel, agentIcon, projectPath, agentCliId, cliCmd: cliCmdProp, cliType, workDir, preferredSessionName, existingSession, resumeMode, resumeSessionId, profileEnv, isPrimary, skipPermissions, persistentSession, boundSessionId, onSessionReady, onClose }: {
+function FloatingTerminal({ agentLabel, agentIcon, projectPath, agentCliId, cliCmd: cliCmdProp, cliType, workDir, preferredSessionName, existingSession, resumeMode, resumeSessionId, profileEnv, isPrimary, skipPermissions, persistentSession, boundSessionId, initialPos, onSessionReady, onClose }: {
   agentLabel: string;
   agentIcon: string;
   projectPath: string;
@@ -1796,14 +1849,20 @@ function FloatingTerminal({ agentLabel, agentIcon, projectPath, agentCliId, cliC
   skipPermissions?: boolean;
   persistentSession?: boolean;
   boundSessionId?: string;
+  initialPos?: { x: number; y: number };
   onSessionReady?: (name: string) => void;
   onClose: (killSession: boolean) => void;
 }) {
   const containerRef = useRef<HTMLDivElement>(null);
   const wsRef = useRef<WebSocket | null>(null);
   const sessionNameRef = useRef('');
-  const [pos, setPos] = useState({ x: 80, y: 60 });
-  const [size, setSize] = useState({ w: 750, h: 450 });
+  const [pos, setPos] = useState(initialPos || { x: 80, y: 60 });
+  const [userDragged, setUserDragged] = useState(false);
+  // Follow node position unless user manually dragged the terminal
+  useEffect(() => {
+    if (initialPos && !userDragged) setPos(initialPos);
+  }, [initialPos?.x, initialPos?.y]); // eslint-disable-line react-hooks/exhaustive-deps
+  const [size, setSize] = useState({ w: 500, h: 300 });
   const [showCloseDialog, setShowCloseDialog] = useState(false);
   const dragRef = useRef<{ startX: number; startY: number; origX: number; origY: number } | null>(null);
   const resizeRef = useRef<{ startX: number; startY: number; origW: number; origH: number } | null>(null);
@@ -1821,7 +1880,7 @@ function FloatingTerminal({ agentLabel, agentIcon, projectPath, agentCliId, cliC
       if (disposed) return;
 
       const term = new Terminal({
-        cursorBlink: true, fontSize: 13,
+        cursorBlink: true, fontSize: 10,
         fontFamily: 'Menlo, Monaco, "Courier New", monospace',
         scrollback: 5000,
         theme: { background: '#0d1117', foreground: '#c9d1d9', cursor: '#58a6ff' },
@@ -1831,7 +1890,15 @@ function FloatingTerminal({ agentLabel, agentIcon, projectPath, agentCliId, cliC
       term.open(el);
       setTimeout(() => { try { fitAddon.fit(); } catch {} }, 100);
 
-      const ro = new ResizeObserver(() => { try { fitAddon.fit(); } catch {} });
+      // Scale font: min 10 at small size, max 13 at large size
+      const ro = new ResizeObserver(() => {
+        try {
+          const w = el.clientWidth;
+          const newSize = Math.min(13, Math.max(10, Math.floor(w / 60)));
+          if (term.options.fontSize !== newSize) term.options.fontSize = newSize;
+          fitAddon.fit();
+        } catch {}
+      });
       ro.observe(el);
 
       // Connect WebSocket — attach to existing or create new
@@ -1900,14 +1967,26 @@ function FloatingTerminal({ agentLabel, agentIcon, projectPath, agentCliId, cliC
             const envWithoutModel = profileEnv ? Object.fromEntries(
               Object.entries(profileEnv).filter(([k]) => k !== 'CLAUDE_MODEL')
             ) : {};
-            // Unset old profile vars + set new ones (prevents leaking between agent switches)
+            // Build commands as separate short lines to avoid terminal truncation
+            const commands: string[] = [];
+
+            // 1. Unset old profile vars
             const profileVarsToReset = ['ANTHROPIC_AUTH_TOKEN', 'ANTHROPIC_BASE_URL', 'ANTHROPIC_SMALL_FAST_MODEL', 'CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC', 'DISABLE_TELEMETRY', 'DISABLE_ERROR_REPORTING', 'DISABLE_AUTOUPDATER', 'DISABLE_NON_ESSENTIAL_MODEL_CALLS', 'CLAUDE_MODEL'];
-            const unsetPrefix = profileVarsToReset.map(v => `unset ${v}`).join(' && ') + ' && ';
-            const envExportsClean = unsetPrefix + (Object.keys(envWithoutModel).length > 0
-              ? Object.entries(envWithoutModel).map(([k, v]) => `export ${k}="${v}"`).join(' && ') + ' && '
-              : '');
-            // Primary: use fixed session. Non-primary: use explicit sessionId or -c
-            // Resolve session: explicit > boundSessionId > fixedSession (primary) > fresh
+            commands.push(profileVarsToReset.map(v => `unset ${v}`).join('; '));
+
+            // 2. Export new profile vars (if any)
+            const envWithoutForge = Object.entries(envWithoutModel).filter(([k]) => !k.startsWith('FORGE_'));
+            if (envWithoutForge.length > 0) {
+              commands.push(envWithoutForge.map(([k, v]) => `export ${k}="${v}"`).join('; '));
+            }
+
+            // 3. Export FORGE vars
+            const forgeVars = Object.entries(envWithoutModel).filter(([k]) => k.startsWith('FORGE_'));
+            if (forgeVars.length > 0) {
+              commands.push(forgeVars.map(([k, v]) => `export ${k}="${v}"`).join('; '));
+            }
+
+            // 4. CLI command
             let resumeId = resumeSessionId || boundSessionId;
             if (isClaude && !resumeId && isPrimary) {
               try {
@@ -1918,11 +1997,15 @@ function FloatingTerminal({ agentLabel, agentIcon, projectPath, agentCliId, cliC
             const resumeFlag = isClaude && resumeId ? ` --resume ${resumeId}` : '';
             let mcpFlag = '';
             if (isClaude) { try { const { getMcpFlag } = await import('@/lib/session-utils'); mcpFlag = await getMcpFlag(projectPath); } catch {} }
-            const sf = skipPermissions ? ' --dangerously-skip-permissions' : '';
-            const cmd = `${envExportsClean}${cdCmd} && ${cli}${resumeFlag}${modelFlag}${sf}${mcpFlag}\n`;
-            setTimeout(() => {
-              if (!disposed && ws.readyState === WebSocket.OPEN) ws.send(JSON.stringify({ type: 'input', data: cmd }));
-            }, 300);
+            const sf = skipPermissions ? (cliType === 'codex' ? ' --full-auto' : cliType === 'aider' ? ' --yes' : ' --dangerously-skip-permissions') : '';
+            commands.push(`${cdCmd} && ${cli}${resumeFlag}${modelFlag}${sf}${mcpFlag}`);
+
+            // Send each command with delay between them
+            commands.forEach((cmd, i) => {
+              setTimeout(() => {
+                if (!disposed && ws.readyState === WebSocket.OPEN) ws.send(JSON.stringify({ type: 'input', data: cmd + '\n' }));
+              }, 300 + i * 300);
+            });
           }
         } catch {}
       };
@@ -1956,6 +2039,7 @@ function FloatingTerminal({ agentLabel, agentIcon, projectPath, agentCliId, cliC
         onMouseDown={(e) => {
           e.preventDefault();
           dragRef.current = { startX: e.clientX, startY: e.clientY, origX: pos.x, origY: pos.y };
+          setUserDragged(true);
           const onMove = (ev: MouseEvent) => {
             if (!dragRef.current) return;
             setPos({ x: Math.max(0, dragRef.current.origX + ev.clientX - dragRef.current.startX), y: Math.max(0, dragRef.current.origY + ev.clientY - dragRef.current.startY) });
@@ -2113,6 +2197,8 @@ interface AgentNodeData {
   state: AgentState;
   colorIdx: number;
   previewLines: string[];
+  projectPath: string;
+  workspaceId: string | null;
   onRun: () => void;
   onPause: () => void;
   onStop: () => void;
@@ -2131,8 +2217,11 @@ interface AgentNodeData {
   [key: string]: unknown;
 }
 
+// PortalTerminal/NodeTerminal removed — xterm cannot render inside React Flow nodes
+// and createPortal causes event routing issues. Using FloatingTerminal instead.
+
 function AgentFlowNode({ data }: NodeProps<Node<AgentNodeData>>) {
-  const { config, state, colorIdx, previewLines, onRun, onPause, onStop, onRetry, onEdit, onRemove, onMessage, onApprove, onShowLog, onShowMemory, onShowInbox, onOpenTerminal, onSwitchSession, inboxPending = 0, inboxFailed = 0 } = data;
+  const { config, state, colorIdx, previewLines, projectPath, workspaceId, onRun, onPause, onStop, onRetry, onEdit, onRemove, onMessage, onApprove, onShowLog, onShowMemory, onShowInbox, onOpenTerminal, onSwitchSession, inboxPending = 0, inboxFailed = 0 } = data;
   const c = COLORS[colorIdx % COLORS.length];
   const smithStatus = state?.smithStatus || 'down';
   const taskStatus = state?.taskStatus || 'idle';
@@ -2141,7 +2230,7 @@ function AgentFlowNode({ data }: NodeProps<Node<AgentNodeData>>) {
   const taskInfo = TASK_STATUS[taskStatus] || TASK_STATUS.idle;
   const currentStep = state?.currentStep;
   const step = currentStep !== undefined ? config.steps[currentStep] : undefined;
-  const isApprovalPending = taskStatus === 'idle' && smithStatus === 'active'; // approximation, actual check would use approvalQueue
+  const isApprovalPending = taskStatus === 'idle' && smithStatus === 'active';
 
   return (
     <div className="w-52 flex flex-col rounded-lg select-none"
@@ -2170,8 +2259,13 @@ function AgentFlowNode({ data }: NodeProps<Node<AgentNodeData>>) {
             {(() => {
               // Execution mode is determined by config, not tmux state
               const isTerminalMode = config.persistentSession;
-              const color = isTerminalMode ? (hasTmux ? '#3fb950' : '#f0883e') : '#484f58';
-              const label = isTerminalMode ? (hasTmux ? 'terminal' : 'terminal (down)') : 'headless';
+              const isActive = smithStatus === 'active';
+              const color = isTerminalMode
+                ? (hasTmux ? '#3fb950' : '#f0883e')         // terminal: green (up) / orange (down)
+                : (isActive ? '#58a6ff' : '#484f58');        // headless: blue (active) / gray (down)
+              const label = isTerminalMode
+                ? (hasTmux ? 'terminal' : 'terminal (down)')
+                : (isActive ? 'headless' : 'headless (down)');
               return (<>
                 <div className="w-1.5 h-1.5 rounded-full" style={{ background: color }} />
                 <span className="text-[7px] font-medium" style={{ color }}>{label}</span>
@@ -2242,7 +2336,8 @@ function AgentFlowNode({ data }: NodeProps<Node<AgentNodeData>>) {
         <div className="flex-1" />
         <span className="flex items-center">
             <button onPointerDown={e => e.stopPropagation()} onClick={e => { e.stopPropagation(); onOpenTerminal(); }}
-              className={`text-[9px] px-1 ${hasTmux && taskStatus === 'running' ? 'text-green-400 animate-pulse' : 'text-gray-600 hover:text-green-400'}`} title="Open terminal">⌨️</button>
+              className={`text-[9px] px-1 ${hasTmux && taskStatus === 'running' ? 'text-green-400 animate-pulse' : 'text-gray-600 hover:text-green-400'}`}
+              title="Open terminal">⌨️</button>
             {hasTmux && !config.primary && (
               <button onPointerDown={e => e.stopPropagation()} onClick={e => { e.stopPropagation(); onSwitchSession(); }}
                 className="text-[10px] text-gray-600 hover:text-yellow-400 px-0.5 py-0.5" title="Switch session">▾</button>
@@ -2287,8 +2382,8 @@ function WorkspaceViewInner({ projectPath, projectName, onClose }: {
   const [memoryTarget, setMemoryTarget] = useState<{ id: string; label: string } | null>(null);
   const [inboxTarget, setInboxTarget] = useState<{ id: string; label: string } | null>(null);
   const [showBusPanel, setShowBusPanel] = useState(false);
-  const [floatingTerminals, setFloatingTerminals] = useState<{ agentId: string; label: string; icon: string; cliId: string; cliCmd?: string; cliType?: string; workDir?: string; tmuxSession?: string; sessionName: string; resumeMode?: boolean; resumeSessionId?: string; profileEnv?: Record<string, string>; isPrimary?: boolean; skipPermissions?: boolean; persistentSession?: boolean; boundSessionId?: string }[]>([]);
-  const [termLaunchDialog, setTermLaunchDialog] = useState<{ agent: AgentConfig; sessName: string; workDir?: string; sessions: string[]; supportsSession?: boolean } | null>(null);
+  const [floatingTerminals, setFloatingTerminals] = useState<{ agentId: string; label: string; icon: string; cliId: string; cliCmd?: string; cliType?: string; workDir?: string; tmuxSession?: string; sessionName: string; resumeMode?: boolean; resumeSessionId?: string; profileEnv?: Record<string, string>; isPrimary?: boolean; skipPermissions?: boolean; persistentSession?: boolean; boundSessionId?: string; initialPos?: { x: number; y: number } }[]>([]);
+  const [termLaunchDialog, setTermLaunchDialog] = useState<{ agent: AgentConfig; sessName: string; workDir?: string; sessions: string[]; supportsSession?: boolean; initialPos?: { x: number; y: number } } | null>(null);
 
   // Expose focusAgent to parent
   useImperativeHandle(ref, () => ({
@@ -2367,6 +2462,8 @@ function WorkspaceViewInner({ projectPath, projectName, onClose }: {
             state: states[agent.id] || { smithStatus: 'down', taskStatus: 'idle', artifacts: [] },
             colorIdx: i,
             previewLines: logPreview[agent.id] || [],
+            projectPath,
+            workspaceId,
             onRun: () => {
               wsApi(workspaceId!, 'run', { agentId: agent.id });
             },
@@ -2387,13 +2484,19 @@ function WorkspaceViewInner({ projectPath, projectName, onClose }: {
             inboxFailed: busLog.filter(m => m.to === agent.id && m.status === 'failed' && m.type !== 'ack').length,
             onOpenTerminal: async () => {
               if (!workspaceId) return;
-              if (!daemonActiveFromStream) {
-                alert('Start daemon first before opening terminal.');
-                return;
-              }
+              // Sync stale daemonActiveFromStream from agent states
+              const anyActive = Object.values(states).some(s => s?.smithStatus === 'active');
+              if (anyActive && !daemonActiveFromStream) setDaemonActiveFromStream(true);
               // Close existing terminal (config may have changed)
               setFloatingTerminals(prev => prev.filter(t => t.agentId !== agent.id));
 
+              // Get node screen position for initial terminal placement
+              const nodeEl = document.querySelector(`[data-id="${agent.id}"]`);
+              const nodeRect = nodeEl?.getBoundingClientRect();
+              const initialPos = nodeRect
+                ? { x: nodeRect.left, y: nodeRect.bottom + 4 }
+                : { x: 80, y: 60 };
+
               const agentState = states[agent.id];
               const existingTmux = agentState?.tmuxSession;
               const safeName = (s: string) => s.toLowerCase().replace(/[^a-z0-9]/g, '-').replace(/-+/g, '-').slice(0, 20);
@@ -2421,7 +2524,7 @@ function WorkspaceViewInner({ projectPath, projectName, onClose }: {
                   agentId: agent.id, label: agent.label, icon: agent.icon,
                   cliId: agent.agentId || 'claude', ...launchInfo, workDir,
                   tmuxSession: existingTmux, sessionName: sessName,
-                  isPrimary: agent.primary, skipPermissions: agent.skipPermissions !== false, persistentSession: agent.persistentSession, boundSessionId: agent.boundSessionId,
+                  isPrimary: agent.primary, skipPermissions: agent.skipPermissions !== false, persistentSession: agent.persistentSession, boundSessionId: agent.boundSessionId, initialPos,
                 }]);
                 return;
               }
@@ -2433,7 +2536,7 @@ function WorkspaceViewInner({ projectPath, projectName, onClose }: {
                   agentId: agent.id, label: agent.label, icon: agent.icon,
                   cliId: agent.agentId || 'claude', ...launchInfo, workDir,
                   tmuxSession: res?.tmuxSession || sessName, sessionName: sessName,
-                  isPrimary: true, skipPermissions: agent.skipPermissions !== false, persistentSession: agent.persistentSession, boundSessionId: agent.boundSessionId,
+                  isPrimary: true, skipPermissions: agent.skipPermissions !== false, persistentSession: agent.persistentSession, boundSessionId: agent.boundSessionId, initialPos,
                 }]);
                 return;
               }
@@ -2446,24 +2549,25 @@ function WorkspaceViewInner({ projectPath, projectName, onClose }: {
                   cliId: agent.agentId || 'claude', ...launchInfo, workDir,
                   tmuxSession: res?.tmuxSession || sessName, sessionName: sessName,
                   resumeSessionId: agent.boundSessionId,
-                  isPrimary: false, skipPermissions: agent.skipPermissions !== false, persistentSession: agent.persistentSession, boundSessionId: agent.boundSessionId,
+                  isPrimary: false, skipPermissions: agent.skipPermissions !== false, persistentSession: agent.persistentSession, boundSessionId: agent.boundSessionId, initialPos,
                 }]);
                 return;
               }
               // No bound session → show launch dialog (New / Resume / Select)
-              setTermLaunchDialog({ agent, sessName, workDir, sessions: [], supportsSession: resolveRes?.supportsSession ?? true });
+              setTermLaunchDialog({ agent, sessName, workDir, sessions: [], supportsSession: resolveRes?.supportsSession ?? true, initialPos });
             },
             onSwitchSession: async () => {
               if (!workspaceId) return;
-              // Close existing terminal
               setFloatingTerminals(prev => prev.filter(t => t.agentId !== agent.id));
               if (agent.id) wsApi(workspaceId, 'close_terminal', { agentId: agent.id });
-              // Show launch dialog
+              const nodeEl = document.querySelector(`[data-id="${agent.id}"]`);
+              const nodeRect = nodeEl?.getBoundingClientRect();
+              const switchPos = nodeRect ? { x: nodeRect.left, y: nodeRect.bottom + 4 } : { x: 80, y: 60 };
               const safeName = (s: string) => s.toLowerCase().replace(/[^a-z0-9]/g, '-').replace(/-+/g, '-').slice(0, 20);
               const sessName = `mw-forge-${safeName(projectName)}-${safeName(agent.label)}`;
               const workDir = agent.workDir && agent.workDir !== './' && agent.workDir !== '.' ? agent.workDir : undefined;
               const resolveRes = await wsApi(workspaceId, 'open_terminal', { agentId: agent.id, resolveOnly: true }).catch(() => ({})) as any;
-              setTermLaunchDialog({ agent, sessName, workDir, sessions: [], supportsSession: resolveRes?.supportsSession ?? true });
+              setTermLaunchDialog({ agent, sessName, workDir, sessions: [], supportsSession: resolveRes?.supportsSession ?? true, initialPos: switchPos });
             },
           } satisfies AgentNodeData,
         };
@@ -2716,6 +2820,22 @@ function WorkspaceViewInner({ projectPath, projectName, onClose }: {
             nodes={rfNodes}
             edges={rfEdges}
             onNodesChange={onNodesChange}
+            onNodeDragStop={() => {
+              // Reposition terminals to follow their nodes
+              setFloatingTerminals(prev => prev.map(ft => {
+                const nodeEl = document.querySelector(`[data-id="${ft.agentId}"]`);
+                const rect = nodeEl?.getBoundingClientRect();
+                return rect ? { ...ft, initialPos: { x: rect.left, y: rect.bottom + 4 } } : ft;
+              }));
+            }}
+            onMoveEnd={() => {
+              // Reposition after pan/zoom
+              setFloatingTerminals(prev => prev.map(ft => {
+                const nodeEl = document.querySelector(`[data-id="${ft.agentId}"]`);
+                const rect = nodeEl?.getBoundingClientRect();
+                return rect ? { ...ft, initialPos: { x: rect.left, y: rect.bottom + 4 } } : ft;
+              }));
+            }}
             nodeTypes={nodeTypes}
             fitView
             fitViewOptions={{ padding: 0.3 }}
@@ -2826,7 +2946,7 @@ function WorkspaceViewInner({ projectPath, projectName, onClose }: {
                 cliCmd: res.cliCmd || 'claude',
                 cliType: res.cliType || 'claude-code',
                 workDir,
-                sessionName: sessName, resumeMode, resumeSessionId: sessionId, isPrimary: false, skipPermissions: agent.skipPermissions !== false, persistentSession: agent.persistentSession, boundSessionId: sessionId || agent.boundSessionId,
+                sessionName: sessName, resumeMode, resumeSessionId: sessionId, isPrimary: false, skipPermissions: agent.skipPermissions !== false, persistentSession: agent.persistentSession, boundSessionId: sessionId || agent.boundSessionId, initialPos: termLaunchDialog.initialPos,
                 profileEnv: {
                   ...(res.env || {}),
                   ...(res.model ? { CLAUDE_MODEL: res.model } : {}),
@@ -2861,6 +2981,7 @@ function WorkspaceViewInner({ projectPath, projectName, onClose }: {
           skipPermissions={ft.skipPermissions}
           persistentSession={ft.persistentSession}
           boundSessionId={ft.boundSessionId}
+          initialPos={ft.initialPos}
           onSessionReady={(name) => {
             if (workspaceId) wsApi(workspaceId, 'set_tmux_session', { agentId: ft.agentId, sessionName: name });
             setFloatingTerminals(prev => prev.map(t => t.agentId === ft.agentId ? { ...t, tmuxSession: name } : t));

package/lib/agents/index.ts

@@ -27,9 +27,9 @@ export function listAgents(): AgentConfig[] {
 
   // Codex
   const codexConfig = settings.agents?.codex;
-  const codex = detectAgent('codex', 'OpenAI Codex', codexConfig?.path || 'codex');
+  const codex = detectAgent('codex', 'OpenAI Codex', codexConfig?.path || 'codex', ['exec']);
   if (codex) {
-    codex.capabilities.requiresTTY = true;
+    codex.capabilities.requiresTTY = false; // exec subcommand is non-interactive
     agents.push({ ...codex, enabled: codexConfig?.enabled !== false, detected: true, skipPermissionsFlag: codexConfig?.skipPermissionsFlag || '--full-auto', cliType: 'codex' } as any);
   }
 

package/lib/workspace/agent-worker.ts

@@ -444,20 +444,11 @@ export class AgentWorker extends EventEmitter {
       this.state.history.push(msg);
     }
 
-    // Execute using the last step definition as template (or first if no steps)
+    // Execute using step template, or create one from the prompt if no steps defined
     const stepTemplate = this.config.steps[this.config.steps.length - 1] || this.config.steps[0];
-    if (!stepTemplate) {
-      // No steps defined — just log
-      this.state.history.push({
-        type: 'system', subtype: 'daemon',
-        content: `[Daemon] Wake: ${reason.type} — no steps defined to execute`,
-        timestamp: new Date().toISOString(),
-      });
-      return;
-    }
 
     const step = {
-      ...stepTemplate,
+      ...(stepTemplate || { id: '', label: '', prompt: '' }),
       id: `daemon-${this.state.daemonIteration}`,
       label: `Daemon iteration ${this.state.daemonIteration}`,
       prompt,

package/lib/workspace/backends/cli-backend.ts

@@ -91,6 +91,7 @@ function detectArtifacts(parsed: any): Artifact[] {
 export class CliBackend implements AgentBackend {
   private child: ChildProcess | null = null;
   private sessionId: string | undefined;
+  headlessSessionId: string | undefined; // exposed for session file monitoring
   /** Callback to persist sessionId back to agent state */
   onSessionId?: (id: string) => void;
 
@@ -118,6 +119,12 @@ export class CliBackend implements AgentBackend {
     // Note: if no sessionId, each execution starts a new session (no resume).
     // To maintain context, user can enable persistent terminal session per agent.
 
+    // Generate a session ID for headless execution so we can monitor the .jsonl file
+    const isClaude = adapter.config.type === 'claude-code';
+    if (isClaude && !this.sessionId) {
+      this.headlessSessionId = crypto.randomUUID();
+    }
+
     const spawnOpts = adapter.buildTaskSpawn({
       projectPath,
       prompt,
@@ -125,6 +132,7 @@ export class CliBackend implements AgentBackend {
       conversationId: this.sessionId,
       skipPermissions: true,
       outputFormat: adapter.config.capabilities?.supportsStreamJson ? 'stream-json' : undefined,
+      extraFlags: this.headlessSessionId && !this.sessionId ? ['--session-id', this.headlessSessionId] : undefined,
     });
 
     onLog?.({
@@ -148,9 +156,10 @@ export class CliBackend implements AgentBackend {
       };
       delete env.CLAUDECODE;
 
-      // Check if agent needs TTY (same logic as task-manager)
+      // Check if agent needs TTY — use cliType not agentId
+      const cliType = (adapter.config as any).cliType || adapter.config.type;
       const needsTTY = adapter.config.capabilities?.requiresTTY
-        || agentId === 'codex' || (adapter.config as any).base === 'codex';
+        || cliType === 'codex';
 
       if (needsTTY) {
         this.executePTY(spawnOpts, projectPath, env, onLog, abortSignal, resolve, reject);