mirror of
https://github.com/Twigpine/zero.git
synced 2026-11-11 23:40:28 -10:00
* chore: remove code unreachable on every supported platform The Security and code health job's advisory deadcode step reports 152 unreachable functions on main. Running the same check under GOOS=linux, windows, and darwin shows 13 of those are false positives whose callers live in windows build-tagged files, so only functions unreachable on all three platforms are touched. Functions with no references anywhere are deleted, including the internal/reasoning package, which nothing imports. Functions that only tests reference move into per-package export_test.go files so tests keep their seams while the production binary sheds the code. Test call sites of deleted convenience wrappers are ported to the live APIs (scoped tool constructors, tools.DeferredSource, FinishReason checks). Kept despite the report: cron.Store.Runs (only reader of runs.jsonl, which production writes), and agenteval.TraceEventKeys and MissingTraceEvents (used across packages by the trace contract test). * docs(config): correct ValidateFile's errors.As claim Message is a flattened string (.Error() already called on the parse error), not a wrapped error, so callers can't recover the concrete json error type via errors.As. Fix the comment to match. Co-Authored-By: Claude Sonnet 5 <[email protected]> * chore(trace,skills): drop obsolete Sink adapters and fix stale doc references The dead-code pass removed the Emit methods but left Sink, NDJSONSink, and TextSink exported with a contract nothing implements; remove the types with their contract. Also remove the stray blank line at EOF of trace.go flagged by gofmt, and update skills package docs and HOW_ZERO_WORKS.md to stop directing callers to DiscoveryRoots/Duplicates, which are now test seams. Co-Authored-By: Claude Fable 5 <[email protected]> * chore: clean up remaining review nits on dead code removal Replace a pointless fmt.Errorf(...%w...).Error() with fmt.Sprintf using %v, since the wrapped error was discarded immediately anyway. Remove a comment block that was duplicated verbatim. * docs(skills): drop remaining references to test-only List/Get Load and MergedSkills comments still named List/Get as production entry points after they moved to export_test.go. Point callers at Load and ListFromRoots instead. * chore: remove now-unreferenced export_test.go seams execSessionManager.len() and likelySandboxDenied/sandboxDenialKind had no remaining callers after the sandbox unify-command-execution rebase; the production code they wrapped for tests no longer exists. --------- Co-authored-by: Claude Sonnet 5 <[email protected]>
746 lines
23 KiB
Go
746 lines
23 KiB
Go
package acp
|
|
|
|
import (
|
|
"context"
|
|
"encoding/base64"
|
|
"encoding/json"
|
|
"errors"
|
|
"log"
|
|
"strings"
|
|
"sync"
|
|
|
|
"github.com/Gitlawb/zero/internal/agent"
|
|
"github.com/Gitlawb/zero/internal/config"
|
|
"github.com/Gitlawb/zero/internal/providercatalog"
|
|
"github.com/Gitlawb/zero/internal/providermodelcatalog"
|
|
"github.com/Gitlawb/zero/internal/providermodeldiscovery"
|
|
"github.com/Gitlawb/zero/internal/sandbox"
|
|
"github.com/Gitlawb/zero/internal/sessions"
|
|
"github.com/Gitlawb/zero/internal/tools"
|
|
"github.com/Gitlawb/zero/internal/zeroruntime"
|
|
)
|
|
|
|
// Deps are the ZERO capabilities the ACP Agent drives. The CLI fills these with
|
|
// real implementations; tests inject fakes (e.g. a canned provider) to drive the
|
|
// full ACP flow without a live model. Keeping auth/model/keys behind these deps
|
|
// means the editor only hosts the thread — ZERO owns BYOK and telemetry-free
|
|
// operation.
|
|
type Deps struct {
|
|
ResolveConfig func(workspaceRoot string, overrides config.Overrides) (config.ResolvedConfig, error)
|
|
DiscoverModels func(context.Context, config.ProviderProfile) ([]providermodeldiscovery.Model, error)
|
|
NewProvider func(profile config.ProviderProfile) (zeroruntime.Provider, error)
|
|
RunAgent func(ctx context.Context, prompt string, provider zeroruntime.Provider, opts agent.Options) (agent.Result, error)
|
|
// BuildWorkspace builds the SCOPED tool registry and the sandbox engine for a
|
|
// validated workspace root, so ACP shell tools (bash/exec_command) are confined
|
|
// exactly like the exec surface — never run unconfined on the host.
|
|
BuildWorkspace func(workspaceRoot string, resolved config.ResolvedConfig) (*tools.Registry, *sandbox.Engine, error)
|
|
// ResolveWorkspaceRoot validates + normalizes a client-supplied cwd (must be an
|
|
// existing directory; never the bare root). It is the file-tool confinement root.
|
|
ResolveWorkspaceRoot func(cwd string) (string, error)
|
|
Store *sessions.Store
|
|
AgentInfo Implementation
|
|
}
|
|
|
|
// Agent is the ACP agent server bound to one JSON-RPC connection (one editor).
|
|
type Agent struct {
|
|
conn *Conn
|
|
deps Deps
|
|
|
|
mu sync.Mutex
|
|
clientCaps ClientCapabilities
|
|
initialized bool
|
|
sessions map[string]*acpSession
|
|
}
|
|
|
|
type turnRecord struct {
|
|
user string
|
|
assistant string
|
|
}
|
|
|
|
type acpSession struct {
|
|
id string
|
|
cwd string
|
|
|
|
// turnMu serializes prompt turns for one session: concurrent session/prompt
|
|
// calls run one at a time so they can't interleave history or clobber the
|
|
// single cancel slot.
|
|
turnMu sync.Mutex
|
|
modelMu sync.Mutex
|
|
|
|
mu sync.Mutex
|
|
mode agent.PermissionMode
|
|
model string
|
|
models []SessionConfigOptionValue
|
|
restrictModels bool
|
|
cancel context.CancelFunc
|
|
history []turnRecord
|
|
}
|
|
|
|
// NewAgent builds the ACP server and registers its method handlers on conn.
|
|
func NewAgent(conn *Conn, deps Deps) *Agent {
|
|
a := &Agent{conn: conn, deps: deps, sessions: make(map[string]*acpSession)}
|
|
conn.Handle(MethodInitialize, a.handleInitialize)
|
|
conn.Handle(MethodSessionNew, a.handleSessionNew)
|
|
conn.Handle(MethodSessionLoad, a.handleSessionLoad)
|
|
conn.Handle(MethodSessionPrompt, a.handleSessionPrompt)
|
|
conn.Handle(MethodSessionSetMode, a.handleSetMode)
|
|
conn.Handle(MethodSessionSetConfigOption, a.handleSetConfigOption)
|
|
conn.Handle(MethodZeroSetModel, a.handleZeroSetModel)
|
|
conn.HandleNotify(MethodSessionCancel, a.handleCancel)
|
|
return a
|
|
}
|
|
|
|
// ---- initialize ----
|
|
|
|
func (a *Agent) handleInitialize(_ context.Context, params json.RawMessage) (any, error) {
|
|
var p InitializeParams
|
|
if len(params) > 0 {
|
|
_ = json.Unmarshal(params, &p)
|
|
}
|
|
negotiated := ProtocolVersion
|
|
if p.ProtocolVersion > 0 && p.ProtocolVersion < ProtocolVersion {
|
|
negotiated = p.ProtocolVersion
|
|
}
|
|
a.mu.Lock()
|
|
a.clientCaps = p.ClientCapabilities
|
|
a.initialized = true
|
|
a.mu.Unlock()
|
|
|
|
info := a.deps.AgentInfo
|
|
return InitializeResult{
|
|
ProtocolVersion: negotiated,
|
|
AgentCapabilities: AgentCapabilities{
|
|
// Only advertise what ZERO actually implements: session/load (loadSession)
|
|
// and image prompts. session/resume + the session-capability sub-object
|
|
// are intentionally omitted since there is no resume handler yet.
|
|
LoadSession: true,
|
|
PromptCapabilities: PromptCapabilities{Image: true},
|
|
},
|
|
AgentInfo: &info,
|
|
// ZERO owns credentials (BYOK) and does not delegate auth to the editor.
|
|
AuthMethods: []AuthMethod{},
|
|
}, nil
|
|
}
|
|
|
|
// ---- session lifecycle ----
|
|
|
|
func (a *Agent) handleSessionNew(ctx context.Context, params json.RawMessage) (any, error) {
|
|
var p NewSessionParams
|
|
if err := json.Unmarshal(params, &p); err != nil {
|
|
return nil, RPCError(codeInvalidParams, "invalid session/new params")
|
|
}
|
|
root, err := a.deps.ResolveWorkspaceRoot(p.Cwd)
|
|
if err != nil {
|
|
return nil, RPCError(codeInvalidParams, err.Error())
|
|
}
|
|
model, models, restrictModels, err := a.resolveModelChoices(ctx, root)
|
|
if err != nil {
|
|
return nil, RPCError(codeInternalError, "config: "+err.Error())
|
|
}
|
|
meta, err := a.deps.Store.Create(sessions.CreateInput{Title: "ACP session", Cwd: root, ModelID: model})
|
|
if err != nil {
|
|
return nil, RPCError(codeInternalError, "create session: "+err.Error())
|
|
}
|
|
sess := a.registerSession(meta.SessionID, root, nil, model, models, restrictModels)
|
|
return NewSessionResult{
|
|
SessionID: sess.id,
|
|
ConfigOptions: a.configOptions(sess),
|
|
Modes: a.modeState(sess),
|
|
}, nil
|
|
}
|
|
|
|
func (a *Agent) handleSessionLoad(ctx context.Context, params json.RawMessage) (any, error) {
|
|
var p LoadSessionParams
|
|
if err := json.Unmarshal(params, &p); err != nil {
|
|
return nil, RPCError(codeInvalidParams, "invalid session/load params")
|
|
}
|
|
meta, err := a.deps.Store.Get(p.SessionID)
|
|
if err != nil || meta == nil {
|
|
return nil, RPCError(codeInvalidParams, "session not found: "+p.SessionID)
|
|
}
|
|
cwdInput := p.Cwd
|
|
if strings.TrimSpace(cwdInput) == "" {
|
|
cwdInput = meta.Cwd
|
|
}
|
|
root, err := a.deps.ResolveWorkspaceRoot(cwdInput)
|
|
if err != nil {
|
|
return nil, RPCError(codeInvalidParams, err.Error())
|
|
}
|
|
// Load history BEFORE publishing the session so no concurrent prompt observes
|
|
// a half-initialized session (registerSession sets history under the lock and
|
|
// reuses an already-live session rather than orphaning its in-flight turn).
|
|
history, historyErr := a.loadHistory(meta.SessionID)
|
|
model, models, restrictModels, err := a.resolveModelChoices(ctx, root)
|
|
if err != nil {
|
|
return nil, RPCError(codeInternalError, "config: "+err.Error())
|
|
}
|
|
if persistedModel := strings.TrimSpace(meta.ModelID); persistedModel != "" && (!restrictModels || modelChoiceExists(models, persistedModel)) {
|
|
model = persistedModel
|
|
if !modelChoiceExists(models, persistedModel) {
|
|
models = append(models, SessionConfigOptionValue{Value: persistedModel, Name: persistedModel})
|
|
}
|
|
}
|
|
sess := a.registerSession(meta.SessionID, root, history, model, models, restrictModels)
|
|
a.warnPersistence(
|
|
¬ifier{conn: a.conn, sessionID: sess.id},
|
|
"load session history",
|
|
"Could not load session history. The session is open, but earlier turns may be missing until storage recovers.",
|
|
historyErr,
|
|
)
|
|
return LoadSessionResult{
|
|
ConfigOptions: a.configOptions(sess),
|
|
Modes: a.modeState(sess),
|
|
}, nil
|
|
}
|
|
|
|
// ---- prompt turn ----
|
|
|
|
func (a *Agent) handleSessionPrompt(ctx context.Context, params json.RawMessage) (any, error) {
|
|
var p PromptParams
|
|
if err := json.Unmarshal(params, &p); err != nil {
|
|
return nil, RPCError(codeInvalidParams, "invalid session/prompt params")
|
|
}
|
|
sess := a.session(p.SessionID)
|
|
if sess == nil {
|
|
return nil, RPCError(codeInvalidParams, "unknown session: "+p.SessionID)
|
|
}
|
|
|
|
// Serialize turns for this session so two prompts can't interleave history or
|
|
// fight over the single cancel slot. session/cancel still works concurrently
|
|
// (it doesn't take turnMu).
|
|
sess.turnMu.Lock()
|
|
defer sess.turnMu.Unlock()
|
|
|
|
userText := promptText(p.Prompt)
|
|
images := promptImages(p.Prompt)
|
|
|
|
turnCtx, cancel := context.WithCancel(ctx)
|
|
sess.setCancel(cancel)
|
|
defer func() {
|
|
cancel()
|
|
sess.setCancel(nil)
|
|
}()
|
|
|
|
reason, err := a.runTurn(turnCtx, sess, userText, images)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return PromptResult{StopReason: reason}, nil
|
|
}
|
|
|
|
func (a *Agent) runTurn(ctx context.Context, sess *acpSession, userText string, images []zeroruntime.ImageBlock) (string, error) {
|
|
overrides := config.Overrides{}
|
|
if model := sess.currentModel(); model != "" {
|
|
overrides.Provider.Model = model
|
|
}
|
|
resolved, err := a.deps.ResolveConfig(sess.cwd, overrides)
|
|
if err != nil {
|
|
return "", RPCError(codeInternalError, "config: "+err.Error())
|
|
}
|
|
provider, err := a.deps.NewProvider(resolved.Provider)
|
|
if err != nil {
|
|
return "", RPCError(codeInternalError, "provider: "+err.Error())
|
|
}
|
|
// Build the SCOPED registry + sandbox engine for this session's workspace so
|
|
// shell/file tools are confined to the workspace exactly like the exec surface.
|
|
registry, sandboxEngine, err := a.deps.BuildWorkspace(sess.cwd, resolved)
|
|
if err != nil {
|
|
return "", RPCError(codeInternalError, "workspace: "+err.Error())
|
|
}
|
|
note := ¬ifier{conn: a.conn, sessionID: sess.id}
|
|
|
|
opts := agent.Options{
|
|
Cwd: sess.cwd,
|
|
SessionID: sess.id,
|
|
ProviderName: resolved.Provider.Name,
|
|
Model: resolved.Provider.Model,
|
|
Registry: registry,
|
|
Sandbox: sandboxEngine,
|
|
PermissionMode: sess.currentMode(),
|
|
MaxTurns: resolved.MaxTurns,
|
|
Images: images,
|
|
OnText: note.text,
|
|
OnReasoning: note.thought,
|
|
OnToolCall: note.toolCall,
|
|
OnToolResult: func(result agent.ToolResult) {
|
|
note.toolResult(result)
|
|
if result.Name == "update_plan" {
|
|
a.emitPlan(registry, note)
|
|
}
|
|
},
|
|
OnPermissionRequest: func(ctx context.Context, req agent.PermissionRequest) (agent.PermissionDecision, error) {
|
|
return a.requestPermission(ctx, sess.id, req)
|
|
},
|
|
}
|
|
|
|
agentPrompt := buildPrompt(sess.snapshotHistory(), userText)
|
|
result, runErr := a.deps.RunAgent(ctx, agentPrompt, provider, opts)
|
|
|
|
reason, stopErr := stopReasonFor(result, runErr)
|
|
if stopErr != nil {
|
|
return "", RPCError(codeInternalError, stopErr.Error())
|
|
}
|
|
if err := a.persistTurn(sess, userText, result.FinalAnswer); err != nil {
|
|
a.warnPersistence(
|
|
note,
|
|
"save session history",
|
|
"Could not save session history. This turn is available in memory, but future resume may miss it until storage recovers.",
|
|
err,
|
|
)
|
|
}
|
|
return reason, nil
|
|
}
|
|
|
|
func stopReasonFor(result agent.Result, err error) (string, error) {
|
|
if err != nil {
|
|
if errors.Is(err, context.Canceled) {
|
|
return StopCancelled, nil
|
|
}
|
|
return "", err
|
|
}
|
|
if result.FinishReason == "length" {
|
|
return StopMaxTokens, nil
|
|
}
|
|
if result.FinishReason == "content_filter" {
|
|
return StopRefusal, nil
|
|
}
|
|
return StopEndTurn, nil
|
|
}
|
|
|
|
// requestPermission forwards a ZERO permission prompt to the client as an ACP
|
|
// session/request_permission request and maps the outcome back. Failure to reach
|
|
// the client fails closed to deny.
|
|
func (a *Agent) requestPermission(ctx context.Context, sessionID string, req agent.PermissionRequest) (agent.PermissionDecision, error) {
|
|
params := RequestPermissionParams{
|
|
SessionID: sessionID,
|
|
ToolCall: permissionToolCall(req),
|
|
Options: buildPermissionOptions(req),
|
|
}
|
|
var result RequestPermissionResult
|
|
if err := a.conn.Call(ctx, MethodSessionRequestPerm, params, &result); err != nil {
|
|
if errors.Is(err, context.Canceled) {
|
|
return agent.PermissionDecision{Action: agent.PermissionDecisionCancel, Reason: "cancelled"}, nil
|
|
}
|
|
return agent.PermissionDecision{Action: agent.PermissionDecisionDeny, Reason: "permission request failed: " + err.Error()}, nil
|
|
}
|
|
return decisionFromOutcome(result.Outcome, req.AvailableDecisions), nil
|
|
}
|
|
|
|
func (a *Agent) emitPlan(registry *tools.Registry, note *notifier) {
|
|
t, ok := registry.Get("update_plan")
|
|
if !ok {
|
|
return
|
|
}
|
|
planner, ok := t.(interface{ CurrentPlan() []tools.PlanItem })
|
|
if !ok {
|
|
return
|
|
}
|
|
note.plan(planner.CurrentPlan())
|
|
}
|
|
|
|
// ---- mode + model selection ----
|
|
|
|
func (a *Agent) handleSetMode(_ context.Context, params json.RawMessage) (any, error) {
|
|
var p SetSessionModeParams
|
|
if err := json.Unmarshal(params, &p); err != nil {
|
|
return nil, RPCError(codeInvalidParams, "invalid set_mode params")
|
|
}
|
|
sess := a.session(p.SessionID)
|
|
if sess == nil {
|
|
return nil, RPCError(codeInvalidParams, "unknown session: "+p.SessionID)
|
|
}
|
|
mode := agent.PermissionMode(p.ModeID)
|
|
switch mode {
|
|
case agent.PermissionModeAuto, agent.PermissionModeAsk:
|
|
sess.setMode(mode)
|
|
(¬ifier{conn: a.conn, sessionID: sess.id}).currentMode(string(mode))
|
|
return SetSessionModeResult{}, nil
|
|
case agent.PermissionModeUnsafe:
|
|
// Unsafe = run every tool with no prompt. The TUI gates this behind an
|
|
// explicit --skip-permissions-unsafe operator flag; an editor client must
|
|
// not be able to grant itself unconfined, no-prompt access over the wire.
|
|
return nil, RPCError(codeInvalidParams, "mode not permitted over ACP: "+p.ModeID)
|
|
default:
|
|
return nil, RPCError(codeInvalidParams, "unknown mode: "+p.ModeID)
|
|
}
|
|
}
|
|
|
|
func (a *Agent) handleSetConfigOption(_ context.Context, params json.RawMessage) (any, error) {
|
|
var p SetSessionConfigOptionParams
|
|
if err := json.Unmarshal(params, &p); err != nil {
|
|
return nil, RPCError(codeInvalidParams, "invalid set_config_option params")
|
|
}
|
|
sess := a.session(p.SessionID)
|
|
if sess == nil {
|
|
return nil, RPCError(codeInvalidParams, "unknown session: "+p.SessionID)
|
|
}
|
|
switch p.ConfigID {
|
|
case configIDModel:
|
|
model := strings.TrimSpace(p.Value)
|
|
if err := a.updateModel(sess, model, sess.restrictModels); err != nil {
|
|
return nil, err
|
|
}
|
|
case configIDMode:
|
|
mode := agent.PermissionMode(p.Value)
|
|
switch mode {
|
|
case agent.PermissionModeAuto, agent.PermissionModeAsk:
|
|
sess.setMode(mode)
|
|
(¬ifier{conn: a.conn, sessionID: sess.id}).currentMode(string(mode))
|
|
case agent.PermissionModeUnsafe:
|
|
return nil, RPCError(codeInvalidParams, "mode not permitted over ACP: "+p.Value)
|
|
default:
|
|
return nil, RPCError(codeInvalidParams, "unknown mode: "+p.Value)
|
|
}
|
|
default:
|
|
return nil, RPCError(codeInvalidParams, "unknown config option: "+p.ConfigID)
|
|
}
|
|
return SetSessionConfigOptionResult{ConfigOptions: a.configOptions(sess)}, nil
|
|
}
|
|
|
|
func (a *Agent) handleZeroSetModel(_ context.Context, params json.RawMessage) (any, error) {
|
|
var p ZeroSetModelParams
|
|
if err := json.Unmarshal(params, &p); err != nil {
|
|
return nil, RPCError(codeInvalidParams, "invalid _zero/set_model params")
|
|
}
|
|
sess := a.session(p.SessionID)
|
|
if sess == nil {
|
|
return nil, RPCError(codeInvalidParams, "unknown session: "+p.SessionID)
|
|
}
|
|
model := strings.TrimSpace(p.Model)
|
|
if err := a.updateModel(sess, model, false); err != nil {
|
|
return nil, err
|
|
}
|
|
return ZeroSetModelResult{Model: model}, nil
|
|
}
|
|
|
|
func (a *Agent) updateModel(sess *acpSession, model string, restrictModels bool) error {
|
|
sess.modelMu.Lock()
|
|
defer sess.modelMu.Unlock()
|
|
if restrictModels && !sess.hasModel(model) {
|
|
return RPCError(codeInvalidParams, "unknown model: "+model)
|
|
}
|
|
if _, err := a.deps.Store.UpdateModel(sess.id, model); err != nil {
|
|
return RPCError(codeInternalError, "save model selection: "+err.Error())
|
|
}
|
|
sess.setModel(model)
|
|
return nil
|
|
}
|
|
|
|
func (a *Agent) handleCancel(_ context.Context, params json.RawMessage) {
|
|
var p CancelParams
|
|
if err := json.Unmarshal(params, &p); err != nil {
|
|
return
|
|
}
|
|
if sess := a.session(p.SessionID); sess != nil {
|
|
sess.invokeCancel()
|
|
}
|
|
}
|
|
|
|
// ---- advertising helpers ----
|
|
|
|
func (a *Agent) modeState(s *acpSession) *SessionModeState {
|
|
// Only auto/ask are offered over ACP; Unsafe is gated to the operator (see
|
|
// handleSetMode) so a client can't grant itself no-prompt host access.
|
|
return &SessionModeState{
|
|
CurrentModeID: string(s.currentMode()),
|
|
AvailableModes: []SessionMode{
|
|
{ID: string(agent.PermissionModeAuto), Name: "Auto", Description: "Run safe tools automatically; ask before risky ones."},
|
|
{ID: string(agent.PermissionModeAsk), Name: "Ask", Description: "Ask before every tool that changes state."},
|
|
},
|
|
}
|
|
}
|
|
|
|
// resolveModelChoices advertises authenticated live models when discovery is
|
|
// available. The configured model is always retained as the sole fallback.
|
|
func (a *Agent) resolveModelChoices(ctx context.Context, cwd string) (string, []SessionConfigOptionValue, bool, error) {
|
|
resolved, err := a.deps.ResolveConfig(cwd, config.Overrides{})
|
|
if err != nil {
|
|
return "", nil, false, err
|
|
}
|
|
selected := strings.TrimSpace(resolved.Provider.Model)
|
|
options := make([]SessionConfigOptionValue, 0, 8)
|
|
seen := make(map[string]bool)
|
|
add := func(id, description string) {
|
|
id = strings.TrimSpace(id)
|
|
if id == "" || seen[id] {
|
|
return
|
|
}
|
|
seen[id] = true
|
|
options = append(options, SessionConfigOptionValue{Value: id, Name: id, Description: description})
|
|
}
|
|
add(selected, "")
|
|
descriptor, knownProvider := providercatalog.Get(resolved.Provider.CatalogID)
|
|
restrictModels := knownProvider && !descriptor.Custom
|
|
if a.deps.DiscoverModels != nil {
|
|
discovered, discoverErr := a.deps.DiscoverModels(ctx, resolved.Provider)
|
|
if ctx.Err() != nil {
|
|
return "", nil, false, ctx.Err()
|
|
}
|
|
if discoverErr == nil && len(discovered) > 0 {
|
|
for _, model := range discovered {
|
|
if providermodelcatalog.ModelIDAllowedForProvider(resolved.Provider.CatalogID, model.ID) {
|
|
add(model.ID, model.Description)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return selected, options, restrictModels, nil
|
|
}
|
|
|
|
func modelChoiceExists(models []SessionConfigOptionValue, model string) bool {
|
|
for _, option := range models {
|
|
if option.Value == model {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
func (a *Agent) configOptions(s *acpSession) []SessionConfigOption {
|
|
model, models, mode := s.configState()
|
|
return []SessionConfigOption{{
|
|
ID: configIDModel,
|
|
Name: "Model",
|
|
Description: "Model used for this session.",
|
|
Category: configCategoryModel,
|
|
Type: configOptionTypeSelect,
|
|
CurrentValue: model,
|
|
Options: models,
|
|
}, {
|
|
ID: configIDMode,
|
|
Name: "Mode",
|
|
Description: "Permission mode used for this session.",
|
|
Category: configCategoryMode,
|
|
Type: configOptionTypeSelect,
|
|
CurrentValue: string(mode),
|
|
Options: []SessionConfigOptionValue{
|
|
{Value: string(agent.PermissionModeAuto), Name: "Auto", Description: "Run safe tools automatically; ask before risky ones."},
|
|
{Value: string(agent.PermissionModeAsk), Name: "Ask", Description: "Ask before every tool that changes state."},
|
|
},
|
|
}}
|
|
}
|
|
|
|
// ---- persistence + continuity ----
|
|
|
|
func (a *Agent) persistTurn(sess *acpSession, user, assistant string) error {
|
|
defer sess.appendHistory(turnRecord{user: user, assistant: assistant})
|
|
if a.deps.Store == nil {
|
|
return nil
|
|
}
|
|
events := []sessions.AppendEventInput{
|
|
{
|
|
Type: sessions.EventMessage,
|
|
Payload: map[string]any{"role": "user", "content": user},
|
|
},
|
|
}
|
|
if assistant != "" {
|
|
events = append(events, sessions.AppendEventInput{
|
|
Type: sessions.EventMessage,
|
|
Payload: map[string]any{"role": "assistant", "content": assistant},
|
|
})
|
|
}
|
|
_, err := a.deps.Store.AppendEvents(sess.id, events)
|
|
return err
|
|
}
|
|
|
|
func (a *Agent) loadHistory(sessionID string) ([]turnRecord, error) {
|
|
if a.deps.Store == nil {
|
|
return nil, nil
|
|
}
|
|
events, err := a.deps.Store.ReadEvents(sessionID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var records []turnRecord
|
|
var pendingUser string
|
|
havePending := false
|
|
for _, e := range events {
|
|
if e.Type != sessions.EventMessage {
|
|
continue
|
|
}
|
|
raw, err := json.Marshal(e.Payload)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
var msg struct {
|
|
Role string `json:"role"`
|
|
Content string `json:"content"`
|
|
}
|
|
if json.Unmarshal(raw, &msg) != nil {
|
|
continue
|
|
}
|
|
switch msg.Role {
|
|
case "user":
|
|
if havePending {
|
|
records = append(records, turnRecord{user: pendingUser})
|
|
}
|
|
pendingUser = msg.Content
|
|
havePending = true
|
|
case "assistant":
|
|
records = append(records, turnRecord{user: pendingUser, assistant: msg.Content})
|
|
pendingUser = ""
|
|
havePending = false
|
|
}
|
|
}
|
|
if havePending {
|
|
records = append(records, turnRecord{user: pendingUser})
|
|
}
|
|
return records, nil
|
|
}
|
|
|
|
func (a *Agent) warnPersistence(note *notifier, action string, message string, err error) {
|
|
if err == nil {
|
|
return
|
|
}
|
|
sessionID := ""
|
|
if note != nil {
|
|
sessionID = note.sessionID
|
|
}
|
|
log.Printf("zero acp: failed to %s for session %s: %v", action, sessionID, err)
|
|
if note != nil {
|
|
note.text("\n\n[zero warning] " + message + "\n")
|
|
}
|
|
}
|
|
|
|
// buildPrompt prepends prior conversation as context, since agent.Run drives a
|
|
// single seeded turn. Mirrors how headless resume folds history into the prompt.
|
|
func buildPrompt(history []turnRecord, userText string) string {
|
|
if len(history) == 0 {
|
|
return userText
|
|
}
|
|
var b strings.Builder
|
|
b.WriteString("Conversation so far:\n")
|
|
for _, t := range history {
|
|
b.WriteString("User: ")
|
|
b.WriteString(t.user)
|
|
b.WriteString("\n")
|
|
if t.assistant != "" {
|
|
b.WriteString("Assistant: ")
|
|
b.WriteString(t.assistant)
|
|
b.WriteString("\n")
|
|
}
|
|
}
|
|
b.WriteString("\n---\nContinue with this request:\n")
|
|
b.WriteString(userText)
|
|
return b.String()
|
|
}
|
|
|
|
func promptImages(blocks []ContentBlock) []zeroruntime.ImageBlock {
|
|
var images []zeroruntime.ImageBlock
|
|
for _, blk := range blocks {
|
|
if blk.Type != "image" || blk.Data == "" {
|
|
continue
|
|
}
|
|
data, err := base64.StdEncoding.DecodeString(blk.Data)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
images = append(images, zeroruntime.ImageBlock{MediaType: blk.MimeType, Data: data})
|
|
}
|
|
return images
|
|
}
|
|
|
|
// ---- session registry + accessors ----
|
|
|
|
// registerSession publishes a session under the agent's lock. If one is already
|
|
// registered for id (e.g. a re-load of an in-flight session) the existing live
|
|
// session is returned unchanged rather than orphaning its turn or resetting its
|
|
// mode/model. history is set BEFORE publishing so no concurrent prompt can read a
|
|
// half-initialized session.
|
|
func (a *Agent) registerSession(id, cwd string, history []turnRecord, model string, models []SessionConfigOptionValue, restrictModels bool) *acpSession {
|
|
a.mu.Lock()
|
|
defer a.mu.Unlock()
|
|
if existing := a.sessions[id]; existing != nil {
|
|
return existing
|
|
}
|
|
sess := &acpSession{id: id, cwd: cwd, mode: agent.PermissionModeAuto, model: model, models: models, restrictModels: restrictModels, history: history}
|
|
a.sessions[id] = sess
|
|
return sess
|
|
}
|
|
|
|
func (a *Agent) session(id string) *acpSession {
|
|
a.mu.Lock()
|
|
defer a.mu.Unlock()
|
|
return a.sessions[id]
|
|
}
|
|
|
|
func (s *acpSession) setCancel(cancel context.CancelFunc) {
|
|
s.mu.Lock()
|
|
s.cancel = cancel
|
|
s.mu.Unlock()
|
|
}
|
|
|
|
func (s *acpSession) invokeCancel() {
|
|
s.mu.Lock()
|
|
cancel := s.cancel
|
|
s.mu.Unlock()
|
|
if cancel != nil {
|
|
cancel()
|
|
}
|
|
}
|
|
|
|
func (s *acpSession) setMode(mode agent.PermissionMode) {
|
|
s.mu.Lock()
|
|
s.mode = mode
|
|
s.mu.Unlock()
|
|
}
|
|
|
|
func (s *acpSession) currentMode() agent.PermissionMode {
|
|
s.mu.Lock()
|
|
defer s.mu.Unlock()
|
|
return s.mode
|
|
}
|
|
|
|
func (s *acpSession) setModel(model string) {
|
|
model = strings.TrimSpace(model)
|
|
s.mu.Lock()
|
|
found := false
|
|
for _, option := range s.models {
|
|
if option.Value == model {
|
|
found = true
|
|
break
|
|
}
|
|
}
|
|
if !found && model != "" {
|
|
s.models = append(s.models, SessionConfigOptionValue{Value: model, Name: model})
|
|
}
|
|
s.model = model
|
|
s.mu.Unlock()
|
|
}
|
|
|
|
func (s *acpSession) currentModel() string {
|
|
s.mu.Lock()
|
|
defer s.mu.Unlock()
|
|
return s.model
|
|
}
|
|
|
|
func (s *acpSession) hasModel(model string) bool {
|
|
model = strings.TrimSpace(model)
|
|
s.mu.Lock()
|
|
defer s.mu.Unlock()
|
|
for _, option := range s.models {
|
|
if option.Value == model {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
func (s *acpSession) configState() (string, []SessionConfigOptionValue, agent.PermissionMode) {
|
|
s.mu.Lock()
|
|
defer s.mu.Unlock()
|
|
return s.model, append([]SessionConfigOptionValue(nil), s.models...), s.mode
|
|
}
|
|
|
|
func (s *acpSession) appendHistory(rec turnRecord) {
|
|
s.mu.Lock()
|
|
s.history = append(s.history, rec)
|
|
s.mu.Unlock()
|
|
}
|
|
|
|
func (s *acpSession) snapshotHistory() []turnRecord {
|
|
s.mu.Lock()
|
|
defer s.mu.Unlock()
|
|
return append([]turnRecord(nil), s.history...)
|
|
}
|