Skip to content

fix(skills): resolve leftover merge markers and drop alpha hosts on v1.203 - #3841

Merged
RaduAna-Maria merged 2 commits into
release/v1.203from
fix/release-v1.203-merge-markers-and-alpha-hosts
Oct 9, 2026
Merged

RaduAna-Maria merged 2 commits into
release/v1.203from
fix/release-v1.203-merge-markers-and-alpha-hosts

Conversation

@RaduAna-Maria

Copy link
Copy Markdown
Collaborator

Summary

Two fixes for release/v1.203 before cutting 1.203.1.

1. Conflict markers in maestro-bpmn

#2387 (feat(bpmn): derive package metadata with refresh) merged to main with unresolved <<<<<<< / >>>>>>> blocks in two references:

  • skills/uipath-maestro-bpmn/references/operate/CAPABILITY.md
  • skills/uipath-maestro-bpmn/references/shared/local-metadata-regeneration-guide.md

Main fixed this in #3491, but that fix landed after this branch was cut. This PR cherry-picks it (git cherry-pick -x 83bfc473). It applied cleanly, and no conflict markers remain under skills/, skill-flavors/ or preview/.

2. alpha.uipath.com in maestro-flow

#3838 (the #3792 cherry-pick) removes alpha/staging hosts from every other skill. These four maestro-flow files are not in it because main rewrote them in #3624:

Once this PR and #3838 are both merged, release/v1.203 has no alpha.uipath.com or staging.uipath.com hosts left in skills.

🤖 Generated with Claude Code

…nces (#3491)

The #2387 rebase left four unresolved conflict blocks in
local-metadata-regeneration-guide.md and operate/CAPABILITY.md. Where the
sides disagree, keep the one SKILL.md already states: validate after
refresh, never update-metadata. Where they do not overlap, keep both. Add
the validate step the kept text pointed at but the list lacked.

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
(cherry picked from commit 83bfc47)
…examples

The #3792 cherry-pick (#3838) covers every other skill, but these four
maestro-flow references were rewritten on main by #3624 and so fall
outside it. Use the same <AUTHORITY_URL> login placeholder and a
cloud.uipath.com example host.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@github-actions

github-actions Bot commented Oct 9, 2026 •

Copy link
Copy Markdown
Contributor

Claude finished @RaduAna-Maria's task in 1m 51s —— View job


PR Review: fix(skills): resolve leftover merge markers and drop alpha hosts on v1.203

  • Read review criteria and project conventions
  • Analyze the diff (2 commits, 6 files)
  • Read full changed files for context
  • Verify no remaining merge markers or alpha hosts in changed files
  • Check relative links resolve correctly
  • Check for cross-skill references and secrets
  • Post review findings

Summary

Cherry-picks the merge-marker fix from main (#3491) into release/v1.203 for two maestro-bpmn references, and replaces four alpha.uipath.com occurrences in maestro-flow with either <AUTHORITY_URL> placeholders or cloud.uipath.com, complementing PR #3838.

Change-by-Change Review

1. skills/uipath-maestro-bpmn/references/operate/CAPABILITY.md

OK — Removes a <<<<<<</=======/>>>>>>> block around Critical Rule 4, keeping the HEAD version that documents Data.WrittenFiles and states update-metadata does not materialize Intsvc.* connection bindings. The surviving text is the more complete and accurate version.

2. skills/uipath-maestro-bpmn/references/shared/local-metadata-regeneration-guide.md

OK — Resolves three merge-conflict blocks. The merged result correctly:

  • Keeps the "Do NOT apply" scoping paragraph (HEAD) alongside the "refresh is the authoritative boundary" paragraph (other branch) — both carry distinct information.
  • Preserves the HEAD explanation for steps 2–3 (why validate should run after refresh, not before).
  • Adds uip maestro bpmn validate <file.bpmn> --output json to step 4 before verifying the metadata set — a net improvement over both original branches.

No orphaned content or duplicated instructions after resolution.

3. skills/uipath-maestro-flow/references/author/greenfield.md

OK — https://alpha.uipath.com → "<AUTHORITY_URL>" with comment # non-default host (Automation Suite, dedicated). Follows the content-quality rule for <PLACEHOLDER> values and matches the wording used by #3792 across other skills.

4. skills/uipath-maestro-flow/references/shared/cli-conventions.md

OK — Same alpha → <AUTHORITY_URL> replacement as greenfield.md. Consistent wording and comment.

5. skills/uipath-maestro-flow/references/author/plugins/inline-voice-agent/impl.md

OK — alpha.uipath.com → cloud.uipath.com in the Phone numbers URL example inside a troubleshooting table. This is a URL pattern example (not a user-provided value), so the production domain is the correct replacement.

6. skills/uipath-maestro-flow/references/author/plugins/inline-voice-agent/planning.md

OK — Same alpha.uipath.com → cloud.uipath.com replacement in the Phone numbers URL example. Consistent with impl.md.

What's Missing

Nothing identified.

Area Ratings

Area Status Notes
Frontmatter OK No frontmatter changes
E2E Tests OK No new capabilities; merge-marker cleanup and host replacement don't alter skill behavior
Skill Body OK No SKILL.md changes
References & Assets OK All six files are clean, merge markers fully resolved, alpha hosts replaced consistently
Repo Hygiene OK No new skill paths, no secrets, changes scoped to the two affected skills

Issues for Manual Review

None found.

Conclusion

Clean, well-scoped fix. The merge-marker resolution in maestro-bpmn keeps the better text from each branch and the alpha-host replacements in maestro-flow are consistent with the pattern used across the rest of the repo (#3792/#3838). No issues found — approve.

@RaduAna-Maria
RaduAna-Maria merged commit dbf284d into release/v1.203 Oct 9, 2026
40 of 41 checks passed
@RaduAna-Maria
RaduAna-Maria deleted the fix/release-v1.203-merge-markers-and-alpha-hosts branch October 9, 2026 11:49
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