markupr 2.6.3 → 2.6.5

package/dist/mcp/index.mjs

@@ -24,7 +24,7 @@ import { resolve } from "path";
 
 // src/mcp/utils/Logger.ts
 function log(message) {
-  process.stderr.write(`[markupr-mcp] ${message}
+  process.stderr.write(`[markupR-mcp] ${message}
 `);
 }
 
@@ -246,6 +246,141 @@ var SessionStore = class {
 };
 var sessionStore = new SessionStore();
 
+// src/mcp/utils/CaptureContext.ts
+import { execFile as execFileCb2 } from "child_process";
+var SAFE_CHILD_ENV2 = {
+  PATH: process.env.PATH,
+  HOME: process.env.HOME || process.env.USERPROFILE,
+  USERPROFILE: process.env.USERPROFILE,
+  LANG: process.env.LANG,
+  TMPDIR: process.env.TMPDIR || process.env.TEMP,
+  TEMP: process.env.TEMP
+};
+var MAC_CONTEXT_PROBE_JXA = `
+ObjC.import('AppKit');
+ObjC.import('CoreGraphics');
+ObjC.import('ApplicationServices');
+
+function unwrap(v) {
+  try { return ObjC.unwrap(v); } catch (_) { return null; }
+}
+
+function readAttr(el, attr) {
+  var ref = Ref();
+  var err = $.AXUIElementCopyAttributeValue(el, attr, ref);
+  if (err !== 0) return null;
+  return unwrap(ref[0]);
+}
+
+var out = {};
+var event = $.CGEventCreate(null);
+if (event) {
+  var p = $.CGEventGetLocation(event);
+  out.cursor = { x: Math.round(p.x), y: Math.round(p.y) };
+}
+
+var front = $.NSWorkspace.sharedWorkspace.frontmostApplication;
+if (front) {
+  var pid = Number(front.processIdentifier);
+  out.activeWindow = {
+    appName: unwrap(front.localizedName) || undefined,
+    pid: pid
+  };
+
+  var appEl = $.AXUIElementCreateApplication(pid);
+  var focusedWindow = readAttr(appEl, $.kAXFocusedWindowAttribute);
+  if (focusedWindow) {
+    var winTitle = readAttr(focusedWindow, $.kAXTitleAttribute);
+    if (winTitle) out.activeWindow.title = String(winTitle);
+  }
+
+  var focused = readAttr(appEl, $.kAXFocusedUIElementAttribute);
+  if (focused) {
+    out.focusedElement = {
+      role: readAttr(focused, $.kAXRoleAttribute) || undefined,
+      title: readAttr(focused, $.kAXTitleAttribute) || undefined,
+      description: readAttr(focused, $.kAXDescriptionAttribute) || undefined,
+      value: readAttr(focused, $.kAXValueAttribute) || undefined,
+    };
+  }
+}
+
+JSON.stringify(out);
+`;
+function sanitizeText(value, maxLength = 140) {
+  if (!value) return void 0;
+  const normalized = value.replace(/\s+/g, " ").trim();
+  if (!normalized) return void 0;
+  return normalized.slice(0, maxLength);
+}
+function runMacContextProbe(timeoutMs) {
+  return new Promise((resolve4) => {
+    execFileCb2(
+      "osascript",
+      ["-l", "JavaScript", "-e", MAC_CONTEXT_PROBE_JXA],
+      { env: SAFE_CHILD_ENV2, timeout: timeoutMs },
+      (error, stdout) => {
+        if (error) {
+          resolve4(null);
+          return;
+        }
+        try {
+          const parsed = JSON.parse(stdout.toString().trim());
+          resolve4(parsed);
+        } catch {
+          resolve4(null);
+        }
+      }
+    );
+  });
+}
+async function captureContextSnapshot() {
+  const snapshot = {
+    recordedAt: Date.now()
+  };
+  if (process.platform !== "darwin") {
+    return snapshot;
+  }
+  const context = await runMacContextProbe(550);
+  if (!context) {
+    return snapshot;
+  }
+  if (context.cursor && Number.isFinite(context.cursor.x) && Number.isFinite(context.cursor.y)) {
+    snapshot.cursor = {
+      x: Number(context.cursor.x),
+      y: Number(context.cursor.y)
+    };
+  }
+  if (context.activeWindow) {
+    snapshot.activeWindow = {
+      appName: sanitizeText(context.activeWindow.appName, 120),
+      title: sanitizeText(context.activeWindow.title, 160),
+      pid: Number.isFinite(context.activeWindow.pid) ? Number(context.activeWindow.pid) : void 0
+    };
+  }
+  if (context.focusedElement) {
+    const textPreview = sanitizeText(context.focusedElement.value, 120) || sanitizeText(context.focusedElement.title, 120) || sanitizeText(context.focusedElement.description, 120);
+    if (textPreview || context.focusedElement.role) {
+      snapshot.focusedElement = {
+        source: "os-accessibility",
+        role: sanitizeText(context.focusedElement.role, 80),
+        textPreview,
+        appName: snapshot.activeWindow?.appName,
+        windowTitle: snapshot.activeWindow?.title
+      };
+    }
+  }
+  if (!snapshot.focusedElement && (snapshot.activeWindow?.title || snapshot.activeWindow?.appName)) {
+    snapshot.focusedElement = {
+      source: "window-title",
+      textPreview: snapshot.activeWindow?.title || snapshot.activeWindow?.appName,
+      appName: snapshot.activeWindow?.appName,
+      windowTitle: snapshot.activeWindow?.title
+    };
+  }
+  return snapshot;
+}
+
 // src/mcp/tools/captureScreenshot.ts
 function register(server) {
   server.tool(
@@ -265,18 +400,40 @@ function register(server) {
         const index = existing.filter((f) => f.startsWith("screenshot-")).length + 1;
         const filename = `screenshot-${String(index).padStart(3, "0")}.png`;
         const outputPath = join2(screenshotsDir, filename);
+        const context = await captureContextSnapshot();
         log(`Capturing screenshot: display=${display}, label=${label ?? "none"}`);
         await capture({ display, outputPath });
         if (shouldOptimize) {
           await optimize(outputPath);
         }
+        const latestMetadata = await sessionStore.get(session.id);
+        const existingCaptures = latestMetadata?.captures ?? [];
+        await sessionStore.update(session.id, {
+          lastCaptureContext: context,
+          captures: [
+            ...existingCaptures,
+            {
+              file: filename,
+              label,
+              display,
+              capturedAt: context.recordedAt,
+              context
+            }
+          ].slice(-250)
+        });
         const markdownRef = `![${label ?? filename}](screenshots/${filename})`;
+        const contextSummary = [
+          context.cursor ? `Cursor: ${Math.round(context.cursor.x)}, ${Math.round(context.cursor.y)}` : "",
+          context.activeWindow?.appName ? `App: ${context.activeWindow.appName}` : "",
+          context.focusedElement?.textPreview ? `Focus: ${context.focusedElement.textPreview}` : ""
+        ].filter(Boolean).join(" | ");
         return {
           content: [
             {
               type: "text",
               text: `Screenshot saved: ${outputPath}
-${markdownRef}`
+${markdownRef}${contextSummary ? `
+Context: ${contextSummary}` : ""}`
             }
           ]
         };
@@ -295,10 +452,10 @@ import { z as z2 } from "zod";
 import { join as join6 } from "path";
 
 // src/mcp/capture/ScreenRecorder.ts
-import { execFile as execFileCb2 } from "child_process";
+import { execFile as execFileCb3 } from "child_process";
 import { stat as stat2 } from "fs/promises";
 import { resolve as resolve3 } from "path";
-var SAFE_CHILD_ENV2 = {
+var SAFE_CHILD_ENV3 = {
   PATH: process.env.PATH,
   HOME: process.env.HOME || process.env.USERPROFILE,
   USERPROFILE: process.env.USERPROFILE,
@@ -338,10 +495,10 @@ async function record(options) {
   const args = buildFfmpegArgs(outputPath, videoDevice, audioDevice, duration);
   log(`Recording screen+audio: duration=${duration}s, output=${outputPath}`);
   await new Promise((resolve4, reject) => {
-    execFileCb2(
+    execFileCb3(
       "ffmpeg",
       args,
-      { env: SAFE_CHILD_ENV2, timeout: (duration + 30) * 1e3 },
+      { env: SAFE_CHILD_ENV3, timeout: (duration + 30) * 1e3 },
       (error) => {
         if (error) {
           reject(
@@ -366,10 +523,10 @@ function start(options) {
   const audioDevice = options.audioDevice ?? "default";
   const args = buildFfmpegArgs(outputPath, videoDevice, audioDevice);
   log(`Starting long-form recording: output=${outputPath}`);
-  const child = execFileCb2(
+  const child = execFileCb3(
     "ffmpeg",
     args,
-    { env: SAFE_CHILD_ENV2 },
+    { env: SAFE_CHILD_ENV3 },
     (error) => {
       if (error && !error.killed) {
         log(`Recording process exited with error: ${error.message}`);
@@ -422,7 +579,7 @@ Check Screen Recording and Microphone permissions in System Settings \u2192 Priv
 import { existsSync as existsSync3, mkdirSync as mkdirSync2 } from "fs";
 import { stat as stat3, unlink as unlink2, writeFile as writeFile2, chmod as chmod2 } from "fs/promises";
 import { join as join5, basename as basename3 } from "path";
-import { execFile as execFileCb4 } from "child_process";
+import { execFile as execFileCb5 } from "child_process";
 import { tmpdir as tmpdir2 } from "os";
 import { randomUUID as randomUUID2 } from "crypto";
 
@@ -564,19 +721,19 @@ var TranscriptAnalyzer = class {
 var transcriptAnalyzer = new TranscriptAnalyzer();
 
 // src/main/pipeline/FrameExtractor.ts
-import { execFile as execFileCb3 } from "child_process";
+import { execFile as execFileCb4 } from "child_process";
 import { promisify } from "util";
 import { existsSync, mkdirSync } from "fs";
 import { stat as statFile } from "fs/promises";
 import { join as join3 } from "path";
-var execFile = promisify(execFileCb3);
+var execFile = promisify(execFileCb4);
 var DEFAULT_MAX_FRAMES = 20;
 var FFMPEG_ACCURATE_FRAME_TIMEOUT_MS = 2e4;
 var FFMPEG_FAST_FRAME_TIMEOUT_MS = 1e4;
 var FFMPEG_CHECK_TIMEOUT_MS = 5e3;
 var FRAME_EDGE_MARGIN_SECONDS2 = 0.35;
 var TIMESTAMP_DEDUPE_WINDOW_SECONDS = 0.15;
-var SAFE_CHILD_ENV3 = {
+var SAFE_CHILD_ENV4 = {
   PATH: process.env.PATH,
   HOME: process.env.HOME || process.env.USERPROFILE,
   USERPROFILE: process.env.USERPROFILE,
@@ -600,7 +757,7 @@ var FrameExtractor = class {
     try {
       await execFile(this.ffmpegPath, ["-version"], {
         timeout: FFMPEG_CHECK_TIMEOUT_MS,
-        env: SAFE_CHILD_ENV3
+        env: SAFE_CHILD_ENV4
       });
       this.ffmpegAvailable = true;
       this.log("ffmpeg is available");
@@ -699,7 +856,7 @@ var FrameExtractor = class {
     ];
     await execFile(this.ffmpegPath, args, {
       timeout: FFMPEG_ACCURATE_FRAME_TIMEOUT_MS,
-      env: SAFE_CHILD_ENV3
+      env: SAFE_CHILD_ENV4
     });
   }
   async extractSingleFrameFast(videoPath, timestamp, outputPath) {
@@ -720,7 +877,7 @@ var FrameExtractor = class {
     ];
     await execFile(this.ffmpegPath, args, {
       timeout: FFMPEG_FAST_FRAME_TIMEOUT_MS,
-      env: SAFE_CHILD_ENV3
+      env: SAFE_CHILD_ENV4
     });
   }
   /**
@@ -759,7 +916,7 @@ var FrameExtractor = class {
           "default=noprint_wrappers=1:nokey=1",
           videoPath
         ],
-        { timeout: FFMPEG_CHECK_TIMEOUT_MS, env: SAFE_CHILD_ENV3 }
+        { timeout: FFMPEG_CHECK_TIMEOUT_MS, env: SAFE_CHILD_ENV4 }
       );
       const parsed = Number.parseFloat(String(stdout).trim());
       if (Number.isFinite(parsed) && parsed > 0) {
@@ -817,13 +974,13 @@ var MarkdownGeneratorImpl = class {
     const filename = this.generateFilename(projectName, session.startTime);
     if (items.length === 0) {
       const content2 = `# ${projectName} Feedback Report
-> Generated by markupr on ${timestamp}
+> Generated by markupR on ${timestamp}
 > Duration: ${duration}
 
 _No feedback items were captured during this session._
 
 ---
-*Generated by [markupr](https://markupr.com)*
+*Generated by [markupR](https://markupr.com)*
 ${REPORT_SUPPORT_LINE}
 `;
       return {
@@ -844,7 +1001,7 @@ ${REPORT_SUPPORT_LINE}
     const highImpactCount = (severityCounts.Critical || 0) + (severityCounts.High || 0);
     const platform = session.metadata?.os || process?.platform || "Unknown";
     let content = `# ${projectName} Feedback Report
-> Generated by markupr on ${timestamp}
+> Generated by markupR on ${timestamp}
 > Duration: ${duration} | Items: ${items.length} | Screenshots: ${screenshotCount}
 
 ## Session Overview
@@ -941,7 +1098,7 @@ _No screenshot captured for this item._
 `;
     content += `
 ---
-*Generated by [markupr](https://markupr.com)*
+*Generated by [markupR](https://markupr.com)*
 ${REPORT_SUPPORT_LINE}
 `;
     return {
@@ -974,7 +1131,7 @@ ${REPORT_SUPPORT_LINE}
     const sessionDuration = transcriptSegments.length > 0 ? this.formatDuration(
       (transcriptSegments[transcriptSegments.length - 1].endTime - transcriptSegments[0].startTime) * 1e3
     ) : "0:00";
-    let md = `# markupr Session \u2014 ${sessionTimestamp}
+    let md = `# markupR Session \u2014 ${sessionTimestamp}
 `;
     md += `> Segments: ${transcriptSegments.length} | Frames: ${extractedFrames.length} | Duration: ${sessionDuration}
 
@@ -1005,11 +1162,17 @@ ${REPORT_SUPPORT_LINE}
           md += `![Frame at ${frameTimestamp}](${relativePath})
 
 `;
+          const contextLine = this.formatCaptureContextLine(frame.captureContext);
+          if (contextLine) {
+            md += `> ${contextLine}
+
+`;
+          }
         }
       }
     }
     md += `---
-*Generated by [markupr](https://markupr.com)*
+*Generated by [markupR](https://markupr.com)*
 ${REPORT_SUPPORT_LINE}
 `;
     return md;
@@ -1056,6 +1219,16 @@ ${REPORT_SUPPORT_LINE}
     }
     return path2.relative(sessionDir, framePath);
   }
+  formatCaptureContextLine(context) {
+    if (!context) {
+      return void 0;
+    }
+    const cursor = context.cursor ? `Cursor: ${Math.round(context.cursor.x)}, ${Math.round(context.cursor.y)}` : void 0;
+    const app = context.activeWindow?.appName || context.activeWindow?.sourceName;
+    const focus = context.focusedElement?.textPreview || context.focusedElement?.label || context.focusedElement?.role;
+    const parts = [cursor, app ? `App: ${app}` : void 0, focus ? `Focus: ${focus}` : void 0].filter((part) => Boolean(part));
+    return parts.length ? parts.join(" | ") : void 0;
+  }
   /**
    * Format a timestamp in seconds to M:SS format for post-process output.
    * Examples: 0 -> "0:00", 15.3 -> "0:15", 125 -> "2:05"
@@ -2004,7 +2177,7 @@ var markdownTemplate = {
     const { transcriptSegments, extractedFrames } = result;
     const sessionTimestamp = formatDate(new Date(timestamp ?? Date.now()));
     const sessionDuration = computeSessionDuration(transcriptSegments);
-    let md = `# markupr Session \u2014 ${sessionTimestamp}
+    let md = `# markupR Session \u2014 ${sessionTimestamp}
 `;
     md += `> Segments: ${transcriptSegments.length} | Frames: ${extractedFrames.length} | Duration: ${sessionDuration}
 
@@ -2035,11 +2208,20 @@ var markdownTemplate = {
           md += `![Frame at ${frameTimestamp}](${relativePath})
 
 `;
+          const cursor = frame.captureContext?.cursor ? `Cursor: ${Math.round(frame.captureContext.cursor.x)}, ${Math.round(frame.captureContext.cursor.y)}` : void 0;
+          const app = frame.captureContext?.activeWindow?.appName || frame.captureContext?.activeWindow?.sourceName;
+          const focus = frame.captureContext?.focusedElement?.textPreview || frame.captureContext?.focusedElement?.label || frame.captureContext?.focusedElement?.role;
+          const contextLine = [cursor, app ? `App: ${app}` : void 0, focus ? `Focus: ${focus}` : void 0].filter(Boolean).join(" | ");
+          if (contextLine) {
+            md += `> ${contextLine}
+
+`;
+          }
         }
       }
     }
     md += `---
-*Generated by [markupr](https://markupr.com)*
+*Generated by [markupR](https://markupr.com)*
 ${REPORT_SUPPORT_LINE2}
 `;
     return { content: md, fileExtension: ".md" };
@@ -2057,7 +2239,7 @@ var jsonTemplate = {
     const segmentFrameMap = mapFramesToSegments(transcriptSegments, extractedFrames);
     const output = {
       version: "1.0",
-      generator: "markupr",
+      generator: "markupR",
       timestamp: new Date(timestamp ?? Date.now()).toISOString(),
       summary: {
         segments: transcriptSegments.length,
@@ -2074,7 +2256,8 @@ var jsonTemplate = {
           frames: frames.map((f) => ({
             path: computeRelativeFramePath(f.path, sessionDir),
             timestamp: f.timestamp,
-            reason: f.reason
+            reason: f.reason,
+            captureContext: f.captureContext
           }))
         };
       })
@@ -2099,7 +2282,7 @@ var githubIssueTemplate = {
     let md = `## Feedback Report
 
 `;
-    md += `> Captured by [markupr](https://markupr.com) on ${sessionTimestamp}
+    md += `> Captured by [markupR](https://markupr.com) on ${sessionTimestamp}
 `;
     md += `> ${transcriptSegments.length} segments | ${extractedFrames.length} frames | Duration: ${duration}
 
@@ -2149,7 +2332,7 @@ var githubIssueTemplate = {
 `;
     }
     md += `---
-_Generated by [markupr](https://markupr.com)_
+_Generated by [markupR](https://markupr.com)_
 `;
     return { content: md, fileExtension: ".md" };
   }
@@ -2209,7 +2392,7 @@ var linearTemplate = {
       }
     }
     md += `---
-_Captured by [markupr](https://markupr.com)_
+_Captured by [markupR](https://markupr.com)_
 `;
     return { content: md, fileExtension: ".md" };
   }
@@ -2283,7 +2466,7 @@ ${segment.text}
       }
     }
     content += `----
-_Generated by [markupr|https://markupr.com]_
+_Generated by [markupR|https://markupr.com]_
 `;
     return { content, fileExtension: ".jira" };
   }
@@ -2361,8 +2544,15 @@ var CLIPipeline = class _CLIPipeline {
     const result = {
       transcriptSegments: segments,
       extractedFrames,
-      reportPath: this.options.outputDir
+      reportPath: this.options.outputDir,
+      captureContexts: this.normalizeCaptureContexts(this.options.captureContexts || [])
     };
+    if (result.captureContexts && result.captureContexts.length > 0 && result.extractedFrames.length > 0) {
+      result.extractedFrames = this.attachCaptureContextsToFrames(
+        result.extractedFrames,
+        result.captureContexts
+      );
+    }
     let reportContent;
     let reportExtension = ".md";
     const templateName = this.options.template;
@@ -2440,7 +2630,7 @@ var CLIPipeline = class _CLIPipeline {
   };
   execFileTracked(command, args) {
     return new Promise((resolve4, reject) => {
-      const child = execFileCb4(command, args, { env: _CLIPipeline.SAFE_CHILD_ENV }, (error, stdout, stderr) => {
+      const child = execFileCb5(command, args, { env: _CLIPipeline.SAFE_CHILD_ENV }, (error, stdout, stderr) => {
         this.activeProcesses.delete(child);
         if (error) reject(error);
         else resolve4({ stdout: stdout?.toString() ?? "", stderr: stderr?.toString() ?? "" });
@@ -2448,6 +2638,38 @@ var CLIPipeline = class _CLIPipeline {
       this.activeProcesses.add(child);
     });
   }
+  normalizeCaptureContexts(contexts) {
+    return contexts.filter((context) => Number.isFinite(context.recordedAt)).slice().sort((a, b) => a.recordedAt - b.recordedAt);
+  }
+  attachCaptureContextsToFrames(frames, contexts) {
+    const earliestContext = contexts[0]?.recordedAt;
+    if (!Number.isFinite(earliestContext)) {
+      return frames;
+    }
+    const maxDistanceMs = 5e3;
+    return frames.map((frame) => {
+      const frameAtMs = Number(earliestContext) + Math.round(frame.timestamp * 1e3);
+      let bestMatch;
+      let bestDistance = Number.POSITIVE_INFINITY;
+      for (const context of contexts) {
+        const distance = Math.abs(frameAtMs - context.recordedAt);
+        if (distance < bestDistance) {
+          bestDistance = distance;
+          bestMatch = context;
+        }
+        if (context.recordedAt > frameAtMs && distance > bestDistance) {
+          break;
+        }
+      }
+      if (!bestMatch || bestDistance > maxDistanceMs) {
+        return frame;
+      }
+      return {
+        ...frame,
+        captureContext: bestMatch
+      };
+    });
+  }
   /**
    * Validate the video file is a real, non-empty file with a video stream.
    */
@@ -2709,10 +2931,33 @@ var CLIPipelineError = class extends Error {
 };
 
 // src/mcp/tools/captureWithVoice.ts
+function toSharedCaptureContext(context) {
+  if (!context) {
+    return void 0;
+  }
+  return {
+    recordedAt: context.recordedAt,
+    trigger: "manual",
+    cursor: context.cursor,
+    activeWindow: {
+      appName: context.activeWindow?.appName,
+      title: context.activeWindow?.title,
+      pid: context.activeWindow?.pid,
+      sourceType: "screen"
+    },
+    focusedElement: context.focusedElement ? {
+      source: context.focusedElement.source,
+      role: context.focusedElement.role,
+      textPreview: context.focusedElement.textPreview,
+      appName: context.focusedElement.appName,
+      windowTitle: context.focusedElement.windowTitle
+    } : void 0
+  };
+}
 function register2(server) {
   server.tool(
     "capture_with_voice",
-    "Record screen and voice for a specified duration, then run the full markupr pipeline to produce a structured feedback report.",
+    "Record screen and voice for a specified duration, then run the full markupR pipeline to produce a structured feedback report.",
     {
       duration: z2.number().min(3).max(300).describe("Recording duration in seconds (3-300)"),
       outputDir: z2.string().optional().describe("Output directory (default: session directory)"),
@@ -2724,10 +2969,26 @@ function register2(server) {
     async ({ duration, outputDir, skipFrames, template }) => {
       try {
         const session = await sessionStore.create();
+        const startContext = await captureContextSnapshot();
+        await sessionStore.update(session.id, {
+          recordingContextStart: startContext,
+          lastCaptureContext: startContext
+        });
         const sessionDir = sessionStore.getSessionDir(session.id);
         const videoPath = join6(sessionDir, "recording.mp4");
         log(`Starting capture_with_voice: duration=${duration}s`);
         await record({ duration, outputPath: videoPath });
+        const stopContext = await captureContextSnapshot();
+        await sessionStore.update(session.id, {
+          recordingContextStop: stopContext,
+          lastCaptureContext: stopContext
+        });
+        const metadataBeforePipeline = await sessionStore.get(session.id);
+        const captureContexts = [
+          toSharedCaptureContext(metadataBeforePipeline?.recordingContextStart),
+          ...(metadataBeforePipeline?.captures || []).map((capture2) => toSharedCaptureContext(capture2.context)),
+          toSharedCaptureContext(stopContext)
+        ].filter((context) => Boolean(context));
         const pipelineOutputDir = outputDir ?? sessionDir;
         const pipeline = new CLIPipeline(
           {
@@ -2735,7 +2996,8 @@ function register2(server) {
             outputDir: pipelineOutputDir,
             skipFrames,
             template,
-            verbose: false
+            verbose: false,
+            captureContexts
           },
           (msg) => log(msg)
         );
@@ -2744,7 +3006,9 @@ function register2(server) {
           status: "complete",
           endTime: Date.now(),
           videoPath,
-          reportPath: result.outputPath
+          reportPath: result.outputPath,
+          recordingContextStop: stopContext,
+          lastCaptureContext: stopContext
         });
         return {
           content: [
@@ -2779,7 +3043,7 @@ import { stat as stat4 } from "fs/promises";
 function register3(server) {
   server.tool(
     "analyze_video",
-    "Process an existing video file through the markupr pipeline. Generates a structured markdown report with transcript, key moments, and extracted frames.",
+    "Process an existing video file through the markupR pipeline. Generates a structured markdown report with transcript, key moments, and extracted frames.",
     {
       videoPath: z3.string().describe("Absolute path to the video file"),
       audioPath: z3.string().optional().describe("Separate audio file path (if not embedded)"),
@@ -2991,6 +3255,11 @@ function register5(server) {
           };
         }
         const session = await sessionStore.create(label);
+        const startContext = await captureContextSnapshot();
+        await sessionStore.update(session.id, {
+          recordingContextStart: startContext,
+          lastCaptureContext: startContext
+        });
         const sessionDir = sessionStore.getSessionDir(session.id);
         const videoPath = join8(sessionDir, "recording.mp4");
         log(`Starting long-form recording: session=${session.id}`);
@@ -3021,10 +3290,33 @@ function register5(server) {
 
 // src/mcp/tools/stopRecording.ts
 import { z as z6 } from "zod";
+function toSharedCaptureContext2(context) {
+  if (!context) {
+    return void 0;
+  }
+  return {
+    recordedAt: context.recordedAt,
+    trigger: "manual",
+    cursor: context.cursor,
+    activeWindow: {
+      appName: context.activeWindow?.appName,
+      title: context.activeWindow?.title,
+      pid: context.activeWindow?.pid,
+      sourceType: "screen"
+    },
+    focusedElement: context.focusedElement ? {
+      source: context.focusedElement.source,
+      role: context.focusedElement.role,
+      textPreview: context.focusedElement.textPreview,
+      appName: context.focusedElement.appName,
+      windowTitle: context.focusedElement.windowTitle
+    } : void 0
+  };
+}
 function register6(server) {
   server.tool(
     "stop_recording",
-    "Stop an active recording and run the full markupr pipeline on the captured video.",
+    "Stop an active recording and run the full markupR pipeline on the captured video.",
     {
       sessionId: z6.string().optional().describe("Session ID (default: current active recording)"),
       skipFrames: z6.boolean().optional().default(false).describe("Skip frame extraction"),
@@ -3050,7 +3342,14 @@ function register6(server) {
         log(`Stopping recording: session=${current.sessionId}`);
         await stop(current.process);
         const { sessionId, videoPath } = activeRecording.stop();
+        const stopContext = await captureContextSnapshot();
         await sessionStore.update(sessionId, { status: "processing" });
+        const metadataBeforePipeline = await sessionStore.get(sessionId);
+        const captureContexts = [
+          toSharedCaptureContext2(metadataBeforePipeline?.recordingContextStart),
+          ...(metadataBeforePipeline?.captures || []).map((capture2) => toSharedCaptureContext2(capture2.context)),
+          toSharedCaptureContext2(stopContext)
+        ].filter((context) => Boolean(context));
         const sessionDir = sessionStore.getSessionDir(sessionId);
         const pipeline = new CLIPipeline(
           {
@@ -3058,7 +3357,8 @@ function register6(server) {
             outputDir: sessionDir,
             skipFrames,
             template,
-            verbose: false
+            verbose: false,
+            captureContexts
           },
           (msg) => log(msg)
         );
@@ -3067,7 +3367,9 @@ function register6(server) {
           status: "complete",
           endTime: Date.now(),
           videoPath,
-          reportPath: result.outputPath
+          reportPath: result.outputPath,
+          recordingContextStop: stopContext,
+          lastCaptureContext: stopContext
         });
         return {
           content: [
@@ -3128,7 +3430,7 @@ var LinearIssueCreator = class {
     this.token = token;
   }
   /**
-   * Push a markupr report to Linear, creating one issue per feedback item.
+   * Push a markupR report to Linear, creating one issue per feedback item.
    */
   async pushReport(reportPath, options) {
     const markdown = await readFile4(reportPath, "utf-8");
@@ -3292,7 +3594,7 @@ var LinearIssueCreator = class {
    * Build markdown description for a Linear issue from a feedback item.
    */
   buildIssueDescription(item) {
-    let desc = `## markupr Feedback: ${item.id}
+    let desc = `## markupR Feedback: ${item.id}
 
 `;
     desc += `**Severity:** ${item.severity}
@@ -3327,7 +3629,7 @@ ${item.suggestedAction}
     }
     desc += `
 ---
-*Created by [markupr](https://markupr.com)*`;
+*Created by [markupR](https://markupr.com)*`;
     return desc;
   }
   /**
@@ -3417,9 +3719,9 @@ function extractSuggestedAction(section) {
 function register7(server) {
   server.tool(
     "push_to_linear",
-    "Push a markupr feedback report to Linear. Creates one issue per feedback item with priority mapping, labels, and full context.",
+    "Push a markupR feedback report to Linear. Creates one issue per feedback item with priority mapping, labels, and full context.",
     {
-      reportPath: z7.string().describe("Absolute path to the markupr markdown report"),
+      reportPath: z7.string().describe("Absolute path to the markupR markdown report"),
       teamKey: z7.string().describe('Linear team key (e.g., "ENG", "DES")'),
       token: z7.string().optional().describe("Linear API key (or set LINEAR_API_KEY env var)"),
       projectName: z7.string().optional().describe("Linear project name to assign issues to"),
@@ -3530,9 +3832,9 @@ var SEVERITY_LABELS = {
   Low: { name: "priority: low", color: "0e8a16", description: "Low priority" }
 };
 var MARKUPR_LABEL = {
-  name: "markupr",
+  name: "markupR",
   color: "6f42c1",
-  description: "Created from markupr feedback session"
+  description: "Created from markupR feedback session"
 };
 
 // src/integrations/github/GitHubIssueCreator.ts
@@ -3658,7 +3960,7 @@ function formatIssueBody(item, reportPath) {
     body += `### Screenshots
 
 `;
-    body += `_${item.screenshotPaths.length} screenshot(s) captured \u2014 see the markupr report for images._
+    body += `_${item.screenshotPaths.length} screenshot(s) captured \u2014 see the markupR report for images._
 
 `;
   }
@@ -3676,7 +3978,7 @@ function formatIssueBody(item, reportPath) {
     body += `_Source: \`${reportPath}\`_
 `;
   }
-  body += `_Created by [markupr](https://markupr.com)_
+  body += `_Created by [markupR](https://markupr.com)_
 `;
   return body;
 }
@@ -3796,7 +4098,7 @@ async function pushToGitHub(options) {
   const markdown = await readFile5(reportPath, "utf-8");
   let items = parseMarkuprReport(markdown);
   if (items.length === 0) {
-    throw new Error("No feedback items found in the report. Is this a valid markupr report?");
+    throw new Error("No feedback items found in the report. Is this a valid markupR report?");
   }
   if (filterIds && filterIds.length > 0) {
     const filterSet = new Set(filterIds.map((id) => id.toUpperCase()));
@@ -3866,9 +4168,9 @@ function parseRepoString(repoStr) {
 function register8(server) {
   server.tool(
     "push_to_github",
-    "Create GitHub issues from a markupr feedback report. Each feedback item becomes a separate issue with labels and structured markdown.",
+    "Create GitHub issues from a markupR feedback report. Each feedback item becomes a separate issue with labels and structured markdown.",
     {
-      reportPath: z8.string().describe("Absolute path to the markupr markdown report"),
+      reportPath: z8.string().describe("Absolute path to the markupR markdown report"),
       repo: z8.string().describe('Target GitHub repository in "owner/repo" format'),
       token: z8.string().optional().describe("GitHub token (falls back to GITHUB_TOKEN env or gh CLI)"),
       items: z8.array(z8.string()).optional().describe("Specific FB-XXX item IDs to push (default: all)"),
@@ -4222,10 +4524,10 @@ function registerResources(server) {
 }
 
 // src/mcp/server.ts
-var VERSION = true ? "2.6.2" : "0.0.0-dev";
+var VERSION = true ? "2.6.5" : "0.0.0-dev";
 function createServer() {
   const server = new McpServer2({
-    name: "markupr",
+    name: "markupR",
     version: VERSION
   });
   register(server);
@@ -4242,8 +4544,8 @@ function createServer() {
 }
 
 // src/mcp/index.ts
-var VERSION2 = true ? "2.6.2" : "0.0.0-dev";
-log(`markupr MCP server v${VERSION2} starting...`);
+var VERSION2 = true ? "2.6.5" : "0.0.0-dev";
+log(`markupR MCP server v${VERSION2} starting...`);
 process.on("uncaughtException", (error) => {
   log(`Uncaught exception: ${error instanceof Error ? error.message : String(error)}`);
   process.exit(1);