opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: worktree path stays under workspace, not inside project repo

Browse source 
repoRoot is used for git operations only. The worktree directory lives
under ai.Workspace/.picoclaw/worktrees/ to avoid polluting the user's
project with a .picoclaw directory.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
dj-oyu 2026-02-24 18:05:40 +09:00
parent 1e5926ee35
commit bbc3dea9ed
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/agent/instance.go
View file

@ -208,7 +208,7 @@ func resolvePlanFallbacks(agentCfg *config.AgentConfig, defaults *config.AgentDe
// ActivateWorktree creates a worktree for a session. // ActivateWorktree creates a worktree for a session.
// projectDir is the git repository to create the worktree in. // projectDir is the git repository to create the worktree in.
// If empty, falls back to ai.Workspace. // If empty, falls back to ai.Workspace.
// Path: <projectDir>/.picoclaw/worktrees/<branch-basename>/ // Worktree path: <workspace>/.picoclaw/worktrees/<branch-basename>/
func (ai *AgentInstance) ActivateWorktree(sessionKey, taskName, projectDir string) (*git.WorktreeInfo, error) { func (ai *AgentInstance) ActivateWorktree(sessionKey, taskName, projectDir string) (*git.WorktreeInfo, error) {
if projectDir == "" { if projectDir == "" {
projectDir = ai.Workspace projectDir = ai.Workspace
@ -220,7 +220,7 @@ func (ai *AgentInstance) ActivateWorktree(sessionKey, taskName, projectDir strin
branchName := git.SanitizeBranchName(taskName) branchName := git.SanitizeBranchName(taskName)
baseName := git.BranchBaseName(branchName) baseName := git.BranchBaseName(branchName)
wtPath := filepath.Join(repoRoot, ".picoclaw", "worktrees", baseName) wtPath := filepath.Join(ai.Workspace, ".picoclaw", "worktrees", baseName)
wt, err := git.CreateWorktree(repoRoot, wtPath, branchName) wt, err := git.CreateWorktree(repoRoot, wtPath, branchName)
if err != nil { if err != nil {