synthos 0.9.0 → 0.10.1

package/src/service/requiresSettings.ts

@@ -1,17 +1,18 @@
 import { hasConfiguredSettings, loadSettings, SettingsV2 } from "../settings";
+import { SynthOSConfig } from "../init";
 
 
-export async function requiresSettings(res: any, folder: string, cb: (settings: SettingsV2) => Promise<void>) {
+export async function requiresSettings(res: any, config: SynthOSConfig, cb: (settings: SettingsV2) => Promise<void>) {
     try {
         // Ensure settings configured
-        const isConfigured = await hasConfiguredSettings(folder);
+        const isConfigured = await hasConfiguredSettings(config);
         if (!isConfigured) {
             res.status(400).send('Settings not configured');
             return;
         }
 
         // Load settings
-        const settings = await loadSettings(folder);
+        const settings = await loadSettings(config);
 
         // Call the callback
         await cb(settings);

package/src/service/useAgentRoutes.ts

@@ -54,7 +54,7 @@ export function useAgentRoutes(config: SynthOSConfig, app: Application, customiz
     // Auto-connect all enabled OpenClaw agents on startup
     (async () => {
         try {
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             for (const agent of settings.agents ?? []) {
                 tryConnectAgent(agent);
             }
@@ -66,7 +66,7 @@ export function useAgentRoutes(config: SynthOSConfig, app: Application, customiz
     // GET /api/agents — List configured agents (with optional filters)
     app.get('/api/agents', async (req, res) => {
         try {
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             let agents = settings.agents ?? [];
 
             // Filter by enabled
@@ -122,7 +122,7 @@ export function useAgentRoutes(config: SynthOSConfig, app: Application, customiz
                 return;
             }
 
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const agents = settings.agents ? [...settings.agents] : [];
 
             const agentConfig: AgentConfig = {
@@ -159,7 +159,7 @@ export function useAgentRoutes(config: SynthOSConfig, app: Application, customiz
                 agents.push(agentConfig);
             }
 
-            await saveSettings(config.pagesFolder, { agents });
+            await saveSettings(config, { agents });
 
             // Auto-connect OpenClaw agents after save
             tryConnectAgent(agentConfig);
@@ -175,7 +175,7 @@ export function useAgentRoutes(config: SynthOSConfig, app: Application, customiz
     app.patch('/api/agents/:id', async (req, res) => {
         try {
             const { id } = req.params;
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const agents = settings.agents ? [...settings.agents] : [];
             const idx = agents.findIndex(a => a.id === id);
             if (idx === -1) {
@@ -188,7 +188,7 @@ export function useAgentRoutes(config: SynthOSConfig, app: Application, customiz
             if (typeof body.name === 'string') agents[idx].name = body.name;
             if (typeof body.description === 'string') agents[idx].description = body.description;
 
-            await saveSettings(config.pagesFolder, { agents });
+            await saveSettings(config, { agents });
 
             // Connect or disconnect based on enabled state
             if (agents[idx].provider === 'openclaw') {
@@ -210,7 +210,7 @@ export function useAgentRoutes(config: SynthOSConfig, app: Application, customiz
     app.delete('/api/agents/:id', async (req, res) => {
         try {
             const { id } = req.params;
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const agent = (settings.agents ?? []).find(a => a.id === id);
 
             // Disconnect if OpenClaw
@@ -219,7 +219,7 @@ export function useAgentRoutes(config: SynthOSConfig, app: Application, customiz
             }
 
             const agents = (settings.agents ?? []).filter(a => a.id !== id);
-            await saveSettings(config.pagesFolder, { agents });
+            await saveSettings(config, { agents });
             res.json({ deleted: true });
         } catch (err: unknown) {
             console.error(err);
@@ -231,7 +231,7 @@ export function useAgentRoutes(config: SynthOSConfig, app: Application, customiz
     app.post('/api/agents/:id/connect', async (req, res) => {
         try {
             const { id } = req.params;
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const agent = (settings.agents ?? []).find(a => a.id === id);
             if (!agent) {
                 res.status(404).json({ error: `Agent "${id}" not found` });
@@ -277,7 +277,7 @@ export function useAgentRoutes(config: SynthOSConfig, app: Application, customiz
                 return;
             }
 
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const agent = (settings.agents ?? []).find(a => a.id === id);
             if (!agent) {
                 res.status(404).json({ error: `Agent "${id}" not found` });
@@ -307,7 +307,7 @@ export function useAgentRoutes(config: SynthOSConfig, app: Application, customiz
         res: import('express').Response,
         fn: (agent: AgentConfig, provider: AgentProvider) => Promise<void>,
     ): Promise<void> {
-        const settings = await loadSettings(config.pagesFolder);
+        const settings = await loadSettings(config);
         const agent = (settings.agents ?? []).find(a => a.id === id);
         if (!agent) {
             res.status(404).json({ error: `Agent "${id}" not found` });
@@ -386,7 +386,7 @@ export function useAgentRoutes(config: SynthOSConfig, app: Application, customiz
                 return;
             }
 
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const agent = (settings.agents ?? []).find(a => a.id === id);
             if (!agent) {
                 res.status(404).json({ error: `Agent "${id}" not found` });

package/src/service/useApiRoutes.ts

@@ -1,8 +1,7 @@
 import path from "path";
-import fs from "fs/promises";
 import AdmZip from "adm-zip";
-import { listPages, loadPageMetadata, PageMetadata, savePageMetadata, deletePage, copyPage, loadPageState, savePageState, clearVersions, PAGE_VERSION } from "../pages";
-import { checkIfExists, copyFile, copyFolderRecursive, deleteFile, ensureFolderExists, findFileInFolders, listFolders, loadFile } from "../files";
+import { listPages, loadPageMetadata, PageMetadata, savePageMetadata, deletePage, copyPage, savePageState, clearVersions, PAGE_VERSION } from "../pages";
+import { checkIfExists, findFileInFolders, listFiles, listFolders, loadFile } from "../files";
 import {getModelEntry, loadSettings, saveSettings, ServicesConfig } from "../settings";
 import { Application } from 'express';
 import express from 'express';
@@ -50,9 +49,11 @@ const SERVICE_REGISTRY: ServiceDefinition[] = [
 ];
 
 export function useApiRoutes(config: SynthOSConfig, app: Application, customizer?: Customizer): void {
+    const sp = config.storageProvider;
+
     // List pages
     app.get('/api/pages', async (req, res) => {
-        const pages = await listPages(config.pagesFolder, config.requiredPagesFolders);
+        const pages = await listPages(config, config.requiredPagesFolders);
         res.json(pages);
     });
 
@@ -98,13 +99,13 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
             // Auto-append _1, _2, etc. on name conflicts
             let finalName = pageName;
             let suffix = 0;
-            while (await checkIfExists(path.join(config.pagesFolder, 'pages', finalName))) {
+            while (await sp.checkIfExists(path.join(config.pagesFolder, 'pages', finalName))) {
                 suffix++;
                 finalName = `${pageName}_${suffix}`;
             }
 
             const targetDir = path.join(config.pagesFolder, 'pages', finalName);
-            await ensureFolderExists(targetDir);
+            await sp.ensureFolderExists(targetDir);
 
             // Extract entries with path traversal protection
             for (const entry of entries) {
@@ -120,13 +121,13 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
                     continue;
                 }
 
-                await ensureFolderExists(path.dirname(resolvedPath));
-                await fs.writeFile(resolvedPath, entry.getData());
+                await sp.ensureFolderExists(path.dirname(resolvedPath));
+                await sp.saveBuffer(resolvedPath, entry.getData());
             }
 
             // Update metadata: set createdDate and lastModified to now
             const now = new Date().toISOString();
-            const existingMeta = await loadPageMetadata(config.pagesFolder, finalName);
+            const existingMeta = await loadPageMetadata(config, finalName);
             const metadata: PageMetadata = {
                 title: existingMeta?.title ?? '',
                 categories: existingMeta?.categories ?? [],
@@ -137,7 +138,7 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
                 pageVersion: existingMeta?.pageVersion ?? PAGE_VERSION,
                 mode: existingMeta?.mode ?? 'unlocked',
             };
-            await savePageMetadata(config.pagesFolder, finalName, metadata);
+            await savePageMetadata(config, finalName, metadata);
 
             res.status(201).json({ name: finalName, title: metadata.title });
         } catch (err: unknown) {
@@ -150,7 +151,7 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
     app.get('/api/pages/:name', async (req, res) => {
         try {
             const { name } = req.params;
-            const metadata = await loadPageMetadata(config.pagesFolder, name, config.requiredPagesFolders);
+            const metadata = await loadPageMetadata(config, name, config.requiredPagesFolders);
             if (metadata) {
                 res.json(metadata);
             } else {
@@ -201,7 +202,7 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
             }
 
             // Load existing metadata (or defaults)
-            const existing = await loadPageMetadata(config.pagesFolder, name, config.requiredPagesFolders);
+            const existing = await loadPageMetadata(config, name, config.requiredPagesFolders);
             const metadata: PageMetadata = {
                 title: existing?.title ?? '',
                 categories: existing?.categories ?? [],
@@ -226,19 +227,23 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
             // Promote required page to user folder if being unlocked/designed
             if (metadata.mode !== 'locked') {
                 const userPagePath = path.join(config.pagesFolder, 'pages', name, 'page.html');
-                if (!(await checkIfExists(userPagePath))) {
+                if (!(await sp.checkIfExists(userPagePath))) {
+                    // Read from required pages (package content, always local fs)
                     let html: string | undefined;
                     for (const folder of config.requiredPagesFolders) {
-                        html = await loadPageState(folder, name);
-                        if (html) break;
+                        const candidate = path.join(folder, name, 'page.html');
+                        if (await checkIfExists(candidate)) {
+                            html = await loadFile(candidate);
+                            break;
+                        }
                     }
                     if (html) {
-                        await savePageState(config.pagesFolder, name, html);
+                        await savePageState(config, name, html);
                     }
                 }
             }
 
-            await savePageMetadata(config.pagesFolder, name, metadata);
+            await savePageMetadata(config, name, metadata);
             res.json(metadata);
         } catch (err: unknown) {
             console.error(err);
@@ -257,7 +262,7 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
             }
 
             // Load existing metadata (user override → fallback .json → defaults)
-            let metadata = await loadPageMetadata(config.pagesFolder, name, config.requiredPagesFolders);
+            let metadata = await loadPageMetadata(config, name, config.requiredPagesFolders);
             if (!metadata) {
                 metadata = {
                     title: '',
@@ -272,7 +277,7 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
             }
 
             metadata.pinned = pinned;
-            await savePageMetadata(config.pagesFolder, name, metadata);
+            await savePageMetadata(config, name, metadata);
             res.json(metadata);
         } catch (err: unknown) {
             console.error(err);
@@ -294,13 +299,13 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
             // Check if page exists (folder-based or legacy flat file)
             const folderPath = path.join(config.pagesFolder, 'pages', name, 'page.html');
             const flatPath = path.join(config.pagesFolder, `${name}.html`);
-            const exists = await checkIfExists(folderPath) || await checkIfExists(flatPath);
+            const exists = await sp.checkIfExists(folderPath) || await sp.checkIfExists(flatPath);
             if (!exists) {
                 res.status(404).json({ error: `Page "${name}" not found` });
                 return;
             }
 
-            await deletePage(config.pagesFolder, name);
+            await deletePage(config, name);
             res.json({ deleted: true });
         } catch (err: unknown) {
             console.error(err);
@@ -316,7 +321,7 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
             // Resolve page folder: user pages first, then required pages
             let pageFolder: string | undefined;
             const userFolder = path.join(config.pagesFolder, 'pages', name);
-            if (await checkIfExists(path.join(userFolder, 'page.html'))) {
+            if (await sp.checkIfExists(path.join(userFolder, 'page.html'))) {
                 pageFolder = userFolder;
             } else {
                 for (const folder of config.requiredPagesFolders) {
@@ -335,14 +340,23 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
 
             // List subdirectories, filtering out non-table entries
             const EXCLUDED = new Set(['files']);
-            const subdirs = await listFolders(pageFolder);
+            // Use provider for user folder, local fs for required pages
+            const isUserFolder = pageFolder === userFolder;
+            const subdirs = isUserFolder
+                ? await sp.listFolders(pageFolder)
+                : await listFolders(pageFolder);
             const tables = subdirs.filter(d => !EXCLUDED.has(d));
 
             // Check if files/ exists and has entries
             const filesDir = path.join(pageFolder, 'files');
             let hasFiles = false;
-            if (await checkIfExists(filesDir)) {
-                const entries = await fs.readdir(filesDir);
+            const filesDirExists = isUserFolder
+                ? await sp.checkIfExists(filesDir)
+                : await checkIfExists(filesDir);
+            if (filesDirExists) {
+                const entries = isUserFolder
+                    ? await sp.listFiles(filesDir)
+                    : await listFiles(filesDir);
                 hasFiles = entries.length > 0;
             }
 
@@ -384,8 +398,8 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
                 const candidate = path.join(folder, sourceName, 'page.html');
                 if (await checkIfExists(candidate)) { sourceRequiredPath = candidate; break; }
             }
-            const sourceExists = await checkIfExists(sourceFolderPath)
-                || await checkIfExists(sourceFlatPath)
+            const sourceExists = await sp.checkIfExists(sourceFolderPath)
+                || await sp.checkIfExists(sourceFlatPath)
                 || !!sourceRequiredPath;
             if (!sourceExists) {
                 res.status(404).json({ error: `Source page "${sourceName}" not found` });
@@ -395,13 +409,13 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
             // Check target doesn't already exist
             const targetFolderPath = path.join(config.pagesFolder, 'pages', targetName, 'page.html');
             const targetFlatPath = path.join(config.pagesFolder, `${targetName}.html`);
-            if (await checkIfExists(targetFolderPath) || await checkIfExists(targetFlatPath)) {
+            if (await sp.checkIfExists(targetFolderPath) || await sp.checkIfExists(targetFlatPath)) {
                 res.status(409).json({ error: `Page "${targetName}" already exists` });
                 return;
             }
 
             await copyPage(
-                config.pagesFolder,
+                config,
                 sourceName,
                 targetName,
                 typeof title === 'string' ? title : '',
@@ -414,7 +428,7 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
             );
 
             // Return the new page metadata
-            const metadata = await loadPageMetadata(config.pagesFolder, targetName);
+            const metadata = await loadPageMetadata(config, targetName);
             res.status(201).json({ name: targetName, ...metadata });
         } catch (err: unknown) {
             console.error(err);
@@ -424,7 +438,7 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
 
     // Define a route to return settings
     app.get('/api/settings', async (req, res) => {
-        const settings = await loadSettings(config.pagesFolder);
+        const settings = await loadSettings(config);
         const providers = PROVIDERS.map(p => ({ name: p.name, builderModels: p.builderModels, chatModels: p.chatModels }));
         res.json({...settings, providers});
     });
@@ -445,7 +459,7 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
             }
 
             // Save settings
-            await saveSettings(config.pagesFolder, settings);
+            await saveSettings(config, settings);
             res.redirect('/builder');
         } catch (err: unknown) {
             console.error(err);
@@ -455,7 +469,7 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
 
     // Define a route to generate an image
     app.post('/api/generate/image', async (req, res) => {
-        await requiresSettings(res, config.pagesFolder, async (settings) => {
+        await requiresSettings(res, config, async (settings) => {
             const { prompt, shape, style } = req.body;
             const builder = getModelEntry(settings, 'builder');
             const { configuration, imageQuality, provider } = builder;
@@ -472,9 +486,9 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
 
     // Define a route to generate a completion using chain-of-thought
     app.post('/api/generate/completion', async (req, res) => {
-        await requiresSettings(res, config.pagesFolder, async (settings) => {
+        await requiresSettings(res, config, async (settings) => {
             const { prompt, temperature } = req.body;
-            const completePrompt = await createCompletePrompt(config.pagesFolder, 'chat', req.body.model);
+            const completePrompt = await createCompletePrompt(config, 'chat', req.body.model);
             const response = await chainOfThought({ question: prompt, temperature, completePrompt });
             if (response.completed) {
                 res.json(response.value ?? {});
@@ -488,9 +502,9 @@ export function useApiRoutes(config: SynthOSConfig, app: Application, customizer
     // Brainstorm endpoint
     if (!customizer || customizer.isEnabled('brainstorm'))
     app.post('/api/brainstorm', async (req, res) => {
-        await requiresSettings(res, config.pagesFolder, async (settings) => {
+        await requiresSettings(res, config, async (settings) => {
             const { context, messages } = req.body;
-            const completePrompt = await createCompletePrompt(config.pagesFolder, 'chat');
+            const completePrompt = await createCompletePrompt(config, 'chat');
 
             const productName = customizer?.productName ?? 'SynthOS';
             const system: { role: 'system'; content: string } = {
@@ -557,11 +571,10 @@ Return ONLY the JSON object.`};
     // Define a route for running configured scripts
     if (!customizer || customizer.isEnabled('scripts'))
     app.post('/api/scripts/:id', async (req, res) => {
-        await requiresSettings(res, config.pagesFolder, async (settings) => {
+        await requiresSettings(res, config, async (settings) => {
             const { id } = req.params;
-            const pagesFolder = config.pagesFolder;
             const scriptId = id;
-            const response = await executeScript({ pagesFolder, scriptId, variables: req.body });
+            const response = await executeScript({ pagesFolder: config.pagesFolder, scriptId, variables: req.body });
             if (response.completed) {
                 // Return the response as text
                 const value = (response.value?.output ?? (response.value?.errors ?? []).join('\n')).trim();
@@ -577,7 +590,7 @@ Return ONLY the JSON object.`};
     // Return theme info as a self-executing JS script
     app.get('/api/theme-info.js', async (req, res) => {
         try {
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const themeName = settings.theme ?? 'nebula-dusk';
             const info = await loadThemeInfo(themeName, config);
             if (!info) {
@@ -607,7 +620,7 @@ Return ONLY the JSON object.`};
                 res.status(400).send('// Missing page query parameter');
                 return;
             }
-            const metadata = await loadPageMetadata(config.pagesFolder, page, config.requiredPagesFolders);
+            const metadata = await loadPageMetadata(config, page, config.requiredPagesFolders);
             const mode = metadata?.mode ?? 'unlocked';
             const title = metadata?.title ?? '';
             const categories = metadata?.categories ?? [];
@@ -634,7 +647,7 @@ Return ONLY the JSON object.`};
     // Return the current theme as CSS
     app.get('/api/theme.css', async (req, res) => {
         try {
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const themeName = settings.theme ?? 'nebula-dusk';
             const css = await loadTheme(themeName, config);
             if (!css) {
@@ -718,7 +731,7 @@ Return ONLY the JSON object.`};
     // Return user's configured services (API keys masked)
     app.get('/api/services', async (_req, res) => {
         try {
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const services = settings.services ?? {};
             const masked: Record<string, { enabled: boolean; hasKey: boolean }> = {};
             for (const [id, cfg] of Object.entries(services)) {
@@ -738,7 +751,7 @@ Return ONLY the JSON object.`};
     app.post('/api/services', async (req, res) => {
         try {
             const incoming = req.body as ServicesConfig;
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const existing = settings.services ?? {};
 
             // Build merged config — empty apiKey means "keep existing"
@@ -759,7 +772,7 @@ Return ONLY the JSON object.`};
                 }
             }
 
-            await saveSettings(config.pagesFolder, { services: merged });
+            await saveSettings(config, { services: merged });
             res.json({ saved: true });
         } catch (err: unknown) {
             console.error(err);
@@ -780,7 +793,7 @@ Return ONLY the JSON object.`};
                 return;
             }
 
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const braveConfig = settings.connectors?.['brave-search'] ?? settings.services?.['brave-search'];
             if (!braveConfig || !braveConfig.enabled || !braveConfig.apiKey) {
                 res.status(400).json({ error: 'Brave Search is not configured or not enabled. Add your API key in Settings > Services.' });
@@ -826,7 +839,7 @@ Return ONLY the JSON object.`};
             const { name } = req.params;
 
             // Load current metadata
-            const metadata = await loadPageMetadata(config.pagesFolder, name, config.requiredPagesFolders);
+            const metadata = await loadPageMetadata(config, name, config.requiredPagesFolders);
             if (!metadata) {
                 res.status(404).json({ error: `Page "${name}" not found` });
                 return;
@@ -846,35 +859,37 @@ Return ONLY the JSON object.`};
             }
 
             // Run LLM-based migration
-            const completePrompt = await createCompletePrompt(config.pagesFolder, 'builder');
+            const completePrompt = await createCompletePrompt(config, 'builder');
             const migratedHtml = await migratePage(html, currentVersion, PAGE_VERSION, completePrompt);
 
             // Save upgraded HTML to v2 folder structure
-            await savePageState(config.pagesFolder, name, migratedHtml);
+            await savePageState(config, name, migratedHtml);
 
             // Backup original page to .migrated/ before overwriting
             const migratedFolder = path.join(config.pagesFolder, '.migrated');
 
             // Handle legacy flat file (<localFolder>/pagename.html)
             const flatPath = path.join(config.pagesFolder, `${name}.html`);
-            if (await checkIfExists(flatPath)) {
-                await copyFile(flatPath, migratedFolder);
-                await deleteFile(flatPath);
+            if (await sp.checkIfExists(flatPath)) {
+                await sp.ensureFolderExists(migratedFolder);
+                const flatData = await sp.loadBuffer(flatPath);
+                await sp.saveBuffer(path.join(migratedFolder, `${name}.html`), flatData);
+                await sp.deleteFile(flatPath);
             }
 
             // Handle folder-based page (<localFolder>/pages/name/)
             const folderPath = path.join(config.pagesFolder, 'pages', name);
-            if (await checkIfExists(folderPath)) {
-                await copyFolderRecursive(folderPath, path.join(migratedFolder, name));
+            if (await sp.checkIfExists(folderPath)) {
+                await sp.copyFolderRecursive(folderPath, path.join(migratedFolder, name));
             }
 
             // Clear stale version files (undo snapshots from the old page version)
-            await clearVersions(config.pagesFolder, name);
+            await clearVersions(config, name);
 
             // Update metadata
             metadata.pageVersion = PAGE_VERSION;
             metadata.lastModified = new Date().toISOString();
-            await savePageMetadata(config.pagesFolder, name, metadata);
+            await savePageMetadata(config, name, metadata);
 
             res.json({ upgraded: true, fromVersion: currentVersion, toVersion: PAGE_VERSION });
         } catch (err: unknown) {
@@ -892,14 +907,14 @@ Return ONLY the JSON object.`};
             const userPageDir = path.join(config.pagesFolder, 'pages', name);
             let requiredPageDir: string | undefined;
             for (const folder of config.requiredPagesFolders) {
-                if (await checkIfExists(path.join(folder, name, 'page.html'))) {
+                if (await checkIfExists(path.join(folder, name, 'page.html'))) {  // package content, local fs
                     requiredPageDir = path.join(folder, name);
                     break;
                 }
             }
             let sourceDir: string | null = null;
 
-            if (await checkIfExists(path.join(userPageDir, 'page.html'))) {
+            if (await sp.checkIfExists(path.join(userPageDir, 'page.html'))) {
                 sourceDir = userPageDir;
             } else if (requiredPageDir) {
                 // For required pages, create a temp-like zip with just the HTML
@@ -940,7 +955,7 @@ Return ONLY the JSON object.`};
 
     // Ask a question about a page (with full page HTML context)
     app.post('/api/pages/:name/ask', async (req, res) => {
-        await requiresSettings(res, config.pagesFolder, async (settings) => {
+        await requiresSettings(res, config, async (settings) => {
             const { name } = req.params;
             const { question } = req.body;
             if (typeof question !== 'string' || !question.trim()) {
@@ -956,7 +971,7 @@ Return ONLY the JSON object.`};
             }
 
             // Create completion (uses 'chat' model, not 'builder')
-            const complete = await createCompletePrompt(config.pagesFolder, 'chat', req.body.model);
+            const complete = await createCompletePrompt(config, 'chat', req.body.model);
 
             const system = {
                 role: 'system' as const,

package/src/service/useConnectorRoutes.ts

@@ -15,7 +15,7 @@ export function useConnectorRoutes(config: SynthOSConfig, app: Application): voi
     // Also handles POST /api/connectors — Proxy call (see below)
     app.get('/api/connectors', async (req, res) => {
         try {
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const connectors = settings.connectors ?? {};
 
             const categoryFilter = req.query.category as string | undefined;
@@ -60,7 +60,7 @@ export function useConnectorRoutes(config: SynthOSConfig, app: Application): voi
                 return;
             }
 
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const cfg = (settings.connectors ?? {})[id];
             const isOAuth = def.authStrategy === 'oauth2';
             const oauthCfg = cfg as ConnectorOAuthConfig | undefined;
@@ -94,7 +94,7 @@ export function useConnectorRoutes(config: SynthOSConfig, app: Application): voi
                 return;
             }
 
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const existing = settings.connectors ?? {};
 
             if (def.authStrategy === 'oauth2') {
@@ -121,7 +121,7 @@ export function useConnectorRoutes(config: SynthOSConfig, app: Application): voi
                 }
 
                 const updated = { ...existing, [id]: entry };
-                await saveSettings(config.pagesFolder, { connectors: updated });
+                await saveSettings(config, { connectors: updated });
             } else {
                 const { apiKey, enabled } = req.body;
                 const resolvedKey = (typeof apiKey === 'string' && apiKey.length > 0)
@@ -132,7 +132,7 @@ export function useConnectorRoutes(config: SynthOSConfig, app: Application): voi
                     ...existing,
                     [id]: { apiKey: resolvedKey, enabled: !!enabled }
                 };
-                await saveSettings(config.pagesFolder, { connectors: updated });
+                await saveSettings(config, { connectors: updated });
             }
 
             res.json({ saved: true });
@@ -146,13 +146,13 @@ export function useConnectorRoutes(config: SynthOSConfig, app: Application): voi
     app.delete('/api/connectors/:id', async (req, res) => {
         try {
             const { id } = req.params;
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const existing = settings.connectors ?? {};
 
             const updated = { ...existing };
             delete updated[id];
 
-            await saveSettings(config.pagesFolder, { connectors: updated });
+            await saveSettings(config, { connectors: updated });
             res.json({ deleted: true });
         } catch (err: unknown) {
             console.error(err);
@@ -170,7 +170,7 @@ export function useConnectorRoutes(config: SynthOSConfig, app: Application): voi
                 return;
             }
 
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const cfg = (settings.connectors ?? {})[id] as ConnectorOAuthConfig | undefined;
             if (!cfg?.clientId || !cfg?.clientSecret) {
                 res.status(400).json({ error: 'Client ID and Client Secret must be saved before authorizing' });
@@ -220,7 +220,7 @@ export function useConnectorRoutes(config: SynthOSConfig, app: Application): voi
                 return;
             }
 
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const cfg = (settings.connectors ?? {})[connectorId] as ConnectorOAuthConfig | undefined;
             if (!cfg?.clientId || !cfg?.clientSecret) {
                 res.status(400).json({ error: 'Client credentials not found' });
@@ -307,7 +307,7 @@ export function useConnectorRoutes(config: SynthOSConfig, app: Application): voi
                     enabled: true
                 }
             };
-            await saveSettings(config.pagesFolder, { connectors: updated });
+            await saveSettings(config, { connectors: updated });
 
             res.redirect(`/settings?tab=connectors&connected=${encodeURIComponent(connectorId)}`);
         } catch (err: unknown) {
@@ -332,7 +332,7 @@ export function useConnectorRoutes(config: SynthOSConfig, app: Application): voi
                 return;
             }
 
-            const settings = await loadSettings(config.pagesFolder);
+            const settings = await loadSettings(config);
             const cfg = (settings.connectors ?? {})[request.connector];
 
             if (def.authStrategy === 'oauth2') {