opencode-matrixx 2.6.6 → 2.6.7

package/dist/index.js

@@ -4550,14 +4550,14 @@ __export(exports_storage, {
   readState: () => readState,
   writeState: () => writeState
 });
-import { existsSync as existsSync34, mkdirSync as mkdirSync13, readFileSync as readFileSync28, unlinkSync as unlinkSync7, writeFileSync as writeFileSync15 } from "fs";
-import { dirname as dirname9, join as join43 } from "path";
+import { existsSync as existsSync35, mkdirSync as mkdirSync13, readFileSync as readFileSync28, unlinkSync as unlinkSync7, writeFileSync as writeFileSync15 } from "fs";
+import { dirname as dirname9, join as join44 } from "path";
 function getStateFilePath(directory, customPath) {
-  return customPath ? join43(directory, customPath) : join43(directory, DEFAULT_STATE_FILE);
+  return customPath ? join44(directory, customPath) : join44(directory, DEFAULT_STATE_FILE);
 }
 function readState(directory, customPath) {
   const filePath = getStateFilePath(directory, customPath);
-  if (!existsSync34(filePath)) {
+  if (!existsSync35(filePath)) {
     return null;
   }
   try {
@@ -4597,7 +4597,7 @@ function writeState(directory, state3, customPath) {
   const filePath = getStateFilePath(directory, customPath);
   try {
     const dir = dirname9(filePath);
-    if (!existsSync34(dir)) {
+    if (!existsSync35(dir)) {
       mkdirSync13(dir, { recursive: true });
     }
     const sessionIdLine = state3.session_id ? `session_id: "${state3.session_id}"
@@ -4624,7 +4624,7 @@ ${state3.prompt}
 function clearState(directory, customPath) {
   const filePath = getStateFilePath(directory, customPath);
   try {
-    if (existsSync34(filePath)) {
+    if (existsSync35(filePath)) {
       unlinkSync7(filePath);
     }
     return true;
@@ -30087,7 +30087,7 @@ Write final summary to \`.matrixx/slop-scan-<timestamp>.md\`.
 });
 
 // src/hooks/agent-usage-reminder/constants.ts
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 
 // src/shared/agent-tool-restrictions.ts
 var EXPLORATION_AGENT_DENYLIST = {
@@ -45003,6 +45003,73 @@ async function updateConnectedProvidersCache(client) {
     log("[connected-providers-cache] Error updating cache", { error: String(err) });
   }
 }
+// src/shared/context-mode-enforcement.ts
+import { existsSync as existsSync3 } from "fs";
+import { homedir as homedir2 } from "os";
+import { join as join5 } from "path";
+var CONTEXT_MODE_DEFAULT_BLOCKED_TOOLS = ["grep", "glob"];
+function resolveContextModeEnforcement(contextMode) {
+  return {
+    enabled: contextMode?.enabled ?? true,
+    enforce: contextMode?.enforce ?? false,
+    blockedTools: (contextMode?.blocked_tools ?? [...CONTEXT_MODE_DEFAULT_BLOCKED_TOOLS]).map((t) => t.toLowerCase())
+  };
+}
+function hasGrepGlobToolNames(toolNames) {
+  return toolNames.some((n) => n === "grep" || n === "glob");
+}
+function resolveGrepGlobUsable(toolNames, contextMode) {
+  if (!hasGrepGlobToolNames(toolNames))
+    return false;
+  const cfg = contextMode !== undefined ? contextMode : _contextModeForPrompts;
+  return !willBlockGrepGlob(cfg);
+}
+var _disciplinePathOverride;
+var _contextModeForPrompts;
+function setContextModeForPrompts(contextMode) {
+  _contextModeForPrompts = contextMode;
+}
+function getContextModeForPrompts() {
+  return _contextModeForPrompts;
+}
+function willBlockGrepGlob(contextMode) {
+  const { enforce, blockedTools } = resolveContextModeEnforcement(contextMode);
+  if (!enforce)
+    return false;
+  if (!(blockedTools.includes("grep") || blockedTools.includes("glob")))
+    return false;
+  return hasWorkingSubstitute();
+}
+function resolveContextModeDisciplinePath() {
+  if (_disciplinePathOverride !== undefined)
+    return _disciplinePathOverride;
+  try {
+    const resolved = __require.resolve("context-mode/configs/opencode/AGENTS.md");
+    if (existsSync3(resolved))
+      return resolved;
+  } catch {}
+  try {
+    const cacheDir = getOpenCodeCacheDir();
+    const p = join5(cacheDir, "packages/context-mode@latest/node_modules/context-mode/configs/opencode/AGENTS.md");
+    if (existsSync3(p))
+      return p;
+  } catch {}
+  try {
+    const base = process.env.XDG_CACHE_HOME ?? join5(homedir2(), ".cache");
+    const p = join5(base, "opencode/packages/context-mode@latest/node_modules/context-mode/configs/opencode/AGENTS.md");
+    if (existsSync3(p))
+      return p;
+  } catch {}
+  try {
+    const p2 = join5(homedir2(), ".cache/opencode/packages/context-mode@latest/node_modules/context-mode/configs/opencode/AGENTS.md");
+    if (existsSync3(p2))
+      return p2;
+  } catch {}
+  return null;
+}
+function hasWorkingSubstitute() {
+  return resolveContextModeDisciplinePath() !== null;
+}
 // src/shared/deep-merge.ts
 var DANGEROUS_KEYS = new Set(["__proto__", "constructor", "prototype"]);
 var MAX_DEPTH = 50;
@@ -45218,7 +45285,7 @@ import * as os3 from "os";
 import * as path4 from "path";
 
 // src/shared/jsonc-parser.ts
-import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
 
 // node_modules/jsonc-parser/lib/esm/impl/scanner.js
 function createScanner(text, ignoreTrivia = false) {
@@ -46092,10 +46159,10 @@ function parseJsoncSafe(content) {
 function detectConfigFile(basePath) {
   const jsoncPath = `${basePath}.jsonc`;
   const jsonPath = `${basePath}.json`;
-  if (existsSync3(jsoncPath)) {
+  if (existsSync4(jsoncPath)) {
     return { format: "jsonc", path: jsoncPath };
   }
-  if (existsSync3(jsonPath)) {
+  if (existsSync4(jsonPath)) {
     return { format: "json", path: jsonPath };
   }
   return { format: "none", path: jsonPath };
@@ -46190,8 +46257,8 @@ Both matrixx and ${pluginName} listen to session.idle events.
    2. Or set "notification": { "force_enable": true } in matrixx.json`;
 }
 // src/shared/file-reference-resolver.ts
-import { existsSync as existsSync5, readFileSync as readFileSync4, statSync } from "fs";
-import { isAbsolute, join as join6 } from "path";
+import { existsSync as existsSync6, readFileSync as readFileSync4, statSync } from "fs";
+import { isAbsolute, join as join7 } from "path";
 var FILE_REFERENCE_PATTERN = /@([^\s@]+)/g;
 function findFileReferences(text) {
   const matches = [];
@@ -46210,10 +46277,10 @@ function resolveFilePath(filePath, cwd) {
   if (isAbsolute(filePath)) {
     return filePath;
   }
-  return join6(cwd, filePath);
+  return join7(cwd, filePath);
 }
 function readFileContent(resolvedPath) {
-  if (!existsSync5(resolvedPath)) {
+  if (!existsSync6(resolvedPath)) {
     return `[file not found: ${resolvedPath}]`;
   }
   const stat = statSync(resolvedPath);
@@ -46279,7 +46346,7 @@ init_frontmatter();
 // src/shared/git-worktree/collect-git-diff-stats.ts
 import { execFileSync } from "child_process";
 import { readFileSync as readFileSync5 } from "fs";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 
 // src/shared/git-worktree/parse-diff-numstat.ts
 function parseGitDiffNumstat(output, statusMap) {
@@ -46352,7 +46419,7 @@ function collectGitDiffStats(directory) {
     const untrackedNumstat = untrackedOutput ? untrackedOutput.split(`
 `).filter(Boolean).map((filePath) => {
       try {
-        const content = readFileSync5(join7(directory, filePath), "utf-8");
+        const content = readFileSync5(join8(directory, filePath), "utf-8");
         const lineCount = content.split(`
 `).length - (content.endsWith(`
 `) ? 1 : 0);
@@ -46440,8 +46507,8 @@ function isAbortError(error51) {
 init_logger();
 
 // src/shared/model-availability.ts
-import { existsSync as existsSync6, readFileSync as readFileSync6 } from "fs";
-import { join as join8 } from "path";
+import { existsSync as existsSync7, readFileSync as readFileSync6 } from "fs";
+import { join as join9 } from "path";
 init_logger();
 function normalizeModelName(name) {
   return name.toLowerCase().replace(/(opus|sonnet|haiku)-(\d+)[.-](\d+)/g, "$1-$2.$3");
@@ -46577,8 +46644,8 @@ async function fetchAvailableModels(client, options) {
     }
   }
   log("[fetchAvailableModels] provider-models cache not found, falling back to models.json");
-  const cacheFile = join8(getOpenCodeCacheDir(), "models.json");
-  if (!existsSync6(cacheFile)) {
+  const cacheFile = join9(getOpenCodeCacheDir(), "models.json");
+  if (!existsSync7(cacheFile)) {
     log("[fetchAvailableModels] models.json cache file not found, falling back to client");
   } else {
     try {
@@ -46683,8 +46750,8 @@ function isModelCacheAvailable() {
   if (hasProviderModelsCache()) {
     return true;
   }
-  const cacheFile = join8(getOpenCodeCacheDir(), "models.json");
-  return existsSync6(cacheFile);
+  const cacheFile = join9(getOpenCodeCacheDir(), "models.json");
+  return existsSync7(cacheFile);
 }
 // src/shared/model-resolution-pipeline.ts
 init_logger();
@@ -46973,9 +47040,9 @@ async function promptSyncWithModelSuggestionRetry(client, args) {
   }
 }
 // src/shared/opencode-config-dir.ts
-import { existsSync as existsSync7 } from "fs";
-import { homedir as homedir3 } from "os";
-import { join as join9, resolve } from "path";
+import { existsSync as existsSync8 } from "fs";
+import { homedir as homedir4 } from "os";
+import { join as join10, resolve } from "path";
 var TAURI_APP_IDENTIFIER = "ai.opencode.desktop";
 var TAURI_APP_IDENTIFIER_DEV = "ai.opencode.desktop.dev";
 function isDevBuild(version2) {
@@ -46987,14 +47054,14 @@ function getTauriConfigDir(identifier) {
   const platform = process.platform;
   switch (platform) {
     case "darwin":
-      return join9(homedir3(), "Library", "Application Support", identifier);
+      return join10(homedir4(), "Library", "Application Support", identifier);
     case "win32": {
-      const appData = process.env.APPDATA || join9(homedir3(), "AppData", "Roaming");
-      return join9(appData, identifier);
+      const appData = process.env.APPDATA || join10(homedir4(), "AppData", "Roaming");
+      return join10(appData, identifier);
     }
     default: {
-      const xdgConfig = process.env.XDG_CONFIG_HOME || join9(homedir3(), ".config");
-      return join9(xdgConfig, identifier);
+      const xdgConfig = process.env.XDG_CONFIG_HOME || join10(homedir4(), ".config");
+      return join10(xdgConfig, identifier);
     }
   }
 }
@@ -47004,21 +47071,21 @@ function getCliConfigDir() {
     return resolve(envConfigDir);
   }
   if (process.platform === "win32") {
-    const crossPlatformDir = join9(homedir3(), ".config", "opencode");
-    const crossPlatformConfig = join9(crossPlatformDir, "opencode.json");
-    if (existsSync7(crossPlatformConfig)) {
+    const crossPlatformDir = join10(homedir4(), ".config", "opencode");
+    const crossPlatformConfig = join10(crossPlatformDir, "opencode.json");
+    if (existsSync8(crossPlatformConfig)) {
       return crossPlatformDir;
     }
-    const appData = process.env.APPDATA || join9(homedir3(), "AppData", "Roaming");
-    const appdataDir = join9(appData, "opencode");
-    const appdataConfig = join9(appdataDir, "opencode.json");
-    if (existsSync7(appdataConfig)) {
+    const appData = process.env.APPDATA || join10(homedir4(), "AppData", "Roaming");
+    const appdataDir = join10(appData, "opencode");
+    const appdataConfig = join10(appdataDir, "opencode.json");
+    if (existsSync8(appdataConfig)) {
       return appdataDir;
     }
     return crossPlatformDir;
   }
-  const xdgConfig = process.env.XDG_CONFIG_HOME || join9(homedir3(), ".config");
-  return join9(xdgConfig, "opencode");
+  const xdgConfig = process.env.XDG_CONFIG_HOME || join10(homedir4(), ".config");
+  return join10(xdgConfig, "opencode");
 }
 function getOpenCodeConfigDir(options) {
   const { binary, version: version2, checkExisting = true } = options;
@@ -47029,9 +47096,9 @@ function getOpenCodeConfigDir(options) {
   const tauriDir = getTauriConfigDir(identifier);
   if (checkExisting) {
     const legacyDir = getCliConfigDir();
-    const legacyConfig = join9(legacyDir, "opencode.json");
-    const legacyConfigC = join9(legacyDir, "opencode.jsonc");
-    if (existsSync7(legacyConfig) || existsSync7(legacyConfigC)) {
+    const legacyConfig = join10(legacyDir, "opencode.json");
+    const legacyConfigC = join10(legacyDir, "opencode.jsonc");
+    if (existsSync8(legacyConfig) || existsSync8(legacyConfigC)) {
       return legacyDir;
     }
   }
@@ -47041,10 +47108,10 @@ function getOpenCodeConfigPaths(options) {
   const configDir = getOpenCodeConfigDir(options);
   return {
     configDir,
-    configJson: join9(configDir, "opencode.json"),
-    configJsonc: join9(configDir, "opencode.jsonc"),
-    packageJson: join9(configDir, "package.json"),
-    matrixxConfig: join9(configDir, "matrixx.json")
+    configJson: join10(configDir, "opencode.json"),
+    configJsonc: join10(configDir, "opencode.jsonc"),
+    packageJson: join10(configDir, "package.json"),
+    matrixxConfig: join10(configDir, "matrixx.json")
   };
 }
 // src/shared/opencode-http-api.ts
@@ -47291,12 +47358,12 @@ async function deletePart(client, sessionID, messageID, partID) {
 }
 // src/shared/opencode-message-dir.ts
 init_logger();
-import { existsSync as existsSync9, readdirSync } from "fs";
-import { join as join12 } from "path";
+import { existsSync as existsSync10, readdirSync } from "fs";
+import { join as join13 } from "path";
 
 // src/shared/opencode-storage-detection.ts
-import { existsSync as existsSync8 } from "fs";
-import { join as join10 } from "path";
+import { existsSync as existsSync9 } from "fs";
+import { join as join11 } from "path";
 
 // src/shared/opencode-version.ts
 import { execSync } from "child_process";
@@ -47361,8 +47428,8 @@ function isSqliteBackend() {
     return false;
   const check2 = () => {
     const versionOk = isOpenCodeVersionAtLeast(OPENCODE_SQLITE_VERSION);
-    const dbPath = join10(getDataDir(), "opencode", "opencode.db");
-    return versionOk && existsSync8(dbPath);
+    const dbPath = join11(getDataDir(), "opencode", "opencode.db");
+    return versionOk && existsSync9(dbPath);
   };
   if (cachedResult === FALSE_PENDING_RETRY) {
     const result2 = check2();
@@ -47379,11 +47446,11 @@ function isSqliteBackend() {
 }
 
 // src/shared/opencode-storage-paths.ts
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 var OPENCODE_STORAGE = getOpenCodeStorageDir();
-var MESSAGE_STORAGE = join11(OPENCODE_STORAGE, "message");
-var PART_STORAGE = join11(OPENCODE_STORAGE, "part");
-var SESSION_STORAGE = join11(OPENCODE_STORAGE, "session");
+var MESSAGE_STORAGE = join12(OPENCODE_STORAGE, "message");
+var PART_STORAGE = join12(OPENCODE_STORAGE, "part");
+var SESSION_STORAGE = join12(OPENCODE_STORAGE, "session");
 
 // src/shared/opencode-message-dir.ts
 function getMessageDir(sessionID) {
@@ -47393,16 +47460,16 @@ function getMessageDir(sessionID) {
     return null;
   if (isSqliteBackend())
     return null;
-  if (!existsSync9(MESSAGE_STORAGE))
+  if (!existsSync10(MESSAGE_STORAGE))
     return null;
-  const directPath = join12(MESSAGE_STORAGE, sessionID);
-  if (existsSync9(directPath)) {
+  const directPath = join13(MESSAGE_STORAGE, sessionID);
+  if (existsSync10(directPath)) {
     return directPath;
   }
   try {
     for (const dir of readdirSync(MESSAGE_STORAGE)) {
-      const sessionPath = join12(MESSAGE_STORAGE, dir, sessionID);
-      if (existsSync9(sessionPath)) {
+      const sessionPath = join13(MESSAGE_STORAGE, dir, sessionID);
+      if (existsSync10(sessionPath)) {
         return sessionPath;
       }
     }
@@ -47519,8 +47586,8 @@ function resetMessageCursor(sessionID) {
   sessionCursors.clear();
 }
 // src/features/hook-message-injector/injector.ts
-import { existsSync as existsSync10, mkdirSync as mkdirSync3, readdirSync as readdirSync2, readFileSync as readFileSync7, writeFileSync as writeFileSync2 } from "fs";
-import { join as join13 } from "path";
+import { existsSync as existsSync11, mkdirSync as mkdirSync3, readdirSync as readdirSync2, readFileSync as readFileSync7, writeFileSync as writeFileSync2 } from "fs";
+import { join as join14 } from "path";
 init_logger();
 function convertSDKMessageToStoredMessage(msg) {
   const info = msg.info;
@@ -47594,7 +47661,7 @@ function findNearestMessageWithFields(messageDir) {
     const files = readdirSync2(messageDir).filter((f) => f.endsWith(".json")).sort().reverse();
     for (const file2 of files) {
       try {
-        const content = readFileSync7(join13(messageDir, file2), "utf-8");
+        const content = readFileSync7(join14(messageDir, file2), "utf-8");
         const msg = JSON.parse(content);
         if (msg.agent && msg.model?.providerID && msg.model?.modelID) {
           return msg;
@@ -47603,7 +47670,7 @@ function findNearestMessageWithFields(messageDir) {
     }
     for (const file2 of files) {
       try {
-        const content = readFileSync7(join13(messageDir, file2), "utf-8");
+        const content = readFileSync7(join14(messageDir, file2), "utf-8");
         const msg = JSON.parse(content);
         if (msg.agent || msg.model?.providerID && msg.model?.modelID) {
           return msg;
@@ -47623,7 +47690,7 @@ function findFirstMessageWithAgent(messageDir) {
     const files = readdirSync2(messageDir).filter((f) => f.endsWith(".json")).sort();
     for (const file2 of files) {
       try {
-        const content = readFileSync7(join13(messageDir, file2), "utf-8");
+        const content = readFileSync7(join14(messageDir, file2), "utf-8");
         const msg = JSON.parse(content);
         if (msg.agent) {
           return msg.agent;
@@ -48068,10 +48135,10 @@ async function spawnTmuxPane(sessionId, description, config2, serverUrl, targetP
   return { success: true, paneId };
 }
 // src/shared/transcript-path.ts
-import { join as join14 } from "path";
-var TRANSCRIPT_DIR = join14(getOpenCodeConfigDir({ binary: "opencode" }), "transcripts");
+import { join as join15 } from "path";
+var TRANSCRIPT_DIR = join15(getOpenCodeConfigDir({ binary: "opencode" }), "transcripts");
 function getTranscriptPath(sessionId) {
-  return join14(TRANSCRIPT_DIR, `${sessionId}.jsonl`);
+  return join15(TRANSCRIPT_DIR, `${sessionId}.jsonl`);
 }
 // src/shared/truncate-description.ts
 function truncateDescription(description, maxLength = 120) {
@@ -48092,7 +48159,7 @@ function withTimeout(promise2, timeoutMs, errorMessage) {
   return Promise.race([promise2, timeoutPromise]).finally(() => clearTimeout(timeoutId));
 }
 // src/hooks/agent-usage-reminder/constants.ts
-var AGENT_USAGE_REMINDER_STORAGE = join15(OPENCODE_STORAGE, "agent-usage-reminder");
+var AGENT_USAGE_REMINDER_STORAGE = join16(OPENCODE_STORAGE, "agent-usage-reminder");
 var TARGET_TOOLS = new Set([
   "grep",
   "safe_grep",
@@ -48138,19 +48205,19 @@ ALWAYS prefer: Multiple parallel task calls > Direct tool calls
 
 // src/hooks/agent-usage-reminder/storage.ts
 import {
-  existsSync as existsSync11,
+  existsSync as existsSync12,
   mkdirSync as mkdirSync4,
   readFileSync as readFileSync8,
   unlinkSync as unlinkSync2,
   writeFileSync as writeFileSync3
 } from "fs";
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 function getStoragePath(sessionID) {
-  return join16(AGENT_USAGE_REMINDER_STORAGE, `${sessionID}.json`);
+  return join17(AGENT_USAGE_REMINDER_STORAGE, `${sessionID}.json`);
 }
 function loadAgentUsageState(sessionID) {
   const filePath = getStoragePath(sessionID);
-  if (!existsSync11(filePath))
+  if (!existsSync12(filePath))
     return null;
   try {
     const content = readFileSync8(filePath, "utf-8");
@@ -48160,7 +48227,7 @@ function loadAgentUsageState(sessionID) {
   }
 }
 function saveAgentUsageState(state) {
-  if (!existsSync11(AGENT_USAGE_REMINDER_STORAGE)) {
+  if (!existsSync12(AGENT_USAGE_REMINDER_STORAGE)) {
     mkdirSync4(AGENT_USAGE_REMINDER_STORAGE, { recursive: true });
   }
   const filePath = getStoragePath(state.sessionID);
@@ -48168,7 +48235,7 @@ function saveAgentUsageState(state) {
 }
 function clearAgentUsageState(sessionID) {
   const filePath = getStoragePath(sessionID);
-  if (existsSync11(filePath)) {
+  if (existsSync12(filePath)) {
     unlinkSync2(filePath);
   }
 }
@@ -48249,16 +48316,16 @@ var META_TAG_SUFFIX = "-->";
 var MAX_PLAN_FILE_BYTES = 102400;
 // src/features/mission-state/plan-storage.ts
 import {
-  existsSync as existsSync12,
+  existsSync as existsSync13,
   mkdirSync as mkdirSync5,
   readFileSync as readFileSync9,
   renameSync,
   writeFileSync as writeFileSync4
 } from "fs";
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 function ensurePlanDir(directory) {
   try {
-    mkdirSync5(join17(directory, PLANS_DIR), { recursive: true });
+    mkdirSync5(join18(directory, PLANS_DIR), { recursive: true });
     return true;
   } catch {
     return false;
@@ -48266,7 +48333,7 @@ function ensurePlanDir(directory) {
 }
 function readPlanFile(planPath) {
   try {
-    if (!existsSync12(planPath))
+    if (!existsSync13(planPath))
       return null;
     const content = readFileSync9(planPath, "utf-8");
     if (content.length > MAX_PLAN_FILE_BYTES)
@@ -48325,17 +48392,17 @@ function parseMetadataComment(content) {
   }
 }
 // src/features/mission-state/rehydrate.ts
-import { existsSync as existsSync14 } from "fs";
+import { existsSync as existsSync15 } from "fs";
 
 // src/features/mission-state/storage.ts
-import { existsSync as existsSync13, mkdirSync as mkdirSync6, readdirSync as readdirSync3, readFileSync as readFileSync10, writeFileSync as writeFileSync5 } from "fs";
-import { basename, dirname, join as join18 } from "path";
+import { existsSync as existsSync14, mkdirSync as mkdirSync6, readdirSync as readdirSync3, readFileSync as readFileSync10, writeFileSync as writeFileSync5 } from "fs";
+import { basename, dirname, join as join19 } from "path";
 function getMissionFilePath(directory) {
-  return join18(directory, MISSION_DIR, MISSION_FILE);
+  return join19(directory, MISSION_DIR, MISSION_FILE);
 }
 function readMissionState(directory) {
   const filePath = getMissionFilePath(directory);
-  if (!existsSync13(filePath)) {
+  if (!existsSync14(filePath)) {
     return null;
   }
   try {
@@ -48356,7 +48423,7 @@ function writeMissionState(directory, state) {
   const filePath = getMissionFilePath(directory);
   try {
     const dir = dirname(filePath);
-    if (!existsSync13(dir)) {
+    if (!existsSync14(dir)) {
       mkdirSync6(dir, { recursive: true });
     }
     writeFileSync5(filePath, JSON.stringify(state, null, 2), "utf-8");
@@ -48383,7 +48450,7 @@ function appendSessionId(directory, sessionId) {
 function clearMissionState(directory) {
   const filePath = getMissionFilePath(directory);
   try {
-    if (existsSync13(filePath)) {
+    if (existsSync14(filePath)) {
       const { unlinkSync: unlinkSync3 } = __require("fs");
       unlinkSync3(filePath);
     }
@@ -48393,13 +48460,13 @@ function clearMissionState(directory) {
   }
 }
 function findOraclePlans(directory) {
-  const plansDir = join18(directory, ORACLE_PLANS_DIR);
-  if (!existsSync13(plansDir)) {
+  const plansDir = join19(directory, ORACLE_PLANS_DIR);
+  if (!existsSync14(plansDir)) {
     return [];
   }
   try {
     const files = readdirSync3(plansDir);
-    return files.filter((f) => f.endsWith(".md")).map((f) => join18(plansDir, f)).sort((a, b) => {
+    return files.filter((f) => f.endsWith(".md")).map((f) => join19(plansDir, f)).sort((a, b) => {
       const aStat = __require("fs").statSync(a);
       const bStat = __require("fs").statSync(b);
       return bStat.mtimeMs - aStat.mtimeMs;
@@ -48409,7 +48476,7 @@ function findOraclePlans(directory) {
   }
 }
 function getPlanProgress(planPath) {
-  if (!existsSync13(planPath)) {
+  if (!existsSync14(planPath)) {
     return { total: 0, completed: 0, isComplete: true };
   }
   try {
@@ -48450,7 +48517,7 @@ function buildRehydrationContext(directory) {
   if (!mission?.active_plan)
     return null;
   const planPath = mission.active_plan;
-  if (!existsSync14(planPath))
+  if (!existsSync15(planPath))
     return null;
   const content = readPlanFile(planPath);
   if (!content)
@@ -48496,6 +48563,9 @@ function unregisterSubagentSession(sessionID) {
   subagentSessions.delete(sessionID);
   subagentParentMap.delete(sessionID);
 }
+function getParentSessionID(subagentSessionID) {
+  return subagentParentMap.get(subagentSessionID);
+}
 function getSubagentSessionIDs(parentSessionID) {
   const ids = [];
   for (const subID of subagentSessions) {
@@ -49340,8 +49410,8 @@ function findSlashCommandPartIndex(parts) {
   return -1;
 }
 // src/hooks/auto-slash-command/executor.ts
-import { existsSync as existsSync15, readdirSync as readdirSync4, readFileSync as readFileSync11 } from "fs";
-import { basename as basename2, dirname as dirname2, join as join19 } from "path";
+import { existsSync as existsSync16, readdirSync as readdirSync4, readFileSync as readFileSync11 } from "fs";
+import { basename as basename2, dirname as dirname2, join as join20 } from "path";
 
 // src/features/builtin-commands/templates/assembly.ts
 var ASSEMBLY_TEMPLATE = `Toggle assembly tool availability for the current session.
@@ -51743,7 +51813,7 @@ function sanitizeModelField(model, source = "other") {
 
 // src/hooks/auto-slash-command/executor.ts
 function discoverCommandsFromDir(commandsDir, scope) {
-  if (!existsSync15(commandsDir)) {
+  if (!existsSync16(commandsDir)) {
     return [];
   }
   const entries = readdirSync4(commandsDir, { withFileTypes: true });
@@ -51751,7 +51821,7 @@ function discoverCommandsFromDir(commandsDir, scope) {
   for (const entry of entries) {
     if (!isMarkdownFile(entry))
       continue;
-    const commandPath = join19(commandsDir, entry.name);
+    const commandPath = join20(commandsDir, entry.name);
     const commandName = basename2(entry.name, ".md");
     try {
       const content = readFileSync11(commandPath, "utf-8");
@@ -51817,8 +51887,8 @@ async function discoverPluginCommands(client) {
 }
 async function discoverAllCommands(options) {
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
-  const opencodeGlobalDir = join19(configDir, "command");
-  const opencodeProjectDir = join19(process.cwd(), ".opencode", "command");
+  const opencodeGlobalDir = join20(configDir, "command");
+  const opencodeProjectDir = join20(process.cwd(), ".opencode", "command");
   const opencodeGlobalCommands = discoverCommandsFromDir(opencodeGlobalDir, "opencode");
   const opencodeProjectCommands = discoverCommandsFromDir(opencodeProjectDir, "opencode-project");
   const builtinCommandsMap = loadBuiltinCommands();
@@ -52799,27 +52869,27 @@ function createCategorySkillReminderHook(_ctx, availableSkills = []) {
 // src/hooks/comment-checker/hook.ts
 import * as fs11 from "fs";
 import { tmpdir as tmpdir4 } from "os";
-import { join as join26 } from "path";
+import { join as join27 } from "path";
 
 // src/hooks/comment-checker/cli-runner.ts
-import { existsSync as existsSync23 } from "fs";
+import { existsSync as existsSync24 } from "fs";
 
 // src/hooks/comment-checker/cli.ts
 import * as fs10 from "fs";
-import { existsSync as existsSync22 } from "fs";
+import { existsSync as existsSync23 } from "fs";
 import { createRequire as createRequire2 } from "module";
 import { tmpdir as tmpdir3 } from "os";
-import { dirname as dirname5, join as join25 } from "path";
+import { dirname as dirname5, join as join26 } from "path";
 var {spawn: spawn8 } = globalThis.Bun;
 
 // src/hooks/comment-checker/downloader.ts
-import { appendFileSync as appendFileSync2, existsSync as existsSync21 } from "fs";
+import { appendFileSync as appendFileSync2, existsSync as existsSync22 } from "fs";
 import { createRequire } from "module";
-import { homedir as homedir6, tmpdir as tmpdir2 } from "os";
-import { join as join24 } from "path";
+import { homedir as homedir7, tmpdir as tmpdir2 } from "os";
+import { join as join25 } from "path";
 init_logger();
 var DEBUG = process.env.COMMENT_CHECKER_DEBUG === "1";
-var DEBUG_FILE = join24(tmpdir2(), "comment-checker-debug.log");
+var DEBUG_FILE = join25(tmpdir2(), "comment-checker-debug.log");
 function debugLog(...args) {
   if (DEBUG) {
     const msg = `[${new Date().toISOString()}] [comment-checker:downloader] ${args.map((a) => typeof a === "object" ? JSON.stringify(a, null, 2) : String(a)).join(" ")}
@@ -52838,12 +52908,12 @@ var PLATFORM_MAP = {
 function getCacheDir2() {
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join24(homedir6(), "AppData", "Local");
-    return join24(base2, "matrixx", "bin");
+    const base2 = localAppData || join25(homedir7(), "AppData", "Local");
+    return join25(base2, "matrixx", "bin");
   }
   const xdgCache = process.env.XDG_CACHE_HOME;
-  const base = xdgCache || join24(homedir6(), ".cache");
-  return join24(base, "matrixx", "bin");
+  const base = xdgCache || join25(homedir7(), ".cache");
+  return join25(base, "matrixx", "bin");
 }
 function getBinaryName() {
   return process.platform === "win32" ? "comment-checker.exe" : "comment-checker";
@@ -52869,8 +52939,8 @@ async function downloadCommentChecker() {
   }
   const cacheDir = getCacheDir2();
   const binaryName = getBinaryName();
-  const binaryPath = join24(cacheDir, binaryName);
-  if (existsSync21(binaryPath)) {
+  const binaryPath = join25(cacheDir, binaryName);
+  if (existsSync22(binaryPath)) {
     debugLog("Binary already cached at:", binaryPath);
     return binaryPath;
   }
@@ -52882,7 +52952,7 @@ async function downloadCommentChecker() {
   log(`[matrixx] Downloading comment-checker binary...`);
   try {
     ensureCacheDir(cacheDir);
-    const archivePath = join24(cacheDir, assetName);
+    const archivePath = join25(cacheDir, assetName);
     await downloadArchive(downloadUrl, archivePath);
     debugLog(`Downloaded archive to: ${archivePath}`);
     if (ext === "tar.gz") {
@@ -52914,7 +52984,7 @@ async function ensureCommentCheckerBinary() {
 
 // src/hooks/comment-checker/cli.ts
 var DEBUG2 = process.env.COMMENT_CHECKER_DEBUG === "1";
-var DEBUG_FILE2 = join25(tmpdir3(), "comment-checker-debug.log");
+var DEBUG_FILE2 = join26(tmpdir3(), "comment-checker-debug.log");
 function debugLog2(...args) {
   if (DEBUG2) {
     const msg = `[${new Date().toISOString()}] [comment-checker:cli] ${args.map((a) => typeof a === "object" ? JSON.stringify(a, null, 2) : String(a)).join(" ")}
@@ -52940,8 +53010,8 @@ function findCommentCheckerPathSync() {
     const require2 = createRequire2(import.meta.url);
     const cliPkgPath = require2.resolve("@code-yeongyu/comment-checker/package.json");
     const cliDir = dirname5(cliPkgPath);
-    const binaryPath = join25(cliDir, "bin", binaryName);
-    if (existsSync22(binaryPath)) {
+    const binaryPath = join26(cliDir, "bin", binaryName);
+    if (existsSync23(binaryPath)) {
       debugLog2("found binary in main package:", binaryPath);
       return binaryPath;
     }
@@ -52962,7 +53032,7 @@ async function getCommentCheckerPath() {
   }
   initPromise2 = (async () => {
     const syncPath = findCommentCheckerPathSync();
-    if (syncPath && existsSync22(syncPath)) {
+    if (syncPath && existsSync23(syncPath)) {
       resolvedCliPath = syncPath;
       debugLog2("using sync-resolved path:", syncPath);
       return syncPath;
@@ -52998,7 +53068,7 @@ async function runCommentChecker(input, cliPath, customPrompt) {
     debugLog2("comment-checker binary not found");
     return { hasComments: false, message: "" };
   }
-  if (!existsSync22(binaryPath)) {
+  if (!existsSync23(binaryPath)) {
     debugLog2("comment-checker binary does not exist:", binaryPath);
     return { hasComments: false, message: "" };
   }
@@ -53157,7 +53227,7 @@ ${result.message}`;
   }
 }
 function isCliPathUsable(cliPath) {
-  return Boolean(cliPath && existsSync23(cliPath));
+  return Boolean(cliPath && existsSync24(cliPath));
 }
 
 // src/hooks/comment-checker/pending-calls.ts
@@ -53195,7 +53265,7 @@ function takePendingCall(callID) {
 
 // src/hooks/comment-checker/hook.ts
 var DEBUG3 = process.env.COMMENT_CHECKER_DEBUG === "1";
-var DEBUG_FILE3 = join26(tmpdir4(), "comment-checker-debug.log");
+var DEBUG_FILE3 = join27(tmpdir4(), "comment-checker-debug.log");
 function debugLog3(...args) {
   if (DEBUG3) {
     const msg = `[${new Date().toISOString()}] [comment-checker:hook] ${args.map((a) => typeof a === "object" ? JSON.stringify(a, null, 2) : String(a)).join(" ")}
@@ -53469,18 +53539,18 @@ function createCompactionTodoPreserverHook(ctx) {
 // src/hooks/context-mode-enforcer/constants.ts
 var HOOK_NAME3 = "context-mode-enforcer";
 var WARN_MESSAGE_READ = "Use ctx_search / ctx_batch_execute / ctx_execute for analysis \u2014 raw read/grep/glob bypasses FTS5 sandbox and pollutes context. Use Read only with hashline IDs for Edit (non-plan paths; .matrixx/plans/*.md must use plan_read/plan_update).";
-var BLOCK_MESSAGE_GREP_GLOB = "Blocked: raw grep/glob is forbidden when context-mode is enforced. Use ctx_search (indexed) \u2192 grep/glob fallback only when ctx_* unavailable, or ctx_batch_execute / ctx_execute for multi-file analysis.";
+var BLOCK_MESSAGE_GREP_GLOB = "Blocked: raw grep/glob is forbidden when context-mode is enforced. " + "Use ctx_search for indexed-KB hits, or ctx_batch_execute / ctx_execute running shell `rg` for codebase search. " + "Raw grep/glob bypasses the FTS5 sandbox and pollutes context.";
 var WARN_MESSAGE_BASH_READ = "Use ctx_* / Read tool instead of `cat`/`head`/`tail`/`grep` via bash for analysis. Raw bash file reads bypass sandbox.";
 
 // src/hooks/context-mode-enforcer/hook.ts
 var BASH_FILE_READ_RE = /^\s*(cat|head|tail)\s+/;
 var BASH_GREP_RE = /\bgrep\b/;
 function resolveContextModeConfig(pluginConfig) {
-  const cfg = pluginConfig.context_mode;
+  const { enabled, enforce, blockedTools } = resolveContextModeEnforcement(pluginConfig.context_mode);
   return {
-    enabled: cfg?.enabled ?? true,
-    enforce: cfg?.enforce ?? false,
-    blockedTools: new Set((cfg?.blocked_tools ?? ["grep", "glob"]).map((t) => t.toLowerCase()))
+    enabled,
+    enforce,
+    blockedTools: new Set(blockedTools)
   };
 }
 function createContextModeEnforcerHook(pluginConfig) {
@@ -53525,7 +53595,7 @@ Bash command: ${command.slice(0, 200)}`);
       if (isGrepGlob) {
         if (!isBlocked)
           return;
-        if (enforce) {
+        if (enforce && hasWorkingSubstitute()) {
           log(`[${HOOK_NAME3}] BLOCKED ${tool}`, { sessionID: input.sessionID });
           throw new Error(BLOCK_MESSAGE_GREP_GLOB);
         }
@@ -53576,13 +53646,13 @@ function incrementEmptyContentAttempt(autoCompactState, sessionID) {
 }
 
 // src/hooks/context-window-limit-recovery/tool-result-store.ts
-import { existsSync as existsSync24, readdirSync as readdirSync5, readFileSync as readFileSync19, writeFileSync as writeFileSync8 } from "fs";
-import { join as join27 } from "path";
+import { existsSync as existsSync25, readdirSync as readdirSync5, readFileSync as readFileSync19, writeFileSync as writeFileSync8 } from "fs";
+import { join as join28 } from "path";
 init_logger();
 var TRUNCATION_MESSAGE = "[TOOL RESULT TRUNCATED - Context limit exceeded. Original output was too large and has been truncated to recover the session. Please re-run this tool if you need the full output.]";
 function getMessageIds(sessionID) {
   const messageDir = getMessageDir(sessionID);
-  if (!messageDir || !existsSync24(messageDir))
+  if (!messageDir || !existsSync25(messageDir))
     return [];
   const ids = [];
   for (const file2 of readdirSync5(messageDir)) {
@@ -53597,14 +53667,14 @@ function findToolResultsBySize(sessionID) {
   const messageIds = getMessageIds(sessionID);
   const results = [];
   for (const messageID of messageIds) {
-    const partDir = join27(PART_STORAGE, messageID);
-    if (!existsSync24(partDir))
+    const partDir = join28(PART_STORAGE, messageID);
+    if (!existsSync25(partDir))
       continue;
     for (const file2 of readdirSync5(partDir)) {
       if (!file2.endsWith(".json"))
         continue;
       try {
-        const partPath = join27(partDir, file2);
+        const partPath = join28(partDir, file2);
         const content = readFileSync19(partPath, "utf-8");
         const part = JSON.parse(content);
         if (part.type === "tool" && part.state?.output && !part.truncated) {
@@ -53817,20 +53887,20 @@ init_logger();
 init_logger();
 
 // src/hooks/session-recovery/storage/messages-reader.ts
-import { existsSync as existsSync25, readdirSync as readdirSync6, readFileSync as readFileSync20 } from "fs";
-import { join as join28 } from "path";
+import { existsSync as existsSync26, readdirSync as readdirSync6, readFileSync as readFileSync20 } from "fs";
+import { join as join29 } from "path";
 function readMessages(sessionID) {
   if (isSqliteBackend())
     return [];
   const messageDir = getMessageDir(sessionID);
-  if (!messageDir || !existsSync25(messageDir))
+  if (!messageDir || !existsSync26(messageDir))
     return [];
   const messages = [];
   for (const file2 of readdirSync6(messageDir)) {
     if (!file2.endsWith(".json"))
       continue;
     try {
-      const content = readFileSync20(join28(messageDir, file2), "utf-8");
+      const content = readFileSync20(join29(messageDir, file2), "utf-8");
       messages.push(JSON.parse(content));
     } catch {}
   }
@@ -53848,20 +53918,20 @@ var THINKING_TYPES = new Set(["thinking", "redacted_thinking", "reasoning"]);
 var META_TYPES = new Set(["step-start", "step-finish"]);
 
 // src/hooks/session-recovery/storage/parts-reader.ts
-import { existsSync as existsSync26, readdirSync as readdirSync7, readFileSync as readFileSync21 } from "fs";
-import { join as join29 } from "path";
+import { existsSync as existsSync27, readdirSync as readdirSync7, readFileSync as readFileSync21 } from "fs";
+import { join as join30 } from "path";
 function readParts(messageID) {
   if (isSqliteBackend())
     return [];
-  const partDir = join29(PART_STORAGE, messageID);
-  if (!existsSync26(partDir))
+  const partDir = join30(PART_STORAGE, messageID);
+  if (!existsSync27(partDir))
     return [];
   const parts = [];
   for (const file2 of readdirSync7(partDir)) {
     if (!file2.endsWith(".json"))
       continue;
     try {
-      const content = readFileSync21(join29(partDir, file2), "utf-8");
+      const content = readFileSync21(join30(partDir, file2), "utf-8");
       parts.push(JSON.parse(content));
     } catch {}
   }
@@ -53925,22 +53995,22 @@ function findEmptyMessageByIndex(sessionID, targetIndex) {
   return null;
 }
 // src/hooks/session-recovery/storage/empty-text.ts
-import { existsSync as existsSync27, readdirSync as readdirSync8, readFileSync as readFileSync22, writeFileSync as writeFileSync9 } from "fs";
-import { join as join30 } from "path";
+import { existsSync as existsSync28, readdirSync as readdirSync8, readFileSync as readFileSync22, writeFileSync as writeFileSync9 } from "fs";
+import { join as join31 } from "path";
 function replaceEmptyTextParts(messageID, replacementText) {
   if (isSqliteBackend()) {
     log("[session-recovery] Disabled on SQLite backend: replaceEmptyTextParts (use async variant)");
     return false;
   }
-  const partDir = join30(PART_STORAGE, messageID);
-  if (!existsSync27(partDir))
+  const partDir = join31(PART_STORAGE, messageID);
+  if (!existsSync28(partDir))
     return false;
   let anyReplaced = false;
   for (const file2 of readdirSync8(partDir)) {
     if (!file2.endsWith(".json"))
       continue;
     try {
-      const filePath = join30(partDir, file2);
+      const filePath = join31(partDir, file2);
       const content = readFileSync22(filePath, "utf-8");
       const part = JSON.parse(content);
       if (part.type === "text") {
@@ -54022,15 +54092,15 @@ function generatePartId() {
   return `prt_${timestamp}${random}`;
 }
 // src/hooks/session-recovery/storage/text-part-injector.ts
-import { existsSync as existsSync28, mkdirSync as mkdirSync7, writeFileSync as writeFileSync10 } from "fs";
-import { join as join31 } from "path";
+import { existsSync as existsSync29, mkdirSync as mkdirSync7, writeFileSync as writeFileSync10 } from "fs";
+import { join as join32 } from "path";
 function injectTextPart(sessionID, messageID, text) {
   if (isSqliteBackend()) {
     log("[session-recovery] Disabled on SQLite backend: injectTextPart (use async variant)");
     return false;
   }
-  const partDir = join31(PART_STORAGE, messageID);
-  if (!existsSync28(partDir)) {
+  const partDir = join32(PART_STORAGE, messageID);
+  if (!existsSync29(partDir)) {
     mkdirSync7(partDir, { recursive: true });
   }
   const partId = generatePartId();
@@ -54043,7 +54113,7 @@ function injectTextPart(sessionID, messageID, text) {
     synthetic: true
   };
   try {
-    writeFileSync10(join31(partDir, `${partId}.json`), JSON.stringify(part, null, 2));
+    writeFileSync10(join32(partDir, `${partId}.json`), JSON.stringify(part, null, 2));
     return true;
   } catch {
     return false;
@@ -54082,8 +54152,8 @@ function findMessagesWithThinkingBlocks(sessionID) {
   return result;
 }
 // src/hooks/session-recovery/storage/thinking-prepend.ts
-import { existsSync as existsSync29, mkdirSync as mkdirSync8, writeFileSync as writeFileSync11 } from "fs";
-import { join as join32 } from "path";
+import { existsSync as existsSync30, mkdirSync as mkdirSync8, writeFileSync as writeFileSync11 } from "fs";
+import { join as join33 } from "path";
 function findLastThinkingContent(sessionID, beforeMessageID) {
   const messages = readMessages(sessionID);
   const currentIndex = messages.findIndex((message) => message.id === beforeMessageID);
@@ -54112,8 +54182,8 @@ function prependThinkingPart(sessionID, messageID) {
     log("[session-recovery] Disabled on SQLite backend: prependThinkingPart (use async variant)");
     return false;
   }
-  const partDir = join32(PART_STORAGE, messageID);
-  if (!existsSync29(partDir)) {
+  const partDir = join33(PART_STORAGE, messageID);
+  if (!existsSync30(partDir)) {
     mkdirSync8(partDir, { recursive: true });
   }
   const previousThinking = findLastThinkingContent(sessionID, messageID);
@@ -54127,7 +54197,7 @@ function prependThinkingPart(sessionID, messageID) {
     synthetic: true
   };
   try {
-    writeFileSync11(join32(partDir, `${partId}.json`), JSON.stringify(part, null, 2));
+    writeFileSync11(join33(partDir, `${partId}.json`), JSON.stringify(part, null, 2));
     return true;
   } catch {
     return false;
@@ -54178,22 +54248,22 @@ async function prependThinkingPartAsync(client, sessionID, messageID) {
   }
 }
 // src/hooks/session-recovery/storage/thinking-strip.ts
-import { existsSync as existsSync30, readdirSync as readdirSync9, readFileSync as readFileSync23, unlinkSync as unlinkSync3 } from "fs";
-import { join as join33 } from "path";
+import { existsSync as existsSync31, readdirSync as readdirSync9, readFileSync as readFileSync23, unlinkSync as unlinkSync3 } from "fs";
+import { join as join34 } from "path";
 function stripThinkingParts(messageID) {
   if (isSqliteBackend()) {
     log("[session-recovery] Disabled on SQLite backend: stripThinkingParts (use async variant)");
     return false;
   }
-  const partDir = join33(PART_STORAGE, messageID);
-  if (!existsSync30(partDir))
+  const partDir = join34(PART_STORAGE, messageID);
+  if (!existsSync31(partDir))
     return false;
   let anyRemoved = false;
   for (const file2 of readdirSync9(partDir)) {
     if (!file2.endsWith(".json"))
       continue;
     try {
-      const filePath = join33(partDir, file2);
+      const filePath = join34(partDir, file2);
       const content = readFileSync23(filePath, "utf-8");
       const part = JSON.parse(content);
       if (THINKING_TYPES.has(part.type)) {
@@ -54950,7 +55020,7 @@ var DELEGATE_TASK_ERROR_PATTERNS = [
   {
     pattern: "run_in_background",
     errorType: "missing_run_in_background",
-    fixHint: "Add run_in_background=false (for delegation) or run_in_background=true (for parallel exploration)"
+    fixHint: "Add run_in_background=false (sync, awaits result inline; the default) or run_in_background=true (async, returns task_id immediately for parallel independent work such as exploration or fan-out waves)"
   },
   {
     pattern: "load_skills",
@@ -55064,7 +55134,7 @@ function buildRetryGuidance(errorInfo) {
    description="Task description",
    prompt="Detailed prompt...",
    category="blue-pill",  // OR subagent_type="trinity"
-   run_in_background=false,
+   run_in_background=false,  // false is default \u2014 use true for any parallel independent work (returns task_id; async). Sync awaits result inline.
    load_skills=[]
  )
  \`\`\`
@@ -55089,7 +55159,7 @@ ${guidance}`;
   };
 }
 // src/hooks/design-intent-preserver/hook.ts
-import { join as join35 } from "path";
+import { join as join36 } from "path";
 
 // src/hooks/design-intent-preserver/constants.ts
 var HOOK_NAME4 = "design-intent-preserver";
@@ -55109,7 +55179,7 @@ If design intent must change, record why in .matrixx/drafts/design-changes.md fi
 
 // src/hooks/design-intent-preserver/phase-detector.ts
 import { readdirSync as readdirSync10, readFileSync as readFileSync24, statSync as statSync3 } from "fs";
-import { join as join34 } from "path";
+import { join as join35 } from "path";
 function extractPromptText2(parts) {
   return parts.filter((p) => p.type === "text" && p.text !== undefined).map((p) => p.text ?? "").join(" ");
 }
@@ -55127,7 +55197,7 @@ function findMostRecentPlanFile(plansDir) {
     return null;
   let mostRecent = null;
   for (const entry of entries) {
-    const fullPath = join34(plansDir, entry);
+    const fullPath = join35(plansDir, entry);
     try {
       const stats = statSync3(fullPath);
       if (!stats.isFile())
@@ -55162,7 +55232,7 @@ function createDesignIntentPreserverHook(_ctx) {
       if (!hasPhaseTransition(promptText)) {
         return;
       }
-      const plansDir = join35(_ctx.directory, PLANS_DIR2);
+      const plansDir = join36(_ctx.directory, PLANS_DIR2);
       const planPath = findMostRecentPlanFile(plansDir);
       if (!planPath) {
         return;
@@ -55234,11 +55304,11 @@ import { dirname as dirname7 } from "path";
 
 // src/hooks/directory-agents-injector/finder.ts
 import { access } from "fs/promises";
-import { dirname as dirname6, join as join37, resolve as resolve2 } from "path";
+import { dirname as dirname6, join as join38, resolve as resolve2 } from "path";
 
 // src/hooks/directory-agents-injector/constants.ts
-import { join as join36 } from "path";
-var AGENTS_INJECTOR_STORAGE = join36(OPENCODE_STORAGE, "directory-agents");
+import { join as join37 } from "path";
+var AGENTS_INJECTOR_STORAGE = join37(OPENCODE_STORAGE, "directory-agents");
 var AGENTS_FILENAME = "AGENTS.md";
 
 // src/hooks/directory-agents-injector/finder.ts
@@ -55255,7 +55325,7 @@ async function findAgentsMdUp(input) {
   while (true) {
     const isRootDir = current === input.rootDir;
     if (!isRootDir) {
-      const agentsPath = join37(current, AGENTS_FILENAME);
+      const agentsPath = join38(current, AGENTS_FILENAME);
       const exists = await access(agentsPath).then(() => true).catch(() => false);
       if (exists) {
         found.push(agentsPath);
@@ -55275,18 +55345,18 @@ async function findAgentsMdUp(input) {
 
 // src/shared/session-injected-paths.ts
 import {
-  existsSync as existsSync31,
+  existsSync as existsSync32,
   mkdirSync as mkdirSync9,
   readFileSync as readFileSync25,
   unlinkSync as unlinkSync4,
   writeFileSync as writeFileSync12
 } from "fs";
-import { join as join38 } from "path";
+import { join as join39 } from "path";
 function createInjectedPathsStorage(storageDir) {
-  const getStoragePath2 = (sessionID) => join38(storageDir, `${sessionID}.json`);
+  const getStoragePath2 = (sessionID) => join39(storageDir, `${sessionID}.json`);
   const loadInjectedPaths = (sessionID) => {
     const filePath = getStoragePath2(sessionID);
-    if (!existsSync31(filePath))
+    if (!existsSync32(filePath))
       return new Set;
     try {
       const content = readFileSync25(filePath, "utf-8");
@@ -55297,7 +55367,7 @@ function createInjectedPathsStorage(storageDir) {
     }
   };
   const saveInjectedPaths = (sessionID, paths) => {
-    if (!existsSync31(storageDir)) {
+    if (!existsSync32(storageDir)) {
       mkdirSync9(storageDir, { recursive: true });
     }
     const data = {
@@ -55309,7 +55379,7 @@ function createInjectedPathsStorage(storageDir) {
   };
   const clearInjectedPaths = (sessionID) => {
     const filePath = getStoragePath2(sessionID);
-    if (existsSync31(filePath)) {
+    if (existsSync32(filePath)) {
       unlinkSync4(filePath);
     }
   };
@@ -58822,8 +58892,8 @@ ${originalText}`;
 init_logger();
 
 // src/hooks/interactive-bash-session/constants.ts
-import { join as join41 } from "path";
-var INTERACTIVE_BASH_SESSION_STORAGE = join41(OPENCODE_STORAGE, "interactive-bash-session");
+import { join as join42 } from "path";
+var INTERACTIVE_BASH_SESSION_STORAGE = join42(OPENCODE_STORAGE, "interactive-bash-session");
 var MATRIXX_SESSION_PREFIX = "matrixx-";
 function buildSessionReminderMessage(sessions) {
   if (sessions.length === 0)
@@ -58918,19 +58988,19 @@ function findSubcommand(tokens) {
 
 // src/hooks/interactive-bash-session/storage.ts
 import {
-  existsSync as existsSync33,
+  existsSync as existsSync34,
   mkdirSync as mkdirSync12,
   readFileSync as readFileSync27,
   unlinkSync as unlinkSync6,
   writeFileSync as writeFileSync14
 } from "fs";
-import { join as join42 } from "path";
+import { join as join43 } from "path";
 function getStoragePath2(sessionID) {
-  return join42(INTERACTIVE_BASH_SESSION_STORAGE, `${sessionID}.json`);
+  return join43(INTERACTIVE_BASH_SESSION_STORAGE, `${sessionID}.json`);
 }
 function loadInteractiveBashSessionState(sessionID) {
   const filePath = getStoragePath2(sessionID);
-  if (!existsSync33(filePath))
+  if (!existsSync34(filePath))
     return null;
   try {
     const content = readFileSync27(filePath, "utf-8");
@@ -58945,7 +59015,7 @@ function loadInteractiveBashSessionState(sessionID) {
   }
 }
 function saveInteractiveBashSessionState(state3) {
-  if (!existsSync33(INTERACTIVE_BASH_SESSION_STORAGE)) {
+  if (!existsSync34(INTERACTIVE_BASH_SESSION_STORAGE)) {
     mkdirSync12(INTERACTIVE_BASH_SESSION_STORAGE, { recursive: true });
   }
   const filePath = getStoragePath2(state3.sessionID);
@@ -58958,7 +59028,7 @@ function saveInteractiveBashSessionState(state3) {
 }
 function clearInteractiveBashSessionState(sessionID) {
   const filePath = getStoragePath2(sessionID);
-  if (existsSync33(filePath)) {
+  if (existsSync34(filePath)) {
     unlinkSync6(filePath);
   }
 }
@@ -59302,7 +59372,7 @@ init_logger();
 
 // src/hooks/matrix-loop/completion-promise-detector.ts
 init_logger();
-import { existsSync as existsSync35, readFileSync as readFileSync29 } from "fs";
+import { existsSync as existsSync36, readFileSync as readFileSync29 } from "fs";
 function escapeRegex2(str) {
   return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -59313,7 +59383,7 @@ function detectCompletionInTranscript(transcriptPath, promise2) {
   if (!transcriptPath)
     return false;
   try {
-    if (!existsSync35(transcriptPath))
+    if (!existsSync36(transcriptPath))
       return false;
     const content = readFileSync29(transcriptPath, "utf-8");
     const pattern = buildPromisePattern(promise2);
@@ -60096,13 +60166,13 @@ function createOracleMdOnlyHook(ctx) {
   };
 }
 // src/hooks/plan-persister/hook.ts
-import { existsSync as existsSync37, readdirSync as readdirSync12 } from "fs";
+import { existsSync as existsSync38, readdirSync as readdirSync12 } from "fs";
 
 // src/features/task-storage/storage.ts
 init_logger();
 import { randomUUID } from "crypto";
-import { existsSync as existsSync36, mkdirSync as mkdirSync14, readdirSync as readdirSync11, readFileSync as readFileSync30, renameSync as renameSync3, unlinkSync as unlinkSync8, writeFileSync as writeFileSync16 } from "fs";
-import { basename as basename5, dirname as dirname10, isAbsolute as isAbsolute3, join as join44 } from "path";
+import { existsSync as existsSync37, mkdirSync as mkdirSync14, readdirSync as readdirSync11, readFileSync as readFileSync30, renameSync as renameSync3, unlinkSync as unlinkSync8, writeFileSync as writeFileSync16 } from "fs";
+import { basename as basename5, dirname as dirname10, isAbsolute as isAbsolute3, join as join45 } from "path";
 
 // src/shared/task-system-gating.ts
 var TASK_SYSTEM_DEFAULT = true;
@@ -60126,18 +60196,18 @@ function isTaskSystemEnabled(config2) {
 
 // src/features/task-storage/storage.ts
 function getProjectTaskDir(directory) {
-  return join44(directory, ".matrixx", "tasks");
+  return join45(directory, ".matrixx", "tasks");
 }
 function getTaskDir(config2 = {}, directory) {
   const tasksConfig = resolveTasksConfig(config2);
   const storagePath = tasksConfig.storage_path;
   if (storagePath) {
-    return isAbsolute3(storagePath) ? storagePath : join44(directory ?? process.cwd(), storagePath);
+    return isAbsolute3(storagePath) ? storagePath : join45(directory ?? process.cwd(), storagePath);
   }
   if (tasksConfig.scope === "global" || !directory) {
     const configDir = getOpenCodeConfigDir({ binary: "opencode" });
     const listId = resolveTaskListId(config2);
-    return join44(configDir, "tasks", listId);
+    return join45(configDir, "tasks", listId);
   }
   return getProjectTaskDir(directory);
 }
@@ -60154,13 +60224,13 @@ function resolveTaskListId(config2 = {}) {
   return sanitizePathSegment(basename5(process.cwd()));
 }
 function ensureDir2(dirPath) {
-  if (!existsSync36(dirPath)) {
+  if (!existsSync37(dirPath)) {
     mkdirSync14(dirPath, { recursive: true });
   }
 }
 function readJsonSafe(filePath, schema) {
   try {
-    if (!existsSync36(filePath)) {
+    if (!existsSync37(filePath)) {
       return null;
     }
     const content = readFileSync30(filePath, "utf-8");
@@ -60183,7 +60253,7 @@ function writeJsonAtomic(filePath, data) {
     renameSync3(tempPath, filePath);
   } catch (error51) {
     try {
-      if (existsSync36(tempPath)) {
+      if (existsSync37(tempPath)) {
         unlinkSync8(tempPath);
       }
     } catch {}
@@ -60207,8 +60277,8 @@ function generateTaskId() {
 }
 function migrateLegacyTasksIfNeeded(config2, directory) {
   const projectDir = getProjectTaskDir(directory);
-  const legacyDir = join44(getOpenCodeConfigDir({ binary: "opencode" }), "tasks", resolveTaskListId(config2));
-  if (existsSync36(projectDir)) {
+  const legacyDir = join45(getOpenCodeConfigDir({ binary: "opencode" }), "tasks", resolveTaskListId(config2));
+  if (existsSync37(projectDir)) {
     try {
       const existing = readdirSync11(projectDir).filter((f) => f.startsWith("T-") && f.endsWith(".json"));
       if (existing.length > 0) {
@@ -60216,7 +60286,7 @@ function migrateLegacyTasksIfNeeded(config2, directory) {
       }
     } catch {}
   }
-  if (!existsSync36(legacyDir)) {
+  if (!existsSync37(legacyDir)) {
     return { migrated: 0, legacyDir, projectDir };
   }
   let files = [];
@@ -60231,9 +60301,9 @@ function migrateLegacyTasksIfNeeded(config2, directory) {
   ensureDir2(projectDir);
   let migrated = 0;
   for (const file2 of files) {
-    const src = join44(legacyDir, file2);
-    const dest = join44(projectDir, file2);
-    if (existsSync36(dest))
+    const src = join45(legacyDir, file2);
+    const dest = join45(projectDir, file2);
+    if (existsSync37(dest))
       continue;
     try {
       const content = readFileSync30(src, "utf-8");
@@ -60247,7 +60317,7 @@ function migrateLegacyTasksIfNeeded(config2, directory) {
   return { migrated, legacyDir, projectDir };
 }
 function acquireLock(dirPath) {
-  const lockPath = join44(dirPath, ".lock");
+  const lockPath = join45(dirPath, ".lock");
   const lockId = randomUUID();
   const createLock = (timestamp) => {
     writeFileSync16(lockPath, JSON.stringify({ id: lockId, timestamp }), {
@@ -60295,7 +60365,7 @@ function acquireLock(dirPath) {
     acquired: true,
     release: () => {
       try {
-        if (!existsSync36(lockPath))
+        if (!existsSync37(lockPath))
           return;
         const lockContent = readFileSync30(lockPath, "utf-8");
         const lockData = JSON.parse(lockContent);
@@ -60437,12 +60507,12 @@ function createPlanPersister(ctx, options) {
     if (!mission.session_ids?.includes(sessionID))
       return;
     const planPath = mission.active_plan;
-    if (!existsSync37(planPath))
+    if (!existsSync38(planPath))
       return;
     let todos = [];
     try {
       const taskDir = getTaskDir({}, directory);
-      if (existsSync37(taskDir)) {
+      if (existsSync38(taskDir)) {
         const files = readdirSync12(taskDir).filter((f) => f.startsWith("T-") && f.endsWith(".json"));
         const tasks = [];
         for (const f of files) {
@@ -61770,12 +61840,12 @@ function createRtkBashRewriterHook(_ctx, config2) {
   };
 }
 // src/hooks/rules-injector/project-root-finder.ts
-import { existsSync as existsSync38, statSync as statSync5 } from "fs";
-import { dirname as dirname11, join as join46 } from "path";
+import { existsSync as existsSync39, statSync as statSync5 } from "fs";
+import { dirname as dirname11, join as join47 } from "path";
 
 // src/hooks/rules-injector/constants.ts
-import { join as join45 } from "path";
-var RULES_INJECTOR_STORAGE = join45(OPENCODE_STORAGE, "rules-injector");
+import { join as join46 } from "path";
+var RULES_INJECTOR_STORAGE = join46(OPENCODE_STORAGE, "rules-injector");
 var PROJECT_MARKERS = [
   ".git",
   "pyproject.toml",
@@ -61806,8 +61876,8 @@ function findProjectRoot(startPath) {
   }
   while (true) {
     for (const marker of PROJECT_MARKERS) {
-      const markerPath = join46(current, marker);
-      if (existsSync38(markerPath)) {
+      const markerPath = join47(current, marker);
+      if (existsSync39(markerPath)) {
         return current;
       }
     }
@@ -61819,12 +61889,12 @@ function findProjectRoot(startPath) {
   }
 }
 // src/hooks/rules-injector/rule-file-finder.ts
-import { existsSync as existsSync40, statSync as statSync6 } from "fs";
-import { dirname as dirname12, join as join48 } from "path";
+import { existsSync as existsSync41, statSync as statSync6 } from "fs";
+import { dirname as dirname12, join as join49 } from "path";
 
 // src/hooks/rules-injector/rule-file-scanner.ts
-import { existsSync as existsSync39, readdirSync as readdirSync13, realpathSync as realpathSync2 } from "fs";
-import { join as join47 } from "path";
+import { existsSync as existsSync40, readdirSync as readdirSync13, realpathSync as realpathSync2 } from "fs";
+import { join as join48 } from "path";
 function isGitHubInstructionsDir(dir) {
   return dir.includes(".github/instructions") || dir.endsWith(".github/instructions");
 }
@@ -61835,12 +61905,12 @@ function isValidRuleFile(fileName, dir) {
   return RULE_EXTENSIONS.some((ext) => fileName.endsWith(ext));
 }
 function findRuleFilesRecursive(dir, results) {
-  if (!existsSync39(dir))
+  if (!existsSync40(dir))
     return;
   try {
     const entries = readdirSync13(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join47(dir, entry.name);
+      const fullPath = join48(dir, entry.name);
       if (entry.isDirectory()) {
         findRuleFilesRecursive(fullPath, results);
       } else if (entry.isFile()) {
@@ -61867,7 +61937,7 @@ function findRuleFiles(projectRoot, currentFile) {
   let distance = 0;
   while (true) {
     for (const [parent, subdir] of PROJECT_RULE_SUBDIRS) {
-      const ruleDir = join48(currentDir, parent, subdir);
+      const ruleDir = join49(currentDir, parent, subdir);
       const files = [];
       findRuleFilesRecursive(ruleDir, files);
       for (const filePath of files) {
@@ -61893,8 +61963,8 @@ function findRuleFiles(projectRoot, currentFile) {
   }
   if (projectRoot) {
     for (const ruleFile of PROJECT_RULE_FILES) {
-      const filePath = join48(projectRoot, ruleFile);
-      if (existsSync40(filePath)) {
+      const filePath = join49(projectRoot, ruleFile);
+      if (existsSync41(filePath)) {
         try {
           const stat = statSync6(filePath);
           if (stat.isFile()) {
@@ -61924,19 +61994,19 @@ function findRuleFiles(projectRoot, currentFile) {
 }
 // src/hooks/rules-injector/storage.ts
 import {
-  existsSync as existsSync41,
+  existsSync as existsSync42,
   mkdirSync as mkdirSync15,
   readFileSync as readFileSync31,
   unlinkSync as unlinkSync9,
   writeFileSync as writeFileSync17
 } from "fs";
-import { join as join49 } from "path";
+import { join as join50 } from "path";
 function getStoragePath3(sessionID) {
-  return join49(RULES_INJECTOR_STORAGE, `${sessionID}.json`);
+  return join50(RULES_INJECTOR_STORAGE, `${sessionID}.json`);
 }
 function loadInjectedRules(sessionID) {
   const filePath = getStoragePath3(sessionID);
-  if (!existsSync41(filePath))
+  if (!existsSync42(filePath))
     return { contentHashes: new Set, realPaths: new Set };
   try {
     const content = readFileSync31(filePath, "utf-8");
@@ -61950,7 +62020,7 @@ function loadInjectedRules(sessionID) {
   }
 }
 function saveInjectedRules(sessionID, data) {
-  if (!existsSync41(RULES_INJECTOR_STORAGE)) {
+  if (!existsSync42(RULES_INJECTOR_STORAGE)) {
     mkdirSync15(RULES_INJECTOR_STORAGE, { recursive: true });
   }
   const storageData = {
@@ -61963,7 +62033,7 @@ function saveInjectedRules(sessionID, data) {
 }
 function clearInjectedRules(sessionID) {
   const filePath = getStoragePath3(sessionID);
-  if (existsSync41(filePath)) {
+  if (existsSync42(filePath)) {
     unlinkSync9(filePath);
   }
 }
@@ -64921,8 +64991,8 @@ var FAILURE_RESET_WINDOW_MS = 5 * 60 * 1000;
 init_logger();
 
 // src/hooks/task-continuation-enforcer/idle-event.ts
-import { existsSync as existsSync43, readdirSync as readdirSync15 } from "fs";
-import { join as join52 } from "path";
+import { existsSync as existsSync44, readdirSync as readdirSync15 } from "fs";
+import { join as join53 } from "path";
 init_logger();
 
 // src/hooks/task-continuation-enforcer/abort-detection.ts
@@ -64945,12 +65015,12 @@ function isLastAssistantMessageAborted(messages) {
 init_logger();
 
 // src/hooks/task-continuation-enforcer/continuation-injection.ts
-import { existsSync as existsSync42, readdirSync as readdirSync14 } from "fs";
-import { join as join51 } from "path";
+import { existsSync as existsSync43, readdirSync as readdirSync14 } from "fs";
+import { join as join52 } from "path";
 init_logger();
 // src/hooks/task-continuation-enforcer/staleness.ts
 import { statSync as statSync8 } from "fs";
-import { join as join50 } from "path";
+import { join as join51 } from "path";
 var DEFAULT_STALE_AFTER_HOURS = 24;
 var HOUR_MS = 60 * 60 * 1000;
 function getStaleAfterMs(config2) {
@@ -64970,7 +65040,7 @@ function isTaskStale(taskPath, staleAfterMs) {
   return ageMs !== null && ageMs > staleAfterMs;
 }
 function filterFreshIncompleteTasks(tasks, taskDir, staleAfterMs) {
-  return tasks.filter((t) => !isTaskStale(join50(taskDir, `${t.id}.json`), staleAfterMs));
+  return tasks.filter((t) => !isTaskStale(join51(taskDir, `${t.id}.json`), staleAfterMs));
 }
 function formatTaskAge(ageMs) {
   const hours = Math.floor(ageMs / HOUR_MS);
@@ -65058,7 +65128,7 @@ async function injectContinuation(args) {
   let taskDir = "";
   try {
     taskDir = getTaskDir(config2, ctx.directory);
-    if (!existsSync42(taskDir)) {
+    if (!existsSync43(taskDir)) {
       const hadBgTasks = backgroundManager ? backgroundManager.getTasksByParentSession(sessionID).length > 0 : false;
       if (hadBgTasks) {
         log(`[${HOOK_NAME14}] Bootstrap injection: no task dir (hadBgTasks)`, { sessionID, taskDir });
@@ -65141,7 +65211,7 @@ async function injectContinuation(args) {
     const incompleteTasks = getIncompleteTasks(filteredTasks);
     const freshIncompleteTasks = filterFreshIncompleteTasks(incompleteTasks, taskDir, staleAfterMs);
     const taskList = incompleteTasks.map((task) => {
-      const ageMs = getTaskAgeMs(join51(taskDir, `${task.id}.json`));
+      const ageMs = getTaskAgeMs(join52(taskDir, `${task.id}.json`));
       const staleSuffix = ageMs !== null && ageMs > staleAfterMs ? ` (stale: ${formatTaskAge(ageMs)})` : "";
       return `- [${task.status}] ${task.subject} (${task.id})${staleSuffix}`;
     }).join(`
@@ -65320,7 +65390,7 @@ async function handleSessionIdle(args) {
   let taskDir = "";
   try {
     taskDir = getTaskDir(config2, ctx.directory);
-    if (!existsSync43(taskDir)) {
+    if (!existsSync44(taskDir)) {
       const hadBgTasks = backgroundManager ? backgroundManager.getTasksByParentSession(sessionID).length > 0 : false;
       if (hadBgTasks) {
         log(`[${HOOK_NAME14}] No task dir \u2014 bootstrap (hadBgTasks)`, { sessionID, taskDir });
@@ -65359,7 +65429,7 @@ async function handleSessionIdle(args) {
         const incompleteTasks = getIncompleteTasks(filteredTasks);
         incompleteCount = incompleteTasks.length;
         const staleAfterMs = getStaleAfterMs(config2);
-        const staleIncompleteCount = incompleteTasks.filter((t) => isTaskStale(join52(taskDir, `${t.id}.json`), staleAfterMs)).length;
+        const staleIncompleteCount = incompleteTasks.filter((t) => isTaskStale(join53(taskDir, `${t.id}.json`), staleAfterMs)).length;
         const activeIncompleteCount = incompleteCount - staleIncompleteCount;
         if (activeIncompleteCount === 0 && staleIncompleteCount > 0) {
           log(`[${HOOK_NAME14}] Skipped: only stale tasks remain`, {
@@ -65806,8 +65876,8 @@ var TASK_NOTEPAD_FRAGMENT = "task-notepad";
 var TODO_FETCH_ERROR_FRAGMENT = "Failed to fetch todos for task-notepad";
 // src/hooks/task-notepad/hook.ts
 init_logger();
-import { existsSync as existsSync44, mkdirSync as mkdirSync16, readdirSync as readdirSync16, readFileSync as readFileSync33, statSync as statSync9, writeFileSync as writeFileSync18 } from "fs";
-import { dirname as dirname13, join as join53 } from "path";
+import { existsSync as existsSync45, mkdirSync as mkdirSync16, readdirSync as readdirSync16, readFileSync as readFileSync33, statSync as statSync9, writeFileSync as writeFileSync18 } from "fs";
+import { dirname as dirname13, join as join54 } from "path";
 function createTaskNotepadHook(ctx) {
   return {
     "tool.execute.after": async (input, output) => {
@@ -65858,8 +65928,8 @@ async function fetchTodos(ctx, sessionID) {
   }
 }
 function resolveActivePlan(directory) {
-  const plansDir = join53(directory, PLAN_DIR_NAME, PLANS_SUBDIR);
-  if (!existsSync44(plansDir))
+  const plansDir = join54(directory, PLAN_DIR_NAME, PLANS_SUBDIR);
+  if (!existsSync45(plansDir))
     return null;
   let entries;
   try {
@@ -65871,7 +65941,7 @@ function resolveActivePlan(directory) {
   for (const entry of entries) {
     if (!entry.endsWith(PLAN_EXTENSION))
       continue;
-    const fullPath = join53(plansDir, entry);
+    const fullPath = join54(plansDir, entry);
     try {
       const stats = statSync9(fullPath);
       if (!stats.isFile())
@@ -65890,7 +65960,7 @@ function resolveActivePlan(directory) {
 }
 function ensureNotepad(directory, planName, todo) {
   const notepadPath = notepadPathFor(directory, planName, todo.id);
-  if (existsSync44(notepadPath))
+  if (existsSync45(notepadPath))
     return;
   mkdirSync16(dirname13(notepadPath), { recursive: true });
   const content = renderNotepad(todo);
@@ -65899,7 +65969,7 @@ function ensureNotepad(directory, planName, todo) {
 }
 function appendCompletion(directory, planName, todo) {
   const notepadPath = notepadPathFor(directory, planName, todo.id);
-  if (!existsSync44(notepadPath))
+  if (!existsSync45(notepadPath))
     return;
   const existing = readFileSync33(notepadPath, "utf-8");
   if (existing.includes("**Status**: completed"))
@@ -65914,7 +65984,7 @@ function appendCompletion(directory, planName, todo) {
   log(`[${HOOK_NAME16}] Appended completion to notepad`, { plan: planName, taskID: todo.id });
 }
 function notepadPathFor(directory, planName, taskID) {
-  return join53(directory, PLAN_DIR_NAME, NOTEPAD_DIR_NAME, planName, TASKS_SUBDIR, `${taskID}${NOTEPAD_EXTENSION}`);
+  return join54(directory, PLAN_DIR_NAME, NOTEPAD_DIR_NAME, planName, TASKS_SUBDIR, `${taskID}${NOTEPAD_EXTENSION}`);
 }
 function renderNotepad(todo) {
   const priority = todo.priority ?? "medium";
@@ -67589,8 +67659,8 @@ function createWebFetchRedirectGuardHook(_ctx) {
   };
 }
 // src/hooks/write-existing-file-guard/hook.ts
-import { existsSync as existsSync45 } from "fs";
-import { isAbsolute as isAbsolute4, join as join54, normalize, resolve as resolve6, sep } from "path";
+import { existsSync as existsSync46 } from "fs";
+import { isAbsolute as isAbsolute4, join as join55, normalize, resolve as resolve6, sep } from "path";
 function createWriteExistingFileGuardHook(ctx) {
   return {
     "tool.execute.before": async (input, output) => {
@@ -67604,8 +67674,8 @@ function createWriteExistingFileGuardHook(ctx) {
         return;
       }
       const resolvedPath = normalize(isAbsolute4(filePath) ? filePath : resolve6(ctx.directory, filePath));
-      if (existsSync45(resolvedPath)) {
-        const matrixxRoot = join54(ctx.directory, ".matrixx") + sep;
+      if (existsSync46(resolvedPath)) {
+        const matrixxRoot = join55(ctx.directory, ".matrixx") + sep;
         const isMatrixMarkdown = resolvedPath.startsWith(matrixxRoot) && resolvedPath.endsWith(".md");
         const normalizedPath = resolvedPath.replace(/\\/g, "/");
         const isPlansPath = normalizedPath.includes(".matrixx/plans");
@@ -68050,14 +68120,14 @@ function getLanguageId(ext) {
   return EXT_TO_LANG[ext] || "plaintext";
 }
 // src/tools/lsp/server-installation.ts
-import { existsSync as existsSync46 } from "fs";
-import { join as join55 } from "path";
+import { existsSync as existsSync47 } from "fs";
+import { join as join56 } from "path";
 function isServerInstalled(command) {
   if (command.length === 0)
     return false;
   const cmd = command[0];
   if (cmd.includes("/") || cmd.includes("\\")) {
-    if (existsSync46(cmd))
+    if (existsSync47(cmd))
       return true;
   }
   const isWindows = process.platform === "win32";
@@ -68079,23 +68149,23 @@ function isServerInstalled(command) {
   const paths = pathEnv.split(pathSeparator);
   for (const p of paths) {
     for (const suffix of exts) {
-      if (existsSync46(join55(p, cmd + suffix))) {
+      if (existsSync47(join56(p, cmd + suffix))) {
         return true;
       }
     }
   }
   const cwd = process.cwd();
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
-  const dataDir = join55(getDataDir(), "opencode");
+  const dataDir = join56(getDataDir(), "opencode");
   const additionalBases = [
-    join55(cwd, "node_modules", ".bin"),
-    join55(configDir, "bin"),
-    join55(configDir, "node_modules", ".bin"),
-    join55(dataDir, "bin")
+    join56(cwd, "node_modules", ".bin"),
+    join56(configDir, "bin"),
+    join56(configDir, "node_modules", ".bin"),
+    join56(dataDir, "bin")
   ];
   for (const base of additionalBases) {
     for (const suffix of exts) {
-      if (existsSync46(join55(base, cmd + suffix))) {
+      if (existsSync47(join56(base, cmd + suffix))) {
         return true;
       }
     }
@@ -68106,10 +68176,10 @@ function isServerInstalled(command) {
   return false;
 }
 // src/tools/lsp/server-config-loader.ts
-import { existsSync as existsSync47, readFileSync as readFileSync34 } from "fs";
-import { join as join56 } from "path";
+import { existsSync as existsSync48, readFileSync as readFileSync34 } from "fs";
+import { join as join57 } from "path";
 function loadJsonFile(path12) {
-  if (!existsSync47(path12))
+  if (!existsSync48(path12))
     return null;
   try {
     return parseJsonc(readFileSync34(path12, "utf-8"));
@@ -68121,9 +68191,9 @@ function getConfigPaths3() {
   const cwd = process.cwd();
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
   return {
-    project: detectConfigFile(join56(cwd, ".opencode", "matrixx")).path,
-    user: detectConfigFile(join56(configDir, "matrixx")).path,
-    opencode: detectConfigFile(join56(configDir, "opencode")).path
+    project: detectConfigFile(join57(cwd, ".opencode", "matrixx")).path,
+    user: detectConfigFile(join57(configDir, "matrixx")).path,
+    opencode: detectConfigFile(join57(configDir, "opencode")).path
   };
 }
 function loadAllConfigs() {
@@ -68241,14 +68311,14 @@ import { Readable, Writable } from "stream";
 // src/tools/lsp/lsp-process.ts
 init_logger();
 import { spawn as nodeSpawn } from "child_process";
-import { existsSync as existsSync48, statSync as statSync10 } from "fs";
+import { existsSync as existsSync49, statSync as statSync10 } from "fs";
 var {spawn: bunSpawn } = globalThis.Bun;
 function shouldUseNodeSpawn() {
   return process.platform === "win32";
 }
 function validateCwd(cwd) {
   try {
-    if (!existsSync48(cwd)) {
+    if (!existsSync49(cwd)) {
       return { valid: false, error: `Working directory does not exist: ${cwd}` };
     }
     const stats = statSync10(cwd);
@@ -68971,8 +69041,8 @@ class LSPServerManager {
 }
 var lspManager = LSPServerManager.getInstance();
 // src/tools/lsp/lsp-client-wrapper.ts
-import { existsSync as existsSync49, statSync as statSync11 } from "fs";
-import { dirname as dirname14, extname as extname3, join as join57, resolve as resolve8 } from "path";
+import { existsSync as existsSync50, statSync as statSync11 } from "fs";
+import { dirname as dirname14, extname as extname3, join as join58, resolve as resolve8 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 function findWorkspaceRoot(filePath) {
   let dir = resolve8(filePath);
@@ -68988,7 +69058,7 @@ function findWorkspaceRoot(filePath) {
   let prevDir = "";
   while (dir !== prevDir) {
     for (const marker of markers) {
-      if (existsSync49(join57(dir, marker))) {
+      if (existsSync50(join58(dir, marker))) {
         return dir;
       }
     }
@@ -81798,12 +81868,12 @@ var lsp_symbols = tool({
   }
 });
 // src/tools/ast-grep/cli.ts
-import { existsSync as existsSync53 } from "fs";
+import { existsSync as existsSync54 } from "fs";
 var {spawn: spawn9 } = globalThis.Bun;
 
 // src/tools/ast-grep/cli-binary-path-resolution.ts
 init_logger();
-import { existsSync as existsSync52 } from "fs";
+import { existsSync as existsSync53 } from "fs";
 
 // src/tools/ast-grep/language-support.ts
 var CLI_LANGUAGES = [
@@ -81838,15 +81908,15 @@ var DEFAULT_MAX_OUTPUT_BYTES = 1 * 1024 * 1024;
 var DEFAULT_MAX_MATCHES = 500;
 
 // src/tools/ast-grep/sg-cli-path.ts
-import { existsSync as existsSync51, statSync as statSync12 } from "fs";
+import { existsSync as existsSync52, statSync as statSync12 } from "fs";
 import { createRequire as createRequire4 } from "module";
-import { dirname as dirname15, join as join59 } from "path";
+import { dirname as dirname15, join as join60 } from "path";
 
 // src/tools/ast-grep/downloader.ts
-import { existsSync as existsSync50 } from "fs";
+import { existsSync as existsSync51 } from "fs";
 import { createRequire as createRequire3 } from "module";
-import { homedir as homedir8 } from "os";
-import { join as join58 } from "path";
+import { homedir as homedir9 } from "os";
+import { join as join59 } from "path";
 init_logger();
 var REPO2 = "ast-grep/ast-grep";
 var DEFAULT_VERSION = "0.40.0";
@@ -81871,12 +81941,12 @@ var PLATFORM_MAP2 = {
 function getCacheDir3() {
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join58(homedir8(), "AppData", "Local");
-    return join58(base2, "matrixx", "bin");
+    const base2 = localAppData || join59(homedir9(), "AppData", "Local");
+    return join59(base2, "matrixx", "bin");
   }
   const xdgCache = process.env.XDG_CACHE_HOME;
-  const base = xdgCache || join58(homedir8(), ".cache");
-  return join58(base, "matrixx", "bin");
+  const base = xdgCache || join59(homedir9(), ".cache");
+  return join59(base, "matrixx", "bin");
 }
 function getBinaryName3() {
   return process.platform === "win32" ? "sg.exe" : "sg";
@@ -81893,8 +81963,8 @@ async function downloadAstGrep(version3 = DEFAULT_VERSION) {
   }
   const cacheDir = getCacheDir3();
   const binaryName = getBinaryName3();
-  const binaryPath = join58(cacheDir, binaryName);
-  if (existsSync50(binaryPath)) {
+  const binaryPath = join59(cacheDir, binaryName);
+  if (existsSync51(binaryPath)) {
     return binaryPath;
   }
   const { arch, os: os7 } = platformInfo;
@@ -81902,7 +81972,7 @@ async function downloadAstGrep(version3 = DEFAULT_VERSION) {
   const downloadUrl = `https://github.com/${REPO2}/releases/download/${version3}/${assetName}`;
   log(`[matrixx] Downloading ast-grep binary...`);
   try {
-    const archivePath = join58(cacheDir, assetName);
+    const archivePath = join59(cacheDir, assetName);
     ensureCacheDir(cacheDir);
     await downloadArchive(downloadUrl, archivePath);
     await extractZipArchive(archivePath, cacheDir);
@@ -81956,8 +82026,8 @@ function findSgCliPathSync() {
     const require2 = createRequire4(import.meta.url);
     const cliPackageJsonPath = require2.resolve("@ast-grep/cli/package.json");
     const cliDirectory = dirname15(cliPackageJsonPath);
-    const sgPath = join59(cliDirectory, binaryName);
-    if (existsSync51(sgPath) && isValidBinary(sgPath)) {
+    const sgPath = join60(cliDirectory, binaryName);
+    if (existsSync52(sgPath) && isValidBinary(sgPath)) {
       return sgPath;
     }
   } catch {}
@@ -81968,8 +82038,8 @@ function findSgCliPathSync() {
       const packageJsonPath = require2.resolve(`${platformPackage}/package.json`);
       const packageDirectory = dirname15(packageJsonPath);
       const astGrepBinaryName = process.platform === "win32" ? "ast-grep.exe" : "ast-grep";
-      const binaryPath = join59(packageDirectory, astGrepBinaryName);
-      if (existsSync51(binaryPath) && isValidBinary(binaryPath)) {
+      const binaryPath = join60(packageDirectory, astGrepBinaryName);
+      if (existsSync52(binaryPath) && isValidBinary(binaryPath)) {
         return binaryPath;
       }
     } catch {}
@@ -81977,7 +82047,7 @@ function findSgCliPathSync() {
   if (process.platform === "darwin") {
     const homebrewPaths = ["/opt/homebrew/bin/sg", "/usr/local/bin/sg"];
     for (const path12 of homebrewPaths) {
-      if (existsSync51(path12) && isValidBinary(path12)) {
+      if (existsSync52(path12) && isValidBinary(path12)) {
         return path12;
       }
     }
@@ -82003,7 +82073,7 @@ function setSgCliPath(path12) {
 var resolvedCliPath3 = null;
 var initPromise3 = null;
 async function getAstGrepPath() {
-  if (resolvedCliPath3 !== null && existsSync52(resolvedCliPath3)) {
+  if (resolvedCliPath3 !== null && existsSync53(resolvedCliPath3)) {
     return resolvedCliPath3;
   }
   if (initPromise3) {
@@ -82011,7 +82081,7 @@ async function getAstGrepPath() {
   }
   initPromise3 = (async () => {
     const syncPath = findSgCliPathSync();
-    if (syncPath && existsSync52(syncPath)) {
+    if (syncPath && existsSync53(syncPath)) {
       resolvedCliPath3 = syncPath;
       setSgCliPath(syncPath);
       return syncPath;
@@ -82110,7 +82180,7 @@ async function runSg(options) {
   const paths = options.paths && options.paths.length > 0 ? options.paths : ["."];
   args.push(...paths);
   let cliPath = getSgCliPath();
-  if (!cliPath || !existsSync53(cliPath)) {
+  if (!cliPath || !existsSync54(cliPath)) {
     const downloadedPath = await getAstGrepPath();
     if (downloadedPath) {
       cliPath = downloadedPath;
@@ -84398,18 +84468,18 @@ var {spawn: spawn10 } = globalThis.Bun;
 
 // src/tools/grep/constants.ts
 import { spawnSync as spawnSync2 } from "child_process";
-import { existsSync as existsSync58 } from "fs";
-import { dirname as dirname16, join as join61 } from "path";
+import { existsSync as existsSync59 } from "fs";
+import { dirname as dirname16, join as join62 } from "path";
 
 // src/tools/grep/downloader.ts
-import { existsSync as existsSync57, readdirSync as readdirSync18 } from "fs";
-import { join as join60 } from "path";
+import { existsSync as existsSync58, readdirSync as readdirSync18 } from "fs";
+import { join as join61 } from "path";
 function findFileRecursive(dir, filename) {
   try {
     const entries = readdirSync18(dir, { withFileTypes: true, recursive: true });
     for (const entry of entries) {
       if (entry.isFile() && entry.name === filename) {
-        return join60(entry.parentPath ?? dir, entry.name);
+        return join61(entry.parentPath ?? dir, entry.name);
       }
     }
   } catch {
@@ -84430,11 +84500,11 @@ function getPlatformKey() {
 }
 function getInstallDir() {
   const homeDir = process.env.HOME || process.env.USERPROFILE || ".";
-  return join60(homeDir, ".cache", "matrixx", "bin");
+  return join61(homeDir, ".cache", "matrixx", "bin");
 }
 function getRgPath() {
   const isWindows = process.platform === "win32";
-  return join60(getInstallDir(), isWindows ? "rg.exe" : "rg");
+  return join61(getInstallDir(), isWindows ? "rg.exe" : "rg");
 }
 async function extractTarGz2(archivePath, destDir) {
   const platformKey = getPlatformKey();
@@ -84451,7 +84521,7 @@ async function extractZip2(archivePath, destDir) {
   const binaryName = process.platform === "win32" ? "rg.exe" : "rg";
   const foundPath = findFileRecursive(destDir, binaryName);
   if (foundPath) {
-    const destPath = join60(destDir, binaryName);
+    const destPath = join61(destDir, binaryName);
     if (foundPath !== destPath) {
       const { renameSync: renameSync4 } = await import("fs");
       renameSync4(foundPath, destPath);
@@ -84466,13 +84536,13 @@ async function downloadAndInstallRipgrep() {
   }
   const installDir = getInstallDir();
   const rgPath = getRgPath();
-  if (existsSync57(rgPath)) {
+  if (existsSync58(rgPath)) {
     return rgPath;
   }
   ensureCacheDir(installDir);
   const filename = `ripgrep-${RG_VERSION}-${config4.platform}.${config4.extension}`;
   const url3 = `https://github.com/BurntSushi/ripgrep/releases/download/${RG_VERSION}/${filename}`;
-  const archivePath = join60(installDir, filename);
+  const archivePath = join61(installDir, filename);
   try {
     await downloadArchive(url3, archivePath);
     if (config4.extension === "tar.gz") {
@@ -84481,7 +84551,7 @@ async function downloadAndInstallRipgrep() {
       await extractZip2(archivePath, installDir);
     }
     ensureExecutable(rgPath);
-    if (!existsSync57(rgPath)) {
+    if (!existsSync58(rgPath)) {
       throw new Error("ripgrep binary not found after extraction");
     }
     return rgPath;
@@ -84493,7 +84563,7 @@ async function downloadAndInstallRipgrep() {
 }
 function getInstalledRipgrepPath() {
   const rgPath = getRgPath();
-  return existsSync57(rgPath) ? rgPath : null;
+  return existsSync58(rgPath) ? rgPath : null;
 }
 
 // src/tools/grep/constants.ts
@@ -84517,14 +84587,14 @@ function getOpenCodeBundledRg() {
   const isWindows = process.platform === "win32";
   const rgName = isWindows ? "rg.exe" : "rg";
   const candidates = [
-    join61(getDataDir(), "opencode", "bin", rgName),
-    join61(execDir, rgName),
-    join61(execDir, "bin", rgName),
-    join61(execDir, "..", "bin", rgName),
-    join61(execDir, "..", "libexec", rgName)
+    join62(getDataDir(), "opencode", "bin", rgName),
+    join62(execDir, rgName),
+    join62(execDir, "bin", rgName),
+    join62(execDir, "..", "bin", rgName),
+    join62(execDir, "..", "libexec", rgName)
   ];
   for (const candidate of candidates) {
-    if (existsSync58(candidate)) {
+    if (existsSync59(candidate)) {
       return candidate;
     }
   }
@@ -85028,17 +85098,17 @@ var HandoffSchema = exports_external.object({
   sections: HandoffSectionSchema
 });
 // src/features/handoff/storage.ts
-import { existsSync as existsSync59, mkdirSync as mkdirSync17, readFileSync as readFileSync39, renameSync as renameSync4, writeFileSync as writeFileSync22 } from "fs";
-import { join as join62 } from "path";
+import { existsSync as existsSync60, mkdirSync as mkdirSync17, readFileSync as readFileSync39, renameSync as renameSync4, writeFileSync as writeFileSync22 } from "fs";
+import { join as join63 } from "path";
 function getHandoffFilePath(directory) {
-  return join62(directory, HANDOFF_FILE_PATH);
+  return join63(directory, HANDOFF_FILE_PATH);
 }
 function getHandoffConsumedFilePath(directory) {
-  return join62(directory, HANDOFF_CONSUMED_FILE_PATH);
+  return join63(directory, HANDOFF_CONSUMED_FILE_PATH);
 }
 function handoffFileExists(directory) {
   try {
-    return existsSync59(getHandoffFilePath(directory));
+    return existsSync60(getHandoffFilePath(directory));
   } catch {
     return false;
   }
@@ -85046,7 +85116,7 @@ function handoffFileExists(directory) {
 function readHandoffFile(directory) {
   const filePath = getHandoffFilePath(directory);
   try {
-    if (!existsSync59(filePath))
+    if (!existsSync60(filePath))
       return null;
     return readFileSync39(filePath, "utf-8");
   } catch {
@@ -85072,7 +85142,7 @@ function writeHandoffFile(directory, content) {
 }
 function ensureHandoffDir(directory) {
   try {
-    mkdirSync17(join62(directory, ".matrixx"), { recursive: true });
+    mkdirSync17(join63(directory, ".matrixx"), { recursive: true });
     return true;
   } catch {
     return false;
@@ -85227,15 +85297,15 @@ ${body}
 }
 
 // src/tools/handoff/list-handler.ts
-import { existsSync as existsSync60, readdirSync as readdirSync19, statSync as statSync14 } from "fs";
-import { join as join63 } from "path";
+import { existsSync as existsSync61, readdirSync as readdirSync19, statSync as statSync14 } from "fs";
+import { join as join64 } from "path";
 var MATRIX_DIR = ".matrixx";
 function isHandoffFile(name) {
   return name === "handoff.md" || name.startsWith("handoff.consumed");
 }
 function handleList(directory) {
-  const matrixxDir = join63(directory, MATRIX_DIR);
-  if (!existsSync60(matrixxDir)) {
+  const matrixxDir = join64(directory, MATRIX_DIR);
+  if (!existsSync61(matrixxDir)) {
     return "No handoffs found in .matrixx/";
   }
   let entries;
@@ -85252,7 +85322,7 @@ function handleList(directory) {
   lines.push(`Handoff files in ${matrixxDir}:`);
   lines.push("");
   for (const name of handoffs) {
-    const fullPath = join63(matrixxDir, name);
+    const fullPath = join64(matrixxDir, name);
     let size = "?";
     let mtime = "?";
     try {
@@ -85476,9 +85546,9 @@ The Bash tool can execute these commands directly. Do NOT retry with interactive
   }
 });
 // src/tools/pdf-extract-figures/tools.ts
-import { existsSync as existsSync61, mkdtempSync, writeFileSync as writeFileSync23 } from "fs";
+import { existsSync as existsSync62, mkdtempSync, writeFileSync as writeFileSync23 } from "fs";
 import { tmpdir as tmpdir5 } from "os";
-import { join as join64 } from "path";
+import { join as join65 } from "path";
 var PYTHON_SCRIPT = `#!/usr/bin/env python3
 import sys
 import json
@@ -85580,7 +85650,7 @@ function validateArgs(args) {
   if (!args.file_path) {
     return "Error: 'file_path' is required.";
   }
-  if (!existsSync61(args.file_path)) {
+  if (!existsSync62(args.file_path)) {
     return `Error: File not found: ${args.file_path}`;
   }
   if (!args.file_path.toLowerCase().endsWith(".pdf")) {
@@ -85629,11 +85699,11 @@ async function runExtraction(args) {
   }
   let tmpDir;
   try {
-    tmpDir = mkdtempSync(join64(tmpdir5(), "matrixx-pdf-extract-"));
+    tmpDir = mkdtempSync(join65(tmpdir5(), "matrixx-pdf-extract-"));
   } catch {
     return "Error: Could not create temporary directory.";
   }
-  const scriptPath = join64(tmpDir, "extract_pdf_figures.py");
+  const scriptPath = join65(tmpDir, "extract_pdf_figures.py");
   writeFileSync23(scriptPath, PYTHON_SCRIPT);
   const payload = buildArgsPayload(args);
   log("[pdf_extract_figures] Running extraction", { file_path: args.file_path, payload });
@@ -85681,11 +85751,11 @@ function createPdfExtractFiguresTool() {
   return { pdf_extract_figures };
 }
 // src/tools/plan/plan-create.ts
-import { existsSync as existsSync62 } from "fs";
+import { existsSync as existsSync63 } from "fs";
 import { basename as basename7 } from "path";
 
 // src/tools/plan/types.ts
-import { basename as basename6, isAbsolute as isAbsolute5, join as join65, relative as relative4, resolve as resolve9 } from "path";
+import { basename as basename6, isAbsolute as isAbsolute5, join as join66, relative as relative4, resolve as resolve9 } from "path";
 
 // src/tools/plan/constants.ts
 var PLANS_DIR3 = ".matrixx/plans";
@@ -85711,8 +85781,8 @@ function validatePlanFilePath(filePath, directory) {
   if (!PLAN_FILENAME_KEBAB_REGEX.test(base)) {
     return { error: `fileName must match kebab-case ^[a-z0-9-]+\\.md$: ${base}` };
   }
-  const resolved = isAbsolute5(filePath) ? resolve9(filePath) : resolve9(join65(directory, filePath));
-  const plansDir = resolve9(join65(directory, PLANS_DIR3));
+  const resolved = isAbsolute5(filePath) ? resolve9(filePath) : resolve9(join66(directory, filePath));
+  const plansDir = resolve9(join66(directory, PLANS_DIR3));
   const relToPlans = relative4(plansDir, resolved);
   if (relToPlans.startsWith("..") || isAbsolute5(relToPlans)) {
     return { error: `filePath must be inside ${PLANS_DIR3}: ${filePath}` };
@@ -85755,7 +85825,7 @@ Uses atomicWrite (.tmp.pid+rename) + upsertMetadataComment. Warns if file alread
         }
         const resolved = validation.resolved;
         ensurePlanDir(directory);
-        if (existsSync62(resolved)) {
+        if (existsSync63(resolved)) {
           return JSON.stringify({
             error: "file_exists",
             message: `Plan file already exists: ${resolved}. Use plan_read + plan_update to modify.`,
@@ -85786,7 +85856,7 @@ Uses atomicWrite (.tmp.pid+rename) + upsertMetadataComment. Warns if file alread
   });
 }
 // src/tools/plan/plan-delete.ts
-import { existsSync as existsSync63, unlinkSync as unlinkSync10 } from "fs";
+import { existsSync as existsSync64, unlinkSync as unlinkSync10 } from "fs";
 function createPlanDeleteTool(ctx) {
   return tool({
     description: `Delete a plan file under .matrixx/plans/*.md. Scoped unlink inside PLANS_DIR, refuses outside paths.`,
@@ -85802,7 +85872,7 @@ function createPlanDeleteTool(ctx) {
           return JSON.stringify({ error: "invalid_file_path", message: validation.error });
         }
         const resolved = validation.resolved;
-        if (!existsSync63(resolved)) {
+        if (!existsSync64(resolved)) {
           return JSON.stringify({ error: "file_not_found", message: `File not found: ${resolved}` });
         }
         unlinkSync10(resolved);
@@ -85815,8 +85885,8 @@ function createPlanDeleteTool(ctx) {
   });
 }
 // src/tools/plan/plan-list.ts
-import { existsSync as existsSync64, readdirSync as readdirSync20, statSync as statSync15 } from "fs";
-import { join as join66 } from "path";
+import { existsSync as existsSync65, readdirSync as readdirSync20, statSync as statSync15 } from "fs";
+import { join as join67 } from "path";
 function createPlanListTool(ctx) {
   return tool({
     description: `List plan files under .matrixx/plans/*.md. Filters *.md with kebab-case, sorts by mtime.`,
@@ -85824,13 +85894,13 @@ function createPlanListTool(ctx) {
     execute: async (_args, context) => {
       try {
         const directory = resolveDirectory(context?.directory, ctx?.directory);
-        const plansDir = join66(directory, PLANS_DIR3);
-        if (!existsSync64(plansDir)) {
+        const plansDir = join67(directory, PLANS_DIR3);
+        if (!existsSync65(plansDir)) {
           return JSON.stringify({ plans: [] });
         }
         const entries = readdirSync20(plansDir).filter((f) => f.endsWith(".md") && PLAN_FILENAME_KEBAB_REGEX.test(f));
         const plans = entries.map((fileName) => {
-          const filePath = join66(plansDir, fileName);
+          const filePath = join67(plansDir, fileName);
           try {
             const stat2 = statSync15(filePath);
             return {
@@ -85853,7 +85923,7 @@ function createPlanListTool(ctx) {
   });
 }
 // src/tools/plan/plan-read.ts
-import { existsSync as existsSync65, statSync as statSync16 } from "fs";
+import { existsSync as existsSync66, statSync as statSync16 } from "fs";
 function createPlanReadTool(ctx) {
   return tool({
     description: `Read a plan file from .matrixx/plans/*.md with hashline-tagged output (1#AB|content) + lsp-style. Enforces scoping and ${MAX_PLAN_FILE_BYTES2} byte cap.`,
@@ -85869,7 +85939,7 @@ function createPlanReadTool(ctx) {
           return JSON.stringify({ error: "invalid_file_path", message: validation.error });
         }
         const resolved = validation.resolved;
-        if (!existsSync65(resolved)) {
+        if (!existsSync66(resolved)) {
           return JSON.stringify({ error: "file_not_found", message: `File not found: ${resolved}` });
         }
         try {
@@ -85901,7 +85971,7 @@ function createPlanReadTool(ctx) {
   });
 }
 // src/tools/plan/plan-update.ts
-import { existsSync as existsSync66 } from "fs";
+import { existsSync as existsSync67 } from "fs";
 
 // src/features/tool-metadata-store/store.ts
 var pendingStore = new Map;
@@ -86964,7 +87034,7 @@ function createPlanUpdateTool(ctx) {
           return JSON.stringify({ error: "invalid_file_path", message: validation.error });
         }
         const resolved = validation.resolved;
-        if (!existsSync66(resolved)) {
+        if (!existsSync67(resolved)) {
           return JSON.stringify({ error: "file_not_found", message: `File not found: ${resolved}` });
         }
         const result = await executeHashlineEditTool({ filePath: resolved, edits }, context, ctx);
@@ -86977,9 +87047,9 @@ function createPlanUpdateTool(ctx) {
   });
 }
 // src/tools/preset/tools.ts
-import { existsSync as existsSync67, mkdirSync as mkdirSync18, readFileSync as readFileSync40, writeFileSync as writeFileSync24 } from "fs";
-import { homedir as homedir9 } from "os";
-import { dirname as dirname17, join as join67 } from "path";
+import { existsSync as existsSync68, mkdirSync as mkdirSync18, readFileSync as readFileSync40, writeFileSync as writeFileSync24 } from "fs";
+import { homedir as homedir10 } from "os";
+import { dirname as dirname17, join as join68 } from "path";
 
 // src/features/preset-state/manager.ts
 init_logger();
@@ -86998,14 +87068,14 @@ var ACTIONS = ["list", "show", "set"];
 var SCOPES = ["global", "project"];
 function resolveConfigPath(scope, directory) {
   if (scope === "global") {
-    return join67(homedir9(), ".config", "opencode", "matrixx.jsonc");
+    return join68(homedir10(), ".config", "opencode", "matrixx.jsonc");
   }
-  return join67(directory ?? process.cwd(), ".opencode", "matrixx.jsonc");
+  return join68(directory ?? process.cwd(), ".opencode", "matrixx.jsonc");
 }
 function persistActivePreset(presetName, scope, directory) {
   const configPath = resolveConfigPath(scope, directory);
   let raw = {};
-  if (existsSync67(configPath)) {
+  if (existsSync68(configPath)) {
     const content = readFileSync40(configPath, "utf-8");
     const parsed = parseJsoncSafe(content);
     if (parsed.errors.length > 0) {
@@ -87119,9 +87189,9 @@ function createPresetTool(options) {
   return { preset };
 }
 // src/tools/session-manager/constants.ts
-import { join as join68 } from "path";
-var TODO_DIR = join68(getOpenCodeConfigDir({ binary: "opencode" }), "todos");
-var TRANSCRIPT_DIR2 = join68(getOpenCodeConfigDir({ binary: "opencode" }), "transcripts");
+import { join as join69 } from "path";
+var TODO_DIR = join69(getOpenCodeConfigDir({ binary: "opencode" }), "todos");
+var TRANSCRIPT_DIR2 = join69(getOpenCodeConfigDir({ binary: "opencode" }), "transcripts");
 var SESSION_LIST_DESCRIPTION = `List all OpenCode sessions with optional filtering.
 
 Returns a list of available session IDs with metadata including message count, date range, and agents used.
@@ -87193,9 +87263,9 @@ Agents Used: build, oracle, librarian
 Has Todos: Yes (12 items, 8 completed)
 Has Transcript: Yes (234 entries)`;
 // src/tools/session-manager/storage.ts
-import { existsSync as existsSync68 } from "fs";
+import { existsSync as existsSync69 } from "fs";
 import { readdir, readFile as readFile3 } from "fs/promises";
-import { join as join69 } from "path";
+import { join as join70 } from "path";
 var sdkClient = null;
 function setStorageClient(client2) {
   sdkClient = client2;
@@ -87214,7 +87284,7 @@ async function getMainSessions(options) {
       return [];
     }
   }
-  if (!existsSync68(SESSION_STORAGE))
+  if (!existsSync69(SESSION_STORAGE))
     return [];
   const sessions = [];
   try {
@@ -87222,13 +87292,13 @@ async function getMainSessions(options) {
     for (const projectDir of projectDirs) {
       if (!projectDir.isDirectory())
         continue;
-      const projectPath = join69(SESSION_STORAGE, projectDir.name);
+      const projectPath = join70(SESSION_STORAGE, projectDir.name);
       const sessionFiles = await readdir(projectPath);
       for (const file3 of sessionFiles) {
         if (!file3.endsWith(".json"))
           continue;
         try {
-          const content = await readFile3(join69(projectPath, file3), "utf-8");
+          const content = await readFile3(join70(projectPath, file3), "utf-8");
           const meta3 = JSON.parse(content);
           if (meta3.parentID)
             continue;
@@ -87253,7 +87323,7 @@ async function getAllSessions() {
       return [];
     }
   }
-  if (!existsSync68(MESSAGE_STORAGE))
+  if (!existsSync69(MESSAGE_STORAGE))
     return [];
   const sessions = [];
   async function scanDirectory(dir) {
@@ -87261,7 +87331,7 @@ async function getAllSessions() {
       const entries = await readdir(dir, { withFileTypes: true });
       for (const entry of entries) {
         if (entry.isDirectory()) {
-          const sessionPath = join69(dir, entry.name);
+          const sessionPath = join70(dir, entry.name);
           const files = await readdir(sessionPath);
           if (files.some((f) => f.endsWith(".json"))) {
             sessions.push(entry.name);
@@ -87322,7 +87392,7 @@ async function readSessionMessages(sessionID) {
     }
   }
   const messageDir = getMessageDir(sessionID);
-  if (!messageDir || !existsSync68(messageDir))
+  if (!messageDir || !existsSync69(messageDir))
     return [];
   const messages2 = [];
   try {
@@ -87331,7 +87401,7 @@ async function readSessionMessages(sessionID) {
       if (!file3.endsWith(".json"))
         continue;
       try {
-        const content = await readFile3(join69(messageDir, file3), "utf-8");
+        const content = await readFile3(join70(messageDir, file3), "utf-8");
         const meta3 = JSON.parse(content);
         const parts = await readParts2(meta3.id);
         messages2.push({
@@ -87355,8 +87425,8 @@ async function readSessionMessages(sessionID) {
   });
 }
 async function readParts2(messageID) {
-  const partDir = join69(PART_STORAGE, messageID);
-  if (!existsSync68(partDir))
+  const partDir = join70(PART_STORAGE, messageID);
+  if (!existsSync69(partDir))
     return [];
   const parts = [];
   try {
@@ -87365,7 +87435,7 @@ async function readParts2(messageID) {
       if (!file3.endsWith(".json"))
         continue;
       try {
-        const content = await readFile3(join69(partDir, file3), "utf-8");
+        const content = await readFile3(join70(partDir, file3), "utf-8");
         parts.push(JSON.parse(content));
       } catch {}
     }
@@ -87389,14 +87459,14 @@ async function readSessionTodos(sessionID) {
       return [];
     }
   }
-  if (!existsSync68(TODO_DIR))
+  if (!existsSync69(TODO_DIR))
     return [];
   try {
     const allFiles = await readdir(TODO_DIR);
     const todoFiles = allFiles.filter((f) => f.includes(sessionID) && f.endsWith(".json"));
     for (const file3 of todoFiles) {
       try {
-        const content = await readFile3(join69(TODO_DIR, file3), "utf-8");
+        const content = await readFile3(join70(TODO_DIR, file3), "utf-8");
         const data = JSON.parse(content);
         if (Array.isArray(data)) {
           return data.map((item) => ({
@@ -87414,10 +87484,10 @@ async function readSessionTodos(sessionID) {
   return [];
 }
 async function readSessionTranscript(sessionID) {
-  if (!existsSync68(TRANSCRIPT_DIR2))
+  if (!existsSync69(TRANSCRIPT_DIR2))
     return 0;
-  const transcriptFile = join69(TRANSCRIPT_DIR2, `${sessionID}.jsonl`);
-  if (!existsSync68(transcriptFile))
+  const transcriptFile = join70(TRANSCRIPT_DIR2, `${sessionID}.jsonl`);
+  if (!existsSync69(transcriptFile))
     return 0;
   try {
     const content = await readFile3(transcriptFile, "utf-8");
@@ -87927,17 +87997,17 @@ function createSkillTool(options = {}) {
 }
 var skill = createSkillTool();
 // src/tools/slashcommand/command-discovery.ts
-import { existsSync as existsSync69, readdirSync as readdirSync21, readFileSync as readFileSync41 } from "fs";
-import { basename as basename8, join as join70 } from "path";
+import { existsSync as existsSync70, readdirSync as readdirSync21, readFileSync as readFileSync41 } from "fs";
+import { basename as basename8, join as join71 } from "path";
 function discoverCommandsFromDir2(commandsDir, scope) {
-  if (!existsSync69(commandsDir))
+  if (!existsSync70(commandsDir))
     return [];
   const entries = readdirSync21(commandsDir, { withFileTypes: true });
   const commands2 = [];
   for (const entry of entries) {
     if (!isMarkdownFile(entry))
       continue;
-    const commandPath = join70(commandsDir, entry.name);
+    const commandPath = join71(commandsDir, entry.name);
     const commandName = basename8(entry.name, ".md");
     try {
       const content = readFileSync41(commandPath, "utf-8");
@@ -87964,8 +88034,8 @@ function discoverCommandsFromDir2(commandsDir, scope) {
 }
 function discoverCommandsSync(directory) {
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
-  const opencodeGlobalDir = join70(configDir, "command");
-  const opencodeProjectDir = join70(directory ?? process.cwd(), ".opencode", "command");
+  const opencodeGlobalDir = join71(configDir, "command");
+  const opencodeProjectDir = join71(directory ?? process.cwd(), ".opencode", "command");
   const opencodeGlobalCommands = discoverCommandsFromDir2(opencodeGlobalDir, "opencode");
   const opencodeProjectCommands = discoverCommandsFromDir2(opencodeProjectDir, "opencode-project");
   const builtinCommandsMap = loadBuiltinCommands();
@@ -88199,6 +88269,14 @@ var slashcommand = createSlashcommandTool();
 // src/tools/background-task/constants.ts
 var BACKGROUND_OUTPUT_DESCRIPTION = `Get output from background task. Use full_session=true to fetch session messages with filters. System notifies on completion, so block=true rarely needed.`;
 var BACKGROUND_CANCEL_DESCRIPTION = `Cancel running background task(s). Use all=true to cancel ALL before final answer.`;
+var BACKGROUND_REVIVE_DESCRIPTION = `Revive a retained terminal background task with a NEW instruction.
+
+Call with no arguments (or list=true) to DISCOVER revivable tasks.
+
+Revivable: cancelled, stopped, interrupt, error, completed \u2014 provided the task still has a session ID.
+Not revivable: pending/running (still active \u2014 use background_output), statusUncertain (unknown liveness \u2014 pass force=true to acknowledge), and tasks that never produced a session (e.g. queue-saturated).
+
+Handles are retained for 30 minutes, so revive works after a task was pruned or the plugin restarted.`;
 // src/tools/background-task/create-background-cancel.ts
 function createBackgroundCancel(manager, _client) {
   return tool({
@@ -88367,6 +88445,14 @@ ${truncated}
     statusNote = `
 
 > **Interrupted**: The task was interrupted by a prompt error. The session may contain partial results.`;
+  } else if (task.status === "stopped") {
+    statusNote = `
+
+> **Stopped**: the session ended without a terminal result \u2014 partial output may exist.`;
+  } else if (task.status === "statusUncertain") {
+    statusNote = `
+
+> **Uncertain**: liveness could not be determined after restart; re-check with background_output.`;
   }
   const durationLabel = task.status === "pending" ? "Queued for" : "Duration";
   return `# Task Status
@@ -88525,6 +88611,18 @@ function getTimeString(value) {
   return typeof value === "string" ? value : "";
 }
 async function formatTaskResult(task, client2) {
+  if (task.compactedResult) {
+    const duration6 = formatDuration(task.startedAt ?? new Date, task.completedAt);
+    return `Task Result
+
+Task ID: ${task.id}
+Description: ${task.description}
+Duration: ${duration6}
+Session ID: ${task.sessionID}
+
+---
+${task.compactedResult}`;
+  }
   if (!task.sessionID) {
     return `Error: Task has no sessionID`;
   }
@@ -88729,7 +88827,7 @@ function createBackgroundOutput(manager, client2) {
         if (resolvedTask.status === "completed") {
           return await formatTaskResult(resolvedTask, client2);
         }
-        if (resolvedTask.status === "error" || resolvedTask.status === "cancelled" || resolvedTask.status === "interrupt") {
+        if (resolvedTask.status === "error" || resolvedTask.status === "cancelled" || resolvedTask.status === "interrupt" || resolvedTask.status === "stopped" || resolvedTask.status === "statusUncertain") {
           return formatTaskStatus(resolvedTask);
         }
         const statusOutput = formatTaskStatus(resolvedTask);
@@ -88740,6 +88838,262 @@ function createBackgroundOutput(manager, client2) {
     }
   });
 }
+// src/tools/background-task/create-background-revive.ts
+import { existsSync as existsSync72 } from "fs";
+
+// src/features/background-agent/handle-index.ts
+import { existsSync as existsSync71, mkdirSync as mkdirSync19, readdirSync as readdirSync22, readFileSync as readFileSync42, renameSync as renameSync5, unlinkSync as unlinkSync11, writeFileSync as writeFileSync25 } from "fs";
+import { dirname as dirname19, join as join72 } from "path";
+
+// src/features/background-agent/constants.ts
+var TASK_TTL_MS = 30 * 60 * 1000;
+var MIN_STABILITY_TIME_MS = 10 * 1000;
+var DEFAULT_STALE_TIMEOUT_MS = 180000;
+var DEFAULT_MESSAGE_STALENESS_TIMEOUT_MS = 600000;
+var DEFAULT_MAX_TOOL_CALLS = 4000;
+var DEFAULT_CIRCUIT_BREAKER_CONSECUTIVE_THRESHOLD = 20;
+var DEFAULT_CIRCUIT_BREAKER_ENABLED = true;
+var MIN_RUNTIME_BEFORE_STALE_MS = 30000;
+var MIN_IDLE_TIME_MS = 5000;
+var POLLING_INTERVAL_MS = 3000;
+var PRUNE_THROTTLE_MS = 30000;
+var TASK_CLEANUP_DELAY_MS = 10 * 60 * 1000;
+var DEFAULT_ADMISSION_TIMEOUT_MS = 0;
+var DEFAULT_WALL_CLOCK_TIMEOUT_MS = 0;
+var DEFAULT_WALL_CLOCK_ABORT_GRACE_MS = 5000;
+var DEFAULT_NESTED_ADMISSION_ENABLED = true;
+var DEFAULT_NESTED_ADMISSION_MODE = "bypass";
+var DEFAULT_NESTED_MAX_DEPTH = 2;
+var DEFAULT_WAKE_INTERVAL_MS = 300000;
+var MIN_WAKE_INTERVAL_MS = 60000;
+var RECONCILE_CONFIRMATION_GRACE_MS = 5000;
+
+// src/features/background-agent/handle-index.ts
+var BG_HANDLE_DIR_NAME = "bg-handles";
+var BG_HANDLE_FILE_PREFIX = "bg_";
+var BgHandleSchema = exports_external.object({
+  taskId: exports_external.string(),
+  parentSessionID: exports_external.string(),
+  parentMessageID: exports_external.string(),
+  description: exports_external.string(),
+  agent: exports_external.string(),
+  status: exports_external.enum(["pending", "running", "completed", "error", "cancelled", "interrupt", "stopped", "statusUncertain"]),
+  sessionID: exports_external.string().optional(),
+  terminalReason: exports_external.enum(["queue-saturated", "no-output", "uncertain", "aborted", "stale", "nested-depth-exceeded", "wall-clock-timeout"]).optional(),
+  model: exports_external.object({
+    providerID: exports_external.string(),
+    modelID: exports_external.string(),
+    variant: exports_external.string().optional(),
+    temperature: exports_external.number().optional()
+  }).optional(),
+  category: exports_external.string().optional(),
+  concurrencyGroup: exports_external.string().optional(),
+  queuedAt: exports_external.number().optional(),
+  startedAt: exports_external.number().optional(),
+  completedAt: exports_external.number().optional()
+}).strict();
+function getBgHandleDir(directory) {
+  return join72(directory, ".matrixx", BG_HANDLE_DIR_NAME);
+}
+function getHandlePath(directory, taskId) {
+  return join72(getBgHandleDir(directory), `${taskId}.json`);
+}
+function ensureDir3(dirPath) {
+  if (!existsSync71(dirPath)) {
+    mkdirSync19(dirPath, { recursive: true });
+  }
+}
+function toHandle(task) {
+  return {
+    taskId: task.id,
+    parentSessionID: task.parentSessionID,
+    parentMessageID: task.parentMessageID,
+    description: task.description,
+    agent: task.agent,
+    status: task.status,
+    sessionID: task.sessionID,
+    terminalReason: task.terminalReason,
+    model: task.model,
+    category: task.category,
+    concurrencyGroup: task.concurrencyGroup,
+    queuedAt: task.queuedAt?.getTime(),
+    startedAt: task.startedAt?.getTime(),
+    completedAt: task.completedAt?.getTime()
+  };
+}
+function writeHandle(directory, task) {
+  const filePath = getHandlePath(directory, task.id);
+  ensureDir3(dirname19(filePath));
+  const tempPath = `${filePath}.tmp.${process.pid}.${Date.now()}`;
+  try {
+    writeFileSync25(tempPath, JSON.stringify(toHandle(task), null, 2), "utf-8");
+    renameSync5(tempPath, filePath);
+  } catch (error95) {
+    try {
+      if (existsSync71(tempPath)) {
+        unlinkSync11(tempPath);
+      }
+    } catch {}
+    throw error95;
+  }
+}
+function readHandleFile(filePath) {
+  try {
+    if (!existsSync71(filePath)) {
+      return null;
+    }
+    const parsed = JSON.parse(readFileSync42(filePath, "utf-8"));
+    const result = BgHandleSchema.safeParse(parsed);
+    return result.success ? result.data : null;
+  } catch {
+    return null;
+  }
+}
+function readHandles(directory) {
+  const dir = getBgHandleDir(directory);
+  if (!existsSync71(dir)) {
+    return [];
+  }
+  const handles = [];
+  for (const name of readdirSync22(dir)) {
+    if (!name.startsWith(BG_HANDLE_FILE_PREFIX) || !name.endsWith(".json")) {
+      continue;
+    }
+    const handle = readHandleFile(join72(dir, name));
+    if (handle) {
+      handles.push(handle);
+    }
+  }
+  return handles;
+}
+function sweepStaleHandles(directory, ttlMs = TASK_TTL_MS, now = Date.now()) {
+  const dir = getBgHandleDir(directory);
+  if (!existsSync71(dir)) {
+    return 0;
+  }
+  let removed = 0;
+  for (const name of readdirSync22(dir)) {
+    if (!name.startsWith(BG_HANDLE_FILE_PREFIX) || !name.endsWith(".json")) {
+      continue;
+    }
+    const filePath = join72(dir, name);
+    const handle = readHandleFile(filePath);
+    const timestamp = handle?.completedAt ?? handle?.startedAt ?? handle?.queuedAt;
+    if (handle && timestamp !== undefined && now - timestamp <= ttlMs) {
+      continue;
+    }
+    try {
+      unlinkSync11(filePath);
+      removed++;
+    } catch {}
+  }
+  if (removed > 0) {
+    log(`[bg-handles] Swept ${removed} stale handle file(s) from ${dir}`);
+  }
+  return removed;
+}
+
+// src/shared/revive-outcome.ts
+function formatReviveOutcome(taskId, sessionID, status) {
+  const metadata = JSON.stringify({
+    task_id: taskId,
+    session_id: sessionID,
+    status,
+    reason: "revived"
+  });
+  return `Background task revived.
+
+Task ID: ${taskId}
+Session ID: ${sessionID}
+Status: ${status}
+
+<task_metadata>${metadata}</task_metadata>`;
+}
+function formatUnrevivable(taskId, reason, detail) {
+  const metadata = JSON.stringify({
+    task_id: taskId,
+    status: "unrevived",
+    reason
+  });
+  const detailLine = detail === undefined ? "" : `Detail: ${detail}
+`;
+  return `Background task NOT revived.
+
+Task ID: ${taskId}
+Reason: ${reason}
+${detailLine}
+<task_metadata>${metadata}</task_metadata>`;
+}
+
+// src/tools/background-task/create-background-revive.ts
+function formatListing(entries) {
+  if (entries.length === 0) {
+    return `No revivable background tasks found.
+
+Handles are retained for 30 minutes after a task reaches a terminal state.`;
+  }
+  const rows = entries.map((entry) => `| \`${entry.taskId}\` | ${entry.description} | ${entry.agent} | ${entry.status} | ${entry.terminalReason ?? "-"} | \`${entry.sessionID}\` |`).join(`
+`);
+  return `Revivable background tasks (${entries.length}):
+
+| Task ID | Description | Agent | Status | Reason | Session ID |
+|---------|-------------|-------|--------|--------|------------|
+${rows}
+
+Revive one with background_revive(taskId="<id>", prompt="<new instruction>").`;
+}
+function resolveFailure(identifier, message, directory) {
+  if (message.includes("not found for revive")) {
+    const handleOnDisk = existsSync72(getHandlePath(directory, identifier));
+    return { reason: handleOnDisk ? "unknown-task" : "expired", detail: message };
+  }
+  if (message.includes("still active"))
+    return { reason: "active", detail: message };
+  if (message.includes("unknown liveness"))
+    return { reason: "uncertain", detail: message };
+  if (message.includes("no session to revive") || message.includes("has no sessionID")) {
+    return { reason: "no-session", detail: message };
+  }
+  return { reason: "unknown-task", detail: message };
+}
+function createBackgroundRevive(manager, directory) {
+  return tool({
+    description: BACKGROUND_REVIVE_DESCRIPTION,
+    args: {
+      taskId: tool.schema.string().optional().describe("Task ID to revive (provide this or session_id)"),
+      session_id: tool.schema.string().optional().describe("Session ID of the task to revive (alternative to taskId)"),
+      prompt: tool.schema.string().optional().describe("NEW instruction for the revived session (required unless list=true)"),
+      list: tool.schema.boolean().optional().describe("List revivable tasks instead of reviving one (default: false)"),
+      force: tool.schema.boolean().optional().describe("Acknowledge unknown liveness for statusUncertain tasks (default: false)"),
+      parentSessionID: tool.schema.string().optional().describe("Restrict discovery to this parent session")
+    },
+    async execute(args, toolContext) {
+      const isListing = args.list === true || args.taskId === undefined && args.session_id === undefined;
+      if (isListing) {
+        return formatListing(manager.listRevivable(args.parentSessionID ?? toolContext.sessionID));
+      }
+      const identifier = args.taskId ?? args.session_id;
+      if (args.prompt === undefined || args.prompt.trim().length === 0) {
+        return formatUnrevivable(identifier, "unknown-task", "a prompt is required to revive a task");
+      }
+      try {
+        const task = await manager.revive({
+          taskId: args.taskId,
+          sessionId: args.session_id,
+          prompt: args.prompt,
+          parentSessionID: toolContext.sessionID,
+          parentMessageID: toolContext.messageID,
+          force: args.force
+        });
+        return formatReviveOutcome(task.id, task.sessionID ?? "", task.status);
+      } catch (error95) {
+        const message = error95 instanceof Error ? error95.message : String(error95);
+        const { reason, detail } = resolveFailure(identifier, message, directory);
+        return formatUnrevivable(identifier, reason, detail);
+      }
+    }
+  });
+}
 // src/tools/assembly/constants.ts
 var DEFAULT_VOTERS = 3;
 var DEFAULT_ROUNDS = 2;
@@ -89105,9 +89459,9 @@ function createAssemblyTool(options) {
   });
 }
 // src/tools/dcp-switch-profile/tools.ts
-import { existsSync as existsSync70, writeFileSync as writeFileSync25 } from "fs";
-import { homedir as homedir10 } from "os";
-import { join as join71 } from "path";
+import { existsSync as existsSync73, writeFileSync as writeFileSync26 } from "fs";
+import { homedir as homedir11 } from "os";
+import { join as join73 } from "path";
 
 // src/config/schema/dcp.ts
 var DcpCompressOverrideSchema = exports_external.object({
@@ -89192,12 +89546,37 @@ var BUILTIN_DCP_PROFILES = {
     turnProtection: { enabled: true, turns: 5 },
     experimental: { allowSubAgents: true },
     strategies: { purgeErrors: { turns: 4 } }
+  },
+  brutal: {
+    pruneNotification: "off",
+    compress: {
+      maxContextLimit: "15%",
+      minContextLimit: "10%",
+      nudgeFrequency: 1,
+      nudgeForce: "strong",
+      iterationNudgeThreshold: 1
+    },
+    turnProtection: { enabled: false },
+    experimental: { allowSubAgents: false },
+    strategies: { purgeErrors: { turns: 1 } }
   }
 };
+var DcpHandoffCompressionSchema = exports_external.object({
+  enabled: exports_external.boolean().default(true),
+  maxMessages: exports_external.number().int().min(1).default(6),
+  keepFirst: exports_external.number().int().min(0).default(2),
+  keepLast: exports_external.number().int().min(0).default(3)
+});
 var DcpConfigSchema = exports_external.object({
   enabled: exports_external.boolean().default(true),
   profiles: exports_external.record(exports_external.string(), DcpProfileDefinitionSchema).default(BUILTIN_DCP_PROFILES),
   default_profile: exports_external.string().optional(),
+  handoffCompression: DcpHandoffCompressionSchema.default({
+    enabled: true,
+    maxMessages: 6,
+    keepFirst: 2,
+    keepLast: 3
+  }),
   base: exports_external.object({
     autoUpdate: exports_external.boolean().default(false),
     debug: exports_external.boolean().default(false),
@@ -89254,7 +89633,8 @@ var DcpConfigSchema = exports_external.object({
       enabled: false,
       automaticStrategies: true
     }),
-    protectedFilePatterns: exports_external.array(exports_external.string()).default([])
+    protectedFilePatterns: exports_external.array(exports_external.string()).default([]),
+    experimental: DcpExperimentalSchema.default({ allowSubAgents: true })
   }).default({
     autoUpdate: false,
     debug: false,
@@ -89275,25 +89655,54 @@ var DcpConfigSchema = exports_external.object({
     },
     commands: { enabled: true, protectedTools: [] },
     manualMode: { enabled: false, automaticStrategies: true },
-    protectedFilePatterns: []
+    protectedFilePatterns: [],
+    experimental: { allowSubAgents: true }
   })
 });
 
 // src/tools/dcp-switch-profile/tools.ts
-var DCP_PLUGIN_DIR = join71(homedir10(), ".config", "opencode", "node_modules", "@tarquinen", "opencode-dcp");
-var DCP_SYMLINK = join71(homedir10(), ".config", "opencode", "dcp.jsonc");
-var VALID_PROFILES = ["economy", "balanced", "performance", "ultimate"];
+var DCP_PLUGIN_DIR = join73(homedir11(), ".config", "opencode", "node_modules", "@tarquinen", "opencode-dcp");
+var DCP_SYMLINK = join73(homedir11(), ".config", "opencode", "dcp.jsonc");
+var VALID_PROFILES = ["economy", "balanced", "performance", "ultimate", "brutal"];
 function checkDcpInstalled() {
-  if (!existsSync70(DCP_PLUGIN_DIR)) {
+  if (!existsSync73(DCP_PLUGIN_DIR)) {
     return `DCP is not installed at ${DCP_PLUGIN_DIR}. Install it with: npm install --prefix ~/.config/opencode @tarquinen/opencode-dcp`;
   }
   return null;
 }
+function deepMergeProfile(builtin, override) {
+  const result = { ...builtin };
+  if (override.pruneNotification !== undefined) {
+    result.pruneNotification = override.pruneNotification;
+  }
+  const subObjects = ["compress", "turnProtection", "experimental"];
+  for (const key of subObjects) {
+    const builtinObj = builtin[key];
+    const overrideObj = override[key];
+    if (builtinObj || overrideObj) {
+      result[key] = { ...builtinObj ?? {}, ...overrideObj ?? {} };
+    }
+  }
+  const builtinStrategies = builtin.strategies;
+  const overrideStrategies = override.strategies;
+  if (builtinStrategies || overrideStrategies) {
+    const merged = { ...builtinStrategies ?? {}, ...overrideStrategies ?? {} };
+    const builtinPurge = builtinStrategies?.purgeErrors;
+    const overridePurge = overrideStrategies?.purgeErrors;
+    if (builtinPurge || overridePurge) {
+      merged.purgeErrors = { ...builtinPurge ?? {}, ...overridePurge ?? {} };
+    }
+    result.strategies = merged;
+  }
+  return result;
+}
 function buildInlineConfig(profile, options) {
   const dcpConfig = options?.pluginConfig?.dcp;
   const base = dcpConfig?.base ? dcpConfig.base : {};
   const validProfiles = BUILTIN_DCP_PROFILES;
-  const profileConfig = dcpConfig?.profiles?.[profile] ?? validProfiles[profile] ?? {};
+  const builtinProfile = validProfiles[profile] ?? {};
+  const userOverride = dcpConfig?.profiles?.[profile];
+  const profileConfig = userOverride ? deepMergeProfile(builtinProfile, userOverride) : builtinProfile;
   const compressBase = base.compress ?? {};
   const strategiesBase = base.strategies ?? {};
   const commandsCfg = base.commands ?? {};
@@ -89303,6 +89712,7 @@ function buildInlineConfig(profile, options) {
   const profileExp = profileConfig.experimental ?? {};
   const profilePurge = profileConfig.strategies?.purgeErrors ?? {};
   const basePurge = strategiesBase.purgeErrors ?? {};
+  const baseExp = base.experimental ?? {};
   return {
     $schema: "https://raw.githubusercontent.com/Opencode-DCP/opencode-dynamic-context-pruning/v3.1.14/dcp.schema.json",
     enabled: true,
@@ -89329,7 +89739,7 @@ function buildInlineConfig(profile, options) {
       turns: profileTurn.turns ?? 2
     },
     experimental: {
-      allowSubAgents: profileExp.allowSubAgents ?? true,
+      allowSubAgents: profileExp.allowSubAgents ?? baseExp.allowSubAgents ?? true,
       customPrompts: false
     },
     protectedFilePatterns: base.protectedFilePatterns ?? [],
@@ -89355,14 +89765,16 @@ function buildInlineConfig(profile, options) {
   };
 }
 function switchProfile(profile, options) {
-  if (!VALID_PROFILES.includes(profile)) {
-    return `Error: Invalid profile "${profile}". Valid profiles: ${VALID_PROFILES.join(", ")}`;
+  const customProfiles = Object.keys(options?.pluginConfig?.dcp?.profiles ?? {});
+  const allValid = [...VALID_PROFILES, ...customProfiles];
+  if (!allValid.includes(profile)) {
+    return `Error: Invalid profile "${profile}". Valid profiles: ${allValid.join(", ")}`;
   }
   const dcpError = checkDcpInstalled();
   if (dcpError)
     return dcpError;
   const inlineConfig = buildInlineConfig(profile, options);
-  writeFileSync25(DCP_SYMLINK, `${JSON.stringify(inlineConfig, null, 2)}
+  writeFileSync26(DCP_SYMLINK, `${JSON.stringify(inlineConfig, null, 2)}
 `);
   return `\u2713 Switched to DCP profile: ${profile}
 
@@ -89370,9 +89782,9 @@ Restart OpenCode session for changes to take effect.`;
 }
 function createDcpSwitchProfileTool(options) {
   const dcp_switch_profile = tool({
-    description: "Switch the active DCP (Dynamic Context Pruning) profile tier. " + "Reads profile parameters from the Matrixx plugin configuration and writes a full inline DCP config " + "to ~/.config/opencode/dcp.jsonc. No external files needed. " + "Call this with one of: economy, balanced, performance, ultimate.",
+    description: "Switch the active DCP (Dynamic Context Pruning) profile tier. " + "Reads profile parameters from the Matrixx plugin configuration and writes a full inline DCP config " + "to ~/.config/opencode/dcp.jsonc. No external files needed. " + "Built-in profiles: economy, balanced, performance, ultimate. " + "Custom profiles (e.g. brutal) are read from dcp.profiles in opencode.jsonc.",
     args: {
-      profile: tool.schema.enum(VALID_PROFILES).describe("Target DCP profile tier: economy (most aggressive), balanced, performance, ultimate (least aggressive)")
+      profile: tool.schema.string().describe("Target DCP profile tier: economy (most aggressive), balanced, performance, ultimate (least aggressive), or a custom profile name from config (e.g., brutal)")
     },
     async execute(args) {
       const profile = args.profile;
@@ -89393,6 +89805,39 @@ var CALL_DELEGATE_AGENT_DESCRIPTION = `Spawn explore/librarian agent. run_in_bac
 Available: {agents}
 
 Pass \`session_id=<id>\` to continue previous agent with full context. Prompts MUST be in English. Use \`background_output\` for async results.`;
+// src/shared/saturated-outcome.ts
+var LAUNCH_TERMINAL_STATUSES = [
+  "error",
+  "cancelled",
+  "interrupt",
+  "stopped",
+  "statusUncertain"
+];
+function isLaunchTerminalStatus(status) {
+  return LAUNCH_TERMINAL_STATUSES.includes(status);
+}
+function isQueueSaturated(status, terminalReason) {
+  return status === "stopped" && terminalReason === "queue-saturated";
+}
+function formatSaturatedOutcome(taskId) {
+  const metadata = JSON.stringify({
+    task_id: taskId,
+    status: "stopped",
+    reason: "queue-saturated"
+  });
+  return `Background task NOT admitted (queue saturated).
+
+Task ID: ${taskId}
+Status: stopped
+Reason: queue-saturated
+
+<task_metadata>${metadata}</task_metadata>`;
+}
+function formatLaunchFailure(taskId, status) {
+  return `Task failed to start (status: ${status}).
+
+Task ID: ${taskId}`;
+}
 // src/tools/delegate-agent/background-executor.ts
 async function executeBackground(args, toolContext, manager, client2) {
   try {
@@ -89429,10 +89874,11 @@ async function executeBackground(args, toolContext, manager, client2) {
 Task ID: ${task.id}`;
       }
       const updated = manager.getTask(task.id);
-      if (updated?.status === "error" || updated?.status === "cancelled" || updated?.status === "interrupt") {
-        return `Task failed to start (status: ${updated.status}).
-
-Task ID: ${task.id}`;
+      if (updated && isLaunchTerminalStatus(updated.status)) {
+        if (isQueueSaturated(updated.status, updated.terminalReason)) {
+          return formatSaturatedOutcome(task.id);
+        }
+        return formatLaunchFailure(task.id, updated.status);
       }
       await new Promise((resolve10) => setTimeout(resolve10, WAIT_FOR_SESSION_INTERVAL_MS));
       sessionId = manager.getTask(task.id)?.sessionID;
@@ -90411,7 +90857,7 @@ ${task.agent ? `subagent: ${task.agent}
 }
 // src/tools/delegate-task/timing.ts
 var POLL_INTERVAL_MS3 = 1000;
-var MIN_STABILITY_TIME_MS = 1e4;
+var MIN_STABILITY_TIME_MS2 = 1e4;
 var STABILITY_POLLS_REQUIRED = 3;
 var WAIT_FOR_SESSION_INTERVAL_MS = 100;
 var WAIT_FOR_SESSION_TIMEOUT_MS = 30000;
@@ -90420,7 +90866,7 @@ var SESSION_CONTINUATION_STABILITY_MS = 5000;
 function getTimingConfig() {
   return {
     POLL_INTERVAL_MS: POLL_INTERVAL_MS3,
-    MIN_STABILITY_TIME_MS,
+    MIN_STABILITY_TIME_MS: MIN_STABILITY_TIME_MS2,
     STABILITY_POLLS_REQUIRED,
     WAIT_FOR_SESSION_INTERVAL_MS,
     WAIT_FOR_SESSION_TIMEOUT_MS,
@@ -90461,6 +90907,12 @@ Task ID: ${task.id}`;
       }
       await new Promise((resolve10) => setTimeout(resolve10, timing.WAIT_FOR_SESSION_INTERVAL_MS));
       const updated = manager.getTask(task.id);
+      if (updated && isLaunchTerminalStatus(updated.status)) {
+        if (isQueueSaturated(updated.status, updated.terminalReason)) {
+          return formatSaturatedOutcome(task.id);
+        }
+        return formatLaunchFailure(task.id, updated.status);
+      }
       sessionId = updated?.sessionID;
     }
     if (!sessionId) {
@@ -92101,7 +92553,7 @@ REQUIRED: You MUST provide EITHER category OR subagent_type (one of them is REQU
   Available categories:
 ${categoryList}
 - subagent_type: Use specific agent directly (e.g., "oracle", "trinity")
-- run_in_background: true=async (returns task_id), false=sync (waits for result). Default: false. Use background=true ONLY for parallel exploration with 5+ independent queries.
+- run_in_background: true=async (returns task_id), false=sync (waits for result). Default: false. Use true for ANY parallel independent work (exploration, fan-out, multi-agent waves); false awaits the result inline.
 - session_id: Existing Task session to continue (from previous task output). Continues agent with FULL CONTEXT PRESERVED - saves tokens, maintains continuity.
 - command: The command that triggered this task (optional, for slash command tracking).
 
@@ -92598,8 +93050,8 @@ Original error: ${createResult.error}`;
   });
 }
 // src/tools/task/task-cleanup.ts
-import { existsSync as existsSync71, readdirSync as readdirSync22, readFileSync as readFileSync42, unlinkSync as unlinkSync11 } from "fs";
-import { join as join72 } from "path";
+import { existsSync as existsSync74, readdirSync as readdirSync23, readFileSync as readFileSync43, unlinkSync as unlinkSync12 } from "fs";
+import { join as join74 } from "path";
 init_logger();
 function parseOlderThan(value) {
   const match = value.trim().match(/^(\d+)(d|h|m)$/);
@@ -92658,17 +93110,17 @@ Returns counts: {deleted, remaining, deletedIds}`,
         }
         const directory = context?.directory ?? ctx?.directory ?? process.cwd();
         const taskDir = getTaskDir(config4, directory);
-        if (!existsSync71(taskDir)) {
+        if (!existsSync74(taskDir)) {
           return JSON.stringify({ deleted: 0, remaining: 0, deletedIds: [] });
         }
-        const files = readdirSync22(taskDir).filter((f) => f.endsWith(".json") && f.startsWith("T-"));
+        const files = readdirSync23(taskDir).filter((f) => f.endsWith(".json") && f.startsWith("T-"));
         const total = files.length;
         const deletedIds = [];
         for (const file3 of files) {
-          const filePath = join72(taskDir, file3);
+          const filePath = join74(taskDir, file3);
           let raw;
           try {
-            const content = readFileSync42(filePath, "utf-8");
+            const content = readFileSync43(filePath, "utf-8");
             raw = JSON.parse(content);
           } catch {
             continue;
@@ -92683,7 +93135,7 @@ Returns counts: {deleted, remaining, deletedIds}`,
               continue;
           }
           try {
-            unlinkSync11(filePath);
+            unlinkSync12(filePath);
             deletedIds.push(id);
           } catch (err) {
             log("[task-cleanup] Failed to delete", { file: file3, error: String(err) });
@@ -92701,8 +93153,8 @@ Returns counts: {deleted, remaining, deletedIds}`,
   });
 }
 // src/tools/task/task-create.ts
-import { readdirSync as readdirSync23, statSync as statSync17 } from "fs";
-import { join as join73 } from "path";
+import { readdirSync as readdirSync24, statSync as statSync17 } from "fs";
+import { join as join75 } from "path";
 init_logger();
 function createTaskCreateTool(config4, ctx) {
   return tool({
@@ -92768,7 +93220,7 @@ async function handleCreate2(args, config4, ctx, context) {
         projectRoot: directory
       };
       const validatedTask = TaskObjectSchema.parse(task);
-      writeJsonAtomic(join73(taskDir, `${taskId}.json`), validatedTask);
+      writeJsonAtomic(join75(taskDir, `${taskId}.json`), validatedTask);
       return JSON.stringify({
         task: {
           id: validatedTask.id,
@@ -92791,13 +93243,13 @@ async function handleCreate2(args, config4, ctx, context) {
 function findDuplicateTask(taskDir, subject, directory) {
   let files;
   try {
-    files = readdirSync23(taskDir).filter((f) => f.endsWith(".json") && f.startsWith("T-"));
+    files = readdirSync24(taskDir).filter((f) => f.endsWith(".json") && f.startsWith("T-"));
   } catch (error95) {
     log(`[task-create] Failed to list task dir ${taskDir} during dedup scan`, error95);
     return null;
   }
   for (const file3 of files) {
-    const filePath = join73(taskDir, file3);
+    const filePath = join75(taskDir, file3);
     let existing;
     try {
       existing = readJsonSafe(filePath, TaskObjectSchema);
@@ -92828,7 +93280,7 @@ function findDuplicateTask(taskDir, subject, directory) {
   return null;
 }
 // src/tools/task/task-get.ts
-import { join as join74 } from "path";
+import { join as join76 } from "path";
 function parseTaskId(id) {
   if (!TASK_ID_PATTERN.test(id))
     return null;
@@ -92853,7 +93305,7 @@ Returns null if the task does not exist or the file is invalid.`,
         }
         const directory = context?.directory ?? ctx?.directory ?? process.cwd();
         const taskDir = getTaskDir(config4, directory);
-        const taskPath = join74(taskDir, `${taskId}.json`);
+        const taskPath = join76(taskDir, `${taskId}.json`);
         const task = readJsonSafe(taskPath, TaskObjectSchema);
         return JSON.stringify({ task: task ?? null });
       } catch (error95) {
@@ -92866,8 +93318,8 @@ Returns null if the task does not exist or the file is invalid.`,
   });
 }
 // src/tools/task/task-list.ts
-import { existsSync as existsSync72, readdirSync as readdirSync24 } from "fs";
-import { join as join75 } from "path";
+import { existsSync as existsSync75, readdirSync as readdirSync25 } from "fs";
+import { join as join77 } from "path";
 function createTaskList(config4, ctx) {
   return tool({
     description: `List all active tasks with summary information.
@@ -92885,16 +93337,16 @@ Optional \`parentID\` filter: when provided, returns only tasks whose parentID m
       const parentID = args.parentID;
       const directory = context?.directory ?? ctx?.directory ?? process.cwd();
       const taskDir = getTaskDir(config4, directory);
-      if (!existsSync72(taskDir)) {
+      if (!existsSync75(taskDir)) {
         return JSON.stringify({ tasks: [] });
       }
-      const files = readdirSync24(taskDir).filter((f) => f.endsWith(".json") && f.startsWith("T-")).map((f) => f.replace(".json", ""));
+      const files = readdirSync25(taskDir).filter((f) => f.endsWith(".json") && f.startsWith("T-")).map((f) => f.replace(".json", ""));
       if (files.length === 0) {
         return JSON.stringify({ tasks: [] });
       }
       const allTasks = [];
       for (const fileId of files) {
-        const task = readJsonSafe(join75(taskDir, `${fileId}.json`), TaskObjectSchema);
+        const task = readJsonSafe(join77(taskDir, `${fileId}.json`), TaskObjectSchema);
         if (task) {
           allTasks.push(task);
         }
@@ -92923,7 +93375,7 @@ Optional \`parentID\` filter: when provided, returns only tasks whose parentID m
   });
 }
 // src/tools/task/task-update.ts
-import { join as join76 } from "path";
+import { join as join78 } from "path";
 function parseTaskId2(id) {
   if (!TASK_ID_PATTERN.test(id))
     return null;
@@ -92969,7 +93421,7 @@ async function handleUpdate(args, config4, ctx, context) {
       return JSON.stringify({ error: "task_lock_unavailable" });
     }
     try {
-      const taskPath = join76(taskDir, `${taskId}.json`);
+      const taskPath = join78(taskDir, `${taskId}.json`);
       const task = readJsonSafe(taskPath, TaskObjectSchema);
       if (!task) {
         return JSON.stringify({ error: "task_not_found" });
@@ -93022,12 +93474,13 @@ async function handleUpdate(args, config4, ctx, context) {
   }
 }
 // src/tools/index.ts
-function createBackgroundTools(manager, client2) {
+function createBackgroundTools(manager, client2, directory) {
   const outputManager = manager;
   const cancelClient = client2;
   return {
     background_output: createBackgroundOutput(outputManager, client2),
-    background_cancel: createBackgroundCancel(manager, cancelClient)
+    background_cancel: createBackgroundCancel(manager, cancelClient),
+    background_revive: createBackgroundRevive(manager, directory)
   };
 }
 var builtinTools = {
@@ -93436,30 +93889,63 @@ class ConcurrencyManager {
     }
     return 5;
   }
-  async acquire(model) {
+  tryAcquireSlot(model) {
     const limit = this.getConcurrencyLimit(model);
     if (limit === Infinity) {
-      return;
+      return true;
     }
     const current = this.counts.get(model) ?? 0;
     if (current < limit) {
       this.counts.set(model, current + 1);
+      return true;
+    }
+    return false;
+  }
+  async acquire(model) {
+    if (this.tryAcquireSlot(model))
+      return;
+    const outcome = await this.acquireWithDeadline(model, undefined);
+    if (outcome.granted)
       return;
+    if (outcome.reason === "cancelled") {
+      throw new Error(`Concurrency queue cancelled for model: ${model}`);
     }
-    return new Promise((resolve10, reject) => {
+  }
+  async acquireWithDeadline(model, timeoutMs) {
+    if (this.tryAcquireSlot(model)) {
+      return { granted: true };
+    }
+    return new Promise((resolve10) => {
       const queue = this.queues.get(model) ?? [];
+      let timer;
       const entry = {
-        resolve: () => {
+        settled: false,
+        enqueuedAt: Date.now(),
+        settle: (outcome) => {
           if (entry.settled)
             return;
           entry.settled = true;
-          resolve10();
-        },
-        rawReject: reject,
-        settled: false
+          if (timer !== undefined)
+            clearTimeout(timer);
+          resolve10(outcome);
+        }
       };
       queue.push(entry);
       this.queues.set(model, queue);
+      if (timeoutMs === undefined || timeoutMs <= 0)
+        return;
+      timer = setTimeout(() => {
+        if (entry.settled)
+          return;
+        entry.settled = true;
+        const pending = this.queues.get(model);
+        if (pending) {
+          const index = pending.indexOf(entry);
+          if (index !== -1)
+            pending.splice(index, 1);
+        }
+        resolve10({ granted: false, reason: "timeout", waitedMs: Date.now() - entry.enqueuedAt });
+      }, timeoutMs);
     });
   }
   release(model) {
@@ -93473,7 +93959,7 @@ class ConcurrencyManager {
       if (!next)
         continue;
       if (!next.settled) {
-        next.resolve();
+        next.settle({ granted: true });
         return;
       }
     }
@@ -93485,11 +93971,9 @@ class ConcurrencyManager {
   cancelWaiters(model) {
     const queue = this.queues.get(model);
     if (queue) {
+      const now = Date.now();
       for (const entry of queue) {
-        if (!entry.settled) {
-          entry.settled = true;
-          entry.rawReject(new Error(`Concurrency queue cancelled for model: ${model}`));
-        }
+        entry.settle({ granted: false, reason: "cancelled", waitedMs: now - entry.enqueuedAt });
       }
       this.queues.delete(model);
     }
@@ -93508,144 +93992,55 @@ class ConcurrencyManager {
     return this.queues.get(model)?.length ?? 0;
   }
 }
-// src/features/background-agent/handle-index.ts
-import { existsSync as existsSync73, mkdirSync as mkdirSync19, readdirSync as readdirSync25, readFileSync as readFileSync43, renameSync as renameSync5, unlinkSync as unlinkSync12, writeFileSync as writeFileSync26 } from "fs";
-import { dirname as dirname19, join as join77 } from "path";
-
-// src/features/background-agent/constants.ts
-var TASK_TTL_MS = 30 * 60 * 1000;
-var MIN_STABILITY_TIME_MS2 = 10 * 1000;
-var DEFAULT_STALE_TIMEOUT_MS = 180000;
-var DEFAULT_MESSAGE_STALENESS_TIMEOUT_MS = 600000;
-var DEFAULT_MAX_TOOL_CALLS = 4000;
-var DEFAULT_CIRCUIT_BREAKER_CONSECUTIVE_THRESHOLD = 20;
-var DEFAULT_CIRCUIT_BREAKER_ENABLED = true;
-var MIN_RUNTIME_BEFORE_STALE_MS = 30000;
-var MIN_IDLE_TIME_MS = 5000;
-var POLLING_INTERVAL_MS = 3000;
-var PRUNE_THROTTLE_MS = 30000;
-var TASK_CLEANUP_DELAY_MS = 10 * 60 * 1000;
-
-// src/features/background-agent/handle-index.ts
-var BG_HANDLE_DIR_NAME = "bg-handles";
-var BG_HANDLE_FILE_PREFIX = "bg_";
-var BgHandleSchema = exports_external.object({
-  taskId: exports_external.string(),
-  parentSessionID: exports_external.string(),
-  parentMessageID: exports_external.string(),
-  description: exports_external.string(),
-  agent: exports_external.string(),
-  status: exports_external.enum(["pending", "running", "completed", "error", "cancelled", "interrupt"]),
-  model: exports_external.object({
-    providerID: exports_external.string(),
-    modelID: exports_external.string(),
-    variant: exports_external.string().optional(),
-    temperature: exports_external.number().optional()
-  }).optional(),
-  category: exports_external.string().optional(),
-  concurrencyGroup: exports_external.string().optional(),
-  queuedAt: exports_external.number().optional(),
-  startedAt: exports_external.number().optional(),
-  completedAt: exports_external.number().optional()
-}).strict();
-function getBgHandleDir(directory) {
-  return join77(directory, ".matrixx", BG_HANDLE_DIR_NAME);
-}
-function getHandlePath(directory, taskId) {
-  return join77(getBgHandleDir(directory), `${taskId}.json`);
-}
-function ensureDir3(dirPath) {
-  if (!existsSync73(dirPath)) {
-    mkdirSync19(dirPath, { recursive: true });
-  }
-}
-function toHandle(task) {
-  return {
-    taskId: task.id,
-    parentSessionID: task.parentSessionID,
-    parentMessageID: task.parentMessageID,
-    description: task.description,
-    agent: task.agent,
-    status: task.status,
-    model: task.model,
-    category: task.category,
-    concurrencyGroup: task.concurrencyGroup,
-    queuedAt: task.queuedAt?.getTime(),
-    startedAt: task.startedAt?.getTime(),
-    completedAt: task.completedAt?.getTime()
-  };
-}
-function writeHandle(directory, task) {
-  const filePath = getHandlePath(directory, task.id);
-  ensureDir3(dirname19(filePath));
-  const tempPath = `${filePath}.tmp.${process.pid}.${Date.now()}`;
-  try {
-    writeFileSync26(tempPath, JSON.stringify(toHandle(task), null, 2), "utf-8");
-    renameSync5(tempPath, filePath);
-  } catch (error95) {
-    try {
-      if (existsSync73(tempPath)) {
-        unlinkSync12(tempPath);
-      }
-    } catch {}
-    throw error95;
-  }
-}
-function readHandleFile(filePath) {
-  try {
-    if (!existsSync73(filePath)) {
-      return null;
-    }
-    const parsed = JSON.parse(readFileSync43(filePath, "utf-8"));
-    const result = BgHandleSchema.safeParse(parsed);
-    return result.success ? result.data : null;
-  } catch {
-    return null;
-  }
-}
-function readHandles(directory) {
-  const dir = getBgHandleDir(directory);
-  if (!existsSync73(dir)) {
-    return [];
-  }
-  const handles = [];
-  for (const name of readdirSync25(dir)) {
-    if (!name.startsWith(BG_HANDLE_FILE_PREFIX) || !name.endsWith(".json")) {
-      continue;
-    }
-    const handle = readHandleFile(join77(dir, name));
-    if (handle) {
-      handles.push(handle);
-    }
-  }
-  return handles;
-}
-function sweepStaleHandles(directory, ttlMs = TASK_TTL_MS, now = Date.now()) {
-  const dir = getBgHandleDir(directory);
-  if (!existsSync73(dir)) {
-    return 0;
-  }
-  let removed = 0;
-  for (const name of readdirSync25(dir)) {
-    if (!name.startsWith(BG_HANDLE_FILE_PREFIX) || !name.endsWith(".json")) {
-      continue;
-    }
-    const filePath = join77(dir, name);
-    const handle = readHandleFile(filePath);
-    const timestamp = handle?.completedAt ?? handle?.startedAt ?? handle?.queuedAt;
-    if (handle && timestamp !== undefined && now - timestamp <= ttlMs) {
-      continue;
-    }
-    try {
-      unlinkSync12(filePath);
-      removed++;
-    } catch {}
-  }
-  if (removed > 0) {
-    log(`[bg-handles] Swept ${removed} stale handle file(s) from ${dir}`);
+// src/shared/wallclock-outcome.ts
+function formatWallclockTimeout(taskId, elapsedMs, limitMs) {
+  const metadata = JSON.stringify({
+    task_id: taskId,
+    status: "cancelled",
+    reason: "wall-clock-timeout",
+    timedOut: true,
+    elapsedMs,
+    limitMs
+  });
+  return `Background task wall-clock timeout. Task ID ${taskId} exceeded its elapsed-time bound.
+
+Task ID: ${taskId}
+Elapsed: ${formatDuration2(elapsedMs)}
+Limit: ${formatDuration2(limitMs)}
+Status: cancelled
+Reason: wall-clock-timeout
+
+<task_metadata>${metadata}</task_metadata>`;
+}
+function formatDuration2(ms) {
+  if (ms < 0)
+    ms = 0;
+  if (ms >= 60000) {
+    const mins = Math.floor(ms / 60000);
+    return `${mins}min`;
+  }
+  return `${Math.floor(ms / 1000)}sec`;
+}
+
+// src/features/background-agent/admission.ts
+function classifyAdmission(parentSessionID, maxDepth) {
+  if (!parentSessionID)
+    return { kind: "root" };
+  const immediateParent = getParentSessionID(parentSessionID);
+  if (!immediateParent)
+    return { kind: "root" };
+  let depth = 1;
+  let current = immediateParent;
+  while (depth < maxDepth) {
+    const parent = getParentSessionID(current);
+    if (!parent)
+      break;
+    depth += 1;
+    current = parent;
   }
-  return removed;
+  return { kind: "nested", depth };
 }
+
 // src/features/background-agent/error-helpers.ts
 function getErrorText(error95) {
   if (!error95)
@@ -93748,19 +94143,19 @@ function detectRepetitiveToolUse(window2) {
 }
 
 // src/features/background-agent/message-dir.ts
-import { existsSync as existsSync74, readdirSync as readdirSync26, readFileSync as readFileSync44 } from "fs";
-import { join as join78 } from "path";
+import { existsSync as existsSync76, readdirSync as readdirSync26, readFileSync as readFileSync44 } from "fs";
+import { join as join79 } from "path";
 var MESSAGE_DIR_CACHE_CAP = 1000;
 var messageDirCache = new Map;
 function computeMessageDir(sessionID) {
-  if (!existsSync74(MESSAGE_STORAGE))
+  if (!existsSync76(MESSAGE_STORAGE))
     return null;
-  const directPath = join78(MESSAGE_STORAGE, sessionID);
-  if (existsSync74(directPath))
+  const directPath = join79(MESSAGE_STORAGE, sessionID);
+  if (existsSync76(directPath))
     return directPath;
   for (const dir of readdirSync26(MESSAGE_STORAGE)) {
-    const sessionPath = join78(MESSAGE_STORAGE, dir, sessionID);
-    if (existsSync74(sessionPath))
+    const sessionPath = join79(MESSAGE_STORAGE, dir, sessionID);
+    if (existsSync76(sessionPath))
       return sessionPath;
   }
   return null;
@@ -93798,7 +94193,7 @@ function findNearestMessageExcludingCompaction(messageDir) {
     const parsedByFile = new Map;
     for (const file3 of files) {
       try {
-        const content = readFileSync44(join78(messageDir, file3), "utf-8");
+        const content = readFileSync44(join79(messageDir, file3), "utf-8");
         const parsed = JSON.parse(content);
         parsedByFile.set(file3, parsed);
         if (hasFullAgentAndModel(parsed)) {
@@ -93818,6 +94213,19 @@ function findNearestMessageExcludingCompaction(messageDir) {
 }
 
 // src/features/background-agent/notification-builder.ts
+var STATUS_LABELS = {
+  completed: "COMPLETED",
+  interrupt: "INTERRUPTED",
+  cancelled: "CANCELLED",
+  stopped: "STOPPED",
+  statusUncertain: "STATUS UNCERTAIN",
+  error: "ERROR",
+  pending: "IN PROGRESS",
+  running: "IN PROGRESS"
+};
+function statusToLabel(status) {
+  return STATUS_LABELS[status];
+}
 function buildCompletionNotification(task, allComplete, completedTasks, remainingCount, duration5, errorInfo) {
   if (allComplete) {
     const completedTasksText = completedTasks.map((t) => `- \`${t.id}\`: ${t.description}`).join(`
@@ -93831,7 +94239,7 @@ ${completedTasksText || `- \`${task.id}\`: ${task.description}`}
 Use \`background_output(task_id="<id>")\` to retrieve each result.
 </system-reminder>`;
   }
-  const statusText = task.status === "completed" ? "COMPLETED" : task.status === "interrupt" ? "INTERRUPTED" : "CANCELLED";
+  const statusText = statusToLabel(task.status);
   return `<system-reminder>
 [BACKGROUND TASK ${statusText}]
 **ID:** \`${task.id}\`
@@ -93886,6 +94294,164 @@ async function resolveAgentAndModel(client2, task, enableParentSessionNotificati
   return { agent, model };
 }
 
+// src/features/background-agent/session-output.ts
+async function fetchSessionMessages2(client2, sessionID) {
+  const response = await client2.session.messages({ path: { id: sessionID } });
+  return normalizeSDKResponse(response, [], { preferResponseOnMissingData: true });
+}
+function messagesHaveAssistantOutput(messages2, sessionID) {
+  const hasAssistantOrToolMessage = messages2.some((m) => m.info?.role === "assistant" || m.info?.role === "tool");
+  if (!hasAssistantOrToolMessage) {
+    if (sessionID)
+      log("[background-agent] No assistant/tool messages found in session:", sessionID);
+    return false;
+  }
+  const hasContent2 = messages2.some((m) => {
+    if (m.info?.role !== "assistant" && m.info?.role !== "tool")
+      return false;
+    const parts = m.parts ?? [];
+    return parts.some((p) => p.type === "text" && p.text && p.text.trim().length > 0 || p.type === "reasoning" && p.text && p.text.trim().length > 0 || p.type === "tool" || p.type === "tool_result" && p.content && (typeof p.content === "string" ? p.content.trim().length > 0 : p.content.length > 0));
+  });
+  if (!hasContent2 && sessionID) {
+    log("[background-agent] Messages exist but no content found in session:", sessionID);
+  }
+  return hasContent2;
+}
+function messagesHaveRecordedError(messages2) {
+  return messages2.some((m) => m.info?.role === "assistant" && m.info.error != null);
+}
+async function validateSessionHasOutput(client2, sessionID) {
+  try {
+    const messages2 = await fetchSessionMessages2(client2, sessionID);
+    return messagesHaveAssistantOutput(messages2, sessionID);
+  } catch (error95) {
+    log("[background-agent] Error validating session output:", error95);
+    return true;
+  }
+}
+
+// src/features/background-agent/reconcile.ts
+function uncertain() {
+  return { status: "statusUncertain", terminalReason: "uncertain" };
+}
+function responseHasError(response) {
+  if (typeof response !== "object" || response === null)
+    return false;
+  return Boolean(response.error);
+}
+function isNonIdle(status) {
+  return status !== undefined && status.type !== "idle";
+}
+async function statusesOrThrow(client2) {
+  const response = await client2.session.status();
+  if (responseHasError(response))
+    throw new Error("session.status returned an error response");
+  return normalizeSDKResponse(response, {});
+}
+async function hasIncompleteTodos2(client2, sessionID) {
+  try {
+    const response = await client2.session.todo({ path: { id: sessionID } });
+    const todos = normalizeSDKResponse(response, [], { preferResponseOnMissingData: true });
+    if (!todos || todos.length === 0)
+      return false;
+    return todos.some((t) => t.status !== "completed" && t.status !== "cancelled");
+  } catch {
+    return false;
+  }
+}
+async function reconcileHandle(client2, handle, deps) {
+  const sessionID = handle.sessionID?.trim();
+  if (!sessionID)
+    return uncertain();
+  try {
+    const statuses = await statusesOrThrow(client2);
+    if (isNonIdle(statuses[sessionID]))
+      return { status: "running" };
+    const messages2 = await fetchSessionMessages2(client2, sessionID);
+    if (messagesHaveRecordedError(messages2))
+      return { status: "error" };
+    if (hasPendingQuestionMessage(messages2))
+      return { status: "running" };
+    const hasOutput = deps?.validateOutput ? await deps.validateOutput(sessionID) : messagesHaveAssistantOutput(messages2);
+    if (!hasOutput) {
+      return await confirmStopped(client2, sessionID, deps);
+    }
+    if (await hasIncompleteTodos2(client2, sessionID))
+      return { status: "running" };
+    return { status: "completed" };
+  } catch {
+    return uncertain();
+  }
+}
+async function confirmStopped(client2, sessionID, deps) {
+  if (!deps?.sleep)
+    return { status: "stopped", terminalReason: "no-output" };
+  await deps.sleep(RECONCILE_CONFIRMATION_GRACE_MS);
+  const statuses = await statusesOrThrow(client2);
+  if (isNonIdle(statuses[sessionID]))
+    return { status: "running" };
+  const messages2 = await fetchSessionMessages2(client2, sessionID);
+  if (messagesHaveRecordedError(messages2))
+    return { status: "error" };
+  if (messagesHaveAssistantOutput(messages2) || hasPendingQuestionMessage(messages2)) {
+    return { status: "running" };
+  }
+  return { status: "stopped", terminalReason: "no-output" };
+}
+
+// src/features/background-agent/revive.ts
+var REVIVABLE_STATUSES = ["cancelled", "stopped", "interrupt", "error", "completed"];
+function isRevivableStatus(status) {
+  return REVIVABLE_STATUSES.includes(status);
+}
+function classifyRevivable(handle, opts) {
+  if (handle.status === "pending" || handle.status === "running") {
+    return { eligible: false, reason: "active" };
+  }
+  if (handle.sessionID === undefined || handle.sessionID.trim().length === 0) {
+    return { eligible: false, reason: "no-session" };
+  }
+  if (handle.status === "statusUncertain") {
+    if (opts?.force === true) {
+      return { eligible: true };
+    }
+    return { eligible: false, reason: "uncertain" };
+  }
+  if (isRevivableStatus(handle.status)) {
+    return { eligible: true };
+  }
+  return { eligible: false, reason: "unknown-task" };
+}
+function findRevivableHandle(handles, opts) {
+  if (opts.taskId !== undefined && opts.taskId !== "") {
+    const byTask = handles.find((handle) => handle.taskId === opts.taskId);
+    if (byTask)
+      return byTask;
+  }
+  if (opts.sessionId !== undefined && opts.sessionId !== "") {
+    return handles.find((handle) => handle.sessionID === opts.sessionId);
+  }
+  return;
+}
+function toReviveTask(handle, prompt) {
+  return {
+    id: handle.taskId,
+    parentSessionID: handle.parentSessionID,
+    parentMessageID: handle.parentMessageID,
+    description: handle.description,
+    prompt,
+    agent: handle.agent,
+    status: "pending",
+    sessionID: handle.sessionID,
+    queuedAt: handle.queuedAt !== undefined ? new Date(handle.queuedAt) : undefined,
+    completedAt: undefined,
+    error: undefined,
+    model: handle.model,
+    category: handle.category,
+    concurrencyGroup: handle.concurrencyGroup
+  };
+}
+
 // src/features/background-agent/task-history.ts
 var MAX_ENTRIES_PER_PARENT = 100;
 
@@ -93943,11 +94509,232 @@ class TaskHistory {
     return lines.join(`
 `);
   }
+  getJobBoardEntries(parentSessionID) {
+    return this.getByParentSession(parentSessionID).map((e) => ({
+      agent: e.agent,
+      ...e.category !== undefined ? { category: e.category } : {},
+      status: e.status,
+      description: e.description.replace(/[\n\r]+/g, " ").trim(),
+      ...e.sessionID !== undefined ? { session: e.sessionID } : {}
+    }));
+  }
+  buildJobBoardSnapshot(parentSessionID, opts) {
+    const entries = this.getJobBoardEntries(parentSessionID);
+    if (entries.length === 0)
+      return null;
+    const strategy = opts?.strategy ?? "latest";
+    const block = formatJobBoardBlock(entries);
+    if (strategy === "latest")
+      return { strategy, block };
+    const maxRetained = clampMaxRetainedSnapshots(opts?.maxRetained);
+    const retained = [...opts?.previous ?? [], block].slice(-maxRetained);
+    return { strategy, block, retained };
+  }
+}
+function clampMaxRetainedSnapshots(value) {
+  if (value === undefined || !Number.isFinite(value))
+    return 20;
+  return Math.min(100, Math.max(1, Math.floor(value)));
+}
+function formatJobBoardBlock(entries) {
+  const lines = entries.map((row) => {
+    const parts = [
+      `- **${row.agent}**`,
+      row.category ? `[${row.category}]` : null,
+      `(${row.status})`,
+      `: ${row.description}`,
+      row.session ? ` | session: \`${row.session}\`` : null
+    ];
+    return parts.filter(Boolean).join("");
+  });
+  return `**Background task board (${entries.length} task${entries.length === 1 ? "" : "s"}):**
+${lines.join(`
+`)}`;
+}
+
+// src/features/background-agent/wake-scheduler.ts
+var WAKE_REMINDER_TEXT = `<system-reminder>
+[BACKGROUND WAKE]
+
+One or more background tasks for this session are still running or have undelivered results.
+Use background_output with the task ID to retrieve results when ready.
+Do NOT poll - continue productive work.
+</system-reminder>`;
+function resolveWakeIntervalMs(cfg) {
+  const raw = cfg?.intervalMs ?? DEFAULT_WAKE_INTERVAL_MS;
+  return Math.max(MIN_WAKE_INTERVAL_MS, raw);
+}
+function shouldWakeForParent(state3) {
+  if (!state3.hasPendingChildren && !state3.hasUndeliveredNotifications)
+    return false;
+  if (state3.hasUnfinishedTodos === false)
+    return false;
+  return true;
+}
+function nextWakeDelay(lastWakeAtMs, intervalMs, nowMs = Date.now()) {
+  const interval = Math.max(MIN_WAKE_INTERVAL_MS, intervalMs);
+  return Math.max(0, lastWakeAtMs + interval - nowMs);
+}
+var MAX_STAGNANT_WAKES = 2;
+
+class WakeTracker {
+  stagnantByParent = new Map;
+  recordWake(parentSessionID, progressed) {
+    if (progressed) {
+      this.stagnantByParent.delete(parentSessionID);
+      return true;
+    }
+    const stagnant = (this.stagnantByParent.get(parentSessionID) ?? 0) + 1;
+    this.stagnantByParent.set(parentSessionID, stagnant);
+    return stagnant <= MAX_STAGNANT_WAKES;
+  }
+  resetOnActivity(parentSessionID) {
+    this.stagnantByParent.delete(parentSessionID);
+  }
+  stagnantCount(parentSessionID) {
+    return this.stagnantByParent.get(parentSessionID) ?? 0;
+  }
+}
+function defaultScheduleTimer(callback, delayMs) {
+  return setTimeout(callback, delayMs);
+}
+function defaultClearTimer(handle) {
+  clearTimeout(handle);
+}
+
+class WakeScheduler {
+  timers = new Map;
+  registrations = new Map;
+  snapshots = new Map;
+  tracker = new WakeTracker;
+  scheduleTimer;
+  clearTimer;
+  constructor(deps) {
+    this.scheduleTimer = deps?.scheduleTimer ?? defaultScheduleTimer;
+    this.clearTimer = deps?.clearTimer ?? defaultClearTimer;
+  }
+  armTimer(parentSessionID, callback, delayMs) {
+    const handle = this.scheduleTimer(callback, delayMs);
+    const maybeUnref = handle;
+    if (typeof maybeUnref.unref === "function")
+      maybeUnref.unref();
+    this.timers.set(parentSessionID, handle);
+  }
+  schedule(parentSessionID, registration) {
+    this.clearTimerFor(parentSessionID);
+    this.registrations.set(parentSessionID, registration);
+    this.snapshots.delete(parentSessionID);
+    this.tracker.resetOnActivity(parentSessionID);
+    this.armTimer(parentSessionID, () => void this.tick(parentSessionID), nextWakeDelay(Date.now(), registration.intervalMs));
+  }
+  clear(parentSessionID) {
+    this.clearTimerFor(parentSessionID);
+    this.registrations.delete(parentSessionID);
+    this.snapshots.delete(parentSessionID);
+    this.tracker.resetOnActivity(parentSessionID);
+  }
+  dispose() {
+    for (const handle of this.timers.values())
+      this.clearTimer(handle);
+    this.timers.clear();
+    this.registrations.clear();
+    this.snapshots.clear();
+  }
+  hasScheduledWake(parentSessionID) {
+    return this.timers.has(parentSessionID);
+  }
+  clearTimerFor(parentSessionID) {
+    const handle = this.timers.get(parentSessionID);
+    if (handle !== undefined) {
+      this.clearTimer(handle);
+      this.timers.delete(parentSessionID);
+    }
+  }
+  async tick(parentSessionID) {
+    this.timers.delete(parentSessionID);
+    const registration = this.registrations.get(parentSessionID);
+    if (!registration)
+      return;
+    const state3 = registration.readState();
+    const previous = this.snapshots.get(parentSessionID);
+    const progressed = previous === undefined || previous.hasPendingChildren !== state3.hasPendingChildren || previous.hasUndeliveredNotifications !== state3.hasUndeliveredNotifications || previous.hasUnfinishedTodos !== state3.hasUnfinishedTodos;
+    this.snapshots.set(parentSessionID, state3);
+    if (!shouldWakeForParent(state3)) {
+      this.registrations.delete(parentSessionID);
+      this.snapshots.delete(parentSessionID);
+      return;
+    }
+    const allowed = this.tracker.recordWake(parentSessionID, progressed);
+    if (allowed) {
+      try {
+        await registration.deliverWake();
+      } catch {}
+    }
+    if (allowed && this.registrations.has(parentSessionID)) {
+      this.armTimer(parentSessionID, () => void this.tick(parentSessionID), nextWakeDelay(Date.now(), registration.intervalMs));
+    } else {
+      this.registrations.delete(parentSessionID);
+      this.snapshots.delete(parentSessionID);
+    }
+  }
+}
+
+// src/features/background-agent/wallclock.ts
+var MAX_WALLCLOCK_TIMEOUT_MS = 2147483647;
+function isWallclockEnabled(timeoutMs) {
+  return timeoutMs !== undefined && timeoutMs !== 0;
+}
+
+class WallclockSupervisor {
+  entries = new Map;
+  arm(taskId, startedAtMs, timeoutMs, onFire) {
+    if (!isWallclockEnabled(timeoutMs))
+      return;
+    const limitMs = Math.min(timeoutMs, MAX_WALLCLOCK_TIMEOUT_MS);
+    this.disarm(taskId);
+    const deadlineAt = startedAtMs + limitMs;
+    const delayMs = Math.max(deadlineAt - Date.now(), 0);
+    let timer;
+    const entry = { deadlineAt, fired: false, timer };
+    timer = setTimeout(() => {
+      if (entry.fired)
+        return;
+      entry.fired = true;
+      this.entries.delete(taskId);
+      onFire({ taskId, elapsedMs: Date.now() - startedAtMs, limitMs });
+    }, delayMs);
+    entry.timer = timer;
+    this.entries.set(taskId, entry);
+  }
+  disarm(taskId) {
+    const entry = this.entries.get(taskId);
+    if (entry === undefined)
+      return false;
+    entry.fired = true;
+    if (entry.timer !== undefined)
+      clearTimeout(entry.timer);
+    this.entries.delete(taskId);
+    return true;
+  }
+  disarmAll() {
+    for (const entry of this.entries.values()) {
+      entry.fired = true;
+      if (entry.timer !== undefined)
+        clearTimeout(entry.timer);
+    }
+    this.entries.clear();
+  }
+  size() {
+    return this.entries.size;
+  }
+  getDeadlineAt(taskId) {
+    return this.entries.get(taskId)?.deadlineAt;
+  }
 }
 
 // src/features/background-agent/manager.ts
+var NESTED_RESERVE_ATTEMPT_TIMEOUT_MS = 100;
 function restoreTaskFromHandle(handle) {
-  const interrupted = handle.status === "running" || handle.status === "pending";
   return {
     id: handle.taskId,
     parentSessionID: handle.parentSessionID,
@@ -93955,7 +94742,9 @@ function restoreTaskFromHandle(handle) {
     description: handle.description,
     prompt: "",
     agent: handle.agent,
-    status: interrupted ? "interrupt" : handle.status,
+    status: handle.status,
+    sessionID: handle.sessionID,
+    terminalReason: handle.terminalReason,
     queuedAt: handle.queuedAt !== undefined ? new Date(handle.queuedAt) : undefined,
     startedAt: handle.startedAt !== undefined ? new Date(handle.startedAt) : undefined,
     completedAt: handle.completedAt !== undefined ? new Date(handle.completedAt) : undefined,
@@ -93987,9 +94776,15 @@ class BackgroundManager {
   processingKeys = new Set;
   completionTimers = new Map;
   idleDeferralTimers = new Map;
+  wakeScheduler = new WakeScheduler;
   notificationQueueByParent = new Map;
   enableParentSessionNotifications;
   cachedCircuitBreakerSettings;
+  handoffCompression;
+  nestedActive = new Map;
+  nestedBypassTaskIds = new Set;
+  wallclock = new WallclockSupervisor;
+  wallclockGraceTimers = new Map;
   taskHistory = new TaskHistory;
   constructor(ctx, config4, options) {
     this.tasks = new Map;
@@ -94003,6 +94798,7 @@ class BackgroundManager {
     this.onSubagentSessionCreated = options?.onSubagentSessionCreated;
     this.onShutdown = options?.onShutdown;
     this.enableParentSessionNotifications = options?.enableParentSessionNotifications ?? true;
+    this.handoffCompression = options?.handoffCompression;
     this.registerProcessCleanup();
   }
   persistHandle(task) {
@@ -94012,6 +94808,66 @@ class BackgroundManager {
       log("[background-agent] Failed to persist background handle:", { taskId: task.id, error: error95 });
     }
   }
+  armWallclock(task) {
+    const timeoutMs = this.config?.wallClockTimeoutMs ?? DEFAULT_WALL_CLOCK_TIMEOUT_MS;
+    if (timeoutMs === 0 || timeoutMs === undefined || !task.startedAt)
+      return;
+    const startedAtMs = task.startedAt.getTime();
+    this.wallclock.arm(task.id, startedAtMs, timeoutMs, () => {
+      this.onWallclockFire(task.id);
+    });
+  }
+  disarmWallclock(taskId) {
+    this.wallclock.disarm(taskId);
+    const grace = this.wallclockGraceTimers.get(taskId);
+    if (grace !== undefined) {
+      clearTimeout(grace);
+      this.wallclockGraceTimers.delete(taskId);
+    }
+  }
+  async onWallclockFire(taskId) {
+    const task = this.tasks.get(taskId);
+    if (task?.status !== "running")
+      return;
+    if (this.wallclockGraceTimers.has(taskId))
+      return;
+    if (task.sessionID) {
+      this.abortSessionQuietly(task.sessionID, "wall-clock-timeout");
+    }
+    const graceMs = this.config?.wallClockAbortGraceMs ?? DEFAULT_WALL_CLOCK_ABORT_GRACE_MS;
+    const startedAtMs = task.startedAt?.getTime() ?? Date.now();
+    const limitMs = this.config?.wallClockTimeoutMs ?? DEFAULT_WALL_CLOCK_TIMEOUT_MS;
+    const timer = setTimeout(() => {
+      this.wallclockGraceTimers.delete(taskId);
+      this.completeWallclockTimeout(taskId, startedAtMs, limitMs);
+    }, graceMs);
+    this.wallclockGraceTimers.set(taskId, timer);
+  }
+  async completeWallclockTimeout(taskId, startedAtMs, limitMs) {
+    const task = this.tasks.get(taskId);
+    if (task?.status !== "running")
+      return;
+    const elapsedMs = Date.now() - startedAtMs;
+    const elapsedMin = Math.round(elapsedMs / 60000);
+    const limitMin = Math.round(limitMs / 60000);
+    task.status = "cancelled";
+    task.terminalReason = "wall-clock-timeout";
+    task.error = `Wall-clock timeout (elapsed ${elapsedMin}min, limit ${limitMin}min)
+
+${formatWallclockTimeout(task.id, elapsedMs, limitMs)}`;
+    task.completedAt = new Date;
+    this.persistHandle(task);
+    if (task.concurrencyKey) {
+      this.concurrencyManager.release(task.concurrencyKey);
+      task.concurrencyKey = undefined;
+    }
+    this.decrementNestedActive(task);
+    try {
+      await this.enqueueNotificationForParent(task.parentSessionID, () => this.notifyParentSession(task));
+    } catch (err) {
+      log("[background-agent] Error in notifyParentSession for wall-clock task:", { taskId: task.id, error: err });
+    }
+  }
   async restoreHandles() {
     const swept = sweepStaleHandles(this.directory);
     const handles = readHandles(this.directory);
@@ -94020,13 +94876,44 @@ class BackgroundManager {
       if (this.tasks.has(handle.taskId)) {
         continue;
       }
-      this.tasks.set(handle.taskId, restoreTaskFromHandle(handle));
+      const task = restoreTaskFromHandle(handle);
+      this.tasks.set(handle.taskId, task);
       restored++;
+      if (handle.status === "running" || handle.status === "pending") {
+        await this.reconcileRestoredTask(task, handle);
+      }
     }
     if (restored > 0 || swept > 0) {
       log("[background-agent] Restored background handles:", { restored, swept });
     }
   }
+  async reconcileRestoredTask(task, handle) {
+    let outcome;
+    try {
+      outcome = await reconcileHandle(this.client, handle);
+    } catch (error95) {
+      log("[background-agent] Handle reconciliation failed:", { taskId: handle.taskId, error: error95 });
+      outcome = { status: "statusUncertain", terminalReason: "uncertain" };
+    }
+    if (outcome.status === "running") {
+      task.status = "running";
+      if (task.sessionID) {
+        registerSubagentSession(task.sessionID, task.parentSessionID);
+      }
+      task.concurrencyKey = undefined;
+      const pending = this.pendingByParent.get(task.parentSessionID) ?? new Set;
+      pending.add(task.id);
+      this.pendingByParent.set(task.parentSessionID, pending);
+      this.startPolling();
+      this.armWallclock(task);
+      return;
+    }
+    task.status = outcome.status;
+    task.terminalReason = outcome.terminalReason;
+    task.completedAt = new Date;
+    this.persistHandle(task);
+    this.disarmWallclock(task.id);
+  }
   async launch(input) {
     log("[background-agent] launch() called with:", {
       agent: input.agent,
@@ -94088,7 +94975,48 @@ class BackgroundManager {
       const queue = this.queuesByKey.get(key);
       while (queue && queue.length > 0) {
         const item = queue[0];
-        await this.concurrencyManager.acquire(key);
+        const nestedEnabled = this.config?.nestedAdmission?.enabled ?? DEFAULT_NESTED_ADMISSION_ENABLED;
+        const maxDepth = this.config?.nestedAdmission?.maxDepth ?? DEFAULT_NESTED_MAX_DEPTH;
+        const admission = classifyAdmission(item.input.parentSessionID, maxDepth);
+        if (admission.kind === "nested" && nestedEnabled) {
+          const result = await this.admitNested(key, item, maxDepth);
+          if (result.kind === "skip") {
+            queue.shift();
+            continue;
+          }
+          acquired = result.slotHeld;
+          try {
+            await this.startTask(item);
+            acquired = false;
+          } catch (error95) {
+            log("[background-agent] Error starting nested task:", error95);
+            if (!item.task.concurrencyKey && acquired) {
+              this.concurrencyManager.release(key);
+              acquired = false;
+            }
+            this.decrementNestedActive(item.task);
+          }
+          if (!result.slotHeld) {
+            item.task.concurrencyKey = undefined;
+          }
+          queue.shift();
+          continue;
+        }
+        const admissionTimeoutMs = this.config?.admissionTimeoutMs ?? DEFAULT_ADMISSION_TIMEOUT_MS;
+        const outcome = await this.concurrencyManager.acquireWithDeadline(key, admissionTimeoutMs);
+        if (!outcome.granted) {
+          if (outcome.reason === "cancelled") {
+            item.task.status = "cancelled";
+            item.task.completedAt = new Date;
+            this.persistHandle(item.task);
+            queue.shift();
+            continue;
+          }
+          const limit = this.concurrencyManager.getConcurrencyLimit(key);
+          await this.terminateQueuedTask(item.task, "queue-saturated", `Queue admission timed out after ${outcome.waitedMs}ms (key "${key}", limit ${limit})`);
+          queue.shift();
+          continue;
+        }
         acquired = true;
         if (item.task.status === "cancelled" || item.task.status === "error") {
           this.concurrencyManager.release(key);
@@ -94115,6 +95043,76 @@ class BackgroundManager {
       this.processingKeys.delete(key);
     }
   }
+  async admitNested(key, item, maxDepth) {
+    const mode = this.config?.nestedAdmission?.mode ?? DEFAULT_NESTED_ADMISSION_MODE;
+    if (mode === "reserve") {
+      const outcome = await this.concurrencyManager.acquireWithDeadline(key, NESTED_RESERVE_ATTEMPT_TIMEOUT_MS);
+      if (outcome.granted) {
+        return { kind: "admitted", slotHeld: true };
+      }
+      if (outcome.reason === "cancelled") {
+        item.task.status = "cancelled";
+        item.task.completedAt = new Date;
+        this.persistHandle(item.task);
+        return { kind: "skip" };
+      }
+    }
+    const active = this.nestedActive.get(key) ?? 0;
+    if (active >= maxDepth) {
+      await this.terminateQueuedTask(item.task, "nested-depth-exceeded", `Nested admission depth exceeded (maxDepth ${maxDepth}, key "${key}")`);
+      return { kind: "skip" };
+    }
+    this.nestedActive.set(key, active + 1);
+    this.nestedBypassTaskIds.add(item.task.id);
+    return { kind: "admitted", slotHeld: false };
+  }
+  async terminateQueuedTask(task, terminalReason, errorMessage) {
+    task.status = "stopped";
+    task.terminalReason = terminalReason;
+    task.completedAt = new Date;
+    task.error = errorMessage;
+    this.persistHandle(task);
+    this.disarmWallclock(task.id);
+    this.taskHistory.record(task.parentSessionID, {
+      id: task.id,
+      sessionID: task.sessionID,
+      agent: task.agent,
+      description: task.description,
+      status: "stopped",
+      category: task.category,
+      startedAt: task.startedAt,
+      completedAt: task.completedAt
+    });
+    const existingTimer = this.completionTimers.get(task.id);
+    if (existingTimer) {
+      clearTimeout(existingTimer);
+      this.completionTimers.delete(task.id);
+    }
+    const idleTimer = this.idleDeferralTimers.get(task.id);
+    if (idleTimer) {
+      clearTimeout(idleTimer);
+      this.idleDeferralTimers.delete(task.id);
+    }
+    this.cleanupPendingByParent(task);
+    this.markForNotification(task);
+    try {
+      await this.enqueueNotificationForParent(task.parentSessionID, () => this.notifyParentSession(task));
+    } catch (err) {
+      log("[background-agent] Error in notifyParentSession for stopped task:", { taskId: task.id, error: err });
+    }
+  }
+  decrementNestedActive(task) {
+    if (!this.nestedBypassTaskIds.has(task.id))
+      return;
+    this.nestedBypassTaskIds.delete(task.id);
+    const key = task.concurrencyGroup ?? task.concurrencyKey;
+    if (!key)
+      return;
+    const current = this.nestedActive.get(key) ?? 0;
+    if (current > 0) {
+      this.nestedActive.set(key, current - 1);
+    }
+  }
   async startTask(item) {
     const { task, input } = item;
     log("[background-agent] Starting task:", {
@@ -94179,6 +95177,7 @@ class BackgroundManager {
     task.concurrencyKey = concurrencyKey;
     task.concurrencyGroup = concurrencyKey;
     this.persistHandle(task);
+    this.armWallclock(task);
     this.taskHistory.record(input.parentSessionID, { id: task.id, sessionID, agent: input.agent, description: input.description, status: "running", category: input.category, startedAt: task.startedAt });
     this.startPolling();
     log("[background-agent] Launching task:", { taskId: task.id, sessionID, agent: input.agent });
@@ -94231,6 +95230,7 @@ class BackgroundManager {
         }
         existingTask.completedAt = new Date;
         this.persistHandle(existingTask);
+        this.disarmWallclock(existingTask.id);
         if (existingTask.concurrencyKey) {
           this.concurrencyManager.release(existingTask.concurrencyKey);
           existingTask.concurrencyKey = undefined;
@@ -94381,6 +95381,7 @@ class BackgroundManager {
     }
     existingTask.startedAt = new Date;
     this.persistHandle(existingTask);
+    this.armWallclock(existingTask);
     existingTask.progress = {
       toolCalls: existingTask.progress?.toolCalls ?? 0,
       lastUpdate: new Date
@@ -94437,6 +95438,7 @@ class BackgroundManager {
       existingTask.error = errorMessage;
       existingTask.completedAt = new Date;
       this.persistHandle(existingTask);
+      this.disarmWallclock(existingTask.id);
       if (existingTask.concurrencyKey) {
         this.concurrencyManager.release(existingTask.concurrencyKey);
         existingTask.concurrencyKey = undefined;
@@ -94452,6 +95454,158 @@ class BackgroundManager {
     });
     return existingTask;
   }
+  async revive(input) {
+    const id = input.taskId ?? input.sessionId ?? "";
+    let task = input.taskId !== undefined ? this.tasks.get(input.taskId) : undefined;
+    if (!task && input.sessionId !== undefined)
+      task = this.findBySession(input.sessionId);
+    if (task?.status === "running") {
+      log("[background-agent] Revive skipped - task already running:", { taskId: task.id, sessionID: task.sessionID });
+      return task;
+    }
+    const guidance = { active: `Task ${id} is still active; use background_output to inspect it.`, uncertain: `Task ${id} has unknown liveness; re-run with force: true to acknowledge this.`, "no-session": `Task ${id} has no session to revive (it never produced one, e.g. it was queue-saturated).`, "unknown-task": `Task ${id} is not revivable (unrecognised state).`, expired: `Task ${id} is not revivable (unrecognised state).` };
+    if (!task) {
+      const handle = findRevivableHandle(readHandles(this.directory), { taskId: input.taskId, sessionId: input.sessionId });
+      if (!handle)
+        throw new Error(`Task not found for revive: ${id}. It may have expired (handles are retained 30 minutes) or never existed.`);
+      const handleEligibility = classifyRevivable(handle, { force: input.force });
+      if (!handleEligibility.eligible)
+        throw new Error(guidance[handleEligibility.reason]);
+      task = toReviveTask(handle, input.prompt);
+    } else {
+      task.prompt = input.prompt;
+      const taskEligibility = classifyRevivable(task, { force: input.force });
+      if (!taskEligibility.eligible)
+        throw new Error(guidance[taskEligibility.reason]);
+    }
+    if (!task.sessionID)
+      throw new Error(`Task has no sessionID: ${task.id}`);
+    const sessionID = task.sessionID;
+    const completionTimer = this.completionTimers.get(task.id);
+    if (completionTimer) {
+      clearTimeout(completionTimer);
+      this.completionTimers.delete(task.id);
+    }
+    task.status = "pending";
+    task.parentSessionID = input.parentSessionID;
+    task.parentMessageID = input.parentMessageID;
+    if (input.parentModel !== undefined)
+      task.parentModel = input.parentModel;
+    if (input.parentAgent !== undefined)
+      task.parentAgent = input.parentAgent;
+    if (input.parentTools !== undefined)
+      task.parentTools = input.parentTools;
+    this.tasks.set(task.id, task);
+    this.taskHistory.record(task.parentSessionID, { id: task.id, sessionID, agent: task.agent, description: task.description, status: "pending", startedAt: task.startedAt });
+    const pending = this.pendingByParent.get(task.parentSessionID) ?? new Set;
+    pending.add(task.id);
+    this.pendingByParent.set(task.parentSessionID, pending);
+    const key = task.concurrencyGroup ?? task.agent;
+    const maxDepth = this.config?.nestedAdmission?.maxDepth ?? DEFAULT_NESTED_MAX_DEPTH;
+    const admissionTimeoutMs = this.config?.admissionTimeoutMs ?? DEFAULT_ADMISSION_TIMEOUT_MS;
+    const nestedEnabled = this.config?.nestedAdmission?.enabled ?? DEFAULT_NESTED_ADMISSION_ENABLED;
+    const nestedMode = this.config?.nestedAdmission?.mode ?? DEFAULT_NESTED_ADMISSION_MODE;
+    const admission = classifyAdmission(input.parentSessionID, maxDepth);
+    log("[background-agent] Reviving task:", { taskId: task.id, admission: admission.kind, key });
+    let slotHeld = true;
+    if (admission.kind === "nested" && nestedEnabled) {
+      let bypass = true;
+      if (nestedMode === "reserve") {
+        const reserved = await this.concurrencyManager.acquireWithDeadline(key, NESTED_RESERVE_ATTEMPT_TIMEOUT_MS);
+        if (reserved.granted) {
+          bypass = false;
+        } else if (reserved.reason === "cancelled") {
+          task.status = "cancelled";
+          this.persistHandle(task);
+          throw new Error(`Revive admission cancelled for task ${task.id}.`);
+        }
+      }
+      if (bypass) {
+        const active = this.nestedActive.get(key) ?? 0;
+        if (active >= maxDepth) {
+          const depthMessage = `Nested admission depth exceeded (maxDepth ${maxDepth}, key "${key}")`;
+          await this.terminateQueuedTask(task, "nested-depth-exceeded", depthMessage);
+          throw new Error(depthMessage);
+        }
+        this.nestedActive.set(key, active + 1);
+        this.nestedBypassTaskIds.add(task.id);
+        slotHeld = false;
+      }
+    } else {
+      const outcome = await this.concurrencyManager.acquireWithDeadline(key, admissionTimeoutMs);
+      if (!outcome.granted) {
+        if (outcome.reason === "cancelled") {
+          task.status = "cancelled";
+          this.persistHandle(task);
+          throw new Error(`Revive admission cancelled for task ${task.id}.`);
+        }
+        const errorMessage = `Queue admission timed out after ${outcome.waitedMs}ms (key "${key}", limit ${this.concurrencyManager.getConcurrencyLimit(key)})`;
+        await this.terminateQueuedTask(task, "queue-saturated", errorMessage);
+        throw new Error(errorMessage);
+      }
+    }
+    task.concurrencyGroup = key;
+    task.concurrencyKey = slotHeld ? key : undefined;
+    task.status = "running";
+    task.startedAt = new Date;
+    task.completedAt = undefined;
+    task.error = undefined;
+    task.progress = { toolCalls: task.progress?.toolCalls ?? 0, lastUpdate: new Date };
+    this.persistHandle(task);
+    this.armWallclock(task);
+    registerSubagentSession(sessionID, input.parentSessionID);
+    this.startPolling();
+    const toastManager = getTaskToastManager();
+    if (toastManager)
+      toastManager.addTask({ id: task.id, description: task.description, agent: task.agent, isBackground: true });
+    const tools = { task: false, delegate_agent: true, question: false, ...getAgentToolRestrictions(task.agent) };
+    setSessionTools(sessionID, tools);
+    const reviveModel = task.model ? { providerID: task.model.providerID, modelID: task.model.modelID } : undefined;
+    const reviveVariant = task.model?.variant;
+    this.client.session.promptAsync({
+      path: { id: sessionID },
+      body: { agent: task.agent, ...reviveModel ? { model: reviveModel } : {}, ...reviveVariant ? { variant: reviveVariant } : {}, tools, parts: [{ type: "text", text: input.prompt }] }
+    }).catch((error95) => {
+      log("[background-agent] revive prompt error:", error95);
+      task.status = "interrupt";
+      task.error = error95 instanceof Error ? error95.message : String(error95);
+      task.completedAt = new Date;
+      this.persistHandle(task);
+      this.disarmWallclock(task.id);
+      this.decrementNestedActive(task);
+      if (task.concurrencyKey) {
+        this.concurrencyManager.release(task.concurrencyKey);
+        task.concurrencyKey = undefined;
+      }
+      this.abortSessionQuietly(sessionID, "revive-error");
+      this.markForNotification(task);
+      this.cleanupPendingByParent(task);
+      this.enqueueNotificationForParent(task.parentSessionID, () => this.notifyParentSession(task)).catch((err) => {
+        log("[background-agent] Failed to notify on revive error:", err);
+      });
+    });
+    return task;
+  }
+  listRevivable(parentSessionID) {
+    const seen = new Set;
+    const rows = [];
+    const consider = (id, parent, description, agent, status, sessionID, terminalReason, ts) => {
+      if (seen.has(id) || sessionID === undefined)
+        return;
+      if (parentSessionID !== undefined && parent !== parentSessionID)
+        return;
+      if (!classifyRevivable({ status, sessionID }, {}).eligible)
+        return;
+      seen.add(id);
+      rows.push({ taskId: id, description, agent, status, sessionID, terminalReason, ts });
+    };
+    for (const task of this.tasks.values())
+      consider(task.id, task.parentSessionID, task.description, task.agent, task.status, task.sessionID, task.terminalReason, task.completedAt?.getTime() ?? task.startedAt?.getTime() ?? task.queuedAt?.getTime() ?? 0);
+    for (const handle of readHandles(this.directory))
+      consider(handle.taskId, handle.parentSessionID, handle.description, handle.agent, handle.status, handle.sessionID, handle.terminalReason, handle.completedAt ?? handle.startedAt ?? handle.queuedAt ?? 0);
+    rows.sort((a, b) => b.ts - a.ts);
+    return rows.map((row) => ({ taskId: row.taskId, description: row.description, agent: row.agent, status: row.status, sessionID: row.sessionID, terminalReason: row.terminalReason }));
+  }
   async checkSessionTodos(sessionID) {
     try {
       const response = await this.client.session.todo({
@@ -94576,12 +95730,12 @@ class BackgroundManager {
           log("[background-agent] Session.idle but no valid output yet, waiting:", task.id);
           return;
         }
-        const hasIncompleteTodos2 = await this.checkSessionTodos(sessionID);
+        const hasIncompleteTodos3 = await this.checkSessionTodos(sessionID);
         if (task.status !== "running") {
           log("[background-agent] Task status changed during todo check, skipping:", { taskId: task.id, status: task.status });
           return;
         }
-        if (hasIncompleteTodos2) {
+        if (hasIncompleteTodos3) {
           log("[background-agent] Task has incomplete todos, waiting for todo-continuation:", task.id);
           return;
         }
@@ -94602,11 +95756,13 @@ class BackgroundManager {
       task.error = errorMessage ?? "Session error";
       task.completedAt = new Date;
       this.persistHandle(task);
+      this.disarmWallclock(task.id);
       this.taskHistory.record(task.parentSessionID, { id: task.id, sessionID: task.sessionID, agent: task.agent, description: task.description, status: "error", category: task.category, startedAt: task.startedAt, completedAt: task.completedAt });
       if (task.concurrencyKey) {
         this.concurrencyManager.release(task.concurrencyKey);
         task.concurrencyKey = undefined;
       }
+      this.decrementNestedActive(task);
       const completionTimer = this.completionTimers.get(task.id);
       if (completionTimer) {
         clearTimeout(completionTimer);
@@ -94620,6 +95776,7 @@ class BackgroundManager {
       this.cleanupPendingByParent(task);
       this.tasks.delete(task.id);
       this.clearNotificationsForTask(task.id);
+      this.refreshParentWake(task.parentSessionID);
       const toastManager = getTaskToastManager();
       if (toastManager) {
         toastManager.removeTask(task.id);
@@ -94691,31 +95848,7 @@ class BackgroundManager {
     this.notifications.delete(sessionID);
   }
   async validateSessionHasOutput(sessionID) {
-    try {
-      const response = await this.client.session.messages({
-        path: { id: sessionID }
-      });
-      const messages2 = normalizeSDKResponse(response, [], { preferResponseOnMissingData: true });
-      const hasAssistantOrToolMessage = messages2.some((m) => m.info?.role === "assistant" || m.info?.role === "tool");
-      if (!hasAssistantOrToolMessage) {
-        log("[background-agent] No assistant/tool messages found in session:", sessionID);
-        return false;
-      }
-      const hasContent2 = messages2.some((m) => {
-        if (m.info?.role !== "assistant" && m.info?.role !== "tool")
-          return false;
-        const parts = m.parts ?? [];
-        return parts.some((p) => p.type === "text" && p.text && p.text.trim().length > 0 || p.type === "reasoning" && p.text && p.text.trim().length > 0 || p.type === "tool" || p.type === "tool_result" && p.content && (typeof p.content === "string" ? p.content.trim().length > 0 : p.content.length > 0));
-      });
-      if (!hasContent2) {
-        log("[background-agent] Messages exist but no content found in session:", sessionID);
-        return false;
-      }
-      return true;
-    } catch (error95) {
-      log("[background-agent] Error validating session output:", error95);
-      return true;
-    }
+    return validateSessionHasOutput(this.client, sessionID);
   }
   clearNotificationsForTask(taskId) {
     for (const [sessionID, tasks] of this.notifications.entries()) {
@@ -94738,6 +95871,27 @@ class BackgroundManager {
       }
     }
   }
+  refreshParentWake(parentSessionID) {
+    if (this.config?.wakeScheduler?.enabled === false)
+      return;
+    const readState2 = () => ({
+      hasPendingChildren: (this.pendingByParent.get(parentSessionID)?.size ?? 0) > 0,
+      hasUndeliveredNotifications: (this.notifications.get(parentSessionID)?.length ?? 0) > 0
+    });
+    if (!shouldWakeForParent(readState2())) {
+      this.wakeScheduler.clear(parentSessionID);
+      return;
+    }
+    this.wakeScheduler.schedule(parentSessionID, {
+      intervalMs: resolveWakeIntervalMs(this.config?.wakeScheduler),
+      readState: readState2,
+      deliverWake: async () => {
+        await this.enqueueNotificationForParent(parentSessionID, async () => {
+          await this.client.session.promptAsync({ path: { id: parentSessionID }, body: { noReply: true, parts: [{ type: "text", text: WAKE_REMINDER_TEXT }] } });
+        });
+      }
+    });
+  }
   abortSessionQuietly(sessionID, context) {
     this.client.session.abort({ path: { id: sessionID } }).catch((err) => {
       log(`[background-agent] Session abort failed${context ? ` (${context})` : ""}:`, {
@@ -94771,6 +95925,7 @@ class BackgroundManager {
     task.status = "cancelled";
     task.completedAt = new Date;
     this.persistHandle(task);
+    this.disarmWallclock(task.id);
     if (reason) {
       task.error = reason;
     }
@@ -94779,6 +95934,7 @@ class BackgroundManager {
       this.concurrencyManager.release(task.concurrencyKey);
       task.concurrencyKey = undefined;
     }
+    this.decrementNestedActive(task);
     const existingTimer = this.completionTimers.get(task.id);
     if (existingTimer) {
       clearTimeout(existingTimer);
@@ -94805,6 +95961,7 @@ class BackgroundManager {
     try {
       await this.enqueueNotificationForParent(task.parentSessionID, () => this.notifyParentSession(task));
       log(`[background-agent] Task cancelled via ${source}:`, task.id);
+      this.refreshParentWake(task.parentSessionID);
     } catch (err) {
       log("[background-agent] Error in notifyParentSession for cancelled task:", { taskId: task.id, error: err });
     }
@@ -94893,12 +96050,48 @@ class BackgroundManager {
     }
     task.status = "completed";
     task.completedAt = new Date;
+    const hc = this.handoffCompression;
+    if (hc && hc.enabled !== false && task.sessionID) {
+      try {
+        const raw = await this.client.session.messages({ path: { id: task.sessionID } });
+        let msgs = [];
+        if (Array.isArray(raw)) {
+          msgs = raw;
+        } else if (raw && typeof raw === "object" && "data" in raw && Array.isArray(raw.data)) {
+          msgs = raw.data;
+        }
+        const assistantMsgs = msgs.filter((m) => m.info?.role === "assistant");
+        const maxMsgs = hc?.maxMessages ?? 6;
+        const keepFirst = hc?.keepFirst ?? 2;
+        const keepLast = hc?.keepLast ?? 3;
+        if (assistantMsgs.length > maxMsgs) {
+          const first = assistantMsgs.slice(0, keepFirst);
+          const last = assistantMsgs.slice(-keepLast);
+          const extractText = (msgs2) => msgs2.map((m) => m.parts?.filter((p) => p.type === "text" || p.type === "reasoning").map((p) => p.text).filter(Boolean).join(`
+`) ?? "").filter(Boolean).join(`
+
+`);
+          const firstText = extractText(first);
+          const lastText = extractText(last);
+          const truncated = assistantMsgs.length - keepFirst - keepLast;
+          task.compactedResult = `${firstText}
+
+[... ${truncated} messages truncated]
+
+${lastText}`;
+        }
+      } catch (err) {
+        log("[background-agent] Handoff compression failed:", { taskId: task.id, error: err });
+      }
+    }
     this.persistHandle(task);
+    this.disarmWallclock(task.id);
     this.taskHistory.record(task.parentSessionID, { id: task.id, sessionID: task.sessionID, agent: task.agent, description: task.description, status: "completed", category: task.category, startedAt: task.startedAt, completedAt: task.completedAt });
     if (task.concurrencyKey) {
       this.concurrencyManager.release(task.concurrencyKey);
       task.concurrencyKey = undefined;
     }
+    this.decrementNestedActive(task);
     this.markForNotification(task);
     this.cleanupPendingByParent(task);
     const idleTimer = this.idleDeferralTimers.get(task.id);
@@ -94912,6 +96105,7 @@ class BackgroundManager {
     try {
       await this.enqueueNotificationForParent(task.parentSessionID, () => this.notifyParentSession(task));
       log(`[background-agent] Task completed via ${source}:`, task.id);
+      this.refreshParentWake(task.parentSessionID);
     } catch (err) {
       log("[background-agent] Error in notifyParentSession:", { taskId: task.id, error: err });
     }
@@ -95027,10 +96221,12 @@ class BackgroundManager {
         task.error = errorMessage;
         task.completedAt = new Date;
         this.persistHandle(task);
+        this.disarmWallclock(task.id);
         if (task.concurrencyKey) {
           this.concurrencyManager.release(task.concurrencyKey);
           task.concurrencyKey = undefined;
         }
+        this.decrementNestedActive(task);
         this.cleanupPendingByParent(task);
         if (wasPending) {
           const key = task.model ? `${task.model.providerID}/${task.model.modelID}` : task.agent;
@@ -95073,6 +96269,8 @@ class BackgroundManager {
         this.notifications.set(sessionID, validNotifications);
       }
     }
+    this.nestedActive.clear();
+    this.nestedBypassTaskIds.clear();
   }
   async isSessionAwaitingUser(sessionID) {
     try {
@@ -95112,10 +96310,12 @@ class BackgroundManager {
         task.error = `Stale timeout (no activity for ${staleMinutes2}min since start)`;
         task.completedAt = new Date;
         this.persistHandle(task);
+        this.disarmWallclock(task.id);
         if (task.concurrencyKey) {
           this.concurrencyManager.release(task.concurrencyKey);
           task.concurrencyKey = undefined;
         }
+        this.decrementNestedActive(task);
         this.abortSessionQuietly(sessionID, "stale-no-progress");
         log(`[background-agent] Task ${task.id} interrupted: no progress since start`);
         try {
@@ -95141,10 +96341,12 @@ class BackgroundManager {
       task.error = `Stale timeout (no activity for ${staleMinutes}min)`;
       task.completedAt = new Date;
       this.persistHandle(task);
+      this.disarmWallclock(task.id);
       if (task.concurrencyKey) {
         this.concurrencyManager.release(task.concurrencyKey);
         task.concurrencyKey = undefined;
       }
+      this.decrementNestedActive(task);
       this.abortSessionQuietly(sessionID, "stale-timeout");
       log(`[background-agent] Task ${task.id} interrupted: stale timeout`);
       try {
@@ -95182,8 +96384,8 @@ class BackgroundManager {
             }
             if (task.status !== "running")
               continue;
-            const hasIncompleteTodos2 = await this.checkSessionTodos(sessionID);
-            if (hasIncompleteTodos2) {
+            const hasIncompleteTodos3 = await this.checkSessionTodos(sessionID);
+            if (hasIncompleteTodos3) {
               log("[background-agent] Task has incomplete todos via polling, waiting:", task.id);
               continue;
             }
@@ -95239,6 +96441,12 @@ class BackgroundManager {
       clearTimeout(timer);
     }
     this.idleDeferralTimers.clear();
+    this.wakeScheduler.dispose();
+    this.wallclock.disarmAll();
+    for (const timer of this.wallclockGraceTimers.values()) {
+      clearTimeout(timer);
+    }
+    this.wallclockGraceTimers.clear();
     this.concurrencyManager.clear();
     this.tasks.clear();
     this.notifications.clear();
@@ -95246,6 +96454,8 @@ class BackgroundManager {
     this.notificationQueueByParent.clear();
     this.queuesByKey.clear();
     this.processingKeys.clear();
+    this.nestedActive.clear();
+    this.nestedBypassTaskIds.clear();
     this.unregisterProcessCleanup();
     log("[background-agent] Shutdown complete");
   }
@@ -96032,9 +97242,7 @@ class TmuxSessionManager {
 var SESSION_TIMEOUT_MS3 = 10 * 60 * 1000;
 var MIN_STABILITY_TIME_MS4 = 10 * 1000;
 // src/agents/dynamic-agent-prompt-builder.ts
-import { existsSync as existsSync75, readFileSync as readFileSync45 } from "fs";
-import { homedir as homedir11 } from "os";
-import { join as join79 } from "path";
+import { readFileSync as readFileSync45 } from "fs";
 init_logger();
 function categorizeTools(toolNames) {
   return toolNames.map((name) => {
@@ -96351,16 +97559,13 @@ function buildAntiPatternsSection() {
 ${patterns2.join(`
 `)}`;
 }
-var cachedRuntimeFull = null;
-var cachedRuntimeCompact = null;
+var cachedRuntimeFull = {};
+var cachedRuntimeCompact = {};
 var cachedFallbackFull = {};
 var cachedFallbackCompact = {};
-function hasGrepGlobToolNames(toolNames) {
-  return toolNames.some((n) => n === "grep" || n === "glob");
-}
 function fallbackFullDiscipline(hasGrepGlob) {
   const analysis = hasGrepGlob ? "| Analysis / Processing | Use ctx_* tools \u2014 NEVER raw read/bash/grep/glob for analysis |" : "| Analysis / Processing | Use ctx_* tools \u2014 NEVER raw read/bash for analysis |";
-  const search = hasGrepGlob ? "| Search | ctx_search FIRST -> grep/glob fallback |" : "| Search | ctx_search FIRST (indexed KB) -> LSP/ast_grep fallback |";
+  const search = hasGrepGlob ? "| Search | ctx_search FIRST -> grep/glob fallback |" : "| Search | ctx_search FIRST (indexed KB) -> ctx_batch_execute / ctx_execute (rg) or LSP/ast_grep fallback |";
   return `### Context Discipline (ALWAYS)
 
 | Scenario | Tool |
@@ -96377,7 +97582,7 @@ ${search}
 }
 function fallbackCompactDiscipline(hasGrepGlob) {
   const analysis = hasGrepGlob ? "| Analysis / Aggregation / Counting | ctx_batch_execute / ctx_execute(_file) \u2014 NEVER raw read/grep for analysis |" : "| Analysis / Aggregation / Counting | ctx_batch_execute / ctx_execute(_file) \u2014 NEVER raw read for analysis |";
-  const search = hasGrepGlob ? "| Search | ctx_search FIRST (indexed KB) \u2192 grep/glob fallback (raw FS) |" : "| Search | ctx_search FIRST (indexed KB) \u2192 LSP/ast_grep fallback |";
+  const search = hasGrepGlob ? "| Search | ctx_search FIRST (indexed KB) \u2192 grep/glob fallback (raw FS) |" : "| Search | ctx_search FIRST (indexed KB) \u2192 ctx_batch_execute / ctx_execute (rg) or LSP/ast_grep fallback |";
   const note = hasGrepGlob ? "Edits need prior read for LINE#ID \u2014 read\u2192edit chain exempt (non-plan paths; .matrixx/plans/*.md must use plan_read/plan_update). MUST use ctx_* when available \u2014 raw grep/read is forbidden for analysis." : "Edits need prior read for LINE#ID \u2014 read\u2192edit chain exempt (non-plan paths; .matrixx/plans/*.md must use plan_read/plan_update). MUST use ctx_* when available \u2014 raw read for analysis is forbidden.";
   return `### Context Discipline (when ctx_* available)
 
@@ -96391,69 +97596,54 @@ ${search}
 ${note}`;
 }
 function exploreCtxPart(hasGrepGlob) {
-  return hasGrepGlob ? "MUST use ctx_search for indexed hits \u2192 grep/glob fallback ONLY when ctx_* unavailable; use ctx_batch_execute / ctx_execute for multi-file analysis; use ctx_fetch_and_index for docs/web \u2192 ctx_search. Raw grep/read/glob for analysis is forbidden when ctx_* is available." : "MUST use ctx_search for indexed hits \u2192 LSP/ast_grep fallback ONLY when ctx_* unavailable; use ctx_batch_execute / ctx_execute for multi-file analysis; use ctx_fetch_and_index for docs/web \u2192 ctx_search. Raw read for analysis is forbidden when ctx_* is available.";
-}
-function resolveContextModeDisciplinePath() {
-  try {
-    const resolved = __require.resolve("context-mode/configs/opencode/AGENTS.md");
-    if (existsSync75(resolved))
-      return resolved;
-  } catch {}
-  try {
-    const cacheDir = getOpenCodeCacheDir();
-    const p = join79(cacheDir, "packages/context-mode@latest/node_modules/context-mode/configs/opencode/AGENTS.md");
-    if (existsSync75(p))
-      return p;
-  } catch {}
-  try {
-    const base = process.env.XDG_CACHE_HOME ?? join79(homedir11(), ".cache");
-    const p = join79(base, "opencode/packages/context-mode@latest/node_modules/context-mode/configs/opencode/AGENTS.md");
-    if (existsSync75(p))
-      return p;
-  } catch {}
-  try {
-    const p2 = join79(homedir11(), ".cache/opencode/packages/context-mode@latest/node_modules/context-mode/configs/opencode/AGENTS.md");
-    if (existsSync75(p2))
-      return p2;
-  } catch {}
-  return null;
+  return hasGrepGlob ? "MUST use ctx_search for indexed hits \u2192 grep/glob fallback ONLY when ctx_* unavailable; use ctx_batch_execute / ctx_execute for multi-file analysis; use ctx_fetch_and_index for docs/web \u2192 ctx_search. Raw grep/read/glob for analysis is forbidden when ctx_* is available." : "MUST use ctx_search for indexed hits \u2192 ctx_batch_execute / ctx_execute (rg) or LSP/ast_grep fallback ONLY when ctx_* unavailable; use ctx_batch_execute / ctx_execute for multi-file analysis; use ctx_fetch_and_index for docs/web \u2192 ctx_search. Raw read for analysis is forbidden when ctx_* is available.";
 }
 function stripDisciplineHeader(content) {
   return content.trim();
 }
-function loadContextModeDiscipline(hasGrepGlob = true) {
-  if (cachedRuntimeFull)
-    return cachedRuntimeFull;
-  const fallbackKey = hasGrepGlob ? "1" : "0";
-  if (cachedFallbackFull[fallbackKey])
-    return cachedFallbackFull[fallbackKey];
+function readDisciplineFile() {
+  const p = resolveContextModeDisciplinePath();
+  if (!p)
+    throw new Error("discipline file not found");
+  const raw = readFileSync45(p, "utf8");
+  let version4 = "1.0.169";
   try {
-    const p = resolveContextModeDisciplinePath();
-    if (!p)
-      throw new Error("discipline file not found");
-    const raw = readFileSync45(p, "utf8");
-    let version4 = "1.0.169";
-    try {
-      const pkgResolved = __require.resolve("context-mode/package.json");
-      const pkgRaw = readFileSync45(pkgResolved, "utf8");
-      const pkg = JSON.parse(pkgRaw);
-      if (pkg.version)
-        version4 = pkg.version;
-    } catch {}
-    const body = stripDisciplineHeader(raw);
-    const withVersion = body.includes("<!-- discipline") ? body : `${body}
+    const pkgResolved = __require.resolve("context-mode/package.json");
+    const pkgRaw = readFileSync45(pkgResolved, "utf8");
+    const pkg = JSON.parse(pkgRaw);
+    if (pkg.version)
+      version4 = pkg.version;
+  } catch {}
+  const body = stripDisciplineHeader(raw);
+  const text = body.includes("<!-- discipline") ? body : `${body}
 
 <!-- discipline v${version4} Elastic-2.0 -->`;
-    cachedRuntimeFull = withVersion;
-    log("context-discipline loaded", { path: p, version: version4 });
-    return withVersion;
+  return { text, version: version4, path: p };
+}
+function loadDiscipline(kind, hasGrepGlob = true) {
+  const fallbackKey = hasGrepGlob ? "1" : "0";
+  const runtimeCache = kind === "full" ? cachedRuntimeFull : cachedRuntimeCompact;
+  const fallbackCache = kind === "full" ? cachedFallbackFull : cachedFallbackCompact;
+  const label = kind === "full" ? "context-discipline" : "compact-discipline";
+  if (runtimeCache[fallbackKey])
+    return runtimeCache[fallbackKey];
+  if (fallbackCache[fallbackKey])
+    return fallbackCache[fallbackKey];
+  try {
+    const { text, version: version4, path: path13 } = readDisciplineFile();
+    runtimeCache[fallbackKey] = text;
+    log(`${label} loaded`, { path: path13, version: version4 });
+    return text;
   } catch (e) {
-    log("context-discipline fallback", { error: String(e) });
-    const fallback = fallbackFullDiscipline(hasGrepGlob);
-    cachedFallbackFull[fallbackKey] = fallback;
+    log(`${label} fallback`, { error: String(e) });
+    const fallback = kind === "full" ? fallbackFullDiscipline(hasGrepGlob) : fallbackCompactDiscipline(hasGrepGlob);
+    fallbackCache[fallbackKey] = fallback;
     return fallback;
   }
 }
+function loadContextModeDiscipline(hasGrepGlob = true) {
+  return loadDiscipline("full", hasGrepGlob);
+}
 function buildContextDisciplineSection(hasContextMode = false, hasGrepGlob = true) {
   if (!hasContextMode)
     return "";
@@ -96473,37 +97663,7 @@ function buildHeadroomSection(hasHeadroom = false) {
 **Headroom L4 is transport-level (CacheAligner->ContentRouter->CCR). It complements L1 RTK, L2 context-mode, L3 DCP \u2014 do not duplicate their discipline.**`;
 }
 function loadCompactContextDiscipline(hasGrepGlob = true) {
-  if (cachedRuntimeCompact)
-    return cachedRuntimeCompact;
-  const fallbackKey = hasGrepGlob ? "1" : "0";
-  if (cachedFallbackCompact[fallbackKey])
-    return cachedFallbackCompact[fallbackKey];
-  try {
-    const p = resolveContextModeDisciplinePath();
-    if (!p)
-      throw new Error("discipline file not found");
-    const raw = readFileSync45(p, "utf8");
-    let version4 = "1.0.169";
-    try {
-      const pkgResolved = __require.resolve("context-mode/package.json");
-      const pkgRaw = readFileSync45(pkgResolved, "utf8");
-      const pkg = JSON.parse(pkgRaw);
-      if (pkg.version)
-        version4 = pkg.version;
-    } catch {}
-    const body = stripDisciplineHeader(raw);
-    const withVersion = body.includes("<!-- discipline") ? body : `${body}
-
-<!-- discipline v${version4} Elastic-2.0 -->`;
-    cachedRuntimeCompact = withVersion;
-    log("compact-discipline loaded", { path: p, version: version4 });
-    return withVersion;
-  } catch (e) {
-    log("compact-discipline fallback", { error: String(e) });
-    const fallback = fallbackCompactDiscipline(hasGrepGlob);
-    cachedFallbackCompact[fallbackKey] = fallback;
-    return fallback;
-  }
+  return loadDiscipline("compact", hasGrepGlob);
 }
 function buildCompactContextDisciplineSection(hasContextMode = false, hasGrepGlob = true) {
   if (!hasContextMode)
@@ -97555,7 +98715,7 @@ function createBddContractAgent(model) {
 createBddContractAgent.mode = MODE2;
 
 // src/agents/builtin-agents/resolve-file-uri.ts
-import { existsSync as existsSync76, readFileSync as readFileSync46 } from "fs";
+import { existsSync as existsSync77, readFileSync as readFileSync46 } from "fs";
 import { homedir as homedir12 } from "os";
 import { isAbsolute as isAbsolute6, resolve as resolve10 } from "path";
 function resolvePromptAppend(promptAppend, configDir) {
@@ -97570,7 +98730,7 @@ function resolvePromptAppend(promptAppend, configDir) {
   } catch {
     return `[WARNING: Malformed file URI (invalid percent-encoding): ${promptAppend}]`;
   }
-  if (!existsSync76(filePath)) {
+  if (!existsSync77(filePath)) {
     return `[WARNING: Could not resolve file URI: ${promptAppend}]`;
   }
   try {
@@ -97924,7 +99084,7 @@ function buildKeymakerPrompt(availableAgents = [], availableTools = [], availabl
   const hardBlocks = buildHardBlocksSection();
   const antiPatterns = buildAntiPatternsSection();
   const hasContextMode = availableTools.some((t) => t.name.startsWith("ctx_"));
-  const hasGrepGlob = hasGrepGlobToolNames(availableTools.map((t) => t.name));
+  const hasGrepGlob = resolveGrepGlobUsable(availableTools.map((t) => t.name));
   const contextDiscipline = buildContextDisciplineSection(hasContextMode, hasGrepGlob);
   const hasHeadroom = availableTools.some((t) => t.name.startsWith("headroom_"));
   const headroomDiscipline = buildHeadroomSection(hasHeadroom);
@@ -98113,6 +99273,11 @@ result = task(..., run_in_background=false)  // Never wait synchronously for exp
 - Collect results with \`background_output(task_id="...")\` when needed
 - BEFORE final answer: \`background_cancel(all=true)\` to clean up
 
+**Interpreting terminal task states** \u2014 \`background_output\` and the completion \`<system-reminder>\` report one of:
+- \`completed\` / \`error\` / \`cancelled\` / \`interrupt\` \u2014 as named.
+- \`stopped\` (notification label \`STOPPED\`) \u2014 ended without a terminal result (queue-saturated, no output, or nested depth cap); partial output may exist.
+- \`statusUncertain\` (label \`STATUS UNCERTAIN\`) \u2014 liveness could not be determined after a restart; re-check with \`background_output\`, never assume success or failure.
+
 ### Search Stop Conditions
 
 STOP searching when:
@@ -98601,7 +99766,7 @@ function buildDynamicMorpheusPrompt(availableAgents, availableTools = [], availa
   const hardBlocks = buildHardBlocksSection();
   const antiPatterns = buildAntiPatternsSection();
   const hasContextMode = availableTools.some((t) => t.name.startsWith("ctx_"));
-  const hasGrepGlob = hasGrepGlobToolNames(availableTools.map((t) => t.name));
+  const hasGrepGlob = resolveGrepGlobUsable(availableTools.map((t) => t.name));
   const contextDiscipline = buildContextDisciplineSection(hasContextMode, hasGrepGlob);
   const hasHeadroom = availableTools.some((t) => t.name.startsWith("headroom_"));
   const headroomDiscipline = buildHeadroomSection(hasHeadroom);
@@ -98746,6 +99911,11 @@ result = task(..., run_in_background=false)  // Never wait synchronously for exp
 3. When results needed: \`background_output(task_id="...")\`
 4. BEFORE final answer: \`background_cancel(all=true)\`
 
+**Interpreting terminal task states** \u2014 \`background_output\` and the completion \`<system-reminder>\` report one of:
+- \`completed\` / \`error\` / \`cancelled\` / \`interrupt\` \u2014 as named.
+- \`stopped\` (notification label \`STOPPED\`) \u2014 ended without a terminal result (queue-saturated, no output, or nested depth cap); partial output may exist.
+- \`statusUncertain\` (label \`STATUS UNCERTAIN\`) \u2014 liveness could not be determined after a restart; re-check with \`background_output\`, never assume success or failure.
+
 ### Search Stop Conditions
 
 STOP searching when:
@@ -102999,12 +104169,12 @@ function setAvailableToolNames(names) {
 function getAvailableToolNames() {
   return _availableToolNames;
 }
-function injectContextDiscipline(availableToolNames, agents) {
+function injectContextDiscipline(availableToolNames, agents, contextMode) {
   const hasContextMode = availableToolNames.some((n) => n.startsWith("ctx_"));
   const hasHeadroom = availableToolNames.some((n) => n.startsWith("headroom_"));
   if (!(hasContextMode || hasHeadroom))
     return;
-  const hasGrepGlob = hasGrepGlobToolNames(availableToolNames);
+  const hasGrepGlob = resolveGrepGlobUsable(availableToolNames, contextMode ?? getContextModeForPrompts());
   const exploreAgents = new Set(["trinity", "operator", "seraph", "smith", "merovingian", "construct", "bdd-contract"]);
   for (const [name, cfg] of Object.entries(agents)) {
     if (name === "morpheus" || name === "keymaker")
@@ -103045,6 +104215,7 @@ async function applyAgentConfig(params) {
     disabledSkills.add("tdd-enforcer");
   }
   const useTaskSystem = isTaskSystemEnabled(params.pluginConfig);
+  setContextModeForPrompts(params.pluginConfig.context_mode);
   const availableToolNames = getAvailableToolNames();
   const builtinAgents = await createBuiltinAgents(migratedDisabledAgents, params.pluginConfig.agents, params.ctx.directory, undefined, params.pluginConfig.categories, allDiscoveredSkills, params.ctx.client, browserProvider, currentModel, disabledSkills, useTaskSystem, params.pluginConfig.global_model, availableToolNames);
   const rawPluginAgents = params.pluginComponents.agents;
@@ -103120,7 +104291,7 @@ async function applyAgentConfig(params) {
     params.config.agent = reorderAgentsByPriority(params.config.agent);
   }
   if (params.config.agent) {
-    injectContextDiscipline(availableToolNames, params.config.agent);
+    injectContextDiscipline(availableToolNames, params.config.agent, params.pluginConfig.context_mode);
   }
   const agentResult = params.config.agent;
   log("[config-handler] agents loaded", { agentKeys: Object.keys(agentResult) });
@@ -103457,6 +104628,7 @@ function createManagers(args) {
   const tmuxSessionManager = new TmuxSessionManager(ctx, tmuxConfig);
   const backgroundManager = new BackgroundManager(ctx, pluginConfig.background_task, {
     tmuxConfig,
+    handoffCompression: pluginConfig.dcp?.handoffCompression,
     onSubagentSessionCreated: async (event) => {
       log("[index] onSubagentSessionCreated callback received", {
         sessionID: event.sessionID,
@@ -103554,7 +104726,7 @@ function filterDisabledTools(tools, disabledTools) {
 // src/plugin/tool-registry.ts
 function createToolRegistry(args) {
   const { ctx, pluginConfig, managers, skillContext, availableCategories } = args;
-  const backgroundTools = createBackgroundTools(managers.backgroundManager, ctx.client);
+  const backgroundTools = createBackgroundTools(managers.backgroundManager, ctx.client, ctx.directory);
   const delegateAgent = createDelegateAgent(ctx, managers.backgroundManager, pluginConfig.disabled_agents ?? []);
   const isMultimodalLookerEnabled = !(pluginConfig.disabled_agents ?? []).some((agent) => agent.toLowerCase() === "construct");
   const lookAt = isMultimodalLookerEnabled ? createLookAt(ctx) : null;
@@ -103834,6 +105006,20 @@ var CircuitBreakerConfigSchema = exports_external.object({
   maxToolCalls: exports_external.number().int().min(10).optional(),
   consecutiveThreshold: exports_external.number().int().min(5).optional()
 });
+var NestedAdmissionConfigSchema = exports_external.object({
+  enabled: exports_external.boolean().optional(),
+  mode: exports_external.enum(["bypass", "reserve"]).optional(),
+  maxDepth: exports_external.number().int().min(1).max(5).optional()
+});
+var WakeSchedulerConfigSchema = exports_external.object({
+  enabled: exports_external.boolean().optional(),
+  intervalMs: exports_external.number().min(60000).optional()
+});
+var JobBoardConfigSchema = exports_external.object({
+  enabled: exports_external.boolean().optional(),
+  strategy: exports_external.enum(["latest", "checkpoint-compatible"]).optional(),
+  maxRetainedSnapshots: exports_external.number().int().min(1).max(100).optional()
+});
 var BackgroundTaskConfigSchema = exports_external.object({
   defaultConcurrency: exports_external.number().min(1).optional(),
   providerConcurrency: exports_external.record(exports_external.string(), exports_external.number().min(0)).optional(),
@@ -103841,7 +105027,13 @@ var BackgroundTaskConfigSchema = exports_external.object({
   staleTimeoutMs: exports_external.number().min(60000).optional(),
   messageStalenessTimeoutMs: exports_external.number().min(60000).optional(),
   maxToolCalls: exports_external.number().int().min(10).optional(),
-  circuitBreaker: CircuitBreakerConfigSchema.optional()
+  circuitBreaker: CircuitBreakerConfigSchema.optional(),
+  admissionTimeoutMs: exports_external.union([exports_external.literal(0), exports_external.number().min(60000)]).optional(),
+  nestedAdmission: NestedAdmissionConfigSchema.optional(),
+  wakeScheduler: WakeSchedulerConfigSchema.optional(),
+  jobBoard: JobBoardConfigSchema.optional(),
+  wallClockTimeoutMs: exports_external.union([exports_external.literal(0), exports_external.number().int().min(60000).max(2147483647)]).optional(),
+  wallClockAbortGraceMs: exports_external.number().int().min(1000).max(60000).optional()
 });
 // src/config/schema/browser-automation.ts
 var BrowserAutomationProviderSchema = exports_external.enum([
@@ -103915,7 +105107,7 @@ var CommentCheckerConfigSchema = exports_external.object({
 var ContextModeConfigSchema = exports_external.object({
   enabled: exports_external.boolean().default(true),
   enforce: exports_external.boolean().default(false),
-  blocked_tools: exports_external.array(exports_external.string()).default(["read", "grep", "glob"])
+  blocked_tools: exports_external.array(exports_external.string()).default(["grep", "glob"])
 });
 // src/config/schema/evolution.ts
 var EvolutionWatcherConfigSchema = exports_external.object({
@@ -105210,6 +106402,7 @@ var MatrixxPlugin = async (ctx) => {
   injectServerAuthIntoClient(ctx.client);
   startBackgroundCheck();
   const pluginConfig = await loadPluginConfig(ctx.directory, ctx);
+  setContextModeForPrompts(pluginConfig.context_mode);
   const disabledHooks = new Set(pluginConfig.disabled_hooks ?? []);
   const isHookEnabled = (hookName) => !disabledHooks.has(hookName);
   const safeHookEnabled = pluginConfig.experimental?.safe_hook_creation ?? true;