@oh-my-pi/pi-coding-agent 17.1.5 → 17.1.6

package/src/modes/components/status-line/component.jj-cache.test.ts

@@ -1,229 +0,0 @@
-import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, spyOn } from "bun:test";
-import * as fs from "node:fs";
-import * as os from "node:os";
-import * as path from "node:path";
-import { getProjectDir, setProjectDir } from "@oh-my-pi/pi-utils";
-import { Settings, settings } from "../../../config/settings";
-import type { AgentSession } from "../../../session/agent-session";
-import * as git from "../../../utils/git";
-import * as jj from "../../../utils/jj";
-import { getThemeByName, setThemeInstance } from "../../theme/theme";
-import { StatusLineComponent } from "./component";
-
-// Minimal session the git-only status line render path touches: state.messages
-// (token-rate scan), model window, streaming flag, and the async-job snapshot.
-// The `git` segment reads none of these — they only keep #buildStatusLine from
-// throwing while it renders the single segment under test.
-function makeSession(): AgentSession {
-	const model = { contextWindow: 128000 } as const;
-	return {
-		state: { messages: [], model },
-		messages: [],
-		model,
-		isStreaming: false,
-		sessionFile: undefined,
-		getAsyncJobSnapshot: () => null,
-		getContextUsage: () => ({ tokens: 0, contextWindow: 128000 }),
-	} as unknown as AgentSession;
-}
-
-// Drain the microtask queue so the fire-and-forget async jj lookups started by a
-// render() have applied their result to the cache. No real timers: only
-// already-resolved promises are awaited, so this stays deterministic.
-async function flushMicrotasks(): Promise<void> {
-	for (let i = 0; i < 8; i++) await Promise.resolve();
-}
-
-// Strip SGR/OSC escapes so assertions match on the visible branch label text.
-function visible(s: string): string {
-	return s.replace(/\x1b\][^\x07]*\x07/g, "").replace(/\x1b\[[0-9;]*m/g, "");
-}
-
-const WIDTH = 200;
-
-let spies: Array<{ mockRestore(): void }> = [];
-let tmpA: string;
-let tmpB: string;
-let originalProjectDir: string;
-const ROOT_A = "/virtual/jj-root-a";
-const ROOT_B = "/virtual/jj-root-b";
-
-beforeAll(async () => {
-	await Settings.init({ inMemory: true });
-	const loaded = await getThemeByName("dark");
-	if (!loaded) throw new Error("theme unavailable");
-	setThemeInstance(loaded);
-	// Render only the git segment: shrinks the render surface to the code under
-	// test and keeps the fake session tiny. Constructor snapshots these, so they
-	// must be set before any `new StatusLineComponent`.
-	settings.override("statusLine.preset", "custom");
-	settings.override("statusLine.leftSegments", ["git"]);
-	settings.override("statusLine.rightSegments", []);
-	originalProjectDir = getProjectDir();
-	tmpA = fs.mkdtempSync(path.join(os.tmpdir(), "jjcache-a-"));
-	tmpB = fs.mkdtempSync(path.join(os.tmpdir(), "jjcache-b-"));
-});
-
-afterAll(() => {
-	settings.clearOverride("statusLine.preset");
-	settings.clearOverride("statusLine.leftSegments");
-	settings.clearOverride("statusLine.rightSegments");
-	setProjectDir(originalProjectDir);
-	fs.rmSync(tmpA, { recursive: true, force: true });
-	fs.rmSync(tmpB, { recursive: true, force: true });
-});
-
-beforeEach(() => {
-	// Force the jj fallback branch in #buildSegmentContext: git HEAD resolves to
-	// null (so gitBranch === null triggers #getJjBranch), and no repo/worktree is
-	// detected (so effectiveGitCwd stays the raw project dir we control).
-	spies = [
-		spyOn(git.head, "resolveSync").mockReturnValue(null),
-		spyOn(git.repo, "resolveSync").mockReturnValue(null),
-		spyOn(git.repo, "linkedWorktreeSync").mockReturnValue(null),
-		// jj status: return a clean summary so #getJjStatus never falls through to
-		// the real `git status` subprocess. Keeps the git segment's status empty so
-		// the visible content is exactly the branch label.
-		spyOn(jj.status, "summary").mockResolvedValue({ staged: 0, unstaged: 0, untracked: 0 }),
-		// Map each controlled project dir to a stable virtual jj root.
-		spyOn(jj.repo, "rootSync").mockImplementation(cwd => {
-			if (cwd === tmpA) return ROOT_A;
-			if (cwd === tmpB) return ROOT_B;
-			return null;
-		}),
-	];
-	setProjectDir(tmpA);
-});
-
-afterEach(() => {
-	for (const s of spies) s.mockRestore();
-	spies = [];
-});
-
-describe("StatusLineComponent jj cache coherence", () => {
-	it("invalidate() drops the throttled jj branch cache within its TTL and refetches", async () => {
-		// A live jj bookmark label; a second query for the SAME root returns a new
-		// label, simulating a colocated bookmark/HEAD move mid-TTL.
-		const branchSpy = spyOn(jj.workingCopy, "label").mockResolvedValue("bookmark-v1");
-		spies.push(branchSpy);
-
-		const statusLine = new StatusLineComponent(makeSession());
-
-		// First render kicks off the async lookup (returns the empty cache); after
-		// it resolves, a second render paints the fetched label.
-		statusLine.getTopBorder(WIDTH);
-		await flushMicrotasks();
-		expect(visible(statusLine.getTopBorder(WIDTH).content)).toContain("bookmark-v1");
-		expect(branchSpy).toHaveBeenCalledTimes(1);
-
-		// Move the bookmark: a plain render within the 5s TTL must keep serving the
-		// cached label without a refetch (guards that the TTL is real, so the next
-		// assertion proves invalidate() — not TTL expiry — forces the refresh).
-		branchSpy.mockResolvedValue("bookmark-v2");
-		const throttled = visible(statusLine.getTopBorder(WIDTH).content);
-		await flushMicrotasks();
-		expect(throttled).toContain("bookmark-v1");
-		expect(branchSpy).toHaveBeenCalledTimes(1);
-
-		// invalidate() (public watcher trigger) must reset the jj caches so the
-		// next render refetches despite being inside the TTL, and paint the new
-		// label — the finding-1 contract.
-		statusLine.invalidate();
-		statusLine.getTopBorder(WIDTH);
-		await flushMicrotasks();
-		expect(branchSpy).toHaveBeenCalledTimes(2);
-		expect(visible(statusLine.getTopBorder(WIDTH).content)).toContain("bookmark-v2");
-		expect(visible(statusLine.getTopBorder(WIDTH).content)).not.toContain("bookmark-v1");
-	});
-
-	it("a jj lookup that resolves after the root changed never lands in the new root's cache", async () => {
-		// Root A's query hangs on a deferred so it is still in flight when we
-		// switch repos; root B resolves with its own label.
-		const deferredA = Promise.withResolvers<string | null>();
-		const branchSpy = spyOn(jj.workingCopy, "label").mockImplementation(async root => {
-			if (root === ROOT_A) return deferredA.promise;
-			if (root === ROOT_B) return "branch-B";
-			return null;
-		});
-		spies.push(branchSpy);
-
-		const statusLine = new StatusLineComponent(makeSession());
-
-		// Render in repo A: starts the (hanging) lookup for ROOT_A. Nothing painted
-		// yet — the cache is empty and the query is unresolved.
-		expect(visible(statusLine.getTopBorder(WIDTH).content)).not.toContain("branch-A-STALE");
-		expect(branchSpy).toHaveBeenCalledTimes(1);
-
-		// Switch to repo B mid-flight. #jjRootFor(tmpB) re-points #jjRoot to ROOT_B
-		// and resets the jj caches; ROOT_A's lookup is now stale. The render can't
-		// start B's lookup yet — the single in-flight flag is still held by A.
-		setProjectDir(tmpB);
-		statusLine.getTopBorder(WIDTH);
-		await flushMicrotasks();
-		expect(branchSpy).toHaveBeenCalledTimes(1);
-
-		// Let ROOT_A's slow query finish, then drain its continuation. The
-		// root-keyed guard must DROP it: #jjRoot is ROOT_B, so A's label must never
-		// become B's cached branch, and A's completion must not advance B's
-		// throttle (leaving B free to refetch) — the finding-2/4 contract.
-		deferredA.resolve("branch-A-STALE");
-		await flushMicrotasks();
-
-		// The very next render paints synchronously from the current cache BEFORE
-		// any new fetch resolves. This is the only window the transient stale is
-		// observable: with the fix the cache is empty here (A's result was
-		// dropped), so this render both refuses to paint A's label AND is free to
-		// launch B's refetch. Without the fix, A's stale label is already sitting
-		// in B's cache and paints here.
-		const paintedImmediate = visible(statusLine.getTopBorder(WIDTH).content);
-		expect(paintedImmediate).not.toContain("branch-A-STALE");
-
-		// Steady state: B's (now unthrottled) refetch resolves and paints B's real
-		// label — confirming the switch left B's cache coherent, not poisoned.
-		await flushMicrotasks();
-		expect(visible(statusLine.getTopBorder(WIDTH).content)).toContain("branch-B");
-	});
-
-	it("a jj lookup that resolves after a same-root invalidation never lands as stale", async () => {
-		// The finding-6 race: a HEAD/bookmark move invalidates the caches while a
-		// branch query for the SAME root is still in flight. #invalidateGitCaches
-		// resets #jjRoot, but the next render re-resolves it to the identical root
-		// string — so a guard keyed only on root equality would accept the
-		// pre-invalidation result. The generation token must reject it.
-		const deferred = Promise.withResolvers<string | null>();
-		let call = 0;
-		const branchSpy = spyOn(jj.workingCopy, "label").mockImplementation(async () => {
-			call++;
-			// First query (pre-invalidation) hangs; later queries return the fresh label.
-			return call === 1 ? deferred.promise : "bookmark-fresh";
-		});
-		spies.push(branchSpy);
-
-		const statusLine = new StatusLineComponent(makeSession());
-
-		// Render in ROOT_A: starts the (hanging) first lookup. Nothing cached yet.
-		statusLine.getTopBorder(WIDTH);
-		await flushMicrotasks();
-		expect(branchSpy).toHaveBeenCalledTimes(1);
-
-		// A HEAD/bookmark move fires the watcher → invalidate(). The cwd is
-		// unchanged, so the next #jjRootFor re-resolves #jjRoot to the SAME ROOT_A.
-		statusLine.invalidate();
-		statusLine.getTopBorder(WIDTH);
-		await flushMicrotasks();
-
-		// The stale first query now resolves. The generation captured at its launch
-		// no longer matches (invalidate bumped it), so its label must be dropped —
-		// never cached, and the throttle must NOT be advanced on it.
-		deferred.resolve("bookmark-stale");
-		await flushMicrotasks();
-		const paintedImmediate = visible(statusLine.getTopBorder(WIDTH).content);
-		expect(paintedImmediate).not.toContain("bookmark-stale");
-
-		// Because the stale result did not advance the throttle, the post-invalidate
-		// cache is free to refetch and paint the fresh label.
-		await flushMicrotasks();
-		expect(visible(statusLine.getTopBorder(WIDTH).content)).toContain("bookmark-fresh");
-		expect(branchSpy).toHaveBeenCalledTimes(2);
-	});
-});

package/src/modes/components/status-line/component.test.ts

@@ -1,84 +0,0 @@
-import { beforeAll, describe, expect, it } from "bun:test";
-import { Settings } from "../../../config/settings";
-import type { AgentSession } from "../../../session/agent-session";
-import { getThemeByName, setThemeInstance } from "../../theme/theme";
-import { StatusLineComponent } from "./component";
-
-function makeSessionWithLastMessage(lastMessage: unknown, prewalkArmed: boolean = false) {
-	return {
-		messages: lastMessage ? [lastMessage] : [],
-		model: { contextWindow: 128000 },
-		contextUsageRevision: 0,
-		systemPrompt: [],
-		agent: { state: { tools: [] } },
-		skills: [],
-		getContextUsage: () => ({ tokens: 42, contextWindow: 128000 }),
-		state: {
-			messages: lastMessage ? [lastMessage] : [],
-			model: { contextWindow: 128000 },
-		},
-		sessionManager: {
-			getUsageStatistics: () => ({
-				input: 0,
-				output: 0,
-				cacheRead: 0,
-				cacheWrite: 0,
-				totalTokens: 0,
-				orchestrationInput: 0,
-				orchestrationOutput: 0,
-				orchestrationCacheRead: 0,
-				premiumRequests: 0,
-				cost: 0,
-				tokensPerSecond: null,
-			}),
-			getSessionName: () => "test-session",
-		},
-		getPrewalkState: () => (prewalkArmed ? { target: { id: "cheap-model", provider: "openai" } } : undefined),
-		getAsyncJobSnapshot: () => undefined,
-		isAdvisorActive: () => false,
-		getAdvisorStatusOverview: () => ({ configured: false, advisors: [] }),
-		isFastModeActive: () => false,
-		configuredThinkingLevel: () => undefined,
-		modelRegistry: {
-			isUsingOAuth: () => false,
-		},
-	};
-}
-
-beforeAll(async () => {
-	await Settings.init({ inMemory: true });
-	const loaded = await getThemeByName("dark");
-	if (!loaded) throw new Error("theme unavailable");
-	setThemeInstance(loaded);
-});
-
-describe("StatusLineComponent", () => {
-	it("fingerprints tool-call arguments containing bigint values", () => {
-		const statusLine = new StatusLineComponent(
-			makeSessionWithLastMessage({
-				role: "assistant",
-				timestamp: 1,
-				content: [
-					{
-						type: "toolCall",
-						name: "read",
-						arguments: { offset: 1n, nested: { limit: 2n } },
-					},
-				],
-			}) as unknown as AgentSession,
-		);
-
-		expect(statusLine.getCachedContextBreakdown()).toEqual({ usedTokens: 42, contextWindow: 128000 });
-	});
-
-	it("renders Prewalk annotation when prewalk is armed", () => {
-		const statusLine = new StatusLineComponent(makeSessionWithLastMessage(null, true) as unknown as AgentSession);
-
-		// By default preset, 'mode' segment is included in left/right segments.
-		// Let's get the border and see if Prewalk is rendered.
-		const border = statusLine.getTopBorder(100);
-		// SGR codes might be included, so we check if the stripped content contains "Prewalk"
-		const stripped = border.content.replace(/\x1b\[[0-9;]*m/g, "");
-		expect(stripped).toContain("Prewalk");
-	});
-});

package/src/modes/components/tool-execution.test.ts

@@ -1,162 +0,0 @@
-import { afterEach, beforeAll, describe, expect, it } from "bun:test";
-import type { AgentTool } from "@oh-my-pi/pi-agent-core";
-import { type Component, Text } from "@oh-my-pi/pi-tui";
-import { Settings, settings } from "../../config/settings";
-import { renderMCPResult } from "../../mcp/render";
-import type { MCPToolDetails } from "../../mcp/tool-bridge";
-import { getThemeByName, setThemeInstance, theme } from "../theme/theme";
-import { ToolExecutionComponent, type ToolExecutionUi } from "./tool-execution";
-
-class BoldTypeErrorComponent implements Component {
-	render(_width: number): readonly string[] {
-		throw new TypeError("th.bold is not a function");
-	}
-}
-
-function visibleText(lines: readonly string[]): string {
-	let text = lines.join("\n");
-	text = text.replace(/\x1b\]8;[^\x1b\x07]*(?:\x07|\x1b\\)/g, "");
-	text = text.replace(/\x1b\[[0-9;]*m/g, "");
-	return text;
-}
-
-describe("ToolExecutionComponent custom renderer failures", () => {
-	beforeAll(async () => {
-		await Settings.init({ inMemory: true });
-		const loaded = await getThemeByName("dark");
-		if (!loaded) throw new Error("theme unavailable");
-		setThemeInstance(loaded);
-	});
-
-	afterEach(() => {
-		settings.set("mcp.renderMarkdownResults", true);
-	});
-
-	it("falls back to the custom tool label when a renderCall child component throws during render", () => {
-		const tool: AgentTool = {
-			name: "graphify_graph",
-			label: "Graphify Graph",
-			description: "renders a graph",
-			parameters: { type: "object", additionalProperties: true },
-			renderCall() {
-				return new BoldTypeErrorComponent();
-			},
-			async execute() {
-				return { content: [{ type: "text", text: "ok" }] };
-			},
-		};
-		const ui: ToolExecutionUi = {
-			requestRender() {},
-			requestComponentRender(_component: Component) {},
-			resetDisplay() {},
-		};
-		const component = new ToolExecutionComponent(
-			"graphify_graph",
-			{},
-			{ showImages: false },
-			tool,
-			ui,
-			process.cwd(),
-		);
-		let text = "";
-
-		expect(() => {
-			text = visibleText(component.render(80));
-		}).not.toThrow();
-		expect(text).toContain("Graphify Graph");
-	});
-
-	it("preserves raw result text when a renderResult child component throws during render", () => {
-		const rawResultText = "raw result survives child renderer failure";
-		const tool: AgentTool = {
-			name: "crashy_result_renderer",
-			label: "Crashy Result Renderer",
-			description: "renders result output",
-			parameters: { type: "object", additionalProperties: true },
-			renderCall() {
-				return new Text(theme.fg("toolTitle", theme.bold("Crashy Result Renderer")), 0, 0);
-			},
-			renderResult() {
-				return new BoldTypeErrorComponent();
-			},
-			async execute() {
-				return { content: [{ type: "text", text: rawResultText }] };
-			},
-		};
-		const ui: ToolExecutionUi = {
-			requestRender() {},
-			requestComponentRender(_component: Component) {},
-			resetDisplay() {},
-		};
-		const component = new ToolExecutionComponent(
-			"crashy_result_renderer",
-			{},
-			{ showImages: false },
-			tool,
-			ui,
-			process.cwd(),
-		);
-		component.updateResult({ content: [{ type: "text", text: rawResultText }] }, false);
-		let text = "";
-
-		expect(() => {
-			text = visibleText(component.render(80));
-		}).not.toThrow();
-		expect(text).toContain(rawResultText);
-	});
-});
-
-describe("MCP result Markdown rendering", () => {
-	const details: MCPToolDetails = {
-		serverName: "context-mode",
-		mcpToolName: "ctx_search",
-	};
-
-	beforeAll(async () => {
-		await Settings.init({ inMemory: true });
-		const loaded = await getThemeByName("dark");
-		if (!loaded) throw new Error("theme unavailable");
-		setThemeInstance(loaded);
-	});
-
-	afterEach(() => {
-		settings.set("mcp.renderMarkdownResults", true);
-	});
-
-	it("renders inline Markdown by default", () => {
-		const component = renderMCPResult(
-			{ content: [{ type: "text", text: "**bold result** and `code`" }], details },
-			{ expanded: true, isPartial: false },
-			theme,
-		);
-		const rendered = visibleText(component.render(80));
-
-		expect(rendered).toContain("bold result and code");
-		expect(rendered).not.toContain("**bold result**");
-		expect(rendered).not.toContain("`code`");
-	});
-
-	it("keeps Markdown syntax literal when the setting is disabled", () => {
-		settings.set("mcp.renderMarkdownResults", false);
-		const component = renderMCPResult(
-			{ content: [{ type: "text", text: "**bold result**" }], details },
-			{ expanded: true, isPartial: false },
-			theme,
-		);
-
-		expect(visibleText(component.render(80))).toContain("**bold result**");
-	});
-
-	it("preserves structured JSON rendering when Markdown is enabled", () => {
-		settings.set("mcp.renderMarkdownResults", true);
-		const component = renderMCPResult(
-			{ content: [{ type: "text", text: '{"status":"**ok**"}' }], details },
-			{ expanded: true, isPartial: false },
-			theme,
-		);
-		const rendered = visibleText(component.render(80));
-
-		expect(rendered).toContain("status");
-		expect(rendered).toContain("**ok**");
-	});
-});