Skip to content

Commit 1eeed1b

Browse files
committed
feat(es-app): show current work in session insights (anomalyco#159)
1 parent 4cce730 commit 1eeed1b

11 files changed

Lines changed: 389 additions & 1 deletion

‎packages/es-app/src/api.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,29 @@ export type SessionInsights = {
276276
error?: string
277277
}
278278

279+
export type CurrentWork = {
280+
turn: {
281+
started_at: number | null
282+
elapsed_seconds: number | null
283+
status: "busy" | "idle" | "unknown"
284+
user_messages: number | null
285+
assistant_messages: number | null
286+
tool_calls: number | null
287+
active_tools: { name: string; status: string }[]
288+
watermark: string | null
289+
}
290+
summary: {
291+
status: "ready" | "stale" | "error" | "unavailable"
292+
text: string | null
293+
generated_at: number | null // Unix seconds, unlike turn.started_at (milliseconds)
294+
watermark: string | null
295+
}
296+
}
297+
279298
export const es = {
299+
currentWork: (sessionID: string, directory: string, generate = false, signal?: AbortSignal): Promise<CurrentWork> =>
300+
fetch(`/es/api/current-work?session_id=${encodeURIComponent(sessionID)}&${q(directory)}${generate ? "&generate=true" : ""}`, { signal })
301+
.then(statusJson<CurrentWork>),
280302
sessionInsights: (sessionID: string, directory: string, signal?: AbortSignal): Promise<SessionInsights> =>
281303
fetch(`/es/api/session-insights?session_id=${encodeURIComponent(sessionID)}&${q(directory)}`, { signal })
282304
.then(statusJson<SessionInsights>),

‎packages/es-app/src/components/session-info.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { compactTokens, contextUsage, countCompletedTurns, latestCompletedTurn,
1717
import { compositionSlices, estimateComposition } from "../context-composition"
1818
import { accountingGist, CompositionBar, ProviderAccounting } from "./context-viz"
1919
import { prDetail, requestPrDetails } from "../pr-details"
20+
import { CurrentWorkView } from "../current-work"
2021

2122
const URL_RE = /https?:\/\/[^\s)\]}"'`>]+/g
2223
// #N / repo#N / owner/repo#N mentions and markdown-ish path tokens
@@ -328,6 +329,10 @@ function SessionInfoBody(props: {
328329
)}
329330
</Show>
330331

332+
<Show when={props.session?.directory}>
333+
{(directory) => <div class="info-section"><CurrentWorkView id={props.sessionID} directory={directory()} /></div>}
334+
</Show>
335+
331336
<Show when={props.session || props.messages.some((m) => m.sessionID === props.sessionID)}>
332337
<div class="info-section" data-section="context">
333338
<div class="info-heading">context</div>

‎packages/es-app/src/components/session-peek.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { compactTokens, contextUsage, usageLevel } from "../context-usage"
1212
import { compositionSlices } from "../context-composition"
1313
import { cancelInsights, providersFor, sessionInsights } from "../session-insights"
1414
import { ContextDonut, CompositionDots, ProviderAccounting } from "./context-viz"
15+
import { CurrentWorkView } from "../current-work"
1516

1617
const WIDTH = 268
1718
const GAP = 6
@@ -201,6 +202,7 @@ export function SessionPeek(props: { container: () => HTMLElement | undefined })
201202
</Show>
202203
</dl>
203204
</div>
205+
<CurrentWorkView id={r().id} directory={r().directory} compact />
204206
<div class="peek-context" classList={{ warn: usageLevel(usage()?.percent) === "warn", high: usageLevel(usage()?.percent) === "high" }}>
205207
<Show when={usage()} fallback={
206208
<span class="dim">{insights()?.loading && !insights()?.value ? "loading context…" : "latest turn context unknown"}</span>
Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
import { createEffect, createSignal, onCleanup, Show, untrack } from "solid-js"
2+
import { ApiStatusError, es, type CurrentWork } from "./api"
3+
4+
type Snapshot = { value: CurrentWork | null; checked: number; error: boolean; loading: boolean }
5+
type Entry = {
6+
state: () => Snapshot
7+
set: (value: Snapshot) => void
8+
attempted: number
9+
summaryAttempted: number
10+
summaryWatermark: string | null
11+
wantSummary: boolean
12+
pending?: Promise<void>
13+
controller?: AbortController
14+
}
15+
const entries = new Map<string, Entry>()
16+
let missingUntil = 0
17+
18+
const keyFor = (id: string, directory: string) => `${directory}\u0000${id}`
19+
const entryFor = (id: string, directory: string) => {
20+
const key = keyFor(id, directory)
21+
const cached = entries.get(key)
22+
if (cached) return cached
23+
const [state, set] = createSignal<Snapshot>({ value: null, checked: 0, error: false, loading: false })
24+
const entry: Entry = { state, set, attempted: 0, summaryAttempted: 0, summaryWatermark: null, wantSummary: false }
25+
entries.set(key, entry)
26+
// Bound cache size, while preserving the selected session on subsequent reads.
27+
if (entries.size > 100) entries.delete(entries.keys().next().value!)
28+
return entry
29+
}
30+
31+
export const currentWork = (id: string, directory: string, generate = false) => {
32+
const entry = entryFor(id, directory)
33+
const previous = entry.state()
34+
const interval = previous.error ? 30_000 : previous.value?.turn.status === "busy" || previous.value?.summary.status === "unavailable" ? 5_000 : 30_000
35+
const watermark = previous.value?.turn.watermark ?? null
36+
const ready = previous.value?.summary.status === "ready" && previous.value.summary.watermark === watermark &&
37+
Date.now() - (previous.value.summary.generated_at ?? 0) * 1000 < 300_000
38+
const requestSummary = generate && !ready && (entry.summaryWatermark !== watermark || Date.now() - entry.summaryAttempted >= 60_000)
39+
if (entry.pending) {
40+
if (requestSummary) entry.wantSummary = true
41+
return entry.state
42+
}
43+
if (Date.now() < missingUntil || (!requestSummary && Date.now() - entry.attempted < interval)) return entry.state
44+
entry.attempted = Date.now()
45+
if (requestSummary) {
46+
entry.summaryAttempted = Date.now()
47+
entry.summaryWatermark = watermark
48+
}
49+
const controller = new AbortController()
50+
entry.controller = controller
51+
entry.set({ ...previous, loading: !previous.value })
52+
entry.pending = es.currentWork(id, directory, requestSummary, controller.signal)
53+
.then((value) => {
54+
if (requestSummary && !watermark) entry.summaryWatermark = value.turn.watermark
55+
entry.set({ value, checked: Date.now(), error: false, loading: false })
56+
})
57+
.catch((error) => {
58+
if (controller.signal.aborted) return
59+
if (error instanceof ApiStatusError && error.routeMissing) missingUntil = Date.now() + 10 * 60_000
60+
entry.set({ ...entry.state(), error: true, loading: false })
61+
})
62+
.finally(() => {
63+
entry.pending = undefined
64+
entry.controller = undefined
65+
if (entry.wantSummary) {
66+
entry.wantSummary = false
67+
currentWork(id, directory, true)
68+
}
69+
})
70+
return entry.state
71+
}
72+
73+
const elapsed = (seconds: number) => seconds < 60 ? `${seconds}s` : seconds < 3600
74+
? `${Math.floor(seconds / 60)}m ${seconds % 60}s` : `${Math.floor(seconds / 3600)}h ${Math.floor(seconds % 3600 / 60)}m`
75+
76+
export function CurrentWorkView(props: { id: string; directory: string; compact?: boolean }) {
77+
const [now, setNow] = createSignal(Date.now())
78+
const [snapshot, setSnapshot] = createSignal<Snapshot>({ value: null, checked: 0, error: false, loading: true })
79+
createEffect(() => {
80+
const id = props.id
81+
const directory = props.directory
82+
if (!id || !directory) return
83+
setSnapshot({ value: null, checked: 0, error: false, loading: true })
84+
const refresh = () => {
85+
const state = currentWork(id, directory)
86+
setSnapshot(state())
87+
}
88+
untrack(refresh)
89+
const timer = setInterval(() => { setNow(Date.now()); refresh() }, 5_000)
90+
const state = entryFor(id, directory).state
91+
// Solid tracks the shared signal; concurrent hover/panel reads use one request.
92+
createEffect(() => setSnapshot(state()))
93+
onCleanup(() => clearInterval(timer))
94+
})
95+
const value = () => snapshot().value
96+
const summary = () => value()?.summary
97+
const age = () => summary()?.generated_at != null ? elapsed(Math.max(0, Math.floor(now() / 1000) - summary()!.generated_at!)) : null
98+
return <section class={props.compact ? "current-work compact" : "current-work"} data-section="current-work">
99+
<div class={props.compact ? "ctx-subheading" : "info-heading"}>current turn</div>
100+
<Show when={value()} fallback={<div class="ctx-caption">{snapshot().loading ? "checking current turn…" : snapshot().error ? "current turn unavailable" : "current turn unknown"}</div>}>
101+
{(work) => <>
102+
<div class="current-work-line">{work().turn.status}{work().turn.elapsed_seconds != null ? ` · ${elapsed(work().turn.elapsed_seconds!)} elapsed` : " · elapsed unknown"}{snapshot().error ? " · refresh failed" : ""}</div>
103+
<Show when={work().turn.started_at != null}>
104+
<div class="current-work-line">started {new Date(work().turn.started_at!).toLocaleString()}</div>
105+
</Show>
106+
<div class="current-work-line mono">{work().turn.user_messages ?? "?"} user · {work().turn.assistant_messages ?? "?"} assistant · {work().turn.tool_calls ?? "?"} tools</div>
107+
<Show when={work().turn.active_tools.length}><div class="current-work-tools">{work().turn.active_tools.map((tool) => `${tool.name} (${tool.status})`).join(", ")}</div></Show>
108+
<div class="ctx-caption" data-summary-status={summary()?.status}>
109+
summary {summary()?.status ?? "unavailable"}{age() ? ` · ${age()} old` : ""}
110+
<Show when={summary()?.text && (summary()?.status === "ready" || summary()?.status === "stale")}>: {summary()?.text}</Show>
111+
</div>
112+
<Show when={summary()?.status !== "ready"}>
113+
<button type="button" class="current-work-generate" onClick={() => currentWork(props.id, props.directory, true)}>Generate summary</button>
114+
</Show>
115+
<Show when={snapshot().error || now() - snapshot().checked > (work().turn.status === "busy" ? 15_000 : 45_000)}>
116+
<div class="ctx-caption">telemetry last checked {elapsed(Math.max(0, Math.floor((now() - snapshot().checked) / 1000)))} ago</div>
117+
</Show>
118+
</>}
119+
</Show>
120+
</section>
121+
}

‎packages/es-app/src/index.css‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,8 @@ main { max-width: 1400px; margin: 0 auto; padding: 0 20px 40px; }
465465
* the gap without the card vanishing */
466466
.session-peek {
467467
position: fixed;
468+
max-height: calc(100dvh - 12px);
469+
overflow-y: auto;
468470
z-index: 60;
469471
box-sizing: border-box;
470472
background: var(--crust);
@@ -495,6 +497,11 @@ main { max-width: 1400px; margin: 0 auto; padding: 0 20px 40px; }
495497
.peek-context.warn .mono { color: var(--yellow); }
496498
.peek-context.high .mono { color: var(--red); }
497499
.peek-degraded { color: var(--peach); }
500+
.current-work { min-width: 0; overflow-wrap: anywhere; }
501+
.current-work.compact { padding: 7px 0; border-block: 1px solid var(--border); }
502+
.current-work-line, .current-work-tools { font-size: 11px; line-height: 1.5; }
503+
.current-work .ctx-caption { margin-top: 3px; }
504+
.current-work-generate { color: var(--lavender); font-size: 11px; text-align: start; padding: 2px 0; }
498505

499506
/* context ring: exact usage arc; segments show relative visible estimates only */
500507
.ctx-donut { position: relative; display: inline-grid; place-items: center; flex-shrink: 0; }

‎packages/es-app/test/composer-fixture.mjs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ export const createFixture = async () => {
104104
directory: url.searchParams.get("directory"),
105105
es: url.searchParams.get("es"),
106106
limit: url.searchParams.get("limit"),
107+
generate: url.searchParams.get("generate"),
107108
body,
108109
})
109110
const json = (value, status = 200) => {
@@ -194,6 +195,11 @@ export const createFixture = async () => {
194195
if (fixture.insightDelayMs) return void setTimeout(send, fixture.insightDelayMs)
195196
return send()
196197
}
198+
if (url.pathname === "/api/current-work") {
199+
if (!fixture.currentWork) return json({ detail: "Not Found" }, 404)
200+
const reply = await fixture.currentWork(url.searchParams.get("session_id"), url.searchParams.get("directory"), url.searchParams.get("generate"))
201+
return reply?.status ? json(reply.body ?? {}, reply.status) : json(reply)
202+
}
197203
if (url.pathname === "/api/pr-detail") {
198204
if (!fixture.prDetails) return json({ detail: "Not Found" }, 404)
199205
const reply = fixture.prDetails(url.searchParams.get("url"))
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
import { createRequire } from "node:module"
2+
import { mkdtemp, rm } from "node:fs/promises"
3+
import { tmpdir } from "node:os"
4+
import path from "node:path"
5+
import assert from "node:assert/strict"
6+
import { startPanelPreview } from "./composer-panel-preview.mjs"
7+
import { directory } from "./composer-fixture.mjs"
8+
9+
const { chromium, _electron, expect } = createRequire(new URL("../../app/package.json", import.meta.url))("@playwright/test")
10+
const backend = "http://127.0.0.1:7794"
11+
const count = async () => (await (await fetch(`${backend}/fixture-count`)).json()).provider_attempts
12+
assert.equal(await count(), 0, "Disposable backend fixture must be reset before this smoke")
13+
const preview = await startPanelPreview()
14+
preview.fixture.currentWork = async (id, dir, generate) => {
15+
assert.equal(id, "ses_a")
16+
assert.equal(dir, directory)
17+
const response = await fetch(`${backend}/api/current-work?${new URLSearchParams({ session_id: id, directory: dir, ...(generate === "true" ? { generate } : {}) })}`)
18+
assert.equal(response.status, 200)
19+
return response.json()
20+
}
21+
const profile = process.env.ES_DESKTOP_EXECUTABLE ? await mkdtemp(path.join(tmpdir(), "current-work-live-intent-")) : undefined
22+
const app = profile ? await _electron.launch({ executablePath: process.env.ES_DESKTOP_EXECUTABLE,
23+
env: { ...process.env, ELECTRON_RUN_AS_NODE: "", ES_DESKTOP_USER_DATA: profile, ES_DESKTOP_RENDERER: "",
24+
OPENCODE_URL: preview.fixture.url, ES_DASHBOARD_URL: preview.fixture.url, OPENCODE_SERVER_PASSWORD: "" },
25+
}) : undefined
26+
const browser = app ? undefined : await chromium.launch({ channel: "chrome", headless: true })
27+
const page = app ? await app.firstWindow() : await browser.newPage({ viewport: { width: 1440, height: 900 } })
28+
if (app) {
29+
await page.waitForURL("http://127.0.0.1:*/")
30+
preview.origin = new URL(page.url()).origin
31+
preview.url = `${preview.origin}/session/ses_a?directory=${encodeURIComponent(directory)}`
32+
}
33+
await page.context().route("**/*", route => new URL(route.request().url()).origin === preview.origin ? route.continue() : route.abort())
34+
try {
35+
await page.goto(preview.url)
36+
const panel = page.locator(".session-info [data-section='current-work']")
37+
await expect(panel).toContainText("1 user · 1 assistant · 1 tools")
38+
await expect(panel.locator("[data-summary-status='unavailable']")).toBeVisible()
39+
assert.equal(await count(), 0)
40+
assert.deepEqual(preview.fixture.calls.filter(call => call.path === "/api/current-work").map(call => call.generate), [null])
41+
await page.reload()
42+
await expect(panel.locator("[data-summary-status='unavailable']")).toBeVisible()
43+
assert.equal(await count(), 0)
44+
await page.locator(".session-entry[data-peek-id='ses_a']").hover()
45+
await expect(page.locator(".session-peek [data-summary-status='unavailable']")).toBeVisible()
46+
assert.equal(await count(), 0)
47+
await page.locator(".session-peek .current-work-generate").click()
48+
await expect(page.locator(".session-peek [data-summary-status='ready']")).toContainText("summary ready", { timeout: 15_000 })
49+
assert.equal(await count(), 1)
50+
assert.equal(preview.fixture.calls.filter(call => call.path === "/api/current-work" && call.generate === "true").length, 1)
51+
await page.mouse.move(700, 600)
52+
await page.locator(".session-entry[data-peek-id='ses_a']").hover()
53+
await expect(page.locator(".session-peek [data-summary-status='ready']")).toBeVisible()
54+
assert.equal(await count(), 1)
55+
assert.deepEqual(preview.fixture.calls.filter(call => !["GET", "HEAD", "OPTIONS"].includes(call.method)), [])
56+
console.log(`PASS combined passive/intent ${app ? "native" : "browser"}: backend fixture passive0, explicit generate1, cached ready, zero writes`)
57+
} finally {
58+
await app?.close()
59+
await browser?.close()
60+
await preview.close()
61+
if (profile) await rm(profile, { recursive: true, force: true })
62+
}
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
import { createRequire } from "node:module"
2+
import { mkdtemp, rm } from "node:fs/promises"
3+
import { tmpdir } from "node:os"
4+
import path from "node:path"
5+
import assert from "node:assert/strict"
6+
import { startPanelPreview } from "./composer-panel-preview.mjs"
7+
import { directory } from "./composer-fixture.mjs"
8+
9+
const { chromium, _electron, expect } = createRequire(new URL("../../app/package.json", import.meta.url))("@playwright/test")
10+
const preview = await startPanelPreview()
11+
let attempts = 0
12+
preview.fixture.currentWork = (id, dir, generate) => {
13+
assert.equal(id, "ses_a")
14+
assert.equal(dir, directory)
15+
if (generate === "true") attempts++
16+
return {
17+
turn: { started_at: Date.now() - 80_000, elapsed_seconds: 80, status: "busy", user_messages: 1,
18+
assistant_messages: 1, tool_calls: 1, active_tools: [{ name: "bash", status: "running" }], watermark: "fixture-a" },
19+
summary: { status: generate === "true" ? "ready" : "unavailable", text: generate === "true" ? "Checking fixture." : null,
20+
generated_at: generate === "true" ? Math.floor(Date.now() / 1000) : null, watermark: generate === "true" ? "fixture-a" : null },
21+
}
22+
}
23+
const profile = process.env.ES_DESKTOP_EXECUTABLE ? await mkdtemp(path.join(tmpdir(), "current-work-intent-")) : undefined
24+
const app = profile ? await _electron.launch({ executablePath: process.env.ES_DESKTOP_EXECUTABLE,
25+
env: { ...process.env, ELECTRON_RUN_AS_NODE: "", ES_DESKTOP_USER_DATA: profile, ES_DESKTOP_RENDERER: "",
26+
OPENCODE_URL: preview.fixture.url, ES_DASHBOARD_URL: preview.fixture.url, OPENCODE_SERVER_PASSWORD: "" },
27+
}) : undefined
28+
const browser = app ? undefined : await chromium.launch({ channel: "chrome", headless: true })
29+
const page = app ? await app.firstWindow() : await browser.newPage({ viewport: { width: 1440, height: 900 } })
30+
if (app) {
31+
await page.waitForURL("http://127.0.0.1:*/")
32+
preview.origin = new URL(page.url()).origin
33+
preview.url = `${preview.origin}/session/ses_a?directory=${encodeURIComponent(directory)}`
34+
}
35+
await page.context().route("**/*", route => new URL(route.request().url()).origin === preview.origin ? route.continue() : route.abort())
36+
try {
37+
await page.goto(preview.url)
38+
const panel = page.locator(".session-info [data-section='current-work']")
39+
await expect(panel).toContainText("1 user · 1 assistant · 1 tools")
40+
await expect(panel.locator("[data-summary-status='unavailable']")).toBeVisible()
41+
const calls = () => preview.fixture.calls.filter(call => call.path === "/api/current-work")
42+
assert.equal(calls().length, 1)
43+
assert.equal(calls()[0].generate, null)
44+
assert.equal(attempts, 0)
45+
await page.reload()
46+
await expect(panel.locator("[data-summary-status='unavailable']")).toBeVisible()
47+
assert.equal(attempts, 0) // passive native/session reload cannot invoke the model
48+
await page.locator(".session-entry[data-peek-id='ses_a']").hover()
49+
await expect(page.locator(".session-peek [data-summary-status='unavailable']")).toBeVisible()
50+
assert.equal(attempts, 0)
51+
await page.locator(".session-peek .current-work-generate").click()
52+
await expect(page.locator(".session-peek [data-summary-status='ready']")).toContainText("Checking fixture.")
53+
assert.equal(attempts, 1)
54+
assert.equal(calls().filter(call => call.generate === "true").length, 1)
55+
await page.mouse.move(700, 600)
56+
await page.locator(".session-entry[data-peek-id='ses_a']").hover()
57+
await expect(page.locator(".session-peek [data-summary-status='ready']")).toBeVisible()
58+
assert.equal(attempts, 1) // repeated hover shares the ready watermark
59+
assert.deepEqual(preview.fixture.calls.filter(call => !["GET", "HEAD", "OPTIONS"].includes(call.method)), [])
60+
console.log(`PASS current work intent ${app ? "native" : "browser"}: passive panel/reload/hover no inference, explicit generate once, zero writes`)
61+
} finally {
62+
await app?.close()
63+
await browser?.close()
64+
await preview.close()
65+
if (profile) await rm(profile, { recursive: true, force: true })
66+
}

0 commit comments

Comments
 (0)