@evalops/maestro 0.10.8 → 0.10.11

package/dist/timeline/redaction.js

@@ -0,0 +1,119 @@
+const SUMMARY_LIMIT = 180;
+const SECRET_PATTERNS = [
+    [/\b(Bearer\s+)[A-Za-z0-9._~+/=-]{16,}/gi, "$1[redacted]"],
+    [/\b(sk-[A-Za-z0-9_-]{16,})\b/g, "[redacted-secret]"],
+    [/\b(gh[pousr]_[A-Za-z0-9_]{16,})\b/g, "[redacted-token]"],
+    [/\b(xox[a-zA-Z]?-[A-Za-z0-9-]{16,})\b/g, "[redacted-token]"],
+    [/\b(AKIA[0-9A-Z]{16})\b/g, "[redacted-access-key]"],
+];
+const ALWAYS_SENSITIVE_KEY_TOKENS = new Set([
+    "arg",
+    "args",
+    "argument",
+    "arguments",
+    "body",
+    "command",
+    "commands",
+    "content",
+    "credential",
+    "credentials",
+    "env",
+    "header",
+    "headers",
+    "input",
+    "inputs",
+    "output",
+    "outputs",
+    "password",
+    "passwords",
+    "prompt",
+    "prompts",
+    "secret",
+    "secrets",
+    "stderr",
+    "stdout",
+    "token",
+    "tokens",
+    "transcript",
+    "transcripts",
+]);
+const SENSITIVE_EXACT_KEYS = new Set(["request", "response"]);
+const REQUEST_RESPONSE_BODY_TOKENS = new Set([
+    "body",
+    "content",
+    "data",
+    "payload",
+    "raw",
+    "text",
+]);
+function stringValue(value) {
+    return typeof value === "string" && value.trim().length > 0
+        ? value.trim()
+        : undefined;
+}
+export function redactTimelineSecrets(value) {
+    let redacted = value;
+    for (const [pattern, replacement] of SECRET_PATTERNS) {
+        redacted = redacted.replace(pattern, replacement);
+    }
+    return redacted;
+}
+export function compactTimelineSummary(value) {
+    const text = stringValue(value);
+    if (!text)
+        return undefined;
+    const singleLine = redactTimelineSecrets(text.replace(/\s+/g, " ").trim());
+    if (!singleLine)
+        return undefined;
+    if (singleLine.length <= SUMMARY_LIMIT)
+        return singleLine;
+    return `${singleLine.slice(0, SUMMARY_LIMIT - 3)}...`;
+}
+export function compactTimelineMetadata(values) {
+    const metadata = Object.fromEntries(Object.entries(values).filter(([, value]) => value !== undefined));
+    return Object.keys(metadata).length > 0 ? metadata : undefined;
+}
+function keyTokens(key) {
+    return key
+        .replace(/([a-z0-9])([A-Z])/g, "$1_$2")
+        .toLowerCase()
+        .split(/[^a-z0-9]+/u)
+        .filter(Boolean);
+}
+function isSensitiveMetadataKey(key) {
+    const tokens = keyTokens(key);
+    if (!tokens.length) {
+        return false;
+    }
+    if (SENSITIVE_EXACT_KEYS.has(tokens.join("_"))) {
+        return true;
+    }
+    if (tokens.some((token) => ALWAYS_SENSITIVE_KEY_TOKENS.has(token))) {
+        return true;
+    }
+    const hasRequestOrResponse = tokens.includes("request") || tokens.includes("response");
+    return (hasRequestOrResponse &&
+        tokens.some((token) => REQUEST_RESPONSE_BODY_TOKENS.has(token)));
+}
+function redactMetadataValue(value) {
+    if (typeof value === "string") {
+        return compactTimelineSummary(value);
+    }
+    if (Array.isArray(value)) {
+        return value.map(redactMetadataValue).filter((item) => item !== undefined);
+    }
+    if (value && typeof value === "object") {
+        return redactTimelineMetadata(value);
+    }
+    return value;
+}
+export function redactTimelineMetadata(metadata) {
+    if (!metadata) {
+        return undefined;
+    }
+    const redacted = Object.fromEntries(Object.entries(metadata)
+        .filter(([key, value]) => value !== undefined && !isSensitiveMetadataKey(key))
+        .map(([key, value]) => [key, redactMetadataValue(value)]));
+    return Object.keys(redacted).length > 0 ? redacted : undefined;
+}
+//# sourceMappingURL=redaction.js.map

package/dist/timeline/redaction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redaction.js","sourceRoot":"","sources":["../../src/timeline/redaction.ts"],"names":[],"mappings":"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","sourcesContent":["const SUMMARY_LIMIT = 180;\n\nconst SECRET_PATTERNS: Array<[RegExp, string]> = [\n\t[/\\b(Bearer\\s+)[A-Za-z0-9._~+/=-]{16,}/gi, \"$1[redacted]\"],\n\t[/\\b(sk-[A-Za-z0-9_-]{16,})\\b/g, \"[redacted-secret]\"],\n\t[/\\b(gh[pousr]_[A-Za-z0-9_]{16,})\\b/g, \"[redacted-token]\"],\n\t[/\\b(xox[a-zA-Z]?-[A-Za-z0-9-]{16,})\\b/g, \"[redacted-token]\"],\n\t[/\\b(AKIA[0-9A-Z]{16})\\b/g, \"[redacted-access-key]\"],\n];\n\nconst ALWAYS_SENSITIVE_KEY_TOKENS = new Set([\n\t\"arg\",\n\t\"args\",\n\t\"argument\",\n\t\"arguments\",\n\t\"body\",\n\t\"command\",\n\t\"commands\",\n\t\"content\",\n\t\"credential\",\n\t\"credentials\",\n\t\"env\",\n\t\"header\",\n\t\"headers\",\n\t\"input\",\n\t\"inputs\",\n\t\"output\",\n\t\"outputs\",\n\t\"password\",\n\t\"passwords\",\n\t\"prompt\",\n\t\"prompts\",\n\t\"secret\",\n\t\"secrets\",\n\t\"stderr\",\n\t\"stdout\",\n\t\"token\",\n\t\"tokens\",\n\t\"transcript\",\n\t\"transcripts\",\n]);\n\nconst SENSITIVE_EXACT_KEYS = new Set([\"request\", \"response\"]);\n\nconst REQUEST_RESPONSE_BODY_TOKENS = new Set([\n\t\"body\",\n\t\"content\",\n\t\"data\",\n\t\"payload\",\n\t\"raw\",\n\t\"text\",\n]);\n\nfunction stringValue(value: unknown): string | undefined {\n\treturn typeof value === \"string\" && value.trim().length > 0\n\t\t? value.trim()\n\t\t: undefined;\n}\n\nexport function redactTimelineSecrets(value: string): string {\n\tlet redacted = value;\n\tfor (const [pattern, replacement] of SECRET_PATTERNS) {\n\t\tredacted = redacted.replace(pattern, replacement);\n\t}\n\treturn redacted;\n}\n\nexport function compactTimelineSummary(value: unknown): string | undefined {\n\tconst text = stringValue(value);\n\tif (!text) return undefined;\n\tconst singleLine = redactTimelineSecrets(text.replace(/\\s+/g, \" \").trim());\n\tif (!singleLine) return undefined;\n\tif (singleLine.length <= SUMMARY_LIMIT) return singleLine;\n\treturn `${singleLine.slice(0, SUMMARY_LIMIT - 3)}...`;\n}\n\nexport function compactTimelineMetadata(\n\tvalues: Record<string, unknown>,\n): Record<string, unknown> | undefined {\n\tconst metadata = Object.fromEntries(\n\t\tObject.entries(values).filter(([, value]) => value !== undefined),\n\t);\n\treturn Object.keys(metadata).length > 0 ? metadata : undefined;\n}\n\nfunction keyTokens(key: string): string[] {\n\treturn key\n\t\t.replace(/([a-z0-9])([A-Z])/g, \"$1_$2\")\n\t\t.toLowerCase()\n\t\t.split(/[^a-z0-9]+/u)\n\t\t.filter(Boolean);\n}\n\nfunction isSensitiveMetadataKey(key: string): boolean {\n\tconst tokens = keyTokens(key);\n\tif (!tokens.length) {\n\t\treturn false;\n\t}\n\tif (SENSITIVE_EXACT_KEYS.has(tokens.join(\"_\"))) {\n\t\treturn true;\n\t}\n\tif (tokens.some((token) => ALWAYS_SENSITIVE_KEY_TOKENS.has(token))) {\n\t\treturn true;\n\t}\n\tconst hasRequestOrResponse =\n\t\ttokens.includes(\"request\") || tokens.includes(\"response\");\n\treturn (\n\t\thasRequestOrResponse &&\n\t\ttokens.some((token) => REQUEST_RESPONSE_BODY_TOKENS.has(token))\n\t);\n}\n\nfunction redactMetadataValue(value: unknown): unknown {\n\tif (typeof value === \"string\") {\n\t\treturn compactTimelineSummary(value);\n\t}\n\tif (Array.isArray(value)) {\n\t\treturn value.map(redactMetadataValue).filter((item) => item !== undefined);\n\t}\n\tif (value && typeof value === \"object\") {\n\t\treturn redactTimelineMetadata(value as Record<string, unknown>);\n\t}\n\treturn value;\n}\n\nexport function redactTimelineMetadata(\n\tmetadata: Record<string, unknown> | undefined,\n): Record<string, unknown> | undefined {\n\tif (!metadata) {\n\t\treturn undefined;\n\t}\n\tconst redacted = Object.fromEntries(\n\t\tObject.entries(metadata)\n\t\t\t.filter(\n\t\t\t\t([key, value]) => value !== undefined && !isSensitiveMetadataKey(key),\n\t\t\t)\n\t\t\t.map(([key, value]) => [key, redactMetadataValue(value)]),\n\t);\n\treturn Object.keys(redacted).length > 0 ? redacted : undefined;\n}\n"]}

package/dist/tools/ask-user.d.ts

@@ -5,9 +5,19 @@
  * improving UX over free-form text input.
  */
 import { type Static } from "@sinclair/typebox";
+export declare const askUserOptionPreviewSchema: import("@sinclair/typebox").TObject<{
+    kind: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"markdown">, import("@sinclair/typebox").TLiteral<"text">, import("@sinclair/typebox").TLiteral<"diff">]>;
+    title: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    body: import("@sinclair/typebox").TString;
+}>;
 export declare const questionOptionSchema: import("@sinclair/typebox").TObject<{
     label: import("@sinclair/typebox").TString;
     description: import("@sinclair/typebox").TString;
+    preview: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+        kind: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"markdown">, import("@sinclair/typebox").TLiteral<"text">, import("@sinclair/typebox").TLiteral<"diff">]>;
+        title: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+        body: import("@sinclair/typebox").TString;
+    }>>;
 }>;
 export declare const questionSchema: import("@sinclair/typebox").TObject<{
     question: import("@sinclair/typebox").TString;
@@ -15,6 +25,11 @@ export declare const questionSchema: import("@sinclair/typebox").TObject<{
     options: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
         label: import("@sinclair/typebox").TString;
         description: import("@sinclair/typebox").TString;
+        preview: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+            kind: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"markdown">, import("@sinclair/typebox").TLiteral<"text">, import("@sinclair/typebox").TLiteral<"diff">]>;
+            title: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            body: import("@sinclair/typebox").TString;
+        }>>;
     }>>;
     multiSelect: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
 }>;
@@ -25,11 +40,17 @@ export declare const askUserSchema: import("@sinclair/typebox").TObject<{
         options: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
             label: import("@sinclair/typebox").TString;
             description: import("@sinclair/typebox").TString;
+            preview: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+                kind: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"markdown">, import("@sinclair/typebox").TLiteral<"text">, import("@sinclair/typebox").TLiteral<"diff">]>;
+                title: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+                body: import("@sinclair/typebox").TString;
+            }>>;
         }>>;
         multiSelect: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
     }>>;
 }>;
 export type QuestionOption = Static<typeof questionOptionSchema>;
+export type AskUserOptionPreview = Static<typeof askUserOptionPreviewSchema>;
 export type Question = Static<typeof questionSchema>;
 export type AskUserInput = Static<typeof askUserSchema>;
 export interface AskUserResult {
@@ -68,6 +89,11 @@ export declare const askUserTool: Readonly<{
             options: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
                 label: import("@sinclair/typebox").TString;
                 description: import("@sinclair/typebox").TString;
+                preview: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+                    kind: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"markdown">, import("@sinclair/typebox").TLiteral<"text">, import("@sinclair/typebox").TLiteral<"diff">]>;
+                    title: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+                    body: import("@sinclair/typebox").TString;
+                }>>;
             }>>;
             multiSelect: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
         }>>;

package/dist/tools/ask-user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ask-user.d.ts","sourceRoot":"","sources":["../../src/tools/ask-user.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAGtD,eAAO,MAAM,oBAAoB;;;EAa/B,CAAC;AAEH,eAAO,MAAM,cAAc;;;;;;;;EA0BzB,CAAC;AAEH,eAAO,MAAM,aAAa;;;;;;;;;;EAMxB,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AACjE,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;AACrD,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,aAAa,CAAC,CAAC;AAExD,MAAM,WAAW,aAAa;IAC7B,wCAAwC;IACxC,QAAQ,EAAE,OAAO,CAAC;IAClB,kDAAkD;IAClD,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IACxC,sBAAsB;IACtB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC;AAED,KAAK,cAAc,GAAG;IACrB,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,WAAW,CAAC;CAC7C,CAAC;AAEF;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAoBvE;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAChC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,GAChB,MAAM,GAAG,MAAM,EAAE,CAgCnB;AAED,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0CtB,CAAC;AAEH;;GAEG;AACH,wBAAgB,aAAa,CAC5B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAET;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,QAAQ,EAAE,CAG1E"}
+{"version":3,"file":"ask-user.d.ts","sourceRoot":"","sources":["../../src/tools/ask-user.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAGtD,eAAO,MAAM,0BAA0B;;;;EAqBrC,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;EAc/B,CAAC;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;;;;EA0BzB,CAAC;AAEH,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;EAMxB,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AACjE,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAC7E,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;AACrD,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,aAAa,CAAC,CAAC;AAExD,MAAM,WAAW,aAAa;IAC7B,wCAAwC;IACxC,QAAQ,EAAE,OAAO,CAAC;IAClB,kDAAkD;IAClD,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IACxC,sBAAsB;IACtB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC;AAED,KAAK,cAAc,GAAG;IACrB,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,WAAW,CAAC;CAC7C,CAAC;AAEF;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAyBvE;AAYD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAChC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,GAChB,MAAM,GAAG,MAAM,EAAE,CAgCnB;AAED,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4CtB,CAAC;AAEH;;GAEG;AACH,wBAAgB,aAAa,CAC5B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAET;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,QAAQ,EAAE,CAG1E"}

package/dist/tools/ask-user.js

@@ -6,6 +6,21 @@
  */
 import { Type } from "@sinclair/typebox";
 import { createTool } from "./tool-dsl.js";
+export const askUserOptionPreviewSchema = Type.Object({
+    kind: Type.Union([Type.Literal("markdown"), Type.Literal("text"), Type.Literal("diff")], {
+        description: "Preview format. Raw HTML is intentionally unsupported; use markdown, text, or diff.",
+    }),
+    title: Type.Optional(Type.String({
+        description: "Optional short preview title.",
+        minLength: 1,
+        maxLength: 80,
+    })),
+    body: Type.String({
+        description: "Preview content shown with the option. Keep it focused; large artifacts should be summarized.",
+        minLength: 1,
+        maxLength: 12_000,
+    }),
+});
 export const questionOptionSchema = Type.Object({
     label: Type.String({
         description: "The display text for this option (1-5 words). Should clearly describe the choice.",
@@ -17,6 +32,7 @@ export const questionOptionSchema = Type.Object({
         minLength: 1,
         maxLength: 200,
     }),
+    preview: Type.Optional(askUserOptionPreviewSchema),
 });
 export const questionSchema = Type.Object({
     question: Type.String({
@@ -56,6 +72,11 @@ export function formatQuestionsForDisplay(questions) {
         for (const [optIndex, opt] of q.options.entries()) {
             const marker = q.multiSelect ? "☐" : "○";
             lines.push(`  ${marker} ${optIndex + 1}. **${opt.label}**: ${opt.description}`);
+            if (opt.preview) {
+                const title = opt.preview.title ? `: ${opt.preview.title}` : "";
+                lines.push(`     Preview (${opt.preview.kind}${title})`);
+                lines.push(...formatPreviewBodyForDisplay(opt.preview.body));
+            }
         }
         lines.push(`  ${q.multiSelect ? "☐" : "○"} ${q.options.length + 1}. **Other**: Provide custom answer`);
         if (index < questions.length - 1) {
@@ -64,6 +85,15 @@ export function formatQuestionsForDisplay(questions) {
     }
     return lines.join("\n");
 }
+function formatPreviewBodyForDisplay(body) {
+    const lines = body.split(/\r?\n/);
+    const visibleLines = lines.slice(0, 12);
+    const formatted = visibleLines.map((line) => `       ${line}`);
+    if (lines.length > visibleLines.length) {
+        formatted.push("       ...");
+    }
+    return formatted;
+}
 /**
  * Parse user response to questions.
  * Supports formats like:
@@ -114,10 +144,12 @@ Parameters:
   - question: The full question text
   - header: Short label (max 12 chars) like "Library", "Approach"
   - options: 2-4 choices with label and description
+  - options[].preview: Optional markdown/text/diff preview for concrete artifacts
   - multiSelect: Allow multiple selections (default: false)
 
 An "Other" option is automatically added to allow custom input.
-Users can respond with option numbers, labels, or free text.`,
+Users can respond with option numbers, labels, or free text.
+Preview HTML is not supported; use markdown, text, or diff so clients can render previews safely.`,
     schema: askUserSchema,
     // This tool requires special handling - the TUI will intercept it
     // and display a proper selection UI rather than executing directly

package/dist/tools/ask-user.js.map

@@ -1 +1 @@
-{"version":3,"file":"ask-user.js","sourceRoot":"","sources":["../../src/tools/ask-user.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Structured question tool for gathering user input.\n *\n * Provides a structured way to ask users questions with predefined options,\n * improving UX over free-form text input.\n */\n\nimport { type Static, Type } from \"@sinclair/typebox\";\nimport { createTool } from \"./tool-dsl.js\";\n\nexport const questionOptionSchema = Type.Object({\n\tlabel: Type.String({\n\t\tdescription:\n\t\t\t\"The display text for this option (1-5 words). Should clearly describe the choice.\",\n\t\tminLength: 1,\n\t\tmaxLength: 50,\n\t}),\n\tdescription: Type.String({\n\t\tdescription:\n\t\t\t\"Explanation of what this option means or what will happen if chosen.\",\n\t\tminLength: 1,\n\t\tmaxLength: 200,\n\t}),\n});\n\nexport const questionSchema = Type.Object({\n\tquestion: Type.String({\n\t\tdescription:\n\t\t\t'The complete question to ask. Should be clear, specific, and end with a question mark. E.g., \"Which library should we use for date formatting?\"',\n\t\tminLength: 5,\n\t\tmaxLength: 500,\n\t}),\n\theader: Type.String({\n\t\tdescription:\n\t\t\t'Short label displayed as a chip/tag (max 12 chars). E.g., \"Auth method\", \"Library\", \"Approach\".',\n\t\tminLength: 1,\n\t\tmaxLength: 12,\n\t}),\n\toptions: Type.Array(questionOptionSchema, {\n\t\tdescription:\n\t\t\t\"Available choices (2-4 options). Each should be distinct. An 'Other' option is automatically added.\",\n\t\tminItems: 2,\n\t\tmaxItems: 4,\n\t}),\n\tmultiSelect: Type.Optional(\n\t\tType.Boolean({\n\t\t\tdescription:\n\t\t\t\t\"Allow selecting multiple options. Use when choices are not mutually exclusive.\",\n\t\t\tdefault: false,\n\t\t}),\n\t),\n});\n\nexport const askUserSchema = Type.Object({\n\tquestions: Type.Array(questionSchema, {\n\t\tdescription: \"Questions to ask the user (1-4 questions)\",\n\t\tminItems: 1,\n\t\tmaxItems: 4,\n\t}),\n});\n\nexport type QuestionOption = Static<typeof questionOptionSchema>;\nexport type Question = Static<typeof questionSchema>;\nexport type AskUserInput = Static<typeof askUserSchema>;\n\nexport interface AskUserResult {\n\t/** Whether the user provided answers */\n\tanswered: boolean;\n\t/** Map of question index to selected option(s) */\n\tanswers: Map<number, string | string[]>;\n\t/** Raw answer data */\n\trawAnswers: Record<string, string>;\n}\n\ntype AskUserDetails = {\n\tquestions: Question[];\n\tstatus: \"pending\" | \"answered\" | \"cancelled\";\n};\n\n/**\n * Format questions for display when the tool is invoked.\n */\nexport function formatQuestionsForDisplay(questions: Question[]): string {\n\tconst lines: string[] = [];\n\n\tfor (const [index, q] of questions.entries()) {\n\t\tlines.push(`**[${q.header}]** ${q.question}`);\n\t\tfor (const [optIndex, opt] of q.options.entries()) {\n\t\t\tconst marker = q.multiSelect ? \"☐\" : \"○\";\n\t\t\tlines.push(\n\t\t\t\t`  ${marker} ${optIndex + 1}. **${opt.label}**: ${opt.description}`,\n\t\t\t);\n\t\t}\n\t\tlines.push(\n\t\t\t`  ${q.multiSelect ? \"☐\" : \"○\"} ${q.options.length + 1}. **Other**: Provide custom answer`,\n\t\t);\n\t\tif (index < questions.length - 1) {\n\t\t\tlines.push(\"\");\n\t\t}\n\t}\n\n\treturn lines.join(\"\\n\");\n}\n\n/**\n * Parse user response to questions.\n * Supports formats like:\n * - \"1\" (single selection)\n * - \"1, 3\" (multi-select)\n * - \"Option A\" (label match)\n * - Free text (for \"Other\")\n */\nexport function parseUserResponse(\n\tresponse: string,\n\tquestion: Question,\n): string | string[] {\n\tconst trimmed = response.trim();\n\n\t// Check if it's a number or comma-separated numbers\n\tconst numbers = trimmed\n\t\t.split(/[,\\s]+/)\n\t\t.map((s) => Number.parseInt(s.trim(), 10));\n\tconst allValidNumbers = numbers.every((n) => !Number.isNaN(n));\n\n\tif (allValidNumbers && numbers.length > 0) {\n\t\tconst selected = numbers\n\t\t\t.filter((n) => n >= 1 && n <= question.options.length + 1)\n\t\t\t.map((n) => {\n\t\t\t\tif (n === question.options.length + 1) {\n\t\t\t\t\treturn \"Other\";\n\t\t\t\t}\n\t\t\t\treturn question.options[n - 1]?.label || `Option ${n}`;\n\t\t\t});\n\n\t\treturn question.multiSelect ? selected : selected[0] || trimmed;\n\t}\n\n\t// Check if it matches an option label\n\tconst matchedOption = question.options.find(\n\t\t(opt) => opt.label.toLowerCase() === trimmed.toLowerCase(),\n\t);\n\tif (matchedOption) {\n\t\treturn matchedOption.label;\n\t}\n\n\t// Return as free-form answer\n\treturn trimmed;\n}\n\nexport const askUserTool = createTool<typeof askUserSchema, AskUserDetails>({\n\tname: \"ask_user\",\n\tlabel: \"ask\",\n\tdescription: `Ask the user structured questions with predefined options.\n\nUse this tool when you need to:\n- Gather user preferences or requirements\n- Clarify ambiguous instructions\n- Get decisions on implementation choices\n- Offer choices about direction to take\n\nParameters:\n- questions: Array of 1-4 questions, each with:\n  - question: The full question text\n  - header: Short label (max 12 chars) like \"Library\", \"Approach\"\n  - options: 2-4 choices with label and description\n  - multiSelect: Allow multiple selections (default: false)\n\nAn \"Other\" option is automatically added to allow custom input.\nUsers can respond with option numbers, labels, or free text.`,\n\tschema: askUserSchema,\n\n\t// This tool requires special handling - the TUI will intercept it\n\t// and display a proper selection UI rather than executing directly\n\tdeferApiDefinition: true,\n\n\tasync run({ questions }, { respond }) {\n\t\t// Format the questions for display\n\t\t// In practice, this tool should be intercepted by the UI layer\n\t\t// before reaching here, but we provide a fallback text format\n\n\t\tconst formatted = formatQuestionsForDisplay(questions);\n\n\t\treturn respond\n\t\t\t.text(\n\t\t\t\t`Please answer the following question(s):\\n\\n${formatted}\\n\\nReply with option numbers (e.g., '1' or '1, 3' for multi-select), option labels, or your own answer for 'Other'.`,\n\t\t\t)\n\t\t\t.detail({\n\t\t\t\tquestions,\n\t\t\t\tstatus: \"pending\",\n\t\t\t});\n\t},\n});\n\n/**\n * Check if a tool call is an ask_user call.\n */\nexport function isAskUserCall(\n\ttoolName: string,\n\t_args: Record<string, unknown>,\n): boolean {\n\treturn toolName === \"ask_user\";\n}\n\n/**\n * Extract questions from an ask_user tool call.\n */\nexport function extractQuestions(args: Record<string, unknown>): Question[] {\n\tconst input = args as AskUserInput;\n\treturn input.questions || [];\n}\n"]}
+{"version":3,"file":"ask-user.js","sourceRoot":"","sources":["../../src/tools/ask-user.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Structured question tool for gathering user input.\n *\n * Provides a structured way to ask users questions with predefined options,\n * improving UX over free-form text input.\n */\n\nimport { type Static, Type } from \"@sinclair/typebox\";\nimport { createTool } from \"./tool-dsl.js\";\n\nexport const askUserOptionPreviewSchema = Type.Object({\n\tkind: Type.Union(\n\t\t[Type.Literal(\"markdown\"), Type.Literal(\"text\"), Type.Literal(\"diff\")],\n\t\t{\n\t\t\tdescription:\n\t\t\t\t\"Preview format. Raw HTML is intentionally unsupported; use markdown, text, or diff.\",\n\t\t},\n\t),\n\ttitle: Type.Optional(\n\t\tType.String({\n\t\t\tdescription: \"Optional short preview title.\",\n\t\t\tminLength: 1,\n\t\t\tmaxLength: 80,\n\t\t}),\n\t),\n\tbody: Type.String({\n\t\tdescription:\n\t\t\t\"Preview content shown with the option. Keep it focused; large artifacts should be summarized.\",\n\t\tminLength: 1,\n\t\tmaxLength: 12_000,\n\t}),\n});\n\nexport const questionOptionSchema = Type.Object({\n\tlabel: Type.String({\n\t\tdescription:\n\t\t\t\"The display text for this option (1-5 words). Should clearly describe the choice.\",\n\t\tminLength: 1,\n\t\tmaxLength: 50,\n\t}),\n\tdescription: Type.String({\n\t\tdescription:\n\t\t\t\"Explanation of what this option means or what will happen if chosen.\",\n\t\tminLength: 1,\n\t\tmaxLength: 200,\n\t}),\n\tpreview: Type.Optional(askUserOptionPreviewSchema),\n});\n\nexport const questionSchema = Type.Object({\n\tquestion: Type.String({\n\t\tdescription:\n\t\t\t'The complete question to ask. Should be clear, specific, and end with a question mark. E.g., \"Which library should we use for date formatting?\"',\n\t\tminLength: 5,\n\t\tmaxLength: 500,\n\t}),\n\theader: Type.String({\n\t\tdescription:\n\t\t\t'Short label displayed as a chip/tag (max 12 chars). E.g., \"Auth method\", \"Library\", \"Approach\".',\n\t\tminLength: 1,\n\t\tmaxLength: 12,\n\t}),\n\toptions: Type.Array(questionOptionSchema, {\n\t\tdescription:\n\t\t\t\"Available choices (2-4 options). Each should be distinct. An 'Other' option is automatically added.\",\n\t\tminItems: 2,\n\t\tmaxItems: 4,\n\t}),\n\tmultiSelect: Type.Optional(\n\t\tType.Boolean({\n\t\t\tdescription:\n\t\t\t\t\"Allow selecting multiple options. Use when choices are not mutually exclusive.\",\n\t\t\tdefault: false,\n\t\t}),\n\t),\n});\n\nexport const askUserSchema = Type.Object({\n\tquestions: Type.Array(questionSchema, {\n\t\tdescription: \"Questions to ask the user (1-4 questions)\",\n\t\tminItems: 1,\n\t\tmaxItems: 4,\n\t}),\n});\n\nexport type QuestionOption = Static<typeof questionOptionSchema>;\nexport type AskUserOptionPreview = Static<typeof askUserOptionPreviewSchema>;\nexport type Question = Static<typeof questionSchema>;\nexport type AskUserInput = Static<typeof askUserSchema>;\n\nexport interface AskUserResult {\n\t/** Whether the user provided answers */\n\tanswered: boolean;\n\t/** Map of question index to selected option(s) */\n\tanswers: Map<number, string | string[]>;\n\t/** Raw answer data */\n\trawAnswers: Record<string, string>;\n}\n\ntype AskUserDetails = {\n\tquestions: Question[];\n\tstatus: \"pending\" | \"answered\" | \"cancelled\";\n};\n\n/**\n * Format questions for display when the tool is invoked.\n */\nexport function formatQuestionsForDisplay(questions: Question[]): string {\n\tconst lines: string[] = [];\n\n\tfor (const [index, q] of questions.entries()) {\n\t\tlines.push(`**[${q.header}]** ${q.question}`);\n\t\tfor (const [optIndex, opt] of q.options.entries()) {\n\t\t\tconst marker = q.multiSelect ? \"☐\" : \"○\";\n\t\t\tlines.push(\n\t\t\t\t`  ${marker} ${optIndex + 1}. **${opt.label}**: ${opt.description}`,\n\t\t\t);\n\t\t\tif (opt.preview) {\n\t\t\t\tconst title = opt.preview.title ? `: ${opt.preview.title}` : \"\";\n\t\t\t\tlines.push(`     Preview (${opt.preview.kind}${title})`);\n\t\t\t\tlines.push(...formatPreviewBodyForDisplay(opt.preview.body));\n\t\t\t}\n\t\t}\n\t\tlines.push(\n\t\t\t`  ${q.multiSelect ? \"☐\" : \"○\"} ${q.options.length + 1}. **Other**: Provide custom answer`,\n\t\t);\n\t\tif (index < questions.length - 1) {\n\t\t\tlines.push(\"\");\n\t\t}\n\t}\n\n\treturn lines.join(\"\\n\");\n}\n\nfunction formatPreviewBodyForDisplay(body: string): string[] {\n\tconst lines = body.split(/\\r?\\n/);\n\tconst visibleLines = lines.slice(0, 12);\n\tconst formatted = visibleLines.map((line) => `       ${line}`);\n\tif (lines.length > visibleLines.length) {\n\t\tformatted.push(\"       ...\");\n\t}\n\treturn formatted;\n}\n\n/**\n * Parse user response to questions.\n * Supports formats like:\n * - \"1\" (single selection)\n * - \"1, 3\" (multi-select)\n * - \"Option A\" (label match)\n * - Free text (for \"Other\")\n */\nexport function parseUserResponse(\n\tresponse: string,\n\tquestion: Question,\n): string | string[] {\n\tconst trimmed = response.trim();\n\n\t// Check if it's a number or comma-separated numbers\n\tconst numbers = trimmed\n\t\t.split(/[,\\s]+/)\n\t\t.map((s) => Number.parseInt(s.trim(), 10));\n\tconst allValidNumbers = numbers.every((n) => !Number.isNaN(n));\n\n\tif (allValidNumbers && numbers.length > 0) {\n\t\tconst selected = numbers\n\t\t\t.filter((n) => n >= 1 && n <= question.options.length + 1)\n\t\t\t.map((n) => {\n\t\t\t\tif (n === question.options.length + 1) {\n\t\t\t\t\treturn \"Other\";\n\t\t\t\t}\n\t\t\t\treturn question.options[n - 1]?.label || `Option ${n}`;\n\t\t\t});\n\n\t\treturn question.multiSelect ? selected : selected[0] || trimmed;\n\t}\n\n\t// Check if it matches an option label\n\tconst matchedOption = question.options.find(\n\t\t(opt) => opt.label.toLowerCase() === trimmed.toLowerCase(),\n\t);\n\tif (matchedOption) {\n\t\treturn matchedOption.label;\n\t}\n\n\t// Return as free-form answer\n\treturn trimmed;\n}\n\nexport const askUserTool = createTool<typeof askUserSchema, AskUserDetails>({\n\tname: \"ask_user\",\n\tlabel: \"ask\",\n\tdescription: `Ask the user structured questions with predefined options.\n\nUse this tool when you need to:\n- Gather user preferences or requirements\n- Clarify ambiguous instructions\n- Get decisions on implementation choices\n- Offer choices about direction to take\n\nParameters:\n- questions: Array of 1-4 questions, each with:\n  - question: The full question text\n  - header: Short label (max 12 chars) like \"Library\", \"Approach\"\n  - options: 2-4 choices with label and description\n  - options[].preview: Optional markdown/text/diff preview for concrete artifacts\n  - multiSelect: Allow multiple selections (default: false)\n\nAn \"Other\" option is automatically added to allow custom input.\nUsers can respond with option numbers, labels, or free text.\nPreview HTML is not supported; use markdown, text, or diff so clients can render previews safely.`,\n\tschema: askUserSchema,\n\n\t// This tool requires special handling - the TUI will intercept it\n\t// and display a proper selection UI rather than executing directly\n\tdeferApiDefinition: true,\n\n\tasync run({ questions }, { respond }) {\n\t\t// Format the questions for display\n\t\t// In practice, this tool should be intercepted by the UI layer\n\t\t// before reaching here, but we provide a fallback text format\n\n\t\tconst formatted = formatQuestionsForDisplay(questions);\n\n\t\treturn respond\n\t\t\t.text(\n\t\t\t\t`Please answer the following question(s):\\n\\n${formatted}\\n\\nReply with option numbers (e.g., '1' or '1, 3' for multi-select), option labels, or your own answer for 'Other'.`,\n\t\t\t)\n\t\t\t.detail({\n\t\t\t\tquestions,\n\t\t\t\tstatus: \"pending\",\n\t\t\t});\n\t},\n});\n\n/**\n * Check if a tool call is an ask_user call.\n */\nexport function isAskUserCall(\n\ttoolName: string,\n\t_args: Record<string, unknown>,\n): boolean {\n\treturn toolName === \"ask_user\";\n}\n\n/**\n * Extract questions from an ask_user tool call.\n */\nexport function extractQuestions(args: Record<string, unknown>): Question[] {\n\tconst input = args as AskUserInput;\n\treturn input.questions || [];\n}\n"]}

package/dist/tools/background/task-types.d.ts

@@ -129,6 +129,6 @@ export declare function buildTaskDetail(task: BackgroundTask): {
     limits: TaskRuntimeLimits;
     resourceUsage: TaskResourceUsage | null;
     failureReason: string | null;
-    monitoringMode: "proc" | "disabled" | "ps";
+    monitoringMode: "disabled" | "proc" | "ps";
 };
 //# sourceMappingURL=task-types.d.ts.map

package/dist/tools/edit.d.ts

@@ -35,11 +35,13 @@
  *
  * @module tools/edit
  */
+import { type DiagnosticDeltaToolSummary } from "../lsp/diagnostic-repair.js";
 import type { ValidatorRunResult } from "../safety/safe-mode.js";
 type EditToolDetails = {
     diff: string;
     editsApplied?: number;
     validators?: ValidatorRunResult[];
+    diagnosticDelta?: DiagnosticDeltaToolSummary;
     mode?: "sandbox";
 };
 export declare const editTool: Readonly<{

package/dist/tools/edit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../../src/tools/edit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAaH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAwHjE,KAAK,eAAe,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAClC,IAAI,CAAC,EAAE,SAAS,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0QnB,CAAC"}
+{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../../src/tools/edit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAWH,OAAO,EACN,KAAK,0BAA0B,EAG/B,MAAM,6BAA6B,CAAC;AAMrC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAwHjE,KAAK,eAAe,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAClC,eAAe,CAAC,EAAE,0BAA0B,CAAC;IAC7C,IAAI,CAAC,EAAE,SAAS,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgSnB,CAAC"}

package/dist/tools/edit.js

@@ -40,7 +40,8 @@ import { constants } from "node:fs";
 import { access, readFile, rename, unlink, writeFile } from "node:fs/promises";
 import { resolve as resolvePath } from "node:path";
 import { Type } from "@sinclair/typebox";
-import { collectDiagnostics } from "../lsp/index.js";
+import { captureDiagnosticBaseline, collectDiagnosticDelta, } from "../lsp/diagnostic-deltas.js";
+import { buildDiagnosticDeltaToolSummary, formatDiagnosticDeltaForToolOutput, } from "../lsp/diagnostic-repair.js";
 import { assertTeamMemoryContentSafe } from "../memory/team-memory.js";
 import { requirePlanCheck, runValidatorsOnSuccess, } from "../safety/safe-mode.js";
 import { formatLspDiagnostics, generateDiffString } from "./diff-utils.js";
@@ -299,16 +300,26 @@ If "not found", read file to check actual content.`,
                 editsApplied: hasMultiEdit ? replacementCount : undefined,
             });
         }
+        const diagnosticBaseline = await captureDiagnosticBaseline(absolutePath);
+        throwIfAborted();
         await writeFileAtomically(absolutePath, newContent);
         let validatorSummaries;
         let linterOutput = "";
+        let diagnosticDeltaSummary;
         try {
-            const lspDiagnostics = await collectDiagnostics();
-            const fileDiagnostics = lspDiagnostics[absolutePath] || [];
-            if (fileDiagnostics.length > 0) {
-                linterOutput = formatLspDiagnostics(path, fileDiagnostics);
+            const diagnosticDelta = await collectDiagnosticDelta(diagnosticBaseline);
+            diagnosticDeltaSummary = buildDiagnosticDeltaToolSummary({
+                file: absolutePath,
+                displayPath: path,
+                result: diagnosticDelta,
+            });
+            const visibleDiagnostics = diagnosticDelta.usedDelta
+                ? diagnosticDelta.newDiagnostics
+                : diagnosticDelta.fileDiagnostics;
+            if (visibleDiagnostics.length > 0) {
+                linterOutput = formatLspDiagnostics(path, visibleDiagnostics);
             }
-            validatorSummaries = await runValidatorsOnSuccess([absolutePath], lspDiagnostics);
+            validatorSummaries = await runValidatorsOnSuccess([absolutePath], diagnosticDelta.validatorDiagnostics);
         }
         catch (validatorError) {
             await writeFileAtomically(absolutePath, originalContent);
@@ -321,11 +332,20 @@ If "not found", read file to check actual content.`,
                 ? `Successfully replaced all ${replacementCount} occurrence(s) in ${path}.`
                 : `Successfully edited ${path}.`;
         return respond
-            .text(linterOutput ? `${resultMessage}\n${linterOutput}` : resultMessage)
+            .text([
+            resultMessage,
+            linterOutput,
+            diagnosticDeltaSummary
+                ? formatDiagnosticDeltaForToolOutput(diagnosticDeltaSummary)
+                : "",
+        ]
+            .filter(Boolean)
+            .join("\n"))
             .detail({
             diff,
             editsApplied: hasMultiEdit ? replacementCount : undefined,
             validators: validatorSummaries,
+            diagnosticDelta: diagnosticDeltaSummary,
         });
     },
 });