From c75f548863eaf605863a077b9d12590bf410182a Mon Sep 17 00:00:00 2001
From: YeonGyu-Kim <code.yeon.gyu@gmail.com>
Date: Fri, 15 May 2026 11:29:55 +0900
Subject: [PATCH] fix(fallback): gate model retry prompts

---
 src/plugin/event.ts | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/plugin/event.ts b/src/plugin/event.ts
index 976c732ab..0de6738a2 100644
--- a/src/plugin/event.ts
+++ b/src/plugin/event.ts
@@ -42,6 +42,7 @@ import { createTeamIdleWakeHint } from "../hooks/team-session-events/team-idle-w
 import { createTeamLeadOrphanHandler } from "../hooks/team-session-events/team-lead-orphan-handler";
 import { createTeamMemberErrorHandler } from "../hooks/team-session-events/team-member-error-handler";
 import { createTeamMemberStatusHandler } from "../hooks/team-session-events/team-member-status-handler";
+import { promptAsyncAfterSessionIdle } from "../hooks/shared/prompt-async-gate";
 
 import type { CreatedHooks } from "../create-hooks";
 import type { Managers } from "../create-managers";
@@ -348,6 +349,7 @@ export function createEventHandler(args: {
         client: {
           session: {
             promptAsync: pluginContext.client.session.promptAsync,
+            status: pluginContext.client.session.status,
           },
         },
       }, teamModeConfig)
@@ -495,11 +497,20 @@ export function createEventHandler(args: {
       };
 
       if (typeof pluginContext.client.session.promptAsync === "function") {
-        await pluginContext.client.session.promptAsync(promptBody).then(() => {
-          dispatched = true;
-        }).catch((error) => {
-          log("[event] model-fallback promptAsync failed", { sessionID, source, error });
+        const promptResult = await promptAsyncAfterSessionIdle({
+          client: pluginContext.client,
+          sessionID,
+          source: `model-fallback:${source}`,
+          input: promptBody,
         });
+        if (promptResult.status === "dispatched") {
+          dispatched = true;
+        } else if (promptResult.status === "failed") {
+          const error = promptResult.error;
+          log("[event] model-fallback promptAsync failed", { sessionID, source, error });
+        } else {
+          log("[event] model-fallback promptAsync skipped by gate", { sessionID, source, status: promptResult.status });
+        }
         return;
       }