Rich LLM logging

binary/src/index.ts

@@ -1,6 +1,7 @@
 process.env.IS_BINARY = "true";
 import { Command } from "commander";
 import { Core } from "core/core";
+import { LLMLogFormatter } from "core/llm/logFormatter";
 import { FromCoreProtocol, ToCoreProtocol } from "core/protocol";
 import { IMessenger } from "core/protocol/messenger";
 import { getCoreLogsPath, getPromptLogsPath } from "core/util/paths";
@@ -33,9 +34,8 @@ program.action(async () => {
     const ide = new IpcIde(messenger);
     const promptLogsPath = getPromptLogsPath();
 
-    new Core(messenger, ide, async (text) => {
-      fs.appendFileSync(promptLogsPath, text + "\n\n");
-    });
+    const core = new Core(messenger, ide);
+    new LLMLogFormatter(core.llmLogger, fs.createWriteStream(promptLogsPath));
 
     console.log("[binary] Core started");
   } catch (e) {

core/config/ConfigHandler.ts

@@ -12,6 +12,7 @@ import {
   IDE,
   IdeSettings,
   ILLM,
+  ILLMLogger,
 } from "../index.js";
 import Ollama from "../llm/llms/Ollama.js";
 import { GlobalContext } from "../util/GlobalContext.js";
@@ -48,12 +49,11 @@ export class ConfigHandler {
   constructor(
     private readonly ide: IDE,
     private ideSettingsPromise: Promise<IdeSettings>,
-    private readonly writeLog: (text: string) => Promise<void>,
+    private llmLogger: ILLMLogger,
     sessionInfoPromise: Promise<ControlPlaneSessionInfo | undefined>,
   ) {
     this.ide = ide;
     this.ideSettingsPromise = ideSettingsPromise;
-    this.writeLog = writeLog;
     this.controlPlaneClient = new ControlPlaneClient(
       sessionInfoPromise,
       ideSettingsPromise,
@@ -65,7 +65,7 @@ export class ConfigHandler {
         ide,
         ideSettingsPromise,
         this.controlPlaneClient,
-        writeLog,
+        this.llmLogger,
       ),
       this.ide,
     );
@@ -184,7 +184,7 @@ export class ConfigHandler {
           this.controlPlaneClient,
           this.ide,
           this.ideSettingsPromise,
-          this.writeLog,
+          this.llmLogger,
           assistant.rawYaml,
           orgScopeId,
         );
@@ -229,7 +229,7 @@ export class ConfigHandler {
         this.controlPlaneClient,
         this.ide,
         this.ideSettingsPromise,
-        this.writeLog,
+        this.llmLogger,
         this.reloadConfig.bind(this),
       );
 
@@ -292,7 +292,7 @@ export class ConfigHandler {
         this.ide,
         this.ideSettingsPromise,
         this.controlPlaneClient,
-        this.writeLog,
+        this.llmLogger,
         assistant,
       );
     });

core/config/load.ts

@@ -27,6 +27,7 @@ import {
   IdeSettings,
   IdeType,
   ILLM,
+  ILLMLogger,
   LLMOptions,
   ModelDescription,
   RerankerDescription,
@@ -222,7 +223,7 @@ async function intermediateToFinalConfig(
   ideSettings: IdeSettings,
   ideInfo: IdeInfo,
   uniqueId: string,
-  writeLog: (log: string) => Promise<void>,
+  llmLogger: ILLMLogger,
   workOsAccessToken: string | undefined,
   loadPromptFiles: boolean = true,
   allowFreeTrial: boolean = true,
@@ -238,7 +239,7 @@ async function intermediateToFinalConfig(
         ide.readFile.bind(ide),
         uniqueId,
         ideSettings,
-        writeLog,
+        llmLogger,
         config.completionOptions,
         config.systemMessage,
       );
@@ -260,7 +261,7 @@ async function intermediateToFinalConfig(
                 ide.readFile.bind(ide),
                 uniqueId,
                 ideSettings,
-                writeLog,
+                llmLogger,
                 copyOf(config.completionOptions),
                 config.systemMessage,
               );
@@ -280,7 +281,7 @@ async function intermediateToFinalConfig(
     } else {
       const llm = new CustomLLMClass({
         ...desc,
-        options: { ...desc.options, writeLog } as any,
+        options: { ...desc.options, logger: llmLogger } as any,
       });
       if (llm.model === "AUTODETECT") {
         try {
@@ -289,7 +290,11 @@ async function intermediateToFinalConfig(
             (modelName) =>
               new CustomLLMClass({
                 ...desc,
-                options: { ...desc.options, model: modelName, writeLog },
+                options: {
+                  ...desc.options,
+                  model: modelName,
+                  logger: llmLogger,
+                },
               }),
           );
 
@@ -343,7 +348,7 @@ async function intermediateToFinalConfig(
               ide.readFile.bind(ide),
               uniqueId,
               ideSettings,
-              writeLog,
+              llmLogger,
               config.completionOptions,
               config.systemMessage,
             );
@@ -831,7 +836,7 @@ async function loadContinueConfigFromJson(
   ideSettings: IdeSettings,
   ideInfo: IdeInfo,
   uniqueId: string,
-  writeLog: (log: string) => Promise<void>,
+  llmLogger: ILLMLogger,
   workOsAccessToken: string | undefined,
   overrideConfigJson: SerializedContinueConfig | undefined,
 ): Promise<ConfigResult<ContinueConfig>> {
@@ -931,7 +936,7 @@ async function loadContinueConfigFromJson(
       ideSettings,
       ideInfo,
       uniqueId,
-      writeLog,
+      llmLogger,
       workOsAccessToken,
     );
   return {

core/config/profile/ControlPlaneProfileLoader.ts

@@ -7,6 +7,7 @@ import {
   ContinueConfig,
   IDE,
   IdeSettings,
+  ILLMLogger,
   SerializedContinueConfig,
 } from "../../index.js";
 import { ProfileDescription } from "../ProfileLifecycleManager.js";
@@ -27,7 +28,7 @@ export default class ControlPlaneProfileLoader implements IProfileLoader {
     private readonly controlPlaneClient: ControlPlaneClient,
     private readonly ide: IDE,
     private ideSettingsPromise: Promise<IdeSettings>,
-    private writeLog: (message: string) => Promise<void>,
+    private llmLogger: ILLMLogger,
     private readonly onReload: () => void,
   ) {
     this.description = {
@@ -65,7 +66,7 @@ export default class ControlPlaneProfileLoader implements IProfileLoader {
       this.ide,
       this.ideSettingsPromise,
       this.controlPlaneClient,
-      this.writeLog,
+      this.llmLogger,
       serializedConfig,
       undefined,
       undefined,

core/config/profile/LocalProfileLoader.ts

@@ -1,7 +1,7 @@
 import { ConfigResult, parseConfigYaml } from "@continuedev/config-yaml";
 
 import { ControlPlaneClient } from "../../control-plane/client.js";
-import { ContinueConfig, IDE, IdeSettings } from "../../index.js";
+import { ContinueConfig, IDE, IdeSettings, ILLMLogger } from "../../index.js";
 import { ProfileDescription } from "../ProfileLifecycleManager.js";
 
 import { getPrimaryConfigFilePath } from "../../util/paths.js";
@@ -17,7 +17,7 @@ export default class LocalProfileLoader implements IProfileLoader {
     private ide: IDE,
     private ideSettingsPromise: Promise<IdeSettings>,
     private controlPlaneClient: ControlPlaneClient,
-    private writeLog: (message: string) => Promise<void>,
+    private llmLogger: ILLMLogger,
     private overrideAssistantFile?:
       | { path: string; content: string }
       | undefined,
@@ -59,7 +59,7 @@ export default class LocalProfileLoader implements IProfileLoader {
       this.ide,
       this.ideSettingsPromise,
       this.controlPlaneClient,
-      this.writeLog,
+      this.llmLogger,
       undefined,
       undefined,
       undefined,

core/config/profile/PlatformProfileLoader.ts

@@ -2,7 +2,7 @@ import { AssistantUnrolled, ConfigResult } from "@continuedev/config-yaml";
 
 import { ControlPlaneClient } from "../../control-plane/client.js";
 import { getControlPlaneEnv } from "../../control-plane/env.js";
-import { ContinueConfig, IDE, IdeSettings } from "../../index.js";
+import { ContinueConfig, IDE, IdeSettings, ILLMLogger } from "../../index.js";
 import { ProfileDescription } from "../ProfileLifecycleManager.js";
 
 import doLoadConfig from "./doLoadConfig.js";
@@ -30,7 +30,7 @@ export default class PlatformProfileLoader implements IProfileLoader {
     private readonly controlPlaneClient: ControlPlaneClient,
     private readonly ide: IDE,
     private ideSettingsPromise: Promise<IdeSettings>,
-    private writeLog: (message: string) => Promise<void>,
+    private llmLogger: ILLMLogger,
     readonly description: ProfileDescription,
     private readonly orgScopeId: string | null,
   ) {}
@@ -44,7 +44,7 @@ export default class PlatformProfileLoader implements IProfileLoader {
     controlPlaneClient: ControlPlaneClient,
     ide: IDE,
     ideSettingsPromise: Promise<IdeSettings>,
-    writeLog: (message: string) => Promise<void>,
+    llmLogger: ILLMLogger,
     rawYaml: string,
     orgScopeId: string | null,
   ): Promise<PlatformProfileLoader> {
@@ -74,7 +74,7 @@ export default class PlatformProfileLoader implements IProfileLoader {
       controlPlaneClient,
       ide,
       ideSettingsPromise,
-      writeLog,
+      llmLogger,
       description,
       orgScopeId,
     );
@@ -93,7 +93,7 @@ export default class PlatformProfileLoader implements IProfileLoader {
       this.ide,
       this.ideSettingsPromise,
       this.controlPlaneClient,
-      this.writeLog,
+      this.llmLogger,
       undefined,
       this.configResult.config,
       {

core/config/profile/doLoadConfig.ts

@@ -12,6 +12,7 @@ import {
   ContinueRcJson,
   IDE,
   IdeSettings,
+  ILLMLogger,
   SerializedContinueConfig,
   Tool,
 } from "../../";
@@ -39,7 +40,7 @@ export default async function doLoadConfig(
   ide: IDE,
   ideSettingsPromise: Promise<IdeSettings>,
   controlPlaneClient: ControlPlaneClient,
-  writeLog: (message: string) => Promise<void>,
+  llmLogger: ILLMLogger,
   overrideConfigJson: SerializedContinueConfig | undefined,
   overrideConfigYaml: AssistantUnrolled | undefined,
   platformConfigMetadata: PlatformConfigMetadata | undefined,
@@ -74,7 +75,7 @@ export default async function doLoadConfig(
       ideSettings,
       ideInfo,
       uniqueId,
-      writeLog,
+      llmLogger,
       workOsAccessToken,
       overrideConfigYaml,
       platformConfigMetadata,
@@ -92,7 +93,7 @@ export default async function doLoadConfig(
       ideSettings,
       ideInfo,
       uniqueId,
-      writeLog,
+      llmLogger,
       workOsAccessToken,
       overrideConfigJson,
     );