draftwatch 0.2.1__tar.gz → 0.2.3__tar.gz

{draftwatch-0.2.1 → draftwatch-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: draftwatch
-Version: 0.2.1
+Version: 0.2.3
 Summary: Review an AI agent's edits to your writing files as a real git word-diff — keep or revert changes hunk by hunk, then commit.
 Author: Mike Konczal
 License: MIT

{draftwatch-0.2.1 → draftwatch-0.2.3}/draftwatch/app.py

@@ -40,8 +40,8 @@ TERM_SUPPORTED = _term is not None
 # Single source of truth for the version and the date of the latest release.
 # __init__.py re-exports __version__; the About panel shows both (injected into
 # the served page from these constants).
-__version__ = "0.2.1"
-RELEASE_DATE = "2026-07-07"
+__version__ = "0.2.3"
+RELEASE_DATE = "2026-09-23"
 
 # Preferred port. When --port is not given, Draftwatch tries this first and
 # falls back to a free port if it is busy (so a second instance can start while
@@ -244,6 +244,53 @@ def resolve_new_file(root, path):
     return cand
 
 
+# Local images the preview may load: extension -> MIME type. The image route
+# serves only these, only from inside the repo root, and only up to the size
+# cap, so it can't be used to read arbitrary files (source, .env, keys).
+IMAGE_TYPES = {
+    ".png": "image/png",
+    ".jpg": "image/jpeg",
+    ".jpeg": "image/jpeg",
+    ".gif": "image/gif",
+    ".webp": "image/webp",
+    ".avif": "image/avif",
+    ".svg": "image/svg+xml",
+    ".bmp": "image/bmp",
+    ".ico": "image/x-icon",
+}
+MAX_IMAGE_BYTES = 25 * 1024 * 1024
+
+
+def resolve_image(root, relpath, src):
+    """Resolve an <img src> from the markdown to (abspath, mime), or raise ValueError.
+
+    `src` is the raw attribute value, resolved relative to the open file's
+    directory (the repo root when no file is open), the way a markdown renderer
+    on disk would. URLs, absolute paths, and anything resolving outside the repo
+    or to a non-image type are refused.
+    """
+    from urllib.parse import unquote
+    s = (src or "").split("#", 1)[0].split("?", 1)[0].strip()
+    s = unquote(s)
+    if not s:
+        raise ValueError("no image path given")
+    if ":" in s.split("/", 1)[0] or s.startswith("/") or os.path.isabs(s):
+        raise ValueError("only relative image paths are served")
+    base = os.path.join(root, os.path.dirname(relpath)) if relpath else root
+    cand = os.path.realpath(os.path.join(base, s))
+    root_prefix = root.rstrip(os.sep) + os.sep
+    if not cand.startswith(root_prefix):
+        raise ValueError("refusing an image outside the repository")
+    mime = IMAGE_TYPES.get(os.path.splitext(cand)[1].lower())
+    if mime is None:
+        raise ValueError("not an image type the preview serves")
+    if not os.path.isfile(cand):
+        raise ValueError("image not found")
+    if os.path.getsize(cand) > MAX_IMAGE_BYTES:
+        raise ValueError("image too large")
+    return cand, mime
+
+
 def list_repo_files(root, has_repo=True, limit=5000):
     """Files for the picker. In a git repo: tracked + non-ignored untracked,
     sorted, deduped. In write-only mode (no repo), fall back to a filesystem
@@ -793,6 +840,7 @@ STATIC_ASSETS = {
     "marked.js": "application/javascript; charset=utf-8",
     "purify.js": "application/javascript; charset=utf-8",
     "turndown.js": "application/javascript; charset=utf-8",
+    "favicon.png": "image/png",
 }
 
 
@@ -887,6 +935,8 @@ class Handler(BaseHTTPRequestHandler):
         #                       writer's legitimate external images still render;
         #                       with connect-src+Referrer-Policy above, a stray
         #                       image beacon carries no token and no document data.
+        #                       blob: is for local images, fetched with the token
+        #                       from /api/image and shown via object URLs.
         #   nosniff           — don't let a response be reinterpreted as another type.
         self.send_header("Referrer-Policy", "no-referrer")
         self.send_header("X-Content-Type-Options", "nosniff")
@@ -895,7 +945,7 @@ class Handler(BaseHTTPRequestHandler):
             "default-src 'self'; "
             "script-src 'self' 'unsafe-inline'; "
             "style-src 'self' 'unsafe-inline'; "
-            "img-src 'self' data: https:; "
+            "img-src 'self' data: blob: https:; "
             "connect-src 'self'; "
             "base-uri 'none'; form-action 'none'; frame-ancestors 'none'")
         self.end_headers()
@@ -939,6 +989,8 @@ class Handler(BaseHTTPRequestHandler):
             self._api_baselines()
         elif path == "/api/files":
             self._api_files()
+        elif path == "/api/image":
+            self._api_image()
         else:
             self._send(404, "not found", "text/plain")
 
@@ -1031,6 +1083,22 @@ class Handler(BaseHTTPRequestHandler):
         self._json({"files": list_repo_files(st.root, has_repo),
                     "current": current, "repo": has_repo})
 
+    def _api_image(self):
+        """A local image referenced by the open file, for the preview. Token-gated
+        like the rest of /api/* (the client fetches it with the header and shows
+        it as a blob: URL), so file contents never load without the session."""
+        st = self.state
+        with st.lock:
+            relpath = st.relpath
+        vals = self._query().get("src")
+        try:
+            abspath, mime = resolve_image(st.root, relpath, vals[0] if vals else "")
+            with open(abspath, "rb") as fh:
+                data = fh.read()
+        except (ValueError, OSError) as e:
+            return self._send(404, str(e), "text/plain")
+        self._send(200, data, mime)
+
     # ---- POST ----
     def do_POST(self):
         path = self.path.split("?", 1)[0]
@@ -1395,6 +1463,7 @@ INDEX_HTML = r"""<!DOCTYPE html>
 <meta name="referrer" content="no-referrer">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <title>Draftwatch</title>
+<link rel="icon" type="image/png" href="/static/favicon.png">
 <script src="/static/codemirror.js"></script>
 <script src="/static/marked.js"></script>
 <script src="/static/purify.js"></script>
@@ -1550,7 +1619,7 @@ INDEX_HTML = r"""<!DOCTYPE html>
 
   /* app chrome (native window via pywebview, ?app=1): the OS title bar
      already says "draftwatch · file", so the in-page wordmark is redundant —
-     drop it, tighten the toolbar, and make the chrome feel native (no text
+     drop the word (the logo, outside .title, stays as the brand), tighten the toolbar, and make the chrome feel native (no text
      selection on controls, no web-page tells). */
   body.app-mode header .title { display: none; }
   body.app-mode header { padding: 5px 10px; }
@@ -1571,14 +1640,22 @@ INDEX_HTML = r"""<!DOCTYPE html>
     display: flex;
     flex-direction: column;
   }
+  /* logo on the left, spanning both toolbar rows; the rows stack beside it */
   header {
     display: flex;
-    flex-direction: column;
-    gap: 6px;
+    align-items: center;
+    gap: 10px;
     padding: 8px 12px;
     border-bottom: 1px solid var(--border);
     background: var(--panel);
   }
+  header .rows {
+    flex: 1;
+    min-width: 0;
+    display: flex;
+    flex-direction: column;
+    gap: 6px;
+  }
   /* Two fixed rows that never wrap into each other, so the layout stays put
      regardless of title length or window width:
        row 1 = what you're looking at (title, file picker, baseline selector —
@@ -1601,19 +1678,11 @@ INDEX_HTML = r"""<!DOCTYPE html>
     gap: 7px;
     letter-spacing: .02em;
   }
-  /* the +/− mark: the product in two characters (keep the add, strike the del) */
-  .mark {
-    display: inline-flex;
-    align-items: center;
-    background: var(--bg);
-    border: 1px solid var(--border);
-    border-radius: 5px;
-    padding: 0 5px;
-    font-weight: 700;
-    line-height: 1.45;
-  }
-  .mark .ma { color: var(--add-fg); }
-  .mark .md { color: var(--del-fg); text-decoration: line-through; }
+  /* the logo: same drawing as the Dock icon and favicon (scripts/make_icon.py),
+     inline so it stays crisp at any size. Fixed brand colors, not the accent. */
+  .logo { width: 28px; height: 28px; flex: none; display: block; }
+  header > .logo { width: 54px; height: 54px; }
+  #about h2 .logo { width: 48px; height: 48px; }
   header .status { color: var(--muted); }
   header #status {
     flex: 1 1 auto;
@@ -1727,30 +1796,42 @@ INDEX_HTML = r"""<!DOCTYPE html>
     background: rgba(127, 127, 127, .28);
   }
   #editor-host .cm-placeholder { color: var(--muted); font-style: italic; }
-  /* CM search panel, themed with the app variables (light/dark for free) */
-  .cm-panels {
-    background: var(--panel) !important;
-    color: var(--text) !important;
-    border-color: var(--border) !important;
+  /* CM search panel, themed with the app variables (light/dark for free).
+     Scoped under #editor-host on purpose: CodeMirror's base theme injects
+     two-class rules (e.g. `.ͼ2 .cm-textfield`, `.ͼ2 .cm-button`) that outrank a
+     bare `.cm-panels input`, and since no dark theme is registered with CM it
+     always applies its LIGHT palette (white input, pale gradient buttons, 70%
+     font). Unscoped, that left near-white dark-mode text on a white field. */
+  #editor-host .cm-panels {
+    background: var(--panel);
+    color: var(--text);
+    border-color: var(--border);
   }
-  .cm-panels input, .cm-panels button, .cm-panels label {
+  #editor-host .cm-panels input, #editor-host .cm-panels button, #editor-host .cm-panels label {
     font-family: var(--mono);
     font-size: 12px;
     color: var(--text);
   }
-  .cm-panels input {
+  #editor-host .cm-panels input[type="checkbox"] { accent-color: var(--accent); }
+  #editor-host .cm-panels .cm-textfield {
     background: var(--bg);
     border: 1px solid var(--border);
     border-radius: 4px;
   }
-  .cm-panels button {
+  #editor-host .cm-panels .cm-textfield:focus { outline: none; border-color: var(--accent); }
+  #editor-host .cm-panels .cm-button {
     background: var(--bg);
-    border: 1px solid var(--border) !important;
+    background-image: none;
+    border: 1px solid var(--border);
     border-radius: 4px;
     cursor: pointer;
   }
-  .cm-searchMatch { background: var(--warn-bg); outline: 1px solid var(--warn-border); }
-  .cm-searchMatch-selected { background: var(--warn-border); }
+  #editor-host .cm-panels .cm-button:hover { border-color: var(--accent); }
+  #editor-host .cm-panels .cm-button:active { background-image: none; }
+  #editor-host .cm-searchMatch { background: var(--warn-bg); outline: 1px solid var(--warn-border); }
+  #editor-host .cm-searchMatch-selected { background: var(--warn-border); }
+  /* highlightSelectionMatches: CM's default is a bright translucent green */
+  #editor-host .cm-selectionMatch { background: rgba(127, 127, 127, .22); }
 
   /* rendered markdown preview: reading typography, sanitized content only */
   #preview {
@@ -1790,6 +1871,8 @@ INDEX_HTML = r"""<!DOCTYPE html>
     color: var(--muted);
   }
   #preview img { max-width: 100%; }
+  /* a local image the server could not serve: the alt text shows in its place */
+  #preview img.img-missing { outline: 1px dashed var(--del-fg); outline-offset: 2px; color: var(--muted); }
   #preview hr { border: none; border-top: 1px solid var(--border); }
   #preview table { border-collapse: collapse; }
   #preview th, #preview td { border: 1px solid var(--border); padding: 4px 9px; }
@@ -1986,9 +2069,26 @@ INDEX_HTML = r"""<!DOCTYPE html>
 </style>
 </head>
 <body>
+<!-- logo geometry mirrors scripts/make_icon.py (1024 grid, tile at 100..924) -->
+<svg width="0" height="0" style="position:absolute" aria-hidden="true">
+  <defs>
+    <linearGradient id="dw-logo-bg" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#3d82c7"/><stop offset="1" stop-color="#215892"/>
+    </linearGradient>
+    <symbol id="dw-logo" viewBox="100 100 824 824">
+      <rect x="100" y="100" width="824" height="824" rx="185" fill="url(#dw-logo-bg)"/>
+      <path fill="#f5f9fe" fill-rule="evenodd"
+            d="M322 262H488A250 250 0 0 1 488 762H322Z M428 368H488A144 144 0 0 1 488 656H428Z"/>
+      <rect x="470" y="452" width="120" height="42" rx="21" fill="#7ed08a"/>
+      <rect x="470" y="530" width="92" height="42" rx="21" fill="#f08e7f"/>
+    </symbol>
+  </defs>
+</svg>
 <header>
+  <svg class="logo" aria-hidden="true"><use href="#dw-logo"/></svg>
+  <div class="rows">
   <div class="bar">
-    <span class="title"><span class="mark"><span class="ma">+</span><span class="md">−</span></span>Draftwatch</span>
+    <span class="title"><span class="word">Draftwatch</span></span>
     <span class="filepick">
       <label class="status" for="file-select">file</label>
       <select id="file-select" title="pick a writing file in this repo"></select>
@@ -2013,6 +2113,7 @@ INDEX_HTML = r"""<!DOCTYPE html>
     <button id="accent-toggle" title="accent color — click to cycle"><span class="swatch"></span><span id="accent-name">blue</span></button>
     <button id="about-btn" title="what is Draftwatch?">about</button>
   </div>
+  </div>
 </header>
 
 <div id="banner">
@@ -2025,7 +2126,7 @@ INDEX_HTML = r"""<!DOCTYPE html>
 <div id="about" role="dialog" aria-modal="true" aria-label="About Draftwatch">
   <div class="card">
     <button class="about-close" id="about-close" title="close (Esc)">close ✕</button>
-    <h2><span class="mark"><span class="ma">+</span><span class="md">−</span></span>Draftwatch</h2>
+    <h2><svg class="logo" aria-hidden="true"><use href="#dw-logo"/></svg>Draftwatch</h2>
     <p class="tag">Review an AI agent's edits as a real git diff — locally.</p>
     <p>An autonomous agent (Claude Code and the like) edits your files on disk.
       Draftwatch shows you exactly what changed, as the word-level diff
@@ -2933,6 +3034,61 @@ INDEX_HTML = r"""<!DOCTYPE html>
     strongDelimiter: "**",
     linkStyle: "inlined"
   });
+
+  // Local images (e.g. ![](figs/chart.png)). A relative src would resolve to a
+  // bare path on this server and 404, so the sanitizer moves it to data-md-src
+  // (no request fires from the markup), and loadLocalImages fetches it through
+  // the token-gated /api/image route and shows it as a blob: URL. data-md-src
+  // keeps the markdown's own path, which Turndown writes back on preview edits
+  // (never the blob: URL; its default rule would also drop a src-less image).
+  function isLocalSrc(s) {
+    return !!s && !/^([a-z][a-z0-9+.-]*:|\/|#)/i.test(s);
+  }
+  DOMPurify.addHook("afterSanitizeAttributes", function (node) {
+    if (node.nodeName !== "IMG") return;
+    var src = node.getAttribute("src");
+    if (!isLocalSrc(src)) return;
+    node.setAttribute("data-md-src", src);
+    node.removeAttribute("src");
+  });
+  TURN.addRule("localImage", {
+    filter: function (node) {
+      return node.nodeName === "IMG" && node.hasAttribute("data-md-src");
+    },
+    replacement: function (content, node) {
+      var clean = function (a) { return (a || "").replace(/(\n+\s*)+/g, "\n"); };
+      var title = clean(node.getAttribute("title"));
+      return "![" + clean(node.getAttribute("alt")) + "](" +
+        node.getAttribute("data-md-src") + (title ? ' "' + title + '"' : "") + ")";
+    }
+  });
+  var imageCache = {};   // "<file>|<src>" -> Promise of a blob: URL, or null
+  function clearImageCache() {
+    Object.keys(imageCache).forEach(function (k) {
+      imageCache[k].then(function (u) { if (u) URL.revokeObjectURL(u); });
+    });
+    imageCache = {};
+  }
+  function loadLocalImages(root) {
+    root.querySelectorAll("img[data-md-src]").forEach(function (img) {
+      var src = img.getAttribute("data-md-src");
+      var key = (currentFile || "") + "|" + src;
+      if (!imageCache[key]) {
+        imageCache[key] = fetch("/api/image?src=" + encodeURIComponent(src),
+                                { headers: { "X-Draftwatch-Token": TOKEN } })
+          .then(function (r) { return r.ok ? r.blob() : null; })
+          .then(function (b) { return b ? URL.createObjectURL(b) : null; })
+          .catch(function () { return null; });
+        // don't cache a miss: the image may be added to disk later
+        imageCache[key].then(function (u) { if (!u) delete imageCache[key]; });
+      }
+      imageCache[key].then(function (u) {
+        if (u) { img.src = u; img.classList.remove("img-missing"); }
+        else img.classList.add("img-missing");
+      });
+    });
+  }
+
   function renderPreview() {
     var out = "";
     try {
@@ -2945,6 +3101,7 @@ INDEX_HTML = r"""<!DOCTYPE html>
     // (innerHTML assignment does not fire 'input', but keep the intent explicit)
     $("preview").innerHTML = out ||
       '<p class="empty">nothing to preview</p>';
+    loadLocalImages($("preview"));
   }
 
   // Convert the edited rendered HTML back to markdown and push it into the
@@ -2975,7 +3132,8 @@ INDEX_HTML = r"""<!DOCTYPE html>
     $("preview").setAttribute("contenteditable", on ? "true" : "false");
     // the format buttons + save stay available in preview — you can write here too
     $("view-toggle").textContent = on ? "source" : "preview";
-    if (on) renderPreview();
+    // re-read local images each time preview opens, so a regenerated chart shows
+    if (on) { clearImageCache(); renderPreview(); }
   }
   $("view-toggle").addEventListener("click", function () { setPreviewMode(!previewMode); });
 
@@ -3661,6 +3819,30 @@ def _webview_available():
         return False
 
 
+def _app_identity_kwargs(webview):
+    """Brand the native window as Draftwatch rather than the Python interpreter
+    running it: the Dock icon (draftwatch/assets/icon.png, drawn by
+    scripts/make_icon.py) and, on macOS, the app name in the menu bar and its
+    About/Hide/Quit items. Best effort: any failure leaves pywebview's defaults.
+    Returns the kwargs for webview.start()."""
+    if sys.platform == "darwin":
+        try:
+            from Foundation import NSBundle   # PyObjC, a pywebview dependency on macOS
+            info = NSBundle.mainBundle().infoDictionary()
+            if info is not None:
+                info["CFBundleName"] = "Draftwatch"
+        except Exception:
+            pass
+    icon = os.path.join(os.path.dirname(os.path.abspath(__file__)), "assets", "icon.png")
+    try:
+        import inspect
+        takes_icon = "icon" in inspect.signature(webview.start).parameters
+    except (TypeError, ValueError):
+        takes_icon = False
+    # start(icon=) arrived in pywebview 5; on 4.x the window just keeps its default
+    return {"icon": icon} if takes_icon and os.path.isfile(icon) else {}
+
+
 def _run_app_window(url, title):
     """Open the UI in a native window (PyWebView). Returns True when the window
     ran and was closed by the user; False when unavailable, in which case the
@@ -3678,7 +3860,7 @@ def _run_app_window(url, title):
     try:
         webview.create_window(title, url, width=1280, height=860,
                               min_size=(880, 560))
-        webview.start()
+        webview.start(**_app_identity_kwargs(webview))
         return True
     except Exception as e:
         sys.stderr.write(

{draftwatch-0.2.1 → draftwatch-0.2.3}/draftwatch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: draftwatch
-Version: 0.2.1
+Version: 0.2.3
 Summary: Review an AI agent's edits to your writing files as a real git word-diff — keep or revert changes hunk by hunk, then commit.
 Author: Mike Konczal
 License: MIT

{draftwatch-0.2.1 → draftwatch-0.2.3}/draftwatch.egg-info/SOURCES.txt

@@ -12,6 +12,8 @@ draftwatch.egg-info/entry_points.txt
 draftwatch.egg-info/requires.txt
 draftwatch.egg-info/top_level.txt
 draftwatch/assets/codemirror.js
+draftwatch/assets/favicon.png
+draftwatch/assets/icon.png
 draftwatch/assets/marked.js
 draftwatch/assets/purify.js
 draftwatch/assets/turndown.js

{draftwatch-0.2.1 → draftwatch-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "draftwatch"
-version = "0.2.1"
+version = "0.2.3"
 description = "Review an AI agent's edits to your writing files as a real git word-diff — keep or revert changes hunk by hunk, then commit."
 readme = "README.md"
 requires-python = ">=3.9"