@contraagent/ui 0.7.2 → 0.8.0

package/src/elements/task/ca-transcript.ts

@@ -14,7 +14,7 @@ import { getLocale } from '../../core/i18n.js';
 import { RememberedSet, SessionSet, memoryOf, pageMemory } from '../../core/memory.js';
 import { promptText } from '../shared/prompt-text.js';
 import { retryTip } from '../../words/attempts.js';
-import { correctionTip } from '../../words/contract.js';
+import { correctionRoundTip } from '../../words/contract.js';
 import { modelSwitchTip } from '../../words/hops.js';
 
 /** The transcript's words, in the reader's language (call at render time). */
@@ -22,7 +22,7 @@ const strings = (): TranscriptStrings => ({
   sections: msg('Agent sessions'),
   sectionsTip: [
     `${msg('Retry')}: ${retryTip()}`,
-    `${msg('Correction')}: ${correctionTip()}`,
+    `${msg('Correction round')}: ${correctionRoundTip()}`,
     `${msg('Model switch')}: ${modelSwitchTip()}`,
   ].join('\n'),
   loadEarlier: (n) => (n === 1 ? msg('Show 1 earlier line') : msg(str`Show ${n} earlier lines`)),

package/src/elements/task/context.ts

@@ -16,6 +16,7 @@ import {
   type UpstreamTask,
 } from '@contraagent/api';
 import { html } from 'lit';
+import { correctionCount } from '../../adapters/filters.js';
 import { emit, type RoundInfo } from '../../core/events.js';
 import { kindUnit } from '../../words/format.js';
 import { correctionsText, inputCause, notStartedCause } from '../../words/index.js';
@@ -95,7 +96,7 @@ export function culprit(c: TaskContext): { key: string; kind: string; unit: stri
 }
 
 /** `N corrections` for a journal row whose attempt needed them ('' when none). */
-export const correctionsOf = (r: { rounds?: number | null }): string => correctionsText((r.rounds || 1) - 1);
+export const correctionsOf = (r: Pick<JournalRow, 'rounds' | 'hook_errors'>): string => correctionsText(correctionCount(r));
 
 /** A task's name as a link that sends `ca-open-task`. */
 export const taskLink = (c: TaskContext, u: { key: string; kind: string; unit: string }) =>

package/src/elements/task/header.ts

@@ -6,7 +6,7 @@ import { html, nothing, type TemplateResult } from 'lit';
 import { toneAttr } from '@contraagent/elements';
 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, type ChangeKind } from '../../words/index.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 { safetyStopCount, safetyStopLine, safetyStopTip } from '../../words/safety.js';
@@ -17,6 +17,7 @@ import { isStop, type Tone } from '../../lib/tone.js';
 import { executorIcon } from '../../words/executor.js';
 import '@contraagent/elements/json-tree/define';
 import { tagChips, type TranscriptTag } from '@contraagent/elements/transcript';
+import { correctionCount } from '../../adapters/filters.js';
 import { checkMessage } from '../../adapters/transcript/rounds.js';
 import { agentLabel, launchWho, whoTags, type Who } from '../../adapters/transcript/who.js';
 import { correctionsOf, hadSession, isPy, notStartedWhy, stateOf, type TaskContext } from './context.js';
@@ -73,7 +74,7 @@ function verdict(c: TaskContext): [text: string, tone: Tone] {
       'neutral',
     ];
   }
-  const corrections = (last.rounds || 1) - 1 + (last.hook_errors ?? []).length;
+  const corrections = correctionCount(last);
   if (corrections > 0) {
     const errors = [...(last.hook_errors ?? []).flat(), ...(last.round_errors ?? []).flat(), ...c.rounds.flatMap((r) => r.rejectedWith)];
     const first = errors[0] ? checkMessage(runRelative(errors[0], c.run)) : '';
@@ -139,6 +140,7 @@ export function taskHeader(c: TaskContext, key: string, onSearch: (query: string
               </div>`
             : nothing}
           ${node?.priority ? html`<div class="meta" title=${priorityTip()}>${priorityText(node.priority)}</div>` : nothing}
+          ${node?.cwd ? html`<div class="meta" title=${workingDirectoryTip()}>${workingDirectoryText(node.cwd)}</div>` : nothing}
           ${rerunMeta(rows, node?.rerun)}
           ${stoppedFlowCalls(c)}
           ${session

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

@@ -30,7 +30,7 @@ import { ioFileCard } from '../../shared/file-card.js';
 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, lineageTip, lineageWord } from '../../../words/lineage.js';
+import { inputFileCheckWord, inputRootPath, inputRootTip, lineageTip, lineageWord } from '../../../words/lineage.js';
 import { correctionsOf, hadSession, isPy, producerOf, stateOf, taskLink, type TaskContext } from '../context.js';
 
 const valueText = (v: unknown): string => (typeof v === 'string' ? v : JSON.stringify(v) ?? String(v));
@@ -81,8 +81,9 @@ export function inputPane(c: TaskContext): TemplateResult {
 }
 
 /**
- * One input file of the task (an `InputFile` param): its check at the start, its path,
- * the param that holds it, its hash, and the earlier task whose output file it is.
+ * One input file of the task (an `InputFile` param): its check at the start, its path
+ * (with its input root), the param that holds it, its hash, and the earlier task whose
+ * output file it is.
  */
 function inputFileCard(c: TaskContext, f: TaskInputFile) {
   const tone = f.check === 'passed' ? 'done' : f.check === 'refused' ? 'failed' : 'neutral';
@@ -91,8 +92,10 @@ function inputFileCard(c: TaskContext, f: TaskInputFile) {
   const origin = f.writer
     ? html`<span>${msg(html`Output of ${taskLink(c, writer ?? { key: f.writer, kind: f.writer, unit: '' })}`)}</span>`
     : nothing;
+  const rooted = inputRootPath(f);
+  const tip = f.root && f.root !== 'out' ? inputRootTip(f.root, f.path) : f.path;
   return html`<div class="io-card one infile">
-    <div class="io-hd">${pill({ text: inputFileCheckWord(f.check), tone, mark })}<span class="jmono ct-path" title=${f.path}>${runRelative(f.path, c.run)}</span></div>
+    <div class="io-hd">${pill({ text: inputFileCheckWord(f.check), tone, mark })}<span class="jmono ct-path" title=${tip}>${rooted ?? runRelative(f.path, c.run)}</span></div>
     <div class="meta io-from"><span title=${f.sha256}>${facts(msg(str`Param ${f.param}`), `sha256 ${f.sha256.slice(0, 12)}`)}</span>${f.writer
       ? html` | ${origin}`
       : nothing}</div>

package/src/locales/ja.ts

@@ -33,6 +33,7 @@
 'part-input-files': `入力ファイル`,
 'part-params': `パラメータ`,
 's0007e74d64dabdbc': `実行履歴の未実行のタスク`,
+'s0094a2c710d4521a': `修正ラウンド 1 回後`,
 's00cfc1e282ce46d7': str`HTTP ステータス ${0}`,
 's02f7b7c4ece3e097': `実行されず`,
 's02f936d07f478eb8': str`アカウント: ${0}`,
@@ -176,7 +177,6 @@
 's2f54740b39931f87': `定義なし`,
 's2faec8a0d7db08dd': str`5 時間枠の利用率 ${0}（リセット ${1}）`,
 's2fe3f0ef38a252c7': `ツール`,
-'s2fea0e9e542e5b47': str`修正依頼 ${0}`,
 's31377c5b29515e8b': `終了（未実行のタスク 1 件）`,
 's31ad37e9f51902fd': str`待たれなかったタスク ${0} 件`,
 's321b04e2b2f863d5': `余分なフィールド`,
@@ -200,6 +200,7 @@
 's3786b7768c22d7fd': `検証エラーの後に、同じエージェントのセッションで続けるラウンド（rounds）`,
 's37da018e1fe6a0d7': `スキーマ以外の検証（validators）`,
 's3841eba6a1c038af': str`${0} を展開`,
+'s3850111242895c2f': str`修正ラウンド ${0}`,
 's387a4a41718122cb': str`検索結果 ${0} 件`,
 's38e65cca012f316f': `修正依頼のプロンプトに含めて送信`,
 's38e6a13eab00995b': `日ごとの料金`,
@@ -247,6 +248,7 @@
 's48e186fb300e5464': `所要時間`,
 's49098dfd8a30a9b7': `モニターのサーバーに接続済み`,
 's491765412b82838e': str`${0} のループ`,
+'s49c85c93fd66fbe4': str`修正ラウンド ${0} 回`,
 's4abcddbf0c24a4e2': str`${0} 日前`,
 's4cd75aa2c080e64a': `あと 1 件の見込み（forecast）`,
 's4d613d768e2faa0d': `検索結果 1 件`,
@@ -255,6 +257,7 @@
 's4efee5b48a4593cb': `ループ`,
 's4f0af1e75e3f4e0d': `スキーマにない`,
 's4f901d8830793b99': str`ホスト ${0}`,
+'s4fca51e2e890a0f0': `検証エラーを示し、同じエージェントのセッションで出力の修正を求める依頼。ラウンドの途中、または修正ラウンドで（hook_errors, rounds）`,
 's4fed3c544c5791df': `エージェントタスク`,
 's5013070506ff1eda': str`取り消し ${0} 件`,
 's50182c197f93c873': str`${0}: ${1} → ${2}`,
@@ -283,6 +286,7 @@
 's5590dbf7e425789d': `項目`,
 's559ffe740d166c8d': `その他のモデル`,
 's55fa598b754cc3cc': str`${0}（${1}）`,
+'s5657377baae212e4': `修正ラウンド 1 回`,
 's5667ab3a2fddedf6': str`（ほか ${0} 文字は未保存）`,
 's567f1fa5829fb0c2': `未実行（依存先タスクが失敗）`,
 's56838581fa8422a5': str`後続タスク: ${0}`,
@@ -335,7 +339,6 @@
 's670ef751f29dc9ae': str`${0} ユニット`,
 's673f9ec66716c84a': `停止でエラー`,
 's680fc90489553ed6': `タイムライン`,
-'s685f61cef2e55d31': `修正依頼`,
 's68818ff23f9c3cd6': `その他の検証`,
 's68d5849bad94a91d': str`仕上げの猶予 ${0}`,
 's69522c8fd29e217c': `修正依頼 1 回`,
@@ -411,7 +414,6 @@
 's8273cf03c84a59ef': `認証情報が休止中`,
 's837f3597be0e0bda': str`書き込み ${0}`,
 's84126fa92f00b4ef': `たった今`,
-'s843c1705315bbf4e': str`修正依頼 ${0} 回後`,
 's84fb675fb17d4455': `リトライ`,
 's851220394bf4ca62': str`テーマ: ${0}`,
 's851d0f73d02cf0b5': `ファイルの値`,
@@ -425,11 +427,9 @@
 's877a8bf58317ec9e': str`${0} 回目の失敗後の、新しいエージェントのセッション`,
 's87aaf1391fb727b7': `実行されず`,
 's87b0c0d87ec9c3a1': str`モデル切り替え後に完了: ${0}`,
-'s87cfcf0fecad5ace': `修正依頼 1 回後`,
 's8807d2925482479b': `全試行の合計`,
 's888d98a196a240d8': `入力`,
 's88be8b2eafea1028': `表で表示`,
-'s88e6f151026426e7': str`修正依頼 ${0}`,
 's892f20ba2aadea33': str`入力 ${0}（${1} の出力）がありません`,
 's89ece7813063852e': `パラメータなし`,
 's8a56a8c8bd19c9c7': `なし`,
@@ -500,10 +500,12 @@
 's9bd11c2c49c08916': str`${0} 回目で完了 | 失敗 ${1} 回 | 最初の失敗: ${2}`,
 's9c325e901c43f27a': str`上限を超えた利用: ${0}`,
 's9c5f040496c9716b': str`${0} の出力`,
+'s9c64a5e5cd2b70e9': `修正ラウンド`,
 's9c77b049b9f43ad5': `すべての中を表示`,
 's9cb7a149bc9abd88': `実装する種別`,
 's9d313ec614917a38': str`${0} 時点の書き出し`,
 's9d60d7651126c205': `最終応答なしで終了`,
+'s9da88e027753b536': str`修正ラウンド ${0} 回後`,
 's9de543933e6e703a': `モデル`,
 's9e06cbf9c5f57859': str`状態: ${0}`,
 's9e8afbe69b10d822': `未実行（入力ファイルに検証エラー）`,
@@ -695,6 +697,7 @@
 'sd5c13f0d5d88c035': str`変更: ${0}`,
 'sd5da7ee4a43a6b2d': str`トークン: 入力 ${0}、出力 ${1}、キャッシュ読み込み ${2}、キャッシュ書き込み ${3}`,
 'sd5e28ee1c3ede3b6': `所要時間の合計`,
+'sd6a08709ccdbf95c': `タスク呼び出しが実行全体の代わりに指定した、このタスクの作業ディレクトリ（cwd）`,
 'sd7338946b42394f4': `失敗`,
 'sd7445330352af2c5': `検証対象のファイル`,
 'sd747248fb64d7bb2': `なし（任意）`,
@@ -718,6 +721,7 @@
 'sdd4a8ac67f7885c1': `モデル 1 種類`,
 'sdd826d4b3e02f41b': `修正依頼なし`,
 'sddf65e6dc438188d': `ビューを表示`,
+'sde3961511d128fcd': str`作業ディレクトリ ${0}`,
 'sde7cbc4291a82cc4': `履歴にほか 1 件`,
 'sde88e8c24887ecfe': str`アカウント ${0}`,
 'sdf14d39488c16f16': str`${0} 回目で完了 | 失敗 1 回 | 最初の失敗: ${1}`,
@@ -736,6 +740,7 @@
 'se4ba2b7d91bd3060': `修正依頼のあったタスク 1 件`,
 'se55f1e3401225b3f': `エージェントのセッションの所要時間の合計`,
 'se5ad61b61dc5c4f6': `モデル切り替え`,
+'se5af45314a3a6b0f': str`修正ラウンド ${0}`,
 'se5bc88938f3b6e59': `推移`,
 'se5d1247fe34fbb95': `monitor.Panel`,
 'se60a4867465d5d31': `ハイコントラスト`,
@@ -770,6 +775,7 @@
 'sede9056322866918': `ステージなし`,
 'seea0f53b4dbb2fb3': `結果`,
 'seea18d10f66cb015': `ホスト ID なし`,
+'seed22b61a74bd723': str`入力ルート ${1} の ${0}`,
 'seee13c69133b70b7': `スキップ`,
 'seee3885e38ae0126': `完了しなかった試行`,
 'sef0ce050d92c35e2': str`実行中 ${0} 件`,

package/src/words/contract.ts

@@ -29,14 +29,18 @@ export function contractStatusWhy(s: ContractStatus): string {
 }
 
 /** What a correction is, for tooltips. */
-export const correctionTip = (): string => msg('Another round in the same agent session after failed checks (rounds)');
+export const correctionTip = (): string =>
+  msg('Failed checks sent back to the same agent session, within its round or in a correction round (hook_errors, rounds)');
 
-/** How many corrections a file took (`rounds` counts the first round too), in words; '' for none. */
-export function correctionsLabel(rounds: number | null | undefined, passed: boolean): string {
+/** What a correction round is, for tooltips. */
+export const correctionRoundTip = (): string => msg('Another round in the same agent session after failed checks (rounds)');
+
+/** How many correction rounds a file took (`rounds` counts the first round too), in words; '' for none. */
+export function correctionRoundsLabel(rounds: number | null | undefined, passed: boolean): string {
   const n = (rounds ?? 1) - 1;
   if (n < 1) return '';
-  if (passed) return n === 1 ? msg('after 1 correction') : msg(str`after ${n} corrections`);
-  return n === 1 ? msg('1 correction') : msg(str`${n} corrections`);
+  if (passed) return n === 1 ? msg('after 1 correction round') : msg(str`after ${n} correction rounds`);
+  return n === 1 ? msg('1 correction round') : msg(str`${n} correction rounds`);
 }
 
 /** Who writes a file, for naming the task an input should have come from. */

package/src/words/index.ts

@@ -26,6 +26,7 @@ export * from './panels.js';
 export * from './export.js';
 export * from './trends.js';
 export * from './priority.js';
+export * from './working-directory.js';
 export * from './context.js';
 export * from './preflight.js';
 export * from './task-definition.js';

package/src/words/lineage.ts

@@ -1,8 +1,9 @@
 // How a task is joined to an earlier one (`Lineage`), in the words of the graph's
 // edges: each word names the edge from the earlier task to the later one, in the
-// task's earlier and later tasks alike. And an input file's check at the start.
+// task's earlier and later tasks alike. And an input file's check at the start, and
+// its path with its input root.
 import type { InputFileCheck, Lineage } from '@contraagent/api';
-import { msg } from '@lit/localize';
+import { msg, str } from '@lit/localize';
 
 /** A lineage as the graph's legend names its edge: given output (solid), runs after (dotted), created after result (dashed). */
 export function lineageWord(l: Lineage): string {
@@ -28,6 +29,19 @@ export function lineageTip(l: Lineage): string {
   }
 }
 
+/**
+ * An input file's path as the task detail shows it (`TaskInputFile`): `data: 2026/x.csv` for
+ * a file of an input root the run names, `out/review/a.md` for an output file of the run
+ * (the root `out`), else its path; null for a file of no input root.
+ */
+export function inputRootPath(f: { root?: string | null; path: string }): string | null {
+  if (!f.root) return null;
+  return f.root === 'out' ? `out/${f.path}` : `${f.root}: ${f.path}`;
+}
+
+/** The tooltip of a file of an input root the run names: its path under the root. */
+export const inputRootTip = (root: string, path: string): string => msg(str`${path} in the input root ${root}`);
+
 /** An input file's check as its task was about to start. */
 export function inputFileCheckWord(c: InputFileCheck): string {
   switch (c) {

package/src/words/rounds.ts

@@ -7,17 +7,17 @@ import { stopLabel } from './stop.js';
 import type { RoundInfo } from '../core/events.js';
 
 /**
- * "Attempt 1", "Correction 1", "Model switch"; with more than one attempt,
- * "Attempt 2 | correction 1" and "Attempt 2 | model switch". `name` is the name of
+ * "Attempt 1", "Correction round 1", "Model switch"; with more than one attempt,
+ * "Attempt 2 | correction round 1" and "Attempt 2 | model switch". `name` is the name of
  * the round's attempt (`attemptNames`: "Attempt 1 | resumed run" in a resumed run).
  */
 export function roundLabel(r: RoundInfo, tries: number, name = attemptLabel(r.tryNo - 1)): string {
   if (tries > 1) {
-    if (r.fixupNo) return facts(name, msg(str`correction ${r.fixupNo}`));
+    if (r.fixupNo) return facts(name, msg(str`correction round ${r.fixupNo}`));
     if (r.hopNo) return facts(name, msg('model switch'));
     return name;
   }
-  if (r.fixupNo) return msg(str`Correction ${r.fixupNo}`);
+  if (r.fixupNo) return msg(str`Correction round ${r.fixupNo}`);
   if (r.hopNo) return msg('Model switch');
   return attemptLabel(0);
 }

package/src/words/working-directory.ts

@@ -0,0 +1,8 @@
+// Words for a task's own working directory (`PlanNode.cwd`): the directory its call options named.
+import { msg, str } from '@lit/localize';
+
+/** A task's own working directory as a fact: `Working directory /repo.worktrees/alpha`; '' for none (the run's). */
+export const workingDirectoryText = (cwd: string | null | undefined): string => (cwd ? msg(str`Working directory ${cwd}`) : '');
+
+/** What a task's own working directory is, for its tooltip. */
+export const workingDirectoryTip = (): string => msg("Directory the task worked in, named by its task call in place of the run's (cwd)");