From ccd28b7ac9c562a29eb67dbed8333570f0dd6470 Mon Sep 17 00:00:00 2001 From: James Babcock Date: Sun, 30 Aug 2026 15:34:33 -0700 Subject: [PATCH] Move Roam settings out of the Settings app and into the Roam app itself --- app/apps/roam/roam-api.ts | 6 +- app/apps/roam/roam-app.worker.ts | 99 ++++++++++++++++++++++++++++-- app/assistant/roam-tools.ts | 2 +- app/ui/dashboard/settings-menus.ts | 9 --- 4 files changed, 97 insertions(+), 19 deletions(-) diff --git a/app/apps/roam/roam-api.ts b/app/apps/roam/roam-api.ts index 70c7dd39..8e8136bf 100644 --- a/app/apps/roam/roam-api.ts +++ b/app/apps/roam/roam-api.ts @@ -104,7 +104,7 @@ async function roamPost(endpoint: "q" | "pull" | "write", body: object): Promise const graph = roamGraphNameSetting.get(); const token = roamApiTokenSetting.get(); if (!graph || !token) { - throw new Error("Set the Roam graph name and API token in Settings > Roam."); + throw new Error("Set the Roam graph name and API token from the Roam app's long-press menu."); } const path = `/api/graph/${encodeURIComponent(graph)}/${endpoint}`; const payload = JSON.stringify(body); @@ -166,8 +166,8 @@ async function fetchWithTimeout(url: string, payload: string, token: string): Pr } async function describeHttpError(response: Response): Promise { - if (response.status === 401) return "Roam API rejected the token (check Settings > Roam)."; - if (response.status === 404) return "Roam graph not found (check the graph name in Settings > Roam)."; + if (response.status === 401) return "Roam API rejected the token (check Set API token in the menu)."; + if (response.status === 404) return "Roam graph not found (check Set graph name in the menu)."; if (response.status === 429) return "Roam API rate limit hit; try again shortly."; if (response.status === 503) return "Roam graph is not ready yet; try again shortly."; let detail = ""; diff --git a/app/apps/roam/roam-app.worker.ts b/app/apps/roam/roam-app.worker.ts index 9f1e3360..c447a8ab 100644 --- a/app/apps/roam/roam-app.worker.ts +++ b/app/apps/roam/roam-app.worker.ts @@ -4,6 +4,8 @@ * todo or follows a [[page]] link, double-click walks back through visited * pages then yields focus. Edits (check/uncheck, add todo, edit block) go * through the Roam backend API and are also exposed as assistant tools. + * The graph name and API token are configured here too, from the long-press + * menu, via the phone app's text editor. */ import "@nativescript/core/globals"; import { GrayImage } from "../../graphics/image"; @@ -12,11 +14,17 @@ import { prepareFrameDraws } from "../../graphics/glyph-wire"; import { getDefaultSmallFont } from "../../graphics/ui-fonts"; import { truncateText, wrapText } from "../../graphics/textwrap"; import * as frameTimings from "../../native/frame-timings"; +import { onSettingsStoreChanged } from "../../native/settings-store"; import type { MenuItem } from "../../ui/menu"; import { defaultWindowMenuItems, WindowMenu } from "../../ui/window-menu"; import type { WorkerAppMessage, WorkerAppReply } from "../../ui/shell/worker-window"; import type { ToolResult, ToolSpec } from "../../assistant/tool-registry"; import { GESTURE_CLICK, type InputEvent } from "../../ui/gestures"; +import { + roamApiTokenSetting, + roamGraphNameSetting, + type ConfigSettingString, +} from "../../ui/dashboard-settings"; import { DocumentView } from "../../ui/document/document-view"; import { docNodePageLink, type DocNode } from "../../ui/document/document-model"; import { @@ -133,6 +141,14 @@ let loading = false; let errorMessage = ""; let lastFetchMs = 0; let loadSerial = 0; +/** Setting being edited on the "type on the phone" screen, when open. */ +let editingSetting: ConfigSettingString | null = null; + +// Live keystrokes from the phone editor (and edits from other isolates, e.g. +// a settings import): repaint the edit screen / the not-configured hint. +onSettingsStoreChanged((key) => { + if (key.startsWith("integrations.roam.")) render(); +}); function post(message: WorkerAppReply): void { global.postMessage(message); @@ -160,6 +176,11 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { void loadPage(todayRef(), { resetStack: true }); break; case "close-window": + if (editingSetting) { + // Window closed mid-edit: shut the phone editor down. + editingSetting = null; + post({ type: "end-text-setting-edit" }); + } window = null; break; case "input": @@ -175,8 +196,12 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { handleInput(window, message.event as InputEvent, message.frameId); break; case "text-input": - // Voice input / typed text becomes a new todo on the shown page. - if (message.text.trim()) { + if (editingSetting) { + // Voice input as an alternative to the phone keyboard. + editingSetting.set(message.text.trim()); + render(); + } else if (message.text.trim()) { + // Voice input / typed text becomes a new todo on the shown page. void addTodoFromText(message.text.trim()); } break; @@ -332,15 +357,42 @@ function menuItems(win: RoamWindow): MenuItem[] { }); } items.push({ - label: "Roam settings", + label: "Set graph name", onSelect: (ctx) => { ctx.stack.pop(); - post({ type: "open-settings", section: "Roam" }); + beginSettingEdit(roamGraphNameSetting); + }, + }); + items.push({ + label: "Set API token", + onSelect: (ctx) => { + ctx.stack.pop(); + beginSettingEdit(roamApiTokenSetting); }, }); return [...items, ...defaultWindowMenuItems(win.windowId, post)]; } +/** + * Enter the setting-edit screen and ask the shell to open the phone app's + * text editor on the setting. The editor writes the setting live; click (or + * double-click) here finishes the edit. + */ +function beginSettingEdit(setting: ConfigSettingString): void { + editingSetting = setting; + post({ type: "start-text-setting-edit", settingId: setting.id }); + render(); +} + +/** Leave the edit screen; if Roam just became usable, load the page. */ +function endSettingEdit(): void { + editingSetting = null; + post({ type: "end-text-setting-edit" }); + if (isRoamConfigured() && (!currentPage || errorMessage)) { + void loadPage(currentRef ?? todayRef(), { resetStack: !currentRef }); + } +} + function handleInput(win: RoamWindow, event: InputEvent, frameId: number): void { if (win.menu?.isOpen()) { win.menu @@ -349,6 +401,15 @@ function handleInput(win: RoamWindow, event: InputEvent, frameId: number): void .then(() => renderAndSubmit(win, frameId)); return; } + if (editingSetting) { + if (event.type === "click" || event.type === "double-click") { + endSettingEdit(); + renderAndSubmit(win, frameId); + } else { + frameTimings.finishFrame(frameId, "discarded: roam edit-screen ignored input"); + } + return; + } if (event.type === "long-press") { windowMenu(win).open(menuItems(win)); renderAndSubmit(win, frameId); @@ -451,7 +512,7 @@ async function addTodoFromText(text: string): Promise { async function handleRoamTool(name: string, args: any): Promise { if (!isRoamConfigured()) { - return { ok: false, error: "Roam is not configured; set the graph name and API token in Settings > Roam." }; + return { ok: false, error: "Roam is not configured; set the graph name and API token from the Roam app's long-press menu." }; } switch (name) { case "read_page": { @@ -513,9 +574,35 @@ async function handleRoamTool(name: string, args: any): Promise { function paint(win: RoamWindow): Plane[] { if (win.menu?.isOpen()) return win.menu.paint(); + if (editingSetting) return singlePlane(paintSettingEdit(win, editingSetting)); return singlePlane(paintContent(win)); } +/** The "type on the phone" screen shown while a Roam setting is being edited. */ +function paintSettingEdit(win: RoamWindow, setting: ConfigSettingString): GrayImage { + const image = new GrayImage(win.viewportWidth, win.viewportHeight, 0); + const step = smallFont.lineHeight + 2; + image.drawText(smallFont, DOC_MARGIN + 2, 6, setting.glassesEditTitle, 225); + image.drawLine(DOC_MARGIN, HEADER_HEIGHT - 4, win.viewportWidth - DOC_MARGIN, HEADER_HEIGHT - 4, 40); + const messageY = HEADER_HEIGHT + 16; + const lines = wrapText(smallFont, "Type the value in the phone app, or use voice input.", win.viewportWidth - DOC_MARGIN * 2 - 24); + for (let index = 0; index < lines.length; index++) { + image.drawText(smallFont, DOC_MARGIN + 12, messageY + index * step, lines[index]!, 190); + } + // The live value, unmasked so the user can check what they typed. + const value = setting.get(); + const valueY = messageY + (lines.length + 1) * step; + image.drawText( + smallFont, + DOC_MARGIN + 12, + valueY, + truncateText(smallFont, value || "(empty)", win.viewportWidth - DOC_MARGIN * 2 - 24), + value ? 225 : 130, + ); + image.drawText(smallFont, DOC_MARGIN + 12, win.viewportHeight - smallFont.lineHeight - 12, `${GESTURE_CLICK} done`, 110); + return image; +} + function paintContent(win: RoamWindow): GrayImage { const image = new GrayImage(win.viewportWidth, win.viewportHeight, 0); const title = currentRef?.title ?? "Roam"; @@ -534,7 +621,7 @@ function paintContent(win: RoamWindow): GrayImage { image.drawLine(DOC_MARGIN, HEADER_HEIGHT - 4, win.viewportWidth - DOC_MARGIN, HEADER_HEIGHT - 4, 40); if (!isRoamConfigured()) { - drawBodyMessage(image, win, "Set the Roam graph name and API token in Settings > Roam. Long-press for the menu, then pick Roam settings."); + drawBodyMessage(image, win, "Set the Roam graph name and API token: long-press for the menu, then pick Set graph name and Set API token."); } else if (errorMessage) { drawBodyMessage(image, win, `${errorMessage}\n\n${GESTURE_CLICK} retry`); } else if (currentPage && currentPage.children.length === 0 && !loading) { diff --git a/app/assistant/roam-tools.ts b/app/assistant/roam-tools.ts index f7f02f29..057d9173 100644 --- a/app/assistant/roam-tools.ts +++ b/app/assistant/roam-tools.ts @@ -57,7 +57,7 @@ async function callAppTool( args: unknown, ): Promise { if (roamGraphNameSetting.get().length === 0 || roamApiTokenSetting.get().length === 0) { - return err("Roam is not configured; the user must set the graph name and API token in Settings > Roam."); + return err("Roam is not configured; the user must set the graph name and API token from the Roam app's long-press menu."); } return callAppToolWithLaunch(registry, launchApp, "roam", unprefixedName, args); } diff --git a/app/ui/dashboard/settings-menus.ts b/app/ui/dashboard/settings-menus.ts index a66cf2cf..0c9cad0b 100644 --- a/app/ui/dashboard/settings-menus.ts +++ b/app/ui/dashboard/settings-menus.ts @@ -42,8 +42,6 @@ import { openAiApiKeySetting, previewColorSetting, ringConnectionModeSetting, - roamApiTokenSetting, - roamGraphNameSetting, sonioxApiKeySetting, enumSettingMenuItem, firmwareDebugFlagsSetting, @@ -146,13 +144,6 @@ function settingsSections(): SettingsSection[] { toggleSettingMenuItem(terminalWakeOnBellSetting), ], }, - { - label: "Roam", - items: [ - textSettingMenuItem(roamGraphNameSetting), - textSettingMenuItem(roamApiTokenSetting), - ], - }, { label: "Phone display", // The phone app's mirror of the glasses screen and its controls