vibora 2.2.2 → 2.3.0

package/server/index.js

@@ -3610,6 +3610,7 @@ var log2 = {
 
 // server/lib/settings.ts
 var CURRENT_SCHEMA_VERSION = 3;
+var CLAUDE_CODE_THEMES = ["light", "light-ansi", "light-daltonized", "dark", "dark-ansi", "dark-daltonized"];
 var DEFAULT_SETTINGS = {
   _schemaVersion: CURRENT_SCHEMA_VERSION,
   server: {
@@ -3622,9 +3623,6 @@ var DEFAULT_SETTINGS = {
     username: null,
     password: null
   },
-  remoteVibora: {
-    url: ""
-  },
   editor: {
     app: "vscode",
     host: "",
@@ -3635,7 +3633,11 @@ var DEFAULT_SETTINGS = {
     githubPat: null
   },
   appearance: {
-    language: null
+    language: null,
+    theme: null,
+    syncClaudeCodeTheme: false,
+    claudeCodeLightTheme: "light-ansi",
+    claudeCodeDarkTheme: "dark-ansi"
   }
 };
 var OLD_DEFAULT_PORT = 3333;
@@ -3647,7 +3649,11 @@ var MIGRATION_MAP = {
   sshPort: "editor.sshPort",
   linearApiKey: "integrations.linearApiKey",
   githubPat: "integrations.githubPat",
-  language: "appearance.language"
+  language: "appearance.language",
+  theme: "appearance.theme",
+  syncClaudeCodeTheme: "appearance.syncClaudeCodeTheme",
+  claudeCodeLightTheme: "appearance.claudeCodeLightTheme",
+  claudeCodeDarkTheme: "appearance.claudeCodeDarkTheme"
 };
 function getNestedValue(obj, path2) {
   return path2.split(".").reduce((o, k) => {
@@ -3669,13 +3675,6 @@ function setNestedValue(obj, path2, value) {
   }
   current[lastKey] = value;
 }
-function constructRemoteUrl(host, port) {
-  if (!host)
-    return "";
-  const effectivePort = port || 7777;
-  const portSuffix = effectivePort === 80 || effectivePort === 443 ? "" : `:${effectivePort}`;
-  return `http://${host}${portSuffix}`;
-}
 function migrateSettings(parsed) {
   const result = { migrated: false, migratedKeys: [], warnings: [] };
   const version = parsed._schemaVersion ?? 1;
@@ -3702,26 +3701,9 @@ function migrateSettings(parsed) {
         result.migrated = true;
       }
     }
-    const flatHost = parsed.remoteHost || parsed.hostname || "";
-    if (flatHost) {
-      const url = constructRemoteUrl(flatHost, 7777);
-      setNestedValue(parsed, "remoteVibora.url", url);
-      result.migratedKeys.push("remoteHost");
-      delete parsed.remoteHost;
-      delete parsed.hostname;
-      result.migrated = true;
-    }
-  }
-  if (version < 3) {
-    const remoteVibora = parsed.remoteVibora;
-    if (remoteVibora && "host" in remoteVibora) {
-      const host = remoteVibora.host || "";
-      const port = remoteVibora.port || 7777;
-      const url = constructRemoteUrl(host, port);
-      parsed.remoteVibora = { url };
-      result.migratedKeys.push("remoteVibora.host");
-      result.migrated = true;
-    }
+    delete parsed.remoteHost;
+    delete parsed.hostname;
+    delete parsed.remoteVibora;
   }
   parsed._schemaVersion = CURRENT_SCHEMA_VERSION;
   result.migrated = true;
@@ -3814,9 +3796,6 @@ function getSettings() {
       username: parsed.authentication?.username ?? null,
       password: parsed.authentication?.password ?? null
     },
-    remoteVibora: {
-      url: parsed.remoteVibora?.url ?? DEFAULT_SETTINGS.remoteVibora.url
-    },
     editor: {
       app: parsed.editor?.app ?? DEFAULT_SETTINGS.editor.app,
       host: parsed.editor?.host ?? DEFAULT_SETTINGS.editor.host,
@@ -3827,7 +3806,11 @@ function getSettings() {
       githubPat: parsed.integrations?.githubPat ?? null
     },
     appearance: {
-      language: parsed.appearance?.language ?? null
+      language: parsed.appearance?.language ?? null,
+      theme: parsed.appearance?.theme ?? null,
+      syncClaudeCodeTheme: parsed.appearance?.syncClaudeCodeTheme ?? false,
+      claudeCodeLightTheme: parsed.appearance?.claudeCodeLightTheme ?? "light-ansi",
+      claudeCodeDarkTheme: parsed.appearance?.claudeCodeDarkTheme ?? "dark-ansi"
     }
   };
   const portEnv = parseInt(process.env.PORT || "", 10);
@@ -3844,9 +3827,6 @@ function getSettings() {
       username: process.env.VIBORA_BASIC_AUTH_USERNAME ?? fileSettings.authentication.username,
       password: process.env.VIBORA_BASIC_AUTH_PASSWORD ?? fileSettings.authentication.password
     },
-    remoteVibora: {
-      url: process.env.VIBORA_REMOTE_URL ?? fileSettings.remoteVibora.url
-    },
     editor: {
       app: fileSettings.editor.app,
       host: process.env.VIBORA_EDITOR_HOST ?? fileSettings.editor.host,
@@ -3872,13 +3852,16 @@ function toLegacySettings(settings) {
   return {
     port: settings.server.port,
     defaultGitReposDir: settings.paths.defaultGitReposDir,
-    remoteUrl: settings.remoteVibora.url,
     sshPort: settings.editor.sshPort,
     basicAuthUsername: settings.authentication.username,
     basicAuthPassword: settings.authentication.password,
     linearApiKey: settings.integrations.linearApiKey,
     githubPat: settings.integrations.githubPat,
-    language: settings.appearance.language
+    language: settings.appearance.language,
+    theme: settings.appearance.theme,
+    syncClaudeCodeTheme: settings.appearance.syncClaudeCodeTheme,
+    claudeCodeLightTheme: settings.appearance.claudeCodeLightTheme,
+    claudeCodeDarkTheme: settings.appearance.claudeCodeDarkTheme
   };
 }
 function isDeveloperMode() {
@@ -3909,8 +3892,8 @@ function getDefaultValue(settingPath) {
   return getNestedValue(DEFAULT_SETTINGS, settingPath);
 }
 var DEFAULT_NOTIFICATION_SETTINGS = {
-  enabled: false,
-  sound: { enabled: false },
+  enabled: true,
+  sound: { enabled: true },
   slack: { enabled: false },
   discord: { enabled: false },
   pushover: { enabled: false }
@@ -3982,6 +3965,33 @@ function updateClaudeSettings(updates) {
   const merged = { ...current, ...updates };
   fs.writeFileSync(settingsPath, JSON.stringify(merged, null, 2), "utf-8");
 }
+function getClaudeConfigPath() {
+  return path.join(os.homedir(), ".claude.json");
+}
+function getClaudeConfig() {
+  const configPath = getClaudeConfigPath();
+  if (!fs.existsSync(configPath))
+    return {};
+  try {
+    return JSON.parse(fs.readFileSync(configPath, "utf-8"));
+  } catch {
+    return {};
+  }
+}
+function updateClaudeConfig(updates) {
+  const configPath = getClaudeConfigPath();
+  const current = getClaudeConfig();
+  const merged = { ...current, ...updates };
+  fs.writeFileSync(configPath, JSON.stringify(merged, null, 2), "utf-8");
+}
+function syncClaudeCodeTheme(resolvedTheme) {
+  const settings = getSettings();
+  if (!settings.appearance.syncClaudeCodeTheme)
+    return;
+  const claudeTheme = resolvedTheme === "light" ? settings.appearance.claudeCodeLightTheme : settings.appearance.claudeCodeDarkTheme;
+  updateClaudeConfig({ theme: claudeTheme });
+  log2.settings.info("Synced Claude Code theme", { claudeTheme, resolvedTheme });
+}
 var DEFAULT_ZAI_SETTINGS = {
   enabled: false,
   apiKey: null,
@@ -137999,25 +138009,8 @@ async function updateLinearTicketStatus(identifier, viboraStatus) {
 }
 
 // server/services/notification-service.ts
-import { spawn as spawn2 } from "child_process";
-async function sendSoundNotification(config) {
-  if (process.platform !== "darwin") {
-    return { channel: "sound", success: false, error: "Sound only supported on macOS" };
-  }
-  const soundFile = config.soundFile || "/System/Library/Sounds/Glass.aiff";
-  return new Promise((resolve2) => {
-    const proc2 = spawn2("afplay", [soundFile]);
-    proc2.on("close", (code) => {
-      if (code === 0) {
-        resolve2({ channel: "sound", success: true });
-      } else {
-        resolve2({ channel: "sound", success: false, error: `afplay exited with code ${code}` });
-      }
-    });
-    proc2.on("error", (err) => {
-      resolve2({ channel: "sound", success: false, error: err.message });
-    });
-  });
+async function sendSoundNotification(_config) {
+  return { channel: "sound", success: true };
 }
 async function sendSlackNotification(config, payload) {
   if (!config.webhookUrl) {
@@ -139028,6 +139021,53 @@ app3.post("/merge-to-main", async (c) => {
     return c.json({ error: err instanceof Error ? err.message : "Failed to merge" }, 500);
   }
 });
+app3.post("/push", async (c) => {
+  try {
+    const body = await c.req.json();
+    const { worktreePath } = body;
+    if (!worktreePath) {
+      return c.json({ error: "Missing required field: worktreePath" }, 400);
+    }
+    if (!fs4.existsSync(worktreePath)) {
+      return c.json({ error: "Worktree path does not exist" }, 404);
+    }
+    let branch;
+    try {
+      branch = gitExec(worktreePath, "rev-parse --abbrev-ref HEAD");
+    } catch {
+      return c.json({ error: "Failed to determine current branch" }, 500);
+    }
+    try {
+      const status = gitExec(worktreePath, "status --porcelain");
+      if (status.trim()) {
+        return c.json({
+          error: "Worktree has uncommitted changes. Please commit or stash changes before pushing.",
+          hasUncommittedChanges: true
+        }, 409);
+      }
+    } catch {}
+    try {
+      gitExec(worktreePath, `push origin ${branch}`);
+    } catch (pushErr) {
+      const errorMsg = pushErr instanceof Error ? pushErr.message : "Unknown error";
+      if (errorMsg.includes("rejected") || errorMsg.includes("non-fast-forward")) {
+        return c.json({
+          error: "Push rejected. The remote has changes you do not have locally. Pull first.",
+          pushRejected: true
+        }, 409);
+      }
+      return c.json({
+        error: `Failed to push: ${errorMsg}`
+      }, 500);
+    }
+    return c.json({
+      success: true,
+      branch
+    });
+  } catch (err) {
+    return c.json({ error: err instanceof Error ? err.message : "Failed to push" }, 500);
+  }
+});
 app3.post("/sync-parent", async (c) => {
   try {
     const body = await c.req.json();
@@ -139377,7 +139417,7 @@ app4.get("/is-git-repo", (c) => {
 var filesystem_default = app4;
 
 // server/routes/config.ts
-import { spawn as spawn3 } from "child_process";
+import { spawn as spawn2 } from "child_process";
 var CONFIG_KEYS = {
   PORT: "server.port",
   DEFAULT_GIT_REPOS_DIR: "paths.defaultGitReposDir",
@@ -139390,7 +139430,11 @@ var CONFIG_KEYS = {
   EDITOR_SSH_PORT: "editor.sshPort",
   LINEAR_API_KEY: "integrations.linearApiKey",
   GITHUB_PAT: "integrations.githubPat",
-  LANGUAGE: "appearance.language"
+  LANGUAGE: "appearance.language",
+  THEME: "appearance.theme",
+  SYNC_CLAUDE_CODE_THEME: "appearance.syncClaudeCodeTheme",
+  CLAUDE_CODE_LIGHT_THEME: "appearance.claudeCodeLightTheme",
+  CLAUDE_CODE_DARK_THEME: "appearance.claudeCodeDarkTheme"
 };
 var LEGACY_KEY_MAP = {
   port: "server.port",
@@ -139403,6 +139447,7 @@ var LEGACY_KEY_MAP = {
   linear_api_key: "integrations.linearApiKey",
   github_pat: "integrations.githubPat",
   language: "appearance.language",
+  theme: "appearance.theme",
   defaultGitReposDir: "paths.defaultGitReposDir",
   basicAuthUsername: "authentication.username",
   basicAuthPassword: "authentication.password",
@@ -139523,13 +139568,26 @@ 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 && bun run drizzle-kit push && systemctl --user restart vibora-dev"], {
+    spawn2("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 (build + migrate + restart)" });
 });
+app5.post("/sync-claude-theme", async (c) => {
+  try {
+    const body = await c.req.json();
+    const { resolvedTheme } = body;
+    if (resolvedTheme !== "light" && resolvedTheme !== "dark") {
+      return c.json({ error: 'resolvedTheme must be "light" or "dark"' }, 400);
+    }
+    syncClaudeCodeTheme(resolvedTheme);
+    return c.json({ success: true, resolvedTheme });
+  } catch (err) {
+    return c.json({ error: err instanceof Error ? err.message : "Failed to sync theme" }, 400);
+  }
+});
 app5.get("/:key", (c) => {
   const key = c.req.param("key");
   if (key === "worktree_base_path") {
@@ -139571,6 +139629,19 @@ app5.put("/:key", async (c) => {
         return c.json({ error: 'Language must be "en", "zh", or null' }, 400);
       }
       value = value === "" ? null : value;
+    } else if (path8 === CONFIG_KEYS.THEME) {
+      if (value !== null && value !== "" && value !== "system" && value !== "light" && value !== "dark") {
+        return c.json({ error: 'Theme must be "system", "light", "dark", or null' }, 400);
+      }
+      value = value === "" || value === "system" ? null : value;
+    } else if (path8 === CONFIG_KEYS.SYNC_CLAUDE_CODE_THEME || path8 === CONFIG_KEYS.SYNC_STARSHIP_THEME) {
+      if (typeof value !== "boolean") {
+        return c.json({ error: "Sync setting must be a boolean" }, 400);
+      }
+    } else if (path8 === CONFIG_KEYS.CLAUDE_CODE_LIGHT_THEME || path8 === CONFIG_KEYS.CLAUDE_CODE_DARK_THEME) {
+      if (!CLAUDE_CODE_THEMES.includes(value)) {
+        return c.json({ error: `Claude Code theme must be one of: ${CLAUDE_CODE_THEMES.join(", ")}` }, 400);
+      }
     } else if (path8 === CONFIG_KEYS.EDITOR_APP) {
       const validApps = ["vscode", "cursor", "windsurf", "zed"];
       if (!validApps.includes(value)) {
@@ -139603,7 +139674,7 @@ app5.delete("/:key", (c) => {
 var config_default = app5;
 
 // server/routes/uploads.ts
-import { mkdir, writeFile, readFile } from "fs/promises";
+import { mkdir, writeFile, readFile, unlink } from "fs/promises";
 import { existsSync as existsSync8 } from "fs";
 import { join as join10 } from "path";
 var mimeTypes = {
@@ -139612,7 +139683,10 @@ var mimeTypes = {
   jpeg: "image/jpeg",
   gif: "image/gif",
   webp: "image/webp",
-  svg: "image/svg+xml"
+  svg: "image/svg+xml",
+  mp3: "audio/mpeg",
+  wav: "audio/wav",
+  ogg: "audio/ogg"
 };
 var app6 = new Hono2;
 function generateFilename(extension) {
@@ -139664,6 +139738,75 @@ app6.get("/:filename", async (c) => {
     headers: { "Content-Type": contentType }
   });
 });
+app6.post("/sound", async (c) => {
+  const body = await c.req.parseBody();
+  const file = body["file"];
+  if (!file || !(file instanceof File)) {
+    return c.json({ error: "No file provided" }, 400);
+  }
+  const audioMimeTypes = {
+    "audio/mpeg": "mp3",
+    "audio/mp3": "mp3",
+    "audio/wav": "wav",
+    "audio/wave": "wav",
+    "audio/ogg": "ogg"
+  };
+  const extension = audioMimeTypes[file.type];
+  if (!extension) {
+    return c.json({ error: "File must be an audio file (mp3, wav, or ogg)" }, 400);
+  }
+  const viboraDir = getViboraDir();
+  const filename = `notification-sound.${extension}`;
+  const filePath = join10(viboraDir, filename);
+  for (const ext2 of ["mp3", "wav", "ogg"]) {
+    const oldPath = join10(viboraDir, `notification-sound.${ext2}`);
+    if (existsSync8(oldPath)) {
+      try {
+        await unlink(oldPath);
+      } catch {}
+    }
+  }
+  const arrayBuffer = await file.arrayBuffer();
+  await writeFile(filePath, Buffer.from(arrayBuffer));
+  updateNotificationSettings({
+    sound: {
+      ...getNotificationSettings().sound,
+      customSoundFile: filePath
+    }
+  });
+  return c.json({ path: filePath, filename });
+});
+app6.delete("/sound", async (c) => {
+  const viboraDir = getViboraDir();
+  for (const ext2 of ["mp3", "wav", "ogg"]) {
+    const filePath = join10(viboraDir, `notification-sound.${ext2}`);
+    if (existsSync8(filePath)) {
+      try {
+        await unlink(filePath);
+      } catch {}
+    }
+  }
+  updateNotificationSettings({
+    sound: {
+      ...getNotificationSettings().sound,
+      customSoundFile: undefined
+    }
+  });
+  return c.json({ success: true });
+});
+app6.get("/sound", async (c) => {
+  const settings = getNotificationSettings();
+  const customSoundFile = settings.sound?.customSoundFile;
+  if (!customSoundFile || !existsSync8(customSoundFile)) {
+    return c.notFound();
+  }
+  const ext2 = customSoundFile.split(".").pop()?.toLowerCase() || "";
+  const contentType = mimeTypes[ext2] || "audio/mpeg";
+  const content = await readFile(customSoundFile);
+  return new Response(content, {
+    headers: { "Content-Type": contentType }
+  });
+});
 var uploads_default = app6;
 
 // node_modules/hono/dist/utils/stream.js
@@ -145071,6 +145214,7 @@ function stopPRMonitor() {
 
 // server/index.ts
 var PORT = getSettingByKey("port");
+var HOST = process.env.HOST || "localhost";
 var ptyManager2 = initPTYManager({
   onData: (terminalId, data) => {
     broadcastToTerminal(terminalId, {
@@ -145098,7 +145242,7 @@ app13.get("/ws/terminal", upgradeWebSocket(() => terminalWebSocketHandlers));
 var server = serve({
   fetch: app13.fetch,
   port: PORT,
-  hostname: "0.0.0.0"
+  hostname: HOST
 }, (info) => {
   log2.server.info("Vibora server running", {
     port: info.port,