Multi-Agent Collaboration for Team and Friends
TypeScript agent-automationagent-orchestrationagent-workflowai-agentsai-collaborationai-memoryai-workforceautonomous-agentsclaude-codeclaude-code-skillscodexcoding-agentmulti-agentmultiple-agentone-person-businessone-person-companyone-person-teamopencodesolopreneur
fix(daemon): report per-daemon activity
Gus479b25f2dd56
diff --git a/src/daemon/src/cli/daemonList.test.ts b/src/daemon/src/cli/daemonList.test.tsindex acf4658db..e77bd23a2 100644--- a/src/daemon/src/cli/daemonList.test.ts+++ b/src/daemon/src/cli/daemonList.test.ts@@ -120,7 +120,14 @@ describe("daemonList — C0 per-daemon subdir layout + multi-daemon isolation",afterEach(() => { fs.rmSync(baseDir, { recursive: true, force: true }); });// `running` defaults to all agents; pass fewer to mix in idle agents.- const writeDaemon = (id: string, pid: number, agents: number, writtenAt: number, running = agents) => {+ const writeDaemon = (+ id: string,+ pid: number,+ agents: number,+ writtenAt: number,+ running = agents,+ sinceProgressMs = 1,+ ) => {const dir = path.join(baseDir, "daemons", id);fs.mkdirSync(dir, { recursive: true });fs.writeFileSync(path.join(dir, "daemon.pid"), JSON.stringify({ pid, key: `cmk_${id}` }));@@ -132,7 +139,7 @@ describe("daemonList — C0 per-daemon subdir layout + multi-daemon isolation",agentId: `${id}-a${i}`,status: "running",derivedActivity: i < running ? "running" : "idle",- turnActive: i < running, inbox: 0, sinceProgressMs: 1, stoppingSince: null,+ turnActive: i < running, inbox: 0, sinceProgressMs, stoppingSince: null,})),}),);@@ -167,6 +174,89 @@ describe("daemonList — C0 per-daemon subdir layout + multi-daemon isolation",expect(b!.agents).toBe(7); // distinct — NOT both showing one value});+ it("derives distinct LAST ACTIVE values from each daemon's latest agent progress", () => {+ const writtenAtA = 1_000_000;+ const writtenAtB = writtenAtA + 24;+ writeDaemon("cm_active_a", process.pid, 1, writtenAtA, 0, 700);+ writeDaemon("cm_active_b", process.pid, 1, writtenAtB, 0, 12_000);++ const list = daemonList({ baseDir });+ expect(list.find((row) => row.id === "cm_active_a")?.lastActiveMs).toBe(999_300);+ expect(list.find((row) => row.id === "cm_active_b")?.lastActiveMs).toBe(988_024);++ const output = renderDaemonList(list, writtenAtB);+ expect(output.split("\n").find((line) => line.includes("cm_active_a"))).toContain("just now (1s)");+ expect(output.split("\n").find((line) => line.includes("cm_active_b"))).toContain("just now (12s)");+ });++ it("shows no last activity when a daemon has no agents", () => {+ writeDaemon("cm_zeroagents", process.pid, 0, 1_000_000);+ const row = daemonList({ baseDir }).find((item) => item.id === "cm_zeroagents");++ expect(row?.lastActiveMs).toBeNull();+ expect(renderDaemonList([row!], 1_000_000).split(/\s{2,}/)).toContain("—");+ });++ it("treats invalid progress ages and the never-active epoch sentinel as no activity", () => {+ const id = "cm_badprogress";+ const dir = path.join(baseDir, "daemons", id);+ fs.mkdirSync(dir, { recursive: true });+ fs.writeFileSync(path.join(dir, "daemon.pid"), JSON.stringify({ pid: process.pid, key: `cmk_${id}` }));+ fs.writeFileSync(+ path.join(dir, "status.json"),+ `{"writtenAt":1000,"agents":[{"sinceProgressMs":1e400},{"sinceProgressMs":-1},{"sinceProgressMs":1200}]}`,+ );++ expect(daemonList({ baseDir }).find((row) => row.id === id)?.lastActiveMs).toBeNull();+ });++ it("uses the latest valid progress age when invalid and sentinel agents are mixed in", () => {+ const id = "cm_mixedprogress";+ const dir = path.join(baseDir, "daemons", id);+ fs.mkdirSync(dir, { recursive: true });+ fs.writeFileSync(path.join(dir, "daemon.pid"), JSON.stringify({ pid: process.pid, key: `cmk_${id}` }));+ fs.writeFileSync(+ path.join(dir, "status.json"),+ `{"writtenAt":1000,"agents":[{"sinceProgressMs":1e400},{"sinceProgressMs":1000},{"sinceProgressMs":300},{"sinceProgressMs":100}]}`,+ );++ expect(daemonList({ baseDir }).find((row) => row.id === id)?.lastActiveMs).toBe(900);+ });++ it("ignores future activity candidates instead of rendering them as just now", () => {+ const id = "cm_futureonly";+ const dir = path.join(baseDir, "daemons", id);+ const writtenAt = Date.now() + 100_000;+ fs.mkdirSync(dir, { recursive: true });+ fs.writeFileSync(path.join(dir, "daemon.pid"), JSON.stringify({ pid: process.pid, key: `cmk_${id}` }));+ fs.writeFileSync(path.join(dir, "status.json"), JSON.stringify({+ writtenAt,+ agents: [{ sinceProgressMs: 1 }],+ }));++ const row = daemonList({ baseDir }).find((item) => item.id === id);+ expect(row?.lastActiveMs).toBeNull();+ expect(renderDaemonList([row!])).toContain("—");+ });++ it("ignores a future candidate while retaining the latest valid activity", () => {+ const id = "cm_futuremixed";+ const dir = path.join(baseDir, "daemons", id);+ const validProgressAt = Date.now() - 500;+ const writtenAt = validProgressAt + 100_000;+ fs.mkdirSync(dir, { recursive: true });+ fs.writeFileSync(path.join(dir, "daemon.pid"), JSON.stringify({ pid: process.pid, key: `cmk_${id}` }));+ fs.writeFileSync(path.join(dir, "status.json"), JSON.stringify({+ writtenAt,+ agents: [+ { sinceProgressMs: 1 },+ { sinceProgressMs: writtenAt - validProgressAt },+ ],+ }));++ expect(daemonList({ baseDir }).find((row) => row.id === id)?.lastActiveMs).toBe(validProgressAt);+ });+it("only subdir daemons are listed — a stray flat file is NOT discovered (legacy compat dropped, Gus #466)", () => {// No migration compat: a bare `<id>.pid` file (pre-C0 shape) is ignored;// only per-key subdirs are daemons. Keeps discovery single-path, no legacydiff --git a/src/daemon/src/cli/daemonStart.ts b/src/daemon/src/cli/daemonStart.tsindex 34de60768..3929eb0b0 100644--- a/src/daemon/src/cli/daemonStart.ts+++ b/src/daemon/src/cli/daemonStart.ts@@ -511,6 +511,21 @@ export interface DaemonInfo {lastActiveMs: number | null;}+function daemonLastActiveMs(snapshot: DaemonStatusResult, nowMs: number): number | null {+ const writtenAt = snapshot.writtenAt;+ if (writtenAt == null || !Number.isFinite(writtenAt) || writtenAt < 0) return null;++ let latest: number | null = null;+ for (const agent of snapshot.agents) {+ const sinceProgressMs = agent.sinceProgressMs;+ if (!Number.isFinite(sinceProgressMs) || sinceProgressMs < 0) continue;+ const progressAt = writtenAt - sinceProgressMs;+ if (progressAt <= 0 || progressAt > nowMs) continue;+ latest = latest == null ? progressAt : Math.max(latest, progressAt);+ }+ return latest;+}+export function daemonList(opts: DaemonListOpts): DaemonInfo[] {const baseDir = opts.baseDir || process.env.ALOOK_DATA_DIR || DEFAULT_BASE_DIR;const dir = daemonsDir(baseDir);@@ -536,7 +551,7 @@ export function daemonList(opts: DaemonListOpts): DaemonInfo[] {if (s.found) {agents = s.agents.length;running = s.agents.filter((a) => a.derivedActivity === "running").length;- lastActiveMs = s.writtenAt;+ lastActiveMs = daemonLastActiveMs(s, now);}}results.push({ id, pid: data.pid, alive, agents, running, lastActiveMs });diff --git a/src/daemon/src/daemon/createDaemon.test.ts b/src/daemon/src/daemon/createDaemon.test.tsindex 1a6ebfad6..209b3e5d7 100644--- a/src/daemon/src/daemon/createDaemon.test.ts+++ b/src/daemon/src/daemon/createDaemon.test.ts@@ -286,6 +286,40 @@ describe("createDaemon", () => {}});+ it("uses one clock sample for status writtenAt and agent progress ages", async () => {+ const sockets: FakeSocket[] = [];+ const root = mkdtempSync(join(tmpdir(), "daemon-status-clock-"));+ startupSweepDirs.push(root);+ const statusFilePath = join(root, "status.json");+ const projectionTimes: number[] = [];+ let nowMs = 10_000;+ vi.spyOn(Date, "now").mockImplementation(() => ++nowMs);+ vi.spyOn(AgentProcessManager.prototype, "statusProjection").mockImplementation((sampledNowMs) => {+ projectionTimes.push(sampledNowMs);+ return [];+ });+ vi.stubGlobal("fetch", vi.fn(async () => Response.json({ bots: [] })));++ const daemon = await createDaemon({+ machineKey: "cmk_status_clock",+ serverUrl: "http://localhost:9999",+ serverWsUrl: "ws://x",+ webSocketFactory: factory(sockets) as never,+ runtimeReport: [],+ driverFor: () => fakeDriver,+ capabilities: [],+ statusFilePath,+ });++ try {+ const snapshot = JSON.parse(readFileSync(statusFilePath, "utf8")) as { writtenAt: number };+ expect(projectionTimes).toHaveLength(1);+ expect(snapshot.writtenAt).toBe(projectionTimes[0]);+ } finally {+ await daemon.stop();+ }+ });+it("consumes diagnostics before Router and invokes the injected handler once", async () => {const sockets: FakeSocket[] = [];const routerEntry = spyOnRouterCommandEntry();diff --git a/src/daemon/src/daemon/createDaemon.ts b/src/daemon/src/daemon/createDaemon.tsindex be43c6a55..0e2db9e2d 100644--- a/src/daemon/src/daemon/createDaemon.ts+++ b/src/daemon/src/daemon/createDaemon.ts@@ -845,8 +845,10 @@ export async function createDaemon(opts: CreateDaemonOptions): Promise<RunningDalet statusTimer: ReturnType<typeof setInterval> | null = null;if (opts.statusFilePath) {const statusPath = opts.statusFilePath;- const writeStatus = () =>- writeStatusFile(statusPath, { writtenAt: Date.now(), agents: manager.statusProjection(Date.now()) });+ const writeStatus = () => {+ const nowMs = Date.now();+ writeStatusFile(statusPath, { writtenAt: nowMs, agents: manager.statusProjection(nowMs) });+ };writeStatus(); // one immediately so `daemon status` works right after bootstatusTimer = setInterval(writeStatus, STATUS_WRITE_INTERVAL_MS);statusTimer.unref?.();