@aion0/forge 0.5.7 → 0.5.8

package/components/WebTerminal.tsx

@@ -310,11 +310,13 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
   // ─── Imperative handle for parent ─────────────────────
 
   useImperativeHandle(ref, () => ({
-    openSessionInTerminal(sessionId: string, projectPath: string) {
+    async openSessionInTerminal(sessionId: string, projectPath: string) {
       const tree = makeTerminal(undefined, projectPath);
       const paneId = firstTerminalId(tree);
       const sf = skipPermissions ? ' --dangerously-skip-permissions' : '';
-      const cmd = `cd "${projectPath}" && claude --resume ${sessionId}${sf}\n`;
+      let mcpFlag = '';
+      try { const { getMcpFlag } = await import('@/lib/session-utils'); mcpFlag = await getMcpFlag(projectPath); } catch {}
+      const cmd = `cd "${projectPath}" && claude --resume ${sessionId}${sf}${mcpFlag}\n`;
       pendingCommands.set(paneId, cmd);
       const projectName = projectPath.split('/').pop() || 'Terminal';
       const newTab: TabState = {
@@ -334,12 +336,21 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
       const knownClis = ['claude', 'codex', 'aider'];
       const agentCmd = knownClis.includes(agent) ? agent : 'claude';
 
-      // Resume flag from user's choice
+      // Resume flag: explicit sessionId > fixedSession (set async below) > -c
       let resumeFlag = '';
       if (agentCmd === 'claude') {
         if (sessionId) resumeFlag = ` --resume ${sessionId}`;
         else if (resumeMode) resumeFlag = ' -c';
       }
+      // Override with fixedSession if available (async, patched before command is sent)
+      let fixedSessionPending: Promise<void> | null = null;
+      if (agentCmd === 'claude' && !sessionId && projectPath) {
+        fixedSessionPending = import('@/lib/session-utils').then(({ resolveFixedSession }) =>
+          resolveFixedSession(projectPath).then(fixedId => {
+            if (fixedId) resumeFlag = ` --resume ${fixedId}`;
+          })
+        ).catch(() => {});
+      }
 
       // Model flag from profile
       const modelFlag = profileEnv?.CLAUDE_MODEL ? ` --model ${profileEnv.CLAUDE_MODEL}` : '';
@@ -368,6 +379,15 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
         if (skipPermissions && agentCmd === 'claude') sf = ' --dangerously-skip-permissions';
       }
 
+      // Wait for fixedSession resolution before building command
+      if (fixedSessionPending) await fixedSessionPending;
+
+      // MCP + env vars for claude-code agents
+      let mcpFlag = '';
+      if (agentCmd === 'claude' && projectPath) {
+        try { const { getMcpFlag } = await import('@/lib/session-utils'); mcpFlag = await getMcpFlag(projectPath); } catch {}
+      }
+
       let targetTabId: number | null = null;
 
       setTabs(prev => {
@@ -378,7 +398,7 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
         }
         const tree = makeTerminal(undefined, projectPath);
         const paneId = firstTerminalId(tree);
-        pendingCommands.set(paneId, `${envPrefix}cd "${projectPath}" && ${agentCmd}${resumeFlag}${modelFlag}${sf}\n`);
+        pendingCommands.set(paneId, `${envPrefix}cd "${projectPath}" && ${agentCmd}${resumeFlag}${modelFlag}${sf}${mcpFlag}\n`);
         const newTab: TabState = {
           id: nextId++,
           label: projectName,
@@ -898,13 +918,13 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
                                             // Model flag (claude-code only)
                                             const modelFlag = info.supportsSession && profileEnv.CLAUDE_MODEL ? ` --model ${profileEnv.CLAUDE_MODEL}` : '';
 
-                                            // Resume flag (claude-code only)
+                                            // Resume flag: use fixedSession if available, else -c
                                             let resumeFlag = '';
                                             if (info.supportsSession) {
                                               try {
-                                                const sRes = await fetch(`/api/claude-sessions/${encodeURIComponent(p.name)}`);
-                                                const sData = await sRes.json();
-                                                if (Array.isArray(sData) && sData.length > 0) resumeFlag = ' -c';
+                                                const { resolveFixedSession, buildResumeFlag } = await import('@/lib/session-utils');
+                                                const fixedId = await resolveFixedSession(p.path);
+                                                resumeFlag = buildResumeFlag(fixedId, true);
                                               } catch {}
                                             }
 
@@ -917,7 +937,13 @@ const WebTerminal = forwardRef<WebTerminalHandle, WebTerminalProps>(function Web
                                               sf = cfg?.skipPermissionsFlag ? ` ${cfg.skipPermissionsFlag}` : (cliCmd === 'claude' ? ' --dangerously-skip-permissions' : '');
                                             }
 
-                                            cmd = `${envExports}cd "${p.path}" && ${cliCmd}${resumeFlag}${modelFlag}${sf}\n`;
+                                            // MCP + env vars
+                                            let mcpFlag = '';
+                                            if (cliCmd === 'claude') {
+                                              try { const { getMcpFlag } = await import('@/lib/session-utils'); mcpFlag = await getMcpFlag(p.path); } catch {}
+                                            }
+
+                                            cmd = `${envExports}cd "${p.path}" && ${cliCmd}${resumeFlag}${modelFlag}${sf}${mcpFlag}\n`;
                                           } catch {
                                             cmd = `cd "${p.path}" && ${a.id}\n`;
                                           }
@@ -1448,29 +1474,18 @@ const MemoTerminalPane = memo(function TerminalPane({
             // Auto-run claude for project tabs (only if no pendingCommand already set)
             if (isNewlyCreated && projectPathRef.current && !pendingCommands.has(id)) {
               isNewlyCreated = false;
-              // Check if project has existing claude sessions to decide -c flag
               const pp = projectPathRef.current;
-              const pName = pp.replace(/\/+$/, '').split('/').pop() || '';
-              fetch(`/api/claude-sessions/${encodeURIComponent(pName)}`)
-                .then(r => r.json())
-                .then(sData => {
-                  const hasSession = Array.isArray(sData) ? sData.length > 0 : false;
-                  const resumeFlag = hasSession ? ' -c' : '';
-                  const skipFlag = skipPermRef.current ? ' --dangerously-skip-permissions' : '';
-                  setTimeout(() => {
-                    if (!disposed && ws?.readyState === WebSocket.OPEN) {
-                      ws.send(JSON.stringify({ type: 'input', data: `cd "${pp}" && claude${resumeFlag}${skipFlag}\n` }));
-                    }
-                  }, 300);
-                })
-                .catch(() => {
+              import('@/lib/session-utils').then(({ resolveFixedSession, buildResumeFlag, getMcpFlag }) => {
+                Promise.all([resolveFixedSession(pp), getMcpFlag(pp)]).then(([fixedId, mcpFlag]) => {
+                  const resumeFlag = buildResumeFlag(fixedId, true);
                   const skipFlag = skipPermRef.current ? ' --dangerously-skip-permissions' : '';
                   setTimeout(() => {
                     if (!disposed && ws?.readyState === WebSocket.OPEN) {
-                      ws.send(JSON.stringify({ type: 'input', data: `cd "${pp}" && claude${skipFlag}\n` }));
+                      ws.send(JSON.stringify({ type: 'input', data: `cd "${pp}" && claude${resumeFlag}${skipFlag}${mcpFlag}\n` }));
                     }
                   }, 300);
                 });
+              });
             }
             isNewlyCreated = false;
             // Force tmux to redraw by toggling size, then send reset