* feat: show activity indicators for terminals and their workspaces A terminal surfaces whether the agent running inside it is working, idle, or waiting for input as a tab dot, and that state rolls up into the owning workspace status — so an agent run inside a terminal reads the same as a native agent. Finishing a turn raises a "Terminal finished" notification that routes back to the workspace terminal tab. Activity is reported by the agents, not parsed from terminal output: Claude and Codex command hooks and an OpenCode plugin post coarse state to a local daemon endpoint, and a source-agnostic per-terminal tracker maps it to working/idle/attention. Hook installation is opt-in and off by default because it edits your real agent config files; enable it under a host's Terminal settings and Paseo installs the hooks globally, runs them via `paseo hooks <agent> <event>`, and removes its own hooks when you opt back out. Installation and reporting are idempotent and fail-open, so a missing or failing hook never breaks the user's shell. * Fix terminal activity routing and CI test Test drift: anchor the provider-leak test to the repo root instead of process.cwd() so it passes under the server workspace CI runner. Also restore auth-first JSON parsing outside the terminal-activity route and route subdirectory terminal activity to the deepest active workspace. * Fix workspace resolver regression Code drift: terminal activity routing needs parent-workspace prefix matching, but agent directory and historical fetches keep exact registered workspace semantics, including archived exact matches. * Narrow terminal/draft workspace subscriptions to the fields they use terminal-panel and the draft agent tab subscribed to the whole workspace descriptor via useWorkspace but read only workspaceDirectory (plus projectKind in TerminalPanel, plus id in the draft tab), so they re-rendered on any field change of that workspace (status, diffStat, scripts). Switch them to the existing useWorkspaceDirectory / useWorkspaceFields hooks so they re-render only when the fields they actually read change. No behavior change. * Make TerminalActivity.state forward-compatible A strict z.enum rejects the whole payload when a newer daemon reports a terminal activity state this client predates, breaking the protocol's old-client-parses-new-daemon contract (the activity field has no .catch at its embedding in messages.ts, so the failure bubbles up). Degrade unknown states to "idle" (no indicator, no notification) via .catch, matching the enum-with-catch pattern used elsewhere in the protocol. Add a forward-compat regression test.
257 lines
7.7 KiB
TypeScript
257 lines
7.7 KiB
TypeScript
import { describe, expect, it } from "vitest";
|
|
import {
|
|
ACTIVITY_HEARTBEAT_THROTTLE_MS,
|
|
createClientActivityTracker,
|
|
type ClientActivityTracker,
|
|
type ClientActivityTrackerInput,
|
|
type HeartbeatClient,
|
|
type HeartbeatPayload,
|
|
} from "./client-activity-tracker";
|
|
|
|
const START_MS = new Date("2026-04-19T10:00:00.000Z").getTime();
|
|
|
|
function createTestClock(initial = START_MS) {
|
|
let t = initial;
|
|
return {
|
|
now: () => t,
|
|
set(ms: number) {
|
|
t = ms;
|
|
},
|
|
advance(ms: number) {
|
|
t += ms;
|
|
},
|
|
};
|
|
}
|
|
|
|
interface FakeHeartbeatClient extends HeartbeatClient {
|
|
isConnected: boolean;
|
|
recordedHeartbeats: HeartbeatPayload[];
|
|
latest(): HeartbeatPayload;
|
|
reset(): void;
|
|
}
|
|
|
|
function createFakeHeartbeatClient(): FakeHeartbeatClient {
|
|
const recorded: HeartbeatPayload[] = [];
|
|
return {
|
|
isConnected: true,
|
|
recordedHeartbeats: recorded,
|
|
sendHeartbeat(payload) {
|
|
recorded.push(payload);
|
|
},
|
|
latest() {
|
|
const last = recorded.at(-1);
|
|
if (!last) throw new Error("Expected a heartbeat");
|
|
return last;
|
|
},
|
|
reset() {
|
|
recorded.length = 0;
|
|
},
|
|
};
|
|
}
|
|
|
|
function buildTracker(
|
|
overrides: Partial<ClientActivityTrackerInput> & {
|
|
client?: FakeHeartbeatClient;
|
|
clock?: ReturnType<typeof createTestClock>;
|
|
} = {},
|
|
): {
|
|
tracker: ClientActivityTracker;
|
|
client: FakeHeartbeatClient;
|
|
clock: ReturnType<typeof createTestClock>;
|
|
} {
|
|
const client = overrides.client ?? createFakeHeartbeatClient();
|
|
const clock = overrides.clock ?? createTestClock();
|
|
const tracker = createClientActivityTracker({
|
|
client,
|
|
deviceType: overrides.deviceType ?? "web",
|
|
initialFocusedAgentId: overrides.initialFocusedAgentId ?? "agent-1",
|
|
initialFocusedTerminalId: overrides.initialFocusedTerminalId ?? null,
|
|
initialAppVisible: overrides.initialAppVisible ?? true,
|
|
now: clock.now,
|
|
onAppResumed: overrides.onAppResumed,
|
|
});
|
|
return { tracker, client, clock };
|
|
}
|
|
|
|
describe("client activity tracker", () => {
|
|
it("includes the latest user-activity time in the next heartbeat", () => {
|
|
const { tracker, client, clock } = buildTracker();
|
|
|
|
clock.advance(5_250);
|
|
tracker.recordUserActivity();
|
|
tracker.maybeSendImmediateHeartbeat();
|
|
|
|
expect(client.latest()).toMatchObject({
|
|
deviceType: "web",
|
|
focusedAgentId: "agent-1",
|
|
appVisible: true,
|
|
lastActivityAt: new Date(START_MS + 5_250).toISOString(),
|
|
});
|
|
});
|
|
|
|
it("throttles repeated immediate heartbeats within the throttle window", () => {
|
|
const { tracker, client, clock } = buildTracker();
|
|
|
|
tracker.recordUserActivity();
|
|
tracker.maybeSendImmediateHeartbeat();
|
|
expect(client.recordedHeartbeats).toHaveLength(1);
|
|
|
|
clock.advance(ACTIVITY_HEARTBEAT_THROTTLE_MS - 1);
|
|
tracker.recordUserActivity();
|
|
tracker.maybeSendImmediateHeartbeat();
|
|
expect(client.recordedHeartbeats).toHaveLength(1);
|
|
|
|
clock.advance(1);
|
|
tracker.recordUserActivity();
|
|
tracker.maybeSendImmediateHeartbeat();
|
|
expect(client.recordedHeartbeats).toHaveLength(2);
|
|
});
|
|
|
|
it("sends one immediate heartbeat when the focused agent changes", () => {
|
|
const { tracker, client, clock } = buildTracker();
|
|
tracker.sendHeartbeat(); // simulate the on-connect heartbeat
|
|
expect(client.recordedHeartbeats).toHaveLength(1);
|
|
client.reset();
|
|
|
|
clock.advance(5_000);
|
|
tracker.setFocusedAgentId("agent-2");
|
|
|
|
expect(client.recordedHeartbeats).toHaveLength(1);
|
|
expect(client.latest()).toMatchObject({
|
|
focusedAgentId: "agent-2",
|
|
lastActivityAt: new Date(START_MS + 5_000).toISOString(),
|
|
});
|
|
});
|
|
|
|
it("ignores focused-agent updates that do not change the value", () => {
|
|
const { tracker, client } = buildTracker({ initialFocusedAgentId: "agent-1" });
|
|
|
|
tracker.setFocusedAgentId("agent-1");
|
|
|
|
expect(client.recordedHeartbeats).toHaveLength(0);
|
|
});
|
|
|
|
it("sends one immediate heartbeat when the focused terminal changes", () => {
|
|
const { tracker, client, clock } = buildTracker({ initialFocusedTerminalId: null });
|
|
|
|
clock.advance(5_000);
|
|
tracker.setFocusedTerminalId("terminal-1");
|
|
|
|
expect(client.recordedHeartbeats).toHaveLength(1);
|
|
expect(client.latest()).toMatchObject({
|
|
focusedAgentId: "agent-1",
|
|
focusedTerminalId: "terminal-1",
|
|
lastActivityAt: new Date(START_MS + 5_000).toISOString(),
|
|
});
|
|
});
|
|
|
|
it("drives lastActivityAt forward from system idle polling", () => {
|
|
const { tracker, client, clock } = buildTracker();
|
|
|
|
clock.advance(5_000);
|
|
tracker.notifySystemIdleMs(0);
|
|
clock.advance(5_000);
|
|
tracker.notifySystemIdleMs(0);
|
|
clock.advance(5_000);
|
|
tracker.notifySystemIdleMs(0);
|
|
tracker.sendHeartbeat();
|
|
|
|
expect(client.latest().lastActivityAt).toBe(new Date(START_MS + 15_000).toISOString());
|
|
});
|
|
|
|
it("sets lastActivityAt to now minus the system idle time", () => {
|
|
const { tracker, client, clock } = buildTracker();
|
|
|
|
clock.advance(15_000);
|
|
tracker.notifySystemIdleMs(2_000);
|
|
tracker.sendHeartbeat();
|
|
|
|
expect(client.latest().lastActivityAt).toBe(new Date(START_MS + 13_000).toISOString());
|
|
});
|
|
|
|
it("ignores failed system idle polls", () => {
|
|
const { tracker, client, clock } = buildTracker();
|
|
tracker.sendHeartbeat();
|
|
const before = client.latest().lastActivityAt;
|
|
|
|
clock.advance(15_000);
|
|
tracker.notifySystemIdleMs(null);
|
|
tracker.sendHeartbeat();
|
|
|
|
expect(client.latest().lastActivityAt).toBe(before);
|
|
});
|
|
|
|
it("never moves lastActivityAt backward from a system idle poll", () => {
|
|
const { tracker, client, clock } = buildTracker();
|
|
|
|
clock.advance(5_000);
|
|
tracker.recordUserActivity();
|
|
const userActivityAt = new Date(clock.now()).toISOString();
|
|
|
|
clock.advance(10_000);
|
|
tracker.notifySystemIdleMs(20_000); // would imply activity 5_000 ms before start
|
|
tracker.sendHeartbeat();
|
|
|
|
expect(client.latest().lastActivityAt).toBe(userActivityAt);
|
|
});
|
|
|
|
it("emits an appVisibilityChangedAt and runs onAppResumed when becoming visible after backgrounding", () => {
|
|
let resumed: number | null = null;
|
|
const { tracker, client, clock } = buildTracker({
|
|
initialAppVisible: true,
|
|
onAppResumed: (awayMs) => {
|
|
resumed = awayMs;
|
|
},
|
|
});
|
|
|
|
clock.advance(2_000);
|
|
const hideTransition = tracker.notifyAppVisibility(false);
|
|
expect(hideTransition.changed).toBe(true);
|
|
|
|
clock.advance(8_000);
|
|
const showTransition = tracker.notifyAppVisibility(true);
|
|
expect(showTransition.changed).toBe(true);
|
|
expect(resumed).toBe(8_000);
|
|
|
|
tracker.sendHeartbeat();
|
|
expect(client.latest()).toMatchObject({
|
|
appVisible: true,
|
|
appVisibilityChangedAt: new Date(START_MS + 10_000).toISOString(),
|
|
lastActivityAt: new Date(START_MS + 10_000).toISOString(),
|
|
});
|
|
});
|
|
|
|
it("treats no-op visibility transitions as no change", () => {
|
|
const { tracker } = buildTracker({ initialAppVisible: true });
|
|
const result = tracker.notifyAppVisibility(true);
|
|
expect(result.changed).toBe(false);
|
|
});
|
|
|
|
it("does not call onAppResumed when transitioning visible→visible or from initial-visible to hidden", () => {
|
|
let resumed: number | null = null;
|
|
const { tracker } = buildTracker({
|
|
initialAppVisible: true,
|
|
onAppResumed: (awayMs) => {
|
|
resumed = awayMs;
|
|
},
|
|
});
|
|
|
|
tracker.notifyAppVisibility(false);
|
|
expect(resumed).toBeNull();
|
|
});
|
|
|
|
it("skips heartbeats while the client is disconnected", () => {
|
|
const client = createFakeHeartbeatClient();
|
|
client.isConnected = false;
|
|
const { tracker, clock } = buildTracker({ client });
|
|
|
|
tracker.sendHeartbeat();
|
|
tracker.recordUserActivity();
|
|
tracker.maybeSendImmediateHeartbeat();
|
|
clock.advance(10_000);
|
|
tracker.setFocusedAgentId("agent-2");
|
|
|
|
expect(client.recordedHeartbeats).toHaveLength(0);
|
|
});
|
|
});
|