Merge main into stable

apps/cli/src/__tests__/cli.test.ts

@@ -407,7 +407,7 @@ describe('superdoc CLI', () => {
   });
 
   test('describe command paragraph format ops do not advertise text-range shortcuts', async () => {
-    const result = await runCli(['describe', 'command', 'doc.format.paragraph.setMarkRunProps', '--output', 'pretty']);
+    const result = await runCli(['describe', 'command', 'doc.format.paragraph.setAlignment', '--output', 'pretty']);
     expect(result.code).toBe(0);
     expect(result.stdout).toContain('--block-id');
     expect(result.stdout).not.toContain('--start');
@@ -1696,30 +1696,6 @@ describe('superdoc CLI', () => {
     expect(await readDocxPart(footnotesOut, 'word/document.xml')).toContain('footnoteReference');
   });
 
-  test('paragraph mark run props surface CAPABILITY_UNAVAILABLE on the v1 runtime', async () => {
-    const formatSource = join(TEST_DIR, 'paragraph-mark-run-props-source.docx');
-    const formatOut = join(TEST_DIR, 'paragraph-mark-run-props-out.docx');
-    await copyFile(SAMPLE_DOC, formatSource);
-
-    const target = await firstTextRange(['find', formatSource, '--type', 'text', '--pattern', 'Wilde']);
-    const result = await runCli([
-      'format',
-      'paragraph',
-      'set-mark-run-props',
-      formatSource,
-      '--block-id',
-      target.blockId,
-      '--mark-run-props-json',
-      '{"bold":true}',
-      '--out',
-      formatOut,
-    ]);
-
-    expect(result.code).toBe(1);
-    const envelope = parseJsonOutput<ErrorEnvelope>(result);
-    expect(envelope.error.code).toBe('CAPABILITY_UNAVAILABLE');
-  });
-
   test('track-changes list is capability-aware', async () => {
     const result = await runCli(['track-changes', 'list', SAMPLE_DOC]);
     if (result.code === 0) {

apps/cli/src/__tests__/lib/context.test.ts

@@ -75,6 +75,28 @@ describe('normalizeContextMetadata', () => {
     });
   });
 
+  describe('runtime normalization', () => {
+    test('preserves the supported v1 runtime', () => {
+      const result = normalizeContextMetadata(makeMetadata({ runtime: 'v1' }));
+      expect(result.runtime).toBe('v1');
+    });
+
+    test('defaults an absent runtime to v1', () => {
+      const result = normalizeContextMetadata(makeMetadata({ runtime: undefined as any }));
+      expect(result.runtime).toBe('v1');
+    });
+
+    test('normalizes stale unsupported runtime metadata to v1', () => {
+      const metadata = makeMetadata({ runtime: 'legacy-runtime' as any });
+      expect(normalizeContextMetadata(metadata).runtime).toBe('v1');
+    });
+
+    test('normalizes any unknown runtime value to v1', () => {
+      const metadata = makeMetadata({ runtime: 'v3' as any });
+      expect(normalizeContextMetadata(metadata).runtime).toBe('v1');
+    });
+  });
+
   describe('session type normalization', () => {
     test('normalizes unknown session type to local', () => {
       const metadata = makeMetadata({ sessionType: 'unknown' as any });

apps/cli/src/__tests__/lib/error-mapping.test.ts

@@ -135,20 +135,17 @@ describe('mapInvokeError', () => {
     expect(canonical.code).toBe('TARGET_NOT_FOUND');
   });
 
-  test.each([
-    'blocks.split',
-    'lists.apply',
-    'format.paragraph.setMarkRunProps',
-    'tables.moveRow',
-    'fields.insert',
-  ] as const)('%s preserves CAPABILITY_UNAVAILABLE for unsupported v1/v2-gated paths', (operationId) => {
-    const error = Object.assign(new Error(`${operationId} is only available on v2-backed sessions.`), {
-      code: 'CAPABILITY_UNAVAILABLE',
-    });
+  test.each(['fields.insert', 'footnotes.insert'] as const)(
+    '%s preserves CAPABILITY_UNAVAILABLE for adapter-gated paths',
+    (operationId) => {
+      const error = Object.assign(new Error(`${operationId} is not available on this adapter.`), {
+        code: 'CAPABILITY_UNAVAILABLE',
+      });
 
-    const mapped = mapInvokeError(operationId as any, error);
-    expect(mapped.code).toBe('CAPABILITY_UNAVAILABLE');
-  });
+      const mapped = mapInvokeError(operationId as any, error);
+      expect(mapped.code).toBe('CAPABILITY_UNAVAILABLE');
+    },
+  );
 });
 
 // ---------------------------------------------------------------------------
@@ -523,25 +520,22 @@ describe('mapFailedReceipt: plan-engine code passthrough', () => {
     },
   );
 
-  test.each([
-    'blocks.split',
-    'lists.apply',
-    'format.paragraph.setMarkRunProps',
-    'tables.moveRow',
-    'footnotes.insert',
-  ] as const)('%s failed receipts preserve CAPABILITY_UNAVAILABLE', (operationId) => {
-    const receipt = {
-      success: false,
-      failure: {
-        code: 'CAPABILITY_UNAVAILABLE',
-        message: `${operationId} is only available on v2-backed sessions.`,
-      },
-    };
+  test.each(['fields.insert', 'footnotes.insert'] as const)(
+    '%s failed receipts preserve CAPABILITY_UNAVAILABLE',
+    (operationId) => {
+      const receipt = {
+        success: false,
+        failure: {
+          code: 'CAPABILITY_UNAVAILABLE',
+          message: `${operationId} is not available on this adapter.`,
+        },
+      };
 
-    const result = mapFailedReceipt(operationId as any, receipt);
-    expect(result).toBeInstanceOf(CliError);
-    expect(result!.code).toBe('CAPABILITY_UNAVAILABLE');
-  });
+      const result = mapFailedReceipt(operationId as any, receipt);
+      expect(result).toBeInstanceOf(CliError);
+      expect(result!.code).toBe('CAPABILITY_UNAVAILABLE');
+    },
+  );
 });
 
 // ---------------------------------------------------------------------------

apps/cli/src/__tests__/lib/invoke-input.test.ts

@@ -109,12 +109,9 @@ describe('extractInvokeInput', () => {
   });
 
   test('converts paragraph format --block-id shortcuts into paragraph block targets', () => {
-    const input = extractInvokeInput('format.paragraph.setMarkRunProps', {
+    const input = extractInvokeInput('format.paragraph.setAlignment', {
       blockId: 'p1',
-      markRunProps: {
-        bold: true,
-        color: { model: 'rgb', value: 'FF0000' },
-      },
+      alignment: 'center',
     }) as Record<string, unknown>;
 
     expect(input).toEqual({
@@ -123,22 +120,17 @@ describe('extractInvokeInput', () => {
         nodeType: 'paragraph',
         nodeId: 'p1',
       },
-      markRunProps: {
-        bold: true,
-        color: { model: 'rgb', value: 'FF0000' },
-      },
+      alignment: 'center',
     });
   });
 
   test('rejects text-range shortcuts for paragraph format operations', () => {
     expect(() =>
-      extractInvokeInput('format.paragraph.setMarkRunProps', {
+      extractInvokeInput('format.paragraph.setAlignment', {
         blockId: 'p1',
         start: 0,
         end: 5,
-        markRunProps: {
-          bold: true,
-        },
+        alignment: 'center',
       }),
     ).toThrow(CliError);
   });

apps/cli/src/__tests__/lib/operation-args.test.ts

@@ -5,11 +5,11 @@ import { parseOperationArgs } from '../../lib/operation-args';
 describe('parseOperationArgs target validation', () => {
   test('rejects legacy text-address target-json payloads for paragraph format operations', () => {
     expect(() =>
-      parseOperationArgs('doc.format.paragraph.setMarkRunProps', [
+      parseOperationArgs('doc.format.paragraph.setAlignment', [
         '--target-json',
         '{"kind":"text","blockId":"p1","range":{"start":0,"end":4}}',
-        '--mark-run-props-json',
-        '{"bold":true}',
+        '--alignment',
+        'center',
       ]),
     ).toThrow(CliError);
   });

apps/cli/src/__tests__/lib/operation-runtime-metadata.test.ts

@@ -104,6 +104,14 @@ describe('operation runtime metadata', () => {
     expect(trackChangesOption!.type).toBe('string');
   });
 
+  test('doc.open metadata does not expose a runtime selector', () => {
+    const openMeta = CLI_OPERATION_METADATA['doc.open'];
+    const openOptions = CLI_OPERATION_OPTION_SPECS['doc.open'];
+
+    expect(openMeta.params.map((p) => p.name)).not.toContain('runtime');
+    expect(openOptions.map((o) => o.name)).not.toContain('runtime');
+  });
+
   test('final recipe-provider parity operations expose their promoted CLI params', () => {
     const blocksListMeta = CLI_OPERATION_METADATA['doc.blocks.list'];
     expect(blocksListMeta.params.find((p) => p.name === 'in')?.flag).toBe('in-json');
@@ -118,12 +126,12 @@ describe('operation runtime metadata', () => {
     expect(fieldsInsertMeta.params.find((p) => p.name === 'cachedResultText')?.flag).toBe('cached-result-text');
     expect(fieldsInsertMeta.params.find((p) => p.name === 'updatePolicy')?.flag).toBe('update-policy');
 
-    const markRunMeta = CLI_OPERATION_METADATA['doc.format.paragraph.setMarkRunProps'];
-    expect(markRunMeta.params.find((p) => p.name === 'markRunProps')?.flag).toBe('mark-run-props-json');
+    const alignmentMeta = CLI_OPERATION_METADATA['doc.format.paragraph.setAlignment'];
+    expect(alignmentMeta.params.find((p) => p.name === 'alignment')?.flag).toBe('alignment');
   });
 
   test('paragraph format operations expose block shortcuts without text-range flags', () => {
-    const paragraphFormatMeta = CLI_OPERATION_METADATA['doc.format.paragraph.setMarkRunProps'];
+    const paragraphFormatMeta = CLI_OPERATION_METADATA['doc.format.paragraph.setAlignment'];
     const paragraphParamNames = paragraphFormatMeta.params.map((p) => p.name);
 
     expect(paragraphParamNames).toContain('blockId');

apps/cli/src/cli/__tests__/schema-ref-resolution.test.ts

@@ -245,7 +245,7 @@ describe('operation-params deriveParamsFromInputSchema with $ref', () => {
 });
 
 describe('operation-params production metadata', () => {
-  test('trackChanges.decide exposes nested logical range targets used by v2 requirements', () => {
+  test('trackChanges.decide exposes nested logical range targets', () => {
     const targetParam = CLI_OPERATION_METADATA['doc.trackChanges.decide'].params.find(
       (param) => param.name === 'target',
     );

apps/cli/src/cli/cli-only-operation-definitions.ts

@@ -42,15 +42,15 @@ export const CLI_ONLY_OPERATION_DEFINITIONS: Record<CliOnlyOperation, CliOnlyOpe
   open: {
     category: 'session',
     description:
-      "Open a document and create a persistent editing session. Pass `runtime: 'v1'` (default) or `runtime: 'v2'` to select the underlying engine. V2 single-socket collaboration supports only `y-websocket`; `hocuspocus` and `liveblocks` remain legacy v1-only collaboration providers. Optionally override the document body with contentOverride + overrideType (markdown, html, or text).",
+      'Open a document and create a persistent editing session. Collaboration supports the `y-websocket`, `hocuspocus`, and `liveblocks` providers. Optionally override the document body with contentOverride + overrideType (markdown, html, or text).',
     requiresDocumentContext: false,
     sdkMetadata: { mutates: true, idempotency: 'non-idempotent', supportsTrackedMode: false, supportsDryRun: false },
     outputSchema: {
       type: 'object',
       properties: {
         active: { type: 'boolean' },
         contextId: { type: 'string' },
-        runtime: { type: 'string', enum: ['v1', 'v2'] },
+        runtime: { type: 'string', enum: ['v1'] },
         sessionType: { type: 'string' },
         document: {
           type: 'object',
@@ -96,7 +96,7 @@ export const CLI_ONLY_OPERATION_DEFINITIONS: Record<CliOnlyOperation, CliOnlyOpe
       type: 'object',
       properties: {
         contextId: { type: 'string' },
-        runtime: { type: 'string', enum: ['v1', 'v2'] },
+        runtime: { type: 'string', enum: ['v1'] },
         saved: { type: 'boolean' },
         inPlace: { type: 'boolean' },
         document: {
@@ -152,7 +152,7 @@ export const CLI_ONLY_OPERATION_DEFINITIONS: Record<CliOnlyOperation, CliOnlyOpe
       type: 'object',
       properties: {
         contextId: { type: 'string' },
-        runtime: { type: 'string', enum: ['v1', 'v2'] },
+        runtime: { type: 'string', enum: ['v1'] },
         closed: { type: 'boolean' },
         saved: { type: 'boolean' },
         discarded: { type: 'boolean' },
@@ -218,7 +218,7 @@ export const CLI_ONLY_OPERATION_DEFINITIONS: Record<CliOnlyOperation, CliOnlyOpe
       properties: {
         active: { type: 'boolean' },
         contextId: { type: 'string' },
-        runtime: { type: 'string', enum: ['v1', 'v2'] },
+        runtime: { type: 'string', enum: ['v1'] },
         activeSessionId: { type: 'string' },
         requestedSessionId: { type: 'string' },
         projectRoot: { type: 'string' },
@@ -313,7 +313,7 @@ export const CLI_ONLY_OPERATION_DEFINITIONS: Record<CliOnlyOperation, CliOnlyOpe
             properties: {
               sessionId: { type: 'string' },
               sessionType: { type: 'string' },
-              runtime: { type: 'string', enum: ['v1', 'v2'] },
+              runtime: { type: 'string', enum: ['v1'] },
               dirty: { type: 'boolean' },
               revision: { type: 'number' },
               collaboration: {

apps/cli/src/cli/command-examples.ts

@@ -157,7 +157,5 @@ export const DOC_COMMAND_EXAMPLES: Readonly<Record<string, readonly string[]>> =
   ],
 
   // ── Paragraph Format ────────────────────────────────────────────────
-  'format.paragraph.setMarkRunProps': [
-    'superdoc format paragraph set-mark-run-props --block-id abc123 --mark-run-props-json \'{"bold":true,"italic":true,"color":{"model":"rgb","value":"FF0000"}}\'',
-  ],
+  'format.paragraph.setAlignment': ['superdoc format paragraph set-alignment --block-id abc123 --alignment center'],
 };