diff --git a/crates/db/.sqlx/query-72509d252c39fce77520aa816cb2acbc1fb35dc2605e7be893610599b2427f2e.json b/crates/db/.sqlx/query-283a8ef6493346c9ee3bf649e977849eb361d801cdfc8180a8f082269a6bd649.json
similarity index 69%
rename from crates/db/.sqlx/query-72509d252c39fce77520aa816cb2acbc1fb35dc2605e7be893610599b2427f2e.json
rename to crates/db/.sqlx/query-283a8ef6493346c9ee3bf649e977849eb361d801cdfc8180a8f082269a6bd649.json
index d68bd414..e3fc3b31 100644
--- a/crates/db/.sqlx/query-72509d252c39fce77520aa816cb2acbc1fb35dc2605e7be893610599b2427f2e.json
+++ b/crates/db/.sqlx/query-283a8ef6493346c9ee3bf649e977849eb361d801cdfc8180a8f082269a6bd649.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "UPDATE projects SET name = $2, git_repo_path = $3, setup_script = $4, dev_script = $5, cleanup_script = $6 WHERE id = $1 RETURNING id as \"id!: Uuid\", name, git_repo_path, setup_script, dev_script, cleanup_script, created_at as \"created_at!: DateTime<Utc>\", updated_at as \"updated_at!: DateTime<Utc>\"",
+  "query": "UPDATE projects SET name = $2, git_repo_path = $3, setup_script = $4, dev_script = $5, cleanup_script = $6, copy_files = $7 WHERE id = $1 RETURNING id as \"id!: Uuid\", name, git_repo_path, setup_script, dev_script, cleanup_script, copy_files, created_at as \"created_at!: DateTime<Utc>\", updated_at as \"updated_at!: DateTime<Utc>\"",
   "describe": {
     "columns": [
       {
@@ -34,18 +34,23 @@
         "type_info": "Text"
       },
       {
-        "name": "created_at!: DateTime<Utc>",
+        "name": "copy_files",
         "ordinal": 6,
         "type_info": "Text"
       },
       {
-        "name": "updated_at!: DateTime<Utc>",
+        "name": "created_at!: DateTime<Utc>",
         "ordinal": 7,
         "type_info": "Text"
+      },
+      {
+        "name": "updated_at!: DateTime<Utc>",
+        "ordinal": 8,
+        "type_info": "Text"
       }
     ],
     "parameters": {
-      "Right": 6
+      "Right": 7
     },
     "nullable": [
       true,
@@ -54,9 +59,10 @@
       true,
       true,
       true,
+      true,
       false,
       false
     ]
   },
-  "hash": "72509d252c39fce77520aa816cb2acbc1fb35dc2605e7be893610599b2427f2e"
+  "hash": "283a8ef6493346c9ee3bf649e977849eb361d801cdfc8180a8f082269a6bd649"
 }
diff --git a/crates/db/.sqlx/query-90fd607fcb2dca72239ff25e618e21e174b195991eaa33722cbf5f76da84cfab.json b/crates/db/.sqlx/query-59d178b298ba60d490a9081a40064a5acb06fecbc0b164c0de2fe502d02b13a7.json
similarity index 69%
rename from crates/db/.sqlx/query-90fd607fcb2dca72239ff25e618e21e174b195991eaa33722cbf5f76da84cfab.json
rename to crates/db/.sqlx/query-59d178b298ba60d490a9081a40064a5acb06fecbc0b164c0de2fe502d02b13a7.json
index b06544b5..4b2a935c 100644
--- a/crates/db/.sqlx/query-90fd607fcb2dca72239ff25e618e21e174b195991eaa33722cbf5f76da84cfab.json
+++ b/crates/db/.sqlx/query-59d178b298ba60d490a9081a40064a5acb06fecbc0b164c0de2fe502d02b13a7.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "INSERT INTO projects (id, name, git_repo_path, setup_script, dev_script, cleanup_script) VALUES ($1, $2, $3, $4, $5, $6) RETURNING id as \"id!: Uuid\", name, git_repo_path, setup_script, dev_script, cleanup_script, created_at as \"created_at!: DateTime<Utc>\", updated_at as \"updated_at!: DateTime<Utc>\"",
+  "query": "INSERT INTO projects (id, name, git_repo_path, setup_script, dev_script, cleanup_script, copy_files) VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING id as \"id!: Uuid\", name, git_repo_path, setup_script, dev_script, cleanup_script, copy_files, created_at as \"created_at!: DateTime<Utc>\", updated_at as \"updated_at!: DateTime<Utc>\"",
   "describe": {
     "columns": [
       {
@@ -34,18 +34,23 @@
         "type_info": "Text"
       },
       {
-        "name": "created_at!: DateTime<Utc>",
+        "name": "copy_files",
         "ordinal": 6,
         "type_info": "Text"
       },
       {
-        "name": "updated_at!: DateTime<Utc>",
+        "name": "created_at!: DateTime<Utc>",
         "ordinal": 7,
         "type_info": "Text"
+      },
+      {
+        "name": "updated_at!: DateTime<Utc>",
+        "ordinal": 8,
+        "type_info": "Text"
       }
     ],
     "parameters": {
-      "Right": 6
+      "Right": 7
     },
     "nullable": [
       true,
@@ -54,9 +59,10 @@
       true,
       true,
       true,
+      true,
       false,
       false
     ]
   },
-  "hash": "90fd607fcb2dca72239ff25e618e21e174b195991eaa33722cbf5f76da84cfab"
+  "hash": "59d178b298ba60d490a9081a40064a5acb06fecbc0b164c0de2fe502d02b13a7"
 }
diff --git a/crates/db/.sqlx/query-3d0a1cabf2a52e9d90cdfd29c509ca89aeb448d0c1d2446c65cd43db40735e86.json b/crates/db/.sqlx/query-71c7befa63391ca211eb69036ff0e4aabe92932fd8bb7ba8c52b2ae8bf411ac8.json
similarity index 75%
rename from crates/db/.sqlx/query-3d0a1cabf2a52e9d90cdfd29c509ca89aeb448d0c1d2446c65cd43db40735e86.json
rename to crates/db/.sqlx/query-71c7befa63391ca211eb69036ff0e4aabe92932fd8bb7ba8c52b2ae8bf411ac8.json
index 1ca98c41..6dec9ab5 100644
--- a/crates/db/.sqlx/query-3d0a1cabf2a52e9d90cdfd29c509ca89aeb448d0c1d2446c65cd43db40735e86.json
+++ b/crates/db/.sqlx/query-71c7befa63391ca211eb69036ff0e4aabe92932fd8bb7ba8c52b2ae8bf411ac8.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT id as \"id!: Uuid\", name, git_repo_path, setup_script, dev_script, cleanup_script, created_at as \"created_at!: DateTime<Utc>\", updated_at as \"updated_at!: DateTime<Utc>\" FROM projects WHERE id = $1",
+  "query": "SELECT id as \"id!: Uuid\", name, git_repo_path, setup_script, dev_script, cleanup_script, copy_files, created_at as \"created_at!: DateTime<Utc>\", updated_at as \"updated_at!: DateTime<Utc>\" FROM projects WHERE git_repo_path = $1",
   "describe": {
     "columns": [
       {
@@ -34,14 +34,19 @@
         "type_info": "Text"
       },
       {
-        "name": "created_at!: DateTime<Utc>",
+        "name": "copy_files",
         "ordinal": 6,
         "type_info": "Text"
       },
       {
-        "name": "updated_at!: DateTime<Utc>",
+        "name": "created_at!: DateTime<Utc>",
         "ordinal": 7,
         "type_info": "Text"
+      },
+      {
+        "name": "updated_at!: DateTime<Utc>",
+        "ordinal": 8,
+        "type_info": "Text"
       }
     ],
     "parameters": {
@@ -54,9 +59,10 @@
       true,
       true,
       true,
+      true,
       false,
       false
     ]
   },
-  "hash": "3d0a1cabf2a52e9d90cdfd29c509ca89aeb448d0c1d2446c65cd43db40735e86"
+  "hash": "71c7befa63391ca211eb69036ff0e4aabe92932fd8bb7ba8c52b2ae8bf411ac8"
 }
diff --git a/crates/db/.sqlx/query-b2b2c6b4d0b1a347b5c4cb63c3a46a265d4db53be9554989a814b069d0af82f2.json b/crates/db/.sqlx/query-72769cc30de13bb250687b26609ee95660cb4b716615406ecb6f45c4562c3f97.json
similarity index 75%
rename from crates/db/.sqlx/query-b2b2c6b4d0b1a347b5c4cb63c3a46a265d4db53be9554989a814b069d0af82f2.json
rename to crates/db/.sqlx/query-72769cc30de13bb250687b26609ee95660cb4b716615406ecb6f45c4562c3f97.json
index 84cbfd22..32a0cbca 100644
--- a/crates/db/.sqlx/query-b2b2c6b4d0b1a347b5c4cb63c3a46a265d4db53be9554989a814b069d0af82f2.json
+++ b/crates/db/.sqlx/query-72769cc30de13bb250687b26609ee95660cb4b716615406ecb6f45c4562c3f97.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT id as \"id!: Uuid\", name, git_repo_path, setup_script, dev_script, cleanup_script, created_at as \"created_at!: DateTime<Utc>\", updated_at as \"updated_at!: DateTime<Utc>\" FROM projects ORDER BY created_at DESC",
+  "query": "SELECT id as \"id!: Uuid\", name, git_repo_path, setup_script, dev_script, cleanup_script, copy_files, created_at as \"created_at!: DateTime<Utc>\", updated_at as \"updated_at!: DateTime<Utc>\" FROM projects ORDER BY created_at DESC",
   "describe": {
     "columns": [
       {
@@ -34,14 +34,19 @@
         "type_info": "Text"
       },
       {
-        "name": "created_at!: DateTime<Utc>",
+        "name": "copy_files",
         "ordinal": 6,
         "type_info": "Text"
       },
       {
-        "name": "updated_at!: DateTime<Utc>",
+        "name": "created_at!: DateTime<Utc>",
         "ordinal": 7,
         "type_info": "Text"
+      },
+      {
+        "name": "updated_at!: DateTime<Utc>",
+        "ordinal": 8,
+        "type_info": "Text"
       }
     ],
     "parameters": {
@@ -54,9 +59,10 @@
       true,
       true,
       true,
+      true,
       false,
       false
     ]
   },
-  "hash": "b2b2c6b4d0b1a347b5c4cb63c3a46a265d4db53be9554989a814b069d0af82f2"
+  "hash": "72769cc30de13bb250687b26609ee95660cb4b716615406ecb6f45c4562c3f97"
 }
diff --git a/crates/db/.sqlx/query-3a5b3c98a55ca183ab20c74708e3d7e579dda37972c059e7515c4ceee4bd8dd3.json b/crates/db/.sqlx/query-821192d8d8a8fba8ce0f144a32e7e500aaa2b6e527b7e7f082a1c73b1f9f9eb8.json
similarity index 75%
rename from crates/db/.sqlx/query-3a5b3c98a55ca183ab20c74708e3d7e579dda37972c059e7515c4ceee4bd8dd3.json
rename to crates/db/.sqlx/query-821192d8d8a8fba8ce0f144a32e7e500aaa2b6e527b7e7f082a1c73b1f9f9eb8.json
index a0dfb371..d3b1aad8 100644
--- a/crates/db/.sqlx/query-3a5b3c98a55ca183ab20c74708e3d7e579dda37972c059e7515c4ceee4bd8dd3.json
+++ b/crates/db/.sqlx/query-821192d8d8a8fba8ce0f144a32e7e500aaa2b6e527b7e7f082a1c73b1f9f9eb8.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT id as \"id!: Uuid\", name, git_repo_path, setup_script, dev_script, cleanup_script, created_at as \"created_at!: DateTime<Utc>\", updated_at as \"updated_at!: DateTime<Utc>\" FROM projects WHERE git_repo_path = $1",
+  "query": "SELECT id as \"id!: Uuid\", name, git_repo_path, setup_script, dev_script, cleanup_script, copy_files, created_at as \"created_at!: DateTime<Utc>\", updated_at as \"updated_at!: DateTime<Utc>\" FROM projects WHERE id = $1",
   "describe": {
     "columns": [
       {
@@ -34,14 +34,19 @@
         "type_info": "Text"
       },
       {
-        "name": "created_at!: DateTime<Utc>",
+        "name": "copy_files",
         "ordinal": 6,
         "type_info": "Text"
       },
       {
-        "name": "updated_at!: DateTime<Utc>",
+        "name": "created_at!: DateTime<Utc>",
         "ordinal": 7,
         "type_info": "Text"
+      },
+      {
+        "name": "updated_at!: DateTime<Utc>",
+        "ordinal": 8,
+        "type_info": "Text"
       }
     ],
     "parameters": {
@@ -54,9 +59,10 @@
       true,
       true,
       true,
+      true,
       false,
       false
     ]
   },
-  "hash": "3a5b3c98a55ca183ab20c74708e3d7e579dda37972c059e7515c4ceee4bd8dd3"
+  "hash": "821192d8d8a8fba8ce0f144a32e7e500aaa2b6e527b7e7f082a1c73b1f9f9eb8"
 }
diff --git a/crates/db/.sqlx/query-6ecfa16d0cf825aacf233544b5baf151e9adfdca26c226ad71020d291fd802d5.json b/crates/db/.sqlx/query-b95cb59154da69213dea2ded3646d2df2f68293be211cc4f9db0582ea691efee.json
similarity index 74%
rename from crates/db/.sqlx/query-6ecfa16d0cf825aacf233544b5baf151e9adfdca26c226ad71020d291fd802d5.json
rename to crates/db/.sqlx/query-b95cb59154da69213dea2ded3646d2df2f68293be211cc4f9db0582ea691efee.json
index 329e4f71..689763bd 100644
--- a/crates/db/.sqlx/query-6ecfa16d0cf825aacf233544b5baf151e9adfdca26c226ad71020d291fd802d5.json
+++ b/crates/db/.sqlx/query-b95cb59154da69213dea2ded3646d2df2f68293be211cc4f9db0582ea691efee.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT id as \"id!: Uuid\", name, git_repo_path, setup_script, dev_script, cleanup_script, created_at as \"created_at!: DateTime<Utc>\", updated_at as \"updated_at!: DateTime<Utc>\" FROM projects WHERE git_repo_path = $1 AND id != $2",
+  "query": "SELECT id as \"id!: Uuid\", name, git_repo_path, setup_script, dev_script, cleanup_script, copy_files, created_at as \"created_at!: DateTime<Utc>\", updated_at as \"updated_at!: DateTime<Utc>\" FROM projects WHERE git_repo_path = $1 AND id != $2",
   "describe": {
     "columns": [
       {
@@ -34,14 +34,19 @@
         "type_info": "Text"
       },
       {
-        "name": "created_at!: DateTime<Utc>",
+        "name": "copy_files",
         "ordinal": 6,
         "type_info": "Text"
       },
       {
-        "name": "updated_at!: DateTime<Utc>",
+        "name": "created_at!: DateTime<Utc>",
         "ordinal": 7,
         "type_info": "Text"
+      },
+      {
+        "name": "updated_at!: DateTime<Utc>",
+        "ordinal": 8,
+        "type_info": "Text"
       }
     ],
     "parameters": {
@@ -54,9 +59,10 @@
       true,
       true,
       true,
+      true,
       false,
       false
     ]
   },
-  "hash": "6ecfa16d0cf825aacf233544b5baf151e9adfdca26c226ad71020d291fd802d5"
+  "hash": "b95cb59154da69213dea2ded3646d2df2f68293be211cc4f9db0582ea691efee"
 }
diff --git a/crates/db/migrations/20250811000000_add_copy_files_to_projects.sql b/crates/db/migrations/20250811000000_add_copy_files_to_projects.sql
new file mode 100644
index 00000000..09ae996d
--- /dev/null
+++ b/crates/db/migrations/20250811000000_add_copy_files_to_projects.sql
@@ -0,0 +1,3 @@
+-- Add copy_files column to projects table
+-- This field stores comma-separated file paths to copy from the original project directory to the worktree
+ALTER TABLE projects ADD COLUMN copy_files TEXT;
\ No newline at end of file
diff --git a/crates/db/src/models/project.rs b/crates/db/src/models/project.rs
index 35d4db09..1fc44e40 100644
--- a/crates/db/src/models/project.rs
+++ b/crates/db/src/models/project.rs
@@ -29,6 +29,7 @@ pub struct Project {
     pub setup_script: Option<String>,
     pub dev_script: Option<String>,
     pub cleanup_script: Option<String>,
+    pub copy_files: Option<String>,
 
     #[ts(type = "Date")]
     pub created_at: DateTime<Utc>,
@@ -44,6 +45,7 @@ pub struct CreateProject {
     pub setup_script: Option<String>,
     pub dev_script: Option<String>,
     pub cleanup_script: Option<String>,
+    pub copy_files: Option<String>,
 }
 
 #[derive(Debug, Deserialize, TS)]
@@ -53,6 +55,7 @@ pub struct UpdateProject {
     pub setup_script: Option<String>,
     pub dev_script: Option<String>,
     pub cleanup_script: Option<String>,
+    pub copy_files: Option<String>,
 }
 
 #[derive(Debug, Serialize, TS)]
@@ -63,6 +66,7 @@ pub struct ProjectWithBranch {
     pub setup_script: Option<String>,
     pub dev_script: Option<String>,
     pub cleanup_script: Option<String>,
+    pub copy_files: Option<String>,
     pub current_branch: Option<String>,
 
     #[ts(type = "Date")]
@@ -80,6 +84,7 @@ impl ProjectWithBranch {
             setup_script: project.setup_script,
             dev_script: project.dev_script,
             cleanup_script: project.cleanup_script,
+            copy_files: project.copy_files,
             current_branch,
             created_at: project.created_at,
             updated_at: project.updated_at,
@@ -105,7 +110,7 @@ impl Project {
     pub async fn find_all(pool: &SqlitePool) -> Result<Vec<Self>, sqlx::Error> {
         sqlx::query_as!(
             Project,
-            r#"SELECT id as "id!: Uuid", name, git_repo_path, setup_script, dev_script, cleanup_script, created_at as "created_at!: DateTime<Utc>", updated_at as "updated_at!: DateTime<Utc>" FROM projects ORDER BY created_at DESC"#
+            r#"SELECT id as "id!: Uuid", name, git_repo_path, setup_script, dev_script, cleanup_script, copy_files, created_at as "created_at!: DateTime<Utc>", updated_at as "updated_at!: DateTime<Utc>" FROM projects ORDER BY created_at DESC"#
         )
         .fetch_all(pool)
         .await
@@ -114,7 +119,7 @@ impl Project {
     pub async fn find_by_id(pool: &SqlitePool, id: Uuid) -> Result<Option<Self>, sqlx::Error> {
         sqlx::query_as!(
             Project,
-            r#"SELECT id as "id!: Uuid", name, git_repo_path, setup_script, dev_script, cleanup_script, created_at as "created_at!: DateTime<Utc>", updated_at as "updated_at!: DateTime<Utc>" FROM projects WHERE id = $1"#,
+            r#"SELECT id as "id!: Uuid", name, git_repo_path, setup_script, dev_script, cleanup_script, copy_files, created_at as "created_at!: DateTime<Utc>", updated_at as "updated_at!: DateTime<Utc>" FROM projects WHERE id = $1"#,
             id
         )
         .fetch_optional(pool)
@@ -127,7 +132,7 @@ impl Project {
     ) -> Result<Option<Self>, sqlx::Error> {
         sqlx::query_as!(
             Project,
-            r#"SELECT id as "id!: Uuid", name, git_repo_path, setup_script, dev_script, cleanup_script, created_at as "created_at!: DateTime<Utc>", updated_at as "updated_at!: DateTime<Utc>" FROM projects WHERE git_repo_path = $1"#,
+            r#"SELECT id as "id!: Uuid", name, git_repo_path, setup_script, dev_script, cleanup_script, copy_files, created_at as "created_at!: DateTime<Utc>", updated_at as "updated_at!: DateTime<Utc>" FROM projects WHERE git_repo_path = $1"#,
             git_repo_path
         )
         .fetch_optional(pool)
@@ -141,7 +146,7 @@ impl Project {
     ) -> Result<Option<Self>, sqlx::Error> {
         sqlx::query_as!(
             Project,
-            r#"SELECT id as "id!: Uuid", name, git_repo_path, setup_script, dev_script, cleanup_script, created_at as "created_at!: DateTime<Utc>", updated_at as "updated_at!: DateTime<Utc>" FROM projects WHERE git_repo_path = $1 AND id != $2"#,
+            r#"SELECT id as "id!: Uuid", name, git_repo_path, setup_script, dev_script, cleanup_script, copy_files, created_at as "created_at!: DateTime<Utc>", updated_at as "updated_at!: DateTime<Utc>" FROM projects WHERE git_repo_path = $1 AND id != $2"#,
             git_repo_path,
             exclude_id
         )
@@ -156,13 +161,14 @@ impl Project {
     ) -> Result<Self, sqlx::Error> {
         sqlx::query_as!(
             Project,
-            r#"INSERT INTO projects (id, name, git_repo_path, setup_script, dev_script, cleanup_script) VALUES ($1, $2, $3, $4, $5, $6) RETURNING id as "id!: Uuid", name, git_repo_path, setup_script, dev_script, cleanup_script, created_at as "created_at!: DateTime<Utc>", updated_at as "updated_at!: DateTime<Utc>""#,
+            r#"INSERT INTO projects (id, name, git_repo_path, setup_script, dev_script, cleanup_script, copy_files) VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING id as "id!: Uuid", name, git_repo_path, setup_script, dev_script, cleanup_script, copy_files, created_at as "created_at!: DateTime<Utc>", updated_at as "updated_at!: DateTime<Utc>""#,
             project_id,
             data.name,
             data.git_repo_path,
             data.setup_script,
             data.dev_script,
-            data.cleanup_script
+            data.cleanup_script,
+            data.copy_files
         )
         .fetch_one(pool)
         .await
@@ -176,16 +182,18 @@ impl Project {
         setup_script: Option<String>,
         dev_script: Option<String>,
         cleanup_script: Option<String>,
+        copy_files: Option<String>,
     ) -> Result<Self, sqlx::Error> {
         sqlx::query_as!(
             Project,
-            r#"UPDATE projects SET name = $2, git_repo_path = $3, setup_script = $4, dev_script = $5, cleanup_script = $6 WHERE id = $1 RETURNING id as "id!: Uuid", name, git_repo_path, setup_script, dev_script, cleanup_script, created_at as "created_at!: DateTime<Utc>", updated_at as "updated_at!: DateTime<Utc>""#,
+            r#"UPDATE projects SET name = $2, git_repo_path = $3, setup_script = $4, dev_script = $5, cleanup_script = $6, copy_files = $7 WHERE id = $1 RETURNING id as "id!: Uuid", name, git_repo_path, setup_script, dev_script, cleanup_script, copy_files, created_at as "created_at!: DateTime<Utc>", updated_at as "updated_at!: DateTime<Utc>""#,
             id,
             name,
             git_repo_path,
             setup_script,
             dev_script,
-            cleanup_script
+            cleanup_script,
+            copy_files
         )
         .fetch_one(pool)
         .await
diff --git a/crates/local-deployment/src/container.rs b/crates/local-deployment/src/container.rs
index 33ad280c..d30f4f54 100644
--- a/crates/local-deployment/src/container.rs
+++ b/crates/local-deployment/src/container.rs
@@ -671,6 +671,17 @@ impl ContainerService for LocalContainerService {
         )
         .await?;
 
+        // Copy files specified in the project's copy_files field
+        if let Some(copy_files) = &project.copy_files
+            && !copy_files.trim().is_empty()
+        {
+            self.copy_project_files(&project.git_repo_path, &worktree_path, copy_files)
+                .await
+                .unwrap_or_else(|e| {
+                    tracing::warn!("Failed to copy project files: {}", e);
+                });
+        }
+
         // Update both container_ref and branch in the database
         TaskAttempt::update_container_ref(
             &self.db.pool,
@@ -933,4 +944,51 @@ impl ContainerService for LocalContainerService {
 
         Ok(self.git().commit(Path::new(container_ref), &message)?)
     }
+
+    /// Copy files from the original project directory to the worktree
+    async fn copy_project_files(
+        &self,
+        source_dir: &PathBuf,
+        target_dir: &PathBuf,
+        copy_files: &str,
+    ) -> Result<(), ContainerError> {
+        let files: Vec<&str> = copy_files
+            .split(',')
+            .map(|s| s.trim())
+            .filter(|s| !s.is_empty())
+            .collect();
+
+        for file_path in files {
+            let source_file = source_dir.join(file_path);
+            let target_file = target_dir.join(file_path);
+
+            // Create parent directories if needed
+            if let Some(parent) = target_file.parent()
+                && !parent.exists()
+            {
+                std::fs::create_dir_all(parent).map_err(|e| {
+                    ContainerError::Other(anyhow!("Failed to create directory {:?}: {}", parent, e))
+                })?;
+            }
+
+            // Copy the file
+            if source_file.exists() {
+                std::fs::copy(&source_file, &target_file).map_err(|e| {
+                    ContainerError::Other(anyhow!(
+                        "Failed to copy file {:?} to {:?}: {}",
+                        source_file,
+                        target_file,
+                        e
+                    ))
+                })?;
+                tracing::info!("Copied file {:?} to worktree", file_path);
+            } else {
+                return Err(ContainerError::Other(anyhow!(
+                    "File {:?} does not exist in the project directory",
+                    source_file
+                )));
+            }
+        }
+        Ok(())
+    }
 }
diff --git a/crates/server/src/routes/projects.rs b/crates/server/src/routes/projects.rs
index 8ca9353e..a36565e3 100644
--- a/crates/server/src/routes/projects.rs
+++ b/crates/server/src/routes/projects.rs
@@ -181,6 +181,7 @@ pub async fn update_project(
         setup_script,
         dev_script,
         cleanup_script,
+        copy_files,
     } = payload;
 
     let name = name.unwrap_or(existing_project.name);
@@ -195,6 +196,7 @@ pub async fn update_project(
         setup_script,
         dev_script,
         cleanup_script,
+        copy_files,
     )
     .await
     {
diff --git a/crates/services/src/services/container.rs b/crates/services/src/services/container.rs
index b8ecd775..d9610a16 100644
--- a/crates/services/src/services/container.rs
+++ b/crates/services/src/services/container.rs
@@ -123,6 +123,13 @@ pub trait ContainerService {
 
     async fn try_commit_changes(&self, ctx: &ExecutionContext) -> Result<(), ContainerError>;
 
+    async fn copy_project_files(
+        &self,
+        source_dir: &PathBuf,
+        target_dir: &PathBuf,
+        copy_files: &str,
+    ) -> Result<(), ContainerError>;
+
     async fn get_diff(
         &self,
         task_attempt: &TaskAttempt,
diff --git a/frontend/src/components/projects/copy-files-field.tsx b/frontend/src/components/projects/copy-files-field.tsx
new file mode 100644
index 00000000..8451263a
--- /dev/null
+++ b/frontend/src/components/projects/copy-files-field.tsx
@@ -0,0 +1,43 @@
+import { MultiFileSearchTextarea } from '@/components/ui/multi-file-search-textarea';
+
+interface CopyFilesFieldProps {
+  value: string;
+  onChange: (value: string) => void;
+  projectId?: string;
+  disabled?: boolean;
+}
+
+export function CopyFilesField({
+  value,
+  onChange,
+  projectId,
+  disabled = false,
+}: CopyFilesFieldProps) {
+  if (projectId) {
+    // Editing existing project - use file search
+    return (
+      <MultiFileSearchTextarea
+        value={value}
+        onChange={onChange}
+        placeholder="Start typing a file path... (.env, config.local.json, .local/settings.yml)"
+        rows={3}
+        disabled={disabled}
+        className="w-full px-3 py-2 border border-input bg-background text-foreground rounded-md resize-vertical focus:outline-none focus:ring-2 focus:ring-ring"
+        projectId={projectId}
+        maxRows={6}
+      />
+    );
+  }
+
+  // Creating new project - fall back to plain textarea
+  return (
+    <textarea
+      value={value}
+      onChange={(e) => onChange(e.target.value)}
+      placeholder=".env,config.local.json,.local/settings.yml"
+      rows={3}
+      disabled={disabled}
+      className="w-full px-3 py-2 border border-input bg-background text-foreground rounded-md resize-vertical focus:outline-none focus:ring-2 focus:ring-ring"
+    />
+  );
+}
diff --git a/frontend/src/components/projects/project-form-fields.tsx b/frontend/src/components/projects/project-form-fields.tsx
index db5d7ea4..9443dca1 100644
--- a/frontend/src/components/projects/project-form-fields.tsx
+++ b/frontend/src/components/projects/project-form-fields.tsx
@@ -8,6 +8,7 @@ import {
   ScriptPlaceholderContext,
 } from '@/utils/script-placeholders';
 import { useUserSystem } from '@/components/config-provider';
+import { CopyFilesField } from './copy-files-field';
 
 interface ProjectFormFieldsProps {
   isEditing: boolean;
@@ -28,7 +29,10 @@ interface ProjectFormFieldsProps {
   setDevScript: (script: string) => void;
   cleanupScript: string;
   setCleanupScript: (script: string) => void;
+  copyFiles: string;
+  setCopyFiles: (files: string) => void;
   error: string;
+  projectId?: string;
 }
 
 export function ProjectFormFields({
@@ -50,7 +54,10 @@ export function ProjectFormFields({
   setDevScript,
   cleanupScript,
   setCleanupScript,
+  copyFiles,
+  setCopyFiles,
   error,
+  projectId,
 }: ProjectFormFieldsProps) {
   const { system } = useUserSystem();
 
@@ -246,6 +253,22 @@ export function ProjectFormFields({
         </p>
       </div>
 
+      <div className="space-y-2">
+        <Label htmlFor="copy-files">Copy Files (Optional)</Label>
+        <CopyFilesField
+          value={copyFiles}
+          onChange={setCopyFiles}
+          projectId={projectId}
+        />
+        <p className="text-sm text-muted-foreground">
+          Comma-separated list of files to copy from the original project
+          directory to the worktree. These files will be copied after the
+          worktree is created but before the setup script runs. Useful for
+          environment-specific files like .env, configuration files, and local
+          settings. Make sure these are gitignored or they could get committed!
+        </p>
+      </div>
+
       {error && (
         <Alert variant="destructive">
           <AlertCircle className="h-4 w-4" />
diff --git a/frontend/src/components/projects/project-form.tsx b/frontend/src/components/projects/project-form.tsx
index ae298714..e4e01c21 100644
--- a/frontend/src/components/projects/project-form.tsx
+++ b/frontend/src/components/projects/project-form.tsx
@@ -35,6 +35,7 @@ export function ProjectForm({
   const [cleanupScript, setCleanupScript] = useState(
     project?.cleanup_script ?? ''
   );
+  const [copyFiles, setCopyFiles] = useState(project?.copy_files ?? '');
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState('');
   const [showFolderPicker, setShowFolderPicker] = useState(false);
@@ -52,12 +53,14 @@ export function ProjectForm({
       setSetupScript(project.setup_script ?? '');
       setDevScript(project.dev_script ?? '');
       setCleanupScript(project.cleanup_script ?? '');
+      setCopyFiles(project.copy_files ?? '');
     } else {
       setName('');
       setGitRepoPath('');
       setSetupScript('');
       setDevScript('');
       setCleanupScript('');
+      setCopyFiles('');
     }
   }, [project]);
 
@@ -98,6 +101,7 @@ export function ProjectForm({
           setup_script: setupScript.trim() || null,
           dev_script: devScript.trim() || null,
           cleanup_script: cleanupScript.trim() || null,
+          copy_files: copyFiles.trim() || null,
         };
 
         await projectsApi.update(project.id, updateData);
@@ -135,6 +139,7 @@ export function ProjectForm({
           setup_script: setupScript.trim() || null,
           dev_script: devScript.trim() || null,
           cleanup_script: cleanupScript.trim() || null,
+          copy_files: copyFiles.trim() || null,
         };
 
         await projectsApi.create(createData);
@@ -148,6 +153,7 @@ export function ProjectForm({
       setSetupScript('');
       setDevScript('');
       setCleanupScript('');
+      setCopyFiles('');
       setParentPath('');
       setFolderName('');
     } catch (error) {
@@ -163,11 +169,13 @@ export function ProjectForm({
       setGitRepoPath(project.git_repo_path || '');
       setSetupScript(project.setup_script ?? '');
       setDevScript(project.dev_script ?? '');
+      setCopyFiles(project.copy_files ?? '');
     } else {
       setName('');
       setGitRepoPath('');
       setSetupScript('');
       setDevScript('');
+      setCopyFiles('');
     }
     setParentPath('');
     setFolderName('');
@@ -218,7 +226,10 @@ export function ProjectForm({
                   setDevScript={setDevScript}
                   cleanupScript={cleanupScript}
                   setCleanupScript={setCleanupScript}
+                  copyFiles={copyFiles}
+                  setCopyFiles={setCopyFiles}
                   error={error}
+                  projectId={(project as any)?.id}
                 />
                 <DialogFooter>
                   <Button
@@ -326,7 +337,10 @@ export function ProjectForm({
               setDevScript={setDevScript}
               cleanupScript={cleanupScript}
               setCleanupScript={setCleanupScript}
+              copyFiles={copyFiles}
+              setCopyFiles={setCopyFiles}
               error={error}
+              projectId={(project as any)?.id}
             />
             {/* )} */}
             <DialogFooter>
diff --git a/frontend/src/components/ui/multi-file-search-textarea.tsx b/frontend/src/components/ui/multi-file-search-textarea.tsx
new file mode 100644
index 00000000..da982221
--- /dev/null
+++ b/frontend/src/components/ui/multi-file-search-textarea.tsx
@@ -0,0 +1,370 @@
+import { KeyboardEvent, useEffect, useRef, useState } from 'react';
+import { createPortal } from 'react-dom';
+import { AutoExpandingTextarea } from '@/components/ui/auto-expanding-textarea';
+import { projectsApi } from '@/lib/api';
+
+import type { SearchResult } from 'shared/types';
+
+interface FileSearchResult extends SearchResult {
+  name: string;
+}
+
+interface MultiFileSearchTextareaProps {
+  value: string;
+  onChange: (value: string) => void;
+  placeholder?: string;
+  rows?: number;
+  disabled?: boolean;
+  className?: string;
+  projectId: string;
+  onKeyDown?: (e: React.KeyboardEvent) => void;
+  maxRows?: number;
+}
+
+export function MultiFileSearchTextarea({
+  value,
+  onChange,
+  placeholder = 'Start typing a file path...',
+  rows = 3,
+  disabled = false,
+  className,
+  projectId,
+  onKeyDown,
+  maxRows = 10,
+}: MultiFileSearchTextareaProps) {
+  const [searchQuery, setSearchQuery] = useState('');
+  const [searchResults, setSearchResults] = useState<FileSearchResult[]>([]);
+  const [showDropdown, setShowDropdown] = useState(false);
+  const [selectedIndex, setSelectedIndex] = useState(-1);
+  const [currentTokenStart, setCurrentTokenStart] = useState(-1);
+  const [currentTokenEnd, setCurrentTokenEnd] = useState(-1);
+  const [isLoading, setIsLoading] = useState(false);
+
+  const textareaRef = useRef<HTMLTextAreaElement>(null);
+  const dropdownRef = useRef<HTMLDivElement>(null);
+  const abortControllerRef = useRef<AbortController | null>(null);
+  const searchCacheRef = useRef<Map<string, FileSearchResult[]>>(new Map());
+
+  // Search for files when query changes
+  useEffect(() => {
+    if (!searchQuery || !projectId || searchQuery.length < 2) {
+      setSearchResults([]);
+      setShowDropdown(false);
+      return;
+    }
+
+    // Check cache first
+    const cached = searchCacheRef.current.get(searchQuery);
+    if (cached) {
+      setSearchResults(cached);
+      setShowDropdown(true);
+      setSelectedIndex(-1);
+      return;
+    }
+
+    const searchFiles = async () => {
+      setIsLoading(true);
+
+      // Cancel previous request
+      if (abortControllerRef.current) {
+        abortControllerRef.current.abort();
+      }
+
+      const abortController = new AbortController();
+      abortControllerRef.current = abortController;
+
+      try {
+        const result = await projectsApi.searchFiles(projectId, searchQuery, {
+          signal: abortController.signal,
+        });
+
+        // Only process if this request wasn't aborted
+        if (!abortController.signal.aborted) {
+          const fileResults: FileSearchResult[] = result.map((item) => ({
+            ...item,
+            name: item.path.split('/').pop() || item.path,
+          }));
+
+          // Cache the results
+          searchCacheRef.current.set(searchQuery, fileResults);
+
+          setSearchResults(fileResults);
+          setShowDropdown(true);
+          setSelectedIndex(-1);
+        }
+      } catch (error) {
+        if (!abortController.signal.aborted) {
+          console.error('Failed to search files:', error);
+        }
+      } finally {
+        if (!abortController.signal.aborted) {
+          setIsLoading(false);
+        }
+      }
+    };
+
+    const debounceTimer = setTimeout(searchFiles, 350);
+    return () => {
+      clearTimeout(debounceTimer);
+      if (abortControllerRef.current) {
+        abortControllerRef.current.abort();
+      }
+    };
+  }, [searchQuery, projectId]);
+
+  // Find current token boundaries based on cursor position
+  const findCurrentToken = (text: string, cursorPosition: number) => {
+    const textBefore = text.slice(0, cursorPosition);
+    const textAfter = text.slice(cursorPosition);
+
+    // Find the last separator (comma or newline) before cursor
+    const lastSeparatorIndex = Math.max(
+      textBefore.lastIndexOf(','),
+      textBefore.lastIndexOf('\n')
+    );
+
+    // Find the next separator after cursor
+    const nextSeparatorIndex = Math.min(
+      textAfter.indexOf(',') === -1
+        ? Infinity
+        : textAfter.indexOf(',') + cursorPosition,
+      textAfter.indexOf('\n') === -1
+        ? Infinity
+        : textAfter.indexOf('\n') + cursorPosition
+    );
+
+    const tokenStart = lastSeparatorIndex + 1;
+    const tokenEnd =
+      nextSeparatorIndex === Infinity ? text.length : nextSeparatorIndex;
+    const token = text.slice(tokenStart, tokenEnd).trim();
+
+    return {
+      token,
+      start: tokenStart,
+      end: tokenEnd,
+    };
+  };
+
+  // Handle text changes and detect current token
+  const handleChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+    const newValue = e.target.value;
+    const cursorPosition = e.target.selectionStart || 0;
+
+    onChange(newValue);
+
+    const { token, start, end } = findCurrentToken(newValue, cursorPosition);
+
+    setCurrentTokenStart(start);
+    setCurrentTokenEnd(end);
+
+    // Show search results if token has 2+ characters
+    if (token.length >= 2) {
+      setSearchQuery(token);
+    } else {
+      setSearchQuery('');
+      setShowDropdown(false);
+    }
+  };
+
+  // Handle keyboard navigation
+  const handleKeyDown = (e: KeyboardEvent<HTMLTextAreaElement>) => {
+    // Handle dropdown navigation first
+    if (showDropdown && searchResults.length > 0) {
+      switch (e.key) {
+        case 'ArrowDown':
+          e.preventDefault();
+          setSelectedIndex((prev) =>
+            prev < searchResults.length - 1 ? prev + 1 : 0
+          );
+          return;
+        case 'ArrowUp':
+          e.preventDefault();
+          setSelectedIndex((prev) =>
+            prev > 0 ? prev - 1 : searchResults.length - 1
+          );
+          return;
+        case 'Enter':
+        case 'Tab':
+          if (selectedIndex >= 0) {
+            e.preventDefault();
+            selectFile(searchResults[selectedIndex]);
+            return;
+          }
+          break;
+        case 'Escape':
+          e.preventDefault();
+          setShowDropdown(false);
+          setSearchQuery('');
+          return;
+      }
+    }
+
+    // Call the passed onKeyDown handler
+    onKeyDown?.(e);
+  };
+
+  // Select a file and insert it into the text
+  const selectFile = (file: FileSearchResult) => {
+    if (currentTokenStart === -1) return;
+
+    const before = value.slice(0, currentTokenStart);
+    const after = value.slice(currentTokenEnd);
+
+    // Smart comma handling - add ", " if not at end and next char isn't comma/newline
+    let insertion = file.path;
+    const trimmedAfter = after.trimStart();
+    const needsComma =
+      trimmedAfter.length > 0 &&
+      !trimmedAfter.startsWith(',') &&
+      !trimmedAfter.startsWith('\n');
+
+    if (needsComma || trimmedAfter.length === 0) {
+      insertion += ', ';
+    }
+
+    const newValue =
+      before.trimEnd() + (before.trimEnd() ? ' ' : '') + insertion + after;
+    onChange(newValue);
+
+    setShowDropdown(false);
+    setSearchQuery('');
+
+    // Focus back to textarea and position cursor after insertion
+    setTimeout(() => {
+      if (textareaRef.current) {
+        const newCursorPos =
+          currentTokenStart + (before.trimEnd() ? 1 : 0) + insertion.length;
+        textareaRef.current.focus();
+        textareaRef.current.setSelectionRange(newCursorPos, newCursorPos);
+      }
+    }, 0);
+  };
+
+  // Calculate dropdown position
+  const getDropdownPosition = () => {
+    if (!textareaRef.current) return { top: 0, left: 0, maxHeight: 240 };
+
+    const textareaRect = textareaRef.current.getBoundingClientRect();
+    const dropdownWidth = 256;
+    const maxDropdownHeight = 320;
+    const minDropdownHeight = 120;
+
+    let finalTop = textareaRect.bottom + 4;
+    let finalLeft = textareaRect.left;
+    let maxHeight = maxDropdownHeight;
+
+    // Ensure dropdown doesn't go off the right edge
+    if (finalLeft + dropdownWidth > window.innerWidth - 16) {
+      finalLeft = window.innerWidth - dropdownWidth - 16;
+    }
+
+    // Ensure dropdown doesn't go off the left edge
+    if (finalLeft < 16) {
+      finalLeft = 16;
+    }
+
+    // Calculate available space below and above textarea
+    const availableSpaceBelow = window.innerHeight - textareaRect.bottom - 32;
+    const availableSpaceAbove = textareaRect.top - 32;
+
+    // If not enough space below, position above
+    if (
+      availableSpaceBelow < minDropdownHeight &&
+      availableSpaceAbove > availableSpaceBelow
+    ) {
+      const actualHeight =
+        dropdownRef.current?.getBoundingClientRect().height ||
+        minDropdownHeight;
+      finalTop = textareaRect.top - actualHeight - 4;
+      maxHeight = Math.min(
+        maxDropdownHeight,
+        Math.max(availableSpaceAbove, minDropdownHeight)
+      );
+    } else {
+      maxHeight = Math.min(
+        maxDropdownHeight,
+        Math.max(availableSpaceBelow, minDropdownHeight)
+      );
+    }
+
+    return { top: finalTop, left: finalLeft, maxHeight };
+  };
+
+  // Update dropdown position when results change
+  useEffect(() => {
+    if (showDropdown && dropdownRef.current) {
+      setTimeout(() => {
+        const newPosition = getDropdownPosition();
+        if (dropdownRef.current) {
+          dropdownRef.current.style.top = `${newPosition.top}px`;
+          dropdownRef.current.style.left = `${newPosition.left}px`;
+          dropdownRef.current.style.maxHeight = `${newPosition.maxHeight}px`;
+        }
+      }, 0);
+    }
+  }, [searchResults.length, showDropdown]);
+
+  const dropdownPosition = getDropdownPosition();
+
+  return (
+    <div
+      className={`relative ${className?.includes('flex-1') ? 'flex-1' : ''}`}
+    >
+      <AutoExpandingTextarea
+        ref={textareaRef}
+        value={value}
+        onChange={handleChange}
+        onKeyDown={handleKeyDown}
+        placeholder={placeholder}
+        rows={rows}
+        disabled={disabled}
+        className={className}
+        maxRows={maxRows}
+      />
+
+      {showDropdown &&
+        createPortal(
+          <div
+            ref={dropdownRef}
+            className="fixed bg-background border border-border rounded-md shadow-lg overflow-y-auto min-w-64"
+            style={{
+              top: dropdownPosition.top,
+              left: dropdownPosition.left,
+              maxHeight: dropdownPosition.maxHeight,
+              zIndex: 10000,
+            }}
+          >
+            {isLoading ? (
+              <div className="p-2 text-sm text-muted-foreground">
+                Searching...
+              </div>
+            ) : searchResults.length === 0 ? (
+              <div className="p-2 text-sm text-muted-foreground">
+                No files found
+              </div>
+            ) : (
+              <div className="py-1">
+                {searchResults.map((file, index) => (
+                  <div
+                    key={file.path}
+                    className={`px-3 py-2 cursor-pointer text-sm ${
+                      index === selectedIndex
+                        ? 'bg-blue-50 text-blue-900'
+                        : 'hover:bg-muted'
+                    }`}
+                    onClick={() => selectFile(file)}
+                  >
+                    <div className="font-medium truncate">{file.name}</div>
+                    <div className="text-xs text-muted-foreground truncate">
+                      {file.path}
+                    </div>
+                  </div>
+                ))}
+              </div>
+            )}
+          </div>,
+          document.body
+        )}
+    </div>
+  );
+}
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts
index 41d353ed..45f64d89 100644
--- a/frontend/src/lib/api.ts
+++ b/frontend/src/lib/api.ts
@@ -224,9 +224,14 @@ export const projectsApi = {
     return handleApiResponse<GitBranch[]>(response);
   },
 
-  searchFiles: async (id: string, query: string): Promise<SearchResult[]> => {
+  searchFiles: async (
+    id: string,
+    query: string,
+    options?: RequestInit
+  ): Promise<SearchResult[]> => {
     const response = await makeRequest(
-      `/api/projects/${id}/search?q=${encodeURIComponent(query)}`
+      `/api/projects/${id}/search?q=${encodeURIComponent(query)}`,
+      options
     );
     return handleApiResponse<SearchResult[]>(response);
   },
diff --git a/shared/types.ts b/shared/types.ts
index c7115858..b5183c64 100644
--- a/shared/types.ts
+++ b/shared/types.ts
@@ -8,13 +8,13 @@ export type DirectoryEntry = { name: string, path: string, is_directory: boolean
 
 export type DirectoryListResponse = { entries: Array<DirectoryEntry>, current_path: string, };
 
-export type Project = { id: string, name: string, git_repo_path: string, setup_script: string | null, dev_script: string | null, cleanup_script: string | null, created_at: Date, updated_at: Date, };
+export type Project = { id: string, name: string, git_repo_path: string, setup_script: string | null, dev_script: string | null, cleanup_script: string | null, copy_files: string | null, created_at: Date, updated_at: Date, };
 
-export type ProjectWithBranch = { id: string, name: string, git_repo_path: string, setup_script: string | null, dev_script: string | null, cleanup_script: string | null, current_branch: string | null, created_at: Date, updated_at: Date, };
+export type ProjectWithBranch = { id: string, name: string, git_repo_path: string, setup_script: string | null, dev_script: string | null, cleanup_script: string | null, copy_files: string | null, current_branch: string | null, created_at: Date, updated_at: Date, };
 
-export type CreateProject = { name: string, git_repo_path: string, use_existing_repo: boolean, setup_script: string | null, dev_script: string | null, cleanup_script: string | null, };
+export type CreateProject = { name: string, git_repo_path: string, use_existing_repo: boolean, setup_script: string | null, dev_script: string | null, cleanup_script: string | null, copy_files: string | null, };
 
-export type UpdateProject = { name: string | null, git_repo_path: string | null, setup_script: string | null, dev_script: string | null, cleanup_script: string | null, };
+export type UpdateProject = { name: string | null, git_repo_path: string | null, setup_script: string | null, dev_script: string | null, cleanup_script: string | null, copy_files: string | null, };
 
 export type SearchResult = { path: string, is_file: boolean, match_type: SearchMatchType, };