@creatok/cli 0.18.0 → 0.18.2-preview.1

package/install.js

@@ -1,34 +1,28 @@
 'use strict';
 
-// Best-effort postinstall: warn (do not fail) if no platform binary is
-// resolvable, and opportunistically sync embedded skills into existing agent
-// skill directories after npm updates the CLI binary.
+// Missing platform binaries are fatal; skill synchronization remains best-effort.
 const { spawnSync } = require('child_process');
-
-const pkg = `@creatok/cli-${process.platform}-${process.arch}`;
-const binName = process.platform === 'win32' ? 'creatok.exe' : 'creatok';
+const { binaryPath, recoverBinary, repairCommand, supported, platform } = require('./platform');
 
 function warn(message) {
   console.error(`[creatok] ${message}`);
 }
 
-function binaryPath() {
+let bin = binaryPath();
+if (!bin) {
+  if (!supported) {
+    warn(`unsupported platform ${platform}`);
+    process.exit(1);
+  }
+  warn('platform package is missing or mismatched; recovering the exact version from the official npm registry');
   try {
-    return require.resolve(`${pkg}/bin/${binName}`);
-  } catch {
-    return null;
+    bin = recoverBinary();
+  } catch (err) {
+    warn(`${err.message}\nInstallation failed. Retry: ${repairCommand()}`);
+    process.exit(1);
   }
 }
 
-const bin = binaryPath();
-if (!bin) {
-  warn(
-    `no prebuilt binary for ${process.platform}-${process.arch}. ` +
-      `If this platform should be supported, reinstall with: npm install -g @creatok/cli --force`
-  );
-  process.exit(0);
-}
-
 if (/^(1|true|yes)$/i.test(process.env.CREATOK_SKIP_SKILLS_INSTALL || '')) {
   process.exit(0);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@creatok/cli",
-  "version": "0.18.0",
+  "version": "0.18.2-preview.1",
   "description": "CreatOK CLI — drives CreatOK Open Skills (analyze, generate image/video) for TikTok creators and sellers.",
   "bin": {
     "creatok": "run.js"
@@ -10,7 +10,8 @@
   },
   "files": [
     "run.js",
-    "install.js"
+    "install.js",
+    "platform.js"
   ],
   "license": "UNLICENSED",
   "homepage": "https://github.com/EchoSell/creatok-skills",
@@ -18,9 +19,9 @@
     "node": ">=16"
   },
   "optionalDependencies": {
-    "@creatok/cli-darwin-arm64": "0.18.0",
-    "@creatok/cli-win32-x64": "0.18.0",
-    "@creatok/cli-linux-x64": "0.18.0",
-    "@creatok/cli-linux-arm64": "0.18.0"
+    "@creatok/cli-darwin-arm64": "0.18.2-preview.1",
+    "@creatok/cli-win32-x64": "0.18.2-preview.1",
+    "@creatok/cli-linux-x64": "0.18.2-preview.1",
+    "@creatok/cli-linux-arm64": "0.18.2-preview.1"
   }
 }

package/platform.js

@@ -0,0 +1,65 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const { spawnSync } = require('child_process');
+const version = require('./package.json').version;
+const platform = `${process.platform}-${process.arch}`;
+const supported = ['darwin-arm64', 'win32-x64', 'linux-x64', 'linux-arm64'].includes(platform);
+const pkg = `@creatok/cli-${platform}`;
+const binName = process.platform === 'win32' ? 'creatok.exe' : 'creatok';
+const recoveryDir = path.join(__dirname, '.platform');
+
+function binaryPath() {
+  for (const base of [__dirname, recoveryDir]) {
+    try {
+      const manifest = require.resolve(`${pkg}/package.json`, { paths: [base] });
+      if (JSON.parse(fs.readFileSync(manifest, 'utf8')).version !== version) continue;
+      const bin = path.join(path.dirname(manifest), 'bin', binName);
+      fs.accessSync(bin, process.platform === 'win32' ? fs.constants.F_OK : fs.constants.X_OK);
+      return bin;
+    } catch { /* Missing or mismatched optional dependency. */ }
+  }
+  return null;
+}
+
+function repairCommand() {
+  return `npm install -g @creatok/cli@${version} --include=optional --prefer-online --registry=https://registry.npmjs.org`;
+}
+
+// A separate prefix avoids modifying the dependency tree of the outer npm install.
+// npm verifies the registry tarball integrity; lifecycle scripts are disabled.
+function recoverBinary() {
+  if (!supported) throw new Error(`unsupported platform ${platform}`);
+  const npmCLI = process.env.npm_execpath;
+  if (!npmCLI || !fs.existsSync(npmCLI)) throw new Error('npm installer path is unavailable');
+  const temp = fs.mkdtempSync(path.join(os.tmpdir(), 'creatok-platform-'));
+  try {
+    const result = spawnSync(process.execPath, [npmCLI, 'install', `${pkg}@${version}`,
+      '--prefix', recoveryDir, '--global=false', '--ignore-scripts', '--package-lock=false',
+      '--no-audit', '--no-fund', '--include=optional', '--prefer-online',
+      '--registry=https://registry.npmjs.org', '--cache', path.join(temp, 'cache')], {
+      encoding: 'utf8', windowsHide: true, timeout: 120000,
+      env: { ...process.env, CREATOK_AUTO_UPDATE: 'off' },
+    });
+    if (result.error || result.status !== 0) {
+      throw new Error(`platform download failed: ${result.error ? result.error.message : (result.stderr || '').trim()}`);
+    }
+    const bin = binaryPath();
+    if (!bin) throw new Error(`download did not provide ${pkg}@${version}`);
+    const check = spawnSync(bin, ['version'], {
+      encoding: 'utf8', windowsHide: true, timeout: 15000,
+      env: { ...process.env, CREATOK_AUTO_UPDATE: 'off', CREATOK_HOME: temp, CREATOK_LOG_DIR: temp },
+    });
+    if (check.error || check.status !== 0) throw new Error('downloaded binary failed to run');
+    let data;
+    try { data = JSON.parse(check.stdout).data; } catch { /* Invalid binary output. */ }
+    if (!data || data.version !== `v${version}`) throw new Error('downloaded binary version does not match the CLI');
+    return bin;
+  } finally {
+    fs.rmSync(temp, { recursive: true, force: true });
+  }
+}
+
+module.exports = { binaryPath, recoverBinary, repairCommand, supported, platform };

package/run.js

@@ -5,23 +5,13 @@
 // optional dependency) and exec it, passing through args, stdio, and exit code.
 const { spawnSync } = require('child_process');
 
-function binaryPath() {
-  const pkg = `@creatok/cli-${process.platform}-${process.arch}`;
-  const binName = process.platform === 'win32' ? 'creatok.exe' : 'creatok';
-  try {
-    return require.resolve(`${pkg}/bin/${binName}`);
-  } catch {
-    return null;
-  }
-}
+const { binaryPath, repairCommand, supported, platform } = require('./platform');
 
 const bin = binaryPath();
 if (!bin) {
-  console.error(
-    `creatok: no prebuilt binary for ${process.platform}-${process.arch}.\n` +
-      `The platform may be unsupported, or the optional platform package failed to install.\n` +
-      `Try: npm install -g @creatok/cli --force`
-  );
+  console.error(supported
+    ? `creatok: missing platform binary for ${platform}.\nTry: ${repairCommand()}`
+    : `creatok: unsupported platform ${platform}.`);
   process.exit(1);
 }