@swarmclawai/swarmclaw 1.2.0 → 1.2.1

package/src/lib/strip-internal-metadata.test.ts

@@ -62,18 +62,23 @@ describe('stripLoopDetectionMessages', () => {
     expect(stripLoopDetectionMessages(input).trim()).toBe('')
   })
 
-  it('strips generic repeat "has been called" messages', () => {
-    const input = 'Tool "search" has been called 12 times with the same input. This appears to be a stuck loop.'
+  it('strips generic repeat "You called" messages', () => {
+    const input = 'You called "browser" 6 times with identical input. Input: "{"action":"screenshot"}" — State your blocker or deliver what you have.'
+    expect(stripLoopDetectionMessages(input).trim()).toBe('')
+  })
+
+  it('strips generic repeat "You called" warning messages', () => {
+    const input = 'You called "search" 4 times with identical input. Input: "query" — Try a fundamentally different approach or deliver partial results.'
     expect(stripLoopDetectionMessages(input).trim()).toBe('')
   })
 
   it('strips "would repeat the same input" messages', () => {
-    const input = 'Tool "search" would repeat the same input 12 times. Blocking before it becomes a stuck loop.'
+    const input = '"search" would repeat the same input 12 times. Input: "query" — State your blocker or deliver what you have.'
     expect(stripLoopDetectionMessages(input).trim()).toBe('')
   })
 
   it('strips "is about to repeat the same input" messages', () => {
-    const input = 'Tool "search" is about to repeat the same input 6 times. Consider a different approach.'
+    const input = '"search" is about to repeat the same input 6 times. Input: "query" — Try a different approach.'
     expect(stripLoopDetectionMessages(input).trim()).toBe('')
   })
 
@@ -102,6 +107,41 @@ describe('stripLoopDetectionMessages', () => {
     expect(stripLoopDetectionMessages(input).trim()).toBe('')
   })
 
+  it('strips output stagnation messages', () => {
+    const input = 'Output stagnation: last 8 tool calls all produced identical output. The approach is not working — try something fundamentally different or report the blocker.'
+    expect(stripLoopDetectionMessages(input).trim()).toBe('')
+  })
+
+  it('strips output stagnation warning messages', () => {
+    const input = 'Output stagnation: 6 of the last 8 tool calls produced identical output. Your tools may not be making progress.'
+    expect(stripLoopDetectionMessages(input).trim()).toBe('')
+  })
+
+  it('strips error convergence messages', () => {
+    const input = 'Error convergence: 5 of the last 6 tool calls returned errors. Stop retrying and report the underlying issue (likely an infrastructure or configuration problem).'
+    expect(stripLoopDetectionMessages(input).trim()).toBe('')
+  })
+
+  it('strips error convergence warning messages', () => {
+    const input = 'Error convergence: 4 of the last 6 tool calls returned errors. You may be hitting a systemic issue — consider a different approach or report the blocker.'
+    expect(stripLoopDetectionMessages(input).trim()).toBe('')
+  })
+
+  it('strips messages wrapped in [Error: ...] brackets', () => {
+    const input = '[Error: You called "browser" 6 times with identical input. Input: "{"action":"screenshot"}" — State your blocker or deliver what you have.]'
+    expect(stripLoopDetectionMessages(input).trim()).toBe('')
+  })
+
+  it('strips [Error: ...] wrapped tool frequency messages', () => {
+    const input = '[Error: Tool "shell" called 30 times this turn. Excessive repetition — wrap up with available results.]'
+    expect(stripLoopDetectionMessages(input).trim()).toBe('')
+  })
+
+  it('strips [Error: ...] wrapped output stagnation messages', () => {
+    const input = '[Error: Output stagnation: last 8 tool calls all produced identical output.]'
+    expect(stripLoopDetectionMessages(input).trim()).toBe('')
+  })
+
   it('preserves normal text that mentions tools', () => {
     const input = 'I used the shell tool to run the command.'
     expect(stripLoopDetectionMessages(input)).toBe(input)

package/src/lib/strip-internal-metadata.ts

@@ -43,35 +43,49 @@ export function stripInternalJson(text: string): string {
  * - Tool "X" called N times ...
  * - Tool "X" would be called N times ...
  * - Tool "X" is nearing overuse ...
- * - Tool "X" has been called N times with the same input ...
- * - Tool "X" would repeat the same input N times ...
- * - Tool "X" is about to repeat the same input N times ...
+ * - You called "X" N times with identical input ...
+ * - "X" would repeat the same input N times ...
+ * - "X" is about to repeat the same input N times ...
  * - Circuit breaker: "X" called N times ...
  * - Circuit breaker: "X" would be called N times ...
  * - Polling stall: "X" returned identical output N times ...
  * - Ping-pong: "X" and "Y" are alternating ...
  * - Ping-pong: "X" and "Y" may be stuck ...
+ * - Output stagnation: last N / N of the last N ...
+ * - Error convergence: N of the last N ...
  */
 const LOOP_DETECTION_RE = new RegExp(
   [
     // Tool frequency: called / would be called / nearing overuse
     String.raw`Tool "[^"]*" (?:called|would be called) \d+ times[^\n]*`,
     String.raw`Tool "[^"]*" is nearing overuse[^\n]*`,
-    // Generic repeat: has been called / would repeat / is about to repeat
-    String.raw`Tool "[^"]*" (?:has been called|would repeat the same input|is about to repeat the same input) \d+ times[^\n]*`,
+    // Generic repeat: "You called" (post-call) / "X" would repeat / is about to repeat (preview)
+    String.raw`You called "[^"]*" \d+ times[^\n]*`,
+    String.raw`"[^"]*" (?:would repeat the same input|is about to repeat the same input) \d+ times[^\n]*`,
     // Circuit breaker
     String.raw`Circuit breaker: "[^"]*" (?:called|would be called) \d+ times[^\n]*`,
     // Polling stall
     String.raw`Polling stall: "[^"]*" returned identical output \d+ times[^\n]*`,
     // Ping-pong
     String.raw`Ping-pong: "[^"]*" and "[^"]*" (?:are alternating|may be stuck)[^\n]*`,
+    // Output stagnation
+    String.raw`Output stagnation:[^\n]*`,
+    // Error convergence
+    String.raw`Error convergence:[^\n]*`,
   ].join('|'),
   'g',
 )
 
+/**
+ * Matches loop detection messages wrapped in `[Error: ...]` brackets
+ * (from the err SSE event handler in use-chat-store.ts).
+ */
+const LOOP_DETECTION_WRAPPED_RE = /\[Error: (?:Tool "[^"]*" (?:called|would be called) \d+ times|Tool "[^"]*" is nearing overuse|You called "[^"]*" \d+ times|"[^"]*" (?:would repeat the same input|is about to repeat the same input) \d+ times|Circuit breaker: "[^"]*" (?:called|would be called) \d+ times|Polling stall: "[^"]*" returned identical output \d+ times|Ping-pong: "[^"]*" and "[^"]*" (?:are alternating|may be stuck)|Output stagnation:|Error convergence:)[^\]]*\]/g
+
 /** Remove loop detection messages that the LLM echoed from tool error results. */
 export function stripLoopDetectionMessages(text: string): string {
-  return text.replace(LOOP_DETECTION_RE, '')
+  // Strip [Error: ...] wrapped versions first, before the inner regex eats the content
+  return text.replace(LOOP_DETECTION_WRAPPED_RE, '').replace(LOOP_DETECTION_RE, '')
 }
 
 // ---------------------------------------------------------------------------

package/src/stores/use-approval-store.ts

@@ -76,7 +76,13 @@ export const useApprovalStore = create<ApprovalState>((set) => ({
       for (const [id, a] of Object.entries(s.approvals)) {
         if (a.expiresAtMs > now && !s.resolvedIds.has(id)) next[id] = a
       }
-      return { approvals: next }
+      // Prune resolvedIds for IDs no longer in the approval set
+      const liveIds = new Set(Object.keys(next))
+      const nextResolved = new Set<string>()
+      for (const id of s.resolvedIds) {
+        if (liveIds.has(id)) nextResolved.add(id)
+      }
+      return { approvals: next, resolvedIds: nextResolved }
     })
   },
 

package/src/stores/use-chat-store.ts

@@ -418,7 +418,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
     let toolCallCounter = 0
     let soundFiredStart = false
     const shouldIgnoreTransientError = (msg: string) =>
-      /cancelled by steer mode|stopped by user/i.test(msg || '')
+      /cancelled by steer mode|stopped by user|stream timed out/i.test(msg || '')
 
     try { await streamChat(sessionId, text, imagePath, imageUrl, (event: SSEEvent) => {
       // Forward events to voice conversation handler if active
@@ -860,6 +860,10 @@ export const useChatStore = create<ChatState>((set, get) => ({
       displayText: '',
       streamPhase: 'thinking' as const,
       streamToolName: '',
+      thinkingText: '',
+      thinkingStartTime: 0,
+      toolEvents: [],
+      agentStatus: null,
     })
   },
 }))

package/src/types/index.ts

@@ -452,6 +452,8 @@ export interface Session {
   theme?: string
   avatar?: string
   canvasContent?: CanvasContent
+  /** Tracks how many times each memory ID has been injected via proactive recall in this session. */
+  injectedMemoryIds?: Record<string, number>
 }
 
 export type Sessions = Record<string, Session>
@@ -1545,6 +1547,7 @@ export interface MemoryEntry {
   lastAccessedAt?: number
   contentHash?: string
   reinforcementCount?: number
+  abstract?: string | null
   createdAt: number
   updatedAt: number
 }
@@ -2147,6 +2150,9 @@ export interface SessionRunRecord {
   recoveredFromRestart?: boolean
   recoveredFromRunId?: string
   recoveryPayload?: SessionRunRecoveryPayload
+  totalInputTokens?: number
+  totalOutputTokens?: number
+  estimatedCost?: number
 }
 
 export interface SessionQueuedTurn {