@yusukeshib/pi-babysit 0.6.15 → 0.6.17

package/README.md

@@ -98,6 +98,14 @@ Pi's transcript shortcuts. At the bottom it follows new output; scrolling up
 pauses following until you return to the bottom. The viewer resizes with the
 terminal, leaving room for the editor/status/footer. Agent logs separate
 assistant text, tool calls, and results; process logs show terminal output.
+When babysit provides `output.timestamps.jsonl`, process lines begin with a muted
+local `[YYYY-MM-DD HH:mm:ss]` capture time, with wrapped text aligned beneath the
+message. Agent lines show the capture time of their block's first available event
+in the same left column, with the assistant/tool/result/error label beside the
+first content line; streamed updates and duplicate results keep that time. This
+is the time babysit received the first byte of the event or line, not an
+application event time. Narrow views place the date above the text. Old logs and
+lines without capture metadata remain readable without invented timestamps.
 Only the selected log is loaded, bounded to the latest 1 MiB / 2,000 display
 lines with an omission notice; the full log file is unchanged. Empty logs show
 a placeholder. Works in the released Pi 1.0 widget host. Mouse interaction

package/index.ts

@@ -2521,7 +2521,7 @@ export function createSessionWidget(options: {
 	getHeight: () => number;
 	requestRender: () => void;
 	getTheme: () => Theme;
-	readLog: (id: string) => { text: string; isAgent: boolean; clipped?: boolean };
+	readLog: (id: string) => { text: string; isAgent: boolean; clipped?: boolean; lineTimestamps?: (number | undefined)[] };
 }) {
 	const listState: WidgetSessionListState = { mode: "running", page: 0 };
 	let selectedId: string | undefined;
@@ -2539,6 +2539,7 @@ export function createSessionWidget(options: {
 			log.text,
 			log.isAgent,
 			detail.startsWith("task: ") ? detail.slice(6) : detail,
+			log.lineTimestamps,
 		);
 	}
 	function close() {
@@ -2571,8 +2572,44 @@ export function createSessionWidget(options: {
 	};
 }
 
+/** Capture times are optional: old logs and incomplete sidecars remain readable. */
+function readLineTimestamps(file: string, data: Buffer, offset: number): (number | undefined)[] {
+	const metadata = readViewerLog(path.join(path.dirname(file), "output.timestamps.jsonl")).text;
+	const ranges: { start: number; end: number; time: number }[] = [];
+	for (const line of metadata.split("\n")) {
+		try {
+			const record = JSON.parse(line);
+			if (!Array.isArray(record) || record.length !== 3) continue;
+			const [start, length, time] = record;
+			if (!Number.isSafeInteger(start) || start < 0 ||
+				!Number.isSafeInteger(length) || length <= 0 ||
+				!Number.isSafeInteger(start + length) ||
+				!Number.isSafeInteger(time) || time < 0 || time > 8640000000000000 ||
+				start < (ranges.at(-1)?.end ?? 0)) continue;
+			ranges.push({ start, end: start + length, time });
+		} catch { /* A partial or malformed record has no trustworthy time. */ }
+	}
+	let range = 0;
+	const timestamps: (number | undefined)[] = [];
+	const addLine = (position: number) => {
+		const absolute = offset + position;
+		while (range < ranges.length && ranges[range].end <= absolute) range++;
+		const entry = ranges[range];
+		timestamps.push(position < data.length && entry && entry.start <= absolute ? entry.time : undefined);
+	};
+	addLine(0);
+	for (let i = 0; i < data.length; i++) {
+		if (data[i] !== 10 && data[i] !== 13) continue;
+		if (data[i] === 13 && data[i + 1] === 10) i++;
+		addLine(i + 1);
+	}
+	return timestamps;
+}
+
 /** Only the selected session is read; bounded snapshots never affect worker logs. */
-export function readViewerLog(file: string): { text: string; clipped: boolean } {
+export function readViewerLog(file: string, withTimestamps = false): {
+	text: string; clipped: boolean; lineTimestamps?: (number | undefined)[];
+} {
 	try {
 		const fd = fs.openSync(file, "r");
 		try {
@@ -2580,9 +2617,18 @@ export function readViewerLog(file: string): { text: string; clipped: boolean }
 			const start = Math.max(0, size - 1024 * 1024);
 			const buffer = Buffer.alloc(size - start);
 			const bytes = fs.readSync(fd, buffer, 0, buffer.length, start);
-			let text = buffer.subarray(0, bytes).toString("utf8");
-			if (start > 0) text = text.slice(text.indexOf("\n") + 1);
-			return { text, clipped: start > 0 };
+			let data = buffer.subarray(0, bytes);
+			let offset = start;
+			if (start > 0) {
+				const skip = data.indexOf(10) + 1;
+				data = data.subarray(skip);
+				offset += skip;
+			}
+			const text = data.toString("utf8");
+			return {
+				text, clipped: start > 0,
+				...(withTimestamps ? { lineTimestamps: readLineTimestamps(file, data, offset) } : {}),
+			};
 		} finally { fs.closeSync(fd); }
 	} catch {
 		return { text: "", clipped: false };
@@ -3627,7 +3673,10 @@ export default function (pi: ExtensionAPI) {
 						getHeight: () => Math.max(3, tui.terminal.rows - 8),
 						requestRender: () => tui.requestRender(),
 						getTheme: () => ctx.ui.theme,
-						readLog: (id) => ({ ...readViewerLog(logPath(id)), isAgent: kindOf(id) === "subagent" }),
+						readLog: (id) => {
+							const isAgent = kindOf(id) === "subagent";
+							return { ...readViewerLog(logPath(id), true), isAgent };
+						},
 					});
 					return sessionWidget;
 				}, { placement: "belowEditor" });

package/log-viewer.ts

@@ -31,7 +31,7 @@ function sanitize(text: string, sgr = false): string {
 			(s) => (sgr && /^\x1b\[[\d;]*m$/.test(s) ? s : ""),
 		);
 }
-type Block = { kind: "assistant" | "tool" | "result" | "error"; text: string };
+type Block = { kind: "assistant" | "tool" | "result" | "error"; text: string; timestamp?: number };
 function contentText(content: unknown): string {
 	if (typeof content === "string") return content;
 	return Array.isArray(content)
@@ -41,15 +41,17 @@ function contentText(content: unknown): string {
 				.join("")
 		: "";
 }
-function agentBlocks(raw: string): Block[] {
+function agentBlocks(raw: string, timestamps?: (number | undefined)[]): Block[] {
 	const blocks: Block[] = [];
 	let current: Block | undefined;
 	const toolResults = new Map<string, Block>();
-	const assistant = () =>
-		(current ??=
-			(blocks.push({ kind: "assistant", text: "" }),
-			blocks[blocks.length - 1]));
-	for (const line of raw.split("\n")) {
+	const assistant = (timestamp: number | undefined) => {
+		current ??= (blocks.push({ kind: "assistant", text: "", timestamp }), blocks[blocks.length - 1]);
+		current.timestamp ??= timestamp;
+		return current;
+	};
+	for (const [index, line] of raw.split(/\r\n|\r|\n/).entries()) {
+		const timestamp = timestamps?.[index];
 		let e: any;
 		try {
 			e = JSON.parse(line);
@@ -62,28 +64,30 @@ function agentBlocks(raw: string): Block[] {
 		if (["message_start", "message_update", "message_end"].includes(e.type)) {
 			if (e.message?.role === "assistant") {
 				const text = contentText(e.message.content);
-				const b = assistant();
+				const b = assistant(timestamp);
 				if (text) b.text = text; // cumulative/final snapshots replace streamed deltas
 				if (e.message.errorMessage)
-					blocks.push({ kind: "error", text: String(e.message.errorMessage) });
+					blocks.push({ kind: "error", text: String(e.message.errorMessage), timestamp });
 				if (e.type === "message_end") current = undefined;
 			} else if (
 				!e.message &&
 				e.assistantMessageEvent?.type === "text_delta" &&
 				typeof e.assistantMessageEvent.delta === "string"
 			) {
-				assistant().text += e.assistantMessageEvent.delta;
+				assistant(timestamp).text += e.assistantMessageEvent.delta;
 			} else if (e.type === "message_end" && e.message?.role === "toolResult") {
 				const id = e.message.toolCallId;
 				const text = contentText(e.message.content);
 				if (id && toolResults.has(id)) {
 					const b = toolResults.get(id)!;
 					b.text = text;
+					b.timestamp ??= timestamp;
 					b.kind = e.message.isError ? "error" : b.kind;
 				} else {
 					const b: Block = {
 						kind: e.message.isError ? "error" : "result",
 						text,
+						timestamp,
 					};
 					blocks.push(b);
 					if (id) toolResults.set(id, b);
@@ -93,10 +97,12 @@ function agentBlocks(raw: string): Block[] {
 			blocks.push({
 				kind: "tool",
 				text: `${e.toolName ?? "tool"} ${JSON.stringify(e.args ?? {})}`,
+				timestamp,
 			});
 		} else if (e.type === "tool_execution_end") {
 			const b: Block = {
 				kind: e.isError ? "error" : "result",
+				timestamp,
 				text:
 					contentText(e.result?.content) ||
 					String(e.error?.message ?? e.error ?? ""),
@@ -108,6 +114,7 @@ function agentBlocks(raw: string): Block[] {
 		} else if (e.type === "error")
 			blocks.push({
 				kind: "error",
+				timestamp,
 				text: String(
 					e.message ?? e.error?.message ?? e.error ?? "Unknown error",
 				),
@@ -118,11 +125,18 @@ function agentBlocks(raw: string): Block[] {
 		.map((b) => ({ ...b, text: sanitize(b.text) }));
 }
 
+function dateLabel(timestamp: number): string {
+	const date = new Date(timestamp);
+	const pad = (n: number) => String(n).padStart(2, "0");
+	return `[${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}]`;
+}
+
 export function createLogViewer(options: LogViewerOptions) {
 	let header = "",
 		raw = "",
 		description = "",
 		isAgent = false;
+	let lineTimestamps: (number | undefined)[] | undefined;
 	let cache: string[] | undefined,
 		cacheWidth = -1,
 		cacheTheme: Theme | undefined;
@@ -134,7 +148,7 @@ export function createLogViewer(options: LogViewerOptions) {
 			const theme = options.getTheme();
 			if (cache && cacheWidth === width && cacheTheme === theme) return cache;
 			const blocks = isAgent
-				? agentBlocks(raw)
+				? agentBlocks(raw, lineTimestamps)
 				: [{ kind: "result" as const, text: sanitize(raw, true) }];
 			const lines: string[] = description
 				? [
@@ -144,7 +158,41 @@ export function createLogViewer(options: LogViewerOptions) {
 					]
 				: [];
 			for (const b of blocks) {
-				if (isAgent)
+				if (!isAgent && lineTimestamps?.some((time) => time !== undefined)) {
+					for (const [index, text] of raw.split(/\r\n|\r|\n/).entries()) {
+						const time = lineTimestamps[index];
+						const label = time === undefined ? "" : dateLabel(time);
+						const indent = label ? visibleWidth(label) + 1 : 0;
+						if (indent && width <= indent + 4) {
+							lines.push(...new Text(theme.fg("muted", label), 0, 0).render(width));
+							lines.push(...new Text(sanitize(text, true), 0, 0).render(width));
+						} else {
+							const wrapped = new Text(sanitize(text, true), 0, 0).render(width - indent);
+							lines.push(...wrapped.map((line, row) =>
+								(row === 0 && label ? theme.fg("muted", label) + " " : " ".repeat(indent)) + line));
+						}
+					}
+					continue;
+				}
+				if (isAgent && b.timestamp !== undefined) {
+					const date = theme.fg("muted", dateLabel(b.timestamp));
+					const kind = theme.fg(b.kind === "error" ? "error" : b.kind === "assistant" ? "accent" : "toolTitle", `[${b.kind}]`);
+					const indent = visibleWidth(date) + 1;
+					const kindIndent = visibleWidth(kind) + 1;
+					if (width <= indent + kindIndent + 4) {
+						lines.push(...new Text(date, 0, 0).render(width));
+						lines.push(...new Text(`${kind} ${b.text}`, 0, 0).render(width));
+					} else {
+						const contentWidth = width - indent - kindIndent;
+						const rendered = b.kind === "assistant"
+							? new Markdown(b.text, 0, 0, getMarkdownTheme()).render(contentWidth)
+							: new Text(b.text, 0, 0).render(contentWidth);
+						lines.push(...rendered.map((line, row) =>
+							`${date} ${row === 0 ? kind + " " : " ".repeat(kindIndent)}${line}`));
+					}
+					continue;
+				}
+				if (isAgent) {
 					lines.push(
 						theme.fg(
 							b.kind === "error"
@@ -155,6 +203,7 @@ export function createLogViewer(options: LogViewerOptions) {
 							`[${b.kind}]`,
 						),
 					);
+				}
 				lines.push(
 					...(b.kind === "assistant"
 						? new Markdown(b.text, 0, 0, getMarkdownTheme()).render(width)
@@ -321,9 +370,11 @@ export function createLogViewer(options: LogViewerOptions) {
 		invalidate() {
 			body.invalidate();
 		},
-		update(nextHeader: string, logText: string, agent: boolean, context = "") {
+		update(nextHeader: string, logText: string, agent: boolean, context = "", timestamps?: (number | undefined)[]) {
 			header = nextHeader;
-			if (raw !== logText || isAgent !== agent || description !== context) {
+			if (raw !== logText || isAgent !== agent || description !== context ||
+				JSON.stringify(lineTimestamps) !== JSON.stringify(timestamps)) {
+				lineTimestamps = timestamps;
 				raw = logText;
 				isAgent = agent;
 				description = context;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yusukeshib/pi-babysit",
-  "version": "0.6.15",
+  "version": "0.6.17",
   "description": "Run any shell command and pi subagents under babysit, with context-safe captured output.",
   "keywords": [
     "pi-package",