audit-tools 0.55.17 → 0.55.19
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/audit/cli/args.js +1 -1
- package/dist/audit/cli/args.js.map +1 -1
- package/dist/audit/cli/argumentContract.d.ts +2 -1
- package/dist/audit/cli/argumentContract.d.ts.map +1 -1
- package/dist/audit/cli/argumentContract.js +8 -3
- package/dist/audit/cli/argumentContract.js.map +1 -1
- package/dist/audit/cli/charterClarificationPrompt.d.ts.map +1 -1
- package/dist/audit/cli/charterClarificationPrompt.js +2 -1
- package/dist/audit/cli/charterClarificationPrompt.js.map +1 -1
- package/dist/audit/cli/dispatch/hostHandoff.d.ts.map +1 -1
- package/dist/audit/cli/dispatch/hostHandoff.js +6 -1
- package/dist/audit/cli/dispatch/hostHandoff.js.map +1 -1
- package/dist/audit/cli/explainTaskCommand.d.ts +2 -0
- package/dist/audit/cli/explainTaskCommand.d.ts.map +1 -1
- package/dist/audit/cli/explainTaskCommand.js +10 -3
- package/dist/audit/cli/explainTaskCommand.js.map +1 -1
- package/dist/audit/cli/fanoutLanes.d.ts.map +1 -1
- package/dist/audit/cli/fanoutLanes.js +5 -1
- package/dist/audit/cli/fanoutLanes.js.map +1 -1
- package/dist/audit/cli/laneValidators.d.ts +8 -0
- package/dist/audit/cli/laneValidators.d.ts.map +1 -1
- package/dist/audit/cli/laneValidators.js +21 -1
- package/dist/audit/cli/laneValidators.js.map +1 -1
- package/dist/audit/cli/nextStepHelpers.d.ts.map +1 -1
- package/dist/audit/cli/nextStepHelpers.js +6 -25
- package/dist/audit/cli/nextStepHelpers.js.map +1 -1
- package/dist/audit/cli/semanticReviewStep.d.ts +1 -1
- package/dist/audit/cli/semanticReviewStep.d.ts.map +1 -1
- package/dist/audit/cli/semanticReviewStep.js +12 -9
- package/dist/audit/cli/semanticReviewStep.js.map +1 -1
- package/dist/audit/cli/statusCommand.d.ts.map +1 -1
- package/dist/audit/cli/statusCommand.js +2 -0
- package/dist/audit/cli/statusCommand.js.map +1 -1
- package/dist/audit/cli/submitCommand.d.ts.map +1 -1
- package/dist/audit/cli/submitCommand.js +9 -0
- package/dist/audit/cli/submitCommand.js.map +1 -1
- package/dist/audit/cli/submitGateResult.d.ts +22 -0
- package/dist/audit/cli/submitGateResult.d.ts.map +1 -0
- package/dist/audit/cli/submitGateResult.js +92 -0
- package/dist/audit/cli/submitGateResult.js.map +1 -0
- package/dist/audit/cli.d.ts.map +1 -1
- package/dist/audit/cli.js +5 -3
- package/dist/audit/cli.js.map +1 -1
- package/dist/audit/extractors/graph.d.ts +1 -1
- package/dist/audit/extractors/graph.js +1 -1
- package/dist/audit/extractors/graphManifestEdges/cargo.js +1 -1
- package/dist/audit/extractors/graphManifestEdges/cargo.js.map +1 -1
- package/dist/audit/extractors/graphManifestEdges/pyproject.js +1 -1
- package/dist/audit/extractors/graphManifestEdges/pyproject.js.map +1 -1
- package/dist/audit/orchestrator/charterClarificationExecutor.d.ts +25 -1
- package/dist/audit/orchestrator/charterClarificationExecutor.d.ts.map +1 -1
- package/dist/audit/orchestrator/charterClarificationExecutor.js +3 -3
- package/dist/audit/orchestrator/charterClarificationExecutor.js.map +1 -1
- package/dist/remediate/index.d.ts.map +1 -1
- package/dist/remediate/index.js +15 -1
- package/dist/remediate/index.js.map +1 -1
- package/dist/remediate/steps/clarificationResolution.d.ts +72 -0
- package/dist/remediate/steps/clarificationResolution.d.ts.map +1 -0
- package/dist/remediate/steps/clarificationResolution.js +132 -0
- package/dist/remediate/steps/clarificationResolution.js.map +1 -0
- package/dist/remediate/steps/dispatch/contractConformanceReview.d.ts +21 -0
- package/dist/remediate/steps/dispatch/contractConformanceReview.d.ts.map +1 -1
- package/dist/remediate/steps/dispatch/contractConformanceReview.js +13 -6
- package/dist/remediate/steps/dispatch/contractConformanceReview.js.map +1 -1
- package/dist/remediate/steps/gateCommands.js +2 -2
- package/dist/remediate/steps/gateCommands.js.map +1 -1
- package/dist/remediate/steps/nextStep.d.ts.map +1 -1
- package/dist/remediate/steps/nextStep.js +1 -124
- package/dist/remediate/steps/nextStep.js.map +1 -1
- package/dist/remediate/steps/submitGateResult.d.ts +23 -0
- package/dist/remediate/steps/submitGateResult.d.ts.map +1 -0
- package/dist/remediate/steps/submitGateResult.js +81 -0
- package/dist/remediate/steps/submitGateResult.js.map +1 -0
- package/dist/shared/mcp/submitServer.d.ts +14 -0
- package/dist/shared/mcp/submitServer.d.ts.map +1 -1
- package/dist/shared/mcp/submitServer.js +23 -2
- package/dist/shared/mcp/submitServer.js.map +1 -1
- package/dist/{audit/extractors/graphManifestEdges → shared/parsing}/toml.d.ts +3 -3
- package/dist/shared/parsing/toml.d.ts.map +1 -0
- package/dist/{audit/extractors/graphManifestEdges → shared/parsing}/toml.js +10 -6
- package/dist/shared/parsing/toml.js.map +1 -0
- package/dist/shared/tooling/exec.d.ts +1 -1
- package/dist/shared/tooling/exec.d.ts.map +1 -1
- package/dist/shared/tooling/exec.js +3 -2
- package/dist/shared/tooling/exec.js.map +1 -1
- package/dist/shared/tooling/projectTestAdmission.d.ts +2 -2
- package/dist/shared/tooling/projectTestAdmission.js +2 -2
- package/dist/shared/tooling/repoConventions.d.ts.map +1 -1
- package/dist/shared/tooling/repoConventions.js +9 -6
- package/dist/shared/tooling/repoConventions.js.map +1 -1
- package/dist/shared/tooling/testCommand.d.ts +5 -3
- package/dist/shared/tooling/testCommand.d.ts.map +1 -1
- package/dist/shared/tooling/testCommand.js +28 -12
- package/dist/shared/tooling/testCommand.js.map +1 -1
- package/package.json +1 -1
- package/scripts/shared/install-host-assets.mjs +80 -17
- package/dist/audit/extractors/graphManifestEdges/toml.d.ts.map +0 -1
- package/dist/audit/extractors/graphManifestEdges/toml.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testCommand.js","sourceRoot":"","sources":["../../../src/shared/tooling/testCommand.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"testCommand.js","sourceRoot":"","sources":["../../../src/shared/tooling/testCommand.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -93,18 +93,68 @@ export function mergeOpenCodeMcpServer(existingMcp, toolName, launch) {
|
|
|
93
93
|
}
|
|
94
94
|
|
|
95
95
|
/**
|
|
96
|
-
*
|
|
96
|
+
* True when a Codex entry has this package's launch shape,
|
|
97
|
+
* `{command, args: [<dir>/<tool>.mjs, "mcp"]}` and nothing else: an install of
|
|
98
|
+
* this package wrote it (a clone's own `npm install` runs this postinstall
|
|
99
|
+
* too, so the entry can point at a clone or a removed lap worktree). Any other
|
|
100
|
+
* entry is the user's.
|
|
101
|
+
*/
|
|
102
|
+
function isOwnCodexLaunch(entry, toolName) {
|
|
103
|
+
const args = entry.args;
|
|
104
|
+
return (
|
|
105
|
+
Object.keys(entry).length === 2 &&
|
|
106
|
+
typeof entry.command === "string" &&
|
|
107
|
+
Array.isArray(args) &&
|
|
108
|
+
args.length === 2 &&
|
|
109
|
+
args[1] === "mcp" &&
|
|
110
|
+
typeof args[0] === "string" &&
|
|
111
|
+
args[0].split(/[\\/]/).pop() === `${toolName}.mjs`
|
|
112
|
+
);
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
/** A parsed TOML value as JSON with sorted object keys: key order and prototype do not count. */
|
|
116
|
+
function canonicalJson(value) {
|
|
117
|
+
return JSON.stringify(value, (_key, item) =>
|
|
118
|
+
item && typeof item === "object" && !Array.isArray(item)
|
|
119
|
+
? Object.fromEntries(Object.keys(item).sort().map((key) => [key, item[key]]))
|
|
120
|
+
: item,
|
|
121
|
+
);
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
/**
|
|
125
|
+
* Replace the text of the `[mcp_servers.<tool>]` table: from its header line to
|
|
126
|
+
* the next table header, less the blank and comment lines just before that
|
|
127
|
+
* header (they introduce the next table). Undefined when no such header line
|
|
128
|
+
* exists (for example a dotted-key or inline form).
|
|
129
|
+
*/
|
|
130
|
+
function replaceCodexTable(text, toolName, table) {
|
|
131
|
+
const lines = text.split(/(?<=\n)/);
|
|
132
|
+
const name = toolName.replace(/[.*+?^${}()|[\]\\-]/g, "\\$&");
|
|
133
|
+
const header = new RegExp(`^\\s*\\[\\s*mcp_servers\\s*\\.\\s*(?:"${name}"|'${name}'|${name})\\s*\\]\\s*(?:#.*)?\\r?\\n?$`);
|
|
134
|
+
const start = lines.findIndex((line) => header.test(line));
|
|
135
|
+
if (start < 0) return undefined;
|
|
136
|
+
let end = start + 1;
|
|
137
|
+
while (end < lines.length && !/^\s*\[/.test(lines[end])) end++;
|
|
138
|
+
while (end > start + 1 && /^\s*(?:#.*)?\r?\n?$/.test(lines[end - 1])) end--;
|
|
139
|
+
return [...lines.slice(0, start), table, ...lines.slice(end)].join("");
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
/**
|
|
143
|
+
* Register this tool's `[mcp_servers.<tool>]` table in the Codex config. The
|
|
97
144
|
* user's file is never re-serialized (that would drop their comments and
|
|
98
|
-
* layout): an absent entry is appended as text, an identical one is left,
|
|
99
|
-
*
|
|
145
|
+
* layout): an absent entry is appended as text, an identical one is left, an
|
|
146
|
+
* entry of this package's own launch shape at another path is replaced in
|
|
147
|
+
* place (an earlier install of this package wrote it), and any other entry is
|
|
148
|
+
* the user's edit and is left, with a note.
|
|
100
149
|
*
|
|
101
|
-
* The file is written only when the COMPOSED text
|
|
102
|
-
*
|
|
103
|
-
* tables), and a file that does not
|
|
104
|
-
*
|
|
105
|
-
* never failing the install over a
|
|
150
|
+
* The file is written only when the COMPOSED text parses to exactly the old
|
|
151
|
+
* config plus this one entry. An appended table cannot extend an inline
|
|
152
|
+
* `mcp_servers = { ... }` (TOML closes inline tables), and a file that does not
|
|
153
|
+
* parse today cannot be judged at all: each returns "manual" and leaves the
|
|
154
|
+
* file as it is, never making it invalid and never failing the install over a
|
|
155
|
+
* user's own config.
|
|
106
156
|
*
|
|
107
|
-
* @returns {"installed" | "unchanged" | "kept" | "manual"}
|
|
157
|
+
* @returns {"installed" | "replaced" | "unchanged" | "kept" | "manual"}
|
|
108
158
|
*/
|
|
109
159
|
function registerCodexMcpServer(path, toolName, launch) {
|
|
110
160
|
const existing = existsSync(path) ? readFileSync(path, "utf8") : "";
|
|
@@ -118,6 +168,11 @@ function registerCodexMcpServer(path, toolName, launch) {
|
|
|
118
168
|
const current = parsesAs(existing);
|
|
119
169
|
if (current === undefined) return "manual";
|
|
120
170
|
const entry = objectValue(objectValue(current.mcp_servers)[toolName]);
|
|
171
|
+
const rawTable = stringifyToml({ mcp_servers: { [toolName]: launch } });
|
|
172
|
+
const table = rawTable.endsWith("\n") ? rawTable : `${rawTable}\n`;
|
|
173
|
+
let next;
|
|
174
|
+
/** @type {"installed" | "replaced"} */
|
|
175
|
+
let action;
|
|
121
176
|
if (Object.keys(entry).length > 0) {
|
|
122
177
|
// Compare by field, not by serialized text: the same entry with its keys in
|
|
123
178
|
// another order is unchanged, not an edit to report as kept.
|
|
@@ -125,19 +180,26 @@ function registerCodexMcpServer(path, toolName, launch) {
|
|
|
125
180
|
Object.keys(entry).length === 2 &&
|
|
126
181
|
entry.command === launch.command &&
|
|
127
182
|
JSON.stringify(entry.args) === JSON.stringify(launch.args);
|
|
128
|
-
|
|
183
|
+
if (sameLaunch) return "unchanged";
|
|
184
|
+
if (!isOwnCodexLaunch(entry, toolName)) return "kept";
|
|
185
|
+
next = replaceCodexTable(existing, toolName, table);
|
|
186
|
+
if (next === undefined) return "manual";
|
|
187
|
+
action = "replaced";
|
|
188
|
+
} else {
|
|
189
|
+
const separator = existing === "" || existing.endsWith("\n\n") ? "" : existing.endsWith("\n") ? "\n" : "\n\n";
|
|
190
|
+
next = `${existing}${separator}${table}`;
|
|
191
|
+
action = "installed";
|
|
129
192
|
}
|
|
130
|
-
const
|
|
131
|
-
const
|
|
132
|
-
|
|
133
|
-
if (parsesAs(next) === undefined) return "manual";
|
|
193
|
+
const composed = parsesAs(next);
|
|
194
|
+
const expected = { ...current, mcp_servers: { ...objectValue(current.mcp_servers), [toolName]: launch } };
|
|
195
|
+
if (composed === undefined || canonicalJson(composed) !== canonicalJson(expected)) return "manual";
|
|
134
196
|
mkdirSync(dirname(path), { recursive: true });
|
|
135
197
|
// The user's own config: temp-then-rename, so a crash mid-write leaves the
|
|
136
198
|
// old file whole instead of a truncated one.
|
|
137
199
|
const temp = `${path}.${process.pid}.tmp`;
|
|
138
200
|
writeFileSync(temp, next, "utf8");
|
|
139
201
|
renameSync(temp, path);
|
|
140
|
-
return
|
|
202
|
+
return action;
|
|
141
203
|
}
|
|
142
204
|
|
|
143
205
|
/**
|
|
@@ -172,8 +234,9 @@ export function installMcpServerRegistrations({ toolName, homeDir, launch, claud
|
|
|
172
234
|
);
|
|
173
235
|
} else if (action === "manual") {
|
|
174
236
|
console.log(
|
|
175
|
-
`${toolName}: left ${path} unchanged —
|
|
176
|
-
`(an inline mcp_servers table, or a file that does not
|
|
237
|
+
`${toolName}: left ${path} unchanged — writing the ${label} table there would not parse to the old ` +
|
|
238
|
+
`config plus this entry (an inline mcp_servers table, a dotted-key entry, or a file that does not ` +
|
|
239
|
+
`parse today). Add it by hand: ` +
|
|
177
240
|
`[mcp_servers.${toolName}] command = ${JSON.stringify(launch.command)} args = ${JSON.stringify(launch.args)}`,
|
|
178
241
|
);
|
|
179
242
|
} else {
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"toml.d.ts","sourceRoot":"","sources":["../../../../src/audit/extractors/graphManifestEdges/toml.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;AAEH,kFAAkF;AAClF,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAStE;AAED,oFAAoF;AACpF,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAI/E;AAED,kEAAkE;AAClE,wBAAgB,SAAS,CACvB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,GACV,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAErC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"toml.js","sourceRoot":"","sources":["../../../../src/audit/extractors/graphManifestEdges/toml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,WAAW,CAAC;AAE/C;;;;;;;;;;;GAWG;AAEH,kFAAkF;AAClF,MAAM,UAAU,aAAa,CAAC,OAAe;IAC3C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QAClC,OAAO,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YACnE,CAAC,CAAE,MAAkC;YACrC,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,oFAAoF;AACpF,MAAM,UAAU,WAAW,CAAC,KAAc;IACxC,OAAO,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAChE,CAAC,CAAE,KAAiC;QACpC,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,kEAAkE;AAClE,MAAM,UAAU,SAAS,CACvB,OAAe,EACf,GAAW;IAEX,OAAO,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;AAClD,CAAC"}
|