Refactor rendering of shell output and update type definitions for de…

…f function

packages/core/src/chat.ts

@@ -31,7 +31,11 @@ import {
     ChatCompletionUserMessageParam,
     CreateChatCompletionRequest,
 } from "./chattypes"
-import { renderMessageContent, renderMessagesToMarkdown } from "./chatrender"
+import {
+    renderMessageContent,
+    renderMessagesToMarkdown,
+    renderShellOutput,
+} from "./chatrender"
 import { promptParametersSchemaToJSONSchema } from "./parameters"
 import { fenceMD } from "./markdown"
 import { YAMLStringify } from "./yaml"
@@ -204,14 +208,7 @@ async function runToolCalls(
                     typeof output === "object" &&
                     (output as ShellOutput).exitCode !== undefined
                 ) {
-                    const { stdout, stderr, exitCode } = output as ShellOutput
-                    toolContent = `EXIT_CODE: ${exitCode}
-
-STDOUT:
-${stdout || ""}
-
-STDERR:
-${stderr || ""}`
+                    toolContent = renderShellOutput(output as ShellOutput)
                 } else if (
                     typeof output === "object" &&
                     (output as WorkspaceFile).filename &&

packages/core/src/chatrender.ts

@@ -8,6 +8,17 @@ import { JSON5TryParse } from "./json5"
 import { details, fenceMD } from "./markdown"
 import { YAMLStringify } from "./yaml"
 
+export function renderShellOutput(output: ShellOutput) {
+    const { exitCode, stdout, stderr } = output
+    return [
+        `EXIT_CODE: ${exitCode}`,
+        stdout ? `STDOUT:${fenceMD(stdout, "text")}` : undefined,
+        stderr ? `STDERR:${fenceMD(stderr, "text")}` : undefined,
+    ]
+        .filter((s) => s)
+        .join("\n\n")
+}
+
 export function renderMessageContent(
     msg:
         | ChatCompletionAssistantMessageParam

packages/core/src/runpromptcontext.ts

@@ -19,6 +19,7 @@ import { consoleLogFormat } from "./logging"
 import { resolveFileDataUri } from "./file"
 import { isGlobMatch } from "./glob"
 import { logVerbose } from "./util"
+import { renderShellOutput } from "./chatrender"
 
 export function createChatTurnGenerationContext(
     options: GenerationOptions,
@@ -69,14 +70,6 @@ export function createChatTurnGenerationContext(
                 if (body.length === 0 && !doptions.ignoreEmpty)
                     throw new Error(`def ${name} is empty`)
                 body.forEach((f) => ctx.def(name, f, defOptions))
-            } else if (typeof body === "object" && body.filename) {
-                const { glob, endsWith } = defOptions || {}
-                const filename = body.filename
-                if (glob && filename) {
-                    if (!isGlobMatch(filename, glob)) return undefined
-                }
-                if (endsWith && !filename.endsWith(endsWith)) return undefined
-                appendChild(node, createDefNode(name, body, doptions))
             } else if (typeof body === "string") {
                 if (body.trim() === "" && !doptions.ignoreEmpty)
                     throw new Error(`def ${name} is empty`)
@@ -88,6 +81,33 @@ export function createChatTurnGenerationContext(
                         doptions
                     )
                 )
+            } else if (
+                typeof body === "object" &&
+                (body as WorkspaceFile).filename
+            ) {
+                const file = body as WorkspaceFile
+                const { glob, endsWith } = defOptions || {}
+                const { filename } = file
+                if (glob && filename) {
+                    if (!isGlobMatch(filename, glob)) return undefined
+                }
+                if (endsWith && !filename.endsWith(endsWith)) return undefined
+                appendChild(node, createDefNode(name, file, doptions))
+            } else if (
+                typeof body === "object" &&
+                (body as ShellOutput).exitCode !== undefined
+            ) {
+                appendChild(
+                    node,
+                    createDefNode(
+                        name,
+                        {
+                            filename: "",
+                            content: renderShellOutput(body as ShellOutput),
+                        },
+                        { ...doptions, lineNumbers: false }
+                    )
+                )
             }
 
             // TODO: support clause

packages/core/src/types/prompt_template.d.ts

@@ -1392,7 +1392,11 @@ interface ChatTurnGenerationContext {
     writeText(body: Awaitable<string>, options?: WriteTextOptions): void
     $(strings: TemplateStringsArray, ...args: any[]): void
     fence(body: StringLike, options?: FenceOptions): void
-    def(name: string, body: StringLike, options?: DefOptions): string
+    def(
+        name: string,
+        body: string | WorkspaceFile | WorkspaceFile[] | ShellOutput,
+        options?: DefOptions
+    ): string
     defData(
         name: string,
         data: object[] | object,
@@ -1414,7 +1418,9 @@ interface ChatGenerationContext extends ChatTurnGenerationContext {
         options?: DefSchemaOptions
     ): string
     defImages(files: StringLike, options?: DefImagesOptions): void
-    defTool(tool: ToolCallback | AgenticToolCallback | AgenticToolProviderCallback): void
+    defTool(
+        tool: ToolCallback | AgenticToolCallback | AgenticToolProviderCallback
+    ): void
     defTool(
         name: string,
         description: string,

packages/core/src/types/prompt_type.d.ts

@@ -51,7 +51,7 @@ declare function fence(body: StringLike, options?: FenceOptions): void
  */
 declare function def(
     name: string,
-    body: StringLike,
+    body: string | WorkspaceFile | WorkspaceFile[] | ShellOutput,
     options?: DefOptions
 ): string