diff --git a/packages/cli/src/ui/components/__snapshots__/ToolConfirmationQueue-ToolConfirmationQueue-height-allocation-and-layout-should-handle-security-warning-height-correctly.snap.svg b/packages/cli/src/ui/components/__snapshots__/ToolConfirmationQueue-ToolConfirmationQueue-height-allocation-and-layout-should-handle-security-warning-height-correctly.snap.svg
index 70bd4548f5..28d2c382ad 100644
--- a/packages/cli/src/ui/components/__snapshots__/ToolConfirmationQueue-ToolConfirmationQueue-height-allocation-and-layout-should-handle-security-warning-height-correctly.snap.svg
+++ b/packages/cli/src/ui/components/__snapshots__/ToolConfirmationQueue-ToolConfirmationQueue-height-allocation-and-layout-should-handle-security-warning-height-correctly.snap.svg
@@ -84,15 +84,15 @@
     <text x="0" y="308" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="711" y="308" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="325" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="18" y="323" width="9" height="17" fill="#005f00" />
+    <rect x="18" y="323" width="9" height="17" fill="#008700" />
     <text x="18" y="325" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">●</text>
-    <rect x="27" y="323" width="9" height="17" fill="#005f00" />
-    <rect x="36" y="323" width="18" height="17" fill="#005f00" />
+    <rect x="27" y="323" width="9" height="17" fill="#008700" />
+    <rect x="36" y="323" width="18" height="17" fill="#008700" />
     <text x="36" y="325" fill="#00cd00" textLength="18" lengthAdjust="spacingAndGlyphs">1.</text>
-    <rect x="54" y="323" width="9" height="17" fill="#005f00" />
-    <rect x="63" y="323" width="90" height="17" fill="#005f00" />
+    <rect x="54" y="323" width="9" height="17" fill="#008700" />
+    <rect x="63" y="323" width="90" height="17" fill="#008700" />
     <text x="63" y="325" fill="#00cd00" textLength="90" lengthAdjust="spacingAndGlyphs">Allow once</text>
-    <rect x="153" y="323" width="549" height="17" fill="#005f00" />
+    <rect x="153" y="323" width="549" height="17" fill="#008700" />
     <text x="711" y="325" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="342" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="36" y="342" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">2.</text>
diff --git a/packages/cli/src/ui/components/__snapshots__/ToolConfirmationQueue-ToolConfirmationQueue-height-allocation-and-layout-should-render-the-full-queue-wrapper-with-borders-and-content-for-large-edit-diffs.snap.svg b/packages/cli/src/ui/components/__snapshots__/ToolConfirmationQueue-ToolConfirmationQueue-height-allocation-and-layout-should-render-the-full-queue-wrapper-with-borders-and-content-for-large-edit-diffs.snap.svg
index c192a63c85..a7edfbb7be 100644
--- a/packages/cli/src/ui/components/__snapshots__/ToolConfirmationQueue-ToolConfirmationQueue-height-allocation-and-layout-should-render-the-full-queue-wrapper-with-borders-and-content-for-large-edit-diffs.snap.svg
+++ b/packages/cli/src/ui/components/__snapshots__/ToolConfirmationQueue-ToolConfirmationQueue-height-allocation-and-layout-should-render-the-full-queue-wrapper-with-borders-and-content-for-large-edit-diffs.snap.svg
@@ -14,7 +14,7 @@
     <text x="711" y="36" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="53" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="18" y="53" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="36" y="53" fill="#a8a8a8" textLength="234" lengthAdjust="spacingAndGlyphs">... 14 hidden (Ctrl+O) ...</text>
+    <text x="36" y="53" fill="#a8a8a8" textLength="234" lengthAdjust="spacingAndGlyphs">... 13 hidden (Ctrl+O) ...</text>
     <text x="693" y="53" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="711" y="53" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="70" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
@@ -498,15 +498,15 @@
     <text x="0" y="546" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="711" y="546" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="563" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="18" y="561" width="9" height="17" fill="#005f00" />
+    <rect x="18" y="561" width="9" height="17" fill="#008700" />
     <text x="18" y="563" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">●</text>
-    <rect x="27" y="561" width="9" height="17" fill="#005f00" />
-    <rect x="36" y="561" width="18" height="17" fill="#005f00" />
+    <rect x="27" y="561" width="9" height="17" fill="#008700" />
+    <rect x="36" y="561" width="18" height="17" fill="#008700" />
     <text x="36" y="563" fill="#00cd00" textLength="18" lengthAdjust="spacingAndGlyphs">1.</text>
-    <rect x="54" y="561" width="9" height="17" fill="#005f00" />
-    <rect x="63" y="561" width="90" height="17" fill="#005f00" />
+    <rect x="54" y="561" width="9" height="17" fill="#008700" />
+    <rect x="63" y="561" width="90" height="17" fill="#008700" />
     <text x="63" y="563" fill="#00cd00" textLength="90" lengthAdjust="spacingAndGlyphs">Allow once</text>
-    <rect x="153" y="561" width="549" height="17" fill="#005f00" />
+    <rect x="153" y="561" width="549" height="17" fill="#008700" />
     <text x="711" y="563" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="580" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="36" y="580" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">2.</text>
diff --git a/packages/cli/src/ui/components/__snapshots__/ToolConfirmationQueue-ToolConfirmationQueue-height-allocation-and-layout-should-render-the-full-queue-wrapper-with-borders-and-content-for-large-exec-commands.snap.svg b/packages/cli/src/ui/components/__snapshots__/ToolConfirmationQueue-ToolConfirmationQueue-height-allocation-and-layout-should-render-the-full-queue-wrapper-with-borders-and-content-for-large-exec-commands.snap.svg
index 7838dc9163..4db7136768 100644
--- a/packages/cli/src/ui/components/__snapshots__/ToolConfirmationQueue-ToolConfirmationQueue-height-allocation-and-layout-should-render-the-full-queue-wrapper-with-borders-and-content-for-large-exec-commands.snap.svg
+++ b/packages/cli/src/ui/components/__snapshots__/ToolConfirmationQueue-ToolConfirmationQueue-height-allocation-and-layout-should-render-the-full-queue-wrapper-with-borders-and-content-for-large-exec-commands.snap.svg
@@ -15,7 +15,7 @@
     <text x="711" y="36" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="53" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="18" y="53" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="36" y="53" fill="#a8a8a8" textLength="234" lengthAdjust="spacingAndGlyphs">... 23 hidden (Ctrl+O) ...</text>
+    <text x="36" y="53" fill="#a8a8a8" textLength="234" lengthAdjust="spacingAndGlyphs">... 22 hidden (Ctrl+O) ...</text>
     <text x="693" y="53" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="711" y="53" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="70" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
@@ -191,15 +191,15 @@
     <text x="0" y="563" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="711" y="563" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="580" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="18" y="578" width="9" height="17" fill="#005f00" />
+    <rect x="18" y="578" width="9" height="17" fill="#008700" />
     <text x="18" y="580" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">●</text>
-    <rect x="27" y="578" width="9" height="17" fill="#005f00" />
-    <rect x="36" y="578" width="18" height="17" fill="#005f00" />
+    <rect x="27" y="578" width="9" height="17" fill="#008700" />
+    <rect x="36" y="578" width="18" height="17" fill="#008700" />
     <text x="36" y="580" fill="#00cd00" textLength="18" lengthAdjust="spacingAndGlyphs">1.</text>
-    <rect x="54" y="578" width="9" height="17" fill="#005f00" />
-    <rect x="63" y="578" width="90" height="17" fill="#005f00" />
+    <rect x="54" y="578" width="9" height="17" fill="#008700" />
+    <rect x="63" y="578" width="90" height="17" fill="#008700" />
     <text x="63" y="580" fill="#00cd00" textLength="90" lengthAdjust="spacingAndGlyphs">Allow once</text>
-    <rect x="153" y="578" width="549" height="17" fill="#005f00" />
+    <rect x="153" y="578" width="549" height="17" fill="#008700" />
     <text x="711" y="580" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="597" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="36" y="597" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">2.</text>
diff --git a/packages/cli/src/ui/components/messages/__snapshots__/ToolConfirmationMessage-ToolConfirmationMessage-height-allocation-and-layout-should-expand-to-available-height-for-large-edit-diffs.snap.svg b/packages/cli/src/ui/components/messages/__snapshots__/ToolConfirmationMessage-ToolConfirmationMessage-height-allocation-and-layout-should-expand-to-available-height-for-large-edit-diffs.snap.svg
index b511f8fffc..7b2a4dbaac 100644
--- a/packages/cli/src/ui/components/messages/__snapshots__/ToolConfirmationMessage-ToolConfirmationMessage-height-allocation-and-layout-should-expand-to-available-height-for-large-edit-diffs.snap.svg
+++ b/packages/cli/src/ui/components/messages/__snapshots__/ToolConfirmationMessage-ToolConfirmationMessage-height-allocation-and-layout-should-expand-to-available-height-for-large-edit-diffs.snap.svg
@@ -6,7 +6,7 @@
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#303030" textLength="720" lengthAdjust="spacingAndGlyphs">╭──────────────────────────────────────────────────────────────────────────────╮</text>
     <text x="0" y="19" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#a8a8a8" textLength="234" lengthAdjust="spacingAndGlyphs">... 11 hidden (Ctrl+O) ...</text>
+    <text x="18" y="19" fill="#a8a8a8" textLength="234" lengthAdjust="spacingAndGlyphs">... 10 hidden (Ctrl+O) ...</text>
     <text x="711" y="19" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="36" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <rect x="18" y="34" width="9" height="17" fill="#008700" />
@@ -481,15 +481,15 @@
     <text x="711" y="512" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="529" fill="#303030" textLength="720" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────╯</text>
     <text x="0" y="546" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Apply this change?</text>
-    <rect x="0" y="578" width="9" height="17" fill="#005f00" />
+    <rect x="0" y="578" width="9" height="17" fill="#008700" />
     <text x="0" y="580" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">●</text>
-    <rect x="9" y="578" width="9" height="17" fill="#005f00" />
-    <rect x="18" y="578" width="18" height="17" fill="#005f00" />
+    <rect x="9" y="578" width="9" height="17" fill="#008700" />
+    <rect x="18" y="578" width="18" height="17" fill="#008700" />
     <text x="18" y="580" fill="#00cd00" textLength="18" lengthAdjust="spacingAndGlyphs">1.</text>
-    <rect x="36" y="578" width="9" height="17" fill="#005f00" />
-    <rect x="45" y="578" width="90" height="17" fill="#005f00" />
+    <rect x="36" y="578" width="9" height="17" fill="#008700" />
+    <rect x="45" y="578" width="90" height="17" fill="#008700" />
     <text x="45" y="580" fill="#00cd00" textLength="90" lengthAdjust="spacingAndGlyphs">Allow once</text>
-    <rect x="135" y="578" width="603" height="17" fill="#005f00" />
+    <rect x="135" y="578" width="603" height="17" fill="#008700" />
     <text x="18" y="597" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">2.</text>
     <text x="45" y="597" fill="#ffffff" textLength="198" lengthAdjust="spacingAndGlyphs">Allow for this session</text>
     <text x="18" y="614" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">3.</text>
diff --git a/packages/cli/src/ui/components/messages/__snapshots__/ToolConfirmationMessage-ToolConfirmationMessage-height-allocation-and-layout-should-expand-to-available-height-for-large-exec-commands.snap.svg b/packages/cli/src/ui/components/messages/__snapshots__/ToolConfirmationMessage-ToolConfirmationMessage-height-allocation-and-layout-should-expand-to-available-height-for-large-exec-commands.snap.svg
index 5355e16de0..0d2994d4d3 100644
--- a/packages/cli/src/ui/components/messages/__snapshots__/ToolConfirmationMessage-ToolConfirmationMessage-height-allocation-and-layout-should-expand-to-available-height-for-large-exec-commands.snap.svg
+++ b/packages/cli/src/ui/components/messages/__snapshots__/ToolConfirmationMessage-ToolConfirmationMessage-height-allocation-and-layout-should-expand-to-available-height-for-large-exec-commands.snap.svg
@@ -6,7 +6,7 @@
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#303030" textLength="720" lengthAdjust="spacingAndGlyphs">╭──────────────────────────────────────────────────────────────────────────────╮</text>
     <text x="0" y="19" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#a8a8a8" textLength="234" lengthAdjust="spacingAndGlyphs">... 20 hidden (Ctrl+O) ...</text>
+    <text x="18" y="19" fill="#a8a8a8" textLength="234" lengthAdjust="spacingAndGlyphs">... 19 hidden (Ctrl+O) ...</text>
     <text x="711" y="19" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="36" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="18" y="36" fill="#00cdcd" textLength="36" lengthAdjust="spacingAndGlyphs">echo</text>
@@ -130,15 +130,15 @@
     <text x="711" y="529" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="546" fill="#303030" textLength="720" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────╯</text>
     <text x="0" y="563" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">Allow execution of [echo]?                                                                          </text>
-    <rect x="0" y="595" width="9" height="17" fill="#005f00" />
+    <rect x="0" y="595" width="9" height="17" fill="#008700" />
     <text x="0" y="597" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">●</text>
-    <rect x="9" y="595" width="9" height="17" fill="#005f00" />
-    <rect x="18" y="595" width="18" height="17" fill="#005f00" />
+    <rect x="9" y="595" width="9" height="17" fill="#008700" />
+    <rect x="18" y="595" width="18" height="17" fill="#008700" />
     <text x="18" y="597" fill="#00cd00" textLength="18" lengthAdjust="spacingAndGlyphs">1.</text>
-    <rect x="36" y="595" width="9" height="17" fill="#005f00" />
-    <rect x="45" y="595" width="90" height="17" fill="#005f00" />
+    <rect x="36" y="595" width="9" height="17" fill="#008700" />
+    <rect x="45" y="595" width="90" height="17" fill="#008700" />
     <text x="45" y="597" fill="#00cd00" textLength="90" lengthAdjust="spacingAndGlyphs">Allow once</text>
-    <rect x="135" y="595" width="603" height="17" fill="#005f00" />
+    <rect x="135" y="595" width="603" height="17" fill="#008700" />
     <text x="18" y="614" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">2.</text>
     <text x="45" y="614" fill="#ffffff" textLength="198" lengthAdjust="spacingAndGlyphs">Allow for this session</text>
     <text x="18" y="631" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">3.</text>
diff --git a/packages/cli/src/ui/components/messages/__snapshots__/ToolConfirmationMessage-ToolConfirmationMessage-should-render-multiline-shell-scripts-with-correct-newlines-and-syntax-highlighting.snap.svg b/packages/cli/src/ui/components/messages/__snapshots__/ToolConfirmationMessage-ToolConfirmationMessage-should-render-multiline-shell-scripts-with-correct-newlines-and-syntax-highlighting.snap.svg
index 0439731934..7b693b506d 100644
--- a/packages/cli/src/ui/components/messages/__snapshots__/ToolConfirmationMessage-ToolConfirmationMessage-should-render-multiline-shell-scripts-with-correct-newlines-and-syntax-highlighting.snap.svg
+++ b/packages/cli/src/ui/components/messages/__snapshots__/ToolConfirmationMessage-ToolConfirmationMessage-should-render-multiline-shell-scripts-with-correct-newlines-and-syntax-highlighting.snap.svg
@@ -25,15 +25,15 @@
     <text x="711" y="70" fill="#303030" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="87" fill="#303030" textLength="720" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────╯</text>
     <text x="0" y="104" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">Allow execution of [echo]?                                                                          </text>
-    <rect x="0" y="136" width="9" height="17" fill="#005f00" />
+    <rect x="0" y="136" width="9" height="17" fill="#008700" />
     <text x="0" y="138" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">●</text>
-    <rect x="9" y="136" width="9" height="17" fill="#005f00" />
-    <rect x="18" y="136" width="18" height="17" fill="#005f00" />
+    <rect x="9" y="136" width="9" height="17" fill="#008700" />
+    <rect x="18" y="136" width="18" height="17" fill="#008700" />
     <text x="18" y="138" fill="#00cd00" textLength="18" lengthAdjust="spacingAndGlyphs">1.</text>
-    <rect x="36" y="136" width="9" height="17" fill="#005f00" />
-    <rect x="45" y="136" width="90" height="17" fill="#005f00" />
+    <rect x="36" y="136" width="9" height="17" fill="#008700" />
+    <rect x="45" y="136" width="90" height="17" fill="#008700" />
     <text x="45" y="138" fill="#00cd00" textLength="90" lengthAdjust="spacingAndGlyphs">Allow once</text>
-    <rect x="135" y="136" width="603" height="17" fill="#005f00" />
+    <rect x="135" y="136" width="603" height="17" fill="#008700" />
     <text x="18" y="155" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">2.</text>
     <text x="45" y="155" fill="#ffffff" textLength="198" lengthAdjust="spacingAndGlyphs">Allow for this session</text>
     <text x="18" y="172" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">3.</text>