create-principles-disciple 1.85.0 → 1.87.0

package/pd-cli/dist/commands/runtime-recovery-failed-tasks.js

@@ -0,0 +1,164 @@
+import * as path from 'path';
+import { createRecoverySweepService } from '@principles/core/runtime-v2';
+import { resolveWorkspaceDir } from '../resolve-workspace.js';
+export async function handleRuntimeRecoveryFailedTasks(opts) {
+    if (opts.dryRun && opts.confirm) {
+        if (opts.json) {
+            console.log(JSON.stringify({
+                ok: false,
+                reason: 'Error: --dry-run and --confirm are mutually exclusive',
+                nextAction: 'Specify only one of --dry-run or --confirm',
+            }, null, 2));
+        }
+        else {
+            console.error('Error: --dry-run and --confirm are mutually exclusive');
+        }
+        process.exitCode = 1;
+        return;
+    }
+    const isConfirm = opts.confirm ?? false;
+    const isDryRun = !isConfirm;
+    let serviceHandle = null;
+    try {
+        const workspaceDir = opts.workspace ? path.resolve(opts.workspace) : resolveWorkspaceDir();
+        const handle = await createRecoverySweepService({ workspaceDir });
+        serviceHandle = handle;
+        const failedTasks = await handle.service.detectFailedTasks();
+        const taskDetails = [];
+        let recoveredCount = 0;
+        let skippedCount = 0;
+        for (const t of failedTasks) {
+            if (t.isExhausted && !opts.force) {
+                taskDetails.push({
+                    taskId: t.taskId,
+                    taskKind: t.taskKind,
+                    status: t.status,
+                    attemptCount: t.attemptCount,
+                    maxAttempts: t.maxAttempts,
+                    action: 'skipped',
+                    reason: `Task has exhausted max attempts (${t.attemptCount}/${t.maxAttempts})`,
+                    nextAction: 'Run with --force to recover this task',
+                });
+                skippedCount++;
+            }
+            else {
+                if (isConfirm) {
+                    const result = await handle.service.recoverFailedTask(t.taskId, opts.force);
+                    if (result) {
+                        recoveredCount++;
+                        taskDetails.push({
+                            taskId: t.taskId,
+                            taskKind: t.taskKind,
+                            status: t.status,
+                            attemptCount: t.attemptCount,
+                            maxAttempts: t.maxAttempts,
+                            action: 'recovered',
+                            reason: t.isExhausted
+                                ? `Task exhausted max attempts (${t.attemptCount}/${t.maxAttempts}) but --force specified — reset to pending`
+                                : `Task failed and attempts remain (${t.attemptCount}/${t.maxAttempts}) — reset to pending`,
+                            nextAction: 'Task recovered to pending. Run pd runtime internalization run-once to execute.',
+                        });
+                    }
+                    else {
+                        skippedCount++;
+                        taskDetails.push({
+                            taskId: t.taskId,
+                            taskKind: t.taskKind,
+                            status: t.status,
+                            attemptCount: t.attemptCount,
+                            maxAttempts: t.maxAttempts,
+                            action: 'skipped',
+                            reason: 'Task recovery skipped (task no longer failed or concurrently modified)',
+                            nextAction: 'Verify task status using task list',
+                        });
+                    }
+                }
+                else {
+                    recoveredCount++;
+                    taskDetails.push({
+                        taskId: t.taskId,
+                        taskKind: t.taskKind,
+                        status: t.status,
+                        attemptCount: t.attemptCount,
+                        maxAttempts: t.maxAttempts,
+                        action: 'would_recover',
+                        reason: t.isExhausted
+                            ? `Task exhausted max attempts (${t.attemptCount}/${t.maxAttempts}) but --force specified — reset to pending`
+                            : `Task failed and attempts remain (${t.attemptCount}/${t.maxAttempts}) — reset to pending`,
+                        nextAction: 'Run with --confirm to recover this task',
+                    });
+                }
+            }
+        }
+        const mode = isDryRun ? 'dry_run' : 'confirm';
+        let summaryReason = '';
+        let summaryNextAction = '';
+        if (isDryRun) {
+            if (taskDetails.length === 0) {
+                summaryReason = 'No failed internalization tasks found';
+                summaryNextAction = 'Nothing to recover';
+            }
+            else {
+                summaryReason = `Found ${recoveredCount} recoverable and ${skippedCount} exhausted failed tasks`;
+                summaryNextAction = `Run with --confirm to recover tasks, and use --force to recover exhausted tasks`;
+            }
+        }
+        else {
+            summaryReason = `Successfully recovered ${recoveredCount} failed tasks, skipped ${skippedCount} tasks`;
+            summaryNextAction = recoveredCount > 0
+                ? 'Run pd runtime internalization run-once to execute recovered tasks'
+                : 'No tasks recovered';
+        }
+        if (opts.json) {
+            console.log(JSON.stringify({
+                ok: true,
+                mode,
+                recoveredCount,
+                skippedCount,
+                tasks: taskDetails,
+                reason: summaryReason,
+                nextAction: summaryNextAction,
+            }, null, 2));
+        }
+        else {
+            console.log(`Failed Tasks Recovery (${mode.toUpperCase()})`);
+            console.log(`  reason:      ${summaryReason}`);
+            console.log(`  nextAction:  ${summaryNextAction}`);
+            console.log(`  recovered:   ${recoveredCount}`);
+            console.log(`  skipped:     ${skippedCount}`);
+            console.log('');
+            if (taskDetails.length > 0) {
+                console.log('Tasks:');
+                for (const t of taskDetails) {
+                    console.log(`  - ${t.taskId} (${t.taskKind})`);
+                    console.log(`    action:     ${t.action}`);
+                    console.log(`    reason:     ${t.reason}`);
+                    console.log(`    nextAction: ${t.nextAction}`);
+                }
+                console.log('');
+            }
+        }
+        if (recoveredCount > 0 && isDryRun) {
+            process.exitCode = 1;
+        }
+    }
+    catch (err) {
+        if (opts.json) {
+            console.log(JSON.stringify({
+                ok: false,
+                reason: err instanceof Error ? err.message : String(err),
+                nextAction: 'Check workspace path and DB connectivity',
+            }, null, 2));
+        }
+        else {
+            console.error(`Error: ${err instanceof Error ? err.message : String(err)}`);
+        }
+        process.exitCode = 1;
+    }
+    finally {
+        if (serviceHandle) {
+            await serviceHandle.close();
+        }
+    }
+}
+//# sourceMappingURL=runtime-recovery-failed-tasks.js.map

package/pd-cli/dist/commands/runtime-recovery-failed-tasks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime-recovery-failed-tasks.js","sourceRoot":"","sources":["../../src/commands/runtime-recovery-failed-tasks.ts"],"names":[],"mappings":"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"}

package/pd-cli/dist/commands/runtime-recovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-recovery.d.ts","sourceRoot":"","sources":["../../src/commands/runtime-recovery.ts"],"names":[],"mappings":"AAMA,UAAU,oBAAoB;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AA6BD,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkE1F"}
+{"version":3,"file":"runtime-recovery.d.ts","sourceRoot":"","sources":["../../src/commands/runtime-recovery.ts"],"names":[],"mappings":"AAOA,UAAU,oBAAoB;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AA6BD,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmE1F"}

package/pd-cli/dist/commands/runtime-recovery.js

@@ -2,6 +2,7 @@ import * as path from 'path';
 import { createRecoverySweepService } from '@principles/core/runtime-v2';
 import { resolveWorkspaceDir } from '../resolve-workspace.js';
 import { createRemediationResult, remediationAction } from './remediation-output.js';
+import { emitResult, emitFlagConflict } from '../services/cli-output.js';
 function formatTextOutput(output) {
     const lines = [];
     lines.push(`Recovery Sweep (${output.mode})`);
@@ -29,8 +30,10 @@ function formatTextOutput(output) {
 }
 export async function handleRuntimeRecoverySweep(opts) {
     if (opts.dryRun && opts.confirm) {
-        console.error('Error: --dry-run and --confirm are mutually exclusive');
-        process.exitCode = 1;
+        // PRI-432: Bug fix — flag conflict now emits JSON when --json is set
+        // (previously always used console.error, violating CLI Operator Gate rule #1)
+        const exitCode = emitFlagConflict({ json: opts.json ?? false });
+        process.exit(exitCode);
         return;
     }
     const workspaceDir = opts.workspace ? path.resolve(opts.workspace) : resolveWorkspaceDir();
@@ -77,12 +80,10 @@ export async function handleRuntimeRecoverySweep(opts) {
             status: failedCount > 0 && repairedCount === 0 ? 'error' : undefined,
             safeToConfirm: isDryRun && expiredLeaseTaskIds.length > 0,
         });
-        if (opts.json) {
-            console.log(JSON.stringify(output, null, 2));
-        }
-        else {
-            console.log(formatTextOutput(output));
-        }
+        emitResult(output, {
+            json: opts.json ?? false,
+            formatText: formatTextOutput,
+        });
         if (expiredLeaseTaskIds.length > 0 && isDryRun) {
             process.exitCode = 1;
         }

package/pd-cli/dist/commands/runtime-recovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-recovery.js","sourceRoot":"","sources":["../../src/commands/runtime-recovery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime-recovery.js","sourceRoot":"","sources":["../../src/commands/runtime-recovery.ts"],"names":[],"mappings":"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"}

package/pd-cli/dist/commands/runtime.d.ts

@@ -1,3 +1,4 @@
+import type { Command } from 'commander';
 interface RuntimeProbeOptions {
     runtime: string;
     openclawLocal?: boolean;
@@ -13,8 +14,13 @@ interface RuntimeProbeOptions {
     json?: boolean;
 }
 /**
- * pd runtime probe — dispatches to openclaw-cli or pi-ai branch.
+ * pd runtime probe — dispatches to openclaw-cli, pi-ai, or config branch.
  */
 export declare function handleRuntimeProbe(opts: RuntimeProbeOptions): Promise<void>;
+/**
+ * Register the `pd runtime probe` command on a Commander instance.
+ * Used by index.ts and tests to ensure real command wiring is verified (EP-04).
+ */
+export declare function registerRuntimeProbeCommand(runtimeCmd: Command): Command;
 export {};
 //# sourceMappingURL=runtime.d.ts.map

package/pd-cli/dist/commands/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/commands/runtime.ts"],"names":[],"mappings":"AAaA,UAAU,mBAAmB;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAgPD;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAWjF"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/commands/runtime.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,UAAU,mBAAmB;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAiZD;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBjF;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAmBxE"}

package/pd-cli/dist/commands/runtime.js

@@ -8,8 +8,8 @@
  * HG-01 HARD GATE: This command must deliver.
  */
 import * as path from 'path';
-import { probeRuntime } from '@principles/core/runtime-v2';
-import { PDRuntimeError } from '@principles/core/runtime-v2';
+import { probeRuntime, PDRuntimeError, isRuntimeConfigError } from '@principles/core/runtime-v2';
+import { resolveRuntimeFromPdConfig, resolveRuntimeWithOverrides } from '../services/resolve-runtime-from-pd-config.js';
 /**
  * Format capabilities as a key-value table for console output.
  */
@@ -109,6 +109,11 @@ async function handleOpenClawProbe(opts) {
 }
 /**
  * pi-ai probe branch — validates flags, calls probeRuntime, formats output.
+ *
+ * PRI-402: When --workspace is provided without explicit --provider,
+ * reads pi-ai config from .pd/config.yaml via resolveRuntimeWithOverrides.
+ * JSON output includes configSource, runtimeProfileId, runtimeProfileLabel
+ * for alignment with `pd config doctor`.
  */
 async function handlePiAiProbe(opts) {
     // D-01: flags are required for pi-ai probe unless --workspace is provided (policy fallback)
@@ -117,47 +122,125 @@ async function handlePiAiProbe(opts) {
     let model = opts.model ?? '';
     let apiKeyEnv = opts.apiKeyEnv ?? '';
     let baseUrl = opts.baseUrl ?? '';
-    let { timeoutMs } = opts;
-    // D-01: always load workspace policy; CLI values take priority as override
+    let { timeoutMs, maxRetries } = opts;
+    // PRI-402: Track config source and profile info for JSON output
+    let configSource = null;
+    let runtimeProfileId = null;
+    let runtimeProfileLabel = null;
+    // PRI-393: always load workspace policy from .pd/config.yaml (not .state/workflows.yaml)
     if (workspaceDir) {
-        try {
-            const { resolveRuntimeConfig, isRuntimeConfigError } = await import('@principles/core/runtime-v2');
-            const configResult = resolveRuntimeConfig(path.join(workspaceDir, '.state'));
-            if (isRuntimeConfigError(configResult)) {
-                console.warn(`Warning: could not load workspace runtime config — ${configResult.message}`);
+        const resolved = resolveRuntimeWithOverrides(workspaceDir, {
+            provider: opts.provider,
+            model: opts.model,
+            apiKeyEnv: opts.apiKeyEnv,
+            baseUrl: opts.baseUrl,
+            maxRetries: opts.maxRetries,
+            timeoutMs: opts.timeoutMs,
+        });
+        for (const w of resolved.legacyWarnings)
+            console.warn(`Warning: ${w}`);
+        // PRI-402: capture profile info regardless of merge result
+        ({ configSource, runtimeProfileId, runtimeProfileLabel } = resolved);
+        if (resolved.mergedConfig) {
+            provider = provider || resolved.mergedConfig.provider || '';
+            model = model || resolved.mergedConfig.model || '';
+            apiKeyEnv = apiKeyEnv || resolved.mergedConfig.apiKeyEnv || '';
+            baseUrl = baseUrl || resolved.mergedConfig.baseUrl || '';
+            timeoutMs = timeoutMs ?? resolved.mergedConfig.timeoutMs;
+            maxRetries = maxRetries ?? resolved.mergedConfig.maxRetries;
+        }
+        else if (isRuntimeConfigError(resolved.result)) {
+            // PRI-402: fail-loud JSON when config.yaml is broken (EP-03, EP-04)
+            if (opts.json) {
+                console.log(JSON.stringify({
+                    ok: false,
+                    status: 'failed',
+                    reason: resolved.result.reason,
+                    message: resolved.result.message,
+                    nextAction: resolved.result.nextAction,
+                    configSource: resolved.configSource,
+                }, null, 2));
             }
             else {
-                const config = configResult;
-                provider = provider || config.provider || '';
-                model = model || config.model || '';
-                apiKeyEnv = apiKeyEnv || config.apiKeyEnv || '';
-                baseUrl = baseUrl || config.baseUrl || '';
-                timeoutMs = timeoutMs ?? config.timeoutMs;
+                console.error(`error: could not resolve runtime from .pd/config.yaml — ${resolved.result.message}`);
+                console.error(`nextAction: ${resolved.result.nextAction}`);
             }
-        }
-        catch (err) {
-            console.warn(`Warning: could not load workspace runtime config — policy fallback disabled: ${err instanceof Error ? err.message : String(err)}`);
+            process.exit(1);
+            return;
         }
     }
     if (!provider) {
-        console.error("error: --provider is required for --runtime pi-ai (or set in --workspace workflows.yaml)");
-        console.error("  e.g.: pd runtime probe --runtime pi-ai --provider openrouter --model anthropic/claude-sonnet-4 --apiKeyEnv OPENROUTER_API_KEY");
+        // PRI-402: fail-loud JSON when provider is missing (EP-03, EP-04)
+        if (opts.json) {
+            console.log(JSON.stringify({
+                ok: false,
+                status: 'failed',
+                reason: 'provider_missing',
+                message: '--provider is required for --runtime pi-ai (or set in .pd/config.yaml)',
+                nextAction: 'Set provider in .pd/config.yaml runtimeProfiles, or pass --provider explicitly',
+                configSource,
+            }, null, 2));
+        }
+        else {
+            console.error("error: --provider is required for --runtime pi-ai (or set in .pd/config.yaml)");
+            console.error("  e.g.: pd runtime probe --runtime pi-ai --provider openrouter --model anthropic/claude-sonnet-4 --apiKeyEnv OPENROUTER_API_KEY");
+        }
         process.exit(1);
+        return;
     }
     if (!model) {
-        console.error("error: --model is required for --runtime pi-ai (or set in --workspace workflows.yaml)");
-        console.error("  e.g.: pd runtime probe --runtime pi-ai --provider openrouter --model anthropic/claude-sonnet-4 --apiKeyEnv OPENROUTER_API_KEY");
+        if (opts.json) {
+            console.log(JSON.stringify({
+                ok: false,
+                status: 'failed',
+                reason: 'model_missing',
+                message: '--model is required for --runtime pi-ai (or set in .pd/config.yaml)',
+                nextAction: 'Set model in .pd/config.yaml runtimeProfiles, or pass --model explicitly',
+                configSource,
+            }, null, 2));
+        }
+        else {
+            console.error("error: --model is required for --runtime pi-ai (or set in .pd/config.yaml)");
+            console.error("  e.g.: pd runtime probe --runtime pi-ai --provider openrouter --model anthropic/claude-sonnet-4 --apiKeyEnv OPENROUTER_API_KEY");
+        }
         process.exit(1);
+        return;
     }
     if (!apiKeyEnv) {
-        console.error("error: --apiKeyEnv is required for --runtime pi-ai (or set in --workspace workflows.yaml)");
-        console.error("  e.g.: pd runtime probe --runtime pi-ai --provider openrouter --model anthropic/claude-sonnet-4 --apiKeyEnv OPENROUTER_API_KEY");
+        if (opts.json) {
+            console.log(JSON.stringify({
+                ok: false,
+                status: 'failed',
+                reason: 'apiKeyEnv_missing',
+                message: '--apiKeyEnv is required for --runtime pi-ai (or set in .pd/config.yaml)',
+                nextAction: 'Set apiKeyEnv in .pd/config.yaml runtimeProfiles, or pass --apiKeyEnv explicitly',
+                configSource,
+            }, null, 2));
+        }
+        else {
+            console.error("error: --apiKeyEnv is required for --runtime pi-ai (or set in .pd/config.yaml)");
+            console.error("  e.g.: pd runtime probe --runtime pi-ai --provider openrouter --model anthropic/claude-sonnet-4 --apiKeyEnv OPENROUTER_API_KEY");
+        }
         process.exit(1);
+        return;
     }
     // D-09: check env var exists before calling probeRuntime
     if (!process.env[apiKeyEnv]) {
-        console.error(`error: environment variable '${apiKeyEnv}' is not set`);
+        if (opts.json) {
+            console.log(JSON.stringify({
+                ok: false,
+                status: 'failed',
+                reason: 'api_key_not_set',
+                message: `Environment variable '${apiKeyEnv}' is not set`,
+                nextAction: `Set the environment variable '${apiKeyEnv}' with a valid API key`,
+                configSource,
+            }, null, 2));
+        }
+        else {
+            console.error(`error: environment variable '${apiKeyEnv}' is not set`);
+        }
         process.exit(1);
+        return;
     }
     try {
         const result = await probeRuntime({
@@ -166,7 +249,7 @@ async function handlePiAiProbe(opts) {
             model,
             apiKeyEnv,
             baseUrl,
-            maxRetries: opts.maxRetries,
+            maxRetries: maxRetries,
             timeoutMs: timeoutMs ?? 120_000, // D-04: probe timeout 120s (matches Runtime defaults)
         });
         // Narrow to pi-ai result (TypeScript can't infer from input args alone)
@@ -181,7 +264,9 @@ async function handlePiAiProbe(opts) {
         if (!result.health.healthy)
             exitCode = 1;
         if (opts.json) {
-            console.log(JSON.stringify({
+            // PRI-402: include configSource, runtimeProfileId, runtimeProfileLabel in JSON output
+            const jsonOutput = {
+                ok: result.health.healthy,
                 status,
                 runtimeKind: result.runtimeKind,
                 provider: result.provider,
@@ -189,7 +274,14 @@ async function handlePiAiProbe(opts) {
                 baseUrlPresent: !!baseUrl,
                 health: result.health,
                 capabilities: result.capabilities,
-            }, null, 2));
+            };
+            if (configSource)
+                jsonOutput.configSource = configSource;
+            if (runtimeProfileId)
+                jsonOutput.runtimeProfileId = runtimeProfileId;
+            if (runtimeProfileLabel)
+                jsonOutput.runtimeProfileLabel = runtimeProfileLabel;
+            console.log(JSON.stringify(jsonOutput, null, 2));
             if (exitCode !== 0)
                 process.exit(exitCode);
             return;
@@ -200,6 +292,10 @@ async function handlePiAiProbe(opts) {
         console.log(`Model:    ${result.model}`);
         if (baseUrl)
             console.log(`BaseUrl:  ${baseUrl}`);
+        if (runtimeProfileLabel)
+            console.log(`Profile:  ${runtimeProfileLabel}`);
+        if (configSource)
+            console.log(`Config:   ${configSource}`);
         console.log(`Status:   ${status}`);
         console.log('');
         console.log('Health:');
@@ -228,10 +324,12 @@ async function handlePiAiProbe(opts) {
         }
         if (opts.json) {
             console.log(JSON.stringify({
+                ok: false,
                 status: 'failed',
                 errorCategory,
                 message,
                 runtimeKind: 'pi-ai',
+                configSource,
             }, null, 2));
         }
         else {
@@ -241,7 +339,74 @@ async function handlePiAiProbe(opts) {
     }
 }
 /**
- * pd runtime probe — dispatches to openclaw-cli or pi-ai branch.
+ * --runtime config probe branch — PRI-393
+ * Resolves runtime from .pd/config.yaml, then dispatches to pi-ai or openclaw-cli probe.
+ */
+async function handleConfigProbe(opts) {
+    const workspaceDir = opts.workspace ? path.resolve(opts.workspace) : undefined;
+    if (!workspaceDir) {
+        if (opts.json) {
+            console.log(JSON.stringify({
+                ok: false,
+                status: 'failed',
+                reason: 'workspace_missing',
+                message: '--workspace is required for --runtime config',
+                nextAction: 'Provide --workspace <path> pointing to a PD workspace directory',
+            }, null, 2));
+        }
+        else {
+            console.error('error: --workspace is required for --runtime config');
+        }
+        process.exit(1);
+        return;
+    }
+    const resolved = resolveRuntimeFromPdConfig(workspaceDir);
+    for (const w of resolved.legacyWarnings)
+        console.warn(`Warning: ${w}`);
+    if (isRuntimeConfigError(resolved.result)) {
+        if (opts.json) {
+            console.log(JSON.stringify({
+                ok: false,
+                status: 'failed',
+                errorCategory: 'config_error',
+                message: resolved.result.message,
+                reason: resolved.result.reason,
+                nextAction: resolved.result.nextAction,
+                configSource: resolved.configSource,
+            }, null, 2));
+        }
+        else {
+            console.error(`error: ${resolved.result.message}`);
+            console.error(`nextAction: ${resolved.result.nextAction}`);
+        }
+        process.exit(1);
+        return;
+    }
+    const config = resolved.result;
+    // Dispatch to the appropriate runtime probe
+    if (config.runtimeKind === 'pi-ai') {
+        return handlePiAiProbe({
+            ...opts,
+            provider: opts.provider ?? config.provider,
+            model: opts.model ?? config.model,
+            apiKeyEnv: opts.apiKeyEnv ?? config.apiKeyEnv,
+            baseUrl: opts.baseUrl ?? config.baseUrl,
+            timeoutMs: opts.timeoutMs ?? config.timeoutMs,
+        });
+    }
+    if (config.runtimeKind === 'openclaw-cli') {
+        return handleOpenClawProbe({
+            ...opts,
+            openclawLocal: config.openclawMode === 'local' ? true : opts.openclawLocal,
+            openclawGateway: config.openclawMode === 'gateway' ? true : opts.openclawGateway,
+        });
+    }
+    console.error(`error: unsupported runtimeKind '${config.runtimeKind}' from .pd/config.yaml`);
+    process.exit(1);
+    return;
+}
+/**
+ * pd runtime probe — dispatches to openclaw-cli, pi-ai, or config branch.
  */
 export async function handleRuntimeProbe(opts) {
     if (opts.runtime === 'openclaw-cli') {
@@ -250,7 +415,35 @@ export async function handleRuntimeProbe(opts) {
     if (opts.runtime === 'pi-ai') {
         return handlePiAiProbe(opts);
     }
-    console.error(`error: unsupported --runtime '${opts.runtime}' (supported: openclaw-cli, pi-ai)`);
+    if (opts.runtime === 'config') {
+        return handleConfigProbe(opts);
+    }
+    console.error(`error: unsupported --runtime '${opts.runtime}' (supported: openclaw-cli, pi-ai, config)`);
     process.exit(1);
+    return;
+}
+/**
+ * Register the `pd runtime probe` command on a Commander instance.
+ * Used by index.ts and tests to ensure real command wiring is verified (EP-04).
+ */
+export function registerRuntimeProbeCommand(runtimeCmd) {
+    return runtimeCmd
+        .command('probe')
+        .description('Probe runtime health and capabilities (HG-01 HARD GATE)')
+        .requiredOption('-r, --runtime <kind>', "Runtime kind: 'openclaw-cli', 'pi-ai', or 'config'")
+        .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) \u2014 for pi-ai, falls back to .pd/config.yaml')
+        .option('--model <id>', 'Model ID (e.g., anthropic/claude-sonnet-4) \u2014 for pi-ai, falls back to .pd/config.yaml')
+        .option('--apiKeyEnv <name>', 'Env var name for API key (e.g., OPENROUTER_API_KEY) \u2014 for pi-ai, falls back to .pd/config.yaml')
+        .option('--baseUrl <url>', 'Custom base URL for OpenAI-compatible providers \u2014 for pi-ai, falls back to .pd/config.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 \u2014 loads pi-ai config from .pd/config.yaml')
+        .option('--json', 'Output raw JSON')
+        .action(async (opts) => {
+        await handleRuntimeProbe(opts);
+    });
 }
 //# sourceMappingURL=runtime.js.map