@epoch-agent/core 0.16.0 → 0.18.0

package/dist/index.js

@@ -1013,6 +1013,11 @@ function createAskQuestionTool(deps) {
     }
   };
 }
+// src/agent/types.ts
+function isAbortSignal(signal) {
+  return !!signal && typeof signal.addEventListener === "function" && typeof signal.removeEventListener === "function";
+}
+// src/tools/builtin/code-exec.ts
 var MAX_CODE_LENGTH = 1e5;
 function createCodeExecTool(sandbox) {
   const iso = sandbox.getIsolation();
@@ -1058,7 +1063,7 @@ function createCodeExecTool(sandbox) {
     },
     operation: "code_exec",
     describeTarget: (args) => `${String(args["language"] ?? "")}:${String(args["code"] ?? "")}`,
-    async execute(args, _ctx) {
+    async execute(args, ctx) {
       const start = Date.now();
       const language = String(args["language"] ?? "");
       const code = String(args["code"] ?? "");
@@ -1096,7 +1101,8 @@ function createCodeExecTool(sandbox) {
         language,
         code,
         timeout,
-        allowNetwork: args["allow_network"] === true
+        allowNetwork: args["allow_network"] === true,
+        ...isAbortSignal(ctx.signal) ? { signal: ctx.signal } : {}
       });
       const header = `[\u9694\u79BB: ${result.isolation === "os" ? "OS \u7EA7" : "\u4EC5\u8FDB\u7A0B\u7EA7"}]`;
       const body2 = result.output || "(\u65E0\u8F93\u51FA)";
@@ -1108,7 +1114,9 @@ ${body2}`,
           error: {
             code: 6004,
             message: result.error ?? "\u6267\u884C\u5931\u8D25",
-            ...result.errorType === "oom" ? { suggestion: "\u51CF\u5C11\u5185\u5B58\u5360\u7528\uFF0C\u6216\u5206\u6279\u5904\u7406\u6570\u636E" } : result.errorType === "timeout" ? { suggestion: "\u4F18\u5316\u7B97\u6CD5\uFF0C\u6216\u63D0\u9AD8 timeout\uFF08\u4E0A\u9650 120 \u79D2\uFF09" } : {}
+            ...result.errorType === "oom" ? { suggestion: "\u51CF\u5C11\u5185\u5B58\u5360\u7528\uFF0C\u6216\u5206\u6279\u5904\u7406\u6570\u636E" } : (
+              result.errorType === "timeout" && !ctx.signal?.aborted ? { suggestion: "\u4F18\u5316\u7B97\u6CD5\uFF0C\u6216\u63D0\u9AD8 timeout\uFF08\u4E0A\u9650 120 \u79D2\uFF09" } : {}
+            )
           },
           duration: result.duration
         };
@@ -1118,6 +1126,218 @@ ${body2}`, duration: result.duration };
     }
   };
 }
+var WINDOW_CHARS = 1024;
+var NGRAM = 16;
+var MAX_DISTINCT_RATIO = 0.2;
+var CHECK_EVERY_CHARS = 256;
+var SUSTAIN_CHECKS = 2;
+var MIN_NORMALIZED_CHARS = 256;
+function normalizeRuns(text) {
+  return text.replace(/\s+/g, " ").replace(/(.)\1{3,}/gu, (_m, c) => c.repeat(3));
+}
+function distinctNgramRatio(text, n = NGRAM) {
+  if (text.length < n) return 1;
+  const seen = /* @__PURE__ */ new Set();
+  let total = 0;
+  for (let i = 0; i + n <= text.length; i++) {
+    seen.add(text.slice(i, i + n));
+    total++;
+  }
+  return total === 0 ? 1 : seen.size / total;
+}
+var RepetitionDetector = class {
+  buf = "";
+  sinceCheck = 0;
+  streak = 0;
+  chars = 0;
+  hit = null;
+  push(delta) {
+    if (this.hit) return true;
+    if (!delta) return false;
+    this.chars += delta.length;
+    this.buf = (this.buf + delta).slice(-WINDOW_CHARS);
+    this.sinceCheck += delta.length;
+    if (this.sinceCheck < CHECK_EVERY_CHARS) return false;
+    this.sinceCheck = 0;
+    if (this.buf.length < WINDOW_CHARS) return false;
+    const norm = normalizeRuns(this.buf);
+    if (norm.length < MIN_NORMALIZED_CHARS) {
+      this.streak = 0;
+      return false;
+    }
+    const ratio = distinctNgramRatio(norm);
+    if (ratio > MAX_DISTINCT_RATIO) {
+      this.streak = 0;
+      return false;
+    }
+    if (++this.streak < SUSTAIN_CHECKS) return false;
+    this.hit = { chars: this.chars, distinctRatio: ratio };
+    return true;
+  }
+  pushAll(text) {
+    for (let i = 0; i < text.length; i += CHECK_EVERY_CHARS) {
+      if (this.push(text.slice(i, i + CHECK_EVERY_CHARS))) return true;
+    }
+    return false;
+  }
+  isLooping() {
+    return this.hit !== null;
+  }
+  getInfo() {
+    if (!this.hit) return null;
+    return t("agent_run.looping_info", {
+      chars: this.hit.chars,
+      percent: Math.round(this.hit.distinctRatio * 100)
+    });
+  }
+};
+// src/agent/turn.ts
+async function* runTurn(opts) {
+  if (opts.streaming) {
+    return yield* runTurnStreaming(opts);
+  }
+  return yield* runTurnBuffered(opts);
+}
+async function* runTurnStreaming(opts) {
+  const { provider, input, guard, reasoningGuard } = opts;
+  const repetition = new RepetitionDetector();
+  const reasoningRepetition = new RepetitionDetector();
+  let text = "";
+  let reasoningText = "";
+  let finishReason = "stop";
+  let looping;
+  let usage;
+  const toolCalls = [];
+  let streamError;
+  let model;
+  let requestedModel;
+  let warnings;
+  const ac = new AbortController();
+  const unlink = linkAbort(input.signal, ac);
+  try {
+    for await (const chunk of provider.stream({ ...input, signal: ac.signal })) {
+      switch (chunk.type) {
+        case "text-delta": {
+          const raw = chunk.textDelta ?? "";
+          if (!raw) break;
+          const delta = guard ? guard.push(raw) : raw;
+          if (!delta) break;
+          text += delta;
+          yield { type: "text-delta", text: delta };
+          if (repetition.push(delta)) looping = repetition;
+          break;
+        }
+        case "reasoning-delta": {
+          const raw = chunk.textDelta ?? "";
+          if (!raw) break;
+          const delta = reasoningGuard ? reasoningGuard.push(raw) : raw;
+          if (!delta) break;
+          reasoningText += delta;
+          yield { type: "reasoning-delta", text: delta };
+          if (reasoningRepetition.push(delta)) looping = reasoningRepetition;
+          break;
+        }
+        case "tool-call":
+          if (chunk.toolCall) {
+            toolCalls.push({
+              toolCallId: chunk.toolCall.toolCallId,
+              toolName: chunk.toolCall.toolName,
+              input: chunk.toolCall.input
+            });
+          }
+          break;
+        case "finish":
+          if (chunk.usage) usage = chunk.usage;
+          if (chunk.finishReason) finishReason = chunk.finishReason;
+          if (chunk.model) model = chunk.model;
+          if (chunk.requestedModel) requestedModel = chunk.requestedModel;
+          if (chunk.warnings) warnings = chunk.warnings;
+          break;
+        case "error":
+          streamError = chunk.error ?? t("agent_run.unknown_provider_error");
+          break;
+        case "tool-result":
+          break;
+      }
+      if (looping) {
+        ac.abort();
+        break;
+      }
+    }
+  } finally {
+    unlink();
+  }
+  if (streamError && !looping) throw new Error(streamError);
+  if (guard) {
+    const tail = guard.flush();
+    if (tail) {
+      text += tail;
+      yield { type: "text-delta", text: tail };
+    }
+  }
+  if (reasoningGuard) {
+    const tail = reasoningGuard.flush();
+    if (tail) {
+      reasoningText += tail;
+      yield { type: "reasoning-delta", text: tail };
+    }
+  }
+  return {
+    text,
+    ...usage ? { usage } : {},
+    finishReason: looping ? "looping" : finishReason,
+    ...looping ? { loopingInfo: looping.getInfo() ?? "" } : {},
+    ...toolCalls.length > 0 ? { toolCalls } : {},
+    ...reasoningText ? { reasoningText } : {},
+    ...model ? { model } : {},
+    ...requestedModel ? { requestedModel } : {},
+    ...warnings && warnings.length > 0 ? { warnings } : {}
+  };
+}
+async function* runTurnBuffered(opts) {
+  const { provider, input, guard, reasoningGuard } = opts;
+  const result = await provider.generate(input);
+  const reasoningText = result.reasoningText ? filterWhole(reasoningGuard, result.reasoningText) : result.reasoningText;
+  if (reasoningText) {
+    yield { type: "reasoning-delta", text: reasoningText };
+  }
+  const text = filterWhole(guard, result.text);
+  if (text) {
+    yield { type: "text-delta", text };
+  }
+  const { reasoningText: _replaced, ...rest } = result;
+  const textLoop = new RepetitionDetector();
+  const reasoningLoop = new RepetitionDetector();
+  textLoop.pushAll(text);
+  if (reasoningText) reasoningLoop.pushAll(reasoningText);
+  let looping;
+  if (textLoop.isLooping()) looping = textLoop;
+  else if (reasoningLoop.isLooping()) looping = reasoningLoop;
+  return {
+    ...rest,
+    text,
+    ...reasoningText ? { reasoningText } : {},
+    ...looping ? { finishReason: "looping", loopingInfo: looping.getInfo() ?? "" } : {}
+  };
+}
+function linkAbort(outer, ac) {
+  if (!outer) return () => {
+  };
+  if (outer.aborted) {
+    ac.abort(outer.reason);
+    return () => {
+    };
+  }
+  const onAbort = () => ac.abort(outer.reason);
+  outer.addEventListener("abort", onAbort, { once: true });
+  return () => outer.removeEventListener("abort", onAbort);
+}
+function filterWhole(guard, text) {
+  if (!guard || !text) return text;
+  return guard.push(text) + guard.flush();
+}
+// src/delegate/manager.ts
+var ABORTED = "\u5DF2\u4E2D\u6B62\uFF1A\u7528\u6237\u7EC8\u6B62\u4E86\u8FD9\u4E00\u8F6E";
 var BLOCKED_TOOLS = Object.freeze([
   "delegate_task",
   "clarify",
@@ -1147,7 +1367,7 @@ var DelegateManager = class {
       ...config
     };
   }
-  async delegate(args, parentSessionId) {
+  async delegate(args, parentSessionId, signal) {
     const start = Date.now();
     const tasks = this.normalizeTasks(args);
     const maxConcurrent = args.max_concurrent ?? this.config.max_concurrent_children;
@@ -1158,7 +1378,7 @@ var DelegateManager = class {
         duration: 0
       };
     }
-    const results = await this.runWithConcurrency(tasks, maxConcurrent, parentSessionId);
+    const results = await this.runWithConcurrency(tasks, maxConcurrent, parentSessionId, signal);
     const summary = this.buildSummary(results, Date.now() - start);
     return {
       success: results.every((r) => r.success),
@@ -1173,12 +1393,12 @@ var DelegateManager = class {
     if (args.goal) return [{ goal: args.goal, ...args.role ? { role: args.role } : {} }];
     return [];
   }
-  async runWithConcurrency(tasks, maxConcurrent, parentSessionId) {
+  async runWithConcurrency(tasks, maxConcurrent, parentSessionId, signal) {
     const results = [];
     for (let i = 0; i < tasks.length; i += maxConcurrent) {
       const batch = tasks.slice(i, i + maxConcurrent);
       const batchResults = await Promise.allSettled(
-        batch.map((t81) => this.runSingleTask(t81, parentSessionId))
+        batch.map((t81) => this.runSingleTask(t81, parentSessionId, signal))
       );
       for (const r of batchResults) {
         if (r.status === "fulfilled") {
@@ -1196,14 +1416,40 @@ var DelegateManager = class {
     }
     return results;
   }
-  async runSingleTask(task, parentSessionId) {
+  async runSingleTask(task, parentSessionId, signal) {
     const start = Date.now();
     const sessionId = `delegate-${randomUUID().slice(0, 8)}`;
+    const failed = (error, summary = "") => ({
+      goal: task.goal,
+      success: false,
+      summary,
+      error,
+      duration: Date.now() - start,
+      ...task.role ? { role: task.role } : {}
+    });
+    if (signal?.aborted) return failed(ABORTED);
+    const controller = new AbortController();
+    const unlink = linkAbort(isAbortSignal(signal) ? signal : void 0, controller);
+    const ms = this.config.task_timeout;
+    let timer;
     try {
-      const result = await this.runWithTimeout(
-        this.runner(task.goal, task.context ?? "", sessionId, task.role, parentSessionId),
-        this.config.task_timeout
-      );
+      const result = await Promise.race([
+        this.runner(
+          task.goal,
+          task.context ?? "",
+          sessionId,
+          task.role,
+          parentSessionId,
+          controller.signal
+        ),
+        new Promise((_, reject2) => {
+          timer = setTimeout(() => {
+            reject2(new Error(`\u8D85\u65F6 (${ms / 1e3}s)`));
+            controller.abort();
+          }, ms);
+        })
+      ]);
+      if (controller.signal.aborted) return failed(ABORTED, result.text);
       return {
         goal: task.goal,
         success: !result.error,
@@ -1214,22 +1460,13 @@ var DelegateManager = class {
       };
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
-      return {
-        goal: task.goal,
-        success: false,
-        summary: "",
-        error: msg.includes("\u8D85\u65F6") ? `[\u8D85\u65F6] ${msg}` : msg,
-        duration: Date.now() - start,
-        ...task.role ? { role: task.role } : {}
-      };
+      if (signal?.aborted) return failed(ABORTED);
+      return failed(msg.includes("\u8D85\u65F6") ? `[\u8D85\u65F6] ${msg}` : msg);
+    } finally {
+      clearTimeout(timer);
+      unlink();
     }
   }
-  async runWithTimeout(promise, ms) {
-    const timeout = new Promise(
-      (_, reject2) => setTimeout(() => reject2(new Error(`\u8D85\u65F6 (${ms / 1e3}s)`)), ms)
-    );
-    return Promise.race([promise, timeout]);
-  }
   buildSummary(results, totalDuration) {
     const lines = [];
     const succeeded = results.filter((r) => r.success).length;
@@ -1373,12 +1610,13 @@ function createDelegateTool(runner, config, roles) {
           ...topRole ? { role: topRole } : {},
           ...maxConcurrent ? { max_concurrent: maxConcurrent } : {}
         },
-        ctx.sessionId
+        ctx.sessionId,
+        ctx.signal
       );
       return {
         success: result.success,
         output: result.output,
-        ...result.success ? {} : { error: { code: 7002, message: "\u90E8\u5206\u5B50\u4EFB\u52A1\u5931\u8D25\uFF0C\u8BE6\u60C5\u89C1\u8F93\u51FA" } },
+        ...result.success ? {} : { error: { code: 7002, message: result.output } },
         duration: result.duration
       };
     }
@@ -10442,6 +10680,17 @@ function blankResponseNote(chars) {
     "\u4E0A\u4E00\u8F6E\u7684\u5DE5\u5177\u7ED3\u679C\u90FD\u8FD8\u5728\u4E0A\u9762\u7684\u4E0A\u4E0B\u6587\u91CC\uFF0C\u76F4\u63A5\u636E\u6B64\u4F5C\u7B54\uFF0C\u522B\u628A\u90A3\u4E9B\u5DE5\u5177\u91CD\u8DD1\u4E00\u904D\u3002"
   ].join("\n");
 }
+var STALL_NOTE_ARGS_MAX_CHARS = 200;
+function stallNote(detail) {
+  const args = detail.args.length > STALL_NOTE_ARGS_MAX_CHARS ? `${detail.args.slice(0, STALL_NOTE_ARGS_MAX_CHARS)}\u2026` : detail.args;
+  const fact = detail.kind === "failure" ? `\u4F60\u5DF2\u7ECF\u7528\u540C\u4E00\u4EFD\u53C2\u6570\u8C03\u4E86 ${detail.count} \u6B21 ${detail.tool}\uFF08${args}\uFF09\uFF0C\u6BCF\u6B21\u90FD\u5931\u8D25\uFF0C\u800C\u4E14\u662F\u540C\u4E00\u6761\u9519\u8BEF\uFF1A${detail.error ?? ""}` : `\u4F60\u5DF2\u7ECF\u8FDE\u7EED ${detail.count} \u8F6E\u7528\u540C\u4E00\u4EFD\u53C2\u6570\u8C03 ${detail.tool}\uFF08${args}\uFF09\uFF0C\u7ED3\u679C\u4E0D\u4F1A\u56E0\u4E3A\u518D\u8C03\u4E00\u6B21\u800C\u6539\u53D8\u3002`;
+  return [
+    `${fact} \u2014\u2014 \u8FD9\u662F\u5728\u539F\u5730\u6253\u8F6C\u3002`,
+    detail.kind === "failure" ? "\u522B\u518D\u539F\u6837\u91CD\u8BD5\u3002\u5148\u8BFB\u61C2\u8FD9\u6761\u9519\u8BEF\u8BF4\u7684\u662F\u4EC0\u4E48\uFF0C\u7136\u540E\u6362\u4E00\u79CD\u505A\u6CD5\uFF1A\u6362\u53C2\u6570\u3001\u6362\u4E00\u4E2A\u5DE5\u5177\uFF0C\u6216\u8005\u7ED5\u5F00\u8FD9\u4E00\u6B65\u7528\u5DF2\u7ECF\u62FF\u5230\u7684\u7ED3\u679C\u5F80\u4E0B\u8D70\u3002" : "\u522B\u518D\u539F\u6837\u8C03\u4E00\u6B21\u3002\u5B83\u7684\u7ED3\u679C\u5DF2\u7ECF\u5728\u4E0A\u9762\u7684\u4E0A\u4E0B\u6587\u91CC\u4E86\uFF0C\u76F4\u63A5\u7528\uFF1B\u8981\u4E48\u6362\u53C2\u6570\u3001\u6362\u4E00\u4E2A\u5DE5\u5177\uFF0C\u6362\u4E00\u79CD\u505A\u6CD5\u5F80\u4E0B\u8D70\u3002",
+    "\u5982\u679C\u786E\u5B9E\u6CA1\u6709\u522B\u7684\u8DEF\uFF08\u5DE5\u5177\u672C\u8EAB\u574F\u4E86\u3001\u7F3A\u6743\u9650\u6216\u51ED\u636E\u3001\u9700\u8981\u7528\u6237\u5148\u505A\u70B9\u4EC0\u4E48\uFF09\uFF0C\u5C31\u505C\u4E0B\u6765\uFF0C\u76F4\u63A5\u544A\u8BC9\u7528\u6237\u5361\u5728\u54EA\u4E00\u6B65\u3001\u9700\u8981\u4ED6\u505A\u4EC0\u4E48\u3002",
+    "\u8FD9\u662F\u552F\u4E00\u4E00\u6B21\u63D0\u9192\uFF1A\u518D\u9677\u8FDB\u540C\u6837\u7684\u91CD\u590D\uFF0C\u4EFB\u52A1\u4F1A\u88AB\u76F4\u63A5\u7EC8\u6B62\u3002"
+  ].join("\n");
+}
 var CODE_VERIFICATION_POLICY = [
   "<code_verification>",
   "\u6539\u5B8C\u4EE3\u7801\u3001\u5BA3\u5E03\u5B8C\u6210\u4E4B\u524D\uFF0C\u8C03\u4E00\u6B21 `lsp_diagnostics`\uFF0C\u628A\u672C\u8F6E\u65B0\u5EFA\u6216\u4FEE\u6539\u8FC7\u7684\u6E90\u6587\u4EF6\u5217\u8FDB\u53BB\u3002",
@@ -10627,6 +10876,28 @@ var StallDetector = class {
     }
     return null;
   }
+  getStallDetail() {
+    const failure = this.stalledFailure();
+    if (failure) {
+      return {
+        kind: "failure",
+        tool: failure.toolName,
+        args: failure.args,
+        count: failure.count,
+        error: failure.error
+      };
+    }
+    const streak = this.stalledStreak();
+    if (streak) {
+      return {
+        kind: "streak",
+        tool: streak.toolName,
+        args: streak.args,
+        count: streak.consecutive
+      };
+    }
+    return null;
+  }
   reset() {
     this.history = [];
     this.failures.clear();
@@ -10945,7 +11216,7 @@ var ToolExecutor = class {
           output: `\u64CD\u4F5C\u88AB hook \u963B\u6B62: ${blocked.reason || "\u672A\u77E5\u539F\u56E0"}`
         });
       }
-      const gate = await this.checkPermission(et, tc.input);
+      const gate = await this.checkPermission(et, tc.input, signal);
       if (!gate.allowed) {
         return finish({ ...base, success: false, output: gate.output });
       }
@@ -11088,7 +11359,7 @@ var ToolExecutor = class {
     );
     return guessed || argsKey(args);
   }
-  async checkPermission(et, args) {
+  async checkPermission(et, args, signal) {
     const pm = this.deps.permissionManager;
     if (!pm) return { allowed: true };
     const toolName = et.name;
@@ -11122,6 +11393,9 @@ var ToolExecutor = class {
         ...decision.rememberable === false ? { rememberable: false } : {}
       })
     );
+    if (signal?.aborted) {
+      return { allowed: false, output: "\u64CD\u4F5C\u5DF2\u4E2D\u6B62\uFF1A\u7528\u6237\u7EC8\u6B62\u4E86\u8FD9\u4E00\u8F6E\u3002" };
+    }
     this.deps.telemetry?.counter(METRIC.TOOL_APPROVAL, 1, {
       [GEN_AI.TOOL_NAME]: toolName,
       "epoch.approval.outcome": outcome
@@ -11143,220 +11417,6 @@ var ToolExecutor = class {
     return { allowed: true };
   }
 };
-var WINDOW_CHARS = 1024;
-var NGRAM = 16;
-var MAX_DISTINCT_RATIO = 0.2;
-var CHECK_EVERY_CHARS = 256;
-var SUSTAIN_CHECKS = 2;
-var MIN_NORMALIZED_CHARS = 256;
-function normalizeRuns(text) {
-  return text.replace(/\s+/g, " ").replace(/(.)\1{3,}/gu, (_m, c) => c.repeat(3));
-}
-function distinctNgramRatio(text, n = NGRAM) {
-  if (text.length < n) return 1;
-  const seen = /* @__PURE__ */ new Set();
-  let total = 0;
-  for (let i = 0; i + n <= text.length; i++) {
-    seen.add(text.slice(i, i + n));
-    total++;
-  }
-  return total === 0 ? 1 : seen.size / total;
-}
-var RepetitionDetector = class {
-  buf = "";
-  sinceCheck = 0;
-  streak = 0;
-  chars = 0;
-  hit = null;
-  push(delta) {
-    if (this.hit) return true;
-    if (!delta) return false;
-    this.chars += delta.length;
-    this.buf = (this.buf + delta).slice(-WINDOW_CHARS);
-    this.sinceCheck += delta.length;
-    if (this.sinceCheck < CHECK_EVERY_CHARS) return false;
-    this.sinceCheck = 0;
-    if (this.buf.length < WINDOW_CHARS) return false;
-    const norm = normalizeRuns(this.buf);
-    if (norm.length < MIN_NORMALIZED_CHARS) {
-      this.streak = 0;
-      return false;
-    }
-    const ratio = distinctNgramRatio(norm);
-    if (ratio > MAX_DISTINCT_RATIO) {
-      this.streak = 0;
-      return false;
-    }
-    if (++this.streak < SUSTAIN_CHECKS) return false;
-    this.hit = { chars: this.chars, distinctRatio: ratio };
-    return true;
-  }
-  pushAll(text) {
-    for (let i = 0; i < text.length; i += CHECK_EVERY_CHARS) {
-      if (this.push(text.slice(i, i + CHECK_EVERY_CHARS))) return true;
-    }
-    return false;
-  }
-  isLooping() {
-    return this.hit !== null;
-  }
-  getInfo() {
-    if (!this.hit) return null;
-    return t("agent_run.looping_info", {
-      chars: this.hit.chars,
-      percent: Math.round(this.hit.distinctRatio * 100)
-    });
-  }
-};
-// src/agent/turn.ts
-async function* runTurn(opts) {
-  if (opts.streaming) {
-    return yield* runTurnStreaming(opts);
-  }
-  return yield* runTurnBuffered(opts);
-}
-async function* runTurnStreaming(opts) {
-  const { provider, input, guard, reasoningGuard } = opts;
-  const repetition = new RepetitionDetector();
-  const reasoningRepetition = new RepetitionDetector();
-  let text = "";
-  let reasoningText = "";
-  let finishReason = "stop";
-  let looping;
-  let usage;
-  const toolCalls = [];
-  let streamError;
-  let model;
-  let requestedModel;
-  let warnings;
-  const ac = new AbortController();
-  const unlink = linkAbort(input.signal, ac);
-  try {
-    for await (const chunk of provider.stream({ ...input, signal: ac.signal })) {
-      switch (chunk.type) {
-        case "text-delta": {
-          const raw = chunk.textDelta ?? "";
-          if (!raw) break;
-          const delta = guard ? guard.push(raw) : raw;
-          if (!delta) break;
-          text += delta;
-          yield { type: "text-delta", text: delta };
-          if (repetition.push(delta)) looping = repetition;
-          break;
-        }
-        case "reasoning-delta": {
-          const raw = chunk.textDelta ?? "";
-          if (!raw) break;
-          const delta = reasoningGuard ? reasoningGuard.push(raw) : raw;
-          if (!delta) break;
-          reasoningText += delta;
-          yield { type: "reasoning-delta", text: delta };
-          if (reasoningRepetition.push(delta)) looping = reasoningRepetition;
-          break;
-        }
-        case "tool-call":
-          if (chunk.toolCall) {
-            toolCalls.push({
-              toolCallId: chunk.toolCall.toolCallId,
-              toolName: chunk.toolCall.toolName,
-              input: chunk.toolCall.input
-            });
-          }
-          break;
-        case "finish":
-          if (chunk.usage) usage = chunk.usage;
-          if (chunk.finishReason) finishReason = chunk.finishReason;
-          if (chunk.model) model = chunk.model;
-          if (chunk.requestedModel) requestedModel = chunk.requestedModel;
-          if (chunk.warnings) warnings = chunk.warnings;
-          break;
-        case "error":
-          streamError = chunk.error ?? t("agent_run.unknown_provider_error");
-          break;
-        case "tool-result":
-          break;
-      }
-      if (looping) {
-        ac.abort();
-        break;
-      }
-    }
-  } finally {
-    unlink();
-  }
-  if (streamError && !looping) throw new Error(streamError);
-  if (guard) {
-    const tail = guard.flush();
-    if (tail) {
-      text += tail;
-      yield { type: "text-delta", text: tail };
-    }
-  }
-  if (reasoningGuard) {
-    const tail = reasoningGuard.flush();
-    if (tail) {
-      reasoningText += tail;
-      yield { type: "reasoning-delta", text: tail };
-    }
-  }
-  return {
-    text,
-    ...usage ? { usage } : {},
-    finishReason: looping ? "looping" : finishReason,
-    ...looping ? { loopingInfo: looping.getInfo() ?? "" } : {},
-    ...toolCalls.length > 0 ? { toolCalls } : {},
-    ...reasoningText ? { reasoningText } : {},
-    ...model ? { model } : {},
-    ...requestedModel ? { requestedModel } : {},
-    ...warnings && warnings.length > 0 ? { warnings } : {}
-  };
-}
-async function* runTurnBuffered(opts) {
-  const { provider, input, guard, reasoningGuard } = opts;
-  const result = await provider.generate(input);
-  const reasoningText = result.reasoningText ? filterWhole(reasoningGuard, result.reasoningText) : result.reasoningText;
-  if (reasoningText) {
-    yield { type: "reasoning-delta", text: reasoningText };
-  }
-  const text = filterWhole(guard, result.text);
-  if (text) {
-    yield { type: "text-delta", text };
-  }
-  const { reasoningText: _replaced, ...rest } = result;
-  const textLoop = new RepetitionDetector();
-  const reasoningLoop = new RepetitionDetector();
-  textLoop.pushAll(text);
-  if (reasoningText) reasoningLoop.pushAll(reasoningText);
-  let looping;
-  if (textLoop.isLooping()) looping = textLoop;
-  else if (reasoningLoop.isLooping()) looping = reasoningLoop;
-  return {
-    ...rest,
-    text,
-    ...reasoningText ? { reasoningText } : {},
-    ...looping ? { finishReason: "looping", loopingInfo: looping.getInfo() ?? "" } : {}
-  };
-}
-function linkAbort(outer, ac) {
-  if (!outer) return () => {
-  };
-  if (outer.aborted) {
-    ac.abort(outer.reason);
-    return () => {
-    };
-  }
-  const onAbort = () => ac.abort(outer.reason);
-  outer.addEventListener("abort", onAbort, { once: true });
-  return () => outer.removeEventListener("abort", onAbort);
-}
-function filterWhole(guard, text) {
-  if (!guard || !text) return text;
-  return guard.push(text) + guard.flush();
-}
-// src/agent/types.ts
-function isAbortSignal(signal) {
-  return !!signal && typeof signal.addEventListener === "function" && typeof signal.removeEventListener === "function";
-}
 // src/agent/loop.ts
 var DEFAULT_CONTEXT_LENGTH = 128e3;
 function shrank(before, after) {
@@ -11683,6 +11743,7 @@ var AgentLoop = class {
       let idleNudged = false;
       let blankNudged = false;
       let blankAfterNudge = false;
+      let stallNudged = false;
       for (let turn = 1; turn <= maxTurns; turn++) {
         if (this.isAborted(input.signal)) {
           if (turns.length > 0 || lastText) {
@@ -12081,7 +12142,17 @@ ${finalText}` };
           turn
         });
         yield { type: "turn-complete", turn };
-        if (this.stallDetector.isStalled()) {
+        const stall = this.stallDetector.getStallDetail();
+        if (stall && !stallNudged && turn < maxTurns) {
+          stallNudged = true;
+          yield {
+            type: "notice",
+            code: "stall-nudged",
+            text: t("agent_run.stall_nudged", { info: this.stallDetector.getStallInfo() ?? "" })
+          };
+          this.stallDetector.reset();
+          messages.push({ role: "user", content: systemNote(stallNote(stall)) });
+        } else if (stall) {
           const msg2 = t("agent_run.stalled", { info: this.stallDetector.getStallInfo() ?? "" });
           yield { type: "text-delta", text: msg2 };
           await this.prompt.syncMemory(userText, msg2);