minimal-agent 0.18.13 → 0.18.14

package/src/prompts/promptAssembly.ts

@@ -113,6 +113,8 @@ export interface PromptRuntimeContext {
   /** @deprecated Use memoryAccess. Kept for source compatibility. */
   ownerLocalSession: boolean;
   currentUserInput?: string;
+  /** The user request before this one; lets a bare follow-up recall by topic (see memory/recallQuery.ts). */
+  previousUserInput?: string;
   /** Host policy, independent of the tools exposed to this invocation. */
   inheritPersona?: boolean;
   transientBudgetTokens?: number;
@@ -248,12 +250,7 @@ async function buildAdvisorStatusLine(): Promise<string> {
     const advisor = await configService.advisor();
     if (!advisor) return 'Advisor 状态：未配置。';
     const mode = advisor.mode === 'auto' ? '自动' : '仅手动';
-    const vision =
-      advisor.supportsVision && advisor.shareSensitive
-        ? '允许图片'
-        : advisor.supportsVision
-          ? '支持图片但敏感共享关闭'
-          : '不支持图片';
+    const vision = advisor.supportsVision ? '支持图片' : '不支持图片';
     return `Advisor 状态：${advisor.enabled ? '已启用' : '已关闭'}，${advisor.provider.name}/${advisor.provider.model}，${mode}，${vision}，超时 ${Math.round(advisor.timeoutMs / 1000)} 秒。`;
   } catch {
     return 'Advisor 状态：暂时无法读取。';
@@ -357,6 +354,7 @@ async function buildMemoryTransient(
       {
         includePersona: runtime.inheritPersona !== false,
         budgetTokens: memoryBudgetTokens(runtime),
+        previousInput: runtime.previousUserInput,
       },
     );
   } catch {
@@ -586,9 +584,13 @@ export async function buildTransientBundle(
     const priorities = {
       persona: 82,
       preferences: 78,
+      profile: 76,
       relevant: 70,
       projectKnowledge: 68,
       experiences: 65,
+      // The subject index only helps the model choose what to Recall; below
+      // skills (45) so a tight budget drops it before anything the model acts on.
+      index: 40,
       health: 10,
     } as const;
     for (const section of memory.sections) {

package/src/prompts/visualPresentation.js

@@ -1,28 +1,57 @@
 import { resolveOutputContract } from '../runtime/outputContract.js';
-/** One output contract shared by preparation and tool-free publication. */
+/** Presentation guidance derived from the host's declared output contract. */
 export function visualPresentation(target) {
     const output = typeof target === 'string' ? resolveOutputContract(target) : target;
     const common = '按需配图，优先 Mermaid/SVG；用户指定 ASCII、代码/目录树除外。';
     if (output.format === 'rich-markdown')
-        return `${common}\nDesktop/Web 聊天支持 ${output.diagrams.length ? output.diagrams.join(' 和 ') + ' 围栏' : 'Markdown，未声明图形渲染'}，不用裸 HTML。仅用已声明的图形格式替代字符框图；最终表达同样生效。${output.images ? '支持图片。' : ''}${output.attachments ? '附件须真实提交。' : ''}无法可靠画图则用文字/表格。`;
+        return `${common}\nDesktop/Web 聊天支持 ${output.diagrams.length ? output.diagrams.join(' 和 ') + ' 围栏' : 'Markdown，未声明图形渲染'}，不用裸 HTML。仅用已声明的图形格式替代字符框图。${output.images ? '支持图片。' : ''}${output.attachments ? '附件须真实提交。' : ''}无法可靠画图则用文字/表格。`;
     if (output.format === 'terminal')
         return `${common}\nCLI/TUI 直接回复用文字/表格/紧凑 ASCII，生成文件仍优先 Mermaid/SVG。`;
     if (output.format === 'structured')
         return '仅按调用方结构化协议输出，不插入 Markdown 围栏或图形源码。';
     return `${common}\n跟随最终阅读载体，不等同于终端：Web 用 mermaid/svg 围栏；保持协议契约，未知不假定可渲染。`;
 }
+/** The user explicitly wants text drawings (ASCII, "原样", no Mermaid/SVG). */
+export function requestKeepsTextDiagrams(request) {
+    const rejectsAscii = /(?:不要|不用|避免|别用|without|not|instead of)[^\n。！？]{0,24}(?:ascii|字符图|纯文本图)/i.test(request);
+    return !rejectsAscii && /ascii|字符图|纯文本图|原样|不要.*(?:mermaid|svg)/i.test(request);
+}
+/** Only these fence info words can hold a prose diagram; a language tag means code. */
+export const DIAGRAM_FENCE_INFO = /^(?:text|plaintext)?$/i;
+/** Fence lines as Markdown renders them: up to 3 spaces of indentation (list
+ * items), and an info string whose first word is the language — anything after
+ * it (`title=…`) is attributes. Group 1 = marker, group 2 = first info word. */
+export const FENCE_OPEN = /^ {0,3}(`{3,}|~{3,})[ \t]*([^\s`]*)[^`\n]*$/;
+export const FENCE_CLOSE = /^ {0,3}(`{3,}|~{3,})[ \t]*$/;
+/** A fenced body drawn as boxes: at least two border lines and a walled row.
+ * Ordinary code, directory trees and arrows are not diagrams. */
+export function isBoxDiagram(body) {
+    const borders = body.split('\n').filter(line => /[┌┐└┘┏┓┗┛+][─━\-]{3,}[┌┐└┘┏┓┗┛+]/.test(line));
+    return borders.length >= 2 && /[│┃|].*\S.*[│┃|]/.test(body);
+}
 /** Conservative signal on PRIVATE candidates only, never a frontend converter.
- * Require box borders in prose fences; ordinary code, trees and arrows are not diagrams.
+ * Live answers use loop/liveDiagramGate.ts, built on the same two predicates.
  */
 export function needsDiagramPreparation(candidate, request) {
-    const rejectsAscii = /(?:不要|不用|避免|别用|without|not|instead of)[^\n。！？]{0,24}(?:ascii|字符图|纯文本图)/i.test(request);
-    if (!rejectsAscii && /ascii|字符图|纯文本图|原样|不要.*(?:mermaid|svg)/i.test(request))
+    if (requestKeepsTextDiagrams(request))
         return false;
-    const fences = candidate.matchAll(/^(?:```|~~~)(?:text|plaintext)?[ \t]*\r?\n([\s\S]*?)^(?:```|~~~)[ \t]*$/gm);
-    for (const [, body] of fences) {
-        const borders = body.split('\n').filter(line => /[┌┐└┘┏┓┗┛+][─━\-]{3,}[┌┐└┘┏┓┗┛+]/.test(line));
-        if (borders.length >= 2 && /[│┃|].*\S.*[│┃|]/.test(body))
-            return true;
+    let fence;
+    for (const raw of candidate.split('\n')) {
+        const line = raw.replace(/\r$/, '');
+        if (!fence) {
+            const open = FENCE_OPEN.exec(line);
+            if (open)
+                fence = { marker: open[1], candidate: DIAGRAM_FENCE_INFO.test(open[2]), body: [] };
+            continue;
+        }
+        const close = FENCE_CLOSE.exec(line);
+        if (close && close[1][0] === fence.marker[0] && close[1].length >= fence.marker.length) {
+            if (fence.candidate && isBoxDiagram(fence.body.join('\n')))
+                return true;
+            fence = undefined;
+        }
+        else
+            fence.body.push(line);
     }
     return false;
 }

package/src/prompts/visualPresentation.ts

@@ -1,26 +1,55 @@
 import type { AgentSurface } from '../runtime/agentRuntimeContext.js';
 import { resolveOutputContract, type OutputContract } from '../runtime/outputContract.js';
 
-/** One output contract shared by preparation and tool-free publication. */
+/** Presentation guidance derived from the host's declared output contract. */
 export function visualPresentation(target: AgentSurface | OutputContract): string {
   const output = typeof target === 'string' ? resolveOutputContract(target) : target;
   const common = '按需配图，优先 Mermaid/SVG；用户指定 ASCII、代码/目录树除外。';
-  if (output.format === 'rich-markdown') return `${common}\nDesktop/Web 聊天支持 ${output.diagrams.length ? output.diagrams.join(' 和 ') + ' 围栏' : 'Markdown，未声明图形渲染'}，不用裸 HTML。仅用已声明的图形格式替代字符框图；最终表达同样生效。${output.images ? '支持图片。' : ''}${output.attachments ? '附件须真实提交。' : ''}无法可靠画图则用文字/表格。`;
+  if (output.format === 'rich-markdown') return `${common}\nDesktop/Web 聊天支持 ${output.diagrams.length ? output.diagrams.join(' 和 ') + ' 围栏' : 'Markdown，未声明图形渲染'}，不用裸 HTML。仅用已声明的图形格式替代字符框图。${output.images ? '支持图片。' : ''}${output.attachments ? '附件须真实提交。' : ''}无法可靠画图则用文字/表格。`;
   if (output.format === 'terminal') return `${common}\nCLI/TUI 直接回复用文字/表格/紧凑 ASCII，生成文件仍优先 Mermaid/SVG。`;
   if (output.format === 'structured') return '仅按调用方结构化协议输出，不插入 Markdown 围栏或图形源码。';
   return `${common}\n跟随最终阅读载体，不等同于终端：Web 用 mermaid/svg 围栏；保持协议契约，未知不假定可渲染。`;
 }
 
+/** The user explicitly wants text drawings (ASCII, "原样", no Mermaid/SVG). */
+export function requestKeepsTextDiagrams(request: string): boolean {
+  const rejectsAscii = /(?:不要|不用|避免|别用|without|not|instead of)[^\n。！？]{0,24}(?:ascii|字符图|纯文本图)/i.test(request);
+  return !rejectsAscii && /ascii|字符图|纯文本图|原样|不要.*(?:mermaid|svg)/i.test(request);
+}
+
+/** Only these fence info words can hold a prose diagram; a language tag means code. */
+export const DIAGRAM_FENCE_INFO = /^(?:text|plaintext)?$/i;
+/** Fence lines as Markdown renders them: up to 3 spaces of indentation (list
+ * items), and an info string whose first word is the language — anything after
+ * it (`title=…`) is attributes. Group 1 = marker, group 2 = first info word. */
+export const FENCE_OPEN = /^ {0,3}(`{3,}|~{3,})[ \t]*([^\s`]*)[^`\n]*$/;
+export const FENCE_CLOSE = /^ {0,3}(`{3,}|~{3,})[ \t]*$/;
+
+/** A fenced body drawn as boxes: at least two border lines and a walled row.
+ * Ordinary code, directory trees and arrows are not diagrams. */
+export function isBoxDiagram(body: string): boolean {
+  const borders = body.split('\n').filter(line => /[┌┐└┘┏┓┗┛+][─━\-]{3,}[┌┐└┘┏┓┗┛+]/.test(line));
+  return borders.length >= 2 && /[│┃|].*\S.*[│┃|]/.test(body);
+}
+
 /** Conservative signal on PRIVATE candidates only, never a frontend converter.
- * Require box borders in prose fences; ordinary code, trees and arrows are not diagrams.
+ * Live answers use loop/liveDiagramGate.ts, built on the same two predicates.
  */
 export function needsDiagramPreparation(candidate: string, request: string): boolean {
-  const rejectsAscii = /(?:不要|不用|避免|别用|without|not|instead of)[^\n。！？]{0,24}(?:ascii|字符图|纯文本图)/i.test(request);
-  if (!rejectsAscii && /ascii|字符图|纯文本图|原样|不要.*(?:mermaid|svg)/i.test(request)) return false;
-  const fences = candidate.matchAll(/^(?:```|~~~)(?:text|plaintext)?[ \t]*\r?\n([\s\S]*?)^(?:```|~~~)[ \t]*$/gm);
-  for (const [, body] of fences) {
-    const borders = body!.split('\n').filter(line => /[┌┐└┘┏┓┗┛+][─━\-]{3,}[┌┐└┘┏┓┗┛+]/.test(line));
-    if (borders.length >= 2 && /[│┃|].*\S.*[│┃|]/.test(body!)) return true;
+  if (requestKeepsTextDiagrams(request)) return false;
+  let fence: { marker: string; candidate: boolean; body: string[] } | undefined;
+  for (const raw of candidate.split('\n')) {
+    const line = raw.replace(/\r$/, '');
+    if (!fence) {
+      const open = FENCE_OPEN.exec(line);
+      if (open) fence = { marker: open[1]!, candidate: DIAGRAM_FENCE_INFO.test(open[2]!), body: [] };
+      continue;
+    }
+    const close = FENCE_CLOSE.exec(line);
+    if (close && close[1]![0] === fence.marker[0] && close[1]!.length >= fence.marker.length) {
+      if (fence.candidate && isBoxDiagram(fence.body.join('\n'))) return true;
+      fence = undefined;
+    } else fence.body.push(line);
   }
   return false;
 }

package/src/runtime/answerPreparation.js

@@ -1,9 +1,9 @@
 export function answerPreparationNotice(reason) {
     switch (reason) {
-        case 'advisor_checkpoint': return '交付前复核：正在核查内部候选结论，完成后发布最终答案。';
         case 'formal_delivery': return '整理交付：正在核对委派结果或补齐正式成果提交。';
         case 'interactive_question': return '等待关键决策：接下来通过交互问题确认，请在输入区作答。';
         case 'empty_response': return '本轮未产生可显示的正文，未生成新的最终答复。';
+        case 'diagram_preparation': return '整理配图：正在把字符框图改为可渲染的图形。';
         case 'interrupted': return '生成未完成，未发布最终答案。';
     }
 }

package/src/runtime/answerPreparation.ts

@@ -2,10 +2,10 @@ import type { LoopEvent } from '../types.js';
 
 export function answerPreparationNotice(reason: Extract<LoopEvent, { type: 'assistant_draft_discarded' }>['reason'] | 'interrupted'): string {
   switch (reason) {
-    case 'advisor_checkpoint': return '交付前复核：正在核查内部候选结论，完成后发布最终答案。';
     case 'formal_delivery': return '整理交付：正在核对委派结果或补齐正式成果提交。';
     case 'interactive_question': return '等待关键决策：接下来通过交互问题确认，请在输入区作答。';
     case 'empty_response': return '本轮未产生可显示的正文，未生成新的最终答复。';
+    case 'diagram_preparation': return '整理配图：正在把字符框图改为可渲染的图形。';
     case 'interrupted': return '生成未完成，未发布最终答案。';
   }
 }

package/src/runtime/fileLock.js

@@ -1,10 +1,16 @@
-import { mkdir, stat } from 'node:fs/promises';
+import { mkdir, stat, unlink } from 'node:fs/promises';
 import * as fs from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import { setTimeout as delay } from 'node:timers/promises';
 import lockfile from 'proper-lockfile';
+/** Hosts before this protocol wrote a plain `.lock` file without heartbeat and
+ * reclaimed each other's after 120s (memory) / 30s (runtime). A file older than
+ * that is abandoned by the old protocol's own rule. Refusing it forever turned a
+ * crash of the previous version into a permanent memory/runtime outage that only
+ * a manual delete could end. A younger one is a live old host: wait, never steal.
+ */
+const LEGACY_LOCK_STALE_MS = 120_000;
 /** Shared heartbeat protocol for local file-backed stores, not a database lock.
- * Never reclaim legacy regular-file locks: old hosts do not speak this protocol.
  * proper-lockfile fails closed on compromised ownership (its default handler).
  */
 export async function acquireStateFileLock(path, options = {}) {
@@ -21,7 +27,17 @@ export async function acquireStateFileLock(path, options = {}) {
             throw error;
         });
         if (legacy?.isFile()) {
-            throw new Error(`${label}_LEGACY_LOCK：请停止旧版本宿主并检查遗留锁：${target}.lock`);
+            if (Date.now() - legacy.mtimeMs > LEGACY_LOCK_STALE_MS) {
+                await unlink(`${target}.lock`).catch((error) => {
+                    if (error.code !== 'ENOENT')
+                        throw error;
+                });
+                continue;
+            }
+            if (Date.now() >= deadline)
+                throw new Error(`${label}_LEGACY_LOCK：旧版本宿主正持有锁，请停止旧版本后重试：${target}.lock`);
+            await delay(40, undefined, { signal });
+            continue;
         }
         try {
             let owned = false;

package/src/runtime/fileLock.ts

@@ -1,11 +1,18 @@
-import { mkdir, stat } from 'node:fs/promises';
+import { mkdir, stat, unlink } from 'node:fs/promises';
 import * as fs from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import { setTimeout as delay } from 'node:timers/promises';
 import lockfile from 'proper-lockfile';
 
+/** Hosts before this protocol wrote a plain `.lock` file without heartbeat and
+ * reclaimed each other's after 120s (memory) / 30s (runtime). A file older than
+ * that is abandoned by the old protocol's own rule. Refusing it forever turned a
+ * crash of the previous version into a permanent memory/runtime outage that only
+ * a manual delete could end. A younger one is a live old host: wait, never steal.
+ */
+const LEGACY_LOCK_STALE_MS = 120_000;
+
 /** Shared heartbeat protocol for local file-backed stores, not a database lock.
- * Never reclaim legacy regular-file locks: old hosts do not speak this protocol.
  * proper-lockfile fails closed on compromised ownership (its default handler).
  */
 export async function acquireStateFileLock(
@@ -24,7 +31,16 @@ export async function acquireStateFileLock(
       throw error;
     });
     if (legacy?.isFile()) {
-      throw new Error(`${label}_LEGACY_LOCK：请停止旧版本宿主并检查遗留锁：${target}.lock`);
+      if (Date.now() - legacy.mtimeMs > LEGACY_LOCK_STALE_MS) {
+        await unlink(`${target}.lock`).catch((error) => {
+          if (error.code !== 'ENOENT') throw error;
+        });
+        continue;
+      }
+      if (Date.now() >= deadline)
+        throw new Error(`${label}_LEGACY_LOCK：旧版本宿主正持有锁，请停止旧版本后重试：${target}.lock`);
+      await delay(40, undefined, { signal });
+      continue;
     }
     try {
       let owned = false;

package/src/runtime/invocationPolicy.js

@@ -6,7 +6,7 @@ export function invocationToolAllowed(name, policy) {
     if (!policy.interactiveAsk && name === 'AskUserQuestion')
         return false;
     return (policy.consultation !== 'disabled' ||
-        !['Advisor', 'AdvisorDecision'].includes(name));
+        name !== 'Advisor');
 }
 export function invocationInstructions(policy) {
     if (!policy)

package/src/runtime/invocationPolicy.ts

@@ -16,7 +16,7 @@ export function invocationToolAllowed(
   if (!policy.interactiveAsk && name === 'AskUserQuestion') return false;
   return (
     policy.consultation !== 'disabled' ||
-    !['Advisor', 'AdvisorDecision'].includes(name)
+    name !== 'Advisor'
   );
 }
 

package/src/runtime/outputContract.js

@@ -11,7 +11,3 @@ export function resolveOutputContract(surface, output) {
     });
     return Object.freeze({ ...value, diagrams: Object.freeze(value.format === 'rich-markdown' ? [...new Set(value.diagrams)] : []) });
 }
-/** Publication changes tool access, not the renderer or local execution rights. */
-export function toolsForResponsePhase(tools, phase) {
-    return phase === 'publication' ? [] : [...tools];
-}

package/src/runtime/outputContract.ts

@@ -25,10 +25,3 @@ export function resolveOutputContract(surface: AgentSurface, output?: OutputCont
     value.format === 'rich-markdown' ? [...new Set(value.diagrams)] : [],
   ) });
 }
-
-export type ResponsePhase = 'preparation' | 'publication';
-
-/** Publication changes tool access, not the renderer or local execution rights. */
-export function toolsForResponsePhase<T>(tools: readonly T[], phase: ResponsePhase): T[] {
-  return phase === 'publication' ? [] : [...tools];
-}

package/src/session/runAgentTurn.js

@@ -1,3 +1,5 @@
+import { previousUserRequest } from '../memory/recallQuery.js';
+import { loadContext } from '../context/persistContext.js';
 import { withWorkingDir } from '../bootstrap/workingDir.js';
 import { configService } from '../config/configService.js';
 import { sessionFileFor } from '../context/sessionPath.js';
@@ -164,6 +166,7 @@ deps = {}) {
                     memoryAccess: runtimeContext.memoryAccess,
                     browser: browserPromptRuntime(runtimeContext.browser, provider.supportsVision),
                     currentUserInput: opts.input,
+                    previousUserInput: previousUserRequest(await loadContext(sessionFile).catch(() => null) ?? undefined),
                     contextWindow: turnProvider.contextWindow,
                 },
             }).catch(() => undefined);

package/src/session/runAgentTurn.ts

@@ -1,3 +1,5 @@
+import { previousUserRequest } from '../memory/recallQuery.js';
+import { loadContext } from '../context/persistContext.js';
 import { withWorkingDir } from '../bootstrap/workingDir.js';
 import { configService } from '../config/configService.js';
 import { sessionFileFor } from '../context/sessionPath.js';
@@ -234,6 +236,7 @@ export async function runAgentTurn(
         memoryAccess: runtimeContext.memoryAccess,
         browser: browserPromptRuntime(runtimeContext.browser, provider.supportsVision),
         currentUserInput: opts.input,
+        previousUserInput: previousUserRequest(await loadContext(sessionFile).catch(() => null) ?? undefined),
         contextWindow: turnProvider.contextWindow,
       },
     }).catch(() => undefined);

package/src/team/onlineToolContract.js

@@ -55,7 +55,6 @@ export const ONLINE_TOOL_CATEGORY_BY_NAME = {
     AgentInterrupt: 'subagents',
     AgentFollowup: 'subagents',
     Advisor: 'subagents',
-    AdvisorDecision: 'subagents',
     GenerateImage: 'integrations',
     GenerateSpeech: 'integrations',
 };

package/src/team/onlineToolContract.ts

@@ -95,7 +95,6 @@ export const ONLINE_TOOL_CATEGORY_BY_NAME = {
   AgentInterrupt: 'subagents',
   AgentFollowup: 'subagents',
   Advisor: 'subagents',
-  AdvisorDecision: 'subagents',
   GenerateImage: 'integrations',
   GenerateSpeech: 'integrations',
 } as const satisfies Readonly<Record<string, OnlineToolCategory>>;