paperclip-github-plugin 0.4.9 → 0.5.1

package/dist/ui/index.js

@@ -22411,6 +22411,7 @@ function normalizeCompanyAssigneeOptionsResponse(response) {
       return null;
     }
     const record = entry;
+    const kind = record.kind === "user" ? "user" : "agent";
     const id = typeof record.id === "string" ? record.id.trim() : "";
     const name2 = typeof record.name === "string" ? record.name.trim() : "";
     const status = typeof record.status === "string" ? record.status.trim() : "";
@@ -22419,12 +22420,18 @@ function normalizeCompanyAssigneeOptionsResponse(response) {
       return null;
     }
     return {
+      kind,
       id,
       name: name2,
       ...title ? { title } : {},
       ...status ? { status } : {}
     };
-  }).filter((entry) => entry !== null).sort((left, right) => left.name.localeCompare(right.name));
+  }).filter((entry) => entry !== null).sort((left, right) => {
+    if (left.kind !== right.kind) {
+      return left.kind === "user" ? -1 : 1;
+    }
+    return left.name.localeCompare(right.name);
+  });
 }
 
 // src/ui/http.ts
@@ -22810,6 +22817,14 @@ var HOST_DESTRUCTIVE_BUTTON_CLASSNAME = [
   "bg-destructive text-white hover:bg-destructive/90",
   "focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40"
 ].join(" ");
+var HOST_SUCCESS_BUTTON_CLASSNAME = [
+  HOST_BUTTON_BASE_CLASSNAME,
+  "ghsync__button-tone ghsync__button-tone--success"
+].join(" ");
+var HOST_WARNING_BUTTON_CLASSNAME = [
+  HOST_BUTTON_BASE_CLASSNAME,
+  "ghsync__button-tone ghsync__button-tone--warning"
+].join(" ");
 var HOST_TOOLBAR_BUTTON_SIZE_CLASSNAME = "px-3 has-[>svg]:px-2.5";
 var HOST_ACTION_BUTTON_SIZE_CLASSNAME = "h-9 px-4 py-2 has-[>svg]:px-3";
 var HOST_INLINE_BUTTON_SIZE_CLASSNAME = "h-8 px-3 has-[>svg]:px-2.5";
@@ -22838,7 +22853,7 @@ var PREVIEW_MARKDOWN_REHYPE_PLUGINS = [rehypeRaw, PREVIEW_MARKDOWN_SANITIZE_REHY
 function getPluginActionClassName(options) {
   const variant = options?.variant ?? "secondary";
   const size = options?.size ?? "default";
-  const variantClassName = variant === "primary" ? HOST_DEFAULT_BUTTON_CLASSNAME : variant === "danger" ? HOST_DESTRUCTIVE_BUTTON_CLASSNAME : HOST_OUTLINE_BUTTON_CLASSNAME;
+  const variantClassName = variant === "primary" ? HOST_DEFAULT_BUTTON_CLASSNAME : variant === "success" ? HOST_SUCCESS_BUTTON_CLASSNAME : variant === "warning" ? HOST_WARNING_BUTTON_CLASSNAME : variant === "danger" ? HOST_DESTRUCTIVE_BUTTON_CLASSNAME : HOST_OUTLINE_BUTTON_CLASSNAME;
   const sizeClassName = size === "sm" ? HOST_INLINE_BUTTON_SIZE_CLASSNAME : HOST_ACTION_BUTTON_SIZE_CLASSNAME;
   return ["ghsync__button", variantClassName, sizeClassName, options?.extraClassName].filter(Boolean).join(" ");
 }
@@ -22875,6 +22890,7 @@ function GitHubButtonLabel(props) {
   ] });
 }
 var PROJECT_PULL_REQUESTS_PAGE_ROUTE_PATH = "github-pull-requests";
+var QUICK_REQUEST_CHANGES_REVIEW_SUMMARY = "Requested changes.";
 var LIGHT_PALETTE = {
   text: "#18181b",
   title: "#09090b",
@@ -23349,6 +23365,32 @@ var SHARED_LOADING_STYLES = `
   min-width: 0;
 }
 
+.ghsync__button-tone {
+  border: 1px solid transparent;
+}
+
+.ghsync__button-tone--success {
+  border-color: var(--ghsync-success-border);
+  background: var(--ghsync-success-bg);
+  color: var(--ghsync-success-text);
+}
+
+.ghsync__button-tone--success:hover {
+  background: color-mix(in srgb, var(--ghsync-success-bg) 72%, var(--ghsync-success-border));
+  color: var(--ghsync-success-text);
+}
+
+.ghsync__button-tone--warning {
+  border-color: var(--ghsync-warning-border);
+  background: var(--ghsync-warning-bg);
+  color: var(--ghsync-warning-text);
+}
+
+.ghsync__button-tone--warning:hover {
+  background: color-mix(in srgb, var(--ghsync-warning-bg) 72%, var(--ghsync-warning-border));
+  color: var(--ghsync-warning-text);
+}
+
 .ghsync__loading-inline {
   display: inline-flex;
   align-items: center;
@@ -23927,9 +23969,15 @@ var PAGE_STYLES = `
 
 .ghsync__picker {
   position: relative;
+  min-width: 0;
+}
+
+.ghsync__picker--full {
+  width: 100%;
 }
 
 .ghsync__picker-trigger {
+  box-sizing: border-box;
   width: fit-content;
   max-width: 100%;
   min-height: 0;
@@ -23962,6 +24010,10 @@ var PAGE_STYLES = `
   background: var(--ghsync-surfaceRaised);
 }
 
+.ghsync__picker--full .ghsync__picker-trigger {
+  width: 100%;
+}
+
 .ghsync__picker-trigger--assignee {
   min-width: 10rem;
   font-size: 14px;
@@ -24012,6 +24064,7 @@ var PAGE_STYLES = `
 }
 
 .ghsync__picker-panel {
+  box-sizing: border-box;
   position: absolute;
   top: calc(100% + 8px);
   left: 0;
@@ -24024,7 +24077,8 @@ var PAGE_STYLES = `
 }
 
 .ghsync__picker-panel--assignee {
-  width: min(20rem, calc(100vw - 2rem));
+  width: min(20rem, 100%);
+  max-width: calc(100vw - 2rem);
 }
 
 .ghsync__picker-panel--status {
@@ -24976,6 +25030,7 @@ var PROJECT_PULL_REQUESTS_PAGE_STYLES = `
   font-weight: 700;
   letter-spacing: 0.02em;
   flex: 0 0 auto;
+  overflow: hidden;
 }
 
 .ghsync-prs-avatar img,
@@ -25043,6 +25098,36 @@ var PROJECT_PULL_REQUESTS_PAGE_STYLES = `
   opacity: 0.42;
 }
 
+.ghsync-prs-table__icon-button--success {
+  color: var(--ghsync-success-text);
+}
+
+.ghsync-prs-table__icon-button--warning {
+  color: var(--ghsync-warning-text);
+}
+
+.ghsync-prs-table__icon-button--danger {
+  color: var(--ghsync-danger-text);
+}
+
+.ghsync-prs-table__icon-button--success:hover {
+  color: var(--ghsync-success-text);
+  border-color: var(--ghsync-success-border);
+  background: color-mix(in srgb, var(--ghsync-success-bg) 68%, var(--ghsync-surfaceRaised));
+}
+
+.ghsync-prs-table__icon-button--warning:hover {
+  color: var(--ghsync-warning-text);
+  border-color: var(--ghsync-warning-border);
+  background: color-mix(in srgb, var(--ghsync-warning-bg) 68%, var(--ghsync-surfaceRaised));
+}
+
+.ghsync-prs-table__icon-button--danger:hover {
+  color: var(--ghsync-danger-text);
+  border-color: var(--ghsync-danger-border);
+  background: color-mix(in srgb, var(--ghsync-danger-bg) 68%, var(--ghsync-surfaceRaised));
+}
+
 .ghsync-prs-table__status--passed {
   color: var(--ghsync-success-text);
 }
@@ -26630,14 +26715,45 @@ function normalizeAgentIds(value) {
     rawEntries.map((entry) => typeof entry === "string" && entry.trim() ? entry.trim() : null).filter((entry) => Boolean(entry))
   )].sort((left, right) => left.localeCompare(right));
 }
+function normalizeAdvancedSettingsAssigneeOverride(record, keys2) {
+  const rawUserId = record[keys2.userId];
+  const userId = typeof rawUserId === "string" && rawUserId.trim() ? rawUserId.trim() : void 0;
+  if (userId) {
+    return {
+      [keys2.userId]: userId
+    };
+  }
+  const rawAgentId = record[keys2.agentId];
+  const agentId = typeof rawAgentId === "string" && rawAgentId.trim() ? rawAgentId.trim() : void 0;
+  if (agentId) {
+    return {
+      [keys2.agentId]: agentId
+    };
+  }
+  return {};
+}
 function normalizeAdvancedSettings(value) {
   if (!value || typeof value !== "object") {
     return DEFAULT_ADVANCED_SETTINGS;
   }
   const record = value;
-  const defaultAssigneeAgentId = typeof record.defaultAssigneeAgentId === "string" && record.defaultAssigneeAgentId.trim() ? record.defaultAssigneeAgentId.trim() : void 0;
   return {
-    ...defaultAssigneeAgentId ? { defaultAssigneeAgentId } : {},
+    ...normalizeAdvancedSettingsAssigneeOverride(record, {
+      agentId: "defaultAssigneeAgentId",
+      userId: "defaultAssigneeUserId"
+    }),
+    ...normalizeAdvancedSettingsAssigneeOverride(record, {
+      agentId: "executorAssigneeAgentId",
+      userId: "executorAssigneeUserId"
+    }),
+    ...normalizeAdvancedSettingsAssigneeOverride(record, {
+      agentId: "reviewerAssigneeAgentId",
+      userId: "reviewerAssigneeUserId"
+    }),
+    ...normalizeAdvancedSettingsAssigneeOverride(record, {
+      agentId: "approverAssigneeAgentId",
+      userId: "approverAssigneeUserId"
+    }),
     defaultStatus: normalizePaperclipIssueStatus(record.defaultStatus),
     ignoredIssueAuthorUsernames: "ignoredIssueAuthorUsernames" in record ? normalizeIgnoredIssueAuthorUsernames(record.ignoredIssueAuthorUsernames) : DEFAULT_ADVANCED_SETTINGS.ignoredIssueAuthorUsernames,
     ...normalizeAgentIds(record.githubTokenPropagationAgentIds).length > 0 ? { githubTokenPropagationAgentIds: normalizeAgentIds(record.githubTokenPropagationAgentIds) } : {}
@@ -26656,6 +26772,13 @@ function getComparableAdvancedSettings(value) {
   const settings = normalizeAdvancedSettings(value);
   return {
     ...settings.defaultAssigneeAgentId ? { defaultAssigneeAgentId: settings.defaultAssigneeAgentId } : {},
+    ...settings.defaultAssigneeUserId ? { defaultAssigneeUserId: settings.defaultAssigneeUserId } : {},
+    ...settings.executorAssigneeAgentId ? { executorAssigneeAgentId: settings.executorAssigneeAgentId } : {},
+    ...settings.executorAssigneeUserId ? { executorAssigneeUserId: settings.executorAssigneeUserId } : {},
+    ...settings.reviewerAssigneeAgentId ? { reviewerAssigneeAgentId: settings.reviewerAssigneeAgentId } : {},
+    ...settings.reviewerAssigneeUserId ? { reviewerAssigneeUserId: settings.reviewerAssigneeUserId } : {},
+    ...settings.approverAssigneeAgentId ? { approverAssigneeAgentId: settings.approverAssigneeAgentId } : {},
+    ...settings.approverAssigneeUserId ? { approverAssigneeUserId: settings.approverAssigneeUserId } : {},
     defaultStatus: settings.defaultStatus,
     ignoredIssueAuthorUsernames: [...settings.ignoredIssueAuthorUsernames].sort((left, right) => left.localeCompare(right)),
     ...settings.githubTokenPropagationAgentIds?.length ? { githubTokenPropagationAgentIds: [...settings.githubTokenPropagationAgentIds].sort((left, right) => left.localeCompare(right)) } : {}
@@ -26664,43 +26787,127 @@ function getComparableAdvancedSettings(value) {
 function formatAssigneeOptionLabel(option) {
   return option.title?.trim() ? `${option.name} (${option.title.trim()})` : option.name;
 }
-function getAvailableAssigneeOptions(options, selectedAgentId) {
+function getAssigneeOptionKey(option) {
+  return `${option.kind}:${option.id}`;
+}
+function getAssigneeOptionValue(option) {
+  return getAssigneeOptionKey(option);
+}
+function parseAssigneeOptionValue(value) {
+  const trimmedValue = typeof value === "string" ? value.trim() : "";
+  if (!trimmedValue) {
+    return null;
+  }
+  if (trimmedValue.startsWith("agent:")) {
+    const id = trimmedValue.slice("agent:".length).trim();
+    return id ? { kind: "agent", id } : null;
+  }
+  if (trimmedValue.startsWith("user:")) {
+    const id = trimmedValue.slice("user:".length).trim();
+    return id ? { kind: "user", id } : null;
+  }
+  return { kind: "agent", id: trimmedValue };
+}
+function getAdvancedSettingsAssigneePrincipal(advancedSettings, role) {
+  switch (role) {
+    case "default":
+      return advancedSettings.defaultAssigneeUserId ? { kind: "user", id: advancedSettings.defaultAssigneeUserId } : advancedSettings.defaultAssigneeAgentId ? { kind: "agent", id: advancedSettings.defaultAssigneeAgentId } : null;
+    case "executor":
+      return advancedSettings.executorAssigneeUserId ? { kind: "user", id: advancedSettings.executorAssigneeUserId } : advancedSettings.executorAssigneeAgentId ? { kind: "agent", id: advancedSettings.executorAssigneeAgentId } : null;
+    case "reviewer":
+      return advancedSettings.reviewerAssigneeUserId ? { kind: "user", id: advancedSettings.reviewerAssigneeUserId } : advancedSettings.reviewerAssigneeAgentId ? { kind: "agent", id: advancedSettings.reviewerAssigneeAgentId } : null;
+    case "approver":
+      return advancedSettings.approverAssigneeUserId ? { kind: "user", id: advancedSettings.approverAssigneeUserId } : advancedSettings.approverAssigneeAgentId ? { kind: "agent", id: advancedSettings.approverAssigneeAgentId } : null;
+  }
+}
+function setAdvancedSettingsAssigneePrincipal(advancedSettings, role, principal) {
+  switch (role) {
+    case "default":
+      return {
+        ...advancedSettings,
+        defaultAssigneeAgentId: principal?.kind === "agent" ? principal.id : void 0,
+        defaultAssigneeUserId: principal?.kind === "user" ? principal.id : void 0
+      };
+    case "executor":
+      return {
+        ...advancedSettings,
+        executorAssigneeAgentId: principal?.kind === "agent" ? principal.id : void 0,
+        executorAssigneeUserId: principal?.kind === "user" ? principal.id : void 0
+      };
+    case "reviewer":
+      return {
+        ...advancedSettings,
+        reviewerAssigneeAgentId: principal?.kind === "agent" ? principal.id : void 0,
+        reviewerAssigneeUserId: principal?.kind === "user" ? principal.id : void 0
+      };
+    case "approver":
+      return {
+        ...advancedSettings,
+        approverAssigneeAgentId: principal?.kind === "agent" ? principal.id : void 0,
+        approverAssigneeUserId: principal?.kind === "user" ? principal.id : void 0
+      };
+  }
+}
+function getSelectedAssigneeOptionValue(advancedSettings, role) {
+  const principal = getAdvancedSettingsAssigneePrincipal(advancedSettings, role);
+  return principal ? getAssigneeOptionValue(principal) : "";
+}
+function compareAssigneeOptions(left, right) {
+  if (left.kind !== right.kind) {
+    return left.kind === "user" ? -1 : 1;
+  }
+  return left.name.localeCompare(right.name);
+}
+function getAvailableAssigneeOptions(options, selectedAssignees) {
   const normalizedOptions = [...options ?? []];
-  if (selectedAgentId && !normalizedOptions.some((option) => option.id === selectedAgentId)) {
-    normalizedOptions.push({
-      id: selectedAgentId,
-      name: "Unavailable agent"
-    });
+  const selectedPrincipals = Array.isArray(selectedAssignees) ? selectedAssignees.filter((selectedAssignee) => Boolean(selectedAssignee)) : selectedAssignees ? [selectedAssignees] : [];
+  for (const selectedPrincipal of selectedPrincipals) {
+    if (!normalizedOptions.some((option) => getAssigneeOptionKey(option) === getAssigneeOptionKey(selectedPrincipal))) {
+      normalizedOptions.push({
+        kind: selectedPrincipal.kind,
+        id: selectedPrincipal.id,
+        name: selectedPrincipal.kind === "user" ? "Unavailable user" : "Unavailable agent"
+      });
+    }
   }
-  return normalizedOptions;
+  return normalizedOptions.sort(compareAssigneeOptions);
 }
 function getAvailablePropagationAgentOptions(options, selectedAgentIds) {
-  const normalizedOptions = [...options ?? []];
+  const normalizedOptions = [...(options ?? []).filter((option) => option.kind === "agent")];
   const selectedIds = normalizeAgentIds(selectedAgentIds);
   for (const selectedAgentId of selectedIds) {
     if (!normalizedOptions.some((option) => option.id === selectedAgentId)) {
       normalizedOptions.push({
+        kind: "agent",
         id: selectedAgentId,
         name: "Unavailable agent"
       });
     }
   }
-  return normalizedOptions.sort((left, right) => left.name.localeCompare(right.name));
+  return normalizedOptions.sort(compareAssigneeOptions);
 }
 function formatAdvancedSettingsSummary(advancedSettings, availableAssignees, options) {
-  const assigneeLabel = advancedSettings.defaultAssigneeAgentId ? formatAssigneeOptionLabel(
-    availableAssignees.find((option) => option.id === advancedSettings.defaultAssigneeAgentId) ?? {
-      id: advancedSettings.defaultAssigneeAgentId,
-      name: "Unavailable agent"
-    }
-  ) : "Unassigned";
+  const resolveAssigneeLabel = (principal, fallbackLabel = "None") => {
+    return principal ? formatAssigneeOptionLabel(
+      availableAssignees.find((option) => getAssigneeOptionKey(option) === getAssigneeOptionKey(principal)) ?? {
+        kind: principal.kind,
+        id: principal.id,
+        name: principal.kind === "user" ? "Unavailable user" : "Unavailable agent"
+      }
+    ) : fallbackLabel;
+  };
+  const assigneeLabel = resolveAssigneeLabel(getAdvancedSettingsAssigneePrincipal(advancedSettings, "default"), "Unassigned");
+  const executorLabel = resolveAssigneeLabel(getAdvancedSettingsAssigneePrincipal(advancedSettings, "executor"), "Automatic routing");
+  const reviewerLabel = resolveAssigneeLabel(getAdvancedSettingsAssigneePrincipal(advancedSettings, "reviewer"), "Automatic routing");
+  const approverLabel = resolveAssigneeLabel(getAdvancedSettingsAssigneePrincipal(advancedSettings, "approver"), "Automatic routing");
   const statusLabel = PAPERCLIP_STATUS_OPTIONS.find((option) => option.value === advancedSettings.defaultStatus)?.label ?? "Backlog";
   const ignoredAuthorsLabel = advancedSettings.ignoredIssueAuthorUsernames.length > 0 ? advancedSettings.ignoredIssueAuthorUsernames.join(", ") : "none";
+  const handoffLabel = `Back to work: ${executorLabel} \xB7 Review: ${reviewerLabel} \xB7 Approval: ${approverLabel}`;
   if (options?.includePropagation) {
     const propagatedAgentsLabel = advancedSettings.githubTokenPropagationAgentIds?.length ? `${advancedSettings.githubTokenPropagationAgentIds.length} selected` : "none";
-    return `Assignee: ${assigneeLabel} \xB7 Status: ${statusLabel} \xB7 Ignore: ${ignoredAuthorsLabel} \xB7 Propagate: ${propagatedAgentsLabel}`;
+    return `Import: ${assigneeLabel} \xB7 ${handoffLabel} \xB7 Status: ${statusLabel} \xB7 Ignore: ${ignoredAuthorsLabel} \xB7 Propagate: ${propagatedAgentsLabel}`;
   }
-  return `Assignee: ${assigneeLabel} \xB7 Status: ${statusLabel} \xB7 Ignore: ${ignoredAuthorsLabel}`;
+  return `Import: ${assigneeLabel} \xB7 ${handoffLabel} \xB7 Status: ${statusLabel} \xB7 Ignore: ${ignoredAuthorsLabel}`;
 }
 function resolveSavedTokenUiState(params) {
   if (params.githubTokenConfigured) {
@@ -26771,6 +26978,29 @@ function AgentIcon() {
     )
   ] });
 }
+function UserIcon() {
+  return /* @__PURE__ */ jsxs2("svg", { viewBox: "0 0 16 16", fill: "none", "aria-hidden": "true", children: [
+    /* @__PURE__ */ jsx2("circle", { cx: "8", cy: "5.1", r: "2.3", stroke: "currentColor", strokeWidth: "1.2" }),
+    /* @__PURE__ */ jsx2(
+      "path",
+      {
+        d: "M3.25 12.85C3.78 10.83 5.62 9.4 7.82 9.4H8.18C10.38 9.4 12.22 10.83 12.75 12.85",
+        stroke: "currentColor",
+        strokeWidth: "1.2",
+        strokeLinecap: "round"
+      }
+    )
+  ] });
+}
+function SettingsSelectIcon(props) {
+  if (props.icon === "agent") {
+    return /* @__PURE__ */ jsx2(AgentIcon, {});
+  }
+  if (props.icon === "user") {
+    return /* @__PURE__ */ jsx2(UserIcon, {});
+  }
+  return null;
+}
 function SettingsAssigneePicker(props) {
   const { id, value, options, disabled, onChange } = props;
   const [open, setOpen] = useState2(false);
@@ -26813,7 +27043,7 @@ function SettingsAssigneePicker(props) {
       setOpen(false);
     }
   }, [disabled, open]);
-  return /* @__PURE__ */ jsxs2("div", { className: "ghsync__picker", ref: rootRef, children: [
+  return /* @__PURE__ */ jsxs2("div", { className: "ghsync__picker ghsync__picker--full", ref: rootRef, children: [
     /* @__PURE__ */ jsxs2(
       "button",
       {
@@ -26831,7 +27061,7 @@ function SettingsAssigneePicker(props) {
         },
         children: [
           /* @__PURE__ */ jsxs2("span", { className: "ghsync__picker-trigger-main", children: [
-            selectedOption?.icon === "agent" ? /* @__PURE__ */ jsx2("span", { className: "ghsync__picker-agent-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx2(AgentIcon, {}) }) : null,
+            selectedOption?.icon ? /* @__PURE__ */ jsx2("span", { className: "ghsync__picker-agent-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx2(SettingsSelectIcon, { icon: selectedOption.icon }) }) : null,
             /* @__PURE__ */ jsx2("span", { className: "ghsync__picker-trigger-label", children: selectedOption?.label ?? "No assignee" })
           ] }),
           /* @__PURE__ */ jsx2("span", { className: "ghsync__picker-trigger-icon", children: /* @__PURE__ */ jsx2(PickerChevronIcon, {}) })
@@ -26873,7 +27103,7 @@ function SettingsAssigneePicker(props) {
             },
             children: [
               /* @__PURE__ */ jsxs2("span", { className: "ghsync__picker-trigger-main", children: [
-                option.icon === "agent" ? /* @__PURE__ */ jsx2("span", { className: "ghsync__picker-agent-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx2(AgentIcon, {}) }) : null,
+                option.icon ? /* @__PURE__ */ jsx2("span", { className: "ghsync__picker-agent-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx2(SettingsSelectIcon, { icon: option.icon }) }) : null,
                 /* @__PURE__ */ jsx2("span", { className: "ghsync__picker-option-label", children: option.label })
               ] }),
               /* @__PURE__ */ jsx2("span", { className: "ghsync__picker-option-check", "aria-hidden": "true", children: selected ? /* @__PURE__ */ jsx2(PickerCheckIcon, {}) : null })
@@ -26929,7 +27159,7 @@ function SettingsAgentMultiPicker(props) {
       setOpen(false);
     }
   }, [disabled, open]);
-  return /* @__PURE__ */ jsxs2("div", { className: "ghsync__picker", ref: rootRef, children: [
+  return /* @__PURE__ */ jsxs2("div", { className: "ghsync__picker ghsync__picker--full", ref: rootRef, children: [
     /* @__PURE__ */ jsxs2(
       "button",
       {
@@ -26989,7 +27219,7 @@ function SettingsAgentMultiPicker(props) {
             },
             children: [
               /* @__PURE__ */ jsxs2("span", { className: "ghsync__picker-trigger-main", children: [
-                option.icon === "agent" ? /* @__PURE__ */ jsx2("span", { className: "ghsync__picker-agent-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx2(AgentIcon, {}) }) : null,
+                option.icon ? /* @__PURE__ */ jsx2("span", { className: "ghsync__picker-agent-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx2(SettingsSelectIcon, { icon: option.icon }) }) : null,
                 /* @__PURE__ */ jsx2("span", { className: "ghsync__picker-option-label", children: option.label })
               ] }),
               /* @__PURE__ */ jsx2("span", { className: "ghsync__picker-option-check", "aria-hidden": "true", children: selected ? /* @__PURE__ */ jsx2(PickerCheckIcon, {}) : null })
@@ -27395,6 +27625,16 @@ function getPreviewPullRequestCheckToneClass(status) {
       return "ghsync-prs-table__status--pending";
   }
 }
+function getPreviewPullRequestInlineActionToneClass(tone) {
+  switch (tone) {
+    case "success":
+      return "ghsync-prs-table__icon-button--success";
+    case "warning":
+      return "ghsync-prs-table__icon-button--warning";
+    default:
+      return "ghsync-prs-table__icon-button--danger";
+  }
+}
 function getPreviewPullRequestUpToDateMeta(status) {
   switch (status) {
     case "up_to_date":
@@ -28092,6 +28332,20 @@ function getCliAuthIdentityLabel(identity) {
   }
   return null;
 }
+function getCliAuthIdentityUserId(identity) {
+  const candidates = [
+    identity.user?.id,
+    identity.user?.userId,
+    identity.id,
+    identity.userId
+  ];
+  for (const candidate of candidates) {
+    if (typeof candidate === "string" && candidate.trim()) {
+      return candidate.trim();
+    }
+  }
+  return null;
+}
 function waitForDuration(durationMs) {
   return new Promise((resolve) => {
     globalThis.setTimeout(resolve, durationMs);
@@ -28146,7 +28400,10 @@ async function fetchBoardAccessIdentity(boardApiToken) {
       authorization: `Bearer ${boardApiToken.trim()}`
     }
   });
-  return getCliAuthIdentityLabel(identity);
+  return {
+    label: getCliAuthIdentityLabel(identity),
+    userId: getCliAuthIdentityUserId(identity)
+  };
 }
 function getSyncStatus(syncState, runningSync, syncUnlocked) {
   if (!syncUnlocked) {
@@ -28782,24 +29039,43 @@ function SyncDiagnosticsPanel(props) {
 function PreviewAvatar(props) {
   const backgroundColor = getPreviewAvatarColor(props.person.handle);
   const className = props.stacked ? "ghsync-prs-avatar-stack__item" : "ghsync-prs-avatar";
-  const avatarSizePx = props.size === "sm" ? 20 : 28;
-  const fontSizePx = props.size === "sm" ? 10 : 11;
   const labels = resolvePreviewPersonLabels(props.person);
   const initialsSource = props.person.name.trim() || props.person.handle.replace(/^@/, "").trim();
   const title = labels.secondary ? `${labels.primary} (${labels.secondary})` : labels.primary;
+  const avatarStyle = {
+    backgroundColor
+  };
+  const imageStyle = props.size === "sm" ? {
+    width: "100%",
+    height: "100%",
+    borderRadius: "inherit",
+    objectFit: "cover",
+    display: "block"
+  } : void 0;
+  if (props.size === "sm") {
+    Object.assign(avatarStyle, {
+      width: 20,
+      height: 20,
+      fontSize: 10,
+      display: "inline-flex",
+      alignItems: "center",
+      justifyContent: "center",
+      borderRadius: 999,
+      color: "white",
+      fontWeight: 700,
+      letterSpacing: "0.02em",
+      flex: "0 0 auto",
+      overflow: "hidden"
+    });
+  }
   return /* @__PURE__ */ jsx2(
     "span",
     {
       className,
-      style: {
-        backgroundColor,
-        width: avatarSizePx,
-        height: avatarSizePx,
-        fontSize: fontSizePx
-      },
+      style: avatarStyle,
       title,
       "aria-hidden": "true",
-      children: props.person.avatarUrl ? /* @__PURE__ */ jsx2("img", { src: props.person.avatarUrl, alt: "", loading: "lazy" }) : getInitials(initialsSource)
+      children: props.person.avatarUrl ? /* @__PURE__ */ jsx2("img", { src: props.person.avatarUrl, alt: "", loading: "lazy", style: imageStyle }) : getInitials(initialsSource)
     }
   );
 }
@@ -29152,6 +29428,7 @@ function GitHubSyncProjectPullRequestsPage() {
   const issueModalPending = issueModalPullRequest ? pendingActionKey === `create-issue:${issueModalPullRequest.id}` : false;
   const commentModalPending = commentModalPullRequest ? pendingActionKey === `comment-modal:${commentModalPullRequest.id}` : false;
   const reviewModalApprovePending = reviewModalPullRequest ? pendingActionKey === `review:${reviewModalPullRequest.id}:approve` : false;
+  const reviewModalCommentPending = reviewModalPullRequest ? pendingActionKey === `review:${reviewModalPullRequest.id}:comment` : false;
   const reviewModalRequestChangesPending = reviewModalPullRequest ? pendingActionKey === `review:${reviewModalPullRequest.id}:request_changes` : false;
   const reviewModalPending = reviewModalPullRequest ? Boolean(pendingActionKey?.startsWith(`review:${reviewModalPullRequest.id}:`)) : false;
   const rerunCiModalPending = rerunCiModalPullRequest ? pendingActionKey === `rerun-ci:${rerunCiModalPullRequest.id}` : false;
@@ -29314,6 +29591,10 @@ function GitHubSyncProjectPullRequestsPage() {
     setCommentModalPullRequestId(pullRequestId);
     setCommentModalDraft("");
   }
+  function openReviewModal(pullRequestId) {
+    setReviewModalPullRequestId(pullRequestId);
+    setReviewModalDraft("");
+  }
   function openClosePullRequestModal(pullRequest) {
     setCloseModalPullRequest(pullRequest);
   }
@@ -29600,23 +29881,42 @@ function GitHubSyncProjectPullRequestsPage() {
       setPendingActionKey((current) => current === actionKey ? null : current);
     }
   }
-  async function handleReviewPullRequest(review) {
-    if (!reviewModalPullRequest || !hostContext.companyId || !projectId) {
+  function getSubmittedReviewToast(review, pullRequestNumber) {
+    switch (review) {
+      case "approved":
+        return {
+          title: `Approved #${pullRequestNumber}`,
+          body: "GitHub review submitted."
+        };
+      case "changes_requested":
+        return {
+          title: `Requested changes on #${pullRequestNumber}`,
+          body: "GitHub change request submitted."
+        };
+      default:
+        return {
+          title: `Commented on #${pullRequestNumber}`,
+          body: "GitHub review comment submitted."
+        };
+    }
+  }
+  async function submitPullRequestReview(pullRequest, review, body, options) {
+    if (!hostContext.companyId || !projectId) {
       return;
     }
-    const actionKey = `review:${reviewModalPullRequest.id}:${review}`;
+    const actionKey = `review:${pullRequest.id}:${review}`;
     setPendingActionKey(actionKey);
     try {
       const result = await reviewPullRequest({
         companyId: hostContext.companyId,
         projectId,
         repositoryUrl: pageData.repositoryUrl,
-        pullRequestNumber: reviewModalPullRequest.number,
+        pullRequestNumber: pullRequest.number,
         review,
-        body: reviewModalDraft.trim()
+        body
       });
       const updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-      patchPullRequestRow(reviewModalPullRequest.id, (current) => {
+      patchPullRequestRow(pullRequest.id, (current) => {
         const nextReviewApprovals = current.reviewApprovals + (result.review === "approved" ? 1 : 0);
         const nextReviewChangesRequested = current.reviewChangesRequested + (result.review === "changes_requested" ? 1 : 0);
         const nextRecord = {
@@ -29631,13 +29931,16 @@ function GitHubSyncProjectPullRequestsPage() {
           mergeable: resolvePreviewPullRequestMergeable(nextRecord)
         };
       });
-      closeReviewModal();
-      refreshSelectedPullRequestDetails(reviewModalPullRequest.id);
+      if (options?.closeModal) {
+        closeReviewModal();
+      }
+      refreshSelectedPullRequestDetails(pullRequest.id);
       refreshPullRequestMetricsPanel();
       notifyGitHubSyncPullRequestsChanged();
+      const submittedReviewToast = getSubmittedReviewToast(result.review, pullRequest.number);
       toast({
-        title: result.review === "approved" ? `Approved #${reviewModalPullRequest.number}` : `Requested changes on #${reviewModalPullRequest.number}`,
-        body: result.review === "approved" ? "GitHub review submitted." : "GitHub change request submitted.",
+        title: submittedReviewToast.title,
+        body: submittedReviewToast.body,
         tone: "success"
       });
     } catch (error) {
@@ -29650,6 +29953,19 @@ function GitHubSyncProjectPullRequestsPage() {
       setPendingActionKey((current) => current === actionKey ? null : current);
     }
   }
+  async function handleReviewPullRequest(review) {
+    if (!reviewModalPullRequest) {
+      return;
+    }
+    await submitPullRequestReview(reviewModalPullRequest, review, reviewModalDraft.trim(), { closeModal: true });
+  }
+  async function handleQuickPullRequestReview(pullRequest, review) {
+    await submitPullRequestReview(
+      pullRequest,
+      review,
+      review === "request_changes" ? QUICK_REQUEST_CHANGES_REVIEW_SUMMARY : ""
+    );
+  }
   async function handleRerunCi() {
     if (!rerunCiModalPullRequest || !hostContext.companyId || !projectId) {
       return;
@@ -29707,7 +30023,7 @@ function GitHubSyncProjectPullRequestsPage() {
     /* @__PURE__ */ jsx2("th", { scope: "col", className: "ghsync-prs-table__cell--center", children: "Checks" }),
     /* @__PURE__ */ jsx2("th", { scope: "col", className: "ghsync-prs-table__cell--center", children: "Up to date" }),
     /* @__PURE__ */ jsx2("th", { scope: "col", className: "ghsync-prs-table__cell--center", children: "Target branch" }),
-    /* @__PURE__ */ jsx2("th", { scope: "col", className: "ghsync-prs-table__cell--center", children: "Reviews" }),
+    /* @__PURE__ */ jsx2("th", { scope: "col", className: "ghsync-prs-table__cell--center", children: "Approvals" }),
     /* @__PURE__ */ jsx2("th", { scope: "col", className: "ghsync-prs-table__cell--center", children: "Review threads" }),
     /* @__PURE__ */ jsx2("th", { scope: "col", className: "ghsync-prs-table__cell--center", children: "Comments" }),
     /* @__PURE__ */ jsx2("th", { scope: "col", className: "ghsync-prs-table__cell--center", children: "Last updated" }),
@@ -29929,12 +30245,16 @@ function GitHubSyncProjectPullRequestsPage() {
               const mergeActionKey = `merge:${pullRequest.id}`;
               const commentModalActionKey = `comment-modal:${pullRequest.id}`;
               const reviewActionPrefix = `review:${pullRequest.id}:`;
+              const reviewApproveActionKey = `review:${pullRequest.id}:approve`;
+              const reviewRequestChangesActionKey = `review:${pullRequest.id}:request_changes`;
               const rerunCiActionKey = `rerun-ci:${pullRequest.id}`;
               const updateBranchActionKey = `update-branch:${pullRequest.id}`;
               const closeActionKey = `close:${pullRequest.id}`;
               const copilotPending = Boolean(pendingActionKey?.startsWith(copilotActionPrefix));
               const commentModalPending2 = pendingActionKey === commentModalActionKey;
               const reviewPending = Boolean(pendingActionKey?.startsWith(reviewActionPrefix));
+              const reviewApprovePending = pendingActionKey === reviewApproveActionKey;
+              const reviewRequestChangesPending = pendingActionKey === reviewRequestChangesActionKey;
               const rerunCiPending = pendingActionKey === rerunCiActionKey;
               const updateBranchPending = pendingActionKey === updateBranchActionKey;
               const mergePending = pendingActionKey === mergeActionKey;
@@ -30015,7 +30335,7 @@ function GitHubSyncProjectPullRequestsPage() {
                         "button",
                         {
                           type: "button",
-                          className: "ghsync-prs-table__icon-button",
+                          className: `ghsync-prs-table__icon-button ${getPreviewPullRequestInlineActionToneClass("warning")}`,
                           title: `Re-run CI for #${pullRequest.number}`,
                           onClick: () => setRerunCiPullRequestId(pullRequest.id),
                           disabled: rerunCiPending,
@@ -30071,40 +30391,82 @@ function GitHubSyncProjectPullRequestsPage() {
                     /* @__PURE__ */ jsx2("td", { className: "ghsync-prs-table__cell--center", children: /* @__PURE__ */ jsxs2("div", { className: "ghsync-prs-table__metric-group", children: [
                       hasReviewSummary ? /* @__PURE__ */ jsxs2("a", { className: "ghsync-prs-table__metric-link", href: pullRequest.reviewsUrl, target: "_blank", rel: "noreferrer", children: [
                         pullRequest.reviewApprovals > 0 ? /* @__PURE__ */ jsxs2(Fragment2, { children: [
-                          /* @__PURE__ */ jsx2(CheckPassedIcon, { className: "ghsync-prs-icon" }),
+                          /* @__PURE__ */ jsx2(CheckPassedIcon, { className: "ghsync-prs-icon ghsync-prs-table__status--passed" }),
                           /* @__PURE__ */ jsx2("span", { children: pullRequest.reviewApprovals })
                         ] }) : null,
                         pullRequest.reviewChangesRequested > 0 ? /* @__PURE__ */ jsxs2(Fragment2, { children: [
-                          /* @__PURE__ */ jsx2(CheckFailedIcon, { className: "ghsync-prs-icon" }),
+                          /* @__PURE__ */ jsx2(CheckFailedIcon, { className: "ghsync-prs-icon ghsync-prs-table__status--failed" }),
                           /* @__PURE__ */ jsx2("span", { children: pullRequest.reviewChangesRequested })
                         ] }) : null
                       ] }) : null,
-                      pullRequest.reviewable && canReviewPullRequests ? /* @__PURE__ */ jsx2(
-                        "button",
-                        {
-                          type: "button",
-                          className: "ghsync-prs-table__icon-button",
-                          title: `Review #${pullRequest.number}`,
-                          onClick: () => {
-                            setReviewModalPullRequestId(pullRequest.id);
-                            setReviewModalDraft("");
-                          },
-                          disabled: reviewPending,
-                          children: /* @__PURE__ */ jsx2(
-                            LoadingIconButtonContent,
-                            {
-                              busy: reviewPending,
-                              busyLabel: `Reviewing #${pullRequest.number}`,
-                              icon: /* @__PURE__ */ jsx2(ReviewIcon, { className: "ghsync-prs-icon" })
-                            }
-                          )
-                        }
-                      ) : null
+                      pullRequest.reviewable && canReviewPullRequests ? /* @__PURE__ */ jsxs2(Fragment2, { children: [
+                        /* @__PURE__ */ jsx2(
+                          "button",
+                          {
+                            type: "button",
+                            className: "ghsync-prs-table__icon-button",
+                            title: `Review #${pullRequest.number}`,
+                            "aria-label": `Review #${pullRequest.number}`,
+                            onClick: () => openReviewModal(pullRequest.id),
+                            disabled: reviewPending,
+                            children: /* @__PURE__ */ jsx2(
+                              LoadingIconButtonContent,
+                              {
+                                busy: false,
+                                busyLabel: `Reviewing #${pullRequest.number}`,
+                                icon: /* @__PURE__ */ jsx2(ReviewIcon, { className: "ghsync-prs-icon" })
+                              }
+                            )
+                          }
+                        ),
+                        /* @__PURE__ */ jsx2(
+                          "button",
+                          {
+                            type: "button",
+                            className: `ghsync-prs-table__icon-button ${getPreviewPullRequestInlineActionToneClass("success")}`,
+                            title: `Approve #${pullRequest.number}`,
+                            "aria-label": `Approve #${pullRequest.number}`,
+                            onClick: () => {
+                              void handleQuickPullRequestReview(pullRequest, "approve");
+                            },
+                            disabled: reviewPending,
+                            children: /* @__PURE__ */ jsx2(
+                              LoadingIconButtonContent,
+                              {
+                                busy: reviewApprovePending,
+                                busyLabel: `Approving #${pullRequest.number}`,
+                                icon: /* @__PURE__ */ jsx2(CheckPassedIcon, { className: "ghsync-prs-icon" })
+                              }
+                            )
+                          }
+                        ),
+                        /* @__PURE__ */ jsx2(
+                          "button",
+                          {
+                            type: "button",
+                            className: `ghsync-prs-table__icon-button ${getPreviewPullRequestInlineActionToneClass("danger")}`,
+                            title: `Request changes on #${pullRequest.number}`,
+                            "aria-label": `Request changes on #${pullRequest.number}`,
+                            onClick: () => {
+                              void handleQuickPullRequestReview(pullRequest, "request_changes");
+                            },
+                            disabled: reviewPending,
+                            children: /* @__PURE__ */ jsx2(
+                              LoadingIconButtonContent,
+                              {
+                                busy: reviewRequestChangesPending,
+                                busyLabel: `Requesting changes on #${pullRequest.number}`,
+                                icon: /* @__PURE__ */ jsx2(CheckFailedIcon, { className: "ghsync-prs-icon" })
+                              }
+                            )
+                          }
+                        )
+                      ] }) : null
                     ] }) }),
                     /* @__PURE__ */ jsx2("td", { className: "ghsync-prs-table__cell--center", children: pullRequest.unresolvedReviewThreads > 0 ? /* @__PURE__ */ jsxs2("a", { className: "ghsync-prs-table__metric-link", href: pullRequest.reviewThreadsUrl, target: "_blank", rel: "noreferrer", children: [
                       /* @__PURE__ */ jsx2(CommentIcon, { className: "ghsync-prs-icon" }),
                       /* @__PURE__ */ jsx2("span", { children: pullRequest.unresolvedReviewThreads })
-                    ] }) : hasResolvedReviewThreads ? /* @__PURE__ */ jsx2("a", { className: "ghsync-prs-table__metric-link", href: pullRequest.reviewThreadsUrl, target: "_blank", rel: "noreferrer", children: /* @__PURE__ */ jsx2(CheckPassedIcon, { className: "ghsync-prs-icon" }) }) : null }),
+                    ] }) : hasResolvedReviewThreads ? /* @__PURE__ */ jsx2("a", { className: "ghsync-prs-table__metric-link", href: pullRequest.reviewThreadsUrl, target: "_blank", rel: "noreferrer", children: /* @__PURE__ */ jsx2(CheckPassedIcon, { className: "ghsync-prs-icon ghsync-prs-table__status--passed" }) }) : null }),
                     /* @__PURE__ */ jsx2("td", { className: "ghsync-prs-table__cell--center", children: /* @__PURE__ */ jsxs2("div", { className: "ghsync-prs-table__metric-group", children: [
                       /* @__PURE__ */ jsxs2("a", { className: "ghsync-prs-table__metric-link", href: pullRequest.commentsUrl, target: "_blank", rel: "noreferrer", children: [
                         /* @__PURE__ */ jsx2(CommentIcon, { className: "ghsync-prs-icon" }),
@@ -30168,7 +30530,7 @@ function GitHubSyncProjectPullRequestsPage() {
                         "button",
                         {
                           type: "button",
-                          className: "ghsync-prs-table__icon-button",
+                          className: `ghsync-prs-table__icon-button ${getPreviewPullRequestInlineActionToneClass("success")}`,
                           title: `Merge #${pullRequest.number}`,
                           onClick: () => {
                             void handleMergePullRequest(pullRequest);
@@ -30188,7 +30550,7 @@ function GitHubSyncProjectPullRequestsPage() {
                         "button",
                         {
                           type: "button",
-                          className: "ghsync-prs-table__icon-button",
+                          className: `ghsync-prs-table__icon-button ${getPreviewPullRequestInlineActionToneClass("danger")}`,
                           title: `Close PR #${pullRequest.number}`,
                           "aria-label": `Close PR #${pullRequest.number}`,
                           onClick: () => {
@@ -30312,10 +30674,7 @@ function GitHubSyncProjectPullRequestsPage() {
               {
                 type: "button",
                 className: getPluginActionClassName({ variant: "secondary", size: "sm" }),
-                onClick: () => {
-                  setReviewModalPullRequestId(selectedPullRequest.id);
-                  setReviewModalDraft("");
-                },
+                onClick: () => openReviewModal(selectedPullRequest.id),
                 disabled: selectedPullRequestReviewPending,
                 children: /* @__PURE__ */ jsx2(
                   LoadingButtonContent,
@@ -30332,7 +30691,7 @@ function GitHubSyncProjectPullRequestsPage() {
               "button",
               {
                 type: "button",
-                className: getPluginActionClassName({ variant: "secondary", size: "sm" }),
+                className: getPluginActionClassName({ variant: "warning", size: "sm" }),
                 onClick: () => setRerunCiPullRequestId(selectedPullRequest.id),
                 disabled: selectedPullRequestRerunCiPending,
                 children: /* @__PURE__ */ jsx2(
@@ -30370,7 +30729,7 @@ function GitHubSyncProjectPullRequestsPage() {
               "button",
               {
                 type: "button",
-                className: getPluginActionClassName({ variant: "primary", size: "sm" }),
+                className: getPluginActionClassName({ variant: "success", size: "sm" }),
                 onClick: () => {
                   void handleMergePullRequest(selectedPullRequest);
                 },
@@ -30999,7 +31358,7 @@ function GitHubSyncProjectPullRequestsPage() {
                       className: "ghsync-prs-modal__textarea",
                       value: reviewModalDraft,
                       onChange: (event) => setReviewModalDraft(event.currentTarget.value),
-                      placeholder: "Optional comment"
+                      placeholder: "Required for Comment and Request changes. Optional for Approve."
                     }
                   )
                 ] }),
@@ -31014,6 +31373,25 @@ function GitHubSyncProjectPullRequestsPage() {
                     }
                   ),
                   /* @__PURE__ */ jsxs2("div", { className: "ghsync-prs-modal__split-actions", children: [
+                    /* @__PURE__ */ jsx2(
+                      "button",
+                      {
+                        type: "button",
+                        className: getPluginActionClassName({ variant: "secondary" }),
+                        onClick: () => {
+                          void handleReviewPullRequest("comment");
+                        },
+                        disabled: !reviewModalDraft.trim() || reviewModalPending,
+                        children: /* @__PURE__ */ jsx2(
+                          LoadingButtonContent,
+                          {
+                            busy: reviewModalCommentPending,
+                            label: "Comment",
+                            busyLabel: "Commenting\u2026"
+                          }
+                        )
+                      }
+                    ),
                     /* @__PURE__ */ jsx2(
                       "button",
                       {
@@ -31022,7 +31400,7 @@ function GitHubSyncProjectPullRequestsPage() {
                         onClick: () => {
                           void handleReviewPullRequest("request_changes");
                         },
-                        disabled: reviewModalPending,
+                        disabled: !reviewModalDraft.trim() || reviewModalPending,
                         children: /* @__PURE__ */ jsx2(
                           LoadingButtonContent,
                           {
@@ -31037,7 +31415,7 @@ function GitHubSyncProjectPullRequestsPage() {
                       "button",
                       {
                         type: "button",
-                        className: getPluginActionClassName({ variant: "primary" }),
+                        className: getPluginActionClassName({ variant: "success" }),
                         onClick: () => {
                           void handleReviewPullRequest("approve");
                         },
@@ -31094,7 +31472,7 @@ function GitHubSyncProjectPullRequestsPage() {
                     "button",
                     {
                       type: "button",
-                      className: getPluginActionClassName({ variant: "primary" }),
+                      className: getPluginActionClassName({ variant: "warning" }),
                       onClick: () => {
                         void handleRerunCi();
                       },
@@ -31419,7 +31797,12 @@ function GitHubSyncSettingsPage() {
   const repositoriesUnlocked = tokenStatus === "valid";
   const availableAssignees = getAvailableAssigneeOptions(
     (currentSettings?.availableAssignees?.length ? currentSettings.availableAssignees : null) ?? (form.availableAssignees?.length ? form.availableAssignees : null) ?? browserAvailableAssignees,
-    form.advancedSettings.defaultAssigneeAgentId
+    [
+      getAdvancedSettingsAssigneePrincipal(form.advancedSettings, "default"),
+      getAdvancedSettingsAssigneePrincipal(form.advancedSettings, "executor"),
+      getAdvancedSettingsAssigneePrincipal(form.advancedSettings, "reviewer"),
+      getAdvancedSettingsAssigneePrincipal(form.advancedSettings, "approver")
+    ]
   );
   const propagationAgents = getAvailablePropagationAgentOptions(
     (currentSettings?.availableAssignees?.length ? currentSettings.availableAssignees : null) ?? (form.availableAssignees?.length ? form.availableAssignees : null) ?? browserAvailableAssignees,
@@ -31498,9 +31881,17 @@ function GitHubSyncSettingsPage() {
   const assigneeSelectOptions = [
     { value: "", label: "Unassigned" },
     ...availableAssignees.map((option) => ({
-      value: option.id,
+      value: getAssigneeOptionValue(option),
       label: formatAssigneeOptionLabel(option),
-      icon: "agent"
+      icon: option.kind
+    }))
+  ];
+  const transitionAssigneeSelectOptions = [
+    { value: "", label: "Automatic routing" },
+    ...availableAssignees.map((option) => ({
+      value: getAssigneeOptionValue(option),
+      label: formatAssigneeOptionLabel(option),
+      icon: option.kind
     }))
   ];
   const propagationAgentOptions = propagationAgents.map((option) => ({
@@ -31800,7 +32191,7 @@ function GitHubSyncSettingsPage() {
         throw new Error("Allow pop-ups for Paperclip, then try connecting board access again.");
       }
       const boardApiToken = await waitForBoardAccessApproval(challenge);
-      const identity = await fetchBoardAccessIdentity(boardApiToken);
+      const boardIdentity = await fetchBoardAccessIdentity(boardApiToken);
       const secretName = `paperclip_board_api_${companyId.replace(/[^a-z0-9]+/gi, "_").toLowerCase()}`;
       const secret = await resolveOrCreateCompanySecret(companyId, secretName, boardApiToken);
       await patchPluginConfig(pluginId, {
@@ -31811,15 +32202,16 @@ function GitHubSyncSettingsPage() {
       await updateBoardAccess({
         companyId,
         paperclipBoardApiTokenRef: secret.id,
-        paperclipBoardAccessIdentity: identity ?? ""
+        paperclipBoardAccessIdentity: boardIdentity.label ?? "",
+        paperclipBoardAccessUserId: boardIdentity.userId ?? ""
       });
-      setBoardAccessIdentity(identity);
+      setBoardAccessIdentity(boardIdentity.label);
       setForm((current) => ({
         ...current,
         paperclipBoardAccessConfigured: true
       }));
       toast({
-        title: identity ? `Paperclip board access connected as ${identity}` : "Paperclip board access connected",
+        title: boardIdentity.label ? `Paperclip board access connected as ${boardIdentity.label}` : "Paperclip board access connected",
         body: "Direct Paperclip REST calls can now authenticate in authenticated deployments.",
         tone: "success"
       });
@@ -32374,16 +32766,17 @@ function GitHubSyncSettingsPage() {
                   SettingsAssigneePicker,
                   {
                     id: "advanced-default-assignee",
-                    value: form.advancedSettings.defaultAssigneeAgentId ?? "",
+                    value: getSelectedAssigneeOptionValue(form.advancedSettings, "default"),
                     options: assigneeSelectOptions,
                     disabled: settingsMutationsLocked,
                     onChange: (nextValue) => {
                       setForm((current) => ({
                         ...current,
-                        advancedSettings: {
-                          ...current.advancedSettings,
-                          ...nextValue ? { defaultAssigneeAgentId: nextValue } : { defaultAssigneeAgentId: void 0 }
-                        }
+                        advancedSettings: setAdvancedSettingsAssigneePrincipal(
+                          current.advancedSettings,
+                          "default",
+                          parseAssigneeOptionValue(nextValue)
+                        )
                       }));
                     }
                   }
@@ -32409,8 +32802,78 @@ function GitHubSyncSettingsPage() {
                     }
                   }
                 )
+              ] }),
+              /* @__PURE__ */ jsxs2("div", { className: "ghsync__field", children: [
+                /* @__PURE__ */ jsx2("label", { htmlFor: "advanced-executor-assignee", children: "Executor handoff" }),
+                /* @__PURE__ */ jsx2(
+                  SettingsAssigneePicker,
+                  {
+                    id: "advanced-executor-assignee",
+                    value: getSelectedAssigneeOptionValue(form.advancedSettings, "executor"),
+                    options: transitionAssigneeSelectOptions,
+                    disabled: settingsMutationsLocked,
+                    onChange: (nextValue) => {
+                      setForm((current) => ({
+                        ...current,
+                        advancedSettings: setAdvancedSettingsAssigneePrincipal(
+                          current.advancedSettings,
+                          "executor",
+                          parseAssigneeOptionValue(nextValue)
+                        )
+                      }));
+                    }
+                  }
+                ),
+                /* @__PURE__ */ jsx2("p", { className: "ghsync__hint", children: "The assignee that resumes work when GitHub Sync sends an issue back to active execution, such as failing CI, unresolved review threads, or a trusted new GitHub comment." })
+              ] }),
+              /* @__PURE__ */ jsxs2("div", { className: "ghsync__field", children: [
+                /* @__PURE__ */ jsx2("label", { htmlFor: "advanced-reviewer-assignee", children: "Reviewer handoff" }),
+                /* @__PURE__ */ jsx2(
+                  SettingsAssigneePicker,
+                  {
+                    id: "advanced-reviewer-assignee",
+                    value: getSelectedAssigneeOptionValue(form.advancedSettings, "reviewer"),
+                    options: transitionAssigneeSelectOptions,
+                    disabled: settingsMutationsLocked,
+                    onChange: (nextValue) => {
+                      setForm((current) => ({
+                        ...current,
+                        advancedSettings: setAdvancedSettingsAssigneePrincipal(
+                          current.advancedSettings,
+                          "reviewer",
+                          parseAssigneeOptionValue(nextValue)
+                        )
+                      }));
+                    }
+                  }
+                ),
+                /* @__PURE__ */ jsx2("p", { className: "ghsync__hint", children: "The assignee that reviews work when GitHub Sync moves an issue into `in_review` because linked pull requests are green and all review threads are resolved." })
+              ] }),
+              /* @__PURE__ */ jsxs2("div", { className: "ghsync__field", children: [
+                /* @__PURE__ */ jsx2("label", { htmlFor: "advanced-approver-assignee", children: "Approver handoff" }),
+                /* @__PURE__ */ jsx2(
+                  SettingsAssigneePicker,
+                  {
+                    id: "advanced-approver-assignee",
+                    value: getSelectedAssigneeOptionValue(form.advancedSettings, "approver"),
+                    options: transitionAssigneeSelectOptions,
+                    disabled: settingsMutationsLocked,
+                    onChange: (nextValue) => {
+                      setForm((current) => ({
+                        ...current,
+                        advancedSettings: setAdvancedSettingsAssigneePrincipal(
+                          current.advancedSettings,
+                          "approver",
+                          parseAssigneeOptionValue(nextValue)
+                        )
+                      }));
+                    }
+                  }
+                ),
+                /* @__PURE__ */ jsx2("p", { className: "ghsync__hint", children: "The assignee that approves work for the same `in_review` handoff when Paperclip's execution policy says the current stage is approval instead of review." })
               ] })
             ] }),
+            /* @__PURE__ */ jsx2("p", { className: "ghsync__hint", children: `Choose "Automatic routing" to let GitHub Sync follow the issue's Paperclip execution policy and built-in fallback behavior. Pick a specific assignee only when you want a company-wide fallback for missing reviewer, approver, or return-assignee data. When Paperclip board access is connected for this company, each assignee picker also includes "Me" so the connected board user can take the handoff instead of an agent.` }),
             /* @__PURE__ */ jsxs2("div", { className: "ghsync__field", children: [
               /* @__PURE__ */ jsx2("label", { htmlFor: "advanced-ignored-authors", children: "Ignore issues from GitHub usernames" }),
               /* @__PURE__ */ jsx2(