菜单
Carefully merge the `upstream` branch into `main`: prioritize the current project's existing behavior in locally customized code while otherwise preserving upstream changes as fully as practical. Use when synchronizing main with upstream or handling conflicts from that merge.
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
Run a bounded review-remediate loop in which every review round uses the external Codex CLI through the codex-review workflow. Use when asked to have Codex iteratively review and fix uncommitted changes, a branch or commit diff, a pull-request diff, named paths, or another explicit target until no verified finding remains or a safe round limit or blocker is reached.
Run a bounded, evidence-driven review and remediation loop over uncommitted changes, a base-branch merge diff, commits, pull-request diffs, or an explicit custom target. Use when asked to review code iteratively, fix verified findings within the original authorization, repeat review until clean or safely bounded, or provide a final review audit without external reviewers or remote writes.
After finishing the current task, run an external Codex CLI review, return its feedback verbatim, and add your own independent assessment of the findings. Use when the user says "Codex review", "ask Codex to review", or runs /codex-review. Codex is a second opinion — not ground truth.
Compare the current agent's prior user-visible analysis report with one explicitly supplied report file and produce a concise numbered decision table covering material conflicts, useful improvements, and questions needing user judgment. Independently recommend how to resolve conflicts. Use only when the user explicitly invokes this skill with exactly one target report file; never invoke implicitly, from a general comparison request, or without that file.
Compare the current Git worktree with one explicitly supplied peer worktree and identify only material improvements to apply to the current worktree. Use only when the user explicitly invokes this skill with exactly one target worktree path; never invoke implicitly, from a general comparison request, or without that path.
Upgrade all project dependencies across Mix/Hex, npm applications including Phoenix assets and browser extensions, and Tailwind. Use when asked to update, upgrade, or modernize every dependency and repair resulting code, configuration, or test breakage.
| name | upstream-merge |
| description | Carefully merge the `upstream` branch into `main`: prioritize the current project's existing behavior in locally customized code while otherwise preserving upstream changes as fully as practical. Use when synchronizing main with upstream or handling conflicts from that merge. |
main and upstream. Identify project-owned or locally modified behavior from repository evidence such as history, diffs, documentation, and nearby tests; do not infer ownership from names alone.main is checked out safely, then merge upstream with the repository's normal strategy. Never use a global ours/theirs strategy option and never push.