From a3043e786a7b8919a02bbd1b37cbe7be77b1b0d5 Mon Sep 17 00:00:00 2001
From: Virgil <virgil@lethean.io>
Date: Thu, 2 Apr 2026 04:42:58 +0000
Subject: [PATCH] feat(agentic): preserve nullable fleet task id

Co-Authored-By: Virgil <virgil@lethean.io>
---
 pkg/agentic/platform.go      | 12 ++++++++++--
 pkg/agentic/platform_test.go | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/pkg/agentic/platform.go b/pkg/agentic/platform.go
index d23aea2..2985514 100644
--- a/pkg/agentic/platform.go
+++ b/pkg/agentic/platform.go
@@ -31,7 +31,7 @@ type FleetNode struct {
 	Capabilities    []string       `json:"capabilities,omitempty"`
 	Status          string         `json:"status"`
 	ComputeBudget   *ComputeBudget `json:"compute_budget,omitempty"`
-	CurrentTaskID   int            `json:"current_task_id,omitempty"`
+	CurrentTaskID   *int           `json:"current_task_id,omitempty"`
 	LastHeartbeatAt string         `json:"last_heartbeat_at,omitempty"`
 	RegisteredAt    string         `json:"registered_at,omitempty"`
 }
@@ -738,12 +738,20 @@ func parseFleetNode(values map[string]any) FleetNode {
 		Capabilities:    listValue(values["capabilities"]),
 		Status:          stringValue(values["status"]),
 		ComputeBudget:   computeBudgetFromValue(values["compute_budget"]),
-		CurrentTaskID:   intValue(values["current_task_id"]),
+		CurrentTaskID:   intPointerValue(values["current_task_id"]),
 		LastHeartbeatAt: stringValue(values["last_heartbeat_at"]),
 		RegisteredAt:    stringValue(values["registered_at"]),
 	}
 }
 
+func intPointerValue(value any) *int {
+	number, ok := intValueOK(value)
+	if !ok {
+		return nil
+	}
+	return &number
+}
+
 func computeBudgetFromValue(value any) *ComputeBudget {
 	switch typed := value.(type) {
 	case *ComputeBudget:
diff --git a/pkg/agentic/platform_test.go b/pkg/agentic/platform_test.go
index 6607c4f..8dd8366 100644
--- a/pkg/agentic/platform_test.go
+++ b/pkg/agentic/platform_test.go
@@ -69,6 +69,7 @@ func TestPlatform_HandleFleetRegister_Good(t *testing.T) {
 	assert.Equal(t, "linux", node.Platform)
 	assert.Equal(t, []string{"codex"}, node.Models)
 	assert.Equal(t, []string{"go", "review"}, node.Capabilities)
+	assert.Nil(t, node.CurrentTaskID)
 }
 
 func TestPlatform_HandleFleetHeartbeat_Good_ComputeBudget(t *testing.T) {
@@ -194,6 +195,39 @@ func TestPlatform_HandleFleetNextTask_Ugly(t *testing.T) {
 	assert.Nil(t, task)
 }
 
+func TestPlatform_ParseFleetNode_Good_CurrentTaskID(t *testing.T) {
+	node := parseFleetNode(map[string]any{
+		"agent_id":        "charon",
+		"platform":        "linux",
+		"status":          "online",
+		"current_task_id": 17,
+	})
+
+	require.NotNil(t, node.CurrentTaskID)
+	assert.Equal(t, 17, *node.CurrentTaskID)
+}
+
+func TestPlatform_ParseFleetNode_Bad_CurrentTaskIDMissing(t *testing.T) {
+	node := parseFleetNode(map[string]any{
+		"agent_id": "charon",
+		"platform": "linux",
+		"status":   "online",
+	})
+
+	assert.Nil(t, node.CurrentTaskID)
+}
+
+func TestPlatform_ParseFleetNode_Ugly_CurrentTaskIDNull(t *testing.T) {
+	node := parseFleetNode(map[string]any{
+		"agent_id":        "charon",
+		"platform":        "linux",
+		"status":          "online",
+		"current_task_id": nil,
+	})
+
+	assert.Nil(t, node.CurrentTaskID)
+}
+
 func TestPlatform_HandleFleetEvents_Good(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		require.Equal(t, "/v1/fleet/events", r.URL.Path)