Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 33 additions & 1 deletion src/renderer/features/task-detail/stores/taskExecutionStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import type {
} from "@shared/types";
import { cloneStore } from "@stores/cloneStore";
import { repositoryWorkspaceStore } from "@stores/repositoryWorkspaceStore";
import { useTaskDirectoryStore } from "@stores/taskDirectoryStore";
import { expandTildePath } from "@utils/path";
import { create } from "zustand";
import { persist } from "zustand/middleware";
Expand Down Expand Up @@ -248,6 +249,11 @@ export const useTaskExecutionStore = create<TaskExecutionStore>()(

setRepoPath: (taskId: string, repoPath: string | null) => {
get().updateTaskState(taskId, { repoPath });

// Persist to taskDirectoryStore
if (repoPath) {
useTaskDirectoryStore.getState().setTaskDirectory(taskId, repoPath);
}
},

setCurrentTaskId: (taskId: string, currentTaskId: string | null) => {
Expand Down Expand Up @@ -729,7 +735,33 @@ export const useTaskExecutionStore = create<TaskExecutionStore>()(
const store = get();
const taskState = store.getTaskState(taskId);

if (taskState.repoPath || !task.repository_config) return;
if (taskState.repoPath) return;

// 1. Check taskDirectoryStore first
const repoKey = task.repository_config
? `${task.repository_config.organization}/${task.repository_config.repository}`
: undefined;

const storedDirectory = useTaskDirectoryStore
.getState()
.getTaskDirectory(taskId, repoKey);
if (storedDirectory) {
store.setRepoPath(taskId, storedDirectory);

// Validate repo exists
window.electronAPI
?.validateRepo(storedDirectory)
.then((exists) => {
store.updateTaskState(taskId, { repoExists: exists });
})
.catch(() => {
store.updateTaskState(taskId, { repoExists: false });
});
return;
}

// 2. Fallback to deriving from workspace (existing logic)
if (!task.repository_config) return;

const { defaultWorkspace } = useAuthStore.getState();
if (!defaultWorkspace) return;
Expand Down
7 changes: 7 additions & 0 deletions src/renderer/stores/cloneStore.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useTaskExecutionStore } from "@features/task-detail/stores/taskExecutionStore";
import type { RepositoryConfig } from "@shared/types";
import { useTaskDirectoryStore } from "@stores/taskDirectoryStore";
import { create } from "zustand";

type CloneStatus = "cloning" | "complete" | "error";
Expand Down Expand Up @@ -50,6 +51,12 @@ export const cloneStore = create<CloneStore>((set, get) => {
const operation = get().operations[cloneId];
if (operation) {
updateTaskRepoExists(operation.targetPath, true);

// Save repo → directory mapping for future tasks
const repoKey = `${operation.repository.organization}/${operation.repository.repository}`;
useTaskDirectoryStore
.getState()
.setRepoDirectory(repoKey, operation.targetPath);
}

window.setTimeout(
Expand Down
Loading