MetonaTeam/metona-ollama-desktop
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: 去掉所有指令性文字，只描述事实不替用户下命令

Browse Source
This commit is contained in:
thzxx
2026-06-18 14:50:16 +08:00
parent 18be23ae87
commit 6266d0b10c
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/components/input-area.ts
+3 -8
View File
@@ -1013,12 +1013,10 @@ async function sendMessageWithAgentLoop(text: string, currentSession: ChatSessio
apiParts.push(...fileParts); apiParts.push(...fileParts);
logInfo('📄 文件内容已注入', `${fileParts.length} 段, 共 ${fileContents.reduce((s, f) => s + f.content.length, 0)} 字符`); logInfo('📄 文件内容已注入', `${fileParts.length} 段, 共 ${fileContents.reduce((s, f) => s + f.content.length, 0)} 字符`);
} }
// 图片和视频帧按顺序分块描述（images 数组：图片在前，视频帧在后）
if (pendingImages.length === 1) { if (pendingImages.length === 1) {
apiParts.push(`[独立图片: ${pendingImages[0].name}]（请单独分析该图片，勿与视频帧混淆）`); apiParts.push(`[图片: ${pendingImages[0].name}]`);
} else if (pendingImages.length > 1) { } else if (pendingImages.length > 1) {
const imgNames = pendingImages.map(img => img.name).join(', '); apiParts.push(`[${pendingImages.length} 张图片: ${pendingImages.map(img => img.name).join(', ')}]`);
apiParts.push(`[${pendingImages.length} 张独立图片: ${imgNames}]（请分别分析每张图片，勿与视频帧混淆）`);
} }
let allVids: Array<{ name: string; count: number; dur: number; frames: Array<{ timestampSeconds: number; name: string }> }> = []; let allVids: Array<{ name: string; count: number; dur: number; frames: Array<{ timestampSeconds: number; name: string }> }> = [];
if (hasVideos) { if (hasVideos) {
@@ -1034,10 +1032,7 @@ async function sendMessageWithAgentLoop(text: string, currentSession: ChatSessio
parts.push(`[视频帧序列 · ${v.name} · ${v.count}帧 · 1fps · ${v.dur.toFixed(0)}s]\n${fl}`); parts.push(`[视频帧序列 · ${v.name} · ${v.count}帧 · 1fps · ${v.dur.toFixed(0)}s]\n${fl}`);
} }
apiParts.push(parts.join('\n\n')); apiParts.push(parts.join('\n\n'));
apiParts.push('以上为视频帧序列，按时间顺序排列，帧间存在时序关系。请分析视频内容。'); apiParts.push('以上为视频帧序列，按时间顺序排列。');
}
if (pendingImages.length > 0 && hasVideos) {
apiParts.push('注意：独立图片和视频帧是不同的内容，请分别分析，不要混淆。');
} }
apiContentForModel = apiParts.join('\n\n'); apiContentForModel = apiParts.join('\n\n');