@evalops/maestro 0.10.8 → 0.10.11

package/dist/lsp/diagnostic-deltas.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diagnostic-deltas.js","sourceRoot":"","sources":["../../src/lsp/diagnostic-deltas.ts"],"names":[],"mappings":"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","sourcesContent":["import { resolve as resolvePath } from \"node:path\";\nimport type { LspDiagnostic } from \"./index.js\";\nimport { collectDiagnostics } from \"./index.js\";\nimport { uriToPath } from \"./utils.js\";\n\nexport type DiagnosticBaseline = {\n\tfile: string;\n\tdiagnostics: LspDiagnostic[];\n\tcaptured: boolean;\n\terrorMessage?: string;\n};\n\nexport type DiagnosticDeltaResult = {\n\tallDiagnostics: Record<string, LspDiagnostic[]>;\n\tfileDiagnostics: LspDiagnostic[];\n\tnewDiagnostics: LspDiagnostic[];\n\trepairedDiagnostics: LspDiagnostic[];\n\tusedDelta: boolean;\n\tvalidatorDiagnostics: Record<string, LspDiagnostic[]>;\n};\n\nexport async function captureDiagnosticBaseline(\n\tfile: string,\n): Promise<DiagnosticBaseline> {\n\tconst normalizedFile = normalizeDiagnosticPath(file);\n\n\ttry {\n\t\tconst diagnostics = await collectDiagnostics();\n\t\treturn {\n\t\t\tfile: normalizedFile,\n\t\t\tdiagnostics: diagnosticsForFile(diagnostics, normalizedFile),\n\t\t\tcaptured: true,\n\t\t};\n\t} catch (error) {\n\t\treturn {\n\t\t\tfile: normalizedFile,\n\t\t\tdiagnostics: [],\n\t\t\tcaptured: false,\n\t\t\terrorMessage:\n\t\t\t\terror instanceof Error\n\t\t\t\t\t? error.message\n\t\t\t\t\t: \"Unable to collect diagnostics\",\n\t\t};\n\t}\n}\n\nexport async function collectDiagnosticDelta(\n\tbaseline: DiagnosticBaseline,\n): Promise<DiagnosticDeltaResult> {\n\tconst allDiagnostics = await collectDiagnostics();\n\tconst fileDiagnostics = diagnosticsForFile(allDiagnostics, baseline.file);\n\n\tif (!baseline.captured) {\n\t\treturn {\n\t\t\tallDiagnostics,\n\t\t\tfileDiagnostics,\n\t\t\tnewDiagnostics: fileDiagnostics,\n\t\t\trepairedDiagnostics: [],\n\t\t\tusedDelta: false,\n\t\t\tvalidatorDiagnostics: allDiagnostics,\n\t\t};\n\t}\n\n\tconst newDiagnostics = diffDiagnostics(baseline.diagnostics, fileDiagnostics);\n\tconst repairedDiagnostics = diffDiagnostics(\n\t\tfileDiagnostics,\n\t\tbaseline.diagnostics,\n\t);\n\n\treturn {\n\t\tallDiagnostics,\n\t\tfileDiagnostics,\n\t\tnewDiagnostics,\n\t\trepairedDiagnostics,\n\t\tusedDelta: true,\n\t\tvalidatorDiagnostics: {\n\t\t\t[baseline.file]: newDiagnostics,\n\t\t},\n\t};\n}\n\nexport function diffDiagnostics(\n\tbefore: LspDiagnostic[],\n\tafter: LspDiagnostic[],\n): LspDiagnostic[] {\n\tconst remainingBefore = new Map<string, number>();\n\n\tfor (const diagnostic of before) {\n\t\tconst key = diagnosticKey(diagnostic);\n\t\tremainingBefore.set(key, (remainingBefore.get(key) ?? 0) + 1);\n\t}\n\n\tconst introduced: LspDiagnostic[] = [];\n\tfor (const diagnostic of after) {\n\t\tconst key = diagnosticKey(diagnostic);\n\t\tconst count = remainingBefore.get(key) ?? 0;\n\t\tif (count > 0) {\n\t\t\tremainingBefore.set(key, count - 1);\n\t\t\tcontinue;\n\t\t}\n\t\tintroduced.push(diagnostic);\n\t}\n\n\treturn introduced;\n}\n\nexport function diagnosticsForFile(\n\tdiagnostics: Record<string, LspDiagnostic[]>,\n\tfile: string,\n): LspDiagnostic[] {\n\tconst targetFile = normalizeDiagnosticPath(file);\n\tconst direct = diagnostics[file] ?? diagnostics[targetFile];\n\tif (direct) return direct;\n\n\tfor (const [diagnosticFile, entries] of Object.entries(diagnostics)) {\n\t\tif (normalizeDiagnosticPath(diagnosticFile) === targetFile) {\n\t\t\treturn entries;\n\t\t}\n\t}\n\n\treturn [];\n}\n\nfunction normalizeDiagnosticPath(file: string): string {\n\treturn resolvePath(uriToPath(file));\n}\n\nfunction diagnosticKey(diagnostic: LspDiagnostic): string {\n\treturn JSON.stringify({\n\t\tseverity: diagnostic.severity ?? null,\n\t\tsource: diagnostic.source ?? null,\n\t\tmessage: diagnostic.message,\n\t\trange: diagnostic.range,\n\t});\n}\n"]}

package/dist/lsp/diagnostic-repair.d.ts

@@ -0,0 +1,48 @@
+import type { AppMessage, ToolResultMessage } from "../agent/types.js";
+import type { DiagnosticDeltaResult } from "./diagnostic-deltas.js";
+import type { LspDiagnostic } from "./types.js";
+export declare const DIAGNOSTIC_REPAIR_MAX_ATTEMPTS = 2;
+export type StructuredDiagnosticDeltaDiagnostic = {
+    message: string;
+    severity: LspDiagnostic["severity"];
+    severityLabel: "error" | "warning" | "information" | "hint" | "unknown";
+    source?: string;
+    line: number;
+    column: number;
+    range: LspDiagnostic["range"];
+};
+export type DiagnosticDeltaToolSummary = {
+    kind: "diagnostic_delta";
+    file: string;
+    displayPath: string;
+    usedDelta: boolean;
+    introducedCount: number;
+    repairedCount: number;
+    remainingCount: number;
+    fingerprint: string;
+    introducedDiagnostics: StructuredDiagnosticDeltaDiagnostic[];
+    repairedDiagnostics: StructuredDiagnosticDeltaDiagnostic[];
+    repair: {
+        shouldFollowUp: boolean;
+        maxAttempts: number;
+        reason: string;
+    };
+};
+export type DiagnosticDeltaDetails = {
+    diagnosticDelta?: DiagnosticDeltaToolSummary;
+};
+export declare function buildDiagnosticDeltaToolSummary({ file, displayPath, result, }: {
+    file: string;
+    displayPath: string;
+    result: DiagnosticDeltaResult;
+}): DiagnosticDeltaToolSummary;
+export declare function formatDiagnosticDeltaForToolOutput(summary: DiagnosticDeltaToolSummary): string;
+export declare function getDiagnosticDeltaFromToolResult(message: ToolResultMessage): DiagnosticDeltaToolSummary | undefined;
+export declare function buildDiagnosticRepairFollowUpMessage({ summary, toolName, toolCallId, attempt, }: {
+    summary: DiagnosticDeltaToolSummary;
+    toolName: string;
+    toolCallId: string;
+    attempt: number;
+}): AppMessage;
+export declare function hasDiagnosticRepairOptOut(messages: AppMessage[]): boolean;
+//# sourceMappingURL=diagnostic-repair.d.ts.map

package/dist/lsp/diagnostic-repair.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"diagnostic-repair.d.ts","sourceRoot":"","sources":["../../src/lsp/diagnostic-repair.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,eAAO,MAAM,8BAA8B,IAAI,CAAC;AAEhD,MAAM,MAAM,mCAAmC,GAAG;IACjD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IACpC,aAAa,EAAE,OAAO,GAAG,SAAS,GAAG,aAAa,GAAG,MAAM,GAAG,SAAS,CAAC;IACxE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACxC,IAAI,EAAE,kBAAkB,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,EAAE,mCAAmC,EAAE,CAAC;IAC7D,mBAAmB,EAAE,mCAAmC,EAAE,CAAC;IAC3D,MAAM,EAAE;QACP,cAAc,EAAE,OAAO,CAAC;QACxB,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;KACf,CAAC;CACF,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACpC,eAAe,CAAC,EAAE,0BAA0B,CAAC;CAC7C,CAAC;AAEF,wBAAgB,+BAA+B,CAAC,EAC/C,IAAI,EACJ,WAAW,EACX,MAAM,GACN,EAAE;IACF,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,qBAAqB,CAAC;CAC9B,GAAG,0BAA0B,CA2B7B;AAED,wBAAgB,kCAAkC,CACjD,OAAO,EAAE,0BAA0B,GACjC,MAAM,CAgBR;AAED,wBAAgB,gCAAgC,CAC/C,OAAO,EAAE,iBAAiB,GACxB,0BAA0B,GAAG,SAAS,CAUxC;AAED,wBAAgB,oCAAoC,CAAC,EACpD,OAAO,EACP,QAAQ,EACR,UAAU,EACV,OAAO,GACP,EAAE;IACF,OAAO,EAAE,0BAA0B,CAAC;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CAChB,GAAG,UAAU,CAiCb;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAWzE"}

package/dist/lsp/diagnostic-repair.js

@@ -0,0 +1,143 @@
+import { createHash } from "node:crypto";
+export const DIAGNOSTIC_REPAIR_MAX_ATTEMPTS = 2;
+export function buildDiagnosticDeltaToolSummary({ file, displayPath, result, }) {
+    const introducedDiagnostics = result.newDiagnostics.map(structureDiagnostic);
+    const repairedDiagnostics = result.repairedDiagnostics.map(structureDiagnostic);
+    const introducedCount = introducedDiagnostics.length;
+    const repairedCount = repairedDiagnostics.length;
+    const remainingCount = result.fileDiagnostics.length;
+    return {
+        kind: "diagnostic_delta",
+        file,
+        displayPath,
+        usedDelta: result.usedDelta,
+        introducedCount,
+        repairedCount,
+        remainingCount,
+        fingerprint: fingerprintDiagnostics(result.newDiagnostics),
+        introducedDiagnostics,
+        repairedDiagnostics,
+        repair: {
+            shouldFollowUp: result.usedDelta && introducedCount > 0,
+            maxAttempts: DIAGNOSTIC_REPAIR_MAX_ATTEMPTS,
+            reason: result.usedDelta
+                ? "New diagnostics were introduced by this tool call."
+                : "Diagnostic baseline was unavailable, so diagnostics are not treated as agent-caused.",
+        },
+    };
+}
+export function formatDiagnosticDeltaForToolOutput(summary) {
+    if (summary.introducedCount === 0 && summary.repairedCount === 0) {
+        return "";
+    }
+    const lines = [
+        `Diagnostic delta: ${summary.introducedCount} introduced, ${summary.repairedCount} repaired, ${summary.remainingCount} remaining.`,
+    ];
+    if (summary.repair.shouldFollowUp) {
+        lines.push(`Self-repair guidance: treat only the ${summary.introducedCount} introduced diagnostic(s) above as caused by this ${summary.displayPath} edit/write. Repair them, run a focused read/diagnostic command, or explain why a safe repair is not possible. Stop after ${summary.repair.maxAttempts} unchanged attempt(s).`);
+    }
+    return lines.join("\n");
+}
+export function getDiagnosticDeltaFromToolResult(message) {
+    const details = message.details;
+    if (!details || typeof details !== "object") {
+        return undefined;
+    }
+    const diagnosticDelta = details.diagnosticDelta;
+    if (diagnosticDelta?.kind !== "diagnostic_delta") {
+        return undefined;
+    }
+    return diagnosticDelta;
+}
+export function buildDiagnosticRepairFollowUpMessage({ summary, toolName, toolCallId, attempt, }) {
+    const diagnosticLines = summary.introducedDiagnostics
+        .slice(0, 5)
+        .map((diagnostic) => `- ${diagnostic.severityLabel} ${summary.displayPath}:${diagnostic.line}:${diagnostic.column} ${diagnostic.message}`);
+    const moreCount = summary.introducedDiagnostics.length - diagnosticLines.length;
+    if (moreCount > 0) {
+        diagnosticLines.push(`- ...and ${moreCount} more introduced diagnostic(s).`);
+    }
+    return {
+        role: "user",
+        content: [
+            {
+                type: "text",
+                text: [
+                    `The ${toolName} tool call ${toolCallId} introduced ${summary.introducedCount} new diagnostic(s) in ${summary.displayPath}.`,
+                    `Automatic diagnostic repair attempt ${attempt}/${summary.repair.maxAttempts}.`,
+                    "Decide the smallest safe next step: repair the introduced diagnostics, run a focused read/diagnostic command, explain why a repair is unsafe, or stop if the user's request is already complete.",
+                    "Do not chase diagnostics that existed before this tool call, and do not repeat an unchanged repair attempt.",
+                    diagnosticLines.join("\n"),
+                ]
+                    .filter(Boolean)
+                    .join("\n\n"),
+            },
+        ],
+        timestamp: Date.now(),
+    };
+}
+export function hasDiagnosticRepairOptOut(messages) {
+    const lastUser = [...messages]
+        .reverse()
+        .find((message) => message.role === "user");
+    if (!lastUser) {
+        return false;
+    }
+    const text = messageText(lastUser).toLowerCase();
+    return /\b(do not|don't|dont|no)\s+(continue|repair|fix|self[- ]?repair|auto[- ]?repair)\b/.test(text);
+}
+function structureDiagnostic(diagnostic) {
+    return {
+        message: diagnostic.message,
+        severity: diagnostic.severity,
+        severityLabel: severityLabel(diagnostic.severity),
+        source: diagnostic.source,
+        line: diagnostic.range.start.line + 1,
+        column: diagnostic.range.start.character + 1,
+        range: diagnostic.range,
+    };
+}
+function severityLabel(severity) {
+    switch (severity) {
+        case 1:
+            return "error";
+        case 2:
+            return "warning";
+        case 3:
+            return "information";
+        case 4:
+            return "hint";
+        default:
+            return "unknown";
+    }
+}
+function fingerprintDiagnostics(diagnostics) {
+    if (diagnostics.length === 0) {
+        return "none";
+    }
+    const payload = diagnostics
+        .map((diagnostic) => JSON.stringify({
+        severity: diagnostic.severity ?? null,
+        source: diagnostic.source ?? null,
+        message: diagnostic.message,
+        range: diagnostic.range,
+    }))
+        .sort()
+        .join("\n");
+    return createHash("sha256").update(payload).digest("hex").slice(0, 16);
+}
+function messageText(message) {
+    if (!("content" in message)) {
+        return "";
+    }
+    if (typeof message.content === "string") {
+        return message.content;
+    }
+    if (!Array.isArray(message.content)) {
+        return "";
+    }
+    return message.content
+        .map((part) => (part.type === "text" ? part.text : ""))
+        .join("\n");
+}
+//# sourceMappingURL=diagnostic-repair.js.map

package/dist/lsp/diagnostic-repair.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diagnostic-repair.js","sourceRoot":"","sources":["../../src/lsp/diagnostic-repair.ts"],"names":[],"mappings":"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","sourcesContent":["import { createHash } from \"node:crypto\";\nimport type { AppMessage, ToolResultMessage } from \"../agent/types.js\";\nimport type { DiagnosticDeltaResult } from \"./diagnostic-deltas.js\";\nimport type { LspDiagnostic } from \"./types.js\";\n\nexport const DIAGNOSTIC_REPAIR_MAX_ATTEMPTS = 2;\n\nexport type StructuredDiagnosticDeltaDiagnostic = {\n\tmessage: string;\n\tseverity: LspDiagnostic[\"severity\"];\n\tseverityLabel: \"error\" | \"warning\" | \"information\" | \"hint\" | \"unknown\";\n\tsource?: string;\n\tline: number;\n\tcolumn: number;\n\trange: LspDiagnostic[\"range\"];\n};\n\nexport type DiagnosticDeltaToolSummary = {\n\tkind: \"diagnostic_delta\";\n\tfile: string;\n\tdisplayPath: string;\n\tusedDelta: boolean;\n\tintroducedCount: number;\n\trepairedCount: number;\n\tremainingCount: number;\n\tfingerprint: string;\n\tintroducedDiagnostics: StructuredDiagnosticDeltaDiagnostic[];\n\trepairedDiagnostics: StructuredDiagnosticDeltaDiagnostic[];\n\trepair: {\n\t\tshouldFollowUp: boolean;\n\t\tmaxAttempts: number;\n\t\treason: string;\n\t};\n};\n\nexport type DiagnosticDeltaDetails = {\n\tdiagnosticDelta?: DiagnosticDeltaToolSummary;\n};\n\nexport function buildDiagnosticDeltaToolSummary({\n\tfile,\n\tdisplayPath,\n\tresult,\n}: {\n\tfile: string;\n\tdisplayPath: string;\n\tresult: DiagnosticDeltaResult;\n}): DiagnosticDeltaToolSummary {\n\tconst introducedDiagnostics = result.newDiagnostics.map(structureDiagnostic);\n\tconst repairedDiagnostics =\n\t\tresult.repairedDiagnostics.map(structureDiagnostic);\n\tconst introducedCount = introducedDiagnostics.length;\n\tconst repairedCount = repairedDiagnostics.length;\n\tconst remainingCount = result.fileDiagnostics.length;\n\n\treturn {\n\t\tkind: \"diagnostic_delta\",\n\t\tfile,\n\t\tdisplayPath,\n\t\tusedDelta: result.usedDelta,\n\t\tintroducedCount,\n\t\trepairedCount,\n\t\tremainingCount,\n\t\tfingerprint: fingerprintDiagnostics(result.newDiagnostics),\n\t\tintroducedDiagnostics,\n\t\trepairedDiagnostics,\n\t\trepair: {\n\t\t\tshouldFollowUp: result.usedDelta && introducedCount > 0,\n\t\t\tmaxAttempts: DIAGNOSTIC_REPAIR_MAX_ATTEMPTS,\n\t\t\treason: result.usedDelta\n\t\t\t\t? \"New diagnostics were introduced by this tool call.\"\n\t\t\t\t: \"Diagnostic baseline was unavailable, so diagnostics are not treated as agent-caused.\",\n\t\t},\n\t};\n}\n\nexport function formatDiagnosticDeltaForToolOutput(\n\tsummary: DiagnosticDeltaToolSummary,\n): string {\n\tif (summary.introducedCount === 0 && summary.repairedCount === 0) {\n\t\treturn \"\";\n\t}\n\n\tconst lines = [\n\t\t`Diagnostic delta: ${summary.introducedCount} introduced, ${summary.repairedCount} repaired, ${summary.remainingCount} remaining.`,\n\t];\n\n\tif (summary.repair.shouldFollowUp) {\n\t\tlines.push(\n\t\t\t`Self-repair guidance: treat only the ${summary.introducedCount} introduced diagnostic(s) above as caused by this ${summary.displayPath} edit/write. Repair them, run a focused read/diagnostic command, or explain why a safe repair is not possible. Stop after ${summary.repair.maxAttempts} unchanged attempt(s).`,\n\t\t);\n\t}\n\n\treturn lines.join(\"\\n\");\n}\n\nexport function getDiagnosticDeltaFromToolResult(\n\tmessage: ToolResultMessage,\n): DiagnosticDeltaToolSummary | undefined {\n\tconst details = message.details;\n\tif (!details || typeof details !== \"object\") {\n\t\treturn undefined;\n\t}\n\tconst diagnosticDelta = (details as DiagnosticDeltaDetails).diagnosticDelta;\n\tif (diagnosticDelta?.kind !== \"diagnostic_delta\") {\n\t\treturn undefined;\n\t}\n\treturn diagnosticDelta;\n}\n\nexport function buildDiagnosticRepairFollowUpMessage({\n\tsummary,\n\ttoolName,\n\ttoolCallId,\n\tattempt,\n}: {\n\tsummary: DiagnosticDeltaToolSummary;\n\ttoolName: string;\n\ttoolCallId: string;\n\tattempt: number;\n}): AppMessage {\n\tconst diagnosticLines = summary.introducedDiagnostics\n\t\t.slice(0, 5)\n\t\t.map(\n\t\t\t(diagnostic) =>\n\t\t\t\t`- ${diagnostic.severityLabel} ${summary.displayPath}:${diagnostic.line}:${diagnostic.column} ${diagnostic.message}`,\n\t\t);\n\tconst moreCount =\n\t\tsummary.introducedDiagnostics.length - diagnosticLines.length;\n\tif (moreCount > 0) {\n\t\tdiagnosticLines.push(\n\t\t\t`- ...and ${moreCount} more introduced diagnostic(s).`,\n\t\t);\n\t}\n\n\treturn {\n\t\trole: \"user\",\n\t\tcontent: [\n\t\t\t{\n\t\t\t\ttype: \"text\",\n\t\t\t\ttext: [\n\t\t\t\t\t`The ${toolName} tool call ${toolCallId} introduced ${summary.introducedCount} new diagnostic(s) in ${summary.displayPath}.`,\n\t\t\t\t\t`Automatic diagnostic repair attempt ${attempt}/${summary.repair.maxAttempts}.`,\n\t\t\t\t\t\"Decide the smallest safe next step: repair the introduced diagnostics, run a focused read/diagnostic command, explain why a repair is unsafe, or stop if the user's request is already complete.\",\n\t\t\t\t\t\"Do not chase diagnostics that existed before this tool call, and do not repeat an unchanged repair attempt.\",\n\t\t\t\t\tdiagnosticLines.join(\"\\n\"),\n\t\t\t\t]\n\t\t\t\t\t.filter(Boolean)\n\t\t\t\t\t.join(\"\\n\\n\"),\n\t\t\t},\n\t\t],\n\t\ttimestamp: Date.now(),\n\t};\n}\n\nexport function hasDiagnosticRepairOptOut(messages: AppMessage[]): boolean {\n\tconst lastUser = [...messages]\n\t\t.reverse()\n\t\t.find((message) => message.role === \"user\");\n\tif (!lastUser) {\n\t\treturn false;\n\t}\n\tconst text = messageText(lastUser).toLowerCase();\n\treturn /\\b(do not|don't|dont|no)\\s+(continue|repair|fix|self[- ]?repair|auto[- ]?repair)\\b/.test(\n\t\ttext,\n\t);\n}\n\nfunction structureDiagnostic(\n\tdiagnostic: LspDiagnostic,\n): StructuredDiagnosticDeltaDiagnostic {\n\treturn {\n\t\tmessage: diagnostic.message,\n\t\tseverity: diagnostic.severity,\n\t\tseverityLabel: severityLabel(diagnostic.severity),\n\t\tsource: diagnostic.source,\n\t\tline: diagnostic.range.start.line + 1,\n\t\tcolumn: diagnostic.range.start.character + 1,\n\t\trange: diagnostic.range,\n\t};\n}\n\nfunction severityLabel(\n\tseverity: LspDiagnostic[\"severity\"],\n): StructuredDiagnosticDeltaDiagnostic[\"severityLabel\"] {\n\tswitch (severity) {\n\t\tcase 1:\n\t\t\treturn \"error\";\n\t\tcase 2:\n\t\t\treturn \"warning\";\n\t\tcase 3:\n\t\t\treturn \"information\";\n\t\tcase 4:\n\t\t\treturn \"hint\";\n\t\tdefault:\n\t\t\treturn \"unknown\";\n\t}\n}\n\nfunction fingerprintDiagnostics(diagnostics: LspDiagnostic[]): string {\n\tif (diagnostics.length === 0) {\n\t\treturn \"none\";\n\t}\n\tconst payload = diagnostics\n\t\t.map((diagnostic) =>\n\t\t\tJSON.stringify({\n\t\t\t\tseverity: diagnostic.severity ?? null,\n\t\t\t\tsource: diagnostic.source ?? null,\n\t\t\t\tmessage: diagnostic.message,\n\t\t\t\trange: diagnostic.range,\n\t\t\t}),\n\t\t)\n\t\t.sort()\n\t\t.join(\"\\n\");\n\treturn createHash(\"sha256\").update(payload).digest(\"hex\").slice(0, 16);\n}\n\nfunction messageText(message: AppMessage): string {\n\tif (!(\"content\" in message)) {\n\t\treturn \"\";\n\t}\n\tif (typeof message.content === \"string\") {\n\t\treturn message.content;\n\t}\n\tif (!Array.isArray(message.content)) {\n\t\treturn \"\";\n\t}\n\treturn message.content\n\t\t.map((part) => (part.type === \"text\" ? part.text : \"\"))\n\t\t.join(\"\\n\");\n}\n"]}

package/dist/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuFG;AAmTH;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,iBAy4BxC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuFG;AA4TH;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,iBAm+BxC"}

package/dist/main.js

@@ -86,13 +86,14 @@
  *
  * @module main
  */
+import { createRequire } from "node:module";
 import chalk from "chalk";
-import { ActionApprovalService, } from "./agent/action-approval.js";
 import { createBackgroundTextAgent } from "./agent/background-agent.js";
 import { isAssistantMessage, } from "./agent/index.js";
 import { applySessionEndHooks } from "./agent/session-lifecycle-hooks.js";
 import { ToolRetryService } from "./agent/tool-retry.js";
 import { applySessionStartHooks, runUserPromptWithRecovery, } from "./agent/user-prompt-runtime.js";
+import { PlatformBackedActionApprovalService } from "./approvals/platform-action-approval.js";
 import { createAuthSetup, validateCodexFlags } from "./bootstrap/auth-setup.js";
 import { disposeCheckpointService, initCheckpointService, } from "./checkpoints/index.js";
 import { TuiClientToolService } from "./cli-tui/client-tools/local-client-tool-service.js";
@@ -114,7 +115,6 @@ import { createAutomaticMemoryExtractionCoordinator, getMemoryExtractionSystemPr
 import { ensureModelsLoaded } from "./models/builtin.js";
 import { reloadModelConfig } from "./models/registry.js";
 import { initOpenTelemetry } from "./opentelemetry.js";
-import { getPackageVersion } from "./package-metadata.js";
 import { resolveMaestroSystemPrompt } from "./prompts/system-prompt.js";
 import { AgentRuntimeController } from "./runtime/agent-runtime.js";
 import { registerBackgroundTaskShutdownHooks } from "./runtime/background-task-hooks.js";
@@ -124,8 +124,15 @@ import { clientToolService } from "./server/client-tools-service.js";
 import { ServerRequestToolRetryService } from "./server/tool-retry-service.js";
 import { SessionManager } from "./session/manager.js";
 import { askUserClientTool } from "./tools/ask-user-client.js";
+import { createStartupProfilerFromEnv } from "./utils/checkpoint-profiler.js";
 import { isInsideGitRepository } from "./utils/git.js";
-const VERSION = getPackageVersion();
+/**
+ * Load version from package.json at runtime.
+ * Uses Node's createRequire for compatibility with ESM imports
+ * (avoids experimental import assertions syntax).
+ */
+const packageJson = createRequire(import.meta.url)("../package.json");
+const VERSION = packageJson.version ?? "unknown";
 let enterpriseCleanupRegistered = false;
 let checkpointCleanupRegistered = false;
 let sandboxCleanupRegistered = false;
@@ -327,8 +334,11 @@ export async function main(args) {
     // ─────────────────────────────────────────────────────────────────────────────
     // Load environment variables from .env files (project and user level)
     loadEnv();
+    const startupProfiler = createStartupProfilerFromEnv();
+    startupProfiler.checkpoint("process:start");
     // Parse arguments early to check for version/help flags before heavy initialization
     const parsed = parseArgs(args);
+    startupProfiler.checkpoint("cli:parsed");
     // Handle --version early exit (before any async operations)
     if (parsed.version) {
         console.log(`Maestro v${VERSION}`);
@@ -343,6 +353,15 @@ export async function main(args) {
         console.error(chalk.red(parsed.error));
         process.exit(1);
     }
+    // Handle `maestro hosted-runner` before importing web-server so hosted
+    // defaults are visible to its module-level runtime profile.
+    if (parsed.command === "hosted-runner") {
+        const { handleHostedRunnerCommand } = await import("./cli/commands/hosted-runner.js");
+        await handleHostedRunnerCommand(parsed.commandArgs ?? [], {
+            defaultPort: parsed.port,
+        });
+        return;
+    }
     // Handle `maestro web` early exit (start the bundled web server + UI).
     if (parsed.command === "web") {
         if (parsed.messages.length > 0) {
@@ -350,19 +369,15 @@ export async function main(args) {
             process.exit(1);
         }
         const { startWebServer } = await import("./web-server.js");
+        const { migrate } = await import("./db/migrate.js");
         const port = parsed.port ?? (Number.parseInt(process.env.PORT || "8080", 10) || 8080);
-        await startWebServer(port);
+        await migrate();
+        await startWebServer(port, { skipStartupMigration: true });
         return;
     }
-    const runtimeConfig = loadRuntimeConfig(parsed, process.cwd());
-    const reasoningSummary = runtimeConfig.config.model_supports_reasoning_summaries === false
-        ? undefined
-        : runtimeConfig.config.model_reasoning_summary === "none"
-            ? null
-            : runtimeConfig.config.model_reasoning_summary;
     // If we're about to enter interactive TUI mode (no prompt messages and not RPC/exec),
     // or headless mode (stdout is JSON-only), redirect all logging/console output to a file.
-    // This must run before model loading to catch any early warnings.
+    // This must run before config/model loading to catch any early warnings.
     const isLikelyInteractiveTui = !parsed.messages.length &&
         (parsed.mode === "text" || parsed.mode === undefined) &&
         parsed.command === undefined;
@@ -370,15 +385,35 @@ export async function main(args) {
     if (isLikelyInteractiveTui || isHeadlessMode) {
         const { redirectLoggerToFile, redirectConsoleToLogger, redirectStderrToLogger, pipeProcessEventsToLogger, } = await import("./utils/logger.js");
         redirectLoggerToFile();
-        redirectConsoleToLogger();
-        redirectStderrToLogger();
+        redirectConsoleToLogger({ preserveErrorStderr: isHeadlessMode });
+        if (!isHeadlessMode) {
+            redirectStderrToLogger();
+        }
         pipeProcessEventsToLogger();
     }
-    const startupProfilingEnabled = process.env.MAESTRO_STARTUP_PROFILE === "1";
-    const logStartupPhase = (label, startedAt) => {
-        if (!startupProfilingEnabled)
-            return;
-        console.error(`[startup] ${label}: ${Math.round(performance.now() - startedAt)}ms`);
+    const runtimeConfig = loadRuntimeConfig(parsed, process.cwd());
+    startupProfiler.checkpoint("config:loaded");
+    const reasoningSummary = runtimeConfig.config.model_supports_reasoning_summaries === false
+        ? undefined
+        : runtimeConfig.config.model_reasoning_summary === "none"
+            ? null
+            : runtimeConfig.config.model_reasoning_summary;
+    const exitWithStartupError = (error) => {
+        const message = error instanceof Error ? error.message : String(error);
+        const stack = error instanceof Error ? error.stack : undefined;
+        if (isHeadlessMode) {
+            process.stdout.write(`${JSON.stringify({
+                type: "error",
+                message: `Headless startup failed: ${message}`,
+                fatal: true,
+                error_type: "fatal",
+            })}\n`);
+            process.stderr.write(`${stack ?? message}\n`);
+        }
+        else {
+            console.error(chalk.red(message));
+        }
+        process.exit(1);
     };
     // ─────────────────────────────────────────────────────────────────────────────
     // PHASE 1: Environment and Telemetry Initialization
@@ -386,17 +421,14 @@ export async function main(args) {
     // Initialize OpenTelemetry tracing for observability
     // This is non-blocking (void) to avoid startup latency
     void initOpenTelemetry("composer-cli");
-    const bootstrapParallelStart = performance.now();
     const modelLoadPromise = (async () => {
-        const startedAt = performance.now();
         await ensureModelsLoaded();
-        logStartupPhase("models.loaded", startedAt);
+        startupProfiler.checkpoint("models:loaded");
     })();
     const enterpriseContextPromise = (async () => {
-        const startedAt = performance.now();
         const { enterpriseContext } = await import("./enterprise/context.js");
         await enterpriseContext.initialize();
-        logStartupPhase("enterprise.initialized", startedAt);
+        startupProfiler.checkpoint("enterprise:initialized");
         return enterpriseContext;
     })();
     // Pre-load model registry and enterprise context in parallel. These are
@@ -405,7 +437,7 @@ export async function main(args) {
         enterpriseContextPromise,
         modelLoadPromise,
     ]);
-    logStartupPhase("bootstrap.parallel", bootstrapParallelStart);
+    startupProfiler.checkpoint("bootstrap:parallel");
     // ─────────────────────────────────────────────────────────────────────────────
     // PHASE 2: Enterprise Context Initialization
     // ─────────────────────────────────────────────────────────────────────────────
@@ -453,24 +485,22 @@ export async function main(args) {
         validateCodexFlags(args, parsed.command);
     }
     catch (error) {
-        console.error(chalk.red(error instanceof Error ? error.message : String(error)));
-        process.exit(1);
+        exitWithStartupError(error);
     }
     const { requireCredential } = createAuthSetup({
         authMode,
         explicitApiKey: parsed.apiKey,
     });
+    startupProfiler.checkpoint("auth:configured");
     if (parsed.command === "exec") {
         if (parsed.execFullAuto && parsed.execReadOnly) {
-            console.error(chalk.red("Cannot combine --full-auto with --read-only in maestro exec."));
-            process.exit(1);
+            exitWithStartupError("Cannot combine --full-auto with --read-only in maestro exec.");
         }
     }
     // Validate sandbox mode (applies to both exec and interactive modes)
     const validSandboxModes = ["docker", "local", "none"];
     if (parsed.sandbox && !validSandboxModes.includes(parsed.sandbox)) {
-        console.error(chalk.red(`Unknown sandbox mode "${parsed.sandbox}". Supported: ${validSandboxModes.join(", ")}`));
-        process.exit(1);
+        exitWithStartupError(`Unknown sandbox mode "${parsed.sandbox}". Supported: ${validSandboxModes.join(", ")}`);
     }
     // ─────────────────────────────────────────────────────────────────────────────
     // PHASE 5: Safety, LSP, and Checkpointing
@@ -502,6 +532,7 @@ export async function main(args) {
         process.once("SIGTERM", disposeCheckpoint);
         checkpointCleanupRegistered = true;
     }
+    startupProfiler.checkpoint("runtime:prepared");
     // ─────────────────────────────────────────────────────────────────────────────
     // Early Exit: Help Command
     // ─────────────────────────────────────────────────────────────────────────────
@@ -540,6 +571,21 @@ export async function main(args) {
         await handleOpenAICommand(parsed.subcommand, parsed.messages);
         return;
     }
+    if (parsed.command === "evalops") {
+        const { handleEvalOpsCommand } = await import("./cli/commands/evalops.js");
+        await handleEvalOpsCommand(parsed.subcommand);
+        return;
+    }
+    if (parsed.command === "init") {
+        const { handleInitCommand } = await import("./cli/commands/init.js");
+        await handleInitCommand(parsed.commandArgs ?? []);
+        return;
+    }
+    if (parsed.command === "codex") {
+        const { handleCodexCommand } = await import("./cli/commands/codex.js");
+        await handleCodexCommand(parsed.subcommand, parsed.messages);
+        return;
+    }
     if (parsed.command === "hooks") {
         const { handleHooksCommand } = await import("./cli/commands/hooks.js");
         await handleHooksCommand(parsed.subcommand);
@@ -560,6 +606,11 @@ export async function main(args) {
         await handleMemoryCommand(parsed.subcommand, parsed.messages);
         return;
     }
+    if (parsed.command === "remote") {
+        const { handleRemoteCommand } = await import("./cli/commands/remote.js");
+        await handleRemoteCommand(parsed.subcommand, parsed.commandArgs ?? []);
+        return;
+    }
     if (parsed.command === "anthropic") {
         const { handleAnthropicCommand } = await import("./cli/commands/anthropic.js");
         await handleAnthropicCommand(parsed.subcommand, parsed.messages);
@@ -599,6 +650,34 @@ export async function main(args) {
                 process.exit(1);
         }
     }
+    if (parsed.command === "stats") {
+        const { handleStatsCommand } = await import("./cli/commands/stats.js");
+        switch (parsed.subcommand) {
+            case undefined:
+            case "today":
+            case "yesterday":
+            case "week":
+            case "7d":
+            case "month":
+            case "30d":
+            case "all":
+                await handleStatsCommand(parsed.subcommand, {
+                    sessionId: parsed.session,
+                    format: parsed.exportFormat,
+                });
+                return;
+            default:
+                console.error(chalk.red(`Unknown stats subcommand: ${parsed.subcommand}`));
+                console.log(chalk.dim("\nAvailable commands:"));
+                console.log(chalk.dim("  maestro stats              - Show last 7 days"));
+                console.log(chalk.dim("  maestro stats --session <id> - Show one session"));
+                console.log(chalk.dim("  maestro stats today        - Show today"));
+                console.log(chalk.dim("  maestro stats month        - Show last 30 days"));
+                console.log(chalk.dim("  maestro stats all          - Show all time"));
+                console.log(chalk.dim("  maestro stats --format json|csv - Export usage data"));
+                process.exit(1);
+        }
+    }
     // Handle models commands
     if (parsed.command === "models") {
         const { handleModelsList, handleModelsProviders } = await import("./cli/commands/models.js");
@@ -660,6 +739,7 @@ export async function main(args) {
     // - Model/thinking level tracking across restarts
     const sessionManager = new SessionManager(parsed.continue && !parsed.resume, // continueSession: auto-load most recent
     parsed.session);
+    startupProfiler.checkpoint("session:created");
     let execResumeApplied = false;
     if (parsed.command === "exec") {
         let targetPath = null;
@@ -712,8 +792,7 @@ export async function main(args) {
         model = resolved.model;
     }
     catch (error) {
-        console.error(chalk.red(error instanceof Error ? error.message : String(error)));
-        process.exit(1);
+        exitWithStartupError(error);
     }
     // ─────────────────────────────────────────────────────────────────────────────
     // PHASE 9: System Prompt and Tool Configuration
@@ -729,6 +808,9 @@ export async function main(args) {
         toolNames: systemPromptToolNames,
         appendPrompt: parsed.appendSystemPrompt,
     });
+    startupProfiler.checkpoint("prompt:assembled", {
+        system_bytes: systemPrompt.length,
+    });
     const systemPromptSourcePaths = resolveExplicitSystemPromptSourcePaths(parsed.systemPrompt, parsed.appendSystemPrompt);
     // Determine approval mode for tool execution:
     // - "prompt": Ask user before each tool execution (default for interactive)
@@ -751,7 +833,9 @@ export async function main(args) {
     // Create approval service that controls tool execution authorization
     const approvalService = isHeadlessMode
         ? new ServerRequestActionApprovalService(approvalModeOverride, () => sessionManager.getSessionId() ?? undefined)
-        : new ActionApprovalService(approvalModeOverride);
+        : new PlatformBackedActionApprovalService(approvalModeOverride, {
+            sessionIdProvider: () => sessionManager.getSessionId() ?? undefined,
+        });
     const headlessClientToolService = isHeadlessMode
         ? clientToolService.forSession(() => sessionManager.getSessionId() ?? undefined)
         : undefined;
@@ -775,10 +859,10 @@ export async function main(args) {
         });
     }
     catch (error) {
-        console.error(chalk.red(error instanceof Error ? error.message : String(error)));
-        process.exit(1);
+        exitWithStartupError(error);
     }
     const { allTools, sandbox, sandboxMode } = toolsResult;
+    startupProfiler.checkpoint("tools:prepared", { tools: allTools.length });
     const useInteractiveClientTools = Boolean(interactiveClientToolService);
     const replaceAskUserTool = (tools) => tools.map((tool) => tool.name === "ask_user" ? askUserClientTool : tool);
     const configuredAllTools = useInteractiveClientTools
@@ -828,6 +912,7 @@ export async function main(args) {
         cwd: process.cwd(),
     });
     setTaskBudgetTotal(agent, parsed.taskBudget);
+    startupProfiler.checkpoint("agent:ready");
     // ─────────────────────────────────────────────────────────────────────────────
     // PHASE 11.5: TypeScript Hooks Initialization
     // ─────────────────────────────────────────────────────────────────────────────
@@ -841,14 +926,13 @@ export async function main(args) {
     // ─────────────────────────────────────────────────────────────────────────────
     // PHASE 12: MCP (Model Context Protocol) Integration
     // ─────────────────────────────────────────────────────────────────────────────
-    const mcpInitStartedAt = performance.now();
     const { initializeMcpServers } = await import("./bootstrap/mcp-setup.js");
     initializeMcpServers({
         agent,
         baseTools: configuredAllTools,
         cwd: process.cwd(),
     });
-    logStartupPhase("mcp.bootstrap_queued", mcpInitStartedAt);
+    startupProfiler.checkpoint("mcp:bootstrap_queued");
     // Determine mode early to know if we should print messages
     const isInteractive = parsed.messages.length === 0;
     const mode = parsed.mode || "text";
@@ -939,6 +1023,7 @@ export async function main(args) {
     // 5. Single-shot: Process CLI messages and exit
     try {
         if (agentsInitPrompt) {
+            startupProfiler.terminal("exec:ready", { mode: "agents" });
             const cwd = process.cwd();
             const targetPath = agentsInitPath ?? "AGENTS.md";
             const displayPath = targetPath.startsWith(cwd) && targetPath !== cwd
@@ -951,15 +1036,18 @@ export async function main(args) {
         }
         else if (mode === "headless" || parsed.headless) {
             // Headless mode - for native TUI communication
+            startupProfiler.terminal("headless:ready");
             await runHeadlessMode(agent, sessionManager, approvalService, toolRetryService);
         }
         else if (mode === "rpc") {
             // RPC mode - headless operation
+            startupProfiler.terminal("rpc:ready");
             const { runRpcMode } = await import("./cli/rpc-mode.js");
             await runRpcMode(agent, sessionManager);
         }
         else if (isInteractive) {
             // No messages and not RPC - use TUI
+            startupProfiler.terminal("ui:ready");
             await runInteractiveMode(agent, sessionManager, VERSION, approvalService, toolRetryService, parsed.apiKey, {
                 clientToolService: interactiveClientToolService,
                 modelScope: scopedModels,
@@ -968,6 +1056,7 @@ export async function main(args) {
             });
         }
         else if (parsed.command === "exec") {
+            startupProfiler.terminal("exec:ready");
             await runExecCommand({
                 agent,
                 sessionManager,
@@ -980,6 +1069,7 @@ export async function main(args) {
         }
         else {
             // CLI mode with messages
+            startupProfiler.terminal("cli:ready");
             await runSingleShotMode(agent, sessionManager, parsed.messages, mode);
         }
     }