From 812c199b45b83776739dd6688e71f98f835ba79a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=B7=E5=B8=83=E5=8A=B3=E5=A4=96=20=C2=B7=20=E8=B4=BE?= =?UTF-8?q?=E8=B4=B5?= <472285740@qq.com> Date: Tue, 15 Jul 2025 10:34:01 +0800 Subject: [PATCH] feat: split individual semantic change (#13155) ## Summary by CodeRabbit * **New Features** * Introduced a new AI-powered document update feature, allowing users to apply multiple independent block-level edits to Markdown documents. * Added support for applying document updates via a new GraphQL query, enabling seamless integration with the frontend. * **Enhancements** * Improved the document editing tool to handle and display multiple simultaneous edit operations with better UI feedback and state management. * Expanded model support with new "morph-v3-fast" and "morph-v3-large" options for document update operations. * Enhanced frontend components and services to support asynchronous application and acceptance of multiple document edits independently. * **Bug Fixes** * Enhanced error handling and user notifications for failed document update operations. * **Documentation** * Updated tool descriptions and examples to clarify the new multi-edit workflow and expected input/output formats. > CLOSE AI-337 --- .../src/plugins/copilot/prompt/prompts.ts | 161 ++++++++++++ .../src/plugins/copilot/providers/morph.ts | 18 ++ .../src/plugins/copilot/providers/provider.ts | 1 + .../src/plugins/copilot/providers/utils.ts | 14 +- .../server/src/plugins/copilot/resolver.ts | 67 ++++- .../src/plugins/copilot/tools/doc-edit.ts | 184 +++++++------ packages/backend/server/src/schema.gql | 3 + .../src/graphql/copilot-apply-doc-updates.gql | 3 + packages/common/graphql/src/graphql/index.ts | 13 + packages/common/graphql/src/schema.ts | 26 ++ .../core/src/blocksuite/ai/actions/types.ts | 6 + .../ai/components/ai-tools/doc-edit.ts | 244 ++++++++++++------ .../blocksuite/ai/provider/copilot-client.ts | 18 ++ .../blocksuite/ai/provider/setup-provider.tsx | 8 + .../src/blocksuite/ai/services/block-diff.ts | 4 +- 15 files changed, 610 insertions(+), 160 deletions(-) create mode 100644 packages/common/graphql/src/graphql/copilot-apply-doc-updates.gql diff --git a/packages/backend/server/src/plugins/copilot/prompt/prompts.ts b/packages/backend/server/src/plugins/copilot/prompt/prompts.ts index 3a790e2a77..c17ccd1361 100644 --- a/packages/backend/server/src/plugins/copilot/prompt/prompts.ts +++ b/packages/backend/server/src/plugins/copilot/prompt/prompts.ts @@ -1624,6 +1624,166 @@ const imageActions: Prompt[] = [ }, ]; +const modelActions: Prompt[] = [ + { + name: 'Apply Updates', + action: 'Apply Updates', + model: 'claude-sonnet-4@20250514', + messages: [ + { + role: 'user', + content: ` +You are a Markdown document update engine. + +You will be given: + +1. content: The original Markdown document + - The content is structured into blocks. + - Each block starts with a comment like and contains the block's content. + - The content is {{content}} + +2. op: A description of the edit intention + - This describes the semantic meaning of the edit, such as "Bold the first paragraph". + - The op is {{op}} + +3. updates: A Markdown snippet + - The updates is {{updates}} + - This represents the block-level changes to apply to the original Markdown. + - The update may: + - **Replace** an existing block (same block_id, new content) + - **Delete** block(s) using + - **Insert** new block(s) with a new unique block_id + - When performing deletions, the update will include **surrounding context blocks** (or use ) to help you determine where and what to delete. + +Your task: +- Apply the update in to the document in , following the intent described in . +- Preserve all block_id and flavour comments. +- Maintain the original block order unless the update clearly appends new blocks. +- Do not remove or alter unrelated blocks. +- Output only the fully updated Markdown content. Do not wrap the content in \`\`\`markdown. + +--- + +✍️ Examples + +✅ Replacement (modifying an existing block) + + + +## Introduction + + +This document provides an overview of the system architecture and its components. + + + +Make the introduction more formal. + + + + +This document outlines the architectural design and individual components of the system in detail. + + +Expected Output: + +## Introduction + + +This document outlines the architectural design and individual components of the system in detail. + +--- + +➕ Insertion (adding new content) + + + +# Project Summary + + +This project aims to build a collaborative text editing tool. + + + +Add a disclaimer section at the end. + + + + +## Disclaimer + + +This document is subject to change. Do not distribute externally. + + +Expected Output: + +# Project Summary + + +This project aims to build a collaborative text editing tool. + + +## Disclaimer + + +This document is subject to change. Do not distribute externally. + +--- + +❌ Deletion (removing blocks) + + + +## Author + + +Written by the AI team at OpenResearch. + + +## Experimental Section + + +The following section is still under development and may change without notice. + + +## License + + +This document is licensed under CC BY-NC 4.0. + + + +Remove the experimental section. + + + + + + + +Expected Output: + +## Author + + +Written by the AI team at OpenResearch. + + +## License + + +This document is licensed under CC BY-NC 4.0. + +--- + +Now apply the \`updates\` to the \`content\`, following the intent in \`op\`, and return the updated Markdown. +`, + }, + ], + }, +]; + const CHAT_PROMPT: Omit = { model: 'claude-sonnet-4@20250514', optionalModels: [ @@ -1861,6 +2021,7 @@ const artifactActions: Prompt[] = [ export const prompts: Prompt[] = [ ...textActions, ...imageActions, + ...modelActions, ...chat, ...workflows, ...artifactActions, diff --git a/packages/backend/server/src/plugins/copilot/providers/morph.ts b/packages/backend/server/src/plugins/copilot/providers/morph.ts index 6d41f3f56b..36f96c9f26 100644 --- a/packages/backend/server/src/plugins/copilot/providers/morph.ts +++ b/packages/backend/server/src/plugins/copilot/providers/morph.ts @@ -37,6 +37,24 @@ export class MorphProvider extends CopilotProvider { }, ], }, + { + id: 'morph-v3-fast', + capabilities: [ + { + input: [ModelInputType.Text], + output: [ModelOutputType.Text], + }, + ], + }, + { + id: 'morph-v3-large', + capabilities: [ + { + input: [ModelInputType.Text], + output: [ModelOutputType.Text], + }, + ], + }, ]; #instance!: VercelOpenAICompatibleProvider; diff --git a/packages/backend/server/src/plugins/copilot/providers/provider.ts b/packages/backend/server/src/plugins/copilot/providers/provider.ts index bfd390dfbd..5d2315afa0 100644 --- a/packages/backend/server/src/plugins/copilot/providers/provider.ts +++ b/packages/backend/server/src/plugins/copilot/providers/provider.ts @@ -172,6 +172,7 @@ export abstract class CopilotProvider { const getDocContent = buildContentGetter(ac, docReader); tools.doc_edit = createDocEditTool( this.factory, + prompt, getDocContent.bind(null, options) ); break; diff --git a/packages/backend/server/src/plugins/copilot/providers/utils.ts b/packages/backend/server/src/plugins/copilot/providers/utils.ts index b91e01ba06..426d70a44f 100644 --- a/packages/backend/server/src/plugins/copilot/providers/utils.ts +++ b/packages/backend/server/src/plugins/copilot/providers/utils.ts @@ -472,10 +472,18 @@ export class TextStreamParser { result = this.addPrefix(result); switch (chunk.toolName) { case 'doc_edit': { - if (chunk.result && typeof chunk.result === 'object') { - result += `\n${chunk.result.result}\n`; + if ( + chunk.result && + typeof chunk.result === 'object' && + Array.isArray(chunk.result.result) + ) { + result += chunk.result.result + .map(item => { + return `\n${item.changedContent}\n`; + }) + .join(''); this.docEditFootnotes[this.docEditFootnotes.length - 1].result = - chunk.result.result; + result; } else { this.docEditFootnotes.pop(); } diff --git a/packages/backend/server/src/plugins/copilot/resolver.ts b/packages/backend/server/src/plugins/copilot/resolver.ts index 47aa613f50..7c46738a15 100644 --- a/packages/backend/server/src/plugins/copilot/resolver.ts +++ b/packages/backend/server/src/plugins/copilot/resolver.ts @@ -23,6 +23,7 @@ import { CallMetric, CopilotDocNotFound, CopilotFailedToCreateMessage, + CopilotProviderSideError, CopilotSessionNotFound, type FileUpload, paginate, @@ -31,15 +32,18 @@ import { RequestMutex, Throttle, TooManyRequest, + UserFriendlyError, } from '../../base'; import { CurrentUser } from '../../core/auth'; import { Admin } from '../../core/common'; +import { DocReader } from '../../core/doc'; import { AccessController } from '../../core/permission'; import { UserType } from '../../core/user'; import type { ListSessionOptions, UpdateChatSession } from '../../models'; import { CopilotCronJobs } from './cron'; import { PromptService } from './prompt'; import { PromptMessage, StreamObject } from './providers'; +import { CopilotProviderFactory } from './providers/factory'; import { ChatSessionService } from './session'; import { CopilotStorage } from './storage'; import { type ChatHistory, type ChatMessage, SubmittedMessage } from './types'; @@ -397,7 +401,9 @@ export class CopilotResolver { private readonly ac: AccessController, private readonly mutex: RequestMutex, private readonly chatSession: ChatSessionService, - private readonly storage: CopilotStorage + private readonly storage: CopilotStorage, + private readonly docReader: DocReader, + private readonly providerFactory: CopilotProviderFactory ) {} @ResolveField(() => CopilotQuotaType, { @@ -725,6 +731,65 @@ export class CopilotResolver { } } + @Query(() => String, { + description: + 'Apply updates to a doc using LLM and return the merged markdown.', + }) + async applyDocUpdates( + @CurrentUser() user: CurrentUser, + @Args({ name: 'workspaceId', type: () => String }) + workspaceId: string, + @Args({ name: 'docId', type: () => String }) + docId: string, + @Args({ name: 'op', type: () => String }) + op: string, + @Args({ name: 'updates', type: () => String }) + updates: string + ): Promise { + await this.assertPermission(user, { workspaceId, docId }); + + const docContent = await this.docReader.getDocMarkdown( + workspaceId, + docId, + true + ); + if (!docContent || !docContent.markdown) { + throw new NotFoundException('Doc not found or empty'); + } + + const markdown = docContent.markdown.trim(); + + // Get LLM provider + const provider = + await this.providerFactory.getProviderByModel('morph-v3-large'); + if (!provider) { + throw new BadRequestException('No LLM provider available'); + } + + try { + return await provider.text( + { modelId: 'morph-v3-large' }, + [ + { + role: 'user', + content: `${op}\n${markdown}\n${updates}`, + }, + ], + { reasoning: false } + ); + } catch (e: any) { + if (e instanceof UserFriendlyError) { + throw e; + } else { + throw new CopilotProviderSideError({ + provider: provider.type, + kind: 'unexpected_response', + message: e?.message || 'Unexpected apply response', + }); + } + } + } + private transformToSessionType( session: Omit ): CopilotSessionType { diff --git a/packages/backend/server/src/plugins/copilot/tools/doc-edit.ts b/packages/backend/server/src/plugins/copilot/tools/doc-edit.ts index ed1ee64fed..20ec4b76c6 100644 --- a/packages/backend/server/src/plugins/copilot/tools/doc-edit.ts +++ b/packages/backend/server/src/plugins/copilot/tools/doc-edit.ts @@ -3,6 +3,7 @@ import { z } from 'zod'; import { DocReader } from '../../../core/doc'; import { AccessController } from '../../../core/permission'; +import { type PromptService } from '../prompt'; import type { CopilotChatOptions, CopilotProviderFactory } from '../providers'; export const buildContentGetter = (ac: AccessController, doc: DocReader) => { @@ -24,14 +25,20 @@ export const buildContentGetter = (ac: AccessController, doc: DocReader) => { export const createDocEditTool = ( factory: CopilotProviderFactory, + prompt: PromptService, getContent: (targetId?: string) => Promise ) => { return tool({ description: ` -Use this tool to propose an edit to a structured Markdown document with identifiable blocks. Each block begins with a comment like , and represents a unit of editable content such as a heading, paragraph, list, or code snippet. +Use this tool to propose an edit to a structured Markdown document with identifiable blocks. +Each block begins with a comment like , and represents a unit of editable content such as a heading, paragraph, list, or code snippet. This will be read by a less intelligent model, which will quickly apply the edit. You should make it clear what the edit is, while also minimizing the unchanged code you write. -Your task is to return a list of block-level changes needed to fulfill the user's intent. Each change should correspond to a specific user instruction and be represented by one of the following operations: +If you receive a markdown without block_id comments, you should call \`doc_read\` tool to get the content. + +Your task is to return a list of block-level changes needed to fulfill the user's intent. **Each change in code_edit must be completely independent: each code_edit entry should only perform a single, isolated change, and must not include the effects of other changes. For example, the updates for a delete operation should only show the context related to the deletion, and must not include any content modified by other operations (such as bolding or insertion). This ensures that each change can be applied independently and in any order.** + +Each change should correspond to a specific user instruction and be represented by one of the following operations: replace: Replace the content of a block with updated Markdown. @@ -41,83 +48,75 @@ insert: Add a new block, and specify its block_id and content. Important Instructions: - Use the existing block structure as-is. Do not reformat or reorder blocks unless explicitly asked. -- Always preserve block_id and type in your replacements. -- When replacing a block, use the full new block including and the updated content. - When inserting, follow the same format as a replacement, but ensure the new block_id does not conflict with existing IDs. +- When replacing content, always keep the original block_id unchanged. +- When deleting content, only use the format , and only for valid block_id present in the original content. - Each list item should be a block. -- Use for unchanged sections. -- If you plan on deleting a section, you must provide surrounding context to indicate the deletion. +- Your task is to return a list of block-level changes needed to fulfill the user's intent. +- **Each change in code_edit must be completely independent: each code_edit entry should only perform a single, isolated change, and must not include the effects of other changes. For example, the updates for a delete operation should only show the context related to the deletion, and must not include any content modified by other operations (such as bolding or insertion). This ensures that each change can be applied independently and in any order.** -Example Input Document: -\`\`\`md - -# My Holiday Plan +Original Content: +\`\`\`markdown + +# Andriy Shevchenko - -I plan to travel to Paris, France, where I will visit the Eiffel Tower, the Louvre, and the Champs-Élysées. + +## Player Profile - -I love Paris. + +Andriy Shevchenko is a legendary Ukrainian striker, best known for his time at AC Milan and Dynamo Kyiv. He won the Ballon d'Or in 2004. - -## Reason for the delay + +## Career Overview - -This plan has been brewing for a long time, but I always postponed it because I was too busy with work. - - -## Trip Steps - - -- Book flight tickets - -- Reserve a hotel - -- Prepare visa documents - -- Plan the itinerary - - -Additionally, I plan to learn some basic French to make communication easier during the trip. + +- Born in 1976 in Ukraine. + +- Rose to fame at Dynamo Kyiv in the 1990s. + +- Starred at AC Milan (1999–2006), scoring over 170 goals. + +- Played for Chelsea (2006–2009) before returning to Kyiv. + +- Coached Ukraine national team, reaching Euro 2020 quarter-finals. \`\`\` -Example User Request: - +User Request： \`\`\` -Translate the trip steps to Chinese, remove the reason for the delay, and bold the final paragraph. +Bold the player’s name in the intro, add a summary section at the end, and remove the career overview. \`\`\` -Expected Output: - -\`\`\`md - - - -I plan to travel to Paris, France, where I will visit the Eiffel Tower, the Louvre, and the Champs-Élysées. - - -I love Paris. - - - - - - -## Trip Steps - - -- 订机票 - -- 预定酒店 - -- 准备签证材料 - -- 规划行程 - - - - -**Additionally, I plan to learn some basic French to make communication easier during the trip.** +Example response: +\`\`\`json +[ + { + "op": "Bold the player's name in the introduction", + "updates": " + + **Andriy Shevchenko** is a legendary Ukrainian striker, best known for his time at AC Milan and Dynamo Kyiv. He won the Ballon d'Or in 2004. + " + }, + { + "op": "Add a summary section at the end", + "updates": " + + ## Summary + + Shevchenko is celebrated as one of the greatest Ukrainian footballers of all time. Known for his composure, strength, and goal-scoring instinct, he left a lasting legacy both on and off the pitch. + " + }, + { + "op": "Delete the career overview section", + "updates": " + + + + + + + " + } +] \`\`\` You should specify the following arguments before the others: [doc_id], [origin_content] @@ -144,14 +143,32 @@ You should specify the following arguments before the others: [doc_id], [origin_ ), code_edit: z - .string() + .array( + z.object({ + op: z + .string() + .describe( + 'A short description of the change, such as "Bold intro name"' + ), + updates: z + .string() + .describe( + 'Markdown block fragments that represent the change, including the block_id and type' + ), + }) + ) .describe( - 'Specify only the necessary Markdown block-level changes. Return a list of inserted, replaced, or deleted blocks. Each block must start with its comment. Use for unchanged sections.If you plan on deleting a section, you must provide surrounding context to indicate the deletion.' + 'An array of independent semantic changes to apply to the document.' ), }), execute: async ({ doc_id, origin_content, code_edit }) => { try { - const provider = await factory.getProviderByModel('morph-v2'); + const applyPrompt = await prompt.get('Apply Updates'); + if (!applyPrompt) { + return 'Prompt not found'; + } + const model = applyPrompt.model; + const provider = await factory.getProviderByModel(model); if (!provider) { return 'Editing docs is not supported'; } @@ -160,14 +177,27 @@ You should specify the following arguments before the others: [doc_id], [origin_ if (!content) { return 'Doc not found or doc is empty'; } - const result = await provider.text({ modelId: 'morph-v2' }, [ - { - role: 'user', - content: `${content}\n${code_edit}`, - }, - ]); - return { result, content }; + const changedContents = await Promise.all( + code_edit.map(async edit => { + return await provider.text({ modelId: model }, [ + ...applyPrompt.finish({ + content, + op: edit.op, + updates: edit.updates, + }), + ]); + }) + ); + + return { + result: changedContents.map((changedContent, index) => ({ + op: code_edit[index].op, + updates: code_edit[index].updates, + originalContent: content, + changedContent, + })), + }; } catch { return 'Failed to apply edit to the doc'; } diff --git a/packages/backend/server/src/schema.gql b/packages/backend/server/src/schema.gql index 160f798137..69a1e89387 100644 --- a/packages/backend/server/src/schema.gql +++ b/packages/backend/server/src/schema.gql @@ -1518,6 +1518,9 @@ type PublicUserType { type Query { """get the whole app configuration""" appConfig: JSONObject! + + """Apply updates to a doc using LLM and return the merged markdown.""" + applyDocUpdates(docId: String!, op: String!, updates: String!, workspaceId: String!): String! collectAllBlobSizes: WorkspaceBlobSizes! @deprecated(reason: "use `user.quotaUsage` instead") """Get current user""" diff --git a/packages/common/graphql/src/graphql/copilot-apply-doc-updates.gql b/packages/common/graphql/src/graphql/copilot-apply-doc-updates.gql new file mode 100644 index 0000000000..94b1e95089 --- /dev/null +++ b/packages/common/graphql/src/graphql/copilot-apply-doc-updates.gql @@ -0,0 +1,3 @@ +query applyDocUpdates($workspaceId: String!, $docId: String!, $op: String!, $updates: String!) { + applyDocUpdates(workspaceId: $workspaceId, docId: $docId, op: $op, updates: $updates) +} \ No newline at end of file diff --git a/packages/common/graphql/src/graphql/index.ts b/packages/common/graphql/src/graphql/index.ts index 3ced05cf44..019e27c2d0 100644 --- a/packages/common/graphql/src/graphql/index.ts +++ b/packages/common/graphql/src/graphql/index.ts @@ -555,6 +555,19 @@ export const uploadCommentAttachmentMutation = { file: true, }; +export const applyDocUpdatesQuery = { + id: 'applyDocUpdatesQuery' as const, + op: 'applyDocUpdates', + query: `query applyDocUpdates($workspaceId: String!, $docId: String!, $op: String!, $updates: String!) { + applyDocUpdates( + workspaceId: $workspaceId + docId: $docId + op: $op + updates: $updates + ) +}`, +}; + export const addContextCategoryMutation = { id: 'addContextCategoryMutation' as const, op: 'addContextCategory', diff --git a/packages/common/graphql/src/schema.ts b/packages/common/graphql/src/schema.ts index 89071a8e62..5f7fe418c8 100644 --- a/packages/common/graphql/src/schema.ts +++ b/packages/common/graphql/src/schema.ts @@ -2073,6 +2073,8 @@ export interface Query { __typename?: 'Query'; /** get the whole app configuration */ appConfig: Scalars['JSONObject']['output']; + /** Apply updates to a doc using LLM and return the merged markdown. */ + applyDocUpdates: Scalars['String']['output']; /** @deprecated use `user.quotaUsage` instead */ collectAllBlobSizes: WorkspaceBlobSizes; /** Get current user */ @@ -2120,6 +2122,13 @@ export interface Query { workspaces: Array; } +export interface QueryApplyDocUpdatesArgs { + docId: Scalars['String']['input']; + op: Scalars['String']['input']; + updates: Scalars['String']['input']; + workspaceId: Scalars['String']['input']; +} + export interface QueryErrorArgs { name: ErrorNames; } @@ -3509,6 +3518,18 @@ export type UploadCommentAttachmentMutation = { uploadCommentAttachment: string; }; +export type ApplyDocUpdatesQueryVariables = Exact<{ + workspaceId: Scalars['String']['input']; + docId: Scalars['String']['input']; + op: Scalars['String']['input']; + updates: Scalars['String']['input']; +}>; + +export type ApplyDocUpdatesQuery = { + __typename?: 'Query'; + applyDocUpdates: string; +}; + export type AddContextCategoryMutationVariables = Exact<{ options: AddContextCategoryInput; }>; @@ -6148,6 +6169,11 @@ export type Queries = variables: ListCommentsQueryVariables; response: ListCommentsQuery; } + | { + name: 'applyDocUpdatesQuery'; + variables: ApplyDocUpdatesQueryVariables; + response: ApplyDocUpdatesQuery; + } | { name: 'listContextObjectQuery'; variables: ListContextObjectQueryVariables; diff --git a/packages/frontend/core/src/blocksuite/ai/actions/types.ts b/packages/frontend/core/src/blocksuite/ai/actions/types.ts index 54f995b81b..92e7c5810b 100644 --- a/packages/frontend/core/src/blocksuite/ai/actions/types.ts +++ b/packages/frontend/core/src/blocksuite/ai/actions/types.ts @@ -348,6 +348,12 @@ declare global { files?: ContextMatchedFileChunk[]; docs?: ContextMatchedDocChunk[]; }>; + applyDocUpdates: ( + workspaceId: string, + docId: string, + op: string, + updates: string + ) => Promise; } // TODO(@Peng): should be refactored to get rid of implement details (like messages, action, role, etc.) diff --git a/packages/frontend/core/src/blocksuite/ai/components/ai-tools/doc-edit.ts b/packages/frontend/core/src/blocksuite/ai/components/ai-tools/doc-edit.ts index 1552bd4c45..390485fe69 100644 --- a/packages/frontend/core/src/blocksuite/ai/components/ai-tools/doc-edit.ts +++ b/packages/frontend/core/src/blocksuite/ai/components/ai-tools/doc-edit.ts @@ -2,6 +2,7 @@ import track from '@affine/track'; import { WithDisposable } from '@blocksuite/affine/global/lit'; import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme'; import { type EditorHost, ShadowlessElement } from '@blocksuite/affine/std'; +import { AIStarIconWithAnimation } from '@blocksuite/affine-components/icons'; import type { NotificationService } from '@blocksuite/affine-shared/services'; import { CloseIcon, @@ -14,7 +15,9 @@ import { } from '@blocksuite/icons/lit'; import { css, html, nothing } from 'lit'; import { property, state } from 'lit/decorators.js'; +import { repeat } from 'lit/directives/repeat.js'; +import { AIProvider } from '../../provider'; import { BlockDiffProvider } from '../../services/block-diff'; import { diffMarkdown } from '../../utils/apply-model/markdown-diff'; import { copyText } from '../../utils/editor-actions'; @@ -37,8 +40,12 @@ interface DocEditToolResult { }; result: | { - result: string; - content: string; + result: { + op: string; + updates: string; + originalContent: string; + changedContent: string; + }[]; } | ToolError | null; @@ -199,40 +206,108 @@ export class DocEditTool extends WithDisposable(ShadowlessElement) { @state() accessor isCollapsed = false; + @state() + accessor applyingMap: Record = {}; + + @state() + accessor acceptingMap: Record = {}; + get blockDiffService() { return this.host?.std.getOptional(BlockDiffProvider); } - private async _handleApply(markdown: string) { - if (!this.host || this.data.type !== 'tool-result') { - return; - } - track.applyModel.chat.$.apply({ - instruction: this.data.args.instructions, - }); - await this.blockDiffService?.apply(this.host.store, markdown); + get isBusy() { + return undefined; } - private async _handleReject(changedMarkdown: string) { + isBusyForOp(op: string) { + return this.applyingMap[op] || this.acceptingMap[op]; + } + + private async _handleApply(op: string, updates: string) { + if ( + !this.host || + this.data.type !== 'tool-result' || + this.isBusyForOp(op) + ) { + return; + } + this.applyingMap = { ...this.applyingMap, [op]: true }; + try { + const markdown = await AIProvider.context?.applyDocUpdates( + this.host.std.workspace.id, + this.data.args.doc_id, + op, + updates + ); + if (!markdown) { + return; + } + track.applyModel.chat.$.apply({ + instruction: this.data.args.instructions, + operation: op, + }); + await this.blockDiffService?.apply(this.host.store, markdown); + } catch (error) { + this.notificationService.notify({ + title: 'Failed to apply updates', + message: error instanceof Error ? error.message : 'Unknown error', + accent: 'error', + onClose: function (): void {}, + }); + } finally { + this.applyingMap = { ...this.applyingMap, [op]: false }; + } + } + + private async _handleReject(op: string) { if (!this.host || this.data.type !== 'tool-result') { return; } + // TODO: set the rejected status track.applyModel.chat.$.reject({ instruction: this.data.args.instructions, + operation: op, }); - this.blockDiffService?.setChangedMarkdown(changedMarkdown); + this.blockDiffService?.setChangedMarkdown(null); this.blockDiffService?.rejectAll(); } - private async _handleAccept(changedMarkdown: string) { - if (!this.host || this.data.type !== 'tool-result') { + private async _handleAccept(op: string, updates: string) { + if ( + !this.host || + this.data.type !== 'tool-result' || + this.isBusyForOp(op) + ) { return; } - track.applyModel.chat.$.accept({ - instruction: this.data.args.instructions, - }); - await this.blockDiffService?.apply(this.host.store, changedMarkdown); - await this.blockDiffService?.acceptAll(this.host.store); + this.acceptingMap = { ...this.acceptingMap, [op]: true }; + try { + const changedMarkdown = await AIProvider.context?.applyDocUpdates( + this.host.std.workspace.id, + this.data.args.doc_id, + op, + updates + ); + if (!changedMarkdown) { + return; + } + track.applyModel.chat.$.accept({ + instruction: this.data.args.instructions, + operation: op, + }); + await this.blockDiffService?.apply(this.host.store, changedMarkdown); + await this.blockDiffService?.acceptAll(this.host.store); + } catch (error) { + this.notificationService.notify({ + title: 'Failed to apply updates', + message: error instanceof Error ? error.message : 'Unknown error', + accent: 'error', + onClose: function (): void {}, + }); + } finally { + this.acceptingMap = { ...this.acceptingMap, [op]: false }; + } } private async _toggleCollapse() { @@ -322,69 +397,84 @@ export class DocEditTool extends WithDisposable(ShadowlessElement) { const result = this.data.result; - if (result && 'result' in result && 'content' in result) { - const { result: changedMarkdown, content } = result; - const { instructions, doc_id: docId } = this.data.args; + if (result && 'result' in result && Array.isArray(result.result)) { + const { doc_id: docId } = this.data.args; - const diffs = diffMarkdown(content, changedMarkdown); - - return html` -
-
${instructions}
-
-
-
- ${PenIcon({ - style: `color: ${unsafeCSSVarV2('icon/activated')}`, - })} - ${docId} -
-
- this._toggleCollapse()} - >${this.isCollapsed - ? ExpandFullIcon() - : ExpandCloseIcon()} - this._handleCopy(changedMarkdown)}> - ${CopyIcon()} - - -
-
-
-
- ${this.renderBlockDiffs(diffs)} -
-
-
+ return repeat( + result.result, + change => change.op, + ({ op, updates, originalContent, changedContent }) => { + const diffs = diffMarkdown(originalContent, changedContent); + return html` +
+
${op}
this._handleReject(changedMarkdown)} + class="doc-edit-tool-result-card ${this.isCollapsed + ? 'collapsed' + : ''}" > - ${CloseIcon({ - style: `color: ${unsafeCSSVarV2('icon/secondary')}`, - })} - Reject -
-
this._handleAccept(changedMarkdown)} - > - ${DoneIcon({ - style: `color: ${unsafeCSSVarV2('icon/activated')}`, - })} - Accept +
+
+ ${PenIcon({ + style: `color: ${unsafeCSSVarV2('icon/activated')}`, + })} + ${docId} +
+
+ this._toggleCollapse()} + >${this.isCollapsed + ? ExpandFullIcon() + : ExpandCloseIcon()} + this._handleCopy(changedContent)}> + ${CopyIcon()} + + +
+
+
+
+ ${this.renderBlockDiffs(diffs)} +
+
+
+
this._handleReject(op)} + > + ${CloseIcon({ + style: `color: ${unsafeCSSVarV2('icon/secondary')}`, + })} + Reject +
+ +
-
-
- `; + `; + } + ); } return html` diff --git a/packages/frontend/core/src/blocksuite/ai/provider/copilot-client.ts b/packages/frontend/core/src/blocksuite/ai/provider/copilot-client.ts index 6134bfe48d..474b0d9c2c 100644 --- a/packages/frontend/core/src/blocksuite/ai/provider/copilot-client.ts +++ b/packages/frontend/core/src/blocksuite/ai/provider/copilot-client.ts @@ -4,6 +4,7 @@ import { addContextCategoryMutation, addContextDocMutation, addContextFileMutation, + applyDocUpdatesQuery, cleanupCopilotSessionMutation, createCopilotContextMutation, createCopilotMessageMutation, @@ -500,4 +501,21 @@ export class CopilotClient { variables: { workspaceId }, }).then(res => res.queryWorkspaceEmbeddingStatus); } + + applyDocUpdates( + workspaceId: string, + docId: string, + op: string, + updates: string + ) { + return this.gql({ + query: applyDocUpdatesQuery, + variables: { + workspaceId, + docId, + op, + updates, + }, + }).then(res => res.applyDocUpdates); + } } diff --git a/packages/frontend/core/src/blocksuite/ai/provider/setup-provider.tsx b/packages/frontend/core/src/blocksuite/ai/provider/setup-provider.tsx index b40ee67e0d..b917a1b015 100644 --- a/packages/frontend/core/src/blocksuite/ai/provider/setup-provider.tsx +++ b/packages/frontend/core/src/blocksuite/ai/provider/setup-provider.tsx @@ -733,6 +733,14 @@ Could you make a new website based on these notes and send back just the html fi threshold ); }, + applyDocUpdates: async ( + workspaceId: string, + docId: string, + op: string, + updates: string + ) => { + return client.applyDocUpdates(workspaceId, docId, op, updates); + }, }); AIProvider.provide('histories', { diff --git a/packages/frontend/core/src/blocksuite/ai/services/block-diff.ts b/packages/frontend/core/src/blocksuite/ai/services/block-diff.ts index 69e86e6f25..24a6470fa3 100644 --- a/packages/frontend/core/src/blocksuite/ai/services/block-diff.ts +++ b/packages/frontend/core/src/blocksuite/ai/services/block-diff.ts @@ -80,13 +80,13 @@ export interface BlockDiffProvider { * Set the original markdown * @param originalMarkdown - The original markdown */ - setOriginalMarkdown(originalMarkdown: string): void; + setOriginalMarkdown(originalMarkdown: string | null): void; /** * Set the changed markdown * @param changedMarkdown - The changed markdown */ - setChangedMarkdown(changedMarkdown: string): void; + setChangedMarkdown(changedMarkdown: string | null): void; /** * Apply the diff to the doc