@jsonstudio/llms 0.6.2172 → 0.6.2979

package/dist/servertool/handlers/stop-message-auto.js

@@ -4,18 +4,14 @@ import { extractCapturedChatSeed } from './followup-request-builder.js';
 import { readRuntimeMetadata } from '../../conversion/shared/runtime-metadata.js';
 import { isStopEligibleForServerTool } from '../stop-gateway-context.js';
 import { attachStopMessageCompareContext } from '../stop-message-compare-context.js';
-import { extractStopMessageAutoResponseSnapshot, renderStopMessageAutoFollowupViaIflow } from './stop-message-auto/iflow-followup.js';
-import { getCapturedRequest, hasCompactionFlag, readServerToolFollowupFlowId, resolveClientConnectionState, resolveEntryEndpoint, resolveImplicitGeminiStopMessageSnapshot, resolveStopMessageFollowupProviderKey, resolveStopMessageFollowupToolContentMaxChars } from './stop-message-auto/runtime-utils.js';
+import { extractStopMessageAutoResponseSnapshot, renderStopMessageAutoFollowupViaAi, resolveStopMessageAiApprovedMarker, resolveStopMessageAiDoneMarker } from './stop-message-auto/iflow-followup.js';
+import { getCapturedRequest, hasCompactionFlag, persistStopMessageState, readServerToolFollowupFlowId, resolveBdWorkingDirectoryForRecord, resolveClientConnectionState, resolveDefaultStopMessageSnapshot, resolveEntryEndpoint, resolveImplicitGeminiStopMessageSnapshot, resolveStopMessageSessionScope, resolveStickyKey, resolveStopMessageFollowupProviderKey } from './stop-message-auto/runtime-utils.js';
+import { loadRoutingInstructionStateSync } from '../../router/virtual-router/sticky-session-store.js';
+import { clearStopMessageState, createStopMessageState, resolveStopMessageSnapshot } from './stop-message-auto/routing-state.js';
 export { extractBlockedReportFromMessagesForTests } from './stop-message-auto/blocked-report.js';
 const STOPMESSAGE_DEBUG = (process.env.ROUTECODEX_STOPMESSAGE_DEBUG || '').trim() === '1';
-const STOPMESSAGE_IMPLICIT_GEMINI = (process.env.ROUTECODEX_STOPMESSAGE_IMPLICIT_GEMINI || '').trim() === '1';
-const STOPMESSAGE_DEFAULT_ENABLED = (() => {
-    const raw = process.env.ROUTECODEX_STOPMESSAGE_DEFAULT_ENABLED;
-    if (typeof raw === 'string' && raw.trim().length > 0) {
-        return raw.trim() !== '0';
-    }
-    return process.env.NODE_ENV !== 'test';
-})();
+const STOPMESSAGE_IMPLICIT_GEMINI = false;
+const STOPMESSAGE_DEFAULT_ENABLED = false;
 const STOPMESSAGE_DEFAULT_TEXT = (() => {
     const raw = process.env.ROUTECODEX_STOPMESSAGE_DEFAULT_TEXT;
     return typeof raw === 'string' && raw.trim().length > 0 ? raw.trim() : '继续执行';
@@ -40,14 +36,113 @@ function debugLog(message, extra) {
     }
 }
 const FLOW_ID = 'stop_message_flow';
+function hasStopMessageDoneMarker(snapshot, marker) {
+    if (!snapshot || !marker) {
+        return false;
+    }
+    const normalizedMarker = marker.trim();
+    if (!normalizedMarker) {
+        return false;
+    }
+    const candidates = [snapshot.assistantText, snapshot.reasoningText, snapshot.responseExcerpt];
+    return candidates.some((value) => typeof value === 'string' && value.includes(normalizedMarker));
+}
+function hasStopMessageMarkerLine(text, marker) {
+    const content = typeof text === 'string' ? text.trim() : '';
+    const normalizedMarker = typeof marker === 'string' ? marker.trim() : '';
+    if (!content || !normalizedMarker) {
+        return false;
+    }
+    const escapedMarker = normalizedMarker.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const markerLinePattern = new RegExp(`(^|\\n)\\s*${escapedMarker}\\s*(?=\\n|$)`);
+    return markerLinePattern.test(content);
+}
+function readStopMessageStageMode(raw) {
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+        return undefined;
+    }
+    const value = raw.stopMessageStageMode;
+    if (typeof value !== 'string') {
+        return undefined;
+    }
+    const normalized = value.trim().toLowerCase();
+    if (normalized === 'on' || normalized === 'off' || normalized === 'auto') {
+        return normalized;
+    }
+    return undefined;
+}
 const STOP_MESSAGE_EXECUTION_DIRECTIVE = [
     '执行策略（必须遵守）：',
     '- 禁止输出口播式状态汇报（如“继续执行中”“我会继续”）。',
     '- 以当前上下文目标为准，优先推进可验证的工程动作，不要停留在任务管理操作。',
     '- 优先完成真实动作（改代码/补测试/运行验证），再做简短汇报。',
+    '- 禁止连续执行纯只读/纯汇报动作（如 cargo llvm-cov report、cat/head/tail/rg/git status）；若上一轮没有代码修改证据，本轮必须先完成写动作（修改文件或新增测试）。',
+    '- 覆盖率命令仅用于“写动作之后的验证”，不得作为本轮唯一或首要动作。',
+    '- 若预计等待超过 2 分钟，必须调用 clock.schedule 设置定时，不得只口头说明等待。',
+    '- 若仅需汇报任务进度，必须按顺序：先调用 CONTINUE execution（continue_execution，参数示例 {"reason":"progress_update"}），再做 <=5 行简短汇报，然后立即继续执行。',
     '- 若遇阻塞，请按 JSON 输出结构化阻塞信息（type=blocked, summary, blocker, impact, next_action, evidence）。',
-    '- 如果即将返回 finish_reason=stop 或协议等价 end_turn，先调用 continue_execution 工具，不要直接结束会话。'
+    '- 如果即将返回 finish_reason=stop 或协议等价 end_turn，先调用 continue_execution 工具，不要直接结束会话。',
+    '- 仅当总体目标完成时，才允许停止。'
 ].join('\n');
+const STOP_MESSAGE_AI_HISTORY_MAX = 8;
+const STOP_MESSAGE_EXECUTION_APPEND = '请直接继续执行，不要进行状态汇总；优先写动作（改代码/补测试），覆盖率命令只用于写动作后的验证，不得连续只做汇报/只读检查；仅在完成一个阶段性任务或已完成总体目标时再停止并回复。';
+function readStopMessageAiSeedPrompt(state) {
+    if (!state || typeof state !== 'object' || Array.isArray(state)) {
+        return '';
+    }
+    const raw = state.stopMessageAiSeedPrompt;
+    return typeof raw === 'string' ? raw.trim() : '';
+}
+function readStopMessageAiHistory(state) {
+    if (!state || typeof state !== 'object' || Array.isArray(state)) {
+        return [];
+    }
+    const raw = state.stopMessageAiHistory;
+    if (!Array.isArray(raw)) {
+        return [];
+    }
+    const normalized = [];
+    for (const entry of raw) {
+        if (!entry || typeof entry !== 'object' || Array.isArray(entry)) {
+            continue;
+        }
+        const record = entry;
+        const item = {};
+        if (typeof record.ts === 'number' && Number.isFinite(record.ts)) {
+            item.ts = Math.floor(record.ts);
+        }
+        if (typeof record.round === 'number' && Number.isFinite(record.round)) {
+            item.round = Math.max(0, Math.floor(record.round));
+        }
+        for (const key of ['assistantText', 'reasoningText', 'responseExcerpt', 'followupText']) {
+            const value = record[key];
+            if (typeof value === 'string' && value.trim()) {
+                item[key] = value.trim();
+            }
+        }
+        if (Object.keys(item).length > 0) {
+            normalized.push(item);
+        }
+    }
+    return normalized.slice(-STOP_MESSAGE_AI_HISTORY_MAX);
+}
+function appendStopMessageAiHistory(history, item) {
+    const next = [...history, item].filter((entry) => entry && Object.keys(entry).length > 0);
+    return next.slice(-STOP_MESSAGE_AI_HISTORY_MAX);
+}
+function enforceStopMessageExecutionFollowupText(text, doneMarker) {
+    const rawBase = typeof text === 'string' && text.trim() ? text.trim() : '';
+    const marker = doneMarker && doneMarker.trim() ? doneMarker.trim() : '[STOPMESSAGE_DONE]';
+    const escapedMarker = marker.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const markerLinePattern = new RegExp(`(^|\\n)\\s*${escapedMarker}\\s*(?=\\n|$)`, 'g');
+    const strippedBase = rawBase.replace(markerLinePattern, '$1').replace(/\n{3,}/g, '\n\n').trim();
+    const base = strippedBase || '继续执行';
+    let next = base;
+    if (!next.includes(STOP_MESSAGE_EXECUTION_APPEND)) {
+        next = `${next}\n\n${STOP_MESSAGE_EXECUTION_APPEND}`;
+    }
+    return next.trim();
+}
 const handler = async (ctx) => {
     const record = ctx.adapterContext;
     const rt = readRuntimeMetadata(ctx.adapterContext);
@@ -111,33 +206,160 @@ const handler = async (ctx) => {
             return markSkip('skip_compaction_flag');
         }
         const connectionState = resolveClientConnectionState(record.clientConnectionState);
-        const implicit = STOPMESSAGE_IMPLICIT_GEMINI
-            ? resolveImplicitGeminiStopMessageSnapshot(ctx, record)
-            : null;
-        if (!STOPMESSAGE_DEFAULT_ENABLED && !implicit) {
-            debugLog('skip_default_disabled');
-            return markSkip('skip_default_disabled', { armed: false, mode: 'off' });
-        }
-        const text = ((typeof implicit?.text === 'string' && implicit.text.trim().length > 0
-            ? implicit.text
-            : STOPMESSAGE_DEFAULT_TEXT) || '继续执行').trim();
-        const maxRepeats = typeof implicit?.maxRepeats === 'number' && Number.isFinite(implicit.maxRepeats) && implicit.maxRepeats > 0
-            ? Math.floor(implicit.maxRepeats)
-            : STOPMESSAGE_DEFAULT_MAX_REPEATS;
+        const strictSessionScope = resolveStopMessageSessionScope(record, rt);
+        if (!strictSessionScope) {
+            debugLog('skip_missing_session_scope');
+            return markSkip('skip_missing_session_scope');
+        }
+        const stickyKey = strictSessionScope || resolveStickyKey(record, rt);
+        let stickyState = stickyKey ? loadRoutingInstructionStateSync(stickyKey) : null;
+        let snapshot = resolveStopMessageSnapshot(stickyState);
+        if (!snapshot) {
+            snapshot = resolveStopMessageSnapshot(rt?.stopMessageState);
+            if (snapshot && stickyKey) {
+                stickyState = createStopMessageState(snapshot);
+                persistStopMessageState(stickyKey, stickyState);
+            }
+        }
+        const stickyMode = readStopMessageStageMode(stickyState);
+        const runtimeMode = readStopMessageStageMode(rt?.stopMessageState);
+        const explicitMode = stickyMode ?? runtimeMode;
+        if (!snapshot && explicitMode === 'off') {
+            debugLog('skip_explicit_mode_off', { stickyKey });
+            return markSkip('skip_explicit_mode_off', {
+                armed: true,
+                mode: 'off',
+                allowModeOnly: true,
+                textLength: 0,
+                maxRepeats: 0,
+                used: 0
+            });
+        }
+        if (!snapshot) {
+            const implicit = STOPMESSAGE_IMPLICIT_GEMINI
+                ? resolveImplicitGeminiStopMessageSnapshot(ctx, record)
+                : null;
+            const defaultSnapshot = STOPMESSAGE_DEFAULT_ENABLED
+                ? resolveDefaultStopMessageSnapshot(ctx, {
+                    text: STOPMESSAGE_DEFAULT_TEXT,
+                    maxRepeats: STOPMESSAGE_DEFAULT_MAX_REPEATS
+                })
+                : null;
+            const fallback = implicit
+                ? {
+                    text: implicit.text,
+                    maxRepeats: implicit.maxRepeats,
+                    used: implicit.used,
+                    source: implicit.source,
+                    updatedAt: implicit.updatedAt,
+                    lastUsedAt: implicit.lastUsedAt,
+                    stageMode: 'on'
+                }
+                : defaultSnapshot
+                    ? {
+                        text: defaultSnapshot.text,
+                        maxRepeats: defaultSnapshot.maxRepeats,
+                        used: defaultSnapshot.used,
+                        source: defaultSnapshot.source,
+                        updatedAt: defaultSnapshot.updatedAt,
+                        lastUsedAt: defaultSnapshot.lastUsedAt,
+                        stageMode: 'on'
+                    }
+                    : null;
+            if (!fallback) {
+                if (!STOPMESSAGE_DEFAULT_ENABLED && !implicit) {
+                    debugLog('skip_default_disabled');
+                    return markSkip('skip_default_disabled', { armed: false, mode: 'off' });
+                }
+                debugLog('skip_no_stop_message_state');
+                return markSkip('skip_no_stop_message_state', { armed: false, mode: 'off' });
+            }
+            snapshot = fallback;
+            if (stickyKey) {
+                stickyState = createStopMessageState(snapshot);
+                persistStopMessageState(stickyKey, stickyState);
+            }
+        }
+        const mode = snapshot.stageMode ?? 'on';
+        if (mode === 'off') {
+            debugLog('skip_explicit_mode_off', { stickyKey });
+            return markSkip('skip_explicit_mode_off', {
+                armed: true,
+                mode: 'off',
+                allowModeOnly: true,
+                textLength: 0,
+                maxRepeats: 0,
+                used: 0
+            });
+        }
+        const text = typeof snapshot.text === 'string' ? snapshot.text.trim() : '';
+        const maxRepeats = typeof snapshot.maxRepeats === 'number' && Number.isFinite(snapshot.maxRepeats)
+            ? Math.max(1, Math.floor(snapshot.maxRepeats))
+            : 0;
+        const aiMode = snapshot.aiMode === 'on' ? 'on' : 'off';
+        const used = typeof snapshot.used === 'number' && Number.isFinite(snapshot.used)
+            ? Math.max(0, Math.floor(snapshot.used))
+            : 0;
         updateCompare({
             armed: true,
-            mode: 'on',
-            allowModeOnly: text.length === 0,
+            mode,
+            allowModeOnly: false,
             textLength: text.length,
-            maxRepeats: Math.max(1, maxRepeats),
-            used: 0
+            maxRepeats,
+            used
         });
+        if (used >= maxRepeats) {
+            if (stickyKey && stickyState) {
+                clearStopMessageState(stickyState, Date.now());
+                persistStopMessageState(stickyKey, stickyState);
+            }
+            debugLog('skip_reached_max_repeats', {
+                stickyKey,
+                used,
+                maxRepeats
+            });
+            return markSkip('skip_reached_max_repeats');
+        }
+        const injectReadyRaw = rt?.stopMessageClientInjectReady;
+        const injectReadyExplicitlyFalse = injectReadyRaw === false ||
+            (typeof injectReadyRaw === 'string' && injectReadyRaw.trim().toLowerCase() === 'false');
+        if (injectReadyExplicitlyFalse) {
+            const injectReason = typeof rt?.stopMessageClientInjectReason === 'string'
+                ? String(rt.stopMessageClientInjectReason).trim()
+                : '';
+            if (stickyKey) {
+                const nextState = stickyState ??
+                    createStopMessageState({
+                        text,
+                        maxRepeats,
+                        used,
+                        ...(snapshot.source ? { source: snapshot.source } : {}),
+                        ...(snapshot.updatedAt ? { updatedAt: snapshot.updatedAt } : {}),
+                        ...(snapshot.lastUsedAt ? { lastUsedAt: snapshot.lastUsedAt } : {}),
+                        ...(snapshot.stageMode ? { stageMode: snapshot.stageMode } : {}),
+                        aiMode
+                    });
+                clearStopMessageState(nextState, Date.now());
+                persistStopMessageState(stickyKey, nextState);
+            }
+            debugLog('skip_client_inject_unready', {
+                stickyKey,
+                injectReadyRaw: injectReadyRaw,
+                injectReason
+            });
+            const normalizedInjectReason = injectReason && /^[a-z0-9_:-]+$/i.test(injectReason) ? injectReason.toLowerCase() : 'unknown';
+            return markSkip(`skip_client_inject_unready_${normalizedInjectReason}`);
+        }
         const stopEligible = isStopEligibleForServerTool(ctx.base, ctx.adapterContext);
         updateCompare({ stopEligible });
         if (!stopEligible) {
             debugLog('skip_not_stop_finish_reason');
             return markSkip('skip_not_stop_finish_reason');
         }
+        const autoResponseSnapshot = extractStopMessageAutoResponseSnapshot(ctx.base, ctx.adapterContext);
+        const doneMarker = resolveStopMessageAiDoneMarker();
+        const approvedMarker = resolveStopMessageAiApprovedMarker();
+        const completionClaimedByMainModel = aiMode === 'on' && hasStopMessageDoneMarker(autoResponseSnapshot, doneMarker);
         const captured = getCapturedRequest(ctx.adapterContext);
         updateCompare({ hasCapturedRequest: Boolean(captured) });
         if (!captured) {
@@ -157,59 +379,152 @@ const handler = async (ctx) => {
             debugLog('skip_failed_build_followup');
             return markSkip('skip_failed_build_followup');
         }
-        const used = 0;
-        let followupText = text || '继续执行';
-        const autoResponseSnapshot = extractStopMessageAutoResponseSnapshot(ctx.base, ctx.adapterContext);
-        const iflowFollowupText = renderStopMessageAutoFollowupViaIflow({
-            baseStopMessageText: text,
-            candidateFollowupText: followupText,
-            responseSnapshot: autoResponseSnapshot,
-            requestId: typeof record.requestId === 'string'
-                ? record.requestId.trim()
-                : undefined,
-            sessionId: typeof record.sessionId === 'string'
-                ? record.sessionId.trim()
-                : undefined,
-            providerKey: resolveStopMessageFollowupProviderKey({ record, runtimeMetadata: rt }),
-            model: typeof seed.model === 'string' ? seed.model : undefined,
-            usedRepeats: used,
-            maxRepeats
-        });
-        if (iflowFollowupText) {
-            followupText = iflowFollowupText.trim();
-            if (text && !followupText.includes(text)) {
-                followupText = `${text}\n${followupText}`.trim();
+        const historyStateCandidate = stickyState ?? rt?.stopMessageState;
+        const existingSeedPrompt = readStopMessageAiSeedPrompt(historyStateCandidate);
+        const existingHistory = readStopMessageAiHistory(historyStateCandidate);
+        const fallbackCandidateFollowupText = existingSeedPrompt || text || '继续执行';
+        const isFirstPrompt = existingHistory.length === 0;
+        let followupText = '';
+        if (aiMode === 'on') {
+            const aiFollowupText = renderStopMessageAutoFollowupViaAi({
+                baseStopMessageText: text,
+                candidateFollowupText: fallbackCandidateFollowupText,
+                responseSnapshot: autoResponseSnapshot,
+                requestId: typeof record.requestId === 'string'
+                    ? record.requestId.trim()
+                    : undefined,
+                sessionId: typeof record.sessionId === 'string'
+                    ? record.sessionId.trim()
+                    : undefined,
+                workingDirectory: resolveBdWorkingDirectoryForRecord(record, rt),
+                providerKey: resolveStopMessageFollowupProviderKey({ record, runtimeMetadata: rt }),
+                model: typeof seed.model === 'string' ? seed.model : undefined,
+                usedRepeats: used,
+                maxRepeats,
+                doneMarker,
+                approvedMarker,
+                completionClaimed: completionClaimedByMainModel,
+                isFirstPrompt,
+                historyEntries: existingHistory
+            });
+            if (aiFollowupText) {
+                followupText = aiFollowupText.trim();
+                debugLog('ai_followup_applied', {
+                    textLength: followupText.length
+                });
+            }
+            else {
+                followupText = '继续执行';
+                debugLog('ai_followup_fallback_to_continue_execution');
+            }
+        }
+        else {
+            followupText = fallbackCandidateFollowupText;
+            debugLog('fixed_followup_applied', { textLength: followupText.length });
+        }
+        if (hasStopMessageMarkerLine(followupText, approvedMarker)) {
+            if (stickyKey) {
+                const nextState = stickyState ??
+                    createStopMessageState({
+                        text,
+                        maxRepeats,
+                        used,
+                        ...(snapshot.source ? { source: snapshot.source } : {}),
+                        ...(snapshot.updatedAt ? { updatedAt: snapshot.updatedAt } : {}),
+                        ...(snapshot.lastUsedAt ? { lastUsedAt: snapshot.lastUsedAt } : {}),
+                        ...(snapshot.stageMode ? { stageMode: snapshot.stageMode } : {}),
+                        aiMode
+                    });
+                clearStopMessageState(nextState, Date.now());
+                persistStopMessageState(stickyKey, nextState);
             }
-            debugLog('iflow_automessage_followup_applied', {
-                textLength: followupText.length
+            const approvedInjectText = typeof followupText === 'string' && followupText.trim()
+                ? followupText.trim()
+                : approvedMarker;
+            debugLog('trigger_done_marker_approved', {
+                stickyKey,
+                doneMarker,
+                approvedMarker
             });
+            updateCompare({
+                decision: 'trigger',
+                reason: 'done_marker_approved'
+            });
+            return {
+                flowId: FLOW_ID,
+                finalize: async () => ({
+                    chatResponse: ctx.base,
+                    execution: {
+                        flowId: FLOW_ID,
+                        followup: {
+                            requestIdSuffix: ':stop_followup',
+                            metadata: {
+                                ...(connectionState ? { clientConnectionState: connectionState } : {}),
+                                clientInjectOnly: true,
+                                clientInjectText: approvedInjectText,
+                                clientInjectSource: 'servertool.stop_message.done'
+                            }
+                        }
+                    }
+                })
+            };
+        }
+        if (aiMode === 'on') {
+            followupText = enforceStopMessageExecutionFollowupText(followupText || '继续执行', doneMarker);
         }
         else {
-            followupText = '继续执行';
-            debugLog('iflow_automessage_followup_fallback_to_continue_execution');
+            followupText = (followupText || '继续执行').trim();
         }
-        if (!followupText) {
-            debugLog('skip_empty_followup_text_after_stage');
-            return markSkip('skip_empty_followup_text_after_stage');
+        const nextHistory = aiMode === 'on'
+            ? appendStopMessageAiHistory(existingHistory, {
+                ts: Date.now(),
+                round: used + 1,
+                ...(autoResponseSnapshot.assistantText ? { assistantText: autoResponseSnapshot.assistantText } : {}),
+                ...(autoResponseSnapshot.reasoningText ? { reasoningText: autoResponseSnapshot.reasoningText } : {}),
+                ...(autoResponseSnapshot.responseExcerpt ? { responseExcerpt: autoResponseSnapshot.responseExcerpt } : {}),
+                followupText
+            })
+            : [];
+        const nextUsed = used + 1;
+        updateCompare({ used: nextUsed });
+        if (stickyKey) {
+            const nextState = stickyState ??
+                createStopMessageState({
+                    text,
+                    maxRepeats,
+                    used,
+                    ...(snapshot.source ? { source: snapshot.source } : {}),
+                    ...(snapshot.updatedAt ? { updatedAt: snapshot.updatedAt } : {}),
+                    ...(snapshot.lastUsedAt ? { lastUsedAt: snapshot.lastUsedAt } : {}),
+                    ...(snapshot.stageMode ? { stageMode: snapshot.stageMode } : {}),
+                    aiMode,
+                    aiSeedPrompt: fallbackCandidateFollowupText,
+                    aiHistory: existingHistory
+                });
+            const now = Date.now();
+            if (nextUsed >= maxRepeats) {
+                clearStopMessageState(nextState, now);
+            }
+            else {
+                nextState.stopMessageText = text;
+                nextState.stopMessageMaxRepeats = maxRepeats;
+                nextState.stopMessageUsed = nextUsed;
+                nextState.stopMessageStageMode = mode;
+                nextState.stopMessageAiMode = aiMode;
+                nextState.stopMessageLastUsedAt = now;
+                nextState.stopMessageAiSeedPrompt = fallbackCandidateFollowupText;
+                nextState.stopMessageAiHistory =
+                    aiMode === 'on' && nextHistory.length > 0
+                        ? nextHistory.map((entry) => ({ ...entry }))
+                        : undefined;
+            }
+            persistStopMessageState(stickyKey, nextState);
         }
-        const followupProviderKey = resolveStopMessageFollowupProviderKey({ record, runtimeMetadata: rt });
-        const followupToolContentMaxChars = resolveStopMessageFollowupToolContentMaxChars({
-            providerKey: followupProviderKey,
-            model: seed.model
-        });
-        const followupOps = [];
-        if (typeof followupToolContentMaxChars === 'number' &&
-            Number.isFinite(followupToolContentMaxChars) &&
-            followupToolContentMaxChars > 0) {
-            followupOps.push({ op: 'compact_tool_content', maxChars: Math.floor(followupToolContentMaxChars) });
-        }
-        followupOps.push({ op: 'ensure_standard_tools' });
-        followupOps.push({ op: 'inject_system_text', text: STOP_MESSAGE_EXECUTION_DIRECTIVE });
-        followupOps.push({ op: 'append_user_text', text: followupText });
         updateCompare({
             decision: 'trigger',
             reason: 'triggered'
         });
+        // stop_message uses clientInjectOnly path only (tmux injection), no servertool followup reenter
         return {
             flowId: FLOW_ID,
             finalize: async () => ({
@@ -218,11 +533,12 @@ const handler = async (ctx) => {
                     flowId: FLOW_ID,
                     followup: {
                         requestIdSuffix: ':stop_followup',
-                        entryEndpoint,
-                        injection: {
-                            ops: followupOps
-                        },
-                        metadata: (connectionState ? { clientConnectionState: connectionState } : {})
+                        metadata: {
+                            ...(connectionState ? { clientConnectionState: connectionState } : {}),
+                            clientInjectOnly: true,
+                            clientInjectText: followupText,
+                            clientInjectSource: 'servertool.stop_message'
+                        }
                     }
                 }
             })

package/dist/servertool/server-side-tools.d.ts

@@ -9,6 +9,7 @@ import './handlers/clock-auto.js';
 import './handlers/exec-command-guard.js';
 import './handlers/apply-patch-guard.js';
 import './handlers/continue-execution.js';
+import './handlers/review.js';
 export declare function runServerSideToolEngine(options: ServerSideToolEngineOptions): Promise<ServerSideToolEngineResult>;
 export declare function extractToolCalls(chatResponse: JsonObject): ToolCall[];
 export declare function cloneJson<T>(value: T): T;