merge: resolve main→develop conflicts for release#31
Merged
Conversation
* fix(ci): trigger CI on develop branch PRs (#9) Branch protection on develop requires Lint + Security Audit checks, but CI only triggered on main. Added develop to trigger branches. Co-authored-by: Jessie <jessie@coco.site> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * docs: ClawMark Digest 嵌入组件 PRD (#8) * docs: add ClawMark digest embed PRD PRD for embedding ClawMark annotation UI in digest detail pages. Includes design, API changes, acceptance criteria, and 10 test cases. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * docs: rewrite ClawMark PRD — bug reporting widget, not annotation Kevin clarified: embed ClawMark Fab plugin as a bug reporting tool in ClawFeed (especially staging), not as a digest item annotation feature. Completely rewritten PRD with correct scope. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * docs: update PRD with independent deployment + online service scope Kevin confirmed: ClawMark server as independent process, domain via Lisa. Also make it a general online service, not just for ClawFeed. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Jessie <jessie@coco.site> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Kevin He <freefacefly@gmail.com> * docs: retroactive PRD for Feedback system (#11) * docs: add retroactive PRD for Feedback system Documents existing feedback feature: floating button, text submission, admin reply/status management, Lark webhook notification, i18n support. All acceptance criteria already met (feature is live). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * docs: update feedback PRD per Kevin review - Remove email/name fields for logged-in users (identity auto-attached) - Add design principles referencing Lisa's research doc - Add HxA mode (Agent auto-classify + reply, complex → human) - Add status flow and CRM-first principle Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Jessie <jessie@coco.xyz> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * docs: PRD for Source personalization (raw_items collection pipeline) (#10) * docs: add PRD for Source personalization (raw_items collection pipeline) Defines Phase 1 of multi-tenant personalization: raw_items table, multi-source collector (RSS, HN, Reddit, GitHub Trending, Website), dedup strategy, and API endpoints. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * docs: update PRD with user experience flow, error handling, concurrency Address Kevin's feedback: - Add public source + default subscription UX flow - Non-logged-in users see default source digest - New users auto-subscribe to default source Address Lisa's review suggestions: - Error count + auto-pause after 5 consecutive failures - Concurrent collection with configurable limit - Website type fallback logic clarified Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * docs: add scalability design, Twitter priority, production data analysis Kevin review feedback: - Add distributed scalability section (stateless collector, DB row lock, future PostgreSQL/S3 migration path) - Expand Twitter to detailed analysis with sub-types, access methods, and phased approach - Add production data analysis from Lisa: 90%+ sources are Twitter, confirming Twitter as #1 priority not nice-to-have Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Jessie <jessie@coco.xyz> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * feat: add TG group link + info banner with i18n (#16) - Add Telegram group link (t.me/CocoAIxyz) next to theme toggle - Add info banner below subtitle about bug fixes and TG group - Both zh and en i18n supported Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * fix: replace TG airplane emoji with proper icon + make TG group clickable (#17) - Replace✈️ emoji with Telegram SVG icon for better recognizability - Make "TG group" text in info banner a clickable link to t.me/CocoAIxyz - Use innerHTML instead of textContent for info banner to support links Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * fix: make subtitle @mentions clickable links to Twitter profiles (#18) - Reorder to Jessie@ZylosAI, Lisa@OpenClaw (per Kevin) - @ZylosAI links to x.com/ZylosAI, @openclaw links to x.com/OpenClaw - Both zh and en i18n strings updated - Use innerHTML for subtitle to support links Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * docs: add DEVOPLOG.md — R&D lifecycle tracking (#20) * docs: add DEPLOYLOG.md for staging validation + release tracking First entry: v0.8.1 (TG hotfix + subtitle links + PRDs) Kevin staging verified. Establishes DEPLOYLOG-driven release flow. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * rename DEPLOYLOG → DEVOPLOG, broaden scope to full R&D lifecycle Per Kevin: "devop log" is more general — records the entire development process, not just deployments. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Kevin He <freefacefly@gmail.com> * fix: align skill metadata with actual code for ClawHub scan (#25) Fixes #24 — ClawHub security scan flagged clawfeed as Suspicious due to metadata/code mismatch. Changes: - SKILL.md: add Credentials & Dependencies section declaring all env vars (GOOGLE_CLIENT_ID/SECRET, SESSION_SECRET, API_KEY, AI_DIGEST_DB, etc.) - SKILL.md: expand Environment Variables table with Required column - TESTING.md: mark HttpOnly cookie workaround as localhost-only Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Kevin He <freefacefly@gmail.com> --------- Co-authored-by: Jessie <jessie@coco.site> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Kevin He <freefacefly@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
web/index.html(uppercase subtitle) anddocs/prd/feedback.md(acceptance criteria)Context
PR #30 (develop→main release) has merge conflicts. This PR resolves them on the develop side so PR #30 can merge cleanly.
🤖 Generated with Claude Code