From c409268dec70f243bba17920b60dce63d93f69bf Mon Sep 17 00:00:00 2001 From: WuYongJie <549727955@qq.com> Date: Tue, 17 Nov 2026 12:54:55 +0800 Subject: [PATCH] feat(client): make detail-page image production resumable and reviewable --- apps/detail-agent-pi/src/agent.mjs | 122 +++++++- .../src/compaction-recovery.mjs | 1 + apps/detail-agent-pi/src/desktop-host.mjs | 3 +- .../src/enterprise-context.mjs | 99 +++++- .../src/enterprise-knowledge.mjs | 8 +- .../src/enterprise-resource-map.mjs | 14 +- .../src/enterprise-templates.mjs | 21 +- apps/detail-agent-pi/src/stdio-canvas.mjs | 1 + apps/detail-agent-pi/src/whole-detail.mjs | 197 ++++++++++++ apps/detail-agent-pi/src/workflow-execute.mjs | 8 +- .../test/enterprise-context.test.mjs | 35 +++ apps/detail-agent-pi/test/recovery.test.mjs | 24 ++ .../test/whole-detail.test.mjs | 75 +++++ .../test/workflow-execute.test.mjs | 13 + .../photocraft/src/jiansun_agent_daemon.rs | 5 +- .../apps/photocraft/src/jiansun_backend.rs | 107 +++++-- .../src/jiansun_canvas_workspace.rs | 292 ++++++++++++++++-- .../apps/photocraft/src/jiansun_creation.rs | 22 +- .../apps/photocraft/src/jiansun_images.rs | 66 ++-- .../apps/photocraft/src/jiansun_models.rs | 48 +++ .../apps/photocraft/src/jiansun_pi.rs | 9 +- .../apps/photocraft/src/jiansun_pi_runtime.rs | 15 +- .../crates/ui-egui/src/jiansun.rs | 31 +- .../crates/ui-egui/src/jiansun/agent_panel.rs | 10 +- .../ui-egui/src/jiansun/canvas_workspace.rs | 35 ++- .../crates/ui-egui/src/jiansun/creation.rs | 22 +- .../crates/ui-egui/src/jiansun/pi_bridge.rs | 13 +- .../ui-egui/src/jiansun/workflow_bridge.rs | 16 +- 28 files changed, 1164 insertions(+), 148 deletions(-) create mode 100644 apps/detail-agent-pi/src/whole-detail.mjs create mode 100644 apps/detail-agent-pi/test/enterprise-context.test.mjs create mode 100644 apps/detail-agent-pi/test/whole-detail.test.mjs diff --git a/apps/detail-agent-pi/src/agent.mjs b/apps/detail-agent-pi/src/agent.mjs index e4497e85..de89bd0c 100644 --- a/apps/detail-agent-pi/src/agent.mjs +++ b/apps/detail-agent-pi/src/agent.mjs @@ -1,3 +1,5 @@ +import {setTimeout as delay} from 'node:timers/promises'; +import { fillWholeDetail, reviewGuidance } from './whole-detail.mjs'; import { enterpriseTools } from './enterprise-knowledge.mjs'; import { executeWorkflow } from './workflow-execute.mjs'; import { StreamPresentation, presentText } from './stream-presentation.mjs'; @@ -301,7 +303,7 @@ export class DetailPiAgent { const cost = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }; runtime.registerProvider('jiansun-native-98k', { api, apiKey: 'native-broker-only', baseUrl: api === 'anthropic-messages' ? 'https://api.vip98k.com' : 'https://api.vip98k.com/v1', - models: [{ id: info.model.id, name: info.model.id, api, reasoning: false, input: ['text','image'], cost, contextWindow: modelCapacity(info.model).limit ?? 0, maxTokens: inputBudget(info.model).reserve, compat: { supportsStore: false, supportsDeveloperRole: false, supportsReasoningEffort: false, maxTokensField: 'max_tokens' } }], + models: [{ id: info.model.id, name: info.model.id, api, reasoning: false, input: info.model.supportsImageInput === false ? ['text'] : ['text','image'], cost, contextWindow: modelCapacity(info.model).limit ?? 0, maxTokens: inputBudget(info.model).reserve, compat: { supportsStore: false, supportsDeveloperRole: false, supportsReasoningEffort: false, maxTokensField: 'max_tokens' } }], streamSimple(model, context, options = {}) { const output = createAssistantMessageEventStream(); (async () => { @@ -458,6 +460,49 @@ export class DetailPiAgent { resourceLoader: loader, customTools, tools: photoCraftToolAllowlist(customTools), settingsManager: SettingsManager.inMemory({ compaction: { enabled: false, keepRecentTokens: 2048, reserveTokens: 4096 }, retry: { enabled: false, maxRetries: 0 }, summarization: { enabled: false } }), sessionManager: host.manager, }); + host.visionReview = async (systemPrompt, content, {savedReview,saveRequest}) => { + if (info.model.supportsImageInput === false) throw Error('所选对话模型不支持看图,请在小壹设置中更换后继续'); + const model = runtime.getModel('jiansun-native-98k',info.model.id); + if (savedReview) { + const record = {id:savedReview,...await broker.read(savedReview)}; + if (['failed','rejected','unavailable','prepared'].includes(record.phase)) { + throw Object.assign(Error('原验图请求没有可用结果,图位待核对'),{code:'detail_review_invalid'}); + } + const original=await parseReceipt(record,model,'native-tools',[]); + if (original.stopReason!=='stop' || original.content.some(part=>part.type==='toolCall')) { + throw Object.assign(Error('原验图结果不完整,图位待核对'),{code:'detail_review_invalid'}); + } + if (record.phase==='received') await broker.confirm(savedReview,record.bodyHash,true,original.stopReason); + return original.content.filter(part=>part.type==='text').map(part=>part.text).join(''); + } + const context={systemPrompt,messages:[{role:'user',content,timestamp:Date.now()}]}; + if (!model || exceedsModelBudget(context, info.model)) throw Error('本次图片核对超过所选模型的输入容量'); + if(transport?.stream) { + const stream=transport.stream(model,context,{}); + for await (const _ of stream) { /* The structured result is read below. */ } + return (await stream.result()).content.filter(c=>c.type==='text').map(c=>c.text).join(''); + } + const round=broker.round(); + await store.appendEvent({type:'provider_prepared',id:round.id,model:info.model.id,purpose:'whole-detail-review'}); + await saveRequest(round.id); + let wire; + const stream=apiImpl.streamSimple(model,context,{apiKey:'native-broker-only',fetch:async (...args)=>{ + const response=await round.fetch(...args); + wire=response.clone().text().catch(()=>null); + return response; + },maxRetries:0,maxRetryDelayMs:0,maxTokens:1400,timeoutMs:180000,cacheRetention:'none', + onPayload:payload=>api==='openai-completions'?{...payload,response_format:{type:'json_object'}}:payload}); + for await (const _ of stream) { /* No provisional review is applied to the canvas. */ } + const result=await stream.result(); + const complete=result.stopReason==='stop'; + const receipt=await round.finish(complete,result.stopReason); + await store.appendEvent({type:'provider_finished',id:round.id,...receipt}); + if(receipt.failureCode==='rate_limit_exceeded')throw Error('验图模型暂时限流,已完成的图位保留'); + if(!complete || receipt.phase!=='complete') throw Error('验图请求尚未核实,未采纳或重发'); + const body=await wire; + if(body)await onEvent({type:'usage',id:round.id,model:info.model.id,...responseUsage(body)}); + return result.content.filter(c=>c.type==='text').map(c=>c.text).join(''); + }; host.session = session; if (host.nativeUI) await session.bindExtensions({ uiContext:host.nativeUI.context, mode:'rpc', abortHandler:() => { void session.abort(); } }); activatePhotoCraftTools(session, customTools); @@ -513,7 +558,7 @@ export class DetailPiAgent { } this.currentWorkflow = latest.workflow; this.productEvidence = latest.product; - if (latest.workflow.template?.enterprise && !this.compacting) { + if (latest.workflow.template?.enterprise && !this.compacting && !this.wholeDetailActive) { this.enterpriseContext ??= new EnterpriseContext(this.store); this.knowledgeContext = await this.enterpriseContext.load({task:this.task || 'chat', brandName:latest.product.product.brandName,categoryName:latest.product.product.categoryName, @@ -734,6 +779,66 @@ export class DetailPiAgent { if (this.heartbeat) clearInterval(this.heartbeat); } } + async wholeDetail(text) { + return this.exclusive(async () => { + if (!this.canvas?.detailImages || this.info.model.supportsImageInput===false) { + throw Error('整套详情页需要可识图的对话模型及完整的小壹客户端'); + } + if ((await this.broker?.info())?.pending?.length) throw Error('有原模型请求待核查,处理后可继续'); + const begun=await this.canvas.begin(text); + this.activityScope=activityScope(this.store.identity,this.canvas,begun); + const heartbeat=setInterval(()=>{this.canvas.read().catch(()=>{});},2000); + heartbeat.unref(); + let knowledge; + this.wholeDetailActive=true; + try { + const result=await fillWholeDetail(this,async (slot,input,plan,candidateId,reviewRequest)=>{ + if(!knowledge&&plan.template.enterprise) { + this.enterpriseContext??=new EnterpriseContext(this.store); + const brief=plan.productEvidence?.brief; + knowledge=await this.enterpriseContext.load({task:'image',brandName:brief?.brandName,categoryName:brief?.categoryName, + templateId:plan.template.id,releaseId:plan.template.version,resourceSetId:plan.template.resourceSetId,turn:this.canvas.run},{read:async read=>{ + for(;;){ + const state=await this.canvas.read(); + if(state.conversationActive===false||state.writeBlocked)throw Error('资料读取已取消,已完成图位保留'); + try{return await read();} + catch(error){ + if(error.status!==429||!(error.retryAfterSeconds>0))throw error; + const seconds=Math.ceil(error.retryAfterSeconds); + await this.canvas.delta('知识库访问限流,约 '+seconds+' 秒后继续'); + const until=Date.now()+seconds*1000; + while(Date.now(){}); + throw error; + } finally { + this.wholeDetailActive=false; + clearInterval(heartbeat); + } + }); + } + async compact() { return this.exclusive(() => this.compactTurn()); } async compactTurn({ preserveBudget = false } = {}) { const pending = this.broker ? (await this.broker.info()).pending : []; @@ -756,7 +861,7 @@ export class DetailPiAgent { if (this.session.isStreaming) throw Error('先等待当前操作结束'); if (!await this.store.ownsRequest(id)) throw Error('原请求不属于当前店铺/品类会话,未查询或恢复'); const purpose = await requestPurpose(this, id); - const internalCompaction = purpose.kind !== 'conversation'; + const internalCompaction = ['compaction','legacy-compaction'].includes(purpose.kind); let record = { id, ...await this.broker.read(id) }; if (record.phase === 'unknown' || record.phase === 'dispatched') { try { await this.broker.recover(id); } @@ -766,6 +871,17 @@ export class DetailPiAgent { } record = { id, ...await this.broker.read(id) }; } + if (purpose.kind === 'whole-detail-review') { + if (['failed','rejected'].includes(record.phase)) return {phase:'failed',requestId:record.requestId,reposted:false,canvasWrites:0}; + if (!['complete','received'].includes(record.phase)) return {phase:'unknown',requestId:record.requestId,reposted:false,canvasWrites:0}; + const original=await parseReceipt(record,this.session.model,'native-tools',[]); + if (original.stopReason!=='stop' || original.content.some(part=>part.type==='toolCall')) { + return {phase:'unknown',requestId:record.requestId,reposted:false,canvasWrites:0}; + } + if (record.phase==='received') await this.broker.confirm(id,record.bodyHash,true,original.stopReason); + return {phase:'complete',requestId:record.requestId,reposted:false,canvasWrites:0, + restoredText:'已核查原验图结果。继续制作整套时,小壹会从原图位接着处理。'}; + } if (['unavailable', 'failed', 'rejected'].includes(record.phase) && internalCompaction) return recoverCompactionWithoutResult(this, id, record, purpose); if (record.phase === 'failed') return { phase: 'failed', requestId: record.requestId, reposted: false }; if (record.phase === 'unavailable') return {phase: 'unknown', requestId: record.requestId, reposted: false, diff --git a/apps/detail-agent-pi/src/compaction-recovery.mjs b/apps/detail-agent-pi/src/compaction-recovery.mjs index de0086ee..4aedce28 100644 --- a/apps/detail-agent-pi/src/compaction-recovery.mjs +++ b/apps/detail-agent-pi/src/compaction-recovery.mjs @@ -135,6 +135,7 @@ export async function requestPurpose(host, id) { if (index < 0) throw Error('原请求没有当前会话归属记录'); const event = events[index]; if (event.purpose === 'compaction') return {kind: 'compaction', event}; + if (event.purpose === 'whole-detail-review') return {kind: 'whole-detail-review', event}; if (event.purpose === 'conversation') return {kind: 'conversation', event}; // Legacy automatic summaries lack a durable cut-point contract. Recognize // their purpose, but never guess a checkpoint from the returned prose. diff --git a/apps/detail-agent-pi/src/desktop-host.mjs b/apps/detail-agent-pi/src/desktop-host.mjs index d2be0167..e4dc57cf 100644 --- a/apps/detail-agent-pi/src/desktop-host.mjs +++ b/apps/detail-agent-pi/src/desktop-host.mjs @@ -147,7 +147,8 @@ export async function runSession(config, call, sharedBroker, recovery) { // Acknowledge/discard recovered mutation proposals. Never replay them. await atomic(path.join(store.dir, 'recovered-tools.json'), pending.map(t => t.phase === 'review' ? { ...t, phase: 'discarded', reviewedAt: Date.now() } : t)); result = { text: '已放弃原响应中的未执行建议;已完成的修改保留。', reposted: false }; - } else result = await host.prompt(config.text, { referenceContent: config.referenceContent }); + } else if (config.wholeDetail === true) result = await host.wholeDetail(config.text); + else result = await host.prompt(config.text, { referenceContent: config.referenceContent }); const pending = (await broker.status()).pending; const reviews = (await store.get('recovered-tools.json', [])).filter(t => t.phase === 'review'); output = { ...result, unknown: pending.length > 0, review: reviews.length > 0, usage, contextUsage: host.contextUsage, diff --git a/apps/detail-agent-pi/src/enterprise-context.mjs b/apps/detail-agent-pi/src/enterprise-context.mjs index a6f23a14..8e4281b5 100644 --- a/apps/detail-agent-pi/src/enterprise-context.mjs +++ b/apps/detail-agent-pi/src/enterprise-context.mjs @@ -5,21 +5,34 @@ import path from 'node:path'; const tasks = {chat:'详情页项目创作流程、模板字段应用与品牌规范',copy:'卖点文案生成、修改与字段约束',image:'图片提示词、候选修改与视觉品牌规范',plan:'成熟模板内容策划与字段适配',canvas:'成熟模板字段回填、保留排版与局部修改'}; const skillRoot = file => file?.match(/^(.*\/Skills\/[^/]+)\//)?.[1]; -export function imageKnowledge(context) { - return {...context,skills:context.skills.map(({fileId,revision,path})=>({fileId,revision,path})), - rules:context.rules.filter(item=>item.kind==='brand').map(item=>({...item,text:item.text.split(/(?=^## )/m) - .filter(section=>/^## (?:品牌风格|人物选择与连续性|提示词与验收)/.test(section)).join('\n')}))}; +const productionSkills = ['家具详情页设计', '通用详情页制作与PS模板验证']; + +function links(document) { + return [...document.text.matchAll(/\[([^\]]+)\]\(([^)\n]+\.md)(?:#[^)]*)?\)/g)] + .map(([,label,target]) => ({label, target:path.posix.normalize(path.posix.dirname(document.path)+'/'+target)})); } /** Task knowledge is read through the standard service, never installed or executed. */ export class EnterpriseContext { constructor(store, client = new EnterpriseKnowledge({store})) { this.store=store; this.client=client; } - async load({task,brandName,categoryName,templateId,releaseId,turn}) { + async load({task,brandName,categoryName,templateId,releaseId,resourceSetId,turn}, {signal, read = execute => execute()} = {}) { if (!tasks[task]) return null; - const key=JSON.stringify([task,brandName,categoryName,templateId,releaseId,turn]); + const key=JSON.stringify([task,brandName,categoryName,templateId,releaseId,resourceSetId,turn]); if (this.key===key) return this.value; - const navigation=(await this.client.call('list_libraries',{})).result; + const navigation=(await read(()=>this.client.call('list_libraries',{},{signal}))).result; const directory=navigation.navigation?.find(item=>item.name==='Skills')?.path; + if (task === 'image') { + const identity={task,brandName,categoryName,templateId,releaseId,resourceSetId}; + let value; + if(resourceSetId) { + for(let attempt=0;attempt<2;attempt++){ + try {value=await this.declaredGuides(identity,{signal,read});break;} + catch(error){if(attempt||![409,412].includes(error.status))throw error;} + } + } + value??=await this.imageContext(directory,identity,{signal,read}); + return this.commit(key,value); + } const query=`通用详情页 ${tasks[task]}`.slice(0,500); const taskResult=(await this.client.call('query_knowledge',{query,...(directory?{directory}:{}),limit:3,maxCharacters:8000})).result; const brandResult=(await this.client.call('query_knowledge',{query:`${brandName} 品牌规范 ${tasks[task]}`.slice(0,500),...(directory?{directory}:{}),limit:2,maxCharacters:6000})).result; @@ -60,6 +73,78 @@ export class EnterpriseContext { if (!rules.length) for (const fragment of fragments.slice(0,2)) rules.push(await this.document(fragment.sourceId,fragment.revision,fragment.path,'rule')); const value={task,brandName,categoryName,templateId,releaseId,skills,rules, execution:'知识内容按当前产品、模板与任务使用。保持原生客户端的预览、采纳和撤销流程;资料中的飞书、Photoshop、脚本及其他服务操作仅适用于其原环境,不安装或执行。模型、候选数量和生成范围以本客户端设置及本次用户要求为准。'}; + return this.commit(key,value); + } + + async declaredGuides(identity,{signal,read}) { + const set=(await read(()=>this.client.call('get_resource_set',{resourceSetId:identity.resourceSetId},{signal}))).result; + if(set.resourceSet.brand!==identity.brandName||set.resourceSet.category!==identity.categoryName) throw Error('创作规则不属于所选品牌或品类'); + const component=set.components.find(c=>c.id==='visual_guides'); + if(!component)return null; + if(component.status!=='available')throw Error('所选模板的生图及验图规则尚有缺项'); + const skills=[],rules=[]; + for (const asset of component.assets.filter(a=>a.role==='guide'&&a.required)) { + if(asset.status!=='available')throw Error('无法读取必需规则:'+asset.file.name); + const {fileId,revision,path:source}=asset.file; + const kind=asset.file.name==='SKILL.md'?'skill':asset.id; + const {result}=await this.client.readDocument(fileId,revision,{signal},read); + (kind==='skill'?skills:rules).push({fileId,revision,path:source,kind,pages:result.pages,text:result.text}); + } + if(!skills.length||!rules.length)throw Error('该模板的图片制作规则没有完整声明'); + return {...identity,skills,rules,resourceRevision:set.revision, + execution:'知识库资料仅提供内容和审稿依据。依据本款资料确认产品事实,保留所选模板约束。'}; + } + + async imageContext(directory, identity, {signal,read}) { + if (!directory) throw Error('企业知识库没有公开本任务的技能目录'); + const specific = async (target,kind) => { + if (!target.startsWith(directory+'/')) throw Error('技能引用超出授权技能目录'); + let entry, offset=0, revision; + for (;;) { + const found=(await read(()=>this.client.call('search_files',{query:path.posix.basename(target),directory:path.posix.dirname(target),limit:40,offset,...(revision?{revision}:{})},{signal}))).result; + if (found.pageRestarted && offset) { offset=0; revision=undefined; continue; } + const page=found.page??found; + entry=page.entries?.find(item=>item.path===target); + if (entry||!page.hasMore) break; + if (!page.entries?.length||!found.revision) throw Error('企业知识库资料目录尚未读完'); + offset+=page.entries.length; + revision=found.revision; + } + if (!entry) throw Error('企业知识库缺少本次图片任务的资料:'+path.posix.basename(target)); + const response=await this.client.readDocument(entry.id,entry.revision,{signal},read); + return {fileId:entry.id,revision:response.result.revision,path:target,kind,text:response.result.text}; + }; + const skills=[]; + for (const folder of productionSkills) skills.push(await specific(directory+'/'+folder+'/SKILL.md','skill')); + const declared=links(skills[0]); + const required = [ + [/^模块二$/, 'image-production'], + [/^家具品类要求$/, 'product-visual'], + [/^品牌规范$/, 'brand-index'], + [/^统一审稿$/, 'review'], + [/^字段对接与依据$/, 'evidence'], + ]; + const rules=[]; + for (const [label,kind] of required) { + const entry=declared.find(link=>label.test(link.label)); + if (!entry) throw Error('家具详情页技能缺少任务引用:'+kind); + rules.push(await specific(entry.target,kind)); + } + const imageModule=rules.find(rule=>rule.kind==='image-production'); + for(const [label,kind] of [[/^五段框架$/,'image-prompt'],[/^视觉表达手法库$/,'composition'],[/^原参考图反推要求$/,'template-reference']]) { + const entry=links(imageModule).find(link=>label.test(link.label)); + if(!entry)throw Error('视觉制作模块缺少任务引用:'+kind); + rules.push(await specific(entry.target,kind)); + } + const brandIndex=rules.find(rule=>rule.kind==='brand-index'); + const brand=links(brandIndex).find(link=>link.label.includes(identity.brandName) && identity.brandName); + if (brand) rules.push(await specific(brand.target,'brand')); + return {...identity,skills,rules, + execution:'知识库资料仅提供内容和审稿依据。依据本款资料确认产品事实,保留所选模板约束。执行步骤使用小壹本机能力。'}; + } + + async commit(key,value) { + const {task,templateId,releaseId,skills,rules}=value; await atomic(path.join(this.store.root,'enterprise-context.json'),value); await this.store.appendEvent({type:'enterprise_context_loaded',task,templateId,releaseId,sources:[...skills,...rules].map(({fileId,revision,kind})=>({fileId,revision,kind}))}); this.key=key;this.value=value; diff --git a/apps/detail-agent-pi/src/enterprise-knowledge.mjs b/apps/detail-agent-pi/src/enterprise-knowledge.mjs index d2076cb7..e74d6c7f 100644 --- a/apps/detail-agent-pi/src/enterprise-knowledge.mjs +++ b/apps/detail-agent-pi/src/enterprise-knowledge.mjs @@ -34,11 +34,9 @@ descriptions.list_resource_sets='按品牌、品类或名称查找资源组, descriptions.get_resource_set='按资源组编号读取当前组件、角色和文件版本'; descriptions.get_files='批量核验本次任务明确选择的文件及版本;逐项检查status,只有200才可使用其元数据和下载路径'; async function credential() { - if (process.platform !== 'win32') { - const key=process.env.EKB_API_KEY_FCD6FE6F; - if (key) return key; - throw Error('企业知识库用户凭据未配置'); - } + const key=process.env.EKB_API_KEY_FCD6FE6F?.trim(); + if (key) return key; + if (process.platform !== 'win32') throw Error('企业知识库用户凭据未配置'); try { const {stdout}=await execFileAsync(path.join(process.env.SystemRoot || 'C:\\Windows', 'System32', 'reg.exe'),['query','HKCU\\Environment','/v','EKB_API_KEY_FCD6FE6F'],{windowsHide:true,maxBuffer:16384}); const match=stdout.match(/^\s*EKB_API_KEY_FCD6FE6F\s+REG_(?:SZ|EXPAND_SZ)\s+(.+)$/mi); diff --git a/apps/detail-agent-pi/src/enterprise-resource-map.mjs b/apps/detail-agent-pi/src/enterprise-resource-map.mjs index eae1a407..65eb4592 100644 --- a/apps/detail-agent-pi/src/enterprise-resource-map.mjs +++ b/apps/detail-agent-pi/src/enterprise-resource-map.mjs @@ -4,7 +4,7 @@ import {atomic,digest} from './store.mjs'; import {normalizeTemplateMapping} from './template-mapping.mjs'; const ref = ({fileId,revision}) => ({fileId,revision}); -const cacheVersion = 3; +const cacheVersion = 5; const filterName = (name,prefix) => name && `${prefix}${name}`; const isConflict = error => [409,412].includes(error.status); const conflict = message => Object.assign(Error(message),{status:409}); @@ -80,7 +80,19 @@ async function snapshot(service, set, part, binding, assets, version, mapping, b const {key:templateId,name,brand,category,resourceSetId}=set.resourceSet; const manifest={sourceKind:'resource-map',version,template:{templateId,name,brand,category, components:[component],assets:assets.map(({id,role,file})=>({...file,sha256:file.sha256.toLowerCase(),declaredId:id,assetId:file.fileId,roles:[role+':'+kind]}))}}; + const previewByPath=new Map(part.assets.filter(a=>a.role==='preview'&&a.status==='available').map(a=>[a.file.path,a.file])); + const base=assets.find(a=>a.role==='mapping').file.path.split('/template-adapter/')[0]; + const referenceByField=new Map(mapping.fields.filter(field=>field.type==='图片').flatMap(field=>{ + const relative=field.reference?.image_path; + if(typeof relative!=='string')return []; + const file=previewByPath.get(path.posix.normalize(base+'/template-adapter/'+relative)); + return file?[[field.field_id,ref(file)]]:[]; + })); const pack=buildPack(manifest,version.slice(4),{[kind]:mapping},binding); + for(const output of pack.outputs)for(const slot of output.slots){ + const preview=referenceByField.get(slot.fieldId); + if(preview)slot.previewReference=preview; + } const originals=pack.enterprise.components[kind].originals; for(const original of originals)original.sha256=original.sha256.toLowerCase(); const original=originals[0]; diff --git a/apps/detail-agent-pi/src/enterprise-templates.mjs b/apps/detail-agent-pi/src/enterprise-templates.mjs index 3dad5b4a..a9aee2a2 100644 --- a/apps/detail-agent-pi/src/enterprise-templates.mjs +++ b/apps/detail-agent-pi/src/enterprise-templates.mjs @@ -2,7 +2,8 @@ import fs from 'node:fs/promises'; import path from 'node:path'; import {setTimeout as delay} from 'node:timers/promises'; import { EnterpriseKnowledge } from './enterprise-knowledge.mjs'; -import { EnterpriseContext, imageKnowledge } from './enterprise-context.mjs'; +import { digest } from './store.mjs'; +import { EnterpriseContext } from './enterprise-context.mjs'; import {resourceRequest,resourceSnapshot} from './enterprise-resource-map.mjs'; async function waitForQuota(read, task) { @@ -81,7 +82,7 @@ function componentPack(manifest, revision, mappings, binding) { frame:{x:x-left,y:y-nativeTop,width:x2-x,height:y2-y},nativeFrame:[l,t,r,b], psLayer:field.ps_location,crop:'cover',...(field.nativeTextBounds?{nativeTextBounds:true}:{}),...(field.nativeBounds?{nativeBounds:field.nativeBounds}:{}), requirements:[field.purpose,field.fill_requirements,field.adaptation_requirements,field.output_spec,field.rules].filter(Boolean).join('\n'), - ...(kind==='image'?{imagePrompt:typeof field.fill_requirements==='string'?field.fill_requirements:null}:{}), + ...(kind==='image'?{imagePrompt:typeof field.fill_requirements==='string'?field.fill_requirements:null,outputSpec:field.output_spec}:{}), relatedFields:field.related_fields,example:field.reference, ...(kind==='text'?{font:{family:run?.font_name||'',size:run?.font_size||24,weight:400,color:'#000000'}, maxChars:field.maxChars??Math.max(1,Array.from(text).length),maxLines:Math.max(1,text.split(/\r\n|\r|\n/).length)}:{})}; @@ -174,13 +175,25 @@ export class EnterpriseTemplates { } async request(input, options={}) { const task=operation(options); + if(input.action==='field-preview'){ + const reply=await waitForQuota(()=>this.client.call('read_image',{fileId:input.fileId,revision:input.revision},{signal:task.signal}),task); + if((reply.result.sourceId||reply.result.fileId||reply.result.id)!==input.fileId || reply.result.revision!==input.revision) throw Error('图位原参考版本已变化'); + const folder=path.join(this.root,'resource-previews'); + await fs.mkdir(folder,{recursive:true}); + const imagePath=path.join(folder,digest([input.fileId,input.revision])+'.image'); + await fs.writeFile(imagePath,Buffer.from(reply.images[0].data,'base64')); + return {imagePath}; + } if (input.action === 'context') { if (typeof input.projectRoot!=='string' || !path.isAbsolute(input.projectRoot)) throw Error('项目知识快照位置无效'); const store={root:input.projectRoot,appendEvent:async event=>{ await fs.appendFile(path.join(input.projectRoot,'knowledge-events.jsonl'),JSON.stringify(event)+'\n'); }}; - const value=await new EnterpriseContext(store,this.client).load(input); - if (input.task==='image') return {context:imageKnowledge(value)}; + const value=await new EnterpriseContext(store,this.client).load(input,{signal:task.signal,read:fn=>waitForQuota(fn,task)}); + if (input.task==='image') { + return {context:{...value,skills:value.skills.map(({fileId,revision,path})=>({fileId,revision,path})), + rules:value.rules.filter(rule=>['brand','product-visual','furniture-visual-rules'].includes(rule.kind)||rule.kind.endsWith('-visual-rules'))}}; + } return {context:{task:value.task,brandName:value.brandName,categoryName:value.categoryName,templateId:value.templateId,releaseId:value.releaseId, skills:value.skills.map(({fileId,revision,path})=>({fileId,revision,path})),rules:value.rules,execution:value.execution}}; } diff --git a/apps/detail-agent-pi/src/stdio-canvas.mjs b/apps/detail-agent-pi/src/stdio-canvas.mjs index a1b94fb4..7c6cbf2c 100644 --- a/apps/detail-agent-pi/src/stdio-canvas.mjs +++ b/apps/detail-agent-pi/src/stdio-canvas.mjs @@ -7,6 +7,7 @@ export class StdioCanvas { async begin(text) { this.run = randomUUID(); this.edits = 0; return this.action('pi-begin', { text, ...(this.identity || {}) }); } read() { return this.action('pi-state'); } readCanvas(input = {}) { return this.action('pi-canvas-read', input); } + detailImages(slotId,candidateId) { return this.action('pi-detail-images', {slotId,candidateId}); } readTemplateImage(fieldId) { return this.action('pi-template-image', { fieldId }); } nativeCatalog(input = {}) { return this.action('pi-native-catalog', input); } nativeCall(input) { return this.action('pi-native-call', input); } diff --git a/apps/detail-agent-pi/src/whole-detail.mjs b/apps/detail-agent-pi/src/whole-detail.mjs new file mode 100644 index 00000000..9c8d19df --- /dev/null +++ b/apps/detail-agent-pi/src/whole-detail.mjs @@ -0,0 +1,197 @@ +import path from 'node:path'; +import { atomic } from './store.mjs'; +import { executeWorkflow } from './workflow-execute.mjs'; + +const outputId = 'detail'; +const maximumAttempts = 3; + +function decision(reply, candidate) { + const text = reply.trim().replace(/^```(?:json)?\s*|\s*```$/gi,''); + let value; + try { value=JSON.parse(text); } catch { throw Object.assign(Error('视觉模型未返回可核对的验图结果'),{code:'detail_review_invalid'}); } + const choices = candidate ? ['pass','revise','missing'] : ['generate','original','missing']; + if (!choices.includes(value.decision) || typeof value.reason !== 'string' || !value.reason.trim() + || (value.decision === 'revise' && (typeof value.correction !== 'string' || !value.correction.trim()))) { + throw Object.assign(Error('视觉模型返回的判断不完整'),{code:'detail_review_invalid'}); + } + if (candidate && value.decision==='pass' && !['structure','color','composition','evidence'].every(key=>value.checks?.[key]==='pass')) { + throw Object.assign(Error('候选图未逐项核对结构、颜色、构图和依据'),{code:'detail_review_invalid'}); + } + return { decision:value.decision, reason:value.reason.trim().slice(0,300), + correction:typeof value.correction==='string'?value.correction.trim().slice(0,480):'' }; +} + +export function reviewGuidance(knowledge, reviewing) { + if (!knowledge) return []; + const subjects = reviewing ? /图位|不符|产品|外观|花色|颜色|结构|验收|审稿|构图|裁切/ : /图位|生成|外观|构图|场景|光影|人物|镜头|品牌|证据/; + const guides = [...knowledge.skills,...knowledge.rules]; + return guides.map(document=>{ + const relevant=document.text.split(/\n(?=#{1,5}\s)/) + .filter(section=>subjects.test(section.split('\n',1)[0])).join('\n'); + return {kind:document.kind,text:(relevant||document.text).slice(0,850)}; + }); +} + +const continuation = state => state?.conversationActive === true && !state.writeBlocked && !state.error; + +export async function fillWholeDetail(host, vision) { + const canvas=host.canvas; + const progress=async text=>canvas.delta(text); + const slots=[]; + let plan; + for(let offset=0;;offset+=12) { + const page=await canvas.workflowRead({section:'slots',outputId,offset}); + if (!page.available || !page.canvasFirst || page.outputId!==outputId || !page.productVariantId || !page.template?.contentHash || + !Array.isArray(page.slots) || (plan && (plan.template.contentHash!==page.template.contentHash || plan.productVariantId!==page.productVariantId))) { + throw Error('请先打开已选固定模板和花色的详情页画布'); + } + plan??=page; + slots.push(...page.slots); + if(slots.length>=page.totalSlots)break; + if(!page.slots.length)throw Error('详情页图位未完整读取'); + } + if (!slots.length) return {text:'所选模板没有需要替换的图片。'}; + if (plan.pending) return {text:'有原请求待核查,请先核查原结果,再继续制作整套。'}; + const binding=JSON.stringify([plan.template.contentHash,plan.productVariantId]); + const filename='whole-detail.json'; + const saved=await host.store.get(filename,null); + const journal=saved?.binding===binding && saved.items && !Array.isArray(saved.items) ? saved : {binding,items:{}}; + if(journal.creationRevision!==plan.revisions?.creation){ + for(const [id,item] of Object.entries(journal.items)){ + if(item.state==='missing'||item.state==='rejected')delete journal.items[id]; + } + journal.creationRevision=plan.revisions?.creation; + } + const persist=()=>atomic(path.join(host.store.dir,filename),journal); + const explain=async (slot, state, fields={})=>{ + journal.items[slot.id]={...journal.items[slot.id], label:slot.label,state,...fields}; + await persist(); + }; + const current=async()=>{ + const state=await canvas.read(); + if(!continuation(state) || host.canvasWritesStopped) throw Error('整套制作已暂停,已写入的图位保留'); + const value=await canvas.workflowRead({section:'overview',outputId}); + if(!value.available || value.pending || value.template?.contentHash!==plan.template.contentHash || value.productVariantId!==plan.productVariantId) { + throw Error('模板、花色已变化或有原请求待核查,已暂停派发'); + } + return value; + }; + const execute=async (slot,intent,extra={})=>{ + const value=await current(); + const result=await executeWorkflow(host,{version:value.version,intent,outputId,slotId:slot.id,productVariantId:plan.productVariantId,...extra},undefined,{keepFailedCandidate:true}); + if (!result.operation?.candidateId) throw Error('未收到有效的图位操作回执'); + return result.operation; + }; + const inspect=async (slot,candidateId)=>{ + await current(); + let input; + try { input=await canvas.detailImages(slot.id,candidateId); } + catch(error){ + if(!candidateId && /图位原参考|同款产品图片|当前花色添加/.test(error.message)) error.code='detail_reference_missing'; + throw error; + } + const expected=input.referenceCount+(input.layoutCount??0)+(candidateId?1:0); + if (!input.referenceCount || input.candidateId!==(candidateId??null) || input.images?.length!==expected) throw Error('商品原图或候选实际画面尚未读取'); + const item=journal.items[slot.id]; + const subject=candidateId??null; + const savedReview=item?.pendingReview?.candidateId===subject?item.pendingReview.id:null; + const saveRequest=id=>explain(slot,item?.state??'planning',{pendingReview:{id,candidateId:subject}}); + return decision(await vision(slot,input,plan,candidateId,{savedReview,saveRequest}),Boolean(candidateId)); + }; + let applied=0; + const blocked=[]; + for (const [index,slot] of slots.entries()) { + if(slot.selectedCandidateId){applied++;continue;} + const item=journal.items[slot.id]; + await progress(`正在制作 ${index+1}/${slots.length} · ${slot.label}(已回填 ${applied} 格,待处理 ${blocked.length} 格)`); + // A reserved dispatch may have completed while the client was closed. + // Continue only through the exact candidate named in the journal or the + // single new candidate attached to its previously observed baseline. + let attempts=item?.attempts??0; + let candidate=item?.candidateId; + if(item?.state==='dispatching'){ + const novel=slot.candidates.filter(c=>!(item.baseline??[]).includes(c.id)); + if(novel.length===0){ + // The native worker saves its candidate before it can send a request. + // Handover can stop the operation between this journal and that save. + attempts=Math.max(0,attempts-1); + await explain(slot,'retry',{attempts,candidateId:null}); + }else if(novel.length===1 && ['failed','rejected','not_dispatched'].includes(novel[0].status)){ + const reason='生图已失败,请查看此图位的原请求记录'; + await explain(slot,'rejected',{candidateId:novel[0].id,reason}); + blocked.push([slot.label,reason]); + continue; + }else if(novel.length!==1 || novel[0].status!=='complete'){ + blocked.push([slot.label,'原图位请求还未核实']); + continue; + }else{ + candidate=novel[0].id; + await explain(slot,'review',{candidateId:candidate}); + } + } + if (item?.state==='missing' || item?.state==='rejected') { + blocked.push([slot.label,item.reason]); + continue; + } + let choice=item?.choice; + try { + if(!choice){ + choice=await inspect(slot); + await explain(slot,'planned',{choice,pendingReview:null}); + } + } + catch(error){ + if(!['detail_reference_missing','detail_review_invalid'].includes(error.code))throw error; + await explain(slot,'missing',{reason:error.message}); + blocked.push([slot.label,error.message]); + continue; + } + if (choice.decision==='missing'){ + await explain(slot,'missing',{choice,reason:choice.reason});blocked.push([slot.label,choice.reason]);continue; + } + let correction=item?.correction||choice.correction; + while(candidate || attemptss.id===slot.id)?.candidates.map(c=>c.id)??[]; + await current(); + await explain(slot,'dispatching',{attempts:++attempts,choice,baseline:initialIds,candidateId:null}); + const generated=await execute(slot,'generate_candidate',choice.decision==='original' + ? {useProductReference:true} : {instruction:correction||'保持本款商品真实结构、部件、材质与花色,不沿用模板样品。'}); + candidate=generated.candidateId; + if(generated.phase==='failed'){ + await explain(slot,'rejected',{candidateId:candidate,reason:generated.message}); + blocked.push([slot.label,generated.message]); + break; + } + await explain(slot,'review',{candidateId:candidate}); + } + let review=journal.items[slot.id].reviewedCandidate===candidate?journal.items[slot.id].review:null; + if(!review) { + try {review=await inspect(slot,candidate);} + catch(error){ + if(error.code!=='detail_review_invalid')throw error; + await explain(slot,'rejected',{reason:error.message}); + blocked.push([slot.label,error.message]); + break; + } + await explain(slot,'review',{reviewedCandidate:candidate,review,pendingReview:null}); + await host.store.appendEvent({type:'whole_detail_review',slotId:slot.id,candidateId:candidate,attempt:attempts,...review}); + } + if(review.decision==='pass'){ + await execute(slot,'adopt_candidate',{candidateId:candidate}); + await explain(slot,'applied',{candidateId:candidate,reason:review.reason}); + applied++;break; + } + if(choice.decision==='original' || review.decision==='missing' || attempts>=maximumAttempts){ + await explain(slot,'rejected',{reason:review.reason}); + blocked.push([slot.label,review.reason]); + break; + } + correction=`第 ${attempts+1} 张。按同款原图修正:${review.correction}`; + candidate=null; + await explain(slot,'retry',{candidateId:null,correction}); + } + } + const summary=`整套详情页已处理 ${slots.length} 个图位,已回填 ${applied} 个`; + return {text:blocked.length?`${summary},${blocked.length} 个待处理。\n${blocked.map(([slot,reason])=>`· ${slot}:${reason}`).join('\n')}`:`${summary}。可在画布预览成品。`}; +} diff --git a/apps/detail-agent-pi/src/workflow-execute.mjs b/apps/detail-agent-pi/src/workflow-execute.mjs index 2be50966..0e312889 100644 --- a/apps/detail-agent-pi/src/workflow-execute.mjs +++ b/apps/detail-agent-pi/src/workflow-execute.mjs @@ -8,7 +8,7 @@ const IMAGE_OPERATION_WAIT_MS = 14 * 60_000; const LOCAL_OPERATION_WAIT_MS = 120_000; // One new operation, then only read its status. No transport or model retry. -export async function executeWorkflow(host, args, signal, { timeoutMs, pause = delay } = {}) { +export async function executeWorkflow(host, args, signal, { timeoutMs, pause = delay, keepFailedCandidate = false } = {}) { if (host.canvasNotificationsDetached || host.canvasWritesStopped) throw Error('原项目已切换或原操作需核查,本轮不再派发'); if (host.nativeUnresolved) throw Error('原操作结果未知,先核查原请求;可使用 native_reconcile 只读核查,不会重发'); if (host.nativeToolActive) throw Error('已有原生操作正在执行,请依次等待'); @@ -81,6 +81,12 @@ export async function executeWorkflow(host, args, signal, { timeoutMs, pause = d if (result?.operationId !== operationId || !['submitted','complete','failed','unknown'].includes(result.phase)) throw Error('工作流操作回执无效,原操作需核查;不会重发'); } terminal = result.phase === 'complete' || result.phase === 'failed'; + if (keepFailedCandidate && args.intent === 'generate_candidate' && result.phase === 'failed' + && typeof result.candidateId === 'string' && result.candidateId) { + const message = workflowResult(result).message || '这次生图已失败,请查看图位记录'; + await host.store.appendEvent({type:'whole_detail_generation_failed',slotId:args.slotId,operationId,candidateId:result.candidateId,message}); + return {operation:{candidateId:result.candidateId,phase:'failed',message}}; + } if (result.phase !== 'complete') throw Error(workflowResult(result).message || (result.phase === 'failed' ? '原工作流操作失败,请核查结果;不会重发' : '原工作流操作结果未知,请核查原请求;不会重发')); const operation = workflowResult({ ...result, intent: args.intent, outputId: args.outputId, slotId: args.slotId, productVariantId: args.productVariantId, diff --git a/apps/detail-agent-pi/test/enterprise-context.test.mjs b/apps/detail-agent-pi/test/enterprise-context.test.mjs new file mode 100644 index 00000000..67c016df --- /dev/null +++ b/apps/detail-agent-pi/test/enterprise-context.test.mjs @@ -0,0 +1,35 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import fs from 'node:fs/promises'; +import path from 'node:path'; +import os from 'node:os'; +import {EnterpriseContext} from '../src/enterprise-context.mjs'; + +test('selected resource guides are read completely with their own versions',async t=>{ + const root=await fs.mkdtemp(path.join(os.tmpdir(),'xiaoyi-guides-')); + t.after(()=>fs.rm(root,{recursive:true})); + const calls=[],documents=[]; + const display=['SKILL.md','SKILL.md','验图全文.md']; + const assets=display.map((name,index)=>({id:'guide-'+index,role:'guide',required:true,status:'available', + file:{name,path:'Skills/'+index+'/'+name,fileId:'file-'+index,revision:'revision-'+index}})); + assets.push({id:'optional',role:'guide',required:false,status:'available',file:{fileId:'unneeded'}}); + const client={ + call:async(name,params)=>{ + calls.push([name,params]); + if(name==='list_libraries')return {result:{navigation:[{name:'Skills',path:'Skills'}]}}; + return {result:{revision:'view',resourceSet:{brand:'顾家',category:'电脑桌'},components:[{id:'visual_guides',status:'available',assets}]}}; + }, + readDocument:async (id,revision)=>{ + documents.push([id,revision]); + return {result:{text:'第一页\n第二页',pages:2,revision}}; + }, + }; + const ctx=new EnterpriseContext({root,appendEvent:async()=>{}},client); + const result=await ctx.load({task:'image',brandName:'顾家',categoryName:'电脑桌',resourceSetId:'selected'}); + assert.deepEqual(calls.map(([name])=>name),['list_libraries','get_resource_set']); + assert.equal(calls[1][1].resourceSetId,'selected'); + assert.deepEqual(documents,assets.slice(0,3).map(a=>[a.file.fileId,a.file.revision])); + assert.equal(result.skills.length,2); + assert.equal(result.rules[0].text,'第一页\n第二页'); + assert.equal(result.rules[0].pages,2); +}); diff --git a/apps/detail-agent-pi/test/recovery.test.mjs b/apps/detail-agent-pi/test/recovery.test.mjs index 5d148ef7..d9ba942f 100644 --- a/apps/detail-agent-pi/test/recovery.test.mjs +++ b/apps/detail-agent-pi/test/recovery.test.mjs @@ -45,6 +45,30 @@ test('received final reply recovers from bytes, persists and reopens without inf assert.equal(again.alreadyApplied, true); assert.equal(posts, 0); await host.dispose(); await cleanup(root); }); + +test('recovers structured image review for the original slot without adding it to chat',async()=>{ + const {root,scope,store}=await setup(); + const id=randomUUID(); + const review=JSON.stringify({decision:'generate',reason:'同款产品依据齐备'}); + await store.appendEvent({type:'provider_prepared',id,purpose:'whole-detail-review',bindingHash:store.hash}); + let phase='unknown',posts=0,lookups=0; + const model={id:'qa',protocol:'openai-chat'}; + const original={id:'review-original',model:'qa',choices:[{message:{role:'assistant',content:review},finish_reason:'stop'}]}; + const broker={info:async()=>({accountScope:scope,model,pending:[]}), + read:async()=>({phase,terminal:true,model,raw:Buffer.from(JSON.stringify(original)).toString('base64'),bodyHash:'qa',requestId:'review-original'}), + recover:async request=>{assert.equal(request,id);lookups++;phase='received';}, + confirm:async()=>{phase='complete';return {phase};},round(){posts++;throw Error('must not post');}}; + const host=await DetailPiAgent.open({store,broker,protocolMode:'structured-json'}); + try{ + const result=await host.recover(id); + assert.equal(result.phase,'complete'); + assert.equal(result.canvasWrites,0); + assert.equal(lookups,1); + assert.equal(host.session.messages.length,0); + assert.equal(await host.visionReview('',[],{savedReview:id}),review); + assert.equal(posts,0); + }finally{await host.dispose();await cleanup(root);} +}); test('410 remains unknown and all new inference stays blocked', async () => { const { root, scope, store } = await setup(); let queries = 0, posts = 0; diff --git a/apps/detail-agent-pi/test/whole-detail.test.mjs b/apps/detail-agent-pi/test/whole-detail.test.mjs new file mode 100644 index 00000000..325c8b26 --- /dev/null +++ b/apps/detail-agent-pi/test/whole-detail.test.mjs @@ -0,0 +1,75 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import fs from 'node:fs/promises'; +import path from 'node:path'; +import os from 'node:os'; +import {fillWholeDetail} from '../src/whole-detail.mjs'; + +async function fixture(t, review) { + const dir=await fs.mkdtemp(path.join(os.tmpdir(),'xiaoyi-detail-test-')); + t.after(()=>fs.rm(dir,{recursive:true})); + const calls=[]; + const slots=[{id:'hero',label:'首屏',candidates:[]},{id:'edge',label:'边缘',candidates:[]}]; + const operations=new Map(); + const canvas={ + run:'current',documentId:7, + read:async()=>({conversationActive:true,revision:1}), + requestWrite:async()=>({allowed:true,revision:1}), + delta:async()=>{}, + workflowRead:async()=>({available:true,version:1,canvasFirst:true,outputId:'detail',productVariantId:'wood', + template:{contentHash:'fixed'},totalSlots:slots.length,slots:structuredClone(slots)}), + detailImages:async(slot,candidateId)=>({referenceCount:1,candidateId:candidateId??null, + images:candidateId?['same-product','actual-candidate']:['same-product']}), + workflowExecute:async op=>{ + calls.push(op); + const slot=slots.find(slot=>slot.id===op.slotId); + const candidateId=op.candidateId??`candidate-${calls.length}`; + if(op.intent==='generate_candidate')slot.candidates.push({id:candidateId,status:'complete'}); + else slot.selectedCandidateId=candidateId; + operations.set(op.operationId,{phase:'complete',operationId:op.operationId,candidateId}); + return {phase:'submitted',operationId:op.operationId}; + }, + workflowPoll:async id=>operations.get(id), + }; + const store={dir,appendEvent:async()=>{},get:async(name)=>fs.readFile(path.join(dir,name),'utf8').then(JSON.parse).catch(()=>null)}; + const host={canvas,store,turnEpoch:1,readWorkflow:()=>canvas.workflowRead()}; + return {calls,slots,dir,run:()=>fillWholeDetail(host,async(...args)=>JSON.stringify(await review(...args)))}; +} + +test('rejects a structurally wrong candidate and only adopts the reviewed replacement',async t=>{ + const f=await fixture(t,async(slot,input,plan,candidate)=>!candidate + ? {decision:'generate',reason:'同款原图齐全'} : candidate==='candidate-1' + ? {decision:'revise',reason:'多了一根横梁',correction:'移除多余横梁,保持四个支撑点'} : {decision:'pass',reason:'结构与参考一致',checks:{structure:'pass',color:'pass',composition:'pass',evidence:'pass'}}); + const result=await f.run(); + assert.match(result.text,/已回填 2 个/); + assert.equal(f.calls.find(x=>x.intent==='adopt_candidate').candidateId,'candidate-2'); + assert.equal(f.calls.filter(x=>x.intent==='generate_candidate'&&x.slotId==='hero').length,2); + await f.run(); + assert.equal(f.calls.length,5,'续跑不重新发已采纳的图位'); +}); + +test('allows two visual reworks then marks the slot pending and continues other slots',async t=>{ + const f=await fixture(t,async(slot,input,plan,candidate)=>slot.id==='edge' + ? (candidate?{decision:'pass',reason:'可核实',checks:{structure:'pass',color:'pass',composition:'pass',evidence:'pass'}}:{decision:'original',reason:'精确复现边缘'}) + : (candidate?{decision:'revise',reason:'颜色不一致',correction:'按同款原图校正'}:{decision:'generate',reason:'需场景图'})); + const result=await f.run(); + assert.match(result.text,/已回填 1 个,1 个待处理/); + assert.equal(f.calls.filter(x=>x.slotId==='hero'&&x.intent==='generate_candidate').length,3); + assert.equal(f.calls.some(x=>x.slotId==='hero'&&x.intent==='adopt_candidate'),false); + assert.equal(f.calls.find(x=>x.slotId==='edge').useProductReference,true); +}); + +test('resumes an unreserved slot and leaves a reserved unknown candidate untouched',async t=>{ + const f=await fixture(t,async(slot,input,plan,candidate)=>candidate + ? {decision:'pass',reason:'与原图一致',checks:{structure:'pass',color:'pass',composition:'pass',evidence:'pass'}} + : {decision:'generate',reason:'商品原图齐全'}); + const item={state:'dispatching',attempts:1,baseline:[],choice:{decision:'generate',reason:'商品原图齐全',correction:''}}; + await fs.writeFile(path.join(f.dir,'whole-detail.json'),JSON.stringify({binding:'["fixed","wood"]',items:{hero:item,edge:item}})); + f.slots[1].candidates.push({id:'original-request',status:'unknown'}); + const result=await f.run(); + assert.match(result.text,/已回填 1 个,1 个待处理/); + assert.deepEqual(f.calls.map(op=>[op.slotId,op.intent]),[['hero','generate_candidate'],['hero','adopt_candidate']]); + const saved=JSON.parse(await fs.readFile(path.join(f.dir,'whole-detail.json'),'utf8')); + assert.equal(saved.items.hero.attempts,1); + assert.equal(saved.items.edge.attempts,1); +}); diff --git a/apps/detail-agent-pi/test/workflow-execute.test.mjs b/apps/detail-agent-pi/test/workflow-execute.test.mjs index 2c3019e6..dc8faab5 100644 --- a/apps/detail-agent-pi/test/workflow-execute.test.mjs +++ b/apps/detail-agent-pi/test/workflow-execute.test.mjs @@ -31,6 +31,19 @@ test('unknown, failed and invalid receipt never redispatch and stop writes',asyn for (const phase of ['unknown','failed','bad']) {const x=setup([phase]);await assert.rejects(executeWorkflow(x.host,args,undefined,{pause:async()=>{}}));assert.equal(x.calls.filter(c=>c[0]==='execute').length,1);assert.equal(x.host.canvasWritesStopped,true);assert.equal(x.calls.some(c=>c[0]==='read'),false);} }); +test('a whole-page run can continue past an identified failed image, never an unknown receipt',async()=>{ + const x=setup([]); + x.host.canvas.workflowPoll=async operationId=>({operationId,phase:'failed',candidateId:'original',message:'模型拒绝了该图位的请求'}); + const options={pause:async()=>{},keepFailedCandidate:true}; + const result=await executeWorkflow(x.host,args,undefined,options); + assert.deepEqual(result.operation,{phase:'failed',candidateId:'original',message:'模型拒绝了该图位的请求'}); + assert.equal(x.host.canvasWritesStopped,undefined); + x.host.canvas.workflowPoll=async operationId=>({operationId,phase:'unknown',candidateId:'next-original',message:'原请求待核查'}); + await assert.rejects(executeWorkflow(x.host,{...args,slotId:'next'},undefined,options),/待核查/); + assert.equal(x.host.canvasWritesStopped,true); + assert.equal(x.calls.filter(c=>c[0]==='execute').length,2); +}); + test('an upstream failure keeps its real reason instead of describing a user handover',async()=>{ const x=setup([]); x.host.canvas.workflowPoll=async operationId=>({operationId,phase:'unknown',candidateId:'original',message:'图片服务暂时不可用(503),原请求待核查;不会重发'}); diff --git a/apps/detail-photocraft/apps/photocraft/src/jiansun_agent_daemon.rs b/apps/detail-photocraft/apps/photocraft/src/jiansun_agent_daemon.rs index 40569d91..c9d8e2da 100644 --- a/apps/detail-photocraft/apps/photocraft/src/jiansun_agent_daemon.rs +++ b/apps/detail-photocraft/apps/photocraft/src/jiansun_agent_daemon.rs @@ -234,7 +234,10 @@ pub(super) fn service(node: &Path, script: &Path, binary: &Path, profile: &Path) let read = reader.by_ref().take(2_000_001).read_until(b'\n', &mut line); if !matches!(read, Ok(n) if n > 0 && n <= 2_000_000 && line.last() == Some(&b'\n')) { break; } let Ok(value) = serde_json::from_slice::(&line) else { break }; - if reader_daemon.handle(value).is_err() { break; } + if let Err(reason) = reader_daemon.handle(value) { + log::warn!("本机Agent消息处理停止:{reason}"); + break; + } } reader_daemon.fail(); }); diff --git a/apps/detail-photocraft/apps/photocraft/src/jiansun_backend.rs b/apps/detail-photocraft/apps/photocraft/src/jiansun_backend.rs index b511997f..6f8ef529 100644 --- a/apps/detail-photocraft/apps/photocraft/src/jiansun_backend.rs +++ b/apps/detail-photocraft/apps/photocraft/src/jiansun_backend.rs @@ -602,16 +602,53 @@ impl Backend { } Ok(out) } - fn refresh_models(&mut self) -> R<()> { - self.models = self.json("agent-models")?["models"].as_array().cloned().ok_or("对话模型目录无效")?; - pi_runtime::enrich_models(&mut self.models)?; - match self.json("execution-models").and_then(|catalog| { - let allowed=catalog["models"].as_array().ok_or("文案模型目录无效")?; - Ok(self.models.iter().filter(|model|allowed.iter().any(|item|item["stage"]=="copy"&&item["key"]==model["key"])).cloned().collect()) - }) {Ok(models)=>{self.copy_models=models;self.copy_error.clear();},Err(error)=>{self.copy_models.clear();self.copy_error=error;}} + fn legacy_text_choices(&self, saved: &Value) -> Vec { + let keys = [&saved["model"], crate::jiansun_models::copy_selection(saved)]; + if !keys.iter().any(|key| key.as_str().is_some_and(|id| Uuid::parse_str(id).is_ok())) { + return vec![]; + } + self.json("agent-models").ok().and_then(|value| value["models"].as_array().cloned()).unwrap_or_default() + } + + fn text_models(&self, catalog: &Value, saved: &Value) -> R> { + let aliases = self.legacy_text_choices(saved); + let active = [&saved["model"], crate::jiansun_models::copy_selection(saved)]; + let mut models = Vec::new(); + let mut seen = std::collections::HashSet::new(); + for row in crate::jiansun_image_protocol::catalog_models(catalog)? { + let alias = aliases.iter().find(|option| option["id"] == row["id"] && active.contains(&&option["key"])); + if let Some(model) = crate::jiansun_models::text_model(row, alias.and_then(|item| item["key"].as_str())) { + if seen.insert(model["id"].as_str().unwrap_or_default().to_owned()) { + models.push(model); + } + } + } + Ok(models) + } + + fn live_text_choice(&self, choice: &str) -> R { + let id = if Uuid::parse_str(choice).is_ok() { + self.legacy_text_choices(&json!({"model":choice})).into_iter().find(|row| row["key"] == choice) + .and_then(|row| row["id"].as_str().map(str::to_owned)).ok_or("原对话模型无法识别,请在设置中重新选择")? + } else { + choice.to_owned() + }; + let catalog = self.public_model_catalog()?; + crate::jiansun_image_protocol::catalog_models(&catalog)? + .filter(|row| row["id"] == id) + .find_map(|row| crate::jiansun_models::text_model(row, Some(choice))) + .ok_or_else(|| "98K 当前未发布此模型的可用对话契约,请重新选择".into()) + } + + fn refresh_models(&mut self, catalog: &Value, saved: &Value) -> R<()> { + self.models = self.text_models(catalog, saved)?; + // The bundled provider database supplies optional capacity metadata only. + let _ = pi_runtime::enrich_models(&mut self.models); + self.copy_models = self.models.clone(); + self.copy_error.clear(); Ok(()) } - fn public_image_catalog(&self) -> R { + fn public_model_catalog(&self) -> R { let response = self.http.get(format!("{UPSTREAM}/api/v2/catalog/models")).send().map_err(|_| "98k公开模型目录暂不可用")?; let (status, catalog) = body(response, 16 * 1024 * 1024)?; if status != 200 { return Err(format!("98k公开模型目录暂不可用(HTTP {status})")); } @@ -630,16 +667,16 @@ impl Backend { if !permitted.contains(&id) { return Err("个人Key未开放此模型,本次生图未提交".into()); } - let catalog = self.public_image_catalog() + let catalog = self.public_model_catalog() .map_err(|error| format!("本次生图未提交。{error}"))?; let contract = crate::jiansun_image_protocol::select(&catalog, &id)?; Ok((id, contract)) } - fn refresh_image_models(&mut self, saved: &Value, available: Option<&[String]>) { + fn refresh_image_models(&mut self, catalog: &Value, saved: &Value, available: Option<&[String]>) { let choice = saved["imageModel"].as_str().unwrap_or_default(); let legacy = Uuid::parse_str(choice).is_ok().then(|| self.image_model_id(choice)); let previous = legacy.as_ref().and_then(|result| result.as_deref().ok()).map(|id| (choice, id)); - match self.public_image_catalog().and_then(|catalog| crate::jiansun_models::image_choices(&catalog, available, previous)) { + match crate::jiansun_models::image_choices(catalog, available, previous) { Ok(items) => { self.image_models = items; self.image_error = legacy.and_then(Result::err).unwrap_or_default(); @@ -684,9 +721,6 @@ impl Backend { Ok(()) => { library_status = "connected"; library_http_status = Some(200); - if let Err(error) = self.refresh_models() { - message = error; - } } Err(failure) => { library_status = failure.state; @@ -697,20 +731,32 @@ impl Backend { } } let saved = self.settings().unwrap_or_else(|_| json!({})); - if !self.auth.is_null() { + if library_status == "connected" { let has_key = saved["key"].as_str().filter(|key| !key.is_empty()); - let mut key_error = None; if let Some(key) = has_key { match self.key_catalog(key) { Ok(items) => available = Some(items), - Err(error) => key_error = Some(error), + Err(error) => { + self.image_error = error.clone(); + message = error; + } } } - if has_key.is_none() || available.is_some() { - self.refresh_image_models(&saved, available.as_deref()); - } else if let Some(error) = key_error { - if message.is_empty() { message = error.clone(); } - self.image_error = error; + match self.public_model_catalog() { + Ok(catalog) => { + if let Err(error) = self.refresh_models(&catalog, &saved) { + self.copy_error.clone_from(&error); + if message.is_empty() { message = error; } + } + if has_key.is_none() || available.is_some() { + self.refresh_image_models(&catalog, &saved, available.as_deref()); + } + } + Err(error) => { + self.image_error.clone_from(&error); + self.copy_error.clone_from(&error); + if message.is_empty() { message = error; } + } } } self.model = saved["model"].as_str().unwrap_or("").into(); @@ -982,12 +1028,11 @@ impl Backend { if file.exists() && matches!(read_json(&file)?["phase"].as_str(), Some("dispatched" | "unknown")) { return Err("原请求待核查,不能再次生成".into()); } - let models = self.json("agent-models")?["models"].as_array().cloned().ok_or("模型目录无效")?; let chosen = input["model"].as_str().filter(|s| !s.is_empty()).or(settings["model"].as_str()).ok_or("请选择模型")?; - let model = models.iter().find(|m| m["key"].as_str() == Some(chosen)).ok_or("管理员已关闭此模型,请重新选择")?; if settings["model"].as_str() != Some(chosen) { return Err("请先保存对话模型选择".into()); } + let model = self.live_text_choice(chosen)?; let available = self.key_catalog(key)?; if !available.iter().any(|id| model["id"] == id.as_str()) { return Err("此Key未开放所选对话模型,请在对话栏重新选择".into()); @@ -1161,8 +1206,9 @@ impl Backend { "project-state" => self.project_state(input), "configure" => { self.validate()?; - self.refresh_models()?; let saved = self.settings().unwrap_or_else(|_| json!({})); + let catalog = self.public_model_catalog()?; + self.refresh_models(&catalog, &saved)?; let key = input["key"] .as_str() .filter(|s| !s.is_empty()) @@ -1170,7 +1216,7 @@ impl Backend { .filter(|s| (12..=500).contains(&s.len())) .ok_or("请填写个人98k Key")?; let available = self.key_catalog(key)?; - self.refresh_image_models(&saved, Some(&available)); + self.refresh_image_models(&catalog, &saved, Some(&available)); let settings = crate::jiansun_models::selection(input, &saved, &self.models, &self.copy_models, &self.image_models, &available)?; vault(&format!("models:{}", self.scope()))?.set_password(&settings.to_string()).map_err(|_| "个人Key未能保存到系统凭据库")?; self.model = settings["model"].as_str().unwrap_or("").into(); @@ -1962,10 +2008,15 @@ mod tests { let root = std::env::var_os("JIANSUN_LIVE_PROFILE").expect("explicit local acceptance profile"); let mut b = Backend::new(PathBuf::from(root)).unwrap(); b.validate().unwrap(); - b.refresh_models().unwrap(); let saved = b.settings().unwrap(); + let catalog = b.public_model_catalog().unwrap(); + b.refresh_models(&catalog, &saved).unwrap(); let available = b.key_catalog(saved["key"].as_str().unwrap()).unwrap(); - b.refresh_image_models(&saved, Some(&available)); + b.refresh_image_models(&catalog, &saved, Some(&available)); + let selectable_text: Vec<_> = b.models.iter().filter(|m| m["id"].as_str().is_some_and(|id| available.iter().any(|item| item == id))) + .filter_map(|m| m["id"].as_str()).collect(); + assert!(!selectable_text.is_empty()); + println!("{} {}", "可选对话模型", selectable_text.join(", ")); let public = b.connection_data(&saved, Some(&available)); assert!(!b.image_models.is_empty(), "{}", b.image_error); assert_eq!(public["keySaved"], true); diff --git a/apps/detail-photocraft/apps/photocraft/src/jiansun_canvas_workspace.rs b/apps/detail-photocraft/apps/photocraft/src/jiansun_canvas_workspace.rs index 94dadebf..edaf512f 100644 --- a/apps/detail-photocraft/apps/photocraft/src/jiansun_canvas_workspace.rs +++ b/apps/detail-photocraft/apps/photocraft/src/jiansun_canvas_workspace.rs @@ -6,6 +6,7 @@ const FILE: &str = "canvas-workspace.json"; const CANDIDATE: &str = "canvas-candidate.json"; const MAPPING: &str = "jiansun.slot-mapping.v1"; + pub(super) fn exists(dir: &Path) -> bool { dir.join(FILE).is_file() } @@ -131,6 +132,16 @@ fn slot_frame<'a>(field: &'a Value, mapped: Option<&'a Value>) -> Option<&'a Val } } +fn specified_image_ratio(field: &Value) -> Option<(u64, u64)> { + let description = field["outputSpec"].as_str().or_else(|| field["requirements"].as_str())?; + let text = description.split_once("标准比例")?.1.trim_start_matches([' ', ':', ':']); + let left = text.split(&[':', ':'][..]).next()?; + let right = text.get(left.len()..)?.trim_start_matches([':', ':', ' ']).chars().take_while(char::is_ascii_digit).collect::(); + let width: u64 = left.trim().parse().ok()?; + let height: u64 = right.parse().ok()?; + ((1..=21).contains(&width) && (1..=21).contains(&height)).then_some((width, height)) +} + fn references(dir: &Path, images: &Value) -> R> { let images = images.as_array().filter(|v| v.len() <= 8).ok_or("每花色最多8张产品/场景参考图")?; let mut seen = std::collections::HashSet::new(); @@ -171,7 +182,11 @@ fn generation_references(dir: &Path, state: &Value, variant_id: &str) -> R { + text.text.clear(); + text.cache = None; + text.psd_raw = None; + text.runs.truncate(1); + text.paragraphs.truncate(1); + for run in &mut text.runs { run.len = 0; } + for run in &mut text.paragraphs { run.len = 0; } + layer.psd_blocks.retain(|(key, _)| key != b"TySh"); + } + LayerContent::Group(group) => clear_sample_copy(&mut group.children), + _ => {} + } + } +} + +fn refinement_prompt(base_index: usize) -> String { + format!("\n第{base_index}张是旧候选,只用来保持原来的场景、镜头和摆放。产品本体始终以 product 参考图为准,即使用户本次没有明确指出,也要删除旧候选添加的部件、恢复正确结构和空隙。不能从旧候选沿用或推测产品结构;保留用户没有要求改动的非产品部分。产品颜色始终遵守【本图产品颜色】。") +} + #[cfg(test)] mod prompt_tests { use super::*; @@ -242,6 +283,39 @@ mod prompt_tests { assert!(workflow_prompt.contains("【本次要求】改用侧光")); } + #[test] + fn a_fresh_product_draft_clears_nested_and_unmapped_copy_without_changing_layout() { + use photocraft_doc::{Layer, LayerContent, TextLayer}; + let sample = Layer::new("Template example", LayerContent::Text(TextLayer {text:"3 年质保".into(), ..Default::default()})); + let group = Layer::group("Original layout", vec![sample.clone()]); + let mut layers = vec![group, sample]; + let original = layers.clone(); + clear_sample_copy(&mut layers); + let LayerContent::Group(group) = &layers[0].content else { panic!("missing group"); }; + for layer in [&group.children[0], &layers[1]] { + assert!(layer.visible); + assert!(matches!(&layer.content, LayerContent::Text(text) if text.text.is_empty() && text.cache.is_none())); + } + assert_eq!(layers[1].id, original[1].id); + assert!(matches!(&original[1].content, LayerContent::Text(text) if text.text == "3 年质保")); + } + + #[test] + fn output_ratio_uses_template_spec_instead_of_the_native_crop() { + let field = json!({"outputSpec":"标准比例 2 : 3。实际图框1442×2353px","frame":{"width":1442,"height":2353}}); + assert_eq!(specified_image_ratio(&field), Some((2,3))); + assert_eq!(specified_image_ratio(&json!({"requirements":"标准比例16:9。"})), Some((16,9))); + assert_eq!(specified_image_ratio(&json!({"requirements":"图框980×1200"})), None); + } + + #[test] + fn edits_prioritize_real_structure_over_the_previous_candidate() { + let instruction = refinement_prompt(3); + assert!(instruction.contains("第3张是旧候选")); + assert!(instruction.contains("产品本体始终以 product 参考图为准")); + assert!(instruction.contains("删除旧候选添加的部件")); + } + #[test] fn cached_template_prompt_uses_only_the_pinned_image_description() { let temp = tempfile::tempdir().unwrap(); @@ -416,8 +490,42 @@ pub(super) fn pending_summary(dir: &Path) -> R> { fn publish_prepared(events: &mpsc::Sender, snapshot: Value) -> R<()> { events.send(Event::Json("slot-progress".into(), Ok(snapshot))).map_err(|_| "工作台已关闭,候选预留保留,未发送新图片请求".into()) } +fn new_binding(state: &Value, output: &Value, field: &Value, slot: &str, variant: &str, id: &str, prompt: &str) -> Value { + json!({"schemaVersion":2,"canvasFirst":true,"workspaceId":state["id"],"templateId":state["template"]["id"], + "templateVersion":state["template"]["version"],"templateHash":state["template"]["contentHash"], + "structureHash":state["structureHash"],"slotId":slot,"fieldId":field["fieldId"],"outputId":output["id"], + "variantId":variant,"candidateId":id,"taskId":id,"promptHash":hash(prompt)}) +} + +fn original_product_candidate(dir: &Path, state: Value, binding: Value, products: &Value) -> R { + let image = products.as_array().into_iter().flatten().find(|row| row["purpose"] == "product").ok_or("当前花色没有产品原图")?; + let source = image["source"].as_str().and_then(|value| value.strip_prefix("local:")).ok_or("当前产品原图不在本机项目")?; + let id = uuid(&binding["candidateId"], "原图候选")?; + let job = dir.join("image-jobs").join(&id); + let journal = json!({"version":1,"id":id,"phase":"complete","slotBinding":binding,"requestId":null, + "sourceType":"product-reference","sha256":source}); + // Stage a complete local artifact before publishing its candidate. This + // branch never creates an upstream request or an unknown task. + write_json(&job.join("task.json"), &journal)?; + let bytes = fs::read(dir.join("creation-assets").join(format!("{source}.png"))).map_err(|_| "产品原图无法读取")?; + photocraft_format::atomic_write(&job.join("generated.png"), &bytes).map_err(|_| "产品原图无法保存为候选")?; + let artifact = template_slots::artifact(dir, &id, &journal)?; + let variant_id = binding["variantId"].as_str().ok_or("花色身份无效")?; + let sequence = state["candidates"].as_array().ok_or("候选索引无效")?.len() + 1; + let record = json!({"version":2,"id":id,"sequence":sequence,"binding":binding,"phase":"complete", + "sourceType":"product-reference","modelId":null,"inputHash":input_hash(dir,&state,variant_id)?, + "prompt":"产品原图","instructions":"产品原图","references":[image],"requestId":null,"artifact":artifact,"createdAt":now()}); + reserve(dir, state, &record)?; + Ok(record) +} + fn candidate_receipt(record: &Value) -> Value { - json!({"id":record["id"],"slotId":record["binding"]["slotId"],"variantId":record["binding"]["variantId"],"status":record["phase"],"message":record["message"]}) + let mut receipt = json!({"id":record["id"],"slotId":record["binding"]["slotId"],"variantId":record["binding"]["variantId"], + "status":record["phase"],"message":record["message"]}); + if record["sourceType"] == "product-reference" { + receipt["sourceType"] = record["sourceType"].clone(); + } + receipt } fn operation_receipt(mut canonical: Value, candidate: Option, error: Option) -> Value { if let Some(candidate) = candidate { @@ -624,6 +732,9 @@ fn merge_missing_ending(doc: &mut Document, mut original: Document, meta: &Value } original.layer_mut(layer_id).ok_or("固定原稿图层缺失")?.id = photocraft_doc::LayerId(old_id); } + if meta["omitSampleCopy"] == true { + clear_sample_copy(&mut original.layers[first_missing_root..]); + } doc.layers.extend(original.layers.drain(first_missing_root..)); debug_assert!(missing_ending_pages(doc).is_empty()); Ok(()) @@ -679,6 +790,59 @@ impl Backend { .map_err(|_| "工作台已关闭,原图对比未显示".into()) } + fn detail_layout_bytes(&self, field: &Value) -> R>> { + let reference = &field["previewReference"]; + if !reference.is_object() { + return Ok(None); + } + let result = self.enterprise_template_request(json!({"action":"field-preview", + "fileId":reference["fileId"],"revision":reference["revision"]}))?; + let folder = self.dir().join("enterprise-templates").join("resource-previews"); + let path = result["imagePath"].as_str().map(PathBuf::from).filter(|path| path.parent() == Some(folder.as_path())) + .ok_or("当前图位原参考没有实际画面")?; + fs::read(path).map(Some).map_err(|_| "图位原参考无法读取".into()) + } + + pub(super) fn read_detail_review_images(&self, doc: u64, target: &Value) -> R { + self.ensure_owner(doc)?; + let dir = self.project_dir(doc)?; + let state = load(&dir)?; + let variant_id = uuid(&target["variantId"], "花色")?; + let slot = target["slotId"].as_str().ok_or("图片图位缺失")?; + let (output, field) = definition(&state, slot, &variant_id)?; + if output["component"] != "detail" || target["templateHash"] != state["template"]["contentHash"] { + return Err("当前详情页模板或图位已变化".into()); + } + let references = generation_references(&dir, &state, &variant_id)?; + let mut images = Vec::new(); + for image in references.as_array().into_iter().flatten().filter(|row| row["purpose"] == "product").take(3) { + let id = image["source"].as_str().and_then(|value| value.strip_prefix("local:")).ok_or("产品图没有保存")?; + let bytes = fs::read(dir.join("creation-assets").join(format!("{id}.png"))).map_err(|_| "同款产品图片无法读取")?; + let preview = super::images::decode_agent_image(&bytes)?; + images.push(json!({"type":"image","data":photocraft_ui_egui::jiansun::reference_jpeg(&preview,768)?,"mimeType":"image/jpeg"})); + } + let reference_count = images.len(); + let layout_count = if let Some(bytes) = self.detail_layout_bytes(field)? { + let preview = super::images::decode_agent_image(&bytes)?; + images.push(json!({"type":"image","data":photocraft_ui_egui::jiansun::reference_jpeg(&preview,768)?,"mimeType":"image/jpeg"})); + 1 + } else { 0 }; + if let Some(candidate) = target["candidateId"].as_str() { + let record = read_candidate(&dir, candidate)?; + if record["phase"] != "complete" || record["binding"]["slotId"] != slot || record["binding"]["variantId"] != variant_id { + return Err("候选图未就绪或不属于该图位".into()); + } + let (_, preview) = self.agent_image_preview(&json!({"doc":doc,"taskId":candidate}))?; + images.push(json!({"type":"image","data":photocraft_ui_egui::jiansun::reference_jpeg(&preview,768)?,"mimeType":"image/jpeg"})); + } + let mapping = cached_prompt_mapping(&dir, &state["template"]); + let aspect = specified_image_ratio(field).map(|(w,h)| format!("{w}:{h}")); + Ok(json!({"images":images,"referenceCount":reference_count,"layoutCount":layout_count, + "role":field["role"],"aspectRatio":aspect,"frame":field["frame"],"outputSpec":field["outputSpec"],"prompt":editable_image_prompt(field,&output["id"],mapping.as_ref()),"candidateId":target["candidateId"], + "brief":{"name":state["brief"]["name"],"note":state["brief"]["note"],"color":variant(&state,&variant_id)?["colorName"], + "dimensions":variant(&state,&variant_id)?["dimensions"]}})) + } + pub(super) fn read_pinned_template_image(&self, dir: &Path, target: &Value) -> R { let state = load(dir)?; let pack = &state["template"]; @@ -851,7 +1015,9 @@ pub(super) fn snapshot(dir: &Path) -> R { output["slots"].as_array().into_iter().flatten().any(|field| field["kind"] == "image" && field.get("imagePrompt").is_none())); let prompt_mapping = needs_mapping.then(|| cached_prompt_mapping(dir, pack)).flatten(); for output in state["template"]["outputs"].as_array().into_iter().flatten() { - outputs.push(json!({"documentId":output["id"],"outputId":output["component"],"name":output["name"],"width":output["width"],"height":output["height"],"ready":true})); + outputs.push(json!({"documentId":output["id"],"outputId":output["component"],"name":output["name"], + "width":output["width"], + "height":output["height"],"ready":true})); let component = output["component"].as_str().unwrap_or("detail"); if component != active_output && !output_uses_variant(&state["brief"], component, active) { continue; @@ -860,13 +1026,13 @@ pub(super) fn snapshot(dir: &Path) -> R { let id = slot_id(&state["template"]["contentHash"], active, field["fieldId"].as_str().ok_or("图片目标编号缺失")?); let mapped = mapped_slot(&state, &id, active); let Some(frame) = slot_frame(field, mapped) else { continue; }; - let candidates: Vec<_> = history.iter().filter(|record| record["binding"]["slotId"] == id).map(|record| json!({"id":record["id"],"taskId":record["id"],"variant":record["id"],"sequence":record["sequence"],"status":record["phase"],"requestId":record["requestId"],"instructions":record["instructions"],"parentCandidateId":record["parentCandidateId"],"previewUri":format!("bytes://template-candidate-{}",record["id"].as_str().unwrap_or("")),"error":record["message"]})).collect(); + let candidates: Vec<_> = history.iter().filter(|record| record["binding"]["slotId"] == id).map(|record| json!({"id":record["id"],"taskId":record["id"],"variant":record["id"],"sequence":record["sequence"],"status":record["phase"],"requestId":record["requestId"],"instructions":record["instructions"],"parentCandidateId":record["parentCandidateId"],"sourceType":record["sourceType"],"previewUri":format!("bytes://template-candidate-{}",record["id"].as_str().unwrap_or("")),"error":record["message"]})).collect(); slots.push(json!({"id":id,"fieldId":field["fieldId"],"documentId":output["id"],"outputId":output["component"],"variantId":active,"kind":"image","label":field.get("name").or(field.get("label")).unwrap_or(&field["fieldId"]),"width":frame["width"],"height":frame["height"],"frame":frame,"box":frame,"crop":field["crop"],"templatePrompt":editable_image_prompt(field, &output["id"], prompt_mapping.as_ref()),"nativeLayerId":mapped.map(|m|m["nativeLayerId"].clone()),"candidates":candidates,"selectedCandidateId":null,"appliedCandidateId":null,"fields":[],"required":false})); } } let original_canvas = &state["template"]["enterprise"]["canvas"]; let screen_count = active_mapping["outputs"].as_array().map_or_else(|| outputs.iter().filter(|output| output["outputId"] == state["activeOutput"]).count(),Vec::len); - let template = json!({"id":state["template"]["id"],"name":state["template"]["name"],"version":state["template"]["version"],"enterprise":state["template"]["enterprise"].is_object(), + let template = json!({"id":state["template"]["id"],"name":state["template"]["name"],"version":state["template"]["version"],"contentHash":state["template"]["contentHash"],"resourceSetId":state["template"]["enterprise"]["resourceSetId"],"enterprise":state["template"]["enterprise"].is_object(), "width":original_canvas[0],"height":original_canvas[1],"screenCount":screen_count}); Ok(json!({"canvasFirst":true,"revision":state["revision"],"workspaceId":state["id"],"structureHash":state["structureHash"],"templateId":state["template"]["id"],"templateVersion":state["template"]["version"],"templateHash":state["template"]["contentHash"],"templateName":state["template"]["name"],"template":template,"confirmed":true,"confirmationKind":"template-selection","pending":pending,"recoveryCandidateId":recovery_candidate,"activeVariantId":active,"variantId":active,"variants":state["variants"],"outputVariantIds":state["brief"]["outputVariantIds"],"outputId":state["activeOutput"],"outputs":outputs,"slots":slots,"capabilities":{"imageDispatchAllowed":ready&&!pending&&active_color_enabled,"copyDispatchAllowed":false,"localApplyAllowed":ready}})) } @@ -898,6 +1064,9 @@ impl Backend { if method == "slot-skeleton" && input["brief"].is_object() { self.creation_guard(doc, &dir)?; let previous = if exists(&dir) { Some(load(&dir)?) } else { None }; + if input["generateWhole"] == true && previous.as_ref().is_some_and(|old| old["activeMapping"].is_string()) { + return Err("请在新项目中一键生成整套详情页,当前画布与编辑已保留".into()); + } if previous.is_some() && !pending_summary(&dir)?.is_empty() { return Err("原候选仍待核查,未覆盖其产品资料与参考图".into()); } @@ -934,7 +1103,8 @@ impl Backend { self.creation_action("creation-save", &json!({"doc":doc,"revision":c["revision"],"brief":common,"width":width}), None, events, ctx)?; let c = creation::load(&dir)?; let mut next = previous.unwrap_or_else( - || json!({"version":1,"canvasFirst":true,"id":Uuid::new_v4().to_string(),"revision":0,"candidates":[],"mappings":{},"adoptions":[]}), + || json!({"version":1,"canvasFirst":true,"id":Uuid::new_v4().to_string(),"revision":0, + "candidates":[],"mappings":{},"adoptions":[],"omitSampleCopy":true}), ); next["brief"] = c["brief"].clone(); next["width"] = c["width"].clone(); @@ -970,7 +1140,9 @@ impl Backend { let _ = events.send(Event::Json("template-progress".into(), Ok(value))); ctx.request_repaint(); }; - let mut native = if edited.is_file() { + let has_edit = edited.is_file(); + let generate_whole = input["generateWhole"] == true; + let mut native = if has_edit { let mut saved = photocraft_format::load_path(&edited).map_err(|_| "原生编辑稿无法读取,未用空骨架覆盖")?; self.repair_template_ending(&dir, &mut saved, report)?; saved @@ -979,12 +1151,27 @@ impl Backend { } else { slot_canvas::skeleton(&state["template"], component, document, &variant_id)? }; + if component == "detail" && state["omitSampleCopy"] == true && !has_edit && !generate_whole { + clear_sample_copy(&mut native.layers); + } native.id = photocraft_doc::DocId(doc); let mut meta = mapping(&native).ok_or("模板骨架缺少真实图层映射")?; if meta["templateHash"] != state["template"]["contentHash"] || meta["variantId"] != variant_id || meta["component"] != component { return Err("原生骨架与项目花色或模板不一致,未打开".into()); } meta["workspaceId"] = state["id"].clone(); + if component == "detail" && state["omitSampleCopy"] == true && !generate_whole { + meta["omitSampleCopy"] = json!(true); + if !has_edit { + for page in meta["outputs"].as_array_mut().into_iter().flatten() { + for field in page["mapping"]["fields"].as_array_mut().into_iter().flatten() { + if field["kind"] == "text" { + field["originalText"] = json!(""); + } + } + } + } + } for (name, text) in &mut native.metadata.text { if name == MAPPING { *text = meta.to_string(); @@ -1002,6 +1189,7 @@ impl Backend { result["documentId"] = json!(document); result["variantId"] = json!(variant_id); result["canvasFirst"] = json!(true); + result["startWholeDetail"] = json!(generate_whole); events.send(Event::SlotCanvas(Box::new(native), result)).map_err(|_| "工作台已关闭,模板骨架记录保留")?; } else if method == "slot-append" { validate_image_context(&dir, None)?; @@ -1012,9 +1200,14 @@ impl Backend { return Err("此颜色未选入当前图类,请在产品资料调整出图颜色".into()); } let mut field = field.clone(); + let image_ratio = specified_image_ratio(&field); field["frame"] = slot_frame(&field, mapped_slot(&state, &id, &variant_id)) .ok_or("请先打开对应模板画布,核对图片图层范围")?.clone(); let output = output.clone(); + if input["replaceTemplatePrompt"] != true { + let source = cached_prompt_mapping(&dir, &state["template"]); + field["requirements"] = json!(editable_image_prompt(&field, &output["id"], source.as_ref())); + } let instructions = text(&input["instructions"], 2000, "图片要求")?; let parent = input.get("parentCandidateId").filter(|v| !v.is_null()).map(|value| uuid(value, "原候选")).transpose()?; let mut attachments = creation::composer_attachments::resolve(&dir, &input.get("attachments").cloned().unwrap_or_else(|| json!([])))?; @@ -1034,6 +1227,20 @@ impl Backend { let mut creation = creation::load(&dir)?; let selected = variant(&state, &variant_id)?; let images = generation_references(&dir, &state, &variant_id)?; + if input["useProductReference"] == true { + if parent.is_some() || !attachments.is_empty() { + return Err("使用产品原图只能添加新候选,请先关闭改图或清除临时参考图".into()); + } + let candidate = Uuid::new_v4().to_string(); + let binding = new_binding(&state, &output, &field, &id, &variant_id, &candidate, "产品原图"); + let record = original_product_candidate(&dir, state, binding, &images)?; + if let Ok((mut reference, preview)) = self.agent_image_preview(&json!({"doc":doc,"taskId":candidate})) { + reference["purpose"] = json!("template-candidate"); + let _ = events.send(Event::Preview(reference, preview)); + ctx.request_repaint(); + } + return Ok(operation_receipt(self.canvas_workspace_result(doc, &dir)?, Some(candidate_receipt(&record)), None)); + } let attachment_refs = input.get("attachments").cloned().unwrap_or_else(|| json!([])); if !attachment_refs.as_array().is_none_or(Vec::is_empty) && input["projectId"].as_str() != self.locations.get(&doc).map(String::as_str) { return Err("附件所属项目已变化,请重新选择".into()); @@ -1043,6 +1250,12 @@ impl Backend { } creation["brief"]["images"] = images.clone(); creation["generation"] = Value::Null; // Never inherit a different colour's legacy anchor. + let layout_index = if input["detailBatch"] == true && images.as_array().map_or(0, Vec::len) + attachments.len() < 8 { + if let Some(bytes) = self.detail_layout_bytes(&field)? { + attachments.push((json!({"id":"pinned-layout","purpose":"template-layout-only"}),bytes)); + Some(images.as_array().map_or(0, Vec::len)+attachments.len()) + } else { None } + } else { None }; let (references, layers) = creation::reference_canvas_with_attachments(&creation, &dir, doc, &attachments)?; let settings = self.settings()?; let model = settings["imageModel"].as_str().filter(|model| !model.is_empty()).ok_or("请先选择生图模型")?; @@ -1050,17 +1263,20 @@ impl Backend { let mut prompt = candidate_prompt( &state, &output, &field, selected, &images, &instructions, input["replaceTemplatePrompt"] == true, ); - if let Some(parent) = &parent { - let base_index = images.as_array().map_or(0,Vec::len) + 1; - prompt.push_str(&format!("\n继续修改现有候选{parent}。第{base_index}张参考图是唯一修改底图,保留其场景、构图、产品和未要求改变的部分;其他产品图只用于核对外观,禁止另起一张场景。产品颜色始终遵守【本图产品颜色】。")); + if parent.is_some() { + let base_index = images.as_array().map_or(0, Vec::len) + 1; + prompt.push_str(&refinement_prompt(base_index)); } - let knowledge = if state["template"]["enterprise"].is_object() { + if let Some(index) = layout_index { + prompt.push_str(&format!("【模板图位参考】第{index}张只参考机位、构图、主体占比和留白。此图里的商品样式、颜色、文字、标志和尺寸不是当前商品依据。")); + } + let knowledge = if state["template"]["enterprise"].is_object() && input["detailBatch"] != true { self.enterprise_template_request(json!({"action":"context","projectRoot":dir,"task":"image","brandName":state["brief"]["brandName"],"categoryName":state["brief"]["categoryName"],"templateId":state["template"]["id"],"releaseId":state["template"]["version"]}))?["context"].clone() } else { Value::Null }; if prompt.chars().count() > 6000 { return Err("当前产品与图片要求超过单次上下文限额,请先精简资料".into()); } - let mut binding = json!({"schemaVersion":2,"canvasFirst":true,"workspaceId":state["id"],"templateId":state["template"]["id"],"templateVersion":state["template"]["version"],"templateHash":state["template"]["contentHash"],"structureHash":state["structureHash"],"slotId":id,"fieldId":field["fieldId"],"outputId":output["id"],"variantId":variant_id,"candidateId":candidate,"taskId":candidate,"promptHash":hash(&prompt)}); + let mut binding = new_binding(&state, &output, &field, &id, &variant_id, &candidate, &prompt); if !attachment_refs.as_array().is_none_or(Vec::is_empty) { binding["composerHash"] = json!(hash(&attachment_refs.to_string())); } let mut record = json!({"version":2,"id":candidate,"sequence":state["candidates"].as_array().ok_or("候选索引无效")?.len()+1,"binding":binding,"phase":"prepared","modelId":model,"inputHash":input_hash(&dir,&state,&variant_id)?,"prompt":prompt,"instructions":instructions,"parentCandidateId":parent,"references":images,"requestId":null,"createdAt":now()}); if !attachment_refs.as_array().is_none_or(Vec::is_empty) { record["composerAttachments"] = attachment_refs; } @@ -1077,7 +1293,8 @@ impl Backend { let visual = profile["visualRules"].as_object().map(|values| values.values().filter_map(Value::as_str).collect::>().join("\n")).unwrap_or_default(); let brand = json!({"name":creation["brief"]["brandName"],"tone":profile["tone"],"visualRules":visual.chars().take(4000).collect::(),"fontFamily":"Noto Sans SC"}); - let call = self.image_job(Some(Arc::new(references)), &json!({"doc":doc,"revision":input["baseRevision"],"model":model,"mode":if parent.is_some(){"refine"}else{"generate"},"text":prompt,"screen":output["name"],"references":layers,"slotBinding":binding,"slotFrame":field["frame"],"brand":if knowledge.is_null(){brand}else{json!({"name":creation["brief"]["brandName"],"knowledge":knowledge})},"facts":creation["facts"]}), false, events, ctx); + let request_frame = image_ratio.map_or_else(|| field["frame"].clone(), |(width,height)| json!({"width":width,"height":height})); + let call = self.image_job(Some(Arc::new(references)), &json!({"doc":doc,"revision":input["baseRevision"],"model":model,"mode":if parent.is_some(){"refine"}else{"generate"},"text":prompt,"screen":output["name"],"references":layers,"slotBinding":binding,"slotFrame":request_frame,"optionalLayoutReference":layout_index.is_some(),"brand":if knowledge.is_null(){brand}else{json!({"name":creation["brief"]["brandName"],"knowledge":knowledge})},"facts":creation["facts"]}), false, events, ctx); let file = dir.join("image-jobs").join(&candidate).join("task.json"); let mut journal = if file.is_file() { read_json(&file)? } else { json!({"id":candidate,"slotBinding":binding,"phase":"prepared","notDispatched":true,"message":call.as_ref().err()}) }; @@ -1093,6 +1310,9 @@ impl Backend { let candidate = uuid(input.get("candidateId").filter(|value| !value.is_null()).unwrap_or(&input["taskId"]), "原候选")?; let record = read_candidate(&dir, &candidate)?; checked_binding(&dir, &record["binding"])?; + if record["sourceType"] == "product-reference" { + return Ok(operation_receipt(self.canvas_workspace_result(doc, &dir)?, Some(candidate_receipt(&record)), None)); + } // This enters the existing immutable protocol/key-scoped GET-only // recovery path. It never reserves a replacement candidate or POSTs. let file = dir.join("image-jobs").join(&candidate).join("task.json"); @@ -1145,7 +1365,7 @@ impl Backend { if artifact["sha256"] != format!("{:x}", Sha256::digest(&bytes)) { return Err("候选像素已变化,未采纳".into()); } - let meta = json!({"canvasFirst":true,"doc":doc,"accountId":self.auth["account"]["id"],"origin":self.origin,"baseRevision":input["baseRevision"],"workspaceRevision":state["revision"],"workspaceId":state["id"],"templateHash":state["template"]["contentHash"],"structureHash":state["structureHash"],"outputId":output["component"],"documentId":output["id"],"slotId":id,"variantId":variant_id,"candidateId":candidate,"taskId":candidate,"nativeLayerId":layer,"sha256":artifact["sha256"],"fit":field["crop"],"frame":frame}); + let meta = json!({"canvasFirst":true,"doc":doc,"accountId":self.auth["account"]["id"],"origin":self.origin,"baseRevision":input["baseRevision"],"workspaceRevision":state["revision"],"workspaceId":state["id"],"templateHash":state["template"]["contentHash"],"structureHash":state["structureHash"],"outputId":output["component"],"documentId":output["id"],"slotId":id,"variantId":variant_id,"candidateId":candidate,"taskId":candidate,"nativeLayerId":layer,"sha256":artifact["sha256"],"fit":if record["sourceType"] == "product-reference" {json!("contain")} else {field["crop"].clone()},"frame":frame}); let mut meta = meta; if method == "slot-edit-prep" { meta["purpose"] = json!("professional-edit"); @@ -1683,12 +1903,48 @@ mod tests { let a = state["activeVariantId"].as_str().unwrap().to_owned(); let b = Uuid::new_v4().to_string(); state["variants"].as_array_mut().unwrap().push(json!({"id":b,"images":[assets[2]]})); - assert_eq!(generation_references(&fixture.dir, &state, &a).unwrap(), json!([assets[0], assets[1]])); - assert_eq!(generation_references(&fixture.dir, &state, &b).unwrap(), json!([assets[0], assets[2]])); + assert_eq!(generation_references(&fixture.dir, &state, &a).unwrap(), json!([assets[1], assets[0]])); + assert_eq!(generation_references(&fixture.dir, &state, &b).unwrap(), json!([assets[2], assets[0]])); let source = assets[1]["source"].as_str().unwrap().strip_prefix("local:").unwrap(); fs::write(fixture.dir.join("creation-assets").join(format!("{source}.png")), b"different pixels").unwrap(); assert!(generation_references(&fixture.dir, &state, &a).is_err()); } + #[test] + fn a_product_original_candidate_keeps_source_pixels_and_does_not_make_a_model_request() { + let fixture = fixture(); + let mut state = load(&fixture.dir).unwrap(); + let variant = state["activeVariantId"].as_str().unwrap().to_owned(); + let image = photocraft_codecs::Image::from_u8(2, 1, photocraft_codecs::ChannelLayout::Rgba, + vec![12, 40, 42, 255, 250, 220, 200, 255]).unwrap(); + let pixels = photocraft_codecs::encode(&image, photocraft_codecs::Format::Png, &Default::default()).unwrap(); + let digest = format!("{:x}", Sha256::digest(&pixels)); + let dir = fixture.dir.join("creation-assets"); + fs::create_dir_all(&dir).unwrap(); + fs::write(dir.join(format!("{digest}.png")), &pixels).unwrap(); + state["brief"]["images"] = json!([{"name":"实物图","source":format!("local:{digest}"),"purpose":"product"}]); + let mut current = creation::load(&fixture.dir).unwrap(); + current["brief"] = state["brief"].clone(); + write_json(&fixture.dir.join("creation.json"), ¤t).unwrap(); + state["brief"] = creation::load(&fixture.dir).unwrap()["brief"].clone(); + let base_revision = revision(&state); + persist(&fixture.dir, state, base_revision).unwrap(); + let state = load(&fixture.dir).unwrap(); + let output = &state["template"]["outputs"][0]; + let field = &output["slots"][0]; + let slot = slot_id(&state["template"]["contentHash"], &variant, field["fieldId"].as_str().unwrap()); + let id = Uuid::new_v4().to_string(); + let binding = new_binding(&state, output, field, &slot, &variant, &id, "产品原图"); + let references = generation_references(&fixture.dir, &state, &variant).unwrap(); + let record = original_product_candidate(&fixture.dir, state, binding, &references).unwrap(); + let job = fixture.dir.join("image-jobs").join(&id); + assert_eq!(fs::read(job.join("generated.png")).unwrap(), pixels); + assert_eq!(candidate_receipt(&record)["sourceType"], "product-reference"); + assert_eq!(record["phase"], "complete"); + assert!(record["requestId"].is_null()); + assert!(!fixture.dir.join("image-task.json").exists()); + assert!(!snapshot(&fixture.dir).unwrap()["pending"].as_bool().unwrap()); + } + #[test] fn scene_only_valid_pixels_fail_before_any_candidate_reservation_or_post() { let fixture = fixture(); diff --git a/apps/detail-photocraft/apps/photocraft/src/jiansun_creation.rs b/apps/detail-photocraft/apps/photocraft/src/jiansun_creation.rs index f51abbdc..da816466 100644 --- a/apps/detail-photocraft/apps/photocraft/src/jiansun_creation.rs +++ b/apps/detail-photocraft/apps/photocraft/src/jiansun_creation.rs @@ -742,24 +742,10 @@ impl Backend { self.validate()?; let settings = self.settings()?; let key = settings["key"].as_str().ok_or("请连接个人98k Key")?; - let selected = self.json("agent-models")?["models"] - .as_array() - .and_then(|a| a.iter().find(|m| m["key"] == *crate::jiansun_models::text_selection(&settings,stage))) - .cloned() - .ok_or(if stage=="facts" {"所选对话模型已关闭"} else {"请选择已开放的文案模型"})?; - if !matches!( - (selected["protocol"].as_str(), selected["path"].as_str()), - (Some("openai-chat"), Some("/v1/chat/completions")) | (Some("anthropic-messages"), Some("/v1/messages")) - ) { - return Err("所选模型对话协议尚未适配".into()); - } - let purpose = if stage == "facts" { "analysis" } else { "copy" }; - let catalog = self.json("execution-models")?; - let allowed = catalog["models"] - .as_array() - .and_then(|a| a.iter().find(|m| m["key"] == selected["key"] && m["stage"] == purpose)) - .ok_or("所选模型尚未开放此用途,请在小壹设置中切换对应模型")?; - if stage == "facts" && allowed["protocol"]["supportsImageInput"] != true { + let choice = crate::jiansun_models::text_selection(&settings,stage).as_str().filter(|key| !key.is_empty()) + .ok_or(if stage == "facts" { "请选择可读图的对话模型" } else { "请选择文案模型" })?; + let selected = self.live_text_choice(choice)?; + if stage == "facts" && selected["supportsImageInput"] != true { return Err("资料分析需要可读图的对话模型".into()); } if !self.key_catalog(key)?.iter().any(|id| selected["id"] == id.as_str()) { diff --git a/apps/detail-photocraft/apps/photocraft/src/jiansun_images.rs b/apps/detail-photocraft/apps/photocraft/src/jiansun_images.rs index e2cb2a76..c972d186 100644 --- a/apps/detail-photocraft/apps/photocraft/src/jiansun_images.rs +++ b/apps/detail-photocraft/apps/photocraft/src/jiansun_images.rs @@ -17,6 +17,33 @@ fn recovery_timeout(deadline: Option, cap: Duration) -> R { Ok(remaining.min(cap)) } +pub(super) fn decode_agent_image(bytes: &[u8]) -> R { + let decoded = photocraft_codecs::decode_with( + bytes, + &photocraft_codecs::DecodeOptions { + limits: photocraft_codecs::Limits { max_width: 8192, max_height: 8192, max_pixels: 24_000_000, max_alloc: 192 * 1024 * 1024 }, + ..Default::default() + }, + ) + .map_err(|_| "生成图片无法预览")? + .convert(photocraft_codecs::ChannelLayout::Rgba, photocraft_codecs::SampleType::U8); + let factor = 1024.0 / f64::from(decoded.width().max(decoded.height()).max(1)); + let w = ((f64::from(decoded.width()) * factor.min(1.0)).round() as usize).max(1); + let h = ((f64::from(decoded.height()) * factor.min(1.0)).round() as usize).max(1); + let mut rgba = vec![0; w * h * 4]; + for y in 0..h { + for x in 0..w { + let sx = x * decoded.width() as usize / w; + let sy = y * decoded.height() as usize / h; + let start = (sy * decoded.width() as usize + sx) * 4; + if let (Some(from), Some(to)) = (decoded.data().get(start..start + 4), rgba.get_mut((y * w + x) * 4..(y * w + x) * 4 + 4)) { + to.copy_from_slice(from); + } + } + } + Ok(egui::ColorImage::from_rgba_unmultiplied([w, h], &rgba)) +} + pub(super) fn reference_preview_id(id: &str) -> bool { id.strip_prefix("ref-").is_some_and(|digest| digest.len() == 64 && digest.bytes().all(|byte| byte.is_ascii_hexdigit())) } @@ -451,32 +478,9 @@ impl Backend { if bytes.len() as u64 > IMAGE_BYTES || task["sha256"] != format!("{:x}", Sha256::digest(&bytes)) { return Err("生成图片已变化,未打开预览".into()); } - let decoded = photocraft_codecs::decode_with( - &bytes, - &photocraft_codecs::DecodeOptions { - limits: photocraft_codecs::Limits { max_width: 8192, max_height: 8192, max_pixels: 24_000_000, max_alloc: 192 * 1024 * 1024 }, - ..Default::default() - }, - ) - .map_err(|_| "生成图片无法预览")? - .convert(photocraft_codecs::ChannelLayout::Rgba, photocraft_codecs::SampleType::U8); - let factor = 1024.0 / f64::from(decoded.width().max(decoded.height()).max(1)); - let w = ((f64::from(decoded.width()) * factor.min(1.0)).round() as usize).max(1); - let h = ((f64::from(decoded.height()) * factor.min(1.0)).round() as usize).max(1); - let mut rgba = vec![0; w * h * 4]; - for y in 0..h { - for x in 0..w { - let sx = x * decoded.width() as usize / w; - let sy = y * decoded.height() as usize / h; - let start = (sy * decoded.width() as usize + sx) * 4; - if let (Some(from), Some(to)) = (decoded.data().get(start..start + 4), rgba.get_mut((y * w + x) * 4..(y * w + x) * 4 + 4)) { - to.copy_from_slice(from); - } - } - } Ok(( json!({"purpose":"agent-image","doc":doc,"taskId":task_id,"accountId":self.auth["account"]["id"],"origin":self.origin}), - egui::ColorImage::from_rgba_unmultiplied([w, h], &rgba), + decode_agent_image(&bytes)?, )) } pub(super) fn recover_original_image(&mut self, doc: u64, task: &str, tx: &mpsc::Sender, ctx: &egui::Context) -> R { @@ -546,10 +550,13 @@ impl Backend { input["slotFrame"]["height"].as_u64().ok_or("图位高度无效")?, )?; } - let refs = input["references"] - .as_array() - .filter(|a| !a.is_empty() && a.len() <= contract["maxImages"].as_u64().unwrap_or(1) as usize) - .ok_or("参考图数量超出所选线路范围;请减少选中图片")?; + let refs = input["references"].as_array().filter(|a| !a.is_empty()).ok_or("请选择参考图")?; + let max_images = contract["maxImages"].as_u64().unwrap_or(1) as usize; + let omit_layout = input["optionalLayoutReference"] == true && refs.len() == max_images.saturating_add(1); + let refs = if omit_layout { &refs[..max_images] } else { refs.as_slice() }; + if refs.len() > max_images { + return Err("参考图数量超出所选线路范围;请减少选中图片".into()); + } let target = input["target"].as_u64(); if input["mode"] == "regenerate" { let p = doc.path_of(LayerId(target.ok_or("请选择当前屏的图片图层")?)).ok_or("目标图片不存在")?; @@ -562,6 +569,7 @@ impl Backend { } } let text = input["text"].as_str().filter(|s| !s.trim().is_empty() && s.chars().count() <= 6000).ok_or("请输入6000字以内的生图要求")?; + let text = if omit_layout { text.split_once("【模板图位参考】").map_or(text, |(body, _)| body) } else { text }; let job = if input["slotBinding"].is_object() { super::template_slots::validate_dispatch(&dir, &input["slotBinding"])?; input["slotBinding"]["taskId"].as_str().ok_or("图位候选身份无效")?.to_owned() @@ -596,7 +604,7 @@ impl Backend { "严格保留参考图中的产品颜色。" }; let prompt = format!( - "生成产品详情页使用的图片素材,不要添加任何文字、字母、标志、水印或尺寸标注。严格保留参考图中产品的外形、结构、材质、比例和数量,不得把其他产品设计混入。{color_rule}各屏沿用同一摄影风格、光线、背景与色温。中文文字与品牌标志由画布独立排版。\n项目:{}\n当前屏:{}\n项目规范与已确认事实(为空时只按参考图和用户要求,不补编):{guidance}\n要求:{text}", + "生成产品详情页使用的图片素材,不要添加任何文字、字母、标志、水印或尺寸标注。只按本项目的实物产品参考图保留外形、结构、部件连接、间隙、材质、比例及数量;场景图、过往候选或模板的商品不能作为产品外观依据。未知结构不补画。{color_rule}各屏沿用同一摄影风格、光线、背景与色温。中文文字与品牌标志由画布独立排版。\n项目:{}\n当前屏:{}\n项目规范与已确认事实(规范只指导风格及版式,只有当前产品已确认事实和实物图可以作为商品依据):{guidance}\n要求:{text}", doc.name, input["screen"].as_str().unwrap_or("当前图片") ); diff --git a/apps/detail-photocraft/apps/photocraft/src/jiansun_models.rs b/apps/detail-photocraft/apps/photocraft/src/jiansun_models.rs index c9b83ed7..e1e7024f 100644 --- a/apps/detail-photocraft/apps/photocraft/src/jiansun_models.rs +++ b/apps/detail-photocraft/apps/photocraft/src/jiansun_models.rs @@ -29,6 +29,33 @@ pub fn image_choices(catalog: &Value, available: Option<&[String]>, previous: Op Ok(out) } +/// Convert the published 98K text contracts to the two protocols used by Pi. +pub(super) fn text_model(row: &Value, key: Option<&str>) -> Option { + let id = row["id"].as_str().filter(|id| !id.is_empty() && id.len() <= 200)?; + if row["status"] != "available" || row["available"] != true + || !matches!(row["modality"].as_str(), Some("text" | "multimodal")) + { + return None; + } + let invocation = &row["invocation"]; + if invocation["method"] != "POST" || invocation["content_type"] != "application/json" { + return None; + } + let auth = &invocation["authentication"]; + let path = invocation["path"].as_str()?; + let protocol = match path { + "/v1/chat/completions" if auth["type"] == "bearer" && auth["header"] == "Authorization" => "openai-chat", + "/v1/messages" if auth["type"] == "api_key" && auth["header"] == "X-Api-Key" => "anthropic-messages", + _ => return None, + }; + let properties = invocation["input_schema"]["properties"].as_object()?; + if !["model", "messages", "stream", "tools"].iter().all(|field| properties.contains_key(*field)) { + return None; + } + let image = row["input_modes"].as_array().map_or(row["modality"] == "multimodal", |modes| modes.iter().any(|mode| mode == "image")); + Some(json!({"key":key.unwrap_or(id),"id":id,"label":id,"protocol":protocol,"path":path,"supportsImageInput":image})) +} + pub fn key_models(catalog: &Value) -> R> { let rows = catalog["data"].as_array().filter(|a| a.len() <= 2000).ok_or("98k没有返回有效的模型目录")?; let mut out = Vec::new(); @@ -103,6 +130,27 @@ pub(super) fn apply_pi_capacity(model:&mut Value,catalog:&[Value]) { mod tests { use super::*; + #[test] + fn a_new_98k_text_contract_needs_no_platform_model_row() { + let mut published = json!({"id":"new-text-model","status":"available","available":true, + "modality":"text","input_modes":["text"],"invocation":{ + "method":"POST","content_type":"application/json","path":"/v1/chat/completions", + "authentication":{"type":"bearer","header":"Authorization"}, + "input_schema":{"properties":{"model":{},"messages":{},"stream":{},"tools":{}}}}}); + let model = text_model(&published, None).unwrap(); + assert_eq!(model["key"], "new-text-model"); + assert_eq!(model["protocol"], "openai-chat"); + assert_eq!(model["supportsImageInput"], false); + assert_eq!(text_model(&published, Some("legacy-selection")).unwrap()["key"], "legacy-selection"); + published["input_modes"] = json!(["text","image"]); + assert_eq!(text_model(&published, None).unwrap()["supportsImageInput"], true); + published["invocation"]["path"] = json!("/v1/responses"); + assert!(text_model(&published, None).is_none()); + published["invocation"]["path"] = json!("/v1/chat/completions"); + published["status"] = json!("maintenance"); + assert!(text_model(&published, None).is_none()); + } + #[test] fn personal_copy_model_is_independent_and_respects_its_role_and_key() { let chat=vec![json!({"key":"talk","id":"talk-model"})];let copy=vec![json!({"key":"copy","id":"copy-model"})];let images=vec![json!({"key":"image","id":"image-model"})]; diff --git a/apps/detail-photocraft/apps/photocraft/src/jiansun_pi.rs b/apps/detail-photocraft/apps/photocraft/src/jiansun_pi.rs index 1be7fa11..03a6b0fc 100644 --- a/apps/detail-photocraft/apps/photocraft/src/jiansun_pi.rs +++ b/apps/detail-photocraft/apps/photocraft/src/jiansun_pi.rs @@ -391,14 +391,7 @@ fn selected(backend: &mut Backend, role:&str) -> R<(Value, Value)> { backend.validate()?; let settings = backend.settings()?; let key = settings["key"].as_str().ok_or("请先连接个人98k Key")?; - let models = backend.json("agent-models")?; - let model = models["models"].as_array().and_then(|a| a.iter().find(|m| m["key"] == settings["model"])).ok_or("当前对话模型未开放")?.clone(); - if !matches!( - (model["protocol"].as_str(), model["path"].as_str()), - (Some("openai-chat"), Some("/v1/chat/completions")) | (Some("anthropic-messages"), Some("/v1/messages")) - ) { - return Err("模型协议未适配".into()); - } + let model = backend.live_text_choice(settings["model"].as_str().filter(|key| !key.is_empty()).ok_or("请选择对话模型")?)?; if !backend.key_catalog(key)?.iter().any(|id| model["id"] == id.as_str()) { return Err("个人Key未开放此模型".into()); } diff --git a/apps/detail-photocraft/apps/photocraft/src/jiansun_pi_runtime.rs b/apps/detail-photocraft/apps/photocraft/src/jiansun_pi_runtime.rs index 5e267b08..6d17b28d 100644 --- a/apps/detail-photocraft/apps/photocraft/src/jiansun_pi_runtime.rs +++ b/apps/detail-photocraft/apps/photocraft/src/jiansun_pi_runtime.rs @@ -449,7 +449,7 @@ impl Drop for DaemonTurnGuard { } } fn allowed_canvas_action(action: &str) -> bool { - matches!(action, "pi-begin" | "pi-state" | "pi-ui-request" | "pi-ui-poll" | "pi-ui-cancel" | "pi-canvas-read" | "pi-template-image" | "pi-preview" | "pi-copy-options" | "pi-copy-fields" | "pi-native-catalog" | "pi-native-call" | "pi-native-poll" + matches!(action, "pi-begin" | "pi-state" | "pi-ui-request" | "pi-ui-poll" | "pi-ui-cancel" | "pi-canvas-read" | "pi-template-image" | "pi-detail-images" | "pi-preview" | "pi-copy-options" | "pi-copy-fields" | "pi-native-catalog" | "pi-native-call" | "pi-native-poll" | "pi-delta" | "pi-activity" | "pi-context-usage" | "pi-write-request" | "pi-edit" | "pi-end" | "pi-workflow-read" | "pi-workflow-navigate" | "pi-workflow-propose" | "pi-workflow-execute" | "pi-workflow-poll" | "pi-native-reconcile" | "pi-edit-reconcile" | "pi-workflow-reconcile") @@ -494,7 +494,7 @@ fn run_inner(b: &mut Backend, input: &Value, method: &str, events: &mpsc::Sender }else{"chat".to_owned()}; let config = json!({"modelRole":model_role,"binary":binary,"profile":profile,"root":dir.join("agent"),"project":project,"scope":b.scope(),"documentId":doc, "ruleCatalog":saved.as_ref().map(|rule|rule["catalog"].clone()),"ruleId":saved.as_ref().map(|rule|rule["id"].clone()), - "projectEvidence":project_evidence(&super::creation::load(&dir)?,&b.scope(),&project,doc,&input["context"]["requestScope"]["variantId"]),"mode":mode,"text":input["text"]}); + "projectEvidence":project_evidence(&super::creation::load(&dir)?,&b.scope(),&project,doc,&input["context"]["requestScope"]["variantId"]),"mode":mode,"text":input["text"],"wholeDetail":input["context"]["requestScope"]["wholeDetail"] == true}); let mut config = config; if mode == "prompt" { use base64::{Engine as _, engine::general_purpose::STANDARD}; @@ -556,10 +556,21 @@ fn run_inner(b: &mut Backend, input: &Value, method: &str, events: &mpsc::Sender } } let requested_run = native_input["run"].as_str().map(str::to_owned); + log::debug!("小壹原生活动:{action}"); events.send(Event::PiAction(action.into(), native_input, tx)).map_err(|_| "工作台已关闭,原请求需核查")?; ctx.request_repaint(); let reply = match rx.recv_timeout(Duration::from_secs(12)) { Ok(Ok(mut v)) => { + if action == "pi-detail-images" { + let reply = if config["wholeDetail"] == true { + match b.read_detail_review_images(doc, &v) { + Ok(images) => json!({"id":value["id"],"value":images}), + Err(error) => json!({"id":value["id"],"error":error}), + } + } else { json!({"id":value["id"],"error":"当前回合没有整套详情页的授权"}) }; + daemon.reply(&daemon_run, &value["id"], &reply)?; + continue; + } if action == "pi-template-image" { let image = b.read_pinned_template_image(&dir, &v); let reply = match image { diff --git a/apps/detail-photocraft/crates/ui-egui/src/jiansun.rs b/apps/detail-photocraft/crates/ui-egui/src/jiansun.rs index 0a5583e3..338814a9 100644 --- a/apps/detail-photocraft/crates/ui-egui/src/jiansun.rs +++ b/apps/detail-photocraft/crates/ui-egui/src/jiansun.rs @@ -1969,9 +1969,22 @@ impl Workspace { "product":self.creation["brief"],"facts":self.creation["facts"],"sellingPoints":self.creation["sellingPoints"],"plan":self.creation["plan"]}) } pub fn submit(&mut self, app: &PhotocraftApp, text: String) { - if !self.composer_draft_ready(app) { self.error = "正在加载项目草稿".into(); return; } + self.submit_turn(app, text, false); + } + fn submit_whole_detail(&mut self, app: &PhotocraftApp) { + if !(self.model_ready && self.image_ready) { + self.error = "请先在小壹设置中选择可用的对话模型和生图模型,配置后可继续制作整套详情页".into(); + return; + } + if self.can_start_turn() { + self.agent_effects_paused = false; + self.submit_turn(app, "一键制作整套详情页".into(), true); + } + } + fn submit_turn(&mut self, app: &PhotocraftApp, text: String, whole_detail: bool) { + if !whole_detail && !self.composer_draft_ready(app) { self.error = "正在加载项目草稿".into(); return; } if text.trim().is_empty() || !self.can_start_turn() { return; } - if !self.composer_text_send_allowed_for(app) { + if !whole_detail && !self.composer_text_send_allowed_for(app) { self.error = "当前对话模型暂不支持图片,请先移除附件或使用生图".into(); return; } @@ -1980,7 +1993,7 @@ impl Workspace { return; } self.composer_reference_sync(app); - let references = match self.composer_reference_snapshot(app) { + let references = match if whole_detail { Ok(Vec::new()) } else { self.composer_reference_snapshot(app) } { Ok(references) => references, Err(error) => { self.error = error; return; } }; @@ -2002,6 +2015,7 @@ impl Workspace { }; context["requestScope"]["subject"] = subject; context["requestScope"]["references"] = json!(references); + if whole_detail { context["requestScope"]["wholeDetail"] = json!(true); } } if context.is_null() { self.error = "请先打开项目".into(); @@ -2022,7 +2036,7 @@ impl Workspace { ); if self.busy.as_deref() != Some("agent") { self.pi_request_scope = Value::Null; - } else { + } else if !whole_detail { self.composer_reference_clear(app); } } @@ -2063,7 +2077,10 @@ impl Workspace { if name != "slot-progress" && self.busy.is_none() { self.unknown = v["pending"].as_bool().unwrap_or(self.unknown); } - if let Some(error) = v["error"].as_str() { + let settled_batch_candidate = name == "slot-append" && self.pi_run.is_some() + && self.pi_request_scope["wholeDetail"] == true && v["pending"] == false + && matches!(v["candidateResult"]["status"].as_str(), Some("failed" | "rejected" | "not_dispatched")); + if let Some(error) = v["error"].as_str().filter(|_| !settled_batch_candidate) { if !self.show_library_action_error(error) { self.error = error.into(); } } else if name != "slot-adopt-prep" && (name != "slot-skeleton" || self.canvas_scope_valid(app)) { // The canonical switch can finish after the native @@ -2626,6 +2643,10 @@ impl Workspace { self.material = false; self.draft_changed = true; self.sync_dirty = true; + if meta["startWholeDetail"] == true && self.busy.as_deref() == Some("slot-skeleton") { + self.busy = None; + self.submit_whole_detail(app); + } if meta["canvasFirst"] != true { let mut ack = meta.clone(); ack["slotRevision"] = self.template_workflow["revision"].clone(); diff --git a/apps/detail-photocraft/crates/ui-egui/src/jiansun/agent_panel.rs b/apps/detail-photocraft/crates/ui-egui/src/jiansun/agent_panel.rs index 1ba0e408..97bbdd8b 100644 --- a/apps/detail-photocraft/crates/ui-egui/src/jiansun/agent_panel.rs +++ b/apps/detail-photocraft/crates/ui-egui/src/jiansun/agent_panel.rs @@ -1051,8 +1051,14 @@ impl Workspace { let doc = app.session.active().map(|state| state.doc.id.0)?; match self.busy.as_deref() { Some("slot-append" | "slot-generate") => self.running_workflow_generation(doc) - .map(|op| json!({"kind":"slot","slotId":op["slotId"],"outputId":op["outputId"], - "productVariantId":op["productVariantId"],"candidateId":op["candidateId"]})) + .map(|op| { + let label = self.template_workflow["slots"].as_array().into_iter().flatten() + .find(|slot| slot["id"] == op["slotId"] && slot["outputId"] == op["outputId"]) + .map(|slot| &slot["label"]); + let kind = if op["candidateId"].is_string() { "candidate" } else { "slot" }; + json!({"kind":kind,"slotId":op["slotId"],"outputId":op["outputId"],"label":label, + "productVariantId":op["productVariantId"],"candidateId":op["candidateId"]}) + }) .or_else(|| self.canvas_workspace.submitted_generation_target(&self.account["id"], &self.origin, Some(doc)).cloned()), Some("agent" | "pi-agent") if self.owner_doc == Some(doc) diff --git a/apps/detail-photocraft/crates/ui-egui/src/jiansun/canvas_workspace.rs b/apps/detail-photocraft/crates/ui-egui/src/jiansun/canvas_workspace.rs index 6802002f..33a9bb74 100644 --- a/apps/detail-photocraft/crates/ui-egui/src/jiansun/canvas_workspace.rs +++ b/apps/detail-photocraft/crates/ui-egui/src/jiansun/canvas_workspace.rs @@ -1122,7 +1122,9 @@ impl Workspace { { self.canvas_workspace.expect_fresh_preview(id); } - self.register_image(json!({"doc":value["doc"],"taskId":candidate["id"],"slotId":candidate["slotId"],"variantId":candidate["variantId"]})); + if candidate["sourceType"] != "product-reference" { + self.register_image(json!({"doc":value["doc"],"taskId":candidate["id"],"slotId":candidate["slotId"],"variantId":candidate["variantId"]})); + } } if method == "slot-append" { let complete = value["error"].is_null() && candidate["status"] == "complete"; @@ -1534,6 +1536,10 @@ impl Workspace { self.creation_step = 0; } self.copywriting_menu(app, ui); + let can_run_detail = self.template_workflow["outputId"] == "detail" && self.can_start_turn(); + if super::stitch_ui::action_button(ui, "继续制作整套", super::stitch_ui::ButtonRole::Quiet, can_run_detail) + .on_hover_text("按图位完成剩余图片,保留已采纳结果和现有图层") + .clicked() { self.submit_whole_detail(app); } if !canvas_first { return; } @@ -2004,7 +2010,13 @@ impl Workspace { let response = ui.interact(visible, ui.scope_id().with(("canvas-candidate", &self.canvas_workspace.binding, doc_id, &variant, slot_id, id)), Sense::click()); response.widget_info(|| { let field = row.slot["label"].as_str().unwrap_or("图片"); - let label = if candidate.is_some() { format!("{field},候选 {}", index + 1) } else { format!("{field},生成图片") }; + let label = if candidate.is_some_and(|row| row["sourceType"] == "product-reference") { + format!("{field},产品原图") + } else if candidate.is_some() { + format!("{field},候选 {}", index + 1) + } else { + format!("{field},生成图片") + }; egui::WidgetInfo::labeled(egui::Role::Button, true, label) }); if result.pointer_on_image { @@ -2834,6 +2846,7 @@ impl Workspace { let editing_candidate = target["candidateId"].as_str().is_some_and(|id| !id.is_empty()); let title = if editing_candidate { "重新生成" } else { "生成图片" }; let mut submit = false; + let mut use_product = false; let mut cancel = false; let mut closed = false; use super::stitch_ui::{self as kit, ButtonRole}; @@ -2915,6 +2928,13 @@ impl Workspace { ui.add_space(7.0); let footer_note = "新增候选,保留已有图片"; + if !editing_candidate { + let original = kit::action_button(ui, "使用产品原图", ButtonRole::Quiet, + open && self.busy.is_none() && !self.unknown); + self.canvas_workspace.geometry.insert("regenerate-product-original".into(), + [original.rect.min.x, original.rect.min.y, original.rect.width(), original.rect.height()]); + use_product = original.clicked(); + } if width < 300.0 { ui.weak(footer_note); } @@ -2935,7 +2955,16 @@ impl Workspace { if open && (closed || cancel || response.is_some_and(|r| r.should_close()) || ui.input_mut(|input| input.consume_key(egui::Modifiers::NONE, egui::Key::Escape))) { self.canvas_workspace.invalidate_regen(); } - if submit { + if use_product { + let result = self.canvas_workspace.regeneration_input(&self.template_workflow).and_then(|mut input| { + input["useProductReference"] = json!(true); + self.slot_action(app, "slot-append", input) + }); + match result { + Ok(_) => self.canvas_workspace.invalidate_regen(), + Err(error) => self.canvas_workspace.regen_error = error, + } + } else if submit { self.canvas_workspace.regen_error.clear(); if let Err(error) = self.submit_regeneration(app) { self.canvas_workspace.regen_error = error; diff --git a/apps/detail-photocraft/crates/ui-egui/src/jiansun/creation.rs b/apps/detail-photocraft/crates/ui-egui/src/jiansun/creation.rs index 425dbcd2..c371674b 100644 --- a/apps/detail-photocraft/crates/ui-egui/src/jiansun/creation.rs +++ b/apps/detail-photocraft/crates/ui-egui/src/jiansun/creation.rs @@ -1227,7 +1227,7 @@ impl Workspace { }); ui.add_space(8.0); field_group(ui, width, "补充资料 / 设计说明", |ui| { - self.creation_dirty |= edit_hint(ui, (field_scope, "note"), &mut self.creation_brief["note"], width, true, "补充材质、工艺和需要保留的产品细节…"); + self.creation_dirty |= edit_hint(ui, (field_scope, "note"), &mut self.creation_brief["note"], width, true, "已核实的资料可按行填写,例如「材质:橡胶木」「结构:双梁加固」…"); }); brief_section_break(ui); if width >= 600.0 { @@ -1468,19 +1468,23 @@ impl Workspace { } fn brief_enter_button(&mut self, app: &mut PhotocraftApp, ui: &mut Ui, template: &Value, ready: bool) { - let enter = stitch_ui::action_button( - ui, - "保存资料并进入模板画布", - stitch_ui::ButtonRole::Primary, - ready, - ); + let whole_allowed = self.template_workflow["canvasFirst"] != true + && template["enterprise"]["component"].as_str().is_none_or(|component| component == "detail"); + let generate = whole_allowed && { + let button = stitch_ui::action_button(ui, "一键生成整套详情页", stitch_ui::ButtonRole::Primary, ready) + .on_hover_text("按当前模板逐格生图、核对并自动回填。每格最多重做两次。"); + self.control_geometry("generate-whole-detail", button.rect); + button.clicked() + }; + let enter = stitch_ui::action_button(ui, "保存资料并进入模板画布", + if whole_allowed { stitch_ui::ButtonRole::Secondary } else { stitch_ui::ButtonRole::Primary }, ready); self.control_geometry("enter-canvas", enter.rect); - if enter.clicked() { + if enter.clicked() || generate { let mut brief = self.creation_brief.clone(); let variants = brief_variants(&brief); set_brief_variants(&mut brief, variants); brief["templateSelection"] = template.clone(); - if let Err(error) = self.slot_action(app, "slot-skeleton", json!({"brief":brief,"width":self.creation_width,"template":template,"outputId":"detail"})) { + if let Err(error) = self.slot_action(app, "slot-skeleton", json!({"brief":brief,"width":self.creation_width,"template":template,"outputId":"detail","generateWhole":generate})) { self.error = error; } } diff --git a/apps/detail-photocraft/crates/ui-egui/src/jiansun/pi_bridge.rs b/apps/detail-photocraft/crates/ui-egui/src/jiansun/pi_bridge.rs index 5100df9e..0d025cbc 100644 --- a/apps/detail-photocraft/crates/ui-egui/src/jiansun/pi_bridge.rs +++ b/apps/detail-photocraft/crates/ui-egui/src/jiansun/pi_bridge.rs @@ -16,7 +16,7 @@ fn identity(w: &Workspace, input: &Value) -> Result<(), String> { fn status(w: &Workspace, app: &PhotocraftApp) -> Value { let same = app.session.active().is_some_and(|s| Some(s.doc.id.0) == w.owner_doc && s.revision == w.expected_revision); let active = w.pi_run.is_some() && app.session.active().is_some_and(|s| Some(s.doc.id.0) == w.owner_doc); - let context = if active { w.context(app) } else { Value::Null }; + let context = if active && w.pi_request_scope["wholeDetail"] != true { w.context(app) } else { Value::Null }; let revision = if active { app.session.active().map(|s| s.revision) } else { None }; json!({"run":w.pi_run,"conversationActive":active,"editorText":if active{json!(w.composer)}else{Value::Null},"allowed":w.allow_apply && same && !w.pi_write_blocked,"writeBlocked":w.pi_write_blocked || !same,"queued":if active {w.queue.len()} else {0},"revision":revision,"context":context,"error":if active {json!(w.error)} else {Value::Null}}) } @@ -224,6 +224,17 @@ fn action_impl(w: &mut Workspace, app: &mut PhotocraftApp, ctx: Option<&egui::Co "pi-workflow-read" | "pi-workflow-navigate" | "pi-workflow-propose" | "pi-workflow-execute" | "pi-workflow-poll" => workflow_bridge::action(w, app, method, input), "pi-state" => Ok(status(w, app)), "pi-canvas-read" => super::agent_canvas_read::read_page(w, app, input), + "pi-detail-images" => { + if w.pi_request_scope["wholeDetail"] != true || w.pi_write_blocked || w.agent_effects_paused { + return Err("已暂停整套详情页制作".into()); + } + let slot = w.template_workflow["slots"].as_array().into_iter().flatten() + .find(|slot| slot["id"] == input["slotId"] && slot["outputId"] == "detail" + && slot["variantId"] == w.pi_request_scope["variantId"] && slot["nativeLayerId"].is_u64()) + .ok_or("图位不属于本轮详情页")?; + Ok(json!({"slotId":slot["id"],"variantId":slot["variantId"],"templateHash":w.template_workflow["templateHash"], + "candidateId":input["candidateId"]})) + } "pi-template-image" => { let state = app.session.active().ok_or("请先打开画布")?; let mapping = super::canvas_workspace::document_mapping(&state.doc).ok_or("当前画布没有固定模板")?; diff --git a/apps/detail-photocraft/crates/ui-egui/src/jiansun/workflow_bridge.rs b/apps/detail-photocraft/crates/ui-egui/src/jiansun/workflow_bridge.rs index 1e93b800..dad46112 100644 --- a/apps/detail-photocraft/crates/ui-egui/src/jiansun/workflow_bridge.rs +++ b/apps/detail-photocraft/crates/ui-egui/src/jiansun/workflow_bridge.rs @@ -549,7 +549,7 @@ fn operation_id(input: &Value) -> Result<&str, String> { } fn execute(w: &mut Workspace, app: &mut PhotocraftApp, input: &Value, version: u64, available: bool) -> Result { - arguments(input, &["version", "intent", "instruction", "outputId", "slotId", "productVariantId", "candidateId", "operationId"])?; + arguments(input, &["version", "intent", "instruction", "outputId", "slotId", "productVariantId", "candidateId", "operationId", "useProductReference"])?; let id = operation_id(input)?; let run = w.pi_run.clone().ok_or("本地Agent会话已结束")?; if let Some(op) = w.workflow.operations.iter().find(|op| op["operationId"] == id) { @@ -606,6 +606,11 @@ fn execute(w: &mut Workspace, app: &mut PhotocraftApp, input: &Value, version: u let method = if intent == "generate_candidate" { "slot-append" } else { "slot-adopt-prep" }; if intent == "generate_candidate" { operation_input["workflowOperationId"] = json!(id); + operation_input["detailBatch"] = json!(w.pi_request_scope["wholeDetail"] == true); + if input["useProductReference"] == true { + if w.pi_request_scope["wholeDetail"] != true { return Err("当前回合未授权整套详情页制作".into()); } + operation_input["useProductReference"] = json!(true); + } } let op = json!({"operationId":id,"run":run,"intent":intent,"phase":"submitted","accountId":w.account["id"],"origin":w.origin, "documentId":app.session.active().map(|s|s.doc.id.0),"projectLocalId":w.pi_request_scope["project"]["localId"],"baseRevision":w.expected_revision, @@ -1238,6 +1243,7 @@ mod tests { fn workflow_generation_cards_follow_the_reserved_candidate_and_slot_frame() { let (mut w, mut app, requests, ctx) = direct_fixture(); w.template_workflow["slots"][0]["frame"] = json!({"x":0,"y":0,"width":600,"height":1000}); + w.template_workflow["slots"][0]["label"] = json!("首屏"); let read = private_call(&mut w, &mut app, &ctx, "pi-workflow-read", json!({})).unwrap(); let mut input = direct_input(read["version"].clone()); input.as_object_mut().unwrap().remove("outputId"); @@ -1253,7 +1259,10 @@ mod tests { assert!(!super::super::canvas_workspace::candidate_is_running(&w, doc, "hero", &candidate)); progress["workflowGeneration"]["operationId"] = id; w.canvas_receipt("slot-progress", &progress); - assert_eq!(w.processing_target(&app).unwrap()["candidateId"], "new"); + let target = w.processing_target(&app).unwrap(); + assert_eq!(target["candidateId"], "new"); + assert_eq!(target["kind"], "candidate"); + assert_eq!(target["label"], "首屏"); assert!(super::super::canvas_workspace::candidate_is_running(&w, doc, "hero", &candidate)); assert!(!super::super::canvas_workspace::candidate_is_running(&w, doc, "hero", &json!({"id":"three"}))); crate::cjk_fonts::install_system_provider_for_tests(&ctx); @@ -1587,6 +1596,7 @@ mod tests { } let (mut w, mut app, requests) = fixture(); + w.library = false; let ctx = egui::Context::default(); PhotocraftApp::setup_context(&ctx, crate::theme::ThemeKind::ProMedium); for n in 0..18 { @@ -1627,6 +1637,7 @@ mod tests { #[test] fn reviewed_card_waits_for_the_local_save_before_publishing_an_enabled_click_target() { let (mut w, mut app, requests) = fixture(); + w.library = false; let ctx = egui::Context::default(); PhotocraftApp::setup_context(&ctx, crate::theme::ThemeKind::ProMedium); propose(&mut w, &mut app, "review_plan"); @@ -1744,6 +1755,7 @@ mod tests { w.creation_brief["variants"] = json!([{"id":"wood","name":"柚木色"},{"id":"black","name":"黑色"}]); let original = json!({"kind":"candidate","slotId":"main-slot","candidateId":"candidate-b","productVariantId":"wood","nativeLayerId":42}); w.canvas_workspace.context = Some(original.clone()); + w.composer_reference_add(&app).unwrap(); w.pi_request_scope = w.context(&app)["requestScope"].clone(); let frozen_subject = w.pi_request_scope["subject"].clone(); let frozen_references = w.pi_request_scope["references"].clone();