fixing imports

packages/cli/src/nodehost.ts

@@ -13,6 +13,10 @@ import { createNodePath } from "./nodepath"
 import { DockerManager } from "./docker"
 import { DefaultAzureCredential, AccessToken } from "@azure/identity"
 import { LanguageModel } from "../../core/src/chat"
+import {
+    parseDefaultsFromEnv,
+    parseTokenFromEnv,
+} from "../../core/src/connection"
 import {
     DEFAULT_MODEL,
     DEFAULT_TEMPERATURE,
@@ -36,7 +40,6 @@ import { resolveLanguageModel } from "../../core/src/models"
 import { createBundledParsers } from "../../core/src/pdf"
 import { AbortSignalOptions, TraceOptions } from "../../core/src/trace"
 import { unique } from "../../core/src/util"
-import { parseGHTokenFromEnv } from "../../core/src/github"
 
 class NodeServerManager implements ServerManager {
     async start(): Promise<void> {

packages/cli/src/server.ts

@@ -2,7 +2,6 @@ import { WebSocketServer } from "ws"
 import { runPromptScriptTests } from "./test"
 import { PROMPTFOO_VERSION } from "./version"
 import { runScript } from "./run"
-import { ServerResponse } from "http"
 import { AbortSignalCancellationController } from "../../core/src/cancellation"
 import {
     SERVER_PORT,
@@ -16,11 +15,18 @@ import {
     errorMessage,
     serializeError,
 } from "../../core/src/error"
-import { ResponseStatus, host } from "../../core/src/host"
+import { ResponseStatus, ServerResponse, host } from "../../core/src/host"
 import { MarkdownTrace, TraceChunkEvent } from "../../core/src/trace"
 import { logVerbose, logError } from "../../core/src/util"
 import { CORE_VERSION } from "../../core/src/version"
 import { YAMLStringify } from "../../core/src/yaml"
+import {
+    RequestMessages,
+    PromptScriptProgressResponseEvent,
+    PromptScriptEndResponseEvent,
+    ContainerStartResponse,
+    ShellExecResponse,
+} from "../../core/src/server/messages"
 
 export async function startServer(options: { port: string }) {
     const port = parseInt(options.port) || SERVER_PORT

packages/cli/src/test.ts

@@ -30,6 +30,12 @@ import {
     delay,
 } from "../../core/src/util"
 import { YAMLStringify } from "../../core/src/yaml"
+import {
+    PromptScriptTestRunOptions,
+    PromptScriptTestRunResponse,
+    PromptScriptTestResult,
+} from "../../core/src/server/messages"
+import { generatePromptFooConfiguration } from "../../core/src/test"
 
 function parseModelSpec(m: string): ModelOptions {
     const values = parseKeyValuePairs(m)

packages/vscode/src/airequesttree.ts

@@ -4,10 +4,10 @@ import {
     AIRequestSnapshotKey,
     ExtensionState,
 } from "./state"
-import { CACHE_AIREQUEST_PREFIX, CHANGE, CacheEntry } from "genaiscript-core"
-import { JSONLineCache } from "genaiscript-core"
 import { infoUri } from "./markdowndocumentprovider"
 import { toMarkdownString } from "./markdown"
+import { CacheEntry, JSONLineCache } from "../../core/src/cache"
+import { CHANGE, CACHE_AIREQUEST_PREFIX } from "../../core/src/constants"
 
 type AIRequestTreeNode = CacheEntry<AIRequestSnapshotKey, AIRequestSnapshot>
 

packages/vscode/src/azuremanager.ts

@@ -1,6 +1,7 @@
+import { AZURE_OPENAI_TOKEN_SCOPES } from "../../core/src/constants"
+import { errorMessage } from "../../core/src/error"
 import { ExtensionState } from "./state"
 import * as vscode from "vscode"
-import { AZURE_OPENAI_TOKEN_SCOPES, errorMessage } from "genaiscript-core"
 
 export class AzureManager {
     private _session: vscode.AuthenticationSession

packages/vscode/src/commands.ts

@@ -1,5 +1,6 @@
-import { errorMessage, TOOL_NAME } from "genaiscript-core"
 import * as vscode from "vscode"
+import { TOOL_NAME } from "../../core/src/constants"
+import { errorMessage } from "../../core/src/error"
 
 export function registerCommand(
     id: string,

packages/vscode/src/docsnotebook.ts

@@ -1,25 +1,22 @@
 import * as vscode from "vscode"
 import { ExtensionState } from "./state"
+import { Utils } from "vscode-uri"
+import { registerCommand } from "./commands"
+import { renderMessagesToMarkdown } from "../../core/src/chat"
 import {
-    details,
-    Fragment,
-    MARKDOWN_MIME_TYPE,
     TOOL_NAME,
-    renderMessagesToMarkdown,
-    YAMLStringify,
-    parsePromptScriptMeta,
-    EMOJI_FAIL,
-    errorMessage,
     MDX_REGEX,
-    frontmatterTryParse,
-    YAMLTryParse,
-    arrayify,
-    parseKeyValuePairs,
-    parseBoolean,
-} from "genaiscript-core"
-import { Utils } from "vscode-uri"
-import { register } from "tsx/cjs/api"
-import { registerCommand } from "./commands"
+    EMOJI_FAIL,
+    MARKDOWN_MIME_TYPE,
+} from "../../core/src/constants"
+import { errorMessage } from "../../core/src/error"
+import { parseKeyValuePairs } from "../../core/src/fence"
+import { frontmatterTryParse } from "../../core/src/frontmatter"
+import { details } from "../../core/src/markdown"
+import { parsePromptScriptMeta } from "../../core/src/template"
+import { arrayify, parseBoolean } from "../../core/src/util"
+import { YAMLTryParse, YAMLStringify } from "../../core/src/yaml"
+import { Fragment } from "../../core/src/promptrunner"
 
 // parser
 // https://raw.githubusercontent.com/microsoft/vscode-markdown-notebook/main/src/markdownParser.ts

packages/vscode/src/edit.ts

@@ -1,6 +1,6 @@
 import * as vscode from "vscode"
-import { Fragment, eolPosition } from "genaiscript-core"
 import { ExtensionState } from "./state"
+import { eolPosition } from "../../core/src/ast"
 
 export function toPos(p: CharPosition | number) {
     if (typeof p === "number") return new vscode.Position(p, 0)

packages/vscode/src/extension.ts

@@ -2,7 +2,6 @@ import * as vscode from "vscode"
 import { ExtensionContext } from "vscode"
 import { ExtensionState } from "./state"
 import { activateStatusBar } from "./statusbar"
-import { EXTENSION_ID, TOOL_NAME } from "genaiscript-core"
 import { activateFragmentCommands } from "./fragmentcommands"
 import { activateMarkdownTextDocumentContentProvider } from "./markdowndocumentprovider"
 import { activatePrompTreeDataProvider } from "./prompttree"
@@ -14,6 +13,7 @@ import { activateModelCompletionProvider } from "./modelcompletionprovider"
 import { activateDocsNotebook } from "./docsnotebook"
 import { activateTraceTreeDataProvider } from "./tracetree"
 import { registerCommand } from "./commands"
+import { EXTENSION_ID, TOOL_NAME } from "../../core/src/constants"
 
 export async function activate(context: ExtensionContext) {
     const state = new ExtensionState(context)
@@ -29,68 +29,57 @@ export async function activate(context: ExtensionContext) {
     activateDocsNotebook(state)
 
     context.subscriptions.push(
-        registerCommand(
-            "genaiscript.request.abort",
-            async () => {
-                await state.cancelAiRequest()
+        registerCommand("genaiscript.request.abort", async () => {
+            await state.cancelAiRequest()
+            await vscode.window.showInformationMessage(
+                `${TOOL_NAME} - request aborted.`
+            )
+        }),
+        registerCommand("genaiscript.request.status", async () => {
+            const cmds = commandButtons(state)
+            if (!cmds.length)
                 await vscode.window.showInformationMessage(
-                    `${TOOL_NAME} - request aborted.`
+                    `${TOOL_NAME} - no request.`
                 )
+            else {
+                const res = await vscode.window.showQuickPick(cmds, {
+                    canPickMany: false,
+                })
+                if (res) vscode.commands.executeCommand(res.cmd)
             }
-        ),
-        registerCommand(
-            "genaiscript.request.status",
-            async () => {
-                const cmds = commandButtons(state)
-                if (!cmds.length)
-                    await vscode.window.showInformationMessage(
-                        `${TOOL_NAME} - no request.`
-                    )
-                else {
-                    const res = await vscode.window.showQuickPick(cmds, {
-                        canPickMany: false,
-                    })
-                    if (res) vscode.commands.executeCommand(res.cmd)
-                }
+        }),
+        registerCommand("genaiscript.openIssueReporter", async () => {
+            const issueBody: string[] = [
+                `## Describe the issue`,
+                `A clear and concise description of what the bug is.`,
+                ``,
+                `## To Reproduce`,
+                `Steps to reproduce the behavior`,
+                ``,
+                `## Expected behavior`,
+                `A clear and concise description of what you expected to happen.`,
+                ``,
+                `## Environment`,
+                ``,
+            ]
+            issueBody.push(`vscode: ${vscode.version}`)
+            issueBody.push(
+                `extension: ${context.extension?.packageJSON?.version || "?"}`
+            )
+            if (state.aiRequest?.trace) {
+                issueBody.push(`## Trace`)
+                issueBody.push("`````")
+                issueBody.push(state.aiRequest?.trace?.content)
+                issueBody.push("`````")
             }
-        ),
-        registerCommand(
-            "genaiscript.openIssueReporter",
-            async () => {
-                const issueBody: string[] = [
-                    `## Describe the issue`,
-                    `A clear and concise description of what the bug is.`,
-                    ``,
-                    `## To Reproduce`,
-                    `Steps to reproduce the behavior`,
-                    ``,
-                    `## Expected behavior`,
-                    `A clear and concise description of what you expected to happen.`,
-                    ``,
-                    `## Environment`,
-                    ``,
-                ]
-                issueBody.push(`vscode: ${vscode.version}`)
-                issueBody.push(
-                    `extension: ${
-                        context.extension?.packageJSON?.version || "?"
-                    }`
-                )
-                if (state.aiRequest?.trace) {
-                    issueBody.push(`## Trace`)
-                    issueBody.push("`````")
-                    issueBody.push(state.aiRequest?.trace?.content)
-                    issueBody.push("`````")
+            await vscode.commands.executeCommand(
+                "workbench.action.openIssueReporter",
+                {
+                    extensionId: EXTENSION_ID,
+                    issueBody: issueBody.join("\n"),
                 }
-                await vscode.commands.executeCommand(
-                    "workbench.action.openIssueReporter",
-                    {
-                        extensionId: EXTENSION_ID,
-                        issueBody: issueBody.join("\n"),
-                    }
-                )
-            }
-        )
+            )
+        })
     )
 
     await state.activate()

packages/vscode/src/fragmentcommands.ts

@@ -1,19 +1,13 @@
 import * as vscode from "vscode"
-import {
-    Fragment,
-    GENAI_ANYJS_REGEX,
-    NotSupportedError,
-    PromptScript,
-    assert,
-    dotGenaiscriptPath,
-    errorMessage,
-    groupBy,
-    promptParameterTypeToJSONSchema,
-    templateGroup,
-} from "genaiscript-core"
 import { ExtensionState } from "./state"
 import { checkDirectoryExists, checkFileExists } from "./fs"
 import { registerCommand } from "./commands"
+import { templateGroup } from "../../core/src/ast"
+import { GENAI_ANYJS_REGEX } from "../../core/src/constants"
+import { NotSupportedError } from "../../core/src/error"
+import { promptParameterTypeToJSONSchema } from "../../core/src/parameters"
+import { Fragment } from "../../core/src/promptrunner"
+import { assert, dotGenaiscriptPath, groupBy } from "../../core/src/util"
 
 type TemplateQuickPickItem = {
     template?: PromptScript
@@ -206,7 +200,7 @@ export function activateFragmentCommands(state: ExtensionState) {
 
     subscriptions.push(
         registerCommand("genaiscript.fragment.prompt", fragmentPrompt),
-        registerCommand("genaiscript.fragment.debug", fragmentDebug),
+        registerCommand("genaiscript.fragment.debug", fragmentDebug)
     )
 }
 

packages/vscode/src/fs.ts

@@ -1,6 +1,6 @@
 import * as vscode from "vscode"
-import { JSON5TryParse } from "genaiscript-core"
 import { Utils } from "vscode-uri"
+import { JSON5TryParse } from "../../core/src/json5"
 
 export async function findFiles(pattern: string) {
     return (await vscode.workspace.findFiles(pattern)).map((f) => f.fsPath)

packages/vscode/src/llmrequesttree.ts

@@ -1,15 +1,14 @@
 import * as vscode from "vscode"
 import { ExtensionState } from "./state"
+import { infoUri } from "./markdowndocumentprovider"
+import { CacheEntry } from "../../core/src/cache"
 import {
-    CHANGE,
-    CacheEntry,
     CreateChatCompletionRequest,
-    CACHE_LLMREQUEST_PREFIX,
-    getChatCompletionCache,
-    ChatCompletationRequestCache,
     ChatCompletationRequestCacheValue,
-} from "genaiscript-core"
-import { infoUri } from "./markdowndocumentprovider"
+    ChatCompletationRequestCache,
+    getChatCompletionCache,
+} from "../../core/src/chat"
+import { CHANGE, CACHE_LLMREQUEST_PREFIX } from "../../core/src/constants"
 
 type LLMRequestTreeNode = CacheEntry<
     CreateChatCompletionRequest,

packages/vscode/src/lmaccess.ts

@@ -1,22 +1,22 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import * as vscode from "vscode"
 import { AIRequestOptions, ExtensionState } from "./state"
+import { isApiProposalEnabled } from "./proposals"
+import { LanguageModel } from "../../core/src/chat"
 import {
-    LanguageModel,
-    GenerationOptions,
-    estimateTokens,
-    logVerbose,
-    APIType,
-    MODEL_PROVIDER_OPENAI,
     MODEL_PROVIDER_OLLAMA,
+    MODEL_PROVIDER_LLAMAFILE,
     MODEL_PROVIDER_AICI,
-    updateConnectionConfiguration,
     MODEL_PROVIDER_AZURE,
-    parseModelIdentifier,
     MODEL_PROVIDER_LITELLM,
-    MODEL_PROVIDER_LLAMAFILE,
-} from "genaiscript-core"
-import { isApiProposalEnabled } from "./proposals"
+    MODEL_PROVIDER_OPENAI,
+} from "../../core/src/constants"
+import { APIType } from "../../core/src/host"
+import { parseModelIdentifier } from "../../core/src/models"
+import { GenerationOptions } from "../../core/src/promptcontext"
+import { estimateTokens } from "../../core/src/tokens"
+import { logVerbose } from "../../core/src/util"
+import { updateConnectionConfiguration } from "../../core/src/connection"
 
 async function generateLanguageModelConfiguration(
     state: ExtensionState,

packages/vscode/src/localai.ts

@@ -1,6 +1,6 @@
-import { ICON_LOGO_NAME } from "genaiscript-core"
 import * as vscode from "vscode"
 import { openUrlInTab } from "./browser"
+import { ICON_LOGO_NAME } from "../../core/src/constants"
 
 export async function startLocalAI() {
     const name = "LocalAI"