From ae63e9717ec7c8a30230dd5bda1159b25d728acf Mon Sep 17 00:00:00 2001 From: shiyue Date: Thu, 18 Jun 2026 17:06:47 +0800 Subject: [PATCH] fix: restore @ composer file suggestions --- scripts/regression.js | 7 ++++--- server.js | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/regression.js b/scripts/regression.js index aad7ccd..8f78b71 100644 --- a/scripts/regression.js +++ b/scripts/regression.js @@ -757,13 +757,14 @@ async function main() { const promptDirComposer = await nextMessage(messages, ws, (msg) => msg.type === 'composer_suggestions' && msg.requestId === 'reg-prompt-dir'); assert(promptDirComposer.items.some((item) => item.kind === 'prompt' && item.name === 'nested-tool'), 'Composer prompt suggestions should include ~/.codex/prompts//prompt.md shortcuts'); - ws.send(JSON.stringify({ type: 'composer_suggestions', requestId: 'reg-prompt-mcp', trigger: '@', query: 'ccweb', sessionId: codexSession.sessionId, agent: 'codex' })); - const promptMcpComposer = await nextMessage(messages, ws, (msg) => msg.type === 'composer_suggestions' && msg.requestId === 'reg-prompt-mcp'); - assert(promptMcpComposer.items.some((item) => item.kind === 'mcp' && item.name === 'ccweb_list_conversations'), 'Composer prompt trigger suggestions should include ccweb MCP tools'); + ws.send(JSON.stringify({ type: 'composer_suggestions', requestId: 'reg-at-no-mcp', trigger: '@', query: 'ccweb', sessionId: codexSession.sessionId, agent: 'codex' })); + const atNoMcpComposer = await nextMessage(messages, ws, (msg) => msg.type === 'composer_suggestions' && msg.requestId === 'reg-at-no-mcp'); + assert(!atNoMcpComposer.items.some((item) => item.kind === 'mcp'), 'Composer @ suggestions should not include MCP tools'); ws.send(JSON.stringify({ type: 'composer_suggestions', requestId: 'reg-file', trigger: '@', query: 'context', sessionId: codexSession.sessionId, agent: 'codex' })); const fileComposer = await nextMessage(messages, ws, (msg) => msg.type === 'composer_suggestions' && msg.requestId === 'reg-file'); assert(fileComposer.items.some((item) => item.kind === 'file' && item.name === 'context.txt'), 'Composer file suggestions should include cwd file'); + assert(!fileComposer.items.some((item) => item.kind === 'mcp'), 'Composer file suggestions should not include MCP tools'); ws.send(JSON.stringify({ type: 'message', diff --git a/server.js b/server.js index f8c6788..e89bae5 100644 --- a/server.js +++ b/server.js @@ -2266,7 +2266,7 @@ function listComposerSuggestions(trigger, query, sessionId, agent, session = nul appendSpace: true, })), query); const files = listComposerFileSuggestions(sessionId, query); - return mergeComposerSuggestionGroups(prompts, mcpItems, files); + return mergeComposerSuggestionGroups(files, prompts); } return []; }