sync: merge upstream/main (ours) to reach behind=0

[MocA-Love]

Summary

PR #12 (#417) で upstream superset-sh#3697 split を実質取り込み済みだが、cherry-pick で patch-id が変わるため GitHub UI の "behind" が 1 のまま残っていた (git 仕様)。

本 PR は git merge -s ours upstream/main で fork 現状の内容を一切変更せず、upstream/main の全 commits を fork main の ancestor に入れて "behind" を 0 にする。

変更内容

• ファイル差分ゼロ (+0/-0/0 files)
• merge commit のみ、fork 現状 (PR upstream 取り込み PR #2: v2 UI 小粒 / marketing / 9 commits #398〜refactor(host-service): adopt upstream #3697 split workspace-creation router (closes #415) #417 の成果物) をそのまま維持
• merge 対象: 167542eb4 [codex] refactor(host-service): split workspace-creation router (#3697) まで (upstream/main の HEAD)

全 upstream 取り込み完遂

PR	内容
#398	v2 UI 小粒・marketing・CI (9 commits)
#399	host-service 系 (4)
#400	terminal 系 (3+1)
#402	superset-sh#3295 + 19 procedure 再設計 (5)
#404	version bump + uuid v14 (5+1)
#406	v2 project create + big features (10+3)
#408	scheduled agent runs + link-click (4)
#411	計画後前進分 12 commits (14)
#413	delete dialog checkbox + hook 補完 (2)
#414	task title naming (1)
#416	ours-sync through superset-sh#3700
#417	superset-sh#3697 split workspace-creation (Issue #415)
本 PR	ours-sync through upstream/main HEAD → behind=0

計 50+ commits 実質取り込み、fork 固有機能 100% 維持。

検証

• git diff origin/main HEAD --stat がゼロ (fork 実内容完全維持)
• ours strategy で conflict 発生せず
• 次回 git fetch upstream 時点では upstream が既に前進している可能性あり (その場合は別途バッチ PR)

関連

• Issue Adopt upstream #3697 split workspace-creation router (残る唯一の未取り込み upstream commit) #415: Adopted via PR refactor(host-service): adopt upstream #3697 split workspace-creation router (closes #415) #417
• 計画書: plans/20260424-upstream-merge-strategy.md
• 作業フロー: project_upstream_batch_workflow.md

[github-actions]

🧹 Preview Cleanup Complete

The following preview resources have been cleaned up:

• ⚠️ Neon database branch
• ⚠️ Electric Fly.io app

Thank you for your contribution! 🎉

[chatgpt-codex-connector]

💡 Codex Review

superset/packages/local-db/drizzle/meta/_journal.json

Lines 293 to 296 in e1e5614

	"idx": 42,
	"version": "6",
	"when": 1775708839194,
	"tag": "0042_add_right_sidebar_open_view_width_setting",

Register 0041 migration in local-db journal

packages/local-db/drizzle/0041_add_editor_features_and_site_permissions.sql is added in this commit, but _journal.json skips directly from idx 40 to idx 42, so that migration tag is never scheduled. The desktop startup path runs migrate(localDb, { migrationsFolder }), so fresh local databases will miss the settings columns added by 0041, and subsequent settings table reads/writes that reference indentRainbow*/trailingSpaces* can fail with missing-column errors.

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".