@oh-my-pi/pi-coding-agent 13.2.0 → 13.3.0

package/src/tools/gemini-image.ts

@@ -13,8 +13,8 @@ import { resolveReadPath } from "./path-utils";
 const DEFAULT_MODEL = "gemini-3-pro-image-preview";
 const DEFAULT_OPENROUTER_MODEL = "google/gemini-3-pro-image-preview";
 const DEFAULT_ANTIGRAVITY_MODEL = "gemini-3-pro-image";
-const DEFAULT_TIMEOUT_SECONDS = 120;
-const MAX_IMAGE_SIZE = 20 * 1024 * 1024;
+const IMAGE_TIMEOUT = 3 * 60 * 1000; // 3 minutes
+const MAX_IMAGE_SIZE = 35 * 1024 * 1024;
 
 const ANTIGRAVITY_ENDPOINT = "https://daily-cloudcode-pa.sandbox.googleapis.com";
 const IMAGE_SYSTEM_INSTRUCTION =
@@ -76,13 +76,7 @@ const baseImageSchema = Type.Object(
 		style: Type.Optional(
 			Type.String({
 				description:
-					"Artistic style, mood, color grading (e.g., 'film noir mood, cinematic color grading', 'Studio Ghibli watercolor', 'photorealistic').",
-			}),
-		),
-		camera: Type.Optional(
-			Type.String({
-				description:
-					"Lens and camera specs (e.g., 'Shot on 35mm, f/1.8', 'macro lens, extreme close-up', '85mm portrait lens').",
+					"Artistic style, mood, color grading, camera (e.g., 'film noir mood, cinematic color grading', 'Studio Ghibli watercolor', 'photorealistic').",
 			}),
 		),
 		text: Type.Optional(
@@ -94,23 +88,16 @@ const baseImageSchema = Type.Object(
 		changes: Type.Optional(
 			Type.Array(Type.String(), {
 				description:
-					"For edits: specific changes to make (e.g., ['Change the tie to green', 'Remove the car in background']). Use with input_images.",
-			}),
-		),
-		preserve: Type.Optional(
-			Type.String({
-				description:
-					"For edits: what to keep unchanged (e.g., 'identity, face, hairstyle, lighting'). Use with input_images and changes.",
+					"For edits: specific changes to make, as well as, what to keep unchanged (e.g., ['Change the tie to green', 'Remove the car in background']). Use with input_images.",
 			}),
 		),
 		aspect_ratio: Type.Optional(aspectRatioSchema),
 		image_size: Type.Optional(imageSizeSchema),
-		input_images: Type.Optional(
+		input: Type.Optional(
 			Type.Array(inputImageSchema, {
 				description: "Optional input images for edits or variations.",
 			}),
 		),
-		timeout: Type.Optional(Type.Number({ description: "Timeout in seconds (default: 120)" })),
 	},
 	{ additionalProperties: false },
 );
@@ -136,7 +123,6 @@ function assemblePrompt(params: GeminiImageParams): string {
 	// Technical details as separate sentences
 	if (params.composition) parts.push(params.composition);
 	if (params.lighting) parts.push(params.lighting);
-	if (params.camera) parts.push(params.camera);
 	if (params.style) parts.push(params.style);
 
 	// Join with periods for sentence structure
@@ -150,9 +136,6 @@ function assemblePrompt(params: GeminiImageParams): string {
 	// Edit mode: changes and preserve directives
 	if (params.changes?.length) {
 		prompt += `\n\nChanges:\n${params.changes.map(c => `- ${c}`).join("\n")}`;
-		if (params.preserve) {
-			prompt += `\n\nPreserve: ${params.preserve}`;
-		}
 	}
 
 	return prompt;
@@ -638,16 +621,13 @@ export const geminiImageTool: CustomTool<typeof geminiImageSchema, GeminiImageTo
 			const cwd = ctx.sessionManager.getCwd();
 
 			const resolvedImages: InlineImageData[] = [];
-			if (params.input_images?.length) {
-				for (const input of params.input_images) {
+			if (params.input?.length) {
+				for (const input of params.input) {
 					resolvedImages.push(await resolveInputImage(input, cwd));
 				}
 			}
 
-			const { timeout: rawTimeout = DEFAULT_TIMEOUT_SECONDS } = params;
-			// Clamp to reasonable range: 1s - 600s (10 min)
-			const timeoutSeconds = Math.max(1, Math.min(600, rawTimeout));
-			const requestSignal = ptree.combineSignals(signal, timeoutSeconds * 1000);
+			const requestSignal = ptree.combineSignals(signal, IMAGE_TIMEOUT);
 
 			if (provider === "antigravity") {
 				if (!apiKey.projectId) {

package/src/tools/json-tree.ts

@@ -1,6 +1,7 @@
 /**
  * JSON tree rendering utilities shared across tool renderers.
  */
+import { INTENT_FIELD } from "@oh-my-pi/pi-agent-core";
 import type { Theme } from "../modes/theme/theme";
 import { truncateToWidth } from "./render-utils";
 
@@ -13,7 +14,7 @@ export const JSON_TREE_SCALAR_LEN_COLLAPSED = 60;
 export const JSON_TREE_SCALAR_LEN_EXPANDED = 2000;
 
 /** Keys injected by the harness that should not be displayed to users */
-const HIDDEN_ARG_KEYS = new Set(["agent__intent"]);
+const HIDDEN_ARG_KEYS = new Set([INTENT_FIELD]);
 
 /** Strip harness-internal keys from tool args for display */
 export function stripInternalArgs(args: Record<string, unknown>): Record<string, unknown> {

package/src/tools/python.ts

@@ -4,7 +4,7 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 import type { ImageContent } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Markdown, Text } from "@oh-my-pi/pi-tui";
-import { getProjectDir } from "@oh-my-pi/pi-utils/dirs";
+import { getProjectDir } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import { renderPromptTemplate } from "../config/prompt-templates";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";

package/src/tools/read.ts

@@ -5,8 +5,7 @@ import type { ImageContent, TextContent } from "@oh-my-pi/pi-ai";
 import { FileType, glob } from "@oh-my-pi/pi-natives";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
-import { ptree, untilAborted } from "@oh-my-pi/pi-utils";
-import { getRemoteDir } from "@oh-my-pi/pi-utils/dirs";
+import { getRemoteDir, ptree, untilAborted } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import { renderPromptTemplate } from "../config/prompt-templates";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";

package/src/tools/submit-result.ts

@@ -4,8 +4,7 @@
  * Subagents must call this tool to finish and return structured JSON output.
  */
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import { StringEnum } from "@oh-my-pi/pi-ai";
-import type { Static, TObject } from "@sinclair/typebox";
+import type { Static, TSchema } from "@sinclair/typebox";
 import { Type } from "@sinclair/typebox";
 import Ajv, { type ErrorObject, type ValidateFunction } from "ajv";
 import { subprocessToolRegistry } from "../task/subprocess-tool-registry";
@@ -52,13 +51,13 @@ function formatAjvErrors(errors: ErrorObject[] | null | undefined): string {
 		.join("; ");
 }
 
-export class SubmitResultTool implements AgentTool<TObject, SubmitResultDetails> {
+export class SubmitResultTool implements AgentTool<TSchema, SubmitResultDetails> {
 	readonly name = "submit_result";
 	readonly label = "Submit Result";
 	readonly description =
 		"Finish the task with structured JSON output. Call exactly once at the end of the task.\n\n" +
-		"If you cannot complete the task, call with status='aborted' and an error message.";
-	readonly parameters: TObject;
+		"If you cannot complete the task, call with an error message payload.";
+	readonly parameters: TSchema;
 	readonly strict = true;
 
 	readonly #validate?: ValidateFunction;
@@ -92,45 +91,45 @@ export class SubmitResultTool implements AgentTool<TObject, SubmitResultDetails>
 				})
 			: Type.Object({}, { additionalProperties: true, description: "Structured JSON output (no schema specified)" });
 
-		this.parameters = Type.Object({
-			data: Type.Optional(dataSchema),
-			status: Type.Optional(
-				StringEnum(["success", "aborted"], {
-					description: "Use 'aborted' if the task cannot be completed, defaults to 'success'",
-				}),
-			),
-			error: Type.Optional(Type.String({ description: "Error message when status is 'aborted'" })),
-		});
+		this.parameters = Type.Union([
+			Type.Object({
+				data: dataSchema,
+			}),
+			Type.Object({
+				error: Type.String({ description: "Error message when the task cannot be completed" }),
+			}),
+		]);
 	}
 
 	async execute(
 		_toolCallId: string,
-		params: Static<TObject>,
+		params: Static<TSchema>,
 		_signal?: AbortSignal,
 		_onUpdate?: AgentToolUpdateCallback<SubmitResultDetails>,
 		_context?: AgentToolContext,
 	): Promise<AgentToolResult<SubmitResultDetails>> {
-		const status = (params.status ?? "success") as "success" | "aborted";
+		const raw = params as Record<string, unknown>;
+		const errorMessage = typeof raw.error === "string" ? raw.error : undefined;
+		const status = errorMessage !== undefined ? "aborted" : "success";
+		const data = raw.data;
 
-		// Skip validation when aborting - data is optional for aborts
 		if (status === "success") {
-			if (params.data === undefined || params.data === null) {
-				throw new Error("data is required when status is 'success' (got null/undefined)");
+			if (data === undefined || data === null) {
+				throw new Error("data is required when submit_result indicates success");
 			}
 			if (this.#schemaError) {
 				throw new Error(`Invalid output schema: ${this.#schemaError}`);
 			}
-			if (this.#validate && !this.#validate(params.data)) {
+			if (this.#validate && !this.#validate(data)) {
 				throw new Error(`Output does not match schema: ${formatAjvErrors(this.#validate.errors)}`);
 			}
 		}
 
-		const responseText =
-			status === "aborted" ? `Task aborted: ${params.error || "No reason provided"}` : "Result submitted.";
+		const responseText = status === "aborted" ? `Task aborted: ${errorMessage}` : "Result submitted.";
 
 		return {
 			content: [{ type: "text", text: responseText }],
-			details: { data: params.data, status, error: params.error as string | undefined },
+			details: { data, status, error: errorMessage },
 		};
 	}
 }

package/src/utils/commit-message-generator.ts

@@ -0,0 +1,132 @@
+/**
+ * Generate commit messages from diffs using a smol, fast model.
+ * Follows the same pattern as title-generator.ts.
+ */
+import type { Api, Model } from "@oh-my-pi/pi-ai";
+import { completeSimple } from "@oh-my-pi/pi-ai";
+import { logger } from "@oh-my-pi/pi-utils";
+import type { ModelRegistry } from "../config/model-registry";
+import { parseModelString } from "../config/model-resolver";
+import { renderPromptTemplate } from "../config/prompt-templates";
+import MODEL_PRIO from "../priority.json" with { type: "json" };
+import commitSystemPrompt from "../prompts/system/commit-message-system.md" with { type: "text" };
+
+const COMMIT_SYSTEM_PROMPT = renderPromptTemplate(commitSystemPrompt);
+const MAX_DIFF_CHARS = 4000;
+
+/** File patterns that should be excluded from commit message generation diffs. */
+const NOISE_SUFFIXES = [".lock", ".lockb", "-lock.json", "-lock.yaml"];
+
+/** Strip diff hunks for noisy files that drown out real changes. */
+function filterDiffNoise(diff: string): string {
+	const lines = diff.split("\n");
+	const filtered: string[] = [];
+	let skip = false;
+	for (const line of lines) {
+		if (line.startsWith("diff --git ")) {
+			const bPath = line.split(" b/")[1];
+			skip = bPath != null && NOISE_SUFFIXES.some(s => bPath.endsWith(s));
+		}
+		if (!skip) filtered.push(line);
+	}
+	return filtered.join("\n");
+}
+
+function getSmolModelCandidates(registry: ModelRegistry, savedSmolModel?: string): Model<Api>[] {
+	const availableModels = registry.getAvailable();
+	if (availableModels.length === 0) return [];
+
+	const candidates: Model<Api>[] = [];
+	const addCandidate = (model?: Model<Api>): void => {
+		if (!model) return;
+		if (candidates.some(c => c.provider === model.provider && c.id === model.id)) return;
+		candidates.push(model);
+	};
+
+	if (savedSmolModel) {
+		const parsed = parseModelString(savedSmolModel);
+		if (parsed) {
+			const match = availableModels.find(m => m.provider === parsed.provider && m.id === parsed.id);
+			addCandidate(match);
+		}
+	}
+
+	for (const pattern of MODEL_PRIO.smol) {
+		const needle = pattern.toLowerCase();
+		addCandidate(availableModels.find(m => m.id.toLowerCase() === needle));
+		addCandidate(availableModels.find(m => m.id.toLowerCase().includes(needle)));
+	}
+
+	for (const model of availableModels) {
+		addCandidate(model);
+	}
+
+	return candidates;
+}
+
+/**
+ * Generate a commit message from a unified diff.
+ * Returns null if generation fails (caller should fall back to generic message).
+ */
+export async function generateCommitMessage(
+	diff: string,
+	registry: ModelRegistry,
+	savedSmolModel?: string,
+	sessionId?: string,
+): Promise<string | null> {
+	const candidates = getSmolModelCandidates(registry, savedSmolModel);
+	if (candidates.length === 0) {
+		logger.debug("commit-msg-generator: no smol model found");
+		return null;
+	}
+
+	const cleanDiff = filterDiffNoise(diff);
+	const truncatedDiff =
+		cleanDiff.length > MAX_DIFF_CHARS ? `${cleanDiff.slice(0, MAX_DIFF_CHARS)}\n… (truncated)` : cleanDiff;
+	if (!truncatedDiff.trim()) {
+		logger.debug("commit-msg-generator: diff is empty after noise filtering");
+		return null;
+	}
+	const userMessage = `<diff>\n${truncatedDiff}\n</diff>`;
+
+	for (const model of candidates) {
+		const apiKey = await registry.getApiKey(model, sessionId);
+		if (!apiKey) continue;
+
+		try {
+			const response = await completeSimple(
+				model,
+				{
+					systemPrompt: COMMIT_SYSTEM_PROMPT,
+					messages: [{ role: "user", content: userMessage, timestamp: Date.now() }],
+				},
+				{ apiKey, maxTokens: 60 },
+			);
+
+			if (response.stopReason === "error") {
+				logger.debug("commit-msg-generator: error", { model: model.id, error: response.errorMessage });
+				continue;
+			}
+
+			let msg = "";
+			for (const content of response.content) {
+				if (content.type === "text") msg += content.text;
+			}
+			msg = msg.trim();
+			if (!msg) continue;
+
+			// Clean up: remove wrapping quotes, backticks, trailing period
+			msg = msg.replace(/^[`"']|[`"']$/g, "").replace(/\.$/, "");
+
+			logger.debug("commit-msg-generator: generated", { model: model.id, msg });
+			return msg;
+		} catch (err) {
+			logger.debug("commit-msg-generator: error", {
+				model: model.id,
+				error: err instanceof Error ? err.message : String(err),
+			});
+		}
+	}
+
+	return null;
+}

package/src/utils/tools-manager.ts

@@ -1,8 +1,7 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { logger, ptree, TempDir } from "@oh-my-pi/pi-utils";
-import { APP_NAME, getToolsDir } from "@oh-my-pi/pi-utils/dirs";
+import { APP_NAME, getToolsDir, logger, ptree, TempDir } from "@oh-my-pi/pi-utils";
 
 const TOOLS_DIR = getToolsDir();
 const TOOL_DOWNLOAD_TIMEOUT_MS = 15000;

package/src/web/scrapers/artifacthub.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatIsoDate, formatNumber, loadPage, tryParseJson } from "./types";
+import { buildResult, formatIsoDate, formatNumber, loadPage } from "./types";
 
 interface ArtifactHubMaintainer {
 	name: string;

package/src/web/scrapers/aur.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatIsoDate, formatNumber, loadPage, tryParseJson } from "./types";
+import { buildResult, formatIsoDate, formatNumber, loadPage } from "./types";
 
 interface AurPackage {
 	Name: string;

package/src/web/scrapers/biorxiv.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, loadPage, tryParseJson } from "./types";
+import { buildResult, loadPage } from "./types";
 
 interface BiorxivPaper {
 	biorxiv_doi?: string;

package/src/web/scrapers/bluesky.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatNumber, loadPage, tryParseJson } from "./types";
+import { buildResult, formatNumber, loadPage } from "./types";
 
 const API_BASE = "https://public.api.bsky.app/xrpc";
 

package/src/web/scrapers/chocolatey.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatIsoDate, formatNumber, loadPage, tryParseJson } from "./types";
+import { buildResult, formatIsoDate, formatNumber, loadPage } from "./types";
 
 interface NuGetODataEntry {
 	Id: string;

package/src/web/scrapers/cisa-kev.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, loadPage, tryParseJson } from "./types";
+import { buildResult, loadPage } from "./types";
 
 interface KevEntry {
 	cveID: string;

package/src/web/scrapers/clojars.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatNumber, loadPage, tryParseJson } from "./types";
+import { buildResult, formatNumber, loadPage } from "./types";
 import { asNumber, asString, isRecord } from "./utils";
 
 function formatLicenses(licenses: unknown): string[] {

package/src/web/scrapers/coingecko.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatNumber, loadPage, tryParseJson } from "./types";
+import { buildResult, formatNumber, loadPage } from "./types";
 
 interface CoinGeckoResponse {
 	id: string;

package/src/web/scrapers/crates-io.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatNumber, loadPage, tryParseJson } from "./types";
+import { buildResult, formatNumber, loadPage } from "./types";
 
 /**
  * Check if content looks like HTML

package/src/web/scrapers/crossref.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, htmlToBasicMarkdown, loadPage, tryParseJson } from "./types";
+import { buildResult, htmlToBasicMarkdown, loadPage } from "./types";
 
 interface CrossrefAuthor {
 	given?: string;

package/src/web/scrapers/discogs.ts

@@ -4,8 +4,10 @@
  * Uses the Discogs API to extract structured metadata about releases.
  * API docs: https://www.discogs.com/developers
  */
+
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, loadPage, tryParseJson } from "./types";
+import { buildResult, loadPage } from "./types";
 
 interface DiscogsArtist {
 	name: string;

package/src/web/scrapers/discourse.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatIsoDate, htmlToBasicMarkdown, loadPage, tryParseJson } from "./types";
+import { buildResult, formatIsoDate, htmlToBasicMarkdown, loadPage } from "./types";
 
 interface DiscourseUser {
 	username?: string;

package/src/web/scrapers/dockerhub.ts

@@ -1,6 +1,7 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import { formatBytes } from "../../tools/render-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatIsoDate, formatNumber, loadPage, tryParseJson } from "./types";
+import { buildResult, formatIsoDate, formatNumber, loadPage } from "./types";
 
 interface DockerHubRepo {
 	name: string;

package/src/web/scrapers/fdroid.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { LocalizedText, RenderResult, SpecialHandler } from "./types";
-import { buildResult, getLocalizedText, loadPage, tryParseJson } from "./types";
+import { buildResult, getLocalizedText, loadPage } from "./types";
 
 type FdroidPackage = {
 	packageName?: string;

package/src/web/scrapers/firefox-addons.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { LocalizedText, RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatNumber, getLocalizedText, htmlToBasicMarkdown, loadPage, tryParseJson } from "./types";
+import { buildResult, formatNumber, getLocalizedText, htmlToBasicMarkdown, loadPage } from "./types";
 
 type AddonFile = {
 	permissions?: string[];

package/src/web/scrapers/flathub.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatIsoDate, formatNumber, htmlToBasicMarkdown, loadPage, tryParseJson } from "./types";
+import { buildResult, formatIsoDate, formatNumber, htmlToBasicMarkdown, loadPage } from "./types";
 
 interface FlathubScreenshotSize {
 	src?: string;

package/src/web/scrapers/gitlab.ts

@@ -1,3 +1,4 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import {
 	buildResult,
 	formatIsoDate,
@@ -6,7 +7,6 @@ import {
 	loadPage,
 	type RenderResult,
 	type SpecialHandler,
-	tryParseJson,
 } from "./types";
 
 interface GitLabUrl {

package/src/web/scrapers/go-pkg.ts

@@ -1,6 +1,7 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import { parse as parseHtml } from "node-html-parser";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, htmlToBasicMarkdown, loadPage, tryParseJson } from "./types";
+import { buildResult, htmlToBasicMarkdown, loadPage } from "./types";
 
 interface GoModuleInfo {
 	Version: string;

package/src/web/scrapers/hackage.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, loadPage, tryParseJson } from "./types";
+import { buildResult, loadPage } from "./types";
 
 interface HackageVersionMap {
 	[version: string]: string;

package/src/web/scrapers/hackernews.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { SpecialHandler } from "./types";
-import { buildResult, decodeHtmlEntities, formatIsoDate, loadPage, tryParseJson } from "./types";
+import { buildResult, decodeHtmlEntities, formatIsoDate, loadPage } from "./types";
 
 interface HNItem {
 	id: number;

package/src/web/scrapers/hex.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { SpecialHandler } from "./types";
-import { buildResult, formatIsoDate, formatNumber, loadPage, tryParseJson } from "./types";
+import { buildResult, formatIsoDate, formatNumber, loadPage } from "./types";
 
 /**
  * Handle Hex.pm (Elixir package registry) URLs via API

package/src/web/scrapers/huggingface.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { SpecialHandler } from "./types";
-import { buildResult, formatNumber, loadPage, tryParseJson } from "./types";
+import { buildResult, formatNumber, loadPage } from "./types";
 
 interface HfModelData {
 	modelId: string;

package/src/web/scrapers/jetbrains-marketplace.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatNumber, htmlToBasicMarkdown, loadPage, tryParseJson } from "./types";
+import { buildResult, formatNumber, htmlToBasicMarkdown, loadPage } from "./types";
 
 interface PluginVendor {
 	name?: string;

package/src/web/scrapers/lemmy.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, loadPage, tryParseJson } from "./types";
+import { buildResult, loadPage } from "./types";
 
 interface LemmyCreator {
 	name: string;

package/src/web/scrapers/lobsters.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { SpecialHandler } from "./types";
-import { buildResult, formatIsoDate, loadPage, tryParseJson } from "./types";
+import { buildResult, formatIsoDate, loadPage } from "./types";
 
 // =============================================================================
 // Lobste.rs Types

package/src/web/scrapers/mastodon.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatNumber, htmlToBasicMarkdown, loadPage, tryParseJson } from "./types";
+import { buildResult, formatNumber, htmlToBasicMarkdown, loadPage } from "./types";
 
 interface MastodonAccount {
 	id: string;

package/src/web/scrapers/maven.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatIsoDate, formatNumber, loadPage, tryParseJson } from "./types";
+import { buildResult, formatIsoDate, formatNumber, loadPage } from "./types";
 
 interface MavenDoc {
 	id: string;

package/src/web/scrapers/mdn.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { SpecialHandler } from "./types";
-import { buildResult, htmlToBasicMarkdown, loadPage, tryParseJson } from "./types";
+import { buildResult, htmlToBasicMarkdown, loadPage } from "./types";
 
 interface MDNSection {
 	type: string;

package/src/web/scrapers/metacpan.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatIsoDate, loadPage, tryParseJson } from "./types";
+import { buildResult, formatIsoDate, loadPage } from "./types";
 
 interface ModuleResponse {
 	name: string;