workstate-bootstrap 0.5.2__tar.gz → 0.7.0__tar.gz

{workstate_bootstrap-0.5.2 → workstate_bootstrap-0.7.0}/CHANGELOG.md

@@ -2,6 +2,64 @@
 
 ## Unreleased
 
+## [0.7.0] — 2026-06-01
+
+### Added
+
+- **Package-source overlay delivery (WS-PKG-DELIVERY-01).** `install` /
+  `update` can resolve the harness overlay from an installed
+  `workstate-system` distribution (`source_kind="package"`) instead of a git
+  clone, writing a `package`-kind `BootstrapManifest`. `update` / `repair`
+  reject a package-source manifest with a clear error rather than
+  dereferencing a `remote_url` that package manifests do not carry.
+
+### Changed
+
+- **MCP launch decoupled from resolution (implementation note Theme A,
+  WS-MCP-LAUNCH-01).** Generated serve commands now use `uv run --no-sync`
+  and the server venvs are pre-built at install time
+  (`_presync_local_mcp_envs`), eliminating the cold-start re-sync race that
+  overran the harness's 30s MCP connection timeout and registered zero tools.
+  The `--no-sync` invariant is enforced at the shared render seam
+  (`_canonicalize_managed_servers`), so `install` / `update` / `repair` /
+  `mcp-sync` all rewrite an older launcher; the earlier preserve-path
+  `_normalize_local_mcp_server_specs` patch is retired.
+
+### Removed
+
+- **Runtime-path migration shim retired (implementation note Slice D cutover complete).**
+  The legacy-runtime-tree migration helpers (`migrate_runtime_paths()`,
+  `plan_runtime_path_migration()`) and the `legacy_runtime_path` `doctor` check
+  are removed. `.workstate/` / `docs/workstate/` are the sole runtime paths with
+  no backward compatibility — a consumer still carrying the pre-rebrand runtime
+  tree must reinstall cleanly.
+
+## [0.6.0] — 2026-05-30
+
+### Changed
+
+- **MCP server identity cutover (implementation note Slice B).** Default managed servers
+  register under the canonical `workstate-handoff-mcp` /
+  `workstate-orchestrator-mcp` names. `LEGACY_MCP_SERVER_RENAMES` +
+  `_legacy_prune_for()` dedup and forward-rewrite a stale `agent-*-mcp`
+  registration across all three config surfaces (`.mcp.json`,
+  `.vscode/mcp.json`, `.codex/config.toml`) so a re-install collapses the
+  duplicate to one canonical entry — fixing the "MCP servers not loading"
+  symptom caused by deep-merge preserving both old and new entries.
+- **Default managed server pins bumped** to `mcp-workstate-handoff@0.12.0` and
+  `mcp-workstate-orchestrator@0.5.0`. `workstate-protocol` floor raised to
+  `>=0.1.6`.
+
+### Added
+
+- **Runtime path migration `.workstate/` → `.workstate/` and
+  `docs/workstate/` → `docs/workstate/` (implementation note Slice D).**
+  `migrate_runtime_paths()` / `plan_runtime_path_migration()` run on
+  `install`/`update`: idempotent, archive-backed (a both-present collision
+  moves the legacy tree aside rather than overwriting), dry-run-capable, and
+  routed through the shared `workstate_protocol.paths` constants. `doctor`
+  flags a surviving legacy tree as `legacy_runtime_path`.
+
 ## [0.5.2] — 2026-05-20
 
 ### Changed
@@ -19,7 +77,7 @@
   When a consumer was installed pre-v0.2.0 (legacy root layout
   `<clone>/<surface>`) and the layout subsequently moved into
   `<clone>/packages/workstate-system/<surface>`, the target-side
-  `scripts/hooks -> ../.agentic/remote/scripts/hooks` symlink survived
+  `scripts/hooks -> ../.workstate/remote/scripts/hooks` symlink survived
   every subsequent `workstate-bootstrap install` because the pre-fix
   `points_into_clone` check still passed lexically for the broken
   resolved path. `_materialize_surfaces` now classifies each existing
@@ -151,7 +209,7 @@
   post-checkout / pre-commit / pre-push hooks `exec`) is materialized
   alongside them. Without the helper, every branch-naming gate
   silently no-ops. The shared surface itself is unchanged
-  (`scripts/hooks` is symlinked from `.agentic/remote`); the new
+  (`scripts/hooks` is symlinked from `.workstate/remote`); the new
   assertion catches a future regression where the upstream package
   drops the helper.
 - **Manifest renamed: `.workstate-overlay.json` → `.workstate-bootstrap.json`

{workstate_bootstrap-0.5.2 → workstate_bootstrap-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workstate-bootstrap
-Version: 0.5.2
+Version: 0.7.0
 Summary: Bootstrap CLI that hoists the shared workstate-system surface into consumer repos.
 Project-URL: Homepage, https://github.com/darce/workstate
 Project-URL: Source, https://github.com/darce/workstate/tree/main/packages/workstate-bootstrap
@@ -11,7 +11,8 @@ License: Proprietary
 Requires-Python: >=3.11
 Requires-Dist: pyyaml>=6
 Requires-Dist: tomlkit>=0.13
-Requires-Dist: workstate-protocol<0.2.0,>=0.1.4
+Requires-Dist: workstate-protocol<0.2.0,>=0.1.7
+Requires-Dist: workstate-system<0.2.0,>=0.1.0
 Provides-Extra: dev
 Requires-Dist: mcp-workstate-handoff; (python_version >= '3.12') and extra == 'dev'
 Requires-Dist: pytest>=8; extra == 'dev'
@@ -117,20 +118,20 @@ installer implementation in
 | ------------------------------------ | ---------- | ----------- |
 | `scripts/hooks/`                     | shared     | symlink     |
 | `.github/hooks/`                     | shared     | symlink     |
-| `docs/agentic/contracts/`            | shared     | symlink     |
-| `docs/agentic/rules/`                | shared     | symlink     |
+| `docs/workstate/contracts/`            | shared     | symlink     |
+| `docs/workstate/rules/`                | shared     | symlink     |
 | `Makefile.d/` non-excluded children  | shared     | carved dir  |
 | `scripts/workstate/` non-excluded children | shared | carved dir  |
 | `.github/prompts/`                   | generated  | real dir    |
-| `.agentic/generated/plugins/workstate-system/base/` | generated | real dir |
-| `.agentic/generated/plugins/workstate-system/effective/` | generated | real dir |
+| `.workstate/generated/plugins/workstate-system/base/` | generated | real dir |
+| `.workstate/generated/plugins/workstate-system/effective/` | generated | real dir |
 | `.mcp.json`                          | generated  | real file   |
 | `.vscode/mcp.json`                   | generated  | real file   |
 | `.codex/config.toml`                 | generated  | real file   |
 | `core.hooksPath` git config          | generated  | git config  |
 | `.task-state/handoff.db`             | runtime    | sqlite      |
 | `.task-state/exports/`               | runtime    | dir         |
-| `.agentic/remote/`                   | bootstrap  | git clone   |
+| `.workstate/remote/`                   | bootstrap  | git clone   |
 | `.workstate-bootstrap.json`              | bootstrap  | manifest    |
 
 `.task-state/` is provisioned by the handoff server's `init-state`
@@ -161,13 +162,13 @@ regenerates it through `workstate-bootstrap install`.
   `install`, `update`, `doctor`, or `repair` for a non-default root;
   bootstrap records that path so later update/doctor/repair runs reuse
   it. Override-aware installs generate effective plugin trees under
-  `.agentic/generated/plugins/workstate-system/effective/{claude,codex}`
+  `.workstate/generated/plugins/workstate-system/effective/{claude,codex}`
   and point marketplace pins at those generated trees.
 - `install` and `update` preserve plugin override files by default.
   `--reset-overrides` is the explicit destructive path; it removes only
   the resolved override root, refuses dirty git worktrees unless
   `--backup` is supplied, and archives backups under
-  `.agentic/override-backups/<timestamp>/` before removal.
+  `.workstate/override-backups/<timestamp>/` before removal.
 
 ## Development
 

{workstate_bootstrap-0.5.2 → workstate_bootstrap-0.7.0}/README.md

@@ -98,20 +98,20 @@ installer implementation in
 | ------------------------------------ | ---------- | ----------- |
 | `scripts/hooks/`                     | shared     | symlink     |
 | `.github/hooks/`                     | shared     | symlink     |
-| `docs/agentic/contracts/`            | shared     | symlink     |
-| `docs/agentic/rules/`                | shared     | symlink     |
+| `docs/workstate/contracts/`            | shared     | symlink     |
+| `docs/workstate/rules/`                | shared     | symlink     |
 | `Makefile.d/` non-excluded children  | shared     | carved dir  |
 | `scripts/workstate/` non-excluded children | shared | carved dir  |
 | `.github/prompts/`                   | generated  | real dir    |
-| `.agentic/generated/plugins/workstate-system/base/` | generated | real dir |
-| `.agentic/generated/plugins/workstate-system/effective/` | generated | real dir |
+| `.workstate/generated/plugins/workstate-system/base/` | generated | real dir |
+| `.workstate/generated/plugins/workstate-system/effective/` | generated | real dir |
 | `.mcp.json`                          | generated  | real file   |
 | `.vscode/mcp.json`                   | generated  | real file   |
 | `.codex/config.toml`                 | generated  | real file   |
 | `core.hooksPath` git config          | generated  | git config  |
 | `.task-state/handoff.db`             | runtime    | sqlite      |
 | `.task-state/exports/`               | runtime    | dir         |
-| `.agentic/remote/`                   | bootstrap  | git clone   |
+| `.workstate/remote/`                   | bootstrap  | git clone   |
 | `.workstate-bootstrap.json`              | bootstrap  | manifest    |
 
 `.task-state/` is provisioned by the handoff server's `init-state`
@@ -142,13 +142,13 @@ regenerates it through `workstate-bootstrap install`.
   `install`, `update`, `doctor`, or `repair` for a non-default root;
   bootstrap records that path so later update/doctor/repair runs reuse
   it. Override-aware installs generate effective plugin trees under
-  `.agentic/generated/plugins/workstate-system/effective/{claude,codex}`
+  `.workstate/generated/plugins/workstate-system/effective/{claude,codex}`
   and point marketplace pins at those generated trees.
 - `install` and `update` preserve plugin override files by default.
   `--reset-overrides` is the explicit destructive path; it removes only
   the resolved override root, refuses dirty git worktrees unless
   `--backup` is supplied, and archives backups under
-  `.agentic/override-backups/<timestamp>/` before removal.
+  `.workstate/override-backups/<timestamp>/` before removal.
 
 ## Development
 

{workstate_bootstrap-0.5.2 → workstate_bootstrap-0.7.0}/pyproject.toml

@@ -4,13 +4,18 @@ build-backend = "hatchling.build"
 
 [project]
 name = "workstate-bootstrap"
-version = "0.5.2"
+version = "0.7.0"
 description = "Bootstrap CLI that hoists the shared workstate-system surface into consumer repos."
 readme = "README.md"
 requires-python = ">=3.11"
 license = { text = "Proprietary" }
 authors = [{ name = "darce" }]
-dependencies = ["tomlkit>=0.13", "pyyaml>=6", "workstate-protocol>=0.1.4,<0.2.0"]
+dependencies = [
+	"tomlkit>=0.13",
+	"pyyaml>=6",
+	"workstate-protocol>=0.1.7,<0.2.0",
+	"workstate-system>=0.1.0,<0.2.0",
+]
 
 [project.scripts]
 workstate-bootstrap = "workstate_bootstrap.cli:main"
@@ -27,6 +32,7 @@ dev = ["pytest>=8", "mcp-workstate-handoff; python_version >= '3.12'"]
 [tool.uv.sources]
 mcp-workstate-handoff = { path = "../mcp-workstate-handoff", editable = true }
 workstate-protocol = { path = "../workstate-protocol", editable = true }
+workstate-system = { path = "../workstate-system", editable = true }
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/workstate_bootstrap"]

{workstate_bootstrap-0.5.2 → workstate_bootstrap-0.7.0}/src/workstate_bootstrap/__init__.py

@@ -3,4 +3,4 @@
 from workstate_bootstrap.install import install
 
 __all__ = ["install"]
-__version__ = "0.5.2"
+__version__ = "0.6.0"

{workstate_bootstrap-0.5.2 → workstate_bootstrap-0.7.0}/src/workstate_bootstrap/cli.py

@@ -13,6 +13,7 @@ from workstate_bootstrap.install import (
     PROFILE_ALL,
     PROFILE_LIFECYCLE,
     PROFILE_MINIMAL,
+    _build_local_default_mcp_servers,
     install,
 )
 from workstate_bootstrap.mcp_sync import (
@@ -64,8 +65,29 @@ def _resolve_mcp_servers(
     return doc
 
 
+def _resolve_managed_servers(
+    target: Path, raw: str | None
+) -> Mapping[str, Mapping[str, Any]] | None:
+    """Resolve ``--mcp-servers``, making ``default`` profile-aware.
+
+    On a ``git_overlay`` install with local MCP packages, ``default`` resolves
+    the LOCAL ``uv run --no-sync --project ...`` launchers (via
+    :func:`_build_local_default_mcp_servers`) instead of the uvx package map, so
+    ``mcp-sync`` and ``repair`` converge on the same launchers as
+    ``install``/``update`` and never silently downgrade a local install. Falls
+    back to the uvx map when no local packages are present. implementation note A1.
+    """
+    servers = _resolve_mcp_servers(raw)
+    if raw == "default":
+        local = _build_local_default_mcp_servers(target)
+        if local is not None:
+            return local
+    return servers
+
+
 DEFAULT_REMOTE_URL = "git@github.com:darce/workstate.git"
 DEFAULT_REMOTE_REF = "main"
+INSTALL_SOURCE_CHOICES: tuple[str, ...] = ("git_overlay", "package")
 
 
 def _build_parser() -> argparse.ArgumentParser:
@@ -80,7 +102,7 @@ def _build_parser() -> argparse.ArgumentParser:
 
     p_install = sub.add_parser(
         "install",
-        help="Clone the shared workstate-system remote and write the overlay manifest.",
+        help="Materialize the shared workstate-system overlay and write the manifest.",
     )
     p_install.add_argument(
         "--target",
@@ -98,6 +120,16 @@ def _build_parser() -> argparse.ArgumentParser:
         default=DEFAULT_REMOTE_REF,
         help=f"Tag or branch to check out (default: {DEFAULT_REMOTE_REF}).",
     )
+    p_install.add_argument(
+        "--source",
+        choices=INSTALL_SOURCE_CHOICES,
+        default="git_overlay",
+        help=(
+            "Overlay source. 'git_overlay' keeps the existing clone-backed "
+            "default; 'package' resolves payload data from the installed "
+            "workstate-system distribution."
+        ),
+    )
     p_install.add_argument(
         "--mcp-servers",
         default=None,
@@ -151,7 +183,7 @@ def _build_parser() -> argparse.ArgumentParser:
         "--backup",
         action="store_true",
         help=(
-            "Archive plugin overrides under .agentic/override-backups/<timestamp>/ "
+            "Archive plugin overrides under .workstate/override-backups/<timestamp>/ "
             "before a reset-overrides removal."
         ),
     )
@@ -303,7 +335,7 @@ def _build_parser() -> argparse.ArgumentParser:
         "--backup",
         action="store_true",
         help=(
-            "Archive plugin overrides under .agentic/override-backups/<timestamp>/ "
+            "Archive plugin overrides under .workstate/override-backups/<timestamp>/ "
             "before a reset-overrides removal."
         ),
     )
@@ -439,6 +471,7 @@ def main(argv: list[str] | None = None) -> int:
             target=args.target,
             remote_url=args.remote_url,
             remote_ref=args.remote_ref,
+            source=args.source,
             mcp_servers=_resolve_mcp_servers(
                 args.mcp_servers,
                 no_servers=args.no_mcp_servers,
@@ -454,11 +487,18 @@ def main(argv: list[str] | None = None) -> int:
             install_codex_stop_hook=args.install_codex_stop_hook,
             install_vscode_stop_hook=args.install_vscode_stop_hook,
         )
-        print(
-            f"installed workstate-system overlay: "
-            f"{args.remote_url}@{manifest['remote_sha']} -> {args.target}",
-            file=sys.stdout,
-        )
+        if manifest.get("source_kind") == "package":
+            print(
+                f"installed workstate-system overlay: "
+                f"workstate-system=={manifest['package_version']} -> {args.target}",
+                file=sys.stdout,
+            )
+        else:
+            print(
+                f"installed workstate-system overlay: "
+                f"{args.remote_url}@{manifest['remote_sha']} -> {args.target}",
+                file=sys.stdout,
+            )
         if isinstance(manifest.get("override_backup_path"), str):
             print(f"override backup: {manifest['override_backup_path']}", file=sys.stdout)
         if isinstance(manifest.get("state_backup_path"), str):
@@ -503,7 +543,7 @@ def main(argv: list[str] | None = None) -> int:
                 backup_overrides=args.backup,
                 enforce_required_surfaces=not args.no_enforce_required_surfaces,
             )
-        except FileNotFoundError as exc:
+        except (FileNotFoundError, ValueError) as exc:
             print(str(exc), file=sys.stderr)
             return 1
         print(
@@ -520,7 +560,7 @@ def main(argv: list[str] | None = None) -> int:
             report = repair(
                 target=args.target,
                 force_dirty=args.force_dirty,
-                mcp_servers=_resolve_mcp_servers(args.mcp_servers),
+                mcp_servers=_resolve_managed_servers(args.target, args.mcp_servers),
                 plugin_overrides=args.plugin_overrides,
             )
         except FileNotFoundError as exc:
@@ -540,7 +580,7 @@ def main(argv: list[str] | None = None) -> int:
 
     if args.command == "mcp-sync":
         try:
-            servers = _resolve_mcp_servers(args.mcp_servers)
+            servers = _resolve_managed_servers(args.target, args.mcp_servers)
         except (FileNotFoundError, json.JSONDecodeError) as exc:
             print(f"mcp-sync: --mcp-servers: {exc}", file=sys.stderr)
             return 2