Skip to content

fix(core): break agent loop on permission rejection with feedback #33623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Haohao-end wants to merge 1 commit into
base: dev
Choose a base branch
from
+16 −5
Open

fix(core): break agent loop on permission rejection with feedback #33623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions packages/core/src/session/runner/llm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { EventV2 } from "../../event"
import { Location } from "../../location"
import { ModelV2 } from "../../model"
import { ProviderV2 } from "../../provider"
import { PermissionV2 } from "../../permission"
import { QuestionV2 } from "../../question"
import { SystemContext } from "../../system-context/index"
import { SystemContextRegistry } from "../../system-context/registry"
Expand Down Expand Up @@ -136,9 +137,15 @@ export const layer = Layer.effect(
const awaitToolFibers = (fibers: FiberSet.FiberSet<void, ToolOutputStore.Error>) =>
Effect.raceFirst(FiberSet.join(fibers), FiberSet.awaitEmpty(fibers))

// Match V1: dismissing a question halts the loop instead of becoming model-facing tool output.
const isQuestionRejected = (cause: Cause.Cause<unknown>) =>
cause.reasons.some((reason) => Cause.isDieReason(reason) && reason.defect instanceof QuestionV2.RejectedError)
// Match V1: dismissing a question or permission prompt halts the loop instead of becoming model-facing tool output.
const isHalted = (cause: Cause.Cause<unknown>) =>
cause.reasons.some(
(reason) =>
Cause.isDieReason(reason) &&
(reason.defect instanceof QuestionV2.RejectedError ||
reason.defect instanceof PermissionV2.RejectedError ||
reason.defect instanceof PermissionV2.CorrectedError),
)

type TurnTransition =
// Automatic compaction completed; rebuild the request from compacted history.
Expand Down Expand Up @@ -283,7 +290,7 @@ export const layer = Layer.effect(
}
if (stream._tag === "Failure" && Cause.hasInterrupts(stream.cause)) yield* FiberSet.clear(toolFibers)
const settled = yield* restore(awaitToolFibers(toolFibers)).pipe(Effect.exit)
if (settled._tag === "Failure" && isQuestionRejected(settled.cause)) {
if (settled._tag === "Failure" && isHalted(settled.cause)) {
yield* FiberSet.clear(toolFibers)
yield* withPublication(publisher.failUnsettledTools("Tool execution interrupted"))
return yield* Effect.interrupt
Expand Down
6 changes: 5 additions & 1 deletion packages/opencode/src/session/processor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,11 @@ export const layer = Layer.effect(
time: { start: match.part.state.time.start, end: Date.now() },
},
})
if (error instanceof PermissionV1.RejectedError || error instanceof Question.RejectedError) {
if (
error instanceof PermissionV1.RejectedError ||
error instanceof PermissionV1.CorrectedError ||
error instanceof Question.RejectedError
) {
ctx.blocked = ctx.shouldBreak
}
yield* settleToolCall(toolCallID)
Expand Down
Loading