@tenderprompt/cli 0.1.34 → 0.1.35

package/dist/index.js

@@ -32,6 +32,8 @@ function readCliPackageVersion() {
 }
 const CLI_PACKAGE_VERSION = readCliPackageVersion();
 const GIT_COMMIT_SHA_PATTERN = /^[0-9a-f]{40}$/i;
+const SHOPIFY_CLI_PACKAGE = '@shopify/cli@latest';
+const SHOPIFY_CLI_BIN = 'shopify';
 const ANALYTICS_AUTHORING_PLAYBOOK_ID = 'analytics-event-authoring';
 const ANALYTICS_AUTHORING_COMMAND = 'tender app analytics authoring --json';
 const ANALYTICS_AUTHORING_PLAYBOOK_COMMAND = `tender playbooks get ${ANALYTICS_AUTHORING_PLAYBOOK_ID} --json`;
@@ -145,6 +147,23 @@ class TenderCliConnectorsApiError extends Error {
         this.example = example;
     }
 }
+class TenderCliChildProcessError extends Error {
+    command;
+    args;
+    exitCode;
+    stdout;
+    stderr;
+    constructor(input) {
+        const detail = input.stderr.trim() || input.stdout.trim();
+        super([`${input.command} ${input.args.join(' ')} failed with exit code ${input.exitCode}.`, detail].filter(Boolean).join('\n'));
+        this.name = 'TenderCliChildProcessError';
+        this.command = input.command;
+        this.args = input.args;
+        this.exitCode = input.exitCode;
+        this.stdout = input.stdout;
+        this.stderr = input.stderr;
+    }
+}
 const DEFAULT_PROFILE_NAME = 'default';
 const DEFAULT_BASE_URL = 'https://app.tenderprompt.com';
 const ARTIFACT_SOURCE_EXPORT_MAX_FILES = 1000;
@@ -592,7 +611,7 @@ function connectorsShopifySourceValidateHelp() {
     return `Usage: tender connectors shopify source validate <connector-id> [--dir <path>] [--client-id <shopify-client-id>] [--execute] [--base-url <url>] [--token <token>] [--profile <name>] [--json]
 
 Without --execute, prints the exact Shopify CLI validation command. With
---execute, runs npx --yes @shopify/cli@latest app config validate.
+the --execute flag, runs npm exec --yes --package @shopify/cli@latest -- shopify app config validate with npm lifecycle environment variables scrubbed.
 
 Examples:
   tender connectors shopify source validate conn_123 --dir ./shopify-app --execute --json`;
@@ -601,7 +620,7 @@ function connectorsShopifySourceDeployHelp() {
     return `Usage: tender connectors shopify source deploy <connector-id> [--dir <path>] [--client-id <shopify-client-id>] [--version <tag>] [--message <text>] [--source-control-url <url>] [--allow-deletes] [--confirm deploy] [--base-url <url>] [--token <token>] [--profile <name>] [--json]
 
 Without --confirm deploy, prints the exact Shopify CLI deployment command. With
---confirm deploy, runs npx --yes @shopify/cli@latest app deploy. If
+the --confirm deploy flag, runs npm exec --yes --package @shopify/cli@latest -- shopify app deploy with npm lifecycle environment variables scrubbed. If
 SHOPIFY_APP_AUTOMATION_TOKEN is not set locally, the CLI requests the
 connector's stored App Automation Token and injects it only into the spawned
 Shopify CLI child process.
@@ -12220,7 +12239,7 @@ spawned Shopify CLI child process.
 ## Validate
 
 \`\`\`sh
-npx --yes @shopify/cli@latest app config validate --path . --json
+npm exec --yes --package @shopify/cli@latest -- shopify app config validate --path . --json
 \`\`\`
 
 ## Deploy
@@ -12482,8 +12501,6 @@ async function commitAndPushSourceFiles(input) {
 }
 function shopifyValidateArgs(input) {
     return [
-        '--yes',
-        '@shopify/cli@latest',
         'app',
         'config',
         'validate',
@@ -12495,8 +12512,6 @@ function shopifyValidateArgs(input) {
 }
 function shopifyDeployArgs(input) {
     return [
-        '--yes',
-        '@shopify/cli@latest',
         'app',
         'deploy',
         '--path',
@@ -12508,9 +12523,50 @@ function shopifyDeployArgs(input) {
         ...(input.sourceControlUrl ? ['--source-control-url', input.sourceControlUrl] : []),
     ];
 }
+function shopifyCliCommand(args) {
+    return {
+        command: 'npm',
+        args: ['exec', '--yes', '--package', SHOPIFY_CLI_PACKAGE, '--', SHOPIFY_CLI_BIN, ...args],
+    };
+}
+function shopifyCliCommandLine(args) {
+    const invocation = shopifyCliCommand(args);
+    return commandLine(invocation.command, invocation.args);
+}
 function commandLine(command, args) {
     return [command, ...args.map(shellQuote)].join(' ');
 }
+function shouldDropNestedNpmEnv(key) {
+    const normalized = key.toLowerCase();
+    return (normalized === 'init_cwd' ||
+        normalized === 'npm_command' ||
+        normalized === 'npm_config_argv' ||
+        normalized === 'npm_config_call' ||
+        normalized === 'npm_config_package' ||
+        normalized === 'npm_execpath' ||
+        normalized === 'npm_node_execpath' ||
+        normalized.startsWith('npm_lifecycle_') ||
+        normalized.startsWith('npm_package_'));
+}
+function sanitizeNestedNpmEnvironment(env) {
+    const sanitized = {};
+    for (const [key, value] of Object.entries(env)) {
+        if (shouldDropNestedNpmEnv(key)) {
+            continue;
+        }
+        sanitized[key] = value;
+    }
+    return sanitized;
+}
+function shopifyCliChildEnv(runtime, overrides = {}) {
+    return {
+        ...sanitizeNestedNpmEnvironment({
+            ...process.env,
+            ...(runtime.env ?? {}),
+        }),
+        ...overrides,
+    };
+}
 function redactSensitiveText(value, secrets = []) {
     let redacted = value;
     for (const secret of secrets) {
@@ -12524,11 +12580,12 @@ function redactSensitiveText(value, secrets = []) {
         .replace(/\b(authorization\s*[:=]\s*(?:Bearer\s+)?)([^\s'"]+)/gi, '$1[REDACTED]')
         .replace(/\b(x-shopify-access-token\s*[:=]\s*)([^\s'"]+)/gi, '$1[REDACTED]');
 }
-async function runNpxCommand(input) {
+async function runShopifyCliCommand(input) {
     const runner = input.runtime.commandRunner ?? defaultCommandRunner;
-    const result = await runner('npx', input.args, {
+    const invocation = shopifyCliCommand(input.args);
+    const result = await runner(invocation.command, invocation.args, {
         cwd: input.cwd,
-        ...(input.env ? { env: input.env } : {}),
+        env: shopifyCliChildEnv(input.runtime, input.env),
     });
     const redactedResult = {
         ...result,
@@ -12536,12 +12593,13 @@ async function runNpxCommand(input) {
         stderr: redactSensitiveText(result.stderr, input.redactions),
     };
     if (redactedResult.exitCode !== 0) {
-        throw new Error([
-            `npx ${input.args.join(' ')} failed with exit code ${redactedResult.exitCode}.`,
-            redactedResult.stderr.trim() || redactedResult.stdout.trim(),
-        ]
-            .filter(Boolean)
-            .join('\n'));
+        throw new TenderCliChildProcessError({
+            command: invocation.command,
+            args: invocation.args,
+            exitCode: redactedResult.exitCode,
+            stdout: redactedResult.stdout,
+            stderr: redactedResult.stderr,
+        });
     }
     return redactedResult;
 }
@@ -12570,10 +12628,8 @@ function localShopifyDeployToken(runtime) {
     const token = env.SHOPIFY_APP_AUTOMATION_TOKEN;
     return token?.trim() ? token.trim() : null;
 }
-function childShopifyDeployEnv(runtime, token) {
+function childShopifyDeployEnv(_runtime, token) {
     return {
-        ...process.env,
-        ...(runtime.env ?? {}),
         SHOPIFY_APP_AUTOMATION_TOKEN: token,
     };
 }
@@ -12682,8 +12738,8 @@ async function runConnectorsShopifySourceInit(command, io, runtime) {
             sourceCheckout: checkout.sourceCheckout,
             commit: gitCommit,
         },
-        validateCommand: commandLine('npx', shopifyValidateArgs({ dir, clientId: command.clientId })),
-        deployCommand: commandLine('npx', shopifyDeployArgs({ dir, clientId: command.clientId, version: 'connector-source', message: null, sourceControlUrl: null, allowDeletes: false })),
+        validateCommand: shopifyCliCommandLine(shopifyValidateArgs({ dir, clientId: command.clientId })),
+        deployCommand: shopifyCliCommandLine(shopifyDeployArgs({ dir, clientId: command.clientId, version: 'connector-source', message: null, sourceControlUrl: null, allowDeletes: false })),
     };
     printConnectorsPayload(command, io, result, [
         `connector_id: ${command.connectorId}`,
@@ -12745,10 +12801,10 @@ async function runConnectorsShopifySourceValidate(command, io, runtime) {
         }
     }
     if (!command.execute) {
-        printConnectorsPayload(command, io, { ok: true, dryRun: true, command: command.command, connectorId: command.connectorId, sourceArtifactId, dir, shopifyCommand: commandLine('npx', args) }, [`connector_id: ${command.connectorId}`, `source_artifact_id: ${sourceArtifactId}`, `source_dir: ${dir}`, `shopify_command: ${commandLine('npx', args)}`]);
+        printConnectorsPayload(command, io, { ok: true, dryRun: true, command: command.command, connectorId: command.connectorId, sourceArtifactId, dir, shopifyCommand: shopifyCliCommandLine(args) }, [`connector_id: ${command.connectorId}`, `source_artifact_id: ${sourceArtifactId}`, `source_dir: ${dir}`, `shopify_command: ${shopifyCliCommandLine(args)}`]);
         return 0;
     }
-    const result = await runNpxCommand({ args, cwd: dir, runtime });
+    const result = await runShopifyCliCommand({ args, cwd: dir, runtime });
     printConnectorsPayload(command, io, { ok: true, command: command.command, connectorId: command.connectorId, sourceArtifactId, dir, exitCode: result.exitCode, stdout: result.stdout, stderr: result.stderr }, [`connector_id: ${command.connectorId}`, `source_artifact_id: ${sourceArtifactId}`, `source_dir: ${dir}`, 'validation: passed']);
     return 0;
 }
@@ -12769,7 +12825,7 @@ async function runConnectorsShopifySourceDeploy(command, io, runtime) {
         allowDeletes: command.allowDeletes,
     });
     if (command.confirm !== 'deploy') {
-        printConnectorsPayload(command, io, { ok: true, dryRun: true, command: command.command, connectorId: command.connectorId, sourceArtifactId, dir, shopifyCommand: commandLine('npx', args), confirmRequired: 'deploy' }, [`connector_id: ${command.connectorId}`, `source_artifact_id: ${sourceArtifactId}`, `source_dir: ${dir}`, `shopify_command: ${commandLine('npx', args)}`, 'confirm_required: --confirm deploy']);
+        printConnectorsPayload(command, io, { ok: true, dryRun: true, command: command.command, connectorId: command.connectorId, sourceArtifactId, dir, shopifyCommand: shopifyCliCommandLine(args), confirmRequired: 'deploy' }, [`connector_id: ${command.connectorId}`, `source_artifact_id: ${sourceArtifactId}`, `source_dir: ${dir}`, `shopify_command: ${shopifyCliCommandLine(args)}`, 'confirm_required: --confirm deploy']);
         return 0;
     }
     const deployToken = await resolveShopifyDeployTokenEnvironment({
@@ -12779,7 +12835,7 @@ async function runConnectorsShopifySourceDeploy(command, io, runtime) {
         runtime,
         fetcher,
     });
-    const result = await runNpxCommand({ args, cwd: dir, runtime, env: deployToken.env, redactions: deployToken.redactions });
+    const result = await runShopifyCliCommand({ args, cwd: dir, runtime, env: deployToken.env, redactions: deployToken.redactions });
     printConnectorsPayload(command, io, { ok: true, command: command.command, connectorId: command.connectorId, sourceArtifactId, dir, exitCode: result.exitCode, stdout: result.stdout, stderr: result.stderr }, [`connector_id: ${command.connectorId}`, `source_artifact_id: ${sourceArtifactId}`, `source_dir: ${dir}`, 'deploy: completed']);
     return 0;
 }
@@ -13880,6 +13936,9 @@ function cliErrorMessage(error) {
     return String(error);
 }
 function cliErrorCode(error) {
+    if (error instanceof TenderCliChildProcessError) {
+        return 'child_process_failed';
+    }
     if (error instanceof TenderCliDbApiError || error instanceof TenderCliAnalyticsApiError || error instanceof TenderCliConnectorsApiError) {
         return error.reasonCode;
     }
@@ -13967,6 +14026,16 @@ function cliErrorPayload(error, args, command) {
     const scope = scopeForError(error, args, command);
     const example = exampleForError(error, args, command);
     const nextAction = nextActionForError(error);
+    const childProcess = error instanceof TenderCliChildProcessError
+        ? {
+            command: error.command,
+            args: error.args,
+            commandLine: commandLine(error.command, error.args),
+            exitCode: error.exitCode,
+            stdout: error.stdout,
+            stderr: error.stderr,
+        }
+        : null;
     return {
         ok: false,
         command: commandNameForError(args, command),
@@ -13975,6 +14044,7 @@ function cliErrorPayload(error, args, command) {
         ...(scope ? { scope } : {}),
         ...(nextAction ? { nextAction } : {}),
         ...(example ? { example } : {}),
+        ...(childProcess ? { childProcess } : {}),
     };
 }
 export async function runTenderCli(args, io = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tenderprompt/cli",
-	"version": "0.1.34",
+	"version": "0.1.35",
 	"type": "module",
 	"bin": {
 		"tender": "bin/tender.js"