create-principles-disciple 1.145.6 → 1.145.7
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/_release/product-identity.json +2 -2
- package/console/dist/server/models/CodexGovernanceHealthModel.d.ts +39 -2
- package/console/dist/server/models/CodexGovernanceHealthModel.js +228 -29
- package/core/dist/runtime-v2/adapter/artificer-l2-adapter.d.ts.map +1 -1
- package/core/dist/runtime-v2/adapter/artificer-l2-adapter.js +28 -9
- package/core/dist/runtime-v2/adapter/artificer-l2-adapter.js.map +1 -1
- package/core/dist/runtime-v2/adapter/l2-agent-loop-adapter.d.ts.map +1 -1
- package/core/dist/runtime-v2/adapter/l2-agent-loop-adapter.js +29 -9
- package/core/dist/runtime-v2/adapter/l2-agent-loop-adapter.js.map +1 -1
- package/core/dist/runtime-v2/adapter/pi-ai-runtime-adapter.d.ts +6 -0
- package/core/dist/runtime-v2/adapter/pi-ai-runtime-adapter.d.ts.map +1 -1
- package/core/dist/runtime-v2/adapter/pi-ai-runtime-adapter.js +105 -1
- package/core/dist/runtime-v2/adapter/pi-ai-runtime-adapter.js.map +1 -1
- package/core/dist/runtime-v2/index.d.ts +6 -2
- package/core/dist/runtime-v2/index.d.ts.map +1 -1
- package/core/dist/runtime-v2/index.js +3 -1
- package/core/dist/runtime-v2/index.js.map +1 -1
- package/core/dist/runtime-v2/internalization/artificer-intent-preflight.d.ts +154 -0
- package/core/dist/runtime-v2/internalization/artificer-intent-preflight.d.ts.map +1 -0
- package/core/dist/runtime-v2/internalization/artificer-intent-preflight.js +686 -0
- package/core/dist/runtime-v2/internalization/artificer-intent-preflight.js.map +1 -0
- package/core/dist/runtime-v2/internalization/artificer-prompt-builder.d.ts +21 -3
- package/core/dist/runtime-v2/internalization/artificer-prompt-builder.d.ts.map +1 -1
- package/core/dist/runtime-v2/internalization/artificer-prompt-builder.js +48 -5
- package/core/dist/runtime-v2/internalization/artificer-prompt-builder.js.map +1 -1
- package/core/dist/runtime-v2/internalization/artificer-runner.d.ts +17 -0
- package/core/dist/runtime-v2/internalization/artificer-runner.d.ts.map +1 -1
- package/core/dist/runtime-v2/internalization/artificer-runner.js +45 -2
- package/core/dist/runtime-v2/internalization/artificer-runner.js.map +1 -1
- package/core/dist/runtime-v2/internalization/behavior-example-pack.d.ts +0 -19
- package/core/dist/runtime-v2/internalization/behavior-example-pack.d.ts.map +1 -1
- package/core/dist/runtime-v2/internalization/behavior-example-pack.js +31 -0
- package/core/dist/runtime-v2/internalization/behavior-example-pack.js.map +1 -1
- package/core/dist/runtime-v2/internalization/intent-contract.d.ts +31 -0
- package/core/dist/runtime-v2/internalization/intent-contract.d.ts.map +1 -1
- package/core/dist/runtime-v2/internalization/intent-contract.js +42 -0
- package/core/dist/runtime-v2/internalization/intent-contract.js.map +1 -1
- package/core/dist/runtime-v2/internalization/peer-runner-contracts.d.ts +14 -1
- package/core/dist/runtime-v2/internalization/peer-runner-contracts.d.ts.map +1 -1
- package/core/dist/runtime-v2/internalization/peer-runner-contracts.js.map +1 -1
- package/core/dist/runtime-v2/internalization/pitask-metadata.d.ts +64 -0
- package/core/dist/runtime-v2/internalization/pitask-metadata.d.ts.map +1 -1
- package/core/dist/runtime-v2/internalization/pitask-metadata.js +84 -0
- package/core/dist/runtime-v2/internalization/pitask-metadata.js.map +1 -1
- package/core/dist/runtime-v2/internalization/scribe-output.d.ts +13 -1
- package/core/dist/runtime-v2/internalization/scribe-output.d.ts.map +1 -1
- package/core/dist/runtime-v2/internalization/scribe-output.js +13 -1
- package/core/dist/runtime-v2/internalization/scribe-output.js.map +1 -1
- package/core/dist/runtime-v2/internalization/scribe-prompt-builder.d.ts +15 -1
- package/core/dist/runtime-v2/internalization/scribe-prompt-builder.d.ts.map +1 -1
- package/core/dist/runtime-v2/internalization/scribe-prompt-builder.js +29 -1
- package/core/dist/runtime-v2/internalization/scribe-prompt-builder.js.map +1 -1
- package/core/dist/runtime-v2/tools/agent-tool-contract.d.ts +2 -1
- package/core/dist/runtime-v2/tools/agent-tool-contract.d.ts.map +1 -1
- package/core/dist/runtime-v2/tools/agent-tool-contract.js +1 -1
- package/core/dist/runtime-v2/tools/agent-tool-contract.js.map +1 -1
- package/core/dist/runtime-v2/tools/artificer-l2-tool-contract.d.ts +1 -1
- package/core/dist/telemetry-event.d.ts +4 -2
- package/core/dist/telemetry-event.d.ts.map +1 -1
- package/core/dist/telemetry-event.js +12 -0
- package/core/dist/telemetry-event.js.map +1 -1
- package/core/package.json +3 -3
- package/host-runtime/dist/internalization-consumer-cycle.d.ts +10 -1
- package/host-runtime/dist/internalization-consumer-cycle.js +85 -4
- package/host-runtime/dist/production-rulehost-gate.js +40 -3
- package/host-runtime/package.json +1 -1
- package/package.json +1 -1
- package/plugin/dist/bundle.js +655 -781
- package/plugin/dist/openclaw.plugin.json +1 -1
- package/plugin/dist/rulehost-evidence.js +27 -27
- package/release-manager/package.json +1 -1
|
@@ -12,7 +12,15 @@
|
|
|
12
12
|
*
|
|
13
13
|
* Failure is explicit (rc-9): if the CLI cannot run, the model returns
|
|
14
14
|
* `status: 'unknown'` with `ready: false` and a `health_collection_failed`
|
|
15
|
-
* blocker — "unable to determine health" is never rendered as healthy.
|
|
15
|
+
* blocker — "unable to determine health" is never rendered as healthy. The
|
|
16
|
+
* CLI's own location is resolved from the install layout authority
|
|
17
|
+
* (`resolveUpdateLayout()`), not from the npm dependency graph — PRI-1013.
|
|
18
|
+
*
|
|
19
|
+
* A non-zero CLI exit is NOT by itself a collection failure: the CLI exits 1
|
|
20
|
+
* when the report it produced says governance is not ready (cli-2), and
|
|
21
|
+
* not-ready is the very signal this panel renders — PRI-1013 review found both
|
|
22
|
+
* halves of the same symptom (entry never resolved, then the resolved
|
|
23
|
+
* report discarded on exit 1).
|
|
16
24
|
*
|
|
17
25
|
* This is a *verbatim* report passthrough, not a projection: no field is
|
|
18
26
|
* recomputed or filtered here.
|
|
@@ -89,9 +97,38 @@ export type CodexGovernanceHealthResult = {
|
|
|
89
97
|
nextAction: string;
|
|
90
98
|
productClaim: 'degraded';
|
|
91
99
|
};
|
|
100
|
+
export type PdCliEntryResolution = {
|
|
101
|
+
ok: true;
|
|
102
|
+
entry: string;
|
|
103
|
+
} | {
|
|
104
|
+
ok: false;
|
|
105
|
+
reason: string;
|
|
106
|
+
nextAction: string;
|
|
107
|
+
};
|
|
108
|
+
/**
|
|
109
|
+
* Resolve the pd-cli entry to exec — PRI-1013.
|
|
110
|
+
*
|
|
111
|
+
* The install layout is the authority: components are delivered as siblings
|
|
112
|
+
* under `<runtime>/`, and console deliberately does NOT declare
|
|
113
|
+
* `@principles/pd-cli`, so `require.resolve` on that package name threw
|
|
114
|
+
* MODULE_NOT_FOUND on every installed machine and the item degraded forever
|
|
115
|
+
* (the delivery-surface half of this class is ERR-040: declaring the dependency
|
|
116
|
+
* would mean extending bundle-plugin, the installer link sync AND the console
|
|
117
|
+
* inline updater in one change — strictly more durable complexity than wiring
|
|
118
|
+
* the existing layout authority in here).
|
|
119
|
+
*
|
|
120
|
+
* The package graph is consulted only when NO install layout resolves, i.e. a
|
|
121
|
+
* source checkout: there the workspace links are the developer's own build.
|
|
122
|
+
* When the layout does resolve its answer is final — falling through to the npm
|
|
123
|
+
* graph could point at a different pd-cli generation than the install reports.
|
|
124
|
+
*/
|
|
125
|
+
export declare function resolvePdCliEntry(): PdCliEntryResolution;
|
|
92
126
|
export declare class CodexGovernanceHealthModel {
|
|
93
127
|
private readonly workspaceDir;
|
|
94
128
|
private readonly cliEntryOverride;
|
|
95
|
-
|
|
129
|
+
private readonly execTimeoutMs;
|
|
130
|
+
constructor(workspaceDir: string, cliEntryOverride?: string, options?: {
|
|
131
|
+
execTimeoutMs?: number;
|
|
132
|
+
});
|
|
96
133
|
collect(): Promise<CodexGovernanceHealthResult>;
|
|
97
134
|
}
|
|
@@ -12,7 +12,15 @@
|
|
|
12
12
|
*
|
|
13
13
|
* Failure is explicit (rc-9): if the CLI cannot run, the model returns
|
|
14
14
|
* `status: 'unknown'` with `ready: false` and a `health_collection_failed`
|
|
15
|
-
* blocker — "unable to determine health" is never rendered as healthy.
|
|
15
|
+
* blocker — "unable to determine health" is never rendered as healthy. The
|
|
16
|
+
* CLI's own location is resolved from the install layout authority
|
|
17
|
+
* (`resolveUpdateLayout()`), not from the npm dependency graph — PRI-1013.
|
|
18
|
+
*
|
|
19
|
+
* A non-zero CLI exit is NOT by itself a collection failure: the CLI exits 1
|
|
20
|
+
* when the report it produced says governance is not ready (cli-2), and
|
|
21
|
+
* not-ready is the very signal this panel renders — PRI-1013 review found both
|
|
22
|
+
* halves of the same symptom (entry never resolved, then the resolved
|
|
23
|
+
* report discarded on exit 1).
|
|
16
24
|
*
|
|
17
25
|
* This is a *verbatim* report passthrough, not a projection: no field is
|
|
18
26
|
* recomputed or filtered here.
|
|
@@ -22,60 +30,251 @@ import { promisify } from 'node:util';
|
|
|
22
30
|
import path from 'node:path';
|
|
23
31
|
import { createRequire } from 'node:module';
|
|
24
32
|
import * as fs from 'node:fs';
|
|
33
|
+
import { resolveUpdateLayout } from '../utils/installed-layout.js';
|
|
25
34
|
const execFileAsync = promisify(execFile);
|
|
35
|
+
/**
|
|
36
|
+
* Repair action for a machine whose install layout DOES resolve (§1.1: the
|
|
37
|
+
* installer/updater is the only legitimate writer of the install face, so the
|
|
38
|
+
* Owner is pointed at the update chain, never at hand-editing the runtime).
|
|
39
|
+
*/
|
|
40
|
+
const INSTALLED_REPAIR_ACTION = 'Finish or re-run the update from the Console update page; if that page reports the layout itself as unusable, repair the install with `npx create-principles-disciple`. Do not edit the runtime directory by hand, and do NOT install the CLI globally with npm — this resolver reads the install layout, not a global npm install.';
|
|
41
|
+
/** Repair action for a source checkout with no install to resolve against. */
|
|
42
|
+
const DEV_BUILD_ACTION = 'No PD install layout resolves for this home, so the Console used its own workspace dependency graph for pd-cli. In a source checkout run `npm run build` to emit packages/pd-cli/dist/index.js; on a user machine install PD with `npx create-principles-disciple`.';
|
|
26
43
|
const require = createRequire(import.meta.url);
|
|
27
|
-
|
|
28
|
-
|
|
44
|
+
/** rc-1/rc-2: the failure shape from fs is unknown — read `code` only if present. */
|
|
45
|
+
function errnoCode(error) {
|
|
46
|
+
if (typeof error !== 'object' || error === null || !Object.hasOwn(error, 'code'))
|
|
47
|
+
return undefined;
|
|
48
|
+
const { code } = error;
|
|
49
|
+
return typeof code === 'string' ? code : undefined;
|
|
50
|
+
}
|
|
51
|
+
/** rc-8: bounded rendering of an unknown value that goes into an API payload. */
|
|
52
|
+
function boundedDetail(value) {
|
|
53
|
+
return (value instanceof Error ? value.message : String(value)).slice(0, 160);
|
|
54
|
+
}
|
|
55
|
+
const MANUAL_RUN_ACTION = 'Run `pd health --host codex --workspace <dir>` manually to see the structured reason.';
|
|
56
|
+
/**
|
|
57
|
+
* The degraded result for "the CLI authority produced nothing usable".
|
|
58
|
+
* `reason` separates the two failure classes (rc-9) — the subprocess could not
|
|
59
|
+
* be read at all vs. it printed something that is not a report — while the
|
|
60
|
+
* blocker keeps the single `health_collection_failed` family the panel renders.
|
|
61
|
+
*/
|
|
62
|
+
function degradedCollection(reason, detail) {
|
|
63
|
+
return {
|
|
64
|
+
status: 'unknown',
|
|
65
|
+
ready: false,
|
|
66
|
+
readyBlockers: [`health_collection_failed: ${reason}`],
|
|
67
|
+
reason,
|
|
68
|
+
nextAction: detail.length > 0 ? `${MANUAL_RUN_ACTION} (${detail})` : MANUAL_RUN_ACTION,
|
|
69
|
+
productClaim: 'degraded',
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* rc-1..rc-4: stdout from a subprocess is untrusted runtime data even when the
|
|
74
|
+
* subprocess is our own CLI, so the report-bearing fields are checked before the
|
|
75
|
+
* passthrough cast. This is what distinguishes a real report ("not ready" is a
|
|
76
|
+
* valid report) from a usage/rejection JSON or truncated output — the cast below
|
|
77
|
+
* stays a verbatim passthrough of the CLI's documented contract (ERR-001,
|
|
78
|
+
* runtime-contract-exempt per PRI-625 review round 2) because it sits behind it.
|
|
79
|
+
*/
|
|
80
|
+
function parseCodexReport(text) {
|
|
81
|
+
if (text.trim().length === 0)
|
|
82
|
+
return undefined;
|
|
83
|
+
let parsed;
|
|
84
|
+
try {
|
|
85
|
+
parsed = JSON.parse(text);
|
|
86
|
+
}
|
|
87
|
+
catch {
|
|
88
|
+
return undefined;
|
|
89
|
+
}
|
|
90
|
+
if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed))
|
|
91
|
+
return undefined;
|
|
92
|
+
if (Reflect.get(parsed, 'host') !== 'codex')
|
|
93
|
+
return undefined;
|
|
94
|
+
if (typeof Reflect.get(parsed, 'ready') !== 'boolean')
|
|
95
|
+
return undefined;
|
|
96
|
+
if (typeof Reflect.get(parsed, 'generatedAt') !== 'string')
|
|
97
|
+
return undefined;
|
|
98
|
+
const blockers = Reflect.get(parsed, 'readyBlockers');
|
|
99
|
+
if (!Array.isArray(blockers) || !blockers.every((b) => typeof b === 'string')) {
|
|
100
|
+
return undefined;
|
|
101
|
+
}
|
|
102
|
+
return parsed; // runtime-contract-exempt: ERR-001 verbatim passthrough of our own CLI's documented JSON contract after the field guards above — single authority, see PRI-625 review round 2.
|
|
103
|
+
}
|
|
104
|
+
/** rc-1/rc-2: the rejection object's shape is unknown — read `stdout` only if present. */
|
|
105
|
+
function stdoutFromExecError(error) {
|
|
106
|
+
if (typeof error !== 'object' || error === null || !Object.hasOwn(error, 'stdout'))
|
|
107
|
+
return '';
|
|
108
|
+
const { stdout } = error;
|
|
109
|
+
return typeof stdout === 'string' ? stdout : '';
|
|
110
|
+
}
|
|
111
|
+
/** rc-1/rc-2: distinguish a process that EXITED from one that was KILLED. A
|
|
112
|
+
* timeout kill, a signal, or a spawn/system error (code is a string, killed is
|
|
113
|
+
* true, or signal is set) means the process failed — stdout on that path is
|
|
114
|
+
* partial or stale output, never a report (PRI-1013 review round 2, P2). */
|
|
115
|
+
function execFailureKind(error) {
|
|
116
|
+
if (typeof error !== 'object' || error === null)
|
|
117
|
+
return undefined;
|
|
118
|
+
const rec = error;
|
|
119
|
+
if (rec.killed === true)
|
|
120
|
+
return 'killed';
|
|
121
|
+
if (typeof rec.signal === 'string' && rec.signal.length > 0)
|
|
122
|
+
return `signal ${rec.signal}`;
|
|
123
|
+
if (typeof rec.code === 'string')
|
|
124
|
+
return rec.code;
|
|
125
|
+
return undefined;
|
|
126
|
+
}
|
|
127
|
+
/** rc-1/rc-2: same guard for the exit code, used only for the bounded operator detail. */
|
|
128
|
+
function exitCodeOf(error) {
|
|
129
|
+
if (typeof error !== 'object' || error === null || !Object.hasOwn(error, 'code'))
|
|
130
|
+
return undefined;
|
|
131
|
+
const { code } = error;
|
|
132
|
+
return typeof code === 'number' ? code : undefined;
|
|
133
|
+
}
|
|
134
|
+
/**
|
|
135
|
+
* Classify the entry the INSTALL LAYOUT pointed at. Each failure class gets its
|
|
136
|
+
* own reason so "not wired" (the PRI-1013 constant) can never be mistaken for
|
|
137
|
+
* "the runtime is actually broken" (rc-9, rc-3): ENOENT means the component was
|
|
138
|
+
* never delivered or an update was interrupted, a stat error other than ENOENT
|
|
139
|
+
* means the path could not be read, and a non-file means something else lives
|
|
140
|
+
* there.
|
|
141
|
+
*/
|
|
142
|
+
function installedEntryVerdict(entry) {
|
|
143
|
+
let stat;
|
|
144
|
+
try {
|
|
145
|
+
stat = fs.statSync(entry);
|
|
146
|
+
}
|
|
147
|
+
catch (error) {
|
|
148
|
+
const code = errnoCode(error);
|
|
149
|
+
if (code === 'ENOENT' || code === 'ENOTDIR') {
|
|
150
|
+
return { ok: false, reason: 'pd_cli_entry_missing', nextAction: `${INSTALLED_REPAIR_ACTION} (missing: ${entry})` };
|
|
151
|
+
}
|
|
152
|
+
return {
|
|
153
|
+
ok: false,
|
|
154
|
+
reason: 'pd_cli_entry_unreadable',
|
|
155
|
+
nextAction: `${INSTALLED_REPAIR_ACTION} (stat ${entry} failed: ${code ?? boundedDetail(error)})`,
|
|
156
|
+
};
|
|
157
|
+
}
|
|
158
|
+
if (!stat.isFile()) {
|
|
159
|
+
return { ok: false, reason: 'pd_cli_entry_invalid', nextAction: `${INSTALLED_REPAIR_ACTION} (${entry} is not a regular file)` };
|
|
160
|
+
}
|
|
161
|
+
return { ok: true, entry };
|
|
162
|
+
}
|
|
163
|
+
/**
|
|
164
|
+
* Resolve the pd-cli entry to exec — PRI-1013.
|
|
165
|
+
*
|
|
166
|
+
* The install layout is the authority: components are delivered as siblings
|
|
167
|
+
* under `<runtime>/`, and console deliberately does NOT declare
|
|
168
|
+
* `@principles/pd-cli`, so `require.resolve` on that package name threw
|
|
169
|
+
* MODULE_NOT_FOUND on every installed machine and the item degraded forever
|
|
170
|
+
* (the delivery-surface half of this class is ERR-040: declaring the dependency
|
|
171
|
+
* would mean extending bundle-plugin, the installer link sync AND the console
|
|
172
|
+
* inline updater in one change — strictly more durable complexity than wiring
|
|
173
|
+
* the existing layout authority in here).
|
|
174
|
+
*
|
|
175
|
+
* The package graph is consulted only when NO install layout resolves, i.e. a
|
|
176
|
+
* source checkout: there the workspace links are the developer's own build.
|
|
177
|
+
* When the layout does resolve its answer is final — falling through to the npm
|
|
178
|
+
* graph could point at a different pd-cli generation than the install reports.
|
|
179
|
+
*/
|
|
180
|
+
export function resolvePdCliEntry() {
|
|
181
|
+
let layout;
|
|
182
|
+
try {
|
|
183
|
+
layout = resolveUpdateLayout();
|
|
184
|
+
}
|
|
185
|
+
catch (error) {
|
|
186
|
+
// rc-9: a throwing layout reader is its own failure class, never folded
|
|
187
|
+
// into "not installed" — the repair action differs.
|
|
188
|
+
return {
|
|
189
|
+
ok: false,
|
|
190
|
+
reason: 'install_layout_error',
|
|
191
|
+
nextAction: `${INSTALLED_REPAIR_ACTION} (layout read failed: ${boundedDetail(error)})`,
|
|
192
|
+
};
|
|
193
|
+
}
|
|
194
|
+
if (layout !== undefined) {
|
|
195
|
+
return installedEntryVerdict(path.join(layout.pdCliDir, 'dist', 'index.js'));
|
|
196
|
+
}
|
|
29
197
|
try {
|
|
30
198
|
const pkgJsonPath = require.resolve('@principles/pd-cli/package.json');
|
|
31
199
|
const packageRoot = path.dirname(pkgJsonPath);
|
|
32
200
|
const entry = path.join(packageRoot, 'dist', 'index.js');
|
|
33
201
|
const packageRootDir = path.resolve(packageRoot);
|
|
34
|
-
if (!path.resolve(entry).startsWith(packageRootDir + path.sep))
|
|
35
|
-
return
|
|
36
|
-
|
|
202
|
+
if (!path.resolve(entry).startsWith(packageRootDir + path.sep)) {
|
|
203
|
+
return { ok: false, reason: 'pd_cli_entry_invalid', nextAction: `${DEV_BUILD_ACTION} (resolved entry escaped the package root ${packageRootDir})` };
|
|
204
|
+
}
|
|
205
|
+
// Deliberately no existsSync preflight — same reasoning as the onboarding
|
|
206
|
+
// route's `findPdCli()`: the Console test job runs before pd-cli is built,
|
|
207
|
+
// so an unbuilt entry must surface as the subprocess's own structured
|
|
208
|
+
// failure, not as an install-layout verdict.
|
|
209
|
+
return { ok: true, entry };
|
|
37
210
|
}
|
|
38
|
-
catch {
|
|
39
|
-
|
|
211
|
+
catch (error) {
|
|
212
|
+
if (errnoCode(error) === 'MODULE_NOT_FOUND') {
|
|
213
|
+
return { ok: false, reason: 'install_layout_unresolved', nextAction: DEV_BUILD_ACTION };
|
|
214
|
+
}
|
|
215
|
+
return { ok: false, reason: 'install_layout_unresolved', nextAction: `${DEV_BUILD_ACTION} (${boundedDetail(error)})` };
|
|
40
216
|
}
|
|
41
217
|
}
|
|
42
218
|
export class CodexGovernanceHealthModel {
|
|
43
219
|
workspaceDir;
|
|
44
220
|
cliEntryOverride;
|
|
45
|
-
|
|
221
|
+
execTimeoutMs;
|
|
222
|
+
constructor(workspaceDir, cliEntryOverride, options) {
|
|
46
223
|
this.workspaceDir = workspaceDir;
|
|
47
224
|
this.cliEntryOverride = cliEntryOverride ?? null;
|
|
225
|
+
// PRI-1013 review round 2 (P2): the timeout stays a production default;
|
|
226
|
+
// the option exists only so a regression test can trigger a REAL timeout
|
|
227
|
+
// kill without waiting 30s — never used in production wiring.
|
|
228
|
+
this.execTimeoutMs = options?.execTimeoutMs ?? 30_000;
|
|
48
229
|
}
|
|
49
230
|
async collect() {
|
|
50
|
-
const
|
|
51
|
-
|
|
231
|
+
const resolution = this.cliEntryOverride !== null
|
|
232
|
+
? { ok: true, entry: this.cliEntryOverride }
|
|
233
|
+
: resolvePdCliEntry();
|
|
234
|
+
if (!resolution.ok) {
|
|
52
235
|
return {
|
|
53
236
|
status: 'unknown',
|
|
54
237
|
ready: false,
|
|
55
|
-
readyBlockers: [
|
|
56
|
-
reason:
|
|
57
|
-
nextAction:
|
|
238
|
+
readyBlockers: [`health_collection_failed: ${resolution.reason}`],
|
|
239
|
+
reason: resolution.reason,
|
|
240
|
+
nextAction: resolution.nextAction,
|
|
58
241
|
productClaim: 'degraded',
|
|
59
242
|
};
|
|
60
243
|
}
|
|
244
|
+
let stdout;
|
|
61
245
|
try {
|
|
62
|
-
const
|
|
63
|
-
|
|
64
|
-
// object on stdout — parse the whole stdout, not just the first `{` line.
|
|
65
|
-
// runtime-contract-exempt: ERR-001 verbatim passthrough of our own CLI's documented JSON contract — single authority, see PRI-625 review round 2.
|
|
66
|
-
const health = JSON.parse(stdout);
|
|
67
|
-
return { status: 'ok', health };
|
|
246
|
+
const result = await execFileAsync(process.execPath, [resolution.entry, 'health', '--host', 'codex', '--workspace', this.workspaceDir, '--json'], { encoding: 'utf8', timeout: this.execTimeoutMs, windowsHide: true });
|
|
247
|
+
({ stdout } = result);
|
|
68
248
|
}
|
|
69
249
|
catch (error) {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
250
|
+
// cli-2 + PRI-1013: `pd health --host codex` exits 1 when the report it
|
|
251
|
+
// produced says NOT READY — non-readiness is the actionable governance
|
|
252
|
+
// signal this panel exists to show, so a non-zero exit only counts as a
|
|
253
|
+
// collection failure when stdout carries no report. On a machine where the
|
|
254
|
+
// Codex host is disabled that was the normal case, and the panel rendered
|
|
255
|
+
// the constant failure instead of the CLI's real blockers.
|
|
256
|
+
//
|
|
257
|
+
// PRI-1013 review round 2 (P2): the ONLY exit that may carry a report
|
|
258
|
+
// out of this catch is the CLI's DESIGNED not-ready signal — exit 1 with
|
|
259
|
+
// ready === false (health-codex.ts sets exitCode = 1 iff !report.ready).
|
|
260
|
+
// A timeout kill, a signal, a spawn/system error, or any other exit code
|
|
261
|
+
// means the process failed; stdout on those paths is partial or stale
|
|
262
|
+
// output and must never render as `status:'ok'`.
|
|
263
|
+
const failureKind = execFailureKind(error);
|
|
264
|
+
const exitCode = exitCodeOf(error);
|
|
265
|
+
if (failureKind === undefined && exitCode === 1) {
|
|
266
|
+
const report = parseCodexReport(stdoutFromExecError(error));
|
|
267
|
+
if (report !== undefined && report.ready === false)
|
|
268
|
+
return { status: 'ok', health: report };
|
|
269
|
+
}
|
|
270
|
+
return degradedCollection('health_collection_failed', `${boundedDetail(error)}${exitCode === undefined ? '' : ` [exit ${exitCode}]`}${failureKind === undefined ? '' : ` [${failureKind}]`}`);
|
|
271
|
+
}
|
|
272
|
+
// cli-1: the CLI's --json mode prints exactly one (pretty-printed) JSON
|
|
273
|
+
// object on stdout — parse the whole stdout, not just the first `{` line.
|
|
274
|
+
const report = parseCodexReport(stdout);
|
|
275
|
+
if (report === undefined) {
|
|
276
|
+
return degradedCollection('report_unusable', boundedDetail(stdout));
|
|
79
277
|
}
|
|
278
|
+
return { status: 'ok', health: report };
|
|
80
279
|
}
|
|
81
280
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artificer-l2-adapter.d.ts","sourceRoot":"","sources":["../../../src/runtime-v2/adapter/artificer-l2-adapter.ts"],"names":[],"mappings":"AAyCA,OAAO,KAAK,EACV,gBAAgB,EAChB,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,SAAS,EACT,SAAS,EACT,aAAa,EACb,mBAAmB,EACnB,kBAAkB,EAClB,WAAW,EACZ,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAGjF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAYnE,MAAM,WAAW,wBAAwB;IACvC,gDAAgD;IAChD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,gBAAgB;IAChB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,wCAAwC;IACxC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,8DAA8D;IAC9D,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,iDAAiD;IACjD,QAAQ,CAAC,QAAQ,EAAE,uBAAuB,CAAC;IAC3C,4DAA4D;IAC5D,QAAQ,CAAC,SAAS,EAAE,kBAAkB,CAAC;IACvC,2DAA2D;IAC3D,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,0EAA0E;IAC1E,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,qDAAqD;IACrD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,CAAC;IAC7E,gEAAgE;IAChE,QAAQ,CAAC,YAAY,CAAC,EAAE,iBAAiB,CAAC;IAC1C;;;;OAIG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAChC;AAoKD,qBAAa,kBAAmB,YAAW,gBAAgB;IACzD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2B;IAClD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0B;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqB;IAC/C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoB;IACjD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA0C;IAC/D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAsC;IACvE;;;;;;;OAOG;IACH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmC;IAE/D,YAAY,MAAM,EAAE,wBAAwB,EAK3C;IAGD,IAAI,IAAI,WAAW,CAElB;IAGK,eAAe,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAYpD;IAEK,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAExD;IAEK,WAAW,IAAI,OAAO,CAAC,aAAa,CAAC,CAiB1C;IAEK,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"artificer-l2-adapter.d.ts","sourceRoot":"","sources":["../../../src/runtime-v2/adapter/artificer-l2-adapter.ts"],"names":[],"mappings":"AAyCA,OAAO,KAAK,EACV,gBAAgB,EAChB,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,SAAS,EACT,SAAS,EACT,aAAa,EACb,mBAAmB,EACnB,kBAAkB,EAClB,WAAW,EACZ,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAGjF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAYnE,MAAM,WAAW,wBAAwB;IACvC,gDAAgD;IAChD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,gBAAgB;IAChB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,wCAAwC;IACxC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,8DAA8D;IAC9D,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,iDAAiD;IACjD,QAAQ,CAAC,QAAQ,EAAE,uBAAuB,CAAC;IAC3C,4DAA4D;IAC5D,QAAQ,CAAC,SAAS,EAAE,kBAAkB,CAAC;IACvC,2DAA2D;IAC3D,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,0EAA0E;IAC1E,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,qDAAqD;IACrD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,CAAC;IAC7E,gEAAgE;IAChE,QAAQ,CAAC,YAAY,CAAC,EAAE,iBAAiB,CAAC;IAC1C;;;;OAIG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAChC;AAoKD,qBAAa,kBAAmB,YAAW,gBAAgB;IACzD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2B;IAClD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0B;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqB;IAC/C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoB;IACjD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA0C;IAC/D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAsC;IACvE;;;;;;;OAOG;IACH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmC;IAE/D,YAAY,MAAM,EAAE,wBAAwB,EAK3C;IAGD,IAAI,IAAI,WAAW,CAElB;IAGK,eAAe,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAYpD;IAEK,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAExD;IAEK,WAAW,IAAI,OAAO,CAAC,aAAa,CAAC,CAiB1C;IAEK,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,CAqUvD;IAEK,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAY/C;IAEK,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkB5C;IAEK,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAGpE;IAGK,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAElE;IAGK,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAExE;IAID,OAAO,CAAC,SAAS;IAQjB,OAAO,CAAC,YAAY;IAwCpB,OAAO,CAAC,YAAY;CAQrB"}
|
|
@@ -269,7 +269,13 @@ export class ArtificerL2Adapter {
|
|
|
269
269
|
// protocol, via StartRunInput.systemPrompt) → tool protocol → profile
|
|
270
270
|
// append layer (config). Undefined when every layer is absent.
|
|
271
271
|
const systemPrompt = mergeSystemPromptLayers(input.systemPrompt, toolInstruction, this.config.systemPrompt);
|
|
272
|
+
// Pi 1.2 (agent-core 0.86+): AgentContext.systemPrompt is gone — the system
|
|
273
|
+
// prompt rides the transcript as a leading SystemMessage, and runAgentLoop
|
|
274
|
+
// merges the tool declarations into it (declareToolChanges).
|
|
272
275
|
const prompts = [
|
|
276
|
+
...(systemPrompt !== undefined && systemPrompt.length > 0
|
|
277
|
+
? [{ role: 'system', content: systemPrompt, timestamp: 0 }]
|
|
278
|
+
: []),
|
|
273
279
|
{ role: 'user', content: messageContent, timestamp: Date.now() },
|
|
274
280
|
];
|
|
275
281
|
// Fresh capture + turn counter per run (EP-05 loop-state freshness).
|
|
@@ -294,9 +300,12 @@ export class ArtificerL2Adapter {
|
|
|
294
300
|
},
|
|
295
301
|
};
|
|
296
302
|
const tools = buildArtificerL2Tools(toolContext);
|
|
303
|
+
// Pi 1.2: prompts carry the full input (system + user). context.messages
|
|
304
|
+
// MUST stay empty — runAgentLoop builds [...context.messages, ...prompts],
|
|
305
|
+
// so passing prompts here (the 0.85 shape) duplicated the user message in
|
|
306
|
+
// every LLM request.
|
|
297
307
|
const agentContext = {
|
|
298
|
-
|
|
299
|
-
messages: prompts,
|
|
308
|
+
messages: [],
|
|
300
309
|
tools,
|
|
301
310
|
};
|
|
302
311
|
const MAX_NO_TOOL_CALL_NUDGES = 2;
|
|
@@ -333,7 +342,7 @@ export class ArtificerL2Adapter {
|
|
|
333
342
|
? { reasoning: this.config.reasoning }
|
|
334
343
|
: {}),
|
|
335
344
|
convertToLlm: (msgs) => msgs.map((m) => {
|
|
336
|
-
if (m.role === 'user' || m.role === 'assistant' || m.role === 'toolResult') {
|
|
345
|
+
if (m.role === 'user' || m.role === 'assistant' || m.role === 'toolResult' || m.role === 'system') {
|
|
337
346
|
return m;
|
|
338
347
|
}
|
|
339
348
|
throw new PDRuntimeError('output_invalid', `Artificer L2 convertToLlm encountered an unsupported message role: ${String(m.role)}`);
|
|
@@ -344,9 +353,18 @@ export class ArtificerL2Adapter {
|
|
|
344
353
|
}
|
|
345
354
|
return undefined;
|
|
346
355
|
},
|
|
347
|
-
|
|
356
|
+
// Pi 1.2 (0.87): finishTurn replaces shouldStopAfterTurn and ALSO fires on
|
|
357
|
+
// error/aborted turns (0.85 never called the hook there). Guard those
|
|
358
|
+
// first — before turnCount increments — to keep the 0.85 turn accounting
|
|
359
|
+
// and the hard-exit behavior intact.
|
|
360
|
+
finishTurn: (turn) => {
|
|
361
|
+
if (turn.message.stopReason === 'error' || turn.message.stopReason === 'aborted') {
|
|
362
|
+
return undefined;
|
|
363
|
+
}
|
|
348
364
|
turnCount += 1;
|
|
349
|
-
return outputCapture.output !== null || turnCount >= maxTurns
|
|
365
|
+
return outputCapture.output !== null || turnCount >= maxTurns
|
|
366
|
+
? { action: 'end' }
|
|
367
|
+
: undefined;
|
|
350
368
|
},
|
|
351
369
|
// EP002-R3 (live evidence, glm-5.3-flash): the model sometimes ends its
|
|
352
370
|
// turn with a plain-text draft instead of a tool call, which makes the
|
|
@@ -400,10 +418,11 @@ export class ArtificerL2Adapter {
|
|
|
400
418
|
});
|
|
401
419
|
let loopError = null;
|
|
402
420
|
// EP002-R3: streamAssistantResponse reports LLM-call failures as a message
|
|
403
|
-
// with stopReason 'error'/'aborted' and the agent loop then
|
|
404
|
-
//
|
|
405
|
-
//
|
|
406
|
-
//
|
|
421
|
+
// with stopReason 'error'/'aborted' and the agent loop then hard-exits —
|
|
422
|
+
// previously invisible (Pi 1.2 fires finishTurn there, but our guard
|
|
423
|
+
// ignores error/aborted turns, so turnCount stays frozen, no nudge,
|
|
424
|
+
// generic failure reason). Capture it here so the underlying provider
|
|
425
|
+
// error surfaces loudly (rc-9) instead of a generic message.
|
|
407
426
|
let lastErrorMessage = null;
|
|
408
427
|
let lastStopReason = null;
|
|
409
428
|
let transcript = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artificer-l2-adapter.js","sourceRoot":"","sources":["../../../src/runtime-v2/adapter/artificer-l2-adapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"artificer-l2-adapter.js","sourceRoot":"","sources":["../../../src/runtime-v2/adapter/artificer-l2-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"l2-agent-loop-adapter.d.ts","sourceRoot":"","sources":["../../../src/runtime-v2/adapter/l2-agent-loop-adapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"l2-agent-loop-adapter.d.ts","sourceRoot":"","sources":["../../../src/runtime-v2/adapter/l2-agent-loop-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,10 @@
|
|
|
6
6
|
* completeSimple path in PiAiRuntimeAdapter.
|
|
7
7
|
*
|
|
8
8
|
* Why the low-level runAgentLoop() and not the Agent class (review P0-1):
|
|
9
|
-
* Agent.createLoopConfig() does NOT forward
|
|
10
|
-
*
|
|
11
|
-
*
|
|
9
|
+
* Agent.createLoopConfig() does NOT forward the turn-stop hook (agent.ts,
|
|
10
|
+
* shouldStopAfterTurn in Pi 0.85 / finishTurn in Pi 1.2), which is exactly
|
|
11
|
+
* the hook we need to (a) cap turns and (b) terminate the loop when
|
|
12
|
+
* submit_output captures output. runAgentLoop gives us finishTurn +
|
|
12
13
|
* beforeToolCall + tools + abort signal in one config, and returns the final
|
|
13
14
|
* transcript directly. The Agent class adds steering/followup/session machinery the
|
|
14
15
|
* headless dreamer runner does not need.
|
|
@@ -17,7 +18,7 @@
|
|
|
17
18
|
* agent-loop's shouldTerminateToolBatch uses .every(r => r.result.terminate) over the
|
|
18
19
|
* whole batch (agent-loop.ts:544). If the model calls read_principles + submit_output
|
|
19
20
|
* in the same turn, the batch does not terminate. We instead stop via
|
|
20
|
-
*
|
|
21
|
+
* finishTurn checking the L2OutputCapture, which is turn-granular.
|
|
21
22
|
*
|
|
22
23
|
* Output extraction:
|
|
23
24
|
* 1. Primary: the params captured by the submit_output tool (deterministic, the
|
|
@@ -293,7 +294,14 @@ export class L2AgentLoopAdapter {
|
|
|
293
294
|
const systemPrompt = mergeSystemPromptLayers(input.systemPrompt, toolInstruction, this.config.systemPrompt);
|
|
294
295
|
// L1 fallback variant: base + profile append, NO tool protocol (no tools there).
|
|
295
296
|
const baseSystemPrompt = mergeSystemPromptLayers(input.systemPrompt, this.config.systemPrompt);
|
|
297
|
+
// Pi 1.2 (agent-core 0.86+): AgentContext.systemPrompt is gone — the system
|
|
298
|
+
// prompt rides the transcript as a leading SystemMessage, and runAgentLoop
|
|
299
|
+
// merges the tool declarations into it (declareToolChanges). Seeding it here
|
|
300
|
+
// keeps the PRI-633 layered prompt on the 1.2 loop.
|
|
296
301
|
const prompts = [
|
|
302
|
+
...(systemPrompt !== undefined && systemPrompt.length > 0
|
|
303
|
+
? [{ role: 'system', content: systemPrompt, timestamp: 0 }]
|
|
304
|
+
: []),
|
|
297
305
|
{ role: 'user', content: messageContent, timestamp: Date.now() },
|
|
298
306
|
];
|
|
299
307
|
// Telemetry accumulator shared across all L2 attempts (PRI-420 retry loop).
|
|
@@ -337,16 +345,19 @@ export class L2AgentLoopAdapter {
|
|
|
337
345
|
},
|
|
338
346
|
};
|
|
339
347
|
const tools = buildDreamerL2Tools(toolContext);
|
|
348
|
+
// Pi 1.2: prompts carry the full input (system + user). context.messages
|
|
349
|
+
// MUST stay empty — runAgentLoop builds [...context.messages, ...prompts],
|
|
350
|
+
// so passing prompts here (the 0.85 shape) duplicated the user message in
|
|
351
|
+
// every LLM request.
|
|
340
352
|
const agentContext = {
|
|
341
|
-
|
|
342
|
-
messages: prompts,
|
|
353
|
+
messages: [],
|
|
343
354
|
tools,
|
|
344
355
|
};
|
|
345
356
|
const loopConfig = {
|
|
346
357
|
model: resolveL2Model(this.config.provider, this.config.model, this.config.baseUrl),
|
|
347
358
|
apiKey,
|
|
348
359
|
convertToLlm: (msgs) => msgs.map((m) => {
|
|
349
|
-
if (m.role === 'user' || m.role === 'assistant' || m.role === 'toolResult') {
|
|
360
|
+
if (m.role === 'user' || m.role === 'assistant' || m.role === 'toolResult' || m.role === 'system') {
|
|
350
361
|
return m;
|
|
351
362
|
}
|
|
352
363
|
throw new PDRuntimeError('output_invalid', `L2 convertToLlm encountered an unsupported message role: ${String(m.role)}`);
|
|
@@ -357,9 +368,18 @@ export class L2AgentLoopAdapter {
|
|
|
357
368
|
}
|
|
358
369
|
return undefined;
|
|
359
370
|
},
|
|
360
|
-
|
|
371
|
+
// Pi 1.2 (0.87): finishTurn replaces shouldStopAfterTurn. Semantics that
|
|
372
|
+
// matter here: it ALSO fires on error/aborted turns (0.85 never called
|
|
373
|
+
// the hook there), so guard those first — before turnCount increments —
|
|
374
|
+
// to keep the 0.85 turn accounting and the hard-exit behavior intact.
|
|
375
|
+
finishTurn: (turn) => {
|
|
376
|
+
if (turn.message.stopReason === 'error' || turn.message.stopReason === 'aborted') {
|
|
377
|
+
return undefined;
|
|
378
|
+
}
|
|
361
379
|
turnCount += 1;
|
|
362
|
-
return outputCapture.output !== null || turnCount >= maxTurns
|
|
380
|
+
return outputCapture.output !== null || turnCount >= maxTurns
|
|
381
|
+
? { action: 'end' }
|
|
382
|
+
: undefined;
|
|
363
383
|
},
|
|
364
384
|
};
|
|
365
385
|
let transcript;
|