npm - openwriter - Versions diffs - 0.2.0 → 0.2.2 - Mend

openwriter 0.2.0 → 0.2.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 (21) hide show

package/README.md +7 -5
package/dist/client/assets/index-De-jpZgc.css +1 -0
package/dist/client/assets/index-FOERHzGc.js +205 -0
package/dist/client/index.html +2 -2
package/dist/server/compact.js +1 -2
package/dist/server/documents.js +6 -5
package/dist/server/index.js +88 -30
package/dist/server/link-routes.js +6 -5
package/dist/server/mcp.js +148 -76
package/dist/server/plugin-discovery.js +64 -0
package/dist/server/plugin-manager.js +155 -0
package/dist/server/state.js +197 -26
package/dist/server/workspace-routes.js +3 -24
package/dist/server/workspace-tags.js +0 -3
package/dist/server/workspace-types.js +0 -8
package/dist/server/workspaces.js +128 -38
package/dist/server/ws.js +63 -12
package/package.json +3 -2
package/skill/SKILL.md +112 -32
package/dist/client/assets/index-DNJs7lC-.js +0 -205
package/dist/client/assets/index-WweytMO1.css +0 -1

package/dist/client/index.html CHANGED Viewed

@@ -7,8 +7,8 @@
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link href="https://fonts.googleapis.com/css2?family=Charter:ital,wght@0,400;0,700;1,400&family=Crimson+Pro:ital,wght@0,300;0,400;0,600;0,700;1,400&family=DM+Sans:ital,wght@0,400;0,500;0,600;0,700;1,400&family=DM+Serif+Display&family=IBM+Plex+Mono:wght@400;500;600&family=IBM+Plex+Sans:wght@400;500;600&family=Inter:wght@400;500;600;700&family=Libre+Baskerville:ital,wght@0,400;0,700;1,400&family=Literata:ital,opsz,wght@0,7..72,400;0,7..72,600;0,7..72,700;1,7..72,400&family=Newsreader:ital,opsz,wght@0,6..72,400;0,6..72,600;1,6..72,400&family=Playfair+Display:wght@400;600;700;900&family=Source+Serif+4:ital,opsz,wght@0,8..60,400;0,8..60,600;0,8..60,700;1,8..60,400&family=Space+Grotesk:wght@400;500;600;700&family=Space+Mono:wght@400;700&display=swap" rel="stylesheet" />
-    <script type="module" crossorigin src="/assets/index-DNJs7lC-.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-WweytMO1.css">
+    <script type="module" crossorigin src="/assets/index-FOERHzGc.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-De-jpZgc.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/server/compact.js CHANGED Viewed

@@ -209,6 +209,5 @@ export function compactNodes(nodes) {
  * Used when agents send markdown strings as content in write_to_pad.
  */
 export function parseMarkdownContent(content) {
-    const nodes = markdownToNodes(content);
-    return nodes.length === 1 ? nodes[0] : nodes;
+    return markdownToNodes(content);
 }

package/dist/server/documents.js CHANGED Viewed

@@ -3,9 +3,10 @@
  * Manages listing, switching, creating, deleting documents.
  * Each document is a .md file in ~/.openwriter/.
  */
-import { existsSync, readFileSync, writeFileSync, unlinkSync, readdirSync, statSync, mkdirSync } from 'fs';
+import { existsSync, readFileSync, writeFileSync, readdirSync, statSync, mkdirSync } from 'fs';
 import { join } from 'path';
 import matter from 'gray-matter';
+import trash from 'trash';
 import { tiptapToMarkdown, markdownToTiptap } from './markdown.js';
 import { parseMarkdownContent } from './compact.js';
 import { getDocument, getTitle, getFilePath, save, cancelDebouncedSave, setActiveDocument, registerExternalDoc, unregisterExternalDoc, getExternalDocs, } from './state.js';
@@ -67,8 +68,8 @@ export function listDocuments() {
         }
         catch { /* skip unreadable external files */ }
     }
-    // Stable sort: alphabetical by filename (no reordering on switch)
-    files.sort((a, b) => a.filename.localeCompare(b.filename));
+    // Most recently modified first — new docs appear at top (matches spinner position)
+    files.sort((a, b) => new Date(b.lastModified).getTime() - new Date(a.lastModified).getTime());
     return files;
 }
 export function switchDocument(filename) {
@@ -140,7 +141,7 @@ export function createDocument(title, content, path) {
     writeFileSync(filePath, markdown, 'utf-8');
     return { document: getDocument(), title: getTitle(), filename };
 }
-export function deleteDocument(filename) {
+export async function deleteDocument(filename) {
     ensureDataDir();
     const targetPath = resolveDocPath(filename);
     // Unregister if external
@@ -153,7 +154,7 @@ export function deleteDocument(filename) {
     }
     const isDeletingActive = targetPath === getFilePath();
     if (existsSync(targetPath)) {
-        unlinkSync(targetPath);
+        await trash(targetPath);
     }
     if (isDeletingActive) {
         const remaining = readdirSync(DATA_DIR)

package/dist/server/index.js CHANGED Viewed

@@ -8,9 +8,9 @@ import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 import { existsSync } from 'fs';
 import { setupWebSocket, broadcastAgentStatus, broadcastDocumentSwitched, broadcastDocumentsChanged, broadcastWorkspacesChanged, broadcastSyncStatus } from './ws.js';
-import { startMcpServer, TOOL_REGISTRY, registerPluginTools } from './mcp.js';
+import { startMcpServer, TOOL_REGISTRY } from './mcp.js';
 import { startMcpClientServer } from './mcp-client.js';
-import { load, save, getDocument, getTitle, getFilePath, getDocId, getStatus, updateDocument, setMetadata, applyTextEdits, isAgentLocked, getPendingDocFilenames, getPendingDocCounts } from './state.js';
+import { load, save, getDocument, getTitle, getFilePath, getDocId, getStatus, updateDocument, setMetadata, applyTextEdits, isAgentLocked, getPendingDocFilenames, getPendingDocCounts, getDocTagsByFilename, addDocTag, removeDocTag } from './state.js';
 import { listDocuments, switchDocument, createDocument, deleteDocument, reloadDocument, updateDocumentTitle, openFile } from './documents.js';
 import { createWorkspaceRouter } from './workspace-routes.js';
 import { createLinkRouter } from './link-routes.js';
@@ -20,7 +20,7 @@ import { createVersionRouter } from './version-routes.js';
 import { createSyncRouter } from './sync-routes.js';
 import { createImageRouter } from './image-upload.js';
 import { createExportRouter } from './export-routes.js';
-import { loadPlugins } from './plugin-loader.js';
+import { PluginManager } from './plugin-manager.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 function isPortTaken(port) {
@@ -170,9 +170,9 @@ export async function startServer(options = {}) {
             res.status(500).json({ error: err.message });
         }
     });
-    app.delete('/api/documents/:filename', (req, res) => {
+    app.delete('/api/documents/:filename', async (req, res) => {
         try {
-            const result = deleteDocument(req.params.filename);
+            const result = await deleteDocument(req.params.filename);
             if (result.switched && result.newDoc) {
                 broadcastDocumentSwitched(result.newDoc.document, result.newDoc.title, result.newDoc.filename);
             }
@@ -196,7 +196,36 @@ export async function startServer(options = {}) {
             res.status(400).json({ error: err.message });
         }
     });
-    // Mount workspace CRUD + doc/container/tag routes
+    // Document-level tag routes
+    app.get('/api/doc-tags/:filename', (req, res) => {
+        res.json({ tags: getDocTagsByFilename(req.params.filename) });
+    });
+    app.post('/api/doc-tags/:filename', (req, res) => {
+        try {
+            const { tag } = req.body;
+            if (!tag?.trim()) {
+                res.status(400).json({ error: 'tag is required' });
+                return;
+            }
+            addDocTag(req.params.filename, tag.trim());
+            broadcastDocumentsChanged();
+            res.json({ success: true });
+        }
+        catch (err) {
+            res.status(400).json({ error: err.message });
+        }
+    });
+    app.delete('/api/doc-tags/:filename/:tag', (req, res) => {
+        try {
+            removeDocTag(req.params.filename, req.params.tag);
+            broadcastDocumentsChanged();
+            res.json({ success: true });
+        }
+        catch (err) {
+            res.status(400).json({ error: err.message });
+        }
+    });
+    // Mount workspace CRUD + doc/container routes
     app.use(createWorkspaceRouter({ broadcastWorkspacesChanged }));
     // Mount link-doc routes (create-link-doc, auto-tag-link)
     app.use(createLinkRouter({ broadcastDocumentsChanged, broadcastWorkspacesChanged }));
@@ -231,37 +260,66 @@ export async function startServer(options = {}) {
             res.status(400).json({ error: err.message });
         }
     });
-    // Load plugins
-    const pluginResult = await loadPlugins(options.plugins || [], options.pluginConfig || {});
-    for (const err of pluginResult.errors)
-        console.error(`[Plugin] ${err}`);
-    for (const { plugin, config } of pluginResult.plugins) {
-        if (plugin.registerRoutes)
-            await plugin.registerRoutes({ app, config });
-        if (plugin.mcpTools)
-            registerPluginTools(plugin.mcpTools(config));
-        console.log(`[Plugin] Loaded: ${plugin.name} v${plugin.version}`);
+    // Plugin Manager — discover, enable/disable, config persistence
+    const pluginManager = new PluginManager(app);
+    await pluginManager.discover();
+    // Auto-enable from --plugins CLI flag
+    for (const name of (options.plugins || [])) {
+        const result = await pluginManager.enable(name);
+        if (!result.success)
+            console.error(`[Plugin] ${result.error}`);
     }
-    // Plugin discovery endpoint — client fetches to build dynamic context menu
+    // Auto-enable from saved config.json
+    const savedConfig = (await import('./helpers.js')).readConfig();
+    for (const [name, state] of Object.entries(savedConfig.plugins || {})) {
+        if (state.enabled && !((options.plugins || []).includes(name))) {
+            const result = await pluginManager.enable(name);
+            if (!result.success)
+                console.error(`[Plugin] ${result.error}`);
+        }
+    }
+    // Enabled plugins' context menu items (backward-compatible)
     app.get('/api/plugins', (_req, res) => {
-        const descriptors = pluginResult.plugins.map(({ plugin }) => ({
-            name: plugin.name,
-            contextMenuItems: plugin.contextMenuItems?.() || [],
-        }));
-        res.json({ plugins: descriptors });
+        res.json({ plugins: pluginManager.getEnabledPluginDescriptors() });
+    });
+    // All discovered plugins with enabled status, configSchema, current config
+    app.get('/api/available-plugins', (_req, res) => {
+        res.json({ plugins: pluginManager.getAvailablePlugins() });
+    });
+    // Enable a plugin
+    app.post('/api/plugins/enable', async (req, res) => {
+        const { name } = req.body;
+        if (!name) {
+            res.status(400).json({ error: 'name is required' });
+            return;
+        }
+        const result = await pluginManager.enable(name);
+        res.json(result);
+    });
+    // Disable a plugin
+    app.post('/api/plugins/disable', async (req, res) => {
+        const { name } = req.body;
+        if (!name) {
+            res.status(400).json({ error: 'name is required' });
+            return;
+        }
+        const result = await pluginManager.disable(name);
+        res.json(result);
+    });
+    // Update plugin config
+    app.post('/api/plugins/config', (req, res) => {
+        const { name, config } = req.body;
+        if (!name || !config) {
+            res.status(400).json({ error: 'name and config are required' });
+            return;
+        }
+        const result = pluginManager.updateConfig(name, config);
+        res.json(result);
     });
     // Plugin action dispatch — client sends action payload, routed to correct plugin
     app.post('/api/plugin-action', async (req, res) => {
         try {
             const payload = req.body;
-            const prefix = payload.action.split(':')[0];
-            const loaded = pluginResult.plugins.find(({ plugin }) => plugin.contextMenuItems?.().some((item) => item.action.startsWith(prefix + ':')));
-            if (!loaded) {
-                res.status(404).json({ error: `No plugin handles action "${payload.action}"` });
-                return;
-            }
-            // Forward to plugin's registered route — plugins handle their own actions
-            // via routes registered in registerRoutes(). The client calls those directly.
             res.status(404).json({ error: 'Use plugin-registered routes directly' });
         }
         catch (err) {

package/dist/server/link-routes.js CHANGED Viewed

@@ -4,9 +4,10 @@
  */
 import { Router } from 'express';
 import { existsSync, writeFileSync } from 'fs';
-import { listWorkspaces, getWorkspace, addDoc, addContainerToWorkspace, tagDoc } from './workspaces.js';
+import { listWorkspaces, getWorkspace, addDoc, addContainerToWorkspace } from './workspaces.js';
 import { collectAllFiles } from './workspace-tree.js';
 import { getActiveFilename } from './documents.js';
+import { addDocTag } from './state.js';
 import { filePathForTitle, ensureDataDir } from './helpers.js';
 import { tiptapToMarkdown } from './markdown.js';
 export function createLinkRouter(b) {
@@ -61,10 +62,10 @@ export function createLinkRouter(b) {
                     }
                     // 5. Tag with "linked"
                     try {
-                        tagDoc(wsInfo.filename, filename, 'linked');
+                        addDocTag(filename, 'linked');
                     }
                     catch {
-                        // Doc not in workspace or already tagged
+                        // Already tagged or file missing
                     }
                 }
                 catch {
@@ -97,7 +98,7 @@ export function createLinkRouter(b) {
                     // Both source and target must be in same workspace
                     if (!wsFiles.includes(currentFilename) || !wsFiles.includes(targetFile))
                         continue;
-                    tagDoc(wsInfo.filename, targetFile, 'linked');
+                    addDocTag(targetFile, 'linked');
                     tagged = true;
                 }
                 catch {
@@ -105,7 +106,7 @@ export function createLinkRouter(b) {
                 }
             }
             if (tagged)
-                b.broadcastWorkspacesChanged();
+                b.broadcastDocumentsChanged();
             res.json({ success: true, tagged });
         }
         catch (err) {

package/dist/server/mcp.js CHANGED Viewed

@@ -6,13 +6,13 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { z } from 'zod';
-import { getDocument, getWordCount, getPendingChangeCount, getTitle, getStatus, getNodesByIds, getMetadata, setMetadata, applyChanges, applyTextEdits, updateDocument, save, markAllNodesAsPending, } from './state.js';
-import { listDocuments, switchDocument, createDocument, openFile, getActiveFilename } from './documents.js';
-import { broadcastDocumentSwitched, broadcastDocumentsChanged, broadcastWorkspacesChanged, broadcastTitleChanged, broadcastPendingDocsChanged } from './ws.js';
-import { listWorkspaces, getWorkspace, getDocTitle, getItemContext, addDoc, updateWorkspaceContext, createWorkspace, addContainerToWorkspace, tagDoc, untagDoc, moveDoc } from './workspaces.js';
+import { getDocument, getWordCount, getPendingChangeCount, getTitle, getStatus, getNodesByIds, getMetadata, setMetadata, applyChanges, applyTextEdits, updateDocument, save, markAllNodesAsPending, setAgentLock, } from './state.js';
+import { listDocuments, switchDocument, createDocument, deleteDocument, openFile, getActiveFilename } from './documents.js';
+import { broadcastDocumentSwitched, broadcastDocumentsChanged, broadcastWorkspacesChanged, broadcastTitleChanged, broadcastPendingDocsChanged, broadcastWritingStarted, broadcastWritingFinished } from './ws.js';
+import { listWorkspaces, getWorkspace, getDocTitle, getItemContext, addDoc, updateWorkspaceContext, createWorkspace, deleteWorkspace, addContainerToWorkspace, findOrCreateWorkspace, findOrCreateContainer, moveDoc } from './workspaces.js';
+import { addDocTag, removeDocTag, getDocTagsByFilename } from './state.js';
 import { importGoogleDoc } from './gdoc-import.js';
 import { toCompactFormat, compactNodes, parseMarkdownContent } from './compact.js';
-import { markdownToTiptap } from './markdown.js';
 export const TOOL_REGISTRY = [
     {
         name: 'read_pad',
@@ -26,7 +26,7 @@ export const TOOL_REGISTRY = [
     },
     {
         name: 'write_to_pad',
-        description: 'Preferred tool for all document edits. Send 3-8 changes per call for responsive feel. Multiple rapid calls better than one monolithic call. Content can be a markdown string (preferred) or TipTap JSON. Markdown strings are auto-converted. Changes appear as pending decorations the user accepts or rejects.',
+        description: 'Preferred tool for all document edits. Send 3-8 changes per call for responsive feel. Multiple rapid calls better than one monolithic call. Content can be a markdown string (preferred) or TipTap JSON. Markdown strings are auto-converted. Changes appear as pending decorations the user accepts or rejects. Use afterNodeId: "end" to append to the document without knowing node IDs. Response includes lastNodeId for chaining subsequent inserts.',
         schema: {
             changes: z.array(z.object({
                 operation: z.enum(['rewrite', 'insert', 'delete']),
@@ -43,7 +43,7 @@ export const TOOL_REGISTRY = [
                 }
                 return resolved;
             });
-            const appliedCount = applyChanges(processed);
+            const { count: appliedCount, lastNodeId } = applyChanges(processed);
             broadcastPendingDocsChanged();
             return {
                 content: [{
@@ -51,6 +51,7 @@ export const TOOL_REGISTRY = [
                         text: JSON.stringify({
                             success: appliedCount > 0,
                             appliedCount,
+                            ...(lastNodeId ? { lastNodeId } : {}),
                             ...(appliedCount < processed.length ? { skipped: processed.length - appliedCount } : {}),
                         }),
                     }],
@@ -96,6 +97,7 @@ export const TOOL_REGISTRY = [
             filename: z.string().describe('Filename of the document to switch to (e.g. "My Essay.md")'),
         },
         handler: async ({ filename }) => {
+            broadcastWritingFinished(); // Clear any in-progress creation spinner
             const result = switchDocument(filename);
             broadcastDocumentSwitched(result.document, result.title, result.filename);
             const compact = toCompactFormat(result.document, result.title, getWordCount(), getPendingChangeCount());
@@ -104,29 +106,101 @@ export const TOOL_REGISTRY = [
     },
     {
         name: 'create_document',
-        description: 'Create a new document and switch to it. Always provide a title — documents without one show as "Untitled". Saves the current document first. Accepts optional content as markdown string or TipTap JSON — if provided, the document is created with that content. Without content, creates an empty document. Use `path` to create the file at a specific location instead of ~/.openwriter/.',
+        description: 'Create a new empty document and switch to it. Always provide a title. Saves the current document first. Shows a sidebar spinner that persists until populate_document is called — always call populate_document next to add content. If workspace is provided, the doc is automatically added to it (workspace is created if it doesn\'t exist). If container is also provided, the doc is placed inside that container (created if it doesn\'t exist).',
         schema: {
             title: z.string().optional().describe('Title for the new document. Defaults to "Untitled".'),
-            content: z.any().optional().describe('Initial content: markdown string (preferred) or TipTap JSON doc object. If omitted, document starts empty.'),
             path: z.string().optional().describe('Absolute file path to create the document at (e.g. "C:/projects/doc.md"). If omitted, creates in ~/.openwriter/.'),
+            workspace: z.string().optional().describe('Workspace title to add this doc to. Creates the workspace if it doesn\'t exist.'),
+            container: z.string().optional().describe('Container name within the workspace (e.g. "Chapters", "Notes", "References"). Creates the container if it doesn\'t exist. Requires workspace.'),
+        },
+        handler: async ({ title, path, workspace, container }) => {
+            // Resolve workspace/container up front so spinner renders in the right place
+            let wsTarget;
+            if (workspace) {
+                const ws = findOrCreateWorkspace(workspace);
+                let containerId = null;
+                if (container) {
+                    const c = findOrCreateContainer(ws.filename, container);
+                    containerId = c.containerId;
+                }
+                wsTarget = { wsFilename: ws.filename, containerId };
+                broadcastWorkspacesChanged(); // Browser sees container structure before spinner
+            }
+            broadcastWritingStarted(title || 'Untitled', wsTarget);
+            // Yield so the browser receives and renders the placeholder before heavy work
+            await new Promise((resolve) => setTimeout(resolve, 200));
+            try {
+                // Lock browser doc-updates: prevents race where browser sends a doc-update
+                // for the previous document but server has already switched active doc.
+                setAgentLock();
+                const result = createDocument(title, undefined, path);
+                setMetadata({ agentCreated: true });
+                save(); // Persist agentCreated flag to frontmatter
+                // Auto-add to workspace if specified (defer sidebar broadcasts to populate_document
+                // so the real doc entry doesn't appear alongside the spinner placeholder)
+                let wsInfo = '';
+                if (wsTarget) {
+                    addDoc(wsTarget.wsFilename, wsTarget.containerId, result.filename, result.title);
+                    wsInfo = ` → workspace "${workspace}"${container ? ` / ${container}` : ''}`;
+                }
+                // Spinner persists until populate_document is called
+                return {
+                    content: [{
+                            type: 'text',
+                            text: `Created "${result.title}" (${result.filename})${wsInfo} — empty. Call populate_document to add content.`,
+                        }],
+                };
+            }
+            catch (err) {
+                broadcastWritingFinished();
+                throw err;
+            }
+        },
+    },
+    {
+        name: 'populate_document',
+        description: 'Populate the active document with content. Use after create_document (without content) to complete the two-step creation flow. Content appears as pending decorations for user review. Clears the sidebar creation spinner and shows the document.',
+        schema: {
+            content: z.any().describe('Document content: markdown string (preferred) or TipTap JSON doc object.'),
         },
-        handler: async ({ title, content, path }) => {
-            const result = createDocument(title, content, path);
-            if (content) {
-                const doc = getDocument();
+        handler: async ({ content }) => {
+            try {
+                let doc;
+                if (typeof content === 'string') {
+                    doc = { type: 'doc', content: parseMarkdownContent(content) };
+                }
+                else if (content?.type === 'doc' && Array.isArray(content.content)) {
+                    doc = content;
+                }
+                else {
+                    broadcastWritingFinished();
+                    return {
+                        content: [{ type: 'text', text: 'Error: content must be a markdown string or TipTap JSON { type: "doc", content: [...] }' }],
+                    };
+                }
+                setAgentLock(); // Block browser doc-updates during population
                 markAllNodesAsPending(doc, 'insert');
                 updateDocument(doc);
                 save();
+                // Broadcast sidebar updates first (deferred from create_document) so the doc
+                // entry and spinner removal arrive in the same render cycle
+                broadcastDocumentsChanged();
+                broadcastWorkspacesChanged();
+                broadcastDocumentSwitched(doc, getTitle(), getActiveFilename());
+                broadcastPendingDocsChanged();
+                broadcastWritingFinished();
+                const wordCount = getWordCount();
+                return {
+                    content: [{
+                            type: 'text',
+                            text: `Populated "${getTitle()}" — ${wordCount.toLocaleString()} words`,
+                        }],
+                };
+            }
+            catch (err) {
+                broadcastWritingFinished();
+                throw err;
             }
-            broadcastDocumentSwitched(result.document, result.title, result.filename);
-            broadcastPendingDocsChanged();
-            const wordCount = getWordCount();
-            return {
-                content: [{
-                        type: 'text',
-                        text: `Created "${result.title}" (${result.filename})${wordCount > 0 ? ` — ${wordCount} words` : ''}`,
-                    }],
-            };
         },
     },
     {
@@ -143,43 +217,22 @@ export const TOOL_REGISTRY = [
         },
     },
     {
-        name: 'replace_document',
-        description: 'Only for importing external content into a new/blank document. Never use to edit a document you already wrote — use write_to_pad instead. Accepts markdown string (preferred) or TipTap JSON. Optionally updates the title.',
+        name: 'delete_document',
+        description: 'Delete a document file. Moves to OS trash (Recycle Bin / macOS Trash). If deleting the active document, automatically switches to the most recent remaining doc. Cannot delete the last document. IMPORTANT: Always confirm with the user before calling this tool.',
         schema: {
-            content: z.any().describe('New document content: markdown string (preferred) or TipTap JSON { type: "doc", content: [...] }'),
-            title: z.string().optional().describe('New title for the document. If omitted, title is unchanged (or extracted from markdown frontmatter).'),
-        },
-        handler: async ({ content, title }) => {
-            let doc;
-            let newTitle = title;
-            if (typeof content === 'string') {
-                const parsed = markdownToTiptap(content);
-                doc = parsed.document;
-                if (!newTitle && parsed.title !== 'Untitled')
-                    newTitle = parsed.title;
-            }
-            else if (content?.type === 'doc' && Array.isArray(content.content)) {
-                doc = content;
+            filename: z.string().describe('Filename of the document to delete (e.g. "My Essay.md")'),
+        },
+        handler: async ({ filename }) => {
+            const result = await deleteDocument(filename);
+            if (result.switched && result.newDoc) {
+                broadcastDocumentSwitched(result.newDoc.document, result.newDoc.title, result.newDoc.filename);
             }
-            else {
-                return {
-                    content: [{ type: 'text', text: JSON.stringify({ success: false, error: 'content must be a markdown string or TipTap JSON { type: "doc", content: [...] }' }) }],
-                };
+            broadcastDocumentsChanged();
+            let text = `Deleted "${filename}" (moved to trash)`;
+            if (result.switched && result.newDoc) {
+                text += `. Switched to "${result.newDoc.filename}"`;
             }
-            const status = getWordCount() === 0 ? 'insert' : 'rewrite';
-            markAllNodesAsPending(doc, status);
-            updateDocument(doc);
-            if (newTitle)
-                setMetadata({ title: newTitle });
-            save();
-            broadcastDocumentSwitched(doc, newTitle || getTitle(), getActiveFilename());
-            broadcastPendingDocsChanged();
-            return {
-                content: [{
-                        type: 'text',
-                        text: `Document replaced — ${getWordCount().toLocaleString()} words${newTitle ? `, title: "${newTitle}"` : ''}`,
-                    }],
-            };
+            return { content: [{ type: 'text', text }] };
         },
     },
     {
@@ -253,9 +306,26 @@ export const TOOL_REGISTRY = [
             return { content: [{ type: 'text', text: `Created workspace "${info.title}" (${info.filename})` }] };
         },
     },
+    {
+        name: 'delete_workspace',
+        description: 'Delete a workspace and all its document files. Files go to OS trash (Recycle Bin / macOS Trash). IMPORTANT: Always confirm with the user before calling this tool.',
+        schema: {
+            filename: z.string().describe('Workspace manifest filename (e.g. "my-novel-a1b2c3d4.json")'),
+        },
+        handler: async ({ filename }) => {
+            const result = await deleteWorkspace(filename);
+            broadcastWorkspacesChanged();
+            broadcastDocumentsChanged();
+            let text = `Deleted workspace "${filename}" and ${result.deletedFiles.length} files: ${result.deletedFiles.join(', ')}`;
+            if (result.skippedExternal.length > 0) {
+                text += `\nSkipped ${result.skippedExternal.length} external files (not owned by OpenWriter): ${result.skippedExternal.join(', ')}`;
+            }
+            return { content: [{ type: 'text', text }] };
+        },
+    },
     {
         name: 'get_workspace_structure',
-        description: 'Get the full structure of a workspace: tree of containers and docs, tags index, plus context (characters, settings, rules). Use to understand workspace organization before writing.',
+        description: 'Get the full structure of a workspace: tree of containers and docs, per-doc tags, plus context (characters, settings, rules). Use to understand workspace organization before writing.',
         schema: {
             filename: z.string().describe('Workspace manifest filename (e.g. "my-novel-a1b2c3d4.json")'),
         },
@@ -265,7 +335,9 @@ export const TOOL_REGISTRY = [
                 const lines = [];
                 for (const node of nodes) {
                     if (node.type === 'doc') {
-                        lines.push(`${indent}${getDocTitle(node.file)}  (${node.file})`);
+                        const tags = getDocTagsByFilename(node.file);
+                        const tagStr = tags.length > 0 ? `  [${tags.join(', ')}]` : '';
+                        lines.push(`${indent}${getDocTitle(node.file)}  (${node.file})${tagStr}`);
                     }
                     else {
                         lines.push(`${indent}[container] ${node.name}  (id:${node.id})`);
@@ -276,13 +348,6 @@ export const TOOL_REGISTRY = [
             }
             const treeLines = renderTree(ws.root, '  ');
             let text = `workspace: "${ws.title}"\nstructure:\n${treeLines.join('\n') || '  (empty)'}`;
-            const tagEntries = Object.entries(ws.tags);
-            if (tagEntries.length > 0) {
-                text += '\ntags:';
-                for (const [tag, files] of tagEntries) {
-                    text += `\n  ${tag}: ${files.join(', ')}`;
-                }
-            }
             if (ws.context && Object.keys(ws.context).length > 0) {
                 text += `\ncontext:\n${JSON.stringify(ws.context, null, 2)}`;
             }
@@ -350,29 +415,27 @@ export const TOOL_REGISTRY = [
     },
     {
         name: 'tag_doc',
-        description: 'Add a tag to a document in a workspace. Tags are cross-cutting — a doc can have multiple tags.',
+        description: 'Add a tag to a document. Tags are stored in the document\'s frontmatter — they travel with the file. A doc can have multiple tags.',
         schema: {
-            workspaceFile: z.string().describe('Workspace manifest filename'),
-            docFile: z.string().describe('Document filename'),
+            docFile: z.string().describe('Document filename (e.g. "Chapter 1.md")'),
             tag: z.string().describe('Tag name to add'),
         },
-        handler: async ({ workspaceFile, docFile, tag }) => {
-            tagDoc(workspaceFile, docFile, tag);
-            broadcastWorkspacesChanged();
+        handler: async ({ docFile, tag }) => {
+            addDocTag(docFile, tag);
+            broadcastDocumentsChanged();
             return { content: [{ type: 'text', text: `Tagged "${docFile}" with [${tag}]` }] };
         },
     },
     {
         name: 'untag_doc',
-        description: 'Remove a tag from a document in a workspace.',
+        description: 'Remove a tag from a document.',
         schema: {
-            workspaceFile: z.string().describe('Workspace manifest filename'),
             docFile: z.string().describe('Document filename'),
             tag: z.string().describe('Tag name to remove'),
         },
-        handler: async ({ workspaceFile, docFile, tag }) => {
-            untagDoc(workspaceFile, docFile, tag);
-            broadcastWorkspacesChanged();
+        handler: async ({ docFile, tag }) => {
+            removeDocTag(docFile, tag);
+            broadcastDocumentsChanged();
             return { content: [{ type: 'text', text: `Removed tag [${tag}] from "${docFile}"` }] };
         },
     },
@@ -444,6 +507,15 @@ export function registerPluginTools(tools) {
         });
     }
 }
+/** Remove MCP tools by name. Existing MCP stdio sessions won't see removal until reconnect. */
+export function removePluginTools(names) {
+    const nameSet = new Set(names);
+    for (let i = TOOL_REGISTRY.length - 1; i >= 0; i--) {
+        if (nameSet.has(TOOL_REGISTRY[i].name)) {
+            TOOL_REGISTRY.splice(i, 1);
+        }
+    }
+}
 export async function startMcpServer() {
     const server = new McpServer({
         name: 'open-writer',