... getting closer now

Signed-off-by: David Zager <[email protected]>

Author: djzager

agentic/src/clients/solutionServerClient.ts

@@ -374,8 +374,6 @@ export class SolutionServerClient {
         },
       });
 
-      let bestHintResult: GetBestHintResult | undefined;
-
       if (result.content && Array.isArray(result.content) && result.content.length > 0) {
         for (const chunk of result.content) {
           if ("text" in chunk) {
@@ -391,28 +389,24 @@ export class SolutionServerClient {
                   "hint" in parsed &&
                   "hint_id" in parsed
                 ) {
-                  bestHintResult = {
+                  console.log(`Found best hint for violation ${rulesetName} - ${violationName}`);
+                  return {
                     hint: parsed.hint,
                     hint_id: parsed.hint_id,
                   };
                 }
               } catch (parseError) {
                 console.error(`Failed to parse best hint response: ${parseError}`);
-                bestHintResult = undefined;
+                return undefined;
               }
             }
             break;
           }
         }
       }
 
-      if (bestHintResult) {
-        console.log(`Found best hint for violation ${rulesetName} - ${violationName}`);
-      } else {
-        console.log(`No hint found for violation ${rulesetName} - ${violationName}`);
-      }
-
-      return bestHintResult;
+      console.log(`No hint found for violation ${rulesetName} - ${violationName}`);
+      return undefined;
     } catch (error) {
       console.error(
         `Error getting best hint for violation ${rulesetName} - ${violationName}: ${error}`,

agentic/src/nodes/analysisIssueFix.ts

@@ -7,6 +7,7 @@ import {
 } from "@langchain/core/messages";
 import { promises as fsPromises } from "fs";
 import { type DynamicStructuredTool } from "@langchain/core/tools";
+import { createPatch } from "diff";
 
 import {
   type SummarizeAdditionalInfoInputState,
@@ -18,9 +19,7 @@ import {
 } from "../schemas/analysisIssueFix";
 import { BaseNode, type ModelInfo } from "./base";
 import { type KaiFsCache, KaiWorkflowMessageType } from "../types";
-import { type SolutionServerClient } from "../clients/solutionServerClient";
-import { GetBestHintResult } from "../clients/solutionServerClient";
-import { createPatch } from "diff";
+import { type GetBestHintResult, SolutionServerClient } from "src/clients/solutionServerClient";
 
 type IssueFixResponseParserState = "reasoning" | "updatedFile" | "additionalInfo";
 
@@ -55,6 +54,7 @@ export class AnalysisIssueFix extends BaseNode {
       ...state,
       // since we are using a reducer, allResponses has to be reset
       outputAllResponses: [],
+      outputHints: [],
       inputFileUri: undefined,
       inputFileContent: undefined,
       inputIncidents: [],
@@ -137,9 +137,8 @@ export class AnalysisIssueFix extends BaseNode {
         },
       ];
       nextState.outputUpdatedFile = undefined;
-      nextState.outputUpdatedFileUri = undefined;
       nextState.outputAdditionalInfo = undefined;
-      nextState.outputHints = undefined;
+      nextState.outputHints = [];
     }
     // if this was the last file we worked on, accumulate additional infromation
     if (state.currentIdx === state.inputIncidentsByUris.length) {
@@ -149,15 +148,13 @@ export class AnalysisIssueFix extends BaseNode {
             reasoning: `${acc.reasoning}\n${val.outputReasoning}`,
             additionalInfo: `${acc.additionalInfo}\n${val.outputAdditionalInfo}`,
             uris: acc.uris.concat([relative(this.workspaceDir, val.outputUpdatedFileUri!)]),
-            hints: acc.hints.concat(val.outputHints || []),
           };
         },
         {
           reasoning: "",
           additionalInfo: "",
           uris: [],
-          hints: [],
-        } as { reasoning: string; additionalInfo: string; uris: string[]; hints: number[] },
+        } as { reasoning: string; additionalInfo: string; uris: string[] },
       );
       nextState.inputAllAdditionalInfo = accumulated.additionalInfo;
       nextState.inputAllReasoning = accumulated.reasoning;
@@ -170,13 +167,13 @@ export class AnalysisIssueFix extends BaseNode {
   async fixAnalysisIssue(
     state: typeof AnalysisIssueFixInputState.State,
   ): Promise<typeof AnalysisIssueFixOutputState.State> {
-    if (!state.inputFileUri || !state.inputFileContent || !state.inputIncidents) {
+    if (!state.inputFileUri || !state.inputFileContent || state.inputIncidents.length === 0) {
       return {
         outputUpdatedFile: undefined,
         outputAdditionalInfo: undefined,
         outputReasoning: undefined,
         outputUpdatedFileUri: state.inputFileUri,
-        outputHints: undefined,
+        outputHints: [],
       };
     }
 
@@ -216,7 +213,6 @@ export class AnalysisIssueFix extends BaseNode {
       new HumanMessage(`I will give you a file for which I want to take one step towards migrating ${state.migrationHint}.
 I will provide you with static source code analysis information highlighting an issue which needs to be addressed.
 Fix all the issues described. Other problems will be solved in subsequent steps so it is unnecessary to handle them now.
-Some issues may include hints to guide you towards the best solution approach.
 Before attempting to migrate the code from ${state.migrationHint}, reason through what changes are required and why.
 
 Pay attention to changes you make and impacts to external dependencies in the pom.xml as well as changes to imports we need to consider.
@@ -254,7 +250,6 @@ Write the step by step reasoning in this markdown section. If you are unsure of
 ## Additional Information (optional)
 
 If you have any additional details or steps that need to be performed, put it here. Do not summarize any of the changes you already made in this section. Only mention any additional changes needed.`);
-    console.log(humanMessage.content);
 
     const response = await this.streamOrInvoke([sysMessage, humanMessage], {
       emitResponseChunks: true,
@@ -267,7 +262,7 @@ If you have any additional details or steps that need to be performed, put it he
         outputUpdatedFile: undefined,
         outputReasoning: undefined,
         outputUpdatedFileUri: state.inputFileUri,
-        outputHints: undefined,
+        outputHints: [],
       };
     }
 

agentic/src/workflows/interactiveWorkflow.ts

@@ -266,7 +266,7 @@ export class KaiInteractiveWorkflow
       });
 
     // if there is any additional information spit by analysis workflow, capture that
-    const additionalInformation: string = analysisFixOutputState.summarizedAdditionalInfo || "";
+    const additionalInformation: string = analysisFixOutputState.summarizedAdditionalInfo;
     if (
       !input.enableAdditionalInformation ||
       additionalInformation.length < 1 ||
@@ -312,7 +312,7 @@ export class KaiInteractiveWorkflow
       migrationHint: input.migrationHint,
       programmingLanguage: input.programmingLanguage,
       plannerInputAgents: ["generalFix", "javaDependency"],
-      plannerInputBackground: analysisFixOutputState.summarizedHistory || "",
+      plannerInputBackground: analysisFixOutputState.summarizedHistory,
       enableDiagnosticsFixes: input.enableDiagnostics ?? false,
       // internal fields
       inputDiagnosticsTasks: undefined,
@@ -377,8 +377,7 @@ export class KaiInteractiveWorkflow
     });
 
     // if these attributes are available, router meant to solve the analysis issue
-    if (state.inputFileContent && state.inputFileUri && state.inputIncidents) {
-      console.log(`[DEBUG] Going to fix_analysis_issue`);
+    if (state.inputFileContent && state.inputFileUri && state.inputIncidents.length > 0) {
       return "fix_analysis_issue";
     }
 
@@ -392,7 +391,7 @@ export class KaiInteractiveWorkflow
     // this will make router pick up the next incident in list
     if (
       state.currentIdx < state.inputIncidentsByUris.length &&
-      (!state.inputFileContent || !state.inputFileUri || !state.inputIncidents)
+      (!state.inputFileContent || !state.inputFileUri || state.inputIncidents.length === 0)
     ) {
       console.log(`[DEBUG] Going back to fix_analysis_issue_router for next incident`);
       return "fix_analysis_issue_router";
@@ -415,8 +414,6 @@ export class KaiInteractiveWorkflow
         return "fix_analysis_issue_router";
       }
     }
-
-    console.log(`[DEBUG] All processing complete, going to END`);
     return END;
   }