@martian-engineering/lossless-claw 0.2.8 → 0.3.0

package/index.ts

@@ -156,9 +156,22 @@ function resolveApiKey(provider: string, readEnv: ReadEnvFn): string | undefined
   return undefined;
 }
 
+/** A SecretRef pointing to a value inside secrets.json via a nested path. */
+type SecretRef = {
+  source?: string;
+  provider?: string;
+  id: string;
+};
+
+type SecretProviderConfig = {
+  source?: string;
+  path?: string;
+  mode?: string;
+};
+
 type AuthProfileCredential =
-  | { type: "api_key"; provider: string; key?: string; email?: string }
-  | { type: "token"; provider: string; token?: string; expires?: number; email?: string }
+  | { type: "api_key"; provider: string; key?: string; keyRef?: SecretRef; email?: string }
+  | { type: "token"; provider: string; token?: string; tokenRef?: SecretRef; expires?: number; email?: string }
   | ({
       type: "oauth";
       provider: string;
@@ -500,12 +513,102 @@ function resolveAuthProfileCandidates(params: {
   return candidates;
 }
 
+/**
+ * Resolve a SecretRef (tokenRef/keyRef) to a credential string.
+ *
+ * OpenClaw's auth-profiles support a level of indirection: instead of storing
+ * the raw API key or token inline, a credential can reference it via a
+ * SecretRef. Two resolution strategies are supported:
+ *
+ * 1. `source: "env"` — read the value from an environment variable whose
+ *    name is `ref.id` (e.g. `{ source: "env", id: "ANTHROPIC_API_KEY" }`).
+ *
+ * 2. File-based — resolve against a configured `secrets.providers.<provider>`
+ *    file provider when available. JSON-mode providers walk slash-delimited
+ *    paths, while singleValue providers use the sentinel id `value`.
+ *
+ * 3. Legacy fallback — when no file provider config is available, fall back to
+ *    `~/.openclaw/secrets.json` for backward compatibility.
+ */
+function resolveSecretRef(params: {
+  ref: SecretRef | undefined;
+  home: string;
+  config?: unknown;
+}): string | undefined {
+  const ref = params.ref;
+  if (!ref?.id) return undefined;
+
+  // source: env — read directly from environment variable
+  if (ref.source === "env") {
+    const val = process.env[ref.id]?.trim();
+    return val || undefined;
+  }
+
+  // File-based provider config — use configured file provider when present.
+  try {
+    const providers = isRecord(params.config)
+      ? (params.config as { secrets?: { providers?: Record<string, unknown> } }).secrets?.providers
+      : undefined;
+    const providerName = ref.provider?.trim() || "default";
+    const provider =
+      providers && isRecord(providers)
+        ? providers[providerName]
+        : undefined;
+    if (isRecord(provider) && provider.source === "file" && typeof provider.path === "string") {
+      const configuredPath = provider.path.trim();
+      const filePath =
+        configuredPath.startsWith("~/") && params.home
+          ? join(params.home, configuredPath.slice(2))
+          : configuredPath;
+      if (!filePath) {
+        return undefined;
+      }
+      const raw = readFileSync(filePath, "utf8");
+      if (provider.mode === "singleValue") {
+        if (ref.id.trim() !== "value") {
+          return undefined;
+        }
+        const value = raw.trim();
+        return value || undefined;
+      }
+
+      const secrets = JSON.parse(raw) as Record<string, unknown>;
+      const parts = ref.id.replace(/^\//, "").split("/");
+      let current: unknown = secrets;
+      for (const part of parts) {
+        if (!current || typeof current !== "object") return undefined;
+        current = (current as Record<string, unknown>)[part];
+      }
+      return typeof current === "string" && current.trim() ? current.trim() : undefined;
+    }
+  } catch {
+    // Fall through to the legacy secrets.json lookup below.
+  }
+
+  // Legacy file fallback (source: "file" or unset) — read from ~/.openclaw/secrets.json
+  try {
+    const secretsPath = join(params.home, ".openclaw", "secrets.json");
+    const raw = readFileSync(secretsPath, "utf8");
+    const secrets = JSON.parse(raw) as Record<string, unknown>;
+    const parts = ref.id.replace(/^\//, "").split("/");
+    let current: unknown = secrets;
+    for (const part of parts) {
+      if (!current || typeof current !== "object") return undefined;
+      current = (current as Record<string, unknown>)[part];
+    }
+    return typeof current === "string" && current.trim() ? current.trim() : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
 /** Resolve OAuth/api-key/token credentials from auth-profiles store. */
 async function resolveApiKeyFromAuthProfiles(params: {
   provider: string;
   authProfileId?: string;
   agentDir?: string;
   runtimeConfig?: unknown;
+  appConfig?: unknown;
   piAiModule: PiAiModule;
   envSnapshot: PluginEnvSnapshot;
 }): Promise<string | undefined> {
@@ -543,6 +646,17 @@ async function resolveApiKeyFromAuthProfiles(params: {
 
   const persistPath =
     params.agentDir?.trim() ? join(params.agentDir.trim(), "auth-profiles.json") : storesWithPaths[0]?.path;
+  const secretConfig = (() => {
+    if (isRecord(params.runtimeConfig)) {
+      const runtimeProviders = (params.runtimeConfig as {
+        secrets?: { providers?: Record<string, unknown> };
+      }).secrets?.providers;
+      if (isRecord(runtimeProviders) && Object.keys(runtimeProviders).length > 0) {
+        return params.runtimeConfig;
+      }
+    }
+    return params.appConfig ?? params.runtimeConfig;
+  })();
 
   for (const profileId of candidates) {
     const credential = mergedStore.profiles[profileId];
@@ -554,7 +668,13 @@ async function resolveApiKeyFromAuthProfiles(params: {
     }
 
     if (credential.type === "api_key") {
-      const key = credential.key?.trim();
+      const key =
+        credential.key?.trim() ||
+        resolveSecretRef({
+          ref: credential.keyRef,
+          home: params.envSnapshot.home,
+          config: secretConfig,
+        });
       if (key) {
         return key;
       }
@@ -562,7 +682,13 @@ async function resolveApiKeyFromAuthProfiles(params: {
     }
 
     if (credential.type === "token") {
-      const token = credential.token?.trim();
+      const token =
+        credential.token?.trim() ||
+        resolveSecretRef({
+          ref: credential.tokenRef,
+          home: params.envSnapshot.home,
+          config: secretConfig,
+        });
       if (!token) {
         continue;
       }
@@ -759,11 +885,23 @@ function createLcmDependencies(api: OpenClawPluginApi): LcmDependencies {
           return { content: [] };
         }
 
+        // When runtimeConfig is undefined (e.g. resolveLargeFileTextSummarizer
+        // passes legacyParams without config), fall back to the plugin API so
+        // provider-level baseUrl/headers/apiKey are always resolvable.
+        let effectiveRuntimeConfig = runtimeConfig;
+        if (!isRecord(effectiveRuntimeConfig)) {
+          try {
+            effectiveRuntimeConfig = api.runtime.config.loadConfig();
+          } catch {
+            // loadConfig may not be available in all contexts; leave undefined.
+          }
+        }
+
         const knownModel =
           typeof mod.getModel === "function" ? mod.getModel(providerId, modelId) : undefined;
         const fallbackApi =
           providerApi?.trim() ||
-          resolveProviderApiFromRuntimeConfig(runtimeConfig, providerId) ||
+          resolveProviderApiFromRuntimeConfig(effectiveRuntimeConfig, providerId) ||
           (() => {
             if (typeof mod.getModels !== "function") {
               return undefined;
@@ -777,6 +915,21 @@ function createLcmDependencies(api: OpenClawPluginApi): LcmDependencies {
           })() ||
           inferApiFromProvider(providerId);
 
+        // Resolve provider-level config (baseUrl, headers, etc.) from runtime config.
+        // Custom/proxy providers (e.g. bailian, local proxies) store their baseUrl and
+        // apiKey under models.providers.<provider> in openclaw.json.  Without this
+        // lookup the resolved model object lacks baseUrl, which crashes pi-ai's
+        // detectCompat() ("Cannot read properties of undefined (reading 'includes')"),
+        // and the apiKey is unresolvable, causing 401 errors.  See #19.
+        const providerLevelConfig: Record<string, unknown> = (() => {
+          if (!isRecord(effectiveRuntimeConfig)) return {};
+          const providers = (effectiveRuntimeConfig as { models?: { providers?: Record<string, unknown> } })
+            .models?.providers;
+          if (!providers) return {};
+          const cfg = findProviderConfigValue(providers, providerId);
+          return isRecord(cfg) ? cfg : {};
+        })();
+
         const resolvedModel =
           isRecord(knownModel) &&
           typeof knownModel.api === "string" &&
@@ -787,6 +940,18 @@ function createLcmDependencies(api: OpenClawPluginApi): LcmDependencies {
                 id: knownModel.id,
                 provider: knownModel.provider,
                 api: knownModel.api,
+                // Merge baseUrl/headers from provider config if not already on the model.
+                // Always set baseUrl to a string — pi-ai's detectCompat() crashes when
+                // baseUrl is undefined.
+                baseUrl:
+                  typeof knownModel.baseUrl === "string"
+                    ? knownModel.baseUrl
+                    : typeof providerLevelConfig.baseUrl === "string"
+                      ? providerLevelConfig.baseUrl
+                      : "",
+                ...(knownModel.headers == null && isRecord(providerLevelConfig.headers)
+                  ? { headers: providerLevelConfig.headers }
+                  : {}),
               }
             : {
                 id: modelId,
@@ -803,6 +968,14 @@ function createLcmDependencies(api: OpenClawPluginApi): LcmDependencies {
                 },
                 contextWindow: 200_000,
                 maxTokens: 8_000,
+                // Always set baseUrl to a string — pi-ai's detectCompat() crashes when
+                // baseUrl is undefined.
+                baseUrl: typeof providerLevelConfig.baseUrl === "string"
+                  ? providerLevelConfig.baseUrl
+                  : "",
+                ...(isRecord(providerLevelConfig.headers)
+                  ? { headers: providerLevelConfig.headers }
+                  : {}),
               };
 
         let resolvedApiKey = apiKey?.trim();
@@ -833,11 +1006,27 @@ function createLcmDependencies(api: OpenClawPluginApi): LcmDependencies {
             provider: providerId,
             authProfileId,
             agentDir,
-            runtimeConfig,
+            appConfig: api.config,
+            runtimeConfig: effectiveRuntimeConfig,
             piAiModule: mod,
             envSnapshot,
           });
         }
+        // Fallback: read apiKey from models.providers config (e.g. proxy providers
+        // with keys like "not-needed-for-cli-proxy").
+        if (!resolvedApiKey && isRecord(effectiveRuntimeConfig)) {
+          const providers = (effectiveRuntimeConfig as { models?: { providers?: Record<string, unknown> } })
+            .models?.providers;
+          if (providers) {
+            const providerCfg = findProviderConfigValue(providers, providerId);
+            if (isRecord(providerCfg) && typeof providerCfg.apiKey === "string") {
+              const cfgKey = providerCfg.apiKey.trim();
+              if (cfgKey) {
+                resolvedApiKey = cfgKey;
+              }
+            }
+          }
+        }
 
         const completeOptions = buildCompleteSimpleOptions({
           api: resolvedModel.api,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@martian-engineering/lossless-claw",
-  "version": "0.2.8",
+  "version": "0.3.0",
   "description": "Lossless Context Management plugin for OpenClaw — DAG-based conversation summarization with incremental compaction",
   "type": "module",
   "main": "index.ts",
@@ -24,7 +24,10 @@
     "LICENSE"
   ],
   "scripts": {
-    "test": "vitest run --dir test"
+    "changeset": "changeset",
+    "release:verify": "npm test && npm pack --dry-run",
+    "test": "vitest run --dir test",
+    "version-packages": "changeset version"
   },
   "dependencies": {
     "@mariozechner/pi-agent-core": "*",
@@ -32,12 +35,16 @@
     "@sinclair/typebox": "0.34.48"
   },
   "devDependencies": {
+    "@changesets/cli": "^2.30.0",
     "typescript": "^5.7.0",
     "vitest": "^3.0.0"
   },
   "peerDependencies": {
     "openclaw": "*"
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "openclaw": {
     "extensions": [
       "./index.ts"

package/src/assembler.ts

@@ -262,6 +262,10 @@ function toolResultBlockFromPart(part: MessagePartRecord, rawType?: string): unk
   const output = parseStoredValue(part.toolOutput) ?? part.textContent ?? "";
   const block: Record<string, unknown> = { type, output };
 
+  if (typeof part.toolName === "string" && part.toolName.length > 0) {
+    block.name = part.toolName;
+  }
+
   if (type === "function_call_output") {
     if (typeof part.toolCallId === "string" && part.toolCallId.length > 0) {
       block.call_id = part.toolCallId;
@@ -395,6 +399,10 @@ function pickToolCallId(parts: MessagePartRecord[]): string | undefined {
     if (!decoded || typeof decoded !== "object") {
       continue;
     }
+    const metadataToolCallId = (decoded as { toolCallId?: unknown }).toolCallId;
+    if (typeof metadataToolCallId === "string" && metadataToolCallId.length > 0) {
+      return metadataToolCallId;
+    }
     const raw = (decoded as { raw?: unknown }).raw;
     if (!raw || typeof raw !== "object") {
       continue;
@@ -411,6 +419,49 @@ function pickToolCallId(parts: MessagePartRecord[]): string | undefined {
   return undefined;
 }
 
+function pickToolName(parts: MessagePartRecord[]): string | undefined {
+  for (const part of parts) {
+    if (typeof part.toolName === "string" && part.toolName.length > 0) {
+      return part.toolName;
+    }
+    const decoded = parseJson(part.metadata);
+    if (!decoded || typeof decoded !== "object") {
+      continue;
+    }
+    const metadataToolName = (decoded as { toolName?: unknown }).toolName;
+    if (typeof metadataToolName === "string" && metadataToolName.length > 0) {
+      return metadataToolName;
+    }
+    const raw = (decoded as { raw?: unknown }).raw;
+    if (!raw || typeof raw !== "object") {
+      continue;
+    }
+    const maybe = (raw as { name?: unknown }).name;
+    if (typeof maybe === "string" && maybe.length > 0) {
+      return maybe;
+    }
+    const maybeCamel = (raw as { toolName?: unknown }).toolName;
+    if (typeof maybeCamel === "string" && maybeCamel.length > 0) {
+      return maybeCamel;
+    }
+  }
+  return undefined;
+}
+
+function pickToolIsError(parts: MessagePartRecord[]): boolean | undefined {
+  for (const part of parts) {
+    const decoded = parseJson(part.metadata);
+    if (!decoded || typeof decoded !== "object") {
+      continue;
+    }
+    const metadataIsError = (decoded as { isError?: unknown }).isError;
+    if (typeof metadataIsError === "boolean") {
+      return metadataIsError;
+    }
+  }
+  return undefined;
+}
+
 /** Format a Date for XML attributes in the agent's timezone. */
 function formatDateForAttribute(date: Date, timezone?: string): string {
   const tz = timezone ?? "UTC";
@@ -674,12 +725,15 @@ export class ContextAssembler {
 
     const parts = await this.conversationStore.getMessageParts(msg.messageId);
     const roleFromStore = toRuntimeRole(msg.role, parts);
-    const toolCallId = roleFromStore === "toolResult" ? pickToolCallId(parts) : undefined;
+    const isToolResult = roleFromStore === "toolResult";
+    const toolCallId = isToolResult ? pickToolCallId(parts) : undefined;
+    const toolName = isToolResult ? (pickToolName(parts) ?? "unknown") : undefined;
+    const toolIsError = isToolResult ? pickToolIsError(parts) : undefined;
     // Tool results without a call id cannot be serialized for Anthropic-compatible APIs.
     // This happens for legacy/bootstrap rows that have role=tool but no message_parts.
     // Preserve the text by degrading to assistant content instead of emitting invalid toolResult.
     const role: "user" | "assistant" | "toolResult" =
-      roleFromStore === "toolResult" && !toolCallId ? "assistant" : roleFromStore;
+      isToolResult && !toolCallId ? "assistant" : roleFromStore;
     const content = contentFromParts(parts, role, msg.content);
     const contentText =
       typeof content === "string" ? content : (JSON.stringify(content) ?? msg.content);
@@ -713,6 +767,8 @@ export class ContextAssembler {
               role,
               content,
               ...(toolCallId ? { toolCallId } : {}),
+              ...(toolName ? { toolName } : {}),
+              ...(role === "toolResult" && toolIsError !== undefined ? { isError: toolIsError } : {}),
             } as AgentMessage),
       tokens: tokenCount,
       isMessage: true,

package/src/compaction.ts

@@ -86,7 +86,7 @@ function estimateTokens(content: string): number {
 }
 
 /** Format a timestamp as `YYYY-MM-DD HH:mm TZ` for prompt source text. */
-function formatTimestamp(value: Date, timezone: string = "UTC"): string {
+export function formatTimestamp(value: Date, timezone: string = "UTC"): string {
   try {
     const fmt = new Intl.DateTimeFormat("en-CA", {
       timeZone: timezone,

package/src/engine.ts

@@ -60,6 +60,10 @@ function safeString(value: unknown): string | undefined {
   return typeof value === "string" ? value : undefined;
 }
 
+function safeBoolean(value: unknown): boolean | undefined {
+  return typeof value === "boolean" ? value : undefined;
+}
+
 function appendTextValue(value: unknown, out: string[]): void {
   if (typeof value === "string") {
     out.push(value);
@@ -264,6 +268,12 @@ function buildMessageParts(params: {
     safeString(topLevel.tool_use_id) ??
     safeString(topLevel.call_id) ??
     safeString(topLevel.id);
+  const topLevelToolName =
+    safeString(topLevel.toolName) ??
+    safeString(topLevel.tool_name);
+  const topLevelIsError =
+    safeBoolean(topLevel.isError) ??
+    safeBoolean(topLevel.is_error);
 
   // BashExecutionMessage: preserve a synthetic text part so output is round-trippable.
   if (!("content" in message) && "command" in message && "output" in message) {
@@ -307,6 +317,9 @@ function buildMessageParts(params: {
         textContent: message.content,
         metadata: toJson({
           originalRole: role,
+          toolCallId: topLevelToolCallId,
+          toolName: topLevelToolName,
+          isError: topLevelIsError,
         }),
       },
     ];
@@ -351,7 +364,8 @@ function buildMessageParts(params: {
       toolName:
         safeString(metadataRecord?.name) ??
         safeString(metadataRecord?.toolName) ??
-        safeString(metadataRecord?.tool_name),
+        safeString(metadataRecord?.tool_name) ??
+        topLevelToolName,
       toolInput:
         metadataRecord?.input !== undefined
           ? toJson(metadataRecord.input)
@@ -368,6 +382,9 @@ function buildMessageParts(params: {
             : (safeString(metadataRecord?.tool_output) ?? null),
       metadata: toJson({
         originalRole: role,
+        toolCallId: topLevelToolCallId,
+        toolName: topLevelToolName,
+        isError: topLevelIsError,
         rawType: block.type,
         raw: metadataRecord ?? message.content[ordinal],
       }),
@@ -563,6 +580,12 @@ export class LcmContextEngine implements ContextEngine {
   };
 
   private config: LcmConfig;
+
+  /** Get the configured timezone, falling back to system timezone. */
+  get timezone(): string {
+    return this.config.timezone ?? Intl.DateTimeFormat().resolvedOptions().timeZone;
+  }
+
   private conversationStore: ConversationStore;
   private summaryStore: SummaryStore;
   private assembler: ContextAssembler;

package/src/tools/lcm-describe-tool.ts

@@ -8,6 +8,7 @@ import type { LcmDependencies } from "../types.js";
 import type { AnyAgentTool } from "./common.js";
 import { jsonResult } from "./common.js";
 import { resolveLcmConversationScope } from "./lcm-conversation-scope.js";
+import { formatTimestamp } from "../compaction.js";
 
 const LcmDescribeSchema = Type.Object({
   id: Type.String({
@@ -40,8 +41,12 @@ function normalizeRequestedTokenCap(value: unknown): number | undefined {
   return Math.max(1, Math.trunc(value));
 }
 
-function formatIso(value: Date | null | undefined): string {
-  return value instanceof Date ? value.toISOString() : "-";
+function formatIso(value: Date | null | undefined, timezone?: string): string {
+  if (!(value instanceof Date)) return "-";
+  if (timezone) {
+    return formatTimestamp(value, timezone);
+  }
+  return value.toISOString();
 }
 
 export function createLcmDescribeTool(input: {
@@ -61,6 +66,7 @@ export function createLcmDescribeTool(input: {
     parameters: LcmDescribeSchema,
     async execute(_toolCallId, params) {
       const retrieval = input.lcm.getRetrieval();
+      const timezone = input.lcm.timezone;
       const p = params as Record<string, unknown>;
       const id = (p.id as string).trim();
       const conversationScope = await resolveLcmConversationScope({
@@ -152,7 +158,7 @@ export function createLcmDescribeTool(input: {
         lines.push(
           `meta conv=${s.conversationId} kind=${s.kind} depth=${s.depth} tok=${s.tokenCount} ` +
             `descTok=${s.descendantTokenCount} srcTok=${s.sourceMessageTokenCount} ` +
-            `desc=${s.descendantCount} range=${formatIso(s.earliestAt)}..${formatIso(s.latestAt)} ` +
+            `desc=${s.descendantCount} range=${formatIso(s.earliestAt, timezone)}..${formatIso(s.latestAt, timezone)} ` +
             `budgetCap=${resolvedTokenCap}`,
         );
         if (s.parentIds.length > 0) {
@@ -167,7 +173,7 @@ export function createLcmDescribeTool(input: {
             `d${node.depthFromRoot} ${node.summaryId} k=${node.kind} tok=${node.tokenCount} ` +
               `descTok=${node.descendantTokenCount} srcTok=${node.sourceMessageTokenCount} ` +
               `desc=${node.descendantCount} child=${node.childCount} ` +
-              `range=${formatIso(node.earliestAt)}..${formatIso(node.latestAt)} ` +
+              `range=${formatIso(node.earliestAt, timezone)}..${formatIso(node.latestAt, timezone)} ` +
               `cost[s=${node.costs.summariesOnly},m=${node.costs.withMessages}] ` +
               `budget[s=${node.budgetFit.summariesOnly ? "in" : "over"},` +
               `m=${node.budgetFit.withMessages ? "in" : "over"}]`,
@@ -205,7 +211,7 @@ export function createLcmDescribeTool(input: {
         if (f.byteSize != null) {
           lines.push(`**Size:** ${f.byteSize.toLocaleString()} bytes`);
         }
-        lines.push(`**Created:** ${f.createdAt.toISOString()}`);
+        lines.push(`**Created:** ${formatIso(f.createdAt, timezone)}`);
         if (f.explorationSummary) {
           lines.push("");
           lines.push("## Exploration Summary");

package/src/tools/lcm-grep-tool.ts

@@ -4,6 +4,7 @@ import type { LcmDependencies } from "../types.js";
 import type { AnyAgentTool } from "./common.js";
 import { jsonResult } from "./common.js";
 import { parseIsoTimestampParam, resolveLcmConversationScope } from "./lcm-conversation-scope.js";
+import { formatTimestamp } from "../compaction.js";
 
 const MAX_RESULT_CHARS = 40_000; // ~10k tokens
 
@@ -83,6 +84,7 @@ export function createLcmGrepTool(input: {
     parameters: LcmGrepSchema,
     async execute(_toolCallId, params) {
       const retrieval = input.lcm.getRetrieval();
+      const timezone = input.lcm.timezone;
 
       const p = params as Record<string, unknown>;
       const pattern = (p.pattern as string).trim();
@@ -139,8 +141,8 @@ export function createLcmGrepTool(input: {
       }
       if (since || before) {
         lines.push(
-          `**Time filter:** ${since ? `since ${since.toISOString()}` : "since -∞"} | ${
-            before ? `before ${before.toISOString()}` : "before +∞"
+          `**Time filter:** ${since ? `since ${formatTimestamp(since, timezone)}` : "since -∞"} | ${
+            before ? `before ${formatTimestamp(before, timezone)}` : "before +∞"
           }`,
         );
       }
@@ -154,7 +156,7 @@ export function createLcmGrepTool(input: {
         lines.push("");
         for (const msg of result.messages) {
           const snippet = truncateSnippet(msg.snippet);
-          const line = `- [msg#${msg.messageId}] (${msg.role}, ${msg.createdAt.toISOString()}): ${snippet}`;
+          const line = `- [msg#${msg.messageId}] (${msg.role}, ${formatTimestamp(msg.createdAt, timezone)}): ${snippet}`;
           if (currentChars + line.length > MAX_RESULT_CHARS) {
             lines.push("*(truncated — more results available)*");
             break;
@@ -170,7 +172,7 @@ export function createLcmGrepTool(input: {
         lines.push("");
         for (const sum of result.summaries) {
           const snippet = truncateSnippet(sum.snippet);
-          const line = `- [${sum.summaryId}] (${sum.kind}, ${sum.createdAt.toISOString()}): ${snippet}`;
+          const line = `- [${sum.summaryId}] (${sum.kind}, ${formatTimestamp(sum.createdAt, timezone)}): ${snippet}`;
           if (currentChars + line.length > MAX_RESULT_CHARS) {
             lines.push("*(truncated — more results available)*");
             break;