@jsonstudio/llms 0.6.2172 → 0.6.2979

package/dist/conversion/shared/tool-governor.js

@@ -6,9 +6,37 @@ import { augmentOpenAITools } from '../../guidance/index.js';
 import { validateToolCall } from '../../tools/tool-registry.js';
 import { captureApplyPatchRegression } from '../../tools/patch-regression-capturer.js';
 import { normalizeExecCommandArgs } from '../../tools/exec-command/normalize.js';
+import { readRuntimeMetadata } from './runtime-metadata.js';
 function isObject(v) { return !!v && typeof v === 'object' && !Array.isArray(v); }
 // Note: tool schema strict augmentation removed per alignment
 function enforceChatBudget(chat, _modelId) { return chat; }
+function resolveExecCommandGuardValidationOptions(payload) {
+    const carrier = isObject(payload.metadata)
+        ? payload.metadata
+        : payload;
+    const rt = readRuntimeMetadata(carrier);
+    if (!rt || typeof rt !== 'object') {
+        return undefined;
+    }
+    const guardRaw = rt.execCommandGuard;
+    if (!guardRaw || typeof guardRaw !== 'object' || Array.isArray(guardRaw)) {
+        return undefined;
+    }
+    const guard = guardRaw;
+    const enabled = guard.enabled === true;
+    if (!enabled) {
+        return undefined;
+    }
+    const policyFile = typeof guard.policyFile === 'string' && guard.policyFile.trim().length
+        ? guard.policyFile.trim()
+        : undefined;
+    return {
+        execCommandGuard: {
+            enabled: true,
+            ...(policyFile ? { policyFile } : {})
+        }
+    };
+}
 function isTruthyEnv(value) {
     const v = typeof value === 'string' ? value.trim().toLowerCase() : '';
     return v === '1' || v === 'true' || v === 'yes' || v === 'on';
@@ -116,9 +144,11 @@ function buildExecCommandGuardScript(reason, message) {
         ? 'blocked by exec_command guard: git reset --hard is forbidden. Use git reset --mixed REF or git restore --source REF -- FILE.'
         : reason === 'forbidden_git_checkout_scope'
             ? 'blocked by exec_command guard: git checkout is allowed only for a single file. Use git checkout -- FILE or git checkout REF -- FILE.'
-            : message && message.trim()
-                ? `blocked by exec_command guard: ${message.trim()}`
-                : fallback;
+            : reason === 'forbidden_exec_command_policy'
+                ? `policy 不允许: ${(message || '').trim() || 'command blocked by policy'}`
+                : message && message.trim()
+                    ? `blocked by exec_command guard: ${message.trim()}`
+                    : fallback;
     const compact = detail.replace(/\s+/g, ' ').trim() || fallback;
     return `bash -lc "printf '%s\\n' ${shellSingleQuote(compact)} >&2; exit 2"`;
 }
@@ -158,7 +188,7 @@ function buildBlockedExecCommandArgs(rawArgs, reason, message) {
     }
 }
 const EXEC_COMMAND_NAME_AS_COMMAND_PATTERN = /^(?:rg|wc|cat|ls|find|grep|git|sed|head|tail|awk|bash|sh|zsh|node|npm|pnpm|yarn|bd|echo|cp|mv|rm|mkdir|python|python3|perl|ruby)\b/i;
-function repairCommandNameAsExecToolCall(fn) {
+function repairCommandNameAsExecToolCall(fn, validationOptions) {
     try {
         if (!fn)
             return false;
@@ -195,7 +225,7 @@ function repairCommandNameAsExecToolCall(fn) {
         if (typeof argsObj.cwd === 'string' && (!argsObj.workdir || typeof argsObj.workdir !== 'string')) {
             argsObj.workdir = String(argsObj.cwd);
         }
-        const validation = validateToolCall('exec_command', JSON.stringify(argsObj));
+        const validation = validateToolCall('exec_command', JSON.stringify(argsObj), validationOptions);
         if (validation.ok && typeof validation.normalizedArgs === 'string') {
             fn.arguments = validation.normalizedArgs;
         }
@@ -247,114 +277,6 @@ function tryWriteSnapshot(options, stage, data) {
  * - Inject/Refine system tool guidance (idempotent)
  * - Canonicalize structured tool_calls; set content=null when applicable
  */
-const IMAGE_EXT_RE = /\.(png|jpe?g|gif|webp|bmp|svg)(?:[?#].*)?$/i;
-function hasImageReference(messages) {
-    if (!Array.isArray(messages))
-        return false;
-    for (const entry of messages) {
-        if (!entry || typeof entry !== 'object')
-            continue;
-        const content = entry.content;
-        if (!content)
-            continue;
-        if (Array.isArray(content)) {
-            if (content.some((part) => isImagePart(part)))
-                return true;
-        }
-        else if (isObject(content)) {
-            if (isImagePart(content))
-                return true;
-        }
-        else if (typeof content === 'string') {
-            if (stringHasImageLink(content))
-                return true;
-        }
-    }
-    return false;
-}
-function hasInputImage(entries) {
-    if (!Array.isArray(entries))
-        return false;
-    for (const entry of entries) {
-        if (!entry || typeof entry !== 'object')
-            continue;
-        const type = String(entry.type || '').toLowerCase();
-        if (type.includes('image'))
-            return true;
-        const content = entry.content;
-        if (!content)
-            continue;
-        if (Array.isArray(content)) {
-            if (content.some((part) => isImagePart(part)))
-                return true;
-        }
-        else if (isObject(content)) {
-            if (isImagePart(content))
-                return true;
-        }
-    }
-    return false;
-}
-function attachmentsHaveImage(payload) {
-    const attachments = payload?.attachments;
-    if (!Array.isArray(attachments))
-        return false;
-    for (const attachment of attachments) {
-        if (!attachment || typeof attachment !== 'object')
-            continue;
-        const mime = typeof attachment.mime === 'string' ? attachment.mime.toLowerCase() : '';
-        if (mime.startsWith('image/'))
-            return true;
-        const name = typeof attachment.name === 'string' ? attachment.name : '';
-        if (IMAGE_EXT_RE.test(name))
-            return true;
-        const url = typeof attachment.url === 'string' ? attachment.url : '';
-        if (stringHasImageLink(url))
-            return true;
-    }
-    return false;
-}
-function stringHasImageLink(value) {
-    if (!value)
-        return false;
-    if (value.includes('cid:'))
-        return true;
-    if (IMAGE_EXT_RE.test(value))
-        return true;
-    const lowered = value.toLowerCase();
-    return lowered.includes('image://');
-}
-function isImagePart(part) {
-    if (!part || typeof part !== 'object')
-        return false;
-    const type = String(part.type || '').toLowerCase();
-    if (type.includes('image'))
-        return true;
-    const imageUrl = part.image_url || part.imageUrl;
-    if (typeof imageUrl === 'string')
-        return true;
-    if (isObject(imageUrl) && typeof imageUrl.url === 'string')
-        return true;
-    const url = part.url;
-    if (typeof url === 'string' && stringHasImageLink(url))
-        return true;
-    return false;
-}
-function shouldExposeViewImage(payload) {
-    if (hasImageReference(payload?.messages))
-        return true;
-    if (hasInputImage(payload?.input))
-        return true;
-    if (attachmentsHaveImage(payload))
-        return true;
-    return false;
-}
-function isViewImageTool(tool) {
-    if (!tool || typeof tool !== 'object')
-        return false;
-    const name = String(tool.name || tool?.function?.name || '').toLowerCase();
-    return name === 'view_image';
-}
 export function processChatRequestTools(request, opts) {
     const options = { ...(opts || {}) };
     if (!isObject(request))
@@ -365,13 +287,6 @@ export function processChatRequestTools(request, opts) {
     try {
         let tools = Array.isArray(out?.tools) ? out.tools : [];
         if (tools.length > 0) {
-            if (!shouldExposeViewImage(out)) {
-                const filtered = tools.filter((tool) => !isViewImageTool(tool));
-                if (filtered.length !== tools.length) {
-                    tools = filtered;
-                    out.tools = tools;
-                }
-            }
             for (const t of tools) {
                 if (!t || typeof t !== 'object')
                     continue;
@@ -425,10 +340,11 @@ export function processChatRequestTools(request, opts) {
  * Process OpenAI Chat response (choices[0].message) with unified 标准 governance.
  * - Canonicalize structured tool_calls; ensure finish_reason and content=null policy
  */
-import { repairArgumentsToString, parseLenient } from './jsonish.js';
+import { parseLenientJsonishWithNative as parseLenient, repairArgumentsToStringWithNative as repairArgumentsToString } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
 export function normalizeApplyPatchToolCallsOnResponse(chat) {
     try {
         const out = JSON.parse(JSON.stringify(chat));
+        const validationOptions = resolveExecCommandGuardValidationOptions(out);
         const choices = Array.isArray(out?.choices) ? out.choices : [];
         for (const ch of choices) {
             const msg = ch && ch.message ? ch.message : undefined;
@@ -438,7 +354,7 @@ export function normalizeApplyPatchToolCallsOnResponse(chat) {
             for (const tc of tcs) {
                 try {
                     const fn = tc && tc.function ? tc.function : undefined;
-                    repairCommandNameAsExecToolCall(fn);
+                    repairCommandNameAsExecToolCall(fn, validationOptions);
                     rewriteExecCommandApplyPatchCall(fn);
                     const name = typeof fn?.name === 'string' ? String(fn.name).trim().toLowerCase() : '';
                     if (name !== 'apply_patch')
@@ -488,6 +404,7 @@ export function normalizeApplyPatchToolCallsOnRequest(request) {
 function normalizeSpecialToolCallsOnRequest(request) {
     try {
         const out = JSON.parse(JSON.stringify(request));
+        const validationOptions = resolveExecCommandGuardValidationOptions(out);
         const messages = Array.isArray(out?.messages) ? out.messages : [];
         // 仅针对「当轮」工具调用做校验与形态修复：选择最后一条 assistant 消息
         let lastAssistantIndex = -1;
@@ -516,7 +433,7 @@ function normalizeSpecialToolCallsOnRequest(request) {
             for (const tc of tcs) {
                 try {
                     const fn = tc && tc.function ? tc.function : undefined;
-                    repairCommandNameAsExecToolCall(fn);
+                    repairCommandNameAsExecToolCall(fn, validationOptions);
                     if (rewriteExecCommandApplyPatchCall(fn)) {
                         rewrittenNestedApplyPatchCount += 1;
                     }
@@ -555,7 +472,7 @@ function normalizeSpecialToolCallsOnRequest(request) {
                     // exec_command 兼容：TOON / map / string 一律收敛为 { cmd, command, workdir, ... }
                     if (name === 'exec_command') {
                         const argsStr = repairArgumentsToString(rawArgs);
-                        const validation = validateToolCall('exec_command', argsStr);
+                        const validation = validateToolCall('exec_command', argsStr, validationOptions);
                         if (validation && validation.ok && typeof validation.normalizedArgs === 'string') {
                             fn.arguments = validation.normalizedArgs;
                         }
@@ -603,6 +520,7 @@ function enhanceResponseToolArguments(chat) {
         if (!enable)
             return chat;
         const out = JSON.parse(JSON.stringify(chat));
+        const validationOptions = resolveExecCommandGuardValidationOptions(out);
         const choices = Array.isArray(out?.choices) ? out.choices : [];
         for (const ch of choices) {
             const msg = ch && ch.message ? ch.message : undefined;
@@ -686,7 +604,7 @@ function enhanceResponseToolArguments(chat) {
                         }
                     }
                     else if (name === 'exec_command') {
-                        const validation = validateToolCall('exec_command', repaired);
+                        const validation = validateToolCall('exec_command', repaired, validationOptions);
                         if (validation.ok && typeof validation.normalizedArgs === 'string') {
                             finalStr = validation.normalizedArgs;
                         }

package/dist/conversion/shared/tool-harvester.js

@@ -4,6 +4,7 @@
 // - Handles structural shapes (function_call legacy, tool_calls)
 // - Normalizes arguments (single JSON string), sets finish_reason when applicable
 import { isStructuredApplyPatchPayload } from '../../tools/apply-patch-structured.js';
+import { repairArgumentsToStringWithNative } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
 function isObject(v) {
     return !!v && typeof v === 'object' && !Array.isArray(v);
 }
@@ -18,14 +19,7 @@ function hashString(s) {
     }
 }
 function toJsonString(v) {
-    if (typeof v === 'string')
-        return v;
-    try {
-        return JSON.stringify(v ?? {});
-    }
-    catch {
-        return '{}';
-    }
+    return repairArgumentsToStringWithNative(v);
 }
 function genId(ctx, i = 0) {
     const p = ctx?.idPrefix || 'call';

package/dist/conversion/shared/tool-mapping.js

@@ -1,3 +1,4 @@
+import { sanitizeResponsesFunctionNameWithNative } from '../../router/virtual-router/engine-selection/native-hub-pipeline-resp-semantics.js';
 export function stringifyArgs(args) {
     if (typeof args === 'string')
         return args;
@@ -73,11 +74,7 @@ function enforceBuiltinToolSchema(name, candidate) {
     return asSchema(candidate);
 }
 const DEFAULT_SANITIZER = (value) => {
-    if (typeof value === 'string') {
-        const trimmed = value.trim();
-        return trimmed.length ? trimmed : undefined;
-    }
-    return undefined;
+    return sanitizeResponsesFunctionNameWithNative(value);
 };
 function resolveToolName(candidate, options) {
     const sanitized = options?.sanitizeName?.(candidate);

package/dist/conversion/shared/tooling.d.ts

@@ -1,7 +1,3 @@
-/**
- * Shared helpers for standard tool normalization (shell packing rules).
- * The goal is deterministic, minimal shaping so executors succeed consistently.
- */
 export interface ShellArgs {
     command: string | string[];
     workdir?: string;

package/dist/conversion/shared/tooling.js

@@ -2,6 +2,7 @@
  * Shared helpers for standard tool normalization (shell packing rules).
  * The goal is deterministic, minimal shaping so executors succeed consistently.
  */
+import { parseLenientJsonishWithNative } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
 // We intentionally do NOT evaluate shell control operators (&&, |, etc.).
 // Codex CLI executor runs argv directly (execvp-like), not through a shell.
 // So we avoid wrapping with "bash -lc" and leave such tokens as-is.
@@ -45,6 +46,23 @@ export function splitCommandString(input) {
     const s = input.trim();
     if (!s)
         return [];
+    try {
+        if (s.startsWith('{') || s.startsWith('[')) {
+            const parsed = parseLenientJsonishWithNative(s);
+            if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+                const command = parsed.command;
+                if (Array.isArray(command)) {
+                    const tokens = command.map((entry) => String(entry ?? '')).map((entry) => entry.trim()).filter(Boolean);
+                    if (tokens.length) {
+                        return tokens;
+                    }
+                }
+            }
+        }
+    }
+    catch {
+        // Keep legacy parser path when native parse returns non-command payload.
+    }
     const out = [];
     let cur = '';
     let inSingle = false;

package/dist/router/virtual-router/engine/provider-key/parse.d.ts

@@ -1,6 +1 @@
-import type { ProviderRegistry } from '../../provider-registry.js';
-export declare function extractProviderId(providerKey: string): string | null;
-export declare function normalizeAliasDescriptor(alias: string): string;
-export declare function extractKeyAlias(providerKey: string): string | null;
-export declare function extractKeyIndex(providerKey: string): number | undefined;
-export declare function getProviderModelId(providerKey: string, providerRegistry: ProviderRegistry): string | null;
+export { extractProviderId, normalizeAliasDescriptor, extractKeyAlias, extractKeyIndex, getProviderModelId } from '../../engine-selection/key-parsing.js';

package/dist/router/virtual-router/engine/provider-key/parse.js

@@ -1,43 +1 @@
-export function extractProviderId(providerKey) {
-    const firstDot = providerKey.indexOf('.');
-    if (firstDot <= 0)
-        return null;
-    return providerKey.substring(0, firstDot);
-}
-export function normalizeAliasDescriptor(alias) {
-    if (/^\d+-/.test(alias)) {
-        return alias.replace(/^\d+-/, '');
-    }
-    return alias;
-}
-export function extractKeyAlias(providerKey) {
-    const parts = providerKey.split('.');
-    if (parts.length === 3) {
-        return normalizeAliasDescriptor(parts[1]);
-    }
-    return null;
-}
-export function extractKeyIndex(providerKey) {
-    const parts = providerKey.split('.');
-    if (parts.length === 2) {
-        const index = parseInt(parts[1], 10);
-        if (!isNaN(index) && index > 0) {
-            return index;
-        }
-    }
-    return undefined;
-}
-export function getProviderModelId(providerKey, providerRegistry) {
-    const profile = providerRegistry.get(providerKey);
-    if (profile.modelId) {
-        return profile.modelId;
-    }
-    const parts = providerKey.split('.');
-    if (parts.length === 2) {
-        return parts[1] || null;
-    }
-    if (parts.length === 3) {
-        return parts[2] || null;
-    }
-    return null;
-}
+export { extractProviderId, normalizeAliasDescriptor, extractKeyAlias, extractKeyIndex, getProviderModelId } from '../../engine-selection/key-parsing.js';

package/dist/router/virtual-router/engine/routing-state/store.js

@@ -1,8 +1,31 @@
 import { mergeStopMessageFromPersisted } from '../../stop-message-state-sync.js';
+function readToken(value) {
+    if (typeof value !== 'string') {
+        return '';
+    }
+    const trimmed = value.trim();
+    return trimmed || '';
+}
+function isPersistentScopeKey(key) {
+    if (!key) {
+        return false;
+    }
+    return key.startsWith('session:')
+        || key.startsWith('conversation:')
+        || key.startsWith('tmux:');
+}
 export function resolveStopMessageScope(metadata) {
-    const sessionId = typeof metadata?.sessionId === 'string' ? String(metadata.sessionId).trim() : '';
-    if (sessionId) {
-        return `session:${sessionId}`;
+    const explicitScope = readToken(metadata?.stopMessageClientInjectSessionScope)
+        || readToken(metadata?.stopMessageClientInjectScope);
+    if (explicitScope && explicitScope.startsWith('tmux:')) {
+        return explicitScope;
+    }
+    const tmuxSessionId = readToken(metadata?.clientTmuxSessionId)
+        || readToken(metadata?.client_tmux_session_id)
+        || readToken(metadata?.tmuxSessionId)
+        || readToken(metadata?.tmux_session_id);
+    if (tmuxSessionId) {
+        return `tmux:${tmuxSessionId}`;
     }
     return undefined;
 }
@@ -12,7 +35,7 @@ export function getRoutingInstructionState(stickyKey, routingInstructionState, r
     // 对 session:/conversation: 作用域，在每次读取时尝试从磁盘刷新 stopMessage 相关字段，
     // 确保 servertool（如 stop_message_auto）通过 sticky-session-store 更新的使用次数
     // 能在 VirtualRouter 日志中实时反映出来。
-    if (existing && (key.startsWith('session:') || key.startsWith('conversation:'))) {
+    if (existing && isPersistentScopeKey(key)) {
         try {
             const persisted = routingStateStore.loadSync(key);
             const merged = mergeStopMessageFromPersisted(existing, persisted);
@@ -22,6 +45,10 @@ export function getRoutingInstructionState(stickyKey, routingInstructionState, r
             existing.stopMessageUsed = merged.stopMessageUsed;
             existing.stopMessageUpdatedAt = merged.stopMessageUpdatedAt;
             existing.stopMessageLastUsedAt = merged.stopMessageLastUsedAt;
+            existing.stopMessageStageMode = merged.stopMessageStageMode;
+            existing.stopMessageAiMode = merged.stopMessageAiMode;
+            existing.stopMessageAiSeedPrompt = merged.stopMessageAiSeedPrompt;
+            existing.stopMessageAiHistory = merged.stopMessageAiHistory;
             if (persisted) {
                 existing.preCommandSource = persisted.preCommandSource;
                 existing.preCommandScriptPath = persisted.preCommandScriptPath;
@@ -35,7 +62,7 @@ export function getRoutingInstructionState(stickyKey, routingInstructionState, r
     }
     let initial = null;
     // 仅对 session:/conversation: 作用域的 key 尝试从磁盘恢复持久化状态
-    if (key.startsWith('session:') || key.startsWith('conversation:')) {
+    if (isPersistentScopeKey(key)) {
         initial = routingStateStore.loadSync(key);
     }
     if (!initial) {
@@ -52,6 +79,10 @@ export function getRoutingInstructionState(stickyKey, routingInstructionState, r
             stopMessageUsed: undefined,
             stopMessageUpdatedAt: undefined,
             stopMessageLastUsedAt: undefined,
+            stopMessageStageMode: undefined,
+            stopMessageAiMode: undefined,
+            stopMessageAiSeedPrompt: undefined,
+            stopMessageAiHistory: undefined,
             preCommandSource: undefined,
             preCommandScriptPath: undefined,
             preCommandUpdatedAt: undefined
@@ -74,8 +105,8 @@ function isRoutingStateEmpty(state) {
     const noStopMessage = (!state.stopMessageText || !state.stopMessageText.trim()) &&
         (typeof state.stopMessageMaxRepeats !== 'number' || !Number.isFinite(state.stopMessageMaxRepeats)) &&
         (typeof state.stopMessageUsed !== 'number' || !Number.isFinite(state.stopMessageUsed)) &&
-        (typeof state.stopMessageUpdatedAt !== 'number' || !Number.isFinite(state.stopMessageUpdatedAt)) &&
-        (typeof state.stopMessageLastUsedAt !== 'number' || !Number.isFinite(state.stopMessageLastUsedAt));
+        (typeof state.stopMessageStageMode !== 'string' || !state.stopMessageStageMode.trim()) &&
+        (typeof state.stopMessageAiMode !== 'string' || !state.stopMessageAiMode.trim());
     const noPreCommand = (!state.preCommandScriptPath || !state.preCommandScriptPath.trim()) &&
         (typeof state.preCommandUpdatedAt !== 'number' || !Number.isFinite(state.preCommandUpdatedAt));
     return (noForced &&
@@ -89,21 +120,26 @@ function isRoutingStateEmpty(state) {
         noPreCommand);
 }
 export function persistRoutingInstructionState(key, state, routingStateStore) {
-    if (!key || (!key.startsWith('session:') && !key.startsWith('conversation:'))) {
+    if (!isPersistentScopeKey(key)) {
         return;
     }
     const supportsSync = typeof routingStateStore.saveSync === 'function';
+    const shouldUseSyncForSession = supportsSync && (key.startsWith('session:')
+        || key.startsWith('tmux:'));
     const prefersSync = supportsSync &&
-        key.startsWith('session:') &&
+        (key.startsWith('session:')
+            || key.startsWith('tmux:')) &&
         (Boolean(state.stopMessageText && state.stopMessageText.trim()) ||
             (typeof state.stopMessageMaxRepeats === 'number' && Number.isFinite(state.stopMessageMaxRepeats)) ||
             (typeof state.stopMessageUsed === 'number' && Number.isFinite(state.stopMessageUsed)) ||
-            (typeof state.stopMessageUpdatedAt === 'number' && Number.isFinite(state.stopMessageUpdatedAt)) ||
-            (typeof state.stopMessageLastUsedAt === 'number' && Number.isFinite(state.stopMessageLastUsedAt)) ||
+            Boolean(state.stopMessageStageMode && state.stopMessageStageMode.trim()) ||
+            Boolean(state.stopMessageAiMode && state.stopMessageAiMode.trim()) ||
             Boolean(state.preCommandScriptPath && state.preCommandScriptPath.trim()) ||
             (typeof state.preCommandUpdatedAt === 'number' && Number.isFinite(state.preCommandUpdatedAt)));
     if (isRoutingStateEmpty(state)) {
-        if (prefersSync) {
+        // For session scope, clear must be sync to avoid stale persisted snapshots
+        // being reloaded immediately by same-request readers.
+        if (shouldUseSyncForSession) {
             routingStateStore.saveSync(key, null);
         }
         else {

package/dist/router/virtual-router/engine-logging.js

@@ -18,23 +18,24 @@ function summarizeStopMessageRuntime(state) {
     const parsedMaxRepeats = typeof state.stopMessageMaxRepeats === 'number' && Number.isFinite(state.stopMessageMaxRepeats)
         ? Math.max(0, Math.floor(state.stopMessageMaxRepeats))
         : 0;
+    const hasGoalText = Boolean(text);
     const maxRepeats = parsedMaxRepeats > 0
         ? parsedMaxRepeats
-        : mode === 'on' || mode === 'auto'
+        : hasGoalText && (mode === 'on' || mode === 'auto')
             ? DEFAULT_STOP_MESSAGE_MAX_REPEATS
             : 0;
     const used = typeof state.stopMessageUsed === 'number' && Number.isFinite(state.stopMessageUsed)
         ? Math.max(0, Math.floor(state.stopMessageUsed))
         : 0;
     const remaining = maxRepeats > 0 ? Math.max(0, maxRepeats - used) : -1;
-    const active = mode !== 'off' && maxRepeats > 0 && (Boolean(text) || mode === 'on' || mode === 'auto');
+    const active = mode !== 'off' && hasGoalText && maxRepeats > 0;
     const updatedAt = typeof state.stopMessageUpdatedAt === 'number' && Number.isFinite(state.stopMessageUpdatedAt)
         ? state.stopMessageUpdatedAt
         : undefined;
     const lastUsedAt = typeof state.stopMessageLastUsedAt === 'number' && Number.isFinite(state.stopMessageLastUsedAt)
         ? state.stopMessageLastUsedAt
         : undefined;
-    const hasAny = Boolean(text) || maxRepeats > 0 || mode !== 'unset' || used > 0;
+    const hasAny = hasGoalText || maxRepeats > 0 || used > 0;
     return {
         hasAny,
         ...(safeText ? { safeText } : {}),