@visa/cli 5.0.0-rc.409 → 5.0.0-rc.412

package/dist/managed-runtime/runtime-readiness.mjs

@@ -1,22 +1,4 @@
 export const DEFAULT_RUNTIME_READINESS_TIMEOUT_MS = 60_000
-const COMMERCE_RUNTIMES = new Set(['openclaw', 'hermes'])
-
-/** Fixed argv only: callers cannot substitute a package, command, or script path. */
-export function commerceSkillArgs(env = process.env, check = false) {
-  const runtime = env.VISA_COMMERCE_RUNTIME || ''
-  if (runtime && !COMMERCE_RUNTIMES.has(runtime)) {
-    throw new Error('VISA_COMMERCE_RUNTIME must be openclaw or hermes')
-  }
-  return [
-    'agent',
-    'skill',
-    '--commerce',
-    ...(runtime ? ['--runtime', runtime] : []),
-    ...(check ? ['--check'] : []),
-    '--format',
-    'json',
-  ]
-}
 
 function isPlainRecord(value) {
   return typeof value === 'object' && value !== null && !Array.isArray(value)
@@ -57,32 +39,6 @@ export function parseRuntimeReadiness(raw) {
   }
 }
 
-export function assertSameShopifyRuntime(actual, expected) {
-  if (!isPlainRecord(actual)) {
-    throw new Error('loaded runtime readiness must attest the named shopify-ucp MCP')
-  }
-  if (actual.serverName !== 'shopify-ucp') {
-    throw new Error('loaded runtime readiness did not attest the canonical shopify-ucp mount')
-  }
-  for (const field of ['installedVersion', 'toolSchemaFingerprint', 'command']) {
-    if (actual[field] !== expected[field]) {
-      throw new Error(`loaded Shopify UCP ${field} does not match the certified local runtime`)
-    }
-  }
-  if (
-    !Array.isArray(actual.args) ||
-    actual.args.length !== expected.args.length ||
-    !actual.args.every((value, index) => value === expected.args[index])
-  ) {
-    throw new Error('loaded Shopify UCP command arguments do not match the certified local runtime')
-  }
-  if (!Array.isArray(actual.blockedTools) || !actual.blockedTools.includes('checkout_complete')) {
-    throw new Error(
-      'loaded Shopify UCP runtime does not attest the checkout completion deny boundary'
-    )
-  }
-}
-
 export function resolveRuntimeUpdateConfig(env = process.env) {
   const restartCommand = env.RUNTIME_RESTART_COMMAND || env.OPENCLAW_RESTART_COMMAND || ''
   const readinessCommand = env.RUNTIME_READINESS_COMMAND || ''

package/dist/managed-runtime/update-and-restart.mjs

@@ -25,8 +25,6 @@ import { basename, dirname, isAbsolute, join, relative, resolve } from 'node:pat
 import { fileURLToPath } from 'node:url'
 import {
   assertSameRuntimeBuild,
-  assertSameShopifyRuntime,
-  commerceSkillArgs,
   parseRuntimeReadiness,
   resolveRuntimeUpdateConfig,
   runtimeReadinessExecOptions,
@@ -656,105 +654,34 @@ export function recoverInterruptedActivation(managedDir, logger = console) {
   return true
 }
 
-function runCommerceInstall(releaseDir, env, execFile, timeout) {
+export function certifyLocalBinary(
+  releaseDir,
+  env = process.env,
+  execFile = execFileSync,
+  timeout = DEFAULT_COMMAND_TIMEOUT_MS
+) {
   try {
-    execFile(visaBinary(releaseDir), commerceSkillArgs(env), {
-      stdio: ['ignore', 'pipe', 'pipe'],
-      timeout,
-    })
-  } catch (error) {
-    throw new ManagedRuntimeUpdateError(
-      'rebuild_or_remount_required',
-      'the managed runtime could not refresh its installer-owned commerce mount; rebuild or remount it',
-      { cause: error }
-    )
-  }
-}
-
-function certifyLocalBinary(releaseDir, execFile, timeout) {
-  const rawCapabilities = execFile(visaBinary(releaseDir), ['capabilities', '--format', 'json'], {
-    encoding: 'utf8',
-    stdio: ['ignore', 'pipe', 'pipe'],
-    timeout,
-  })
-  const capabilities = parseJson(rawCapabilities, 'visa capabilities')
-  const build = capabilities?.data?.build ?? capabilities?.build
-  if (typeof build?.version !== 'string' || typeof build?.targetEnvironment !== 'string') {
-    throw new ManagedRuntimeUpdateError(
-      'local_readiness_failed',
-      'local capabilities omitted build identity'
-    )
-  }
-
-  return {
-    version: build.version,
-    targetEnvironment: build.targetEnvironment,
-    minCompatibleVersion: build.minCompatibleVersion || null,
-  }
-}
-
-function certifyLocalCommerce(releaseDir, env, execFile, timeout) {
-  let rawCommerce
-  try {
-    rawCommerce = execFile(visaBinary(releaseDir), commerceSkillArgs(env, true), {
+    const entry = join(releaseDir, 'node_modules', '@visa', 'cli', 'dist', 'mcp-server', 'index.js')
+    const raw = execFile(process.execPath, [entry, '--self-check'], {
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'pipe'],
       timeout,
+      env,
     })
+    if (JSON.parse(raw)?.ok !== true) throw new Error('self-check did not succeed')
+    const build = parseRuntimeReadiness(raw)
+    return {
+      version: build.version,
+      targetEnvironment: build.targetEnvironment,
+      minCompatibleVersion: null,
+    }
   } catch (error) {
     throw new ManagedRuntimeUpdateError(
-      'commerce_runtime_not_ready',
-      'local Shopify UCP runtime readiness command failed',
+      'local_readiness_failed',
+      'staged MCP server failed its self-check',
       { cause: error }
     )
   }
-  const commerce = parseJson(rawCommerce, 'commerce readiness')
-  if (
-    commerce?.localBundleReady !== true ||
-    commerce?.shopifyRuntime?.status !== 'ready' ||
-    typeof commerce?.shopifyRuntime?.toolSchemaFingerprint !== 'string'
-  ) {
-    throw new ManagedRuntimeUpdateError(
-      'commerce_runtime_not_ready',
-      'local Shopify UCP runtime did not certify its required tools'
-    )
-  }
-  return commerce.shopifyRuntime
-}
-
-function assessLocalCommerce(releaseDir, env, execFile, timeout) {
-  try {
-    runCommerceInstall(releaseDir, env, execFile, timeout)
-    return {
-      commerceReady: true,
-      commerceActionRequired: null,
-      shopifyRuntime: certifyLocalCommerce(releaseDir, env, execFile, timeout),
-    }
-  } catch (error) {
-    const code =
-      error instanceof ManagedRuntimeUpdateError && error.code === 'rebuild_or_remount_required'
-        ? 'rebuild_or_remount_required'
-        : 'commerce_runtime_not_ready'
-    return {
-      commerceReady: false,
-      commerceActionRequired: code,
-      shopifyRuntime: null,
-    }
-  }
-}
-
-function assessLoadedCommerce(loaded, localCommerce) {
-  if (!localCommerce.commerceReady) return localCommerce
-  try {
-    assertSameShopifyRuntime(loaded.shopifyRuntime, localCommerce.shopifyRuntime)
-    return localCommerce
-  } catch {
-    return {
-      commerceReady: false,
-      commerceActionRequired: 'commerce_runtime_not_ready',
-      shopifyRuntime: null,
-    }
-  }
 }
 
 function restartSupervisor(config, dependencies, operation = 'restart') {
@@ -917,7 +844,7 @@ export async function runManagedRuntimeUpdate(env = process.env, dependencies =
     )
     targetRelease = stageExactRelease(config, dependencies)
     const execFile = dependencies.execFileSync ?? execFileSync
-    const local = certifyLocalBinary(targetRelease, execFile, config.commandTimeoutMs)
+    const local = certifyLocalBinary(targetRelease, env, execFile, config.commandTimeoutMs)
     if (local.version !== config.exactVersion) {
       throw new ManagedRuntimeUpdateError(
         'installed_version_mismatch',
@@ -930,27 +857,25 @@ export async function runManagedRuntimeUpdate(env = process.env, dependencies =
         `staged CLI targets ${local.targetEnvironment}, expected ${config.expectedEnvironment}`
       )
     }
-    const localCommerce = assessLocalCommerce(targetRelease, env, execFile, config.commandTimeoutMs)
-
     const releaseIntegrity = releaseTreeIntegrity(targetRelease)
     writePendingTransaction(config, targetRelease, previous, correlationId)
     activateRelease(config.managedDir, targetRelease)
     activated = true
     const loaded = restartAndReadLoaded(config, dependencies)
     assertSameRuntimeBuild(loaded, local)
-    const commerce = assessLoadedCommerce(loaded, localCommerce)
-    if (!commerce.commerceReady) {
-      structuredLog(
-        'commerce_action_required',
-        {
-          correlationId,
-          version: local.version,
-          code: commerce.commerceActionRequired,
-          checkoutBlocked: true,
-        },
-        dependencies.logger
-      )
-    }
+    // Preserve the receipt contract without invoking the retired Shopify installer.
+    // Binary readiness never establishes payment readiness.
+    const commerceActionRequired = 'commerce_runtime_removed'
+    structuredLog(
+      'commerce_action_required',
+      {
+        correlationId,
+        version: local.version,
+        code: commerceActionRequired,
+        checkoutBlocked: true,
+      },
+      dependencies.logger
+    )
 
     const receipt = {
       ok: true,
@@ -962,19 +887,10 @@ export async function runManagedRuntimeUpdate(env = process.env, dependencies =
       releaseDir: targetRelease,
       previousVersion: previous?.receipt.version ?? null,
       releaseIntegrity,
-      commerceReady: commerce.commerceReady,
-      checkoutBlocked: !commerce.commerceReady,
-      commerceActionRequired: commerce.commerceActionRequired,
-      shopifyRuntime: commerce.commerceReady
-        ? {
-            serverName: 'shopify-ucp',
-            installedVersion: commerce.shopifyRuntime.installedVersion,
-            toolSchemaFingerprint: commerce.shopifyRuntime.toolSchemaFingerprint,
-            command: commerce.shopifyRuntime.command,
-            args: commerce.shopifyRuntime.args,
-            blockedTools: commerce.shopifyRuntime.blockedTools,
-          }
-        : null,
+      commerceReady: false,
+      checkoutBlocked: true,
+      commerceActionRequired,
+      shopifyRuntime: null,
       durationMs: Date.now() - startedAt,
     }
     try {