add prompt... syntax

packages/core/src/constants.ts

@@ -231,3 +231,5 @@
 export const PLAYWRIGHT_DEFAULT_BROWSER = "chromium"
 export const MAX_TOKENS_ELLIPSE = "..."
 export const ESTIMATE_TOKEN_OVERHEAD = 2
+
+export const DEDENT_INSPECT_MAX_DEPTH = 3

packages/core/src/importprompt.ts

@@ -24,6 +24,7 @@ export async function importPrompt(
         "env",
         "retrieval",
         "runPrompt",
+        "prompt",
     ]
 
     const oldGlb: any = {}

packages/core/src/indent.ts

@@ -1,4 +1,6 @@
 import tsDedent from "ts-dedent"
+import { inspect } from "./logging"
+import { DEDENT_INSPECT_MAX_DEPTH } from "./constants"
 
 export function indent(text: string, indentation: string) {
     return text
@@ -8,3 +10,23 @@
 }
 
 export const dedent = tsDedent
+
+export async function dedentAsync(
+    strings: Awaitable<TemplateStringsArray | string>,
+    ...args: any[]
+) {
+    const template = await strings
+    const resolvedArgs: any[] = []
+    for (const arg of args) {
+        let resolvedArg = await arg
+        if (typeof resolvedArg === "function") resolvedArg = resolvedArg()
+        // render objects
+        if (typeof resolvedArg === "object" || Array.isArray(resolvedArg))
+            resolvedArg = inspect(resolvedArg, {
+                maxDepth: DEDENT_INSPECT_MAX_DEPTH,
+            })
+        resolvedArgs.push(resolvedArg ?? "")
+    }
+    const value = dedent(template, ...resolvedArgs)
+    return value
+}

packages/core/src/promptcontext.ts

@@ -41,6 +41,7 @@
 import { Project } from "./ast"
 import { resolveSystems } from "./systems"
 import { shellParse } from "./shell"
+import { dedent, dedentAsync } from "./indent"
 
 export async function createPromptContext(
     prj: Project,
@@ -233,6 +234,25 @@
         defFileMerge: (fn) => {
             appendPromptChild(createFileMerge(fn))
         },
+        prompt: (template, ...args): RunPromptResultPromiseWithOptions => {
+            const options: PromptGeneratorOptions = {}
+            const p: RunPromptResultPromiseWithOptions =
+                new Promise<RunPromptResult>(async (resolve, reject) => {
+                    try {
+                        const text = await dedentAsync(template, ...args)
+                        // data race for options
+                        const res = await runPrompt(text, options)
+                        resolve(res)
+                    } catch (e) {
+                        reject(e)
+                    }
+                }) as any
+            p.options = (v) => {
+                if (v !== undefined) Object.assign(options, v)
+                return p
+            }
+            return p
+        },
         runPrompt: async (generator, runOptions): Promise<RunPromptResult> => {
             try {
                 const { label } = runOptions || {}

packages/core/src/promptdom.ts

@@ -16,7 +16,7 @@ import { toChatCompletionUserMessage } from "./chat"
 import { errorMessage } from "./error"
 import { tidyData } from "./tidy"
 import { inspect } from "./logging"
-import { dedent } from "./indent"
+import { dedent, dedentAsync } from "./indent"
 import {
     ChatCompletionAssistantMessageParam,
     ChatCompletionMessageParam,
@@ -483,24 +483,7 @@ async function resolvePromptNode(
         stringTemplate: async (n) => {
             const { strings, args } = n
             try {
-                const resolvedArgs: any[] = []
-                for (const arg of args) {
-                    let resolvedArg = await arg
-                    if (typeof resolvedArg === "function")
-                        resolvedArg = resolvedArg()
-                    // render objects
-                    if (
-                        typeof resolvedArg === "object" ||
-                        Array.isArray(resolvedArg)
-                    )
-                        resolvedArg = inspect(resolvedArg, {
-                            maxDepth: 3,
-                        })
-                    resolvedArgs.push(resolvedArg ?? "")
-                }
-                let value = dedent(strings, ...resolvedArgs)
-
-                // apply transforms
+                let value = await dedentAsync(strings, ...args)
                 if (n.transforms?.length)
                     for (const transform of n.transforms)
                         value = await transform(value)

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

@@ -1544,6 +1544,10 @@ interface FileUpdate {
     validation?: JSONSchemaValidation
 }
 
+interface RunPromptResultPromiseWithOptions extends Promise<RunPromptResult> {
+    options(values?: PromptGeneratorOptions): RunPromptResultPromiseWithOptions
+}
+
 interface ChatGenerationContext extends ChatTurnGenerationContext {
     defSchema(
         name: string,
@@ -1576,6 +1580,10 @@ interface ChatGenerationContext extends ChatTurnGenerationContext {
         generator: string | PromptGenerator,
         options?: PromptGeneratorOptions
     ): Promise<RunPromptResult>
+    prompt(
+        strings: TemplateStringsArray,
+        ...args: any[]
+    ): RunPromptResultPromiseWithOptions
 }
 
 interface GenerationOutput {

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

@@ -203,7 +203,7 @@ declare function defSchema(
  * @param options
  */
 declare function defImages(
-    files: ElementOrArray<string | WorkspaceFile | Buffer | Blob>,    
+    files: ElementOrArray<string | WorkspaceFile | Buffer | Blob>,
     options?: DefImagesOptions
 ): void
 
@@ -235,6 +235,14 @@ declare function runPrompt(
     options?: PromptGeneratorOptions
 ): Promise<RunPromptResult>
 
+/**
+ * Expands and executes the prompt
+ */
+declare function prompt(
+    strings: TemplateStringsArray,
+    ...args: any[]
+): RunPromptResultPromiseWithOptions
+
 /**
  * Registers a callback to process the LLM output
  * @param fn