@molecule/app-ide-react 3.0.3 → 3.1.0

package/dist/components/ChatPanel.js

@@ -51,7 +51,7 @@ import { ShareModal } from './ShareModal.js';
 import { SkillsCard } from './SkillsCard.js';
 import { StreamingIndicator } from './StreamingIndicator.js';
 import { getTestsBarVisible, parseTestsBarArg, setTestsBarVisible, shouldShowTestsBar, } from './tests-bar-utilities.js';
-import { applyTestRunEvent, buildTestFixMessage, EMPTY_RUN_STATE, failRun, markSkipUnavailable, parseTestCommand, requestSkip, } from './tests-card-utilities.js';
+import { applyTestRunEvent, buildTestFixMessage, EMPTY_RUN_STATE, failRun, markSkipUnavailable, parseTestCommand, requestSkip, TestRunProjection, } from './tests-card-utilities.js';
 import { TestsCard } from './TestsCard.js';
 import { TestStatusBar } from './TestStatusBar.js';
 import { TipCard } from './TipCard.js';
@@ -650,7 +650,7 @@ function CollapsibleUserMessage({ content, isLight, }) {
  * @param props - Component props (see {@link MessageItemProps}).
  * @returns The rendered verification badge element.
  */
-function VerificationBadge({ status, output, categories, }) {
+function VerificationBadge({ status, output, categories, renderCheckUnavailable, }) {
     const cm = getClassMap();
     const [expanded, setExpanded] = useState(false);
     if (status === 'ok') {
@@ -660,7 +660,9 @@ function VerificationBadge({ status, output, categories, }) {
                 gap: '6px',
                 padding: '3px 0',
                 fontSize: '13px',
-            }, className: cm.textMuted, children: [_jsx("svg", { width: "10", height: "10", viewBox: "0 0 10 10", style: { flexShrink: 0, alignSelf: 'center', position: 'relative', top: '-1px' }, children: _jsx("path", { d: "M2 5.5 L4.2 7.8 L8 3", fill: "none", stroke: "#3fb950", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" }) }), _jsx("span", { children: t('ide.chat.verificationPassed', undefined, { defaultValue: 'Checks passed' }) })] }));
+            }, className: cm.textMuted, children: [_jsx("svg", { width: "10", height: "10", viewBox: "0 0 10 10", style: { flexShrink: 0, alignSelf: 'center', position: 'relative', top: '-1px' }, children: _jsx("path", { d: "M2 5.5 L4.2 7.8 L8 3", fill: "none", stroke: "#3fb950", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" }) }), _jsxs("span", { children: [t('ide.chat.verificationPassed', undefined, { defaultValue: 'Checks passed' }), renderCheckUnavailable && (_jsxs("span", { "data-mol-id": "render-check-unavailable", className: cm.textWarning, children: [' · ', t('ide.chat.renderCheckUnavailable', undefined, {
+                                    defaultValue: 'Render check unavailable',
+                                })] }))] })] }));
     }
     // Count errors from the output text
     const cats = categories ?? [];
@@ -1212,7 +1214,7 @@ const MessageItem = memo(function MessageItem(props) {
                     }
                     if (blockType === 'verification') {
                         const vBlock = block;
-                        return (_jsx(VerificationBadge, { status: vBlock.status, output: vBlock.output, workspaces: vBlock.workspaces, categories: vBlock.categories }, `verification-${bi}`));
+                        return (_jsx(VerificationBadge, { status: vBlock.status, output: vBlock.output, workspaces: vBlock.workspaces, categories: vBlock.categories, renderCheckUnavailable: vBlock.renderCheckUnavailable }, `verification-${bi}`));
                     }
                     if (blockType === 'resource_limit') {
                         const rlBlock = block;
@@ -1321,12 +1323,24 @@ const MessageItem = memo(function MessageItem(props) {
                                             }, children: String.fromCharCode(65 + i) }), _jsx("span", { children: opt.label })] }, i)))] }));
                     })()] })) }));
 });
+/** Only COMPLETED own ids are bounded; active own ids are pinned separately. */
+const COMPLETED_OWN_TEST_RUN_ID_LIMIT = 32;
+/** Remember a completed own run for its delayed feed copy. */
+function rememberCompletedOwnTestRunId(ids, runId) {
+    ids.delete(runId);
+    ids.add(runId);
+    if (ids.size <= COMPLETED_OWN_TEST_RUN_ID_LIMIT)
+        return;
+    const oldest = ids.values().next();
+    if (!oldest.done)
+        ids.delete(oldest.value);
+}
 /**
  * Inner chat component that owns useChat state, message rendering, and input handling.
  * @param props - Component props (see {@link MessageItemProps}).
  * @returns The rendered chat inner component.
  */
-function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent, isPro, isAnonymous, canEdit, canSendTeamMessages = true, canShare, shareLinksAllowed, shareLinksRefreshSignal, shareModalContent, buildUpgradeCta, buildHelpUpgradeSection, activeFile, openTabs, onFileOpen, onFileDoubleClick, onFileDiff, onFileRevert, onFileChange, onFileDeleted, onCommit, onConversationId, onActivityClick, onRenderError, onProfileClick, currentUserId, onReadyToBuild, awaitingSandboxBoot, onClientAction, onTurnComplete, onLoadingChange, onNavigatePreview, onRegisterPushHandler, onRegisterHistoryReconcile, autoSubmitSignal, openSettingsSignal, onManageCustomModels, modelSelectionSignal, openReportSignal, openShareSignal, initialInputValue, pendingMessage, pendingMessageKey, pendingMessageSuppressUser, pendingMessageUserInitiated, userEditedFile, userEditedFileKey, gitStatusTick: externalGitStatusTick, discovery, userAvatar, agentName = DEFAULT_AGENT_NAME, productName = DEFAULT_PRODUCT_NAME, version, extraCommands, listTests, runTests, canRunTests, testsAvailable, skipToolCall,
+function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent, isPro, isAnonymous, canEdit, canSendTeamMessages = true, canShare, shareLinksAllowed, shareLinksRefreshSignal, shareModalContent, buildUpgradeCta, buildHelpUpgradeSection, activeFile, openTabs, onFileOpen, onFileDoubleClick, onFileDiff, onFileRevert, onFileChange, onFileDeleted, onCommit, onConversationId, onActivityClick, onRenderError, onProfileClick, currentUserId, onReadyToBuild, awaitingSandboxBoot, onClientAction, onTurnComplete, onLoadingChange, onNavigatePreview, onRegisterPushHandler, onRegisterHistoryReconcile, autoSubmitSignal, openSettingsSignal, onManageCustomModels, modelSelectionSignal, openReportSignal, openShareSignal, initialInputValue, pendingMessage, pendingMessageKey, pendingMessageSuppressUser, pendingMessageUserInitiated, userEditedFile, userEditedFileKey, gitStatusTick: externalGitStatusTick, discovery, userAvatar, agentName = DEFAULT_AGENT_NAME, productName = DEFAULT_PRODUCT_NAME, version, extraCommands, listTests, runTests, watchTestRuns, canRunTests, testsAvailable, skipToolCall,
 // feedbackUrl: prop kept for back-compat (callers still pass it), but no longer
 // consumed here — its only use was the command-menu footer link removed in P3-21.
  }) {
@@ -2753,13 +2767,48 @@ function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent,
     const [testsList, setTestsList] = useState([]);
     const [testsStatus, setTestsStatus] = useState('loading');
     const [testsRun, setTestsRun] = useState(EMPTY_RUN_STATE);
-    const testsRunHandleRef = useRef(null);
+    // Each callback closes over its own folded run. Only this invocation owns
+    // controls; stopped/completed invocations can still report trailing verdicts.
+    const ownTestRunRef = useRef(null);
     // Live "is a run in flight?" for the dispatchers, so `startTestsRun` keeps a
     // stable identity — the command callbacks that hold it carry hand-written
     // dependency lists, and a value that changes every run transition is one they
     // would eventually capture stale.
     const testsRunningRef = useRef(false);
     testsRunningRef.current = testsRun.running;
+    // One incremental projection: per-file verdicts plus bounded live/latest run state. Server ids
+    // dedupe the direct stream and feed echo; legacy id-less custom hosts use the bounded id guard.
+    const testRunProjectionRef = useRef(null);
+    if (!testRunProjectionRef.current)
+        testRunProjectionRef.current = new TestRunProjection();
+    const activeOwnTestRunIdsRef = useRef(new Set());
+    const completedOwnTestRunIdsRef = useRef(new Set());
+    const projectTestsRun = useCallback(() => {
+        const invocation = ownTestRunRef.current;
+        if (invocation && invocation.state.runId == null) {
+            setTestsRun(invocation.state);
+            return;
+        }
+        const activeOwnRunId = invocation?.state.runId ?? null;
+        const next = testRunProjectionRef.current.show(activeOwnRunId);
+        setTestsRun(invocation && next.runId === invocation.state.runId
+            ? {
+                ...next,
+                skipPending: invocation.state.skipPending,
+                skipUnavailable: invocation.state.skipUnavailable,
+            }
+            : next);
+    }, []);
+    const recordOwnTestRunEvent = useCallback((event) => {
+        const legacy = !event.eventId;
+        if (legacy) {
+            if (ownTestRunRef.current?.state.runId === event.runId)
+                activeOwnTestRunIdsRef.current.add(event.runId);
+            else
+                rememberCompletedOwnTestRunId(completedOwnTestRunIdsRef.current, event.runId);
+        }
+        testRunProjectionRef.current.apply(event, ownTestRunRef.current?.state.runId ?? null);
+    }, []);
     // Whether a TURN is in flight — a fix is a real message, so it waits its turn.
     const testsBusyRef = useRef(false);
     // Live for the async callbacks, so a list resolving after an unmount, or a
@@ -2771,7 +2820,9 @@ function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent,
         testsMountedRef.current = true;
         return () => {
             testsMountedRef.current = false;
-            testsRunHandleRef.current?.cancel();
+            const own = ownTestRunRef.current;
+            ownTestRunRef.current = null;
+            own?.handle?.cancel();
         };
     }, []);
     const refreshTests = useCallback(async () => {
@@ -2807,52 +2858,121 @@ function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent,
             return;
         if (canRunTests === false || canEdit === false)
             return;
-        if (testsAvailable === false || testsRunningRef.current)
+        if (testsAvailable === false || testsRunningRef.current || ownTestRunRef.current)
             return;
         if (selection.ids?.length === 0)
             return;
         // Seed a running state immediately: the host's `start` event may be a
         // round trip away, and a Run button that appears to do nothing is the
         // failure this feature exists to remove.
-        setTestsRun((prev) => ({
-            ...prev,
+        const initial = {
+            ...EMPTY_RUN_STATE,
             running: true,
-            outcome: null,
-            error: null,
-            output: [],
-            currentId: null,
-            queued: selection.ids ?? [],
+            queued: [...(selection.ids ?? [])],
             startedAt: Date.now(),
-            durationMs: null,
-        }));
+            external: false,
+        };
+        const invocation = {
+            state: initial,
+            handle: null,
+            ended: null,
+        };
+        ownTestRunRef.current = invocation;
+        setTestsRun((prev) => {
+            const results = { ...prev.results };
+            for (const id of initial.queued)
+                delete results[id];
+            return { ...initial, results };
+        });
         try {
             const handle = runTests(selection, (event) => {
                 if (!testsMountedRef.current)
                     return;
-                setTestsRun((prev) => applyTestRunEvent(prev, event));
+                const current = ownTestRunRef.current === invocation;
+                const ended = invocation.ended;
+                invocation.state = applyTestRunEvent(invocation.state, event);
+                const runId = invocation.state.runId;
+                // Completion owns cleanup even when no start ever supplied an id. Otherwise one failed
+                // start leaves this invocation occupied and every later Run click returns early.
                 if (event.type === 'done') {
-                    testsRunHandleRef.current = null;
-                    // A run cannot create a test, but it CAN finish after the agent wrote
-                    // one — re-list once it settles so the card is current.
+                    invocation.ended = event;
+                    if (current)
+                        ownTestRunRef.current = null;
                     void refreshTests();
                 }
+                if (runId == null) {
+                    if (current)
+                        setTestsRun(invocation.state);
+                    return;
+                }
+                if (event.type === 'start') {
+                    recordOwnTestRunEvent(event);
+                    if (ended) {
+                        // A start delayed past cancellation is history, never a live own run.
+                        invocation.state = applyTestRunEvent(invocation.state, ended);
+                        recordOwnTestRunEvent({ ...ended, runId });
+                    }
+                }
+                else {
+                    recordOwnTestRunEvent({ ...event, runId });
+                }
+                if (event.type === 'done' && !event.eventId) {
+                    activeOwnTestRunIdsRef.current.delete(runId);
+                    rememberCompletedOwnTestRunId(completedOwnTestRunIdsRef.current, runId);
+                }
+                projectTestsRun();
             });
-            testsRunHandleRef.current = handle;
+            // The host is allowed to finish synchronously, before returning its
+            // handle. It no longer owns controls after handing the card onward.
+            if (ownTestRunRef.current !== invocation)
+                return;
+            invocation.handle = handle;
             // Whether a Skip control belongs on screen is decided HERE, by whether
             // this host's handle serves one — not by the card guessing, and not by
             // a button that would do nothing when clicked.
             const skips = typeof handle.skipCurrent === 'function';
+            invocation.state = {
+                ...invocation.state,
+                skipPending: false,
+                skipUnavailable: !skips,
+            };
             setTestsRun((prev) => ({ ...prev, skipPending: false, skipUnavailable: !skips }));
         }
         catch (error) {
             logger.warn('Failed to start a test run', { error });
-            setTestsRun((prev) => failRun(prev, error instanceof Error
+            if (ownTestRunRef.current !== invocation)
+                return;
+            ownTestRunRef.current = null;
+            const message = error instanceof Error
                 ? error.message
                 : t('ide.tests.runError', undefined, {
                     defaultValue: 'The test run could not start.',
-                })));
+                });
+            const runId = invocation.state.runId;
+            if (runId != null) {
+                const done = { type: 'done', outcome: 'error', error: message };
+                invocation.ended = done;
+                invocation.state = applyTestRunEvent(invocation.state, done);
+                activeOwnTestRunIdsRef.current.delete(runId);
+                recordOwnTestRunEvent({ ...done, runId });
+                projectTestsRun();
+            }
+            else if (testRunProjectionRef.current.show().running) {
+                projectTestsRun();
+            }
+            else {
+                setTestsRun((prev) => failRun(prev, message));
+            }
         }
-    }, [runTests, canRunTests, canEdit, testsAvailable, refreshTests]);
+    }, [
+        runTests,
+        canRunTests,
+        canEdit,
+        testsAvailable,
+        refreshTests,
+        projectTestsRun,
+        recordOwnTestRunEvent,
+    ]);
     // Hand the failing tests to the agent as ONE ordinary user message — the same
     // move as the editor’s "Fix with AI" and the auto-fix loop: compose the
     // problem, send it through the normal path, let the turn answer. The overlay
@@ -2869,18 +2989,70 @@ function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent,
         sendMessageRef.current(message);
     }, [canEdit]);
     const cancelTestsRun = useCallback(() => {
-        testsRunHandleRef.current?.cancel();
-        testsRunHandleRef.current = null;
-        setTestsRun((prev) => ({
-            ...prev,
-            running: false,
-            currentId: null,
-            cases: {},
-            skipPending: false,
-            skipUnavailable: true,
-            outcome: 'cancelled',
-        }));
-    }, []);
+        // Only this panel's own run can be stopped from here; the controls are not
+        // offered on a run it is only watching.
+        const invocation = ownTestRunRef.current;
+        if (!invocation)
+            return;
+        // Relinquish ownership before cancel(), which may synchronously call back.
+        ownTestRunRef.current = null;
+        const done = { type: 'done', outcome: 'cancelled' };
+        invocation.ended = done;
+        invocation.state = applyTestRunEvent(invocation.state, done);
+        const runId = invocation.state.runId;
+        if (runId != null) {
+            activeOwnTestRunIdsRef.current.delete(runId);
+            recordOwnTestRunEvent({ ...done, runId });
+            projectTestsRun();
+        }
+        else {
+            setTestsRun({ ...invocation.state, skipUnavailable: true });
+        }
+        invocation.handle?.cancel();
+    }, [projectTestsRun, recordOwnTestRunEvent]);
+    // Every run in the project, however it was started, reaches the same bar and
+    // browser: the host replays the runs it still holds, then streams new ones.
+    // The ref keeps the subscription from restarting (and replaying) each time
+    // `refreshTests` changes identity.
+    const refreshTestsRef = useRef(refreshTests);
+    refreshTestsRef.current = refreshTests;
+    useEffect(() => {
+        if (!watchTestRuns)
+            return;
+        let relist = null;
+        let unsubscribe = null;
+        try {
+            unsubscribe = watchTestRuns((event) => {
+                if (!testsMountedRef.current)
+                    return;
+                // Only id-less legacy hosts need run-id suppression. Ordered copies dedupe by event id.
+                if (!event.eventId &&
+                    (activeOwnTestRunIdsRef.current.has(event.runId) ||
+                        completedOwnTestRunIdsRef.current.has(event.runId))) {
+                    return;
+                }
+                testRunProjectionRef.current.apply(event, ownTestRunRef.current?.state.runId ?? null);
+                projectTestsRun();
+                if (event.type === 'done') {
+                    if (relist)
+                        clearTimeout(relist);
+                    relist = setTimeout(() => {
+                        relist = null;
+                        void refreshTestsRef.current();
+                    }, 500);
+                }
+            });
+            projectTestsRun();
+        }
+        catch (error) {
+            logger.warn('Failed to watch the project test runs', { error });
+        }
+        return () => {
+            if (relist)
+                clearTimeout(relist);
+            unsubscribe?.();
+        };
+    }, [watchTestRuns, projectTestsRun]);
     // Skip the executor's in-flight tool call WITHOUT ending the turn — the
     // model is told the command did not run and carries on. The card owns its own
     // pressed state, so this just forwards the host's answer: `false` means the
@@ -2905,23 +3077,33 @@ function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent,
     const skipCurrentTest = useCallback(() => {
         if (canEdit === false || canRunTests === false)
             return;
-        const skip = testsRunHandleRef.current?.skipCurrent;
+        const invocation = ownTestRunRef.current;
+        if (!invocation)
+            return;
+        const skip = invocation.handle?.skipCurrent;
         if (!skip) {
+            invocation.state = markSkipUnavailable(invocation.state);
             setTestsRun((prev) => markSkipUnavailable(prev));
             return;
         }
+        invocation.state = requestSkip(invocation.state);
         setTestsRun((prev) => requestSkip(prev));
         const unavailable = () => {
-            if (testsMountedRef.current)
+            if (testsMountedRef.current && ownTestRunRef.current === invocation) {
+                invocation.state = markSkipUnavailable(invocation.state);
                 setTestsRun((prev) => markSkipUnavailable(prev));
+            }
         };
         try {
-            const outcome = skip.call(testsRunHandleRef.current);
+            const outcome = skip.call(invocation.handle);
             if (outcome) {
                 void outcome.then((accepted) => {
                     if (accepted === false)
                         unavailable();
-                }, unavailable);
+                }, (error) => {
+                    logger.warn('Failed to skip the running test', { error });
+                    unavailable();
+                });
             }
         }
         catch (error) {
@@ -3329,11 +3511,31 @@ function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent,
     // ── Git status ─────────────────────────────────────────────────────────────
     const [gitStatusTick, setGitStatusTick] = useState(0);
     const refreshGitStatus = useCallback(() => setGitStatusTick((n) => n + 1), []);
+    const gitScopeRef = useRef(0);
+    useLayoutEffect(() => {
+        gitScopeRef.current++;
+        setPendingFiles(null);
+        setCommitState(null);
+        setCommitCards([]);
+        setCommitBarExpanded(false);
+        return () => {
+            gitScopeRef.current++;
+        };
+    }, [projectId]);
+    const gitStatusRequestRef = useRef(0);
     const fetchPendingFiles = useCallback(() => {
-        http
+        const scope = gitScopeRef.current;
+        const request = ++gitStatusRequestRef.current;
+        return http
             .get(`/projects/${projectId}/git-status`)
-            .then((res) => setPendingFiles(res.data.files.length > 0 ? res.data.files : null))
-            .catch(() => setPendingFiles(null));
+            .then((res) => {
+            if (scope === gitScopeRef.current && request === gitStatusRequestRef.current)
+                setPendingFiles(res.data.files.length > 0 ? res.data.files : null);
+        })
+            .catch(() => {
+            if (scope === gitScopeRef.current && request === gitStatusRequestRef.current)
+                setPendingFiles(null);
+        });
     }, [http, projectId]);
     // Debounced version — coalesces rapid ticks (e.g. save → format, or an AI
     // write burst mid-turn) into a single fetch after the last write settles.
@@ -3362,6 +3564,25 @@ function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent,
             return;
         debouncedFetchPendingFiles();
     }, [externalGitStatusTick, debouncedFetchPendingFiles]);
+    // Startup repairs, another editor, or another client can commit without a
+    // local file event. Reconcile on return and while the workspace is visible.
+    useEffect(() => {
+        const refresh = () => {
+            if (document.visibilityState !== 'hidden')
+                void fetchPendingFiles();
+        };
+        window.addEventListener('focus', refresh);
+        document.addEventListener('visibilitychange', refresh);
+        const interval = setInterval(refresh, 45_000);
+        return () => {
+            window.removeEventListener('focus', refresh);
+            document.removeEventListener('visibilitychange', refresh);
+            clearInterval(interval);
+            if (gitFetchTimerRef.current)
+                clearTimeout(gitFetchTimerRef.current);
+            gitStatusRequestRef.current++;
+        };
+    }, [fetchPendingFiles]);
     // A user-side file mutation (edit/rename/delete) also restarts the auto-commit
     // countdown — the parent's externalGitStatusTick is the canonical "files moved"
     // signal. Skipped on the initial 0 so opening a project doesn't arm anything.
@@ -3604,6 +3825,9 @@ function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent,
     }, [userEditedFile, userEditedFileKey, clearQueuedForFile]);
     // ── Commit ─────────────────────────────────────────────────────────────────
     const handleCommit = useCallback(async () => {
+        const scope = gitScopeRef.current;
+        // An older status response must not restore a pre-commit count.
+        gitStatusRequestRef.current++;
         setCommitState({ status: 'committing' });
         const cardId = `commit-${Date.now()}`;
         setCommitCards((prev) => [
@@ -3611,8 +3835,11 @@ function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent,
             { id: cardId, message: '', files: [], timestamp: Date.now(), status: 'running' },
         ]);
         try {
-            const result = await http.post(`/projects/${projectId}/commit`, {});
+            const result = await http.post(`/projects/${projectId}/commit`);
+            if (scope !== gitScopeRef.current)
+                return;
             if (result.data.committed) {
+                gitStatusRequestRef.current++;
                 const msg = result.data.message ?? t('ide.chat.committed');
                 setCommitState({ status: 'committed', message: msg });
                 setPendingFiles(null);
@@ -3627,14 +3854,28 @@ function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent,
                     }
                     : c));
                 onCommit?.();
-                setTimeout(() => setCommitState(null), 3000);
+                setTimeout(() => {
+                    if (scope === gitScopeRef.current)
+                        setCommitState(null);
+                }, 3000);
             }
             else {
                 setCommitCards((prev) => prev.filter((c) => c.id !== cardId));
                 setCommitState(null);
+                addSystemCard(result.data.message === 'No changes to commit'
+                    ? t('ide.chat.commitNoChanges', undefined, { defaultValue: 'No changes to commit.' })
+                    : result.data.message === 'A build is in progress'
+                        ? t('ide.chat.commitBuildInProgress', undefined, {
+                            defaultValue: 'Wait for the build to finish before creating a Git commit.',
+                        })
+                        : t('ide.chat.commitError', undefined, { defaultValue: 'Failed to commit changes.' }));
+                void fetchPendingFiles();
+                onCommit?.();
             }
         }
         catch (error) {
+            if (scope !== gitScopeRef.current)
+                return;
             logger.warn('Commit request failed', { error });
             setCommitCards((prev) => prev.map((c) => c.id === cardId
                 ? {
@@ -3644,9 +3885,12 @@ function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent,
                 }
                 : c));
             setCommitState({ status: 'error' });
-            setTimeout(() => setCommitState(null), 3000);
+            setTimeout(() => {
+                if (scope === gitScopeRef.current)
+                    setCommitState(null);
+            }, 3000);
         }
-    }, [http, projectId, onCommit]);
+    }, [http, projectId, onCommit, addSystemCard, fetchPendingFiles, t]);
     // ── Revert commit ────────────────────────────────────────────────────────
     /** Reverts a commit by hash. Returns the new revert commit's hash on success. */
     const handleRevertCommit = useCallback(async (hash) => {
@@ -4503,32 +4747,7 @@ function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent,
         }
         else if (id === 'commit') {
             setInputValue('');
-            try {
-                const status = await http.get(`/projects/${projectId}/git-status`);
-                if (!status.data.files.length) {
-                    addSystemCard(t('ide.chat.commitNoChanges', undefined, { defaultValue: 'No changes to commit.' }));
-                    return;
-                }
-                const res = await http.post(`/projects/${projectId}/commit`);
-                if (res.data.committed) {
-                    setCommitCards((prev) => [
-                        ...prev,
-                        {
-                            id: crypto.randomUUID(),
-                            message: res.data.message ?? '',
-                            files: res.data.files ?? [],
-                            timestamp: Date.now(),
-                            status: 'done',
-                            hash: res.data.hash,
-                        },
-                    ]);
-                    refreshGitStatus();
-                }
-            }
-            catch (error) {
-                logger.warn('Failed to commit changes via /commit command', { error });
-                addSystemCard(t('ide.chat.commitError', undefined, { defaultValue: 'Failed to commit changes.' }));
-            }
+            await handleCommit();
         }
         else if (id === 'test') {
             setInputValue('');
@@ -4653,6 +4872,7 @@ function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent,
         messages,
         sendMessage,
         refreshGitStatus,
+        handleCommit,
         openPanelOverlay,
         extraCommandIds,
         canEdit,
@@ -6174,7 +6394,7 @@ function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent,
                                     return (_jsx(ScriptsCard, { projectId: projectId, initialQuery: item.card.query ?? '', isLight: isLight, agentName: agentName }, item.card.id));
                                 }
                                 if (item.card.variant === 'tests') {
-                                    return (_jsx(TestsCard, { tests: testsList, status: testsStatus, run: testsRun, initialQuery: item.card.query ?? '', canRun: (canRunTests ?? canEdit !== false) && canEdit !== false, onRun: startTestsRun, onCancel: cancelTestsRun, onSkipCurrent: skipCurrentTest, onFix: fixTests, fixDisabledReason: canEdit === false
+                                    return (_jsx(TestsCard, { tests: testsList, status: testsStatus, run: testsRun, agentName: agentName, initialQuery: item.card.query ?? '', canRun: (canRunTests ?? canEdit !== false) && canEdit !== false, onRun: startTestsRun, onCancel: cancelTestsRun, onSkipCurrent: skipCurrentTest, onFix: fixTests, fixDisabledReason: canEdit === false
                                             ? t('ide.tests.viewerCannotRun', undefined, {
                                                 defaultValue: 'Only editors can run this project’s tests.',
                                             })
@@ -7431,7 +7651,7 @@ function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent,
                                                     minHeight: 36,
                                                 }
                                                 : {}),
-                                        }, children: '✕' })] }), _jsxs("div", { style: { overflowY: 'auto', flex: 1 }, children: [panelOverlay === 'settings' && (_jsx(SettingsCard, { settings: computeSettingsList(), onRunCommand: (commandId) => void executeCommand(commandId), onPrefillInput: (input) => setInputAndCursorEnd(`${input} `), isLight: isLight, agentName: agentName, embedded: true })), panelOverlay === 'skills' && (_jsx(SkillsCard, { projectId: projectId, initialQuery: panelOverlayQuery, onLoad: loadSkill, onCreate: createSkill, loadedSkillPaths: loadedSkillPaths, defaultSkillPaths: defaultSkillPaths, onToggleDefault: toggleDefaultSkill, onResetDefault: resetDefaultSkills, defaultsExplicit: defaultSkillsExplicitRef.current, isLight: isLight, embedded: true })), panelOverlay === 'scripts' && (_jsx(ScriptsCard, { projectId: projectId, initialQuery: panelOverlayQuery, isLight: isLight, agentName: agentName, embedded: true })), panelOverlay === 'tests' && (_jsx(TestsCard, { tests: testsList, status: testsStatus, run: testsRun, initialQuery: panelOverlayQuery, canRun: (canRunTests ?? canEdit !== false) && canEdit !== false, onRun: startTestsRun, onCancel: cancelTestsRun, onSkipCurrent: skipCurrentTest, onFix: fixTests, fixDisabledReason: canEdit === false
+                                        }, children: '✕' })] }), _jsxs("div", { style: { overflowY: 'auto', flex: 1 }, children: [panelOverlay === 'settings' && (_jsx(SettingsCard, { settings: computeSettingsList(), onRunCommand: (commandId) => void executeCommand(commandId), onPrefillInput: (input) => setInputAndCursorEnd(`${input} `), isLight: isLight, agentName: agentName, embedded: true })), panelOverlay === 'skills' && (_jsx(SkillsCard, { projectId: projectId, initialQuery: panelOverlayQuery, onLoad: loadSkill, onCreate: createSkill, loadedSkillPaths: loadedSkillPaths, defaultSkillPaths: defaultSkillPaths, onToggleDefault: toggleDefaultSkill, onResetDefault: resetDefaultSkills, defaultsExplicit: defaultSkillsExplicitRef.current, isLight: isLight, embedded: true })), panelOverlay === 'scripts' && (_jsx(ScriptsCard, { projectId: projectId, initialQuery: panelOverlayQuery, isLight: isLight, agentName: agentName, embedded: true })), panelOverlay === 'tests' && (_jsx(TestsCard, { tests: testsList, status: testsStatus, run: testsRun, agentName: agentName, initialQuery: panelOverlayQuery, canRun: (canRunTests ?? canEdit !== false) && canEdit !== false, onRun: startTestsRun, onCancel: cancelTestsRun, onSkipCurrent: skipCurrentTest, onFix: fixTests, fixDisabledReason: canEdit === false
                                             ? t('ide.tests.viewerCannotRun', undefined, {
                                                 defaultValue: 'Only editors can run this project’s tests.',
                                             })
@@ -7627,7 +7847,7 @@ function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent,
                                             }, onMouseLeave: (e) => {
                                                 e.currentTarget.style.opacity = '0.7';
                                                 e.currentTarget.style.background = 'none';
-                                            }, children: _jsx("svg", { width: "13", height: "13", viewBox: "0 0 12 12", style: { display: 'block' }, children: _jsx("path", { d: "M 2.5,6.5 L 6,3 L 9.5,6.5 M 6,3.5 L 6,10", fill: "none", stroke: "currentColor", strokeWidth: "1.75", strokeLinecap: "round", strokeLinejoin: "round" }) }) }))] }, qm.id))) })] })), workVisible && (_jsxs(WorkCard, { children: [_jsx(PlanCard, { todos: plan, live: planLive, awaitingUser: planAwaitingUser }), _jsx(BackgroundTasksStrip, { tasks: backgroundTasks }), showTests && (_jsx(TestStatusBar, { run: testsRun, tests: testsList, onOpen: () => openTestsBrowser(''), onStop: testsRun.running ? cancelTestsRun : undefined })), showFiles && pendingFiles != null && (_jsx(DockStrip, { molId: "chat-commit-bar", toggleMolId: "chat-commit-toggle", expanded: commitBarExpanded, onToggle: () => setCommitBarExpanded((v) => !v), hideLabel: true, label: t('ide.chat.showChangedFiles', undefined, {
+                                            }, children: _jsx("svg", { width: "13", height: "13", viewBox: "0 0 12 12", style: { display: 'block' }, children: _jsx("path", { d: "M 2.5,6.5 L 6,3 L 9.5,6.5 M 6,3.5 L 6,10", fill: "none", stroke: "currentColor", strokeWidth: "1.75", strokeLinecap: "round", strokeLinejoin: "round" }) }) }))] }, qm.id))) })] })), workVisible && (_jsxs(WorkCard, { children: [_jsx(PlanCard, { todos: plan, live: planLive, awaitingUser: planAwaitingUser }), _jsx(BackgroundTasksStrip, { tasks: backgroundTasks }), showTests && (_jsx(TestStatusBar, { run: testsRun, agentName: agentName, tests: testsList, onOpen: () => openTestsBrowser(''), onStop: testsRun.running && !testsRun.external ? cancelTestsRun : undefined })), showFiles && pendingFiles != null && (_jsx(DockStrip, { molId: "chat-commit-bar", toggleMolId: "chat-commit-toggle", expanded: commitBarExpanded, onToggle: () => setCommitBarExpanded((v) => !v), hideLabel: true, label: t('ide.chat.showChangedFiles', undefined, {
                                     defaultValue: 'Show changed files',
                                 }), actions: _jsx(_Fragment, { children: isAutoCommitEnabled(autoCommit) &&
                                         commitState?.status !== 'committing' &&
@@ -8077,7 +8297,7 @@ function ChatInner({ projectId, endpoint, initialMessage, onInitialMessageSent,
  * @param props - Component props (see {@link MessageItemProps}).
  * @returns The rendered chat panel element.
  */
-export function ChatPanel({ projectId, endpoint, initialMessage, onInitialMessageSent, activeFile, openTabs, onFileOpen, onFileDoubleClick, onFileDiff, onFileRevert, onFileChange, onFileDeleted, onCommit, onActivityClick, onRenderError, onProfileClick, currentUserId, onReadyToBuild, awaitingSandboxBoot, onClientAction, onTurnComplete, onLoadingChange, onNavigatePreview, onRegisterPushHandler, onRegisterHistoryReconcile, autoSubmitSignal, initialInputValue, hideConversationMenu, renderConversationHeader = true, conversationId: controlledConversationId, chatKey: controlledChatKey, onConversationId: controlledOnConversationId, openShareSignal: controlledShareSignal, openReportSignal: controlledReportSignal, openSettingsSignal: controlledSettingsSignal, onManageCustomModels, gitStatusTick, pendingMessage, pendingMessageKey, pendingMessageSuppressUser, pendingMessageUserInitiated, userEditedFile, userEditedFileKey, isPro, isAnonymous, canEdit = true, canSendTeamMessages = true, canShare, shareLinksAllowed, shareLinksRefreshSignal, shareModalContent, buildUpgradeCta, buildHelpUpgradeSection, userAvatar, agentName, productName, version, extraCommands, feedbackUrl, listTests, runTests, canRunTests, testsAvailable, skipToolCall, className, }) {
+export function ChatPanel({ projectId, endpoint, initialMessage, onInitialMessageSent, activeFile, openTabs, onFileOpen, onFileDoubleClick, onFileDiff, onFileRevert, onFileChange, onFileDeleted, onCommit, onActivityClick, onRenderError, onProfileClick, currentUserId, onReadyToBuild, awaitingSandboxBoot, onClientAction, onTurnComplete, onLoadingChange, onNavigatePreview, onRegisterPushHandler, onRegisterHistoryReconcile, autoSubmitSignal, initialInputValue, hideConversationMenu, renderConversationHeader = true, conversationId: controlledConversationId, chatKey: controlledChatKey, onConversationId: controlledOnConversationId, openShareSignal: controlledShareSignal, openReportSignal: controlledReportSignal, openSettingsSignal: controlledSettingsSignal, onManageCustomModels, gitStatusTick, pendingMessage, pendingMessageKey, pendingMessageSuppressUser, pendingMessageUserInitiated, userEditedFile, userEditedFileKey, isPro, isAnonymous, canEdit = true, canSendTeamMessages = true, canShare, shareLinksAllowed, shareLinksRefreshSignal, shareModalContent, buildUpgradeCta, buildHelpUpgradeSection, userAvatar, agentName, productName, version, extraCommands, feedbackUrl, listTests, runTests, watchTestRuns, canRunTests, testsAvailable, skipToolCall, className, }) {
     const cm = getClassMap();
     // Share management may be gated ABOVE canEdit by the host (see
     // ChatPanelProps.canShare) — gates the built-in header share button here and
@@ -8292,7 +8512,7 @@ export function ChatPanel({ projectId, endpoint, initialMessage, onInitialMessag
                                             textOverflow: 'ellipsis',
                                             whiteSpace: 'nowrap',
                                             width: '100%',
-                                        }, children: conv.preview ?? 'New conversation' }), _jsx("span", { className: cm.cn(cm.textMuted, cm.textSize('xs')), style: { opacity: 0.55 }, children: relativeTime(conv.updatedAt) })] }, conv.id)))] }))] })), _jsx(ChatInner, { projectId: projectId, endpoint: chatEndpoint, initialMessage: initialMessage, onInitialMessageSent: onInitialMessageSent, isPro: isPro, isAnonymous: isAnonymous, canEdit: canEdit, canSendTeamMessages: canSendTeamMessages, canShare: shareAllowed, shareLinksAllowed: shareLinksAllowed, shareLinksRefreshSignal: shareLinksRefreshSignal, shareModalContent: shareModalContent, buildUpgradeCta: buildUpgradeCta, buildHelpUpgradeSection: buildHelpUpgradeSection, activeFile: activeFile, openTabs: openTabs, onFileOpen: onFileOpen, onFileDoubleClick: onFileDoubleClick, onFileDiff: onFileDiff, onFileRevert: onFileRevert, onFileChange: onFileChange, onFileDeleted: onFileDeleted, onCommit: onCommit, onConversationId: reportConversationId, onActivityClick: onActivityClick, onRenderError: onRenderError, onProfileClick: onProfileClick, currentUserId: currentUserId, onReadyToBuild: onReadyToBuild, awaitingSandboxBoot: awaitingSandboxBoot, onClientAction: onClientAction, onTurnComplete: onTurnComplete, onLoadingChange: onLoadingChange, onNavigatePreview: onNavigatePreview, onRegisterPushHandler: onRegisterPushHandler, onRegisterHistoryReconcile: onRegisterHistoryReconcile, autoSubmitSignal: autoSubmitSignal, openSettingsSignal: effectiveSettingsSignal, onManageCustomModels: onManageCustomModels, openReportSignal: effectiveReportSignal, openShareSignal: effectiveShareSignal, initialInputValue: initialInputValue, pendingMessage: pendingMessage, pendingMessageKey: pendingMessageKey, pendingMessageSuppressUser: pendingMessageSuppressUser, pendingMessageUserInitiated: pendingMessageUserInitiated, userEditedFile: userEditedFile, userEditedFileKey: userEditedFileKey, gitStatusTick: gitStatusTick, discovery: hideConversationMenu, userAvatar: userAvatar, agentName: agentName, productName: productName, version: version, extraCommands: extraCommands, feedbackUrl: feedbackUrl, listTests: listTests, runTests: runTests, canRunTests: canRunTests, testsAvailable: testsAvailable, skipToolCall: skipToolCall }, chatKey)] }));
+                                        }, children: conv.preview ?? 'New conversation' }), _jsx("span", { className: cm.cn(cm.textMuted, cm.textSize('xs')), style: { opacity: 0.55 }, children: relativeTime(conv.updatedAt) })] }, conv.id)))] }))] })), _jsx(ChatInner, { projectId: projectId, endpoint: chatEndpoint, initialMessage: initialMessage, onInitialMessageSent: onInitialMessageSent, isPro: isPro, isAnonymous: isAnonymous, canEdit: canEdit, canSendTeamMessages: canSendTeamMessages, canShare: shareAllowed, shareLinksAllowed: shareLinksAllowed, shareLinksRefreshSignal: shareLinksRefreshSignal, shareModalContent: shareModalContent, buildUpgradeCta: buildUpgradeCta, buildHelpUpgradeSection: buildHelpUpgradeSection, activeFile: activeFile, openTabs: openTabs, onFileOpen: onFileOpen, onFileDoubleClick: onFileDoubleClick, onFileDiff: onFileDiff, onFileRevert: onFileRevert, onFileChange: onFileChange, onFileDeleted: onFileDeleted, onCommit: onCommit, onConversationId: reportConversationId, onActivityClick: onActivityClick, onRenderError: onRenderError, onProfileClick: onProfileClick, currentUserId: currentUserId, onReadyToBuild: onReadyToBuild, awaitingSandboxBoot: awaitingSandboxBoot, onClientAction: onClientAction, onTurnComplete: onTurnComplete, onLoadingChange: onLoadingChange, onNavigatePreview: onNavigatePreview, onRegisterPushHandler: onRegisterPushHandler, onRegisterHistoryReconcile: onRegisterHistoryReconcile, autoSubmitSignal: autoSubmitSignal, openSettingsSignal: effectiveSettingsSignal, onManageCustomModels: onManageCustomModels, openReportSignal: effectiveReportSignal, openShareSignal: effectiveShareSignal, initialInputValue: initialInputValue, pendingMessage: pendingMessage, pendingMessageKey: pendingMessageKey, pendingMessageSuppressUser: pendingMessageSuppressUser, pendingMessageUserInitiated: pendingMessageUserInitiated, userEditedFile: userEditedFile, userEditedFileKey: userEditedFileKey, gitStatusTick: gitStatusTick, discovery: hideConversationMenu, userAvatar: userAvatar, agentName: agentName, productName: productName, version: version, extraCommands: extraCommands, feedbackUrl: feedbackUrl, listTests: listTests, runTests: runTests, watchTestRuns: watchTestRuns, canRunTests: canRunTests, testsAvailable: testsAvailable, skipToolCall: skipToolCall }, chatKey)] }));
 }
 ChatPanel.displayName = 'ChatPanel';
 //# sourceMappingURL=ChatPanel.js.map