@harness-engineering/orchestrator 0.8.0 → 0.8.2

package/dist/index.js

@@ -2887,6 +2887,21 @@ var path21 = __toESM(require("path"));
 var import_node_crypto16 = require("crypto");
 var import_core14 = require("@harness-engineering/core");
 
+// src/core/stall-detector.ts
+function detectStalledIssues(running, nowMs, stallTimeoutMs) {
+  if (stallTimeoutMs <= 0) return [];
+  const stalled = [];
+  for (const [runId, entry] of running) {
+    const reference = entry.session?.lastTimestamp ?? entry.startedAt;
+    if (!reference) continue;
+    const silentMs = nowMs - new Date(reference).getTime();
+    if (silentMs >= stallTimeoutMs) {
+      stalled.push(runId);
+    }
+  }
+  return stalled;
+}
+
 // src/intelligence/pipeline-runner.ts
 var path9 = __toESM(require("path"));
 var import_intelligence = require("@harness-engineering/intelligence");
@@ -4731,7 +4746,7 @@ var OpenAIBackend = class {
 };
 
 // src/agent/backends/gemini.ts
-var import_generative_ai = require("@google/generative-ai");
+var import_genai = require("@google/genai");
 var import_types13 = require("@harness-engineering/types");
 var import_core6 = require("@harness-engineering/core");
 var GeminiBackend = class {
@@ -4769,16 +4784,21 @@ var GeminiBackend = class {
     let cacheCreationTokens = 0;
     let cacheReadTokens = 0;
     try {
-      const genAI = new import_generative_ai.GoogleGenerativeAI(this.config.apiKey);
-      const model = genAI.getGenerativeModel({
+      const genAI = new import_genai.GoogleGenAI({ apiKey: this.config.apiKey });
+      const response = await genAI.models.generateContentStream({
         model: this.config.model,
+        contents: params.prompt,
         ...geminiSession.systemPrompt !== void 0 && {
-          systemInstruction: geminiSession.systemPrompt
+          config: { systemInstruction: geminiSession.systemPrompt }
         }
       });
-      const result = await model.generateContentStream(params.prompt);
-      for await (const chunk of result.stream) {
-        const text = chunk.text();
+      for await (const chunk of response) {
+        let text;
+        try {
+          text = chunk.text;
+        } catch {
+          text = void 0;
+        }
         if (text) {
           const event = {
             type: "text",
@@ -4808,7 +4828,13 @@ var GeminiBackend = class {
       return {
         success: false,
         sessionId: session.sessionId,
-        usage: { inputTokens: 0, outputTokens: 0, totalTokens: 0 },
+        usage: {
+          inputTokens,
+          outputTokens,
+          totalTokens,
+          cacheCreationTokens,
+          cacheReadTokens
+        },
         error: errorMessage
       };
     }
@@ -4835,9 +4861,14 @@ var GeminiBackend = class {
     return (0, import_types13.Ok)(void 0);
   }
   async healthCheck() {
+    if (!this.config.apiKey) {
+      return (0, import_types13.Err)({
+        category: "agent_not_found",
+        message: "GEMINI_API_KEY is not set"
+      });
+    }
     try {
-      const genAI = new import_generative_ai.GoogleGenerativeAI(this.config.apiKey);
-      genAI.getGenerativeModel({ model: this.config.model });
+      new import_genai.GoogleGenAI({ apiKey: this.config.apiKey });
       return (0, import_types13.Ok)(void 0);
     } catch (err) {
       return (0, import_types13.Err)({
@@ -6941,7 +6972,7 @@ var ChatRequestSchema = import_zod6.z.object({
 });
 function handleChatProxyRoute(req, res, command = "claude") {
   const { method, url } = req;
-  if (method === "POST" && url === "/api/chat") {
+  if (method === "POST" && (url === "/api/chat" || url === "/api/chat-proxy")) {
     void handleChatRequest(req, res, command);
     return true;
   }
@@ -9300,7 +9331,7 @@ function requiredScopeForRoute(method, path24) {
   if (path24.startsWith("/api/maintenance")) return "trigger-job";
   if (path24.startsWith("/api/streams")) return "read-status";
   if (path24.startsWith("/api/sessions")) return "read-status";
-  if (path24.startsWith("/api/chat-proxy")) return "trigger-job";
+  if (path24 === "/api/chat" || path24.startsWith("/api/chat-proxy")) return "trigger-job";
   return null;
 }
 
@@ -13011,32 +13042,27 @@ ${messages}`);
       await this.handleEffect(effect);
     }
     const stallTimeoutMs = this.config.agent.stallTimeoutMs;
-    if (stallTimeoutMs > 0) {
-      const stalledIds = [];
-      for (const [runId, runEntry] of this.state.running) {
-        const lastTs = runEntry.session?.lastTimestamp;
-        if (!lastTs) continue;
-        const silentMs = nowMs - new Date(lastTs).getTime();
-        if (silentMs >= stallTimeoutMs) {
-          stalledIds.push(runId);
-        }
-      }
-      for (const runId of stalledIds) {
-        const runEntry = this.state.running.get(runId);
-        if (!runEntry) continue;
-        this.logger.warn(
-          `Agent stalled for ${runEntry.identifier}: ${Math.round((nowMs - new Date(runEntry.session?.lastTimestamp ?? 0).getTime()) / 1e3)}s since last event`,
-          { issueId: runId }
-        );
-        const stallEvent = {
-          type: "stall_detected",
+    const stalledIds = detectStalledIssues(this.state.running, nowMs, stallTimeoutMs);
+    for (const runId of stalledIds) {
+      const runEntry = this.state.running.get(runId);
+      if (!runEntry) continue;
+      const reference = runEntry.session?.lastTimestamp ?? runEntry.startedAt;
+      const silentSec = Math.round((nowMs - new Date(reference).getTime()) / 1e3);
+      const sinceWhat = runEntry.session?.lastTimestamp ? "last event" : "dispatch";
+      this.logger.warn(
+        `Agent stalled for ${runEntry.identifier}: ${silentSec}s since ${sinceWhat}`,
+        {
           issueId: runId
-        };
-        const stallResult = applyEvent(this.state, stallEvent, this.config);
-        this.state = stallResult.nextState;
-        for (const eff of stallResult.effects) {
-          await this.handleEffect(eff);
         }
+      );
+      const stallEvent = {
+        type: "stall_detected",
+        issueId: runId
+      };
+      const stallResult = applyEvent(this.state, stallEvent, this.config);
+      this.state = stallResult.nextState;
+      for (const eff of stallResult.effects) {
+        await this.handleEffect(eff);
       }
     }
     const openPrNumbers = [];

package/dist/index.mjs

@@ -2778,6 +2778,21 @@ import * as path21 from "path";
 import { randomUUID as randomUUID5 } from "crypto";
 import { writeTaint } from "@harness-engineering/core";
 
+// src/core/stall-detector.ts
+function detectStalledIssues(running, nowMs, stallTimeoutMs) {
+  if (stallTimeoutMs <= 0) return [];
+  const stalled = [];
+  for (const [runId, entry] of running) {
+    const reference = entry.session?.lastTimestamp ?? entry.startedAt;
+    if (!reference) continue;
+    const silentMs = nowMs - new Date(reference).getTime();
+    if (silentMs >= stallTimeoutMs) {
+      stalled.push(runId);
+    }
+  }
+  return stalled;
+}
+
 // src/intelligence/pipeline-runner.ts
 import * as path9 from "path";
 import { weightedRecommendPersona, refreshProfiles } from "@harness-engineering/intelligence";
@@ -4638,7 +4653,7 @@ var OpenAIBackend = class {
 };
 
 // src/agent/backends/gemini.ts
-import { GoogleGenerativeAI } from "@google/generative-ai";
+import { GoogleGenAI } from "@google/genai";
 import {
   Ok as Ok13,
   Err as Err10
@@ -4679,16 +4694,21 @@ var GeminiBackend = class {
     let cacheCreationTokens = 0;
     let cacheReadTokens = 0;
     try {
-      const genAI = new GoogleGenerativeAI(this.config.apiKey);
-      const model = genAI.getGenerativeModel({
+      const genAI = new GoogleGenAI({ apiKey: this.config.apiKey });
+      const response = await genAI.models.generateContentStream({
         model: this.config.model,
+        contents: params.prompt,
         ...geminiSession.systemPrompt !== void 0 && {
-          systemInstruction: geminiSession.systemPrompt
+          config: { systemInstruction: geminiSession.systemPrompt }
         }
       });
-      const result = await model.generateContentStream(params.prompt);
-      for await (const chunk of result.stream) {
-        const text = chunk.text();
+      for await (const chunk of response) {
+        let text;
+        try {
+          text = chunk.text;
+        } catch {
+          text = void 0;
+        }
         if (text) {
           const event = {
             type: "text",
@@ -4718,7 +4738,13 @@ var GeminiBackend = class {
       return {
         success: false,
         sessionId: session.sessionId,
-        usage: { inputTokens: 0, outputTokens: 0, totalTokens: 0 },
+        usage: {
+          inputTokens,
+          outputTokens,
+          totalTokens,
+          cacheCreationTokens,
+          cacheReadTokens
+        },
         error: errorMessage
       };
     }
@@ -4745,9 +4771,14 @@ var GeminiBackend = class {
     return Ok13(void 0);
   }
   async healthCheck() {
+    if (!this.config.apiKey) {
+      return Err10({
+        category: "agent_not_found",
+        message: "GEMINI_API_KEY is not set"
+      });
+    }
     try {
-      const genAI = new GoogleGenerativeAI(this.config.apiKey);
-      genAI.getGenerativeModel({ model: this.config.model });
+      new GoogleGenAI({ apiKey: this.config.apiKey });
       return Ok13(void 0);
     } catch (err) {
       return Err10({
@@ -6874,7 +6905,7 @@ var ChatRequestSchema = z6.object({
 });
 function handleChatProxyRoute(req, res, command = "claude") {
   const { method, url } = req;
-  if (method === "POST" && url === "/api/chat") {
+  if (method === "POST" && (url === "/api/chat" || url === "/api/chat-proxy")) {
     void handleChatRequest(req, res, command);
     return true;
   }
@@ -9263,7 +9294,7 @@ function requiredScopeForRoute(method, path24) {
   if (path24.startsWith("/api/maintenance")) return "trigger-job";
   if (path24.startsWith("/api/streams")) return "read-status";
   if (path24.startsWith("/api/sessions")) return "read-status";
-  if (path24.startsWith("/api/chat-proxy")) return "trigger-job";
+  if (path24 === "/api/chat" || path24.startsWith("/api/chat-proxy")) return "trigger-job";
   return null;
 }
 
@@ -12982,32 +13013,27 @@ ${messages}`);
       await this.handleEffect(effect);
     }
     const stallTimeoutMs = this.config.agent.stallTimeoutMs;
-    if (stallTimeoutMs > 0) {
-      const stalledIds = [];
-      for (const [runId, runEntry] of this.state.running) {
-        const lastTs = runEntry.session?.lastTimestamp;
-        if (!lastTs) continue;
-        const silentMs = nowMs - new Date(lastTs).getTime();
-        if (silentMs >= stallTimeoutMs) {
-          stalledIds.push(runId);
-        }
-      }
-      for (const runId of stalledIds) {
-        const runEntry = this.state.running.get(runId);
-        if (!runEntry) continue;
-        this.logger.warn(
-          `Agent stalled for ${runEntry.identifier}: ${Math.round((nowMs - new Date(runEntry.session?.lastTimestamp ?? 0).getTime()) / 1e3)}s since last event`,
-          { issueId: runId }
-        );
-        const stallEvent = {
-          type: "stall_detected",
+    const stalledIds = detectStalledIssues(this.state.running, nowMs, stallTimeoutMs);
+    for (const runId of stalledIds) {
+      const runEntry = this.state.running.get(runId);
+      if (!runEntry) continue;
+      const reference = runEntry.session?.lastTimestamp ?? runEntry.startedAt;
+      const silentSec = Math.round((nowMs - new Date(reference).getTime()) / 1e3);
+      const sinceWhat = runEntry.session?.lastTimestamp ? "last event" : "dispatch";
+      this.logger.warn(
+        `Agent stalled for ${runEntry.identifier}: ${silentSec}s since ${sinceWhat}`,
+        {
           issueId: runId
-        };
-        const stallResult = applyEvent(this.state, stallEvent, this.config);
-        this.state = stallResult.nextState;
-        for (const eff of stallResult.effects) {
-          await this.handleEffect(eff);
         }
+      );
+      const stallEvent = {
+        type: "stall_detected",
+        issueId: runId
+      };
+      const stallResult = applyEvent(this.state, stallEvent, this.config);
+      this.state = stallResult.nextState;
+      for (const eff of stallResult.effects) {
+        await this.handleEffect(eff);
       }
     }
     const openPrNumbers = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harness-engineering/orchestrator",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "description": "Orchestrator daemon for dispatching coding agents to issues",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -38,7 +38,7 @@
   "dependencies": {
     "@anthropic-ai/sdk": "^0.95.1",
     "@earendil-works/pi-coding-agent": "^0.74.1",
-    "@google/generative-ai": "^0.24.0",
+    "@google/genai": "^2.0.4",
     "bcryptjs": "^2.4.3",
     "better-sqlite3": "^12.10.0",
     "ink": "^4.4.1",
@@ -48,10 +48,10 @@
     "ws": "^8.21.0",
     "yaml": "^2.8.3",
     "zod": "^3.25.76",
-    "@harness-engineering/core": "0.28.2",
-    "@harness-engineering/intelligence": "0.2.6",
-    "@harness-engineering/types": "0.15.0",
-    "@harness-engineering/graph": "0.10.0"
+    "@harness-engineering/core": "0.30.0",
+    "@harness-engineering/graph": "0.11.0",
+    "@harness-engineering/intelligence": "0.3.0",
+    "@harness-engineering/types": "0.16.0"
   },
   "devDependencies": {
     "@asteasolutions/zod-to-openapi": "^7.3.0",