diff --git a/docs/QA-OPEN-PERMISSIONS-1.25.5.md b/docs/QA-OPEN-PERMISSIONS-1.25.5.md index c19631d3..9b1a53d7 100644 --- a/docs/QA-OPEN-PERMISSIONS-1.25.5.md +++ b/docs/QA-OPEN-PERMISSIONS-1.25.5.md @@ -61,3 +61,13 @@ 此前将额度、审查和完成核验捆在一起,造成用户正常工程流程反复停下。此次把额度和操作权限拆开;差异/Git/检查与证据作为可回看事实,开放执行不再以缺少检查或要求复核强制停住。自动执行不把未检查写成通过,也不改变原上游错误。所有发行和正式结果必须观察后再更新。 冻结实现前新网页8组通过(open-web-267794e3),含9图批量上传、删除单图后保留其他8项选择,390px截图已实际回看;新增专用原生SDK初始化也断言未主动传maxTokens。最终Electron多图扩展与完整源码接续,正式未改动。 + +## 冻结后旧任务续接复核 + +2fa22073已本地提交(113文件/1866新增631删除),网页最终8组与实际Electron最终9组通过,截图已回看;SDK四轮645份原件共21197319字节复制到.qa/unrestricted-1.25.5/native-sdk-attempt-1至4,所有字节与原Temp逐项一致。 + +第三遍继续检查旧Task续接,零请求复现:新Run已unrestricted/零预算,旧Task最大100、已消费200仍触发task_token_limit(open-legacy-resume-diagnostic-1.json)。现在开始开放新Run时将当前Task的后续额度改为0,旧Run预算/原用量完全保持;真实localhost续接专项open-legacy-resume-fixed-1.log通过,只有一次本机POST、无输出字段,仍是同一Task。 + +完整源码第2轮在修改产品源码前主动取消:169顶层通过标记、无断言失败,结束时两个正在运行的测试文件被取消进程产生✖文件标记,不是已完成整轮。open-full-source-2-cancellation.json保存所属PID/创建时间/树;初次取消驱动空子列表循环也保留,已停止该驱动后用有界遍历只终止所属3个测试进程,未停止正式机。重新冻结后跑第3轮。 + +实际安装验收增加新权限/多图网页8组与Electron9组,既有界面检查继续保留。正式仍未升级。 diff --git a/findings.md b/findings.md index 02812da9..ef78e4f6 100644 --- a/findings.md +++ b/findings.md @@ -1271,3 +1271,7 @@ V调用前检查:新增11文件SHA断言首语法检查发现多一个右括 ## 开放权限:跨层null语义与真实完成状态 原生SDK要求正整数defaultMaxTokens,需使用内部规划哨兵并在桥/HTTP省略输出上限;任何有限输入比较必须先判断inputBudget非null。父合并不能在自动应用前暴露最终merge_prepared,否则客户端会把半途状态当完成。多图的数量策略在上传/选择/Store绑定三个入口各有独立校验,需要一起修复;同Task续接须追加原附件ID而非替换。浏览器读取不增加文件页覆盖,不能机械扣源文件页状态预留。以上均由实际失败定位并保留。 + +## 续接策略必须覆盖当前Task的后续额度 + +新Run创建使用零额度并不足够,checkBudget和请求预留还读取当前Task.budget。用户切换开放后续接旧任务时,只将当前Task后续额度置0;旧Run保留原预算和消费。该行为需真实发送验证,不能仅检查配置表。零请求复现后,一次本机HTTP续接、同Task和原Run字节对比通过。 diff --git a/progress.md b/progress.md index 06b57017..ec82b52a 100644 --- a/progress.md +++ b/progress.md @@ -1897,3 +1897,7 @@ Y阶段结束:预检110tokens通过;Node8请求64500tokens全部matched, ## 开放权限接续:原生SDK与补漏 收取并保留SDK第二/三轮失败:正整数元数据修正后,复核null预算与父合并中间状态分别暴露。修正后实际SDK完整4组通过、6本机请求/0真实;33文件/大于2MB/无检查worker自动父合并通过。旧有限浏览器小页错误单独修复并在完整16K约束下通过;多图Store残留与驱动chat别名失败保留,9张/续接第10张补验通过。完整源码首轮35通过标记/1失败/主动取消不作完成。即将冻结实现、本地提交并完整回归;正式仍未升级。 + +## 旧Task续接的额度遗留修正 + +2fa22073提交后第三遍检查复现:开放新Run仍被旧Task累计额度阻止。新Run采用当前开放策略时只更新后续Task额度为0,旧Run和原消费保持,实际本机HTTP专项通过。原完整源码第2轮因修改前取消保留169通过与两个终止文件标记,不作整轮通过。网页8/Electron9最终通过并回看;4轮SDK645份21197319字节全保留。增加安装副本的8/9权限检查,下一重建/提交后完整源码第3轮。 diff --git a/scripts/verify-desktop-install.mjs b/scripts/verify-desktop-install.mjs index 7aaf1217..ddaa39cd 100644 --- a/scripts/verify-desktop-install.mjs +++ b/scripts/verify-desktop-install.mjs @@ -158,7 +158,7 @@ try { ...(['1.24.9', '1.25.0', '1.25.1', '1.25.2', '1.25.3', '1.25.5'].includes(version) ? [['verify-requirements-ui.mjs', [], 7], ['verify-requirements-desktop.mjs', [], 3], ['verify-turn-progress-ui.mjs', [], 9], ['verify-turn-progress-ui.mjs', ['--desktop'], 9]] : []), ...(['1.25.0', '1.25.1', '1.25.2', '1.25.3', '1.25.5'].includes(version) ? [['verify-task-agreement-ui.mjs', [], 6], ['verify-task-agreement-ui.mjs', ['--desktop'], 6], ['verify-task-follow-up-ui.mjs', [], 5], ['verify-task-follow-up-ui.mjs', ['--desktop'], 5]] : []), ...(['1.25.3', '1.25.5'].includes(version) ? [['verify-reasoning-settings-ui.mjs', [], 6], ['verify-reasoning-settings-ui.mjs', ['--desktop'], 6], ['verify-model-catalog-ui.mjs', [], 8], ['verify-model-catalog-ui.mjs', ['--desktop'], 8]] : []), - ...(version === '1.25.5' ? [['verify-model-capacity-ui.mjs', [], 3], ['verify-model-capacity-ui.mjs', ['--desktop'], 3]] : []), + ...(version === '1.25.5' ? [['verify-model-capacity-ui.mjs', [], 3], ['verify-model-capacity-ui.mjs', ['--desktop'], 3], ['verify-unrestricted-ui.mjs', [], 8], ['verify-unrestricted-ui.mjs', ['--desktop'], 9]] : []), ]; for (const [script, args, expected] of suites) { const output = await run(process.execPath, [path.join(appRoot, 'scripts', script), ...args], { cwd: appRoot, diff --git a/src/server/store.mjs b/src/server/store.mjs index 04027b1f..d615ee7e 100644 --- a/src/server/store.mjs +++ b/src/server/store.mjs @@ -509,6 +509,9 @@ export class Store extends EventEmitter { task.workspaceIdentity ??= structuredClone(workspaceIdentity); if (JSON.stringify(task.workspaceIdentity) !== JSON.stringify(workspaceIdentity)) throw Object.assign(new Error('任务的工作区身份已变化,不能将原任务移动到另一个工作区。'), { status: 409 }); const run = createRun(session, task, config, resume || continuing ? previousRunId : null); + // A new open Run adopts the user's current policy even when it continues + // an exhausted legacy Task. Historical Run budgets and usage stay intact. + if (unrestricted(config)) task.budget.maxTokens = 0; run.purpose = purpose; if (purpose === 'diagnostic') { run.question = String(content); run.taskStatusBefore = task.status; diff --git a/tests/unrestricted-execution.test.mjs b/tests/unrestricted-execution.test.mjs index 8786a850..4d74c519 100644 --- a/tests/unrestricted-execution.test.mjs +++ b/tests/unrestricted-execution.test.mjs @@ -18,6 +18,20 @@ import { taskPlanInput } from '../src/shared/contracts/task-plans.mjs'; import { ChangeSetManager } from '../src/core/workspaces/change-sets.mjs'; import { proposeFile, rollbackChange } from '../src/server/files.mjs'; +test('an unrestricted continuation releases an exhausted legacy Task allowance without rewriting its original Run or usage', async t => { + const f=fixture(t),first=f.store.beginRun(f.session,'Original bounded task',false,f.store.config),task=f.store.core.task.get(first.taskId); + task.budget.maxTokens=100;task.usage.totalTokens=200; + f.store.finishRun(f.session,first,'task_token_limit'); + const original=structuredClone(first),usage=structuredClone(task.usage); + const server=await compatibleFixture(t,(_url,body)=>{for(const key of ['max_tokens','max_output_tokens','max_completion_tokens'])assert.equal(Object.hasOwn(body,key),false);return completion([],'Continued the original task.');}); + f.store.saveConfig({...openDefaults,mode:'compatible',model:'owned',baseUrl:server.baseUrl}); + const runtime=new Runtime(f.store,new Provider());f.onCleanup(()=>runtime.stopAll()); + runtime.start(f.session.id,'Continue the saved task.',true);await until(()=>!runtime.isActive(f.session.id),30000); + assert.equal(f.session.status,'completed',JSON.stringify(f.session.failure));assert.equal(f.session.taskId,task.id); + assert.equal(task.budget.maxTokens,0);assert.equal(server.requests.length,1); + assert.ok(task.usage.totalTokens>=usage.totalTokens);assert.deepEqual(f.store.core.run.get(first.id),original); +}); + test('open change sets apply and restore a file larger than the old four MiB batch ceiling', async t => { const f = fixture(t, { modernDefaults: true }), before = '\uFEFFORIGINAL\r\n' + 'a'.repeat(5 * 1024 * 1024); fs.writeFileSync(path.join(f.projectRoot, 'large-change.txt'), before);