@givolt/i3-composer-agent 2.3.4 → 2.3.5

package/.agents/plugins/marketplace.json

@@ -6,7 +6,7 @@
   "plugins": [
     {
       "name": "i3-composer-agent",
-      "version": "2.3.4",
+      "version": "2.3.5",
       "description": "覆盖需求、计划、开发、测试、审查与发布的软件工程技能，默认使用简体中文。",
       "source": {
         "source": "local",

package/.claude/commands/i3-prototype.md

@@ -19,3 +19,5 @@ Use the i3-ui-prototype skill in the main session for the user's request below.
 $ARGUMENTS
 
 With no arguments use create; explicit analysis or read-only limits take precedence. Preserve the user's scope, manual edits, fixed inputs and approved baselines. Use supporting engineering, framework, design and browser skills as the working skill requires; keep its workflow and evidence requirements there.
+
+For a managed Buddy implementation, execute the Skill's printed absolute execution-begin command on its own and wait for status=bound before writing UI. Follow immediate recovery feedback and retry the blocked operation; an outer tool success does not override an inner stage failure.

package/.claude-plugin/marketplace.json

@@ -8,7 +8,7 @@
   "plugins": [
     {
       "name": "i3-composer-agent",
-      "version": "2.3.4",
+      "version": "2.3.5",
       "source": "./",
       "description": "覆盖需求、计划、开发、测试、审查与发布的软件工程技能，默认使用简体中文。",
       "homepage": "https://github.com/49780522/i3-composer-agent",

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "i3-composer-agent",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": "覆盖需求、计划、开发、测试、审查与发布的软件工程技能，默认使用简体中文。",
   "author": {
     "name": "Givolt"

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "i3-composer-agent",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": "覆盖需求、计划、开发、测试、审查与发布的软件工程技能，默认使用简体中文。",
   "author": {
     "name": "Givolt"

package/.gemini/commands/i3-prototype.toml

@@ -18,4 +18,6 @@ Use the i3-ui-prototype skill in the main session for the user's request below.
 $ARGUMENTS
 
 With no arguments use create; explicit analysis or read-only limits take precedence. Preserve the user's scope, manual edits, fixed inputs and approved baselines. Use supporting engineering, framework, design and browser skills as the working skill requires; keep its workflow and evidence requirements there.
+
+For a managed Buddy implementation, execute the Skill's printed absolute execution-begin command on its own and wait for status=bound before writing UI. Follow immediate recovery feedback and retry the blocked operation; an outer tool success does not override an inner stage failure.
 """

package/README.md

@@ -1,4 +1,4 @@
-# i3 Composer Agent v2.3.4
+# i3 Composer Agent v2.3.5
 
 **Intelligence. Integration. Innovation.**
 

package/commands/i3-prototype.toml

@@ -18,4 +18,6 @@ Use the i3-ui-prototype skill in the main session for the user's request below.
 $ARGUMENTS
 
 With no arguments use create; explicit analysis or read-only limits take precedence. Preserve the user's scope, manual edits, fixed inputs and approved baselines. Use supporting engineering, framework, design and browser skills as the working skill requires; keep its workflow and evidence requirements there.
+
+For a managed Buddy implementation, execute the Skill's printed absolute execution-begin command on its own and wait for status=bound before writing UI. Follow immediate recovery feedback and retry the blocked operation; an outer tool success does not override an inner stage failure.
 """

package/docs/codebuddy-setup.md

@@ -48,7 +48,7 @@ CodeBuddy 与 WorkBuddy 项目共用 `.codebuddy/`；同版本追加客户端会
 npx @givolt/i3-composer-agent --codebuddy --scope project --yes --prototype-skills uiux,antdv
 ```
 
-值为 none、uiux、antdv 或 uiux,antdv；默认 none。可选工具跟随宿主和项目／全局范围，位于基址下 `tools/i3-prototype/`；旧项目 `.prototype-tools` 保持读取兼容。需要固定本次版本时使用 `npx @givolt/i3-composer-agent@2.3.4`。已安装后可随时单独检测／补装，无需重装 i3：
+值为 none、uiux、antdv 或 uiux,antdv；默认 none。可选工具跟随宿主和项目／全局范围，位于基址下 `tools/i3-prototype/`；旧项目 `.prototype-tools` 保持读取兼容。需要固定本次版本时使用 `npx @givolt/i3-composer-agent@2.3.5`。已安装后可随时单独检测／补装，无需重装 i3：
 
 ```bash
 node .codebuddy/skills/i3-ui-prototype/scripts/prototype-dependencies.cjs check --host codebuddy --scope project --project .

package/docs/codex-setup.md

@@ -37,6 +37,6 @@ Codex 已有原生技能路由，勿把元技能全文预加载为常驻上下
 
 ## 可选原型工具
 
-原型辅助工具位于本宿主基址的 `tools/i3-prototype/`，支持项目和全局范围；旧项目 `.prototype-tools` 继续读取兼容。项目安装可使用 `npx @givolt/i3-composer-agent@2.3.4 --codex --scope project --yes --prototype-skills uiux,antdv`；全局安装将 scope 改为 global。可选依赖默认 none，后续也可使用已安装 Skill 的 prototype-dependencies.cjs 单独检测／补装。完整用法见原型 Skill 的 references/optional-skills.md。
+原型辅助工具位于本宿主基址的 `tools/i3-prototype/`，支持项目和全局范围；旧项目 `.prototype-tools` 继续读取兼容。项目安装可使用 `npx @givolt/i3-composer-agent@2.3.5 --codex --scope project --yes --prototype-skills uiux,antdv`；全局安装将 scope 改为 global。可选依赖默认 none，后续也可使用已安装 Skill 的 prototype-dependencies.cjs 单独检测／补装。完整用法见原型 Skill 的 references/optional-skills.md。
 
 原型共享资料统一在项目 prototypes/：新索引 prototypes/index.json，准备范围 prototypes/.preparation/<id>/scope.json。新原生 scope.moduleIds 自动生成 appliesTo；旧索引、输入和实例保持兼容，安装升级不自动迁移。工具及运行缓存使用所选宿主基址；全局浏览器缓存按业务项目身份隔离。详细规则和只读查询／显式迁移命令见 i3-ui-prototype/references/project-layout.md。

package/docs/other-hosts.md

@@ -6,7 +6,7 @@
 
 ## 使用本地分发目录
 
-以下命令使用完整分发包解压目录里的 CLI，适用于本地测试和离线接入。`/absolute/path/to/package` 均替换为实际解压目录；已发布版本也可使用 `npx @givolt/i3-composer-agent@2.3.4` 的对应入口。
+以下命令使用完整分发包解压目录里的 CLI，适用于本地测试和离线接入。`/absolute/path/to/package` 均替换为实际解压目录；已发布版本也可使用 `npx @givolt/i3-composer-agent@2.3.5` 的对应入口。
 
 ### fx
 

package/docs/workbuddy-setup.md

@@ -85,7 +85,7 @@ npx @givolt/i3-composer-agent --workbuddy --scope global --yes --force
 
 ## 可选原型工具
 
-原型辅助工具位于本宿主基址的 `tools/i3-prototype/`，支持项目和全局范围；旧项目 `.prototype-tools` 继续读取兼容。推荐使用 `npx @givolt/i3-composer-agent@2.3.4 --workbuddy --scope global --yes --prototype-skills uiux,antdv`；项目安装将 scope 改为 project。可选依赖默认 none，后续也可使用已安装 Skill 的 prototype-dependencies.cjs 单独检测／补装。完整用法见原型 Skill 的 references/optional-skills.md。
+原型辅助工具位于本宿主基址的 `tools/i3-prototype/`，支持项目和全局范围；旧项目 `.prototype-tools` 继续读取兼容。推荐使用 `npx @givolt/i3-composer-agent@2.3.5 --workbuddy --scope global --yes --prototype-skills uiux,antdv`；项目安装将 scope 改为 project。可选依赖默认 none，后续也可使用已安装 Skill 的 prototype-dependencies.cjs 单独检测／补装。完整用法见原型 Skill 的 references/optional-skills.md。
 
 原型共享资料统一在项目 prototypes/：新索引 prototypes/index.json，准备范围 prototypes/.preparation/<id>/scope.json。新原生 scope.moduleIds 自动生成 appliesTo；旧索引、输入和实例保持兼容，安装升级不自动迁移。工具及运行缓存使用所选宿主基址；全局浏览器缓存按业务项目身份隔离。详细规则和只读查询／显式迁移命令见 i3-ui-prototype/references/project-layout.md。
 

package/package.json

@@ -195,6 +195,7 @@
     "scripts/run-evals.js",
     "scripts/run-regressions.js",
     "scripts/template-adapter-test.js",
+    "scripts/ui-prototype-binding-recovery-test.js",
     "scripts/ui-prototype-buddy-lifecycle-test.js",
     "scripts/ui-prototype-codebuddy-hook-test.js",
     "scripts/ui-prototype-content-test.js",
@@ -415,6 +416,7 @@
       "scripts/run-evals.js",
       "scripts/run-regressions.js",
       "scripts/template-adapter-test.js",
+      "scripts/ui-prototype-binding-recovery-test.js",
       "scripts/ui-prototype-buddy-lifecycle-test.js",
       "scripts/ui-prototype-codebuddy-hook-test.js",
       "scripts/ui-prototype-content-test.js",
@@ -442,7 +444,7 @@
       "scripts/validate-versions.js"
     ]
   },
-  "version": "2.3.4",
+  "version": "2.3.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/49780522/i3-composer-agent.git"

package/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "i3-composer-agent",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": "覆盖需求、计划、开发、测试、审查与发布的软件工程技能，默认使用简体中文。",
   "homepage": "https://github.com/49780522/i3-composer-agent",
   "repository": "https://github.com/49780522/i3-composer-agent"

package/scripts/ui-prototype-binding-recovery-test.js

@@ -0,0 +1,84 @@
+'use strict';
+// Regression cases reduced from a real IDE failure; no native host is installed.
+const test=require('node:test'),assert=require('node:assert/strict'),fs=require('node:fs'),path=require('node:path'),os=require('node:os'),cp=require('node:child_process');
+const installed=path.join(__dirname,'lib/installation.js');
+const scripts=path.join(fs.existsSync(installed)?require(installed).loadInstallation().skillsDirectory:path.resolve(__dirname,'../skills'),'i3-ui-prototype/scripts');
+const E=require(path.join(scripts,'execution-evidence.cjs')),H=require(path.join(scripts,'codebuddy-hook.cjs')),N=require(path.join(scripts,'native-command.cjs')),R=require(path.join(scripts,'execution-recovery.cjs'));
+const raw=rows=>rows.map(row=>JSON.stringify(row)).join('\n')+'\n';
+for(const flat of [false,true])test(`raw ${flat?'flat':'paired'} use_skill is a real Skill without accepting Read or forged names`,()=>{
+ const rows=flat?[
+  {type:'function_call',callId:'front',name:'use_skill',arguments:'{"command":"i3-frontend-ui-engineering"}',sessionId:'s1'},
+  {type:'function_call_result',callId:'front',name:'Skill',status:'completed',output:'Frontend instructions',sessionId:'s1'}
+ ]:[
+  {type:'assistant',sessionId:'s1',message:{content:[{type:'tool_use',id:'front',name:'use_skill',input:{command:'i3-frontend-ui-engineering'}}]}},
+  {type:'user',sessionId:'s1',message:{content:[{type:'tool_result',tool_use_id:'front',tool_name:'Skill',content:'Frontend instructions'}]}}
+ ];
+ const calls=E.parse(raw(rows));assert.equal(E.loaded(calls,'frontend').length,1);assert.equal(calls[0].name,'Skill');assert.equal(calls[0].rawName,'use_skill');
+ assert.equal(H.eventCall({hook_event_name:'PostToolUse',tool_name:'use_skill',tool_use_id:'front',tool_input:calls[0].input},{prompts:[{line:0}],calls}).toolCallId,'front');
+ for(const name of ['Read','use_skill_fake']){
+  const changed=JSON.parse(JSON.stringify(rows));if(flat){changed[0].name=changed[1].name=name;}else{changed[0].message.content[0].name=changed[1].message.content[0].tool_name=name;}
+  assert.equal(E.loaded(E.parse(raw(changed)),'frontend').length,0);
+ }
+ const wrong=JSON.parse(JSON.stringify(rows));if(flat)wrong[1].sessionId='s2';else wrong[1].sessionId='s2';assert.throws(()=>E.parse(raw(wrong)),/session/);
+});
+test('native execute_command success cannot hide a failed stage inside result or stdout',()=>{
+ for(const result of [
+  {type:'execute_command_result',exitCode:1,stdout:'failed'},
+  {type:'execute_command_result',exitCode:0,stdout:'{"status":"failed","errors":["No native Hook task binding"]}\r\n\r\n'},
+  {type:'execute_command_result',exitCode:0,stdout:'Error: unavailable'},
+  {status:'failed',errors:['native stage failed']}
+ ])assert.equal(E.successful({content:{status:'success',success:true,result}}),false);
+ assert.equal(E.successful({content:{status:'success',success:true,result:{type:'execute_command_result',exitCode:0,stdout:'{"status":"bound","runId":"r1"}'}}}),true);
+ assert.equal(E.successful({content:{result:{status:'failed'},observedApplicationState:true}}),true,'A browser observation of an error is not a failed tool');
+});
+test('frontend already loaded leaves only execution-begin missing until the native begin actually succeeds',()=>{
+ const directory='/work/prototypes/a',binding={entryLine:1,contextLine:0,sessionId:'s1',runId:'r1',directory,project:'/work'};
+ const source={prompts:[{line:1,text:'实现原型'}],contextLine:0,calls:[{skill:'frontend',success:true,sessionId:'s1',requestLine:2,resultLine:3}]};
+ const input={event:'PreToolUse',source,binding,tool:'Write',input:{file_path:directory+'/app/src/A.vue'},directory,cwd:'/work'};
+ let answer=H.decision(input);assert.equal(answer.deny,true);assert.deepEqual(answer.missing,['execution-begin']);assert.doesNotMatch(answer.reason,/调用 i3-frontend/);
+ const command=`node /skills/native-pilot.cjs execution-begin '${directory}'`;
+ const begin={toolCallId:'begin',name:'Bash',input:{command},cwd:'/work',success:false,sessionId:'s1',result:{status:'bound',runId:'r1',sessionId:'s1',directory},requestLine:4,resultLine:5};source.calls.push(begin);
+ assert.equal(H.decision(input).deny,true);begin.success=true;assert.equal(H.decision(input).continue,true);
+ begin.result={...begin.result,runId:'another-run'};assert.equal(H.decision(input).deny,true);begin.result.runId='r1';
+ begin.result.status='success';assert.equal(H.decision(input).deny,true);begin.result.status='bound';
+ source.stableThroughLine=4;assert.equal(H.decision(input).deny,true);delete source.stableThroughLine;
+ source.calls.push({...begin,toolCallId:'failed-rebind',requestLine:6,resultLine:7,success:false});assert.equal(H.decision(input).deny,true,'A failed rebind must not inherit old success');
+});
+test('binding recovery emits one absolute quoted command that the strict parser recognizes',()=>{
+ const directory="/work with spaces/prototypes/customer's demo";
+ const command=N.beginCommand(directory);const parsed=N.nativeCommand('Bash',{command},'/unrelated');
+ assert.equal(parsed.operation,'execution-begin');assert.equal(parsed.root,directory);assert.ok(path.isAbsolute(parsed.argv[0]));assert.ok(path.isAbsolute(parsed.argv[1]));
+ assert.match(R.instruction(['execution-begin'],{directory}),new RegExp('execution-begin'));assert.ok(R.instruction(['execution-begin'],{directory}).includes(command));
+ assert.match(R.instruction(['execution-begin'],{directory}),/管道|pipeline/);
+ assert.equal(N.nativeCommand('Bash',{command:`cd /work && ${command} 2>&1 | head -80`},'/work'),null);
+});
+test('unbound CLI execution-begin exits nonzero with an actionable standalone command and creates no proof',t=>{
+ const root=fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(),'i3-unbound-regression-')));t.after(()=>fs.rmSync(root,{recursive:true,force:true}));
+ const result=cp.spawnSync(process.execPath,[path.join(scripts,'native-pilot.cjs'),'execution-begin',root],{encoding:'utf8'});
+ assert.equal(result.status,1);const failure=JSON.parse(result.stderr);assert.equal(failure.status,'failed');assert.match(failure.errors.join(),/No native Hook task binding/);
+ assert.ok(failure.errors.join().includes(N.beginCommand(root)));assert.deepEqual(fs.readdirSync(root),[]);
+});
+test('PostToolUse failures use additionalContext and keep the tool return intact',()=>{
+ const value=require(path.join(scripts,'hosts/codebuddy.cjs')).format({feedback:true,reason:'实际返回失败，请补调'},'PostToolUse');
+ assert.equal(value.output.continue,true);assert.deepEqual(value.output.hookSpecificOutput,{hookEventName:'PostToolUse',additionalContext:'实际返回失败，请补调'});
+ const bound={status:'bound',runId:'r1'};assert.deepEqual(E.resultValue([{type:'text',text:JSON.stringify(bound)}]),bound);
+});
+test('native wrappers preserve actual JSON facts and quoted findings without matching escaped wrapper bytes',()=>{
+ const facts={form:{errors:1},observed:true},wrapped={status:'success',success:true,result:JSON.stringify(facts)};
+ const A=require(path.join(scripts,'execution-assertions.cjs'));
+ assert.equal(A.extract(A.resultData(wrapped),'/form/errors'),1);assert.ok(E.resultText(wrapped).includes('"observed":true'));
+ assert.deepEqual(A.resultData({result:{status:'failed'},observedApplicationState:true}),{result:{status:'failed'},observedApplicationState:true});
+ assert.equal(E.successful({content:{type:'text',text:'{"status":"failed","operation":"execution-begin"}'}}),false);
+});
+test('loading a missing browser Skill cannot let another stage stand in for the denied finalize retry',()=>{
+ const source={prompts:[{line:1,digest:'task',text:'实现原型'}],contextLine:0,calls:[]},index={};
+ const context={source,sessionId:'s1',directory:'/work/prototypes/a',stage:'delivery',event:'PreToolUse',eventKey:'deny-finalize',expectedRetry:{kind:'stage',stage:'delivery',operation:'finalize'}};
+ R.record(index,context,{deny:true,missing:['browser']});
+ source.calls.push({skill:'browser',toolCallId:'actual-browser-load',sessionId:'s1',requestLine:2,resultLine:3,success:true});
+ const failedPrerequisite=R.record(index,{...context,stage:'browser-entry',event:'PostToolUse',eventKey:'failed-review',expectedRetry:{kind:'stage',stage:'browser-entry',operation:'record-devtools-review'}},{feedback:true,missing:['execution-evidence']});
+ assert.equal(failedPrerequisite.recovery.expectedRetry.operation,'finalize');
+ const other=R.record(index,{...context,stage:'browser-entry',resolved:['execution-evidence'],event:'PostToolUse',eventKey:'other-stage-result',retrySucceeded:true,retry:{kind:'stage',stage:'browser-entry',operation:'record-devtools-review',requestLine:4,resultLine:5}},{continue:true});
+ assert.equal(other.recovery.status,'ready-to-retry');
+ const correct=R.record(index,{...context,event:'PostToolUse',eventKey:'finalize-result',retrySucceeded:true,retry:{kind:'stage',stage:'delivery',operation:'finalize',requestLine:6,resultLine:7}},{continue:true});
+ assert.equal(correct.recovery.status,'recovered');
+});

package/scripts/ui-prototype-buddy-lifecycle-test.js

@@ -32,11 +32,11 @@ function fixture(t,host,scope,client){
  function tool(name,input,content='success',action=()=>{}){
   const id=request(name,input),decision=hook('PreToolUse',name,input,id);
   if(decision.deny){result(id,decision.reason,true);return {id,decision};}
-  action();result(id,content);return {id,decision,post:hook('PostToolUse',name,input,id)};
+  action();result(id,typeof content==='function'?content():content);return {id,decision,post:hook('PostToolUse',name,input,id)};
  }
  append({type:'user',message:{content:'实现原型，使用模板模式。Synthetic fixture only.'}});
  tool('Skill',{skill:'i3-ui-prototype'},'Prototype Skill loaded');
- const begin=()=>tool('Bash',{command:`node '${path.join(scripts,'native-pilot.cjs')}' execution-begin '${created.directory}'`},'bound');begin();
+ const begin=()=>tool('Bash',{command:`node '${path.join(scripts,'native-pilot.cjs')}' execution-begin '${created.directory}'`},()=>{const pointer=JSON.parse(fs.readFileSync(path.join(created.directory,'qa/execution-context.json')));return JSON.stringify({status:'bound',runId:pointer.runId,sessionId,directory:created.directory});});begin();
  return {root,project,base,directory:created.directory,append,hook,tool,begin,result,request,read(){const pointer=JSON.parse(fs.readFileSync(path.join(created.directory,'qa/execution-context.json')));const selected=C.select({project,product:client==='CodeBuddyCLI'||!client&&host==='codebuddy'?'cli':'ide',host,home,env:{}});return JSON.parse(fs.readFileSync(path.join(C.sessionDirectory(selected,project,pointer.sessionId),'session.json')));}};
 }
 for(const [host,client] of [['codebuddy','CodeBuddyCLI'],['codebuddy','CodeBuddyIDE'],['workbuddy','WorkBuddy'],['codebuddy',null],['workbuddy',null]])for(const scope of ['project','global'])test(`${host} ${client||'native-flat-log'} ${scope}: deny, correlate successful Skills, retry and retain budget`,t=>{
@@ -62,6 +62,14 @@ test('Stop asks for missing Skills twice, then reports blocked without an endles
  f.append({type:'user',message:{content:'先分析，不改代码'}});
  const answer=f.tool('Write',{file_path:path.join(f.directory,'app/src/NoWrite.vue'),content:'no'});assert.equal(answer.decision.deny,true);assert.match(answer.decision.reason,/read-only/);
 });
+test('exhausted recovery cannot silently reopen writes after late Skill loads in the same human task',t=>{
+ const f=fixture(t,'codebuddy','project','CodeBuddyCLI');
+ for(let n=0;n<3;n++){f.append({type:'assistant',message:{content:'已完成，可以交付 '+n}});f.hook('Stop');}
+ f.tool('Skill',{skill:'i3-frontend-ui-engineering'});f.tool('Skill',{skill:'antdv'});
+ const file=path.join(f.directory,'app/src/AfterBudget.vue');
+ const answer=f.tool('Write',{file_path:file,content:'no'},'written',()=>fs.writeFileSync(file,'no'));
+ assert.equal(answer.decision.deny,true);assert.equal(fs.existsSync(file),false);assert.equal(f.read().bindings[f.directory].recovery.status,'blocked');
+});
 test('a duplicated native callback does not spend recovery budget when the transcript grows',t=>{
  const f=fixture(t,'workbuddy','project',null),input={file_path:path.join(f.directory,'app/src/Duplicate.vue'),content:'fixture'};
  const id=f.request('Write',input);assert.equal(f.hook('PreToolUse','Write',input,id).deny,true);

package/scripts/ui-prototype-codebuddy-hook-test.js

@@ -8,10 +8,10 @@ test('native command parsing handles quoted paths without evaluating shell subst
  for(const command of ['node x; node native-pilot.cjs finalize /x','$(steal) native-pilot.cjs build /x','node x | node native-pilot.cjs finalize /x'])assert.equal(H.nativeCommand('Bash',{command},'/work'),null);
 });
 test('before UI write requires a successful frontend Skill in the same live context and task',()=>{
- const source={prompts:[{line:1,text:'create prototype'}],calls:[],contextLine:0},binding={entryLine:1,contextLine:0,sessionId:'s1'};
+ const source={prompts:[{line:1,text:'create prototype'}],calls:[],contextLine:0},binding={entryLine:1,contextLine:0,sessionId:'s1',runId:'r1',directory:'/work/prototypes/p',project:'/work'};
  const input={event:'PreToolUse',source,binding,tool:'Write',input:{file_path:'/work/prototypes/p/app/src/A.vue'},directory:'/work/prototypes/p'};
  assert.equal(H.decision(input).deny,true);
- source.calls=[{skill:'frontend',sessionId:'s1',requestLine:2,resultLine:3,success:true}];assert.equal(H.decision(input).continue,true);
+ source.calls=[{skill:'frontend',sessionId:'s1',requestLine:2,resultLine:3,success:true},{name:'Bash',input:{command:'node /skills/native-pilot.cjs execution-begin /work/prototypes/p'},sessionId:'s1',result:{status:'bound',runId:'r1',sessionId:'s1',directory:binding.directory},requestLine:4,resultLine:5,success:true}];assert.equal(H.decision(input).continue,true);
  source.contextLine=4;assert.equal(H.decision(input).deny,true);
 });
 test('analysis overrides old tasks and Stop feedback is bounded without granting tool permissions',()=>{

package/scripts/ui-prototype-execution-gates-test.js

@@ -12,17 +12,18 @@ test('native UI writes resolve relative paths from the actual tool cwd',()=>{
 });
 function fixture() {
  const file='/work/prototypes/orders/app/src/Orders.vue',bytes='<Table />';
- const call=(toolCallId,name,input,result,line,skill)=>({toolCallId,name,input,result,requestLine:line,resultLine:line+1,success:true,resultDigest:E.sha(result),sessionId:'s1',contextLine:0,skill});
+ const call=(toolCallId,name,input,result,line,skill)=>({toolCallId,name,input,result,requestLine:line+2,resultLine:line+3,success:true,resultDigest:E.sha(result),sessionId:'s1',contextLine:0,skill});
  const calls=[call('front','Skill',{},'frontend instructions',3,'frontend'),call('ant','Skill',{},'antdv instructions',5,'antdv'),call('query','Bash',{command:'antdv info Table'},'Table API: rowSelection',7),call('version','Read',{file_path:'/work/app/node_modules/antdv-next/package.json'},'{"version":"1.5.3"}',9),call('write','Write',{file_path:file},'saved',11)];
  const policy=P.create({mode:'template'}),current={digest:'candidate',inputDigest:'input',revision:'r001'};
  const binding={schemaVersion:1,runId:'r1',sessionId:'s1',projectKey:'p1',directory:'/work/prototypes/orders',instanceId:'instance',policyDigest:policy.digest,inputDigest:'input',entryLine:1};
+ calls.push(call('begin','Bash',{command:'node /skills/native-pilot.cjs execution-begin /work/prototypes/orders'},JSON.stringify({status:'bound',runId:'r1',sessionId:'s1',directory:binding.directory}),0));
  const proof={schemaVersion:1,runId:'r1',sessionId:'s1',projectKey:'p1',policyDigest:policy.digest,candidateDigest:'candidate',inputDigest:'input',revision:'r001',frontend:{toolCallId:'front',files:[{path:'app/src/Orders.vue',sha256:E.sha(bytes)}],requirementIds:['R1']},official:{skill:{toolCallId:'ant'},version:{toolCallId:'version',quote:'"version":"1.5.3"'},queries:[{component:'Table',toolCallId:'query',quote:'Table API: rowSelection'}]},templateChoice:{quote:'template mode'}};
  return {policy,current,binding,proof,source:{calls,contextLine:0,prompts:[{line:1,text:'generate prototype in template mode',digest:'prompt'}]},scope:{requirements:[{id:'R1'}]},files:{'app/src/Orders.vue':bytes},implementation:{bindings:[{status:'implemented',components:['Table'],files:[{path:'app/src/Orders.vue'}]}]},frameworkVersion:'1.5.3'};
 }
 test('a native frontend load is required before the first actual UI write in both modes',()=>{
  const f=fixture();assert.equal(G.evaluate(f,'implementation').status,'passed');
  f.source.calls[0].success=false;assert.equal(G.evaluate(f,'implementation').status,'failed');
- f.source.calls[0].success=true;f.source.calls[0].resultLine=12;assert.match(G.evaluate(f,'implementation').errors.join(),/before/);
+ f.source.calls[0].success=true;f.source.calls[0].resultLine=14;assert.match(G.evaluate(f,'implementation').errors.join(),/before/);
 });
 test('IDE relative write evidence uses its bound workspace while legacy evidence keeps its contract',()=>{
  const f=fixture();f.source.format='codebuddy-ide-index-v1';f.binding.project='/work';f.source.calls.find(c=>c.name==='Write').input.file_path='prototypes/orders/app/src/Orders.vue';
@@ -40,7 +41,7 @@ test('new WorkBuddy implementation uses the shared design gate and rechecks reco
  const f=fixture();f.policy=P.create({id:P.AUTO_ID,host:'workbuddy',mode:'template'});
  Object.assign(f.binding,{host:'workbuddy',identitySource:'native-client',policyDigest:f.policy.digest});f.proof.policyDigest=f.policy.digest;
  assert.equal(G.evaluate(f,'implementation').status,'passed');
- f.binding.recovery={status:'recovered',invocations:[{skill:'frontend',toolCallId:'front',resultDigest:f.source.calls[0].resultDigest,requestLine:3,resultLine:4,feedbackLine:1}],retry:{toolCallId:'write'}};
+ f.binding.recovery={status:'recovered',invocations:[{skill:'frontend',toolCallId:'front',resultDigest:f.source.calls[0].resultDigest,requestLine:5,resultLine:6,feedbackLine:1}],retry:{toolCallId:'write'}};
  assert.equal(G.evaluate(f,'implementation').status,'passed');
  f.binding.recovery.retry.toolCallId='invented';assert.equal(G.evaluate(f,'implementation').status,'failed');
  delete f.binding.recovery;f.source.calls.find(call=>call.skill==='antdv').success=false;

package/skills/i3-ui-prototype/SKILL.md

@@ -63,6 +63,8 @@ CodeBuddy 新建原型采用 A＋B 执行合同，实际接口见 [execution-evi
 
 CodeBuddy／WorkBuddy 新 create 前，用 `native-pilot.cjs execution-assertions-template --scope <scope-file>` 取得完整场景，按本次 PRD 与能力参数填充每项预期 JSON 事实，存于该原型 `.preparation` 目录。create 增加 `--host <codebuddy|workbuddy> --execution-policy buddy-ab-v2 --execution-assertions <assertions-file>`；官方 Skill 真实不可用时才显式 `--official-source-fallback`，保留其失败调用定位。随后在实际所选宿主主会话执行 `execution-begin <prototype-root>`，以原生 Skill 工具加载当前上下文需要的前端 Skill 后再写业务界面。旧 codebuddy-ab-v1 及未采用 executionPolicy 的实例保留原合同。其他宿主尚未适配此 Hook 合同，按原流程披露调用核验边界。
 
+新建后及恢复实施时，从 `state` 的 `commands.executionBegin.shell` 取得绝对路径命令，在该宿主主会话的 Shell 工具中独立执行；也可原样执行门禁反馈给出的命令。不得拼接 `cd &&`、管道、重定向或 `head`；这些组合不能建立原生任务绑定。等待进程退出码为 0 且内层结果 `status=bound`，再进行业务写入。外层 `success:true` 仅表示工具返回，内层 `status=failed`／非零退出仍是失败；失败后立即按反馈补做绑定或 Skill 调用，再重试原操作。任务／上下文变化重新绑定，失败或未完成的 begin 不能继承旧成功；绑定由真实 PreToolUse 创建，CLI 不补造绑定或成功记录。
+
 `execution-template <prototype-root>` 返回当前身份与已观察到的真实加载引用；以实际查询、实现复核及浏览器结果补齐 `qa/execution-evidence.json`，不能补造调用 ID。构建、record-run、record-devtools-review、finalize 与 `execution-check --stage <stage>` 共用 A；B 在可识别的写入前检查，反馈明确 Skill 名与下一动作，成功补调后重试；Stop 按同缺项两次、当前原生任务总计六次的预算继续纠正，到上限如实报告阻塞，反复 begin 不清零。只读分析、进度、阻塞及用户停止可正常结束。未通过门禁时交付候选和缺项；新收据的 `native-source-correlated` 不代表不可篡改认证或用户认可。
 
 ### 2. 完整内容模板与需求能力

package/skills/i3-ui-prototype/references/execution-evidence.md

@@ -44,6 +44,10 @@ node <skill-root>/scripts/native-pilot.cjs execution-assertions-template --scope
 
 通过自然语言／using 选到工作 Skill，或实际 `/i3-prototype` 快捷入口后，新实例执行 `execution-begin <prototype-root>`。B 回查原生用户请求和工作 Skill／快捷命令，绑定规范化 projectKey、sessionId、runId、实例、输入、模式、策略与注册。只读或停止请求不能启动写任务。新会话／新请求／压缩后的上下文在恢复实施前重新 begin 并加载适用 Skill；用户手改保留。初建骨架不等于实际实施。
 
+使用 `state` 中的 `commands.executionBegin.shell` 或拒绝反馈中的绝对路径命令，作为一次独立 Shell 调用；不加 `cd &&`、管道、重定向或 `head`。严格解析器不解释组合 Shell。成功须同时满足进程退出 0 和内层 `status=bound`；外层 `status=success`／`success:true` 不足以证明阶段成功。缺绑定、任务切换、上下文变化或输入变化时重新执行，不能由 CLI 自行写入原生绑定；A 和写入门禁回查当前任务最新一次 begin 的成功结果，失败／待返回不可复用旧成功。
+
+原始工具名 `use_skill`／`skill` 与 `Skill` 通过同一有限别名表识别；IDE 历史转换和原始 JSONL 采用相同规则。保留原始请求／结果摘要、调用 ID、会话与时序校验，普通 Read、未知近似名称仍不算 Skill。原生 execute_command 的内层非零退出、错误结果或 stdout 中完整 JSON `status=failed` 都按失败处理；不会把浏览器返回的任意业务 `result.status` 当成工具错误。
+
 `execution-template <prototype-root>` 只读返回当前证据骨架和已经成功返回的 Skill 引用；保存并填入 `qa/execution-evidence.json`。字段语义：
 
 - 固定身份：schemaVersion=1、runId、sessionId、projectKey、policyDigest、inputDigest、candidateDigest、revision，须与当前绑定一致。
@@ -74,6 +78,8 @@ B 的 PreToolUse 只拒绝可识别的缺前置 UI 写入或明确阶段命令
 
 B 拒绝后主会话立即补调，等待成功返回，再重试被拒操作；普通 Read 或另开会话不算本主会话 Skill 调用。缺项、反馈事件、后续成功 toolCallId/resultDigest 及重试结果在宿主会话状态落盘。required → ready-to-retry → recovered 分别表示缺项、已可重试、观察到成功重试；recovered 不表示业务验收通过。A 再回查补调及重试的原生引用和时序。
 
+PostToolUse 观察到已落盘的 begin／阶段失败时，通过该事件的 additionalContext 返回补调指令并保留 required；Stop 才使用停止反馈协议。IDE 尚未持久化当前结果时继续等待后续原生来源核验，不制造成功。实际 Skill 已成功但缺绑定时只提示 execution-begin；补调成功不直接记 recovered，仍须观察原操作的成功重试。
+
 重试按 kind 区分 ui-write 和 stage；阶段重试绑定实际 operation、stage 与同一原型目录。两类新记录都以 feedbackLine 核对请求发生在反馈之后，旧成功回调不能恢复后续拒绝；旧无 kind 的记录继续仅按页面写入合同核验。
 
 默认同一缺项两次、单原生任务总计六次，重复回调不增加预算，反复 begin 和内部 providerData.isMeta 的 Hook 消息不重置任务。达到上限时保持受管操作拒绝，允许真实 blocked 报告正常结束；不无限驱动 Stop。用户只读／暂停优先。入口、Skill 发现、加载成功、CLI 查询、重试成功、交付和用户认可分开记录。

package/skills/i3-ui-prototype/scripts/codebuddy-context.cjs

@@ -1,7 +1,7 @@
 'use strict';
 const fs=require('node:fs'),path=require('node:path'),os=require('node:os'),assert=require('node:assert/strict');
 const R=require('./codebuddy-registration.cjs'),E=require('./execution-evidence.cjs'),H=require('./buddy-host.cjs');
-const FILES=['native-command.cjs','buddy-host.cjs','execution-recovery.cjs','execution-policy.cjs','execution-evidence.cjs','codebuddy-ide-source.cjs','execution-gates.cjs','execution-assertions.cjs','execution-runtime.cjs','codebuddy-context.cjs','codebuddy-registration.cjs','codebuddy-hook.cjs','prototype-hooks.cjs','hosts/codebuddy.cjs','native-pilot.cjs','native-pilot-lib.cjs','native-delivery.cjs','native-devtools.cjs','native-files.cjs','native-build.cjs'];
+const FILES=['native-tool-name.cjs','native-command.cjs','buddy-host.cjs','execution-recovery.cjs','execution-policy.cjs','execution-evidence.cjs','codebuddy-ide-source.cjs','execution-gates.cjs','execution-assertions.cjs','execution-runtime.cjs','codebuddy-context.cjs','codebuddy-registration.cjs','codebuddy-hook.cjs','prototype-hooks.cjs','hosts/codebuddy.cjs','native-pilot.cjs','native-pilot-lib.cjs','native-delivery.cjs','native-devtools.cjs','native-files.cjs','native-build.cjs'];
 const read=file=>R.fileIO.read(file);
 function scriptsForEntry(scriptPath) {
  if(path.basename(scriptPath)!=='i3-prototype.cjs')return path.dirname(path.dirname(scriptPath));

package/skills/i3-ui-prototype/scripts/codebuddy-hook.cjs

@@ -4,13 +4,14 @@ const F=require('./native-files.cjs'),C=require('./codebuddy-context.cjs'),E=req
 const X=require('./execution-runtime.cjs');
 const H=require('./buddy-host.cjs');
 const Recovery=require('./execution-recovery.cjs');
-const {tokens,nativeCommand,stageFor}=require('./native-command.cjs');
+const {tokens,nativeCommand,stageFor,completedBegin}=require('./native-command.cjs');
+const {toolName}=require('./native-tool-name.cjs');
 function eventCall(payload,source) {
  const callId=payload.tool_use_id||payload.call_id;
  const canonical=value=>Array.isArray(value)?value.map(canonical):value&&typeof value==='object'?Object.fromEntries(Object.keys(value).sort().map(k=>[k,canonical(value[k])])):value;
  const partial=(before,after)=>typeof before==='string'?typeof after==='string'&&after.startsWith(before):Array.isArray(before)?Array.isArray(after)&&before.length<=after.length&&before.every((value,i)=>partial(value,after[i])):before&&typeof before==='object'?after&&typeof after==='object'&&Object.keys(before).every(key=>Object.hasOwn(after,key)&&partial(before[key],after[key])):before===after;
  const matches=source.calls.filter(call=>{
-  if(call.name!==payload.tool_name||call.requestLine<source.prompts.at(-1).line||callId&&call.toolCallId!==callId)return false;
+  if(call.name!==toolName(payload.tool_name)||call.requestLine<source.prompts.at(-1).line||callId&&call.toolCallId!==callId)return false;
   if(source.format==='codebuddy-ide-index-v1'&&payload.generation_id&&call.nativeRequestId!==payload.generation_id)return false;
   if(JSON.stringify(canonical(call.input))===JSON.stringify(canonical(payload.tool_input||{})))return true;
   // IDE 4.12 streams incomplete args to disk before PreToolUse. Correlate its
@@ -35,7 +36,7 @@ function eventSource(payload,record,project,{readSource=C.source,pause=milliseco
     if(source.format==='codebuddy-ide-index-v1'&&record.product==='ide'&&H.isIDE(payload)) {
      const latest=source.prompts.at(-1);
      assert.ok(typeof payload.generation_id==='string'&&latest?.nativeRequestId===payload.generation_id,'IDE callback differs from the current native task generation');
-     const pending=source.calls.filter(call=>!call.resultLine&&call.requestLine>latest.line&&call.nativeRequestId===payload.generation_id&&call.name===payload.tool_name);
+     const pending=source.calls.filter(call=>!call.resultLine&&call.requestLine>latest.line&&call.nativeRequestId===payload.generation_id&&call.name===toolName(payload.tool_name));
      if(pending.length) {eventCall(payload,source);nativeRequestStatus='pending-native-request';}
      else nativeRequestStatus='deferred-until-native-persistence';
     }else {eventCall(payload,source);nativeRequestStatus='matched-native-request';}
@@ -48,13 +49,13 @@ function decision({event,source,binding,tool,input,directory,cwd,deliveryCurrent
  if(C.readOnly(source.prompts.at(-1)?.text||''))return {continue:true,reason:'latest-user-read-only'};
  if(event==='PreToolUse'&&G.uiWrite({name:tool,input:input||{},cwd},directory)) {
   const missing=Recovery.missing({source,binding,policy});
-  if(missing.length)return {deny:true,missing,reason:'原型 UI 写入已被阻止。'+Recovery.instruction(missing)};
+  if(missing.length)return {deny:true,missing,reason:'原型 UI 写入已被阻止。'+Recovery.instruction(missing,{directory})};
  }
  const final=source.latestAssistant||'',claim=/(?:已完成|已经完成|全部通过|可以交付|\b(?:completed|ready for review|all checks passed)\b)/i.test(final)&&!/(?:未完成|尚未|待验证|阻塞|等待|进度|blocked|awaiting|not complete|in progress)/i.test(final);
  const blocked=/(?:\bblocked\b|无法继续|当前阻塞|等待用户|等待授权)/i.test(final);
  if(event==='Stop'&&binding&&!deliveryCurrent&&!blocked&&(policy?.id===P.AUTO_ID||!stopHookActive)&&claim){
   const missing=Recovery.missing({source,binding,policy,stage:'delivery'});if(!missing.length)missing.push('execution-evidence');
-  return {feedback:true,missing,reason:'当前原型没有有效交付回执。'+Recovery.instruction(missing)};
+  return {feedback:true,missing,reason:'当前原型没有有效交付回执。'+Recovery.instruction(missing,{directory})};
  }
  return {continue:true};
 }
@@ -81,6 +82,7 @@ function toolCwd(payload,record,project) {
  return record.product==='ide'&&H.isIDE(payload)&&payload.cwd==='/'?project:payload.cwd||project;
 }
 function handle(payload,options) {
+ payload={...payload,tool_name:toolName(payload.tool_name)};
  assert.equal(payload.hook_event_name,options.event,'Hook event mismatch');
  if(options.event==='SessionStart')return {continue:true};
  if(options.event==='UserPromptSubmit'){
@@ -132,8 +134,10 @@ function handle(payload,options) {
  const recoveryContext=target=>{
   const stagePassed=stage&&options.event!=='Stop'&&X.check(target,stage,require('./native-pilot-lib.cjs')).status==='passed';
   const retryCall=options.event==='PostToolUse'&&callbackCall?.success&&(stagePassed||G.uiWrite({...callbackCall,cwd:callbackCall.cwd||cwd},target))?callbackCall:null;
-  return {source,sessionId:payload.session_id,directory:target,event:options.event,eventKey,stage,policy:X.policy(target),resolved:[...(existing?['execution-begin']:[]),...(stagePassed?['execution-evidence']:[])],retrySucceeded:!!retryCall,
-   ...(retryCall?{retry:{toolCallId:retryCall.toolCallId,resultDigest:retryCall.resultDigest,requestLine:retryCall.requestLine,resultLine:retryCall.resultLine,...(stagePassed?{kind:'stage',stage,operation:command.operation}:{kind:'ui-write'})}}:{})};
+  const input=payload.tool_input||{},uiFile=input.file_path||input.filePath||input.path||input.TargetFile;
+  const expectedRetry=stage?{kind:'stage',stage,operation:options.event==='Stop'?'finalize':command.operation}:G.uiWrite({name:payload.tool_name,input,cwd},target)?{kind:'ui-write',file:path.resolve(cwd,uiFile)}:null;
+  return {source,sessionId:payload.session_id,directory:target,event:options.event,eventKey,stage,expectedRetry,policy:X.policy(target),resolved:[...(completedBegin(source,existing)?['execution-begin']:[]),...(stagePassed?['execution-evidence']:[])],retrySucceeded:!!retryCall,
+   ...(retryCall?{retry:{toolCallId:retryCall.toolCallId,resultDigest:retryCall.resultDigest,requestLine:retryCall.requestLine,resultLine:retryCall.resultLine,...(stagePassed?{kind:'stage',stage,operation:command.operation}:{kind:'ui-write',file:path.resolve(cwd,uiFile)})}}:{})};
  };
  const respond=answer=>{
   const lock=path.join(stateDirectory,'.audit.lock');fs.mkdirSync(stateDirectory,{recursive:true});
@@ -163,15 +167,26 @@ function handle(payload,options) {
  if(directory&&fs.existsSync(path.join(directory,'prototype.json'))&&X.policy(directory)) {
   const fixed=X.policy(directory),answer=decision({event:options.event,source,binding:existing,tool:payload.tool_name,input:payload.tool_input,directory,cwd,policy:fixed});
   if(answer.deny)return respond(answer);
+  if(options.event==='PostToolUse'&&command&&(command.operation==='execution-begin'||stage)){
+   // IDE may not have persisted a callback's result yet. Only observed native
+   // failures produce recovery feedback; outer tool success is insufficient.
+   if(callbackCall?.resultLine&&!callbackCall.success){
+    const missing=command.operation==='execution-begin'?['execution-begin']:['execution-evidence'];
+    return respond({feedback:true,missing,reason:`原型 ${command.operation} 实际返回失败，阶段尚未通过。`+Recovery.instruction(missing,{directory})});
+   }
+   if(command.operation==='execution-begin')return respond({continue:true});
+  }
   if(options.event==='PreToolUse'&&command&&['build','record-run','record-devtools-review','finalize'].includes(command.operation)){
-   if(!existing)return respond({deny:true,missing:['execution-begin'],reason:Recovery.instruction(['execution-begin'])});
+   if(!completedBegin(source,existing))return respond({deny:true,missing:['execution-begin'],reason:Recovery.instruction(['execution-begin'],{directory})});
    const checked=X.check(directory,stage,require('./native-pilot-lib.cjs'));
    if(checked.status==='failed'){
     const missing=Recovery.missing({source,binding:existing,policy:fixed,stage});if(!missing.length)missing.push('execution-evidence');
-    return respond({deny:true,missing,reason:Recovery.instruction(missing)+' '+checked.errors.join('; ')});
+    return respond({deny:true,missing,reason:Recovery.instruction(missing,{directory})+' '+checked.errors.join('; ')});
    }
   }
-  if(G.uiWrite({name:payload.tool_name,input:payload.tool_input||{},cwd},directory)||stage&&['PreToolUse','PostToolUse'].includes(options.event))respond({continue:true});
+  if(G.uiWrite({name:payload.tool_name,input:payload.tool_input||{},cwd},directory)||stage&&['PreToolUse','PostToolUse'].includes(options.event)){
+   const recovery=respond({continue:true});if(recovery.deny||recovery.feedback||recovery.context)return recovery;
+  }
  }
  if(!Object.keys(index.bindings).length)return {continue:true};
  const lock=path.join(stateDirectory,'.audit.lock');fs.mkdirSync(stateDirectory,{recursive:true});

package/skills/i3-ui-prototype/scripts/codebuddy-ide-source.cjs

@@ -3,7 +3,7 @@
 // UUID message files explicitly referenced by that index. No directory scan.
 const fs=require('node:fs'),path=require('node:path'),assert=require('node:assert/strict');
 const ID=/^[a-f0-9]{32}$/;
-const aliases={use_skill:'Skill',execute_command:'Bash',write_to_file:'Write',read_file:'Read',replace_in_file:'Edit'};
+const {toolName}=require('./native-tool-name.cjs');
 function read(file) {
  assert.equal(path.basename(file),'index.json','Expected native IDE index');
  const directory=path.dirname(file),sessionId=path.basename(directory);
@@ -52,13 +52,13 @@ function read(file) {
    if(text)latestAssistant=text;
    for(const block of message.content.filter(b=>b.type==='tool-call')){
     assert.ok(block.args&&typeof block.args==='object'&&!Array.isArray(block.args),'Invalid IDE tool arguments');
-    events.push({...base,type:'assistant',message:{content:[{type:'tool_use',id:block.toolCallId,name:aliases[block.toolName]||block.toolName,input:block.args}]}});
+    events.push({...base,type:'assistant',message:{content:[{type:'tool_use',id:block.toolCallId,name:toolName(block.toolName),input:block.args}]}});
    }
   }else if(row.role==='tool'){
    for(const block of message.content.filter(b=>b.type==='tool-result')){
     const result=block.result,success=!block.isError&&result?.success===true&&result.status==='success';
     events.push({...base,type:'user',message:{content:[{type:'tool_result',tool_use_id:block.toolCallId,
-     tool_name:aliases[block.toolName]||block.toolName,content:result,is_error:!success}]}});
+     tool_name:toolName(block.toolName),content:result,is_error:!success}]}});
    }
   }
  }

package/skills/i3-ui-prototype/scripts/execution-assertions.cjs

@@ -17,7 +17,7 @@ function validate(value,scenarioIds) {
  return value;
 }
 function resultData(result) {
- const text=E.contentText(result).trim();let value;
+ const text=E.resultText(result).trim();let value;
  try{value=JSON.parse(text);}catch{const blocks=[...text.matchAll(/```(?:json)?\s*\n([\s\S]*?)\n```/g)];assert.equal(blocks.length,1,'One actual JSON result or JSON code block required');value=JSON.parse(blocks[0][1]);}
  assert.ok(value&&typeof value==='object','Native JSON fact result required');return value;
 }

package/skills/i3-ui-prototype/scripts/execution-evidence.cjs

@@ -4,6 +4,7 @@ const crypto = require('node:crypto');
 const fs = require('node:fs');
 const path = require('node:path');
 const P = require('./execution-policy.cjs');
+const {toolName}=require('./native-tool-name.cjs');
 const sha = value => crypto.createHash('sha256').update(value).digest('hex');
 function contentText(content) {
   if (typeof content === 'string') return content;
@@ -36,17 +37,47 @@ function nativeEvent(event) {
 function successful(block) {
   if (block.is_error || block.isError || block.success === false || block.error) return false;
   const text = contentText(block.content ?? block.result ?? block.tool_response);
-  if (!text.trim() || /^\s*(?:Error:|Error\b|错误[:：]|Unknown skill\b|Skill[^\n]*not (?:found|available))/i.test(text)) return false;
-  try {
-    const value = JSON.parse(text);
-    if (value && typeof value === 'object') {
-      if (value.isError || value.success === false || value.error || value.status === 'failed') return false;
-      if (typeof value.exitCode === 'number' && value.exitCode !== 0) return false;
-      if (typeof value.stdout === 'string' && /^\s*(?:Error:|Error\b|错误[:：])/i.test(value.stdout)) return false;
+  if (!text.trim()) return false;
+  function failed(value,depth=0) {
+    if(depth>8)return true;
+    if(typeof value==='string'){
+      if(/^\s*(?:Error:|Error\b|错误[:：]|Unknown skill\b|Skill[^\n]*not (?:found|available))/i.test(value))return true;
+      try{return failed(JSON.parse(value),depth+1);}catch{return false;}
     }
-  } catch { /* Native tool text need not be JSON. */ }
-  return true;
+    if(!value||typeof value!=='object')return false;
+    if(value.type==='text')return failed(value.text,depth+1);
+    if(value.isError||value.is_error||value.success===false||value.error||['failed','error','cancelled'].includes(value.status))return true;
+    if(typeof value.exitCode==='number'&&value.exitCode!==0)return true;
+    if(typeof value.stdout==='string'&&failed(value.stdout,depth+1))return true;
+    // Only descend through native execution envelopes, not arbitrary observed
+    // application data such as {result:{status:'failed'}} from a browser check.
+    const envelope=typeof value.success==='boolean'||['success','error'].includes(value.status)||value.type==='execute_command_result';
+    return !!(envelope&&value.result!==undefined&&failed(value.result,depth+1));
+  }
+  return !failed(text);
+}
+function resultContent(content){
+  let value=content;
+  for(let depth=0;depth<8;depth++){
+    if(typeof value==='string'){
+      try{const parsed=JSON.parse(value);if(parsed&&typeof parsed==='object'&&(parsed.type==='text'||parsed.type==='execute_command_result'||typeof parsed.success==='boolean')){value=parsed;continue;}}catch{/* Plain text and fenced MCP facts remain text. */}
+      return value;
+    }
+    if(Array.isArray(value)){value=contentText(value);continue;}
+    if(value?.type==='text'){value=value.text;continue;}
+    if(!value||typeof value!=='object')return value;
+    if((typeof value.success==='boolean'||['success','error'].includes(value.status)||value.type==='execute_command_result')&&value.result!==undefined){value=value.result;continue;}
+    if(typeof value.stdout==='string'){value=value.stdout;continue;}
+    return value;
+  }
+  return null;
+}
+function resultValue(content){
+  const value=resultContent(content);
+  if(typeof value==='string'){try{return JSON.parse(value);}catch{return null;}}
+  return value;
 }
+const resultText=content=>contentText(resultContent(content));
 function parse(text) {
   assert.ok(typeof text === 'string' && Buffer.byteLength(text) <= 64 * 1024 * 1024, 'Native transcript is too large');
   const calls = [], requests = new Map(); let nativeMessages = 0, contextLine = 0, promptLine = 0;
@@ -65,16 +96,16 @@ function parse(text) {
       if (event.type === 'assistant' && block.type === 'tool_use') {
         assert.ok(typeof block.id === 'string' && block.id && typeof block.name === 'string', 'Native request identity missing');
         assert.ok(!requests.has(block.id), 'Duplicate native tool call ID');
-        const input = block.input || {}, skillName = ['Skill', 'skill'].includes(block.name) ? input.skill || input.name || input.command : null;
+        const name=toolName(block.name),input = block.input || {}, skillName = name==='Skill' ? input.skill || input.name || input.command : null;
         const normalized = typeof skillName === 'string' ? skillName.replace(/^i3-composer-agent:/, '') : null;
-        const call = { toolCallId: block.id, name: block.name, input, skillName: normalized, skill: P.skillKey(normalized),
+        const call = { toolCallId: block.id, name, ...(name!==block.name?{rawName:block.name}:{}), input, skillName: normalized, skill: P.skillKey(normalized),
           sessionId:event.sessionId||event.session_id||null, cwd:event.cwd||null, nativeRequestId:event.nativeRequestId||null, contextLine, promptLine,
           requestLine: lineIndex + 1, requestDigest: sha(JSON.stringify(block)), success: false };
         requests.set(block.id, call); calls.push(call);
       } else if (event.type === 'user' && block.type === 'tool_result') {
         const call = requests.get(block.tool_use_id);
         assert.ok(call && !call.resultLine, 'Unmatched or duplicate native tool result');
-        if (block.tool_name !== undefined) assert.equal(block.tool_name, call.name, 'Native tool result name differs');
+        if (block.tool_name !== undefined) assert.equal(toolName(block.tool_name), call.name, 'Native tool result name differs');
         if (call.sessionId && (event.sessionId||event.session_id)) assert.equal(call.sessionId,event.sessionId||event.session_id,'Cross-session native result');
         Object.assign(call, { resultLine: lineIndex + 1, resultDigest: sha(JSON.stringify(block)),
           result: block.content, success: successful(block) });
@@ -143,4 +174,4 @@ function readSource(file, roots, {mode='manual',project}={}) {
     ...(data.latestAssistant!==undefined?{latestAssistant:data.latestAssistant}:{}),
     sourceVerification: mode==='auto'?'native-hook-transcript':'configured-host-transcript', tamperProof: false };
 }
-module.exports = { sha, contentText, successful, parse, loaded, reference, describe, readSource, cursorBytes, ideWorkspace };
+module.exports = { sha, contentText, successful, resultContent, resultText, resultValue, parse, loaded, reference, describe, readSource, cursorBytes, ideWorkspace };

package/skills/i3-ui-prototype/scripts/execution-gates.cjs

@@ -30,7 +30,7 @@ function skill(data,ref,key,before=Infinity) {
 }
 function quote(data,ref) {
  const call=nativeRef(data,ref);assert.ok(typeof ref.quote==='string'&&ref.quote.trim(),'Actual native result quote required');
- assert.ok(E.contentText(call.result).includes(ref.quote),'Quoted finding absent from native result');return call;
+ assert.ok(E.resultText(call.result).includes(ref.quote),'Quoted finding absent from native result');return call;
 }
 function identity(d) {
  P.validate(d.policy);assert.equal(d.binding?.schemaVersion,1,'Hook task binding required');assert.equal(d.proof?.schemaVersion,1,'Execution evidence required');
@@ -38,12 +38,15 @@ function identity(d) {
  same(d.binding.policyDigest,d.policy.digest,'Execution policy differs');same(d.binding.inputDigest,d.current.inputDigest,'Inputs changed; begin a new execution run');
  for(const key of ['inputDigest','candidateDigest','revision'])same(d.proof[key],key==='candidateDigest'?d.current.digest:d.current[key],`Current ${key} differs`);
  assert.ok(d.source.prompts.some(p=>p.line===d.binding.entryLine),'Native user task source missing');
+ assert.ok(command.completedBegin(d.source,d.binding),'Successful execution-begin for the current native task/context is required');
  if(d.policy.id===P.AUTO_ID){same(d.binding.host,d.policy.host,'Actual native host differs from the fixed policy');assert.ok(d.binding.identitySource&&d.binding.identitySource!=='legacy-profile','Automatic policy requires actual native host identity');}
  if(d.binding.recovery){
   const recovery=d.binding.recovery;
+  assert.notEqual(recovery.status,'blocked','Recovery budget exhausted; a new human task is required');
   for(const ref of recovery.invocations||[]){const call=nativeRef(d,ref);same(call.skill,ref.skill,'Recovery Skill differs');same(call.requestLine,ref.requestLine,'Recovery request cursor differs');same(call.resultLine,ref.resultLine,'Recovery result cursor differs');assert.ok(call.requestLine>ref.feedbackLine,'Recovery invocation must follow its feedback');}
   if(recovery.status==='recovered'){
    const retry=nativeRef(d,recovery.retry);
+   if(recovery.expectedRetry)for(const [key,value] of Object.entries(recovery.expectedRetry))same(recovery.retry[key],value,'Recovery retry differs from the denied operation');
    if(recovery.retry.kind!==undefined)assert.ok(Number.isFinite(recovery.retry.feedbackLine)&&recovery.retry.feedbackLine>=d.binding.entryLine&&retry.requestLine>recovery.retry.feedbackLine,'Recovery retry must follow its feedback');
    if(recovery.retry.kind==='stage'){
     const parsed=command.nativeCommand(retry.name,retry.input,retry.cwd||d.binding.project||d.binding.directory);
@@ -54,6 +57,7 @@ function identity(d) {
    }else {
     assert.ok(recovery.retry.kind===undefined||recovery.retry.kind==='ui-write','Unknown recovery retry kind');
     assert.ok(uiWrite({...retry,cwd:retry.cwd||d.binding.project},d.binding.directory),'Recovery retry is not a native UI write');
+    if(recovery.expectedRetry?.file){const input=retry.input,file=input.file_path||input.filePath||input.path||input.TargetFile;same(path.resolve(retry.cwd||d.binding.project,file),recovery.expectedRetry.file,'Recovery wrote a different UI file');}
    }
    for(const ref of recovery.invocations||[])assert.ok(retry.requestLine>ref.resultLine,'Retry must follow successful Skill results');
   }
@@ -106,7 +110,7 @@ function design(d) {
   assert.ok(query.decisions?.length,'UIUX result decisions required');
   for(const decision of query.decisions) {
    assert.ok(['adopted','adjusted','rejected','no-match'].includes(decision.decision)&&decision.rationale&&decision.identity,'UIUX decision identity and rationale required');
-   assert.ok(E.contentText(call.result).includes(decision.identity),'UIUX identity absent from actual result');
+   assert.ok(E.resultText(call.result).includes(decision.identity),'UIUX identity absent from actual result');
    if(['adopted','adjusted'].includes(decision.decision))assert.ok(Object.hasOwn(d.files||{},decision.implementation)&&decision.scenarioId,'Adopted UIUX result needs source and verification scenario');
   }
  }
@@ -115,7 +119,7 @@ function design(d) {
 }
 function build(d) {
  assert.ok(d.build?.buildId&&d.build?.buildDigest,'Current checked build required');
- const call=nativeRef(d,d.proof.build),input=JSON.stringify(call.input),output=E.contentText(call.result);
+ const call=nativeRef(d,d.proof.build),input=JSON.stringify(call.input),output=E.resultText(call.result);
  assert.ok(['Bash','execute_command','run_terminal_command'].includes(call.name)&&input.includes('native-pilot.cjs')&&/\bbuild\b/.test(input)&&input.includes(d.binding.directory),'Actual current build command required');
  assert.ok(output.includes(d.build.buildId)&&output.includes(d.build.buildDigest),'Native build result differs from current build');
  same(d.build.candidateDigest,d.current.digest,'Build candidate is stale');return call;

package/skills/i3-ui-prototype/scripts/execution-recovery.cjs

@@ -1,16 +1,19 @@
 'use strict';
 // Deterministic recovery state; only native source results can resolve a Skill.
 const E=require('./execution-evidence.cjs'),P=require('./execution-policy.cjs');
+const N=require('./native-command.cjs');
 const names={frontend:'i3-frontend-ui-engineering',antdv:'antdv',uiux:'ui-ux-pro-max',browser:'i3-browser-testing-with-devtools'};
+const blockedReason='原型补调已达到自动恢复上限，当前任务仍被阻塞。请如实报告缺项及失败原因；修复依赖、权限或宿主后由用户发起继续。不能取得合格交付回执。';
 function missing({source,binding,policy,stage}){
- const unbound=!binding||binding.entryLine!==source.prompts.at(-1)?.line||binding.contextLine!==source.contextLine;
+ const unbound=!N.completedBegin(source,binding);
  const required=stage&&policy?P.requirements(policy,stage).filter(key=>Object.hasOwn(names,key)):['frontend',...(policy?.id===P.AUTO_ID?[...(policy.officialCallable?['antdv']:[]),...(policy.mode==='professional'?['uiux']:[])]:[])];
  const sessionId=binding?.sessionId||source.calls.find(call=>call.sessionId)?.sessionId;
  return [...(unbound?['execution-begin']:[]),...required.filter(key=>!E.loaded(source.calls,key).some(call=>call.sessionId===sessionId&&call.requestLine>source.contextLine&&(source.stableThroughLine===undefined||call.resultLine<=source.stableThroughLine)))];
 }
-function instruction(keys){
+function instruction(keys,{directory}={}){
  const skills=keys.filter(key=>names[key]).map(key=>names[key]);
- return `${keys.includes('execution-begin')?'先为当前任务执行 execution-begin。':''}${skills.length?'请立即通过当前宿主的 Skill 工具调用 '+skills.join('、')+'（插件安装使用宿主显示的完整名称），等待成功返回后重试原操作。':''}${keys.includes('execution-evidence')?'执行 execution-check，按实际原生请求和结果补齐当前阶段证据后重试。':''}读取 SKILL.md、自动补全提示、手填调用记录不能代替实际调用。失败时报告具体原因，不得自动安装依赖或宣称完成。`;
+ const begin=keys.includes('execution-begin')?`先为当前任务独立执行 execution-begin${directory?'：\n'+N.beginCommand(directory)+'\n':'。'}不得拼接 cd &&、管道、重定向或 head；等待 status=bound 且退出码为 0，再重试原操作。`:'';
+ return `${begin}${skills.length?'请立即通过当前宿主的 Skill 工具调用 '+skills.join('、')+'（插件安装使用宿主显示的完整名称），等待成功返回后重试原操作。':''}${keys.includes('execution-evidence')?'执行 execution-check，按实际原生请求和结果补齐当前阶段证据后重试。':''}读取 SKILL.md、自动补全提示、手填调用记录不能代替实际调用。外层工具 success 不代表原型阶段成功；内层 status=failed 或非零退出必须保持阻塞。失败时报告具体原因，不得自动安装依赖或宣称完成。`;
 }
 function record(index,context,answer){
  const {source,sessionId,directory,eventKey,event}=context,prompt=source.prompts.at(-1);
@@ -19,16 +22,17 @@ function record(index,context,answer){
  index.recoveries||={};
  const state=index.recoveries[taskKey]||={schemaVersion:1,total:0,counts:{},events:{},pending:{},invocations:[],status:'required'};
  state.feedbackLine??=Math.max(prompt.line,...Object.values(state.pending).map(item=>item.line));
- const summary=()=>({taskKey,status:state.status,total:state.total,counts:state.counts,invocations:state.invocations,...(state.retry?{retry:state.retry}:{})});
+ const summary=()=>({taskKey,status:state.status,total:state.total,counts:state.counts,invocations:state.invocations,...(state.expectedRetry?{expectedRetry:state.expectedRetry}:{}),...(state.retry?{retry:state.retry}:{})});
  const remember=result=>{state.events[eventKey]=result;for(const key of Object.keys(state.events).slice(0,-128))delete state.events[key];return {...result,recovery:summary()};};
  if(state.events[eventKey])return {...state.events[eventKey],recovery:summary()};
+ if(state.status==='blocked'&&!answer.deny&&!answer.feedback)return remember(event==='PreToolUse'&&context.expectedRetry?{deny:true,reason:blockedReason}:{...answer,context:blockedReason});
  if(answer.deny||answer.feedback){
+  if(context.expectedRetry&&(!state.expectedRetry||state.status==='recovered'))state.expectedRetry=context.expectedRetry;
   const keys=[...new Set(answer.missing?.length?answer.missing:['execution-evidence'])];
   const limits=context.policy?.recovery||{perMissing:2,total:6};
   if(state.total>=limits.total||keys.some(key=>(state.counts[key]||0)>=limits.perMissing)){
    state.status='blocked';
-   const reason='原型补调已达到自动恢复上限，当前任务仍被阻塞。请如实报告缺项及失败原因；修复依赖、权限或宿主后由用户发起继续。不能取得合格交付回执。';
-   const result=answer.deny?{deny:true,reason,missing:keys}:{continue:true,context:reason};return remember(result);
+   const result=answer.deny?{deny:true,reason:blockedReason,missing:keys}:{continue:true,context:blockedReason};return remember(result);
   }
   state.total++;for(const key of keys)state.counts[key]=(state.counts[key]||0)+1;state.status='required';
   const line=Math.max(prompt.line,...source.calls.map(call=>call.resultLine||call.requestLine));
@@ -44,7 +48,8 @@ function record(index,context,answer){
    delete state.pending[key];
   }
   if(!Object.keys(state.pending).length&&state.status!=='recovered'){
-   state.status=context.retrySucceeded&&event==='PostToolUse'&&context.retry?.requestLine>state.feedbackLine?'recovered':'ready-to-retry';if(state.status==='recovered')state.retry={...context.retry,feedbackLine:state.feedbackLine};
+   const matchingRetry=!state.expectedRetry||Object.entries(state.expectedRetry).every(([key,value])=>context.retry?.[key]===value);
+   state.status=context.retrySucceeded&&matchingRetry&&event==='PostToolUse'&&context.retry?.requestLine>state.feedbackLine?'recovered':'ready-to-retry';if(state.status==='recovered')state.retry={...context.retry,feedbackLine:state.feedbackLine};
   }
  }
  return remember({...answer});

package/skills/i3-ui-prototype/scripts/execution-runtime.cjs

@@ -1,6 +1,7 @@
 'use strict';
 const F=require('./native-files.cjs'),{fs,path,assert,json,inside}=F;
 const P=require('./execution-policy.cjs'),E=require('./execution-evidence.cjs'),G=require('./execution-gates.cjs'),C=require('./codebuddy-context.cjs');
+const Recovery=require('./execution-recovery.cjs');
 const optional=(root,file)=>fs.existsSync(inside(root,file))?json(inside(root,file)):null;
 function policy(directory) {
  const value=optional(directory,'inputs/execution-policy.json'),metaFile=inside(directory,'prototype.json');
@@ -11,7 +12,8 @@ function policy(directory) {
  const acceptance=json(inside(directory,'inputs/acceptance.json'));require('./execution-assertions.cjs').validate(json(inside(directory,'inputs/execution-assertions.json')),[...acceptance.requiredScenarios,...acceptance.frameworkScenarios]);return value;
 }
 function binding(directory) {
- const pointer=optional(directory,'qa/execution-context.json');assert.ok(pointer?.schemaVersion===1,'No native Hook task binding; run execution-begin inside enabled CodeBuddy');
+ const recover=Recovery.instruction(['execution-begin'],{directory});
+ const pointer=optional(directory,'qa/execution-context.json');assert.ok(pointer?.schemaVersion===1,'No native Hook task binding; '+recover);
  const project=fs.realpathSync(pointer.project),selected=C.select({project,product:pointer.product,host:pointer.host||'codebuddy'});assert.ok(selected,'Hooks are not enabled or are shadowed');
  assert.equal(selected.base,pointer.base,'Effective Hook scope changed');
  const stateDirectory=C.sessionDirectory(selected,project,pointer.sessionId),indexFile=path.join(stateDirectory,'session.json');
@@ -23,6 +25,8 @@ function binding(directory) {
  const source=C.source({session_id:entry.sessionId,transcript_path:entry.source.path},selected,project);
  const prompt=source.prompts.find(p=>p.line===entry.entryLine);assert.equal(prompt?.digest,entry.promptDigest,'Original user task changed');
  assert.ok(!C.readOnly(source.prompts.at(-1).text),'Latest user request is read-only or stopped');
+ assert.equal(entry.entryLine,source.prompts.at(-1).line,'Native task changed; '+recover);
+ assert.equal(entry.contextLine,source.contextLine,'Native context changed; '+recover);
  return {entry,source,selected};
 }
 function data(directory,lib,options={}) {
@@ -33,7 +37,7 @@ function data(directory,lib,options={}) {
  const pointer=optional(directory,'last-build.json');let build=null;
  if(pointer)try{build=lib.verifyBuild(directory,pointer.buildId);}catch{/* A changed candidate must be allowed to rebuild; build/browser gates reject null. */}
  const latest=optional(directory,'qa/latest.json');
- const business=options.businessReport||(latest?json(inside(directory,latest.report)):proof?.browser?.report?json(inside(directory,proof.browser.report)):null);
+ const business=options.businessReport||(latest?json(inside(directory,latest.report)):proof?.browser?.report?optional(directory,proof.browser.report):null);
  const framework=json(inside(directory,'inputs/framework.json'));
  return {policy:fixed,current,binding:entry,source,proof,assertions:json(inside(directory,'inputs/execution-assertions.json')),designReview:optional(directory,'qa/design-advice.json'),scope:json(inside(directory,'inputs/scope.json')),implementation:optional(directory,'design-system/implementation.json'),files,frameworkVersion:framework.profile?.versions?.['antdv-next']||json(inside(directory,'app/package.json')).dependencies['antdv-next'].replace(/^[~^]/,''),build,business,devtools:options.devtoolsReport||optional(directory,'qa/devtools-review.json'),selected};
 }
@@ -54,6 +58,7 @@ function template(directory,lib) {
 }
 function begin(directory,lib) {
  directory=fs.realpathSync(directory);const {entry}=binding(directory);
+ assert.equal(entry.inputDigest,lib.manifest(directory).inputDigest,'Inputs changed; '+Recovery.instruction(['execution-begin'],{directory}));
  return {status:'bound',operation:'execution-begin',directory,runId:entry.runId,sessionId:entry.sessionId,policyDigest:entry.policyDigest,evidenceTemplate:template(directory,lib),
   next:'Load applicable Skills through CodeBuddy, implement the current scope, and bind actual native result IDs in qa/execution-evidence.json. Binding is not completion.'};
 }

package/skills/i3-ui-prototype/scripts/hosts/codebuddy.cjs

@@ -3,7 +3,7 @@
 const fs=require('node:fs'),path=require('node:path');
 function format(result,event){
  if(result.deny)return {code:0,output:{hookSpecificOutput:{hookEventName:'PreToolUse',permissionDecision:'deny',permissionDecisionReason:result.reason}}};
- if(result.feedback)return {code:0,output:{continue:false,reason:result.reason}};
+ if(result.feedback)return {code:0,output:event==='Stop'?{continue:false,reason:result.reason}:{continue:true,hookSpecificOutput:{hookEventName:event,additionalContext:result.reason}}};
  if(result.context)return {code:0,output:{continue:true,...(result.recovery?.status==='blocked'?{systemMessage:result.context}:{}),...(['SessionStart','UserPromptSubmit','PostToolUse'].includes(event)?{hookSpecificOutput:{hookEventName:event,additionalContext:result.context}}:{})}};
  return {code:0,output:{continue:true}};
 }

package/skills/i3-ui-prototype/scripts/native-command.cjs

@@ -1,6 +1,8 @@
 'use strict';
 // One non-executing parser shared by Hook dispatch and A receipt verification.
-const path=require('node:path');
+const path=require('node:path'),assert=require('node:assert/strict');
+const {quote}=require('./codebuddy-registration.cjs');
+const E=require('./execution-evidence.cjs');
 function tokens(command) {
  if(typeof command!=='string'||/[\x00\r\n]|\$\(|`/.test(command))return null;
  const values=[];let value='',quote=null,started=false;
@@ -15,4 +17,19 @@ function nativeCommand(tool,input,cwd) {
  return {operation,root,argv};
 }
 const stageFor=Object.freeze({build:'implementation','record-run':'browser-entry','record-devtools-review':'browser-entry',finalize:'delivery'});
-module.exports={tokens,nativeCommand,stageFor};
+function beginCommand(directory){
+ assert.ok(typeof directory==='string'&&path.isAbsolute(directory),'Absolute prototype directory required');
+ return [process.execPath,path.join(__dirname,'native-pilot.cjs'),'execution-begin',directory].map(quote).join(' ');
+}
+function completedBegin(source,binding){
+ if(!binding||binding.entryLine!==source.prompts.at(-1)?.line||(binding.contextLine||0)!==source.contextLine)return null;
+ const calls=source.calls.filter(call=>call.sessionId===binding.sessionId&&call.requestLine>=binding.entryLine&&call.requestLine>source.contextLine&&(()=>{
+  const command=nativeCommand(call.name,call.input,call.cwd||binding.project||binding.directory);
+  return command?.operation==='execution-begin'&&command.root===binding.directory;
+ })());
+ const latest=calls.at(-1);
+ if(!latest?.success||!latest.resultLine||source.stableThroughLine!==undefined&&latest.resultLine>source.stableThroughLine)return null;
+ const result=E.resultValue(latest.result);
+ return result?.status==='bound'&&result.runId===binding.runId&&result.sessionId===binding.sessionId&&result.directory===binding.directory?latest:null;
+}
+module.exports={tokens,nativeCommand,stageFor,beginCommand,completedBegin};

package/skills/i3-ui-prototype/scripts/native-tool-name.cjs

@@ -0,0 +1,5 @@
+'use strict';
+// Observed Buddy tool aliases only. Preserve original blocks for digest checks.
+const aliases=Object.freeze({use_skill:'Skill',skill:'Skill',execute_command:'Bash',write_to_file:'Write',read_file:'Read',replace_in_file:'Edit'});
+const toolName=name=>Object.hasOwn(aliases,name)?aliases[name]:name;
+module.exports={toolName};