X-Git-Url: http://git.giacomolli.uk/onechat/blobdiff_plain/150d707b16a5495272dfb02d690d99bfae50c14e..0e57dcfc96cd95268d5dd00af7ce0594721d3ded:/schedule_test.go?ds=sidebyside

diff --git a/schedule_test.go b/schedule_test.go
index 85e11d0..6610c26 100644
--- a/schedule_test.go
+++ b/schedule_test.go
@@ -2,8 +2,6 @@ package main
 
 import (
 	"context"
-	"io"
-	"log"
 	"os"
 	"path/filepath"
 	"strings"
@@ -130,7 +128,7 @@ func TestSchedulesSurviveARestart(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, os.FileMode(0o600), info.Mode().Perm())
 
-	reopened, err := openSchedules(path, schedules.clock, log.New(io.Discard, "", 0))
+	reopened, err := openSchedules(path, "OneChat", schedules.clock, discardLog())
 	require.NoError(t, err)
 	require.Equal(t, "2 | Monday 2026-11-09 08:00 -03:00 | 0 8 * * 1-5 | Tell the user the news.", reopened.List())
 
@@ -173,6 +171,7 @@ func TestSchedulesDone(t *testing.T) {
 	now := start.Add(3*time.Hour + 30*time.Minute)
 	due := schedules.Due(now)
 	require.Len(t, due, 2)
+
 	for _, schedule := range due {
 		require.NoError(t, schedules.Done(schedule, now))
 	}
@@ -232,7 +231,7 @@ func TestOpenSchedulesRefusesABadCron(t *testing.T) {
 	path := filepath.Join(t.TempDir(), scheduleFileName)
 	require.NoError(t, os.WriteFile(path, []byte(`{"next":1,"schedules":[{"id":1,"text":"x","cron":"* * * * *","due":"2026-11-09T09:00:00-03:00"}]}`), 0o600))
 
-	_, err := openSchedules(path, time.Now, log.New(io.Discard, "", 0))
+	_, err := openSchedules(path, "OneChat", time.Now, discardLog())
 	require.ErrorContains(t, err, "schedule 1: the runs of")
 }
 
@@ -242,7 +241,7 @@ func TestSchedulesRunStartsATurnWhenDue(t *testing.T) {
 	}
 
 	logs := &SyncBuffer{}
-	schedules, err := openSchedules(filepath.Join(t.TempDir(), scheduleFileName), clock.Now, log.New(logs, "", 0))
+	schedules, err := openSchedules(filepath.Join(t.TempDir(), scheduleFileName), "OneChat", clock.Now, daemonTestLogger(logs))
 	require.NoError(t, err)
 
 	server := newModelFake(t)
@@ -259,7 +258,7 @@ func TestSchedulesRunStartsATurnWhenDue(t *testing.T) {
 	require.Equal(t, "[Schedule 1] Sunday 2026-11-08 20:05 -03:00, once\nRemind the user to drink water.\n"+scheduleEmptyReply, texts[len(texts)-1])
 	require.Equal(t, scheduleSource, test.events.LastEvent("work").Source)
 	require.Equal(t, "No schedules.", schedules.List())
-	require.Equal(t, "schedule 1 runs\n", logs.String())
+	require.Equal(t, "<6>schedule ran id=1\n", logs.String())
 }
 
 func TestSchedulesRunMissedSchedulesOnceAtTheStart(t *testing.T) {
@@ -271,7 +270,7 @@ func TestSchedulesRunMissedSchedulesOnceAtTheStart(t *testing.T) {
 	}
 
 	logs := &SyncBuffer{}
-	schedules, err := openSchedules(path, clock.Now, log.New(logs, "", 0))
+	schedules, err := openSchedules(path, "OneChat", clock.Now, daemonTestLogger(logs))
 	require.NoError(t, err)
 
 	server := newModelFake(t)
@@ -285,7 +284,7 @@ func TestSchedulesRunMissedSchedulesOnceAtTheStart(t *testing.T) {
 		"[Schedule 2] Sunday 2026-11-08 10:00 -03:00, repeats 0 * * * *\nTell the user the time.\n" + scheduleLateLine + "\n" + scheduleEmptyReply,
 	}, texts[len(texts)-2:])
 	require.Equal(t, "2 | Sunday 2026-11-08 21:00 -03:00 | 0 * * * * | Tell the user the time.", schedules.List())
-	require.Equal(t, "schedule 1 runs 11h30m0s late, because the daemon was stopped at its time\nschedule 2 runs 10h30m0s late, because the daemon was stopped at its time\n", logs.String())
+	require.Equal(t, "<6>schedule ran id=1 late=11h30m0s\n<6>schedule ran id=2 late=10h30m0s\n", logs.String())
 }
 
 func TestDaemonRunsADueSchedule(t *testing.T) {
@@ -293,7 +292,7 @@ func TestDaemonRunsADueSchedule(t *testing.T) {
 		now: time.Date(2026, time.November, 8, 20, 0, 0, 0, time.FixedZone("", -3*60*60)),
 	}
 
-	schedules, err := openSchedules(filepath.Join(t.TempDir(), scheduleFileName), clock.Now, log.New(io.Discard, "", 0))
+	schedules, err := openSchedules(filepath.Join(t.TempDir(), scheduleFileName), "OneChat", clock.Now, discardLog())
 	require.NoError(t, err)
 
 	schedules.check = time.Millisecond
@@ -330,6 +329,36 @@ func TestSubagentHasNoScheduleTools(t *testing.T) {
 	require.Equal(t, `error: unknown tool "schedule_remove"`, box.run(t.Context(), "schedule_remove", `{"id":1}`))
 }
 
+func TestSchedulesKeepTheirOwnerAcrossRestart(t *testing.T) {
+	path := filepath.Join(t.TempDir(), scheduleFileName)
+	clock := newTestClock()
+	schedules, err := openSchedules(path, "GreenOtter", clock.Now, discardLog())
+	require.NoError(t, err)
+
+	_, err = schedules.Set("Check the plants.", new(clock.Now().Add(time.Minute).Format(scheduleAtLayout)), nil)
+	require.NoError(t, err)
+
+	reopened, err := openSchedules(path, "GreenOtter", clock.Now, discardLog())
+	require.NoError(t, err)
+	require.Equal(t, "GreenOtter", reopened.sorted()[0].Owner)
+
+	_, err = openSchedules(path, "OneChat", clock.Now, discardLog())
+	require.ErrorContains(t, err, "belongs to")
+}
+
+func TestSchedulesAssignTheOwnerToSavedRootSchedules(t *testing.T) {
+	path := filepath.Join(t.TempDir(), scheduleFileName)
+	require.NoError(t, os.WriteFile(path, []byte(`{"next":1,"schedules":[{"id":1,"text":"Check the news.","due":"2026-11-09T09:00:00-03:00"}]}`), 0o600))
+
+	schedules, err := openSchedules(path, "OneChat", newTestClock().Now, discardLog())
+	require.NoError(t, err)
+	require.Equal(t, "OneChat", schedules.sorted()[0].Owner)
+
+	data, err := os.ReadFile(path)
+	require.NoError(t, err)
+	require.Contains(t, string(data), `"owner":"OneChat"`)
+}
+
 // ScheduleTestClock is a clock that a test sets while Run reads it.
 type ScheduleTestClock struct {
 	mutex sync.Mutex
@@ -360,7 +389,7 @@ func scheduleTestOpen(t *testing.T) (*Schedules, string) {
 		now: time.Date(2026, time.November, 8, 20, 0, 0, 0, time.FixedZone("", -3*60*60)),
 	}
 
-	schedules, err := openSchedules(path, clock.Now, log.New(io.Discard, "", 0))
+	schedules, err := openSchedules(path, "OneChat", clock.Now, discardLog())
 	require.NoError(t, err)
 
 	return schedules, path