@jsonstudio/llms 0.6.2172 → 0.6.2979

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

@@ -1,6 +1,12 @@
 import * as childProcess from 'node:child_process';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
 import { readRuntimeMetadata } from '../../../conversion/shared/runtime-metadata.js';
 import { extractTextFromMessageContent } from './blocked-report.js';
+import { appendServerToolProgressFileEvent } from '../../log/progress-file.js';
+const DEFAULT_STOP_MESSAGE_AI_DONE_MARKER = '[STOPMESSAGE_DONE]';
+const DEFAULT_STOP_MESSAGE_AI_APPROVED_MARKER = '[STOPMESSAGE_APPROVED]';
 const STOP_MESSAGE_AUTOMESSAGE_IFLOW_TIMEOUT_MS = 300_000;
 const STOP_MESSAGE_AUTOMESSAGE_IFLOW_TIMEOUT_MAX_MS = 300_000;
 const STOP_MESSAGE_AUTOMESSAGE_IFLOW_TIMEOUT_TEST_CAP_MS = 800;
@@ -8,80 +14,100 @@ const STOP_MESSAGE_AUTOMESSAGE_PROMPT_MAX_CHARS = 18_000;
 const STOP_MESSAGE_AUTOMESSAGE_OUTPUT_MAX_CHARS = 1_600;
 const STOP_MESSAGE_AUTOMESSAGE_LOG_SUMMARY_MAX_CHARS = 200;
 const ANSI_ESCAPE_PATTERN = /\x1B\[[0-?]*[ -/]*[@-~]/g;
-export function renderStopMessageAutoFollowupViaIflow(args) {
-    if (!isStopMessageAutoMessageIflowEnabled()) {
-        return null;
-    }
-    const command = resolveStopMessageAutoMessageIflowCommand();
-    if (!command) {
+export function renderStopMessageAutoFollowupViaAi(args) {
+    if (!isStopMessageAutoMessageEnabled()) {
         return null;
     }
-    const prompt = buildStopMessageAutoMessageIflowPrompt(args);
-    if (!prompt) {
-        return null;
-    }
-    const timeoutMs = resolveStopMessageAutoMessageIflowTimeoutMs();
+    const backendOrder = resolveStopMessageAutoMessageBackendOrder();
     const maxOutputChars = resolveStopMessageAutoMessageIflowOutputMaxChars();
-    const requestSummary = summarizeStopMessageAutoMessageLog([
-        `base=${args.baseStopMessageText || ''}`,
-        `candidate=${args.candidateFollowupText || ''}`,
-        `assistant=${args.responseSnapshot.assistantText || ''}`,
-        `reasoning=${args.responseSnapshot.reasoningText || ''}`
-    ].join(' | '), STOP_MESSAGE_AUTOMESSAGE_LOG_SUMMARY_MAX_CHARS);
-    logStopMessageAutoMessageIflow({
-        requestId: args.requestId,
-        stage: 'request',
-        requestSummary
-    });
-    try {
-        const result = childProcess.spawnSync(command, ['-p', prompt], {
-            encoding: 'utf8',
-            timeout: timeoutMs,
-            maxBuffer: 1024 * 1024
+    const workingDirectory = resolveStopMessageAutoMessageWorkingDirectory(args.workingDirectory);
+    for (const backend of backendOrder) {
+        const command = resolveStopMessageAutoMessageCommand(backend);
+        if (!command) {
+            continue;
+        }
+        const prompt = buildStopMessageAutoMessageIflowPrompt(args, backend);
+        if (!prompt) {
+            continue;
+        }
+        const invocation = createStopMessageAutoMessageInvocation(backend, prompt);
+        const timeoutMs = resolveStopMessageAutoMessageTimeoutMs(backend);
+        const requestSummary = summarizeStopMessageAutoMessageLog([
+            `base=${args.baseStopMessageText || ''}`,
+            `candidate=${args.candidateFollowupText || ''}`,
+            `assistant=${args.responseSnapshot.assistantText || ''}`,
+            `reasoning=${args.responseSnapshot.reasoningText || ''}`,
+            `completionClaimed=${args.completionClaimed === true ? 'yes' : 'no'}`,
+            `backend=${backend}`,
+            `cwd=${workingDirectory || 'n/a'}`
+        ].join(' | '), STOP_MESSAGE_AUTOMESSAGE_LOG_SUMMARY_MAX_CHARS);
+        logStopMessageAutoMessageIflow({
+            requestId: args.requestId,
+            stage: 'request',
+            requestSummary
         });
-        if (result.error || result.status !== 0) {
-            const responseSummary = summarizeStopMessageAutoMessageLog(sanitizeStopMessageAutoMessageOutput(result.stderr || result.stdout, STOP_MESSAGE_AUTOMESSAGE_OUTPUT_MAX_CHARS), STOP_MESSAGE_AUTOMESSAGE_LOG_SUMMARY_MAX_CHARS);
+        try {
+            const result = childProcess.spawnSync(command, invocation.args, {
+                encoding: 'utf8',
+                timeout: timeoutMs,
+                maxBuffer: 1024 * 1024,
+                ...(workingDirectory ? { cwd: workingDirectory } : {})
+            });
+            if (result.error || result.status !== 0) {
+                const responseSummary = summarizeStopMessageAutoMessageLog(sanitizeStopMessageAutoMessageOutput(result.stderr || result.stdout, STOP_MESSAGE_AUTOMESSAGE_OUTPUT_MAX_CHARS), STOP_MESSAGE_AUTOMESSAGE_LOG_SUMMARY_MAX_CHARS);
+                logStopMessageAutoMessageIflow({
+                    requestId: args.requestId,
+                    stage: 'response',
+                    status: result.status ?? -1,
+                    requestSummary,
+                    responseSummary,
+                    error: result.error ? String(result.error) : 'non_zero_exit'
+                });
+                continue;
+            }
+            const backendOutput = backend === 'codex'
+                ? sanitizeStopMessageAutoMessageOutput(readStopMessageAutoMessageCodexOutput(invocation.outputFilePath), maxOutputChars)
+                : '';
+            const stdout = backendOutput || sanitizeStopMessageAutoMessageOutput(result.stdout, maxOutputChars);
+            if (stdout) {
+                logStopMessageAutoMessageIflow({
+                    requestId: args.requestId,
+                    stage: 'response',
+                    status: result.status ?? 0,
+                    requestSummary,
+                    responseSummary: summarizeStopMessageAutoMessageLog(stdout, STOP_MESSAGE_AUTOMESSAGE_LOG_SUMMARY_MAX_CHARS)
+                });
+                return stdout;
+            }
+            const stderr = sanitizeStopMessageAutoMessageOutput(result.stderr, maxOutputChars);
             logStopMessageAutoMessageIflow({
                 requestId: args.requestId,
                 stage: 'response',
-                status: result.status ?? -1,
+                status: result.status ?? 0,
                 requestSummary,
-                responseSummary,
-                error: result.error ? String(result.error) : 'non_zero_exit'
+                responseSummary: summarizeStopMessageAutoMessageLog(stderr, STOP_MESSAGE_AUTOMESSAGE_LOG_SUMMARY_MAX_CHARS)
             });
-            return null;
+            if (stderr) {
+                return stderr;
+            }
         }
-        const stdout = sanitizeStopMessageAutoMessageOutput(result.stdout, maxOutputChars);
-        if (stdout) {
+        catch (error) {
             logStopMessageAutoMessageIflow({
                 requestId: args.requestId,
                 stage: 'response',
-                status: result.status ?? 0,
+                status: -1,
                 requestSummary,
-                responseSummary: summarizeStopMessageAutoMessageLog(stdout, STOP_MESSAGE_AUTOMESSAGE_LOG_SUMMARY_MAX_CHARS)
+                error: error instanceof Error ? error.message : String(error ?? 'unknown_error')
             });
-            return stdout;
         }
-        const stderr = sanitizeStopMessageAutoMessageOutput(result.stderr, maxOutputChars);
-        logStopMessageAutoMessageIflow({
-            requestId: args.requestId,
-            stage: 'response',
-            status: result.status ?? 0,
-            requestSummary,
-            responseSummary: summarizeStopMessageAutoMessageLog(stderr, STOP_MESSAGE_AUTOMESSAGE_LOG_SUMMARY_MAX_CHARS)
-        });
-        return stderr || null;
-    }
-    catch (error) {
-        logStopMessageAutoMessageIflow({
-            requestId: args.requestId,
-            stage: 'response',
-            status: -1,
-            requestSummary,
-            error: error instanceof Error ? error.message : String(error ?? 'unknown_error')
-        });
-        return null;
+        finally {
+            invocation.cleanup();
+        }
     }
+    return null;
+}
+export function renderStopMessageAutoFollowupViaIflow(args) {
+    return renderStopMessageAutoFollowupViaAi(args);
 }
 export function extractStopMessageAutoResponseSnapshot(base, adapterContext) {
     const providerProtocol = extractStopMessageProviderProtocol(adapterContext);
@@ -114,8 +140,8 @@ export function extractStopMessageAutoResponseSnapshot(base, adapterContext) {
         toNonEmptyText(payload.finish_reason).toLowerCase() ||
         toNonEmptyText(payload.status).toLowerCase() ||
         undefined;
-    const assistantText = responsesText || anthropicContent;
-    const reasoningText = responsesReasoning || anthropicReasoning;
+    const assistantText = dedupeAndJoinTexts([responsesText, anthropicContent]);
+    const reasoningText = dedupeAndJoinTexts([responsesReasoning, anthropicReasoning]);
     return {
         ...(providerProtocol ? { providerProtocol } : {}),
         ...(responseFinishReason ? { finishReason: responseFinishReason } : {}),
@@ -145,6 +171,17 @@ export function extractResponsesOutputText(base) {
         if (typeof item.type !== 'string')
             continue;
         const type = String(item.type).trim().toLowerCase();
+        if (type.includes('tool') || type.includes('function') || type.includes('call')) {
+            const toolText = extractUnknownText(item.input) ||
+                extractUnknownText(item.arguments) ||
+                extractUnknownText(item.args) ||
+                extractUnknownText(item.patch) ||
+                extractUnknownText(item);
+            if (toolText) {
+                chunks.push(toolText);
+            }
+            continue;
+        }
         if (type !== 'message')
             continue;
         const content = Array.isArray(item.content) ? (item.content) : [];
@@ -154,10 +191,21 @@ export function extractResponsesOutputText(base) {
             const pType = typeof part.type === 'string'
                 ? String(part.type).trim().toLowerCase()
                 : '';
-            if (pType === 'output_text') {
+            if (pType === 'output_text' || pType === 'text' || pType === 'input_text') {
                 const text = typeof part.text === 'string' ? String(part.text) : '';
                 if (text.trim().length)
                     chunks.push(text.trim());
+                continue;
+            }
+            const fallback = extractUnknownText(part.text) ||
+                extractUnknownText(part.input) ||
+                extractUnknownText(part.arguments) ||
+                extractUnknownText(part.args) ||
+                extractUnknownText(part.patch) ||
+                extractUnknownText(part.content) ||
+                extractUnknownText(part.value);
+            if (fallback) {
+                chunks.push(fallback);
             }
         }
     }
@@ -177,8 +225,11 @@ export function hasToolLikeOutput(value) {
         type === 'function_call' ||
         type.includes('tool'));
 }
-function isStopMessageAutoMessageIflowEnabled() {
-    const raw = String(process.env.ROUTECODEX_STOPMESSAGE_AUTOMESSAGE_IFLOW || '')
+function isStopMessageAutoMessageEnabled() {
+    const raw = String(process.env.ROUTECODEX_STOPMESSAGE_AI_FOLLOWUP_ENABLED ??
+        process.env.ROUTECODEX_STOPMESSAGE_AUTOMESSAGE_ENABLED ??
+        process.env.ROUTECODEX_STOPMESSAGE_AUTOMESSAGE_IFLOW ??
+        '')
         .trim()
         .toLowerCase();
     if (!raw) {
@@ -189,20 +240,63 @@ function isStopMessageAutoMessageIflowEnabled() {
     }
     return true;
 }
-function resolveStopMessageAutoMessageIflowCommand() {
-    const raw = String(process.env.ROUTECODEX_STOPMESSAGE_AUTOMESSAGE_IFLOW_BIN || '').trim();
+function resolveStopMessageAutoMessageBackendOrder() {
+    const preferred = resolveStopMessageAutoMessageBackend();
+    if (preferred === 'iflow') {
+        return ['iflow', 'codex'];
+    }
+    return ['codex', 'iflow'];
+}
+function resolveStopMessageAutoMessageBackend() {
+    const raw = String(process.env.ROUTECODEX_STOPMESSAGE_AI_FOLLOWUP_BACKEND ??
+        process.env.ROUTECODEX_STOPMESSAGE_AUTOMESSAGE_BACKEND ??
+        '').trim().toLowerCase();
+    if (raw === 'iflow') {
+        return 'iflow';
+    }
+    if (raw === 'codex') {
+        return 'codex';
+    }
+    const legacyIflowHint = String(process.env.ROUTECODEX_STOPMESSAGE_AUTOMESSAGE_IFLOW || '').trim().toLowerCase();
+    if (legacyIflowHint && legacyIflowHint !== '0' && legacyIflowHint !== 'false' && legacyIflowHint !== 'no' && legacyIflowHint !== 'off') {
+        return 'iflow';
+    }
+    return 'codex';
+}
+function resolveStopMessageAutoMessageCommand(backend) {
+    if (backend === 'codex') {
+        const codexRaw = String(process.env.ROUTECODEX_STOPMESSAGE_AI_FOLLOWUP_CODEX_BIN ??
+            process.env.ROUTECODEX_STOPMESSAGE_AUTOMESSAGE_CODEX_BIN ??
+            '').trim();
+        return codexRaw || 'codex';
+    }
+    const raw = String(process.env.ROUTECODEX_STOPMESSAGE_AI_FOLLOWUP_IFLOW_BIN ??
+        process.env.ROUTECODEX_STOPMESSAGE_AUTOMESSAGE_IFLOW_BIN ??
+        '').trim();
     return raw || 'iflow';
 }
-function resolveStopMessageAutoMessageIflowTimeoutMs() {
-    const raw = String(process.env.ROUTECODEX_STOPMESSAGE_AUTOMESSAGE_TIMEOUT_MS || '').trim();
+function resolveStopMessageAutoMessageWorkingDirectory(value) {
+    return typeof value === 'string' && value.trim() ? value.trim() : undefined;
+}
+function resolveStopMessageAutoMessageTimeoutMs(backend) {
+    const raw = String(process.env.ROUTECODEX_STOPMESSAGE_AI_FOLLOWUP_TIMEOUT_MS ??
+        process.env.ROUTECODEX_STOPMESSAGE_AUTOMESSAGE_TIMEOUT_MS ??
+        '').trim();
     const parsed = Number(raw);
     const explicitTimeout = Number.isFinite(parsed) && parsed > 0
         ? Math.max(200, Math.min(STOP_MESSAGE_AUTOMESSAGE_IFLOW_TIMEOUT_MAX_MS, Math.floor(parsed)))
         : STOP_MESSAGE_AUTOMESSAGE_IFLOW_TIMEOUT_MS;
     let resolvedTimeout = explicitTimeout;
-    const explicitCommand = String(process.env.ROUTECODEX_STOPMESSAGE_AUTOMESSAGE_IFLOW_BIN || '').trim();
-    const usingDefaultIflowCommand = !explicitCommand || explicitCommand === 'iflow';
-    if (process.env.JEST_WORKER_ID && usingDefaultIflowCommand) {
+    const explicitCommand = backend === 'codex'
+        ? String(process.env.ROUTECODEX_STOPMESSAGE_AI_FOLLOWUP_CODEX_BIN ??
+            process.env.ROUTECODEX_STOPMESSAGE_AUTOMESSAGE_CODEX_BIN ??
+            '').trim()
+        : String(process.env.ROUTECODEX_STOPMESSAGE_AI_FOLLOWUP_IFLOW_BIN ??
+            process.env.ROUTECODEX_STOPMESSAGE_AUTOMESSAGE_IFLOW_BIN ??
+            '').trim();
+    const defaultCommand = backend === 'codex' ? 'codex' : 'iflow';
+    const usingDefaultCommand = !explicitCommand || explicitCommand === defaultCommand;
+    if (process.env.JEST_WORKER_ID && usingDefaultCommand) {
         resolvedTimeout = Math.min(resolvedTimeout, STOP_MESSAGE_AUTOMESSAGE_IFLOW_TIMEOUT_TEST_CAP_MS);
     }
     const followupTimeoutRaw = String(process.env.ROUTECODEX_SERVERTOOL_FOLLOWUP_TIMEOUT_MS || '').trim();
@@ -213,8 +307,45 @@ function resolveStopMessageAutoMessageIflowTimeoutMs() {
     }
     return resolvedTimeout;
 }
+function createStopMessageAutoMessageInvocation(backend, prompt) {
+    if (backend !== 'codex') {
+        return {
+            args: ['-p', prompt],
+            cleanup: () => {
+                // no-op
+            }
+        };
+    }
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'routecodex-stopmessage-codex-'));
+    const outputFilePath = path.join(dir, 'last-message.txt');
+    return {
+        args: ['exec', '--color', 'never', '--skip-git-repo-check', '--output-last-message', outputFilePath, prompt],
+        outputFilePath,
+        cleanup: () => {
+            try {
+                fs.rmSync(dir, { recursive: true, force: true });
+            }
+            catch {
+                // ignore cleanup errors
+            }
+        }
+    };
+}
+function readStopMessageAutoMessageCodexOutput(outputFilePath) {
+    if (!outputFilePath) {
+        return '';
+    }
+    try {
+        return fs.readFileSync(outputFilePath, 'utf8');
+    }
+    catch {
+        return '';
+    }
+}
 function resolveStopMessageAutoMessageIflowOutputMaxChars() {
-    const raw = String(process.env.ROUTECODEX_STOPMESSAGE_AUTOMESSAGE_OUTPUT_MAX_CHARS || '').trim();
+    const raw = String(process.env.ROUTECODEX_STOPMESSAGE_AI_FOLLOWUP_OUTPUT_MAX_CHARS ??
+        process.env.ROUTECODEX_STOPMESSAGE_AUTOMESSAGE_OUTPUT_MAX_CHARS ??
+        '').trim();
     const parsed = Number(raw);
     if (!Number.isFinite(parsed) || parsed <= 0) {
         return STOP_MESSAGE_AUTOMESSAGE_OUTPUT_MAX_CHARS;
@@ -246,26 +377,69 @@ function truncateStopMessageAutoMessagePrompt(value, maxChars) {
     }
     return `${text.slice(0, maxChars)}...`;
 }
-function buildStopMessageAutoMessageIflowPrompt(args) {
+function buildStopMessageAutoMessageIflowPrompt(args, backend) {
+    const usedRepeats = Math.max(0, Math.floor(args.usedRepeats));
+    const maxRepeats = Math.max(0, Math.floor(args.maxRepeats));
+    const nextRound = usedRepeats + 1;
+    const roundsLabel = maxRepeats > 0 ? `${nextRound}/${maxRepeats}` : `${nextRound}/n/a`;
+    const remaining = maxRepeats > 0 ? Math.max(0, maxRepeats - nextRound) : 0;
+    const overallGoal = (typeof args.candidateFollowupText === 'string' && args.candidateFollowupText.trim()) ||
+        (typeof args.baseStopMessageText === 'string' && args.baseStopMessageText.trim()) ||
+        '继续执行';
+    const approvedMarker = resolveStopMessageAiApprovedMarker(args.approvedMarker);
+    const completionClaimed = args.completionClaimed === true;
+    const isFirstPrompt = Boolean(args.isFirstPrompt);
+    const historyBlock = renderStopMessageAiHistoryEntries(args.historyEntries);
     const lines = [
-        '你是 RouteCodex 的 stopMessage followup 文案生成器。',
-        '目标：基于本轮 finish_reason=stop 的模型原始响应，生成“下一步用户 followup 消息文本”。',
-        '输出要求（严格）：',
+        isFirstPrompt
+            ? '你是 RouteCodex 的 ai-followup 生成器（首次引导）。'
+            : '你是 RouteCodex 的 ai-followup 生成器（续轮系统约束）。',
+        '角色定位：你是“执行审稿人（reviewer）”，默认做审慎核验但不要吹毛求疵，仍以证据驱动判断。',
+        '任务：根据“短期目标（用户输入） + 当前执行进度 + 模型反馈消息内容 + 历史记录（xxx）”，生成下一步用户 followup 消息。',
+        isFirstPrompt ? '首次提示词（完整规则）:' : '续轮系统提示词（延续同一目标）:',
         '1) 只输出一段可直接注入的用户消息文本；不要解释、不要 JSON、不要代码块。',
-        '2) 必须基于 assistantText / reasoningText / responseExcerpt 的实际内容给出具体下一步动作。',
-        '3) 必须包含至少一个可执行动作（如具体文件、命令、检查点、验证目标）。',
-        '4) 禁止输出空泛短答：如“继续”“继续执行”“好的”“收到”“ok”。',
-        '5) 语气直接，不要复述流程，不要问选择题。',
+        '1.1) 输出目标固定为：根据当前状态调整后的下一步 followup 消息文本。',
+        '2) 模型反馈=消息内容（assistantText/reasoningText/responseExcerpt）；你的指令必须基于这些实际内容，不得凭空编造状态。',
+        '3) 先做代码 review（最多一句），再给指令：必须结合 workingDirectory 下当前实现/测试/构建状态给出建议；不能只做抽象建议。',
+        '3.1) 主模型若声明“完成了某项”，优先核验与 overallGoal 直接相关的关键项；非关键分支/小目标可记录为后续补充验证，不必阻塞推进。',
+        '3.2) 通过标准以“总体目标是否达成”为主；当主目标证据充分时，允许次要项暂未验证，并给出后续补测建议。',
+        '3.3) 若主模型声称“无法完成/被阻塞”，你必须要求其提供阻塞证据，并判断是否存在可继续推进的最小可执行动作。',
+        '3.4) 必要时必须要求其打开并检查已改代码（明确到文件），再给出具体修改建议，不允许停留在抽象层面。',
+        '4) 必须包含至少一个可执行动作（具体文件、命令、检查点或验证目标），并尽量最小化下一步范围；优先“写动作”（改代码/补测试）。',
+        '5) 禁止输出空泛短答：如“继续”“继续执行”“好的”“收到”“ok”。',
+        '6) 禁止把回复做成纯状态汇总；默认是推进执行，直到阶段目标或总体目标完成。',
+        '7) 只有在消息内容或历史记录里存在明确证据时，才允许判断“偏离目标”；否则按同轨推进，不要泛化指责偏离。',
+        '8) 若判定偏离，必须在指令里点明证据来源（来自消息内容或历史记录）并给出回轨的最小动作；若无证据，直接给下一步动作。',
+        '9) 禁止把 review 责任交回主模型（例如“请你先自己 review/自查代码”）；review 必须由你（ai-followup）先完成。',
+        '10) 禁止连续安排纯只读/纯汇报命令（如 cargo llvm-cov report、cat/head/tail/rg/git status）；若上一轮没有代码修改证据，本轮必须先给出写动作（修改文件或新增测试），再允许验证命令。',
+        '11) 覆盖率类命令只能作为写动作后的验证步骤，不能作为本轮唯一或首要动作。',
+        completionClaimed
+            ? '12) 参考信号：主模型本轮声称“已完成”，但你必须独立核验，不能直接采信。'
+            : '12) 主模型未显式声称完成；你仍可基于证据独立判断是否达成总体目标。',
+        `13) 当关键路径证据充分且确认已完成总体目标时，允许只输出 ${approvedMarker} 作为唯一内容；若仅剩非关键小项未验证，也可判定通过并建议后续补齐。`,
+        `14) 若证据不足或主目标未达成，严禁输出 ${approvedMarker}。`,
+        '',
+        '本轮注入上下文（必须参考）：',
+        `overallGoal(短期目标): ${overallGoal}`,
         '',
         `baseStopMessage: ${args.baseStopMessageText || 'n/a'}`,
         `candidateFollowup: ${args.candidateFollowupText || 'n/a'}`,
-        `repeat: ${Math.max(0, args.usedRepeats) + 1}/${Math.max(0, args.maxRepeats)}`,
+        `repeat: ${roundsLabel}`,
+        `progress: used=${usedRepeats} next=${nextRound} max=${maxRepeats > 0 ? maxRepeats : 'n/a'} remaining=${maxRepeats > 0 ? remaining : 'n/a'}`,
         `requestId: ${args.requestId || 'n/a'}`,
         `sessionId: ${args.sessionId || 'n/a'}`,
         `providerKey: ${args.providerKey || 'n/a'}`,
         `model: ${args.model || 'n/a'}`,
+        `workingDirectory: ${args.workingDirectory || 'n/a'}`,
+        `completionClaimedByMainModel: ${completionClaimed ? 'yes' : 'no'}`,
+        `reviewApprovedMarker: ${approvedMarker}`,
+        'historyRecord(xxx): 见下方 stopMessage 历史轨迹',
+        'modelFeedback(消息内容): 见下方 assistantText/reasoningText/responseExcerpt',
+        '',
+        'stopMessage 历史轨迹（最近轮次，按时间升序）：',
+        historyBlock,
         '',
-        '本轮模型响应（结构化摘录）：',
+        '当前模型反馈（结构化摘录）：',
         `responseProtocol: ${args.responseSnapshot.providerProtocol || 'n/a'}`,
         `finishReason: ${args.responseSnapshot.finishReason || 'n/a'}`,
         '',
@@ -278,9 +452,44 @@ function buildStopMessageAutoMessageIflowPrompt(args) {
         'responseExcerpt:',
         truncateStopMessageAutoMessagePrompt(args.responseSnapshot.responseExcerpt || 'n/a', 6_000)
     ];
-    lines.push('', '现在直接输出下一步 followup 消息文本。');
+    const closingInstruction = `现在做完成校验：若确认已完成，仅输出 ${approvedMarker}；否则输出“根据当前状态调整后的下一步 followup 消息文本”。`;
+    lines.push('', closingInstruction);
     const prompt = lines.join('\n').trim();
-    return truncateStopMessageAutoMessagePrompt(prompt, STOP_MESSAGE_AUTOMESSAGE_PROMPT_MAX_CHARS);
+    if (prompt.length <= STOP_MESSAGE_AUTOMESSAGE_PROMPT_MAX_CHARS) {
+        return prompt;
+    }
+    const reserve = closingInstruction.length + 4;
+    if (STOP_MESSAGE_AUTOMESSAGE_PROMPT_MAX_CHARS <= reserve + 32) {
+        return truncateStopMessageAutoMessagePrompt(prompt, STOP_MESSAGE_AUTOMESSAGE_PROMPT_MAX_CHARS);
+    }
+    const headLimit = STOP_MESSAGE_AUTOMESSAGE_PROMPT_MAX_CHARS - reserve - 3;
+    const head = prompt.slice(0, headLimit).trimEnd();
+    return `${head}...\n\n${closingInstruction}`;
+}
+export function buildStopMessageAutoMessageIflowPromptForTests(args, backend = 'iflow') {
+    return buildStopMessageAutoMessageIflowPrompt(args, backend);
+}
+function renderStopMessageAiHistoryEntries(entries) {
+    if (!Array.isArray(entries) || entries.length === 0) {
+        return '- (empty)';
+    }
+    const normalized = entries
+        .slice(-8)
+        .map((entry) => {
+        const round = Number.isFinite(entry?.round) ? Math.max(0, Math.floor(entry.round)) : 0;
+        const assistant = truncateStopMessageAutoMessagePrompt(String(entry?.assistantText || ''), 280);
+        const followup = truncateStopMessageAutoMessagePrompt(String(entry?.followupText || ''), 280);
+        const reasoning = truncateStopMessageAutoMessagePrompt(String(entry?.reasoningText || ''), 220);
+        const parts = [
+            `round=${round || 'n/a'}`,
+            assistant ? `assistant=${assistant}` : '',
+            reasoning ? `reasoning=${reasoning}` : '',
+            followup ? `followup=${followup}` : ''
+        ].filter(Boolean);
+        return `- ${parts.join(' | ')}`;
+    })
+        .filter((line) => line.trim().length > 0);
+    return normalized.length > 0 ? normalized.join('\n') : '- (empty)';
 }
 function summarizeStopMessageAutoMessageLog(value, maxChars) {
     const text = typeof value === 'string' ? value : '';
@@ -296,8 +505,32 @@ function summarizeStopMessageAutoMessageLog(value, maxChars) {
     }
     return `${singleLine.slice(0, maxChars)}...`;
 }
+export function resolveStopMessageAiDoneMarker(value) {
+    const explicit = typeof value === 'string' && value.trim() ? value.trim() : '';
+    if (explicit) {
+        return explicit;
+    }
+    const envValue = String(process.env.ROUTECODEX_STOPMESSAGE_AI_DONE_MARKER || '').trim();
+    if (envValue) {
+        return envValue;
+    }
+    return DEFAULT_STOP_MESSAGE_AI_DONE_MARKER;
+}
+export function resolveStopMessageAiApprovedMarker(value) {
+    const explicit = typeof value === 'string' && value.trim() ? value.trim() : '';
+    if (explicit) {
+        return explicit;
+    }
+    const envValue = String(process.env.ROUTECODEX_STOPMESSAGE_AI_APPROVED_MARKER || '').trim();
+    if (envValue) {
+        return envValue;
+    }
+    return DEFAULT_STOP_MESSAGE_AI_APPROVED_MARKER;
+}
 function isStopMessageAutoMessageIflowTraceEnabled() {
-    const raw = String(process.env.ROUTECODEX_STOPMESSAGE_IFLOW_TRACE || '').trim().toLowerCase();
+    const raw = String(process.env.ROUTECODEX_STOPMESSAGE_AI_FOLLOWUP_TRACE ??
+        process.env.ROUTECODEX_STOPMESSAGE_IFLOW_TRACE ??
+        '').trim().toLowerCase();
     if (!raw) {
         return true;
     }
@@ -307,6 +540,29 @@ function isStopMessageAutoMessageIflowTraceEnabled() {
     return true;
 }
 function logStopMessageAutoMessageIflow(args) {
+    const requestId = args.requestId && args.requestId.trim() ? args.requestId.trim() : 'unknown';
+    const stage = args.stage;
+    const statusToken = typeof args.status === 'number' ? ` status=${args.status}` : '';
+    const errorToken = args.error ? ` error=${args.error}` : '';
+    const requestSummary = args.requestSummary || '';
+    const responseSummary = args.responseSummary || '';
+    const eventMessage = stage === 'request'
+        ? requestSummary
+        : `${requestSummary}${requestSummary && (responseSummary || statusToken || errorToken) ? ' | ' : ''}${responseSummary}${statusToken}${errorToken}`.trim();
+    const eventResult = stage === 'request'
+        ? 'sent'
+        : args.error || (typeof args.status === 'number' && args.status !== 0)
+            ? 'failed'
+            : 'completed';
+    appendServerToolProgressFileEvent({
+        requestId,
+        flowId: 'stop_message_flow',
+        tool: 'ai_followup',
+        stage,
+        result: eventResult,
+        message: eventMessage,
+        step: stage === 'request' ? 3 : 4
+    });
     if (!isStopMessageAutoMessageIflowTraceEnabled()) {
         return;
     }
@@ -316,7 +572,7 @@ function logStopMessageAutoMessageIflow(args) {
             const request = args.requestSummary || '';
             // cyan: outbound request summary
             // eslint-disable-next-line no-console
-            console.log(`\x1b[38;5;45m[servertool][iflow-automessage] SEND${requestIdPart} ${request}\x1b[0m`);
+            console.log(`\x1b[38;5;45m[servertool][ai-followup] SEND${requestIdPart} ${request}\x1b[0m`);
             return;
         }
         const response = args.responseSummary || '';
@@ -325,12 +581,12 @@ function logStopMessageAutoMessageIflow(args) {
             const errorPart = args.error ? ` error=${args.error}` : '';
             // red: failed response summary
             // eslint-disable-next-line no-console
-            console.log(`\x1b[38;5;196m[servertool][iflow-automessage] RECV${requestIdPart}${statusPart}${errorPart} ${response}\x1b[0m`);
+            console.log(`\x1b[38;5;196m[servertool][ai-followup] RECV${requestIdPart}${statusPart}${errorPart} ${response}\x1b[0m`);
             return;
         }
         // green: successful response summary
         // eslint-disable-next-line no-console
-        console.log(`\x1b[38;5;46m[servertool][iflow-automessage] RECV${requestIdPart} ${response}\x1b[0m`);
+        console.log(`\x1b[38;5;46m[servertool][ai-followup] RECV${requestIdPart} ${response}\x1b[0m`);
     }
     catch {
         // ignore logging failures
@@ -346,11 +602,44 @@ function extractStopMessageProviderProtocol(adapterContext) {
     return fromRuntime || undefined;
 }
 function extractStopMessageAssistantText(message) {
+    const chunks = [];
     const contentText = extractTextFromMessageContent(message.content);
     if (contentText) {
-        return contentText;
+        chunks.push(contentText);
+    }
+    const directKeys = [
+        'text',
+        'output_text',
+        'response',
+        'summary',
+        'message',
+        'result',
+        'command',
+        'patch'
+    ];
+    for (const key of directKeys) {
+        const text = extractUnknownText(message[key]);
+        if (text) {
+            chunks.push(text);
+        }
     }
-    return extractUnknownText(message.content);
+    const toolLikeKeys = [
+        'tool_calls',
+        'tool_call',
+        'function_call',
+        'tool_use',
+        'input',
+        'arguments',
+        'args',
+        'payload'
+    ];
+    for (const key of toolLikeKeys) {
+        const text = extractUnknownText(message[key]);
+        if (text) {
+            chunks.push(text);
+        }
+    }
+    return dedupeAndJoinTexts(chunks);
 }
 function extractStopMessageReasoningText(message) {
     const explicitKeys = [
@@ -447,7 +736,26 @@ function extractUnknownText(value, depth = 0) {
         return '';
     }
     const record = value;
-    const priorityKeys = ['text', 'content', 'value', 'summary', 'reasoning', 'thinking', 'analysis'];
+    const priorityKeys = [
+        'text',
+        'content',
+        'value',
+        'summary',
+        'reasoning',
+        'thinking',
+        'analysis',
+        'function',
+        'input',
+        'arguments',
+        'args',
+        'patch',
+        'payload',
+        'result',
+        'command',
+        'message',
+        'output_text',
+        'name'
+    ];
     const parts = [];
     for (const key of priorityKeys) {
         if (!(key in record)) {