@principles/pd-cli 1.159.2 → 1.160.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/diagnose.d.ts +0 -3
- package/dist/commands/diagnose.d.ts.map +1 -1
- package/dist/commands/diagnose.js +20 -57
- package/dist/commands/diagnose.js.map +1 -1
- package/dist/commands/pain-retry.d.ts +0 -3
- package/dist/commands/pain-retry.d.ts.map +1 -1
- package/dist/commands/pain-retry.js +11 -39
- package/dist/commands/pain-retry.js.map +1 -1
- package/dist/commands/runtime-internalization-enqueue-successors.d.ts.map +1 -1
- package/dist/commands/runtime-internalization-enqueue-successors.js +32 -0
- package/dist/commands/runtime-internalization-enqueue-successors.js.map +1 -1
- package/dist/commands/runtime-internalization-run-once.d.ts.map +1 -1
- package/dist/commands/runtime-internalization-run-once.js +4 -2
- package/dist/commands/runtime-internalization-run-once.js.map +1 -1
- package/dist/commands/runtime.d.ts +1 -4
- package/dist/commands/runtime.d.ts.map +1 -1
- package/dist/commands/runtime.js +25 -95
- package/dist/commands/runtime.js.map +1 -1
- package/dist/index.js +2 -5
- package/dist/index.js.map +1 -1
- package/dist/services/config-doctor.d.ts.map +1 -1
- package/dist/services/config-doctor.js +9 -21
- package/dist/services/config-doctor.js.map +1 -1
- package/dist/services/mainline-snapshot-assembler.d.ts.map +1 -1
- package/dist/services/mainline-snapshot-assembler.js +2 -2
- package/dist/services/mainline-snapshot-assembler.js.map +1 -1
- package/dist/services/resolve-runtime-from-pd-config.d.ts +0 -7
- package/dist/services/resolve-runtime-from-pd-config.d.ts.map +1 -1
- package/dist/services/resolve-runtime-from-pd-config.js +0 -5
- package/dist/services/resolve-runtime-from-pd-config.js.map +1 -1
- package/dist/services/runtime-adapter-resolver.d.ts +1 -8
- package/dist/services/runtime-adapter-resolver.d.ts.map +1 -1
- package/dist/services/runtime-adapter-resolver.js +13 -39
- package/dist/services/runtime-adapter-resolver.js.map +1 -1
- package/package.json +4 -4
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
* - ERR-013 (Object.hasOwn): feature flag check uses Object.hasOwn
|
|
23
23
|
* - ERR-002 (graceful degradation with reason): structured error includes reason + nextAction
|
|
24
24
|
*/
|
|
25
|
-
import { TestDoubleRuntimeAdapter, PiAiRuntimeAdapter,
|
|
25
|
+
import { TestDoubleRuntimeAdapter, PiAiRuntimeAdapter, L2AgentLoopAdapter, buildL2PrincipleReaderFromLedger, isRuntimeConfigError, validateRuntimeConfig, } from '@principles/core/runtime-v2';
|
|
26
26
|
import { loadLedger } from '@principles/core/principle-tree-ledger';
|
|
27
27
|
import { loadPdConfig, computeFlagsFromLoadResult } from './pd-config-loader.js';
|
|
28
28
|
import { resolveRuntimeFromPdConfig } from './resolve-runtime-from-pd-config.js';
|
|
@@ -53,7 +53,7 @@ export function resolveRuntimeAdapterFromConfig(opts) {
|
|
|
53
53
|
}
|
|
54
54
|
return opts.testDoublePayloadBuilder(opts);
|
|
55
55
|
}
|
|
56
|
-
// ── Resolve config from .pd/config.yaml (for pi-ai
|
|
56
|
+
// ── Resolve config from .pd/config.yaml (for pi-ai and config) ──────────
|
|
57
57
|
const resolved = resolveRuntimeFromPdConfig(opts.workspaceDir, {
|
|
58
58
|
agentName: opts.agentName,
|
|
59
59
|
...(opts.runtimeProfileId !== undefined ? { runtimeProfileId: opts.runtimeProfileId } : {}),
|
|
@@ -62,6 +62,16 @@ export function resolveRuntimeAdapterFromConfig(opts) {
|
|
|
62
62
|
const configResult = resolved.result;
|
|
63
63
|
// PRI-431 Step 1d: invoke onConfigResolved callback (for telemetry, legacyWarnings, etc.)
|
|
64
64
|
opts.onConfigResolved?.(resolved);
|
|
65
|
+
// ── Retired backend (ADR-0029) ──────────────────────────────────────────
|
|
66
|
+
// Checked BEFORE the config-error branch: naming the retired backend is a
|
|
67
|
+
// refused request, and a needs_setup/invalid-config result must not mask the
|
|
68
|
+
// retirement reason behind a generic config error (cli-6).
|
|
69
|
+
if (opts.runtimeKind === 'openclaw-cli') {
|
|
70
|
+
throw new ConfigResolutionError("Runtime kind 'openclaw-cli' is retired (ADR-0029): PD runs internal agents " +
|
|
71
|
+
"only on its own pi-ai runtime, never through a host CLI agent session.", 'unsupported-runtime', {
|
|
72
|
+
nextAction: 'Use --runtime pi-ai, or point the .pd/config.yaml runtime profile at a pi-ai profile (provider + model + apiKeyEnv).',
|
|
73
|
+
});
|
|
74
|
+
}
|
|
65
75
|
if (isRuntimeConfigError(configResult)) {
|
|
66
76
|
if (!opts.configOptional) {
|
|
67
77
|
throw new ConfigResolutionError(`Config resolution from .pd/config.yaml failed: ${configResult.reason}. ${configResult.message}`, 'invalid-config', { nextAction: configResult.nextAction });
|
|
@@ -166,44 +176,8 @@ export function resolveRuntimeAdapterFromConfig(opts) {
|
|
|
166
176
|
...(configFields.systemPrompt ? { systemPrompt: configFields.systemPrompt } : {}),
|
|
167
177
|
});
|
|
168
178
|
}
|
|
169
|
-
// ── openclaw-cli branch ─────────────────────────────────────────────────
|
|
170
|
-
const isOpenClawCli = opts.runtimeKind === 'openclaw-cli' ||
|
|
171
|
-
(opts.runtimeKind === 'config' &&
|
|
172
|
-
!isRuntimeConfigError(configResult) &&
|
|
173
|
-
configResult.runtimeKind === 'openclaw-cli');
|
|
174
|
-
if (isOpenClawCli) {
|
|
175
|
-
// PRI-431 Step 1d: handle configOptional — when config failed, configFields is empty
|
|
176
|
-
const openclawConfigFields = isRuntimeConfigError(configResult)
|
|
177
|
-
? {}
|
|
178
|
-
: configResult;
|
|
179
|
-
// CLI override takes precedence over config. PRI-917 review (P1): a
|
|
180
|
-
// source='default' OpenClaw profile DELEGATES mode resolution to OpenClaw
|
|
181
|
-
// (createAdapterConfigFromProfile -> openclawMode 'default'; the factory
|
|
182
|
-
// omits it from RuntimeConfig, and validateRuntimeConfig accepts exactly
|
|
183
|
-
// that). Construct the adapter in delegated mode instead of throwing, so
|
|
184
|
-
// the two resolution paths agree on the same profile.
|
|
185
|
-
const delegatedDefault = resolved.runtimeProfileSource === 'default' && opts.openclawMode === undefined;
|
|
186
|
-
const openclawMode = opts.openclawMode
|
|
187
|
-
?? openclawConfigFields.openclawMode
|
|
188
|
-
?? (delegatedDefault ? 'default' : undefined);
|
|
189
|
-
if (!openclawMode) {
|
|
190
|
-
throw new ConfigResolutionError("runtimeKind 'openclaw-cli' requires openclawMode.", 'missing-fields', {
|
|
191
|
-
missing: ['openclawMode'],
|
|
192
|
-
nextAction: 'Add openclawMode: local|gateway to your .pd/config.yaml runtime profile or use --openclaw-local/--openclaw-gateway flags.',
|
|
193
|
-
});
|
|
194
|
-
}
|
|
195
|
-
// PRI-431 Step 1d: only pass agentId when explicitly provided (backward compat with run-once.ts)
|
|
196
|
-
const openclawAdapterOpts = {
|
|
197
|
-
runtimeMode: openclawMode,
|
|
198
|
-
workspaceDir: opts.workspaceDir,
|
|
199
|
-
};
|
|
200
|
-
if (opts.agentId !== undefined) {
|
|
201
|
-
openclawAdapterOpts.agentId = opts.agentId;
|
|
202
|
-
}
|
|
203
|
-
return new OpenClawCliRuntimeAdapter(openclawAdapterOpts);
|
|
204
|
-
}
|
|
205
179
|
// ── Unsupported runtime ────────────────────────────────────────────────
|
|
206
|
-
throw new Error(`Unsupported runtime kind: ${opts.runtimeKind}. Supported: test-double, pi-ai,
|
|
180
|
+
throw new Error(`Unsupported runtime kind: ${opts.runtimeKind}. Supported: test-double, pi-ai, config`);
|
|
207
181
|
}
|
|
208
182
|
export { TestDoubleRuntimeAdapter, isRuntimeConfigError, validateRuntimeConfig };
|
|
209
183
|
//# sourceMappingURL=runtime-adapter-resolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-adapter-resolver.js","sourceRoot":"","sources":["../../src/services/runtime-adapter-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"runtime-adapter-resolver.js","sourceRoot":"","sources":["../../src/services/runtime-adapter-resolver.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@principles/pd-cli",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.160.1",
|
|
4
4
|
"description": "PD CLI — Pain recording, sample management, and governance tasks for Principles Disciple",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -21,12 +21,12 @@
|
|
|
21
21
|
"test": "vitest run"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@principles/core": "^1.
|
|
24
|
+
"@principles/core": "^1.297.1",
|
|
25
25
|
"@principles/codex-adapter": "^0.5.13",
|
|
26
26
|
"@principles/workbuddy-adapter": "^0.2.11",
|
|
27
|
-
"@principles/host-runtime": "^0.13.
|
|
27
|
+
"@principles/host-runtime": "^0.13.3",
|
|
28
28
|
"@principles/install-layout": "^0.4.0",
|
|
29
|
-
"principles-disciple": "^2.2.
|
|
29
|
+
"principles-disciple": "^2.2.3",
|
|
30
30
|
"better-sqlite3": "^13.0.3",
|
|
31
31
|
"commander": "^12.0.0",
|
|
32
32
|
"js-yaml": "^5.4.3"
|