feat(client): run Pi slot agents alongside canvas editing

This commit is contained in:
WuYongJie 2026-11-17 18:16:00 +08:00
parent b9f294158d
commit edcfc08b27
10 changed files with 359 additions and 140 deletions

View File

@ -1,4 +1,3 @@
import { createInitialSystemMessage, toToolDeclaration } from '@earendil-works/pi-ai';
import {setTimeout as delay} from 'node:timers/promises';
import { runWholeDetail } from './whole-detail.mjs';
import { enterpriseTools } from './enterprise-knowledge.mjs';
@ -323,7 +322,7 @@ export class DetailPiAgent {
}
const liveCanvas = host.canvas && !host.compacting && !host.canvasNotificationsDetached ? await host.canvas.read() : null;
if (liveCanvas?.conversationActive === false) throw Error('当前项目已切换,本轮对话未应用到其他项目');
if (host.canvasNotificationsDetached || host.canvasWritesStopped || liveCanvas?.writeBlocked && host.canvasWriteRequested) {
if (host.canvasNotificationsDetached || !liveCanvas?.manualEdit && (host.canvasWritesStopped || liveCanvas?.writeBlocked && host.canvasWriteRequested)) {
const text=host.canvasNotificationsDetached?'本机:原项目已切换,原回复保留在原项目,后续画布操作已停止。':host.workflowStopReason?`本次创作已停止:${host.workflowStopReason}`:'本机:已接手,剩余画布操作已停止。';
const message = { role: 'assistant', api, provider: model.provider, model: model.id, content: [{ type: 'text', text }], stopReason: 'stop', timestamp: Date.now(), usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, totalTokens: 0, cost: { ...cost, total: 0 } } };
await store.appendEvent({ type: host.canvasNotificationsDetached?'inactive_project_stopped':host.workflowStopReason?'workflow_operation_stopped':'handover_stopped', modelCallSkipped: true });
@ -480,17 +479,16 @@ 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,
});
let detailAgent;
host.runDetailAgent = async (slotId, systemPrompt, prompt, tools) => {
const model = runtime.getModel('jiansun-native-98k', info.model.id);
const scoped = broker?.forDetailSlot?.(slotId);
if (!model || !scoped && !transport?.stream) throw Error('详情页模型连接未就绪');
const used = new Map();
detailAgent ??= new Agent({initialState:{model,thinkingLevel:'off'},toolExecution:'sequential',streamFn:apiImpl.streamSimple});
const agent = detailAgent;
agent.reset();
agent.state.tools=tools;
agent.state.messages=[createInitialSystemMessage(systemPrompt,tools.map(toToolDeclaration))];
const agent = new Agent({
initialState:{model,systemPrompt,tools,thinkingLevel:'off'},
toolExecution:'sequential',
streamFn:apiImpl.streamSimple,
});
agent.beforeToolCall=async ({toolCall})=>{
const key=JSON.stringify([toolCall.name,toolCall.arguments]);
const count=(used.get(key)??0)+1;
@ -537,11 +535,14 @@ export class DetailPiAgent {
if(original?.requestId){
const recovered=await scoped.recover(round.id).catch(()=>null);
if(recovered?.phase==='received'){
const record={id:round.id,...await scoped.read(round.id)};
const saved=await parseReceipt(record,selected,'native-tools',[]).catch(()=>null);
if(saved&&['stop','toolUse'].includes(saved.stopReason))await scoped.confirm(round.id,record.bodyHash,true,saved.stopReason).catch(()=>null);
const stored=await scoped.read(round.id).catch(()=>null);
if(stored){
const record={id:round.id,...stored};
const saved=await parseReceipt(record,selected,'native-tools',[]).catch(()=>null);
if(saved&&['stop','toolUse'].includes(saved.stopReason))await scoped.confirm(round.id,record.bodyHash,true,saved.stopReason).catch(()=>null);
}
}
await store.appendEvent({type:'whole_detail_original_checked',id:round.id,slotId,phase:recovered?.phase??'unknown'});
await store.appendEvent({type:'whole_detail_original_checked',id:round.id,slotId,phase:recovered?.phase??'unknown'}).catch(()=>{});
}
}
const failure={role:'assistant',api,provider:selected.provider,model:selected.id,content:[],stopReason:'error',

View File

@ -20,6 +20,7 @@ export function reviewGuidance(knowledge, reviewing) {
const outputId = 'detail';
const imageAttempts = 3;
const concurrentSlots = 4;
const transportDelays = [2000, 8000];
const short = Type.String({minLength:1,maxLength:500});
const params = properties => Type.Object(properties,{additionalProperties:false});
@ -69,23 +70,30 @@ export async function runWholeDetail(host, runAgent, loadKnowledge, {pause=delay
}
journal.creationRevision=plan.revisions?.creation;
}
const writeJournal=ordered(), writeCanvas=ordered();
const writeJournal=ordered(), writeCanvas=ordered(), publishProgress=ordered();
const written=new Set(slots.filter(slot=>slot.selectedCandidateId).map(slot=>slot.id));
const generated=new Set();
const outcomes=new Map();
const outcomes=new Map(), activeSlots=new Map(), delegated=new Set();
let phase='读取模板与商品资料';
let providerRetryAt=0;
const totals=()=>[
'本轮生图 '+generated.size+' 张',
'已回填 '+written.size+'/'+slots.length+' 个图位',
'待补或失败 '+[...outcomes.values()].filter(item=>item.status==='待补或失败').length+' 个',
'待核查 '+[...outcomes.values()].filter(item=>item.status==='待核查').length+' 个',
].join(' · ');
const progress=(step)=>canvas.delta([
phase+(step?' · '+step:''),
const progress=()=>publishProgress(()=>canvas.delta([
phase,
totals(),
...[...outcomes.values()].slice(-4).map(({label,status,reason})=>
...[...activeSlots.values()].map(({label,step})=>'· '+label+' · '+step),
...[...outcomes.values()].slice(-3).map(({label,status,reason})=>
'· '+label+' · '+status+(reason?'('+reason+')':'')),
].join('\n'));
].join('\n')));
const showStep=(slot,step)=>{
if(activeSlots.get(slot.id)?.step===step)return Promise.resolve();
activeSlots.set(slot.id,{label:slot.label,step});
return progress();
};
await progress();
const current=async()=>{
const state=await canvas.read();
@ -115,9 +123,10 @@ export async function runWholeDetail(host, runAgent, loadKnowledge, {pause=delay
const invoke=async(worker,slot,intent,extra,signal)=>{
const value=await current();
return executeWorkflow(worker,{version:value.version,intent,outputId,slotId:slot.id,
productVariantId:plan.productVariantId,...extra},signal,{keepFailedCandidate:true,detailBatch:true});
productVariantId:plan.productVariantId,...extra},signal,{keepFailedCandidate:true,detailBatch:true,
onWriteWaiting:()=>showStep(slot,'候选已验收,等待当前编辑结束')});
};
async function runSlot(slot,goal) {
async function runSlot(slot,goal,slotSignal) {
let start=journal.items[slot.id];
const needsOriginal=requiresProductOriginal(slot);
if(!needsOriginal&&start?.source==='product'&&['missing','rejected'].includes(start.state)){
@ -126,6 +135,10 @@ export async function runWholeDetail(host, runAgent, loadKnowledge, {pause=delay
start=journal.items[slot.id];
}
if(written.has(slot.id)||start?.state==='missing'||start?.state==='rejected'&&start.candidateId)return;
if(slot.manuallyEdited){
await save(slot,{state:'manual',reason:'此图位已有手动修改,保留当前画布'});
return;
}
const position=slots.indexOf(slot), offset=Math.floor(position/12)*12;
const refresh=async()=>{
const page=await canvas.workflowRead({section:'slots',outputId,offset});
@ -156,7 +169,11 @@ export async function runWholeDetail(host, runAgent, loadKnowledge, {pause=delay
if(item?.review?.candidateId!==candidateId||item.review.decision!=='pass')throw Error('先验图并确认通过');
const latest=await refresh();
if(latest.selectedCandidateId){written.add(slot.id);return report({status:'applied'},true);}
await progress('正在回填');
if(latest.manuallyEdited){
await save(slot,{state:'manual',reason:'此图位已有手动修改,保留已验收候选'});
return report({status:'manual'},true);
}
await showStep(slot,'正在回填');
const {operation}=await invoke(operationHost,slot,'adopt_candidate',{candidateId,fit},signal);
if(operation?.phase!=='complete')throw Error('采纳结果尚未确认');
const after=await refresh();
@ -171,7 +188,7 @@ export async function runWholeDetail(host, runAgent, loadKnowledge, {pause=delay
await current();
const item=journal.items[slot.id];
if(candidateId && item?.candidateId!==candidateId)throw Error('请读取当前图位候选');
await progress(candidateId?'正在验图':'正在核对商品和图位资料');
await showStep(slot,candidateId?'正在验图':'正在核对商品和图位资料');
const input=await canvas.detailImages(slot.id,candidateId);
const expected=input.referenceCount+(input.layoutCount??0)+(candidateId?1:0);
if(!input.referenceCount||input.candidateId!==(candidateId??null)||input.images?.length!==expected){
@ -202,15 +219,23 @@ export async function runWholeDetail(host, runAgent, loadKnowledge, {pause=delay
throw Error('此图位有已确认失败的原候选,请按保存的原要求重试');
}
while(true){
if (journal.items[slot.id]?.retryAt>Date.now()) {
await progress('生图服务繁忙,稍后继续');
await waitUntil(journal.items[slot.id].retryAt,signal);
if(source==='generate'){
for(let retryAt=Math.max(providerRetryAt,journal.items[slot.id]?.retryAt??0);retryAt>Date.now();
retryAt=Math.max(providerRetryAt,journal.items[slot.id]?.retryAt??0)){
await showStep(slot,'等待生图服务恢复');
await waitUntil(retryAt,signal);
if(Math.max(providerRetryAt,journal.items[slot.id]?.retryAt??0)===retryAt)break;
}
}
const latest=await refresh();
if(latest.selectedCandidateId){written.add(slot.id);return report({status:'applied'},true);}
if(latest.manuallyEdited){
await save(slot,{state:'manual',reason:'此图位已有手动修改,保留当前画布'});
return report({status:'manual'},true);
}
const baseline=latest.candidates.map(candidate=>candidate.id);
await save(slot,{state:'dispatching',attempts,baseline,source,prompt,candidateId:null,review:null,retryOf,retryAt:null});
await progress(source==='product'?'正在取用同款原图':'正在生图');
await showStep(slot,source==='product'?'正在取用同款原图':'正在生图');
let operation;
try {
({operation}=await invoke(operationHost,slot,'generate_candidate',source==='product'?{useProductReference:true}:
@ -226,7 +251,7 @@ export async function runWholeDetail(host, runAgent, loadKnowledge, {pause=delay
if(operation.phase==='complete'){
await save(slot,{state:'candidate',candidateId:operation.candidateId,transportRetries:retries,reason:null});
if(source==='generate')generated.add(operation.candidateId);
await progress(source==='generate'?'生图已返回,等待验图':'已取用原图,等待验图');
await showStep(slot,source==='generate'?'生图已返回,等待验图':'已取用原图,等待验图');
return report({candidateId:operation.candidateId,status:'complete'});
}
if(source!=='generate'||!operation.retryableFailure||retries>=transportDelays.length){
@ -235,6 +260,7 @@ export async function runWholeDetail(host, runAgent, loadKnowledge, {pause=delay
}
const waitMs=Math.max(transportDelays[retries++],Number.isFinite(operation.retryAfterSeconds)?operation.retryAfterSeconds*1000:0);
retryOf=operation.candidateId;
if(operation.retryAfterSeconds>0)providerRetryAt=Math.max(providerRetryAt,Date.now()+operation.retryAfterSeconds*1000);
await save(slot,{state:'waiting_retry',candidateId:retryOf,transportRetries:retries,retryAt:Date.now()+waitMs,reason:operation.message});
}
}),
@ -243,6 +269,7 @@ export async function runWholeDetail(host, runAgent, loadKnowledge, {pause=delay
checks:Type.Object({structure:Type.Boolean(),color:Type.Boolean(),composition:Type.Boolean(),evidence:Type.Boolean()},{additionalProperties:false}),
reason:short,
}),async({candidateId,verdict,checks,reason},signal)=>{
await current();
const item=journal.items[slot.id];
if(item?.candidateId!==candidateId||inspected!==candidateId)throw Error('请先读取并查看此候选实际像素');
if(verdict==='pass'&&!Object.values(checks).every(Boolean))throw Error('四项都符合才可以通过');
@ -253,6 +280,7 @@ export async function runWholeDetail(host, runAgent, loadKnowledge, {pause=delay
return report({status:state,verdict},state==='rejected');
}),
tool('mark_missing','缺少商品证据或图位无法验收时,明确记录需要补什么。',params({reason:short}),async({reason})=>{
await current();
await save(slot,{state:'missing',reason});
return report({status:'missing',reason},true);
}),
@ -267,11 +295,11 @@ export async function runWholeDetail(host, runAgent, loadKnowledge, {pause=delay
try{
const ready=journal.items[slot.id];
if(ready?.review?.decision==='pass'&&ready.review.candidateId===ready.candidateId){
await placeCandidate({candidateId:ready.candidateId,fit:ready.source==='product'?'contain':'cover'});
await placeCandidate({candidateId:ready.candidateId,fit:ready.source==='product'?'contain':'cover'},slotSignal);
}else{
await runAgent(slot.id,instructions,JSON.stringify(inputs),tools);
}
if(!written.has(slot.id)&&!['missing','rejected','unknown'].includes(journal.items[slot.id]?.state)){
if(!written.has(slot.id)&&!['missing','rejected','unknown','manual'].includes(journal.items[slot.id]?.state)){
await save(slot,{reason:'本图位尚未得到已验收的回填结果'});
}
}catch(error){
@ -279,14 +307,52 @@ export async function runWholeDetail(host, runAgent, loadKnowledge, {pause=delay
}
}
const supervisorTools=[
tool('delegate_image_slots','把指定图位交给小壹的子代理并行生图和验图,合格图自动回填。',params({
slotIds:Type.Array(short,{minItems:1,maxItems:300}),goal:short,
}),async({slotIds,goal},signal)=>{
if(slotIds.some(id=>!slots.some(slot=>slot.id===id)))throw Error('图位不属于当前详情页');
const queue=slots.filter(slot=>slotIds.includes(slot.id)&&!delegated.has(slot.id)&&!written.has(slot.id));
for(const slot of queue)delegated.add(slot.id);
phase='小壹正在制作详情页';
let cursor=0;
const work=async()=>{
while(cursor<queue.length){
signal?.throwIfAborted();
await current();
const slot=queue[cursor++];
if(!slot)break;
await showStep(slot,'正在准备');
try {
await runSlot(slot,goal,signal);
} catch(error) {
await save(slot,{reason:error.message});
} finally {
activeSlots.delete(slot.id);
}
const item=journal.items[slot.id];
const status=written.has(slot.id)?'已回填':item?.state==='unknown'?'待核查':
item?.state==='manual'?'保留手改':'待补或失败';
outcomes.set(slot.id,{label:slot.label,status,reason:written.has(slot.id)?'':(item?.reason??'尚未验收').slice(0,80)});
await progress();
}
};
const workers=await Promise.allSettled(Array.from({length:Math.min(concurrentSlots,queue.length)}, work));
const stopped=workers.find(worker=>worker.status==='rejected');
if(stopped)throw stopped.reason;
return report(queue.map(({id})=>({id,...outcomes.get(id)})));
}),
];
let textWritten=0, textPending=0;
if(typeof canvas.detailCopyFields==='function'&&typeof canvas.detailApplyCopy==='function'){
const copyTools=[
tool('read_copy_fields','查看固定模板的分屏、待填写文字格和容量。',params({}),async()=>report(await canvas.detailCopyFields())),
tool('write_copy_fields','把同款商品事实写入指定文字格。缺证据可写待补。',params({items:Type.Array(params({layer:Type.Integer({minimum:1}),text:short}),{minItems:1,maxItems:32})}),
supervisorTools.push(
tool('read_copy_fields','查看固定模板中尚未填写的文字格。',params({}),async()=>report(await canvas.detailCopyFields())),
tool('write_copy_fields','用同款商品资料写入未修改过的文字格。',params({items:Type.Array(params({layer:Type.Integer({minimum:1}),text:short}),{minItems:1,maxItems:32})}),
({items},signal)=>writeCanvas(async()=>{
signal?.throwIfAborted();
await current();
phase='正在填写模板文案';
await progress();
const state=await canvas.read();
const granted=await canvas.requestWrite(state.revision);
if(!granted.allowed||granted.revision!==state.revision)throw Error('当前修订未获得文案写入许可');
@ -295,31 +361,26 @@ export async function runWholeDetail(host, runAgent, loadKnowledge, {pause=delay
textPending=result.pending;
return report(result);
})),
];
);
textPending=(await canvas.detailCopyFields()).length;
if(textPending){
phase='正在填写模板文案';
await progress();
await runAgent('supervisor','你是小壹。读取待填文案,按商品事实填写。标题、卖点和配套短标签须写入对应文字格。认证、质保、承重等缺乏依据的字段写待补,不沿用模板样品信息。单次写入最多 32 格,分批完成后结束。',
JSON.stringify({product:plan.productEvidence?.brief,facts:plan.productEvidence?.facts,textPending}),copyTools).catch(async error=>{
await store.appendEvent({type:'whole_detail_copy_stopped',reason:error.message});
});
}
}
for(const [index,slot] of slots.entries()){
if(written.has(slot.id))continue;
await current();
phase='当前图位 '+(index+1)+'/'+slots.length+' · '+slot.label;
const remaining=slots.filter(slot=>!written.has(slot.id)).map(({id,label})=>({id,label}));
let stopped;
if(remaining.length||textPending){
phase=textPending?'正在核对待填文案和图位':'正在安排图片图位';
await progress();
await runSlot(slot,'保持模板视觉风格与同款商品的实际结构和花色');
const item=journal.items[slot.id];
const status=written.has(slot.id)?'已回填':item?.state==='unknown'?'待核查':'待补或失败';
outcomes.set(slot.id,{label:slot.label,status,reason:written.has(slot.id)?'':(item?.reason??'尚未验收').slice(0,80)});
await progress(status);
try {
await runAgent('supervisor','你是小壹。用户已经确认一键制作整套详情页,无需再询问。可先按同款商品资料分批填写待填文案(每批最多 32 格)。商品名和通用描述可用已知资料,认证、质保、承重等证据不足的内容写待补。然后用 delegate_image_slots 一次提交所有剩余图位,给出整套视觉目标。图位完成后按实际工具回执结束。保留已有图片和手动修改。',
JSON.stringify({product:plan.productEvidence?.brief,facts:plan.productEvidence?.facts,slots:remaining,textPending}),supervisorTools);
} catch(error) {
stopped=error.message;
await store.appendEvent({type:'whole_detail_supervisor_stopped',reason:stopped});
}
}
const pending=slots.filter(slot=>!written.has(slot.id));
const summary='本轮生图 '+generated.size+' 张,整套详情页 '+slots.length+' 个图位已回填 '+written.size+' 个'
+(textWritten||textPending?',已填写 '+textWritten+' 个文字格,'+textPending+' 个待填':'');
return {text:pending.length?summary+','+pending.length+' 个待处理。\n'+pending.map(slot=>
'· '+slot.label+':'+(journal.items[slot.id]?.reason||'尚未验收')).join('\n'):summary+'。可在画布预览成品。'};
const exceptions=pending.map(slot=>'· '+slot.label+':'+(journal.items[slot.id]?.reason||(delegated.has(slot.id)?'尚未验收':'尚未分派')));
return {text:[summary+(pending.length?','+pending.length+' 个待处理。':'。可在画布预览成品。'),
stopped&&'本轮暂停原因:'+stopped,...exceptions].filter(Boolean).join('\n')};
}

View File

@ -7,8 +7,32 @@ import { workflowResult } from './workflow-context.mjs';
const IMAGE_OPERATION_WAIT_MS = 14 * 60_000;
const LOCAL_OPERATION_WAIT_MS = 120_000;
async function acquireWrite(host, signal, checkTurn, wait, onWait) {
const state=await host.canvas.read();
checkTurn();
if(state?.conversationActive===false||state?.writeBlocked||!Number.isSafeInteger(state?.revision)||state.revision<0) {
throw Error('画布已变化或用户已停止,未派发采纳');
}
if(wait && state.detailWriteWaiting){
await onWait?.();
return null;
}
host.canvasWriteRequested=true;
const receipt=await host.canvas.requestWrite(state.revision);
checkTurn();
if(wait && receipt?.retryWrite){
await onWait?.();
return null;
}
if(!receipt?.allowed)throw Error('用户已接手,本轮写入未获许可');
if(receipt.revision!==state.revision)throw Error('画布已修改,写入许可已过期,未派发采纳');
signal?.throwIfAborted();
if(host.canvasNotificationsDetached||host.canvasWritesStopped)throw Error('原项目已切换或用户已接手,未派发采纳');
return receipt;
}
// One new operation, then only read its status. No transport or model retry.
export async function executeWorkflow(host, args, signal, { timeoutMs, pause = delay, keepFailedCandidate = false, detailBatch = false } = {}) {
export async function executeWorkflow(host, args, signal, { timeoutMs, pause = delay, keepFailedCandidate = false, detailBatch = false, onWriteWaiting } = {}) {
if (host.canvasNotificationsDetached || host.canvasWritesStopped) throw Error('原项目已切换或原操作需核查,本轮不再派发');
if (host.nativeUnresolved) throw Error('原操作结果未知,先核查原请求;可使用 native_reconcile 只读核查,不会重发');
if (host.nativeToolActive) throw Error('已有原生操作正在执行,请依次等待');
@ -21,21 +45,19 @@ export async function executeWorkflow(host, args, signal, { timeoutMs, pause = d
const operationId = randomUUID();
try {
signal?.throwIfAborted();
if (args.intent === 'adopt_candidate') {
if (typeof host.canvas.read !== 'function' || typeof host.canvas.requestWrite !== 'function') throw Error('画布写入许可不可用,未派发采纳');
const state = await host.canvas.read();
checkTurn();
if (state?.conversationActive === false || state?.writeBlocked || !Number.isSafeInteger(state?.revision) || state.revision < 0) throw Error('画布已变化或用户已接手,未派发采纳');
host.canvasWriteRequested = true;
const permission = await host.canvas.requestWrite(state.revision);
checkTurn();
if (!permission?.allowed) throw Error('用户已接手,本轮写入未获许可');
if (permission.revision !== state.revision) throw Error('画布已修改,写入许可已过期,未派发采纳');
signal?.throwIfAborted();
if (host.canvasNotificationsDetached || host.canvasWritesStopped) throw Error('原项目已切换或用户已接手,未派发采纳');
}
dispatched = true;
const saveDeadline = Date.now() + (timeoutMs ?? LOCAL_OPERATION_WAIT_MS);
const adoption=args.intent==='adopt_candidate';
const requestWrite=async()=>{
if(typeof host.canvas.read!=='function'||typeof host.canvas.requestWrite!=='function')throw Error('画布写入许可不可用,未派发采纳');
while(!await acquireWrite(host,signal,checkTurn,detailBatch,onWriteWaiting)){
signal?.throwIfAborted();
if(Date.now()>=saveDeadline)throw Error('当前编辑尚未落定,已保留候选');
await pause(150,undefined,{signal});
checkTurn();
}
};
if(adoption)await requestWrite();
dispatched = true;
let result = await host.canvas.workflowExecute({ ...args, operationId });
while (result?.operationId === operationId && result.phase === 'waiting_save' && result.dispatched === false) {
dispatched = false;
@ -47,8 +69,9 @@ export async function executeWorkflow(host, args, signal, { timeoutMs, pause = d
signal?.throwIfAborted();
const state = await host.canvas.read();
checkTurn();
if (state?.conversationActive === false || state?.writeBlocked || (!(detailBatch && args.intent==='generate_candidate') && state?.revision !== result.revision)) throw Error('画布已变化或用户已接手,尚未派发操作');
if (state?.error) throw Error(state.error);
if (state?.conversationActive === false || state?.writeBlocked || (!detailBatch && state?.revision !== result.revision)) throw Error('画布已变化或用户已接手,尚未派发操作');
if (!detailBatch && state?.error) throw Error(state.error);
if(detailBatch && adoption)await requestWrite();
dispatched = true;
result = await host.canvas.workflowExecute({ ...args, operationId });
}

View File

@ -51,6 +51,12 @@ async function fixture(t,{total=9,failures=[],unknownSlot=''}={}){
const waits=[];
const stub=(custom,beforeCandidate)=>async (slotId,_system,prompt,toolset)=>{
tools.push({slotId,tools:toolset.map(t=>t.name)});
if(slotId==='supervisor'){
const {slots}=JSON.parse(prompt);
const receipt=result(await invoke(toolset,'delegate_image_slots',{slotIds:slots.map(slot=>slot.id),goal:'使用同款商品资料'}));
assert.equal(receipt.length,slots.length);
return;
}
await invoke(toolset,'view_slot');
const args=await beforeCandidate?.(toolset,slotId)??{source:'generate',prompt:'沿用真实结构'};
const item=result(await invoke(toolset,'make_candidate',args));
@ -63,14 +69,15 @@ async function fixture(t,{total=9,failures=[],unknownSlot=''}={}){
run:(custom,beforeCandidate)=>runWholeDetail({canvas,store,turnEpoch:1,readWorkflow:()=>canvas.workflowRead()},stub(custom,beforeCandidate),async()=>null,{pause:async ms=>{waits.push(ms);}})};
}
test('one-click continues through every slot with one image request at a time',async t=>{
test('the supervisor keeps four slot agents busy and serializes canvas writes',async t=>{
const f=await fixture(t);
const summary=await f.run();
assert.match(summary.text,/已回填 9 个/);
assert.equal(f.peak,1);
assert.equal(f.peak,4);
assert.equal(f.overlapAdoptions,1);
assert.equal(f.calls.length,18);
assert.equal(f.tools[0].slotId,'slot-0');
assert.equal(f.tools[0].slotId,'supervisor');
assert.deepEqual(f.tools[0].tools,['delegate_image_slots']);
assert.equal(f.tools.filter(worker=>worker.tools.includes('review_candidate')).length,9);
});
@ -82,7 +89,7 @@ test('slot position, model images and filled slots stay distinct',async t=>{
if(id==='slot-1')return product;
await assert.rejects(invoke(tools,'make_candidate',product),/需要生图/);
});
assert.ok(f.progress.some(text=>text.includes('当前图位 2/2')&&text.includes('本轮生图 1 张')&&text.includes('已回填 1/2')));
assert.ok(f.progress.some(text=>text.includes('桌腿结构图')&&text.includes('本轮生图 1 张')&&text.includes('已回填 1/2')));
assert.ok(f.progress.some(text=>text.includes('正在取用同款原图')));
assert.ok(f.progress.at(-1).includes('本轮生图 1 张 · 已回填 2/2'));
assert.match(summary.text,/本轮生图 1 张/);
@ -117,12 +124,12 @@ test('review rejects uninspected images and protects a manually adopted result',
assert.equal(f.calls.some(op=>op.intent==='adopt_candidate'),false);
});
test('the real Pi agent loop reviews and places the candidate',async t=>{
test('real Pi supervisor and slot agents use separate tool contexts',async t=>{
const {createAssistantMessageEventStream,getCurrentTools}=await import('@earendil-works/pi-ai/compat');
const {DetailPiAgent}=await import('../src/agent.mjs');
const {ProjectStore}=await import('../src/store.mjs');
const {randomUUID}=await import('node:crypto');
const f=await fixture(t,{total:1});
const f=await fixture(t,{total:2});
const root=await fs.mkdtemp(path.join(os.tmpdir(),'xiaoyi-pi-worker-'));
t.after(()=>fs.rm(root,{recursive:true}));
const project=randomUUID(),scope='8'.repeat(64),model={id:'qa',protocol:'openai-chat',supportsImageInput:true};
@ -135,14 +142,20 @@ test('the real Pi agent loop reviews and places the candidate',async t=>{
const options=getCurrentTools(context.messages).map(tool=>tool.name);
const previous=context.messages.filter(message=>message.role==='toolResult').at(-1);
const what=previous?.toolName;
const candidate='slot-0-candidate-1';
let request;
assert.ok(!options.includes('delegate_image_slots'));
if(!what)request=['view_slot',{}];
else if(what==='view_slot'&&previous.content.filter(part=>part.type==='image').length===1)
if(options.includes('delegate_image_slots')){
assert.deepEqual(options,['delegate_image_slots']);
if(!what)request=['delegate_image_slots',{slotIds:f.slots.map(slot=>slot.id),goal:'核对同款'}];
}else if(!what) {
request=['view_slot',{}];
}else if(what==='view_slot'&&previous.content.filter(part=>part.type==='image').length===1){
request=['make_candidate',{source:'generate',prompt:'按原图创作'}];
else if(what==='make_candidate')request=['view_slot',{candidateId:candidate}];
else if(what==='view_slot')request=['review_candidate',{candidateId:candidate,verdict:'pass',checks,reason:'同款结构一致'}];
}else if(what==='make_candidate'){
request=['view_slot',{candidateId:result(previous).candidateId}];
}else if(what==='view_slot'){
const prior=context.messages.find(message=>message.role==='toolResult'&&message.toolName==='make_candidate');
request=['review_candidate',{candidateId:result(prior).candidateId,verdict:'pass',checks,reason:'同款结构一致'}];
}
if(request)toolCalls.push(request[0]);
const content=request?[{type:'toolCall',id:'call-'+(++n),name:request[0],arguments:request[1]}]:[{type:'text',text:'完成'}];
const stopReason=request?'toolUse':'stop';
@ -159,8 +172,10 @@ test('the real Pi agent loop reviews and places the candidate',async t=>{
const client=await DetailPiAgent.open({store,broker:{info:async()=>transport.info},canvas:f.canvas,transport,documentId:7});
try{
const response=await client.wholeDetail('一键制作整套详情页');
assert.match(response.text,/已回填 1 个/);
assert.deepEqual(toolCalls,['view_slot','make_candidate','view_slot','review_candidate']);
assert.match(response.text,/已回填 2 个/);
assert.equal(toolCalls[0],'delegate_image_slots');
assert.equal(toolCalls.filter(name=>name==='make_candidate').length,2);
assert.equal(toolCalls.filter(name=>name==='review_candidate').length,2);
assert.equal(f.calls.find(op=>op.intent==='adopt_candidate').fit,'cover');
}finally{await client.dispose();}
});

View File

@ -934,9 +934,14 @@ fn acknowledge_adoption(dir: &Path, state: &Value, input: &Value) -> R<()> {
return Err("采纳回执与原生事务、项目或像素身份不一致".into());
}
}
let before = input["beforeRevision"].as_u64();
let prepared = audit["meta"]["baseRevision"].as_u64();
let accepted_base = if audit["meta"]["detailBatch"] == true {
before.zip(prepared).is_some_and(|(before, prepared)| before >= prepared)
} else { before == prepared };
if audit["meta"]["workspaceId"] != state["id"]
|| input["afterRevision"].as_u64().zip(input["beforeRevision"].as_u64()).is_none_or(|(a, b)| b.checked_add(1) != Some(a))
|| input["beforeRevision"] != audit["meta"]["baseRevision"]
|| input["afterRevision"].as_u64().zip(before).is_none_or(|(a, b)| b.checked_add(1) != Some(a))
|| !accepted_base
{
return Err("原生采纳修订回执无效".into());
}
@ -1153,8 +1158,16 @@ impl Backend {
persist(&dir, next, expected)?;
}
let mut state = load(&dir)?;
if method != "slot-read" && input["slotRevision"].as_u64() != Some(revision(&state))
&& !(method == "slot-skeleton" && input["brief"].is_object()) && !(method == "slot-append" && input["detailBatch"] == true) {
let batch = input["detailBatch"] == true && matches!(method, "slot-append" | "slot-adopt-prep");
if batch && input["detailWorkspace"] != json!({"id":state["id"],"templateHash":state["template"]["contentHash"],
"structureHash":state["structureHash"],"outputId":state["activeOutput"],"variantId":state["activeVariantId"]})
{
return Err("本轮图位的模板、输出或花色已变化,原候选保留".into());
}
// Sibling candidates change the workspace revision, not this document or slot.
// The mapped layer and candidate are checked again below before reading any pixels.
if !matches!(method, "slot-read" | "slot-adopted") && input["slotRevision"].as_u64() != Some(revision(&state))
&& !batch && !(method == "slot-skeleton" && input["brief"].is_object()) {
return Err("画布项目已有新版本,请重新读取;原候选保留".into());
}
if method == "slot-read" {
@ -1408,6 +1421,7 @@ impl Backend {
}
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 if input["detailBatch"] == true && matches!(input["fit"].as_str(), Some("cover" | "contain")) {input["fit"].clone()} else {field["crop"].clone()},"frame":frame});
let mut meta = meta;
if batch { meta["detailBatch"] = json!(true); }
if method == "slot-edit-prep" {
meta["purpose"] = json!("professional-edit");
events.send(Event::SlotAdopt { bytes, meta }).map_err(|_| "工作台已关闭,原候选和采用准备保留")?;

View File

@ -50,7 +50,15 @@ impl SourceTicket {
/// current authorization. Call again after every worker read.
pub fn validate(&self, s: &Session) -> Result<()> {
let current = s.active().ok_or_else(|| other("no document open"))?;
if current.doc.id != self.document || current.revision != self.revision { return Err(other("the original document or revision changed")); }
if current.revision != self.revision { return Err(other("the original document or revision changed")); }
self.validate_source(s)
}
/// Verify the same object and source when the caller separately checks the
/// complete layout layer and commits only that layer to the current canvas.
pub fn validate_source(&self, s: &Session) -> Result<()> {
let current = s.active().ok_or_else(|| other("no document open"))?;
if current.doc.id != self.document { return Err(other("the original document changed")); }
let object = smart(&current.doc, self.layer)?;
if object.contents_id != self.contents || object.source != self.source { return Err(other("the original smart object contents changed")); }
if self.resolved_kind.load(std::sync::atomic::Ordering::Acquire) == 2 {

View File

@ -906,6 +906,8 @@ pub struct Workspace {
unknown: bool,
owner_doc: Option<u64>,
expected_revision: u64,
pi_canvas_basis: Option<Arc<Document>>,
pi_manual_edit: bool,
queue: VecDeque<Edit>,
recording_edit_owner: Option<Value>,
next_step: Instant,
@ -1312,6 +1314,8 @@ impl Workspace {
unknown: false,
owner_doc: None,
expected_revision: 0,
pi_canvas_basis: None,
pi_manual_edit: false,
queue: VecDeque::new(),
recording_edit_owner: None,
next_step: Instant::now(),
@ -1624,9 +1628,41 @@ impl Workspace {
self.messages.push(json!({"role":"assistant","kind":"activity","text":text.into()}));
self.draft_changed = true;
}
fn track_pi_canvas(&mut self, app: &PhotocraftApp) {
if self.pi_run.is_none() || self.pi_write_blocked { return; }
let Some(active) = app.session.active().filter(|state| Some(state.doc.id.0) == self.owner_doc) else { return; };
if self.pi_request_scope["wholeDetail"] == true {
// Batch writes check the actual target against the canvas at the start of the run.
self.expected_revision = active.revision;
return;
}
if active.revision != self.expected_revision && !self.pi_canvas_basis.as_ref().is_some_and(|basis|
Arc::ptr_eq(basis, &active.doc) || photocraft_engine::layer_multi_cmds::selection_only_change(basis, &active.doc))
{
self.pi_manual_edit = true;
self.pi_write_blocked = true;
self.allow_apply = false;
return;
}
self.expected_revision = active.revision;
self.pi_canvas_basis = Some(active.doc.clone());
}
fn detail_layer_unchanged(&self, doc: &Document, layer: photocraft_doc::LayerId) -> bool {
let Some(basis) = &self.pi_canvas_basis else { return false; };
basis.id == doc.id && basis.size == doc.size && basis.mode == doc.mode
&& basis.depth == doc.depth && basis.icc_profile == doc.icc_profile && basis.global_light == doc.global_light
&& basis.layer(layer).zip(doc.layer(layer)).is_some_and(|(before, now)| before == now)
&& doc.path_of(layer).is_some_and(|path| {
let locks = doc.locks_at(&path);
!(locks.all || locks.position || locks.pixels)
})
}
fn handover(&mut self) {
self.pi_ui_cancel("已接手,交互已取消");
self.agent_native.cancel();
self.pi_manual_edit = false;
if self.pending() {
self.agent_effects_paused = true;
}
@ -2028,6 +2064,8 @@ impl Workspace {
self.stream_reply.clear();
self.allow_apply = false;
self.pi_write_blocked = false;
self.pi_manual_edit = false;
self.pi_canvas_basis = app.session.active().map(|state| state.doc.clone());
self.expected_revision = context["revision"].as_u64().unwrap_or(0);
self.pi_request_scope = context["requestScope"].clone();
self.messages.push(json!({"role":"user","text":text,"target":self.pi_request_scope["subject"],"requestScope":self.pi_request_scope,"referenceContent":recorded_content}));
@ -2051,7 +2089,7 @@ impl Workspace {
&& let Some(state) = app.session.active() {
let receipt = json!({"kind":"native-operation","run":self.pi_run,"accountId":self.account["id"],"origin":self.origin,
"projectLocalId":self.pi_request_scope["project"]["localId"],"documentId":state.doc.id.0,
"beforeRevision":meta["baseRevision"],"afterRevision":state.revision,"method":"workflow.execute","command":"slot-adopt",
"beforeRevision":meta.get("commitBaseRevision").unwrap_or(&meta["baseRevision"]),"afterRevision":state.revision,"method":"workflow.execute","command":"slot-adopt",
"dispatched":true,"executed":true,"pending":false,"completed":true,
"actualResult":{"slotId":meta["slotId"],"candidateId":meta["candidateId"]},"subject":self.pi_request_scope["subject"]});
if self.agent_native.record(receipt).is_ok() { self.expected_revision = state.revision; }
@ -2766,17 +2804,7 @@ impl Workspace {
self.pi_request_scope = Value::Null;
self.note("本地 Agent 连接已断开,草稿已保留");
}
if self.pi_run.is_some() {
// Browsing is allowed during conversation and candidate generation.
// A primary press can still interrupt an explicitly authorized canvas write.
let editing_pointer = self.allow_apply && self.pi_request_scope["wholeDetail"] != true && ui.input(|input| {
input.pointer.primary_pressed()
&& input.pointer.interact_pos().is_some_and(|position| app.last_canvas_rect.contains(position))
});
if editing_pointer || current != self.owner_doc.map(|id| (id, self.expected_revision)) {
self.handover();
}
}
self.track_pi_canvas(app);
if self.observed_doc != current.map(|v| v.0) {
self.persisted_revisions.retain(|id, _| app.session.documents().iter().any(|st| st.doc.id.0 == *id));
self.flush_document_draft(ui.ctx(), self.observed_doc, true);
@ -2877,11 +2905,14 @@ impl Workspace {
ui.ctx().request_repaint_after(Duration::from_millis(60));
}
if !self.queue.is_empty() {
let manual_pointer = !self.library
&& !self.material
&& ui.input(|i| i.pointer.any_pressed() && i.pointer.interact_pos().is_some_and(|p| app.last_canvas_rect.contains(p)));
if manual_pointer || current != self.owner_doc.map(|id| (id, self.expected_revision)) {
self.handover();
if current != self.owner_doc.map(|id| (id, self.expected_revision)) {
if self.pi_run.is_some() {
self.recording_edit_owner = None;
self.queue.clear();
self.allow_apply = false;
} else {
self.handover();
}
} else if Instant::now() >= self.next_step
&& let Some(edit) = self.queue.pop_front()
{

View File

@ -883,6 +883,18 @@ fn original_for_replacement(doc:&Document,layer:photocraft_doc::LayerId,source:&
photocraft_engine::smart_cmds::prepare_bounded_source(&source.file_name,source.bytes.clone()).map(Some).map_err(|error|error.to_string())
}
pub(super) fn detail_write_waiting(w: &Workspace, app: &PhotocraftApp) -> bool {
app.ui.text_edit.is_some() || app.saving() || adoption_write_mode(w, app).is_none()
}
fn valid_detail_adoption(w: &Workspace, doc: &Document, meta: &Value) -> bool {
let Some(layer) = meta["nativeLayerId"].as_u64().map(photocraft_doc::LayerId) else { return false; };
w.pi_request_scope["wholeDetail"] == true && w.pi_run.is_some()
&& !w.pi_write_blocked && !w.agent_effects_paused
&& meta["variantId"] == w.canvas_workspace.variant && meta["outputId"] == w.canvas_workspace.output
&& w.detail_layer_unchanged(doc, layer)
}
fn adoption_write_mode(w: &Workspace, app: &PhotocraftApp) -> Option<Value> {
let state = app.session.active()?;
if app.layer_mask_targeted() || app.ui.mask_target || app.ui.vector_mask_target || app.ui.transform.is_some()
@ -1148,10 +1160,12 @@ impl Workspace {
pub(super) fn canvas_adopt(&mut self, app: &mut PhotocraftApp, bytes: Vec<u8>, meta: Value) -> Option<(Value, bool)> {
use std::sync::atomic::Ordering;
let pending = self.canvas_workspace.pending_adoption.clone()?;
let batch = meta["detailBatch"] == true;
let write_mode = adoption_write_mode(self, app);
let valid = write_mode.is_some() && self.enforce_canvas_scope(app) && app.session.active().is_some_and(|state| {
meta["accountId"] == self.account["id"] && meta["origin"] == self.origin
&& meta["doc"].as_u64() == Some(state.doc.id.0) && meta["baseRevision"].as_u64() == Some(state.revision)
&& meta["doc"].as_u64() == Some(state.doc.id.0)
&& (if batch { valid_detail_adoption(self, &state.doc, &meta) } else { meta["baseRevision"].as_u64() == Some(state.revision) })
&& meta["templateHash"] == self.template_workflow["templateHash"]
&& pending["slotId"] == meta["slotId"] && pending["candidateId"] == meta["candidateId"] && pending["variantId"] == meta["variantId"]
&& meta["nativeLayerId"].as_u64().is_some_and(|layer| meta["slotId"].as_str().and_then(|slot| native_layer(&state.doc, slot)) == Some(layer))
@ -1183,7 +1197,7 @@ impl Workspace {
let active_layer = state.active_layer;
let selected_layers = state.selected_layers();
let project = bound_project(self, state.doc.id.0).map(str::to_owned);
let animate_original = !self.reduce_motion && matches!(&smart.source, photocraft_doc::SmartSource::Linked { .. });
let animate_original = !batch && !self.reduce_motion && matches!(&smart.source, photocraft_doc::SmartSource::Linked { .. });
let recheck_source = matches!(&smart.source, photocraft_doc::SmartSource::Linked { .. });
let worker_meta = meta.clone();
let (sender, result) = std::sync::mpsc::sync_channel(1);
@ -1205,7 +1219,7 @@ impl Workspace {
photocraft_engine::smart_cmds::refresh_layer_with_bounded_source(&before, &mut target, original).map_err(|error|error.to_string())?;
}
*before.layer_mut(photocraft_doc::LayerId(layer)).ok_or("原图位不存在")? = target;
let snapshot = if animate_original {
let snapshot = if animate_original || recheck_source && batch {
Some(AdoptionSnapshot { before_doc:std::sync::Arc::new(before.clone()), source_digest:source.digest })
} else { None };
let mut prepared = photocraft_engine::Session::new();
@ -1236,14 +1250,16 @@ impl Workspace {
}
fn adoption_worker_valid(&self, app: &PhotocraftApp, worker: &AdoptionWorker) -> bool {
worker.source_ticket.validate(&app.session).is_ok()
let batch = worker.meta["detailBatch"] == true;
let source_ok = if batch { worker.source_ticket.validate_source(&app.session) } else { worker.source_ticket.validate(&app.session) };
source_ok.is_ok()
&& self.canvas_workspace.pending_adoption.as_ref() == Some(&worker.pending)
&& adoption_write_mode(self, app).as_ref() == Some(&worker.write_mode)
&& (batch || adoption_write_mode(self, app).as_ref() == Some(&worker.write_mode))
&& self.canvas_scope_valid(app)
&& worker.meta["accountId"] == self.account["id"] && worker.meta["origin"] == self.origin
&& worker.meta["templateHash"] == self.template_workflow["templateHash"]
&& app.session.active().is_some_and(|state| worker.meta["doc"].as_u64() == Some(state.doc.id.0)
&& worker.meta["baseRevision"].as_u64() == Some(state.revision)
&& (if batch { valid_detail_adoption(self, &state.doc, &worker.meta) } else { worker.meta["baseRevision"].as_u64() == Some(state.revision) })
&& bound_project(self, state.doc.id.0).map(str::to_owned) == worker.project
&& worker.meta["nativeLayerId"].as_u64().is_some_and(|layer| worker.meta["slotId"].as_str()
.and_then(|slot| native_layer(&state.doc, slot)) == Some(layer)))
@ -1251,6 +1267,10 @@ impl Workspace {
pub(super) fn poll_canvas_adoption(&mut self, app: &mut PhotocraftApp, ctx: &egui::Context) -> Option<(Value, bool)> {
let worker = self.canvas_workspace.adoption_worker.as_ref()?;
if worker.meta["detailBatch"] == true && !self.pi_write_blocked && !self.agent_effects_paused && detail_write_waiting(self, app) {
ctx.request_repaint_after(std::time::Duration::from_millis(100));
return None;
}
if !self.adoption_worker_valid(app, worker) {
let source_error = worker.source_ticket.validate(&app.session).err().map(|error| error.to_string());
let worker = self.canvas_workspace.adoption_worker.take()?;
@ -1334,7 +1354,7 @@ impl Workspace {
Ok(AdoptionProgress::Done(Ok(payload))) => {
let (updated, snapshot) = *payload;
#[cfg(not(target_arch = "wasm32"))]
if let Some(old) = snapshot.as_ref() {
if let Some(old) = snapshot.as_ref().filter(|_| worker.meta["detailBatch"] != true) {
let id = ADOPTION_PREWARM_ID.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
let mut lease = worker.meta.clone();
lease["project"] = json!(worker.project);
@ -1353,7 +1373,8 @@ impl Workspace {
}
};
let worker = self.canvas_workspace.adoption_worker.take()?;
let meta = worker.meta;
let valid = self.adoption_worker_valid(app, &worker);
let mut meta = worker.meta;
let (updated, snapshot) = match prepared {
Ok(result) => result,
Err(error) => {
@ -1364,47 +1385,49 @@ impl Workspace {
return Some((meta, false));
}
};
let valid = worker.source_ticket.validate(&app.session).is_ok()
&& self.canvas_workspace.pending_adoption.as_ref() == Some(&worker.pending)
&& adoption_write_mode(self, app).as_ref() == Some(&worker.write_mode)
&& self.enforce_canvas_scope(app) && app.session.active().is_some_and(|state| {
meta["accountId"] == self.account["id"] && meta["origin"] == self.origin
&& meta["doc"].as_u64() == Some(state.doc.id.0) && meta["baseRevision"].as_u64() == Some(state.revision)
&& meta["templateHash"] == self.template_workflow["templateHash"]
&& bound_project(self, state.doc.id.0).map(str::to_owned) == worker.project
&& meta["nativeLayerId"].as_u64().is_some_and(|layer| meta["slotId"].as_str().and_then(|slot| native_layer(&state.doc, slot)) == Some(layer))
});
if !valid {
if self.canvas_workspace.pending_adoption.as_ref() == Some(&worker.pending) { self.canvas_workspace.pending_adoption = None; }
self.error = "当前项目或画布已有变化,候选已保留,未覆盖编辑".into();
return Some((meta, false));
}
self.canvas_workspace.pending_adoption = None;
let Some(layer) = meta["nativeLayerId"].as_u64() else { self.error = "图位图层身份缺失".into(); return Some((meta, false)); };
let selection_unchanged = app.session.active().is_some_and(|state|
let Some(layer) = meta["nativeLayerId"].as_u64().map(photocraft_doc::LayerId) else { self.error = "图位图层身份缺失".into(); return Some((meta, false)); };
let batch = meta["detailBatch"] == true;
let before_revision = app.session.active().map(|state| state.revision);
let selection_unchanged = !batch && app.session.active().is_some_and(|state|
state.active_layer == worker.active_layer && state.selected_layers() == worker.selected_layers);
let marker = format!("jiansun.adopted.{}.{}", meta["variantId"].as_str().unwrap_or(""), meta["slotId"].as_str().unwrap_or(""));
let candidate = meta["candidateId"].as_str().unwrap_or("").to_owned();
if let Err(error) = app.session.edit("采纳图片", move |doc, selected| {
*doc = updated;
if selection_unchanged { *selected = Some(photocraft_doc::LayerId(layer)); }
if batch {
*doc.layer_mut(layer).ok_or(photocraft_engine::EngineError::NoLayer(layer))? =
updated.layer(layer).cloned().ok_or(photocraft_engine::EngineError::NoLayer(layer))?;
doc.metadata.text.retain(|(key, _)| key != &marker);
doc.metadata.text.push((marker, candidate));
} else {
*doc = updated;
if selection_unchanged { *selected = Some(layer); }
}
Ok(())
}) { self.error = error.to_string(); return Some((meta, false)); }
if batch { meta["commitBaseRevision"] = json!(before_revision); }
app.sync_views();
let mut effect = meta.clone();
effect["afterRevision"] = json!(app.session.active().map(|s| s.revision));
effect["effectProject"] = json!(bound_project(self, meta["doc"].as_u64().unwrap_or_default()));
let started = std::time::Instant::now();
#[cfg(not(target_arch = "wasm32"))]
if let Some(snapshot) = snapshot.as_ref() {
if let Some(snapshot) = snapshot.as_ref().filter(|_| !batch) {
crate::canvas::set_agent_adoption(ctx, Some(crate::canvas::AgentAdoptionFade {
old_doc:snapshot.before_doc.clone(), lease:effect.clone(), started, request_id:worker.prewarm_id.unwrap_or_default(),
}));
}
self.canvas_workspace.adoption_effect = Some((effect, started));
self.canvas_workspace.adoption_snapshot = snapshot;
self.canvas_workspace.adoption_snapshot = if batch { None } else { snapshot };
self.draft_changed = true;
self.sync_dirty = true;
let mut ack = meta.clone();
ack["beforeRevision"] = meta["baseRevision"].clone();
ack["beforeRevision"] = json!(before_revision);
ack["afterRevision"] = json!(app.session.active().map(|s| s.revision));
ack["slotRevision"] = self.template_workflow["revision"].clone();
if self.tx.send(Request::Action("slot-adopted".into(), ack)).is_err() {

View File

@ -18,7 +18,8 @@ fn status(w: &Workspace, app: &PhotocraftApp) -> Value {
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.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}})
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,
"manualEdit":w.pi_manual_edit,"detailWriteWaiting":active && w.pi_request_scope["wholeDetail"] == true && super::canvas_workspace::detail_write_waiting(w, app),"queued":if active {w.queue.len()} else {0},"revision":revision,"context":context,"error":if active {json!(w.error)} else {Value::Null}})
}
// Tool activity is a deliberately narrow projection of SDK events. Never keep
@ -172,8 +173,16 @@ fn action_impl(w: &mut Workspace, app: &mut PhotocraftApp, ctx: Option<&egui::Co
if !own_submit {
w.pi_write_blocked = false;
}
if own_submit && st.revision != w.expected_revision {
let batch = request_scope["wholeDetail"] == true;
if !own_submit || w.pi_canvas_basis.as_ref().is_none_or(|basis| basis.id != st.doc.id) {
w.pi_canvas_basis = Some(st.doc.clone());
w.pi_manual_edit = false;
}
if own_submit && !batch && st.revision != w.expected_revision && !w.pi_canvas_basis.as_ref().is_some_and(|basis|
std::sync::Arc::ptr_eq(basis, &st.doc) || photocraft_engine::layer_multi_cmds::selection_only_change(basis, &st.doc))
{
w.pi_write_blocked = true;
w.pi_manual_edit = true;
}
w.owner_doc = Some(st.doc.id.0);
w.expected_revision = st.revision;
@ -210,6 +219,7 @@ fn action_impl(w: &mut Workspace, app: &mut PhotocraftApp, ctx: Option<&egui::Co
if method == "pi-workflow-reconcile" { return workflow_bridge::reconcile(w, app, input); }
identity(w, input)?;
w.pi_touched = Instant::now();
w.track_pi_canvas(app);
if method != "pi-state" && !app.session.active().is_some_and(|s| Some(s.doc.id.0) == w.owner_doc) {
if method == "pi-end" {
// The SDK transcript/response stays in its original project's store.
@ -242,7 +252,8 @@ fn action_impl(w: &mut Workspace, app: &mut PhotocraftApp, ctx: Option<&egui::Co
"pi-detail-copy-fields" => {
if w.pi_request_scope["wholeDetail"] != true || w.pi_write_blocked { return Err("当前回合无整套详情页文案授权".into()); }
let doc = &app.session.active().ok_or("原项目未打开")?.doc;
Ok(json!(detail_copy_fields(doc)))
Ok(json!(detail_copy_fields(doc).into_iter().filter(|field| field["layer"].as_u64()
.is_some_and(|id| w.detail_layer_unchanged(doc, photocraft_doc::LayerId(id)))).collect::<Vec<_>>()))
}
"pi-detail-copy-apply" => {
if w.pi_request_scope["wholeDetail"] != true || w.pi_write_blocked || !w.allow_apply
@ -257,6 +268,7 @@ fn action_impl(w: &mut Workspace, app: &mut PhotocraftApp, ctx: Option<&egui::Co
for item in items {
let layer = item["layer"].as_u64().filter(|id| seen.insert(*id)).ok_or("文字格身份重复或无效")?;
let field = fields.iter().find(|row| row["layer"] == layer).ok_or("该文字格已填写或不属于模板")?;
if !w.detail_layer_unchanged(&active.doc, photocraft_doc::LayerId(layer)) { continue; }
let text = item["text"].as_str().filter(|text| !text.trim().is_empty()).ok_or("缺少填写文字")?;
let max = field["maxChars"].as_u64().unwrap_or(120).min(500) as usize;
let lines = field["maxLines"].as_u64().unwrap_or(8).min(32) as usize;
@ -266,6 +278,9 @@ fn action_impl(w: &mut Workspace, app: &mut PhotocraftApp, ctx: Option<&egui::Co
edits.push(json!({"layer":layer,"text":text}));
}
let count = edits.len();
let remaining = fields.iter().filter(|field| field["layer"].as_u64()
.is_some_and(|id| w.detail_layer_unchanged(&active.doc, photocraft_doc::LayerId(id)))).count().saturating_sub(count);
if count == 0 { return Ok(json!({"applied":0,"pending":remaining})); }
let mut staged = photocraft_engine::Session::new();
staged.add_document(active.doc.as_ref().clone(),None);
for edit in edits { staged.execute("type.edit",edit).map_err(|error| error.to_string())?; }
@ -275,7 +290,7 @@ fn action_impl(w: &mut Workspace, app: &mut PhotocraftApp, ctx: Option<&egui::Co
w.expected_revision=app.session.active().ok_or("当前画布未打开")?.revision;
w.draft_changed=true;
w.sync_dirty=true;
Ok(json!({"applied":count,"pending":fields.len()-count}))
Ok(json!({"applied":count,"pending":remaining}))
}
"pi-detail-images" => {
if w.pi_request_scope["wholeDetail"] != true || w.pi_write_blocked || w.agent_effects_paused {
@ -346,11 +361,20 @@ fn action_impl(w: &mut Workspace, app: &mut PhotocraftApp, ctx: Option<&egui::Co
Ok(Value::Null)
}
"pi-write-request" => {
let batch = w.pi_request_scope["wholeDetail"] == true;
if batch && !w.pi_write_blocked
&& (super::canvas_workspace::detail_write_waiting(w, app) || input["revision"].as_u64() != Some(w.expected_revision))
{
w.allow_apply = false;
let mut receipt = status(w, app);
receipt["retryWrite"] = json!(true);
return Ok(receipt);
}
if !w.pi_write_blocked
&& app.session.active().is_some_and(|s| Some(s.doc.id.0) == w.owner_doc && s.revision == w.expected_revision)
&& input["revision"].as_u64() == Some(w.expected_revision)
&& w.queue.is_empty()
&& !w.unknown
&& (!w.unknown || batch)
{
w.allow_apply = true;
Ok(status(w, app))

View File

@ -51,7 +51,7 @@ impl State {
}
pub(super) fn running_generation(&self, run: Option<&str>, account: &Value, origin: &str, doc: u64, project: Option<&str>) -> Option<&Value> {
self.operations.last().filter(|op| {
self.operations.iter().rev().find(|op| {
run.is_some() && op["run"].as_str() == run && op["intent"] == "generate_candidate"
&& op["phase"] == "submitted" && op["accountId"] == *account && op["origin"] == origin
&& op["documentId"] == doc && project.is_some() && op["projectLocalId"].as_str() == project
@ -460,7 +460,7 @@ fn product_evidence(w: &Workspace) -> Value {
"stale":brief_dirty(w) || w.creation["sellingPoints"]["stale"]==true},"plan":projected_plan(w)})
}
fn read(w: &Workspace, version: u64, section: &str, output: &str, offset: usize, available: bool, canvas: &Value) -> Value {
fn read(w: &Workspace, version: u64, section: &str, output: &str, offset: usize, available: bool, canvas: &Value, active_doc: Option<&super::Document>) -> Value {
if !available {
return json!({"available":false,"version":version,"section":section,"productEvidence":null,"reason":"当前工作流尚未绑定本账户项目"});
}
@ -512,8 +512,12 @@ fn read(w: &Workspace, version: u64, section: &str, output: &str, offset: usize,
result["totalSlots"] = json!(slots.len());
result["slots"] = json!(slots.into_iter().skip(offset).take(12).map(|slot| {
let candidates=slot["candidates"].as_array().into_iter().flatten().rev().take(12).map(|candidate| json!({"id":clip(&candidate["id"],100),"variant":clip(&candidate["variant"],100),"status":clip(&candidate["status"],24),"reused":candidate["reusedFrom"].is_object()})).collect::<Vec<_>>();
let manually_edited = w.pi_request_scope["wholeDetail"] == true && w.pi_canvas_basis.is_some()
&& slot["nativeLayerId"].as_u64().is_some_and(|id| active_doc
.is_some_and(|doc| !w.detail_layer_unchanged(doc, photocraft_doc::LayerId(id))));
json!({"id":clip(&slot["id"],160),"fieldId":clip(&slot["fieldId"],100),"documentId":clip(&slot["documentId"],100),"outputId":output,
"label":clip(&slot["label"],160),"selectedCandidateId":if w.template_workflow["canvasFirst"]==true{adopted(&slot["id"])}else{slot["selectedCandidateId"].clone()},"candidates":candidates})
"label":clip(&slot["label"],160),"selectedCandidateId":if w.template_workflow["canvasFirst"]==true{adopted(&slot["id"])}else{slot["selectedCandidateId"].clone()},
"manuallyEdited":manually_edited,"candidates":candidates})
}).collect::<Vec<_>>());
result["outputs"] = json!(w.template_workflow["outputs"].as_array().into_iter().flatten().filter(|row| row["outputId"]==output).take(32)
.map(|row|json!({"documentId":clip(&row["documentId"],100),"name":clip(&row["name"],160),"ready":row["ready"]==true,"requiredImages":row["requiredImages"],"selectedImages":row["selectedImages"],"hasEditedDraft":row["hasEditedDraft"]==true})).collect::<Vec<_>>());
@ -596,6 +600,9 @@ fn execute(w: &mut Workspace, app: &mut PhotocraftApp, input: &Value, version: u
if w.template_workflow["canvasFirst"] != true || !version_ok && !batch_scope {
return Err("工作流已变化或不支持直接执行,请重新读取".into());
}
if batch && intent == "adopt_candidate" && super::canvas_workspace::detail_write_waiting(w, app) {
return Ok(json!({"operationId":id,"phase":"waiting_save","dispatched":false,"revision":w.expected_revision}));
}
if intent == "adopt_candidate" && !w.allow_apply { return Err("本轮原生操作尚未取得当前修订许可".into()); }
let instruction = input.get("instruction").map_or(Ok(""), |v| v.as_str().ok_or("调整要求须为文本"))?;
if instruction.chars().count() > 500 || instruction.chars().any(|ch| ch.is_control() && !matches!(ch, '\n' | '\r' | '\t')) || (intent != "generate_candidate" && !instruction.trim().is_empty()) {
@ -612,7 +619,18 @@ fn execute(w: &mut Workspace, app: &mut PhotocraftApp, input: &Value, version: u
return Err("本轮相同操作已有原记录,不会重复执行".into());
}
let method = if intent == "generate_candidate" { "slot-append" } else { "slot-adopt-prep" };
if batch { operation_input["detailBatch"] = json!(true); }
if batch {
operation_input["detailBatch"] = json!(true);
operation_input["detailWorkspace"] = json!({"id":w.template_workflow["workspaceId"],
"templateHash":w.template_workflow["templateHash"],"structureHash":w.template_workflow["structureHash"],
"outputId":output_id,"variantId":input["productVariantId"]});
if intent == "adopt_candidate" && w.pi_canvas_basis.is_some()
&& operation_input["nativeLayerId"].as_u64().is_some_and(|id| app.session.active()
.is_some_and(|state| !w.detail_layer_unchanged(&state.doc, photocraft_doc::LayerId(id))))
{
return Err("当前图位已有手动修改,候选已保留".into());
}
}
if let Some(fit) = input.get("fit") {
if !batch || intent != "adopt_candidate" || !matches!(fit.as_str(), Some("cover" | "contain")) {
return Err("该图位放置方式无效".into());
@ -669,7 +687,8 @@ pub(super) fn action(w: &mut Workspace, app: &mut PhotocraftApp, method: &str, i
let output = output(w, input)?;
let offset = input.get("offset").map_or(Ok(0), |offset| offset.as_u64().filter(|offset| *offset <= 300).ok_or("读取位置无效"))? as usize;
w.workflow.last_read_version = available.then_some(version);
Ok(read(w, version, section, &output, offset, available, &current_guard["canvas"]))
Ok(read(w, version, section, &output, offset, available, &current_guard["canvas"],
app.session.active().map(|state| state.doc.as_ref())))
}
"pi-workflow-navigate" => {
arguments(input, &["stage", "outputId"])?;