@calltelemetry/openclaw-linear 0.5.1 → 0.6.0

package/src/{gemini-tool.ts → tools/gemini-tool.ts}

@@ -1,7 +1,7 @@
 import { spawn } from "node:child_process";
 import { createInterface } from "node:readline";
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
-import type { ActivityContent } from "./linear-api.js";
+import type { ActivityContent } from "../api/linear-api.js";
 import {
   buildLinearApi,
   resolveSession,
@@ -11,6 +11,7 @@ import {
   type CliToolParams,
   type CliResult,
 } from "./cli-shared.js";
+import { InactivityWatchdog, resolveWatchdogConfig } from "../agent/watchdog.js";
 
 const GEMINI_BIN = "/home/claw/.npm-global/bin/gemini";
 
@@ -98,7 +99,9 @@ export async function runGemini(
 
   api.logger.info(`gemini_run: session=${agentSessionId ?? "none"}, issue=${issueIdentifier ?? "none"}`);
 
-  const timeout = timeoutMs ?? (pluginConfig?.geminiTimeoutMs as number) ?? DEFAULT_TIMEOUT_MS;
+  const agentId = (params as any).agentId ?? (pluginConfig?.defaultAgentId as string) ?? "default";
+  const wdConfig = resolveWatchdogConfig(agentId, pluginConfig ?? undefined);
+  const timeout = timeoutMs ?? (pluginConfig?.geminiTimeoutMs as number) ?? wdConfig.toolTimeoutMs;
   const workingDir = params.workingDir ?? (pluginConfig?.geminiBaseRepo as string) ?? DEFAULT_BASE_REPO;
 
   const linearApi = buildLinearApi(api, agentSessionId);
@@ -131,12 +134,27 @@ export async function runGemini(
     });
 
     let killed = false;
+    let killedByWatchdog = false;
     const timer = setTimeout(() => {
       killed = true;
       child.kill("SIGTERM");
       setTimeout(() => { if (!child.killed) child.kill("SIGKILL"); }, 5_000);
     }, timeout);
 
+    const watchdog = new InactivityWatchdog({
+      inactivityMs: wdConfig.inactivityMs,
+      label: `gemini:${agentSessionId ?? "unknown"}`,
+      logger: api.logger,
+      onKill: () => {
+        killedByWatchdog = true;
+        killed = true;
+        clearTimeout(timer);
+        child.kill("SIGTERM");
+        setTimeout(() => { if (!child.killed) child.kill("SIGKILL"); }, 5_000);
+      },
+    });
+    watchdog.start();
+
     const collectedMessages: string[] = [];
     const collectedCommands: string[] = [];
     let stderrOutput = "";
@@ -144,6 +162,7 @@ export async function runGemini(
     const rl = createInterface({ input: child.stdout! });
     rl.on("line", (line) => {
       if (!line.trim()) return;
+      watchdog.tick();
 
       let event: any;
       try {
@@ -187,11 +206,13 @@ export async function runGemini(
     });
 
     child.stderr?.on("data", (chunk) => {
+      watchdog.tick();
       stderrOutput += chunk.toString();
     });
 
     child.on("close", (code) => {
       clearTimeout(timer);
+      watchdog.stop();
       rl.close();
 
       const parts: string[] = [];
@@ -200,11 +221,15 @@ export async function runGemini(
       const output = parts.join("\n\n") || stderrOutput || "(no output)";
 
       if (killed) {
-        api.logger.warn(`Gemini timed out after ${timeout}ms`);
+        const errorType = killedByWatchdog ? "inactivity_timeout" : "timeout";
+        const reason = killedByWatchdog
+          ? `Gemini killed by inactivity watchdog (no I/O for ${Math.round(wdConfig.inactivityMs / 1000)}s)`
+          : `Gemini timed out after ${Math.round(timeout / 1000)}s`;
+        api.logger.warn(reason);
         resolve({
           success: false,
-          output: `Gemini timed out after ${Math.round(timeout / 1000)}s. Partial output:\n${output}`,
-          error: "timeout",
+          output: `${reason}. Partial output:\n${output}`,
+          error: errorType,
         });
         return;
       }
@@ -225,6 +250,7 @@ export async function runGemini(
 
     child.on("error", (err) => {
       clearTimeout(timer);
+      watchdog.stop();
       rl.close();
       api.logger.error(`Gemini spawn error: ${err}`);
       resolve({

package/src/{orchestration-tools.ts → tools/orchestration-tools.ts}

@@ -1,6 +1,6 @@
 import type { AnyAgentTool, OpenClawPluginApi } from "openclaw/plugin-sdk";
 import { jsonResult } from "openclaw/plugin-sdk";
-import { runAgent } from "./agent.js";
+import { runAgent } from "../agent/agent.js";
 
 /**
  * Create orchestration tools that let agents delegate work to other crew agents.

package/src/client.ts

@@ -1,94 +0,0 @@
-const LINEAR_GRAPHQL_URL = "https://api.linear.app/graphql";
-
-export class LinearClient {
-  constructor(private accessToken: string) {}
-
-  async request<T = any>(query: string, variables?: Record<string, any>): Promise<T> {
-    const res = await fetch(LINEAR_GRAPHQL_URL, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "Authorization": `Bearer ${this.accessToken}`,
-      },
-      body: JSON.stringify({ query, variables }),
-    });
-
-    if (!res.ok) {
-      const text = await res.text();
-      throw new Error(`Linear API request failed: ${res.status} ${text}`);
-    }
-
-    const payload = await res.json();
-    if (payload.errors) {
-      throw new Error(`Linear API returned errors: ${JSON.stringify(payload.errors)}`);
-    }
-
-    return payload.data as T;
-  }
-
-  async getViewer() {
-    const query = `
-      query {
-        viewer {
-          id
-          name
-          email
-        }
-      }
-    `;
-    return this.request(query);
-  }
-
-  async listIssues(params: { limit: number; teamId?: string }) {
-    const query = `
-      query ListIssues($limit: Int, $teamId: String) {
-        issues(first: $limit, filter: { team: { id: { eq: $teamId } } }) {
-          nodes {
-            id
-            identifier
-            title
-            description
-            state {
-              name
-            }
-            assignee {
-              name
-            }
-          }
-        }
-      }
-    `;
-    return this.request(query, params);
-  }
-
-  async createIssue(params: { title: string; description?: string; teamId: string }) {
-    const query = `
-      mutation CreateIssue($title: String!, $description: String, $teamId: String!) {
-        issueCreate(input: { title: $title, description: $description, teamId: $teamId }) {
-          success
-          issue {
-            id
-            identifier
-            title
-          }
-        }
-      }
-    `;
-    return this.request(query, params);
-  }
-
-  async addComment(params: { issueId: string; body: string }) {
-    const query = `
-      mutation AddComment($issueId: String!, $body: String!) {
-        commentCreate(input: { issueId: $issueId, body: $body }) {
-          success
-          comment {
-            id
-          }
-        }
-      }
-    `;
-    return this.request(query, params);
-  }
-
-}