José Almeida
b0f8c3f4f4
Every ACP agent's session dir was bind-mounted from ~/.<agent> on the host into /root/.<agent> in the container. That exposed host state DBs, session caches, and lock files to the container — codex's rollout DB caches absolute /Users/... paths, which don't resolve inside Linux and the agent silently loses prior thread context on resume. Replace the host bind mount with a kandev-managed per-container session dir under <kandev-home>/agent-sessions/<instance_id>/. Before the container starts, selectively copy the auth-relevant files (the same files Sprites already copies via RemoteAuth.SourceFiles) into that dir; everything else — state DBs, sessions/, lock files — stays on the host and the agent rebuilds them inside the container with container-local Linux paths. The change is agent-agnostic: any agent that has SessionDirTemplate + SessionDirTarget gets the new behavior automatically. Cleanup runs on destructive stops only (task/session deleted/archived), mirroring the Sprites preserve-on-stop rule so plain stops let resume re-attach to the same agent state.
96 lines
3.5 KiB
Go
96 lines
3.5 KiB
Go
// Package lifecycle manages agent instance lifecycles including tracking,
|
|
// state transitions, and cleanup.
|
|
package lifecycle
|
|
|
|
import (
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/kandev/kandev/internal/agent/agents"
|
|
)
|
|
|
|
// CommandBuilder builds agent commands from agent configuration.
|
|
// Delegates to the Agent interface's BuildCommand method.
|
|
type CommandBuilder struct{}
|
|
|
|
// NewCommandBuilder creates a new CommandBuilder
|
|
func NewCommandBuilder() *CommandBuilder {
|
|
return &CommandBuilder{}
|
|
}
|
|
|
|
// BuildCommand builds a Command from agent config and options. Delegates to
|
|
// the Agent.BuildCommand method and then appends the user-configured CLI
|
|
// flag tokens so every agent participates in the cli_flags feature without
|
|
// each BuildCommand needing to remember to opt in.
|
|
func (cb *CommandBuilder) BuildCommand(ag agents.Agent, opts agents.CommandOptions) agents.Command {
|
|
cmd := ag.BuildCommand(opts)
|
|
if len(opts.CLIFlagTokens) == 0 {
|
|
return cmd
|
|
}
|
|
return cmd.With().Flag(opts.CLIFlagTokens...).Build()
|
|
}
|
|
|
|
// BuildCommandString builds a command as a single string (for standalone mode)
|
|
func (cb *CommandBuilder) BuildCommandString(ag agents.Agent, opts agents.CommandOptions) string {
|
|
cmd := cb.BuildCommand(ag, opts)
|
|
return strings.Join(cmd.Args(), " ")
|
|
}
|
|
|
|
// BuildContinueCommandString builds the continue command with the same model/permission
|
|
// flags as the initial command. Used by one-shot agents (Amp) where each follow-up prompt
|
|
// needs a separate "threads continue" command. Returns empty string if the agent has no
|
|
// ContinueSessionCmd configured.
|
|
func (cb *CommandBuilder) BuildContinueCommandString(ag agents.Agent, opts agents.CommandOptions) string {
|
|
sessionCfg := ag.Runtime().SessionConfig
|
|
if sessionCfg.ContinueSessionCmd.IsEmpty() {
|
|
return ""
|
|
}
|
|
|
|
// Start from the continue command base and apply the same flags as BuildCommand
|
|
cmd := sessionCfg.ContinueSessionCmd.With().
|
|
Model(ag.Runtime().ModelFlag, opts.Model).
|
|
Settings(ag.PermissionSettings(), opts.PermissionValues).
|
|
Flag(opts.CLIFlagTokens...).
|
|
Build()
|
|
|
|
return strings.Join(cmd.Args(), " ")
|
|
}
|
|
|
|
// ExpandSessionDir resolves the host-side directory that should be bind-
|
|
// mounted into the container at SessionDirTarget. When kandevHomeDir and
|
|
// instanceID are non-empty, the path is the kandev-managed per-container
|
|
// session dir (~/.kandev/agent-sessions/<instance_id>/<dotdir>) — isolated
|
|
// from the user's actual ~/<dotdir> so the host's stale state DBs and
|
|
// session caches stay out of the container.
|
|
//
|
|
// Falls back to the legacy {home}/<dotdir> expansion only when kandev home
|
|
// is unavailable (kept narrow on purpose; callers in production always have
|
|
// a resolved kandev home).
|
|
//
|
|
// Returns empty string if no session directory is configured.
|
|
func (cb *CommandBuilder) ExpandSessionDir(ag agents.Agent, kandevHomeDir, instanceID string) string {
|
|
template := ag.Runtime().SessionConfig.SessionDirTemplate
|
|
if template == "" {
|
|
return ""
|
|
}
|
|
|
|
if path := SessionDirHostPath(kandevHomeDir, instanceID, template); path != "" {
|
|
_ = os.MkdirAll(path, 0o755)
|
|
return path
|
|
}
|
|
|
|
homeDir, err := os.UserHomeDir()
|
|
if err != nil {
|
|
homeDir = "/tmp"
|
|
}
|
|
result := strings.ReplaceAll(template, "{home}", homeDir)
|
|
_ = os.MkdirAll(result, 0o755)
|
|
return result
|
|
}
|
|
|
|
// GetSessionDirTarget returns the container path for session directory mount.
|
|
// Returns empty string if no session directory is configured.
|
|
func (cb *CommandBuilder) GetSessionDirTarget(ag agents.Agent) string {
|
|
return ag.Runtime().SessionConfig.SessionDirTarget
|
|
}
|