From 9f3edc5dafb3aeb72f3d1cf2da80ccbda1690e48 Mon Sep 17 00:00:00 2001
From: kaitranntt <kaitran.ntt@gmail.com>
Date: Mon, 2 Feb 2026 19:00:46 -0500
Subject: [PATCH] fix(hooks): enable image-read blocking by default for
 third-party profiles

Match WebSearch hook pattern:
- ENABLED by default for settings/cliproxy profiles
- DISABLED for native Claude accounts (account/default)
- User can override via config: hooks.block_image_read.enabled: false

This ensures CCS CLI users get context protection out-of-the-box
while native Claude subscription users are unaffected.
---
 lib/hooks/block-image-read.cjs               | 46 ++++++++++++++------
 src/utils/hooks/image-read-block-hook-env.ts | 18 ++++++--
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/lib/hooks/block-image-read.cjs b/lib/hooks/block-image-read.cjs
index c4dceecd..78d87e27 100644
--- a/lib/hooks/block-image-read.cjs
+++ b/lib/hooks/block-image-read.cjs
@@ -7,6 +7,11 @@
  *
  * This is a PreToolUse hook that runs BEFORE the tool is executed.
  *
+ * Behavior (matches WebSearch pattern):
+ * - ENABLED by default for third-party profiles (settings, cliproxy)
+ * - DISABLED for native Claude accounts (account, default profiles)
+ * - User can override via config: hooks.block_image_read.enabled: false
+ *
  * Usage:
  *   Configured in ~/.claude/settings.json:
  *   {
@@ -22,10 +27,11 @@
  *     }
  *   }
  *
- * Environment Variables:
- *   CCS_BLOCK_IMAGE_READ=1       - Enable blocking (required)
- *   CCS_BLOCK_IMAGE_READ=0       - Disable blocking (allow all reads)
- *   CCS_DEBUG=1                  - Enable debug output
+ * Environment Variables (set by CCS):
+ *   CCS_BLOCK_IMAGE_READ=1    - Enable blocking (default for third-party)
+ *   CCS_BLOCK_IMAGE_READ=0    - Disable blocking
+ *   CCS_PROFILE_TYPE          - Profile type (account, default, settings, cliproxy)
+ *   CCS_DEBUG=1               - Enable debug output
  *
  * Exit codes:
  *   0 - Allow tool (pass-through)
@@ -53,11 +59,28 @@ process.stdin.on('error', () => {
 });
 
 /**
- * Check if blocking is enabled via environment variable
+ * Check if hook should skip (for native Claude accounts).
+ * Matches WebSearch hook pattern.
  */
-function isBlockingEnabled() {
-  // Must be explicitly enabled
-  return process.env.CCS_BLOCK_IMAGE_READ === '1';
+function shouldSkipHook() {
+  // Account/default profiles use native Claude - don't block
+  const profileType = process.env.CCS_PROFILE_TYPE;
+  if (profileType === 'account' || profileType === 'default') {
+    if (process.env.CCS_DEBUG) {
+      console.error(`[CCS Hook] Skipping image block for profile type: ${profileType}`);
+    }
+    return true;
+  }
+
+  // Explicit disable via config
+  if (process.env.CCS_BLOCK_IMAGE_READ === '0') {
+    if (process.env.CCS_DEBUG) {
+      console.error('[CCS Hook] Image read blocking disabled by config');
+    }
+    return true;
+  }
+
+  return false;
 }
 
 /**
@@ -65,11 +88,8 @@ function isBlockingEnabled() {
  */
 function processHook() {
   try {
-    // Skip if blocking not enabled
-    if (!isBlockingEnabled()) {
-      if (process.env.CCS_DEBUG) {
-        console.error('[CCS Hook] Image read blocking disabled (CCS_BLOCK_IMAGE_READ != 1)');
-      }
+    // Skip for native accounts or explicit disable
+    if (shouldSkipHook()) {
       process.exit(0);
     }
 
diff --git a/src/utils/hooks/image-read-block-hook-env.ts b/src/utils/hooks/image-read-block-hook-env.ts
index ad2f3333..b2cc91fc 100644
--- a/src/utils/hooks/image-read-block-hook-env.ts
+++ b/src/utils/hooks/image-read-block-hook-env.ts
@@ -4,6 +4,9 @@
  * Provides environment variables for image read blocking hook configuration.
  * Prevents context overflow when skills generate images and agent tries to read them.
  *
+ * Enabled by default for third-party profiles (settings, cliproxy).
+ * Disabled for native Claude accounts where context is managed server-side.
+ *
  * @module utils/hooks/image-read-block-hook-env
  */
 
@@ -13,13 +16,13 @@ import { loadOrCreateUnifiedConfig } from '../../config/unified-config-loader';
  * Configuration for image read blocking.
  */
 export interface ImageReadBlockConfig {
-  /** Whether blocking is enabled */
+  /** Whether blocking is enabled (default: true) */
   enabled: boolean;
 }
 
 /**
  * Get image read block configuration from unified config.
- * Defaults to disabled (opt-in feature).
+ * Defaults to ENABLED (opt-out feature) - matches WebSearch pattern.
  */
 export function getImageReadBlockConfig(): ImageReadBlockConfig {
   const config = loadOrCreateUnifiedConfig();
@@ -28,14 +31,18 @@ export function getImageReadBlockConfig(): ImageReadBlockConfig {
     config as unknown as { hooks?: { block_image_read?: { enabled?: boolean } } }
   ).hooks;
   return {
-    // Default to false - must be explicitly enabled
-    enabled: hooksConfig?.block_image_read?.enabled ?? false,
+    // Default to TRUE - enabled by default, user can opt-out
+    enabled: hooksConfig?.block_image_read?.enabled ?? true,
   };
 }
 
 /**
  * Get environment variables for image read block hook configuration.
  *
+ * Like WebSearch, this respects CCS_PROFILE_TYPE:
+ * - 'account' or 'default' profiles: Skip blocking (native Claude)
+ * - 'settings' or 'cliproxy' profiles: Apply blocking
+ *
  * @returns Record of environment variables to set before spawning Claude
  */
 export function getImageReadBlockHookEnv(): Record<string, string> {
@@ -44,6 +51,9 @@ export function getImageReadBlockHookEnv(): Record<string, string> {
 
   if (config.enabled) {
     env.CCS_BLOCK_IMAGE_READ = '1';
+  } else {
+    // Explicit disable signal
+    env.CCS_BLOCK_IMAGE_READ = '0';
   }
 
   return env;