npm - openwriter - Versions diffs - 0.40.0 → 0.40.2 - Mend

openwriter 0.40.0 → 0.40.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/client/assets/{index-vmEPerKn.js → index-Dxbv2n2m.js} +1 -1
package/dist/client/index.html +1 -1
package/dist/plugins/github/dist/blog-tools.d.ts +19 -0
package/dist/plugins/github/dist/blog-tools.js +28 -9
package/package.json +1 -1
package/dist/server/blog-routes.js +0 -160
package/dist/server/git-sync.js +0 -273
package/dist/server/marks.js +0 -182
package/dist/server/sync-routes.js +0 -75

package/dist/client/index.html CHANGED Viewed

@@ -10,7 +10,7 @@
     <!-- Fonts are self-hosted (bundled via @fontsource, imported in main.tsx →
          themes/vendored-fonts.css). No external font CDN: a local-first editor
          must work offline and behind content blockers. -->
-    <script type="module" crossorigin src="/assets/index-vmEPerKn.js"></script>
+    <script type="module" crossorigin src="/assets/index-Dxbv2n2m.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-DiJrXBgV.css">
   </head>
   <body>

package/dist/plugins/github/dist/blog-tools.d.ts CHANGED Viewed

@@ -37,6 +37,25 @@ export declare function pathStyleOf(site: Pick<BlogSite, 'image_path_style'>): '
  *   relative → "images/og/x.png"   absolute → "/images/og/x.png"
  */
 export declare function imageRef(publicPrefix: string, file: string, style: 'relative' | 'absolute'): string;
+/**
+ * Rewrite inline `/_images/` references in the post BODY to their published
+ * public paths, collecting the referenced filenames for copying.
+ *
+ * Body references ALWAYS emit an absolute (leading-slash) path, regardless of
+ * the site's `image_path_style`. That style contract exists for the
+ * FRONTMATTER cover only, whose value is rendered through the site's template
+ * — a relative-style site's layout prepends the slash itself (e.g. Astro
+ * `<img src={`/${image}`}>`). A raw markdown body image has no template: a
+ * slashless path is treated by Astro/Vite as an ESM import (`Rollup failed to
+ * resolve import "images/og/x.png"`) and red-builds the site, while a
+ * root-absolute path resolves against the public dir on every static
+ * framework. Do NOT collapse body refs back into the cover's path style.
+ * adr: adr/blog-image-contract.md
+ */
+export declare function rewriteBodyImages(bodyMd: string, publicPrefix: string): {
+    body: string;
+    imageRefs: Set<string>;
+};
 /**
  * Resolve the deterministic cover filename from the site's naming template.
  *   `{slug}` → post slug

package/dist/plugins/github/dist/blog-tools.js CHANGED Viewed

@@ -497,6 +497,29 @@ export function imageRef(publicPrefix, file, style) {
     const rel = seg ? `${seg}/${file}` : file;
     return style === 'absolute' ? `/${rel}` : rel;
 }
+/**
+ * Rewrite inline `/_images/` references in the post BODY to their published
+ * public paths, collecting the referenced filenames for copying.
+ *
+ * Body references ALWAYS emit an absolute (leading-slash) path, regardless of
+ * the site's `image_path_style`. That style contract exists for the
+ * FRONTMATTER cover only, whose value is rendered through the site's template
+ * — a relative-style site's layout prepends the slash itself (e.g. Astro
+ * `<img src={`/${image}`}>`). A raw markdown body image has no template: a
+ * slashless path is treated by Astro/Vite as an ESM import (`Rollup failed to
+ * resolve import "images/og/x.png"`) and red-builds the site, while a
+ * root-absolute path resolves against the public dir on every static
+ * framework. Do NOT collapse body refs back into the cover's path style.
+ * adr: adr/blog-image-contract.md
+ */
+export function rewriteBodyImages(bodyMd, publicPrefix) {
+    const imageRefs = new Set();
+    const body = bodyMd.replace(/\/_images\/([^\s)"'<>]+)/g, (_m, fn) => {
+        imageRefs.add(fn);
+        return imageRef(publicPrefix, fn, 'absolute');
+    });
+    return { body, imageRefs };
+}
 /**
  * Resolve the deterministic cover filename from the site's naming template.
  *   `{slug}` → post slug
@@ -989,18 +1012,14 @@ export function blogTools() {
                 const slug = String(params.slug || blogCtx.slug || slugify(title));
                 if (!slug)
                     return { error: 'Could not derive a slug from the title.' };
-                // Rewrite inline image refs in body, collect filenames
-                // Per-site image contract: path style governs the leading slash on
-                // every emitted reference (cover + inline body). adr: adr/blog-image-contract.md
+                // Per-site image contract: `image_path_style` governs the FRONTMATTER
+                // cover only. Inline BODY refs are always absolute — see
+                // rewriteBodyImages. adr: adr/blog-image-contract.md
                 const style = pathStyleOf(site);
                 // Inline body images keep their source (hash) filenames — only the
-                // path style is normalized. Deterministic slug naming is scoped to the
+                // path is rewritten. Deterministic slug naming is scoped to the
                 // COVER for now (inline naming is a noted follow-up in the ADR).
-                const imageRefs = new Set();
-                const bodyRewritten = bodyMd.replace(/\/_images\/([^\s)"'<>]+)/g, (_m, fn) => {
-                    imageRefs.add(fn);
-                    return imageRef(site.image_public_prefix, fn, style);
-                });
+                const { body: bodyRewritten, imageRefs } = rewriteBodyImages(bodyMd, site.image_public_prefix);
                 // Cover image from blogContext → deterministic `og-{slug}.{ext}` name.
                 // Same doc + slug ⇒ same filename every republish (idempotent
                 // overwrite, no orphaned cover). Source extension is preserved.

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "openwriter",
-  "version": "0.40.0",
+  "version": "0.40.2",
   "description": "The open-source writing surface for AI agents. Markdown-native editor with pending change review — your agent writes, you accept or reject.",
   "type": "module",
   "license": "MIT",

package/dist/server/blog-routes.js DELETED Viewed

@@ -1,160 +0,0 @@
-/**
- * Blog publishing routes — push blog content to GitHub via platform connection.
- * Builds clean YAML frontmatter + markdown body, collects images, posts to platform.
- */
-import { Router } from 'express';
-import { readFileSync, existsSync } from 'fs';
-import { join } from 'path';
-import matter from 'gray-matter';
-import { getDocument, getTitle, getMetadata, save, cancelDebouncedSave } from './state.js';
-import { tiptapToMarkdown } from './markdown.js';
-import { platformFetch, isAuthenticated } from './connections.js';
-import { getDataDir } from './helpers.js';
-export function createBlogRouter() {
-    const router = Router();
-    // Find active GitHub connection for blog publishing
-    router.get('/api/blog/connection', async (_req, res) => {
-        try {
-            if (!isAuthenticated()) {
-                res.json({ connection: null });
-                return;
-            }
-            const upstream = await platformFetch('/connections/unified');
-            if (!upstream.ok) {
-                res.json({ connection: null });
-                return;
-            }
-            const data = await upstream.json();
-            const ghConn = data.connections?.find((c) => c.provider === 'github' && c.status === 'active');
-            res.json({ connection: ghConn || null });
-        }
-        catch {
-            res.json({ connection: null });
-        }
-    });
-    // Publish blog post to GitHub via platform connection
-    router.post('/api/blog/publish', async (req, res) => {
-        try {
-            if (!isAuthenticated()) {
-                res.status(401).json({ error: 'Not authenticated' });
-                return;
-            }
-            // Flush current doc to disk
-            cancelDebouncedSave();
-            save();
-            const doc = getDocument();
-            const title = getTitle();
-            const metadata = getMetadata();
-            const blogCtx = metadata.blogContext;
-            if (!blogCtx?.active) {
-                res.status(400).json({ error: 'Not a blog document' });
-                return;
-            }
-            // Get clean markdown body (strip OpenWriter JSON frontmatter)
-            const fullMd = tiptapToMarkdown(doc, title, metadata);
-            const parsed = matter(fullMd);
-            let markdownBody = parsed.content.trim();
-            // Build clean blog YAML frontmatter — only include fields the target schema expects
-            const fm = {
-                title,
-                description: blogCtx.description || '',
-                date: blogCtx.date || new Date().toISOString().split('T')[0],
-            };
-            // Optional fields — only include if explicitly set
-            if (blogCtx.author)
-                fm.author = blogCtx.author;
-            if (blogCtx.layout)
-                fm.layout = blogCtx.layout;
-            if (blogCtx.category)
-                fm.category = blogCtx.category;
-            if (blogCtx.tags?.length)
-                fm.tags = blogCtx.tags;
-            if (blogCtx.draft)
-                fm.draft = true;
-            // Find GitHub connection
-            const connectionId = req.body.connectionId;
-            const connRes = await platformFetch('/connections/unified');
-            if (!connRes.ok) {
-                res.status(500).json({ error: 'Failed to fetch connections' });
-                return;
-            }
-            const connData = await connRes.json();
-            const ghConn = connectionId
-                ? connData.connections?.find((c) => c.id === connectionId)
-                : connData.connections?.find((c) => c.provider === 'github' && c.status === 'active');
-            if (!ghConn) {
-                res.status(400).json({ error: 'No GitHub connection found. Connect a GitHub repo first.' });
-                return;
-            }
-            // Fetch connection config to derive image web path
-            let imageWebPrefix = '/images';
-            try {
-                const cfgRes = await platformFetch(`/connections/${ghConn.id}/config`);
-                if (cfgRes.ok) {
-                    const cfg = await cfgRes.json();
-                    const imgDir = cfg.config?.imageDir || cfg.imageDir;
-                    if (imgDir) {
-                        imageWebPrefix = '/' + imgDir.replace(/^public\/?/, '');
-                    }
-                }
-            }
-            catch { /* fall back to /images */ }
-            // Cover image — read as base64 for GitHub commit
-            let imageBase64;
-            let imageFilename;
-            if (blogCtx.coverImage) {
-                const imgPath = blogCtx.coverImage.replace(/^\/_images\//, '');
-                const fullImgPath = join(getDataDir(), '_images', imgPath);
-                if (existsSync(fullImgPath)) {
-                    imageBase64 = readFileSync(fullImgPath).toString('base64');
-                    imageFilename = imgPath;
-                    fm.image = `${imageWebPrefix}/${imgPath}`;
-                }
-            }
-            // Collect inline images and rewrite paths in markdown
-            const inlineImages = [];
-            const imgRegex = /!\[([^\]]*)\]\(\/_images\/([^)]+)\)/g;
-            markdownBody = markdownBody.replace(imgRegex, (_match, alt, imgFile) => {
-                const fullImgPath = join(getDataDir(), '_images', imgFile);
-                if (existsSync(fullImgPath)) {
-                    inlineImages.push({ filename: imgFile, base64: readFileSync(fullImgPath).toString('base64') });
-                }
-                return `![${alt}](${imageWebPrefix}/${imgFile})`;
-            });
-            // Assemble full markdown with YAML frontmatter
-            const yamlLines = Object.entries(fm).map(([k, v]) => {
-                if (Array.isArray(v))
-                    return `${k}:\n${v.map(i => `  - ${JSON.stringify(i)}`).join('\n')}`;
-                if (typeof v === 'boolean')
-                    return `${k}: ${v}`;
-                return `${k}: ${JSON.stringify(v)}`;
-            });
-            const fullMarkdown = `---\n${yamlLines.join('\n')}\n---\n\n${markdownBody}`;
-            // Build target filename from slug or title
-            const slug = blogCtx.slug || title.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '');
-            const filename = `${slug}.md`;
-            // Post to platform — matches worker's expected payload:
-            // { markdown, filename, imageBase64?, imageFilename?, commitMessage? }
-            const upstream = await platformFetch(`/connections/${ghConn.id}/post`, {
-                method: 'POST',
-                body: JSON.stringify({
-                    markdown: fullMarkdown,
-                    filename,
-                    ...(imageBase64 && imageFilename ? { imageBase64, imageFilename } : {}),
-                    ...(inlineImages.length ? { images: inlineImages } : {}),
-                    commitMessage: `Add blog post: ${title}`,
-                }),
-            });
-            const result = await upstream.json();
-            if (!upstream.ok) {
-                res.status(upstream.status).json(result);
-                return;
-            }
-            res.json({ success: true, ...result });
-        }
-        catch (err) {
-            res.status(500).json({ error: err.message });
-        }
-    });
-    return router;
-}

package/dist/server/git-sync.js DELETED Viewed

@@ -1,273 +0,0 @@
-/**
- * Git sync module: all git/gh CLI interactions for GitHub sync.
- * Uses child_process.execFile with shell:true (required on Windows).
- */
-import { execFile } from 'child_process';
-import { existsSync, writeFileSync } from 'fs';
-import { join } from 'path';
-import { getDataDir, readConfig, saveConfig } from './helpers.js';
-import { save, cancelDebouncedSave } from './state.js';
-const GITIGNORE_CONTENT = `config.json\n.versions/\n`;
-const NETWORK_TIMEOUT = 30000;
-let currentSyncState = 'unconfigured';
-let lastError;
-function exec(cmd, args, cwd, timeout = 10000) {
-    // Quote args with spaces so shell: true doesn't split them
-    const safeArgs = args.map(a => a.includes(' ') ? `"${a}"` : a);
-    return new Promise((resolve, reject) => {
-        execFile(cmd, safeArgs, { cwd, shell: true, timeout }, (err, stdout, stderr) => {
-            if (err)
-                reject(new Error(stderr?.trim() || err.message));
-            else
-                resolve(stdout.trim());
-        });
-    });
-}
-export async function isGitInstalled() {
-    try {
-        await exec('git', ['--version'], getDataDir());
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-export async function isGhInstalled() {
-    try {
-        await exec('gh', ['--version'], getDataDir());
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-export async function isGhAuthenticated() {
-    try {
-        await exec('gh', ['auth', 'status'], getDataDir());
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-export function isGitRepo() {
-    return existsSync(join(getDataDir(), '.git'));
-}
-function ensureGitignore() {
-    const gitignorePath = join(getDataDir(), '.gitignore');
-    if (!existsSync(gitignorePath)) {
-        writeFileSync(gitignorePath, GITIGNORE_CONTENT, 'utf-8');
-    }
-}
-/** Count files that have changed since last commit (or all files if no commits yet). */
-async function countPendingFiles() {
-    if (!isGitRepo())
-        return 0;
-    try {
-        // Check for any changes (staged + unstaged + untracked)
-        const status = await exec('git', ['status', '--porcelain'], getDataDir());
-        if (!status)
-            return 0;
-        return status.split('\n').filter(Boolean).length;
-    }
-    catch {
-        return 0;
-    }
-}
-/** Return the list of pending files with their status. */
-export async function getPendingFiles() {
-    if (!isGitRepo())
-        return [];
-    try {
-        const output = await exec('git', ['status', '--porcelain'], getDataDir());
-        if (!output)
-            return [];
-        return output.split('\n').filter(Boolean).map(line => {
-            const code = line.substring(0, 2);
-            const file = line.substring(3);
-            let status = 'modified';
-            if (code.includes('?') || code.includes('A'))
-                status = 'added';
-            else if (code.includes('D'))
-                status = 'deleted';
-            else if (code.includes('R'))
-                status = 'renamed';
-            return { status, file };
-        });
-    }
-    catch {
-        return [];
-    }
-}
-export async function getSyncStatus() {
-    const config = readConfig();
-    if (!config.gitConfigured || !isGitRepo()) {
-        return { state: 'unconfigured' };
-    }
-    if (currentSyncState === 'syncing') {
-        return { state: 'syncing' };
-    }
-    if (currentSyncState === 'error' && lastError) {
-        return { state: 'error', error: lastError, lastSyncTime: config.lastSyncTime };
-    }
-    const pending = await countPendingFiles();
-    return {
-        state: pending > 0 ? 'pending' : 'synced',
-        pendingFiles: pending,
-        lastSyncTime: config.lastSyncTime,
-    };
-}
-export async function getCapabilities() {
-    const [git, gh] = await Promise.all([isGitInstalled(), isGhInstalled()]);
-    let ghAuth = false;
-    if (gh)
-        ghAuth = await isGhAuthenticated();
-    let remoteUrl;
-    if (isGitRepo()) {
-        try {
-            remoteUrl = await exec('git', ['remote', 'get-url', 'origin'], getDataDir());
-        }
-        catch { /* no remote */ }
-    }
-    return {
-        gitInstalled: git,
-        ghInstalled: gh,
-        ghAuthenticated: ghAuth,
-        existingRepo: isGitRepo(),
-        remoteUrl,
-    };
-}
-async function initRepo() {
-    if (!isGitRepo()) {
-        await exec('git', ['init'], getDataDir());
-    }
-    ensureGitignore();
-    // Ensure git user is configured (required for commits)
-    try {
-        await exec('git', ['config', 'user.name'], getDataDir());
-    }
-    catch {
-        await exec('git', ['config', 'user.name', 'OpenWriter'], getDataDir());
-    }
-    try {
-        await exec('git', ['config', 'user.email'], getDataDir());
-    }
-    catch {
-        await exec('git', ['config', 'user.email', 'openwriter@local'], getDataDir());
-    }
-}
-async function initialCommit() {
-    await exec('git', ['add', '-A'], getDataDir());
-    // Check if there's anything staged
-    const status = await exec('git', ['status', '--porcelain'], getDataDir());
-    if (!status)
-        return; // Nothing to commit
-    await exec('git', ['commit', '-m', 'Initial sync from OpenWriter'], getDataDir());
-    // Ensure branch is named 'main'
-    await exec('git', ['branch', '-M', 'main'], getDataDir());
-}
-export async function setupWithGh(repoName, isPrivate) {
-    await initRepo();
-    await initialCommit();
-    const visibility = isPrivate ? '--private' : '--public';
-    // Create repo without --push, then push separately for better error control
-    await exec('gh', ['repo', 'create', repoName, visibility, '--source=.', '--remote=origin'], getDataDir(), NETWORK_TIMEOUT);
-    await exec('git', ['push', '-u', 'origin', 'main'], getDataDir(), NETWORK_TIMEOUT);
-    saveConfig({
-        gitConfigured: true,
-        repoName,
-        lastSyncTime: new Date().toISOString(),
-    });
-    currentSyncState = 'synced';
-}
-export async function setupWithPat(pat, repoName, isPrivate) {
-    // Create repo via GitHub REST API
-    const res = await fetch('https://api.github.com/user/repos', {
-        method: 'POST',
-        headers: {
-            Authorization: `Bearer ${pat}`,
-            'Content-Type': 'application/json',
-            Accept: 'application/vnd.github+json',
-        },
-        body: JSON.stringify({ name: repoName, private: isPrivate, auto_init: false }),
-    });
-    if (!res.ok) {
-        const body = await res.json().catch(() => ({}));
-        throw new Error(body.message || `GitHub API error: ${res.status}`);
-    }
-    const repo = await res.json();
-    const remoteUrl = `https://${pat}@github.com/${repo.full_name}.git`;
-    await initRepo();
-    await initialCommit();
-    // Set remote
-    try {
-        await exec('git', ['remote', 'remove', 'origin'], getDataDir());
-    }
-    catch { /* no remote */ }
-    await exec('git', ['remote', 'add', 'origin', remoteUrl], getDataDir());
-    await exec('git', ['push', '-u', 'origin', 'main'], getDataDir(), NETWORK_TIMEOUT);
-    saveConfig({
-        gitConfigured: true,
-        gitPat: pat,
-        repoName,
-        gitRemote: repo.html_url,
-        lastSyncTime: new Date().toISOString(),
-    });
-    currentSyncState = 'synced';
-}
-export async function connectExisting(remoteUrl, pat) {
-    await initRepo();
-    await initialCommit();
-    // Embed PAT in URL if provided
-    let finalUrl = remoteUrl;
-    if (pat && remoteUrl.startsWith('https://')) {
-        finalUrl = remoteUrl.replace('https://', `https://${pat}@`);
-    }
-    try {
-        await exec('git', ['remote', 'remove', 'origin'], getDataDir());
-    }
-    catch { /* no remote */ }
-    await exec('git', ['remote', 'add', 'origin', finalUrl], getDataDir());
-    await exec('git', ['push', '-u', 'origin', 'main'], getDataDir(), NETWORK_TIMEOUT);
-    saveConfig({
-        gitConfigured: true,
-        gitPat: pat,
-        gitRemote: remoteUrl,
-        lastSyncTime: new Date().toISOString(),
-    });
-    currentSyncState = 'synced';
-}
-export async function pushSync(onStatus) {
-    currentSyncState = 'syncing';
-    lastError = undefined;
-    onStatus({ state: 'syncing' });
-    try {
-        // Flush current document to disk first (cancel debounce to ensure immediate write)
-        cancelDebouncedSave();
-        save();
-        ensureGitignore();
-        await exec('git', ['add', '-A'], getDataDir());
-        // Check if there's anything to commit
-        const status = await exec('git', ['status', '--porcelain'], getDataDir());
-        if (status) {
-            const timestamp = new Date().toLocaleString('en-US', {
-                month: 'short', day: 'numeric', hour: 'numeric', minute: '2-digit',
-            });
-            await exec('git', ['commit', '-m', `Sync: ${timestamp}`], getDataDir());
-        }
-        await exec('git', ['push'], getDataDir(), NETWORK_TIMEOUT);
-        const now = new Date().toISOString();
-        saveConfig({ lastSyncTime: now });
-        currentSyncState = 'synced';
-        const result = { state: 'synced', lastSyncTime: now, pendingFiles: 0 };
-        onStatus(result);
-        return result;
-    }
-    catch (err) {
-        currentSyncState = 'error';
-        lastError = err.message;
-        const result = { state: 'error', error: err.message };
-        onStatus(result);
-        return result;
-    }
-}