@filipc77/cowrite 0.4.1 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@filipc77/cowrite",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Live commenting plugin for coding agent sessions",
   "type": "module",
   "bin": {

package/ui/client.js

@@ -156,22 +156,31 @@ document.addEventListener("mouseup", (e) => {
 });
 
 function computeOffset(selection, text) {
-  // For plain text: use data-offset on span.line elements
-  const anchor = selection.anchorNode;
-  if (!anchor) return -1;
-
-  // Walk up to find a [data-offset] element
-  let node = anchor.nodeType === Node.TEXT_NODE ? anchor.parentElement : anchor;
-  while (node && !node.dataset?.offset && node !== fileContentEl) {
-    node = node.parentElement;
+  const range = selection.getRangeAt(0);
+  const startNode = range.startContainer;
+  const startCharOffset = range.startOffset;
+
+  // Walk up from the range start to find a [data-offset] element
+  let lineEl = startNode.nodeType === Node.TEXT_NODE ? startNode.parentElement : startNode;
+  while (lineEl && !lineEl.dataset?.offset && lineEl !== fileContentEl) {
+    lineEl = lineEl.parentElement;
   }
 
-  if (node?.dataset?.offset !== undefined) {
-    // Plain text mode: compute from data-offset + text offset within the line
-    const lineOffset = parseInt(node.dataset.offset, 10);
-    const nodeText = node.textContent || "";
-    const idx = nodeText.indexOf(text);
-    if (idx !== -1) return lineOffset + idx;
+  if (lineEl?.dataset?.offset !== undefined) {
+    // Compute exact character offset within the line using the range start
+    const lineOffset = parseInt(lineEl.dataset.offset, 10);
+    // Walk text nodes inside this line element to find the position of startNode
+    const walker = document.createTreeWalker(lineEl, NodeFilter.SHOW_TEXT);
+    let charsBefore = 0;
+    while (walker.nextNode()) {
+      if (walker.currentNode === startNode) {
+        return lineOffset + charsBefore + startCharOffset;
+      }
+      charsBefore += walker.currentNode.textContent.length;
+    }
+    // If the start node wasn't found in this line, the selection might start
+    // at the line element boundary itself
+    return lineOffset;
   }
 
   // Fallback: search for the text in the raw content