@openclaw-cloud/agent-controller 0.2.2 → 0.2.4

package/__tests__/heartbeat.test.ts

@@ -1,8 +1,54 @@
 import os from 'node:os';
 
-import { getMetrics, startHeartbeat } from '../src/heartbeat';
+import { getMetrics, getLastMessageAt, startHeartbeat } from '../src/heartbeat';
 import type { AgentApi } from '../src/api';
 
+jest.mock('node:fs/promises', () => ({
+  readdir: jest.fn(),
+  stat: jest.fn(),
+}));
+
+import fsMock from 'node:fs/promises';
+const fsPromises = fsMock as jest.Mocked<typeof fsMock>;
+
+describe('getLastMessageAt', () => {
+  const origEnv = process.env.OPENCLAW_STATE_DIR;
+
+  afterEach(() => {
+    process.env.OPENCLAW_STATE_DIR = origEnv;
+    jest.clearAllMocks();
+  });
+
+  it('returns null when sessions directory does not exist', async () => {
+    fsPromises.readdir.mockRejectedValue(Object.assign(new Error('ENOENT'), { code: 'ENOENT' }));
+    const result = await getLastMessageAt();
+    expect(result).toBeNull();
+  });
+
+  it('returns null when no .jsonl files are present', async () => {
+    fsPromises.readdir.mockResolvedValue(['session.txt', 'other.json'] as unknown as Awaited<ReturnType<typeof fsPromises.readdir>>);
+    const result = await getLastMessageAt();
+    expect(result).toBeNull();
+  });
+
+  it('returns ISO string of the most recent mtime when .jsonl files are present', async () => {
+    process.env.OPENCLAW_STATE_DIR = '/test/state';
+    fsPromises.readdir.mockResolvedValue(['a.jsonl', 'b.jsonl'] as unknown as Awaited<ReturnType<typeof fsPromises.readdir>>);
+    const t1 = new Date('2024-01-01T10:00:00.000Z').getTime();
+    const t2 = new Date('2024-01-02T12:00:00.000Z').getTime();
+    fsPromises.stat
+      .mockResolvedValueOnce({ mtime: new Date(t1) } as unknown as Awaited<ReturnType<typeof fsPromises.stat>>)
+      .mockResolvedValueOnce({ mtime: new Date(t2) } as unknown as Awaited<ReturnType<typeof fsPromises.stat>>);
+    const result = await getLastMessageAt();
+    expect(result).toBe('2024-01-02T12:00:00.000Z');
+  });
+
+  it('does not throw on any error', async () => {
+    fsPromises.readdir.mockRejectedValue(new Error('unexpected'));
+    await expect(getLastMessageAt()).resolves.toBeNull();
+  });
+});
+
 describe('getMetrics', () => {
   it('returns cpu, mem, uptime', () => {
     const metrics = getMetrics();
@@ -37,11 +83,14 @@ describe('startHeartbeat', () => {
     jest.useRealTimers();
   });
 
-  it('publishes heartbeat immediately and at intervals', () => {
+  it('publishes heartbeat immediately and at intervals', async () => {
     const publishHeartbeat = jest.fn().mockResolvedValue(undefined);
     const api = makeApi(publishHeartbeat);
 
     const timer = startHeartbeat({ api, agentId: 'agent-42' });
+    // Flush microtasks so async getLastMessageAt() resolves before api.publishHeartbeat is called
+    await Promise.resolve();
+    await Promise.resolve();
 
     // Immediate call
     expect(publishHeartbeat).toHaveBeenCalledTimes(1);
@@ -55,6 +104,8 @@ describe('startHeartbeat', () => {
 
     // After 30s
     jest.advanceTimersByTime(30_000);
+    await Promise.resolve();
+    await Promise.resolve();
     expect(publishHeartbeat).toHaveBeenCalledTimes(2);
 
     clearInterval(timer);

package/dist/heartbeat.d.ts

@@ -1,5 +1,6 @@
 import type { AgentApi } from './api.js';
 import type { BoardState, HeartbeatPayload } from './types.js';
+export declare function getLastMessageAt(): Promise<string | null>;
 export interface HeartbeatOptions {
     api: AgentApi;
     agentId: string;

package/dist/heartbeat.js

@@ -1,6 +1,24 @@
 import os from 'node:os';
+import path from 'node:path';
+import fs from 'node:fs/promises';
 import { debugLog } from './debug.js';
 const HEARTBEAT_INTERVAL = 30_000;
+export async function getLastMessageAt() {
+    const stateDir = process.env.OPENCLAW_STATE_DIR?.trim()
+        ?? path.join(os.homedir(), '.openclaw');
+    const sessionsDir = path.join(stateDir, 'agents', 'main', 'sessions');
+    try {
+        const files = await fs.readdir(sessionsDir);
+        const jsonlFiles = files.filter((f) => f.endsWith('.jsonl'));
+        if (jsonlFiles.length === 0)
+            return null;
+        const mtimes = await Promise.all(jsonlFiles.map((f) => fs.stat(path.join(sessionsDir, f)).then((s) => s.mtime.getTime())));
+        return new Date(Math.max(...mtimes)).toISOString();
+    }
+    catch {
+        return null;
+    }
+}
 function getMetrics() {
     const cpus = os.cpus();
     const cpuUsage = cpus.reduce((acc, cpu) => {
@@ -22,6 +40,7 @@ async function publishHeartbeat(opts) {
         ts: Date.now(),
         metrics: getMetrics(),
         ...(opts.getBoardStatus ? { boardStatus: opts.getBoardStatus() } : {}),
+        lastMessageAt: await getLastMessageAt(),
     };
     try {
         debugLog('heartbeat', '→ sending', opts.agentId, JSON.stringify(payload).slice(0, 500));

package/dist/heartbeat.js.map

@@ -1 +1 @@
-{"version":3,"file":"heartbeat.js","sourceRoot":"","sources":["../src/heartbeat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAItC,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAQlC,SAAS,UAAU;IACjB,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC;IACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACxC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAClE,OAAO,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;IAC5C,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;IAEpB,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;IAC/B,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAE7B,OAAO;QACL,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAC,GAAG,GAAG;QACrC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,QAAQ,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG;QAC9D,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE;KACpB,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,IAAsB;IACpD,MAAM,OAAO,GAAqB;QAChC,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE;QACd,OAAO,EAAE,UAAU,EAAE;QACrB,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACvE,CAAC;IAEF,IAAI,CAAC;QACH,QAAQ,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QACxF,MAAM,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACvD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACrF,QAAQ,CAAC,WAAW,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;IACxC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAsB;IACnD,MAAM,IAAI,GAAG,GAAG,EAAE,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,IAAI,EAAE,CAAC;IACP,OAAO,WAAW,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;AAC/C,CAAC;AAED,OAAO,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"heartbeat.js","sourceRoot":"","sources":["../src/heartbeat.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -26,6 +26,7 @@ export interface HeartbeatPayload {
         uptime: number;
     };
     boardStatus?: BoardState;
+    lastMessageAt?: string | null;
 }
 export interface BoardState {
     state: 'idle' | 'working';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw-cloud/agent-controller",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "type": "module",
   "main": "dist/index.js",
   "bin": {

package/src/handlers/backup.ts

@@ -1,9 +1,14 @@
 import { exec } from 'node:child_process';
 import fs from 'node:fs/promises';
+import os from 'node:os';
 import path from 'node:path';
 import type { AgentCommand, AgentResponse } from '../types.js';
 
-const WORKSPACE_DIR = '/home/node/.openclaw/workspace';
+function getWorkspaceDir(): string {
+  const stateDir = process.env.OPENCLAW_STATE_DIR?.trim() ?? path.join(os.homedir(), '.openclaw');
+  return path.join(stateDir, 'workspace');
+}
+
 const BACKUP_DIR = '/tmp';
 const TAR_TIMEOUT = 120_000;
 const UPLOAD_TIMEOUT = 120_000;
@@ -47,9 +52,10 @@ export function handleBackup(command: AgentCommand): Promise<AgentResponse> {
 }
 
 function createArchive(archivePath: string): Promise<void> {
+  const workspaceDir = getWorkspaceDir();
   return new Promise((resolve, reject) => {
     exec(
-      `tar -czf ${archivePath} -C ${path.dirname(WORKSPACE_DIR)} ${path.basename(WORKSPACE_DIR)}`,
+      `tar -czf ${archivePath} -C ${path.dirname(workspaceDir)} ${path.basename(workspaceDir)}`,
       { timeout: TAR_TIMEOUT },
       (error, _stdout, stderr) => {
         if (error) {

package/src/heartbeat.ts

@@ -1,10 +1,31 @@
 import os from 'node:os';
+import path from 'node:path';
+import fs from 'node:fs/promises';
 import { debugLog } from './debug.js';
 import type { AgentApi } from './api.js';
 import type { BoardState, HeartbeatPayload } from './types.js';
 
 const HEARTBEAT_INTERVAL = 30_000;
 
+export async function getLastMessageAt(): Promise<string | null> {
+  const stateDir = process.env.OPENCLAW_STATE_DIR?.trim()
+    ?? path.join(os.homedir(), '.openclaw');
+  const sessionsDir = path.join(stateDir, 'agents', 'main', 'sessions');
+  try {
+    const files = await fs.readdir(sessionsDir);
+    const jsonlFiles = files.filter((f) => f.endsWith('.jsonl'));
+    if (jsonlFiles.length === 0) return null;
+    const mtimes = await Promise.all(
+      jsonlFiles.map((f) =>
+        fs.stat(path.join(sessionsDir, f)).then((s) => s.mtime.getTime())
+      )
+    );
+    return new Date(Math.max(...mtimes)).toISOString();
+  } catch {
+    return null;
+  }
+}
+
 export interface HeartbeatOptions {
   api: AgentApi;
   agentId: string;
@@ -35,6 +56,7 @@ async function publishHeartbeat(opts: HeartbeatOptions): Promise<void> {
     ts: Date.now(),
     metrics: getMetrics(),
     ...(opts.getBoardStatus ? { boardStatus: opts.getBoardStatus() } : {}),
+    lastMessageAt: await getLastMessageAt(),
   };
 
   try {

package/src/types.ts

@@ -33,6 +33,7 @@ export interface HeartbeatPayload {
     uptime: number;
   };
   boardStatus?: BoardState;
+  lastMessageAt?: string | null;
 }
 
 export interface BoardState {