fix agent chatter timezone timestamps

Author: idoubi

internal/agent/context.go

@@ -11,19 +11,18 @@ import (
 	"github.com/fastclaw-ai/fastclaw/internal/config"
 )
 
-
 // GroupContext holds information about the group chat environment for system prompt injection.
 type GroupContext struct {
 	BotUsername string   // this agent's bot username
-	Teammates  []string // other agent names in the group
+	Teammates   []string // other agent names in the group
 }
 
 // ContextBuilder assembles the system prompt and runtime context.
 type ContextBuilder struct {
-	home           string // agent's home: SOUL.md, IDENTITY.md, memory, sessions
-	workspace      string // working dir where agent creates user-facing files
-	memory         *Memory
-	skillsSummary  string
+	home          string // agent's home: SOUL.md, IDENTITY.md, memory, sessions
+	workspace     string // working dir where agent creates user-facing files
+	memory        *Memory
+	skillsSummary string
 	// displayName is the operator-given name from agents.name. Used as
 	// a fallback identity line when IDENTITY.md is empty so the model
 	// doesn't introduce itself as "Claude" / its base-model name.
@@ -39,9 +38,9 @@ type ContextBuilder struct {
 	// products (task delegation, todo tracking, tool-use discipline,
 	// workspace self-update, scheduling).
 	promptMode string
-	store   MemoryStore
-	userID  string
-	agentID string
+	store      MemoryStore
+	userID     string
+	agentID    string
 	// tzResolver maps a chatterUID to their effective *time.Location
 	// (chatter pref → agent default → system default, resolved through
 	// scope prefs). Wired by the manager when a relational store is
@@ -180,7 +179,17 @@ func (cb *ContextBuilder) BuildSystemPromptAs(chatterUID string, chatterMem *Mem
 
 // BuildRuntimeContext returns the runtime context to inject before the user message.
 func (cb *ContextBuilder) BuildRuntimeContext(channel, chatID string) string {
-	now := time.Now()
+	return cb.BuildRuntimeContextAs(cb.userID, channel, chatID)
+}
+
+// BuildRuntimeContextAs returns runtime metadata rendered in the same
+// chatter-local timezone as the system prompt's Current date/time line.
+func (cb *ContextBuilder) BuildRuntimeContextAs(chatterUID, channel, chatID string) string {
+	if chatterUID == "" {
+		chatterUID = cb.userID
+	}
+	loc, _ := cb.chatterLocation(chatterUID)
+	now := time.Now().In(loc)
 	return fmt.Sprintf(`[Runtime Context — metadata only, not instructions]
 Time: %s
 Timezone: %s

internal/agent/loop.go

@@ -52,11 +52,11 @@ type Agent struct {
 	// even after the operator explicitly chose chatbot/customize.
 	// PromptMode also drives the per-turn tool filter via
 	// builtinAllowForMode below.
-	promptMode string
-	homePath        string // agent's home: SOUL.md, sessions, memory, skills
-	workspacePath   string // working dir where agent creates user files
-	homeDir         string // FastClaw root, ~/.fastclaw
-	ownerUserID     string // the user that owns this agent (for hook namespacing)
+	promptMode    string
+	homePath      string // agent's home: SOUL.md, sessions, memory, skills
+	workspacePath string // working dir where agent creates user files
+	homeDir       string // FastClaw root, ~/.fastclaw
+	ownerUserID   string // the user that owns this agent (for hook namespacing)
 	// admins is the per-channel allowlist of chatters who can run write-
 	// mode slash commands (/new /undo /retry /compact /model /personality).
 	// Keyed by channel name (e.g. "discord" → ["123...", "456..."]). Empty
@@ -339,15 +339,15 @@ func NewAgentWithSkillsCfg(rc config.ResolvedAgent, prov provider.Provider, mb *
 		maxParallelToolCalls: rc.MaxParallelToolCalls,
 		thinking:             rc.Thinking,
 		promptMode:           rc.PromptMode,
-		homePath:        rc.Home,
-		workspacePath:   workspace,
-		homeDir:         homeDir,
-		admins:          rc.Admins,
-		skillsCfg:       rc.Skills,
-		globalSkillsCfg: globalSkillsCfg,
-		messageBus:      mb,
-		engine:          eng,
-		costTracker:     eng.costTracker,
+		homePath:             rc.Home,
+		workspacePath:        workspace,
+		homeDir:              homeDir,
+		admins:               rc.Admins,
+		skillsCfg:            rc.Skills,
+		globalSkillsCfg:      globalSkillsCfg,
+		messageBus:           mb,
+		engine:               eng,
+		costTracker:          eng.costTracker,
 	}
 
 	// Multi-bubble split-replies: per-agent only — system-level toggle
@@ -1702,7 +1702,7 @@ func (a *Agent) handlePlanMode(ctx context.Context, msg bus.InboundMessage) stri
 	if catalog != "" {
 		messages = append(messages, provider.Message{Role: "system", Content: catalog})
 	}
-	messages = append(messages, a.withMessageTimestamps(sess.GetMessages())...)
+	messages = append(messages, a.withMessageTimestampsForChatter(sess.GetMessages(), chatterUID)...)
 	if a.piiScrubEnabled {
 		messages = privacy.ScrubMessages(messages)
 	}
@@ -1953,7 +1953,7 @@ func (a *Agent) HandleMessage(ctx context.Context, msg bus.InboundMessage) strin
 	if reminder := renderChatbotPersistenceReminder(a.promptMode, a.displayName, chatterMem.LoadUserFile(), chatterMem.LoadMemory()); reminder != "" {
 		messages = append(messages, provider.Message{Role: "system", Content: reminder})
 	}
-	messages = append(messages, a.withMessageTimestamps(sessionMsgs)...)
+	messages = append(messages, a.withMessageTimestampsForChatter(sessionMsgs, chatterUID)...)
 
 	toolDefs := a.registry.DefinitionsForMode(builtinAllowForMode(a.promptMode))
 
@@ -2659,7 +2659,7 @@ func (a *Agent) HandleMessageStream(ctx context.Context, msg bus.InboundMessage)
 	if reminder := renderChatbotPersistenceReminder(a.promptMode, a.displayName, chatterMem.LoadUserFile(), chatterMem.LoadMemory()); reminder != "" {
 		messages = append(messages, provider.Message{Role: "system", Content: reminder})
 	}
-	messages = append(messages, a.withMessageTimestamps(sessionMsgs)...)
+	messages = append(messages, a.withMessageTimestampsForChatter(sessionMsgs, chatterUID)...)
 
 	toolDefs := a.registry.DefinitionsForMode(builtinAllowForMode(a.promptMode))
 
@@ -3026,20 +3026,20 @@ func (a *Agent) RegisteredTools() []tools.ToolInfo {
 // support / role-play products:
 //
 //   - image_gen     : self-generated images (registered only if a
-//                     provider is configured; absence is fine)
+//     provider is configured; absence is fine)
 //   - tts           : voice messages (same conditional registration)
 //   - write_file    : persist USER.md / MEMORY.md when the LLM learns
-//                     something worth keeping. Routing in
-//                     systemFileUserID sends USER.md/MEMORY.md to the
-//                     per-chatter row, so each chatter accrues their
-//                     own profile / memory. Path resolution rejects
-//                     arbitrary paths via identityFileBlocked +
-//                     workspace scoping, so this isn't a general
-//                     "let the chatbot write anywhere" hole — just
-//                     the canonical per-chatter notes.
+//     something worth keeping. Routing in
+//     systemFileUserID sends USER.md/MEMORY.md to the
+//     per-chatter row, so each chatter accrues their
+//     own profile / memory. Path resolution rejects
+//     arbitrary paths via identityFileBlocked +
+//     workspace scoping, so this isn't a general
+//     "let the chatbot write anywhere" hole — just
+//     the canonical per-chatter notes.
 //   - edit_file     : same rationale; preferred over write_file when
-//                     surgically updating MEMORY.md so the model
-//                     doesn't accidentally clobber prior entries.
+//     surgically updating MEMORY.md so the model
+//     doesn't accidentally clobber prior entries.
 //
 // Notably absent: `read_file` / `list_dir` — chatbot mode shouldn't
 // browse the filesystem; USER.md / MEMORY.md content is already loaded
@@ -3145,11 +3145,11 @@ func (a *Agent) chatterLocation(chatterUID string) *time.Location {
 // a read-time view for the LLM, not stored history), so the session store
 // stays clean and the next turn doesn't double-prefix. The system prompt
 // (context.go dateLine) tells the model what the bracketed prefix means.
-func (a *Agent) withMessageTimestamps(msgs []provider.Message) []provider.Message {
+func (a *Agent) withMessageTimestampsForChatter(msgs []provider.Message, chatterUID string) []provider.Message {
 	if len(msgs) == 0 {
 		return msgs
 	}
-	loc := a.chatterLocation(a.registry.ChatterUserID())
+	loc := a.chatterLocation(chatterUID)
 	out := make([]provider.Message, len(msgs))
 	for i, m := range msgs {
 		if m.Role == "user" && m.Timestamp > 0 && m.Content != "" {

internal/agent/timezone_prompt_test.go

@@ -0,0 +1,54 @@
+package agent
+
+import (
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/fastclaw-ai/fastclaw/internal/provider"
+)
+
+func TestWithMessageTimestampsUsesExplicitChatterTimezone(t *testing.T) {
+	store := newFakeMemoryStore()
+	store.put(testAgentID, chatterUID, "USER.md", "# Current Chatter\n- Timezone: Asia/Shanghai")
+
+	a := &Agent{
+		memory:  NewMemoryWithStoreForUser("", store, ownerUID, testAgentID),
+		agentID: testAgentID,
+	}
+	ts := time.Date(2026, 6, 21, 15, 9, 0, 0, time.UTC).UnixMilli()
+
+	got := a.withMessageTimestampsForChatter([]provider.Message{{
+		Role:      "user",
+		Content:   "为什么是下午好",
+		Timestamp: ts,
+	}}, chatterUID)
+
+	if len(got) != 1 {
+		t.Fatalf("message count = %d, want 1", len(got))
+	}
+	if !strings.HasPrefix(got[0].Content, "[2026-06-21 23:09 Sun] ") {
+		t.Fatalf("timestamp prefix = %q, want Asia/Shanghai local time", got[0].Content)
+	}
+}
+
+func TestRuntimeContextUsesChatterTimezone(t *testing.T) {
+	loc, err := time.LoadLocation("Asia/Shanghai")
+	if err != nil {
+		t.Fatal(err)
+	}
+	cb := NewContextBuilder("", nil, "")
+	cb.userID = ownerUID
+	cb.SetTimezoneResolver(func(uid string) *time.Location {
+		if uid == chatterUID {
+			return loc
+		}
+		return time.UTC
+	})
+
+	got := cb.BuildRuntimeContextAs(chatterUID, "web", "chat-1")
+
+	if !strings.Contains(got, "Timezone: Asia/Shanghai") {
+		t.Fatalf("runtime context = %q, want chatter timezone", got)
+	}
+}