fix: strip leaked tool-call serialization text in formatOutbound()

When Codex enters a degenerate loop, it emits tool-call intent as
plaintext (e.g. `to=functions.exec_command code {"cmd":"..."}`) instead
of actual tool calls. Add stripToolCallLeaks() defense layer to remove
these patterns before they reach Discord. Pure garbage output becomes
empty and is suppressed entirely.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Eyejoker
2026-03-25 15:51:03 +09:00
parent f62aa261e6
commit 8fee2ab3fc
2 changed files with 125 additions and 1 deletions

View File

@@ -6,6 +6,7 @@ import {
formatMessages,
formatOutbound,
stripInternalTags,
stripToolCallLeaks,
} from './router.js';
import { NewMessage } from './types.js';
@@ -203,6 +204,106 @@ describe('formatOutbound', () => {
});
});
// --- Tool-call leak stripping ---
describe('stripToolCallLeaks', () => {
it('strips a single tool-call serialization line', () => {
const input =
'to=functions.exec_command code {"cmd":"git status","yield_time_ms":1000,"max_output_tokens":200}';
expect(stripToolCallLeaks(input)).toBe('');
});
it('strips tool-call text surrounded by normal text', () => {
const input =
'Hello\nto=functions.exec_command code {"cmd":"ls"}\nWorld';
expect(stripToolCallLeaks(input)).toBe('Hello\n\nWorld');
});
it('strips multiple consecutive tool-call lines', () => {
const call =
'to=functions.exec_command code {"cmd":"git status --short && git rev-parse --short HEAD","yield_time_ms":1000,"max_output_tokens":200}';
const input = `${call}\n${call}\n${call}`;
expect(stripToolCallLeaks(input)).toBe('');
});
it('strips tool-call with nested JSON braces', () => {
const input =
'to=functions.exec_command code {"cmd":"echo hello","options":{"verbose":true}}';
expect(stripToolCallLeaks(input)).toBe('');
});
it('preserves normal text mentioning functions in prose', () => {
const input = 'The model called to=functions but with wrong syntax';
// No match: missing the <word> <{json}> part
expect(stripToolCallLeaks(input)).toBe(input);
});
it('preserves code blocks discussing tool calls', () => {
const input =
'```\nto=functions.exec_command code {"cmd":"ls"}\n```';
// The tool-call inside backticks still gets stripped — this is intentional.
// Defense layer prioritizes safety over preserving code examples.
expect(stripToolCallLeaks(input)).toBe('```\n\n```');
});
it('collapses excessive blank lines after stripping', () => {
const input =
'Before\n\nto=functions.exec_command code {"cmd":"ls"}\n\n\n\nAfter';
const result = stripToolCallLeaks(input);
expect(result).toBe('Before\n\nAfter');
});
it('handles different function names', () => {
expect(
stripToolCallLeaks(
'to=functions.read_file code {"path":"/tmp/test.txt"}',
),
).toBe('');
expect(
stripToolCallLeaks(
'to=functions.write_file code {"path":"/tmp/out","content":"hi"}',
),
).toBe('');
});
it('returns original text when no tool-call patterns present', () => {
const input = 'This is a perfectly normal response with no issues.';
expect(stripToolCallLeaks(input)).toBe(input);
});
it('returns empty string for empty input', () => {
expect(stripToolCallLeaks('')).toBe('');
});
});
describe('formatOutbound with tool-call leaks', () => {
it('strips tool-call leaks and returns empty for pure garbage', () => {
const garbage =
'to=functions.exec_command code {"cmd":"git status","yield_time_ms":1000}';
expect(formatOutbound(garbage)).toBe('');
});
it('preserves legitimate text while stripping tool-call leaks', () => {
const mixed =
'Here is my answer.\nto=functions.exec_command code {"cmd":"ls"}\nHope this helps!';
expect(formatOutbound(mixed)).toBe(
'Here is my answer.\n\nHope this helps!',
);
});
it('strips internal tags AND tool-call leaks together', () => {
const input =
'<internal>thinking</internal>to=functions.exec_command code {"cmd":"ls"}Done!';
expect(formatOutbound(input)).toBe('Done!');
});
it('redacts secrets in remaining text after tool-call strip', () => {
const input =
'Key: sk-ant-XXXXXXXXXXXXXXXXXXXXXXXX\nto=functions.exec_command code {"cmd":"ls"}';
expect(formatOutbound(input)).toBe('Key: [REDACTED]');
});
});
// --- Trigger gating with requiresTrigger flag ---
describe('trigger gating (requiresTrigger interaction)', () => {

View File

@@ -53,8 +53,31 @@ function redactSecrets(text: string): string {
return result;
}
/**
* Strip leaked tool-call serialization text.
*
* When a model (especially Codex) enters a degenerate loop, it emits
* tool-call intent as plaintext instead of actual tool calls. The format is:
* to=functions.<name> <type> {<json>}
* e.g. `to=functions.exec_command code {"cmd":"git status","yield_time_ms":1000}`
*
* This function removes such fragments so they never reach Discord.
*/
export function stripToolCallLeaks(text: string): string {
// Match tool-call serialization: to=functions.<name> <word> {<json>}
// Handles up to one level of nested braces in the JSON body.
const stripped = text.replace(
/to=functions\.\w+\s+\w+\s+\{[^{}]*(?:\{[^{}]*\}[^{}]*)*\}/g,
'',
);
// Collapse excessive blank lines left after stripping
return stripped.replace(/\n{3,}/g, '\n\n').trim();
}
export function formatOutbound(rawText: string): string {
const text = stripInternalTags(rawText);
let text = stripInternalTags(rawText);
if (!text) return '';
text = stripToolCallLeaks(text);
if (!text) return '';
return redactSecrets(text);
}