Merge branch 'ji' into dhk-1

Resolve column_additions_mysql.sql conflict: keep square_id columns from master and roundtable_drafts.task_id from dhk-1.

Co-authored-by: Cursor <cursoragent@cursor.com>

offline-backend-20260512/backend/scripts/sql/column_additions_mysql.sql

@@ -62,6 +62,14 @@ CALL _add_column_if_missing('skills', 'name_zh', 'VARCHAR(128) NULL DEFAULT NULL
 -- detail: 技能的长文介绍,对应 migration 20260518_01。
 --          ORM: SkillRow.detail = Text, nullable=True。
 CALL _add_column_if_missing('skills', 'detail', 'TEXT NULL DEFAULT NULL');
+-- square_id: 技能所属的发布广场(发布广场功能),对应 migration 20260611_01。
+--          ORM: SkillRow.square_id = String(64), nullable=False, default=''。
+CALL _add_column_if_missing('skills', 'square_id', "VARCHAR(64) NOT NULL DEFAULT ''");
+
+-- ---- agents ------------------------------------------------------------------
+-- square_id: 智能体所属的发布广场(发布广场功能),对应 migration 20260611_01。
+--          ORM: AgentRow.square_id = String(64), nullable=False, default=''。
+CALL _add_column_if_missing('agents', 'square_id', "VARCHAR(64) NOT NULL DEFAULT ''");
 
 -- ---- roundtable_drafts -------------------------------------------------------
 -- task_id: 外部任务 id(无界嵌入抽屉传入),对应 migration 20260611_01。非空时草稿
@@ -90,6 +98,7 @@ DEALLOCATE PREPARE stmt;
 SELECT table_name, column_name
   FROM information_schema.columns
  WHERE table_schema = DATABASE()
-   AND ((table_name = 'skills' AND column_name IN ('name_zh', 'detail'))
+   AND ((table_name = 'skills' AND column_name IN ('name_zh', 'detail', 'square_id'))
+        OR (table_name = 'agents' AND column_name IN ('square_id'))
         OR (table_name = 'roundtable_drafts' AND column_name = 'task_id'))
  ORDER BY table_name, column_name;