fix: Resolve merge conflict between feature/productivity-engine and main

[Copilot]

Resolves the merge conflict blocking PR #412 (feature/productivity-engine → main). The divergence occurred after bfb0314 — both branches independently modified public/sw.js (minified service worker build artifact).

Description

Merged latest main into the branch to unblock the PR. Single conflict in public/sw.js was resolved by taking the main version (more recent, includes performance optimization changes from PRs #413/#414).

Type of Change

• New feature (e.g., new page, component, or functionality)
• Bug fix (non-breaking change that fixes an issue)
• UI/UX improvement (design, layout, or styling updates)
• Performance optimization (e.g., code splitting, caching)
• Documentation update (README, contribution guidelines, etc.)
• Other (please specify): Merge conflict resolution

Changes Made

• Resolved public/sw.js conflict — took main's version (20 KB minified SW vs branch's 30 KB stale build artifact)
• Incorporated non-conflicting main changes cleanly: performance optimizer, API route updates, presentation component fixes, qwen-code-presentation.ts, docs, next.config.js, package.json

Dependencies

• No new dependencies. package.json/package-lock.json updates come from main (performance/optimization PRs).

Add Screenshots

N/A — no UI changes.

Checklist

• My code follows the style guidelines of this project.
• I have tested my changes across major browsers/devices
• I have tested my changes in development mode (npm run dev)
• I have written or updated related tests, if necessary
• This is already assigned Issue to me, not an unassigned issue.

---

📱 Kick off Copilot coding agent tasks wherever you are with GitHub Mobile, available on iOS and Android.

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
doc-magic-heob	Error		Mar 15, 2026 0:42am
doc-magic-vvg8	Error		Mar 15, 2026 0:42am
docmagic	Error		Mar 15, 2026 0:42am