diff --git a/scripts/bundle-a2ui.sh b/scripts/bundle-a2ui.sh
index a1cf7ff2b..57e756b28 100755
--- a/scripts/bundle-a2ui.sh
+++ b/scripts/bundle-a2ui.sh
@@ -30,10 +30,22 @@ collect_files() {
 }
 
 compute_hash() {
+  local hash_cmd
+  local hash_args=()
+  if command -v shasum >/dev/null 2>&1; then
+    hash_cmd="shasum"
+    hash_args=("-a" "256")
+  elif command -v sha256sum >/dev/null 2>&1; then
+    hash_cmd="sha256sum"
+  else
+    echo "Error: shasum/sha256sum not found" >&2
+    exit 1
+  fi
+
   collect_files \
     | LC_ALL=C sort -z \
-    | xargs -0 shasum -a 256 \
-    | shasum -a 256 \
+    | xargs -0 "$hash_cmd" "${hash_args[@]}" \
+    | "$hash_cmd" "${hash_args[@]}" \
     | awk '{print $1}'
 }
 
diff --git a/src/auto-reply/envelope.ts b/src/auto-reply/envelope.ts
index 7a1593445..b79a8507f 100644
--- a/src/auto-reply/envelope.ts
+++ b/src/auto-reply/envelope.ts
@@ -237,11 +237,11 @@ export function formatAgentEnvelope(params: AgentEnvelopeParams): string {
   const elapsed =
     resolved.includeElapsed && params.timestamp && params.previousTimestamp
       ? formatElapsedTime(
-        params.timestamp instanceof Date ? params.timestamp.getTime() : params.timestamp,
-        params.previousTimestamp instanceof Date
-          ? params.previousTimestamp.getTime()
-          : params.previousTimestamp,
-      )
+          params.timestamp instanceof Date ? params.timestamp.getTime() : params.timestamp,
+          params.previousTimestamp instanceof Date
+            ? params.previousTimestamp.getTime()
+            : params.previousTimestamp,
+        )
       : undefined;
   if (params.from?.trim()) {
     const from = params.from.trim();