mirror of
https://github.com/docker/docker-agent.git
synced 2026-11-04 10:02:15 +00:00
David Gageot
b54f4fa319
- Pass resolved caller agent explicitly into processToolCalls, handleTaskTransfer, runForwarding, handleChangeModel/handleRevertModel, and handleHandoff; removes r.toolMap registrations for those handlers so every invocation sees the agent that issued the tool call. - Session-local handoff routing for skill forks: AllowsAgentHandoffs / TryAgentHandoff / HandoffAgent helpers; skill-fork sub-sessions set AllowHandoffs so handoffs update a session-local pointer instead of the shared currentAgent; Clone propagates both fields. - agentRouter.ResolveSession checks handoffAgent before AgentName. - Hard-pinned background sessions excluded from force-handoff and handleHandoff to prevent infinite loops. - Prompt-file guard fails closed on discovery error when a guard is configured; unguarded agents still load the nearest ancestor file. GuardPromptFiles wired into buildHooksExecutors. - Exact-duplicate-free, case-sensitive JSON matching for model/command guards in shape_guard_decision.go. - Tests: model_picker_test, handoff_test, expanded skill_runner_test and skill_content_test, TestPromptFileGuardDiscoveryFailure; all processToolCalls / runForwarding call-sites updated. - Docs: hooks reference and skills feature page updated. Assisted-By: claude-opus-4-5
76 lines
2.8 KiB
Go
76 lines
2.8 KiB
Go
package runtime
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"log/slog"
|
|
"slices"
|
|
"strings"
|
|
|
|
"github.com/docker/docker-agent/pkg/agent"
|
|
"github.com/docker/docker-agent/pkg/tools"
|
|
"github.com/docker/docker-agent/pkg/tools/builtin/modelpicker"
|
|
)
|
|
|
|
// findModelPickerTool returns the Tool from the current agent's
|
|
// toolsets, or nil if the agent has no model_picker configured.
|
|
func findModelPickerTool(a *agent.Agent) *modelpicker.ToolSet {
|
|
for _, ts := range a.ToolSets() {
|
|
if mpt, ok := tools.Find[*modelpicker.ToolSet](ts); ok {
|
|
return mpt
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// handleChangeModel handles the change_model tool call by switching the current agent's model.
|
|
func (r *LocalRuntime) handleChangeModel(ctx context.Context, a *agent.Agent, toolCall tools.ToolCall, events EventSink) (*tools.ToolCallResult, error) {
|
|
var params modelpicker.ChangeModelArgs
|
|
if err := tools.UnmarshalToolArguments(ctx, toolCall, ¶ms); err != nil {
|
|
return nil, fmt.Errorf("invalid arguments: %w", err)
|
|
}
|
|
|
|
if params.Model == "" {
|
|
return tools.ResultError("model parameter is required"), nil
|
|
}
|
|
|
|
// Validate the requested model against the allowed list
|
|
mpt := findModelPickerTool(a)
|
|
if mpt == nil {
|
|
return tools.ResultError("model_picker is not configured for this agent"), nil
|
|
}
|
|
allowed := mpt.AllowedModels()
|
|
if !slices.Contains(allowed, params.Model) {
|
|
return tools.ResultError(fmt.Sprintf(
|
|
"model %q is not in the allowed list. Available models: %s",
|
|
params.Model, strings.Join(allowed, ", "),
|
|
)), nil
|
|
}
|
|
|
|
return r.setModelAndEmitInfo(ctx, a, params.Model, events)
|
|
}
|
|
|
|
// handleRevertModel handles the revert_model tool call by reverting the current agent to its default model.
|
|
func (r *LocalRuntime) handleRevertModel(ctx context.Context, a *agent.Agent, events EventSink) (*tools.ToolCallResult, error) {
|
|
return r.setModelAndEmitInfo(ctx, a, "", events)
|
|
}
|
|
|
|
// setModelAndEmitInfo sets the model for the current agent and emits an updated
|
|
// AgentInfo event so the UI reflects the change. An empty modelRef reverts to
|
|
// the agent's default model.
|
|
func (r *LocalRuntime) setModelAndEmitInfo(ctx context.Context, a *agent.Agent, modelRef string, events EventSink) (*tools.ToolCallResult, error) {
|
|
currentName := a.Name()
|
|
if err := r.SetAgentModel(ctx, currentName, modelRef); err != nil {
|
|
return tools.ResultError(fmt.Sprintf("failed to set model: %v", err)), nil
|
|
}
|
|
|
|
events.Emit(AgentInfo(a.Name(), r.getEffectiveModelID(ctx, a).String(), a.Description(), a.WelcomeMessage()))
|
|
|
|
if modelRef == "" {
|
|
slog.InfoContext(ctx, "Model reverted via model_picker tool", "agent", currentName)
|
|
return tools.ResultSuccess("Model reverted to the agent's default model"), nil
|
|
}
|
|
slog.InfoContext(ctx, "Model changed via model_picker tool", "agent", currentName, "model", modelRef)
|
|
return tools.ResultSuccess("Model changed to " + modelRef), nil
|
|
}
|