refactor: raise the worktree seam to one lifecycle module; age-guard orphan cleanup#263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tryanks merged 1 commit into from
Aug 24, 2026
Merged

refactor: raise the worktree seam to one lifecycle module; age-guard orphan cleanup #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions crates/runtime/src/app/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,11 +56,11 @@ use tcode_services::acp_registry::{
visible_agents,
};
use tcode_services::export;
#[cfg(test)]
use tcode_services::git::run_git;
use tcode_services::git::{
CheckoutError, MergeWorktreeError, MergeWorktreeOutcome, checkout_if_clean,
cleanup_orphaned_worktrees, commit_diff_context, create_git_worktree, list_git_branches,
merge_worktree_back, perform_action, read_git_branch, read_status, remove_git_worktree,
run_claude_headless, run_git, worktree_path_for,
CheckoutError, checkout_if_clean, commit_diff_context, list_git_branches, perform_action,
read_git_branch, read_status, run_claude_headless,
};
use tcode_services::import::{
ExternalImportUpdate, ExternalRoots, ImportOutcome, existing_external_ids, import_thread,
Expand All@@ -77,6 +77,10 @@ use tcode_services::version_check::{
npm_package, parse_version, tcode_update_available, update_command, update_command_string,
};
use tcode_services::workspace::list_workspace;
use tcode_services::worktree::{
MergeBackError, MergeBackOutcome, ProvisionError, cleanup_orphans, merge_back, provision,
remove as remove_git_worktree,
};

const TITLE_MAX_CHARS: usize = 40;
const TITLE_SOURCE_MAX_CHARS: usize = 4_000;
Expand Down
48 changes: 15 additions & 33 deletions crates/runtime/src/app/orchestrate.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -414,17 +414,19 @@ impl AppState {
meta.cwd = cwd;
meta.worktree = worktree;
let worktree_info = meta.worktree.clone();
let worktree_path =
worktree_info.as_ref().map(|_| meta.cwd.clone());
state
.install_child_session(meta, brief, cx)
.map(|id| (id, worktree_info, warning))
.map(|id| (id, worktree_info, worktree_path, warning))
})
.await
.unwrap_or_else(|_| Err("application closed".to_string()))
.map(|(id, worktree, warning)| {
.map(|(id, worktree, worktree_path, warning)| {
let mut response = serde_json::json!({ "thread_id": id });
if let Some(worktree) = worktree {
response["worktree_path"] = serde_json::json!(
worktree_path_for(&id).display().to_string()
worktree_path.expect("worktree path").display().to_string()
);
response["worktree_branch"] =
serde_json::json!(worktree.branch);
Expand DownExpand Up@@ -1250,43 +1252,23 @@ fn resolve_child_worktree(
cwd: PathBuf,
child_id: &str,
) -> (PathBuf, Option<WorktreeInfo>, Option<String>) {
let repo_root = run_git(&cwd, &["rev-parse", "--show-toplevel"])
.ok()
.map(|root| PathBuf::from(root.trim()))
.and_then(|root| root.canonicalize().ok());
if repo_root.as_ref() != Some(&cwd) {
let warning = format!(
"worktree isolation unavailable: {} is not a Git repository root; using the plain cwd",
cwd.display()
);
log::warn!("orchestrate dispatch: {warning}");
return (cwd, None, Some(warning));
}

let base = run_git(&cwd, &["symbolic-ref", "--quiet", "--short", "HEAD"])
.or_else(|_| run_git(&cwd, &["rev-parse", "HEAD"]))
.map(|base| base.trim().to_string());
let base = match base {
Ok(base) => base,
Err(error) => {
let warning = format!(
"worktree isolation unavailable: could not resolve the base revision ({error}); using the plain cwd"
);
log::warn!("orchestrate dispatch: {warning}");
return (cwd, None, Some(warning));
}
};
let path = worktree_path_for(child_id);
let requested_branch = format!("tcode/{child_id}");
match create_git_worktree(&cwd, &path, &requested_branch, &base) {
match provision(&cwd, child_id) {
Ok(created) => {
let info = WorktreeInfo {
root_project_path: cwd,
base,
base: created.base,
branch: created.branch,
};
(created.path, Some(info), None)
}
Err(ProvisionError::NotRepositoryRoot { path }) => {
let warning = format!(
"worktree isolation unavailable: {} is not a Git repository root; using the plain cwd",
path.display()
);
log::warn!("orchestrate dispatch: {warning}");
(cwd, None, Some(warning))
}
Err(error) => {
let warning = format!("worktree isolation failed ({error}); using the plain cwd");
log::warn!("orchestrate dispatch: {warning}");
Expand Down
61 changes: 21 additions & 40 deletions crates/runtime/src/app/sessions.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -261,32 +261,30 @@ impl AppState {
let host_cx = cx.clone();
HostCx::spawn_detached(cx, async move {
let result = host_cx
.unblock(move || merge_worktree_back(&destination, &worktree_path, &branch))
.unblock(move || merge_back(&destination, &worktree_path, &branch))
.await;
host_cx.enqueue(move |_state, cx| {
let notice = match result {
Ok(MergeWorktreeOutcome::FastForward) => {
RuntimeNotice::WorktreeMergedFastForward
}
Ok(MergeWorktreeOutcome::MergeCommit) => RuntimeNotice::WorktreeMergedCommit,
Ok(MergeBackOutcome::FastForward) => RuntimeNotice::WorktreeMergedFastForward,
Ok(MergeBackOutcome::MergeCommit) => RuntimeNotice::WorktreeMergedCommit,
Err(error) => {
let (reason, detail) = match error {
MergeWorktreeError::WorktreeMissing => {
MergeBackError::WorktreeMissing => {
(MergeWorktreeFailure::Missing, None)
}
MergeWorktreeError::DirtyWorktree => {
MergeBackError::DirtyWorktree => {
(MergeWorktreeFailure::DirtyWorktree, None)
}
MergeWorktreeError::DestinationDetached => {
MergeBackError::DestinationDetached => {
(MergeWorktreeFailure::DestinationDetached, None)
}
MergeWorktreeError::DirtyDestination => {
MergeBackError::DirtyDestination => {
(MergeWorktreeFailure::DirtyDestination, None)
}
MergeWorktreeError::DivergedConflict => {
MergeBackError::DivergedConflict => {
(MergeWorktreeFailure::DivergedConflict, None)
}
MergeWorktreeError::Git(detail) => {
MergeBackError::Git(detail) => {
(MergeWorktreeFailure::Git, Some(detail))
}
};
Expand DownExpand Up@@ -838,9 +836,7 @@ impl AppState {
.collect();
let host_cx = cx.clone();
HostCx::spawn_detached(cx, async move {
let summary = host_cx
.unblock(move || cleanup_orphaned_worktrees(&known_ids))
.await;
let summary = host_cx.unblock(move || cleanup_orphans(&known_ids)).await;
if !summary.removed.is_empty() || !summary.skipped.is_empty() {
log::info!(
"worktree orphan recovery removed {}, left {}",
Expand All@@ -865,37 +861,22 @@ impl AppState {
&mut self,
text: String,
attachments: Vec<Attachment>,
base: String,
_base: String,
cx: &mut HostCx,
) {
let Some(active) = self.residents.active.as_mut() else {
return;
};
active.preparing_worktree = true;
let session_id = active.meta.id.clone();
let session_id_for_task = session_id.clone();
let root = active.meta.cwd.clone();

let path = worktree_path_for(&session_id);
let branch = format!("tcode/{session_id}");
let base_for_task = base.clone();
let root_for_task = root.clone();
let path_for_task = path.clone();
let branch_for_task = branch.clone();
let host_cx = cx.clone();
HostCx::spawn_detached(cx, async move {
let result = host_cx
.unblock(move || {
create_git_worktree(
&root_for_task,
&path_for_task,
&branch_for_task,
&base_for_task,
)
.map(|created| {
let git_branch = read_git_branch(&created.path);
(created, git_branch)
})
})
.unblock(move || provision(&root_for_task, &session_id_for_task))
.await;
host_cx.enqueue(move |state, cx| {
let Some(active) = state
Expand All@@ -908,22 +889,22 @@ impl AppState {
};
active.preparing_worktree = false;
match result {
Ok((created, git_branch)) => {
Ok(created) => {
active.meta.cwd = created.path.clone();
active.meta.worktree = Some(WorktreeInfo {
root_project_path: root,
base,
branch: created.branch,
base: created.base,
branch: created.branch.clone(),
});
active.draft_workspace = WorkspaceMode::LocalCheckout;
active.git_branch = git_branch;
if created.seed.manifest_found {
active.git_branch = Some(created.branch);
if created.seed_summary.manifest_found {
emit_runtime(
cx,
RuntimeEvent::Notice(RuntimeNotice::WorktreeSeeded {
copied_files: created.seed.copied_files,
skipped: created.seed.skipped,
limit_reached: created.seed.limit_reached,
copied_files: created.seed_summary.copied_files,
skipped: created.seed_summary.skipped,
limit_reached: created.seed_summary.limit_reached,
}),
);
}
Expand Down
11 changes: 10 additions & 1 deletion crates/runtime/src/app/tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5117,6 +5117,12 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
let cx = &mut TestAppContext::default();
let root =
std::env::temp_dir().join(format!("tcode-dispatch-worktree-{}", uuid::Uuid::new_v4()));
let isolated_worktrees = root.join("tcode-owned-worktrees");
// The services lifecycle honors this process-local override so this test
// cannot create or clean entries in the user's real ~/.tcode/worktrees.
unsafe {
std::env::set_var("TCODE_WORKTREES_DIR", &isolated_worktrees);
}
std::fs::create_dir_all(&root).unwrap();
run_git(&root, &["init", "-b", "main"]).unwrap();
run_git(&root, &["config", "user.name", "tcode"]).unwrap();
Expand DownExpand Up@@ -5155,7 +5161,7 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
let response = recv_dispatch_reply(cx, &response).unwrap();
let child_id = response["thread_id"].as_str().unwrap().to_string();
let expected_branch = format!("tcode/{child_id}");
let expected_path = worktree_path_for(&child_id);
let expected_path = isolated_worktrees.join(&child_id);
assert_eq!(
response["worktree_path"],
expected_path.display().to_string(),
Expand All@@ -5174,5 +5180,8 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
);
});
remove_git_worktree(&root, &expected_path).unwrap();
unsafe {
std::env::remove_var("TCODE_WORKTREES_DIR");
}
let _ = std::fs::remove_dir_all(&root);
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
refactor: raise the worktree seam to one lifecycle module; age-guard orphan cleanup#263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Tryanks
merged 1 commit into

from

Aug 24, 2026
 Merged


refactor: raise the worktree seam to one lifecycle module; age-guard orphan cleanup
#263
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 8 additions & 4 deletions
crates/runtime/src/app/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,11 +56,11 @@ use tcode_services::acp_registry::{
 visible_agents,
};
use tcode_services::export;
#[cfg(test)]
use tcode_services::git::run_git;
use tcode_services::git::{
 CheckoutError, MergeWorktreeError, MergeWorktreeOutcome, checkout_if_clean,
 cleanup_orphaned_worktrees, commit_diff_context, create_git_worktree, list_git_branches,
 merge_worktree_back, perform_action, read_git_branch, read_status, remove_git_worktree,
 run_claude_headless, run_git, worktree_path_for,
 CheckoutError, checkout_if_clean, commit_diff_context, list_git_branches, perform_action,
 read_git_branch, read_status, run_claude_headless,
};
use tcode_services::import::{
 ExternalImportUpdate, ExternalRoots, ImportOutcome, existing_external_ids, import_thread,
Expand All@@ -77,6 +77,10 @@ use tcode_services::version_check::{
 npm_package, parse_version, tcode_update_available, update_command, update_command_string,
};
use tcode_services::workspace::list_workspace;
use tcode_services::worktree::{
 MergeBackError, MergeBackOutcome, ProvisionError, cleanup_orphans, merge_back, provision,
 remove as remove_git_worktree,
};

const TITLE_MAX_CHARS: usize = 40;
const TITLE_SOURCE_MAX_CHARS: usize = 4_000;
Expand Down

48 changes: 15 additions & 33 deletions
crates/runtime/src/app/orchestrate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,17 +414,19 @@ impl AppState {
 meta.cwd = cwd;
 meta.worktree = worktree;
 let worktree_info = meta.worktree.clone();
 let worktree_path =
 worktree_info.as_ref().map(|_| meta.cwd.clone());
 state
 .install_child_session(meta, brief, cx)
 .map(|id| (id, worktree_info, warning))
 .map(|id| (id, worktree_info, worktree_path, warning))
 })
 .await
 .unwrap_or_else(|_| Err("application closed".to_string()))
 .map(|(id, worktree, warning)| {
 .map(|(id, worktree, worktree_path, warning)| {
 let mut response = serde_json::json!({ "thread_id": id });
 if let Some(worktree) = worktree {
 response["worktree_path"] = serde_json::json!(
worktree_path_for(&id).display().to_string()
worktree_path.expect("worktree path").display().to_string()
 );
 response["worktree_branch"] =
 serde_json::json!(worktree.branch);
Expand DownExpand Up@@ -1250,43 +1252,23 @@ fn resolve_child_worktree(
 cwd: PathBuf,
 child_id: &str,
) -> (PathBuf, Option<WorktreeInfo>, Option<String>) {
 let repo_root = run_git(&cwd, &["rev-parse", "--show-toplevel"])
 .ok()
 .map(|root| PathBuf::from(root.trim()))
 .and_then(|root| root.canonicalize().ok());
 if repo_root.as_ref() != Some(&cwd) {
 let warning = format!(
 "worktree isolation unavailable: {} is not a Git repository root; using the plain cwd",
 cwd.display()
 );
 log::warn!("orchestrate dispatch: {warning}");
 return (cwd, None, Some(warning));
 }

 let base = run_git(&cwd, &["symbolic-ref", "--quiet", "--short", "HEAD"])
 .or_else(|_| run_git(&cwd, &["rev-parse", "HEAD"]))
 .map(|base| base.trim().to_string());
 let base = match base {
 Ok(base) => base,
 Err(error) => {
 let warning = format!(
 "worktree isolation unavailable: could not resolve the base revision ({error}); using the plain cwd"
 );
 log::warn!("orchestrate dispatch: {warning}");
 return (cwd, None, Some(warning));
 }
 };
 let path = worktree_path_for(child_id);
 let requested_branch = format!("tcode/{child_id}");
 match create_git_worktree(&cwd, &path, &requested_branch, &base) {
 match provision(&cwd, child_id) {
 Ok(created) => {
 let info = WorktreeInfo {
 root_project_path: cwd,
 base,
 base: created.base,
 branch: created.branch,
 };
 (created.path, Some(info), None)
 }
 Err(ProvisionError::NotRepositoryRoot { path }) => {
 let warning = format!(
 "worktree isolation unavailable: {} is not a Git repository root; using the plain cwd",
 path.display()
 );
 log::warn!("orchestrate dispatch: {warning}");
 (cwd, None, Some(warning))
 }
 Err(error) => {
 let warning = format!("worktree isolation failed ({error}); using the plain cwd");
 log::warn!("orchestrate dispatch: {warning}");
Expand Down

61 changes: 21 additions & 40 deletions
crates/runtime/src/app/sessions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -261,32 +261,30 @@ impl AppState {
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let result = host_cx
 .unblock(move || merge_worktree_back(&destination, &worktree_path, &branch))
 .unblock(move || merge_back(&destination, &worktree_path, &branch))
 .await;
 host_cx.enqueue(move |_state, cx| {
 let notice = match result {
 Ok(MergeWorktreeOutcome::FastForward) => {
 RuntimeNotice::WorktreeMergedFastForward
 }
 Ok(MergeWorktreeOutcome::MergeCommit) => RuntimeNotice::WorktreeMergedCommit,
 Ok(MergeBackOutcome::FastForward) => RuntimeNotice::WorktreeMergedFastForward,
 Ok(MergeBackOutcome::MergeCommit) => RuntimeNotice::WorktreeMergedCommit,
 Err(error) => {
 let (reason, detail) = match error {
MergeWorktreeError::WorktreeMissing => {
MergeBackError::WorktreeMissing => {
 (MergeWorktreeFailure::Missing, None)
 }
MergeWorktreeError::DirtyWorktree => {
MergeBackError::DirtyWorktree => {
 (MergeWorktreeFailure::DirtyWorktree, None)
 }
MergeWorktreeError::DestinationDetached => {
MergeBackError::DestinationDetached => {
 (MergeWorktreeFailure::DestinationDetached, None)
 }
MergeWorktreeError::DirtyDestination => {
MergeBackError::DirtyDestination => {
 (MergeWorktreeFailure::DirtyDestination, None)
 }
MergeWorktreeError::DivergedConflict => {
MergeBackError::DivergedConflict => {
 (MergeWorktreeFailure::DivergedConflict, None)
 }
MergeWorktreeError::Git(detail) => {
MergeBackError::Git(detail) => {
 (MergeWorktreeFailure::Git, Some(detail))
 }
 };
Expand DownExpand Up@@ -838,9 +836,7 @@ impl AppState {
 .collect();
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let summary = host_cx
 .unblock(move || cleanup_orphaned_worktrees(&known_ids))
 .await;
 let summary = host_cx.unblock(move || cleanup_orphans(&known_ids)).await;
 if !summary.removed.is_empty() || !summary.skipped.is_empty() {
 log::info!(
 "worktree orphan recovery removed {}, left {}",
Expand All@@ -865,37 +861,22 @@ impl AppState {
 &mut self,
 text: String,
 attachments: Vec<Attachment>,
base: String,
_base: String,
 cx: &mut HostCx,
 ) {
 let Some(active) = self.residents.active.as_mut() else {
 return;
 };
 active.preparing_worktree = true;
 let session_id = active.meta.id.clone();
 let session_id_for_task = session_id.clone();
 let root = active.meta.cwd.clone();

 let path = worktree_path_for(&session_id);
 let branch = format!("tcode/{session_id}");
 let base_for_task = base.clone();
 let root_for_task = root.clone();
 let path_for_task = path.clone();
 let branch_for_task = branch.clone();
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let result = host_cx
 .unblock(move || {
 create_git_worktree(
 &root_for_task,
 &path_for_task,
 &branch_for_task,
 &base_for_task,
 )
 .map(|created| {
 let git_branch = read_git_branch(&created.path);
 (created, git_branch)
 })
 })
 .unblock(move || provision(&root_for_task, &session_id_for_task))
 .await;
 host_cx.enqueue(move |state, cx| {
 let Some(active) = state
Expand All@@ -908,22 +889,22 @@ impl AppState {
 };
 active.preparing_worktree = false;
 match result {
 Ok((created, git_branch)) => {
 Ok(created) => {
 active.meta.cwd = created.path.clone();
 active.meta.worktree = Some(WorktreeInfo {
 root_project_path: root,
 base,
 branch: created.branch,
 base: created.base,
 branch: created.branch.clone(),
 });
 active.draft_workspace = WorkspaceMode::LocalCheckout;
 active.git_branch = git_branch;
 if created.seed.manifest_found {
 active.git_branch = Some(created.branch);
 if created.seed_summary.manifest_found {
 emit_runtime(
 cx,
 RuntimeEvent::Notice(RuntimeNotice::WorktreeSeeded {
 copied_files: created.seed.copied_files,
 skipped: created.seed.skipped,
 limit_reached: created.seed.limit_reached,
 copied_files: created.seed_summary.copied_files,
 skipped: created.seed_summary.skipped,
 limit_reached: created.seed_summary.limit_reached,
 }),
 );
 }
Expand Down

11 changes: 10 additions & 1 deletion
crates/runtime/src/app/tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5117,6 +5117,12 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 let cx = &mut TestAppContext::default();
 let root =
 std::env::temp_dir().join(format!("tcode-dispatch-worktree-{}", uuid::Uuid::new_v4()));
 let isolated_worktrees = root.join("tcode-owned-worktrees");
 // The services lifecycle honors this process-local override so this test
 // cannot create or clean entries in the user's real ~/.tcode/worktrees.
 unsafe {
 std::env::set_var("TCODE_WORKTREES_DIR", &isolated_worktrees);
 }
 std::fs::create_dir_all(&root).unwrap();
 run_git(&root, &["init", "-b", "main"]).unwrap();
 run_git(&root, &["config", "user.name", "tcode"]).unwrap();
Expand DownExpand Up@@ -5155,7 +5161,7 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 let response = recv_dispatch_reply(cx, &response).unwrap();
 let child_id = response["thread_id"].as_str().unwrap().to_string();
 let expected_branch = format!("tcode/{child_id}");
 let expected_path = worktree_path_for(&child_id);
 let expected_path = isolated_worktrees.join(&child_id);
 assert_eq!(
 response["worktree_path"],
 expected_path.display().to_string(),
Expand All@@ -5174,5 +5180,8 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 );
 });
 remove_git_worktree(&root, &expected_path).unwrap();
 unsafe {
 std::env::remove_var("TCODE_WORKTREES_DIR");
 }
 let _ = std::fs::remove_dir_all(&root);
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: raise the worktree seam to one lifecycle module; age-guard orphan cleanup#263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Tryanks
merged 1 commit into

from

Aug 24, 2026
 Merged


refactor: raise the worktree seam to one lifecycle module; age-guard orphan cleanup
#263
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 8 additions & 4 deletions
crates/runtime/src/app/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,11 +56,11 @@ use tcode_services::acp_registry::{
 visible_agents,
};
use tcode_services::export;
#[cfg(test)]
use tcode_services::git::run_git;
use tcode_services::git::{
 CheckoutError, MergeWorktreeError, MergeWorktreeOutcome, checkout_if_clean,
 cleanup_orphaned_worktrees, commit_diff_context, create_git_worktree, list_git_branches,
 merge_worktree_back, perform_action, read_git_branch, read_status, remove_git_worktree,
 run_claude_headless, run_git, worktree_path_for,
 CheckoutError, checkout_if_clean, commit_diff_context, list_git_branches, perform_action,
 read_git_branch, read_status, run_claude_headless,
};
use tcode_services::import::{
 ExternalImportUpdate, ExternalRoots, ImportOutcome, existing_external_ids, import_thread,
Expand All@@ -77,6 +77,10 @@ use tcode_services::version_check::{
 npm_package, parse_version, tcode_update_available, update_command, update_command_string,
};
use tcode_services::workspace::list_workspace;
use tcode_services::worktree::{
 MergeBackError, MergeBackOutcome, ProvisionError, cleanup_orphans, merge_back, provision,
 remove as remove_git_worktree,
};

const TITLE_MAX_CHARS: usize = 40;
const TITLE_SOURCE_MAX_CHARS: usize = 4_000;
Expand Down

48 changes: 15 additions & 33 deletions
crates/runtime/src/app/orchestrate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,17 +414,19 @@ impl AppState {
 meta.cwd = cwd;
 meta.worktree = worktree;
 let worktree_info = meta.worktree.clone();
 let worktree_path =
 worktree_info.as_ref().map(|_| meta.cwd.clone());
 state
 .install_child_session(meta, brief, cx)
 .map(|id| (id, worktree_info, warning))
 .map(|id| (id, worktree_info, worktree_path, warning))
 })
 .await
 .unwrap_or_else(|_| Err("application closed".to_string()))
 .map(|(id, worktree, warning)| {
 .map(|(id, worktree, worktree_path, warning)| {
 let mut response = serde_json::json!({ "thread_id": id });
 if let Some(worktree) = worktree {
 response["worktree_path"] = serde_json::json!(
worktree_path_for(&id).display().to_string()
worktree_path.expect("worktree path").display().to_string()
 );
 response["worktree_branch"] =
 serde_json::json!(worktree.branch);
Expand DownExpand Up@@ -1250,43 +1252,23 @@ fn resolve_child_worktree(
 cwd: PathBuf,
 child_id: &str,
) -> (PathBuf, Option<WorktreeInfo>, Option<String>) {
 let repo_root = run_git(&cwd, &["rev-parse", "--show-toplevel"])
 .ok()
 .map(|root| PathBuf::from(root.trim()))
 .and_then(|root| root.canonicalize().ok());
 if repo_root.as_ref() != Some(&cwd) {
 let warning = format!(
 "worktree isolation unavailable: {} is not a Git repository root; using the plain cwd",
 cwd.display()
 );
 log::warn!("orchestrate dispatch: {warning}");
 return (cwd, None, Some(warning));
 }

 let base = run_git(&cwd, &["symbolic-ref", "--quiet", "--short", "HEAD"])
 .or_else(|_| run_git(&cwd, &["rev-parse", "HEAD"]))
 .map(|base| base.trim().to_string());
 let base = match base {
 Ok(base) => base,
 Err(error) => {
 let warning = format!(
 "worktree isolation unavailable: could not resolve the base revision ({error}); using the plain cwd"
 );
 log::warn!("orchestrate dispatch: {warning}");
 return (cwd, None, Some(warning));
 }
 };
 let path = worktree_path_for(child_id);
 let requested_branch = format!("tcode/{child_id}");
 match create_git_worktree(&cwd, &path, &requested_branch, &base) {
 match provision(&cwd, child_id) {
 Ok(created) => {
 let info = WorktreeInfo {
 root_project_path: cwd,
 base,
 base: created.base,
 branch: created.branch,
 };
 (created.path, Some(info), None)
 }
 Err(ProvisionError::NotRepositoryRoot { path }) => {
 let warning = format!(
 "worktree isolation unavailable: {} is not a Git repository root; using the plain cwd",
 path.display()
 );
 log::warn!("orchestrate dispatch: {warning}");
 (cwd, None, Some(warning))
 }
 Err(error) => {
 let warning = format!("worktree isolation failed ({error}); using the plain cwd");
 log::warn!("orchestrate dispatch: {warning}");
Expand Down

61 changes: 21 additions & 40 deletions
crates/runtime/src/app/sessions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -261,32 +261,30 @@ impl AppState {
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let result = host_cx
 .unblock(move || merge_worktree_back(&destination, &worktree_path, &branch))
 .unblock(move || merge_back(&destination, &worktree_path, &branch))
 .await;
 host_cx.enqueue(move |_state, cx| {
 let notice = match result {
 Ok(MergeWorktreeOutcome::FastForward) => {
 RuntimeNotice::WorktreeMergedFastForward
 }
 Ok(MergeWorktreeOutcome::MergeCommit) => RuntimeNotice::WorktreeMergedCommit,
 Ok(MergeBackOutcome::FastForward) => RuntimeNotice::WorktreeMergedFastForward,
 Ok(MergeBackOutcome::MergeCommit) => RuntimeNotice::WorktreeMergedCommit,
 Err(error) => {
 let (reason, detail) = match error {
MergeWorktreeError::WorktreeMissing => {
MergeBackError::WorktreeMissing => {
 (MergeWorktreeFailure::Missing, None)
 }
MergeWorktreeError::DirtyWorktree => {
MergeBackError::DirtyWorktree => {
 (MergeWorktreeFailure::DirtyWorktree, None)
 }
MergeWorktreeError::DestinationDetached => {
MergeBackError::DestinationDetached => {
 (MergeWorktreeFailure::DestinationDetached, None)
 }
MergeWorktreeError::DirtyDestination => {
MergeBackError::DirtyDestination => {
 (MergeWorktreeFailure::DirtyDestination, None)
 }
MergeWorktreeError::DivergedConflict => {
MergeBackError::DivergedConflict => {
 (MergeWorktreeFailure::DivergedConflict, None)
 }
MergeWorktreeError::Git(detail) => {
MergeBackError::Git(detail) => {
 (MergeWorktreeFailure::Git, Some(detail))
 }
 };
Expand DownExpand Up@@ -838,9 +836,7 @@ impl AppState {
 .collect();
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let summary = host_cx
 .unblock(move || cleanup_orphaned_worktrees(&known_ids))
 .await;
 let summary = host_cx.unblock(move || cleanup_orphans(&known_ids)).await;
 if !summary.removed.is_empty() || !summary.skipped.is_empty() {
 log::info!(
 "worktree orphan recovery removed {}, left {}",
Expand All@@ -865,37 +861,22 @@ impl AppState {
 &mut self,
 text: String,
 attachments: Vec<Attachment>,
base: String,
_base: String,
 cx: &mut HostCx,
 ) {
 let Some(active) = self.residents.active.as_mut() else {
 return;
 };
 active.preparing_worktree = true;
 let session_id = active.meta.id.clone();
 let session_id_for_task = session_id.clone();
 let root = active.meta.cwd.clone();

 let path = worktree_path_for(&session_id);
 let branch = format!("tcode/{session_id}");
 let base_for_task = base.clone();
 let root_for_task = root.clone();
 let path_for_task = path.clone();
 let branch_for_task = branch.clone();
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let result = host_cx
 .unblock(move || {
 create_git_worktree(
 &root_for_task,
 &path_for_task,
 &branch_for_task,
 &base_for_task,
 )
 .map(|created| {
 let git_branch = read_git_branch(&created.path);
 (created, git_branch)
 })
 })
 .unblock(move || provision(&root_for_task, &session_id_for_task))
 .await;
 host_cx.enqueue(move |state, cx| {
 let Some(active) = state
Expand All@@ -908,22 +889,22 @@ impl AppState {
 };
 active.preparing_worktree = false;
 match result {
 Ok((created, git_branch)) => {
 Ok(created) => {
 active.meta.cwd = created.path.clone();
 active.meta.worktree = Some(WorktreeInfo {
 root_project_path: root,
 base,
 branch: created.branch,
 base: created.base,
 branch: created.branch.clone(),
 });
 active.draft_workspace = WorkspaceMode::LocalCheckout;
 active.git_branch = git_branch;
 if created.seed.manifest_found {
 active.git_branch = Some(created.branch);
 if created.seed_summary.manifest_found {
 emit_runtime(
 cx,
 RuntimeEvent::Notice(RuntimeNotice::WorktreeSeeded {
 copied_files: created.seed.copied_files,
 skipped: created.seed.skipped,
 limit_reached: created.seed.limit_reached,
 copied_files: created.seed_summary.copied_files,
 skipped: created.seed_summary.skipped,
 limit_reached: created.seed_summary.limit_reached,
 }),
 );
 }
Expand Down

11 changes: 10 additions & 1 deletion
crates/runtime/src/app/tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5117,6 +5117,12 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 let cx = &mut TestAppContext::default();
 let root =
 std::env::temp_dir().join(format!("tcode-dispatch-worktree-{}", uuid::Uuid::new_v4()));
 let isolated_worktrees = root.join("tcode-owned-worktrees");
 // The services lifecycle honors this process-local override so this test
 // cannot create or clean entries in the user's real ~/.tcode/worktrees.
 unsafe {
 std::env::set_var("TCODE_WORKTREES_DIR", &isolated_worktrees);
 }
 std::fs::create_dir_all(&root).unwrap();
 run_git(&root, &["init", "-b", "main"]).unwrap();
 run_git(&root, &["config", "user.name", "tcode"]).unwrap();
Expand DownExpand Up@@ -5155,7 +5161,7 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 let response = recv_dispatch_reply(cx, &response).unwrap();
 let child_id = response["thread_id"].as_str().unwrap().to_string();
 let expected_branch = format!("tcode/{child_id}");
 let expected_path = worktree_path_for(&child_id);
 let expected_path = isolated_worktrees.join(&child_id);
 assert_eq!(
 response["worktree_path"],
 expected_path.display().to_string(),
Expand All@@ -5174,5 +5180,8 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 );
 });
 remove_git_worktree(&root, &expected_path).unwrap();
 unsafe {
 std::env::remove_var("TCODE_WORKTREES_DIR");
 }
 let _ = std::fs::remove_dir_all(&root);
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: raise the worktree seam to one lifecycle module; age-guard orphan cleanup#263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Tryanks
merged 1 commit into

from

Aug 24, 2026
 Merged


refactor: raise the worktree seam to one lifecycle module; age-guard orphan cleanup
#263
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 8 additions & 4 deletions
crates/runtime/src/app/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,11 +56,11 @@ use tcode_services::acp_registry::{
 visible_agents,
};
use tcode_services::export;
#[cfg(test)]
use tcode_services::git::run_git;
use tcode_services::git::{
 CheckoutError, MergeWorktreeError, MergeWorktreeOutcome, checkout_if_clean,
 cleanup_orphaned_worktrees, commit_diff_context, create_git_worktree, list_git_branches,
 merge_worktree_back, perform_action, read_git_branch, read_status, remove_git_worktree,
 run_claude_headless, run_git, worktree_path_for,
 CheckoutError, checkout_if_clean, commit_diff_context, list_git_branches, perform_action,
 read_git_branch, read_status, run_claude_headless,
};
use tcode_services::import::{
 ExternalImportUpdate, ExternalRoots, ImportOutcome, existing_external_ids, import_thread,
Expand All@@ -77,6 +77,10 @@ use tcode_services::version_check::{
 npm_package, parse_version, tcode_update_available, update_command, update_command_string,
};
use tcode_services::workspace::list_workspace;
use tcode_services::worktree::{
 MergeBackError, MergeBackOutcome, ProvisionError, cleanup_orphans, merge_back, provision,
 remove as remove_git_worktree,
};

const TITLE_MAX_CHARS: usize = 40;
const TITLE_SOURCE_MAX_CHARS: usize = 4_000;
Expand Down

48 changes: 15 additions & 33 deletions
crates/runtime/src/app/orchestrate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,17 +414,19 @@ impl AppState {
 meta.cwd = cwd;
 meta.worktree = worktree;
 let worktree_info = meta.worktree.clone();
 let worktree_path =
 worktree_info.as_ref().map(|_| meta.cwd.clone());
 state
 .install_child_session(meta, brief, cx)
 .map(|id| (id, worktree_info, warning))
 .map(|id| (id, worktree_info, worktree_path, warning))
 })
 .await
 .unwrap_or_else(|_| Err("application closed".to_string()))
 .map(|(id, worktree, warning)| {
 .map(|(id, worktree, worktree_path, warning)| {
 let mut response = serde_json::json!({ "thread_id": id });
 if let Some(worktree) = worktree {
 response["worktree_path"] = serde_json::json!(
worktree_path_for(&id).display().to_string()
worktree_path.expect("worktree path").display().to_string()
 );
 response["worktree_branch"] =
 serde_json::json!(worktree.branch);
Expand DownExpand Up@@ -1250,43 +1252,23 @@ fn resolve_child_worktree(
 cwd: PathBuf,
 child_id: &str,
) -> (PathBuf, Option<WorktreeInfo>, Option<String>) {
 let repo_root = run_git(&cwd, &["rev-parse", "--show-toplevel"])
 .ok()
 .map(|root| PathBuf::from(root.trim()))
 .and_then(|root| root.canonicalize().ok());
 if repo_root.as_ref() != Some(&cwd) {
 let warning = format!(
 "worktree isolation unavailable: {} is not a Git repository root; using the plain cwd",
 cwd.display()
 );
 log::warn!("orchestrate dispatch: {warning}");
 return (cwd, None, Some(warning));
 }

 let base = run_git(&cwd, &["symbolic-ref", "--quiet", "--short", "HEAD"])
 .or_else(|_| run_git(&cwd, &["rev-parse", "HEAD"]))
 .map(|base| base.trim().to_string());
 let base = match base {
 Ok(base) => base,
 Err(error) => {
 let warning = format!(
 "worktree isolation unavailable: could not resolve the base revision ({error}); using the plain cwd"
 );
 log::warn!("orchestrate dispatch: {warning}");
 return (cwd, None, Some(warning));
 }
 };
 let path = worktree_path_for(child_id);
 let requested_branch = format!("tcode/{child_id}");
 match create_git_worktree(&cwd, &path, &requested_branch, &base) {
 match provision(&cwd, child_id) {
 Ok(created) => {
 let info = WorktreeInfo {
 root_project_path: cwd,
 base,
 base: created.base,
 branch: created.branch,
 };
 (created.path, Some(info), None)
 }
 Err(ProvisionError::NotRepositoryRoot { path }) => {
 let warning = format!(
 "worktree isolation unavailable: {} is not a Git repository root; using the plain cwd",
 path.display()
 );
 log::warn!("orchestrate dispatch: {warning}");
 (cwd, None, Some(warning))
 }
 Err(error) => {
 let warning = format!("worktree isolation failed ({error}); using the plain cwd");
 log::warn!("orchestrate dispatch: {warning}");
Expand Down

61 changes: 21 additions & 40 deletions
crates/runtime/src/app/sessions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -261,32 +261,30 @@ impl AppState {
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let result = host_cx
 .unblock(move || merge_worktree_back(&destination, &worktree_path, &branch))
 .unblock(move || merge_back(&destination, &worktree_path, &branch))
 .await;
 host_cx.enqueue(move |_state, cx| {
 let notice = match result {
 Ok(MergeWorktreeOutcome::FastForward) => {
 RuntimeNotice::WorktreeMergedFastForward
 }
 Ok(MergeWorktreeOutcome::MergeCommit) => RuntimeNotice::WorktreeMergedCommit,
 Ok(MergeBackOutcome::FastForward) => RuntimeNotice::WorktreeMergedFastForward,
 Ok(MergeBackOutcome::MergeCommit) => RuntimeNotice::WorktreeMergedCommit,
 Err(error) => {
 let (reason, detail) = match error {
MergeWorktreeError::WorktreeMissing => {
MergeBackError::WorktreeMissing => {
 (MergeWorktreeFailure::Missing, None)
 }
MergeWorktreeError::DirtyWorktree => {
MergeBackError::DirtyWorktree => {
 (MergeWorktreeFailure::DirtyWorktree, None)
 }
MergeWorktreeError::DestinationDetached => {
MergeBackError::DestinationDetached => {
 (MergeWorktreeFailure::DestinationDetached, None)
 }
MergeWorktreeError::DirtyDestination => {
MergeBackError::DirtyDestination => {
 (MergeWorktreeFailure::DirtyDestination, None)
 }
MergeWorktreeError::DivergedConflict => {
MergeBackError::DivergedConflict => {
 (MergeWorktreeFailure::DivergedConflict, None)
 }
MergeWorktreeError::Git(detail) => {
MergeBackError::Git(detail) => {
 (MergeWorktreeFailure::Git, Some(detail))
 }
 };
Expand DownExpand Up@@ -838,9 +836,7 @@ impl AppState {
 .collect();
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let summary = host_cx
 .unblock(move || cleanup_orphaned_worktrees(&known_ids))
 .await;
 let summary = host_cx.unblock(move || cleanup_orphans(&known_ids)).await;
 if !summary.removed.is_empty() || !summary.skipped.is_empty() {
 log::info!(
 "worktree orphan recovery removed {}, left {}",
Expand All@@ -865,37 +861,22 @@ impl AppState {
 &mut self,
 text: String,
 attachments: Vec<Attachment>,
base: String,
_base: String,
 cx: &mut HostCx,
 ) {
 let Some(active) = self.residents.active.as_mut() else {
 return;
 };
 active.preparing_worktree = true;
 let session_id = active.meta.id.clone();
 let session_id_for_task = session_id.clone();
 let root = active.meta.cwd.clone();

 let path = worktree_path_for(&session_id);
 let branch = format!("tcode/{session_id}");
 let base_for_task = base.clone();
 let root_for_task = root.clone();
 let path_for_task = path.clone();
 let branch_for_task = branch.clone();
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let result = host_cx
 .unblock(move || {
 create_git_worktree(
 &root_for_task,
 &path_for_task,
 &branch_for_task,
 &base_for_task,
 )
 .map(|created| {
 let git_branch = read_git_branch(&created.path);
 (created, git_branch)
 })
 })
 .unblock(move || provision(&root_for_task, &session_id_for_task))
 .await;
 host_cx.enqueue(move |state, cx| {
 let Some(active) = state
Expand All@@ -908,22 +889,22 @@ impl AppState {
 };
 active.preparing_worktree = false;
 match result {
 Ok((created, git_branch)) => {
 Ok(created) => {
 active.meta.cwd = created.path.clone();
 active.meta.worktree = Some(WorktreeInfo {
 root_project_path: root,
 base,
 branch: created.branch,
 base: created.base,
 branch: created.branch.clone(),
 });
 active.draft_workspace = WorkspaceMode::LocalCheckout;
 active.git_branch = git_branch;
 if created.seed.manifest_found {
 active.git_branch = Some(created.branch);
 if created.seed_summary.manifest_found {
 emit_runtime(
 cx,
 RuntimeEvent::Notice(RuntimeNotice::WorktreeSeeded {
 copied_files: created.seed.copied_files,
 skipped: created.seed.skipped,
 limit_reached: created.seed.limit_reached,
 copied_files: created.seed_summary.copied_files,
 skipped: created.seed_summary.skipped,
 limit_reached: created.seed_summary.limit_reached,
 }),
 );
 }
Expand Down

11 changes: 10 additions & 1 deletion
crates/runtime/src/app/tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5117,6 +5117,12 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 let cx = &mut TestAppContext::default();
 let root =
 std::env::temp_dir().join(format!("tcode-dispatch-worktree-{}", uuid::Uuid::new_v4()));
 let isolated_worktrees = root.join("tcode-owned-worktrees");
 // The services lifecycle honors this process-local override so this test
 // cannot create or clean entries in the user's real ~/.tcode/worktrees.
 unsafe {
 std::env::set_var("TCODE_WORKTREES_DIR", &isolated_worktrees);
 }
 std::fs::create_dir_all(&root).unwrap();
 run_git(&root, &["init", "-b", "main"]).unwrap();
 run_git(&root, &["config", "user.name", "tcode"]).unwrap();
Expand DownExpand Up@@ -5155,7 +5161,7 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 let response = recv_dispatch_reply(cx, &response).unwrap();
 let child_id = response["thread_id"].as_str().unwrap().to_string();
 let expected_branch = format!("tcode/{child_id}");
 let expected_path = worktree_path_for(&child_id);
 let expected_path = isolated_worktrees.join(&child_id);
 assert_eq!(
 response["worktree_path"],
 expected_path.display().to_string(),
Expand All@@ -5174,5 +5180,8 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 );
 });
 remove_git_worktree(&root, &expected_path).unwrap();
 unsafe {
 std::env::remove_var("TCODE_WORKTREES_DIR");
 }
 let _ = std::fs::remove_dir_all(&root);
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
refactor: raise the worktree seam to one lifecycle module; age-guard orphan cleanup#263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Tryanks
merged 1 commit into

from

Aug 24, 2026
 Merged


refactor: raise the worktree seam to one lifecycle module; age-guard orphan cleanup
#263
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 8 additions & 4 deletions
crates/runtime/src/app/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,11 +56,11 @@ use tcode_services::acp_registry::{
 visible_agents,
};
use tcode_services::export;
#[cfg(test)]
use tcode_services::git::run_git;
use tcode_services::git::{
 CheckoutError, MergeWorktreeError, MergeWorktreeOutcome, checkout_if_clean,
 cleanup_orphaned_worktrees, commit_diff_context, create_git_worktree, list_git_branches,
 merge_worktree_back, perform_action, read_git_branch, read_status, remove_git_worktree,
 run_claude_headless, run_git, worktree_path_for,
 CheckoutError, checkout_if_clean, commit_diff_context, list_git_branches, perform_action,
 read_git_branch, read_status, run_claude_headless,
};
use tcode_services::import::{
 ExternalImportUpdate, ExternalRoots, ImportOutcome, existing_external_ids, import_thread,
Expand All@@ -77,6 +77,10 @@ use tcode_services::version_check::{
 npm_package, parse_version, tcode_update_available, update_command, update_command_string,
};
use tcode_services::workspace::list_workspace;
use tcode_services::worktree::{
 MergeBackError, MergeBackOutcome, ProvisionError, cleanup_orphans, merge_back, provision,
 remove as remove_git_worktree,
};

const TITLE_MAX_CHARS: usize = 40;
const TITLE_SOURCE_MAX_CHARS: usize = 4_000;
Expand Down

48 changes: 15 additions & 33 deletions
crates/runtime/src/app/orchestrate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,17 +414,19 @@ impl AppState {
 meta.cwd = cwd;
 meta.worktree = worktree;
 let worktree_info = meta.worktree.clone();
 let worktree_path =
 worktree_info.as_ref().map(|_| meta.cwd.clone());
 state
 .install_child_session(meta, brief, cx)
 .map(|id| (id, worktree_info, warning))
 .map(|id| (id, worktree_info, worktree_path, warning))
 })
 .await
 .unwrap_or_else(|_| Err("application closed".to_string()))
 .map(|(id, worktree, warning)| {
 .map(|(id, worktree, worktree_path, warning)| {
 let mut response = serde_json::json!({ "thread_id": id });
 if let Some(worktree) = worktree {
 response["worktree_path"] = serde_json::json!(
worktree_path_for(&id).display().to_string()
worktree_path.expect("worktree path").display().to_string()
 );
 response["worktree_branch"] =
 serde_json::json!(worktree.branch);
Expand DownExpand Up@@ -1250,43 +1252,23 @@ fn resolve_child_worktree(
 cwd: PathBuf,
 child_id: &str,
) -> (PathBuf, Option<WorktreeInfo>, Option<String>) {
 let repo_root = run_git(&cwd, &["rev-parse", "--show-toplevel"])
 .ok()
 .map(|root| PathBuf::from(root.trim()))
 .and_then(|root| root.canonicalize().ok());
 if repo_root.as_ref() != Some(&cwd) {
 let warning = format!(
 "worktree isolation unavailable: {} is not a Git repository root; using the plain cwd",
 cwd.display()
 );
 log::warn!("orchestrate dispatch: {warning}");
 return (cwd, None, Some(warning));
 }

 let base = run_git(&cwd, &["symbolic-ref", "--quiet", "--short", "HEAD"])
 .or_else(|_| run_git(&cwd, &["rev-parse", "HEAD"]))
 .map(|base| base.trim().to_string());
 let base = match base {
 Ok(base) => base,
 Err(error) => {
 let warning = format!(
 "worktree isolation unavailable: could not resolve the base revision ({error}); using the plain cwd"
 );
 log::warn!("orchestrate dispatch: {warning}");
 return (cwd, None, Some(warning));
 }
 };
 let path = worktree_path_for(child_id);
 let requested_branch = format!("tcode/{child_id}");
 match create_git_worktree(&cwd, &path, &requested_branch, &base) {
 match provision(&cwd, child_id) {
 Ok(created) => {
 let info = WorktreeInfo {
 root_project_path: cwd,
 base,
 base: created.base,
 branch: created.branch,
 };
 (created.path, Some(info), None)
 }
 Err(ProvisionError::NotRepositoryRoot { path }) => {
 let warning = format!(
 "worktree isolation unavailable: {} is not a Git repository root; using the plain cwd",
 path.display()
 );
 log::warn!("orchestrate dispatch: {warning}");
 (cwd, None, Some(warning))
 }
 Err(error) => {
 let warning = format!("worktree isolation failed ({error}); using the plain cwd");
 log::warn!("orchestrate dispatch: {warning}");
Expand Down

61 changes: 21 additions & 40 deletions
crates/runtime/src/app/sessions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -261,32 +261,30 @@ impl AppState {
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let result = host_cx
 .unblock(move || merge_worktree_back(&destination, &worktree_path, &branch))
 .unblock(move || merge_back(&destination, &worktree_path, &branch))
 .await;
 host_cx.enqueue(move |_state, cx| {
 let notice = match result {
 Ok(MergeWorktreeOutcome::FastForward) => {
 RuntimeNotice::WorktreeMergedFastForward
 }
 Ok(MergeWorktreeOutcome::MergeCommit) => RuntimeNotice::WorktreeMergedCommit,
 Ok(MergeBackOutcome::FastForward) => RuntimeNotice::WorktreeMergedFastForward,
 Ok(MergeBackOutcome::MergeCommit) => RuntimeNotice::WorktreeMergedCommit,
 Err(error) => {
 let (reason, detail) = match error {
MergeWorktreeError::WorktreeMissing => {
MergeBackError::WorktreeMissing => {
 (MergeWorktreeFailure::Missing, None)
 }
MergeWorktreeError::DirtyWorktree => {
MergeBackError::DirtyWorktree => {
 (MergeWorktreeFailure::DirtyWorktree, None)
 }
MergeWorktreeError::DestinationDetached => {
MergeBackError::DestinationDetached => {
 (MergeWorktreeFailure::DestinationDetached, None)
 }
MergeWorktreeError::DirtyDestination => {
MergeBackError::DirtyDestination => {
 (MergeWorktreeFailure::DirtyDestination, None)
 }
MergeWorktreeError::DivergedConflict => {
MergeBackError::DivergedConflict => {
 (MergeWorktreeFailure::DivergedConflict, None)
 }
MergeWorktreeError::Git(detail) => {
MergeBackError::Git(detail) => {
 (MergeWorktreeFailure::Git, Some(detail))
 }
 };
Expand DownExpand Up@@ -838,9 +836,7 @@ impl AppState {
 .collect();
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let summary = host_cx
 .unblock(move || cleanup_orphaned_worktrees(&known_ids))
 .await;
 let summary = host_cx.unblock(move || cleanup_orphans(&known_ids)).await;
 if !summary.removed.is_empty() || !summary.skipped.is_empty() {
 log::info!(
 "worktree orphan recovery removed {}, left {}",
Expand All@@ -865,37 +861,22 @@ impl AppState {
 &mut self,
 text: String,
 attachments: Vec<Attachment>,
base: String,
_base: String,
 cx: &mut HostCx,
 ) {
 let Some(active) = self.residents.active.as_mut() else {
 return;
 };
 active.preparing_worktree = true;
 let session_id = active.meta.id.clone();
 let session_id_for_task = session_id.clone();
 let root = active.meta.cwd.clone();

 let path = worktree_path_for(&session_id);
 let branch = format!("tcode/{session_id}");
 let base_for_task = base.clone();
 let root_for_task = root.clone();
 let path_for_task = path.clone();
 let branch_for_task = branch.clone();
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let result = host_cx
 .unblock(move || {
 create_git_worktree(
 &root_for_task,
 &path_for_task,
 &branch_for_task,
 &base_for_task,
 )
 .map(|created| {
 let git_branch = read_git_branch(&created.path);
 (created, git_branch)
 })
 })
 .unblock(move || provision(&root_for_task, &session_id_for_task))
 .await;
 host_cx.enqueue(move |state, cx| {
 let Some(active) = state
Expand All@@ -908,22 +889,22 @@ impl AppState {
 };
 active.preparing_worktree = false;
 match result {
 Ok((created, git_branch)) => {
 Ok(created) => {
 active.meta.cwd = created.path.clone();
 active.meta.worktree = Some(WorktreeInfo {
 root_project_path: root,
 base,
 branch: created.branch,
 base: created.base,
 branch: created.branch.clone(),
 });
 active.draft_workspace = WorkspaceMode::LocalCheckout;
 active.git_branch = git_branch;
 if created.seed.manifest_found {
 active.git_branch = Some(created.branch);
 if created.seed_summary.manifest_found {
 emit_runtime(
 cx,
 RuntimeEvent::Notice(RuntimeNotice::WorktreeSeeded {
 copied_files: created.seed.copied_files,
 skipped: created.seed.skipped,
 limit_reached: created.seed.limit_reached,
 copied_files: created.seed_summary.copied_files,
 skipped: created.seed_summary.skipped,
 limit_reached: created.seed_summary.limit_reached,
 }),
 );
 }
Expand Down

11 changes: 10 additions & 1 deletion
crates/runtime/src/app/tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5117,6 +5117,12 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 let cx = &mut TestAppContext::default();
 let root =
 std::env::temp_dir().join(format!("tcode-dispatch-worktree-{}", uuid::Uuid::new_v4()));
 let isolated_worktrees = root.join("tcode-owned-worktrees");
 // The services lifecycle honors this process-local override so this test
 // cannot create or clean entries in the user's real ~/.tcode/worktrees.
 unsafe {
 std::env::set_var("TCODE_WORKTREES_DIR", &isolated_worktrees);
 }
 std::fs::create_dir_all(&root).unwrap();
 run_git(&root, &["init", "-b", "main"]).unwrap();
 run_git(&root, &["config", "user.name", "tcode"]).unwrap();
Expand DownExpand Up@@ -5155,7 +5161,7 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 let response = recv_dispatch_reply(cx, &response).unwrap();
 let child_id = response["thread_id"].as_str().unwrap().to_string();
 let expected_branch = format!("tcode/{child_id}");
 let expected_path = worktree_path_for(&child_id);
 let expected_path = isolated_worktrees.join(&child_id);
 assert_eq!(
 response["worktree_path"],
 expected_path.display().to_string(),
Expand All@@ -5174,5 +5180,8 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 );
 });
 remove_git_worktree(&root, &expected_path).unwrap();
 unsafe {
 std::env::remove_var("TCODE_WORKTREES_DIR");
 }
 let _ = std::fs::remove_dir_all(&root);
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: raise the worktree seam to one lifecycle module; age-guard orphan cleanup#263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Tryanks
merged 1 commit into

from

Aug 24, 2026
 Merged


refactor: raise the worktree seam to one lifecycle module; age-guard orphan cleanup
#263
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 8 additions & 4 deletions
crates/runtime/src/app/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,11 +56,11 @@ use tcode_services::acp_registry::{
 visible_agents,
};
use tcode_services::export;
#[cfg(test)]
use tcode_services::git::run_git;
use tcode_services::git::{
 CheckoutError, MergeWorktreeError, MergeWorktreeOutcome, checkout_if_clean,
 cleanup_orphaned_worktrees, commit_diff_context, create_git_worktree, list_git_branches,
 merge_worktree_back, perform_action, read_git_branch, read_status, remove_git_worktree,
 run_claude_headless, run_git, worktree_path_for,
 CheckoutError, checkout_if_clean, commit_diff_context, list_git_branches, perform_action,
 read_git_branch, read_status, run_claude_headless,
};
use tcode_services::import::{
 ExternalImportUpdate, ExternalRoots, ImportOutcome, existing_external_ids, import_thread,
Expand All@@ -77,6 +77,10 @@ use tcode_services::version_check::{
 npm_package, parse_version, tcode_update_available, update_command, update_command_string,
};
use tcode_services::workspace::list_workspace;
use tcode_services::worktree::{
 MergeBackError, MergeBackOutcome, ProvisionError, cleanup_orphans, merge_back, provision,
 remove as remove_git_worktree,
};

const TITLE_MAX_CHARS: usize = 40;
const TITLE_SOURCE_MAX_CHARS: usize = 4_000;
Expand Down

48 changes: 15 additions & 33 deletions
crates/runtime/src/app/orchestrate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,17 +414,19 @@ impl AppState {
 meta.cwd = cwd;
 meta.worktree = worktree;
 let worktree_info = meta.worktree.clone();
 let worktree_path =
 worktree_info.as_ref().map(|_| meta.cwd.clone());
 state
 .install_child_session(meta, brief, cx)
 .map(|id| (id, worktree_info, warning))
 .map(|id| (id, worktree_info, worktree_path, warning))
 })
 .await
 .unwrap_or_else(|_| Err("application closed".to_string()))
 .map(|(id, worktree, warning)| {
 .map(|(id, worktree, worktree_path, warning)| {
 let mut response = serde_json::json!({ "thread_id": id });
 if let Some(worktree) = worktree {
 response["worktree_path"] = serde_json::json!(
worktree_path_for(&id).display().to_string()
worktree_path.expect("worktree path").display().to_string()
 );
 response["worktree_branch"] =
 serde_json::json!(worktree.branch);
Expand DownExpand Up@@ -1250,43 +1252,23 @@ fn resolve_child_worktree(
 cwd: PathBuf,
 child_id: &str,
) -> (PathBuf, Option<WorktreeInfo>, Option<String>) {
 let repo_root = run_git(&cwd, &["rev-parse", "--show-toplevel"])
 .ok()
 .map(|root| PathBuf::from(root.trim()))
 .and_then(|root| root.canonicalize().ok());
 if repo_root.as_ref() != Some(&cwd) {
 let warning = format!(
 "worktree isolation unavailable: {} is not a Git repository root; using the plain cwd",
 cwd.display()
 );
 log::warn!("orchestrate dispatch: {warning}");
 return (cwd, None, Some(warning));
 }

 let base = run_git(&cwd, &["symbolic-ref", "--quiet", "--short", "HEAD"])
 .or_else(|_| run_git(&cwd, &["rev-parse", "HEAD"]))
 .map(|base| base.trim().to_string());
 let base = match base {
 Ok(base) => base,
 Err(error) => {
 let warning = format!(
 "worktree isolation unavailable: could not resolve the base revision ({error}); using the plain cwd"
 );
 log::warn!("orchestrate dispatch: {warning}");
 return (cwd, None, Some(warning));
 }
 };
 let path = worktree_path_for(child_id);
 let requested_branch = format!("tcode/{child_id}");
 match create_git_worktree(&cwd, &path, &requested_branch, &base) {
 match provision(&cwd, child_id) {
 Ok(created) => {
 let info = WorktreeInfo {
 root_project_path: cwd,
 base,
 base: created.base,
 branch: created.branch,
 };
 (created.path, Some(info), None)
 }
 Err(ProvisionError::NotRepositoryRoot { path }) => {
 let warning = format!(
 "worktree isolation unavailable: {} is not a Git repository root; using the plain cwd",
 path.display()
 );
 log::warn!("orchestrate dispatch: {warning}");
 (cwd, None, Some(warning))
 }
 Err(error) => {
 let warning = format!("worktree isolation failed ({error}); using the plain cwd");
 log::warn!("orchestrate dispatch: {warning}");
Expand Down

61 changes: 21 additions & 40 deletions
crates/runtime/src/app/sessions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -261,32 +261,30 @@ impl AppState {
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let result = host_cx
 .unblock(move || merge_worktree_back(&destination, &worktree_path, &branch))
 .unblock(move || merge_back(&destination, &worktree_path, &branch))
 .await;
 host_cx.enqueue(move |_state, cx| {
 let notice = match result {
 Ok(MergeWorktreeOutcome::FastForward) => {
 RuntimeNotice::WorktreeMergedFastForward
 }
 Ok(MergeWorktreeOutcome::MergeCommit) => RuntimeNotice::WorktreeMergedCommit,
 Ok(MergeBackOutcome::FastForward) => RuntimeNotice::WorktreeMergedFastForward,
 Ok(MergeBackOutcome::MergeCommit) => RuntimeNotice::WorktreeMergedCommit,
 Err(error) => {
 let (reason, detail) = match error {
MergeWorktreeError::WorktreeMissing => {
MergeBackError::WorktreeMissing => {
 (MergeWorktreeFailure::Missing, None)
 }
MergeWorktreeError::DirtyWorktree => {
MergeBackError::DirtyWorktree => {
 (MergeWorktreeFailure::DirtyWorktree, None)
 }
MergeWorktreeError::DestinationDetached => {
MergeBackError::DestinationDetached => {
 (MergeWorktreeFailure::DestinationDetached, None)
 }
MergeWorktreeError::DirtyDestination => {
MergeBackError::DirtyDestination => {
 (MergeWorktreeFailure::DirtyDestination, None)
 }
MergeWorktreeError::DivergedConflict => {
MergeBackError::DivergedConflict => {
 (MergeWorktreeFailure::DivergedConflict, None)
 }
MergeWorktreeError::Git(detail) => {
MergeBackError::Git(detail) => {
 (MergeWorktreeFailure::Git, Some(detail))
 }
 };
Expand DownExpand Up@@ -838,9 +836,7 @@ impl AppState {
 .collect();
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let summary = host_cx
 .unblock(move || cleanup_orphaned_worktrees(&known_ids))
 .await;
 let summary = host_cx.unblock(move || cleanup_orphans(&known_ids)).await;
 if !summary.removed.is_empty() || !summary.skipped.is_empty() {
 log::info!(
 "worktree orphan recovery removed {}, left {}",
Expand All@@ -865,37 +861,22 @@ impl AppState {
 &mut self,
 text: String,
 attachments: Vec<Attachment>,
base: String,
_base: String,
 cx: &mut HostCx,
 ) {
 let Some(active) = self.residents.active.as_mut() else {
 return;
 };
 active.preparing_worktree = true;
 let session_id = active.meta.id.clone();
 let session_id_for_task = session_id.clone();
 let root = active.meta.cwd.clone();

 let path = worktree_path_for(&session_id);
 let branch = format!("tcode/{session_id}");
 let base_for_task = base.clone();
 let root_for_task = root.clone();
 let path_for_task = path.clone();
 let branch_for_task = branch.clone();
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let result = host_cx
 .unblock(move || {
 create_git_worktree(
 &root_for_task,
 &path_for_task,
 &branch_for_task,
 &base_for_task,
 )
 .map(|created| {
 let git_branch = read_git_branch(&created.path);
 (created, git_branch)
 })
 })
 .unblock(move || provision(&root_for_task, &session_id_for_task))
 .await;
 host_cx.enqueue(move |state, cx| {
 let Some(active) = state
Expand All@@ -908,22 +889,22 @@ impl AppState {
 };
 active.preparing_worktree = false;
 match result {
 Ok((created, git_branch)) => {
 Ok(created) => {
 active.meta.cwd = created.path.clone();
 active.meta.worktree = Some(WorktreeInfo {
 root_project_path: root,
 base,
 branch: created.branch,
 base: created.base,
 branch: created.branch.clone(),
 });
 active.draft_workspace = WorkspaceMode::LocalCheckout;
 active.git_branch = git_branch;
 if created.seed.manifest_found {
 active.git_branch = Some(created.branch);
 if created.seed_summary.manifest_found {
 emit_runtime(
 cx,
 RuntimeEvent::Notice(RuntimeNotice::WorktreeSeeded {
 copied_files: created.seed.copied_files,
 skipped: created.seed.skipped,
 limit_reached: created.seed.limit_reached,
 copied_files: created.seed_summary.copied_files,
 skipped: created.seed_summary.skipped,
 limit_reached: created.seed_summary.limit_reached,
 }),
 );
 }
Expand Down

11 changes: 10 additions & 1 deletion
crates/runtime/src/app/tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5117,6 +5117,12 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 let cx = &mut TestAppContext::default();
 let root =
 std::env::temp_dir().join(format!("tcode-dispatch-worktree-{}", uuid::Uuid::new_v4()));
 let isolated_worktrees = root.join("tcode-owned-worktrees");
 // The services lifecycle honors this process-local override so this test
 // cannot create or clean entries in the user's real ~/.tcode/worktrees.
 unsafe {
 std::env::set_var("TCODE_WORKTREES_DIR", &isolated_worktrees);
 }
 std::fs::create_dir_all(&root).unwrap();
 run_git(&root, &["init", "-b", "main"]).unwrap();
 run_git(&root, &["config", "user.name", "tcode"]).unwrap();
Expand DownExpand Up@@ -5155,7 +5161,7 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 let response = recv_dispatch_reply(cx, &response).unwrap();
 let child_id = response["thread_id"].as_str().unwrap().to_string();
 let expected_branch = format!("tcode/{child_id}");
 let expected_path = worktree_path_for(&child_id);
 let expected_path = isolated_worktrees.join(&child_id);
 assert_eq!(
 response["worktree_path"],
 expected_path.display().to_string(),
Expand All@@ -5174,5 +5180,8 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 );
 });
 remove_git_worktree(&root, &expected_path).unwrap();
 unsafe {
 std::env::remove_var("TCODE_WORKTREES_DIR");
 }
 let _ = std::fs::remove_dir_all(&root);
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: raise the worktree seam to one lifecycle module; age-guard orphan cleanup#263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Tryanks
merged 1 commit into

from

Aug 24, 2026
 Merged


refactor: raise the worktree seam to one lifecycle module; age-guard orphan cleanup
#263
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 8 additions & 4 deletions
crates/runtime/src/app/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,11 +56,11 @@ use tcode_services::acp_registry::{
 visible_agents,
};
use tcode_services::export;
#[cfg(test)]
use tcode_services::git::run_git;
use tcode_services::git::{
 CheckoutError, MergeWorktreeError, MergeWorktreeOutcome, checkout_if_clean,
 cleanup_orphaned_worktrees, commit_diff_context, create_git_worktree, list_git_branches,
 merge_worktree_back, perform_action, read_git_branch, read_status, remove_git_worktree,
 run_claude_headless, run_git, worktree_path_for,
 CheckoutError, checkout_if_clean, commit_diff_context, list_git_branches, perform_action,
 read_git_branch, read_status, run_claude_headless,
};
use tcode_services::import::{
 ExternalImportUpdate, ExternalRoots, ImportOutcome, existing_external_ids, import_thread,
Expand All@@ -77,6 +77,10 @@ use tcode_services::version_check::{
 npm_package, parse_version, tcode_update_available, update_command, update_command_string,
};
use tcode_services::workspace::list_workspace;
use tcode_services::worktree::{
 MergeBackError, MergeBackOutcome, ProvisionError, cleanup_orphans, merge_back, provision,
 remove as remove_git_worktree,
};

const TITLE_MAX_CHARS: usize = 40;
const TITLE_SOURCE_MAX_CHARS: usize = 4_000;
Expand Down

48 changes: 15 additions & 33 deletions
crates/runtime/src/app/orchestrate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,17 +414,19 @@ impl AppState {
 meta.cwd = cwd;
 meta.worktree = worktree;
 let worktree_info = meta.worktree.clone();
 let worktree_path =
 worktree_info.as_ref().map(|_| meta.cwd.clone());
 state
 .install_child_session(meta, brief, cx)
 .map(|id| (id, worktree_info, warning))
 .map(|id| (id, worktree_info, worktree_path, warning))
 })
 .await
 .unwrap_or_else(|_| Err("application closed".to_string()))
 .map(|(id, worktree, warning)| {
 .map(|(id, worktree, worktree_path, warning)| {
 let mut response = serde_json::json!({ "thread_id": id });
 if let Some(worktree) = worktree {
 response["worktree_path"] = serde_json::json!(
worktree_path_for(&id).display().to_string()
worktree_path.expect("worktree path").display().to_string()
 );
 response["worktree_branch"] =
 serde_json::json!(worktree.branch);
Expand DownExpand Up@@ -1250,43 +1252,23 @@ fn resolve_child_worktree(
 cwd: PathBuf,
 child_id: &str,
) -> (PathBuf, Option<WorktreeInfo>, Option<String>) {
 let repo_root = run_git(&cwd, &["rev-parse", "--show-toplevel"])
 .ok()
 .map(|root| PathBuf::from(root.trim()))
 .and_then(|root| root.canonicalize().ok());
 if repo_root.as_ref() != Some(&cwd) {
 let warning = format!(
 "worktree isolation unavailable: {} is not a Git repository root; using the plain cwd",
 cwd.display()
 );
 log::warn!("orchestrate dispatch: {warning}");
 return (cwd, None, Some(warning));
 }

 let base = run_git(&cwd, &["symbolic-ref", "--quiet", "--short", "HEAD"])
 .or_else(|_| run_git(&cwd, &["rev-parse", "HEAD"]))
 .map(|base| base.trim().to_string());
 let base = match base {
 Ok(base) => base,
 Err(error) => {
 let warning = format!(
 "worktree isolation unavailable: could not resolve the base revision ({error}); using the plain cwd"
 );
 log::warn!("orchestrate dispatch: {warning}");
 return (cwd, None, Some(warning));
 }
 };
 let path = worktree_path_for(child_id);
 let requested_branch = format!("tcode/{child_id}");
 match create_git_worktree(&cwd, &path, &requested_branch, &base) {
 match provision(&cwd, child_id) {
 Ok(created) => {
 let info = WorktreeInfo {
 root_project_path: cwd,
 base,
 base: created.base,
 branch: created.branch,
 };
 (created.path, Some(info), None)
 }
 Err(ProvisionError::NotRepositoryRoot { path }) => {
 let warning = format!(
 "worktree isolation unavailable: {} is not a Git repository root; using the plain cwd",
 path.display()
 );
 log::warn!("orchestrate dispatch: {warning}");
 (cwd, None, Some(warning))
 }
 Err(error) => {
 let warning = format!("worktree isolation failed ({error}); using the plain cwd");
 log::warn!("orchestrate dispatch: {warning}");
Expand Down

61 changes: 21 additions & 40 deletions
crates/runtime/src/app/sessions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -261,32 +261,30 @@ impl AppState {
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let result = host_cx
 .unblock(move || merge_worktree_back(&destination, &worktree_path, &branch))
 .unblock(move || merge_back(&destination, &worktree_path, &branch))
 .await;
 host_cx.enqueue(move |_state, cx| {
 let notice = match result {
 Ok(MergeWorktreeOutcome::FastForward) => {
 RuntimeNotice::WorktreeMergedFastForward
 }
 Ok(MergeWorktreeOutcome::MergeCommit) => RuntimeNotice::WorktreeMergedCommit,
 Ok(MergeBackOutcome::FastForward) => RuntimeNotice::WorktreeMergedFastForward,
 Ok(MergeBackOutcome::MergeCommit) => RuntimeNotice::WorktreeMergedCommit,
 Err(error) => {
 let (reason, detail) = match error {
MergeWorktreeError::WorktreeMissing => {
MergeBackError::WorktreeMissing => {
 (MergeWorktreeFailure::Missing, None)
 }
MergeWorktreeError::DirtyWorktree => {
MergeBackError::DirtyWorktree => {
 (MergeWorktreeFailure::DirtyWorktree, None)
 }
MergeWorktreeError::DestinationDetached => {
MergeBackError::DestinationDetached => {
 (MergeWorktreeFailure::DestinationDetached, None)
 }
MergeWorktreeError::DirtyDestination => {
MergeBackError::DirtyDestination => {
 (MergeWorktreeFailure::DirtyDestination, None)
 }
MergeWorktreeError::DivergedConflict => {
MergeBackError::DivergedConflict => {
 (MergeWorktreeFailure::DivergedConflict, None)
 }
MergeWorktreeError::Git(detail) => {
MergeBackError::Git(detail) => {
 (MergeWorktreeFailure::Git, Some(detail))
 }
 };
Expand DownExpand Up@@ -838,9 +836,7 @@ impl AppState {
 .collect();
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let summary = host_cx
 .unblock(move || cleanup_orphaned_worktrees(&known_ids))
 .await;
 let summary = host_cx.unblock(move || cleanup_orphans(&known_ids)).await;
 if !summary.removed.is_empty() || !summary.skipped.is_empty() {
 log::info!(
 "worktree orphan recovery removed {}, left {}",
Expand All@@ -865,37 +861,22 @@ impl AppState {
 &mut self,
 text: String,
 attachments: Vec<Attachment>,
base: String,
_base: String,
 cx: &mut HostCx,
 ) {
 let Some(active) = self.residents.active.as_mut() else {
 return;
 };
 active.preparing_worktree = true;
 let session_id = active.meta.id.clone();
 let session_id_for_task = session_id.clone();
 let root = active.meta.cwd.clone();

 let path = worktree_path_for(&session_id);
 let branch = format!("tcode/{session_id}");
 let base_for_task = base.clone();
 let root_for_task = root.clone();
 let path_for_task = path.clone();
 let branch_for_task = branch.clone();
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let result = host_cx
 .unblock(move || {
 create_git_worktree(
 &root_for_task,
 &path_for_task,
 &branch_for_task,
 &base_for_task,
 )
 .map(|created| {
 let git_branch = read_git_branch(&created.path);
 (created, git_branch)
 })
 })
 .unblock(move || provision(&root_for_task, &session_id_for_task))
 .await;
 host_cx.enqueue(move |state, cx| {
 let Some(active) = state
Expand All@@ -908,22 +889,22 @@ impl AppState {
 };
 active.preparing_worktree = false;
 match result {
 Ok((created, git_branch)) => {
 Ok(created) => {
 active.meta.cwd = created.path.clone();
 active.meta.worktree = Some(WorktreeInfo {
 root_project_path: root,
 base,
 branch: created.branch,
 base: created.base,
 branch: created.branch.clone(),
 });
 active.draft_workspace = WorkspaceMode::LocalCheckout;
 active.git_branch = git_branch;
 if created.seed.manifest_found {
 active.git_branch = Some(created.branch);
 if created.seed_summary.manifest_found {
 emit_runtime(
 cx,
 RuntimeEvent::Notice(RuntimeNotice::WorktreeSeeded {
 copied_files: created.seed.copied_files,
 skipped: created.seed.skipped,
 limit_reached: created.seed.limit_reached,
 copied_files: created.seed_summary.copied_files,
 skipped: created.seed_summary.skipped,
 limit_reached: created.seed_summary.limit_reached,
 }),
 );
 }
Expand Down

11 changes: 10 additions & 1 deletion
crates/runtime/src/app/tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5117,6 +5117,12 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 let cx = &mut TestAppContext::default();
 let root =
 std::env::temp_dir().join(format!("tcode-dispatch-worktree-{}", uuid::Uuid::new_v4()));
 let isolated_worktrees = root.join("tcode-owned-worktrees");
 // The services lifecycle honors this process-local override so this test
 // cannot create or clean entries in the user's real ~/.tcode/worktrees.
 unsafe {
 std::env::set_var("TCODE_WORKTREES_DIR", &isolated_worktrees);
 }
 std::fs::create_dir_all(&root).unwrap();
 run_git(&root, &["init", "-b", "main"]).unwrap();
 run_git(&root, &["config", "user.name", "tcode"]).unwrap();
Expand DownExpand Up@@ -5155,7 +5161,7 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 let response = recv_dispatch_reply(cx, &response).unwrap();
 let child_id = response["thread_id"].as_str().unwrap().to_string();
 let expected_branch = format!("tcode/{child_id}");
 let expected_path = worktree_path_for(&child_id);
 let expected_path = isolated_worktrees.join(&child_id);
 assert_eq!(
 response["worktree_path"],
 expected_path.display().to_string(),
Expand All@@ -5174,5 +5180,8 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 );
 });
 remove_git_worktree(&root, &expected_path).unwrap();
 unsafe {
 std::env::remove_var("TCODE_WORKTREES_DIR");
 }
 let _ = std::fs::remove_dir_all(&root);
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
refactor: raise the worktree seam to one lifecycle module; age-guard orphan cleanup#263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Tryanks
merged 1 commit into

from

Aug 24, 2026
 Merged


refactor: raise the worktree seam to one lifecycle module; age-guard orphan cleanup
#263
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 8 additions & 4 deletions
crates/runtime/src/app/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,11 +56,11 @@ use tcode_services::acp_registry::{
 visible_agents,
};
use tcode_services::export;
#[cfg(test)]
use tcode_services::git::run_git;
use tcode_services::git::{
 CheckoutError, MergeWorktreeError, MergeWorktreeOutcome, checkout_if_clean,
 cleanup_orphaned_worktrees, commit_diff_context, create_git_worktree, list_git_branches,
 merge_worktree_back, perform_action, read_git_branch, read_status, remove_git_worktree,
 run_claude_headless, run_git, worktree_path_for,
 CheckoutError, checkout_if_clean, commit_diff_context, list_git_branches, perform_action,
 read_git_branch, read_status, run_claude_headless,
};
use tcode_services::import::{
 ExternalImportUpdate, ExternalRoots, ImportOutcome, existing_external_ids, import_thread,
Expand All@@ -77,6 +77,10 @@ use tcode_services::version_check::{
 npm_package, parse_version, tcode_update_available, update_command, update_command_string,
};
use tcode_services::workspace::list_workspace;
use tcode_services::worktree::{
 MergeBackError, MergeBackOutcome, ProvisionError, cleanup_orphans, merge_back, provision,
 remove as remove_git_worktree,
};

const TITLE_MAX_CHARS: usize = 40;
const TITLE_SOURCE_MAX_CHARS: usize = 4_000;
Expand Down

48 changes: 15 additions & 33 deletions
crates/runtime/src/app/orchestrate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,17 +414,19 @@ impl AppState {
 meta.cwd = cwd;
 meta.worktree = worktree;
 let worktree_info = meta.worktree.clone();
 let worktree_path =
 worktree_info.as_ref().map(|_| meta.cwd.clone());
 state
 .install_child_session(meta, brief, cx)
 .map(|id| (id, worktree_info, warning))
 .map(|id| (id, worktree_info, worktree_path, warning))
 })
 .await
 .unwrap_or_else(|_| Err("application closed".to_string()))
 .map(|(id, worktree, warning)| {
 .map(|(id, worktree, worktree_path, warning)| {
 let mut response = serde_json::json!({ "thread_id": id });
 if let Some(worktree) = worktree {
 response["worktree_path"] = serde_json::json!(
worktree_path_for(&id).display().to_string()
worktree_path.expect("worktree path").display().to_string()
 );
 response["worktree_branch"] =
 serde_json::json!(worktree.branch);
Expand DownExpand Up@@ -1250,43 +1252,23 @@ fn resolve_child_worktree(
 cwd: PathBuf,
 child_id: &str,
) -> (PathBuf, Option<WorktreeInfo>, Option<String>) {
 let repo_root = run_git(&cwd, &["rev-parse", "--show-toplevel"])
 .ok()
 .map(|root| PathBuf::from(root.trim()))
 .and_then(|root| root.canonicalize().ok());
 if repo_root.as_ref() != Some(&cwd) {
 let warning = format!(
 "worktree isolation unavailable: {} is not a Git repository root; using the plain cwd",
 cwd.display()
 );
 log::warn!("orchestrate dispatch: {warning}");
 return (cwd, None, Some(warning));
 }

 let base = run_git(&cwd, &["symbolic-ref", "--quiet", "--short", "HEAD"])
 .or_else(|_| run_git(&cwd, &["rev-parse", "HEAD"]))
 .map(|base| base.trim().to_string());
 let base = match base {
 Ok(base) => base,
 Err(error) => {
 let warning = format!(
 "worktree isolation unavailable: could not resolve the base revision ({error}); using the plain cwd"
 );
 log::warn!("orchestrate dispatch: {warning}");
 return (cwd, None, Some(warning));
 }
 };
 let path = worktree_path_for(child_id);
 let requested_branch = format!("tcode/{child_id}");
 match create_git_worktree(&cwd, &path, &requested_branch, &base) {
 match provision(&cwd, child_id) {
 Ok(created) => {
 let info = WorktreeInfo {
 root_project_path: cwd,
 base,
 base: created.base,
 branch: created.branch,
 };
 (created.path, Some(info), None)
 }
 Err(ProvisionError::NotRepositoryRoot { path }) => {
 let warning = format!(
 "worktree isolation unavailable: {} is not a Git repository root; using the plain cwd",
 path.display()
 );
 log::warn!("orchestrate dispatch: {warning}");
 (cwd, None, Some(warning))
 }
 Err(error) => {
 let warning = format!("worktree isolation failed ({error}); using the plain cwd");
 log::warn!("orchestrate dispatch: {warning}");
Expand Down

61 changes: 21 additions & 40 deletions
crates/runtime/src/app/sessions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -261,32 +261,30 @@ impl AppState {
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let result = host_cx
 .unblock(move || merge_worktree_back(&destination, &worktree_path, &branch))
 .unblock(move || merge_back(&destination, &worktree_path, &branch))
 .await;
 host_cx.enqueue(move |_state, cx| {
 let notice = match result {
 Ok(MergeWorktreeOutcome::FastForward) => {
 RuntimeNotice::WorktreeMergedFastForward
 }
 Ok(MergeWorktreeOutcome::MergeCommit) => RuntimeNotice::WorktreeMergedCommit,
 Ok(MergeBackOutcome::FastForward) => RuntimeNotice::WorktreeMergedFastForward,
 Ok(MergeBackOutcome::MergeCommit) => RuntimeNotice::WorktreeMergedCommit,
 Err(error) => {
 let (reason, detail) = match error {
MergeWorktreeError::WorktreeMissing => {
MergeBackError::WorktreeMissing => {
 (MergeWorktreeFailure::Missing, None)
 }
MergeWorktreeError::DirtyWorktree => {
MergeBackError::DirtyWorktree => {
 (MergeWorktreeFailure::DirtyWorktree, None)
 }
MergeWorktreeError::DestinationDetached => {
MergeBackError::DestinationDetached => {
 (MergeWorktreeFailure::DestinationDetached, None)
 }
MergeWorktreeError::DirtyDestination => {
MergeBackError::DirtyDestination => {
 (MergeWorktreeFailure::DirtyDestination, None)
 }
MergeWorktreeError::DivergedConflict => {
MergeBackError::DivergedConflict => {
 (MergeWorktreeFailure::DivergedConflict, None)
 }
MergeWorktreeError::Git(detail) => {
MergeBackError::Git(detail) => {
 (MergeWorktreeFailure::Git, Some(detail))
 }
 };
Expand DownExpand Up@@ -838,9 +836,7 @@ impl AppState {
 .collect();
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let summary = host_cx
 .unblock(move || cleanup_orphaned_worktrees(&known_ids))
 .await;
 let summary = host_cx.unblock(move || cleanup_orphans(&known_ids)).await;
 if !summary.removed.is_empty() || !summary.skipped.is_empty() {
 log::info!(
 "worktree orphan recovery removed {}, left {}",
Expand All@@ -865,37 +861,22 @@ impl AppState {
 &mut self,
 text: String,
 attachments: Vec<Attachment>,
base: String,
_base: String,
 cx: &mut HostCx,
 ) {
 let Some(active) = self.residents.active.as_mut() else {
 return;
 };
 active.preparing_worktree = true;
 let session_id = active.meta.id.clone();
 let session_id_for_task = session_id.clone();
 let root = active.meta.cwd.clone();

 let path = worktree_path_for(&session_id);
 let branch = format!("tcode/{session_id}");
 let base_for_task = base.clone();
 let root_for_task = root.clone();
 let path_for_task = path.clone();
 let branch_for_task = branch.clone();
 let host_cx = cx.clone();
 HostCx::spawn_detached(cx, async move {
 let result = host_cx
 .unblock(move || {
 create_git_worktree(
 &root_for_task,
 &path_for_task,
 &branch_for_task,
 &base_for_task,
 )
 .map(|created| {
 let git_branch = read_git_branch(&created.path);
 (created, git_branch)
 })
 })
 .unblock(move || provision(&root_for_task, &session_id_for_task))
 .await;
 host_cx.enqueue(move |state, cx| {
 let Some(active) = state
Expand All@@ -908,22 +889,22 @@ impl AppState {
 };
 active.preparing_worktree = false;
 match result {
 Ok((created, git_branch)) => {
 Ok(created) => {
 active.meta.cwd = created.path.clone();
 active.meta.worktree = Some(WorktreeInfo {
 root_project_path: root,
 base,
 branch: created.branch,
 base: created.base,
 branch: created.branch.clone(),
 });
 active.draft_workspace = WorkspaceMode::LocalCheckout;
 active.git_branch = git_branch;
 if created.seed.manifest_found {
 active.git_branch = Some(created.branch);
 if created.seed_summary.manifest_found {
 emit_runtime(
 cx,
 RuntimeEvent::Notice(RuntimeNotice::WorktreeSeeded {
 copied_files: created.seed.copied_files,
 skipped: created.seed.skipped,
 limit_reached: created.seed.limit_reached,
 copied_files: created.seed_summary.copied_files,
 skipped: created.seed_summary.skipped,
 limit_reached: created.seed_summary.limit_reached,
 }),
 );
 }
Expand Down

11 changes: 10 additions & 1 deletion
crates/runtime/src/app/tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5117,6 +5117,12 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 let cx = &mut TestAppContext::default();
 let root =
 std::env::temp_dir().join(format!("tcode-dispatch-worktree-{}", uuid::Uuid::new_v4()));
 let isolated_worktrees = root.join("tcode-owned-worktrees");
 // The services lifecycle honors this process-local override so this test
 // cannot create or clean entries in the user's real ~/.tcode/worktrees.
 unsafe {
 std::env::set_var("TCODE_WORKTREES_DIR", &isolated_worktrees);
 }
 std::fs::create_dir_all(&root).unwrap();
 run_git(&root, &["init", "-b", "main"]).unwrap();
 run_git(&root, &["config", "user.name", "tcode"]).unwrap();
Expand DownExpand Up@@ -5155,7 +5161,7 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 let response = recv_dispatch_reply(cx, &response).unwrap();
 let child_id = response["thread_id"].as_str().unwrap().to_string();
 let expected_branch = format!("tcode/{child_id}");
 let expected_path = worktree_path_for(&child_id);
 let expected_path = isolated_worktrees.join(&child_id);
 assert_eq!(
 response["worktree_path"],
 expected_path.display().to_string(),
Expand All@@ -5174,5 +5180,8 @@ fn orchestrate_worktree_dispatch_resolves_child_cwd_to_worktree() {
 );
 });
 remove_git_worktree(&root, &expected_path).unwrap();
 unsafe {
 std::env::remove_var("TCODE_WORKTREES_DIR");
 }
 let _ = std::fs::remove_dir_all(&root);
}
Loading