Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 124 additions & 16 deletions packages/gittensory-mcp/bin/gittensory-mcp.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,10 @@ const currentBranchShape = {
.array(
z.object({
command: z.string().min(1),
status: z.enum(["passed", "failed", "not_run"]),
status: z.enum(["passed", "failed", "not_run", "skipped", "focused", "unknown"]),
summary: z.string().optional(),
durationMs: z.number().int().min(0).optional(),
exitCode: z.number().int().min(0).optional(),
}),
)
.optional(),
Expand Down Expand Up @@ -624,7 +626,7 @@ Source upload remains disabled.

function parseOptions(args) {
const options = {};
const repeatable = new Set(["label", "issue", "validation", "validationCommand", "validationStatus", "validationSummary", "scenarioNote"]);
const repeatable = new Set(["label", "issue", "validation", "validationCommand", "validationStatus", "validationSummary", "validationDuration", "scenarioNote"]);
for (let index = 0; index < args.length; index += 1) {
const arg = args[index];
if (arg === "--json") {
Expand Down Expand Up @@ -908,29 +910,58 @@ function getApiToken() {
}

function validationFromOptions(options) {
const direct = (options.validation ?? []).map((entry) => {
const [statusOrCommand, commandOrSummary, ...summaryParts] = String(entry).split("|");
const status = isValidationStatus(statusOrCommand) ? statusOrCommand : "not_run";
const command = isValidationStatus(statusOrCommand) ? commandOrSummary : statusOrCommand;
return stripUndefined({
command: command?.trim(),
status,
summary: summaryParts.join("|").trim() || (isValidationStatus(statusOrCommand) ? undefined : commandOrSummary?.trim()),
});
});
const direct = (options.validation ?? []).map(parseValidationEntry);
const commands = options.validationCommand ?? [];
const statuses = options.validationStatus ?? [];
const summaries = options.validationSummary ?? [];
const durations = options.validationDuration ?? [];
const expanded = commands.map((command, index) =>
stripUndefined({
validationEntry({
command,
status: isValidationStatus(statuses[index]) ? statuses[index] : "not_run",
summary: summaries[index],
statusText: statuses[index],
summaryText: summaries[index],
Comment thread
oktofeesh1 marked this conversation as resolved.
durationText: durations[index],
}),
);
return [...direct, ...expanded].filter((entry) => typeof entry.command === "string" && entry.command.length > 0);
}

function parseValidationEntry(entry) {
const parts = String(entry ?? "").split("|").map((part) => part.trim());
const explicitStatus = normalizeValidationStatus(parts[0]);
const command = explicitStatus ? parts[1] : parts[0];
const rest = explicitStatus ? parts.slice(2) : parts.slice(1);
const inferredStatusText = !explicitStatus && isValidationStatusLike(rest[0]) ? rest[0] : undefined;
const detailParts = inferredStatusText ? rest.slice(1) : rest;
const durationMs = parseDurationMs(detailParts[0]);
const summaryParts = durationMs !== undefined ? detailParts.slice(1) : detailParts;
return validationEntry({
command,
statusText: explicitStatus ?? inferredStatusText,
summaryText: summaryParts.join("|"),
durationMs,
});
}

function validationEntry({ command, statusText, summaryText, durationText, durationMs }) {
const statusSource = nonEmptyString(statusText);
const summarySource = statusSource ? undefined : nonEmptyString(summaryText);
const exitCode =
inferValidationExitCode(statusSource, { allowBareCode: true, allowGenericStatus: true }) ??
inferValidationExitCode(summarySource, { allowBareCode: false, allowGenericStatus: false });
const status =
normalizeValidationStatus(statusSource) ??
normalizeSummaryValidationStatus(summarySource) ??
(exitCode !== undefined ? (exitCode === 0 ? "passed" : "failed") : "not_run");
return stripUndefined({
command: sanitizeValidationText(command, 160),
status,
summary: sanitizeValidationText(summaryText),
durationMs: durationMs ?? parseDurationMs(durationText),
exitCode,
});
}

function optionalInteger(value) {
if (value === undefined || value === true) return undefined;
const parsed = Number(value);
Expand All @@ -944,7 +975,84 @@ function optionalNumber(value) {
}

function isValidationStatus(value) {
return value === "passed" || value === "failed" || value === "not_run";
return Boolean(normalizeValidationStatus(value));
}

function normalizeValidationStatus(value) {
const text = String(value ?? "").trim().toLowerCase().replace(/[-\s]+/g, "_");
if (["passed", "pass", "success", "ok", "exit_0", "0"].includes(text)) return "passed";
if (["failed", "fail", "failure", "error", "nonzero", "non_zero"].includes(text) || /^exit_[1-9]\d*$/.test(text) || /^[1-9]\d*$/.test(text)) return "failed";
if (["not_run", "notrun", "not_ran", "pending"].includes(text)) return "not_run";
if (["skipped", "skip"].includes(text)) return "skipped";
if (["focused", "focus"].includes(text)) return "focused";
if (["unknown", "unclear"].includes(text)) return "unknown";
return undefined;
}

function isValidationStatusLike(value) {
return Boolean(
normalizeValidationStatus(value) ??
inferValidationExitCode(value, { allowBareCode: true, allowGenericStatus: true }),
);
}

function inferValidationExitCode(value, options = {}) {
const text = String(value ?? "").trim().toLowerCase();
const allowBareCode = options.allowBareCode === true;
const allowGenericStatus = options.allowGenericStatus === true;
if (allowBareCode && /^\d{1,3}$/.test(text)) return Number(text);
const processExitPattern = /\b(?:exit(?:ed)?(?:\s+(?:code|status))?|exitcode|process\s+(?:exit(?:ed)?|status|code)|command\s+(?:exit(?:ed)?|status|code)|shell\s+(?:exit(?:ed)?|status|code))[\s:_-]*(\d{1,3})\b/;
const genericStatusPattern = /^(?:status|code)[\s:_-]*(\d{1,3})\b/;
const match = text.match(processExitPattern) ?? (allowGenericStatus ? text.match(genericStatusPattern) : null);
if (match) return Number(match[1]);
if (!allowBareCode && /^\d{1,3}$/.test(text)) return undefined;
const status = normalizeValidationStatus(text);
if (status === "passed" || status === "focused") return 0;
if (status === "failed") return 1;
return undefined;
}

function normalizeSummaryValidationStatus(value) {
const text = nonEmptyString(value);
if (!text || /^\d{1,3}$/.test(text)) return undefined;
return normalizeValidationStatus(text);
}

function nonEmptyString(value) {
const text = String(value ?? "").trim();
return text ? text : undefined;
}

function parseDurationMs(value) {
const text = String(value ?? "").trim().toLowerCase();
const match = text.match(/^(\d+(?:\.\d+)?)\s*(ms|s|sec|secs|m|min|mins)?$/);
if (!match) return undefined;
const amount = Number(match[1]);
if (!Number.isFinite(amount)) return undefined;
const unit = match[2] ?? "ms";
const multiplier = unit.startsWith("m") && unit !== "ms" ? 60000 : unit.startsWith("s") ? 1000 : 1;
return Math.round(amount * multiplier);
}

function sanitizeValidationText(value, maxLength = 240) {
const text = String(value ?? "").replace(/[\r\n\t]+/g, " ").trim();
if (!text) return undefined;
const redacted = redactPrivateValidationMetrics(redactLocalValidationPaths(text));
return redacted.length <= maxLength ? redacted : `${redacted.slice(0, maxLength - 3)}...`;
}

function redactLocalValidationPaths(text) {
const pathSegment = "[^\\\\/\\s\"'`,;)]+(?:\\s+[^\\\\/\\s\"'`,;)]+)*(?=[\\\\/])";
const pathTail = "[^\\\\/\\s\"'`,;)]+";
const localPathPattern = new RegExp(`(^|[\\s"'\\\`=])((?:~[\\\\/]|[A-Za-z]:[\\\\/]|/)(?:${pathSegment}[\\\\/])*${pathTail})`, "g");
return text.replace(localPathPattern, (_, prefix) => `${prefix}<local-path>`);
}

function redactPrivateValidationMetrics(text) {
return text.replace(
/\b(?:wallet|hotkey|coldkey|mnemonic|raw[-_\s]?trust|private[-_\s]?reviewability|trust[-_\s]?score)\b(?:\s*[:=]\s*(?:"[^"]*"|'[^']*'|[^\s"'`,;)]+))?/gi,
"[redacted]",
);
}

function clientSnippet(client, command) {
Expand Down
4 changes: 3 additions & 1 deletion src/api/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,10 @@ const localBranchChangedFileSchema = z
const localBranchValidationSchema = z
.object({
command: z.string().min(1).max(MAX_LOCAL_BRANCH_REF_CHARS),
status: z.enum(["passed", "failed", "not_run"]),
status: z.enum(["passed", "failed", "not_run", "skipped", "focused", "unknown"]),
summary: z.string().max(MAX_LOCAL_BRANCH_TEXT_CHARS).optional(),
durationMs: z.number().int().min(0).optional(),
exitCode: z.number().int().min(0).optional(),
})
.strict();

Expand Down
4 changes: 3 additions & 1 deletion src/mcp/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,10 @@ const localBranchAnalysisShape = {
z
.object({
command: z.string().min(1),
status: z.enum(["passed", "failed", "not_run"]),
status: z.enum(["passed", "failed", "not_run", "skipped", "focused", "unknown"]),
summary: z.string().optional(),
durationMs: z.number().int().min(0).optional(),
exitCode: z.number().int().min(0).optional(),
})
.strict(),
)
Expand Down
10 changes: 9 additions & 1 deletion src/openapi/schemas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1299,7 +1299,15 @@ export const LocalBranchAnalysisSchema = z
passed: z.number(),
failed: z.number(),
notRun: z.number(),
commands: z.array(z.object({ command: z.string(), status: z.enum(["passed", "failed", "not_run"]), summary: z.string().optional() })),
commands: z.array(
z.object({
command: z.string(),
status: z.enum(["passed", "failed", "not_run", "skipped", "focused", "unknown"]),
summary: z.string().optional(),
durationMs: z.number().optional(),
exitCode: z.number().optional(),
}),
),
}),
publicSafeWarnings: z.array(z.string()),
}),
Expand Down
12 changes: 7 additions & 5 deletions src/signals/local-branch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ export type LocalBranchChangedFile = {

export type LocalBranchValidation = {
command: string;
status: "passed" | "failed" | "not_run";
status: "passed" | "failed" | "not_run" | "skipped" | "focused" | "unknown";
summary?: string | undefined;
durationMs?: number | undefined;
exitCode?: number | undefined;
};

export type LocalBranchScorer = {
Expand Down Expand Up @@ -640,7 +642,7 @@ function buildPublicSafePrPacket(args: {
);
const validationLines =
args.validationSummary.commands.length > 0
? args.validationSummary.commands.map((entry) => `- ${entry.status}: ${entry.command}${entry.summary ? ` (${entry.summary})` : ""}`)
? args.validationSummary.commands.map((entry) => `- ${entry.status}: ${entry.command}${entry.durationMs !== undefined ? ` [${entry.durationMs}ms]` : ""}${entry.summary ? ` (${entry.summary})` : ""}`)
: ["- Not supplied yet."];
const bodySections = [
{
Expand Down Expand Up @@ -699,16 +701,16 @@ function renderPrPacketMarkdown(title: string, sections: Array<{ heading: string

function summarizeValidation(validation: LocalBranchValidation[]): LocalBranchAnalysis["prPacket"]["validationSummary"] {
return {
passed: validation.filter((entry) => entry.status === "passed").length,
passed: validation.filter((entry) => entry.status === "passed" || entry.status === "focused").length,
failed: validation.filter((entry) => entry.status === "failed").length,
notRun: validation.filter((entry) => entry.status === "not_run").length,
notRun: validation.filter((entry) => entry.status === "not_run" || entry.status === "skipped" || entry.status === "unknown").length,
commands: validation,
};
}

function validationEvidence(validation: LocalBranchValidation[] | undefined): string[] {
return (validation ?? [])
.filter((entry) => entry.status === "passed")
.filter((entry) => entry.status === "passed" || entry.status === "focused")
.map((entry) => entry.command);
}

Expand Down
29 changes: 29 additions & 0 deletions test/unit/local-branch.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,35 @@ describe("local branch analysis", () => {
expect(analysis.recommendedRerunCondition).toMatch(/git fetch origin/i);
});

it("treats focused validation as evidence and failed validation as actionable", () => {
const analysis = buildLocalBranchAnalysis({
input: {
login: "oktofeesh1",
repoFullName: repo.fullName,
body: "Fixes #7",
changedFiles: [{ path: "internal/entity/model.go", additions: 10, deletions: 2, status: "modified" }],
validation: [
{ command: "go test ./internal/entity", status: "focused", durationMs: 1240, exitCode: 0, summary: "focused regression passed" },
{ command: "npm run lint", status: "failed", durationMs: 2000, exitCode: 1, summary: "raw_trust=0.4 /Users/example/log.txt" },
{ command: "npm run e2e", status: "skipped", summary: "not relevant for this fixture" },
],
},
repo,
issues: [{ repoFullName: repo.fullName, number: 7, title: "Entity model edge case", state: "open", labels: ["bug"], linkedPrs: [] }],
pullRequests: [],
profile,
outcomeHistory,
scoringSnapshot,
scoringProfile,
});

expect(analysis.prPacket.validationSummary).toMatchObject({ passed: 1, failed: 1, notRun: 1 });
expect(analysis.preflight.findings.map((finding) => finding.code)).not.toContain("missing_test_evidence");
expect(analysis.localFindings).toEqual(expect.arrayContaining([expect.objectContaining({ code: "failed_local_validation" })]));
expect(analysis.prPacket.markdown).toContain("- focused: go test ./internal/entity [1240ms] (focused regression passed)");
expect(analysis.prPacket.markdown).not.toMatch(/raw_trust|\/Users\/example/i);
});

it("includes public-safe overlap caution and hides local absolute paths", () => {
const analysis = buildLocalBranchAnalysis({
input: {
Expand Down
Loading