Generalize the focus controller into a harness hosting swappable modes
Loosen AntiDrift's session controller into Keel's general collect→brain→act
loop. A new internal/harness runs at most one mode.Mode at a time, fanning
async completions out to the web SSE and status-bar surfaces.
- internal/mode: the Mode contract (Kind/Command/View/Active) plus optional
EvidenceConsumer and Expirer ports, and the surfacing Envelope.
- internal/mode/focus: the former session/domain/statemachine packages moved
under the mode, now satisfying the harness contracts unchanged.
- internal/mode/offscreen: a one-shot away-from-desk mode built on the new
ai.Proposer, which turns a life-domain brief into one off-screen action.
- cmd/keeld replaces cmd/antidriftd; daemon wires focus + offscreen factories
with per-mode persistence under ~/.keel/modes/<kind>.
- Finish the rename: KEEL_* env refs in the README, /keeld build artifact
ignored, stale antidriftd binary removed.
Include the design + implementation plan this refactor was built from under
docs/superpowers/{specs,plans}/2026-06-04-controller-refactor*.md.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,378 @@
|
||||
package focus
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"keel/internal/ai"
|
||||
"keel/internal/knowledge"
|
||||
"keel/internal/mode/focus/domain"
|
||||
"keel/internal/store"
|
||||
"keel/internal/tasks"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
const coachTimeout = 60 * time.Second
|
||||
|
||||
const (
|
||||
coachIdle = "idle"
|
||||
coachPending = "pending"
|
||||
coachReady = "ready"
|
||||
coachError = "error"
|
||||
)
|
||||
|
||||
const tasksTimeout = 30 * time.Second
|
||||
|
||||
const (
|
||||
tasksIdle = "idle"
|
||||
tasksPending = "pending"
|
||||
tasksReady = "ready"
|
||||
tasksError = "error"
|
||||
)
|
||||
|
||||
const knowledgeTimeout = 10 * time.Second
|
||||
|
||||
const (
|
||||
knowledgeIdle = "idle"
|
||||
knowledgePending = "pending"
|
||||
knowledgeReady = "ready"
|
||||
knowledgeAbsent = "absent"
|
||||
knowledgeError = "error"
|
||||
)
|
||||
|
||||
const reflectionTimeout = 30 * time.Second
|
||||
|
||||
const reflectionHistoryN = 5
|
||||
|
||||
// reflectionTopBuckets caps how many per-window time buckets the finished-session
|
||||
// block lists for the reviewer, keeping the prompt compact.
|
||||
const reflectionTopBuckets = 3
|
||||
|
||||
const (
|
||||
reflectionIdle = "idle"
|
||||
reflectionPending = "pending"
|
||||
reflectionReady = "ready"
|
||||
reflectionAbsent = "absent"
|
||||
)
|
||||
|
||||
// SetCoach injects the AI coach. Mirrors SetOnChange. A nil coach makes
|
||||
// RequestCoach degrade gracefully.
|
||||
func (c *Mode) SetCoach(coach ai.Coach) {
|
||||
c.mu.Lock()
|
||||
c.coach = coach
|
||||
c.mu.Unlock()
|
||||
}
|
||||
|
||||
// resetCoachLocked returns coach state to idle and invalidates any in-flight
|
||||
// request. Caller holds mu.
|
||||
func (c *Mode) resetCoachLocked() {
|
||||
c.coachStatus = coachIdle
|
||||
c.coachProposal = nil
|
||||
c.coachErr = ""
|
||||
c.coachGen++
|
||||
}
|
||||
|
||||
// SetTasks injects the Tasks provider. Mirrors SetCoach. A nil provider keeps
|
||||
// the planning tasks list absent.
|
||||
func (c *Mode) SetTasks(p tasks.Provider) {
|
||||
c.mu.Lock()
|
||||
c.tasksProvider = p
|
||||
c.mu.Unlock()
|
||||
}
|
||||
|
||||
// startTasksFetchLocked kicks off an asynchronous Today() fetch when a provider
|
||||
// is set. Mirrors RequestCoach: generation-guarded, discards stale or
|
||||
// post-planning results, and notifies on completion. Caller holds mu.
|
||||
func (c *Mode) startTasksFetchLocked() {
|
||||
c.tasksList = nil
|
||||
if c.tasksProvider == nil {
|
||||
c.tasksStatus = tasksIdle
|
||||
return
|
||||
}
|
||||
c.tasksGen++
|
||||
gen := c.tasksGen
|
||||
c.tasksStatus = tasksPending
|
||||
provider := c.tasksProvider
|
||||
var list []tasks.Task
|
||||
var err error
|
||||
c.async.Run(tasksTimeout,
|
||||
func(ctx context.Context) { list, err = provider.Today(ctx) },
|
||||
func() bool { return gen != c.tasksGen || c.runtimeState != domain.RuntimePlanning },
|
||||
func() {
|
||||
if err != nil {
|
||||
c.tasksStatus = tasksError
|
||||
c.tasksList = nil
|
||||
} else {
|
||||
c.tasksStatus = tasksReady
|
||||
c.tasksList = list
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// SetKnowledge injects the Knowledge source. Mirrors SetTasks. A nil source
|
||||
// keeps the planning knowledge view absent and the coach ungrounded.
|
||||
func (c *Mode) SetKnowledge(s knowledge.Source) {
|
||||
c.mu.Lock()
|
||||
c.knowledgeSrc = s
|
||||
c.mu.Unlock()
|
||||
}
|
||||
|
||||
// SetKnowledgePath selects an explicit profile path (session-only; not
|
||||
// persisted). While planning, it re-loads immediately so the indicator and the
|
||||
// cached grounding update. An empty path resets to the adapter default.
|
||||
func (c *Mode) SetKnowledgePath(path string) {
|
||||
c.mu.Lock()
|
||||
c.knowledgePath = strings.TrimSpace(path)
|
||||
planning := c.runtimeState == domain.RuntimePlanning
|
||||
if planning {
|
||||
c.startKnowledgeFetchLocked()
|
||||
}
|
||||
c.mu.Unlock()
|
||||
if planning {
|
||||
c.notify()
|
||||
}
|
||||
}
|
||||
|
||||
// startKnowledgeFetchLocked kicks off an asynchronous Load when a source is set.
|
||||
// Mirrors startTasksFetchLocked: generation-guarded, discards stale or
|
||||
// post-planning results, and notifies on completion. The loaded text is cached
|
||||
// in knowledgeText for the coach to read. Caller holds mu.
|
||||
func (c *Mode) startKnowledgeFetchLocked() {
|
||||
c.knowledgeText = ""
|
||||
c.knowledgeChars = 0
|
||||
if c.knowledgeSrc == nil {
|
||||
c.knowledgeStatus = knowledgeIdle
|
||||
return
|
||||
}
|
||||
c.knowledgeGen++
|
||||
gen := c.knowledgeGen
|
||||
c.knowledgeStatus = knowledgePending
|
||||
src := c.knowledgeSrc
|
||||
path := c.knowledgePath
|
||||
var prof knowledge.Profile
|
||||
var err error
|
||||
c.async.Run(knowledgeTimeout,
|
||||
func(ctx context.Context) { prof, err = src.Load(ctx, path) },
|
||||
func() bool { return gen != c.knowledgeGen || c.runtimeState != domain.RuntimePlanning },
|
||||
func() {
|
||||
if err != nil {
|
||||
c.knowledgeStatus = knowledgeError
|
||||
c.knowledgeText = ""
|
||||
c.knowledgeChars = 0
|
||||
if prof.Path != "" {
|
||||
c.knowledgePath = prof.Path
|
||||
}
|
||||
} else if prof.Text == "" {
|
||||
c.knowledgeStatus = knowledgeAbsent
|
||||
c.knowledgeText = ""
|
||||
c.knowledgeChars = 0
|
||||
c.knowledgePath = prof.Path
|
||||
} else {
|
||||
c.knowledgeStatus = knowledgeReady
|
||||
c.knowledgeText = prof.Text
|
||||
c.knowledgeChars = len(prof.Text)
|
||||
c.knowledgePath = prof.Path
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// SetReviewer injects the AI reviewer. A nil reviewer keeps reflection idle and
|
||||
// leaves the coach ungrounded by any carry-forward.
|
||||
func (c *Mode) SetReviewer(r ai.Reviewer) {
|
||||
c.mu.Lock()
|
||||
c.reviewer = r
|
||||
c.mu.Unlock()
|
||||
}
|
||||
|
||||
// startReflectionFetchLocked kicks off an asynchronous reflection when a
|
||||
// reviewer is set, on entering Review. Unlike the tasks/knowledge fetches, the
|
||||
// completion guard is generation-only (not state-gated): the carry-forward must
|
||||
// still apply if the user clicks End before the reviewer returns. A superseded
|
||||
// review (a later session's fetch) bumps the generation and discards this one.
|
||||
// The recap and carry-forward are cleared up front so a failed/slow reviewer
|
||||
// never leaves stale data from the previous session. Caller holds mu.
|
||||
func (c *Mode) startReflectionFetchLocked() {
|
||||
c.reflectionRecap = ""
|
||||
c.carryForward = ""
|
||||
if c.reviewer == nil {
|
||||
c.reflectionStatus = reflectionIdle
|
||||
return
|
||||
}
|
||||
c.reflectionGen++
|
||||
gen := c.reflectionGen
|
||||
c.reflectionStatus = reflectionPending
|
||||
reviewer := c.reviewer
|
||||
finished := c.buildReflectionFinishedLocked()
|
||||
// Read the history synchronously, here under the lock, on purpose: it must
|
||||
// happen-before End appends the just-finished session to the audit chain, so
|
||||
// that session is excluded from "recent history" and not double-counted (it
|
||||
// is already carried in `finished`). Moving this into the goroutine would
|
||||
// race with End's append and reintroduce that double-count. The read is
|
||||
// bounded to reflectionHistoryN summaries and runs once per Review entry, not
|
||||
// on any hot path.
|
||||
history := buildReflectionHistory(c.auditPath)
|
||||
var refl ai.Reflection
|
||||
var err error
|
||||
c.async.Run(reflectionTimeout,
|
||||
func(ctx context.Context) { refl, err = reviewer.Review(ctx, finished, history) },
|
||||
func() bool { return gen != c.reflectionGen },
|
||||
func() {
|
||||
if err != nil || strings.TrimSpace(refl.Recap) == "" {
|
||||
c.reflectionStatus = reflectionAbsent
|
||||
c.reflectionRecap = ""
|
||||
c.carryForward = ""
|
||||
} else {
|
||||
c.reflectionStatus = reflectionReady
|
||||
c.reflectionRecap = refl.Recap
|
||||
c.carryForward = refl.CarryForward
|
||||
}
|
||||
_ = c.persistLocked()
|
||||
})
|
||||
}
|
||||
|
||||
// buildReflectionFinishedLocked renders the just-finished session as a compact
|
||||
// block for the reviewer: the commitment, the outcome, on/off/unclassified time
|
||||
// totals, and a top-N on-task list and top-N off-task list. The split fields are
|
||||
// populated live by creditLocked. Caller holds mu; c.stats/c.commitment are still
|
||||
// set (End clears them, but enterReview runs before End).
|
||||
func (c *Mode) buildReflectionFinishedLocked() string {
|
||||
var na, sc string
|
||||
if c.commitment != nil {
|
||||
na, sc = c.commitment.NextAction, c.commitment.SuccessCondition
|
||||
}
|
||||
outcome := c.outcomePending
|
||||
if outcome == "" {
|
||||
outcome = "completed"
|
||||
}
|
||||
var b strings.Builder
|
||||
fmt.Fprintf(&b, "Next action: %s\n", na)
|
||||
fmt.Fprintf(&b, "Success condition: %s\n", sc)
|
||||
fmt.Fprintf(&b, "Outcome: %s\n", outcome)
|
||||
if c.stats != nil {
|
||||
onMin := int64(sumDurations(c.stats.OnTask).Seconds()) / 60
|
||||
offMin := int64(sumDurations(c.stats.OffTask).Seconds()) / 60
|
||||
unclMin := int64(c.stats.unclassified.Seconds()) / 60
|
||||
fmt.Fprintf(&b, "On-task %dm / Off-task %dm / Unclassified %dm\n", onMin, offMin, unclMin)
|
||||
fmt.Fprintf(&b, "Context switches: %d\n", c.stats.SwitchCount)
|
||||
writeBucketList(&b, "On-task", c.stats.OnTask)
|
||||
writeBucketList(&b, "Off-task", c.stats.OffTask)
|
||||
}
|
||||
return strings.TrimRight(b.String(), "\n")
|
||||
}
|
||||
|
||||
// writeBucketList renders a labeled, time-descending list of buckets capped at
|
||||
// reflectionTopBuckets. It writes nothing — not even the label — when the map is
|
||||
// empty, so a single-sided session shows only the list that has time.
|
||||
func writeBucketList(b *strings.Builder, label string, m map[bucketKey]time.Duration) {
|
||||
views := bucketViews(m)
|
||||
if len(views) == 0 {
|
||||
return
|
||||
}
|
||||
fmt.Fprintf(b, "%s:\n", label)
|
||||
for i, bv := range views {
|
||||
if i >= reflectionTopBuckets {
|
||||
break
|
||||
}
|
||||
fmt.Fprintf(b, "- %s · %s: %dm\n", bv.Class, bv.Title, bv.Seconds/60)
|
||||
}
|
||||
}
|
||||
|
||||
// sumDurations totals the durations in a bucket map.
|
||||
func sumDurations(m map[bucketKey]time.Duration) time.Duration {
|
||||
var total time.Duration
|
||||
for _, d := range m {
|
||||
total += d
|
||||
}
|
||||
return total
|
||||
}
|
||||
|
||||
// buildReflectionHistory renders the last few prior sessions as compact lines.
|
||||
// The just-finished session is not yet in the chain (End appends it), so it is
|
||||
// not double-counted. Returns "" when there is no usable history.
|
||||
func buildReflectionHistory(auditPath string) string {
|
||||
sums, err := store.RecentSessions(auditPath, reflectionHistoryN)
|
||||
if err != nil || len(sums) == 0 {
|
||||
return ""
|
||||
}
|
||||
var b strings.Builder
|
||||
for _, s := range sums {
|
||||
top := ""
|
||||
if len(s.Buckets) > 0 {
|
||||
top = fmt.Sprintf(", top %s %dm", s.Buckets[0].Class, s.Buckets[0].Seconds/60)
|
||||
}
|
||||
fmt.Fprintf(&b, "- %s: %s (%d switches%s)\n", s.Outcome, s.NextAction, s.SwitchCount, top)
|
||||
}
|
||||
return strings.TrimRight(b.String(), "\n")
|
||||
}
|
||||
|
||||
// composedGroundingLocked combines the standing profile (knowledge port) with
|
||||
// the latest carry-forward takeaway into the single free-form grounding string
|
||||
// the coach already accepts. Caller holds mu.
|
||||
func (c *Mode) composedGroundingLocked() string {
|
||||
g := c.knowledgeText
|
||||
if c.carryForward != "" {
|
||||
if g != "" {
|
||||
g += "\n\n"
|
||||
}
|
||||
g += "Last session's takeaway: " + c.carryForward
|
||||
}
|
||||
return g
|
||||
}
|
||||
|
||||
// RequestCoach starts an async coach call for intent. Returns ErrNotPlanning if
|
||||
// not in planning; otherwise never a hard error (failures surface as coach
|
||||
// state). The proposal is ephemeral and never persisted.
|
||||
func (c *Mode) RequestCoach(intent string) error {
|
||||
c.mu.Lock()
|
||||
if c.runtimeState != domain.RuntimePlanning {
|
||||
c.mu.Unlock()
|
||||
return ErrNotPlanning
|
||||
}
|
||||
if c.coach == nil {
|
||||
c.coachStatus = coachError
|
||||
c.coachErr = "coach unavailable"
|
||||
c.coachProposal = nil
|
||||
c.mu.Unlock()
|
||||
c.notify()
|
||||
return nil
|
||||
}
|
||||
c.coachGen++
|
||||
gen := c.coachGen
|
||||
c.coachStatus = coachPending
|
||||
c.coachErr = ""
|
||||
c.coachProposal = nil
|
||||
coach := c.coach
|
||||
grounding := c.composedGroundingLocked()
|
||||
c.mu.Unlock()
|
||||
c.notify()
|
||||
|
||||
var prop ai.Proposal
|
||||
var err error
|
||||
c.async.Run(coachTimeout,
|
||||
func(ctx context.Context) { prop, err = coach.Coach(ctx, intent, grounding) },
|
||||
func() bool { return gen != c.coachGen || c.runtimeState != domain.RuntimePlanning },
|
||||
func() {
|
||||
if err != nil {
|
||||
c.coachStatus = coachError
|
||||
c.coachErr = coachErrorMessage(err)
|
||||
c.coachProposal = nil
|
||||
} else {
|
||||
c.coachStatus = coachReady
|
||||
c.coachProposal = &prop
|
||||
c.coachErr = ""
|
||||
}
|
||||
})
|
||||
return nil
|
||||
}
|
||||
|
||||
func coachErrorMessage(err error) string {
|
||||
switch {
|
||||
case errors.Is(err, ai.ErrEmptyResponse), errors.Is(err, ai.ErrNoJSON), errors.Is(err, ai.ErrInvalidProposal):
|
||||
return "coach returned an unusable response"
|
||||
case errors.Is(err, context.DeadlineExceeded):
|
||||
return "coach timed out"
|
||||
default:
|
||||
return "coach unavailable"
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user