chore(footnote): merge main and port caps marker to refactored list-marker (SD-2656)

Resolves conflicts after main's painter-dom refactor (#3269 / SD-2851):

* shared/common/list-marker-utils.ts — combined main's new fields
  (color, letterSpacing, vanish) with our caps marks (allCaps, smallCaps)
  on MinimalMarkerRun.
* packages/layout-engine/painters/dom/src/utils/marker-helpers.ts —
  accepted main's deletion; createListMarkerElement moved to
  paragraph/list-marker.ts.
* packages/layout-engine/painters/dom/src/renderer.ts — accepted main's
  removal of WordLayoutMarker type and the renderListItemFragment /
  renderDropCap methods. Both were superseded by the new
  paragraph/list-marker.ts and the resolved-fragment pipeline.
* packages/layout-engine/painters/dom/src/paragraph/list-marker.ts —
  ported our caps mark handling (textTransform: uppercase for w:caps,
  fontVariant: small-caps for w:smallCaps) to the new MarkerRunStyle
  type and createListMarkerElement implementation.
* packages/layout-engine/layout-resolved/src/resolveParagraph.ts —
  refreshed JSDoc reference to the file's new home.

Tests:
- 1136 painter-dom pass
- 1252 layout-bridge pass + 1 skip
- 657 layout-engine pass

Author: tupizz

.github/workflows/release-stable.yml

@@ -142,40 +142,37 @@ jobs:
       # `git tag --points-at HEAD`. After CLI -> SDK -> MCP, HEAD lands on
       # MCP's version commit and the SDK tag is no longer at HEAD.
       #
-      # PyPI publish steps disabled: trusted-publisher config and per-project
-      # storage cap need to be sorted on the PyPI side before re-enabling.
-      # Restore by uncommenting once access is back.
-      # - name: Publish recovered SDK companion Python packages to PyPI
-      #   if: steps.stable_release.outputs.sdk_python_snapshot_companion_dir != ''
-      #   uses: pypa/gh-action-pypi-publish@release/v1
-      #   with:
-      #     packages-dir: ${{ steps.stable_release.outputs.sdk_python_snapshot_companion_dir }}
-      #     skip-existing: true
-      #
-      # - name: Publish recovered SDK main Python package to PyPI
-      #   if: steps.stable_release.outputs.sdk_python_snapshot_main_dir != ''
-      #   uses: pypa/gh-action-pypi-publish@release/v1
-      #   with:
-      #     packages-dir: ${{ steps.stable_release.outputs.sdk_python_snapshot_main_dir }}
-      #     skip-existing: true
+      - name: Publish recovered SDK companion Python packages to PyPI
+        if: steps.stable_release.outputs.sdk_python_snapshot_companion_dir != ''
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          packages-dir: ${{ steps.stable_release.outputs.sdk_python_snapshot_companion_dir }}
+          skip-existing: true
+
+      - name: Publish recovered SDK main Python package to PyPI
+        if: steps.stable_release.outputs.sdk_python_snapshot_main_dir != ''
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          packages-dir: ${{ steps.stable_release.outputs.sdk_python_snapshot_main_dir }}
+          skip-existing: true
 
       - name: Build and verify Python SDK
         if: steps.stable_release.outputs.sdk_release_present == 'true'
         run: node packages/sdk/scripts/build-python-sdk.mjs
 
-      # - name: Publish companion Python packages to PyPI
-      #   if: steps.stable_release.outputs.sdk_release_present == 'true'
-      #   uses: pypa/gh-action-pypi-publish@release/v1
-      #   with:
-      #     packages-dir: packages/sdk/langs/python/companion-dist/
-      #     skip-existing: true
-      #
-      # - name: Publish main Python SDK to PyPI
-      #   if: steps.stable_release.outputs.sdk_release_present == 'true'
-      #   uses: pypa/gh-action-pypi-publish@release/v1
-      #   with:
-      #     packages-dir: packages/sdk/langs/python/dist/
-      #     skip-existing: true
+      - name: Publish companion Python packages to PyPI
+        if: steps.stable_release.outputs.sdk_release_present == 'true'
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          packages-dir: packages/sdk/langs/python/companion-dist/
+          skip-existing: true
+
+      - name: Publish main Python SDK to PyPI
+        if: steps.stable_release.outputs.sdk_release_present == 'true'
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          packages-dir: packages/sdk/langs/python/dist/
+          skip-existing: true
       # Docs promotion lives in promote-stable-docs.yml. It triggers off this
       # workflow's completion and gates on whether a real superdoc v* tag was
       # created during the run, so tools-only releases leave docs-stable

AGENTS.md

@@ -72,8 +72,8 @@ Do not hand-edit `COMMAND_CATALOG`, `OPERATION_MEMBER_PATH_MAP`, `OPERATION_REFE
 - `pnpm test` - unit tests
 - `pnpm dev` - dev server from `examples/`
 - `pnpm check:types` - raw TS compile across all referenced projects (`tsc -b tsconfig.references.json`). Does NOT run the public-interface chain. Legacy alias: `pnpm run type-check`.
-- `pnpm check:public` - **canonical pre-merge command for typed public surfaces.** Validates both `superdoc` (tier discipline + jsdoc ratchet + public-method fixture coverage + vite build + postbuild chain + consumer typecheck matrix + deep-type audit + package-shape + snapshots + classification closure) and Document API (contract parity + output staleness + examples + overview). ~5 min. Non-mutating. Combines `check:public:superdoc` + `check:public:docapi`.
-- `pnpm check:public:superdoc` - SuperDoc public package surface only. Wraps ten stages in cheap-to-expensive order: `contract-tiers-test`, `contract-tiers`, `jsdoc-ratchet`, `public-method-coverage`, `build`, `consumer-typecheck-matrix`, `deep-type-audit-supported-root`, `package-shape`, `export-snapshots`, `root-classification-closure`. Legacy alias: `pnpm run check:public-contract`.
+- `pnpm check:public` - **canonical pre-merge command for typed public surfaces.** Validates both `superdoc` (tier discipline + jsdoc ratchet + ts-jsdoc hygiene + public-method fixture coverage + vite build + postbuild chain + consumer typecheck matrix + deep-type audit + package-shape + snapshots + classification closure) and Document API (contract parity + output staleness + examples + overview). ~5 min. Non-mutating. Combines `check:public:superdoc` + `check:public:docapi`.
+- `pnpm check:public:superdoc` - SuperDoc public package surface only. Wraps twelve stages in cheap-to-expensive order: `contract-tiers-test`, `contract-tiers`, `jsdoc-ratchet`, `jsdoc-hygiene-ts-test`, `jsdoc-hygiene-ts`, `public-method-coverage`, `build`, `consumer-typecheck-matrix`, `deep-type-audit-supported-root`, `package-shape`, `export-snapshots`, `root-classification-closure`. Legacy alias: `pnpm run check:public-contract`.
 - `pnpm check:public:docapi` - Document API public surface only. Wraps four stages: `contract-parity`, `contract-outputs`, `examples`, `overview-alignment`. Clean-checkout safe: gitignored generated artifacts are built in memory; tracked outputs (reference docs, overview block) are compared byte-for-byte. No mutation. Legacy alias: `pnpm run docapi:check`.
 - `pnpm generate:docapi` - regenerate Document API outputs after editing the contract (alias of `docapi:sync`). Writes gitignored Document API generated artifacts. Run only when you need the artifacts materialized locally (SDK builds, publishing); `check:public:docapi` does not require it.
 - `pnpm generate:all` - regenerate schemas, SDK clients, tool catalogs, reference docs.

README.md

@@ -175,6 +175,7 @@ Special thanks to these community members who have contributed code to SuperDoc:
 <a href="https://github.com/shri-scale"><img src="https://github.com/shri-scale.png" width="50" height="50" alt="shri-scale" title="Shri H" /></a>
 <a href="https://github.com/msviderok"><img src="https://github.com/msviderok.png" width="50" height="50" alt="msviderok" title="Myroslav Sviderok" /></a>
 <a href="https://github.com/sergiogomes"><img src="https://github.com/sergiogomes.png" width="50" height="50" alt="sergiogomes" title="Sérgio Paulo Gomes" /></a>
+<a href="https://github.com/wookieb"><img src="https://github.com/wookieb.png" width="50" height="50" alt="wookieb" title="Łukasz Kużyński" /></a>
 
 Want to see your avatar here? Check the [Contributing Guide](CONTRIBUTING.md) to get started.
 

apps/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.12.0",
+  "version": "0.13.1",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"

apps/cli/platforms/cli-darwin-arm64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli-darwin-arm64",
-  "version": "0.12.0",
+  "version": "0.13.1",
   "os": [
     "darwin"
   ],

apps/cli/platforms/cli-darwin-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli-darwin-x64",
-  "version": "0.12.0",
+  "version": "0.13.1",
   "os": [
     "darwin"
   ],

apps/cli/platforms/cli-linux-arm64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli-linux-arm64",
-  "version": "0.12.0",
+  "version": "0.13.1",
   "os": [
     "linux"
   ],

apps/cli/platforms/cli-linux-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli-linux-x64",
-  "version": "0.12.0",
+  "version": "0.13.1",
   "os": [
     "linux"
   ],

apps/cli/platforms/cli-windows-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli-windows-x64",
-  "version": "0.12.0",
+  "version": "0.13.1",
   "os": [
     "win32"
   ],

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

@@ -65,6 +65,10 @@ const ENCRYPTED_FIXTURE_SOURCE = join(
   REPO_ROOT,
   'packages/super-editor/src/editors/v1/core/ooxml-encryption/fixtures/encrypted-advanced-text.docx',
 );
+const TRACKED_CHANGE_FIXTURE_SOURCE = join(
+  REPO_ROOT,
+  'packages/super-editor/src/editors/v1/tests/data/basic-tracked-change.docx',
+);
 const execFileAsync = promisify(execFile);
 const ZIP_MAX_BUFFER_BYTES = 10 * 1024 * 1024;
 
@@ -2334,6 +2338,35 @@ describe('superdoc CLI', () => {
     expect(verifyEnvelope.data.result.total).toBeGreaterThan(0);
   });
 
+  test('save --mode final exports accepted OOXML instead of copying review-preserving revisions', async () => {
+    const trackedSource = join(TEST_DIR, 'save-final-source.docx');
+    const savedOut = join(TEST_DIR, 'save-final-output.docx');
+    await copyFile(TRACKED_CHANGE_FIXTURE_SOURCE, trackedSource);
+
+    const openResult = await runCli(['open', trackedSource, '--session', 'final-export']);
+    expect(openResult.code).toBe(0);
+
+    const saveResult = await runCli([
+      'save',
+      '--session',
+      'final-export',
+      '--mode',
+      'final',
+      '--out',
+      savedOut,
+      '--force',
+    ]);
+    expect(saveResult.code).toBe(0);
+
+    const saveEnvelope = parseJsonOutput<SuccessEnvelope<{ mode: string; output: { path: string } }>>(saveResult);
+    expect(saveEnvelope.data.mode).toBe('final');
+    expect(saveEnvelope.data.output.path).toBe(savedOut);
+
+    const documentXml = await readDocxPart(savedOut, 'word/document.xml');
+    expect(documentXml).not.toContain('<w:ins');
+    expect(documentXml).not.toContain('<w:del');
+  });
+
   test('save --in-place detects source drift unless forced', async () => {
     const driftSource = join(TEST_DIR, 'drift-source.docx');
     await copyFile(SAMPLE_DOC, driftSource);