@hanamesh/dsh-app-host 0.6.21 → 0.6.24

package/dist/library/install.js

@@ -8,7 +8,7 @@ import { redact } from '../runtime.js';
 import { AppHostError, requireCondition, SerialQueue } from '../errors.js';
 import {noteFailurePhase} from './diagnostics.js';
 import { validateDefinition } from '../descriptor.js';
-import { itemKind } from './catalog.js';
+import { isApplication } from './catalog.js';
 import { profileSnapshot, runtimeSnapshot, profileChecks, runtimeChecks, packageRestoreArgs, keepOriginals } from './recovery.js';
 import {SUITE_BUNDLE,prepareSuiteUpgrade,readSuiteStatus,createCoreSuiteAdapter} from './suite.js';
 import {packageInstallTarget,installTargetName,pinnedGithubSpec} from './github-target.js';
@@ -17,7 +17,6 @@ import {packageInstallTarget,installTargetName,pinnedGithubSpec} from './github-
 export const PROTECTED_PACKAGES=Object.freeze([SUITE_BUNDLE,'@hanamesh/core','@hanamesh/usage','@hanamesh/dsh-app-host','hanamesh-brand']);
 const blocked=new Set(PROTECTED_PACKAGES);
 const packageName=value=>typeof value==='string'&&/^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/.test(value);
-const versionText=value=>typeof value==='string'&&/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/.test(value);
 async function json(path){return JSON.parse(await readFile(path,'utf8'));}
 const defaultSpawn=spawnGitSafe;
 
@@ -46,8 +45,8 @@ async function clearGeneratedRuntimeCache(result,runtimeRoot){
 }
 
 /** Package mutations use the public CLI in an owned monitored process; upstream's in-process manager has no scoped env/monitor port. */
-export function createLibraryInstaller({profileDir,profileName,dataRoot,nodeBinary,dshBin,desktopCli,desktopLauncher,pluginManagerVersion,registryRules,registry,allowPrerelease=false,
-  fetchImpl=globalThis.fetch,spawn=defaultSpawn,provision,remove,ledger,coreSuitePlan,coreService=()=>undefined,suiteSourceMode=()=>'configured',suiteSourceService=()=>undefined,pluginManager=()=>undefined,emit=()=>{},profileWriter=new SerialQueue()}){
+export function createLibraryInstaller({profileDir,profileName,dataRoot,nodeBinary,dshBin,desktopCli,desktopLauncher,pluginManagerVersion,registry,
+  spawn=defaultSpawn,provision,remove,ledger,coreSuitePlan,coreService=()=>undefined,suiteSourceMode=()=>'configured',suiteSourceService=()=>undefined,emit=()=>{},profileWriter=new SerialQueue()}){
   requireCondition(typeof profileDir==='string'&&resolve(profileDir)===profileDir,'PROFILE_DIR_REQUIRED','library.profileDir must be an absolute path.');
   requireCondition(typeof dataRoot==='string'&&resolve(dataRoot)===dataRoot,'INVALID_ROOT','dataRoot must be absolute.');
   const launcherAvailable=typeof desktopLauncher?.command==='string'&&resolve(desktopLauncher.command)===desktopLauncher.command&&typeof desktopLauncher.home==='string'&&join(desktopLauncher.home,'profiles',profileName)===profileDir;
@@ -66,58 +65,15 @@ export function createLibraryInstaller({profileDir,profileName,dataRoot,nodeBina
   const runtimeApi=async name=>injected[name]??(await defaults())[name];
   async function installed(packageNameValue){const root=join(profileDir,'node_modules',...packageNameValue.split('/')),pkg=await json(join(root,'package.json'));const appFile=typeof pkg.hanamesh?.app==='string'?pkg.hanamesh.app:'app.json';return{pkg,definition:validateDefinition(await json(join(root,appFile)))};}
   const commandPath=command=>[dirname(command),...(process.platform==='win32'?(process.env.PATH??process.env.Path??'').split(delimiter):['/opt/homebrew/bin','/usr/local/bin','/usr/bin','/bin'])].join(delimiter);
-  async function run(args){try{requireCondition(cliAvailable,'DSH_CLI_UNAVAILABLE','The official dsh plugin CLI is unavailable in this host.',{need:['nodeBinary','dshBin']},503);
-    const options={cwd:profileDir,workerNode:supervisorNode,env:safeGitEnv({HOME:process.env.HOME,DSH_HOME:process.env.DSH_HOME,LANG:process.env.LANG??'C.UTF-8',PATH:commandPath(nodeBinary??desktopLauncher.command)})},tail=['plugin','--profile',profileName,...args];
+  const run=args=>runCli(['plugin','--profile',profileName,...args]);
+  async function runCli(tail){try{requireCondition(cliAvailable,'DSH_CLI_UNAVAILABLE','The official dsh plugin CLI is unavailable in this host.',{need:['nodeBinary','dshBin']},503);
+    const options={cwd:profileDir,workerNode:supervisorNode,env:safeGitEnv({HOME:process.env.HOME,DSH_HOME:process.env.DSH_HOME,LANG:process.env.LANG??'C.UTF-8',PATH:commandPath(nodeBinary??desktopLauncher.command)})};
     if(launcherAvailable)options.env=safeGitEnv({...options.env,DSH_HOME:desktopLauncher.home,PATH:commandPath(desktopLauncher.command)});
     const result=await spawn(launcherAvailable?desktopLauncher.command:nodeBinary,launcherAvailable?tail:[...(desktopCli?['--expose-internals',fileURLToPath(new URL('./desktop-cli.js',import.meta.url)),desktopCli.entry,desktopCli.runtimeDir,desktopCli.supportDir]:[dshBin]),...tail],options);
     const clean=text=>redact(stripVTControlCharacters(String(text??''))).replace(/(https?:\/\/)[^/\s@]+@/g,'$1[REDACTED]@').slice(-2000);
     const stdout=clean(result.stdout),stderr=clean(result.stderr);
     requireCondition(result.code===0,'DSH_PLUGIN_FAILED','DSH plugin operation failed.',{code:result.code,signal:result.signal,stderr,diagnostic:[stdout,stderr].filter(Boolean).join('\n')||`DSH plugin exited with code ${result.code}${result.signal?' ('+result.signal+')':''}.`},502);return result;
     }catch(error){noteFailurePhase(error,'CLI run');throw error;}}
-  /** Bound the entire pre-install lookup, including public source discovery and metadata readback. */
-  async function latest(name){
-    const controller=new AbortController();let timer,phase='registry configuration';
-    const timeout=new Promise((_,reject)=>{timer=setTimeout(()=>{
-      const error=new AppHostError('REGISTRY_LOOKUP_TIMEOUT','Registry lookup timed out after 30000ms. Check DSH registry settings and network, then retry explicitly.',{},504);
-      noteFailurePhase(error,phase);controller.abort(error);reject(error);
-    },30000);});
-    async function lookup(){
-      const manager=pluginManager();
-      requireCondition(typeof manager?.registries==='function','REGISTRY_CONFIG_UNAVAILABLE','DSH does not expose registry configuration. Restore the public plugin manager before installing.',{},503);
-      // Public DSH ports own ordering, normalization, de-duplication and private-registry isolation.
-      const ruleMessage='DSH does not expose its registry rules. Restore the public plugin manager before installing.';
-      requireCondition(typeof registryRules==='function','REGISTRY_CONFIG_UNAVAILABLE',ruleMessage,{},503);
-      let rules;try{rules=await registryRules();}catch(cause){const error=new AppHostError('REGISTRY_CONFIG_UNAVAILABLE',ruleMessage,{},503);error.cause=cause;throw error;}
-      const {registryPlan,attributeFailure}=rules??{};
-      requireCondition(typeof registryPlan==='function'&&typeof attributeFailure==='function','REGISTRY_CONFIG_UNAVAILABLE',ruleMessage,{},503);
-      controller.signal.throwIfAborted();const configured=await manager.registries();controller.signal.throwIfAborted();
-      const plan=registryPlan(registry,configured);
-      for(let index=0;index<plan.length;index++){
-        const selected=plan[index],source=selected??configured.resolved;let failureKind='unknown';
-        controller.signal.throwIfAborted();phase='registry configuration';
-        requireCondition(typeof source==='string','REGISTRY_CONFIG_UNAVAILABLE','DSH could not resolve its configured registry. Check DSH registry settings.',{},503);
-        const base=new URL(source);requireCondition(['https:','http:'].includes(base.protocol),'REGISTRY_DENIED','Registry URL is invalid.');
-        try{
-          phase='registry fetch';let response;
-          try{response=await fetchImpl(new URL(`${base.href.replace(/\/$/,'')}/${encodeURIComponent(name)}/latest`),{headers:{accept:'application/json','accept-encoding':'identity'},signal:controller.signal});}
-          catch(error){failureKind='network';throw error;}
-          controller.signal.throwIfAborted();if(!response.ok){failureKind=response.status===404?'not-found':response.status>=500?'network':'unknown';throw new AppHostError('REGISTRY_LOOKUP_FAILED','Registry latest lookup failed. Check DSH registry settings and network, then retry explicitly.',{status:response.status},502);}
-          phase='registry readback';const metadata=await response.json();controller.signal.throwIfAborted();const version=metadata.version;
-          requireCondition(versionText(version)&&(allowPrerelease||!version.includes('-')),'UNSTABLE_VERSION','Registry latest must be an exact stable version.');
-          return{version,registry:selected};
-        }catch(error){
-          // Ask only fallbacks configured by DSH, and only when its public rule permits another source.
-          if(!controller.signal.aborted&&index+1<plan.length&&attributeFailure(failureKind,'',{kind:'registry',name,spec:name})==='registry')continue;
-          throw error;
-        }
-      }
-    }
-    try{return await Promise.race([lookup(),timeout]);}
-    catch(cause){
-      const error=cause instanceof AppHostError?cause:new AppHostError('REGISTRY_LOOKUP_FAILED','Registry lookup failed. Check DSH registry settings and network, then retry explicitly.',{},502);
-      if(error!==cause)error.cause=cause;noteFailurePhase(error,phase);throw error;
-    }finally{clearTimeout(timer);}
-  }
   /**
    * rc.10 compensation after a failed install: the package goes back to its baseline spec through the official CLI, runtime
    * items this operation newly claimed are removed by ownership, a replaced baseline item is provisioned again from the
@@ -162,8 +118,7 @@ export function createLibraryInstaller({profileDir,profileName,dataRoot,nodeBina
     try{
       base=await profileSnapshot(profileDir,name);
       stage='before-add';let version;const target=item.installTarget,github=target?.source==='github';
-      if(target?.source==='npm'){version=target.version;installRegistry=registry??null;}
-      else if(!github)({version,registry:installRegistry}=await latest(name));
+      if(target.source==='npm'){version=target.version;installRegistry=registry??null;}
       const spec=github?pinnedGithubSpec(target.repo,target.ref,target.path):`${name}@${version}`;
       const status='restart-required';
       stage='add';await run(['add','--save-exact',...(installRegistry===null?[]:[`--registry=${installRegistry}`]),...(target?.allowBuild??[]).map(entry=>`--allow-build=${entry}`),spec]);
@@ -188,7 +143,7 @@ export function createLibraryInstaller({profileDir,profileName,dataRoot,nodeBina
     catch(error){emit({type:'library.install-failed',...(item.id?{itemId:item.id}:{}),packageName:name,kind,...(item.installTarget?{installTarget:item.installTarget}:{}),code:error.code??'INSTALL_FAILED',...(error.recovery?{recovery:error.recovery}:{})});throw error;}
   }
   let suitePlan;
-  const suiteProvider=coreSuitePlan??createCoreSuiteAdapter({core:coreService,registry:registry??'https://registry.npmjs.org',suiteSourceMode,suiteSourceService});
+  const suiteProvider=coreSuitePlan??createCoreSuiteAdapter({core:coreService,registry,profileName,suiteSourceMode,suiteSourceService});
   async function previewSuite(){
     const next=await prepareSuiteUpgrade({coreSuitePlan:suiteProvider});
     suitePlan={...next,planId:randomUUID()};return structuredClone(suitePlan);
@@ -204,7 +159,7 @@ export function createLibraryInstaller({profileDir,profileName,dataRoot,nodeBina
       requireCondition(suitePlan?.planId===planId,'SUITE_PLAN_CHANGED','升级确认已变化，请重新查看并确认。',{},409);
       const confirmed=suitePlan;suitePlan=undefined;
       const fresh=await prepareSuiteUpgrade({coreSuitePlan:suiteProvider});
-      const identity=plan=>JSON.stringify({sourceBinding:plan.sourceBinding,bundle:plan.bundle,components:plan.components,declarationId:plan.declarationId,registry:plan.registry,selectedUpgrade:plan.selectedUpgrade,physicalBaseline:plan.physicalBaseline});
+      const identity=plan=>JSON.stringify({installation:plan.installation,sourceBinding:plan.sourceBinding,bundle:plan.bundle,components:plan.components,declarationId:plan.declarationId,registry:plan.registry,selectedUpgrade:plan.selectedUpgrade,physicalBaseline:plan.physicalBaseline});
       requireCondition(identity(fresh)===identity(confirmed),'SUITE_PLAN_CHANGED','套件声明或版本已变化，请重新查看并确认。',{},409);
       requireCondition(fresh.available,'SUITE_NO_UPDATE','当前没有兼容新版。',{},409);
       const before=await readSuiteStatus(profileDir);
@@ -214,7 +169,7 @@ export function createLibraryInstaller({profileDir,profileName,dataRoot,nodeBina
       requireCondition(identity(executing)===identity(confirmed),'SUITE_PLAN_CHANGED','执行前套件安装包来源或声明已变化，请重新查看并确认。',{},409);
       emit({type:'library.install-started',itemId:'hanamesh:suite-upgrade',packageName:SUITE_BUNDLE,kind:'suite-upgrade'});
       try{
-        await run(['add','--save-exact','--strict-peer-dependencies',`--registry=${fresh.registry??registry??'https://registry.npmjs.org'}`,`${SUITE_BUNDLE}@${fresh.bundle.to}`]);
+        await runCli(fresh.installation.args);
         const actual=await readSuiteStatus(profileDir);
         const saved=await json(join(profileDir,'package.json'));
         requireCondition(actual.status==='installed'&&actual.version===fresh.bundle.to&&saved.dependencies?.[SUITE_BUNDLE]===fresh.bundle.to&&fresh.components.every((c,i)=>actual.components[i]?.version===c.to),'INSTALL_READBACK_MISMATCH','套件升级后的版本或启用状态不符，请完全退出后按补齐命令修复。',{},502);
@@ -225,13 +180,11 @@ export function createLibraryInstaller({profileDir,profileName,dataRoot,nodeBina
       }
     });},
     async install(item,context){
-      if(item.installTarget){const target=packageInstallTarget(item.installTarget);item={...item,installTarget:target,package:{registry:target.source,name:installTargetName(target)}};}
-      const kind=itemKind(item);
-      requireCondition(kind!=='listing','NOT_INSTALLABLE','Catalog item has no npm package to install.');
+      requireCondition(item?.installTarget,'NOT_INSTALLABLE','A fixed catalog installation target is required.',{reason:'fixed-install-target-required'});
+      const target=packageInstallTarget(item.installTarget);item={...item,installTarget:target,package:{registry:target.source,name:installTargetName(target)}};
+      const kind=isApplication(item)?'application':'plugin';
       return await installAs(item,kind,context);
     },
-    /** rc.28: install a plugin by package name (already verified against the catalog by the service). */
-    async installPlugin({packageName:name},context){return await installAs({package:{registry:'npm',name}},'plugin',context);},
     async provisionRuntime({appId,packageName:installedName,runtimeItem}){return await profileWriter.run(async()=>{const record=await installed(installedName);requireCondition(record.definition.id===appId,'APP_ID_MISMATCH','Installed package app id does not match.');const runtime=record.definition.deployments.map(deployment=>deployment.runtime).find(value=>value?.item===runtimeItem);requireCondition(runtime,'RUNTIME_NOT_DECLARED','Runtime item is not declared.');const result=await (await runtimeApi('provision'))(runtime.manifest,{root:runtimeRoot(appId),only:[runtime.item],onProgress:event=>emit({type:'library.provision-progress',appId,...event})});return{status:'restart-required',appId,packageName:installedName,result};});},
     async uninstall({packageName:installedName,appId,runtimeItem,running}){permitted(installedName);requireCondition(!running,'INSTANCE_IN_USE','Stop all application instances before uninstalling.',{},409);return await profileWriter.run(async()=>{await run(['remove',installedName]);if(runtimeItem){const result=await (await runtimeApi('remove'))(runtimeItem,{root:runtimeRoot(appId)});await clearGeneratedRuntimeCache(result,runtimeRoot(appId));}return{status:'restart-required',kind:'application',appId,packageName:installedName,dataPreserved:true};});},
     /** rc.28: `dsh plugin remove <name>`; the suite itself (PROTECTED_PACKAGES) is refused with PACKAGE_DENIED. */

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});
@@ -48,11 +49,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 +65,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;

package/dist/library/installation-worker.js

@@ -1,13 +1,52 @@
 /** Detached reaper: it outlives the caller and owns the neutral directory, outside the command group. */
-import {fork} from 'node:child_process';
-import {mkdtempSync,realpathSync,rmSync} from 'node:fs';
+import {fork,spawnSync} from 'node:child_process';
+import {mkdtempSync,realpathSync,rmSync,lstatSync} from 'node:fs';
 import {join} from 'node:path';
-let started=false,finishing=false,finalized=false,directory,anchor,anchorExited=false,payload;
-function finalize(){
+import {createWindowsJob} from '../windows-job.js';
+let started=false,finishing=false,finalized=false,directory,anchor,anchorExited=false,payload,windowsJob,jobStarting,jobController,stopping;
+function groupMetadata(){
+ const result=spawnSync('/bin/ps',['-axo','pid=,pgid=,uid=,stat='],{encoding:'utf8',stdio:['ignore','pipe','ignore']});
+ if(result.status!==0)throw new Error('Owned group metadata is unavailable.');
+ const rows=result.stdout.trim().split('\n').filter(Boolean).map(line=>{
+  const match=/^\s*(\d+)\s+(\d+)\s+(\d+)\s+(\S+)\s*$/.exec(line);
+  if(!match)throw new Error('Owned group metadata is invalid.');
+  return{pid:Number(match[1]),pgid:Number(match[2]),uid:Number(match[3]),state:match[4]};
+ });
+ return rows.filter(row=>row.pgid===anchor.pid);
+}
+async function confirmOwnedGroupGone(){
+ if(process.platform==='win32'){if(stopping)await stopping;return}if(!anchor)return;
+ // Observe only the PGID created by this anchor, never send another termination
+ // signal after its PID could be reused. close(anchor) alone does not reap descendants.
+ const deadline=Date.now()+1000;const observed=new Set();
+ while(true){
+  try{process.kill(-anchor.pid,0)}catch(error){
+   if(error.code==='ESRCH')return;
+   if(error.code!=='EPERM')throw error;
+   // Darwin may return EPERM for an empty or zombie-only process group. Read
+   // metadata only (never argv/commands); a foreign UID or unknown state fails closed.
+   const members=groupMetadata();
+   if(members.some(row=>row.uid!==process.getuid()||!/^[-A-Za-z+<>]+$/.test(row.state)))throw error;
+   for(const row of members)observed.add(row.pid);
+   if(members.length===0){
+    let remaining=false;for(const pid of observed){try{process.kill(pid,0);remaining=true}catch(probe){if(probe.code!=='ESRCH')throw probe}}
+    if(!remaining)return;
+   }
+  }
+  if(Date.now()>=deadline)throw new Error('Owned command group did not finish reaping.');
+  await new Promise(resolve=>setTimeout(resolve,5));
+ }
+}
+async function finalize(){
  if(finalized)return;finalized=true;
+ let cleanupComplete=false;
  // Normal owned shutdown reaches here after the live group was killed and its anchor closed.
  // An external SIGKILL/native crash of an internal supervisor is outside automatic recovery.
- if(directory){try{rmSync(directory,{recursive:true,force:true})}catch{payload={error:'AGENT_READER_CLEANUP_FAILED'}}}
+ try{await confirmOwnedGroupGone();
+  if(directory){rmSync(directory,{recursive:true,force:true,maxRetries:4,retryDelay:25});try{lstatSync(directory);throw new Error('Owned neutral directory survived cleanup.')}catch(error){if(error.code!=='ENOENT')throw error}}
+  cleanupComplete=true;
+ }catch{payload={error:'AGENT_READER_CLEANUP_FAILED'}}
+ payload={...payload,cleanupComplete};
  let flushed=0;const complete=()=>{if(++flushed!==2)return;const exit=()=>process.exit(0);
   if(process.connected){try{process.send(payload,exit)}catch{exit()}}else exit();
  };
@@ -15,10 +54,23 @@ function finalize(){
 }
 function finish(value){
  if(finishing)return;finishing=true;payload=value;
- if(anchor&&!anchorExited){
-  // The IPC anchor deliberately stays alive after command completion. Kill only its still-owned group.
-  try{process.kill(-anchor.pid,'SIGKILL')}catch{payload={error:'AGENT_READER_FAILED'}}
- }else if(!anchor)finalize();
+ if(anchor&&(process.platform==='win32'||!anchorExited)){
+  // The anchor is not released until the entire exact command ownership has ended.
+  if(process.platform==='win32'){
+   stopping=(async()=>{
+    if(!windowsJob){jobController?.abort();try{await jobStarting}catch{};try{anchor.kill('SIGKILL')}catch(error){if(error.code!=='ESRCH')throw error}}
+    else await windowsJob.stop();
+   })();
+   stopping.catch(()=>{payload={error:'AGENT_READER_CLEANUP_FAILED'}});
+  }else try{process.kill(-anchor.pid,'SIGKILL')}catch{payload={error:'AGENT_READER_FAILED'}}
+ }else if(!anchor)void finalize();
+}
+async function commandResult(value){
+ if(finishing)return;
+ if(process.platform==='win32'&&!value.error){
+  try{while(!finishing){if(await windowsJob.active()<=1)break;await new Promise(resolve=>setTimeout(resolve,5));}if(finishing)return;}catch{finish({error:'AGENT_READER_FAILED'});return}
+ }
+ finish(value);
 }
 process.once('disconnect',()=>finish({error:'INSTALLATION_STATUS_CANCELLED'}));
 process.once('SIGTERM',()=>finish({error:'INSTALLATION_STATUS_CANCELLED'}));
@@ -27,18 +79,24 @@ process.once('uncaughtException',()=>finish({error:'AGENT_READER_FAILED'}));
 process.once('unhandledRejection',()=>finish({error:'AGENT_READER_FAILED'}));
 if(!process.connected)process.exit(1);
 process.on('message',request=>{
+ if(request.abort){finish({error:'INSTALLATION_STATUS_CANCELLED'});return}
  if(started)return;started=true;
  try{
   if(!process.connected){finish({error:'INSTALLATION_STATUS_CANCELLED'});return}
   directory=mkdtempSync(join(realpathSync(request.temporaryRoot),'hanamesh-installation-read-'));
   process.send({directory},error=>{if(error)finish({error:'INSTALLATION_STATUS_CANCELLED'})});
-  const env={...request.env,XDG_CONFIG_HOME:join(directory,'config'),XDG_CACHE_HOME:join(directory,'cache'),XDG_STATE_HOME:join(directory,'state'),TMPDIR:directory,TMP:directory,TEMP:directory};
-  anchor=fork(new URL('./installation-command-worker.js',import.meta.url),[],{cwd:directory,env,execArgv:[],detached:true,stdio:['ignore','pipe','pipe','ipc']});
+  const env={...request.env,TMPDIR:directory,TMP:directory,TEMP:directory};
+  anchor=fork(new URL('./installation-command-worker.js',import.meta.url),[],{cwd:directory,env,execArgv:[],detached:process.platform!=='win32',stdio:['ignore','pipe','pipe','ipc']});
   anchor.stdout.pipe(process.stdout,{end:false});anchor.stderr.pipe(process.stderr,{end:false});
-  anchor.on('message',value=>finish(value));
+  anchor.on('message',value=>{void commandResult(value)});
   anchor.once('exit',()=>{anchorExited=true});
   anchor.once('error',()=>{if(!finishing){finishing=true;payload={error:'AGENT_READER_UNAVAILABLE'}}});
-  anchor.once('close',()=>{if(!finishing){finishing=true;payload={error:'AGENT_READER_FAILED'}}finalize()});
-  anchor.send({executable:request.executable,args:request.args},error=>{if(error)finish({error:'AGENT_READER_UNAVAILABLE'})});
+  anchor.once('close',()=>{if(!finishing)finish({error:'AGENT_READER_FAILED'});void finalize()});
+  const launch=()=>{if(!finishing)anchor.send({executable:request.executable,args:request.args},error=>{if(error)finish({error:'AGENT_READER_UNAVAILABLE'})});};
+  if(process.platform==='win32'){
+   jobController=new AbortController();
+   jobStarting=createWindowsJob({pid:anchor.pid,env,cwd:request.temporaryRoot,signal:jobController.signal});
+   void jobStarting.then(job=>{windowsJob=job;if(!finishing)launch();},()=>finish({error:'AGENT_READER_UNAVAILABLE'}));
+  }else launch();
  }catch{finish({error:'AGENT_READER_UNAVAILABLE'})}
 });

package/dist/library/locate.js

@@ -28,18 +28,10 @@ async function pluginManagerFacts(anchor){
   try{
     const require=createRequire(anchor),manifestPath=require.resolve('@deepseek-ai/dsh-plugin-manager/package.json'),pkg=await json(manifestPath);
     if(pkg?.name!=='@deepseek-ai/dsh-plugin-manager'||typeof pkg.version!=='string')return {};
-    let pluginManagerRegistry;
-    try{const path=require.resolve('@deepseek-ai/dsh-plugin-manager/registry');if(path.startsWith(dirname(manifestPath)+sep))pluginManagerRegistry=path;}catch{}
-    return{pluginManagerVersion:pkg.version,...(pluginManagerRegistry?{pluginManagerRegistry}:{})};
+    return{pluginManagerVersion:pkg.version};
   }catch{return {};}
 }
 export async function inferPluginManagerVersion(anchor){return(await pluginManagerFacts(anchor)).pluginManagerVersion;}
-async function desktopRegistryPath(root,pkg){
-  const entry=pkg.exports?.['./registry'],target=typeof entry==='string'?entry:entry?.import??entry?.default;
-  if(typeof target!=='string'||!target.startsWith('./'))return undefined;
-  const path=resolve(root,target);if(!path.startsWith(root+sep))return undefined;
-  try{await access(path);return path;}catch{return undefined;}
-}
 /** A DSH profile manifest that carries HanaMesh: `dsh.profile` (written by `dsh plugin`) or a hanamesh dependency. */
 export function isHanameshProfileManifest(manifest){
   if(!manifest||typeof manifest!=='object'||Array.isArray(manifest))return false;
@@ -109,7 +101,6 @@ export async function inferDesktopLayout({moduleUrl=import.meta.url,argv=process
   }
   const managerManifest=await json(join(runtimeDir,'node_modules/@deepseek-ai/dsh-plugin-manager/package.json'));
   const pluginManagerVersion=managerManifest?.name==='@deepseek-ai/dsh-plugin-manager'&&managerManifest.version===hostManifest.version?managerManifest.version:undefined;
-  const pluginManagerRegistry=pluginManagerVersion?await desktopRegistryPath(join(runtimeDir,'node_modules/@deepseek-ai/dsh-plugin-manager'),managerManifest):undefined;
   // Current canonical runtime manifest only. No legacy descriptor inference or PATH search.
   if(metadata?.platform===process.platform&&metadata?.arch===process.arch&&
     metadata.desktopVersion===(await json(join(hostRoot,'package.json')))?.version&&/^24\.\d+\.\d+$/.test(metadata.node??'')) {
@@ -121,7 +112,7 @@ export async function inferDesktopLayout({moduleUrl=import.meta.url,argv=process
       if(actual.node===metadata.node&&actual.electron===undefined)nodeBinary=await realpath(node);
     } catch { /* Unavailable/unproven payload Node stays unavailable; never use Electron. */ }
   }
-  return {profileDir:await realpath(profileDir),profileName:'desktop',dshBin,parentOrigin:'dsh-app://app',frameAncestors:[],desktopCli,desktopLauncher,pluginManagerVersion,pluginManagerRegistry,nodeBinary,runtimeDir};
+  return {profileDir:await realpath(profileDir),profileName:'desktop',dshBin,parentOrigin:'dsh-app://app',frameAncestors:[],desktopCli,desktopLauncher,pluginManagerVersion,nodeBinary,runtimeDir};
 }
 
 /** The DSH CLI that started this process — `argv[1]` only when it IS `@deepseek-ai/dsh/lib/bin.js`. */
@@ -149,6 +140,6 @@ export async function resolveLibraryLocations(config={},{moduleUrl=import.meta.u
   let dshBin=config.dshBin;if(dshBin===undefined){dshBin=desktop?.dshBin??inferDshBin(argv);if(dshBin)inferred.push('dshBin');}
   let node=nodeBinary;if(node===undefined){node=desktop?.nodeBinary??inferNodeBinary({execPath,versions});if(node)inferred.push('nodeBinary');}
   let sources=config.sources;if(sources===undefined){sources=structuredClone(DEFAULT_CATALOG_SOURCES);inferred.push('sources');}
-  const {pluginManagerVersion,pluginManagerRegistry}=desktop??await pluginManagerFacts(inferDshBin(argv)??(profileDir?join(profileDir,'package.json'):undefined));
-  return{profileDir,profileName,dshBin,nodeBinary:node,sources,inferred,...(pluginManagerVersion?{pluginManagerVersion}:{}),...(pluginManagerRegistry?{pluginManagerRegistry}:{}),...(desktop&&desktop.profileDir===profileDir&&config.dshBin===undefined?{desktopCli:desktop.desktopCli,desktopLauncher:desktop.desktopLauncher}:{})};
+  const {pluginManagerVersion}=desktop??await pluginManagerFacts(inferDshBin(argv)??(profileDir?join(profileDir,'package.json'):undefined));
+  return{profileDir,profileName,dshBin,nodeBinary:node,sources,inferred,...(pluginManagerVersion?{pluginManagerVersion}:{}),...(desktop&&desktop.profileDir===profileDir&&config.dshBin===undefined?{desktopCli:desktop.desktopCli,desktopLauncher:desktop.desktopLauncher}:{})};
 }