@aion0/forge 0.5.8 → 0.5.9

package/RELEASE_NOTES.md

@@ -1,134 +1,15 @@
-# Forge v0.5.8
+# Forge v0.5.9
 
 Released: 2026-03-30
 
-## Changes since v0.5.7
+## Changes since v0.5.8
 
 ### Features
-- feat: Restart Session button for persistentSession agents
-- feat: boundSessionId drives non-primary terminal open flow
-- feat: boundSessionId per agent — each agent has its own last session
-- feat: execution mode determined by config, not runtime tmux state
-- feat: /resolve API for workspace lookup + skills use env var → API fallback
-- feat: switch session button (▾) for non-primary agents with active terminal
-- feat: auto-fallback to headless when terminal startup fails
-- feat: Forge agent monitors all inbox states
-- feat: Forge agent — autonomous bus monitor with periodic scanning
-- feat: Forge agent auto-requests summary when agent completes without reply
-- feat: nudge sender when target agent completes — inject hint into terminal
-- feat: restore auto-reply on completion + keep check_outbox as supplement
-- feat: auto-reply to message sender on completion + check_outbox tool
-- feat: add MCP Server to monitor panel and status script
-- feat: get_agents tool + fuzzy send_message matching
-- feat: inject FORGE env vars at all terminal launch points
-- feat: --mcp-config injected at all claude terminal launch points
-- feat: Forge MCP Server — replace HTTP skills with native tool calls
-- feat: open terminal button on session list items
-- feat: detect CLI startup failures in persistent sessions
-- feat: all terminal entry points use fixedSessionId via --resume
-- feat: bind button on sessions list to set fixedSessionId
-- feat: click-to-change session binding in project header
-- feat: show bound session in project header and session list
-- feat: session picker dropdown for fixedSessionId binding
-- feat: session list shows full ID on expand with copy button
-- feat: show and edit fixedSessionId in agent config modal
-- feat: primary agent setup prompt for new and existing workspaces
-- feat: primary agent checkbox in agent config modal
-- feat: terminal dock — inline right panel with tabs and resizable width
-- feat: VibeCoding uses workspace primary agent's fixed session
-- feat: fixed CLI session binding for primary agent
-- feat: primary agent — terminal-only, fixed session, root directory
-- feat: persistent terminal session per agent
-- feat: watch send_message auto-detects tmux sessions (workspace + VibeCoding)
-- feat: watch send_message injects directly into terminal session
+- feat: terminal floats below agent node, follows on drag/zoom
 
 ### Bug Fixes
-- fix: unset profile env vars before setting new ones on agent switch
-- fix: normalize workDir paths before encoding session directory
-- fix: session list uses agent's workDir, not project root
-- fix: clear boundSessionId on agent change even without tmux session
-- fix: kill terminal and clear boundSessionId when agent CLI changes
-- fix: rename "Keep terminal session alive" to "Terminal mode"
-- fix: codex skipPermissionsFlag back to --full-auto
-- fix: codex skip flag + -c only when sessions exist
-- fix: set FORGE env vars as separate tmux command before CLI start
-- fix: set FORGE env vars in tmux, skills use env vars not curl lookup
-- fix: mark forge skills as FALLBACK so MCP tools take priority
-- fix: nudge explicitly says use MCP tool, not forge-send skill
-- fix: skills prefer MCP tools, fix subdirectory workspace lookup
-- fix: show headless after Kill, terminal (pending) only before daemon start
-- fix: Suspend vs Kill terminal behavior
-- fix: Forge agent nudge uses stronger language to trigger send_message
-- fix: always resolve agent launch info before opening terminal
-- fix: bus log updates immediately after message delete (no refresh needed)
-- fix: stop daemon kills tmux sessions + Forge agent only scans new messages
-- fix: enlarge session switch button (▾) for easier clicking
-- fix: terminal button visible during running state (was hidden)
-- fix: daemon persistent session uses -c for non-primary agents
-- fix: restore -c flag for non-primary agents to resume latest session
-- fix: Forge agent processes historical pending/running, skips done/failed
-- fix: Forge agent only scans messages after daemon start, ignores history
-- fix: Forge agent restarts message loop for stuck pending messages
-- fix: add skipPermissions to FloatingTerminalInline (was missing)
-- fix: pass skipPermissions to FloatingTerminal, add --dangerously-skip-permissions
-- fix: block terminal open when daemon not started
-- fix: re-open terminal when agent config changes (close old first)
-- fix: don't use claude -c for workspace agents (subdirs may have no session)
-- fix: MCP monitor shows port not pid, add separator after Tunnel
-- fix: add type:'sse' to MCP config (required by Claude Code schema)
-- fix: MCP server port 7830 → 8406 (follows 8403/8404/8405 sequence)
-- fix: MCP agentId resolved by server, not hardcoded in all URLs
-- fix: MAX_ACTIVE limits daemon start, not workspace loading
-- fix: increase MAX_ACTIVE workspaces from 2 to 5
-- fix: move all session action buttons to second row (right-aligned)
-- fix: skip message loop when persistent session fails to start
-- fix: only primary agent uses fixedSession, others use -c or session dialog
-- fix: refresh fixed session display after bind via window event
-- fix: resolveFixedSession auto-binds latest session when not set
-- fix: add error logging to session bind button for debugging
-- fix: session list uses disk files as source of truth, not stale index
-- fix: bind button always visible, set session when none bound
-- fix: limit fixedSessionId auto-bind to only 3 entry points
-- fix: show bind button even when no session is bound yet
-- fix: auto-bind fixedSessionId at Next.js API layer
-- fix: ensure primary session binding at all entry points
-- fix: auto-bind fixedSessionId on agent add and config update
-- fix: show terminal (pending) for persistentSession agents without tmux yet
-- fix: replace nested button with div+span in terminal dock tabs
-- fix: don't auto-open terminal UI on workspace load
-- fix: session binding edge cases
-- fix: auto-bind latest CLI session on upgrade instead of creating new
-- fix: persistent session starts claude with -c (resume last session)
-- fix: verify stored tmuxSession is alive before using, fallback to find
-- fix: findTmuxSession reads terminal-state.json for VibeCoding sessions
-- fix: session watch detects file switch (new session created)
-- fix: getAllAgentStates preserves tmuxSession + currentMessageId
-- fix: persistent session emits state update so frontend knows tmuxSession
-- fix: watch send_message sends configured prompt only + auto-Enter
-- fix: open terminal attaches to existing tmux session regardless of mode
-- fix: session watch only sends last matching entry, not all content
-- fix: remove .js extension from dynamic import for Next.js compat
-- fix: workspace terminal defaults to resume last session (-c)
-- fix: updateAgentConfig rebuilds worker + emits status update
-- fix: CLI backend auto-finds latest session when no sessionId
+- fix: revise dedup to not block legitimate messages
+- fix: reduce duplicate messages in workspace agent communication
 
-### Performance
-- perf: cache session binding check, defer SessionView loading
 
-### Refactoring
-- refactor: MCP context via URL params, remove FORGE env var injection
-- refactor: fixedSessionId is project-level, not workspace/agent-level
-- refactor: remove manual/auto mode, unify message execution via tmuxSession
-
-### Documentation
-- revert auto-resume + document persistent terminal session plan
-
-### Other
-- revert: remove orchestrator auto-reply, let agent decide via MCP
-- cleanup: remove fixedSessionId from agent config and workspace state
-- simplify: remove auto-detect session binding complexity
-- revert: restore floating terminal windows, remove dock panel
-- revert auto-resume + document persistent terminal session plan
-
-
-**Full Changelog**: https://github.com/aiwatching/forge/compare/v0.5.7...v0.5.8
+**Full Changelog**: https://github.com/aiwatching/forge/compare/v0.5.8...v0.5.9

package/components/WorkspaceView.tsx

@@ -1779,7 +1779,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 +1796,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 +1827,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 +1837,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
@@ -1956,6 +1970,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 +2128,8 @@ interface AgentNodeData {
   state: AgentState;
   colorIdx: number;
   previewLines: string[];
+  projectPath: string;
+  workspaceId: string | null;
   onRun: () => void;
   onPause: () => void;
   onStop: () => void;
@@ -2131,8 +2148,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 +2161,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"
@@ -2242,7 +2262,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 +2308,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 +2388,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 });
             },
@@ -2394,6 +2417,13 @@ function WorkspaceViewInner({ projectPath, projectName, onClose }: {
               // 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 +2451,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 +2463,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 +2476,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 +2747,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 +2873,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 +2908,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/workspace/orchestrator.ts

@@ -1171,10 +1171,14 @@ export class WorkspaceOrchestrator extends EventEmitter {
       if (msg.type === 'ack' || msg.from === '_forge') continue;
       if (this.forgeActedMessages.has(msg.id)) continue;
 
-      // Case 1: Message done but no reply from target → ask target to send summary
+      // Case 1: Message done but no reply from target → ask target to send summary (once per pair)
       if (msg.status === 'done') {
         const age = now - msg.timestamp;
-        if (age < 30_000) continue; // give 30s grace period
+        if (age < 30_000) continue;
+
+        // Dedup by target→sender pair (only nudge once per relationship)
+        const nudgeKey = `nudge-${msg.to}->${msg.from}`;
+        if (this.forgeActedMessages.has(nudgeKey)) { this.forgeActedMessages.add(msg.id); continue; }
 
         const hasReply = log.some(r =>
           r.from === msg.to && r.to === msg.from &&
@@ -1189,7 +1193,8 @@ export class WorkspaceOrchestrator extends EventEmitter {
               content: `[IMPORTANT] You finished a task requested by ${senderLabel} but did not send them the results. You MUST call the MCP tool "send_message" (NOT the forge-send skill) with to="${senderLabel}" and include a summary of what you did and the outcome. Do not do any other work until you have sent this reply.`,
             });
             this.forgeActedMessages.add(msg.id);
-            console.log(`[forge-agent] Nudged ${targetEntry.config.label} to reply to ${senderLabel}`);
+            this.forgeActedMessages.add(nudgeKey);
+            console.log(`[forge-agent] Nudged ${targetEntry.config.label} to reply to ${senderLabel} (once)`);
           }
         }
       }
@@ -1755,13 +1760,25 @@ export class WorkspaceOrchestrator extends EventEmitter {
       ? `${completedLabel} completed: ${files.length} files changed. ${summary.slice(0, 200)}`
       : `${completedLabel} completed. ${summary.slice(0, 300) || 'Check upstream outputs for updates.'}`;
 
-    // Find all downstream agents that depend on this one
+    // Find all downstream agents — skip if already sent upstream_complete recently (60s)
+    const now = Date.now();
     let sent = 0;
     for (const [id, entry] of this.agents) {
       if (id === completedAgentId) continue;
       if (entry.config.type === 'input') continue;
       if (!entry.config.dependsOn.includes(completedAgentId)) continue;
 
+      // Dedup: skip if upstream_complete was sent to this target within last 60s
+      const recentDup = this.bus.getLog().some(m =>
+        m.from === completedAgentId && m.to === id &&
+        m.payload?.action === 'upstream_complete' &&
+        now - m.timestamp < 60_000
+      );
+      if (recentDup) {
+        console.log(`[bus] ${completedLabel} → ${entry.config.label}: upstream_complete skipped (sent <60s ago)`);
+        continue;
+      }
+
       this.bus.send(completedAgentId, id, 'notify', {
         action: 'upstream_complete',
         content,
@@ -2209,8 +2226,23 @@ export class WorkspaceOrchestrator extends EventEmitter {
       // requiresApproval is handled at message arrival time (routeMessageToAgent),
       // not in the message loop. Approved messages come through as normal 'pending'.
 
+      // Dedup: if multiple upstream_complete from same sender are pending, keep only latest
+      const allRaw = this.bus.getPendingMessagesFor(agentId).filter(m => m.from !== agentId && m.type !== 'ack');
+      const upstreamSeen = new Set<string>();
+      for (let i = allRaw.length - 1; i >= 0; i--) {
+        const m = allRaw[i];
+        if (m.payload?.action === 'upstream_complete') {
+          const key = `upstream-${m.from}`;
+          if (upstreamSeen.has(key)) {
+            m.status = 'done' as any;
+            this.emit('event', { type: 'bus_message_status', messageId: m.id, status: 'done' } as any);
+          }
+          upstreamSeen.add(key);
+        }
+      }
+
       // Find next pending message, applying causedBy rules
-      const allPending = this.bus.getPendingMessagesFor(agentId).filter(m => m.from !== agentId && m.type !== 'ack');
+      const allPending = allRaw.filter(m => m.status === 'pending');
       const pending = allPending.filter(m => {
         // Tickets: accepted but check retry limit
         if (m.category === 'ticket') {

package/next-env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/dev/types/routes.d.ts";
+import "./.next/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aion0/forge",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "description": "Unified AI workflow platform — multi-model task orchestration, persistent sessions, web terminal, remote access",
   "type": "module",
   "scripts": {

package/qa/.forge/mcp.json

@@ -0,0 +1,8 @@
+{
+  "mcpServers": {
+    "forge": {
+      "type": "sse",
+      "url": "http://localhost:8406/sse?workspaceId=656c9e65-9d73-4cb6-a065-60d966e1fc78&agentId=qa-1774920510930"
+    }
+  }
+}