@dboio/cli 0.17.0 → 0.19.1

package/src/lib/config.js

@@ -1,35 +1,41 @@
 import { readFile, writeFile, mkdir, access, chmod, unlink } from 'fs/promises';
 import { join } from 'path';
+import { homedir } from 'os';
 import { log } from './logger.js';
 
-const DBO_DIR = '.dbo';
+const APP_DIR = '.app';
+const LEGACY_DBO_DIR = '.dbo'; // kept for migration bootstrap only
 const CONFIG_FILE = 'config.json';
-const CONFIG_LOCAL_FILE = 'config.local.json';
+const CONFIG_LOCAL_FILE = 'settings.json';
 const CREDENTIALS_FILE = 'credentials.json';
 const COOKIES_FILE = 'cookies.txt';
 const SYNCHRONIZE_FILE = 'synchronize.json';
-const BASELINE_FILE = '.app_baseline.json';
 const SCRIPTS_FILE = 'scripts.json';
 const SCRIPTS_LOCAL_FILE = 'scripts.local.json';
 
-function dboDir() {
-  return join(process.cwd(), DBO_DIR);
+export function projectDir() {
+  return join(process.cwd(), APP_DIR);
+}
+
+// Keep private helper for legacy bootstrap:
+function legacyDboDir() {
+  return join(process.cwd(), LEGACY_DBO_DIR);
 }
 
 function configPath() {
-  return join(dboDir(), CONFIG_FILE);
+  return join(projectDir(), CONFIG_FILE);
 }
 
 function credentialsPath() {
-  return join(dboDir(), CREDENTIALS_FILE);
+  return join(projectDir(), CREDENTIALS_FILE);
 }
 
 function cookiesPath() {
-  return join(dboDir(), COOKIES_FILE);
+  return join(projectDir(), COOKIES_FILE);
 }
 
 function synchronizePath() {
-  return join(dboDir(), SYNCHRONIZE_FILE);
+  return join(projectDir(), SYNCHRONIZE_FILE);
 }
 
 async function exists(path) {
@@ -42,7 +48,7 @@ async function exists(path) {
 }
 
 export async function isInitialized() {
-  return exists(dboDir());
+  return (await exists(projectDir())) || (await exists(legacyDboDir()));
 }
 
 export async function hasLegacyConfig() {
@@ -65,12 +71,12 @@ export async function readLegacyConfig() {
 }
 
 export async function initConfig(domain) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   await writeFile(configPath(), JSON.stringify({ domain, dependencies: ['_system'] }, null, 2) + '\n');
 }
 
 export async function saveCredentials(username) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   // Preserve existing fields (like userId) — never store password
   let existing = {};
   try {
@@ -82,7 +88,7 @@ export async function saveCredentials(username) {
 }
 
 export async function saveUserInfo({ userId }) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let existing = {};
   try {
     existing = JSON.parse(await readFile(credentialsPath(), 'utf8'));
@@ -104,7 +110,7 @@ export async function loadUserInfo() {
 export async function loadConfig() {
   const config = { domain: null, username: null, password: null, ServerTimezone: 'UTC' };
 
-  // Try .dbo/config.json
+  // Try .app/config.json
   try {
     const raw = await readFile(configPath(), 'utf8');
     Object.assign(config, JSON.parse(raw));
@@ -115,7 +121,7 @@ export async function loadConfig() {
     } catch { /* no config found */ }
   }
 
-  // Try .dbo/credentials.json (username only — password is never stored)
+  // Try .app/credentials.json (username only — password is never stored)
   try {
     const raw = await readFile(credentialsPath(), 'utf8');
     const creds = JSON.parse(raw);
@@ -136,8 +142,8 @@ export async function loadConfig() {
 }
 
 export function getCookiesPath() {
-  // Prefer .dbo/cookies.txt, fall back to legacy .cookies
-  const dboCookies = join(dboDir(), COOKIES_FILE);
+  // Prefer .app/cookies.txt, fall back to legacy .cookies
+  const dboCookies = join(projectDir(), COOKIES_FILE);
   const legacyCookies = join(process.cwd(), '.cookies');
   return { dbo: dboCookies, legacy: legacyCookies };
 }
@@ -150,11 +156,11 @@ export async function getActiveCookiesPath() {
 }
 
 /**
- * Merge app metadata into .dbo/config.json.
+ * Merge app metadata into .app/config.json.
  * Preserves existing fields; only sets new ones.
  */
 export async function updateConfigWithApp({ AppID, AppUID, AppName, AppShortName, ServerTimezone }) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let existing = {};
   try {
     existing = JSON.parse(await readFile(configPath(), 'utf8'));
@@ -170,7 +176,7 @@ export async function updateConfigWithApp({ AppID, AppUID, AppName, AppShortName
 // ─── Dependency helpers ───────────────────────────────────────────────────
 
 /**
- * Get the dependencies array from .dbo/config.json.
+ * Get the dependencies array from .app/config.json.
  * Returns ["_system"] if the key is absent.
  */
 export async function getDependencies() {
@@ -188,10 +194,10 @@ export async function getDependencies() {
 
 /**
  * Merge new short-names into the dependencies array (union, no duplicates).
- * Persists the result to .dbo/config.json.
+ * Persists the result to .app/config.json.
  */
 export async function mergeDependencies(shortnames) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let existing = {};
   try {
     existing = JSON.parse(await readFile(configPath(), 'utf8'));
@@ -207,11 +213,11 @@ export async function mergeDependencies(shortnames) {
 }
 
 /**
- * Replace the full dependencies array in .dbo/config.json.
+ * Replace the full dependencies array in .app/config.json.
  * Always ensures _system is present.
  */
 export async function setDependencies(shortnames) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let existing = {};
   try {
     existing = JSON.parse(await readFile(configPath(), 'utf8'));
@@ -222,7 +228,7 @@ export async function setDependencies(shortnames) {
 }
 
 /**
- * Get dependencyLastUpdated.<shortname> from .dbo/config.json.
+ * Get dependencyLastUpdated.<shortname> from .app/config.json.
  * Returns null if absent.
  */
 export async function getDependencyLastUpdated(shortname) {
@@ -236,10 +242,10 @@ export async function getDependencyLastUpdated(shortname) {
 }
 
 /**
- * Set dependencyLastUpdated.<shortname> in .dbo/config.json.
+ * Set dependencyLastUpdated.<shortname> in .app/config.json.
  */
 export async function setDependencyLastUpdated(shortname, timestamp) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let existing = {};
   try {
     existing = JSON.parse(await readFile(configPath(), 'utf8'));
@@ -250,7 +256,7 @@ export async function setDependencyLastUpdated(shortname, timestamp) {
 }
 
 /**
- * Load app-related fields from .dbo/config.json.
+ * Load app-related fields from .app/config.json.
  */
 export async function loadAppConfig() {
   try {
@@ -269,12 +275,12 @@ export async function loadAppConfig() {
 }
 
 /**
- * Save clone placement preferences to .dbo/config.json.
+ * Save clone placement preferences to .app/config.json.
  * mediaPlacement: 'fullpath' | 'bin' | 'ask'
  * contentPlacement: 'path' | 'bin' | 'ask'
  */
 export async function saveClonePlacement({ mediaPlacement, contentPlacement }) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let existing = {};
   try {
     existing = JSON.parse(await readFile(configPath(), 'utf8'));
@@ -285,7 +291,7 @@ export async function saveClonePlacement({ mediaPlacement, contentPlacement }) {
 }
 
 /**
- * Load clone placement preferences from .dbo/config.json.
+ * Load clone placement preferences from .app/config.json.
  */
 export async function loadClonePlacement() {
   try {
@@ -301,11 +307,11 @@ export async function loadClonePlacement() {
 }
 
 /**
- * Save entity-dir filename column preference to .dbo/config.json.
+ * Save entity-dir filename column preference to .app/config.json.
  * Key format: "<EntityType>FilenameCol" (e.g., "ExtensionFilenameCol")
  */
 export async function saveEntityDirPreference(entityKey, filenameCol) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let existing = {};
   try {
     existing = JSON.parse(await readFile(configPath(), 'utf8'));
@@ -317,7 +323,7 @@ export async function saveEntityDirPreference(entityKey, filenameCol) {
 }
 
 /**
- * Load entity-dir filename column preference from .dbo/config.json.
+ * Load entity-dir filename column preference from .app/config.json.
  */
 export async function loadEntityDirPreference(entityKey) {
   try {
@@ -339,7 +345,7 @@ export async function loadEntityDirPreference(entityKey) {
  *                                 false means user explicitly chose not to extract that column
  */
 export async function saveEntityContentExtractions(entityKey, extractions) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let existing = {};
   try {
     existing = JSON.parse(await readFile(configPath(), 'utf8'));
@@ -351,7 +357,7 @@ export async function saveEntityContentExtractions(entityKey, extractions) {
 }
 
 /**
- * Load content extraction preferences for an entity type from .dbo/config.json.
+ * Load content extraction preferences for an entity type from .app/config.json.
  *
  * @param {string} entityKey - Entity type (e.g., 'extension', 'site')
  * @returns {Object|null} - Map of column names to extensions, or null if not saved
@@ -368,13 +374,13 @@ export async function loadEntityContentExtractions(entityKey) {
 }
 
 /**
- * Save collision resolutions to .dbo/config.json.
+ * Save collision resolutions to .app/config.json.
  * Maps file paths to the UID of the record the user chose to keep.
  *
  * @param {Object} resolutions - { "Bins/app/file.css": { keepUID: "abc", keepEntity: "content" } }
  */
 export async function saveCollisionResolutions(resolutions) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let existing = {};
   try {
     existing = JSON.parse(await readFile(configPath(), 'utf8'));
@@ -384,7 +390,7 @@ export async function saveCollisionResolutions(resolutions) {
 }
 
 /**
- * Load collision resolutions from .dbo/config.json.
+ * Load collision resolutions from .app/config.json.
  *
  * @returns {Object} - { "Bins/app/file.css": { keepUID: "abc", keepEntity: "content" } }
  */
@@ -402,7 +408,7 @@ export async function loadCollisionResolutions() {
  * Save user profile fields (FirstName, LastName, Email) into credentials.json.
  */
 export async function saveUserProfile({ FirstName, LastName, Email }) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let existing = {};
   try {
     existing = JSON.parse(await readFile(credentialsPath(), 'utf8'));
@@ -446,7 +452,7 @@ export async function loadSynchronize() {
  * Save synchronize.json.
  */
 export async function saveSynchronize(data) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   await writeFile(synchronizePath(), JSON.stringify(data, null, 2) + '\n');
 }
 
@@ -474,15 +480,15 @@ export async function removeDeleteEntry(uid) {
 }
 
 /**
- * Remove a @metaPath reference from app.json children arrays.
+ * Remove a @metaPath reference from the app metadata file children arrays.
  */
 export async function removeAppJsonReference(metaPath) {
-  const appJsonPath = join(process.cwd(), 'app.json');
+  const appJsonPath = await appMetadataPath();
   let appJson;
   try {
     appJson = JSON.parse(await readFile(appJsonPath, 'utf8'));
   } catch {
-    return; // no app.json
+    return; // no metadata file
   }
 
   if (!appJson.children) return;
@@ -504,14 +510,18 @@ export async function removeAppJsonReference(metaPath) {
   }
 }
 
-// ─── config.local.json (per-user, gitignored) ────────────────────────────
+// ─── config.local.json (global ~/.dbo/settings.json) ────────────────────
 
 function configLocalPath() {
-  return join(dboDir(), CONFIG_LOCAL_FILE);
+  return join(homedir(), '.dbo', CONFIG_LOCAL_FILE);
+}
+
+async function ensureGlobalDboDir() {
+  await mkdir(join(homedir(), '.dbo'), { recursive: true });
 }
 
 /**
- * Load config.local.json (per-user settings including plugin scopes).
+ * Load ~/.dbo/settings.json (per-user settings including plugin scopes).
  * Returns empty structure if file doesn't exist.
  */
 export async function loadLocalConfig() {
@@ -524,10 +534,10 @@ export async function loadLocalConfig() {
 }
 
 /**
- * Save config.local.json.
+ * Save ~/.dbo/settings.json.
  */
 export async function saveLocalConfig(data) {
-  await mkdir(dboDir(), { recursive: true });
+  await ensureGlobalDboDir();
   await writeFile(configLocalPath(), JSON.stringify(data, null, 2) + '\n');
 }
 
@@ -609,35 +619,44 @@ export async function getAllPluginScopes() {
   return result;
 }
 
-// ─── Migration tracking (config.local.json._completedMigrations) ──────────
+// ─── Migration tracking (keyed by project path in ~/.dbo/settings.json) ──
 
 /**
- * Load the list of completed migration IDs from .dbo/config.local.json.
+ * Load the list of completed migration IDs from ~/.dbo/settings.json.
+ * Keyed by project cwd for multi-project support.
  * Returns an empty array if the file does not exist or the key is absent.
  * @returns {Promise<string[]>}
  */
 export async function loadCompletedMigrations() {
   try {
-    const local = await loadLocalConfig();
-    const ids = local._completedMigrations;
-    return Array.isArray(ids) ? ids : [];
+    const raw = await readFile(configLocalPath(), 'utf8');
+    const settings = JSON.parse(raw);
+    const key = process.cwd();
+    const projectMigrations = settings._completedMigrations?.[key];
+    return Array.isArray(projectMigrations) ? projectMigrations : [];
   } catch {
     return [];
   }
 }
 
 /**
- * Append a migration ID to .dbo/config.local.json._completedMigrations.
+ * Append a migration ID to ~/.dbo/settings.json._completedMigrations[cwd].
  * Deduplicates: if the ID is already present, no-op.
  * @param {string} id - Three-digit migration ID, e.g. '001'
  */
 export async function saveCompletedMigration(id) {
-  const local = await loadLocalConfig();
-  const existing = new Set(Array.isArray(local._completedMigrations) ? local._completedMigrations : []);
-  if (existing.has(id)) return; // already recorded — idempotent
+  await ensureGlobalDboDir();
+  let settings = {};
+  try {
+    settings = JSON.parse(await readFile(configLocalPath(), 'utf8'));
+  } catch { /* first write */ }
+  if (!settings._completedMigrations) settings._completedMigrations = {};
+  const key = process.cwd();
+  const existing = new Set(Array.isArray(settings._completedMigrations[key]) ? settings._completedMigrations[key] : []);
+  if (existing.has(id)) return;
   existing.add(id);
-  local._completedMigrations = [...existing].sort();
-  await saveLocalConfig(local);
+  settings._completedMigrations[key] = [...existing].sort();
+  await writeFile(configLocalPath(), JSON.stringify(settings, null, 2) + '\n');
 }
 
 // ─── Output Hierarchy Filename Preferences ────────────────────────────────
@@ -677,7 +696,7 @@ export async function loadOutputFilenamePreference(entityKey) {
 export async function saveOutputFilenamePreference(entityKey, columnName) {
   const configKey = OUTPUT_FILENAME_CONFIG_KEYS[entityKey];
   if (!configKey) return;
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let existing = {};
   try { existing = JSON.parse(await readFile(configPath(), 'utf8')); } catch {}
   existing[configKey] = columnName;
@@ -687,11 +706,11 @@ export async function saveOutputFilenamePreference(entityKey, columnName) {
 // ─── AppModifyKey ─────────────────────────────────────────────────────────
 
 /**
- * Save AppModifyKey to .dbo/config.json.
+ * Save AppModifyKey to .app/config.json.
  * Pass null to remove the key (e.g. when server no longer has one).
  */
 export async function saveAppModifyKey(modifyKey) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let existing = {};
   try { existing = JSON.parse(await readFile(configPath(), 'utf8')); } catch {}
   if (modifyKey != null) existing.AppModifyKey = modifyKey;
@@ -700,7 +719,7 @@ export async function saveAppModifyKey(modifyKey) {
 }
 
 /**
- * Load AppModifyKey from .dbo/config.json.
+ * Load AppModifyKey from .app/config.json.
  * Returns the key string or null if not set.
  */
 export async function loadAppModifyKey() {
@@ -713,11 +732,11 @@ export async function loadAppModifyKey() {
 // ─── TransactionKeyPreset ─────────────────────────────────────────────────
 
 /**
- * Save TransactionKeyPreset to .dbo/config.json.
+ * Save TransactionKeyPreset to .app/config.json.
  * @param {'RowUID'|'RowID'} preset
  */
 export async function saveTransactionKeyPreset(preset) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let existing = {};
   try { existing = JSON.parse(await readFile(configPath(), 'utf8')); } catch {}
   existing.TransactionKeyPreset = preset;
@@ -725,7 +744,7 @@ export async function saveTransactionKeyPreset(preset) {
 }
 
 /**
- * Load TransactionKeyPreset from .dbo/config.json.
+ * Load TransactionKeyPreset from .app/config.json.
  * Returns 'RowUID', 'RowID', or null if not set.
  */
 export async function loadTransactionKeyPreset() {
@@ -738,11 +757,11 @@ export async function loadTransactionKeyPreset() {
 // ─── TicketSuggestionOutput ────────────────────────────────────────────────
 
 /**
- * Save TicketSuggestionOutput to .dbo/config.json.
+ * Save TicketSuggestionOutput to .app/config.json.
  * This is the output UID used to fetch ticket suggestions.
  */
 export async function saveTicketSuggestionOutput(outputUid) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let existing = {};
   try { existing = JSON.parse(await readFile(configPath(), 'utf8')); } catch {}
   if (outputUid != null) existing.TicketSuggestionOutput = outputUid;
@@ -751,7 +770,7 @@ export async function saveTicketSuggestionOutput(outputUid) {
 }
 
 /**
- * Load TicketSuggestionOutput from .dbo/config.json.
+ * Load TicketSuggestionOutput from .app/config.json.
  * Returns the output UID string or null if not set.
  */
 export async function loadTicketSuggestionOutput() {
@@ -808,86 +827,118 @@ export async function ensureGitignore(patterns) {
   for (const p of toAdd) log.dim(`  Added ${p} to .gitignore`);
 }
 
-// ─── Baseline (.dbo/.app_baseline.json) ───────────────────────────────────
+// ─── Baseline (.app/<shortName>.json) ─────────────────────────────────────
+
+function sanitizeShortName(name) {
+  if (!name) return 'app';
+  return String(name).replace(/[/\\:*?"<>|]/g, '-');
+}
+
+export async function baselinePath() {
+  try {
+    const raw = await readFile(configPath(), 'utf8');
+    const cfg = JSON.parse(raw);
+    return join(projectDir(), sanitizeShortName(cfg.AppShortName) + '.json');
+  } catch {
+    return join(projectDir(), 'app.json');
+  }
+}
 
-export function baselinePath() {
-  return join(dboDir(), BASELINE_FILE);
+/** Path to .app/<shortName>.metadata.json (the former root app.json with @references). */
+export async function appMetadataPath() {
+  try {
+    const raw = await readFile(configPath(), 'utf8');
+    const cfg = JSON.parse(raw);
+    return join(projectDir(), sanitizeShortName(cfg.AppShortName) + '.metadata.json');
+  } catch {
+    return join(projectDir(), 'app.metadata.json');
+  }
+}
+
+/** Path to .app/<shortName>.metadata_schema.json. */
+export async function metadataSchemaPath() {
+  try {
+    const raw = await readFile(configPath(), 'utf8');
+    const cfg = JSON.parse(raw);
+    return join(projectDir(), sanitizeShortName(cfg.AppShortName) + '.metadata_schema.json');
+  } catch {
+    return join(projectDir(), 'app.metadata_schema.json');
+  }
 }
 
 /**
- * Check if baseline file (.app.json) exists.
+ * Check if baseline file exists.
  */
 export async function hasBaseline() {
-  return exists(baselinePath());
+  return exists(await baselinePath());
 }
 
 /**
- * Load .dbo/.app_baseline.json baseline file.
- * Auto-migrates from legacy root .app.json if the new path does not exist.
+ * Load .app/<shortName>.json baseline file.
+ * Auto-migrates from legacy paths if the new path does not exist.
  */
 export async function loadAppJsonBaseline() {
-  const newPath = baselinePath();
-
-  // Legacy migration: root .app.json → .dbo/.app_baseline.json
-  if (!(await exists(newPath))) {
-    const legacyPath = join(process.cwd(), '.app.json');
-    if (await exists(legacyPath)) {
-      let parsed;
-      try {
-        parsed = JSON.parse(await readFile(legacyPath, 'utf8'));
-      } catch {
-        log.warn('Could not migrate .app.json — file is not valid JSON. Delete it manually and run "dbo clone" to recreate the baseline.');
-        return null;
-      }
-      await mkdir(dboDir(), { recursive: true });
-      await writeFile(newPath, JSON.stringify(parsed, null, 2) + '\n');
-      try { await chmod(newPath, 0o444); } catch { /* ignore */ }
-      try {
-        await unlink(legacyPath);
-      } catch {
-        log.warn('Migrated baseline but could not delete root .app.json — please remove it manually.');
-      }
-      log.dim('Migrated .app.json → .dbo/.app_baseline.json (system-managed baseline)');
+  const newPath = await baselinePath();
+  if (await exists(newPath)) {
+    try { return JSON.parse(await readFile(newPath, 'utf8')); } catch { return null; }
+  }
+
+  // Legacy: .dbo/.app_baseline.json (post-baseline-relocation, pre-bin-restructure)
+  const legacyDboPath = join(legacyDboDir(), '.app_baseline.json');
+  if (await exists(legacyDboPath)) {
+    try {
+      const parsed = JSON.parse(await readFile(legacyDboPath, 'utf8'));
+      await saveAppJsonBaseline(parsed); // writes to new path
       return parsed;
-    }
+    } catch { return null; }
   }
 
-  try {
-    const raw = await readFile(newPath, 'utf8');
-    return JSON.parse(raw);
-  } catch {
-    return null;
+  // Legacy: root .app.json (very old format)
+  const rootLegacy = join(process.cwd(), '.app.json');
+  if (await exists(rootLegacy)) {
+    let parsed;
+    try {
+      parsed = JSON.parse(await readFile(rootLegacy, 'utf8'));
+    } catch {
+      log.warn('Could not migrate .app.json — file is not valid JSON. Delete it manually and run "dbo clone" to recreate the baseline.');
+      return null;
+    }
+    await mkdir(projectDir(), { recursive: true });
+    await saveAppJsonBaseline(parsed);
+    try {
+      await unlink(rootLegacy);
+    } catch {
+      log.warn('Migrated baseline but could not delete root .app.json — please remove it manually.');
+    }
+    log.dim('Migrated .app.json → .app/<shortName>.json (system-managed baseline)');
+    return parsed;
   }
+
+  return null;
 }
 
 /**
- * Save .dbo/.app_baseline.json baseline file.
+ * Save .app/<shortName>.json baseline file.
  * Temporarily widens permissions before writing (chmod 0o644),
  * then restores read-only (chmod 0o444) after writing.
  */
 export async function saveAppJsonBaseline(data) {
-  await mkdir(dboDir(), { recursive: true });
-
-  try {
-    await chmod(baselinePath(), 0o644);
-  } catch { /* file doesn't exist yet — first write */ }
-
-  await writeFile(baselinePath(), JSON.stringify(data, null, 2) + '\n');
-
-  try {
-    await chmod(baselinePath(), 0o444);
-  } catch {
-    log.warn('⚠ Could not set baseline file permissions — ensure .dbo/.app_baseline.json is not manually edited');
+  await mkdir(projectDir(), { recursive: true });
+  const path = await baselinePath();
+  try { await chmod(path, 0o644); } catch { /* first write */ }
+  await writeFile(path, JSON.stringify(data, null, 2) + '\n');
+  try { await chmod(path, 0o444); } catch {
+    log.warn('⚠ Could not set baseline file permissions');
   }
 }
 
 /**
- * Save the clone source to .dbo/config.json.
+ * Save the clone source to .app/config.json.
  * "default" = fetched from server via AppShortName.
  * Any other value = explicit local file path or URL provided by the user.
  */
 export async function saveCloneSource(source) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let existing = {};
   try {
     existing = JSON.parse(await readFile(configPath(), 'utf8'));
@@ -897,7 +948,7 @@ export async function saveCloneSource(source) {
 }
 
 /**
- * Load the stored clone source from .dbo/config.json.
+ * Load the stored clone source from .app/config.json.
  * Returns null if not set.
  */
 export async function loadCloneSource() {
@@ -916,7 +967,7 @@ export async function loadCloneSource() {
  *  Config key: "Extension_<descriptor>_FilenameCol"
  */
 export async function saveDescriptorFilenamePreference(descriptor, columnName) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let cfg = {};
   try { cfg = JSON.parse(await readFile(configPath(), 'utf8')); } catch {}
   if (columnName === null) {
@@ -940,7 +991,7 @@ export async function loadDescriptorFilenamePreference(descriptor) {
  *  Value: { "ColName": "css", "Other": false, ... }
  */
 export async function saveDescriptorContentExtractions(descriptor, extractions) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let cfg = {};
   try { cfg = JSON.parse(await readFile(configPath(), 'utf8')); } catch {}
   if (extractions === null) {
@@ -963,7 +1014,7 @@ export async function loadDescriptorContentExtractions(descriptor) {
  *  @param {'inline'|'root'|null} placement  — null clears the key
  */
 export async function saveExtensionDocumentationMDPlacement(placement) {
-  await mkdir(dboDir(), { recursive: true });
+  await mkdir(projectDir(), { recursive: true });
   let cfg = {};
   try { cfg = JSON.parse(await readFile(configPath(), 'utf8')); } catch {}
   if (placement === null) {
@@ -982,18 +1033,18 @@ export async function loadExtensionDocumentationMDPlacement() {
   } catch { return null; }
 }
 
-// ─── Script Hooks (.dbo/scripts.json, .dbo/scripts.local.json) ────────────
+// ─── Script Hooks (.app/scripts.json, .app/scripts.local.json) ────────────
 
 function scriptsPath() {
-  return join(dboDir(), SCRIPTS_FILE);
+  return join(projectDir(), SCRIPTS_FILE);
 }
 
 function scriptsLocalPath() {
-  return join(dboDir(), SCRIPTS_LOCAL_FILE);
+  return join(projectDir(), SCRIPTS_LOCAL_FILE);
 }
 
 /**
- * Load .dbo/scripts.json. Returns parsed object or null if missing.
+ * Load .app/scripts.json. Returns parsed object or null if missing.
  * Throws SyntaxError with clear message if JSON is malformed.
  */
 export async function loadScripts() {
@@ -1001,12 +1052,12 @@ export async function loadScripts() {
   let raw;
   try { raw = await readFile(path, 'utf8'); } catch { return null; }
   try { return JSON.parse(raw); } catch (err) {
-    throw new SyntaxError(`Invalid JSON in .dbo/scripts.json: ${err.message}`);
+    throw new SyntaxError(`Invalid JSON in .app/scripts.json: ${err.message}`);
   }
 }
 
 /**
- * Load .dbo/scripts.local.json (gitignored per-user overrides).
+ * Load .app/scripts.local.json (gitignored per-user overrides).
  * Returns parsed object or null if missing.
  * Throws SyntaxError with clear message if JSON is malformed.
  */
@@ -1015,7 +1066,7 @@ export async function loadScriptsLocal() {
   let raw;
   try { raw = await readFile(path, 'utf8'); } catch { return null; }
   try { return JSON.parse(raw); } catch (err) {
-    throw new SyntaxError(`Invalid JSON in .dbo/scripts.local.json: ${err.message}`);
+    throw new SyntaxError(`Invalid JSON in .app/scripts.local.json: ${err.message}`);
   }
 }
 
@@ -1027,7 +1078,7 @@ export async function loadScriptsLocal() {
  */
 export async function loadTagConfig() {
   try {
-    const raw = await readFile(join(process.cwd(), DBO_DIR, CONFIG_FILE), 'utf8');
+    const raw = await readFile(join(process.cwd(), APP_DIR, CONFIG_FILE), 'utf8');
     const config = JSON.parse(raw);
     return { tagFiles: config.tagFiles !== false };
   } catch {
@@ -1040,9 +1091,9 @@ export async function loadTagConfig() {
  * @param {boolean} enabled
  */
 export async function saveTagConfig(enabled) {
-  const configPath = join(process.cwd(), DBO_DIR, CONFIG_FILE);
+  const cfgPath = join(process.cwd(), APP_DIR, CONFIG_FILE);
   let config = {};
-  try { config = JSON.parse(await readFile(configPath, 'utf8')); } catch {}
+  try { config = JSON.parse(await readFile(cfgPath, 'utf8')); } catch {}
   config.tagFiles = enabled;
-  await writeFile(configPath, JSON.stringify(config, null, 2));
+  await writeFile(cfgPath, JSON.stringify(config, null, 2));
 }