@accio-ai/cli 0.1.6 → 0.1.7-rc.1

package/bin/workctl.js

@@ -6,10 +6,48 @@ const childProcess = require("child_process");
 const fs = require("fs");
 const path = require("path");
 
-const binaryPath = path.join(__dirname, "..", "vendor", process.platform === "win32" ? "workctl.exe" : "workctl");
+function getBinaryName() {
+  return process.platform === "win32" ? "workctl.exe" : "workctl";
+}
+
+function basePackageName() {
+  const pkgPath = path.join(__dirname, "..", "package.json");
+  const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+  return pkg.name;
+}
+
+function findBinaryPath() {
+  const binaryName = getBinaryName();
+  const suffix = `${process.platform}-${process.arch}`;
+
+  try {
+    const platformPackage = `${basePackageName()}-${suffix}`;
+    const platformDir = path.dirname(
+      require.resolve(`${platformPackage}/package.json`),
+    );
+    const candidate = path.join(platformDir, binaryName);
+    if (fs.existsSync(candidate)) {
+      return candidate;
+    }
+  } catch (e) {
+    // Platform sub-package not installed; fall through to vendor fallback.
+  }
+
+  const vendorPath = path.join(__dirname, "..", "vendor", binaryName);
+  if (fs.existsSync(vendorPath)) {
+    return vendorPath;
+  }
+
+  return null;
+}
 
-if (!fs.existsSync(binaryPath)) {
-  console.error(`workctl binary not found at ${binaryPath}. Reinstall the package.`);
+const binaryPath = findBinaryPath();
+if (!binaryPath) {
+  const suffix = `${process.platform}-${process.arch}`;
+  console.error(
+    `workctl: could not find binary for platform ${suffix}.\n` +
+      `Reinstall the package, or check that your platform is supported.`,
+  );
   process.exit(1);
 }
 

package/install.js

@@ -14,14 +14,6 @@ const AGENT_DIRS = [
   ".codex/skills",
 ];
 
-const PLATFORM_MAP = {
-  "darwin-x64": "workctl-darwin-amd64.tar.gz",
-  "darwin-arm64": "workctl-darwin-arm64.tar.gz",
-  "linux-x64": "workctl-linux-amd64.tar.gz",
-  "linux-arm64": "workctl-linux-arm64.tar.gz",
-  "win32-x64": "workctl-windows-amd64.zip",
-  "win32-arm64": "workctl-windows-arm64.zip",
-};
 function ensureDir(dir) {
   fs.mkdirSync(dir, { recursive: true });
 }
@@ -42,62 +34,6 @@ function copyChildren(srcDir, destDir) {
   }
 }
 
-function findBinary(root, names) {
-  const entries = fs.readdirSync(root, { withFileTypes: true });
-  for (const entry of entries) {
-    const entryPath = path.join(root, entry.name);
-    if (entry.isDirectory()) {
-      const nested = findBinary(entryPath, names);
-      if (nested) {
-        return nested;
-      }
-      continue;
-    }
-    if (names.includes(entry.name)) {
-      return entryPath;
-    }
-  }
-  return "";
-}
-
-function extractArchiveBinary(archivePath, names, destPath, cleanDestDir) {
-  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "workctl-npm-bin-"));
-  try {
-    if (archivePath.endsWith(".tar.gz")) {
-      run("tar", ["-xzf", archivePath, "-C", tmpDir]);
-    } else if (process.platform === "win32") {
-      run("powershell.exe", [
-        "-NoLogo",
-        "-NoProfile",
-        "-Command",
-        `Expand-Archive -Path '${archivePath.replace(/'/g, "''")}' -DestinationPath '${tmpDir.replace(/'/g, "''")}' -Force`,
-      ]);
-    } else {
-      run("unzip", ["-q", archivePath, "-d", tmpDir]);
-    }
-
-    const binaryPath = findBinary(tmpDir, names);
-    if (!binaryPath) {
-      throw new Error(`expected binary not found in archive ${archivePath}`);
-    }
-    copyExecutable(binaryPath, destPath, cleanDestDir);
-  } finally {
-    fs.rmSync(tmpDir, { recursive: true, force: true });
-  }
-}
-
-function copyExecutable(srcPath, destPath, cleanDestDir) {
-  if (cleanDestDir) {
-    ensureCleanDir(path.dirname(destPath));
-  } else {
-    ensureDir(path.dirname(destPath));
-  }
-  fs.copyFileSync(srcPath, destPath);
-  if (process.platform !== "win32") {
-    fs.chmodSync(destPath, 0o755);
-  }
-}
-
 function extractSkills(zipPath, destDir) {
   ensureCleanDir(destDir);
   if (process.platform === "win32") {
@@ -121,31 +57,31 @@ function installSkillsToHomes(skillRoot) {
   });
 }
 
+function clearWorkctlCache(configDir) {
+  const cacheDir = path.join(configDir, "cache");
+  if (fs.existsSync(cacheDir)) {
+    fs.rmSync(cacheDir, { recursive: true, force: true });
+    console.log("✓ Cleared cache for fresh command discovery");
+  }
+}
+
 function main() {
   const packageRoot = __dirname;
   const assetsDir = path.join(packageRoot, "assets");
-  const vendorDir = path.join(packageRoot, "vendor");
   const skillDir = path.join(packageRoot, "share", "skills", "workctl");
   const homeDir = process.env.HOME || process.env.USERPROFILE || os.homedir();
   const configDir = process.env.WORKCTL_CONFIG_DIR || path.join(homeDir, ".workctl");
-  const assetName = PLATFORM_MAP[`${process.platform}-${process.arch}`];
-  if (!assetName) {
-    throw new Error(`unsupported platform: ${process.platform}/${process.arch}`);
-  }
+
   if (!homeDir) {
     throw new Error("home directory not available for installation");
   }
 
-  const archivePath = path.join(assetsDir, assetName);
   const skillsPath = path.join(assetsDir, "workctl-skills.zip");
-  if (!fs.existsSync(archivePath)) {
-    throw new Error(`missing platform archive: ${archivePath}`);
-  }
   if (!fs.existsSync(skillsPath)) {
-    throw new Error(`missing skills archive: ${skillsPath}`);
+    console.warn("warning: skills archive not found, skipping skills installation");
+    return;
   }
 
-  extractArchiveBinary(archivePath, ["workctl", "workctl.exe"], path.join(vendorDir, process.platform === "win32" ? "workctl.exe" : "workctl"), true);
   extractSkills(skillsPath, skillDir);
   installSkillsToHomes(skillDir);
 
@@ -156,12 +92,4 @@ function main() {
   console.log("  Run 'workctl --help' to get started");
 }
 
-function clearWorkctlCache(configDir) {
-  const cacheDir = path.join(configDir, "cache");
-  if (fs.existsSync(cacheDir)) {
-    fs.rmSync(cacheDir, { recursive: true, force: true });
-    console.log("✓ Cleared cache for fresh command discovery");
-  }
-}
-
 main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@accio-ai/cli",
-  "version": "0.1.6",
+  "version": "0.1.7-rc.1",
   "description": "Work Agent CLI - AI-native command line interface",
   "license": "UNLICENSED",
   "repository": {
@@ -17,6 +17,14 @@
   "scripts": {
     "postinstall": "node install.js"
   },
+  "optionalDependencies": {
+    "@accio-ai/cli-darwin-arm64": "0.1.7-rc.1",
+    "@accio-ai/cli-darwin-x64": "0.1.7-rc.1",
+    "@accio-ai/cli-linux-arm64": "0.1.7-rc.1",
+    "@accio-ai/cli-linux-x64": "0.1.7-rc.1",
+    "@accio-ai/cli-win32-arm64": "0.1.7-rc.1",
+    "@accio-ai/cli-win32-x64": "0.1.7-rc.1"
+  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
@@ -27,6 +35,6 @@
     "README.md"
   ],
   "engines": {
-    "node": ">=16"
+    "node": ">=16.7"
   }
 }