oh-my-opencode 5.0.0-beta.30 → 5.0.0-beta.31

package/dist/index.js

@@ -5449,7 +5449,7 @@ var init_git_master = __esm(() => {
 
 // packages/omo-config-core/src/schema/memory.ts
 import * as z8 from "zod";
-var OmoMemoryReflectionTriggerSchema, OmoMemoryReflectionSchema, OmoMemorySyncSchema, OmoMemorySearchSchema, OmoMemoryNudgeSchema, OmoMemoryFactsSchema, OmoMemoryDreamSchema, OmoMemoryPeopleSchema, OmoMemorySoulSchema, OmoMemoryWriteNoticeSchema, OmoMemoryReflectionTriggerLayerSchema, OmoMemoryReflectionLayerSchema, OmoMemorySyncLayerSchema, OmoMemorySearchLayerSchema, OmoMemoryNudgeLayerSchema, OmoMemoryFactsLayerSchema, OmoMemoryDreamLayerSchema, OmoMemoryPeopleLayerSchema, OmoMemorySoulLayerSchema, OmoMemoryWriteNoticeLayerSchema, OmoMemoryAgentOverridesSchema, OmoMemorySettingsSchema, OmoMemorySettingsLayerSchema;
+var OmoMemoryReflectionTriggerSchema, OmoMemoryReflectionSchema, OmoMemorySyncSchema, OmoMemorySearchSchema, OmoMemoryRecallSchema, OmoMemoryNudgeSchema, OmoMemoryFactsSchema, OmoMemoryDreamSchema, OmoMemoryPeopleSchema, OmoMemorySoulSchema, OmoMemoryWriteNoticeSchema, OmoMemoryReflectionTriggerLayerSchema, OmoMemoryReflectionLayerSchema, OmoMemorySyncLayerSchema, OmoMemorySearchLayerSchema, OmoMemoryRecallLayerSchema, OmoMemoryNudgeLayerSchema, OmoMemoryFactsLayerSchema, OmoMemoryDreamLayerSchema, OmoMemoryPeopleLayerSchema, OmoMemorySoulLayerSchema, OmoMemoryWriteNoticeLayerSchema, OmoMemoryAgentOverridesSchema, OmoMemorySettingsSchema, OmoMemorySettingsLayerSchema;
 var init_memory = __esm(() => {
   OmoMemoryReflectionTriggerSchema = z8.object({
     step_count: z8.number().int().nonnegative().default(25),
@@ -5470,6 +5470,14 @@ var init_memory = __esm(() => {
   OmoMemorySearchSchema = z8.object({
     enabled: z8.boolean().default(true)
   }).strict();
+  OmoMemoryRecallSchema = z8.object({
+    enabled: z8.boolean().default(true),
+    max_items: z8.number().int().min(1).max(5).default(2),
+    budget_tokens: z8.number().int().positive().default(600),
+    excerpt_chars: z8.number().int().positive().default(200),
+    min_score: z8.number().optional(),
+    exclude: z8.array(z8.string()).default([])
+  }).strict();
   OmoMemoryNudgeSchema = z8.object({
     enabled: z8.boolean().default(true),
     every_user_turns: z8.number().int().min(1).default(10)
@@ -5516,6 +5524,14 @@ var init_memory = __esm(() => {
   OmoMemorySearchLayerSchema = z8.object({
     enabled: z8.boolean().optional()
   }).strict();
+  OmoMemoryRecallLayerSchema = z8.object({
+    enabled: z8.boolean().optional(),
+    max_items: z8.number().int().min(1).max(5).optional(),
+    budget_tokens: z8.number().int().positive().optional(),
+    excerpt_chars: z8.number().int().positive().optional(),
+    min_score: z8.number().optional(),
+    exclude: z8.array(z8.string()).optional()
+  }).strict();
   OmoMemoryNudgeLayerSchema = z8.object({
     enabled: z8.boolean().optional(),
     every_user_turns: z8.number().int().min(1).optional()
@@ -5555,6 +5571,7 @@ var init_memory = __esm(() => {
     write_notice: OmoMemoryWriteNoticeLayerSchema.optional(),
     sync: OmoMemorySyncLayerSchema.optional(),
     search: OmoMemorySearchLayerSchema.optional(),
+    recall: OmoMemoryRecallLayerSchema.optional(),
     compile_warn_tokens: z8.number().int().positive().optional()
   }).strict();
   OmoMemorySettingsSchema = z8.object({
@@ -5584,6 +5601,13 @@ var init_memory = __esm(() => {
     write_notice: OmoMemoryWriteNoticeSchema.default({ enabled: true }),
     sync: OmoMemorySyncSchema.default({ enabled: true }),
     search: OmoMemorySearchSchema.default({ enabled: true }),
+    recall: OmoMemoryRecallSchema.default({
+      enabled: true,
+      max_items: 2,
+      budget_tokens: 600,
+      excerpt_chars: 200,
+      exclude: []
+    }),
     compile_warn_tokens: z8.number().int().positive().default(30000),
     agents: z8.record(z8.string(), OmoMemoryAgentOverridesSchema).default({})
   }).strict();
@@ -5600,6 +5624,7 @@ var init_memory = __esm(() => {
     write_notice: OmoMemoryWriteNoticeLayerSchema.optional(),
     sync: OmoMemorySyncLayerSchema.optional(),
     search: OmoMemorySearchLayerSchema.optional(),
+    recall: OmoMemoryRecallLayerSchema.optional(),
     compile_warn_tokens: z8.number().int().positive().optional(),
     agents: z8.record(z8.string(), OmoMemoryAgentOverridesSchema).optional()
   }).strict();
@@ -5634,11 +5659,11 @@ function resolveOmoTaskSettings(input, resolveParallelism = availableParallelism
   const record8 = z10.record(z10.string(), z10.unknown()).parse(input);
   return OmoTaskSettingsSchema.parse({
     ...record8,
-    residency_max_children: record8["residency_max_children"] ?? Math.max(8, resolveParallelism() * 3),
+    residency_max_children: record8["residency_max_children"] ?? Math.min(DEFAULT_RESIDENCY_MAX_CHILDREN, Math.max(8, resolveParallelism() * 2)),
     global_concurrency: record8["global_concurrency"] ?? Math.max(8, resolveParallelism() * 2)
   });
 }
-var ResidencyMaxChildrenInputSchema, OmoTaskWaitSchema, OmoTaskTeamSettingsSchema, OmoTaskWarningsSchema, OmoTaskDagSettingsSchema, OmoTaskSettingsSchema, OmoTaskDagSettingsLayerSchema, OmoTaskWaitLayerSchema, OmoTaskTeamSettingsLayerSchema, OmoTaskWarningsLayerSchema, OmoTaskSettingsLayerSchema;
+var DEFAULT_RESIDENCY_MAX_CHILDREN = 16, ResidencyMaxChildrenInputSchema, OmoTaskWaitSchema, OmoTaskTeamSettingsSchema, OmoTaskWarningsSchema, OmoTaskDagSettingsSchema, OmoTaskSettingsSchema, OmoTaskDagSettingsLayerSchema, OmoTaskWaitLayerSchema, OmoTaskTeamSettingsLayerSchema, OmoTaskWarningsLayerSchema, OmoTaskSettingsLayerSchema;
 var init_task = __esm(() => {
   ResidencyMaxChildrenInputSchema = z10.union([z10.number().int().nonnegative(), z10.literal("unlimited")]);
   OmoTaskWaitSchema = z10.object({
@@ -11999,7 +12024,6 @@ function extractPromptFailureMessage(error) {
     try {
       return JSON.stringify(error);
     } catch (stringifyError) {
-      stringifyError instanceof Error;
       return "";
     }
   }
@@ -24366,6 +24390,33 @@ var AGENT_MODEL_REQUIREMENTS = {
       { providers: ["opencode-go"], model: "glm-5.2" }
     ]
   },
+  "omo-senpi-code-reviewer": {
+    fallbackChain: [
+      { providers: ["openai", "openai-codex"], model: "gpt-5.6-terra", variant: "medium" },
+      { providers: ["github-copilot"], model: "gpt-5.6-terra", variant: "medium" },
+      { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-4-6" },
+      { providers: ["opencode-go"], model: "glm-5.2" },
+      { providers: ["kimi-for-coding"], model: "kimi-k3" }
+    ]
+  },
+  "omo-senpi-qa-executor": {
+    fallbackChain: [
+      { providers: ["openai", "openai-codex"], model: "gpt-5.6-luna", variant: "high" },
+      { providers: ["github-copilot"], model: "gpt-5.6-luna", variant: "high" },
+      { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-4-6" },
+      { providers: ["opencode-go"], model: "glm-5.2" },
+      { providers: ["kimi-for-coding"], model: "kimi-k3" }
+    ]
+  },
+  "omo-senpi-gate-reviewer": {
+    fallbackChain: [
+      { providers: ["openai", "openai-codex"], model: "gpt-5.6-sol", variant: "low" },
+      { providers: ["github-copilot"], model: "gpt-5.6-sol", variant: "low" },
+      { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-5", variant: "max" },
+      { providers: ["opencode-go"], model: "glm-5.2" },
+      { providers: ["kimi-for-coding"], model: "kimi-k3" }
+    ]
+  },
   atlas: {
     fallbackChain: [
       { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-5" },
@@ -24955,7 +25006,7 @@ function normalizeCapabilitiesReasoningEfforts(capabilities) {
   }
   return capabilities.reasoningEfforts.map((value) => value.toLowerCase());
 }
-function resolveField(normalized, familyCaps, ladder, familyKnown, metadataOverride, familyAliases) {
+function resolveField(normalized, familyCaps, familyKnown, metadataOverride, familyAliases) {
   const aliased = familyAliases?.[normalized];
   if (aliased && (metadataOverride?.includes(aliased) || familyCaps?.includes(aliased))) {
     return { value: aliased, reason: "unsupported-by-model-family" };
@@ -24990,7 +25041,7 @@ function resolveCompatibleModelSettings(input) {
   let variant = input.desired.variant;
   if (variant !== undefined) {
     const normalized = variant.toLowerCase();
-    const resolved = resolveField(normalized, family?.variants, REASONING_LEVELS2, familyKnown, metadataVariants);
+    const resolved = resolveField(normalized, family?.variants, familyKnown, metadataVariants);
     if (resolved.value !== normalized && resolved.reason) {
       changes.push({ field: "variant", from: variant, to: resolved.value, reason: resolved.reason });
     }
@@ -24999,7 +25050,7 @@ function resolveCompatibleModelSettings(input) {
   let reasoningEffort = input.desired.reasoningEffort;
   if (reasoningEffort !== undefined) {
     const normalized = reasoningEffort.toLowerCase();
-    const resolved = resolveField(normalized, family?.reasoningEfforts, REASONING_LEVELS2, familyKnown, metadataReasoningEfforts, family?.reasoningEffortAliases);
+    const resolved = resolveField(normalized, family?.reasoningEfforts, familyKnown, metadataReasoningEfforts, family?.reasoningEffortAliases);
     if (resolved.value !== normalized && resolved.reason) {
       changes.push({ field: "reasoningEffort", from: reasoningEffort, to: resolved.value, reason: resolved.reason });
     }
@@ -27343,6 +27394,7 @@ var BackgroundTaskConfigSchema = z20.object({
   providerConcurrency: z20.record(z20.string(), z20.number().min(0)).optional(),
   modelConcurrency: z20.record(z20.string(), z20.number().min(0)).optional(),
   maxDepth: z20.number().int().min(1).optional(),
+  maxLiveDescendantsPerRoot: z20.number().int().min(0).optional(),
   staleTimeoutMs: z20.number().min(60000).optional(),
   messageStalenessTimeoutMs: z20.number().min(60000).optional(),
   taskTtlMs: z20.number().min(300000).optional(),
@@ -85494,7 +85546,7 @@ var getUrl = ({ baseUrl, path: path7, query, querySerializer, url: _url }) => {
 };
 
 // node_modules/.bun/@opencode-ai+sdk@1.18.22/node_modules/@opencode-ai/sdk/dist/gen/client/utils.gen.js
-var createQuerySerializer = ({ allowReserved, array: array7, object: object15 } = {}) => {
+var createQuerySerializer = ({ allowReserved, array: array8, object: object15 } = {}) => {
   const querySerializer = (queryParams) => {
     const search = [];
     if (queryParams && typeof queryParams === "object") {
@@ -85510,7 +85562,7 @@ var createQuerySerializer = ({ allowReserved, array: array7, object: object15 }
             name,
             style: "form",
             value,
-            ...array7
+            ...array8
           });
           if (serializedArray)
             search.push(serializedArray);
@@ -87109,7 +87161,6 @@ function extractMessage2(error) {
     try {
       return JSON.stringify(error);
     } catch (stringifyError) {
-      stringifyError instanceof Error;
       return "";
     }
   }
@@ -90765,7 +90816,6 @@ async function hasIncompleteTodos(ctx, sessionID) {
       return false;
     return todos.some((todo) => todo.status !== "completed" && todo.status !== "cancelled");
   } catch (todoError) {
-    todoError instanceof Error;
     return false;
   }
 }
@@ -92550,9 +92600,7 @@ async function findReadmeMdUp(input) {
     try {
       await access2(readmePath);
       found.push(readmePath);
-    } catch (error) {
-      error instanceof Error;
-    }
+    } catch (error) {}
     if (current === input.rootDir)
       break;
     const parent = dirname23(current);
@@ -92934,6 +92982,21 @@ var TRUNCATE_CONFIG = {
   charsPerToken: 4
 };
 
+// packages/omo-opencode/src/hooks/anthropic-context-window-limit-recovery/session-timeout-map.ts
+function clearSessionTimeout(timeoutBySession, sessionID) {
+  const timeoutID = timeoutBySession.get(sessionID);
+  if (timeoutID !== undefined) {
+    clearTimeout(timeoutID);
+    timeoutBySession.delete(sessionID);
+  }
+}
+function clearAllSessionTimeouts(timeoutBySession) {
+  for (const timeoutID of timeoutBySession.values()) {
+    clearTimeout(timeoutID);
+  }
+  timeoutBySession.clear();
+}
+
 // packages/omo-opencode/src/hooks/anthropic-context-window-limit-recovery/state.ts
 function getOrCreateRetryState(autoCompactState, sessionID) {
   let state2 = autoCompactState.retryStateBySession.get(sessionID);
@@ -92964,6 +93027,15 @@ function clearSessionState(autoCompactState, sessionID) {
   autoCompactState.emptyContentAttemptBySession.delete(sessionID);
   autoCompactState.compactionInProgress.delete(sessionID);
 }
+function clearAllSessionState(autoCompactState) {
+  clearAllSessionTimeouts(autoCompactState.retryTimerBySession);
+  autoCompactState.pendingCompact.clear();
+  autoCompactState.errorDataBySession.clear();
+  autoCompactState.retryStateBySession.clear();
+  autoCompactState.truncateStateBySession.clear();
+  autoCompactState.emptyContentAttemptBySession.clear();
+  autoCompactState.compactionInProgress.clear();
+}
 function setRetryTimer(autoCompactState, sessionID, timeout) {
   const existingTimer = autoCompactState.retryTimerBySession.get(sessionID);
   if (existingTimer !== undefined) {
@@ -93798,7 +93870,7 @@ function getSdkMessages(response) {
   const data = record11["data"];
   if (Array.isArray(data))
     return data;
-  return Array.isArray(record11) ? record11 : [];
+  return [];
 }
 async function findEmptyMessagesFromSDK(client3, sessionID) {
   try {
@@ -94515,21 +94587,6 @@ async function attemptDeduplicationRecovery(sessionID, parsed, experimental2, cl
   }
 }
 
-// packages/omo-opencode/src/hooks/anthropic-context-window-limit-recovery/session-timeout-map.ts
-function clearSessionTimeout(timeoutBySession, sessionID) {
-  const timeoutID = timeoutBySession.get(sessionID);
-  if (timeoutID !== undefined) {
-    clearTimeout(timeoutID);
-    timeoutBySession.delete(sessionID);
-  }
-}
-function clearAllSessionTimeouts(timeoutBySession) {
-  for (const timeoutID of timeoutBySession.values()) {
-    clearTimeout(timeoutID);
-  }
-  timeoutBySession.clear();
-}
-
 // packages/omo-opencode/src/hooks/anthropic-context-window-limit-recovery/recovery-hook.ts
 init_logger2();
 function createRecoveryState() {
@@ -94655,7 +94712,7 @@ function createAnthropicContextWindowLimitRecoveryHook(ctx, options) {
     event: eventHandler,
     dispose: () => {
       clearAllSessionTimeouts(pendingCompactionTimeoutBySession);
-      clearAllSessionTimeouts(autoCompactState.retryTimerBySession);
+      clearAllSessionState(autoCompactState);
     }
   };
 }
@@ -95922,7 +95979,9 @@ function appendTranscriptEntry(sessionId, entry) {
   appendFileSync6(path8, line);
 }
 var TRANSCRIPT_CACHE_TTL_MS = 5 * 60 * 1000;
+var TRANSCRIPT_CACHE_PRUNE_INTERVAL_MS = TRANSCRIPT_CACHE_TTL_MS;
 var transcriptCache = new Map;
+var cleanupInterval2 = null;
 function logTranscriptError(message, error) {
   log2(message, { error });
 }
@@ -95958,6 +96017,30 @@ function clearTranscriptCache(sessionId) {
     transcriptCache.clear();
   }
 }
+function pruneExpiredTranscriptCache() {
+  const now = Date.now();
+  for (const sessionId of [...transcriptCache.keys()]) {
+    const entry = transcriptCache.get(sessionId);
+    if (!entry || now - entry.createdAt >= TRANSCRIPT_CACHE_TTL_MS) {
+      clearTranscriptCache(sessionId);
+    }
+  }
+}
+function ensureTranscriptCacheCleanup() {
+  if (cleanupInterval2)
+    return;
+  cleanupInterval2 = setInterval(pruneExpiredTranscriptCache, TRANSCRIPT_CACHE_PRUNE_INTERVAL_MS);
+  if (typeof cleanupInterval2 === "object" && "unref" in cleanupInterval2) {
+    cleanupInterval2.unref();
+  }
+}
+function stopTranscriptCacheCleanup() {
+  clearTranscriptCache();
+  if (!cleanupInterval2)
+    return;
+  clearInterval(cleanupInterval2);
+  cleanupInterval2 = null;
+}
 function isCacheValid(entry) {
   return Date.now() - entry.createdAt < TRANSCRIPT_CACHE_TTL_MS;
 }
@@ -96034,6 +96117,7 @@ async function buildTranscriptFromSession(client3, sessionId, directory, current
         tempPath: null,
         createdAt: Date.now()
       });
+      ensureTranscriptCacheCleanup();
     }
     const allEntries = [...baseEntries, buildCurrentEntry(currentToolName, currentToolInput)];
     if (previousTempPath) {
@@ -96091,6 +96175,91 @@ function deleteTempTranscript(path8) {
   }
 }
 
+// packages/omo-opencode/src/hooks/claude-code-hooks/todo.ts
+import { join as join77 } from "path";
+var TODO_DIR = join77(getClaudeConfigDir(), "todos");
+function getTodoPath(sessionId) {
+  return join77(TODO_DIR, `${sessionId}-agent-${sessionId}.json`);
+}
+
+// packages/omo-opencode/src/hooks/claude-code-hooks/stop.ts
+var stopHookActiveState = new Map;
+function clearStopHookActive(sessionId) {
+  stopHookActiveState.delete(sessionId);
+}
+function clearAllStopHookActive() {
+  stopHookActiveState.clear();
+}
+async function executeStopHooks(ctx, config3, extendedConfig) {
+  if (ctx.parentSessionId) {
+    return { block: false };
+  }
+  if (!config3) {
+    return { block: false };
+  }
+  const matchers = findMatchingHooks(config3, "Stop");
+  if (matchers.length === 0) {
+    return { block: false };
+  }
+  const stdinData = {
+    session_id: ctx.sessionId,
+    transcript_path: ctx.transcriptPath,
+    cwd: ctx.cwd,
+    permission_mode: ctx.permissionMode ?? "bypassPermissions",
+    hook_event_name: "Stop",
+    stop_hook_active: stopHookActiveState.get(ctx.sessionId) ?? false,
+    todo_path: getTodoPath(ctx.sessionId),
+    hook_source: "opencode-plugin"
+  };
+  for (const matcher of matchers) {
+    if (!matcher.hooks || matcher.hooks.length === 0)
+      continue;
+    for (const hook of matcher.hooks) {
+      if (hook.type !== "command" && hook.type !== "http")
+        continue;
+      const hookName = getHookIdentifier(hook);
+      if (isHookCommandDisabled("Stop", hookName, extendedConfig ?? null)) {
+        log2("Stop hook command skipped (disabled by config)", { command: hookName });
+        continue;
+      }
+      const result = await dispatchHook(hook, JSON.stringify(stdinData), ctx.cwd);
+      if (result.exitCode === 2) {
+        const reason = normalizeHookText(result.stderr) ?? normalizeHookText(result.stdout) ?? "Blocked by stop hook";
+        return {
+          block: true,
+          reason,
+          injectPrompt: reason
+        };
+      }
+      if (result.stdout) {
+        try {
+          const output = JSON.parse(result.stdout || "{}");
+          if (output.stop_hook_active !== undefined) {
+            stopHookActiveState.set(ctx.sessionId, output.stop_hook_active);
+          }
+          const isBlock = output.decision === "block";
+          if (isBlock) {
+            const reason = normalizeHookText(output.reason);
+            const injectPrompt = normalizeHookText(output.inject_prompt) ?? reason;
+            return {
+              block: true,
+              reason,
+              stopHookActive: output.stop_hook_active,
+              permissionMode: output.permission_mode,
+              injectPrompt
+            };
+          }
+        } catch (error) {
+          if (!(error instanceof SyntaxError)) {
+            throw error;
+          }
+        }
+      }
+    }
+  }
+  return { block: false };
+}
+
 // packages/omo-opencode/src/hooks/claude-code-hooks/session-hook-state.ts
 var sessionFirstMessageProcessed = new Set;
 var sessionErrorState = new Map;
@@ -96099,10 +96268,16 @@ function clearSessionHookState(sessionID) {
   sessionErrorState.delete(sessionID);
   sessionInterruptState.delete(sessionID);
 }
+function clearSessionEndHookState(sessionID) {
+  clearSessionHookState(sessionID);
+  sessionFirstMessageProcessed.delete(sessionID);
+  clearStopHookActive(sessionID);
+}
 function clearAllSessionHookState() {
   sessionErrorState.clear();
   sessionInterruptState.clear();
   sessionFirstMessageProcessed.clear();
+  clearAllStopHookActive();
 }
 
 // packages/omo-opencode/src/hooks/claude-code-hooks/handlers/chat-message-handler.ts
@@ -96313,89 +96488,10 @@ function createPreCompactHandler(ctx, config3) {
   };
 }
 
-// packages/omo-opencode/src/hooks/claude-code-hooks/todo.ts
-import { join as join77 } from "path";
-var TODO_DIR = join77(getClaudeConfigDir(), "todos");
-function getTodoPath(sessionId) {
-  return join77(TODO_DIR, `${sessionId}-agent-${sessionId}.json`);
-}
-
-// packages/omo-opencode/src/hooks/claude-code-hooks/stop.ts
-var stopHookActiveState = new Map;
-async function executeStopHooks(ctx, config3, extendedConfig) {
-  if (ctx.parentSessionId) {
-    return { block: false };
-  }
-  if (!config3) {
-    return { block: false };
-  }
-  const matchers = findMatchingHooks(config3, "Stop");
-  if (matchers.length === 0) {
-    return { block: false };
-  }
-  const stdinData = {
-    session_id: ctx.sessionId,
-    transcript_path: ctx.transcriptPath,
-    cwd: ctx.cwd,
-    permission_mode: ctx.permissionMode ?? "bypassPermissions",
-    hook_event_name: "Stop",
-    stop_hook_active: stopHookActiveState.get(ctx.sessionId) ?? false,
-    todo_path: getTodoPath(ctx.sessionId),
-    hook_source: "opencode-plugin"
-  };
-  for (const matcher of matchers) {
-    if (!matcher.hooks || matcher.hooks.length === 0)
-      continue;
-    for (const hook of matcher.hooks) {
-      if (hook.type !== "command" && hook.type !== "http")
-        continue;
-      const hookName = getHookIdentifier(hook);
-      if (isHookCommandDisabled("Stop", hookName, extendedConfig ?? null)) {
-        log2("Stop hook command skipped (disabled by config)", { command: hookName });
-        continue;
-      }
-      const result = await dispatchHook(hook, JSON.stringify(stdinData), ctx.cwd);
-      if (result.exitCode === 2) {
-        const reason = normalizeHookText(result.stderr) ?? normalizeHookText(result.stdout) ?? "Blocked by stop hook";
-        return {
-          block: true,
-          reason,
-          injectPrompt: reason
-        };
-      }
-      if (result.stdout) {
-        try {
-          const output = JSON.parse(result.stdout || "{}");
-          if (output.stop_hook_active !== undefined) {
-            stopHookActiveState.set(ctx.sessionId, output.stop_hook_active);
-          }
-          const isBlock = output.decision === "block";
-          if (isBlock) {
-            const reason = normalizeHookText(output.reason);
-            const injectPrompt = normalizeHookText(output.inject_prompt) ?? reason;
-            return {
-              block: true,
-              reason,
-              stopHookActive: output.stop_hook_active,
-              permissionMode: output.permission_mode,
-              injectPrompt
-            };
-          }
-        } catch (error) {
-          if (!(error instanceof SyntaxError)) {
-            throw error;
-          }
-        }
-      }
-    }
-  }
-  return { block: false };
-}
-
 // packages/omo-opencode/src/hooks/claude-code-hooks/tool-input-cache.ts
 var cache = new Map;
 var CACHE_TTL = 60000;
-var cleanupInterval2 = null;
+var cleanupInterval3 = null;
 function pruneExpiredToolInputs() {
   const now = Date.now();
   for (const [key, entry] of cache.entries()) {
@@ -96405,13 +96501,13 @@ function pruneExpiredToolInputs() {
   }
 }
 function ensureCleanupInterval() {
-  if (cleanupInterval2)
+  if (cleanupInterval3)
     return;
-  cleanupInterval2 = setInterval(() => {
+  cleanupInterval3 = setInterval(() => {
     pruneExpiredToolInputs();
   }, CACHE_TTL);
-  if (typeof cleanupInterval2 === "object" && "unref" in cleanupInterval2) {
-    cleanupInterval2.unref();
+  if (typeof cleanupInterval3 === "object" && "unref" in cleanupInterval3) {
+    cleanupInterval3.unref();
   }
 }
 function cacheToolInput(sessionId, toolName, invocationId, toolInput) {
@@ -96443,10 +96539,10 @@ function clearToolInputCache(sessionId) {
 }
 function stopToolInputCacheCleanup() {
   clearToolInputCache();
-  if (!cleanupInterval2)
+  if (!cleanupInterval3)
     return;
-  clearInterval(cleanupInterval2);
-  cleanupInterval2 = null;
+  clearInterval(cleanupInterval3);
+  cleanupInterval3 = null;
 }
 
 // packages/omo-opencode/src/hooks/claude-code-hooks/handlers/session-event-handler.ts
@@ -96473,7 +96569,7 @@ function createSessionEventHandler(ctx, config3, contextCollector) {
         clearTranscriptCache(sessionID2);
         clearToolInputCache(sessionID2);
         contextCollector?.clear(sessionID2);
-        clearSessionHookState(sessionID2);
+        clearSessionEndHookState(sessionID2);
       }
       return;
     }
@@ -96563,7 +96659,7 @@ function createSessionEventHandler(ctx, config3, contextCollector) {
   };
 }
 function disposeSessionEventHandler(contextCollector) {
-  clearTranscriptCache();
+  stopTranscriptCacheCleanup();
   clearClaudeHooksConfigCache();
   clearPluginExtendedConfigCache();
   stopToolInputCacheCleanup();
@@ -98631,7 +98727,6 @@ function getLocalDevVersion(directory) {
     const pkg = JSON.parse(content);
     return pkg.version ?? null;
   } catch (error) {
-    error instanceof Error;
     return null;
   }
 }
@@ -98661,7 +98756,6 @@ function findPluginEntry(directory) {
         }
       }
     } catch (error) {
-      error instanceof Error;
       continue;
     }
   }
@@ -98727,7 +98821,7 @@ function getCachedVersion(options = {}) {
 // package.json
 var package_default = {
   name: "oh-my-opencode",
-  version: "5.0.0-beta.30",
+  version: "5.0.0-beta.31",
   description: "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   main: "./dist/index.js",
   types: "dist/index.d.ts",
@@ -98908,7 +99002,7 @@ var package_default = {
     zod: "^4.4.3"
   },
   devDependencies: {
-    "@code-yeongyu/senpi": "2026.8.30-3",
+    "@code-yeongyu/senpi": "2026.8.31",
     "@oh-my-opencode/agents-md-core": "workspace:*",
     "@oh-my-opencode/ast-grep-mcp": "workspace:*",
     "@oh-my-opencode/boulder-state": "workspace:*",
@@ -98949,18 +99043,18 @@ var package_default = {
     typescript: "^7.0.2"
   },
   optionalDependencies: {
-    "oh-my-opencode-darwin-arm64": "5.0.0-beta.30",
-    "oh-my-opencode-darwin-x64": "5.0.0-beta.30",
-    "oh-my-opencode-darwin-x64-baseline": "5.0.0-beta.30",
-    "oh-my-opencode-linux-arm64": "5.0.0-beta.30",
-    "oh-my-opencode-linux-arm64-musl": "5.0.0-beta.30",
-    "oh-my-opencode-linux-x64": "5.0.0-beta.30",
-    "oh-my-opencode-linux-x64-baseline": "5.0.0-beta.30",
-    "oh-my-opencode-linux-x64-musl": "5.0.0-beta.30",
-    "oh-my-opencode-linux-x64-musl-baseline": "5.0.0-beta.30",
-    "oh-my-opencode-windows-arm64": "5.0.0-beta.30",
-    "oh-my-opencode-windows-x64": "5.0.0-beta.30",
-    "oh-my-opencode-windows-x64-baseline": "5.0.0-beta.30"
+    "oh-my-opencode-darwin-arm64": "5.0.0-beta.31",
+    "oh-my-opencode-darwin-x64": "5.0.0-beta.31",
+    "oh-my-opencode-darwin-x64-baseline": "5.0.0-beta.31",
+    "oh-my-opencode-linux-arm64": "5.0.0-beta.31",
+    "oh-my-opencode-linux-arm64-musl": "5.0.0-beta.31",
+    "oh-my-opencode-linux-x64": "5.0.0-beta.31",
+    "oh-my-opencode-linux-x64-baseline": "5.0.0-beta.31",
+    "oh-my-opencode-linux-x64-musl": "5.0.0-beta.31",
+    "oh-my-opencode-linux-x64-musl-baseline": "5.0.0-beta.31",
+    "oh-my-opencode-windows-arm64": "5.0.0-beta.31",
+    "oh-my-opencode-windows-x64": "5.0.0-beta.31",
+    "oh-my-opencode-windows-x64-baseline": "5.0.0-beta.31"
   },
   overrides: {
     "@earendil-works/pi-agent-core": "0.84.2",
@@ -98978,7 +99072,7 @@ var package_default = {
     "@code-yeongyu/comment-checker"
   ],
   patchedDependencies: {
-    "@code-yeongyu/senpi@2026.8.30-3": "patches/@code-yeongyu%2Fsenpi@2026.8.30-3.patch"
+    "@code-yeongyu/senpi@2026.8.31": "patches/@code-yeongyu%2Fsenpi@2026.8.31.patch"
   }
 };
 
@@ -99002,7 +99096,6 @@ async function getLatestVersion(channel = "latest") {
     const data = await response.json();
     return data[channel] ?? data.latest ?? null;
   } catch (error) {
-    error instanceof Error;
     return null;
   } finally {
     clearTimeout(timeoutId);
@@ -101041,8 +101134,7 @@ var TARGET_TOOLS = new Set([
 ]);
 var AGENT_TOOLS = new Set([
   "task",
-  "call_omo_agent",
-  "task"
+  "call_omo_agent"
 ]);
 var REMINDER_MESSAGE = `
 [Agent Usage Reminder]
@@ -101082,7 +101174,6 @@ function loadAgentUsageState(sessionID) {
     const content = readFileSync48(filePath, "utf-8");
     return JSON.parse(content);
   } catch (error) {
-    error instanceof Error;
     return null;
   }
 }
@@ -106136,6 +106227,23 @@ function extractPromptText2(parts) {
 }
 // packages/omo-opencode/src/hooks/keyword-detector/hook.ts
 var defaultModeUltraworkInjectedSessions = new Set;
+var DEFAULT_MODE_ULTRAWORK_SESSION_CAP = 256;
+function rememberDefaultModeUltraworkInjectedSession(sessionID) {
+  if (defaultModeUltraworkInjectedSessions.has(sessionID))
+    return;
+  if (defaultModeUltraworkInjectedSessions.size >= DEFAULT_MODE_ULTRAWORK_SESSION_CAP) {
+    const oldest = defaultModeUltraworkInjectedSessions.values().next().value;
+    if (oldest !== undefined)
+      defaultModeUltraworkInjectedSessions.delete(oldest);
+  }
+  defaultModeUltraworkInjectedSessions.add(sessionID);
+}
+function clearDefaultModeUltraworkInjectedSession(sessionID) {
+  defaultModeUltraworkInjectedSessions.delete(sessionID);
+}
+function clearAllDefaultModeUltraworkInjectedSessions() {
+  defaultModeUltraworkInjectedSessions.clear();
+}
 function suppressComboStandalones(detected) {
   const hasCombo = detected.some((k) => k.type === "hyperplan-ultrawork");
   if (!hasCombo)
@@ -106196,7 +106304,7 @@ function createKeywordDetectorHook(ctx, _collector, _ralphLoop, config3, default
       const isNonMainSession = mainSessionID && input.sessionID !== mainSessionID;
       if (detectedKeywords.length === 0) {
         if (defaultMode?.ultrawork && !isNonMainSession && !defaultModeUltraworkInjectedSessions.has(input.sessionID)) {
-          defaultModeUltraworkInjectedSessions.add(input.sessionID);
+          rememberDefaultModeUltraworkInjectedSession(input.sessionID);
           log2(`[keyword-detector] Default ultrawork mode auto-activated (injected via system prompt)`, { sessionID: input.sessionID });
           ctx.client.tui.showToast({
             body: {
@@ -106294,6 +106402,16 @@ ${allMessages}`;
         sessionID: input.sessionID,
         types: detectedKeywords.map((k) => k.type)
       });
+    },
+    event: ({ event }) => {
+      if (event.type !== "session.deleted")
+        return;
+      const sessionID = resolveSessionEventID(event.properties);
+      if (sessionID)
+        clearDefaultModeUltraworkInjectedSession(sessionID);
+    },
+    dispose: () => {
+      clearAllDefaultModeUltraworkInjectedSessions();
     }
   };
 }
@@ -119738,8 +119856,6 @@ async function runPreemptiveCompactionIfNeeded(args) {
       if (toastError instanceof Error)
         return;
     });
-    if (error instanceof Error)
-      return;
   } finally {
     compactionInProgress.delete(sessionID);
   }
@@ -121758,15 +121874,15 @@ function createRuntimeFallbackHook(ctx, options, factoryOverrides = {}) {
   const messageUpdateHandler = factories.createMessageUpdateHandler(deps, helpers);
   const chatMessageHandler = factories.createChatMessageHandler(deps);
   const firstPromptWatchdog = factories.createFirstPromptWatchdog(deps, helpers);
-  let cleanupInterval3 = null;
+  let cleanupInterval4 = null;
   let intervalStarted = false;
   const ensureInterval = () => {
     if (intervalStarted)
       return;
     intervalStarted = true;
-    cleanupInterval3 = setInterval(helpers.cleanupStaleSessions, 5 * 60 * 1000);
-    if (typeof cleanupInterval3.unref === "function") {
-      cleanupInterval3.unref();
+    cleanupInterval4 = setInterval(helpers.cleanupStaleSessions, 5 * 60 * 1000);
+    if (typeof cleanupInterval4.unref === "function") {
+      cleanupInterval4.unref();
     }
   };
   const eventHandler = async ({ event }) => {
@@ -121784,8 +121900,8 @@ function createRuntimeFallbackHook(ctx, options, factoryOverrides = {}) {
     await baseEventHandler({ event });
   };
   const dispose = () => {
-    if (cleanupInterval3) {
-      clearInterval(cleanupInterval3);
+    if (cleanupInterval4) {
+      clearInterval(cleanupInterval4);
     }
     for (const fallbackTimeout of deps.sessionFallbackTimeouts.values()) {
       clearTimeout(fallbackTimeout);
@@ -121991,7 +122107,6 @@ function toCanonicalPath2(absolutePath) {
     try {
       canonicalPath2 = realpathSync20.native(absolutePath);
     } catch (canonicalPathError) {
-      canonicalPathError instanceof Error;
       canonicalPath2 = absolutePath;
     }
   } else {
@@ -123075,11 +123190,11 @@ class Diff {
       return left === right || !!options.ignoreCase && left.toLowerCase() === right.toLowerCase();
     }
   }
-  removeEmpty(array8) {
+  removeEmpty(array9) {
     const ret = [];
-    for (let i = 0;i < array8.length; i++) {
-      if (array8[i]) {
-        ret.push(array8[i]);
+    for (let i = 0;i < array9.length; i++) {
+      if (array9[i]) {
+        ret.push(array9[i]);
       }
     }
     return ret;
@@ -124907,16 +125022,41 @@ function formatFsyncSkipWarning(entries) {
 }
 
 // packages/omo-opencode/src/hooks/fsync-skip-warning/index.ts
+var FSYNC_SKIP_START_TTL_MS = 60000;
+var startTimesByCallId = new Map;
+var cleanupInterval4 = null;
+function pruneStaleStartTimes(now = Date.now()) {
+  for (const [callID, startedAt] of startTimesByCallId) {
+    if (now - startedAt > FSYNC_SKIP_START_TTL_MS) {
+      startTimesByCallId.delete(callID);
+    }
+  }
+}
+function ensureCleanupInterval2() {
+  if (cleanupInterval4)
+    return;
+  cleanupInterval4 = setInterval(() => pruneStaleStartTimes(), FSYNC_SKIP_START_TTL_MS);
+  if (typeof cleanupInterval4 === "object" && "unref" in cleanupInterval4) {
+    cleanupInterval4.unref();
+  }
+}
+function stopFsyncSkipWarningCleanup() {
+  startTimesByCallId.clear();
+  if (!cleanupInterval4)
+    return;
+  clearInterval(cleanupInterval4);
+  cleanupInterval4 = null;
+}
 function createFsyncSkipWarningHook() {
-  const startTimesByCallId = new Map;
   const toolExecuteBefore = async (input, _output) => {
+    ensureCleanupInterval2();
     startTimesByCallId.set(input.callID, Date.now());
   };
   const toolExecuteAfter = async (input, output) => {
-    if (typeof output.output !== "string")
-      return;
     const startTimestamp = startTimesByCallId.get(input.callID) ?? 0;
     startTimesByCallId.delete(input.callID);
+    if (typeof output.output !== "string")
+      return;
     const skips = drainSkipsAfter(startTimestamp);
     const warning = formatFsyncSkipWarning(skips);
     if (warning.length === 0)
@@ -124927,7 +125067,8 @@ ${warning}`;
   };
   return {
     "tool.execute.before": toolExecuteBefore,
-    "tool.execute.after": toolExecuteAfter
+    "tool.execute.after": toolExecuteAfter,
+    dispose: stopFsyncSkipWarningCleanup
   };
 }
 // packages/omo-opencode/src/hooks/notepad-write-guard/index.ts
@@ -131683,6 +131824,7 @@ function getTerminalSessionError(messages) {
 init_logger2();
 var ACTIVE_SESSION_STATUSES2 = new Set(["busy", "retry", "running"]);
 var CHILD_WAKE_GRACE_MS = 5000;
+var MAX_NON_ACTIVE_STATUS_STALENESS_POLLS = 10;
 function wait(milliseconds) {
   const sharedBuffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT);
   const typedArray = new Int32Array(sharedBuffer);
@@ -131702,8 +131844,15 @@ function abortSyncSession(client3, sessionID, reason) {
 function isActiveSessionStatus(status) {
   return status !== undefined && ACTIVE_SESSION_STATUSES2.has(status.type);
 }
+function hasMessagesAfterAnchor(messages, anchorMessageID, anchorMessageCount) {
+  if (anchorMessageID !== undefined) {
+    const anchorIndex = messages.findIndex((message) => message.info?.id === anchorMessageID);
+    return anchorIndex === -1 || anchorIndex < messages.length - 1;
+  }
+  return anchorMessageCount === undefined || messages.length > anchorMessageCount;
+}
 async function fetchSessionMessages(client3, sessionID) {
-  const messagesResult = await client3.session.messages({ path: { id: sessionID } });
+  const messagesResult = await client3.session.messages({ path: { id: sessionID }, query: { limit: 100 } });
   const rawData = messagesResult?.data ?? messagesResult;
   return Array.isArray(rawData) ? rawData : [];
 }
@@ -131715,6 +131864,9 @@ async function pollSyncSession(ctx, client3, input, timeoutMs) {
   const pollStart = Date.now();
   let inactiveStart = pollStart;
   let pollCount = 0;
+  let nonActivePollsSinceMessageFetch = 0;
+  let lastStatusRevision;
+  let hasFetchedNonActiveMessages = false;
   let timedOut = false;
   let assistantTurnCount = 0;
   let lastSeenAssistantId;
@@ -131762,7 +131914,7 @@ async function pollSyncSession(ctx, client3, input, timeoutMs) {
         }
       }
       if (finalMessages) {
-        const hasNewMessages = input.anchorMessageCount === undefined || finalMessages.length > input.anchorMessageCount;
+        const hasNewMessages = hasMessagesAfterAnchor(finalMessages, input.anchorMessageID, input.anchorMessageCount);
         if (hasNewMessages && isSessionComplete(finalMessages)) {
           log2("[task] Abort detected after session already completed", { sessionID: input.sessionID });
           return null;
@@ -131800,6 +131952,15 @@ Session ID: ${input.sessionID}`;
       inactiveStart = Date.now();
       continue;
     }
+    nonActivePollsSinceMessageFetch++;
+    const statusRevision = sessionStatus && (sessionStatus.updatedAt ?? sessionStatus.revision ?? sessionStatus.messageCount);
+    const statusChanged = statusRevision !== undefined && String(statusRevision) !== lastStatusRevision;
+    if (hasFetchedNonActiveMessages && !statusChanged && nonActivePollsSinceMessageFetch < MAX_NON_ACTIVE_STATUS_STALENESS_POLLS) {
+      continue;
+    }
+    lastStatusRevision = statusRevision === undefined ? lastStatusRevision : String(statusRevision);
+    nonActivePollsSinceMessageFetch = 0;
+    hasFetchedNonActiveMessages = true;
     let messages;
     try {
       messages = await fetchSessionMessages(client3, input.sessionID);
@@ -131808,9 +131969,8 @@ Session ID: ${input.sessionID}`;
       log2("[task] Poll messages fetch failed, retrying", { sessionID: input.sessionID, error: errorMessage });
       continue;
     }
-    if (input.anchorMessageCount !== undefined && messages.length <= input.anchorMessageCount) {
+    if (!hasMessagesAfterAnchor(messages, input.anchorMessageID, input.anchorMessageCount))
       continue;
-    }
     const sessionError = getTerminalSessionError(messages);
     if (sessionError) {
       log2("[task] Poll detected terminal session error", { sessionID: input.sessionID, sessionError });
@@ -131992,6 +132152,54 @@ var syncContinuationDeps = {
 
 // packages/omo-opencode/src/tools/delegate-task/sync-continuation.ts
 init_logger2();
+
+// packages/omo-opencode/src/features/background-agent/constants.ts
+var TASK_TTL_MS = 30 * 60 * 1000;
+var TERMINAL_TASK_TTL_MS = 30 * 60 * 1000;
+var MIN_STABILITY_TIME_MS2 = 10 * 1000;
+var DEFAULT_STALE_TIMEOUT_MS = 2700000;
+var DEFAULT_MESSAGE_STALENESS_TIMEOUT_MS = 3600000;
+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 DEFAULT_SESSION_GONE_TIMEOUT_MS = 60000;
+var MIN_IDLE_TIME_MS = 5000;
+var POLLING_INTERVAL_MS = 3000;
+var TASK_CLEANUP_DELAY_MS = 10 * 60 * 1000;
+
+// packages/omo-opencode/src/tools/delegate-task/sync-session-cleanup.ts
+init_logger2();
+var pendingDeletionTimers = new Map;
+function cancelSyncSessionDeletion(sessionID) {
+  const timer = pendingDeletionTimers.get(sessionID);
+  if (!timer)
+    return;
+  clearTimeout(timer);
+  pendingDeletionTimers.delete(sessionID);
+}
+function scheduleSyncSessionDeletion(client3, sessionID, delayMs = TASK_CLEANUP_DELAY_MS) {
+  cancelSyncSessionDeletion(sessionID);
+  const deleteSession = client3?.session?.delete?.bind(client3.session);
+  if (typeof deleteSession !== "function")
+    return;
+  const timer = setTimeout(() => {
+    pendingDeletionTimers.delete(sessionID);
+    try {
+      deleteSession({ path: { id: sessionID } }).then(() => {
+        handedBackSyncSessions.delete(sessionID);
+      }).catch((error) => {
+        log2("[task] Failed to delete completed sync session:", { sessionID, error: String(error) });
+      });
+    } catch (error) {
+      log2("[task] Failed to schedule completed sync session deletion:", { sessionID, error: String(error) });
+    }
+  }, delayMs);
+  pendingDeletionTimers.set(sessionID, timer);
+  timer.unref();
+}
+
+// packages/omo-opencode/src/tools/delegate-task/sync-continuation.ts
 function shouldAttemptPollErrorRecovery(pollError) {
   const trimmed = pollError.trim();
   if (trimmed.length === 0) {
@@ -132022,11 +132230,12 @@ async function resolveResumeContext(client3, continuationID) {
           resumeAgent: info.agent,
           resumeModel: info.model ?? (info.providerID && info.modelID ? { providerID: info.providerID, modelID: info.modelID } : undefined),
           resumeVariant: info.variant,
-          anchorMessageCount: messages.length
+          anchorMessageCount: messages.length,
+          anchorMessageID: messages.at(-1)?.info?.id
         };
       }
     }
-    return { anchorMessageCount: messages.length };
+    return { anchorMessageCount: messages.length, anchorMessageID: messages.at(-1)?.info?.id };
   } catch (error) {
     if (!(error instanceof Error))
       throw error;
@@ -132047,6 +132256,7 @@ async function executeSyncContinuation(args, ctx, executorCtx, parentContext, de
   if (!continuationID) {
     throw new Error("task_id is required to continue a sync task");
   }
+  cancelSyncSessionDeletion(continuationID);
   const taskId = `resume_sync_${continuationID.slice(0, 8)}`;
   const startTime = new Date;
   if (toastManager) {
@@ -132061,6 +132271,7 @@ async function executeSyncContinuation(args, ctx, executorCtx, parentContext, de
   let resumeModel;
   let resumeVariant;
   let anchorMessageCount;
+  let anchorMessageID;
   let handedBackToParent = false;
   try {
     const resumeContext = await resolveResumeContext(client3, continuationID);
@@ -132068,6 +132279,7 @@ async function executeSyncContinuation(args, ctx, executorCtx, parentContext, de
     resumeModel = resumeContext.resumeModel;
     resumeVariant = resumeContext.resumeVariant;
     anchorMessageCount = resumeContext.anchorMessageCount;
+    anchorMessageID = resumeContext.anchorMessageID;
     const resumeModelForMetadata = resumeModel && resumeVariant !== undefined ? { ...resumeModel, variant: resumeVariant } : resumeModel;
     const syncContMeta = {
       title: args.description,
@@ -132116,6 +132328,7 @@ async function executeSyncContinuation(args, ctx, executorCtx, parentContext, de
       toastManager.removeTask(taskId);
     }
     const errorMessage = promptError instanceof Error ? promptError.message : String(promptError);
+    scheduleSyncSessionDeletion(client3, continuationID);
     return `Failed to send continuation prompt: ${errorMessage}
 
 Task ID: ${continuationID}`;
@@ -132126,7 +132339,8 @@ Task ID: ${continuationID}`;
       agentToUse: resumeAgent ?? "continue",
       toastManager,
       taskId,
-      anchorMessageCount
+      anchorMessageCount,
+      anchorMessageID
     }, syncPollTimeoutMs);
     if (pollError && shouldAttemptPollErrorRecovery(pollError)) {
       if (anchorMessageCount === undefined) {
@@ -132188,6 +132402,7 @@ ${buildTaskMetadataBlock({
         });
       }
     }
+    scheduleSyncSessionDeletion(client3, continuationID);
   }
 }
 // packages/omo-opencode/src/tools/delegate-task/cancel-unstable-agent-task.ts
@@ -133151,7 +133366,14 @@ async function executeSyncTask(args, ctx, executorCtx, parentContext, agentToUse
   let taskId;
   let syncSessionID;
   let spawnReservation;
+  let concurrencyAcquired = false;
+  const concurrencyModel = categoryModel && typeof categoryModel.providerID === "string" && typeof categoryModel.modelID === "string" ? `${categoryModel.providerID}/${categoryModel.modelID}` : typeof agentToUse === "string" ? agentToUse : "default";
+  const manager = executorCtx?.manager;
   try {
+    if (!subagentSessions.has(parentContext.sessionID) && typeof manager?.acquireSyncSubagentConcurrency === "function") {
+      await manager.acquireSyncSubagentConcurrency(concurrencyModel);
+      concurrencyAcquired = true;
+    }
     const spawn5 = await reserveSyncSubagentSpawn(executorCtx, parentContext);
     spawnReservation = spawn5.reservation;
     const { spawnContext } = spawn5;
@@ -133260,11 +133482,15 @@ async function executeSyncTask(args, ctx, executorCtx, parentContext, agentToUse
     if (syncSessionID) {
       cleanupSyncSessionSideEffects(syncSessionID, executorCtx);
       handedBackSyncSessions.add(syncSessionID);
-      if (typeof client3.session.abort === "function") {
+      if (typeof client3?.session?.abort === "function") {
         client3.session.abort({ path: { id: syncSessionID } }).catch((error) => {
           log2(`[task] Failed to abort completed sync session:`, error);
         });
       }
+      scheduleSyncSessionDeletion(client3, syncSessionID);
+    }
+    if (concurrencyAcquired && typeof manager?.releaseSyncSubagentConcurrency === "function") {
+      manager.releaseSyncSubagentConcurrency(concurrencyModel);
     }
   }
 }
@@ -137105,21 +137331,6 @@ class ConcurrencyManager {
   }
 }
 
-// packages/omo-opencode/src/features/background-agent/constants.ts
-var TASK_TTL_MS = 30 * 60 * 1000;
-var TERMINAL_TASK_TTL_MS = 30 * 60 * 1000;
-var MIN_STABILITY_TIME_MS2 = 10 * 1000;
-var DEFAULT_STALE_TIMEOUT_MS = 2700000;
-var DEFAULT_MESSAGE_STALENESS_TIMEOUT_MS = 3600000;
-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 DEFAULT_SESSION_GONE_TIMEOUT_MS = 60000;
-var MIN_IDLE_TIME_MS = 5000;
-var POLLING_INTERVAL_MS = 3000;
-var TASK_CLEANUP_DELAY_MS = 10 * 60 * 1000;
-
 // packages/omo-opencode/src/features/background-agent/duration-formatter.ts
 function formatDuration3(start, end) {
   const duration = (end ?? new Date).getTime() - start.getTime();
@@ -137557,9 +137768,6 @@ class ParentWakeDispatchedTracker {
   getWake(sessionID) {
     return this.dispatchedParentWakes.get(sessionID);
   }
-  hasWake(sessionID) {
-    return this.dispatchedParentWakes.has(sessionID);
-  }
   clearWake(sessionID) {
     const timer = this.dispatchedParentWakeTimers.get(sessionID);
     if (timer) {
@@ -139108,31 +139316,29 @@ function invokeTmuxSessionCreatedCallback(invocation) {
 
 // packages/omo-opencode/src/features/background-agent/subagent-spawn-limits.ts
 var DEFAULT_MAX_SUBAGENT_DEPTH = 3;
+var DEFAULT_MAX_LIVE_DESCENDANTS_PER_ROOT = 24;
 function getMaxSubagentDepth(config3) {
   return config3?.maxDepth ?? DEFAULT_MAX_SUBAGENT_DEPTH;
 }
+function getMaxLiveDescendantsPerRoot(config3) {
+  return config3?.maxLiveDescendantsPerRoot ?? DEFAULT_MAX_LIVE_DESCENDANTS_PER_ROOT;
+}
 async function resolveSubagentSpawnContext(client3, parentSessionID, directory) {
   const visitedSessionIDs = new Set;
   let rootSessionID = parentSessionID;
   let currentSessionID = parentSessionID;
   let parentDepth = 0;
   while (true) {
-    if (visitedSessionIDs.has(currentSessionID)) {
+    if (visitedSessionIDs.has(currentSessionID))
       throw new Error(`Detected a session parent cycle while resolving ${parentSessionID}`);
-    }
     visitedSessionIDs.add(currentSessionID);
     let nextParentSessionID;
     try {
-      const response = await client3.session.get({
-        path: { id: currentSessionID },
-        ...directory ? { query: { directory } } : {}
-      });
-      if (response.error) {
+      const response = await client3.session.get({ path: { id: currentSessionID }, ...directory ? { query: { directory } } : {} });
+      if (response.error)
         throw new Error(String(response.error));
-      }
-      if (!response.data) {
+      if (!response.data)
         throw new Error("No session data returned");
-      }
       nextParentSessionID = response.data.parentID;
     } catch (error) {
       const reason = error instanceof Error ? error.message : String(error);
@@ -139145,15 +139351,13 @@ async function resolveSubagentSpawnContext(client3, parentSessionID, directory)
     currentSessionID = nextParentSessionID;
     parentDepth += 1;
   }
-  return {
-    rootSessionID,
-    parentDepth,
-    childDepth: parentDepth + 1
-  };
+  return { rootSessionID, parentDepth, childDepth: parentDepth + 1 };
 }
 function createSubagentDepthLimitError(input) {
-  const { childDepth, maxDepth, parentSessionID, rootSessionID } = input;
-  return new Error(`Subagent spawn blocked: child depth ${childDepth} exceeds background_task.maxDepth=${maxDepth}. Parent session: ${parentSessionID}. Root session: ${rootSessionID}. Continue in an existing subagent session instead of spawning another.`);
+  return new Error(`Subagent spawn blocked: child depth ${input.childDepth} exceeds background_task.maxDepth=${input.maxDepth}. Parent session: ${input.parentSessionID}. Root session: ${input.rootSessionID}. Continue in an existing subagent session instead of spawning another.`);
+}
+function createSubagentDescendantLimitError(input) {
+  return new Error(`Subagent spawn blocked: root session ${input.rootSessionID} already has ${input.descendantCount} live descendants, reaching background_task.maxLiveDescendantsPerRoot=${input.maxDescendants}. Parent session: ${input.parentSessionID}.`);
 }
 
 // packages/omo-opencode/src/features/background-agent/task-history.ts
@@ -139855,6 +140059,16 @@ class BackgroundManager {
   }
   async reserveSubagentSpawn(parentSessionID) {
     const spawnContext = await this.assertCanSpawn(parentSessionID);
+    const maxDescendants = getMaxLiveDescendantsPerRoot(this.config);
+    const currentCount = this.rootDescendantCounts.get(spawnContext.rootSessionID) ?? 0;
+    if (maxDescendants !== 0 && currentCount >= maxDescendants) {
+      throw createSubagentDescendantLimitError({
+        descendantCount: currentCount,
+        maxDescendants,
+        parentSessionID,
+        rootSessionID: spawnContext.rootSessionID
+      });
+    }
     const descendantCount = this.registerRootDescendant(spawnContext.rootSessionID);
     let settled = false;
     return {
@@ -139872,6 +140086,12 @@ class BackgroundManager {
       }
     };
   }
+  async acquireSyncSubagentConcurrency(model, taskId) {
+    await this.concurrencyManager.acquire(model, taskId);
+  }
+  releaseSyncSubagentConcurrency(model) {
+    this.concurrencyManager.release(model);
+  }
   registerRootDescendant(rootSessionID) {
     const nextCount = (this.rootDescendantCounts.get(rootSessionID) ?? 0) + 1;
     this.rootDescendantCounts.set(rootSessionID, nextCount);
@@ -140775,18 +140995,6 @@ The fallback retry session is now created and can be inspected directly.
   clearSessionTodoObservation(sessionID) {
     this.observedIncompleteTodosBySession.delete(sessionID);
   }
-  messageUpdatedInfoHasParentWakeOutput(info, role) {
-    if (role === "tool") {
-      return true;
-    }
-    if (role !== "assistant") {
-      return false;
-    }
-    if (info.error) {
-      return false;
-    }
-    return !isEmptyNoProgressAssistantTurnInfo(info);
-  }
   shouldHoldDispatchedParentWakeForTextDelta(eventType, partInfo, sessionID, wake) {
     if (eventType !== "message.part.delta") {
       return false;
@@ -141414,7 +141622,7 @@ The task was re-queued on a fallback model after a retryable failure.
       clearTimeout(existingTimer);
       this.completionTimers.delete(taskId);
     }
-    const timer = setTimeout(() => {
+    const timer = setTimeout(async () => {
       this.completionTimers.delete(taskId);
       const task2 = this.tasks.get(taskId);
       if (!task2)
@@ -141436,6 +141644,12 @@ The task was re-queued on a fallback model after a retryable failure.
         subagentSessions.delete(task2.sessionId);
         clearDelegatedChildSessionBootstrap(task2.sessionId);
         SessionCategoryRegistry.remove(task2.sessionId);
+        const deleteSession = this.client.session.delete?.bind(this.client.session);
+        if (typeof deleteSession === "function") {
+          await deleteSession({ path: { id: task2.sessionId } }).catch((error) => {
+            log2("[background-agent] Failed to delete completed subagent session:", { sessionID: task2.sessionId, error: String(error) });
+          });
+        }
       }
       log2("[background-agent] Removed completed task from memory:", taskId);
     }, this.config?.taskCleanupDelayMs ?? TASK_CLEANUP_DELAY_MS);
@@ -149329,6 +149543,7 @@ class TuiStateMirror {
     this.heartbeatID = setInterval(() => {
       this.flush();
     }, HEARTBEAT_MS);
+    this.heartbeatID.unref?.();
   }
   stop() {
     this.stopped = true;
@@ -173235,7 +173450,7 @@ async function createTools(args) {
 }
 // packages/omo-opencode/src/plugin-dispose.ts
 function createPluginDispose(args) {
-  const { backgroundManager, skillMcpManager, disposeHooks } = args;
+  const { backgroundManager, skillMcpManager, tuiStateMirror, disposeHooks } = args;
   let disposePromise = null;
   return async () => {
     if (disposePromise) {
@@ -173243,6 +173458,11 @@ function createPluginDispose(args) {
       return;
     }
     disposePromise = (async () => {
+      try {
+        tuiStateMirror?.stop();
+      } catch (error) {
+        log2("[plugin-dispose] tuiStateMirror.stop() error:", error);
+      }
       try {
         await backgroundManager.shutdown();
       } catch (error) {
@@ -174874,6 +175094,8 @@ async function handleSessionDeletedEvent(args) {
   await args.managers.monitorManager?.stopSessionMonitors(sessionID);
   const wasSyncSubagentSession = syncSubagentSessions.has(sessionID);
   clearSessionAgent(sessionID);
+  handedBackSyncSessions.delete(sessionID);
+  subagentSessions.delete(sessionID);
   args.clearModelFallbackSession(sessionID);
   resetMessageCursor(sessionID);
   clearBackgroundOutputConsumptionsForParentSession(sessionID);
@@ -174885,8 +175107,6 @@ async function handleSessionDeletedEvent(args) {
   if (!isBtwSideSession) {
     await dispatchOpenClawSessionEvent({ ...args, rawEvent: "session.deleted", sessionID });
   }
-  if (wasSyncSubagentSession)
-    subagentSessions.delete(sessionID);
   deleteSessionTools(sessionID);
   await args.managers.skillMcpManager.disconnectSession(sessionID);
   if (args.tmuxIntegrationEnabled && !isBtwSideSession) {
@@ -184121,6 +184341,7 @@ function createPluginModule(overrides2 = {}) {
     const dispose = createPluginDispose({
       backgroundManager: managers.backgroundManager,
       skillMcpManager: managers.skillMcpManager,
+      tuiStateMirror: managers.tuiStateMirror,
       disposeHooks: hooks2.disposeHooks
     });
     const pluginHooks = {