Skip to content

Add upstream sync slash command#39

Merged
maksimzayats merged 5 commits into
mainfrom
docs/upstream-sync-command
Jun 1, 2026
Merged

Add upstream sync slash command#39
maksimzayats merged 5 commits into
mainfrom
docs/upstream-sync-command

Conversation

@maksimzayats
Copy link
Copy Markdown
Contributor

@maksimzayats maksimzayats commented May 31, 2026

Summary

  • Add a shared /upstream-sync slash command under .agents/commands.
  • Document the safe Superset mirror refresh flow and proxy-branch PR handling.
  • Keep --mirror-only for refreshing the mirror without opening a PR; no dry-run mode is included.
  • Harden the runbook with argument validation, clean-worktree gating, repo/default-branch checks, mirror SHA verification, existing sync PR handling, deterministic proxy branch naming, conflict completion steps, and a PR body template.
  • Keep fork-delta specifics in canonical docs by referencing AGENTS.md and docs/internal/fork-deltas/{README.md,registry.md} instead of duplicating the checklist in the command.

Validation

  • Verified .claude/commands and .cursor/commands both resolve the new command through their symlinks to .agents/commands.
  • Verified command frontmatter, required sync steps, canonical fork-delta references, absence of dry-run wiring, and the hardened command details with local Node checks.
  • Verified GitHub context resolves to o3dotdev/o3-code with default branch main.
  • Refreshed upstream topology: origin/upstream is fast-forwardable to superset/main; superset/main is currently 3 commits ahead of origin/upstream (977067fe7, 71062f5a3, 9bf4052b1). This PR intentionally does not perform that content sync.
  • git diff --check
  • ./scripts/check-desktop-git-env.sh
  • ./scripts/check-git-ref-strings.sh
  • bash ./scripts/check-simple-git-usage.sh

Notes

  • bunx biome check .agents/commands/upstream-sync.md reports that markdown command files are ignored by the Biome config.
  • bun run lint is currently blocked by unrelated local dev-state formatting diagnostics under .superset/ and superset-dev-data/; no tracked files were modified by the run.

@vercel
Copy link
Copy Markdown

vercel Bot commented May 31, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

4 Skipped Deployments
Project Deployment Actions Updated (UTC)
o3-code-api Ignored Ignored Preview Jun 1, 2026 7:29am
o3-code-docs Ignored Ignored Preview Jun 1, 2026 7:29am
o3-code-marketing Ignored Ignored Preview Jun 1, 2026 7:29am
o3-code-web Ignored Ignored Preview Jun 1, 2026 7:29am

@maksimzayats maksimzayats marked this pull request as ready for review June 1, 2026 07:15
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: a3d655226b

ℹ️ 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 .agents/commands/upstream-sync.md
@maksimzayats maksimzayats merged commit 0c53bea into main Jun 1, 2026
13 checks passed
@maksimzayats maksimzayats deleted the docs/upstream-sync-command branch June 1, 2026 07:52
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.

1 participant