oh-my-opencode 4.1.0 → 4.1.2

package/dist/index.js

@@ -54573,6 +54573,13 @@ function createInternalAgentTextPart(text) {
 ${OMO_INTERNAL_INITIATOR_MARKER}`
   };
 }
+function createInternalAgentContinuationTextPart(text) {
+  return {
+    ...createInternalAgentTextPart(text),
+    synthetic: true,
+    metadata: { compaction_continue: true }
+  };
+}
 var OMO_INTERNAL_INITIATOR_MARKER = "<!-- OMO_INTERNAL_INITIATOR -->", INTERNAL_INITIATOR_MARKER_PATTERN;
 var init_internal_initiator_marker = __esm(() => {
   INTERNAL_INITIATOR_MARKER_PATTERN = /\n*<!--\s*OMO_INTERNAL_INITIATOR\s*-->\s*/g;
@@ -55991,6 +55998,7 @@ __export(exports_shared, {
   createSystemDirective: () => createSystemDirective,
   createModelCapabilitiesCacheStore: () => createModelCapabilitiesCacheStore,
   createInternalAgentTextPart: () => createInternalAgentTextPart,
+  createInternalAgentContinuationTextPart: () => createInternalAgentContinuationTextPart,
   createDynamicTruncator: () => createDynamicTruncator,
   createConnectedProvidersCacheStore: () => createConnectedProvidersCacheStore,
   createAgentToolRestrictions: () => createAgentToolRestrictions,
@@ -58319,18 +58327,18 @@ function serializeRuntimeState(runtimeState) {
   return `${JSON.stringify(parsedRuntimeState, null, 2)}
 `;
 }
-function isRecord11(value) {
+function isRecord12(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function stripLegacyRuntimeStateMemberFields(member) {
-  if (!isRecord11(member)) {
+  if (!isRecord12(member)) {
     return member;
   }
   const { delegateTaskCallsUsed: _delegateTaskCallsUsed, ...memberWithoutLegacyFields } = member;
   return memberWithoutLegacyFields;
 }
 function stripLegacyRuntimeStateFields(rawState) {
-  if (!isRecord11(rawState)) {
+  if (!isRecord12(rawState)) {
     return rawState;
   }
   const members = rawState["members"];
@@ -58604,10 +58612,13 @@ function clearState(directory, customPath) {
     return false;
   }
 }
-function incrementIteration(directory, customPath) {
+function incrementIteration(directory, customPath, expected) {
   const state3 = readState(directory, customPath);
   if (!state3)
     return null;
+  if (expected && (state3.iteration !== expected.iteration || state3.session_id !== expected.sessionID)) {
+    return null;
+  }
   state3.iteration += 1;
   if (writeState(directory, state3, customPath)) {
     return state3;
@@ -69633,6 +69644,48 @@ init_logger();
 init_opencode_storage_detection();
 init_agent_display_names();
 
+// src/hooks/shared/session-idle-settle.ts
+var DEFAULT_SESSION_IDLE_SETTLE_MS = 150;
+function settleAfterSessionIdle(ms = DEFAULT_SESSION_IDLE_SETTLE_MS) {
+  return ms > 0 ? new Promise((resolve8) => setTimeout(resolve8, ms)) : Promise.resolve();
+}
+var ACTIVE_SESSION_STATUSES = new Set(["busy", "retry", "running"]);
+function isRecord8(value) {
+  return typeof value === "object" && value !== null;
+}
+function getSessionStatusPayload(response) {
+  if (isRecord8(response) && isRecord8(response.data)) {
+    return response.data;
+  }
+  if (isRecord8(response)) {
+    return response;
+  }
+  return {};
+}
+function isActiveSessionStatusType(statusType) {
+  return ACTIVE_SESSION_STATUSES.has(statusType);
+}
+async function isSessionActive(client, sessionID) {
+  if (typeof client.session?.status !== "function") {
+    return false;
+  }
+  try {
+    const statusResult = await client.session.status();
+    const status = getSessionStatusPayload(statusResult)[sessionID];
+    if (!isRecord8(status)) {
+      return false;
+    }
+    const statusType = status.type;
+    return typeof statusType === "string" && isActiveSessionStatusType(statusType);
+  } catch {
+    return false;
+  }
+}
+async function shouldPromptAfterSessionIdle(client, sessionID, settleMs = DEFAULT_SESSION_IDLE_SETTLE_MS) {
+  await settleAfterSessionIdle(settleMs);
+  return !await isSessionActive(client, sessionID);
+}
+
 // src/hooks/todo-continuation-enforcer/message-directory.ts
 init_opencode_message_dir();
 
@@ -69906,6 +69959,10 @@ ${todoList}`;
     log(`[${HOOK_NAME}] Skipped injection: session was cancelled before prompt`, { sessionID });
     return;
   }
+  if (await isSessionActive(ctx.client, sessionID)) {
+    log(`[${HOOK_NAME}] Skipped injection: session is active before prompt`, { sessionID });
+    return;
+  }
   if (injectionState) {
     injectionState.inFlight = true;
   }
@@ -69926,7 +69983,7 @@ ${todoList}`;
         ...launchModel ? { model: launchModel } : {},
         ...launchVariant ? { variant: launchVariant } : {},
         ...inheritedTools ? { tools: inheritedTools } : {},
-        parts: [createInternalAgentTextPart(prompt)]
+        parts: [createInternalAgentContinuationTextPart(prompt)]
       },
       query: { directory: ctx.directory }
     });
@@ -71025,12 +71082,12 @@ async function playSessionNotificationSound(ctx, platform2, soundPath) {
 }
 
 // src/hooks/session-notification-event-properties.ts
-function isRecord8(value) {
+function isRecord9(value) {
   return typeof value === "object" && value !== null;
 }
 function getEventInfo(properties) {
   const info = properties?.info;
-  return isRecord8(info) ? info : undefined;
+  return isRecord9(info) ? info : undefined;
 }
 function getSessionID(properties) {
   const sessionID = properties?.sessionID;
@@ -71047,7 +71104,7 @@ function getSessionID(properties) {
   if (typeof infoSessionId === "string" && infoSessionId.length > 0)
     return infoSessionId;
   const part = properties?.part;
-  if (isRecord8(part)) {
+  if (isRecord9(part)) {
     const partSessionID = part.sessionID;
     if (typeof partSessionID === "string" && partSessionID.length > 0)
       return partSessionID;
@@ -71068,13 +71125,13 @@ function getEventToolName(properties) {
 }
 function getQuestionText(properties) {
   const args = properties?.args;
-  if (!isRecord8(args))
+  if (!isRecord9(args))
     return "";
   const questions = args.questions;
   if (!Array.isArray(questions) || questions.length === 0)
     return "";
   const firstQuestion = questions[0];
-  if (!isRecord8(firstQuestion))
+  if (!isRecord9(firstQuestion))
     return "";
   const questionText = firstQuestion.question;
   return typeof questionText === "string" ? questionText : "";
@@ -72304,7 +72361,7 @@ async function resumeSession(client, config) {
     await client.session.promptAsync({
       path: { id: config.sessionID },
       body: {
-        parts: [createInternalAgentTextPart(RECOVERY_RESUME_TEXT)],
+        parts: [createInternalAgentContinuationTextPart(RECOVERY_RESUME_TEXT)],
         agent: config.agent,
         ...launchModel ? { model: launchModel } : {},
         ...launchVariant ? { variant: launchVariant } : {},
@@ -74039,6 +74096,12 @@ async function runAggressiveTruncationStrategy(params) {
     clearSessionState(params.autoCompactState, params.sessionID);
     setTimeout(async () => {
       try {
+        if (await isSessionActive(params.client, params.sessionID)) {
+          log("[auto-compact] skipped delayed auto prompt because session became active", {
+            sessionID: params.sessionID
+          });
+          return;
+        }
         const sdkMessage = await findNearestMessageWithFieldsFromSDK(params.client, params.sessionID);
         const previousMessage = sdkMessage ?? (() => {
           const messageDir = getMessageDir(params.sessionID);
@@ -74060,7 +74123,12 @@ async function runAggressiveTruncationStrategy(params) {
           },
           query: { directory: params.directory }
         });
-      } catch {}
+      } catch (error) {
+        log("[auto-compact] delayed auto prompt failed", {
+          sessionID: params.sessionID,
+          error: String(error)
+        });
+      }
     }, 500);
     return { handled: true, nextTruncateAttempt };
   }
@@ -75408,6 +75476,12 @@ function getNextReachableFallback(sessionID, state3) {
 }
 
 // src/hooks/model-fallback/fallback-state-controller.ts
+function canonicalizeModelIDForDuplicateCheck(modelID) {
+  return modelID.toLowerCase().replace(/\./g, "-");
+}
+function isSameFailedModel(state3, providerID, modelID) {
+  return state3.providerID.toLowerCase() === providerID.toLowerCase() && canonicalizeModelIDForDuplicateCheck(state3.modelID) === canonicalizeModelIDForDuplicateCheck(modelID);
+}
 function createModelFallbackStateController(input) {
   const { pendingModelFallbacks, lastToastKey, sessionFallbackChains } = input;
   function setSessionFallbackChain(sessionID, fallbackChain) {
@@ -75446,6 +75520,10 @@ function createModelFallbackStateController(input) {
       log(`[model-fallback] Pending fallback already armed for session: ${sessionID}`);
       return false;
     }
+    if (existing.attemptCount > 0 && isSameFailedModel(existing, currentProviderID, currentModelID)) {
+      log(`[model-fallback] Ignoring duplicate fallback arm for already handled model in session: ${sessionID}`);
+      return false;
+    }
     existing.providerID = currentProviderID;
     existing.modelID = currentModelID;
     existing.pending = true;
@@ -76690,7 +76768,7 @@ ${result.stderr.trim()}`);
 
 // src/hooks/claude-code-hooks/handlers/tool-execute-after-handler.ts
 init_shared();
-function isRecord9(value) {
+function isRecord10(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function getStringValue(record, key) {
@@ -76703,7 +76781,7 @@ function getNumberValue(record, key) {
 }
 function buildTranscriptToolOutput(outputText, metadata) {
   const compactOutput = { output: outputText };
-  if (!isRecord9(metadata)) {
+  if (!isRecord10(metadata)) {
     return compactOutput;
   }
   const filePath = getStringValue(metadata, "filePath") ?? getStringValue(metadata, "path") ?? getStringValue(metadata, "file");
@@ -76725,7 +76803,7 @@ function buildTranscriptToolOutput(outputText, metadata) {
     }
   }
   const filediff = metadata.filediff;
-  if (isRecord9(filediff)) {
+  if (isRecord10(filediff)) {
     const additions = getNumberValue(filediff, "additions");
     const deletions = getNumberValue(filediff, "deletions");
     if (additions !== undefined || deletions !== undefined) {
@@ -78695,14 +78773,14 @@ var defaultDeps3 = {
   runBackgroundUpdateCheck,
   log
 };
-var isRecord10 = (value) => {
+var isRecord11 = (value) => {
   return typeof value === "object" && value !== null;
 };
 var getParentID = (properties) => {
-  if (!isRecord10(properties))
+  if (!isRecord11(properties))
     return;
   const { info } = properties;
-  if (!isRecord10(info))
+  if (!isRecord11(info))
     return;
   const { parentID } = info;
   return typeof parentID === "string" && parentID.length > 0 ? parentID : undefined;
@@ -80171,6 +80249,31 @@ function detectBannedCommand(command) {
   }
   return;
 }
+function detectWindowsShellType(shellPath) {
+  if (!shellPath) {
+    return;
+  }
+  const shellName = shellPath.replace(/\\/g, "/").split("/").pop()?.toLowerCase();
+  if (shellName === "cmd" || shellName === "cmd.exe") {
+    return "cmd";
+  }
+  if (shellName === "powershell" || shellName === "powershell.exe" || shellName === "pwsh" || shellName === "pwsh.exe") {
+    return "powershell";
+  }
+  return;
+}
+function detectCommandShellType() {
+  if (process.platform === "win32" && process.env.SHELL) {
+    const shellType = detectWindowsShellType(process.env.SHELL);
+    if (shellType) {
+      return shellType;
+    }
+  }
+  if (process.platform === "win32" && !process.env.SHELL && !process.env.MSYSTEM) {
+    return detectWindowsShellType(process.env.ComSpec) ?? "cmd";
+  }
+  return detectShellType();
+}
 function createNonInteractiveEnvHook(_ctx) {
   return {
     "tool.execute.before": async (input, output) => {
@@ -80189,7 +80292,7 @@ function createNonInteractiveEnvHook(_ctx) {
       if (!isGitCommand) {
         return;
       }
-      const shellType = detectShellType();
+      const shellType = detectCommandShellType();
       const envPrefix = buildEnvPrefix(NON_INTERACTIVE_ENV, shellType);
       if (command.trim().startsWith(envPrefix.trim())) {
         return;
@@ -81111,8 +81214,8 @@ function createLoopStateController(options) {
     clear() {
       return clearState(directory, stateDir);
     },
-    incrementIteration() {
-      return incrementIteration(directory, stateDir);
+    incrementIteration(expected) {
+      return incrementIteration(directory, stateDir, expected);
     },
     setSessionID(sessionID) {
       const state3 = readState(directory, stateDir);
@@ -81125,11 +81228,14 @@ function createLoopStateController(options) {
       }
       return state3;
     },
-    setMessageCountAtStart(sessionID, messageCountAtStart) {
+    setMessageCountAtStart(sessionID, messageCountAtStart, expectedStartedAt) {
       const state3 = readState(directory, stateDir);
       if (!state3 || state3.session_id !== sessionID) {
         return null;
       }
+      if (state3.iteration !== 1 || state3.verification_pending || state3.message_count_at_start !== undefined || expectedStartedAt !== undefined && state3.started_at !== expectedStartedAt) {
+        return null;
+      }
       state3.message_count_at_start = messageCountAtStart;
       if (!writeState(directory, state3, stateDir)) {
         return null;
@@ -81366,7 +81472,7 @@ async function injectContinuationPrompt(ctx, options) {
         ...launchModel ? { model: launchModel } : {},
         ...launchVariant ? { variant: launchVariant } : {},
         ...inheritedTools ? { tools: inheritedTools } : {},
-        parts: [createInternalAgentTextPart(options.prompt)]
+        parts: [createInternalAgentContinuationTextPart(options.prompt)]
       },
       query: { directory: options.directory }
     });
@@ -81496,7 +81602,7 @@ function resolveToolCallID(ctx) {
 }
 // src/features/tool-metadata-store/task-metadata-contract.ts
 init_logger();
-function isRecord12(value) {
+function isRecord13(value) {
   return typeof value === "object" && value !== null;
 }
 function readString2(value) {
@@ -81581,7 +81687,7 @@ function parseTaskMetadataBlock(text) {
   return parsed;
 }
 function extractTaskLink(metadata, outputText) {
-  if (isRecord12(metadata)) {
+  if (isRecord13(metadata)) {
     const metadataLink = {
       sessionId: readSessionIdFromMetadata(metadata),
       taskId: readTaskIdFromMetadata(metadata),
@@ -81879,9 +81985,9 @@ async function continueIteration(ctx, state3, options) {
         previousSessionID: options.previousSessionID,
         newSessionID
       });
-      return { status: "dispatched" };
+      return { status: "dispatch_rejected", error: "state commit failed after reset dispatch" };
     }
-    return { status: "dispatched" };
+    return { status: "dispatched", sessionID: newSessionID };
   }
   try {
     const promptResult = await injectContinuationPrompt(ctx, {
@@ -81896,7 +82002,7 @@ async function continueIteration(ctx, state3, options) {
   } catch (error) {
     return { status: "dispatch_rejected", error };
   }
-  return { status: "dispatched" };
+  return { status: "dispatched", sessionID: options.previousSessionID };
 }
 
 // src/hooks/ralph-loop/pending-verification-handler.ts
@@ -82352,6 +82458,10 @@ function createRalphLoopEventHandler(ctx, options) {
           });
           return;
         }
+        if (await isSessionActive(ctx.client, sessionID)) {
+          log(`[${HOOK_NAME3}] Skipped: session became active during settle window`, { sessionID });
+          return;
+        }
         if (stateAfterSettle.verification_pending) {
           log(`[${HOOK_NAME3}] Skipped: state entered verification_pending during settle window`, { sessionID });
           return;
@@ -82390,11 +82500,21 @@ function createRalphLoopEventHandler(ctx, options) {
           })) {
             return;
           }
-          const committed = options.loopState.incrementIteration();
+          const committed = options.loopState.incrementIteration({
+            iteration: stateBeforeCommit.iteration,
+            sessionID: result.sessionID
+          });
           if (committed) {
             showIterationToast(ctx, committed);
           } else {
             log(`[${HOOK_NAME3}] Dispatch succeeded but iteration commit failed`, { sessionID });
+            options.loopState.clear();
+            showToastBestEffort3(ctx, {
+              title: "Ralph Loop Failed",
+              message: "Dispatch succeeded but iteration commit failed",
+              variant: "warning",
+              duration: 5000
+            });
           }
           return;
         }
@@ -82485,6 +82605,10 @@ function createRalphLoopEventHandler(ctx, options) {
           });
           return;
         }
+        if (await isSessionActive(ctx.client, sessionID)) {
+          log(`[${HOOK_NAME3}] Skipped: session became active during settle window`, { sessionID });
+          return;
+        }
         if (stateAfterSettle.verification_pending) {
           log(`[${HOOK_NAME3}] Skipped: state entered verification_pending during settle window`, { sessionID });
           return;
@@ -82518,12 +82642,22 @@ function createRalphLoopEventHandler(ctx, options) {
           })) {
             return;
           }
-          const committed = options.loopState.incrementIteration();
+          const committed = options.loopState.incrementIteration({
+            iteration: stateBeforeCommit.iteration,
+            sessionID: result.sessionID
+          });
           if (committed) {
             showIterationToast(ctx, committed);
             runtimeErrorRetriedSessions.set(sessionID, committed.iteration);
           } else {
             log(`[${HOOK_NAME3}] Dispatch succeeded but iteration commit failed after runtime error`, { sessionID });
+            options.loopState.clear();
+            showToastBestEffort3(ctx, {
+              title: "Ralph Loop Failed",
+              message: "Dispatch succeeded but iteration commit failed",
+              variant: "warning",
+              duration: 5000
+            });
           }
           return;
         }
@@ -82584,12 +82718,14 @@ function createRalphLoopHook(ctx, options) {
       if (!startSuccess || typeof loopOptions?.messageCountAtStart === "number") {
         return startSuccess;
       }
+      const startedState = loopState.getState();
+      const expectedStartedAt = startedState?.session_id === sessionID ? startedState.started_at : undefined;
       ctx.client.session.messages({
         path: { id: sessionID },
         query: { directory: ctx.directory }
       }).then((messagesResponse) => {
         const messageCountAtStart = getMessageCountFromResponse2(messagesResponse);
-        loopState.setMessageCountAtStart(sessionID, messageCountAtStart);
+        loopState.setMessageCountAtStart(sessionID, messageCountAtStart, expectedStartedAt);
       }).catch(() => {});
       return startSuccess;
     },
@@ -89383,7 +89519,7 @@ function createProcessedCommandStore() {
 
 // src/hooks/auto-slash-command/hook.ts
 var COMMAND_EXECUTE_FALLBACK_DEDUP_TTL_MS = 100;
-function isRecord13(value) {
+function isRecord14(value) {
   return typeof value === "object" && value !== null;
 }
 function getDeletedSessionID(properties) {
@@ -89401,7 +89537,7 @@ function getCommandExecutionEventID(input) {
     "commandId"
   ];
   const recordInput = input;
-  if (!isRecord13(recordInput)) {
+  if (!isRecord14(recordInput)) {
     return null;
   }
   for (const key of candidateKeys) {
@@ -91211,12 +91347,6 @@ init_shared();
 init_agent_display_names();
 init_logger();
 
-// src/hooks/shared/session-idle-settle.ts
-var DEFAULT_SESSION_IDLE_SETTLE_MS = 150;
-function settleAfterSessionIdle(ms = DEFAULT_SESSION_IDLE_SETTLE_MS) {
-  return ms > 0 ? new Promise((resolve14) => setTimeout(resolve14, ms)) : Promise.resolve();
-}
-
 // src/hooks/atlas/boulder-continuation-injector.ts
 init_logger();
 init_shared();
@@ -91500,6 +91630,10 @@ async function injectBoulderContinuation(input) {
     return "skipped_agent_unavailable";
   }
   try {
+    if (await isSessionActive(ctx.client, sessionID)) {
+      log(`[${HOOK_NAME7}] Skipped injection: session is active`, { sessionID });
+      return "skipped_active_session";
+    }
     log(`[${HOOK_NAME7}] Injecting boulder continuation`, { sessionID, planName, remaining });
     const promptContext = await resolveRecentPromptContextForSession(ctx, sessionID);
     const inheritedTools = resolveInheritedPromptTools(sessionID, promptContext.tools);
@@ -91512,7 +91646,7 @@ async function injectBoulderContinuation(input) {
         ...launchModel ? { model: launchModel } : {},
         ...launchVariant ? { variant: launchVariant } : {},
         ...inheritedTools ? { tools: inheritedTools } : {},
-        parts: [createInternalAgentTextPart(prompt)]
+        parts: [createInternalAgentContinuationTextPart(prompt)]
       },
       query: { directory: ctx.directory }
     });
@@ -91760,11 +91894,15 @@ async function handleAtlasSessionIdle(input) {
     const prompt = BOULDER_COMPLETE_PROMPT.replace(/{PLAN_NAME}/g, work.plan_name).replace(/{ELAPSED_HUMAN}/g, elapsedHuman).replace(/{TASK_BREAKDOWN}/g, taskBreakdown.length > 0 ? taskBreakdown : "- (no task timings)");
     const atlasAgent = resolveRegisteredAgentName(boulderState.agent ?? (isAgentRegistered("atlas") ? "atlas" : undefined));
     if (atlasAgent && isAgentRegistered(atlasAgent)) {
+      if (!await shouldPromptAfterSessionIdle(ctx.client, sessionID, options?.idleSettleMs)) {
+        log(`[${HOOK_NAME7}] Boulder completion nudge skipped because session is active`, { sessionID });
+        return;
+      }
       await ctx.client.session.promptAsync({
         path: { id: sessionID },
         body: {
           agent: atlasAgent,
-          parts: [createInternalAgentTextPart(prompt)]
+          parts: [createInternalAgentContinuationTextPart(prompt)]
         },
         query: { directory: ctx.directory }
       });
@@ -91842,7 +91980,10 @@ async function handleAtlasSessionIdle(input) {
     });
     return;
   }
-  await settleAfterSessionIdle(options?.idleSettleMs);
+  if (!await shouldPromptAfterSessionIdle(ctx.client, sessionID, options?.idleSettleMs)) {
+    log(`[${HOOK_NAME7}] Skipped: session became active during idle settle`, { sessionID });
+    return;
+  }
   await injectContinuation2({
     ctx,
     sessionID,
@@ -93483,7 +93624,7 @@ function createRecoveryLogic(ctx, getTailState) {
           agent: launchAgent ?? expectedPromptConfig.agent,
           ...model ? { model } : {},
           ...tools ? { tools } : {},
-          parts: [createInternalAgentTextPart(AGENT_RECOVERY_PROMPT)]
+          parts: [createInternalAgentContinuationTextPart(AGENT_RECOVERY_PROMPT)]
         },
         query: { directory: ctx.directory }
       });
@@ -93889,16 +94030,16 @@ var THINKING_SUMMARY_MAX_CHARS = 500;
 function hasData(value) {
   return typeof value === "object" && value !== null && "data" in value;
 }
-function isRecord14(value) {
+function isRecord15(value) {
   return typeof value === "object" && value !== null;
 }
 function getMessageInfo(value) {
-  if (!isRecord14(value))
+  if (!isRecord15(value))
     return;
-  if (!isRecord14(value.info))
+  if (!isRecord15(value.info))
     return;
   const info = value.info;
-  const modelValue = isRecord14(info.model) ? info.model : undefined;
+  const modelValue = isRecord15(info.model) ? info.model : undefined;
   const model = modelValue && typeof modelValue.providerID === "string" && typeof modelValue.modelID === "string" ? {
     providerID: modelValue.providerID,
     modelID: modelValue.modelID,
@@ -93910,7 +94051,7 @@ function getMessageInfo(value) {
     model,
     providerID: typeof info.providerID === "string" ? info.providerID : undefined,
     modelID: typeof info.modelID === "string" ? info.modelID : undefined,
-    tools: isRecord14(info.tools) ? Object.entries(info.tools).reduce((acc, [key, value2]) => {
+    tools: isRecord15(info.tools) ? Object.entries(info.tools).reduce((acc, [key, value2]) => {
       if (value2 === true || value2 === false || value2 === "allow" || value2 === "deny" || value2 === "ask") {
         acc[key] = value2;
       }
@@ -93919,11 +94060,11 @@ function getMessageInfo(value) {
   };
 }
 function getMessageParts(value) {
-  if (!isRecord14(value))
+  if (!isRecord15(value))
     return [];
   if (!Array.isArray(value.parts))
     return [];
-  return value.parts.filter(isRecord14).map((part) => ({
+  return value.parts.filter(isRecord15).map((part) => ({
     type: typeof part.type === "string" ? part.type : undefined,
     text: typeof part.text === "string" ? part.text : undefined,
     thinking: typeof part.thinking === "string" ? part.thinking : undefined
@@ -94108,7 +94249,10 @@ function createUnstableAgentBabysitterHook(ctx, options) {
       try {
         const launchModel = model ? { providerID: model.providerID, modelID: model.modelID } : undefined;
         const launchVariant = model?.variant;
-        await settleAfterSessionIdle(options.idleSettleMs);
+        if (!await shouldPromptAfterSessionIdle(ctx.client, mainSessionID, options.idleSettleMs)) {
+          log(`[${HOOK_NAME10}] Reminder skipped because main session is active`, { taskId: task.id, sessionID: mainSessionID });
+          continue;
+        }
         await ctx.client.session.promptAsync({
           path: { id: mainSessionID },
           body: {
@@ -94736,11 +94880,11 @@ function buildRetryModelPayload(model, agentSettings) {
 }
 
 // src/hooks/runtime-fallback/session-messages.ts
-function isRecord15(value) {
+function isRecord16(value) {
   return typeof value === "object" && value !== null;
 }
 function isSessionMessage(value) {
-  return isRecord15(value);
+  return isRecord16(value);
 }
 function isSessionMessageArray(value) {
   return Array.isArray(value) && value.every(isSessionMessage);
@@ -94749,7 +94893,7 @@ function extractSessionMessages(messagesResponse) {
   if (isSessionMessageArray(messagesResponse)) {
     return messagesResponse;
   }
-  if (!isRecord15(messagesResponse)) {
+  if (!isRecord16(messagesResponse)) {
     return;
   }
   const data = messagesResponse.data;
@@ -95301,6 +95445,18 @@ function createSessionStatusHandler(deps, helpers, sessionStatusRetryKeys) {
 
 // src/hooks/runtime-fallback/event-handler.ts
 init_event_session_id();
+function resolveEventModel(props) {
+  const model = props?.model;
+  if (typeof model === "string") {
+    return model;
+  }
+  const providerID = props?.providerID;
+  const modelID = props?.modelID;
+  if (typeof providerID === "string" && typeof modelID === "string") {
+    return `${providerID}/${modelID}`;
+  }
+  return;
+}
 function createEventHandler(deps, helpers) {
   const { config, pluginConfig, sessionStates, sessionLastAccess, sessionRetryInFlight, sessionAwaitingFallbackResult, sessionFallbackTimeouts, sessionStatusRetryKeys } = deps;
   const sessionStatusHandler = createSessionStatusHandler(deps, helpers, sessionStatusRetryKeys);
@@ -95405,6 +95561,18 @@ function createEventHandler(deps, helpers) {
       });
       return;
     }
+    if (sessionAwaitingFallbackResult.has(sessionID)) {
+      const pendingFallbackModel = sessionStates.get(sessionID)?.pendingFallbackModel;
+      const eventModel = resolveEventModel(props);
+      if (!pendingFallbackModel || eventModel !== pendingFallbackModel) {
+        log(`[${HOOK_NAME11}] session.error skipped - awaiting fallback result`, {
+          sessionID,
+          pendingFallbackModel,
+          eventModel
+        });
+        return;
+      }
+    }
     sessionAwaitingFallbackResult.delete(sessionID);
     helpers.clearSessionFallbackTimeout(sessionID);
     log(`[${HOOK_NAME11}] session.error received`, {
@@ -101171,7 +101339,7 @@ function normalizeToolArgSchemas(toolDefinition) {
   return toolDefinition;
 }
 var UNSUPPORTED_SCHEMA_KEYWORDS = new Set(["contentEncoding", "contentMediaType"]);
-function isRecord16(value) {
+function isRecord17(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function normalizeJsonSchemaRef(value) {
@@ -101184,7 +101352,7 @@ function sanitizeJsonSchema(value, depth = 0, isPropertyName = false) {
   if (Array.isArray(value)) {
     return value.map((item) => sanitizeJsonSchema(item, depth + 1, false));
   }
-  if (!isRecord16(value)) {
+  if (!isRecord17(value)) {
     return value;
   }
   const sanitized = {};
@@ -102344,6 +102512,9 @@ var BLOCKED_TMUX_SUBCOMMANDS = [
   "pipe-pane",
   "pipep"
 ];
+var PROHIBITED_TMUX_SUBCOMMANDS = [
+  "kill-server"
+];
 var INTERACTIVE_BASH_DESCRIPTION = `WARNING: This is TMUX ONLY. Pass tmux subcommands directly (without 'tmux' prefix).
 
 Examples: new-session -d -s omo-dev, send-keys -t omo-dev "vim" Enter
@@ -102352,6 +102523,7 @@ For TUI apps needing ongoing interaction (vim, htop, pudb). One-shot commands \u
 
 // src/tools/interactive-bash/tools.ts
 init_tmux_path_resolver();
+var GLOBAL_TMUX_OPTIONS_WITH_ARGS = new Set(["-L", "-S", "-f", "-c", "-T"]);
 function resolveTmuxExecutable2(tmuxPath2) {
   if (!isCmuxCompatEnvironment()) {
     return [tmuxPath2];
@@ -102396,6 +102568,71 @@ function tokenizeCommand2(cmd) {
     tokens.push(current);
   return tokens;
 }
+function findSubcommandIndex(parts) {
+  let index = 0;
+  while (index < parts.length) {
+    const part = parts[index] ?? "";
+    if (part === "--") {
+      return index + 1 < parts.length ? index + 1 : -1;
+    }
+    if (GLOBAL_TMUX_OPTIONS_WITH_ARGS.has(part)) {
+      index += 2;
+      continue;
+    }
+    if (part.startsWith("-")) {
+      index++;
+      continue;
+    }
+    return index;
+  }
+  return -1;
+}
+function getTargetSessionName(parts) {
+  const sessionIdx = parts.findIndex((p) => p === "-t" || p.startsWith("-t"));
+  if (sessionIdx === -1) {
+    return "omo-session";
+  }
+  const sessionToken = parts[sessionIdx] ?? "";
+  const nextToken = parts[sessionIdx + 1];
+  if (sessionToken === "-t" && nextToken) {
+    return nextToken;
+  }
+  if (sessionToken.startsWith("-t")) {
+    return sessionToken.slice(2);
+  }
+  return "omo-session";
+}
+function buildBlockedTmuxCommandMessage(command, parts) {
+  const sessionName = getTargetSessionName(parts);
+  return `Error: '${command}' is blocked in interactive_bash.
+
+**USE BASH TOOL INSTEAD:**
+
+\`\`\`bash
+# Capture terminal output
+tmux capture-pane -p -t ${sessionName}
+
+# Or capture with history (last 1000 lines)
+tmux capture-pane -p -t ${sessionName} -S -1000
+\`\`\`
+
+The Bash tool can execute these commands directly. Do NOT retry with interactive_bash.`;
+}
+function buildProhibitedTmuxCommandMessage(command) {
+  return `Error: '${command}' is prohibited in interactive_bash.
+
+NEVER EVER run tmux kill-server from interactive_bash.
+
+It terminates the entire tmux server, destroying every tmux session and pane that the user, Codex, or other agents may be using.
+
+Use scoped cleanup only:
+
+\`\`\`bash
+tmux kill-session -t <session-name>
+\`\`\`
+
+If you created an omo-* session, kill only that exact session. Do not retry kill-server with Bash or any other tool.`;
+}
 var interactive_bash = tool({
   description: INTERACTIVE_BASH_DESCRIPTION,
   args: {
@@ -102408,30 +102645,14 @@ var interactive_bash = tool({
       if (parts.length === 0) {
         return "Error: Empty tmux command";
       }
-      const subcommand = parts[0].toLowerCase();
+      const subcommandIndex = findSubcommandIndex(parts);
+      const rawSubcommand = subcommandIndex === -1 ? "" : parts[subcommandIndex];
+      const subcommand = rawSubcommand.toLowerCase();
+      if (PROHIBITED_TMUX_SUBCOMMANDS.includes(subcommand)) {
+        return buildProhibitedTmuxCommandMessage(rawSubcommand);
+      }
       if (BLOCKED_TMUX_SUBCOMMANDS.includes(subcommand)) {
-        const sessionIdx = parts.findIndex((p) => p === "-t" || p.startsWith("-t"));
-        let sessionName = "omo-session";
-        if (sessionIdx !== -1) {
-          if (parts[sessionIdx] === "-t" && parts[sessionIdx + 1]) {
-            sessionName = parts[sessionIdx + 1];
-          } else if (parts[sessionIdx].startsWith("-t")) {
-            sessionName = parts[sessionIdx].slice(2);
-          }
-        }
-        return `Error: '${parts[0]}' is blocked in interactive_bash.
-
-**USE BASH TOOL INSTEAD:**
-
-\`\`\`bash
-# Capture terminal output
-tmux capture-pane -p -t ${sessionName}
-
-# Or capture with history (last 1000 lines)
-tmux capture-pane -p -t ${sessionName} -S -1000
-\`\`\`
-
-The Bash tool can execute these commands directly. Do NOT retry with interactive_bash.`;
+        return buildBlockedTmuxCommandMessage(rawSubcommand, parts);
       }
       const proc = spawnWithWindowsHide([...resolveTmuxExecutable2(tmuxPath2), ...parts], {
         stdout: "pipe",
@@ -102902,7 +103123,7 @@ async function formatFullSession(task, client2, options) {
 }
 
 // src/features/background-agent/error-classifier.ts
-function isRecord17(value) {
+function isRecord18(value) {
   return typeof value === "object" && value !== null;
 }
 function isAbortedSessionError(error) {
@@ -102928,7 +103149,7 @@ function getErrorText(error) {
   return "";
 }
 function extractErrorName2(error) {
-  if (isRecord17(error) && typeof error["name"] === "string")
+  if (isRecord18(error) && typeof error["name"] === "string")
     return error["name"];
   if (error instanceof Error)
     return error.name;
@@ -102939,11 +103160,11 @@ function extractErrorMessage(error) {
     return;
   if (typeof error === "string")
     return error;
-  if (isRecord17(error)) {
+  if (isRecord18(error)) {
     const dataRaw = error["data"];
     const candidates = [
       dataRaw,
-      isRecord17(dataRaw) ? dataRaw["error"] : undefined,
+      isRecord18(dataRaw) ? dataRaw["error"] : undefined,
       error["error"],
       error["cause"],
       error
@@ -102951,7 +103172,7 @@ function extractErrorMessage(error) {
     for (const candidate of candidates) {
       if (typeof candidate === "string" && candidate.length > 0)
         return candidate;
-      if (isRecord17(candidate) && typeof candidate["message"] === "string" && candidate["message"].length > 0) {
+      if (isRecord18(candidate) && typeof candidate["message"] === "string" && candidate["message"].length > 0) {
         return candidate["message"];
       }
     }
@@ -102966,10 +103187,10 @@ function extractErrorMessage(error) {
 }
 function getSessionErrorMessage(properties) {
   const errorRaw = properties["error"];
-  if (!isRecord17(errorRaw))
+  if (!isRecord18(errorRaw))
     return;
   const dataRaw = errorRaw["data"];
-  if (isRecord17(dataRaw)) {
+  if (isRecord18(dataRaw)) {
     const message2 = dataRaw["message"];
     if (typeof message2 === "string")
       return message2;
@@ -103745,11 +103966,12 @@ function mergeWithClaudeCodeAgents(serverAgents, directory) {
   const toAgentInfoList = (record) => Object.entries(record).map(([name, config2]) => ({
     name,
     mode: config2.mode,
+    hidden: config2.hidden,
     model: config2.model
   }));
   const mergedAgentMap = new Map;
   const addIfAbsent = (agent) => {
-    const key = agent.name.toLowerCase();
+    const key = stripAgentListSortPrefix(agent.name).trim().toLowerCase();
     if (!mergedAgentMap.has(key)) {
       mergedAgentMap.set(key, agent);
     }
@@ -103782,10 +104004,10 @@ function findPrimaryAgentMatch(agents, requestedAgentName) {
   return agents.find((agent) => agent.mode === "primary" && matchesRequestedAgent(agent, requestedAgentName));
 }
 function findCallableAgentMatch(agents, requestedAgentName) {
-  return agents.find((agent) => isTaskCallableAgentMode(agent.mode) && matchesRequestedAgent(agent, requestedAgentName));
+  return agents.find((agent) => isTaskCallableAgentMode(agent.mode) && agent.hidden !== true && matchesRequestedAgent(agent, requestedAgentName));
 }
 function listCallableAgentNames(agents) {
-  return agents.filter((agent) => isTaskCallableAgentMode(agent.mode)).map((agent) => stripAgentListSortPrefix(agent.name)).sort().join(", ");
+  return agents.filter((agent) => isTaskCallableAgentMode(agent.mode) && agent.hidden !== true).map((agent) => stripAgentListSortPrefix(agent.name)).sort().join(", ");
 }
 
 // src/tools/call-omo-agent/background-executor.ts
@@ -105345,7 +105567,7 @@ init_logger();
 init_shared();
 var NON_TERMINAL_FINISH_REASONS = new Set(["tool-calls", "unknown"]);
 var PENDING_TOOL_PART_TYPES = new Set(["tool", "tool_use", "tool-call"]);
-var ACTIVE_SESSION_STATUSES = new Set(["busy", "retry", "running"]);
+var ACTIVE_SESSION_STATUSES2 = new Set(["busy", "retry", "running"]);
 function wait(milliseconds) {
   const sharedBuffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT);
   const typedArray = new Int32Array(sharedBuffer);
@@ -105363,7 +105585,7 @@ function abortSyncSession(client2, sessionID, reason) {
   });
 }
 function isActiveSessionStatus(status) {
-  return status !== undefined && ACTIVE_SESSION_STATUSES.has(status.type);
+  return status !== undefined && ACTIVE_SESSION_STATUSES2.has(status.type);
 }
 async function fetchSessionMessages(client2, sessionID) {
   const messagesResult = await client2.session.messages({ path: { id: sessionID } });
@@ -111697,10 +111919,10 @@ async function verifySessionExists(client2, sessionID, directory) {
 
 // src/features/background-agent/session-status-classifier.ts
 init_shared();
-var ACTIVE_SESSION_STATUSES2 = new Set(["busy", "retry", "running"]);
+var ACTIVE_SESSION_STATUSES3 = new Set(["busy", "retry", "running"]);
 var KNOWN_TERMINAL_STATUSES = new Set(["idle", "interrupted"]);
 function isActiveSessionStatus2(type2) {
-  if (ACTIVE_SESSION_STATUSES2.has(type2)) {
+  if (ACTIVE_SESSION_STATUSES3.has(type2)) {
     return true;
   }
   if (!KNOWN_TERMINAL_STATUSES.has(type2)) {
@@ -112000,6 +112222,7 @@ function createSubagentDepthLimitError(input) {
 }
 
 // src/features/background-agent/manager.ts
+var PENDING_PARENT_WAKE_RETRY_MS = 1000;
 function resolveMessagePartInfo(properties) {
   if (!properties || typeof properties !== "object") {
     return;
@@ -112062,6 +112285,8 @@ class BackgroundManager {
   completedTaskSummaries = new Map;
   idleDeferralTimers = new Map;
   notificationQueueByParent = new Map;
+  pendingParentWakes = new Map;
+  pendingParentWakeTimers = new Map;
   observedOutputSessions = new Set;
   observedIncompleteTodosBySession = new Map;
   rootDescendantCounts;
@@ -113031,6 +113256,12 @@ The fallback retry session is now created and can be inspected directly.
     if (event.type === "session.idle") {
       if (!props || typeof props !== "object")
         return;
+      const sessionID = resolveSessionEventID(props);
+      if (sessionID) {
+        this.enqueueNotificationForParent(sessionID, () => this.flushPendingParentWake(sessionID)).catch((error) => {
+          log("[background-agent] Failed to flush pending parent wake:", { sessionID, error });
+        });
+      }
       handleSessionIdleBackgroundEvent({
         properties: props,
         findBySession: (id) => {
@@ -113041,7 +113272,7 @@ The fallback retry session is now created and can be inspected directly.
         validateSessionHasOutput: (id) => this.validateSessionHasOutput(id),
         checkSessionTodos: (id) => this.checkSessionTodos(id),
         tryCompleteTask: (task, source) => this.tryCompleteTask(task, source),
-        emitIdleEvent: (sessionID) => this.handleEvent({ type: "session.idle", properties: { sessionID } })
+        emitIdleEvent: (sessionID2) => this.handleEvent({ type: "session.idle", properties: { sessionID: sessionID2 } })
       });
     }
     if (event.type === "session.error") {
@@ -113610,7 +113841,7 @@ ${originalText}`;
         }, this.directory);
         const messages = normalizeSDKResponse(messagesResp, []);
         promptContext = resolvePromptContextFromSessionMessages(messages, task.parentSessionId);
-        const normalizedTools = isRecord17(promptContext?.tools) ? normalizePromptTools(promptContext.tools) : undefined;
+        const normalizedTools = isRecord18(promptContext?.tools) ? normalizePromptTools(promptContext.tools) : undefined;
         if (promptContext?.agent || promptContext?.model || normalizedTools) {
           agent = promptContext?.agent ?? task.parentAgent;
           model = promptContext?.model?.providerID && promptContext.model.modelID ? { providerID: promptContext.model.providerID, modelID: promptContext.model.modelID } : undefined;
@@ -113644,30 +113875,41 @@ ${originalText}`;
         ...variant !== undefined ? { variant } : {},
         ...resolvedTools ? { tools: resolvedTools } : {}
       };
-      try {
-        await promptAsyncInDirectory(this.client, {
-          path: { id: task.parentSessionId },
-          body: {
-            noReply: !shouldReply,
-            ...parentPromptContext,
-            parts: [createInternalAgentTextPart(notification2)]
-          }
-        }, this.directory);
-        log("[background-agent] Sent notification to parent session:", {
+      const shouldDeferNotification = await this.isSessionActive(task.parentSessionId);
+      if (shouldDeferNotification) {
+        this.queuePendingParentWake(task.parentSessionId, notification2, parentPromptContext, shouldReply);
+        log("[background-agent] Deferred notification until parent session is idle:", {
           taskId: task.id,
           allComplete,
           isTaskFailure,
-          noReply: !shouldReply
+          shouldReply
         });
-      } catch (error) {
-        if (isAbortedSessionError(error)) {
-          log("[background-agent] Parent session aborted while sending notification; continuing cleanup:", {
+      } else {
+        try {
+          await promptAsyncInDirectory(this.client, {
+            path: { id: task.parentSessionId },
+            body: {
+              noReply: !shouldReply,
+              ...parentPromptContext,
+              parts: [createInternalAgentTextPart(notification2)]
+            }
+          }, this.directory);
+          log("[background-agent] Sent notification to parent session:", {
             taskId: task.id,
-            parentSessionID: task.parentSessionId
+            allComplete,
+            isTaskFailure,
+            noReply: !shouldReply
           });
-          this.queuePendingNotification(task.parentSessionId, notification2);
-        } else {
-          log("[background-agent] Failed to send notification:", error);
+        } catch (error) {
+          if (isAbortedSessionError(error)) {
+            log("[background-agent] Parent session aborted while sending notification; continuing cleanup:", {
+              taskId: task.id,
+              parentSessionID: task.parentSessionId
+            });
+            this.queuePendingNotification(task.parentSessionId, notification2);
+          } else {
+            log("[background-agent] Failed to send notification:", error);
+          }
         }
       }
     } else {
@@ -113680,6 +113922,80 @@ ${originalText}`;
       this.scheduleTaskRemoval(task.id);
     }
   }
+  async isSessionActive(sessionID) {
+    return isSessionActive(this.client, sessionID);
+  }
+  queuePendingParentWake(sessionID, notification2, promptContext, shouldReply) {
+    const pendingWake = this.pendingParentWakes.get(sessionID);
+    if (pendingWake) {
+      pendingWake.notifications.push(notification2);
+      pendingWake.promptContext = promptContext;
+      pendingWake.shouldReply = pendingWake.shouldReply || shouldReply;
+    } else {
+      this.pendingParentWakes.set(sessionID, {
+        promptContext,
+        notifications: [notification2],
+        shouldReply
+      });
+    }
+    this.schedulePendingParentWakeFlush(sessionID);
+  }
+  async flushPendingParentWake(sessionID) {
+    const pendingWake = this.pendingParentWakes.get(sessionID);
+    if (!pendingWake) {
+      this.clearPendingParentWakeTimer(sessionID);
+      return;
+    }
+    if (await this.isSessionActive(sessionID)) {
+      this.schedulePendingParentWakeFlush(sessionID);
+      return;
+    }
+    this.pendingParentWakes.delete(sessionID);
+    this.clearPendingParentWakeTimer(sessionID);
+    await settleAfterSessionIdle();
+    if (await this.isSessionActive(sessionID)) {
+      this.pendingParentWakes.set(sessionID, pendingWake);
+      this.schedulePendingParentWakeFlush(sessionID);
+      return;
+    }
+    const notificationContent = pendingWake.notifications.join(`
+
+`);
+    try {
+      await promptAsyncInDirectory(this.client, {
+        path: { id: sessionID },
+        body: {
+          noReply: !pendingWake.shouldReply,
+          ...pendingWake.promptContext,
+          parts: [createInternalAgentTextPart(notificationContent)]
+        }
+      }, this.directory);
+      log("[background-agent] Sent deferred parent wake:", { sessionID });
+    } catch (error) {
+      this.queuePendingNotification(sessionID, notificationContent);
+      log("[background-agent] Failed to send deferred parent wake:", { sessionID, error });
+    }
+  }
+  schedulePendingParentWakeFlush(sessionID) {
+    if (this.pendingParentWakeTimers.has(sessionID)) {
+      return;
+    }
+    const timer = setTimeout(() => {
+      this.pendingParentWakeTimers.delete(sessionID);
+      this.enqueueNotificationForParent(sessionID, () => this.flushPendingParentWake(sessionID)).catch((error) => {
+        log("[background-agent] Failed to retry pending parent wake:", { sessionID, error });
+      });
+    }, PENDING_PARENT_WAKE_RETRY_MS);
+    this.pendingParentWakeTimers.set(sessionID, timer);
+  }
+  clearPendingParentWakeTimer(sessionID) {
+    const timer = this.pendingParentWakeTimers.get(sessionID);
+    if (!timer) {
+      return;
+    }
+    clearTimeout(timer);
+    this.pendingParentWakeTimers.delete(sessionID);
+  }
   hasRunningTasks() {
     for (const task of this.tasks.values()) {
       if (task.status === "running")
@@ -113949,6 +114265,10 @@ ${originalText}`;
       clearTimeout(timer);
     }
     this.idleDeferralTimers.clear();
+    for (const timer of this.pendingParentWakeTimers.values()) {
+      clearTimeout(timer);
+    }
+    this.pendingParentWakeTimers.clear();
     for (const sessionID of trackedSessionIDs) {
       subagentSessions.delete(sessionID);
       SessionCategoryRegistry.remove(sessionID);
@@ -113959,6 +114279,7 @@ ${originalText}`;
     this.notifications.clear();
     this.pendingNotifications.clear();
     this.pendingByParent.clear();
+    this.pendingParentWakes.clear();
     this.notificationQueueByParent.clear();
     this.rootDescendantCounts.clear();
     this.queuesByKey.clear();
@@ -114213,7 +114534,7 @@ async function getOrRegisterClient(options) {
   }
 }
 function parseRegistrationResponse(data) {
-  if (!isRecord18(data))
+  if (!isRecord19(data))
     return null;
   const clientId = data.client_id;
   if (typeof clientId !== "string" || clientId.length === 0)
@@ -114224,7 +114545,7 @@ function parseRegistrationResponse(data) {
   }
   return { clientId };
 }
-function isRecord18(value) {
+function isRecord19(value) {
   return typeof value === "object" && value !== null;
 }
 
@@ -137318,11 +137639,11 @@ async function createTools(args) {
 // src/plugin/chat-params.ts
 init_shared();
 var SAFE_MAX_OUTPUT_TOKENS_FALLBACK = 4096;
-function isRecord19(value) {
+function isRecord20(value) {
   return typeof value === "object" && value !== null;
 }
 function buildChatParamsInput(raw) {
-  if (!isRecord19(raw))
+  if (!isRecord20(raw))
     return null;
   const sessionID = raw.sessionID;
   const agent = raw.agent;
@@ -137331,16 +137652,16 @@ function buildChatParamsInput(raw) {
   const message = raw.message;
   if (typeof sessionID !== "string")
     return null;
-  if (!isRecord19(model))
+  if (!isRecord20(model))
     return null;
-  if (!isRecord19(provider))
+  if (!isRecord20(provider))
     return null;
-  if (!isRecord19(message))
+  if (!isRecord20(message))
     return null;
   let agentName;
   if (typeof agent === "string") {
     agentName = agent;
-  } else if (isRecord19(agent)) {
+  } else if (isRecord20(agent)) {
     const name = agent.name;
     if (typeof name === "string") {
       agentName = name;
@@ -137367,12 +137688,12 @@ function buildChatParamsInput(raw) {
   };
 }
 function isChatParamsOutput(raw) {
-  if (!isRecord19(raw))
+  if (!isRecord20(raw))
     return false;
-  if (!isRecord19(raw.options)) {
+  if (!isRecord20(raw.options)) {
     raw.options = {};
   }
-  return isRecord19(raw.options);
+  return isRecord20(raw.options);
 }
 function createChatParamsHandler(args) {
   return async (input, output) => {
@@ -137412,7 +137733,7 @@ function createChatParamsHandler(args) {
         temperature: typeof output.temperature === "number" ? output.temperature : undefined,
         topP: typeof output.topP === "number" ? output.topP : undefined,
         maxTokens: typeof output.maxOutputTokens === "number" ? output.maxOutputTokens : undefined,
-        thinking: isRecord19(output.options.thinking) ? output.options.thinking : undefined
+        thinking: isRecord20(output.options.thinking) ? output.options.thinking : undefined
       },
       capabilities
     });
@@ -137469,20 +137790,20 @@ function createChatParamsHandler(args) {
 init_shared();
 var INTERNAL_MARKER_CACHE_LIMIT = 1000;
 var internalMarkerCache = new Map;
-function isRecord20(value) {
+function isRecord21(value) {
   return typeof value === "object" && value !== null;
 }
 function buildChatHeadersInput(raw) {
-  if (!isRecord20(raw))
+  if (!isRecord21(raw))
     return null;
   const sessionID = raw.sessionID;
   const provider = raw.provider;
   const message = raw.message;
   if (typeof sessionID !== "string")
     return null;
-  if (!isRecord20(provider) || typeof provider.id !== "string")
+  if (!isRecord21(provider) || typeof provider.id !== "string")
     return null;
-  if (!isRecord20(message))
+  if (!isRecord21(message))
     return null;
   return {
     sessionID,
@@ -137494,12 +137815,12 @@ function buildChatHeadersInput(raw) {
   };
 }
 function isChatHeadersOutput(raw) {
-  if (!isRecord20(raw))
+  if (!isRecord21(raw))
     return false;
-  if (!isRecord20(raw.headers)) {
+  if (!isRecord21(raw.headers)) {
     raw.headers = {};
   }
-  return isRecord20(raw.headers);
+  return isRecord21(raw.headers);
 }
 function isCopilotProvider(providerID) {
   return providerID === "github-copilot" || providerID === "github-copilot-enterprise";
@@ -137515,7 +137836,7 @@ async function hasInternalMarker(client2, sessionID, messageID) {
       path: { id: sessionID, messageID }
     });
     const data = response.data;
-    if (!isRecord20(data) || !Array.isArray(data.parts)) {
+    if (!isRecord21(data) || !Array.isArray(data.parts)) {
       internalMarkerCache.set(cacheKey, false);
       if (internalMarkerCache.size > INTERNAL_MARKER_CACHE_LIMIT) {
         internalMarkerCache.clear();
@@ -137523,7 +137844,7 @@ async function hasInternalMarker(client2, sessionID, messageID) {
       return false;
     }
     const hasMarker = data.parts.some((part) => {
-      if (!isRecord20(part) || part.type !== "text" || typeof part.text !== "string") {
+      if (!isRecord21(part) || part.type !== "text" || typeof part.text !== "string") {
         return false;
       }
       return part.text.includes(OMO_INTERNAL_INITIATOR_MARKER);
@@ -137560,8 +137881,8 @@ function createChatHeadersHandler(args) {
       return;
     if (!isCopilotProvider(normalizedInput.provider.id))
       return;
-    const model = isRecord20(input) && isRecord20(input.model) ? input.model : undefined;
-    const api = model && isRecord20(model.api) ? model.api : undefined;
+    const model = isRecord21(input) && isRecord21(input.model) ? input.model : undefined;
+    const api = model && isRecord21(model.api) ? model.api : undefined;
     if (api?.npm === "@ai-sdk/github-copilot")
       return;
     if (!await isOmoInternalMessage(normalizedInput, ctx.client))
@@ -138258,7 +138579,16 @@ function createTeamIdleWakeHint(ctx, config2, options) {
         return;
       }
       applyMemberSessionRouting(sessionID, memberEntry);
-      await settleAfterSessionIdle(options?.idleSettleMs);
+      if (!await shouldPromptAfterSessionIdle(ctx.client, sessionID, options?.idleSettleMs)) {
+        log("team idle wake hint skipped because session is active", {
+          event: "team-mode-idle-wake-hint-active-session",
+          teamRunId: runtimeState.teamRunId,
+          memberName: memberEntry.name,
+          sessionID,
+          unreadCount: unreadMessages.length
+        });
+        return;
+      }
       await ctx.client.session.promptAsync({
         path: { id: sessionID },
         body: buildMemberPromptBody(memberEntry, buildWakeHint(unreadMessages.length)),
@@ -138529,14 +138859,14 @@ function normalizeSessionStatusToIdle(input) {
 
 // src/plugin/event.ts
 init_event_session_id();
-function isRecord21(value) {
+function isRecord22(value) {
   return typeof value === "object" && value !== null;
 }
 function normalizeFallbackModelID(modelID) {
   return modelID.replace(/-thinking$/i, "").replace(/-max$/i, "").replace(/-high$/i, "");
 }
 function extractErrorName3(error) {
-  if (isRecord21(error) && typeof error.name === "string")
+  if (isRecord22(error) && typeof error.name === "string")
     return error.name;
   if (error instanceof Error)
     return error.name;
@@ -138547,16 +138877,16 @@ function extractErrorMessage3(error) {
     return "";
   if (typeof error === "string")
     return error;
-  if (isRecord21(error)) {
+  if (isRecord22(error)) {
     const candidates = [
       error.data,
-      isRecord21(error.data) ? error.data.error : undefined,
+      isRecord22(error.data) ? error.data.error : undefined,
       error.error,
       error.cause,
       error
     ];
     for (const candidate of candidates) {
-      if (isRecord21(candidate) && typeof candidate.message === "string" && candidate.message.length > 0) {
+      if (isRecord22(candidate) && typeof candidate.message === "string" && candidate.message.length > 0) {
         return candidate.message;
       }
     }
@@ -138612,6 +138942,10 @@ function createEventHandler2(args) {
   const lastHandledRetryStatusKey = new Map;
   const lastKnownModelBySession = new Map;
   const resolveFallbackProviderID = (sessionID, providerHint) => {
+    const normalizedProviderHint = providerHint?.trim();
+    if (normalizedProviderHint) {
+      return normalizedProviderHint;
+    }
     const sessionModel = getSessionModel(sessionID);
     if (sessionModel?.providerID) {
       return sessionModel.providerID;
@@ -138620,10 +138954,6 @@ function createEventHandler2(args) {
     if (lastKnownModel?.providerID) {
       return lastKnownModel.providerID;
     }
-    const normalizedProviderHint = providerHint?.trim();
-    if (normalizedProviderHint) {
-      return normalizedProviderHint;
-    }
     const connectedProvider = readConnectedProvidersCache()?.[0];
     if (connectedProvider) {
       return connectedProvider;
@@ -138638,7 +138968,7 @@ function createEventHandler2(args) {
     if (input.event.type.startsWith("message.") || input.event.type.startsWith("tool.")) {
       return resolveMessageEventSessionID(properties);
     }
-    const record3 = isRecord21(properties) ? properties : undefined;
+    const record3 = isRecord22(properties) ? properties : undefined;
     const sessionID = record3?.sessionID;
     return typeof sessionID === "string" && sessionID.length > 0 ? sessionID : undefined;
   };
@@ -138737,7 +139067,7 @@ function createEventHandler2(args) {
         ...launchAgent ? { agent: launchAgent } : {},
         ...launchModel ? { model: launchModel } : {},
         ...launchVariant ? { variant: launchVariant } : {},
-        parts: [{ type: "text", text: "continue" }]
+        parts: [createInternalAgentContinuationTextPart("continue")]
       },
       query: { directory: pluginContext.directory }
     };
@@ -139044,7 +139374,7 @@ function createEventHandler2(args) {
             });
             await pluginContext.client.session.prompt({
               path: { id: sessionID },
-              body: { parts: [{ type: "text", text: "continue" }] },
+              body: { parts: [createInternalAgentContinuationTextPart("continue")] },
               query: { directory: pluginContext.directory }
             }).catch(() => {});
           }