refactor: update trace handling in context creation and expand functions

Author: pelikhan

packages/core/src/expander.ts

@@ -52,14 +52,14 @@ export async function callExpander(
   prj: Project,
   r: PromptScript,
   ev: ExpansionVariables,
-  trace: MarkdownTrace,
   options: GenerationOptions,
   installGlobally: boolean,
 ) {
   mark("prompt.expand.main");
   assert(!!options.model);
+  const trace = options.trace;
   const modelId = r.model ?? options.model;
-  const ctx = await createPromptContext(prj, ev, trace, options, modelId);
+  const ctx = await createPromptContext(prj, ev, options, modelId);
   if (installGlobally) installGlobalPromptContext(ctx);
 
   let status: GenerationStatus = undefined;
@@ -268,9 +268,9 @@ export async function expandTemplate(
     prj,
     template,
     env,
-    trace,
     {
       ...options,
+      trace,
       maxTokens,
       maxToolCalls,
       flexTokens,
@@ -356,8 +356,7 @@ export async function expandTemplate(
         prj,
         system,
         mergeEnvVarsWithSystem(env, systemId),
-        trace,
-        options,
+        { ...options, trace },
         false,
       );
 

packages/core/src/promptcontext.ts

@@ -54,11 +54,10 @@ const dbg = genaiscriptDebug("ctx");
 export async function createPromptContext(
   prj: Project,
   ev: ExpansionVariables,
-  trace: MarkdownTrace,
   options: GenerationOptions,
   model: string,
 ) {
-  const { cancellationToken } = options;
+  const { trace, cancellationToken } = options;
   const { generator, vars, dbg, output, ...varsNoGenerator } = ev;
 
   dbg(`create`);

packages/core/src/runpromptcontext.ts

@@ -894,7 +894,6 @@ export function createChatGenerationContext(
               prj,
               system,
               mergeEnvVarsWithSystem(env, systemId),
-              runTrace,
               genOptions,
               false,
             );

packages/runtime-sample/src/poem-js.js

@@ -1,4 +1,6 @@
-import "@genaiscript/runtime";
+import { config } from "@genaiscript/runtime";
+
+await config();
 
 const d = YAML`foo: bar`;
 

packages/runtime/src/runtime.ts

@@ -36,9 +36,9 @@ import {
   generateId,
   getRunDir,
   installGlobalPromptContext,
-  installGlobals,
   genaiscriptDebug,
   LARGE_MODEL_ID,
+  MarkdownTrace,
 } from "@genaiscript/core";
 import { NodeHost } from "./nodehost.js";
 import debug from "debug";
@@ -124,6 +124,7 @@ export async function config(
   const prj = await buildProject();
   const runId = generateId();
   const runDir = getRunDir("runtime", runId);
+  const output = new MarkdownTrace();
   const env: ExpansionVariables = {
     runId,
     runDir,
@@ -135,21 +136,19 @@ export async function config(
       id: "",
     },
     generator: undefined,
-    output: undefined,
+    output,
     dbg: debug(DEBUG_SCRIPT_CATEGORY),
   };
   const ctx = await createPromptContext(
     prj,
     env,
-    undefined,
     {
       inner: false,
       stats: undefined,
-      trace: undefined,
       model: LARGE_MODEL_ID,
       userState: {},
     },
-    undefined,
+    LARGE_MODEL_ID,
   );
   installGlobalPromptContext(ctx);
 }