Skip to content

fix: Consecutive Cmd+N no longer spawns agent in wrong project #147

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
2witstudios merged 2 commits into from
Mar 14, 2026
Merged

fix: Consecutive Cmd+N no longer spawns agent in wrong project #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adfdcc6
fix: Consecutive Cmd+N no longer spawns agent in wrong project
2witstudios Mar 13, 2026
76319f4
fix: Guard activeProjectRoot callbacks against removed projects
2witstudios Mar 14, 2026
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
8 changes: 6 additions & 2 deletions apps/purepoint-macos/purepoint-macos/State/AppState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,13 @@ final class AppState {

switch selection {
case .agent(let id), .terminal(let id):
activeProjectRoot = projectState(forAgentId: id)?.projectRoot
if let root = projectState(forAgentId: id)?.projectRoot {
activeProjectRoot = root
}
case .worktree(let id):
activeProjectRoot = projectState(forWorktreeId: id)?.projectRoot
if let root = projectState(forWorktreeId: id)?.projectRoot {
activeProjectRoot = root
}
case .project(let root):
activeProjectRoot = root
case nil, .nav:
Expand Down
6 changes: 6 additions & 0 deletions apps/purepoint-macos/purepoint-macos/State/ProjectState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ final class ProjectState: Identifiable {
)
) { response in
if case .spawnResult(_, let agentId, _) = response {
if self.appState?.projectState(forRoot: self.projectRoot) != nil {
self.appState?.activeProjectRoot = self.projectRoot
}
self.appState?.pendingSelectAgentId = agentId
}
}
Expand Down Expand Up @@ -196,6 +199,9 @@ final class ProjectState: Identifiable {
func createWorktree(name: String?) {
sendDaemonRequest(.createWorktree(projectRoot: projectRoot, name: name)) { response in
if case .createWorktreeResult(let worktreeId) = response {
if self.appState?.projectState(forRoot: self.projectRoot) != nil {
self.appState?.activeProjectRoot = self.projectRoot
}
self.appState?.pendingSelectWorktreeId = worktreeId
}
}
Expand Down
20 changes: 20 additions & 0 deletions apps/purepoint-macos/purepoint-macosTests/ActiveProjectRoutingTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,26 @@ struct ActiveProjectRoutingTests {
#expect(state.activeSidebarSelection == .agent("a1"))
}

@Test func unknownWorktreeIdPreservesActiveProjectRoot() {
let state = AppState(service: StubWorkspaceService())
state.projects = [makeProject(root: "/a"), makeProject(root: "/b")]
state.activeProjectRoot = "/a"

state.updateActiveProject(for: .worktree("nonexistent"))

#expect(state.activeProjectRoot == "/a")
}

@Test func unknownAgentIdPreservesActiveProjectRoot() {
let state = AppState(service: StubWorkspaceService())
state.projects = [makeProject(root: "/a"), makeProject(root: "/b")]
state.activeProjectRoot = "/a"

state.updateActiveProject(for: .agent("nonexistent"))

#expect(state.activeProjectRoot == "/a")
}

@Test func worktreeAgentTerminalRoutesThroughWorktree() {
let state = AppState(service: StubWorkspaceService())
state.projects = [
Expand Down
Loading