@aware-aeco/cli 0.90.0 → 0.91.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aware-aeco/cli",
-  "version": "0.90.0",
+  "version": "0.91.0",
   "description": "AWARE CLI — open-source agentic substrate for AECO",
   "homepage": "https://github.com/aware-aeco/aware",
   "repository": {

package/scripts/bin/aware.js

@@ -1,9 +1,45 @@
 #!/usr/bin/env node
+const fs = require('fs');
 const path = require('path');
 const { spawnSync } = require('child_process');
 
+const PKG_VERSION = require('../../package.json').version;
+const { requiredFiles } = require('../payload');
 const binaryName = process.platform === 'win32' ? 'aware.exe' : 'aware';
-const binary = path.join(__dirname, '..', '..', 'binaries', binaryName);
+const binariesDir = path.join(__dirname, '..', '..', 'binaries');
+let binary = path.join(binariesDir, binaryName);
+
+if (!fs.existsSync(binary)) {
+  // Rescue a partial install: postinstall ≤0.90.0 could leave the extracted
+  // versioned folder unpromoted (#287) — run the binary from there. Pinned to
+  // this package's version so a leftover from another release never runs, and
+  // only a COMPLETE payload qualifies — the CLI resolves its sidecar/roslyn
+  // companions next to the executable, so a half-extracted folder would run
+  // but fail confusingly later.
+  const exeSuffix = process.platform === 'win32' ? '.exe' : '';
+  const complete = (dir) =>
+    requiredFiles(exeSuffix).every((f) => fs.existsSync(path.join(dir, f)));
+  const candidate = fs.existsSync(binariesDir)
+    ? fs.readdirSync(binariesDir)
+        .filter((name) => name.startsWith(`aware-${PKG_VERSION}-`))
+        .map((name) => path.join(binariesDir, name))
+        .filter(complete)
+        .map((dir) => path.join(dir, binaryName))[0]
+    : undefined;
+  if (candidate) {
+    binary = candidate;
+  } else {
+    // Never fail silently (#287) — say what is missing and how to repair it.
+    console.error(`aware: binary not found at ${binary}`);
+    console.error('The npm postinstall step did not complete on this machine. To repair, run:');
+    console.error(`  node "${path.join(__dirname, '..', 'postinstall.js')}"`);
+    console.error('or download a release manually: https://github.com/aware-aeco/aware/releases');
+    process.exit(1);
+  }
+}
 
 const result = spawnSync(binary, process.argv.slice(2), { stdio: 'inherit' });
+if (result.error) {
+  console.error(`aware: failed to run ${binary}: ${result.error.message}`);
+}
 process.exit(result.status ?? 1);

package/scripts/payload.js

@@ -0,0 +1,23 @@
+// Shared payload contract for postinstall.js and bin/aware.js (#287).
+//
+// The files without which the CLI (or its aware-roslyn companion host) cannot
+// start. aware-roslyn ships as a self-contained FOLDER (hundreds of framework
+// DLLs); exhaustively manifesting it is disproportionate here — these four are
+// the startup-critical set (apphost, app dll, runtime config, deps graph), and
+// the extraction paths themselves fail loudly on any entry error, so a payload
+// passing this check with an arbitrary missing middle DLL requires the
+// extractor to have lied about its exit code.
+const path = require('path');
+
+function requiredFiles(exeSuffix) {
+  return [
+    `aware${exeSuffix}`,
+    `aware-sidecar${exeSuffix}`,
+    path.join('aware-roslyn', `aware-roslyn${exeSuffix}`),
+    path.join('aware-roslyn', 'aware-roslyn.dll'),
+    path.join('aware-roslyn', 'aware-roslyn.runtimeconfig.json'),
+    path.join('aware-roslyn', 'aware-roslyn.deps.json'),
+  ];
+}
+
+module.exports = { requiredFiles };

package/scripts/postinstall.js

@@ -2,7 +2,8 @@
 const fs = require('fs');
 const path = require('path');
 const https = require('https');
-const { execSync } = require('child_process');
+const { execFileSync } = require('child_process');
+const { requiredFiles } = require('./payload');
 
 const PKG_VERSION = require('../package.json').version;
 const REPO = 'aware-aeco/aware';
@@ -61,22 +62,73 @@ function download(srcUrl, dest, depth = 0) {
     await download(url, tmpFile);
 
     console.log('[aware-npm] extracting...');
-    if (target.archive === 'zip') {
-      execSync(`powershell -NoProfile -Command "Expand-Archive -Path '${tmpFile}' -DestinationPath '${binariesDir}' -Force"`, { stdio: 'inherit' });
+    // bsdtar handles both .zip and .tar.gz, exits non-zero on real failures, and
+    // (unlike PS 5.1 Expand-Archive) never half-extracts silently (#287). Use the
+    // System32 copy on Windows — a GNU tar earlier on PATH (Git Bash) can't read zip.
+    const winTar = path.join(process.env.WINDIR || 'C:\\Windows', 'System32', 'tar.exe');
+    if (process.platform === 'win32' && !fs.existsSync(winTar)) {
+      // Server 2016 / Win10 <1803 ship no inbox bsdtar — fall back to
+      // Expand-Archive. Its silent half-extraction mode is defused by the
+      // shim-target check below, which turns it into a loud failure (#287).
+      // $ErrorActionPreference='Stop' promotes Expand-Archive's non-terminating
+      // extraction errors to a non-zero exit, so a partial payload throws here
+      // instead of surfacing later.
+      execFileSync('powershell', [
+        '-NoProfile', '-Command',
+        `$ErrorActionPreference='Stop'; Expand-Archive -LiteralPath '${tmpFile}' -DestinationPath '${binariesDir}' -Force`,
+      ], { stdio: 'inherit' });
     } else {
-      execSync(`tar -xzf "${tmpFile}" -C "${binariesDir}"`, { stdio: 'inherit' });
+      const tar = process.platform === 'win32' ? winTar : 'tar';
+      // Explicit -z for tar.gz: minimal POSIX tar builds don't autodetect gzip.
+      const flags = target.archive === 'zip' ? '-xf' : '-xzf';
+      execFileSync(tar, [flags, tmpFile, '-C', binariesDir], { stdio: 'inherit' });
     }
-    fs.unlinkSync(tmpFile);
+    // Cleanup is cosmetic — an AV scan holding the fresh archive must not abort
+    // an install that already extracted successfully (#287).
+    try { fs.unlinkSync(tmpFile); } catch { /* locked archive; leave it */ }
 
     // Promote binaries from <binariesDir>/aware-<version>-<rid>/ to <binariesDir>/
     const extractedDir = path.join(binariesDir, `aware-${PKG_VERSION}-${target.rid}`);
     if (fs.existsSync(extractedDir)) {
       for (const file of fs.readdirSync(extractedDir)) {
-        fs.renameSync(path.join(extractedDir, file), path.join(binariesDir, file));
+        const src = path.join(extractedDir, file);
+        const dest = path.join(binariesDir, file);
+        // renameSync replaces existing FILES atomically (MOVEFILE_REPLACE_EXISTING
+        // on Windows); only a directory dest (aware-roslyn) must be moved aside
+        // first. Keep it until the replacement lands so an interrupted repair
+        // can't destroy a working install (#287 review).
+        let backup = null;
+        if (fs.existsSync(dest) && fs.statSync(dest).isDirectory()) {
+          backup = `${dest}.old-${process.pid}`;
+          fs.rmSync(backup, { recursive: true, force: true });
+          fs.renameSync(dest, backup);
+        }
+        try {
+          fs.renameSync(src, dest);
+        } catch (err) {
+          if (backup) fs.renameSync(backup, dest); // restore the old payload
+          throw err;
+        }
+        // The replacement already landed — a locked obsolete backup (AV handle)
+        // must not abort the remaining promotions.
+        if (backup) {
+          try { fs.rmSync(backup, { recursive: true, force: true }); } catch { /* best-effort */ }
+        }
       }
       fs.rmdirSync(extractedDir);
     }
 
+    // The shim resolves <binariesDir>/aware(.exe), and the CLI needs its
+    // sidecar + roslyn companions next to it. Anything missing is a broken
+    // install — fail loudly here instead of letting every later `aware` call
+    // exit 1 in silence (#287). Also catches Expand-Archive's silent
+    // half-extraction on the no-inbox-tar fallback path.
+    const required = requiredFiles(target.ext);
+    const missing = required.filter((f) => !fs.existsSync(path.join(binariesDir, f)));
+    if (missing.length) {
+      throw new Error(`extraction finished but ${missing.join(', ')} missing from ${binariesDir}`);
+    }
+
     if (process.platform !== 'win32') {
       fs.chmodSync(path.join(binariesDir, `aware${target.ext}`), 0o755);
       fs.chmodSync(path.join(binariesDir, `aware-sidecar${target.ext}`), 0o755);