openwriter 0.26.0 → 0.27.0

package/dist/server/documents.js

@@ -16,6 +16,8 @@ import { renameDocInAllWorkspaces, removeDocFromAllWorkspaces, listWorkspaces, g
 import { collectAllFiles } from './workspace-tree.js';
 import { renameComments } from './comments.js';
 import { deleteOverlay, diagLog } from './pending-overlay.js';
+import { loadPendingMetadata, savePendingMetadata } from './pending-metadata.js';
+import { getPendingMetadata as getActivePendingMetadata, setPendingMetadata as setActivePendingMetadata, getDocVersion } from './state.js';
 import { getDocId as getActiveDocId } from './state.js';
 function getDocOrderFile() { return join(getDataDir(), '_doc-order.json'); }
 /** Scan files for matching docId. Checks active doc first (free), then getDataDir(), then external docs. */
@@ -119,7 +121,7 @@ export function listDocuments() {
                 isActive: fullPath === currentPath,
                 ...(data.docId ? { docId: data.docId } : {}),
                 ...(data.newsletterContext?.lastSend?.sentAt ? { lastSent: data.newsletterContext.lastSend.sentAt } : data.tweetContext?.lastPost?.postedAt ? { lastSent: data.tweetContext.lastPost.postedAt } : data.blogContext?.lastPublish?.publishedAt ? { lastSent: data.blogContext.lastPublish.publishedAt } : data.articleContext?.lastPost?.postedAt ? { lastSent: data.articleContext.lastPost.postedAt } : data.manualPost?.postedAt ? { lastSent: data.manualPost.postedAt } : {}),
-                ...(data.tweetContext?.lastPost?.tweetUrl ? { postedUrl: data.tweetContext.lastPost.tweetUrl } : data.articleContext?.lastPost?.tweetUrl ? { postedUrl: data.articleContext.lastPost.tweetUrl } : {}),
+                ...(data.tweetContext?.lastPost?.tweetUrl ? { postedUrl: data.tweetContext.lastPost.tweetUrl } : data.articleContext?.lastPost?.tweetUrl ? { postedUrl: data.articleContext.lastPost.tweetUrl } : data.blogContext?.lastPublish?.publishedUrl ? { postedUrl: data.blogContext.lastPublish.publishedUrl } : {}),
                 ...(data.newsletterContext ? { isNewsletter: true } : {}),
                 ...(deriveContentType(data) ? { contentType: deriveContentType(data) } : {}),
                 ...(data.masterDocId ? { masterDocId: data.masterDocId } : {}),
@@ -175,7 +177,7 @@ export function listDocuments() {
                 isActive: extPath === currentPath,
                 ...(data.docId ? { docId: data.docId } : {}),
                 ...(data.newsletterContext?.lastSend?.sentAt ? { lastSent: data.newsletterContext.lastSend.sentAt } : data.tweetContext?.lastPost?.postedAt ? { lastSent: data.tweetContext.lastPost.postedAt } : data.blogContext?.lastPublish?.publishedAt ? { lastSent: data.blogContext.lastPublish.publishedAt } : data.articleContext?.lastPost?.postedAt ? { lastSent: data.articleContext.lastPost.postedAt } : {}),
-                ...(data.tweetContext?.lastPost?.tweetUrl ? { postedUrl: data.tweetContext.lastPost.tweetUrl } : data.articleContext?.lastPost?.tweetUrl ? { postedUrl: data.articleContext.lastPost.tweetUrl } : {}),
+                ...(data.tweetContext?.lastPost?.tweetUrl ? { postedUrl: data.tweetContext.lastPost.tweetUrl } : data.articleContext?.lastPost?.tweetUrl ? { postedUrl: data.articleContext.lastPost.tweetUrl } : data.blogContext?.lastPublish?.publishedUrl ? { postedUrl: data.blogContext.lastPublish.publishedUrl } : {}),
                 ...(data.newsletterContext ? { isNewsletter: true } : {}),
                 ...(deriveContentType(data) ? { contentType: deriveContentType(data) } : {}),
                 ...(data.masterDocId ? { masterDocId: data.masterDocId } : {}),
@@ -946,6 +948,121 @@ export function updateDocumentTitle(filename, newTitle) {
         setActiveDocument(getDocument(), newTitle, filePath, baseName.startsWith(TEMP_PREFIX), undefined, metadata);
     }
 }
+// ============================================================================
+// PENDING TITLE STAGING (agent-initiated renames gated through pending review)
+// ============================================================================
+//
+// Agent-side renames (MCP rename_item, set_metadata with a title field) route
+// here instead of calling updateDocumentTitle directly. The proposal lands in
+// the per-doc sidecar's `metadata:` slot; the .md file's frontmatter is
+// unchanged on disk; the user accepts or rejects via the title-bar inline
+// diff. User-typed renames (HTTP PUT /api/documents/:filename) and creation-
+// time titling (populate_document) still write hot — they're the user
+// disposing, not the agent proposing.
+//
+// adr: adr/pending-overlay-model.md
+/** Read the canonical current title for a doc without loading it into state.
+ *  Active doc → in-memory; otherwise → parse the .md frontmatter from disk. */
+function readCanonicalTitle(docId, filename) {
+    if (getActiveDocId() === docId) {
+        return getTitle();
+    }
+    const filePath = resolveDocPath(filename);
+    if (!existsSync(filePath)) {
+        throw new Error(`Document not found: ${filename}`);
+    }
+    const raw = readFileSync(filePath, 'utf-8');
+    const { data } = matter(raw);
+    return data.title || filename.replace(/\.md$/i, '');
+}
+/** Stage a pending title rename for the doc identified by `docId`. Writes
+ *  to the sidecar (and to state.pendingMetadata when the doc is active).
+ *  Does NOT touch the .md file on disk. Returns the resolved {from, to}
+ *  pair for the caller's response message. */
+export function stagePendingTitle(docId, newTitle) {
+    const filename = filenameByDocId(docId);
+    if (!filename) {
+        throw new Error(`Document not found: ${docId}`);
+    }
+    const from = readCanonicalTitle(docId, filename);
+    // Idempotency: if the proposal equals canonical, clear any pending entry
+    // and return — nothing to review.
+    if (newTitle === from) {
+        if (getActiveDocId() === docId) {
+            setActivePendingMetadata(null);
+        }
+        else {
+            savePendingMetadata(docId, null);
+        }
+        return { from, to: newTitle, filename };
+    }
+    const meta = {
+        title: { from, to: newTitle, addedAtVersion: getDocVersion() },
+    };
+    if (getActiveDocId() === docId) {
+        setActivePendingMetadata(meta);
+    }
+    else {
+        savePendingMetadata(docId, meta);
+    }
+    diagLog(`[Overlay] PENDING-TITLE STAGE docId=${docId} from="${from}" to="${newTitle}"`);
+    return { from, to: newTitle, filename };
+}
+/** Accept a staged title rename — promote it to canonical (writes through
+ *  updateDocumentTitle) and clear the pending entry. Returns the {from, to}
+ *  applied, or null if no pending title was staged for this doc. */
+export function acceptPendingTitle(docId) {
+    const filename = filenameByDocId(docId);
+    if (!filename)
+        return null;
+    const meta = (getActiveDocId() === docId)
+        ? getActivePendingMetadata()
+        : loadPendingMetadata(docId);
+    if (!meta?.title)
+        return null;
+    const { from, to } = meta.title;
+    // Order matters: clear pending FIRST so updateDocumentTitle's downstream
+    // setActiveDocument re-rehydration sees an empty sidecar metadata slot.
+    if (getActiveDocId() === docId) {
+        setActivePendingMetadata(null);
+    }
+    else {
+        savePendingMetadata(docId, null);
+    }
+    updateDocumentTitle(filename, to);
+    diagLog(`[Overlay] PENDING-TITLE ACCEPT docId=${docId} from="${from}" to="${to}"`);
+    return { from, to, filename };
+}
+/** Reject a staged title rename — discard the proposal without modifying
+ *  the .md file. Returns the {from, to} that was discarded, or null if no
+ *  pending title was staged. */
+export function rejectPendingTitle(docId) {
+    const filename = filenameByDocId(docId);
+    if (!filename)
+        return null;
+    const meta = (getActiveDocId() === docId)
+        ? getActivePendingMetadata()
+        : loadPendingMetadata(docId);
+    if (!meta?.title)
+        return null;
+    const { from, to } = meta.title;
+    if (getActiveDocId() === docId) {
+        setActivePendingMetadata(null);
+    }
+    else {
+        savePendingMetadata(docId, null);
+    }
+    diagLog(`[Overlay] PENDING-TITLE REJECT docId=${docId} from="${from}" to="${to}"`);
+    return { from, to, filename };
+}
+/** Lookup helper: read the currently-staged pending title for a docId, or
+ *  null if no proposal exists. Active doc → in-memory; otherwise → sidecar. */
+export function getPendingTitle(docId) {
+    const meta = (getActiveDocId() === docId)
+        ? getActivePendingMetadata()
+        : loadPendingMetadata(docId);
+    return meta?.title ?? null;
+}
 /** Open an existing file from any path. Saves current doc, registers as external, sets as active.
  *
  *  Canonicalizes the input path at the boundary so opening the same physical

package/dist/server/index.js

@@ -7,7 +7,7 @@ import { createServer } from 'http';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 import { existsSync, readFileSync } from 'fs';
-import { setupWebSocket, broadcastAgentStatus, broadcastDocumentSwitched, broadcastDocumentsChanged, broadcastWorkspacesChanged, broadcastMetadataChanged, broadcastPendingDocsChanged, broadcastSyncStatus, broadcastWritingStarted, broadcastWritingFinished, broadcastCommentsChanged, broadcastActivityLogSeed } from './ws.js';
+import { setupWebSocket, broadcastAgentStatus, broadcastDocumentSwitched, broadcastDocumentsChanged, broadcastWorkspacesChanged, broadcastMetadataChanged, broadcastPendingDocsChanged, broadcastWritingStarted, broadcastWritingFinished, broadcastCommentsChanged, broadcastActivityLogSeed } from './ws.js';
 import { TOOL_REGISTRY } from './mcp.js';
 import { z } from 'zod';
 import { zodToJsonSchema } from 'zod-to-json-schema';
@@ -21,7 +21,6 @@ import { markdownToTiptap } from './markdown.js';
 import { importGoogleDoc } from './gdoc-import.js';
 import { createVersionRouter } from './version-routes.js';
 import { clearVersionsCache } from './versions.js';
-import { createSyncRouter } from './sync-routes.js';
 import { removeDocFromAllWorkspaces } from './workspaces.js';
 import { resolveDocPath, getActiveProfile, setActiveProfile, listProfiles, createProfile, deleteProfile, listTrashedProfiles, restoreProfile, saveConfig, readConfig } from './helpers.js';
 import { createImageRouter } from './image-upload.js';
@@ -29,7 +28,6 @@ import { createExportRouter } from './export-routes.js';
 import { createConnectionRouter } from './connection-routes.js';
 import { createSchedulerRouter } from './scheduler-routes.js';
 import { createBillingRouter } from './billing-routes.js';
-import { createBlogRouter } from './blog-routes.js';
 import { createTaskRouter } from './task-routes.js';
 import { platformFetch, isAuthenticated } from './connections.js';
 import { PluginManager } from './plugin-manager.js';
@@ -111,8 +109,8 @@ export async function startHttpServer(options = {}) {
     });
     // Mount image upload + static serving
     app.use(createImageRouter());
-    // Mount sync routes
-    app.use(createSyncRouter(broadcastSyncStatus));
+    // Sync routes now provided by @openwriter/plugin-github (auto-enabled below
+    // if installed). SyncButton + SyncSetupModal hit /api/sync/* unchanged.
     // Mount export routes
     app.use(createExportRouter());
     // Mount connection CRUD + profile binding routes
@@ -121,8 +119,6 @@ export async function startHttpServer(options = {}) {
     app.use(createSchedulerRouter());
     // Mount billing proxy routes
     app.use(createBillingRouter());
-    // Mount blog publish routes
-    app.use(createBlogRouter());
     // Mount task CRUD routes
     app.use(createTaskRouter());
     // Newsletter analytics proxy routes
@@ -1024,6 +1020,18 @@ export async function startHttpServer(options = {}) {
                 console.error(`[Plugin] ${result.error}`);
         }
     }
+    // Migration: existing docs-sync users (config.gitConfigured === true from
+    // before the github-plugin lift) get the plugin auto-enabled so /api/sync/*
+    // routes keep responding. Runs once — the enable() call persists the flag
+    // into config.plugins for next boot.
+    const ghName = '@openwriter/plugin-github';
+    if (savedConfig.gitConfigured && !savedConfig.plugins?.[ghName]?.enabled) {
+        const result = await pluginManager.enable(ghName);
+        if (!result.success)
+            console.error(`[Plugin migration] ${result.error}`);
+        else
+            console.log('[Plugin migration] auto-enabled @openwriter/plugin-github for existing sync user');
+    }
     // Enabled plugins' context menu items (backward-compatible)
     app.get('/api/plugins', (_req, res) => {
         res.json({ plugins: pluginManager.getEnabledPluginDescriptors() });
@@ -1039,8 +1047,14 @@ export async function startHttpServer(options = {}) {
             res.status(400).json({ error: 'name is required' });
             return;
         }
-        const result = await pluginManager.enable(name);
-        res.json(result);
+        try {
+            const result = await pluginManager.enable(name);
+            res.json(result);
+        }
+        catch (err) {
+            console.error(`[Plugin] enable(${name}) threw:`, err?.message ?? err);
+            res.status(500).json({ success: false, error: err?.message ?? String(err) });
+        }
     });
     // Disable a plugin
     app.post('/api/plugins/disable', async (req, res) => {
@@ -1049,8 +1063,14 @@ export async function startHttpServer(options = {}) {
             res.status(400).json({ error: 'name is required' });
             return;
         }
-        const result = await pluginManager.disable(name);
-        res.json(result);
+        try {
+            const result = await pluginManager.disable(name);
+            res.json(result);
+        }
+        catch (err) {
+            console.error(`[Plugin] disable(${name}) threw:`, err?.message ?? err);
+            res.status(500).json({ success: false, error: err?.message ?? String(err) });
+        }
     });
     // Update plugin config
     app.post('/api/plugins/config', (req, res) => {

package/dist/server/markdown-parse.js

@@ -114,6 +114,22 @@ function normalizeTableBlankLines(markdown) {
     }
     return out.join('\n');
 }
+/**
+ * Parse a raw markdown file into a TipTap document. Returns CANONICAL-ONLY
+ * — the per-docId sidecar overlay (`_pending/{docId}.json`) is NOT loaded
+ * here. Callers that want "the user-visible doc" (any read surface — MCP
+ * tools, HTTP fetches, anything that shows content to the user) must use
+ * `loadDocFromDisk` from pending-overlay.ts instead. Bare callers of this
+ * function are the persistence-layer internals — save-time matcher,
+ * sync-check roundtripping, on-disk identity reads — that deliberately
+ * want pre-overlay canonical shape.
+ *
+ * The legacy rehydrate at line 176 handles the pre-fb666e6 in-frontmatter
+ * `pending:` field for migration purposes only. New writes never produce
+ * that field; the sidecar is authoritative.
+ *
+ * adr: adr/pending-overlay-model.md
+ */
 export function markdownToTiptap(markdown) {
     const result = matter(markdown);
     const { data, content } = result;
@@ -328,7 +344,17 @@ function tokensToTiptap(tokens) {
                 nodes.push(content[0]);
             }
             else {
-                nodes.push({ type: 'paragraph', attrs: { id: id || generateNodeId() }, content });
+                // Heal `<br><br>` paragraph fusion. A run of 2+ consecutive hardBreaks
+                // visually renders as a blank-line gap — i.e. a paragraph break — and
+                // the tweet editor's TweetEnterHardBreak keymap actively prevents
+                // authoring this state at the keyboard. The only way it lands in a
+                // body is the pre-6d0a75e mergeParagraphsToHardBreaks behavior that
+                // collapsed tweet writes into a single node before serializing, so
+                // splitting on import restores the original per-paragraph review
+                // unit (and the next save writes clean `\n\n` to disk).
+                // Single hardBreaks stay inline — they're legitimate intra-paragraph
+                // soft breaks (tweet line break, poem line).
+                nodes.push(...splitParagraphOnDoubleBreaks(content, id));
             }
             i += 3;
         }
@@ -757,3 +783,50 @@ function extractTrailingNodeId(content) {
     }
     return { content: newContent, id };
 }
+/**
+ * Split a paragraph's inline content at runs of 2+ consecutive `hardBreak`
+ * nodes. Returns one paragraph node per logical chunk. The first paragraph
+ * keeps the passed-in id (when present); the rest get fresh ids. Single
+ * `hardBreak`s pass through untouched.
+ *
+ * Empty groups (runs of breaks at the start/end, or back-to-back split points)
+ * are dropped, but at least one paragraph is always returned so an
+ * all-breaks input still serializes as an empty paragraph rather than
+ * vanishing.
+ */
+function splitParagraphOnDoubleBreaks(content, firstId) {
+    if (!content || content.length === 0) {
+        return [{ type: 'paragraph', attrs: { id: firstId || generateNodeId() }, content: [] }];
+    }
+    const groups = [];
+    let current = [];
+    let i = 0;
+    while (i < content.length) {
+        if (content[i].type === 'hardBreak') {
+            let j = i;
+            while (j < content.length && content[j].type === 'hardBreak')
+                j++;
+            const runLen = j - i;
+            if (runLen >= 2) {
+                groups.push(current);
+                current = [];
+            }
+            else {
+                current.push(content[i]);
+            }
+            i = j;
+        }
+        else {
+            current.push(content[i]);
+            i++;
+        }
+    }
+    groups.push(current);
+    const nonEmpty = groups.filter((g) => g.length > 0);
+    const final = nonEmpty.length > 0 ? nonEmpty : [[]];
+    return final.map((g, idx) => ({
+        type: 'paragraph',
+        attrs: { id: idx === 0 ? (firstId || generateNodeId()) : generateNodeId() },
+        content: g,
+    }));
+}