fix(delegate-task): consume fallback chain on sendSyncPrompt failure (#2691)

setSessionFallbackChain stored the fallback chain but the sync path never consumed it when sendSyncPrompt returned an error. Added a retry loop that iterates getNextFallback() until the prompt succeeds or the chain is exhausted, preserving the finally-block cleanup. 🤖 Generated with OhMyOpenCode assistance https://github.com/code-yeongyu/oh-my-opencode
2026-04-12 02:30:32 +09:00
parent aed8dbfa3e
commit c5c5bc36bc
4 changed files with 248 additions and 6 deletions
@@ -228,6 +228,140 @@ describe("executeSyncTask - cleanup on error paths", () => {
    expect(deleteCalls[0]).toBe("ses_test_12345678")
  })

+  test("#given fallback chain set #when sendSyncPrompt fails #then retries with next model", async () => {
+    //#given
+    const mockClient = {
+      session: {
+        create: async () => ({ data: { id: "ses_test_12345678" } }),
+      },
+    }
+
+    const { executeSyncTask } = require("./sync-task")
+    const attemptedModels: Array<{ providerID: string; modelID: string; variant?: string } | undefined> = []
+
+    const deps = {
+      createSyncSession: async () => ({ ok: true, sessionID: "ses_test_12345678" }),
+      sendSyncPrompt: async (_client: unknown, input: { categoryModel?: { providerID: string; modelID: string; variant?: string } }) => {
+        attemptedModels.push(input.categoryModel)
+        return attemptedModels.length === 1 ? "Initial failure" : null
+      },
+      pollSyncSession: async () => null,
+      fetchSyncResult: async () => ({ ok: true as const, textContent: "Result" }),
+    }
+
+    const mockCtx = {
+      sessionID: "parent-session",
+      callID: "call-123",
+      metadata: () => {},
+    }
+
+    const mockExecutorCtx = {
+      client: mockClient,
+      directory: "/tmp",
+      onSyncSessionCreated: null,
+    }
+
+    const args = {
+      prompt: "test prompt",
+      description: "test task",
+      category: "test",
+      load_skills: [],
+      run_in_background: false,
+      command: null,
+    }
+
+    const initialModel = {
+      providerID: "anthropic",
+      modelID: "claude-opus-4-6",
+      variant: "max",
+    }
+    const fallbackChain = [
+      { providers: ["anthropic"], model: "claude-opus-4-6", variant: "max" },
+      { providers: ["opencode-go"], model: "kimi-k2.5" },
+    ]
+
+    //#when
+    const result = await executeSyncTask(args, mockCtx, mockExecutorCtx, {
+      sessionID: "parent-session",
+    }, "test-agent", initialModel, undefined, undefined, fallbackChain, deps)
+
+    //#then
+    expect(result).toContain("Task completed")
+    expect(result).toContain("Model: opencode-go/kimi-k2.5")
+    expect(attemptedModels).toEqual([
+      { providerID: "anthropic", modelID: "claude-opus-4-6", variant: "max" },
+      { providerID: "opencode-go", modelID: "kimi-k2.5", variant: undefined },
+    ])
+  })
+
+  test("#given fallback chain exhausted #when all retries fail #then returns final error", async () => {
+    //#given
+    const mockClient = {
+      session: {
+        create: async () => ({ data: { id: "ses_test_12345678" } }),
+      },
+    }
+
+    const { executeSyncTask } = require("./sync-task")
+    const attemptedModels: Array<{ providerID: string; modelID: string; variant?: string } | undefined> = []
+    const promptErrors = ["Initial failure", "Second failure", "Final failure"]
+
+    const deps = {
+      createSyncSession: async () => ({ ok: true, sessionID: "ses_test_12345678" }),
+      sendSyncPrompt: async (_client: unknown, input: { categoryModel?: { providerID: string; modelID: string; variant?: string } }) => {
+        attemptedModels.push(input.categoryModel)
+        return promptErrors[attemptedModels.length - 1] ?? "Unexpected extra retry"
+      },
+      pollSyncSession: async () => null,
+      fetchSyncResult: async () => ({ ok: true as const, textContent: "Result" }),
+    }
+
+    const mockCtx = {
+      sessionID: "parent-session",
+      callID: "call-123",
+      metadata: () => {},
+    }
+
+    const mockExecutorCtx = {
+      client: mockClient,
+      directory: "/tmp",
+      onSyncSessionCreated: null,
+    }
+
+    const args = {
+      prompt: "test prompt",
+      description: "test task",
+      category: "test",
+      load_skills: [],
+      run_in_background: false,
+      command: null,
+    }
+
+    const initialModel = {
+      providerID: "anthropic",
+      modelID: "claude-opus-4-6",
+      variant: "max",
+    }
+    const fallbackChain = [
+      { providers: ["anthropic"], model: "claude-opus-4-6", variant: "max" },
+      { providers: ["opencode-go"], model: "kimi-k2.5" },
+      { providers: ["openai"], model: "gpt-5.4", variant: "medium" },
+    ]
+
+    //#when
+    const result = await executeSyncTask(args, mockCtx, mockExecutorCtx, {
+      sessionID: "parent-session",
+    }, "test-agent", initialModel, undefined, undefined, fallbackChain, deps)
+
+    //#then
+    expect(result).toBe("Final failure")
+    expect(attemptedModels).toEqual([
+      { providerID: "anthropic", modelID: "claude-opus-4-6", variant: "max" },
+      { providerID: "opencode-go", modelID: "kimi-k2.5", variant: undefined },
+      { providerID: "openai", modelID: "gpt-5.4", variant: "medium" },
+    ])
+  })
+
  test("cleans up toast and subagentSessions on successful completion", async () => {
    const mockClient = {
      session: {