granola-toolkit 0.32.0 → 0.33.0

package/README.md

@@ -319,6 +319,7 @@ That keeps the current single-package repo simple, while making a future split i
 
 The initial terminal workspace includes:
 
+- a folder scope inside the navigation pane, including an explicit All meetings view
 - a meeting list pane with keyboard navigation
 - a detail pane with notes, transcript, metadata, and raw views
 - an auth session overlay for import, refresh, source switching, and sign-out
@@ -327,7 +328,8 @@ The initial terminal workspace includes:
 
 The main keyboard controls are:
 
-- `j` / `k` or arrow keys to move between meetings
+- `h` / `l`, left / right, or `Tab` to switch between folders and meetings
+- `j` / `k` or arrow keys to move within the active folder or meeting list
 - `/` or `Ctrl+P` to open quick open
 - `a` to open auth session actions
 - `1`-`4` to switch detail tabs

package/dist/cli.js

@@ -1345,6 +1345,7 @@ function renderGranolaTuiMeetingTab(bundle, tab) {
 			`ID: ${summary.id}`,
 			`Created: ${summary.createdAt}`,
 			`Updated: ${summary.updatedAt}`,
+			`Folders: ${summary.folders.length > 0 ? summary.folders.map((folder) => folder.name).join(", ") : "none"}`,
 			`Tags: ${summary.tags.length > 0 ? summary.tags.join(", ") : "none"}`,
 			`Notes source: ${summary.noteContentSource}`,
 			`Transcript loaded: ${summary.transcriptLoaded ? "yes" : "no"}`,
@@ -1360,7 +1361,7 @@ function renderGranolaTuiMeetingTab(bundle, tab) {
 	}
 }
 function buildGranolaTuiSummary(state, meetingSource) {
-	return `auth ${state.auth.mode === "stored-session" ? "stored" : "supabase"} | ${state.documents.loaded ? `${state.documents.count} docs` : "docs pending"} | ${state.cache.loaded ? `${state.cache.transcriptCount} transcript sets` : state.cache.configured ? "cache configured" : "cache missing"} | ${state.index.loaded ? `${state.index.meetingCount} indexed` : "index pending"} | list ${meetingSource}`;
+	return `auth ${state.auth.mode === "stored-session" ? "stored" : "supabase"} | ${state.documents.loaded ? `${state.documents.count} docs` : "docs pending"} | ${state.folders.loaded ? `${state.folders.count} folders` : "folders pending"} | ${state.cache.loaded ? `${state.cache.transcriptCount} transcript sets` : state.cache.configured ? "cache configured" : "cache missing"} | ${state.index.loaded ? `${state.index.meetingCount} indexed` : "index pending"} | list ${meetingSource}`;
 }
 //#endregion
 //#region src/tui/theme.ts
@@ -1657,9 +1658,13 @@ var GranolaTuiWorkspace = class {
 	focused = false;
 	#maxMeetings;
 	#appState;
+	#activePane = "meetings";
 	#detailError = "";
 	#detailScroll = 0;
 	#detailToken = 0;
+	#folderError = "";
+	#folderToken = 0;
+	#folders = [];
 	#listError = "";
 	#listToken = 0;
 	#loadingDetail = false;
@@ -1667,6 +1672,7 @@ var GranolaTuiWorkspace = class {
 	#meetingSource = "live";
 	#meetings = [];
 	#overlay;
+	#selectedFolderId;
 	#selectedMeeting;
 	#selectedMeetingId;
 	#statusMessage = "Loading meetings…";
@@ -1679,11 +1685,13 @@ var GranolaTuiWorkspace = class {
 		this.options = options;
 		this.#appState = app.getState();
 		this.#maxMeetings = options.maxMeetings ?? 200;
+		this.#selectedFolderId = this.#appState.ui.selectedFolderId;
 	}
 	async initialise() {
 		this.#unsubscribe = this.app.subscribe((event) => {
 			this.handleAppUpdate(event);
 		});
+		await this.loadFolders({ setStatus: false });
 		await this.loadMeetings({
 			preferredMeetingId: this.options.initialMeetingId,
 			setStatus: true
@@ -1699,7 +1707,12 @@ var GranolaTuiWorkspace = class {
 	handleAppUpdate(event) {
 		const previousDocumentsLoadedAt = this.#appState.documents.loadedAt;
 		this.#appState = event.state;
-		if (this.#meetingSource === "index" && event.state.documents.loadedAt && event.state.documents.loadedAt !== previousDocumentsLoadedAt && !this.#loadingMeetings) this.loadMeetings({ preferredMeetingId: this.#selectedMeetingId });
+		this.#selectedFolderId = event.state.ui.selectedFolderId;
+		this.#selectedMeetingId = event.state.ui.selectedMeetingId ?? this.#selectedMeetingId;
+		if (this.#meetingSource === "index" && event.state.documents.loadedAt && event.state.documents.loadedAt !== previousDocumentsLoadedAt && !this.#loadingMeetings) (async () => {
+			await this.loadFolders({ setStatus: false });
+			await this.loadMeetings({ preferredMeetingId: this.#selectedMeetingId });
+		})();
 		this.tui.requestRender();
 	}
 	setStatus(message, tone = "info") {
@@ -1712,6 +1725,11 @@ var GranolaTuiWorkspace = class {
 		const selectedIndex = this.#selectedMeetingId ? this.#meetings.findIndex((meeting) => meeting.id === this.#selectedMeetingId) : -1;
 		return selectedIndex >= 0 ? selectedIndex : 0;
 	}
+	normaliseSelectedFolderIndex() {
+		if (!this.#selectedFolderId) return 0;
+		const selectedIndex = this.#folders.findIndex((folder) => folder.id === this.#selectedFolderId);
+		return selectedIndex >= 0 ? selectedIndex + 1 : 0;
+	}
 	ensureMeetingVisible(meeting) {
 		const existingIndex = this.#meetings.findIndex((item) => item.id === meeting.id);
 		if (existingIndex >= 0) this.#meetings[existingIndex] = meeting;
@@ -1721,6 +1739,30 @@ var GranolaTuiWorkspace = class {
 			return left.title.localeCompare(right.title);
 		});
 	}
+	async loadFolders(options = {}) {
+		const token = ++this.#folderToken;
+		this.#folderError = "";
+		if (options.setStatus) this.setStatus(options.forceRefresh ? "Refreshing folders…" : "Loading folders…");
+		try {
+			const result = await this.app.listFolders({
+				forceRefresh: options.forceRefresh,
+				limit: 100
+			});
+			if (token !== this.#folderToken) return;
+			this.#folders = result.folders;
+			if (this.#selectedFolderId && !this.#folders.some((folder) => folder.id === this.#selectedFolderId)) this.#selectedFolderId = void 0;
+			this.#folderError = "";
+		} catch (error) {
+			if (token !== this.#folderToken) return;
+			const message = error instanceof Error ? error.message : String(error);
+			this.#folderError = message;
+			this.#folders = [];
+			this.#selectedFolderId = void 0;
+			this.setStatus(message, "error");
+		} finally {
+			if (token === this.#folderToken) this.tui.requestRender();
+		}
+	}
 	async loadMeetings(options = {}) {
 		const token = ++this.#listToken;
 		this.#loadingMeetings = true;
@@ -1728,6 +1770,7 @@ var GranolaTuiWorkspace = class {
 		if (options.setStatus !== false) this.setStatus(options.forceRefresh ? "Refreshing meetings…" : "Loading meetings…");
 		try {
 			const result = await this.app.listMeetings({
+				folderId: this.#selectedFolderId,
 				forceRefresh: options.forceRefresh,
 				limit: this.#maxMeetings,
 				preferIndex: true
@@ -1736,8 +1779,13 @@ var GranolaTuiWorkspace = class {
 			this.#meetings = result.meetings;
 			this.#meetingSource = result.source;
 			this.#selectedMeetingId = options.preferredMeetingId && this.#meetings.some((meeting) => meeting.id === options.preferredMeetingId) ? options.preferredMeetingId : this.#selectedMeetingId && this.#meetings.some((meeting) => meeting.id === this.#selectedMeetingId) ? this.#selectedMeetingId : this.#meetings[0]?.id;
+			if (!this.#selectedMeetingId) {
+				this.#selectedMeeting = void 0;
+				this.#detailError = "";
+				this.#detailScroll = 0;
+			}
 			this.#listError = "";
-			this.setStatus(result.source === "index" ? "Loaded meetings from the local index" : "Connected to Granola");
+			this.setStatus(result.source === "index" ? "Loaded meetings from the local index" : this.#selectedFolderId ? "Connected to Granola (folder scope)" : "Connected to Granola");
 		} catch (error) {
 			if (token !== this.#listToken) return;
 			const message = error instanceof Error ? error.message : String(error);
@@ -1780,6 +1828,10 @@ var GranolaTuiWorkspace = class {
 	}
 	async refresh(forceRefresh) {
 		try {
+			await this.loadFolders({
+				forceRefresh,
+				setStatus: false
+			});
 			await this.loadMeetings({
 				forceRefresh,
 				preferredMeetingId: this.#selectedMeetingId
@@ -1787,7 +1839,7 @@ var GranolaTuiWorkspace = class {
 			if (this.#selectedMeetingId) await this.loadMeeting(this.#selectedMeetingId, { ensureMeetingVisible: true });
 		} catch {}
 	}
-	async moveSelection(delta) {
+	async moveMeetingSelection(delta) {
 		if (this.#meetings.length === 0) return;
 		const currentIndex = this.normaliseSelectedIndex();
 		const nextIndex = Math.max(0, Math.min(this.#meetings.length - 1, currentIndex + delta));
@@ -1795,6 +1847,33 @@ var GranolaTuiWorkspace = class {
 		if (!nextMeeting || nextMeeting.id === this.#selectedMeetingId) return;
 		await this.loadMeeting(nextMeeting.id);
 	}
+	async moveFolderSelection(delta) {
+		const total = this.#folders.length + 1;
+		const currentIndex = this.normaliseSelectedFolderIndex();
+		const nextIndex = Math.max(0, Math.min(total - 1, currentIndex + delta));
+		const nextFolderId = nextIndex === 0 ? void 0 : this.#folders[nextIndex - 1]?.id;
+		if (nextFolderId === this.#selectedFolderId) return;
+		this.#selectedFolderId = nextFolderId;
+		this.#selectedMeeting = void 0;
+		this.#detailError = "";
+		this.#detailScroll = 0;
+		await this.loadMeetings({
+			preferredMeetingId: this.#selectedMeetingId,
+			setStatus: false
+		});
+		if (this.#selectedMeetingId) {
+			await this.loadMeeting(this.#selectedMeetingId, { ensureMeetingVisible: true });
+			return;
+		}
+		this.tui.requestRender();
+	}
+	async moveSelection(delta) {
+		if (this.#activePane === "folders") {
+			await this.moveFolderSelection(delta);
+			return;
+		}
+		await this.moveMeetingSelection(delta);
+	}
 	currentDetailBody(width) {
 		if (this.#detailError) return wrapBlock(this.#detailError, width);
 		if (this.#loadingDetail && !this.#selectedMeeting) return wrapBlock("Loading meeting details…", width);
@@ -1832,6 +1911,10 @@ var GranolaTuiWorkspace = class {
 	async reloadAfterAuthChange() {
 		const preferredMeetingId = this.#selectedMeeting?.document.id ?? this.#selectedMeetingId;
 		try {
+			await this.loadFolders({
+				forceRefresh: true,
+				setStatus: false
+			});
 			await this.loadMeetings({
 				forceRefresh: true,
 				preferredMeetingId,
@@ -1956,6 +2039,21 @@ var GranolaTuiWorkspace = class {
 			this.openAuthPanel();
 			return;
 		}
+		if (matchesKey(data, "tab")) {
+			this.#activePane = this.#activePane === "folders" ? "meetings" : "folders";
+			this.tui.requestRender();
+			return;
+		}
+		if (matchesKey(data, "left") || matchesKey(data, "h")) {
+			this.#activePane = "folders";
+			this.tui.requestRender();
+			return;
+		}
+		if (matchesKey(data, "right") || matchesKey(data, "l")) {
+			this.#activePane = "meetings";
+			this.tui.requestRender();
+			return;
+		}
 		if (matchesKey(data, "up") || matchesKey(data, "k")) {
 			this.moveSelection(-1);
 			return;
@@ -2021,22 +2119,53 @@ var GranolaTuiWorkspace = class {
 	renderListPane(width, height) {
 		const lines = [];
 		const innerWidth = Math.max(1, width - 2);
-		const header = `${granolaTuiTheme.strong("Meetings")} ${granolaTuiTheme.dim(`(${this.#meetings.length})`)}`;
-		lines.push(padLine(header, innerWidth));
+		const folderEntries = [{
+			id: void 0,
+			label: "All meetings",
+			meta: this.#folders.length > 0 ? `${this.#folders.length} folders` : "global scope"
+		}, ...this.#folders.map((folder) => ({
+			id: folder.id,
+			label: `${folder.isFavourite ? "★ " : ""}${folder.name || folder.id}`,
+			meta: `${folder.documentCount} meetings`
+		}))];
+		const availableRows = Math.max(2, height - 3);
+		const folderWindowSize = Math.min(Math.max(3, Math.min(8, Math.floor(availableRows * .35))), Math.max(1, availableRows - 1));
+		const meetingWindowSize = Math.max(1, availableRows - folderWindowSize);
+		const folderHeader = `${this.#activePane === "folders" ? granolaTuiTheme.accent("Folders") : granolaTuiTheme.strong("Folders")} ${granolaTuiTheme.dim(`(${this.#folders.length})`)}`;
+		lines.push(padLine(folderHeader, innerWidth));
+		if (this.#folderError) {
+			lines.push(...wrapBlock(granolaTuiTheme.error(this.#folderError), innerWidth).slice(0, folderWindowSize));
+			while (lines.length < 1 + folderWindowSize) lines.push(" ".repeat(innerWidth));
+		} else {
+			const selectedFolderIndex = this.normaliseSelectedFolderIndex();
+			const folderStartIndex = Math.max(0, Math.min(selectedFolderIndex - Math.floor(folderWindowSize / 2), folderEntries.length - folderWindowSize));
+			const visibleFolders = folderEntries.slice(folderStartIndex, folderStartIndex + folderWindowSize);
+			for (const [offset, folder] of visibleFolders.entries()) {
+				const selected = folderStartIndex + offset === selectedFolderIndex;
+				const prefix = selected ? "> " : "  ";
+				const maxLabelWidth = Math.max(6, innerWidth - visibleWidth(prefix) - visibleWidth(folder.meta) - 1);
+				const labelBlock = `${prefix}${truncateToWidth(folder.label, maxLabelWidth, "")}`;
+				const line = `${labelBlock}${" ".repeat(Math.max(1, innerWidth - visibleWidth(labelBlock) - visibleWidth(folder.meta)))}${granolaTuiTheme.dim(folder.meta)}`;
+				lines.push(selected ? padLine(granolaTuiTheme.selected(line), innerWidth) : padLine(line, innerWidth));
+			}
+			while (lines.length < 1 + folderWindowSize) lines.push(" ".repeat(innerWidth));
+		}
+		lines.push(padLine(granolaTuiTheme.dim(""), innerWidth));
+		const meetingsHeader = `${this.#activePane === "meetings" ? granolaTuiTheme.accent("Meetings") : granolaTuiTheme.strong("Meetings")} ${granolaTuiTheme.dim(`(${this.#meetings.length})`)}`;
+		lines.push(padLine(meetingsHeader, innerWidth));
 		if (this.#listError) {
-			lines.push(...wrapBlock(granolaTuiTheme.error(this.#listError), innerWidth).slice(0, height - 1));
+			lines.push(...wrapBlock(granolaTuiTheme.error(this.#listError), innerWidth).slice(0, meetingWindowSize));
 			while (lines.length < height) lines.push(" ".repeat(innerWidth));
 			return lines;
 		}
 		if (this.#meetings.length === 0) {
-			lines.push(...wrapBlock("No meetings available yet.", innerWidth).slice(0, height - 1));
+			lines.push(...wrapBlock("No meetings available yet.", innerWidth).slice(0, meetingWindowSize));
 			while (lines.length < height) lines.push(" ".repeat(innerWidth));
 			return lines;
 		}
 		const selectedIndex = this.normaliseSelectedIndex();
-		const windowSize = Math.max(1, height - 1);
-		const startIndex = Math.max(0, Math.min(selectedIndex - Math.floor(windowSize / 2), this.#meetings.length - windowSize));
-		const visibleMeetings = this.#meetings.slice(startIndex, startIndex + windowSize);
+		const startIndex = Math.max(0, Math.min(selectedIndex - Math.floor(meetingWindowSize / 2), this.#meetings.length - meetingWindowSize));
+		const visibleMeetings = this.#meetings.slice(startIndex, startIndex + meetingWindowSize);
 		for (const [offset, meeting] of visibleMeetings.entries()) {
 			const selected = startIndex + offset === selectedIndex;
 			const dateLabel = meeting.updatedAt.slice(0, 10);
@@ -2094,7 +2223,7 @@ var GranolaTuiWorkspace = class {
 		const bodyLines = [];
 		for (let index = 0; index < bodyHeight; index += 1) bodyLines.push(`${padLine(listLines[index] ?? "", listWidth)} | ${padLine(detailLines[index] ?? "", detailWidth)}`);
 		const footerStatus = padLine(toneText(this.#statusTone, this.#statusMessage), width);
-		const footerHints = padLine(granolaTuiTheme.dim("/ quick open  a auth  r refresh  1-4 tabs  PgUp/PgDn scroll  q quit"), width);
+		const footerHints = padLine(granolaTuiTheme.dim("h/l or Tab pane  j/k move  / quick open  a auth  r refresh  1-4 tabs  PgUp/PgDn scroll  q quit"), width);
 		return [
 			headerTitle,
 			headerSummary,

package/package.json

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