Give the rebuild its own call limit

[onechat] / daemon.go

diff --git a/daemon.go b/daemon.go
index 4c0f466d4d0b04b5a9b2d05e541947e0fb3b2117..5ec220ed6d3f144db0805b2f3beb8a06da22ac96 100644 (file)
--- a/daemon.go
+++ b/daemon.go
@@ -65,6 +65,7 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
        }()
 
        whatsappSetDeviceProps()
        }()
 
        whatsappSetDeviceProps()

+

        logger := daemonLogger(out, "onechat: ")
        whatsapp, err := openWhatsApp(ctx, dir, time.Now, daemonLogger(out, "whatsapp: "), whatsappNewClient)
        if err != nil {
        logger := daemonLogger(out, "onechat: ")
        whatsapp, err := openWhatsApp(ctx, dir, time.Now, daemonLogger(out, "whatsapp: "), whatsappNewClient)
        if err != nil {


@@ -86,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"))
        }
 
        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
        }
        if err != nil {
                return err
        }


@@ -95,7 +96,7 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
                err = errors.Join(err, memory.Close())
        }()
 
                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
        }
        if err != nil {
                return err
        }


@@ -110,21 +111,23 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
                return err
        }
 
                return err
        }
 

-       linked := "WhatsApp is not linked"
+       linked := "WhatsApp not linked"

        if whatsapp.isLinked() {
        if whatsapp.isLinked() {

-               linked = "WhatsApp is linked"
+               linked = "WhatsApp linked"

        }
 
        }
 

-       logger.Printf("%s is ready: socket %s, model %s at %s effort, commands run in %s, %s, active schedules: %d", agent.config.Name, listener.Addr(), agent.config.Model, agent.config.Effort, agent.config.Workdir, linked, schedules.Len())
+       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
 
        var telegram *TelegramBot

+

        if hasBot {
                telegram = newTelegramBot(newTelegramAPI(telegramAPIURL, botSettings.Token), botSettings.Owner, filepath.Join(agent.dir, telegramOffsetFileName), daemonLogger(out, "telegram: "))
        if hasBot {
                telegram = newTelegramBot(newTelegramAPI(telegramAPIURL, botSettings.Token), botSettings.Owner, filepath.Join(agent.dir, telegramOffsetFileName), daemonLogger(out, "telegram: "))

-               logger.Print("the Telegram bot waits for messages of its owner")
+
+               logger.Print("Telegram bot started")

        }
 
        return daemonServe(ctx, listener, telegram, whatsapp, schedules, func(notify func(Event)) (*TurnLoop, error) {
        }
 
        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)

        })
 }
 
        })
 }
 


@@ -154,10 +157,12 @@ func (h *DaemonHub) Accept(ctx context.Context, listener net.Listener, l *TurnLo
                }
 
                h.mutex.Lock()
                }
 
                h.mutex.Lock()

+

                h.clients[client] = true
                h.mutex.Unlock()
 
                h.workers.Add(2)
                h.clients[client] = true
                h.mutex.Unlock()
 
                h.workers.Add(2)

+

                go h.write(client)
                go h.read(ctx, client, l)
 
                go h.write(client)
                go h.read(ctx, client, l)
 


@@ -194,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)
 
        scanner := bufio.NewScanner(client.conn)
        scanner.Buffer(make([]byte, 64*1024), socketRequestBytes)

+

        for ctx.Err() == nil && scanner.Scan() {
                var request SocketRequest
        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) {
                err := json.Unmarshal(scanner.Bytes(), &request)
                if err == nil {
                        err = daemonRunRequest(l, h.whatsapp, request, func(text string) {


@@ -251,6 +258,7 @@ func (h *DaemonHub) remove(client *DaemonClient) {
        delete(h.clients, client)
        client.once.Do(func() {
                close(client.events)
        delete(h.clients, client)
        client.once.Do(func() {
                close(client.events)

+

                _ = client.conn.Close()
        })
 }
                _ = client.conn.Close()
        })
 }


@@ -268,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()
 // 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)
        }
        for client := range h.clients {
                h.remove(client)
        }

+

        h.mutex.Unlock()
 
        h.workers.Wait()
        h.mutex.Unlock()
 
        h.workers.Wait()


@@ -340,7 +350,9 @@ func daemonServe(ctx context.Context, listener net.Listener, bot *TelegramBot, w
        }
 
        var workers sync.WaitGroup
        }
 
        var workers sync.WaitGroup

+

        workers.Add(2)
        workers.Add(2)

+

        go func() {
                defer workers.Done()
 
        go func() {
                defer workers.Done()
 


@@ -348,29 +360,37 @@ func daemonServe(ctx context.Context, listener net.Listener, bot *TelegramBot, w
        }()
 
        var whatsappErr error
        }()
 
        var whatsappErr error

+

        go func() {
                defer workers.Done()
 
                whatsappErr = whatsapp.Run(ctx, l, notify)
        go func() {
                defer workers.Done()
 
                whatsappErr = whatsapp.Run(ctx, l, notify)

+

                cancel()
        }()
 
        var schedulesErr error
                cancel()
        }()
 
        var schedulesErr error

+

        workers.Add(1)
        workers.Add(1)

+

        go func() {
                defer workers.Done()
 
                schedulesErr = schedules.Run(ctx, l)
        go func() {
                defer workers.Done()
 
                schedulesErr = schedules.Run(ctx, l)

+

                cancel()
        }()
 
        var botErr error
                cancel()
        }()
 
        var botErr error

+

        if bot != nil {
                workers.Add(1)
        if bot != nil {
                workers.Add(1)

+

                go func() {
                        defer workers.Done()
 
                        botErr = bot.Run(ctx, l, whatsapp)
                go func() {
                        defer workers.Done()
 
                        botErr = bot.Run(ctx, l, whatsapp)

+

                        cancel()
                }()
        }
                        cancel()
                }()
        }


@@ -381,7 +401,9 @@ func daemonServe(ctx context.Context, listener net.Listener, bot *TelegramBot, w
        }
 
        cancel()
        }
 
        cancel()

+

        err = errors.Join(err, listener.Close())
        err = errors.Join(err, listener.Close())

+

        hub.CloseAll()
        workers.Wait()
 
        hub.CloseAll()
        workers.Wait()