codex: address PR review feedback (#1129)

Author: chhoumann

src/preflight/collectChoiceRequirements.test.ts

@@ -12,11 +12,13 @@ const {
 	getMarkdownFilesWithTagMock,
 	getUserScriptMock,
 	isFolderMock,
+	logWarningMock,
 } = vi.hoisted(() => ({
 	getMarkdownFilesInFolderMock: vi.fn(() => []),
 	getMarkdownFilesWithTagMock: vi.fn(() => []),
 	getUserScriptMock: vi.fn(),
 	isFolderMock: vi.fn(() => false),
+	logWarningMock: vi.fn(),
 }));
 
 vi.mock("src/utilityObsidian", () => ({
@@ -26,6 +28,12 @@ vi.mock("src/utilityObsidian", () => ({
 	isFolder: isFolderMock,
 }));
 
+vi.mock("src/logger/logManager", () => ({
+	log: {
+		logWarning: logWarningMock,
+	},
+}));
+
 function createMacroChoice(script: IUserScript): IMacroChoice {
 	return {
 		id: "macro-choice",
@@ -101,6 +109,7 @@ describe("collectChoiceRequirements - macro script metadata", () => {
 		getMarkdownFilesWithTagMock.mockReset();
 		getUserScriptMock.mockReset();
 		isFolderMock.mockReset();
+		logWarningMock.mockReset();
 		getMarkdownFilesInFolderMock.mockReturnValue([]);
 		getMarkdownFilesWithTagMock.mockReturnValue([]);
 		isFolderMock.mockReturnValue(false);
@@ -178,6 +187,24 @@ describe("collectChoiceRequirements - macro script metadata", () => {
 
 		expect(requirements).toEqual([]);
 	});
+
+	it("logs a warning when script metadata cannot be inspected", async () => {
+		getUserScriptMock.mockRejectedValue(new Error("script load failed"));
+
+		const requirements = await collectChoiceRequirements(
+			app,
+			plugin,
+			choiceExecutor,
+			createMacroChoice(scriptCommand),
+		);
+
+		expect(requirements).toEqual([]);
+		expect(logWarningMock).toHaveBeenCalledWith(
+			expect.stringContaining(
+				"Preflight could not inspect user script 'script.js'",
+			),
+		);
+	});
 });
 
 describe("collectChoiceRequirements - capture targets", () => {
@@ -198,6 +225,7 @@ describe("collectChoiceRequirements - capture targets", () => {
 		getMarkdownFilesInFolderMock.mockReset();
 		getMarkdownFilesWithTagMock.mockReset();
 		isFolderMock.mockReset();
+		logWarningMock.mockReset();
 		getMarkdownFilesInFolderMock.mockReturnValue([]);
 		getMarkdownFilesWithTagMock.mockReturnValue([]);
 	});
@@ -217,4 +245,23 @@ describe("collectChoiceRequirements - capture targets", () => {
 			"Projects/",
 		);
 	});
+
+	it("does not force capture target dropdown for tokenized file paths", async () => {
+		isFolderMock.mockReturnValue(false);
+
+		const requirements = await collectChoiceRequirements(
+			app,
+			plugin,
+			choiceExecutor,
+			createCaptureChoice("Projects/{{VALUE}}.md"),
+		);
+
+		expect(getMarkdownFilesInFolderMock).not.toHaveBeenCalled();
+		expect(
+			requirements.some(
+				(requirement) =>
+					requirement.id === "QA_INTERNAL_CAPTURE_TARGET_FILE_PATH",
+			),
+		).toBe(false);
+	});
 });

src/preflight/collectChoiceRequirements.ts

@@ -21,6 +21,7 @@ import {
 	getUserScript,
 	isFolder,
 } from "src/utilityObsidian";
+import { log } from "src/logger/logManager";
 import { resolveExistingVariableKey } from "src/utils/valueSyntax";
 import {
 	RequirementCollector,
@@ -174,14 +175,12 @@ async function collectForCaptureChoice(
 	const isFolderTarget =
 		!isTagTarget && (normalizedTarget === "" || isFolder(app, trimmedPath));
 	const looksLikeFolderBySuffix = normalizedTarget.endsWith("/");
-	const containsFormatTokens = /{{[^}]+}}/.test(choice.captureTo ?? "");
 
 	if (
 		!choice.captureToActiveFile &&
 		(isTagTarget ||
 			isFolderTarget ||
-			looksLikeFolderBySuffix ||
-			containsFormatTokens)
+			looksLikeFolderBySuffix)
 	) {
 		let files: TFile[] = [];
 		if (isTagTarget) {
@@ -244,8 +243,13 @@ async function collectMacroScriptRequirements(
 				const requirement = toFieldRequirement(input);
 				if (requirement) requirements.push(requirement);
 			}
-		} catch {
-			// Ignore script spec errors in preflight collection.
+		} catch (error) {
+			const scriptPath = userScriptCommand.path ?? userScriptCommand.id;
+			const message =
+				error instanceof Error ? error.message : String(error);
+			log.logWarning(
+				`Preflight could not inspect user script '${scriptPath}': ${message}`,
+			);
 		}
 	}