upstream-fix

Coordinates upstream cherry-pick issue porting into otto-cli with lanes and gates.

Updated May 25, 2026
One-click install
npx skills add https://github.com/cmetech/otto-cli --skill upstream-fix-cmetech
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: upstream-fix
Source: https://github.com/cmetech/otto-cli/tree/main/.claude/skills/upstream-fix
Command: npx skills add https://github.com/cmetech/otto-cli --skill upstream-fix-cmetech

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve?

Implement upstream-cherry-pick issues on cmetech/otto-cli. This skill coordinates planning, porting, testing, and review across file-disjoint git-worktree lanes to ensure safe, auditable upstream integrations.

Core Features & Use Cases

  • Plan: group issues by target files into file-disjoint lanes to maximize parallelism while avoiding conflicts.
  • Execute: drive deterministic subagents for selective porting, regression/build/targeted gates, and independent reviews to gate acceptance.
  • Track: maintain a ledger of lanes and issues with statuses, SHAs, guidance paths, and PRs to support resumable runs and audits.

Quick Start

Port selected upstream issues into otto-cli by running the upstream-fix workflow with the desired filters and gates.

Frequently Asked Questions about upstream-fix

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
What is the best way to port upstream cherry-pick fixes into otto-cli?

The best way to port upstream cherry-pick fixes is using a deterministic workflow that groups issues into file-disjoint git-worktree lanes, ensuring safe parallel integration. This coordinates planning, selective porting, testing gates, and independent reviews into otto-cli.

How does file-disjoint git-worktree lane planning work for porting upstream fixes?

Lane planning works by grouping upstream cherry-pick issues by target files to maximize parallelism while avoiding conflicts. It assigns issues to deterministic, file-disjoint git-worktree lanes so engineers can port fixes concurrently and safely into otto-cli.

How do I handle interrupted upstream porting runs and audit their status?

You handle interrupted upstream porting runs by checking the maintained ledger of lanes and issues. This ledger tracks statuses, SHAs, guidance paths, and PRs to support resumable runs and provide full traceability for auditing upstream integrations.

What testing gates and review approvals are enforced during upstream integration?

Testing gates enforced during upstream integration include regression, build, and targeted tests. The workflow drives deterministic subagents to execute these gates and coordinate independent reviewer approvals before accepting any ported upstream fix into otto-cli.

Can I use this upstream fix workflow to port critical fixes at scale without conflicts?

Yes, you can port critical fixes at scale without conflicts. The workflow enforces file-disjoint lanes and safety invariants, coordinating issue selection and testing gates to ensure experienced engineers can safely port multiple upstream fixes in parallel.

Why should I use deterministic lanes for porting upstream issues instead of manual cherry-picking?

You should use deterministic lanes instead of manual cherry-picking to uphold safety invariants and ensure correct gating. Manual cherry-picking lacks the automated lane planning, testing gates, and integration reporting needed for safe, auditable upstream integrations.