fix(background-agent): align wake activity windows

src/features/background-agent/manager.test.ts

@@ -5643,6 +5643,7 @@ describe("BackgroundManager.handleEvent - session.error", () => {
     const client = {
       session: {
         status: async () => ({ data: { "parent-session-wake": { type: "idle" } } }),
+        messages: async () => ({ data: [] }),
         promptAsync: async (args: { path: { id: string }; body: Record<string, unknown> }) => {
           promptCalls.push(args)
           return {}
@@ -5699,6 +5700,7 @@ describe("BackgroundManager.handleEvent - session.error", () => {
     const client = {
       session: {
         status: async () => ({ data: { "parent-session-alias": { type: "idle" } } }),
+        messages: async () => ({ data: [] }),
         promptAsync: async (args: { path: { id: string }; body: Record<string, unknown> }) => {
           promptCalls.push(args)
           return {}

src/features/background-agent/manager.ts

@@ -149,7 +149,7 @@ const PARENT_WAKE_TOOL_CALL_DEFER_MAX_MS = 5_000
  * env. See issue #4120.
  */
 const PARENT_WAKE_USER_MESSAGE_IN_PROGRESS_WINDOW_MS = 2_000
-const PARENT_WAKE_SESSION_ACTIVITY_IN_PROGRESS_WINDOW_MS = 2_000
+const PARENT_WAKE_SESSION_ACTIVITY_IN_PROGRESS_WINDOW_MS = PARENT_WAKE_TOOL_CALL_DEFER_MAX_MS
 
 interface EventProperties {
   sessionID?: string

src/features/background-agent/parent-wake-activity-window.test.ts

@@ -0,0 +1,129 @@
+import { tmpdir } from "node:os"
+import { afterEach, describe, expect, test } from "bun:test"
+import type { PluginInput } from "@opencode-ai/plugin"
+import { unsafeTestValue } from "../../../test-support/unsafe-test-value"
+import { releaseAllPromptAsyncReservationsForTesting } from "../../hooks/shared/prompt-async-gate"
+import { BackgroundManager } from "./manager"
+import type { BackgroundTask } from "./types"
+
+type PromptAsyncCall = {
+  readonly path: { readonly id: string }
+  readonly body: { readonly parts?: readonly unknown[] }
+}
+
+let managerUnderTest: BackgroundManager | undefined
+
+afterEach(() => {
+  managerUnderTest?.shutdown()
+  managerUnderTest = undefined
+  releaseAllPromptAsyncReservationsForTesting()
+})
+
+function createTask(): BackgroundTask {
+  return {
+    id: "task-a",
+    parentMessageId: "parent-message-id",
+    parentSessionId: "parent-1",
+    description: "task A",
+    prompt: "Prompt for task A",
+    agent: "test-agent",
+    status: "completed",
+    startedAt: new Date("2026-05-20T14:19:10.000Z"),
+    completedAt: new Date("2026-05-20T14:19:14.625Z"),
+  }
+}
+
+function createManager(): {
+  readonly manager: BackgroundManager
+  readonly promptAsyncCalls: readonly PromptAsyncCall[]
+} {
+  const promptAsyncCalls: PromptAsyncCall[] = []
+  const client = unsafeTestValue<PluginInput["client"]>({
+    session: {
+      messages: async () => [],
+      status: async () => ({ data: { "parent-1": { type: "idle" } } }),
+      prompt: async () => ({}),
+      promptAsync: async (call: PromptAsyncCall) => {
+        promptAsyncCalls.push(call)
+        return {}
+      },
+      abort: async () => ({}),
+    },
+  })
+  const manager = new BackgroundManager({
+    pluginContext: {
+      client,
+      project: {},
+      directory: tmpdir(),
+      worktree: tmpdir(),
+      serverUrl: new URL("http://localhost"),
+      $: {},
+    },
+    config: undefined,
+    enableParentSessionNotifications: true,
+  })
+  return { manager, promptAsyncCalls }
+}
+
+function getTasks(manager: BackgroundManager): Map<string, BackgroundTask> {
+  return unsafeTestValue<Map<string, BackgroundTask>>(Reflect.get(manager, "tasks"))
+}
+
+function getPendingByParent(manager: BackgroundManager): Map<string, Set<string>> {
+  return unsafeTestValue<Map<string, Set<string>>>(Reflect.get(manager, "pendingByParent"))
+}
+
+function getPendingParentWakes(manager: BackgroundManager): Map<string, unknown> {
+  const notifier = unsafeTestValue<{
+    readonly getPendingParentWakes: () => Map<string, unknown>
+  }>(Reflect.get(manager, "parentWakeNotifier"))
+  return notifier.getPendingParentWakes()
+}
+
+async function notifyParentSessionForTest(manager: BackgroundManager, task: BackgroundTask): Promise<void> {
+  const notifyParentSession = unsafeTestValue<(task: BackgroundTask) => Promise<void>>(Reflect.get(manager, "notifyParentSession"))
+  await notifyParentSession.call(manager, task)
+}
+
+async function flushPendingParentWakeForTest(manager: BackgroundManager, sessionID: string): Promise<void> {
+  const flushPendingParentWake = unsafeTestValue<(sessionID: string) => Promise<void>>(Reflect.get(manager, "flushPendingParentWake"))
+  await flushPendingParentWake.call(manager, sessionID)
+}
+
+describe("BackgroundManager parent wake activity window", () => {
+  test("#given parent tool activity is within the tool deferral window #when stale idle flushes a wake #then parent prompt stays deferred", async () => {
+    // given
+    const originalDateNow = Date.now
+    let now = 100_000
+    Date.now = () => now
+    const { manager, promptAsyncCalls } = createManager()
+    managerUnderTest = manager
+    manager.handleEvent({
+      type: "message.part.updated",
+      properties: {
+        sessionID: "parent-1",
+        part: {
+          sessionID: "parent-1",
+          type: "tool",
+          tool: "todowrite",
+        },
+      },
+    })
+    now = 104_900
+    const task = createTask()
+    getTasks(manager).set(task.id, task)
+    getPendingByParent(manager).set(task.parentSessionId, new Set([task.id]))
+
+    try {
+      // when
+      await notifyParentSessionForTest(manager, task)
+      await flushPendingParentWakeForTest(manager, "parent-1")
+
+      // then
+      expect(promptAsyncCalls).toHaveLength(0)
+      expect(getPendingParentWakes(manager).has("parent-1")).toBe(true)
+    } finally {
+      Date.now = originalDateNow
+    }
+  })
+})

src/tools/delegate-task/sync-continuation.ts

@@ -172,6 +172,7 @@ export async function executeSyncContinuation(
       },
     }, {
       queueBehavior: "defer",
+      checkToolState: false,
     })
    } catch (promptError) {
      if (toastManager) {