fix: restore completed task conversation follow-ups (#3564)
This commit is contained in:
@@ -1,7 +1,9 @@
|
||||
package controller
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
@@ -136,12 +138,40 @@ type CreateStepRequest struct {
|
||||
ShowInCommandPanel *bool `json:"show_in_command_panel,omitempty"`
|
||||
AutoAdvanceRequiresSignal *bool `json:"auto_advance_requires_signal,omitempty"`
|
||||
CancelTriggersTurnComplete *bool `json:"cancel_triggers_turn_complete,omitempty"`
|
||||
CompleteTaskOnEnter *bool `json:"complete_task_on_enter,omitempty"`
|
||||
ProfileSessionStartPolicy *string `json:"profile_session_start_policy,omitempty"`
|
||||
ProfileSessionEndPolicy *string `json:"profile_session_end_policy,omitempty"`
|
||||
WIPLimit *int `json:"wip_limit,omitempty"`
|
||||
PullFromStepID *string `json:"pull_from_step_id,omitempty"`
|
||||
}
|
||||
|
||||
func rejectNullCompleteTaskOnEnter(data []byte) error {
|
||||
var fields map[string]json.RawMessage
|
||||
if err := json.Unmarshal(data, &fields); err != nil {
|
||||
return err
|
||||
}
|
||||
if raw, ok := fields["complete_task_on_enter"]; ok && bytes.Equal(bytes.TrimSpace(raw), []byte("null")) {
|
||||
return fmt.Errorf("complete_task_on_enter must be a boolean")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// UnmarshalJSON keeps omission distinct from an explicit null. The REST
|
||||
// boundary uses nil to mean the documented default for create and no-op for
|
||||
// update, so null must be rejected instead of silently taking either path.
|
||||
func (r *CreateStepRequest) UnmarshalJSON(data []byte) error {
|
||||
if err := rejectNullCompleteTaskOnEnter(data); err != nil {
|
||||
return err
|
||||
}
|
||||
type requestAlias CreateStepRequest
|
||||
var decoded requestAlias
|
||||
if err := json.Unmarshal(data, &decoded); err != nil {
|
||||
return err
|
||||
}
|
||||
*r = CreateStepRequest(decoded)
|
||||
return nil
|
||||
}
|
||||
|
||||
// CreateStep creates a new workflow step.
|
||||
func (c *Controller) CreateStep(ctx context.Context, req CreateStepRequest) (*GetStepResponse, error) {
|
||||
// The new step names its workflow in the body; authorize that workflow
|
||||
@@ -189,6 +219,9 @@ func (c *Controller) CreateStep(ctx context.Context, req CreateStepRequest) (*Ge
|
||||
if req.CancelTriggersTurnComplete != nil {
|
||||
step.CancelTriggersTurnComplete = *req.CancelTriggersTurnComplete
|
||||
}
|
||||
if req.CompleteTaskOnEnter != nil {
|
||||
step.CompleteTaskOnEnter = *req.CompleteTaskOnEnter
|
||||
}
|
||||
if req.WIPLimit != nil {
|
||||
if *req.WIPLimit < 0 {
|
||||
return nil, fmt.Errorf("wip_limit must be non-negative")
|
||||
@@ -224,12 +257,27 @@ type UpdateStepRequest struct {
|
||||
AgentProfileID *string `json:"agent_profile_id,omitempty"`
|
||||
AutoAdvanceRequiresSignal *bool `json:"auto_advance_requires_signal,omitempty"`
|
||||
CancelTriggersTurnComplete *bool `json:"cancel_triggers_turn_complete,omitempty"`
|
||||
CompleteTaskOnEnter *bool `json:"complete_task_on_enter,omitempty"`
|
||||
ProfileSessionStartPolicy *string `json:"profile_session_start_policy,omitempty"`
|
||||
ProfileSessionEndPolicy *string `json:"profile_session_end_policy,omitempty"`
|
||||
WIPLimit *int `json:"wip_limit,omitempty"`
|
||||
PullFromStepID *string `json:"pull_from_step_id,omitempty"`
|
||||
}
|
||||
|
||||
// UnmarshalJSON rejects null while preserving omission semantics for updates.
|
||||
func (r *UpdateStepRequest) UnmarshalJSON(data []byte) error {
|
||||
if err := rejectNullCompleteTaskOnEnter(data); err != nil {
|
||||
return err
|
||||
}
|
||||
type requestAlias UpdateStepRequest
|
||||
var decoded requestAlias
|
||||
if err := json.Unmarshal(data, &decoded); err != nil {
|
||||
return err
|
||||
}
|
||||
*r = UpdateStepRequest(decoded)
|
||||
return nil
|
||||
}
|
||||
|
||||
// UpdateStep updates an existing workflow step.
|
||||
func (c *Controller) UpdateStep(ctx context.Context, req UpdateStepRequest) (*GetStepResponse, error) {
|
||||
if err := c.svc.AuthorizeStep(ctx, req.ID); err != nil {
|
||||
@@ -287,6 +335,9 @@ func (c *Controller) UpdateStep(ctx context.Context, req UpdateStepRequest) (*Ge
|
||||
if req.CancelTriggersTurnComplete != nil {
|
||||
step.CancelTriggersTurnComplete = *req.CancelTriggersTurnComplete
|
||||
}
|
||||
if req.CompleteTaskOnEnter != nil {
|
||||
step.CompleteTaskOnEnter = *req.CompleteTaskOnEnter
|
||||
}
|
||||
if req.WIPLimit != nil {
|
||||
if *req.WIPLimit < 0 {
|
||||
return nil, fmt.Errorf("wip_limit must be non-negative")
|
||||
|
||||
Reference in New Issue
Block a user