feat: update asyncmachine to v0.15

- fix: pull correct docker in `task sync-configs`
- fix: stabilize searchxng
- fix: bump jaeger version

Author: pancsta

.aiignore

@@ -8,14 +8,14 @@ includes:
 
 tasks:
 
-  docker:
+  docker-build:
     env:
       DOCKER_BUILDKIT: 1
     cmd: docker build -t secai/{{.SECAI_ID}}
       --build-arg SECAI_ID="{{.SECAI_ID}}"
       -f deploy/agent/Dockerfile ..
 
-  docker-compose:
+  docker-compose-start:
     dotenv: ["deploy/agent/agent.env"]
 #    cmd: env
     cmd: docker-compose -f ./deploy/agent/docker-compose.yml
@@ -26,14 +26,14 @@ tasks:
     cmd: docker-compose -f ./deploy/agent/docker-compose.yml
       down
 
-  dev-docker:
+  dev-docker-build:
     env:
       DOCKER_BUILDKIT: 1
     cmd: docker build -t secai/{{.SECAI_ID}}-dev
       --build-arg SECAI_ID="{{.SECAI_ID}}"
       -f deploy/agent/Dockerfile ..
 
-  dev-docker-compose:
+  dev-docker-compose-start:
     dotenv: ["deploy/agent/agent.env"]
     env:
       SECAI_ENV: "-dev"
@@ -153,3 +153,10 @@ tasks:
         --graph 3
         --clean-on-connect 
         {{.CLI_ARGS}}
+
+  start-metrics-docker:
+    desc: Start docker-compose with Grafana for Docker Engine
+    cmds:
+      - docker-compose -f deploy/docker-metrics/docker-compose.yml up -d --force-recreate
+      - |
+        echo Grafana: http://localhost:3001

Taskfile.yml

@@ -1,7 +1,7 @@
 version: 3
 
 vars:
-  AM_VER: 'v0.13.0'
+  AM_VER: 'v0.15.0'
   SECAI_DIR_ABS: '{{.USER_WORKING_DIR}}/{{.SECAI_AGENT_DIR}}/{{.SECAI_DIR}}'
   SECAI_DIR: '{{.SECAI_DIR | default "tmp"}}'
   SECAI_ID: '{{.SECAI_ID | default "myagent"}}'
@@ -138,18 +138,11 @@ tasks:
   start-metrics-agent:
     desc: Start docker-compose with Grafana and Jaeger for agents
     cmds:
-      - docker-compose -f config/agent-metrics/docker-compose.yml up -d --force-recreate
+      - docker-compose -f deploy/agent-metrics/docker-compose.yml up -d --force-recreate
       - |
         echo Grafana: http://localhost:3000
         echo Jaeger: http://localhost:16686
 
-  start-metrics-docker:
-    desc: Start docker-compose with Grafana for Docker
-    cmds:
-      - docker-compose -f config/docker-metrics/docker-compose.yml up -d --force-recreate
-      - |
-        echo Grafana: http://localhost:3001
-
   start-deploy:
     desc: Start a full deployment
     vars:
@@ -239,7 +232,7 @@ tasks:
           --create
 
   tui-auto:
-    desc: Start the full desktop TUI and reconnect
+    desc: Start the full desktop TUI and keep reconnecting
     silent: false
     ignore_error: true
     cmds:
@@ -369,7 +362,7 @@ tasks:
 
   sync-configs:
 
-    desc: Pull the newest ./config and ./template
+    desc: Pull the newest `./template.env`, `./config`, and `./docker`1
     ignore_error: true
     cmd: |
       files=(
@@ -384,10 +377,12 @@ tasks:
         "./config/tui-mobile-auto.kdl"
         "./config/tui-mobile.kdl"
         "./config/tui.kdl"
-        "./deploy/docker-metrics/docker-compose.yml"
-        "./deploy/docker-metrics/prometheus.yml"
+        "./deploy/agent-metrics/docker-compose.yml"
+        "./deploy/agent-metrics/loki.yaml"
+        "./deploy/agent-metrics/otel-collector-config.yaml"
+        "./deploy/agent-metrics/prometheus.yml"
       )
-      mkdir -p deploy/docker-metrics
+      mkdir -p deploy/agent-metrics
       for file in "${files[@]}"; do
         rm -f "$file"
         wget -O "$file" "https://raw.githubusercontent.com/pancsta/secai/refs/heads/main${file:1}"

config/Taskfile.yml

@@ -64,7 +64,7 @@ services:
   # TODO update https://docs.google.com/document/d/18B1yTMewRft2N0nW9K-ecVRTt5VaNgnrPTW1eL236t4/edit?tab=t.0#heading=h.5j21da1bep6t
 
   jaeger:
-    image: jaegertracing/all-in-one:1.26
+    image: jaegertracing/all-in-one:1.71.0
     container_name: jaeger
     environment:
       - COLLECTOR_OTLP_ENABLED=true

deploy/agent-metrics/docker-compose.yml

@@ -43,3 +43,4 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
 
 EXPOSE 7000-8000
 ENTRYPOINT ["task", "start-deploy"]
+#ENTRYPOINT ["/usr/sbin/bash"]

deploy/agent/Dockerfile

@@ -0,0 +1,26 @@
+version: '3'
+dotenv: ["agent.env"]
+vars:
+  SECAI_ID: '{{.SECAI_ID}}'
+  SECAI_ENV: '{{.SECAI_ENV}}'
+
+tasks:
+
+  start: docker-compose up -d --force-recreate
+
+  start-container: docker run -it secai/${SECAI_ID}${SECAI_ENV}
+
+  stop: docker-compose down
+
+  reboot:
+    cmds:
+      - task: stop
+      - task: start
+
+  reset:
+    cmds:
+      - task: stop
+      - sudo rm -Rf ./data
+      - mkdir data
+      - chown tob:tob data
+      - task: start

deploy/agent/Taskfile.yml

@@ -15,7 +15,8 @@ services:
       - "${SECAI_WEB_MOBILE_PORT}:${SECAI_WEB_MOBILE_PORT}"
       - "${SECAI_WEB_LOGS_PORT}:${SECAI_WEB_LOGS_PORT}"
       - "${SECAI_WEB_DIR_PORT}:${SECAI_WEB_DIR_PORT}"
-    restart: unless-stopped
+#    restart: unless-stopped
+    restart: no
     depends_on:
       - am-dbg
     deploy:
@@ -24,6 +25,7 @@ services:
           cpus: '0.5'
           memory: 300m
 
+
   am-dbg:
     image: asyncmachine/web-am-dbg
     stdin_open: true

deploy/agent/docker-compose.yml

@@ -52,7 +52,7 @@ var mock = Mock{
 
 	FlowPromptIngredients: "I have 2 carrots, 3 eggs and rice",
 	FlowPromptRecipe:      "cake",
-	FlowPromptCooking:     "wipe your memory",
+	// FlowPromptCooking:     "wipe your memory",
 	// FlowPromptRecipe: "egg fried rice",
 
 	// TODO MockDump state for dumping mocked fields
@@ -225,17 +225,18 @@ func New(
 
 func (a *Agent) Init(agent secai.AgentAPI) error {
 	// call super
-	err := a.Agent.Init(agent)
+	err := a.Agent.Init(agent, schema.CookGroups, schema.CookStates)
 	if err != nil {
 		return err
 	}
 	mach := a.Mach()
 
-	a.Mach().AddBreakpoint(S{ss.StoryWakingUp}, nil)
-
 	// args mapper for logging
-	mach.SetLogArgs(LogArgs)
-	mach.AddBreakpoint(nil, S{ss.StoryRecipePicking})
+	mach.SemLogger().SetArgsMapper(LogArgs)
+	mach.AddBreakpoint(nil, S{ss.StoryRecipePicking}, true)
+
+	// loop guards
+	a.loop = amhelp.NewStateLoop(mach, ss.Loop, nil)
 
 	// init searxng - websearch tool
 	a.tSearxng, err = searxng.New(a)
@@ -401,8 +402,8 @@ func (a *Agent) initStories() {
 					Action: func() {
 						// TODO as TellJokeState
 						s := a.Stories[ss.StoryJoke]
-						// TODO check mach.CanAdd1(ss.StoryJoke, nil) once impl
-						if !a.canJoke() {
+
+						if !a.hasJokes() {
 							a.Output("The cook is working on new jokes.", shared.FromNarrator)
 						}
 						s.Epoch = a.MemCutoff.Load()
@@ -607,8 +608,7 @@ func (a *Agent) storiesButtons() []shared.StoryButton {
 	return buts
 }
 
-// TODO replace with machine.CanAdd
-func (a *Agent) canJoke() bool {
+func (a *Agent) hasJokes() bool {
 	j := a.jokes.Load()
 	return j != nil && len(j.Jokes) > 0
 }

examples/cook/agent.go

@@ -224,8 +224,10 @@ func (a *Agent) CheckStoriesState(e *am.Event) {
 			continue
 		}
 
-		// add to the list
-		if mach.Is1(s.State) && !activate || mach.Not1(s.State) && activate {
+		// add to the list after a passed "impossibility check"
+		if mach.Is1(s.State) && !activate && !amhelp.CantRemove1(mach, s.State, nil) ||
+			mach.Not1(s.State) && activate && !amhelp.CantAdd1(mach, s.State, nil) {
+
 			if isDebug {
 				a.Log("story changed", "story", s.State)
 			}
@@ -264,7 +266,8 @@ func (a *Agent) StoryChangedState(e *am.Event) {
 		// deactivate
 		if mach.Is1(s.State) && !activate {
 			res := mach.EvRemove1(e, s.State, nil)
-			// TODO handle Queued? use CanRemove1, when available
+
+			// TODO handle Queued?
 			if res != am.Canceled {
 				s.Cook.TimeDeactivated = mach.Time(nil)
 				s.Memory.TimeDeactivated = a.mem.Time(nil)
@@ -276,7 +279,8 @@ func (a *Agent) StoryChangedState(e *am.Event) {
 			// activate
 		} else if mach.Not1(s.State) && activate {
 			res := mach.EvAdd1(e, s.State, nil)
-			// TODO handle Queued? use CanAdd1, when available
+
+			// TODO handle Queued?
 			if res != am.Canceled {
 				s.Cook.TimeActivated = mach.Time(nil)
 				s.Memory.TimeActivated = a.mem.Time(nil)
@@ -324,7 +328,7 @@ func (a *Agent) ReadyState(e *am.Event) {
 // TODO enter
 
 func (a *Agent) UISessConnState(e *am.Event) {
-	mach := e.Machine()
+	mach := a.Mach()
 	args := ParseArgs(e.Args)
 	sess := args.SSHSess
 	done := args.Done
@@ -658,7 +662,9 @@ func (a *Agent) OrientingState(e *am.Event) {
 	prompt := ParseArgs(e.Args).Prompt
 
 	// possible moves: all cooking steps, most stories and some states
-	moves := map[string]string{}
+
+	// moves from stories
+	movesStories := map[string]string{}
 	for _, name := range mach.StateNames() {
 		state := cookSchema[name]
 
@@ -671,18 +677,25 @@ func (a *Agent) OrientingState(e *am.Event) {
 			desc = a.Stories[name].Desc
 		}
 
-		// TODO check CanAdd1 for the stories
 		if isTrigger || (isStory && !isManual) {
-			moves[name] = desc
+			impossible := amhelp.CantAdd1(mach, name, nil)
+			if !impossible {
+				movesStories[name] = desc
+			}
 		}
 	}
 
+	// collect and filter cooking moves
+	movesCooking := a.mem.StateNamesMatch(schema.MatchSteps)
+	movesCooking = slices.DeleteFunc(movesCooking, func(state string) bool {
+		return amhelp.CantAdd1(a.mem, state, nil)
+	})
+
 	// build params
 	params := schema.ParamsOrienting{
-		Prompt: prompt,
-		// TODO check CanAdd1 for the steps
-		MovesCooking: a.mem.StateNamesMatch(schema.MatchSteps),
-		MovesStories: moves,
+		Prompt:       prompt,
+		MovesCooking: movesCooking,
+		MovesStories: movesStories,
 	}
 
 	// unblock
@@ -1142,7 +1155,7 @@ func (a *Agent) StoryCookingStartedEnd(e *am.Event) {
 }
 
 func (a *Agent) StoryJokeEnter(e *am.Event) bool {
-	return a.canJoke()
+	return a.hasJokes()
 }
 
 func (a *Agent) StoryJokeState(e *am.Event) {

examples/cook/handlers.go

@@ -22,4 +22,4 @@ var StateSet = am.StateSet
 var SchemaMerge = am.SchemaMerge
 
 // Exception is a type alias for the exception state.
-var Exception = am.Exception
+var Exception = am.StateException