buddy-workbench 0.1.42 → 0.1.44

package/package.json

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

package/server/routes/file-organizer.js

@@ -91,11 +91,15 @@ router.post('/browse', async (req, res) => {
         name: e.name,
         fullPath: path.join(dirPath, e.name)
       }));
+    const files = entries
+      .filter(e => e.isFile() && !e.name.startsWith('.'))
+      .map(e => ({ name: e.name, fullPath: path.join(dirPath, e.name) }));
 
     res.json({
       currentPath: dirPath,
       parentPath: path.dirname(dirPath),
-      subdirectories: subdirs
+      subdirectories: subdirs,
+      files
     });
   } catch (err) {
     res.status(500).json({ error: err.message });

package/server/routes/jira-filters.js

@@ -270,6 +270,7 @@ router.post('/issues/clone', async (req, res) => {
     // Fetch original issue details to preserve issue type, project, description, priority
     let origIssueType = null;
     let origProjectKey = null;
+    let origSummary = null;
     let origDescription = null;
     let origPriority = null;
 
@@ -289,6 +290,9 @@ router.post('/issues/clone', async (req, res) => {
           if (fields.project?.key) {
             origProjectKey = fields.project.key;
           }
+          if (fields.summary) {
+            origSummary = String(fields.summary).trim();
+          }
           if (fields.description) {
             origDescription = fields.description;
           }
@@ -308,10 +312,12 @@ router.post('/issues/clone', async (req, res) => {
     // Determine issue type fallback: fetched original issueType -> passed issueType -> Task
     const targetIssueType = origIssueType || (issueType ? { name: issueType } : { name: 'Task' });
     const projectKey = origProjectKey || (issueKey ? issueKey.split('-')[0] : '');
+    const requestedSummary = summary.trim();
+    const cloneSummary = origSummary || requestedSummary;
     const url = `https://${jiraHost}/rest/api/2/issue`;
     const payload = {
       fields: {
-        summary: summary.trim(),
+        summary: cloneSummary,
         ...(projectKey ? { project: { key: projectKey } } : {}),
         issuetype: targetIssueType,
         ...(assigneeField ? { assignee: assigneeField } : {}),
@@ -325,7 +331,7 @@ router.post('/issues/clone', async (req, res) => {
     if (response.status !== 201 && response.status !== 200 && (origPriority || origDescription)) {
       const fallbackPayload = {
         fields: {
-          summary: summary.trim(),
+          summary: cloneSummary,
           ...(projectKey ? { project: { key: projectKey } } : {}),
           issuetype: targetIssueType,
           ...(assigneeField ? { assignee: assigneeField } : {})
@@ -355,6 +361,20 @@ router.post('/issues/clone', async (req, res) => {
       }
     }
 
+    // Clone with the original summary first, then apply the requested summary.
+    // This keeps both Clone Ticket and + Jira on the same clone-then-edit path.
+    if (createdKey && requestedSummary !== cloneSummary) {
+      const updateUrl = `https://${jiraHost}/rest/api/2/issue/${encodeURIComponent(createdKey)}`;
+      const updateResponse = await httpClient.put(updateUrl, { fields: { summary: requestedSummary } }, { headers });
+      if (updateResponse.status < 200 || updateResponse.status >= 300) {
+        const errMsg = updateResponse.data?.errorMessages?.[0] ||
+          (updateResponse.data?.errors ? Object.values(updateResponse.data.errors).join(', ') : null) ||
+          updateResponse.data?.message ||
+          `Jira summary update returned status ${updateResponse.status}`;
+        return res.status(updateResponse.status).json({ error: errMsg, createdKey });
+      }
+    }
+
     const issueUrl = `https://${jiraHost}/browse/${createdKey}`;
     if (trackRecent) {
       const recentIssue = {

package/server/routes/pr-review.js

@@ -72,9 +72,9 @@ const analyzeDiff = (filePath, hunks) => {
       let segmentText = '';
       const charToLineMap = [];
 
-      for (const line of lines) {
-        const text = line.text || '';
-        const lineNum = line.destinationLine;
+      for (const lineObj of lines) {
+        const text = lineObj.line ?? lineObj.text ?? '';
+        const lineNum = lineObj.destination ?? lineObj.destinationLine ?? 1;
         const startIdx = segmentText.length;
         segmentText += text + '\n';
         const endIdx = segmentText.length;
@@ -87,7 +87,9 @@ const analyzeDiff = (filePath, hunks) => {
             return { lineNum: item.lineNum, text: item.text };
           }
         }
-        return { lineNum: lines[0]?.destinationLine || 1, text: lines[0]?.text || '' };
+        const firstText = lines[0]?.line ?? lines[0]?.text ?? '';
+        const firstLine = lines[0]?.destination ?? lines[0]?.destinationLine ?? 1;
+        return { lineNum: firstLine, text: firstText };
       };
 
       const addIssue = (severity, rule, message, charIndex, customCode) => {
@@ -104,10 +106,10 @@ const analyzeDiff = (filePath, hunks) => {
       };
 
       // Rule 1: Object property extraction requires lodash.get
-      const propAccessRegex = /\b([a-zA-Z_$][\w$]*)\s*\.\s*([a-zA-Z_$][\w$]*)\b(?!\s*\()/g;
+      const propAccessRegex = /\b([a-zA-Z_$][\w$]*)\s*(\?\.|\.)\s*([a-zA-Z_$][\w$]*)\b(?!\s*\()/g;
       for (const match of segmentText.matchAll(propAccessRegex)) {
         const objName = match[1];
-        const propName = match[2];
+        const propName = match[3];
         const matchIdx = match.index;
 
         if (objName === 'row' && propName === 'original') continue;
@@ -116,7 +118,8 @@ const analyzeDiff = (filePath, hunks) => {
         const globalNamespaces = [
           'Math', 'Object', 'Array', 'JSON', 'Promise', 'Reflect', 'Symbol', 'Date',
           'Number', 'String', 'Boolean', 'React', 'process', 'e', 'evt', 'event',
-          'console', 'window', 'document', 'history', 'location', 'styles', 'style'
+          'console', 'window', 'document', 'history', 'location', 'styles', 'style',
+          'req', 'res'
         ];
         if (globalNamespaces.includes(objName)) continue;
 
@@ -366,7 +369,7 @@ router.post('/check', async (req, res) => {
 
   try {
     // 1. Fetch Pull Request details to show basic info
-    const prUrl = `https://${host}/rest/api/1.0/projects/${projectKey}/repos/${repositorySlug}/pull-requests/${pullRequestId}`;
+    const prUrl = `https://${host}/rest/api/latest/projects/${projectKey}/repos/${repositorySlug}/pull-requests/${pullRequestId}`;
     const prRes = await httpClient.get(prUrl, { headers });
     if (prRes.status < 200 || prRes.status >= 300) {
       if (prRes.status === 401) {
@@ -377,7 +380,7 @@ router.post('/check', async (req, res) => {
     const prInfo = prRes.data;
 
     // 2. Fetch changes
-    const changesUrl = `https://${host}/rest/api/1.0/projects/${projectKey}/repos/${repositorySlug}/pull-requests/${pullRequestId}/changes?limit=1000`;
+    const changesUrl = `https://${host}/rest/api/latest/projects/${projectKey}/repos/${repositorySlug}/pull-requests/${pullRequestId}/changes?limit=1000`;
     const changesRes = await httpClient.get(changesUrl, { headers });
     if (changesRes.status < 200 || changesRes.status >= 300) {
       return res.status(changesRes.status).json({ error: `Failed to fetch PR changes: ${changesRes.statusText || changesRes.status}`, targetUrl: changesUrl });
@@ -404,14 +407,24 @@ router.post('/check', async (req, res) => {
     let warningCount = 0;
     let infoCount = 0;
 
+    const untilCommit = prInfo.fromRef?.latestCommit || prInfo.fromRef?.id || 'HEAD';
+    const sinceCommit = prInfo.toRef?.latestCommit || prInfo.toRef?.id;
+
     for (const change of targetChanges) {
       const filePath = change.path.toString;
-      const diffUrl = `https://${host}/rest/api/1.0/projects/${projectKey}/repos/${repositorySlug}/pull-requests/${pullRequestId}/diff/${encodeURIComponent(filePath)}?context=0`;
+      let diffUrl = `https://${host}/rest/api/latest/projects/${projectKey}/repos/${repositorySlug}/commits/${encodeURIComponent(untilCommit)}/diff/${filePath}?contextLines=10000&whitespace=ignore-all&withComments=false`;
+      if (sinceCommit) diffUrl += `&since=${encodeURIComponent(sinceCommit)}`;
+
       const diffRes = await httpClient.get(diffUrl, { headers });
       if (diffRes.status < 200 || diffRes.status >= 300) continue; // skip file if diff cannot be retrieved
 
       const diffData = diffRes.data;
-      const fileIssues = analyzeDiff(filePath, diffData.hunks);
+      let hunks = diffData.hunks;
+      if (!hunks && Array.isArray(diffData.diffs)) {
+        hunks = diffData.diffs.flatMap(d => d.hunks || []);
+      }
+
+      const fileIssues = analyzeDiff(filePath, hunks || []);
 
       if (fileIssues.length > 0) {
         reviewFiles.push({
@@ -486,7 +499,7 @@ router.get('/my-prs', async (req, res) => {
   const headers = { 'Accept': 'application/json' };
   if (token) headers['Authorization'] = `Bearer ${token}`;
 
-  const url = `https://${host}/rest/api/1.0/dashboard/pull-requests?role=author&state=OPEN&limit=100`;
+  const url = `https://${host}/rest/api/latest/dashboard/pull-requests?role=author&state=OPEN&limit=100`;
   try {
     const response = await httpClient.get(url, { headers });
     if (response.status < 200 || response.status >= 300) {
@@ -520,7 +533,7 @@ router.get('/review-prs', async (req, res) => {
   const headers = { 'Accept': 'application/json' };
   if (token) headers['Authorization'] = `Bearer ${token}`;
 
-  const url = `https://${host}/rest/api/1.0/dashboard/pull-requests?role=reviewer&state=OPEN&limit=100`;
+  const url = `https://${host}/rest/api/latest/dashboard/pull-requests?role=reviewer&state=OPEN&limit=100`;
   try {
     const response = await httpClient.get(url, { headers });
     if (response.status < 200 || response.status >= 300) {
@@ -554,7 +567,7 @@ router.post('/comment', async (req, res) => {
     return res.status(400).json({ error: 'Bitbucket Access Token or Host not configured.' });
   }
 
-  const url = `https://${host}/rest/api/1.0/projects/${projectKey}/repos/${repositorySlug}/pull-requests/${pullRequestId}/comments`;
+  const url = `https://${host}/rest/api/latest/projects/${projectKey}/repos/${repositorySlug}/pull-requests/${pullRequestId}/comments`;
   const headers = {
     'Content-Type': 'application/json',
     'Accept': 'application/json',

package/server/routes/settings.js

@@ -4,7 +4,7 @@ import { paths } from '../config.js';
 import { saveAccessToken, saveClipboardDeduplicateMinutes, saveClipboardEnabled, saveClipboardImageEnabled, saveDefaultBrowser, saveDefaultEditor, saveDomain, saveJiraIssuePrefix, saveTheme, settingsStatus } from '../repositories/settings.js';
 import { getNpmPackageVersions, installNvmVersion, manageGlobalNpmPackage, readDevConfigurations, readNvmConfiguration, saveDevConfigurations, searchNpmPackages } from '../services/dev-configurations.js';
 import { openInSystemBrowser, openInSystemEditor, openInSystemFolder } from '../services/browser.js';
-import { selectDirectory } from '../services/dialog.js';
+import { selectDirectory, selectFile } from '../services/dialog.js';
 
 const router = Router();
 
@@ -93,6 +93,14 @@ router.post('/select-directory', async (_req, res) => {
     res.status(500).json({ error: error.message });
   }
 });
+router.post('/select-file', async (_req, res) => {
+  try {
+    const result = await selectFile();
+    res.json(result);
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
 router.put('/clipboard-enabled', (req, res) => {
   const { enabled } = req.body || {};
   if (typeof enabled !== 'boolean') return res.status(400).json({ error: 'Enabled must be a boolean.' });

package/server/routes/updates.js

@@ -1,4 +1,4 @@
-import { execFile } from 'node:child_process';
+import { execFile, spawn } from 'node:child_process';
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { promisify } from 'node:util';
@@ -157,7 +157,19 @@ router.post('/self-update', async (_req, res) => {
     );
     cachedResult = null;
     cachedAt = 0;
-    return res.json({ success: true, message: stdout.trim() || 'DevBuddy was updated successfully.' });
+    const message = stdout.trim() || 'DevBuddy was updated successfully.';
+    res.json({ success: true, message: `${message} Restarting DevBuddy…` });
+
+    // Let the update request finish before replacing the running server process.
+    setTimeout(() => {
+      const restartProcess = spawn(
+        process.execPath,
+        [join(root, 'bin', 'devbuddy.js'), 'restart'],
+        { cwd: root, detached: true, stdio: 'ignore', windowsHide: true }
+      );
+      restartProcess.unref();
+    }, 1000);
+    return undefined;
   } catch (error) {
     const details = error?.stderr?.trim() || error?.stdout?.trim() || error?.message;
     return res.status(500).json({ error: details || 'DevBuddy could not be updated.' });

package/server/services/dialog.js

@@ -41,3 +41,42 @@ export async function selectDirectory() {
     }
   }
 }
+
+export async function selectFile() {
+  if (process.platform === 'darwin') {
+    try {
+      const { stdout } = await execFileAsync('osascript', [
+        '-e',
+        'POSIX path of (choose file with prompt "Select SSH Key")'
+      ]);
+      const filePath = stdout.trim();
+      return filePath ? { path: filePath, canceled: false } : { path: null, canceled: true };
+    } catch {
+      return { path: null, canceled: true };
+    }
+  } else if (process.platform === 'win32') {
+    try {
+      const psScript = `
+        Add-Type -AssemblyName System.Windows.Forms
+        $dialog = New-Object System.Windows.Forms.OpenFileDialog
+        $dialog.Title = "Select SSH Key"
+        if ($dialog.ShowDialog() -eq [System.Windows.Forms.DialogResult]::OK) {
+            Write-Output $dialog.FileName
+        }
+      `;
+      const { stdout } = await execFileAsync('powershell', ['-NoProfile', '-Command', psScript]);
+      const filePath = stdout.trim();
+      return filePath ? { path: filePath, canceled: false } : { path: null, canceled: true };
+    } catch {
+      return { path: null, canceled: true };
+    }
+  } else {
+    try {
+      const { stdout } = await execFileAsync('zenity', ['--file-selection', '--title=Select SSH Key']);
+      const filePath = stdout.trim();
+      return filePath ? { path: filePath, canceled: false } : { path: null, canceled: true };
+    } catch {
+      return { path: null, canceled: true };
+    }
+  }
+}