@principles/pd-cli 1.108.0 → 1.109.0

package/src/index.ts

@@ -24,7 +24,7 @@ import { handleContextBuild } from './commands/context.js';
 import { handleLegacyImportOpenClaw } from './commands/legacy-import.js';
 import { handleLegacyCleanup } from './commands/legacy-cleanup.js';
 import { handleDiagnoseStatus, handleDiagnoseRun } from './commands/diagnose.js';
-import { handleRuntimeProbe } from './commands/runtime.js';
+import { registerRuntimeProbeCommand } from './commands/runtime.js';
 import { handleFlowShow } from './commands/flow.js';
 import { handleTraceShow } from './commands/trace.js';
 import { handlePruningReport, handlePruningExplain, handlePruningReview, handlePruningRollback, handlePruningOrphans } from './commands/runtime-pruning.js';
@@ -430,24 +430,7 @@ demoCmd
     });
   });
 
-runtimeCmd
-  .command('probe')
-  .description('Probe runtime health and capabilities (HG-01 HARD GATE)')
-  .requiredOption('-r, --runtime <kind>', "Runtime kind: 'openclaw-cli' or 'pi-ai'")
-  .option('--openclaw-local', 'Use local OpenClaw (mutually exclusive with --openclaw-gateway)')
-  .option('--openclaw-gateway', 'Use gateway OpenClaw (mutually exclusive with --openclaw-local)')
-  .option('-a, --agent <agentId>', 'Agent ID to probe')
-  .option('--provider <name>', 'LLM provider (e.g., openrouter) 鈥?for pi-ai, falls back to --workspace workflows.yaml')
-  .option('--model <id>', 'Model ID (e.g., anthropic/claude-sonnet-4) 鈥?for pi-ai, falls back to --workspace workflows.yaml')
-  .option('--apiKeyEnv <name>', 'Env var name for API key (e.g., OPENROUTER_API_KEY) 鈥?for pi-ai, falls back to --workspace workflows.yaml')
-  .option('--baseUrl <url>', 'Custom base URL for OpenAI-compatible providers 鈥?for pi-ai, falls back to --workspace workflows.yaml')
-  .option('--maxRetries <n>', 'Max retry attempts for LLM failures', parseInt)
-  .option('--timeoutMs <ms>', 'Timeout in milliseconds for probe', parseInt)
-  .option('-w, --workspace <path>', 'Workspace directory 鈥?loads pi-ai policy from .state/workflows.yaml')
-  .option('--json', 'Output raw JSON')
-  .action(async (opts) => {
-    await handleRuntimeProbe(opts);
-  });
+registerRuntimeProbeCommand(runtimeCmd);
 
 const flowCmd = runtimeCmd
   .command('flow')

package/src/services/config-doctor.ts

@@ -110,6 +110,8 @@ export interface DoctorOutput {
   nextActions: string[];
   /** Legacy files detected (informational only, not used for resolution) */
   legacyFilesDetected: string[];
+  /** PRI-404: Next actions for removing legacy files */
+  legacyFileNextActions: string[];
 }
 
 // ─── Helpers ────────────────────────────────────────────────────────────────
@@ -450,6 +452,9 @@ export async function buildDoctorOutput(input: BuildDoctorInput): Promise<Doctor
   warnings.push(...loadResult.warnings);
   warnings.push(...flags.warnings);
 
+  // PRI-404: Add legacy file nextActions (separate field, not mixed into general nextActions)
+  const { legacyFileNextActions } = loadResult;
+
   if (!loadResult.ok) {
     for (const err of loadResult.errors) {
       warnings.push(`Config error at ${err.path}: ${err.reason}`);
@@ -567,6 +572,7 @@ export async function buildDoctorOutput(input: BuildDoctorInput): Promise<Doctor
     warnings,
     nextActions: nextActions.length > 0 ? nextActions : ['All checks passed — configuration is valid'],
     legacyFilesDetected: loadResult.legacyFilesDetected,
+    legacyFileNextActions,
   };
 
   if (reason) out.reason = reason;

package/src/services/mainline-snapshot-assembler.ts

@@ -20,6 +20,7 @@ import {
   assertMainlineContract,
   EMPTY_CONTEXT_SENTINEL,
   hydratePITaskRecord,
+  resolveAgentRuntimeBinding,
   type MainlineSnapshot,
   type RuntimeReadinessSnapshot,
   type DiagnosisTaskSnapshot,
@@ -140,13 +141,32 @@ function buildDefaultReadiness(workspaceDir: string, warnings: string[]): Runtim
     warnings.push(...configLoadResult.warnings);
   }
 
+  // PRI-402: resolve real runtimeProbeProfile from .pd/config.yaml
+  // so smoke's config_source_alignment + diagnostician_readiness can judge correctly
+  let runtimeProbeProfile: string | null = null;
+  let diagnosticianReady = false;
+  let diagnosticianReadinessReason = 'No readiness snapshot provided; run "pd runtime probe" first.';
+
+  if (configLoadResult.ok) {
+    const bindingResult = resolveAgentRuntimeBinding(configLoadResult.effective, 'diagnostician');
+    if (bindingResult.ok) {
+      runtimeProbeProfile = bindingResult.profileId;
+      // Profile exists and is bound — readiness is at least "configured"
+      // Actual connectivity is unknown without probe, but config alignment is satisfied
+      diagnosticianReady = true;
+      diagnosticianReadinessReason = `Profile '${bindingResult.profileId}' resolved from .pd/config.yaml (connectivity not probed)`;
+    } else {
+      diagnosticianReadinessReason = bindingResult.reason;
+    }
+  }
+
   return {
     configDoctorProfile: defaultProfile,
-    runtimeProbeProfile: null,
+    runtimeProbeProfile,
     configSource: '.pd/config.yaml',
     probeConfigSource: '.pd/config.yaml',
-    diagnosticianReady: false,
-    diagnosticianReadinessReason: 'No readiness snapshot provided; run "pd runtime probe" first.',
+    diagnosticianReady,
+    diagnosticianReadinessReason,
   };
 }
 

package/src/services/pd-config-loader.ts

@@ -46,6 +46,8 @@ export interface PdConfigLoadResultOk {
   warnings: string[];
   /** If legacy files were detected */
   legacyFilesDetected: string[];
+  /** PRI-404: Next actions for removing legacy files (empty if none detected) */
+  legacyFileNextActions: string[];
 }
 
 export interface PdConfigLoadResultErr {
@@ -58,6 +60,8 @@ export interface PdConfigLoadResultErr {
   /** Warnings from config resolution */
   warnings: string[];
   legacyFilesDetected: string[];
+  /** PRI-404: Next actions for removing legacy files (empty if none detected) */
+  legacyFileNextActions: string[];
 }
 
 export type PdConfigLoadResult = PdConfigLoadResultOk | PdConfigLoadResultErr;
@@ -84,6 +88,13 @@ function detectLegacyFiles(workspaceDir: string): string[] {
   return detected;
 }
 
+/** PRI-404: Generate nextAction suggestions for removing legacy files. */
+function buildLegacyFileNextActions(legacyFiles: string[]): string[] {
+  return legacyFiles.map(f => {
+    return `Run 'Remove-Item ${f} -Force' to remove legacy config`;
+  });
+}
+
 // ── Load PD Config ───────────────────────────────────────────────────────────
 
 /**
@@ -98,6 +109,7 @@ function detectLegacyFiles(workspaceDir: string): string[] {
 export function loadPdConfig(workspaceDir: string): PdConfigLoadResult {
   const configPath = getPdConfigPath(workspaceDir);
   const legacyFilesDetected = detectLegacyFiles(workspaceDir);
+  const legacyFileNextActions = buildLegacyFileNextActions(legacyFilesDetected);
 
   // 1) Config file missing → use defaults
   if (!fs.existsSync(configPath)) {
@@ -114,6 +126,7 @@ export function loadPdConfig(workspaceDir: string): PdConfigLoadResult {
           : []),
       ],
       legacyFilesDetected,
+      legacyFileNextActions,
     };
   }
 
@@ -132,6 +145,7 @@ export function loadPdConfig(workspaceDir: string): PdConfigLoadResult {
       warnings: [],
       defaults: effective,
       legacyFilesDetected,
+      legacyFileNextActions,
     };
   }
 
@@ -150,6 +164,7 @@ export function loadPdConfig(workspaceDir: string): PdConfigLoadResult {
       warnings: [],
       defaults: effective,
       legacyFilesDetected,
+      legacyFileNextActions,
     };
   }
 
@@ -170,6 +185,7 @@ export function loadPdConfig(workspaceDir: string): PdConfigLoadResult {
       warnings: [],
       defaults: effective,
       legacyFilesDetected,
+      legacyFileNextActions,
     };
   }
 
@@ -188,6 +204,7 @@ export function loadPdConfig(workspaceDir: string): PdConfigLoadResult {
         : []),
     ],
     legacyFilesDetected,
+    legacyFileNextActions,
   };
 }
 

package/src/services/resolve-runtime-from-pd-config.ts

@@ -16,6 +16,7 @@
 import {
   resolveRuntimeConfigFromPdConfig,
   isRuntimeConfigError,
+  resolveAgentRuntimeBinding,
 } from '@principles/core/runtime-v2';
 import type {
   RuntimeConfigResult,
@@ -34,6 +35,33 @@ export interface ResolvedRuntimeFromPdConfig {
   configLoadResult: PdConfigLoadResult;
   /** Canonical config source label, e.g. ".pd/config.yaml". */
   configSource: string;
+  /**
+   * PRI-402: Resolved runtime profile ID for the diagnostician agent.
+   * e.g. "pi-ai.lmstudio". null when config resolution fails or profile is not found.
+   */
+  runtimeProfileId: string | null;
+  /**
+   * PRI-402: Human-readable runtime profile label for the diagnostician agent.
+   * e.g. "pi-ai: lmstudio/qwen3.6-27b-mtp". null when config resolution fails.
+   * Matches the label format used by `pd config doctor`.
+   */
+  runtimeProfileLabel: string | null;
+}
+
+/**
+ * Build a profile label matching the format used by `pd config doctor`.
+ * Mirrors `buildProfileLabel` in `pd-config-redaction.ts` (core).
+ */
+function buildProfileLabel(profileId: string, profile: { type: string; provider?: string; model?: string; source?: string }): string {
+  if (profile.type === 'openclaw') {
+    const parts: string[] = ['openclaw'];
+    if (profile.provider) parts.push(profile.provider);
+    if (profile.model) parts.push(profile.model);
+    if (profile.source && !profile.provider && !profile.model) parts.push(profile.source);
+    return parts.join(': ');
+  }
+  // pi-ai
+  return `pi-ai: ${profile.provider ?? 'unknown'}/${profile.model ?? 'unknown'}`;
 }
 
 /**
@@ -77,11 +105,22 @@ export function resolveRuntimeFromPdConfig(
       legacyWarnings,
       configLoadResult,
       configSource: '.pd/config.yaml',
+      runtimeProfileId: null,
+      runtimeProfileLabel: null,
     };
   }
 
   const result = resolveRuntimeConfigFromPdConfig(configLoadResult.effective, getEnvVar);
 
+  // PRI-402: Extract profile ID and label for probe output alignment with doctor
+  let runtimeProfileId: string | null = null;
+  let runtimeProfileLabel: string | null = null;
+  const bindingResult = resolveAgentRuntimeBinding(configLoadResult.effective, 'diagnostician');
+  if (bindingResult.ok) {
+    runtimeProfileId = bindingResult.profileId;
+    runtimeProfileLabel = buildProfileLabel(bindingResult.profileId, bindingResult.profile);
+  }
+
   const legacyWarnings = configLoadResult.legacyFilesDetected.length > 0
     ? [
         `Legacy config files detected: ${configLoadResult.legacyFilesDetected.join(', ')}. ` +
@@ -94,6 +133,8 @@ export function resolveRuntimeFromPdConfig(
     legacyWarnings,
     configLoadResult,
     configSource: '.pd/config.yaml',
+    runtimeProfileId,
+    runtimeProfileLabel,
   };
 }
 

package/tests/commands/config-doctor.test.ts

@@ -239,6 +239,21 @@ describe('Legacy file detection', () => {
       expect(output.legacyFilesDetected[0]).toContain('feature-flags.yaml');
     } finally { rmTmpDir(tmp); }
   });
+
+  it('PRI-404: legacyFileNextActions contains Remove-Item commands and does not pollute nextActions', async () => {
+    const tmp = mkTmpDir();
+    const stateDir = path.join(tmp, '.state');
+    fs.mkdirSync(stateDir, { recursive: true });
+    fs.writeFileSync(path.join(stateDir, 'workflows.yaml'), 'version: 1\n', 'utf8');
+    try {
+      const output = await buildDoctorOutput({ workspaceDir: tmp });
+      expect(output.legacyFileNextActions.length).toBeGreaterThan(0);
+      expect(output.legacyFileNextActions[0]).toContain('Remove-Item');
+      expect(output.legacyFileNextActions[0]).toContain('workflows.yaml');
+      // Regression: legacyFileNextActions must NOT appear in general nextActions
+      expect(output.nextActions.some(na => na.includes('Remove-Item') && na.includes('workflows.yaml'))).toBe(false);
+    } finally { rmTmpDir(tmp); }
+  });
 });
 
 // ── Feature flags from config.yaml ───────────────────────────────────────────

package/tests/services/pd-config-loader.test.ts

@@ -445,6 +445,27 @@ describe('Legacy file detection', () => {
       expect(result.warnings.some(w => w.includes('Legacy config files detected'))).toBe(true);
     } finally { rmTmpDir(tmp); }
   });
+
+  it('PRI-404: includes legacyFileNextActions with Remove-Item command when legacy files detected', () => {
+    const tmp = mkTmpDir();
+    const stateDir = path.join(tmp, '.state');
+    fs.mkdirSync(stateDir, { recursive: true });
+    fs.writeFileSync(path.join(stateDir, 'workflows.yaml'), 'version: 1\n', 'utf8');
+    try {
+      const result = loadPdConfig(tmp);
+      expect(result.legacyFileNextActions.length).toBeGreaterThan(0);
+      expect(result.legacyFileNextActions[0]).toContain('Remove-Item');
+      expect(result.legacyFileNextActions[0]).toContain('workflows.yaml');
+    } finally { rmTmpDir(tmp); }
+  });
+
+  it('PRI-404: legacyFileNextActions is empty when no legacy files', () => {
+    const tmp = mkTmpDir();
+    try {
+      const result = loadPdConfig(tmp);
+      expect(result.legacyFileNextActions).toEqual([]);
+    } finally { rmTmpDir(tmp); }
+  });
 });
 
 // ── JSON purity ──────────────────────────────────────────────────────────────