Adding directories

Author: Caleb-T-Owens

apps/desktop/src/components/codegen/CodegenPage.svelte

@@ -145,6 +145,9 @@
 	const selectedPermissionMode = $derived(
 		selectedBranch ? uiState.lane(selectedBranch.stackId).permissionMode.current : 'default'
 	);
+	const laneState = $derived(
+		selectedBranch?.stackId ? uiState.lane(selectedBranch.stackId) : undefined
+	);
 
 	const prompt = $derived(
 		selectedBranch ? uiState.lane(selectedBranch.stackId).prompt.current : ''
@@ -202,6 +205,22 @@
 		if (!selectedBranch) return;
 		if (!prompt) return;
 
+		// Handle /add-dir command
+		if (prompt.startsWith('/add-dir ')) {
+			const path = prompt.slice('/add-dir '.length).trim();
+			if (path) {
+				const isValid = await claudeCodeService.verifyPath({ projectId, path });
+				if (isValid) {
+					laneState?.addedDirs.add(path);
+					chipToasts.success(`Added directory: ${path}`);
+				} else {
+					chipToasts.error(`Invalid directory path: ${path}`);
+				}
+			}
+			setPrompt('');
+			return;
+		}
+
 		if (prompt.startsWith('/')) {
 			chipToasts.warning('Slash commands are not yet supported');
 			setPrompt('');
@@ -225,7 +244,8 @@
 				thinkingLevel: selectedThinkingLevel,
 				model: selectedModel,
 				permissionMode: selectedPermissionMode,
-				disabledMcpServers: uiState.lane(selectedBranch.stackId).disabledMcpServers.current
+				disabledMcpServers: uiState.lane(selectedBranch.stackId).disabledMcpServers.current,
+				addDirs: laneState?.addedDirs.current || []
 			},
 			{ properties: analyticsProperties }
 		);
@@ -693,8 +713,9 @@
 {/snippet}
 
 {#snippet rightSidebar(events: ClaudeMessage[])}
+	{@const addedDirs = laneState?.addedDirs.current || []}
 	<div class="right-sidebar" bind:this={rightSidebarRef}>
-		{#if !branchChanges || !selectedBranch || (branchChanges.response && branchChanges.response.changes.length === 0 && getTodos(events).length === 0)}
+		{#if !branchChanges || !selectedBranch || (branchChanges.response && branchChanges.response.changes.length === 0 && getTodos(events).length === 0 && addedDirs.length === 0)}
 			<div class="right-sidebar__placeholder">
 				<EmptyStatePlaceholder
 					image={filesAndChecksSvg}
@@ -713,7 +734,7 @@
 				<ReduxResult result={branchChanges.result} {projectId}>
 					{#snippet children({ changes }, { projectId })}
 						<Drawer
-							bottomBorder={todos.length > 0}
+							bottomBorder={todos.length > 0 || addedDirs.length > 0}
 							grow
 							defaultCollapsed={todos.length > 0}
 							notFoldable
@@ -763,6 +784,35 @@
 					</div>
 				</Drawer>
 			{/if}
+
+			{#if addedDirs.length > 0}
+				<Drawer defaultCollapsed={false} noshrink>
+					{#snippet header()}
+						<h4 class="text-14 text-semibold truncate">Added Directories</h4>
+						<Badge>{addedDirs.length}</Badge>
+					{/snippet}
+
+					<div class="right-sidebar-list right-sidebar-list--small-gap">
+						{#each addedDirs as dir}
+							<div class="added-dir-item">
+								<span class="text-13 grow-1">{dir}</span>
+								<Button
+									kind="ghost"
+									icon="bin"
+									shrinkable
+									onclick={() => {
+										if (selectedBranch) {
+											uiState.lane(selectedBranch.stackId).addedDirs.remove(dir);
+											chipToasts.success(`Removed directory: ${dir}`);
+										}
+									}}
+									tooltip="Remove directory"
+								/>
+							</div>
+						{/each}
+					</div>
+				</Drawer>
+			{/if}
 		{/if}
 
 		<Resizer
@@ -1188,4 +1238,14 @@
 		width: 9px;
 		height: 9px;
 	}
+
+	.added-dir-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.right-sidebar-list--small-gap {
+		gap: 4px;
+	}
 </style>

apps/desktop/src/lib/codegen/claude.ts

@@ -115,6 +115,10 @@ export class ClaudeCodeService {
 	get subAgents() {
 		return this.api.endpoints.getSubAgents.useQuery;
 	}
+
+	get verifyPath() {
+		return this.api.endpoints.verifyPath.mutate;
+	}
 }
 
 function injectEndpoints(api: ClientState['backendApi']) {
@@ -130,6 +134,7 @@ function injectEndpoints(api: ClientState['backendApi']) {
 					model: ModelType;
 					permissionMode: PermissionMode;
 					disabledMcpServers: string[];
+					addDirs: string[];
 				}
 			>({
 				extraOptions: {
@@ -298,6 +303,19 @@ function injectEndpoints(api: ClientState['backendApi']) {
 			getSubAgents: build.query<SubAgent[], { projectId: string }>({
 				extraOptions: { command: 'claude_get_sub_agents' },
 				query: (args) => args
+			}),
+			verifyPath: build.mutation<
+				boolean,
+				{
+					projectId: string;
+					path: string;
+				}
+			>({
+				extraOptions: {
+					command: 'claude_verify_path',
+					actionName: 'Verify Path'
+				},
+				query: (args) => args
 			})
 		})
 	});

apps/desktop/src/lib/state/uiState.svelte.ts

@@ -35,6 +35,8 @@ export type StackState = {
 	permissionMode: PermissionMode;
 	// A list of mcp server names that should be disabled
 	disabledMcpServers: string[];
+	// A list of added directories for Claude Code
+	addedDirs: string[];
 };
 
 type BranchesSelection = {
@@ -156,7 +158,8 @@ export class UiState {
 		prompt: '',
 		// I _know_ we have a permission mode called 'default', but acceptEdits is a much more sensible default.
 		permissionMode: 'acceptEdits',
-		disabledMcpServers: []
+		disabledMcpServers: [],
+		addedDirs: []
 	});
 
 	/** Properties scoped to a specific project. */

apps/desktop/src/lib/testing/mockUiState.ts

@@ -17,7 +17,8 @@ const MOCK_STACK_UI_STATE: StackState = {
 	newCommitMessage: { title: '', description: '' },
 	prompt: '',
 	permissionMode: 'default',
-	disabledMcpServers: []
+	disabledMcpServers: [],
+	addedDirs: []
 };
 
 const MOCK_PROJECT_UI_STATE: ProjectUiState = {

crates/but-api/src/commands/claude.rs

@@ -194,3 +194,32 @@ pub async fn claude_get_sub_agents(
     let sub_agents = but_claude::claude_sub_agents::read_claude_sub_agents(&project.path).await;
     Ok(sub_agents)
 }
+
+#[tauri::command(async)]
+#[instrument(err(Debug))]
+pub async fn claude_verify_path(project_id: ProjectId, path: String) -> Result<bool, Error> {
+    let project = gitbutler_project::get(project_id)?;
+
+    // Check if it's an absolute path first
+    let path = if std::path::Path::new(&path).is_absolute() {
+        std::path::PathBuf::from(&path)
+    } else {
+        // If relative, make it relative to project path
+        project.path.join(&path)
+    };
+
+    // Check if the path exists and is a directory
+    match tokio::fs::try_exists(&path).await {
+        Ok(exists) => {
+            if exists {
+                match tokio::fs::metadata(&path).await {
+                    Ok(metadata) => Ok(metadata.is_dir()),
+                    Err(_) => Ok(false),
+                }
+            } else {
+                Ok(false)
+            }
+        }
+        Err(_) => Ok(false),
+    }
+}

crates/but-claude/src/bridge.rs

@@ -377,7 +377,7 @@ async fn spawn_command(
         command.args(["--model", user_params.model.to_cli_string()]);
     }
 
-    command.args(["-p", "--verbose"]);
+    command.args(["--verbose"]);
 
     if app_settings.claude.dangerously_allow_all_permissions {
         command.arg("--dangerously-skip-permissions");
@@ -413,6 +413,13 @@ async fn spawn_command(
 
     command.args(["--append-system-prompt", SYSTEM_PROMPT]);
 
+    if !user_params.add_dirs.is_empty() {
+        command.arg("--add-dir");
+        command.args(user_params.add_dirs);
+    }
+
+    command.arg("-p");
+
     command.arg(format_message(
         &user_params.message,
         user_params.thinking_level,

crates/but-claude/src/lib.rs

@@ -164,4 +164,5 @@ pub struct ClaudeUserParams {
     pub model: ModelType,
     pub permission_mode: PermissionMode,
     pub disabled_mcp_servers: Vec<String>,
+    pub add_dirs: Vec<String>,
 }

crates/but-server/src/lib.rs

@@ -508,6 +508,22 @@ async fn handle_command(
                 Err(e) => Err(e),
             }
         }
+        "claude_verify_path" => {
+            #[derive(Debug, Deserialize)]
+            #[serde(rename_all = "camelCase")]
+            pub struct Params {
+                pub project_id: ProjectId,
+                pub path: String,
+            }
+            let params = serde_json::from_value::<Params>(request.params).to_error();
+            match params {
+                Ok(params) => {
+                    let result = claude::claude_verify_path(params.project_id, params.path).await;
+                    result.map(|r| json!(r))
+                }
+                Err(e) => Err(e),
+            }
+        }
 
         _ => Err(anyhow::anyhow!("Command {} not found!", command).into()),
     };

crates/gitbutler-tauri/src/claude.rs

@@ -23,6 +23,7 @@ pub async fn claude_send_message(
     model: ModelType,
     permission_mode: PermissionMode,
     disabled_mcp_servers: Vec<String>,
+    add_dirs: Vec<String>,
 ) -> Result<(), Error> {
     claude::claude_send_message(
         &app,
@@ -35,6 +36,7 @@ pub async fn claude_send_message(
                 model,
                 permission_mode,
                 disabled_mcp_servers,
+                add_dirs,
             },
         },
     )

crates/gitbutler-tauri/src/main.rs

@@ -358,7 +358,8 @@ fn main() {
                     but_api::claude::claude_write_prompt_templates,
                     but_api::claude::claude_get_prompt_templates_path,
                     but_api::claude::claude_get_mcp_config,
-                    but_api::claude::claude_get_sub_agents
+                    but_api::claude::claude_get_sub_agents,
+                    but_api::claude::claude_verify_path
                 ])
                 .menu(move |handle| menu::build(handle, &app_settings_for_menu))
                 .on_window_event(|window, event| match event {