granola-toolkit 0.12.0 → 0.14.0

package/README.md

@@ -81,6 +81,8 @@ Inspect individual meetings:
 granola meeting list --limit 10
 granola meeting list --search planning
 granola meeting view 1234abcd
+granola meeting notes 1234abcd
+granola meeting transcript 1234abcd --format json
 granola meeting export 1234abcd --format yaml
 ```
 
@@ -143,7 +145,7 @@ The flow is:
 2. fetch documents from Granola's API
 3. optionally load the local cache for transcript data
 4. resolve a meeting by full id or unique id prefix
-5. render either a list, a human-readable meeting view, or a machine-readable export bundle
+5. render either a list, a combined meeting view, focused notes/transcript output, or a machine-readable export bundle
 
 The human-readable `view` command shows:
 
@@ -151,6 +153,11 @@ The human-readable `view` command shows:
 - the selected notes content
 - transcript lines when the local cache is available
 
+The focused meeting subcommands are:
+
+- `meeting notes` for just the selected note output
+- `meeting transcript` for just the selected transcript output
+
 The machine-readable `export` command includes:
 
 - a meeting summary

package/dist/cli.js

@@ -327,14 +327,22 @@ var StoredSessionTokenProvider = class {
 	}
 	async invalidate() {
 		const session = await this.loadSession().catch(() => void 0);
-		if (session?.refreshToken && session.clientId) {
+		if (session?.refreshToken && session.clientId) try {
 			const refreshedSession = await refreshGranolaSession(session, this.options.fetchImpl);
 			this.#session = refreshedSession;
 			await this.store.writeSession(refreshedSession);
 			return;
+		} catch {
+			if (!this.options.source) {
+				this.#session = void 0;
+				await this.store.clearSession();
+				throw new Error("failed to refresh stored Granola session");
+			}
 		}
 		if (this.options.source) {
-			this.#session = await this.options.source.loadSession();
+			const sourcedSession = await this.options.source.loadSession();
+			this.#session = sourcedSession;
+			await this.store.writeSession(sourcedSession);
 			return;
 		}
 		this.#session = void 0;
@@ -939,6 +947,9 @@ function toJson(value) {
 function repeatIndent(level) {
 	return "  ".repeat(level);
 }
+function escapeMarkdownText(text) {
+	return text.replace(/\\/g, "\\\\").replace(/([*_`[\]])/g, "\\$1");
+}
 function renderInline(nodes = []) {
 	return nodes.map((node) => renderInlineNode(node)).join("");
 }
@@ -949,6 +960,9 @@ function applyMarks(text, marks = []) {
 			case "em": return `*${current}*`;
 			case "code": return `\`${current}\``;
 			case "strike": return `~~${current}~~`;
+			case "underline": return `<u>${current}</u>`;
+			case "subscript": return `<sub>${current}</sub>`;
+			case "superscript": return `<sup>${current}</sup>`;
 			case "link": {
 				const href = typeof mark.attrs?.href === "string" ? mark.attrs.href : void 0;
 				return href ? `[${current}](${href})` : current;
@@ -959,8 +973,9 @@ function applyMarks(text, marks = []) {
 }
 function renderInlineNode(node) {
 	switch (node.type) {
-		case "text": return applyMarks(node.text ?? "", node.marks);
+		case "text": return applyMarks(escapeMarkdownText(node.text ?? ""), node.marks);
 		case "hardBreak": return "  \n";
+		case "mention": return applyMarks(escapeMarkdownText(typeof node.attrs?.label === "string" ? node.attrs.label : typeof node.attrs?.text === "string" ? node.attrs.text : typeof node.attrs?.name === "string" ? node.attrs.name : renderInline(node.content)), node.marks);
 		default: return applyMarks(renderInline(node.content), node.marks);
 	}
 }
@@ -968,21 +983,45 @@ function indentLines(value, level) {
 	const indent = repeatIndent(level);
 	return value.split("\n").map((line) => line.length === 0 ? line : `${indent}${line}`).join("\n");
 }
-function renderList(items, ordered, indentLevel) {
-	return items.map((item, index) => renderListItem(item, ordered ? `${index + 1}.` : "-", indentLevel)).join("\n");
+function renderList(items, ordered, indentLevel, start = 1) {
+	return items.map((item, index) => renderListItem(item, ordered ? `${start + index}.` : "-", indentLevel)).join("\n");
 }
 function renderListItem(node, marker, indentLevel) {
 	const children = node.content ?? [];
 	const blockChildren = children.filter((child) => child.type !== "bulletList" && child.type !== "orderedList");
 	const nestedLists = children.filter((child) => child.type === "bulletList" || child.type === "orderedList");
 	const mainText = blockChildren.map((child) => renderBlock(child, indentLevel + 1)).filter(Boolean).join("\n").trim();
-	let output = `${`${repeatIndent(indentLevel)}${marker} `}${mainText || ""}`.trimEnd();
+	const prefix = `${repeatIndent(indentLevel)}${marker} `;
+	const continuationIndent = `${repeatIndent(indentLevel)}${" ".repeat(marker.length + 1)}`;
+	let output = `${prefix}${mainText.split("\n").map((line, index) => index === 0 ? line : `${continuationIndent}${line}`).join("\n") || ""}`.trimEnd();
 	if (nestedLists.length > 0) {
 		const nestedText = nestedLists.map((child) => renderBlock(child, indentLevel + 1)).filter(Boolean).map((value) => indentLines(value, 0)).join("\n");
 		output = `${output}\n${nestedText}`;
 	}
 	return output;
 }
+function renderTaskList(items, indentLevel) {
+	return items.map((item) => renderTaskItem(item, indentLevel)).join("\n");
+}
+function renderTaskItem(node, indentLevel) {
+	return renderListItem(node, node.attrs?.checked === true ? "[x]" : "[ ]", indentLevel);
+}
+function renderTableCell(node) {
+	return renderBlocks(node.content ?? [], 0).replace(/\n+/g, " <br> ").replace(/\|/g, "\\|").trim();
+}
+function renderTable(node) {
+	const rows = (node.content ?? []).map((row) => (row.content ?? []).map((cell) => renderTableCell(cell))).filter((row) => row.length > 0);
+	if (rows.length === 0) return "";
+	const header = rows[0];
+	const body = rows.slice(1);
+	const separator = header.map(() => "---");
+	const lines = [`| ${header.map((cell) => cell || " ").join(" | ")} |`, `| ${separator.join(" | ")} |`];
+	for (const row of body) {
+		const padded = header.map((_, index) => row[index] ?? " ");
+		lines.push(`| ${padded.join(" | ")} |`);
+	}
+	return lines.join("\n");
+}
 function renderBlock(node, indentLevel) {
 	switch (node.type) {
 		case "heading": {
@@ -991,10 +1030,25 @@ function renderBlock(node, indentLevel) {
 		}
 		case "paragraph": return renderInline(node.content).trim();
 		case "bulletList": return renderList(node.content ?? [], false, indentLevel);
-		case "orderedList": return renderList(node.content ?? [], true, indentLevel);
+		case "orderedList": {
+			const start = typeof node.attrs?.start === "number" ? node.attrs.start : 1;
+			return renderList(node.content ?? [], true, indentLevel, start);
+		}
 		case "listItem": return renderListItem(node, "-", indentLevel);
+		case "taskList": return renderTaskList(node.content ?? [], indentLevel);
+		case "taskItem": return renderTaskItem(node, indentLevel);
+		case "table": return renderTable(node);
+		case "tableRow": return (node.content ?? []).map((cell) => renderTableCell(cell)).join(" | ");
+		case "tableCell":
+		case "tableHeader": return renderTableCell(node);
 		case "blockquote": return renderBlocks(node.content ?? [], indentLevel).split("\n").map((line) => line ? `> ${line}` : ">").join("\n").trim();
-		case "codeBlock": return `\`\`\`\n${extractPlainText(node).trimEnd()}\n\`\`\``;
+		case "codeBlock": {
+			const text = extractPlainText({
+				type: "doc",
+				content: node.content
+			}).trimEnd();
+			return `\`\`\`${typeof node.attrs?.language === "string" ? node.attrs.language.trim() : typeof node.attrs?.params === "string" ? node.attrs.params.trim() : ""}\n${text}\n\`\`\``;
+		}
 		case "horizontalRule": return "---";
 		case "hardBreak": return "";
 		case "text": return renderInlineNode(node);
@@ -1315,6 +1369,7 @@ function buildMeetingTranscript(document, cacheData) {
 		loaded: false,
 		segmentCount: 0,
 		transcript: null,
+		transcriptRecord: null,
 		transcriptText: null
 	};
 	const rawSegments = cacheData.transcripts[document.id] ?? [];
@@ -1323,6 +1378,7 @@ function buildMeetingTranscript(document, cacheData) {
 		loaded: true,
 		segmentCount: 0,
 		transcript: null,
+		transcriptRecord: null,
 		transcriptText: null
 	};
 	const transcript = buildTranscriptExport(cacheDocumentForMeeting(document, cacheData), normalisedSegments, rawSegments);
@@ -1330,6 +1386,7 @@ function buildMeetingTranscript(document, cacheData) {
 		loaded: true,
 		segmentCount: transcript.segments.length,
 		transcript: serialiseTranscript(transcript),
+		transcriptRecord: transcript,
 		transcriptText: renderTranscriptExport(transcript, "text")
 	};
 }
@@ -1458,6 +1515,14 @@ function renderMeetingExport(record, format = "json") {
 		case "yaml": return toYaml(record);
 	}
 }
+function renderMeetingNotes(document, format = "markdown") {
+	return renderNoteExport(buildNoteExport(document), format);
+}
+function renderMeetingTranscript(document, cacheData, format = "text") {
+	const transcript = buildMeetingTranscript(document, cacheData).transcriptRecord;
+	if (!transcript) return "";
+	return renderTranscriptExport(transcript, format);
+}
 //#endregion
 //#region src/commands/shared.ts
 function debug(enabled, ...values) {
@@ -1469,16 +1534,18 @@ function meetingHelp() {
 	return `Granola meeting
 
 Usage:
-  granola meeting <list|view|export> [options]
+  granola meeting <list|view|export|notes|transcript> [options]
 
 Subcommands:
   list                List meetings from the Granola API
   view <id>           Show a single meeting with notes and transcript text
   export <id>         Export a single meeting as JSON or YAML
+  notes <id>          Show a single meeting's notes
+  transcript <id>     Show a single meeting's transcript
 
 Options:
   --cache <path>      Path to Granola cache JSON for transcript data
-  --format <value>    list/view: text, json, yaml; export: json, yaml
+  --format <value>    list/view: text, json, yaml; export: json, yaml; notes: markdown, json, yaml, raw; transcript: text, json, yaml, raw
   --limit <n>         Number of meetings for list (default: 20)
   --search <query>    Filter list by title, id, or tag
   --timeout <value>   Request timeout, e.g. 2m, 30s, 120000 (default: 2m)
@@ -1514,6 +1581,26 @@ function resolveExportFormat(value) {
 		default: throw new Error("invalid meeting export format: expected json or yaml");
 	}
 }
+function resolveNotesFormat(value) {
+	switch (value) {
+		case void 0: return "markdown";
+		case "json":
+		case "markdown":
+		case "raw":
+		case "yaml": return value;
+		default: throw new Error("invalid meeting notes format: expected markdown, json, yaml, or raw");
+	}
+}
+function resolveTranscriptFormat$1(value) {
+	switch (value) {
+		case void 0: return "text";
+		case "json":
+		case "raw":
+		case "text":
+		case "yaml": return value;
+		default: throw new Error("invalid meeting transcript format: expected text, json, yaml, or raw");
+	}
+}
 function parseLimit(value) {
 	if (value === void 0) return 20;
 	if (typeof value !== "string" || !/^\d+$/.test(value)) throw new Error("invalid meeting limit: expected a positive integer");
@@ -1543,18 +1630,25 @@ const meetingCommand = {
 			case "export":
 				if (!id) throw new Error("meeting export requires an id");
 				return await exportMeeting(id, commandFlags, globalFlags);
+			case "notes":
+				if (!id) throw new Error("meeting notes requires an id");
+				return await notes(id, commandFlags, globalFlags);
+			case "transcript":
+				if (!id) throw new Error("meeting transcript requires an id");
+				return await transcript(id, commandFlags, globalFlags);
 			case void 0:
 				console.log(meetingHelp());
 				return 1;
-			default: throw new Error("invalid meeting command: expected list, view, or export");
+			default: throw new Error("invalid meeting command: expected list, view, export, notes, or transcript");
 		}
 	}
 };
-async function loadMeetingData(commandFlags, globalFlags) {
+async function loadMeetingData(commandFlags, globalFlags, options = {}) {
 	const config = await loadConfig({
 		globalFlags,
 		subcommandFlags: commandFlags
 	});
+	if (options.requireCache && !config.transcripts.cacheFile) throw new Error(`Granola cache file not found. Pass --cache or create .granola.toml. Expected locations include: ${granolaCacheCandidates().join(", ")}`);
 	if (config.transcripts.cacheFile && !existsSync(config.transcripts.cacheFile)) throw new Error(`Granola cache file not found: ${config.transcripts.cacheFile}`);
 	debug(config.debug, "using config", config.configFileUsed ?? "(none)");
 	debug(config.debug, "supabase", config.supabase);
@@ -1567,6 +1661,15 @@ async function loadMeetingData(commandFlags, globalFlags) {
 		granolaClient
 	};
 }
+async function loadResolvedMeeting(id, commandFlags, globalFlags, options = {}) {
+	const { cacheData, config, granolaClient } = await loadMeetingData(commandFlags, globalFlags, options);
+	console.log("Fetching meeting from Granola API...");
+	return {
+		cacheData,
+		config,
+		document: resolveMeeting(await granolaClient.listDocuments({ timeoutMs: config.notes.timeoutMs }), id)
+	};
+}
 async function list(commandFlags, globalFlags) {
 	const format = resolveListFormat(commandFlags.format);
 	const limit = parseLimit(commandFlags.limit);
@@ -1583,20 +1686,32 @@ async function list(commandFlags, globalFlags) {
 }
 async function view(id, commandFlags, globalFlags) {
 	const format = resolveViewFormat(commandFlags.format);
-	const { cacheData, config, granolaClient } = await loadMeetingData(commandFlags, globalFlags);
-	console.log("Fetching meeting from Granola API...");
-	const meeting = buildMeetingRecord(resolveMeeting(await granolaClient.listDocuments({ timeoutMs: config.notes.timeoutMs }), id), cacheData);
+	const { cacheData, document } = await loadResolvedMeeting(id, commandFlags, globalFlags);
+	const meeting = buildMeetingRecord(document, cacheData);
 	console.log(renderMeetingView(meeting, format).trimEnd());
 	return 0;
 }
 async function exportMeeting(id, commandFlags, globalFlags) {
 	const format = resolveExportFormat(commandFlags.format);
-	const { cacheData, config, granolaClient } = await loadMeetingData(commandFlags, globalFlags);
-	console.log("Fetching meeting from Granola API...");
-	const meeting = buildMeetingRecord(resolveMeeting(await granolaClient.listDocuments({ timeoutMs: config.notes.timeoutMs }), id), cacheData);
+	const { cacheData, document } = await loadResolvedMeeting(id, commandFlags, globalFlags);
+	const meeting = buildMeetingRecord(document, cacheData);
 	console.log(renderMeetingExport(meeting, format).trimEnd());
 	return 0;
 }
+async function notes(id, commandFlags, globalFlags) {
+	const format = resolveNotesFormat(commandFlags.format);
+	const { document } = await loadResolvedMeeting(id, commandFlags, globalFlags);
+	console.log(renderMeetingNotes(document, format).trimEnd());
+	return 0;
+}
+async function transcript(id, commandFlags, globalFlags) {
+	const format = resolveTranscriptFormat$1(commandFlags.format);
+	const { cacheData, document } = await loadResolvedMeeting(id, commandFlags, globalFlags, { requireCache: true });
+	const output = renderMeetingTranscript(document, cacheData, format);
+	if (!output.trim()) throw new Error(`no transcript found for meeting: ${document.id}`);
+	console.log(output.trimEnd());
+	return 0;
+}
 //#endregion
 //#region src/commands/notes.ts
 function notesHelp() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "granola-toolkit",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "description": "CLI toolkit for exporting and working with Granola notes and transcripts",
   "keywords": [
     "cli",