@givolt/i3-composer-agent 2.3.3 → 2.3.5

package/skills/i3-ui-prototype/references/interaction-acceptance.md

@@ -39,7 +39,7 @@
 
 固定工具的输入事件也须实际验证：本轮 Chrome DevTools MCP 1.11.0 内捆的短文本 fill 路径对空字符串直接设置 DOM value 后结束，没有发送 input／change，可能使界面为空而查询或校验仍使用旧绑定值。保存原始失败观测。独立真实 MCP 实测可用原生 fill 单个空格使输入活跃，再只读取得实际 value 长度和 selectionStart／selectionEnd；空格可能追加到恢复的旧值，不能假定只有一字。确认光标位于末尾后，按实际文本长度逐次原生 press_key Backspace，核对空值，再查询／保存并核对绑定结果。本轮 headless 的 Meta+A／Control+A 未全选，快捷键须按实际结果核对。不能只看 DOM value 或工具成功文本，也不修改组件库或用 evaluate_script 修补事件。其他版本按实际行为判断。该工具事件限制、宿主 PreToolUse 参数兼容、原型业务缺陷分别诊断，不以其中一项通过代替其他项。
 
-`native-pilot.cjs browser` 的 Playwright 执行器保留原型专项回归，包括确定性能力、故障与隔离检查；它是补充证据，不能代替浏览器 Skill、MCP 调用或上述实际观测。指定的 CodeBuddy 完整链必须同时满足 Skill、DevTools 和专项回归，缺可调用 Skill 或 MCP 时明确 blocked／not-run，最终结果为 partial／blocked。只有补充回归通过时，不将整链写为 complete。
+`native-pilot.cjs browser` 的 Playwright 执行器保留原型专项回归，包括确定性能力、故障与隔离检查；它是补充证据，不能代替浏览器 Skill、MCP 调用或上述实际观测。新完整业务的 CodeBuddy／WorkBuddy 严格链必须满足 Skill、DevTools 和固定业务场景实测；Playwright 执行器仅适用于原设备列表固定合同，缺可调用 Skill 或 MCP 时明确 blocked／not-run，最终结果为 partial／blocked。只有补充回归通过时，不将整链写为 complete。
 
 新 create 将 `browserReview` 要求固定到 inputs/acceptance.json；字段缺失的旧 v2 维持原行为，v1 不迁移。现有实例需明确接受完整验收输入变更后才启用，不在 inspect 中追随全局策略。其他宿主的等效真实浏览器渠道如实单列，不能借其结果宣称这条 CodeBuddy 指定链已通过。
 

package/skills/i3-ui-prototype/references/project-layout.md

@@ -36,7 +36,7 @@ paths 返回的 scope 是安装范围，scopeFile 是准备区 scope.json 的完
 
 ## scope.moduleIds 与 appliesTo
 
-新原生 scope 使用 schemaVersion=2，moduleIds 为数组，例如 `["asset-management", "work-order-management"]`。标识须来自实际 PRD 或已确定项目模块：小写字母开头，使用字母、数字和单个连字符分隔，总长不超过 128；不把文档名、需求全文、代码路径或通配符当模块标识。模块身份不清楚时填 []，不编造标识。
+新原生 scope 使用 schemaVersion=3，moduleIds 为数组，例如 `["asset-management", "work-order-management"]`。标识须来自实际 PRD 或已确定项目模块：小写字母开头，使用字母、数字和单个连字符分隔，总长不超过 128；不把文档名、需求全文、代码路径或通配符当模块标识。模块身份不清楚时填 []，不编造标识。
 
 需求的 source.reference 保留具体 PRD、版本与需求编号，statement 保留真实依据。多个 PRD 同模块去重；不同模块取本原型 scope 范围内并集。需求 ID 在本 scope 内唯一，文档冲突明确留作待确认项；模块关联不能代替需求覆盖或完成证明。
 

package/skills/i3-ui-prototype/scripts/buddy-host.cjs

@@ -0,0 +1,40 @@
+'use strict';
+// Identification never treats absence of an IDE marker as proof of CLI identity.
+const path=require('node:path'),os=require('node:os'),assert=require('node:assert/strict');
+const HOSTS=['codebuddy','workbuddy'];
+function globalBase({host='codebuddy',home=os.homedir(),env=process.env}={}){
+ assert.ok(HOSTS.includes(host),'Unsupported Buddy host');
+ const key=host==='workbuddy'?'WORKBUDDY_CONFIG_DIR':'CODEBUDDY_CONFIG_DIR';
+ const base=env[key]?.trim()||path.join(home,`.${host}`);
+ assert.ok(path.isAbsolute(base)&&!/[\x00\r\n]/.test(base),`${key} must be an absolute safe directory`);
+ return path.normalize(base);
+}
+function identify(payload,record,{home=os.homedir(),env=process.env}={}){
+ const clients={CodeBuddyIDE:['codebuddy','ide'],CodeBuddyCLI:['codebuddy','cli'],CodeBuddyCode:['codebuddy','cli'],WorkBuddy:['workbuddy','ide'],WorkBuddyIDE:['workbuddy','ide'],WorkBuddyDesktop:['workbuddy','ide']};
+ const client=clients[payload.client];
+ const declared=typeof payload.host==='string'?payload.host.toLowerCase():null;
+ let found=client&&{host:client[0],product:client[1],identitySource:'native-client'};
+ if(found&&declared)assert.equal(declared,found.host,'Conflicting native host identity');
+ const candidates=[];
+ if(typeof payload.transcript_path==='string'&&path.isAbsolute(payload.transcript_path)){
+  const file=path.normalize(payload.transcript_path);
+  for(const host of HOSTS){
+   const parent=path.join(globalBase({host,home,env}),'projects')+path.sep;
+   if(file.startsWith(parent)&&file.endsWith('.jsonl'))candidates.push(host);
+  }
+ }
+ if(found&&candidates.length)assert.ok(candidates.includes(found.host),'Conflicting client and native host log location');
+ if(!found&&candidates.length){
+  const host=candidates.length===1?candidates[0]:env.WORKBUDDY_CONFIG_DIR&&candidates.includes('workbuddy')?'workbuddy':null;
+  assert.ok(host,'Conflicting native host log locations');
+  found={host,product:host==='codebuddy'?'cli':'ide',identitySource:'native-host-log-location'};
+ }
+ // A legacy installation retains its original, explicitly weaker contract.
+ if(!found&&record.schemaVersion===1&&['ide','cli'].includes(record.product))found={host:'codebuddy',product:record.product,identitySource:'legacy-profile'};
+ assert.ok(found,'Native host/product identity is unavailable; keep invocation unverified');
+ if(declared)assert.equal(declared,found.host,'Conflicting native host identity');
+ assert.ok((record.hosts||['codebuddy']).includes(found.host),'Native host is outside the registered scope');
+ return {...found,productVersion:payload.client_version||payload.product_version||(found.host==='workbuddy'?(env.WORKBUDDY_APP_VERSION||env.CLIENT_INFO_PRODUCT_VERSION):null)||(record.product==='auto'?null:record.productVersion)||'unreported'};
+}
+function isIDE(payload){return ['CodeBuddyIDE','WorkBuddy','WorkBuddyIDE','WorkBuddyDesktop'].includes(payload.client);}
+module.exports={HOSTS,globalBase,identify,isIDE};

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');
-const FILES=['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 R=require('./codebuddy-registration.cjs'),E=require('./execution-evidence.cjs'),H=require('./buddy-host.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));
@@ -21,37 +21,37 @@ function bundle(scriptPath) {
 }
 function registration(base) {
  const raw=read(path.join(base,'state/i3-prototype/installation.json'));if(!raw)return null;
- const record=JSON.parse(raw);assert.equal(record.owner,R.OWNER,'Unknown Hook ownership');assert.equal(record.schemaVersion,1,'Unsupported Hook ownership');assert.equal(record.base,base,'Hook base differs');
+ const record=JSON.parse(raw);assert.equal(record.owner,R.OWNER,'Unknown Hook ownership');assert.ok([1,2].includes(record.schemaVersion),'Unsupported Hook ownership');assert.equal(record.base,base,'Hook base differs');
+ if(record.schemaVersion===2)assert.ok(record.product==='auto'&&Array.isArray(record.hosts)&&record.hosts.length&&record.hosts.every(host=>H.HOSTS.includes(host)),'Invalid automatic Hook identity');
  const settingsText=read(path.join(base,'settings.json')),settings=R.config(settingsText);
  for(const event of R.EVENTS)assert.equal((settings.hooks?.[event]||[]).filter(group=>JSON.stringify(group)===JSON.stringify(record.groups[event])).length,1,'Registered Hook was removed, duplicated, or edited');
  assert.equal(bundle(record.scriptPath),record.scriptDigest,'Audit adapter bytes changed; refresh owned registration');
  assert.ok(fs.existsSync(record.nodePath),'Registered Node executable is missing');
  return {...record,settingsDigest:E.sha(settingsText),registrationDigest:E.sha(JSON.stringify(record))};
 }
-function globalBase({home=os.homedir(),env=process.env}={}) {
- const configured=env.CODEBUDDY_CONFIG_DIR?.trim();
- if(!configured)return path.join(home,'.codebuddy');
- assert.ok(path.isAbsolute(configured)&&!/[\x00\r\n]/.test(configured),'CODEBUDDY_CONFIG_DIR must be an absolute safe directory');
- return path.normalize(configured);
-}
-function select({project,product,home=os.homedir(),env=process.env,readText=read,loadRegistration=registration}) {
- const projectBase=path.join(project,'.codebuddy'),userBase=globalBase({home,env});
+const globalBase=H.globalBase;
+function select({project,product,host='codebuddy',home=os.homedir(),env=process.env,readText=read,loadRegistration=registration}) {
+ assert.ok(['ide','cli'].includes(product),'Actual native product identity required');
+ const projectBase=path.join(project,'.codebuddy'),userBase=globalBase({host,home,env});
  const projectText=readText(path.join(projectBase,'settings.json')),localText=readText(path.join(projectBase,'settings.local.json'));
  if(localText){const local=R.config(localText);assert.ok(!local.hooks&&!local.disableAllHooks&&!local.allowManagedHooksOnly,'Local Hook overrides are not supported by this profile');}
  const projectSettings=R.config(projectText);assert.ok(!projectSettings.disableAllHooks&&!projectSettings.allowManagedHooksOnly,'Project Hook policy prevents automatic auditing');
  const globalText=readText(path.join(userBase,'settings.json')),globalSettings=R.config(globalText);assert.ok(!globalSettings.disableAllHooks&&!globalSettings.allowManagedHooksOnly,'Global Hook policy prevents automatic auditing');
  // IDE documents project settings as an override. Do not silently fall back through a shadowing file.
- const bases=product==='ide'&&projectText!==null?[projectBase]:[projectBase,userBase];
+ const bases=host==='codebuddy'&&product==='ide'&&projectText!==null?[projectBase]:[projectBase,userBase];
  for(const base of [...new Set(bases)]) {
   const record=loadRegistration(base);if(!record)continue;
-  assert.equal(record.product,product,'Conflicting CodeBuddy product profiles');return record;
+  if(record.product==='auto'){
+   if(!(record.hosts||[]).includes(host))continue;
+  }else {assert.equal(host,'codebuddy','Legacy profile is CodeBuddy only');assert.equal(record.product,product,'Conflicting CodeBuddy product profiles');}
+  return {...record,host,product};
  }
  return null;
 }
 function projectKey(project){return `${path.basename(project).replace(/[^a-zA-Z0-9_-]/g,'-').slice(0,32)||'project'}-${E.sha(project).slice(0,16)}`;}
 function sessionDirectory(record,project,sessionId) {
  assert.ok(typeof sessionId==='string'&&sessionId,'Native session ID required');
- return path.join(record.base,'state/i3-prototype',projectKey(project),E.sha(sessionId).slice(0,24));
+ return path.join(record.base,'state/i3-prototype',projectKey(project),E.sha(record.schemaVersion===2?`${record.host}:${record.product}:${sessionId}`:sessionId).slice(0,24));
 }
 function source(payload,record,project) {
  assert.ok(typeof payload.transcript_path==='string'&&typeof payload.session_id==='string','Native transcript and session fields required');

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

@@ -2,30 +2,22 @@
 const fs=require('node:fs'),path=require('node:path'),crypto=require('node:crypto'),assert=require('node:assert/strict');
 const F=require('./native-files.cjs'),C=require('./codebuddy-context.cjs'),E=require('./execution-evidence.cjs'),P=require('./execution-policy.cjs'),G=require('./execution-gates.cjs');
 const X=require('./execution-runtime.cjs');
-function tokens(command) {
- if(typeof command!=='string'||/[\x00\r\n]|\$\(|`/.test(command))return null;
- const values=[];let value='',quote=null,started=false;
- for(let i=0;i<command.length;i++) {const c=command[i];if(quote){if(c===quote){quote=null;started=true;}else if(c==='\\'&&quote==='"'&&i+1<command.length)value+=command[++i];else value+=c;}
- else if(c==='"'||c==="'"){quote=c;started=true;}else if(c==='\\'&&i+1<command.length){value+=command[++i];started=true;}else if(/\s/.test(c)){if(started){values.push(value);value='';started=false;}}else if(/[;&|<>]/.test(c))return null;else {value+=c;started=true;}}
- if(quote)return null;if(started)values.push(value);return values;
-}
-function nativeCommand(tool,input,cwd) {
- if(!['Bash','execute_command','run_terminal_command'].includes(tool))return null;
- const argv=tokens(input?.command);if(!argv)return null;const index=argv.findIndex(arg=>path.basename(arg)==='native-pilot.cjs');if(index<1)return null;
- const operation=argv[index+1],root=argv[index+2]&&!argv[index+2].startsWith('--')?path.resolve(cwd,argv[index+2]):null;
- return {operation,root,argv};
-}
+const H=require('./buddy-host.cjs');
+const Recovery=require('./execution-recovery.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||payload.tool_use_id&&call.toolCallId!==payload.tool_use_id)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
   // actual callback with one pending native call in the exact generation. The
   // pending call remains unsuccessful until a native result is persisted.
-  return source.format==='codebuddy-ide-index-v1'&&payload.client==='CodeBuddyIDE'&&typeof payload.generation_id==='string'&&call.nativeRequestId===payload.generation_id&&!call.resultLine&&partial(call.input,payload.tool_input||{});
+  return source.format==='codebuddy-ide-index-v1'&&H.isIDE(payload)&&typeof payload.generation_id==='string'&&call.nativeRequestId===payload.generation_id&&!call.resultLine&&partial(call.input,payload.tool_input||{});
  });
  const current=payload.hook_event_name==='PreToolUse'?matches.filter(call=>!call.resultLine):matches;
  assert.equal(current.length,1,'Native Hook event does not uniquely match the current transcript request');return current[0];
@@ -35,16 +27,16 @@ function eventSource(payload,record,project,{readSource=C.source,pause=milliseco
  // IDE can persist the current call only AFTER returning from both Hooks. Its
  // current native prompt/generation still binds the callback. Never synthesize
  // a successful call; A checks the persisted request/result at a later stage.
- const attempts=toolEvent&&record.product==='ide'&&payload.client==='CodeBuddyIDE'?8:1;
+ const attempts=toolEvent&&record.product==='ide'&&H.isIDE(payload)?8:1;
  for(let attempt=1;attempt<=attempts;attempt++) {
   try {
    const source=readSource(payload,record,project);
    let nativeRequestStatus='not-tool-event';
    if(toolEvent) {
-    if(source.format==='codebuddy-ide-index-v1'&&record.product==='ide'&&payload.client==='CodeBuddyIDE') {
+    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';}
@@ -53,14 +45,18 @@ function eventSource(payload,record,project,{readSource=C.source,pause=milliseco
   }catch(error){if(attempt===attempts)throw error;pause(100);}
  }
 }
-function decision({event,source,binding,tool,input,directory,cwd,deliveryCurrent,stopHookActive=false}) {
+function decision({event,source,binding,tool,input,directory,cwd,deliveryCurrent,stopHookActive=false,policy}) {
  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 front=E.loaded(source.calls,'frontend').filter(c=>c.sessionId===binding?.sessionId&&c.requestLine>source.contextLine&&(source.stableThroughLine===undefined||c.resultLine<=source.stableThroughLine));
-  if(!binding||binding.entryLine!==source.prompts.at(-1)?.line||binding.contextLine!==source.contextLine||!front.length)return {deny:true,reason:'Run execution-begin for the current task and load the frontend engineering Skill successfully in this session/context before writing prototype UI. Reading SKILL.md is insufficient.'};
+  const missing=Recovery.missing({source,binding,policy});
+  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);
- if(event==='Stop'&&binding&&!deliveryCurrent&&!stopHookActive&&claim)return {feedback:true,reason:'This prototype run has no current verified receipt. Run execution-check and resolve the missing evidence, or report blocked / awaiting-input / progress without claiming completion.'};
+ 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,{directory})};
+ }
  return {continue:true};
 }
 function prototypeForWrite(project,tool,input) {
@@ -70,8 +66,9 @@ function prototypeForWrite(project,tool,input) {
  while(current.startsWith(prototypes+path.sep)){if(fs.existsSync(path.join(current,'prototype.json')))return fs.realpathSync(current);current=path.dirname(current);}return null;
 }
 function safeProject(payload,options={},env=process.env,real=file=>fs.realpathSync(file),callbackCwd=process.cwd(),workspace=E.ideWorkspace) {
- const ideRoot=options.product==='ide'&&payload.client==='CodeBuddyIDE'&&payload.cwd==='/';
- const root=options.scope==='project'?path.dirname(options.base):ideRoot?workspace(payload.transcript_path,payload.session_id):env.CODEBUDDY_PROJECT_DIR||env.CLAUDE_PROJECT_DIR||payload.cwd||(payload.hook_event_name==='SessionStart'?callbackCwd:null);assert.ok(root&&path.isAbsolute(root),'Native project directory required');
+ const ideRoot=options.product==='ide'&&H.isIDE(payload)&&payload.cwd==='/';
+ const hostProject=options.host==='workbuddy'?env.WORKBUDDY_PROJECT_DIR:env.CODEBUDDY_PROJECT_DIR;
+ const root=options.scope==='project'?path.dirname(options.base):ideRoot?workspace(payload.transcript_path,payload.session_id):hostProject||env.CLAUDE_PROJECT_DIR||payload.cwd||(payload.hook_event_name==='SessionStart'?callbackCwd:null);assert.ok(root&&path.isAbsolute(root),'Native project directory required');
  const project=real(root);
  // IDE 4.12.2 reports '/' for absolute-path tools. Use the project registration
  // or session-bound native workspace above; reject all other outside cwd.
@@ -82,15 +79,30 @@ function saveIndex(directory,index) {
  F.write(directory,'session.json',index);
 }
 function toolCwd(payload,record,project) {
- return record.product==='ide'&&payload.client==='CodeBuddyIDE'&&payload.cwd==='/'?project:payload.cwd||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');
- const project=safeProject(payload,options),record=C.select({project,product:options.product});
+ if(options.event==='SessionStart')return {continue:true};
+ if(options.event==='UserPromptSubmit'){
+  const prompt=payload.prompt||'';
+  if(!C.readOnly(prompt)&&(/\/i3-prototype\b(?!\s+(?:analyze|inspect|confirm-baseline))/.test(prompt)||/(?:生成|实现|创建|修订|修改|继续).{0,16}原型|(?:create|revise|implement).{0,20}prototype/i.test(prompt)))return {continue:true,context:'原型实施：先 execution-begin，再实际调用 i3-frontend-ui-engineering；使用 antDv 时加载 antdv 并通过 prototype-deps query 或检测出的本地 Node 入口查询组件。专业模式还须实际调用 UIUX。成功返回后再实施；收到原型门禁拒绝时按明确缺项补调并重试，不能留到下次修订。'};
+  return {continue:true};
+ }
+ let identity,installed;
+ try{installed=options.product==='auto'?C.registration(options.base):null;identity=H.identify(payload,installed||{schemaVersion:1,product:options.product},options);}catch(error){
+  const project=options.scope==='project'?path.dirname(options.base):payload.cwd;
+  if(options.event==='PreToolUse'&&project&&path.isAbsolute(project)){
+   const native=nativeCommand(payload.tool_name,payload.tool_input,project),target=native?.root||prototypeForWrite(project,payload.tool_name,payload.tool_input);
+   if(target&&fs.existsSync(path.join(target,'prototype.json'))&&X.policy(target))return {deny:true,reason:'原型原生宿主身份尚未核验，禁止受管写入或阶段推进：'+error.message};
+  }
+  throw error;
+ }
+ options={...options,...identity};
+ const project=safeProject(payload,options,options.env),record=C.select({project,product:identity.product,host:identity.host,home:options.home,env:options.env});
  if(!record||record.base!==options.base)return {continue:true};
  const cwd=toolCwd(payload,record,project);
- // SessionStart and analysis do not create persistent per-project/session state.
- if(['SessionStart','UserPromptSubmit'].includes(options.event))return {continue:true};
  let source;
  try {
   source=eventSource(payload,record,project);
@@ -108,30 +120,73 @@ function handle(payload,options) {
  const stateDirectory=C.sessionDirectory(record,project,payload.session_id),file=path.join(stateDirectory,'session.json');
  const index=JSON.parse(C.read(file)||'{"schemaVersion":1,"bindings":{}}');assert.equal(index.schemaVersion,1,'Unsupported audit session state');
  const command=nativeCommand(payload.tool_name,payload.tool_input,cwd);
- if(options.event==='PreToolUse'&&command?.operation==='create'&&!command.argv.includes('--execution-policy')&&(E.loaded(source.calls,'prototype').some(c=>c.requestLine>source.contextLine)||/^\s*\/i3-prototype\b/.test(latest.text)))return {deny:true,reason:'New CodeBuddy prototypes require --host codebuddy --execution-policy codebuddy-ab-v1 and fixed --execution-assertions. Existing artifacts keep their original contracts.'};
+ if(options.event==='PreToolUse'&&command?.operation==='create'&&(installed?.schemaVersion===2||E.loaded(source.calls,'prototype').some(c=>c.requestLine>source.contextLine)||/^\s*\/i3-prototype\b/.test(latest.text))){
+  const at=command.argv.indexOf('--execution-policy'),expected=installed?.schemaVersion===2?P.AUTO_ID:P.ID;
+  const hostAt=command.argv.indexOf('--host');
+  if(at<0||command.argv[at+1]!==expected||installed?.schemaVersion===2&&(hostAt<0||command.argv[hostAt+1]!==identity.host))return {deny:true,reason:`New ${identity.host} prototypes require --host ${identity.host} --execution-policy ${expected} and fixed --execution-assertions. Existing artifacts keep their original contracts.`};
+ }
  const directory=command?.root||prototypeForWrite(project,payload.tool_name,payload.tool_input);
  const existing=directory?index.bindings[directory]:null;
+ const stage=options.event==='Stop'?'delivery':stageFor[command?.operation];
+ let callbackCall=null;if(['PreToolUse','PostToolUse'].includes(options.event))try{callbackCall=eventCall(payload,source);}catch{/* Deferred IDE requests cannot attest results. */}
+ const callId=payload.tool_use_id||payload.call_id||callbackCall?.toolCallId;
+ const eventKey=E.sha(JSON.stringify([options.event,payload.generation_id||latest.nativeRequestId||null,callId||null,payload.tool_name||null,payload.tool_input||null,callId?null:source.digest]));
+ 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;
+  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});
+  try{fs.mkdirSync(lock);}catch{throw new Error('Concurrent audit callback; retry without bypassing the gate');}
+  try{const fresh=JSON.parse(C.read(file)||'{"schemaVersion":1,"bindings":{}}');const result=Recovery.record(fresh,recoveryContext(directory),answer);if(fresh.bindings[directory]&&result.recovery)fresh.bindings[directory].recovery=result.recovery;saveIndex(stateDirectory,fresh);return result;}
+  finally{fs.rmdirSync(lock);}
+ };
  if(options.event==='PreToolUse'&&command?.operation==='execution-begin') {
   assert.ok(directory&&directory.startsWith(path.join(project,'prototypes')+path.sep),'Prototype must be in this project');
   const fixed=X.policy(directory);assert.ok(fixed,'Existing prototype retains its original contract; do not rewrite it implicitly');
+  assert.equal(fixed.host,identity.host,'This prototype has a fixed contract for another host; inspect it or explicitly migrate and revalidate, do not inherit its invocation proof');
   const loaded=E.loaded(source.calls,'prototype').some(c=>c.requestLine>source.contextLine);
   assert.ok(loaded||/^\s*\/i3-prototype\b/.test(latest.text),'Native prototype Skill or actual shortcut entry required');
   const meta=F.json(path.join(directory,'prototype.json')),lib=require('./native-pilot-lib.cjs'),current=lib.manifest(directory);
   const runId=existing&&existing.entryLine===latest.line&&existing.inputDigest===current.inputDigest&&existing.contextLine===source.contextLine?existing.runId:crypto.randomUUID();
   index.bindings[directory]={schemaVersion:1,runId,sessionId:payload.session_id,project,projectKey:C.projectKey(project),directory,instanceId:meta.instanceId,policyDigest:fixed.digest,inputDigest:current.inputDigest,entryLine:latest.line,promptDigest:latest.digest,contextLine:source.contextLine,
-   operation:meta.revision==='r001'?'create':'revise',product:record.product,productVersion:record.productVersion,scope:record.scope,registrationDigest:record.registrationDigest,settingsDigest:record.settingsDigest,source:{path:source.path,bytes:source.bytes,digest:source.digest},lastHook:{event:options.event,at:new Date().toISOString(),nativeReadAttempts:source.nativeReadAttempts,nativeRequestStatus:source.nativeRequestStatus}};
+   operation:meta.revision==='r001'?'create':'revise',host:identity.host,identitySource:identity.identitySource,product:record.product,productVersion:identity.productVersion,scope:record.scope,registrationDigest:record.registrationDigest,settingsDigest:record.settingsDigest,source:{path:source.path,bytes:source.bytes,digest:source.digest},lastHook:{event:options.event,at:new Date().toISOString(),nativeReadAttempts:source.nativeReadAttempts,nativeRequestStatus:source.nativeRequestStatus}};
   const lock=path.join(stateDirectory,'.audit.lock');fs.mkdirSync(stateDirectory,{recursive:true});
   try{fs.mkdirSync(lock);}catch{throw new Error('Concurrent audit callback; retry execution-begin');}
   try {
    const fresh=JSON.parse(C.read(file)||'{"schemaVersion":1,"bindings":{}}');fresh.bindings[directory]=index.bindings[directory];
    saveIndex(stateDirectory,fresh);
-   F.write(directory,'qa/execution-context.json',{schemaVersion:1,runId,sessionId:payload.session_id,project,base:record.base,product:record.product});
+   F.write(directory,'qa/execution-context.json',{schemaVersion:1,runId,sessionId:payload.session_id,project,base:record.base,host:identity.host,product:record.product});
   }finally{fs.rmdirSync(lock);}
   return {continue:true};
  }
  if(directory&&fs.existsSync(path.join(directory,'prototype.json'))&&X.policy(directory)) {
-  const answer=decision({event:options.event,source,binding:existing,tool:payload.tool_name,input:payload.tool_input,directory,cwd});if(answer.deny)return answer;
-  if(options.event==='PreToolUse'&&command&&['build','record-run','record-devtools-review','finalize'].includes(command.operation)&&!existing)return {deny:true,reason:'Begin this strict prototype run with execution-begin before implementation or delivery.'};
+  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(!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,{directory})+' '+checked.errors.join('; ')});
+   }
+  }
+  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});
@@ -140,14 +195,13 @@ function handle(payload,options) {
   const fresh=JSON.parse(C.read(file));let changed=false;
   for(const entry of Object.values(fresh.bindings)) {
    if(entry.entryLine!==latest.line)continue;
-   const eventKey=E.sha(JSON.stringify([options.event,payload.tool_use_id||null,payload.tool_name||null,payload.tool_input||null,source.digest]));
    if(entry.lastEventKey===eventKey)continue;
    entry.source={path:source.path,bytes:source.bytes,digest:source.digest};entry.lastEventKey=eventKey;entry.lastHook={event:options.event,at:new Date().toISOString(),nativeReadAttempts:source.nativeReadAttempts,nativeRequestStatus:source.nativeRequestStatus};changed=true;
    if(options.event==='Stop') {
     const lib=require('./native-pilot-lib.cjs'),state=lib.state(entry.directory);
     const complete=state.execution.status==='passed'&&state.delivery?.status==='current'&&state.delivery.result.runId===entry.runId;
-    const feedback=decision({event:'Stop',source,binding:entry,directory:entry.directory,deliveryCurrent:complete,stopHookActive:payload.stop_hook_active||entry.stopFeedbackPrompt===latest.digest});
-    if(feedback.feedback){entry.stopFeedbackPrompt=latest.digest;saveIndex(stateDirectory,fresh);return feedback;}
+    const fixed=X.policy(entry.directory),feedback=decision({event:'Stop',source,binding:entry,directory:entry.directory,deliveryCurrent:complete,policy:fixed,stopHookActive:payload.stop_hook_active||entry.stopFeedbackPrompt===latest.digest});
+    if(feedback.feedback){const result=Recovery.record(fresh,{...recoveryContext(entry.directory),policy:fixed},feedback);entry.recovery=result.recovery;if(fixed.id!==P.AUTO_ID)entry.stopFeedbackPrompt=latest.digest;saveIndex(stateDirectory,fresh);return result;}
    }
   }
   if(changed)saveIndex(stateDirectory,fresh);

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/codebuddy-registration.cjs

@@ -24,18 +24,20 @@ function config(text) {
 }
 function ownedMarker(group) { return group.hooks.some(hook => typeof hook.command === 'string' && hook.command.includes(OWNER)); }
 function plan(options) {
-  const { action = 'keep', scope, product, base, project, nodePath, scriptPath, scriptDigest, currentText = null, record = null,
+  const { action = 'keep', scope, product = 'auto', base, project, nodePath, scriptPath, scriptDigest, currentText = null, record = null,
     transcriptRoots = record?.transcriptRoots || [], transcriptMode = record?.transcriptMode || (transcriptRoots.length ? 'manual' : 'auto'), productVersion = record?.productVersion || 'unreported' } = options;
   assert.ok(['keep', 'enable', 'disable'].includes(action), 'Invalid Hook action');
   assert.ok(['project', 'global'].includes(scope), 'Invalid installation scope');
-  assert.ok(['ide', 'cli'].includes(product), 'Specify CodeBuddy product ide or cli');
+  assert.ok(['auto', 'ide', 'cli'].includes(product), 'Use automatic product detection, or a legacy ide/cli profile');
+  const hosts=[...new Set(options.hosts || [...(record?.hosts || (record ? ['codebuddy'] : [])),...(options.agents?.filter(host=>['codebuddy','workbuddy'].includes(host)) || [options.host || 'codebuddy'])])].sort();
+  assert.ok((hosts.length||action==='disable')&&hosts.every(host=>['codebuddy','workbuddy'].includes(host)), 'Unsupported prototype Hook host');
   for (const item of [base, project, nodePath, scriptPath]) assert.ok(typeof item === 'string' && path.isAbsolute(item) && !/[\x00\r\n]/.test(item), 'Absolute safe registration paths required');
   if (process.platform === 'win32') throw new Error('CodeBuddy A+B Windows Hook quoting is not yet verified');
   const before = config(currentText), after = structuredClone(before), activeRecord = record && record.owner === OWNER ? record : null;
   if (record) {
-    assert.ok(activeRecord && activeRecord.schemaVersion === 1, 'Unknown registration ownership');
+    assert.ok(activeRecord && [1,2].includes(activeRecord.schemaVersion), 'Unknown registration ownership');
     assert.equal(activeRecord.scope, scope, 'Registration scope changed');
-    assert.equal(activeRecord.product, product, 'Disable the previous product profile before changing it');
+    if(product!=='auto')assert.equal(activeRecord.product, product, 'Disable the previous product profile before changing it');
     assert.equal(activeRecord.base, base, 'Registration base changed');
   }
   const found = {};
@@ -63,7 +65,7 @@ function plan(options) {
       assert.ok(Array.isArray(transcriptRoots)&&transcriptRoots.every(root=>typeof root==='string'&&path.isAbsolute(root)&&!/[\x00\r\n]/.test(root)),'Absolute native transcript roots required');
       assert.ok(['auto','manual'].includes(transcriptMode),'Invalid native transcript mode');
       assert.ok(transcriptMode==='manual'?transcriptRoots.length>0:transcriptRoots.length===0,'Manual transcript mode requires roots; auto uses only the native callback file');
-      recordAfter = { schemaVersion: 1, owner: OWNER, scope, product, base, scriptPath, scriptDigest, nodePath, groups, transcriptMode, transcriptRoots, productVersion };
+      recordAfter = { schemaVersion: product==='auto'?2:1, owner: OWNER, scope, product, ...(product==='auto'?{hosts}:{}), base, scriptPath, scriptDigest, nodePath, groups, transcriptMode, transcriptRoots, productVersion };
     }
   }
   const afterText = unchanged ? currentText : JSON.stringify(after, null, 2) + '\n';

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;
@@ -18,7 +19,7 @@ function nativeEvent(event) {
   if (event.type === 'message' && ['assistant', 'user'].includes(event.role)) {
     const content = Array.isArray(event.content) ? event.content.map(block =>
       ['input_text', 'output_text'].includes(block?.type) ? { ...block, type: 'text' } : block) : event.content;
-    return { ...event, type: event.role, message: { content } };
+    return { ...event, type: event.role, isMeta:event.isMeta===true||event.providerData?.isMeta===true, message: { content } };
   }
   if (event.type === 'function_call') {
     let input;
@@ -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 };