refactor(media): remove stale completion wake wrappers · ...

Recent Commits to openclaw:main

vincentkoc · 2026-06-19 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ vi.mock("../subagent-announce-delivery.js", () => announceDeliveryMocks);`
`19`	`19`
`20`	`20`	`const {`
`21`	`21`	`createImageGenerationTaskRun,`
	`22`	`+ imageGenerationTaskLifecycle,`
`22`	`23`	`recordImageGenerationTaskProgress,`
`23`		`- wakeImageGenerationTaskCompletion,`
`24`	`24`	`} = await import("./image-generate-background.js");`
`25`	`25`
`26`	`26`	`describe("image generate background helpers", () => {`
`@@ -87,7 +87,7 @@ describe("image generate background helpers", () => {`
`87`	`87`	`path: "direct",`
`88`	`88`	`});`
`89`	`89`
`90`		`-await wakeImageGenerationTaskCompletion({`
	`90`	`+await imageGenerationTaskLifecycle.wakeTaskCompletion({`
`91`	`91`	`...createMediaCompletionFixture({`
`92`	`92`	`runId: "tool:image_generate:abc",`
`93`	`93`	`taskLabel: "small watercolor robot",`
`@@ -122,7 +122,7 @@ describe("image generate background helpers", () => {`
`122`	`122`	`result: "provider failed",`
`123`	`123`	`});`
`124`	`124`
`125`		`-await wakeImageGenerationTaskCompletion({`
	`125`	`+await imageGenerationTaskLifecycle.wakeTaskCompletion({`
`126`	`126`	`...completion,`
`127`	`127`	`status: "error",`
`128`	`128`	`statusLabel: "failed",`

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`*`
`4`	`4`	`* Binds shared detached media-task lifecycle behavior to image_generate labels and completion messages.`
`5`	`5`	`*/`
`6`		`-import type { OpenClawConfig } from "../../config/types.openclaw.js";`
`7`		`-import type { AgentGeneratedAttachment } from "../generated-attachments.js";`
`8`	`6`	`import { IMAGE_GENERATION_TASK_KIND } from "../image-generation-task-status.js";`
`9`	`7`	`import {`
`10`	`8`	`createMediaGenerationTaskLifecycle,`
`@@ -46,17 +44,3 @@ export const completeImageGenerationTaskRun = (`
`46`	`44`	`export const failImageGenerationTaskRun = (`
`47`	`45`	`...params: Parameters<typeof imageGenerationTaskLifecycle.failTaskRun>`
`48`	`46`	`) => imageGenerationTaskLifecycle.failTaskRun(...params);`
`49`		`-`
`50`		`-/** Wakes the requester session with image generation completion or failure. */`
`51`		`-export async function wakeImageGenerationTaskCompletion(params: {`
`52`		`-config?: OpenClawConfig;`
`53`		`-handle: ImageGenerationTaskHandle \| null;`
`54`		`-status: "ok" \| "error";`
`55`		`-statusLabel: string;`
`56`		`-result: string;`
`57`		`-attachments?: AgentGeneratedAttachment[];`
`58`		`-mediaUrls?: string[];`
`59`		`-statsLine?: string;`
`60`		`-}) {`
`61`		`-return await imageGenerationTaskLifecycle.wakeTaskCompletion(params);`
`62`		`-}`

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ vi.mock("../subagent-announce-delivery.js", () => announceDeliveryMocks);`
`19`	`19`
`20`	`20`	`const {`
`21`	`21`	`createMusicGenerationTaskRun,`
	`22`	`+ musicGenerationTaskLifecycle,`
`22`	`23`	`recordMusicGenerationTaskProgress,`
`23`		`- wakeMusicGenerationTaskCompletion,`
`24`	`24`	`} = await import("./music-generate-background.js");`
`25`	`25`
`26`	`26`	`function getDeliveredInternalEvents(): Array<Record<string, unknown>> {`
`@@ -106,7 +106,7 @@ describe("music generate background helpers", () => {`
`106`	`106`	`path: "direct",`
`107`	`107`	`});`
`108`	`108`
`109`		`-await wakeMusicGenerationTaskCompletion({`
	`109`	`+await musicGenerationTaskLifecycle.wakeTaskCompletion({`
`110`	`110`	`...createMediaCompletionFixture({`
`111`	`111`	`runId: "tool:music_generate:abc",`
`112`	`112`	`taskLabel: "night-drive synthwave",`
`@@ -131,7 +131,7 @@ describe("music generate background helpers", () => {`
`131`	`131`	`mediaUrls: ["/tmp/generated-night-drive.mp3"],`
`132`	`132`	`});`
`133`	`133`
`134`		`-await wakeMusicGenerationTaskCompletion({`
	`134`	`+await musicGenerationTaskLifecycle.wakeTaskCompletion({`
`135`	`135`	`...completion,`
`136`	`136`	`handle: {`
`137`	`137`	`...completion.handle,`
`@@ -156,7 +156,7 @@ describe("music generate background helpers", () => {`
`156`	`156`	`result: "provider failed",`
`157`	`157`	`});`
`158`	`158`
`159`		`-await wakeMusicGenerationTaskCompletion({`
	`159`	`+await musicGenerationTaskLifecycle.wakeTaskCompletion({`
`160`	`160`	`...completion,`
`161`	`161`	`status: "error",`
`162`	`162`	`statusLabel: "failed",`
`@@ -185,7 +185,7 @@ describe("music generate background helpers", () => {`
`185`	`185`	`mediaUrls: ["/tmp/generated-night-drive.mp3"],`
`186`	`186`	`});`
`187`	`187`
`188`		`-await wakeMusicGenerationTaskCompletion({`
	`188`	`+await musicGenerationTaskLifecycle.wakeTaskCompletion({`
`189`	`189`	`...completion,`
`190`	`190`	`handle: {`
`191`	`191`	`...completion.handle,`
`@@ -208,7 +208,7 @@ describe("music generate background helpers", () => {`
`208`	`208`	`path: "direct",`
`209`	`209`	`});`
`210`	`210`
`211`		`-await wakeMusicGenerationTaskCompletion({`
	`211`	`+await musicGenerationTaskLifecycle.wakeTaskCompletion({`
`212`	`212`	`...createMediaCompletionFixture({`
`213`	`213`	`directSend: true,`
`214`	`214`	`runId: "tool:music_generate:abc",`

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`*`
`4`	`4`	`* Binds shared detached media-task lifecycle behavior to music_generate labels and completion messages.`
`5`	`5`	`*/`
`6`		`-import type { OpenClawConfig } from "../../config/types.openclaw.js";`
`7`		`-import type { AgentGeneratedAttachment } from "../generated-attachments.js";`
`8`	`6`	`import { MUSIC_GENERATION_TASK_KIND } from "../music-generation-task-status.js";`
`9`	`7`	`import {`
`10`	`8`	`createMediaGenerationTaskLifecycle,`
`@@ -45,17 +43,3 @@ export const completeMusicGenerationTaskRun = (`
`45`	`43`	`export const failMusicGenerationTaskRun = (`
`46`	`44`	`...params: Parameters<typeof musicGenerationTaskLifecycle.failTaskRun>`
`47`	`45`	`) => musicGenerationTaskLifecycle.failTaskRun(...params);`
`48`		`-`
`49`		`-/** Wakes the waiting session turn with final music-generation output. */`
`50`		`-export async function wakeMusicGenerationTaskCompletion(params: {`
`51`		`-config?: OpenClawConfig;`
`52`		`-handle: MusicGenerationTaskHandle \| null;`
`53`		`-status: "ok" \| "error";`
`54`		`-statusLabel: string;`
`55`		`-result: string;`
`56`		`-attachments?: AgentGeneratedAttachment[];`
`57`		`-mediaUrls?: string[];`
`58`		`-statsLine?: string;`
`59`		`-}) {`
`60`		`-return await musicGenerationTaskLifecycle.wakeTaskCompletion(params);`
`61`		`-}`

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,7 @@ const musicGenerateBackgroundMocks = vi.hoisted(() => ({`
`58`	`58`	`failTaskRun: (`
`59`	`59`	`params: Parameters<typeof musicGenerateBackground.failMusicGenerationTaskRun>[0],`
`60`	`60`	`) => musicGenerateBackgroundMocks.failMusicGenerationTaskRun(params),`
`61`		`-wakeTaskCompletion: (`
`62`		`-params: Parameters<typeof musicGenerateBackground.wakeMusicGenerationTaskCompletion>[0],`
`63`		`-) => musicGenerateBackgroundMocks.wakeMusicGenerationTaskCompletion(params),`
	`61`	`+wakeTaskCompletion: vi.fn(),`
`64`	`62`	`},`
`65`	`63`	`completeMusicGenerationTaskRun: vi.fn((params) => {`
`66`	`64`	`if (!params.handle) {`
`@@ -119,7 +117,6 @@ const musicGenerateBackgroundMocks = vi.hoisted(() => ({`
`119`	`117`	`eventSummary: params.eventSummary,`
`120`	`118`	`});`
`121`	`119`	`}),`
`122`		`-wakeMusicGenerationTaskCompletion: vi.fn(),`
`123`	`120`	`}));`
`124`	`121`
`125`	`122`	`vi.mock("../../config/config.js", () => configMocks);`
`@@ -179,8 +176,10 @@ function resetMusicGenerateMocks() {`
`179`	`176`	`taskExecutorMocks.completeTaskRunByRunId.mockReset();`
`180`	`177`	`taskExecutorMocks.failTaskRunByRunId.mockReset();`
`181`	`178`	`taskExecutorMocks.recordTaskRunProgressByRunId.mockReset();`
`182`		`-musicGenerateBackgroundMocks.wakeMusicGenerationTaskCompletion.mockReset();`
`183`		`-musicGenerateBackgroundMocks.wakeMusicGenerationTaskCompletion.mockResolvedValue(true);`
	`179`	`+musicGenerateBackgroundMocks.musicGenerationTaskLifecycle.wakeTaskCompletion.mockReset();`
	`180`	`+musicGenerateBackgroundMocks.musicGenerationTaskLifecycle.wakeTaskCompletion.mockResolvedValue(`
	`181`	`+true,`
	`182`	`+);`
`184`	`183`	`}`
`185`	`184`
`186`	`185`	`function detailsOf(result: { details?: unknown }): Record<string, unknown> {`
`@@ -218,7 +217,9 @@ function taskCompleteCall(callIndex = 0): Record<string, unknown> {`
`218`	`217`
`219`	`218`	`function wakeCompletionCall(callIndex = 0): Record<string, unknown> {`
`220`	`219`	`const call =`
`221`		`-musicGenerateBackgroundMocks.wakeMusicGenerationTaskCompletion.mock.calls[callIndex]?.[0];`
	`220`	`+musicGenerateBackgroundMocks.musicGenerationTaskLifecycle.wakeTaskCompletion.mock.calls[`
	`221`	`+callIndex`
	`222`	`+]?.[0];`
`222`	`223`	`if (!call \|\| typeof call !== "object") {`
`223`	`224`	throw new Error(`expected wake completion call ${callIndex}`);
`224`	`225`	`}`
`@@ -558,7 +559,7 @@ describe("createMusicGenerateTool", () => {`
`558`	`559`	`createdAt: Date.now(),`
`559`	`560`	`});`
`560`	`561`	`const wakeSpy = vi`
`561`		`-.spyOn(musicGenerateBackground, "wakeMusicGenerationTaskCompletion")`
	`562`	`+.spyOn(musicGenerateBackground.musicGenerationTaskLifecycle, "wakeTaskCompletion")`
`562`	`563`	`.mockResolvedValue(true);`
`563`	`564`	`vi.spyOn(musicGenerationRuntime, "generateMusic").mockResolvedValue({`
`564`	`565`	`provider: "google",`

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ const {`
`22`	`22`	`createVideoGenerationTaskRun,`
`23`	`23`	`failVideoGenerationTaskRun,`
`24`	`24`	`recordVideoGenerationTaskProgress,`
`25`		`-wakeVideoGenerationTaskCompletion,`
	`25`	`+videoGenerationTaskLifecycle,`
`26`	`26`	`} = await import("./video-generate-background.js");`
`27`	`27`	`const { withMediaGenerationTaskKeepalive } = await import("./media-generate-background-shared.js");`
`28`	`28`
`@@ -165,7 +165,7 @@ describe("video generate background helpers", () => {`
`165`	`165`	`path: "direct",`
`166`	`166`	`});`
`167`	`167`
`168`		`-await wakeVideoGenerationTaskCompletion({`
	`168`	`+await videoGenerationTaskLifecycle.wakeTaskCompletion({`
`169`	`169`	`...createMediaCompletionFixture({`
`170`	`170`	`runId: "tool:video_generate:abc",`
`171`	`171`	`taskLabel: "friendly lobster surfing",`
`@@ -184,7 +184,7 @@ describe("video generate background helpers", () => {`
`184`	`184`	`path: "direct",`
`185`	`185`	`});`
`186`	`186`
`187`		`-await wakeVideoGenerationTaskCompletion({`
	`187`	`+await videoGenerationTaskLifecycle.wakeTaskCompletion({`
`188`	`188`	`...createMediaCompletionFixture({`
`189`	`189`	`directSend: true,`
`190`	`190`	`runId: "tool:video_generate:abc",`
`@@ -215,7 +215,7 @@ describe("video generate background helpers", () => {`
`215`	`215`	`error: "completion agent did not deliver generated media",`
`216`	`216`	`});`
`217`	`217`
`218`		`-await wakeVideoGenerationTaskCompletion({`
	`218`	`+await videoGenerationTaskLifecycle.wakeTaskCompletion({`
`219`	`219`	`...createMediaCompletionFixture({`
`220`	`220`	`runId: "tool:video_generate:abc",`
`221`	`221`	`taskLabel: "friendly lobster surfing",`
`@@ -249,7 +249,7 @@ describe("video generate background helpers", () => {`
`249`	`249`	`path: "steered",`
`250`	`250`	`});`
`251`	`251`
`252`		`-await wakeVideoGenerationTaskCompletion({`
	`252`	`+await videoGenerationTaskLifecycle.wakeTaskCompletion({`
`253`	`253`	`...createMediaCompletionFixture({`
`254`	`254`	`runId: "tool:video_generate:abc",`
`255`	`255`	`taskLabel: "friendly lobster surfing",`

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`*`
`4`	`4`	`* Specializes the shared media background runner with video status text and completion metadata.`
`5`	`5`	`*/`
`6`		`-import type { OpenClawConfig } from "../../config/types.openclaw.js";`
`7`		`-import type { AgentGeneratedAttachment } from "../generated-attachments.js";`
`8`	`6`	`import { VIDEO_GENERATION_TASK_KIND } from "../video-generation-task-status.js";`
`9`	`7`	`import {`
`10`	`8`	`createMediaGenerationTaskLifecycle,`
`@@ -45,17 +43,3 @@ export const completeVideoGenerationTaskRun = (`
`45`	`43`	`export const failVideoGenerationTaskRun = (`
`46`	`44`	`...params: Parameters<typeof videoGenerationTaskLifecycle.failTaskRun>`
`47`	`45`	`) => videoGenerationTaskLifecycle.failTaskRun(...params);`
`48`		`-`
`49`		`-/** Wakes the waiting session turn with final video-generation output. */`
`50`		`-export async function wakeVideoGenerationTaskCompletion(params: {`
`51`		`-config?: OpenClawConfig;`
`52`		`-handle: VideoGenerationTaskHandle \| null;`
`53`		`-status: "ok" \| "error";`
`54`		`-statusLabel: string;`
`55`		`-result: string;`
`56`		`-attachments?: AgentGeneratedAttachment[];`
`57`		`-mediaUrls?: string[];`
`58`		`-statsLine?: string;`
`59`		`-}) {`
`60`		`-return await videoGenerationTaskLifecycle.wakeTaskCompletion(params);`
`61`		`-}`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main