@templatical/core 0.48.0 → 0.49.0

package/README.md

@@ -45,6 +45,8 @@ watch(editor.content, (next) => {
 
 - `useEditor` — reactive state (content, selection, viewport, darkMode, isDirty) + mutation methods (`addBlock`, `removeBlock`, `moveBlock`, `updateBlock`, `updateSettings`, `selectBlock`, …)
 - `useHistory` — undo/redo stack
+- `useCollaboration` — the real-time collaboration controller over a `CollaborationProvider`: ordered operation batches, block locks, presence, and undo/redo as inverse operations
+- `diffContent` / `invertOperations` — the operations between two contents, and the guarded operations that undo a batch
 - `useHistoryInterceptor` — wraps mutation methods so they push onto the history stack automatically
 - `useBlockActions` — higher-level helpers built on top of `useEditor` (`createAndAddBlock(type)`, `duplicateBlock`, `deleteBlock`, `updateBlockProperty`)
 - `useAutoSave` — debounced save with onSave callback
@@ -55,7 +57,7 @@ watch(editor.content, (next) => {
 
 ## Cloud subpath
 
-The `@templatical/core/cloud` subpath provides Templatical Cloud integrations (Auth, API client, WebSocket, AI chat/rewrite, collaboration, comments, scoring, and `createCloudSavedBlocksProvider`). Used by `@templatical/editor`'s `initCloud()`.
+The `@templatical/core/cloud` subpath provides Templatical Cloud integrations (Auth, API client, WebSocket, AI chat/rewrite, comments, scoring, and `createCloudSavedBlocksProvider`). Used by `@templatical/editor`'s `initCloud()`.
 
 ## Documentation
 

package/dist/cloud/index.d.ts

@@ -1,5 +1,4 @@
-import { r as UseEditorReturn } from "../editor-Bl4WsPU3.js";
-import { AiChatMessage, AiConfig, AuthConfig, AuthRequestOptions, Block, Collaborator, CommentResponse, CommentsProvider, CustomFont, ExportResult, FontsConfig, HealthCheckResult, MediaProvider, MergeTag, PlanConfig, PlanFeatures, RenderProvider, SavedBlock, SavedBlocksProvider, ScoringCategory, ScoringFinding, ScoringResult, SdkAuthConfig, Template, TemplateContent, TemplateOperationPayload, TemplatePatch, TemplateVersionResponse, TemplatesProvider, TestEmailConfig, TestEmailProvider, UserConfig, VersionHistoryProvider, WebSocketServerConfig } from "@templatical/types";
+import { AiChatMessage, AiConfig, AuthConfig, AuthRequestOptions, Block, CommentResponse, CommentsProvider, CustomFont, ExportResult, FontsConfig, HealthCheckResult, MediaProvider, MergeTag, PlanConfig, PlanFeatures, RenderProvider, SavedBlock, SavedBlocksProvider, ScoringCategory, ScoringFinding, ScoringResult, SdkAuthConfig, Template, TemplateContent, TemplatePatch, TemplateVersionResponse, TemplatesProvider, TestEmailConfig, TestEmailProvider, UserConfig, VersionHistoryProvider, WebSocketServerConfig } from "@templatical/types";
 import { ComputedRef, Ref, ref } from "vue";
 import { Channel, PresenceChannel } from "pusher-js";
 //#region src/cloud/auth.d.ts
@@ -292,9 +291,6 @@ export declare class WebSocketClient {
   get isConnected(): boolean;
 }
 //#endregion
-//#region src/cloud/mcp-operation-handler.d.ts
-export declare function handleOperation(editor: UseEditorReturn, payload: TemplateOperationPayload): void;
-//#endregion
 //#region src/cloud/ai-chat.d.ts
 interface UseAiChatOptions {
   authManager: AuthManager;
@@ -439,45 +435,6 @@ interface CreateCloudCommentsProviderOptions {
  */
 export declare function createCloudCommentsProvider(options: CreateCloudCommentsProviderOptions): CommentsProvider;
 //#endregion
-//#region src/cloud/collaboration.d.ts
-interface UseCollaborationOptions {
-  authManager: AuthManager;
-  editor: UseEditorReturn;
-  channel: Ref<PresenceChannel | null>;
-  onError?: (error: Error) => void;
-  onCollaboratorJoined?: (collaborator: Collaborator) => void;
-  onCollaboratorLeft?: (collaborator: Collaborator) => void;
-  onBlockLocked?: (event: {
-    blockId: string;
-    collaborator: Collaborator;
-  }) => void;
-  onBlockUnlocked?: (event: {
-    blockId: string;
-    collaborator: Collaborator;
-  }) => void;
-}
-interface UseCollaborationReturn {
-  collaborators: Ref<Collaborator[]>;
-  lockedBlocks: Ref<Map<string, Collaborator>>;
-}
-export declare function useCollaboration(options: UseCollaborationOptions): UseCollaborationReturn & {
-  _broadcastOperation: (payload: TemplateOperationPayload) => void;
-  _isProcessingRemoteOperation: () => boolean;
-};
-//#endregion
-//#region src/cloud/collaboration-broadcast.d.ts
-interface BroadcastTarget {
-  _broadcastOperation: (payload: TemplateOperationPayload) => void;
-}
-/**
- * Wraps editor mutation methods to broadcast operations to collaboration
- * peers after each mutation executes. Mutates the editor object in place.
- *
- * Must be applied **before** the history interceptor so the call chain is:
- * history.record() → broadcast + original mutation.
- */
-export declare function useCollaborationBroadcast(editor: Pick<UseEditorReturn, "addBlock" | "updateBlock" | "removeBlock" | "moveBlock" | "updateSettings" | "setContent">, collaboration: BroadcastTarget): void;
-//#endregion
 //#region src/cloud/web-socket.d.ts
 interface UseWebSocketOptions {
   authManager: AuthManager;
@@ -733,13 +690,5 @@ interface HealthCheckOptions {
 }
 export declare function performHealthCheck(options?: HealthCheckOptions): Promise<HealthCheckResult>;
 //#endregion
-//#region src/cloud/mcp-listener.d.ts
-interface UseMcpListenerOptions {
-  editor: UseEditorReturn;
-  channel: Ref<PresenceChannel | null>;
-  onOperation?: (payload: TemplateOperationPayload) => void;
-}
-export declare function useMcpListener(options: UseMcpListenerOptions): void;
-//#endregion
-export type { AuthConfig, AuthRequestOptions, CloudMediaBrowseParams, CloudMediaBrowseResponse, CloudMediaFolder, CloudMediaItem, CloudMediaUsageInfo, CloudMediaUsageResponse, CreateCloudCommentsProviderOptions, CreateCloudRenderProviderOptions, CreateCloudTestEmailProviderOptions, DesignReferenceInput, ExportFontsPayload, PresenceMember, RealtimeChannel, SdkAuthConfig, TestEmailConfig, UseAiChatOptions, UseAiChatReturn, UseAiConfigReturn, UseAiRewriteOptions, UseAiRewriteReturn, UseCollaborationOptions, UseCollaborationReturn, UseDesignReferenceOptions, UseDesignReferenceReturn, UseExportOptions, UseExportReturn, UseMcpListenerOptions, UsePlanConfigOptions, UsePlanConfigReturn, UseTemplateScoringOptions, UseTemplateScoringReturn, UseTestEmailOptions, UseTestEmailReturn, UseWebSocketOptions, UseWebSocketReturn, UserConfig, WebSocketClientOptions, WebSocketConfig };
+export type { AuthConfig, AuthRequestOptions, CloudMediaBrowseParams, CloudMediaBrowseResponse, CloudMediaFolder, CloudMediaItem, CloudMediaUsageInfo, CloudMediaUsageResponse, CreateCloudCommentsProviderOptions, CreateCloudRenderProviderOptions, CreateCloudTestEmailProviderOptions, DesignReferenceInput, ExportFontsPayload, PresenceMember, RealtimeChannel, SdkAuthConfig, TestEmailConfig, UseAiChatOptions, UseAiChatReturn, UseAiConfigReturn, UseAiRewriteOptions, UseAiRewriteReturn, UseDesignReferenceOptions, UseDesignReferenceReturn, UseExportOptions, UseExportReturn, UsePlanConfigOptions, UsePlanConfigReturn, UseTemplateScoringOptions, UseTemplateScoringReturn, UseTestEmailOptions, UseTestEmailReturn, UseWebSocketOptions, UseWebSocketReturn, UserConfig, WebSocketClientOptions, WebSocketConfig };
 //# sourceMappingURL=index.d.ts.map

package/dist/cloud/index.js

@@ -1,5 +1,5 @@
 import { SdkError } from "@templatical/types";
-import { computed, onScopeDispose, ref, watch } from "vue";
+import { computed, ref, watch } from "vue";
 //#region src/cloud/auth.ts
 /**
 * Whether a token-refresh failure is worth interrupting the user over.
@@ -693,32 +693,6 @@ var WebSocketClient = class {
 	}
 };
 //#endregion
-//#region src/cloud/mcp-operation-handler.ts
-function handleOperation(editor, payload) {
-	const { operation, data } = payload;
-	switch (operation) {
-		case "addBlock":
-			editor.addBlock(data.block, data.sectionId, data.columnIndex, data.index);
-			break;
-		case "updateBlock":
-			editor.updateBlock(data.blockId, data.updates);
-			break;
-		case "deleteBlock":
-			editor.removeBlock(data.blockId);
-			break;
-		case "moveBlock":
-			editor.moveBlock(data.blockId, data.index, data.sectionId, data.columnIndex);
-			break;
-		case "updateSettings":
-			editor.updateSettings(data.updates);
-			break;
-		case "setContent":
-			editor.setContent(data.content);
-			break;
-		case "updateBlockStyle": editor.updateBlock(data.blockId, { styles: data.styles });
-	}
-}
-//#endregion
 //#region src/cloud/ai-chat.ts
 let messageIdCounter = 0;
 function generateMessageId() {
@@ -1461,247 +1435,6 @@ function createCloudCommentsProvider(options) {
 	};
 }
 //#endregion
-//#region src/cloud/collaboration.ts
-const COLLAB_EVENTS = [
-	"pusher:member_added",
-	"pusher:member_removed",
-	"client-blockLocked",
-	"client-blockUnlocked",
-	"client-operation",
-	"mcp-operation"
-];
-function unbindCollabEvents(channel) {
-	for (const event of COLLAB_EVENTS) channel.unbind(event);
-}
-const COLLABORATOR_COLORS = [
-	"#3b82f6",
-	"#ef4444",
-	"#10b981",
-	"#f59e0b",
-	"#8b5cf6",
-	"#ec4899",
-	"#06b6d4",
-	"#f97316",
-	"#6366f1",
-	"#14b8a6"
-];
-function useCollaboration(options) {
-	const { authManager, editor, channel } = options;
-	const collaborators = ref([]);
-	const lockedBlocks = ref(/* @__PURE__ */ new Map());
-	let colorIndex = 0;
-	let isProcessingRemoteOperation = false;
-	const myUserId = computed(() => authManager.userConfig?.id ?? "");
-	function assignColor() {
-		const color = COLLABORATOR_COLORS[colorIndex % COLLABORATOR_COLORS.length];
-		colorIndex++;
-		return color;
-	}
-	function addCollaborator(member) {
-		if (member.id === myUserId.value) return;
-		if (collaborators.value.some((c) => c.id === member.id)) return;
-		const collaborator = {
-			id: member.id,
-			name: member.name,
-			color: assignColor(),
-			selectedBlockId: null
-		};
-		collaborators.value = [...collaborators.value, collaborator];
-		return collaborator;
-	}
-	function removeCollaborator(memberId) {
-		const newLockedBlocks = new Map(lockedBlocks.value);
-		for (const [blockId, collaborator] of newLockedBlocks) if (collaborator.id === memberId) newLockedBlocks.delete(blockId);
-		lockedBlocks.value = newLockedBlocks;
-		collaborators.value = collaborators.value.filter((c) => c.id !== memberId);
-	}
-	function handleBlockLocked(data) {
-		const collaborator = collaborators.value.find((c) => c.id === data.userId);
-		if (!collaborator) return;
-		collaborators.value = collaborators.value.map((c) => c.id === data.userId ? {
-			...c,
-			selectedBlockId: data.blockId
-		} : c);
-		const newLockedBlocks = new Map(lockedBlocks.value);
-		for (const [blockId, holder] of newLockedBlocks) if (holder.id === data.userId) newLockedBlocks.delete(blockId);
-		newLockedBlocks.set(data.blockId, {
-			...collaborator,
-			selectedBlockId: data.blockId
-		});
-		lockedBlocks.value = newLockedBlocks;
-		if (editor.state.selectedBlockId === data.blockId) editor.selectBlock(null);
-	}
-	function handleBlockUnlocked(data) {
-		const newLockedBlocks = new Map(lockedBlocks.value);
-		const holder = newLockedBlocks.get(data.blockId);
-		newLockedBlocks.delete(data.blockId);
-		lockedBlocks.value = newLockedBlocks;
-		if (holder) collaborators.value = collaborators.value.map((c) => c.id === holder.id ? {
-			...c,
-			selectedBlockId: null
-		} : c);
-	}
-	function handleRemoteOperation(payload) {
-		isProcessingRemoteOperation = true;
-		try {
-			handleOperation(editor, payload);
-		} finally {
-			isProcessingRemoteOperation = false;
-		}
-	}
-	function broadcastOperation(payload) {
-		if (!channel.value || isProcessingRemoteOperation) return;
-		channel.value.trigger("client-operation", payload);
-	}
-	function broadcastBlockLocked(blockId) {
-		if (!channel.value) return;
-		channel.value.trigger("client-blockLocked", {
-			blockId,
-			userId: myUserId.value
-		});
-	}
-	function broadcastBlockUnlocked(blockId) {
-		if (!channel.value) return;
-		channel.value.trigger("client-blockUnlocked", { blockId });
-	}
-	watch(() => editor.state.selectedBlockId, (newBlockId, oldBlockId) => {
-		if (isProcessingRemoteOperation) return;
-		if (oldBlockId) broadcastBlockUnlocked(oldBlockId);
-		if (newBlockId) broadcastBlockLocked(newBlockId);
-	});
-	watch(channel, (newChannel, oldChannel) => {
-		if (oldChannel) unbindCollabEvents(oldChannel);
-		if (!newChannel) {
-			collaborators.value = [];
-			lockedBlocks.value = /* @__PURE__ */ new Map();
-			colorIndex = 0;
-			return;
-		}
-		const members = newChannel.members;
-		if (members) members.each((member) => {
-			addCollaborator(member.info);
-		});
-		newChannel.bind("pusher:member_added", (member) => {
-			const collaborator = addCollaborator(member.info);
-			if (collaborator) options.onCollaboratorJoined?.(collaborator);
-		});
-		newChannel.bind("pusher:member_removed", (member) => {
-			const collaborator = collaborators.value.find((c) => c.id === member.id);
-			removeCollaborator(member.id);
-			if (collaborator) options.onCollaboratorLeft?.(collaborator);
-		});
-		newChannel.bind("client-blockLocked", (data) => {
-			handleBlockLocked(data);
-			const collaborator = collaborators.value.find((c) => c.id === data.userId);
-			if (collaborator) options.onBlockLocked?.({
-				blockId: data.blockId,
-				collaborator
-			});
-		});
-		newChannel.bind("client-blockUnlocked", (data) => {
-			const holder = lockedBlocks.value.get(data.blockId);
-			handleBlockUnlocked(data);
-			if (holder) options.onBlockUnlocked?.({
-				blockId: data.blockId,
-				collaborator: holder
-			});
-		});
-		newChannel.bind("client-operation", (payload) => {
-			handleRemoteOperation(payload);
-		});
-		newChannel.bind("mcp-operation", (payload) => {
-			handleRemoteOperation(payload);
-		});
-	});
-	onScopeDispose(() => {
-		if (channel.value) unbindCollabEvents(channel.value);
-	});
-	return {
-		collaborators,
-		lockedBlocks,
-		_broadcastOperation: broadcastOperation,
-		_isProcessingRemoteOperation: () => isProcessingRemoteOperation
-	};
-}
-//#endregion
-//#region src/cloud/collaboration-broadcast.ts
-/**
-* Wraps editor mutation methods to broadcast operations to collaboration
-* peers after each mutation executes. Mutates the editor object in place.
-*
-* Must be applied **before** the history interceptor so the call chain is:
-* history.record() → broadcast + original mutation.
-*/
-function useCollaborationBroadcast(editor, collaboration) {
-	const originalAddBlock = editor.addBlock;
-	const originalUpdateBlock = editor.updateBlock;
-	const originalRemoveBlock = editor.removeBlock;
-	const originalMoveBlock = editor.moveBlock;
-	const originalUpdateSettings = editor.updateSettings;
-	const originalSetContent = editor.setContent;
-	editor.addBlock = (block, targetSectionId, columnIndex, index) => {
-		originalAddBlock(block, targetSectionId, columnIndex, index);
-		collaboration._broadcastOperation({
-			operation: "addBlock",
-			data: {
-				block,
-				sectionId: targetSectionId,
-				columnIndex,
-				index
-			},
-			timestamp: Date.now()
-		});
-	};
-	editor.updateBlock = (blockId, updates) => {
-		originalUpdateBlock(blockId, updates);
-		collaboration._broadcastOperation({
-			operation: "updateBlock",
-			data: {
-				blockId,
-				updates
-			},
-			timestamp: Date.now()
-		});
-	};
-	editor.removeBlock = (blockId) => {
-		originalRemoveBlock(blockId);
-		collaboration._broadcastOperation({
-			operation: "deleteBlock",
-			data: { blockId },
-			timestamp: Date.now()
-		});
-	};
-	editor.moveBlock = (blockId, newIndex, targetSectionId, columnIndex) => {
-		originalMoveBlock(blockId, newIndex, targetSectionId, columnIndex);
-		collaboration._broadcastOperation({
-			operation: "moveBlock",
-			data: {
-				blockId,
-				index: newIndex,
-				sectionId: targetSectionId,
-				columnIndex
-			},
-			timestamp: Date.now()
-		});
-	};
-	editor.updateSettings = (updates) => {
-		originalUpdateSettings(updates);
-		collaboration._broadcastOperation({
-			operation: "updateSettings",
-			data: { updates },
-			timestamp: Date.now()
-		});
-	};
-	editor.setContent = (content, markDirty) => {
-		originalSetContent(content, markDirty);
-		collaboration._broadcastOperation({
-			operation: "setContent",
-			data: { content },
-			timestamp: Date.now()
-		});
-	};
-}
-//#endregion
 //#region src/cloud/web-socket.ts
 function useWebSocket(options) {
 	const { authManager, onError } = options;
@@ -2357,18 +2090,6 @@ async function performHealthCheck(options = {}) {
 	};
 }
 //#endregion
-//#region src/cloud/mcp-listener.ts
-function useMcpListener(options) {
-	const { editor, channel, onOperation } = options;
-	watch(channel, (newChannel, oldChannel) => {
-		if (oldChannel) oldChannel.unbind("mcp-operation");
-		if (newChannel) newChannel.bind("mcp-operation", (payload) => {
-			handleOperation(editor, payload);
-			onOperation?.(payload);
-		});
-	});
-}
-//#endregion
-export { API_ROUTES, ApiClient, AuthManager, MediaApiClient, WebSocketClient, buildUrl, createCloudCommentsProvider, createCloudMediaProvider, createCloudRenderProvider, createCloudSavedBlocksProvider, createCloudTemplatesProvider, createCloudTestEmailProvider, createCloudVersionHistoryProvider, createSdkAuthManager, handleOperation, isFatalAuthError, performHealthCheck, resolveExportFonts, resolveWebSocketConfig, useAiChat, useAiConfig, useAiRewrite, useCollaboration, useCollaborationBroadcast, useDesignReference, useExport, useMcpListener, usePlanConfig, useTemplateScoring, useTestEmail, useWebSocket };
+export { API_ROUTES, ApiClient, AuthManager, MediaApiClient, WebSocketClient, buildUrl, createCloudCommentsProvider, createCloudMediaProvider, createCloudRenderProvider, createCloudSavedBlocksProvider, createCloudTemplatesProvider, createCloudTestEmailProvider, createCloudVersionHistoryProvider, createSdkAuthManager, isFatalAuthError, performHealthCheck, resolveExportFonts, resolveWebSocketConfig, useAiChat, useAiConfig, useAiRewrite, useDesignReference, useExport, usePlanConfig, useTemplateScoring, useTestEmail, useWebSocket };
 
 //# sourceMappingURL=index.js.map