@oh-my-pi/pi-tui 18.8.6 → 18.8.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +45 -79
- package/README.md +7 -5
- package/dist/types/chat/assistant-message.d.ts +1 -0
- package/dist/types/chat/compaction-summary-message.d.ts +1 -0
- package/dist/types/chat/execution-shared.d.ts +6 -5
- package/dist/types/chat/user-message.d.ts +2 -0
- package/dist/types/components/box.d.ts +1 -0
- package/dist/types/components/disclosure.d.ts +1 -0
- package/dist/types/components/image.d.ts +1 -0
- package/dist/types/components/key-value-list.d.ts +1 -0
- package/dist/types/components/layout/row.d.ts +1 -0
- package/dist/types/components/layout/stack.d.ts +1 -0
- package/dist/types/components/markdown.d.ts +1 -0
- package/dist/types/components/scroll-view.d.ts +1 -0
- package/dist/types/components/section.d.ts +1 -0
- package/dist/types/components/table.d.ts +1 -0
- package/dist/types/components/text.d.ts +1 -0
- package/dist/types/components/truncated-text.d.ts +1 -0
- package/dist/types/keybinding-matchers.d.ts +3 -0
- package/dist/types/native/blobs.d.ts +3 -1
- package/dist/types/overlays/annotation-overlay.d.ts +12 -0
- package/dist/types/overlays/annotation-types.d.ts +2 -0
- package/dist/types/overlays/hook-selector.d.ts +9 -4
- package/dist/types/overlays/model-browser.d.ts +2 -2
- package/dist/types/overlays/model-hub.d.ts +21 -4
- package/dist/types/overlays/session-observer-registry.d.ts +2 -0
- package/dist/types/overlays/session-selector.d.ts +1 -1
- package/dist/types/overlays/usage-dashboard.d.ts +3 -1
- package/dist/types/render/output-pane.d.ts +1 -0
- package/dist/types/render/render-utils.d.ts +1 -0
- package/dist/types/render/tool-card.d.ts +6 -0
- package/dist/types/render/width-aware-text.d.ts +2 -0
- package/dist/types/status-line/types.d.ts +1 -1
- package/dist/types/terminal.d.ts +10 -2
- package/dist/types/theme/symbols.d.ts +1 -1
- package/dist/types/tools/eval.d.ts +1 -1
- package/dist/types/tools/native-view.d.ts +47 -0
- package/dist/types/tools/renderer.d.ts +15 -2
- package/dist/types/tools/write.d.ts +1 -1
- package/dist/types/tools/yield.d.ts +22 -0
- package/dist/types/tui.d.ts +31 -0
- package/dist/types/vim.d.ts +19 -5
- package/package.json +9 -9
- package/src/chat/advisor-message.ts +11 -0
- package/src/chat/assistant-message.ts +6 -0
- package/src/chat/compaction-summary-message.ts +8 -0
- package/src/chat/execution-shared.ts +42 -25
- package/src/chat/read-tool-group.ts +6 -4
- package/src/chat/skill-message.ts +6 -0
- package/src/chat/table-chart.ts +17 -20
- package/src/chat/tool-execution.ts +27 -2
- package/src/chat/user-message.ts +14 -0
- package/src/chrome/transcript-container.ts +32 -1
- package/src/components/box.ts +5 -0
- package/src/components/disclosure.ts +8 -0
- package/src/components/editor.ts +182 -5
- package/src/components/image.ts +7 -5
- package/src/components/key-value-list.ts +4 -0
- package/src/components/layout/row.ts +7 -0
- package/src/components/layout/stack.ts +7 -0
- package/src/components/markdown.ts +8 -0
- package/src/components/scroll-view.ts +5 -0
- package/src/components/section.ts +5 -0
- package/src/components/table.ts +4 -0
- package/src/components/text.ts +7 -0
- package/src/components/truncated-text.ts +5 -0
- package/src/keybinding-matchers.ts +6 -2
- package/src/native/backend.ts +16 -15
- package/src/native/blobs.ts +43 -10
- package/src/native/reconcile.ts +4 -0
- package/src/overlays/agent-hub.ts +7 -3
- package/src/overlays/annotation-overlay.ts +87 -6
- package/src/overlays/annotation-types.ts +2 -0
- package/src/overlays/hook-selector.ts +12 -5
- package/src/overlays/model-browser.ts +3 -3
- package/src/overlays/model-hub.ts +107 -27
- package/src/overlays/session-observer-registry.ts +10 -2
- package/src/overlays/session-selector.ts +29 -19
- package/src/overlays/snapcompact-shape-preview.ts +2 -3
- package/src/overlays/usage-dashboard.ts +70 -23
- package/src/prompt/attachment-chips.ts +13 -10
- package/src/prompt/composer.ts +1 -0
- package/src/render/output-pane.ts +6 -0
- package/src/render/render-utils.ts +11 -0
- package/src/render/tool-card.ts +15 -0
- package/src/render/width-aware-text.ts +5 -0
- package/src/status-line/segments.ts +3 -0
- package/src/status-line/types.ts +1 -1
- package/src/terminal.ts +24 -3
- package/src/theme/symbols.ts +5 -0
- package/src/tools/bash.ts +92 -42
- package/src/tools/edit.ts +142 -120
- package/src/tools/eval.ts +149 -123
- package/src/tools/fetch.ts +5 -6
- package/src/tools/index.ts +2 -0
- package/src/tools/mcp.ts +15 -2
- package/src/tools/native-view.ts +102 -1
- package/src/tools/read.ts +7 -5
- package/src/tools/renderer.ts +15 -2
- package/src/tools/write.ts +70 -56
- package/src/tools/yield.ts +225 -0
- package/src/tui.ts +93 -0
- package/src/vim.ts +333 -18
package/src/tools/eval.ts
CHANGED
|
@@ -9,10 +9,10 @@ import type {
|
|
|
9
9
|
ToolRenderer,
|
|
10
10
|
} from "./renderer";
|
|
11
11
|
import type { TspSpan } from "@oh-my-pi/pi-wire";
|
|
12
|
-
import {
|
|
12
|
+
import { compact, keyed, md, node, span, text } from "../native/describe";
|
|
13
13
|
import type { NativeChild, NativeNode } from "../native/node";
|
|
14
14
|
import { plainText } from "../native/spans";
|
|
15
|
-
import {
|
|
15
|
+
import { resultText, runBox, runFoot, type RunFootInput, runInput, runOutput, type RunState } from "./native-view";
|
|
16
16
|
import { renderAgentTreeRow } from "./agent-tree";
|
|
17
17
|
import { truncateToVisualLines } from "../chrome/visual-truncate";
|
|
18
18
|
import { getMarkdownTheme, type Theme } from "../theme/theme";
|
|
@@ -694,89 +694,104 @@ function splitConsoleTables(output: string): EvalOutputPart[] {
|
|
|
694
694
|
return parts;
|
|
695
695
|
}
|
|
696
696
|
|
|
697
|
-
/**
|
|
698
|
-
|
|
697
|
+
/**
|
|
698
|
+
* One cell's outputs: markdown, else terminal text (following its tail,
|
|
699
|
+
* clamped to the last `previewLines` while folded) with any `console.table`
|
|
700
|
+
* blocks as tables.
|
|
701
|
+
*/
|
|
702
|
+
function evalOutputNodes(output: string, markdown: boolean, previewLines: number): NativeNode[] {
|
|
699
703
|
if (output.trim().length === 0) return [];
|
|
700
|
-
if (markdown
|
|
701
|
-
|
|
702
|
-
return splitConsoleTables(output).map(part =>
|
|
704
|
+
if (markdown) return [keyed(md(output), "output")];
|
|
705
|
+
return splitConsoleTables(output).map((part, i) =>
|
|
703
706
|
part.kind === "text"
|
|
704
|
-
?
|
|
705
|
-
: node(
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
id: `
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
|
|
707
|
+
? runOutput(part.text, { role: "omp.tool.eval.output", previewLines, key: i === 0 ? "output" : `output-${i}` })
|
|
708
|
+
: node(
|
|
709
|
+
"table",
|
|
710
|
+
{
|
|
711
|
+
// Node's index column header is noise in a real table.
|
|
712
|
+
cols: part.head.map((head, c) => ({ id: `c${c}`, head: head === "(index)" ? "" : head })),
|
|
713
|
+
rows: part.rows.map((cells, r) => ({
|
|
714
|
+
id: `r${r}`,
|
|
715
|
+
cells: Object.fromEntries(cells.map((cell, c) => [`c${c}`, cell])),
|
|
716
|
+
})),
|
|
717
|
+
role: "omp.tool.eval.table",
|
|
718
|
+
},
|
|
719
|
+
undefined,
|
|
720
|
+
`table-${i}`,
|
|
721
|
+
),
|
|
722
|
+
);
|
|
723
|
+
}
|
|
724
|
+
|
|
725
|
+
/** Status lines a folded cell keeps: the newest ones. */
|
|
726
|
+
const RUN_STATUS_TAIL = 8;
|
|
727
|
+
|
|
728
|
+
/**
|
|
729
|
+
* A cell's status events (`omp.run.status`): all of them when expanded, else
|
|
730
|
+
* the newest {@link RUN_STATUS_TAIL} after a muted `N earlier` line.
|
|
731
|
+
*/
|
|
732
|
+
function evalStatusSection(events: readonly EvalStatusEvent[], expanded: boolean): NativeNode | undefined {
|
|
733
|
+
if (events.length === 0) return undefined;
|
|
734
|
+
const hidden = expanded ? 0 : Math.max(0, events.length - RUN_STATUS_TAIL);
|
|
735
|
+
const lines = events.slice(hidden).map((event, i) => keyed(describeStatusEvent(event), `s${hidden + i}`));
|
|
736
|
+
return node(
|
|
737
|
+
"col",
|
|
738
|
+
{ role: "omp.run.status", gap: "none" },
|
|
739
|
+
compact<NativeNode>([hidden > 0 && keyed(text([span(`${hidden} earlier`, "muted")]), "earlier"), ...lines]),
|
|
740
|
+
"status",
|
|
714
741
|
);
|
|
715
742
|
}
|
|
716
743
|
|
|
717
|
-
/**
|
|
718
|
-
|
|
744
|
+
/** The foot state of a cell, or undefined while it has not started. */
|
|
745
|
+
function evalCellState(status: EvalCellResult["status"], cancelled: boolean): RunState | undefined {
|
|
746
|
+
switch (status) {
|
|
747
|
+
case "pending":
|
|
748
|
+
return undefined;
|
|
749
|
+
case "running":
|
|
750
|
+
return cancelled ? "cancelled" : "running";
|
|
751
|
+
case "complete":
|
|
752
|
+
return "done";
|
|
753
|
+
case "error":
|
|
754
|
+
return "failed";
|
|
755
|
+
}
|
|
756
|
+
}
|
|
757
|
+
|
|
758
|
+
/** Inputs of one eval cell box. */
|
|
759
|
+
interface EvalCellRun {
|
|
719
760
|
readonly language: EvalLanguage;
|
|
720
761
|
readonly code: string;
|
|
721
762
|
readonly title?: string;
|
|
722
|
-
readonly
|
|
723
|
-
readonly
|
|
724
|
-
|
|
763
|
+
readonly outputs?: readonly NativeChild[];
|
|
764
|
+
readonly status?: NativeNode;
|
|
765
|
+
/** Omitted while the cell has not started. */
|
|
766
|
+
readonly foot?: RunFootInput;
|
|
725
767
|
}
|
|
726
768
|
|
|
727
769
|
/**
|
|
728
|
-
* A notebook cell
|
|
729
|
-
*
|
|
730
|
-
* Only multi-cell calls repeat titles; marks never invent execution counts.
|
|
770
|
+
* A notebook cell as one run box: the caption (multi-cell calls only), the
|
|
771
|
+
* source, its outputs, status lines and foot. A failed cell tints its box.
|
|
731
772
|
*/
|
|
732
|
-
function
|
|
733
|
-
let
|
|
773
|
+
function evalCellBox(cell: EvalCellRun, index: number, total: number): NativeNode {
|
|
774
|
+
let caption: NativeNode | undefined;
|
|
734
775
|
if (total > 1) {
|
|
735
|
-
|
|
776
|
+
const spans: TspSpan[] = [span(`${index + 1}/${total}`, "muted")];
|
|
736
777
|
const title = plainText(cell.title ?? "").trim();
|
|
737
|
-
if (title)
|
|
738
|
-
|
|
739
|
-
if (cell.durationMs !== undefined) head.push(span(` · ${(cell.durationMs / 1000).toFixed(2)}s`, "muted"));
|
|
778
|
+
if (title) spans.push(span(` ${title}`, "toolTitle"));
|
|
779
|
+
caption = keyed(text(spans, { role: "omp.run.caption" }), "caption");
|
|
740
780
|
}
|
|
741
|
-
|
|
742
|
-
|
|
743
|
-
|
|
744
|
-
|
|
745
|
-
|
|
746
|
-
role: "omp.tool.eval.
|
|
747
|
-
|
|
748
|
-
|
|
749
|
-
})
|
|
750
|
-
|
|
751
|
-
|
|
752
|
-
|
|
753
|
-
|
|
754
|
-
|
|
755
|
-
},
|
|
756
|
-
compact<NativeChild>([
|
|
757
|
-
head ? text(head, { role: "omp.tool.eval.caption" }) : undefined,
|
|
758
|
-
node(
|
|
759
|
-
"row",
|
|
760
|
-
{ role: "omp.tool.eval.input", align: "start" },
|
|
761
|
-
[
|
|
762
|
-
inputMark,
|
|
763
|
-
keyed(codeNode(cell.code, { lang: languageForHighlighter(cell.language), numbers: false }), "code"),
|
|
764
|
-
],
|
|
765
|
-
"input",
|
|
766
|
-
),
|
|
767
|
-
cell.output?.length
|
|
768
|
-
? node(
|
|
769
|
-
"row",
|
|
770
|
-
{ role: "omp.tool.eval.result", align: "start" },
|
|
771
|
-
[
|
|
772
|
-
node("icon", { name: "arrow-right", role: "omp.tool.eval.prompt", aria: "Output" }),
|
|
773
|
-
node("col", { role: "omp.tool.eval.outputs" }, cell.output),
|
|
774
|
-
],
|
|
775
|
-
"output",
|
|
776
|
-
)
|
|
777
|
-
: undefined,
|
|
778
|
-
]),
|
|
779
|
-
`cell-${index}`,
|
|
781
|
+
return runBox(
|
|
782
|
+
[
|
|
783
|
+
caption,
|
|
784
|
+
cell.code.trim().length > 0 &&
|
|
785
|
+
runInput(cell.code, {
|
|
786
|
+
role: "omp.tool.eval.input",
|
|
787
|
+
lang: languageForHighlighter(cell.language),
|
|
788
|
+
wrap: false,
|
|
789
|
+
}),
|
|
790
|
+
...(cell.outputs ?? []),
|
|
791
|
+
cell.status,
|
|
792
|
+
cell.foot && runFoot(cell.foot),
|
|
793
|
+
],
|
|
794
|
+
{ key: `cell-${index}`, tone: cell.foot?.state === "failed" ? "error" : undefined },
|
|
780
795
|
);
|
|
781
796
|
}
|
|
782
797
|
|
|
@@ -1129,16 +1144,20 @@ export const evalToolRenderer = {
|
|
|
1129
1144
|
};
|
|
1130
1145
|
},
|
|
1131
1146
|
|
|
1132
|
-
describeCall(args: EvalRenderArgs,
|
|
1147
|
+
describeCall(args: EvalRenderArgs, options: RenderResultOptions): NativeToolView {
|
|
1133
1148
|
const cells = getRenderCells(args);
|
|
1149
|
+
// No foot until the call starts; then the first cell runs (before any result names it).
|
|
1150
|
+
const startFoot: RunFootInput | undefined = options.executionStarted
|
|
1151
|
+
? { state: options.cancelled ? "cancelled" : "running", elapsedMs: options.elapsedMs }
|
|
1152
|
+
: undefined;
|
|
1134
1153
|
return {
|
|
1135
1154
|
tool: evalToolHead(
|
|
1136
1155
|
cells[0]?.title,
|
|
1137
1156
|
cells.map(cell => cell.language),
|
|
1138
1157
|
cells.length,
|
|
1139
1158
|
),
|
|
1140
|
-
body: cells.map((cell, i) =>
|
|
1141
|
-
preview:
|
|
1159
|
+
body: cells.map((cell, i) => evalCellBox({ ...cell, foot: i === 0 ? startFoot : undefined }, i, cells.length)),
|
|
1160
|
+
preview: "children",
|
|
1142
1161
|
};
|
|
1143
1162
|
},
|
|
1144
1163
|
|
|
@@ -1149,82 +1168,89 @@ export const evalToolRenderer = {
|
|
|
1149
1168
|
): NativeToolView {
|
|
1150
1169
|
const details = result.details;
|
|
1151
1170
|
const isPartial = options.isPartial === true;
|
|
1171
|
+
const cancelled = options.cancelled === true;
|
|
1172
|
+
const expanded = options.renderContext?.expanded ?? options.expanded;
|
|
1152
1173
|
const previewLines = options.renderContext?.previewLines ?? EVAL_DEFAULT_PREVIEW_LINES;
|
|
1153
1174
|
const jsonNodes = (details?.jsonOutputs ?? []).map((value, index) =>
|
|
1154
1175
|
keyed(describeJsonTree(value, { hiddenRootKeys: [] }), `display-${index}`),
|
|
1155
1176
|
);
|
|
1156
|
-
//
|
|
1157
|
-
const
|
|
1177
|
+
// The call's notice and truncation join the last run's foot facts (a background job is a head badge).
|
|
1178
|
+
const callFacts = { facts: compact([details?.notice]), meta: details?.meta };
|
|
1158
1179
|
const cellResults = details?.cells;
|
|
1159
|
-
let cells: NativeNode[];
|
|
1160
|
-
let head: NativeToolHead;
|
|
1161
1180
|
if (cellResults && cellResults.length > 0) {
|
|
1162
1181
|
const languages = cellResults.map(cell => cell.language ?? details?.language ?? "python");
|
|
1163
|
-
|
|
1164
|
-
|
|
1182
|
+
const states = cellResults.map(cell => evalCellState(cell.status, cancelled));
|
|
1183
|
+
// A cell that never started has no foot to carry the call's facts: the last one that ran does.
|
|
1184
|
+
const factsIndex = states.findLastIndex(state => state !== undefined);
|
|
1185
|
+
let earlierMs = 0;
|
|
1186
|
+
const cells = cellResults.map((cell, i) => {
|
|
1165
1187
|
const language = languages[i]!;
|
|
1166
|
-
|
|
1188
|
+
const state = states[i];
|
|
1189
|
+
// A running cell's clock is the call's minus the cells that finished before it.
|
|
1190
|
+
const elapsedMs =
|
|
1191
|
+
state === "running" || state === "cancelled"
|
|
1192
|
+
? options.elapsedMs === undefined
|
|
1193
|
+
? undefined
|
|
1194
|
+
: Math.max(0, options.elapsedMs - earlierMs)
|
|
1195
|
+
: cell.durationMs;
|
|
1196
|
+
earlierMs += cell.durationMs ?? 0;
|
|
1197
|
+
return evalCellBox(
|
|
1167
1198
|
{
|
|
1168
1199
|
language,
|
|
1169
1200
|
code: formatEvalCodeForDisplay(cell.code, language),
|
|
1170
1201
|
title: cell.title,
|
|
1171
|
-
|
|
1172
|
-
durationMs: cell.durationMs,
|
|
1173
|
-
output: [
|
|
1202
|
+
outputs: [
|
|
1174
1203
|
...evalOutputNodes(
|
|
1175
1204
|
cell.output,
|
|
1176
|
-
cell.hasMarkdown === true,
|
|
1177
|
-
|
|
1178
|
-
cell.status === "error",
|
|
1205
|
+
cell.hasMarkdown === true && cell.status !== "error",
|
|
1206
|
+
previewLines,
|
|
1179
1207
|
),
|
|
1180
|
-
...(cell.statusEvents ?? []).map(describeStatusEvent),
|
|
1181
1208
|
...(i === cellResults.length - 1 ? jsonNodes : []),
|
|
1182
1209
|
],
|
|
1210
|
+
status: evalStatusSection(cell.statusEvents ?? [], expanded),
|
|
1211
|
+
foot: state && {
|
|
1212
|
+
state,
|
|
1213
|
+
exitCode: cell.exitCode,
|
|
1214
|
+
elapsedMs,
|
|
1215
|
+
...(i === factsIndex ? callFacts : {}),
|
|
1216
|
+
},
|
|
1183
1217
|
},
|
|
1184
1218
|
i,
|
|
1185
1219
|
cellResults.length,
|
|
1186
1220
|
);
|
|
1187
1221
|
});
|
|
1188
|
-
|
|
1189
|
-
|
|
1190
|
-
|
|
1191
|
-
|
|
1192
|
-
|
|
1222
|
+
return {
|
|
1223
|
+
tool: evalToolHead(cellResults[0]!.title, languages, cellResults.length, details),
|
|
1224
|
+
body: cells,
|
|
1225
|
+
preview: "children",
|
|
1226
|
+
};
|
|
1227
|
+
}
|
|
1228
|
+
// No per-cell results (older details): the call's cells, the whole output and foot under the last.
|
|
1229
|
+
const argCells = getRenderCells(args);
|
|
1230
|
+
const languages = details?.languages ?? (details?.language ? [details.language] : []);
|
|
1231
|
+
const rawOutput = options.renderContext?.output ?? resultText(result).trimEnd();
|
|
1232
|
+
const state: RunState = cancelled ? "cancelled" : isPartial ? "running" : result.isError ? "failed" : "done";
|
|
1233
|
+
const last: Omit<EvalCellRun, "language" | "code" | "title"> = {
|
|
1234
|
+
outputs: [
|
|
1235
|
+
...evalOutputNodes(stripOutputNotice(rawOutput, details?.meta).trimEnd(), false, previewLines),
|
|
1236
|
+
...jsonNodes,
|
|
1237
|
+
],
|
|
1238
|
+
status: evalStatusSection(details?.statusEvents ?? [], expanded),
|
|
1239
|
+
foot: { state, elapsedMs: options.elapsedMs, ...callFacts },
|
|
1240
|
+
};
|
|
1241
|
+
const runs: EvalCellRun[] =
|
|
1242
|
+
argCells.length > 0
|
|
1243
|
+
? argCells.map((cell, i) => (i === argCells.length - 1 ? { ...cell, ...last } : cell))
|
|
1244
|
+
: [{ language: languages[0] ?? "python", code: "", ...last }];
|
|
1245
|
+
return {
|
|
1246
|
+
tool: evalToolHead(
|
|
1193
1247
|
argCells[0]?.title,
|
|
1194
1248
|
argCells.length > 0 ? argCells.map(cell => cell.language) : languages,
|
|
1195
1249
|
argCells.length,
|
|
1196
1250
|
details,
|
|
1197
|
-
)
|
|
1198
|
-
|
|
1199
|
-
|
|
1200
|
-
...evalOutputNodes(
|
|
1201
|
-
stripOutputNotice(rawOutput, details?.meta).trimEnd(),
|
|
1202
|
-
false,
|
|
1203
|
-
isPartial,
|
|
1204
|
-
result.isError === true,
|
|
1205
|
-
),
|
|
1206
|
-
...(details?.statusEvents ?? []).map(describeStatusEvent),
|
|
1207
|
-
...jsonNodes,
|
|
1208
|
-
];
|
|
1209
|
-
cells =
|
|
1210
|
-
argCells.length > 0
|
|
1211
|
-
? argCells.map((cell, i) =>
|
|
1212
|
-
evalCellSection(
|
|
1213
|
-
{
|
|
1214
|
-
...cell,
|
|
1215
|
-
status: isPartial ? "running" : result.isError ? "error" : "complete",
|
|
1216
|
-
output: i === argCells.length - 1 ? output : undefined,
|
|
1217
|
-
},
|
|
1218
|
-
i,
|
|
1219
|
-
argCells.length,
|
|
1220
|
-
),
|
|
1221
|
-
)
|
|
1222
|
-
: output;
|
|
1223
|
-
}
|
|
1224
|
-
return {
|
|
1225
|
-
tool: head,
|
|
1226
|
-
body: compact<NativeChild>([...cells, footer]),
|
|
1227
|
-
preview: { lines: previewLines },
|
|
1251
|
+
),
|
|
1252
|
+
body: runs.map((run, i) => evalCellBox(run, i, runs.length)),
|
|
1253
|
+
preview: "children",
|
|
1228
1254
|
};
|
|
1229
1255
|
},
|
|
1230
1256
|
|
package/src/tools/fetch.ts
CHANGED
|
@@ -282,6 +282,10 @@ export function renderReadUrlResult(
|
|
|
282
282
|
|
|
283
283
|
let lastExpanded: boolean | undefined;
|
|
284
284
|
let contentPreviewLines: string[] | undefined;
|
|
285
|
+
const dropPreview = () => {
|
|
286
|
+
lastExpanded = undefined;
|
|
287
|
+
contentPreviewLines = undefined;
|
|
288
|
+
};
|
|
285
289
|
return framedToolCard(
|
|
286
290
|
uiTheme,
|
|
287
291
|
() => {
|
|
@@ -315,11 +319,6 @@ export function renderReadUrlResult(
|
|
|
315
319
|
applyBg: false,
|
|
316
320
|
};
|
|
317
321
|
},
|
|
318
|
-
{
|
|
319
|
-
onInvalidate: () => {
|
|
320
|
-
lastExpanded = undefined;
|
|
321
|
-
contentPreviewLines = undefined;
|
|
322
|
-
},
|
|
323
|
-
},
|
|
322
|
+
{ onInvalidate: dropPreview, onReleaseRenderCaches: dropPreview },
|
|
324
323
|
);
|
|
325
324
|
}
|
package/src/tools/index.ts
CHANGED
|
@@ -27,6 +27,7 @@ import { todoToolRenderer } from "./todo";
|
|
|
27
27
|
import { createVibeToolRenderer } from "./vibe";
|
|
28
28
|
import { webSearchToolRenderer } from "./web-search";
|
|
29
29
|
import { writeToolRenderer } from "./write";
|
|
30
|
+
import { yieldToolRenderer } from "./yield";
|
|
30
31
|
import { setXdevRendererLookup } from "./xdev";
|
|
31
32
|
|
|
32
33
|
export * from "./renderer";
|
|
@@ -67,6 +68,7 @@ export const toolRenderers: Record<string, ToolRenderer> = {
|
|
|
67
68
|
vibe_kill: createVibeToolRenderer("kill"),
|
|
68
69
|
vibe_list: createVibeToolRenderer("list"),
|
|
69
70
|
write: writeToolRenderer,
|
|
71
|
+
yield: yieldToolRenderer,
|
|
70
72
|
};
|
|
71
73
|
|
|
72
74
|
// Wire the xd:// render delegation without the xdev module importing this registry.
|
package/src/tools/mcp.ts
CHANGED
|
@@ -121,7 +121,15 @@ function renderMarkdownMCPResult(
|
|
|
121
121
|
applyBg: false,
|
|
122
122
|
};
|
|
123
123
|
},
|
|
124
|
-
{
|
|
124
|
+
{
|
|
125
|
+
paddingX: 0,
|
|
126
|
+
paddingY: 0,
|
|
127
|
+
onInvalidate: () => (bodyMemo = undefined),
|
|
128
|
+
onReleaseRenderCaches: () => {
|
|
129
|
+
bodyMemo = undefined;
|
|
130
|
+
markdown.releaseRenderCaches();
|
|
131
|
+
},
|
|
132
|
+
},
|
|
125
133
|
);
|
|
126
134
|
}
|
|
127
135
|
|
|
@@ -208,7 +216,12 @@ export function renderMCPResult(
|
|
|
208
216
|
}
|
|
209
217
|
return { status, phase, body: bodyMemo.lines, applyBg: false };
|
|
210
218
|
},
|
|
211
|
-
{
|
|
219
|
+
{
|
|
220
|
+
paddingX: 0,
|
|
221
|
+
paddingY: 0,
|
|
222
|
+
onInvalidate: () => (bodyMemo = undefined),
|
|
223
|
+
onReleaseRenderCaches: () => (bodyMemo = undefined),
|
|
224
|
+
},
|
|
212
225
|
);
|
|
213
226
|
|
|
214
227
|
function buildMcpResultBody(contentWidth: number): string[] {
|
package/src/tools/native-view.ts
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import * as path from "node:path";
|
|
7
7
|
import { pathToFileURL } from "node:url";
|
|
8
8
|
import type { TspSpan, TspText, TspTone } from "@oh-my-pi/pi-wire";
|
|
9
|
-
import { code, keyed, node, row, span, text } from "../native/describe";
|
|
9
|
+
import { ansi, code, compact, keyed, node, row, span, text } from "../native/describe";
|
|
10
10
|
import type { NativeChild, NativeNode } from "../native/node";
|
|
11
11
|
import { type ParsedDiagnostic, parseDiagnosticMessage, shortenPath } from "../render/render-utils";
|
|
12
12
|
import { plainText } from "../native/spans";
|
|
@@ -189,6 +189,107 @@ export function footnoteText(parts: readonly string[], meta?: OutputMeta): Nativ
|
|
|
189
189
|
};
|
|
190
190
|
}
|
|
191
191
|
|
|
192
|
+
/** Drawn lines of a run's input (command, cell code) before its "N more lines" button. */
|
|
193
|
+
export const RUN_INPUT_PREVIEW_LINES = 6;
|
|
194
|
+
|
|
195
|
+
/**
|
|
196
|
+
* What a run's foot names: `running` (live clock), `background` (an async job
|
|
197
|
+
* outlives the call), and the settled outcomes. A failure with an exit code
|
|
198
|
+
* reads `exit N`; without one, `Failed`.
|
|
199
|
+
*/
|
|
200
|
+
export type RunState = "running" | "background" | "done" | "failed" | "cancelled" | "timed-out";
|
|
201
|
+
|
|
202
|
+
const RUN_STATE: Record<RunState, { readonly word: string; readonly tone: TspTone }> = {
|
|
203
|
+
running: { word: "Running", tone: "pending" },
|
|
204
|
+
background: { word: "In background", tone: "pending" },
|
|
205
|
+
done: { word: "Done", tone: "success" },
|
|
206
|
+
failed: { word: "Failed", tone: "error" },
|
|
207
|
+
cancelled: { word: "Cancelled", tone: "muted" },
|
|
208
|
+
"timed-out": { word: "Timed out", tone: "warning" },
|
|
209
|
+
};
|
|
210
|
+
|
|
211
|
+
/** Inputs of {@link runFoot}. */
|
|
212
|
+
export interface RunFootInput {
|
|
213
|
+
readonly state: RunState;
|
|
214
|
+
/** Exit code of a `failed` run; a non-zero code names the state `exit N`. */
|
|
215
|
+
readonly exitCode?: number;
|
|
216
|
+
/** Milliseconds run so far (`running`) or in total; the time is omitted when undefined. */
|
|
217
|
+
readonly elapsedMs?: number;
|
|
218
|
+
/** Quiet facts (job id, service state, artifact), muted and ` · `-joined. */
|
|
219
|
+
readonly facts?: readonly string[];
|
|
220
|
+
/** Truncation / artifact-capture notices, appended to the facts in `warning`. */
|
|
221
|
+
readonly meta?: OutputMeta;
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
/**
|
|
225
|
+
* The foot line of a run box (`omp.run.foot`): the state word in its tone,
|
|
226
|
+
* the run time (a live clock while running, frozen once settled) and the
|
|
227
|
+
* quiet facts. Glyphs are the terminal's styling, never text.
|
|
228
|
+
*/
|
|
229
|
+
export function runFoot(input: RunFootInput): NativeNode {
|
|
230
|
+
const failedWithCode = input.state === "failed" && input.exitCode !== undefined && input.exitCode !== 0;
|
|
231
|
+
const state = failedWithCode
|
|
232
|
+
? { word: `exit ${input.exitCode}`, tone: RUN_STATE.failed.tone }
|
|
233
|
+
: RUN_STATE[input.state];
|
|
234
|
+
const facts = (input.facts ?? []).map(fact => plainText(fact).trim()).filter(fact => fact.length > 0);
|
|
235
|
+
const notices: string[] = [];
|
|
236
|
+
if (input.meta?.truncation) notices.push(formatTruncationMetaNotice(input.meta.truncation, input.meta.source));
|
|
237
|
+
if (input.meta?.artifactError) notices.push(formatArtifactErrorNotice(input.meta.artifactError));
|
|
238
|
+
const factSpans: TspSpan[] = [];
|
|
239
|
+
if (facts.length > 0) factSpans.push(span(facts.join(" · "), "muted"));
|
|
240
|
+
for (const notice of notices) {
|
|
241
|
+
if (factSpans.length > 0) factSpans.push(span(" · ", "muted"));
|
|
242
|
+
factSpans.push(span(notice, "warning"));
|
|
243
|
+
}
|
|
244
|
+
const ms = input.elapsedMs === undefined ? undefined : Math.max(0, Math.round(input.elapsedMs));
|
|
245
|
+
const time =
|
|
246
|
+
ms === undefined
|
|
247
|
+
? undefined
|
|
248
|
+
: node(
|
|
249
|
+
"elapsed",
|
|
250
|
+
input.state === "running"
|
|
251
|
+
? { role: "omp.run.time", age: ms, format: "short" }
|
|
252
|
+
: { role: "omp.run.time", age: ms, stopped: ms, format: "short" },
|
|
253
|
+
undefined,
|
|
254
|
+
"time",
|
|
255
|
+
);
|
|
256
|
+
return node(
|
|
257
|
+
"row",
|
|
258
|
+
{ role: "omp.run.foot", gap: "sm", align: "center" },
|
|
259
|
+
compact<NativeNode>([
|
|
260
|
+
keyed(text([span(state.word)], { role: "omp.run.state", tone: state.tone }), "state"),
|
|
261
|
+
time,
|
|
262
|
+
factSpans.length > 0 && keyed(text(factSpans, { role: "omp.run.facts", wrap: "word" }), "facts"),
|
|
263
|
+
]),
|
|
264
|
+
"foot",
|
|
265
|
+
);
|
|
266
|
+
}
|
|
267
|
+
|
|
268
|
+
/** A run's input section: the command or cell source, clamped to {@link RUN_INPUT_PREVIEW_LINES}. */
|
|
269
|
+
export function runInput(source: string, p: { role: string; lang: string; wrap: boolean }): NativeNode {
|
|
270
|
+
return keyed(
|
|
271
|
+
code(source.trimEnd(), { role: p.role, lang: p.lang, wrap: p.wrap, preview: { lines: RUN_INPUT_PREVIEW_LINES } }),
|
|
272
|
+
"input",
|
|
273
|
+
);
|
|
274
|
+
}
|
|
275
|
+
|
|
276
|
+
/** A run's terminal output: follows its tail, clamped to the last `previewLines` lines while folded. */
|
|
277
|
+
export function runOutput(output: string, p: { role: string; previewLines: number; key?: string }): NativeNode {
|
|
278
|
+
return keyed(ansi(output, { role: p.role, follow: true, preview: { lines: p.previewLines } }), p.key ?? "output");
|
|
279
|
+
}
|
|
280
|
+
|
|
281
|
+
/**
|
|
282
|
+
* One run as one box (`omp.run`): input, output, status lines and foot in
|
|
283
|
+
* order. `tone` tints the box: `error` for a failed run, `warning` for a
|
|
284
|
+
* timed-out one.
|
|
285
|
+
*/
|
|
286
|
+
export function runBox(
|
|
287
|
+
children: readonly (NativeChild | undefined | false)[],
|
|
288
|
+
p: { key: string; tone?: TspTone },
|
|
289
|
+
): NativeNode {
|
|
290
|
+
return node("col", { role: "omp.run", gap: "none", tone: p.tone }, compact(children), p.key);
|
|
291
|
+
}
|
|
292
|
+
|
|
192
293
|
/** Diagnostic rows shown before `+N more`. */
|
|
193
294
|
const DIAGNOSTIC_ROWS = 5;
|
|
194
295
|
|
package/src/tools/read.ts
CHANGED
|
@@ -600,6 +600,11 @@ export const readToolRenderer = {
|
|
|
600
600
|
let cachedWidth: number | undefined;
|
|
601
601
|
let cachedExpanded: boolean | undefined;
|
|
602
602
|
let cachedLines: string[] | undefined;
|
|
603
|
+
const dropCache = () => {
|
|
604
|
+
cachedWidth = undefined;
|
|
605
|
+
cachedExpanded = undefined;
|
|
606
|
+
cachedLines = undefined;
|
|
607
|
+
};
|
|
603
608
|
return markFramedBlockComponent({
|
|
604
609
|
render: (width: number) => {
|
|
605
610
|
const expanded = options.expanded;
|
|
@@ -634,11 +639,8 @@ export const readToolRenderer = {
|
|
|
634
639
|
cachedExpanded = expanded;
|
|
635
640
|
return cachedLines;
|
|
636
641
|
},
|
|
637
|
-
invalidate:
|
|
638
|
-
|
|
639
|
-
cachedExpanded = undefined;
|
|
640
|
-
cachedLines = undefined;
|
|
641
|
-
},
|
|
642
|
+
invalidate: dropCache,
|
|
643
|
+
releaseRenderCaches: dropCache,
|
|
642
644
|
});
|
|
643
645
|
},
|
|
644
646
|
describeCall(args: ReadRenderArgs): NativeToolView {
|
package/src/tools/renderer.ts
CHANGED
|
@@ -26,6 +26,14 @@ export interface RenderResultOptions {
|
|
|
26
26
|
* Streamed `xd://` previews stay queued until this is set.
|
|
27
27
|
*/
|
|
28
28
|
executionStarted?: boolean;
|
|
29
|
+
/**
|
|
30
|
+
* Milliseconds since this call began executing (`tool_execution_start`),
|
|
31
|
+
* or its total once settled; undefined before it starts. Native describe
|
|
32
|
+
* hooks only.
|
|
33
|
+
*/
|
|
34
|
+
elapsedMs?: number;
|
|
35
|
+
/** The call was abandoned without a final result (turn aborted, sealed). Native describe hooks only. */
|
|
36
|
+
cancelled?: boolean;
|
|
29
37
|
}
|
|
30
38
|
|
|
31
39
|
/** Render options for a result, plus the tool-specific context the transcript threads through. */
|
|
@@ -90,6 +98,8 @@ export interface NativeToolHead {
|
|
|
90
98
|
readonly targetKind?: TspToolProps["targetKind"];
|
|
91
99
|
/** Language for `command` targets. */
|
|
92
100
|
readonly lang?: string;
|
|
101
|
+
/** The raw command line the head's Copy command button copies (set implicitly by a `command` target). */
|
|
102
|
+
readonly command?: string;
|
|
93
103
|
/** `file://` link for path targets. */
|
|
94
104
|
readonly href?: string;
|
|
95
105
|
/** Short facts after the target (`+8 −1`, `5 matches · 2 files`). */
|
|
@@ -117,8 +127,11 @@ export interface NativeToolView {
|
|
|
117
127
|
readonly body?: readonly NativeChild[];
|
|
118
128
|
/** Tone override; the frame otherwise derives it from the call status. */
|
|
119
129
|
readonly tone?: TspTone;
|
|
120
|
-
/**
|
|
121
|
-
|
|
130
|
+
/**
|
|
131
|
+
* Body clamp while collapsed; `{tail}` keeps the end (terminal output). Defaults to the transcript's preview size.
|
|
132
|
+
* `children`: the body stays whole while collapsed and its own `ansi`/`code` previews clamp instead.
|
|
133
|
+
*/
|
|
134
|
+
readonly preview?: TspPreview | { readonly tail: number } | "none" | "children";
|
|
122
135
|
/** Starts expanded whatever the transcript's expand state (the todo checklist); the user can still fold it. */
|
|
123
136
|
readonly open?: boolean;
|
|
124
137
|
/** Render frameless (`frame:"inline"`): a head line plus a disclosed body. */
|