Skip to content

Commit 4049adc

Browse files
cpcloudclaude
andcommitted
chore: use upstream/main and remove skip-ci exception
- Update AGENTS.md: use upstream/main (micasa-dev/micasa) for rebases and PR bases instead of origin/main - Remove skip-ci exception for AGENTS.md-only commits from /commit and /create-pr skills. CI always runs now. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent f232854 commit 4049adc

3 files changed

Lines changed: 11 additions & 8 deletions

File tree

.claude/commands/commit.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,12 @@ Use conventional commits with scopes:
3535
## Scope conventions
3636

3737
- Reference the issue number: `closes #42`, `fixes #42`
38-
- AGENTS.md-only commits: add the standard no-ci marker to the message.
39-
There's nothing to build or test.
4038
- Do not amend unless explicitly requested
4139
- Do not use `--no-verify` under any circumstances
4240

4341
## Avoid CI trigger phrases
4442

4543
The tokens `[skip ci]`, `[ci skip]`, `[no ci]`, `[skip actions]`, and
46-
`[actions skip]` suppress CI runs. Never include them in commit messages
47-
unless you intend to suppress CI (e.g. AGENTS.md-only changes). When
48-
referring to the mechanism, paraphrase instead of writing the literal token.
44+
`[actions skip]` suppress CI runs. Never include them in commit messages.
45+
When referring to the mechanism, paraphrase instead of writing the literal
46+
token.

.claude/commands/create-pr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Create a pull request for the current branch.
2626
omit them from the summary. Only mention AGENTS.md if the PR is solely
2727
about agent rules.
2828
- **Avoid CI trigger phrases**: Never put `[skip ci]`, `[ci skip]`, etc.
29-
in the PR title or body unless you intend to suppress CI.
29+
in the PR title or body.
3030

3131
## Closing issues
3232

AGENTS.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,13 @@ details; do not duplicate that detail here.
182182
independent, sequential when dependent).
183183
- **Use `jq`, not Python, for JSON**: Use `jq` directly, or `--jq` flags on
184184
`gh` subcommands.
185-
- **Treat "upstream" conceptually**: Use the repo's canonical mainline remote
186-
(e.g. `origin/main`) even if no `upstream` remote exists.
185+
- **Discover the mainline remote once per session**: Run
186+
`gh repo view --json nameWithOwner --jq .nameWithOwner` to get the
187+
canonical repo (e.g. `micasa-dev/micasa`), then match it against
188+
`git remote -v` to find the local remote name (e.g. `upstream`). Use
189+
that remote's default branch for rebases, PR bases, and diff
190+
comparisons. Cache the result for the session — don't re-discover on
191+
every command.
187192
- **Modern CLI tools**: Use `rg` not `grep`, `fd` not `find`, `sd` not
188193
`sed` where possible.
189194
- **Read deps locally**: To read a dependency's source, look in the local

0 commit comments

Comments
 (0)