@liiift-studio/deploy-vercel-from-sanity 1.5.1 → 1.6.0

package/dist/index.d.mts

@@ -60,6 +60,12 @@ interface VercelDeployment {
          * deployment comes back BLOCKED.
          */
         githubCommitAuthorLogin?: string;
+        /**
+         * Branch the deploy hook is configured for. Present only on hook-triggered
+         * deployments, and more reliable than githubCommitRef for learning which branch
+         * a target follows, since it describes the hook rather than one commit.
+         */
+        deployHookRef?: string;
         /** GitHub repo in "org/repo" format — used to construct commit links */
         githubRepo?: string;
         /** GitHub org slug — fallback when githubRepo is absent */

package/dist/index.d.ts

@@ -60,6 +60,12 @@ interface VercelDeployment {
          * deployment comes back BLOCKED.
          */
         githubCommitAuthorLogin?: string;
+        /**
+         * Branch the deploy hook is configured for. Present only on hook-triggered
+         * deployments, and more reliable than githubCommitRef for learning which branch
+         * a target follows, since it describes the hook rather than one commit.
+         */
+        deployHookRef?: string;
         /** GitHub repo in "org/repo" format — used to construct commit links */
         githubRepo?: string;
         /** GitHub org slug — fallback when githubRepo is absent */

package/dist/index.js

@@ -617,7 +617,7 @@ async function vercelFetch(path, token, init) {
 async function listDeployments(opts) {
   const params = new URLSearchParams({
     projectId: opts.projectId,
-    "meta-deployHookId": opts.hookId,
+    ...opts.branch ? { "meta-githubCommitRef": opts.branch } : { "meta-deployHookId": opts.hookId },
     limit: String(opts.limit ?? 10)
   });
   if (opts.teamId) params.set("teamId", opts.teamId);
@@ -671,7 +671,7 @@ async function proxyFetch(url, statusKey, init) {
   }
   return res.json();
 }
-async function fetchDeployments(transport, target, limit) {
+async function fetchDeployments(transport, target, limit, branch) {
   if (transport.mode === "direct") {
     if (!target.projectId || !target.hookId) return [];
     return listDeployments({
@@ -679,11 +679,13 @@ async function fetchDeployments(transport, target, limit) {
       hookId: target.hookId,
       token: transport.token,
       teamId: target.teamId,
-      limit
+      limit,
+      branch
     });
   }
   const params = new URLSearchParams({ key: target.proxyKey ?? "" });
   if (limit) params.set("limit", String(limit));
+  if (branch) params.set("branch", branch);
   const data = await proxyFetch(
     `${transport.proxyUrl}/deployments?${params}`,
     transport.statusKey
@@ -952,7 +954,7 @@ function StatusBadge({ state, showSpinner }) {
 // src/components/DeployHistory.tsx
 var import_react7 = require("react");
 var import_jsx_runtime9 = require("react/jsx-runtime");
-function DeployHistory({ target, token, onClose }) {
+function DeployHistory({ target, token, branch, onClose }) {
   const dialogId = (0, import_react7.useId)();
   const pluginConfig = usePluginConfig();
   const [deployments, setDeployments] = (0, import_react7.useState)([]);
@@ -971,14 +973,14 @@ function DeployHistory({ target, token, onClose }) {
     setLoading(true);
     setError(null);
     try {
-      const data = await fetchDeployments(transport, targetRef, 20);
+      const data = await fetchDeployments(transport, targetRef, 20, branch);
       setDeployments(data);
     } catch (err) {
       setError(err instanceof Error ? err.message : "Failed to load history");
     } finally {
       setLoading(false);
     }
-  }, [transport, targetRef]);
+  }, [transport, targetRef, branch]);
   (0, import_react7.useEffect)(() => {
     load();
   }, [load]);
@@ -1004,7 +1006,7 @@ function DeployHistory({ target, token, onClose }) {
           ] }) }),
           deployments.map((d) => {
             const { label, tone } = stateLabel(d.state);
-            const branch = d.meta?.githubCommitRef ?? "\u2014";
+            const branch2 = d.meta?.githubCommitRef ?? "\u2014";
             const sha = shortSha(d.meta?.githubCommitSha);
             const message = d.meta?.githubCommitMessage?.split("\n")[0] ?? "";
             return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(Card, { padding: 3, radius: 2, shadow: 1, tone: "default", children: /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(Flex, { gap: 3, align: "center", children: [
@@ -1020,7 +1022,7 @@ function DeployHistory({ target, token, onClose }) {
               ) : /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(Text, { size: 1, muted: true, children: "\u2014" }) }),
               /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(Box, { flex: 1, children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(Badge, { tone, children: label }) }),
               /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(Box, { flex: 2, style: { overflow: "hidden" }, children: /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(Stack, { space: 1, children: [
-                /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(Text, { size: 1, children: branch }),
+                /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(Text, { size: 1, children: branch2 }),
                 sha && /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(Text, { size: 0, muted: true, children: [
                   sha,
                   message ? ` \xB7 ${message.slice(0, 40)}${message.length > 40 ? "\u2026" : ""}` : ""
@@ -1085,6 +1087,7 @@ function DeployItem({ target, token, onDelete, onEdit }) {
   const [pollError, setPollError] = (0, import_react8.useState)(null);
   const [bumping, setBumping] = (0, import_react8.useState)(false);
   const [awaitingBump, setAwaitingBump] = (0, import_react8.useState)(false);
+  const [knownBranch, setKnownBranch] = (0, import_react8.useState)(void 0);
   const [bumpResult, setBumpResult] = (0, import_react8.useState)(null);
   const triggeredFromUidRef = (0, import_react8.useRef)(void 0);
   const bumpedFromUidRef = (0, import_react8.useRef)(void 0);
@@ -1104,16 +1107,20 @@ function DeployItem({ target, token, onDelete, onEdit }) {
     if (!ready) return;
     const seq = ++requestSeqRef.current;
     try {
-      const data = await fetchDeployments(transport, targetRef);
+      const data = await fetchDeployments(transport, targetRef, void 0, knownBranch);
       if (seq !== requestSeqRef.current || !mountedRef.current) return;
       setDeployments(data);
       setPollError(null);
+      if (!knownBranch) {
+        const learned = data[0]?.meta?.deployHookRef ?? data[0]?.meta?.githubCommitRef;
+        if (learned) setKnownBranch(learned);
+      }
     } catch (err) {
       if (seq !== requestSeqRef.current || !mountedRef.current) return;
       setPollError(err instanceof Error ? err.message : "Could not reach the Vercel API");
       console.error("Deploy-vercel-from-sanity: fetch error", err);
     }
-  }, [transport, targetRef]);
+  }, [transport, targetRef, knownBranch]);
   (0, import_react8.useEffect)(() => {
     fetchDeployments2().finally(() => setLoadingInitial(false));
   }, [fetchDeployments2]);
@@ -1602,6 +1609,7 @@ function DeployItem({ target, token, onDelete, onEdit }) {
       {
         target,
         token,
+        branch: knownBranch,
         onClose: () => setShowHistory(false)
       }
     )
@@ -1887,7 +1895,7 @@ function DeployTargetForm({ initial, onSaved, onClose }) {
 }
 
 // src/version.ts
-var VERSION = "1.5.1";
+var VERSION = "1.6.0";
 
 // src/components/DeployTool.tsx
 var import_jsx_runtime13 = require("react/jsx-runtime");

package/dist/index.mjs

@@ -582,7 +582,7 @@ async function vercelFetch(path, token, init) {
 async function listDeployments(opts) {
   const params = new URLSearchParams({
     projectId: opts.projectId,
-    "meta-deployHookId": opts.hookId,
+    ...opts.branch ? { "meta-githubCommitRef": opts.branch } : { "meta-deployHookId": opts.hookId },
     limit: String(opts.limit ?? 10)
   });
   if (opts.teamId) params.set("teamId", opts.teamId);
@@ -636,7 +636,7 @@ async function proxyFetch(url, statusKey, init) {
   }
   return res.json();
 }
-async function fetchDeployments(transport, target, limit) {
+async function fetchDeployments(transport, target, limit, branch) {
   if (transport.mode === "direct") {
     if (!target.projectId || !target.hookId) return [];
     return listDeployments({
@@ -644,11 +644,13 @@ async function fetchDeployments(transport, target, limit) {
       hookId: target.hookId,
       token: transport.token,
       teamId: target.teamId,
-      limit
+      limit,
+      branch
     });
   }
   const params = new URLSearchParams({ key: target.proxyKey ?? "" });
   if (limit) params.set("limit", String(limit));
+  if (branch) params.set("branch", branch);
   const data = await proxyFetch(
     `${transport.proxyUrl}/deployments?${params}`,
     transport.statusKey
@@ -917,7 +919,7 @@ function StatusBadge({ state, showSpinner }) {
 // src/components/DeployHistory.tsx
 import { useId as useId3, useEffect as useEffect3, useMemo, useState as useState4, useCallback as useCallback3 } from "react";
 import { jsx as jsx9, jsxs as jsxs5 } from "react/jsx-runtime";
-function DeployHistory({ target, token, onClose }) {
+function DeployHistory({ target, token, branch, onClose }) {
   const dialogId = useId3();
   const pluginConfig = usePluginConfig();
   const [deployments, setDeployments] = useState4([]);
@@ -936,14 +938,14 @@ function DeployHistory({ target, token, onClose }) {
     setLoading(true);
     setError(null);
     try {
-      const data = await fetchDeployments(transport, targetRef, 20);
+      const data = await fetchDeployments(transport, targetRef, 20, branch);
       setDeployments(data);
     } catch (err) {
       setError(err instanceof Error ? err.message : "Failed to load history");
     } finally {
       setLoading(false);
     }
-  }, [transport, targetRef]);
+  }, [transport, targetRef, branch]);
   useEffect3(() => {
     load();
   }, [load]);
@@ -969,7 +971,7 @@ function DeployHistory({ target, token, onClose }) {
           ] }) }),
           deployments.map((d) => {
             const { label, tone } = stateLabel(d.state);
-            const branch = d.meta?.githubCommitRef ?? "\u2014";
+            const branch2 = d.meta?.githubCommitRef ?? "\u2014";
             const sha = shortSha(d.meta?.githubCommitSha);
             const message = d.meta?.githubCommitMessage?.split("\n")[0] ?? "";
             return /* @__PURE__ */ jsx9(Card, { padding: 3, radius: 2, shadow: 1, tone: "default", children: /* @__PURE__ */ jsxs5(Flex, { gap: 3, align: "center", children: [
@@ -985,7 +987,7 @@ function DeployHistory({ target, token, onClose }) {
               ) : /* @__PURE__ */ jsx9(Text, { size: 1, muted: true, children: "\u2014" }) }),
               /* @__PURE__ */ jsx9(Box, { flex: 1, children: /* @__PURE__ */ jsx9(Badge, { tone, children: label }) }),
               /* @__PURE__ */ jsx9(Box, { flex: 2, style: { overflow: "hidden" }, children: /* @__PURE__ */ jsxs5(Stack, { space: 1, children: [
-                /* @__PURE__ */ jsx9(Text, { size: 1, children: branch }),
+                /* @__PURE__ */ jsx9(Text, { size: 1, children: branch2 }),
                 sha && /* @__PURE__ */ jsxs5(Text, { size: 0, muted: true, children: [
                   sha,
                   message ? ` \xB7 ${message.slice(0, 40)}${message.length > 40 ? "\u2026" : ""}` : ""
@@ -1050,6 +1052,7 @@ function DeployItem({ target, token, onDelete, onEdit }) {
   const [pollError, setPollError] = useState5(null);
   const [bumping, setBumping] = useState5(false);
   const [awaitingBump, setAwaitingBump] = useState5(false);
+  const [knownBranch, setKnownBranch] = useState5(void 0);
   const [bumpResult, setBumpResult] = useState5(null);
   const triggeredFromUidRef = useRef2(void 0);
   const bumpedFromUidRef = useRef2(void 0);
@@ -1069,16 +1072,20 @@ function DeployItem({ target, token, onDelete, onEdit }) {
     if (!ready) return;
     const seq = ++requestSeqRef.current;
     try {
-      const data = await fetchDeployments(transport, targetRef);
+      const data = await fetchDeployments(transport, targetRef, void 0, knownBranch);
       if (seq !== requestSeqRef.current || !mountedRef.current) return;
       setDeployments(data);
       setPollError(null);
+      if (!knownBranch) {
+        const learned = data[0]?.meta?.deployHookRef ?? data[0]?.meta?.githubCommitRef;
+        if (learned) setKnownBranch(learned);
+      }
     } catch (err) {
       if (seq !== requestSeqRef.current || !mountedRef.current) return;
       setPollError(err instanceof Error ? err.message : "Could not reach the Vercel API");
       console.error("Deploy-vercel-from-sanity: fetch error", err);
     }
-  }, [transport, targetRef]);
+  }, [transport, targetRef, knownBranch]);
   useEffect4(() => {
     fetchDeployments2().finally(() => setLoadingInitial(false));
   }, [fetchDeployments2]);
@@ -1567,6 +1574,7 @@ function DeployItem({ target, token, onDelete, onEdit }) {
       {
         target,
         token,
+        branch: knownBranch,
         onClose: () => setShowHistory(false)
       }
     )
@@ -1852,7 +1860,7 @@ function DeployTargetForm({ initial, onSaved, onClose }) {
 }
 
 // src/version.ts
-var VERSION = "1.5.1";
+var VERSION = "1.6.0";
 
 // src/components/DeployTool.tsx
 import { jsx as jsx13, jsxs as jsxs9 } from "react/jsx-runtime";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liiift-studio/deploy-vercel-from-sanity",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "Sanity Studio plugin — trigger and monitor Vercel deployments with full status, history, and build logs. Supports Studio v3.30 through v6.",
   "license": "MIT",
   "author": "Liiift Studio",

package/proxy/core.ts

@@ -184,7 +184,7 @@ async function assertDeploymentInProject(
 
 /** List recent deployments for a proxy key. */
 export async function handleDeployments(
-	params: { key: string | null; limit?: number; statusKey: string | null },
+	params: { key: string | null; limit?: number; statusKey: string | null; branch?: string | null },
 	env: ProxyEnv,
 ): Promise<ProxyResult> {
 	const denied = checkStatusKey(params.statusKey, env)
@@ -192,9 +192,20 @@ export async function handleDeployments(
 	const project = params.key ? env.projects[params.key.trim().toLowerCase()] : undefined
 	if (!project) return { status: 404, body: { error: 'Unknown target key' } }
 
+	// Branch names come from the caller, so they are held to git's own character set
+	// before being spliced into an authenticated query. Anything else is ignored
+	// rather than rejected, which degrades to the previous hook-only behaviour.
+	const branch = params.branch && /^[A-Za-z0-9._\-/]{1,255}$/.test(params.branch)
+		? params.branch
+		: undefined
+
 	const query = new URLSearchParams({
 		projectId: project.projectId,
-		'meta-deployHookId': project.hookId,
+		// Branch filtering reports what is actually live on that branch; hook filtering
+		// only ever shows deployments this tool triggered, so a git push never appears.
+		...(branch
+			? { 'meta-githubCommitRef': branch }
+			: { 'meta-deployHookId': project.hookId }),
 		limit: String(params.limit ?? 10),
 	})
 	if (project.teamId) query.set('teamId', project.teamId)

package/proxy/nextjs-app-router/route.ts

@@ -87,7 +87,7 @@ async function handleGet(request: Request): Promise<Response> {
 	switch (operation(request)) {
 		case 'deployments': {
 			const limit = Number(url.searchParams.get('limit')) || undefined
-			return json(await handleDeployments({ key, limit, statusKey }, env), request)
+			return json(await handleDeployments({ key, limit, statusKey, branch: url.searchParams.get('branch') }, env), request)
 		}
 		case 'events':
 			return json(await handleEvents({ key, deploymentId: url.searchParams.get('deploymentId'), statusKey }, env), request)