@ozyman42/ozy-cli 0.4.8 → 0.4.9-darwin-arm64.0

package/package.json

@@ -1,8 +1,17 @@
 {
   "name": "@ozyman42/ozy-cli",
-  "version": "0.4.8",
-  "description": "Tools for setting up new packages, configuring with git & npm",
+  "version": "0.4.9-darwin-arm64.0",
   "type": "module",
+  "os": [
+    "darwin"
+  ],
+  "cpu": [
+    "arm64"
+  ],
+  "files": [
+    "multi-call-binary"
+  ],
+  "description": "Tools for setting up new packages, configuring with git & npm",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -11,55 +20,5 @@
   "publishConfig": {
     "access": "public",
     "provenance": true
-  },
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./src/index.ts",
-  "exports": {
-    ".": {
-      "types": "./src/index.ts",
-      "import": "./dist/index.js"
-    },
-    "./entrypoints": null,
-    "./entrypoints/*": null,
-    "./agents": null,
-    "./agents/*": null,
-    "./internal": null,
-    "./internal/*": null,
-    "./*": {
-      "types": "./src/*.ts",
-      "import": "./dist/*.js"
-    }
-  },
-  "files": [
-    "dist",
-    "src",
-    "bin"
-  ],
-  "bin": {
-    "ozy": "./bin/ozy",
-    "ozy-signing-agent": "./bin/ozy-signing-agent",
-    "ozy-ssh-keygen": "./bin/ozy-ssh-keygen",
-    "ozy-virtual-security-key": "./bin/ozy-virtual-security-key"
-  },
-  "dependencies": {
-    "@effect/platform-bun": "^4.0.0-beta.70",
-    "@ozyman42/interactive-cli-select": "^0.2.0",
-    "bip39": "^3.1.0",
-    "bs58": "^6.0.0",
-    "commander": "^13.1.0",
-    "effect": "4.0.0-beta.70",
-    "effective-modules": "0.3.1-effect4",
-    "expand-tilde": "^2.0.2",
-    "friendly-words": "^1.3.1",
-    "ssh-config": "^5.0.3",
-    "zod": "^3.24.2"
-  },
-  "optionalDependencies": {
-    "@ozyman42/ozy-cli-darwin-arm64": "npm:@ozyman42/ozy-cli@0.4.8-darwin-arm64.0",
-    "@ozyman42/ozy-cli-darwin-x64": "npm:@ozyman42/ozy-cli@0.4.8-darwin-x64.0",
-    "@ozyman42/ozy-cli-linux-arm64": "npm:@ozyman42/ozy-cli@0.4.8-linux-arm64.0",
-    "@ozyman42/ozy-cli-linux-x64": "npm:@ozyman42/ozy-cli@0.4.8-linux-x64.0",
-    "@ozyman42/ozy-cli-windows-x64": "npm:@ozyman42/ozy-cli@0.4.8-windows-x64.0"
   }
 }

package/bin/ozy

@@ -1,191 +0,0 @@
-#!/usr/bin/env node
-import { createRequire } from "node:module";
-import { spawnSync } from "node:child_process";
-import {
-  chmodSync,
-  copyFileSync,
-  existsSync,
-  linkSync,
-  mkdirSync,
-  readFileSync,
-  renameSync,
-  rmSync,
-  writeFileSync,
-} from "node:fs";
-import { basename, dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const PLATFORM_MAP = {
-  "darwin-arm64": "darwin-arm64",
-  "darwin-x64": "darwin-x64",
-  "linux-arm64": "linux-arm64",
-  "linux-x64": "linux-x64",
-  "win32-x64": "windows-x64"
-};
-const PLATFORM_PACKAGES = {
-  "darwin-arm64": "@ozyman42/ozy-cli-darwin-arm64",
-  "darwin-x64": "@ozyman42/ozy-cli-darwin-x64",
-  "linux-arm64": "@ozyman42/ozy-cli-linux-arm64",
-  "linux-x64": "@ozyman42/ozy-cli-linux-x64",
-  "windows-x64": "@ozyman42/ozy-cli-windows-x64"
-};
-const PLATFORM_BINARIES = {
-  "darwin-arm64": "multi-call-binary",
-  "darwin-x64": "multi-call-binary",
-  "linux-arm64": "multi-call-binary",
-  "linux-x64": "multi-call-binary",
-  "windows-x64": "multi-call-binary.exe"
-};
-const COMMANDS = [
-  "ozy",
-  "ozy-signing-agent",
-  "ozy-ssh-keygen",
-  "ozy-virtual-security-key"
-];
-const WINDOWS_EXECUTABLE_SUFFIX = ".exe";
-const INSTALLED_JSON = "installed.json";
-
-const require = createRequire(import.meta.url);
-const launcherPath = fileURLToPath(import.meta.url);
-const launcherDir = dirname(launcherPath);
-const commandName = basename(launcherPath);
-
-function fail(message) {
-  console.error(message);
-  process.exit(1);
-}
-
-function currentPlatformKey() {
-  const platformKey = PLATFORM_MAP[`${process.platform}-${process.arch}`];
-  if (!platformKey) {
-    fail(`Unsupported platform: ${process.platform}-${process.arch}`);
-  }
-  return platformKey;
-}
-
-function currentPlatformPackageName() {
-  const platformKey = currentPlatformKey();
-  const packageName = PLATFORM_PACKAGES[platformKey];
-  if (!packageName) {
-    fail(`No platform package is configured for ${platformKey}`);
-  }
-  return packageName;
-}
-
-/**
- * When a Jive library contains any number of CLIs (entrypoints or agents), then the base package
- * will have an optional dependency for each possible architecture, with those platform-specific
- * packages containing a platform build of the CLI.
- * @returns the path to the platform binary and the exact version of the platform package.
- */
-function currentPlatformPackage() {
-  const platformKey = currentPlatformKey();
-  const binaryFile = PLATFORM_BINARIES[platformKey];
-  if (!binaryFile) {
-    fail(`No platform binary is configured for ${platformKey}`);
-  }
-
-  const packageName = currentPlatformPackageName();
-  try {
-    const packageJsonPath = require.resolve(`${packageName}/package.json`);
-    const packageDir = dirname(packageJsonPath);
-    const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-    return {
-      binaryPath: join(packageDir, binaryFile),
-      version: packageJson.version,
-    };
-  } catch (error) {
-    fail(`Could not resolve optional platform package ${packageName}. Reinstall dependencies for ${process.platform}-${process.arch}.`);
-  }
-}
-
-function targetPathFor(command) {
-  const suffix = process.platform === "win32" ? WINDOWS_EXECUTABLE_SUFFIX : "";
-  return join(launcherDir, `${command}${suffix}`);
-}
-
-function installedJsonPath() {
-  return join(launcherDir, INSTALLED_JSON);
-}
-
-function windowsTargetsAreCurrent(version) {
-  if (process.platform !== "win32") return false;
-  if (!COMMANDS.every((command) => existsSync(targetPathFor(command)))) return false;
-
-  try {
-    const installed = JSON.parse(readFileSync(installedJsonPath(), "utf-8"));
-    return installed.version === version;
-  } catch {
-    return false;
-  }
-}
-
-function linkOrCopyFirstExecutable(sourcePath, targetPath) {
-  mkdirSync(dirname(targetPath), { recursive: true });
-  const tempPath = `${targetPath}.${process.pid}.${Date.now()}.tmp${process.platform === "win32" ? WINDOWS_EXECUTABLE_SUFFIX : ""}`;
-  rmSync(tempPath, { force: true });
-
-  try {
-    try {
-      linkSync(sourcePath, tempPath);
-    } catch {
-      copyFileSync(sourcePath, tempPath);
-    }
-
-    chmodSync(tempPath, 0o755);
-    rmSync(targetPath, { force: true });
-    renameSync(tempPath, targetPath);
-  } finally {
-    rmSync(tempPath, { force: true });
-  }
-}
-
-function hardLinkCommandTarget(sourcePath, targetPath) {
-  if (sourcePath === targetPath) return;
-
-  const tempPath = `${targetPath}.${process.pid}.${Date.now()}.tmp${process.platform === "win32" ? WINDOWS_EXECUTABLE_SUFFIX : ""}`;
-  rmSync(tempPath, { force: true });
-
-  try {
-    linkSync(sourcePath, tempPath);
-    chmodSync(tempPath, 0o755);
-    rmSync(targetPath, { force: true });
-    renameSync(tempPath, targetPath);
-  } finally {
-    rmSync(tempPath, { force: true });
-  }
-}
-
-function repairCommandTargets() {
-  const platformPackage = currentPlatformPackage();
-
-  if (windowsTargetsAreCurrent(platformPackage.version)) {
-    return targetPathFor(commandName);
-  }
-
-  const firstTargetPath = targetPathFor(COMMANDS[0]);
-  linkOrCopyFirstExecutable(platformPackage.binaryPath, firstTargetPath);
-
-  for (const command of COMMANDS.slice(1)) {
-    hardLinkCommandTarget(firstTargetPath, targetPathFor(command));
-  }
-
-  if (process.platform === "win32") {
-    writeFileSync(installedJsonPath(), `${JSON.stringify({ version: platformPackage.version }, null, 2)}\n`);
-  }
-
-  return targetPathFor(commandName);
-}
-
-function runExecutable(executablePath) {
-  const result = spawnSync(executablePath, process.argv.slice(2), { stdio: "inherit" });
-
-  if (result.error) {
-    fail(result.error.message);
-  }
-  if (result.status !== 0) {
-    process.exit(result.status ?? 1);
-  }
-}
-
-runExecutable(repairCommandTargets());

package/bin/ozy-signing-agent

@@ -1,191 +0,0 @@
-#!/usr/bin/env node
-import { createRequire } from "node:module";
-import { spawnSync } from "node:child_process";
-import {
-  chmodSync,
-  copyFileSync,
-  existsSync,
-  linkSync,
-  mkdirSync,
-  readFileSync,
-  renameSync,
-  rmSync,
-  writeFileSync,
-} from "node:fs";
-import { basename, dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const PLATFORM_MAP = {
-  "darwin-arm64": "darwin-arm64",
-  "darwin-x64": "darwin-x64",
-  "linux-arm64": "linux-arm64",
-  "linux-x64": "linux-x64",
-  "win32-x64": "windows-x64"
-};
-const PLATFORM_PACKAGES = {
-  "darwin-arm64": "@ozyman42/ozy-cli-darwin-arm64",
-  "darwin-x64": "@ozyman42/ozy-cli-darwin-x64",
-  "linux-arm64": "@ozyman42/ozy-cli-linux-arm64",
-  "linux-x64": "@ozyman42/ozy-cli-linux-x64",
-  "windows-x64": "@ozyman42/ozy-cli-windows-x64"
-};
-const PLATFORM_BINARIES = {
-  "darwin-arm64": "multi-call-binary",
-  "darwin-x64": "multi-call-binary",
-  "linux-arm64": "multi-call-binary",
-  "linux-x64": "multi-call-binary",
-  "windows-x64": "multi-call-binary.exe"
-};
-const COMMANDS = [
-  "ozy",
-  "ozy-signing-agent",
-  "ozy-ssh-keygen",
-  "ozy-virtual-security-key"
-];
-const WINDOWS_EXECUTABLE_SUFFIX = ".exe";
-const INSTALLED_JSON = "installed.json";
-
-const require = createRequire(import.meta.url);
-const launcherPath = fileURLToPath(import.meta.url);
-const launcherDir = dirname(launcherPath);
-const commandName = basename(launcherPath);
-
-function fail(message) {
-  console.error(message);
-  process.exit(1);
-}
-
-function currentPlatformKey() {
-  const platformKey = PLATFORM_MAP[`${process.platform}-${process.arch}`];
-  if (!platformKey) {
-    fail(`Unsupported platform: ${process.platform}-${process.arch}`);
-  }
-  return platformKey;
-}
-
-function currentPlatformPackageName() {
-  const platformKey = currentPlatformKey();
-  const packageName = PLATFORM_PACKAGES[platformKey];
-  if (!packageName) {
-    fail(`No platform package is configured for ${platformKey}`);
-  }
-  return packageName;
-}
-
-/**
- * When a Jive library contains any number of CLIs (entrypoints or agents), then the base package
- * will have an optional dependency for each possible architecture, with those platform-specific
- * packages containing a platform build of the CLI.
- * @returns the path to the platform binary and the exact version of the platform package.
- */
-function currentPlatformPackage() {
-  const platformKey = currentPlatformKey();
-  const binaryFile = PLATFORM_BINARIES[platformKey];
-  if (!binaryFile) {
-    fail(`No platform binary is configured for ${platformKey}`);
-  }
-
-  const packageName = currentPlatformPackageName();
-  try {
-    const packageJsonPath = require.resolve(`${packageName}/package.json`);
-    const packageDir = dirname(packageJsonPath);
-    const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-    return {
-      binaryPath: join(packageDir, binaryFile),
-      version: packageJson.version,
-    };
-  } catch (error) {
-    fail(`Could not resolve optional platform package ${packageName}. Reinstall dependencies for ${process.platform}-${process.arch}.`);
-  }
-}
-
-function targetPathFor(command) {
-  const suffix = process.platform === "win32" ? WINDOWS_EXECUTABLE_SUFFIX : "";
-  return join(launcherDir, `${command}${suffix}`);
-}
-
-function installedJsonPath() {
-  return join(launcherDir, INSTALLED_JSON);
-}
-
-function windowsTargetsAreCurrent(version) {
-  if (process.platform !== "win32") return false;
-  if (!COMMANDS.every((command) => existsSync(targetPathFor(command)))) return false;
-
-  try {
-    const installed = JSON.parse(readFileSync(installedJsonPath(), "utf-8"));
-    return installed.version === version;
-  } catch {
-    return false;
-  }
-}
-
-function linkOrCopyFirstExecutable(sourcePath, targetPath) {
-  mkdirSync(dirname(targetPath), { recursive: true });
-  const tempPath = `${targetPath}.${process.pid}.${Date.now()}.tmp${process.platform === "win32" ? WINDOWS_EXECUTABLE_SUFFIX : ""}`;
-  rmSync(tempPath, { force: true });
-
-  try {
-    try {
-      linkSync(sourcePath, tempPath);
-    } catch {
-      copyFileSync(sourcePath, tempPath);
-    }
-
-    chmodSync(tempPath, 0o755);
-    rmSync(targetPath, { force: true });
-    renameSync(tempPath, targetPath);
-  } finally {
-    rmSync(tempPath, { force: true });
-  }
-}
-
-function hardLinkCommandTarget(sourcePath, targetPath) {
-  if (sourcePath === targetPath) return;
-
-  const tempPath = `${targetPath}.${process.pid}.${Date.now()}.tmp${process.platform === "win32" ? WINDOWS_EXECUTABLE_SUFFIX : ""}`;
-  rmSync(tempPath, { force: true });
-
-  try {
-    linkSync(sourcePath, tempPath);
-    chmodSync(tempPath, 0o755);
-    rmSync(targetPath, { force: true });
-    renameSync(tempPath, targetPath);
-  } finally {
-    rmSync(tempPath, { force: true });
-  }
-}
-
-function repairCommandTargets() {
-  const platformPackage = currentPlatformPackage();
-
-  if (windowsTargetsAreCurrent(platformPackage.version)) {
-    return targetPathFor(commandName);
-  }
-
-  const firstTargetPath = targetPathFor(COMMANDS[0]);
-  linkOrCopyFirstExecutable(platformPackage.binaryPath, firstTargetPath);
-
-  for (const command of COMMANDS.slice(1)) {
-    hardLinkCommandTarget(firstTargetPath, targetPathFor(command));
-  }
-
-  if (process.platform === "win32") {
-    writeFileSync(installedJsonPath(), `${JSON.stringify({ version: platformPackage.version }, null, 2)}\n`);
-  }
-
-  return targetPathFor(commandName);
-}
-
-function runExecutable(executablePath) {
-  const result = spawnSync(executablePath, process.argv.slice(2), { stdio: "inherit" });
-
-  if (result.error) {
-    fail(result.error.message);
-  }
-  if (result.status !== 0) {
-    process.exit(result.status ?? 1);
-  }
-}
-
-runExecutable(repairCommandTargets());

package/bin/ozy-ssh-keygen

@@ -1,191 +0,0 @@
-#!/usr/bin/env node
-import { createRequire } from "node:module";
-import { spawnSync } from "node:child_process";
-import {
-  chmodSync,
-  copyFileSync,
-  existsSync,
-  linkSync,
-  mkdirSync,
-  readFileSync,
-  renameSync,
-  rmSync,
-  writeFileSync,
-} from "node:fs";
-import { basename, dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const PLATFORM_MAP = {
-  "darwin-arm64": "darwin-arm64",
-  "darwin-x64": "darwin-x64",
-  "linux-arm64": "linux-arm64",
-  "linux-x64": "linux-x64",
-  "win32-x64": "windows-x64"
-};
-const PLATFORM_PACKAGES = {
-  "darwin-arm64": "@ozyman42/ozy-cli-darwin-arm64",
-  "darwin-x64": "@ozyman42/ozy-cli-darwin-x64",
-  "linux-arm64": "@ozyman42/ozy-cli-linux-arm64",
-  "linux-x64": "@ozyman42/ozy-cli-linux-x64",
-  "windows-x64": "@ozyman42/ozy-cli-windows-x64"
-};
-const PLATFORM_BINARIES = {
-  "darwin-arm64": "multi-call-binary",
-  "darwin-x64": "multi-call-binary",
-  "linux-arm64": "multi-call-binary",
-  "linux-x64": "multi-call-binary",
-  "windows-x64": "multi-call-binary.exe"
-};
-const COMMANDS = [
-  "ozy",
-  "ozy-signing-agent",
-  "ozy-ssh-keygen",
-  "ozy-virtual-security-key"
-];
-const WINDOWS_EXECUTABLE_SUFFIX = ".exe";
-const INSTALLED_JSON = "installed.json";
-
-const require = createRequire(import.meta.url);
-const launcherPath = fileURLToPath(import.meta.url);
-const launcherDir = dirname(launcherPath);
-const commandName = basename(launcherPath);
-
-function fail(message) {
-  console.error(message);
-  process.exit(1);
-}
-
-function currentPlatformKey() {
-  const platformKey = PLATFORM_MAP[`${process.platform}-${process.arch}`];
-  if (!platformKey) {
-    fail(`Unsupported platform: ${process.platform}-${process.arch}`);
-  }
-  return platformKey;
-}
-
-function currentPlatformPackageName() {
-  const platformKey = currentPlatformKey();
-  const packageName = PLATFORM_PACKAGES[platformKey];
-  if (!packageName) {
-    fail(`No platform package is configured for ${platformKey}`);
-  }
-  return packageName;
-}
-
-/**
- * When a Jive library contains any number of CLIs (entrypoints or agents), then the base package
- * will have an optional dependency for each possible architecture, with those platform-specific
- * packages containing a platform build of the CLI.
- * @returns the path to the platform binary and the exact version of the platform package.
- */
-function currentPlatformPackage() {
-  const platformKey = currentPlatformKey();
-  const binaryFile = PLATFORM_BINARIES[platformKey];
-  if (!binaryFile) {
-    fail(`No platform binary is configured for ${platformKey}`);
-  }
-
-  const packageName = currentPlatformPackageName();
-  try {
-    const packageJsonPath = require.resolve(`${packageName}/package.json`);
-    const packageDir = dirname(packageJsonPath);
-    const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-    return {
-      binaryPath: join(packageDir, binaryFile),
-      version: packageJson.version,
-    };
-  } catch (error) {
-    fail(`Could not resolve optional platform package ${packageName}. Reinstall dependencies for ${process.platform}-${process.arch}.`);
-  }
-}
-
-function targetPathFor(command) {
-  const suffix = process.platform === "win32" ? WINDOWS_EXECUTABLE_SUFFIX : "";
-  return join(launcherDir, `${command}${suffix}`);
-}
-
-function installedJsonPath() {
-  return join(launcherDir, INSTALLED_JSON);
-}
-
-function windowsTargetsAreCurrent(version) {
-  if (process.platform !== "win32") return false;
-  if (!COMMANDS.every((command) => existsSync(targetPathFor(command)))) return false;
-
-  try {
-    const installed = JSON.parse(readFileSync(installedJsonPath(), "utf-8"));
-    return installed.version === version;
-  } catch {
-    return false;
-  }
-}
-
-function linkOrCopyFirstExecutable(sourcePath, targetPath) {
-  mkdirSync(dirname(targetPath), { recursive: true });
-  const tempPath = `${targetPath}.${process.pid}.${Date.now()}.tmp${process.platform === "win32" ? WINDOWS_EXECUTABLE_SUFFIX : ""}`;
-  rmSync(tempPath, { force: true });
-
-  try {
-    try {
-      linkSync(sourcePath, tempPath);
-    } catch {
-      copyFileSync(sourcePath, tempPath);
-    }
-
-    chmodSync(tempPath, 0o755);
-    rmSync(targetPath, { force: true });
-    renameSync(tempPath, targetPath);
-  } finally {
-    rmSync(tempPath, { force: true });
-  }
-}
-
-function hardLinkCommandTarget(sourcePath, targetPath) {
-  if (sourcePath === targetPath) return;
-
-  const tempPath = `${targetPath}.${process.pid}.${Date.now()}.tmp${process.platform === "win32" ? WINDOWS_EXECUTABLE_SUFFIX : ""}`;
-  rmSync(tempPath, { force: true });
-
-  try {
-    linkSync(sourcePath, tempPath);
-    chmodSync(tempPath, 0o755);
-    rmSync(targetPath, { force: true });
-    renameSync(tempPath, targetPath);
-  } finally {
-    rmSync(tempPath, { force: true });
-  }
-}
-
-function repairCommandTargets() {
-  const platformPackage = currentPlatformPackage();
-
-  if (windowsTargetsAreCurrent(platformPackage.version)) {
-    return targetPathFor(commandName);
-  }
-
-  const firstTargetPath = targetPathFor(COMMANDS[0]);
-  linkOrCopyFirstExecutable(platformPackage.binaryPath, firstTargetPath);
-
-  for (const command of COMMANDS.slice(1)) {
-    hardLinkCommandTarget(firstTargetPath, targetPathFor(command));
-  }
-
-  if (process.platform === "win32") {
-    writeFileSync(installedJsonPath(), `${JSON.stringify({ version: platformPackage.version }, null, 2)}\n`);
-  }
-
-  return targetPathFor(commandName);
-}
-
-function runExecutable(executablePath) {
-  const result = spawnSync(executablePath, process.argv.slice(2), { stdio: "inherit" });
-
-  if (result.error) {
-    fail(result.error.message);
-  }
-  if (result.status !== 0) {
-    process.exit(result.status ?? 1);
-  }
-}
-
-runExecutable(repairCommandTargets());