Refactor system resolution and update functions for improved clarity …

…and extendability

packages/core/src/promptcontext.ts

@@ -39,6 +39,7 @@ import { resolveModelConnectionInfo } from "./models"
 import { resolveLanguageModel } from "./lm"
 import { callExpander } from "./expander"
 import { Project } from "./ast"
+import { resolveSystems } from "./systems"
 
 export async function createPromptContext(
     prj: Project,
@@ -215,7 +216,7 @@ export async function createPromptContext(
         },
         runPrompt: async (generator, runOptions): Promise<RunPromptResult> => {
             try {
-                const { label, system = [] } = runOptions || {}
+                const { label } = runOptions || {}
                 trace.startDetails(`🎁 run prompt ${label || ""}`)
                 infoCb?.({ text: `run prompt ${label || ""}` })
 
@@ -265,7 +266,7 @@ export async function createPromptContext(
                     role: "system",
                     content: "",
                 }
-                for (const systemId of system) {
+                for (const systemId of resolveSystems(prj, runOptions)) {
                     checkCancelled(cancellationToken)
 
                     const system = prj.getTemplate(systemId)

packages/core/src/promptdom.ts

@@ -252,7 +252,13 @@ export function createFunctionNode(
     assert(!!description)
     assert(parameters !== undefined)
     assert(impl !== undefined)
-    return { type: "function", name, description, parameters, impl }
+    return {
+        type: "function",
+        name,
+        description: dedent(description),
+        parameters,
+        impl,
+    }
 }
 
 export function createFileMerge(fn: FileMergeHandler): PromptFileMergeNode {

packages/core/src/systems.ts

@@ -1,13 +1,16 @@
 import { Project } from "./ast"
 import { arrayify, unique } from "./util"
 
-export function resolveSystems(prj: Project, template: PromptScript) {
-    const { jsSource } = template
-    const systems = arrayify(template.system).slice(0)
+export function resolveSystems(
+    prj: Project,
+    script: PromptSystemOptions & ModelOptions & { jsSource?: string }
+) {
+    const { jsSource } = script
+    const systems = arrayify(script.system).slice(0)
 
-    if (template.system === undefined) {
+    if (script.system === undefined) {
         const useSchema = /\Wdefschema\W/i.test(jsSource)
-        if (!template.responseType) {
+        if (!script.responseType) {
             systems.push("system")
             systems.push("system.explanations")
         }
@@ -26,9 +29,9 @@ export function resolveSystems(prj: Project, template: PromptScript) {
             systems.push("system.diagrams")
     }
 
-    if (template.tools) {
+    if (script.tools) {
         systems.push("system.tools")
-        arrayify(template.tools).forEach((tool) =>
+        arrayify(script.tools).forEach((tool) =>
             systems.push(...resolveTools(prj, tool))
         )
     }

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

@@ -208,7 +208,7 @@ interface EmbeddingsModelConnectionOptions {
 
 interface EmbeddingsModelOptions extends EmbeddingsModelConnectionOptions {}
 
-interface ScriptRuntimeOptions {
+interface PromptSystemOptions {
     /**
      * List of system script ids used by the prompt.
      */
@@ -218,7 +218,9 @@ interface ScriptRuntimeOptions {
      * List of tools used by the prompt.
      */
     tools?: SystemToolId | SystemToolId[]
+}
 
+interface ScriptRuntimeOptions {
     /**
      * Secrets required by the prompt
      */
@@ -339,6 +341,7 @@ interface PromptTest {
 interface PromptScript
     extends PromptLike,
         ModelOptions,
+        PromptSystemOptions,
         EmbeddingsModelOptions,
         ScriptRuntimeOptions {
     /**
@@ -1445,21 +1448,11 @@ interface WriteTextOptions extends ContextExpansionOptions {
 
 type PromptGenerator = (ctx: ChatGenerationContext) => Awaitable<unknown>
 
-interface PromptGeneratorOptions extends ModelOptions {
+interface PromptGeneratorOptions extends ModelOptions, PromptSystemOptions {
     /**
      * Label for trace
      */
     label?: string
-
-    /**
-     * List of system prompts if any
-     */
-    system?: SystemPromptId | SystemPromptId[]
-
-    /**
-     * List of tools used by the prompt.
-     */
-    tools?: SystemToolId | SystemToolId[]
 }
 
 interface FileOutputOptions {

packages/sample/genaisrc/nested-agents.genai.mts

@@ -1,20 +1,61 @@
+script({ model: "openai:gpt-4o" })
+
+/**
+ * This agent loads the file system prompts.
+ */
 defTool(
-    "agent-fs",
-    "Invokes gpt-4o to execute a LLM request",
+    "agent_file_system",
+    `An agent that uses gpt-4o to execute an LLM requests with tools that can search and read the file system.
+    `,
     {
         prompt: {
             type: "string",
             description: "the prompt to be executed by the LLM",
         },
     },
     async ({ prompt }) => {
-        const res = await env.generator.runPrompt(_ => {
-            _.writeText(prompt)
-        }, {
+        const res = await env.generator.runPrompt(
+            (_) => {
+                _.$`You are an AI assistant that can help with file system tasks.
+
+                Answer the user question in the most concise way possible. Use wildcards and regex if needed.
+                If the question is ambiguous, ask for clarification.
+                Use tools to search and read the file system.
+                
+                QUESTION:`
+                _.writeText(prompt)
+            },
+            {
+                model: "openai:gpt-4o",
+                label: `llm-4o agent_fs ${prompt}`,
+                tools: "fs",
+            }
+        )
+        return res.text
+    }
+)
+
+/**
+ * This agent loads the file system prompts.
+ */
+defTool(
+    "agent_code_interpreter",
+    "An LLM agent that execute python code in a sandboxed container.",
+    {
+        code: {
+            type: "string",
+            description: "the python to be executed by the LLM",
+        },
+    },
+    async ({ code }) => {
+        const res = await env.generator.runPrompt(code, {
             model: "openai:gpt-4o",
-            label: "llm-4o with fs",
-            tools: "fs"
+            label: "llm-4o agent_fs",
+            tools: "python",
         })
         return res.text
     }
 )
+
+// now as a question about the file system
+$`Do a statistical analyzis of all data (*.csv) in the project.`