Defame1297
5e232503c4
Why: ADR-0015 established that Microsoft APM (apm.yml + .apm/) should replace this repo's hand-authored plugin.json/marketplace.json model, with those files becoming compiled output of `apm pack` instead of files edited by hand via the (now-retired) plugin-author/marketplace-author skills. Issue #90 was the deferred execution of that decision, gated on #88 (apm tooling) and #89 (apm-native agent-author/skill-author routing). Implementation notes: - All six plugins (bin, core, git, gitea, kyberforge, lint) now carry apm.yml + .apm/{skills,agents,hooks} as their authoring source. Skills moved with a plain git mv (content-identical across targets). Agents were re-authored, not moved: per ADR-0016, .apm/agents/*.agent.md compiles verbatim to both Claude and Copilot, so plugin-scope agents now carry only name/description/model/source_keys -- no tools: field, no Claude-only knobs (isolation, maxTurns, effort, memory, permissionMode). - Root apm.yml registers all 7 marketplace packages (6 local plus mattpocock-skills as a remote entry) under versioning: per_package, matching this repo's existing independent-plugin-versioning practice. - .claude-plugin/marketplace.json and every plugin's plugin.json are now apm-pack-compiled output, verified against the prior hand-maintained content: same names/descriptions/versions/licenses/authors, only cosmetic serialization differences (JSON key order, owner email vs. url, Unicode escaping). - plugin-author and marketplace-author are retired now that apm-based authoring fully replaces their job; kyberforge bumped 1.3.1 -> 1.4.0 for that removal, and the root marketplace catalog bumped 0.3.1 -> 0.3.2 to match, per the version-bump convention now documented in apm-workflow's reference docs instead of a dedicated script (apm has no native version-bump automation). - Fixed hardcoded pre-.apm/ path assumptions across .pre-commit-config.yaml, .pre-commit-hooks.yaml, scripts/check-scope-walkup-sync.sh, scripts/sync-vale-styles.sh, scripts/check-vale-style-sync.sh, six plugins' root plugin.json (stale skills/hooks/agents pointer fields that check-manifests.sh validates), and several tests/*.bats and tests/*.sh fixtures -- including a bats REPO_ROOT relative-path depth bug (10 files, one extra .apm/ directory level to walk up) and a vale probe-path isolation regression introduced mid-fix. - Corrected empirically-wrong assumptions surfaced this session in apm-workflow/apm-install's own reference docs: `apm marketplace package add` does not accept local paths (only owner/repo remote shorthand -- local packages are registered by editing apm.yml's marketplace.packages[] directly); `apm compile` is a consumer-side AGENTS.md/CLAUDE.md generator, not the plugin.json producer, and hard-fails on skill/agent-only packages without --clean; `apm plugin init <name>` nests a stray subdirectory when run with a positional name arg from inside a same-named directory; no native Copilot marketplace output profile exists; .mcp.json is merged into the compiled plugin.json content-aware and target-scoped, with no dependencies.mcp entry needed for simple passthrough; pipx is the correct pip fallback on externally-managed Python environments. - Renamed agent-author's copilot.agent.md template asset to copilot.agent.md.template so apm compile's recursive *.agent.md glob stops misparsing the placeholder template as a real agent primitive. Impact: plugin.json and marketplace.json are compiled artifacts from here on -- editing them by hand is no longer the workflow; edit apm.yml/.apm/ and run apm pack. CONTEXT.md's Plugin/Plugin marketplace glossary entries reflect this. ADR-0001 is marked superseded, ADR-0006 moot, and ADR-0010 updated for the new .apm/agents/ path (project/user scope unaffected, per ADR-0016). Full local verification: claude plugin validate --strict on all 6 plugins, apm audit --ci, apm marketplace check, check-manifests.sh, and the full test suite (165/165 bats, 13/13 shell scripts) all pass clean. Fixes: #90 Refs: #88, #89 ADR: 0015 ADR: 0016 Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Ub96PyaSRD9BHPktotj1pC
2.4 KiB
2.4 KiB
topic, source_keys
| topic | source_keys | |
|---|---|---|
| worktrees |
|
Full add flag table
| Flag | Meaning |
|---|---|
-b <branch> |
Create and check out a new branch; fails if it exists |
-B <branch> |
Like -b but resets the branch if it already exists |
-d / --detach |
Detach HEAD; useful for throwaway experiments |
--orphan |
Create empty unborn branch |
--no-checkout |
Suppress initial checkout (for sparse-checkout setup) |
--guess-remote |
Look for a matching remote-tracking branch by path basename |
--lock [--reason <str>] |
Lock immediately on creation (atomic; avoids race vs. add-then-lock) |
-f / --force |
Allow when branch is already checked out elsewhere |
--relative-paths |
Link via relative paths (portable across moves) |
Using - as <commit-ish> is shorthand for @{-1} (the branch checked out before the current one), e.g. git worktree add <path> -.
New unborn branch
git worktree add --orphan -b <branch> <path>
Creates an empty branch with no commits.
Sparse-checkout worktree
Suppress the initial checkout to configure sparse-checkout first:
git worktree add --no-checkout ../sparse main
cd ../sparse
git sparse-checkout init --cone
git sparse-checkout set src/
git checkout main
Worktree on removable media
git worktree add --lock --reason "external SSD" <path> <branch>
git worktree unlock <path> # when reconnected
Remote-branch disambiguation
git worktree add <path> <remote>/<branch>
For ambiguous names across remotes, checkout.defaultRemote config disambiguates explicitly, or --guess-remote auto-matches by path basename (default controlled by worktree.guessRemote config). If a branch name matches multiple remotes during worktree add and neither is set, Git refuses rather than guessing.
Configuration
| Key | Effect |
|---|---|
worktree.guessRemote |
Default for --guess-remote on git worktree add |
worktree.useRelativePaths |
Default for --relative-paths on git worktree add (link via relative paths — portable across moves) |
gc.worktreePruneExpire |
How long before stale worktree metadata is pruned by git gc |
extensions.worktreeConfig |
Enable per-worktree config scope (config.worktree file) — see Gotchas in SKILL.md |
checkout.defaultRemote |
Disambiguates which remote to use when a branch name matches multiple remotes during worktree add |