Merge branch 'master' into dhk-1

Integrate task deeplink/FX workspace updates from master while keeping dhk-1 menu-overrides and sensitive-words documentation in CLAUDE.md.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
董宏凯andCursor committed 2026-06-17 19:39:14 +08:00
commit e6a41dbc97
26 files changed
+1302 -84

No files matched your search

@@ -7,8 +7,14 @@ draft is keyed/shared by ``task_id`` and is no longer partitioned by ``user_id``
``create_all`` adds the column for brand-new DBs; this revision patches DBs that
already have the table.
Revision ID: 20260611_01
Revises: 20260609_02
Note: this migration originally shared the revision id ``20260611_01`` with
``20260611_01_agents_skills_square_id`` (both branched off ``20260609_02``),
which corrupted the alembic DAG ("present more than once" + phantom heads). It
was renumbered to ``20260611_02`` and re-chained after that revision so the
history is linear and single-headed.
Revision ID: 20260611_02
Revises: 20260611_01
Create Date: 2026-06-11
"""
@@ -19,8 +25,8 @@ from alembic import op
from sqlalchemy import inspect
revision = "20260611_01"
down_revision = "20260609_02"
revision = "20260611_02"
down_revision = "20260611_01"
branch_labels = None
depends_on = None
@@ -6,7 +6,7 @@
LONGTEXT(计划 JSON 可超 64 KB)。
Revision ID: 20260612_01
Revises: 20260611_01
Revises: 20260611_02
Create Date: 2026-06-12
"""
@@ -19,7 +19,7 @@ from sqlalchemy.dialects.mysql import LONGTEXT
revision = "20260612_01"
down_revision = "20260611_01"
down_revision = "20260611_02"
branch_labels = None
depends_on = None
@@ -1,7 +1,7 @@
"""Add always_on (常驻/免压缩) column to skills table.
Revision ID: 20260616_03
Revises: 20260616_02
Revises: 20260616_04
Create Date: 2026-06-16
"""
@@ -13,7 +13,7 @@ from sqlalchemy import inspect
revision = "20260616_03"
down_revision = "20260616_02"
down_revision = "20260616_04"
branch_labels = None
depends_on = None
@@ -10,8 +10,14 @@ startup (new tables are always created, even on existing DBs); this migration
keeps the alembic history consistent per the repo convention (see
backend/CLAUDE.md → Schema Migrations).
Revision ID: 20260616_02
Revises: 20260616_01
Note: this migration originally shared the revision id ``20260616_02`` with
``20260616_02_knowledge_folders_templates`` (both branched off ``20260616_01``),
which corrupted the alembic DAG ("present more than once" + phantom heads). It
was renumbered to ``20260616_04`` and re-chained after that revision so the
history is linear and single-headed.
Revision ID: 20260616_04
Revises: 20260616_02
Create Date: 2026-06-16
"""
@@ -22,8 +28,8 @@ from alembic import op
from sqlalchemy import inspect
revision = "20260616_02"
down_revision = "20260616_01"
revision = "20260616_04"
down_revision = "20260616_02"
branch_labels = None
depends_on = None
@@ -0,0 +1,30 @@
"""Merge the chain-seat-mode and skill-always-on migration heads.
Two lineages both descend from ``20260612_01`` (roundtable_jobs orchestration
plan): ``20260615_01`` (chain seat mode) branched directly off it, while the
``20260616_*`` line (positions → knowledge folders/templates → skill_favorites →
skill always_on) is the other branch. That left the graph with two heads
(``20260615_01`` and ``20260616_03``) so ``alembic upgrade head`` failed with
"Multiple head revisions are present". This no-op merge revision joins both
lineages so ``upgrade head`` resolves to a single head again.
Revision ID: 20260617_01
Revises: 20260615_01, 20260616_03
Create Date: 2026-06-17
"""
from __future__ import annotations
revision = "20260617_01"
down_revision = ("20260615_01", "20260616_03")
branch_labels = None
depends_on = None
def upgrade() -> None:
pass
def downgrade() -> None:
pass