mixdog 0.9.71 → 0.9.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mixdog",
-  "version": "0.9.71",
+  "version": "0.9.74",
   "private": false,
   "type": "module",
   "description": "Standalone mixdog coding-agent CLI/TUI workspace.",

package/src/lib/rules-builder.cjs

@@ -21,8 +21,8 @@
  * Source files (rules/):
  *   - shared/01-tool.md              — universal tool policy (Lead + agent BP1, identical full set)
  *   - lead/lead-tool.md             — Lead-specific control-tower / delegation / ToolSearch guidance
- *   - lead/lead-brief.md            — Lead brief contract (agent handoff briefs)
- *   - lead/01-02                     — Lead general / channels
+ *   - lead/lead-brief.md            — Lead brief contract (skipped in solo workflow)
+ *   - lead/01-general.md             — Lead general
  *   - output-styles/<name>.md        — Lead output style, selected by config outputStyle
  *   - agent/00-core.md               — universal agent constraints (BP2, all profiles)
  *   - agent/00-common.md             — public-agent-only extras (BP2 full profile)
@@ -133,7 +133,7 @@ function buildProfilePreferencesContent(dataDir) {
     lines.push(`- Use "${profile.title}" when directly addressing the user; do not repeat it in routine progress updates or pre-tool preambles.`);
   }
   const shell = process.platform === 'win32' ? 'powershell' : 'bash';
-  lines.push(`- Shell environment: ${shell}. Write shell commands and scripts in ${shell} syntax unless the user specifies otherwise; keep commands, paths, symbols, and exact errors verbatim.`);
+  lines.push(`- Shell environment: ${shell}. Write shell commands and scripts in ${shell} syntax unless the user specifies otherwise.`);
   return lines.length ? `# Profile Preferences\n\n${lines.join('\n')}` : '';
 }
 
@@ -240,27 +240,6 @@ function collectMarkdownFilesRecursive(dir) {
   return collected;
 }
 
-// Address-form rule. Reads only `user.title` — `user.name` is intentionally
-// not consumed; the user is addressed solely by the configured form.
-// Returns '' when title is empty so nothing is injected.
-function composeUserAddressBullet(memoryConfig) {
-  const userTitle = (memoryConfig.user && memoryConfig.user.title || '').trim();
-  if (!userTitle) return '';
-  return `- User address form: ${userTitle} (use this address form exactly as written; do not combine it with any other name or honorific)`;
-}
-
-function splitLeadGeneral(general, addressBullet = '') {
-  // Language is owned solely by the `# Language` section (buildLanguageSection);
-  // general.md never carries a language line, so there is no language content to
-  // promote into the meta layer here. The only meta-tier content this split
-  // emits is the optional user address-form bullet.
-  const role = String(general || '').trim();
-  const meta = addressBullet
-    ? ['# General', '', addressBullet].join('\n').trim()
-    : '';
-  return { role, meta };
-}
-
 function buildSharedToolContent({ PLUGIN_ROOT }) {
   const SHARED_DIR = path.join(PLUGIN_ROOT, 'rules', 'shared');
   return readOptional(path.join(SHARED_DIR, '01-tool.md'));
@@ -269,22 +248,26 @@ function buildSharedToolContent({ PLUGIN_ROOT }) {
 function buildLeadRoleContent({ PLUGIN_ROOT, DATA_DIR }) {
   const RULES_DIR = path.join(PLUGIN_ROOT, 'rules');
   const LEAD_DIR = path.join(RULES_DIR, 'lead');
-  const memoryConfig = readConfigSection(DATA_DIR, 'memory');
-  const addressBullet = composeUserAddressBullet(memoryConfig);
   const general = readOptional(path.join(LEAD_DIR, '01-general.md'));
-  const generalSplit = splitLeadGeneral(general, addressBullet);
   const parts = [];
 
   const toolLead = readOptional(path.join(LEAD_DIR, 'lead-tool.md'));
   if (toolLead) parts.push(toolLead);
 
-  const briefLead = readOptional(path.join(LEAD_DIR, 'lead-brief.md'));
-  if (briefLead) parts.push(briefLead);
-
-  if (generalSplit.role) parts.push(generalSplit.role);
+  // Solo workflow forbids delegation, so the agent-brief contract is dead
+  // weight there. Cache safety: lead rules cache keys on mixdog-config.json
+  // mtime, so switching workflow rebuilds this block.
+  const workflowActive = String(
+    (readConfigSection(DATA_DIR, 'agent').workflow || {}).active
+      || readConfigSection(DATA_DIR, 'workflow').active
+      || 'default',
+  ).trim().toLowerCase();
+  if (workflowActive !== 'solo') {
+    const briefLead = readOptional(path.join(LEAD_DIR, 'lead-brief.md'));
+    if (briefLead) parts.push(briefLead);
+  }
 
-  const channels = readOptional(path.join(LEAD_DIR, '02-channels.md'));
-  if (channels) parts.push(channels);
+  if (general) parts.push(general);
 
   return parts.join('\n\n');
 }
@@ -292,11 +275,6 @@ function buildLeadRoleContent({ PLUGIN_ROOT, DATA_DIR }) {
 function buildLeadMetaContent({ PLUGIN_ROOT, DATA_DIR }) {
   const RULES_DIR = path.join(PLUGIN_ROOT, 'rules');
   const LEAD_DIR = path.join(RULES_DIR, 'lead');
-  const HISTORY_DIR = path.join(DATA_DIR, 'history');
-  const memoryConfig = readConfigSection(DATA_DIR, 'memory');
-  const addressBullet = composeUserAddressBullet(memoryConfig);
-  const general = readOptional(path.join(LEAD_DIR, '01-general.md'));
-  const generalSplit = splitLeadGeneral(general, addressBullet);
   const parts = [];
 
   const profilePreferences = buildProfilePreferencesContent(DATA_DIR);
@@ -305,16 +283,11 @@ function buildLeadMetaContent({ PLUGIN_ROOT, DATA_DIR }) {
   const languageSection = buildLanguageSection(DATA_DIR);
   if (languageSection) parts.push(languageSection);
 
-  if (generalSplit.meta) parts.push(generalSplit.meta);
-
-  const userProfile = readOptional(path.join(HISTORY_DIR, 'user.md'));
-  if (userProfile) parts.push(`# User Profile\n\n${userProfile}`);
-
-  const botPersona = readOptional(path.join(HISTORY_DIR, 'bot.md'));
-  if (botPersona) parts.push(`# Bot Persona\n\n${botPersona}`);
-
-  const userWorkflowMd = readOptional(path.join(DATA_DIR, 'user-workflow.md'));
-  if (userWorkflowMd) parts.push(`# User Workflow\n\n${userWorkflowMd}`);
+  // Common instructions (renamed from user-workflow.md; legacy file still
+  // honored so existing installs keep their guidance without migration).
+  const commonInstructionsMd = readOptional(path.join(DATA_DIR, 'instructions.md'))
+    || readOptional(path.join(DATA_DIR, 'user-workflow.md'));
+  if (commonInstructionsMd) parts.push(`# Common Instructions\n\n${commonInstructionsMd}`);
 
   const outputStyle = loadOutputStyle({ PLUGIN_ROOT, DATA_DIR });
   if (outputStyle) parts.push(outputStyle);

package/src/output-styles/default.md

@@ -13,36 +13,28 @@ essay-form. Depth comes from picking the right facts, not explaining more.
 Content
 - Lead with the outcome in one short sentence, then only the detail that
   matters: what changed, key evidence (paths, commands, errors, verification).
-- Summarize at the concept level: name the problem/behavior and direction, not
-  the code path. Cite a symbol/path only as an anchor, never as the explanation.
-- Compress by cutting content (filler, hedging, connective padding, restated
-  facts), not by clipping grammar: keep natural, complete sentences in the
-  user's language — never telegraph-style stub endings. Technical terms and
-  code stay exact.
-- State conclusions, not reasoning: no mechanism walkthroughs, background, or
-  chained qualifiers unless asked. One decisive fact beats three hedges.
-- Say each point once: problem and fix in ONE compact statement, not a restated
-  pair. Prefer fewer, denser items over covering every nuance.
-- Size budget: roughly TWICE the Simple style — per point about 2 rendered
-  lines, whole report ~10–15 lines. Spend the extra room on evidence and
-  context Simple would drop, not on longer sentences.
+- Summarize at the concept level: name the problem/behavior and direction,
+  not the code path; cite a symbol/path only as an anchor.
+  State conclusions, not reasoning: no mechanism walkthroughs or chained
+  qualifiers unless asked.
+- Compress by cutting content (filler, hedging, restated facts), not grammar:
+  natural, complete sentences in the user's language; technical terms, paths,
+  commands, symbols, code, and exact errors stay verbatim.
+- Say each point once: problem and fix in ONE compact statement. Size budget:
+  roughly TWICE the Simple style — about 2 rendered lines per point, whole
+  report ~10–15 lines, spent on evidence Simple would drop.
 - Use labels such as `Changes`, `Verification`, and `Risks / next steps` in
-  final reports to structure the summary; skip labels on interim progress.
-- Collapse trivial tasks to a couple of sentences instead of forcing sections.
+  final reports; skip labels on interim progress, and collapse trivial tasks
+  to a couple of sentences instead of forcing sections.
 - Synthesize agent or retrieval results; never forward raw reports, long file
   lists, tool traces, or session metadata.
 - Do not hide blockers, failed verification, or required follow-up; surface them
   in one short clause.
-- Keep paths, commands, symbols, API names, code, and exact errors verbatim.
 
 Layout (hard rules)
-- One bullet or numbered item = one idea, at most 2 rendered lines including its
-  sub-bullet. If it needs more, cut the detail — do not add lines.
-- Open each item with a short **bold key point**, then the brief elaboration —
-  never bury the point mid-sentence.
-- Insert a blank line between numbered items, and between any list items running
-  past one line (loose list). Never emit a wall of consecutive multi-line items.
-- Keep paragraphs to ~3 lines max, with a blank line between paragraphs, lists,
-  and code blocks.
-- Nest at most one sub-level; deeper detail means you are over-explaining.
+- One bullet or numbered item = one idea, at most 2 rendered lines, opened
+  with a short **bold key point**; if it needs more, cut the detail.
+- Blank line between numbered items and between any multi-line list items —
+  never a wall of consecutive multi-line items. Paragraphs ~3 lines max with
+  blank lines between blocks; nest at most one sub-level.
 - Never name this style unless asked.

package/src/output-styles/minimal.md

@@ -10,18 +10,14 @@ keep-coding-instructions: true
 Minimal — a very short summary: one or two sentences, nothing more.
 
 - Summarize only the net result in one short sentence; add a second short
-  sentence only if a second fact (verification, blocker) genuinely needs it.
-  Never cram unrelated facts into a run-on just to stay at one sentence.
-- Size budget: roughly HALF the Simple style — 1–2 plain sentences, ~2–3
-  rendered lines at most, however large the task was.
-- Compress by cutting content, not grammar: natural, complete sentences only.
-  Concept-level only — never walk through code or mechanisms.
-- Summarize, never itemize: do not describe which files changed or how. State
-  only what the change accomplishes.
-- No headings, bullets, numbered lists, labels, or sections — plain sentences
-  only, even when the request says "report" or "summary".
-- Preferred pattern: `<target> changed. <verification> passed.`
-- If verification was not run, say the change is done and verification was not
-  run.
+  sentence only for a fact (verification, blocker) that genuinely needs it —
+  never a run-on that crams extra facts in.
+- Size budget: roughly HALF the Simple style — 1–2 plain, complete sentences
+  (~2–3 rendered lines) however large the task was, concept-level only.
+- Summarize, never itemize: no headings, bullets, labels, or sections and no
+  file-by-file detail — state only what the change accomplishes, even when
+  the request says "report" or "summary".
+- Preferred pattern: `<target> changed. <verification> passed.` If
+  verification was not run, say so.
 - Preserve only the single decisive path, command, symbol, API name, code, or
   error verbatim.

package/src/output-styles/simple.md

@@ -12,31 +12,22 @@ Practical concise — outcome-first handoffs for coding work: summarize the
 result, do not narrate or explain the change.
 
 - Open with the outcome in one sentence: done, blocked, or awaiting a decision.
-- Summarize at the concept level: name the behavior and direction, not the
-  code path; cite a symbol/path only as an anchor, never as the explanation.
-- Compress by cutting content (filler, hedging, pleasantries, restated facts),
-  not grammar: keep natural, complete sentences in the user's language — never
-  telegraph-style stub endings. Technical terms and code stay exact.
-- Summarize what the change accomplishes, not a per-file changelog. Name a
-  path (`file_path:line_number`) only when the reader truly needs it to
-  navigate.
-- Controlled detail: usually 1–3 short bullets or 2–3 sentences total; state
-  each point once — outcome or fix direction, not both. No step-by-step
-  narration or file/line inventory.
-- Size budget: roughly HALF the Default style and TWICE Minimal — one rendered
-  line per point, whole reply ~5–7 lines. Above that you are writing Default;
-  below ~3 lines consider whether prose (Minimal) reads better.
-- Layout: one idea per bullet, ONE line each (two only when a verbatim
-  path/error forces it), led with a short bold key phrase; blank line between
-  multi-line list items — never a dense wall of text. If a point runs past one
-  line, cut the elaboration — detail beyond key phrase + one clause belongs to
-  Default.
+- Summarize at the concept level — what the change accomplishes, not a
+  per-file changelog or code path; cite a path (`file_path:line_number`) only
+  as a navigation anchor, never as the explanation.
+- Compress by cutting content (filler, acknowledgments, hedging, restated
+  facts), not grammar: natural, complete sentences in the user's language;
+  paths, commands, symbols, code, and exact errors stay verbatim.
+- Controlled detail: 1–3 short bullets or 2–3 sentences; state each point
+  once. Size budget: roughly HALF the Default style and TWICE Minimal —
+  whole reply ~5–7 lines.
+- Layout: one idea per bullet, ONE line each, led with a short bold key
+  phrase; blank line between multi-line list items — never a dense wall of
+  text.
 - Final handoffs may use labels like `Changes`, `Verification`, and
   `Risks / next steps`; do not label interim progress.
 - Synthesize agent or retrieval results; never forward raw reports, long file
   lists, tool traces, or session metadata.
 - Do not hide blockers, failed verification, or required follow-up — state
   them in one short clause; if verification was not run, say so once.
-- Keep paths, commands, symbols, API names, code, and exact errors verbatim.
-- Skip filler, acknowledgments, hedging, and repeated conclusions.
 - Never name this style unless asked.

package/src/rules/lead/01-general.md

@@ -2,7 +2,7 @@
 
 - You are Mixdog, the current coding-agent CLI/TUI assistant with
   multi-provider agent workflows. Never identify as generic OpenAI/ChatGPT.
-- A preamble is at most one useful sentence. Never use direct names,
-  honorifics, headings, labels, or routine lookup narration.
+- A preamble is at most one useful sentence, with no direct names, honorifics,
+  headings, labels, or routine lookup narration.
 - Destructive/hard-to-reverse action needs explicit confirmation.
 - Act proactively; ask only for decisions.

package/src/rules/shared/01-tool.md

@@ -15,10 +15,12 @@
   concurrently regardless of tool. Later turns are only for targets dependent
   on prior results or unresolved facets. Shell/write calls are serial.
 - After locator results, collect all known candidate files/regions before
-  inspection. Batch compatible reads, including same-file regions, in one
+  inspection. Batch compatible reads, including same-file regions — real
+  `{path,offset,limit}` arrays covering the whole logical unit — in one
   `path[]` call and graph targets in arrays. Parallelize independent
-  incompatible read-only inspections. Do not start a singleton while a known
-  compatible candidate remains. Put all known edits in one patch.
+  incompatible read-only inspections. Never page or reread returned spans,
+  and do not start a singleton while a known compatible candidate remains.
+  Put all new edits in one patch.
 - Project root, session cwd, user-provided and tool-returned paths are
   verified. Use `find` first for every genuinely guessed path/name fragment, in
   the same turn as independent probes. Never find verified roots or use
@@ -27,22 +29,18 @@
 - At task start, batch all `explore` facets in one `query[]` call, maximum 8,
   without rephrased duplicates. Retry `EXPLORATION_FAILED` once with changed
   tokens.
-- Stop when evidence covers the deliverable; never re-locate, re-verify,
-  refine, or upgrade a sufficient anchor. Every returned requested `path:line`
-  freezes the LOCATION only. When content was not returned, read or
-  code_graph detail inspection is valid; never re-locate it.
+- Stop when evidence covers the deliverable; never re-locate, re-verify, or
+  upgrade a sufficient anchor. A returned requested `path:line`
+  freezes the LOCATION only; when content was not returned,
+  read or code_graph detail inspection is valid — never re-locate it.
 - Give grep content mode enough `-C` to avoid rereads; a sufficient contextual
   grep means no overlapping `read`. After `files_with_matches`, `count`,
   capped, or insufficient context, inspect only missing content. A nonzero
   `content_with_context` result resolves the concept; act directly without
-  token changes, narrowing, or re-search. Only zero/error results permit token
-  or scope changes.
-- Batch independent read files/regions as real arrays, using
-  `{path,offset,limit}` regions, and read the whole logical unit. Never page or
-  reread returned spans.
+  re-search; only zero/error results permit token or scope changes.
 - Apply edits before verification, then verify in a separate shell turn and
   consume results in order. Otherwise remain parallel.
 - A long-running command promoted to background is a decision point, not a
-  cue to wait. Estimate whether observed progress can finish within budget;
+  cue to wait: estimate whether observed progress can finish within budget;
   otherwise diagnose the bottleneck and switch routes. Choose waiting
   explicitly.

package/src/runtime/agent/orchestrator/config.mjs

@@ -396,7 +396,6 @@ export function loadConfig(options = {}) {
                 // bypass the per-provider auto-clear table.
                 autoClear: { enabled: true, ...raw.autoClear },
                 compaction: raw.compaction && typeof raw.compaction === 'object' ? { ...raw.compaction } : {},
-                trajectory: { enabled: true, ...raw.trajectory },
                 runtime: raw.runtime && typeof raw.runtime === 'object' ? raw.runtime : {},
                 shell: raw.shell && typeof raw.shell === 'object' ? raw.shell : {},
                 update: raw.update && typeof raw.update === 'object' ? { ...raw.update } : {},
@@ -426,7 +425,6 @@ export function loadConfig(options = {}) {
         skills: normalizeSkillsConfig(null),
                 autoClear: { enabled: true },
         compaction: {},
-        trajectory: { enabled: true },
         runtime: {},
         shell: {},
         update: {},
@@ -566,7 +564,6 @@ function buildAgentSaveBuilder(config, appliedDirty) {
             skills: normalizeSkillsConfig(config.skills),
             autoClear: config.autoClear || {},
             compaction: config.compaction || {},
-            trajectory: config.trajectory || {},
             runtime: config.runtime || {},
             shell: config.shell || {},
             update: config.update || {},

package/src/runtime/agent/orchestrator/session/loop/steering-ladder.mjs

@@ -124,6 +124,15 @@ export function createSteeringLadder(ctx) {
                         pushSystemReminder(editPushEligible
                             ? 'Last 2 turns each ran a single read-only tool. Batch independent lookups (read/grep/glob/code_graph) into ONE turn, or start editing if you have enough context.'
                             : 'Last 2 turns each ran a single read-only tool. Batch independent lookups (read/grep/glob/code_graph) into ONE turn.');
+                        try {
+                            appendAgentTrace({
+                                sessionId,
+                                iteration: iterations,
+                                kind: 'steer',
+                                payload: { tag: 'level1_batching', level1_fires: _level1FireCount, edit_count: editCount },
+                                agent: sessionAgent || null,
+                            });
+                        } catch { /* best-effort */ }
                     }
                     _hintFiredThisTurn = true;
                 }

package/src/runtime/agent/orchestrator/session/loop/stored-tool-args.mjs

@@ -11,8 +11,12 @@ const STORED_TOOL_ARG_BODY_KEY_RE = /^(?:content|old_string|new_string|patch|rew
 const STORED_TOOL_ARG_LONG_KEY_RE = /^(?:command|script)$/i;
 // Marker-alone value produced by compactStoredToolArgString for body keys.
 const STORED_TOOL_ARG_MARKER_RE = /^\[mixdog compacted\b[^\]\n]*\]$/;
-const STORED_TOOL_ARG_BODY_LIMIT = 2_000;
-const STORED_TOOL_ARG_LONG_LIMIT = 8_000;
+// One shared budget for stored bodies AND long commands, matching the codex
+// reference truncation budget (TruncationPolicyConfig::bytes(10_000)). Below
+// this, the model always sees its own recent patch text verbatim — the 2 KB
+// body cut made every mid-size successful patch render as a marker and Opus
+// mimicked the marker as literal patch input on the next call.
+const STORED_TOOL_ARG_LIMIT = 10_000;
 const STORED_TOOL_ARG_PREVIEW_HEAD = 360;
 const STORED_TOOL_ARG_PREVIEW_TAIL = 160;
 
@@ -20,10 +24,10 @@ function compactStoredToolArgString(value, key = '') {
     if (typeof value !== 'string') return value;
     const isBody = STORED_TOOL_ARG_BODY_KEY_RE.test(key);
     const isLong = isBody || STORED_TOOL_ARG_LONG_KEY_RE.test(key);
-    const limit = isBody ? STORED_TOOL_ARG_BODY_LIMIT : (isLong ? STORED_TOOL_ARG_LONG_LIMIT : Infinity);
+    const limit = isLong ? STORED_TOOL_ARG_LIMIT : Infinity;
     if (value.length <= limit) return value;
     const hash = createHash('sha256').update(value).digest('hex').slice(0, 16);
-    const marker = `[mixdog compacted ${key || 'string'}: ${value.length} chars, sha256:${hash}]`;
+    const marker = `[mixdog compacted ${key || 'string'}: ${value.length} chars, sha256:${hash}; do not copy]`;
     // Body args (patch / old_string / new_string / content / rewrite) are
     // apply_patch / edit inputs. Keeping a head/tail preview leaves real patch
     // fragments (a "*** Begin Patch" opening, diff lines) inside a SUCCESSFUL

package/src/runtime/agent/orchestrator/session/manager/ask-session.mjs

@@ -21,6 +21,7 @@ import {
     prefixSessionStartContent,
     buildCurrentTimeBlock,
     buildSessionStartBlock,
+    buildProjectInstructionsBlock,
     hasUserConversationMessage,
 } from './prompt-utils.mjs';
 import {
@@ -379,11 +380,16 @@ export async function askSession(sessionId, prompt, context, onToolCall, cwdOver
             const _sessionStartBlock = shouldInjectSessionStart
                 ? buildSessionStartBlock(session, effectiveCwd)
                 : '';
+            // Project instructions ride the same once-per-session gate as the
+            // `# Session` block (Lead only — agent-owned sessions return '').
+            const _projectInstructionsBlock = _sessionStartBlock
+                ? buildProjectInstructionsBlock(effectiveCwd)
+                : '';
             const _currentTimeBlock = buildCurrentTimeBlock(prompt);
             const _turnReminderBlock = _currentTimeBlock
                 ? `<system-reminder>\n# Current Time\n${_currentTimeBlock}\n</system-reminder>`
                 : '';
-            const _turnPrefixBlock = [_sessionStartBlock, _turnReminderBlock].filter(Boolean).join('\n\n');
+            const _turnPrefixBlock = [_sessionStartBlock, _projectInstructionsBlock, _turnReminderBlock].filter(Boolean).join('\n\n');
             const _baseUserTurnContent = prefixUserTurnContent(prompt, _contextBlock);
             const _userTurnContent = prefixSessionStartContent(_baseUserTurnContent, _turnPrefixBlock);
             if (shouldInjectSessionStart && _sessionStartBlock) {

package/src/runtime/agent/orchestrator/session/manager/prompt-utils.mjs

@@ -1,5 +1,7 @@
 // Prompt content + temporal helpers, extracted verbatim from manager.mjs
 // (behavior-preserving). Pure string/date utilities with no session state.
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
 import { isInternalRuntimeNotificationText as contractIsInternalRuntimeNotificationText } from '../../../../shared/tool-execution-contract.mjs';
 import { SUMMARY_PREFIX } from '../compact.mjs';
 
@@ -113,6 +115,30 @@ export function buildSessionStartBlock(session, cwd) {
     return lines.length > 1 ? lines.join('\n') : '';
 }
 
+// Project-scoped user instructions (<project>/.mixdog/instructions.md),
+// injected once per session right after the `# Session` block — BP4 head, so
+// the BP1–3 system prefix stays byte-identical across projects and the block
+// sits in the stable message prefix for same-project cache reuse. Missing or
+// empty file → '' (nothing injected). Best-effort: unreadable files never
+// break a turn.
+const PROJECT_INSTRUCTIONS_MAX_CHARS = 16_000;
+export function buildProjectInstructionsBlock(cwd) {
+    const dir = String(cwd || '').trim();
+    if (!dir) return '';
+    try {
+        const file = join(dir, '.mixdog', 'instructions.md');
+        if (!existsSync(file)) return '';
+        const text = readFileSync(file, 'utf8').trim();
+        if (!text) return '';
+        const body = text.length > PROJECT_INSTRUCTIONS_MAX_CHARS
+            ? `${text.slice(0, PROJECT_INSTRUCTIONS_MAX_CHARS)}\n[... project instructions truncated]`
+            : text;
+        return `# Project Instructions\n${body}`;
+    } catch {
+        return '';
+    }
+}
+
 export function isReferenceFilesMessage(message) {
     return message?.role === 'user'
         && typeof message.content === 'string'

package/src/runtime/agent/orchestrator/session/manager/rules-cache.mjs

@@ -104,8 +104,8 @@ export function _buildLeadMetaContext() {
     const RULES_DIR = join(PLUGIN_ROOT, 'rules');
     const mtime = maxMtimeRecursive([
         join(RULES_DIR, 'lead'),
-        join(DATA_DIR, 'history'),
         join(DATA_DIR, 'mixdog-config.json'),
+        join(DATA_DIR, 'instructions.md'),
         join(DATA_DIR, 'user-workflow.md'),
         join(PLUGIN_ROOT, 'output-styles'),
         join(DATA_DIR, 'output-styles'),

package/src/runtime/agent/orchestrator/session/store/listing.mjs

@@ -3,6 +3,7 @@
 // The two halves share the in-flight save map so an unpersisted session still
 // shows up in listings; the cycle is import-only (calls happen at runtime).
 import { existsSync, readFileSync, readdirSync, statSync, unlinkSync } from 'fs';
+import { join } from 'path';
 import { loadConfig } from '../../config.mjs';
 import { isAgentOwner } from '../../agent-owner.mjs';
 import { scanTopLevelLifecycle } from '../lifecycle-scan.mjs';

package/src/runtime/agent/orchestrator/tools/builtin/builtin-tools.mjs

@@ -80,7 +80,7 @@ export const BUILTIN_TOOLS = [
             properties: {
                 command: { type: 'string', description: 'Command.' },
                 cwd: { type: 'string', description: 'Working directory; persists across calls. Omit to reuse; absolute path changes it.' },
-                timeout: { type: 'number', description: `Timeout ms; default ${_shellDefaultTimeoutMs()}. On sync timeout the command moves to background as a task_id and keeps running; an explicit timeout then blocks at most BASH_MAX_TIMEOUT_MS, the remainder enforced as a background deadline. Sleep-like commands and MIXDOG_SHELL_DISABLE_BACKGROUND_TASKS opt out of promotion: they block for the full explicit timeout, then are killed with a [timeout] marker. async with timeout omitted runs until done/cancelled; an explicit timeout is still enforced.` },
+                timeout: { type: 'number', description: `Timeout ms; default ${_shellDefaultTimeoutMs()}. On sync timeout the command is promoted to a background task_id and keeps running, with any explicit timeout enforced as a background deadline. Sleep-like commands skip promotion: they block the full timeout, then are killed with a [timeout] marker. async runs until done/cancelled unless a timeout is set.` },
                 merge_stderr: { type: 'boolean', description: 'Merge stderr.' },
                 mode: { type: 'string', enum: ['sync', 'async'], description: executionModeSchemaDescription('sync') },
                 shell: { type: 'string', enum: ['bash', 'powershell'], description: 'Force shell. Windows defaults to PowerShell; bash = Git Bash/POSIX.' },

package/src/runtime/agent/orchestrator/tools/code-graph/build.mjs

@@ -453,7 +453,11 @@ export function _spawnCodeGraphWorker(
             const genStillCurrent = getGeneration(graphCwd) === genAtStart;
             if (genStillCurrent && cacheResult) {
               setMemoryCache(graphCwd, { ts: Date.now(), signature: msg.signature, graph: msg.graph });
-              setDiskCache(graphCwd, msg.graph);
+              // The Worker strictly persisted this graph before posting
+              // success. Adopt it in the main process without scheduling a
+              // redundant flush that can race the next Worker on the same
+              // manifest lock.
+              setDiskCache(graphCwd, msg.graph, { persist: false });
             }
             settle(genStillCurrent ? msg.graph : new Error('code-graph build invalidated during prewarm'));
           } else {

package/src/runtime/agent/orchestrator/tools/code-graph/disk-cache.mjs

@@ -424,7 +424,7 @@ export function listCachedCodeGraphRoots() {
   }
 }
 
-export function _setDiskCodeGraphEntry(cwd, graph) {
+export function _setDiskCodeGraphEntry(cwd, graph, { persist = true } = {}) {
   _loadDiskCodeGraphCache();
   // Stamp the cache entry with the persistence timestamp (not the build
   // start) so manifest/signature metadata stays fresh. Disk retention is
@@ -434,5 +434,8 @@ export function _setDiskCodeGraphEntry(cwd, graph) {
   serialized.builtAt = Date.now();
   _diskCodeGraphCache.set(_canonicalGraphCwd(cwd), serialized);
   _pruneDiskCodeGraphEntries();
-  _scheduleDiskCodeGraphCacheFlush();
+  // Worker success is already fenced by drainCodeGraphCacheStrict(); the
+  // parent only adopts that result. Rewriting it here races a following
+  // Worker on manifest.json.lock without adding durability.
+  if (persist) _scheduleDiskCodeGraphCacheFlush();
 }

package/src/runtime/agent/orchestrator/tools/patch/orchestrator.mjs

@@ -3,7 +3,7 @@
 // executePatchTool entry point + replay capture. Moved verbatim from
 // patch.mjs; control flow and output are unchanged.
 
-import { chmodSync, existsSync, readFileSync, writeFileSync, mkdirSync, rmSync, statSync } from 'node:fs';
+import { chmodSync, existsSync, readFileSync, readdirSync, writeFileSync, mkdirSync, rmSync, statSync } from 'node:fs';
 import { dirname as pathDirname, resolve as pathResolve, isAbsolute, join as pathJoin } from 'node:path';
 import { parsePatch } from 'diff';
 import { getAbortSignalForSession } from '../../session/abort-lookup.mjs';
@@ -664,7 +664,11 @@ function patchTargetPaths(patchStr, basePath) {
 }
 
 function maybeCapturePatchReplay(args, cwd, errorText) {
-  if (process.env.MIXDOG_PATCH_REPLAY_CAPTURE !== '1') return;
+  // Default ON: every apply_patch failure is frozen for `npm run patch:replay`
+  // (args + target-file snapshots). Set MIXDOG_PATCH_REPLAY_CAPTURE=0 to
+  // disable. Retention is bounded below to the newest records.
+  const _flag = String(process.env.MIXDOG_PATCH_REPLAY_CAPTURE ?? '1').trim().toLowerCase();
+  if (_flag === '0' || _flag === 'false' || _flag === 'off') return;
   try {
     const patchStr = typeof args?.patch === 'string' ? args.patch : '';
     const basePath = pathResolve(String(args?.base_path || cwd || process.cwd()));
@@ -693,6 +697,13 @@ function maybeCapturePatchReplay(args, cwd, errorText) {
       file_snapshots: files,
     };
     writeFileSync(pathJoin(dir, `${id}.json`), JSON.stringify(record, null, 2), { mode: 0o600 });
+    // Retention: keep the newest 40 captures. The id prefix is Date.now() in
+    // base36 (fixed width until ~2059), so a lexicographic sort is
+    // chronological and the oldest records sort first.
+    const _kept = readdirSync(dir).filter((f) => f.endsWith('.json')).sort();
+    for (const stale of _kept.slice(0, Math.max(0, _kept.length - 40))) {
+      try { rmSync(pathJoin(dir, stale), { force: true }); } catch { /* best-effort */ }
+    }
   } catch { /* capture is best-effort; never affect the tool result */ }
 }
 

package/src/runtime/agent/orchestrator/tools/patch-tool-defs.mjs

@@ -26,7 +26,7 @@ export const PATCH_TOOL_DEFS = [
     name: 'apply_patch',
     title: 'Mixdog Apply Patch',
     annotations: { title: 'Mixdog Apply Patch', readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: false, compressible: false, compressibleLossless: true },
-    description: 'Apply known file edits in one atomic patch; sections run in listed order and all touched paths roll back if any section fails. Do not split a dependent edit across turns.',
+    description: 'Apply file edits in one patch; sections run in listed order and all touched paths roll back if any section fails. Do not split a dependent edit across turns.',
     freeformDescription: APPLY_PATCH_FREEFORM_DESCRIPTION,
     freeform: {
       type: 'grammar',
@@ -36,7 +36,7 @@ export const PATCH_TOOL_DEFS = [
     inputSchema: {
       type: 'object',
       properties: {
-        patch: { type: 'string', description: 'Patch text. V4A preferred; use one file block per target file with exact current context; include all known edits in listed order. On failure, the tool rolls all earlier writes back.' },
+        patch: { type: 'string', description: 'Patch text. V4A preferred; one file block per target file, 3 lines of exact context per hunk, @@ anchors when ambiguous; include all new edits in listed order. On failure, the tool rolls all earlier writes back.' },
         format: { type: 'string', enum: ['unified', 'v4a'], description: 'Auto-detected.' },
         base_path: { type: 'string', description: 'Repo root.' },
         dry_run: { type: 'boolean', description: 'Default false. true = validate only, no write.' },

package/src/runtime/memory/lib/session-ingest.mjs

@@ -238,6 +238,12 @@ function stripUserTurnPrefixEnvelopes(text) {
   //    — its next line is not a `Cwd:/Model:/Workflow:` field — so it is
   //    preserved verbatim (zero-loss). Anchored ^.
   out = out.replace(/^# Session\n(?:(?:Cwd|Model|Workflow): [^\n]*\n)+(?:\n|$)/, '')
+  // 1b) Leading `# Project Instructions\n<body>` (buildProjectInstructionsBlock,
+  //     emitted right after the `# Session` block). Anchored to start; body runs
+  //     to the next `# ` section boundary or end — the human prompt follows a
+  //     `# Task` marker, so real user text is never inside this span.
+  out = out.replace(/^# Project Instructions\n[\s\S]*?(?=\n# |$)/, '')
+  out = out.replace(/^\n+/, '')
   // 2) Leading `# Additional context\n<body>\n\n` (manager.mjs:3168). Anchored
   //    to start; body runs up to the next `# ` section boundary or end. The
   //    `\n\n` separator manager.mjs emits is included.

package/src/runtime/memory/tool-defs.mjs

@@ -36,7 +36,7 @@ export const TOOL_DEFS = [
       properties: {
         query: { anyOf: [{ type: 'string' }, { type: 'array', items: { type: 'string' }, minItems: 1 }], description: 'Search text, or array for independent fan-out queries.' },
         id: { anyOf: [{ type: 'number' }, { type: 'array', items: { type: 'number' }, minItems: 1 }], description: 'Exact #id(s) from recall. Do not invent ids.' },
-        period: { type: 'string', description: "last (recent sessions; +query topic-filter; limit=session count [default 5], offset=session paging), Nm/Nh/Nd (rolling), today/yesterday/this_week/last_week, all, YYYY-MM-DD, YYYY-MM-DD~YYYY-MM-DD, HH:MM~HH:MM (today), or 'YYYY-MM-DD HH:MM~HH:MM'." },
+        period: { type: 'string', description: "last (recent sessions; +query topic-filter; limit=session count), Nm/Nh/Nd, today/yesterday/this_week/last_week, all, YYYY-MM-DD, date~date, HH:MM~HH:MM, or 'YYYY-MM-DD HH:MM~HH:MM'." },
         limit: { type: 'number', description: 'Max entries.' },
         offset: { type: 'number', description: 'Skip entries.' },
         sort: { type: 'string', enum: ['importance', 'date'], description: 'importance or date.' },

package/src/runtime/shared/background-tasks.mjs

@@ -51,7 +51,7 @@ export function executionModeSchemaDescription(defaultMode = 'sync') {
   if (defaultMode === 'async') {
     return 'sync = inline result; async = task_id + completion notification. Default async.';
   }
-  return 'Runs sync (inline result); no default auto-background. async forces a background task_id + completion notification.';
+  return 'Default sync.';
 }
 
 export function taskIdFromArgs(args = {}) {

package/src/runtime/shared/user-data-guard.mjs

@@ -31,9 +31,8 @@ const RECOVERY_NOTICE = 'RECOVERY-REQUIRED.txt';
 
 const USER_DATA_FILES = [
   'mixdog-config.json',
+  'instructions.md',
   'user-workflow.md',
-  'history/user.md',
-  'history/bot.md',
 ];
 
 const USER_DATA_DIRS = [

package/src/session-runtime/lifecycle-api.mjs

@@ -425,7 +425,11 @@ export function createLifecycleApi(deps) {
       setSession(resumed);
       applyResolvedCwd(resolveResumeCwd(resumed, getCurrentCwd()), { markRefresh: false });
       const route = getRoute();
-      const resumeEffort = hasOwn(route, 'effort') ? route.effort : resumed.effort;
+      // The resumed session's OWN effort wins. resolveRoute always returns an
+      // effort key, so this used to reinstate the effort of whichever session
+      // happened to be open before — a schedule/webhook session opened with a
+      // different effort than the one it actually ran with.
+      const resumeEffort = resumed.effort || (hasOwn(route, 'effort') ? route.effort : undefined);
       setRoute(resolveRoute(getConfig(), { provider: resumed.provider, model: resumed.model, effort: resumeEffort }));
       await refreshRouteEffort();
       const session = getSession();

package/src/tui/dist/index.mjs

@@ -1179,9 +1179,8 @@ var init_user_data_guard = __esm({
   "src/runtime/shared/user-data-guard.mjs"() {
     USER_DATA_FILES = [
       "mixdog-config.json",
-      "user-workflow.md",
-      "history/user.md",
-      "history/bot.md"
+      "instructions.md",
+      "user-workflow.md"
     ];
     USER_DATA_DIRS = [
       "schedules",

package/src/workflows/solo/WORKFLOW.md

@@ -7,8 +7,8 @@ agents:
 
 # Solo
 
-Lead handles everything directly: consult the user and build the plan
-together. Before the user explicitly approves the latest plan, work is
+Consult the user and build the plan together. Before the user explicitly
+approves the latest plan, work is
 read-only investigation and planning — no edits, no state mutation. A new or
 changed request resets planning; a scope change requires fresh approval.
 

package/src/rules/lead/02-channels.md

@@ -1,3 +0,0 @@
-# Channels
-
-The runtime handles channel features.