@dxos/plugin-markdown 0.9.1-main.c7dcc2e112 → 0.9.1-staging.ee54ba693a

package/src/operations/create.test.ts

@@ -7,7 +7,7 @@ import * as Effect from 'effect/Effect';
 
 import { MemoizedAiService } from '@dxos/ai/testing';
 import { SpaceProperties } from '@dxos/client-protocol';
-import { Blueprint, Operation } from '@dxos/compute';
+import { Operation, Skill } from '@dxos/compute';
 import { Collection, Database, EID, Feed, Obj, Query } from '@dxos/echo';
 import { TestHelpers } from '@dxos/effect/testing';
 import { AgentService } from '@dxos/functions-runtime';
@@ -19,7 +19,7 @@ import { HasSubject } from '@dxos/types';
 
 import { WithProperties } from '#testing';
 
-import MarkdownBlueprint from '../blueprints/markdown-blueprint';
+import MarkdownSkill from '../skills/markdown-skill';
 import { MarkdownOperation } from '../types';
 import { MarkdownOperationHandlerSet } from './index';
 
@@ -28,15 +28,8 @@ EntityId.dangerouslyDisableRandomness();
 const TestLayer = AssistantTestLayer({
   aiServicePreset: 'edge-remote',
   operationHandlers: MarkdownOperationHandlerSet,
-  types: [
-    SpaceProperties,
-    Collection.Collection,
-    Blueprint.Blueprint,
-    Markdown.Document,
-    HasSubject.HasSubject,
-    Feed.Feed,
-  ],
-  blueprints: [MarkdownBlueprint.make()],
+  types: [SpaceProperties, Collection.Collection, Skill.Skill, Markdown.Document, HasSubject.HasSubject, Feed.Feed],
+  skills: [MarkdownSkill.make()],
   tracing: 'pretty',
 });
 
@@ -68,7 +61,7 @@ describe('create', () => {
     Effect.fnUntraced(
       function* (_) {
         const agent = yield* AgentService.createSession({
-          blueprints: [MarkdownBlueprint.make()],
+          skills: [MarkdownSkill.make()],
         });
         yield* agent.submitPrompt('Create a document with a cookie recipe.');
         yield* agent.waitForCompletion();

package/src/operations/update-markdown.ts

@@ -2,12 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { next as A, type Doc } from '@automerge/automerge';
 import * as Effect from 'effect/Effect';
 
 import { Operation } from '@dxos/compute';
-import { Database } from '@dxos/echo';
-import { DocAccessor, createDocAccessor } from '@dxos/echo-client';
+import { Database, Obj, Text } from '@dxos/echo';
 
 import { MarkdownOperation } from '../types';
 
@@ -19,31 +17,13 @@ const handler: Operation.WithHandler<typeof MarkdownOperation.Update> = Markdown
         Effect.map((_) => _.content),
         Effect.flatMap(Database.load),
       );
-      const accessor = createDocAccessor(content, ['content']);
 
-      for (const edit of edits) {
-        accessor.handle.change((doc: Doc<typeof content>) => {
-          const text = DocAccessor.getValue<string>(accessor);
-          if (edit.replaceAll) {
-            let idx = text.indexOf(edit.oldString);
-            while (idx !== -1) {
-              A.splice(doc, accessor.path as A.Prop[], idx, edit.oldString.length, edit.newString);
-              const updated = DocAccessor.getValue<string>(accessor);
-              idx = updated.indexOf(edit.oldString, idx + edit.newString.length);
-            }
-          } else {
-            const idx = text.indexOf(edit.oldString);
-            if (idx === -1) {
-              throw new Error(`Edit not found: ${JSON.stringify(edit.oldString)}`);
-            }
-            A.splice(doc, accessor.path as A.Prop[], idx, edit.oldString.length, edit.newString);
-          }
-        });
-      }
-
-      return {
-        newContent: DocAccessor.getValue<string>(accessor),
-      };
+      // `Text.apply` treats a missing/empty `oldString` as append-to-end, matching the Update schema.
+      let newContent = '';
+      Obj.update(content, () => {
+        newContent = Text.apply(content, 'content', edits);
+      });
+      return { newContent };
     }),
   ),
 );