@calltelemetry/openclaw-linear 0.5.1 → 0.6.0

package/src/{pipeline.ts → pipeline/pipeline.ts}

@@ -16,8 +16,8 @@ import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { parse as parseYaml } from "yaml";
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
-import type { LinearAgentApi, ActivityContent } from "./linear-api.js";
-import { runAgent } from "./agent.js";
+import type { LinearAgentApi, ActivityContent } from "../api/linear-api.js";
+import { runAgent } from "../agent/agent.js";
 import { setActiveSession, clearActiveSession } from "./active-session.js";
 import {
   type Tier,
@@ -33,7 +33,18 @@ import {
   readDispatchState,
   getActiveDispatch,
 } from "./dispatch-state.js";
-import { type NotifyFn } from "./notify.js";
+import { type NotifyFn } from "../infra/notify.js";
+import {
+  saveWorkerOutput,
+  saveAuditVerdict,
+  appendLog,
+  updateManifest,
+  writeSummary,
+  buildSummaryFromArtifacts,
+  writeDispatchMemory,
+  resolveOrchestratorWorkspace,
+} from "./artifacts.js";
+import { resolveWatchdogConfig } from "../agent/watchdog.js";
 
 // ---------------------------------------------------------------------------
 // Prompt loading
@@ -76,7 +87,7 @@ export function loadPrompts(pluginConfig?: Record<string, unknown>): PromptTempl
       raw = readFileSync(resolved, "utf-8");
     } else {
       // Load from plugin directory (sidecar file)
-      const pluginRoot = join(dirname(fileURLToPath(import.meta.url)), "..");
+      const pluginRoot = join(dirname(fileURLToPath(import.meta.url)), "../..");
       raw = readFileSync(join(pluginRoot, "prompts.yaml"), "utf-8");
     }
 
@@ -264,6 +275,9 @@ export async function triggerAudit(
 
   api.logger.info(`${TAG} worker completed, triggering audit (attempt ${dispatch.attempt})`);
 
+  // Update .claw/ manifest
+  try { updateManifest(dispatch.worktreePath, { status: "auditing", attempts: dispatch.attempt }); } catch {}
+
   // Fetch fresh issue details for audit context
   const issueDetails = await linearApi.getIssueDetails(dispatch.issueId).catch(() => null);
   const issue: IssueContext = {
@@ -313,7 +327,9 @@ export async function triggerAudit(
     agentId: (pluginConfig?.defaultAgentId as string) ?? "default",
     sessionId: auditSessionId,
     message: `${auditPrompt.system}\n\n${auditPrompt.task}`,
-    timeoutMs: 5 * 60_000,
+    streaming: dispatch.agentSessionId
+      ? { linearApi, agentSessionId: dispatch.agentSessionId }
+      : undefined,
   });
 
   // runAgent returns inline (embedded runner) — process verdict directly.
@@ -371,6 +387,15 @@ export async function processVerdict(
     }
   }
 
+  // Log audit interaction to .claw/
+  try {
+    appendLog(dispatch.worktreePath, {
+      ts: new Date().toISOString(), phase: "audit", attempt: dispatch.attempt,
+      agent: "auditor", prompt: "(audit task)",
+      outputPreview: auditOutput.slice(0, 500), success: event.success,
+    });
+  } catch {}
+
   // Parse verdict
   const verdict = parseVerdict(auditOutput);
   if (!verdict) {
@@ -406,9 +431,13 @@ async function handleAuditPass(
   dispatch: ActiveDispatch,
   verdict: AuditVerdict,
 ): Promise<void> {
-  const { api, linearApi, notify, configPath } = hookCtx;
+  const { api, linearApi, notify, pluginConfig, configPath } = hookCtx;
   const TAG = `[${dispatch.issueIdentifier}]`;
 
+  // Save audit verdict to .claw/
+  try { saveAuditVerdict(dispatch.worktreePath, dispatch.attempt, verdict); } catch {}
+  try { updateManifest(dispatch.worktreePath, { status: "done", attempts: dispatch.attempt + 1 }); } catch {}
+
   // CAS transition: auditing → done
   try {
     await transitionDispatch(dispatch.issueIdentifier, "auditing", "done", undefined, configPath);
@@ -428,11 +457,26 @@ async function handleAuditPass(
     project: dispatch.project,
   }, configPath);
 
-  // Post approval comment
+  // Build summary from .claw/ artifacts and write to memory
+  let summary: string | null = null;
+  try {
+    summary = buildSummaryFromArtifacts(dispatch.worktreePath);
+    if (summary) {
+      writeSummary(dispatch.worktreePath, summary);
+      const wsDir = resolveOrchestratorWorkspace(api, pluginConfig);
+      writeDispatchMemory(dispatch.issueIdentifier, summary, wsDir);
+      api.logger.info(`${TAG} .claw/ summary and memory written`);
+    }
+  } catch (err) {
+    api.logger.warn(`${TAG} failed to write summary/memory: ${err}`);
+  }
+
+  // Post approval comment (with summary excerpt if available)
   const criteriaList = verdict.criteria.map((c) => `- ${c}`).join("\n");
+  const summaryExcerpt = summary ? `\n\n**Summary:**\n${summary.slice(0, 2000)}` : "";
   await linearApi.createComment(
     dispatch.issueId,
-    `## Audit Passed\n\n**Criteria verified:**\n${criteriaList}\n\n**Tests:** ${verdict.testResults || "N/A"}\n\n---\n*Attempt ${dispatch.attempt + 1} — audit passed.*`,
+    `## Audit Passed\n\n**Criteria verified:**\n${criteriaList}\n\n**Tests:** ${verdict.testResults || "N/A"}${summaryExcerpt}\n\n---\n*Attempt ${dispatch.attempt + 1} — audit passed. Artifacts: \`${dispatch.worktreePath}/.claw/\`*`,
   ).catch((err) => api.logger.error(`${TAG} failed to post audit pass comment: ${err}`));
 
   api.logger.info(`${TAG} audit PASSED — dispatch completed (attempt ${dispatch.attempt})`);
@@ -458,8 +502,13 @@ async function handleAuditFail(
   const maxAttempts = (pluginConfig?.maxReworkAttempts as number) ?? 2;
   const nextAttempt = dispatch.attempt + 1;
 
+  // Save audit verdict to .claw/ (both escalation and rework paths)
+  try { saveAuditVerdict(dispatch.worktreePath, dispatch.attempt, verdict); } catch {}
+
   if (nextAttempt > maxAttempts) {
     // Escalate — too many failures
+    try { updateManifest(dispatch.worktreePath, { status: "stuck", attempts: nextAttempt }); } catch {}
+
     try {
       await transitionDispatch(
         dispatch.issueIdentifier,
@@ -476,10 +525,20 @@ async function handleAuditFail(
       throw err;
     }
 
+    // Write summary + memory for stuck dispatches too
+    try {
+      const summary = buildSummaryFromArtifacts(dispatch.worktreePath);
+      if (summary) {
+        writeSummary(dispatch.worktreePath, summary);
+        const wsDir = resolveOrchestratorWorkspace(api, pluginConfig);
+        writeDispatchMemory(dispatch.issueIdentifier, summary, wsDir);
+      }
+    } catch {}
+
     const gapsList = verdict.gaps.map((g) => `- ${g}`).join("\n");
     await linearApi.createComment(
       dispatch.issueId,
-      `## Audit Failed — Escalating\n\n**Attempt ${nextAttempt} of ${maxAttempts + 1}**\n\n**Gaps:**\n${gapsList}\n\n**Tests:** ${verdict.testResults || "N/A"}\n\n---\n*Max rework attempts reached. Needs human review.*`,
+      `## Audit Failed — Escalating\n\n**Attempt ${nextAttempt} of ${maxAttempts + 1}**\n\n**Gaps:**\n${gapsList}\n\n**Tests:** ${verdict.testResults || "N/A"}\n\n---\n*Max rework attempts reached. Needs human review. Artifacts: \`${dispatch.worktreePath}/.claw/\`*`,
     ).catch((err) => api.logger.error(`${TAG} failed to post escalation comment: ${err}`));
 
     api.logger.warn(`${TAG} audit FAILED ${nextAttempt}x — escalating to human`);
@@ -608,14 +667,79 @@ export async function spawnWorker(
 
   api.logger.info(`${TAG} spawning worker agent session=${workerSessionId} (attempt ${dispatch.attempt})`);
 
+  const workerStartTime = Date.now();
   const result = await runAgent({
     api,
     agentId: (pluginConfig?.defaultAgentId as string) ?? "default",
     sessionId: workerSessionId,
     message: `${workerPrompt.system}\n\n${workerPrompt.task}`,
-    timeoutMs: (pluginConfig?.codexTimeoutMs as number) ?? 10 * 60_000,
+    streaming: dispatch.agentSessionId
+      ? { linearApi, agentSessionId: dispatch.agentSessionId }
+      : undefined,
   });
 
+  // Save worker output to .claw/
+  const workerElapsed = Date.now() - workerStartTime;
+  const agentId = (pluginConfig?.defaultAgentId as string) ?? "default";
+  try { saveWorkerOutput(dispatch.worktreePath, dispatch.attempt, result.output); } catch {}
+  try {
+    appendLog(dispatch.worktreePath, {
+      ts: new Date().toISOString(), phase: "worker", attempt: dispatch.attempt,
+      agent: agentId,
+      prompt: workerPrompt.task.slice(0, 200),
+      outputPreview: result.output.slice(0, 500),
+      success: result.success, durationMs: workerElapsed,
+    });
+  } catch {}
+
+  // Handle watchdog kill (runAgent already retried once — both attempts failed)
+  if (result.watchdogKilled) {
+    const wdConfig = resolveWatchdogConfig(agentId, pluginConfig ?? undefined);
+    const thresholdSec = Math.round(wdConfig.inactivityMs / 1000);
+
+    api.logger.warn(`${TAG} worker killed by inactivity watchdog 2x — escalating to stuck`);
+
+    try {
+      appendLog(dispatch.worktreePath, {
+        ts: new Date().toISOString(), phase: "watchdog", attempt: dispatch.attempt,
+        agent: agentId, prompt: "(watchdog kill)",
+        outputPreview: result.output.slice(0, 500), success: false,
+        durationMs: workerElapsed,
+        watchdog: { reason: "inactivity", silenceSec: thresholdSec, thresholdSec, retried: true },
+      });
+    } catch {}
+
+    try { updateManifest(dispatch.worktreePath, { status: "stuck", attempts: dispatch.attempt + 1 }); } catch {}
+
+    try {
+      await transitionDispatch(
+        dispatch.issueIdentifier, "working", "stuck",
+        { stuckReason: "watchdog_kill_2x" }, configPath,
+      );
+    } catch (err) {
+      if (err instanceof TransitionError) {
+        api.logger.warn(`${TAG} CAS failed for watchdog stuck transition: ${err.message}`);
+      }
+    }
+
+    await linearApi.createComment(
+      dispatch.issueId,
+      `## Watchdog Kill\n\nAgent killed by inactivity watchdog (no I/O for ${thresholdSec}s). ` +
+      `Automatic retry also failed.\n\n---\n*Needs human review. Artifacts: \`${dispatch.worktreePath}/.claw/\`*`,
+    ).catch(() => {});
+
+    await hookCtx.notify("watchdog_kill", {
+      identifier: dispatch.issueIdentifier,
+      title: issue.title,
+      status: "stuck",
+      attempt: dispatch.attempt,
+      reason: `no I/O for ${thresholdSec}s`,
+    });
+
+    clearActiveSession(dispatch.issueId);
+    return;
+  }
+
   // runAgent returns inline — trigger audit directly.
   // Re-read dispatch state since it may have changed during worker run.
   const freshState = await readDispatchState(configPath);

package/src/{tier-assess.ts → pipeline/tier-assess.ts}

@@ -75,7 +75,7 @@ export async function assessTier(
   const message = `${ASSESS_PROMPT}\n\n${issueText}`;
 
   try {
-    const { runAgent } = await import("./agent.js");
+    const { runAgent } = await import("../agent/agent.js");
     const result = await runAgent({
       api,
       agentId: agentId ?? resolveDefaultAgent(api),

package/src/{webhook.test.ts → pipeline/webhook.test.ts}

@@ -17,7 +17,7 @@ vi.mock("./pipeline.js", () => ({
 }));
 
 // Mock the linear-api module
-vi.mock("./linear-api.js", () => ({
+vi.mock("../api/linear-api.js", () => ({
   LinearAgentApi: class MockLinearAgentApi {
     emitActivity = vi.fn().mockResolvedValue(undefined);
     createComment = vi.fn().mockResolvedValue("comment-id");

package/src/{webhook.ts → pipeline/webhook.ts}

@@ -2,13 +2,14 @@ import type { IncomingMessage, ServerResponse } from "node:http";
 import { readFileSync } from "node:fs";
 import { join } from "node:path";
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
-import { LinearAgentApi, resolveLinearToken } from "./linear-api.js";
+import { LinearAgentApi, resolveLinearToken } from "../api/linear-api.js";
 import { spawnWorker, type HookContext } from "./pipeline.js";
 import { setActiveSession, clearActiveSession } from "./active-session.js";
 import { readDispatchState, getActiveDispatch, registerDispatch, updateDispatchStatus, completeDispatch, removeActiveDispatch } from "./dispatch-state.js";
-import { createDiscordNotifier, createNoopNotifier, type NotifyFn } from "./notify.js";
+import { createDiscordNotifier, createNoopNotifier, type NotifyFn } from "../infra/notify.js";
 import { assessTier } from "./tier-assess.js";
-import { createWorktree, prepareWorkspace } from "./codex-worktree.js";
+import { createWorktree, prepareWorkspace } from "../infra/codex-worktree.js";
+import { ensureClawDir, writeManifest } from "./artifacts.js";
 
 // ── Agent profiles (loaded from config, no hardcoded names) ───────
 interface AgentProfile {
@@ -244,7 +245,7 @@ export async function handleLinearWebhook(
 
         // 3. Run agent with streaming
         const sessionId = `linear-notif-${notification?.type ?? "unknown"}-${Date.now()}`;
-        const { runAgent } = await import("./agent.js");
+        const { runAgent } = await import("../agent/agent.js");
         const result = await runAgent({
           api,
           agentId,
@@ -417,7 +418,7 @@ export async function handleLinearWebhook(
 
         // Run agent with streaming to Linear
         const sessionId = `linear-session-${session.id}`;
-        const { runAgent } = await import("./agent.js");
+        const { runAgent } = await import("../agent/agent.js");
         const result = await runAgent({
           api,
           agentId,
@@ -595,7 +596,7 @@ export async function handleLinearWebhook(
         }).catch(() => {});
 
         const sessionId = `linear-session-${session.id}`;
-        const { runAgent } = await import("./agent.js");
+        const { runAgent } = await import("../agent/agent.js");
         const result = await runAgent({
           api,
           agentId,
@@ -797,7 +798,7 @@ export async function handleLinearWebhook(
 
         // 3. Run agent subprocess with streaming
         const sessionId = `linear-comment-${comment.id ?? Date.now()}`;
-        const { runAgent } = await import("./agent.js");
+        const { runAgent } = await import("../agent/agent.js");
         const result = await runAgent({
           api,
           agentId: mentionedAgent,
@@ -1035,7 +1036,7 @@ export async function handleLinearWebhook(
         ].filter(Boolean).join("\n");
 
         const sessionId = `linear-triage-${issue.id}-${Date.now()}`;
-        const { runAgent } = await import("./agent.js");
+        const { runAgent } = await import("../agent/agent.js");
         const result = await runAgent({
           api,
           agentId,
@@ -1250,11 +1251,32 @@ async function handleDispatch(
     api.logger.warn(`@dispatch: could not create agent session: ${err}`);
   }
 
+  // 6b. Initialize .claw/ artifact directory
+  try {
+    ensureClawDir(worktree.path);
+    writeManifest(worktree.path, {
+      issueIdentifier: identifier,
+      issueTitle: enrichedIssue.title ?? "(untitled)",
+      issueId: issue.id,
+      tier: assessment.tier,
+      model: assessment.model,
+      dispatchedAt: new Date().toISOString(),
+      worktreePath: worktree.path,
+      branch: worktree.branch,
+      attempts: 0,
+      status: "dispatched",
+      plugin: "openclaw-linear",
+    });
+  } catch (err) {
+    api.logger.warn(`@dispatch: .claw/ init failed: ${err}`);
+  }
+
   // 7. Register dispatch in persistent state
   const now = new Date().toISOString();
   await registerDispatch(identifier, {
     issueId: issue.id,
     issueIdentifier: identifier,
+    issueTitle: enrichedIssue.title ?? "(untitled)",
     worktreePath: worktree.path,
     branch: worktree.branch,
     tier: assessment.tier,

package/src/{claude-tool.ts → tools/claude-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 CLAUDE_BIN = "/home/claw/.npm-global/bin/claude";
 
@@ -116,7 +117,9 @@ export async function runClaude(
 
   api.logger.info(`claude_run: session=${agentSessionId ?? "none"}, issue=${issueIdentifier ?? "none"}`);
 
-  const timeout = timeoutMs ?? (pluginConfig?.claudeTimeoutMs 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?.claudeTimeoutMs as number) ?? wdConfig.toolTimeoutMs;
   const workingDir = params.workingDir ?? (pluginConfig?.claudeBaseRepo as string) ?? DEFAULT_BASE_REPO;
 
   const linearApi = buildLinearApi(api, agentSessionId);
@@ -155,12 +158,27 @@ export async function runClaude(
     });
 
     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: `claude:${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 = "";
@@ -169,6 +187,7 @@ export async function runClaude(
     const rl = createInterface({ input: child.stdout! });
     rl.on("line", (line) => {
       if (!line.trim()) return;
+      watchdog.tick();
 
       let event: any;
       try {
@@ -229,11 +248,13 @@ export async function runClaude(
     });
 
     child.stderr?.on("data", (chunk) => {
+      watchdog.tick();
       stderrOutput += chunk.toString();
     });
 
     child.on("close", (code) => {
       clearTimeout(timer);
+      watchdog.stop();
       rl.close();
 
       const parts: string[] = [];
@@ -242,11 +263,15 @@ export async function runClaude(
       const output = parts.join("\n\n") || stderrOutput || "(no output)";
 
       if (killed) {
-        api.logger.warn(`Claude timed out after ${timeout}ms`);
+        const errorType = killedByWatchdog ? "inactivity_timeout" : "timeout";
+        const reason = killedByWatchdog
+          ? `Claude killed by inactivity watchdog (no I/O for ${Math.round(wdConfig.inactivityMs / 1000)}s)`
+          : `Claude timed out after ${Math.round(timeout / 1000)}s`;
+        api.logger.warn(reason);
         resolve({
           success: false,
-          output: `Claude timed out after ${Math.round(timeout / 1000)}s. Partial output:\n${output}`,
-          error: "timeout",
+          output: `${reason}. Partial output:\n${output}`,
+          error: errorType,
         });
         return;
       }
@@ -267,6 +292,7 @@ export async function runClaude(
 
     child.on("error", (err) => {
       clearTimeout(timer);
+      watchdog.stop();
       rl.close();
       api.logger.error(`Claude spawn error: ${err}`);
       resolve({

package/src/{cli-shared.ts → tools/cli-shared.ts}

@@ -1,9 +1,10 @@
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
-import type { LinearAgentApi } from "./linear-api.js";
-import { resolveLinearToken, LinearAgentApi as LinearAgentApiClass } from "./linear-api.js";
-import { getCurrentSession, getActiveSessionByIdentifier } from "./active-session.js";
+import type { LinearAgentApi } from "../api/linear-api.js";
+import { resolveLinearToken, LinearAgentApi as LinearAgentApiClass } from "../api/linear-api.js";
+import { getCurrentSession, getActiveSessionByIdentifier } from "../pipeline/active-session.js";
 
-export const DEFAULT_TIMEOUT_MS = 10 * 60_000; // 10 minutes
+export const DEFAULT_TIMEOUT_MS = 10 * 60_000; // 10 minutes (legacy — prefer watchdog config)
+export { DEFAULT_INACTIVITY_SEC, DEFAULT_MAX_TOTAL_SEC, DEFAULT_TOOL_TIMEOUT_SEC } from "../agent/watchdog.js";
 export const DEFAULT_BASE_REPO = "/home/claw/ai-workspace";
 
 export interface CliToolParams {

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

@@ -3,7 +3,7 @@ import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import type { AnyAgentTool, OpenClawPluginApi } from "openclaw/plugin-sdk";
 import { jsonResult } from "openclaw/plugin-sdk";
-import { getCurrentSession } from "./active-session.js";
+import { getCurrentSession } from "../pipeline/active-session.js";
 import { runCodex } from "./codex-tool.js";
 import { runClaude } from "./claude-tool.js";
 import { runGemini } from "./gemini-tool.js";
@@ -43,7 +43,7 @@ export interface CodingToolsConfig {
 export function loadCodingConfig(): CodingToolsConfig {
   try {
     // Resolve relative to the plugin root (one level up from src/)
-    const pluginRoot = join(dirname(fileURLToPath(import.meta.url)), "..");
+    const pluginRoot = join(dirname(fileURLToPath(import.meta.url)), "../..");
     const raw = readFileSync(join(pluginRoot, "coding-tools.json"), "utf8");
     return JSON.parse(raw) as CodingToolsConfig;
   } catch {

package/src/{codex-tool.ts → tools/codex-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 CODEX_BIN = "/home/claw/.npm-global/bin/codex";
 
@@ -103,7 +104,9 @@ export async function runCodex(
 
   api.logger.info(`codex_run: session=${agentSessionId ?? "none"}, issue=${issueIdentifier ?? "none"}`);
 
-  const timeout = timeoutMs ?? (pluginConfig?.codexTimeoutMs 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?.codexTimeoutMs as number) ?? wdConfig.toolTimeoutMs;
   const workingDir = params.workingDir ?? (pluginConfig?.codexBaseRepo as string) ?? DEFAULT_BASE_REPO;
 
   // Build Linear API for activity streaming
@@ -134,12 +137,27 @@ export async function runCodex(
     });
 
     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: `codex:${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 = "";
@@ -147,6 +165,7 @@ export async function runCodex(
     const rl = createInterface({ input: child.stdout! });
     rl.on("line", (line) => {
       if (!line.trim()) return;
+      watchdog.tick();
 
       let event: any;
       try {
@@ -189,11 +208,13 @@ export async function runCodex(
     });
 
     child.stderr?.on("data", (chunk) => {
+      watchdog.tick();
       stderrOutput += chunk.toString();
     });
 
     child.on("close", (code) => {
       clearTimeout(timer);
+      watchdog.stop();
       rl.close();
 
       const parts: string[] = [];
@@ -202,11 +223,15 @@ export async function runCodex(
       const output = parts.join("\n\n") || stderrOutput || "(no output)";
 
       if (killed) {
-        api.logger.warn(`Codex timed out after ${timeout}ms`);
+        const errorType = killedByWatchdog ? "inactivity_timeout" : "timeout";
+        const reason = killedByWatchdog
+          ? `Codex killed by inactivity watchdog (no I/O for ${Math.round(wdConfig.inactivityMs / 1000)}s)`
+          : `Codex timed out after ${Math.round(timeout / 1000)}s`;
+        api.logger.warn(reason);
         resolve({
           success: false,
-          output: `Codex timed out after ${Math.round(timeout / 1000)}s. Partial output:\n${output}`,
-          error: "timeout",
+          output: `${reason}. Partial output:\n${output}`,
+          error: errorType,
         });
         return;
       }
@@ -227,6 +252,7 @@ export async function runCodex(
 
     child.on("error", (err) => {
       clearTimeout(timer);
+      watchdog.stop();
       rl.close();
       api.logger.error(`Codex spawn error: ${err}`);
       resolve({