buddy-workbench 0.1.74 → 0.1.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "buddy-workbench",
-  "version": "0.1.74",
+  "version": "0.1.76",
   "private": false,
   "type": "module",
   "bin": {

package/server/repositories/settings.js

@@ -11,6 +11,7 @@ export function settingsStatus() {
   const settings = readSettings();
   return {
     domain: typeof settings.domain === 'string' ? settings.domain : '',
+    aiApiHost: typeof settings.aiApiHost === 'string' ? settings.aiApiHost : '',
     jiraIssuePrefix: typeof settings.jiraIssuePrefix === 'string' ? settings.jiraIssuePrefix : '',
     defaultEditor: typeof settings.defaultEditor === 'string' ? settings.defaultEditor : 'vscode',
     defaultBrowser: typeof settings.defaultBrowser === 'string' ? settings.defaultBrowser : 'chrome',
@@ -26,6 +27,15 @@ export function settingsStatus() {
   };
 }
 
+export function saveAiApiHost(aiApiHost) {
+  const settings = readSettings();
+  if (aiApiHost) settings.aiApiHost = aiApiHost;
+  else delete settings.aiApiHost;
+  mkdirSync(dirname(paths.settings), { recursive: true });
+  writeFileSync(paths.settings, JSON.stringify(settings, null, 2), { mode: 0o600 });
+  return settingsStatus();
+}
+
 export function saveDomain(domain) {
   const settings = readSettings();
   if (domain) settings.domain = domain;
@@ -112,7 +122,14 @@ export function readPrReviewCustomRules() {
   return Array.isArray(settings.prReviewCustomRules) ? settings.prReviewCustomRules : [];
 }
 
-export function savePrReviewRules(rules, customRules, defaultRules) {
+export function readPrReviewFileFilters() {
+  const settings = readSettings();
+  return Array.isArray(settings.prReviewFileFilters)
+    ? settings.prReviewFileFilters.filter((pattern) => typeof pattern === 'string' && pattern.trim()).map((pattern) => pattern.trim())
+    : [];
+}
+
+export function savePrReviewRules(rules, customRules, fileFilters, defaultRules) {
   const settings = readSettings();
   const allowed = new Map(defaultRules.map((rule) => [rule.id, rule]));
   settings.prReviewRules = {};
@@ -135,9 +152,12 @@ export function savePrReviewRules(rules, customRules, defaultRules) {
       enabled: rule.enabled !== false,
       severity: ['critical', 'warning', 'info'].includes(rule.severity) ? rule.severity : 'warning'
     }));
+  settings.prReviewFileFilters = [...new Set((Array.isArray(fileFilters) ? fileFilters : [])
+    .filter((pattern) => typeof pattern === 'string' && pattern.trim())
+    .map((pattern) => pattern.trim().slice(0, 300)))].slice(0, 100);
   mkdirSync(dirname(paths.settings), { recursive: true });
   writeFileSync(paths.settings, JSON.stringify(settings, null, 2), { mode: 0o600 });
-  return { rules: readPrReviewRules(defaultRules), customRules: readPrReviewCustomRules() };
+  return { rules: readPrReviewRules(defaultRules), customRules: readPrReviewCustomRules(), fileFilters: readPrReviewFileFilters() };
 }
 
 const accessTokenFields = {

package/server/routes/branch-sync.js

@@ -355,7 +355,7 @@ router.post('/create-pr', async (req, res) => {
 
   const prPayload = {
     title: title || `Merge ${sourceBranch} to ${targetBranch}`,
-    description: `Automated Pull Request created via DevBuddy Branch Sync Status Check.\n\nMerging \`${sourceBranch}\` into \`${targetBranch}\`.`,
+    description: `Automated Pull Request created.\n\nMerging \`${sourceBranch}\` into \`${targetBranch}\`.`,
     fromRef: {
       id: `refs/heads/${sourceBranch}`,
       repository: {

package/server/routes/pr-conflicts.js

@@ -118,13 +118,62 @@ function pathOf(change) {
   return change?.path?.toString || change?.path?.name || change?.path || change?.src?.toString || '';
 }
 
+function extractTextFromContent(data) {
+  if (data === null || data === undefined) return '';
+  if (typeof data === 'object') {
+    if (Array.isArray(data.lines)) {
+      return data.lines.map((line) => {
+        if (typeof line === 'string') return line;
+        if (line && typeof line.text === 'string') return line.text;
+        return typeof line === 'object' && line !== null ? (line.text ?? JSON.stringify(line)) : String(line ?? '');
+      }).join('\n');
+    }
+    if (typeof data.text === 'string') return data.text;
+    return JSON.stringify(data);
+  }
+  if (typeof data === 'string') {
+    const trimmed = data.trim();
+    if (trimmed.startsWith('{') && (trimmed.includes('"lines"') || trimmed.includes('"text"'))) {
+      try {
+        const parsed = JSON.parse(trimmed);
+        if (Array.isArray(parsed?.lines)) {
+          return parsed.lines.map((line) => {
+            if (typeof line === 'string') return line;
+            if (line && typeof line.text === 'string') return line.text;
+            return typeof line === 'object' && line !== null ? (line.text ?? JSON.stringify(line)) : String(line ?? '');
+          }).join('\n');
+        }
+        if (typeof parsed?.text === 'string') return parsed.text;
+      } catch {}
+    }
+    return data;
+  }
+  return String(data);
+}
+
 async function readFile({ host, projectKey, repositorySlug, commit, path }) {
   if (!commit || !path) return '';
-  const url = `https://${host}/rest/api/latest/projects/${encodeURIComponent(projectKey)}/repos/${encodeURIComponent(repositorySlug)}/browse/${path.split('/').map(encodeURIComponent).join('/')}?at=${encodeURIComponent(commit)}&raw=true`;
-  const response = await client.get(url, { headers: authHeaders(), responseType: 'text' });
-  if (response.status < 200 || response.status >= 300) return '';
-  if (typeof response.data === 'string') return response.data;
-  return (response.data.lines || []).map((line) => line.text ?? line).join('\n');
+  const encodedPath = path.split('/').map(encodeURIComponent).join('/');
+
+  // 1. Try raw endpoint first (returns pure plaintext)
+  const rawUrl = `https://${host}/rest/api/latest/projects/${encodeURIComponent(projectKey)}/repos/${encodeURIComponent(repositorySlug)}/raw/${encodedPath}?at=${encodeURIComponent(commit)}`;
+  try {
+    const rawRes = await client.get(rawUrl, { headers: authHeaders(), responseType: 'text' });
+    if (rawRes.status >= 200 && rawRes.status < 300 && rawRes.data !== undefined) {
+      return extractTextFromContent(rawRes.data);
+    }
+  } catch {}
+
+  // 2. Fallback to browse endpoint with limit=10000
+  const browseUrl = `https://${host}/rest/api/latest/projects/${encodeURIComponent(projectKey)}/repos/${encodeURIComponent(repositorySlug)}/browse/${encodedPath}?at=${encodeURIComponent(commit)}&limit=10000`;
+  try {
+    const response = await client.get(browseUrl, { headers: authHeaders(), responseType: 'text' });
+    if (response.status >= 200 && response.status < 300 && response.data !== undefined) {
+      return extractTextFromContent(response.data);
+    }
+  } catch {}
+
+  return '';
 }
 
 router.post('/load', async (req, res) => {