luna/oh-my-opencode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(hooks): gate sync injected prompts

Browse Source
This commit is contained in:
YeonGyu-Kim
2026-05-15 11:50:02 +09:00
parent 0b48f80569
commit edf3e530d4
2 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hooks/claude-code-hooks/handlers/session-event-handler.ts
+13 -6
View File
@@ -8,6 +8,7 @@ import { clearToolInputCache, stopToolInputCacheCleanup } from "../tool-input-ca
import type { PluginConfig } from "../types" import type { PluginConfig } from "../types"
import { createInternalAgentTextPart, isHookDisabled, log } from "../../../shared" import { createInternalAgentTextPart, isHookDisabled, log } from "../../../shared"
import { resolveSessionEventID } from "../../../shared/event-session-id" import { resolveSessionEventID } from "../../../shared/event-session-id"
import { promptAfterSessionIdle } from "../../../shared/prompt-async-gate"
import { import {
clearAllSessionHookState, clearAllSessionHookState,
clearSessionHookState, clearSessionHookState,
@@ -108,17 +109,23 @@ export function createSessionEventHandler(
}) })
} else if (stopResult.block && stopResult.injectPrompt) { } else if (stopResult.block && stopResult.injectPrompt) {
log("Stop hook returned block with inject_prompt", { sessionID }) log("Stop hook returned block with inject_prompt", { sessionID })
ctx.client.session const promptResult = await promptAfterSessionIdle({
.prompt({ client: ctx.client,
sessionID,
source: "claude-code-stop-hook:inject-prompt",
input: {
path: { id: sessionID }, path: { id: sessionID },
body: { body: {
parts: [createInternalAgentTextPart(stopResult.injectPrompt)], parts: [createInternalAgentTextPart(stopResult.injectPrompt)],
}, },
query: { directory: ctx.directory }, 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) { } else if (stopResult.block) {
log("Stop hook returned block", { sessionID, reason: stopResult.reason }) log("Stop hook returned block", { sessionID, reason: stopResult.reason })
} }
src/plugin/event.ts
+25 -9
View File
@@ -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 { createTeamLeadOrphanHandler } from "../hooks/team-session-events/team-lead-orphan-handler";
import { createTeamMemberErrorHandler } from "../hooks/team-session-events/team-member-error-handler"; import { createTeamMemberErrorHandler } from "../hooks/team-session-events/team-member-error-handler";
import { createTeamMemberStatusHandler } from "../hooks/team-session-events/team-member-status-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 { CreatedHooks } from "../create-hooks";
import type { Managers } from "../create-managers"; import type { Managers } from "../create-managers";
@@ -514,11 +514,19 @@ export function createEventHandler(args: {
return; return;
} }
await pluginContext.client.session.prompt(promptBody).then(() => { const promptResult = await promptAfterSessionIdle({
dispatched = true; client: pluginContext.client,
}).catch((error) => { sessionID,
log("[event] model-fallback prompt failed", { sessionID, source, error }); 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 { } finally {
if (dispatched && fallbackKeys.modelKey) { if (dispatched && fallbackKeys.modelKey) {
const dispatchedKeys = getFallbackContinuationDedupeState(sessionID); const dispatchedKeys = getFallbackContinuationDedupeState(sessionID);
@@ -909,13 +917,21 @@ export function createEventHandler(args: {
log("[event] compaction before recovery continue failed:", { sessionID, error: err }); log("[event] compaction before recovery continue failed:", { sessionID, error: err });
}); });
await pluginContext.client.session const promptResult = await promptAfterSessionIdle({
.prompt({ client: pluginContext.client,
sessionID,
source: "session-recovery:post-compaction-continue",
input: {
path: { id: sessionID }, path: { id: sessionID },
body: { parts: [createInternalAgentContinuationTextPart("continue")] }, body: { parts: [createInternalAgentContinuationTextPart("continue")] },
query: { directory: pluginContext.directory }, 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.) // Second, try model fallback for model errors (rate limit, quota, provider issues, etc.)