@mriekki/project-forge 4.15.0 → 4.15.1

package/assets/bootstrap-migrations/wsl-setup/setup-wsl.manifest.json

@@ -6,18 +6,21 @@
   "asset": "assets/bootstrap-migrations/wsl-setup/setup-wsl.py",
   "source": {
     "component": "bootstrap",
-    "revision": "043b3b2a0e3ba03b8d18666bb3fef59c588bfa16",
+    "revision": "6b6a2252434d310b21150fcbb5ce7270919ad9d0",
     "artifact": "runtime/dev_environment_wsl.py"
   },
-  "targetGitBlob": "0b959b4e85508016f6e8c12d403a94b2eed46c1f",
+  "targetGitBlob": "a557150b7333f83cfd342b4983037f5ddf8c6748",
   "supportedPredecessorGitBlobs": [
     "6731910246fb99887c58b9f3a8a14fec1bf02c01",
-    "883f7bbadd2de4bc0dcb601ee2285f88a0085b52"
+    "883f7bbadd2de4bc0dcb601ee2285f88a0085b52",
+    "0b959b4e85508016f6e8c12d403a94b2eed46c1f"
   ],
   "supportedBootstrapRevisions": [
     "0c45eb332a815ad79ea061443f337500b9dc5712",
     "173203baaf36935d04eb81c89f1d016131a40442",
-    "9f0f7fd4e0e2220250f6fd5b035706a7d15834af"
+    "9f0f7fd4e0e2220250f6fd5b035706a7d15834af",
+    "043b3b2a0e3ba03b8d18666bb3fef59c588bfa16",
+    "1e656d533a259428bbfb21aada548429462ba190"
   ],
   "allowMissing": true
 }

package/assets/bootstrap-migrations/wsl-setup/setup-wsl.py

@@ -311,19 +311,48 @@ def ensure_tool(entry: dict[str, Any], check_only: bool) -> tuple[bool, str, str
     return False, detail or f"No WSL installer is defined for {tool_id}", "MISSING"
 
 
-def ensure_extensions(extensions: list[str], check_only: bool) -> list[str]:
-    if not extensions or not command_path("code"):
-        return extensions if not command_path("code") else []
+def ensure_extensions(extensions: list[str], check_only: bool) -> tuple[list[str], bool, str]:
+    if not extensions:
+        return [], True, "not applicable"
+    if not command_path("code"):
+        return extensions, False, "VS Code's WSL command bridge is unavailable"
+
+    ipc_hook = os.environ.get("VSCODE_IPC_HOOK_CLI")
+    if not ipc_hook:
+        return [], False, (
+            "this shell is not bound to an active Remote - WSL VS Code host. Open the repository in "
+            "VS Code Remote - WSL and rerun setup from that window's integrated terminal; a bare `code` "
+            "command from an external WSL shell can target the Windows-local extension set instead"
+        )
+
     result = run(["code", "--list-extensions"])
+    if result.returncode != 0:
+        detail = "\n".join(filter(None, [(result.stdout or "").strip(), (result.stderr or "").strip()]))
+        return [], False, detail or "the active Remote - WSL host did not list extensions successfully"
+
     installed = {line.strip().lower() for line in (result.stdout or "").splitlines() if line.strip()}
     missing = [value for value in extensions if value.lower() not in installed]
     if not check_only:
+        install_failures: list[str] = []
         for extension in missing:
-            run(["code", "--install-extension", extension, "--force"], capture=False)
+            install_result = run(["code", "--install-extension", extension, "--force"], capture=False)
+            if install_result.returncode != 0:
+                install_failures.append(extension)
         result = run(["code", "--list-extensions"])
+        if result.returncode != 0:
+            detail = "\n".join(filter(None, [(result.stdout or "").strip(), (result.stderr or "").strip()]))
+            return install_failures, False, detail or "the active Remote - WSL host could not verify extensions"
         installed = {line.strip().lower() for line in (result.stdout or "").splitlines() if line.strip()}
         missing = [value for value in extensions if value.lower() not in installed]
-    return missing
+        for extension in install_failures:
+            if extension not in missing:
+                missing.append(extension)
+
+    agent_folder = os.environ.get("VSCODE_AGENT_FOLDER")
+    detail = "active Remote - WSL extension host"
+    if agent_folder:
+        detail += f" ({agent_folder})"
+    return missing, True, detail
 
 
 def restore_project(commands: list[list[str]], check_only: bool) -> list[str]:
@@ -377,9 +406,17 @@ def main() -> int:
         if not ok:
             (failed_required if required else failed_optional).append(entry["id"])
 
-    missing_extensions = ensure_extensions(config.get("vscodeExtensions", []), args.check)
+    declared_extensions = config.get("vscodeExtensions", [])
+    missing_extensions, extension_host_verified, extension_host_detail = ensure_extensions(
+        declared_extensions, args.check
+    )
+    if declared_extensions:
+        host_state = "PASS" if extension_host_verified else "UNVERIFIED"
+        print(f"{host_state} VS Code WSL extension host — {extension_host_detail}")
     for extension in missing_extensions:
         print(f"MISSING extension {extension}")
+    if declared_extensions and not extension_host_verified:
+        failed_required.append("VS Code extension host")
     if missing_extensions:
         failed_required.append("VS Code extensions")
 

package/assets/components.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 2,
   "package": "@mriekki/project-forge",
-  "version": "4.15.0",
+  "version": "4.15.1",
   "defaultProfile": "greenfield-project",
   "profiles": {
     "greenfield-project": {
@@ -13,7 +13,7 @@
   },
   "components": {
     "core": {
-      "revision": "b51cb62bcc9630748168c9fd1900c6109cafb587",
+      "revision": "6e31941ac4b6c2490b0470b1b4d25b7289b97c98",
       "version": "4.0.0",
       "distribution": "greenfield-workspace",
       "descriptor": "assets/core/distribution.json",

package/assets/generated/ASSEMBLY.json

@@ -1,10 +1,10 @@
 {
   "schemaVersion": 2,
   "package": "@mriekki/project-forge",
-  "version": "4.15.0",
+  "version": "4.15.1",
   "components": {
     "core": {
-      "revision": "b51cb62bcc9630748168c9fd1900c6109cafb587",
+      "revision": "6e31941ac4b6c2490b0470b1b4d25b7289b97c98",
       "version": "4.0.0",
       "distribution": "greenfield-workspace",
       "files": [
@@ -96,7 +96,7 @@
         {
           "source": "core/skills/work-item-status/SKILL.md",
           "destination": ".github/skills/work-item-status/SKILL.md",
-          "sha256": "ca79843e59e5f50785c3621b6bf8ecb7413307aefce05fec737321589792c3a9"
+          "sha256": "b09fc1b9666a81f5c5a85dc691a6db9869097fe560d45fc14dec71256eabdc52"
         },
         {
           "source": "core/skills/cleanup-branches/SKILL.md",
@@ -331,7 +331,7 @@
         {
           "source": "tools/vscode_work_item_status/install.py",
           "destination": "tools/project-forge-vscode/work-item-status/install.py",
-          "sha256": "190015b44611b5b6f0f21bff05923262abd9d9e16e9916dbe71755fb753d8fbc"
+          "sha256": "1f19a8d47b916bd8b21669c50a418010807832db879993a39c3a74d49aa662e1"
         },
         {
           "source": "tools/vscode_work_item_status/extension/package.json",
@@ -346,7 +346,7 @@
         {
           "source": "tools/vscode_work_item_status/extension/README.md",
           "destination": "tools/project-forge-vscode/work-item-status/extension/README.md",
-          "sha256": "54963b69bef2d9f763a6c92ad2c2b3105d3f10dd69542f72167de7e57db18982"
+          "sha256": "b5f1e2d6051fa7b62f724fcfbf9413ff5bbef61437c780bee566be66475f0855"
         },
         {
           "source": "tools/package/check_baseline.py",

package/assets/generated/core/core/skills/work-item-status/SKILL.md

@@ -82,10 +82,23 @@ A useful result is:
 WORK-ITEM EXPLORER STATUS
 
 Local work-item folders .... PRESENT / NOT PRESENT
-VS Code decorator .......... READY / NOT INSTALLED / ERROR
+VS Code decorator files .... FILES PRESENT / NOT INSTALLED / ERROR
+Host activation ............ VERIFIED BY HUMAN / UNVERIFIED / NOT APPLICABLE
 Project workflow authority . UNCHANGED
 ```
 
+`FILES PRESENT` means only that the expected extension files exist in the resolved extension-host directory. It does not prove host discovery or activation. The installer must not report a generic `ready` result merely from file presence.
+
+For Remote - WSL, resolve the extension root in this precedence order:
+
+1. explicit `--extensions-dir`;
+2. `VSCODE_EXTENSIONS`;
+3. the active VS Code Server root exposed by `VSCODE_AGENT_FOLDER`;
+4. an unambiguous existing stable (`~/.vscode-server`) or Insiders (`~/.vscode-server-insiders`) server root;
+5. the normal stable WSL server root when no server root exists yet.
+
+If both stable and Insiders roots exist and no active/explicit root identifies the intended host, stop with an actionable ambiguity instead of guessing. Do not generalize the WSL default to SSH, Dev Containers, custom server roots, or other remote hosts.
+
 ## 4. Enable
 
 Outside `/setup`, `/work-item-status enable` is explicit authorization for one bounded local editor change: install/update the Project Forge-owned extension in this developer's VS Code extensions directory. Normal `/setup` and `/setup local` already authorize the same bounded install when local `docs/work-items` folders are present, so do not ask for a second confirmation in that flow.
@@ -98,7 +111,9 @@ python tools/project-forge-vscode/work-item-status/install.py install --json
 
 The installer may replace older versions of **this same Project Forge extension only**. It must not install unrelated extensions, alter Project files, change work-item docs, or change Git/GitHub state.
 
-If installation changes the extension, tell the developer to reload VS Code once. The decorator then refreshes automatically and also exposes:
+If installation changes the extension, tell the developer to reload VS Code once. The install result may confirm file placement and `reloadRequired: true`, but activation remains `unverified` until the actual editor host discovers the extension after reload. When activation matters, confirm command discovery in the active VS Code window rather than inferring it from file existence or from a `code --list-extensions` invocation whose host binding is unknown.
+
+The decorator then refreshes automatically and also exposes:
 
 ```text
 Project Forge: Refresh Work Item Status
@@ -123,9 +138,10 @@ Do not remove any other extension. If files were removed, tell the developer to
 ## 6. Guided ending
 
 Return:
-- decorator installation state;
+- decorator file-installation state;
+- host activation state when actually verified;
 - whether local `docs/work-items` folders are present;
 - a reminder that badges are evidence-derived and non-authoritative;
 - the smallest relevant next action.
 
-Do not turn this editor convenience into a source of Project workflow authority.
+Do not turn this editor convenience into a source of Project workflow authority.

package/assets/generated/core/tools/vscode_work_item_status/extension/README.md

@@ -2,6 +2,14 @@
 
 This optional local VS Code extension decorates Project Forge work-item folders in the Explorer from repository evidence and provides read-only helpers for Project Forge human-review surfaces.
 
+## Installation and activation
+
+Project Forge installs this extension into the VS Code extension-host directory selected by `tools/project-forge-vscode/work-item-status/install.py`.
+
+For Remote - WSL, the installer preserves explicit `--extensions-dir` and `VSCODE_EXTENSIONS` overrides, prefers the active VS Code Server root exposed by `VSCODE_AGENT_FOLDER`, and otherwise distinguishes stable from Insiders server roots without silently choosing between ambiguous existing hosts.
+
+Installer status describes file placement only. `FILES PRESENT` does not prove that the active VS Code host has discovered or activated the extension. After an install/update reports `reloadRequired: true`, reload the actual VS Code window and verify a Project Forge command from that window when activation evidence is required.
+
 ## Work-item status
 
 - `●` — in progress, supported by the current work-item branch or an open pull request.

package/assets/generated/core/tools/vscode_work_item_status/install.py

@@ -29,11 +29,51 @@ def extension_identity() -> tuple[str, str]:
     return f"{publisher}.{name}", version
 
 
-def default_extensions_root() -> Path:
+def is_wsl() -> bool:
+    if os.environ.get("WSL_DISTRO_NAME") or os.environ.get("WSL_INTEROP"):
+        return True
+    try:
+        release = Path("/proc/sys/kernel/osrelease").read_text(encoding="utf-8")
+    except OSError:
+        return False
+    return "microsoft" in release.lower()
+
+
+def resolve_extensions_root(explicit: Path | None = None) -> tuple[Path, str]:
+    if explicit is not None:
+        return explicit.expanduser(), "command-line"
+
     override = os.environ.get("VSCODE_EXTENSIONS")
     if override:
-        return Path(override).expanduser()
-    return Path.home() / ".vscode" / "extensions"
+        return Path(override).expanduser(), "VSCODE_EXTENSIONS"
+
+    if not is_wsl():
+        return Path.home() / ".vscode" / "extensions", "native-default"
+
+    agent_folder = os.environ.get("VSCODE_AGENT_FOLDER")
+    if agent_folder:
+        return Path(agent_folder).expanduser() / "extensions", "VSCODE_AGENT_FOLDER"
+
+    home = Path.home()
+    candidates = [
+        (home / ".vscode-server" / "extensions", "wsl-stable"),
+        (home / ".vscode-server-insiders" / "extensions", "wsl-insiders"),
+    ]
+    existing = [(path, source) for path, source in candidates if path.parent.is_dir()]
+    if len(existing) == 1:
+        return existing[0]
+    if len(existing) > 1:
+        roots = ", ".join(str(path) for path, _ in existing)
+        raise RuntimeError(
+            "Multiple VS Code Server roots are present in WSL "
+            f"({roots}). Set --extensions-dir or VSCODE_EXTENSIONS to select the active host explicitly."
+        )
+
+    return candidates[0][0], "wsl-stable-default"
+
+
+def default_extensions_root() -> Path:
+    return resolve_extensions_root()[0]
 
 
 def extension_target(root: Path) -> Path:
@@ -44,15 +84,18 @@ def extension_target(root: Path) -> Path:
 def status(root: Path) -> dict[str, Any]:
     extension_id, version = extension_identity()
     target = extension_target(root)
-    ready = target.is_dir() and all(
+    files_present = target.is_dir() and all(
         (target / name).is_file() for name in ("package.json", "extension.js", "README.md")
     )
     return {
         "extensionId": extension_id,
         "version": version,
-        "status": "ready" if ready else "not-installed",
+        "status": "files-present" if files_present else "not-installed",
         "path": str(target),
         "reloadRequired": False,
+        "activationStatus": "unverified" if files_present else "not-applicable",
+        "activationVerified": False,
+        "verificationRequired": files_present,
     }
 
 
@@ -65,7 +108,7 @@ def install(root: Path) -> dict[str, Any]:
         raise RuntimeError(f"Missing Project Forge VS Code extension source: {SOURCE}")
 
     existing = status(root)
-    if existing["status"] == "ready":
+    if existing["status"] == "files-present":
         return existing
 
     with tempfile.TemporaryDirectory(prefix="project-forge-vscode-", dir=str(root)) as tmp:
@@ -101,6 +144,9 @@ def uninstall(root: Path) -> dict[str, Any]:
         "status": "not-installed",
         "removed": removed,
         "reloadRequired": bool(removed),
+        "activationStatus": "not-applicable",
+        "activationVerified": False,
+        "verificationRequired": False,
     }
 
 
@@ -112,8 +158,12 @@ def emit(result: dict[str, Any], as_json: bool) -> None:
     print(f"Extension: {result['extensionId']}@{result['version']}")
     if result.get("path"):
         print(f"Path: {result['path']}")
+    if result.get("extensionsRootSource"):
+        print(f"Extensions root: {result['extensionsRootSource']}")
     if result.get("removed"):
         print(f"Removed: {len(result['removed'])}")
+    if result.get("verificationRequired"):
+        print("Extension files are present; VS Code host discovery/activation is not verified by this installer.")
     if result.get("reloadRequired"):
         print("Reload VS Code to activate the changed extension installation.")
 
@@ -127,14 +177,16 @@ def main() -> int:
     parser.add_argument("--json", action="store_true")
     args = parser.parse_args()
 
-    root = (args.extensions_dir or default_extensions_root()).expanduser().resolve()
     try:
+        root, root_source = resolve_extensions_root(args.extensions_dir)
+        root = root.resolve()
         if args.action == "install":
             result = install(root)
         elif args.action == "uninstall":
             result = uninstall(root)
         else:
             result = status(root)
+        result["extensionsRootSource"] = root_source
     except (OSError, RuntimeError, ValueError, json.JSONDecodeError) as exc:
         if args.json:
             print(json.dumps({"status": "error", "error": str(exc)}, sort_keys=True))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mriekki/project-forge",
-  "version": "4.15.0",
+  "version": "4.15.1",
   "description": "Public consumer distribution and updater for Project Forge engineering assets.",
   "type": "module",
   "bin": {