claude-code-rust 0.14.2 → 0.14.4

package/agent-sdk/dist/bridge/tooling.js

@@ -23,6 +23,19 @@ const WORKFLOW_TOOL_NAME = "Workflow";
 const PROJECTS_TOOL_NAME = "Projects";
 const ARTIFACT_TOOL_NAME = "Artifact";
 const SHOW_ONBOARDING_ROLE_PICKER_TOOL_NAME = "ShowOnboardingRolePicker";
+const SKILL_TOOL_NAME = "Skill";
+const SKILL_WORD_OVERRIDES = {
+    api: "API",
+    ci: "CI",
+    cli: "CLI",
+    gh: "GH",
+    github: "GitHub",
+    mcp: "MCP",
+    pdf: "PDF",
+    sdk: "SDK",
+    ui: "UI",
+    ux: "UX",
+};
 const READ_MCP_RESOURCE_TOOL_NAME = "ReadMcpResource";
 const READ_MCP_RESOURCE_DIR_TOOL_NAME = "ReadMcpResourceDir";
 const SEARCH_OUTPUT_MODES = new Set(["content", "files_with_matches", "count"]);
@@ -37,14 +50,18 @@ export function isToolSearchToolResultType(blockType) {
     return blockType === "tool_search_tool_result";
 }
 export function isToolUseBlockType(blockType) {
-    return blockType === "tool_use" || blockType === "server_tool_use" || blockType === "mcp_tool_use";
+    return (blockType === "tool_use" ||
+        blockType === "server_tool_use" ||
+        blockType === "mcp_tool_use");
 }
 function inputString(input, key) {
     return typeof input[key] === "string" ? input[key].trim() : "";
 }
 function inputNumber(input, key) {
     const value = input[key];
-    return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+    return typeof value === "number" && Number.isFinite(value)
+        ? value
+        : undefined;
 }
 function inputBoolean(input, key) {
     return typeof input[key] === "boolean" ? input[key] : undefined;
@@ -56,7 +73,8 @@ export function isShellToolName(name) {
     return name === "Bash" || name === "PowerShell";
 }
 function isMcpResourceReadToolName(name) {
-    return name === READ_MCP_RESOURCE_TOOL_NAME || name === READ_MCP_RESOURCE_DIR_TOOL_NAME;
+    return (name === READ_MCP_RESOURCE_TOOL_NAME ||
+        name === READ_MCP_RESOURCE_DIR_TOOL_NAME);
 }
 function agentInputTitle(name, input) {
     if (!isAgentLikeToolName(name)) {
@@ -183,6 +201,7 @@ export function normalizeToolKind(name) {
         case "Projects":
         case "Artifact":
         case "ShowOnboardingRolePicker":
+        case SKILL_TOOL_NAME:
             return "other";
         case "Task":
         case "Agent":
@@ -194,6 +213,34 @@ export function normalizeToolKind(name) {
             return "think";
     }
 }
+function skillDisplayName(rawName) {
+    const trimmed = rawName.trim();
+    const segments = trimmed.split(":");
+    if (segments.length > 2 ||
+        segments.some((segment) => !segment || !/^[a-zA-Z0-9]+(?:[-_][a-zA-Z0-9]+)*$/.test(segment))) {
+        return trimmed;
+    }
+    const displaySegments = segments.map((segment) => segment
+        .split(/[-_]/)
+        .map((word) => skillDisplayWord(word))
+        .join(" "));
+    if (displaySegments.length === 2 &&
+        displaySegments[0].toLowerCase() === displaySegments[1].toLowerCase()) {
+        return displaySegments[1];
+    }
+    return displaySegments.join(" / ");
+}
+function skillDisplayWord(word) {
+    const override = SKILL_WORD_OVERRIDES[word.toLowerCase()];
+    if (override) {
+        return override;
+    }
+    if (/^[A-Z0-9]+$/.test(word) ||
+        (/[a-z]/.test(word) && /[A-Z]/.test(word) && !/^[A-Z][a-z0-9]*$/.test(word))) {
+        return word;
+    }
+    return `${word.charAt(0).toUpperCase()}${word.slice(1).toLowerCase()}`;
+}
 export function toolTitle(name, input, context = {}) {
     const agentTitle = agentInputTitle(name, input);
     if (agentTitle) {
@@ -236,7 +283,9 @@ export function toolTitle(name, input, context = {}) {
     }
     if (name === REMOTE_TRIGGER_TOOL_NAME) {
         const action = typeof input.action === "string" ? input.action.trim() : "";
-        return action ? `${REMOTE_TRIGGER_TOOL_NAME}: ${action}` : REMOTE_TRIGGER_TOOL_NAME;
+        return action
+            ? `${REMOTE_TRIGGER_TOOL_NAME}: ${action}`
+            : REMOTE_TRIGGER_TOOL_NAME;
     }
     if (name === ENTER_PLAN_MODE_TOOL_NAME) {
         return name;
@@ -247,11 +296,15 @@ export function toolTitle(name, input, context = {}) {
     }
     if (name === MONITOR_TOOL_NAME) {
         const description = nonEmptyString(input.description);
-        return description ? `${MONITOR_TOOL_NAME}: ${description}` : MONITOR_TOOL_NAME;
+        return description
+            ? `${MONITOR_TOOL_NAME}: ${description}`
+            : MONITOR_TOOL_NAME;
     }
     if (name === WORKFLOW_TOOL_NAME) {
         const workflowName = nonEmptyString(input.name);
-        return workflowName ? `${WORKFLOW_TOOL_NAME}: ${workflowName}` : WORKFLOW_TOOL_NAME;
+        return workflowName
+            ? `${WORKFLOW_TOOL_NAME}: ${workflowName}`
+            : WORKFLOW_TOOL_NAME;
     }
     if (name === PROJECTS_TOOL_NAME) {
         return formatProjectsTitle(input);
@@ -263,6 +316,12 @@ export function toolTitle(name, input, context = {}) {
     if (name === SHOW_ONBOARDING_ROLE_PICKER_TOOL_NAME) {
         return SHOW_ONBOARDING_ROLE_PICKER_TOOL_NAME;
     }
+    if (name === SKILL_TOOL_NAME) {
+        const skillName = nonEmptyString(input.skill);
+        return skillName
+            ? `${SKILL_TOOL_NAME}: ${skillDisplayName(skillName)}`
+            : SKILL_TOOL_NAME;
+    }
     if (name === "EnterWorktree") {
         const worktreeName = typeof input.name === "string" ? input.name.trim() : "";
         return worktreeName || "EnterWorktree";
@@ -270,7 +329,8 @@ export function toolTitle(name, input, context = {}) {
     if (name === "ExitWorktree") {
         return "ExitWorktree";
     }
-    if ((name === "Read" || name === "Write" || name === "Edit") && typeof input.file_path === "string") {
+    if ((name === "Read" || name === "Write" || name === "Edit") &&
+        typeof input.file_path === "string") {
         return `${name} ${input.file_path}`;
     }
     if (isMcpResourceReadToolName(name)) {
@@ -287,7 +347,9 @@ export function toolTitle(name, input, context = {}) {
 }
 function formatProjectsTitle(input) {
     const method = nonEmptyString(input.method);
-    const action = method?.startsWith("project_") ? method.slice("project_".length) : method;
+    const action = method?.startsWith("project_")
+        ? method.slice("project_".length)
+        : method;
     const suffix = nonEmptyString(input.path) ?? nonEmptyString(input.query);
     const base = action ? `${PROJECTS_TOOL_NAME}: ${action}` : PROJECTS_TOOL_NAME;
     return suffix ? `${base} ${suffix}` : base;
@@ -303,14 +365,30 @@ function editDiffContent(name, input) {
         if (!oldText && !newText) {
             return [];
         }
-        return [{ type: "diff", old_path: filePath, new_path: filePath, old: oldText, new: newText }];
+        return [
+            {
+                type: "diff",
+                old_path: filePath,
+                new_path: filePath,
+                old: oldText,
+                new: newText,
+            },
+        ];
     }
     if (name === "Write") {
         const newText = typeof input.content === "string" ? input.content : "";
         if (!newText) {
             return [];
         }
-        return [{ type: "diff", old_path: filePath, new_path: filePath, old: "", new: newText }];
+        return [
+            {
+                type: "diff",
+                old_path: filePath,
+                new_path: filePath,
+                old: "",
+                new: newText,
+            },
+        ];
     }
     return [];
 }
@@ -369,6 +447,17 @@ function resultRecordCandidates(rawResult, rawContent) {
     pushNestedRecords(rawContent);
     return candidates;
 }
+function imageReadResultText(rawResult, rawContent, rawInput) {
+    const isImage = resultRecordCandidates(rawResult, rawContent).some((candidate) => candidate.type === "image");
+    if (!isImage) {
+        return undefined;
+    }
+    const input = asRecordOrNull(rawInput);
+    const filePath = typeof input?.file_path === "string" ? input.file_path.trim() : "";
+    const normalizedPath = filePath.replaceAll("\\", "/");
+    const fileName = normalizedPath.slice(normalizedPath.lastIndexOf("/") + 1);
+    return fileName ? `Viewed Image ${fileName}` : "Viewed Image";
+}
 function parseJsonCandidate(value) {
     const text = typeof value === "string" ? value : extractText(value);
     const trimmed = text.trim();
@@ -403,11 +492,18 @@ function pushStructuredRecordCandidates(candidates, value) {
 }
 function mcpResourceContentFromResult(rawResult, rawContent) {
     const candidates = [];
-    for (const candidate of [rawResult, rawContent, parseJsonCandidate(rawResult), parseJsonCandidate(rawContent)]) {
+    for (const candidate of [
+        rawResult,
+        rawContent,
+        parseJsonCandidate(rawResult),
+        parseJsonCandidate(rawContent),
+    ]) {
         pushStructuredRecordCandidates(candidates, candidate);
     }
     for (const candidate of candidates) {
-        const contents = Array.isArray(candidate.contents) ? candidate.contents : null;
+        const contents = Array.isArray(candidate.contents)
+            ? candidate.contents
+            : null;
         if (!contents || contents.length === 0) {
             continue;
         }
@@ -421,11 +517,14 @@ function mcpResourceContentFromResult(rawResult, rawContent) {
             if (!uri) {
                 continue;
             }
-            const text = typeof record.text === "string" && record.text.length > 0 ? record.text : undefined;
+            const text = typeof record.text === "string" && record.text.length > 0
+                ? record.text
+                : undefined;
             const mimeType = typeof record.mimeType === "string" && record.mimeType.trim().length > 0
                 ? record.mimeType.trim()
                 : undefined;
-            const blobSavedTo = typeof record.blobSavedTo === "string" && record.blobSavedTo.trim().length > 0
+            const blobSavedTo = typeof record.blobSavedTo === "string" &&
+                record.blobSavedTo.trim().length > 0
                 ? record.blobSavedTo.trim()
                 : undefined;
             if (!text && !blobSavedTo) {
@@ -484,10 +583,15 @@ function extractToolOutputMetadata(toolName, rawResult, rawContent) {
             const hasAssistantAutoBackgrounded = typeof candidate.assistantAutoBackgrounded === "boolean";
             const timedOutAfterMs = nonNegativeInteger(candidate.timedOutAfterMs);
             const backgroundCwdHint = nonEmptyString(candidate.backgroundCwdHint);
-            if (hasAssistantAutoBackgrounded || timedOutAfterMs !== undefined || backgroundCwdHint) {
+            const hasBackgroundEndsWithFinalResponse = typeof candidate.backgroundEndsWithFinalResponse === "boolean";
+            if (hasAssistantAutoBackgrounded ||
+                timedOutAfterMs !== undefined ||
+                backgroundCwdHint ||
+                hasBackgroundEndsWithFinalResponse) {
                 const bashMetadata = {};
                 if (hasAssistantAutoBackgrounded) {
-                    bashMetadata.assistant_auto_backgrounded = candidate.assistantAutoBackgrounded;
+                    bashMetadata.assistant_auto_backgrounded =
+                        candidate.assistantAutoBackgrounded;
                 }
                 if (timedOutAfterMs !== undefined) {
                     bashMetadata.timed_out_after_ms = timedOutAfterMs;
@@ -495,6 +599,10 @@ function extractToolOutputMetadata(toolName, rawResult, rawContent) {
                 if (backgroundCwdHint) {
                     bashMetadata.background_cwd_hint = backgroundCwdHint;
                 }
+                if (hasBackgroundEndsWithFinalResponse) {
+                    bashMetadata.background_ends_with_final_response =
+                        candidate.backgroundEndsWithFinalResponse;
+                }
                 metadata.bash = bashMetadata;
                 break;
             }
@@ -592,7 +700,10 @@ export function extractText(value) {
             if (typeof entry === "string") {
                 return entry;
             }
-            if (entry && typeof entry === "object" && "text" in entry && typeof entry.text === "string") {
+            if (entry &&
+                typeof entry === "object" &&
+                "text" in entry &&
+                typeof entry.text === "string") {
                 return entry.text;
             }
             return "";
@@ -600,7 +711,10 @@ export function extractText(value) {
             .filter((part) => part.length > 0)
             .join("\n");
     }
-    if (value && typeof value === "object" && "text" in value && typeof value.text === "string") {
+    if (value &&
+        typeof value === "object" &&
+        "text" in value &&
+        typeof value.text === "string") {
         return value.text;
     }
     return "";
@@ -685,7 +799,15 @@ function writeDiffFromInput(rawInput) {
     if (!filePath || !content) {
         return [];
     }
-    return [{ type: "diff", old_path: filePath, new_path: filePath, old: "", new: content }];
+    return [
+        {
+            type: "diff",
+            old_path: filePath,
+            new_path: filePath,
+            old: "",
+            new: content,
+        },
+    ];
 }
 function editDiffFromInput(rawInput) {
     const input = asRecordOrNull(rawInput);
@@ -706,7 +828,15 @@ function editDiffFromInput(rawInput) {
     if (!filePath || (!oldText && !newText)) {
         return [];
     }
-    return [{ type: "diff", old_path: filePath, new_path: filePath, old: oldText, new: newText }];
+    return [
+        {
+            type: "diff",
+            old_path: filePath,
+            new_path: filePath,
+            old: oldText,
+            new: newText,
+        },
+    ];
 }
 function writeDiffFromResult(rawContent) {
     const candidates = Array.isArray(rawContent) ? rawContent : [rawContent];
@@ -721,15 +851,24 @@ function writeDiffFromResult(rawContent) {
                 ? record.file_path
                 : "";
         const content = typeof record.content === "string" ? record.content : "";
-        const originalRaw = "originalFile" in record ? record.originalFile : "original_file" in record ? record.original_file : undefined;
+        const originalRaw = "originalFile" in record
+            ? record.originalFile
+            : "original_file" in record
+                ? record.original_file
+                : undefined;
         const gitDiff = asRecordOrNull(record.gitDiff);
-        const repository = typeof gitDiff?.repository === "string" && gitDiff.repository.trim().length > 0
+        const repository = typeof gitDiff?.repository === "string" &&
+            gitDiff.repository.trim().length > 0
             ? gitDiff.repository.trim()
             : undefined;
         if (!filePath || !content || originalRaw === undefined) {
             continue;
         }
-        const original = typeof originalRaw === "string" ? originalRaw : originalRaw === null ? "" : "";
+        const original = typeof originalRaw === "string"
+            ? originalRaw
+            : originalRaw === null
+                ? ""
+                : "";
         return [
             {
                 type: "diff",
@@ -772,7 +911,8 @@ function editDiffFromResult(rawResult, rawInput) {
         if (candidatePath && candidatePath !== filePath) {
             continue;
         }
-        const repository = typeof gitDiff?.repository === "string" && gitDiff.repository.trim().length > 0
+        const repository = typeof gitDiff?.repository === "string" &&
+            gitDiff.repository.trim().length > 0
             ? gitDiff.repository.trim()
             : undefined;
         return [
@@ -862,12 +1002,17 @@ function firstSearchRecord(toolName, rawResult, rawContent) {
         return undefined;
     }
     const candidates = resultRecordCandidates(rawResult, rawContent);
-    for (const parsed of [parseJsonCandidate(rawResult), parseJsonCandidate(rawContent)]) {
+    for (const parsed of [
+        parseJsonCandidate(rawResult),
+        parseJsonCandidate(rawContent),
+    ]) {
         candidates.push(...resultRecordCandidates(parsed, undefined));
     }
     return candidates.find((candidate) => {
         if (toolName === "Glob") {
-            return Array.isArray(candidate.filenames) || "numFiles" in candidate || "truncated" in candidate;
+            return (Array.isArray(candidate.filenames) ||
+                "numFiles" in candidate ||
+                "truncated" in candidate);
         }
         return (Array.isArray(candidate.filenames) ||
             "numFiles" in candidate ||
@@ -878,7 +1023,9 @@ function firstSearchRecord(toolName, rawResult, rawContent) {
 }
 function recordNumber(record, key) {
     const value = record[key];
-    return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+    return typeof value === "number" && Number.isFinite(value)
+        ? value
+        : undefined;
 }
 function recordNonNegativeInteger(record, key) {
     return nonNegativeInteger(record[key]);
@@ -934,7 +1081,8 @@ function grepResultText(record) {
     const numFiles = totalFiles ??
         (legacyNumFiles !== 0 || !hasVisibleMatches ? legacyNumFiles : undefined) ??
         (filenames.length > 0 ? filenames.length : undefined);
-    const numLines = recordNonNegativeInteger(record, "totalLines") ?? recordNonNegativeInteger(record, "numLines");
+    const numLines = recordNonNegativeInteger(record, "totalLines") ??
+        recordNonNegativeInteger(record, "numLines");
     const numMatches = recordNumber(record, "numMatches");
     const appliedLimit = recordNumber(record, "appliedLimit");
     const appliedOffset = recordNumber(record, "appliedOffset");
@@ -987,12 +1135,19 @@ function worktreeResultFields(toolName, rawResult, rawContent) {
         return undefined;
     }
     const candidates = resultRecordCandidates(rawResult, rawContent);
-    for (const parsed of [parseJsonCandidate(rawResult), parseJsonCandidate(rawContent)]) {
+    for (const parsed of [
+        parseJsonCandidate(rawResult),
+        parseJsonCandidate(rawContent),
+    ]) {
         candidates.push(...resultRecordCandidates(parsed, undefined));
     }
     for (const candidate of candidates) {
-        const branch = typeof candidate.worktreeBranch === "string" ? candidate.worktreeBranch.trim() : "";
-        const path = typeof candidate.worktreePath === "string" ? candidate.worktreePath.trim() : "";
+        const branch = typeof candidate.worktreeBranch === "string"
+            ? candidate.worktreeBranch.trim()
+            : "";
+        const path = typeof candidate.worktreePath === "string"
+            ? candidate.worktreePath.trim()
+            : "";
         const output = branch ? `Branch: ${branch}` : path ? `Path: ${path}` : "";
         const isStructuredWorktreeOutput = "message" in candidate ||
             "worktreeBranch" in candidate ||
@@ -1058,8 +1213,24 @@ const CRON_WEEKDAY_NAMES = [
     "Friday",
     "Saturday",
 ];
-const CRON_MONTH_ALIASES = new Map(["JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"].map((name, index) => [name, index + 1]));
-const CRON_WEEKDAY_ALIASES = new Map(["SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"].map((name, index) => [name, index]));
+const CRON_MONTH_ALIASES = new Map([
+    "JAN",
+    "FEB",
+    "MAR",
+    "APR",
+    "MAY",
+    "JUN",
+    "JUL",
+    "AUG",
+    "SEP",
+    "OCT",
+    "NOV",
+    "DEC",
+].map((name, index) => [name, index + 1]));
+const CRON_WEEKDAY_ALIASES = new Map(["SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"].map((name, index) => [
+    name,
+    index,
+]));
 function parseCronValue(value, min, max, aliases) {
     const normalized = value.trim().toUpperCase();
     const aliased = aliases?.get(normalized);
@@ -1077,14 +1248,18 @@ function parseCronField(rawField, min, max, aliases) {
     const stepMatch = raw.match(/^\*\/(\d+)$/);
     if (stepMatch) {
         const step = Number(stepMatch[1]);
-        return Number.isInteger(step) && step > 0 ? { kind: "step", raw, step } : { kind: "unsupported", raw };
+        return Number.isInteger(step) && step > 0
+            ? { kind: "step", raw, step }
+            : { kind: "unsupported", raw };
     }
     if (raw.includes(",")) {
         const values = raw
             .split(",")
             .map((part) => parseCronValue(part, min, max, aliases))
             .filter((value) => value !== undefined);
-        return values.length === raw.split(",").length ? { kind: "list", raw, values } : { kind: "unsupported", raw };
+        return values.length === raw.split(",").length
+            ? { kind: "list", raw, values }
+            : { kind: "unsupported", raw };
     }
     const rangeMatch = raw.match(/^([^/-]+)-([^/-]+)$/);
     if (rangeMatch) {
@@ -1095,7 +1270,9 @@ function parseCronField(rawField, min, max, aliases) {
             : { kind: "unsupported", raw };
     }
     const value = parseCronValue(raw, min, max, aliases);
-    return value !== undefined ? { kind: "single", raw, value } : { kind: "unsupported", raw };
+    return value !== undefined
+        ? { kind: "single", raw, value }
+        : { kind: "unsupported", raw };
 }
 function isCronAny(field) {
     return field.kind === "any";
@@ -1136,12 +1313,16 @@ function weekdayDescription(field) {
         return "day";
     }
     if (field.kind === "list") {
-        const normalized = [...new Set(field.values.map((value) => (value === 7 ? 0 : value)))].sort((left, right) => left - right);
+        const normalized = [
+            ...new Set(field.values.map((value) => (value === 7 ? 0 : value))),
+        ].sort((left, right) => left - right);
         if (normalized.length === 2 && normalized[0] === 0 && normalized[1] === 6) {
             return "weekend day";
         }
         const names = normalized.map(weekdayName);
-        return names.every((name) => name !== undefined) ? joinEnglishList(names) : undefined;
+        return names.every((name) => name !== undefined)
+            ? joinEnglishList(names)
+            : undefined;
     }
     return undefined;
 }
@@ -1152,7 +1333,9 @@ function hourlyScheduleText(minute) {
     if (minute.kind !== "single") {
         return undefined;
     }
-    return minute.value === 0 ? "Every hour on the hour" : `Every hour at minute ${padCronNumber(minute.value)}`;
+    return minute.value === 0
+        ? "Every hour on the hour"
+        : `Every hour at minute ${padCronNumber(minute.value)}`;
 }
 function cronScheduleFromExpression(cron) {
     const parts = cron.trim().split(/\s+/);
@@ -1180,7 +1363,9 @@ function cronScheduleFromExpression(cron) {
         return hourlyScheduleText(minute);
     }
     if (everyDay && minute.kind === "single" && hour.kind === "step") {
-        const suffix = minute.value === 0 ? "on the hour" : `at minute ${padCronNumber(minute.value)}`;
+        const suffix = minute.value === 0
+            ? "on the hour"
+            : `at minute ${padCronNumber(minute.value)}`;
         return `Every ${hour.step} ${pluralUnit(hour.step, "hour")} ${suffix}`;
     }
     const time = cronTime(hour, minute);
@@ -1205,13 +1390,17 @@ function cronScheduleFromExpression(cron) {
     if (dayOfMonth.kind === "single" && isCronAny(dayOfWeek)) {
         if (month.kind === "single") {
             const monthLabel = monthName(month.value);
-            return monthLabel ? `Every ${monthLabel} ${dayOfMonth.value} at ${time}` : undefined;
+            return monthLabel
+                ? `Every ${monthLabel} ${dayOfMonth.value} at ${time}`
+                : undefined;
         }
         if (month.kind === "step") {
             return `Every ${month.step} ${pluralUnit(month.step, "month")} on day ${dayOfMonth.value} at ${time}`;
         }
     }
-    if (isCronAny(dayOfMonth) && month.kind === "single" && isCronAny(dayOfWeek)) {
+    if (isCronAny(dayOfMonth) &&
+        month.kind === "single" &&
+        isCronAny(dayOfWeek)) {
         const monthLabel = monthName(month.value);
         return monthLabel ? `Every day in ${monthLabel} at ${time}` : undefined;
     }
@@ -1226,7 +1415,11 @@ function normalizeHumanSchedule(value) {
     if (hourlyMinute) {
         const minute = Number(hourlyMinute[1]);
         if (Number.isInteger(minute) && minute >= 0 && minute <= 59) {
-            return hourlyScheduleText({ kind: "single", raw: hourlyMinute[1], value: minute });
+            return hourlyScheduleText({
+                kind: "single",
+                raw: hourlyMinute[1],
+                value: minute,
+            });
         }
     }
     return text;
@@ -1258,13 +1451,17 @@ function cronCreateResultText(candidate, rawInput) {
     return lines.join("\n");
 }
 function cronDeleteResultText(candidate) {
-    return typeof candidate.id === "string" ? `Schedule ID: ${candidate.id}` : undefined;
+    return typeof candidate.id === "string"
+        ? `Schedule ID: ${candidate.id}`
+        : undefined;
 }
 function cronListResultText(candidate) {
     if (!Array.isArray(candidate.jobs)) {
         return undefined;
     }
-    const jobs = candidate.jobs.map(asRecordOrNull).filter((job) => job !== null);
+    const jobs = candidate.jobs
+        .map(asRecordOrNull)
+        .filter((job) => job !== null);
     if (jobs.length === 0) {
         return "Jobs: none";
     }
@@ -1314,7 +1511,10 @@ function cronResultText(toolName, rawResult, rawContent, rawInput) {
         return undefined;
     }
     const candidates = resultRecordCandidates(rawResult, rawContent);
-    for (const parsed of [parseJsonCandidate(rawResult), parseJsonCandidate(rawContent)]) {
+    for (const parsed of [
+        parseJsonCandidate(rawResult),
+        parseJsonCandidate(rawContent),
+    ]) {
         candidates.push(...resultRecordCandidates(parsed, undefined));
     }
     for (const candidate of candidates) {
@@ -1382,7 +1582,10 @@ function scheduleWakeupResultText(toolName, rawResult, rawContent) {
         return undefined;
     }
     const candidates = resultRecordCandidates(rawResult, rawContent);
-    for (const parsed of [parseJsonCandidate(rawResult), parseJsonCandidate(rawContent)]) {
+    for (const parsed of [
+        parseJsonCandidate(rawResult),
+        parseJsonCandidate(rawContent),
+    ]) {
         candidates.push(...resultRecordCandidates(parsed, undefined));
     }
     for (const candidate of candidates) {
@@ -1392,7 +1595,9 @@ function scheduleWakeupResultText(toolName, rawResult, rawContent) {
         const clampedDelaySeconds = typeof candidate.clampedDelaySeconds === "number"
             ? formatDurationSeconds(candidate.clampedDelaySeconds)
             : undefined;
-        if (!scheduledFor || !clampedDelaySeconds || typeof candidate.wasClamped !== "boolean") {
+        if (!scheduledFor ||
+            !clampedDelaySeconds ||
+            typeof candidate.wasClamped !== "boolean") {
             continue;
         }
         return [
@@ -1421,7 +1626,10 @@ function pushNotificationResultText(toolName, rawResult, rawContent, rawInput) {
     }
     const inputMessage = nonEmptyString(asRecordOrNull(rawInput)?.message);
     const candidates = resultRecordCandidates(rawResult, rawContent);
-    for (const parsed of [parseJsonCandidate(rawResult), parseJsonCandidate(rawContent)]) {
+    for (const parsed of [
+        parseJsonCandidate(rawResult),
+        parseJsonCandidate(rawContent),
+    ]) {
         candidates.push(...resultRecordCandidates(parsed, undefined));
     }
     for (const candidate of candidates) {
@@ -1446,7 +1654,8 @@ function pushNotificationResultText(toolName, rawResult, rawContent, rawInput) {
         if (disabledReason) {
             lines.push(`Disabled reason: ${disabledReason}`);
         }
-        if (typeof candidate.idleSec === "number" && Number.isFinite(candidate.idleSec)) {
+        if (typeof candidate.idleSec === "number" &&
+            Number.isFinite(candidate.idleSec)) {
             lines.push(`Idle time: ${formatDurationSeconds(candidate.idleSec)}`);
         }
         pushBooleanField(lines, "App focused", candidate.hasFocus);
@@ -1496,11 +1705,15 @@ function remoteTriggerResultFields(toolName, rawResult, rawContent) {
         return undefined;
     }
     const candidates = resultRecordCandidates(rawResult, rawContent);
-    for (const parsed of [parseJsonCandidate(rawResult), parseJsonCandidate(rawContent)]) {
+    for (const parsed of [
+        parseJsonCandidate(rawResult),
+        parseJsonCandidate(rawContent),
+    ]) {
         candidates.push(...resultRecordCandidates(parsed, undefined));
     }
     for (const candidate of candidates) {
-        if (typeof candidate.status !== "number" || typeof candidate.json !== "string") {
+        if (typeof candidate.status !== "number" ||
+            typeof candidate.json !== "string") {
             continue;
         }
         const lines = [`Status: ${candidate.status}`];
@@ -1508,11 +1721,9 @@ function remoteTriggerResultFields(toolName, rawResult, rawContent) {
         if (summary) {
             lines.push(`Summary: ${summary}`);
         }
-        else {
-            const response = compactParsedJsonString(candidate.json);
-            if (response) {
-                lines.push(`Response: ${response}`);
-            }
+        const response = compactParsedJsonString(candidate.json);
+        if (response) {
+            lines.push(`Response: ${response}`);
         }
         return { output: lines.join("\n"), failed: candidate.status >= 400 };
     }
@@ -1542,7 +1753,10 @@ function replResultFields(toolName, rawResult, rawContent) {
         return undefined;
     }
     const candidates = resultRecordCandidates(rawResult, rawContent);
-    for (const parsed of [parseJsonCandidate(rawResult), parseJsonCandidate(rawContent)]) {
+    for (const parsed of [
+        parseJsonCandidate(rawResult),
+        parseJsonCandidate(rawContent),
+    ]) {
         candidates.push(...resultRecordCandidates(parsed, undefined));
     }
     for (const candidate of candidates) {
@@ -1588,18 +1802,68 @@ function replResultFields(toolName, rawResult, rawContent) {
 }
 function collectResultCandidates(rawResult, rawContent) {
     const candidates = resultRecordCandidates(rawResult, rawContent);
-    for (const parsed of [parseJsonCandidate(rawResult), parseJsonCandidate(rawContent)]) {
+    for (const parsed of [
+        parseJsonCandidate(rawResult),
+        parseJsonCandidate(rawContent),
+    ]) {
         candidates.push(...resultRecordCandidates(parsed, undefined));
     }
     return candidates;
 }
+function parseSkillResult(toolName, rawResult, rawContent) {
+    if (toolName !== SKILL_TOOL_NAME) {
+        return undefined;
+    }
+    for (const candidate of collectResultCandidates(rawResult, rawContent)) {
+        const commandName = nonEmptyString(candidate.commandName);
+        if (!commandName || typeof candidate.success !== "boolean") {
+            continue;
+        }
+        if (candidate.status === "forked") {
+            const agentId = nonEmptyString(candidate.agentId);
+            if (!agentId || typeof candidate.result !== "string") {
+                continue;
+            }
+            if (candidate.background !== undefined &&
+                typeof candidate.background !== "boolean") {
+                continue;
+            }
+            return {
+                success: candidate.success,
+                commandName,
+                status: "forked",
+                agentId,
+                result: candidate.result,
+                ...(typeof candidate.background === "boolean"
+                    ? { background: candidate.background }
+                    : {}),
+            };
+        }
+        if (candidate.status === undefined || candidate.status === "inline") {
+            const allowedToolsValid = candidate.allowedTools === undefined ||
+                (Array.isArray(candidate.allowedTools) &&
+                    candidate.allowedTools.every((tool) => typeof tool === "string"));
+            const modelValid = candidate.model === undefined || typeof candidate.model === "string";
+            if (!allowedToolsValid || !modelValid) {
+                continue;
+            }
+            return {
+                success: candidate.success,
+                commandName,
+                status: "inline",
+            };
+        }
+    }
+    return undefined;
+}
 function monitorResultFields(toolName, rawResult, rawContent) {
     if (toolName !== MONITOR_TOOL_NAME) {
         return undefined;
     }
     for (const candidate of collectResultCandidates(rawResult, rawContent)) {
         const taskId = nonEmptyString(candidate.taskId);
-        const timeoutMs = typeof candidate.timeoutMs === "number" && Number.isFinite(candidate.timeoutMs)
+        const timeoutMs = typeof candidate.timeoutMs === "number" &&
+            Number.isFinite(candidate.timeoutMs)
             ? Math.max(0, Math.trunc(candidate.timeoutMs))
             : undefined;
         const persistent = typeof candidate.persistent === "boolean"
@@ -1609,7 +1873,9 @@ function monitorResultFields(toolName, rawResult, rawContent) {
                 : timeoutMs !== undefined
                     ? false
                     : undefined;
-        const isStructuredMonitorOutput = taskId !== undefined || timeoutMs !== undefined || persistent !== undefined;
+        const isStructuredMonitorOutput = taskId !== undefined ||
+            timeoutMs !== undefined ||
+            persistent !== undefined;
         if (!isStructuredMonitorOutput) {
             continue;
         }
@@ -1728,7 +1994,10 @@ function enterPlanModeStructuredOutputHandled(toolName, rawResult, rawContent) {
         return false;
     }
     const candidates = resultRecordCandidates(rawResult, rawContent);
-    for (const parsed of [parseJsonCandidate(rawResult), parseJsonCandidate(rawContent)]) {
+    for (const parsed of [
+        parseJsonCandidate(rawResult),
+        parseJsonCandidate(rawContent),
+    ]) {
         candidates.push(...resultRecordCandidates(parsed, undefined));
     }
     for (const candidate of candidates) {
@@ -1778,10 +2047,12 @@ function webFetchResultText(toolName, rawResult, rawContent) {
             const codeText = nonEmptyString(candidate.codeText);
             lines.push(`Status: ${candidate.code}${codeText ? ` ${codeText}` : ""}`);
         }
-        if (typeof candidate.bytes === "number" && Number.isFinite(candidate.bytes)) {
+        if (typeof candidate.bytes === "number" &&
+            Number.isFinite(candidate.bytes)) {
             lines.push(`Bytes: ${Math.max(0, Math.trunc(candidate.bytes))}`);
         }
-        if (typeof candidate.durationMs === "number" && Number.isFinite(candidate.durationMs)) {
+        if (typeof candidate.durationMs === "number" &&
+            Number.isFinite(candidate.durationMs)) {
             lines.push(`Duration: ${Math.max(0, Math.trunc(candidate.durationMs))}ms`);
         }
         return lines.length > 0 ? lines.join("\n") : undefined;
@@ -1797,10 +2068,46 @@ export function buildToolResultFields(isError, rawContent, base, rawResult, _con
     if (outputMetadata) {
         fields.output_metadata = outputMetadata;
     }
-    const fileUnchangedText = !isError && toolName === "Read" ? fileUnchangedResultText(rawResult, rawContent) : "";
+    const skillResult = !isError
+        ? parseSkillResult(toolName, rawResult, rawContent)
+        : undefined;
+    if (skillResult) {
+        fields.title = `${SKILL_TOOL_NAME}: ${skillDisplayName(skillResult.commandName)}`;
+        if (!skillResult.success) {
+            fields.status = "failed";
+        }
+        else if (skillResult.status === "inline") {
+            return fields;
+        }
+        else {
+            const output = skillResult.result.trim();
+            if (output) {
+                fields.raw_output = output;
+                fields.content = [
+                    { type: "content", content: { type: "text", text: output } },
+                ];
+            }
+            return fields;
+        }
+    }
+    const imageReadText = !isError && toolName === "Read"
+        ? imageReadResultText(rawResult, rawContent, base?.raw_input)
+        : undefined;
+    if (imageReadText !== undefined) {
+        fields.raw_output = imageReadText;
+        fields.content = [
+            { type: "content", content: { type: "text", text: imageReadText } },
+        ];
+        return fields;
+    }
+    const fileUnchangedText = !isError && toolName === "Read"
+        ? fileUnchangedResultText(rawResult, rawContent)
+        : "";
     if (fileUnchangedText) {
         fields.raw_output = fileUnchangedText;
-        fields.content = [{ type: "content", content: { type: "text", text: fileUnchangedText } }];
+        fields.content = [
+            { type: "content", content: { type: "text", text: fileUnchangedText } },
+        ];
         return fields;
     }
     const agentTitle = !isError && toolName === "Agent"
@@ -1813,7 +2120,12 @@ export function buildToolResultFields(isError, rawContent, base, rawResult, _con
     if (readMcpResourceError) {
         fields.status = "failed";
         fields.raw_output = readMcpResourceError;
-        fields.content = [{ type: "content", content: { type: "text", text: readMcpResourceError } }];
+        fields.content = [
+            {
+                type: "content",
+                content: { type: "text", text: readMcpResourceError },
+            },
+        ];
         return fields;
     }
     const readMcpResourceDirOutput = !isError
@@ -1822,20 +2134,31 @@ export function buildToolResultFields(isError, rawContent, base, rawResult, _con
     if (readMcpResourceDirOutput !== undefined) {
         fields.raw_output = readMcpResourceDirOutput;
         fields.content = [
-            { type: "content", content: { type: "text", text: readMcpResourceDirOutput } },
+            {
+                type: "content",
+                content: { type: "text", text: readMcpResourceDirOutput },
+            },
         ];
         return fields;
     }
-    const searchOutput = !isError ? searchResultText(toolName, rawResult, rawContent) : undefined;
+    const searchOutput = !isError
+        ? searchResultText(toolName, rawResult, rawContent)
+        : undefined;
     if (searchOutput !== undefined) {
         fields.raw_output = searchOutput;
-        fields.content = [{ type: "content", content: { type: "text", text: searchOutput } }];
+        fields.content = [
+            { type: "content", content: { type: "text", text: searchOutput } },
+        ];
         return fields;
     }
-    const webFetchOutput = !isError ? webFetchResultText(toolName, rawResult, rawContent) : undefined;
+    const webFetchOutput = !isError
+        ? webFetchResultText(toolName, rawResult, rawContent)
+        : undefined;
     if (webFetchOutput !== undefined) {
         fields.raw_output = webFetchOutput;
-        fields.content = [{ type: "content", content: { type: "text", text: webFetchOutput } }];
+        fields.content = [
+            { type: "content", content: { type: "text", text: webFetchOutput } },
+        ];
         return fields;
     }
     const worktreeOutput = !isError
@@ -1845,7 +2168,10 @@ export function buildToolResultFields(isError, rawContent, base, rawResult, _con
         if (worktreeOutput.output) {
             fields.raw_output = worktreeOutput.output;
             fields.content = [
-                { type: "content", content: { type: "text", text: worktreeOutput.output } },
+                {
+                    type: "content",
+                    content: { type: "text", text: worktreeOutput.output },
+                },
             ];
         }
         return fields;
@@ -1855,7 +2181,9 @@ export function buildToolResultFields(isError, rawContent, base, rawResult, _con
         : undefined;
     if (cronOutput !== undefined) {
         fields.raw_output = cronOutput;
-        fields.content = [{ type: "content", content: { type: "text", text: cronOutput } }];
+        fields.content = [
+            { type: "content", content: { type: "text", text: cronOutput } },
+        ];
         return fields;
     }
     const scheduleWakeupOutput = !isError
@@ -1864,7 +2192,10 @@ export function buildToolResultFields(isError, rawContent, base, rawResult, _con
     if (scheduleWakeupOutput !== undefined) {
         fields.raw_output = scheduleWakeupOutput;
         fields.content = [
-            { type: "content", content: { type: "text", text: scheduleWakeupOutput } },
+            {
+                type: "content",
+                content: { type: "text", text: scheduleWakeupOutput },
+            },
         ];
         return fields;
     }
@@ -1874,7 +2205,10 @@ export function buildToolResultFields(isError, rawContent, base, rawResult, _con
     if (pushNotificationOutput !== undefined) {
         fields.raw_output = pushNotificationOutput;
         fields.content = [
-            { type: "content", content: { type: "text", text: pushNotificationOutput } },
+            {
+                type: "content",
+                content: { type: "text", text: pushNotificationOutput },
+            },
         ];
         return fields;
     }
@@ -1890,7 +2224,10 @@ export function buildToolResultFields(isError, rawContent, base, rawResult, _con
         if (remoteTriggerOutput.output) {
             fields.raw_output = remoteTriggerOutput.output;
             fields.content = [
-                { type: "content", content: { type: "text", text: remoteTriggerOutput.output } },
+                {
+                    type: "content",
+                    content: { type: "text", text: remoteTriggerOutput.output },
+                },
             ];
         }
         return fields;
@@ -1920,7 +2257,10 @@ export function buildToolResultFields(isError, rawContent, base, rawResult, _con
         if (backgroundLaunchOutput.output) {
             fields.raw_output = backgroundLaunchOutput.output;
             fields.content = [
-                { type: "content", content: { type: "text", text: backgroundLaunchOutput.output } },
+                {
+                    type: "content",
+                    content: { type: "text", text: backgroundLaunchOutput.output },
+                },
             ];
         }
         return fields;
@@ -1936,15 +2276,21 @@ export function buildToolResultFields(isError, rawContent, base, rawResult, _con
         fields.raw_output = rawOutput;
     }
     if (!isError && isTaskToolName(toolName)) {
-        if (toolName === "TaskUpdate" && taskUpdateSucceeded(rawResult, rawContent) === false) {
+        if (toolName === "TaskUpdate" &&
+            taskUpdateSucceeded(rawResult, rawContent) === false) {
             fields.status = "failed";
         }
         const taskOutput = taskToolResultText(toolName, rawResult, rawContent, base?.raw_input);
         if (taskOutput) {
-            fields.content = [{ type: "content", content: { type: "text", text: taskOutput } }];
+            fields.content = [
+                { type: "content", content: { type: "text", text: taskOutput } },
+            ];
             return fields;
         }
-        if (toolName === "TaskCreate" || toolName === "TaskUpdate" || toolName === "TaskOutput" || toolName === "TaskStop") {
+        if (toolName === "TaskCreate" ||
+            toolName === "TaskUpdate" ||
+            toolName === "TaskOutput" ||
+            toolName === "TaskStop") {
             return fields;
         }
     }
@@ -1978,7 +2324,9 @@ export function buildToolResultFields(isError, rawContent, base, rawResult, _con
         }
     }
     if (rawOutput) {
-        fields.content = [{ type: "content", content: { type: "text", text: rawOutput } }];
+        fields.content = [
+            { type: "content", content: { type: "text", text: rawOutput } },
+        ];
     }
     return fields;
 }