Fix everything.

Author: mkcode

README.md

@@ -47,6 +47,8 @@ This Action:
   - `message`: The final rendered message.
   - `tag`: The final rendered tag (if any).
 - `only_upload` mode when you want to upload a version and deploy it separately.
+- `wrangler_command` lets you control exactly how Wrangler is invoked (e.g. `wrangler`, `npx wrangler@4`, `pnpm dlx wrangler@4`).
+- `working_directory` lets you target a specific folder in a monorepo when running Wrangler commands.
 
 ## How it works
 
@@ -88,11 +90,13 @@ This upload-then-deploy flow is what enables meaningful messages to show up in C
 You must:
 
 - Use Wrangler v4 (Versions API support required).
-- Ensure `wrangler` is available in your GitHub Actions runner:
-  - Example:
-    - `pnpm dlx wrangler@4 --version`
-    - or `npx wrangler@4 --version`
-  - or add Wrangler v4 as a dev dependency and use it from PATH.
+- Ensure you have a reliable way to invoke Wrangler v4:
+-  - You specify this explicitly via the `wrangler_command` input.
+-  - Examples:
+-    - `wrangler`
+-    - `npx wrangler@4`
+-    - `pnpm dlx wrangler@4`
+-  - No separate install step is required if your `wrangler_command` handles it.
 - Provide a Cloudflare API token:
   - With appropriate permissions for your Worker.
   - Passed via `secrets` to the `api_token` input.
@@ -117,6 +121,27 @@ All inputs are strings (as per GitHub Actions) unless noted; booleans are passed
   - Recommended: `secrets.CLOUDFLARE_API_TOKEN`.
   - Used to set `CLOUDFLARE_API_TOKEN` for the Wrangler commands.
 
+- `wrangler_command` (required)
+  - How to invoke Wrangler.
+  - This is the base command (and optional leading arguments) that will be used for both upload and deploy.
+  - Examples:
+    - `wrangler`
+    - `npx wrangler@4`
+    - `pnpm dlx wrangler@4`
+  - The Action splits this into:
+    - Executable: first token
+    - Base args: remaining tokens
+  - Then runs:
+    - `<wrangler_command> versions upload ...`
+    - `<wrangler_command> versions deploy ...`
+
+- `working_directory` (optional)
+  - Working directory from which Wrangler commands will be executed.
+  - If set, it is used as the `cwd` for both:
+    - `versions upload`
+    - `versions deploy`
+  - Useful for monorepos where your Worker lives in a subfolder.
+
 - `config` (required)
   - Path to the Wrangler configuration file.
   - Passed as:
@@ -241,6 +266,7 @@ jobs:
         uses: your-org/wrangler-version-deploy-action-with-metadata@v1
         with:
           api_token: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          wrangler_command: "pnpm dlx wrangler@4"
           config: "dist/server/wrangler.json"
           upload_args: "--env production"
           deploy_args: "--env production"
@@ -279,6 +305,7 @@ jobs:
         uses: your-org/wrangler-version-deploy-action-with-metadata@v1
         with:
           api_token: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          wrangler_command: "pnpm dlx wrangler@4"
           config: "wrangler.toml"
           upload_args: "--env staging"
           only_upload: "true"
@@ -327,7 +354,7 @@ You can combine outputs with other Actions to post deployment info back to PRs:
       });
 ```
 +
-+### Example 4: Monorepo - Deploy Only When a Folder Changes
+### Example 4: Monorepo - Deploy Only When a Folder Changes
 +
 +In a monorepo, you often want to:
 +
@@ -365,16 +392,18 @@ You can combine outputs with other Actions to post deployment info back to PRs:
 +
 +      - run: pnpm dlx wrangler@4 --version
 +
-+      - name: Upload + deploy worker-app via Versions API with metadata
-+        id: cf_deploy
-+        uses: your-org/wrangler-version-deploy-action-with-metadata@v1
-+        with:
-+          api_token: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-+          config: "apps/worker-app/wrangler.toml"
-+          upload_args: "--env production"
-+          deploy_args: "--env production"
-+          message_template: "worker-app: {{repo}}@{{short_sha}} on {{branch}} (run {{run_number}})"
-+```
+      - name: Upload + deploy worker-app via Versions API with metadata
+        id: cf_deploy
+        uses: your-org/wrangler-version-deploy-action-with-metadata@v1
+        with:
+          api_token: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          wrangler_command: "pnpm dlx wrangler@4"
+          working_directory: "apps/worker-app"
+          config: "wrangler.toml"
+          upload_args: "--env production"
+          deploy_args: "--env production"
+          message_template: "worker-app: {{repo}}@{{short_sha}} on {{branch}} (run {{run_number}})"
+```
 
 ## Notes
 

action.yml

@@ -9,6 +9,12 @@ inputs:
   api_token:
     description: "Cloudflare API token. Pass via secrets (e.g. secrets.CLOUDFLARE_API_TOKEN)."
     required: true
+  wrangler_command:
+    description: "Command used to invoke Wrangler (for example: wrangler, npx wrangler, pnpm dlx wrangler@4)."
+    required: true
+  working_directory:
+    description: "Working directory from which Wrangler commands will be executed (useful for monorepos)."
+    required: false
   config:
     description: "Path to the Wrangler configuration file (e.g. wrangler.toml or dist/server/wrangler.json). This will be passed as --config to both versions upload and versions deploy."
     required: true

src/index.ts

@@ -25,6 +25,10 @@ interface DeployMetadata {
 async function run(): Promise<void> {
   try {
     const apiToken = core.getInput("api_token", { required: true });
+    const wranglerCommandInput = core.getInput("wrangler_command", {
+      required: true,
+    });
+    const workingDirectoryInput = core.getInput("working_directory") || "";
     const onlyUploadInput = core.getInput("only_upload") || "false";
     const onlyUpload = onlyUploadInput.toLowerCase() === "true";
     const config = core.getInput("config", { required: true });
@@ -36,6 +40,15 @@ async function run(): Promise<void> {
     const uploadArgsList = splitArgs(uploadArgsRaw);
     const deployArgsList = splitArgs(deployArgsRaw);
 
+    const workingDirectory =
+      workingDirectoryInput.trim().length > 0
+        ? workingDirectoryInput.trim()
+        : undefined;
+
+    const wranglerCommandParts = wranglerCommandInput.trim().split(/\s+/);
+    const wranglerExec = wranglerCommandParts[0];
+    const wranglerBaseArgs = wranglerCommandParts.slice(1);
+
     if (!apiToken) {
       core.setFailed("Cloudflare API token (api_token) is required.");
       return;
@@ -80,6 +93,7 @@ async function run(): Promise<void> {
     // We assume the user is on Wrangler v4+ and that `versions` commands are available.
     // The actual Worker configuration (e.g. wrangler.toml) is controlled by the caller.
     const uploadArgs = [
+      ...wranglerBaseArgs,
       "versions",
       "upload",
       "--config",
@@ -98,6 +112,7 @@ async function run(): Promise<void> {
         ...process.env,
         CLOUDFLARE_API_TOKEN: apiToken,
       },
+      cwd: workingDirectory,
       listeners: {
         stdout: (data: Buffer) => {
           const text = data.toString();
@@ -113,7 +128,7 @@ async function run(): Promise<void> {
     };
 
     const uploadExitCode = await exec.exec(
-      "wrangler",
+      wranglerExec,
       uploadArgs,
       uploadOptions,
     );
@@ -157,6 +172,7 @@ async function run(): Promise<void> {
 
     // 3) Run `wrangler versions deploy <versionId>` non-interactively with the same message.
     const deployArgs = [
+      ...wranglerBaseArgs,
       "versions",
       "deploy",
       versionId,
@@ -177,6 +193,7 @@ async function run(): Promise<void> {
         ...process.env,
         CLOUDFLARE_API_TOKEN: apiToken,
       },
+      cwd: workingDirectory,
       listeners: {
         stdout: (data: Buffer) => {
           const text = data.toString();
@@ -192,7 +209,7 @@ async function run(): Promise<void> {
     };
 
     const deployExitCode = await exec.exec(
-      "wrangler",
+      wranglerExec,
       deployArgs,
       deployOptions,
     );