feat(status): enrich session details

This commit is contained in:
Peter Steinberger
2025-12-09 03:00:01 +00:00
parent 40c8e4832a
commit 2177df51a8
5 changed files with 177 additions and 17 deletions

View File

@@ -2,7 +2,18 @@ import { describe, expect, it, vi } from "vitest";
const mocks = vi.hoisted(() => ({ const mocks = vi.hoisted(() => ({
loadSessionStore: vi.fn().mockReturnValue({ loadSessionStore: vi.fn().mockReturnValue({
"+1000": { updatedAt: Date.now() - 60_000 }, "+1000": {
updatedAt: Date.now() - 60_000,
verboseLevel: "on",
thinkingLevel: "low",
inputTokens: 2_000,
outputTokens: 3_000,
contextTokens: 10_000,
model: "pi:opus",
sessionId: "abc123",
systemSent: true,
syncing: true,
},
}), }),
resolveStorePath: vi.fn().mockReturnValue("/tmp/sessions.json"), resolveStorePath: vi.fn().mockReturnValue("/tmp/sessions.json"),
webAuthExists: vi.fn().mockResolvedValue(true), webAuthExists: vi.fn().mockResolvedValue(true),
@@ -40,6 +51,12 @@ describe("statusCommand", () => {
expect(payload.web.linked).toBe(true); expect(payload.web.linked).toBe(true);
expect(payload.sessions.count).toBe(1); expect(payload.sessions.count).toBe(1);
expect(payload.sessions.path).toBe("/tmp/sessions.json"); expect(payload.sessions.path).toBe("/tmp/sessions.json");
expect(payload.sessions.defaults.model).toBeTruthy();
expect(payload.sessions.defaults.contextTokens).toBeGreaterThan(0);
expect(payload.sessions.recent[0].percentUsed).toBe(50);
expect(payload.sessions.recent[0].remainingTokens).toBe(5000);
expect(payload.sessions.recent[0].flags).toContain("verbose:on");
expect(payload.sessions.recent[0].flags).toContain("syncing");
}); });
it("prints formatted lines otherwise", async () => { it("prints formatted lines otherwise", async () => {
@@ -48,6 +65,11 @@ describe("statusCommand", () => {
const logs = (runtime.log as vi.Mock).mock.calls.map((c) => String(c[0])); const logs = (runtime.log as vi.Mock).mock.calls.map((c) => String(c[0]));
expect(logs.some((l) => l.includes("Web session"))).toBe(true); expect(logs.some((l) => l.includes("Web session"))).toBe(true);
expect(logs.some((l) => l.includes("Active sessions"))).toBe(true); expect(logs.some((l) => l.includes("Active sessions"))).toBe(true);
expect(logs.some((l) => l.includes("Default model"))).toBe(true);
expect(logs.some((l) => l.includes("tokens:"))).toBe(true);
expect(logs.some((l) => l.includes("flags:") && l.includes("verbose:on"))).toBe(
true,
);
expect(mocks.logWebSelfId).toHaveBeenCalled(); expect(mocks.logWebSelfId).toHaveBeenCalled();
}); });
}); });

View File

@@ -1,5 +1,11 @@
import { lookupContextTokens } from "../agents/context.js";
import { DEFAULT_CONTEXT_TOKENS, DEFAULT_MODEL } from "../agents/defaults.js";
import { loadConfig } from "../config/config.js"; import { loadConfig } from "../config/config.js";
import { loadSessionStore, resolveStorePath } from "../config/sessions.js"; import {
loadSessionStore,
resolveStorePath,
type SessionEntry,
} from "../config/sessions.js";
import { info } from "../globals.js"; import { info } from "../globals.js";
import { buildProviderSummary } from "../infra/provider-summary.js"; import { buildProviderSummary } from "../infra/provider-summary.js";
import { peekSystemEvents } from "../infra/system-events.js"; import { peekSystemEvents } from "../infra/system-events.js";
@@ -11,6 +17,27 @@ import {
webAuthExists, webAuthExists,
} from "../web/session.js"; } from "../web/session.js";
export type SessionStatus = {
key: string;
kind: "direct" | "group" | "global" | "unknown";
sessionId?: string;
updatedAt: number | null;
age: number | null;
thinkingLevel?: string;
verboseLevel?: string;
systemSent?: boolean;
abortedLastRun?: boolean;
syncing?: boolean | string;
inputTokens?: number;
outputTokens?: number;
totalTokens: number | null;
remainingTokens: number | null;
percentUsed: number | null;
model: string | null;
contextTokens: number | null;
flags: string[];
};
export type StatusSummary = { export type StatusSummary = {
web: { linked: boolean; authAgeMs: number | null }; web: { linked: boolean; authAgeMs: number | null };
heartbeatSeconds: number; heartbeatSeconds: number;
@@ -19,11 +46,8 @@ export type StatusSummary = {
sessions: { sessions: {
path: string; path: string;
count: number; count: number;
recent: Array<{ defaults: { model: string | null; contextTokens: number | null };
key: string; recent: SessionStatus[];
updatedAt: number | null;
age: number | null;
}>;
}; };
}; };
@@ -35,17 +59,59 @@ export async function getStatusSummary(): Promise<StatusSummary> {
const providerSummary = await buildProviderSummary(cfg); const providerSummary = await buildProviderSummary(cfg);
const queuedSystemEvents = peekSystemEvents(); const queuedSystemEvents = peekSystemEvents();
const configModel = cfg.inbound?.reply?.agent?.model ?? DEFAULT_MODEL;
const configContextTokens =
cfg.inbound?.reply?.agent?.contextTokens ??
lookupContextTokens(configModel) ??
DEFAULT_CONTEXT_TOKENS;
const storePath = resolveStorePath(cfg.inbound?.reply?.session?.store); const storePath = resolveStorePath(cfg.inbound?.reply?.session?.store);
const store = loadSessionStore(storePath); const store = loadSessionStore(storePath);
const now = Date.now();
const sessions = Object.entries(store) const sessions = Object.entries(store)
.filter(([key]) => key !== "global" && key !== "unknown") .filter(([key]) => key !== "global" && key !== "unknown")
.map(([key, entry]) => ({ key, updatedAt: entry?.updatedAt ?? 0 })) .map(([key, entry]) => {
.sort((a, b) => b.updatedAt - a.updatedAt); const updatedAt = entry?.updatedAt ?? null;
const recent = sessions.slice(0, 5).map((s) => ({ const age = updatedAt ? now - updatedAt : null;
key: s.key, const model = entry?.model ?? configModel ?? null;
updatedAt: s.updatedAt || null, const contextTokens =
age: s.updatedAt ? Date.now() - s.updatedAt : null, entry?.contextTokens ??
})); lookupContextTokens(model) ??
configContextTokens ??
null;
const input = entry?.inputTokens ?? 0;
const output = entry?.outputTokens ?? 0;
const total = entry?.totalTokens ?? input + output;
const remaining =
contextTokens != null ? Math.max(0, contextTokens - total) : null;
const pct =
contextTokens && contextTokens > 0
? Math.min(999, Math.round((total / contextTokens) * 100))
: null;
return {
key,
kind: classifyKey(key),
sessionId: entry?.sessionId,
updatedAt,
age,
thinkingLevel: entry?.thinkingLevel,
verboseLevel: entry?.verboseLevel,
systemSent: entry?.systemSent,
abortedLastRun: entry?.abortedLastRun,
syncing: entry?.syncing,
inputTokens: entry?.inputTokens,
outputTokens: entry?.outputTokens,
totalTokens: total ?? null,
remainingTokens: remaining,
percentUsed: pct,
model,
contextTokens,
flags: buildFlags(entry),
} satisfies SessionStatus;
})
.sort((a, b) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0));
const recent = sessions.slice(0, 5);
return { return {
web: { linked, authAgeMs }, web: { linked, authAgeMs },
@@ -55,11 +121,18 @@ export async function getStatusSummary(): Promise<StatusSummary> {
sessions: { sessions: {
path: storePath, path: storePath,
count: sessions.length, count: sessions.length,
defaults: {
model: configModel ?? null,
contextTokens: configContextTokens ?? null,
},
recent, recent,
}, },
}; };
} }
const formatKTokens = (value: number) =>
`${(value / 1000).toFixed(value >= 10_000 ? 0 : 1)}k`;
const formatAge = (ms: number | null | undefined) => { const formatAge = (ms: number | null | undefined) => {
if (!ms || ms < 0) return "unknown"; if (!ms || ms < 0) return "unknown";
const minutes = Math.round(ms / 60_000); const minutes = Math.round(ms / 60_000);
@@ -71,6 +144,48 @@ const formatAge = (ms: number | null | undefined) => {
return `${days}d ago`; return `${days}d ago`;
}; };
const formatContextUsage = (
total: number | null | undefined,
contextTokens: number | null | undefined,
remaining: number | null | undefined,
pct: number | null | undefined,
) => {
const used = total ?? 0;
if (!contextTokens) {
return `tokens: ${formatKTokens(used)} used (ctx unknown)`;
}
const left = remaining ?? Math.max(0, contextTokens - used);
const pctLabel = pct != null ? `${pct}%` : "?%";
return `tokens: ${formatKTokens(used)} used, ${formatKTokens(left)} left of ${formatKTokens(contextTokens)} (${pctLabel})`;
};
const classifyKey = (key: string): SessionStatus["kind"] => {
if (key === "global") return "global";
if (key.startsWith("group:")) return "group";
if (key === "unknown") return "unknown";
return "direct";
};
const buildFlags = (entry: SessionEntry): string[] => {
const flags: string[] = [];
const think = entry?.thinkingLevel;
if (typeof think === "string" && think.length > 0)
flags.push(`think:${think}`);
const verbose = entry?.verboseLevel;
if (typeof verbose === "string" && verbose.length > 0)
flags.push(`verbose:${verbose}`);
if (entry?.systemSent) flags.push("system");
if (entry?.abortedLastRun) flags.push("aborted");
const syncing = entry?.syncing as unknown;
if (syncing === true || syncing === "on") flags.push("syncing");
else if (typeof syncing === "string" && syncing)
flags.push(`sync:${syncing}`);
const sessionId = entry?.sessionId as unknown;
if (typeof sessionId === "string" && sessionId.length > 0)
flags.push(`id:${sessionId}`);
return flags;
};
export async function statusCommand( export async function statusCommand(
opts: { json?: boolean }, opts: { json?: boolean },
runtime: RuntimeEnv, runtime: RuntimeEnv,
@@ -99,12 +214,17 @@ export async function statusCommand(
} }
runtime.log(info(`Heartbeat: ${summary.heartbeatSeconds}s`)); runtime.log(info(`Heartbeat: ${summary.heartbeatSeconds}s`));
runtime.log(info(`Session store: ${summary.sessions.path}`)); runtime.log(info(`Session store: ${summary.sessions.path}`));
const defaults = summary.sessions.defaults;
const defaultCtx = defaults.contextTokens
? ` (${formatKTokens(defaults.contextTokens)} ctx)`
: "";
runtime.log(info(`Default model: ${defaults.model ?? "unknown"}${defaultCtx}`));
runtime.log(info(`Active sessions: ${summary.sessions.count}`)); runtime.log(info(`Active sessions: ${summary.sessions.count}`));
if (summary.sessions.recent.length > 0) { if (summary.sessions.recent.length > 0) {
runtime.log("Recent sessions:"); runtime.log("Recent sessions:");
for (const r of summary.sessions.recent) { for (const r of summary.sessions.recent) {
runtime.log( runtime.log(
`- ${r.key} (${r.updatedAt ? formatAge(Date.now() - r.updatedAt) : "no activity"})`, `- ${r.key} [${r.kind}] | ${r.updatedAt ? formatAge(r.age) : "no activity"} | model ${r.model ?? "unknown"} | ${formatContextUsage(r.totalTokens, r.contextTokens, r.remainingTokens, r.percentUsed)}${r.flags.length ? ` | flags: ${r.flags.join(", ")}` : ""}`,
); );
} }
} else { } else {

View File

@@ -20,6 +20,8 @@ export type SessionEntry = {
totalTokens?: number; totalTokens?: number;
model?: string; model?: string;
contextTokens?: number; contextTokens?: number;
// Optional flag to mirror Mac app UI and future sync states.
syncing?: boolean | string;
}; };
export const SESSION_STORE_DEFAULT = path.join( export const SESSION_STORE_DEFAULT = path.join(

View File

@@ -26,7 +26,12 @@ vi.mock("../commands/status.js", () => ({
getStatusSummary: vi.fn(async () => ({ getStatusSummary: vi.fn(async () => ({
web: { linked: true, authAgeMs: 1000 }, web: { linked: true, authAgeMs: 1000 },
heartbeatSeconds: 60, heartbeatSeconds: 60,
sessions: { path: "/tmp/sessions.json", count: 1, recent: [] }, sessions: {
path: "/tmp/sessions.json",
count: 1,
defaults: { model: "claude-opus-4-5", contextTokens: 200_000 },
recent: [],
},
})), })),
})); }));

View File

@@ -9,7 +9,18 @@ vi.mock("../commands/health.js", () => ({
})); }));
vi.mock("../commands/status.js", () => ({ vi.mock("../commands/status.js", () => ({
getStatusSummary: vi.fn(async () => ({ providerSummary: "ok" })), getStatusSummary: vi.fn(async () => ({
web: { linked: true, authAgeMs: 0 },
heartbeatSeconds: 60,
providerSummary: "ok",
queuedSystemEvents: [],
sessions: {
path: "/tmp/sessions.json",
count: 0,
defaults: { model: "claude-opus-4-5", contextTokens: 200_000 },
recent: [],
},
})),
})); }));
vi.mock("../infra/heartbeat-events.js", () => ({ vi.mock("../infra/heartbeat-events.js", () => ({