minimal-agent 0.11.0 → 0.13.0

package/src/prompts/promptAssembly.js

@@ -27,6 +27,7 @@ import { getSkillList, formatSkillHint } from './skillList.js';
 import { getPluginMetaList, formatPluginHint } from './pluginList.js';
 import { memoryService } from '../memory/memoryService.js';
 import { countTextTokens } from '../context/tokenCounter.js';
+import { effectiveTaskStatus, listManagedTasks, } from '../tools/tasks/taskStore.js';
 import { assembleContextBundle, contextFragment, DEFAULT_TRANSIENT_BUDGET_TOKENS, } from '../context/contextBundle.js';
 import { assertPromptPolicyRegistry, capabilitiesForTools, enabledPolicyIds, renderCapabilityPolicyLayer, renderStablePolicyLayer, } from './policyRegistry.js';
 const stablePromptCache = new Map();
@@ -90,9 +91,9 @@ ${rules}`;
 }
 async function buildMemoryTransient(runtime, tools) {
     const names = new Set(tools.map((tool) => tool.name));
-    const memoryAllowed = runtime.memoryAccess !== undefined && runtime.memoryAccess !== 'denied'
+    const memoryAllowed = (runtime.memoryAccess !== undefined && runtime.memoryAccess !== 'denied') ||
         // Compatibility is explicit-only: omitted ownerLocalSession never grants access.
-        || (runtime.memoryAccess === undefined && runtime.ownerLocalSession === true);
+        (runtime.memoryAccess === undefined && runtime.ownerLocalSession === true);
     if (!memoryAllowed || !names.has('RecallMemory'))
         return null;
     try {
@@ -204,8 +205,12 @@ export async function buildTransientBundle(runtime, profile, tools, options = {}
         runtime.supervisedBrowser
             ? '宿主提供可监督浏览器：调用 WebBrowser 时用户可看到过程并在验证或登录环节接管。'
             : '',
-        runtime.interactiveAsk ? '' : '当前宿主不能交互提问；不要等待用户选择，缺少关键输入时说明阻塞。',
-    ].filter(Boolean).join('\n');
+        runtime.interactiveAsk
+            ? ''
+            : '当前宿主不能交互提问；不要等待用户选择，缺少关键输入时说明阻塞。',
+    ]
+        .filter(Boolean)
+        .join('\n');
     const fragments = [
         contextFragment({
             id: 'runtime.host-state',
@@ -216,7 +221,7 @@ export async function buildTransientBundle(runtime, profile, tools, options = {}
             content: runtimeLines,
         }),
     ];
-    const [memory, advisor, skillHint, pluginHint, projectInstructions] = await Promise.all([
+    const [memory, advisor, skillHint, pluginHint, projectInstructions, activeTasks,] = await Promise.all([
         buildMemoryTransient(runtime, tools),
         buildAdvisorTransient(profile, tools),
         getSkillList(runtime.cwd, new Set(tools.map((tool) => tool.name)))
@@ -224,13 +229,28 @@ export async function buildTransientBundle(runtime, profile, tools, options = {}
             .catch(() => ''),
         options.includePlugins === false
             ? Promise.resolve('')
-            : getPluginMetaList(runtime.cwd).then(formatPluginHint).catch(() => ''),
+            : getPluginMetaList(runtime.cwd)
+                .then(formatPluginHint)
+                .catch(() => ''),
         options.includeProjectInstructions === false
             ? Promise.resolve('')
             : loadProjectPromptInstructions(runtime.cwd).catch(() => ''),
+        runtime.sessionId &&
+            tools.some((tool) => ['TaskCreate', 'TaskGet', 'TaskUpdate', 'TaskList'].includes(tool.name))
+            ? listManagedTasks({
+                workspaceId: runtime.workspaceId,
+                sessionId: runtime.sessionId,
+                cwd: runtime.cwd,
+            }).catch(() => [])
+            : Promise.resolve([]),
     ]);
     if (memory) {
-        const priorities = { persona: 82, preferences: 78, relevant: 70, health: 10 };
+        const priorities = {
+            persona: 82,
+            preferences: 78,
+            relevant: 70,
+            health: 10,
+        };
         for (const section of memory.sections) {
             fragments.push(contextFragment({
                 id: `memory.${section.id}`,
@@ -276,6 +296,18 @@ export async function buildTransientBundle(runtime, profile, tools, options = {}
             required: true,
             content: `# 项目指令\n以下内容来自当前工作目录的 minimal-agent.md。行为约束和仓库约定必须遵守；架构事实若与当前代码冲突，以实际代码为准。不要擅自重写该文件。\n\n${projectInstructions}`,
         }));
+    const unfinished = activeTasks.filter((task) => task.status !== 'completed');
+    if (unfinished.length)
+        fragments.push(contextFragment({
+            id: 'tasks.active',
+            kind: 'task',
+            authority: 'constraint',
+            priority: 85,
+            content: `# Active tasks\n${unfinished
+                .slice(0, 20)
+                .map((task) => `- ${task.id} [${effectiveTaskStatus(task, activeTasks)}] ${task.title}`)
+                .join('\n')}`,
+        }));
     return assembleContextBundle(fragments, runtime.transientBudgetTokens ?? DEFAULT_TRANSIENT_BUDGET_TOKENS);
 }
 /**

package/src/prompts/promptAssembly.ts

@@ -29,6 +29,10 @@ import { getSkillList, formatSkillHint } from './skillList.js';
 import { getPluginMetaList, formatPluginHint } from './pluginList.js';
 import { memoryService } from '../memory/memoryService.js';
 import { countTextTokens } from '../context/tokenCounter.js';
+import {
+  effectiveTaskStatus,
+  listManagedTasks,
+} from '../tools/tasks/taskStore.js';
 import {
   assembleContextBundle,
   contextFragment,
@@ -77,6 +81,7 @@ export interface PromptRuntimeContext {
   surface: PromptSurface;
   cwd: string;
   workspaceId?: string;
+  sessionId?: string;
   interactiveAsk: boolean;
   supervisedBrowser: boolean;
   /** Trusted host decision. Defaults to denied; never inferred from profile. */
@@ -128,18 +133,22 @@ 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 && advisor.shareSensitive
+        ? '允许图片'
+        : advisor.supportsVision
+          ? '支持图片但敏感共享关闭'
+          : '不支持图片';
     return `Advisor 状态：${advisor.enabled ? '已启用' : '已关闭'}，${advisor.provider.name}/${advisor.provider.model}，${mode}，${vision}，超时 ${Math.round(advisor.timeoutMs / 1000)} 秒。`;
   } catch {
     return 'Advisor 状态：暂时无法读取。';
   }
 }
 
-async function buildToolLayer(tools: Tool[], context: StablePromptContext): Promise<string> {
+async function buildToolLayer(
+  tools: Tool[],
+  context: StablePromptContext,
+): Promise<string> {
   const catalog = tools.map((tool) => tool.name).join(', ');
   const rules = renderCapabilityPolicyLayer(context);
 
@@ -162,11 +171,14 @@ export interface AssemblePromptOptions {
 async function buildMemoryTransient(
   runtime: PromptRuntimeContext,
   tools: Tool[],
-): Promise<Awaited<ReturnType<typeof memoryService.buildContextBundle>> | null> {
+): Promise<Awaited<
+  ReturnType<typeof memoryService.buildContextBundle>
+> | null> {
   const names = new Set(tools.map((tool) => tool.name));
-  const memoryAllowed = runtime.memoryAccess !== undefined && runtime.memoryAccess !== 'denied'
+  const memoryAllowed =
+    (runtime.memoryAccess !== undefined && runtime.memoryAccess !== 'denied') ||
     // Compatibility is explicit-only: omitted ownerLocalSession never grants access.
-    || (runtime.memoryAccess === undefined && runtime.ownerLocalSession === true);
+    (runtime.memoryAccess === undefined && runtime.ownerLocalSession === true);
   if (!memoryAllowed || !names.has('RecallMemory')) return null;
   try {
     // One repository snapshot feeds persona/preferences/relevance/diagnostics.
@@ -180,8 +192,12 @@ async function buildMemoryTransient(
   }
 }
 
-async function buildAdvisorTransient(profile: PromptProfile, tools: Tool[]): Promise<string> {
-  if (profile !== 'main' || !tools.some((tool) => tool.name === 'Advisor')) return '';
+async function buildAdvisorTransient(
+  profile: PromptProfile,
+  tools: Tool[],
+): Promise<string> {
+  if (profile !== 'main' || !tools.some((tool) => tool.name === 'Advisor'))
+    return '';
   return buildAdvisorStatusLine();
 }
 
@@ -280,7 +296,9 @@ export async function assembleStablePrompt(
   ].join('|');
   const cached = stablePromptCache.get(key);
   if (cached) return cached;
-  const base = (await buildStableBase(options.cwd, options.tools, profile, runtime)).base;
+  const base = (
+    await buildStableBase(options.cwd, options.tools, profile, runtime)
+  ).base;
   stablePromptCache.set(key, base);
   if (stablePromptCache.size > 64) {
     stablePromptCache.delete(stablePromptCache.keys().next().value!);
@@ -310,15 +328,22 @@ export async function buildTransientBundle(
   runtime: PromptRuntimeContext,
   profile: PromptProfile,
   tools: Tool[],
-  options: Pick<AssemblePromptOptions, 'includeProjectInstructions' | 'includePlugins'> = {},
+  options: Pick<
+    AssemblePromptOptions,
+    'includeProjectInstructions' | 'includePlugins'
+  > = {},
 ): Promise<ContextBundle> {
   const runtimeLines = [
     `【运行时状态】本地日期：${localDate()}。时效敏感信息必须在线核实并使用明确日期或年份。`,
     runtime.supervisedBrowser
       ? '宿主提供可监督浏览器：调用 WebBrowser 时用户可看到过程并在验证或登录环节接管。'
       : '',
-    runtime.interactiveAsk ? '' : '当前宿主不能交互提问；不要等待用户选择，缺少关键输入时说明阻塞。',
-  ].filter(Boolean).join('\n');
+    runtime.interactiveAsk
+      ? ''
+      : '当前宿主不能交互提问；不要等待用户选择，缺少关键输入时说明阻塞。',
+  ]
+    .filter(Boolean)
+    .join('\n');
   const fragments: ContextFragment[] = [
     contextFragment({
       id: 'runtime.host-state',
@@ -329,7 +354,14 @@ export async function buildTransientBundle(
       content: runtimeLines,
     }),
   ];
-  const [memory, advisor, skillHint, pluginHint, projectInstructions] = await Promise.all([
+  const [
+    memory,
+    advisor,
+    skillHint,
+    pluginHint,
+    projectInstructions,
+    activeTasks,
+  ] = await Promise.all([
     buildMemoryTransient(runtime, tools),
     buildAdvisorTransient(profile, tools),
     getSkillList(runtime.cwd, new Set(tools.map((tool) => tool.name)))
@@ -337,54 +369,102 @@ export async function buildTransientBundle(
       .catch(() => ''),
     options.includePlugins === false
       ? Promise.resolve('')
-      : getPluginMetaList(runtime.cwd).then(formatPluginHint).catch(() => ''),
+      : getPluginMetaList(runtime.cwd)
+          .then(formatPluginHint)
+          .catch(() => ''),
     options.includeProjectInstructions === false
       ? Promise.resolve('')
       : loadProjectPromptInstructions(runtime.cwd).catch(() => ''),
+    runtime.sessionId &&
+    tools.some((tool) =>
+      ['TaskCreate', 'TaskGet', 'TaskUpdate', 'TaskList'].includes(tool.name),
+    )
+      ? listManagedTasks({
+          workspaceId: runtime.workspaceId,
+          sessionId: runtime.sessionId,
+          cwd: runtime.cwd,
+        }).catch(() => [])
+      : Promise.resolve([]),
   ]);
   if (memory) {
-    const priorities = { persona: 82, preferences: 78, relevant: 70, health: 10 } as const;
+    const priorities = {
+      persona: 82,
+      preferences: 78,
+      relevant: 70,
+      health: 10,
+    } as const;
     for (const section of memory.sections) {
-      fragments.push(contextFragment({
-        id: `memory.${section.id}`,
-        kind: section.id === 'persona' ? 'persona' : 'memory',
-        authority: section.id === 'health' ? 'host' : 'user-evidence',
-        priority: priorities[section.id],
-        estimatedTokens: section.estimatedTokens,
-        content: section.content,
-      }));
+      fragments.push(
+        contextFragment({
+          id: `memory.${section.id}`,
+          kind: section.id === 'persona' ? 'persona' : 'memory',
+          authority: section.id === 'health' ? 'host' : 'user-evidence',
+          priority: priorities[section.id],
+          estimatedTokens: section.estimatedTokens,
+          content: section.content,
+        }),
+      );
     }
   }
-  if (advisor) fragments.push(contextFragment({
-    id: 'diagnostic.advisor',
-    kind: 'diagnostic',
-    authority: 'host',
-    priority: 20,
-    content: advisor,
-  }));
-  if (skillHint) fragments.push(contextFragment({
-    id: 'skills.catalog',
-    kind: 'skill',
-    authority: 'constraint',
-    priority: 45,
-    clippable: true,
-    content: skillHint,
-  }));
-  if (pluginHint) fragments.push(contextFragment({
-    id: 'plugins.catalog',
-    kind: 'plugin',
-    authority: 'untrusted-data',
-    priority: 50,
-    content: pluginHint,
-  }));
-  if (projectInstructions) fragments.push(contextFragment({
-    id: 'project.instructions',
-    kind: 'project',
-    authority: 'constraint',
-    priority: 90,
-    required: true,
-    content: `# 项目指令\n以下内容来自当前工作目录的 minimal-agent.md。行为约束和仓库约定必须遵守；架构事实若与当前代码冲突，以实际代码为准。不要擅自重写该文件。\n\n${projectInstructions}`,
-  }));
+  if (advisor)
+    fragments.push(
+      contextFragment({
+        id: 'diagnostic.advisor',
+        kind: 'diagnostic',
+        authority: 'host',
+        priority: 20,
+        content: advisor,
+      }),
+    );
+  if (skillHint)
+    fragments.push(
+      contextFragment({
+        id: 'skills.catalog',
+        kind: 'skill',
+        authority: 'constraint',
+        priority: 45,
+        clippable: true,
+        content: skillHint,
+      }),
+    );
+  if (pluginHint)
+    fragments.push(
+      contextFragment({
+        id: 'plugins.catalog',
+        kind: 'plugin',
+        authority: 'untrusted-data',
+        priority: 50,
+        content: pluginHint,
+      }),
+    );
+  if (projectInstructions)
+    fragments.push(
+      contextFragment({
+        id: 'project.instructions',
+        kind: 'project',
+        authority: 'constraint',
+        priority: 90,
+        required: true,
+        content: `# 项目指令\n以下内容来自当前工作目录的 minimal-agent.md。行为约束和仓库约定必须遵守；架构事实若与当前代码冲突，以实际代码为准。不要擅自重写该文件。\n\n${projectInstructions}`,
+      }),
+    );
+  const unfinished = activeTasks.filter((task) => task.status !== 'completed');
+  if (unfinished.length)
+    fragments.push(
+      contextFragment({
+        id: 'tasks.active',
+        kind: 'task',
+        authority: 'constraint',
+        priority: 85,
+        content: `# Active tasks\n${unfinished
+          .slice(0, 20)
+          .map(
+            (task) =>
+              `- ${task.id} [${effectiveTaskStatus(task, activeTasks)}] ${task.title}`,
+          )
+          .join('\n')}`,
+      }),
+    );
   return assembleContextBundle(
     fragments,
     runtime.transientBudgetTokens ?? DEFAULT_TRANSIENT_BUDGET_TOKENS,
@@ -397,12 +477,16 @@ export async function buildTransientBundle(
  * 直接调 assemblePromptEnvelope 再取 .transient 也能拿到同样结果，但会白算一遍 base
  * （27 个 SKILL.md + 项目指令共约 40 次文件读）。每回合都白算一遍不划算，故单独开口。
  */
-export async function buildTransientContext(options: AssemblePromptOptions): Promise<string> {
+export async function buildTransientContext(
+  options: AssemblePromptOptions,
+): Promise<string> {
   return (await buildTransientPromptBundle(options)).text;
 }
 
 /** Structured counterpart used by the Harness for request-time budget reduction. */
-export async function buildTransientPromptBundle(options: AssemblePromptOptions): Promise<ContextBundle> {
+export async function buildTransientPromptBundle(
+  options: AssemblePromptOptions,
+): Promise<ContextBundle> {
   const profile = options.profile ?? 'main';
   const runtime: PromptRuntimeContext = {
     surface: profile === 'main' ? 'cli' : 'subagent',
@@ -418,7 +502,9 @@ export async function buildTransientPromptBundle(options: AssemblePromptOptions)
   });
 }
 
-export async function assembleBasePrompt(options: AssemblePromptOptions): Promise<string> {
+export async function assembleBasePrompt(
+  options: AssemblePromptOptions,
+): Promise<string> {
   const envelope = await assemblePromptEnvelope(options);
   return [envelope.base, envelope.transient].filter(Boolean).join('\n\n');
 }

package/src/session/runAgentTurn.js

@@ -1,10 +1,11 @@
-import { buildBaseSystemPrompt, buildTransientPromptBundle } from '../prompts/system.js';
+import { buildBaseSystemPrompt, buildTransientPromptBundle, } from '../prompts/system.js';
 import { ALL_TOOLS } from '../tools/index.js';
 import { sessionFileFor } from '../context/sessionPath.js';
-import { getOrCreateSessionState, sessionStateKey } from './sessionState.js';
+import { getOrCreateSessionState, sessionStateKey, } from './sessionState.js';
+import { hydrateSessionWorktree } from '../tools/worktree/sessionWorktree.js';
 import { runTurn } from './runTurn.js';
 import { withWorkingDir } from '../bootstrap/workingDir.js';
-import { listSessionSummaries, updateSessionMetadata } from '../context/sessionRegistry.js';
+import { listSessionSummaries, updateSessionMetadata, } from '../context/sessionRegistry.js';
 import { workspaceIndexService } from '../context/workspaceIndex.js';
 import { configService } from '../config/configService.js';
 import { createPromptCacheContext } from '../llm/promptCache.js';
@@ -17,9 +18,12 @@ deps = {}) {
     const session = (await listSessionSummaries(opts.cwd)).find((item) => item.id === opts.sessionId);
     let sessionModelId = session?.modelId;
     if (!opts.model && !sessionModelId) {
-        sessionModelId = (await configService.getSnapshot()).config?.baseModelId ?? undefined;
+        sessionModelId =
+            (await configService.getSnapshot()).config?.baseModelId ?? undefined;
         if (sessionModelId) {
-            await updateSessionMetadata(opts.cwd, opts.sessionId, { modelId: sessionModelId }).catch(() => { });
+            await updateSessionMetadata(opts.cwd, opts.sessionId, {
+                modelId: sessionModelId,
+            }).catch(() => { });
         }
     }
     const sessionProvider = !opts.model && sessionModelId
@@ -27,41 +31,62 @@ deps = {}) {
         : null;
     const provider = opts.model
         ? { ...opts.provider, model: opts.model }
-        : sessionProvider ?? opts.provider;
-    const workspace = await workspaceIndexService.register(opts.cwd).catch(() => undefined);
+        : (sessionProvider ?? opts.provider);
+    const workspace = await workspaceIndexService
+        .register(opts.cwd)
+        .catch(() => undefined);
     const sessionFile = sessionFileFor(opts.cwd, opts.sessionId);
     const events = [];
     let result = '';
     let error;
     let numTurns = 0;
-    await withWorkingDir(opts.cwd, async () => {
+    const turnSessionState = opts.sessionState ??
+        getOrCreateSessionState(sessionStateKey({
+            surface: 'headless',
+            workspaceId: workspace?.id,
+            cwd: workspace?.id ? undefined : opts.cwd,
+            sessionId: opts.sessionId,
+        }));
+    await hydrateSessionWorktree({
+        sessionState: turnSessionState,
+        workspaceId: workspace?.id,
+        sessionId: opts.sessionId,
+        cwd: opts.cwd,
+    });
+    const effectiveCwd = turnSessionState.activeWorktree?.path ?? opts.cwd;
+    await withWorkingDir(effectiveCwd, async () => {
         // 稳定层进 history[0]（runTurn 每轮重写它，必须逐字节可复现，见 runTurn.ts 的缓存不变量）；
         // 易变层每轮单独计算，仅附加到当前用户消息的模型副本。
         const runtimeContext = createAgentRuntimeContext({
             surface: 'headless',
             profile: 'main',
-            cwd: opts.cwd,
+            cwd: effectiveCwd,
             workspaceId: workspace?.id,
             sessionId: opts.sessionId,
-            owner: opts.memoryAccess && opts.memoryAccess !== 'denied' ? 'local-owner' : 'untrusted',
+            owner: opts.memoryAccess && opts.memoryAccess !== 'denied'
+                ? 'local-owner'
+                : 'untrusted',
             memoryAccess: opts.memoryAccess ?? 'denied',
             interactiveAsk: false,
         });
         const turnTools = filterToolsForRuntime(ALL_TOOLS, runtimeContext);
-        const systemPrompt = await buildBaseSystemPrompt(opts.cwd, turnTools);
+        const systemPrompt = await buildBaseSystemPrompt(effectiveCwd, turnTools);
         const transientBundle = await buildTransientPromptBundle({
-            cwd: opts.cwd,
+            cwd: effectiveCwd,
             tools: turnTools,
             runtime: {
                 surface: 'headless',
-                cwd: opts.cwd,
+                cwd: effectiveCwd,
                 workspaceId: workspace?.id,
+                sessionId: opts.sessionId,
                 interactiveAsk: false,
                 memoryAccess: runtimeContext.memoryAccess,
                 currentUserInput: opts.input,
             },
         }).catch(() => undefined);
-        await updateSessionMetadata(opts.cwd, opts.sessionId, { lastMessagePreview: opts.input }).catch(() => { });
+        await updateSessionMetadata(opts.cwd, opts.sessionId, {
+            lastMessagePreview: opts.input,
+        }).catch(() => { });
         for await (const ev of run({
             userInput: opts.input,
             provider,
@@ -69,12 +94,7 @@ deps = {}) {
             systemPrompt,
             ...(transientBundle ? { transientBundle } : {}),
             promptCache: createPromptCacheContext(`workspace:${workspace?.id ?? opts.cwd}:session:${opts.sessionId}`),
-            sessionState: opts.sessionState ?? getOrCreateSessionState(sessionStateKey({
-                surface: runtimeContext.surface,
-                workspaceId: runtimeContext.workspaceId,
-                cwd: opts.cwd,
-                sessionId: opts.sessionId,
-            })),
+            sessionState: turnSessionState,
             signal: opts.signal,
             maxTurns: opts.maxTurns,
             runtimeContext,
@@ -103,5 +123,7 @@ deps = {}) {
     };
 }
 function isEventLike(ev) {
-    return Boolean(ev && typeof ev === 'object' && typeof ev.type === 'string');
+    return Boolean(ev &&
+        typeof ev === 'object' &&
+        typeof ev.type === 'string');
 }