@akagilnc/pi-workflow-roles 0.1.5368 → 0.1.5375
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/acp-host/production-host.js +719 -776
- package/dist/activation-ledger-git.js +2 -2
- package/dist/activation-ledger-topology.js +1 -7
- package/dist/analyst-entry.js +4 -8
- package/dist/analyst-gate-cycles-read.js +3 -11
- package/dist/analyst-index.js +3 -9
- package/dist/analyst-ledger.js +1 -11
- package/dist/analyst-metric-families/acceptance-success-rework.js +1 -3
- package/dist/analyst-metric-families/round-timeline.js +1 -3
- package/dist/analyst-page.js +2 -2
- package/dist/archivist-record-topology.js +2 -2
- package/dist/audit-escalation.js +2 -1
- package/dist/auditor-soul.js +2 -1
- package/dist/collector-config.js +6 -8
- package/dist/compliance-transport.js +2 -1
- package/dist/countersign-contracts.js +2 -1
- package/dist/diarist-contracts.js +3 -2
- package/dist/doctor-contracts.js +1 -3
- package/dist/doctor-evidence.js +7 -8
- package/dist/dossier-resolution.js +1 -3
- package/dist/engine-detour-usage.js +1 -3
- package/dist/gatekeeper-role.js +2 -9
- package/dist/gleaner-left-contracts.js +2 -1
- package/dist/headless-host/description.js +14 -17
- package/dist/headless-host/production-host.js +721 -780
- package/dist/host-session-record.js +3 -2
- package/dist/inspector-contracts.js +2 -1
- package/dist/ledger-session-read.js +1 -3
- package/dist/merger-contracts.js +9 -9
- package/dist/migrate-book-topology.js +348 -314
- package/dist/navigator-attendance.js +9 -11
- package/dist/navigator-invocation-identity.js +3 -2
- package/dist/navigator-public-session.js +3 -5
- package/dist/navigator-session-contracts.js +8 -10
- package/dist/navigator-work-base.js +5 -8
- package/dist/notary-contracts.js +3 -5
- package/dist/package-contracts/auditor-output.js +1 -3
- package/dist/package-contracts/fixer-packet.js +3 -6
- package/dist/package-contracts/gatekeeper-output.js +1 -3
- package/dist/package-contracts/navigator-output.js +8 -8
- package/dist/package-contracts/terminating-infrastructure.js +5 -9
- package/dist/package-contracts/terminating-tools.js +4 -3
- package/dist/public-cli/analyst-run.js +3 -2
- package/dist/public-cli/auto-resume.js +3 -8
- package/dist/public-cli/cli.js +9 -8
- package/dist/public-cli/config.js +8 -11
- package/dist/public-cli/countersign-run.js +1 -3
- package/dist/public-cli/host-providers.js +7 -14
- package/dist/public-cli/instruction-seat-run.js +4 -3
- package/dist/public-cli/invocation.js +9 -8
- package/dist/public-cli/main.js +1531 -1567
- package/dist/public-cli/post-admission.js +4 -3
- package/dist/public-cli/run-lifecycle.js +14 -26
- package/dist/public-cli/settlement.js +10 -26
- package/dist/public-role-summons.js +3 -2
- package/dist/receipt-delivery-policy.js +1 -3
- package/dist/role-run-placement.js +3 -5
- package/dist/role-run-relocation.js +12 -19
- package/dist/run-terminal-artifacts.js +1 -11
- package/dist/run-ticket-number.js +2 -4
- package/dist/session-assistant-usage.js +2 -1
- package/dist/session-dialogue.js +1 -14
- package/dist/sitian-reader.js +2 -4
- package/dist/submission-correctable-error.js +2 -1
- package/dist/submission-errors.js +2 -1
- package/dist/submission-gate.js +2 -1
- package/dist/submission-ledger.js +4 -5
- package/dist/ticket-provenance-contracts.js +1 -3
- package/dist/ticket-provenance.js +2 -1
- package/dist/typed-provider-http.js +4 -7
- package/dist/unknown-value.js +28 -0
- package/dist/user-dialogue-stdin.js +2 -1
- package/package.json +1 -1
- package/src/acp-host/role-turn-host.ts +4 -2
- package/src/activation-ledger-git.ts +3 -2
- package/src/activation-ledger-topology.ts +4 -12
- package/src/analyst-entry.ts +3 -11
- package/src/analyst-gate-cycles-read.ts +3 -15
- package/src/analyst-index.ts +3 -13
- package/src/analyst-ledger.ts +2 -16
- package/src/analyst-metric-families/acceptance-success-rework.ts +2 -4
- package/src/analyst-metric-families/round-timeline.ts +2 -4
- package/src/analyst-page.ts +2 -2
- package/src/archivist-record-topology.ts +2 -2
- package/src/audit-escalation.ts +2 -1
- package/src/auditor-soul.ts +3 -1
- package/src/book-topology-migration-placement.ts +5 -16
- package/src/book-topology-migrators-t11.ts +16 -15
- package/src/book-topology-mixed-volume-migrators.ts +3 -6
- package/src/book-topology-record-class-migrators.ts +7 -10
- package/src/book-topology-runs-migrator.ts +4 -3
- package/src/collector-config.ts +7 -9
- package/src/compliance-transport.ts +2 -1
- package/src/countersign-contracts.ts +2 -1
- package/src/diarist-contracts.ts +3 -2
- package/src/doctor-contracts.ts +3 -1
- package/src/doctor-evidence.ts +8 -7
- package/src/doctor-role.ts +4 -2
- package/src/dossier-resolution.ts +2 -4
- package/src/engine-detour-tool.ts +0 -2
- package/src/engine-detour-usage.ts +2 -4
- package/src/external-host-turn-loop.ts +3 -1
- package/src/factory-board.ts +1 -8
- package/src/gatekeeper-role.ts +2 -10
- package/src/gleaner-left-contracts.ts +3 -1
- package/src/headless-host/description.ts +15 -18
- package/src/headless-host/role-turn-host.ts +10 -9
- package/src/host-session-record.ts +4 -2
- package/src/inspector-contracts.ts +2 -1
- package/src/ledger-session-read.ts +2 -5
- package/src/merger-contracts.ts +10 -9
- package/src/navigator-attendance.ts +10 -12
- package/src/navigator-invocation-identity.ts +3 -2
- package/src/navigator-public-session.ts +4 -6
- package/src/navigator-session-contracts.ts +8 -11
- package/src/navigator-work-base.ts +5 -8
- package/src/navigator-work-context.ts +2 -1
- package/src/notary-contracts.ts +4 -6
- package/src/oauth-keepalive.ts +5 -18
- package/src/package-contracts/auditor-output.ts +2 -4
- package/src/package-contracts/fixer-packet.ts +4 -6
- package/src/package-contracts/gatekeeper-output.ts +2 -4
- package/src/package-contracts/judge-output.ts +0 -1
- package/src/package-contracts/navigator-output.ts +8 -8
- package/src/package-contracts/terminating-infrastructure.ts +6 -20
- package/src/package-contracts/terminating-tools.ts +8 -12
- package/src/pi/adapter.ts +0 -1
- package/src/pi/role-turn-host.ts +0 -1
- package/src/public-cli/analyst-run.ts +4 -2
- package/src/public-cli/auto-resume.ts +4 -11
- package/src/public-cli/cli.ts +10 -10
- package/src/public-cli/config.ts +8 -27
- package/src/public-cli/countersign-run.ts +2 -4
- package/src/public-cli/host-providers.ts +10 -27
- package/src/public-cli/instruction-seat-run.ts +5 -3
- package/src/public-cli/invocation.ts +11 -10
- package/src/public-cli/post-admission.ts +5 -3
- package/src/public-cli/run-lifecycle.ts +20 -41
- package/src/public-cli/settlement.ts +11 -33
- package/src/public-role-summons.ts +4 -3
- package/src/receipt-delivery-policy.ts +1 -4
- package/src/reviewer-role.ts +0 -1
- package/src/role-envelope.ts +5 -3
- package/src/role-run-placement.ts +4 -10
- package/src/role-run-relocation.ts +13 -23
- package/src/role-runtime.ts +9 -15
- package/src/run-terminal-artifacts.ts +2 -16
- package/src/run-ticket-number.ts +4 -10
- package/src/session-assistant-usage.ts +3 -1
- package/src/session-dialogue.ts +1 -4
- package/src/session-identity.ts +0 -1
- package/src/sitian-reader.ts +2 -4
- package/src/submission-correctable-error.ts +3 -1
- package/src/submission-errors.ts +2 -1
- package/src/submission-gate.ts +3 -1
- package/src/submission-ledger.ts +5 -6
- package/src/ticket-provenance-contracts.ts +1 -4
- package/src/ticket-provenance.ts +3 -1
- package/src/ticket-snapshot.ts +2 -4
- package/src/ticket-trajectory.ts +1 -8
- package/src/typed-provider-http.ts +5 -15
- package/src/unknown-value.ts +34 -0
- package/src/user-dialogue-stdin.ts +3 -1
- package/src/worker-role.ts +2 -5
- package/src/worker-submission-gates.ts +5 -7
|
@@ -17,12 +17,13 @@ import {
|
|
|
17
17
|
import {
|
|
18
18
|
bookHistoricalRoots,
|
|
19
19
|
findPlacedMigratingRun,
|
|
20
|
-
isMigrationEnoent,
|
|
21
20
|
listMigrationBookKeys,
|
|
22
21
|
listMigrationDirents,
|
|
23
22
|
runRefFromBoundPath,
|
|
24
23
|
} from "./book-topology-migration-placement.ts";
|
|
25
24
|
|
|
25
|
+
import { isRecord, isEnoent } from "./unknown-value.ts";
|
|
26
|
+
|
|
26
27
|
const SITIAN_MIXED_VOLUME_PARTITIONS = [
|
|
27
28
|
"attendance",
|
|
28
29
|
"auditor",
|
|
@@ -32,10 +33,6 @@ const SITIAN_MIXED_VOLUME_PARTITIONS = [
|
|
|
32
33
|
|
|
33
34
|
const CURRENT_SESSION_LEDGER = "current-session.json";
|
|
34
35
|
|
|
35
|
-
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
36
|
-
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
37
|
-
}
|
|
38
|
-
|
|
39
36
|
function posixRelative(from: string, to: string): string {
|
|
40
37
|
return relative(from, to).split(sep).join("/");
|
|
41
38
|
}
|
|
@@ -98,7 +95,7 @@ async function readRegularBackupFile(path: string): Promise<string | undefined>
|
|
|
98
95
|
try {
|
|
99
96
|
info = await lstat(path);
|
|
100
97
|
} catch (error) {
|
|
101
|
-
if (
|
|
98
|
+
if (isEnoent(error)) return undefined;
|
|
102
99
|
throw error;
|
|
103
100
|
}
|
|
104
101
|
if (!info.isFile()) {
|
|
@@ -9,7 +9,6 @@
|
|
|
9
9
|
* - malformed → unbound with exact bytes + malformedRows entry
|
|
10
10
|
* - misplaced: any foreign jsonl whose kind is one of the three classes
|
|
11
11
|
*/
|
|
12
|
-
import { createHash } from "node:crypto";
|
|
13
12
|
import { appendFile, mkdir, readFile, stat, writeFile } from "node:fs/promises";
|
|
14
13
|
import { dirname, join, relative, sep } from "node:path";
|
|
15
14
|
|
|
@@ -18,7 +17,6 @@ import {
|
|
|
18
17
|
findBookRunDirectory,
|
|
19
18
|
findPlacedMigratingRun,
|
|
20
19
|
findUniquePrincipalPlacedRun,
|
|
21
|
-
isMigrationEnoent,
|
|
22
20
|
isTicketNumberString,
|
|
23
21
|
listMigrationBookKeys,
|
|
24
22
|
listMigrationDirents,
|
|
@@ -36,6 +34,9 @@ import {
|
|
|
36
34
|
import { S4_SUBMISSION_LEDGER_KINDS } from "./sitian-appender.ts";
|
|
37
35
|
import { projectTicketProvenanceHeader } from "./ticket-provenance-contracts.ts";
|
|
38
36
|
|
|
37
|
+
import { sha256Hex } from "./sha256.ts";
|
|
38
|
+
import { isRecord, isEnoent } from "./unknown-value.ts";
|
|
39
|
+
|
|
39
40
|
const TICKET_PROVENANCE = "ticket-provenance";
|
|
40
41
|
const SUBMISSION_LEDGER = "submission-ledger";
|
|
41
42
|
const ATTEMPT_HISTORY = "attempt-history";
|
|
@@ -47,10 +48,6 @@ type JsonLine =
|
|
|
47
48
|
| { readonly ok: true; readonly value: Record<string, unknown>; readonly raw: string }
|
|
48
49
|
| { readonly ok: false; readonly raw: string };
|
|
49
50
|
|
|
50
|
-
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
51
|
-
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
52
|
-
}
|
|
53
|
-
|
|
54
51
|
function parseJsonlLine(raw: string): JsonLine {
|
|
55
52
|
try {
|
|
56
53
|
const value: unknown = JSON.parse(raw);
|
|
@@ -70,7 +67,7 @@ function lineSource(backupBooksDirectory: string, filePath: string, index: numbe
|
|
|
70
67
|
}
|
|
71
68
|
|
|
72
69
|
function stableKey(material: string): string {
|
|
73
|
-
return
|
|
70
|
+
return sha256Hex(material).slice(0, 32);
|
|
74
71
|
}
|
|
75
72
|
|
|
76
73
|
async function readJsonlLines(filePath: string): Promise<readonly string[]> {
|
|
@@ -78,7 +75,7 @@ async function readJsonlLines(filePath: string): Promise<readonly string[]> {
|
|
|
78
75
|
try {
|
|
79
76
|
text = await readFile(filePath, "utf8");
|
|
80
77
|
} catch (error) {
|
|
81
|
-
if (
|
|
78
|
+
if (isEnoent(error)) return [];
|
|
82
79
|
throw error;
|
|
83
80
|
}
|
|
84
81
|
if (text.length === 0) return [];
|
|
@@ -629,7 +626,7 @@ async function mergeOfferedIdentities(
|
|
|
629
626
|
await stat(from);
|
|
630
627
|
lines = await readJsonlLines(from);
|
|
631
628
|
} catch (error) {
|
|
632
|
-
if (
|
|
629
|
+
if (isEnoent(error)) return;
|
|
633
630
|
throw error;
|
|
634
631
|
}
|
|
635
632
|
const destFile = join(destDir, OFFERED_IDENTITIES);
|
|
@@ -704,7 +701,7 @@ async function migrateHomePartitionBook(
|
|
|
704
701
|
try {
|
|
705
702
|
await stat(recordsFile);
|
|
706
703
|
} catch (error) {
|
|
707
|
-
if (
|
|
704
|
+
if (isEnoent(error)) continue;
|
|
708
705
|
throw error;
|
|
709
706
|
}
|
|
710
707
|
await migrateJsonlFileByKind(context, bookKey, writes, recordsFile, TICKET_PROVENANCE, outcomes);
|
|
@@ -10,7 +10,6 @@ import { basename, dirname, join, relative, sep } from "node:path";
|
|
|
10
10
|
|
|
11
11
|
import {
|
|
12
12
|
destinationRunDirectory,
|
|
13
|
-
isMigrationEnoent,
|
|
14
13
|
isTicketNumberString,
|
|
15
14
|
listBackupRunLeaves,
|
|
16
15
|
listMigrationBookKeys,
|
|
@@ -32,6 +31,8 @@ import {
|
|
|
32
31
|
readBoardTicketNumber,
|
|
33
32
|
} from "./run-ticket-number.ts";
|
|
34
33
|
|
|
34
|
+
import { isEnoent } from "./unknown-value.ts";
|
|
35
|
+
|
|
35
36
|
const RUNS_PARTITION = "runs";
|
|
36
37
|
|
|
37
38
|
const RUN_LEAF =
|
|
@@ -62,7 +63,7 @@ async function pathExists(path: string): Promise<boolean> {
|
|
|
62
63
|
await stat(path);
|
|
63
64
|
return true;
|
|
64
65
|
} catch (error) {
|
|
65
|
-
if (
|
|
66
|
+
if (isEnoent(error)) return false;
|
|
66
67
|
throw error;
|
|
67
68
|
}
|
|
68
69
|
}
|
|
@@ -307,7 +308,7 @@ export async function relocateBoardBoundUnboundRunsInBook(
|
|
|
307
308
|
try {
|
|
308
309
|
entries = await readdir(unboundRuns, { withFileTypes: true });
|
|
309
310
|
} catch (error) {
|
|
310
|
-
if (
|
|
311
|
+
if (isEnoent(error)) return [];
|
|
311
312
|
throw error;
|
|
312
313
|
}
|
|
313
314
|
|
package/src/collector-config.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import { createHash } from "node:crypto";
|
|
2
1
|
import { readFile } from "node:fs/promises";
|
|
3
2
|
|
|
3
|
+
import { sha256Hex } from "./sha256.ts";
|
|
4
|
+
import { isRecord } from "./unknown-value.ts";
|
|
5
|
+
|
|
4
6
|
export const COLLECTOR_OWNER_PATTERN = /^[A-Za-z0-9](?:[A-Za-z0-9-]{0,37}[A-Za-z0-9])?$/;
|
|
5
7
|
export const COLLECTOR_REPO_PATTERN = /^[A-Za-z0-9](?:[A-Za-z0-9._-]{0,98}[A-Za-z0-9])?$/;
|
|
6
8
|
|
|
@@ -51,17 +53,13 @@ export function parseCollectorPrNumber(raw: unknown): number {
|
|
|
51
53
|
return value;
|
|
52
54
|
}
|
|
53
55
|
|
|
54
|
-
function record(value: unknown): value is Record<string, unknown> {
|
|
55
|
-
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
56
|
-
}
|
|
57
|
-
|
|
58
56
|
function canonicalManifest(requests: readonly CollectorRequestConfig[]): string {
|
|
59
57
|
return `${JSON.stringify({ requests: requests.map((request) => ({ id: request.id, body: request.requestBody })) })}\n`;
|
|
60
58
|
}
|
|
61
59
|
|
|
62
60
|
export function emptyCollectorManifest(): CollectorManifest {
|
|
63
61
|
const canonicalJson = canonicalManifest([]);
|
|
64
|
-
return { requests: [], canonicalJson, digest:
|
|
62
|
+
return { requests: [], canonicalJson, digest: sha256Hex(canonicalJson) };
|
|
65
63
|
}
|
|
66
64
|
|
|
67
65
|
/** Optional request configuration. It names requests, never expected observers. */
|
|
@@ -70,17 +68,17 @@ export async function loadCollectorManifest(path: string): Promise<CollectorMani
|
|
|
70
68
|
try { bytes = await readFile(path); } catch (error) { fail(`Collector request manifest is unreadable at ${path}`, error); }
|
|
71
69
|
let parsed: unknown;
|
|
72
70
|
try { parsed = JSON.parse(new TextDecoder("utf-8", { fatal: true }).decode(bytes)); } catch (error) { fail("Collector request manifest must be UTF-8 JSON", error); }
|
|
73
|
-
if (!
|
|
71
|
+
if (!isRecord(parsed)) fail("Collector request manifest must be an object");
|
|
74
72
|
const rawRequests = parsed.requests ?? [];
|
|
75
73
|
if (!Array.isArray(rawRequests)) fail("Collector request manifest requests must be an array");
|
|
76
74
|
const requests: CollectorRequestConfig[] = [];
|
|
77
75
|
const ids = new Set<string>();
|
|
78
76
|
for (const [index, item] of rawRequests.entries()) {
|
|
79
|
-
if (!
|
|
77
|
+
if (!isRecord(item) || typeof item.id !== "string" || item.id.length === 0 || typeof item.body !== "string" || item.body.trim() === "") fail(`Collector request manifest requests[${index}] is invalid`);
|
|
80
78
|
if (ids.has(item.id)) fail(`Collector request manifest has duplicate request id "${item.id}"`);
|
|
81
79
|
ids.add(item.id);
|
|
82
80
|
requests.push({ id: item.id, requestBody: item.body });
|
|
83
81
|
}
|
|
84
82
|
const canonicalJson = canonicalManifest(requests);
|
|
85
|
-
return { requests, canonicalJson, digest:
|
|
83
|
+
return { requests, canonicalJson, digest: sha256Hex(canonicalJson), sourcePath: path };
|
|
86
84
|
}
|
|
@@ -8,6 +8,7 @@ import { officerConclusionReask } from "./gatekeeper-role.ts";
|
|
|
8
8
|
import { receivedDiscriminator } from "./submission-errors.ts";
|
|
9
9
|
import { coalesceSubmissionRows } from "./public-cli/terminal.ts";
|
|
10
10
|
import { readableGateItem } from "./readable-gate-item.ts";
|
|
11
|
+
import { isRecord } from "./unknown-value.ts";
|
|
11
12
|
|
|
12
13
|
export type ComplianceNoReceipt = NoReceiptLifecycleFacts & { status: "no-receipt"; usage?: Usage };
|
|
13
14
|
/**
|
|
@@ -63,7 +64,7 @@ function readListField(value: unknown): readonly unknown[] { return Array.isArra
|
|
|
63
64
|
|
|
64
65
|
/** Try to project a known three-state compliance decision; undefined when not converged/continue/escalate. */
|
|
65
66
|
export function tryReadComplianceCandidate(arguments_: unknown, usage?: Usage): ComplianceDecision | undefined {
|
|
66
|
-
if (
|
|
67
|
+
if (!isRecord(arguments_)) {
|
|
67
68
|
return undefined;
|
|
68
69
|
}
|
|
69
70
|
const args = arguments_ as Record<string, unknown>;
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
import { REVIEW_QUEUE_STATUSES, REVIEW_SUBMISSION_OUTPUT_TOOL_NAME } from "./review-submission.ts";
|
|
9
|
+
import { isRecord } from "./unknown-value.ts";
|
|
9
10
|
|
|
10
11
|
export const COUNTERSIGN_OUTPUT_TOOL_NAME = REVIEW_SUBMISSION_OUTPUT_TOOL_NAME;
|
|
11
12
|
|
|
@@ -25,7 +26,7 @@ export type CountersignVerdict =
|
|
|
25
26
|
};
|
|
26
27
|
|
|
27
28
|
export function validateRecordedCountersignOutput(verdict: unknown): CountersignVerdict {
|
|
28
|
-
if (
|
|
29
|
+
if (!isRecord(verdict)) {
|
|
29
30
|
throw new Error("Countersign verdict has no execution discriminator");
|
|
30
31
|
}
|
|
31
32
|
let status: unknown;
|
package/src/diarist-contracts.ts
CHANGED
|
@@ -12,6 +12,7 @@ import {
|
|
|
12
12
|
type TicketProvenanceSession,
|
|
13
13
|
} from "./ticket-provenance-contracts.ts";
|
|
14
14
|
import { isSafePositiveTicketNumber } from "./run-ticket-number.ts";
|
|
15
|
+
import { isRecord } from "./unknown-value.ts";
|
|
15
16
|
|
|
16
17
|
export const DIARIST_OUTPUT_TOOL_NAME = "ak_diarist_output";
|
|
17
18
|
|
|
@@ -43,7 +44,7 @@ export type DiaristOutput =
|
|
|
43
44
|
};
|
|
44
45
|
|
|
45
46
|
export function validateRecordedDiaristOutput(value: unknown): DiaristOutput {
|
|
46
|
-
if (
|
|
47
|
+
if (!isRecord(value)) {
|
|
47
48
|
throw new Error("Diarist output has no execution discriminator");
|
|
48
49
|
}
|
|
49
50
|
let status: unknown;
|
|
@@ -78,7 +79,7 @@ export function projectDiaristTicketSessions(
|
|
|
78
79
|
if (!Array.isArray(raw)) return undefined;
|
|
79
80
|
const perTicket = new Map<number, TicketProvenanceSession[]>();
|
|
80
81
|
for (const entry of raw) {
|
|
81
|
-
if (
|
|
82
|
+
if (!isRecord(entry)) return undefined;
|
|
82
83
|
const { ticketNumber, sessions: rawSessions } = entry as Record<string, unknown>;
|
|
83
84
|
if (!isSafePositiveTicketNumber(ticketNumber)) return undefined;
|
|
84
85
|
const sessions = projectTicketProvenanceSessions(rawSessions);
|
package/src/doctor-contracts.ts
CHANGED
|
@@ -3,6 +3,8 @@ import { canonicalJson } from "./canonical-json.ts";
|
|
|
3
3
|
import { openToolObject } from "./open-tool-schema.ts";
|
|
4
4
|
import { withTerminatingOutputDeclarations } from "./package-contracts/terminating-infrastructure.ts";
|
|
5
5
|
|
|
6
|
+
import { isRecord } from "./unknown-value.ts";
|
|
7
|
+
|
|
6
8
|
export const DOCTOR_EVIDENCE_TOOL_NAME = "ak_doctor_evidence";
|
|
7
9
|
export const DOCTOR_OUTPUT_TOOL_NAME = "ak_doctor_output";
|
|
8
10
|
export const DOCTOR_AUDIT_TOOL_NAME = "ak_doctor_audit_decision";
|
|
@@ -85,7 +87,7 @@ export const doctorSubmissionSchema = withTerminatingOutputDeclarations(
|
|
|
85
87
|
// consumes extra fields, so a closed object only rejects the role for saying more.
|
|
86
88
|
export const doctorEvidenceReadSchema = Type.Object({ evidenceId: Type.String({ minLength: 1, description: "待读留存证据标识" }), offset: Type.Optional(Type.Integer({ minimum: 0, description: "起始字节偏移(从 0 计)" })), limit: Type.Optional(Type.Integer({ minimum: 1, description: "返回字节数(无上限)" })) }, { additionalProperties: true });
|
|
87
89
|
export class DoctorSubmissionContractError extends Error { override readonly name = "DoctorSubmissionContractError"; }
|
|
88
|
-
|
|
90
|
+
|
|
89
91
|
function read(value: unknown, key: string): unknown { if (!isRecord(value)) return undefined; try { return value[key]; } catch { return undefined; } }
|
|
90
92
|
export function validateDoctorSubmissionShape(value: unknown): DoctorSubmission {
|
|
91
93
|
return value as DoctorSubmission;
|
package/src/doctor-evidence.ts
CHANGED
|
@@ -4,26 +4,27 @@ import { sha256Hex } from "./sha256.ts";
|
|
|
4
4
|
import type { DoctorCase, DoctorCaseCost, DoctorCount, DoctorEvidenceEntry } from "./doctor-contracts.ts";
|
|
5
5
|
import { AcceptedDetailsContractError, acceptedFacts, isTerminatingToolName, validateAcceptedDetails } from "./package-contracts/terminating-tools.ts";
|
|
6
6
|
|
|
7
|
-
|
|
7
|
+
import { isRecord, isMissingPathError } from "./unknown-value.ts";
|
|
8
|
+
|
|
8
9
|
async function discoverCaseFiles(root: string): Promise<string[]> { const found: string[] = []; async function walk(dir: string, depth: number) { for (const item of await readdir(dir, { withFileTypes: true })) { const path = resolve(dir, item.name); if (item.isDirectory()) { await walk(path, depth + 1); } else if (item.isFile() && (item.name.endsWith(".jsonl") || (item.name === "stderr.log" && depth === 1))) found.push(path); } } await walk(root, 0); return found.sort(); }
|
|
9
10
|
function sourceList(count: number, sources: string[]) { return { count, sources: [...new Set(sources)].sort() }; }
|
|
10
11
|
function accumulate(metric: DoctorCount, value: number, source: string) { metric.count += value; if (value) metric.sources.push(source); }
|
|
11
12
|
function timestamp(row: Record<string, unknown>) { return typeof row.timestamp === "string" && Number.isFinite(Date.parse(row.timestamp)) ? row.timestamp : undefined; }
|
|
12
|
-
|
|
13
|
+
|
|
13
14
|
async function stableRunsIdentity(root: string): Promise<string> { let cursor = root; while (true) { try { const git = await stat(resolve(cursor, ".git")); if (git.isDirectory() || git.isFile()) return relative(cursor, root).split(sep).join("/"); } catch (error) { if (!isMissingPathError(error)) throw error; } const parent = dirname(cursor); if (parent === cursor) return root; cursor = parent; } }
|
|
14
15
|
|
|
15
16
|
type SessionDerivation = { session: DoctorCaseCost["sessions"][number]; turns: number; calls: number; tokens: number; statuses: DoctorCaseCost["statuses"]; commits: DoctorCaseCost["commits"] };
|
|
16
17
|
function deriveSession(content: string, id: string): SessionDerivation {
|
|
17
18
|
const rows: Record<string, unknown>[] = []; const degradationReasons: string[] = [];
|
|
18
|
-
for (const line of content.split("\n")) if (line.trim()) { try { const row: unknown = JSON.parse(line); if (!
|
|
19
|
+
for (const line of content.split("\n")) if (line.trim()) { try { const row: unknown = JSON.parse(line); if (!isRecord(row)) { degradationReasons.push(`non-object session row in ${id}`); break; } rows.push(row); } catch (error) { if (error instanceof SyntaxError) { degradationReasons.push(`malformed JSON tail in ${id}: ${error.message}`); break; } throw error; } }
|
|
19
20
|
const started = rows.find((row) => row.type === "session"); const startedAt = started && timestamp(started); if (!startedAt) degradationReasons.push(`Pi session header is missing: ${id}`);
|
|
20
21
|
let accepted: Record<string, unknown> | undefined, observedCommit: string | undefined, turns = 0, calls = 0, tokens = 0;
|
|
21
22
|
const statuses: DoctorCaseCost["statuses"] = [], commits: DoctorCaseCost["commits"] = [];
|
|
22
23
|
for (const row of rows) {
|
|
23
|
-
if (row.type === "custom" && row.customType === "ak-role-submission-closure" &&
|
|
24
|
-
const message =
|
|
25
|
-
if (message?.role === "assistant") { for (const part of Array.isArray(message.content) ? message.content : []) if (
|
|
26
|
-
if (message?.role === "toolResult" && message.isError !== true && typeof message.toolName === "string" && isTerminatingToolName(message.toolName) &&
|
|
24
|
+
if (row.type === "custom" && row.customType === "ak-role-submission-closure" && isRecord(row.data) && row.data.isError === false && typeof row.data.toolName === "string" && isTerminatingToolName(row.data.toolName)) accepted = row;
|
|
25
|
+
const message = isRecord(row.message) ? row.message : undefined;
|
|
26
|
+
if (message?.role === "assistant") { for (const part of Array.isArray(message.content) ? message.content : []) if (isRecord(part) && part.type === "toolCall") calls++; if (typeof message.responseId === "string") { turns++; const usage = isRecord(message.usage) ? message.usage : undefined; if (usage && typeof usage.output === "number") tokens += usage.output; } }
|
|
27
|
+
if (message?.role === "toolResult" && message.isError !== true && typeof message.toolName === "string" && isTerminatingToolName(message.toolName) && isRecord(message.details)) { let details; try { details = validateAcceptedDetails(message.toolName, message.details); } catch (error) { // Contract: README.md#Doctor — non-accepted terminating receipts are expected-negative evidence and are skipped; all other validation failures propagate with their cause.
|
|
27
28
|
if (error instanceof AcceptedDetailsContractError) continue; throw error; } const facts = acceptedFacts(message.toolName, details); if (facts.commit && facts.commit !== observedCommit) { commits.push({ source: id, commit: facts.commit }); observedCommit = facts.commit; } /* #836 B10.3: do not wipe earlier statuses or invent a code status sentence */ if (facts.status !== undefined) { statuses.push({ source: id, status: facts.status }); } }
|
|
28
29
|
}
|
|
29
30
|
const acceptedAt = accepted && timestamp(accepted); const final = acceptedAt ? accepted! : rows.at(-1); const endedAt = final && timestamp(final); const wall = startedAt && endedAt ? Date.parse(endedAt) - Date.parse(startedAt) : undefined;
|
package/src/doctor-role.ts
CHANGED
|
@@ -5,6 +5,8 @@ import { DOCTOR_EVIDENCE_TOOL_NAME, DOCTOR_OUTPUT_TOOL_DESCRIPTION, DOCTOR_OUTPU
|
|
|
5
5
|
|
|
6
6
|
import { sitianReport } from "./sitian-facade.ts";
|
|
7
7
|
|
|
8
|
+
import { errorText } from "./unknown-value.ts";
|
|
9
|
+
|
|
8
10
|
export { DOCTOR_EVIDENCE_TOOL_NAME, DOCTOR_OUTPUT_TOOL_NAME };
|
|
9
11
|
export const DOCTOR_CASE_FLAG = { name: "ak-doctor-case", definition: { description: "Retained .ak-roles/books/<book>/<n>/runs directory", type: "string" as const } } as const;
|
|
10
12
|
export type DoctorRoleDependencies = { loadSoul(): Promise<string>; loadCase(path: string): Promise<DoctorCase> };
|
|
@@ -19,14 +21,14 @@ function appendCandidate(ctx: HostContext, data: unknown): void {
|
|
|
19
21
|
source: "doctor-role",
|
|
20
22
|
});
|
|
21
23
|
} catch (error) {
|
|
22
|
-
throw new ComplianceResponseRetentionError(`太医署候选留存失败: ${
|
|
24
|
+
throw new ComplianceResponseRetentionError(`太医署候选留存失败: ${errorText(error)}`, { cause: error });
|
|
23
25
|
}
|
|
24
26
|
const append = ctx.sessionManager.appendCustomEntry;
|
|
25
27
|
if (typeof append === "function") {
|
|
26
28
|
try {
|
|
27
29
|
append.call(ctx.sessionManager, DOCTOR_CANDIDATE_ENTRY_TYPE, data);
|
|
28
30
|
} catch (error) {
|
|
29
|
-
throw new ComplianceResponseRetentionError(`太医署候选留存失败: ${
|
|
31
|
+
throw new ComplianceResponseRetentionError(`太医署候选留存失败: ${errorText(error)}`, { cause: error });
|
|
30
32
|
}
|
|
31
33
|
}
|
|
32
34
|
}
|
|
@@ -9,6 +9,8 @@ import { resolve } from "node:path";
|
|
|
9
9
|
|
|
10
10
|
import { runDirectoryFromHostContext, type HostContext } from "./host-contracts.ts";
|
|
11
11
|
|
|
12
|
+
import { isRecord } from "./unknown-value.ts";
|
|
13
|
+
|
|
12
14
|
export const AUDIT_RUN_DIR_ENV = "AK_ROLE_RUN_DIR" as const;
|
|
13
15
|
export const DOCTOR_CANDIDATE_ENTRY_TYPE = "ak_doctor_audit_candidate" as const;
|
|
14
16
|
|
|
@@ -77,10 +79,6 @@ export function resolveAuditDossier(
|
|
|
77
79
|
return { status: "ok", runDirectory };
|
|
78
80
|
}
|
|
79
81
|
|
|
80
|
-
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
81
|
-
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
82
|
-
}
|
|
83
|
-
|
|
84
82
|
type AuditSubjectContext = { sessionManager: { getEntries?(): Iterable<unknown> } };
|
|
85
83
|
|
|
86
84
|
/**
|
|
@@ -22,8 +22,6 @@ import {
|
|
|
22
22
|
} from "./engine-detour-usage.ts";
|
|
23
23
|
import { runIdFromRunDirectory } from "./run-terminal-artifacts.ts";
|
|
24
24
|
|
|
25
|
-
|
|
26
|
-
|
|
27
25
|
// #836 r16 class 3: argv required/minItems/element-minLength stay — execute()
|
|
28
26
|
// must obtain the first item as the executable and spawn it (below; #82-98).
|
|
29
27
|
// Root additionalProperties:false is deleted — execute() reads only `argv`.
|
|
@@ -27,6 +27,8 @@ import {
|
|
|
27
27
|
type RecordPointer,
|
|
28
28
|
} from "./sitian-facade.ts";
|
|
29
29
|
|
|
30
|
+
import { isRecord } from "./unknown-value.ts";
|
|
31
|
+
|
|
30
32
|
/** Sitian event kind for one detour-tool call (volume under session/). */
|
|
31
33
|
export const ENGINE_DETOUR_CALL_KIND = "engine-detour-call" as const;
|
|
32
34
|
|
|
@@ -155,10 +157,6 @@ export function reportEngineDetourCall(
|
|
|
155
157
|
};
|
|
156
158
|
}
|
|
157
159
|
|
|
158
|
-
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
159
|
-
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
160
|
-
}
|
|
161
|
-
|
|
162
160
|
function callFactFromSitianPayload(
|
|
163
161
|
payload: unknown,
|
|
164
162
|
pointer: RecordPointer,
|
|
@@ -11,6 +11,8 @@ import type {
|
|
|
11
11
|
} from "./host-contracts.ts";
|
|
12
12
|
import type { PreparedRoleTurn } from "./prepared-role-turn.ts";
|
|
13
13
|
|
|
14
|
+
import { errorText } from "./unknown-value.ts";
|
|
15
|
+
|
|
14
16
|
export const EXTERNAL_ROLE_TURN_ROUND_LIMIT = 8 as const;
|
|
15
17
|
|
|
16
18
|
export type ExternalPreparedTurn = Pick<PreparedRoleTurn, "prompt" | "abortSignal" | "closeRound">;
|
|
@@ -103,7 +105,7 @@ export function withExternalHostCleanupFailure(
|
|
|
103
105
|
cleanupError: unknown,
|
|
104
106
|
name: string,
|
|
105
107
|
): RoleTurnResult {
|
|
106
|
-
const message =
|
|
108
|
+
const message = errorText(cleanupError);
|
|
107
109
|
if (outcome.knownFailure === undefined) {
|
|
108
110
|
return externalHostFailure("session", name, "dispose-failed", { cleanupError: message }, message);
|
|
109
111
|
}
|
package/src/factory-board.ts
CHANGED
|
@@ -41,6 +41,7 @@ import {
|
|
|
41
41
|
} from "./ticket-trajectory.ts";
|
|
42
42
|
import type { BoardSnapshot, SnapshotTicket, TicketIssueState } from "./ticket-snapshot.ts";
|
|
43
43
|
|
|
44
|
+
import { isRecord, isMissingPathError } from "./unknown-value.ts";
|
|
44
45
|
|
|
45
46
|
/** Unaccepted latest-run mtime bands (page-visible thresholds). */
|
|
46
47
|
export const UNACCEPTED_FLYING_MS = 2 * 60 * 1000;
|
|
@@ -308,14 +309,6 @@ function currentStateLabel(state: TicketCurrentState): string {
|
|
|
308
309
|
}
|
|
309
310
|
}
|
|
310
311
|
|
|
311
|
-
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
312
|
-
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
313
|
-
}
|
|
314
|
-
|
|
315
|
-
function isMissingPathError(error: unknown): boolean {
|
|
316
|
-
return error instanceof Error && "code" in error && (error.code === "ENOENT" || error.code === "ENOTDIR");
|
|
317
|
-
}
|
|
318
|
-
|
|
319
312
|
function escapeHtml(text: string): string {
|
|
320
313
|
return text
|
|
321
314
|
.replaceAll("&", "&")
|
package/src/gatekeeper-role.ts
CHANGED
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
import type { PublicSummonResult } from "./public-role-summons.ts";
|
|
15
15
|
import type { TerminalResult } from "./public-cli/terminal.ts";
|
|
16
16
|
import { runIdFromRunDirectory } from "./run-terminal-artifacts.ts";
|
|
17
|
+
import { isRecord } from "./unknown-value.ts";
|
|
17
18
|
export const INSPECTOR_OUTPUT_TOOL = INSPECTOR_OUTPUT_TOOL_NAME;
|
|
18
19
|
export const NOTARY_OUTPUT_TOOL = REVIEW_SUBMISSION_OUTPUT_TOOL_NAME;
|
|
19
20
|
|
|
@@ -174,20 +175,11 @@ function failureReason(error: unknown): string {
|
|
|
174
175
|
return error instanceof Error ? `${error.name}: ${error.message}` : String(error);
|
|
175
176
|
}
|
|
176
177
|
|
|
177
|
-
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
178
|
-
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
179
|
-
}
|
|
180
|
-
|
|
181
178
|
/** Original decision bytes — no sentinel replacement (#836). */
|
|
182
179
|
function retainedReceipt(decision: unknown): unknown {
|
|
183
180
|
return decision;
|
|
184
181
|
}
|
|
185
182
|
|
|
186
|
-
function readRecord(value: unknown): Record<string, unknown> | undefined {
|
|
187
|
-
if (typeof value !== "object" || value === null || Array.isArray(value)) return undefined;
|
|
188
|
-
return value as Record<string, unknown>;
|
|
189
|
-
}
|
|
190
|
-
|
|
191
183
|
/**
|
|
192
184
|
* Read only the conclusion field for queueing (#753).
|
|
193
185
|
* converged | continue | escalate → queue signal + raw receipt.
|
|
@@ -206,7 +198,7 @@ function projectOfficerDecision(
|
|
|
206
198
|
fallbackStatus?: string,
|
|
207
199
|
): GatekeeperResult {
|
|
208
200
|
const receipt = retainedReceipt(decision);
|
|
209
|
-
const record =
|
|
201
|
+
const record = isRecord(decision) ? decision : undefined;
|
|
210
202
|
const status =
|
|
211
203
|
(record !== undefined && typeof record.status === "string" ? record.status : undefined)
|
|
212
204
|
?? fallbackStatus;
|
|
@@ -4,6 +4,8 @@
|
|
|
4
4
|
* No bounce / verdict channel (言不为狱). 原卷保真 (ADR 0055).
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
+
import { isRecord } from "./unknown-value.ts";
|
|
8
|
+
|
|
7
9
|
export const GLEANER_LEFT_OUTPUT_TOOL_NAME = "ak_gleaner_left_output";
|
|
8
10
|
|
|
9
11
|
/** Internal transport: comparison-base revision for the unanchored merge-candidate diff. */
|
|
@@ -26,7 +28,7 @@ export type GleanerLeftOutput = {
|
|
|
26
28
|
};
|
|
27
29
|
|
|
28
30
|
export function validateRecordedGleanerLeftOutput(value: unknown): GleanerLeftOutput {
|
|
29
|
-
if (
|
|
31
|
+
if (!isRecord(value)) {
|
|
30
32
|
throw new Error("Gleaner-left output has no execution discriminator");
|
|
31
33
|
}
|
|
32
34
|
let status: unknown;
|
|
@@ -6,6 +6,8 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import type { HostIdentityDescription } from "../host-descriptions.ts";
|
|
8
8
|
|
|
9
|
+
import { isRecord } from "../unknown-value.ts";
|
|
10
|
+
|
|
9
11
|
/** Claude Code print-mode (#645). */
|
|
10
12
|
export type ClaudePrintHostDescription = HostIdentityDescription & Readonly<{
|
|
11
13
|
protocol: "claude-print";
|
|
@@ -167,7 +169,7 @@ export function closeJsonSchemaForCodex(
|
|
|
167
169
|
schema: Readonly<Record<string, unknown>>,
|
|
168
170
|
): Record<string, unknown> {
|
|
169
171
|
const closed = closeSchemaNode(schema) as Record<string, unknown>;
|
|
170
|
-
const existingDefs =
|
|
172
|
+
const existingDefs = isRecord(closed.$defs)
|
|
171
173
|
? (closed.$defs as Record<string, unknown>)
|
|
172
174
|
: {};
|
|
173
175
|
return {
|
|
@@ -179,14 +181,9 @@ export function closeJsonSchemaForCodex(
|
|
|
179
181
|
};
|
|
180
182
|
}
|
|
181
183
|
|
|
182
|
-
/** Shared plain-object guard for headless host schema/event reduction. */
|
|
183
|
-
export function isPlainObject(value: unknown): value is Record<string, unknown> {
|
|
184
|
-
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
185
|
-
}
|
|
186
|
-
|
|
187
184
|
/** Pure null leaf only — composite type|null is stripped in-leaf, not dropped whole. */
|
|
188
185
|
function isPureNullTypeSchema(value: unknown): boolean {
|
|
189
|
-
if (!
|
|
186
|
+
if (!isRecord(value)) return false;
|
|
190
187
|
if (value.type === "null") return true;
|
|
191
188
|
if (Array.isArray(value.type) && value.type.length > 0 && value.type.every((t) => t === "null")) {
|
|
192
189
|
return true;
|
|
@@ -199,7 +196,7 @@ function isPureNullTypeSchema(value: unknown): boolean {
|
|
|
199
196
|
* Required edges keep the non-null type(s); optional edges re-add null once.
|
|
200
197
|
*/
|
|
201
198
|
function stripNullFromLeafType(leaf: unknown): unknown {
|
|
202
|
-
if (!
|
|
199
|
+
if (!isRecord(leaf) || !Array.isArray(leaf.type)) return leaf;
|
|
203
200
|
const nonNull = leaf.type.filter((t) => t !== "null");
|
|
204
201
|
if (nonNull.length === leaf.type.length) return leaf;
|
|
205
202
|
if (nonNull.length === 0) return { ...leaf, type: "null" };
|
|
@@ -213,7 +210,7 @@ function stripNullFromLeafType(leaf: unknown): unknown {
|
|
|
213
210
|
* lack `type`; strict structured output rejects those intermediate nodes.
|
|
214
211
|
*/
|
|
215
212
|
function flattenUnionLeaves(schema: unknown): unknown[] {
|
|
216
|
-
if (!
|
|
213
|
+
if (!isRecord(schema)) return [schema];
|
|
217
214
|
if (Array.isArray(schema.anyOf)) {
|
|
218
215
|
return schema.anyOf.flatMap(flattenUnionLeaves);
|
|
219
216
|
}
|
|
@@ -233,7 +230,7 @@ function nonNullLeaves(schema: unknown): unknown[] {
|
|
|
233
230
|
*/
|
|
234
231
|
function closePropertySchema(schema: unknown, optional: boolean): unknown {
|
|
235
232
|
const description =
|
|
236
|
-
|
|
233
|
+
isRecord(schema) && typeof schema.description === "string"
|
|
237
234
|
? { description: schema.description }
|
|
238
235
|
: {};
|
|
239
236
|
const leaves = nonNullLeaves(schema).map(closeSchemaNode);
|
|
@@ -242,10 +239,10 @@ function closePropertySchema(schema: unknown, optional: boolean): unknown {
|
|
|
242
239
|
const closed = leaves.length === 1 ? leaves[0] : { anyOf: leaves };
|
|
243
240
|
// Codex strict does not allow sibling keys on $ref; put property guidance
|
|
244
241
|
// on an enclosing schema instead of losing it or weakening the free-JSON ref.
|
|
245
|
-
if (
|
|
242
|
+
if (isRecord(closed) && typeof closed.$ref === "string") {
|
|
246
243
|
return { anyOf: [closed], ...description };
|
|
247
244
|
}
|
|
248
|
-
return
|
|
245
|
+
return isRecord(closed) ? { ...closed, ...description } : closed;
|
|
249
246
|
}
|
|
250
247
|
return { anyOf: [...leaves, { type: "null" }], ...description };
|
|
251
248
|
}
|
|
@@ -258,7 +255,7 @@ function closePropertySchema(schema: unknown, optional: boolean): unknown {
|
|
|
258
255
|
function ensureTypedLeaf(schema: Record<string, unknown>): Record<string, unknown> {
|
|
259
256
|
if (schema.type !== undefined) return schema;
|
|
260
257
|
if (typeof schema.$ref === "string") return schema;
|
|
261
|
-
if (
|
|
258
|
+
if (isRecord(schema.properties) || schema.additionalProperties !== undefined) {
|
|
262
259
|
return { ...schema, type: "object" };
|
|
263
260
|
}
|
|
264
261
|
if (schema.items !== undefined) {
|
|
@@ -287,7 +284,7 @@ function originalRequiredNames(node: Record<string, unknown>): ReadonlySet<strin
|
|
|
287
284
|
}
|
|
288
285
|
|
|
289
286
|
function closeSchemaNode(node: unknown): unknown {
|
|
290
|
-
if (!
|
|
287
|
+
if (!isRecord(node)) return node;
|
|
291
288
|
|
|
292
289
|
// Already a ref (free-JSON leaf or pre-existing) — do not retype.
|
|
293
290
|
if (typeof node.$ref === "string") return node;
|
|
@@ -305,13 +302,13 @@ function closeSchemaNode(node: unknown): unknown {
|
|
|
305
302
|
if (node.items !== undefined) {
|
|
306
303
|
out.items = closeSchemaNode(node.items);
|
|
307
304
|
}
|
|
308
|
-
if (
|
|
305
|
+
if (isRecord(node.$defs)) {
|
|
309
306
|
out.$defs = Object.fromEntries(
|
|
310
307
|
Object.entries(node.$defs).map(([key, value]) => [key, closeSchemaNode(value)]),
|
|
311
308
|
);
|
|
312
309
|
}
|
|
313
310
|
|
|
314
|
-
const hasProperties =
|
|
311
|
+
const hasProperties = isRecord(node.properties);
|
|
315
312
|
const isObjectType =
|
|
316
313
|
node.type === "object"
|
|
317
314
|
|| (Array.isArray(node.type) && node.type.includes("object"))
|
|
@@ -351,10 +348,10 @@ function closeSchemaNode(node: unknown): unknown {
|
|
|
351
348
|
function stringEnvironment(value: unknown): Record<string, string> | undefined {
|
|
352
349
|
const entries = Array.isArray(value)
|
|
353
350
|
? value.flatMap((item) => {
|
|
354
|
-
if (!
|
|
351
|
+
if (!isRecord(item) || typeof item.name !== "string" || typeof item.value !== "string") return [];
|
|
355
352
|
return [[item.name, item.value] as const];
|
|
356
353
|
})
|
|
357
|
-
:
|
|
354
|
+
: isRecord(value)
|
|
358
355
|
? Object.entries(value).filter((entry): entry is [string, string] => typeof entry[1] === "string")
|
|
359
356
|
: [];
|
|
360
357
|
return entries.length === 0 ? undefined : Object.fromEntries(entries);
|