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
8 changes: 4 additions & 4 deletions internal/executor/claude_executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func (c *ClaudeExecutor) BuildCommand(task *db.Task, sessionID, prompt string) s

// Build command - resume if we have a session ID, otherwise start fresh
if sessionID != "" {
cmd := fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q claude %s%s--chrome --resume %s`,
cmd := fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q claude %s%s--resume %s`,
task.ID, worktreeSessionID, task.Port, task.WorktreePath, dangerousFlag, systemPromptFlag, sessionID)
if systemFile != nil {
cmd += fmt.Sprintf(`; rm -f %q`, systemFile.Name())
Expand All @@ -113,7 +113,7 @@ func (c *ClaudeExecutor) BuildCommand(task *db.Task, sessionID, prompt string) s
promptFile, err := os.CreateTemp("", "task-prompt-*.txt")
if err != nil {
c.logger.Error("BuildCommand: failed to create temp file", "error", err)
cmd := fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q claude %s%s--chrome`,
cmd := fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q claude %s%s`,
task.ID, worktreeSessionID, task.Port, task.WorktreePath, dangerousFlag, systemPromptFlag)
if systemFile != nil {
cmd += fmt.Sprintf(`; rm -f %q`, systemFile.Name())
Expand All @@ -123,15 +123,15 @@ func (c *ClaudeExecutor) BuildCommand(task *db.Task, sessionID, prompt string) s
promptFile.WriteString(prompt)
promptFile.Close()

cmd := fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q claude %s%s--chrome "$(cat %q)"; rm -f %q`,
cmd := fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q claude %s%s"$(cat %q)"; rm -f %q`,
task.ID, worktreeSessionID, task.Port, task.WorktreePath, dangerousFlag, systemPromptFlag, promptFile.Name(), promptFile.Name())
if systemFile != nil {
cmd += fmt.Sprintf(` %q`, systemFile.Name())
}
return cmd
}

cmd := fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q claude %s%s--chrome`,
cmd := fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q claude %s%s`,
task.ID, worktreeSessionID, task.Port, task.WorktreePath, dangerousFlag, systemPromptFlag)
if systemFile != nil {
cmd += fmt.Sprintf(`; rm -f %q`, systemFile.Name())
Expand Down
10 changes: 5 additions & 5 deletions internal/executor/executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -2192,7 +2192,7 @@ func (e *Executor) runClaude(ctx context.Context, task *db.Task, workDir, prompt
envPrefix := claudeEnvPrefix(paths.configDir)
if existingSessionID != "" && ClaudeSessionExists(existingSessionID, workDir, paths.configDir) {
e.logLine(task.ID, "system", fmt.Sprintf("Resuming existing session %s", existingSessionID))
script = fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q %sclaude %s%s--chrome --resume %s "$(cat %q)"`,
script = fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q %sclaude %s%s--resume %s "$(cat %q)"`,
task.ID, sessionID, task.Port, task.WorktreePath, envPrefix, dangerousFlag, systemPromptFlag, existingSessionID, promptFile.Name())
} else {
if existingSessionID != "" {
Expand All @@ -2202,7 +2202,7 @@ func (e *Executor) runClaude(ctx context.Context, task *db.Task, workDir, prompt
e.logger.Warn("failed to clear stale session ID", "task", task.ID, "error", err)
}
}
script = fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q %sclaude %s%s--chrome "$(cat %q)"`,
script = fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q %sclaude %s%s"$(cat %q)"`,
task.ID, sessionID, task.Port, task.WorktreePath, envPrefix, dangerousFlag, systemPromptFlag, promptFile.Name())
}

Expand Down Expand Up @@ -2359,7 +2359,7 @@ func (e *Executor) runClaudeResume(ctx context.Context, task *db.Task, workDir,
systemPromptFlag := fmt.Sprintf(`--append-system-prompt "$(cat %q)" `, systemFile.Name())

envPrefix := claudeEnvPrefix(paths.configDir)
script := fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q %sclaude %s%s--chrome --resume %s "$(cat %q)"`,
script := fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q %sclaude %s%s--resume %s "$(cat %q)"`,
task.ID, taskSessionID, task.Port, task.WorktreePath, envPrefix, dangerousFlag, systemPromptFlag, claudeSessionID, feedbackFile.Name())

// Create new window in task-daemon session (with retry logic for race conditions)
Expand Down Expand Up @@ -2516,7 +2516,7 @@ func (e *Executor) resumeClaudeDangerous(task *db.Task, workDir string) bool {

// Force dangerous mode regardless of WORKTREE_DANGEROUS_MODE setting
envPrefix := claudeEnvPrefix(paths.configDir)
script := fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q %sclaude --dangerously-skip-permissions --chrome --resume %s`,
script := fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q %sclaude --dangerously-skip-permissions --resume %s`,
taskID, taskSessionID, task.Port, task.WorktreePath, envPrefix, claudeSessionID)

// Create new window in task-daemon session (with retry logic for race conditions)
Expand Down Expand Up @@ -2681,7 +2681,7 @@ func (e *Executor) resumeClaudeSafe(task *db.Task, workDir string) bool {

// Resume without --dangerously-skip-permissions (safe mode)
envPrefix := claudeEnvPrefix(paths.configDir)
script := fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q %sclaude --chrome --resume %s`,
script := fmt.Sprintf(`WORKTREE_TASK_ID=%d WORKTREE_SESSION_ID=%s WORKTREE_PORT=%d WORKTREE_PATH=%q %sclaude --resume %s`,
taskID, taskSessionID, task.Port, task.WorktreePath, envPrefix, claudeSessionID)

// Create new window in task-daemon session (with retry logic for race conditions)
Expand Down