granola-toolkit 0.47.0 → 0.48.0

package/dist/cli.js

@@ -449,7 +449,7 @@ function asRecord(value) {
 function stringValue(value) {
 	return typeof value === "string" ? value : "";
 }
-function stringArray$1(value) {
+function stringArray$2(value) {
 	if (!Array.isArray(value)) return [];
 	return value.filter((item) => typeof item === "string");
 }
@@ -2612,6 +2612,7 @@ function defaultGranolaToolkitPersistenceLayout(options = {}) {
 	const targetPlatform = options.platform ?? platform();
 	const dataDirectory = defaultGranolaToolkitDataDirectory(targetPlatform, options.homeDirectory ?? homedir());
 	return {
+		agentHarnessesFile: join(dataDirectory, "agent-harnesses.json"),
 		automationMatchesFile: join(dataDirectory, "automation-matches.jsonl"),
 		automationRulesFile: join(dataDirectory, "automation-rules.json"),
 		automationRunsFile: join(dataDirectory, "automation-runs.jsonl"),
@@ -2627,6 +2628,145 @@ function defaultGranolaToolkitPersistenceLayout(options = {}) {
 	};
 }
 //#endregion
+//#region src/agent-harnesses.ts
+function stringArray$1(value) {
+	if (!Array.isArray(value)) return;
+	const values = value.filter((item) => typeof item === "string" && item.trim().length > 0).map((item) => item.trim());
+	return values.length > 0 ? [...new Set(values)] : void 0;
+}
+function parseMatch(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	const record = value;
+	return {
+		calendarEventIds: stringArray$1(record.calendarEventIds),
+		eventKinds: stringArray$1(record.eventKinds),
+		folderIds: stringArray$1(record.folderIds),
+		folderNames: stringArray$1(record.folderNames),
+		meetingIds: stringArray$1(record.meetingIds),
+		recurringEventIds: stringArray$1(record.recurringEventIds),
+		tags: stringArray$1(record.tags),
+		titleIncludes: stringArray$1(record.titleIncludes),
+		titleMatches: typeof record.titleMatches === "string" && record.titleMatches.trim() ? record.titleMatches.trim() : void 0,
+		transcriptLoaded: typeof record.transcriptLoaded === "boolean" ? record.transcriptLoaded : void 0
+	};
+}
+function parseHarness(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	const record = value;
+	const id = typeof record.id === "string" && record.id.trim() ? record.id.trim() : void 0;
+	const name = typeof record.name === "string" && record.name.trim() ? record.name.trim() : void 0;
+	if (!id || !name) return;
+	const provider = record.provider === "codex" || record.provider === "openai" || record.provider === "openrouter" ? record.provider : void 0;
+	const prompt = typeof record.prompt === "string" && record.prompt.trim() ? record.prompt.trim() : void 0;
+	const promptFile = typeof record.promptFile === "string" && record.promptFile.trim() ? record.promptFile.trim() : void 0;
+	if (!prompt && !promptFile) return;
+	return {
+		cwd: typeof record.cwd === "string" && record.cwd.trim() ? record.cwd.trim() : void 0,
+		id,
+		match: parseMatch(record.match),
+		model: typeof record.model === "string" && record.model.trim() ? record.model.trim() : void 0,
+		name,
+		priority: typeof record.priority === "number" && Number.isFinite(record.priority) ? record.priority : typeof record.priority === "string" && /^-?\d+$/.test(record.priority) ? Number(record.priority) : void 0,
+		prompt,
+		promptFile,
+		provider,
+		systemPrompt: typeof record.systemPrompt === "string" && record.systemPrompt.trim() ? record.systemPrompt.trim() : void 0,
+		systemPromptFile: typeof record.systemPromptFile === "string" && record.systemPromptFile.trim() ? record.systemPromptFile.trim() : void 0
+	};
+}
+function cloneHarness(harness) {
+	return {
+		...harness,
+		match: harness.match ? {
+			...harness.match,
+			calendarEventIds: harness.match.calendarEventIds ? [...harness.match.calendarEventIds] : void 0,
+			eventKinds: harness.match.eventKinds ? [...harness.match.eventKinds] : void 0,
+			folderIds: harness.match.folderIds ? [...harness.match.folderIds] : void 0,
+			folderNames: harness.match.folderNames ? [...harness.match.folderNames] : void 0,
+			meetingIds: harness.match.meetingIds ? [...harness.match.meetingIds] : void 0,
+			recurringEventIds: harness.match.recurringEventIds ? [...harness.match.recurringEventIds] : void 0,
+			tags: harness.match.tags ? [...harness.match.tags] : void 0,
+			titleIncludes: harness.match.titleIncludes ? [...harness.match.titleIncludes] : void 0
+		} : void 0
+	};
+}
+function includesIgnoreCase$1(candidate, values) {
+	const lowerCandidate = candidate.toLowerCase();
+	return values.some((value) => lowerCandidate.includes(value.toLowerCase()));
+}
+function harnessSpecificity(match) {
+	if (!match) return 0;
+	return [
+		match.calendarEventIds?.length ?? 0,
+		match.eventKinds?.length ?? 0,
+		match.folderIds?.length ?? 0,
+		match.folderNames?.length ?? 0,
+		match.meetingIds?.length ?? 0,
+		match.recurringEventIds?.length ?? 0,
+		match.tags?.length ?? 0,
+		match.titleIncludes?.length ?? 0,
+		match.titleMatches ? 1 : 0,
+		match.transcriptLoaded != null ? 1 : 0
+	].reduce((total, count) => total + count, 0);
+}
+function matchesHarness(harness, context) {
+	const match = harness.match;
+	if (!match) return true;
+	if (match.eventKinds?.length && !match.eventKinds.includes(context.match.eventKind)) return false;
+	if (match.meetingIds?.length && !match.meetingIds.includes(context.match.meetingId)) return false;
+	if (match.folderIds?.length && !context.match.folders.some((folder) => match.folderIds?.includes(folder.id))) return false;
+	if (match.folderNames?.length && !context.match.folders.some((folder) => match.folderNames?.includes(folder.name))) return false;
+	if (match.tags?.length && !context.match.tags.some((tag) => match.tags?.includes(tag))) return false;
+	if (match.transcriptLoaded != null && context.match.transcriptLoaded !== match.transcriptLoaded) return false;
+	if (match.titleIncludes?.length && !includesIgnoreCase$1(context.match.title, match.titleIncludes)) return false;
+	if (match.titleMatches) try {
+		if (!new RegExp(match.titleMatches, "i").test(context.match.title)) return false;
+	} catch {
+		return false;
+	}
+	const calendarEventId = context.bundle?.document.calendarEvent?.id;
+	if (match.calendarEventIds?.length && !calendarEventId) return false;
+	if (match.calendarEventIds?.length && !match.calendarEventIds.includes(calendarEventId)) return false;
+	const recurringEventId = context.bundle?.document.calendarEvent?.recurringEventId;
+	if (match.recurringEventIds?.length && !recurringEventId) return false;
+	if (match.recurringEventIds?.length && !match.recurringEventIds.includes(recurringEventId)) return false;
+	return true;
+}
+function matchAgentHarnesses(harnesses, context) {
+	return harnesses.filter((harness) => matchesHarness(harness, context)).slice().sort((left, right) => {
+		const priority = (right.priority ?? 0) - (left.priority ?? 0);
+		if (priority !== 0) return priority;
+		return harnessSpecificity(right.match) - harnessSpecificity(left.match);
+	}).map(cloneHarness);
+}
+function resolveAgentHarness(harnesses, context, harnessId) {
+	if (harnessId?.trim()) {
+		const harness = harnesses.find((candidate) => candidate.id === harnessId.trim());
+		if (!harness) throw new Error(`agent harness not found: ${harnessId.trim()}`);
+		return cloneHarness(harness);
+	}
+	return matchAgentHarnesses(harnesses, context)[0];
+}
+var FileAgentHarnessStore = class {
+	constructor(filePath = defaultAgentHarnessesFilePath()) {
+		this.filePath = filePath;
+	}
+	async readHarnesses() {
+		try {
+			const parsed = parseJsonString(await readFile(this.filePath, "utf8"));
+			return (Array.isArray(parsed) ? parsed : parsed && typeof parsed === "object" && Array.isArray(parsed.harnesses) ? parsed.harnesses : []).map((harness) => parseHarness(harness)).filter((harness) => Boolean(harness)).map(cloneHarness);
+		} catch {
+			return [];
+		}
+	}
+};
+function defaultAgentHarnessesFilePath() {
+	return defaultGranolaToolkitPersistenceLayout().agentHarnessesFile;
+}
+function createDefaultAgentHarnessStore(filePath) {
+	return new FileAgentHarnessStore(filePath);
+}
+//#endregion
 //#region src/client/auth.ts
 const execFileAsync$1 = promisify(execFile);
 const DEFAULT_CLIENT_ID = "client_GranolaMac";
@@ -3514,13 +3654,15 @@ function parseAction(value, index) {
 			const provider = record.provider === "codex" || record.provider === "openai" || record.provider === "openrouter" ? record.provider : void 0;
 			const prompt = typeof record.prompt === "string" && record.prompt.trim() ? record.prompt.trim() : void 0;
 			const promptFile = typeof record.promptFile === "string" && record.promptFile.trim() ? record.promptFile.trim() : void 0;
+			const harnessId = typeof record.harnessId === "string" && record.harnessId.trim() ? record.harnessId.trim() : void 0;
 			const systemPrompt = typeof record.systemPrompt === "string" && record.systemPrompt.trim() ? record.systemPrompt.trim() : void 0;
 			const systemPromptFile = typeof record.systemPromptFile === "string" && record.systemPromptFile.trim() ? record.systemPromptFile.trim() : void 0;
-			if (!prompt && !promptFile) return;
+			if (!prompt && !promptFile && !harnessId) return;
 			return {
 				cwd: typeof record.cwd === "string" && record.cwd.trim() ? record.cwd.trim() : void 0,
 				dryRun: typeof record.dryRun === "boolean" ? record.dryRun : void 0,
 				enabled,
+				harnessId,
 				id,
 				kind,
 				model: typeof record.model === "string" && record.model.trim() ? record.model.trim() : void 0,
@@ -3912,17 +4054,39 @@ function parseLastViewedPanel(value) {
 		updatedAt: stringValue(panel.updated_at)
 	};
 }
+function parseCalendarEvent(value) {
+	const record = asRecord(value);
+	if (!record) return;
+	const id = stringValue(record.id);
+	const recurringEventId = stringValue(record.recurring_event_id) || stringValue(record.recurringEventId);
+	const calendarId = stringValue(record.calendar_id) || stringValue(record.calendarId);
+	const url = stringValue(record.url);
+	const htmlLink = stringValue(record.html_link) || stringValue(record.htmlLink);
+	const startTime = stringValue(record.start_time) || stringValue(record.startTime);
+	const endTime = stringValue(record.end_time) || stringValue(record.endTime);
+	if (!id && !recurringEventId && !calendarId && !url && !htmlLink && !startTime && !endTime) return;
+	return {
+		calendarId: calendarId || void 0,
+		endTime: endTime || void 0,
+		htmlLink: htmlLink || void 0,
+		id: id || void 0,
+		recurringEventId: recurringEventId || void 0,
+		startTime: startTime || void 0,
+		url: url || void 0
+	};
+}
 function parseDocument(value) {
 	const record = asRecord(value);
 	if (!record) throw new Error("document payload is not an object");
 	return {
+		calendarEvent: parseCalendarEvent(record.google_calendar_event),
 		content: stringValue(record.content),
 		createdAt: stringValue(record.created_at),
 		id: stringValue(record.id),
 		lastViewedPanel: parseLastViewedPanel(record.last_viewed_panel),
 		notes: parseProseMirrorDoc(record.notes),
 		notesPlain: stringValue(record.notes_plain),
-		tags: stringArray$1(record.tags),
+		tags: stringArray$2(record.tags),
 		title: stringValue(record.title),
 		updatedAt: stringValue(record.updated_at)
 	};
@@ -3973,6 +4137,7 @@ function parsePublicNote(value) {
 	const summaryMarkdown = stringValue(record.summary_markdown);
 	const summaryText = stringValue(record.summary_text);
 	return {
+		calendarEvent: parseCalendarEvent(record.google_calendar_event),
 		content: summaryMarkdown || summaryText,
 		createdAt: stringValue(record.created_at),
 		folderMemberships: Array.isArray(record.folder_membership) ? record.folder_membership.map(parseFolderMembership).filter((membership) => Boolean(membership)) : [],
@@ -4890,6 +5055,10 @@ function cloneMeetingSummary(meeting) {
 function resolveActionFilePath(filePath, cwd) {
 	return cwd ? resolve(cwd, filePath) : resolve(filePath);
 }
+async function readOptionalActionFile(filePath, cwd) {
+	if (!filePath) return;
+	return await readFile(resolveActionFilePath(filePath, cwd), "utf8");
+}
 function combinePromptSections(...values) {
 	const sections = values.map((value) => value?.trim()).filter((value) => Boolean(value));
 	return sections.length > 0 ? sections.join("\n\n") : void 0;
@@ -5689,18 +5858,25 @@ var GranolaApp = class {
 	}
 	async runAutomationAgent(match, rule, action) {
 		const bundle = match.eventKind === "meeting.removed" ? void 0 : await this.maybeReadMeetingBundleById(match.meetingId, { requireCache: false });
-		const promptFile = action.promptFile ? await readFile(resolveActionFilePath(action.promptFile, action.cwd), "utf8") : void 0;
-		const systemPromptFile = action.systemPromptFile ? await readFile(resolveActionFilePath(action.systemPromptFile, action.cwd), "utf8") : void 0;
-		const instructions = combinePromptSections(promptFile, action.prompt);
+		const harness = resolveAgentHarness(this.deps.agentHarnessStore ? await this.deps.agentHarnessStore.readHarnesses() : [], {
+			bundle,
+			match
+		}, action.harnessId);
+		const harnessCwd = harness?.cwd;
+		const promptFile = await readOptionalActionFile(action.promptFile, action.cwd ?? harnessCwd);
+		const harnessPromptFile = await readOptionalActionFile(harness?.promptFile, harnessCwd);
+		const systemPromptFile = await readOptionalActionFile(action.systemPromptFile, action.cwd ?? harnessCwd);
+		const harnessSystemPromptFile = await readOptionalActionFile(harness?.systemPromptFile, harnessCwd);
+		const instructions = combinePromptSections(harnessPromptFile, harness?.prompt, promptFile, action.prompt);
 		if (!instructions) throw new Error(`automation agent action ${action.id} is missing prompt instructions`);
 		const request = {
-			cwd: action.cwd,
+			cwd: action.cwd ?? harnessCwd,
 			dryRun: action.dryRun,
-			model: action.model,
+			model: action.model ?? harness?.model,
 			prompt: buildAutomationAgentPrompt(match, rule, instructions, bundle),
-			provider: action.provider,
+			provider: action.provider ?? harness?.provider,
 			retries: action.retries,
-			systemPrompt: combinePromptSections(systemPromptFile, action.systemPrompt),
+			systemPrompt: combinePromptSections(harnessSystemPromptFile, harness?.systemPrompt, systemPromptFile, action.systemPrompt),
 			timeoutMs: action.timeoutMs
 		};
 		return await (this.deps.agentRunner ?? createDefaultAutomationAgentRunner(this.config)).run(request);
@@ -6147,6 +6323,7 @@ async function createGranolaApp(config, options = {}) {
 	const automationRuns = await automationRunStore.readRuns({ limit: 0 });
 	const automationRuleStore = createDefaultAutomationRuleStore(config.automation?.rulesFile ?? defaultAutomationRulesFilePath());
 	const automationRules = await automationRuleStore.readRules();
+	const agentHarnessStore = createDefaultAgentHarnessStore(config.agents?.harnessesFile);
 	const authController = createDefaultGranolaAuthController(config);
 	const exportJobStore = createDefaultExportJobStore();
 	const exportJobs = await exportJobStore.readJobs();
@@ -6160,6 +6337,7 @@ async function createGranolaApp(config, options = {}) {
 	return new GranolaApp(config, {
 		auth,
 		agentRunner: createDefaultAutomationAgentRunner(config),
+		agentHarnessStore,
 		authController,
 		automationMatches,
 		automationMatchStore,
@@ -6257,6 +6435,7 @@ async function loadConfig(options) {
 				return value === "codex" || value === "openai" || value === "openrouter" ? value : void 0;
 			})(),
 			dryRun: envFlag(env.GRANOLA_AGENT_DRY_RUN) ?? pickBoolean(configValues["agent-dry-run"]) ?? pickBoolean(configValues.agentDryRun) ?? false,
+			harnessesFile: pickString(env.GRANOLA_AGENT_HARNESSES_FILE) ?? pickString(configValues["agent-harnesses-file"]) ?? pickString(configValues.agentHarnessesFile) ?? defaultGranolaToolkitPersistenceLayout().agentHarnessesFile,
 			maxRetries: pickNumber(env.GRANOLA_AGENT_MAX_RETRIES) ?? pickNumber(configValues["agent-max-retries"]) ?? pickNumber(configValues.agentMaxRetries) ?? 2,
 			openaiBaseUrl: pickString(env.GRANOLA_OPENAI_BASE_URL) ?? pickString(env.OPENAI_BASE_URL) ?? pickString(configValues["openai-base-url"]) ?? pickString(configValues.openaiBaseUrl) ?? "https://api.openai.com/v1",
 			openrouterBaseUrl: pickString(env.GRANOLA_OPENROUTER_BASE_URL) ?? pickString(env.OPENROUTER_BASE_URL) ?? pickString(configValues["openrouter-base-url"]) ?? pickString(configValues.openrouterBaseUrl) ?? "https://openrouter.ai/api/v1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "granola-toolkit",
-  "version": "0.47.0",
+  "version": "0.48.0",
   "description": "Toolkit for exporting and working with Granola meetings, notes, and transcripts",
   "keywords": [
     "cli",