@h-rig/doctor-plugin 0.0.6-alpha.157 → 0.0.6-alpha.159

package/dist/src/index.js

@@ -23,12 +23,13 @@ __export(exports_service, {
 });
 import { existsSync, readFileSync } from "fs";
 import { resolve } from "path";
-import { isSupportedBunVersion, MIN_SUPPORTED_BUN_VERSION } from "@rig/runtime/control-plane/setup-version";
-import { checkGitHubRepoPermissions, resolveGitHubAuthStatus } from "@rig/github-provider-plugin";
+import { defineCapability } from "@rig/core/capability";
+import { loadCapabilityForRoot } from "@rig/core/capability-loaders";
+import { isSupportedBunVersion, MIN_SUPPORTED_BUN_VERSION } from "@rig/core/setup-version";
+import { checkGitHubRepoPermissions, resolveGitHubAuthStatus } from "@rig/github-lib";
 import { loadConfig } from "@rig/core/load-config";
-import { resolveRigIdentity, resolveRigIdentityFilter } from "@rig/runtime/control-plane/identity";
-import { readSelection, listPlacements } from "@rig/runtime/control-plane/placement";
-import { listRuns } from "@rig/run-worker/runs";
+import { readSelection, listPlacements } from "@rig/core/placement";
+import { RUN_IDENTITY_ENV, RUN_READ_MODEL } from "@rig/contracts";
 function check(id, label, status, detail, remediation) {
   return { id, label, status, level: status === "pass" ? "ok" : status, ...detail ? { detail } : {}, ...remediation ? { remediation } : {} };
 }
@@ -110,7 +111,7 @@ function prMergeCheck(config) {
 }
 async function defaultPiChecks() {
   const pi = Bun.which("pi");
-  return [{ ok: Boolean(pi), label: "pi", detail: pi ?? undefined, hint: pi ? undefined : "Install Pi/OMP and the Rig extension." }];
+  return [{ ok: Boolean(pi), label: "pi", ...pi ? { detail: pi } : { hint: "Install Pi/OMP and the Rig extension." } }];
 }
 async function defaultRequestJson(projectRoot, pathname, _init) {
   if (pathname === "/api/github/auth/status")
@@ -164,14 +165,20 @@ async function runDoctorChecks(options) {
   const piChecks = await (options.piChecks ?? defaultPiChecks)().catch((error) => [{ ok: false, label: "pi/pi-rig checks", detail: undefined, hint: errorMessage(error) }]);
   for (const pi of piChecks)
     checks.push(check(pi.label === "pi" ? "pi" : "pi-rig", pi.label, pi.ok ? "pass" : "warn", pi.detail, pi.hint ?? (pi.ok ? undefined : "Install Pi/OMP and the Rig extension.")));
-  const identity = options.identityContext ? resolveRigIdentity(options.identityContext) : null;
+  const identityService = options.identityContext ? await loadCapabilityForRoot(projectRoot, RunIdentityEnvCap) : null;
+  const identity = options.identityContext ? identityService?.resolveRigIdentity(options.identityContext) ?? null : null;
   if (options.identityContext) {
-    const filter = resolveRigIdentityFilter(options.identityContext);
+    const filter = identityService?.resolveRigIdentityFilter(options.identityContext) ?? null;
     checks.push({ label: "identity", status: identity ? "pass" : "warn", level: identity ? "ok" : "warn", detail: identity?.source ?? "GitHub identity unavailable" });
     checks.push({ label: "github-repo", status: filter?.selectedRepo ? "pass" : "warn", level: filter?.selectedRepo ? "ok" : "warn", detail: filter?.selectedRepo ?? "repo not selected" });
   }
   try {
-    const runs = await (options.listRuns ?? listRuns)(projectRoot);
+    const runs = options.listRuns ? await options.listRuns(projectRoot) : await (async () => {
+      const service = await loadCapabilityForRoot(projectRoot, RunReadModelCap);
+      if (!service)
+        throw new Error("RUN_READ_MODEL capability is not registered for this project");
+      return service.listRuns({ projectRoot });
+    })();
     checks.push({ label: "run-discovery", status: "pass", level: "ok", detail: `${runs.length} run session(s)` });
   } catch (error) {
     checks.push({ label: "run-discovery", status: "fail", level: "fail", detail: errorMessage(error) });
@@ -184,26 +191,28 @@ async function runDoctorChecks(options) {
   }
   return checks;
 }
-var doctorRunner;
+var RunIdentityEnvCap, RunReadModelCap, doctorRunner;
 var init_service = __esm(() => {
+  RunIdentityEnvCap = defineCapability(RUN_IDENTITY_ENV);
+  RunReadModelCap = defineCapability(RUN_READ_MODEL);
   doctorRunner = { runDoctorChecks };
 });
 
 // packages/doctor-plugin/src/plugin.ts
 import { definePlugin } from "@rig/core/config";
-import { DOCTOR_RUNNER_CAPABILITY_ID } from "@rig/contracts";
+import { defineCapability as defineCapability2 } from "@rig/core/capability";
+import { DOCTOR } from "@rig/contracts";
 var DOCTOR_PLUGIN_NAME = "@rig/doctor-plugin";
+var DoctorCap = defineCapability2(DOCTOR);
 var doctorPlugin = definePlugin({
   name: DOCTOR_PLUGIN_NAME,
   version: "0.0.0-alpha.1",
   contributes: {
     capabilities: [
-      {
-        id: DOCTOR_RUNNER_CAPABILITY_ID,
+      DoctorCap.provide(async () => (await Promise.resolve().then(() => (init_service(), exports_service))).doctorRunner, {
         title: "Diagnostic doctor checks",
-        description: "Local toolchain, rig.config loadability, GitHub auth/permissions, Pi, and run/relay diagnostics with remediation copy.",
-        run: async () => (await Promise.resolve().then(() => (init_service(), exports_service))).doctorRunner
-      }
+        description: "Local toolchain, rig.config loadability, GitHub auth/permissions, Pi, and run/relay diagnostics with remediation copy."
+      })
     ]
   }
 });

package/dist/src/plugin.d.ts

@@ -1,4 +1,4 @@
 export declare const DOCTOR_PLUGIN_NAME = "@rig/doctor-plugin";
-export declare const doctorPlugin: import("@rig/core").RigPlugin;
-export declare function createDoctorPlugin(): import("@rig/core").RigPlugin;
+export declare const doctorPlugin: import("@rig/core/config").RigPlugin;
+export declare function createDoctorPlugin(): import("@rig/core/config").RigPlugin;
 export default doctorPlugin;

package/dist/src/plugin.js

@@ -23,12 +23,13 @@ __export(exports_service, {
 });
 import { existsSync, readFileSync } from "fs";
 import { resolve } from "path";
-import { isSupportedBunVersion, MIN_SUPPORTED_BUN_VERSION } from "@rig/runtime/control-plane/setup-version";
-import { checkGitHubRepoPermissions, resolveGitHubAuthStatus } from "@rig/github-provider-plugin";
+import { defineCapability } from "@rig/core/capability";
+import { loadCapabilityForRoot } from "@rig/core/capability-loaders";
+import { isSupportedBunVersion, MIN_SUPPORTED_BUN_VERSION } from "@rig/core/setup-version";
+import { checkGitHubRepoPermissions, resolveGitHubAuthStatus } from "@rig/github-lib";
 import { loadConfig } from "@rig/core/load-config";
-import { resolveRigIdentity, resolveRigIdentityFilter } from "@rig/runtime/control-plane/identity";
-import { readSelection, listPlacements } from "@rig/runtime/control-plane/placement";
-import { listRuns } from "@rig/run-worker/runs";
+import { readSelection, listPlacements } from "@rig/core/placement";
+import { RUN_IDENTITY_ENV, RUN_READ_MODEL } from "@rig/contracts";
 function check(id, label, status, detail, remediation) {
   return { id, label, status, level: status === "pass" ? "ok" : status, ...detail ? { detail } : {}, ...remediation ? { remediation } : {} };
 }
@@ -110,7 +111,7 @@ function prMergeCheck(config) {
 }
 async function defaultPiChecks() {
   const pi = Bun.which("pi");
-  return [{ ok: Boolean(pi), label: "pi", detail: pi ?? undefined, hint: pi ? undefined : "Install Pi/OMP and the Rig extension." }];
+  return [{ ok: Boolean(pi), label: "pi", ...pi ? { detail: pi } : { hint: "Install Pi/OMP and the Rig extension." } }];
 }
 async function defaultRequestJson(projectRoot, pathname, _init) {
   if (pathname === "/api/github/auth/status")
@@ -164,14 +165,20 @@ async function runDoctorChecks(options) {
   const piChecks = await (options.piChecks ?? defaultPiChecks)().catch((error) => [{ ok: false, label: "pi/pi-rig checks", detail: undefined, hint: errorMessage(error) }]);
   for (const pi of piChecks)
     checks.push(check(pi.label === "pi" ? "pi" : "pi-rig", pi.label, pi.ok ? "pass" : "warn", pi.detail, pi.hint ?? (pi.ok ? undefined : "Install Pi/OMP and the Rig extension.")));
-  const identity = options.identityContext ? resolveRigIdentity(options.identityContext) : null;
+  const identityService = options.identityContext ? await loadCapabilityForRoot(projectRoot, RunIdentityEnvCap) : null;
+  const identity = options.identityContext ? identityService?.resolveRigIdentity(options.identityContext) ?? null : null;
   if (options.identityContext) {
-    const filter = resolveRigIdentityFilter(options.identityContext);
+    const filter = identityService?.resolveRigIdentityFilter(options.identityContext) ?? null;
     checks.push({ label: "identity", status: identity ? "pass" : "warn", level: identity ? "ok" : "warn", detail: identity?.source ?? "GitHub identity unavailable" });
     checks.push({ label: "github-repo", status: filter?.selectedRepo ? "pass" : "warn", level: filter?.selectedRepo ? "ok" : "warn", detail: filter?.selectedRepo ?? "repo not selected" });
   }
   try {
-    const runs = await (options.listRuns ?? listRuns)(projectRoot);
+    const runs = options.listRuns ? await options.listRuns(projectRoot) : await (async () => {
+      const service = await loadCapabilityForRoot(projectRoot, RunReadModelCap);
+      if (!service)
+        throw new Error("RUN_READ_MODEL capability is not registered for this project");
+      return service.listRuns({ projectRoot });
+    })();
     checks.push({ label: "run-discovery", status: "pass", level: "ok", detail: `${runs.length} run session(s)` });
   } catch (error) {
     checks.push({ label: "run-discovery", status: "fail", level: "fail", detail: errorMessage(error) });
@@ -184,26 +191,28 @@ async function runDoctorChecks(options) {
   }
   return checks;
 }
-var doctorRunner;
+var RunIdentityEnvCap, RunReadModelCap, doctorRunner;
 var init_service = __esm(() => {
+  RunIdentityEnvCap = defineCapability(RUN_IDENTITY_ENV);
+  RunReadModelCap = defineCapability(RUN_READ_MODEL);
   doctorRunner = { runDoctorChecks };
 });
 
 // packages/doctor-plugin/src/plugin.ts
 import { definePlugin } from "@rig/core/config";
-import { DOCTOR_RUNNER_CAPABILITY_ID } from "@rig/contracts";
+import { defineCapability as defineCapability2 } from "@rig/core/capability";
+import { DOCTOR } from "@rig/contracts";
 var DOCTOR_PLUGIN_NAME = "@rig/doctor-plugin";
+var DoctorCap = defineCapability2(DOCTOR);
 var doctorPlugin = definePlugin({
   name: DOCTOR_PLUGIN_NAME,
   version: "0.0.0-alpha.1",
   contributes: {
     capabilities: [
-      {
-        id: DOCTOR_RUNNER_CAPABILITY_ID,
+      DoctorCap.provide(async () => (await Promise.resolve().then(() => (init_service(), exports_service))).doctorRunner, {
         title: "Diagnostic doctor checks",
-        description: "Local toolchain, rig.config loadability, GitHub auth/permissions, Pi, and run/relay diagnostics with remediation copy.",
-        run: async () => (await Promise.resolve().then(() => (init_service(), exports_service))).doctorRunner
-      }
+        description: "Local toolchain, rig.config loadability, GitHub auth/permissions, Pi, and run/relay diagnostics with remediation copy."
+      })
     ]
   }
 });

package/dist/src/service.d.ts

@@ -1,5 +1,4 @@
-import type { DoctorCheck } from "@rig/contracts";
-import type { DoctorService, RunDoctorChecksOptions } from "@rig/runtime/control-plane/doctor-service-port";
+import { type DoctorCheck, type DoctorService, type RunDoctorChecksOptions } from "@rig/contracts";
 export declare function runDoctorChecks(options: RunDoctorChecksOptions): Promise<DoctorCheck[]>;
 /** The concrete diagnostic service the runtime port resolves and consumes. */
 export declare const doctorRunner: DoctorService;

package/dist/src/service.js

@@ -2,12 +2,15 @@
 // packages/doctor-plugin/src/service.ts
 import { existsSync, readFileSync } from "fs";
 import { resolve } from "path";
-import { isSupportedBunVersion, MIN_SUPPORTED_BUN_VERSION } from "@rig/runtime/control-plane/setup-version";
-import { checkGitHubRepoPermissions, resolveGitHubAuthStatus } from "@rig/github-provider-plugin";
+import { defineCapability } from "@rig/core/capability";
+import { loadCapabilityForRoot } from "@rig/core/capability-loaders";
+import { isSupportedBunVersion, MIN_SUPPORTED_BUN_VERSION } from "@rig/core/setup-version";
+import { checkGitHubRepoPermissions, resolveGitHubAuthStatus } from "@rig/github-lib";
 import { loadConfig } from "@rig/core/load-config";
-import { resolveRigIdentity, resolveRigIdentityFilter } from "@rig/runtime/control-plane/identity";
-import { readSelection, listPlacements } from "@rig/runtime/control-plane/placement";
-import { listRuns } from "@rig/run-worker/runs";
+import { readSelection, listPlacements } from "@rig/core/placement";
+import { RUN_IDENTITY_ENV, RUN_READ_MODEL } from "@rig/contracts";
+var RunIdentityEnvCap = defineCapability(RUN_IDENTITY_ENV);
+var RunReadModelCap = defineCapability(RUN_READ_MODEL);
 function check(id, label, status, detail, remediation) {
   return { id, label, status, level: status === "pass" ? "ok" : status, ...detail ? { detail } : {}, ...remediation ? { remediation } : {} };
 }
@@ -89,7 +92,7 @@ function prMergeCheck(config) {
 }
 async function defaultPiChecks() {
   const pi = Bun.which("pi");
-  return [{ ok: Boolean(pi), label: "pi", detail: pi ?? undefined, hint: pi ? undefined : "Install Pi/OMP and the Rig extension." }];
+  return [{ ok: Boolean(pi), label: "pi", ...pi ? { detail: pi } : { hint: "Install Pi/OMP and the Rig extension." } }];
 }
 async function defaultRequestJson(projectRoot, pathname, _init) {
   if (pathname === "/api/github/auth/status")
@@ -143,14 +146,20 @@ async function runDoctorChecks(options) {
   const piChecks = await (options.piChecks ?? defaultPiChecks)().catch((error) => [{ ok: false, label: "pi/pi-rig checks", detail: undefined, hint: errorMessage(error) }]);
   for (const pi of piChecks)
     checks.push(check(pi.label === "pi" ? "pi" : "pi-rig", pi.label, pi.ok ? "pass" : "warn", pi.detail, pi.hint ?? (pi.ok ? undefined : "Install Pi/OMP and the Rig extension.")));
-  const identity = options.identityContext ? resolveRigIdentity(options.identityContext) : null;
+  const identityService = options.identityContext ? await loadCapabilityForRoot(projectRoot, RunIdentityEnvCap) : null;
+  const identity = options.identityContext ? identityService?.resolveRigIdentity(options.identityContext) ?? null : null;
   if (options.identityContext) {
-    const filter = resolveRigIdentityFilter(options.identityContext);
+    const filter = identityService?.resolveRigIdentityFilter(options.identityContext) ?? null;
     checks.push({ label: "identity", status: identity ? "pass" : "warn", level: identity ? "ok" : "warn", detail: identity?.source ?? "GitHub identity unavailable" });
     checks.push({ label: "github-repo", status: filter?.selectedRepo ? "pass" : "warn", level: filter?.selectedRepo ? "ok" : "warn", detail: filter?.selectedRepo ?? "repo not selected" });
   }
   try {
-    const runs = await (options.listRuns ?? listRuns)(projectRoot);
+    const runs = options.listRuns ? await options.listRuns(projectRoot) : await (async () => {
+      const service = await loadCapabilityForRoot(projectRoot, RunReadModelCap);
+      if (!service)
+        throw new Error("RUN_READ_MODEL capability is not registered for this project");
+      return service.listRuns({ projectRoot });
+    })();
     checks.push({ label: "run-discovery", status: "pass", level: "ok", detail: `${runs.length} run session(s)` });
   } catch (error) {
     checks.push({ label: "run-discovery", status: "fail", level: "fail", detail: errorMessage(error) });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/doctor-plugin",
-  "version": "0.0.6-alpha.157",
+  "version": "0.0.6-alpha.159",
   "type": "module",
   "description": "First-party diagnostic doctor capability plugin for Rig.",
   "license": "UNLICENSED",
@@ -29,10 +29,8 @@
   "module": "./dist/src/index.js",
   "types": "./dist/src/index.d.ts",
   "dependencies": {
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.157",
-    "@rig/run-worker": "npm:@h-rig/run-worker@0.0.6-alpha.157",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.157",
-    "@rig/github-provider-plugin": "npm:@h-rig/github-provider-plugin@0.0.6-alpha.157",
-    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.157"
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.159",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.159",
+    "@rig/github-lib": "npm:@h-rig/github-lib@0.0.6-alpha.159"
   }
 }