fix: block malformed structured silent envelope leaks
This commit is contained in:
@@ -1791,6 +1791,65 @@ describe('createMessageRuntime', () => {
|
|||||||
expect(channel.sendAndTrack).not.toHaveBeenCalled();
|
expect(channel.sendAndTrack).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('suppresses a malformed structured silent envelope without sending a visible message', async () => {
|
||||||
|
const chatJid = 'group@test';
|
||||||
|
const group = makeGroup('codex');
|
||||||
|
const channel = makeChannel(chatJid);
|
||||||
|
const lastAgentTimestamps: Record<string, string> = {};
|
||||||
|
const saveState = vi.fn();
|
||||||
|
|
||||||
|
vi.mocked(config.isClaudeService).mockReturnValue(false);
|
||||||
|
vi.mocked(config.isReviewService).mockReturnValue(true);
|
||||||
|
vi.mocked(db.getMessagesSince).mockReturnValue([
|
||||||
|
{
|
||||||
|
id: 'msg-1',
|
||||||
|
chat_jid: chatJid,
|
||||||
|
sender: 'user@test',
|
||||||
|
sender_name: 'User',
|
||||||
|
content: 'hello',
|
||||||
|
timestamp: '2026-03-19T00:00:00.000Z',
|
||||||
|
seq: 1,
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
vi.mocked(agentRunner.runAgentProcess).mockResolvedValue({
|
||||||
|
status: 'success',
|
||||||
|
result: '{"ejclaw":{"visibility":"silent"}} extra',
|
||||||
|
newSessionId: 'session-malformed-structured-silent',
|
||||||
|
});
|
||||||
|
|
||||||
|
const runtime = createMessageRuntime({
|
||||||
|
assistantName: 'Andy',
|
||||||
|
idleTimeout: 1_000,
|
||||||
|
pollInterval: 1_000,
|
||||||
|
timezone: 'UTC',
|
||||||
|
triggerPattern: /^@Andy\b/i,
|
||||||
|
channels: [channel],
|
||||||
|
queue: {
|
||||||
|
registerProcess: vi.fn(),
|
||||||
|
closeStdin: vi.fn(),
|
||||||
|
notifyIdle: vi.fn(),
|
||||||
|
} as any,
|
||||||
|
getRegisteredGroups: () => ({ [chatJid]: group }),
|
||||||
|
getSessions: () => ({}),
|
||||||
|
getLastTimestamp: () => '',
|
||||||
|
setLastTimestamp: vi.fn(),
|
||||||
|
getLastAgentTimestamps: () => lastAgentTimestamps,
|
||||||
|
saveState,
|
||||||
|
persistSession: vi.fn(),
|
||||||
|
clearSession: vi.fn(),
|
||||||
|
});
|
||||||
|
|
||||||
|
const result = await runtime.processGroupMessages(chatJid, {
|
||||||
|
runId: 'run-malformed-structured-silent',
|
||||||
|
reason: 'messages',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(result).toBe(true);
|
||||||
|
expect(channel.sendMessage).not.toHaveBeenCalled();
|
||||||
|
expect(channel.sendAndTrack).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
it('resets tracked progress after a final output that becomes empty after formatting', async () => {
|
it('resets tracked progress after a final output that becomes empty after formatting', async () => {
|
||||||
vi.useFakeTimers();
|
vi.useFakeTimers();
|
||||||
const chatJid = 'group@test';
|
const chatJid = 'group@test';
|
||||||
|
|||||||
@@ -51,6 +51,21 @@ describe('classifySuppressTokenOutput', () => {
|
|||||||
),
|
),
|
||||||
).toBe('exact');
|
).toBe('exact');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('treats a truncated structured silent envelope as mixed', () => {
|
||||||
|
expect(
|
||||||
|
classifySuppressTokenOutput('{"ejclaw":{"visibility":"silent"', undefined),
|
||||||
|
).toBe('mixed');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('treats a structured silent envelope mixed with extra text as mixed', () => {
|
||||||
|
expect(
|
||||||
|
classifySuppressTokenOutput(
|
||||||
|
'{"ejclaw":{"visibility":"silent"}} extra',
|
||||||
|
undefined,
|
||||||
|
),
|
||||||
|
).toBe('mixed');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('parseStructuredOutputEnvelope', () => {
|
describe('parseStructuredOutputEnvelope', () => {
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import type { StructuredAgentOutput } from './types.js';
|
|||||||
|
|
||||||
const ANY_SUPPRESS_TOKEN_PATTERN = /__EJ_SUPPRESS_[a-f0-9]{24,}(?:__)?/g;
|
const ANY_SUPPRESS_TOKEN_PATTERN = /__EJ_SUPPRESS_[a-f0-9]{24,}(?:__)?/g;
|
||||||
const EXACT_ANY_SUPPRESS_TOKEN_PATTERN = /^__EJ_SUPPRESS_[a-f0-9]{24,}(?:__)?$/;
|
const EXACT_ANY_SUPPRESS_TOKEN_PATTERN = /^__EJ_SUPPRESS_[a-f0-9]{24,}(?:__)?$/;
|
||||||
|
const STRUCTURED_SILENT_OUTPUT_PREFIX_PATTERN =
|
||||||
|
/^\s*\{\s*"ejclaw"\s*:\s*\{\s*"visibility"\s*:\s*"silent"/;
|
||||||
export const STRUCTURED_SILENT_OUTPUT_ENVELOPE =
|
export const STRUCTURED_SILENT_OUTPUT_ENVELOPE =
|
||||||
'{"ejclaw":{"visibility":"silent"}}';
|
'{"ejclaw":{"visibility":"silent"}}';
|
||||||
|
|
||||||
@@ -43,7 +45,12 @@ export function classifySuppressTokenOutput(
|
|||||||
return 'mixed';
|
return 'mixed';
|
||||||
}
|
}
|
||||||
ANY_SUPPRESS_TOKEN_PATTERN.lastIndex = 0;
|
ANY_SUPPRESS_TOKEN_PATTERN.lastIndex = 0;
|
||||||
return ANY_SUPPRESS_TOKEN_PATTERN.test(rawText) ? 'mixed' : 'none';
|
if (ANY_SUPPRESS_TOKEN_PATTERN.test(rawText)) {
|
||||||
|
return 'mixed';
|
||||||
|
}
|
||||||
|
return STRUCTURED_SILENT_OUTPUT_PREFIX_PATTERN.test(trimmed)
|
||||||
|
? 'mixed'
|
||||||
|
: 'none';
|
||||||
}
|
}
|
||||||
|
|
||||||
export function parseStructuredOutputEnvelope(
|
export function parseStructuredOutputEnvelope(
|
||||||
|
|||||||
Reference in New Issue
Block a user