2 files changed, 94 insertions, 3 deletions

diff --git a/internal/storage/db.go b/internal/storage/db.go
index a871c71..adb7c02 100644
--- a/internal/storage/db.go
+++ b/internal/storage/db.go
@@ -190,15 +190,41 @@ func (s *DB) CreateTask(t *task.Task) error {
 		return fmt.Errorf("marshaling depends_on: %w", err)
 	}
 
-	_, err = s.db.Exec(`
+	tx, err := s.db.Begin()
+	if err != nil {
+		return err
+	}
+	defer tx.Rollback() //nolint:errcheck
+
+	if _, err = tx.Exec(`
 		INSERT INTO tasks (id, name, description, elaboration_input, project, repository_url, config_json, priority, timeout_ns, retry_json, tags_json, depends_on_json, parent_task_id, state, created_at, updated_at, story_id, acceptance_criteria, checker_for_task_id, checker_report)
 		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
 		t.ID, t.Name, t.Description, t.ElaborationInput, t.Project, t.RepositoryURL, string(configJSON), string(t.Priority),
 		t.Timeout.Duration.Nanoseconds(), string(retryJSON), string(tagsJSON), string(depsJSON),
 		t.ParentTaskID, string(t.State), t.CreatedAt.UTC(), t.UpdatedAt.UTC(), t.StoryID,
 		t.AcceptanceCriteria, t.CheckerForTaskID, t.CheckerReport,
-	)
-	return err
+	); err != nil {
+		return err
+	}
+
+	// A subtask records a subtask_spawned event on its parent's stream so the
+	// parent's history shows the children it dispatched.
+	if t.ParentTaskID != "" {
+		payload, _ := json.Marshal(struct {
+			SubtaskID string `json:"subtask_id"`
+			Name      string `json:"name"`
+		}{SubtaskID: t.ID, Name: t.Name})
+		if err = createEventTx(tx, &event.Event{
+			TaskID:  t.ParentTaskID,
+			Kind:    event.KindSubtaskSpawned,
+			Actor:   event.ActorAgent,
+			Payload: payload,
+		}); err != nil {
+			return err
+		}
+	}
+
+	return tx.Commit()
 }
 
 // GetTask retrieves a task by ID.
diff --git a/internal/storage/events_test.go b/internal/storage/events_test.go
index 3ce79ab..c5d3c37 100644
--- a/internal/storage/events_test.go
+++ b/internal/storage/events_test.go
@@ -369,6 +369,71 @@ func TestAppendTaskInteraction_EmitsClarificationAnswer(t *testing.T) {
 	}
 }
 
+func TestCreateTask_Subtask_EmitsSubtaskSpawnedOnParent(t *testing.T) {
+	db := testDB(t)
+	makeTaskForEvent(t, db, "parent-1")
+
+	now := time.Now().UTC().Truncate(time.Second)
+	child := &task.Task{
+		ID:           "child-1",
+		Name:         "Do the subthing",
+		ParentTaskID: "parent-1",
+		Agent:        task.AgentConfig{Type: "claude", Instructions: "noop"},
+		Priority:     task.PriorityNormal,
+		State:        task.StatePending,
+		CreatedAt:    now,
+		UpdatedAt:    now,
+	}
+	if err := db.CreateTask(child); err != nil {
+		t.Fatalf("CreateTask child: %v", err)
+	}
+
+	// Parent should have the subtask_spawned event.
+	parentEvents, err := db.ListEvents("parent-1", 0)
+	if err != nil {
+		t.Fatalf("ListEvents parent: %v", err)
+	}
+	if len(parentEvents) != 1 {
+		t.Fatalf("expected 1 event on parent, got %d", len(parentEvents))
+	}
+	e := parentEvents[0]
+	if e.Kind != event.KindSubtaskSpawned || e.Actor != event.ActorAgent {
+		t.Errorf("got kind=%v actor=%v want subtask_spawned/agent", e.Kind, e.Actor)
+	}
+	var payload struct {
+		SubtaskID string `json:"subtask_id"`
+		Name      string `json:"name"`
+	}
+	if err := json.Unmarshal(e.Payload, &payload); err != nil {
+		t.Fatalf("unmarshal: %v", err)
+	}
+	if payload.SubtaskID != "child-1" || payload.Name != "Do the subthing" {
+		t.Errorf("payload: got %+v", payload)
+	}
+
+	// Child should have no events of its own from creation.
+	childEvents, err := db.ListEvents("child-1", 0)
+	if err != nil {
+		t.Fatalf("ListEvents child: %v", err)
+	}
+	if len(childEvents) != 0 {
+		t.Errorf("expected no events on child, got %d", len(childEvents))
+	}
+}
+
+func TestCreateTask_TopLevel_EmitsNoEvent(t *testing.T) {
+	db := testDB(t)
+	makeTaskForEvent(t, db, "top-1") // no parent
+
+	events, err := db.ListEvents("top-1", 0)
+	if err != nil {
+		t.Fatalf("ListEvents: %v", err)
+	}
+	if len(events) != 0 {
+		t.Errorf("top-level task creation should emit no event, got %d", len(events))
+	}
+}
+
 func TestCreateEvent_RequiresFields(t *testing.T) {
 	db := testDB(t)