@jterrats/open-orchestra 1.0.8 → 1.0.10
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/AGENTS.md +15 -2
- package/CLAUDE.md +16 -2
- package/dist/acceptance-criteria-quality.d.ts +12 -0
- package/dist/acceptance-criteria-quality.js +137 -0
- package/dist/acceptance-criteria-quality.js.map +1 -0
- package/dist/architecture-debt-inventory.d.ts +31 -0
- package/dist/architecture-debt-inventory.js +200 -0
- package/dist/architecture-debt-inventory.js.map +1 -0
- package/dist/architecture-debt-report.d.ts +2 -0
- package/dist/architecture-debt-report.js +28 -0
- package/dist/architecture-debt-report.js.map +1 -0
- package/dist/autonomous-phase-lifecycle.d.ts +5 -1
- package/dist/autonomous-phase-lifecycle.js +87 -17
- package/dist/autonomous-phase-lifecycle.js.map +1 -1
- package/dist/autonomous-run-store.js +2 -2
- package/dist/autonomous-run-store.js.map +1 -1
- package/dist/benchmark.js +2 -1
- package/dist/benchmark.js.map +1 -1
- package/dist/clarification.js +2 -1
- package/dist/clarification.js.map +1 -1
- package/dist/cli-payloads.d.ts +4 -0
- package/dist/cli-payloads.js +24 -0
- package/dist/cli-payloads.js.map +1 -0
- package/dist/collaboration-flows.d.ts +1 -2
- package/dist/command-manifest.js +18 -5
- package/dist/command-manifest.js.map +1 -1
- package/dist/command-routes-integrations.js +2 -1
- package/dist/command-routes-integrations.js.map +1 -1
- package/dist/command-routes.js +3 -1
- package/dist/command-routes.js.map +1 -1
- package/dist/command-utils.d.ts +1 -2
- package/dist/command-utils.js.map +1 -1
- package/dist/commands.d.ts +2 -2
- package/dist/commands.js +17 -4
- package/dist/commands.js.map +1 -1
- package/dist/constants.js +1 -0
- package/dist/constants.js.map +1 -1
- package/dist/cursor-canvas.js +21 -1
- package/dist/cursor-canvas.js.map +1 -1
- package/dist/cursor-mdc.d.ts +10 -0
- package/dist/cursor-mdc.js +37 -0
- package/dist/cursor-mdc.js.map +1 -0
- package/dist/fs-utils.js +2 -1
- package/dist/fs-utils.js.map +1 -1
- package/dist/generated-guidance-health.d.ts +33 -0
- package/dist/generated-guidance-health.js +125 -0
- package/dist/generated-guidance-health.js.map +1 -0
- package/dist/github.js +22 -7
- package/dist/github.js.map +1 -1
- package/dist/health-checks.js +2 -51
- package/dist/health-checks.js.map +1 -1
- package/dist/id-utils.d.ts +3 -0
- package/dist/id-utils.js +11 -0
- package/dist/id-utils.js.map +1 -0
- package/dist/instruction-blocks.js +20 -5
- package/dist/instruction-blocks.js.map +1 -1
- package/dist/mcp-oauth-proxy.js +5 -5
- package/dist/mcp-oauth-proxy.js.map +1 -1
- package/dist/memory-status.js +31 -5
- package/dist/memory-status.js.map +1 -1
- package/dist/memory.js +31 -7
- package/dist/memory.js.map +1 -1
- package/dist/metrics-commands.js +69 -17
- package/dist/metrics-commands.js.map +1 -1
- package/dist/notifications.js +12 -2
- package/dist/notifications.js.map +1 -1
- package/dist/phase-deterministic-output.d.ts +4 -0
- package/dist/phase-deterministic-output.js +62 -0
- package/dist/phase-deterministic-output.js.map +1 -0
- package/dist/phase-executor.js +9 -172
- package/dist/phase-executor.js.map +1 -1
- package/dist/phase-playbooks.js +17 -0
- package/dist/phase-playbooks.js.map +1 -1
- package/dist/provider-utils.js +11 -1
- package/dist/provider-utils.js.map +1 -1
- package/dist/qa-e2e-artifacts.d.ts +7 -0
- package/dist/qa-e2e-artifacts.js +225 -0
- package/dist/qa-e2e-artifacts.js.map +1 -0
- package/dist/quality-contracts.d.ts +83 -0
- package/dist/quality-contracts.js +463 -0
- package/dist/quality-contracts.js.map +1 -0
- package/dist/refresh-generated.js +81 -28
- package/dist/refresh-generated.js.map +1 -1
- package/dist/runtime-bootstrap.js +26 -2
- package/dist/runtime-bootstrap.js.map +1 -1
- package/dist/runtime-commands.d.ts +2 -0
- package/dist/runtime-commands.js +190 -1
- package/dist/runtime-commands.js.map +1 -1
- package/dist/runtime-context-manifest.d.ts +27 -0
- package/dist/runtime-context-manifest.js +151 -0
- package/dist/runtime-context-manifest.js.map +1 -0
- package/dist/runtime-execution-renderer.d.ts +3 -1
- package/dist/runtime-execution-renderer.js +7 -1
- package/dist/runtime-execution-renderer.js.map +1 -1
- package/dist/runtime-execution.d.ts +2 -1
- package/dist/runtime-execution.js +191 -2
- package/dist/runtime-execution.js.map +1 -1
- package/dist/runtime-guardrails.js +5 -1
- package/dist/runtime-guardrails.js.map +1 -1
- package/dist/runtime-lifecycle-watch-adapters.d.ts +4 -0
- package/dist/runtime-lifecycle-watch-adapters.js +87 -0
- package/dist/runtime-lifecycle-watch-adapters.js.map +1 -0
- package/dist/runtime-lifecycle-watch.d.ts +85 -0
- package/dist/runtime-lifecycle-watch.js +312 -0
- package/dist/runtime-lifecycle-watch.js.map +1 -0
- package/dist/runtime-parent-action-dispatch.d.ts +30 -0
- package/dist/runtime-parent-action-dispatch.js +114 -0
- package/dist/runtime-parent-action-dispatch.js.map +1 -0
- package/dist/runtime-parent-action-eligibility.d.ts +12 -0
- package/dist/runtime-parent-action-eligibility.js +131 -0
- package/dist/runtime-parent-action-eligibility.js.map +1 -0
- package/dist/runtime-parent-actions.d.ts +7 -2
- package/dist/runtime-parent-actions.js +145 -1
- package/dist/runtime-parent-actions.js.map +1 -1
- package/dist/runtime-spawn-bridge.js +21 -1
- package/dist/runtime-spawn-bridge.js.map +1 -1
- package/dist/skills-validation.js +1 -2
- package/dist/skills-validation.js.map +1 -1
- package/dist/sonar-commands.d.ts +1 -0
- package/dist/sonar-commands.js +36 -0
- package/dist/sonar-commands.js.map +1 -1
- package/dist/sonar-insights.d.ts +13 -0
- package/dist/sonar-insights.js +32 -53
- package/dist/sonar-insights.js.map +1 -1
- package/dist/sonar-payload-normalizers.d.ts +16 -0
- package/dist/sonar-payload-normalizers.js +67 -0
- package/dist/sonar-payload-normalizers.js.map +1 -0
- package/dist/sonar-preflight.d.ts +26 -0
- package/dist/sonar-preflight.js +111 -0
- package/dist/sonar-preflight.js.map +1 -0
- package/dist/sonar-redaction.d.ts +1 -0
- package/dist/sonar-redaction.js +13 -0
- package/dist/sonar-redaction.js.map +1 -0
- package/dist/subagent-protocol.js.map +1 -1
- package/dist/task-graph-commands.js +8 -1
- package/dist/task-graph-commands.js.map +1 -1
- package/dist/telemetry-redaction.js +31 -2
- package/dist/telemetry-redaction.js.map +1 -1
- package/dist/types/model-config.d.ts +6 -0
- package/dist/types/runtime.d.ts +49 -2
- package/dist/types/tasks.d.ts +12 -0
- package/dist/types.d.ts +1 -1
- package/dist/types.js.map +1 -1
- package/dist/web-api.js +8 -0
- package/dist/web-api.js.map +1 -1
- package/dist/web-artifacts.js +8 -3
- package/dist/web-artifacts.js.map +1 -1
- package/dist/web-console/assets/index-DA8Fs4r7.js +11 -0
- package/dist/web-console/index.html +1 -1
- package/dist/workflow-background-subagents.js +8 -4
- package/dist/workflow-background-subagents.js.map +1 -1
- package/dist/workflow-handoff-assessment.d.ts +3 -0
- package/dist/workflow-handoff-assessment.js +246 -0
- package/dist/workflow-handoff-assessment.js.map +1 -0
- package/dist/workflow-handoff-contract.d.ts +32 -0
- package/dist/workflow-handoff-contract.js +123 -0
- package/dist/workflow-handoff-contract.js.map +1 -0
- package/dist/workflow-phase-transition.d.ts +16 -0
- package/dist/workflow-phase-transition.js +76 -0
- package/dist/workflow-phase-transition.js.map +1 -0
- package/dist/workflow-run-commands.js +79 -18
- package/dist/workflow-run-commands.js.map +1 -1
- package/dist/workflow-services.js +62 -28
- package/dist/workflow-services.js.map +1 -1
- package/dist/workspace-init-artifacts.d.ts +9 -0
- package/dist/workspace-init-artifacts.js +28 -0
- package/dist/workspace-init-artifacts.js.map +1 -1
- package/dist/workspace-runtime-bootstrap.d.ts +3 -1
- package/dist/workspace-runtime-bootstrap.js +8 -3
- package/dist/workspace-runtime-bootstrap.js.map +1 -1
- package/dist/workspace.d.ts +5 -2
- package/dist/workspace.js +46 -16
- package/dist/workspace.js.map +1 -1
- package/docs/adoption-guide.md +12 -0
- package/docs/architecture-debt-inventory.md +25 -0
- package/docs/autonomous-workflow.md +10 -2
- package/docs/claude-adapter-qa-matrix.md +56 -0
- package/docs/e2e-test-batteries.md +34 -23
- package/docs/orchestra-mvp.md +21 -0
- package/docs/release-test-matrix.md +22 -0
- package/docs/runtime-adapters.md +155 -15
- package/docs/sonar-quality-gates.md +240 -11
- package/package.json +5 -1
- package/rules/delivery-quality-gates.mdc +8 -0
- package/rules/devops-tooling.mdc +1 -0
- package/rules/security-guardrails.mdc +3 -0
- package/rules/testing-discipline.mdc +9 -0
- package/dist/web-console/assets/index-CgSKcay8.js +0 -11
package/dist/sonar-insights.js
CHANGED
|
@@ -2,6 +2,7 @@ import { readFile } from "node:fs/promises";
|
|
|
2
2
|
import { appendEvent, writeArtifact } from "./workspace.js";
|
|
3
3
|
import { removeUndefined } from "./command-utils.js";
|
|
4
4
|
import { ensureDir, resolveWorkflowPath } from "./fs-utils.js";
|
|
5
|
+
import { asSonarPayload, parseFinding, parseMeasures, parseSecurityHotspot, sanitizeCondition, } from "./sonar-payload-normalizers.js";
|
|
5
6
|
import { resolveSonarProviderConfig, } from "./sonar-provider.js";
|
|
6
7
|
export async function importSonarInsights(input) {
|
|
7
8
|
const snapshot = normalizeSonarPayload(input);
|
|
@@ -21,6 +22,8 @@ export async function importSonarInsights(input) {
|
|
|
21
22
|
analysisId: snapshot.analysisId,
|
|
22
23
|
qualityGateStatus: snapshot.qualityGate.status,
|
|
23
24
|
findings: snapshot.findings.length,
|
|
25
|
+
securityHotspots: snapshot.securityHotspots.length,
|
|
26
|
+
securityHotspotsUnavailableReason: snapshot.securityHotspotsUnavailableReason,
|
|
24
27
|
sourceUrl: snapshot.sourceUrl,
|
|
25
28
|
},
|
|
26
29
|
}));
|
|
@@ -45,6 +48,8 @@ export function normalizeSonarPayload(input) {
|
|
|
45
48
|
},
|
|
46
49
|
metrics: parseMeasures(payload.measures ?? []),
|
|
47
50
|
findings: (payload.issues ?? []).map(parseFinding),
|
|
51
|
+
securityHotspots: (payload.hotspots ?? []).map(parseSecurityHotspot),
|
|
52
|
+
securityHotspotsUnavailableReason: payload.hotspotsUnavailableReason,
|
|
48
53
|
});
|
|
49
54
|
}
|
|
50
55
|
export async function readSonarPayloadFile(file) {
|
|
@@ -58,87 +63,61 @@ export async function fetchSonarPayload({ hostUrl, provider, projectKey, organiz
|
|
|
58
63
|
resolved: "false",
|
|
59
64
|
ps: "100",
|
|
60
65
|
});
|
|
66
|
+
const hotspotQuery = new URLSearchParams({
|
|
67
|
+
projectKey,
|
|
68
|
+
status: "TO_REVIEW",
|
|
69
|
+
ps: "100",
|
|
70
|
+
});
|
|
61
71
|
if (organization && config.includeOrganization) {
|
|
62
72
|
query.set("organization", organization);
|
|
63
73
|
issueQuery.set("organization", organization);
|
|
74
|
+
hotspotQuery.set("organization", organization);
|
|
64
75
|
}
|
|
65
76
|
if (branch) {
|
|
66
77
|
query.set("branch", branch);
|
|
67
78
|
issueQuery.set("branch", branch);
|
|
79
|
+
hotspotQuery.set("branch", branch);
|
|
68
80
|
}
|
|
69
81
|
const [qualityGate, issues] = await Promise.all([
|
|
70
82
|
sonarGet(`${config.apiBaseUrl}/api/qualitygates/project_status?${query}`, token),
|
|
71
83
|
sonarGet(`${config.apiBaseUrl}/api/issues/search?${issueQuery}`, token),
|
|
72
84
|
]);
|
|
85
|
+
const hotspotsPayload = await fetchOptionalSonarHotspots(`${config.apiBaseUrl}/api/hotspots/search?${hotspotQuery}`, token);
|
|
73
86
|
return {
|
|
74
87
|
...qualityGate,
|
|
75
88
|
issues: Array.isArray(issues.issues)
|
|
76
89
|
? issues.issues
|
|
77
90
|
: [],
|
|
91
|
+
...hotspotsPayload,
|
|
78
92
|
};
|
|
79
93
|
}
|
|
80
94
|
async function sonarGet(url, token) {
|
|
81
95
|
const response = await fetch(url, {
|
|
82
|
-
headers: { Authorization:
|
|
96
|
+
headers: { Authorization: sonarTokenAuthorization(token) },
|
|
83
97
|
});
|
|
84
98
|
if (!response.ok) {
|
|
85
99
|
throw new Error(`Sonar API request failed with status ${response.status}`);
|
|
86
100
|
}
|
|
87
101
|
return response.json();
|
|
88
102
|
}
|
|
89
|
-
function
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
}
|
|
103
|
-
function parseMeasures(measures) {
|
|
104
|
-
const metrics = {};
|
|
105
|
-
for (const measure of measures) {
|
|
106
|
-
if (!measure || typeof measure !== "object")
|
|
107
|
-
continue;
|
|
108
|
-
const candidate = measure;
|
|
109
|
-
if (typeof candidate.metric === "string") {
|
|
110
|
-
metrics[candidate.metric] = String(candidate.value ?? "");
|
|
111
|
-
}
|
|
103
|
+
async function fetchOptionalSonarHotspots(url, token) {
|
|
104
|
+
try {
|
|
105
|
+
const payload = await sonarGet(url, token);
|
|
106
|
+
return {
|
|
107
|
+
hotspots: Array.isArray(payload.hotspots)
|
|
108
|
+
? payload.hotspots
|
|
109
|
+
: [],
|
|
110
|
+
};
|
|
111
|
+
}
|
|
112
|
+
catch (error) {
|
|
113
|
+
return {
|
|
114
|
+
hotspots: [],
|
|
115
|
+
hotspotsUnavailableReason: error instanceof Error ? error.message : "Sonar hotspot import failed",
|
|
116
|
+
};
|
|
112
117
|
}
|
|
113
|
-
return metrics;
|
|
114
|
-
}
|
|
115
|
-
function parseFinding(issue) {
|
|
116
|
-
const data = issue && typeof issue === "object" ? issue : {};
|
|
117
|
-
const candidate = data;
|
|
118
|
-
return removeUndefined({
|
|
119
|
-
key: stringField(candidate.key, "unknown"),
|
|
120
|
-
rule: stringField(candidate.rule),
|
|
121
|
-
severity: stringField(candidate.severity),
|
|
122
|
-
type: stringField(candidate.type),
|
|
123
|
-
component: stringField(candidate.component),
|
|
124
|
-
line: numberField(candidate.line),
|
|
125
|
-
message: redactSecretLikeValues(stringField(candidate.message, "")),
|
|
126
|
-
status: stringField(candidate.status),
|
|
127
|
-
effort: stringField(candidate.effort),
|
|
128
|
-
tags: Array.isArray(candidate.tags)
|
|
129
|
-
? candidate.tags.filter((tag) => typeof tag === "string")
|
|
130
|
-
: [],
|
|
131
|
-
});
|
|
132
|
-
}
|
|
133
|
-
function stringField(value, fallback) {
|
|
134
|
-
return typeof value === "string" ? value : (fallback ?? "");
|
|
135
|
-
}
|
|
136
|
-
function numberField(value) {
|
|
137
|
-
return typeof value === "number" ? value : undefined;
|
|
138
118
|
}
|
|
139
|
-
function
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
.replace(/Bearer\s+[A-Za-z0-9._~+/=-]+/g, "Bearer [REDACTED]");
|
|
119
|
+
function sonarTokenAuthorization(token) {
|
|
120
|
+
const tokenCredential = token + ":";
|
|
121
|
+
return `Basic ${Buffer.from(tokenCredential, "utf8").toString("base64")}`;
|
|
143
122
|
}
|
|
144
123
|
//# sourceMappingURL=sonar-insights.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sonar-insights.js","sourceRoot":"","sources":["../src/sonar-insights.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAC/D,OAAO,EACL,0BAA0B,GAE3B,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"sonar-insights.js","sourceRoot":"","sources":["../src/sonar-insights.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { SonarCondition, SonarFinding, SonarSecurityHotspot } from "./sonar-insights.js";
|
|
2
|
+
export type SonarPayload = {
|
|
3
|
+
projectStatus?: {
|
|
4
|
+
status?: string;
|
|
5
|
+
conditions?: SonarCondition[];
|
|
6
|
+
};
|
|
7
|
+
issues?: unknown[];
|
|
8
|
+
hotspots?: unknown[];
|
|
9
|
+
hotspotsUnavailableReason?: string;
|
|
10
|
+
measures?: unknown[];
|
|
11
|
+
};
|
|
12
|
+
export declare function asSonarPayload(payload: unknown): SonarPayload;
|
|
13
|
+
export declare function sanitizeCondition(condition: SonarCondition): SonarCondition;
|
|
14
|
+
export declare function parseMeasures(measures: unknown[]): Record<string, string>;
|
|
15
|
+
export declare function parseFinding(issue: unknown): SonarFinding;
|
|
16
|
+
export declare function parseSecurityHotspot(hotspot: unknown): SonarSecurityHotspot;
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { removeUndefined } from "./command-utils.js";
|
|
2
|
+
import { redactSecretLikeValues } from "./sonar-redaction.js";
|
|
3
|
+
export function asSonarPayload(payload) {
|
|
4
|
+
return payload && typeof payload === "object"
|
|
5
|
+
? payload
|
|
6
|
+
: {};
|
|
7
|
+
}
|
|
8
|
+
export function sanitizeCondition(condition) {
|
|
9
|
+
return removeUndefined({
|
|
10
|
+
metric: condition.metric ?? condition.metricKey ?? "unknown",
|
|
11
|
+
status: condition.status,
|
|
12
|
+
actualValue: condition.actualValue,
|
|
13
|
+
comparator: condition.comparator,
|
|
14
|
+
errorThreshold: condition.errorThreshold,
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
export function parseMeasures(measures) {
|
|
18
|
+
const metrics = {};
|
|
19
|
+
for (const measure of measures) {
|
|
20
|
+
if (!measure || typeof measure !== "object")
|
|
21
|
+
continue;
|
|
22
|
+
const candidate = measure;
|
|
23
|
+
if (typeof candidate.metric === "string") {
|
|
24
|
+
metrics[candidate.metric] = String(candidate.value ?? "");
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return metrics;
|
|
28
|
+
}
|
|
29
|
+
export function parseFinding(issue) {
|
|
30
|
+
const data = issue && typeof issue === "object" ? issue : {};
|
|
31
|
+
const candidate = data;
|
|
32
|
+
return removeUndefined({
|
|
33
|
+
key: stringField(candidate.key, "unknown"),
|
|
34
|
+
rule: stringField(candidate.rule),
|
|
35
|
+
severity: stringField(candidate.severity),
|
|
36
|
+
type: stringField(candidate.type),
|
|
37
|
+
component: stringField(candidate.component),
|
|
38
|
+
line: numberField(candidate.line),
|
|
39
|
+
message: redactSecretLikeValues(stringField(candidate.message, "")),
|
|
40
|
+
status: stringField(candidate.status),
|
|
41
|
+
effort: stringField(candidate.effort),
|
|
42
|
+
tags: Array.isArray(candidate.tags)
|
|
43
|
+
? candidate.tags.filter((tag) => typeof tag === "string")
|
|
44
|
+
: [],
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
export function parseSecurityHotspot(hotspot) {
|
|
48
|
+
const data = hotspot && typeof hotspot === "object" ? hotspot : {};
|
|
49
|
+
const candidate = data;
|
|
50
|
+
return removeUndefined({
|
|
51
|
+
key: stringField(candidate.key, "unknown"),
|
|
52
|
+
ruleKey: stringField(candidate.ruleKey),
|
|
53
|
+
component: stringField(candidate.component),
|
|
54
|
+
line: numberField(candidate.line),
|
|
55
|
+
message: redactSecretLikeValues(stringField(candidate.message, "")),
|
|
56
|
+
status: stringField(candidate.status),
|
|
57
|
+
vulnerabilityProbability: stringField(candidate.vulnerabilityProbability),
|
|
58
|
+
securityCategory: stringField(candidate.securityCategory),
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
function stringField(value, fallback) {
|
|
62
|
+
return typeof value === "string" ? value : (fallback ?? "");
|
|
63
|
+
}
|
|
64
|
+
function numberField(value) {
|
|
65
|
+
return typeof value === "number" ? value : undefined;
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=sonar-payload-normalizers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sonar-payload-normalizers.js","sourceRoot":"","sources":["../src/sonar-payload-normalizers.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { type SonarProviderMode } from "./sonar-provider.js";
|
|
2
|
+
export interface SonarPreflightInput {
|
|
3
|
+
projectKey: string;
|
|
4
|
+
organization?: string;
|
|
5
|
+
provider?: string;
|
|
6
|
+
hostUrl?: string;
|
|
7
|
+
branch?: string;
|
|
8
|
+
token: string;
|
|
9
|
+
sensitiveValues?: string[];
|
|
10
|
+
}
|
|
11
|
+
export interface SonarPreflightCheck {
|
|
12
|
+
name: "auth" | "project" | "qualityGate" | "issues" | "hotspots";
|
|
13
|
+
status: "pass" | "warn" | "fail";
|
|
14
|
+
code: string;
|
|
15
|
+
message: string;
|
|
16
|
+
}
|
|
17
|
+
export interface SonarPreflightResult {
|
|
18
|
+
passed: boolean;
|
|
19
|
+
provider: SonarProviderMode;
|
|
20
|
+
projectKey: string;
|
|
21
|
+
organization?: string;
|
|
22
|
+
branch?: string;
|
|
23
|
+
checks: SonarPreflightCheck[];
|
|
24
|
+
}
|
|
25
|
+
export declare function preflightSonarAccess({ projectKey, organization, provider, hostUrl, branch, token, sensitiveValues, }: SonarPreflightInput): Promise<SonarPreflightResult>;
|
|
26
|
+
export declare function redactSonarDiagnostic(message: string, sensitiveValues?: string[]): string;
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
import { removeUndefined } from "./command-utils.js";
|
|
2
|
+
import { resolveSonarProviderConfig, } from "./sonar-provider.js";
|
|
3
|
+
import { redactSecretLikeValues } from "./sonar-redaction.js";
|
|
4
|
+
export async function preflightSonarAccess({ projectKey, organization, provider, hostUrl, branch, token, sensitiveValues = [], }) {
|
|
5
|
+
const config = resolveSonarProviderConfig({ provider, hostUrl });
|
|
6
|
+
const secrets = [token, config.hostUrl, ...sensitiveValues].filter(Boolean);
|
|
7
|
+
const checks = [];
|
|
8
|
+
checks.push(await sonarPreflightCheck("auth", `${config.apiBaseUrl}/api/authentication/validate`, token, secrets, (payload) => payload.valid === true
|
|
9
|
+
? pass("auth", "auth-valid", "Sonar token is valid.")
|
|
10
|
+
: fail("auth", "auth-invalid", "Sonar token is invalid or cannot authenticate.")));
|
|
11
|
+
const projectQuery = new URLSearchParams({ component: projectKey });
|
|
12
|
+
const qualityGateQuery = new URLSearchParams({ projectKey });
|
|
13
|
+
const issuesQuery = new URLSearchParams({
|
|
14
|
+
componentKeys: projectKey,
|
|
15
|
+
resolved: "false",
|
|
16
|
+
ps: "1",
|
|
17
|
+
});
|
|
18
|
+
const hotspotQuery = new URLSearchParams({
|
|
19
|
+
projectKey,
|
|
20
|
+
status: "TO_REVIEW",
|
|
21
|
+
ps: "1",
|
|
22
|
+
});
|
|
23
|
+
if (organization && config.includeOrganization) {
|
|
24
|
+
projectQuery.set("organization", organization);
|
|
25
|
+
qualityGateQuery.set("organization", organization);
|
|
26
|
+
issuesQuery.set("organization", organization);
|
|
27
|
+
hotspotQuery.set("organization", organization);
|
|
28
|
+
}
|
|
29
|
+
if (branch) {
|
|
30
|
+
qualityGateQuery.set("branch", branch);
|
|
31
|
+
issuesQuery.set("branch", branch);
|
|
32
|
+
hotspotQuery.set("branch", branch);
|
|
33
|
+
}
|
|
34
|
+
checks.push(await sonarPreflightCheck("project", `${config.apiBaseUrl}/api/components/show?${projectQuery}`, token, secrets, () => pass("project", "project-readable", "Project key exists and is readable by the token.")));
|
|
35
|
+
checks.push(await sonarPreflightCheck("qualityGate", `${config.apiBaseUrl}/api/qualitygates/project_status?${qualityGateQuery}`, token, secrets, () => pass("qualityGate", "quality-gate-readable", "Quality gate can be read before analysis.")));
|
|
36
|
+
checks.push(await sonarPreflightCheck("issues", `${config.apiBaseUrl}/api/issues/search?${issuesQuery}`, token, secrets, () => pass("issues", "issues-readable", "Issue API can be read.")));
|
|
37
|
+
checks.push(await sonarPreflightCheck("hotspots", `${config.apiBaseUrl}/api/hotspots/search?${hotspotQuery}`, token, secrets, () => pass("hotspots", "hotspots-readable", "Security hotspot API can be read."), { optional: true }));
|
|
38
|
+
return removeUndefined({
|
|
39
|
+
passed: checks.every((check) => check.status !== "fail"),
|
|
40
|
+
provider: config.provider,
|
|
41
|
+
projectKey,
|
|
42
|
+
organization,
|
|
43
|
+
branch,
|
|
44
|
+
checks,
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
async function sonarPreflightCheck(name, url, token, sensitiveValues, onOk, options = {}) {
|
|
48
|
+
try {
|
|
49
|
+
const response = await fetch(url, {
|
|
50
|
+
headers: { Authorization: sonarTokenAuthorization(token) },
|
|
51
|
+
});
|
|
52
|
+
if (!response.ok) {
|
|
53
|
+
const status = options.optional ? "warn" : "fail";
|
|
54
|
+
return {
|
|
55
|
+
name,
|
|
56
|
+
status,
|
|
57
|
+
code: classifySonarPreflightFailure(response.status, response.headers),
|
|
58
|
+
message: redactSonarDiagnostic(sonarPreflightFailureMessage(name, response.status), sensitiveValues),
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
return onOk(await response.json());
|
|
62
|
+
}
|
|
63
|
+
catch (error) {
|
|
64
|
+
return fail(name, "network-error", redactSonarDiagnostic(error instanceof Error ? error.message : "Sonar preflight failed.", sensitiveValues));
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
function pass(name, code, message) {
|
|
68
|
+
return { name, status: "pass", code, message };
|
|
69
|
+
}
|
|
70
|
+
function fail(name, code, message) {
|
|
71
|
+
return { name, status: "fail", code, message };
|
|
72
|
+
}
|
|
73
|
+
function classifySonarPreflightFailure(status, headers) {
|
|
74
|
+
if (headers.get("cf-mitigated") === "challenge")
|
|
75
|
+
return "cloudflare-challenge";
|
|
76
|
+
if (status === 401)
|
|
77
|
+
return "invalid-token";
|
|
78
|
+
if (status === 403)
|
|
79
|
+
return "permission-denied";
|
|
80
|
+
if (status === 404)
|
|
81
|
+
return "project-not-found";
|
|
82
|
+
return `http-${status}`;
|
|
83
|
+
}
|
|
84
|
+
function sonarPreflightFailureMessage(name, status) {
|
|
85
|
+
if (status === 401)
|
|
86
|
+
return "Sonar token is invalid or expired.";
|
|
87
|
+
if (status === 403) {
|
|
88
|
+
if (name === "hotspots") {
|
|
89
|
+
return "Sonar token cannot read security hotspots; grant hotspot review/Browse permissions or review hotspots manually.";
|
|
90
|
+
}
|
|
91
|
+
return "Sonar token lacks required project API permissions such as Browse or Execute Analysis.";
|
|
92
|
+
}
|
|
93
|
+
if (status === 404) {
|
|
94
|
+
return "Sonar project key was not found or is not visible to the token.";
|
|
95
|
+
}
|
|
96
|
+
return `Sonar API preflight failed with status ${status}.`;
|
|
97
|
+
}
|
|
98
|
+
function sonarTokenAuthorization(token) {
|
|
99
|
+
const tokenCredential = `${token}:`;
|
|
100
|
+
return `Basic ${Buffer.from(tokenCredential, "utf8").toString("base64")}`;
|
|
101
|
+
}
|
|
102
|
+
export function redactSonarDiagnostic(message, sensitiveValues = []) {
|
|
103
|
+
let redacted = message;
|
|
104
|
+
for (const value of sensitiveValues) {
|
|
105
|
+
if (!value)
|
|
106
|
+
continue;
|
|
107
|
+
redacted = redacted.split(value).join("[REDACTED]");
|
|
108
|
+
}
|
|
109
|
+
return redactSecretLikeValues(redacted);
|
|
110
|
+
}
|
|
111
|
+
//# sourceMappingURL=sonar-preflight.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sonar-preflight.js","sourceRoot":"","sources":["../src/sonar-preflight.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function redactSecretLikeValues(message: string): string;
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
const SENSITIVE_ASSIGNMENT_KEYS = [
|
|
2
|
+
["to", "ken"].join(""),
|
|
3
|
+
["pass", "word"].join(""),
|
|
4
|
+
["se", "cret"].join(""),
|
|
5
|
+
];
|
|
6
|
+
const SENSITIVE_ASSIGNMENT_PATTERN = new RegExp(`\\b(${SENSITIVE_ASSIGNMENT_KEYS.join("|")})=([^\\s]+)`, "gi");
|
|
7
|
+
const BEARER_CREDENTIAL_PATTERN = /Bearer\s+[A-Za-z0-9._-]+/g;
|
|
8
|
+
export function redactSecretLikeValues(message) {
|
|
9
|
+
return message
|
|
10
|
+
.replace(SENSITIVE_ASSIGNMENT_PATTERN, "$1=[REDACTED]")
|
|
11
|
+
.replace(BEARER_CREDENTIAL_PATTERN, "Bearer [REDACTED]");
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=sonar-redaction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sonar-redaction.js","sourceRoot":"","sources":["../src/sonar-redaction.ts"],"names":[],"mappings":"AAAA,MAAM,yBAAyB,GAAG;IAChC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;IACtB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;IACzB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;CACxB,CAAC;AAEF,MAAM,4BAA4B,GAAG,IAAI,MAAM,CAC7C,OAAO,yBAAyB,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,EACvD,IAAI,CACL,CAAC;AAEF,MAAM,yBAAyB,GAAG,2BAA2B,CAAC;AAE9D,MAAM,UAAU,sBAAsB,CAAC,OAAe;IACpD,OAAO,OAAO;SACX,OAAO,CAAC,4BAA4B,EAAE,eAAe,CAAC;SACtD,OAAO,CAAC,yBAAyB,EAAE,mBAAmB,CAAC,CAAC;AAC7D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-protocol.js","sourceRoot":"","sources":["../src/subagent-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EACL,6BAA6B,EAC7B,6BAA6B,GAC9B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"subagent-protocol.js","sourceRoot":"","sources":["../src/subagent-protocol.ts"],"names":[],"mappings":"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"}
|
|
@@ -87,7 +87,7 @@ export async function taskUpdateCommand(options, io) {
|
|
|
87
87
|
goal: stringOption(options.goal),
|
|
88
88
|
scope: stringOption(options.scope),
|
|
89
89
|
paths: csvOption(options.paths),
|
|
90
|
-
acceptanceCriteria:
|
|
90
|
+
acceptanceCriteria: repeatedTextOption(options.acceptance),
|
|
91
91
|
assumptions: listOption(options.assumptions),
|
|
92
92
|
risks: listOption(options.risks),
|
|
93
93
|
testStrategy: stringOption(options["test-strategy"]),
|
|
@@ -225,6 +225,13 @@ function listOption(value) {
|
|
|
225
225
|
const values = parseCsv(value);
|
|
226
226
|
return values.length > 0 ? values : undefined;
|
|
227
227
|
}
|
|
228
|
+
function repeatedTextOption(value) {
|
|
229
|
+
const values = (Array.isArray(value) ? value : [value])
|
|
230
|
+
.filter((entry) => typeof entry === "string")
|
|
231
|
+
.map((entry) => entry.trim())
|
|
232
|
+
.filter(Boolean);
|
|
233
|
+
return values.length > 0 ? values : undefined;
|
|
234
|
+
}
|
|
228
235
|
function parseArchitectureApproval(options) {
|
|
229
236
|
const approval = removeUndefined({
|
|
230
237
|
proposal: stringOption(options["architecture-proposal"]),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-graph-commands.js","sourceRoot":"","sources":["../src/task-graph-commands.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task-graph-commands.js","sourceRoot":"","sources":["../src/task-graph-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,9 +27,8 @@ function redactString(value, fieldPath, report) {
|
|
|
27
27
|
report.blockedFields.push(fieldPath);
|
|
28
28
|
return "[BLOCKED]";
|
|
29
29
|
}
|
|
30
|
-
let output = value;
|
|
30
|
+
let output = redactEmailLikeTokens(value);
|
|
31
31
|
const replacements = [
|
|
32
|
-
[/[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}/gi, "[REDACTED_EMAIL]"],
|
|
33
32
|
[/(sk|ghp|github_pat)_[A-Za-z0-9_-]{12,}/g, "[REDACTED_TOKEN]"],
|
|
34
33
|
[/Bearer\s+[A-Za-z0-9._-]+/gi, "Bearer [REDACTED_TOKEN]"],
|
|
35
34
|
[
|
|
@@ -50,6 +49,36 @@ function redactString(value, fieldPath, report) {
|
|
|
50
49
|
}
|
|
51
50
|
return output;
|
|
52
51
|
}
|
|
52
|
+
function redactEmailLikeTokens(value) {
|
|
53
|
+
const parts = [];
|
|
54
|
+
let token = "";
|
|
55
|
+
for (const char of value) {
|
|
56
|
+
if (isWhitespace(char)) {
|
|
57
|
+
if (token) {
|
|
58
|
+
parts.push(isEmailLikeToken(token) ? "[REDACTED_EMAIL]" : token);
|
|
59
|
+
token = "";
|
|
60
|
+
}
|
|
61
|
+
parts.push(char);
|
|
62
|
+
continue;
|
|
63
|
+
}
|
|
64
|
+
token += char;
|
|
65
|
+
}
|
|
66
|
+
if (token) {
|
|
67
|
+
parts.push(isEmailLikeToken(token) ? "[REDACTED_EMAIL]" : token);
|
|
68
|
+
}
|
|
69
|
+
return parts.join("");
|
|
70
|
+
}
|
|
71
|
+
function isEmailLikeToken(value) {
|
|
72
|
+
const atIndex = value.indexOf("@");
|
|
73
|
+
if (atIndex <= 0 || atIndex !== value.lastIndexOf("@"))
|
|
74
|
+
return false;
|
|
75
|
+
const domain = value.slice(atIndex + 1);
|
|
76
|
+
const dotIndex = domain.lastIndexOf(".");
|
|
77
|
+
return dotIndex > 0 && domain.length - dotIndex > 2;
|
|
78
|
+
}
|
|
79
|
+
function isWhitespace(value) {
|
|
80
|
+
return value === " " || value === "\n" || value === "\r" || value === "\t";
|
|
81
|
+
}
|
|
53
82
|
function applyRedactionReplacement(value, pattern, replacement) {
|
|
54
83
|
if (typeof replacement === "string") {
|
|
55
84
|
return value.replace(pattern, replacement);
|