@principles/pd-cli 1.74.0 → 1.76.0

package/dist/services/pd-config-loader.js

@@ -0,0 +1,156 @@
+/**
+ * PD Config Loader — PRI-305
+ *
+ * I/O boundary: reads `.pd/config.yaml`, validates via core, computes effective config.
+ * This replaces the old `feature-flag-loader.ts` and `workflows.yaml` reading
+ * for CLI production paths.
+ *
+ * ADR-0016: PD owns exactly one user config file.
+ * - Missing config → defaults with nextAction
+ * - Malformed config → fail loud with errors and nextAction
+ * - No secrets in output
+ */
+import * as fs from 'fs';
+import * as path from 'path';
+import yaml from 'js-yaml';
+import { validatePdConfig, computeEffectivePdConfig, computeFeatureFlagsFromConfig, redactPdConfig, } from '@principles/core/runtime-v2';
+// ── Constants ────────────────────────────────────────────────────────────────
+export const PD_CONFIG_DIR = '.pd';
+export const PD_CONFIG_FILENAME = 'config.yaml';
+// ── Config Path ──────────────────────────────────────────────────────────────
+export function getPdConfigPath(workspaceDir) {
+    return path.join(workspaceDir, PD_CONFIG_DIR, PD_CONFIG_FILENAME);
+}
+// ── Legacy File Detection ────────────────────────────────────────────────────
+function detectLegacyFiles(workspaceDir) {
+    const detected = [];
+    const legacyPaths = [
+        path.join(workspaceDir, PD_CONFIG_DIR, 'feature-flags.yaml'),
+        path.join(workspaceDir, '.state', 'workflows.yaml'),
+    ];
+    for (const p of legacyPaths) {
+        if (fs.existsSync(p)) {
+            detected.push(p);
+        }
+    }
+    return detected;
+}
+// ── Load PD Config ───────────────────────────────────────────────────────────
+/**
+ * Load and validate `.pd/config.yaml` from the workspace.
+ *
+ * - Missing file → returns defaults with source='defaults'
+ * - Malformed file → returns error result with defaults fallback
+ * - Valid file → returns effective config with source='user_config'
+ *
+ * Never throws on malformed input. Always provides a usable fallback.
+ */
+export function loadPdConfig(workspaceDir) {
+    const configPath = getPdConfigPath(workspaceDir);
+    const legacyFilesDetected = detectLegacyFiles(workspaceDir);
+    // 1) Config file missing → use defaults
+    if (!fs.existsSync(configPath)) {
+        const effective = computeEffectivePdConfig(null);
+        return {
+            ok: true,
+            effective,
+            source: 'defaults',
+            configPath,
+            warnings: [
+                ...effective.warnings,
+                ...(legacyFilesDetected.length > 0
+                    ? [`Legacy config files detected (${legacyFilesDetected.length}): ${legacyFilesDetected.join(', ')}. PD now uses .pd/config.yaml.`]
+                    : []),
+            ],
+            legacyFilesDetected,
+        };
+    }
+    // 2) Read the file
+    let raw;
+    try {
+        raw = fs.readFileSync(configPath, 'utf8');
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        const effective = computeEffectivePdConfig(null);
+        return {
+            ok: false,
+            source: 'malformed',
+            configPath,
+            errors: [{ path: '', reason: `Failed to read .pd/config.yaml: ${message}`, nextAction: 'Check file permissions for .pd/config.yaml' }],
+            warnings: [],
+            defaults: effective,
+            legacyFilesDetected,
+        };
+    }
+    // 3) Parse YAML — treat as unknown (ERR-001)
+    let parsed;
+    try {
+        parsed = yaml.load(raw, { schema: yaml.JSON_SCHEMA });
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        const effective = computeEffectivePdConfig(null);
+        return {
+            ok: false,
+            source: 'malformed',
+            configPath,
+            errors: [{ path: '', reason: `YAML parse error in .pd/config.yaml: ${message}`, nextAction: 'Fix YAML syntax in .pd/config.yaml' }],
+            warnings: [],
+            defaults: effective,
+            legacyFilesDetected,
+        };
+    }
+    // 4) Validate via core (ERR-001, ERR-005: no `as` bypasses)
+    const validationResult = validatePdConfig(parsed);
+    if (!validationResult.ok) {
+        const effective = computeEffectivePdConfig(null);
+        return {
+            ok: false,
+            source: 'malformed',
+            configPath,
+            errors: validationResult.errors.map(e => ({
+                path: e.path,
+                reason: e.reason,
+                nextAction: e.nextAction,
+            })),
+            warnings: [],
+            defaults: effective,
+            legacyFilesDetected,
+        };
+    }
+    // 5) Compute effective config
+    const effective = computeEffectivePdConfig(validationResult.value);
+    return {
+        ok: true,
+        effective,
+        source: 'user_config',
+        configPath,
+        warnings: [
+            ...effective.warnings,
+            ...(legacyFilesDetected.length > 0
+                ? [`Legacy config files detected (${legacyFilesDetected.length}): ${legacyFilesDetected.join(', ')}. PD now uses .pd/config.yaml.`]
+                : []),
+        ],
+        legacyFilesDetected,
+    };
+}
+// ── Feature Flags from Config ────────────────────────────────────────────────
+/**
+ * Compute feature flags from the loaded PD config.
+ * Works with both ok and error results (uses defaults for errors).
+ */
+export function computeFlagsFromLoadResult(result) {
+    const effective = result.ok ? result.effective : result.defaults;
+    return computeFeatureFlagsFromConfig(effective);
+}
+// ── Redacted Summary from Config ─────────────────────────────────────────────
+/**
+ * Produce a redacted summary of the PD config for CLI/Console display.
+ * Never includes token/API key values or raw provider objects.
+ */
+export function redactLoadResult(result) {
+    const effective = result.ok ? result.effective : result.defaults;
+    return redactPdConfig(effective);
+}
+//# sourceMappingURL=pd-config-loader.js.map

package/dist/services/pd-config-loader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pd-config-loader.js","sourceRoot":"","sources":["../../src/services/pd-config-loader.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@principles/pd-cli",
-  "version": "1.74.0",
+  "version": "1.76.0",
   "description": "PD CLI — Pain recording, sample management, and evolution tasks",
   "type": "module",
   "bin": {

package/src/commands/config-doctor.ts

@@ -1,12 +1,9 @@
 /**
  * pd config doctor — Discover and explain PD / OpenClaw configuration state.
  *
- * PRI-299 MVP UX:
- *   - Reports workspace + OpenClaw config paths and existence
- *   - Lists effective feature flags and enabled MVP channels
- *   - Classifies provider/model/auth connectivity (healthy, auth_missing, rate_limit, etc.)
- *   - Emits `reason` + `nextActions` for failures
- *   - NEVER leaks tokens, env var values, or raw config bytes
+ * PRI-305: Cutover to .pd/config.yaml.
+ *   - Feature flags and internal agent runtime bindings come from .pd/config.yaml
+ *   - .pd/feature-flags.yaml and .state/workflows.yaml are no longer production inputs
  *
  * Usage:
  *   pd config doctor [--workspace <path>] [--json]
@@ -33,7 +30,8 @@ function formatTextOutput(output: DoctorOutput): string {
   lines.push('PD config paths:');
   for (const [k, v] of Object.entries(output.pdConfigPaths)) {
     const exists = v.exists ? '[exists]' : '[missing]';
-    lines.push(`  ${k.padEnd(16)} ${exists.padEnd(10)} ${v.path}`);
+    const parseable = v.parseable === false ? ' [unparseable]' : '';
+    lines.push(`  ${k.padEnd(16)} ${exists.padEnd(10)}${parseable} ${v.path}`);
   }
   lines.push('');
 
@@ -54,17 +52,34 @@ function formatTextOutput(output: DoctorOutput): string {
   }
   lines.push('');
 
+  lines.push('Internal agents:');
+  if (output.internalAgents.length === 0) {
+    lines.push('  (no internal agents diagnosed)');
+  } else {
+    for (const agent of output.internalAgents) {
+      const readiness = agent.readiness.toUpperCase();
+      const enabledLabel = agent.enabled ? 'enabled' : 'disabled';
+      lines.push(`  ${agent.name}: [${readiness}] (${enabledLabel})`);
+      lines.push(`    profile:      ${agent.runtimeProfileLabel} (${agent.runtimeProfileId})`);
+      if (agent.apiKeyEnv) {
+        const apiKeyState = agent.apiKeyPresent ? 'present' : 'absent';
+        lines.push(`    apiKeyEnv:    ${agent.apiKeyEnv} (${apiKeyState})`);
+      }
+      lines.push(`    reason:       ${agent.reason}`);
+      lines.push(`    nextAction:   ${agent.nextAction}`);
+    }
+  }
+  lines.push('');
+
   lines.push('Provider health:');
   if (output.providerHealth.length === 0) {
     lines.push('  (no providers discovered)');
   } else {
     for (const p of output.providerHealth) {
       const cls = p.classification.toUpperCase();
-      const provider = p.provider ?? '(unset)';
-      const model = p.model ?? '(unset)';
       const apiKeyEnv = p.apiKeyEnv ?? '(unset)';
       const apiKeyState = p.apiKeyPresent ? 'present' : 'absent';
-      lines.push(`  [${cls}] ${provider} / ${model}`);
+      lines.push(`  [${cls}]`);
       lines.push(`    apiKeyEnv:   ${apiKeyEnv} (${apiKeyState})`);
       lines.push(`    source:      ${p.source}`);
       lines.push(`    reason:      ${p.reason}`);
@@ -73,28 +88,13 @@ function formatTextOutput(output: DoctorOutput): string {
   }
   lines.push('');
 
-  lines.push('Internal agents:');
-  if (output.internalAgents && output.internalAgents.correctionObserver) {
-    const co = output.internalAgents.correctionObserver;
-    const coStatus = co.status.toUpperCase();
-    const coProvider = co.provider ?? '(unset)';
-    const coModel = co.model ?? '(unset)';
-    const coApiKeyEnv = co.apiKeyEnv ?? '(unset)';
-    const coApiKeyState = co.apiKeyPresent ? 'present' : 'absent';
-    lines.push(`  correctionObserver: [${coStatus}]`);
-    lines.push(`    enabled:     ${co.enabled}`);
-    lines.push(`    flagSource:  ${co.flagSource}`);
-    lines.push(`    configSource:${co.configSource}`);
-    if (co.provider || co.model) {
-      lines.push(`    provider:    ${coProvider} / ${coModel}`);
+  if (output.legacyFilesDetected.length > 0) {
+    lines.push('Legacy files detected (not used for resolution):');
+    for (const f of output.legacyFilesDetected) {
+      lines.push(`  [!] ${f}`);
     }
-    lines.push(`    apiKeyEnv:   ${coApiKeyEnv} (${coApiKeyState})`);
-    lines.push(`    reason:      ${co.reason}`);
-    lines.push(`    nextAction:  ${co.nextAction}`);
-  } else {
-    lines.push('  (no internal agents diagnosed)');
+    lines.push('');
   }
-  lines.push('');
 
   if (output.warnings.length > 0) {
     lines.push('Warnings:');