@zhin.js/agent 1.1.3 → 1.1.6

package/lib/prompt/rules/critical-rules.js

@@ -2,18 +2,16 @@ export const CRITICAL_RULES = `
 <critical_rules>
 These rules override everything else. Follow them strictly:
 
-1. **READ BEFORE EDIT**: Never edit a file you haven't read the relevant context for.
-2. **BE AUTONOMOUS**: Don't ask questions - search, read, think, decide, act.
-3. **TEST AFTER CHANGES**: Run tests immediately after each modification.
-4. **BE CONCISE**: Keep output concise (default <4 lines), unless explaining complex changes.
-5. **USE EXACT MATCHES**: When editing, match text exactly including whitespace and line breaks.
-6. **NEVER COMMIT** unless user explicitly says "commit".
-7. **FOLLOW MEMORY**: If memory files contain specific instructions, you MUST follow them.
-8. **NEVER ADD COMMENTS** unless asked. Focus on *why* not *what*.
-9. **SECURITY FIRST**: Only assist with defensive security tasks.
-10. **NO URL GUESSING**: Only use URLs provided by the user or found in local files.
-11. **NEVER PUSH** to remote unless explicitly asked.
-12. **LOAD MATCHING SKILLS**: If any available skill matches the current task, you MUST load it.
+1. **BE AUTONOMOUS**: Don't ask questions - search, think, decide, act. Use tools when available.
+2. **TOOL OVER MEMORY**: When a tool can answer a question (weather, calculation, search), call it. Never answer from training data alone.
+3. **FOLLOW MEMORY**: If memory files contain specific instructions, you MUST follow them.
+4. **MATCH USER LANGUAGE**: Reply in the same language the user uses. Default to Chinese if SOUL.md specifies it.
+5. **BE CONCISE**: Keep output concise — match complexity to the question. Simple question = short answer.
+6. **SECURITY FIRST**: Only assist with defensive security tasks. Never disclose internal implementation details.
+7. **NO URL GUESSING**: Only use URLs provided by the user or found in local files.
+8. **LOAD MATCHING SKILLS**: If any available skill matches the current task, you MUST load it.
+9. **READ BEFORE EDIT**: Never edit a file you haven't read the relevant context for.
+10. **NO HALLUCINATION**: Never claim actions, results, or system state unless confirmed by tool output.
 </critical_rules>
 `.trim();
 //# sourceMappingURL=critical-rules.js.map

package/lib/prompt/rules/critical-rules.js.map

@@ -1 +1 @@
-{"version":3,"file":"critical-rules.js","sourceRoot":"","sources":["../../../src/prompt/rules/critical-rules.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;;;CAiB7B,CAAC,IAAI,EAAE,CAAC"}
+{"version":3,"file":"critical-rules.js","sourceRoot":"","sources":["../../../src/prompt/rules/critical-rules.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;CAe7B,CAAC,IAAI,EAAE,CAAC"}

package/lib/prompt/system-prompt.d.ts

@@ -4,20 +4,13 @@
  * 常驻提示词保持短小：身份由 persona 表达，固定段只保留上下文、风格、
  * 工具、安全，以及按需注入的平台、技能、记忆和 Bootstrap 上下文。
  */
-import { type AgentTurnMessage, type Message } from '@zhin.js/core';
-import type { ContentPart, AgentMessage } from '@zhin.js/ai';
+import type { AgentMessage } from '@zhin.js/ai';
 import type { SkillRegistry } from '../orchestrator/skill-registry.js';
 import { type ZhinAgentConfig } from '../config/index.js';
-import { type FileRole } from '../security/file-role-policy.js';
+import type { TurnContextView } from '../context/turn-envelope.js';
 export declare const FIXED_DISCIPLINE_RULES: readonly ["Never claim actions, results, or system state unless confirmed by tool output.", "If a capability is unavailable, state it honestly and suggest the closest valid alternative.", "Lead with the answer or result; avoid unnecessary preambles and filler."];
-export declare function contentToText(c: string | ContentPart[] | ContentPart | null | undefined): string;
 /** @deprecated 主路径使用 contextRepository 原生 messages；保留供兼容调用。 */
 export declare function buildUserMessageWithHistory(history: AgentMessage[], currentContent: string): string;
-export declare function buildEnhancedPersona(config: Required<ZhinAgentConfig>, profileSummary: string, toneHint: string): string;
-/** 从 Message 重算 SenderRole 并推导文件策略档位（提示词 §3b） */
-export declare function resolvePromptFileRole(commMessage: Message): FileRole | undefined;
-/** @deprecated 已并入 {@link buildContextSection}；保留空实现避免重复 Context 行 */
-export declare function buildContextHint(_commMessage: Message, _content: string): string;
 export interface RichSystemPromptContext {
     config: Required<ZhinAgentConfig>;
     skillRegistry: SkillRegistry | null;
@@ -28,8 +21,8 @@ export interface RichSystemPromptContext {
     toolSearchDeferredStats?: string;
     /** Per-platform markdown from AgentPromptContributor (§6c). */
     platformSections?: string;
-    /** 当前会话 Message（仅用于 # Runtime 中的 Session 行） */
-    commMessage?: Message;
+    /** Canonical turn identity; never an IM Message adapter. */
+    turn?: TurnContextView;
     /** SDK 分治编排片段（workspace prompts/orchestrator*.md） */
     orchestratorSdk?: string;
     /** ai.agents.*.nickname（经 activeBinding 解析） */
@@ -62,18 +55,6 @@ export declare function enforcePromptBudget(sections: {
     truncatable: boolean;
 }[], maxChars: number): string;
 export declare function buildRichSystemPrompt(ctx: RichSystemPromptContext): string;
-/**
- * 使用 PromptBuilder 构建系统提示词
- *
- * 这是一个更现代的提示词构建方式，支持：
- * - 分层提示词结构
- * - 优先级排序
- * - 字符数截断
- * - 安全规则嵌入
- */
-export declare function buildRichSystemPromptWithBuilder(ctx: RichSystemPromptContext): string;
 /** Vision / lite paths: persona + optional platform + context hint. */
 export declare function buildLiteSystemPromptWithPlatform(personaBlock: string, platformSections?: string, contextHint?: string): string;
-/** @deprecated 引用说明已迁入 context/turn-envelope [Turn context] */
-export declare function appendQuoteContextSystemHint(prompt: string, commMessage?: AgentTurnMessage): string;
 //# sourceMappingURL=system-prompt.d.ts.map

package/lib/prompt/system-prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"system-prompt.d.ts","sourceRoot":"","sources":["../../src/prompt/system-prompt.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"system-prompt.d.ts","sourceRoot":"","sources":["../../src/prompt/system-prompt.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAiC,MAAM,aAAa,CAAC;AAC/E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,KAAK,eAAe,EAA+D,MAAM,oBAAoB,CAAC;AAGvH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAYnE,eAAO,MAAM,sBAAsB,wQAIzB,CAAC;AAuBX,+DAA+D;AAC/D,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAQnG;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IAClC,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IACzB,sDAAsD;IACtD,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,+DAA+D;IAC/D,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,4DAA4D;IAC5D,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB,qDAAqD;IACrD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,+CAA+C;IAC/C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qCAAqC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,2BAA2B;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AA2OD,+DAA+D;AAC/D,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,uBAAuB,GAAG,sBAAsB,EAAE,CA6BrG;AAID;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE;IAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,EAAE,EAC5D,QAAQ,EAAE,MAAM,GACf,MAAM,CAqBR;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,uBAAuB,GAAG,MAAM,CAiC1E;AAGD,uEAAuE;AACvE,wBAAgB,iCAAiC,CAC/C,YAAY,EAAE,MAAM,EACpB,gBAAgB,CAAC,EAAE,MAAM,EACzB,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,CAOR"}

package/lib/prompt/system-prompt.js

@@ -5,12 +5,8 @@
  * 工具、安全，以及按需注入的平台、技能、记忆和 Bootstrap 上下文。
  */
 import * as os from 'node:os';
-import { resolveIMSessionIdFromMessage, senderRolesFromMessage } from '@zhin.js/core';
 import { SECTION_SEP, HISTORY_CONTEXT_MARKER, CURRENT_MESSAGE_MARKER } from '../config/index.js';
-import { resolveQuoteSystemHint } from '../context/turn-envelope.js';
-import { getFileMemoryContext, formatMemoryPathsHint } from '../memory-layers.js';
-import { PromptBuilder } from './prompt-builder.js';
-import { buildSenderRolesFilePermissionsPrompt, inferFileRole, } from '../security/file-role-policy.js';
+import { buildSenderRolesFilePermissionsPrompt } from '../security/file-role-policy.js';
 import { resolveWorkspacePrompt } from '../prompt/workspace-prompt.js';
 import { CRITICAL_RULES, WORKFLOW_RULES, ERROR_HANDLING_RULES, TASK_COMPLETION_RULES, EDITING_RULES, MEMORY_INSTRUCTIONS, CODE_REFERENCE_RULES, } from './rules/index.js';
 import { ModelAwarePromptBuilder } from './model-aware-builder.js';
@@ -19,25 +15,6 @@ export const FIXED_DISCIPLINE_RULES = [
     'If a capability is unavailable, state it honestly and suggest the closest valid alternative.',
     'Lead with the answer or result; avoid unnecessary preambles and filler.',
 ];
-export function contentToText(c) {
-    if (c == null)
-        return '';
-    if (typeof c === 'string')
-        return c;
-    const parts = Array.isArray(c) ? c : [c];
-    return parts.map(p => {
-        if (!p)
-            return '';
-        switch (p.type) {
-            case 'text': return p.text;
-            case 'image_url': return '[图片]';
-            case 'audio': return '[音频]';
-            case 'video_url': return '[视频]';
-            case 'face': return p.face.text || '[表情]';
-            default: return '';
-        }
-    }).join('');
-}
 /** Extract plain text from an AgentMessage for history display. */
 function agentMessageToText(message) {
     if (message.role === 'user') {
@@ -69,32 +46,6 @@ export function buildUserMessageWithHistory(history, currentContent) {
     const historyBlock = lines.join('\n');
     return `${HISTORY_CONTEXT_MARKER}\nNote: Prior assistant messages may contain errors or hallucinations. Do NOT treat them as ground truth. Only trust information from tool results.\n${historyBlock}\n\n${CURRENT_MESSAGE_MARKER}\n${currentContent}`;
 }
-export function buildEnhancedPersona(config, profileSummary, toneHint) {
-    let persona = config.persona;
-    if (profileSummary) {
-        persona += `\n\n${profileSummary}`;
-    }
-    if (toneHint) {
-        persona += `\n\n[Tone hint] ${toneHint}`;
-    }
-    return persona;
-}
-/** 从 Message 重算 SenderRole 并推导文件策略档位（提示词 §3b） */
-export function resolvePromptFileRole(commMessage) {
-    if (!commMessage)
-        return undefined;
-    try {
-        const roles = senderRolesFromMessage(commMessage);
-        return inferFileRole({ roles: [...roles] });
-    }
-    catch {
-        return undefined;
-    }
-}
-/** @deprecated 已并入 {@link buildContextSection}；保留空实现避免重复 Context 行 */
-export function buildContextHint(_commMessage, _content) {
-    return '';
-}
 // ── Section builders ──
 const ORCHESTRATOR_SKILL_DESC_MAX = 96;
 function prependBullets(items) {
@@ -226,7 +177,7 @@ function resolvePersonaLead(config, bootstrapContext, agentNickname) {
 /**
  * 稳定运行时（可缓存）：不含时间、会话、deferred 统计、memory 正文。
  */
-function buildContextSection(config, _commMessage, bootstrapContext, agentNickname, gitStatus) {
+function buildContextSection(config, bootstrapContext, agentNickname, gitStatus) {
     const envItems = [
         `CWD: ${process.cwd()}`,
         `Host: ${os.platform()} | Node ${process.version}`,
@@ -239,20 +190,6 @@ function buildContextSection(config, _commMessage, bootstrapContext, agentNickna
         ...prependBullets(envItems),
     ].join('\n');
 }
-/** 直连工具模式：工具 + 纪律 */
-function buildDirectToolsSection() {
-    const items = [
-        'Use tools for actions, fresh facts, file access, and verification.',
-        'Read before editing files.',
-        'Prefer dedicated tools over shell; run independent reads in parallel.',
-        'Search before assuming.',
-        'Use absolute paths for file operations.',
-        'Run tools in parallel when safe (no dependencies).',
-        'Summarize tool output for user.',
-        ...FIXED_DISCIPLINE_RULES,
-    ];
-    return ['# Tools', ...prependBullets(items)].join('\n');
-}
 /** 编排层：合并原 Tools + 可选 workspace/sdk 片段 */
 function buildOrchestrationSection(modelSdk) {
     const resolved = resolveWorkspacePrompt('orchestrator', modelSdk);
@@ -288,55 +225,25 @@ function buildSecuritySection() {
         ...prependBullets(protocol),
     ].join('\n');
 }
-function buildPlatformSection(platformSections, toolSearchActive) {
+function buildPlatformSection(platformSections, withIntro = true) {
     const body = platformSections?.trim();
     if (!body)
         return null;
-    const intro = toolSearchActive
+    const intro = withIntro
         ? 'IM-specific hints for deferred tasks (general rules are in # Orchestration):\n\n'
         : '';
     return `# Platform\n\n${intro}${body}`;
 }
-function buildCommunicationSection() {
-    const items = [
-        'Lead with the answer or result.',
-        'Be concise, direct, and useful.',
-        'Use Markdown when helpful.',
-        'Prioritize the user\'s latest message; prior compressed messages are context.',
-        'One-word answers when possible.',
-        'No emojis ever.',
-        'No explanations unless user asks.',
-        'No preamble ("Here\'s...", "I\'ll...").',
-        'No postamble ("Let me know...", "Hope this helps...").',
-        'Use rich Markdown formatting (headings, bullet lists, tables) for multi-sentence answers.',
-    ];
-    return ['# Style', ...prependBullets(items)].join('\n');
-}
-function buildSkillsSection(skillRegistry, skillsSummaryXML, toolSearchActive) {
-    if (toolSearchActive) {
-        const catalog = buildOrchestratorSkillsCatalog(skillsSummaryXML, skillRegistry);
-        if (!catalog)
-            return null;
-        return [
-            '# Skills (catalog)',
-            catalog,
-            '',
-            'Use discover(kind) to find matching skills, load_skill for instructions, then load_tool or call unlocked tools. Delegate specialist work with spawn_task.',
-        ].join('\n');
-    }
-    if (skillsSummaryXML) {
-        return '# Available Skills\n\n' + skillsSummaryXML + '\n\nUse discover(kind=skill) then load_skill(name) when you need full skill instructions.';
-    }
-    if (skillRegistry && skillRegistry.size > 0) {
-        const skills = skillRegistry.getAll();
-        const lines = ['# Available Skills'];
-        for (const skill of skills) {
-            lines.push(` - ${skill.name}: ${skill.description}`);
-        }
-        lines.push('\nUse discover(kind=skill) then load_skill(name) when you need full skill instructions.');
-        return lines.join('\n');
-    }
-    return null;
+function buildSkillsSection(skillRegistry, skillsSummaryXML) {
+    const catalog = buildOrchestratorSkillsCatalog(skillsSummaryXML, skillRegistry);
+    if (!catalog)
+        return null;
+    return [
+        '# Skills (catalog)',
+        catalog,
+        '',
+        'Use discover(kind) to find matching skills, load_skill for instructions, then load_tool or call unlocked tools. Delegate specialist work with spawn_task.',
+    ].join('\n');
 }
 /**
  * §8 Active Skills context
@@ -346,41 +253,21 @@ function buildActiveSkillsSection(activeSkillsContext) {
         return null;
     return '# Active Skills\n\n' + activeSkillsContext;
 }
-/**
- * §9 Memory（全局 / 平台 / 会话三层）
- */
-function buildMemorySection(commMessage) {
-    const sessionKey = commMessage
-        ? resolveIMSessionIdFromMessage(commMessage)
-        : undefined;
-    const fileMemory = getFileMemoryContext(undefined, commMessage ? String(commMessage.$adapter) : undefined, sessionKey);
-    if (!fileMemory)
-        return null;
-    return [
-        '# Memory',
-        '',
-        fileMemory,
-        '',
-        'Persist: session → data/memory/sessions/…/MEMORY.md (any user with write_file); global/platform → master only.',
-    ].join('\n');
-}
 /**
  * 返回当前上下文中**实际注入**的系统提示各段大小（不含 SECTION_SEP）。
  * 用于观测渐进披露与 token 压力，不改变线上 prompt 拼接逻辑。
  */
 export function describePromptSectionsForDebug(ctx) {
     const { config, skillRegistry, skillsSummaryXML, bootstrapContext, toolSearchDeferredStats, platformSections, orchestratorSdk, } = ctx;
-    const toolSearchActive = true;
     const boot = bootstrapContext?.trim() ? bootstrapContext : null;
     const modelBuilder = new ModelAwarePromptBuilder(ctx.modelId);
     const contextWindow = ctx.contextWindow ?? 128000;
     const pairs = [
-        ['§1_runtime', buildContextSection(config, ctx.commMessage, bootstrapContext, ctx.agentNickname, ctx.gitStatus)],
+        ['§1_runtime', buildContextSection(config, bootstrapContext, ctx.agentNickname, ctx.gitStatus)],
         ['§1b_critical_rules', CRITICAL_RULES],
         ['§1c_workflow', WORKFLOW_RULES],
         ['§1d_model_style', modelBuilder.buildStyleSection()],
-        ['§2_style', toolSearchActive ? null : buildCommunicationSection()],
-        ['§3_tools', toolSearchActive ? buildOrchestrationSection(orchestratorSdk) : buildDirectToolsSection()],
+        ['§3_tools', buildOrchestrationSection(orchestratorSdk)],
         ['§4_security', buildSecuritySection()],
         ['§5_error_handling', ERROR_HANDLING_RULES],
         ['§5b_editing', EDITING_RULES],
@@ -388,8 +275,8 @@ export function describePromptSectionsForDebug(ctx) {
         ['§5d_code_references', CODE_REFERENCE_RULES],
         ['§5e_memory_instructions', MEMORY_INSTRUCTIONS],
         ['§5f_context_mode', modelBuilder.buildContextModeHint(contextWindow)],
-        ['§6c_platform', buildPlatformSection(platformSections, toolSearchActive)],
-        ['§8_skills', buildSkillsSection(skillRegistry, skillsSummaryXML, toolSearchActive)],
+        ['§6c_platform', buildPlatformSection(platformSections)],
+        ['§8_skills', buildSkillsSection(skillRegistry, skillsSummaryXML)],
         ['§10_global', ctx.globalContext?.trim() ? ctx.globalContext : null],
         ['§11_bootstrap', boot],
     ];
@@ -425,9 +312,8 @@ export function enforcePromptBudget(sections, maxChars) {
 }
 export function buildRichSystemPrompt(ctx) {
     const { config, skillRegistry, skillsSummaryXML, bootstrapContext, toolSearchDeferredStats, platformSections, orchestratorSdk, } = ctx;
-    const toolSearchActive = true;
     const modelBuilder = new ModelAwarePromptBuilder(ctx.modelId);
-    const contextSection = buildContextSection(config, ctx.commMessage, bootstrapContext, ctx.agentNickname, ctx.gitStatus);
+    const contextSection = buildContextSection(config, bootstrapContext, ctx.agentNickname, ctx.gitStatus);
     const modelStyle = modelBuilder.buildStyleSection();
     const contextWindow = ctx.contextWindow ?? 128000;
     const contextModeHint = modelBuilder.buildContextModeHint(contextWindow);
@@ -436,15 +322,9 @@ export function buildRichSystemPrompt(ctx) {
         { content: CRITICAL_RULES, truncatable: false },
         { content: WORKFLOW_RULES, truncatable: false },
         { content: modelStyle, truncatable: false },
-        { content: toolSearchActive ? null : buildCommunicationSection(), truncatable: false },
-        {
-            content: toolSearchActive
-                ? buildOrchestrationSection(orchestratorSdk)
-                : buildDirectToolsSection(),
-            truncatable: false,
-        },
+        { content: buildOrchestrationSection(orchestratorSdk), truncatable: false },
         { content: buildSecuritySection(), truncatable: false },
-        { content: buildPlatformSection(platformSections, toolSearchActive), truncatable: false },
+        { content: buildPlatformSection(platformSections), truncatable: false },
         // 可截断段（牺牲顺序：error-handling → editing → task-completion → code-ref → memory → context-mode → skills → globalContext → bootstrap）
         { content: ERROR_HANDLING_RULES, truncatable: true },
         { content: EDITING_RULES, truncatable: true },
@@ -452,211 +332,12 @@ export function buildRichSystemPrompt(ctx) {
         { content: CODE_REFERENCE_RULES, truncatable: true },
         { content: MEMORY_INSTRUCTIONS, truncatable: true },
         { content: contextModeHint, truncatable: true },
-        { content: buildSkillsSection(skillRegistry, skillsSummaryXML, toolSearchActive), truncatable: true },
+        { content: buildSkillsSection(skillRegistry, skillsSummaryXML), truncatable: true },
         { content: ctx.globalContext || null, truncatable: true },
         { content: bootstrapContext || null, truncatable: true },
     ];
     return enforcePromptBudget(sections, config.systemPromptMaxChars);
 }
-/**
- * 使用 PromptBuilder 构建系统提示词
- *
- * 这是一个更现代的提示词构建方式，支持：
- * - 分层提示词结构
- * - 优先级排序
- * - 字符数截断
- * - 安全规则嵌入
- */
-export function buildRichSystemPromptWithBuilder(ctx) {
-    const { config, skillRegistry, skillsSummaryXML, activeSkillsContext, bootstrapContext, toolSearchDeferredStats, platformSections, } = ctx;
-    const toolSearchActive = true;
-    const modelBuilder = new ModelAwarePromptBuilder(ctx.modelId);
-    const builder = new PromptBuilder({
-        maxTotalChars: modelBuilder.strategy.maxPromptChars,
-        enableSafetyRules: modelBuilder.strategy.detailedSecurityRules,
-        enableConstraints: !toolSearchActive,
-    });
-    // §1 系统级提示词（最高优先级）— 包含模型感知风格
-    const personaLead = resolvePersonaLead(config, bootstrapContext, ctx.agentNickname);
-    const modelStyle = modelBuilder.buildStyleSection();
-    builder.addSystemPrompt(`${personaLead}\n\n${modelStyle}`, { priority: 100 });
-    // §2 关键规则（不可截断，最高优先级）
-    builder.addCustomSection({
-        layer: 'system',
-        title: 'Critical Rules',
-        content: CRITICAL_RULES,
-        priority: 99,
-        truncatable: false,
-    });
-    // §3 工作流规则
-    builder.addCustomSection({
-        layer: 'constraints',
-        title: 'Workflow',
-        content: WORKFLOW_RULES,
-        priority: 98,
-        truncatable: false,
-    });
-    // §4 上下文信息
-    const now = new Date();
-    const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
-    const timeStr = now.toLocaleString('zh-CN', { timeZone: tz });
-    const cwd = process.cwd();
-    const sessionKey = ctx.commMessage
-        ? resolveIMSessionIdFromMessage(ctx.commMessage)
-        : undefined;
-    builder.addContext({
-        cwd,
-        platform: os.platform(),
-        nodeVersion: process.version,
-        shell: process.env.SHELL || 'unknown',
-        timestamp: `${timeStr} (${tz})`,
-        memoryPath: formatMemoryPathsHint(ctx.commMessage ? String(ctx.commMessage.$adapter) : undefined, sessionKey),
-    });
-    // §5 上下文窗口模式提示
-    const contextWindow = ctx.contextWindow ?? 128000;
-    const contextModeHint = modelBuilder.buildContextModeHint(contextWindow);
-    if (contextModeHint) {
-        builder.addCustomSection({
-            layer: 'context',
-            title: 'Context Mode',
-            content: contextModeHint,
-            priority: 69,
-            truncatable: true,
-            maxChars: 512,
-        });
-    }
-    // §6 错误处理规则
-    builder.addCustomSection({
-        layer: 'constraints',
-        title: 'Error Handling',
-        content: ERROR_HANDLING_RULES,
-        priority: 97,
-        truncatable: true,
-        maxChars: 2048,
-    });
-    // §7 任务完整性规则
-    builder.addCustomSection({
-        layer: 'constraints',
-        title: 'Task Completion',
-        content: TASK_COMPLETION_RULES,
-        priority: 96,
-        truncatable: true,
-        maxChars: 1024,
-    });
-    // §8 编辑精确匹配规则
-    builder.addCustomSection({
-        layer: 'constraints',
-        title: 'Editing',
-        content: EDITING_RULES,
-        priority: 95,
-        truncatable: true,
-        maxChars: 2048,
-    });
-    // §9 代码引用格式
-    builder.addCustomSection({
-        layer: 'constraints',
-        title: 'Code References',
-        content: CODE_REFERENCE_RULES,
-        priority: 94,
-        truncatable: true,
-        maxChars: 512,
-    });
-    if (!toolSearchActive) {
-        builder.addCustomSection({
-            layer: 'constraints',
-            title: 'Style',
-            content: buildCommunicationSection(),
-            priority: 90,
-            truncatable: false,
-        });
-    }
-    builder.addCustomSection({
-        layer: 'safety',
-        title: 'Security',
-        content: buildSecuritySection(),
-        priority: 88,
-        truncatable: true,
-        maxChars: 2048,
-    });
-    if (toolSearchActive) {
-        builder.addCustomSection({
-            layer: 'tools',
-            title: 'Orchestration',
-            content: buildOrchestrationSection(toolSearchDeferredStats),
-            priority: 75,
-            truncatable: false,
-        });
-    }
-    else {
-        builder.addCustomSection({
-            layer: 'tools',
-            title: 'Tools',
-            content: buildDirectToolsSection(),
-            priority: 75,
-            truncatable: false,
-        });
-        builder.addConstraints();
-    }
-    if (platformSections?.trim()) {
-        const platformBody = buildPlatformSection(platformSections, toolSearchActive);
-        if (platformBody) {
-            builder.addCustomSection({
-                layer: 'context',
-                title: 'Platform',
-                content: platformBody,
-                priority: 70,
-                truncatable: true,
-                maxChars: 2048,
-            });
-        }
-    }
-    const skillsSection = buildSkillsSection(skillRegistry, skillsSummaryXML, toolSearchActive);
-    if (skillsSection) {
-        builder.addCustomSection({
-            layer: 'context',
-            title: 'Skills',
-            content: skillsSection,
-            priority: 50,
-            truncatable: true,
-        });
-    }
-    // 活跃技能上下文
-    if (activeSkillsContext) {
-        builder.addCustomSection({
-            layer: 'context',
-            title: 'Active Skills',
-            content: `# Active Skills\n\n${activeSkillsContext}`,
-            priority: 45,
-            truncatable: true,
-        });
-    }
-    // 内存指令 + 内存上下文
-    builder.addCustomSection({
-        layer: 'context',
-        title: 'Memory Instructions',
-        content: MEMORY_INSTRUCTIONS,
-        priority: 40,
-        truncatable: true,
-        maxChars: 1024,
-    });
-    const fileMemory = getFileMemoryContext(undefined, ctx.commMessage ? String(ctx.commMessage.$adapter) : undefined, sessionKey);
-    if (fileMemory) {
-        builder.addMemory({
-            longTerm: [fileMemory],
-        });
-    }
-    // 启动上下文
-    if (bootstrapContext?.trim()) {
-        builder.addCustomSection({
-            layer: 'context',
-            title: 'Bootstrap',
-            content: bootstrapContext,
-            priority: 30,
-            truncatable: true,
-        });
-    }
-    return builder.build();
-}
 /** Vision / lite paths: persona + optional platform + context hint. */
 export function buildLiteSystemPromptWithPlatform(personaBlock, platformSections, contextHint) {
     const parts = [personaBlock.trim()];
@@ -668,11 +349,4 @@ export function buildLiteSystemPromptWithPlatform(personaBlock, platformSections
         parts.push(hint);
     return parts.join('\n\n');
 }
-/** @deprecated 引用说明已迁入 context/turn-envelope [Turn context] */
-export function appendQuoteContextSystemHint(prompt, commMessage) {
-    const hint = resolveQuoteSystemHint(commMessage);
-    if (!hint)
-        return prompt;
-    return `${prompt.trim()}\n\n${hint}`;
-}
 //# sourceMappingURL=system-prompt.js.map