pi-agent: Implement operation coordination
This commit is contained in:
+236
-68
@@ -48,6 +48,15 @@ type Model struct {
|
||||
profileConfirm *app.Intent
|
||||
pendingActivation app.Intent
|
||||
status string
|
||||
operationStatus app.OperationStatus
|
||||
currentError *app.OperationStatus
|
||||
errorExpanded bool
|
||||
confirmation *app.Confirmation
|
||||
operationActive bool
|
||||
operationKind app.IntentKind
|
||||
operationIntent app.Intent
|
||||
operationUpdates <-chan app.OperationUpdate
|
||||
operationProgress map[string]app.TargetProgressPhase
|
||||
applying bool
|
||||
refreshing bool
|
||||
detectionUpdates <-chan app.TargetDetectionUpdate
|
||||
@@ -76,6 +85,12 @@ type profileOperationProgress struct {
|
||||
updates <-chan app.Result
|
||||
}
|
||||
|
||||
type operationProgress struct {
|
||||
update app.OperationUpdate
|
||||
updates <-chan app.OperationUpdate
|
||||
closed bool
|
||||
}
|
||||
|
||||
// probeDone carries one finished Protocol Probe back to the form. address is
|
||||
// always bare host:port so status text can never leak credentials. gen matches
|
||||
// the probe generation stored in formState so late results can be ignored after
|
||||
@@ -97,6 +112,16 @@ func waitForTargetDetection(updates <-chan app.TargetDetectionUpdate) tea.Cmd {
|
||||
}
|
||||
}
|
||||
|
||||
func waitForOperation(updates <-chan app.OperationUpdate) tea.Cmd {
|
||||
return func() tea.Msg {
|
||||
update, ok := <-updates
|
||||
if !ok {
|
||||
return operationProgress{updates: updates, closed: true}
|
||||
}
|
||||
return operationProgress{update: update, updates: updates}
|
||||
}
|
||||
}
|
||||
|
||||
func waitForProfileProgress(updates <-chan app.Result) tea.Cmd {
|
||||
return func() tea.Msg {
|
||||
result, ok := <-updates
|
||||
@@ -113,26 +138,35 @@ func NewModel(application app.Module, configure ...ModelOption) Model {
|
||||
option(&options)
|
||||
}
|
||||
snapshot := application.Snapshot()
|
||||
var detectionUpdates <-chan app.TargetDetectionUpdate
|
||||
if progressive, ok := application.(app.ProgressiveDetectionModule); ok {
|
||||
snapshot, detectionUpdates = progressive.BeginTargetDetection()
|
||||
model := Model{
|
||||
application: application,
|
||||
presentation: terminalPresentation{theme: newSemanticTheme(options.theme, options.output)},
|
||||
snapshot: snapshot,
|
||||
selectedTargetID: newTargetCatalog(snapshot, false, "").firstID(),
|
||||
width: 80,
|
||||
height: 24,
|
||||
operationProgress: make(map[string]app.TargetProgressPhase),
|
||||
detect: probe.Detect,
|
||||
}
|
||||
return Model{
|
||||
application: application,
|
||||
presentation: terminalPresentation{theme: newSemanticTheme(options.theme, options.output)},
|
||||
snapshot: snapshot,
|
||||
selectedTargetID: newTargetCatalog(snapshot, false, "").firstID(),
|
||||
width: 80,
|
||||
height: 24,
|
||||
refreshing: detectionUpdates != nil,
|
||||
detectionUpdates: detectionUpdates,
|
||||
detect: probe.Detect,
|
||||
_, progressiveDetection := application.(app.ProgressiveDetectionModule)
|
||||
if targetsChecking(snapshot) || progressiveDetection {
|
||||
model.startOperation(app.Intent{Kind: app.RefreshTargets})
|
||||
}
|
||||
return model
|
||||
}
|
||||
|
||||
func targetsChecking(snapshot app.Snapshot) bool {
|
||||
for _, item := range snapshot.Targets {
|
||||
if item.DetectionPhase == app.TargetChecking {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func (m Model) Init() tea.Cmd {
|
||||
if m.detectionUpdates != nil {
|
||||
return waitForTargetDetection(m.detectionUpdates)
|
||||
if m.operationUpdates != nil {
|
||||
return waitForOperation(m.operationUpdates)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -145,11 +179,11 @@ func (m Model) busy() bool {
|
||||
}
|
||||
|
||||
func (m Model) operationInFlight() bool {
|
||||
return m.applying || m.refreshing || m.profileTransition
|
||||
return m.operationActive || m.applying || m.refreshing || m.profileTransition
|
||||
}
|
||||
|
||||
func (m Model) dashboardNavigationAvailable() bool {
|
||||
return !m.quitRequested && !m.applying && !m.profileTransition
|
||||
return !m.quitRequested
|
||||
}
|
||||
|
||||
func (m Model) Update(message tea.Msg) (tea.Model, tea.Cmd) {
|
||||
@@ -166,9 +200,32 @@ func (m Model) Update(message tea.Msg) (tea.Model, tea.Cmd) {
|
||||
if m.quitRequested && !m.operationInFlight() {
|
||||
return m, nil
|
||||
}
|
||||
if key, ok := message.(tea.KeyMsg); ok && m.operationInFlight() && isQuitKey(key) {
|
||||
m.quitRequested = true
|
||||
return m, nil
|
||||
if key, ok := message.(tea.KeyMsg); ok {
|
||||
exitRequest := key.String() == "ctrl+c" || (m.page == mainPage && key.String() == "q" && m.targetConfirm == nil && m.profileConfirm == nil)
|
||||
if exitRequest {
|
||||
if m.operationInFlight() {
|
||||
m.quitRequested = true
|
||||
return m, nil
|
||||
}
|
||||
return m, tea.Quit
|
||||
}
|
||||
}
|
||||
if progress, ok := message.(operationProgress); ok {
|
||||
if !m.operationActive || progress.updates != m.operationUpdates {
|
||||
return m, nil
|
||||
}
|
||||
if progress.closed {
|
||||
m.snapshot = m.application.Snapshot()
|
||||
m.retainTargetSelection()
|
||||
m.finishOperation()
|
||||
return m, m.deferredQuit()
|
||||
}
|
||||
m.applyOperationUpdate(progress.update)
|
||||
if isTerminalOperationPhase(progress.update.Phase) {
|
||||
m.finishOperation()
|
||||
return m, m.deferredQuit()
|
||||
}
|
||||
return m, waitForOperation(progress.updates)
|
||||
}
|
||||
if progress, ok := message.(targetDetectionProgress); ok {
|
||||
if !m.refreshing || progress.updates != m.detectionUpdates {
|
||||
@@ -338,6 +395,106 @@ func (m Model) Update(message tea.Msg) (tea.Model, tea.Cmd) {
|
||||
}
|
||||
}
|
||||
|
||||
func (m *Model) startOperation(intent app.Intent) tea.Cmd {
|
||||
if m.quitRequested {
|
||||
return nil
|
||||
}
|
||||
if m.operationActive {
|
||||
m.operationStatus = app.OperationStatus{Kind: app.StatusBlocked, Summary: "Wait for the current mutation to finish before starting another modification"}
|
||||
return nil
|
||||
}
|
||||
interactive, ok := m.application.(app.InteractiveModule)
|
||||
if !ok {
|
||||
m.operationStatus = app.OperationStatus{Kind: app.StatusBlocked, Summary: "Interactive operation streaming is unavailable"}
|
||||
return nil
|
||||
}
|
||||
stream := interactive.StartOperation(intent)
|
||||
m.snapshot = stream.Snapshot
|
||||
m.retainTargetSelection()
|
||||
m.operationActive = true
|
||||
m.operationKind = intent.Kind
|
||||
m.operationIntent = intent
|
||||
m.operationUpdates = stream.Updates
|
||||
m.operationProgress = make(map[string]app.TargetProgressPhase)
|
||||
m.applying = intent.Kind == app.SetTargetDesired || intent.Kind == app.ActivateProfile
|
||||
m.refreshing = intent.Kind == app.RefreshTargets
|
||||
m.profileTransition = intent.Kind == app.ActivateProfile
|
||||
m.progressTarget = ""
|
||||
m.operationStatus = app.OperationStatus{Kind: app.StatusProgress, Summary: operationStartingSummary(intent.Kind)}
|
||||
return waitForOperation(stream.Updates)
|
||||
}
|
||||
|
||||
func operationStartingSummary(kind app.IntentKind) string {
|
||||
switch kind {
|
||||
case app.RefreshTargets:
|
||||
return "Checking Target availability and state…"
|
||||
case app.ActivateProfile:
|
||||
return "Changing Active Profile…"
|
||||
default:
|
||||
return "Starting Target mutation…"
|
||||
}
|
||||
}
|
||||
|
||||
func (m *Model) finishOperation() {
|
||||
m.operationActive = false
|
||||
m.operationKind = 0
|
||||
m.operationIntent = app.Intent{}
|
||||
m.operationUpdates = nil
|
||||
m.applying = false
|
||||
m.refreshing = false
|
||||
m.profileTransition = false
|
||||
m.progressTarget = ""
|
||||
}
|
||||
|
||||
func isTerminalOperationPhase(phase app.OperationPhase) bool {
|
||||
return phase == app.OperationAwaitingConfirmation || phase == app.OperationSucceeded || phase == app.OperationFailed || phase == app.OperationBlocked
|
||||
}
|
||||
|
||||
func (m *Model) applyOperationUpdate(update app.OperationUpdate) {
|
||||
m.snapshot = update.Snapshot
|
||||
m.retainTargetSelection()
|
||||
for _, progress := range update.Progress {
|
||||
m.operationProgress[progress.TargetID] = progress.Phase
|
||||
if progress.Phase == app.TargetProgressRunning {
|
||||
m.progressTarget = progress.TargetID
|
||||
} else if m.progressTarget == progress.TargetID {
|
||||
m.progressTarget = ""
|
||||
}
|
||||
}
|
||||
if update.Status.Kind != 0 {
|
||||
m.operationStatus = update.Status
|
||||
}
|
||||
if update.Status.Kind == app.StatusError {
|
||||
current := update.Status
|
||||
if current.Detail == "" && update.Err != nil {
|
||||
current.Detail = update.Err.Error()
|
||||
}
|
||||
m.currentError = ¤t
|
||||
m.errorExpanded = false
|
||||
} else if update.Phase == app.OperationSucceeded && m.currentError != nil && update.Status.TargetID != "" && update.Status.TargetID == m.currentError.TargetID {
|
||||
m.currentError = nil
|
||||
m.errorExpanded = false
|
||||
}
|
||||
if update.FirstFailedTargetID != "" {
|
||||
m.selectedTargetID = update.FirstFailedTargetID
|
||||
m.detailsOffset = 0
|
||||
}
|
||||
if isTerminalOperationPhase(update.Phase) && update.Phase != app.OperationAwaitingConfirmation {
|
||||
m.pendingActivation = app.Intent{}
|
||||
}
|
||||
if update.Phase == app.OperationAwaitingConfirmation && update.Confirmation != nil {
|
||||
intent := m.operationIntent
|
||||
m.confirmation = update.Confirmation
|
||||
m.page = mainPage
|
||||
if intent.Kind == app.ActivateProfile {
|
||||
m.pendingActivation = intent
|
||||
m.profileConfirm = &intent
|
||||
} else {
|
||||
m.targetConfirm = &intent
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func isQuitKey(key tea.KeyMsg) bool {
|
||||
switch key.String() {
|
||||
case "q", "esc", "ctrl+c":
|
||||
@@ -355,46 +512,58 @@ func (m Model) deferredQuit() tea.Cmd {
|
||||
}
|
||||
|
||||
func (m Model) updateMain(key tea.KeyMsg) (tea.Model, tea.Cmd) {
|
||||
if m.targetConfirm != nil && !m.busy() {
|
||||
if m.targetConfirm != nil || m.profileConfirm != nil {
|
||||
intent := m.targetConfirm
|
||||
if intent == nil {
|
||||
intent = m.profileConfirm
|
||||
}
|
||||
switch key.String() {
|
||||
case "y":
|
||||
intent := *m.targetConfirm
|
||||
intent.Confirm = true
|
||||
confirmed := *intent
|
||||
confirmed.Confirm = true
|
||||
m.targetConfirm = nil
|
||||
m.applying = true
|
||||
m.profileConfirm = nil
|
||||
m.pendingActivation = app.Intent{}
|
||||
m.confirmation = nil
|
||||
m.status = ""
|
||||
return m, func() tea.Msg { return targetOperationDone{result: m.application.Dispatch(intent)} }
|
||||
case "n", "esc", "q":
|
||||
return m, m.startOperation(confirmed)
|
||||
case "enter", "n", "esc", "q":
|
||||
m.targetConfirm = nil
|
||||
m.status = ""
|
||||
m.profileConfirm = nil
|
||||
m.pendingActivation = app.Intent{}
|
||||
m.confirmation = nil
|
||||
m.operationStatus = app.OperationStatus{}
|
||||
}
|
||||
return m, nil
|
||||
}
|
||||
if key.String() == "e" && m.currentError != nil {
|
||||
m.errorExpanded = !m.errorExpanded
|
||||
return m, nil
|
||||
}
|
||||
if key.String() == "x" && m.currentError != nil {
|
||||
m.currentError = nil
|
||||
m.errorExpanded = false
|
||||
return m, nil
|
||||
}
|
||||
catalog := newTargetCatalog(m.snapshot, m.showUnavailable, m.selectedTargetID)
|
||||
switch key.String() {
|
||||
case "p":
|
||||
if !m.busy() {
|
||||
if m.operationActive || m.quitRequested {
|
||||
m.operationStatus = app.OperationStatus{Kind: app.StatusBlocked, Summary: "Wait for the current mutation to finish before opening Profile management"}
|
||||
} else {
|
||||
m.page = profilesPage
|
||||
m.selected = 0
|
||||
m.status = ""
|
||||
}
|
||||
case "?":
|
||||
if !m.busy() {
|
||||
if !m.quitRequested {
|
||||
m.page = helpPage
|
||||
m.status = ""
|
||||
}
|
||||
case "r":
|
||||
if !m.busy() {
|
||||
m.refreshing = true
|
||||
m.status = "Refreshing Target availability and state…"
|
||||
if progressive, ok := m.application.(app.ProgressiveDetectionModule); ok {
|
||||
m.snapshot, m.detectionUpdates = progressive.BeginTargetDetection()
|
||||
m.retainTargetSelection()
|
||||
return m, waitForTargetDetection(m.detectionUpdates)
|
||||
}
|
||||
return m, func() tea.Msg {
|
||||
return refreshDone{result: m.application.Dispatch(app.Intent{Kind: app.RefreshTargets})}
|
||||
}
|
||||
if m.operationActive || m.quitRequested {
|
||||
m.operationStatus = app.OperationStatus{Kind: app.StatusBlocked, Summary: "Wait for the current mutation to finish before refreshing Targets"}
|
||||
} else {
|
||||
return m, m.startOperation(app.Intent{Kind: app.RefreshTargets})
|
||||
}
|
||||
case "tab":
|
||||
if m.dashboardNavigationAvailable() {
|
||||
@@ -438,22 +607,21 @@ func (m Model) updateMain(key tea.KeyMsg) (tea.Model, tea.Cmd) {
|
||||
m.detailsOffset += 5
|
||||
}
|
||||
case " ":
|
||||
if !m.busy() {
|
||||
selected, ok := catalog.selected(m.selectedTargetID)
|
||||
if !ok || !selected.Available || selected.DetectionPhase != app.TargetReady {
|
||||
break
|
||||
}
|
||||
desired := selected.State == target.Disabled || selected.State == target.External
|
||||
m.applying = true
|
||||
m.status = ""
|
||||
intent := app.Intent{Kind: app.SetTargetDesired, TargetID: selected.ID, Enabled: desired}
|
||||
m.targetConfirm = &intent
|
||||
return m, func() tea.Msg {
|
||||
return targetOperationDone{result: m.application.Dispatch(intent)}
|
||||
}
|
||||
if m.operationActive || m.quitRequested {
|
||||
m.operationStatus = app.OperationStatus{Kind: app.StatusBlocked, Summary: "Wait for the current mutation to finish before starting another modification"}
|
||||
break
|
||||
}
|
||||
selected, ok := catalog.selected(m.selectedTargetID)
|
||||
if !ok || !selected.Available || selected.DetectionPhase != app.TargetReady {
|
||||
break
|
||||
}
|
||||
desired := selected.State == target.Disabled || selected.State == target.External
|
||||
intent := app.Intent{Kind: app.SetTargetDesired, TargetID: selected.ID, Enabled: desired}
|
||||
return m, m.startOperation(intent)
|
||||
case "esc":
|
||||
if !m.operationActive {
|
||||
return m, tea.Quit
|
||||
}
|
||||
case "q", "esc", "ctrl+c":
|
||||
return m, tea.Quit
|
||||
}
|
||||
return m, nil
|
||||
}
|
||||
@@ -610,20 +778,13 @@ func (m Model) updateForm(key tea.KeyMsg) (tea.Model, tea.Cmd) {
|
||||
|
||||
func (m Model) beginProfileActivation(intent app.Intent) (tea.Model, tea.Cmd) {
|
||||
if m.busy() {
|
||||
m.operationStatus = app.OperationStatus{Kind: app.StatusBlocked, Summary: "Wait for the current mutation to finish before changing the Active Profile"}
|
||||
return m, nil
|
||||
}
|
||||
if progressive, ok := m.application.(app.ProgressiveModule); ok {
|
||||
m.applying = true
|
||||
m.profileTransition = true
|
||||
m.pendingActivation = intent
|
||||
m.page = mainPage
|
||||
m.selected = 0
|
||||
m.status = "Changing Active Profile…"
|
||||
updates := progressive.DispatchProgress(intent)
|
||||
return m, waitForProfileProgress(updates)
|
||||
}
|
||||
m.apply(intent)
|
||||
return m, nil
|
||||
m.pendingActivation = intent
|
||||
m.page = mainPage
|
||||
m.selected = 0
|
||||
return m, m.startOperation(intent)
|
||||
}
|
||||
|
||||
func (m *Model) apply(intent app.Intent) {
|
||||
@@ -683,7 +844,14 @@ func (m Model) View() string {
|
||||
confirm: m.confirm,
|
||||
targetConfirm: m.targetConfirm != nil,
|
||||
profileConfirm: m.profileConfirm != nil,
|
||||
confirmation: m.confirmation,
|
||||
status: m.status,
|
||||
operationStatus: m.operationStatus,
|
||||
currentError: m.currentError,
|
||||
errorExpanded: m.errorExpanded,
|
||||
exitDeferred: m.quitRequested && m.operationInFlight(),
|
||||
operationActive: m.operationActive,
|
||||
operationKind: m.operationKind,
|
||||
applying: m.applying,
|
||||
profileTransition: m.profileTransition,
|
||||
progressTarget: m.progressTarget,
|
||||
|
||||
Reference in New Issue
Block a user