fix: only reset merge_ready to active when human message is present

The finalize turn (auto-triggered after reviewer approval) was being
treated as a new working turn because merge_ready was unconditionally
reset to active. Now merge_ready is only reset when a human message
is in the batch, preserving the finalize flow for bot-only turns.
This commit is contained in:
Eyejoker
2026-03-30 19:48:25 +09:00
parent f30b25d2b4
commit 78fa078921
3 changed files with 14 additions and 2 deletions

View File

@@ -78,6 +78,7 @@ export async function runAgentForGroup(
runId: string;
startSeq?: number | null;
endSeq?: number | null;
hasHumanMessage?: boolean;
onOutput?: (output: AgentOutput) => Promise<void>;
},
): Promise<'success' | 'error'> {
@@ -159,6 +160,7 @@ export async function runAgentForGroup(
chatJid,
runId,
roomRoleContext,
hasHumanMessage: args.hasHumanMessage,
});
const effectivePrompt = prompt;
let pairedExecutionStatus: 'succeeded' | 'failed' = 'failed';

View File

@@ -272,6 +272,7 @@ export function createMessageRuntime(deps: MessageRuntimeDeps): {
options?: {
startSeq?: number | null;
endSeq?: number | null;
hasHumanMessage?: boolean;
},
): Promise<'success' | 'error'> =>
runAgentForGroup(
@@ -290,6 +291,7 @@ export function createMessageRuntime(deps: MessageRuntimeDeps): {
runId,
startSeq: options?.startSeq,
endSeq: options?.endSeq,
hasHumanMessage: options?.hasHumanMessage,
onOutput,
},
);
@@ -302,6 +304,7 @@ export function createMessageRuntime(deps: MessageRuntimeDeps): {
channel: Channel;
startSeq: number | null;
endSeq: number | null;
hasHumanMessage?: boolean;
}): Promise<{
outputStatus: 'success' | 'error';
deliverySucceeded: boolean;
@@ -358,7 +361,7 @@ export function createMessageRuntime(deps: MessageRuntimeDeps): {
chatJid,
runId,
(result) => turnController.handleOutput(result),
{ startSeq, endSeq },
{ startSeq, endSeq, hasHumanMessage: args.hasHumanMessage },
);
const { deliverySucceeded, visiblePhase } =
@@ -755,6 +758,7 @@ export function createMessageRuntime(deps: MessageRuntimeDeps): {
pendingTaskForChannel.status === 'in_review');
const turnChannel = useReviewerChannel ? reviewerChannel : channel;
const hasHumanMsg = !isBotOnlyPairedRoomTurn(chatJid, missedMessages);
const { deliverySucceeded, visiblePhase } = await executeTurn({
group,
prompt,
@@ -763,6 +767,7 @@ export function createMessageRuntime(deps: MessageRuntimeDeps): {
channel: turnChannel,
startSeq,
endSeq,
hasHumanMessage: hasHumanMsg,
});
if (!deliverySucceeded) {

View File

@@ -198,6 +198,7 @@ export function preparePairedExecutionContext(args: {
chatJid: string;
runId: string;
roomRoleContext?: RoomRoleContext;
hasHumanMessage?: boolean;
}): PreparedPairedExecutionContext | undefined {
const { group, chatJid, roomRoleContext } = args;
if (!roomRoleContext || !group.workDir) {
@@ -217,9 +218,13 @@ export function preparePairedExecutionContext(args: {
if (roomRoleContext.role === 'owner') {
// New human message → new ping-pong cycle. Reset round trip counter
// AND status so the owner turn is not treated as a finalize turn.
// Reset status on new human message so the owner gets a fresh working
// turn. merge_ready is only reset when a human message is present —
// without it, this is a finalize turn after reviewer approval and
// resetting would prevent task completion.
const needsReset =
latestTask.round_trip_count > 0 ||
latestTask.status === 'merge_ready' ||
(latestTask.status === 'merge_ready' && args.hasHumanMessage === true) ||
latestTask.status === 'review_ready' ||
latestTask.status === 'in_review';
if (needsReset) {