diff --git a/src/hooks/claude-code-hooks/handlers/session-event-handler.ts b/src/hooks/claude-code-hooks/handlers/session-event-handler.ts
index 534b39e34..8326fdb5f 100644
--- a/src/hooks/claude-code-hooks/handlers/session-event-handler.ts
+++ b/src/hooks/claude-code-hooks/handlers/session-event-handler.ts
@@ -8,6 +8,7 @@ import { clearToolInputCache, stopToolInputCacheCleanup } from "../tool-input-ca
 import type { PluginConfig } from "../types"
 import { createInternalAgentTextPart, isHookDisabled, log } from "../../../shared"
 import { resolveSessionEventID } from "../../../shared/event-session-id"
+import { promptAfterSessionIdle } from "../../../shared/prompt-async-gate"
 import {
 	clearAllSessionHookState,
 	clearSessionHookState,
@@ -108,17 +109,23 @@ export function createSessionEventHandler(
 				})
 			} else if (stopResult.block && stopResult.injectPrompt) {
 				log("Stop hook returned block with inject_prompt", { sessionID })
-				ctx.client.session
-					.prompt({
+				const promptResult = await promptAfterSessionIdle({
+					client: ctx.client,
+					sessionID,
+					source: "claude-code-stop-hook:inject-prompt",
+					input: {
 						path: { id: sessionID },
 						body: {
 							parts: [createInternalAgentTextPart(stopResult.injectPrompt)],
 						},
 						query: { directory: ctx.directory },
-					})
-					.catch((err: unknown) =>
-						log("Failed to inject prompt from Stop hook", { error: String(err) }),
-					)
+					},
+				})
+				if (promptResult.status === "failed") {
+					log("Failed to inject prompt from Stop hook", { error: String(promptResult.error) })
+				} else if (promptResult.status !== "dispatched") {
+					log("Skipped prompt injection from Stop hook", { sessionID, status: promptResult.status })
+				}
 			} else if (stopResult.block) {
 				log("Stop hook returned block", { sessionID, reason: stopResult.reason })
 			}
diff --git a/src/plugin/event.ts b/src/plugin/event.ts
index 0de6738a2..840bbe994 100644
--- a/src/plugin/event.ts
+++ b/src/plugin/event.ts
@@ -42,7 +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 { promptAfterSessionIdle, promptAsyncAfterSessionIdle } from "../hooks/shared/prompt-async-gate";
 
 import type { CreatedHooks } from "../create-hooks";
 import type { Managers } from "../create-managers";
@@ -514,11 +514,19 @@ export function createEventHandler(args: {
         return;
       }
 
-      await pluginContext.client.session.prompt(promptBody).then(() => {
-        dispatched = true;
-      }).catch((error) => {
-        log("[event] model-fallback prompt failed", { sessionID, source, error });
+      const promptResult = await promptAfterSessionIdle({
+        client: pluginContext.client,
+        sessionID,
+        source: `model-fallback:${source}:sync`,
+        input: promptBody,
       });
+      if (promptResult.status === "dispatched") {
+        dispatched = true;
+      } else if (promptResult.status === "failed") {
+        log("[event] model-fallback prompt failed", { sessionID, source, error: promptResult.error });
+      } else {
+        log("[event] model-fallback prompt skipped by gate", { sessionID, source, status: promptResult.status });
+      }
     } finally {
       if (dispatched && fallbackKeys.modelKey) {
         const dispatchedKeys = getFallbackContinuationDedupeState(sessionID);
@@ -909,13 +917,21 @@ export function createEventHandler(args: {
                 log("[event] compaction before recovery continue failed:", { sessionID, error: err });
               });
 
-            await pluginContext.client.session
-              .prompt({
+            const promptResult = await promptAfterSessionIdle({
+              client: pluginContext.client,
+              sessionID,
+              source: "session-recovery:post-compaction-continue",
+              input: {
                 path: { id: sessionID },
                 body: { parts: [createInternalAgentContinuationTextPart("continue")] },
                 query: { directory: pluginContext.directory },
-              })
-              .catch(() => {});
+              },
+            });
+            if (promptResult.status === "failed") {
+              log("[event] recovery continue prompt failed", { sessionID, error: promptResult.error });
+            } else if (promptResult.status !== "dispatched") {
+              log("[event] recovery continue prompt skipped by gate", { sessionID, status: promptResult.status });
+            }
           }
         }
         // Second, try model fallback for model errors (rate limit, quota, provider issues, etc.)