@opensearch-project/agent-health 0.1.1 → 0.2.0

package/lib/dist/index.js

@@ -1344,7 +1344,39 @@ var ClaudeCodeConnector = class extends SubprocessConnector {
     this.isInThinking = false;
   }
   /**
-   * Override execute to reset state
+   * Build CLI args from ClaudeCodeConnectorConfig
+   */
+  buildConfigArgs(config) {
+    const args = [];
+    if (config.dangerouslySkipPermissions) {
+      args.push("--dangerously-skip-permissions");
+    }
+    if (config.systemPrompt) {
+      args.push("--system-prompt", config.systemPrompt);
+    } else if (config.appendSystemPrompt) {
+      args.push("--append-system-prompt", config.appendSystemPrompt);
+    }
+    if (config.allowedTools?.length) {
+      args.push("--allowed-tools", ...config.allowedTools);
+    }
+    if (config.disallowedTools?.length) {
+      args.push("--disallowed-tools", ...config.disallowedTools);
+    }
+    if (config.mcpConfigPath) {
+      args.push("--mcp-config", config.mcpConfigPath);
+    } else if (config.mcpServers && Object.keys(config.mcpServers).length > 0) {
+      args.push("--mcp-config", JSON.stringify({ mcpServers: config.mcpServers }));
+    }
+    if (config.strictMcpConfig) {
+      args.push("--strict-mcp-config");
+    }
+    if (config.additionalArgs) {
+      args.push(...config.additionalArgs);
+    }
+    return args;
+  }
+  /**
+   * Override execute to reset state and apply connectorConfig
    */
   async execute(endpoint, request, auth, onProgress, onRawEvent) {
     this.debug("========== execute() STARTED ==========");
@@ -1352,11 +1384,55 @@ var ClaudeCodeConnector = class extends SubprocessConnector {
     this.debug("Test case:", request.testCase.name);
     this.debug("Config:", this["config"]);
     this.resetState();
-    this.debug("State reset, calling super.execute()...");
-    const result = await super.execute(endpoint, request, auth, onProgress, onRawEvent);
-    this.debug("super.execute() returned with", result.trajectory.length, "steps");
-    this.debug("========== execute() COMPLETED ==========");
-    return result;
+    const originalEnv = this.config.env ? structuredClone(this.config.env) : {};
+    const originalArgs = this.config.args ? [...this.config.args] : [];
+    const originalInputMode = this.config.inputMode;
+    const originalTimeout = this.config.timeout;
+    const originalWorkingDir = this.config.workingDir;
+    const ccConfig = request.connectorConfig;
+    if (ccConfig) {
+      this.debug("Applying connectorConfig:", Object.keys(ccConfig));
+      if (ccConfig.env) {
+        this.config.env = { ...this.config.env, ...ccConfig.env };
+      }
+      if (ccConfig.usePromptArg) {
+        this.config.inputMode = "arg";
+      }
+      if (ccConfig.timeout !== void 0) {
+        this.config.timeout = ccConfig.timeout;
+      }
+      if (ccConfig.workingDir) {
+        this.config.workingDir = ccConfig.workingDir;
+      }
+    }
+    if (this.config.env?.CLAUDE_CODE_USE_BEDROCK === "1") {
+      this.config.env = { ...this.config.env, ANTHROPIC_API_KEY: "" };
+      this.debug("Bedrock mode: cleared ANTHROPIC_API_KEY to bypass credit check");
+    }
+    if (request.modelId) {
+      this.config.args = [...this.config.args || [], "--model", request.modelId];
+      this.debug("Model flag added:", request.modelId);
+    }
+    if (ccConfig) {
+      const configArgs = this.buildConfigArgs(ccConfig);
+      if (configArgs.length > 0) {
+        this.config.args = [...this.config.args || [], ...configArgs];
+        this.debug("Config args added:", configArgs);
+      }
+    }
+    try {
+      this.debug("State reset, calling super.execute()...");
+      const result = await super.execute(endpoint, request, auth, onProgress, onRawEvent);
+      this.debug("super.execute() returned with", result.trajectory.length, "steps");
+      this.debug("========== execute() COMPLETED ==========");
+      return result;
+    } finally {
+      this.config.env = originalEnv;
+      this.config.args = originalArgs;
+      this.config.inputMode = originalInputMode;
+      this.config.timeout = originalTimeout;
+      this.config.workingDir = originalWorkingDir;
+    }
   }
   /**
    * Health check - verify claude command exists

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensearch-project/agent-health",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "type": "module",
   "description": "Agent Evaluation and Observability Framework",
   "license": "Apache-2.0",
@@ -70,8 +70,9 @@
   },
   "dependencies": {
     "@ag-ui/core": "^0.0.41",
-    "@aws-sdk/client-bedrock-runtime": "^3.936.0",
-    "@aws-sdk/credential-providers": "^3.936.0",
+    "@aws-sdk/client-bedrock": "^3.1000.0",
+    "@aws-sdk/client-bedrock-runtime": "^3.1000.0",
+    "@aws-sdk/credential-providers": "^3.1000.0",
     "@opensearch-project/opensearch": "^3.5.1",
     "@opentelemetry/semantic-conventions": "^1.38.0",
     "@radix-ui/react-alert-dialog": "^1.1.15",
@@ -154,6 +155,7 @@
     "vite": "^7.3.1"
   },
   "overrides": {
-    "minimatch": "^10.2.1"
+    "minimatch": "^10.2.4",
+    "fast-xml-parser": "5.5.10"
   }
 }