@swarmclawai/swarmclaw 1.2.1 → 1.2.2

package/src/components/chat/message-bubble.tsx

@@ -367,12 +367,14 @@ export const MessageBubble = memo(function MessageBubble({ message, assistantNam
   const toolEvents = message.toolEvents ?? emptyToolEvents
   const toolEventsForMedia = useMemo(
     () => (liveStreamActive
-      ? liveToolEvents.map((event) => ({
-          name: event.name,
-          input: event.input,
-          output: event.output,
-          error: event.status === 'error' || undefined,
-        }))
+      ? (liveToolEvents.length > 0
+          ? liveToolEvents.map((event) => ({
+              name: event.name,
+              input: event.input,
+              output: event.output,
+              error: event.status === 'error' || undefined,
+            }))
+          : toolEvents)
       : toolEvents),
     [liveStreamActive, liveToolEvents, toolEvents],
   )
@@ -383,7 +385,15 @@ export const MessageBubble = memo(function MessageBubble({ message, assistantNam
   )
   const displayToolEvents = useMemo(
     () => (liveStreamActive
-      ? liveToolEvents.filter((ev) => ev.name !== 'send_file' || ev.status === 'error')
+      ? (liveToolEvents.length > 0
+          ? liveToolEvents.filter((ev) => ev.name !== 'send_file' || ev.status === 'error')
+          : persistedToolEvents.map((ev, i) => ({
+              id: ev.toolCallId || `${message.time}-${ev.name}-${i}`,
+              name: ev.name,
+              input: ev.input,
+              output: ev.output,
+              status: ev.error ? 'error' as const : 'done' as const,
+            })))
       : persistedToolEvents.map((ev, i) => ({
           id: ev.toolCallId || `${message.time}-${ev.name}-${i}`,
           name: ev.name,
@@ -419,11 +429,11 @@ export const MessageBubble = memo(function MessageBubble({ message, assistantNam
     ? (liveStreamActive ? (liveStream?.thinking?.trim() ? liveStream.thinking : undefined) : message.thinking)
     : undefined
 
-  const sourceText = liveStreamActive ? (liveStream?.text || '') : message.text
+  const sourceText = liveStreamActive ? (liveStream?.text || message.text || '') : message.text
   const connectorDeliveryTranscript = !isUser && message.kind === 'connector-delivery'
     ? (message.source?.deliveryTranscript?.trim() || '')
     : ''
-  const copySourceText = connectorDeliveryTranscript || (liveStreamActive ? (liveStream?.text || '') : message.text)
+  const copySourceText = connectorDeliveryTranscript || (liveStreamActive ? (liveStream?.text || message.text || '') : message.text)
 
   // Extract ALL media from ALL tool events for inline display after the message text.
   // Covers send_file, browser screenshots, file tool outputs — everything.

package/src/components/chat/message-list.tsx

@@ -188,6 +188,7 @@ export function MessageList({ messages, streaming, connectorFilter = null, loadi
   const snapUntilRef = useRef(0)
   const prevSessionIdRef = useRef<string | null>(null)
   const assistantRenderId = useChatStore((s) => s.assistantRenderId)
+  const thinkingStartTime = useChatStore((s) => s.thinkingStartTime)
   const hasLiveArtifacts = useChatStore(selectHasLiveArtifacts)
   const setMessages = useChatStore((s) => s.setMessages)
   const retryLastMessage = useChatStore((s) => s.retryLastMessage)
@@ -297,13 +298,46 @@ export function MessageList({ messages, streaming, connectorFilter = null, loadi
     return dedupeMessagesForDisplay(displayedMessages)
   }, [messages, showAlerts, showOk])
 
+  const latestPersistedStreamingMessage = useMemo(() => {
+    for (let i = baseDisplayedMessages.length - 1; i >= 0; i -= 1) {
+      const candidate = baseDisplayedMessages[i]
+      if (candidate.role === 'assistant' && candidate.streaming === true) {
+        return candidate
+      }
+    }
+    return null
+  }, [baseDisplayedMessages])
+
+  const currentRunHasCompletedAssistant = useMemo(
+    () => (
+      streaming
+      && thinkingStartTime > 0
+      && baseDisplayedMessages.some((message) => (
+        message.role === 'assistant'
+        && message.streaming !== true
+        && message.kind !== 'system'
+        && message.kind !== 'heartbeat'
+        && typeof message.time === 'number'
+        && message.time >= thinkingStartTime
+      ))
+    ),
+    [baseDisplayedMessages, streaming, thinkingStartTime],
+  )
+
+  const showLiveStreamRow = streaming
+    && !!assistantRenderId
+    && !currentRunHasCompletedAssistant
+    && (hasLiveArtifacts || !!latestPersistedStreamingMessage)
+
   const streamingAwareMessages = useMemo(() => (
     buildStreamingAwareMessageList(baseDisplayedMessages, {
       localStreaming: streaming,
       hasLiveArtifacts,
       assistantRenderId,
+      showLiveRow: showLiveStreamRow,
+      syntheticAssistant: latestPersistedStreamingMessage,
     })
-  ), [assistantRenderId, baseDisplayedMessages, hasLiveArtifacts, streaming])
+  ), [assistantRenderId, baseDisplayedMessages, hasLiveArtifacts, latestPersistedStreamingMessage, showLiveStreamRow, streaming])
 
   const filteredMessages = useMemo(() => {
     let nextMessages = bookmarkFilter
@@ -623,7 +657,7 @@ export function MessageList({ messages, streaming, connectorFilter = null, loadi
   }, [searchOpen])
 
   return (
-    <div className="relative flex-1 min-h-0 min-w-0 flex flex-col overflow-hidden" data-testid="message-list">
+    <div className="relative flex-1 min-h-0 min-w-0 flex flex-col overflow-hidden isolate" data-testid="message-list">
       <div className="shrink-0 px-4 md:px-12 lg:px-16 pt-3">
         <div className="flex flex-wrap items-center gap-2 rounded-[14px] border border-white/[0.06] bg-surface/55 px-3 py-2 backdrop-blur-sm">
           <button
@@ -853,7 +887,7 @@ export function MessageList({ messages, streaming, connectorFilter = null, loadi
           {transcriptNodes}
           <ApprovalCards agentId={agent?.id} />
           <LiveThinkingLane
-            show={streaming && !hasLiveArtifacts && !hasVisiblePersistedStreamingMessage}
+            show={streaming && !showLiveStreamRow && !hasLiveArtifacts && !hasVisiblePersistedStreamingMessage}
             assistantName={assistantName}
             agentAvatarSeed={agent?.avatarSeed}
             agentAvatarUrl={agent?.avatarUrl}

package/src/components/input/chat-input.tsx

@@ -50,6 +50,10 @@ export function ChatInput({ streaming, busy, onSend, onStop, extensionChatAction
   const streamPhase = useChatStore((s) => s.streamPhase)
   const streamToolName = useChatStore((s) => s.streamToolName)
   const visibleQueuedMessages = listQueuedMessagesForSession(queuedMessages, sessionId)
+  const sendingQueuedMessages = visibleQueuedMessages.filter((item) => item.sending)
+  const pendingQueuedMessages = visibleQueuedMessages.filter((item) => !item.sending)
+  const displayedQueuedMessages = [...sendingQueuedMessages, ...pendingQueuedMessages]
+  const nextPendingRunId = pendingQueuedMessages[0]?.runId ?? null
   const shouldQueue = !!sessionId && (busy || visibleQueuedMessages.length > 0)
 
   useEffect(() => {
@@ -178,6 +182,8 @@ export function ChatInput({ streaming, busy, onSend, onStop, extensionChatAction
   const hasContent = value.trim().length > 0 || pendingFiles.length > 0
   const queueStatusLabel = !busy
     ? 'Queue ready'
+    : sendingQueuedMessages.length > 0 && pendingQueuedMessages.length === 0
+      ? 'Sending now'
     : streamPhase === 'queued'
       ? 'Queued'
       : streamPhase === 'tool' && streamToolName
@@ -191,6 +197,8 @@ export function ChatInput({ streaming, busy, onSend, onStop, extensionChatAction
               : 'Working'
   const queueStatusDetail = !busy
     ? 'Queued messages are ready and will dispatch automatically.'
+    : sendingQueuedMessages.length > 0 && pendingQueuedMessages.length === 0
+      ? 'The queued message has been accepted and should appear in the transcript shortly.'
     : 'Queued messages will send automatically when the current turn finishes.'
 
   return (
@@ -229,9 +237,16 @@ export function ChatInput({ streaming, busy, onSend, onStop, extensionChatAction
                     <span className={`relative inline-flex h-2.5 w-2.5 rounded-full ${busy ? 'bg-amber-300' : 'bg-white/[0.45]'}`} />
                   </span>
                   <span className="label-mono text-amber-300/80">Message queue</span>
-                  <span className="rounded-pill border border-amber-400/15 bg-amber-400/10 px-2 py-0.5 text-[10px] font-600 text-amber-200">
-                    {visibleQueuedMessages.length}
-                  </span>
+                  {pendingQueuedMessages.length > 0 && (
+                    <span className="rounded-pill border border-amber-400/15 bg-amber-400/10 px-2 py-0.5 text-[10px] font-600 text-amber-200">
+                      {pendingQueuedMessages.length}
+                    </span>
+                  )}
+                  {sendingQueuedMessages.length > 0 && (
+                    <span className="rounded-pill border border-sky-300/15 bg-sky-300/10 px-2 py-0.5 text-[10px] font-600 text-sky-200">
+                      {sendingQueuedMessages.length} sending
+                    </span>
+                  )}
                   <span className={`rounded-pill border px-2 py-0.5 text-[10px] font-700 uppercase tracking-[0.12em] ${
                     busy
                       ? 'border-amber-300/20 bg-amber-300/10 text-amber-100'
@@ -256,7 +271,7 @@ export function ChatInput({ streaming, busy, onSend, onStop, extensionChatAction
                     Stop
                   </button>
                 )}
-                {sessionId && visibleQueuedMessages.length > 1 && (
+                {sessionId && pendingQueuedMessages.length > 0 && (
                   <button
                     type="button"
                     onClick={() => { void clearQueuedMessagesForSession(sessionId) }}
@@ -268,21 +283,26 @@ export function ChatInput({ streaming, busy, onSend, onStop, extensionChatAction
               </div>
             </div>
             <div className="max-h-[184px] space-y-1.5 overflow-y-auto px-2.5 py-2.5">
-              {visibleQueuedMessages.map((item, index) => (
+              {displayedQueuedMessages.map((item, index) => (
                 <div
                   key={item.runId}
                   className={`group flex items-start gap-3 rounded-[12px] border px-3 py-2.5 transition-all ${
-                    index === 0
-                      ? 'border-amber-300/20 bg-amber-300/[0.07]'
-                      : 'border-white/[0.05] bg-white/[0.02]'
+                    item.sending
+                      ? 'border-sky-300/15 bg-sky-300/[0.06]'
+                      : item.runId === nextPendingRunId
+                        ? 'border-amber-300/20 bg-amber-300/[0.07]'
+                        : 'border-white/[0.05] bg-white/[0.02]'
                   }`}
                 >
                   <div className={`mt-0.5 flex h-6 min-w-6 items-center justify-center rounded-[8px] px-2 text-[10px] font-700 ${
-                    index === 0
-                      ? 'bg-amber-300/15 text-amber-100'
-                      : 'bg-white/[0.06] text-text-3'
-                  }`}>
-                    {index + 1}
+                    item.sending
+                      ? 'bg-sky-300/15 text-sky-100'
+                      : item.runId === nextPendingRunId
+                        ? 'bg-amber-300/15 text-amber-100'
+                      : 'border-white/[0.05] bg-white/[0.02]'
+                  }`}
+                >
+                    {item.sending ? '>' : pendingQueuedMessages.findIndex((candidate) => candidate.runId === item.runId) + 1}
                   </div>
                   <div className="min-w-0 flex-1">
                     <div className="flex flex-wrap items-center gap-2">
@@ -290,7 +310,7 @@ export function ChatInput({ streaming, busy, onSend, onStop, extensionChatAction
                         <span className="rounded-pill border border-sky-300/15 bg-sky-300/10 px-2 py-0.5 text-[10px] font-700 uppercase tracking-[0.12em] text-sky-200 animate-pulse">
                           Sending
                         </span>
-                      ) : index === 0 && (
+                      ) : item.runId === nextPendingRunId && (
                         <span className="rounded-pill border border-amber-300/15 bg-amber-300/10 px-2 py-0.5 text-[10px] font-700 uppercase tracking-[0.12em] text-amber-100">
                           Next
                         </span>

package/src/instrumentation.ts

@@ -1,10 +1,10 @@
 import { hmrSingleton } from '@/lib/shared-utils'
-import { log } from '@/lib/server/logger'
 
 const TAG = 'instrumentation'
 
 export async function register() {
   if (process.env.NEXT_RUNTIME === 'nodejs') {
+    const { log } = await import('@/lib/server/logger')
     const isWorkerOnly = process.env.SWARMCLAW_WORKER_ONLY === '1'
     const { initWsServer, closeWsServer } = await import('./lib/server/ws-hub')
     const { ensureDaemonStarted } = await import('@/lib/server/runtime/daemon-state')

package/src/lib/chat/assistant-render-id.ts

@@ -0,0 +1,3 @@
+export function createAssistantRenderId(): string {
+  return `assistant-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`
+}

package/src/lib/chat/chat-streaming-state.test.ts

@@ -43,16 +43,17 @@ describe('chat-streaming-state', () => {
         localStreaming: true,
         hasLiveArtifacts: true,
         assistantRenderId: 'render-1',
+        showLiveRow: true,
+        syntheticAssistant: messages[1],
       } as StreamingAwareMessageListOptions),
       [
         { role: 'user', text: 'hello', time: 1 },
         {
           role: 'assistant',
-          text: 'final answer',
-          time: 0,
+          text: 'partial',
+          time: 2,
           kind: 'chat',
           streaming: true,
-          thinking: 'working...',
           clientRenderId: 'render-1',
         },
       ],
@@ -69,6 +70,7 @@ describe('chat-streaming-state', () => {
         localStreaming: true,
         hasLiveArtifacts: true,
         assistantRenderId: 'render-2',
+        showLiveRow: true,
       } as StreamingAwareMessageListOptions),
       [
         { role: 'user', text: 'hello', time: 1 },
@@ -84,6 +86,43 @@ describe('chat-streaming-state', () => {
     )
   })
 
+  it('can show a synthetic live row for server-driven runs using the latest persisted streaming artifact', () => {
+    const messages: Message[] = [
+      { role: 'user', text: 'queued follow-up', time: 1 },
+      {
+        role: 'assistant',
+        text: 'Drafting the handoff now.',
+        time: 2,
+        streaming: true,
+        thinking: 'Collecting the completion details',
+        toolEvents: [{ name: 'send_file', input: '{}', output: '/api/uploads/deck.pdf' }],
+      },
+    ]
+
+    assert.deepEqual(
+      buildStreamingAwareMessageList(messages, {
+        localStreaming: true,
+        hasLiveArtifacts: false,
+        assistantRenderId: 'render-server',
+        showLiveRow: true,
+        syntheticAssistant: messages[1],
+      }),
+      [
+        { role: 'user', text: 'queued follow-up', time: 1 },
+        {
+          role: 'assistant',
+          text: 'Drafting the handoff now.',
+          time: 2,
+          kind: 'chat',
+          streaming: true,
+          thinking: 'Collecting the completion details',
+          toolEvents: [{ name: 'send_file', input: '{}', output: '/api/uploads/deck.pdf' }],
+          clientRenderId: 'render-server',
+        },
+      ],
+    )
+  })
+
   it('replaces trailing streaming assistant messages with the completed assistant message', () => {
     const messages: Message[] = [
       { role: 'user', text: 'hello', time: 1 },

package/src/lib/chat/chat-streaming-state.ts

@@ -10,6 +10,8 @@ export interface StreamingAwareMessageListOptions {
   localStreaming: boolean
   hasLiveArtifacts: boolean
   assistantRenderId?: string | null
+  showLiveRow?: boolean
+  syntheticAssistant?: Partial<Message> | null
 }
 
 function isStreamingAssistantMessage(
@@ -27,13 +29,13 @@ function isStreamingAssistantMessage(
 
 export function shouldHidePersistedStreamingAssistantMessage(
   message: Message,
-  opts: { localStreaming: boolean; hasLiveArtifacts: boolean },
+  opts: { localStreaming: boolean; hasLiveArtifacts: boolean; showLiveRow?: boolean },
 ): boolean {
+  const showLiveRow = opts.showLiveRow ?? (opts.localStreaming && opts.hasLiveArtifacts)
   return (
-    opts.localStreaming
+    showLiveRow
     && message.role === 'assistant'
     && message.streaming === true
-    && opts.hasLiveArtifacts
   )
 }
 
@@ -41,22 +43,32 @@ export function buildStreamingAwareMessageList(
   messages: Message[],
   opts: StreamingAwareMessageListOptions,
 ): Message[] {
-  const nextMessages = opts.localStreaming && opts.hasLiveArtifacts
+  const showLiveRow = opts.showLiveRow ?? (opts.localStreaming && opts.hasLiveArtifacts)
+  const nextMessages = showLiveRow
     ? messages.filter((message) => !shouldHidePersistedStreamingAssistantMessage(message, opts))
     : messages
 
-  if (!opts.localStreaming || !opts.hasLiveArtifacts || !opts.assistantRenderId) {
+  if (!showLiveRow || !opts.assistantRenderId) {
     return nextMessages
   }
 
   const syntheticAssistantMessage: Message = {
     role: 'assistant',
-    text: '',
-    time: 0,
-    kind: 'chat',
+    text: typeof opts.syntheticAssistant?.text === 'string' ? opts.syntheticAssistant.text : '',
+    time: typeof opts.syntheticAssistant?.time === 'number' ? opts.syntheticAssistant.time : 0,
+    kind: opts.syntheticAssistant?.kind || 'chat',
     streaming: true,
     clientRenderId: opts.assistantRenderId,
   }
+  if (typeof opts.syntheticAssistant?.thinking === 'string') {
+    syntheticAssistantMessage.thinking = opts.syntheticAssistant.thinking
+  }
+  if (Array.isArray(opts.syntheticAssistant?.toolEvents)) {
+    syntheticAssistantMessage.toolEvents = opts.syntheticAssistant.toolEvents
+  }
+  if (opts.syntheticAssistant?.source) {
+    syntheticAssistantMessage.source = opts.syntheticAssistant.source
+  }
 
   return [
     ...nextMessages,

package/src/lib/chat/queued-message-queue.test.ts

@@ -27,7 +27,7 @@ describe('queued-message-queue', () => {
   it('replaces queued items only for the requested session', () => {
     const replaced = replaceQueuedMessagesForSession(queue, 'session-a', [
       { runId: 'q4', sessionId: 'session-a', text: 'replacement', queuedAt: 4, position: 1 },
-    ])
+    ], { activeRunId: null })
     assert.deepEqual(
       listQueuedMessagesForSession(replaced, 'session-a').map((item) => item.runId),
       ['q4'],
@@ -38,6 +38,28 @@ describe('queued-message-queue', () => {
     )
   })
 
+  it('keeps only the newly active run as a sending placeholder when it disappears from the queue snapshot', () => {
+    const replaced = replaceQueuedMessagesForSession(queue, 'session-a', [
+      { runId: 'q3', sessionId: 'session-a', text: 'second a', queuedAt: 3, position: 1 },
+    ], { activeRunId: 'q1' })
+
+    assert.deepEqual(
+      listQueuedMessagesForSession(replaced, 'session-a').map((item) => [item.runId, item.sending === true]),
+      [['q1', true], ['q3', false]],
+    )
+  })
+
+  it('drops missing stale queue rows that are not the active run', () => {
+    const replaced = replaceQueuedMessagesForSession(queue, 'session-a', [
+      { runId: 'q3', sessionId: 'session-a', text: 'second a', queuedAt: 3, position: 1 },
+    ], { activeRunId: 'run-other' })
+
+    assert.deepEqual(
+      listQueuedMessagesForSession(replaced, 'session-a').map((item) => item.runId),
+      ['q3'],
+    )
+  })
+
   it('removes queued items by stable id', () => {
     assert.deepEqual(removeQueuedMessageById(queue, 'q2').map((item) => item.runId), ['q1', 'q3'])
   })

package/src/lib/chat/queued-message-queue.ts

@@ -41,18 +41,27 @@ export function snapshotToQueuedMessages(snapshot: SessionQueueSnapshot): Queued
   return snapshot.items.map((item) => ({ ...item }))
 }
 
+interface ReplaceQueuedMessagesOptions {
+  activeRunId?: string | null
+}
+
 export function replaceQueuedMessagesForSession(
   queue: QueuedSessionMessage[],
   sessionId: string,
   nextItems: QueuedSessionMessage[],
+  options: ReplaceQueuedMessagesOptions = {},
 ): QueuedSessionMessage[] {
   const otherSessions = queue.filter((item) => item.sessionId !== sessionId)
   const previousForSession = queue.filter((item) => item.sessionId === sessionId && !item.sending)
   // Detect consumed messages: items in local state but not in server snapshot.
-  // Keep them visible as "sending" so they don't vanish from the UI.
+  // Keep only the run that actually became active visible as "sending" so it
+  // doesn't vanish from the UI before the transcript refresh catches up.
   const nextRunIds = new Set(nextItems.map((item) => item.runId))
+  const activeRunId = typeof options.activeRunId === 'string' && options.activeRunId.trim()
+    ? options.activeRunId
+    : null
   const consumed = previousForSession
-    .filter((item) => !item.optimistic && !nextRunIds.has(item.runId))
+    .filter((item) => !item.optimistic && !nextRunIds.has(item.runId) && activeRunId === item.runId)
     .map((item) => ({ ...item, sending: true }))
   return [
     ...otherSessions,

package/src/lib/providers/cli-utils.test.ts

@@ -0,0 +1,124 @@
+import assert from 'node:assert/strict'
+import { describe, it } from 'node:test'
+
+import { isStderrNoise, buildCliEnv, isCliProvider, CLI_PROVIDER_CAPABILITIES } from './cli-utils'
+
+// ---------------------------------------------------------------------------
+// isStderrNoise
+// ---------------------------------------------------------------------------
+
+describe('isStderrNoise', () => {
+  it('returns true for MallocStackLogging lines', () => {
+    assert.equal(isStderrNoise('MallocStackLogging: could not tag MSL'), true)
+  })
+
+  it('returns true for blank/whitespace lines', () => {
+    assert.equal(isStderrNoise(''), true)
+    assert.equal(isStderrNoise('   '), true)
+    assert.equal(isStderrNoise('\t'), true)
+  })
+
+  it('returns false for real error text', () => {
+    assert.equal(isStderrNoise('Error: connection refused'), false)
+    assert.equal(isStderrNoise('FATAL: segfault'), false)
+    assert.equal(isStderrNoise('Permission denied'), false)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// buildCliEnv
+// ---------------------------------------------------------------------------
+
+describe('buildCliEnv', () => {
+  it('strips SWARMCLAW_ prefixed vars from env', () => {
+    const orig = process.env.SWARMCLAW_TEST_VAR
+    process.env.SWARMCLAW_TEST_VAR = 'should_be_stripped'
+    try {
+      const env = buildCliEnv()
+      assert.equal(env.SWARMCLAW_TEST_VAR, undefined)
+    } finally {
+      if (orig === undefined) delete process.env.SWARMCLAW_TEST_VAR
+      else process.env.SWARMCLAW_TEST_VAR = orig
+    }
+  })
+
+  it('deletes MallocStackLogging', () => {
+    const orig = process.env.MallocStackLogging
+    process.env.MallocStackLogging = '1'
+    try {
+      const env = buildCliEnv()
+      assert.equal(env.MallocStackLogging, undefined)
+    } finally {
+      if (orig === undefined) delete process.env.MallocStackLogging
+      else process.env.MallocStackLogging = orig
+    }
+  })
+
+  it('injects provided key-value pairs', () => {
+    const env = buildCliEnv({ inject: { MY_CUSTOM_KEY: 'hello' } })
+    assert.equal(env.MY_CUSTOM_KEY, 'hello')
+  })
+
+  it('preserves unrelated user env vars', () => {
+    const env = buildCliEnv()
+    assert.equal(env.PATH, process.env.PATH)
+  })
+
+  it('supports custom stripPrefixes', () => {
+    const orig = process.env.CUSTOM_PREFIX_VAR
+    process.env.CUSTOM_PREFIX_VAR = 'should_be_stripped'
+    try {
+      const env = buildCliEnv({ stripPrefixes: ['CUSTOM_PREFIX_'] })
+      assert.equal(env.CUSTOM_PREFIX_VAR, undefined)
+    } finally {
+      if (orig === undefined) delete process.env.CUSTOM_PREFIX_VAR
+      else process.env.CUSTOM_PREFIX_VAR = orig
+    }
+  })
+
+  it('sets TERM=dumb and NO_COLOR=1', () => {
+    const env = buildCliEnv()
+    assert.equal(env.TERM, 'dumb')
+    assert.equal(env.NO_COLOR, '1')
+  })
+})
+
+// ---------------------------------------------------------------------------
+// isCliProvider
+// ---------------------------------------------------------------------------
+
+describe('isCliProvider', () => {
+  it('returns true for known CLI providers', () => {
+    assert.equal(isCliProvider('claude-cli'), true)
+    assert.equal(isCliProvider('codex-cli'), true)
+    assert.equal(isCliProvider('opencode-cli'), true)
+    assert.equal(isCliProvider('gemini-cli'), true)
+  })
+
+  it('returns false for non-CLI providers', () => {
+    assert.equal(isCliProvider('openai'), false)
+    assert.equal(isCliProvider('anthropic'), false)
+    assert.equal(isCliProvider(''), false)
+    assert.equal(isCliProvider('google'), false)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// CLI_PROVIDER_CAPABILITIES
+// ---------------------------------------------------------------------------
+
+describe('CLI_PROVIDER_CAPABILITIES', () => {
+  it('has entries for all 4 CLI providers', () => {
+    assert.ok('claude-cli' in CLI_PROVIDER_CAPABILITIES)
+    assert.ok('codex-cli' in CLI_PROVIDER_CAPABILITIES)
+    assert.ok('opencode-cli' in CLI_PROVIDER_CAPABILITIES)
+    assert.ok('gemini-cli' in CLI_PROVIDER_CAPABILITIES)
+  })
+
+  it('each entry is a non-empty string', () => {
+    for (const [key, value] of Object.entries(CLI_PROVIDER_CAPABILITIES)) {
+      assert.equal(typeof value, 'string', `${key} should be a string`)
+      assert.ok(value.length > 0, `${key} should be non-empty`)
+    }
+  })
+})

package/src/lib/server/activity/activity-log.ts

@@ -0,0 +1,21 @@
+import { loadActivity as loadStoredActivity, logActivity as writeActivityLog } from '@/lib/server/storage'
+import { perf } from '@/lib/server/runtime/perf'
+
+export function loadActivity() {
+  return perf.measureSync('repository', 'activity.list', () => loadStoredActivity())
+}
+
+export function logActivity(entry: {
+  entityType: string
+  entityId: string
+  action: string
+  actor: string
+  actorId?: string
+  summary: string
+  detail?: Record<string, unknown>
+}) {
+  perf.measureSync('repository', 'activity.log', () => writeActivityLog(entry), {
+    entityType: entry.entityType,
+    action: entry.action,
+  })
+}

package/src/lib/server/agents/agent-availability.test.ts

@@ -1,20 +1,25 @@
 import assert from 'node:assert/strict'
 import { describe, it } from 'node:test'
+import type { Agent, ProviderType } from '@/types'
 import { isWorkerOnlyAgent, buildWorkerOnlyAgentMessage } from './agent-availability'
 
 describe('isWorkerOnlyAgent', () => {
-  const CLI_PROVIDERS = ['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'openclaw']
-  const NON_CLI_PROVIDERS = ['openai', 'anthropic', 'google', 'deepseek', 'groq', 'custom']
+  const CLI_PROVIDERS = ['claude-cli', 'codex-cli', 'opencode-cli', 'gemini-cli', 'openclaw'] satisfies ProviderType[]
+  const NON_CLI_PROVIDERS = ['openai', 'anthropic', 'google', 'deepseek', 'groq', 'together'] satisfies ProviderType[]
+
+  function withProvider(provider: unknown): Pick<Agent, 'provider'> {
+    return { provider } as Pick<Agent, 'provider'>
+  }
 
   for (const provider of CLI_PROVIDERS) {
     it(`returns true for ${provider}`, () => {
-      assert.equal(isWorkerOnlyAgent({ provider }), true)
+      assert.equal(isWorkerOnlyAgent(withProvider(provider)), true)
     })
   }
 
   for (const provider of NON_CLI_PROVIDERS) {
     it(`returns false for ${provider}`, () => {
-      assert.equal(isWorkerOnlyAgent({ provider }), false)
+      assert.equal(isWorkerOnlyAgent(withProvider(provider)), false)
     })
   }
 
@@ -27,7 +32,7 @@ describe('isWorkerOnlyAgent', () => {
   })
 
   it('returns false for empty provider string', () => {
-    assert.equal(isWorkerOnlyAgent({ provider: '' }), false)
+    assert.equal(isWorkerOnlyAgent(withProvider('')), false)
   })
 })