@contraagent/ui 0.8.0 → 0.9.0

package/src/elements/task/header.ts

@@ -8,7 +8,7 @@ import { pill } from '@contraagent/elements/primitives';
 import { facts, fmtDur, kindUnit, listText, localTime, tokenCount, unreadEvents, usageUnknown, usageUnknownWords, usd } from '../../words/format.js';
 import { attemptNames, deferredText, changedFiles, changedFilesTip, changeLabel, credentialLabel, credentialTip, locksLabel, locksTip, modelSwitch, outcomeLabel, priorityText, priorityTip, replayedLabel, replayedTip, stopLabel, workingDirectoryText, workingDirectoryTip, type ChangeKind } from '../../words/index.js';
 import { contextWarnedText, contextWarnedTip, peakContextLine, peakContextTip, peakTry } from '../../words/context.js';
-import { readingShort, readingTip } from '../../words/quota.js';
+import { readingChange, readingShort, readingTip } from '../../words/quota.js';
 import { safetyStopCount, safetyStopLine, safetyStopTip } from '../../words/safety.js';
 import { customColumnTip, customValues } from '../../words/row-extras.js';
 import { divergenceTip, divergenceWord, rerunLine, rerunOf } from '../../words/rerun.js';
@@ -92,7 +92,7 @@ function verdict(c: TaskContext): [text: string, tone: Tone] {
 }
 
 /** The model of the latest round, as its launch named it (`--model`). */
-function streamModel(c: TaskContext): string {
+function streamModel(c: Pick<TaskContext, 'launches'>): string {
   for (let i = c.launches.length - 1; i >= 0; i--) {
     const l = c.launches[i];
     const m = l ? launchWho(l).model : '';
@@ -105,6 +105,19 @@ function streamModel(c: TaskContext): string {
  * The header of task `key`. `onSearch(query, nth)` is called when the reader
  * picks one of its web searches (the nth with that query).
  */
+/** Who ran the task, as its header names it: the running session's agent, model and role, else the latest attempt's. */
+export function taskWho(c: Pick<TaskContext, 'detail' | 'launches'>): Who {
+  const { rows, launches } = c.detail;
+  const lastRow = rows.slice().sort((a, b) => String(a.ts).localeCompare(String(b.ts)))[rows.length - 1];
+  const lc0 = launches[0];
+  return {
+    agent: agentLabel(lc0?.cmd ? lc0.cmd.split(' ')[0] : lastRow?.agent),
+    // The journal may not name the model (an agent that does not report it): fall back to the one the transcript shows.
+    model: lc0?.model || lastRow?.model || streamModel(c),
+    role: lc0?.role || '',
+  };
+}
+
 export function taskHeader(c: TaskContext, key: string, onSearch: (query: string, nth: number) => void): TemplateResult {
   const d = c.detail;
   const live = c.live;
@@ -112,14 +125,7 @@ export function taskHeader(c: TaskContext, key: string, onSearch: (query: string
   const py = isPy(d);
   const session = hadSession(d);
   const byTs = rows.slice().sort((a, b) => String(a.ts).localeCompare(String(b.ts)));
-  const lastRow = byTs[byTs.length - 1];
-  const lc0 = launches[0];
-  const who: Who = {
-    agent: agentLabel(lc0?.cmd ? lc0.cmd.split(' ')[0] : lastRow?.agent),
-    // The journal may not name the model (an agent that does not report it): fall back to the one the transcript shows.
-    model: lc0?.model || lastRow?.model || streamModel(c),
-    role: lc0?.role || '',
-  };
+  const who = taskWho(c);
   const otherModels = session ? [...new Set(byTs.map((r) => r.model).filter((x): x is string => !!x && x !== who.model))] : [];
   const first = rows[0];
   const tries = rows.filter(isLaunched);
@@ -168,7 +174,7 @@ export function taskHeader(c: TaskContext, key: string, onSearch: (query: string
       ${changesFold(tries)}
       ${safetyFold(tries)}
       ${unreadEvents(tries)
-        ? html`<div class="meta unread" title=${msg('Event types this contraagent version does not know (unread_events)')}>
+        ? html`<div class="meta unread" title=${msg('Events this contraagent version could not read (unread_events)')}>
             <span aria-hidden="true">⚠</span> ${msg(str`Unrecognized events: ${unreadEvents(tries)}`)}
           </div>`
         : nothing}
@@ -285,10 +291,14 @@ function quotaLine(c: TaskContext, tries: JournalRow[]) {
   const start = first ? tryQuota(first, readings).start : null;
   if (!start || !last) return nothing;
   const next = tryQuota(last, readings).next;
-  // The identity chip names the account; both readings are that account's.
+  // The identity chip names the account; both readings are that account's. One line: each window from the first reading to the next.
+  const tip = [
+    msg(str`Usage at session start: ${readingShort(start)}`),
+    readingTip(start),
+    ...(next ? ['', msg(str`Usage after this task: ${readingShort(next)}`), readingTip(next)] : []),
+  ].join('\n');
   return html`<div class="spend quota">
-    <span title=${readingTip(start)}>${msg(str`Usage at session start: ${readingShort(start)}`)}</span>
-    ${next ? html`<span title=${readingTip(next)}>${msg(str`Usage after this task: ${readingShort(next)}`)}</span>` : nothing}
+    <span title=${tip}>${msg(str`Usage: ${readingChange(start, next)}`)}</span>
   </div>`;
 }
 

package/src/elements/task/panes/io.ts

@@ -1,6 +1,6 @@
 // The input and output panes of `ca-task-view`: what the task read (parameters,
 // files, earlier tasks, the prompt) and what it wrote (files against their
-// contracts, the outcome, tokens and cost, later tasks).
+// contracts, tokens and cost, later tasks).
 import {
   isLaunched,
   isPython,
@@ -19,10 +19,10 @@ import { msg, str } from '@lit/localize';
 import { html, nothing, type TemplateResult } from 'lit';
 import { pill } from '@contraagent/elements/primitives';
 import '@contraagent/elements/json-tree/define';
-import { facts, fmtDur, kindUnit, tokenCount, usd } from '../../../words/format.js';
+import { facts, kindUnit, tokenCount, usd } from '../../../words/format.js';
 import { attemptLabel, attemptNames, credentialLabel, credentialTip, outcomeLabel, stopLabel } from '../../../words/index.js';
 import { accountReading, readingShort, readingTip } from '../../../words/quota.js';
-import { outcomeMark, outcomeTone, stopTone } from '../../../lib/tone.js';
+import { outcomeMark, outcomeTone } from '../../../lib/tone.js';
 import { executorIcon } from '../../../words/executor.js';
 import { promptText } from '../../shared/prompt-text.js';
 import { contractChip } from '../../shared/contract-parts.js';
@@ -31,7 +31,7 @@ import { taskChip } from '../../shared/task-chip.js';
 import { inputView, notPassed, type EarlierTask, type InputFile } from '../inputs.js';
 import { roundLabel, roundWhy } from '../../../words/rounds.js';
 import { inputFileCheckWord, inputRootPath, inputRootTip, lineageTip, lineageWord } from '../../../words/lineage.js';
-import { correctionsOf, hadSession, isPy, producerOf, stateOf, taskLink, type TaskContext } from '../context.js';
+import { hadSession, isPy, producerOf, stateOf, taskLink, type TaskContext } from '../context.js';
 
 const valueText = (v: unknown): string => (typeof v === 'string' ? v : JSON.stringify(v) ?? String(v));
 const sameJson = (a: unknown, b: unknown): boolean => {
@@ -56,6 +56,8 @@ export function inputPane(c: TaskContext): TemplateResult {
   const params = Object.entries(io.params);
   const { files, earlier } = inputView(io);
   const source = (v: unknown) => io.upstream.find((u) => u.outputs.some((o) => o.file.exists && sameJson(o.file.content, v)));
+  // An earlier task a parameter names ("From prepare · a") is given its output there: its row below does not say it again.
+  const givenAbove = new Set(params.map(([, v]) => source(v)?.key).filter((k): k is string => !!k));
   return html`<h4 class="sect-h">${msg('Parameters')}</h4>
     ${params.length
       ? html`<table class="ct-fields params">
@@ -76,7 +78,7 @@ export function inputPane(c: TaskContext): TemplateResult {
           ${files.map((f) => inputCard(c, f))}`
       : nothing}
     <h4 class="sect-h">${msg('Earlier tasks')}</h4>
-    ${earlier.length ? earlier.map((e) => earlierTask(c, e)) : html`<div class="meta">${msg('No earlier tasks')}</div>`}
+    ${earlier.length ? earlier.map((e) => earlierTask(c, e, givenAbove.has(e.task.key))) : html`<div class="meta">${msg('No earlier tasks')}</div>`}
     ${isPy(d) ? nothing : promptSection(c)}`;
 }
 
@@ -120,9 +122,10 @@ function inputCard(c: TaskContext, f: InputFile) {
 /**
  * One earlier task: its status, how this task is joined to it (its lineage, in the words of
  * the graph's edges), how many of its output files this task reads, and the others folded
- * under it (open when one did not pass).
+ * under it (open when one did not pass). `givenAbove`: a parameter's "From" names it,
+ * so its lineage leaves out "given output" and keeps the rest.
  */
-function earlierTask(c: TaskContext, e: EarlierTask) {
+function earlierTask(c: TaskContext, e: EarlierTask, givenAbove: boolean) {
   const u = e.task;
   const kindName = isPython(u) ? msg('Python task') : msg('Agent task');
   const state = c.outcomes.get(u.key)?.outcome;
@@ -134,7 +137,7 @@ function earlierTask(c: TaskContext, e: EarlierTask) {
     ${executorIcon(isPython(u), kindName)}
     ${taskLink(c, u)}
     ${state ? outcomeChip(state) : nothing}
-    ${lineageTags(u.lineage ?? [])}
+    ${lineageTags((u.lineage ?? []).filter((l) => !(givenAbove && l === 'given_from')))}
     <span class="meta">${summary}</span>
   </div>`;
   if (!e.rest.length) return html`<div class="upstream">${head}</div>`;
@@ -214,24 +217,14 @@ function usageTable(c: TaskContext, rows: JournalRow[]) {
     </table></div>`;
 }
 
-/** What the task wrote: its output files, its outcome, tokens and cost, and the later tasks. */
+/** What the task wrote: its output files, tokens and cost, and the later tasks. */
 export function outputPane(c: TaskContext): TemplateResult {
   const d = c.detail;
   const io = d.io;
-  const last = d.rows[d.rows.length - 1];
-  // The reason, a refusal's cause and a model switch are in the verdict above, so they are not repeated here.
-  return html`<h4 class="sect-h">${msg('Output files')}</h4>
-    ${io.outputs.length
+  // The header above names the attempts and how each ended, and the tab names the files: the pane starts with them.
+  return html`${io.outputs.length
       ? io.outputs.map((o) => ioFileCard(o, 'output', c.run, { producerOf: producerOf(c) }))
       : html`<div class="meta">${msg('No output files')}</div>`}
-    ${last
-      ? html`<h4 class="sect-h">${msg('Outcome')}</h4>
-          <div class="ct-in">
-            ${pill({ text: stopLabel(last.stop, last.reason), tone: stopTone(last.stop) })}
-            ${isLaunched(last) ? html`<span class="meta">${facts(attemptLabel(last.attempt), fmtDur(last.wall_s), correctionsOf(last))}</span>` : nothing}
-
-          </div>`
-      : nothing}
     ${usageTable(c, d.rows)}
     <h4 class="sect-h">${msg('Later tasks')}</h4>
     ${io.downstream.length ? laterTasks(c, io.downstream) : html`<div class="meta">${msg('No later tasks')}</div>`}`;

package/src/elements/trends/ca-trends.ts

@@ -150,7 +150,8 @@ export class CaTrends extends LitElement {
   /** The period, its time zone and the run group: links of the page's address. */
   private controls() {
     const data = this.view?.data;
-    const period = data ? html`<span class="period">${periodLabel(data.period.from, data.period.to, data.period.tz)}</span>` : nothing;
+    // The time zone control names the zone; an export has none, so its period names it.
+    const period = data ? html`<span class="period">${periodLabel(data.period.from, data.period.to, this.exported ? data.period.tz : '')}</span>` : nothing;
     if (this.exported) return html`<div class="controls"><span class="meta">${exportedPeriod()}</span>${period}</div>`;
     const choice = this.days ? String(this.days) : 'dates';
     const today = data?.period.to || new Date().toISOString().slice(0, 10);

package/src/locales/ja.ts

@@ -52,7 +52,6 @@
 's051e95917479e3a4': `実行中のエージェントのセッション`,
 's05548eaadd7b3e53': `選択中の項目`,
 's05fd532bd52adeae': `認証エラー`,
-'s061a40d8b1403d96': `OutputContract`,
 's0622a6e6cb77254b': `トランスクリプト`,
 's0668067982f84dcb': `ユニットごとのステージとステップ（CursorStore）`,
 's066d70cf9d5e2915': `出力`,
@@ -108,19 +107,17 @@
 's168ae294e3e72ce4': `検証のタイミング`,
 's1703f5cfa8ed0cc9': str`実行されず ${0} 件`,
 's1725258e65a9f38f': str`同じフローの実行 ${0} から見込んだ、この実行がまだ作成していないタスク（forecast）`,
-'s179ba9809bdf35c7': `アカウントごと、最初の値 → 最後の値`,
 's17d7937260be87a6': `利用率のルール`,
 's17ee023c53dcd83c': `書き込み待ち（タスクが待機中）`,
 's18d4d02c2e47cf0f': str`ループ内の ${0}`,
 's19785bbda7e548bc': `利用できるモデルなし`,
 's19ed92a422ad7e4c': `上限: max_concurrent`,
 's1a20210c3f1e40c9': str`スキップ ${0} 件`,
+'s1a2c5a8f76ad9fe3': str`5 時間枠 ${0} → ${1}`,
 's1a3bf4da26280428': `種別 · ユニット`,
 's1a4311a6ff81c6ec': `モデルごとの、エージェントのセッションの使用量。モデル切り替えの前後は別々に集計（Plan.models）`,
 's1ac8c23d19212c8a': `エディタのテーマ`,
-'s1acc85c236fed879': `書き込まれていない出力 1 件（タスクが未実行）`,
 's1b20c3bebd6687ca': str`種別 ${0}`,
-'s1bb7c4234aa7d213': `すべてのタスクが開始済み`,
 's1bf54dcd1c885a20': `実行中のプロセスなし`,
 's1c0f7e3a9a6bce79': `パラメータ`,
 's1c2af4de03b03b48': `タスクが選択されていません`,
@@ -134,7 +131,6 @@
 's1e9a9d076c64051d': str`プロンプト（${0} 文字、ほか ${1} 文字は未保存）`,
 's1ebbae8f5810b65b': `入力`,
 's1f25e1e20469a9ea': `削除`,
-'s1f53dce0721a5fdc': str`所要時間 ${0}`,
 's2043c2041d0a5142': `安全分類器による停止`,
 's20e04bdc808a6442': str`リセットまで ${0}`,
 's20f936012bd51f12': `依存先タスクが実行されなかった`,
@@ -149,7 +145,6 @@
 's23ba00b0f333e17e': str`${0} 回の試行がすべて失敗: ${1}`,
 's23f40d3ffdd352a6': `定義はまだありません`,
 's2413de2aeb2cad27': str`完了 ${0}`,
-'s2575361362fcf642': `OutputContract・InputContract を宣言したタスクはありません`,
 's25f66969239538c1': str`まだ登録されていない種別: ${0}`,
 's26012de2ae38a284': `API 呼び出し 1 回`,
 's26bae2d058ab07f8': `ユニットなし`,
@@ -160,7 +155,7 @@
 's27d5ef7cf527424b': `フローの構成`,
 's28a2fc439aac9783': `リプレイ`,
 's28add9c74fb1b7ef': `曜日と時刻ごと（期間のタイムゾーン）`,
-'s28f91da403800c05': `InputContract`,
+'s29b5ddbe5c1003ee': str`${1} タスク中 ${0} 件`,
 's29b6d46649a71377': str`最大コンテキスト: ${0}`,
 's2a2e8a5afcc8d89a': `現在`,
 's2c0c7686db4c5c18': str`パラメータ ${0}`,
@@ -173,7 +168,6 @@
 's2e422519ed38f7d8': `周`,
 's2f3435308f48080e': str`${0} 周`,
 's2f3c9db4daa3e192': `問題なし`,
-'s2f4e0fd086ad4b96': `すべての出力`,
 's2f54740b39931f87': `定義なし`,
 's2faec8a0d7db08dd': str`5 時間枠の利用率 ${0}（リセット ${1}）`,
 's2fe3f0ef38a252c7': `ツール`,
@@ -200,6 +194,7 @@
 's3786b7768c22d7fd': `検証エラーの後に、同じエージェントのセッションで続けるラウンド（rounds）`,
 's37da018e1fe6a0d7': `スキーマ以外の検証（validators）`,
 's3841eba6a1c038af': str`${0} を展開`,
+'s3850065925d06b86': `各タスクが読み込むファイル（InputContract）`,
 's3850111242895c2f': str`修正ラウンド ${0}`,
 's387a4a41718122cb': str`検索結果 ${0} 件`,
 's38e65cca012f316f': `修正依頼のプロンプトに含めて送信`,
@@ -209,6 +204,7 @@
 's3a72e9d65b4a1ccb': str`上限: ${0}`,
 's3aa67b8233b5ecd0': `出力ファイルなし`,
 's3b32dd23d086c992': `プロセスツリー`,
+'s3b8db9525c909688': `アカウント全体の値 | アカウントごとの最初と最後の値 | エージェントのセッション開始時に取得`,
 's3b9cab5f0aaad29d': str`${0} にモニター API がありません: ${1}`,
 's3bde79a5267baa21': str`task_detail コールバックが失敗: ${0}`,
 's3c6c1ae328e812d5': `実行した試行の回数`,
@@ -220,10 +216,10 @@
 's3d99e317c3b7b422': `検証エラー後の、同じエージェントのセッション`,
 's3d9b2f1277134dfc': `テキストファイル`,
 's3dd137f6b70ab45f': `ネットワークエラーで応答なし`,
-'s3f18b1a78ce1a960': `各タスクが書き込むファイル`,
 's3f7074a6bbbd7726': `修正依頼`,
 's3fd6bd99e3f6a5be': `開始`,
 's3fda7269dc9d47ba': `このタスクの出力が後続タスクのパラメータに含まれる（given_from）`,
+'s3ffb8ae91df75075': str`認証情報: ${0}`,
 's40750d44c5ea3271': str`${0}: 入力`,
 's4085b471de2e2215': `週の利用率`,
 's4134711b0b981089': `Tab: 次のノード`,
@@ -235,7 +231,6 @@
 's451bb7dd42aaf221': `料金の高いタスク`,
 's454c0dcbb0dffc2f': str`${0} のループの各周`,
 's45de7528c20a0792': str`${0}（カスタムビュー）`,
-'s46694c626352a2a7': `モデル切り替えのあったタスク 1 件`,
 's467ceab5071e77a3': str`1 周: ${0}`,
 's473bad4c26a1a663': `キャッシュ読み込み`,
 's478b912874fef59f': `検証対象のファイル（OutputContract、InputContract）`,
@@ -270,13 +265,12 @@
 's525b03a82e5421df': `失敗の後の、次のモデルでの新しいエージェントのセッション（Router のホップ）`,
 's525c011dcf23c207': `記録から再生した試行（replayed）`,
 's529efbcb1a0cf166': str`上限 ${0}`,
-'s52bd9d64b4c399df': `このバージョンの contraagent が対応していないイベント種別（unread_events）`,
-'s52c75c50315f2111': `次の周`,
 's52cce0c30a5db40c': str`${0} の締め切りと仕上げの猶予を過ぎた`,
 's52cfd5bdf53cbac3': `カスタムビュー`,
 's535a5e9dfeb308f0': `種別`,
 's53c57cf5a0992de1': str`${0}: 未実行`,
 's53c8c76220414382': `不可`,
+'s53ebfdf5583cbe71': `次の周`,
 's5410888308ba73df': `開始できず`,
 's54393bfa280ea55b': `プロンプト`,
 's552240946fb80e49': str`フロー呼び出し ${0}`,
@@ -310,6 +304,7 @@
 's5cfa1889ee16f534': `値なし`,
 's5d0bd939d106436c': `実行中にこのタスクが占有する名前（claims）`,
 's5d4b0dd369b6083e': str`${0} 回目で完了 | 失敗 ${1} 回`,
+'s5d51d4e0b343cf54': str`利用率: ${0}`,
 's5da52af9b083c29a': `モデル`,
 's5de9d2dc62f214f9': `依存先タスク`,
 's5e30a7b87ccdc74f': `書き込みなし（タスクが未実行）`,
@@ -325,6 +320,7 @@
 's60147fb4fa4a8e0c': `実行中`,
 's605757aea05668c5': str`未実行の後続タスク ${0} 件`,
 's62035be5de828c62': `キャッシュ書き込み`,
+'s620484486a1868e2': str`このバージョンの contraagent が読めなかったイベント（unread_events）: ${0}`,
 's629576c6b305d539': `任意`,
 's647582a62a567663': `応答が JSON ではなく HTML`,
 's649816288746372b': `後続タスク`,
@@ -389,7 +385,6 @@
 's79a4abd140c07a19': str`未対応のイベント: ${0}`,
 's79faeb77f29174c8': str`5 時間枠の利用率 ${0}`,
 's7a14301773287a5c': `エラーで終了したフロー呼び出し 1 件`,
-'s7a30a0774744040b': `出力ファイル`,
 's7a4c9d94aaf75c45': `権限エラー`,
 's7b16665b242b03f9': `入力ファイルなし`,
 's7b1cef9707986270': `修正依頼のあった試行`,
@@ -407,8 +402,8 @@
 's803ce7e1a2294d50': `ファイル`,
 's8076e2fb2b749dd1': `実行 1 件`,
 's80c0e9fb2bb2e230': `1 行`,
-'s8162d2730a5efc31': `モデル切り替えなし`,
 's81729579ad44c896': `変更したファイル 1 件`,
+'s81a4ee43fe0936ee': `各タスクが書き込むファイル（OutputContract）`,
 's822f38a61c9dbabc': str`以前の試行のモデル: ${0}`,
 's826d5aa7edf4f1db': `エージェントのセッションが使ったモデル`,
 's8273cf03c84a59ef': `認証情報が休止中`,
@@ -464,7 +459,6 @@
 's90e8d2050eab6478': `ほかの種別が実装する種別（base_kind）`,
 's90f3ce6dfe4ed0ce': `認証エラー`,
 's9147091d090a92d4': str`最大 ${0} 周`,
-'s915525f01e5ebdb9': str`モデル ${0} 種類`,
 's919d209719302bd3': str`${0}d ${1}h`,
 's91d2138e1db80125': `順序のみの依存先`,
 's9246c889a0392130': str`モデル ${0}`,
@@ -489,7 +483,6 @@
 's98b1cb8fb62909ec': `グループ`,
 's98fc8cf0000154d3': `入力ファイルなし`,
 's9976b5befb314c64': str`${0} 日間`,
-'s9a23fee499e1a22d': `すべてのプロセス`,
 's9a44f95f7acf28e0': str`失敗: ${0}`,
 's9a629cca97d7a771': str`Web 検索 ${0} 回`,
 's9aa7daedb08fe44c': `API 呼び出し 1 回あたりの入力の最大値。キャッシュ読み込みとキャッシュ書き込みを含む（peak_context）`,
@@ -528,9 +521,8 @@
 'sa390213ff60c0fd9': str`実行中のエージェントのセッションの新しいイベント ${0} 件を表示`,
 'sa3c9339de23c1752': `形式`,
 'sa3d3f3845c4fa2c4': str`週の利用率 ${0}（リセット ${1}）`,
+'sa3db40076838d4d7': `エージェント・モデル`,
 'sa3deee7949f9fece': `停止`,
-'sa3ed6953c910cb53': `アカウント全体の値 | エージェントのセッション開始時に取得`,
-'sa3f961297cb9207f': `各タスクが読み込むファイル`,
 'sa434ad4d2100f245': `作成元`,
 'sa48318e1513f445c': `コマンドライン`,
 'sa4f4addc6a836fcf': str`最大 ${0} 回`,
@@ -538,7 +530,6 @@
 'sa50a6326530d8a0d': `折りたたむ`,
 'sa5441ff1c4c71a32': `API 呼び出しごとのトークンは不明`,
 'sa57b5e86ecb7d735': `権限エラーになったツール呼び出し`,
-'sa58fd816ed43f98e': `周回数`,
 'sa6295f265bf36f55': str`${0}: トランスクリプト`,
 'sa66db52d0401c35d': str`前の ${0} 行を表示`,
 'sa6ab5184d6315895': `開始日`,
@@ -555,6 +546,7 @@
 'sa9dbdda88ddccf5c': `報告なし`,
 'saa08e9b351f629c4': `書き込み待ち（タスクが実行中）`,
 'saa29a2ac03cd9d19': `理由`,
+'saa9614e57f673c62': `OutputContract・InputContract を宣言したタスクなし`,
 'saaaf4d8d7823ecc2': `5 時間枠の利用率`,
 'saab875d8cfcfe712': `テーマ`,
 'sab5bbfc5ec1101a1': str`${0} 行目`,
@@ -577,6 +569,7 @@
 'sb05ee36313adad06': `エラー`,
 'sb067d7b999cdf867': `実行履歴の修正依頼のあった試行`,
 'sb0c5ebf2450daf53': `サブスクリプションの利用率`,
+'sb0cc319c72ab8ad8': str`週 ${0} → ${1}`,
 'sb0fd4b074f0dc196': `Python タスク 1 回`,
 'sb105a27af3c34dd9': str`未実行: ${0}`,
 'sb1068f146c4596c3': `検索語`,
@@ -592,7 +585,6 @@
 'sb31160f9d54a1178': str`プロンプト（${0} 文字）`,
 'sb34b61edb59f7b62': str`変更したファイル ${0} 件`,
 'sb38cfd00b497faae': `ツール呼び出し`,
-'sb45a9b8907f0b38a': `リトライしたタスク 1 件`,
 'sb4d67c0a20dacf94': `トランスクリプトなし`,
 'sb51d4fbebeb0e2ec': `パイプラインのプロセス内`,
 'sb53f7a197981b790': `はい`,
@@ -600,8 +592,10 @@
 'sb594f8019b3bf708': str`コンテキストの上限に接近（${0}%）`,
 'sb5ae7a6b849639af': `未実行`,
 'sb6bb16aa7550533d': `タスク実行中の書き込みが必須`,
+'sb7471868c78302d7': `下の階層あり`,
 'sb76f9199c15fe03c': str`${0} に停止`,
 'sb8127ffb12a5fb54': `実行したエージェントのセッションのトークンは不明（usage_unknown）`,
+'sb8878a0ec9a8c292': `このバージョンの contraagent が読めなかったイベント（unread_events）`,
 'sb89b16909f010061': `エージェントのセッション 1 回`,
 'sb945184259a5d73c': str`5 時間枠（${0}）`,
 'sb9724d1e7908c74c': `コンテキストの上限に接近`,
@@ -612,9 +606,7 @@
 'sba781480d2e52d6a': `ほかの出力 1 件`,
 'sba8659178319945b': `検証を通るファイルを書き込む前に、タスクが失敗`,
 'sbaf87689cccc53eb': `要素 1 個`,
-'sbb0f058643587149': str`このバージョンの contraagent が対応していないイベント種別（unread_events）: ${0}`,
 'sbb202211084591ed': `開始時の利用率`,
-'sbb77dd1d4c08e701': str`${1} タスク中 ${0} 件が未完了`,
 'sbb99d4ec27fbb263': `終了`,
 'sbbe1ac88d71c2fec': `入力元`,
 'sbc65d1b9648966de': str`${0} 周: ${1}`,
@@ -644,11 +636,11 @@
 'sc53249f5adb55c77': `休止した認証情報`,
 'sc54183a104e8da25': str`${0} の締め切りを過ぎた`,
 'sc5751344f7cedf0f': str`入力 ${0} に検証エラー`,
+'sc59982d9c1f538fa': str`${2} 年 ${0}〜${1}`,
 'sc5b9f26a8c698f76': `次のモデルでの新しいエージェントのセッション`,
 'sc61813a1424783fc': str`週 ${0}`,
 'sc65ea2cf2f21a13a': `縮小`,
 'sc683c10250a1b719': `日時`,
-'sc6c0d07e39170334': str`書き込まれていない出力 ${0} 件（タスクが未実行）`,
 'sc6e4815e573036bd': `締め切りまでに終わらない`,
 'sc6fd207e5b80c46e': str`エラーで終了したフロー呼び出し ${0} 件`,
 'sc732f2e2fbe9f15e': `開始`,
@@ -668,6 +660,7 @@
 'scb862deeee160b4a': `終了（未完了のタスク 1 件）`,
 'scb967cb2ce8bd344': `最終試行の終了時刻`,
 'scbd3558d2cfc7dc3': `全文`,
+'scbfbd1c90da088a2': str`試行 ${1} 回中 ${0} 回`,
 'sccad21b77f9a317c': str`最も高い種別: ${0}`,
 'sccce3de7b4abfdfe': `モデルが応答を拒否`,
 'scd16bc5ac18bdf91': `モデルの応答`,
@@ -718,14 +711,11 @@
 'sdb80a6330c0fa072': `出力に検証エラー`,
 'sdc40078597054827': str`実行グループ ${0}`,
 'sdd178845f5450ded': `モニターから応答がありません`,
-'sdd4a8ac67f7885c1': `モデル 1 種類`,
-'sdd826d4b3e02f41b': `修正依頼なし`,
 'sddf65e6dc438188d': `ビューを表示`,
 'sde3961511d128fcd': str`作業ディレクトリ ${0}`,
 'sde7cbc4291a82cc4': `履歴にほか 1 件`,
 'sde88e8c24887ecfe': str`アカウント ${0}`,
 'sdf14d39488c16f16': str`${0} 回目で完了 | 失敗 1 回 | 最初の失敗: ${1}`,
-'sdf452c95fdeb4be0': `リトライなし`,
 'sdf922ccc13491763': `リトライ後に完了`,
 'se0e6bb970987cfb7': str`${0} から休止中`,
 'se0edc9b6c4e14371': str`実行されず: ${0}`,
@@ -737,7 +727,6 @@
 'se2cd8c3175e8f91f': str`期待する型: ${0}`,
 'se3b4c857f91f80d7': `キーボードショートカット`,
 'se414b08e593473b2': `作成、試行の失敗後も保持`,
-'se4ba2b7d91bd3060': `修正依頼のあったタスク 1 件`,
 'se55f1e3401225b3f': `エージェントのセッションの所要時間の合計`,
 'se5ad61b61dc5c4f6': `モデル切り替え`,
 'se5af45314a3a6b0f': str`修正ラウンド ${0}`,
@@ -747,7 +736,6 @@
 'se61f0dc09b51fd35': `パイプラインのプロセス内の関数`,
 'se66872955dc59191': `1 タスク`,
 'se6982e1c5d0986ac': `後続タスクはこのタスクの完了を待つが、出力は受け取らない（after）`,
-'se6de387a56331077': `下の階層あり`,
 'se7102b7d5942a59c': str`${0} 回目`,
 'se751edc73f4d0062': `リプレイと新しいセッション`,
 'se7bc5096d48d4c1c': str`タスクの所要時間 ${0}`,
@@ -788,7 +776,6 @@
 'sf14df172fd566bcc': `最初のエージェントのセッション`,
 'sf260150b06ca44e5': str`実行 ${0} 件`,
 'sf2b0c091b94a0303': `トークンの報告なし`,
-'sf2c0a590370f775e': `すべての試行が完了`,
 'sf2d62a5d815803af': str`関数 ${0}`,
 'sf2e5c0d258c9b689': `定義`,
 'sf39e43f2714690bc': `周回数`,

package/src/words/quota.ts

@@ -49,6 +49,12 @@ export function resetsIn(iso: string | null | undefined, now = Date.now()): stri
 export const readingShort = (r: QuotaReading): string =>
   facts(msg(str`weekly ${pct(r.seven_day_pct)}`), msg(str`5-hour ${pct(r.five_hour_pct)}`));
 
+/** A reading and the next one, window by window ("weekly 41% → 43% | 5-hour 14% → 28%"); the first alone when there is no next. */
+export const readingChange = (a: QuotaReading, b: QuotaReading | null | undefined): string =>
+  b
+    ? facts(msg(str`weekly ${pct(a.seven_day_pct)} → ${pct(b.seven_day_pct)}`), msg(str`5-hour ${pct(a.five_hour_pct)} → ${pct(b.five_hour_pct)}`))
+    : readingShort(a);
+
 /** A reading in full, for a tooltip: both windows, their resets, when it arrived. */
 export function readingTip(r: QuotaReading): string {
   const parts = [

package/src/words/run-line.ts

@@ -1,6 +1,6 @@
 // The monitor's one-line summaries of a run: the header's run line and the
-// history bar's count.
-import { deriveRun, elapsedS, runAccounts, spendOf, type RunDerived, type RunState, type RunSummary } from '@contraagent/api';
+// list bar's count while a filter is on.
+import { deriveRun, elapsedS, runAccounts, spendOf, type RunDerived, type RunState, type RunSummary, type TryCounts } from '@contraagent/api';
 import { msg, str } from '@lit/localize';
 import { facts, fmtDur, usd } from './format.js';
 import { stateCount } from './outcome.js';
@@ -29,11 +29,14 @@ export function runLine(state: RunState, summary: RunSummary, derived: RunDerive
   return facts(msg(str`${c.doneTotal} of ${c.total} tasks done`), notRun, tail);
 }
 
-/** The history bar's count, as the overview counts: "23 attempts | 4 not started". */
-export function triesLine({ tries, notStarted }: RunDerived['tries']): string {
-  return facts(tries === 1 ? msg('1 attempt') : msg(str`${tries} attempts`), notStarted ? stateCount('not_started', notStarted) : '');
+/** The history bar's count while a filter is on: the attempts shown of all, and the tasks shown that did not start ("12 of 23 attempts | 1 not started"). */
+export function shownTriesLine(shown: TryCounts, all: number): string {
+  return facts(msg(str`${shown.tries} of ${all} attempts`), shown.notStarted ? stateCount('not_started', shown.notStarted) : '');
 }
 
+/** The tasks bar's count while a filter is on ("12 of 30 tasks"). */
+export const shownTasksLine = (shown: number, all: number): string => msg(str`${shown} of ${all} tasks`);
+
 /** A stub run's mark (`RunSummary.stub`): its tasks were played by the stub agent. */
 export const stubLabel = (): string => msg('stub agent', { desc: 'A run whose tasks a coding agent with scripted replies played' });
 

package/src/words/trends.ts

@@ -16,10 +16,12 @@ export function dayLabel(day: string, locale: string = getLocale()): string {
   return new Intl.DateTimeFormat(locale, { month: 'short', day: 'numeric', timeZone: 'UTC' }).format(d);
 }
 
-/** The period in words: `Oct 1 to Oct 14, 2026 | Asia/Tokyo`. */
-export function periodLabel(from: string, to: string, tz: string, locale: string = getLocale()): string {
+/** The period in words: `Oct 1 to Oct 14, 2026`, and its time zone after it when given (`| Asia/Tokyo`: where no time zone control names it). */
+export function periodLabel(from: string, to: string, tz = '', locale: string = getLocale()): string {
   const year = to.slice(0, 4);
-  return msg(str`${dayLabel(from, locale)} to ${dayLabel(to, locale)}, ${year} | ${tz}`, { desc: 'The days the trends cover, and the time zone they are counted in' });
+  return tz
+    ? msg(str`${dayLabel(from, locale)} to ${dayLabel(to, locale)}, ${year} | ${tz}`, { desc: 'The days the trends cover, and the time zone they are counted in' })
+    : msg(str`${dayLabel(from, locale)} to ${dayLabel(to, locale)}, ${year}`, { desc: 'The days the trends cover' });
 }
 
 /** A length of period ending today: `7 days`. */