From b6646b6b3ea922365bf8799259ee349742363f3b Mon Sep 17 00:00:00 2001
From: Bohdan Triapitsyn <artmore@protonmail.com>
Date: Wed, 7 Jan 2026 23:00:26 +0200
Subject: [PATCH] feat: enhance worktree session creation with loading screen

---
 package.json                                  | 1 -
 packages/ui/src/lib/worktreeSessionCreator.ts | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 704bb7ff..421560bc 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,6 @@
     "dev:web": "bun run --cwd packages/web build:watch",
     "dev:web:server": "bun run --cwd packages/web dev:server:watch",
     "dev:web:full": "concurrently -n \"api,build\" -c \"cyan,magenta\" \"bun run --cwd packages/web dev:server:watch\" \"bun run --cwd packages/web build:watch\"",
-    "dev": "concurrently -n \"server,web,ui\" -c \"cyan,magenta,yellow\" \"bun run --cwd packages/web dev:server:watch\" \"bun run --cwd packages/web build:watch\" \"bun run --cwd packages/ui dev\"",
     "start:web": "bun run --cwd packages/web start",
     "pack:web": "bun pm pack --cwd packages/web",
     "desktop:start-cli": "node ./packages/desktop/scripts/opencode-cli.mjs start",
diff --git a/packages/ui/src/lib/worktreeSessionCreator.ts b/packages/ui/src/lib/worktreeSessionCreator.ts
index e758f760..695fede6 100644
--- a/packages/ui/src/lib/worktreeSessionCreator.ts
+++ b/packages/ui/src/lib/worktreeSessionCreator.ts
@@ -18,6 +18,7 @@ import {
   runWorktreeSetupCommands,
 } from '@/lib/git/worktreeService';
 import { getWorktreeSetupCommands } from '@/lib/openchamberConfig';
+import { startConfigUpdate, finishConfigUpdate } from '@/lib/configUpdate';
 
 const sanitizeWorktreeSlug = (value: string): string => {
   return value
@@ -67,6 +68,7 @@ export async function createWorktreeSession(): Promise<{ id: string } | null> {
   }
 
   isCreatingWorktreeSession = true;
+  startConfigUpdate("Creating new worktree session...");
 
   try {
     // Get worktree defaults from project settings
@@ -171,6 +173,7 @@ export async function createWorktreeSession(): Promise<{ id: string } | null> {
     });
     return null;
   } finally {
+    finishConfigUpdate();
     isCreatingWorktreeSession = false;
   }
 }