X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/1e2df788bbb17653a6df44acd41da2edb109d403..4c199e7d93b6a4529ed5956807911b5f6c5489a7:/daemon.go?ds=sidebyside

diff --git a/daemon.go b/daemon.go
index f7ed315..5ec220e 100644
--- a/daemon.go
+++ b/daemon.go
@@ -29,7 +29,8 @@ const (
 // the clients on the Unix socket in the data directory until ctx ends. When
 // telegram.json exists, it also runs the Telegram bot. It also keeps a linked
 // WhatsApp device connected. It holds the lock of the token file, so it is the
-// only process that refreshes the tokens and opens the WhatsApp session.
+// only process that refreshes the tokens and opens the WhatsApp session. Its
+// log lines go to out, through the loggers of daemonLogger.
 func daemon(ctx context.Context, out io.Writer) (err error) {
 	dir, err := dataDir()
 	if err != nil {
@@ -64,7 +65,9 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 	}()
 
 	whatsappSetDeviceProps()
-	whatsapp, err := openWhatsApp(ctx, dir, time.Now, log.New(out, "whatsapp: ", log.LstdFlags), whatsappNewClient)
+
+	logger := daemonLogger(out, "onechat: ")
+	whatsapp, err := openWhatsApp(ctx, dir, time.Now, daemonLogger(out, "whatsapp: "), whatsappNewClient)
 	if err != nil {
 		return err
 	}
@@ -84,7 +87,7 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 	}
 
 	client := newModelClient(address, auth, agent.CacheKey(), filepath.Join(agent.dir, "usage.jsonl"))
-	memory, err := openMemory(ctx, agent.dir, time.Now, newCompactor(client, agent.Prompt, config.Compactor))
+	memory, err := openMemory(ctx, agent.dir, time.Now, newCompactor(client, agent.Prompt, config.Compactor), logger)
 	if err != nil {
 		return err
 	}
@@ -93,7 +96,7 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 		err = errors.Join(err, memory.Close())
 	}()
 
-	schedules, err := openSchedules(filepath.Join(agent.dir, scheduleFileName), time.Now)
+	schedules, err := openSchedules(filepath.Join(agent.dir, scheduleFileName), time.Now, logger)
 	if err != nil {
 		return err
 	}
@@ -108,22 +111,23 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 		return err
 	}
 
-	_, err = fmt.Fprintf(out, "onechat: %s on %s, %s at %s effort, in %s\n", agent.config.Name, listener.Addr(), agent.config.Model, agent.config.Effort, agent.config.Workdir)
-	if err != nil {
-		return errors.Join(err, listener.Close())
+	linked := "WhatsApp not linked"
+	if whatsapp.isLinked() {
+		linked = "WhatsApp linked"
 	}
 
+	logger.Printf("ready: socket %s, model %s (%s), workdir %s, %s, %d schedules", listener.Addr(), agent.config.Model, agent.config.Effort, agent.config.Workdir, linked, schedules.Len())
+
 	var telegram *TelegramBot
+
 	if hasBot {
-		telegram = newTelegramBot(newTelegramAPI(telegramAPIURL, botSettings.Token), botSettings.Owner, filepath.Join(agent.dir, telegramOffsetFileName), log.New(out, "telegram: ", log.LstdFlags))
-		_, err = fmt.Fprintln(out, "onechat: the Telegram bot waits for messages of its owner")
-		if err != nil {
-			return errors.Join(err, listener.Close())
-		}
+		telegram = newTelegramBot(newTelegramAPI(telegramAPIURL, botSettings.Token), botSettings.Owner, filepath.Join(agent.dir, telegramOffsetFileName), daemonLogger(out, "telegram: "))
+
+		logger.Print("Telegram bot started")
 	}
 
 	return daemonServe(ctx, listener, telegram, whatsapp, schedules, func(notify func(Event)) (*TurnLoop, error) {
-		return newTurnLoop(agent, memory, subagents, whatsapp, schedules, client, time.Now, notify)
+		return newTurnLoop(agent, memory, subagents, whatsapp, schedules, client, time.Now, logger, notify)
 	})
 }
 
@@ -153,10 +157,12 @@ func (h *DaemonHub) Accept(ctx context.Context, listener net.Listener, l *TurnLo
 		}
 
 		h.mutex.Lock()
+
 		h.clients[client] = true
 		h.mutex.Unlock()
 
 		h.workers.Add(2)
+
 		go h.write(client)
 		go h.read(ctx, client, l)
 
@@ -193,8 +199,10 @@ func (h *DaemonHub) read(ctx context.Context, client *DaemonClient, l *TurnLoop)
 
 	scanner := bufio.NewScanner(client.conn)
 	scanner.Buffer(make([]byte, 64*1024), socketRequestBytes)
+
 	for ctx.Err() == nil && scanner.Scan() {
 		var request SocketRequest
+
 		err := json.Unmarshal(scanner.Bytes(), &request)
 		if err == nil {
 			err = daemonRunRequest(l, h.whatsapp, request, func(text string) {
@@ -250,6 +258,7 @@ func (h *DaemonHub) remove(client *DaemonClient) {
 	delete(h.clients, client)
 	client.once.Do(func() {
 		close(client.events)
+
 		_ = client.conn.Close()
 	})
 }
@@ -267,9 +276,11 @@ func (h *DaemonHub) Broadcast(event Event) {
 // CloseAll drops every client and waits for their readers and writers.
 func (h *DaemonHub) CloseAll() {
 	h.mutex.Lock()
+
 	for client := range h.clients {
 		h.remove(client)
 	}
+
 	h.mutex.Unlock()
 
 	h.workers.Wait()
@@ -339,7 +350,9 @@ func daemonServe(ctx context.Context, listener net.Listener, bot *TelegramBot, w
 	}
 
 	var workers sync.WaitGroup
+
 	workers.Add(2)
+
 	go func() {
 		defer workers.Done()
 
@@ -347,29 +360,37 @@ func daemonServe(ctx context.Context, listener net.Listener, bot *TelegramBot, w
 	}()
 
 	var whatsappErr error
+
 	go func() {
 		defer workers.Done()
 
 		whatsappErr = whatsapp.Run(ctx, l, notify)
+
 		cancel()
 	}()
 
 	var schedulesErr error
+
 	workers.Add(1)
+
 	go func() {
 		defer workers.Done()
 
 		schedulesErr = schedules.Run(ctx, l)
+
 		cancel()
 	}()
 
 	var botErr error
+
 	if bot != nil {
 		workers.Add(1)
+
 		go func() {
 			defer workers.Done()
 
 			botErr = bot.Run(ctx, l, whatsapp)
+
 			cancel()
 		}()
 	}
@@ -380,7 +401,9 @@ func daemonServe(ctx context.Context, listener net.Listener, bot *TelegramBot, w
 	}
 
 	cancel()
+
 	err = errors.Join(err, listener.Close())
+
 	hub.CloseAll()
 	workers.Wait()
 
@@ -421,6 +444,18 @@ func daemonRunRequest(l *TurnLoop, whatsapp *WhatsApp, request SocketRequest, an
 	}
 }
 
+// daemonLogger returns the logger of the part of the daemon with prefix, such
+// as "telegram: ", on out. The journal adds the time to each line and sets
+// JOURNAL_STREAM for a service, so then the lines have no time stamp. Otherwise
+// each line has the standard time stamp.
+func daemonLogger(out io.Writer, prefix string) *log.Logger {
+	if os.Getenv("JOURNAL_STREAM") != "" {
+		return log.New(out, prefix, 0)
+	}
+
+	return log.New(out, prefix, log.LstdFlags)
+}
+
 // durationText returns d for a log line: rounded to the second, or to the
 // millisecond when it is shorter than a second.
 func durationText(d time.Duration) string {