Merge pull request #22 from gaelic-ghost/release/socket-roadmap-cleanup

release: publish socket v6.0.12 roadmap cleanup

Author: gaelic-ghost

ROADMAP.md

@@ -22,57 +22,64 @@
 
 ## Milestone Progress
 
-- Milestone 2: subtree workflow hardening - In Progress
-- Milestone 3: release and sync discipline - In Progress
+- Milestone 2: subtree workflow hardening - Completed
+- Milestone 3: release and sync discipline - Completed
 
 ## Milestone 2: subtree workflow hardening
 
 ### Status
 
-In Progress
+Completed
 
 ### Scope
 
-- [ ] Tighten the documented subtree add, pull, and push workflows without changing the child-repo ownership model.
+- [x] Tighten the documented subtree add, pull, and push workflows without changing the child-repo ownership model.
 - [x] Define `standard` and `subtrees` release modes so umbrella releases follow the `maintain-project-repo` protected-main shape with subtree-specific accounting.
 
 ### Tickets
 
 - [x] Review subtree workflow docs against the current import and publish path.
+- [x] Add a documented audit pass for detecting stale child packaging paths in the root marketplace.
+- [x] Add a superproject-level checklist for removing public child repos that should no longer be imported.
 
 ### Exit Criteria
 
 - [x] Root maintainer workflow docs describe the actual subtree sync path without stale or duplicate guidance.
 
+Completed Milestone 2 by documenting the current subtree add, pull, and push paths, preserving the child-specific `apple-dev-skills` push-capable and `SpeakSwiftlyServer` pull-only rules, and adding explicit marketplace-audit and public-child-removal checklists to the maintainer workflow.
+
 ## Milestone 3: release and sync discipline
 
 ### Status
 
-In Progress
+Completed
 
 ### Scope
 
-- [ ] Keep root release and synchronization guidance explicit when superproject-level changes ship.
+- [x] Keep root release and synchronization guidance explicit when superproject-level changes ship.
 
 ### Tickets
 
 - [x] Document the expected root release and sync rhythm once the current subtree migration experiment stabilizes.
-- [ ] Keep the root docs aligned with the current child packaging model during coordinated release-prep passes.
+- [x] Keep the root docs aligned with the current child packaging model during coordinated release-prep passes.
 - [x] Make coordinated semantic-version bumps across `socket` and the maintained child manifests explicit instead of relying on ad hoc release notes.
 
 ### Exit Criteria
 
 - [x] Superproject release guidance is explicit enough that root changes can be shipped without improvising process each time.
 - [x] Root docs still describe the live packaging and versioning model after a coordinated release-prep pass.
 
+Completed Milestone 3 by aligning the release-mode docs, subtree sync rules, shared-version workflow, and roadmap backlog cleanup around the current mixed monorepo model.
+
 ## Backlog Candidates
 
-- [ ] Add a documented audit pass for detecting stale child packaging paths in the root marketplace.
-- [ ] Add a superproject-level checklist for removing public child repos that should no longer be imported.
+No active backlog candidates are currently tracked here. Add new candidates only when they represent real future work that is not already covered by the maintainer docs or milestone history.
 
 ## History
 
+- Completed the subtree workflow and release-discipline milestones by adding the root marketplace audit pass, the public child plugin removal checklist, and a tighter roadmap state that no longer carries stale backlog items as active work.
 - Added explicit `standard` and `subtrees` release-mode guidance, including the pull-only `SpeakSwiftlyServer` rule for `socket` subtree sync.
+- Published `apple-dev-skills` `v6.0.11` after adding direct regression coverage for SwiftPM-generated `.swiftpm/xcode/package.xcworkspace` classification and synced the released child state back into `socket`.
 - Prepared the shared `v6.0.11` patch release after fixing `productivity-skills:maintain-project-repo` release-helper regressions for initial PR check discovery and approval-only review handling.
 - Added the placeholder `plugins/spotify` child repository, wired it into the root marketplace, and kept the superproject docs honest about that new monorepo-owned plugin surface.
 - Converted the former standalone `cardhop-mcp` checkout into the monorepo-owned `plugins/cardhop-app` child, added first-pass Codex plugin metadata plus a bundled MCP config, and recorded the new child as a normal `socket` marketplace entry.

docs/maintainers/subtree-workflow.md

@@ -138,6 +138,33 @@ Use these rules:
 - do not leave stale marketplace entries behind after a packaging move or subtree removal
 - keep one surviving plugin identity for each real child plugin
 
+### Marketplace Audit Pass
+
+Run this audit whenever a child plugin is added, removed, moved, renamed, converted from subtree-managed to monorepo-owned, or changes its packaged plugin root:
+
+1. List every marketplace entry in `.agents/plugins/marketplace.json`.
+2. For each `source.path`, verify the directory exists under `plugins/` and exposes `.codex-plugin/plugin.json` at the packaged plugin root.
+3. Compare the marketplace entries against the real child directories under `plugins/` and confirm every public child plugin that ships `.codex-plugin/plugin.json` is listed.
+4. Open each changed child repo's README or maintainer docs and confirm the child still treats the marketplace path as its installable plugin root.
+5. Run `uv run scripts/validate_socket_metadata.py`.
+6. Update `README.md`, this maintainer workflow, and `ROADMAP.md` when the audit finds a packaging-model change rather than only a metadata typo.
+
+The audit is about the installable plugin roots that Codex can actually see. Do not rewrite marketplace paths to follow an invented uniform layout when the child repo still packages from a different root.
+
+### Removing A Public Child Plugin
+
+Use this checklist before removing a public child repository from `socket` or from the root marketplace:
+
+1. Identify whether the child is monorepo-owned, subtree-managed with push-back, or pull-only.
+2. Confirm the child history is preserved where it belongs before deleting the directory, marketplace entry, branch, worktree, remote branch, or archive ref.
+3. Remove the child directory only when the source repo is no longer meant to be imported here, or when the child has been explicitly moved elsewhere.
+4. Remove the marketplace entry in the same commit as the directory removal when the plugin is no longer installable from `socket`.
+5. Update `README.md`, `ROADMAP.md`, and any maintainer docs that listed the child as active.
+6. Run `uv run scripts/validate_socket_metadata.py`.
+7. Account for local branches not contained by `main` before cleanup.
+
+If the child is `SpeakSwiftlyServer`, do not use this checklist as permission to delete or rewrite the standalone live-service repository. That repo's standalone release, validation, and live-refresh path stays outside ordinary `socket` cleanup.
+
 ## Release Flow
 
 For full release sequencing, use [`release-modes.md`](./release-modes.md). In short, `standard` is the normal `socket` release mode and `subtrees` is the normal mode plus explicit subtree accounting.

plugins/agent-plugin-skills/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-plugin-skills",
-  "version": "6.0.11",
+  "version": "6.0.12",
   "description": "Installable maintainer skills for skills-export repositories.",
   "author": {
     "name": "Gale",

plugins/agent-plugin-skills/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agent-plugin-skills-maintenance"
-version = "6.0.11"
+version = "6.0.12"
 description = "Maintainer-only Python tooling baseline for agent-plugin-skills."
 requires-python = ">=3.11"
 dependencies = []

plugins/agent-plugin-skills/uv.lock

@@ -1,6 +1,6 @@
 {
   "name": "apple-dev-skills",
-  "version": "6.0.11",
+  "version": "6.0.12",
   "description": "Apple development workflows for Codex and Claude Code, including SwiftUI architecture and DocC authoring guidance.",
   "author": {
     "name": "Gale",

plugins/apple-dev-skills/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 [project]
 name = "apple-dev-skills-maintainer"
-version = "6.0.11"
+version = "6.0.12"
 description = "Maintainer tooling for the apple-dev-skills repository"
 requires-python = ">=3.9"
 dependencies = []

plugins/apple-dev-skills/pyproject.toml

@@ -77,6 +77,21 @@ def test_ignores_generated_xcode_markers_in_swiftpm_state(self) -> None:
             self.assertIsNone(payload["detected_state"]["project"])
             self.assertIsNone(payload["detected_state"]["workspace"])
 
+    def test_ignores_swiftpm_generated_xcode_workspace(self) -> None:
+        with tempfile.TemporaryDirectory() as tmpdir:
+            repo_root = Path(tmpdir)
+            (repo_root / "Package.swift").write_text("// swift-tools-version: 6.0\n", encoding="utf-8")
+            (repo_root / ".swiftpm/xcode/package.xcworkspace").mkdir(parents=True)
+
+            code, payload = self.run_script("--repo-root", tmpdir, "--dry-run")
+
+            self.assertEqual(code, 0)
+            self.assertEqual(payload["status"], "success")
+            self.assertFalse(payload["detected_state"]["is_ambiguous_repo"])
+            self.assertTrue(payload["detected_state"]["is_package_repo"])
+            self.assertFalse(payload["detected_state"]["is_xcode_repo"])
+            self.assertIsNone(payload["detected_state"]["workspace"])
+
     def test_dry_run_plans_agents_creation(self) -> None:
         with tempfile.TemporaryDirectory() as tmpdir:
             Path(tmpdir, "Package.swift").write_text("// swift-tools-version: 6.0\n", encoding="utf-8")

plugins/apple-dev-skills/tests/test_swift_package_guidance_sync_workflow.py

@@ -1,6 +1,6 @@
 {
   "name": "cardhop-app",
-  "version": "6.0.11",
+  "version": "6.0.12",
   "description": "Cardhop.app workflow guidance plus a bundled local MCP server for contact capture and updates on macOS.",
   "author": {
     "name": "Gale",