runs = new ConcurrentHashMap<>();
+ /**
+ * Conversations whose run was force-recycled by an admin. Maps to the
+ * recycle timestamp so a scheduled cleanup can age entries out (TTL
+ * matches {@link #DONE_RETENTION_MS} — long enough that any in-flight
+ * doOnComplete / doOnError firing after the dispose still finds the
+ * marker, short enough not to leak across sessions).
+ *
+ * Read by the SSE doOn* handlers in ChatController to skip a duplicate
+ * saveMessage when the recycle path already wrote the "[已被用户中止]"
+ * placeholder. Without this, the agent's late-yielding doOnComplete
+ * inserts a second assistant row carrying whatever the agent produced
+ * after the user pressed stop — exactly the behavior the user does
+ * not want when force-recycling.
+ */
+ private final ConcurrentHashMap recycledConversations = new ConcurrentHashMap<>();
+
/** 事件 relay：子会话事件转发到父会话（用于 Agent 委派进度可见性） */
private final ConcurrentHashMap>> eventRelays = new ConcurrentHashMap<>();
@@ -451,6 +467,15 @@ public class ChatStreamTracker {
log.info("[ChatStreamTracker] Reset stale stopRequested on register: {}", conversationId);
}
}
+ // Clear the force-recycle marker on new registration — the recycle
+ // tombstone is meant to suppress the late doOnComplete of the
+ // *recycled* run only, not future turns on the same conversation. If
+ // the user re-prompts ("继续", "重试", a new question, etc.) inside
+ // the 5-min TTL, this turn must be allowed to save its assistant
+ // message normally.
+ if (recycledConversations.remove(conversationId) != null) {
+ log.info("[ChatStreamTracker] Cleared recycle marker on new register: {}", conversationId);
+ }
startHeartbeat(conversationId);
log.debug("Stream registered: {}", conversationId);
}
@@ -506,6 +531,23 @@ public class ChatStreamTracker {
return state != null && state.stopRequested.get();
}
+ /**
+ * Whether this conversation was force-recycled by an admin within the
+ * recycle marker's TTL ({@link #DONE_RETENTION_MS}). The SSE doOn*
+ * handlers consult this to skip a duplicate saveMessage when the recycle
+ * path already wrote the placeholder. Survives {@code runs.remove(...)},
+ * unlike {@link #isStopRequested(String)}.
+ */
+ public boolean isRecycled(String conversationId) {
+ Long ts = recycledConversations.get(conversationId);
+ if (ts == null) return false;
+ if (System.currentTimeMillis() - ts > DONE_RETENTION_MS) {
+ recycledConversations.remove(conversationId);
+ return false;
+ }
+ return true;
+ }
+
/**
* 广播事件到所有订阅者并缓存到 buffer.
*
@@ -1454,6 +1496,11 @@ public class ChatStreamTracker {
log.info("[SSE] Cleanup completed: evicted {} stale RunState entries, {} remaining",
evicted, runs.size());
}
+
+ // Age out the recycled-marker map alongside RunState cleanup. Same
+ // 5-minute retention so a delayed doOnComplete still hits the marker
+ // while we don't keep entries around forever.
+ recycledConversations.entrySet().removeIf(e -> now - e.getValue() > DONE_RETENTION_MS);
}
/**
@@ -1603,6 +1650,10 @@ public class ChatStreamTracker {
public boolean forceRecycle(String conversationId) {
RunState state = runs.get(conversationId);
if (state == null) return false;
+ // Mark BEFORE dispose so a doOnComplete that fires the same millisecond
+ // (the upstream agent flux had already buffered/completed concurrently
+ // with the dispose call) sees the recycled flag and skips its save.
+ recycledConversations.put(conversationId, System.currentTimeMillis());
// Persist any partial assistant content first — dispose() only severs
// the downstream subscription, the agent's worker thread keeps running
// and may not yield for minutes. Without this, the conversation row
diff --git a/mateclaw-server/src/main/java/vip/mate/workspace/conversation/ConversationService.java b/mateclaw-server/src/main/java/vip/mate/workspace/conversation/ConversationService.java
index 06128861..896bd77c 100644
--- a/mateclaw-server/src/main/java/vip/mate/workspace/conversation/ConversationService.java
+++ b/mateclaw-server/src/main/java/vip/mate/workspace/conversation/ConversationService.java
@@ -307,6 +307,30 @@ public class ConversationService {
}
}
+ /**
+ * Persist an assistant placeholder marker only when the last message is a
+ * user turn (i.e., the assistant never got to reply). Used by the admin
+ * force-recycle path so a torn-down turn leaves a visible "已被用户中止"
+ * marker instead of an empty conversation. Idempotent: if the previous
+ * emergency-save path already wrote an assistant row, this is a no-op.
+ *
+ * @return the saved message, or {@code null} if the marker was not needed
+ */
+ @Transactional
+ public MessageEntity saveStopMarkerIfDangling(String conversationId, String markerText, String status) {
+ List recent = messageMapper.selectList(
+ new LambdaQueryWrapper()
+ .eq(MessageEntity::getConversationId, conversationId)
+ .orderByDesc(MessageEntity::getCreateTime)
+ .orderByDesc(MessageEntity::getId)
+ .last("LIMIT 1"));
+ if (recent.isEmpty()) return null;
+ MessageEntity last = recent.get(0);
+ if (!"user".equals(last.getRole())) return null;
+ return saveMessage(conversationId, "assistant", markerText, null,
+ status != null ? status : "stopped");
+ }
+
/**
* 获取会话最后一条消息内容（用于 rate limit 防护等场景）
*/
diff --git a/mateclaw-server/src/main/resources/messages.properties b/mateclaw-server/src/main/resources/messages.properties
index 44084e22..f10d47ca 100644
--- a/mateclaw-server/src/main/resources/messages.properties
+++ b/mateclaw-server/src/main/resources/messages.properties
@@ -280,3 +280,6 @@ err.wiki.vision.disabled=图片识别功能未启用
err.wiki.vision.no_provider=未配置可用的图片识别 provider
err.wiki.vision.provider_failed=图片识别 provider 调用失败
err.wiki.vision.all_failed=所有图片识别 provider 调用失败
+
+# --- Chat: assistant stop / interrupt placeholders ---
+chat.stopMarker.userAborted=[已被用户中止]
diff --git a/mateclaw-server/src/main/resources/messages_en.properties b/mateclaw-server/src/main/resources/messages_en.properties
index 8b6ff068..60de88b0 100644
--- a/mateclaw-server/src/main/resources/messages_en.properties
+++ b/mateclaw-server/src/main/resources/messages_en.properties
@@ -287,3 +287,6 @@ err.wiki.vision.disabled=Image vision pipeline is currently disabled
err.wiki.vision.no_provider=No image vision provider is configured
err.wiki.vision.provider_failed=Image vision provider call failed
err.wiki.vision.all_failed=All image vision providers failed
+
+# --- Chat: assistant stop / interrupt placeholders ---
+chat.stopMarker.userAborted=[Stopped by user]