vibora 3.9.0 → 4.3.0

package/server/index.js

@@ -14285,7 +14285,7 @@ var log2 = {
 };
 
 // server/lib/settings.ts
-var CURRENT_SCHEMA_VERSION = 3;
+var CURRENT_SCHEMA_VERSION = 4;
 var CLAUDE_CODE_THEMES = ["light", "light-ansi", "light-daltonized", "dark", "dark-ansi", "dark-daltonized"];
 var DEFAULT_SETTINGS = {
   _schemaVersion: CURRENT_SCHEMA_VERSION,
@@ -20731,13 +20731,13 @@ var ZAI_ENV_VARS = [
   "CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC"
 ];
 function getTerminalEnv() {
-  const { PORT: _PORT, ...envWithoutPort } = process.env;
+  const { PORT: _PORT, NODE_ENV: _NODE_ENV, ...envWithoutFiltered } = process.env;
   const zaiSettings = getZAiSettings();
   if (zaiSettings.enabled) {
-    return envWithoutPort;
+    return envWithoutFiltered;
   }
   const filtered = {};
-  for (const [key, value] of Object.entries(envWithoutPort)) {
+  for (const [key, value] of Object.entries(envWithoutFiltered)) {
     if (!ZAI_ENV_VARS.includes(key) && value !== undefined) {
       filtered[key] = value;
     }
@@ -20809,7 +20809,9 @@ class TerminalSession {
           TERM: "xterm-256color",
           COLORTERM: "truecolor",
           SSH_TTY: "/dev/pts/vibora",
-          SSH_CONNECTION: "127.0.0.1 0 127.0.0.1 22"
+          SSH_CONNECTION: "127.0.0.1 0 127.0.0.1 22",
+          NODE_ENV: "",
+          PORT: ""
         }
       });
       log2.terminal.info("dtach session created", { terminalId: this.id });
@@ -20846,7 +20848,9 @@ class TerminalSession {
         env: {
           ...getTerminalEnv(),
           TERM: "xterm-256color",
-          COLORTERM: "truecolor"
+          COLORTERM: "truecolor",
+          NODE_ENV: "",
+          PORT: ""
         }
       });
       this.setupPtyHandlers();
@@ -145341,11 +145345,19 @@ import * as fs4 from "fs";
 import * as path6 from "path";
 import * as os3 from "os";
 function gitExec(cwd, args) {
-  return execSync3(`git ${args}`, {
-    cwd,
-    encoding: "utf-8",
-    maxBuffer: 10 * 1024 * 1024
-  }).trim();
+  try {
+    return execSync3(`git ${args}`, {
+      cwd,
+      encoding: "utf-8",
+      maxBuffer: 10 * 1024 * 1024,
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+  } catch (err) {
+    if (err && typeof err === "object" && "stderr" in err && err.stderr) {
+      throw new Error(String(err.stderr).trim() || String(err));
+    }
+    throw err;
+  }
 }
 function parseStatusCode(code) {
   const index = code[0];
@@ -145790,10 +145802,28 @@ app3.post("/merge-to-main", async (c) => {
       if (originalBranch !== defaultBranch) {
         gitExec(repoPath, `checkout ${defaultBranch}`);
       }
+      let commitMessages = "";
+      try {
+        commitMessages = gitExec(repoPath, `log ${defaultBranch}..${worktreeBranch} --pretty=format:%s%n%b --reverse`);
+      } catch {}
+      const squashMessage = commitMessages.trim() || `Merge branch '${worktreeBranch}'`;
+      const squashMsgPath = path6.join(repoPath, ".git", "SQUASH_MSG");
       try {
         gitExec(repoPath, `merge --squash ${worktreeBranch}`);
-        gitExec(repoPath, `commit -m "Merge branch '${worktreeBranch}'"`);
+        const tempFile = path6.join(repoPath, ".git", "SQUASH_MSG_TEMP");
+        fs4.writeFileSync(tempFile, squashMessage);
+        try {
+          gitExec(repoPath, `commit -F "${tempFile}"`);
+        } finally {
+          fs4.unlinkSync(tempFile);
+          if (fs4.existsSync(squashMsgPath)) {
+            fs4.unlinkSync(squashMsgPath);
+          }
+        }
       } catch (mergeErr) {
+        if (fs4.existsSync(squashMsgPath)) {
+          fs4.unlinkSync(squashMsgPath);
+        }
         try {
           const mergeStatus = gitExec(repoPath, "status");
           if (mergeStatus.includes("Unmerged paths") || mergeStatus.includes("fix conflicts")) {
@@ -145974,6 +146004,25 @@ app3.post("/sync-parent", async (c) => {
     return c.json({ error: err instanceof Error ? err.message : "Failed to sync parent" }, 500);
   }
 });
+app3.get("/remote", (c) => {
+  let repoPath = c.req.query("path");
+  if (!repoPath) {
+    return c.json({ error: "path parameter is required" }, 400);
+  }
+  if (repoPath.startsWith("~")) {
+    repoPath = path6.join(os3.homedir(), repoPath.slice(1));
+  }
+  repoPath = path6.resolve(repoPath);
+  if (!fs4.existsSync(repoPath)) {
+    return c.json({ error: "Path does not exist" }, 404);
+  }
+  try {
+    const remoteUrl = gitExec(repoPath, "remote get-url origin");
+    return c.json({ remoteUrl });
+  } catch {
+    return c.json({ remoteUrl: null });
+  }
+});
 var git_default = app3;
 
 // server/routes/filesystem.ts
@@ -146018,7 +146067,7 @@ function buildTree(dirPath, root, depth = 0, maxDepth = 20) {
   try {
     const items = fs5.readdirSync(dirPath);
     for (const name of items) {
-      if (name.startsWith(".") || EXCLUDED_DIRECTORIES.has(name))
+      if (EXCLUDED_DIRECTORIES.has(name))
         continue;
       try {
         const itemPath = path7.join(dirPath, name);
@@ -147504,7 +147553,7 @@ var $visit = visit.visit;
 var $visitAsync = visit.visitAsync;
 
 // server/routes/copier.ts
-import { existsSync as existsSync11, readFileSync as readFileSync6, writeFileSync as writeFileSync4, unlinkSync as unlinkSync4, mkdtempSync, rmSync as rmSync5 } from "fs";
+import { existsSync as existsSync11, readFileSync as readFileSync6, writeFileSync as writeFileSync5, unlinkSync as unlinkSync5, mkdtempSync, rmSync as rmSync5 } from "fs";
 import { join as join13 } from "path";
 import { tmpdir } from "os";
 import { execSync as execSync5 } from "child_process";
@@ -147652,7 +147701,7 @@ app10.post("/create", async (c) => {
       }, 400);
     }
     const body = await c.req.json();
-    const { templateSource, outputPath, answers, projectName } = body;
+    const { templateSource, outputPath, answers, projectName, trust } = body;
     if (!templateSource || !outputPath || !projectName) {
       return c.json({ error: "templateSource, outputPath, and projectName are required" }, 400);
     }
@@ -147670,9 +147719,10 @@ app10.post("/create", async (c) => {
       filteredAnswers[key] = value;
     }
     answersFile = join13(tmpdir(), `copier-answers-${crypto.randomUUID()}.json`);
-    writeFileSync4(answersFile, JSON.stringify(filteredAnswers));
+    writeFileSync5(answersFile, JSON.stringify(filteredAnswers));
     try {
-      execSync5(`uvx copier copy --data-file "${answersFile}" --force --vcs-ref HEAD "${templatePath}" "${fullOutputPath}"`, {
+      const trustFlag = trust ? "--trust " : "";
+      execSync5(`uvx copier copy --data-file "${answersFile}" --force --vcs-ref HEAD ${trustFlag}"${templatePath}" "${fullOutputPath}"`, {
         encoding: "utf-8",
         stdio: "pipe",
         timeout: 120000
@@ -147709,7 +147759,7 @@ app10.post("/create", async (c) => {
     return c.json({ error: err instanceof Error ? err.message : "Failed to create project" }, 500);
   } finally {
     if (answersFile && existsSync11(answersFile)) {
-      unlinkSync4(answersFile);
+      unlinkSync5(answersFile);
     }
   }
 });
@@ -152395,6 +152445,28 @@ monitoringRoutes.get("/claude-usage", async (c) => {
   return c.json(usage);
 });
 
+// server/routes/system.ts
+import { execSync as execSync8 } from "child_process";
+var app13 = new Hono2;
+function isCommandAvailable(command) {
+  try {
+    const path9 = execSync8(`which ${command}`, { encoding: "utf-8" }).trim();
+    return { installed: true, path: path9 };
+  } catch {
+    return { installed: false };
+  }
+}
+app13.get("/dependencies", (c) => {
+  const claudeMissingFromEnv = process.env.VIBORA_CLAUDE_MISSING === "1";
+  const claudeCheck = claudeMissingFromEnv ? { installed: false } : isCommandAvailable("claude");
+  const dtachCheck = isCommandAvailable("dtach");
+  return c.json({
+    claudeCode: claudeCheck,
+    dtach: dtachCheck
+  });
+});
+var system_default = app13;
+
 // server/app.ts
 function getDistPath() {
   if (process.env.VIBORA_PACKAGE_ROOT) {
@@ -152403,34 +152475,35 @@ function getDistPath() {
   return join15(process.cwd(), "dist");
 }
 function createApp() {
-  const app13 = new Hono2;
-  app13.use("*", logger());
-  app13.use("*", cors({
+  const app14 = new Hono2;
+  app14.use("*", logger());
+  app14.use("*", cors({
     origin: "*",
     allowMethods: ["GET", "POST", "PATCH", "PUT", "DELETE", "OPTIONS"],
     allowHeaders: ["Content-Type"]
   }));
-  app13.route("/health", health_default);
-  app13.route("/api/tasks", tasks_default);
-  app13.route("/api/git", git_default);
-  app13.route("/api/fs", filesystem_default);
-  app13.route("/api/config", config_default);
-  app13.route("/api/uploads", uploads_default);
-  app13.route("/api/worktrees", worktrees_default);
-  app13.route("/api/terminal-view-state", terminal_view_state_default);
-  app13.route("/api/repositories", repositories_default);
-  app13.route("/api/copier", copier_default);
-  app13.route("/api/linear", linear_default);
-  app13.route("/api/github", github_default);
-  app13.route("/api/monitoring", monitoringRoutes);
-  app13.post("/api/logs", async (c) => {
+  app14.route("/health", health_default);
+  app14.route("/api/tasks", tasks_default);
+  app14.route("/api/git", git_default);
+  app14.route("/api/fs", filesystem_default);
+  app14.route("/api/config", config_default);
+  app14.route("/api/uploads", uploads_default);
+  app14.route("/api/worktrees", worktrees_default);
+  app14.route("/api/terminal-view-state", terminal_view_state_default);
+  app14.route("/api/repositories", repositories_default);
+  app14.route("/api/copier", copier_default);
+  app14.route("/api/linear", linear_default);
+  app14.route("/api/github", github_default);
+  app14.route("/api/monitoring", monitoringRoutes);
+  app14.route("/api/system", system_default);
+  app14.post("/api/logs", async (c) => {
     const { entries } = await c.req.json();
     for (const entry of entries) {
       writeEntry(entry);
     }
     return c.json({ ok: true });
   });
-  app13.post("/api/debug", async (c) => {
+  app14.post("/api/debug", async (c) => {
     const body = await c.req.json();
     const entry = {
       ts: new Date().toISOString(),
@@ -152467,14 +152540,14 @@ function createApp() {
         headers: { "Content-Type": mimeTypes2[ext2 || ""] || "application/octet-stream" }
       });
     };
-    app13.get("/assets/*", async (c) => {
+    app14.get("/assets/*", async (c) => {
       const assetPath = join15(distPath, c.req.path);
       if (existsSync13(assetPath)) {
         return serveFile(assetPath);
       }
       return c.notFound();
     });
-    app13.get("/sounds/*", async (c) => {
+    app14.get("/sounds/*", async (c) => {
       const soundPath = join15(distPath, c.req.path);
       if (existsSync13(soundPath)) {
         return serveFile(soundPath);
@@ -152483,7 +152556,7 @@ function createApp() {
     });
     const staticFiles = ["vibora-icon.png", "vibora-logo.jpeg", "vite.svg", "logo-dark.jpg", "logo-light.jpg", "goat.jpeg"];
     for (const file of staticFiles) {
-      app13.get(`/${file}`, async () => {
+      app14.get(`/${file}`, async () => {
         const filePath = join15(distPath, file);
         if (existsSync13(filePath)) {
           return serveFile(filePath);
@@ -152491,7 +152564,7 @@ function createApp() {
         return new Response("Not Found", { status: 404 });
       });
     }
-    app13.get("*", async (c, next) => {
+    app14.get("*", async (c, next) => {
       const path9 = c.req.path;
       if (path9.startsWith("/api/") || path9.startsWith("/ws/") || path9 === "/health") {
         return next();
@@ -152500,11 +152573,11 @@ function createApp() {
       return c.html(html);
     });
   }
-  return app13;
+  return app14;
 }
 
 // server/services/pr-monitor.ts
-import { execSync as execSync8 } from "child_process";
+import { execSync as execSync9 } from "child_process";
 var POLL_INTERVAL = 60000;
 function parsePrUrl(url) {
   const match3 = url.match(/github\.com\/([^/]+)\/([^/]+)\/pull\/(\d+)/);
@@ -152519,7 +152592,7 @@ function checkPrStatus(prUrl) {
     return null;
   }
   try {
-    const output = execSync8(`gh pr view ${parsed.number} --repo ${parsed.owner}/${parsed.repo} --json state,mergedAt`, { encoding: "utf-8", timeout: 1e4, stdio: ["pipe", "pipe", "pipe"] });
+    const output = execSync9(`gh pr view ${parsed.number} --repo ${parsed.owner}/${parsed.repo} --json state,mergedAt`, { encoding: "utf-8", timeout: 1e4, stdio: ["pipe", "pipe", "pipe"] });
     const data = JSON.parse(output);
     return {
       state: data.state,
@@ -152603,11 +152676,11 @@ setBroadcastDestroyed((terminalId) => {
     payload: { terminalId }
   });
 });
-var app13 = createApp();
-var { injectWebSocket, upgradeWebSocket } = createNodeWebSocket({ app: app13 });
-app13.get("/ws/terminal", upgradeWebSocket(() => terminalWebSocketHandlers));
+var app14 = createApp();
+var { injectWebSocket, upgradeWebSocket } = createNodeWebSocket({ app: app14 });
+app14.get("/ws/terminal", upgradeWebSocket(() => terminalWebSocketHandlers));
 var server = serve({
-  fetch: app13.fetch,
+  fetch: app14.fetch,
   port: PORT,
   hostname: HOST
 }, (info) => {