vibora 2.0.0 → 2.1.0

package/server/index.js

@@ -3503,17 +3503,204 @@ import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
 import * as crypto3 from "crypto";
-var DEFAULT_SETTINGS = {
-  port: 3333,
-  defaultGitReposDir: os.homedir(),
-  remoteHost: "",
-  sshPort: 22,
-  basicAuthUsername: null,
-  basicAuthPassword: null,
-  linearApiKey: null,
-  githubPat: null,
-  language: null
+
+// server/lib/logger.ts
+import { appendFileSync } from "fs";
+import { join } from "path";
+
+// shared/logger/types.ts
+var LOG_LEVELS = {
+  debug: 0,
+  info: 1,
+  warn: 2,
+  error: 3
+};
+function formatLogEntry(entry) {
+  return JSON.stringify(entry);
+}
+// server/lib/logger.ts
+function getMinLevel() {
+  const level = process.env.LOG_LEVEL;
+  if (level && level in LOG_LEVELS) {
+    return level;
+  }
+  return "info";
+}
+var logFilePath = null;
+function getLogFile() {
+  if (logFilePath !== null) {
+    return logFilePath || null;
+  }
+  try {
+    ensureViboraDir();
+    logFilePath = join(getViboraDir(), "vibora.log");
+    return logFilePath;
+  } catch {
+    logFilePath = "";
+    return null;
+  }
+}
+function writeEntry(entry) {
+  const line = formatLogEntry(entry);
+  console.log(line);
+  const logFile = getLogFile();
+  if (logFile) {
+    try {
+      appendFileSync(logFile, line + `
+`);
+    } catch {}
+  }
+}
+
+class ServerLogger {
+  component;
+  minLevel;
+  constructor(component, minLevel) {
+    this.component = component;
+    this.minLevel = minLevel ?? getMinLevel();
+  }
+  shouldLog(level) {
+    return LOG_LEVELS[level] >= LOG_LEVELS[this.minLevel];
+  }
+  log(level, msg, ctx) {
+    if (!this.shouldLog(level))
+      return;
+    writeEntry({
+      ts: new Date().toISOString(),
+      lvl: level,
+      src: this.component,
+      msg,
+      ...ctx && Object.keys(ctx).length > 0 ? { ctx } : {}
+    });
+  }
+  debug(msg, ctx) {
+    this.log("debug", msg, ctx);
+  }
+  info(msg, ctx) {
+    this.log("info", msg, ctx);
+  }
+  warn(msg, ctx) {
+    this.log("warn", msg, ctx);
+  }
+  error(msg, ctx) {
+    this.log("error", msg, ctx);
+  }
+  child(component) {
+    return new ServerLogger(`${this.component}/${component}`, this.minLevel);
+  }
+}
+function createLogger(component) {
+  return new ServerLogger(component);
+}
+var log2 = {
+  pty: createLogger("PTYManager"),
+  ws: createLogger("WS"),
+  terminal: createLogger("Terminal"),
+  buffer: createLogger("BufferManager"),
+  desktop: createLogger("Desktop"),
+  api: createLogger("API"),
+  metrics: createLogger("MetricsCollector"),
+  pr: createLogger("PRMonitor"),
+  github: createLogger("GitHub"),
+  linear: createLogger("Linear"),
+  notification: createLogger("Notification"),
+  server: createLogger("Server"),
+  settings: createLogger("Settings")
 };
+
+// server/lib/settings.ts
+var CURRENT_SCHEMA_VERSION = 2;
+var DEFAULT_SETTINGS = {
+  _schemaVersion: CURRENT_SCHEMA_VERSION,
+  server: {
+    port: 7777
+  },
+  paths: {
+    defaultGitReposDir: os.homedir()
+  },
+  authentication: {
+    username: null,
+    password: null
+  },
+  remoteVibora: {
+    host: "",
+    port: 7777
+  },
+  editor: {
+    app: "vscode",
+    host: "",
+    sshPort: 22
+  },
+  integrations: {
+    linearApiKey: null,
+    githubPat: null
+  },
+  appearance: {
+    language: null
+  }
+};
+var OLD_DEFAULT_PORT = 3333;
+var MIGRATION_MAP = {
+  port: "server.port",
+  defaultGitReposDir: "paths.defaultGitReposDir",
+  basicAuthUsername: "authentication.username",
+  basicAuthPassword: "authentication.password",
+  remoteHost: "remoteVibora.host",
+  hostname: "remoteVibora.host",
+  sshPort: "editor.sshPort",
+  linearApiKey: "integrations.linearApiKey",
+  githubPat: "integrations.githubPat",
+  language: "appearance.language"
+};
+function getNestedValue(obj, path2) {
+  return path2.split(".").reduce((o, k) => {
+    if (o && typeof o === "object") {
+      return o[k];
+    }
+    return;
+  }, obj);
+}
+function setNestedValue(obj, path2, value) {
+  const keys = path2.split(".");
+  const lastKey = keys.pop();
+  let current = obj;
+  for (const key of keys) {
+    if (!(key in current) || typeof current[key] !== "object" || current[key] === null) {
+      current[key] = {};
+    }
+    current = current[key];
+  }
+  current[lastKey] = value;
+}
+function migrateSettings(parsed) {
+  const result = { migrated: false, migratedKeys: [], warnings: [] };
+  const version = parsed._schemaVersion ?? 1;
+  if (version >= CURRENT_SCHEMA_VERSION) {
+    return result;
+  }
+  for (const [oldKey, newPath] of Object.entries(MIGRATION_MAP)) {
+    if (oldKey in parsed && parsed[oldKey] !== undefined) {
+      const oldValue = parsed[oldKey];
+      if (oldKey === "port" && oldValue === OLD_DEFAULT_PORT) {
+        delete parsed[oldKey];
+        result.migrated = true;
+        continue;
+      }
+      const existingValue = getNestedValue(parsed, newPath);
+      if (existingValue !== undefined) {
+        result.warnings.push(`Key "${oldKey}" exists but "${newPath}" already set. Removing old key.`);
+      } else {
+        setNestedValue(parsed, newPath, oldValue);
+        result.migratedKeys.push(oldKey);
+      }
+      delete parsed[oldKey];
+      result.migrated = true;
+    }
+  }
+  parsed._schemaVersion = CURRENT_SCHEMA_VERSION;
+  result.migrated = true;
+  return result;
+}
 function expandPath(p) {
   if (p.startsWith("~/")) {
     return path.join(os.homedir(), p.slice(2));
@@ -3575,60 +3762,127 @@ function getSettings() {
       parsed = JSON.parse(content);
     } catch {}
   }
-  const allKeys = Object.keys(DEFAULT_SETTINGS);
-  const hasMissingKeys = allKeys.some((key) => !(key in parsed));
+  const migrationResult = migrateSettings(parsed);
+  if (migrationResult.migrated) {
+    if (migrationResult.migratedKeys.length > 0) {
+      log2.settings.info("Migrated settings to nested structure", {
+        migratedKeys: migrationResult.migratedKeys
+      });
+    }
+    if (migrationResult.warnings.length > 0) {
+      log2.settings.warn("Settings migration warnings", {
+        warnings: migrationResult.warnings
+      });
+    }
+    fs.writeFileSync(settingsPath, JSON.stringify(parsed, null, 2), "utf-8");
+  }
   const fileSettings = {
-    port: parsed.port ?? DEFAULT_SETTINGS.port,
-    defaultGitReposDir: expandPath(parsed.defaultGitReposDir ?? DEFAULT_SETTINGS.defaultGitReposDir),
-    remoteHost: parsed.remoteHost ?? parsed.hostname ?? DEFAULT_SETTINGS.remoteHost,
-    sshPort: parsed.sshPort ?? DEFAULT_SETTINGS.sshPort,
-    basicAuthUsername: parsed.basicAuthUsername ?? null,
-    basicAuthPassword: parsed.basicAuthPassword ?? null,
-    linearApiKey: parsed.linearApiKey ?? null,
-    githubPat: parsed.githubPat ?? null,
-    language: parsed.language ?? null
+    _schemaVersion: CURRENT_SCHEMA_VERSION,
+    server: {
+      port: parsed.server?.port ?? DEFAULT_SETTINGS.server.port
+    },
+    paths: {
+      defaultGitReposDir: expandPath(parsed.paths?.defaultGitReposDir ?? DEFAULT_SETTINGS.paths.defaultGitReposDir)
+    },
+    authentication: {
+      username: parsed.authentication?.username ?? null,
+      password: parsed.authentication?.password ?? null
+    },
+    remoteVibora: {
+      host: parsed.remoteVibora?.host ?? DEFAULT_SETTINGS.remoteVibora.host,
+      port: parsed.remoteVibora?.port ?? DEFAULT_SETTINGS.remoteVibora.port
+    },
+    editor: {
+      app: parsed.editor?.app ?? DEFAULT_SETTINGS.editor.app,
+      host: parsed.editor?.host ?? DEFAULT_SETTINGS.editor.host,
+      sshPort: parsed.editor?.sshPort ?? DEFAULT_SETTINGS.editor.sshPort
+    },
+    integrations: {
+      linearApiKey: parsed.integrations?.linearApiKey ?? null,
+      githubPat: parsed.integrations?.githubPat ?? null
+    },
+    appearance: {
+      language: parsed.appearance?.language ?? null
+    }
   };
-  if (hasMissingKeys) {
-    fs.writeFileSync(settingsPath, JSON.stringify(fileSettings, null, 2), "utf-8");
-  }
   const portEnv = parseInt(process.env.PORT || "", 10);
-  const sshPortEnv = parseInt(process.env.VIBORA_SSH_PORT || "", 10);
+  const editorSshPortEnv = parseInt(process.env.VIBORA_SSH_PORT || "", 10);
   return {
-    port: !isNaN(portEnv) && portEnv > 0 ? portEnv : fileSettings.port,
-    defaultGitReposDir: process.env.VIBORA_GIT_REPOS_DIR ? expandPath(process.env.VIBORA_GIT_REPOS_DIR) : fileSettings.defaultGitReposDir,
-    remoteHost: process.env.VIBORA_REMOTE_HOST ?? process.env.VIBORA_HOSTNAME ?? fileSettings.remoteHost,
-    sshPort: !isNaN(sshPortEnv) && sshPortEnv > 0 ? sshPortEnv : fileSettings.sshPort,
-    basicAuthUsername: process.env.VIBORA_BASIC_AUTH_USERNAME ?? fileSettings.basicAuthUsername,
-    basicAuthPassword: process.env.VIBORA_BASIC_AUTH_PASSWORD ?? fileSettings.basicAuthPassword,
-    linearApiKey: process.env.LINEAR_API_KEY ?? fileSettings.linearApiKey,
-    githubPat: process.env.GITHUB_PAT ?? fileSettings.githubPat,
-    language: fileSettings.language
+    ...fileSettings,
+    server: {
+      port: !isNaN(portEnv) && portEnv > 0 ? portEnv : fileSettings.server.port
+    },
+    paths: {
+      defaultGitReposDir: process.env.VIBORA_GIT_REPOS_DIR ? expandPath(process.env.VIBORA_GIT_REPOS_DIR) : fileSettings.paths.defaultGitReposDir
+    },
+    authentication: {
+      username: process.env.VIBORA_BASIC_AUTH_USERNAME ?? fileSettings.authentication.username,
+      password: process.env.VIBORA_BASIC_AUTH_PASSWORD ?? fileSettings.authentication.password
+    },
+    remoteVibora: {
+      host: process.env.VIBORA_REMOTE_HOST ?? process.env.VIBORA_HOSTNAME ?? fileSettings.remoteVibora.host,
+      port: fileSettings.remoteVibora.port
+    },
+    editor: {
+      app: fileSettings.editor.app,
+      host: process.env.VIBORA_EDITOR_HOST ?? fileSettings.editor.host,
+      sshPort: !isNaN(editorSshPortEnv) && editorSshPortEnv > 0 ? editorSshPortEnv : fileSettings.editor.sshPort
+    },
+    integrations: {
+      linearApiKey: process.env.LINEAR_API_KEY ?? fileSettings.integrations.linearApiKey,
+      githubPat: process.env.GITHUB_PAT ?? fileSettings.integrations.githubPat
+    },
+    appearance: fileSettings.appearance
   };
 }
-function getSetting(key) {
-  return getSettings()[key];
+function getSetting(path2) {
+  const settings = getSettings();
+  return getNestedValue(settings, path2);
+}
+function getSettingByKey(key) {
+  const settings = getSettings();
+  const legacySettings = toLegacySettings(settings);
+  return legacySettings[key];
+}
+function toLegacySettings(settings) {
+  return {
+    port: settings.server.port,
+    defaultGitReposDir: settings.paths.defaultGitReposDir,
+    remoteHost: settings.remoteVibora.host,
+    sshPort: settings.editor.sshPort,
+    basicAuthUsername: settings.authentication.username,
+    basicAuthPassword: settings.authentication.password,
+    linearApiKey: settings.integrations.linearApiKey,
+    githubPat: settings.integrations.githubPat,
+    language: settings.appearance.language
+  };
 }
 function isDeveloperMode() {
   return process.env.VIBORA_DEVELOPER === "1" || process.env.VIBORA_DEVELOPER === "true";
 }
 function getSessionSecret() {
   const settings = getSettings();
-  if (!settings.basicAuthPassword) {
+  if (!settings.authentication.password) {
     return null;
   }
-  return crypto3.createHash("sha256").update(settings.basicAuthPassword + "vibora-session").digest("hex");
+  return crypto3.createHash("sha256").update(settings.authentication.password + "vibora-session").digest("hex");
 }
-function updateSettings(updates) {
+function updateSettingByPath(settingPath, value) {
   ensureViboraDir();
-  const current = getSettings();
-  const updated = { ...current, ...updates };
-  fs.writeFileSync(getSettingsPath(), JSON.stringify(updated, null, 2), "utf-8");
-  return updated;
+  const settingsPath = getSettingsPath();
+  let parsed = {};
+  if (fs.existsSync(settingsPath)) {
+    try {
+      parsed = JSON.parse(fs.readFileSync(settingsPath, "utf-8"));
+    } catch {}
+  }
+  setNestedValue(parsed, settingPath, value);
+  parsed._schemaVersion = CURRENT_SCHEMA_VERSION;
+  fs.writeFileSync(settingsPath, JSON.stringify(parsed, null, 2), "utf-8");
+  return getSettings();
 }
-function resetSettings() {
-  ensureViboraDir();
-  fs.writeFileSync(getSettingsPath(), JSON.stringify(DEFAULT_SETTINGS, null, 2), "utf-8");
-  return { ...DEFAULT_SETTINGS };
+function getDefaultValue(settingPath) {
+  return getNestedValue(DEFAULT_SETTINGS, settingPath);
 }
 var DEFAULT_NOTIFICATION_SETTINGS = {
   enabled: false,
@@ -4444,7 +4698,7 @@ function sql(strings, ...params) {
     return new SQL([new StringChunk(str)]);
   }
   sql2.raw = raw2;
-  function join2(chunks, separator) {
+  function join3(chunks, separator) {
     const result = [];
     for (const [i, chunk] of chunks.entries()) {
       if (i > 0 && separator !== undefined) {
@@ -4454,7 +4708,7 @@ function sql(strings, ...params) {
     }
     return new SQL(result);
   }
-  sql2.join = join2;
+  sql2.join = join3;
   function identifier(value) {
     return new Name(value);
   }
@@ -6577,7 +6831,7 @@ class SQLiteSelectQueryBuilderBase extends TypedQueryBuilder {
       const tableName = getTableLikeName(table);
       for (const item of extractUsedTable(table))
         this.usedTables.add(item);
-      if (typeof tableName === "string" && this.config.joins?.some((join2) => join2.alias === tableName)) {
+      if (typeof tableName === "string" && this.config.joins?.some((join3) => join3.alias === tableName)) {
         throw new Error(`Alias "${tableName}" is already used in this query`);
       }
       if (!this.isPartialSelect) {
@@ -6991,7 +7245,7 @@ class SQLiteUpdateBase extends QueryPromise {
   createJoin(joinType) {
     return (table, on) => {
       const tableName = getTableLikeName(table);
-      if (typeof tableName === "string" && this.config.joins.some((join2) => join2.alias === tableName)) {
+      if (typeof tableName === "string" && this.config.joins.some((join3) => join3.alias === tableName)) {
         throw new Error(`Alias "${tableName}" is already used in this query`);
       }
       if (typeof on === "function") {
@@ -7734,7 +7988,7 @@ function migrate(db, config) {
 
 // server/db/index.ts
 import { Database as Database2 } from "bun:sqlite";
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 import { readdirSync } from "fs";
 
 // server/db/schema.ts
@@ -7804,6 +8058,7 @@ var repositories = sqliteTable("repositories", {
   startupScript: text("startup_script"),
   copyFiles: text("copy_files"),
   remoteUrl: text("remote_url"),
+  lastUsedAt: text("last_used_at"),
   createdAt: text("created_at").notNull(),
   updatedAt: text("updated_at").notNull()
 });
@@ -7825,7 +8080,7 @@ var sqlite = new Database2(dbPath);
 sqlite.exec("PRAGMA journal_mode = WAL");
 var db = drizzle(sqlite, { schema: exports_schema });
 if (process.env.VIBORA_PACKAGE_ROOT) {
-  const migrationsPath = join2(process.env.VIBORA_PACKAGE_ROOT, "drizzle");
+  const migrationsPath = join3(process.env.VIBORA_PACKAGE_ROOT, "drizzle");
   const hasTasksTable = sqlite.query("SELECT name FROM sqlite_master WHERE type='table' AND name='tasks'").get();
   if (hasTasksTable) {
     sqlite.exec(`
@@ -13401,7 +13656,7 @@ glob.glob = glob;
 // node_modules/bun-pty/dist/index.js
 import { dlopen, FFIType, ptr } from "bun:ffi";
 import { Buffer as Buffer2 } from "buffer";
-import { join as join3, dirname as dirname2, basename } from "path";
+import { join as join4, dirname as dirname2, basename } from "path";
 import { existsSync as existsSync2 } from "fs";
 
 class EventEmitter2 {
@@ -13444,14 +13699,14 @@ function resolveLibPath() {
   const dirName = basename(fileDir);
   const here = dirName === "src" || dirName === "dist" ? dirname2(fileDir) : fileDir;
   const basePaths = [
-    join3(here, "rust-pty", "target", "release"),
-    join3(here, "..", "bun-pty", "rust-pty", "target", "release"),
-    join3(process.cwd(), "node_modules", "bun-pty", "rust-pty", "target", "release")
+    join4(here, "rust-pty", "target", "release"),
+    join4(here, "..", "bun-pty", "rust-pty", "target", "release"),
+    join4(process.cwd(), "node_modules", "bun-pty", "rust-pty", "target", "release")
   ];
   const fallbackPaths = [];
   for (const basePath of basePaths) {
     for (const filename of filenames) {
-      fallbackPaths.push(join3(basePath, filename));
+      fallbackPaths.push(join4(basePath, filename));
     }
   }
   for (const path3 of fallbackPaths) {
@@ -13724,111 +13979,6 @@ function getDtachService() {
 // server/terminal/buffer-manager.ts
 import { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync2, unlinkSync } from "fs";
 import * as path4 from "path";
-
-// server/lib/logger.ts
-import { appendFileSync } from "fs";
-import { join as join5 } from "path";
-
-// shared/logger/types.ts
-var LOG_LEVELS = {
-  debug: 0,
-  info: 1,
-  warn: 2,
-  error: 3
-};
-function formatLogEntry(entry) {
-  return JSON.stringify(entry);
-}
-// server/lib/logger.ts
-function getMinLevel() {
-  const level = process.env.LOG_LEVEL;
-  if (level && level in LOG_LEVELS) {
-    return level;
-  }
-  return "info";
-}
-var logFilePath = null;
-function getLogFile() {
-  if (logFilePath !== null) {
-    return logFilePath || null;
-  }
-  try {
-    ensureViboraDir();
-    logFilePath = join5(getViboraDir(), "vibora.log");
-    return logFilePath;
-  } catch {
-    logFilePath = "";
-    return null;
-  }
-}
-function writeEntry(entry) {
-  const line = formatLogEntry(entry);
-  console.log(line);
-  const logFile = getLogFile();
-  if (logFile) {
-    try {
-      appendFileSync(logFile, line + `
-`);
-    } catch {}
-  }
-}
-
-class ServerLogger {
-  component;
-  minLevel;
-  constructor(component, minLevel) {
-    this.component = component;
-    this.minLevel = minLevel ?? getMinLevel();
-  }
-  shouldLog(level) {
-    return LOG_LEVELS[level] >= LOG_LEVELS[this.minLevel];
-  }
-  log(level, msg, ctx) {
-    if (!this.shouldLog(level))
-      return;
-    writeEntry({
-      ts: new Date().toISOString(),
-      lvl: level,
-      src: this.component,
-      msg,
-      ...ctx && Object.keys(ctx).length > 0 ? { ctx } : {}
-    });
-  }
-  debug(msg, ctx) {
-    this.log("debug", msg, ctx);
-  }
-  info(msg, ctx) {
-    this.log("info", msg, ctx);
-  }
-  warn(msg, ctx) {
-    this.log("warn", msg, ctx);
-  }
-  error(msg, ctx) {
-    this.log("error", msg, ctx);
-  }
-  child(component) {
-    return new ServerLogger(`${this.component}/${component}`, this.minLevel);
-  }
-}
-function createLogger(component) {
-  return new ServerLogger(component);
-}
-var log2 = {
-  pty: createLogger("PTYManager"),
-  ws: createLogger("WS"),
-  terminal: createLogger("Terminal"),
-  buffer: createLogger("BufferManager"),
-  desktop: createLogger("Desktop"),
-  api: createLogger("API"),
-  metrics: createLogger("MetricsCollector"),
-  pr: createLogger("PRMonitor"),
-  github: createLogger("GitHub"),
-  linear: createLogger("Linear"),
-  notification: createLogger("Notification"),
-  server: createLogger("Server")
-};
-
-// server/terminal/buffer-manager.ts
 var MAX_BUFFER_BYTES = 1e6;
 function getBuffersDir() {
   const dir = path4.join(getViboraDir(), "buffers");
@@ -137757,7 +137907,7 @@ var LinearClient = class extends LinearSdk {
 // server/services/linear.ts
 var linearClient = null;
 function getLinearClient() {
-  const apiKey = getSetting("linearApiKey");
+  const apiKey = getSetting("integrations.linearApiKey");
   if (!apiKey)
     return null;
   if (!linearClient) {
@@ -137935,7 +138085,7 @@ async function sendPushoverNotification(config, payload) {
     return { channel: "pushover", success: false, error: message };
   }
 }
-function broadcastUINotification(payload) {
+function broadcastUINotification(payload, playSound) {
   const notificationType = payload.type === "pr_merged" || payload.type === "plan_complete" ? "success" : "info";
   broadcast({
     type: "notification",
@@ -137944,7 +138094,8 @@ function broadcastUINotification(payload) {
       title: payload.title,
       message: payload.message,
       notificationType,
-      taskId: payload.taskId
+      taskId: payload.taskId,
+      playSound
     }
   });
 }
@@ -137955,7 +138106,8 @@ async function sendNotification(payload) {
   }
   const results = [];
   const promises = [];
-  broadcastUINotification(payload);
+  const playSound = settings.sound?.enabled ?? false;
+  broadcastUINotification(payload, playSound);
   if (settings.sound?.enabled) {
     promises.push(sendSoundNotification(settings.sound).then((r) => results.push(r)).catch((e) => results.push({ channel: "sound", success: false, error: e.message })));
   }
@@ -138172,6 +138324,9 @@ app2.post("/", async (c) => {
       }
     }
     db.insert(tasks).values(newTask).run();
+    if (body.repoPath) {
+      db.update(repositories).set({ lastUsedAt: now, updatedAt: now }).where(eq(repositories.path, body.repoPath)).run();
+    }
     const created = db.select().from(tasks).where(eq(tasks.id, newTask.id)).get();
     broadcast({ type: "task:updated", payload: { taskId: newTask.id } });
     return c.json(created ? parseViewState(created) : null, 201);
@@ -139200,16 +139355,61 @@ var filesystem_default = app4;
 // server/routes/config.ts
 import { spawn as spawn3 } from "child_process";
 var CONFIG_KEYS = {
-  PORT: "port",
-  DEFAULT_GIT_REPOS_DIR: "defaultGitReposDir",
-  REMOTE_HOST: "remoteHost",
-  SSH_PORT: "sshPort",
-  LINEAR_API_KEY: "linearApiKey",
-  GITHUB_PAT: "githubPat",
-  LANGUAGE: "language",
-  BASIC_AUTH_USERNAME: "basicAuthUsername",
-  BASIC_AUTH_PASSWORD: "basicAuthPassword"
-};
+  PORT: "server.port",
+  DEFAULT_GIT_REPOS_DIR: "paths.defaultGitReposDir",
+  BASIC_AUTH_USERNAME: "authentication.username",
+  BASIC_AUTH_PASSWORD: "authentication.password",
+  REMOTE_HOST: "remoteVibora.host",
+  REMOTE_PORT: "remoteVibora.port",
+  EDITOR_APP: "editor.app",
+  EDITOR_HOST: "editor.host",
+  EDITOR_SSH_PORT: "editor.sshPort",
+  LINEAR_API_KEY: "integrations.linearApiKey",
+  GITHUB_PAT: "integrations.githubPat",
+  LANGUAGE: "appearance.language"
+};
+var LEGACY_KEY_MAP = {
+  port: "server.port",
+  default_git_repos_dir: "paths.defaultGitReposDir",
+  basic_auth_username: "authentication.username",
+  basic_auth_password: "authentication.password",
+  remote_host: "remoteVibora.host",
+  hostname: "remoteVibora.host",
+  ssh_port: "editor.sshPort",
+  linear_api_key: "integrations.linearApiKey",
+  github_pat: "integrations.githubPat",
+  language: "appearance.language",
+  defaultGitReposDir: "paths.defaultGitReposDir",
+  basicAuthUsername: "authentication.username",
+  basicAuthPassword: "authentication.password",
+  remoteHost: "remoteVibora.host",
+  sshPort: "editor.sshPort",
+  linearApiKey: "integrations.linearApiKey",
+  githubPat: "integrations.githubPat"
+};
+var VALID_PATHS = new Set(Object.values(CONFIG_KEYS));
+function resolveConfigKey(key) {
+  if (VALID_PATHS.has(key)) {
+    return key;
+  }
+  if (key in LEGACY_KEY_MAP) {
+    return LEGACY_KEY_MAP[key];
+  }
+  return null;
+}
+function getSettingValue(path8) {
+  const settings = getSettings();
+  const parts = path8.split(".");
+  let current = settings;
+  for (const part of parts) {
+    if (current && typeof current === "object" && part in current) {
+      current = current[part];
+    } else {
+      return;
+    }
+  }
+  return current;
+}
 var app5 = new Hono2;
 app5.get("/notifications", (c) => {
   const notifications = getNotificationSettings();
@@ -139299,134 +139499,81 @@ app5.post("/restart", (c) => {
     return c.json({ error: "Restart only available in developer mode" }, 403);
   }
   setTimeout(() => {
-    spawn3("bash", ["-c", "cd ~/projects/vibora && mise run build && systemctl --user restart vibora-dev"], {
+    spawn3("bash", ["-c", "cd ~/projects/vibora && mise run build && bun run drizzle-kit push && systemctl --user restart vibora-dev"], {
       detached: true,
       stdio: "ignore"
     }).unref();
   }, 100);
-  return c.json({ success: true, message: "Restart initiated (building first)" });
+  return c.json({ success: true, message: "Restart initiated (build + migrate + restart)" });
 });
 app5.get("/:key", (c) => {
   const key = c.req.param("key");
-  const settings = getSettings();
-  let value = null;
-  if (key === "port" || key === CONFIG_KEYS.PORT) {
-    value = settings.port;
-  } else if (key === "default_git_repos_dir" || key === CONFIG_KEYS.DEFAULT_GIT_REPOS_DIR) {
-    value = settings.defaultGitReposDir;
-  } else if (key === "remote_host" || key === "remoteHost" || key === CONFIG_KEYS.REMOTE_HOST || key === "hostname") {
-    value = settings.remoteHost;
-  } else if (key === "ssh_port" || key === CONFIG_KEYS.SSH_PORT) {
-    value = settings.sshPort;
-  } else if (key === "linear_api_key" || key === CONFIG_KEYS.LINEAR_API_KEY) {
-    value = settings.linearApiKey;
-  } else if (key === "github_pat" || key === CONFIG_KEYS.GITHUB_PAT) {
-    value = settings.githubPat;
-  } else if (key === "language" || key === CONFIG_KEYS.LANGUAGE) {
-    return c.json({ key, value: settings.language, isDefault: settings.language === null });
-  } else if (key === "basic_auth_username" || key === CONFIG_KEYS.BASIC_AUTH_USERNAME) {
-    return c.json({ key, value: settings.basicAuthUsername, isDefault: settings.basicAuthUsername === null });
-  } else if (key === "basic_auth_password" || key === CONFIG_KEYS.BASIC_AUTH_PASSWORD) {
-    return c.json({ key, value: settings.basicAuthPassword ? "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022" : null, isDefault: settings.basicAuthPassword === null });
-  } else if (key === "worktree_base_path") {
+  if (key === "worktree_base_path") {
     return c.json({ key, value: getWorktreeBasePath(), isDefault: true });
   }
-  if (value === null) {
-    return c.json({ key, value: null, isDefault: true });
+  const path8 = resolveConfigKey(key);
+  if (!path8) {
+    return c.json({ key, value: null, isDefault: true, error: "Unknown config key" }, 404);
+  }
+  const value = getSettingValue(path8);
+  const defaultValue = getDefaultValue(path8);
+  const isDefault = value === defaultValue || value === undefined || value === null;
+  if (path8 === CONFIG_KEYS.BASIC_AUTH_PASSWORD) {
+    return c.json({
+      key,
+      value: value ? "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022" : null,
+      isDefault: value === null || value === undefined
+    });
   }
-  return c.json({ key, value, isDefault: false });
+  return c.json({ key, value: value ?? defaultValue, isDefault });
 });
 app5.put("/:key", async (c) => {
   const key = c.req.param("key");
+  const path8 = resolveConfigKey(key);
+  if (!path8) {
+    return c.json({ error: `Unknown or read-only config key: ${key}` }, 400);
+  }
   try {
     const body = await c.req.json();
-    if (key === "port" || key === CONFIG_KEYS.PORT) {
-      const port = typeof body.value === "number" ? body.value : parseInt(body.value, 10);
+    let { value } = body;
+    if (path8 === CONFIG_KEYS.PORT || path8 === CONFIG_KEYS.REMOTE_PORT || path8 === CONFIG_KEYS.EDITOR_SSH_PORT) {
+      const port = typeof value === "number" ? value : parseInt(value, 10);
       if (isNaN(port) || port < 1 || port > 65535) {
         return c.json({ error: "Port must be a number between 1 and 65535" }, 400);
       }
-      updateSettings({ port });
-      return c.json({ key, value: port });
-    } else if (key === "default_git_repos_dir" || key === CONFIG_KEYS.DEFAULT_GIT_REPOS_DIR) {
-      if (typeof body.value !== "string") {
-        return c.json({ error: "Value must be a string" }, 400);
-      }
-      updateSettings({ defaultGitReposDir: body.value });
-      return c.json({ key, value: body.value });
-    } else if (key === "remote_host" || key === "remoteHost" || key === CONFIG_KEYS.REMOTE_HOST || key === "hostname") {
-      if (typeof body.value !== "string") {
-        return c.json({ error: "Value must be a string" }, 400);
-      }
-      updateSettings({ remoteHost: body.value });
-      return c.json({ key, value: body.value });
-    } else if (key === "ssh_port" || key === CONFIG_KEYS.SSH_PORT) {
-      const sshPort = typeof body.value === "number" ? body.value : parseInt(body.value, 10);
-      if (isNaN(sshPort) || sshPort < 1 || sshPort > 65535) {
-        return c.json({ error: "SSH port must be a number between 1 and 65535" }, 400);
-      }
-      updateSettings({ sshPort });
-      return c.json({ key, value: sshPort });
-    } else if (key === "linear_api_key" || key === CONFIG_KEYS.LINEAR_API_KEY) {
-      if (typeof body.value !== "string") {
-        return c.json({ error: "Value must be a string" }, 400);
-      }
-      updateSettings({ linearApiKey: body.value || null });
-      return c.json({ key, value: body.value });
-    } else if (key === "github_pat" || key === CONFIG_KEYS.GITHUB_PAT) {
-      if (typeof body.value !== "string") {
-        return c.json({ error: "Value must be a string" }, 400);
-      }
-      updateSettings({ githubPat: body.value || null });
-      return c.json({ key, value: body.value });
-    } else if (key === "language" || key === CONFIG_KEYS.LANGUAGE) {
-      const langValue = body.value === "" || body.value === null ? null : body.value;
-      if (langValue !== null && langValue !== "en" && langValue !== "zh") {
+      value = port;
+    } else if (path8 === CONFIG_KEYS.LANGUAGE) {
+      if (value !== null && value !== "" && value !== "en" && value !== "zh") {
         return c.json({ error: 'Language must be "en", "zh", or null' }, 400);
       }
-      updateSettings({ language: langValue });
-      return c.json({ key, value: langValue });
-    } else if (key === "basic_auth_username" || key === CONFIG_KEYS.BASIC_AUTH_USERNAME) {
-      if (typeof body.value !== "string") {
-        return c.json({ error: "Value must be a string" }, 400);
+      value = value === "" ? null : value;
+    } else if (path8 === CONFIG_KEYS.EDITOR_APP) {
+      const validApps = ["vscode", "cursor", "windsurf", "zed"];
+      if (!validApps.includes(value)) {
+        return c.json({ error: `Editor app must be one of: ${validApps.join(", ")}` }, 400);
       }
-      updateSettings({ basicAuthUsername: body.value || null });
-      return c.json({ key, value: body.value });
-    } else if (key === "basic_auth_password" || key === CONFIG_KEYS.BASIC_AUTH_PASSWORD) {
-      if (typeof body.value !== "string") {
-        return c.json({ error: "Value must be a string" }, 400);
+    } else if (typeof value === "string" && value === "") {
+      if (path8 === CONFIG_KEYS.LINEAR_API_KEY || path8 === CONFIG_KEYS.GITHUB_PAT || path8 === CONFIG_KEYS.BASIC_AUTH_USERNAME || path8 === CONFIG_KEYS.BASIC_AUTH_PASSWORD || path8 === CONFIG_KEYS.REMOTE_HOST || path8 === CONFIG_KEYS.EDITOR_HOST) {
+        value = null;
       }
-      updateSettings({ basicAuthPassword: body.value || null });
-      return c.json({ key, value: body.value ? "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022" : null });
-    } else {
-      return c.json({ error: `Unknown or read-only config key: ${key}` }, 400);
     }
+    updateSettingByPath(path8, value);
+    if (path8 === CONFIG_KEYS.BASIC_AUTH_PASSWORD) {
+      return c.json({ key, value: value ? "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022" : null });
+    }
+    return c.json({ key, value });
   } catch (err) {
     return c.json({ error: err instanceof Error ? err.message : "Failed to set config" }, 400);
   }
 });
 app5.delete("/:key", (c) => {
   const key = c.req.param("key");
-  const defaults2 = resetSettings();
-  let defaultValue = null;
-  if (key === "port" || key === CONFIG_KEYS.PORT) {
-    defaultValue = defaults2.port;
-  } else if (key === "default_git_repos_dir" || key === CONFIG_KEYS.DEFAULT_GIT_REPOS_DIR) {
-    defaultValue = defaults2.defaultGitReposDir;
-  } else if (key === "remote_host" || key === "remoteHost" || key === CONFIG_KEYS.REMOTE_HOST || key === "hostname") {
-    defaultValue = defaults2.remoteHost;
-  } else if (key === "ssh_port" || key === CONFIG_KEYS.SSH_PORT) {
-    defaultValue = defaults2.sshPort;
-  } else if (key === "linear_api_key" || key === CONFIG_KEYS.LINEAR_API_KEY) {
-    defaultValue = defaults2.linearApiKey;
-  } else if (key === "github_pat" || key === CONFIG_KEYS.GITHUB_PAT) {
-    defaultValue = defaults2.githubPat;
-  } else if (key === "language" || key === CONFIG_KEYS.LANGUAGE) {
-    defaultValue = defaults2.language;
-  } else if (key === "basic_auth_username" || key === CONFIG_KEYS.BASIC_AUTH_USERNAME) {
-    defaultValue = defaults2.basicAuthUsername;
-  } else if (key === "basic_auth_password" || key === CONFIG_KEYS.BASIC_AUTH_PASSWORD) {
-    defaultValue = defaults2.basicAuthPassword;
+  const path8 = resolveConfigKey(key);
+  if (!path8) {
+    return c.json({ error: `Unknown config key: ${key}` }, 400);
   }
+  const defaultValue = getDefaultValue(path8);
+  updateSettingByPath(path8, defaultValue);
   return c.json({ key, value: defaultValue, isDefault: true });
 });
 var config_default = app5;
@@ -139934,7 +140081,7 @@ var terminal_view_state_default = app8;
 // server/routes/repositories.ts
 var app9 = new Hono2;
 app9.get("/", (c) => {
-  const allRepos = db.select().from(repositories).all();
+  const allRepos = db.select().from(repositories).orderBy(desc(sql`COALESCE(${repositories.lastUsedAt}, '1970-01-01')`), desc(repositories.createdAt)).all();
   return c.json(allRepos);
 });
 app9.get("/:id", (c) => {
@@ -143486,7 +143633,7 @@ var Octokit2 = Octokit.plugin(requestLog, legacyRestEndpointMethods, paginateRes
 var octokitClient = null;
 var cachedPat = null;
 function getOctokit() {
-  const pat = getSetting("githubPat");
+  const pat = getSetting("integrations.githubPat");
   if (!pat)
     return null;
   if (pat !== cachedPat) {
@@ -144490,7 +144637,7 @@ function findViboraInstances() {
         const isDevBackend = isBunProcess && cmdline.includes("server/index.ts") && env.NODE_ENV !== "production";
         const isProdBackend = isBunProcess && (!!env.VIBORA_PACKAGE_ROOT || cmdline.includes("server/index.ts") && env.NODE_ENV === "production");
         if (isDevBackend || isProdBackend) {
-          const port = parseInt(env.PORT || "3333", 10);
+          const port = parseInt(env.PORT || "7777", 10);
           const cwd = getProcessCwd(pid);
           let viboraDir = env.VIBORA_DIR || (isDevBackend ? "~/.vibora/dev" : "~/.vibora");
           if (viboraDir.startsWith(".") && cwd !== "(unknown)") {
@@ -144899,7 +145046,7 @@ function stopPRMonitor() {
 }
 
 // server/index.ts
-var PORT = getSetting("port");
+var PORT = getSettingByKey("port");
 var ptyManager2 = initPTYManager({
   onData: (terminalId, data) => {
     broadcastToTerminal(terminalId, {