Skip to content

upstream 取り込み PR #6: version bump (1.5.5→1.5.10) + uuid v14#404

Merged
MocA-Love merged 6 commits intomainfrom
upstream/batch-6-version-bump
Apr 24, 2026
Merged

upstream 取り込み PR #6: version bump (1.5.5→1.5.10) + uuid v14#404
MocA-Love merged 6 commits intomainfrom
upstream/batch-6-version-bump

Conversation

@MocA-Love
Copy link
Copy Markdown
Owner

@MocA-Love MocA-Love commented Apr 23, 2026

Summary

upstream 取り込み PR #6: version bump + dependency bump 5 commits。Codex 事前調査を経て auto-updater 関連 2 commits と fork 既取り込み CVE bump を除外。

Codex が検出した bun.lock の p-retry@7.1.1 resolution 脱落問題 (main 側既存、CI Build fail の原因) も本 PR で修復。

取り込み内容(5 commits)

追加 fix

  • bun.lock 完全再生成 — main 側の lockfile 不整合 (@mastra/core/p-retry@^7.1.1 resolution 欠落) により electron-builder の production dependency traversal が fail していた問題を解消。Codex が P1 で指摘。rm bun.lock && bun install で再生成し、ローカル bun run --filter @superset/desktop build が exit 0 で成功

除外した 3 commits(理由別)

fork の独自 auto-updater 実装と文脈不一致(skip)

fork 既取り込み相当(skip)

Fork 側のコンフリクト解決

fork リリース運用との整合性

  • apps/desktop version: 1.5.51.5.10 (upstream トラッキング、CLAUDE.md/AGENTS.md 方針)
  • 次回 release tag: v1.5.10-fork.1 から再スタート
  • release-desktop.ymldesktop-v*.*.* 発火条件、fork の手動運用 tag とは干渉しない

uuid v14 breaking change (Codex 検証済み)

  • 使用箇所: packages/local-db/src/schema/*.ts, apps/desktop/src/main/lib/local-db/index.ts
  • named import (v4 as uuidv4, validate as uuidValidate, version as uuidVersion) のみ使用、API 変更なし
  • breaking change は Node 18 非対応化 (desktop は Electron 40 = Node 24)

Fork 固有機能ヘルスチェック

baseline 比較で 全項目健在:

Codex 最終レビュー: マージ可

全観点 pass。P1 指摘の p-retry@7.1.1 脱落は本 commit で修復。

Test plan

  • bun install 正常完了
  • bun run typecheck グリーン (27/27)
  • bun run lint グリーン
  • bun run --filter @superset/desktop build ローカル exit 0 成功
  • fork 固有機能 baseline 比較で regression ゼロ
  • apps/desktop/package.json version = 1.5.10, uuid = ^14.0.0
  • desktop dev 起動確認
  • 次回 release で v1.5.10-fork.1 タグを切る運用に移行

次の PR

  • PR #2b (最後の大物 feature / DB migration): v2 project create, scheduled agent runs, v1 review pane, v1→v2 migration 等

Kitenite and others added 5 commits April 24, 2026 08:21
Addresses GHSA-w5hq-g745-h8pq (Dependabot #29): uuid < 14.0.0 is missing
buffer bounds checks in v3/v5/v6 when a caller-provided buffer is passed,
allowing silent partial writes.

Our usage is limited to v4()/validate/version with no caller buffers, so
there's no direct exposure, but bumping to 14.0.0 clears the alert.
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Apr 23, 2026

Warning

Rate limit exceeded

@MocA-Love has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 50 minutes and 55 seconds before requesting another review.

Your organization is not enrolled in usage-based pricing. Contact your admin to enable usage-based pricing to continue reviews beyond the rate limit, or try again in 50 minutes and 55 seconds.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: a99ab722-c34d-46e5-95f8-964311d642ba

📥 Commits

Reviewing files that changed from the base of the PR and between 99cbbec and 21af310.

⛔ Files ignored due to path filters (1)
  • bun.lock is excluded by !**/*.lock
📒 Files selected for processing (2)
  • apps/desktop/package.json
  • packages/local-db/package.json
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch upstream/batch-6-version-bump

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 23, 2026

🧹 Preview Cleanup Complete

The following preview resources have been cleaned up:

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

Thank you for your contribution! 🎉

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 8e06a0deb7

ℹ️ 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".

Comment thread bun.lock
main 側に存在した lockfile の不整合 (`@mastra/core/p-retry@^7.1.1`
に対する resolution entry 欠落) により electron-builder の production
dependency traversal が fail していた問題を解消。`rm bun.lock && bun
install` で完全再生成。

- fork 固有依存 (ansi_up, @vscode/ripgrep, @xyflow/react, vscode-*)
  は全て保持
- desktop build がローカルで exit 0 成功
- typecheck / lint 全 pass
@MocA-Love MocA-Love merged commit c81ef94 into main Apr 24, 2026
12 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants