@milpa/comal 0.2.0 → 0.2.1

package/README.md

@@ -28,7 +28,7 @@ comal --help
 
 Keep the PATH line in your shell startup file if you use that prefix. If your Node manager already provides a user prefix, you can omit `--prefix "$HOME/.local"`. The package registers the `comal` executable; you do not need to create a shell alias.
 
-You can pin a version with `npx @milpa/comal@0.2.0` or `npm install --global @milpa/comal@0.2.0`. The local release manifest preserves SHA-256 and SHA-512 integrity is checked against npm at publish time. No independent publisher signature is claimed.
+You can pin a version with `npx @milpa/comal@0.2.1` or `npm install --global @milpa/comal@0.2.1`. The local release manifest preserves SHA-256 and SHA-512 integrity is checked against npm at publish time. No independent publisher signature is claimed.
 
 ## Test without account or model
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milpa/comal",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Comal: governed operations, execution receipts, and programming assistance in any language",
   "type": "module",
   "private": false,

package/src/private-fs.mjs

@@ -5,21 +5,27 @@ import path from 'node:path';
 
 const fail=message=>Object.assign(new Error(message),{code:'PRIVATE_STATE_UNSAFE'});
 let broker,starting,sequence=0;
+// PowerShell puede tardar en arrancar (antivirus, runners en frío): su arranque tiene su propio plazo.
+const STARTUP_MS=60000,REQUEST_MS=15000;
 async function windowsBroker(){
  if(broker)return broker;if(starting)return starting;
  starting=(async()=>{
   const script=await readFile(new URL('./windows-private.ps1',import.meta.url),'utf8'),program=path.join(process.env.SystemRoot||'C:\\Windows','System32','WindowsPowerShell','v1.0','powershell.exe');
   const child=spawn(program,['-NoLogo','-NoProfile','-NonInteractive','-ExecutionPolicy','Bypass','-EncodedCommand',Buffer.from(script,'utf16le').toString('base64')],{stdio:['pipe','pipe','pipe'],windowsHide:true});
-  const pending=new Map(),lines=createInterface({input:child.stdout});let diagnostic='';
+  const pending=new Map(),lines=createInterface({input:child.stdout});let diagnostic='',ready;
+  const readiness=new Promise((resolve,reject)=>{ready={resolve,reject};});
+  const startup=setTimeout(()=>{ready.reject(fail('Windows ACL helper did not start within its deadline. '+diagnostic.slice(0,300)));child.kill();},STARTUP_MS);
   const references=active=>{const method=active?'ref':'unref';child[method]();for(const stream of[child.stdin,child.stdout,child.stderr])stream[method]?.();};
   child.stderr.on('data',data=>{if(diagnostic.length<2000)diagnostic+=data;});child.stdin.on('error',()=>{});
-  const stopped=()=>{for(const job of pending.values()){clearTimeout(job.timer);job.reject(fail('Windows private-state inspection stopped. '+diagnostic.slice(0,300)));}pending.clear();if(broker?.child===child)broker=undefined;};
+  const stopped=()=>{clearTimeout(startup);ready.reject(fail('Windows private-state inspection stopped. '+diagnostic.slice(0,300)));for(const job of pending.values()){clearTimeout(job.timer);job.reject(fail('Windows private-state inspection stopped. '+diagnostic.slice(0,300)));}pending.clear();if(broker?.child===child)broker=undefined;};
   child.on('error',stopped);child.on('close',stopped);
-  lines.on('line',line=>{let result;try{result=JSON.parse(line);}catch{stopped();child.kill();return;}const job=pending.get(result.id);if(!job)return;clearTimeout(job.timer);pending.delete(result.id);if(!pending.size)references(false);result.ok?job.resolve():job.reject(fail(result.error||'Windows private-state ACL does not verify.'));});
+  lines.on('line',line=>{let result;try{result=JSON.parse(line);}catch{stopped();child.kill();return;}if(result?.ready===true){clearTimeout(startup);ready.resolve();return;}const job=pending.get(result.id);if(!job)return;clearTimeout(job.timer);pending.delete(result.id);if(!pending.size)references(false);result.ok?job.resolve():job.reject(fail(result.error||'Windows private-state ACL does not verify.'));});
   const result={child,request:(action,file)=>new Promise((resolve,reject)=>{
-   const id=++sequence;references(true);const timer=setTimeout(()=>{pending.delete(id);reject(fail('Windows ACL inspection exceeded its deadline.'));if(!pending.size)references(false);},15000);pending.set(id,{resolve,reject,timer});
+   const id=++sequence;references(true);const timer=setTimeout(()=>{pending.delete(id);reject(fail('Windows ACL inspection exceeded its deadline.'));if(!pending.size)references(false);},REQUEST_MS);pending.set(id,{resolve,reject,timer});
    child.stdin.write(JSON.stringify({id,action,path:path.resolve(file)})+'\n',error=>{if(error){clearTimeout(timer);pending.delete(id);reject(fail('Windows ACL inspection could not be sent.'));if(!pending.size)references(false);}});
-  })};references(false);broker=result;return result;
+  })};
+  try{await readiness;}catch(error){if(broker?.child===child)broker=undefined;throw error;}
+  references(false);broker=result;return result;
  })();try{return await starting;}finally{starting=undefined;}
 }
 export async function ensurePrivateDirectory(directory){

package/src/source-ownership.mjs

@@ -22,8 +22,11 @@ export class SourceOwnership {
   }
   contains(file){const r=path.relative(this.directory,file);return r===''||r!=='..'&&!r.startsWith('..'+path.sep)&&!path.isAbsolute(r);}
   async prepareDirectory(){
+    await mkdir(path.dirname(this.directory),{recursive:true,mode:0o700});
+    // El HOME puede llegar por un enlace del sistema (macOS: /tmp, /var → /private/…).
+    // Se resuelve el antecesor del registro; el padre (~/.comal) sigue sin poder ser enlace.
+    if(!this.canonical){const grand=await realpath(path.dirname(path.dirname(this.directory)));this.directory=path.join(grand,path.basename(path.dirname(this.directory)),path.basename(this.directory));this.canonical=true;}
     const parent=path.dirname(this.directory);
-    await mkdir(parent,{recursive:true,mode:0o700});
     if(await realpath(parent)!==parent)throw fail('Native source lock registry has a noncanonical parent.');
     try{await ensurePrivateDirectory(this.directory);}catch(error){if(error.code==='PRIVATE_STATE_UNSAFE')throw fail('Native source lock registry is not private.');throw error;}
     const info=await lstat(this.directory);

package/src/windows-private.ps1

@@ -3,6 +3,8 @@ $ErrorActionPreference = 'Stop'
 [Console]::OutputEncoding = New-Object System.Text.UTF8Encoding($false)
 $currentSid = [Security.Principal.WindowsIdentity]::GetCurrent().User
 $trusted = @($currentSid.Value, 'S-1-5-18', 'S-1-5-32-544')
+[Console]::Out.WriteLine('{"ready":true}')
+[Console]::Out.Flush()
 
 function Assert-Private([string] $path, [bool] $directory) {
     $attributes = [IO.File]::GetAttributes($path)