@hanamesh/dsh-app-host 0.6.22 → 0.6.25

package/dist/git-worker.js

@@ -1,16 +1,32 @@
 // Internal IPC supervisor. The parent never detaches a package manager directly.
-import {spawn,spawnSync} from 'node:child_process';
+import {spawn,spawnSync,fork} from 'node:child_process';
 import {existsSync,mkdtempSync,writeFileSync,rmSync,realpathSync} from 'node:fs';
 import {tmpdir} from 'node:os';
 import {dirname,join,basename} from 'node:path';
+import {createWindowsJob} from './windows-job.js';
 import {observeGitTrace} from './git-process.js';
-let monitor,directory,timer,done=false,started=false;
-function finish(payload){
+let monitor,directory,timer,done=false,started=false,anchor,anchorClosed,windowsJob,jobStarting,jobController;
+async function finish(payload){
  if(done)return;done=true;clearInterval(timer);
+ if(process.platform==='win32'&&anchor){
+  try{
+   if(!windowsJob){jobController?.abort();try{await jobStarting}catch{}}
+   if(windowsJob)await windowsJob.stop();else if(anchor.exitCode===null&&anchor.signalCode===null)anchor.kill('SIGKILL');
+   await anchorClosed;
+  }catch{payload={error:{code:'GIT_TREE_CLEANUP_FAILED'}};}
+ }
+ finalize(payload);
+}
+async function commandResult(payload){
+ if(done)return;
+ if(!payload.error){try{while(!done&&await windowsJob.active()>1)await new Promise(resolve=>setTimeout(resolve,5));}catch{void finish({error:{code:'GIT_TREE_CLEANUP_FAILED'}});return;}}
+ if(!done)void finish(payload);
+}
+function finalize(payload){
  try{monitor?.check(true);}catch(error){payload={error:{code:error.code??'GIT_TRACE_INVALID'}};}
  try{if(monitor)monitor.close();else if(directory)rmSync(directory,{recursive:true,force:true});}catch{payload={error:{code:'GIT_TRACE_CLEANUP_FAILED'}};}
  const end=()=>{
-  if(process.platform==='win32'){spawnSync('taskkill',['/pid',String(process.pid),'/T','/F'],{stdio:'ignore'});process.exit(1);}
+  if(process.platform==='win32')process.exit(0);
   else process.kill(-process.pid,'SIGKILL');
  };
  if(process.connected)process.send(payload,end);else end();
@@ -19,15 +35,17 @@ function abort(code='ABORT_ERR'){finish({error:{code,...(code==='ABORT_ERR'?{nam
 process.once('disconnect',()=>abort());
 process.once('SIGTERM',()=>abort());process.once('SIGINT',()=>abort());
 if(!process.connected)process.exit(1);
-process.on('message',request=>{
+process.on('message',async request=>{
  if(request.abort)return abort();if(request.timeout)return abort('ETIMEDOUT');
  if(started)return;started=true;
  try{
   let {command,args,options}=request;
   // No caller-owned trace exists before this IPC worker can clean on disconnect.
-  directory=mkdtempSync(join(realpathSync(options.env.TMPDIR??tmpdir()),'hm-git-guard-'));
+  const temporaryRoot=realpathSync(options.env.TMPDIR??tmpdir());
+  const parentRoot=options.env.HM_GIT_GUARD_TMP_ROOT===temporaryRoot&&options.env.HM_GIT_GUARD_PARENT_ROOT?realpathSync(options.env.HM_GIT_GUARD_PARENT_ROOT):temporaryRoot;
+  directory=mkdtempSync(join(parentRoot,'hm-git-guard-'));
   writeFileSync(join(directory,'events.jsonl'),'',{mode:0o600});monitor=observeGitTrace(directory);
-  options.env={...options.env,GIT_TRACE2_EVENT:join(directory,'events.jsonl'),GIT_TRACE_REDACT:'1'};
+  options.env={...options.env,HM_GIT_GUARD_PARENT_ROOT:directory,HM_GIT_GUARD_TMP_ROOT:temporaryRoot,GIT_TRACE2_EVENT:join(directory,'events.jsonl'),GIT_TRACE_REDACT:'1'};
   if(!process.connected)return abort();
   process.send({directory},error=>{if(error)abort();});
   // Native Windows .cmd shims cannot be executed by spawn without a shell.
@@ -40,6 +58,18 @@ process.on('message',request=>{
    const cli=candidates.find(path=>existsSync(path));if(!cli)throw Object.assign(new Error('Package manager JS entry unavailable.'),{code:'PACKAGE_MANAGER_UNAVAILABLE'});
    command=process.execPath;args=[cli,...args];
   }
+  if(process.platform==='win32'){
+   anchor=fork(new URL('./git-command-worker.js',import.meta.url),[],{cwd:options.cwd,env:options.env,execArgv:[],stdio:['ignore','inherit','inherit','ipc']});
+   anchorClosed=new Promise(resolve=>anchor.once('close',resolve));
+   anchor.once('message',value=>{void commandResult(value)});anchor.once('error',error=>{void finish({error:{code:error.code??'SPAWN_FAILED'}})});
+   jobController=new AbortController();
+   jobStarting=createWindowsJob({pid:anchor.pid,env:{...options.env,TMPDIR:directory,TMP:directory,TEMP:directory},cwd:options.cwd,signal:jobController.signal});
+   windowsJob=await jobStarting;
+   if(done)return;
+   anchor.send({command,args,options});
+   timer=setInterval(()=>{try{monitor.check();}catch(error){finish({error:{code:error.code??'GIT_TRACE_INVALID'}});}},25);
+   return;
+  }
   const {input,...spawnOptions}=options;
   const child=spawn(command,args,{...spawnOptions,stdio:[input===undefined?'ignore':'pipe','inherit','inherit'],detached:false});
   if(input!==undefined){child.stdin.on('error',()=>{});child.stdin.end(input);}

package/dist/install-target/harness.js

@@ -34,6 +34,8 @@ export async function loadClient({fetch:transport}){
   render();await idle();
   return{module,
     text:()=>JSON.stringify(tree),
+    find:predicate=>find(tree,predicate),
+    async acknowledgeInstall(){const checkbox=find(tree,node=>node.type==='input'&&node.props['aria-label']==='我已核对来源与安装目标');if(!checkbox)throw new Error('Installation review acknowledgement is not visible');checkbox.props.onChange({currentTarget:{checked:true}});await idle();},
     button:label=>find(tree,node=>node.type==='button'&&node.children.includes(label)),
     async click(label){const button=find(tree,node=>node.type==='button'&&node.children.includes(label));if(!button)throw new Error('No visible button '+label);button.props.onClick();await idle();},
     idle,

package/dist/install-target/suite.js

@@ -5,7 +5,7 @@
  * real provider. Fixture data is a test catalog and is labelled as such in the market UI.
  */
 import { readFile, writeFile, mkdir } from 'node:fs/promises';
-import { join, dirname } from 'node:path';
+import { join, dirname, resolve } from 'node:path';
 import { createServer, request } from 'node:http';
 import { randomUUID } from 'node:crypto';
 import { fileURLToPath } from 'node:url';
@@ -95,7 +95,7 @@ export async function sourceRecoveryProfile({recovery},item={}){
   for(const [command,phase,skip] of item.inject??[])profile.fail(command,phase,skip);
   if(item.concurrent)profile.concurrentAdd('@fixture/concurrent','1.0.0');
   // The catalog fixture already supplies the exact reviewed version.
-  const installer=emit=>createLibraryInstaller({profileDir:profile.profileDir,profileName:profile.profileName,dataRoot:profile.dataRoot,nodeBinary:'/source-fixture/bin/node',dshBin:'/source-fixture/dsh/lib/bin.js',
+  const installer=emit=>createLibraryInstaller({profileDir:profile.profileDir,profileName:profile.profileName,dataRoot:profile.dataRoot,nodeBinary:resolve('/source-fixture/bin/node'),dshBin:resolve('/source-fixture/dsh/lib/bin.js'),
     fetchImpl:profile.fetchImpl({[app.packageName]:app.latest,[plugin.packageName]:plugin.latest}),spawn:profile.spawn,provision:profile.provision,remove:profile.remove,ledger:profile.ledger,emit});
   return{profile,target,installer};
 }
@@ -173,7 +173,7 @@ async function runRecoveryProvider(contract,record){
     await record(id,'recovery','market shows '+caseId+' as '+(id==='RU01'?'a failure that was restored':'a failure whose restoration failed, never as installed or rolled back'),async()=>{
       const item=recovery.cases.find(row=>row.id===caseId),source=await sourceRecoveryProfile(contract,item);
       const host=await startProvider(contract,{profile:source.profile,installer:source.installer});const client=await loadClient({fetch:host.browserFetch});
-      try{await client.module.openInstallTarget({packageName:source.target.packageName});await client.idle();await client.click('确认安装');await host.settled();await client.tick(1000);
+      try{await client.module.openInstallTarget({packageName:source.target.packageName});await client.idle();await client.acknowledgeInstall();await client.click('确认安装');await host.settled();await client.tick(1000);
         const text=client.text();
         if(!text.includes('安装失败：'+item.expect.code)||!text.includes(expected))throw new Error('market text: '+text.slice(text.indexOf('安装失败')>=0?text.indexOf('安装失败'):0).slice(0,300));
         if(text.includes(refused)||text.includes('安装完成'))throw new Error('market misreports the recovery result');
@@ -247,7 +247,7 @@ export async function runProviderSuite(){
     await record('PC02','confirm','only an explicit confirmation installs, once, through the existing guarded route',async()=>{
       expectEqual(host.installs.length,0,'installs before confirmation');
       await client.module.openInstallTarget({packageName:'@hanamesh-fixture/install-target-app',contractVersion:'1'});await client.idle();
-      const confirm=client.button('确认安装');confirm.props.onClick();confirm.props.onClick();await client.idle();
+      await client.acknowledgeInstall();const confirm=client.button('确认安装');confirm.props.onClick();confirm.props.onClick();await client.idle();
       expectEqual(host.posts.map(p=>[p.path,p.headers['x-hanamesh-client']]),[['/hanamesh/library/install','workspace-v1']],'install requests');
       expectEqual(host.installs,['@hanamesh-fixture/install-target-app'],'installer calls');
     });
@@ -258,7 +258,7 @@ export async function runProviderSuite(){
       if(!client.button('确认安装'))throw new Error('localhost fragment did not reach confirmation');
       await client.click('取消');expectEqual([host.posts.length,host.installs.length],[postsBefore,installsBefore],'localhost cancellation');
       await client.module.openInstallTarget({packageName:'@hanamesh-fixture/install-target-plugin',contractVersion:'1'});await client.idle();
-      const confirm=client.button('确认安装');confirm.props.onClick();confirm.props.onClick();await client.idle();
+      await client.acknowledgeInstall();const confirm=client.button('确认安装');confirm.props.onClick();confirm.props.onClick();await client.idle();
       expectEqual([host.posts.length,host.installs.length],[postsBefore+1,installsBefore+1],'localhost confirmed install once');
       expectEqual(host.installs.at(-1),'@hanamesh-fixture/install-target-plugin','localhost installer target');
     });

package/dist/installation-status.d.ts

@@ -1,13 +1,5 @@
 /** Advertised metadata only. Discovery performs no installation read. */
 export const INSTALLATION_STATUS_CAPABILITY:Readonly<{contract:'hanamesh.installation-status';contractVersion:'1';path:'/hanamesh/library/installation-status'}>;
-export interface InstallationReaderConfig {
- /** Absolute official executable and explicitly selected user/config directories. Never supplied by a website. */
- executable:string;home:string;configDir:string;
- /** Identity and exact HTTPS marketplace URL from the registered AgentPluginDTO. */
- pluginName:string;marketplace:string;marketplaceUrl:string;
- /** Required positive bounded operation budgets. No product default is inferred. */
- timeoutMs:number;maxOutputBytes:number;
-}
 export interface InstallationStatusRequest {contractVersion:'1';consent:'read-installations'}
 export interface InstallationObservation {
  channel:'hanamesh'|'dsh'|'claude'|'codex';

package/dist/library/catalog.js

@@ -12,14 +12,15 @@ const MAX_SOURCE_LINKS=500;
 const plain=value=>typeof value==='string'&&value.length>0&&!/[\u0000-\u001f\u007f-\u009f\u202a-\u202e\u2066-\u2069]/u.test(value);
 const own=(value,keys)=>value&&typeof value==='object'&&!Array.isArray(value)&&Object.keys(value).every(key=>keys.includes(key));
 // WHATWG URL canonicalizes hostnames (including IPv6); no DNS lookup or origin aliasing.
-const catalogOrigin=url=>(url.protocol==='https:'&&!url.port)||
-  (url.protocol==='http:'&&['127.0.0.1','[::1]','localhost'].includes(url.hostname));
+const loopback=url=>['127.0.0.1','[::1]','localhost'].includes(url.hostname);
+const catalogOrigin=url=>(url.protocol==='https:'&&(!url.port||loopback(url)||url.hostname.endsWith('.localhost')))||
+  (url.protocol==='http:'&&loopback(url));
 
 export function validateManifestUrl(value){
   let url;try{url=new URL(value);}catch{throw new AppHostError('INVALID_CATALOG_URL','Catalog manifest URL is invalid.');}
   const viewQuery=!url.search||(url.searchParams.size===1&&url.searchParams.get('view')==='hanamesh');
   requireCondition(catalogOrigin(url)&&!url.username&&!url.password&&viewQuery&&!url.hash,
-    'INVALID_CATALOG_URL','Catalog manifests require standard-port HTTPS or loopback HTTP (127.0.0.1, ::1, localhost), with only an optional view=hanamesh query.');
+    'INVALID_CATALOG_URL','Catalog manifests require standard-port HTTPS, local HTTPS (loopback or *.localhost), or loopback HTTP, with only an optional view=hanamesh query.');
   return url;
 }
 

package/dist/library/handoff.js

@@ -1,4 +1,5 @@
 import { installationStatusCors, serveInstallationStatus } from './installation-status-http.js';
+import {serveInstallTargetProbe} from './install-target-http.js';
 /**
  * Website → client install handoff (C-MARKET, 2026-10-15 E/F). Upstream Desktop listens on an OS-assigned port that
  * nothing records, and a browser tab without the launch token gets 401, so a website can neither find nor enter the
@@ -33,7 +34,7 @@ const TIMER_MAX_MS = 2_147_483_647;
 /** Fixed rules (correctness, not policy): listed on the settings page with the reason they cannot be switched off. */
 export const HANDOFF_RULES = Object.freeze([
   { rule: '只在本机 127.0.0.1 上监听，请求的 Host 必须是 127.0.0.1 或 localhost 加监听端口', why: '防止别的机器或 DNS 重绑定的网页冒充本机' },
-  { rule: '只有「允许交接的网站」里的网站能探测本客户端、交接安装、读交接状态；别的网站什么也读不到', why: '否则任何网页都能知道你装了什么客户端、缺什么，用来识别你' },
+  { rule: '只有「允许交接的网站」能读取客户端能力、交接安装和交接状态；未许可网站仅能读取固定的来源拒绝提示', why: '拒绝提示只说明本机监听拒绝了该网站，不透露客户端类型、能力、安装情况或允许名单' },
   { rule: '网站交接只会在应用库里弹出确认；只有你点「确认安装」才会安装', why: '网站不能替你决定装什么' },
   { rule: '交接状态只给发起它的那个网站看', why: '一个网站不能读另一个网站的交接' },
   { rule: `交接请求体不超过 ${HANDOFF_BODY_MAX_BYTES} 字节`, why: '交接只包含目录身份、合约版本及已审核的结构化安装目标；正文上限为 4096 字节，不接受来源命令' },
@@ -168,16 +169,7 @@ export function createHandoffHandler({ library, queue, settings, port }) {
       requireCondition([`127.0.0.1:${bound}`, `localhost:${bound}`].includes(req.headers.host), 'HOST_DENIED', 'Unrecognized request host.', {}, 403);
       const url = new URL(req.url ?? '/', `http://${req.headers.host}`), path = url.pathname, origin = req.headers.origin;
       if (path === '/hanamesh/library/install-target') {
-        // A website not in allowedOrigins gets no CORS grant and no body: it cannot tell which client runs or what it lacks.
-        // Requests without an Origin are not from a website (a person's address bar, a local tool) and are answered.
-        if (origin !== undefined) {
-          requireCondition(settings().allowedOrigins.includes(origin), 'ORIGIN_DENIED', 'Not available.', undefined, 403);
-          cors = { 'access-control-allow-origin': origin, vary: 'Origin', 'access-control-allow-private-network': 'true' };
-        }
-        if (req.method === 'OPTIONS') { send(res, 204, undefined, { ...cors, 'access-control-allow-methods': 'GET' }); return; }
-        requireCondition(req.method === 'GET', 'METHOD_NOT_ALLOWED', 'Discovery requires GET.', {}, 405);
-        requireCondition(!url.search, 'UNKNOWN_FIELDS', 'Discovery takes no parameters.');
-        send(res, 200, { ...library.installTarget(), traceId }, cors); return;
+        serveInstallTargetProbe(req,res,{allowedOrigins:settings().allowedOrigins,read:()=>library.installTarget(),traceId,send});return;
       }
       if(path === '/hanamesh/library/installation-status'){
         cors=installationStatusCors(req,settings().allowedOrigins);

package/dist/library/install-target-http.js

@@ -0,0 +1,39 @@
+/** Public discovery only: an unapproved website may read one constant refusal, never client facts. */
+import {AppHostError,requireCondition} from '../errors.js';
+const PATH='/hanamesh/library/install-target';
+const VARY='Origin, Access-Control-Request-Method, Access-Control-Request-Headers, Access-Control-Request-Private-Network';
+function browserOrigin(origin){
+ if(typeof origin!=='string')return false;
+ try{const url=new URL(origin);return ['https:','http:'].includes(url.protocol)&&url.origin===origin}catch{return false}
+}
+export function serveInstallTargetProbe(req,res,{allowedOrigins,read,traceId,send}){
+ let cors={};
+ try{
+  requireCondition(req.url?.startsWith('/')&&!req.url.startsWith('//')&&!req.url.includes('\\')&&req.url.split('?')[0]===PATH,'BAD_TARGET','Invalid discovery target.');
+  requireCondition(req.headers['sec-fetch-dest']!=='iframe','FRAME_CONTROL_DENIED','An application frame cannot inspect the host.',{},403);
+  const url=new URL(req.url,'http://127.0.0.1'),origin=req.headers.origin,approved=origin===undefined||allowedOrigins.includes(origin);
+  if(!approved){
+   requireCondition(browserOrigin(origin),'ORIGIN_DENIED','Not available.',{},403);
+   requireCondition(req.method==='GET'||req.method==='OPTIONS','METHOD_NOT_ALLOWED','Discovery requires GET.',{},405);
+   requireCondition(!url.search,'UNKNOWN_FIELDS','Discovery takes no parameters.');
+   requireCondition(req.headers.cookie===undefined&&req.headers.authorization===undefined,'CREDENTIALS_NOT_ACCEPTED','Discovery requires credentials: omit.',{},403);
+  }
+  if(req.method==='OPTIONS'){
+   const method=req.headers['access-control-request-method'],headers=req.headers['access-control-request-headers'],privateNetwork=req.headers['access-control-request-private-network'];
+   requireCondition(method==='GET'||(approved&&method===undefined),'METHOD_NOT_ALLOWED','Discovery preflight permits GET only.',{},405);
+   requireCondition(headers===undefined||headers.trim()==='','PREFLIGHT_HEADERS_DENIED','Discovery preflight accepts no additional request headers.',{},403);
+   requireCondition(privateNetwork===undefined||privateNetwork==='true','INVALID_PREFLIGHT','Invalid private-network preflight.');
+   cors=origin===undefined?{}:{'access-control-allow-origin':origin};
+   // A non-2xx preflight hides the subsequent refusal from fetch. This grants only the fixed GET response.
+   send(res,204,undefined,{...cors,vary:VARY,'access-control-allow-methods':'GET',...(origin!==undefined&&privateNetwork==='true'?{'access-control-allow-private-network':'true'}:{})});return;
+  }
+  cors=origin===undefined?{}:{'access-control-allow-origin':origin,vary:'Origin'};
+  if(!approved){send(res,403,{error:{code:'ORIGIN_DENIED',message:'This website is not allowed to read discovery.'}},cors);return;}
+  requireCondition(req.method==='GET','METHOD_NOT_ALLOWED','Discovery requires GET.',{},405);
+  requireCondition(!url.search,'UNKNOWN_FIELDS','Discovery takes no parameters.');
+  send(res,200,{...read(),traceId},cors);
+ }catch(error){
+  const trusted=error instanceof AppHostError;
+  send(res,trusted?error.status:500,{error:{code:trusted?error.code:'INTERNAL_ERROR',message:trusted?error.message:'The operation could not be completed.'},traceId},cors);
+ }
+}

package/dist/library/installation-cli.js

@@ -5,11 +5,33 @@ import {stat,realpath,rm} from 'node:fs/promises';
 import {tmpdir} from 'node:os';
 import {dirname,isAbsolute,delimiter} from 'node:path';
 import {AppHostError} from '../errors.js';
-const fail=code=>{throw new AppHostError(code,'The configured official installation reader could not complete.',{},503)};
-export const SUPPORTED_READER_VERSIONS=Object.freeze({claude:'2.1.301 (Claude Code)',codex:'codex-cli 0.162.1'});
+import semver from 'semver';
+export const INSTALLATION_MANAGER_ENV_KEYS=Object.freeze(['VOLTA_HOME','ASDF_DATA_DIR','ASDF_CONFIG_FILE','MISE_DATA_DIR','MISE_CONFIG_DIR','MISE_GLOBAL_CONFIG_FILE','MISE_CACHE_DIR','MISE_STATE_DIR','FNM_DIR','NVM_DIR','NVM_HOME','NVM_SYMLINK','PNPM_HOME']);
+export const INSTALLATION_ENV_KEYS=Object.freeze([...INSTALLATION_MANAGER_ENV_KEYS,'PATH','XDG_CONFIG_HOME','XDG_CACHE_HOME','XDG_DATA_HOME','XDG_STATE_HOME','XDG_RUNTIME_DIR','XDG_CONFIG_DIRS','XDG_DATA_DIRS']);
+const pathListKeys=new Set(['PATH','XDG_CONFIG_DIRS','XDG_DATA_DIRS']);
+const absolutePath=value=>typeof value==='string'&&isAbsolute(value)&&!/[\x00-\x1f]/.test(value);
+export function installationEnvironment(source,platform=process.platform){
+ const separator=platform==='win32'?';':':',result={};
+ for(const key of INSTALLATION_ENV_KEYS){const value=key==='PATH'?source.PATH??source.Path:source[key];
+  if(typeof value!=='string'||/[\x00-\x1f]/.test(value))continue;
+  if(pathListKeys.has(key))result[key]=value.split(separator).filter(absolutePath).join(separator);
+  else if(absolutePath(value))result[key]=value;
+ }
+ return result;
+}
+const fail=code=>{throw new AppHostError(code,'The automatically discovered official installation reader could not complete.',{},503)};
+export const MINIMUM_READER_VERSIONS=Object.freeze({claude:'2.1.301',codex:'0.162.1'});
+export function readerVersionFailure(channel,output){
+ const pattern=channel==='claude'?/^(\d+\.\d+\.\d+) \(Claude Code\)$/:/^codex-cli (\d+\.\d+\.\d+)$/;
+ const version=pattern.exec(output.trim())?.[1];
+ if(!version||semver.valid(version)!==version)return 'AGENT_READER_VERSION_INVALID';
+ return semver.gte(version,MINIMUM_READER_VERSIONS[channel])?null:'AGENT_READER_VERSION_UNSUPPORTED';
+}
 export function validReader(value){
  if(!value||typeof value!=='object'||Array.isArray(value))return false;
- const keys=['executable','home','configDir','pluginName','marketplace','marketplaceUrl','timeoutMs','maxOutputBytes'];
+ const keys=['executable','home','configDir','pluginName','marketplace','marketplaceUrl','timeoutMs','maxOutputBytes','nodeScript','runtimeEnv'];
+ if(value.nodeScript!==undefined&&typeof value.nodeScript!=='boolean')return false;
+ if(value.runtimeEnv!==undefined&&(!value.runtimeEnv||typeof value.runtimeEnv!=='object'||Array.isArray(value.runtimeEnv)||!Object.entries(value.runtimeEnv).every(([key,path])=>INSTALLATION_ENV_KEYS.includes(key)&&typeof path==='string'&&!/[\x00-\x1f]/.test(path)&&(pathListKeys.has(key)?path===''||path.split(delimiter).every(absolutePath):absolutePath(path)))))return false;
  if(Object.keys(value).some(key=>!keys.includes(key))||!['executable','home','configDir'].every(key=>typeof value[key]==='string'&&isAbsolute(value[key])&&!/[\x00-\x1f]/.test(value[key])))return false;
  if(!['pluginName','marketplace'].every(key=>typeof value[key]==='string'&&/^[a-z0-9][a-z0-9._-]{0,127}$/.test(value[key])))return false;
  try{const url=new URL(value.marketplaceUrl);if(url.protocol!=='https:'||url.username||url.password||url.hash||url.search||url.href!==value.marketplaceUrl)return false}catch{return false}
@@ -17,32 +39,35 @@ export function validReader(value){
 }
 export async function runOfficialInstallationCommand({channel,reader,args,signal,workerNode}){
  if(signal?.aborted)fail('INSTALLATION_STATUS_CANCELLED');
- if(process.platform==='win32')fail('AGENT_READER_PLATFORM_UNSUPPORTED');
- if(!validReader(reader))fail('AGENT_READER_CONFIG_INVALID');
+ if(!validReader(reader))fail('AGENT_READER_DISCOVERY_INVALID');
  const nodeRuntime=guardNodeBinary({workerNode});if(!nodeRuntime)fail('AGENT_READER_NODE_REQUIRED');
  for(const path of [reader.home,reader.configDir]){let value;try{value=await stat(path)}catch{fail('AGENT_PROFILE_UNAVAILABLE')}if(!value.isDirectory())fail('AGENT_PROFILE_UNAVAILABLE')}
- const temporaryRoot=await realpath(tmpdir());let cwd;
- // An exact configuration directory is explicit. Inherited model/API tokens, proxy, shell startup and askpass are absent.
- const env={PATH:[dirname(nodeRuntime),'/usr/bin','/bin','/usr/local/bin'].join(delimiter),HOME:reader.home,USERPROFILE:reader.home,
-  ...(channel==='claude'?{CLAUDE_CONFIG_DIR:reader.configDir,CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC:'1',DISABLE_AUTOUPDATER:'1'}:{CODEX_HOME:reader.configDir}),
-  GIT_TERMINAL_PROMPT:'0',GIT_CONFIG_NOSYSTEM:'1',GIT_CONFIG_GLOBAL:'/dev/null',GIT_CONFIG_COUNT:'1',GIT_CONFIG_KEY_0:'credential.helper',GIT_CONFIG_VALUE_0:''};
+ const temporaryRoot=await realpath(tmpdir());let cwd,cleanupConfirmed=false;
+ // Keep the selected user's manager resolution conditions, without model/API tokens, proxy, preloads or askpass.
+ const systemRoot=process.platform==='win32'?(process.env.SystemRoot??'C:\\Windows'):undefined;
+ const inheritedPath=(reader.runtimeEnv?.PATH??'').split(delimiter).filter(absolutePath);
+ const env={...reader.runtimeEnv,PATH:[...new Set([dirname(nodeRuntime),dirname(reader.executable),...inheritedPath,...(systemRoot?[systemRoot,`${systemRoot}\\System32`]:['/usr/bin','/bin','/usr/local/bin'])])].join(delimiter),HOME:reader.home,USERPROFILE:reader.home,
+  ...(systemRoot?{SystemRoot:systemRoot,LOCALAPPDATA:process.env.LOCALAPPDATA??`${reader.home}\\AppData\\Local`,APPDATA:process.env.APPDATA??`${reader.home}\\AppData\\Roaming`}:{}),
+  ...(channel==='claude'?{CLAUDE_CONFIG_DIR:reader.configDir,CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC:'1',DISABLE_AUTOUPDATER:'1'}:channel==='codex'?{CODEX_HOME:reader.configDir}:{}),
+  GIT_TERMINAL_PROMPT:'0',GIT_CONFIG_NOSYSTEM:'1',GIT_CONFIG_GLOBAL:systemRoot?'NUL':'/dev/null',GIT_CONFIG_COUNT:'1',GIT_CONFIG_KEY_0:'credential.helper',GIT_CONFIG_VALUE_0:''};
  try{return await new Promise((resolve,reject)=>{
   if(signal?.aborted){reject(new AppHostError('INSTALLATION_STATUS_CANCELLED','Installation read was cancelled.',{},499));return}
-  const child=fork(new URL('./installation-worker.js',import.meta.url),[],{cwd:temporaryRoot,env,execPath:nodeRuntime,execArgv:[],detached:true,stdio:['ignore','pipe','pipe','ipc']});
+  // The reaper must survive caller death on Windows too; libuv kills non-detached children with their creator.
+  const child=fork(new URL('./installation-worker.js',import.meta.url),[],{cwd:temporaryRoot,env,execPath:nodeRuntime,execArgv:[],detached:true,windowsHide:true,stdio:['ignore','pipe','pipe','ipc']});
   const chunks=[];let total=0,stderr=false,fault,exited=false,message;
-  const kill=code=>{fault??=code;if(!exited&&child.pid){child.kill('SIGTERM')}};
+  const kill=code=>{fault??=code;if(!exited&&child.pid){if(process.platform==='win32'){if(child.connected)child.send({abort:true},()=>{})}else child.kill('SIGTERM')}};
   const abort=()=>kill('INSTALLATION_STATUS_CANCELLED');signal?.addEventListener('abort',abort,{once:true});
   const timer=setTimeout(()=>kill('AGENT_READER_TIMEOUT'),reader.timeoutMs);
   child.stdout.on('data',chunk=>{total+=chunk.length;if(total>reader.maxOutputBytes)kill('AGENT_READER_OUTPUT_LIMIT');else chunks.push(chunk)});
   child.stderr.on('data',chunk=>{stderr=true;total+=chunk.length;if(total>reader.maxOutputBytes)kill('AGENT_READER_OUTPUT_LIMIT')});
-  child.on('message',value=>{if(typeof value.directory==='string')cwd=value.directory;else message=value});
+  child.on('message',value=>{if(typeof value.directory==='string')cwd=value.directory;else{message=value;cleanupConfirmed=value.cleanupComplete===true}});
   child.once('exit',()=>{exited=true});
   child.once('error',error=>{fault??=error.code==='EACCES'?'AGENT_READER_PERMISSION_DENIED':'AGENT_READER_UNAVAILABLE'});
   child.once('close',code=>{exited=true;clearTimeout(timer);signal?.removeEventListener('abort',abort);
-   if(fault||message?.error||message?.result!==0||stderr)reject(new AppHostError(fault??message?.error??(stderr?'AGENT_READER_DIAGNOSTIC':'AGENT_READER_FAILED'),'The configured official reader did not return a complete clean result.',{},503));
+   if(fault||message?.error||message?.result!==0||(stderr&&channel!=='shell'))reject(new AppHostError((cwd&&!cleanupConfirmed?'AGENT_READER_CLEANUP_FAILED':fault??message?.error)??(stderr&&channel!=='shell'?'AGENT_READER_DIAGNOSTIC':'AGENT_READER_FAILED'),'The official reader did not return a complete successful result.',{},503));
    else resolve(Buffer.concat(chunks).toString('utf8'));
   });
-  if(child.connected)child.send({executable:reader.executable,args,temporaryRoot,env},()=>{});
+  if(child.connected)child.send({executable:reader.nodeScript?nodeRuntime:reader.executable,args:reader.nodeScript?[reader.executable,...args]:args,temporaryRoot,env},()=>{});
   if(signal?.aborted)abort();
- })}finally{if(cwd)await rm(cwd,{recursive:true,force:true})}
+ })}finally{if(cwd&&cleanupConfirmed)await rm(cwd,{recursive:true,force:true,maxRetries:4,retryDelay:25})}
 }

package/dist/library/installation-command-worker.js

@@ -1,7 +1,8 @@
 /** Live command-group anchor. Its separate reaper removes the cwd only after this group has ended. */
-import {spawn} from 'node:child_process';
+import {spawn,spawnSync} from 'node:child_process';
+import {join} from 'node:path';
 let started=false,reported=false;
-const stopOwnedGroup=()=>process.kill(-process.pid,'SIGKILL');
+const stopOwnedGroup=()=>{if(process.platform==='win32'){spawnSync(join(process.env.SystemRoot,'System32','taskkill.exe'),['/pid',String(process.pid),'/T','/F'],{stdio:'ignore',windowsHide:true});process.exit(1)}else process.kill(-process.pid,'SIGKILL')};
 function report(payload){
  if(reported)return;reported=true;
  if(process.connected){try{process.send(payload,error=>{if(error)stopOwnedGroup()})}catch{stopOwnedGroup()}}else stopOwnedGroup();

package/dist/library/installation-discovery.js

@@ -0,0 +1,95 @@
+/** Host-only discovery. Lists executable directories, never authentication/config contents. */
+import {access,stat,readdir} from 'node:fs/promises';
+import {constants} from 'node:fs';
+import {homedir,userInfo} from 'node:os';
+import {join,isAbsolute} from 'node:path';
+import semver from 'semver';
+import {AppHostError} from '../errors.js';
+import {guardNodeBinary} from '../git-process.js';
+import {runOfficialInstallationCommand,INSTALLATION_ENV_KEYS,installationEnvironment} from './installation-cli.js';
+
+// Existing installation-command fixture budgets; automatic selection adds no retry or longer deadline.
+export const INSTALLATION_READ_BUDGET=Object.freeze({timeoutMs:2000,maxOutputBytes:20000});
+export const AGENT_INSTALLATION_TARGET=Object.freeze({pluginName:'hanamesh',marketplace:'hanamesh',marketplaceUrl:'https://github.com/yzsnstotz/hanamesh-plugins'});
+const absolute=value=>typeof value==='string'&&isAbsolute(value)&&!/[\x00-\x1f]/.test(value);
+const failure=code=>new AppHostError(code,'Automatic official CLI discovery could not complete.',{},503);
+const split=(value,platform)=>(value??'').split(platform==='win32'?';':':').filter(absolute);
+const unique=values=>[...new Set(values.filter(absolute))];
+async function exists(file,platform){try{if(!(await stat(file)).isFile())return false;await access(file,platform==='win32'?constants.F_OK:constants.X_OK);return true}catch(error){if(['ENOENT','ENOTDIR'].includes(error.code))return false;if(['EACCES','EPERM'].includes(error.code))throw failure('AGENT_READER_PERMISSION_DENIED');throw failure('AGENT_READER_UNAVAILABLE')}}
+async function versions(root,suffix){
+ let entries;try{entries=await readdir(root,{withFileTypes:true})}catch(error){if(['ENOENT','ENOTDIR'].includes(error.code))return[];throw failure(error.code==='EACCES'?'AGENT_READER_PERMISSION_DENIED':'AGENT_READER_UNAVAILABLE')}
+ return entries.filter(entry=>(entry.isDirectory()||entry.isSymbolicLink())&&semver.valid(entry.name.replace(/^v/,''))).sort((a,b)=>semver.rcompare(a.name.replace(/^v/,''),b.name.replace(/^v/,''))).map(entry=>join(root,entry.name,...suffix));
+}
+
+/** VS Code's framed login-shell environment pattern, narrowed to named infrastructure paths only. */
+export async function readLoginEnvironment({home=homedir(),env=process.env,signal,workerNode,timeoutMs=INSTALLATION_READ_BUDGET.timeoutMs,runCommand=runOfficialInstallationCommand}={}){
+ const shell=env.SHELL??userInfo().shell;
+ if(!absolute(shell))throw failure('AGENT_SHELL_ENV_UNAVAILABLE');
+ const node=guardNodeBinary({workerNode});if(!node)throw failure('AGENT_READER_NODE_REQUIRED');
+ const quote=value=>"'"+value.replaceAll("'","'\\''")+"'";
+ const script=`const env={};for(const key of ${JSON.stringify(INSTALLATION_ENV_KEYS)})if(process.env[key]!==undefined)env[key]=process.env[key];process.stdout.write('\\0HANAMESH_ENV\\0'+JSON.stringify(env)+'\\0');`;
+ const output=await runCommand({channel:'shell',reader:{executable:shell,home,configDir:home,...AGENT_INSTALLATION_TARGET,...INSTALLATION_READ_BUDGET,timeoutMs,runtimeEnv:installationEnvironment(env)},
+  args:['-ilc',`${quote(node)} -e ${quote(script)}`],signal,workerNode});
+ const parts=output.split('\0HANAMESH_ENV\0');
+ if(parts.length!==2||!parts[1].includes('\0'))throw failure('AGENT_SHELL_ENV_UNAVAILABLE');
+ let value;try{value=JSON.parse(parts[1].split('\0')[0])}catch{throw failure('AGENT_SHELL_ENV_UNAVAILABLE')}
+ if(!value||typeof value!=='object'||Array.isArray(value)||typeof value.PATH!=='string'||!Object.entries(value).every(([key,path])=>INSTALLATION_ENV_KEYS.includes(key)&&typeof path==='string'&&!/[\x00-\x1f]/.test(path)))throw failure('AGENT_SHELL_ENV_UNAVAILABLE');
+ return installationEnvironment(value);
+}
+export async function readLoginPath(options){return(await readLoginEnvironment(options)).PATH}
+
+/** Select once: inherited PATH, login PATH, then documented layouts; never try another CLI after execution. */
+export async function discoverOfficialReader({channel,home=process.env.HOME??process.env.USERPROFILE??homedir(),env=process.env,platform=process.platform,
+ systemBinDirs=platform==='win32'?[]:['/opt/homebrew/bin','/usr/local/bin','/home/linuxbrew/.linuxbrew/bin','/usr/bin','/bin'],loginPath,signal,workerNode}={}){
+ if(!['claude','codex'].includes(channel)||!absolute(home))throw failure('AGENT_PROFILE_UNAVAILABLE');
+ signal?.throwIfAborted();
+ const configDir=env[channel==='claude'?'CLAUDE_CONFIG_DIR':'CODEX_HOME']??join(home,channel==='claude'?'.claude':'.codex');
+ if(!absolute(configDir))throw failure('AGENT_PROFILE_UNAVAILABLE');
+ const appData=env.APPDATA??join(home,'AppData','Roaming'),local=env.LOCALAPPDATA??join(home,'AppData','Local');
+ const runtimeEnv=installationEnvironment(env,platform);
+ const reader={home,configDir,...AGENT_INSTALLATION_TARGET,...INSTALLATION_READ_BUDGET,runtimeEnv};
+ const find=async dirs=>{for(const dir of unique(dirs)){
+  signal?.throwIfAborted();
+  for(const name of platform==='win32'?[`${channel}.exe`,`${channel}.cmd`]:[channel]){
+   const executable=join(dir,name);if(!await exists(executable,platform))continue;
+   if(name.endsWith('.cmd')){
+    const entry=channel==='claude'?['@anthropic-ai','claude-code','cli.js']:['@openai','codex','bin','codex.js'];
+    const entries=[join(dir,'node_modules',...entry)];
+    if(dir===join(local,'Yarn','bin'))entries.push(join(local,'Yarn','Data','global','node_modules',...entry));
+    if(dir===join(home,'.yarn','bin'))entries.push(join(home,'.config','yarn','global','node_modules',...entry));
+    // pnpm's global layout has a numbered compatibility directory; inspect directory names only.
+    for(const base of unique([dir,...(dir===join(local,'pnpm','bin')?[join(local,'pnpm')]:[]),...(absolute(env.PNPM_HOME)&&dir===join(env.PNPM_HOME,'bin')?[env.PNPM_HOME]:[])])){
+     let global=[];try{global=await readdir(join(base,'global'))}catch(error){if(!['ENOENT','ENOTDIR'].includes(error.code))throw failure('AGENT_READER_ENTRYPOINT_UNAVAILABLE')}
+     for(const name of global.filter(name=>/^\d+$/.test(name)).sort((a,b)=>Number(b)-Number(a)))entries.push(join(base,'global',name,'node_modules',...entry));
+    }
+    let script;for(const candidate of entries)if(await exists(candidate,'win32')){script=candidate;break}
+    if(!script)throw failure('AGENT_READER_ENTRYPOINT_UNAVAILABLE');
+    return{...reader,executable:script,nodeScript:true};
+   }
+   return{...reader,executable};
+  }
+ }return null};
+ let selected=await find(split(env.PATH??env.Path,platform));if(selected)return selected;
+ let shellError;
+ if(platform!=='win32'){
+  try{const resolved=loginPath?{PATH:await loginPath({home,env,signal,workerNode})}:await readLoginEnvironment({home,env,signal,workerNode});Object.assign(runtimeEnv,resolved);selected=await find(split(resolved.PATH,platform));if(selected)return selected}
+  catch(error){if(signal?.aborted)throw error;shellError=error}
+ }
+ const nvm=runtimeEnv.NVM_DIR??join(home,'.nvm'),fnm=runtimeEnv.FNM_DIR??join(runtimeEnv.XDG_DATA_HOME??join(home,'.local','share'),'fnm'),asdf=runtimeEnv.ASDF_DATA_DIR??join(home,'.asdf'),mise=runtimeEnv.MISE_DATA_DIR??join(runtimeEnv.XDG_DATA_HOME??join(home,'.local','share'),'mise');
+ const fixed=[join(home,'.local','bin'),...(channel==='claude'?[join(home,'.claude','local'),join(home,'.claude','local','node_modules','.bin')]:[]),
+  env.CODEX_INSTALL_DIR,env.NVM_BIN,env.NVM_SYMLINK,env.FNM_MULTISHELL_PATH,
+  ...[env.npm_config_prefix,env.NPM_CONFIG_PREFIX,join(home,'.npm-global'),join(home,'.npm')].filter(absolute).map(root=>platform==='win32'?root:join(root,'bin')),
+  env.PNPM_HOME,...(absolute(env.PNPM_HOME)?[join(env.PNPM_HOME,'bin')]:[]),join(home,'.local','share','pnpm'),join(home,'.local','share','pnpm','bin'),join(home,'Library','pnpm'),join(home,'Library','pnpm','bin'),join(home,'.yarn','bin'),join(home,'.config','yarn','global','node_modules','.bin'),
+  join(env.VOLTA_HOME??join(home,'.volta'),'bin'),join(asdf,'shims'),join(mise,'shims'),
+  ...(platform==='win32'?[join(appData,'npm'),join(local,'pnpm'),join(local,'Yarn','bin'),join(local,'Programs','OpenAI','Codex','bin'),join(local,'Microsoft','WinGet','Links'),join(local,'Volta','bin'),...(absolute(env.ProgramFiles)?[join(env.ProgramFiles,'nodejs')]:[])]:[]),...systemBinDirs];
+ selected=await find(fixed);if(selected)return selected;
+ const managed=[];
+ for(const [root,suffix]of [[join(nvm,'versions','node'),['bin']],[env.NVM_HOME,[]],[join(fnm,'node-versions'),['installation',...(platform==='win32'?[]:['bin'])]],
+  [join(home,'Library','Application Support','fnm','node-versions'),['installation','bin']],[join(appData,'fnm','node-versions'),['installation']],
+  [join(asdf,'installs','nodejs'),['bin']],[join(mise,'installs','node'),['bin']]]){
+  if(absolute(root))managed.push(...await versions(root,suffix));
+ }
+ selected=await find(managed);if(selected)return selected;
+ if(shellError)throw failure(shellError.code==='AGENT_READER_TIMEOUT'?'AGENT_READER_TIMEOUT':'AGENT_SHELL_ENV_UNAVAILABLE');
+ throw failure('AGENT_READER_UNAVAILABLE');
+}

package/dist/library/installation-status.js

@@ -2,7 +2,8 @@
 import semver from 'semver';
 import {AppHostError} from '../errors.js';
 import {SUITE_BUNDLE,createCoreSuiteAdapter,SUITE_PACKAGES} from './suite.js';
-import {SUPPORTED_READER_VERSIONS,validReader,runOfficialInstallationCommand} from './installation-cli.js';
+import {readerVersionFailure,validReader,runOfficialInstallationCommand} from './installation-cli.js';
+import {discoverOfficialReader} from './installation-discovery.js';
 const object=x=>x!==null&&typeof x==='object'&&!Array.isArray(x);
 const exact=x=>typeof x==='string'&&semver.valid(x)===x?x:null;
 const reason=(code,message,action)=>({code,message,action});
@@ -16,6 +17,11 @@ const unknown=(row,code,message,action)=>({...row,status:'unknown',version:null,
 const agentBase=channel=>base(channel,'agent-cli','official-user-profile',channel==='claude'?'Claude Code 用户级插件（不覆盖项目或其他隔离资料）':'Codex CLI 本地市场用户资料（不代表桌面 App、项目或其他隔离资料）');
 const inventoryError=()=>{throw new AppHostError('AGENT_INVENTORY_INVALID','Official inventory shape is unsupported.',{},503)};
 const qualified=x=>typeof x==='string'&&/^[a-z0-9][a-z0-9._-]*@[a-z0-9][a-z0-9._-]*$/.test(x)&&x.length<=257;
+function claudeMarketplaceUrl(value){
+ if(value.source==='github'&&typeof value.repo==='string'&&/^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(value.repo))return `https://github.com/${value.repo}`;
+ const url=['url','git'].includes(value.source)?value.url:null;
+ return value.source==='git'&&typeof url==='string'&&/^https:\/\/github\.com\/[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+\.git$/.test(url)?url.slice(0,-4):url;
+}
 function parseInventory(channel,plugins,marketplaces,target){
  let rows,markets;
  if(channel==='claude'){
@@ -28,7 +34,7 @@ function parseInventory(channel,plugins,marketplaces,target){
  if(!markets.every(r=>object(r)&&typeof r.name==='string'&&r.name.length>0&&r.name.length<=128))inventoryError();
  const sourceRows=markets.filter(r=>r.name===target.marketplace);
  if(sourceRows.length>1)throw new AppHostError('AGENT_INVENTORY_CONFLICT','Conflicting marketplace identities.',{},503);
- if(sourceRows.length){const m=sourceRows[0],url=channel==='claude'?(['url','git'].includes(m.source)?m.url:null):(['git','url'].includes(m.marketplaceSource?.sourceType)?m.marketplaceSource.source:null);
+ if(sourceRows.length){const m=sourceRows[0],url=channel==='claude'?claudeMarketplaceUrl(m):(['git','url'].includes(m.marketplaceSource?.sourceType)?m.marketplaceSource.source:null);
   if(url!==target.marketplaceUrl)throw new AppHostError('AGENT_MARKETPLACE_SOURCE_MISMATCH','The configured marketplace source is not the registered target.',{},503);
  }
  const id=`${target.pluginName}@${target.marketplace}`;
@@ -48,11 +54,11 @@ function parseInventory(channel,plugins,marketplaces,target){
  return{status:failed?'incomplete':'installed',version,components:[{name:target.pluginName,version,active:row.enabled}],
   reason:failed?reason(channel==='claude'?'AGENT_PLUGIN_LOAD_FAILED':'AGENT_PLUGIN_PAYLOAD_MISSING','官方清单报告插件负载或加载问题。','在该官方客户端的插件详情中检查并修复。'):version===null?reason('AGENT_VERSION_UNAVAILABLE','已确认该作用域的安装记录，但实际版本未知。','在该官方客户端插件详情中核对实际版本。'):null};
 }
-const failureCodes=new Set(['AGENT_READER_UNAVAILABLE','AGENT_READER_PERMISSION_DENIED','AGENT_READER_PLATFORM_UNSUPPORTED','AGENT_READER_NODE_REQUIRED','AGENT_PROFILE_UNAVAILABLE','AGENT_READER_TIMEOUT','AGENT_READER_OUTPUT_LIMIT','AGENT_READER_CLEANUP_FAILED','AGENT_READER_DIAGNOSTIC','AGENT_READER_FAILED','AGENT_INVENTORY_INVALID','AGENT_INVENTORY_CONFLICT','AGENT_MARKETPLACE_SOURCE_MISMATCH','AGENT_MARKETPLACE_SOURCE_UNAVAILABLE','AGENT_SCOPE_UNOBSERVABLE']);
-/** Trusted static configuration only; `core` is the optional public protocol-1 Cordis service accessor. */
-export function createInstallationStatusReader({client='dsh',core=()=>undefined,readers={},workerNode,runCommand=runOfficialInstallationCommand}={}){
+const failureCodes=new Set(['AGENT_SHELL_ENV_UNAVAILABLE','AGENT_READER_DISCOVERY_INVALID','AGENT_READER_ENTRYPOINT_UNAVAILABLE','AGENT_READER_UNAVAILABLE','AGENT_READER_PERMISSION_DENIED','AGENT_READER_NODE_REQUIRED','AGENT_PROFILE_UNAVAILABLE','AGENT_READER_TIMEOUT','AGENT_READER_OUTPUT_LIMIT','AGENT_READER_CLEANUP_FAILED','AGENT_READER_DIAGNOSTIC','AGENT_READER_FAILED','AGENT_INVENTORY_INVALID','AGENT_INVENTORY_CONFLICT','AGENT_MARKETPLACE_SOURCE_MISMATCH','AGENT_MARKETPLACE_SOURCE_UNAVAILABLE','AGENT_SCOPE_UNOBSERVABLE']);
+/** Automatic current-user discovery only; `core` is the optional public protocol-1 Cordis service accessor. */
+export function createInstallationStatusReader({client='dsh',core=()=>undefined,workerNode,runCommand=runOfficialInstallationCommand,discoverReader=discoverOfficialReader}={}){
  if(!['dsh','hanamesh'].includes(client))throw new TypeError('client must be dsh or hanamesh');
- const settings=structuredClone(readers??{}),active=new Set();let closed=false;
+ const active=new Set();let closed=false;
  const suite=createCoreSuiteAdapter({core});
  async function runtime(signal){
   const row=base(client,'current-runtime','responding-runtime',client==='dsh'?'当前响应的 DSH runtime':'当前响应的 HanaMesh 客户端 runtime');
@@ -64,20 +70,20 @@ export function createInstallationStatusReader({client='dsh',core=()=>undefined,
   }catch(error){if(signal.aborted)throw interrupted();const code=['CORE_SUITE_DECLARATION_MISSING','CORE_SUITE_DECLARATION_INVALID'].includes(error.code)?error.code:'CORE_SUITE_READ_FAILED';return unknown(row,code,code==='CORE_SUITE_DECLARATION_MISSING'?'本 runtime 未提供 Core 套件声明方法。':'本次 Core 套件声明读取失败。','启用支持 protocol 1 getSuiteDeclaration 的 Core，查看其设置并重新检测。')}
  }
  async function agent(channel,signal){
-  const initial=agentBase(channel),config=settings[channel];
-  if(config===undefined)return unknown(initial,'AGENT_READER_NOT_CONFIGURED','尚未配置该渠道的官方只读清单读取器。','在 AppHost library.installationReaders 中配置官方命令、用户资料、登记目标与读取预算后重新检测。');
-  if(!validReader(config))return unknown(initial,'AGENT_READER_CONFIG_INVALID','官方读取器缺少有效的显式配置。','核对 library.installationReaders 的绝对路径、登记插件名/市场来源和必填读取预算。');
-  const row={...initial,identity:{pluginName:config.pluginName,marketplace:config.marketplace}};
-  const invoke=args=>abortable(runCommand({channel,reader:config,args,signal,workerNode}),signal);
+  const initial=agentBase(channel);let row=initial;
   try{
-   const version=(await invoke(['--version'])).trim();
-   if(version!==SUPPORTED_READER_VERSIONS[channel])return unknown(row,'AGENT_READER_VERSION_UNSUPPORTED','该官方 CLI 版本尚未验证此读取协议。','使用提供方正文列明的支持版本，或先核实新版本官方清单协议。');
+   const config=await abortable(discoverReader({channel,signal,workerNode}),signal);
+   if(!validReader(config))throw new AppHostError('AGENT_READER_DISCOVERY_INVALID','Invalid automatic reader.',{},503);
+   row={...initial,identity:{pluginName:config.pluginName,marketplace:config.marketplace}};
+   const invoke=args=>abortable(runCommand({channel,reader:config,args,signal,workerNode}),signal);
+   const versionFailure=readerVersionFailure(channel,await invoke(['--version']));
+   if(versionFailure)return unknown(row,versionFailure,versionFailure==='AGENT_READER_VERSION_INVALID'?'官方 CLI 版本输出格式无效。':'官方 CLI 低于支持的最低版本。','通过官方渠道升级 Claude Code 至 2.1.301 或以上、Codex CLI 至 0.162.1 或以上，再重新检测。');
    const suffix=channel==='codex'?['--disable','remote_plugin']:[];
    const text=await invoke(['plugin','list','--json',...suffix]);
    const sourceText=await invoke(['plugin','marketplace','list','--json',...suffix]);
    let plugins,marketplaces;try{plugins=JSON.parse(text);marketplaces=JSON.parse(sourceText)}catch{inventoryError()}
    return{...row,...parseInventory(channel,plugins,marketplaces,config)};
-  }catch(error){if(signal.aborted||error.code==='INSTALLATION_STATUS_CANCELLED')throw interrupted();const code=failureCodes.has(error.code)?error.code:'AGENT_READER_FAILED';return unknown(row,code,'本次官方清单读取未能提供完整且一致的安装事实。','在对应官方 CLI 的已配置用户资料中检查插件与市场清单、权限或诊断，修复后显式重检。')}
+  }catch(error){if(signal.aborted||error.code==='INSTALLATION_STATUS_CANCELLED')throw interrupted();const code=failureCodes.has(error.code)?error.code:'AGENT_READER_FAILED';const messages={AGENT_READER_UNAVAILABLE:'未在当前用户的 PATH 或常见安装位置找到官方 CLI。',AGENT_SHELL_ENV_UNAVAILABLE:'登录 shell 的 PATH 未能读取。',AGENT_PROFILE_UNAVAILABLE:'当前用户的官方资料目录不存在或不可访问。',AGENT_READER_TIMEOUT:'本次官方只读检测超时。',AGENT_INVENTORY_INVALID:'官方清单 JSON 不符合受支持的格式。',AGENT_READER_DISCOVERY_INVALID:'自动发现的官方 CLI 信息无效。',AGENT_READER_ENTRYPOINT_UNAVAILABLE:'已发现 Windows 命令入口，但官方 npm 程序文件缺失。'};return unknown(row,code,messages[code]??'本次官方清单读取未能提供完整且一致的安装事实。','在终端确认官方 CLI 可运行，并在其用户级插件页面检查清单、权限和市场来源后重新检测。')}
  }
  const read=async({signal}={})=>{
   if(closed||signal?.aborted)throw interrupted();const controller=new AbortController();active.add(controller);const combined=signal?AbortSignal.any([signal,controller.signal]):controller.signal;