From 520fb2620d8d1df91b9e315dd6b2e942f70617c1 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott@gmail.com>
Date: Sat, 6 Jun 2026 01:55:28 +0000
Subject: [PATCH] fix(ng-dev/caretaker): redact raw error objects from
 caretaker logs

---
 ng-dev/caretaker/handoff/update-github-team.ts | 9 ++++++++-
 ng-dev/caretaker/handoff/verify-merge-mode.ts  | 9 ++++++++-
 ng-dev/caretaker/merge-mode/release.ts         | 6 ++++--
 ng-dev/caretaker/merge-mode/reset.ts           | 6 ++++--
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/ng-dev/caretaker/handoff/update-github-team.ts b/ng-dev/caretaker/handoff/update-github-team.ts
index 457480b397..c34d176eb6 100644
--- a/ng-dev/caretaker/handoff/update-github-team.ts
+++ b/ng-dev/caretaker/handoff/update-github-team.ts
@@ -96,7 +96,14 @@ async function getGroupMembers(group: string) {
       })
       .then(({data}) => data.map((member) => member.login));
   } catch (e) {
-    Log.debug(e);
+    if (e instanceof Error) {
+      Log.debug(e.message);
+      if (e.stack) {
+        Log.debug(e.stack);
+      }
+    } else {
+      Log.debug(String(e));
+    }
     return [];
   }
 }
diff --git a/ng-dev/caretaker/handoff/verify-merge-mode.ts b/ng-dev/caretaker/handoff/verify-merge-mode.ts
index ff39ac4ee7..f2276c4756 100644
--- a/ng-dev/caretaker/handoff/verify-merge-mode.ts
+++ b/ng-dev/caretaker/handoff/verify-merge-mode.ts
@@ -33,7 +33,14 @@ export async function verifyMergeMode(expectedMode: MergeMode): Promise<boolean>
       return true;
     } catch (err) {
       Log.info(`${red('✘')} Failed to update merge-mode`);
-      Log.info(err);
+      if (err instanceof Error) {
+        Log.info(err.message);
+        if (err.stack) {
+          Log.debug(err.stack);
+        }
+      } else {
+        Log.info(String(err));
+      }
       return false;
     }
   }
diff --git a/ng-dev/caretaker/merge-mode/release.ts b/ng-dev/caretaker/merge-mode/release.ts
index 2ea19406e2..a06e5ea354 100644
--- a/ng-dev/caretaker/merge-mode/release.ts
+++ b/ng-dev/caretaker/merge-mode/release.ts
@@ -21,10 +21,12 @@ export async function setMergeModeRelease(): Promise<boolean> {
     Log.error('  ✘  Failed to setup of repository for release');
     if (err instanceof Error) {
       Log.info(err.message);
-      Log.debug(err.stack);
+      if (err.stack) {
+        Log.debug(err.stack);
+      }
       return false;
     }
-    Log.info(err);
+    Log.info(String(err));
   }
   return false;
 }
diff --git a/ng-dev/caretaker/merge-mode/reset.ts b/ng-dev/caretaker/merge-mode/reset.ts
index 7fa903aa75..ef4ab0310d 100644
--- a/ng-dev/caretaker/merge-mode/reset.ts
+++ b/ng-dev/caretaker/merge-mode/reset.ts
@@ -22,10 +22,12 @@ export async function resetMergeMode(): Promise<boolean> {
     Log.info(`${red('✘')} Failed to reset the merge mode of the repository`);
     if (err instanceof Error) {
       Log.info(err.message);
-      Log.debug(err.stack);
+      if (err.stack) {
+        Log.debug(err.stack);
+      }
       return false;
     }
-    Log.info(err);
+    Log.info(String(err));
     return false;
   }
 }