From edea33310beb7ac0eeb168fd3cbf735616301e4c Mon Sep 17 00:00:00 2001
From: Hikari <hikari@nhcarrigan.com>
Date: Mon, 13 Apr 2026 10:19:50 -0700
Subject: [PATCH] feat: expose disableSkillShellExecution setting in config UI
 (closes #259)

---
 src-tauri/src/config.rs                 | 11 +++++++++++
 src-tauri/src/wsl_bridge.rs             | 16 ++++++++++++++--
 src/lib/components/ConfigSidebar.svelte | 17 +++++++++++++++++
 src/lib/components/StatusBar.svelte     |  1 +
 src/lib/stores/config.test.ts           |  3 +++
 src/lib/stores/config.ts                |  3 +++
 6 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs
index 2fb18f4..fc89406 100644
--- a/src-tauri/src/config.rs
+++ b/src-tauri/src/config.rs
@@ -54,6 +54,9 @@ pub struct ClaudeStartOptions {
 
     #[serde(default)]
     pub session_name: Option<String>,
+
+    #[serde(default)]
+    pub disable_skill_shell_execution: bool,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -203,6 +206,11 @@ pub struct HikariConfig {
 
     #[serde(default)]
     pub model_overrides: Option<HashMap<String, String>>,
+
+    /// Prevents skill scripts from executing shell commands (Claude Code v2.1.91+).
+    /// Passes `"disableSkillShellExecution": true` via the `--settings` flag.
+    #[serde(default)]
+    pub disable_skill_shell_execution: bool,
 }
 
 impl Default for HikariConfig {
@@ -254,6 +262,7 @@ impl Default for HikariConfig {
             enable_claudeai_mcp_servers: true,
             auto_memory_directory: None,
             model_overrides: None,
+            disable_skill_shell_execution: false,
         }
     }
 }
@@ -405,6 +414,7 @@ mod tests {
         assert!(config.enable_claudeai_mcp_servers);
         assert!(config.auto_memory_directory.is_none());
         assert!(config.model_overrides.is_none());
+        assert!(!config.disable_skill_shell_execution);
     }
 
     #[test]
@@ -459,6 +469,7 @@ mod tests {
                 "claude-opus-4-6".to_string(),
                 "arn:aws:bedrock:us-east-1::foundation-model/anthropic.claude-opus-4-6-v1".to_string(),
             )])),
+            disable_skill_shell_execution: true,
         };
 
         let json = serde_json::to_string(&config).unwrap();
diff --git a/src-tauri/src/wsl_bridge.rs b/src-tauri/src/wsl_bridge.rs
index 7919d4d..6a8f9a6 100644
--- a/src-tauri/src/wsl_bridge.rs
+++ b/src-tauri/src/wsl_bridge.rs
@@ -316,7 +316,7 @@ impl WslBridge {
                     .map(|m| !m.is_empty())
                     .unwrap_or(false);
 
-                if has_memory_dir || has_overrides {
+                if has_memory_dir || has_overrides || options.disable_skill_shell_execution {
                     let mut settings = serde_json::Map::new();
                     if let Some(ref dir) = options.auto_memory_directory {
                         if !dir.is_empty() {
@@ -333,6 +333,12 @@ impl WslBridge {
                             }
                         }
                     }
+                    if options.disable_skill_shell_execution {
+                        settings.insert(
+                            "disableSkillShellExecution".to_string(),
+                            serde_json::Value::Bool(true),
+                        );
+                    }
                     if let Ok(settings_json) = serde_json::to_string(&settings) {
                         cmd.args(["--settings", &settings_json]);
                     }
@@ -503,7 +509,7 @@ impl WslBridge {
                     .map(|m| !m.is_empty())
                     .unwrap_or(false);
 
-                if has_memory_dir || has_overrides {
+                if has_memory_dir || has_overrides || options.disable_skill_shell_execution {
                     let mut settings = serde_json::Map::new();
                     if let Some(ref dir) = options.auto_memory_directory {
                         if !dir.is_empty() {
@@ -520,6 +526,12 @@ impl WslBridge {
                             }
                         }
                     }
+                    if options.disable_skill_shell_execution {
+                        settings.insert(
+                            "disableSkillShellExecution".to_string(),
+                            serde_json::Value::Bool(true),
+                        );
+                    }
                     if let Ok(settings_json) = serde_json::to_string(&settings) {
                         let escaped = settings_json.replace('\'', "'\\''");
                         claude_cmd.push_str(&format!(" --settings '{}'", escaped));
diff --git a/src/lib/components/ConfigSidebar.svelte b/src/lib/components/ConfigSidebar.svelte
index 0a26a2b..b9ccb1b 100644
--- a/src/lib/components/ConfigSidebar.svelte
+++ b/src/lib/components/ConfigSidebar.svelte
@@ -63,6 +63,7 @@
     enable_claudeai_mcp_servers: true,
     auto_memory_directory: null,
     model_overrides: null,
+    disable_skill_shell_execution: false,
     max_output_tokens: null,
     trusted_workspaces: [],
     background_image_path: null,
@@ -585,6 +586,22 @@
         </p>
       </div>
 
+      <!-- Disable Skill Shell Execution -->
+      <div class="mb-4">
+        <label class="flex items-center gap-3 cursor-pointer">
+          <input
+            type="checkbox"
+            bind:checked={config.disable_skill_shell_execution}
+            class="w-4 h-4 rounded border-[var(--border-color)] bg-[var(--bg-primary)] text-[var(--accent-primary)] focus:ring-[var(--accent-primary)]"
+          />
+          <span class="text-sm text-[var(--text-primary)]">Disable skill shell execution</span>
+        </label>
+        <p class="text-xs text-[var(--text-tertiary)] mt-1 ml-7">
+          Passes <code class="font-mono">disableSkillShellExecution: true</code> to prevent skill scripts
+          from executing shell commands (requires Claude Code v2.1.91+)
+        </p>
+      </div>
+
       <!-- Include Git Instructions -->
       <div class="mb-4">
         <label class="flex items-center gap-3 cursor-pointer">
diff --git a/src/lib/components/StatusBar.svelte b/src/lib/components/StatusBar.svelte
index a4d9887..46fc3c9 100644
--- a/src/lib/components/StatusBar.svelte
+++ b/src/lib/components/StatusBar.svelte
@@ -93,6 +93,7 @@
     enable_claudeai_mcp_servers: true,
     auto_memory_directory: null,
     model_overrides: null,
+    disable_skill_shell_execution: false,
   });
 
   let streamerModeActive = $state(false);
diff --git a/src/lib/stores/config.test.ts b/src/lib/stores/config.test.ts
index 018c240..bd2dc8d 100644
--- a/src/lib/stores/config.test.ts
+++ b/src/lib/stores/config.test.ts
@@ -225,6 +225,7 @@ describe("config store", () => {
         enable_claudeai_mcp_servers: true,
         auto_memory_directory: null,
         model_overrides: null,
+        disable_skill_shell_execution: false,
       };
 
       expect(config.model).toBe("claude-sonnet-4");
@@ -289,6 +290,7 @@ describe("config store", () => {
         enable_claudeai_mcp_servers: true,
         auto_memory_directory: null,
         model_overrides: null,
+        disable_skill_shell_execution: false,
       };
 
       expect(config.model).toBeNull();
@@ -908,6 +910,7 @@ describe("config store", () => {
         enable_claudeai_mcp_servers: true,
         auto_memory_directory: null,
         model_overrides: null,
+        disable_skill_shell_execution: false,
       };
 
       const mockInvokeImpl = vi.mocked(invoke);
diff --git a/src/lib/stores/config.ts b/src/lib/stores/config.ts
index 6977cdd..a988fae 100644
--- a/src/lib/stores/config.ts
+++ b/src/lib/stores/config.ts
@@ -91,6 +91,8 @@ export interface HikariConfig {
   auto_memory_directory: string | null;
   // Model overrides for provider-specific model IDs (AWS Bedrock, Google Vertex, etc.)
   model_overrides: Record<string, string> | null;
+  // Prevents skill scripts from executing shell commands (Claude Code v2.1.91+)
+  disable_skill_shell_execution: boolean;
 }
 
 const defaultConfig: HikariConfig = {
@@ -149,6 +151,7 @@ const defaultConfig: HikariConfig = {
   enable_claudeai_mcp_servers: true,
   auto_memory_directory: null,
   model_overrides: null,
+  disable_skill_shell_execution: false,
 };
 
 function createConfigStore() {