feat: add OKENA_FOLDER_ID and OKENA_FOLDER_NAME env vars to all hooks

Folder context was missing from hook environment variables. Add folder_id
and folder_name to project_env() and propagate through all fire_* functions.
For worktree projects, falls back to the parent project's folder.

Also includes the missing pty_manager.kill() call on natural terminal exit
to prevent orphaned dtach daemons.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: neumie

crates/okena-terminal/src/pty_manager.rs

@@ -113,7 +113,7 @@ impl PtyManager {
             std::thread::Builder::new()
                 .name("dtach-socket-gc".into())
                 .spawn(|| {
-                    crate::terminal::session_backend::cleanup_stale_dtach_sockets();
+                    crate::session_backend::cleanup_stale_dtach_sockets();
                 })
                 .ok();
         }

crates/okena-views-git/src/close_worktree_dialog.rs

@@ -147,6 +147,9 @@ impl CloseWorktreeDialog {
             .map(|p| p.hooks.clone())
             .unwrap_or_default();
         let global_hooks = self.hooks_config.clone();
+        let folder = ws.folder_for_project_or_parent(&project_id);
+        let folder_id = folder.map(|f| f.id.clone());
+        let folder_name = folder.map(|f| f.name.clone());
         let monitor = hooks::try_monitor(cx);
         let runner = hooks::try_runner(cx);
 
@@ -223,6 +226,8 @@ impl CloseWorktreeDialog {
                     let branch = branch.clone();
                     let default_branch = default_branch.clone();
                     let main_repo_path = main_repo_path.clone();
+                    let folder_id = folder_id.clone();
+                    let folder_name = folder_name.clone();
                     let monitor = monitor.clone();
                     move || {
                         // Sync hooks run headlessly (no PTY) — they block the flow
@@ -236,6 +241,8 @@ impl CloseWorktreeDialog {
                             &branch,
                             &default_branch,
                             &main_repo_path,
+                            folder_id.as_deref(),
+                            folder_name.as_deref(),
                             monitor.as_ref(),
                             None,
                         )
@@ -285,6 +292,8 @@ impl CloseWorktreeDialog {
                         &default_branch,
                         &main_repo_path,
                         &e,
+                        folder_id.as_deref(),
+                        folder_name.as_deref(),
                         monitor.as_ref(),
                         runner.as_ref(),
                     );
@@ -351,6 +360,8 @@ impl CloseWorktreeDialog {
                     &branch,
                     &default_branch,
                     &main_repo_path,
+                    folder_id.as_deref(),
+                    folder_name.as_deref(),
                     monitor.as_ref(),
                     runner.as_ref(),
                 );
@@ -429,6 +440,8 @@ impl CloseWorktreeDialog {
                         &project_path,
                         &branch,
                         &main_repo_path,
+                        folder_id.as_deref(),
+                        folder_name.as_deref(),
                         monitor.as_ref(),
                         runner.as_ref(),
                     );
@@ -465,6 +478,8 @@ impl CloseWorktreeDialog {
                         let project_path = project_path.clone();
                         let branch = branch.clone();
                         let main_repo_path = main_repo_path.clone();
+                        let folder_id = folder_id.clone();
+                        let folder_name = folder_name.clone();
                         let monitor = monitor.clone();
                         move || {
                             hooks::fire_before_worktree_remove(
@@ -475,6 +490,8 @@ impl CloseWorktreeDialog {
                                 &project_path,
                                 &branch,
                                 &main_repo_path,
+                                folder_id.as_deref(),
+                                folder_name.as_deref(),
                                 monitor.as_ref(),
                                 None,
                             )
@@ -504,6 +521,8 @@ impl CloseWorktreeDialog {
                         &project_name,
                         &project_path,
                         &branch,
+                        folder_id.as_deref(),
+                        folder_name.as_deref(),
                         monitor.as_ref(),
                         runner.as_ref(),
                     );
@@ -539,6 +558,8 @@ impl CloseWorktreeDialog {
                                 &project_path,
                                 &branch,
                                 &main_repo_path,
+                                folder_id.as_deref(),
+                                folder_name.as_deref(),
                                 monitor.as_ref(),
                                 runner.as_ref(),
                             );

crates/okena-views-terminal/src/layout/terminal_pane/mod.rs

@@ -360,7 +360,7 @@ impl<D: ActionDispatch + Send + Sync> TerminalPane<D> {
         );
 
         // Read fresh path and project info from workspace state
-        let (project_path, project_name, project_hooks, parent_hooks, is_worktree) = {
+        let (project_path, project_name, project_hooks, parent_hooks, is_worktree, folder_id, folder_name) = {
             let project = ws.project(&self.project_id);
             let path = project.map(|p| p.path.clone())
                 .unwrap_or_else(|| self.project_path.clone());
@@ -371,10 +371,13 @@ impl<D: ActionDispatch + Send + Sync> TerminalPane<D> {
                 .and_then(|wt| ws.project(&wt.parent_project_id))
                 .map(|p| p.hooks.clone());
             let is_wt = project.map(|p| p.worktree_info.is_some()).unwrap_or(false);
-            (path, name, hooks_cfg, parent, is_wt)
+            let folder = ws.folder_for_project_or_parent(&self.project_id);
+            let fid = folder.map(|f| f.id.clone());
+            let fname = folder.map(|f| f.name.clone());
+            (path, name, hooks_cfg, parent, is_wt, fid, fname)
         };
 
-        let env = hooks::terminal_hook_env(&self.project_id, &project_name, &project_path, is_worktree);
+        let env = hooks::terminal_hook_env(&self.project_id, &project_name, &project_path, is_worktree, folder_id.as_deref(), folder_name.as_deref());
 
         // Apply shell_wrapper if configured
         let global_hooks = settings.hooks;

crates/okena-workspace/src/actions/project.rs

@@ -82,7 +82,10 @@ impl Workspace {
         self.data.project_order.push(id.clone());
         self.notify_data(cx);
 
-        let hook_results = hooks::fire_on_project_open(&project_hooks, &id, &name, &path, global_hooks, cx);
+        let folder = self.folder_for_project_or_parent(&id);
+        let folder_id = folder.map(|f| f.id.as_str());
+        let folder_name = folder.map(|f| f.name.as_str());
+        let hook_results = hooks::fire_on_project_open(&project_hooks, &id, &name, &path, folder_id, folder_name, global_hooks, cx);
         self.register_hook_results(hook_results, cx);
         id
     }
@@ -172,6 +175,9 @@ impl Workspace {
     /// Delete a project
     pub fn delete_project(&mut self, project_id: &str, global_hooks: &HooksConfig, cx: &mut Context<Self>) {
         // Capture project info before removal for the hook
+        let folder = self.folder_for_project_or_parent(project_id);
+        let hook_folder_id = folder.map(|f| f.id.clone());
+        let hook_folder_name = folder.map(|f| f.name.clone());
         let hook_info = self.project(project_id).map(|p| {
             (p.hooks.clone(), p.id.clone(), p.name.clone(), p.path.clone())
         });
@@ -217,7 +223,7 @@ impl Workspace {
         self.notify_data(cx);
 
         if let Some((project_hooks, id, name, path)) = hook_info {
-            hooks::fire_on_project_close(&project_hooks, &id, &name, &path, global_hooks, cx);
+            hooks::fire_on_project_close(&project_hooks, &id, &name, &path, hook_folder_id.as_deref(), hook_folder_name.as_deref(), global_hooks, cx);
         }
     }
 
@@ -433,12 +439,17 @@ impl Workspace {
         self.notify_data(cx);
 
         if fire_hooks {
+            let folder = self.folder_for_project_or_parent(&id);
+            let folder_id = folder.map(|f| f.id.as_str());
+            let folder_name = folder.map(|f| f.name.as_str());
             let hook_results = hooks::fire_on_worktree_create(
                 &new_project_hooks,
                 &id,
                 &new_project_name,
                 project_path,
                 branch,
+                folder_id,
+                folder_name,
                 global_hooks,
                 cx,
             );
@@ -471,12 +482,17 @@ impl Workspace {
             }
         }
 
+        let folder = self.folder_for_project_or_parent(project_id);
+        let folder_id = folder.map(|f| f.id.as_str());
+        let folder_name = folder.map(|f| f.name.as_str());
         let hook_results = hooks::fire_on_worktree_create(
             &hooks_config,
             project_id,
             &name,
             &path,
             &branch,
+            folder_id,
+            folder_name,
             global_hooks,
             cx,
         );
@@ -602,6 +618,9 @@ impl Workspace {
         }
 
         // Capture info before removal for the hook
+        let folder = self.folder_for_project_or_parent(project_id);
+        let hook_folder_id = folder.map(|f| f.id.clone());
+        let hook_folder_name = folder.map(|f| f.name.clone());
         let project_hooks = project.hooks.clone();
         let project_name = project.name.clone();
         let project_path = project.path.clone();
@@ -619,7 +638,7 @@ impl Workspace {
         self.delete_project(project_id, global_hooks, cx);
 
         // Fire worktree-specific hook (runs headlessly since project is deleted)
-        hooks::fire_on_worktree_close(&project_hooks, project_id, &project_name, &project_path, &branch, global_hooks, cx);
+        hooks::fire_on_worktree_close(&project_hooks, project_id, &project_name, &project_path, &branch, hook_folder_id.as_deref(), hook_folder_name.as_deref(), global_hooks, cx);
 
         Ok(())
     }