refactor(media): share duplicate guard action results · o...

Recent Commits to openclaw:main

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

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ import {`
`17`	`17`	`listActiveImageGenerationTasksForSession,`
`18`	`18`	`} from "../image-generation-task-status.js";`
`19`	`19`	`import {`
	`20`	`+createMediaGenerateDuplicateGuardResult,`
`20`	`21`	`createMediaGenerateProviderListActionResult,`
`21`	`22`	`createMediaGenerateTaskStatusActions,`
`22`	`23`	`type MediaGenerateActionResult,`
`@@ -121,24 +122,12 @@ export function createImageGenerateDuplicateGuardResult(`
`121`	`122`	`sessionKey?: string,`
`122`	`123`	`params?: { prompt?: string; requestKey?: string },`
`123`	`124`	`): ImageGenerateActionResult \| undefined {`
`124`		`-const blockingTask = findDuplicateGuardImageGenerationTaskForSession(sessionKey, {`
	`125`	`+return createMediaGenerateDuplicateGuardResult({`
	`126`	`+ sessionKey,`
`125`	`127`	`prompt: params?.prompt,`
`126`	`128`	`requestKey: params?.requestKey,`
	`129`	`+findDuplicateTask: findDuplicateGuardImageGenerationTaskForSession,`
	`130`	`+buildStatusText: buildImageGenerationTaskStatusText,`
	`131`	`+buildStatusDetails: buildImageGenerationTaskStatusDetails,`
`127`	`132`	`});`
`128`		`-if (!blockingTask) {`
`129`		`-return undefined;`
`130`		`-}`
`131`		`-return {`
`132`		`-content: [`
`133`		`-{`
`134`		`-type: "text",`
`135`		`-text: buildImageGenerationTaskStatusText(blockingTask, { duplicateGuard: true }),`
`136`		`-},`
`137`		`-],`
`138`		`-details: {`
`139`		`-action: "status",`
`140`		`-duplicateGuard: true,`
`141`		`- ...buildImageGenerationTaskStatusDetails(blockingTask),`
`142`		`-},`
`143`		`-};`
`144`	`133`	`}`

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,40 @@ export function createMediaGenerateTaskStatusActions<Task>(params: {`
`143`	`143`	`};`
`144`	`144`	`}`
`145`	`145`
	`146`	`+/** Builds duplicate-guard status output for a media generation task type. */`
	`147`	`+export function createMediaGenerateDuplicateGuardResult<Task>(params: {`
	`148`	`+sessionKey?: string;`
	`149`	`+prompt?: string;`
	`150`	`+requestKey?: string;`
	`151`	`+findDuplicateTask: (`
	`152`	`+sessionKey?: string,`
	`153`	`+params?: { prompt?: string; requestKey?: string },`
	`154`	`+) => Task \| undefined;`
	`155`	`+buildStatusText: TaskStatusTextBuilder<Task>;`
	`156`	`+buildStatusDetails: (task: Task) => Record<string, unknown>;`
	`157`	`+}): MediaGenerateActionResult \| undefined {`
	`158`	`+const blockingTask = params.findDuplicateTask(params.sessionKey, {`
	`159`	`+prompt: params.prompt,`
	`160`	`+requestKey: params.requestKey,`
	`161`	`+});`
	`162`	`+if (!blockingTask) {`
	`163`	`+return undefined;`
	`164`	`+}`
	`165`	`+return {`
	`166`	`+content: [`
	`167`	`+{`
	`168`	`+type: "text",`
	`169`	`+text: params.buildStatusText(blockingTask, { duplicateGuard: true }),`
	`170`	`+},`
	`171`	`+],`
	`172`	`+details: {`
	`173`	`+action: "status",`
	`174`	`+duplicateGuard: true,`
	`175`	`+ ...params.buildStatusDetails(blockingTask),`
	`176`	`+},`
	`177`	`+};`
	`178`	`+}`
	`179`	`+`
`146`	`180`	`function createMediaGenerateStatusActionResult<Task>(params: {`
`147`	`181`	`sessionKey?: string;`
`148`	`182`	`inactiveText: string;`

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import {`
`14`	`14`	`findDuplicateGuardMusicGenerationTaskForSession,`
`15`	`15`	`} from "../music-generation-task-status.js";`
`16`	`16`	`import {`
	`17`	`+createMediaGenerateDuplicateGuardResult,`
`17`	`18`	`createMediaGenerateProviderListActionResult,`
`18`	`19`	`createMediaGenerateTaskStatusActions,`
`19`	`20`	`type MediaGenerateActionResult,`
`@@ -100,24 +101,12 @@ export function createMusicGenerateDuplicateGuardResult(`
`100`	`101`	`sessionKey?: string,`
`101`	`102`	`params?: { prompt?: string; requestKey?: string },`
`102`	`103`	`): MusicGenerateActionResult \| undefined {`
`103`		`-const blockingTask = findDuplicateGuardMusicGenerationTaskForSession(sessionKey, {`
	`104`	`+return createMediaGenerateDuplicateGuardResult({`
	`105`	`+ sessionKey,`
`104`	`106`	`prompt: params?.prompt,`
`105`	`107`	`requestKey: params?.requestKey,`
	`108`	`+findDuplicateTask: findDuplicateGuardMusicGenerationTaskForSession,`
	`109`	`+buildStatusText: buildMusicGenerationTaskStatusText,`
	`110`	`+buildStatusDetails: buildMusicGenerationTaskStatusDetails,`
`106`	`111`	`});`
`107`		`-if (!blockingTask) {`
`108`		`-return undefined;`
`109`		`-}`
`110`		`-return {`
`111`		`-content: [`
`112`		`-{`
`113`		`-type: "text",`
`114`		`-text: buildMusicGenerationTaskStatusText(blockingTask, { duplicateGuard: true }),`
`115`		`-},`
`116`		`-],`
`117`		`-details: {`
`118`		`-action: "status",`
`119`		`-duplicateGuard: true,`
`120`		`- ...buildMusicGenerationTaskStatusDetails(blockingTask),`
`121`		`-},`
`122`		`-};`
`123`	`112`	`}`

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import {`
`14`	`14`	`findDuplicateGuardVideoGenerationTaskForSession,`
`15`	`15`	`} from "../video-generation-task-status.js";`
`16`	`16`	`import {`
	`17`	`+createMediaGenerateDuplicateGuardResult,`
`17`	`18`	`createMediaGenerateProviderListActionResult,`
`18`	`19`	`createMediaGenerateTaskStatusActions,`
`19`	`20`	`type MediaGenerateActionResult,`
`@@ -119,24 +120,12 @@ export function createVideoGenerateDuplicateGuardResult(`
`119`	`120`	`sessionKey?: string,`
`120`	`121`	`params?: { prompt?: string; requestKey?: string },`
`121`	`122`	`): VideoGenerateActionResult \| undefined {`
`122`		`-const blockingTask = findDuplicateGuardVideoGenerationTaskForSession(sessionKey, {`
	`123`	`+return createMediaGenerateDuplicateGuardResult({`
	`124`	`+ sessionKey,`
`123`	`125`	`prompt: params?.prompt,`
`124`	`126`	`requestKey: params?.requestKey,`
	`127`	`+findDuplicateTask: findDuplicateGuardVideoGenerationTaskForSession,`
	`128`	`+buildStatusText: buildVideoGenerationTaskStatusText,`
	`129`	`+buildStatusDetails: buildVideoGenerationTaskStatusDetails,`
`125`	`130`	`});`
`126`		`-if (!blockingTask) {`
`127`		`-return undefined;`
`128`		`-}`
`129`		`-return {`
`130`		`-content: [`
`131`		`-{`
`132`		`-type: "text",`
`133`		`-text: buildVideoGenerationTaskStatusText(blockingTask, { duplicateGuard: true }),`
`134`		`-},`
`135`		`-],`
`136`		`-details: {`
`137`		`-action: "status",`
`138`		`-duplicateGuard: true,`
`139`		`- ...buildVideoGenerationTaskStatusDetails(blockingTask),`
`140`		`-},`
`141`		`-};`
`142`	`131`	`}`

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