@plannotator/pi-extension 0.17.10 → 0.18.0

package/server/integrations.ts

@@ -23,6 +23,7 @@ import {
 	detectObsidianVaults,
 } from "../generated/integrations-common.js";
 import { sanitizeTag } from "../generated/project.js";
+import { resolveUserPath } from "../generated/resolve-file.js";
 
 export type { ObsidianConfig, BearConfig, OctarineConfig, IntegrationResult };
 export {
@@ -111,11 +112,10 @@ export async function saveToObsidian(
 ): Promise<IntegrationResult> {
 	try {
 		const { vaultPath, folder, plan } = config;
-		let normalizedVault = vaultPath.trim();
-		if (normalizedVault.startsWith("~")) {
-			const home = process.env.HOME || process.env.USERPROFILE || "";
-			normalizedVault = join(home, normalizedVault.slice(1));
+		if (!vaultPath?.trim()) {
+			return { success: false, error: "Vault path is required" };
 		}
+		const normalizedVault = resolveUserPath(vaultPath);
 		if (!existsSync(normalizedVault))
 			return {
 				success: false,

package/server/reference.ts

@@ -22,7 +22,12 @@ import {
 	FILE_BROWSER_EXCLUDED,
 } from "../generated/reference-common.js";
 import { detectObsidianVaults } from "../generated/integrations-common.js";
-import { resolveMarkdownFile, isWithinProjectRoot } from "../generated/resolve-file.js";
+import {
+	isAbsoluteUserPath,
+	resolveMarkdownFile,
+	resolveUserPath,
+	isWithinProjectRoot,
+} from "../generated/resolve-file.js";
 import { htmlToMarkdown } from "../generated/html-to-markdown.js";
 
 type Res = ServerResponse;
@@ -62,12 +67,13 @@ export function handleDocRequest(res: Res, url: URL): void {
 	// server (see serverAnnotate.ts /api/doc route). The standalone HTML
 	// block below (no base) retains its cwd-based containment check.
 	const base = url.searchParams.get("base");
+	const resolvedBase = base ? resolveUserPath(base) : null;
 	if (
-		base &&
-		!requestedPath.startsWith("/") &&
+		resolvedBase &&
+		!isAbsoluteUserPath(requestedPath) &&
 		/\.(mdx?|html?)$/i.test(requestedPath)
 	) {
-		const fromBase = resolvePath(base, requestedPath);
+		const fromBase = resolveUserPath(requestedPath, resolvedBase);
 		try {
 			if (existsSync(fromBase)) {
 				const raw = readFileSync(fromBase, "utf-8");
@@ -83,7 +89,7 @@ export function handleDocRequest(res: Res, url: URL): void {
 	// HTML files: resolve directly (not via resolveMarkdownFile which only handles .md/.mdx)
 	const projectRoot = process.cwd();
 	if (/\.html?$/i.test(requestedPath)) {
-		const resolvedHtml = resolvePath(base || projectRoot, requestedPath);
+		const resolvedHtml = resolveUserPath(requestedPath, resolvedBase || projectRoot);
 		if (!isWithinProjectRoot(resolvedHtml, projectRoot)) {
 			json(res, { error: "Access denied: path is outside project root" }, 403);
 			return;
@@ -136,7 +142,7 @@ export function handleObsidianFilesRequest(res: Res, url: URL): void {
 		json(res, { error: "Missing vaultPath parameter" }, 400);
 		return;
 	}
-	const resolvedVault = resolvePath(vaultPath);
+	const resolvedVault = resolveUserPath(vaultPath);
 	if (!existsSync(resolvedVault) || !statSync(resolvedVault).isDirectory()) {
 		json(res, { error: "Invalid vault path" }, 400);
 		return;
@@ -162,7 +168,7 @@ export function handleObsidianDocRequest(res: Res, url: URL): void {
 		json(res, { error: "Only markdown files are supported" }, 400);
 		return;
 	}
-	const resolvedVault = resolvePath(vaultPath);
+	const resolvedVault = resolveUserPath(vaultPath);
 	let resolvedFile = resolvePath(resolvedVault, filePath);
 
 	// Bare filename search within vault
@@ -214,7 +220,7 @@ export function handleFileBrowserRequest(res: Res, url: URL): void {
 		json(res, { error: "Missing dirPath parameter" }, 400);
 		return;
 	}
-	const resolvedDir = resolvePath(dirPath);
+	const resolvedDir = resolveUserPath(dirPath);
 	if (!existsSync(resolvedDir) || !statSync(resolvedDir).isDirectory()) {
 		json(res, { error: "Invalid directory path" }, 400);
 		return;

package/server/serverReview.ts

@@ -147,6 +147,7 @@ export async function startReviewServer(options: {
 	error?: string;
 	sharingEnabled?: boolean;
 	shareBaseUrl?: string;
+	pasteApiUrl?: string;
 	prMetadata?: PRMetadata;
 	/** Working directory for agent processes (e.g., --local worktree). Independent of diff pipeline. */
 	agentCwd?: string;
@@ -281,6 +282,8 @@ export async function startReviewServer(options: {
 		options.sharingEnabled ?? process.env.PLANNOTATOR_SHARE !== "disabled";
 	const shareBaseUrl =
 		(options.shareBaseUrl ?? process.env.PLANNOTATOR_SHARE_URL) || undefined;
+	const pasteApiUrl =
+		(options.pasteApiUrl ?? process.env.PLANNOTATOR_PASTE_URL) || undefined;
 	let resolveDecision!: (result: {
 		approved: boolean;
 		feedback: string;
@@ -421,6 +424,7 @@ export async function startReviewServer(options: {
 				gitContext: hasLocalAccess ? options.gitContext : undefined,
 				sharingEnabled,
 				shareBaseUrl,
+				pasteApiUrl,
 				repoInfo,
 				isWSL: wslFlag,
 				...(options.agentCwd && { agentCwd: options.agentCwd }),